6775 files changed, 65464 insertions, 63814 deletions

diff --git a/Manifest b/Manifest
index 27aba7d70e62..89e97780483a 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29469 BLAKE2B d00a753825389d94d17e9ecfc6acb3ee77752d8692a4c4e97f6184decbb1af5ffec698918b279e43e7e710abe0b68836f951f52d573a27031603e8b3844cab5a SHA512 2da5aacef4d1d42121faa22f8f1e3628bd8fa43dc3ee2a4650426aec5b2c3b28eebf28ad94c9957afa9455d0132edf0a9cf7909346b1483fe64fddb5bc0cd5f1
-TIMESTAMP 2020-06-21T11:38:30Z
+MANIFEST Manifest.files.gz 29472 BLAKE2B 688f32db732507262fe6bf1674b06b8bc77f26a8838e37ca234d4e29adbfedc548d5521e9e87d4e7d015d1cfed9b27a1507648071fb61b10919ed31f77455ccf SHA512 309d476ef47271959279a9b9c40db0b7e9700912c1e03a45c210cb41402046710705ca0223613aaab6697e3d84fc3df3e0b234e0b037d9179759f56b92e1c56b
+TIMESTAMP 2020-06-29T10:08:23Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl7vRrZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl75vZdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDB7A/+O2gJaZKePKhXB7vBQcYvksPWLLSKsPt38m73cknE8+5BFFgNktl8NNo9
-kocFla7PMBrAq3kTOyU9SeH1YwpCPsosc2chhJskuYmrhtjVTCQ57ki1ZUvUY3D7
-t5cpdNPqySmN8PvIkZh53wdVaF5BXqzu8T+acfDcSgAOoZBufVQMUlUuLE/haC6V
-ngxwuxXHkSdXFSHh0TTY1nJlJAyDXJB9qWU29ejPq3CoYgeDbPtoHkk958ObOsem
-3/gb4/y9kV1TWu8Ucjs1IprbVk7fyrLmAxMNDBtn16Q6hJ/QQZawERrH0a8Usv2R
-vT4IFi3lE7kXVG6XhRhbY3Gmtx7dSybAXChzrOvJhLyqgMTr7Eycq05PdWabp2oT
-cXiDk9DVG3OEc6wO4UdjXK15zB9rddlx8b8dRxgoVM1QL8r7itxTQe/fv4jyyWmj
-vPgUYi1DRhplPRpGZYRFo5C2poGi9G4QANPEThhN71gEmm0OjViifHWzeHjzF1U+
-4hAvwGWwpEDvVmeUqLtqLUSg5S9imkQSJ8FN6kTRK9p/PYd8SvNrGkIgy4Ohm+Xn
-FYxIB1AEf5svvPe9likHNjV1PJvmyR9e5ldf3XwLTPV9VY+htUW5IcvE8Ig870lJ
-hfl41jjjk0CeZaBH1DcuKR78p2nlo3AjLJpVGUlJUs3AfIa4uXw=
-=DsMT
+klDIMA/8CBIOhnwUmr+ea5AbK60j6Hbl0NC6a55znoSB5te8ATcWAS3TOnf+MTpi
+nVm2S0j+UCxfyN8Cji4PimkIbCRgsH/HTb7u3sk95IoTghyI1anrTsxiXQHZmzy7
+Sbwkn3uixn3UDei41drCwEmqwXl6QtEudvw8UmeXvUnW/+GMOgbpAO7iNn4ZloaT
+qAVEJ1WDWbx5LbhApuRsU6IWcjxX/YleYfk7i/b7LR+GoPKJVqWiocqWpznLmqqx
+fJdVPBMUmF+EALGon61bys4NhbF1dwjt/ckRsXfQ24ZdczexMSzpxdhIi29M9XW9
+Tbk+UG0NjUaHlJC9kT7yJhpp6+y6rXe4xjdAWINBoi7v1knjiP4YhwB5y2YtIw05
+Q1CD7+7b8F1SwJBbFrilOzLyP4RM5PCL9JYL6HfC7HE3p4r/fm0vnlvvLJQUxwzd
+qehlNtO4txnHvvZUxWCYYPZGyXenOtCFR4gU+ls9YOpJemBeWYLgJ1V18cqXLLp8
++Hq/ZDJE9MLtqVcJzUmWDL0aX2F9b002Er0jq5Kw0nd/uCUqKz5cgbd/dFKtbbif
+5VNlhLqgT7hzs7N9taMsMCDtOkAPPsTj6RK7owqDLmPja9YdyS5sLNG+rDSv34bs
+0OC5va1TGtS5h2qOp/NDAAKbHjNwTDG/2/cnVOnG5qCtUn4/v3Y=
+=Cp9x
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 065bbeda98cd..8af60e1fa257 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index dcff1f647729..04b11764166a 100644
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
diff --git a/acct-group/cvmfs/Manifest b/acct-group/cvmfs/Manifest
new file mode 100644
index 000000000000..7cd7bdcc7fba
--- /dev/null
+++ b/acct-group/cvmfs/Manifest
@@ -0,0 +1,2 @@
+EBUILD cvmfs-0.ebuild 204 BLAKE2B d90486273f1616e30a399ae7a0abc5a2cb2762dfab00374448331e11028185a434b6672ab189aba699c0da92456c3e3859b7d71976b9c8693ac9effa7540f192 SHA512 a0278844352e7e4293ef07a2693a17daa8d542c6db60c261b24df82466781e31396269a2c79c7538259099b61344e3cf6c85dcb48068c36b76038cf4d4534dfd
+MISC metadata.xml 261 BLAKE2B f8ebf4d9e5f24ddcf71344ce790e5255aeb69d73a0bf1c58986b295fb62f7030516b6dd7c3e062e4787ecc452b09a3ec1479f647f0dc42fefbe77a2296e758eb SHA512 0bf25eafaf8d053f9645c0c87de9c29e72f6706959ff6d9b69f61bd97cb380af52908c60315709b6315b0ca6de242d25ba5ef5b5e4cc5eeb5cdd68d81f62d81a
diff --git a/acct-group/cvmfs/cvmfs-0.ebuild b/acct-group/cvmfs/cvmfs-0.ebuild
new file mode 100644
index 000000000000..1fcae7e51f98
--- /dev/null
+++ b/acct-group/cvmfs/cvmfs-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the CernVM-FS network file system"
+ACCT_GROUP_ID=268
diff --git a/acct-group/cvmfs/metadata.xml b/acct-group/cvmfs/metadata.xml
new file mode 100644
index 000000000000..46a304a17de5
--- /dev/null
+++ b/acct-group/cvmfs/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>sci-physics@gentoo.org</email>
+		<name>Gentoo Physics Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/lxd/Manifest b/acct-group/lxd/Manifest
index 76d05b165259..6f55fc177809 100644
--- a/acct-group/lxd/Manifest
+++ b/acct-group/lxd/Manifest
@@ -1,2 +1,2 @@
 EBUILD lxd-0.ebuild 188 BLAKE2B d153f470506feb2e2557573bbd0423ba1f14ccf319130834723b2b574c4545995329d6ae8b22df175db173f1edcb28f6088c835d9a650469720a7f305428be11 SHA512 6f9a1c1d2dbff5ca04254fee1584e1cd1c2ea263fb317adf08af8b86ae496343f472967e845ac6ab3556bd1b88b2e215616c2b499e2c3d9d584c5d20a46b9111
-MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
+MISC metadata.xml 277 BLAKE2B fdd3d0858258cd42bb21a1759e210802c20d42422a6b527e43f7c2488162ecc74b31a8098018999b986f23fefa9ce8752f59bce9dbd1becc6044e5a5b999c2cf SHA512 a7f1ef17d50370f30622f5a9f9a3d69623214ce9e1eb76fb9d59fcd8e016a2dfa18e6141ee130e7e1c6dab517d274ae8d252638a27320e356d4f7267d09587db
diff --git a/acct-group/lxd/metadata.xml b/acct-group/lxd/metadata.xml
index 6b0a0fb3a729..36289aa361ce 100644
--- a/acct-group/lxd/metadata.xml
+++ b/acct-group/lxd/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>juippis@gentoo.org</email>
-    <name>Joonas Niilola</name>
+  <maintainer type="project">
+    <email>virtualization@gentoo.org</email>
+    <name>Gentoo Virtualization Project</name>
   </maintainer>
 </pkgmetadata>
diff --git a/acct-group/openntpd/Manifest b/acct-group/openntpd/Manifest
index 722cfa2662b6..e6e937ccece4 100644
--- a/acct-group/openntpd/Manifest
+++ b/acct-group/openntpd/Manifest
@@ -1,2 +1,2 @@
 EBUILD openntpd-0.ebuild 146 BLAKE2B 06f22b047e466da8525eedf85232c68c0c3599d38cbb53df7c83a5808b2571b3fdc770b9a7b4e89a7a7bcb96b539bab4497e68305aa12ab4b8b4dece64eb1085 SHA512 a0d94414f5b3d4ed1ce07505a76a536f822788956b99f3dcea7d71ce9552e0c11d94efd53eabe30eb6d906d2ef04fdc52135fb5c8c4dbef52c9bcd0692443ca2
-MISC metadata.xml 483 BLAKE2B 09372f290c803499c983974a2ee3f1c20964524256bd64fb6bd38b510b7611087392ad740bdf2a5b866e9ebdaebc8c3889af85b550efa0dc7fd142105ec4cbb2 SHA512 3af86a0d6b0afaa1ffca7a388becce85facd57ca1dfbf167ebba25261e4d4e5b9e8867c4d7f7b18e3f580993feae64e274433b39b36838eeb87b2a0380e90299
+MISC metadata.xml 361 BLAKE2B e87dd9324a648e9653e2c9765fce14c381f62e6a0a1ff8a37fba42ed632e3e6b97e3e6ca6b63d72cae77009318d37e2eaf767c072cc378e4304ac79eaee29b8a SHA512 62cbe01f116c560b2c2f5ac9419d8de3c262291cc3a12b529ffc71fd366de0bb1911e5564bd55cb6cbdf9d5548ebe0415c5ed0d5048c5883be17e00554ac33f6
diff --git a/acct-group/openntpd/metadata.xml b/acct-group/openntpd/metadata.xml
index 4fb2c3dd4699..9c1fc34df050 100644
--- a/acct-group/openntpd/metadata.xml
+++ b/acct-group/openntpd/metadata.xml
@@ -5,10 +5,6 @@
 		<email>henson@acm.org</email>
 		<name>Paul B. Henson</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans (proxy)</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/acct-group/sabnzbd/Manifest b/acct-group/sabnzbd/Manifest
new file mode 100644
index 000000000000..533db8c82941
--- /dev/null
+++ b/acct-group/sabnzbd/Manifest
@@ -0,0 +1,2 @@
+EBUILD sabnzbd-0.ebuild 183 BLAKE2B a9b9a479ed75f32a3730744b719401b0e30c48ab1e58b8b3d9003217b139d2b1eef63841f019d6518884e3adc1cef38366c67832d9e64077079a530e999e17a6 SHA512 d3bda34608cda5f6cf168b409d76cec845b7cb967cd4d4a5c0057f27b2228422bdd7dadbbe6e4e9d253e79f2c0f0e6ff4e1a57890a15f2350c63e4c212cb7443
+MISC metadata.xml 251 BLAKE2B fb85d245662fa1577cfe1d77526bd34fb2a674dd447192f2defe78b751423e3d14ae73efd3ac0e1e5e6fdb6259622a782e724ec77021faf526509f199dd20d61 SHA512 46942a98ef7e36470d1169a5bc8839d25603e33c143cd36327a8a85fc14cb6bfb32247eb7608d92cc58a06cc8eef5bd64d6ec2d21e69a88632e4b936598aa772
diff --git a/acct-group/sabnzbd/metadata.xml b/acct-group/sabnzbd/metadata.xml
new file mode 100644
index 000000000000..a32d600f949d
--- /dev/null
+++ b/acct-group/sabnzbd/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>whissi@gentoo.org</email>
+		<name>Thomas Deutschmann</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/sabnzbd/sabnzbd-0.ebuild b/acct-group/sabnzbd/sabnzbd-0.ebuild
new file mode 100644
index 000000000000..4f1a3726241b
--- /dev/null
+++ b/acct-group/sabnzbd/sabnzbd-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="SABnzbd program group"
+
+ACCT_GROUP_ID=397
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 55bd0b079ab2..7fed0fd65de6 100644
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
diff --git a/acct-user/cvmfs/Manifest b/acct-user/cvmfs/Manifest
new file mode 100644
index 000000000000..ae167cce52f6
--- /dev/null
+++ b/acct-user/cvmfs/Manifest
@@ -0,0 +1,2 @@
+EBUILD cvmfs-0.ebuild 250 BLAKE2B ba841c70e8dd9122f1fdab67947ce63bf57d88664ea651bf129e0cec10e76e388a858cde426f53bed31a9bff1c42db7834a61e32eab82878d1751c2c15ffe9aa SHA512 e0f74313654fc958ecac2da409e39cc098d4caa863a043d169fe7749143ab1f041a55f4a8448770b96b5ad767f84957c24a072b4be99ecc127c51f00613ff0f8
+MISC metadata.xml 261 BLAKE2B f8ebf4d9e5f24ddcf71344ce790e5255aeb69d73a0bf1c58986b295fb62f7030516b6dd7c3e062e4787ecc452b09a3ec1479f647f0dc42fefbe77a2296e758eb SHA512 0bf25eafaf8d053f9645c0c87de9c29e72f6706959ff6d9b69f61bd97cb380af52908c60315709b6315b0ca6de242d25ba5ef5b5e4cc5eeb5cdd68d81f62d81a
diff --git a/acct-user/cvmfs/cvmfs-0.ebuild b/acct-user/cvmfs/cvmfs-0.ebuild
new file mode 100644
index 000000000000..9296d50fb9c1
--- /dev/null
+++ b/acct-user/cvmfs/cvmfs-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 the CernVM-FS network file system"
+ACCT_USER_ID=268
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/cvmfs/metadata.xml b/acct-user/cvmfs/metadata.xml
new file mode 100644
index 000000000000..46a304a17de5
--- /dev/null
+++ b/acct-user/cvmfs/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>sci-physics@gentoo.org</email>
+		<name>Gentoo Physics Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/openntpd/Manifest b/acct-user/openntpd/Manifest
index d45b36ed01a6..e76b418f18d4 100644
--- a/acct-user/openntpd/Manifest
+++ b/acct-user/openntpd/Manifest
@@ -1,2 +1,2 @@
 EBUILD openntpd-0.ebuild 304 BLAKE2B a468ada3cccdeb5ed550ad40a685e883da50324bbb11e018b2bd9fa9f01a9f27e2292dd54d606dd4a552fcf22f5dcbfb123a73355bf1f49ce33743f593864607 SHA512 297bb885448780c72a9160e73ff2bab5480db7705ccb27219c252c816aa8b270f1d823f3810592a63e8589c413c5b217d064b6bed6005f42750825129f38857f
-MISC metadata.xml 483 BLAKE2B 09372f290c803499c983974a2ee3f1c20964524256bd64fb6bd38b510b7611087392ad740bdf2a5b866e9ebdaebc8c3889af85b550efa0dc7fd142105ec4cbb2 SHA512 3af86a0d6b0afaa1ffca7a388becce85facd57ca1dfbf167ebba25261e4d4e5b9e8867c4d7f7b18e3f580993feae64e274433b39b36838eeb87b2a0380e90299
+MISC metadata.xml 361 BLAKE2B e87dd9324a648e9653e2c9765fce14c381f62e6a0a1ff8a37fba42ed632e3e6b97e3e6ca6b63d72cae77009318d37e2eaf767c072cc378e4304ac79eaee29b8a SHA512 62cbe01f116c560b2c2f5ac9419d8de3c262291cc3a12b529ffc71fd366de0bb1911e5564bd55cb6cbdf9d5548ebe0415c5ed0d5048c5883be17e00554ac33f6
diff --git a/acct-user/openntpd/metadata.xml b/acct-user/openntpd/metadata.xml
index 4fb2c3dd4699..9c1fc34df050 100644
--- a/acct-user/openntpd/metadata.xml
+++ b/acct-user/openntpd/metadata.xml
@@ -5,10 +5,6 @@
 		<email>henson@acm.org</email>
 		<name>Paul B. Henson</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans (proxy)</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/acct-user/sabnzbd/Manifest b/acct-user/sabnzbd/Manifest
new file mode 100644
index 000000000000..26b3838525cd
--- /dev/null
+++ b/acct-user/sabnzbd/Manifest
@@ -0,0 +1,2 @@
+EBUILD sabnzbd-0.ebuild 287 BLAKE2B c9e0de01f7b6d995de39737ff63858fe5e5c7ac801f06a6e23f10bf891162bec98e1135914587bebe696ef1aaf7fbc72fb6869f915cbe64bc11dcebce79f82ac SHA512 2c3a6762fdc1302c8ef73aaad3197b79c1bf543b9f9c73cf8aed5596b0b5fd1ac548865f9672149a62ed13eab3d3ab8beac47e608a7cb24c628a422985b51e69
+MISC metadata.xml 251 BLAKE2B fb85d245662fa1577cfe1d77526bd34fb2a674dd447192f2defe78b751423e3d14ae73efd3ac0e1e5e6fdb6259622a782e724ec77021faf526509f199dd20d61 SHA512 46942a98ef7e36470d1169a5bc8839d25603e33c143cd36327a8a85fc14cb6bfb32247eb7608d92cc58a06cc8eef5bd64d6ec2d21e69a88632e4b936598aa772
diff --git a/acct-user/sabnzbd/metadata.xml b/acct-user/sabnzbd/metadata.xml
new file mode 100644
index 000000000000..a32d600f949d
--- /dev/null
+++ b/acct-user/sabnzbd/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>whissi@gentoo.org</email>
+		<name>Thomas Deutschmann</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/sabnzbd/sabnzbd-0.ebuild b/acct-user/sabnzbd/sabnzbd-0.ebuild
new file mode 100644
index 000000000000..ee5b6e7c09f5
--- /dev/null
+++ b/acct-user/sabnzbd/sabnzbd-0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="SABnzbd program user"
+
+ACCT_USER_ID=397
+ACCT_USER_HOME="/var/lib/${PN}"
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( sabnzbd )
+
+acct-user_add_deps
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 648bca8a0334..256bb6871786 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/caribou/Manifest b/app-accessibility/caribou/Manifest
index 6c8cfb33f740..eb0c99c9e499 100644
--- a/app-accessibility/caribou/Manifest
+++ b/app-accessibility/caribou/Manifest
@@ -1,4 +1,4 @@
 DIST caribou-0.4.21.tar.xz 426516 BLAKE2B bd5e27bbbdb08fc31edce3b65124177e30b6d51e0071601bcd84c325b5794ce936b3f782ac8639dca332c246e329773f462dcecc0f236f52aeb0dcc7c5607a24 SHA512 5fc0cf54a1cad50d41e659adbbb932b51d69d18951562f87497e99aaae17ac72b453b759dd7289ff8f68a79574dfce510b9de6bedc61408c14cb48b83eaf08da
-EBUILD caribou-0.4.21-r1.ebuild 2396 BLAKE2B d791626e6b290c47acacdc3538107e081359eb02767b52d0a669742874802412cd241bfaf9ee8a75a6c47c9265c41077bfcf0b01e1b355125f14a0b92a4f71fb SHA512 3ab2ba6f2ffa90153b6bce388f6761e05746d6bb4284bf7c249d3a5322bb54d2cba02463f736da3580a80a3dd5a17207366b3bb8ae713d8dfa05b4bf9d46acca
+EBUILD caribou-0.4.21-r1.ebuild 2395 BLAKE2B 963a2a1706c3479c7ff7190e8e4abab5da42a685125073857b214a2de7a2a04f6762fa0001d8993e60f4b5dd84ec3386eb2a98c7979ab006b393f1a92d841460 SHA512 ca6faadc8128e23dbc6971b913af342b7f0b2710269bd0601700c60931364716db36884b8416e630cf62cfb6e2504be492b6eaa460f09958ff0f5b7c3d34b4c9
 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-r1.ebuild b/app-accessibility/caribou/caribou-0.4.21-r1.ebuild
index a6ab60c8d630..cb451983b1c1 100644
--- a/app-accessibility/caribou/caribou-0.4.21-r1.ebuild
+++ b/app-accessibility/caribou/caribou-0.4.21-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Caribou"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 4acdeef5de3d..b9e358f9847b 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 80a7c3b46d84..f7a71c808a45 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -2,5 +2,5 @@ AUX apache-tools-2.4.7-Makefile.patch 1695 BLAKE2B 8fac145613ac9f587e49bc6932c57
 DIST httpd-2.4.41.tar.bz2 7072373 BLAKE2B 88a2390736209d5ef04bffcb867bc8d6019302885e6f3cc63d18123336d4d0657252105a3bfebf4e91b8daa02119d4a61f4c0a9702244858a3193ec6cf681c0f SHA512 350cc7dcd2c439e0590338fa6da3f44df44f9bb885c381e91f91b14c2f48597f6f0bbac0ea118a8a67eaa70ae7edbb769beace368643ed73f6daee44c307b335
 DIST httpd-2.4.43.tar.bz2 7155865 BLAKE2B cd85c7e25500f8f1b4bd6ac5f715718a61bf548dfaf36408a970d27bacbfce256e4dda255ba5b62f89e117c335d0568d6207c93e5fb0d2b1ee84dba4ce0d4bd7 SHA512 16cfeecc8f6fab6eca478065a384bdf1872f7ac42206b0bc2bcac6c0d9c576f392c07107201f39e0601dec1bbafcb33d66153544de4d87d79b9a52094d334b64
 EBUILD apache-tools-2.4.41.ebuild 2552 BLAKE2B bc670330d77922c330dbd5daffe6377d71e4842ad61825de0bb34a2c9f77767ce540fc2372fbb91eb1ab83e9b01f469b87bb4667393fccb4a939b4099b600100 SHA512 26bae9a18cd88d274412a224be8e07c15685da56024b0c747d0c738a6d17e2f132032d2867e9f6530470d39ccabe2922406455c722a30105653b5ff2ae9a9ada
-EBUILD apache-tools-2.4.43.ebuild 2554 BLAKE2B b11b024db71d50c7570aceca3fde2d27f31f01f315a156233030d0039c9bb14a3067b086d7f7ded8334f17003b44de7e4f642e669e45a4c6ec498bc8ce00f510 SHA512 722507dbe3dafc683dd1b6c98907b61c708ce19eec33014dc5c02b68610305c8ecb687ddf47154199deb107e8647a7b267c81e194d49201671c92f957fbdfab5
+EBUILD apache-tools-2.4.43.ebuild 2552 BLAKE2B bc670330d77922c330dbd5daffe6377d71e4842ad61825de0bb34a2c9f77767ce540fc2372fbb91eb1ab83e9b01f469b87bb4667393fccb4a939b4099b600100 SHA512 26bae9a18cd88d274412a224be8e07c15685da56024b0c747d0c738a6d17e2f132032d2867e9f6530470d39ccabe2922406455c722a30105653b5ff2ae9a9ada
 MISC metadata.xml 580 BLAKE2B 013a1f5cecbfa1086e720d341855be076e98b313f03ad99147bc692a5988fc6e0006545104cfe245798f88ab617c6e2c84928d0a73d127715dcb8ba352e8aa94 SHA512 611ed7b76b150a829902110a843a5a97622d2ec645850b6988c578496d716019e511830767a0c3dc300c69f02b5b933c806ea5598f6938b5d6b9d14b58985122
diff --git a/app-admin/apache-tools/apache-tools-2.4.43.ebuild b/app-admin/apache-tools/apache-tools-2.4.43.ebuild
index 4eb119a439b5..45f315f173a1 100644
--- a/app-admin/apache-tools/apache-tools-2.4.43.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.43.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 IUSE="libressl ssl"
 RESTRICT="test"
 
diff --git a/app-admin/cdist/Manifest b/app-admin/cdist/Manifest
index 2cc476c54047..635360cc03bb 100644
--- a/app-admin/cdist/Manifest
+++ b/app-admin/cdist/Manifest
@@ -1,7 +1,9 @@
 DIST cdist-5.1.3.tar.gz 915245 BLAKE2B 5fce58f6fcbd48852e1c0c5568b72c360e74fd49b5321e2aedfdc8e48fd090cbdd7bab87a94e76d087f04f5a706bf2c7b1bebdc5a80867e26d8cc6e28afdeab3 SHA512 8330a5af80dfc07da722675ae1d402ebae4ba0aada451a02d782365d68d1d43a643609f3326f5ed793d2902838ee29071c0255c9d8a9d38c1e8a7c92a24cef46
 DIST cdist-6.0.0.tar.gz 934813 BLAKE2B 3cb18ebb3059fc9a37beb1567c691e1d34a9cde5d49081e8798b5ba86ea8da3b6c964d2c8bea7bf2f04f986b0b4a8766c8ea53ce48fb4bc024264e72efec1fcb SHA512 e846060f3020d6281d41e97b9cc33250cd1d4ae0d110a2792fc2447af110fef91199fc0382d5a1e501f487fda42f703957ff5a39cf28061338609a600290d792
 DIST cdist-6.5.4.tar.gz 898002 BLAKE2B b4565cd8112ce1bff6ac74625a5920886a708fec827f70c3a3a2df156408761badebff4e161900cd09685bfbbb4954927c9771f6516c54a510b582ebec075e76 SHA512 3f1405e1b28d7568ef3ae543d59e760b2dc1fc8004be031550ba52d3aa2d8911cef4325865fb9ed5df053ec1609a076bb31a520b100bad5811f0de9cd73f416e
+DIST cdist-6.5.6.tar.gz 950790 BLAKE2B f13927009eb8c0172ecc0d59c1eb90fccd17542beed21033f17cec0746f6a41d5f9b39103942ffadf5a45251f49d97bc10ac82ff94bd5cd05d86c48f5d4f839f SHA512 b62a62feca742be233af9602b9216408c68cc66f114d9e581619f564359ccddc23a54257f16d70105476b76f6ba19ecd8937253f01dc479f806609e11fde8741
 EBUILD cdist-5.1.3.ebuild 590 BLAKE2B c587b9ffe196b672e600f80c521138e46c838ab3c2c93165299fe58037957c93e4a9fed227705583ae877444d76b81d466827e283af24845127de848594b6308 SHA512 64de373a0834108dcdbed4ad81b6747aa14ef5c568b341ca8056c4d7eb369cabb543d02d252b5cd3c89832fc9a5b1192640072e47594ef2d9c5312e1e6d6d60d
 EBUILD cdist-6.0.0.ebuild 596 BLAKE2B fac03ebac640f9a3c0675bf239849276005d9374c144cfd342bff70bec164883dc3b7aa5c820d28abff14f0a48c7d49380cb2940758cac0b49afa0f0853db3b1 SHA512 265a2362ccd5bbbce39d85b975a0a938b15e790394ae3cbabbbe6244a9e7c65db6248205484927627bc13c6e7bbb3e54efe35c9a7c801d00c4469ead0b4547ca
 EBUILD cdist-6.5.4.ebuild 646 BLAKE2B b590d8fd0f7794c433908ded86c9b1e53007c8bdab64610d94b2d086554ccfd066e83b9b282ef7d29d6c754c8296e6d07666c7e03378aee9edc7f6c3a560e3a8 SHA512 653898d859c35fa4551d95f5d4f84431784d4e48430f4c0ff00e40e92934efa08532ffae6bb74157af19bfdbe78948de1eac4a4fb44af49c312db5fd4f62be56
+EBUILD cdist-6.5.6.ebuild 646 BLAKE2B b590d8fd0f7794c433908ded86c9b1e53007c8bdab64610d94b2d086554ccfd066e83b9b282ef7d29d6c754c8296e6d07666c7e03378aee9edc7f6c3a560e3a8 SHA512 653898d859c35fa4551d95f5d4f84431784d4e48430f4c0ff00e40e92934efa08532ffae6bb74157af19bfdbe78948de1eac4a4fb44af49c312db5fd4f62be56
 MISC metadata.xml 240 BLAKE2B 1dc43622dbc22a70ccbdccd82d2fa3c54b7bb985e0ab124812aac7a453546a46ffa6bf205b4b8e72e014cad9ee017dfec3c4430881277b3463367418bf4f76db SHA512 bedaadadb9b7d70f72dde98c058a74300749effe632f00af0f693a9bf826076d02773cc39bb5b3b813fd2ed24cedfaf3cecfb8cac81ea561d288286840cf1f1c
diff --git a/app-admin/cdist/cdist-6.5.6.ebuild b/app-admin/cdist/cdist-6.5.6.ebuild
new file mode 100644
index 000000000000..ed4bd09b8c98
--- /dev/null
+++ b/app-admin/cdist/cdist-6.5.6.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=( python{3_6,3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="A usable configuration management system"
+HOMEPAGE="https://www.cdi.st/ https://code.ungleich.ch/ungleich-public/cdist"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/dist/html/*.html docs/dist/html/man{1,7}/*.html )
+	distutils-r1_python_install_all
+
+	doman docs/dist/man/man1/*.1 docs/dist/man/man7/*.7
+}
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index c826718308b8..51dec70370df 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -802,8 +802,8 @@ DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.zip 94436 BLAKE2B
 DIST sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod 74 BLAKE2B c2d88e59e640cf540f7547fa0b67caeecd7424a1dc243681a020d233fab5126dc11f73c18032e0eb8edc7bf9d32dc2902183bf76af255f60f186f16c97055e2d SHA512 94785a6d41763ef86959d6ba291cfb34eb7b35f6599042299604fe6f35a666fa388e9d7bcac282d1370dcc5f99c6ac22f2b677ff9b9920aae8f0d9097ea224c5
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip 18120 BLAKE2B 244d3089322264e2fab71fa27e6e49396f724026674970eac309bb027d7bbc7030e9780fbc1c3803b20d893b8621f4e24d5c7824e0315440c14ceb850ec391f9 SHA512 c6e23fe09971b82d52e14d67e68458d3884b0f1d56a7fa9131fe4dafbfa971dd1f134f2d9eeab2599eae02c96132502036fd6b37eda92cd62f3129de6e04e7c3
-EBUILD consul-1.7.2.ebuild 27440 BLAKE2B 6ece05524f485c1297c5a4e3e7a3555b9bb5853b4169794dae863e999739b4bac7af100dac5ce935ce64681b76194c761806ff6f499a797f30bf6cddad85c05e SHA512 835286d9a0c9e13e25a12fa37f7a09775887fce5afbc33571da8895b3ecc1234b93a593f7a666676e43bc793c8899f1c8648134bde809876f635ef4e1f2f0b9a
-EBUILD consul-1.7.3.ebuild 25691 BLAKE2B 0d14b3f078795a2d12206831aaa88a3f7d81c09b2dc01670184248465da85e51fcf173c0d7474048aadb9669b592d028e34ba029f655b8c16040353525f2d6ab SHA512 4e9302a5ec31165008cda9423a8b664ebf8dc265936a3bb82ed2ede3b1151c72dfe6ee74ad541b3b3cd263b894da282c95b8f67a614750e8fdd56d58d0a00cd0
-EBUILD consul-1.7.4.ebuild 25691 BLAKE2B 2106e3e6d6237db32b7064f59f8854f626504ee3ff34b34a3ea894109a446c0658087d7a0dc3656b684bff652da45ccb0f021bf702aa8c245e0d0a87c835421a SHA512 cf428aaf14f1bf5caadf935356447028a2dd473fc57af83d109969117bc5a4fd5662b086369b520b0b1628bae3abcf88584b747e438c265a01e935a14bf97d2f
+EBUILD consul-1.7.2.ebuild 27458 BLAKE2B 0ddfe1a5852dfb12f2df681710ce92d01da09a73642aea64a07e31d27999a85328642dace5ab0182adc87bff2805e019df16c3ec272244fe87bcdf204e4dd40e SHA512 053d5aa676091c3cc32231af848b71faaf8a853fc77b6e487fa58f05dd9907acea4dbb9d1953a9363400b86043b8a40c8cdc9c3ff48c8e6eab85bd581cf4f504
+EBUILD consul-1.7.3.ebuild 25709 BLAKE2B ae78263543992fc46a37c9815df49daea9ab67ad7f6bd016ec7cb6b88ec54738514ac06f51e16b95524b68c4517ace27caff27e45afa938eb7a1f73d868a042e SHA512 425341d37096709ab5a6f06e136442828a366f31533fc067115692a815bf9204de15963481e83a0f8cfb1e0d3f47b7e5bddbc9c512c2ee315f6303f910cf9335
+EBUILD consul-1.7.4.ebuild 25708 BLAKE2B eb083e6c49e6c4d062bb15a475dc88fdbeaafd394d396d17c245bd14eeaa62c31dcd598b9baf7e2508dd78e0c1f0ba8b05415509b38caedb9e3ca759ed74822a SHA512 7791c5ec933ab4cae9f108c04506d0e57a0abffa4b3a0956cbf4cabef13af69decf000ae1ff2e273585b80ceb61849bb4ef8c31fa8c4dd35b0423fb794f87937
 EBUILD consul-1.8.0.ebuild 36543 BLAKE2B 334022150f621a6c27db79789164c8b618a9cc0f0863357c8b37ff5cb9e242b4c0e146cb56255476dde9e607067d97b6b89f9682466a154f2f5d28747d9e01b4 SHA512 470377dc362892d28e412efb6ee7caedb15f02096a668b395550bae90909ea18763157979ec0ac9f637188bdf67a0ecde006561aeb1b250e52bb1b79a4601be5
 MISC metadata.xml 391 BLAKE2B c60fccfb61459803d5e9cff21d68525df118fc15b2390e805e3358b4e50e19a6eba6e06c057c5310797a9ba533f0d24746c95d8160a67e285732e7adab9b7fb2 SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb
diff --git a/app-admin/consul/consul-1.7.2.ebuild b/app-admin/consul/consul-1.7.2.ebuild
index f7ec296056a0..52f7b83a48ed 100644
--- a/app-admin/consul/consul-1.7.2.ebuild
+++ b/app-admin/consul/consul-1.7.2.ebuild
@@ -514,6 +514,7 @@ SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.g
 	${EGO_SUM_SRC_URI}"
 
 LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
+RESTRICT+=" test"
 SLOT="0"
 KEYWORDS="amd64"
 
diff --git a/app-admin/consul/consul-1.7.3.ebuild b/app-admin/consul/consul-1.7.3.ebuild
index 725c0e7d3214..5ba5232b6488 100644
--- a/app-admin/consul/consul-1.7.3.ebuild
+++ b/app-admin/consul/consul-1.7.3.ebuild
@@ -475,6 +475,7 @@ SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.g
 	${EGO_SUM_SRC_URI}"
 
 LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
+RESTRICT+=" test"
 SLOT="0"
 KEYWORDS="~amd64"
 
diff --git a/app-admin/consul/consul-1.7.4.ebuild b/app-admin/consul/consul-1.7.4.ebuild
index 742ba270e8c4..140e5eea9226 100644
--- a/app-admin/consul/consul-1.7.4.ebuild
+++ b/app-admin/consul/consul-1.7.4.ebuild
@@ -475,8 +475,9 @@ SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.g
 	${EGO_SUM_SRC_URI}"
 
 LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
+RESTRICT+=" test"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 BDEPEND="dev-go/gox"
 COMMON_DEPEND="
diff --git a/app-admin/fam/Manifest b/app-admin/fam/Manifest
index 1c7dc05e1a89..b5b376a0d63b 100644
--- a/app-admin/fam/Manifest
+++ b/app-admin/fam/Manifest
@@ -1,11 +1,13 @@
 AUX fam-2.7.0-AM_CONFIG_HEADER.patch 242 BLAKE2B dd0c34f6f4e1c7b9b1893001faf911f428dcf7949828f5ea1fa448aaadad98ea1e671ea49ef5e1e619396495f8a95c5e2874550e4aae5056e1fbf00ed600f5d8 SHA512 874c2242dd3b1300fd87da5e13674a25d426bba688fb4dc9d80914392f9934050a1c9f338cd5591c170bfb1fb30bcd12c85a5f75d1687fff61d41ba85b3ab5e2
+AUX fam-2.7.0-bindresvport.patch 233 BLAKE2B 24524a5c2ef0cf7464ea552725e8e4752dc5eb7a3a7c7ca14f07dc66d508d52b78fa33247d8e093086d234ee53c89a9181dd22428a1849d2436c69f3e795811c SHA512 d9bba85cb4874409feebf4047d748f34e4c6174883bad5a0d6bbf5b36d08ebf9b9a17d6a2fcca4081c32f787a410d52f062d3ca15fbba615d7dca24cbb2c5f47
 AUX fam-2.7.0-out-of-tree.patch 262 BLAKE2B 06a18408ce56a9502c6ff779ff48f884d77d4b33b4dbfc0e35fc4b2fbd41cb268f0bcb272dc2575c8acbccd4e426c5ad83ecb1c1bc4138c29c0314c4f8e8bfdb SHA512 20e92a60b67167aa29e699dd61731e5564a22243cbc0634903421545f6918033bce9849de2d3f665ecf3fd24406dd9fef98c98e3d49759b632293c773c4ac813
 AUX fam-2.7.0-patch-header.patch 3292 BLAKE2B f6e96ab2ac33ddfee2efb20fa32c010d1d554e83efe106191ace70001cdca9de80c0c845ad997cc1ee3efb007769032e2c7904c1acf18a3a56a75155f9898b22 SHA512 055ee28f30286f236436e84fde4b4c89736252216f3484d8f068c3b5f285adf9de78b87007c18f4d6752246b9595d9cf1d3e1ac4ab6cad6b96a3bb9e9f1ba334
 AUX fam-2.7.0-sysmacros.patch 343 BLAKE2B c4b1d4ff996517f9c7a9f17b3e4a7c12053fb4fde9af64e3dbf1a57e26db377951331fdd54fd46982776cad342c6836f09034292a8e198d814e6ed72b095850b SHA512 474ab9d24175d6b3a58d05bc463a53979dfafbd67cf92f892cbf0e9f9330cc8e4b5a34aff261c052fd1080c09c936c0195432404d608b669a824b455d243f3c3
 AUX famd 393 BLAKE2B 5e6fd2f1e7eb9c48fcae90da144a1b6953e2469d0e4f3c7124e5f71440ae2de5195179d0abc969ef11fb59cb2290d541518e36a983e98c735d36837ca0ae8e29 SHA512 ddad96e311a678c5907086b69a6478c5c6e735ff2614846585a2b26476a5049ab90f984d82eba5ba3f0175c3675d478e2abdf4ef2bf98c457a9e1304324979e1
 DIST fam-2.7.0.tar.gz 301974 BLAKE2B 9a915e61b2898717cac1b7bbe9b2049aee0701314710906c5c8323aafe0847a9f017d09c4d9345e1fba386ac3c1001ec013325f9841d716e8c91e35bcf1e3962 SHA512 62b6222ee925eb2af1e258097c9bb676191690f38f8504ae16b1883a1019e0ac6dc7116ac2c4c596a956b3b3cfc3ce3ee7b613c319654681afb13e3ad3f284e2
 DIST fam_2.7.0-17.2.diff.gz 28826 BLAKE2B 880f8614304b048a24be03231ec26a02901befd75c8c5d51abf07d5afb42f370f4d3702d0db790f2f651f040372791024d9cbfbea15a1932629fb13a7b6a5ec8 SHA512 295c954fcecb7357a72ecf3c7469bb37c29e8969fc7be3a0e92e40e79911c9578f44c42a0a6f900610c8a9886f1addc62e50f258105aaadb61c718f526608697
-DIST fam_2.7.0-17.diff.gz 28056 BLAKE2B 4db010fdf7a2548f5651e9da876df63d3bd0d1a5f184b26df99f7d4204bbcbadf4c7672d248d9d1af2e7297b0ec17a5ec80e6b57016774877465a957ae3c6ae8 SHA512 76b14e1d17713eb86d52cb804d34012e5369b5f4e8bcbdc73a063d2ad9219e0c4a261cef9e144ee07744a953a2e893bdf2ceeefcf21edc7a2ac5e70a51a8e209
-EBUILD fam-2.7.0-r7.ebuild 1450 BLAKE2B 8a07222d9613854536c79a7e4414c5a39ec109f6e4f18357d55cf70a37e6cd6e7de6c9f25bd99a94466070ebe29cf0e98d5629aaa56f903cf6910aab7c5f3328 SHA512 3dae6e50db3341f49781c74f3fde0b1230c5d730008d1948b566ca9bf429e038b2b5688b5bcead621a224a09a8883e87b70bb2c4d9173f1a77753605ad78c6e2
+DIST fam_2.7.0-17.3.diff.gz 28847 BLAKE2B d46e0d60d438459b43e24d2757771f02f3b5eec1b297f16a0359b26d14fbfba9701ebdc63d9b4dbbe2247cc7b38b9670ed9900a896224a3c4d8affc1481a8a79 SHA512 67d339e1cd4409897b044aa9b4c755a43b939982ee70c0ab5d99afd807994ad1f571a52bf04125a633cc3a735e99ff9e156caf2fb4288f5c008121a4eb9379b6
+DIST fam_2.7.0.orig.tar.gz 301945 BLAKE2B 9219c15b998bbac49e76eeac86f2de666ac49dca773c82ff6220c11ee77f0381b93ddbeeb500a7775bff3cc29ad6e7008e12304f0b0e361cbcc951d9f995a229 SHA512 dae6e883ef10214b1506d342e32cb5c59d0b4b7b66c1b099daa836958651ff3b04d526b4e516abd96e51587a97a8950e9517d1b38c6f7e6637ee3e7d20243531
 EBUILD fam-2.7.0_p17_p2.ebuild 1768 BLAKE2B a913d5b761c70f175d9f7e5f9666881f2f054fda5dbea96fa613bd0841eeba15ef5cc2905bd139d96af479f813b985c7e2e27a2312434ff0e50d99625b0d9a2a SHA512 38dad20f2f0b2a822ca6bb1f6df5e8339657e562f1cf19db2454901e0b817ea6d6ae5166fa57e47574199b7e4939c9687d1f8b23648922206cbbf5101c20bcf9
+EBUILD fam-2.7.0_p17_p3.ebuild 2003 BLAKE2B ea0435726b29f434a9b909bf54e89d78f23cc069a4faa0bac9a2c659d549e25c3460f8265d4f447c8d991e4edcad29d271a789c0236a31be9843494ce04ce78f SHA512 a0f1cf4708563f3203fa014a9799c9dc75814779371c0e7b6646093dc622a79da2504c7db11758ca9fa51fbd3782885da0310ac303118517e2302ceb1ce02555
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/app-admin/fam/fam-2.7.0-r7.ebuild b/app-admin/fam/fam-2.7.0-r7.ebuild
deleted file mode 100644
index e756b4eaec72..000000000000
--- a/app-admin/fam/fam-2.7.0-r7.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools ltprune multilib-minimal
-
-DEBIAN_PATCH="17"
-DESCRIPTION="FAM, the File Alteration Monitor"
-HOMEPAGE="http://oss.sgi.com/projects/fam/"
-SRC_URI="ftp://oss.sgi.com/projects/fam/download/stable/${P}.tar.gz
-	mirror://debian/pool/main/f/${PN}/${P/-/_}-${DEBIAN_PATCH}.diff.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="static-libs"
-
-DEPEND="net-nds/rpcbind
-	!app-admin/gamin"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog INSTALL NEWS TODO README )
-
-src_prepare() {
-	epatch "${WORKDIR}/${P/-/_}-${DEBIAN_PATCH}.diff"
-	edos2unix "${S}"/${P}/debian/patches/10_debianbug375967.patch
-	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${S}"/${P}/debian/patches
-	sed -i configure.ac -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
-
-	epatch "${FILESDIR}"/${P}-out-of-tree.patch
-	epatch "${FILESDIR}"/${P}-sysmacros.patch #580702
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf $(use_enable static-libs static)
-
-	# These are thrown away later
-	if ! multilib_is_native_abi ; then
-		sed -i -e 's/src conf man//' Makefile || die
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-	einstalldocs
-
-	sed -i "${D}"/etc/fam.conf \
-		-e "s:local_only = false:local_only = true:g" \
-		|| die "sed fam.conf"
-
-	doinitd "${FILESDIR}/famd"
-}
diff --git a/app-admin/fam/fam-2.7.0_p17_p3.ebuild b/app-admin/fam/fam-2.7.0_p17_p3.ebuild
new file mode 100644
index 000000000000..339c46f75395
--- /dev/null
+++ b/app-admin/fam/fam-2.7.0_p17_p3.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 multilib-minimal toolchain-funcs
+
+FAM_PV="${PV/_p*/}"
+DEBIAN_PATCH="${PV#*_p}"
+DEBIAN_PATCH="${DEBIAN_PATCH/_p/.}"
+DESCRIPTION="FAM, the File Alteration Monitor"
+HOMEPAGE="http://oss.sgi.com/projects/fam/"
+SRC_URI="
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${FAM_PV}.orig.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${FAM_PV}-${DEBIAN_PATCH}.diff.gz
+"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="static-libs"
+
+DEPEND="
+	!app-admin/gamin
+	net-libs/libtirpc
+	net-nds/rpcbind
+"
+RDEPEND="
+	${DEPEND}
+"
+DOCS=( AUTHORS ChangeLog INSTALL NEWS TODO README )
+S=${WORKDIR}/${PN}-${FAM_PV}
+PATCHES=(
+	"${FILESDIR}"/${PN}-${FAM_PV}-AM_CONFIG_HEADER.patch
+	"${FILESDIR}"/${PN}-${FAM_PV}-bindresvport.patch #729120
+	"${FILESDIR}"/${PN}-${FAM_PV}-out-of-tree.patch
+	"${FILESDIR}"/${PN}-${FAM_PV}-sysmacros.patch #580702
+)
+
+src_unpack() {
+	default
+	cd "${WORKDIR}" || die
+	tar xzf "${WORKDIR}"/${PN}-${FAM_PV}/${PN}-${FAM_PV}.tar.gz || die
+}
+
+src_prepare() {
+	find "${S}" -type f -exec chmod +w {} \; || die
+
+	eapply "${WORKDIR}"/${PN}_${FAM_PV}-${DEBIAN_PATCH}.diff
+	edos2unix debian/patches/10_debianbug375967.patch
+	eapply "${FILESDIR}"/${PN}-${FAM_PV}-patch-header.patch
+	eapply debian/patches/*patch
+
+	default
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	tc-export PKG_CONFIG
+	append-cppflags $(${PKG_CONFIG} --cflags libtirpc)
+	append-libs $(${PKG_CONFIG} --libs libtirpc)
+	ECONF_SOURCE=${S} econf $(use_enable static-libs static)
+
+	# These are thrown away later
+	if ! multilib_is_native_abi ; then
+		sed -i -e 's/src conf man//' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+
+	einstalldocs
+
+	sed -i "${D}"/etc/fam.conf \
+		-e "s:local_only = false:local_only = true:g" \
+		|| die "sed fam.conf"
+
+	doinitd "${FILESDIR}/famd"
+}
diff --git a/app-admin/fam/files/fam-2.7.0-bindresvport.patch b/app-admin/fam/files/fam-2.7.0-bindresvport.patch
new file mode 100644
index 000000000000..1876ca0c235c
--- /dev/null
+++ b/app-admin/fam/files/fam-2.7.0-bindresvport.patch
@@ -0,0 +1,11 @@
+--- a/src/Listener.c++
++++ b/src/Listener.c++
+@@ -44,7 +44,7 @@
+ #include "Cred.h"
+ #include "BTree.h"
+ 
+-#if !(HAVE_BINDRESVPORT_PROTO)
++#if !(HAVE_BINDRESVPORT)
+ extern "C" int bindresvport(int sd, struct sockaddr_in *);
+ #endif
+ 
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index dea036739ed0..947d973b9ecf 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -37,6 +37,7 @@ DIST filebeat-7.3.2.tar.gz 49977990 BLAKE2B 6219a382b415572fdea2ff4b0aa3f02b3c1e
 DIST filebeat-7.5.2.tar.gz 64360149 BLAKE2B 2bcbe19b9354c7039c652e6edd4b2cac688b136188f55caaf070dc9d60bd775eb2f0a4016725bf48baa5d26a056f74226d6bec09d1909fcbaf36ad2703d06f2e SHA512 8911e05b489e07f4ec6ee6397e916186ad618bfe97c43c509d564a828a1938eeea6c57cf66f2e93216b5d6b3958e0450d3aab24b65ef7209f0040f66ee36e74a
 DIST filebeat-7.6.1.tar.gz 77795975 BLAKE2B 2ca420b339b96baefff5042dba456fe1086dfdc5ccc1503609ff1989d79952709347662be60b18591e2b1a9f6557bfb942429b9aa6412dc02072331c8918c95c SHA512 c4f8daff002fe393b95f00b47df1ecb5566a69a9345bbbe1caceffecd8d413e3e9886f30cd4f2914579526db3de92c036c78fb37d703d447567fe921275b5fac
 DIST filebeat-7.7.0.tar.gz 90104462 BLAKE2B d044ec00bcae08745d012e49fc3cf9369b201da68ee2bfca2ce7f91ecd74c78e7c48d2045e539b6752c164e4c3f6cba38a00f1ee7a82493e008f6be49581b5d5 SHA512 1e0c7cc77b90cb3764d62db23a5a66ac3214c97a2f305c46f568ccc91a21f247c9e42c91a0771c9fc7500f6d0769e3d224b81a2c76399fd2bc6edd5afa1cb367
+DIST filebeat-7.8.0.tar.gz 95390157 BLAKE2B 47f321e4515a0b6346c210eafc5dfe21e9c5d6ba896e19d1fa73758822a6c5a2d029030ce8a2f81d1516bc884167f77ceb671d78f991e3c055444c7417e0819b SHA512 a17b39b590d6bc7e23b74a63f4cc3dcb5defe26dbe1af1cc5dc007bcfc5b316a6b562889be572d2f9f0669db19e58b8920e06faad3c1280a8c0045481776afc1
 DIST github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.mod 372 BLAKE2B 80a7e0aac984acb79239b3309290cd8ef1eeca8d9f53b3c91628cbe6dd112706d2313c47e33ac52ea9e8a6417289dacae8e2e72a03e679836d3ed89cb86c0aee SHA512 6db1a52bbab1332ab7e761532cb110394afa1dd69cc5f7443c3fb733c7d95fa712cf6bf8a78fc3f51d89b2d368a248e532bab06bc93e2e663b8f836c91aef0de
 DIST github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.zip 29788 BLAKE2B c1e493471bca24ac64c8119e624ea077a74678a492b036deb907ede12b5e93c3ef699820cb2ec9468a98d00e83d84c6bb45cf274b4812a0f319a0248610a4d2c SHA512 a412fbe597ab0c47223d733303ed2277656fe35866f52e4ed1f25cc03b691f15f5592cb07b3c5fb39d4cb98c6d73dbc8e1e7869cea17241a33dfc29db0a1d121
 DIST github.com%2F!azure%2Fazure-event-hubs-go%2Fv3%2F@v%2Fv3.1.2.mod 916 BLAKE2B eda68c483b29b920a2a3efafcf5b36b7d4f1c01bc5f55fefafc3ff9805cbf62a9a83a9d8f870319776a53f55d21efd52de8174ecb45c1c648e65d5e187be21fa SHA512 6fd1c6d13559028e1fac3c9cd3de1a914e5cd0607519de8b71e622b187168c377dc8bcc3de87c4905f0a7ed846b123885fc2dd9b8a4a6d9a49f7781a61ef53bb
@@ -108,6 +109,7 @@ DIST github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv1.27.1-0.2017061217410
 DIST github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv1.27.1-0.20170612174108-0f3b54da6bdc.zip 405931 BLAKE2B 462e19a9ef38bce32dadaef71455a82e5cb9bc314228816eb9a0abf2425bd0d450ac2aa152bc57b38aa79d76f0af46790c677043aaca66bbcba02f71d9c782f1 SHA512 adb130c27400012529b74ec93e7d615458eb2df28e9c7507eb6f05969288674a59b5d07edbb51729d304a8016e8054709a16d2663eff4c582f4c05d9ec50a623
 DIST github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.mod 39 BLAKE2B 040b84d78188cff54576ac29dc39bcb557c56bcbcdbf6767a3321163859ae29dddca6e8b3294490238eaca9da7281e6b48ebcc6045a38c5f31795d0a831103f1 SHA512 4d33264b51c07e85a857699f5dc7b1b8a45cf1a330d8bc333525cd22513c4aaa9ddb44530e2f3e47192b21c72ddbffe465c31672a4bb441b863d90020a631a4e
 DIST github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.zip 15095 BLAKE2B 94141df8d22f3961f193f9c107624666dee96f267a7e0c5bbbe70426433ed86dd9a617184e5ee31e668aed94f5f011a6529ec9a45b065a86bba84c2e81ce5490 SHA512 4b7371bb63b8b32da05ff5c5c2aa6e584f9c406164177b5ccad8165b8f3a4972683a4c0756bdb591d28f6b61f22784a391f443503fc3d8e108f92b8c4b6ce0be
+DIST github.com%2Falcortesm%2Ftgz%2F@v%2Fv0.0.0-20161220082320-9c5fe88206d7.mod 32 BLAKE2B 9bf3bf45ceb1891fcb6ecbd977b3968e249d293377508fc645c3fac44f8ebfa0e6aac924836fadc02888ac771c7d641472c2022a31f3c3b068ba94b0dc0e27cb SHA512 678d2ba568fcff09b59e5110b204af334fa1a8357e14194b88d67bc982d4eb3d9c26000fb6f2d51e2a2ce2424681c7ff203b98a5cd3d0fdcb32145a5f05b49e6
 DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
 DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
 DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
@@ -116,7 +118,12 @@ DIST github.com%2Fandrewkroh%2Fgoja%2F@v%2Fv0.0.0-20190128172624-dd2ac4456e20.mo
 DIST github.com%2Fandrewkroh%2Fgoja%2F@v%2Fv0.0.0-20190128172624-dd2ac4456e20.zip 210208 BLAKE2B 9dd3f1a962f3216de6aabe6aa39f74cb817454344918afab9c01c9a0ead3f5721dfbe787ee4b65a7080f2adf0cb9cd82bd688de529fe0708600dc34a71f8480f SHA512 2db3f933081369e6273660658dba52a9e374feb0c0bf8a2052915a76875ade611cc146dff4255e8ecbb55f5982a3fa8a1eb601784dfcc816c86bda590340f328
 DIST github.com%2Fandrewkroh%2Fsys%2F@v%2Fv0.0.0-20151128191922-287798fe3e43.mod 33 BLAKE2B 70b2db5f3e0c688d0365d6e7d53e7fbbcc3a2d79975554baa7b9b32690702ae6c2445999cdf2b7a3f0b833169a3812c4b8096f02795f935c81b8f964f4e34361 SHA512 ea84f042de76554155eb9ffd145c2a631c5b1cc2ada0bf13ec0441a1a78d9fd7a10f17d5d4c5b42a9a118d7dbe4212da3405ea07a3dbfef841ebc41dbabf5389
 DIST github.com%2Fandrewkroh%2Fsys%2F@v%2Fv0.0.0-20151128191922-287798fe3e43.zip 787949 BLAKE2B b3538ab585c5be437f5e4f20bc632b3d89e2a52b9d6aa3a8252518f8089a6d7ccfef00884b28a53ba39b9e058c3d5e35a731d29681b693431e0f86c2076120c4 SHA512 7b2ae93cd883fdd716aa7eeda35df51d624da4c0f06036b48d9e2afe4f6e1e48b0ed60c85d3c6c0350b8d3844ab9357be41c13ef08b052a8018c61cbbf5db145
+DIST github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod 35 BLAKE2B f41c90b71b4b9e1876a13df9703b57f52ec6d7fd4258a7c44bca15c12310b512e400b32715180bfbe4726887aa7284fa21832ca9f9eb1dd759ee7d0c627307ac SHA512 5a93ead508f4f5e229e5d0e59dc820840819d9b32158ddecf2d6dae7ee96ce92af6bd80d18a98e437cbdda5de6df6cac03f7b535017fa92ef868dcccbc6e1f27
 DIST github.com%2Fantihax%2Foptional%2F@v%2Fv0.0.0-20180407024304-ca021399b1a6.mod 35 BLAKE2B 42febcb2e06c46797f14a850943d1df3c0e15630f376b8f1c860cf4e26ae4e2acbb38947f1348f501665f719943510aa2c0ad091f336e635430408794e61feed SHA512 c3d0bc6de3cac8395d0a231f041437b4caf00a4678270ae447b2e76bba3a588a6913cc1df6ba438bf6dd361b48860c365e9d32af55575208bd0f4b705b0504f6
+DIST github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200326173327-a4c66dc863bb.mod 31 BLAKE2B 8ba7e45848280b2365b9c8fafcffd70ac32c1c22bca0d2bccb965b98f1aba961faba0824e33941ba06e7330a7e89d6804860ce16e0c0d6dcff77ad4d9f8e68b6 SHA512 f82c53780113048de082df94ef28072fbd86dadd4531270567ee8cbf31295b2590973c83992c2271df2cc1abe0cad808e4d8c5f7857e3dfc94768db69327d2c4
+DIST github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200326173327-a4c66dc863bb.zip 5551171 BLAKE2B 3a6ad27fe06908c831aabe57acc34e25cf2fb85750011d93ea2c77e78c6968c99aa5abc51e373a11ddfd27aae31073463f6c1ca576dc7e39c24bccdd4c06d32c SHA512 92662212b13315cb47d541e2f522c159829a31cf1a81070c9aa7c1a27b238a9cd2481306275267260b19a81a664ec7ce62ed79c21d24455abaf8da1d164b8037
+DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
+DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip 7144 BLAKE2B d223f96d7bdb87d77573fde857a61d518336b60ab04e2a3cafbbfde23ecd65511553d9bd6360b1a9c17b394f77c7cd37e3c74df827a65b0e79580e1695723652 SHA512 c3d4056c34241f73d9f79801ea6a6d03697f2a6f151ceb5239458cf50c715dab693ccc0b5593f51cde8e2fff5f4959c72ab4e95197be3f65cae8185b6cbda06d
 DIST github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.mod 34 BLAKE2B 2ee2c993fac070e463df0896b1eb4c2160acf22c1f404b58a17024f8b5f2630d2cd1ad6526c611de0b651cd0c7f0f687398fabea864e7e7b0cebeeb7676579e9 SHA512 75898dfee327b793e7f253f5555409433214a7fb0336f3c33122ae5b2ef66e22ac44970202f67ed5d94f2dc02701b8a0f62cd1d80f543d93d347d83ec26da8c8
 DIST github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.zip 14665 BLAKE2B c20de14ba0c48501dee0f4fc7d4c74ce6eb893ffae015dddc34c266c0dad3b89b7bbaf7b3dad87b7f732d6d4ac28e4edbf4b391a2450399257fed73085811c86 SHA512 4e5e94555ba2ec98840e46d482e453e25311ffecc4a745d3afef3a619e9700ece8c72f27e75b7e3017333516af1f373858a56775ef8b599737956170cb9de85c
 DIST github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.6.0.mod 36 BLAKE2B 00f87545f415969bb9c1dd290c293ab915421893bed1fd436be0e53e5acbde8618bbc30bf9954e5da491d127a9d492366413c2313be5d69aba09dcfe6efd90e7 SHA512 c6875fe8335e4bc9eafa2dbd4317455093ee3e7faa6392303e95545bc5118ba37a1088c253503514aa990c0f70a8f995a546416f86555e8d03496a64a0a96b85
@@ -176,6 +183,9 @@ DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod 91 BLAKE2B fad305
 DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.zip 114418 BLAKE2B 43e288a393932b03a27d91cd456cbef42c2611751d40e8a8e6c14d2b80f65990711a5be7d75e1f62b1eaef3d9eb8c9bcf3f51eb14a2436ca1dcb15b3b3a2ef16 SHA512 9df60d53633425f32d5bf594dd579ce61bee549c2672da2f7da39437031a8b0d27b7d3448adc6f9b20b230f48c355242ce8b01b0c5be25612165c53c73e10735
 DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
 DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.zip 57784 BLAKE2B 1f6e54681c062413577ca873cbbc251c2bb9df4de6339e1154d6b34aa146136ff9464629e419bea7f75afd9feb8b50bddee965160560b25dc5b4041e9d30072e SHA512 4e0f838a7752838dcdac70a96235bae7aee51242022ec2c27be99f4af7657ff5afda5b710be81e25539d2712e5644211689b556e9d8971897ab9f8bf1d3845dc
+DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod 29 BLAKE2B 6d29d882c7c8c863cc1cfa01de2e2347b09e8cf4470c0bae2737f7436ce6d6ab34eb6714eba9f869974c1c8d7a332bfb90ac842b9fb7a07bd1a4c8b0e460eefe SHA512 a41a722efe7f634eebd689a9793f9ee3a89924e6c7917008c6661761c8829d6a897dc71c496f761068c36c590a800f06bbefa4ac59f7761cc0ee2cc68ac5c14c
+DIST github.com%2Fcucumber%2Fgodog%2F@v%2Fv0.8.1.mod 42 BLAKE2B 09381800dfdb8d9ee9032e2eb53d51bdef9c0bc48fbed60431654485afc510f1af8282d675101a49fca885004998003d73545269a4d12ab14fe1338d49a976c6 SHA512 4118f2e16a9e96f4d68e003b92189b9b17f58fc57700a98fe0feaeb893f406100c5574aca23d40a579d95a67b59e2cd6dfdb4883fde356a868e6bca640961376
+DIST github.com%2Fcucumber%2Fgodog%2F@v%2Fv0.8.1.zip 624543 BLAKE2B b0d72f4b9e0eec70803fb534f2fa5e1044f89a5d97cea40ac6aa9398b74992cad76bce4c8153a1d0226fcc8fb6fd85fe7d8e098e611073daf3e7ac27e4b5a60e SHA512 149aa16651deba1db2399a721d726ac46160715ed3b940599e36ce7e6950a794b83127c05e20f1247714bcf9ead573b3813bcab06e5cb77a417bfca6930fae2e
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
@@ -184,6 +194,8 @@ DIST github.com%2Fdavecgh%2Fgo-xdr%2F@v%2Fv0.0.0-20161123171359-e6a2ba005892.mod
 DIST github.com%2Fdavecgh%2Fgo-xdr%2F@v%2Fv0.0.0-20161123171359-e6a2ba005892.zip 70819 BLAKE2B fd5ae4da731b41134f50866b12577544634694ad45abbbc92c23d59eacfce23b0dc64fbe1284218fe15013e1fb7d4adbc8b30ebe325ddb01f40209e63e1d7f41 SHA512 2db3f8cb2b13ba66a1ffec69ec6d5c774eeae09bf562f3e4eb7264ddd7ea5e37cfbd3521a911a4efe6a6defc0db58c0802b375b091b9f9dcbba27ff9c4c87558
 DIST github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20181014144952-4e0d7dc8888f.mod 40 BLAKE2B c010929388412995c2f94b2d5ccaa676a243b890bf41ef59250366dd3d7eca00b03ef6525ecd25a6a402da7acfef0c6b5875e4558a68a08066bb4e1cb65f3646 SHA512 b8dd88219c0e6b606247d416c25ac01e3592a162322610ae4a93423f2d83854c108d78a810e546232cbaea6be0f48618ca2f55d890b6a79aada85d9c9df92322
 DIST github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20181014144952-4e0d7dc8888f.zip 528684 BLAKE2B d611ba9fab72a4c04b49f464ccd43a4622d79b746d5da3a15d44c545c4f7b25d217c7fab09812de87d1efcc43be50faeef2db7e89d60aef517d90c1ff844f1b4 SHA512 646dd4628e8d3c6ab3e716d160b611c3d82d508330792b994d28d5909d2449f537ba45c5ce728c1a94335593d47581f8fedf6fbeafe3f4f20b7a802da1d2f798
+DIST github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200206145737-bbfc9a55622e.mod 182 BLAKE2B 27d2e8f155923769d6df395281d9d2967f2bee262faff767c586e851c1595d8c74db1f890809bce63cd9544c4dfcdbda89e518a25e1a8925ff78607940e2a374 SHA512 14925087284b332c5458fa81d0e92f2a33b4a59e98b93dc6c99e0943f03c13165e8dbe1a27fe5a4d78b62b3b3bdc84d634bc31f346a70301cdf7da7463c85f92
+DIST github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200206145737-bbfc9a55622e.zip 570947 BLAKE2B 77503e5f0f669cc6b53ea75a0c227c125022c30af4cfd86389f4381a9cfbc3b15cca21ebf633218e4261ba0d8ad8c26735afcbb5eb57cc8380aebf7d4b0ec69a SHA512 f7c4bc9355f36826d1b0c384e20238c9c461933b4eae6455b1828687eb62137d98969998d181046e36bd348690e7df22633413a294aea73af0420bd242c0f93e
 DIST github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.1.mod 40 BLAKE2B 3090a8e1737078a28e24c1a01f78a18ca2ab94c0cd297a9ab04f970ffe05a6db291561b893c345c1d4f023a0743adf0a769f58365251ec94e3925da9187aaf62 SHA512 de55ba427379e57d671a31a72b9295e8e7fbe3bc0b80d05e63ccd31c1fd7030e74fd39fb0347d87f10f19bed208df6317714b0d1028057fa40e633820d49a03a
 DIST github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.2-0.20190607222403-0c15cf42f9a2.mod 40 BLAKE2B 3090a8e1737078a28e24c1a01f78a18ca2ab94c0cd297a9ab04f970ffe05a6db291561b893c345c1d4f023a0743adf0a769f58365251ec94e3925da9187aaf62 SHA512 de55ba427379e57d671a31a72b9295e8e7fbe3bc0b80d05e63ccd31c1fd7030e74fd39fb0347d87f10f19bed208df6317714b0d1028057fa40e633820d49a03a
 DIST github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.2-0.20190607222403-0c15cf42f9a2.zip 6710 BLAKE2B 25a6519442463637a3592d4d45b9c7f691e51c4217662ae3c2789933dbf98a5a957b2d59b77e59b99f82cf494e753ce2b521ded79f17abfe061ef74bf64038ea SHA512 544cb0f6502ce883beb548f412c6b79394a84961a4d0faeb563438e32c3c4121fe623ae24b81109714eb58fb2f29fce90c20d227a03bb67396dc05fe927cf5d5
@@ -208,12 +220,15 @@ DIST github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.zip 24020 BLAKE2B 0fd01cf85e
 DIST github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod 34 BLAKE2B 37c07a43d4e36f25bb5bbc10a863a717fa114a5eb980f17942f5bc5b1d1a4f58de5301ce871ec5d41f5dae3f05edd7c03a5c9246317ebf089c1cff27d6634aa1 SHA512 53dd482245593fe74b94c319cf4f3079b47313a22aaa69ba023b9e60e8b5dc81177ecfac49e0cbd9b1eb6706f654f387301ceb00313f8cbe530b4dc24eaefe97
 DIST github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip 14089 BLAKE2B a825c998f5a7e6432a9d23f49fdf9d8559b8664ce6508468540530efe9585a98400bd38681a24b5a8b2d10b13c4ad91216f6c71153e8c597e3d2e8c8472622e9 SHA512 294682c312e079f96ac920c3f4e3dde7211e36622a378f54f32483e032f4df6f54a1f7314df7c73e2b7391bc559003ffe2bdb97380e4507aba7620ea4123d872
 DIST github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod 36 BLAKE2B d46b14a3eed14f8d5886e333deada157d9484ad3bab124d3d57d9fd6a39242c2272417df8bb31e08361f2be8b11dda9e96600aa800879f393c8753330eac4e68 SHA512 7ffd6ce59d5c5fffc6ee8e8f48e1e7114628ee2631abbb1a3591b794c23b2ce6dab10f67b8b76bf82c73e1cd8614313b2bb1152b829a8875425f1a603ee394d4
+DIST github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.zip 44017 BLAKE2B 598c6308995ba7e6874f08c56f5453d4f3b68146ee29fcf7677571cc07d39a8bd4b78fe2d7d706e57571f00807476be399b08104a0a8bc3b75cc8da6528747f0 SHA512 bad8443888a33c8ba1a18cf07b09d7401067b6924a2a076a00efcdf959a5d720c2040d011d0ba6d6f0b0844b9605928d9798e57a0ac39bf08c0856cccac317cc
 DIST github.com%2Fdop251%2Fgoja_nodejs%2F@v%2Fv0.0.0-20171011081505-adff31b136e6.mod 37 BLAKE2B 5403fe298a2290c20eb96a74f7f31398914773e73c700c8ed6458945b40e3df4711e8d2001df29d68e322cb5fbec4f566a6b4eb35aaec777468a09618578f6bb SHA512 baa4ebf37e9f35c1923c10fcb703bea1f4b992d92a567b7df8d185bf763d6947640dac436f0763e8f35c3a8e3e5c7a5cc1249986bab0ffd570011d4466dd78db
 DIST github.com%2Fdop251%2Fgoja_nodejs%2F@v%2Fv0.0.0-20171011081505-adff31b136e6.zip 9815 BLAKE2B d263cd677b17ac795fb6be116c662d36c44474029c96a2efdb17b2107c292f7f2240b2565f45ce1a92d1dfbf14bbf9ee5686ae1634b4b1839ce22ad2617e69e1 SHA512 651db3bc9d472dbe6814b7a94d564440ee43f6eb3cf72f94bcf7df266d998bebe334eeb3ec84ebb429825ade32f41f670da144e070fa4b2f9d265c4299f9c8d4
 DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
 DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.zip 26646 BLAKE2B 408dfc541d7bd0692010d6071f96db972dbf84b0e9dfe552db221cdcc4011f023dcfc12e7c9657696c9ad204c6587404f793b4785beb78d53462764a2da96c5b SHA512 fb53c8511a1538397edace6101699904f19e63b82143b56754ef2a62d457fd34f6bfa907d379964c427ad8b7d38fa9ad186bc66d4a103c7f118b8734324593ce
 DIST github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod 40 BLAKE2B 9300f3006801602e05416487e6021123ff345e36835b5f4841158bc87556afa086470218c3f2178d125baae065c1af3cb27e210a50173a5bc9a469c592758eb6 SHA512 fb616884898669f21d53576f0fb70c8babc38bb98da066a2cb77fa85ceab6bcc8775feea3d3bcec19ea3b25544c776b8d55ad82f8876da5d0ed5176768da735f
 DIST github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.zip 17986 BLAKE2B dd2bcaa3f080dc5ed1b1da8d1f2ab7573577e5dce76e23d323310419bb0e3128003715bb023c4c4533e8e3297b795b30a95801cc68129f19844f433026ff8433 SHA512 64d611c7646011f9ad2f9ac423a9ba8154d9e6713611dff5481cf585c18c0a2bde3f32b26ce8647134f2e8338c08fe32b0dce4f3ff591a8a2b2601e29ea1f00d
+DIST github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.2.0.mod 40 BLAKE2B 9300f3006801602e05416487e6021123ff345e36835b5f4841158bc87556afa086470218c3f2178d125baae065c1af3cb27e210a50173a5bc9a469c592758eb6 SHA512 fb616884898669f21d53576f0fb70c8babc38bb98da066a2cb77fa85ceab6bcc8775feea3d3bcec19ea3b25544c776b8d55ad82f8876da5d0ed5176768da735f
+DIST github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.2.0.zip 18643 BLAKE2B 193af083e7191c5003e7668f0f35ce83b40e04642f02337ff5194a60b654d0e9f0776355ced676f8c6482a2b006026380a989e9724b2c7d8a965c863daae8798 SHA512 a5093016b6559c7297cbbca1abd3b7e50ff34a9f57ddbc383a0141a04943a5e4784a54e44d0e722fe2ac011cb9d8bd4aa954b758ff1951fc99a8b7c5ad2a36a0
 DIST github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod 43 BLAKE2B 500b3a85f43db1d61f037f437b3290888204aef8b80aabf42d70c37607fdac86e8b1f7f4e41ad3709ad7015a78b934ed7d6d254522eb3e2baba4ae24619ea4d2 SHA512 da87f8eea5497796badaa6bdd1c67ae04e75deb7595f10739f30f20364f22e588a449aacf603f2c8d738b365ac14211c7cfe8e1bfb91f220f5c9d547007ad453
 DIST github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.zip 19526 BLAKE2B 87715fa440e98bd4c44516e419c0f0495da8fbad415c59361ac53008553c4ab16aaaf37581edaa6a50fa443b9ee28cb426f7e58a921f3a3490fabfa4248245fb SHA512 e8756683977e2dceeaeb1bfb63ec8fe4c7083cc1c7b242d59080a3078cfa5aa73d43f203470b140c1714a30a97dc843adf723243a072b7529c22e1fd72d7ac69
 DIST github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod 32 BLAKE2B 51c322074fb7a69418dcdfd2e54b187fbfe541c21a979c8bf8b155a6264cc670eeaa95c2949f2b760b187fa582e86688a045f3f022cb45f053a58e00ec2c0c60 SHA512 bc43f85d5a21cbdf4b3821e707c845d08f8a6d8f2c6ef0f6ec76f7711c53bb4407f2a356c79bbbda438fe138a3cf74a4b279e8757cec7aa134a93f2173b931a0
@@ -242,6 +257,7 @@ DIST github.com%2Felastic%2Fgo-seccomp-bpf%2F@v%2Fv1.1.0.mod 295 BLAKE2B e58f21b
 DIST github.com%2Felastic%2Fgo-seccomp-bpf%2F@v%2Fv1.1.0.zip 48037 BLAKE2B 33ca7e5932ccdad787d4d8b70f04a289fa7c8fdf16629160a40ad4088c89ab35c0fc4dd0f6a890071b356193e6f7916e1ce698beacd92f18849e50eae91e5428 SHA512 2e587f18759ff5e785b3c4012f2db90477c3d6d789dccb7b87e8d4f7b1db97817e90c77f7381ae4b4d5809bf7d697afc44f89c9779ed343f96deb133c0c2d049
 DIST github.com%2Felastic%2Fgo-structform%2F@v%2Fv0.0.6.mod 49 BLAKE2B 352236127621622e9d98caaa768f688fdd50df5cbfc0b741a438a243aedc8288646a555ca20a6edf5ee56c74b3bd4d14b8e7fadfa68bc74df6afc05d89ae2a4b SHA512 5f32bedf6d5cd474f6de1ab798de83b37ceaf38f2e6895b80f057d0ece97a8ed4690e813b3bc8b2c0fa64e8db2672caa49ebd30be2ba4f0cab3fe007475be7dc
 DIST github.com%2Felastic%2Fgo-structform%2F@v%2Fv0.0.6.zip 458731 BLAKE2B 879eabc0e78a111301c7906f6f7b1b2f6476800e2a53732cdb51aea2c82603e7793c7fdf25b6b8440045c9e11502754923100439955716ab22eed13a62044d58 SHA512 ee6d0839f8b55dc99069948506600855b108514fd119fea4c43412139508cb814344948a9a212ebcd87c961d85e665990348607c4c75ecbd6feee236d94f3ad6
+DIST github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.1.1.mod 400 BLAKE2B adfe5b388979c259bc50763c3221a7a2d5b19c828869be74f7b12f410e975e7359f804a9f0718f58c2be7731ccfa4d434ed0c099af4789ccfd435e9beff8fe7a SHA512 fc6b82929472a56b3fd5fce7f67b39a7d222949adc570cab9ad2c1e5715cee3ebc03d86fd8ecddcbf066cd3b2822c19b32dbfe373e93365f098fad17bdae2cac
 DIST github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.3.0.mod 400 BLAKE2B adfe5b388979c259bc50763c3221a7a2d5b19c828869be74f7b12f410e975e7359f804a9f0718f58c2be7731ccfa4d434ed0c099af4789ccfd435e9beff8fe7a SHA512 fc6b82929472a56b3fd5fce7f67b39a7d222949adc570cab9ad2c1e5715cee3ebc03d86fd8ecddcbf066cd3b2822c19b32dbfe373e93365f098fad17bdae2cac
 DIST github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.3.0.zip 118316 BLAKE2B ec39114ee964eca4fbe1b062de585fefe8875b6c8c1033f1b2c69e626512b984ee413bd9195d589e70bb3a34a3f6d71613690e2792a5b3b5e093d64a8b03246f SHA512 205d9622a2ce33844050d31ae81493766c30629cefe2d353abe84e13cf19e00606bec153e97eeb6bbff1ebf11873236ffd52ae31dcf4232e50a1320c2cba5e76
 DIST github.com%2Felastic%2Fgo-txfile%2F@v%2Fv0.0.7.mod 594 BLAKE2B 95c97799b1cb834b083daba37e0a06f3ff042e1be89b42e91d425b399615dec702b431b7b27253237c9934600991bb698f4554b61914dbd734480d83c09d7717 SHA512 2f7c2f22f8ed0282a9abaf27212cbe9175059dc2950b329b607ad4ca804f460abe211f5df2a8fe2766b9e44ac4d35d6dd95376c667c6dcb10deb571542c8a62c
@@ -257,22 +273,31 @@ DIST github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.5.mod 34 BLAKE2B 1e42e1bc3a6b6e
 DIST github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.5.zip 107227 BLAKE2B 5e29f9ff6b523ac999a74aa4fe0952495a3a63edeb5894783b08056b16bbedcd122ff36f8658d5277711cc45dfb35481b8d3566d7fe4a864c9bc698e7e60c4f4 SHA512 65ebdd1324286abe1dd0dea6e8ca594b7a4ae3114e1847821dc0af545848c3de7c7d2140ff1f62cdaa40a3cb367297e7467b53faf319af58a9773c1600bfb8ed
 DIST github.com%2Felastic%2Fsarama%2F@v%2Fv0.0.0-20191122160421-355d120d0970.mod 1188 BLAKE2B bd52cd2d49c856181228f7d2500d6457befd145e5f5e69d1ee4e939c07cd436d4e94b1d6d7ec2cf7f371683daa69f89e06afd70f3a7d8205141cc934b61a695d SHA512 7afc6074fc64dd861b1fed922c2a89b7b75fd35a3b6af51c073152aa4097782f47f6b2c986b9e92e55c30e7bbff68ac176d478a6b1743df6e54b68c3715e7c7b
 DIST github.com%2Felastic%2Fsarama%2F@v%2Fv0.0.0-20191122160421-355d120d0970.zip 368799 BLAKE2B c5b3fe0346ad2c2978f13c5db9de073a91e70c7ea66e6c848946b6a9642e23668ce1d3de7f816de4d4f81d436ef7dfa2f84fae05d3258d727fbe678f8b779fe3 SHA512 f59e798714e5e5f02e50d44f6728b3bf464ff77704c5b67f8b704f11318d29ea5c883c78f5909e65a907ab23d036e2d64a63e6369d5dbaed565f27d8fae04517
+DIST github.com%2Felastic%2Fsarama%2F@v%2Fv1.24.1-elastic.0.20200519143807-cbc80333a91e.mod 1375 BLAKE2B 2078c8e8bb7e18fc469ef77acbfefbd44e6d76c492bd18a8008adf28c5d1fae9cc60d4fc8503a7d66b16a74299e56f673ed6701b34d7a9840afa2fa61be0d2c6 SHA512 31a41e1f8a619aa9dd438be4dcc185d75984a1dd6d7efc5bfd37bf74f63be6a6fb2ca3b4d584bb66f343ca1693b59a2156745689fee29588395ab369fbe32391
+DIST github.com%2Felastic%2Fsarama%2F@v%2Fv1.24.1-elastic.0.20200519143807-cbc80333a91e.zip 396086 BLAKE2B 3f0aac8224ab251f34b857800f8ab4f764f480b11cfb7a3a7acdf4d6e30c0a70ba4547c773116fa7acda3fce2bb8ec603391d24d19ce62a12dc5f19559c274f1 SHA512 adf9a9fd4ec8ddb449be16161176501260ba8e6c9b34d3b41768520258d07b5fd0b76b4f8d17f32076b9a4b252de4f40e3f3dc71155378092c8f216d4ab0131a
 DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod 34 BLAKE2B f28e4e0816416341c47f1050c45c142e5f54ea8461f335b1303def3516a3642a4cf29341cb16aa3fe7a8f78439732058a3712b3831dc35b2db3bbfdc8289ba2d SHA512 df974cf26d8392df0aa30b39a28ad4b6fa2c128cc6e4be98e91aad8f997e76f98d16a5c19cb3aaa510f659ed8c02b05e7d93888648f30c701fa02e63707075be
+DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.zip 123357 BLAKE2B f90cde27ee435ad6c035c1f5d5e5269730bf04c3328ac75e05f10d4023455e73b1a6bee17685393bfd32ca14e4887eadfba2d882bd0d84ad7a3a9575f7b31dfa SHA512 18c021a4cff23572c12fab0f163cd775c9cc046d5216e37d18ac461ea113e1032d504c8877c240bb3d1461665f926dca9b42015991688fe99389a55e2e2ae797
 DIST github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod 38 BLAKE2B 10c510e0332f88b1c489b5787540e7db93d5babe8fddd2d1603991bd08408a590d133646697604ee008f8a16f1cc384d8223d07e74d5da7e2242434accd1bb9f SHA512 d4d6319d58284419a3bfbe6eef0623570cacf0cd75a192cf5ce49846d75f02dee4188a68b9c62a6c38864503a7884e08d03a44a35296d1a077ea46ad5d68c820
+DIST github.com%2Femirpasic%2Fgods%2F@v%2Fv1.12.0.mod 33 BLAKE2B bf061bb336cde22e7cbf1abc36be47d4d272c0e454ac2cb60c55e33976167d75571cc490dd73761e31e597f2a8daa8244ea4d05a55120f6038dd2abcd1bd4cd4 SHA512 ff65ee51114426fd17d1a36b6e7fa5b37d9ec0cec79b6eee9041f3506373582ef0208f33131ab27e0c4d20a13fc9657e55921a704ce5df1ed3bb7ba8f28a9e76
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
 DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa
 DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv0.0.0-20190203023257-5858425f7550.mod 37 BLAKE2B cc30b89e62bb3a524aa3d6c55c472d2b157d3cd3b06d63b8f68c5ec035b6281dfef631064cd836f696317bd0ab517eeff464fedcf629491ed87b748281f9508b SHA512 f3ebd49ed1f05193a2999ce7178a9bbee1d1feae8b13c612a8a57d5c836eed66307271d9dd21de79800bbe9773364e826502287c366c4d3e2ef16d4a346378a0
 DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod 37 BLAKE2B cc30b89e62bb3a524aa3d6c55c472d2b157d3cd3b06d63b8f68c5ec035b6281dfef631064cd836f696317bd0ab517eeff464fedcf629491ed87b748281f9508b SHA512 f3ebd49ed1f05193a2999ce7178a9bbee1d1feae8b13c612a8a57d5c836eed66307271d9dd21de79800bbe9773364e826502287c366c4d3e2ef16d4a346378a0
+DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.zip 17890 BLAKE2B 78d64a15d328529200d05e6830ae69d4976e1d61df1f335e18e32614b64727b88f008e0369292b15ba633c0d3e687f6baf4520667f22cb9baf8f3140ff9274c9 SHA512 c83ecf63153e35f4fcdf9a35528a3dc2205ead882053682e2ce8d35f1c57bbf60aed92277b2e599bc25da96c1ec3563d7f20505aaa17e78ae5e484b20c921164
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.5.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.5.0.zip 11358 BLAKE2B 665fb79fe378c76e77d98909a3a0c66ce797c79658f4137a1d903d10bf5a9712b6e2a379337196fdddae3fa5ee72488853c8c5f7394ddb98db9bc14dc42ba44b SHA512 74d67dabde4401ad848eea4dcb16862a136f500c887eb2d785f358d1befdecb38efbd901e2becd6302852477156cd26f1cbd06f9d7aa757e81af934d1c5ffbfd
+DIST github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod 33 BLAKE2B 2c279a40bce4e61e5aad9d25a1c374b6c154586c296cfdfd56f52435c7739c8d9a8958e19d6da8026c2a03b728e0cb9bb512d5c094aa6111f9b10af24ab894ee SHA512 2bb0f125a91c8f92dc1cb5ec16441b27027585606a3862c216434b76324f3069941055c4bdc98372547543b095a4014155446de1be98264842504450121c941c
 DIST github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.mod 36 BLAKE2B 0b3e2e38c2a6c708af475f5550f4e6b366b9218fb9e29b9ace6fd61775be5635b5dfb237170e5c4a84c82a4f62e3901ce8854cc5f9a81aeb1e2da6f788470e1a SHA512 88ca10cb6af255e2e0ff960df075cbaf39e8baeb3b65e35b9a8f48843520a4cefe410765d0890781dc0429aebaa183aeda2290fc0643b852b9ef269c009ecbd1
 DIST github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.zip 6665 BLAKE2B f9bdacdd7f4cb7149fbf6297d3ab38c3a9527e0af158b933fbc673b96c5ffb684d6511b1679e03a142e4db5dafffc7b1e2edf24ac2d0f4e8faad32041e3e1165 SHA512 77f320b3a94a6da76051d6c15a7c31bfe9dd50b463ad9a354b0ccd4e24df3ea14ce026a1f509d2125f9603ff95db4ee001f9910fd6db05c9bca7b1b15ec304f2
 DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.1.mod 112 BLAKE2B d5d3a6674d915a64981d16e50519ddcb083e77a5bc0e2474fb1e2d718512edd48534c11e13c4acc7d403da5778cb6f04c275c8f208d14d54880cdceadbfff872 SHA512 b2b728fab00b8cfb86dcfb042631a37025bd981364c068990abca3ed57b3f47837ae71e568bb2a60a2c941aa2a35ff1bb24a336e786d20ff0bebb63384fee5a4
 DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.1.zip 36823 BLAKE2B 748629d0224bc4598ca2573286d49e8623ca17a9438cb525a8d080d14cf37549943418d170dc5b107e2a39271be21e1ffe2f9224b469b3eb82574a0c64218851 SHA512 1d451dc97018060ba5fee2dc1696807fb98aee809bc8cd2994bb83a35550edae819fb46cf17ecaf89fa8a22b277ae20b35c32c779640a47679e5ec965bca007c
+DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.mod 121 BLAKE2B 023fc722091ade6051165a9058ff74674f43aeea249b530be92b7f05534f0b0e738a7dade302f6733e29315fcfd34bd0d8c7554795b524e596a408e248051d12 SHA512 151f687b4d5c2b5a8fa26134332222105f40422530e49930b4533831fd5a0133ea7a8038f2d851196dd615b658729a10ec42d0a6efb15bc3abf55903bf42bd49
+DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.zip 43121 BLAKE2B ae8c0baab3324c9d60363b216e00ccd5e27b746ddd8a3b1b231f9f018dce8f3bacf5c2f9a8f1a3db97fce8db290d05f7c397141d278d585e0e44f0bea099549d SHA512 8f4610eba24604d46bcf1f9c4c7da0723a99f37224c298022823160d14469b85a911a6d18b8f084aa2730dd100721e52a8cd6bbe0215d72843daefe0f79fb141
 DIST github.com%2Fgaryburd%2Fredigo%2F@v%2Fv1.0.1-0.20160525165706-b8dc90050f24.mod 34 BLAKE2B aacafc6177e1e87c8f4a17f295900d749608f722755d31a1939d1b601e4719984c0d1299fc4de9fe74c1109852009daf4641cb5c81629788a639eeb9314867c5 SHA512 c4b5fc4230e8e9c7631f577ee15414f7a72bfe27af524fd6bfad8c38a81426411dce35a191d840a9c69eeedfeacacd3f2a108c5eec35a3e30b0a7b262b15340a
 DIST github.com%2Fgaryburd%2Fredigo%2F@v%2Fv1.0.1-0.20160525165706-b8dc90050f24.zip 52308 BLAKE2B 754630f3a08998023a2b1f7b13352108e336cc50972bec1655cd04134be7f7e416e2a68e776fe527e68ba898784f478b2dea79cffab8675ce4b4be213a14234b SHA512 ce216e29595645dc18cf9d68c8720d2490bda1c51d48037f36ef7dc8debffeddf6177978409da8616cc33dae3bc1f746b5d04c6d22bc77265fc19bb376d0883e
 DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
 DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
+DIST github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.2.2.mod 33 BLAKE2B 18725478b6c6a565e4adc96f4edf09f8369553b8b6523f36f8e4733ae64eb9a859af67e14646e61d2faf5cfd651ada0a6bb2bae455ba6bb4570c92696b31f23c SHA512 e6592e0b4e0c9f344378efbc06365296f5978e173421824512ce6f8921212691aad2f35e73ff4562c72014897a4992b7b3e56e3c424a82159747f1fe328eaf50
 DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
@@ -332,6 +357,8 @@ DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e8
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip 465217 BLAKE2B 4caaf832a22faf1c45e04bebf35d29b38bfab18a490ad1fd7b2c6cd85ae678fd3991505f68e526f9f2205cf919374b07d57f8abe95d8f74dc8263cd37a9db3dd SHA512 7fe69c066b2407e6000ae21888f6cc696e51df2342a71e196aba1a9a9ecce630bd9a4d41c58b3105002508a4d0efb9c5ae2b8a87f848b8e2c6293558b8c4b4ad
 DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
 DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip 69641 BLAKE2B 7d5306ebb893e705188699f7b5e690c375bda9e0ab4c904aec10560dd75f278016c9f69ce4973260a4e5a8d8d7dd7c2f12a59f98e96a4456af6f23fd0db224c2 SHA512 fa400e3e1b6f57e29c93ecfb1dd94ccb1e4e4924f3b62ae125ad0bd88d56b5c48080ad78dbf545c1056bcacf860b93363a27780dbce2b812c5b58ca3c74fd11e
+DIST github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.mod 35 BLAKE2B d6addf74aa6a2ad97c1792946aea166c48bbcf35fbc582a9dfeabbdba68992106b7cc7b2515ccf002f44bc74c0f0655089e3110e39fc312a683b1c364318279a SHA512 33a68d466b4aee3c41e6d70766e90fc7b7b8e904acb360d1a5e15236832ca47e5f45393a7f5c486893f6a8ca04af4ca4ced27b064c15a5189217141a325972a8
+DIST github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.zip 9531 BLAKE2B 17f756f40c12b6ea29962938ef18520d5ca3fc99fe6804b0edc41b63dec17b63740df8d9f1abb028c00f6b5e74b2fb6dcf5c6a09e44ef0ee1a86f2fb2e740239 SHA512 27fc4b487a652c7960ec6e691b78e80adbc3dce7590da3f4e568fae95f583e207a887aa8626ed75da7346a40d47b2bece7c3aa5fda6bc7cd4188673706f616dc
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20160524151835-7d79101e329e.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
@@ -383,10 +410,20 @@ DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.zip 79215 BLAKE2B 25312a1d97
 DIST github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20170728041850-787624de3eb7.mod 38 BLAKE2B 1ee03077667437ef310e0e9d77f917474151294d0ae6654596884b28fa847c4be1fc994e4a2dd00d4551d5a4550e14edf1757f5061c44b527cff91353944b989 SHA512 5500094712db06267cf0d437e774bb1b4df9affcebd73ac218259f089f035df59c7ef38e6f36197014acbe1c8b08806734cd27c85a4bc86cd62fd9196d7f5b3a
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.13.0.mod 535 BLAKE2B 2be9f841d89f87d8b4d2935360953fc003863569b6caafcbfbc17fa8c3f08b480c6a565861db774a4ac3b40539c42185e00d9ab3d4611ae7a92d8bf1acc5553b SHA512 f803cd5c2d7b959df845c0c0f118573718be692698685c1e8201aaea744279aa32b4f8a930e57dbc2fcacd5872498d253849066a97dfa832a45a309569e4e992
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.13.0.zip 606164 BLAKE2B d86b37cf29ebe06722a25ff47450f1ad2994da243216e5694632a3d0b5b74dd9b81bfb9fea9191cea02dbf4bd3baa2aa3162c7af9590526ca79e01fe193239e1 SHA512 c002521fff17e78ea18b8008f9a5553a68dec0f0df641008e5394c8e9e9f1a941b30b48f635497996acd8ec08ac74bd8b38a35e3c32cd6284de8b04cf987dd82
+DIST github.com%2Fh2non%2Ffiletype%2F@v%2Fv1.0.12.mod 42 BLAKE2B cb24fd6d3604f496403704819b10923f426c7b7733ccc97f56b653dd1bbea97d287f006a3c959695b101a477d8ad2ae119407cd81e5ee082347be8264afb7f22 SHA512 2fbb83d7183e38e99767fc49d2cb93b7c69706ec8357768eedf6571a44658b6f293dc998c26e78ebaae6310146949096bf90b3ae7c4985f5dfc2568dfcad1e66
+DIST github.com%2Fh2non%2Ffiletype%2F@v%2Fv1.0.12.zip 3646277 BLAKE2B e1e9bfd0a67e0d6bbd745446b788095877276b51ddabdb87fafe099c1ea37f966d34cc493efa60ba37ff5174c74060ac28fa1c956849efe0fbd9bb341b3a294d SHA512 afd7531c75633cb174f2c258db1e2ca20f77ce1f8c602defff9b82a83cd55694a30bbc0c69c617e95971d0ea3958697def1ee2b013fb3cde9cde035d6ac67e81
 DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
+DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.zip 9313 BLAKE2B f6ca808655e43b0ac41987c47dba2172324cd11cacbecb83b9e6295db22501f42f15bf4a95b08eb8c58e6c8795a432f98e57edc7c7048acb4821ff3cc84deb88 SHA512 bed2931ae7e6ede14d744cc816ab39ffeb129a25bc6aa452b2d8db799ce39a0a81912c29ea016b3daa1a03c84fb18d7ccfdcc758dd213f6a15b344c7c8e990c2
+DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
+DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip 9306 BLAKE2B 1172cbdefac5f63dc5dc155b38f1f6e63bafdcc4a9ec057c3714a93251fa88d9cf29aae780587b13dd4eb4af10fde2dd305c4ff774bd843068726c05861ccc4a SHA512 fcecaaf6496b11fb35d01da0d3375508c978b0a319d344c61f77539be199f1f13ed892f2019d5b6d8ee1603c576064203ab87e235bab4b0bcb96d28f9e16e88d
 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.mod 42 BLAKE2B adaf8e14cd6696bc97bedcada70988d2508d8bf28e94a8b528067359665aac351ec7b7f38ca1a89ceb0c18c3c7935e30af4df20102563c9372b34b0cf54d41bb SHA512 da70feb8b6a17512c3761ce6f13653ea47bfcb4af69b471a3bfde9b79901d0f24ede05c10d35f3e051df54e1e636a848be5d00194ef5e9b85bf7915d6b27dd0e
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.zip 15518 BLAKE2B 2ca1e1de9972c287b7e49507330594e02669c67362a6415f491b8c7648c72cbd12c573c114266bf9b5016412c65740b2f5a0ef3efb85ccb6001c6f1861f05870 SHA512 0026c31a9b2edba5da0d9c0a64e5963dd931f134ae3cdf768c8f1cfd8ba15bd7446ba9f4b7ee2b9f5bdd7d1fe1a34e47cab60c001f6f2a0148f22632ad130f64
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod 87 BLAKE2B 34587a565b583aac6338d7d23b4e7c2ce12deb6700e00bec711d3d8d829ef1ae356eb1b28873d5bc2a0d6ed249dd6095539a1dfd8c177bec32e08d97f4003620 SHA512 d47dfa43806a386eb74b60f692b3bc580997edb9d7feff6633992a5adbf94d102a238e036d828952e204960152c62895288af6f09e2582e8b1408d259fb834c0
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip 14840 BLAKE2B afc6e5519fc2dc1209382c6ffb6f73d29dc97b6cfa03ef525d6095e65870a1ce25ca59d56648e24bc399f53f6879c0a3ce91e27645a48734602292c7d99bfe16 SHA512 8f86f79788cec64d9ce4f02af2ab7acd64f2014e5b592256f07563841444520bf4810a1dfa76abf04909dbe5f3298c67c0a88e636e45a181e461a2fac08d385c
 DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
 DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip 7804 BLAKE2B 118a166e041d64c446114e195ab870455fb75db45554e02f0ca1b0a2ee76938022120848bcd5d3668a9711c32345db5911cc627977a602bfdcaa875be791199e SHA512 3a3e4b23b82bea9b094f407662f5c63659ae427bd0e922c37f0dcafa1e3cbb16f4117f265cacf2a0219f5240d378aad7aa4cd2f9960e07b7cc7200859b0d6699
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip 8042 BLAKE2B 9ea2dd58a5d47047a84965e956e0d228e0c7f836c6b0111fca63ca2313c1721341ba31e7e741febc8f5b1053298116d69d6dc96f1497b59b343da59b57f7c3f9 SHA512 1afcd111ce5ec191a932e6f51f0aa9b05ffd3320793c022cc66766bf01431ee4b9cdd3e7a0544b6b1616fabeea262f54270660fb723de8ecebc8f919e7a94e34
 DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
 DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.zip 15217 BLAKE2B bb9f90cfea6f89716379d3b6f7b5b4558f44ae1c18c32aaf98e8a7f1752b7980f9905b2f49e03e6b12dd4b160c9e0d91a92e8c4f184e0460c320eadf130f5f58 SHA512 6b7c320dd942b6b1c7e5e627bfe2242f77f80a0166637cd965a1845ec986f5f5c726304b09d1d88cea7cb6d36644e83b2f8fe50727223e63e79ff7bdce52abae
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
@@ -405,6 +442,7 @@ DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod 32 BLAKE2B b90f36a2d75d98a23
 DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip 25340 BLAKE2B 3d0fcc2379f60900d4003da2a3663e77ed131986dcbe209aa13a59198f1fb8b182401c50475b4b39986ac1dee1e165f952bc7de758d141f5cbe028dabd6eca64 SHA512 4ef5c92c16747f375f83866581302be13f9425c9257eb4d73d197cd2b9332f7125b5864a1dbf423a96b1c03ef21ce32ab5cd1837760258a07052be40bd4e6399
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip 3712 BLAKE2B f4f79741bb83862583f51f2ac5e80181eb0e9c2a4578df32f7e24eb98f4f548b99333e0e6a377e03ef701057b01e852e6b710ab885b65170c861bef556863da4 SHA512 e16bd414c1df566a12944e4a99ebd84d2103f0cb3bf8ec312e3de400f20b3eae27845db50672801c10474dbf1dc61d0c2e16e5dcd3c4447681c0b77f9114a411
+DIST github.com%2Fjbenet%2Fgo-context%2F@v%2Fv0.0.0-20150711004518-d14ea06fba99.mod 36 BLAKE2B 3face566779516d32818939bfc87f0c24ef4b03ec89330763cb2de2ab371a6a391eb5fbf24d9619a07719f160c4f6c403dd4fbe1c650764c5e0ff43a43051aa0 SHA512 fc1cd659d6210d91ef66189a759c3850b242b76267035f38959be2b2f35283b54a61334f4416b619ff017d39646433c5a13c6b181e53bdfb28fbc3f9c35f3dbd
 DIST github.com%2Fjcmturner%2Fgofork%2F@v%2Fv0.0.0-20190328161633-dc7c13fece03.mod 35 BLAKE2B 152ed61bf84dd1666421e11827c23eeee0c7c50edd35851a50ce21f4fefa13660a7a6cead25a0f9d8f1b748c2c4277d21639eb781c484359aef00e77921139e0 SHA512 5e94601c72f24a3d8a115759a8fd6fd3420b662995ce94d7dbcfe4f86437bdf81a42c77c82accf7fdb926b75a5898bb34706fff864e00b38d891cdd076fc89ec
 DIST github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.mod 35 BLAKE2B 152ed61bf84dd1666421e11827c23eeee0c7c50edd35851a50ce21f4fefa13660a7a6cead25a0f9d8f1b748c2c4277d21639eb781c484359aef00e77921139e0 SHA512 5e94601c72f24a3d8a115759a8fd6fd3420b662995ce94d7dbcfe4f86437bdf81a42c77c82accf7fdb926b75a5898bb34706fff864e00b38d891cdd076fc89ec
 DIST github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.zip 31175 BLAKE2B 17e0ba33bedb9809d12ffefe034baf727e7c2a66aa19adeb87de3e3659c085f176fa48951f1afff4e5fe132c73d4520ac7061deb0e24d86520936e6ed6b63845 SHA512 d1717086c3d429838c88ad276d3bebda858fb4afafff46a204cf252685d9c7f1e2b15916f3cf7f8c03fd54e68d2d1c3ecb64e9d73975ebe9ae188039f0aa4570
@@ -435,12 +473,15 @@ DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f
 DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip 9901 BLAKE2B 0c8cf7ad0809f65d91b9ad5b27759cfedc5efc25194f19effd4b19c35c940461a48a57636ef3c707b27ac614b693ea05830bdef6943f11993bf561ef558cb99d SHA512 08b7201a9aa3294a3fc59bec78fee09f0d1bc7507b50b1d1cb1fa29a523c6870d00b633ea9679c9c86df9841739f46e9d5d9bbf0e3ec15b8ad08e57db67eedc0
 DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
 DIST github.com%2Fjustinas%2Fnosurf%2F@v%2Fv1.1.0.mod 43 BLAKE2B c46a08f2554306747a47fccf4319dd74d0e859441911fe99c0dd7c747391c7b96721e82e5b0047dbcf74c9f6544e1ce17b2d9b28c20fde0ea24d9e82a5130049 SHA512 91521b7af79fb614019b2e6add5c3dfb5560a446ae366f552d95ee1cad09b2a6f121b142fc452ff55584917479ff2949896c0a1729f3a03841a65c804e0bc3e7
+DIST github.com%2Fkevinburke%2Fssh_config%2F@v%2Fv0.0.0-20190725054713-01f96b0aa0cd.mod 40 BLAKE2B fcc716fd56980eec2613156eac1c731cd653369416946bf532a2ac27df56a894cd6dcdbaee1f55d6b9bf2b7215cf21c6beae58404e55fa71a666b9958e69f7c5 SHA512 208caa4a93b3f365428dbd324ac42ca09f073c4028e06427c75a1883100eb1de0031aed9a63eb283742efc0d64e7abe644000829e704891362f59dd32da40b45
 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod 143 BLAKE2B 128f8934f81d0e497e1258ec65129fe5d8831b66058669a5aef3fdb2fbe5f6d8ab30bfe97a1de7befadd34aafd55d6d15bb787e8948fb7718761392817203874 SHA512 c5e546822036a7114a29454e28290f8e1082392a47a101fb1d370e0969fc2c83186b4487473f903dd638abb8a763ce3180dc87993906895a2df33db7d8bc4790
 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod 98 BLAKE2B b9d3c55999054ed927f666a43066ccc6758a6c5f550651f43ad5d85b5403c882ee76ac2b2553803d71789da33c60ea41857ed545003072ab6c666dbb77118e00 SHA512 3529b37d770af511a716a612b7fd7fb6a4805d13166e3a6f9378950443f6eceb2f3d95db5a46027437ce55b36e571c75bba72a03769d21ecdc97888019d80a68
 DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
 DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.8.2.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
 DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.3-0.20191122130757-c099ac9f21dd.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
 DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.3-0.20191122130757-c099ac9f21dd.zip 15268424 BLAKE2B 948489d5e2c6235370c1bdaa1e105047dcc470e316734f148e1dce6b6baca421f215495e6dfd29105f478390599d4334e8078cc2b2933a67d3871ad5ad9acdb9 SHA512 4b5265db6d4383f085a67be3422bf3f18b1703a123e0d4329e44230d73a5fdbf8f46c606cefcaab880263f95bf07b6c3830d8b82cd906516b5c0d29a7d430bad
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.8.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.8.zip 16194359 BLAKE2B da3b081970f666c910de17fb8f959d1c52e7d92b64973b98954b816aef77629014d00eac2a064cbd32b4d4f40581cad8ffd37861c33fa8df31348cd21b320807 SHA512 2157dbd3094aaf49f560c066c6a84314141964ca72425187ff0647f03a033b33234530027879df08055dbff9d58ae365f467f5c1572d33cf0bce1edbe3910e16
 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip 3968 BLAKE2B 223cfe3604cb674a11d4558b8f5a35e2eb41cf11d536e2e2cbdccd6a3c6bed8abf66f450774b39e7247493ea8a382906617c5f297fda02a272b18eef8dcbcf47 SHA512 16c4bf83b78541d2d684113926813ce4cc91f3f13f34dc2cf8d643661dc9f21a988b8382d2c058e138fc87c1ca197e8f694b07595959e917c82bd6ca9101a5ec
@@ -448,7 +489,10 @@ DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod 28 B
 DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.zip 9142 BLAKE2B 0db0e9a6ba33fd156c75943cce1b95385e53593d7f6957f0e6375b38625e1ee60a86b80229ce6cf0ee33de603fb0788892d0a3c3cd20a6969c1acca2521953da SHA512 5e493f08d6a45e8e12160b8c51eb380156ba1d2382523e1be159fa16d15d7ac32c8bbf2861e74791a0fdaa06155e95ad12b5f4999515a9a69dad1384ebbdfad0
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df153e027f22be7d28eefbea1c0adab10979f19d601b95d300c54086b5ee388f453c73b9931339b9b04208fc5e6512385b348c49faff5488 SHA512 bad73f3c47f70de55a90a977a1e2b4a68de545a8425c71533de081c7a8f71d7ab1b489001c56ba2e88dcb78c08804275f7f8128c812f50d005a074ed6dd9286f
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod 72 BLAKE2B 8dbfabd447cc847f4616b959e52fd3bfeef8dda58f5aacdfd362f28d0b530c8e1651a38ae742c2d9ad8d9b0a055409a1840664b1483df73956a21190395b056b SHA512 b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip 11505 BLAKE2B a0c7e576801c150d9eccd27e0a36304a931f9ed53da6e47f69882cf78cadb4e61096d2c748d1ae5bd5ebad26f5f4c2f37cb0b6e15de0a7b9aefb0aab86ce4134 SHA512 0dd52dadb4327839bd37391c19a9e008b2345f9a61356323ac79fa0abd54e23223d7e5568562f26d937ed05171a3b63fb273510867e612e2eb1cbc44ce0d8928
 DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
+DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.8.mod 72 BLAKE2B 796a88b0b7d88f469e90e59f66d12a3c515e0230eb2a7ec83f00f5266266d93eea475b752677f2ec81a7c99243a5034ec1a2e9f4e23a83b61bfe6e855246b6d3 SHA512 9c13eb40018d27bb2f5623251df11cee7b8c08eaee681b4678f854d7c023bfd3885bf04ae085183c7501e637d86386a00e3a979088aaf2c37a03f732d7655a5a
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
 DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod 46 BLAKE2B 1989fd1b186328abc02f8dcd503bf396ee63b55630d3f37f576c7e55b4c48623f62d5f2b16d047afeaa13cd423ab014f254df5f210da52535bb8818a60b375d4 SHA512 4fcffc595708aba2673e895182e695e91d6d239f8feaaaeaf15d75fcff398112af0f0d5ebdb28506d95eae30533dcbb54112ac0b0a4034ee11d7a35b78674915
@@ -482,6 +526,7 @@ DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.zip 210715 BLAKE2B 246ffa14da7608d3f1b0dd2969b2ac4e3f0b62fbc5060ae3e7f39d8ce5cf40d17b2c074021205513c068b33607f108f887a9cfb42b5d9f013b642e70ef85158a SHA512 c7084476120e931394480ea1ef2d4df157500e89f5e5e2fcb05329e5439bb15c99d70a2566400bb74e419984ead7197809ec6cce16c624ac42b8cfff0e222d5a
 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 4163 BLAKE2B 7e00360086a04fb62a46ba20a10ac3460b364aa6ee09bf46f9769980c086db04aad45c4cbaa809a218f207c086876678d708a74d0a7679a48cf62b0b5edd48b7 SHA512 06bd620730c303df004e1d6a06a1aab8d83551d594c28e42f8d43613153ac28e6a5dcffaede69c84b2b49027b62581851a332f1397a2d6df9a46078510f7d1e2
+DIST github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod 40 BLAKE2B 089a3d8f85648feb04c692c4e108e1e843217ef67fb3d5c00ffec847c06eeae55a9432c206753cb220595441da76b635f33a9812ca92f04959b4e7dd08644abb SHA512 e8e4f318e3cc6d203ccc62c0b47af2aebee3fb99680cd6bd24af023442154ffa9c3d4bcf9064af5220f01d3cee71e7c600e465e3651ae0d7d15e2abee1caed27
 DIST github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.mod 121 BLAKE2B 1bcc532c14adaa320767f5d35d1493bfc9a6cf1404bb1ad7c5f5c7fc940b529ec6afa0effdc757aa20640b601b11fffd9f0ca07e1b3ca2cd5128717b9fabb5ce SHA512 a0cc03f0157608eb5e9a26c6496d60446de5493c66d81b2fb7c20c6c029db2e4a9026d22c77c2906e1995d4ed2abf3b353c7bdf34cefd4e57d94499fe159efe3
 DIST github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.zip 23850 BLAKE2B 4cba89eb304fabbe0fb2e5108f0385b28b32e9a18daf7b766f1446a051948abaa4412bf9a17a7d6ca44d9315c47fb5c509856eaa0675263b916dd0b2accdf694 SHA512 6fb395119184b78061f3517739e05a3ecd98d8dae3f790a1e52563a3e10f9aecaa6a65dcf2fb52a8aae6ad27ad8939d2446a47ee66a866bf72a866f8eead6436
 DIST github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170116052023-ab25296c0f51.mod 42 BLAKE2B 8ffe9f17b9bfd55d7f3b44a0571132809a2d18960cad73780b88d31a723fb380b82c2c3952030a0bb4802929b625583e8aec8875c36a2720c0135ed8b59fe4d1 SHA512 414c86e4d26a8cd2f215353f04ca7ba0eaa17af36e3d3708164cb3698b8d198355bc7bf57897fb9d96cfa822ed50681a18157540a752998060c1549348791755
@@ -502,6 +547,8 @@ DIST github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip 56868 BLAKE2B 7795586966a72a5
 DIST github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod 36 BLAKE2B 636b2a1011ff647b1597c535916bdde712e45585b9be3e90191d474e88e293df5b30e2e15adbd2f6d631a57ac81b59b02055b439390664fbc8a8e224cfc51e39 SHA512 7873fe200c30b46285fa8a001345428db580c67cf634c1b1e4aef6a4a82d7b975545b827d00b1a3dad86b2f3f7681df739915f95144d4d3a3553f055fa70781a
 DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
 DIST github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod 34 BLAKE2B 315fe4d5620c1d1c92df3fd382560ac2cf164aa17a741c1a74fc25807819de811705467227923fee7f804c6b6e96606c87b4adb11a6b722f367b543c2792cda0 SHA512 b1c163d7a6a139eeee1457fa07933f01eaf6d2ff24d10385e75f87b443a95fe1b08e9e144d3c18eb6a77d34e8521cc6dbd486fefe908e60452c5a80f654c551a
+DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod 29 BLAKE2B f74d75a495f683f4e9047201721611229ecddc37ed01b5d4b5d81a06220a6385f06d0f99e514bf19cc2030fbdba6de3a08fd38b750e6651a822b10bf69c45327 SHA512 b426d975637bd2b4dddc10d7c88b70f8b946201f311859f22520d53ae0a2d9911ab358460c089771f7900d7a8740bbc0c6d3814ab8f955108fc31b7b602ab5cf
+DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.zip 21676 BLAKE2B e526b9b4942340554bbdd07d83f4cb9678348c600793658644deeb1c64880d420fac1a95002cfd846e7c24d5aa5b1768b5bb1f71a1aed5e44e3755fe2a7c80c0 SHA512 6e24127bb86e9a0990567541b268c9ffb3a91d9cbb379b59b5120ed7f34d6e7f5f32b9efcbbe17553466fc07c06d34017644d7f751775b734b186af1e94d9629
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.zip 243243 BLAKE2B ab663a1a0cbe337fee8b519154c18aeb568da73186d92e7cb122650e68aa22a728c04b91992660a8626c78be5e5550f1538611718052348a2a760ad040191ef2 SHA512 9269de68436cafd9f729f88cc0b8775ff2e94a7ac17f691c4eaf8e2645808558797937b8f1de857122daf2e31ac2a2c13d5264085360530b3ed09bba40f5081f
@@ -530,9 +577,12 @@ DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod 46 BLAKE2B b95
 DIST github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod 47 BLAKE2B 0eda9805fe0e1acdcc1e7b2693e72e39ea416cf57a108b1847491e1f15f8a7965c8aaa77baad1ae6148f39d36b1fc5fcf159b54111bee0d20bf2fe8edfdf85e2 SHA512 4e53e67b276ea3fe8a3977bbe72758bb2f844e22cdc3e23994176821cea51b10f5e802ca3db848a8b3d00a146c133a89271ee76158c478683b393682806400de
 DIST github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.mod 34 BLAKE2B 24e5a5c0bd31053b54c98d3a593c6c82cc8a0136234a90981004ca7f40e1eeca392b56d80ede7407a49f8c666cfffa4407d0ba0d7c09a42dbe8a9773f1613d0c SHA512 a0744e73669284e544d60a9b3c9449ce074cae579583410ff0879571e0cc57a7784e30938a8dc56c08b8f5b87fb0c0df3ad477b0c3543f3bd221b6f3a2f282b9
 DIST github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.zip 10165 BLAKE2B 7208b851d5b38607aaf215d3076130dda5208b8c54a7ae8ceb8232011b2c802e8d3034ace2d91c2e5f1e085068ad8dcbe53eb653674255d3a727dca92cd14dd8 SHA512 0fe3bcb22a1a3485e64df4bb6fcfe619a8544bd1e245ca755a0a4b1db2fbaa39411f4fc2e5d3373538b66eec805a3df208103ef813ebd94494dabde52d5683da
+DIST github.com%2Fpelletier%2Fgo-buffruneio%2F@v%2Fv0.2.0.mod 42 BLAKE2B 26e88451ad5d521cc8f48a08c91f2fd3fe6dc2e2ea084cb0012f25d8399f0e43329de5e96fd741255d910cf5a2146d3568718249980876c816a67f79e8b3290e SHA512 9f82f0d4d467420830ab8fb80ff97215e5fb47653b48d88304a6effdecabfc735f55dba9959319014ba943b2cbd27394ce86ebfba8a6d068c9c3d368f6b0cdfe
 DIST github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod 37 BLAKE2B a52c6a0304ea7026657d40ff685f37799d37cf3b05a87b15336eb05eb8a12d8749cd73d8cc3228ba2a80ce1e489a3029617ecf301dbd51c7f5dc7630dc114801 SHA512 df531789f1495979faa830433a34e38996cd919757f0191b31b862a9e9dd48be68179e291416876cb31083dec78337abf6bee92c68cff38630aaa456cd3cf052
 DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.2.6+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
 DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.2.6+incompatible.zip 20567035 BLAKE2B fc4282618ff1d2d426080e969b1645fd4c8ca72464438fdd2a63feac6743ca15b0522ac6e2e069ebf5c0cbda2b43618253ecf17f271daafc61f03b2aee9f51df SHA512 7c218059eaeb85ef6313c5ea25c9c0118daae8d2795094a3046a020029aa53ce0a55b688fbc9b70999c8c1d93e1d6e11f4977b871e7b3f5cfd2b3aecbac4f97b
+DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.4.1+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
+DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.4.1+incompatible.zip 20573196 BLAKE2B e04cea4ab317118a9a854ea34a7e907f5be268ece8ce552507b18151aef74a30d2a087a48ab1657eae38f79f015542fcc3cd9cac1237d4d2b1411fe2bfa97788 SHA512 5e9b1485713572250b69adf2b826eb40ff65851914452511df818dc1785063b2816d19397bea3d4d581c966d1c0c1aad27750e0ddb4fb0affb1b43f21c76ce47
 DIST github.com%2Fpierrre%2Fgotestcover%2F@v%2Fv0.0.0-20160113212533-7b94f124d338.mod 38 BLAKE2B b26ee235ee877e67b605670a1a041cad6e320058c454816089083ae602be967006955b4f38f23927a495b09d2f71f3e3796a5269ab46587e3047d8150a6f3a57 SHA512 b32caefeba4ead78cb310946d4f8bda2d76eda17913aaf8cdffaa9db41300b5741a759be069f60def0e4ab1bfb1d6505bf3ca9375e80b77897e4419a933ccb11
 DIST github.com%2Fpierrre%2Fgotestcover%2F@v%2Fv0.0.0-20160113212533-7b94f124d338.zip 5506 BLAKE2B 955d71140c6a3780dff928c4f1f27ad1f016ae2e467b773b77891350212c1b2f449d8872ccb7b2503a4c02cc020f78510ad612f02c99310db0f0c36223d423c9 SHA512 2d60ab410169bccd8196b5b352240232479ebef3fad2b1565208c33873eb6633cefabc7c091816d2b228caee64cca7900a26ef9409162913e0723dbaebd44aff
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
@@ -559,6 +609,8 @@ DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod 857 BLAKE2B 4c4486d3772b
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.zip 153651 BLAKE2B ebff467e946cc220ee1bca6fb5507030a080b34be93ae6e5bcef4ef4c9069d19ceb542af6770a620bbf79b65f970898eb536d928d5140cb1de7a57c9f2cd5a57 SHA512 c90a315ff9dc3c8f4e0f1e392a2e23789417e291e5794a506b94d04c5591da529bd379158f9d4d02e9336e4c2336d0d8c68c2db59e89a7b390e11f212a92113f
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190425082905-87a4384529e0.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.11.mod 198 BLAKE2B 9b5c175c915db6a1fdf18f440acf348e395fd2059e1f44fb1fd556e7c2c6821cfa397f88d2123f681b41fe5c5689ebc58c7c75865ef63f7f1c61fd8d323d8117 SHA512 7a54bddb87350ba24423842fcf1cd8b031be427e9f689467503d8d6a876691b209a5d2ac33d848a977d2c3890284d816fe4f2fa9391642010c96c3c0d691efcb
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.11.zip 227473 BLAKE2B bdeb96bffbcd6325a6f3fdc12aa6cdb1c4bd220f966018b44a575e4a681eeb37439cd4f1d6282abbdba527d9d7a2e2efbb4f53c52f963f5301c40ee7c1fe3b1b SHA512 bbba84a1d05a97a82543b60e3eb35e36e504c05ffa11008b9fcc9a6cd252f05bae419c8d3a18f875b136f9200de8925e18e16bd30b7f727b6c85e35d9adf9a0b
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod 136 BLAKE2B 49b2b47ca2cb64a1522a3719c1b46dc6f44d3122d3a05ea475dab88e89336aae3f396082f4de0f89400a0e8db85208446582a226238a701fb92c155a2e85fef8 SHA512 fbbbd57eff765585e67074e5c278d7d3077289c3d13c306147d6c3efb98232ff317ad92464ba768fc3d921b4a09cb3f3ff5c5480c89a01ec821bc86e5dca82f1
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod 136 BLAKE2B 49b2b47ca2cb64a1522a3719c1b46dc6f44d3122d3a05ea475dab88e89336aae3f396082f4de0f89400a0e8db85208446582a226238a701fb92c155a2e85fef8 SHA512 fbbbd57eff765585e67074e5c278d7d3077289c3d13c306147d6c3efb98232ff317ad92464ba768fc3d921b4a09cb3f3ff5c5480c89a01ec821bc86e5dca82f1
@@ -569,6 +621,8 @@ DIST github.com%2Fprometheus%2Fprometheus%2F@v%2Fv2.5.0+incompatible.zip 1301042
 DIST github.com%2Frakyll%2Fstatik%2F@v%2Fv0.1.6.mod 32 BLAKE2B fa3ddb522edba85e62f1f7913ef7230f7f4907bc350a0ee1cc570c73954774baa539b6110941697019d13198bc8cc01a7cb833a6235c8588f86351d4c5643943 SHA512 b9df57a2659d47107fd678dc36e262bc4c796c7ddf38cc6887423a645e4feef2f9d7cbf4070e8635114b754df57c3157c6b8734dc1631af02f848e599326f194
 DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod 38 BLAKE2B 091e64943724001796bfb662a26443a681d4db705219a1d7601c350b94105caa1584c62a4befd1aa0c634268867c84bacc79e235d5a8b416f6a8aa8e12192261 SHA512 f22213d29e8a0914fc947e08d8c85dbcab835cd7587e45cf5458a1cff074359fcb187ab47bdfd933c8937e393975a29e872b744ad61295fb1dee3783877e81df
 DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.zip 57982 BLAKE2B 07c3ac2d98a119485695f6b96c4aae0bca36a305cd38e90f40afeae5746fcf0f78c0f389930b28184ab9ed6750746bea8939ffb8d569b0ef3552a3c3c0eada35 SHA512 0502f433987c5a02ae81f156f4b2916b6de0ac2f3e55a2117ccad7ecf94dc25a8bf952fd70bb7d37b82cc8302280c92f70b94606c8c2d125e505669a72e2e7b6
+DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20190826022208-cac0b30c2563.mod 38 BLAKE2B 091e64943724001796bfb662a26443a681d4db705219a1d7601c350b94105caa1584c62a4befd1aa0c634268867c84bacc79e235d5a8b416f6a8aa8e12192261 SHA512 f22213d29e8a0914fc947e08d8c85dbcab835cd7587e45cf5458a1cff074359fcb187ab47bdfd933c8937e393975a29e872b744ad61295fb1dee3783877e81df
+DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20190826022208-cac0b30c2563.zip 58836 BLAKE2B bd86e85253270f67c6e52406532482d6ff8a702fb2f8bb4ccceaa41b3e3854f65c829e225b954275dc176e632112b4ef6ae7c326bf1c40c5ea16f829b2b9c770 SHA512 25f0432ea5260dfb79909b2f522de492b726f1a7d450d5ba90f56d3abd0202b712cbede6acc628eed08d23dd5eb1741724e3920c02b3299a7378eb3df8dccbfc
 DIST github.com%2Freviewdog%2Ferrorformat%2F@v%2Fv0.0.0-20200109134752-8983be9bc7dd.mod 129 BLAKE2B 89da2797324d72bea586d45da407611d9997c997dbd892f18b5cdeaf1cf2d32caa2d566e71a963284feaf1958daa9f0ee7b6598f9d2286a554dd9c3237423f1f SHA512 7dfa7e8953f8e9cda777fcdf81323f5425fc50aa33dc627e63336ea91fcccb1678a28f58507394a49ec1ac2e6b68e94bd72172a8e237a98c6a2217505dc88078
 DIST github.com%2Freviewdog%2Ferrorformat%2F@v%2Fv0.0.0-20200109134752-8983be9bc7dd.zip 79853 BLAKE2B 9b134753179317e6e1b83e4b5520c62e91b28e20a1f675854ffaecc1f647a080ff46f538ba570f241b925cb00da9c4dffde7cd202e691837796dde5192551be2 SHA512 f2ba014a864e4ae627c4900cb3db756a65a83ac71c60f251ac41d760bf4b023ebc5061a53727cd4e9f99bebc860509343827905b696875dc3d7d3e2960676623
 DIST github.com%2Freviewdog%2Freviewdog%2F@v%2Fv0.9.17.mod 832 BLAKE2B e1e259107572cdcc9195ebe81ad847e4d0b5195548fa26e2cd7712750048008aca4ca9ac2c2be09ff30aa3d137c4877e3151d9a261004305ece525ec172ff377 SHA512 66f2cd49acb19d048c1f007f416fd912dc372c16a6510f0521422f4ce4c6d766d357cee1bf6259cd47fd947f6c886ceb9a76cfcd0bf594d3f84abbcf4eed81b4
@@ -584,6 +638,9 @@ DIST github.com%2Fsanathkr%2Fgo-yaml%2F@v%2Fv0.0.0-20170819195128-ed9d249f429b.z
 DIST github.com%2Fsanathkr%2Fyaml%2F@v%2Fv0.0.0-20170819201035-0056894fa522.mod 32 BLAKE2B ef947c59ffe55c03dabba1279013c3c5dbd92ddd3234a81d256078ead3459bba6b7779caccec4abe9f830c82e935784db7865e45a847b16670d9b19f7d4b42de SHA512 a3c0f7efb604607d6a0ca4578a673de82b43edcfaf8113ccdafdd7af464eb54c9cfe9b0d503626cde3e97a3a0db4892788570f125b0df5d8a62aa012099b4e9a
 DIST github.com%2Fsanathkr%2Fyaml%2F@v%2Fv1.0.1-0.20170819201035-0056894fa522.mod 32 BLAKE2B ef947c59ffe55c03dabba1279013c3c5dbd92ddd3234a81d256078ead3459bba6b7779caccec4abe9f830c82e935784db7865e45a847b16670d9b19f7d4b42de SHA512 a3c0f7efb604607d6a0ca4578a673de82b43edcfaf8113ccdafdd7af464eb54c9cfe9b0d503626cde3e97a3a0db4892788570f125b0df5d8a62aa012099b4e9a
 DIST github.com%2Fsanathkr%2Fyaml%2F@v%2Fv1.0.1-0.20170819201035-0056894fa522.zip 13891 BLAKE2B ac687dec8226be04724eb88c59291d854834902e79601e0b2c1d79f93b7531b2e3c7a7317465985e516576dc359da3b770f4f795843d5a94f9738eb3f1bd97c7 SHA512 af0684e256140fbaa73427cc3cbcc6e78d6487be5cc09299e9a199b8e1fac558de1c88218da5202b86d5e084b10075142814316b3694050c46a7240d5401ba84
+DIST github.com%2Fsanthosh-tekuri%2Fjsonschema%2F@v%2Fv1.2.4.mod 45 BLAKE2B b26b031c30538098db1e5849e987165b22e5d0103265998376b2c2d7e4bcecf49a847cc4af351009a2e25ea17a341de5f3da39cf2ef15e59911afbd0dca8ee8c SHA512 2a16dacaac95b89c853091592dca7209ec8f89a4c9eed036bc81c66c490b966a5a9971b5797bafd9c8b5970b4aed37f05cbbc7b20e5b21e8f483e0f2e9390db2
+DIST github.com%2Fsanthosh-tekuri%2Fjsonschema%2F@v%2Fv1.2.4.zip 119814 BLAKE2B 0ff2e46136165346645d60e4545d7cf42df10df31e9952553d7b6551e97a5266f7cb5278813c3b77e1a4de1d618995536128e60e52e608a6ac253d5cef772070 SHA512 8248d0ea5f4be358670e0b336d2371eda6d25b5e9336149ec19135d499e26dc5576bcf64030d12b8c07c1f7f0eaf0083b8b3275076923872af8e1b0da8befb99
+DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod 32 BLAKE2B 9c0be7f17fe7a9156f124f7f67c3e15e14719d0b271f36d5d41ccfa5ff6c1b7887e0051df6eb3b29f29b40357d8e438598088b3c4f4df28fb81f030c8efa7ff3 SHA512 8b8b8958405a188b93adcdda0634aaa2961b5b8e0d3b3e1f768fb9c49c02b73cf3bb39027431e0c1d209abea6cb72a651c5776bf26391e81f4dc18c7bafa692c
 DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.19.11+incompatible.mod 34 BLAKE2B 790ec7277e4654961540dd09fcb7962328547009b0181183b7cb64972b872d30986d1e53ded5961588d89508c913b2b56dd7af3625d0e8d7be2253b6bcf59576 SHA512 a5f5d88a767a855b6ff24d7e2e0c4aeb81fb1365a7e81ed989b4c605a7a6c61dc52d7ce97fc672c21020ef56f597dce679184e5e8d3d199678487e6bebaa8127
 DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.19.11+incompatible.zip 221848 BLAKE2B 27b3ba82670265086a538cce5cc80395360ee9fa8818ba3de5c9ed974ff7ceefde590df80cdd152485cf3a230b77d92e02a3bc67c0d785ed460eeda9283ae576 SHA512 b763ea558c2bb412a89a65502556ea7d2675c73e4e6289e3c05985e414c8a80fe2e9d25b3f99d38a0ccfd636e5cb68fac31643c56d5408dce394b7afa15c5e6e
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.4-0.20170822132746-89742aefa4b2.mod 34 BLAKE2B 9ff118e3db6f2a49d8cef81bbb78af4ae29fbcf97955758c08c4a9a610fa66f1f6da80dec5aff3c657bbbdf1fd5330331e58dc46c2b2bb657438ec0879a3c45f SHA512 186b34d707aaf1557ddc8edaf49fbc559024f454bd560ca8451cfa555abc211cccf861aea94018363547e39140d9e507c97f7a3c87bb9f1e5d444bab4c531e36
@@ -604,33 +661,50 @@ DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip 74638 BLAKE2B 0e9d2a40aa6e68cae69ae24f76385e840e0b53b2a4afcf89ac5ea61ee144462c113dde938c5de728c8e54e7e46dc099786ce85020bdd60859e1ac04393556246 SHA512 c33aa1ac5cf2a8441bc849a49b65a614de6c9e0c5d37a77f0b6972bdd8f25a651752743b1172e0a83fdbb384aa7e8b0685af5c5dad1bc128310c60e13cc9b56d
+DIST github.com%2Fsrc-d%2Fgcfg%2F@v%2Fv1.4.0.mod 29 BLAKE2B b5d4003e44ee3e61a72146f100f7d669aac7047b096fdaf549194cde409e0ca927af590140e4344f57e77e2db5aa16e92055e3ef2edcb73c8616ddb0edf6c62c SHA512 59c1f5827727d54b89814acef7026a976343019b58d7c673b853382e661b72231e04e251c60377f8bfbaab0bd6768cb8144dc18f1fb207b6fbfd3d5534dea160
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.2-0.20180702103455-b8b73a35e983.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.2-0.20180702103455-b8b73a35e983.zip 43759 BLAKE2B e8e94e38cabf87136a09e900563fbf3bc35563788df16aaf34092ff94fa6f9e046a7f19dbf1d224970239ae7293c824b480569b6629446e0bccd5edc7a53639e SHA512 3f3aefa8b21ac5403b6fe6e142253383c4657bee4b57c98ec2b7a6bdf922244450a97ef0353ac60cad9ada75b612c3e135d76c3235246eaa87f30359a225c878
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod 137 BLAKE2B 47195334e42f0997d96b50b8364764426301d31cc7fbc289b89b173b877d54cc67133b07d4a21e6ecdfa2e4404a9cff32f06b53cfa9493e075ee2ff2cc46e605 SHA512 02d0b2b1df84750ad3d15f4b86b3f7989a22007e27b28e7b3a4d34b26ec7ccbaa5d48ac0032ad692bf7db150e101cabdc050b0aa1697cfb20f922c88b9f086b8
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip 42547 BLAKE2B af3f81b3947f0802a6542c60db0248aebac9521d75d0d991f76b5783f4eeb42f7902250cd22da1b8fcfc2f150342ffff53260276b7a6903c092febbe66f40ace SHA512 b21cdcb8683760280e515ae487e17b65b324b51dbdb36c6380ec0b272699297d388a34b1a6aac281b1aa149d85ca81640850e1fa0d84bf63f3dc67b794baa249
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip 90474 BLAKE2B 2f79f0cac2c15acaeae764aeb640534f58ec2ae86fe88a82533498e718cf37d67c563606090ad39b38e22ffca1e63a25cd881d6a472b862ddaf150c7d329b16a SHA512 a047ba8d5f529d459fb6ae8dd39367e6f6cd2e785e90f54a5f8759ff76e4cfff990f1b8c1e0cf49c67b97ca8de36ecf8fdeb3b8f16e579aeae2d563d38da69db
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.zip 92066 BLAKE2B bc321a8dde64189df65fef0a931a54a1c8dce62de17b011149c1f78a3db2c6bc50e0694c4dac2bb77291dda45fdaaca68901f5a6a584cf8b78117231c2a417ae SHA512 f40c1d8fc0c0edd78abec113f71601ccbc6a320e7eceb9ded2e6a047a05c9ad54bfdd7aea3f476fb10983b92e5d0fdf3cc716b93ad5a93793f40dc3d830c8d28
 DIST github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.mod 38 BLAKE2B eafcc0e8c3633f2d4c2cb4eeb38eacdb7d029944b76da9ee611b3fd2d3b82d2adfb726405168a34f70251be920da17fdc6c70e8052720a6093c788dd724d24b3 SHA512 1efa76d27434ede74fd37d57c1673c8a60cf06248a73c425b5bd08dd068d6b50166b17a15b52d0c059218479fa3976e80e16cba08f671e9ecf7744cf5daa199c
 DIST github.com%2Ftsg%2Fgo-daemon%2F@v%2Fv0.0.0-20200207173439-e704b93fd89b.mod 41 BLAKE2B 1cdef4ea755c26327e7bca09e21cec2bf3999c60d52f997fa5a907afa146535c65c921647cc777ed780e2da71c11d29156039bef93cb8480c38a2e88f5e8f6ef SHA512 395ceaf025ef072181eaee098cf6645e300752ad79623e6bfdce86380bbbddf9e1b870a10309b746bfe0dd6a6f63bdc789f482c9577019a0a124c78c73043fac
 DIST github.com%2Ftsg%2Fgo-daemon%2F@v%2Fv0.0.0-20200207173439-e704b93fd89b.zip 12625 BLAKE2B c85dca7f514c95e22a23df6236b327283dd2fa11ef05b0af19c38bb4548e184313ce3389347e41d51a696d8dfc484854514ed602b1351443ebb7f4e20e6bc262 SHA512 4e492d8404e644e26bbb9e4933595f008276de306a143332c4dfd60b3d2f3fac4c725190e23673c0b995dd9fbf01d289f56cecbf56b12143205f8e9e1c8ca449
 DIST github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20190320122513-dd3d0e41124a.mod 31 BLAKE2B f0a3620501ae28c986a7b1bb5ac6726a807f9b4173129036b72f1a44290fa6e5d59fc66d61d9fa554a4227a91c4d001733d341a7b2165b03a67e528c3b4af822 SHA512 ff7217008312f36684c8c655ea39e67d4efbaf44edbd73d15551649a3647a543fe4f493312c32f0e8f8a3ae9e23b3c9c0820767fa518e3a9dc2aa0cdd5930bbc
 DIST github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20190320122513-dd3d0e41124a.zip 665575 BLAKE2B dbc70781128df28ae9ac6b49f9994a0835a645df593233f7dc4e6cb8be23fe055cd7f1e1466c3a2568d311ffb851ccdac63f81b6e68db8f9a9462cbd2c67a99e SHA512 8f4fea74a9b399a1eb923ed7e724381e47b529ca1c6c041143a8f3f22936ff6f80bd7e15b29c85013da37c5add084ad3af687454e92bf492047c3f4e7dcd1660
 DIST github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.mod 29 BLAKE2B 4f20ac8fb7beef2b678cff290a28c8125d368504aebfcde33e746d3ca7b9606804bd94c59c50fe328da4c1c592b8768b1aad89bc1d22ddf76cbc88d0f0f76b74 SHA512 5edcf2aac39658fc7e60d5086b066470c6d6213b66a2432bc35c6f67b8cb37a66a67fd97cdd4b8fa1b8b1bddfd544e4aa9838cec06806b89f8e1447e3c61bd2a
+DIST github.com%2Furso%2Fdiag%2F@v%2Fv0.0.0-20200125202105-ffdc32ff5518.mod 78 BLAKE2B c50261cc483c6bd82c7a8641696349b4d490c01ef2481aa0c3b5788f9b1c64ecb0c6d75af90ed99dd6e0f2f7946866c81a35731d73224218d5a8057e75864c52 SHA512 66523469a357b8bb9d8b0cda3eedfd0701cf20936974f0a4078fccf2c1eae97eebc77f591a71a2c808ddc5b265500ea77927debb1f74ffe5966eb67c98efee8d
+DIST github.com%2Furso%2Fdiag%2F@v%2Fv0.0.0-20200210123136-21b3cc8eb797.mod 78 BLAKE2B c50261cc483c6bd82c7a8641696349b4d490c01ef2481aa0c3b5788f9b1c64ecb0c6d75af90ed99dd6e0f2f7946866c81a35731d73224218d5a8057e75864c52 SHA512 66523469a357b8bb9d8b0cda3eedfd0701cf20936974f0a4078fccf2c1eae97eebc77f591a71a2c808ddc5b265500ea77927debb1f74ffe5966eb67c98efee8d
+DIST github.com%2Furso%2Fdiag%2F@v%2Fv0.0.0-20200210123136-21b3cc8eb797.zip 45499 BLAKE2B da611c24b4f8ac9b5a5dcd44a9dc6f6b7f9151792f12168f893c38b556d208e709288ef2de96dbf12679f2dd1f61dfbfb38d7d7eeec1d7950eef699af29b1dd5 SHA512 7835c8212dca285d794b1ab29970f29045c957c332ec3e0063964766ab2c42efc89a0951276a633d93773c4799012e3104f55dc8fa773244ea3b64528e8f8eaf
+DIST github.com%2Furso%2Fdiag-ecs%2F@v%2Fv0.0.0-20200210114345-ab085841dcb9.mod 306 BLAKE2B c76617f0e9ec0a42ca37b856fd579e8b6c859b70eb7a07b53332e88d1ac8e07217878826e560edf876e0554d0af92a27e2c53e21b88b80a2cca7bb10ed81a7af SHA512 ccbb2bbea15594c0001bb949e4ed5da08fb55964a0bcf6c8119175e0fa5ec02cf7ccaad8dace4d25a7bd22a7e43e168924d812faed693517d7c45f3ee0e7ea3f
+DIST github.com%2Furso%2Fdiag-ecs%2F@v%2Fv0.0.0-20200210114345-ab085841dcb9.zip 41448 BLAKE2B 0b6d97501e76d00bcde115840db1bc931192e2535f1a68d14ab68e1f9232ad9848b99f4c6cf706ae46e73739c01b70b03e4b569750f47f2230839e84f71b1373 SHA512 7a2ac4b6b52925379048afe2f72b9919be7add7ac57206fe9964e3806d269644d69235d097459c6cfdbcb46a6679b5bc967b2aef65ef37972c15df4bba18a3a7
+DIST github.com%2Furso%2Fecslog%2F@v%2Fv0.0.1.mod 383 BLAKE2B 8df83e25952ddac9c15ce3b7833839721fb0fe8809a0931e5f56d92c89dc3e3734405685b14539592a6ba27edf6b2e505582398291315003712a29db80029df8 SHA512 115efa5e9404787d245c188530502adf1cd1587a7d4048acbd017b2bccb5e5ce4eb179ec96a5b189e6d77c65ae17377a09a5656cdea3443a22757daa5d4d9f30
+DIST github.com%2Furso%2Fecslog%2F@v%2Fv0.0.1.zip 36935 BLAKE2B 0684fc86dd1848087ba54e7d7e921b32f615ef90c2391825e99bbb3dd0da6c9af6f70c7e067d45e93deeaaf8561e88d3ca18f7fed2e8536d43f7f5380e1f872b SHA512 0772a790fcb45796ab1ed92a44ed5581363a78fd8400f553afb00a199720254e0e52f65046fb2b08da2859856ddc0505bf83418b5ad10fb123113c5e25b0fe9d
 DIST github.com%2Furso%2Fgo-bin%2F@v%2Fv0.0.0-20180220135811-781c575c9f0e.mod 30 BLAKE2B 59a627ac9dc142b90929bb7534aa62c92788a4c3d42cd5498ca6a0333019cc053959d8e9cdcfd6be3ea7e6b996868519bb24e7212e406f30affcb3c075d1c2c8 SHA512 bb77d11f853441e67f924eb79a5307f0c9d7db7cf29752b6d7ab1bbadad8afdbccc6461c4401b66c698df86de7b9f32af593d35768c456964530c99e19881259
 DIST github.com%2Furso%2Fgo-bin%2F@v%2Fv0.0.0-20180220135811-781c575c9f0e.zip 11941 BLAKE2B f64e153f3c62f9220f422f1b2e72b4eb77a3dcc009a99a93a2e985bdb8f134d298db36377b05e263ba8e059bbe0aaa9ee6e0ee0a54914f578d2a5ee76ddfeb3d SHA512 b6301d0eb0b0ec015068c9dbf2106109fb258c22010ef71db09bcbc84467fbec83363c3bfa369801f730da74a7779978a86834361d89e4fcee67db7853abfa97
 DIST github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20190919040553-290c89e0c230.mod 33 BLAKE2B aae9bb38eb370b22426bafe483e842d67975bc186f2f040df14d7b8778d0e0d972d8bc084a25e70826cfc4604eec043e26f4add6273db90c6d7ca8b956f9b71b SHA512 8ea785e6ca06a6751f2598f434303a54fb9219f66a824bba4552e67ffcef12e94ad0527c24f762169a33dd627a55110a087e1e54adfef512c1e5909cde28aceb
 DIST github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20200106130147-61080ed7b22b.mod 33 BLAKE2B aae9bb38eb370b22426bafe483e842d67975bc186f2f040df14d7b8778d0e0d972d8bc084a25e70826cfc4604eec043e26f4add6273db90c6d7ca8b956f9b71b SHA512 8ea785e6ca06a6751f2598f434303a54fb9219f66a824bba4552e67ffcef12e94ad0527c24f762169a33dd627a55110a087e1e54adfef512c1e5909cde28aceb
 DIST github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20200106130147-61080ed7b22b.zip 16854 BLAKE2B c6c1ed2cc68e8ffb484b4b456b899e4f2135c8307396cb631cf5adadf0dfc8edfbcf90f8cd396e7e7087b7c82ef101afb23f67dcb2d15c6b2977d579add95459 SHA512 b9abcec3ed8b8fd669dda8b3382d18ef37f576b665d8fe1dc4b43922518223d3246c7affda5b28474b6a6577dcf1083211de50b049a7eab7d61e2b2d21005fab
+DIST github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20200125210132-c2e338f92f3a.mod 42 BLAKE2B 6c481463839f4b6f1e2d162413609f23091c4adb531bfba5eeed80b1c604fa3cc514c097abb72e7ea36a7a07f94fe22909f03fd1420ebe0197d7af7d6f9ee87f SHA512 4ef4c98060e06cde13e9efcd7aeeb47b03960850075f68f2e7d6f9d251f35ac783303a0ece1b8639e254d8c17a6d17a5652c5d5ae4d549be02c32d0eb884473c
+DIST github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20200125210132-c2e338f92f3a.zip 17736 BLAKE2B 2c358e3baa5bca3ea87e8db6574f4b8a907dde49d46e8fdb2860c834a165ba96f41e714b0b7bd430ba6dfe0502b0213029cd5c38b0b8b374c6fd2f0c2821966a SHA512 7511306054669300a1206af2cc6772d9c0258cd098274e540da274251c99f40225ab7c38b0d4d959e60bde6adc29608603f01f93e9edf71a21d891eac8c0fbe7
 DIST github.com%2Furso%2Fqcgen%2F@v%2Fv0.0.0-20180131103024-0b059e7db4f4.mod 29 BLAKE2B 3edbe2c6139af3cab6c0ac32b935764c9442e84ce2c6861d4908741c2c060bc95292c7d24ef0c439397cc23ccc4817214dd802366aafd6941d9e8c9bb6470aae SHA512 406ab8978f9f53c5c35aedb7416a9dda857aec33d3e7ddad167528efba35034c7eedc235a18b533649a2544fd0d5410a6feb03223cd2be32c8bf3ba84c808708
 DIST github.com%2Furso%2Fqcgen%2F@v%2Fv0.0.0-20180131103024-0b059e7db4f4.zip 6351 BLAKE2B 375a6fb8ff47ca013b12c95031317aa394e1e3433e99283896def97b64031cd6fb11a2b45bfb26cca2cb8926bbd8d459731888d36ccec610f3872fb0106b57e3 SHA512 80c71da97f9aa0ecb6d5f72d7f707c42a5b8562d3d94603d5bcf801a8202a46e014f5bff485dc2f88e351da05726e8686d3a2b0702939d3580232905b7a80afa
+DIST github.com%2Furso%2Fsderr%2F@v%2Fv0.0.0-20200210124243-c2a16f3d43ec.mod 103 BLAKE2B 44cd6f3830a796a1b03d0d573228f3c7a1bc9a8ce49afb68a907e974cbae1c0b0f8c1ec33c0738795a2bc63d51aa93f7bd37f049a4a5f201c1b2ecdeff83a71c SHA512 05d11f62ff3e5d0f276d899c1041e0b5bab7ea0c7380c189bafe40ce35150023b10c280f0880bb00feb01c973bd39b8fc041c3041e0570eb499d359d1f302065
+DIST github.com%2Furso%2Fsderr%2F@v%2Fv0.0.0-20200210124243-c2a16f3d43ec.zip 12567 BLAKE2B c1d36493f95214c2daa78c834b14bd026f64d23bf95174751e12a92f950bb1679f25feceeb558cf3f748fc31479e595b5942c5bc7ed6cc2b48d7315231c7385e SHA512 ff292080ec1137df9b1c9aca019ffdf534f3f3863fe1a592795652f623187d48af07bd2b2bf61afbabf786d28b334adf1579e3c63cddd2ed913cc95899817a24
 DIST github.com%2Fvbatts%2Ftar-split%2F@v%2Fv0.11.1.mod 35 BLAKE2B 7d7563eed186b479251bd355f40cb1930c74c0e9421e16d786ea653bc073c297ff12d9fafc11f9664c2a5d8515eceeb85af8e7638c15a7abbb5386467693ae1a SHA512 d519f1c3f9128d34c753f2b5ad141e72e507f8d682494af304f94e794f6e83798c1c67cdf727c24cf0a43d87bec4f450a9cfc41f31dfd7221da86eea339cb51f
 DIST github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.0.0-20170802214208-2cad15190b41.mod 33 BLAKE2B cd0b56c3105d5a303d3e19c1b7fe5231ea3d9454e9b1f67047cbaaae6b5689f2d48fd6ef31c58bbf1453d995045709eacc57b6e9adf1a3c9613b0512dad62868 SHA512 483d88e041bc73a30a83559b427d454381c2774acf67edba69d8dff8034992b6f2435c472e32391f6b6c7c1f0c52715fb554c01890e9da1c173f481df51f51f2
 DIST github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.0.0-20170802214208-2cad15190b41.zip 1253983 BLAKE2B 54037ddd261a65e88a34214456df6ae52c36bd5367648614a05a3e0031dc5fb17222d3f93630fe0d72789998f7a4deb9b77283b6c5a09326b2f06a655833600b SHA512 f011d603972a3ebf9d57f5b0ba723f5122aedaed383d2506a6a57eb2fd5b5c167792d601294b47ddd54036614f9fd1f9c28cec971d4bd34d0bbede464a7c1eca
 DIST github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.22.3.mod 368 BLAKE2B 7e035da82eeb13c315526358d3e3631a69607f86cbdbe327e271de0e4809f0b7a5226f4c95a9bdbe2e80cf5856c77519ad50160fddc4670f2d61b61adf49b189 SHA512 a386f6131970d53037e4f9698832e74b0c5b0d5ab7c904760702e29b5a581fabb23f9cfc131d9a92b6d34e5ab2c89aff2cfd28c9e5e2eafd514e8467b979794d
 DIST github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.22.3.zip 234015 BLAKE2B c9ec1b2347f34973b893acf7e8247d8e108a36fedf6adb5b775aa7dd23a0cd972bb8905a4f6cba874471974502902d5f6777cb1da3c5d2604b8e9e29f5a13b86 SHA512 d711bd876c6090db0febe5af99dccd81ee7b099eddfd68859f1536b1fd04e4a752f4028ff115452b54119aaa65ee7d6d0903c86d4b798e2c42c088dea3731a41
+DIST github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.2.1.mod 168 BLAKE2B 61409485b5a15b6972b31745d6d4153561aba9608993faefed322829f885949f7f09f4455d786ad2b088cc8b40f30bc6746388e86625964fe9adee36adc33035 SHA512 8685959ca2e8ca2ae8e0d802e8fa954c91c9cffd318b476669fc1a2bf969a0463ebe3fc0ec2588a5f151e2da394b0d37fabafb83c8d25337d9b65a307d79b51b
 DIST github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.mod 28 BLAKE2B 87b79aaa3dda433afe275fbb69b3abfaf808a8a992f37846b51a3cb9069b1a0e5506ce6166d5186eef8656b451c3f6fad5bdfb58a213a9dbab2e7820e9062c81 SHA512 2303a64b0acb96f5f73dc64468a81d6aa6fd9a08240a04d5025884d6076cf90eeb5b132979488431d6f885138702a22a606419cfc0aecd05798deeb3acc4fa1e
 DIST github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.zip 33880 BLAKE2B 4b0decc2808a3f38cf272cdc053d1ed933e5023985543ae1643f0ad18dd9de98287403ec3c44ae753c001c25355591d000c996efc23f6bdf4a571cd1ad805833 SHA512 12666c80cb033c49832f33435b6a38d1e0e562965e84485efc5da6243f9fc959de19d05a70628a3bcdd02e7167a69a1a4731f6e6e3960e754f90fb38e7343f9e
 DIST github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.mod 33 BLAKE2B 602b301b7da6b66bdb3a5c9c88d4a74f776ea535fe1c4b1085840eaaea4ea5d9a05fc2f088b92fb85152d22025e89801eb476cdc26e031f8e3adb68fbb62542e SHA512 9c89175c24f82cba599f754d2efb8dec6def64b32735f9733b883b20a0758a6769afc527322ec5059ce275df6e034bc631a32c0a392a66e96c9d4d4a1087c4c8
@@ -645,6 +719,16 @@ DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20181112162635-ac52e6811b
 DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20181112162635-ac52e6811b56.zip 139320 BLAKE2B 0f152a17ee3790bc11d4e4344d16406c494cf9fa563ca4a38a5d5ed6e9b6d0ce0cb95ecf5b13b5acbecae8604d6578265ec276b4d430aa7d25c0b0de496f979d SHA512 53b6fef3e9fc66824a6a6a4a1e66b803052a80b8c1127abcda8d27ba264cf8477035ffbf8b84d0433c697a3f683ae7c1fac64c5326d978de78395822714bdb47
 DIST github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20170403160031-b402f3114ec7.mod 34 BLAKE2B 58672703644ac6739cc829047dc75265ef7c6c4ab2783595819e7f1c4edee8a4ca4b6820f5734dc387882b780dab7f786e03291af2edce3e1bf839dad060c22f SHA512 a93071d377a3b10b4220e71d7ad8bbcae0c55746f11f44f59deec7bc4216e19e4ceb375ee2c0d3ec8ae7f9e78be1a4b93eae6ecb6668936783c778ade75d6cc7
 DIST github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20170403160031-b402f3114ec7.zip 182857 BLAKE2B 1f21c2074fb23a68e95cb4f4f6ed29760fceaf5b6333309ed83fc75ee29728fb388ebce43766c2ed4ad1b7cab83473f2369387b6963b0afbc1fccfe9a8d5479c SHA512 bb421f5858d73f3ac01df87418004575bfc64ee643a935ca44699ee1fd3b9a51f199896ef1a2c5afff52384385f9c0abc2b3d8f8a0f8ca591d255f5e10f03a4a
+DIST go.elastic.co%2Fapm%2F@v%2Fv1.7.2.mod 478 BLAKE2B 5f009a9e870f64c57c52e4e4ac40ca7ee95382fab969e6316f84c5de6bc48629edda4e588727b928399020028a687563fb4f69f6ac6222c20b97e60d34280e56 SHA512 fde518d1bc6c7f675decdf4f2421bb41e3d285269c611a774596e3c222666b0e7f4b2f7f1af39045c1665dfa0b9f4ec90a5e41b609ec8b69e2d7cead874aaa32
+DIST go.elastic.co%2Fapm%2F@v%2Fv1.7.2.zip 332338 BLAKE2B bcf39cd63231e14048fcb16ff54c1b1d8253982010a52b4112e3cbfbf9365dc16af5147c841462fa99eb58f93c4599d327c5f79442668342590e8d67d26911ab SHA512 ccf598af44dd7704f741b04d704ecb48ee0689ef4de8552eb6ae3060cc75fa65a42de6e054c3726e4e52b5b960dc4da374d4810146b3a6190e3c25c9ec828145
+DIST go.elastic.co%2Fapm%2Fmodule%2Fapmelasticsearch%2F@v%2Fv1.7.2.mod 319 BLAKE2B 8bdfeba2da6858dcedd306fcd21c68a68589d44da930b6f0a85a4de39c913838e5e24115a8778e9851361299ed1afe0f61fba9c3f21b7bd2430c131f4c4a72c5 SHA512 f03ce02f3e178d30f5e890c62e647bbe0788e1e42d09489664d5321513c3ea28f09fe99d2f51a1557c06b9aa446fc120eaa8fa3779309be6d4216b6be0cf39df
+DIST go.elastic.co%2Fapm%2Fmodule%2Fapmelasticsearch%2F@v%2Fv1.7.2.zip 16390 BLAKE2B eb63085475105fb3c2749a1e90ed84f8bea36b8859cb7f0155b1d267867d950bbca7d45043ed11610d43b733f895203ed26393bce34d935184741ee4fe3e8164 SHA512 d72b3b404ad475b8e7c0ee59397bb631bf10e7d41262158dc19a33806b84d914fd4763c55e49d251d7341ee73d6332fc912359b9608f4114fde54c804f020f11
+DIST go.elastic.co%2Fapm%2Fmodule%2Fapmhttp%2F@v%2Fv1.7.2.mod 281 BLAKE2B 69b39708dbc3ba646836e44bdc85ef6d867663c97efb3e4a965678dc746fdc84d5bec5bb9fc809a28e340034a9d5a7bc34ca41c47ef7e37c2c061bc6ed0f9c3a SHA512 b23e7e60140bd80d6c46c744120a27d35189fc6ba97365a0d2bf827386390bdeba3e82b16e5d94fa824ddf0a21c329bbc2a113587ac253c27dcd26a816b6c24d
+DIST go.elastic.co%2Fapm%2Fmodule%2Fapmhttp%2F@v%2Fv1.7.2.zip 38649 BLAKE2B b6c9200c6f4dd65324bc7441b82212c8ea182ed0a7d36aa748cbbc790e7d755d4a286026c65e33a994d1a52f2e64556bc51a8f14f3963d6575429aa9f3a4dca1 SHA512 ad10ec85cc845d3b09ae7ebcebf6156ef302c9470371444f9311c53db0c93a08050a2da2374672853c109b2dbf7922412a349d2869aaa9cb309b7f60a0560bed
+DIST go.elastic.co%2Fecszap%2F@v%2Fv0.1.1-0.20200424093508-cdd95a104193.mod 174 BLAKE2B 738d91b9cf4b7a927f67f24a52b5dd181e483fd8e71bd04add082e776a6ea3b4929925c30c865cdb4d553eb4e50d796f4e2a9581ed2959a5eec5982df5f101de SHA512 4ee49236e3bb1354ff8a09235d9bf75bcfdc53a4b1bd95fc4cb17ef327aab083815920ad84b2c03cd563ef24449f3433e9d8c0ca5abd53e66a90951c27be26f2
+DIST go.elastic.co%2Fecszap%2F@v%2Fv0.1.1-0.20200424093508-cdd95a104193.zip 32631 BLAKE2B 55921402d674a684117290a4fea2921a10d8f7624bd0c6c451921139411ee2d0e57b920e39955868457a0d3f46dc94e289d0feaaa598d0a34665380dbebe1720 SHA512 9ca1324dfa639d6d58f772468edbc338d9a8d193240b89abb43e5891cd6ba226d0a74cca2bdd5f81cc9e47d4c0fa8dd6cc8d67f6dcd3c21b5dfd1c6b26fb7454
+DIST go.elastic.co%2Ffastjson%2F@v%2Fv1.0.0.mod 68 BLAKE2B 38761b0b1593550d253ccb0876a8a5d2be2e71ac0ee33a9e4183d95044f57cd4404ee1cbb3f9aa995ff37d949c6ba8e8ce8708b398a79514ad3256da64e3ab2e SHA512 c15374592dc4ec4f13699ce4fcbbdd96ad6dc40d2c6be32d7dc244d04848d2db8305db96ef5fb0be6f2708778ab4da4557cb973720d9010dd8a276372fa8c981
+DIST go.elastic.co%2Ffastjson%2F@v%2Fv1.0.0.zip 13266 BLAKE2B 74f1d3b40705a460d08738d5bff9400540d637a05131e5864b4b0bc2f6bf377258dc8c412d2bd831465c55545fee2fd471ed85c2938cb80ae18b4e9958307765 SHA512 c549aab7779c5637002b7108983e9a63eccea277617f6186edeb3b3de9f4eebe3f32092d7ae008bf8897fa905348ff739e81854b73423595b06229f2a9dd16f1
 DIST go.opencensus.io%2F@v%2Fv0.21.0.mod 305 BLAKE2B 73735106ac582b2e9d5f0d739412c3396e0df8627a6adbe810ac560998e4cf2eda12e449b6e336dd6b433eaf57c885b4a927359d0bc1bd6eba9432bb0793c35d SHA512 448e90223b8d67e4d5e4b150055ac83eacf9ef48aa34036c2e59559f21443f796e721df3c0395a829bf5d10d229cdc7beb956c8f90273e50f0989e45a82aace8
 DIST go.opencensus.io%2F@v%2Fv0.22.0.mod 408 BLAKE2B c96dc637d392594cdf710b9542b90504fb090392662ab45208d45abe2cbaac5b64e55f2f62d1afe5542d2747abef1eedfcff97cfc48d6e0649c23b9b8293f7e5 SHA512 823e1ca3a9adedb1a98f5ac900e190bd51480686872bd901cc20a394cf03be6c8fd69cfe7343e42cb6f9d3500282a8097b6c32376aeb3e92bf0b1ce3e75872d1
 DIST go.opencensus.io%2F@v%2Fv0.22.0.zip 291484 BLAKE2B ca3bfc9c9864a2218ec373d78792ba0a40f4e2522bf3e0acd01b153eee43083cf8b124ae19b5fb0eaf7eef7cd59b2733b6c3ad847761518eeff2b183780c79cf SHA512 4fe718c3dd4c7bc0914b32844ae86ce281721f98b05797fb0a0fb51245129dfe1a74d2d04b419f4e0b7a31409b874e0e9d7939c8426af1efd92fdd5f12a52a98
@@ -652,22 +736,35 @@ DIST go.opencensus.io%2F@v%2Fv0.22.2.mod 478 BLAKE2B 534d5c63341897b7213d30ae225
 DIST go.opencensus.io%2F@v%2Fv0.22.2.zip 296264 BLAKE2B 0b0e20eb2f10b81748d55b843f8489ffb8147a8b17c063cb21fe505fcdb46feb9cc0830f3b3a91ea7034b1e7ba78df27b0b235b8500b8c1ade19f6837366aaa1 SHA512 c98a43e1bfc9f4bd1e54847dfd6b07e9af14efdbcd8d61b70c9f9701541ee2405f800b1e33cf115615a43030accb735a1235e2b7d81f54efd127e2fe5c992326
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.1.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.1.zip 14706 BLAKE2B d310973614a50f94f92344ea10e1bd50e29be5ef90f78a0b03fde6c962df670de8ad56968fca2aab816004906cfb8cc2aa73fa8dac508c8233e5f2c78ea1e701 SHA512 21f4182cd0872e15396ed08dcd7bd3307c2da40c6ac51be0a5e73571776487edf3b611be20ed6a1f745b7197f73a5d0517f34ede098f42f6db24cba8aac322e0
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod 252 BLAKE2B d5019d6264ec35aa5c7c85d6c42130027213590c6dca568099f9c3b7c02fea9abdc969dccdc2d8d3f8abd0ce4c95727ec3f6f8dfbd2d4c1c75d4462e356181ac SHA512 15aae0e0950c9812700ba4bab0a19050c30398511df8e29fcfe496927fae3aa228761a796f150dd766377e5768beed842f06ece285e8b0e094a59288e1b86e23
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.5.0.zip 18762 BLAKE2B a472638d7d9fa9cf5fa1ad2bf968c1eef4b2b3e8bb6fb53066a85a7139fc8621954ff21ae09aae6887803621dabfbf00069deccb9c208e39776052d13a9f0a6c SHA512 73bff83189e7a98b144cc407d4cb267277e68f00827f86d24d9b5586fff66691b6566ad2fce11525b11a5bc3b8f0ade753ea996c7468ea5bfbae682aabb2db95
 DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.1-0.20170829224307-fb7d312c2c04.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4
 DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.1-0.20170829224307-fb7d312c2c04.zip 15327 BLAKE2B 539eb4089f20b1764b62d01e4162eae8c70b05b3072b6bc95c888152f1d7f2fd7d5539856cffa9f00b27b2e2e992ff44b23d01fa03174968e1c94108f17d9137 SHA512 e9a0808e740203e81eaddf9345b42267b8a61d995efac06739b5919a14338919a2b784f9ae45e1cfde84b3b0fe1467630f8dd4439ef60445f15a6a5e4d0467d3
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod 324 BLAKE2B 48b4bfac55f83ef9b78680d5354431cb8fa66139bb3e2f81dfb2861c8c2bd0731572372178c8499f8de7f3e7bd8d34f23f5b51935214eb008d52cda1e80953ce SHA512 9060d8bf8fd7a14d2a32656b1e086de1b3ec5658041ea0127fb2f68570c01059854137ce213d5ed648673c6f1843ae467facf647a4c7cd6ff44165eab575d30d
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.zip 19365 BLAKE2B 7d71e90b68a4d6dd2412108b9484f782209f0c0a9531d1158fee4a9e9c377769ac1734a1254f762e055cbbe342ea9c053bd038826a11e327ed7e13a53de18da5 SHA512 6260dbe2a98d9c74cea2648187ce28280acbbb361a93ba75a8c53755c6521cb929ec05ae93046b3515a194133894111fb0717e9d04e00b1711c2520a62d8759d
+DIST go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod 25 BLAKE2B 233f108e33b587684ea189f873a869f028f02d9fee0eea04183b8d5baa445c5f76bbe2b497f5cae24dbe1745d8b26d35f302b23d8b11b95bb7c62f54416548ad SHA512 0ee649ad9b6a2d478469ece9e6ad9b51fa00f002f7a4966068892cdae278680403637897d83a0a423effcb8bddce1d2f9316774cb5890609f6085b906394909f
+DIST go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.zip 27032 BLAKE2B 58b337663e7a5625521925deadcd0d686ccbaa7d04925852bee0ff1cf3ada22c078e9715930dd20858b16bf51632a4e4d7e76986b0092107bc07ad46d132840c SHA512 b0f1b10667e0e600a4ebca7b4cd9983a27c3ec5f2c54cd46eb055cc0a07504642bea7ccfd0e0f6e3d007422633506efe863817b7c7bc9d18eec3642c84b28f8c
+DIST go.uber.org%2Fzap%2F@v%2Fv1.14.0.mod 221 BLAKE2B 586c82887d6cf6582837fb495a46030e1c582b58305fc70c7b88a29e570610e693a298fa7d4eac80bc86231c7fe6f6e27d3fdb5afe084363eb918692a1ccbc59 SHA512 2a7413f6f83e66456c340536502d855772e6de433ca4be1a9cd1572caf5fba7cafc7d377ef529324b5bd8af97830c9eae75768f7c45d4676b455e3959acc82c1
+DIST go.uber.org%2Fzap%2F@v%2Fv1.14.0.zip 223137 BLAKE2B 55b880703f2b061605954bca3ae21959663c88a8e88deb62373f38228da090a81511bbd0bdf24346e76feba4164b48ec892fc587bbb41de7807c52205db1642b SHA512 3021ddb93de155c5834da694c9528f4c8532c951acfd86b6431302461baf1e097210a7d9cdef8fdeb2a1745842bdeceba4e8d8feaa81dfb8884ba629718feb74
 DIST go.uber.org%2Fzap%2F@v%2Fv1.7.1.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
 DIST go.uber.org%2Fzap%2F@v%2Fv1.7.1.zip 201415 BLAKE2B 67ce98a69444d6b8050fc2e3b9d89cdaeda809fccc973f854ad4aa9bb26cdebef3e02c8884b2e066bae6eaf572c0af050e122733c2ab14463aecdf7cc0131db9 SHA512 bae6a0e1e42eb79ed1ebf14ac527970cca6820379174b12e71a7772dbe31e500d37e1a1e7c98b9cac05b1d0158cac3420f091e657e2017a0c48ef7510eb09e51
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20171113213409-9f005a07e0d3.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181025213731-e84da0312774.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190219172222-a4c6cb3142f2.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190404164418-38d8ce5564a5.mod 88 BLAKE2B 22568b660b7e13eed0dd423bfb6b033adf659a2c2b59c6ab12d707aca9f6f7317b7b438640caf6233dea4d9840aec4eb997eff5fcccbcdb193ba81db52d814d7 SHA512 fcfc8d63d333065f1193e9c27efe32a1fab270e450fbe1db533156e00427a13c75691163cd1bc7e9aa26b84d4142625c9fbd755535c575f83d63d82d7a276066
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.zip 1859923 BLAKE2B 289c9b56814fd50a40a350f1e325381ab0789ec38e161eb7c64a988e6fa46dca70892de0b1fa21636d10ff7f8870160714d30d294781024c45782c5e6ff165e8 SHA512 f54cb2da01ee50f7e04fa3caecd06a794c70e9b58c6ac05fee6d09d7a8cf4f0d8ed129f981d457b8ae1ffc79316744b3e6d0ef8534e61fdc4127d41da8cf2700
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200204104054-c9f3fb736b72.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200204104054-c9f3fb736b72.zip 1863059 BLAKE2B ffa21e8af27abc68c144798d86da766b0c246f68c8a35dc94b29b31234e5b7c611651a1b1f79ea70d0fdf3fd54190df608a23f3a0931271e962ea28bd18fb0bc SHA512 0256e72c4734509cd52a04f4cb6e37837ea352fb649d716bd35befedfc825f531b1b07a0f1427cca08f379989c7a1e2a13c9a62de17fee09fb72e647cee367bd
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.zip 1871909 BLAKE2B fa2d419a5bdff43385f70e3c6e61f8c1b3528b6c4e21c3105f66dc358515b6336673188ff68b27a792be9ae69d77cd26c82b7e30605b974e4435634f961c7583 SHA512 de179d887c4ed6ebba0a1cdcfa67b8312b8b2dcd9bd04589d581c872f6fa7a8606ad1376dc6933dec41938781218a91f31fa27331d80cbda30542b8cd14c5af1
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod 327 BLAKE2B 209bd1491b6099491fca7ccfd2fabb500b56112557b4b359819b5f9d18e1587b8b1551acab53ac6c222b66b825c4058ecd6adb1d886f1868b7b96ebbd5865eea SHA512 e16919da8b2302c45f8fab5f0d200f41c2c978ad31eab2b4db18310bfbe09079d738f682920ef6530f1d5f53359ddc3d4bf33fe5cefbcefd440212b31e72ef28
@@ -682,6 +779,7 @@ DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod 25 BLAK
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod 97 BLAKE2B ec2dbdd2dad833a979dc53c8d170b4d0f5d336f4c52f36e3116cba2f3549e42fc3191fa56b81d3b9378a52322b86cf5eb0e947e6002dc1d1bee12f7a6bc2eb36 SHA512 23082eb3c6f3e4330e88178c7511b83a06288b678e517cf8ad5062943d0a0fdcea16973425a8dc01cfeacc32ec05b2dba8edb1adfba2e0bcb2d81cb5060c6085
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.zip 45839 BLAKE2B 7fa2da9301cd760ce923164ca73b1e5c528f41421aeab0c9b90915b72ebf70f350766db083800d7f552c9253452dbac8c5dd48f8701dafb206513d46389b5638 SHA512 979b197fbfc92f81d4d376c4fcb0845a9e86a7a9350841d88ae2f3059c5192e2309df2e19edb76ef96e1e33bd957a83f95fe5c439d72731bd05fa29dda589e23
 DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod 27 BLAKE2B 9bc664bbb78cd778f132bf3504160bf8f6d9950342fa73c461db815f07c0ce2ae5bb2a0ac099457d022e1edf2d07e536566fea043a77aa8b21054254ae854c46 SHA512 a105eb088532321694d3adb5da0b3cdceb7781670a2d4a8a757799e3c8fde02784b981747714cfa8770ed29eb1a0228e0945ad3c363220c39108a7432fc29a32
@@ -707,6 +805,7 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod 172 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191002035440-2ec189313ef0.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191021144547-ec77196f6094.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191112182307-2180aed22343.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
@@ -737,6 +836,7 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190221075227-b4e8571b14e0.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190405154228-4b34438f7a67.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -748,6 +848,7 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190514135907-3a4b5fb9f71f.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -757,6 +858,8 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200102141924-c96a22e43c9c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200102141924-c96a22e43c9c.zip 1913889 BLAKE2B 01685a0af3f641695bde63f581fafa299b77cdebe1c656864df2bffd65366e65aae62c2a8d6420511a0504e44134ce6e96fa27258a4cd43fb2f1c96f11b6349b SHA512 9a710e5e577fc262316202da89d0058d36313a0f2a849e85b413fcf8bddfef57474d5c6d50bbc61d230bf1a47a96a85dd421c42bba7d81e78be00b10b585213e
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.zip 1913169 BLAKE2B c50435879fb1df50f91b1f37dd92f6504047944d41797350f0871a581d5bf17cf474845d3b422fb219c56f7627f2fdb302059d68657bd7860ebc604861cfae72 SHA512 b732d79f0828b9a900595b8dc98377436dcdcc24e2d3d9fe0472a8170d477c0e2487bb4b8e2da4eb7ca9b19251e29ea3b38a9de777d03c069425897ac47e325e
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
@@ -784,9 +887,12 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod 146 BL
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190729092621-ff9f1409240a.mod 155 BLAKE2B 23d2d8015cce612ac3719373303a968d64840c82a2c4442c1c287baf2d7f30e5422fdbf0eb451912f2d38d23a4c36e7730f2c60d5aa1edb55e0b63c0b6359aea SHA512 99b2e19040279bbf7ccafe1de879eaed0dc22c49d60cc3a0e267b533ca04523ca12f35bbbb3b4b85033f1025b036acf9ee3e526d45ff6fa1ecf30d67a3ffedd9
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.zip 2927101 BLAKE2B 0ed9b3d5c567fdb1cd21ece339622c10c11d4a668971e7e6306a4dcaefb93501fa4d327081e25b7beb99c8cd4fc41510e1da76a2569a504b8e4aed18c2c7ee82 SHA512 f8680d8f2709e6d70d080ad4bccaeec40659d831db019061ea6034a9932116e0bd0a20a8d04e38e2e74d0348a25843380b911e6beb3ce966b2112421e801862c
@@ -833,6 +939,8 @@ DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip 41465 BLAKE2B 9a7183d3ac6591399b5208026208047a670c85e8b6014ad29955b168c63bb4953fa972d31025613c2ab12d7207adeebe9578b3c15b65ebb792f1e41df2668297 SHA512 fa7c68a2b5a6bb14f99cda92a3e77aad0e4160f659c54ea73e9813af9ff9449df6b0cab42ee283971e778b6b9da4a6098df805dd284c3b1aedfcd3a0b8504bde
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip 41481 BLAKE2B b952f04dc8d4717c839de5a5b7780ec2434915d11f897cc759647f71073dd3df717e1195ff2f4f804457195886c63620b342a089fc489f5deafa9c928708d4bb SHA512 40a523fc1dcc36677a0dc0e626313d44a308fa2ad5eedf7b616470ae2972dd8f5b78c18384efffa65d58391e60b704ed35db5557a5dce8362ae45204f64b721d
 DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178
 DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod 28 BLAKE2B ee2514c386f6cb3ff4a9b829d903e57372ce765aeab91fb2f29e95358e3472e0612a00f2982f53790159738e416819e368afa03e44bf8f6b43511347bc6d6995 SHA512 7cf7d1933039974dd4fa16febc52cc118bcd0e35c329d4c563c7f411b8000d9e17be5bca9a60d94f5309cbef97b3d176110704ebfbc3c114572cbadf63a55a34
 DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip 40894 BLAKE2B 5edf237401ae1a48c425ffec6fc67146850d7137c7026260e894656f6c832066321d930151bdd7624489e1f768fc04b47b0fd3dac3b2171bd092dff344de16a7 SHA512 f99afc545324e49ef1de05fd4c8dde0dae37094e2fb1b81de8d8c9b8ba9b28f39f9b5ab715c728e4a0375544a48d49c2dbd719fc178d222e0b914a425d9aeb63
@@ -848,12 +956,18 @@ DIST gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.zip 7069 BLAKE2B db430bd
 DIST gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.2.3.mod 36 BLAKE2B 268adc19223fdd60f8dc01a4eb96290f6c4ae0fe2576d3bac9f82caa3e683e79151d9147a8bf76bfe9b2341ec2bd28d6447248fccfd10e4ed348fd02a88473ed SHA512 a963f19cd93e788d0f5de9873a5b0aa152ea592d829c1513e74c277718ac496d6d2a9dcae0462951fb92ad1fdc59381c30eb5b1bcc2dbb3bcab1cb11928ce05e
 DIST gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.3.0.mod 36 BLAKE2B 268adc19223fdd60f8dc01a4eb96290f6c4ae0fe2576d3bac9f82caa3e683e79151d9147a8bf76bfe9b2341ec2bd28d6447248fccfd10e4ed348fd02a88473ed SHA512 a963f19cd93e788d0f5de9873a5b0aa152ea592d829c1513e74c277718ac496d6d2a9dcae0462951fb92ad1fdc59381c30eb5b1bcc2dbb3bcab1cb11928ce05e
 DIST gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.3.0.zip 55262753 BLAKE2B 42ecb6953d818d5b70bb6ca430ffbb5ee9d2e66feca01d89c41856b99c5d3738b031a1c743cd45860499ae6dd8c0fbe6e949c4954f969dc6bf20be39744f5afd SHA512 8d24dac1e8429af5d26697bb75407490f5a36860cfe5fcb4303c17e931c37454b17d51dd54d6b70112475704da0cdbcb851ed21e1303bde950768192749a822b
+DIST gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.5.0.mod 36 BLAKE2B 268adc19223fdd60f8dc01a4eb96290f6c4ae0fe2576d3bac9f82caa3e683e79151d9147a8bf76bfe9b2341ec2bd28d6447248fccfd10e4ed348fd02a88473ed SHA512 a963f19cd93e788d0f5de9873a5b0aa152ea592d829c1513e74c277718ac496d6d2a9dcae0462951fb92ad1fdc59381c30eb5b1bcc2dbb3bcab1cb11928ce05e
+DIST gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.5.0.zip 55267516 BLAKE2B 75bf270c4214dae356f04ee97895e4811443e013fdb373233c9c7d312c346bdfc7bf74953fe95a8e420a32961f76176fce77246bd384d78512944f9983594748 SHA512 b48eb67302402a67fe0d343eafea34d93063e19b592f6cdb10835ad059c740a90e5f7cdd9eccb66c27d806a8bdf630d5d810681fab97666a953c898444840070
 DIST gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.mod 33 BLAKE2B 0c256369010fa14f2dd95100b3f1b75357816012d226e52588c91c6615eb5b56459061d3bdc8201a84985136912c4d8e62dc281600cb53fd2e9e2a545eb3f35d SHA512 0513089b977716c7cb885b4edced551183b397858963f74f002a078920fd1e2178376261abad2c1c475e7de7ba262670de9d25e8a6e801b4c78385370cd0a489
 DIST gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.zip 42124 BLAKE2B 172da6e6ccc58989dc4827d113bc8b93dfefef6321344bc9f569786ca152dd50369e98e7fdf718096d42eec90c1cd14d05cf908afbcc12dce8de6e2248d8463d SHA512 056ad239cc4831d56ef60f0e36c7cfe78a3a4d67160ee81619f63f27ff975247eb53e2b3461b8ee461f8aeee2fe8c37131832304e3eafadbc5ed5a4fb90a994a
 DIST gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20160818020120-3f83fa500528.mod 23 BLAKE2B 43e4570f039747c5b2ecef5c736a4316d8517a202a587de55165960ba41b79431b8f1d3544b02581c224c5cffaf13e2ddefca0b67e14b9227ab136f285a183d0 SHA512 28d79dd9430ce03c7f67d3c798b1dff21019fb5fe588cffa5003fcad5fc1fe5d7c19c8bd7fd4f132acd59f6c24df7aefd4f1b72eb5b7cd45f2d11302f1560c36
 DIST gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20160818020120-3f83fa500528.zip 443024 BLAKE2B 7e0457c8405f182908d271470e0c32edc328778dd32aea9f642da550b46f3a867ce673a4037dbefeeca374fb8d00c8539bef005bdcde80cc36b2b8d0e619439e SHA512 f9a64218de18fc71fefbba88e17bb274244740c9deb75354cf80a3f642ff0def456f18bde589df883994441ea6eccebe7174602a6ae239a0807367766e72950f
+DIST gopkg.in%2Fsrc-d%2Fgo-billy.v4%2F@v%2Fv4.3.2.mod 233 BLAKE2B c1fc00ae50a9dc2ae76534d85ed853a215dc9c685867cf9981544739806e10c47e42e14c702a613f0d19ecadb72ba486c7e8f5ba5d62933b66f2ac5dea267657 SHA512 b39a6f26eb0dae87688149c00768ab232cf1615b55f210d69fd10423034e2ace9c48d8e246cc12e235e93e7ef539dc116083107a589b02f565d6e713ccdfecfc
+DIST gopkg.in%2Fsrc-d%2Fgo-git-fixtures.v3%2F@v%2Fv3.5.0.mod 41 BLAKE2B 03ca301a47c343c381196bfbcfda429e85a7af164f9b299043c5ed8ce3f3c31254ed733b2ae946dbf69b57d8ac0852b4e4be05ff4e2288ff37cc1bac3f902251 SHA512 cf6f2393997a22a6e1f8549bd632b9406ae54a300c1d0981453a1bd6bdb084de71e6f5515cde2d875cc006651d689769159fa3d38fb761c194402d484bde02da
+DIST gopkg.in%2Fsrc-d%2Fgo-git.v4%2F@v%2Fv4.13.1.mod 1258 BLAKE2B 3e337c2ac0851d9f7572156b4bbd960943da2e95815f85f3b72e5bb1d011c244aeb81d7e6177c2aca41068ca5bf3075922b9fbdc871e613a4ff92102958c83d8 SHA512 d8cc528d1e6d8e8f1ca6f3da5d74f63bf70ed45e3dbaacaed27065ea666dce1aed2e675a15b22e6faddc9893f8af7704f95276b8249f2209a6402a61fdbabfd1
 DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod 24 BLAKE2B 24a0c476e6590543f1b46175c4f0e036498afd9af616f6e204cac280e61cc10454e0c2a54fe10b9a7a306715ab966a5822ad78626c6cf20c2c78aac02598c922 SHA512 b147b03cabc4666519b94f4d9c7d9fefdea45810e3e35a9b3d303dba491d486fe03c0d5969a6186adbb9c75665e4f3e9811c7bf4ce72c46280b053611c198c41
 DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip 5099 BLAKE2B 56a68e317ccf9e6b0912331e7006742c3bfffd087742293b3d48ca7069c707db57b3722179c76b8c724303c8d58ac9ebf847c4277ed38a59e1510c676ebc941c SHA512 658ebdf931b23afe9d9d5d33d6c910fba7cf37740efe7052ba7627199c1a5fa4f93f093796674e341109430ba1f1b5ea933ea4a32356f63eaf337f05a562004a
+DIST gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.2.mod 28 BLAKE2B 39555ca91c4818bcc1955c20438d83965ad6f1b2058c6d8590f4c30688eab2ac08dfa1655d4de34bd68006afea1788a89fb0240d60b048be9616c8e44d8a801f SHA512 6fe714c089847582c8c01e055e4bd6b991e8fddc6e420aa03a40efb35fc4ecc5e87a60c44aa82fe004899eab427d4b82262cfebb3331b7443a2c7a68718f8f75
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321eacd25c0af1e5b3f031831266abf6a8e5a5ed12f6381778868383c03433f8ef760d6b42ffbff40150f2fee91dedd0b312f9fe81c7f SHA512 3214b38f348921f6a6d9ef93d4337bb90abd0d101d69d16ad8e38415c22d3b9a85bda873df2eb7a271f9b973ef38b74731405e522e1bb8083c78932762cb5535
@@ -862,6 +976,8 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.zip 80160 BLAKE2B 7c19bcfee1136e9afaa54bb36a296e48c276e21517eead613313409f3ff85f4a961c1dca7926d3c4fd51feb0f537a85de905294d2a310276bb8177f27f3776c3 SHA512 a8fa21d2f84f8c6f28250e9ec7d678ae160963eaa0a373f345fe67804925b2647239a6117ad6f253f458f34ec9f62bc21e8f2071fc9dfe76dbd2a7ded1e1a0e0
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip 80579 BLAKE2B d5de9f0dbf72902ec2244971ef1d62790008d5686ec66b67ca5ded08503168e507d7afdbc38fbfe3b431432e32d2c79540e407a2916ea93de24d45040262366a SHA512 c4a38c485edfd1773be4d3b3dd97c475b1894603526f5d95b40a3ba34b148f3979f0983444009d716e106fea0a2362836a5277f49ea21f764a55279f343a3920
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d01f3d89a2db6930f406aded7889530b04689ea34b53fa2a7af352c264681ee40b1d192c86ca2f7dcc33dca825d355694527e4dbf SHA512 19f019e85b8c9a533c3cf2fd492b1813272f00cce06a56ffe43046935e49ccf6e191ce83f1d236f6355bae7126aa722016f05174687ff2faf54f121958266edf
 DIST gotest.tools%2F@v%2Fv2.2.0+incompatible.mod 20 BLAKE2B 25d11078b1caa5a705f3ae32f28d155683dfe0109d96531b1fc20e632acdc2f8429395975e6509f5dc78bc042b5e70e90fa2daa9790c39eb3422cbc189fb21af SHA512 5a73bc54777766425ba833348d2986408baedcaff86acf1648384bbcb31e302b0b0de38e1a92d53083551e35c62f375262497c0d5a37c9fb39824ae68fe8113e
 DIST gotest.tools%2F@v%2Fv2.2.0+incompatible.zip 88327 BLAKE2B 8730134244a00fb47b24b347ee4758fac8c11e3f627788c03d6568af129acb5b911b08857ab77a619bf571986ee90dd1c6c6aa12fd8e6e26d395a64bb7513a8b SHA512 66a13fedc358399644b869ac4b39a295c6c15d642e074ec66ff042e1b109f9603bc941ff25aaf7d9bc700f6c2fb1f60bf2a637a471e26ae037d822f0f1e2c518
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
@@ -888,6 +1004,7 @@ DIST k8s.io%2Fklog%2F@v%2Fv0.3.4-0.20190719014911-6a023d6d0e09.mod 68 BLAKE2B f7
 DIST k8s.io%2Fklog%2F@v%2Fv0.3.4-0.20190719014911-6a023d6d0e09.zip 37555 BLAKE2B e3ed1adffed1382395f69e2be37d933f77e712bc80c76239196dbbab3a43df510ff0b468e15ecd30cc314069c26959f946571074ffc72b96087e0f7bb5709b54 SHA512 df15a9ff5496f18f6f2ef6a0b9269b8e4d59b009d81030bab3030c2ed0dd0c7c341cce666642d2d87122afcd9ee349adae352a704c939a8942a7ac00a55c3adb
 DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190228160746-b3a7cee44a30.mod 27 BLAKE2B 9c24d9586f1fdfa479ef27be1f45780be8e756931657d77cc78236332838e6f792d3c8be027ad96528ac819933444eebaa1b2a84d7f7fe63f3f4529c2543d259 SHA512 cfddbdd6ebaa638a046c7f20a87048946521ce1320a615bdd77ec639dcc3994fc8cdf3375c1dc523691af6eb4c87cc4b2119c228d222df7f449c03271670fd5a
 DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190709113604-33be087ad058.mod 2063 BLAKE2B 25b919ce7a92cb3a01ee155b007fdb6816621a3273d63ec155ab207cfd1ac3b1184cc62cc4d85da79ca05e9be908fc2825ab3d2319db63bc2d08ae3ba4d47873 SHA512 8efc1a6f4a88dcd325b4c6503be1563be99e0e588ef4b0ec177ee2ef61e08014ed231d17e285efd1363bdfa4f16419ab2087d42c8cd8ac305a0a59a487d599a3
+DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190709113604-33be087ad058.zip 822693 BLAKE2B 6ab7ada74314c78eee02587fda2357715d9bfa80431e94b9ce9faee1f6cd34ab2e81732f61bfeac9b4e135fc977c4d58b682f450ef10f66b6f26fd1a5eea9b5b SHA512 28774105e826575c8c2cb98e6670eb7ec394258eb8ec15aed493f275ea9d80a6efe58224da43a304efe3d1ff9e87a66d336bb68b0987675c05d72dc1cb30386c
 DIST k8s.io%2Fkubernetes%2F@v%2Fv1.13.0.mod 25 BLAKE2B 4060536d51fac9854215957b1108a158adb0b3aeb8bfc659eca1140efdcf79cffe378db6f3cb1f4a4b68aa36468b7d5631e993d5a089eb839bd03b6b608496be SHA512 2349b7dbe8409836cc70d97c5b336f518b809f5731baf05ce68d957c9970895a9b7f89caf09763794cf13824ee29410b3a6e431b2da7f64610895c44b86c4d2d
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20190221042446-c2654d5206da.mod 20 BLAKE2B 98441f8baf467c4c00918acd9c9e22b0e2368cec17b055ac2c518a12eb8546f0c43930c9fca03855e170f7894e3749a55154e9c9f3f6be1e868b229867522a7f SHA512 1184f14f81034921a81e5526c559cd68d07f244998fa134aabc7015ac6e85a6c2e976657fa2f15d2620bec3601e0674324e663f4480394313c3e08af738f89e1
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20190712204705-3dccf664f023.mod 164 BLAKE2B cd4086710de69fcfd2179978f78cb5fb4633a6700b6cab545a83a733fef06e492428deb492149294c3fea186aa01b86080d2a387c1af2a789f35b5f37abfc7ac SHA512 d2cb2a60b25ab16fe3d377d4811a04503c068eef7901bb971f4107d3cc1339279ee95e3c3967651c98112b61fa7bc0fd913dd61a8aec6348180fa8bb357914c5
@@ -902,4 +1019,5 @@ EBUILD filebeat-7.3.2.ebuild 1497 BLAKE2B b130f2fa0916e4b37b238fb87ef6ab80f4d94b
 EBUILD filebeat-7.5.2.ebuild 1508 BLAKE2B 96f0c9cf11a57514fc929223e3a489dd2521334c42434e30ac0a29b7647930c9265dacafb517d681746e919db3ad67fa07f142bef3a7e302e826137957af5131 SHA512 7a8a32a3e8f1677c496df38b22764340f7ded39500a6dcd9f9c28fd82eaae0131e9d17ad43b4952744e9b486ad868ad779bd696af203bf1663c1d5143dbe5cf9
 EBUILD filebeat-7.6.1.ebuild 1508 BLAKE2B 96f0c9cf11a57514fc929223e3a489dd2521334c42434e30ac0a29b7647930c9265dacafb517d681746e919db3ad67fa07f142bef3a7e302e826137957af5131 SHA512 7a8a32a3e8f1677c496df38b22764340f7ded39500a6dcd9f9c28fd82eaae0131e9d17ad43b4952744e9b486ad868ad779bd696af203bf1663c1d5143dbe5cf9
 EBUILD filebeat-7.7.0.ebuild 52042 BLAKE2B 6ee271360e4e29757e9b45afa6a8db0cef2c8ee9bcb75392408d9ccfd4f8c9bd4d4db7a8d897d3b794d1136235f4db7e8dd72de5f3da4ed1b93f25d6d64ad23f SHA512 2ef37ed61908f01ed4aab65f55befb7ddc2f4224ea703ea8f6d3e3991ae4fe5c473b363b73cf1935c4f597811479a1d486da0ed2858664add8a94dd8a4f8f1a6
+EBUILD filebeat-7.8.0.ebuild 55345 BLAKE2B a4f298fb0d0ec3ce5639cee82c1bf481dc625e748dc7e8ca168ad64466506bb38323e80d4d42ada7e74ea70f0515e6e2b89cee63cf7416e7f33e3db7fcf176a0 SHA512 187c1b52d7f7e4d680945f73f9676da8bdc5f2e8ba5c917e405691344e58c2a025fa0604de264ea0cd36a5112dd77cf3cda6402bdca17a59bfecf0614001d3f8
 MISC metadata.xml 461 BLAKE2B 8bd064daf5ee2d3fe746a73bf36f01926fee1f9796b29499a7fb1db844aface3be7dfd137ed31f606e78834c1d7a135d0119f400244ba33ce3feb81fa792eb6e SHA512 903c43c9cf4b371e34afffd0b425086d5fba6f37af0d761fc0065d114dc843ea0dcdd439682e48749bdf2f9138bfc3dc6cfcc6490503daeb7a71ce5706a779d8
diff --git a/app-admin/filebeat/filebeat-7.8.0.ebuild b/app-admin/filebeat/filebeat-7.8.0.ebuild
new file mode 100644
index 000000000000..ad82014eecdb
--- /dev/null
+++ b/app-admin/filebeat/filebeat-7.8.0.ebuild
@@ -0,0 +1,1019 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+EGO_SUM=(
+	"4d63.com/embedfiles v0.0.0-20190311033909-995e0740726f"
+	"4d63.com/embedfiles v0.0.0-20190311033909-995e0740726f/go.mod"
+	"4d63.com/tz v1.1.1-0.20191124060701-6d37baae851b"
+	"4d63.com/tz v1.1.1-0.20191124060701-6d37baae851b/go.mod"
+	"bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod"
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.38.0/go.mod"
+	"cloud.google.com/go v0.44.1/go.mod"
+	"cloud.google.com/go v0.44.2/go.mod"
+	"cloud.google.com/go v0.45.1/go.mod"
+	"cloud.google.com/go v0.46.3/go.mod"
+	"cloud.google.com/go v0.51.0"
+	"cloud.google.com/go v0.51.0/go.mod"
+	"cloud.google.com/go/bigquery v1.0.1"
+	"cloud.google.com/go/bigquery v1.0.1/go.mod"
+	"cloud.google.com/go/datastore v1.0.0"
+	"cloud.google.com/go/datastore v1.0.0/go.mod"
+	"cloud.google.com/go/pubsub v1.0.1"
+	"cloud.google.com/go/pubsub v1.0.1/go.mod"
+	"cloud.google.com/go/storage v1.0.0"
+	"cloud.google.com/go/storage v1.0.0/go.mod"
+	"code.cloudfoundry.org/go-diodes v0.0.0-20190809170250-f77fb823c7ee"
+	"code.cloudfoundry.org/go-diodes v0.0.0-20190809170250-f77fb823c7ee/go.mod"
+	"code.cloudfoundry.org/go-loggregator v7.4.0+incompatible"
+	"code.cloudfoundry.org/go-loggregator v7.4.0+incompatible/go.mod"
+	"code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f"
+	"code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f/go.mod"
+	"code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a"
+	"code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a/go.mod"
+	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+	"github.com/Azure/azure-amqp-common-go/v3 v3.0.0"
+	"github.com/Azure/azure-amqp-common-go/v3 v3.0.0/go.mod"
+	"github.com/Azure/azure-event-hubs-go/v3 v3.1.2"
+	"github.com/Azure/azure-event-hubs-go/v3 v3.1.2/go.mod"
+	"github.com/Azure/azure-pipeline-go v0.1.8/go.mod"
+	"github.com/Azure/azure-pipeline-go v0.1.9/go.mod"
+	"github.com/Azure/azure-pipeline-go v0.2.1"
+	"github.com/Azure/azure-pipeline-go v0.2.1/go.mod"
+	"github.com/Azure/azure-sdk-for-go v37.1.0+incompatible"
+	"github.com/Azure/azure-sdk-for-go v37.1.0+incompatible/go.mod"
+	"github.com/Azure/azure-storage-blob-go v0.6.0/go.mod"
+	"github.com/Azure/azure-storage-blob-go v0.8.0"
+	"github.com/Azure/azure-storage-blob-go v0.8.0/go.mod"
+	"github.com/Azure/go-amqp v0.12.6"
+	"github.com/Azure/go-amqp v0.12.6/go.mod"
+	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
+	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
+	"github.com/Azure/go-autorest v12.2.0+incompatible"
+	"github.com/Azure/go-autorest v12.2.0+incompatible/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.4"
+	"github.com/Azure/go-autorest/autorest v0.9.4/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.1"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod"
+	"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2"
+	"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.2.0"
+	"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.3.0"
+	"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/to v0.3.0"
+	"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/validation v0.2.0"
+	"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/logger v0.1.0"
+	"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/tracing v0.5.0"
+	"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
+	"github.com/BurntSushi/toml v0.3.1"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/Masterminds/semver v1.4.2"
+	"github.com/Masterminds/semver v1.4.2/go.mod"
+	"github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5"
+	"github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod"
+	"github.com/Microsoft/hcsshim v0.8.7"
+	"github.com/Microsoft/hcsshim v0.8.7/go.mod"
+	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+	"github.com/PuerkitoBio/purell v1.0.0/go.mod"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+	"github.com/Shopify/toxiproxy v2.1.4+incompatible"
+	"github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod"
+	"github.com/StackExchange/wmi v0.0.0-20170221213301-9f32b5905fd6"
+	"github.com/StackExchange/wmi v0.0.0-20170221213301-9f32b5905fd6/go.mod"
+	"github.com/adriansr/fsnotify v0.0.0-20180417234312-c9bbe1f46f1d"
+	"github.com/adriansr/fsnotify v0.0.0-20180417234312-c9bbe1f46f1d/go.mod"
+	"github.com/adriansr/gopacket v1.1.18-0.20200327165309-dd62abfa8a41"
+	"github.com/adriansr/gopacket v1.1.18-0.20200327165309-dd62abfa8a41/go.mod"
+	"github.com/aerospike/aerospike-client-go v1.27.1-0.20170612174108-0f3b54da6bdc"
+	"github.com/aerospike/aerospike-client-go v1.27.1-0.20170612174108-0f3b54da6bdc/go.mod"
+	"github.com/akavel/rsrc v0.8.0"
+	"github.com/akavel/rsrc v0.8.0/go.mod"
+	"github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+	"github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20"
+	"github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20/go.mod"
+	"github.com/andrewkroh/sys v0.0.0-20151128191922-287798fe3e43"
+	"github.com/andrewkroh/sys v0.0.0-20151128191922-287798fe3e43/go.mod"
+	"github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod"
+	"github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod"
+	"github.com/antlr/antlr4 v0.0.0-20200326173327-a4c66dc863bb"
+	"github.com/antlr/antlr4 v0.0.0-20200326173327-a4c66dc863bb/go.mod"
+	"github.com/armon/go-radix v1.0.0"
+	"github.com/armon/go-radix v1.0.0/go.mod"
+	"github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5"
+	"github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod"
+	"github.com/aws/aws-lambda-go v1.6.0"
+	"github.com/aws/aws-lambda-go v1.6.0/go.mod"
+	"github.com/aws/aws-sdk-go-v2 v0.9.0"
+	"github.com/aws/aws-sdk-go-v2 v0.9.0/go.mod"
+	"github.com/awslabs/goformation/v3 v3.1.0/go.mod"
+	"github.com/awslabs/goformation/v4 v4.1.0"
+	"github.com/awslabs/goformation/v4 v4.1.0/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/beorn7/perks v1.0.1"
+	"github.com/beorn7/perks v1.0.1/go.mod"
+	"github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2"
+	"github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2/go.mod"
+	"github.com/blang/semver v3.1.0+incompatible/go.mod"
+	"github.com/bradleyfalzon/ghinstallation v1.1.0"
+	"github.com/bradleyfalzon/ghinstallation v1.1.0/go.mod"
+	"github.com/bsm/sarama-cluster v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible"
+	"github.com/bsm/sarama-cluster v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible/go.mod"
+	"github.com/cavaliercoder/badio v0.0.0-20160213150051-ce5280129e9e"
+	"github.com/cavaliercoder/badio v0.0.0-20160213150051-ce5280129e9e/go.mod"
+	"github.com/cavaliercoder/go-rpm v0.0.0-20190131055624-7a9c54e3d83e"
+	"github.com/cavaliercoder/go-rpm v0.0.0-20190131055624-7a9c54e3d83e/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/cespare/xxhash/v2 v2.1.1"
+	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f"
+	"github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f/go.mod"
+	"github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4"
+	"github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4/go.mod"
+	"github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0"
+	"github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod"
+	"github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod"
+	"github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod"
+	"github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod"
+	"github.com/containerd/containerd v1.3.3"
+	"github.com/containerd/containerd v1.3.3/go.mod"
+	"github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod"
+	"github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41"
+	"github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41/go.mod"
+	"github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod"
+	"github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c"
+	"github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c/go.mod"
+	"github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod"
+	"github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod"
+	"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod"
+	"github.com/coreos/bbolt v1.3.1-coreos.6.0.20180318001526-af9db2027c98"
+	"github.com/coreos/bbolt v1.3.1-coreos.6.0.20180318001526-af9db2027c98/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+	"github.com/coreos/go-systemd/v22 v22.0.0"
+	"github.com/coreos/go-systemd/v22 v22.0.0/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea"
+	"github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod"
+	"github.com/creack/pty v1.1.7/go.mod"
+	"github.com/cucumber/godog v0.8.1"
+	"github.com/cucumber/godog v0.8.1/go.mod"
+	"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892"
+	"github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892/go.mod"
+	"github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e"
+	"github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e/go.mod"
+	"github.com/devigned/tab v0.1.1/go.mod"
+	"github.com/devigned/tab v0.1.2-0.20190607222403-0c15cf42f9a2"
+	"github.com/devigned/tab v0.1.2-0.20190607222403-0c15cf42f9a2/go.mod"
+	"github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible"
+	"github.com/dgrijalva/jwt-go v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible/go.mod"
+	"github.com/digitalocean/go-libvirt v0.0.0-20180301200012-6075ea3c39a1"
+	"github.com/digitalocean/go-libvirt v0.0.0-20180301200012-6075ea3c39a1/go.mod"
+	"github.com/dimchansky/utfbom v1.1.0"
+	"github.com/dimchansky/utfbom v1.1.0/go.mod"
+	"github.com/dlclark/regexp2 v1.1.7-0.20171009020623-7632a260cbaf"
+	"github.com/dlclark/regexp2 v1.1.7-0.20171009020623-7632a260cbaf/go.mod"
+	"github.com/docker/distribution v2.7.1+incompatible"
+	"github.com/docker/distribution v2.7.1+incompatible/go.mod"
+	"github.com/docker/engine v0.0.0-20191113042239-ea84732a7725"
+	"github.com/docker/engine v0.0.0-20191113042239-ea84732a7725/go.mod"
+	"github.com/docker/go-connections v0.4.0"
+	"github.com/docker/go-connections v0.4.0/go.mod"
+	"github.com/docker/go-metrics v0.0.1"
+	"github.com/docker/go-metrics v0.0.1/go.mod"
+	"github.com/docker/go-units v0.4.0"
+	"github.com/docker/go-units v0.4.0/go.mod"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+	"github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6"
+	"github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6/go.mod"
+	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4"
+	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
+	"github.com/eapache/go-resiliency v1.2.0"
+	"github.com/eapache/go-resiliency v1.2.0/go.mod"
+	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21"
+	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
+	"github.com/eapache/queue v1.1.0"
+	"github.com/eapache/queue v1.1.0/go.mod"
+	"github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2"
+	"github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2/go.mod"
+	"github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3"
+	"github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3/go.mod"
+	"github.com/elastic/ecs v1.5.0"
+	"github.com/elastic/ecs v1.5.0/go.mod"
+	"github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270"
+	"github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270/go.mod"
+	"github.com/elastic/go-libaudit v0.4.0"
+	"github.com/elastic/go-libaudit v0.4.0/go.mod"
+	"github.com/elastic/go-licenser v0.2.1"
+	"github.com/elastic/go-licenser v0.2.1/go.mod"
+	"github.com/elastic/go-lookslike v0.3.0"
+	"github.com/elastic/go-lookslike v0.3.0/go.mod"
+	"github.com/elastic/go-lumber v0.1.0"
+	"github.com/elastic/go-lumber v0.1.0/go.mod"
+	"github.com/elastic/go-perf v0.0.0-20191212140718-9c656876f595"
+	"github.com/elastic/go-perf v0.0.0-20191212140718-9c656876f595/go.mod"
+	"github.com/elastic/go-plugins-helpers v0.0.0-20200207104224-bdf17607b79f"
+	"github.com/elastic/go-plugins-helpers v0.0.0-20200207104224-bdf17607b79f/go.mod"
+	"github.com/elastic/go-seccomp-bpf v1.1.0"
+	"github.com/elastic/go-seccomp-bpf v1.1.0/go.mod"
+	"github.com/elastic/go-structform v0.0.6"
+	"github.com/elastic/go-structform v0.0.6/go.mod"
+	"github.com/elastic/go-sysinfo v1.1.1/go.mod"
+	"github.com/elastic/go-sysinfo v1.3.0"
+	"github.com/elastic/go-sysinfo v1.3.0/go.mod"
+	"github.com/elastic/go-txfile v0.0.7"
+	"github.com/elastic/go-txfile v0.0.7/go.mod"
+	"github.com/elastic/go-ucfg v0.7.0/go.mod"
+	"github.com/elastic/go-ucfg v0.8.3"
+	"github.com/elastic/go-ucfg v0.8.3/go.mod"
+	"github.com/elastic/go-windows v1.0.0/go.mod"
+	"github.com/elastic/go-windows v1.0.1"
+	"github.com/elastic/go-windows v1.0.1/go.mod"
+	"github.com/elastic/gosigar v0.10.5"
+	"github.com/elastic/gosigar v0.10.5/go.mod"
+	"github.com/elastic/sarama v1.24.1-elastic.0.20200519143807-cbc80333a91e"
+	"github.com/elastic/sarama v1.24.1-elastic.0.20200519143807-cbc80333a91e/go.mod"
+	"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e"
+	"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
+	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+	"github.com/emirpasic/gods v1.12.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550/go.mod"
+	"github.com/evanphx/json-patch v4.2.0+incompatible"
+	"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
+	"github.com/fatih/color v1.5.0"
+	"github.com/fatih/color v1.5.0/go.mod"
+	"github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
+	"github.com/fortytw2/leaktest v1.3.0"
+	"github.com/fortytw2/leaktest v1.3.0/go.mod"
+	"github.com/frankban/quicktest v1.7.2"
+	"github.com/frankban/quicktest v1.7.2/go.mod"
+	"github.com/garyburd/redigo v1.0.1-0.20160525165706-b8dc90050f24"
+	"github.com/garyburd/redigo v1.0.1-0.20160525165706-b8dc90050f24/go.mod"
+	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/gliderlabs/ssh v0.2.2/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-kit/kit v0.9.0"
+	"github.com/go-kit/kit v0.9.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.4.0"
+	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+	"github.com/go-logr/logr v0.1.0/go.mod"
+	"github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab"
+	"github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod"
+	"github.com/go-ole/go-ole v1.2.5-0.20190920104607-14974a1cf647"
+	"github.com/go-ole/go-ole v1.2.5-0.20190920104607-14974a1cf647/go.mod"
+	"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+	"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+	"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+	"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+	"github.com/go-sourcemap/sourcemap v2.1.2+incompatible"
+	"github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod"
+	"github.com/go-sql-driver/mysql v1.4.0/go.mod"
+	"github.com/go-sql-driver/mysql v1.4.1"
+	"github.com/go-sql-driver/mysql v1.4.1/go.mod"
+	"github.com/go-stack/stack v1.8.0"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/gocarina/gocsv v0.0.0-20170324095351-ffef3ffc77be"
+	"github.com/gocarina/gocsv v0.0.0-20170324095351-ffef3ffc77be/go.mod"
+	"github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e"
+	"github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod"
+	"github.com/godbus/dbus/v5 v5.0.3"
+	"github.com/godbus/dbus/v5 v5.0.3/go.mod"
+	"github.com/godror/godror v0.10.4"
+	"github.com/godror/godror v0.10.4/go.mod"
+	"github.com/gofrs/flock v0.7.1/go.mod"
+	"github.com/gofrs/flock v0.7.2-0.20190320160742-5135e617513b"
+	"github.com/gofrs/flock v0.7.2-0.20190320160742-5135e617513b/go.mod"
+	"github.com/gofrs/uuid v3.2.0+incompatible"
+	"github.com/gofrs/uuid v3.2.0+incompatible/go.mod"
+	"github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod"
+	"github.com/gogo/protobuf v1.0.0/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/gogo/protobuf v1.3.1"
+	"github.com/gogo/protobuf v1.3.1/go.mod"
+	"github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe"
+	"github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7"
+	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/mock v1.3.1/go.mod"
+	"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/snappy v0.0.1"
+	"github.com/golang/snappy v0.0.1/go.mod"
+	"github.com/google/btree v0.0.0-20160524151835-7d79101e329e/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/flatbuffers v1.7.2-0.20170925184458-7a6b2bf521e9"
+	"github.com/google/flatbuffers v1.7.2-0.20170925184458-7a6b2bf521e9/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-cmp v0.4.0"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/go-github/v28 v28.1.1"
+	"github.com/google/go-github/v28 v28.1.1/go.mod"
+	"github.com/google/go-github/v29 v29.0.2"
+	"github.com/google/go-github/v29 v29.0.2/go.mod"
+	"github.com/google/go-querystring v1.0.0"
+	"github.com/google/go-querystring v1.0.0/go.mod"
+	"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
+	"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod"
+	"github.com/google/gofuzz v1.0.0"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+	"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+	"github.com/google/renameio v0.1.0/go.mod"
+	"github.com/google/subcommands v1.0.1/go.mod"
+	"github.com/google/uuid v1.0.0/go.mod"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/google/uuid v1.1.2-0.20190416172445-c2e93f3ae59f"
+	"github.com/google/uuid v1.1.2-0.20190416172445-c2e93f3ae59f/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.5"
+	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+	"github.com/googleapis/gnostic v0.0.0-20170426233943-68f4ded48ba9/go.mod"
+	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
+	"github.com/googleapis/gnostic v0.3.1-0.20190624222214-25d8b0b66985"
+	"github.com/googleapis/gnostic v0.3.1-0.20190624222214-25d8b0b66985/go.mod"
+	"github.com/gophercloud/gophercloud v0.0.0-20190126172459-c818fa66e4c8/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gorhill/cronexpr v0.0.0-20161205141322-d520615e531a"
+	"github.com/gorhill/cronexpr v0.0.0-20161205141322-d520615e531a/go.mod"
+	"github.com/gorilla/mux v1.7.2"
+	"github.com/gorilla/mux v1.7.2/go.mod"
+	"github.com/gorilla/websocket v1.4.1"
+	"github.com/gorilla/websocket v1.4.1/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.13.0"
+	"github.com/grpc-ecosystem/grpc-gateway v1.13.0/go.mod"
+	"github.com/h2non/filetype v1.0.12"
+	"github.com/h2non/filetype v1.0.12/go.mod"
+	"github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce"
+	"github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874"
+	"github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0"
+	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.2"
+	"github.com/hashicorp/go-uuid v1.0.2/go.mod"
+	"github.com/hashicorp/go-version v1.0.0"
+	"github.com/hashicorp/go-version v1.0.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.2-0.20190520140433-59383c442f7d"
+	"github.com/hashicorp/golang-lru v0.5.2-0.20190520140433-59383c442f7d/go.mod"
+	"github.com/haya14busa/go-actions-toolkit v0.0.0-20200105081403-ca0307860f01"
+	"github.com/haya14busa/go-actions-toolkit v0.0.0-20200105081403-ca0307860f01/go.mod"
+	"github.com/haya14busa/go-checkstyle v0.0.0-20170303121022-5e9d09f51fa1/go.mod"
+	"github.com/haya14busa/secretbox v0.0.0-20180525171038-07c7ecf409f5/go.mod"
+	"github.com/hpcloud/tail v1.0.0"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+	"github.com/imdario/mergo v0.3.5/go.mod"
+	"github.com/imdario/mergo v0.3.6"
+	"github.com/imdario/mergo v0.3.6/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod"
+	"github.com/jcmturner/gofork v1.0.0"
+	"github.com/jcmturner/gofork v1.0.0/go.mod"
+	"github.com/jessevdk/go-flags v1.4.0/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+	"github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5"
+	"github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5/go.mod"
+	"github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901"
+	"github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901/go.mod"
+	"github.com/joho/godotenv v1.3.0"
+	"github.com/joho/godotenv v1.3.0/go.mod"
+	"github.com/josephspurrier/goversioninfo v0.0.0-20200309025242-14b0ab84c6ca"
+	"github.com/josephspurrier/goversioninfo v0.0.0-20200309025242-14b0ab84c6ca/go.mod"
+	"github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod"
+	"github.com/jpillora/backoff v1.0.0"
+	"github.com/jpillora/backoff v1.0.0/go.mod"
+	"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
+	"github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.7"
+	"github.com/json-iterator/go v1.1.7/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jstemmer/go-junit-report v0.9.1"
+	"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/justinas/nosurf v1.1.0/go.mod"
+	"github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod"
+	"github.com/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/errcheck v1.2.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/klauspost/compress v1.9.8"
+	"github.com/klauspost/compress v1.9.8/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pretty v0.2.0"
+	"github.com/kr/pretty v0.2.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/pty v1.1.8/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kylelemons/godebug v1.1.0"
+	"github.com/kylelemons/godebug v1.1.0/go.mod"
+	"github.com/lib/pq v1.0.0/go.mod"
+	"github.com/lib/pq v1.1.2-0.20190507191818-2ff3cb3adc01"
+	"github.com/lib/pq v1.1.2-0.20190507191818-2ff3cb3adc01/go.mod"
+	"github.com/magefile/mage v1.9.0"
+	"github.com/magefile/mage v1.9.0/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+	"github.com/mailru/easyjson v0.7.1"
+	"github.com/mailru/easyjson v0.7.1/go.mod"
+	"github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11"
+	"github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11/go.mod"
+	"github.com/mattn/go-colorable v0.0.8"
+	"github.com/mattn/go-colorable v0.0.8/go.mod"
+	"github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod"
+	"github.com/mattn/go-ieproxy v0.0.0-20191113090002-7c0f6868bffe"
+	"github.com/mattn/go-ieproxy v0.0.0-20191113090002-7c0f6868bffe/go.mod"
+	"github.com/mattn/go-isatty v0.0.2"
+	"github.com/mattn/go-isatty v0.0.2/go.mod"
+	"github.com/mattn/go-shellwords v1.0.7"
+	"github.com/mattn/go-shellwords v1.0.7/go.mod"
+	"github.com/mattn/go-sqlite3 v1.9.0"
+	"github.com/mattn/go-sqlite3 v1.9.0/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod"
+	"github.com/miekg/dns v1.1.15"
+	"github.com/miekg/dns v1.1.15/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+	"github.com/mitchellh/gox v1.0.1"
+	"github.com/mitchellh/gox v1.0.1/go.mod"
+	"github.com/mitchellh/hashstructure v0.0.0-20170116052023-ab25296c0f51"
+	"github.com/mitchellh/hashstructure v0.0.0-20170116052023-ab25296c0f51/go.mod"
+	"github.com/mitchellh/iochan v1.0.0"
+	"github.com/mitchellh/iochan v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/morikuni/aec v1.0.0"
+	"github.com/morikuni/aec v1.0.0/go.mod"
+	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+	"github.com/oklog/ulid v1.3.1"
+	"github.com/oklog/ulid v1.3.1/go.mod"
+	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+	"github.com/onsi/ginkgo v1.5.0/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.8.0/go.mod"
+	"github.com/onsi/ginkgo v1.10.1"
+	"github.com/onsi/ginkgo v1.10.1/go.mod"
+	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+	"github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod"
+	"github.com/onsi/gomega v1.2.0/go.mod"
+	"github.com/onsi/gomega v1.4.3/go.mod"
+	"github.com/onsi/gomega v1.5.0/go.mod"
+	"github.com/onsi/gomega v1.7.0"
+	"github.com/onsi/gomega v1.7.0/go.mod"
+	"github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod"
+	"github.com/opencontainers/go-digest v1.0.0-rc1/go.mod"
+	"github.com/opencontainers/go-digest v1.0.0-rc1.0.20190228220655-ac19fd6e7483"
+	"github.com/opencontainers/go-digest v1.0.0-rc1.0.20190228220655-ac19fd6e7483/go.mod"
+	"github.com/opencontainers/image-spec v1.0.1/go.mod"
+	"github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6"
+	"github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6/go.mod"
+	"github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod"
+	"github.com/opencontainers/runc v1.0.0-rc9"
+	"github.com/opencontainers/runc v1.0.0-rc9/go.mod"
+	"github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod"
+	"github.com/opencontainers/runtime-spec v1.0.1/go.mod"
+	"github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod"
+	"github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2"
+	"github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2/go.mod"
+	"github.com/pelletier/go-buffruneio v0.2.0/go.mod"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+	"github.com/pierrec/lz4 v2.4.1+incompatible"
+	"github.com/pierrec/lz4 v2.4.1+incompatible/go.mod"
+	"github.com/pierrre/gotestcover v0.0.0-20160113212533-7b94f124d338"
+	"github.com/pierrre/gotestcover v0.0.0-20160113212533-7b94f124d338/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v1.1.0/go.mod"
+	"github.com/prometheus/client_golang v1.1.1-0.20190913103102-20428fa0bffc"
+	"github.com/prometheus/client_golang v1.1.1-0.20190913103102-20428fa0bffc/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/prometheus/common v0.4.1/go.mod"
+	"github.com/prometheus/common v0.6.0/go.mod"
+	"github.com/prometheus/common v0.7.0"
+	"github.com/prometheus/common v0.7.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190425082905-87a4384529e0/go.mod"
+	"github.com/prometheus/procfs v0.0.2/go.mod"
+	"github.com/prometheus/procfs v0.0.3/go.mod"
+	"github.com/prometheus/procfs v0.0.5/go.mod"
+	"github.com/prometheus/procfs v0.0.11"
+	"github.com/prometheus/procfs v0.0.11/go.mod"
+	"github.com/prometheus/prometheus v2.5.0+incompatible"
+	"github.com/prometheus/prometheus v2.5.0+incompatible/go.mod"
+	"github.com/rakyll/statik v0.1.6/go.mod"
+	"github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563"
+	"github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod"
+	"github.com/reviewdog/errorformat v0.0.0-20200109134752-8983be9bc7dd"
+	"github.com/reviewdog/errorformat v0.0.0-20200109134752-8983be9bc7dd/go.mod"
+	"github.com/reviewdog/reviewdog v0.9.17"
+	"github.com/reviewdog/reviewdog v0.9.17/go.mod"
+	"github.com/rogpeppe/fastuuid v1.2.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/samuel/go-parser v0.0.0-20130731160455-ca8abbf65d0e"
+	"github.com/samuel/go-parser v0.0.0-20130731160455-ca8abbf65d0e/go.mod"
+	"github.com/samuel/go-thrift v0.0.0-20140522043831-2187045faa54"
+	"github.com/samuel/go-thrift v0.0.0-20140522043831-2187045faa54/go.mod"
+	"github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b"
+	"github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b/go.mod"
+	"github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522/go.mod"
+	"github.com/sanathkr/yaml v1.0.1-0.20170819201035-0056894fa522"
+	"github.com/sanathkr/yaml v1.0.1-0.20170819201035-0056894fa522/go.mod"
+	"github.com/santhosh-tekuri/jsonschema v1.2.4"
+	"github.com/santhosh-tekuri/jsonschema v1.2.4/go.mod"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/shirou/gopsutil v2.19.11+incompatible"
+	"github.com/shirou/gopsutil v2.19.11+incompatible/go.mod"
+	"github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.1/go.mod"
+	"github.com/sirupsen/logrus v1.4.2"
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a"
+	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
+	"github.com/spf13/afero v1.2.2/go.mod"
+	"github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod"
+	"github.com/spf13/cobra v0.0.3"
+	"github.com/spf13/cobra v0.0.3/go.mod"
+	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+	"github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod"
+	"github.com/spf13/pflag v1.0.1/go.mod"
+	"github.com/spf13/pflag v1.0.3"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/src-d/gcfg v1.4.0/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/objx v0.2.0"
+	"github.com/stretchr/objx v0.2.0/go.mod"
+	"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.5.0"
+	"github.com/stretchr/testify v1.5.0/go.mod"
+	"github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod"
+	"github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b"
+	"github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b/go.mod"
+	"github.com/tsg/gopacket v0.0.0-20190320122513-dd3d0e41124a"
+	"github.com/tsg/gopacket v0.0.0-20190320122513-dd3d0e41124a/go.mod"
+	"github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod"
+	"github.com/urso/diag v0.0.0-20200125202105-ffdc32ff5518/go.mod"
+	"github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797"
+	"github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797/go.mod"
+	"github.com/urso/diag-ecs v0.0.0-20200210114345-ab085841dcb9"
+	"github.com/urso/diag-ecs v0.0.0-20200210114345-ab085841dcb9/go.mod"
+	"github.com/urso/ecslog v0.0.1"
+	"github.com/urso/ecslog v0.0.1/go.mod"
+	"github.com/urso/go-bin v0.0.0-20180220135811-781c575c9f0e"
+	"github.com/urso/go-bin v0.0.0-20180220135811-781c575c9f0e/go.mod"
+	"github.com/urso/magetools v0.0.0-20190919040553-290c89e0c230/go.mod"
+	"github.com/urso/magetools v0.0.0-20200125210132-c2e338f92f3a"
+	"github.com/urso/magetools v0.0.0-20200125210132-c2e338f92f3a/go.mod"
+	"github.com/urso/qcgen v0.0.0-20180131103024-0b059e7db4f4"
+	"github.com/urso/qcgen v0.0.0-20180131103024-0b059e7db4f4/go.mod"
+	"github.com/urso/sderr v0.0.0-20200210124243-c2a16f3d43ec"
+	"github.com/urso/sderr v0.0.0-20200210124243-c2a16f3d43ec/go.mod"
+	"github.com/vbatts/tar-split v0.11.1/go.mod"
+	"github.com/vmware/govmomi v0.0.0-20170802214208-2cad15190b41"
+	"github.com/vmware/govmomi v0.0.0-20170802214208-2cad15190b41/go.mod"
+	"github.com/xanzy/go-gitlab v0.22.3"
+	"github.com/xanzy/go-gitlab v0.22.3/go.mod"
+	"github.com/xanzy/ssh-agent v0.2.1/go.mod"
+	"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c"
+	"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod"
+	"github.com/xdg/stringprep v1.0.0"
+	"github.com/xdg/stringprep v1.0.0/go.mod"
+	"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod"
+	"github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb"
+	"github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod"
+	"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415"
+	"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod"
+	"github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod"
+	"github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56"
+	"github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56/go.mod"
+	"github.com/yuin/gopher-lua v0.0.0-20170403160031-b402f3114ec7"
+	"github.com/yuin/gopher-lua v0.0.0-20170403160031-b402f3114ec7/go.mod"
+	"go.elastic.co/apm v1.7.2"
+	"go.elastic.co/apm v1.7.2/go.mod"
+	"go.elastic.co/apm/module/apmelasticsearch v1.7.2"
+	"go.elastic.co/apm/module/apmelasticsearch v1.7.2/go.mod"
+	"go.elastic.co/apm/module/apmhttp v1.7.2"
+	"go.elastic.co/apm/module/apmhttp v1.7.2/go.mod"
+	"go.elastic.co/ecszap v0.1.1-0.20200424093508-cdd95a104193"
+	"go.elastic.co/ecszap v0.1.1-0.20200424093508-cdd95a104193/go.mod"
+	"go.elastic.co/fastjson v1.0.0"
+	"go.elastic.co/fastjson v1.0.0/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.opencensus.io v0.22.0/go.mod"
+	"go.opencensus.io v0.22.2"
+	"go.opencensus.io v0.22.2/go.mod"
+	"go.uber.org/atomic v1.5.0"
+	"go.uber.org/atomic v1.5.0/go.mod"
+	"go.uber.org/multierr v1.3.0"
+	"go.uber.org/multierr v1.3.0/go.mod"
+	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee"
+	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
+	"go.uber.org/zap v1.14.0"
+	"go.uber.org/zap v1.14.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod"
+	"golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
+	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+	"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
+	"golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod"
+	"golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37"
+	"golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+	"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+	"golang.org/x/exp v0.0.0-20191227195350-da58074b4299"
+	"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+	"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+	"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f"
+	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+	"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+	"golang.org/x/mod v0.1.0/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+	"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+	"golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
+	"golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod"
+	"golang.org/x/net v0.0.0-20191021144547-ec77196f6094/go.mod"
+	"golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod"
+	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+	"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190130055435-99b60b757ec1/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d"
+	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod"
+	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+	"golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod"
+	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+	"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod"
+	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+	"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
+	"golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod"
+	"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
+	"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod"
+	"golang.org/x/sys v0.0.0-20191025021431-6c3a3bfe00ae/go.mod"
+	"golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod"
+	"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+	"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+	"golang.org/x/sys v0.0.0-20200102141924-c96a22e43c9c"
+	"golang.org/x/sys v0.0.0-20200102141924-c96a22e43c9c/go.mod"
+	"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e"
+	"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
+	"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod"
+	"golang.org/x/text v0.3.2"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/time v0.0.0-20161028155119-f51c12702a4d/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
+	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+	"golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod"
+	"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+	"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+	"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+	"golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod"
+	"golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod"
+	"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+	"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4"
+	"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/api v0.7.0/go.mod"
+	"google.golang.org/api v0.8.0/go.mod"
+	"google.golang.org/api v0.9.0/go.mod"
+	"google.golang.org/api v0.15.0"
+	"google.golang.org/api v0.15.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.2.0/go.mod"
+	"google.golang.org/appengine v1.3.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/appengine v1.5.0/go.mod"
+	"google.golang.org/appengine v1.6.1/go.mod"
+	"google.golang.org/appengine v1.6.5"
+	"google.golang.org/appengine v1.6.5/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+	"google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod"
+	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb"
+	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.1/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.24.0/go.mod"
+	"google.golang.org/grpc v1.26.0/go.mod"
+	"google.golang.org/grpc v1.27.1"
+	"google.golang.org/grpc v1.27.1/go.mod"
+	"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
+	"gopkg.in/inf.v0 v0.9.0"
+	"gopkg.in/inf.v0 v0.9.0/go.mod"
+	"gopkg.in/jcmturner/aescts.v1 v1.0.1"
+	"gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod"
+	"gopkg.in/jcmturner/dnsutils.v1 v1.0.1"
+	"gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod"
+	"gopkg.in/jcmturner/goidentity.v3 v3.0.0"
+	"gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod"
+	"gopkg.in/jcmturner/gokrb5.v7 v7.5.0"
+	"gopkg.in/jcmturner/gokrb5.v7 v7.5.0/go.mod"
+	"gopkg.in/jcmturner/rpc.v1 v1.1.0"
+	"gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod"
+	"gopkg.in/mgo.v2 v2.0.0-20160818020120-3f83fa500528"
+	"gopkg.in/mgo.v2 v2.0.0-20160818020120-3f83fa500528/go.mod"
+	"gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod"
+	"gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod"
+	"gopkg.in/src-d/go-git.v4 v4.13.1/go.mod"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+	"gopkg.in/warnings.v0 v0.1.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.3/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.2.7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"gotest.tools v2.2.0+incompatible"
+	"gotest.tools v2.2.0+incompatible/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"honnef.co/go/tools v0.0.1-2019.2.3"
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+	"howett.net/plist v0.0.0-20181124034731-591f970eefbb"
+	"howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod"
+	"k8s.io/api v0.0.0-20190620084959-7cf5895f2711/go.mod"
+	"k8s.io/api v0.0.0-20190722141453-b90922c02518"
+	"k8s.io/api v0.0.0-20190722141453-b90922c02518/go.mod"
+	"k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719/go.mod"
+	"k8s.io/apimachinery v0.0.0-20190719140911-bfcf53abc9f8"
+	"k8s.io/apimachinery v0.0.0-20190719140911-bfcf53abc9f8/go.mod"
+	"k8s.io/client-go v0.0.0-20190620085101-78d2af792bab"
+	"k8s.io/client-go v0.0.0-20190620085101-78d2af792bab/go.mod"
+	"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
+	"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
+	"k8s.io/klog v0.3.0/go.mod"
+	"k8s.io/klog v0.3.1/go.mod"
+	"k8s.io/klog v0.3.4-0.20190719014911-6a023d6d0e09"
+	"k8s.io/klog v0.3.4-0.20190719014911-6a023d6d0e09/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20190709113604-33be087ad058"
+	"k8s.io/kube-openapi v0.0.0-20190709113604-33be087ad058/go.mod"
+	"k8s.io/kubernetes v1.13.0/go.mod"
+	"k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod"
+	"k8s.io/utils v0.0.0-20190712204705-3dccf664f023"
+	"k8s.io/utils v0.0.0-20190712204705-3dccf664f023/go.mod"
+	"rsc.io/binaryregexp v0.2.0/go.mod"
+	"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
+	"sigs.k8s.io/yaml v1.1.0/go.mod"
+	"sigs.k8s.io/yaml v1.1.1-0.20190704183835-4cd0c284b15f"
+	"sigs.k8s.io/yaml v1.1.1-0.20190704183835-4cd0c284b15f/go.mod"
+)
+
+go-module_set_globals
+
+DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/beats"
+SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+S="${WORKDIR}/beats-${PV}"
+
+src_prepare() {
+	default
+
+	# avoid Elastic license
+	rm -r x-pack || die
+
+	# use ${PV} instead of git commit id
+	sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
+}
+
+src_compile() {
+	emake -C "${S}/filebeat"
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /var/{lib,log}/${PN}
+
+	fperms 0750 /var/{lib,log}/${PN}
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
+
+	docinto examples
+	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
+
+	dobin filebeat/filebeat
+}
+
+pkg_postinst() {
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		elog "Please read the migration guide at:"
+		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
+		elog ""
+	fi
+
+	elog "Example configurations:"
+	elog "${EROOT}/usr/share/doc/${PF}/examples"
+}
diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest
index 325ddada66d3..6acd98bf5516 100644
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@@ -3,5 +3,5 @@ AUX keepass.xml 275 BLAKE2B 8e64d7e60b0808b9505387caf97c9198d14ead3510c72d3a62cb
 DIST KeePass-2.44-Source.zip 5182922 BLAKE2B 092d1b982d748ea1b13f26fe5423a491855cb491c80cae7632429d488f80fd730df5d2f1613bab528d55a3aadcf0cb4f4055a637d2b14b68a468e4baf9ab1837 SHA512 ef2ca69e40c0787b63fc30a2b222dd77fd9f0addf8593511dcd0a47580cc8de5e0900c7d4e6f77c0e5a49d1728286cf1b5856cdc65ef175e4acfdd1ffc54b55e
 DIST KeePass-2.45-Source.zip 5011684 BLAKE2B cf7fafb2666f2e0005533e441f1855006aa64aca69b4829fa66117da88f92e6aa65d58b303a099221e796a500bc5abab5c3d0654e6fa53c3fe6f36d3cb18e381 SHA512 3f9b14e57fce047f8d8ae7c289fffd954545c5638fa20392e7864301073452a4353f487832730fb600e1729b1333360c1bce7e66fc8629788e666418a2afbf9a
 EBUILD keepass-2.44.ebuild 3228 BLAKE2B 58d0e7a54ee7aace849c916e08b45bd6e1e5e838982f54efaccecea3279eee65aefcbbe6a3291828bbb769f938b09ea5a644b4a85667f2420bda90a2743e1c7d SHA512 ea1e5e8addbf66756fe812bddc29d4c8da359bb68f03ba1322f517a36d6839e4e7972628676108efb23ffcec64a42266f848854c55a79a8f7a971a2ac904633c
-EBUILD keepass-2.45.ebuild 3230 BLAKE2B 9e3c55cb5220c18d7044de21d21cd96a1ad5f145ecf627d1db444ed5a187bc97aad27332c1e7a841c8153ae86eec2dc50f48a00567e681714b3354fc81b1c965 SHA512 b1c53ec9a3f97156823bb6c9265f0fa89b7c000a943557dfe3ba5a19eeec36657d537340692eeaccbf61b3af8508785b78cc0615595775b1e9074a285d53605a
+EBUILD keepass-2.45.ebuild 3229 BLAKE2B 804f64ae148cb8fc30a9278b9dd1e90e2e9fbc966432e708bdfe3210f4bbd7863ab4fce8f4131d788525331777a3991b02ebe1202e4365414dd57370987a4b6e SHA512 12fa7978a687562145af54e3730ab832f50f732b56b3c76927e3286cf1fb24c0f7dac3ba2ac984560c56449b3845c073ac99aba457d5b51bda1eccd14ed5a6e2
 MISC metadata.xml 651 BLAKE2B 058fa70fb6ce35fb52464a84cf506ad117343a1376a40b003c4f55bdf94369136276d8bbb67f30490eb73cba4df6b03d78e8c2a65cf8141dd6cf64654c9b6358 SHA512 6251f546e631decbc7692ab00900d722031ce638f3d878771a2bcfebedba8e1fee9b3e54dfd4c3ae3c711006099fc5a772555ea7cc018d012de164755ba8b52c
diff --git a/app-admin/keepass/keepass-2.45.ebuild b/app-admin/keepass/keepass-2.45.ebuild
index db354f613661..cc9a5d395e36 100644
--- a/app-admin/keepass/keepass-2.45.ebuild
+++ b/app-admin/keepass/keepass-2.45.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="aot"
 
 COMMON_DEPEND="dev-lang/mono"
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 23a6c73d6c8a..1c5998827b55 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -3,7 +3,7 @@ DIST keepassxc-2.5.3-src.tar.xz 6839148 BLAKE2B b3cc32f9abb42e662edec0c28967fca6
 DIST keepassxc-2.5.4-src.tar.xz 6839396 BLAKE2B 5f7f415cab73c2665e3dff94c2bde039096b04a6e8e8a6ff4fe40d31cf4c6ff789f72d8c4c18ae0325c6db570933110a65348c4c359acadd2c89617435ffd6bd SHA512 8a70363dd579b95ccb05cb846aa34a5ed89de4305f3bef9e518e5986fe7f0313cb1daaa347f5b2267002f3fff4b71c87f5bb9073f6e6879d2556a2f0e4791dd3
 DIST keepassxc-2.6.0_beta1.tar.gz 8445948 BLAKE2B 46c84d547e621b69ba6e609c75584aec3b6347c1ef8f455c8b69c7bc23f3b87eefcd0c53e595a3ef47f49c4b2bf0f550f11639397b3e511ec515958620992fcd SHA512 7d52c3ac8c1803683a8926282e960d08cba18335a0f5f8a08e6950deb48e570a904f8cc23c7f7ab67e1e398b1dafe829cecdf532fc82e60d61ec5c02bf17b498
 EBUILD keepassxc-2.5.3.ebuild 2183 BLAKE2B 68019fba5936cecc2f48e3c3ea5fb8f24e3385d5cc80f36fde0d7bea796d01c823d338c8d08600cd291cea880c57e78d3b7d20bfc32021598a05c32cb3a212e6 SHA512 b8c4efb3e662085c87357e65355a9b1957bdf06c265668d84cf071ed024f1f4d9f8083cf62f1f8882ef7ce5d44411764895d78e20c2f32c0ab44929f2662c80b
-EBUILD keepassxc-2.5.4.ebuild 2191 BLAKE2B 824069ed9c5448fde16a900e93a3fd8f26ba596a37f4181c831a9b45da325dfbf03648073ab51380d6266d8d2192bcef9baf4460f779e9fbe87373658decf871 SHA512 004ae73357d2a8a26f56b529c9cb7e7fe7b66fb7abcf53fc6dae399cb344e60adce6c9fed99d01faac09f88a54bc19ae007c1ca8e4eeae7ae8deaa3020cf0f22
+EBUILD keepassxc-2.5.4.ebuild 2190 BLAKE2B 4e23b212cf03f1a5c8bc18dc63313ea5224bf76efc29f360cf013af90e9fc745b04754170f5e88bacf4bc5c4600203dc9b706a2412d07e4e21b172f96822319a SHA512 9080c0202fd22e83ab38741edc4ab3061e4a24d2a3735ce03c4194faa8588ea719221296e663079a007f3f49e757ef7efcd7e206341e542054d937f3908d73ab
 EBUILD keepassxc-2.6.0_beta1.ebuild 2125 BLAKE2B de716370e41031cc3e9f373273a9360ad91ececa2272a0bc569edb771b54b6fedae04f25cdaa49c0441ee791b6d12c8c0b8e48a9d3a0c57e33c856381e9bcf8d SHA512 58882ac9cad8670f2f95ef0a41d238899eae9a17c0e145912e89f82799570f8be9b55bbcbd14efd3befe22317f3a27162c751c3ba37e360396fa329fb017dd70
 EBUILD keepassxc-9999.ebuild 2125 BLAKE2B de716370e41031cc3e9f373273a9360ad91ececa2272a0bc569edb771b54b6fedae04f25cdaa49c0441ee791b6d12c8c0b8e48a9d3a0c57e33c856381e9bcf8d SHA512 58882ac9cad8670f2f95ef0a41d238899eae9a17c0e145912e89f82799570f8be9b55bbcbd14efd3befe22317f3a27162c751c3ba37e360396fa329fb017dd70
 MISC metadata.xml 1041 BLAKE2B ba27a63c6d2f620e5e44e0a081db88b3f504dba20f2952b586564fbcbfaf464e82b755c5d4b6faa107a11af53e1acf675c452c721ddefceac4f3aff3c83d4eab SHA512 6e1f6a8455ee0afa21abad8c606da210161c1e287df94ca1e7f49b854d9dca2675ad83e801e5eb0f5f8cab7f115b654b50d71a2399b97e357f77f6b61f2bcb0e
diff --git a/app-admin/keepassxc/keepassxc-2.5.4.ebuild b/app-admin/keepassxc/keepassxc-2.5.4.ebuild
index 769d6af7da77..80d797e0a239 100644
--- a/app-admin/keepassxc/keepassxc-2.5.4.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.5.4.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" != 9999 ]] ; then
 	else
 		#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 		SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
-		KEYWORDS="~amd64 ~arm64 x86"
+		KEYWORDS="amd64 ~arm64 x86"
 	fi
 else
 	inherit git-r3
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index ba71ed4847f3..1af4f46045a9 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -6,10 +6,13 @@ AUX pipelines.yml 285 BLAKE2B d256148500854501d8e17c04a0abdcbf1be7aeea6d0e1eaa88
 DIST logstash-6.8.8.tar.gz 179965893 BLAKE2B a56db7b09c7fd59a5496e076ab11bf273265cff7eedfc9c9dfaa117a16baeb9b9c8e97a71eb8ff2a80f379b242d08c2d997476d7a48bab802ff3380d8914f13c SHA512 11c0b9be1d51c3feff82181234d0b5cd838edff78678bdc410f306c52d6345393e9d6c4d6095c2e3aa044f8c5af35d98fa2570891e81e9e3c57907c2baed6100
 DIST logstash-7.6.2.tar.gz 172679447 BLAKE2B afeaab06178669559ff532cf72575f8063d07f95f2401060d33e0a99c87bb9e0c251e45634b9723efe456892ac19586accc89cf7272163e48eeaef438632b777 SHA512 c86dcf36cd0d578467c7013234040d5ea100f08ef69a185f6aa86c87dfa46936282abf10d0f495ffe649274136b735d17ab513ef3401205140c2d98bd9f91238
 DIST logstash-7.7.0.tar.gz 166451553 BLAKE2B 30b732f1ef516b275246b0e14212b0b00b78502e0b4e78211b3bfdd77e2190639ed8c35f775dae7817b0b43a446d34941b968e8a0785302c337a326a507fc607 SHA512 970740adc47551d7967b9841cc39d15f2cbdcd46c2fee1f84b5688fac266fdcd2202cbb10d3a10cf3768606f693ed2e4fc79e91d293a3295083718bafaa7bc9d
+DIST logstash-7.8.0.tar.gz 167162975 BLAKE2B 666746571151b1cc1b79fc7405235a107f452c4741ba0e65f151e8b38934239e57698faed3663889d932eabf43e58277a1b2d5aebbf8dfa8c3f5e77fa8778ed2 SHA512 8b7c9015edfde0bed43a2668bf24d8523f785ea8f94b522e5d9dd886a677459f2c2c2e103b91b04f671287177e902e8f3fbf6747841f7984357a803405f9ed00
 DIST logstash-oss-6.8.8.tar.gz 179836007 BLAKE2B e278d8dd34341bceb506accb3424b4af6db0795b582e1370d60f4a4b68671372449c94ae28f4a7585b8d4f4e63dcf7d6fa80eed37fd4ef8e872414ae2cd15b80 SHA512 ceba8d798c1246c9fd3385bc4b64995fcf9083dc5149211fabc09bfa3208d56bba6d8ae4ab73da5f9968633f30c547e0132f76543e2f9a2a96675ee58df74b09
 DIST logstash-oss-7.6.2.tar.gz 172501347 BLAKE2B 2a83d7617c8e13a0b736ed0023a164d2191102f49e7d7174bf3ea9c56370c51e4fd760f7bb3aba97f1b9bd2ec122ba22e00dec9ac9636f7b79128c6bb2da548e SHA512 c425a9748964ef38fc58f67778cd88fc367df91087362353cfee316e54528e4a23407e1fc53d628008fd4c829b427061758112f10e7805cec88c0a1f0a966d2a
 DIST logstash-oss-7.7.0.tar.gz 166272505 BLAKE2B a12b065874e03ae985c590b8bcbaabf4d2ee6d0ce3ca1f5d60b0874074996e7f8c40bad4fd242e26e74c11741620103e41bdeade2f60f6fabe97652d1c9fbb1e SHA512 a455fcf5c9a44c326ae581f9390ddf206064e6e6b3801cca312cef91e8d33086f8a6598ed68f81f2cfc6d8d66783632b983bef7c8a4ad0f24e929827ec137da4
+DIST logstash-oss-7.8.0.tar.gz 166982219 BLAKE2B e0d6b500184523e1bb2e52fae6971e12bd7a547796508d4eb6883ffb16e41676a807eb7b228e8e2a64c9b7b5b9e375b2acebe15a0dc77e502707350e43390795 SHA512 4413ed97527eb89da3462cc401b84f4770bfb9e3e3083fb314b8ac813165655752a204f091512de3507527bf8cbea5934f67ada446448802424dd441da2d475e
 EBUILD logstash-bin-6.8.8.ebuild 2099 BLAKE2B f5902b9254e045789a41627c84b5a4e340268eedb1a96a266e20279a9d718ef28279e59b63320fc1d35b2e701acb5ce61a925687cd479d46a74981e92d744618 SHA512 74f8b2a81f63e5d41b373e5cb08f99560afa4f59133bfcd7955907105457ea94cf84fe07f5501e011bb2b69d388207e160057c79ec206589e7d195626fab75bb
 EBUILD logstash-bin-7.6.2.ebuild 2095 BLAKE2B 496fb1f0b2b0c790831ebda7223d315fb0041c93e774f7a6e6985bf820b19f0c79d4ea30383f37403f8fa87308506f2a49436d28e832d4bdce82ce893cec1c87 SHA512 600ae4e607aedeb893dfc9dae0b65bab48e9147f831908fa8e096802d883bccdf82dc66fa73f1bab0e60e0b720c5f40e0d1fc15e1c101b6b6d6d856a323f54ca
 EBUILD logstash-bin-7.7.0.ebuild 2095 BLAKE2B 496fb1f0b2b0c790831ebda7223d315fb0041c93e774f7a6e6985bf820b19f0c79d4ea30383f37403f8fa87308506f2a49436d28e832d4bdce82ce893cec1c87 SHA512 600ae4e607aedeb893dfc9dae0b65bab48e9147f831908fa8e096802d883bccdf82dc66fa73f1bab0e60e0b720c5f40e0d1fc15e1c101b6b6d6d856a323f54ca
+EBUILD logstash-bin-7.8.0.ebuild 2095 BLAKE2B 496fb1f0b2b0c790831ebda7223d315fb0041c93e774f7a6e6985bf820b19f0c79d4ea30383f37403f8fa87308506f2a49436d28e832d4bdce82ce893cec1c87 SHA512 600ae4e607aedeb893dfc9dae0b65bab48e9147f831908fa8e096802d883bccdf82dc66fa73f1bab0e60e0b720c5f40e0d1fc15e1c101b6b6d6d856a323f54ca
 MISC metadata.xml 648 BLAKE2B 1c6bd205971968cbbc720f093853d6f3eb069787447c3e4dcfb12bd345c75adfc7f47dc34a95d28f7bacc77f9e863c44880e15afbcb0fea5468d068b02a53923 SHA512 2fe18cd9d1ae40093e6187aad630c04d94c85e400808e74d3755c7591d260f86b00dff4f1cb7dbe905b014d1551ceeaff1ce4ca21e2c755097600733448453ab
diff --git a/app-admin/logstash-bin/logstash-bin-7.8.0.ebuild b/app-admin/logstash-bin/logstash-bin-7.8.0.ebuild
new file mode 100644
index 000000000000..9e7d19873de3
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-7.8.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2
+
+MY_PN="${PN%-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="https://www.elastic.co/products/logstash"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+RDEPEND="acct-group/logstash
+	acct-user/logstash
+	virtual/jre"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+	keepdir "/var/log/${MY_PN}"
+
+	insinto "/usr/share/${MY_PN}"
+	newins "${FILESDIR}/agent.conf.sample" agent.conf
+
+	rm -v config/{pipelines.yml,startup.options} || die
+	insinto /etc/${MY_PN}
+	doins -r config/.
+	doins "${FILESDIR}/pipelines.yml"
+	rm -rv config data || die
+
+	insinto "/opt/${MY_PN}"
+	doins -r .
+	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
+
+	newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
+
+	insinto /usr/share/eselect/modules
+	doins "${FILESDIR}"/logstash-plugin.eselect
+}
+
+pkg_postinst() {
+	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
+	ewarn "Install the plugins via eselect module that will automatically re-install"
+	ewarn "all self installed plugins after Logstash upgrades."
+	elog
+	elog "Installing plugins:"
+	elog "eselect logstash-plugin install logstash-output-gelf"
+	elog
+
+	elog "Reinstalling self installed plugins (installed via eselect module):"
+	eselect logstash-plugin reinstall
+
+	elog
+	elog "Sample configuration:"
+	elog "${EROOT}/usr/share/${MY_PN}"
+	elog
+	elog "The default pipeline configuration expects the configuration(s) to be found in:"
+	elog "${EROOT}/etc/logstash/conf.d/*.conf"
+}
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index 911d996f9084..8606e7686cf4 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -2,12 +2,16 @@ DIST mongo-tools-3.6.13.tar.gz 4990848 BLAKE2B 022ddf214869c3a3e545aa9572f77f0ad
 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.16.tar.gz 11139827 BLAKE2B 550acfd7e4434b178170dfd94c65668cb7dd37d128235c63a10f72802e3119f33d5cd2138bfd5b957f6d3813f1d9aff49218c4e122c0cd454b4ea7a969c84d4e SHA512 a75831d9fd0b596bfb7354cbc05d1ecf6871d5a7230a858b09b94d5001d18069c9cbe89c9500e9c1a16fc5186fa7a1ac59c605156666a3f1a2d7c81115a47c16
+DIST mongo-tools-4.0.19.tar.gz 11139649 BLAKE2B 7e730138fce671e18a0ebe929b98eff1c0ce2c364ceef7d6868c380242689411c545ac321aebd609dcfe9f8d5b7d35cf37973a978f35a50cc44902b2dbad7134 SHA512 2639cb27a5a27e405bddf9817f409af244d643a9091f7e5ddff4876966af55b6710b0fe158c351df9aea10f3da0b87d224bfb2c962f4ca2cfe41f804cb16749c
 DIST mongo-tools-4.2.3.tar.gz 15020325 BLAKE2B 8501a3ec6e947112ec561ce62f2ea568984f8ac911a7aff3cb8c08c1f29d2cfc64cf7f4b6a24ba73ae0f9b2b5853480f4fbed51c98fdc8c83cd433ea65e21dba SHA512 772719b450f8b656c22ac0126fee1e0fa58b5320c94ac6414b1d9af13e6437393c2482f2e386f4a73c84a2d1bfe0ea88df117a6a7ae87f4884477505cf662585
 DIST mongo-tools-4.2.6.tar.gz 15016596 BLAKE2B 5ee37bf21ea05ec5ba2764c935c1dd3632753e772a01f854dc8a9949620e9a41fe95ba658a0efae0332ed2c059561e39e681f672cf5f4302a7f92c364cfab4b6 SHA512 e91bfba4b015f80d35b6c2ca766c599c5eedea113d6415ec0aef433d46b5e5fe06956481a063e26908a45fdcee4002125ea01a29fa3ea9a541a9210d25625f8e
+DIST mongo-tools-4.2.8.tar.gz 15021497 BLAKE2B e066c299462167754e0752079f35fef25b387eb1df0631ff0e0b783a8a14c4b68c6ed126ec3429f63de87b87b9fdde6a2645badd53ac1386befc7175a61a999e SHA512 c0fca14c60e5f399934f4dfad5be832684d2c1a1145967a4c395b246774f73f71e506bff902a634b7f08f7133304c09f14eb56a1a6fc8585608f537e59d9c899
 EBUILD mongo-tools-3.6.13.ebuild 1612 BLAKE2B fe5fff8fdf2295c6ef3927293da63b4f8da68c81104d554789720b6268f25b06ee42fc728da388617543a18dc3c139b27c1ac28cc8fbf3b2bd519d053a2c9fa1 SHA512 529a9d42003103e564d7b5147d582da78db2435ae3587ef6827fd640947fdd5bd559fcf86ec82f0882a5c04b79fda9d9af612a8fed12e9d256bd5e3fa1e267fb
 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.16.ebuild 1613 BLAKE2B 536182baa4da100c1d3a4ddd7d8818abe75efb9dd51561f23853b3d03ea7f5b3f766ea8759c9bb7c33c36bcda71ae57ca917154d575efbf6557bc7563e649280 SHA512 f4b4ac41d14bb8ef5a3b61ea18877a9171300c577b14fad7b55957ab5c1baf36af979584d6b0cdfb4987f46e08b0b13b86ab4eb5c8a9aef304fbadf56204102c
+EBUILD mongo-tools-4.0.19.ebuild 1613 BLAKE2B 536182baa4da100c1d3a4ddd7d8818abe75efb9dd51561f23853b3d03ea7f5b3f766ea8759c9bb7c33c36bcda71ae57ca917154d575efbf6557bc7563e649280 SHA512 f4b4ac41d14bb8ef5a3b61ea18877a9171300c577b14fad7b55957ab5c1baf36af979584d6b0cdfb4987f46e08b0b13b86ab4eb5c8a9aef304fbadf56204102c
 EBUILD mongo-tools-4.2.3.ebuild 1620 BLAKE2B 7719384b81a600d5ab3f6ef118fdfcba34a46632ec5a9847ce064726be364b59228cd71dfe518d49558d2318119ee8aefe9e1643142ac1708981c644a4c50cdd SHA512 63378bba1aa26dd93b5d76ecf2c1ed4a93b8c67f0912a0461cea007ad375ee91639e3ccc582ecc4233b931f2c62e019a0fdd924d960e20f643568ec87c5c9c98
 EBUILD mongo-tools-4.2.6.ebuild 1620 BLAKE2B 7719384b81a600d5ab3f6ef118fdfcba34a46632ec5a9847ce064726be364b59228cd71dfe518d49558d2318119ee8aefe9e1643142ac1708981c644a4c50cdd SHA512 63378bba1aa26dd93b5d76ecf2c1ed4a93b8c67f0912a0461cea007ad375ee91639e3ccc582ecc4233b931f2c62e019a0fdd924d960e20f643568ec87c5c9c98
+EBUILD mongo-tools-4.2.8.ebuild 1620 BLAKE2B 7719384b81a600d5ab3f6ef118fdfcba34a46632ec5a9847ce064726be364b59228cd71dfe518d49558d2318119ee8aefe9e1643142ac1708981c644a4c50cdd SHA512 63378bba1aa26dd93b5d76ecf2c1ed4a93b8c67f0912a0461cea007ad375ee91639e3ccc582ecc4233b931f2c62e019a0fdd924d960e20f643568ec87c5c9c98
 MISC metadata.xml 463 BLAKE2B 1e4d37c222538ce5d55e6f5c05ecbe85f57ac74eacaf5935540797f03c4c069b2ce2bd0cbb6b433eb86de9b2480058013759db3d504982df908c2ba9e1b4d2ec SHA512 f09474b3932dd6ae36da20c64a394acf65ad1e3a875e7ca743efa22db8b7e3109c9ebe4c489e62eda12c5bdd4d689ede61eca8a4cc89c42d0a08a270f041fcdc
diff --git a/app-admin/mongo-tools/mongo-tools-4.0.19.ebuild b/app-admin/mongo-tools/mongo-tools-4.0.19.ebuild
new file mode 100644
index 000000000000..86f626904b91
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-4.0.19.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.8.ebuild b/app-admin/mongo-tools/mongo-tools-4.2.8.ebuild
new file mode 100644
index 000000000000..7d8cc9a0ebc2
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-4.2.8.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 ~arm64"
+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/procinfo-ng/Manifest b/app-admin/procinfo-ng/Manifest
index b761e401921e..9dc5c5ce9f36 100644
--- a/app-admin/procinfo-ng/Manifest
+++ b/app-admin/procinfo-ng/Manifest
@@ -1,5 +1,5 @@
 AUX procinfo-ng-2.0.304-autotools.patch 1521 BLAKE2B 900b0605e17dfe22512399aac73f79109c12524f53e9924d5f240e10422a1b53d3e171c89b292748bbf5515c4ea99610c39cc8d94bfe1c968a225c5a36f41955 SHA512 3b13f4eb5ebad4d9d9dc6a31f7a46b49b76aeee19042029d7c37c5fe21555c7c98c990cdf57ce9583469058fed315903efe919f7f25cc5354a6800086f56cd28
 AUX procinfo-ng-2.0.304-man.patch 130 BLAKE2B d06416e6302ca0b8952b2f01c2e6d64dbf913c5009248d187bfbf91af938d1f253ff5ff12c467041bcced2f460c3116cfd2192177d3bc7004168ee024c3aedb6 SHA512 acc1ce2abda6099b31faf4d1d6e940e8cbb8a3accfd6ca2af550d226b7f12aebc84cd68b118f7c1362895f63a800416e538ebc43e7ae98a1b348656b09373056
 DIST procinfo-ng-2.0.304.tar.bz2 62469 BLAKE2B fc08cc69ebb4f21c52a314c19eea820bc69408d609e59f122c939c14c9159e4348c4ccc07f39f63e96ec046d8af79abd6456a56397eb952d2fff1dd31f89a3e5 SHA512 db336d2ff3bb3b31ac83a51a9d273fae8d16d36bd805f548eda06cb501699473fd8e4b4f9b722165fbf685d76c3fc09bfea9e516eabc37a888e2fae7679c08cf
-EBUILD procinfo-ng-2.0.304-r1.ebuild 633 BLAKE2B 3af32c93b016576af990545043ebadbdb8507bc82e9ed91e7b76f1d85a6e0d79030a444369f7741bb3c62e173593a7487faaed620b1eea9e6596621c013c594c SHA512 d3d4d45b5d5b4b17ad8c629c627eef37f0326147e2c7ed032049ade6ab85c0c6810efaa6675f3071b0de65fad0c864deae59a7172e16aa59537a7b238f3e9daf
+EBUILD procinfo-ng-2.0.304-r1.ebuild 610 BLAKE2B e82fe3af1ba503c3c70da20fd14d977f5bf223cd8dd20da61d01cbaac0858044579c89350acce504a0bd4c14a57c5556e3f056d71ecb7e01d260ea502ef1b368 SHA512 446d682f9711ab4aec801225825bf8f3fadacaaad64022a1e78454ce2e8c92f5e8d1224d1653005796a7b5e81e45f6697765a20cf0ff3f95d941042d29687660
 MISC metadata.xml 356 BLAKE2B afc57b07ed4eea867d788e4d860b9a115d34cfcee6925b81527401556f2d68d1bb94deb1bd4dbf11183c62945caa6584dcf6bb2f02021aaffc6deef5cb9091ec SHA512 3b442e3aff5a26f504f930a0698b376cb0091daa868579ea436aad142222b101c88ace8faaf8fdf9e79dfdb2c7feaeb44f863c0b0d43e7ec85237c56e892255e
diff --git a/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild b/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild
index 49ce7d2cac57..607a2d15b283 100644
--- a/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild
+++ b/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild
@@ -13,9 +13,7 @@ LICENSE="|| ( GPL-2 LGPL-2.1 )"
 SLOT="0"
 KEYWORDS="amd64 hppa x86"
 
-RDEPEND="
-	sys-libs/ncurses:0=
-	!app-admin/procinfo"
+RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 9dc43cf2f481..e0bfe7d58298 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -7,8 +7,11 @@ AUX rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad1
 AUX rsyslog.initd-r1 1755 BLAKE2B 768dc0d2bcbf240b7a09e814d681ce65a319cd128ef40b9427edb3bc4def5239415f16b67629de70d61e12dc835a3e8e7049c183f0c667d301919ffa7e6a22e7 SHA512 e6de86a72e11d37427a17e07cebdfc26b5c6108b413d853255108acf3c55882fd79d03ed41c0a6c1a23babd55f2e4bf36e5c7fc3e98c19bc07dc4593cd2a07c3
 DIST rsyslog-8.1911.0.tar.gz 2967162 BLAKE2B 6c15436cf6751267de38662b2c5d524dc7f90add4ed1aa7102811d197c2d86847316b58ed626fe0ab2b731c445fbcfb328464a2b1b7c4c3afedccb103267f772 SHA512 8414901a5072cb2cc28d35802c9e22d0f9c88f2ae15985a087a86b0e4053471b02d43bcc95d0c466719105e0a5ee683927af3842b9487f27ddddc1ca00ed713a
 DIST rsyslog-8.2004.0.tar.gz 3002704 BLAKE2B b5049448e0d09e048a45f067b5f8de453721ac5d63233f251e6e24fe2a722469cb19a91e83aa405ffc21245942b824e0a28ecd4e6df431517c8775e7a322bcd3 SHA512 1d7fac65cc97975a6765a55732d413e892502e53566c6fb7c1bfc0107b173eae77dd04c0c9a7471296dff998ceb2fd5a2374368a5a8528f8eb0a89d1915b0214
+DIST rsyslog-8.2006.0.tar.gz 3047140 BLAKE2B 00599341ae579b4d56388c27dd0f2b61dd8b335cfcbc130607d11f692b8b9943b36b377d0aeaed36966960dcd095cc22d03f6ebb4afb69abfac3011d58653f25 SHA512 576a2cfa21e89352de2750f0832bd84348822cc84ce67e1b51bf6a162414bdc7f5ac8320c503454789a576172060efc734c26fa305a7ce849c2ebb95dfb85a09
 DIST rsyslog-doc-8.1911.0.tar.gz 8183360 BLAKE2B f5681945fb30ddf9c21a60ebafaf99698f10ef4790e76c9f6f329763215d5a1d47918008ade3e8ff8b7d4fb3ce1220cfc6f307ebc1dbf85697c3d92f7b855023 SHA512 2326550a0db108db407b701ff0b7b8545f94d06c1979bfbea3496a9a652de2a22bf49e9b95d4b2e6256bbf1f9db6a1c9822557c6ebd6a56bc00f096a642b19df
 DIST rsyslog-doc-8.2004.0.tar.gz 8323570 BLAKE2B 76b6acc7614f1cbe0a4f99a2a27ff44e2706d1a570afb7d92c628154d49bde5b00a7a4ae1c7d9639f67270f3080a6637cbebb14eaa43484655b322def11b367f SHA512 1a95b334bfe4c2a1d4844983cf32e44205ec6b7cabf1a6914a9ebb335d3d8f78655caf2a55a8cf444352af7d9ae92daa09e8fdf36e520554ed4807a4ed5fd393
+DIST rsyslog-doc-8.2006.0.tar.gz 8365252 BLAKE2B f7c6a2e153e84193b48481c9b7417170794fae0873bf9924eb6d4276f07955c2fecc78660a432dc82e23f6b3b575c81c157109a6f819ff57bda220411db36047 SHA512 03d16caef4fa77613eccd682247c1ce58b8c0ef794145c10f18da7bffad437b6b8231eb85cc0986f46b5795b6b24802b19ce0f59bec169ec67c9627e45266df7
 EBUILD rsyslog-8.1911.0-r1.ebuild 12536 BLAKE2B aefb55649f1aaf7b98b5a9f85e87188dcd1546c149023190dcde3f292d7065bd4249f39e19459fbf1b0d34ceb28204ec5b201f4e3cc6b0946f70b46017554a84 SHA512 0bec3b0bdeb0f36b88569f74af758d43c8816955c53dffd74d991fff2f6c211c55a16c2ed09ad38cb34720439a9afa31198ebf4b585b3577576346018e88c931
 EBUILD rsyslog-8.2004.0.ebuild 12623 BLAKE2B 068bf003cf636f1acc1bbd5a07a1cf81ecffd004ccd06bc2e480b1474a25104a8972cb61d1a26846fc5300c3ee982fe37405232d309eb86401bdf61fdd6adcaf SHA512 bae98b989fa7179015c095bf244b37342c3a8cb2623c5e6ba92690504837fcc2da5ee6f9ae7040f488e850b29343a1d47bad0304c61205af693cc538cbd08ecb
+EBUILD rsyslog-8.2006.0.ebuild 12550 BLAKE2B 7823b49926d0b1f648181f60629d707f69f8b84350a189f2bad57266ba5d717b3d8d1ee14afec139b3f4d1f610998eda74c23c5de770a7ade7116474f4238217 SHA512 180285602372bbf5b6c5eb1efb3312ce435e7fcedf2c4168004e2775dc8159c59bbd00d8712c378268cd11b37e68da6ccd74261f73dfc69f53fa57a730351835
 MISC metadata.xml 3874 BLAKE2B c09a57dcbd88bda6c510ca741e1ee8c5207e5906843fe3ae21c8dd6575c7b104dae74e79e5a27c8bf9f0348673f5c33eb6c4b12fafbb1ba64f1a9f81bd374eaa SHA512 2f7a72017376018aa5d864deb33675d51ab50cd8481dffb7f1421b83d4e07f19a86a90705dbb6191686fc650284e2bcbe30ed0af07082b57eef46dd615778868
diff --git a/app-admin/rsyslog/rsyslog-8.2006.0.ebuild b/app-admin/rsyslog/rsyslog-8.2006.0.ebuild
new file mode 100644
index 000000000000..7b351b3a3072
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.2006.0.ebuild
@@ -0,0 +1,462 @@
+# 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,3_8} )
+
+inherit autotools eutils linux-info ltprune python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="https://www.rsyslog.com/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+
+	SRC_URI="
+		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
+	"
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres"
+IUSE+=" rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libfastjson-0.99.8:=
+	>=dev-libs/libestr-0.1.9
+	>=sys-libs/zlib-1.2.5
+	curl? ( >=net-misc/curl-7.35.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	elasticsearch? ( >=net-misc/curl-7.35.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+	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-4:=[drafts]
+	)"
+DEPEND="${RDEPEND}
+	>=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 )
+		${PYTHON_DEPS}
+	)"
+
+REQUIRED_USE="
+	kubernetes? ( normalize )
+	ssl? ( || ( gnutls openssl ) )
+"
+
+if [[ ${PV} == "9999" ]]; then
+	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
+	DEPEND+=" >=sys-devel/bison-2.4.3"
+	DEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_fetch
+		git-r3_checkout
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	if use doc; then
+		if [[ ${PV} == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [[ -n "${EGIT_BRANCH}" ]]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH=${EGIT_BRANCH}
+				unset EGIT_BRANCH
+			fi
+
+			git-r3_fetch "${DOC_REPO_URI}"
+			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [[ -n "${_EGIT_BRANCH}" ]]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
+		else
+			cd "${S}" || die "Cannot change dir into '${S}'"
+			mkdir docs || die "Failed to create docs directory"
+			cd docs || die "Failed to change dir into '${S}/docs'"
+			unpack ${PN}-doc-${PV}.tar.gz
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# https://github.com/rsyslog/rsyslog/issues/3626
+	sed -i \
+		-e '\|^#!/bin/bash$|a exit 77' \
+		tests/mmkubernetes-cache-expir*.sh \
+		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
+
+	eautoreconf
+}
+
+src_configure() {
+	# Maintainer notes:
+	# * Guardtime support is missing because libgt isn't yet available
+	#   in portage.
+	# * Hadoop's HDFS file system output module is currently not
+	#   supported in Gentoo because nobody is able to test it
+	#   (JAVA dependency).
+	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+	#   upstream PR 129 and 136) so we need to export HIREDIS_*
+	#   variables because rsyslog's build system depends on pkg-config.
+
+	if use redis; then
+		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+	fi
+
+	local myeconfargs=(
+		--disable-debug-symbols
+		--disable-generate-man-pages
+		--without-valgrind-testbench
+		--disable-liblogging-stdlog
+		$(use_enable test testbench)
+		$(use_enable test libfaketime)
+		$(use_enable test extended-tests)
+		# Input Plugins without depedencies
+		--enable-imdiag
+		--enable-imfile
+		--enable-impstats
+		--enable-imptcp
+		# Message Modificiation Plugins without depedencies
+		--enable-mmanon
+		--enable-mmaudit
+		--enable-mmcount
+		--enable-mmfields
+		--enable-mmjsonparse
+		--enable-mmpstrucdata
+		--enable-mmrm1stspace
+		--enable-mmsequence
+		--enable-mmutf8fix
+		# Output Modification Plugins without dependencies
+		--enable-mail
+		--enable-omprog
+		--enable-omruleset
+		--enable-omstdout
+		--enable-omuxsock
+		# Misc
+		--enable-fmhash
+		$(use_enable xxhash fmhash-xxhash)
+		--enable-pmaixforwardedfrom
+		--enable-pmciscoios
+		--enable-pmcisconames
+		--enable-pmlastmsg
+		$(use_enable normalize pmnormalize)
+		--enable-pmnull
+		--enable-pmpanngfw
+		--enable-pmsnare
+		# DB
+		$(use_enable dbi libdbi)
+		$(use_enable mongodb ommongodb)
+		$(use_enable mysql)
+		$(use_enable postgres pgsql)
+		$(use_enable redis omhiredis)
+		# Debug
+		$(use_enable debug)
+		$(use_enable debug diagtools)
+		$(use_enable debug valgrind)
+		# Misc
+		$(use_enable clickhouse)
+		$(use_enable curl fmhttp)
+		$(use_enable elasticsearch)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable jemalloc)
+		$(use_enable kafka imkafka)
+		$(use_enable kafka omkafka)
+		$(use_enable kerberos gssapi-krb5)
+		$(use_enable kubernetes mmkubernetes)
+		$(use_enable normalize mmnormalize)
+		$(use_enable mdblookup mmdblookup)
+		$(use_enable omhttp)
+		$(use_enable omhttpfs)
+		$(use_enable omudpspoof)
+		$(use_enable rabbitmq omrabbitmq)
+		$(use_enable relp)
+		$(use_enable rfc3195)
+		$(use_enable rfc5424hmac mmrfc5424addhmac)
+		$(use_enable snmp)
+		$(use_enable snmp mmsnmptrapd)
+		$(use_enable gnutls)
+		$(use_enable openssl)
+		$(use_enable systemd imjournal)
+		$(use_enable systemd omjournal)
+		$(use_enable usertools)
+		$(use_enable uuid)
+		$(use_enable zeromq imczmq)
+		$(use_enable zeromq omczmq)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc && [[ "${PV}" == "9999" ]]; then
+		einfo "Building documentation ..."
+		local doc_dir="${S}/docs"
+		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+		sphinx-build -b html source build || die "Building documentation failed!"
+	fi
+}
+
+src_test() {
+	local _has_increased_ulimit=
+
+	# Sometimes tests aren't executable (i.e. when added via patch)
+	einfo "Adjusting permissions of test scripts ..."
+	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+		die "Failed to adjust test scripts permission"
+
+	if ulimit -n 3072; then
+		_has_increased_ulimit="true"
+	fi
+
+	if ! emake --jobs 1 check; then
+		eerror "Test suite failed! :("
+
+		if [[ -z "${_has_increased_ulimit}" ]]; then
+			eerror "Probably because open file limit couldn't be set to 3072."
+		fi
+
+		if has userpriv ${FEATURES}; then
+			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+				"before you submit a bug report."
+		fi
+
+	fi
+}
+
+src_install() {
+	local DOCS=(
+		AUTHORS
+		ChangeLog
+		"${FILESDIR}"/README.gentoo
+	)
+
+	use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+	default
+
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+
+	keepdir /var/empty/dev
+	keepdir /var/spool/${PN}
+	keepdir /etc/ssl/${PN}
+	keepdir /etc/${PN}.d
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
+
+	insinto /etc/rsyslog.d/
+	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
+
+	if use mysql; then
+		insinto /usr/share/${PN}/scripts/mysql
+		doins plugins/ommysql/createDB.sql
+	fi
+
+	if use postgres; then
+		insinto /usr/share/${PN}/scripts/pgsql
+		doins plugins/ompgsql/createDB.sql
+	fi
+
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	local advertise_readme=0
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		advertise_readme=1
+
+		if use mysql || use postgres; then
+			echo
+			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+			elog "  /usr/share/doc/${PF}/scripts"
+		fi
+
+		if use ssl; then
+			echo
+			elog "To create a default CA and certificates for your server and clients, run:"
+			elog "  emerge --config =${PF}"
+			elog "on your logging server. You can run it several times,"
+			elog "once for each logging client. The client certificates will be signed"
+			elog "using the CA certificate generated during the first run."
+		fi
+	fi
+
+	if [[ ${advertise_readme} -gt 0 ]]; then
+		# We need to show the README file location
+
+		echo ""
+		elog "Please read"
+		elog ""
+		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog ""
+		elog "for more details."
+	fi
+}
+
+pkg_config() {
+	if ! use ssl ; then
+		einfo "There is nothing to configure for rsyslog unless you"
+		einfo "used USE=ssl to build it."
+		return 0
+	fi
+
+	# Make sure the certificates directory exists
+	local CERTDIR="${EROOT}/etc/ssl/${PN}"
+	if [[ ! -d "${CERTDIR}" ]]; then
+		mkdir "${CERTDIR}" || die
+	fi
+	einfo "Your certificates will be stored in ${CERTDIR}"
+
+	# Create a default CA if needed
+	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = Portage automated CA
+		ca
+		cert_signing_key
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-self-signed \
+			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		# Create the server certificate
+		echo
+		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+		read -r CN
+
+		einfo "Creating private key and certificate for server ${CN}..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = ${CN}
+		tls_www_server
+		dns_name = ${CN}
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-certificate \
+			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	else
+		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+	fi
+
+	# Create a client certificate
+	echo
+	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+	read -r CN
+
+	einfo "Creating private key and certificate for client ${CN}..."
+	certtool --generate-privkey \
+		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+	cat > "${T}/${PF}.$$" <<- _EOF
+	cn = ${CN}
+	tls_www_client
+	dns_name = ${CN}
+	expiration_days = 3650
+	_EOF
+
+	certtool --generate-certificate \
+		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+		--template "${T}/${PF}.$$" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	rm -f "${T}/${PF}.$$"
+
+	echo
+	einfo "Here is the documentation on how to encrypt your log traffic:"
+	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 0679d30e4f40..d5f614285553 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,6 +1,7 @@
 AUX README.hardened 358 BLAKE2B a816cf461b4c3553e979c309ced21537841e24ad805b67f43d5bf06fb77b86959a75c7680df87e7ded7fd72073ad469a06bdec1e739784c82776d04a91bd3add SHA512 75b4af1543436506e28d9b0e2625985ab864d1452604b1514ec030df822c36d90ae062508381610cc1f750082a52545f8678102dc475abff15f0f3c9a838128e
 AUX patches/syslog-ng-fno-common.patch 8521 BLAKE2B 6dc0654aefed1c480507269766f18eb9c1c88e8d9a5fe3c5394c108ea750aafe33858bc3c99957e3989b121a39345b6feffc80c588551145720573d5991fcae9 SHA512 c011f0973c8e3c3220bf9e7dc68176b6b4ec36d7e3030680a42862d31d951c499c81b5bd438622c9f7d41af61c2e24750d38b1c869e3e240e7c22ff8cd5d1f2f
 AUX patches/syslog-ng-glib-2.64-support.patch 2751 BLAKE2B bf80fb569292f4a467b3fcc39776943e847d1900bda7e80d7f279259a8f82b9b4c9f85d06bca5629c69a0ca0aedfe955017718d96094e48603a387f73af82476 SHA512 1eead04652764352f9ef0064ecec4b408b4fe8f9cf94c2e9f1a985b6383de0e1098df9bf2dcd352aeb17dd6dae2cda8313a1bfc0a70b2cf56bf8f323bbe1f169
+AUX syslog-ng-3.28.1-net-snmp.patch 292 BLAKE2B 7833709af12ab6531596bdb3b2c327fd2df3a5da3e3b00a597926f5bc5a1053dd2f37dbf0e89784946e169b9d3408c26da84b5355a309b76e424fc48f07ae4b6 SHA512 3b4b62b6e10fcca501891ce878202f1171c8f6bbd69098215015d1a9a1c571e11aa2d8d83d35145f0b5da9c6231952758b60a7116160d64d995d5b2b870b1904
 AUX syslog-ng.conf.gentoo.hardened.in 4509 BLAKE2B 39f130c008df8d5e31c121246997f8f31d2d8e2a78f1a881f4ca07ade0b3a5386c6e8c3fd8518e2ae471751564263886b8e3b78e8651efe0eeccd1d06c23c2a5 SHA512 0670952e6f5d0405e90bb5cb1ea168832bb2293095250c01a9baaf9e4fcdf8578ecf5b60809bd9e5089096a4d97fa966fcc47324fbe70cfd14266a10eb0001c6
 AUX syslog-ng.conf.gentoo.in 1198 BLAKE2B a95b1fb9f46655502a41b0381c7388c9b54cfe9b8c3fd68dc68bd473175688e8ae72145a0ef718ef65220ecced7ecab00b39755cf41d4e21a6d375059cf6f309 SHA512 2830d1c5071a50c4aea6288b35c2880988111f29a11a641ee89f001a4ca4319943f87fdb1fd7079988888efa55401e2ed62f7a507c452de137f2e97a445d60e1
 AUX syslog-ng.confd 1557 BLAKE2B 42b5b1593c877b7395a8470bdf19571705f0c586a1a3530903659828565018dff71d62e56bfba28afa6c5e9fcb55aee2a41bcfff53c9ad006ee319124adbd66a SHA512 c945d27560afa310ac7f15e0cde3a564d5296892c747827d68df1b49c728998b056b596f93ac2564a5cb349f88db6585de58ec64cdaa13b92f20f5aac213ef44
@@ -11,8 +12,10 @@ DIST syslog-ng-3.22.1.tar.gz 4981746 BLAKE2B e4f7e47f1939fb07d204c4721ff558a606c
 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
 DIST syslog-ng-3.26.1.tar.gz 5040993 BLAKE2B 235971547c8febe61191014d971b9e5d71560f51ebc3a74fbae1c95b86653f1de8d0b99788f5b00cc75926dc67e7a80f650e9d2d12f191a4400c5b8edbbd01b7 SHA512 2cf6a8bd70addec3bef0888539f4a4686c30655698835d0c211ea929a0cae91a6f3dc9903f29fe717fd9d48b5cdc9918796f196ca84af6f5733bedff09ffab5a
+DIST syslog-ng-3.28.1.tar.gz 5149671 BLAKE2B bfc33f2a595cb4fbcc5a69b60d283673922873434b21ca8ce9685a0f54b355f162b11242704419349a561f412573c84df30a49a4dc0cc95699e98720e3e65247 SHA512 d70b435a6c9d1d0d22ecebc051dc294b6e7f841159edabf229c772c40342a28014ea1599b2277f0514236f545bac63c9879988fd85d634e9ab4fe4f079c984cb
 EBUILD syslog-ng-3.22.1.ebuild 4936 BLAKE2B 04f1a6919c18f56ac8a3bc7603deb39b6b8813211f459c893006d9accad4df75fc594cbd1fd95ecb86fc913e324db31014be9732ffca8a86137effef2f33ecf8 SHA512 f693d5c9a4171ae85c4a37d595ff613dcda4966bbdbcf47b3bee41022320f1d18e54ed2cd5931000b485cdce85cdc557418f683739efc12728623084dfa62acb
 EBUILD syslog-ng-3.24.1.ebuild 4883 BLAKE2B e48c762ee8d64e1519444632f9db25561cda743e2312726efdfd1f5c931e735a6fa0a6b361d408681c1a2fe5dd34b1549115d0d09b6293097c87603282668d65 SHA512 6e37630522517a83d80fcf97c644c6a434d439b76d53ec267ecf460f11c245b438d0d7439299f8c8260ef88007f96383f06d8e61c1e5469b750c2bfc25592ef4
 EBUILD syslog-ng-3.25.1.ebuild 4909 BLAKE2B 2023e42d14273f411e66e33b5ae3213126ec3de11c24ced371db5e6f5da2bd5b08a535981031db30ca9b753e718956f1dac8fc0ca79f63102f631d0158c4988e SHA512 5f104319d94922cd0e25db9dad30a897243eb271215ed5dab2a6bb05d21c33a69cf60f00713a63115a3ddde9ff79b4f59c1912bb1a5bb7f970e6189df872b63c
-EBUILD syslog-ng-3.26.1-r1.ebuild 4920 BLAKE2B ae8410d9cb5d82886987a6a0eb7b7e23dec0ac2108604a2f7a91a45f2afbbfbae71af732fa188836c8461c4408a485693f01981952a5df2c1e5c505f4ca398b8 SHA512 2ab568d049380f335a6ff61c3ebcb05360f84f7a2a8816ee09f057dadfa991d89d8aa1d845818ddb0c33148be0cab5d8ced20bfe074c74f45c4b80a1bbc65738
+EBUILD syslog-ng-3.26.1-r1.ebuild 4914 BLAKE2B 0a69ee226f3b4e789a85240a2165a01575c8a9a7112aad463411e4e9676edd4a1ed9ec18f33bac1618d4e48b00285f73b8d6a45d544be38ddecf61742f245456 SHA512 11859726aba84e20fe1e532ed1d6d98200db14516bba2d0e9a80a2c7609fe1aa904884537deb634c908035236bae0041d8f403c9138b22163ccef6831ee14bc6
+EBUILD syslog-ng-3.28.1-r2.ebuild 4902 BLAKE2B 4bc2a472ae0a8050f55024545c3e072048480fb9cef36086a8a8e921474cd41bfa424c9840056e69951dc045a71974a024949f1529d8e3b189a4d817dd922e7f SHA512 652b65723665818e0731cfc506d3c0f71e82dfb6b7f64157e33ce64b98d57631bca0a7fc95118cb655b0e3f5d3053a08fb29a0ccd8075ae7b65d77a3dc2d7556
 MISC metadata.xml 1252 BLAKE2B 08f7e05955fc5e4690e2cbe78046c4aa3d298c2f20fe98b32eb49916c1fbb428febe7fee7cb3595b76190b90375eb2816b82379c4ceb690428bcc9b45cabad3f SHA512 a85893da037c9917697bd901825a304da4010208fcb5b0682a47d17bb0ce60677604955847d68c18792fa87cce42e19019aa08e8343e0a8799997894ee5f6158
diff --git a/app-admin/syslog-ng/files/syslog-ng-3.28.1-net-snmp.patch b/app-admin/syslog-ng/files/syslog-ng-3.28.1-net-snmp.patch
new file mode 100644
index 000000000000..e9c244502f4f
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng-3.28.1-net-snmp.patch
@@ -0,0 +1,13 @@
+--- a/modules/afsnmp/Makefile.am
++++ b/modules/afsnmp/Makefile.am
+@@ -24,9 +24,7 @@
+ 	-I$(top_builddir)/modules/afsnmp
+ 
+ modules_afsnmp_libafsnmp_la_LIBADD	=	\
+-	$(MODULE_DEPS_LIBS)
+-
+-modules_afsnmp_libafsnmp_la_LDFLAGS	=	\
++	$(MODULE_DEPS_LIBS) \
+ 	$(MODULE_LDFLAGS) \
+ 	$(NETSNMP_LIBS)
+ 
diff --git a/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild b/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild
index 834c32ffc4ad..5c2b1736a0d0 100644
--- a/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="amqp caps dbi geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
diff --git a/app-admin/syslog-ng/syslog-ng-3.28.1-r2.ebuild b/app-admin/syslog-ng/syslog-ng-3.28.1-r2.ebuild
new file mode 100644
index 000000000000..464779f524ff
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.28.1-r2.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=( python3_{7..9} )
+inherit autotools python-single-r1 systemd
+
+MY_PV_MM=$(ver_cut 1-2)
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="https://syslog-ng.com/open-source-log-management"
+SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="amqp caps dbi geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+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_DEPS} )
+	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="${RDEPEND}
+	test? ( dev-libs/criterion )"
+BDEPEND="
+	sys-devel/flex
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
+	contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
+	"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.28.1-net-snmp.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	local f
+
+	use python && python_fix_shebang .
+
+	# remove bundled libs
+	rm -r lib/ivykis || die
+
+	# drop scl modules requiring json
+	if use !json; then
+		sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die
+	fi
+
+	# drop scl modules requiring http
+	if use !http; then
+		sed -i -r '/slack|telegram/d' scl/Makefile.am || die
+	fi
+
+	# use gentoo default path
+	if use systemd; then
+		sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
+			-i contrib/systemd/syslog-ng@default || die
+	fi
+
+	for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do
+		sed \
+			-e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \
+				"/etc/init.d/syslog-ng reload")#g" \
+			"${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
+	done
+
+	for f in syslog-ng.conf.gentoo.hardened.in \
+			syslog-ng.conf.gentoo.in; do
+		sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
+	done
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-docs
+		--disable-java
+		--disable-java-modules
+		--disable-riemann
+		--enable-manpages
+		--localstatedir=/var/lib/syslog-ng
+		--sysconfdir=/etc/syslog-ng
+		--with-embedded-crypto
+		--with-ivykis=system
+		--with-module-dir=/usr/$(get_libdir)/syslog-ng
+		--with-pidfile-dir=/var/run
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		$(use_enable amqp)
+		$(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client)
+		$(use_enable caps linux-caps)
+		$(use_enable dbi sql)
+		$(use_enable geoip2)
+		$(use_enable http)
+		$(use_enable ipv6)
+		$(use_enable json)
+		$(use_enable kafka)
+		$(use_enable mongodb)
+		$(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options")
+		$(use_enable pacct)
+		$(use_enable python)
+		$(use_enable redis)
+		$(use_enable smtp)
+		$(use_enable snmp afsnmp)
+		$(use_enable spoof-source)
+		$(use_enable systemd)
+		$(use_enable tcpd tcp-wrapper)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	# Install default configuration
+	insinto /etc/default
+	doins contrib/systemd/syslog-ng@default
+
+	insinto /etc/syslog-ng
+	newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf
+
+	insinto /etc/logrotate.d
+	newins "${T}/syslog-ng.logrotate" syslog-ng
+
+	newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng
+	newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
+	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
+	find "${D}" -name '*.la' -delete || die
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	# bug #355257
+	if ! has_version app-admin/logrotate ; then
+		elog "It is highly recommended that app-admin/logrotate be emerged to"
+		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
+		elog "for logrotate to use."
+	fi
+
+	if use systemd; then
+		ewarn "The service file for systemd has changed to support multiple instances."
+		ewarn "To start the default instance issue:"
+		ewarn "# systemctl start syslog-ng@default"
+	fi
+}
diff --git a/app-admin/syslog-summary/Manifest b/app-admin/syslog-summary/Manifest
index ef8b07c7eb11..354305b5d0b9 100644
--- a/app-admin/syslog-summary/Manifest
+++ b/app-admin/syslog-summary/Manifest
@@ -1,6 +1,8 @@
 AUX syslog-summary-1.14-fix-ignore-code.patch 306 BLAKE2B e319592affd7f13c88cd4ea2ba993050474fa1f96351d0144e20ca0ada5fc4ba5aa5243adc71a99efa12ea189757b05fc76f649688eece6261a0f7697bd3719a SHA512 cc6cdaf03d62a1bda5bcbd4c395ef1fbbc7be7a61ec88df6c7784e14c6a3cf677e58304cf4b5caafe115f7267e38262978a148fe9811bdce0f10966df72c709b
+AUX syslog-summary-1.14-remove-file-magic.patch 836 BLAKE2B a4b2d7d40ab7c15ac33325c97d8bea3df7d7f824c3d301a6be764ac0a5ce9721fd7d6dbdd6a6f48432931fdfca7a2f1cf141eab897e8bdfa1eba20f2f9485153 SHA512 1f860cb96cf5eef124217c8253264fe24f6b7fde3d078d2f41e419490bdb3d9d4df6fed7c9b8cc68a855dfc06f81dfdc4c7e868d9812ed1a306ac65cbc97f833
 DIST syslog-summary-1.14.tar.gz 7278 BLAKE2B 609e506c099b734be87ba6d6e21f70283d4654ab5c6d3794da71099f3e590d178348c13ab271ddb84682220091adfd702c107bf2dee792419de3ce14d2a9c9db SHA512 db1f0660ad435eea26fc3ec4cd475f5f1b98bb629495707741077e52aef88fe8bff4a318bb5b0821e57ccfa0646454c6825a5a4fc1fb4b73ea67cbd4defef277
 EBUILD syslog-summary-1.14-r1.ebuild 766 BLAKE2B 036754524dd9c11b985c2ef5777636aba3be7bc92b1ed430cc00cf1ac93701f442354dfe9b12e7a0dcbfca4625a7b6fceea2cb218e9ad3fa2a42f39e098bda39 SHA512 f865914965a0ea4f6db355429c4ffedc768c491c9d7f93a6668422bc3e307be31465fe003462bbf45c73857b292110132bd4499d023040516a1c614fb716a549
 EBUILD syslog-summary-1.14-r2.ebuild 944 BLAKE2B ef4dde4b5da0ce5ae1b28e9200d2d51fbca075f30bb72a6f1bb49104d980da37ea44c872901ee207e392cf5f06a3f4a9a5bc032da5f4d50a9fc8805c12366c66 SHA512 47fe494a2bc164750e4804b6c6e8dfa9328b072ab9e7ca0e77e1f2bc4d253387f4e3ed13bfd1d84cc729d15f71faf58660484803ae2c38dcd61d77c2ef79ff5a
 EBUILD syslog-summary-1.14-r3.ebuild 991 BLAKE2B 9086206934c07f3d810faec448a65cd24492bdd986d7832c95579aaba61136595b6b9c4f4d8fd5d406e32cd15ad9369d095b2e3c68e762267c894738bff5be6f SHA512 c127aa0387176e078d31b46729c9b437e4537b2821ec7b4eda4d7c742e31e014ce1d33f3d3ef3666ccee1de0a21759f27f5feaaf778ee0f26ee703bd26ddd94b
+EBUILD syslog-summary-1.14-r4.ebuild 843 BLAKE2B 7937d374d41d63881205b78d45e73ee5c11ac7a8b21437048e1596c8ac10fb4d7402ea8686a84ad4ab5379b197ff4ed4dc74f1f8d6b2ca06ec32aa5463c70cf4 SHA512 d5b54c48351a7cb82f6c988138621633008367b8a3a8fb02ee05f52a7975cb9799757d04ca17ff0a031ed6354f01c98c22ab8d1188a842cdb354a9cbdbe09c17
 MISC metadata.xml 464 BLAKE2B 862ef04e25fe1aa6609e2ea68c9d61a9c201d43ffab9db6a02244ca9192f4fd11a1f1f4e4d6f7e365660c4043b28a959d5da9783f3c6f0ed4f69eb625784763c SHA512 64073e0ef15c4fbe057f51c09505ea3db8d5e1427c2d581b55137e7fba37f5fef13103cfe4d0e58c74052601d4bae0ed26e36346d497653ea080fe5649f956eb
diff --git a/app-admin/syslog-summary/files/syslog-summary-1.14-remove-file-magic.patch b/app-admin/syslog-summary/files/syslog-summary-1.14-remove-file-magic.patch
new file mode 100644
index 000000000000..c7a1738b7c8d
--- /dev/null
+++ b/app-admin/syslog-summary/files/syslog-summary-1.14-remove-file-magic.patch
@@ -0,0 +1,35 @@
+diff --git a/syslog-summary b/syslog-summary
+index abf6381..b3edffc 100755
+--- a/syslog-summary
++++ b/syslog-summary
+@@ -128,24 +128,12 @@ def split_date(line):
+ 
+ def is_gzipped(filename):
+ 	"""Returns True if the filename is a gzipped compressed file"""	
+-	try:
+-		import magic
+-		ms = magic.open(magic.MAGIC_NONE)
+-		ms.load()
+-		if re.search("^gzip compressed data.*", ms.file(filename)):
+-			return True
+-		else:
+-			return False
+-	except:
+-		from os.path import splitext
+-		
+-		if not QUIET:
+-			print "Using fallback detection... please install python-magic for better gzip detection."
+-		
+-		if splitext(filename)[1] == ".gz":
+-			return True
+-		else:
+-			return False
++	from os.path import splitext
++
++	if splitext(filename)[1] == ".gz":
++		return True
++	else:
++		return False
+ 
+ def summarize(filename, states):
+ 	counts = {}
diff --git a/app-admin/syslog-summary/syslog-summary-1.14-r4.ebuild b/app-admin/syslog-summary/syslog-summary-1.14-r4.ebuild
new file mode 100644
index 000000000000..1831eb914a2b
--- /dev/null
+++ b/app-admin/syslog-summary/syslog-summary-1.14-r4.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="Summarizes the contents of a syslog log file"
+HOMEPAGE="https://github.com/dpaleino/syslog-summary"
+SRC_URI="https://github.com/downloads/dpaleino/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}"
+
+PATCHES=( "${FILESDIR}/${P}-fix-ignore-code.patch" "${FILESDIR}/${P}-remove-file-magic.patch" )
+
+src_prepare() {
+	python_fix_shebang -f syslog-summary
+
+	# Sadly, the makefile is useless for us.
+	rm Makefile || die
+
+	default
+}
+
+src_install() {
+	dobin syslog-summary
+	einstalldocs
+	doman syslog-summary.1
+
+	insinto /etc/syslog-summary
+	doins ignore.rules
+}
diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest
index ce7a568f639e..82a87acd8155 100644
--- a/app-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
@@ -595,7 +595,9 @@ DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8
 DIST terraform-0.12.24.tar.gz 10427523 BLAKE2B 088d0cd249a065ef663b41690e0c1e27baf61706da3444d4677b3a1b24652c50882601e036841fb004377a57d38918a62a45eb84983f5d8f09138ae2c5b3e77e SHA512 026b4c30438459d5fa433ea606e8e020f2ff71ba6e14a5caeecef32f5800a0699cb192ece4bf9b5005b8e0fb2e375f70602d44d94b0b8efa3bac20f9a30e14e6
 DIST terraform-0.12.25.tar.gz 10592286 BLAKE2B c83ba62cded25f279abcb55323137cbbb4e0089ce641136848c235773ec18b8254af3ee761daf0e02be80c507ded26fdae720ec03b80cc8b77000d7ff564ce0f SHA512 875b41987972f7f6e3fea0444a98ba6b033b3a932995693fe047f8751cf556f785a54efd9f53a0ceef598f73df7c6064908fa51824dd8a5b6c3686ba557e9730
 DIST terraform-0.12.26.tar.gz 10636755 BLAKE2B 31be58cbd883ef0c7cbdb71884e100c0e53be8707a1f73d506a40912055dae275d8d4b75bcdf1eb1de4b2f25677a7c64e2b21bd703d7fc91fc5caebe83a2dc56 SHA512 caf11bf1f9fc1abe122409c24ec8f60e80d601f4c818840ae7e8c16e968dd11771af1fb662b695c9134349052c6ad6827b3a0387d2bf8f96fca7304e1575ff33
+DIST terraform-0.12.28.tar.gz 10637713 BLAKE2B 218d8316c004c363bce39f1e4547cdf4a6d73cfd1b1c0e3810b5759ea509ddd6307f2694f9673c1b6b8668c1a869bc04a81be600a38c5d2c5868e2e1962a231f SHA512 cadd2a5527b4c4ee6dd0385d962435e15ac72f99bc0d3e8193f78a49a474e491dab73f9280c77f37f34e516873b12a7f1af23cd437cb2f9d0afb2bef9966c836
 EBUILD terraform-0.12.24.ebuild 777 BLAKE2B 686b38d1df4e28c19f03812fcad15802193f11fc1c8da7ba263513122952ccb9f9d5d469b9ed5e44e1d147c4f7d4d7f1e225ed6345d9d1934cfc062df1be6713 SHA512 4f2f3cd4b891778209a279cd62954cbc91e440422ac5334b88b09e274804c24c1ce9a898d4cfdbeb9623c5e370b8ec9c72ce56801386e981030d821939a7ed91
 EBUILD terraform-0.12.25.ebuild 32516 BLAKE2B 82760e733c16dd65dc176500be6e0295b87e466543cea769e48c33398d81abfa880b74ad07d02c470ffcc30a36c20e69b8d8621cb38dae25f55b9b72718ee0de SHA512 a1546571d726307eacfd58f296232718d0ebca2469a956fb21cdccf35abc4376f0f03b02cb60acbc568932b193e356ff8fc59150bb845801c1bd9c06dbe5ad1d
 EBUILD terraform-0.12.26.ebuild 33304 BLAKE2B 338c8e6fb7f885c28bb932489f977f6ce1f0685437376a17cf05c9a1c69447dd6c4079898907b5326b93989f5cf6b58acce9e4cf74af52c9432135d767968c7c SHA512 08d25823e509ede5234c51b38b5cfbf194b20ab55c8a2f4e62a7be74c11f4530990960f4f1dd28c3ddd28823f32a384ae5a7041534a8cde833dccbe510cdd3f8
+EBUILD terraform-0.12.28.ebuild 33303 BLAKE2B 4c0259ea3d2abbf4339caf96cd8428128f6fe15a9dfe7290f00ac39997796867db7b3861f99e8c8a4ddf28a3382c3d443bbde7ae22cb0b04e74b41a7f20004e7 SHA512 9114f7a5a1f532d4302ba792a2721b8d6b3e5ebbff504b4f48f406fd3de9933b2d57bd888a53fe5cad165d99e1e26f05865e7a46139ab34862dc805f59929add
 MISC metadata.xml 1074 BLAKE2B f14c6ede900b616f5a5514adc9735d25fa834dc879712ab79b68fe15a927cb3e8e77a7b30ee8af3b44551be9ec2368476757c4ec5e5b44fcd266367b485fc8bc SHA512 2e28b3de2b512246ddfb76b547151683c4202620992f9453747b4869db1a16d92996cbf810bf82f09e6895ddc7b23ecc2e0ecaf43d9c3ba9e8a2fb53baa995dc
diff --git a/app-admin/terraform/terraform-0.12.28.ebuild b/app-admin/terraform/terraform-0.12.28.ebuild
new file mode 100644
index 000000000000..7abd310fc46d
--- /dev/null
+++ b/app-admin/terraform/terraform-0.12.28.ebuild
@@ -0,0 +1,628 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.38.0/go.mod"
+	"cloud.google.com/go v0.44.1/go.mod"
+	"cloud.google.com/go v0.44.2/go.mod"
+	"cloud.google.com/go v0.45.1"
+	"cloud.google.com/go v0.45.1/go.mod"
+	"cloud.google.com/go/bigquery v1.0.1/go.mod"
+	"cloud.google.com/go/datastore v1.0.0/go.mod"
+	"github.com/Azure/azure-sdk-for-go v35.0.0+incompatible/go.mod"
+	"github.com/Azure/azure-sdk-for-go v36.2.0+incompatible"
+	"github.com/Azure/azure-sdk-for-go v36.2.0+incompatible/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.2"
+	"github.com/Azure/go-autorest/autorest v0.9.2/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.5.0"
+	"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.1-0.20191028180845-3492b2aff503"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.1-0.20191028180845-3492b2aff503/go.mod"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.2.0"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.1.0"
+	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.2.0"
+	"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.3.0"
+	"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/to v0.3.0"
+	"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/validation v0.2.0"
+	"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/logger v0.1.0"
+	"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/tracing v0.5.0"
+	"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
+	"github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4"
+	"github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022"
+	"github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022/go.mod"
+	"github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod"
+	"github.com/Unknwon/com v0.0.0-20151008135407-28b053d5a292"
+	"github.com/Unknwon/com v0.0.0-20151008135407-28b053d5a292/go.mod"
+	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
+	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
+	"github.com/agext/levenshtein v1.2.1/go.mod"
+	"github.com/agext/levenshtein v1.2.2"
+	"github.com/agext/levenshtein v1.2.2/go.mod"
+	"github.com/agl/ed25519 v0.0.0-20150830182803-278e1ec8e8a6"
+	"github.com/agl/ed25519 v0.0.0-20150830182803-278e1ec8e8a6/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190329064014-6e358769c32a"
+	"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190329064014-6e358769c32a/go.mod"
+	"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190103054945-8205d1f41e70"
+	"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190103054945-8205d1f41e70/go.mod"
+	"github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible"
+	"github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible/go.mod"
+	"github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e"
+	"github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e/go.mod"
+	"github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0"
+	"github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0/go.mod"
+	"github.com/apparentlymart/go-cidr v1.0.1"
+	"github.com/apparentlymart/go-cidr v1.0.1/go.mod"
+	"github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod"
+	"github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0"
+	"github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0/go.mod"
+	"github.com/apparentlymart/go-textseg v1.0.0"
+	"github.com/apparentlymart/go-textseg v1.0.0/go.mod"
+	"github.com/apparentlymart/go-versions v0.0.2-0.20180815153302-64b99f7cb171"
+	"github.com/apparentlymart/go-versions v0.0.2-0.20180815153302-64b99f7cb171/go.mod"
+	"github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2"
+	"github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2/go.mod"
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da"
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+	"github.com/armon/go-radix v1.0.0"
+	"github.com/armon/go-radix v1.0.0/go.mod"
+	"github.com/aws/aws-sdk-go v1.15.78/go.mod"
+	"github.com/aws/aws-sdk-go v1.25.3"
+	"github.com/aws/aws-sdk-go v1.25.3/go.mod"
+	"github.com/aws/aws-sdk-go v1.30.12"
+	"github.com/aws/aws-sdk-go v1.30.12/go.mod"
+	"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f"
+	"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d"
+	"github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/blang/semver v3.5.1+incompatible"
+	"github.com/blang/semver v3.5.1+incompatible/go.mod"
+	"github.com/bmatcuk/doublestar v1.1.5"
+	"github.com/bmatcuk/doublestar v1.1.5/go.mod"
+	"github.com/boltdb/bolt v1.3.1"
+	"github.com/boltdb/bolt v1.3.1/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/cheggaaa/pb v1.0.27/go.mod"
+	"github.com/chzyer/logex v1.1.10"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/coreos/bbolt v1.3.0"
+	"github.com/coreos/bbolt v1.3.0/go.mod"
+	"github.com/coreos/etcd v3.3.10+incompatible"
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d"
+	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dimchansky/utfbom v1.1.0"
+	"github.com/dimchansky/utfbom v1.1.0/go.mod"
+	"github.com/dnaeon/go-vcr v0.0.0-20180920040454-5637cf3d8a31"
+	"github.com/dnaeon/go-vcr v0.0.0-20180920040454-5637cf3d8a31/go.mod"
+	"github.com/dylanmei/iso8601 v0.1.0"
+	"github.com/dylanmei/iso8601 v0.1.0/go.mod"
+	"github.com/dylanmei/winrmtest v0.0.0-20190225150635-99b7fe2fddf1"
+	"github.com/dylanmei/winrmtest v0.0.0-20190225150635-99b7fe2fddf1/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/fatih/color v1.7.0"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/ghodss/yaml v1.0.0"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-sql-driver/mysql v1.5.0/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/go-test/deep v1.0.1/go.mod"
+	"github.com/go-test/deep v1.0.3"
+	"github.com/go-test/deep v1.0.3/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.0"
+	"github.com/gogo/protobuf v1.2.0/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7"
+	"github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/mock v1.3.1"
+	"github.com/golang/mock v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.1.0/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/protobuf v1.3.4"
+	"github.com/golang/protobuf v1.3.4/go.mod"
+	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db"
+	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-querystring v1.0.0"
+	"github.com/google/go-querystring v1.0.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+	"github.com/google/uuid v1.1.1"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.5"
+	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+	"github.com/gophercloud/gophercloud v0.0.0-20190208042652-bc37892e1968"
+	"github.com/gophercloud/gophercloud v0.0.0-20190208042652-bc37892e1968/go.mod"
+	"github.com/gophercloud/utils v0.0.0-20190128072930-fbb6ab446f01"
+	"github.com/gophercloud/utils v0.0.0-20190128072930-fbb6ab446f01/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gorilla/websocket v1.4.0"
+	"github.com/gorilla/websocket v1.4.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.8.5"
+	"github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod"
+	"github.com/hashicorp/aws-sdk-go-base v0.4.0"
+	"github.com/hashicorp/aws-sdk-go-base v0.4.0/go.mod"
+	"github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089"
+	"github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-azure-helpers v0.10.0"
+	"github.com/hashicorp/go-azure-helpers v0.10.0/go.mod"
+	"github.com/hashicorp/go-checkpoint v0.5.0"
+	"github.com/hashicorp/go-checkpoint v0.5.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.0"
+	"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02"
+	"github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02/go.mod"
+	"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
+	"github.com/hashicorp/go-hclog v0.0.0-20181001195459-61d530d6c27f"
+	"github.com/hashicorp/go-hclog v0.0.0-20181001195459-61d530d6c27f/go.mod"
+	"github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa"
+	"github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.4"
+	"github.com/hashicorp/go-msgpack v0.5.4/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0"
+	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+	"github.com/hashicorp/go-plugin v1.3.0"
+	"github.com/hashicorp/go-plugin v1.3.0/go.mod"
+	"github.com/hashicorp/go-retryablehttp v0.5.2"
+	"github.com/hashicorp/go-retryablehttp v0.5.2/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.0"
+	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+	"github.com/hashicorp/go-safetemp v1.0.0"
+	"github.com/hashicorp/go-safetemp v1.0.0/go.mod"
+	"github.com/hashicorp/go-slug v0.4.1"
+	"github.com/hashicorp/go-slug v0.4.1/go.mod"
+	"github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86"
+	"github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86/go.mod"
+	"github.com/hashicorp/go-tfe v0.8.1"
+	"github.com/hashicorp/go-tfe v0.8.1/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.1"
+	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+	"github.com/hashicorp/go-version v1.1.0"
+	"github.com/hashicorp/go-version v1.1.0/go.mod"
+	"github.com/hashicorp/go-version v1.2.0"
+	"github.com/hashicorp/go-version v1.2.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f"
+	"github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod"
+	"github.com/hashicorp/hcl/v2 v2.0.0/go.mod"
+	"github.com/hashicorp/hcl/v2 v2.3.0"
+	"github.com/hashicorp/hcl/v2 v2.3.0/go.mod"
+	"github.com/hashicorp/hil v0.0.0-20190212112733-ab17b08d6590"
+	"github.com/hashicorp/hil v0.0.0-20190212112733-ab17b08d6590/go.mod"
+	"github.com/hashicorp/memberlist v0.1.0"
+	"github.com/hashicorp/memberlist v0.1.0/go.mod"
+	"github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb"
+	"github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb/go.mod"
+	"github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7"
+	"github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7/go.mod"
+	"github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596"
+	"github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596/go.mod"
+	"github.com/hashicorp/vault v0.10.4"
+	"github.com/hashicorp/vault v0.10.4/go.mod"
+	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb"
+	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
+	"github.com/jhump/protoreflect v1.6.0"
+	"github.com/jhump/protoreflect v1.6.0/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+	"github.com/jmespath/go-jmespath v0.3.0"
+	"github.com/jmespath/go-jmespath v0.3.0/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926"
+	"github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926/go.mod"
+	"github.com/json-iterator/go v1.1.5"
+	"github.com/json-iterator/go v1.1.5/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jtolds/gls v4.2.1+incompatible"
+	"github.com/jtolds/gls v4.2.1+incompatible/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0"
+	"github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod"
+	"github.com/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba"
+	"github.com/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod"
+	"github.com/kylelemons/godebug v1.1.0"
+	"github.com/kylelemons/godebug v1.1.0/go.mod"
+	"github.com/lib/pq v1.0.0"
+	"github.com/lib/pq v1.0.0/go.mod"
+	"github.com/likexian/gokit v0.0.0-20190309162924-0a377eecf7aa/go.mod"
+	"github.com/likexian/gokit v0.0.0-20190418170008-ace88ad0983b/go.mod"
+	"github.com/likexian/gokit v0.0.0-20190501133040-e77ea8b19cdc/go.mod"
+	"github.com/likexian/gokit v0.20.15"
+	"github.com/likexian/gokit v0.20.15/go.mod"
+	"github.com/likexian/simplejson-go v0.0.0-20190409170913-40473a74d76d/go.mod"
+	"github.com/likexian/simplejson-go v0.0.0-20190419151922-c1f9f0b4f084/go.mod"
+	"github.com/likexian/simplejson-go v0.0.0-20190502021454-d8787b4bfa0b/go.mod"
+	"github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82"
+	"github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82/go.mod"
+	"github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9"
+	"github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9/go.mod"
+	"github.com/masterzen/winrm v0.0.0-20190223112901-5e5c9a7fe54b"
+	"github.com/masterzen/winrm v0.0.0-20190223112901-5e5c9a7fe54b/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-colorable v0.1.1"
+	"github.com/mattn/go-colorable v0.1.1/go.mod"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.4/go.mod"
+	"github.com/mattn/go-isatty v0.0.5"
+	"github.com/mattn/go-isatty v0.0.5/go.mod"
+	"github.com/mattn/go-runewidth v0.0.4/go.mod"
+	"github.com/mattn/go-shellwords v1.0.4"
+	"github.com/mattn/go-shellwords v1.0.4/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/miekg/dns v1.0.8"
+	"github.com/miekg/dns v1.0.8/go.mod"
+	"github.com/mitchellh/cli v1.0.0"
+	"github.com/mitchellh/cli v1.0.0/go.mod"
+	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db"
+	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod"
+	"github.com/mitchellh/copystructure v1.0.0"
+	"github.com/mitchellh/copystructure v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb"
+	"github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb/go.mod"
+	"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod"
+	"github.com/mitchellh/go-wordwrap v1.0.0"
+	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+	"github.com/mitchellh/hashstructure v1.0.0"
+	"github.com/mitchellh/hashstructure v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/panicwrap v1.0.0"
+	"github.com/mitchellh/panicwrap v1.0.0/go.mod"
+	"github.com/mitchellh/prefixedio v0.0.0-20190213213902-5733675afd51"
+	"github.com/mitchellh/prefixedio v0.0.0-20190213213902-5733675afd51/go.mod"
+	"github.com/mitchellh/reflectwalk v1.0.0"
+	"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/mozillazg/go-httpheader v0.2.1"
+	"github.com/mozillazg/go-httpheader v0.2.1/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d"
+	"github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod"
+	"github.com/oklog/run v1.0.0"
+	"github.com/oklog/run v1.0.0/go.mod"
+	"github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58"
+	"github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58/go.mod"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+	"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4"
+	"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod"
+	"github.com/pkg/errors v0.8.0"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/posener/complete v1.1.1/go.mod"
+	"github.com/posener/complete v1.2.1"
+	"github.com/posener/complete v1.2.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829"
+	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f"
+	"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/prometheus/common v0.2.0"
+	"github.com/prometheus/common v0.2.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1"
+	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/satori/go.uuid v1.2.0"
+	"github.com/satori/go.uuid v1.2.0/go.mod"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+	"github.com/sergi/go-diff v1.0.0"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/sirupsen/logrus v1.2.0"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a"
+	"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod"
+	"github.com/soheilhy/cmux v0.1.4"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/spf13/afero v1.2.1"
+	"github.com/spf13/afero v1.2.1/go.mod"
+	"github.com/spf13/pflag v1.0.2/go.mod"
+	"github.com/spf13/pflag v1.0.3"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.5.1"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d"
+	"github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d/go.mod"
+	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.82+incompatible"
+	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.82+incompatible/go.mod"
+	"github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190808065407-f07404cefc8c"
+	"github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190808065407-f07404cefc8c/go.mod"
+	"github.com/terraform-providers/terraform-provider-openstack v1.15.0"
+	"github.com/terraform-providers/terraform-provider-openstack v1.15.0/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6/go.mod"
+	"github.com/ugorji/go v0.0.0-20180813092308-00b869d2f4a5"
+	"github.com/ugorji/go v0.0.0-20180813092308-00b869d2f4a5/go.mod"
+	"github.com/ulikunitz/xz v0.5.5"
+	"github.com/ulikunitz/xz v0.5.5/go.mod"
+	"github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod"
+	"github.com/vmihailenco/msgpack v4.0.1+incompatible"
+	"github.com/vmihailenco/msgpack v4.0.1+incompatible/go.mod"
+	"github.com/xanzy/ssh-agent v0.2.1"
+	"github.com/xanzy/ssh-agent v0.2.1/go.mod"
+	"github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18"
+	"github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod"
+	"github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557"
+	"github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557/go.mod"
+	"github.com/zclconf/go-cty v1.0.0/go.mod"
+	"github.com/zclconf/go-cty v1.1.0"
+	"github.com/zclconf/go-cty v1.1.0/go.mod"
+	"github.com/zclconf/go-cty v1.2.0"
+	"github.com/zclconf/go-cty v1.2.0/go.mod"
+	"github.com/zclconf/go-cty v1.2.1"
+	"github.com/zclconf/go-cty v1.2.1/go.mod"
+	"github.com/zclconf/go-cty-yaml v1.0.1"
+	"github.com/zclconf/go-cty-yaml v1.0.1/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.opencensus.io v0.22.0"
+	"go.opencensus.io v0.22.0/go.mod"
+	"go.uber.org/atomic v1.3.2"
+	"go.uber.org/atomic v1.3.2/go.mod"
+	"go.uber.org/multierr v1.1.0"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/zap v1.9.1"
+	"go.uber.org/zap v1.9.1/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190222235706-ffb98f73852f/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod"
+	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+	"golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37"
+	"golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+	"golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20191009170851-d66e71096ffb"
+	"golang.org/x/net v0.0.0-20191009170851-d66e71096ffb/go.mod"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+	"golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa"
+	"golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.2"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0"
+	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/api v0.7.0/go.mod"
+	"google.golang.org/api v0.8.0/go.mod"
+	"google.golang.org/api v0.9.0"
+	"google.golang.org/api v0.9.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/appengine v1.5.0/go.mod"
+	"google.golang.org/appengine v1.6.1"
+	"google.golang.org/appengine v1.6.1/go.mod"
+	"google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/grpc v1.8.0/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.1"
+	"google.golang.org/grpc v1.21.1/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.27.1"
+	"google.golang.org/grpc v1.27.1/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod"
+	"gopkg.in/ini.v1 v1.42.0"
+	"gopkg.in/ini.v1 v1.42.0/go.mod"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"rsc.io/binaryregexp v0.2.0/go.mod"
+)
+
+go-module_set_globals
+
+DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
+HOMEPAGE="https://www.terraform.io/"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+
+DOCS=( {README,CHANGELOG}.md )
+
+src_compile() {
+	go build \
+		-work -o "bin/${PN}" ./ || die
+}
+
+src_install() {
+	dobin bin/terraform
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "If you would like to install shell completions please run:"
+	elog "    terraform -install-autocomplete"
+}
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 717af1445848..1ba4dac9c5d1 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -3,10 +3,7 @@ AUX vault.confd 243 BLAKE2B 6598fa2138c4ca94fdd6b7a02048ee4a4eb2b37d17b8a065ae2f
 AUX vault.initd 573 BLAKE2B 444541b8912910cf6b5d038e466e18baebb7dfd2905d802217baf9e861bb7f2a3e032716545c74e269782aa420fbd052745322576b4bcb8c4cf53ba07471b261 SHA512 11124e6fc656977c20b55b578e30fd76b8f6905760c2f17f93b960a317975f1914c6bd8d4ffd3741ba405bfe5aa0cecb68067f8ce52b2df9015863d31f9a7aad
 AUX vault.logrotated 83 BLAKE2B 63b106e949f8a2da0ca97f1d07732fdea4dafbe44cb97ea81074472b95489d179deccd14f4d4176043f488f2be68b96dc6bee20748fe68f650d70fd32078d2bd SHA512 83d73760d85dbb731652aa5936d2780208ac4643e975538652f53b49305d024df6d72a8a06d82f430982b07cf940b2fd69f9a6eedb39d380136c8e5bfda280e5
 AUX vault.service 677 BLAKE2B 0d9c6636c841ff33fa38afca10f10c62d273dc1c6419e35e2fa844472de0c963e177c80a6db3e95230db6f641ab50148843085cb4f141fa2dd2765aecf8457d3 SHA512 15951d095181fb1b1a5f79e0f385bdb96812a517ea59e05017141a29ed880d0e6f29d377e7c4bc53d5b70175122785a39923297b8e3304fc46a63835d2d2ec50
-DIST vault-1.4.0-webui.tar.xz 1211468 BLAKE2B 5a7b221f2339ca451f6bc2df7b1a4611a9f7786305ec0631d0e7130fb0287f764553d8a8a99ade5d28a2ae39fca1028b5a3c7299a5049acff0d1a3c1e9b8124f SHA512 3b17221e189f9e5fa73afbae3496e4d1105401a94ce5f99ff1c6975ca25b20485a05dc7f0b0c469d29d896524370d8fa23157d401d28e2e92a71a4813a4d9ba6
-DIST vault-1.4.0.tar.gz 33097110 BLAKE2B 837f23a50128b0fab6542fc6a596d911267a1e14453091f22171db2ccf6a1a3d0aacdb3f210ac0d07efc7ed5ce845a197f61dd4dab37c35ad6f0f47cefc09c9d SHA512 13c1fb901fe577d91f2734f8a0ae5e51083e1307e7fc32a4388a1be48f2c46cd3d121432fa7450d6f9b439285d3ad5819b123631f41bb347e8d75ce683d24a7e
 DIST vault-1.4.2-webui.tar.xz 1208924 BLAKE2B 5177afc91e7bc774b7d78e5e344d7c8310a13a592c57768ac6a0c8e12ef6e7ac8b6dbc975e5e9131888478a7fb18ad9ef1ee9b1da43c2899fcf636e99d049078 SHA512 ab462bebfa38102e354938e9b8c6990b6bb19b29dd0da96d65f290394a987d89063800247c1d751a8f7ba7c3fa6645aab9383a5455444244adb5f40528408b17
 DIST vault-1.4.2.tar.gz 33158384 BLAKE2B 263f20419c210b83448907b1e95464fb139f52f4f7347eb01803b5aa487797c191f1e61a9fb77321f776ea70feb83a741f10c79400fdd471b790fe37a6404a9c SHA512 d4f2a426a4c0531cca0d3812c2e29ebc5ebbd6da2897d3ee57fe57d4dfde0395f30713cfe21600b4dd51fdc90bf2a10527957b04c8215bd185bd502267f93503
-EBUILD vault-1.4.0.ebuild 1794 BLAKE2B 687a5f85ef6715db8f4f940a1990f47a1380ea52004cd34b467e22b6b93dc7bd851c440cdfdce801b9abc3f397b69f4afdcfecf6f0998f700bec49cba2852f13 SHA512 10bf23a0dfd461fc067667d7c9f6a9b627d72c569940899b7a3b935dda254c0bb0103752145cec61e629d5c9622ac47ad2ef42bbb26ef979ec14cc5fbbbad8d1
-EBUILD vault-1.4.2.ebuild 1794 BLAKE2B a679a23b1d2e349fa1d22e58d9cd22022e4b67a09fab41d672a8f244b6a2a9be9d5907fd5324e5ccbe61efab825d32a37eb5f95597c6984f7c8803f3e66446d8 SHA512 001ba7123b4fbb4c2c56be8d2923402c6ecbf736c85e07805b16c167ccbc80108546fb99244bee055e73fbdb5f146039778b9ffea3b724f2e36088045b773b34
+EBUILD vault-1.4.2-r1.ebuild 1857 BLAKE2B 3bfa96148412f6c7e2979f8e86baeb100e4e0e42fa2ddc9251c4a4017c18b639583fd51cc360b4c31db25d8641a82058a11572c47a2eeca3d92068e44cd00d1a SHA512 29726e334b3abc150235ba6bc72770bd82e8a0f9225f018ded55fbf08366b90d989d1457ac57e882321ae5209d82a102526924db0e44c9598534587772dcd338
 MISC metadata.xml 371 BLAKE2B bdee8ae91cf8ccf66bfceb7ee5e1a46494d3e1b36cf5159ce9e6ad36eb251ea0ea03b1a9aab034936021d1a0f17c8577dafb30dc76a912ec04d8cfc3ae8c37cc SHA512 2517b0ec49190a14a2261c3544e4115435abcc0824a0fd255f6eb585d2de9e97f6feddeff8bb15c505d0f9e3086839e00e2abbd18bc639b45a25f6a7f384be6a
diff --git a/app-admin/vault/vault-1.4.0.ebuild b/app-admin/vault/vault-1.4.0.ebuild
deleted file mode 100644
index a095561ace9e..000000000000
--- a/app-admin/vault/vault-1.4.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps go-module systemd
-
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
-SRC_URI="https://github.com/hashicorp/vault/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	webui? (
-		https://dev.gentoo.org/~williamh/dist/${VAULT_WEBUI_ARCHIVE}
-	)"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+webui"
-
-BDEPEND="dev-go/gox"
-COMMON_DEPEND="acct-group/vault
-	acct-user/vault"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
-
-FILECAPS=(
-	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-RESTRICT+=" test"
-
-src_prepare() {
-	default
-	# Avoid the need to have a git checkout
-	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
-		-e 's:^\(GIT_DIRTY=\).*:\1:' \
-		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
-		-i scripts/build.sh || die
-	sed -e "/hooks/d" \
-		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
-		-i Makefile || die
-	if [[ -f "${WORKDIR}/http/bindata_assetfs.go" ]]; then
-		mv "${WORKDIR}/http/bindata_assetfs.go" "${S}/http" ||
-			die "mv failed"
-	fi
-}
-
-src_compile() {
-	mkdir "${T}"/bin || die
-	BUILD_TAGS="$(usex webui ui '')" \
-	GOFLAGS="-mod=vendor" \
-	GOPATH="${T}" \
-	XC_ARCH=$(go env GOARCH) \
-	XC_OS=$(go env GOOS) \
-	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
-	emake
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md
-	insinto /etc/${PN}.d
-	doins "${FILESDIR}/"*.json.example
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/app-admin/vault/vault-1.4.2-r1.ebuild b/app-admin/vault/vault-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..671178b25133
--- /dev/null
+++ b/app-admin/vault/vault-1.4.2-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps go-module systemd
+
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
+SRC_URI="https://github.com/hashicorp/vault/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	webui? (
+		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
+	)"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="+webui"
+
+BDEPEND="dev-go/gox"
+COMMON_DEPEND="acct-group/vault
+	acct-user/vault"
+	DEPEND="${COMMON_DEPEND}"
+	RDEPEND="${COMMON_DEPEND}"
+
+FILECAPS=(
+	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	# Avoid the need to have a git checkout
+	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+		-e 's:^\(GIT_DIRTY=\).*:\1:' \
+		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+		-i scripts/build.sh || die
+	sed -e "/hooks/d" \
+		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
+		-i Makefile || die
+	if [[ -f "${WORKDIR}/http/bindata_assetfs.go" ]]; then
+		mv "${WORKDIR}/http/bindata_assetfs.go" "${S}/http" ||
+			die "mv failed"
+	fi
+}
+
+src_compile() {
+	mkdir "${T}"/bin || die
+	BUILD_TAGS="$(usex webui ui '')" \
+	GOFLAGS="-mod=vendor" \
+	GOPATH="${T}" \
+	XC_ARCH=$(go env GOARCH) \
+	XC_OS=$(go env GOOS) \
+	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
+	emake
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md
+	insinto /etc/${PN}.d
+	doins "${FILESDIR}/"*.json.example
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+	go-module_pkg_postinst
+}
diff --git a/app-admin/vault/vault-1.4.2.ebuild b/app-admin/vault/vault-1.4.2.ebuild
deleted file mode 100644
index 4a81ecf016aa..000000000000
--- a/app-admin/vault/vault-1.4.2.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
-
-inherit fcaps go-module systemd
-
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
-SRC_URI="https://github.com/hashicorp/vault/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	webui? (
-		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
-	)"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+webui"
-
-BDEPEND="dev-go/gox"
-COMMON_DEPEND="acct-group/vault
-	acct-user/vault"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
-
-FILECAPS=(
-	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-RESTRICT+=" test"
-
-src_prepare() {
-	default
-	# Avoid the need to have a git checkout
-	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
-		-e 's:^\(GIT_DIRTY=\).*:\1:' \
-		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
-		-i scripts/build.sh || die
-	sed -e "/hooks/d" \
-		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
-		-i Makefile || die
-	if [[ -f "${WORKDIR}/http/bindata_assetfs.go" ]]; then
-		mv "${WORKDIR}/http/bindata_assetfs.go" "${S}/http" ||
-			die "mv failed"
-	fi
-}
-
-src_compile() {
-	mkdir "${T}"/bin || die
-	BUILD_TAGS="$(usex webui ui '')" \
-	GOFLAGS="-mod=vendor" \
-	GOPATH="${T}" \
-	XC_ARCH=$(go env GOARCH) \
-	XC_OS=$(go env GOOS) \
-	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
-	emake
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md
-	insinto /etc/${PN}.d
-	doins "${FILESDIR}/"*.json.example
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 0e6e00c37f95..74cf8a01604a 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 2bcce774a14d..fda172a1b477 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,6 +1,7 @@
 AUX clamav-0.101.2-tinfo.patch 854 BLAKE2B 46479552a2dffcf56c7b142062896e8ae34e3721bb604011c7f4d439a0475f7b20fc04b8027958e72eba6c97de4adee0de9f737cc4899bac194ad6fba8f0c475 SHA512 e78e1c13ba9398a59449376ba60f2728ce36feaa94342f675d2f7fe8245703f4c632028ca2bf161e6fe5c3238c540e49849c191b1b080b5486913803384882d9
 AUX clamav-0.102.1-libxml2_pkgconfig.patch 4012 BLAKE2B 4c3e4fc3522d317c57bae942bbd1c9b91d11ddb782cfaa0593458180207ffb873f783cea892d8eefd2402f30b7a0c4dcbbd5b61e01a54f98432c1164b29e7d83 SHA512 ee6379c85f7d85e30bfa4efda728cf9207a5017905abed8a6241561825ca54ec58a6cec2c1a8452574a9356491c192e89f76d19c2e404602637dcc9576b3fdea
 AUX clamav-0.102.2-fix-curl-detection.patch 844 BLAKE2B a813b1f6003b9cff03fca8d72dbd44d6a4f700e3d60aee83f782a87893a3c6753698ca8715237155185660301dd81dc55bf6a6e3b9095f57b099607182c90bf5 SHA512 27e6aa5ad418eaa32b56ea7bbdab0b5b4cd649e55d34eb094b5f02d7e68d8913f39664ffd6bc4a07faf88f60bdbd15b0c381fbbd6d9c1c62cc36e72e34cabd19
+AUX clamav-0.102.3-system-tomsfastmath.patch 3769 BLAKE2B 36c6580709a9f3319643e547c37753a65240aaa2ed612465982ea35c392d5031ba105e8ac67a42453fa4960977579a04f61ad9bb30a8e693908c25daa3085154 SHA512 8749a0e0b97570371a4a661b82c210ab1c9e6cba46b7fdf63474daa745bc280ffc84c3e4030a3c659814ba845f38946cbda0f437130057c8a73b3dc762b09ae3
 AUX clamav-milter.README.gentoo 2284 BLAKE2B 7afc18f3dad57c2d7595257b356943efb3d1af28d55ac8f09f0506430fd0dedf0820906ced666a7237e3af44a9bc1b43fff017c03faad844f96b132ca4c5dde6 SHA512 38eadf2d919a0c48345600ea5a39c90e766b62e8b1ffc7bb01969a8fd93c4545f2030058a470ac7efb75a1d6c74f9930438f58aeff5035e19e38241ed381f7b3
 AUX clamav-milter.service 284 BLAKE2B 7fbdce10ffa1d85aa671616f17ad45683177916269b434283582ecb53000f7a9a8978119e6a8170ddad8f7c0f14f09398fd7b893aad5d718083b002f6371ff21 SHA512 442148ac3c42ecbb893de5c6edde337b72a745d20f6c5ffa33131f9a0b2daadcffac39b686ada986a5ab500ea7b9153c448abc1b819e15fef488da1812bb0cee
 AUX clamav-milter.service-r1 303 BLAKE2B 55253d9a660699411e352bc80837add840dc6740afed4fe64a86def84610cad836ea3ea620664f540f242b917aab560201cca9c33b9fbc9b1cef2c8b29bfce36 SHA512 5dc30e3c57d9bff6595155e8299336c579c713aed429ab770f10d7678dd74691a135aa2070a825ddb726fdabcb001c19caeb993c1cd9a6fcf95d1d47f7160540
@@ -13,5 +14,6 @@ AUX clamd_at.service 228 BLAKE2B 85181b02329a86495d0737308417dd873424da0bb1cd376
 AUX freshclamd.service 240 BLAKE2B 1b72ffee3b0b1b51811aa5f3c7a52678b3beb260f020dd326a437d6abf4bc515392d0b263eeb0773de128b9c0eff1c1f0b7b604dd14b9dffd50aba31909963e1 SHA512 28da28d633f487806448e17aec36648b6ba12f549549485704607e403e64643caea6ee9420e8101f11b3edebe62b651e6d6c338ab232f33b97b315d64b3789ac
 AUX tmpfiles.d/clamav.conf 33 BLAKE2B 447c5ad4ad79bc70fc386833fa763451d30bf30f1ae26434039a3926ca5aae9734e0152c83b5b9aa5bed87b17c1b685c4ea9f41c9cb6b3197b1e78e800b71fd9 SHA512 eabe5a94c2679b82ea3e29272eb448b47e60b271381d3e97f3970b1a9e086d61662aff2d29887950a911025294aa7cea8bfd9003d257963566b251bcaeb5f6b2
 DIST clamav-0.102.3.tar.gz 13226108 BLAKE2B 741c0cc6a088ffe880eabb7a59151b3c13c5754f9cb36582ffca9cbeea6b039e3c49b7155ba14fa302e9ee4bfa6adf8b98f0e29f2354ea8569b11b1ed2b2532c SHA512 d239718814b303fb0f1655d9bdaf3675d888eea57e786d927eafabb7b6f58cd7f5fb7dc149511c2af6f800dcc919f2e1d6954110d45b9e16619c632e8d2b37f2
+EBUILD clamav-0.102.3-r1.ebuild 6957 BLAKE2B a33b5a1a99a06c06d4e9587a6d4e696274a3c86f06f0dc3addfc546477c16d0afd8c3647097874bc7af572d61889bced836c69efdedf0b3a20c241c5bf3280a8 SHA512 676f419e033c37e18aeed19eb3c7372da0bf8b42092bb94c0097fff890fe8588ea800af003d5635b2e90d27af632bd3efe71f52ee5c51cefee116d9c237003d8
 EBUILD clamav-0.102.3.ebuild 6644 BLAKE2B 5f3f39406472f1917d80d35d66738b9fa3d5d96ac0d85406d3c81dcb1afb8a16e04e128e6aa4d2e43e7768d004bf0ac142b2863d54ce427b901b9d94730101df SHA512 9cbb25b6cba7be41360f2f72a652ce23bca8e7e03f873454fb31dc1c68a964d7c9bbb99881a322af6c300c22553e16e781f184b559c29ce50b1faada14b4ee55
 MISC metadata.xml 861 BLAKE2B fa97cb689d37536e3d128d2033038b1a6331ae3d8f435e39330506731c96f742b55f579ca02c678393c0af21fbab88189de8754d80b97fba35cf5a4f4eb2dd9a SHA512 5e2c58dfbb033270cfa014bc207d83799be06aaa02d1b490d6c202ffc151b54be72cd4e15380faffed2e3957c395e43b6853d1abfee99fa42de81159b7656a00
diff --git a/app-antivirus/clamav/clamav-0.102.3-r1.ebuild b/app-antivirus/clamav/clamav-0.102.3-r1.ebuild
new file mode 100644
index 000000000000..09054b32b349
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.102.3-r1.ebuild
@@ -0,0 +1,222 @@
+# 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="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 test uclibc xml"
+
+REQUIRED_USE="libclamav-only? ( !clamdtop !clamsubmit !milter !metadata-analysis-api )"
+
+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
+	dev-libs/libltdl
+	dev-libs/libmspack
+	|| ( dev-libs/libpcre2 >dev-libs/libpcre-6 )
+	dev-libs/tomsfastmath
+	>=sys-libs/zlib-1.2.2:=
+	bzip2? ( app-arch/bzip2 )
+	clamdtop? ( sys-libs/ncurses:0 )
+	clamsubmit? ( net-misc/curl dev-libs/json-c:= )
+	elibc_musl? ( sys-libs/fts-standalone )
+	iconv? ( virtual/libiconv )
+	!libclamav-only? ( net-misc/curl )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
+	xml? ( dev-libs/libxml2 )"
+
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="${CDEPEND}
+	metadata-analysis-api? ( dev-libs/json-c:* )
+	test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-clamav )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.101.2-tinfo.patch" #670729
+	"${FILESDIR}/${PN}-0.102.1-libxml2_pkgconfig.patch" #661328
+	"${FILESDIR}/${PN}-0.102.2-fix-curl-detection.patch" #709616
+	"${FILESDIR}/${P}-system-tomsfastmath.patch" # 649394
+)
+
+src_prepare() {
+	default
+
+	# Be extra sure that we're using the system copy of tomsfastmath
+	einfo "removing bundled copy of dev-libs/tomsfastmath"
+	rm -r libclamav/tomsfastmath || \
+		die "failed to remove bundled tomsfastmath"
+
+	AT_NO_RECURSIVE="yes" eautoreconf
+}
+
+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 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-static
+		--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
+
+	if ! use libclamav-only ; then
+		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
+
+		local i
+		for i in clamd freshclam clamav-milter
+		do
+			if [[ -f "${ED}"/etc/"${i}".conf.sample ]]; then
+				mv "${ED}"/etc/"${i}".conf{.sample,} || die
+			fi
+		done
+
+		# 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
+	fi
+
+	if use doc ; then
+		local HTML_DOCS=( docs/html/. )
+		einstalldocs
+
+		if ! use libclamav-only ; then
+			doman docs/man/*.[1-8]
+		fi
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+src_test() {
+	if use libclamav-only ; then
+		ewarn "Test target not available when USE=libclamav-only is set, skipping tests ..."
+		return 0
+	fi
+
+	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=( "${EROOT}"/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/clamav/files/clamav-0.102.3-system-tomsfastmath.patch b/app-antivirus/clamav/files/clamav-0.102.3-system-tomsfastmath.patch
new file mode 100644
index 000000000000..ee575c3b1287
--- /dev/null
+++ b/app-antivirus/clamav/files/clamav-0.102.3-system-tomsfastmath.patch
@@ -0,0 +1,113 @@
+From bcf63fa6bbd519bc61c2b2553fb1913f802eb96e Mon Sep 17 00:00:00 2001
+From: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
+Date: Wed, 11 Mar 2015 20:03:15 +0100
+Subject: add support for system tomsfastmath
+
+Patch-Name: add-support-for-system-tomsfastmath.patch
+---
+ configure.ac                           |  2 ++
+ libclamav/Makefile.am                  | 10 ++++++++--
+ libclamav/bignum.h                     |  6 +++++-
+ libclamav/xdp.c                        |  2 +-
+ m4/reorganization/libs/tomsfastmath.m4 | 12 ++++++++++++
+ 5 files changed, 28 insertions(+), 4 deletions(-)
+ create mode 100644 m4/reorganization/libs/tomsfastmath.m4
+
+diff --git a/configure.ac b/configure.ac
+index 8375971..3cacfb8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -98,6 +98,7 @@ m4_include([m4/reorganization/libs/libmspack.m4])
+ if test "x$use_internal_mspack" = "xno"; then
+     mspack_msg="External, $LIBMSPACK_CFLAGS $LIBMSPACK_LIBS"
+ fi
++m4_include([m4/reorganization/libs/tomsfastmath.m4])
+ 
+ AM_MAINTAINER_MODE
+ m4_include([m4/reorganization/libs/libz.m4])
+@@ -356,6 +357,7 @@ fi
+ CL_MSG_STATUS([yara        ],[$enable_yara],[$enable_yara])
+ CL_MSG_STATUS([fts         ],[yes],[$lfs_fts_msg])
+ 
++CL_MSG_STATUS([tomsfastmath],[yes],[$tomsfastmath_msg])
+ 
+ # Yep, downgrading the compiler avoids the bug too:
+ # 4.0.x, and 4.1.0 are the known buggy versions
+diff --git a/libclamav/Makefile.am b/libclamav/Makefile.am
+index 699d033..3282272 100644
+--- a/libclamav/Makefile.am
++++ b/libclamav/Makefile.am
+@@ -602,8 +602,10 @@ libclamav_la_SOURCES += yara_arena.c \
+ 	yara_clam.h
+ endif
+ 
+-libclamav_la_SOURCES += bignum.h\
+-	bignum_fast.h\
++libclamav_la_SOURCES += bignum.h
++
++if !SYSTEM_TOMSFASTMATH
++libclamav_la_SOURCES += bignum_fast.h\
+         tomsfastmath/addsub/fp_add.c\
+         tomsfastmath/addsub/fp_add_d.c\
+         tomsfastmath/addsub/fp_addmod.c\
+@@ -685,6 +687,10 @@ libclamav_la_SOURCES += bignum.h\
+         tomsfastmath/sqr/fp_sqr_comba_generic.c\
+         tomsfastmath/sqr/fp_sqr_comba_small_set.c\
+ 	tomsfastmath/sqr/fp_sqrmod.c
++else
++libclamav_la_CFLAGS += $(TOMSFASTMATH_CFLAGS)
++libclamav_la_LIBADD += $(TOMSFASTMATH_LIBS)
++endif
+ 
+ .PHONY2: version.h.tmp
+ version.c: version.h
+diff --git a/libclamav/bignum.h b/libclamav/bignum.h
+index 8fdc956..56dfa95 100644
+--- a/libclamav/bignum.h
++++ b/libclamav/bignum.h
+@@ -1,9 +1,13 @@
+ #ifndef BIGNUM_H_
+ #define BIGNUM_H_
+ 
++#if HAVE_SYSTEM_TOMSFASTMATH
++#include <tfm.h>
++#else
+ #define TFM_CHECK
+-
+ #include "bignum_fast.h"
++#endif
++
+ typedef fp_int mp_int;
+ #define mp_cmp fp_cmp
+ #define mp_toradix_n(a, b, c, d) fp_toradix_n(a, b, c, d)
+diff --git a/libclamav/xdp.c b/libclamav/xdp.c
+index d5a4c4b..cc3b40d 100644
+--- a/libclamav/xdp.c
++++ b/libclamav/xdp.c
+@@ -52,7 +52,7 @@
+ #include "scanners.h"
+ #include "conv.h"
+ #include "xdp.h"
+-#include "bignum_fast.h"
++#include "bignum.h"
+ #include "filetypes.h"
+ 
+ static char *dump_xdp(cli_ctx *ctx, const char *start, size_t sz);
+diff --git a/m4/reorganization/libs/tomsfastmath.m4 b/m4/reorganization/libs/tomsfastmath.m4
+new file mode 100644
+index 0000000..2a821a1
+--- /dev/null
++++ b/m4/reorganization/libs/tomsfastmath.m4
+@@ -0,0 +1,12 @@
++dnl Check for system tomsfastmath
++PKG_CHECK_MODULES([TOMSFASTMATH], [tomsfastmath], [have_system_tomsfastmath=yes], [have_system_tomsfastmath=no])
++
++AM_CONDITIONAL([SYSTEM_TOMSFASTMATH], [test "x$have_system_tomsfastmath" = "xyes"])
++
++if test "x$have_system_tomsfastmath" = "xyes"; then
++    AC_DEFINE([HAVE_SYSTEM_TOMSFASTMATH], [1], [link against system-wide tomsfastmath library])
++    tomsfastmath_msg="External, $TOMSFASTMATH_CFLAGS $TOMSFASTMATH_LIBS"
++else
++    AC_DEFINE([HAVE_SYSTEM_TOMSFASTMATH], [0], [don't link against system-wide tomsfastmath library])
++    tomsfastmath_msg="Internal"
++fi
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index fcd7da60501e..8fb4b9fcb13c 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index b18ae11d5b79..d4c3b2f10e80 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -5,8 +5,10 @@ DIST dpkg_1.19.0.5.tar.xz 4557428 BLAKE2B 99c31705bfad1cfa024366c788264f4e747a71
 DIST dpkg_1.19.6.tar.xz 4802832 BLAKE2B e35a805942e2b26a90cec80493a14697461cfb1c1352fa7fadce7171c8cca88785ff2590d34b8f0bd4763642cb21ee7bf449df86b01eef223554daba4604d1b1 SHA512 71981079835ea4bd5c4a381ca8702cf489c788034e29c129899eb288cfaf4ec55eb58c0aea13145dcde99f15a47d2de71fba7b5e7eb8e6b1b1d6f016de8a919d
 DIST dpkg_1.19.7.tar.xz 4716724 BLAKE2B d65200fc5da986db8b66e31e1ea45b9757b87e0fa15f7fc0579f1c1c63de78829c1a10bbc72726fe3b75bf6c11cbe1fe3c9b62f8374c796f990835f9f0e79dd2 SHA512 9ca441dc265baf5359c71617aef1c57504a7097c26ea57108b88dadc511bfa9918fcc765d8c67cec9def9916c5df92d6cabe508446dbc7223a29b45260445e81
 DIST dpkg_1.20.0.tar.xz 4738556 BLAKE2B 2e58b3881abd46854416b05b0f9d2e972c3b545412a506b7bc18f1ebae5d82eac8bc2b55920d706fee0ca02239871c4f1c121e0c780aef31404e0408fbfa76e8 SHA512 5dd7961bde19ccc891fd5b77ca0085f7fc0308c20380e20b393397ff92e50d1c0f54e7b57676c05876021b44aa3788af8258c21ff2b672110ac92c7ce0b408f9
+DIST dpkg_1.20.2.tar.xz 4710300 BLAKE2B 0d10ee7f5cc863a6496fd8340cf0457f9af3d7d7a74821d561d0cc500a056d52664d1418453fa45dcb27d01ef59e55eb299ce1fcccd1ae7cb72b7c9e43b6b120 SHA512 523713e40d4f49332d96fdcabaeaf4d97f56b40bbbd51f18d17b5c79598249d04fdf96dfc5c8684408a666cf04f622cbd30da60efe68ba2cf1cd836cb2503e02
 EBUILD dpkg-1.19.0.5.ebuild 1848 BLAKE2B d3a5aae22d24450b92205a2bdfda810a3c5b5047b8b7db37c09a66c0b18d8ca87b2c40b5111f3df5ec7a160edccea988e011a9c5954dc4d15be88a04111532ca SHA512 02c7e77565269ef09b1f0c6f96774079fc9c4003fffedf7c60ede89ae7afa9e16cbc433ef949415cf6896a8d77d43adc80b863840741ca33f883ad466003feb4
 EBUILD dpkg-1.19.6.ebuild 1997 BLAKE2B fcf91e8fa0ba143a92c9508f90e4edc9e8a24544e9c1f5c9169d4c8ecece4c7c6c57848ea8b77398f6cecb3a7b4ef751083f0ce2de66dae5bf711e7375874205 SHA512 39ed5665ee5902488a6c8b6fb951b09ade9fe067fae4ee59ac8b1b27b443af22ba6d9f297a501923203fbe335f1a19cae21dd9c83da15f7031d9c5567bf44ba0
 EBUILD dpkg-1.19.7.ebuild 1997 BLAKE2B fcf91e8fa0ba143a92c9508f90e4edc9e8a24544e9c1f5c9169d4c8ecece4c7c6c57848ea8b77398f6cecb3a7b4ef751083f0ce2de66dae5bf711e7375874205 SHA512 39ed5665ee5902488a6c8b6fb951b09ade9fe067fae4ee59ac8b1b27b443af22ba6d9f297a501923203fbe335f1a19cae21dd9c83da15f7031d9c5567bf44ba0
-EBUILD dpkg-1.20.0.ebuild 1949 BLAKE2B 3a9c231a342c812726441fbfa82db3c925b663acc2c0a45fa06c6b0fd1fe1e5293d6d523dd7061e85b7942896826c7246c18625f26c31e114ee48bc1f55d32e0 SHA512 c5e2b22a5eb603105b2de86d8dcfc4103c2cfd5d7d8e1f615d9fc1848ad2f3b967cc17278e3413d1f972579bd1058b7ae068d7b4b5d6c7fc58b378bc16fc9cb1
+EBUILD dpkg-1.20.0.ebuild 1956 BLAKE2B c2bc7ce7f6caf26c282300b61f952310b9a864b6446a7e3098be3305399389b445bb1a552c9b8b41d2fff45f1da1488e9663b1e4f88ee47b8267d6e227f8c6b0 SHA512 0a3105efa877c86ecf7af70a7c49c71c59dae6184e275d811d3ff55b23ec4ccc342f20e9eb3b20ae1e1e1d8221678609fda731a2d96bd71afad3879d5795d058
+EBUILD dpkg-1.20.2.ebuild 1928 BLAKE2B 52add907caa6060be19af86a1f2c02731e4bd2a6d6e826d9bc3b1d0b36f565b7450088ba727f5ddd747e6a0bfdd974b00525d352cfc81d38b1e9e1b083f70d3b SHA512 d7cacc1d8d6a970c527951c902ce6c10f3ceb73c09036f180f50bbd4669bd6b738c3e39d1445d8b311d72a9dc8effa879cb426fa71f1e598628a5781006bc1ca
 MISC metadata.xml 433 BLAKE2B bfddf84314750bbaf97250dc51916485e8226379d3d3aa925f7879ca456c3052e062b1516592c49b4b048a0fe76a55c6302b719747ba43a7a8d6fbd65c9eb8ec SHA512 da157c95d0dcf2086b37482bad4bd1c52da16c015e71411653f12e3f5e0f25d710e1819675a0d5b8e92a9e185dc61f602007e3a8875aa1b05b78f128de1b0ca1
diff --git a/app-arch/dpkg/dpkg-1.20.0.ebuild b/app-arch/dpkg/dpkg-1.20.0.ebuild
index 155450d1586a..8a0c90852c20 100644
--- a/app-arch/dpkg/dpkg-1.20.0.ebuild
+++ b/app-arch/dpkg/dpkg-1.20.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
 IUSE="+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/dpkg/dpkg-1.20.2.ebuild b/app-arch/dpkg/dpkg-1.20.2.ebuild
new file mode 100644
index 000000000000..371e6291f509
--- /dev/null
+++ b/app-arch/dpkg/dpkg-1.20.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib autotools toolchain-funcs
+
+DESCRIPTION="Package maintenance system for Debian"
+HOMEPAGE="https://packages.qa.debian.org/dpkg"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+IUSE="+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/perl-5.14.2:=
+	bzip2? ( app-arch/bzip2 )
+	libmd? ( app-crypt/libmd )
+	lzma? ( app-arch/xz-utils )
+	nls? ( virtual/libintl )
+	selinux? ( sys-libs/libselinux )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+"
+DEPEND="
+	${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	test? (
+		dev-perl/IO-String
+		dev-perl/Test-Pod
+		virtual/perl-Test-Harness
+	)
+"
+BDEPEND="
+	sys-devel/flex
+	nls? (
+		app-text/po4a
+		>=sys-devel/gettext-0.18.2
+	)
+"
+DOCS=(
+	ChangeLog
+	THANKS
+	TODO
+)
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.18.12-dpkg_buildpackage-test.patch
+	"${FILESDIR}"/${PN}-1.18.12-flags.patch
+	"${FILESDIR}"/${PN}-1.18.12-rsyncable.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	econf \
+		$(use_enable nls) \
+		$(use_enable static-libs static) \
+		$(use_enable unicode) \
+		$(use_enable update-alternatives) \
+		$(use_with bzip2 libbz2) \
+		$(use_with libmd) \
+		$(use_with lzma liblzma) \
+		$(use_with selinux libselinux) \
+		$(use_with zlib libz) \
+		--disable-compiler-warnings \
+		--disable-dselect \
+		--disable-start-stop-daemon \
+		--localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+	emake AR=$(tc-getAR)
+}
+
+src_install() {
+	default
+
+	keepdir \
+		/usr/$(get_libdir)/db/methods/{mnt,floppy,disk} \
+		/var/lib/dpkg/{alternatives,info,parts,updates}
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-arch/lha/Manifest b/app-arch/lha/Manifest
index d17abb1e168a..762865bd3242 100644
--- a/app-arch/lha/Manifest
+++ b/app-arch/lha/Manifest
@@ -3,5 +3,5 @@ AUX lha-114i-fix-getopt_long-declaration.patch 263 BLAKE2B d5b53f0624a9b03916728
 DIST lha-1.14i-ac20050924p1.tar.gz 285518 BLAKE2B 7e10ee4cfaeb7212f9dfbe254d33ec7b97bce41a042eed3d6f826790650f5059a19d2a334cc41a86112ba8d80904168a0b3c2785e7670577b2bda0b4d27f0dcc SHA512 efe43d407d273f8f724f7b205223bd122c76adac4b67ad5e9811e88cae03f1f3c3af4297aa6f24951a02558975bbafacf697e97ab0da578b4e0115b89237566f
 DIST lha-114i_p20201004.tar.gz 220541 BLAKE2B 64268deb40de67d5f4888f7d4b4529fa1b6ca02c562bd041d9edd1ac9cc74ccfa43198c79310bd354806e3095f6aba8c97256b49686feb8c713e3d8110137103 SHA512 9a9337cbb6a3d71253597750301e37163c5b495e712f2374adf2ac0d19f731ed49482a3f8b639e4c48c7ef6fa7ed9f9081516d77548e9c88ed3b9ac037efeb06
 EBUILD lha-114i-r9.ebuild 1130 BLAKE2B e26cbbcbfa1b0b49b006806f3c22ee4249620eeae8c9d0d5c6882d5bf617d426ff0bffa6d08172573f59ada05245447b8b56a8ec96cc7820c09f31d73f2ceeb9 SHA512 b0d901706937a0e4f01f34303bc458431c2a7d91f09ce0f1194f3a696315c3a6518edc77af5aee4773bbfe0451555e6a75cd2acf5c26c281050c221966dbd829
-EBUILD lha-114i_p20201004.ebuild 887 BLAKE2B 3bf2b77293d03d0aea88ed213a3c65e3d72c8cabcd283632c276ec1aab8a293b16b77429521cd10719f8449cadcd60d394e76d361359e7a6c42917da8c11f287 SHA512 9777a786650ace8f7a4e219c09e9323ddb2174b128b27cdb9ff0ad0d6b02ace9f948a223218187d187e78e01da3ef7a5a706c066879d637d58c45aec9373b325
+EBUILD lha-114i_p20201004.ebuild 880 BLAKE2B 0c18d20c1c6d7e72f08840c9aca4fa1a0f80afa4151c725002b9d86442bb2904036d9573a480735ac1df3f038bd74b6284bbb4b320214d3522683f8bfd6f6f0d SHA512 2fc38ca7669a3d466022f02a4787b4c643da9d23aff5fa49aa135ae5908d4b5d6beca93ed33095942d427db213ef641caf493d47fa6dd7b07e5c4febe6467c60
 MISC metadata.xml 434 BLAKE2B 414f7750d16ce40058d2ae20237ac880f3d239bb76111ae99afb6733876ae3f44d2aa5de0865a6139f4cc1efc706d2d35991ab61f5af4d5b74ad195c28eb9325 SHA512 8cfaf4a935f86fc33a86becdcd233d6edcf10fdec2f3d4e5af44cdf21c904917f29f83c203f2e00c31aca78d9e6189041f053edcbcb4573e258169fd21566e74
diff --git a/app-arch/lha/lha-114i_p20201004.ebuild b/app-arch/lha/lha-114i_p20201004.ebuild
index 88e1e1a2817e..2301e49b8312 100644
--- a/app-arch/lha/lha-114i_p20201004.ebuild
+++ b/app-arch/lha/lha-114i_p20201004.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jca02266/lha/archive/${MY_COMMIT}.tar.gz -> ${P}.tar
 
 LICENSE="lha"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint"
 
 S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
diff --git a/app-arch/pet2tgz/Manifest b/app-arch/pet2tgz/Manifest
index a4cc1ee7d309..049de00102af 100644
--- a/app-arch/pet2tgz/Manifest
+++ b/app-arch/pet2tgz/Manifest
@@ -1,3 +1,3 @@
 DIST pet2tgz-0.3.tar.gz 90758 BLAKE2B cfefb54467739e4b045c0ef927f6b21815ec59379635a81f782b6355d459715004ef29de0c9f76a3ce71d9b274ea3f066787d80efb20976316e36f2e486d0e93 SHA512 e6d2612c27184ea06114f9ee1927f0d1c6fa5f2bdecd85366d4b35564b59318a123159180eb3da747d46d4ddcdd2f4ec40def0b10d2882acafe5ed40e84826c5
-EBUILD pet2tgz-0.3.ebuild 343 BLAKE2B 37aebc398e047142749a6737049f7d3e7c49dd4e2dbb30a783f255f8ca1e8456e17d91f7e2f7b6e1780a6b3dc2eb7943ff3443f7d5403f39b60cd0696484574b SHA512 16dc40d1819da026f102234353bd76e02cce512234e4554b645ec076b621172ff16ccd036a15e0aa03224857ef49d91823da09ad52e3103fc62968d697dd5ead
-MISC metadata.xml 247 BLAKE2B 6a78ba89b0f5591cd8865331c6ea64fe768be848afc9b0e120ec69da3053a197e064404647c1af82a1cde02b050f0015b45f1afea8ad661e49ced455fdb4ad58 SHA512 45cf64f391c9d283c8e333f9d9a67c980afc89332f3cac538caf898e234a81f7bbce459b8fd65258ceec48ab7f8df22ecede31862775211536f76bf4f8d40e43
+EBUILD pet2tgz-0.3-r1.ebuild 316 BLAKE2B bc66a3bac74b54986d444132d686c0e195ac0c1d3b06692ea101f530fefc6dd7d328c60c0783ce35ab28d70a197a5b912a441be94d07837cf161b33ee61d709e SHA512 b3d021d0bb1052176a39f31482a5e123842f190ed47e4d7ce32a45401f6a22b5aae8952e09f4f870871833180f06ca2b809ed0729d340269370805c2f369d68d
+MISC metadata.xml 244 BLAKE2B b874a189b20c4e6fa7407495e2cf244e9ad1b2a5ea91b2435f8c08d11bbebaa9bbfc19d2f392089b0445a64e81166ec67f050eb441ff8ef7f09bce4340a38459 SHA512 ab0b7db11c67cb62b2ce26ebf898d81722a0fa4c89f9192e02750e8fd473b45a8ef42f75b336b70669e6b9f4f7c9e030679d5340c158811d49aa7eb4b8947b63
diff --git a/app-arch/pet2tgz/metadata.xml b/app-arch/pet2tgz/metadata.xml
index 5e531f2269f7..a272aeda686c 100644
--- a/app-arch/pet2tgz/metadata.xml
+++ b/app-arch/pet2tgz/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!--maintainer-needed-->
-  <upstream>
-    <remote-id type="sourceforge">pet2tgz</remote-id>
-  </upstream>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">pet2tgz</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-arch/pet2tgz/pet2tgz-0.3-r1.ebuild b/app-arch/pet2tgz/pet2tgz-0.3-r1.ebuild
new file mode 100644
index 000000000000..fc99eb44b020
--- /dev/null
+++ b/app-arch/pet2tgz/pet2tgz-0.3-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Puppy Linux .pet to .tar.gz converter"
+HOMEPAGE="https://sourceforge.net/projects/pet2tgz/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/app-arch/pet2tgz/pet2tgz-0.3.ebuild b/app-arch/pet2tgz/pet2tgz-0.3.ebuild
deleted file mode 100644
index a2c746113538..000000000000
--- a/app-arch/pet2tgz/pet2tgz-0.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Puppy Linux .pet to .tar.gz converter"
-HOMEPAGE="https://sourceforge.net/projects/pet2tgz/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DOCS="AUTHORS"
diff --git a/app-arch/vimball/Manifest b/app-arch/vimball/Manifest
index e32ae2eb39e6..00f70fa36e97 100644
--- a/app-arch/vimball/Manifest
+++ b/app-arch/vimball/Manifest
@@ -1,4 +1,4 @@
 DIST vimball-0.5.1.tar.gz 5246 BLAKE2B 8ce95bfe8872f69e501b4453e5a6644d8019367173f8675325775dee58e08618b9ec0908bca9df04839bc165b086d8e5195a0753827d6038d8ccd8adbab80c35 SHA512 f89ba7291e3f4146f2ada7934b0ca74524abc639e586da12e19882e9aebe3f14858a6145b830a32dc19b0deb61f652375d8a56dc7847fd0061d14a2d77208549
-EBUILD vimball-0.5.1.ebuild 649 BLAKE2B f796f9df8801382e40cb1684d87ffd1e05affb109847d904de71b492ea68fbb491fe9ca769dcf195e1b63c34cd3e9c522c90ed043a5ae9cff081e21c873469df SHA512 b0045ea202e25174555c6db45f1efdb032267759214b62c3029beb65c24966f5ed682a9dd084c27a65fae541a69c4795145b57606a74407a114362b949c08a3e
+EBUILD vimball-0.5.1.ebuild 647 BLAKE2B 8a739357e5175e0da7a501c9baa73a5d0267a39ecbdae667afdc10ecf9dbc1513cd4da6dfa4f8dd67c4ead8156f4d7ae8b4e9613622628ecd953d7be775c2c1a SHA512 290cd7eaa7ea117d3eeca0c7e5f1d76830cc77e5dcb5649fdddbc38abcc99e0239942134752c18860d57285ae2fc39b7cad94c24bd106c6f5f083320ea6999db
 EBUILD vimball-9999.ebuild 649 BLAKE2B f796f9df8801382e40cb1684d87ffd1e05affb109847d904de71b492ea68fbb491fe9ca769dcf195e1b63c34cd3e9c522c90ed043a5ae9cff081e21c873469df SHA512 b0045ea202e25174555c6db45f1efdb032267759214b62c3029beb65c24966f5ed682a9dd084c27a65fae541a69c4795145b57606a74407a114362b949c08a3e
 MISC metadata.xml 301 BLAKE2B 07b3d161360551d50927727197e755234ba70034b239c4890aa90cbf863b0e8612be7541c89d503e6d8d80d806485f086e89b071140aba7e63c2f4b78487d3e7 SHA512 5ed23a22a1632cbf42763e8f069f043841ff6eb1c589e7c66b6ab83583da3bf1ec5d820943349fad261a715a9cd61e490242b987556ef9a0bee6fd278cb9e307
diff --git a/app-arch/vimball/vimball-0.5.1.ebuild b/app-arch/vimball/vimball-0.5.1.ebuild
index 9bcf7f649ea8..f5c82d11a752 100644
--- a/app-arch/vimball/vimball-0.5.1.ebuild
+++ b/app-arch/vimball/vimball-0.5.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/radhermit/vimball.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 1c2e043633cb..6ab9e6e725c7 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/btrbk/Manifest b/app-backup/btrbk/Manifest
index 473a2e244232..dab9802f3258 100644
--- a/app-backup/btrbk/Manifest
+++ b/app-backup/btrbk/Manifest
@@ -24,6 +24,6 @@ EBUILD btrbk-0.28.1.ebuild 2291 BLAKE2B caacd41c9fb9b43f1a60743d7455f17b103e9dac
 EBUILD btrbk-0.28.2.ebuild 2291 BLAKE2B caacd41c9fb9b43f1a60743d7455f17b103e9daca45f3850f25ba38b35c369ba090af1a5ff9cd673d8b7eb50ee971f4e30fdebed86bb69a086a9e415ffe02135 SHA512 bb525448696bf226d4c9dbe4c386ad2659f165a559a9dd6eae73a41e2cea6c1113732d802291cef8b2ef5c39e20179fb2e0cbedb7116fc1d1943b21140435a24
 EBUILD btrbk-0.28.3.ebuild 2291 BLAKE2B caacd41c9fb9b43f1a60743d7455f17b103e9daca45f3850f25ba38b35c369ba090af1a5ff9cd673d8b7eb50ee971f4e30fdebed86bb69a086a9e415ffe02135 SHA512 bb525448696bf226d4c9dbe4c386ad2659f165a559a9dd6eae73a41e2cea6c1113732d802291cef8b2ef5c39e20179fb2e0cbedb7116fc1d1943b21140435a24
 EBUILD btrbk-0.29.0.ebuild 2318 BLAKE2B 284c2259dd56ee7469bfa9e4638be53c858d09a9b22f81a3bb00c01f643f2f817d3dd1eb1e36d79b85d9ff335c5d7eae26925bf60d7a282403132992e4263b8c SHA512 090848519b5bbd036940eaceb140115ea94c9bcdcb413f82b962fe51034cb979a596afdbea73055e5043a3b1694cd4b53f75de47d6d0e037f432c3ea20d9a392
-EBUILD btrbk-0.29.1.ebuild 2325 BLAKE2B e3191fe3f7029d38291d531733e6ee2250aa0dcc930763ca27f1e58bee6c1d3a4e9b7d5b38b002989be72756451f86395982b5cf1388db38617e2ac3a527b20d SHA512 fcb454f017725d182d5df4fee63d7fb4e3e20f03553b4673c1c0414e4badc1c4650b9d2f969eda628c8acfea9dbe934e9d7af93263c5d84be7451353ea52ca8b
+EBUILD btrbk-0.29.1.ebuild 2323 BLAKE2B b870e78ae76405cd2ed225d186bdefae05d622ab5c7a0cbbd3b8c6af5503c9277f3070d54e171f6b37681bccb767de98840946197410ff3afe69b7ad8047716b SHA512 d2a41cbff5a145db6e8473f71dad6d1d984d885d2867145afe8d2772033d90d7b2013cdaf4e25984de3779621e12c6d532f3640677a9bc9d0a9a31afff8e1699
 EBUILD btrbk-9999.ebuild 2318 BLAKE2B 284c2259dd56ee7469bfa9e4638be53c858d09a9b22f81a3bb00c01f643f2f817d3dd1eb1e36d79b85d9ff335c5d7eae26925bf60d7a282403132992e4263b8c SHA512 090848519b5bbd036940eaceb140115ea94c9bcdcb413f82b962fe51034cb979a596afdbea73055e5043a3b1694cd4b53f75de47d6d0e037f432c3ea20d9a392
 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
index 73afd3da3703..23596e82881e 100644
--- a/app-backup/btrbk/btrbk-0.29.1.ebuild
+++ b/app-backup/btrbk/btrbk-0.29.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
 else
 	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest
index c1c340283e2f..aeac55a02785 100644
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@@ -8,4 +8,4 @@ EBUILD dar-2.5.18.ebuild 2398 BLAKE2B da4f12e9a5a975303cc0801c1081bc2742454b8f0f
 EBUILD dar-2.6.10.ebuild 2599 BLAKE2B c23775fb216e9491460528e7bfc87dbafb1937c12417d8ff059948f12b5fdf6c6f92b8dbe597c566aefebc2b875b6ab2d7e97cd22de9c3c5c5653cf342de181b SHA512 002c0a42a2af1254c2fe2bd72f13b289f4de9bc04c5a30872b7f405b1dbff699ef5a339238f41d75d5da5604c799757bde9e3190926601f0c4966ce6ab936091
 EBUILD dar-2.6.5.ebuild 2572 BLAKE2B e1059c669c9cf569cad16f5d53492e4c9ab396173b51bead7f0a0e3529809bcb4a5a6f9ab8f2872f1c836405da011bc71ed8cbeeeef5ad1bfa202f287de4c9f4 SHA512 59144b0755ebe5e88147c4c0276f85c63893ff49a926ec904d50e0c74cd2d3c8139454877bb4d2143bc9d5370ea93fe302da8d3b0c2d05897cd98a9e6f8d0d88
 EBUILD dar-2.6.9.ebuild 2599 BLAKE2B c23775fb216e9491460528e7bfc87dbafb1937c12417d8ff059948f12b5fdf6c6f92b8dbe597c566aefebc2b875b6ab2d7e97cd22de9c3c5c5653cf342de181b SHA512 002c0a42a2af1254c2fe2bd72f13b289f4de9bc04c5a30872b7f405b1dbff699ef5a339238f41d75d5da5604c799757bde9e3190926601f0c4966ce6ab936091
-MISC metadata.xml 887 BLAKE2B 7fc6c15d3f725d59a115a839feb6d138b806e1f0e168c6e726e83c9f0185c46cbf869284e17872a376ce52f515fc0446134b5f3a449a578a33c10154876fa1f5 SHA512 9210de7c2f273c52c39555e2db525b1bdaa58c44d22deab887d1bf96e42ac9e8f32545461c7129d4673ced220a6445ddda68c6c2733e5660fcad05e98db56817
+MISC metadata.xml 839 BLAKE2B 9a7022a2e4a20a5519d5242e1d67d30918c5f723f970e6725c7dfb39a16d8130d117fd1cea49a76c209921ed960b6ac9b94ed37aa54e5e41afd39c3e68f23a0c SHA512 e877836606715f1624a67d8b32fb0d586d646b05e5ea6c589adf3c4c8ca4950c251edd212da7b07a0cf763d94e0e0f1c5f8f89c3019e4bfd8c1e3bd89aacd393
diff --git a/app-backup/dar/metadata.xml b/app-backup/dar/metadata.xml
index e22d4effd2e8..31483fe9d2ff 100644
--- a/app-backup/dar/metadata.xml
+++ b/app-backup/dar/metadata.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>rich0@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 Backup directory tree and files.
 Full featured archiver with support for differential backups, slices,
 compression, ATTR/ACL support. DAR also supports Pipes for remote
 operations, including with ssh.
-</longdescription>
+	</longdescription>
 	<use>
 		<flag name="dar32">Enables --enable-mode=32 option, which replace infinite
 		by 32 bit integers</flag>
diff --git a/app-backup/luckybackup/Manifest b/app-backup/luckybackup/Manifest
index 8ba05fa49307..43bdddf01946 100644
--- a/app-backup/luckybackup/Manifest
+++ b/app-backup/luckybackup/Manifest
@@ -1,3 +1,6 @@
+AUX luckybackup-0.5.0-nomancompress.patch 991 BLAKE2B 6fcf029ea905d434215f61a49719d3e078b38d9193148d2266c08ae1cf22fe1b07b2afaed95f049fed7736b6c8bdf7a165e8746408516c553f252bdbe8b6d369 SHA512 344d182a44c3ad043f637b4c7ab5177b01db1f05773231fb41bdcf00bd25a1fd6dc31079a71c149a6983f756f8c42a1a707bbd7a48e512d87474ac6f1e3d6a5a
 DIST luckybackup-0.4.9.tar.gz 5954338 BLAKE2B 632738f8c422ba7d56536fae866ce31d224910b41495e4df3be28a8013ba776e30b4d8e70ceb26c92d28aaf70c96402f27687c55d8f5d7aa5d405bab506a66be SHA512 86d6f1bd84f3bfd89734f0f2066cb17bbf9b4ede96167398de03a460c14d24bf4b50a91bb380655ace9a23497271e102b940ea99a7595cf17f596660dae7f7dd
+DIST luckybackup-0.5.0.tar.gz 5954426 BLAKE2B 7243db713b8e5a6f3929e6d011faff8bdef8b7580c328d336843c71e738fd92a0fd19b2bc3dd0a4695f0af6ec5b436b18833dc20c5ad3479036a1a0bca22be12 SHA512 41fe878a8008b291c2e6f5f8a77ae7dba9d2c547689e53a2dde15cbe733eefd7debf21b3570bd3414dace522ec7843f645639af2cca49b7c2f950eeac62b1f45
 EBUILD luckybackup-0.4.9.ebuild 1442 BLAKE2B 07b9b559b32179733248d205b862f5e4eb1e4ccbf1e4fcd6ea63a0c07ffee7436055236bfc12fcc9aebfacd53b279379c1a0ee3d4d132fb892679f3cc338da4a SHA512 68d4d5e8b5d70b1b2a20471e97c65459969d2f7486fe700e1e18031c68eb612776970a2ac411b17cf8bc83e34e51dd87175bbfd62b405cbedecd32499eaf8cb8
+EBUILD luckybackup-0.5.0.ebuild 1146 BLAKE2B d3a1698afc0afc671b9cbaf98af9d3ae23593a9586b15af9d1098cb43238b949c8824659f64cd3baa64172f8334bb22547039693ed18af7d7271d8d40c9e9feb SHA512 ea328b39244632ec379b88b7e10a63b5caa0f3409981566342a4b256120b0e3765650fb2b0a568dfc880c66692747976557c933353024907e412bf8cfd426203
 MISC metadata.xml 328 BLAKE2B b41ac27e6b5c14d5c6bf9df4a47291ffe57bc679b06ab27b3cf9135be123195a161be705ffd2349f3cc4a5f618c2e75740a677696afa244a3a3716be625aa223 SHA512 64415b71b483e93f41d75f858bbdbce2c612b5e7c37753237d7c2374b1bb2bd2d30a86d18b32f5ac015e15c57e94553019756d2cc6021c803d25da527929ddeb
diff --git a/app-backup/luckybackup/files/luckybackup-0.5.0-nomancompress.patch b/app-backup/luckybackup/files/luckybackup-0.5.0-nomancompress.patch
new file mode 100644
index 000000000000..b043182160f1
--- /dev/null
+++ b/app-backup/luckybackup/files/luckybackup-0.5.0-nomancompress.patch
@@ -0,0 +1,24 @@
+--- a/luckybackup.pro	2018-11-02 19:29:58.000000000 +0100
++++ b/luckybackup.pro	2020-06-26 13:25:02.798368937 +0200
+@@ -33,7 +33,7 @@
+ documentation.files = manual
+ 
+ manpage.path = /usr/share/man/man8
+-manpage.files = manpage/luckybackup.8.gz manpage/luckybackup-pkexec.8
++manpage.files = manpage/luckybackup.8 manpage/luckybackup-pkexec.8
+ 
+ translations.path = /usr/share/luckybackup
+ translations.files = translations
+@@ -43,10 +43,8 @@
+ 
+ INSTALLS += target menu polkit polkitscript pixmap documentation manpage translations license
+ 
+-system(gzip -c manpage/luckybackup.8 > manpage/luckybackup.8.gz)
+-QMAKE_CLEAN = Makefile $${TARGET} manpage/luckybackup.8.gz
+-system(gzip -c manpage/luckybackup-pkexec.8 > manpage/luckybackup-pkexec.8.gz)
+-QMAKE_CLEAN = Makefile $${TARGET} manpage/luckybackup-pkexec.8.gz
++QMAKE_CLEAN = Makefile $${TARGET} manpage/luckybackup.8
++QMAKE_CLEAN = Makefile $${TARGET} manpage/luckybackup-pkexec.8
+ 
+ greaterThan(QT_MAJOR_VERSION, 4) {
+     QT += widgets
diff --git a/app-backup/luckybackup/luckybackup-0.5.0.ebuild b/app-backup/luckybackup/luckybackup-0.5.0.ebuild
new file mode 100644
index 000000000000..b829da8b431e
--- /dev/null
+++ b/app-backup/luckybackup/luckybackup-0.5.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 qmake-utils
+
+DESCRIPTION="Powerful and flexible backup (and syncing) tool, using RSync and Qt"
+HOMEPAGE="http://luckybackup.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+	net-misc/rsync
+	sys-auth/polkit
+"
+
+DOCS=( readme/{AUTHORS,README,TODO,TRANSLATIONS,changelog} )
+
+PATCHES=( "${FILESDIR}/${P}-nomancompress.patch" )
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s:/usr/share/doc/${PN}:/usr/share/doc/${PF}:g" \
+		-e "s:/usr/share/doc/packages/${PN}:/usr/share/doc/${PF}:g" \
+		luckybackup.pro src/global.cpp || die "sed failed"
+
+	# bogus dependency - bug #645732
+	sed -i -e '/QT += network/s/^/#/' luckybackup.pro || die
+
+	# remove text version - cannot remove HTML version
+	# as it's used within the application
+	rm license/gpl.txt || die "rm failed"
+}
+
+src_configure() {
+	eqmake5 ${PN}.pro
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
diff --git a/app-backup/rsnapshot/Manifest b/app-backup/rsnapshot/Manifest
index c95e74112db7..b9e965936ddc 100644
--- a/app-backup/rsnapshot/Manifest
+++ b/app-backup/rsnapshot/Manifest
@@ -1,9 +1,5 @@
-AUX rsnapshot-1.3.1-cp_al.patch 535 BLAKE2B fa29c724ff56fdb6ca2c9c966784fe36d2fd93e6f589ac885d449a14ceac01b4027f3f7e286ac61c10469d9d8cab43e53cadb98b603ab6d32462be58feff5b58 SHA512 511b447d914f01c757b85f098846a91d8585a40297a2ae8b7d07101cbbfd3e99a46168a583a64eaf66e236c4716a69fefcce40fd2e0666fd6f3d9aafdb0c783d
-AUX rsnapshot-1.3.1-perl518.patch 349 BLAKE2B 1a19da5968db79ea95aab0da43f4a73d77459bbb3b9924353b147149da0a12731ca6741fb21f63aaba78b52606977f8e75aa6748c9b2e5582a3777e9cf6c52ef SHA512 5e4d43b814b0ade9743a08da0c580b6bb98673aa39127d2dd6fa0993d4b7a6ac163deff5f1ebd9fbf4c95434ef10f4c48d8f55967e1f78866563bcbaaa9d45a0
-DIST rsnapshot-1.3.1.tar.gz 215806 BLAKE2B fe2d31a5bc62577b187e33bf644600fdd2ade845572a3b0ee6ee9ff146dcdab3277cb5494e84ae144c46adda8391304de83ba3cadda8b5e451b63efd9bfd517e SHA512 a74ad0a21d213dd2e05cb577a47c491af90d8994df8f5a154195515345da438ac9c0d72b563aa02314883a0b3bb86e3c23f8b530a7078c2b55a9547a2d666c10
-DIST rsnapshot-1.4.1.tar.gz 489481 BLAKE2B d8170d6b47d15a45b1d14f67cfcb62e854ef49eb071ff0bb5dd5f640a053e6791e8684e38e7a1bf1e14ab459cb850b5a1c840569732a36acf3dd392331af20d5 SHA512 a99e639bd706aafac82d2a4a40fc6c7fa026321c527ad5826a4fc7917cadea5962c4c7988c98efbe06833ef70db081605aa47a6d77c04dcf6077cc232c078cbf
 DIST rsnapshot-1.4.2.tar.gz 487959 BLAKE2B 90a52af1b2b3de5eae7e98f87b87dae4564a7fa5d240d9e844180d6a57bb4e14b4cf762aa0ed6bbdba8deda0436d77e6c5d281ca8b62eba1c3b6caf948ae9432 SHA512 621be52715a6c1f70ddb251d7f6103ba3487cd0c6c607411d744866547d3ced571862a8f6b5e40a1d050696703f3a15821bd6e829a3fca057848f04566d0e4a0
-EBUILD rsnapshot-1.3.1-r2.ebuild 1256 BLAKE2B 64cae24e77bb53767b76c1fc6102c11a8deae431c13fa13c9af58e048f010bb4366c6dbc71964e732ce0b491a18b00063d53ef8b69b743da3091aec4b447e9ce SHA512 54d6eda226edddd7b347201429dfd5248cc4aed6ddf331aaa1d977eaf6cb668668a68ce7f3c9b6b0064955c873edaa946820d2fadcba93406e56b68869c5d8dd
-EBUILD rsnapshot-1.4.1.ebuild 1109 BLAKE2B 0f39a928a464b99d32efa552bfde1a5c6550d6ad4f397748f7611d203cbe6d3f1f6547aa5d8e91df469b9da9543e6d9f7bae30b224f8c28ddcd8aa969cec87d5 SHA512 1d0bfd24db3a4e851e1c2592784f6c4974894bc5e20e11e11bf5f4077a416203ce4c07a3563028ecc1459a48b6c6bdbe5e3dbbff9250c6213abe5a4f261923a0
+DIST rsnapshot-1.4.3.tar.gz 370840 BLAKE2B 6a3acde4afd8d1f999cfb00f07a0547b6d877aa483e2548b5ecb933c3f6e742046730a78b95fd83bfa6496a71f61dbce2a8bedc42562503bef753b0c72c40eba SHA512 606b5c195e609197ae6711a9764c07a0f0822fe228aba07014155636bd5caa7ad7dbf8f42316275a71490b5c9dd33bf04c42580b92f4910c38ef871694ae09e3
 EBUILD rsnapshot-1.4.2.ebuild 1336 BLAKE2B 8ee3cbd073f40287f5b6a7c9e3e6d05a6d4003a22d5c74460f0dec473a8cbf96abf07417cee854d7a7a35b405f2e281d36c3959f26fdcfdcaa8b1737bafc1c6c SHA512 f6bbd4d2d6a89acb6a80ddd916b1b3d8c91a59e2865586dc0b9dbeb842da1f31b1819fdd2d7ec6d8103cb9d2c20f42db11d3589d61dae5652ab0b273413f3a97
-MISC metadata.xml 166 BLAKE2B df899de61ee57cf9c2d5822a8ca4cb62c697c6da7142003688afbdd1261a8623d48058189ebe005c053ffddcb9f7275f19a0e48fc47ce1890341e276400f1d8f SHA512 12bfcd38af9dc9fe67b866a4ae090e26873d363409efc5949cca4b4a59ba0d770b09ebec8a108482b29b94c922bcdb8ce3f5ccbb578137b44e35bd783b4c9472
+EBUILD rsnapshot-1.4.3.ebuild 1343 BLAKE2B 200b42933ba7a66db8d28697774b5a3933faf08d14affe15b328fbfd646184342848f474b1d3c026aa9ca417b9046939c345f31568c83532373038adf8852fa5 SHA512 7d04b38e75b35fae2d9ed427e05dc439358e6fbdce79f5c7e2fb98123f00efc186590a398f061e7c23d6ba6112275dd83239b0c4754c3a2a4e18e411abef48a1
+MISC metadata.xml 385 BLAKE2B 663d1a8524cad5c1ff25711d7f63808109958f264a18c40195b59d2ce03c3ac92dd4812097863fc36b95f6da92c47f7fae820446323b1c4c9973facabbfb8e34 SHA512 1dcdf81afbd2de28c4039e74e12111b7f334717c68ba161951fdea9e327a97f1cbed3e1b50e3dab5e938cd5e022d5399e0c0f1b19f3a8acefc5523eb57804d54
diff --git a/app-backup/rsnapshot/files/rsnapshot-1.3.1-cp_al.patch b/app-backup/rsnapshot/files/rsnapshot-1.3.1-cp_al.patch
deleted file mode 100644
index 7241d6c8c07e..000000000000
--- a/app-backup/rsnapshot/files/rsnapshot-1.3.1-cp_al.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur rsnapshot-1.3.1.original/rsnapshot-program.pl rsnapshot-1.3.1/rsnapshot-program.pl
---- rsnapshot-1.3.1.original/rsnapshot-program.pl	2006-10-21 08:12:30.000000000 +0200
-+++ rsnapshot-1.3.1/rsnapshot-program.pl	2006-11-22 21:37:39.133222510 +0100
-@@ -3269,7 +3269,7 @@
- 				if (0 == $test) {
- 					$result = cp_al(
- 						"$config_vars{'snapshot_root'}/$interval.0/",
--						"$config_vars{'snapshot_root'}/$interval.1/"
-+						"$config_vars{'snapshot_root'}/$interval.1"
- 					);
- 					if (! $result) {
- 						my $errstr = '';
diff --git a/app-backup/rsnapshot/files/rsnapshot-1.3.1-perl518.patch b/app-backup/rsnapshot/files/rsnapshot-1.3.1-perl518.patch
deleted file mode 100644
index 367055d5cc96..000000000000
--- a/app-backup/rsnapshot/files/rsnapshot-1.3.1-perl518.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fixed man-page creation with pod2man from >=perl-5.18
-
-https://bugs.gentoo.org/490486
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
-
---- rsnapshot-1.3.1/rsnapshot-program.pl
-+++ rsnapshot-1.3.1/rsnapshot-program.pl
-@@ -6716,6 +6716,8 @@
- 
- =back
- 
-+=back
-+
- =head1 USAGE
- 
- B<rsnapshot> can be used by any user, but for system-wide backups
diff --git a/app-backup/rsnapshot/metadata.xml b/app-backup/rsnapshot/metadata.xml
index c1744fe7fc5b..41d4a20db9c6 100644
--- a/app-backup/rsnapshot/metadata.xml
+++ b/app-backup/rsnapshot/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!--maintainer-needed-->
+  <maintainer type="person">
+    <email>Sergiy.Borodych@gmail.com</email>
+    <name>Sergiy Borodych</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-backup/rsnapshot/rsnapshot-1.3.1-r2.ebuild b/app-backup/rsnapshot/rsnapshot-1.3.1-r2.ebuild
deleted file mode 100644
index 5c6f53daed82..000000000000
--- a/app-backup/rsnapshot/rsnapshot-1.3.1-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
-
-inherit eutils
-
-DESCRIPTION="A filesystem backup utility based on rsync"
-HOMEPAGE="http://www.rsnapshot.org"
-SRC_URI="http://www.rsnapshot.org/downloads/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.8.2
-		dev-perl/Lchown
-		>=sys-apps/util-linux-2.12-r4
-		>=sys-apps/coreutils-5.0.91-r4
-		>=net-misc/openssh-3.7.1_p2-r1
-		>=net-misc/rsync-2.6.0"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cp_al.patch \
-		"${FILESDIR}"/${P}-perl518.patch
-}
-
-src_install() {
-	# Change sysconfdir to install the template file as documentation
-	# rather than in /etc.
-	emake install DESTDIR="${D}" \
-		sysconfdir="${EPREFIX}/usr/share/doc/${PF}"
-
-	dodoc README AUTHORS TODO ChangeLog \
-		docs/Upgrading_from_1.1 \
-		docs/HOWTOs/rsnapshot-{Mac,windows}-howto
-
-	docinto utils
-	dodoc utils/{README,rsnaptar,*.sh,*.pl}
-
-	docinto utils/rsnapshotdb
-	dodoc utils/rsnapshotdb/*
-}
-
-pkg_postinst() {
-	elog "The template configuration file has been installed as"
-	elog "/usr/share/doc/${PF}/rsnapshot.conf.default"
-	elog "Copy and edit the the above file as /etc/rsnapshot.conf"
-}
diff --git a/app-backup/rsnapshot/rsnapshot-1.4.1.ebuild b/app-backup/rsnapshot/rsnapshot-1.4.1.ebuild
deleted file mode 100644
index 739f0f8a299b..000000000000
--- a/app-backup/rsnapshot/rsnapshot-1.4.1.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
-
-inherit eutils
-
-DESCRIPTION="A filesystem backup utility based on rsync"
-HOMEPAGE="http://www.rsnapshot.org"
-SRC_URI="http://www.rsnapshot.org/downloads/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=dev-lang/perl-5.8.2
-		dev-perl/Lchown
-		>=sys-apps/util-linux-2.12-r4
-		>=sys-apps/coreutils-5.0.91-r4
-		>=net-misc/openssh-3.7.1_p2-r1
-		>=net-misc/rsync-2.6.0"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	# Change sysconfdir to install the template file as documentation
-	# rather than in /etc.
-	emake install DESTDIR="${D}" \
-		sysconfdir="${EPREFIX}/usr/share/doc/${PF}"
-
-	dodoc README.md AUTHORS ChangeLog \
-		docs/Upgrading_from_1.1
-
-	docinto utils
-	dodoc utils/{README,rsnaptar,*.sh,*.pl}
-
-	docinto utils/rsnapshotdb
-	dodoc utils/rsnapshotdb/*
-}
-
-pkg_postinst() {
-	elog "The template configuration file has been installed as"
-	elog "/usr/share/doc/${PF}/rsnapshot.conf.default"
-	elog "Copy and edit the the above file as /etc/rsnapshot.conf"
-}
diff --git a/app-backup/rsnapshot/rsnapshot-1.4.3.ebuild b/app-backup/rsnapshot/rsnapshot-1.4.3.ebuild
new file mode 100644
index 000000000000..0342270d6a0b
--- /dev/null
+++ b/app-backup/rsnapshot/rsnapshot-1.4.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A filesystem backup utility based on rsync"
+HOMEPAGE="https://www.rsnapshot.org"
+SRC_URI="https://www.rsnapshot.org/downloads/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=dev-lang/perl-5.8.2
+		dev-perl/Lchown
+		>=sys-apps/util-linux-2.12-r4
+		>=sys-apps/coreutils-5.0.91-r4
+		>=net-misc/openssh-3.7.1_p2-r1
+		>=net-misc/rsync-2.6.0"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	# remove '/etc/' since we don't place it here, bug #461554
+	sed -i -e 's:/etc/rsnapshot.conf.default:rsnapshot.conf.default:' rsnapshot-program.pl || die
+}
+
+src_install() {
+	docompress -x "/usr/share/doc/${PF}/rsnapshot.conf.default"
+
+	# Change sysconfdir to install the template file as documentation
+	# rather than in /etc.
+	emake install DESTDIR="${D}" \
+		sysconfdir="${EPREFIX}/usr/share/doc/${PF}"
+
+	dodoc README.md AUTHORS ChangeLog \
+		docs/Upgrading_from_1.1
+
+	docinto utils
+	dodoc utils/{README,rsnaptar,*.sh,*.pl}
+
+	docinto utils/rsnapshotdb
+	dodoc utils/rsnapshotdb/*
+}
+
+pkg_postinst() {
+	elog "The template configuration file has been installed as"
+	elog "  /usr/share/doc/${PF}/rsnapshot.conf.default"
+	elog "Copy and edit the the above file as /etc/rsnapshot.conf"
+}
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 124879096178..f83811ba687d 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/geekbench/Manifest b/app-benchmarks/geekbench/Manifest
index 918824b92e38..32c6a00597b0 100644
--- a/app-benchmarks/geekbench/Manifest
+++ b/app-benchmarks/geekbench/Manifest
@@ -3,11 +3,11 @@ DIST Geekbench-2.4.3-Linux.tar.gz 3337551 BLAKE2B cb660f3c08cc812cb23374032490a1
 DIST Geekbench-3.4.2-Linux.tar.gz 9986039 BLAKE2B 63d7e768d65bc033260a0d99da17df2e518750f19882e63dbc9bbe6ff0b52a8cddb35b9143e85c01838bf5d77a04599578fc0a57a3e6fd89e7aec8c8ffdd4f5b SHA512 a61a5d5481682baefdce64f6054c3373900e8cd585dcbfa2feabbf386032986b40b603619c552102401a83e0b748831d00af5b5b5278e88ef42dee176adf06e9
 DIST Geekbench-4.4.1-Linux.tar.gz 71076124 BLAKE2B 14c2b80c971798e7d2bb256e76c7ab9c48e8c1c389e2f7547a436f706ac4f21c1e52e564cd584893071ee2f9f0a4747cd03ea72cc728ff8e4f369d5cc794d77a SHA512 fa687d33a7d7a2d09c544e3d17de93f41cfa77915c708cd1ef0743f84f7f83df9d3f8df2872a8f85ed2c4c872e3cd41932685ffeb19cdb0ea047ab5116713420
 DIST Geekbench-5.1.1-Linux.tar.gz 92622793 BLAKE2B 178b57d02de43e995f4dc39bd9514bb30fbe470d82572ba43aac08004609c07c656285beb543b3e3832df39bc2e26e41bb8c7d1f617f0846f930183e67a73436 SHA512 0f0a8206ced8cbaf271d964ece273a800bdd1d5b5918130aca2e31cab59f7d716c1b714b96a934e5b0fab8a9b73d1fcdc7ea9cd7ef37963b1a923cdefb542a78
-DIST Geekbench-5.2.0-Linux.tar.gz 92893837 BLAKE2B d081cf6e4faa8c9de494cc11ba58945a8409afd92cf4244e915349ad9ae8610c08e67cf4e4da0c10c823a785e3223fde2048849db641bc05339a4cb8d0fc4c63 SHA512 b587de4c3c6c144b2244e4a85fb719aa8a11a1b413316f0d60467c15cf7d4c43e82f57d45c266dd42679623441e895fbdc3ff29dc4762794d89c9cb33a46d7d9
+DIST Geekbench-5.2.1-Linux.tar.gz 92898328 BLAKE2B 8a989b3921e8da467ffcaea1a466053ce1eae2d30991e8ad0a468cdb2c167e39729381e2f465abc9002eaa1569a4d912bdda3c1774689b35d8edb4778ab0bc90 SHA512 5d462cbb78b0b2a132fc5fbe0e65e9755d67232b22b6f2a541fa5aa1a90bc6768b3255759019218a94df0bb82eb9aeaad7dbb6b7cb0e8cc79a95d21fb9a8960b
 EBUILD geekbench-2.4.2.ebuild 1029 BLAKE2B 325e02bfccabae6f54f24fd7a5f601517eebaec7e51f6d9c4fb15adead8eaa255423fd69a2ed0788fa6e407c4cc7c228e23c2357f4d3699f2f1f725770eee79b SHA512 19d8807a97e5bfbea9155857740c2c3c6138c6366f426defde44976a224f89c48b7dd366bd1ec1079b49b45df0c0aaefaae6e5ca8d367a3034c2c26296385a53
 EBUILD geekbench-2.4.3.ebuild 1089 BLAKE2B 010a26131e1de8b5eb4d7735f10603dc9bcef864ee688b9ba71e6d20c79424b9818b0a99a33d0ad48804872964b4ecce0e69c5a6bafaba865c03a057a6f76e97 SHA512 58ced2485af8de54dfc1a6736b0ddac21089f208c895665aa043efc381a9f04db359bcc0c2db360455b6a55b02d0bcc489c7a65c9414f43d9006b821ce3e6a02
 EBUILD geekbench-3.4.2.ebuild 1089 BLAKE2B 8512afa8c9dc00969d53b4b743158ddc1f5abb94dcfca1312a55e5a75b4204abc67ad86d4902dd95fd1139934c7d2c3c83389434b5466cec490608b76870118a SHA512 ecb7293edca2f48939fe0736dc24c1b4ab71601ff434dfdb0b3e85fabeca6f6f64c343d49edc8ab4bd69a09a598bc7122e3b34be30a91de0aebd2521136a17b2
 EBUILD geekbench-4.4.1.ebuild 1083 BLAKE2B 58703fd44f5a9276dcb69c0a976e25afad4e3ff39eb4657dc2650fc804242193618ae6187d526343db8534396e91954d5bbda75a1c6f50ef49471f2c33ea47fb SHA512 82f9440171735d13befa0aa0120d4e722c416d7633ee08a46e7f8089bc177d8b206f546d34265dfd54428cd4c9a17d589f4b322ebd87434183e05c0592c268c3
 EBUILD geekbench-5.1.1.ebuild 1030 BLAKE2B 942a330df0da458054979c0137d63a06ffd94aaa139a29c5cf291438cc64f7b1563df1d66ecf3e6d3779c860ea060f84efb66daf48871d22f51d798d43c12f10 SHA512 8885a9815bf0788ca460fe8f063c68fb215c0d8888649a49c05d0331182d98f05ae82cff35efec13366a2bb07a480d08fb578d17e01d6fc04b304db7c9d9ebbf
-EBUILD geekbench-5.2.0.ebuild 1031 BLAKE2B 9ed111d7e9a060d502d7056da19f99b7606f3b037cb0503c2f68e9f3e6907248f4ae123d740a90a2ce4977ca554dcd616cb67ecaf73c244c8857ea19d91587fa SHA512 d6a4212be1eae1094b32ed614b436c199f7a952d6b151321ed79237b3d4694691812ad0881c63984d17b1da9f6403a40f226ad7e65ea19d46db4265fc2491e5f
+EBUILD geekbench-5.2.1.ebuild 1031 BLAKE2B 9ed111d7e9a060d502d7056da19f99b7606f3b037cb0503c2f68e9f3e6907248f4ae123d740a90a2ce4977ca554dcd616cb67ecaf73c244c8857ea19d91587fa SHA512 d6a4212be1eae1094b32ed614b436c199f7a952d6b151321ed79237b3d4694691812ad0881c63984d17b1da9f6403a40f226ad7e65ea19d46db4265fc2491e5f
 MISC metadata.xml 250 BLAKE2B d57634b040c498296655940e3ee580c8580075a4190e2600113cee5548ff44a2025568380f3d5d9f3ca0fcd1ea5d41c9871395ffbcf4bd32d8df6a494852a885 SHA512 c225bdf339347a1768b255d905f3831904cdc375f3d4e90e41c68645b8bcfe2dfdf8e6aa4c67063103f459808a387c8edd9b35b073b8be175f7a3bd490fe3dca
diff --git a/app-benchmarks/geekbench/geekbench-5.2.0.ebuild b/app-benchmarks/geekbench/geekbench-5.2.1.ebuild
index 82d4a4a67fbf..82d4a4a67fbf 100644
--- a/app-benchmarks/geekbench/geekbench-5.2.0.ebuild
+++ b/app-benchmarks/geekbench/geekbench-5.2.1.ebuild
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 9758c539ec75..4e002172405a 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/cdw/Manifest b/app-cdr/cdw/Manifest
index 0c0a26346d25..14fe60c4a20d 100644
--- a/app-cdr/cdw/Manifest
+++ b/app-cdr/cdw/Manifest
@@ -1,5 +1,6 @@
+AUX cdw-0.8.1-fix-ar-call.patch 680 BLAKE2B a258766221e3be5eee1d8b1ed9670b09d6119f868caee45c2af72e6c83d44c9073b679162fe275d98e4aa5f8a0e1d558cee83b7eb114d6a7584cff6c88a90a54 SHA512 412da6962e86f263214e883935778cab987a0895cd633dda250a80155f5304350dd4c0682d0b3f262c8801b6bfd858349b44af08288237b5c0d53ef0cd4c0dc6
 DIST cdw-0.8.1.tar.gz 858791 BLAKE2B 971a5c69ef1452bb4fd02e74bb2a81492de5dc16c024d185c43bb19aa0e293b727e74f72ce73ef3aebcdb941500f95433dc6243f1171f68943b2dbe7bdc176f7 SHA512 08f6bac823f534987835f434190601d0a72df2246ff78bfe1af98fd30dda25edb8cf2e09161b3a0bc55e9efefbc453b409cc95fd3c117d447f07e49f79072e33
-EBUILD cdw-0.8.1-r1.ebuild 665 BLAKE2B 8ec562f5e01700a9338989f9a25dabced25fc0a8c9450defde4e5ed133b51e222e993510675e00c8767880ead601e302a7d75e44b46d5a37699ece3feec0a4bb SHA512 3b51aed44a8bef5d1766bce8fa47dfbea67516a2e6c12dc4442c9208f6865ba332f5d2278a0a0160f3420b1f918bde725cbf2089a14ebfcee139d81bbd8d9486
+EBUILD cdw-0.8.1-r1.ebuild 773 BLAKE2B be965818072076042539e98c73559d2f38034446019a24b1ca8e7a87727ceac103a7df491754165019979ffc47e970ecea816b71bb256c1e352c9b113f3e939f SHA512 7389a0b4a34041b1dfea66c984c94f4200f42b619cd356c849fc828813715e19f25caf1207b9fa1dead1b4dbf4f701511af0451e6968d641ce4b71c755fd3e3d
 EBUILD cdw-0.8.1.ebuild 683 BLAKE2B 6be4e48db38ceb81cb4c819552def61d7f96a8b35faa01d02bce8fde9e3915e2fe39cb6010dfd114c24836db2b2b34beed798203d7541022d6acef57a8271208 SHA512 e2f975ae1e5cba6b086d52fa104aa67d0acab99cf6b4cbc04a36880b12cde300d788fb41a7e65e37e2594ad009211d1106c377ed1fb0890052c63c9ed874b0d5
-EBUILD cdw-9999.ebuild 791 BLAKE2B 5b380cbeed433459b15b244ed38a1c1a8b3f5bb9225125327f308a8337adc8f2d2df07e49774830baabf06311d30b4fe5231762ceb0fbd47ebf19666bce4d4da SHA512 c99bea0008b0920bc3bf23de6a35fb1e82509feb5cdb815c9b839628c7f699bd30599bb9daa382e00133173089b72f05a87e4d09190b3ef459b92302f8bab871
+EBUILD cdw-9999.ebuild 849 BLAKE2B 0323ea79202be7e1a0a90b614296e3542d5a9c906dafa65a52b346b62cd0760dedef8f35b09d4a458730b63417fcca8ad2bdd8720a35ec3efed4e9cd2ea6567d SHA512 d692d443175347a3719df1375897d4f94f99e6d3538521ea9465368646afa862c0531bce39f44d68a88fa761541a02326bbda0a9dd6b2eec0de2c5df22c8f5f7
 MISC metadata.xml 446 BLAKE2B 6313db12893912ba680ec7c27d939ba2fa7c81b6cb2d7132052b5a0eaf674ce7f71703a8ea8324c61fcad6101b6bbb1e07f9a857bdc1646d96c27e6110b6b495 SHA512 304f1a9a99962e295db23822a327cc5d1b8f2f049bcbbbe562a516a5bf5171b5d93a9886353d02dedc32d1d1220f519bff13c35a7c00d1463a6af4906ad63161
diff --git a/app-cdr/cdw/cdw-0.8.1-r1.ebuild b/app-cdr/cdw/cdw-0.8.1-r1.ebuild
index 2e0b7596745d..c524d89d06de 100644
--- a/app-cdr/cdw/cdw-0.8.1-r1.ebuild
+++ b/app-cdr/cdw/cdw-0.8.1-r1.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
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools"
 HOMEPAGE="http://cdw.sourceforge.net"
@@ -22,8 +22,15 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}/${PN}-0.8.1-fix-ar-call.patch" )
+
 DOCS=( AUTHORS ChangeLog NEWS README THANKS cdw.conf )
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	econf LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
 }
diff --git a/app-cdr/cdw/cdw-9999.ebuild b/app-cdr/cdw/cdw-9999.ebuild
index 5013ebb9082d..f23f85b84c76 100644
--- a/app-cdr/cdw/cdw-9999.ebuild
+++ b/app-cdr/cdw/cdw-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
@@ -13,7 +13,6 @@ HOMEPAGE="http://cdw.sourceforge.net"
 
 LICENSE="GPL-2+"
 SLOT="0"
-DOCS=( AUTHORS ChangeLog NEWS README THANKS cdw.conf )
 
 RDEPEND="
 	app-cdr/dvd+rw-tools
@@ -27,6 +26,10 @@ BDEPEND="virtual/pkgconfig"
 
 S=${WORKDIR}/${ECVS_MODULE}
 
+PATCHES=( "${FILESDIR}/${PN}-0.8.1-fix-ar-call.patch" )
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS cdw.conf )
+
 src_prepare() {
 	default
 	eautoreconf
diff --git a/app-cdr/cdw/files/cdw-0.8.1-fix-ar-call.patch b/app-cdr/cdw/files/cdw-0.8.1-fix-ar-call.patch
new file mode 100644
index 000000000000..a578696c1c82
--- /dev/null
+++ b/app-cdr/cdw/files/cdw-0.8.1-fix-ar-call.patch
@@ -0,0 +1,26 @@
+diff --git a/configure.ac b/configure.ac
+index 76627c7..527e2cb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -119,7 +119,7 @@ AC_TYPE_UINT16_T
+ AC_TYPE_UINT32_T
+ AC_TYPE_UINT8_T
+ AC_CHECK_TYPES([ptrdiff_t])
+-
++AC_CHECK_TOOL(AR, ar, false)
+ 
+ 
+ 
+diff --git a/src/user_interface/Makefile.in b/src/user_interface/Makefile.in
+index 5d5f1fc..4d8214b 100644
+--- a/src/user_interface/Makefile.in
++++ b/src/user_interface/Makefile.in
+@@ -88,7 +88,7 @@ CONFIG_HEADER = $(top_builddir)/config_cdw.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ LIBRARIES = $(noinst_LIBRARIES)
+-AR = ar
++AR = @AR@
+ ARFLAGS = cru
+ AM_V_AR = $(am__v_AR_@AM_V@)
+ am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
diff --git a/app-cdr/iat/Manifest b/app-cdr/iat/Manifest
index aeaf82ec102f..d345d2d9947d 100644
--- a/app-cdr/iat/Manifest
+++ b/app-cdr/iat/Manifest
@@ -1,3 +1,3 @@
 DIST iat-0.1.7.tar.bz2 103750 BLAKE2B 30aed495ea5a03478fa741ef0479d22bb12e579fddf7f9232b62430d7867f4a0029145e69909f39d3b63c0b8d7f11b473f00cacbf3e051050157177503034d0b SHA512 ecde86ae11a9d88f7fa05c3b803941f6e5fad6f3dd14dc094145aa809fe9a15f7b410dae7b81715147c92309b618b8b62975ee193b73f38250b4403a6dd55eb4
-EBUILD iat-0.1.7-r1.ebuild 401 BLAKE2B ffcc16ea4e34763832b57e28d7ce47a1d00dc33f1f46e61764d3a377ebaad67cbb5e4e95fcba9c3f13601d240279e9505357e89f639236a43c511ce318d84883 SHA512 03325afdf37c5e29166b8c6be9c2b7a6b3939ed4f8cc5adf6019a59592e77a45ef9b2074d5a2cd532176334edabdc2662abcee7b03f7e6c1074e0765f0cd2fdf
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD iat-0.1.7-r1.ebuild 440 BLAKE2B 076add40cbb3e2a2c71d82ff70701ce29cb26bafe5920a902fc021b020e26b220ef394f04b0d321db89a11e3a3f8b757fb5b47f64f10269b2854d6d2d8b3eab5 SHA512 30dbcf3862388e943a628672fe7fecfcbca7b9888e29795aac5cfce7ecf602a9edbb08789df1d78a098db90c8e9df97997da83276112a8f1ee4f6357b266410c
+MISC metadata.xml 467 BLAKE2B ecf4b42f2c5af73519da4f5a5758bee899c3114353af401b6ef22355f88134f21137b0700f4e73b95460c7d0c5cec725001b5f93f2a4836ff602880da02cf119 SHA512 8530afa568ec9a0536f199f3dfa8fad64234b4b8088b62b34517fd6d348136d3fe98113c63ec810b681d8a469d039b6447ac31050b0afb0a1c67aa905a5b89cd
diff --git a/app-cdr/iat/iat-0.1.7-r1.ebuild b/app-cdr/iat/iat-0.1.7-r1.ebuild
index b55af314a5fa..1db342f25705 100644
--- a/app-cdr/iat/iat-0.1.7-r1.ebuild
+++ b/app-cdr/iat/iat-0.1.7-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="BIN, MDF, PDI, CDI, NRG, and B5I converters"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
+HOMEPAGE="https://www.berlios.de/software/iso9660-analyzer-tool"
+SRC_URI="https://download.sourceforge.net/iat.berlios/${P}.tar.bz2"
 LICENSE="GPL-2"
+
 SLOT="0"
 KEYWORDS="amd64 arm x86"
 IUSE=""
diff --git a/app-cdr/iat/metadata.xml b/app-cdr/iat/metadata.xml
index 6f49eba8f496..b00d1366c7a0 100644
--- a/app-cdr/iat/metadata.xml
+++ b/app-cdr/iat/metadata.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>ramage.lucas@protonmail.com</email>
+		<description>Lucas Ramage</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">iat.berlios</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index fe29b59257aa..0e7dfcde430a 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/debian-archive-keyring/Manifest b/app-crypt/debian-archive-keyring/Manifest
index 815453d23029..601ddabb7b8d 100644
--- a/app-crypt/debian-archive-keyring/Manifest
+++ b/app-crypt/debian-archive-keyring/Manifest
@@ -1,5 +1,6 @@
 DIST debian-archive-keyring_2018.1_all.deb 57392 BLAKE2B 3262a1f49af9792ce378a0b6219287ac868d3483783218f55a0ab3d37b9fa0a857da2dcd4c83742d8b47ce4a2df5ecd985d2345d5367908f2f353e8cc0a6a5e3 SHA512 7bf98cda5b9639d68538a8d47e35d422e552bd8afa067e844f0e8e76a366f9d5e503e0f47dd646789fa0264a47b77d0bfcc22559ad09bdc95453e4a5c2169f0f
 DIST debian-archive-keyring_2019.1_all.deb 75088 BLAKE2B 54411c4bde02990670baba608e239f1630394f52e877b62b4683c85c5a45a618cece0f429a35472eedce3768dc8a097049b4cd9dd808cc167c5baafd1e8fe9d1 SHA512 051b8507c9deba0d13dc0137ff43ae9db27b20b78c3437ca680046ae9b1c81ac505dc0a4460d4a83c4b256a04a2e57d1280eb2e8a3afb2a58f150ca6c37d0d63
 EBUILD debian-archive-keyring-2018.1.ebuild 475 BLAKE2B f10d5d944aaaf7a76c60e56e82b469deece91b9c5756874890696bad485bb21f3a53d77d2ed6cde678a2c3ae0ce8e1d78317f189d3df6221cd41daae45d696d7 SHA512 f80c382c04eb60d953f8a3ad1e87211adbff5a2425b9e6be6ce4644c22fbefd0a63d044c429b6379903184ab7ee6045a8b0b790f7fc8c4287ff82fa1c1514655
+EBUILD debian-archive-keyring-2019.1-r1.ebuild 573 BLAKE2B f8a443e81c0345a37286f9b30d2293e2274c48c549b9005005e4db8dd513fec05962ea6ca9ae999ed953ae4ddc0ca89469fe825e78fbfd3fae860bed65407734 SHA512 23cc33336c33fa8275e97a9f235b40f23859c8c2406d9d461b5eb06f461093286ea6804742ce3299e3b3977a4402b7f2f1146093796c120036a3b982f2b5b66a
 EBUILD debian-archive-keyring-2019.1.ebuild 482 BLAKE2B 716ab76abb537b1b44543ae8056ed68be13dbf9c3bb31e293ae955477c534a253556f8a8d6d7399a2f18ef8ae1182ecd9e3d1dab05d4c94854360c9d427162ba SHA512 1643060e07bfa3938f9c20297e3c4eb1800e8d5a953b1c2d16d8fec35b47dff7eff552ed70432053fb03e8b577c75db1cf4a50966c8956c8a8428065a4fb38fe
 MISC metadata.xml 255 BLAKE2B 4c7bf34bcfa727317b7cc808eb50bbfd3d1aae64fa098b599480cc8ae6cfc527956a0d593db2ecc55b1b3cea48c5ce46642b64cda5b40753d6fe5e883129147b SHA512 92faa797311ee8b7bab9f5f5070d5fa6b75ca5f3a07643f8fc4d67a28d50d746e904009b7fb1a8214c4b0fc296b4b3ab3f695786103dc6c26479c5542165a587
diff --git a/app-crypt/debian-archive-keyring/debian-archive-keyring-2019.1-r1.ebuild b/app-crypt/debian-archive-keyring/debian-archive-keyring-2019.1-r1.ebuild
new file mode 100644
index 000000000000..bb310ba9327a
--- /dev/null
+++ b/app-crypt/debian-archive-keyring/debian-archive-keyring-2019.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit unpacker
+
+DESCRIPTION="GnuPG archive keys of the Debian archive"
+HOMEPAGE="https://packages.debian.org/sid/debian-archive-keyring"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}_all.deb"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_install() {
+	doins -r .
+
+	# https://bugs.gentoo.org/729142
+	gunzip "${D}"/usr/share/doc/${PN}/changelog.gz || die
+
+	mv "${D}"/usr/share/doc/{${PN},${PF}} || die
+}
diff --git a/app-crypt/libmd/Manifest b/app-crypt/libmd/Manifest
index ffd8ac0ab793..97960e598d30 100644
--- a/app-crypt/libmd/Manifest
+++ b/app-crypt/libmd/Manifest
@@ -2,6 +2,6 @@ DIST libmd-1.0.0.tar.xz 254852 BLAKE2B af0d3c645a18262965e708d678cb30c7ed168af80
 DIST libmd-1.0.1.tar.xz 257372 BLAKE2B e954ab6b1247952abcf6964d8d714c2a47a644e206a455db547a0159a97ebbc323cf1258a24c744cea3106f267f1a319a689fe545b672580f4e134d96cc7cb3d SHA512 6f343101f9ad8f927d862e6bae948d35ba596ecfd375c255fefb86efc621cf6e9de3597770ad66e0a48e8f4ea018df78debb571ea6746a7457d8900fec87069b
 EBUILD libmd-1.0.0-r1.ebuild 614 BLAKE2B 9d33178bd6faa47c60573c9f1b067cb4243074b42b5d7bc644f6cbfd47fd492081b0a7bcb169db21f0fab0edf3d3f8caf5e500a634ac0292a479f9ee9d766730 SHA512 aa0fdde5ba65459296370927e0c179f55a8aa9abb67ee3ee03eb803dd7760b8c695b826f5a876d89e460c0157bf0cf4f8d2fd5b81ed4ca89cce2d97b1c91aa99
 EBUILD libmd-1.0.0.ebuild 386 BLAKE2B 03798470d2403edab2cb52c6dd7f36abf86ae1590642b7a46c5166adac60e272fae28f72f0384a2bf80763f2d814211b0aa4d562a43829a9236b1a47f4637107 SHA512 6a7cdfc8a8a1a271e328d03f60634b94e3901684af86659996b082a3ecdc858c7b8345d66edfcd0667863bb964f61d116ceb5e9850599409d362906692762b74
-EBUILD libmd-1.0.1.ebuild 651 BLAKE2B 7bf3c330bc3366bd96d3c1eb151c8d166f2707f0be890bc8065c227f1931f5c7346de39251d635b7e1b8ac311797846dd55e0adb8e35ec1995880221f6f26616 SHA512 d3cda10b7575a4159477cbb4198fe15557931519a6e15a7eed74935ff6f9e6624f2e76f835ade8af899dea1875712736e6b12e45265eda2c7d4d1f6929b8147f
+EBUILD libmd-1.0.1.ebuild 658 BLAKE2B 8ebd5931106e0ebc15c965a0b65433856ce4cccc1f9d00598ae7251e45940728423f48a07c264e105ea94b4e755d940ce1a94fe30c126a384f313e726ea79c24 SHA512 01b56857bc7118e94ec6bf321420b6eff57563b589b4f193601808009173251bc44d4958ea1db2523eca06c0d61c5f5d1e3a2655c4474072413275a6b9236adb
 EBUILD libmd-99999.ebuild 568 BLAKE2B f3e942f902160f0fbf840e0c082a3dd07f57c2fe1a9d785a5d7b26c429f2baf6be48e4420b65d3c6b9b15684d6043576e989b15d188a167b016f8d404669d59f SHA512 d8479e0df2f68c33deece78037021a2dd26d75ed623b3fc486837b6bb53bd33fb49d4401e9dc5f938f161a296adeb2e7da8ca6294aaed56b8f9e8adf2fb2f759
 MISC metadata.xml 217 BLAKE2B db2fea1f008893d22d3d43f938c7b7fc7c035cfe58b04e1652b74e3c6a6f35754cfee5351ab5cfbfe286f03ff558b83167764305186d6a15ff10dfa29639011e SHA512 d1543d516a9e55d1985a460e7b21735cb30b977ba2ee097a43bd220c1bdab573baba004968a2d027d99f1222d3fc06931154e70e47b60a61869da05137af20ce
diff --git a/app-crypt/libmd/libmd-1.0.1.ebuild b/app-crypt/libmd/libmd-1.0.1.ebuild
index b3776d95ea2a..0081b4d97e23 100644
--- a/app-crypt/libmd/libmd-1.0.1.ebuild
+++ b/app-crypt/libmd/libmd-1.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
@@ -10,7 +10,7 @@ SRC_URI="https://archive.hadrons.org/software/libmd/${P}.tar.xz"
 
 LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 src_configure() {
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index d3d57f782923..dce2a5ae610d 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -3,5 +3,5 @@ DIST libsecret-0.20.2.tar.xz 526224 BLAKE2B cae93962480f65d2c91b1c26a23321d19c25
 DIST libsecret-0.20.3.tar.xz 526388 BLAKE2B ae2e64af61c269eb109fa7840cc7ff2362ac69eab4b452074c2cb3a80b26cc88e8d341a7649e0f16fa73541943d968dfbd6f3cc802d99a37f3a7d91e8b20cfe3 SHA512 020e1954e0965f33ee15f35e1f439b6c1650322a9112078f7a3e265cee83ad99d217ae3b363fbadc06c5cb0941f7e544d91da72e5be1c6b96992c071e6170c22
 EBUILD libsecret-0.18.8.ebuild 2632 BLAKE2B 4606cccccc9771bf3c3b45d2267be781d7e57e217f91a5385883b3d1af27a02ba33cb23945c609ec660b234c7e26812bf1215d18ae0e2d57ad8cbef84c5534e0 SHA512 caaeb5ff5ee638e2fad31e9753c2546ca09078fdfefaff1b0c8fb760e94c75214aed5b039ae134a81af5984de93eb15f049d9229032e30721cd7a45b86ea3b78
 EBUILD libsecret-0.20.2.ebuild 2637 BLAKE2B 5059338cfd2085bc32343b2614965335b0cd222eb502080afb555080e1f82b36767c4ab5cc85eebd55485233fa6a8aa45d3cf8d2d59ebf8d186b5c4c6f6ded8f SHA512 362a1e6ad2e3100ae432af0297159e3328eaef9fc1e074258b526c97dfbff26e4361b79ea21583215147c4c366528930438e1b36f6f13e01f906fe73a033d408
-EBUILD libsecret-0.20.3.ebuild 2643 BLAKE2B 7d7741ff809281b23904bed3c5ea39ba043b4b168185a84462be46c2377d7632b5bf3ddf18e2b1262cc6bf647c30e4cc4b325cff960ecfc32739af960213ec6e SHA512 d60122ac754942b99a078dba69ae1cb0bda123a596b4fd60a3a84c861541844ac398545519cd18eff3579bf00a8d5cc43197a1547d5f522e9e931d6fececd738
+EBUILD libsecret-0.20.3.ebuild 2640 BLAKE2B 40714a51c856e37a2295afca99fa19959c0dec3eb8da094f437b032fb0ee0496f56dd46fe586be6defaac660619bff56f990dfcca839a7804bcdd52308c6d38f SHA512 1d6124c7287cbca9ad21d0f055ef71de5cd91f247909e94b1c3c5c56e28c1e45c8e36d7d1d0246690d1c870851788ce6fe8e7647e461f31bcb7cab66a67a1dda
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/app-crypt/libsecret/libsecret-0.20.3.ebuild b/app-crypt/libsecret/libsecret-0.20.3.ebuild
index 8272d6cfa416..c822953c6dc3 100644
--- a/app-crypt/libsecret/libsecret-0.20.3.ebuild
+++ b/app-crypt/libsecret/libsecret-0.20.3.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( introspection )
 	vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
diff --git a/app-crypt/rotix/Manifest b/app-crypt/rotix/Manifest
index 17d8964cb84f..d27d0f434a45 100644
--- a/app-crypt/rotix/Manifest
+++ b/app-crypt/rotix/Manifest
@@ -4,6 +4,6 @@ AUX rotix-0.83-locale.diff 256 BLAKE2B a7564979a38ff517bbe0592ba12e2aab92c44fc82
 AUX rotix-0.83-locale.patch 206 BLAKE2B 98f179037eaebee3ca2c1f41d543dba29fc61209518b3abec238473a38da0d3140aed50ed5a33ed1d0656336df2f3a236cd0f8ced9f0795d807710f1978f881f SHA512 caa6430c0bf96fccae2547524c7eb81170e27ef2adb054671db0f1d8f88ed6a4960b827d1781af4adbf5216c00e007a48071b1b4237f5a691bd46e45bbd599a0
 DIST rotix-0.83.tar.bz2 14685 BLAKE2B 296e094dfef2b35db39041e92d350befc970f3594c7aa2962b4dba0215e99b50ea887d3d636dc2e38ee570b60462bcf8304a6f7ee005315fa115b821ee0f29ad SHA512 1f318e15bd51cc197d9d9fc36e37b29c18fe7a8e8c40654c69ccf97d32b896afa7cc517c562750f6c1262baddbb451bd8a29ada994176e442630d8ed56ccf572
 DIST rotix-0.83.tar.gz 15412 BLAKE2B 4a0db309fa23af3e15a63263e40a2b27e2ebf1e0cf162f2776ebd5237621207eee3a41374170c2e0441104704bde4aff8f929fc5ad8994dfcf4fd1cb5a461696 SHA512 bffe527714f35a99f3322e87d1e2fcbafd38f3a7677e2ca816988df2ce1567ce064f0ab7a543fab3dc2d73f148675fe069c398a5d9c7bb285cb6b1658c3fbffb
-EBUILD rotix-0.83-r1.ebuild 828 BLAKE2B a38db350e29de43e47005c789fca18d942a05a3bfe6840c2f72d02a01704837db742d36cf657cdf38341ee966308cf116c9ac7e89ea88a5a28df0e5be18b78ff SHA512 90d9b906e84f2729aff186ce7f95a76b7ebcba9a889ef4d83aeafbe0a74d277de4442cb76347031251e80cb0cd9f7854c342344b8b9a347dfdd6c9c41b2b8602
+EBUILD rotix-0.83-r1.ebuild 826 BLAKE2B 3f1c155a6143585475d889748807d49c0bc2a2eb6a24a0cb8e51d8bc3b010375d4405b483b11a092abf1a3660c2b8f551d82f5a92cef77ced1a547beb887125b SHA512 53e7295feca9de65a5f0f137203aa5b01b6d9acac14436799087757fa5e0579629c07b161057044fd4a5086be548878f3d89d266bc0c2ae8d375bb3ac6585492
 EBUILD rotix-0.83.ebuild 803 BLAKE2B 8c7b1cc3aa763d66ecab9a9082b72040e0c91734dad8701387f2e296d7d300a98bc6074af1e8da7bad0eab7d7a2bb4d562f0cd48efd8c7f61cf4aea712ccc352 SHA512 d1f06b48dfef707e1753f035763a02a4f8032d6255c86d8b79ad0cdfd5a2c5f42f4008c658d7c4ab01539b96882da4948ef865b08d3eadd6dfb679ec0481b3cf
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-crypt/rotix/rotix-0.83-r1.ebuild b/app-crypt/rotix/rotix-0.83-r1.ebuild
index 659781528a35..05b44dc38cb3 100644
--- a/app-crypt/rotix/rotix-0.83-r1.ebuild
+++ b/app-crypt/rotix/rotix-0.83-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/shemminga/${PN}/releases/download/${PV}/${PN}_${PV}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ia64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="sys-devel/gettext"
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 72e65c9f26e9..d265b7aad4ec 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -2,5 +2,5 @@ AUX 3.32.2-libsecret-0.20-compat.patch 1333 BLAKE2B c1c80f28531726c60a709e136c1c
 DIST seahorse-3.32.2.tar.xz 1278668 BLAKE2B cd3fe6794ca02b1b0fd4b833a7128b8180137441a788f1f3ec5bb4186517ebb9e7422fabab2d19f60420b36e6b1ecab8b8326c99122aad185b8e45927232708f SHA512 e372f79907fbc5d60a41ea0db3a91575b0b304c1727c6091f94eec28445cd836faa32754582c59fd1eb8ce784986e63b4c8cabbd46d5e4cacec1150d9ca08481
 DIST seahorse-3.34.1.tar.xz 1271616 BLAKE2B 64956d0ee4f15bc048f42cefd827aad91927b34eecf4a2e53d988c379b3eae1ce0ae29ef469c2ff80ec9cceeaf77a271c57e28cb98dd24ae55c048faff487c1d SHA512 d2dff7d73a0968c1a5a8d39460f08b67f6794f22812200f564ef719354ab5cc2dac2213cba0d4bc10a455aecb9f55de8ff39943db4482beaac9cfdc2ca1012b8
 EBUILD seahorse-3.32.2.ebuild 1548 BLAKE2B c60b73c8b7e427f09b003ebc7d1028a82f236a9975dc41571bf05a16f443e11cd6566aafa502a74eabcb452b6b5b2e14b190c8aeb8b273045a4687eee21352ba SHA512 1aacea7daff0d72cd4b0826faf59430ba62b575dfafb968a950711a6fe68376b8a1afc3fef8176ea471def213ef08962c47d916f24bf7bbf2f64da0a11d7cf83
-EBUILD seahorse-3.34.1.ebuild 1558 BLAKE2B a6f7616c5f0c0bee07719126358bd2cedcb83b343035f1b79f3051b775d6fec30e75ff8d015eb2ddcd0237d1fd26e7354bbb0f3c183c2370bf9668b526dc7f40 SHA512 762c6ed9dc0819240ce13d0f2382ebd69851dcc76d2c8ce1654313e4979659ce804738dbe27f895416afba95866c68cc0f7a96e21aecd9b4237b28205915c9f2
+EBUILD seahorse-3.34.1.ebuild 1557 BLAKE2B 5ada85f4dc382063b8b1bab5819cd224b7bf3dea9d64cbcd7c26457be9f50ac846424d0986efb00408272bf7ff5563c6e0448d6d4ef31c79723d4ea6060746cd SHA512 97913c9016858838300338625938f8a08adc81feb53b0176898e8a7634ce7653db6377d13bf024dafc943411b8d2e1df11a4d34d9ed0afdff3d31e64b881cde1
 MISC metadata.xml 742 BLAKE2B 11cc6cebe3f395ccd9f2570a419e812951287d7a9af2bd88720a66c7349305c108c451b67a33f9a6da0c82d7b0731ca74980dd7515db3d167993008633973a6f SHA512 cf7cceeaedb1fdb503def974d945a7a5d38a95105dda77f7e917abcec8ce823b461bf3cd1ab5f1a458de859e48a4d58abde71a5a4599685772936eb3525ae3af
diff --git a/app-crypt/seahorse/seahorse-3.34.1.ebuild b/app-crypt/seahorse/seahorse-3.34.1.ebuild
index 2f9feb4c7928..a3dadbaed708 100644
--- a/app-crypt/seahorse/seahorse-3.34.1.ebuild
+++ b/app-crypt/seahorse/seahorse-3.34.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 IUSE="ldap zeroconf"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2
diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index f3e781a03b81..94d7c28147e7 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,4 +1,4 @@
-AUX tpm2-tools-4.2-libressl.patch 825 BLAKE2B c6cd9fd6f8aaacd3aa672a31fd727cfae6c64a015e95e2e0fb282b541168a8ad7a45c65186a18651c3bf6d4252de951891b03719c472b0b23639fd1c09729132 SHA512 202aef9a49c9ace31cac0030867c9842c7426e1c11a16c95740fc8818ef83d7e4c7723b09ef372dc8958576f8204f94aa1bd0a8fb7782c6e7b3eb1f37b675cf5
-DIST tpm2-tools-4.2.tar.gz 889062 BLAKE2B 434b88e90f953785e57a9e9f18d717c8b6632206dabfc7478ae866e245eadf032ec4f26bb9597d04ea887bc23a8096d7e6fc2748b0e96806cb2989fd7edf9071 SHA512 7aaf549dd77307e5ad93d4b34737d684c8a7384996143124f10b188f5e99860940902cee83538e6957997859420dd430d6d27979b223beae515aab94ac8fb235
-EBUILD tpm2-tools-4.2.ebuild 930 BLAKE2B 45b35129e0551cedd898d62118a11cb93bbd44fedcf02a76579e890e6c0eebb6b89b4045e6f2ca9a7a98495ea58771e83755e6997c483e4491644a5d435ca682 SHA512 17145939f7dab63047a6ee355be78198abbdd172defb18be2d77d17574d64d3c879c45261a3546d8c804dbe57fab38aea7ac8938dbca6dbed52952e39db067b0
+AUX tpm2-tools-4.2.1-libressl.patch 825 BLAKE2B c6cd9fd6f8aaacd3aa672a31fd727cfae6c64a015e95e2e0fb282b541168a8ad7a45c65186a18651c3bf6d4252de951891b03719c472b0b23639fd1c09729132 SHA512 202aef9a49c9ace31cac0030867c9842c7426e1c11a16c95740fc8818ef83d7e4c7723b09ef372dc8958576f8204f94aa1bd0a8fb7782c6e7b3eb1f37b675cf5
+DIST tpm2-tools-4.2.1.tar.gz 879294 BLAKE2B 7619f72f0fe39360f111822b4ec7a0bb90156f295977115c4612efac33059dd786abfa5d5f46a8fcc134fce11d099b03cb7f9ee01aa3addf5a3bb2455e1eb2d4 SHA512 4da103e70880d72a9aa402dea39ea439a0657729af22f08ac7275022c475ab46cb3dd6123d6846669d9b7f8f9af7b3e3df7c3b1d33cd0149b649b7941c84c339
+EBUILD tpm2-tools-4.2.1.ebuild 930 BLAKE2B 45b35129e0551cedd898d62118a11cb93bbd44fedcf02a76579e890e6c0eebb6b89b4045e6f2ca9a7a98495ea58771e83755e6997c483e4491644a5d435ca682 SHA512 17145939f7dab63047a6ee355be78198abbdd172defb18be2d77d17574d64d3c879c45261a3546d8c804dbe57fab38aea7ac8938dbca6dbed52952e39db067b0
 MISC metadata.xml 525 BLAKE2B 5fa89e3cfb69fe00abe745690aafc6e45b8394e1673521049ae2bb834454f3100ef65d4080010c4fed7265bcd6c9dd6cb9015a159674bb71622646d5dd5dd57b SHA512 533cc4a3dc31600a948c931d144eeee3cdb265286677966ed7bf26953deec79f1c9e0c2c7152e1a5ef3bc067bbc3d88a7ae0678b9395be3a7b01d76976a9a4d9
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-4.2-libressl.patch b/app-crypt/tpm2-tools/files/tpm2-tools-4.2.1-libressl.patch
index 2f39db3283c3..2f39db3283c3 100644
--- a/app-crypt/tpm2-tools/files/tpm2-tools-4.2-libressl.patch
+++ b/app-crypt/tpm2-tools/files/tpm2-tools-4.2.1-libressl.patch
diff --git a/app-crypt/tpm2-tools/tpm2-tools-4.2.ebuild b/app-crypt/tpm2-tools/tpm2-tools-4.2.1.ebuild
index f791854a95a5..f791854a95a5 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-4.2.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-4.2.1.ebuild
diff --git a/app-crypt/tpm2-totp/Manifest b/app-crypt/tpm2-totp/Manifest
index d0cb880a56fb..a18481c54bc4 100644
--- a/app-crypt/tpm2-totp/Manifest
+++ b/app-crypt/tpm2-totp/Manifest
@@ -1,3 +1,3 @@
 DIST tpm2-totp-0.2.1.tar.gz 427226 BLAKE2B e6a9dbcdac4d7fc31048aff968e3eea097752c79a3c1b8551d22558a6b143a758e7bb507722185c648000f4b1edd2f0bbdd443890b5763b297f3d42cfbd84d9d SHA512 2bda34e89b76319a40206e08c0208b0f139309c0b0e40e7168b5e7562096750df504dfcae3a39e6f82fdccbf7a79ed0802d115fbd7560dc3f5b52d81fe8fb59c
-EBUILD tpm2-totp-0.2.1-r1.ebuild 694 BLAKE2B d65fbee79e5e778b13ebd74718b581e16f8a4279444296738d20bd3322990ba232215f86dce929c2b99e0d62e16c73c5cdfc5c3c332900ba81e45c894b097803 SHA512 517b17bf9de14ea0d1bbca0ea0c8019ff1d0473b0fd19c490ddf70858be8ba5698a1e9464bb0a9b54b181afafc1208c4d1b68fab306ae5b82a06dacb38ae6a62
+EBUILD tpm2-totp-0.2.1-r1.ebuild 696 BLAKE2B 4adbf823093d5e8868fe20d0c1bec2c86afa1d5b32b7800ae3a040fbb77b244bb9e1999d20d9a5bce6f367e6ee5093e465d22a29f3e2e2acb7217ffd69a5b2ec SHA512 aaa9cd2384921a0b723ef6ee9b661b5eb8a42aa8a8124d0747dcf70b49dfc2e2ac8320e97bb731a83491e1f1e8c3642aeb271f1570e3318f4264fdb87d046c12
 MISC metadata.xml 457 BLAKE2B a9c8431a32d462bb22c6362828b488746c0ec6f7cb0e2990894db416eedc1b0093b2b6a34cf05797ffe1769c5706f41099ec0a239904d3cd66f948dbe330d12c SHA512 eb49af2e52b354ee329f7bff699ad3a8d30efb83162f907806896021a54fd6d8cc17fa3ba037332004fed460576b4c1ac2e7323ff10331e053d8423540f17542
diff --git a/app-crypt/tpm2-totp/tpm2-totp-0.2.1-r1.ebuild b/app-crypt/tpm2-totp/tpm2-totp-0.2.1-r1.ebuild
index bafbd71fdc7d..e2c2d163e572 100644
--- a/app-crypt/tpm2-totp/tpm2-totp-0.2.1-r1.ebuild
+++ b/app-crypt/tpm2-totp/tpm2-totp-0.2.1-r1.ebuild
@@ -25,7 +25,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--disable-static
+		--disable-static \
 		--disable-defaultflags
 }
 
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index 6598580c2442..d1f0a31aec93 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -1,5 +1,5 @@
 AUX tpm2-tss-2.4.1-Dont-run-systemd-sysusers-in-Makefile.patch 531 BLAKE2B 45a14e0d23b1dcba9eb92465fb6d6a57c3c97f1d574a987214475c40403c554066076a16432ee68ae1a58677c22c72612c08bf91e8cbfae98d941580c0a3598f SHA512 0840be27e1742d5999531cefbc20a661136e44d44728ee5b968d96a7d82baf1d14e5e4e671f8f34fdaf37a0214dc23bd5286c914f6f579e8f4d1dd959779a5a1
 AUX tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch 2073 BLAKE2B 09e64b791b75a6bb673402fe94bd4b4bac91f07f98e9053941470b0f44034d6892e6070aaa08326b25c1567018eef898b6508ded8bdbdfd0dd342ca22d0cdcc6 SHA512 d354f656481db5ead0d48ae0389954cc6735a037a6b09cda251360b937128b5807d4b3c5819dbceaa1767db2232ff8dea2f00af3998c182ee3533f97365aeda2
 DIST tpm2-tss-2.4.1.tar.gz 1445103 BLAKE2B c7be91b93d19b5afeddb6ec455db9ba06795f8dc76ee2a0c6cbabbd8f623930d7c9fdf6319497c70790445531d1e36fe3f904f4c1f4bc9254d833b6d19280f1f SHA512 51551d63fa404e23664aaad1b247bd4b1f93812ced1aed144c37f28cdb3adb4e696aa9e93a502c8fa0eb7e9b4376ac9377f0537eb4c717b68c0b014fee7a0643
-EBUILD tpm2-tss-2.4.1.ebuild 1769 BLAKE2B 7a738081fefc968dbe65457a27320b6aa8efc6890031934bb655dc714c780409900904d56ed5cad4b2f0da67bdf9904fcf0146e86d95058b8455d7b2bcf96902 SHA512 539af63e600cfa13daffe749de43ecc933601406e89390a32d1ceac2e0855d51da456924d2670270b6663f70ed1ac0421cc2a909c0f45259392fc179c08b116e
+EBUILD tpm2-tss-2.4.1.ebuild 1768 BLAKE2B ef53b8d76a557ffcea8af3a1cd07be977b21804b27faf22ba07f8cbdb01a348f2169efdee87644fdf349c047e362387b34c790690c3f15738b023c2f18884070 SHA512 aecec9b6f3e32de44853b329049112d9d1faebccf228f53865f3567e3169814bbf0de7a266a9858420abe57d804ac8d09ed0ebf19d1a03970dcf37e564327eed
 MISC metadata.xml 713 BLAKE2B 2abdfb26f5f48d666fb73603855baca019806420a262855faa4d4b00c90cdb260f2d6db4fab0752b13ef67dcfcd0e6462889eed7797545b1893a8c6ed137d563 SHA512 d48e14b074bcaaf77b723671a49979f94b592812d55a1e42acbe9b609be4e799bab939fdd4db66a2f9e37b40a0c2a13b47ef48d0e6c30e0ba88110e28dfaa4d2
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.4.1.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.1.ebuild
index fd1198b631ab..b67db0a54898 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-2.4.1.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc +fapi gcrypt +openssl static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index 2f480ea7efde..467f4cac1282 100644
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -3,9 +3,9 @@ AUX tcsd.confd 372 BLAKE2B 535a5bb44cd18e4d0b7520a8ea840159d35e4ae0c557b63ec7892
 AUX tcsd.initd 843 BLAKE2B 1c2190a10823130ed69c79761063656e55cdadafeca99053d12a86f110091936f44475f5ea6adaf90e7eb70f3871fcf6452c96c86b5bc88ae28a1a5144e2a95b SHA512 d43dac0f8a7b878fb7572df8e3314ef2e6c1b90ff794df2f41192e7e4f3c8849602dde49db359e6566f1e426b63fc214c6b9dea731fcb7f3c09623e3c27b2001
 AUX tcsd.service 131 BLAKE2B db7995ca078c6008daba2bee50b892d5ae0fceb184c966f67578185dbdd81b8a3a55000029215d28d99e8e3ccd73f64b85b66cc4f4a337f28ee9d9ade4222067 SHA512 e516bde8ce45fe4ad687aaaabae475da9c20a9fbd8ebee736d09ceb6efa597efb6f3bb99840a4c0d2c9eb77c2824df6ee45985b46dc8cf924b4eed67eeec1468
 AUX trousers-0.3.13-nouseradd.patch 606 BLAKE2B 7e4a479fe1bdc75f743263c1321f2d99cfe99d04d8196b57a158bd2ce75335526b2001c2af8aa0f8b17ddfefa304685e237385be0bc4113d5ca366dd464fa85d SHA512 a6c9074e535429f09ce5e850d943378348b54bed479b7fef0fff7bb18ab2547421407900aa35533749a764275a241ddbd083c4e2f3d6a9ad6f9b1d40d090f783
+AUX trousers-0.3.14-Makefile.am-Mark-tddl.a-nodist.patch 746 BLAKE2B 91dec77a329a4931487cdff54ab8c77ae302af6bc741da3db61bc34b416d29615808799c8a4c5b39a293021dc1cc16642461037fcb367507ceadcc4456565715 SHA512 704a87fd4b5e50356ac6a0ad68aec04eebb2030d9818c9e23a40f2e621d6e2d5e5660b81997b459e67a8059a0d88a254a41baa833806ce99268ee24b1190ae0b
 AUX trousers-0.3.14-fno-common.patch 385 BLAKE2B 7ed20c894c4687275804adf8d820227e5b246f02880d38b29dc6a17d12a4932059f237913f8d1841d56ee32c652cf732c01e77cd1235255b8e2fc28bc9a78027 SHA512 cf771b065d972b9974c93ec67a471a8ed3da737178a14b2d14537ee7948544bcbf071201d42d6e2b1333a3c30e8104cd1dbb344327a424597e5046e50137a692
 AUX trousers-0.3.14-libressl.patch 877 BLAKE2B 6416ecf1cf99678299e4ac39756920de61e598ec9b9c91c17cf8eddfa10af145b813756e2fae3b39fef8682eeb2ee722b3979d52570f41b99708fb4ba2cebe2d SHA512 3aba9ec7554d4fdb941063f771b40c5700efefdbb6e5df186824e93a6b2c61801acb4be60cdbe71dcee9360c0f59229e5d17f1a18aa981132807b5e74efc2d59
 DIST trousers-0.3.14.tar.gz 1378438 BLAKE2B 3dc2824fa2ca1b1f1181f98d59e85276e7d38af4bfc07ee8246431d9ccb300a8e0820b318643d4cf5d757d2a49492c8686e2fe9de03484263d2189d4bbaa32d0 SHA512 bf87f00329cf1d76a12cf6b6181fa22f90e76af3c5786e6e2db98438d2d3f0c0e05364374664173f45e3a2f6c0e2364948d0b958a7845cb23fcb340150cd9b21
-EBUILD trousers-0.3.14-r1.ebuild 3005 BLAKE2B 625aca034e7f6c85660c31f2ea2aeea18dc9b555213c8238c54d1e348a1a46db01f6e852ab2ae26ac42d396ba928a75bc0ba9d898bbd74b69b4c0b66310bb604 SHA512 bcbd7d7925f0ad42365c73a0419effe6c2e0b63904b1d2730305251b4ed6c95e5d36b6266a1409714075af714055b4500895399cf0b59ec8baa7bbaffb773502
-EBUILD trousers-0.3.14-r2.ebuild 1579 BLAKE2B 9798302ee9903fef84d39e836a69baa7c3c8fd92651e5245c9734c5979921fc50ebb19fc972b41cfd92d5883605f363afdc8f6588ba0d0db7db32d102fd9afa5 SHA512 9283242356516ef258ec8d42de3b571c24985152efc4441a3123ae2c50e00984ab83aaf61ab1c453311ed48edcf281528ce7e453172e18cf7eb4fb52efd1a2f0
+EBUILD trousers-0.3.14-r2.ebuild 1636 BLAKE2B a7d811322ebc0e5e61b7b4ae53d24a138e1e801782cc8f9b7a0ee3448163a422b92ee648f7df98d79d61ee143b012d85b74ab78e63c3a6251cd6e704bc8f46aa SHA512 2f99e83739a57b8e5114e87064e9975dd6d401842a03a08743ea115037c7847c80b5ed41f729947914304fa2a2c54db0a5b2613f449a45384503851aa5136feb
 MISC metadata.xml 507 BLAKE2B 1674e8c11713df517fd8d2aead0b5207a114de5b34559ed1b1a2527e73ee7e749a13d5a7e10330f940bc61c51ed9083e3ce423db428503f25295e1fd3b64d576 SHA512 f1c304734694001da4b95f1f18cb6891d3fc9df1db1013ad7155b2f60fd466f46947b3fa9e78d50c2a4a2fb1d0ca98b8ebb8017dde2bfcadd847e422df8885d7
diff --git a/app-crypt/trousers/files/trousers-0.3.14-Makefile.am-Mark-tddl.a-nodist.patch b/app-crypt/trousers/files/trousers-0.3.14-Makefile.am-Mark-tddl.a-nodist.patch
new file mode 100644
index 000000000000..f777b629cebe
--- /dev/null
+++ b/app-crypt/trousers/files/trousers-0.3.14-Makefile.am-Mark-tddl.a-nodist.patch
@@ -0,0 +1,25 @@
+From 5b1dbb5f8eada9002ec10f4ebc0bc418272e58b2 Mon Sep 17 00:00:00 2001
+From: Salah Coronya <salah.coronya@gmail.com>
+Date: Sun, 7 Jun 2020 12:34:03 -0500
+Subject: [PATCH] src/tddl/Makefile.am: Mark tddl.a nodist
+
+This makes tddl.a nodist like the others, so it is not installed
+
+Signed-off-by: Salah Coronya <salah.coronya@gmail.com>
+---
+ src/tddl/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tddl/Makefile.am b/src/tddl/Makefile.am
+index 607eb8e..2cd599b 100644
+--- a/src/tddl/Makefile.am
++++ b/src/tddl/Makefile.am
+@@ -1,4 +1,4 @@
+-lib_LIBRARIES=libtddl.a
++noinst_LIBRARIES=libtddl.a
+ 
+ libtddl_a_SOURCES=tddl.c
+ libtddl_a_CFLAGS=-DAPPID=\"TCSD\ TDDL\" -I${top_srcdir}/src/include -fPIE -DPIE
+-- 
+2.26.2
+
diff --git a/app-crypt/trousers/trousers-0.3.14-r1.ebuild b/app-crypt/trousers/trousers-0.3.14-r1.ebuild
deleted file mode 100644
index b9fbfed67e72..000000000000
--- a/app-crypt/trousers/trousers-0.3.14-r1.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 autotools linux-info readme.gentoo-r1 systemd user udev
-
-DESCRIPTION="An open-source TCG Software Stack (TSS) v1.1 implementation"
-HOMEPAGE="http://trousers.sf.net"
-SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
-
-LICENSE="CPL-1.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~m68k ~ppc ppc64 ~s390 x86"
-IUSE="doc libressl selinux" # gtk
-
-# gtk support presently does NOT compile.
-#	gtk? ( >=x11-libs/gtk+-2 )
-
-DEPEND=">=dev-libs/glib-2
-	!libressl? ( >=dev-libs/openssl-0.9.7:0= )
-	libressl? ( dev-libs/libressl:0= )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-tcsd )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.3.13-nouseradd.patch"
-	"${FILESDIR}/${P}-libressl.patch"
-)
-
-DOCS="AUTHORS ChangeLog NICETOHAVES README TODO"
-
-DOC_CONTENTS="
-	If you have problems starting tcsd, please check permissions and
-	ownership on /dev/tpm* and ~tss/system.data
-"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	# Check for driver (not sure it can be an rdep, because ot depends on the
-	# version of virtual/linux-sources... Is that supported by portage?)
-	linux-info_pkg_setup
-	local tpm_kernel_version tpm_kernel_present tpm_module
-	kernel_is ge 2 6 12 && tpm_kernel_version="yes"
-	if linux_config_exists; then
-		linux_chkconfig_present TCG_TPM && tpm_kernel_present="yes"
-	else
-		ewarn "No kernel configuration could be found."
-	fi
-	has_version app-crypt/tpm-emulator && tpm_module="yes"
-	if [[ -n "${tpm_kernel_present}" ]]; then
-		einfo "Good, you seem to have in-kernel TPM support."
-	elif [[ -n "${tpm_module}" ]]; then
-		einfo "Good, you seem to have TPM support with the external module."
-		if [[ -n "${tpm_kernel_version}" ]]; then
-			elog
-			elog "Note that since you have a >=2.6.12 kernel, you could use"
-			elog "the in-kernel driver instead of (CONFIG_TCG_TPM)."
-		fi
-	elif [[ -n "${tpm_kernel_version}" ]]; then
-		eerror
-		eerror "To use this package, you will have to activate TPM support"
-		eerror "in your kernel configuration. That's at least CONFIG_TCG_TPM,"
-		eerror "plus probably a chip specific driver (like CONFIG_TCG_ATMEL)."
-		eerror
-	else
-		eerror
-		eerror "To use this package, you should install a TPM driver."
-		eerror "You can have the following options:"
-		eerror "  - install app-crypt/tpm-emulator"
-		eerror "  - switch to a >=2.6.12 kernel and compile the kernel module"
-		eerror
-	fi
-
-	# New user/group for the daemon
-	enewgroup tss
-	enewuser tss -1 -1 /var/lib/tpm tss
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# econf --with-gui=$(usex gtk gtk openssl)
-	econf --with-gui=openssl
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-
-	keepdir /var/lib/tpm
-	use doc && dodoc doc/*
-	newinitd "${FILESDIR}"/tcsd.initd tcsd
-	newconfd "${FILESDIR}"/tcsd.confd tcsd
-	systemd_dounit "${FILESDIR}"/tcsd.service
-	udev_dorules "${FILESDIR}"/61-trousers.rules
-	fowners tss:tss /var/lib/tpm
-	readme.gentoo_create_doc
-}
diff --git a/app-crypt/trousers/trousers-0.3.14-r2.ebuild b/app-crypt/trousers/trousers-0.3.14-r2.ebuild
index b62a9eb93452..a36ff6830733 100644
--- a/app-crypt/trousers/trousers-0.3.14-r2.ebuild
+++ b/app-crypt/trousers/trousers-0.3.14-r2.ebuild
@@ -30,6 +30,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.3.13-nouseradd.patch"
 	"${FILESDIR}/${P}-libressl.patch"
 	"${FILESDIR}/${P}-fno-common.patch"
+	"${FILESDIR}/${P}-Makefile.am-Mark-tddl.a-nodist.patch"
 )
 
 DOCS="AUTHORS ChangeLog NICETOHAVES README TODO"
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 67cfeac5e902..65c3cfa65914 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/pms/Manifest b/app-doc/pms/Manifest
index c53ccfb3ba5e..1c9d3394a5ca 100644
--- a/app-doc/pms/Manifest
+++ b/app-doc/pms/Manifest
@@ -2,7 +2,7 @@ AUX pms-5-Makefile.patch 1200 BLAKE2B d493382c48e9ee6eab2369ab32e04cc3eec48250c9
 AUX pms-7-Makefile.patch 564 BLAKE2B 048273a5f5a49d4df06277a22abd3ef37c9726c9c111e3fbcbe2f27726511d449c652c3883cac993defd934ffdffb364602c7738547875b77c2662126702e0fe SHA512 ecdd4f5e416ce547ec78dab8002292cdd7ce8be3f7910a7f241e8cd6e6ad1e38603832a4cea419dff2e84279edf25bcd5a9a0ded2ad9349be9c9682bf2932b64
 DIST pms-5.tar.xz 50284 BLAKE2B ecf3c34d79aa1439e0f0f4bca540b673440db04a7f533f103f5956f6a27e994ee42836ae2871c11fadf9230e2b5973d3d1db9e17167f886a6c929e533ece4d45 SHA512 560bdda40d4d1628e97b65bb354c349e3ac52edd1e337427adb0db61e99b40d214459a5046f4b505edfabc3914e2d585ef0453b13057a25fe138b8a5ebd6292e
 DIST pms-7_p20180430.tar.xz 60072 BLAKE2B 58afb1759c84ae86a1dd69aa04a6e8b799fd0cc1e1877cf1f6224f5b1bdbdfcdeaadcabbd9c37c263d62cb24b4164056a88d3524031d1704b059c376d5572101 SHA512 9bb64de842e0aa8f1a6488d12fffba76bfd190e53523e9261161467b30f001f20cddf593cd32e75ace4af309476eb7eb6966665d7ae9b54a5915237094110a47
-EBUILD pms-5_p20120920.ebuild 1306 BLAKE2B af5f8197314cee9a358c71813fb904bb633e1bb34643638a029962a7d28ce9d3a06dd41f05dd4213955342b293059dead8cde307c3b3ecf0f607403976819c3d SHA512 70baff7d7bf5b1e05f0ba0537ad4edf860f69425398b5df6dbda20ac827920788f1bf3f02b8096f22e457255f2b130b424c0984d4b39cab30564a9b2b455c6e7
-EBUILD pms-7_p20180430-r1.ebuild 1486 BLAKE2B f063c197a73010e65279c8ada30532a096ed042b8d5635c2e0b65a66d0bd05c281f60a12b68c52478c06e269b72436547ce11edd206699e60ae4aaa226e8082b SHA512 3734de5c5a3c9dcd7659d1111a713b8fe0a846eacf18509b1925fcfa12303d020c7fcf5b7caf601df1d2ee50ef52295a80a74f609757348c1dc6414d185867c7
-EBUILD pms-9999.ebuild 1233 BLAKE2B 0a96671e313a3f2a725c0d5f436587f30cb39b08c1fdbf3d4d2737abec4f24ca0abe2b96a76330d907feb3e52974c201287b9759b216f1a9150d7fbf9b7aa21c SHA512 1d0aee888971bb84bbf98036d44783f5f013c06fc209fb15362e89d899a32b97a2982ba31016cbca33bea9b8752e3b8f2f131cea05bbb4221bf8ee9d3a2e98af
+EBUILD pms-5_p20120920.ebuild 1354 BLAKE2B 984bfb3d8630cb093943533a471928fefbdcccd8b55e8a809f0b5ec36bbfdbe89dab9488456970b193d6625e8eaa3cc7111563fc9d2e60505d82f9231a1957ef SHA512 768365a14cfa63aff8387c60281f4383be3691fb84509046c9d213a4dc63390948caa8b72476355d7c74ebd0f2d6d745ec4a88374410a656939e2d05503df379
+EBUILD pms-7_p20180430-r1.ebuild 1522 BLAKE2B 3e5016bade1e8272007bc81502590e9fff8906e818da2a1648557c61299121369834bf7bc94550f21da594d7a2033d5303c850835756499b269330e80f91a2ce SHA512 7c70ed4b1a3792e54433acc4227d29dc2b9242b1f00a28498563a31cac8141d3e68d503923ea74588631a3268d75e1b0c1fd043ec4b6f26d6add1e0d21b598d8
+EBUILD pms-9999.ebuild 1283 BLAKE2B 002d1e54e2050e6ee188448e352de405ac1a062341022651aa6bae763c7d68be454a31642aaba39913c20a7ab92f13f79255c9855aca7e7414a96edfc592fb5b SHA512 0621e767a7c7f864b188bc63404d17f9d71a948c586c8c4a2cb5a18f421130303f27fd3cbd2670181d53a48f49b5e3c49d2aefee92495ee5bddf5c5d9837c6cd
 MISC metadata.xml 439 BLAKE2B 3d5b7ec10330bc77a6234beb03de1400af3a295b88e9f2382c76232e2519c944b8b518923d93d2a474e1b96cbd6801458814704b12f0b993165e802bc1fb9b7c SHA512 aa8e7627fb52d1a5357b7758f4cbdb74cef129b3cc45f48a8c58973141e5cea65c0007333fb8e388fd99de8606d8ca137e03f906f5c6e75df68f6eb96099949d
diff --git a/app-doc/pms/pms-5_p20120920.ebuild b/app-doc/pms/pms-5_p20120920.ebuild
index 51d0d7b9b25a..d75185939a57 100644
--- a/app-doc/pms/pms-5_p20120920.ebuild
+++ b/app-doc/pms/pms-5_p20120920.ebuild
@@ -13,7 +13,7 @@ SLOT="${PV#*_p}"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="html"
 
-BDEPEND="dev-tex/leaflet
+BDEPEND="|| ( >=dev-texlive/texlive-latexextra-2020-r1 dev-tex/leaflet )
 	dev-texlive/texlive-bibtexextra
 	dev-texlive/texlive-fontsrecommended
 	dev-texlive/texlive-latex
diff --git a/app-doc/pms/pms-7_p20180430-r1.ebuild b/app-doc/pms/pms-7_p20180430-r1.ebuild
index 975b3f69fc83..7e67fc19e371 100644
--- a/app-doc/pms/pms-7_p20180430-r1.ebuild
+++ b/app-doc/pms/pms-7_p20180430-r1.ebuild
@@ -12,11 +12,11 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="html twoside"
 
-# texlive-bibtexextra: plainurl.bst
-# texlive-latexextra: chngcntr, isodate, marginnote, paralist, tocbibind
-# texlive-mathscience: algorithm, algorithmic
-# leaflet used by eapi-cheatsheet
-BDEPEND="dev-tex/leaflet
+# texlive-bibtexextra for plainurl.bst
+# texlive-latexextra for chngcntr, isodate, leaflet, marginnote,
+#   paralist, tocbibind
+# texlive-mathscience for algorithm, algorithmic
+BDEPEND="|| ( >=dev-texlive/texlive-latexextra-2020-r1 dev-tex/leaflet )
 	dev-texlive/texlive-bibtexextra
 	dev-texlive/texlive-fontsrecommended
 	dev-texlive/texlive-latex
diff --git a/app-doc/pms/pms-9999.ebuild b/app-doc/pms/pms-9999.ebuild
index 001aee4fd9fb..5967acc1abcb 100644
--- a/app-doc/pms/pms-9999.ebuild
+++ b/app-doc/pms/pms-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
@@ -14,11 +14,11 @@ LICENSE="CC-BY-SA-3.0"
 SLOT="live"
 IUSE="html twoside"
 
-# leaflet: used by eapi-cheatsheet
-# tl-bibtexextra: unsrturl.bst
-# tl-latexextra: chngcntr, gitinfo2, isodate, marginnote, paralist, tocbibind
-# tl-mathscience: algorithm, algorithmic
-BDEPEND="dev-tex/leaflet
+# texlive-bibtexextra for unsrturl.bst
+# texlive-latexextra for chngcntr, gitinfo2, isodate, leaflet, marginnote,
+#   paralist, tocbibind
+# texlive-mathscience for algorithm, algorithmic
+BDEPEND="|| ( >=dev-texlive/texlive-latexextra-2020-r1 dev-tex/leaflet )
 	dev-texlive/texlive-bibtexextra
 	dev-texlive/texlive-fontsrecommended
 	dev-texlive/texlive-latex
diff --git a/app-doc/zeal/Manifest b/app-doc/zeal/Manifest
index 092a5926bef7..e97cddebf71f 100644
--- a/app-doc/zeal/Manifest
+++ b/app-doc/zeal/Manifest
@@ -3,4 +3,4 @@ AUX 0002-settings-disable-checking-for-updates-by-default.patch 1080 BLAKE2B 07b
 AUX zeal-0.6.1-qt-5.15.patch 683 BLAKE2B dbb965ede1a2dcaa53826b9986ef9191aadd7ea39464280f7194913ef72295cb4e16579f2b1ff8440c1970897134a1f822d7133ee7dad2eea52813bbaa03b938 SHA512 6e4eac48fa1fc0239228fa32cdc317921d1283b60a9bc9202c6630ed0dd1ed25b7ead7527b09b1657154235ed25ebd8b226784bbd9970e72038676e08c37c68d
 DIST zeal-0.6.1.tar.gz 1063963 BLAKE2B 72f38aac8275cea8da214962b568ff3f634c6c8499a73f506a6b63d947f87bb0b13bf6a0821d7803ccf09689744a79ebf8659ebe1d6ae07863662cb6a017c5ee SHA512 5b1a129980000c0fc8516e2c7d6c4a8de4adde7054ff8d9635e3be35441ad3ef0539746bbe1ca8abce7e6fb3d20c825b57661c3f8cd059ef1480db65ff81f3d9
 EBUILD zeal-0.6.1.ebuild 1097 BLAKE2B 6d17dc11a9c659dca5578bb88b0625cb05715d7652105525771f5e2118bf325d7b4e86e12c38394651dd42f78ec1b7e45b01cdbd28f043ce0bd7cfdb0c766260 SHA512 d48a38ba167819fe1cd1156407dac0cda4a70dc91cd8991267059c9376dca094bcb237629eef164df627041a7b58c4edc74907d8c0f5bfe580ce5841bc1eda61
-MISC metadata.xml 343 BLAKE2B eb010ce88edcf15d87348b5170ca84d46d96d975ff459b4467428af5b75a95bc9e6c6d1245119907b5833f9a2ad2060adf41ba9aa884a5b846c1441241eaf8ba SHA512 a51b0043a255567189cb7ba1247cd6e9427292e7dbb3bc4f33d6c00acb3bf158bce6a7db1262275899b2b55806cfcb71e53a365aa25f05e259d497d5f028074f
+MISC metadata.xml 248 BLAKE2B 1aab3497019b5dbc0563a1c5d3b36895673a4e01b83c65f0bc6c59f155be25e3c9f1dfd6fc5043b237cdfae57a3525c948683514752c27eb5240f94a978f2177 SHA512 437593c3c8e8a5de6bb06fc44ad03380f187808ec08c7dfdc478f3b1d815ca6b79fdc818473c6d3a8f909714b6d2f51a5bb63c9f5f7e54501d99a5baa30b6a21
diff --git a/app-doc/zeal/metadata.xml b/app-doc/zeal/metadata.xml
index bd4216dd2955..73826b939e4b 100644
--- a/app-doc/zeal/metadata.xml
+++ b/app-doc/zeal/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>tranquility@gentoo.org</email>
-    <name>Ole Reifschneider</name>
-  </maintainer>
+  <!--maintainer-needed-->
   <upstream>
     <remote-id type="github">zealdocs/zeal</remote-id>
   </upstream>
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 1c67363f680b..58e822deeeb6 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/e3/Manifest b/app-editors/e3/Manifest
index 70329f82323b..c9b1af064742 100644
--- a/app-editors/e3/Manifest
+++ b/app-editors/e3/Manifest
@@ -1,4 +1,4 @@
-AUX e3-2.8.2-makefile.patch 936 BLAKE2B cd06fbaa470d50fbd971b8925d6813ae5040f3826ada652d891e0d5bd3850a0c8136c13b461426115abbefe2c4e5a87d8443ef6471209833972c2ac9f3516dcf SHA512 77fbe6345d0d9285d3e46458c34b09b08e112db1851626ada6aa31aec3a3115a15d3a4a62c78689b228cbbf06a9e4252b85594785a9310461fe5b19c2aeb8112
+AUX e3-2.8.2-makefile.patch 897 BLAKE2B e93fb544396a6f4e6b0abb0f57124e42ad66c2b9fbb13886498e091ff73bc60c4f1779cbd14c52b800a0579a905fa908423f790b6309d3664ba4a41d5340d857 SHA512 0929387f75bd2d933f030ed319191dbba781564d47f36788bd7ec6ecfffa4bccb367691edbbf9b8241b4905b6cafe7ebc7a5b3e6951765f91ade20962bd54f4a
 DIST e3-2.82.tgz 115504 BLAKE2B 09edea9063657373cf6d7d9d8290dddf17b8fb516538d89b83462176127b8b43832bd81f326eec5504116f05ab780023832b8b5d41d72e3ab8e726d89e364a36 SHA512 07c7e40d26879871b60d7e89839805d779383dbaabe42a6a3a7047fa8a4c501c4cd0cdc828a9d29d4ac1c5b949bda07946d8e71e1320c6c303ffce88a3038547
-EBUILD e3-2.8.2.ebuild 881 BLAKE2B 66552a5b2346ff6685025e570dfb5ba6fa2d5dbb315283c4cd239c2cf8d7115a8e23f2b7b73ec99e0fb0058af6e46d98f11018e5b831073148fd96bf5884537b SHA512 65b7d9b207e0bacb5b187dc5478f90fa92037b6980704a67ed515c3103c76a2a750fec42e61cebce37e1a1a1ff6705e34f2187e8db8e938f61c15300062414b9
+EBUILD e3-2.8.2.ebuild 875 BLAKE2B 366b34b1700c36805e2bc2ccd03665242ffbe4c5adb41fda3daee0f52a89fb7db5aa3111c02e4d0aa291497880b206da76d5c8edcbdc63a0a559abb0dc92b9b6 SHA512 dd1eceb5267542660675b77a5ef15ee13cbe5d5200ef1fcd3c4aa00ef6b183b38fff728d4c87b83c0f9941c8e928a11f67b0ce9d3208f26d1aa8c1cd80f8abb9
 MISC metadata.xml 918 BLAKE2B a0bd5163da7fe48664cc720d60b08c11af32234b0b265a8e2cca6d980a3af3b29ad223fdd5a81886ea3b528875fadd0520650a463894040b2f48ad00eabdf8c6 SHA512 9e8d5b6557a492d39c79c06507ea3ee670729e315cee2456e595d53f88178801b629595ac8903ac70878a63e85b46e934c761d70fef328fdfddc78e0c7416f4d
diff --git a/app-editors/e3/e3-2.8.2.ebuild b/app-editors/e3/e3-2.8.2.ebuild
index b554e85be62a..b6a0ab831345 100644
--- a/app-editors/e3/e3-2.8.2.ebuild
+++ b/app-editors/e3/e3-2.8.2.ebuild
@@ -13,7 +13,6 @@ SRC_URI="https://sites.google.com/site/e3editor/Home/${MY_P}.tgz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
-RESTRICT="strip"
 
 BDEPEND=">=dev-lang/nasm-2.09.04"
 
@@ -22,7 +21,7 @@ PATCHES=("${FILESDIR}"/${P}-makefile.patch)
 QA_FLAGS_IGNORED="/usr/bin/e3"	#726484
 
 src_compile() {
-	emake -- $(usex amd64 64 32) LD="$(tc-getLD)"
+	emake -- $(usex amd64 64 32) LD="$(tc-getLD)" DEBUG=true
 }
 
 src_install() {
diff --git a/app-editors/e3/files/e3-2.8.2-makefile.patch b/app-editors/e3/files/e3-2.8.2-makefile.patch
index 5a22ff67e09d..b37381ef2e28 100644
--- a/app-editors/e3/files/e3-2.8.2-makefile.patch
+++ b/app-editors/e3/files/e3-2.8.2-makefile.patch
@@ -30,7 +30,7 @@
  	cat e3.asm | sed -f e3_32to64.sed  >e3.tmp
  	$(ASSEMBLER64)
 -	ld -b elf64-x86-64 --oformat elf64-x86-64 -o e3 e3.o
-+	$(LD) -b elf64-x86-64 --oformat elf64-x86-64 -o e3 e3.o
++	$(LD) -o e3 e3.o
  ifneq	($(DEBUG),true)
  	strip e3
  endif
diff --git a/app-editors/elvis/Manifest b/app-editors/elvis/Manifest
index 652c43bebe7e..924e74b54bb8 100644
--- a/app-editors/elvis/Manifest
+++ b/app-editors/elvis/Manifest
@@ -4,5 +4,5 @@ AUX ft2.3-symbol-collision-fix.patch 2396 BLAKE2B a890da27b23700d2f6def41ab0a567
 DIST elvis-2.2_0.tar.gz 1439293 BLAKE2B c061370a3a9a9d24bcdba65f1d16b5b8d7dd6a5a9e777949c80862f8e9ce879dac6685f625c0fd86cae26efbbf58277d9626be2f4e513d1b1bed131cc60eb95d SHA512 847cc9ac0af170798abd4725f7dc2ec74d4931fb761b58836d4016d36da5657176bd8cdcdae02bc08438b18e8ce2433eb3340ec2503630fd2992e83ba06adf42
 EBUILD elvis-2.2.0-r6.ebuild 2396 BLAKE2B 71087c0bd2645274858e326a156564676b8d6a02d831a6f57df66131acd789268b08ff0251cf456bff056db10ac9a81ae62a802d31df995a2c31693b4077aa3a SHA512 3c2823dd77b31453b1e06f7741f21ab31ae3f80ea5b15b4771f6ee069a7d54c7bb65fd47028cd3782bda9c1fd3ae7f4d865542a51031bd13595850cf2ca86aca
 EBUILD elvis-2.2.0-r7.ebuild 2404 BLAKE2B cddb49ebd101377d79fcccfb16a5b7a890c6aa142c243132d3098de6798d6f2b6459a42416a76a77ed41d1186ddd9195e2f8faafbb80428bede79652080349ff SHA512 a407b19a0366335de2ae650a7a2d38f9abc6b10a2c5e0e69fc73fcf75ce7cdcb19d12112dec567c2274cec2e33a1998a138b49f8477a8f0f7e847a11b7b54bfc
-EBUILD elvis-2.2.0-r8.ebuild 2484 BLAKE2B 6498d6c0aef75570cf9e4b836bfae0e0eec362cf0cb6e12512e0ad97e450d31c10b8fc0d02c0e9b13c7ec89304c0cd2f21261eca9e6e0a14d316b4ebd146b25b SHA512 f1fa68d3551262e4eda6a30ccef290419fd495845aa853292c0388a2d57ea4d062b3ca49c43b2489cda049d23188be831e3637279bcc2091e6082a61430c0608
+EBUILD elvis-2.2.0-r8.ebuild 2520 BLAKE2B 09f8f2c61646abfbe33ec06f5757fa0da6b925b5efdff5a9cd15128931d526340cf65737cdbba5bb5f19ea54d847a8d90262b2db6f2a82feece2f855656c76a1 SHA512 5a008dab4430c6a0efa2cee4d8d03aec5fb0e438b2086bdd6ee9098eb2f0c35bdde986c0831c13159ec4109f96e464bc08651477ad4ad8929689a964606d5ed4
 MISC metadata.xml 245 BLAKE2B d4f5ef381d0a479a17bfde792cd6828e5fa0ecdd26732c1a13c97fcae2f22396b879fb430aaea7680920d5ba897f78cfbb6e50bb2f65165613a5a0ba1f7dc609 SHA512 6d6d35ccbb839c939bc663cecb55e2178f5fd4e455ee3088b8847416d558dd3e7969f4c78bc445ff29503d6906fec12d302d7249e9adc8cb708d0790e681e5a2
diff --git a/app-editors/elvis/elvis-2.2.0-r8.ebuild b/app-editors/elvis/elvis-2.2.0-r8.ebuild
index 4ac39947e0d6..d5c65e2ef429 100644
--- a/app-editors/elvis/elvis-2.2.0-r8.ebuild
+++ b/app-editors/elvis/elvis-2.2.0-r8.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
@@ -40,6 +40,7 @@ PATCHES=(
 )
 
 src_configure() {
+	export CC="$(tc-getCC)"
 	./configure \
 		--libs="$($(tc-getPKG_CONFIG) --libs ncurses)" \
 		--prefix="${EPREFIX}"/usr \
@@ -51,7 +52,8 @@ src_configure() {
 
 	# Some Makefile fixups (must happen after configure)
 	# Use our CFLAGS
-	sed -i -e "s:gcc -O2:$(tc-getCC) ${CFLAGS}:" Makefile || die "sed 1 failed"
+	sed -e "s#^CFLAGS=\(.*\)#CFLAGS=\1 ${CFLAGS}#g;" -i Makefile || \
+		die "sed 1 failed"
 
 	# We'll install the man-pages ourselves
 	sed -i -e '/^	sh instman.sh/d' Makefile || die "sed 2 failed"
diff --git a/app-editors/hteditor/Manifest b/app-editors/hteditor/Manifest
index 5dd25b899f54..44f3505f69b2 100644
--- a/app-editors/hteditor/Manifest
+++ b/app-editors/hteditor/Manifest
@@ -5,5 +5,5 @@ AUX hteditor-2.1.0-gcc-6-uchar.patch 1443 BLAKE2B e08ca71c4c0499f8344174ea09fa32
 AUX hteditor-2.1.0-gcc-7.patch 724 BLAKE2B 030fe4de475ce4b140f5dcee8cb0268bb0b6dc19f1e50b94cf0f3b8f0546d462025ca30a1a75acc16f7560c9318efaa8adeb6a29c33789c304c97512b31994c5 SHA512 afdc2fef1c05a225e9a8e8d4ccd25a8b1912ff6532dd09a320f6df031edb732d9b9b99fb77f39cd41ccc45fd9818fae1b802ca1831669a0e2825b59094094de9
 AUX hteditor-2.1.0-tinfo.patch 176 BLAKE2B 936f60f54424b9d69986b7b9564abd3c5de2a321611e66e386aac47ea504f7a40d3c6614f4430a70052b39dcdf68f4540cf1ae4a2dd0a4b237857cd611bbf8fe SHA512 1800a7010f0d94da473bd10e3ab36bea2b99c2d9b78b01f0c3ce7c35d2f9ee33eb3da9a2b091482f213136f23c97bc3afd9a10f59c7e56b36817cb5ba34f4c36
 DIST ht-2.1.0.tar.bz2 884139 BLAKE2B c979563cbfc4df7e14f587b250fbf099d9f4683afddb3afc88693284c378c45466dfa3c47555fc69e83e2972cfabab63f3cdd42fd85602842854372131e4063d SHA512 6b5fc5fcbc63b9b7c85721158e044e4578ebfdc38618c760c0e6de06a276bccd3a960ab8bed172de788934515ad94d86349c4abd3228da66b1601deaaa2ce410
-EBUILD hteditor-2.1.0-r1.ebuild 1189 BLAKE2B 9f8d20d19df3f7d853e2a6a7fa132a595ebbad5ff0837d247f2ed14cc886e0e517d72ad7dbbb200aecb23f3154cd308761615237c054d3edd1785ff9c98fa324 SHA512 8a2e8a8271926882de6f878aee001c54324730c621a1a83d32fed7c3c4ebddd65fd2ee3e83250e1e60ea7626c472236d42e98258b32ee59778ceaa9b9bf0e793
+EBUILD hteditor-2.1.0-r1.ebuild 1414 BLAKE2B 6baa7517d6218432641a95c1c79a865b0f1f63b9fcb06571f9fe0414a903194e943b1d4c5c200ee5363a0cad84fc3c24a1e5fafd166d73922cda0e16dd7ab153 SHA512 12f147751d3da898d9336e34fa795bbe3a315ab430995af6c47ea8babacb61b386ebf0186e6cc18f8db93f9e5a03e5873073c49fb79afa9192898cb3882d1be8
 MISC metadata.xml 464 BLAKE2B 7fdb5c881881e21f4a74db09bf905c4d0aebdb5077598916186266ca12dca891c1619ce550a37ac3400ef92138ff2521dffd91c25bf254d8e49e0b628ea7ebca SHA512 b08be8368d7459a56096769aec6cdb6607225968b87ac12d22c788081287d16345060f071c09c0d505a8caffcb5de9378328250758b13c9229eb1fc5c10a8388
diff --git a/app-editors/hteditor/hteditor-2.1.0-r1.ebuild b/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
index 16a7ab4322f0..5b912857bc6f 100644
--- a/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
+++ b/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
 
 MY_P=${P/editor}
 
@@ -39,6 +39,12 @@ PATCHES=(
 src_prepare() {
 	default
 	eautoreconf
+
+	# Many literals are concatenated with macro definitions.
+	# Instead of patching them all let's pick old c++ standard
+	# and port to c++11 upstream.
+	# https://bugs.gentoo.org/729252
+	append-cxxflags -std=c++98
 }
 
 src_configure() {
diff --git a/app-editors/jasspa-microemacs/Manifest b/app-editors/jasspa-microemacs/Manifest
index 59a10f2f7b3f..fa937eec45ed 100644
--- a/app-editors/jasspa-microemacs/Manifest
+++ b/app-editors/jasspa-microemacs/Manifest
@@ -1,3 +1,4 @@
+AUX 20091011-cc-detect.patch 1002 BLAKE2B 9141e32930c9c433a7a682079a961511fd6e1e83f87d0fee17fcc181d88a6daafeacb634f47684de6f81796ae864da0e9ec3fbb1024aa8e665fed96eb571ead9 SHA512 9742c8050dfd724a6224158420ac3c60d3c5dab5ea7b5a3af454a2c63aa11c05e2c2b0f6ff24159e371f62b8faaab22c5d3740dca0a8f7ee19aab4bb77a02509
 AUX 20091011-linux3.patch 723 BLAKE2B 924852d26fc148c124e51e7d392d2a38482022b30bb1ad31e92ce12dd6efb97a154b7c05b8590788d4a4839c4de0bddb4f5576addf9cd64ac9d4511c6197801c SHA512 c3b0246cc83c6840b59b46cbd25ebe1f9364a029f555f916dbc3ca38d8e490514a9dfc9ae8748e751e49cc9a1f3be89af30d0fab95d35486d32cf87fec93431c
 AUX 20091011-ncurses.patch 583 BLAKE2B eaf5eafcfb9fbe6a889b64fcfe895016ec25d8be63975600c11e9cfb889b42b6d03426e1d574bf65899fd5bac00d0fd49a838c1d57e7ab7e3c2cb172664206af SHA512 d2a4ca646e825a9c517ed075205609d141f94735c9bba2f23f5c94ced05b9290e6e24a718d7e8cfbcad77663a6c07f311a387363e8737cb1cb4fc81cf34e9a22
 AUX jasspa-microemacs.desktop 282 BLAKE2B 4c881a43ab13c3043555bbced246aefd463247c467974f4c449d26f3d4db9e91fc47448afae30b478b6d0053da74d07e44f25f08a1e310c4072c45ddc63725e8 SHA512 e55698b2faf0a5a8fbb04e837400ab0d9be00d50ab20fd3d84718edf75a4bedef1155f04654ea1d491c3b456f1bf047e4b90f05efb0702deeb2f496c9ad091d2
@@ -5,5 +6,5 @@ DIST jasspa-mehtml-20091011.tar.gz 628008 BLAKE2B 97c8326e7acfdc4bc4ddd2ef6bbcf0
 DIST jasspa-memacros-20091017.tar.gz 1105437 BLAKE2B 0a74715db55498fed646f209a9121a96c673cb34c487968c4f838bacf6404db717fbd8392d26f8fa120174923724af91e4a14bda088bf229765d1e99c785d8ba SHA512 08908acac4dbe56695362172dabe621b8cca77a35da599c6cf5b4e87700c03f4ee190ca12d5c69b2d88c623cec527daac0980dec2ed713ff563e88ebe636a725
 DIST jasspa-mesrc-20091011.tar.gz 810128 BLAKE2B ce627dab7cf4ec09b099e755c3eb17e773c64fbff60741244cdb134ee1555ffff592ef3684eecae72d5da36c10cd7caa23a03112154c616ad3c7667d913354b4 SHA512 60cc5a83b3cafd8e517f88732dc94feb0329b962bc714eaa5616ba89776fbfac41833be88fd3a666443291184086494434fb8763747c1dc5e216ce793b694b68
 DIST meicons-extra.tar.gz 43345 BLAKE2B 5b3d6e8a76604364d8e5464ba764aec96d822054c02bffed4cd763f7691f78bc3455904cd06d89ddcf8a0861134ada3c7d228751d4f3685e6700ebfc3dda2354 SHA512 bb6879fb12ec1c7b346bc1df2412a837ffdd0569f6be2800a433307a7736bb31798b3c2a71e02cebdce39c59d93d1a986f80c92184604e4292606c98285fe02a
-EBUILD jasspa-microemacs-20091011-r3.ebuild 2276 BLAKE2B e9ba6dbc37f281d0d2f413dccdfe07d425d24b7e126ba340c18d262abc863b8b1e9582ff5feaaf2edc08476dc2b62457dcb749cfda862d66c098455cc571559e SHA512 180227bc3c5d549d29cc28a6bdb7aa398baf55522329244cf381763a22c8fc00cdb16226b18c40ef5405a5035ad1f9a4c0e08953198591197591e0c756ef4711
+EBUILD jasspa-microemacs-20091011-r3.ebuild 2313 BLAKE2B cbc697d1f7ea0900d3c0042e29729af2b5528d9cf73da4458908e18db43dc697c9a9b9912625337db2c71a5ebbbccb51cfc5559c4bd119f9ccc1027eb62ecaac SHA512 1d3ba93a4ced2ba2b4be6e36a8b8709e653854d80b21f3d8965d596c391369f8de0a5cade2f19376d3d22dbb3bcdb1104a3f25222549f7f154a0b740d6718eb9
 MISC metadata.xml 1094 BLAKE2B 9983b2ebf7f9d7a979180ea0d4aa063ace2fa5a3a630339bb8112a8691eb6b46964d298d9b49c2d02b2dba2750e501b5740de2242da00abc4b24ba08af8d7fb1 SHA512 2116ed586b24da86206c4d38977c118bcf2381d455a3cd0fb9d672f8d709b5113fe4c8767e2d2f20f8c879a71f0e6bfb6384b9efe30cba82e177fa75dc4e0d6a
diff --git a/app-editors/jasspa-microemacs/files/20091011-cc-detect.patch b/app-editors/jasspa-microemacs/files/20091011-cc-detect.patch
new file mode 100644
index 000000000000..123d78c895ff
--- /dev/null
+++ b/app-editors/jasspa-microemacs/files/20091011-cc-detect.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/729258
+
+--- me091011-orig/src/build
++++ me091011/src/build
+@@ -158,12 +158,8 @@
+         exit 1
+     fi
+ 
+-    # use cc by default if available
+     if [ -r $MAKEBAS.mak ] ; then
+-        # try to detect cc, if found use it in preference
+-        if [ "`type cc | cut -b 1-5`" = "cc is" ] ; then
+-            MAKEFILE=$MAKEBAS.mak
+-        fi
++        MAKEFILE=$MAKEBAS.mak
+         # Special rules for sun, if cc is /usr/ucb then this is a dummy.
+         if [ $PLATFORM = "SunOS" ] ; then 
+             WHATCC=`/usr/bin/which cc`
+@@ -173,12 +169,8 @@
+         fi                      
+     fi
+     if [ -z "$MAKEFILE" ] ; then
+-        # failed to find cc, try gcc
+         if [ -r $MAKEBAS.gmk ] ; then
+-            # try to detect gcc, if found use it in preference
+-            if [ "`type gcc | cut -b 1-6`" = "gcc is" ] ; then
+-                MAKEFILE=$MAKEBAS.gmk
+-            fi
++            MAKEFILE=$MAKEBAS.gmk
+         fi
+     fi
+     if [ -z "$MAKEFILE" ] ; then
diff --git a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild
index 27f5e8a43037..e41568ee3659 100644
--- a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild
+++ b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-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=6
@@ -37,6 +37,7 @@ S="${WORKDIR}/me${PV:2}"
 PATCHES=(
 	"${FILESDIR}"/${PV}-ncurses.patch
 	"${FILESDIR}"/${PV}-linux3.patch
+	"${FILESDIR}"/${PV}-cc-detect.patch
 )
 
 src_unpack() {
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index 14b294cb800d..7ebc8c7bd4d1 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -4,4 +4,4 @@ DIST mg-20200215.tar.gz 152254 BLAKE2B 89e47aaa94fd95b9409a53b09c9017e26d3f1cc73
 EBUILD mg-20171014.ebuild 1023 BLAKE2B a6b86a471504c94104f4b4174cecfe878104b8d3d18ee6e5b5d005e7c19ce03582e68f6306ff8190f4e0bddcf84b223fd1d2d7b3d923c82c6f794daa0c370000 SHA512 845d09a9e38d0315cc0c2383aa3d65770b73c6dd8a494acb32c471b82d5243072236324a5428ca5a9a6200b75b0fe7a8366c4a94bed2c0f48d683ef36ad8628c
 EBUILD mg-20180408.ebuild 1039 BLAKE2B 1b1c3ad8fd0373d8dd16ddf0a12747f06abb028bc205a6064f50f711ad8fef8a135df1e4b87cb4835656d9ac9834cd2194b83ffe56fbba74e8a6d616dbba3fae SHA512 2acc555ba564b5c9a11bab563847762bb1f726f750a25387b24f282af906c22cf49db2b6912b116dba81f3715e7baa736a57375413d2ac62f2a446e332f124ff
 EBUILD mg-20200215.ebuild 1039 BLAKE2B 1b1c3ad8fd0373d8dd16ddf0a12747f06abb028bc205a6064f50f711ad8fef8a135df1e4b87cb4835656d9ac9834cd2194b83ffe56fbba74e8a6d616dbba3fae SHA512 2acc555ba564b5c9a11bab563847762bb1f726f750a25387b24f282af906c22cf49db2b6912b116dba81f3715e7baa736a57375413d2ac62f2a446e332f124ff
-MISC metadata.xml 384 BLAKE2B 86ad99174028addfaef8bb9f143949161c8d1d81f2e946b3aa9088bd644b61ce97869d0a0b669abcff56e925fe8757d77f6123a2dfe340b8620db2ae84ba0b55 SHA512 70e2db47bef37d81a3842797ea0e12081e697b6e06bd25fbecfb64acf58b80e60a0c31508bf1c93879734af0921a47654fd489f08301b2517757741e0c6d25cf
+MISC metadata.xml 618 BLAKE2B d6aa73580d4aebe2a43f227c56df586058260eb53bc7b09e3cd9355526bcb32bad3c92c2ba20aaa8da9e96634d43b1385921e2f9ef77168e3089eed64b9e7d45 SHA512 a61abb9ef37a2e1d8e04d3476b2ba85e66f1e6287bb81c3d2ba71c7b1022c8e025fbe4f1b46dcef27d38b5f28a75e569608e7b9d5e9b504c8d405680cd764a4d
diff --git a/app-editors/mg/metadata.xml b/app-editors/mg/metadata.xml
index 00486d5abd44..156c5660d642 100644
--- a/app-editors/mg/metadata.xml
+++ b/app-editors/mg/metadata.xml
@@ -6,7 +6,11 @@
   <name>Gentoo Emacs project</name>
 </maintainer>
 <longdescription>
-  mg is Micro GNU/emacs, this is a portable version of the mg maintained by
-  the OpenBSD team.
+  Mg (mg) is intended to be a small, fast, and portable editor for
+  people who can't (or don't want to) run real Emacs for one reason
+  or another. It is compatible with GNU Emacs because there shouldn't
+  be any reason to learn more than one Emacs flavor.
+
+  This is a portable version of the Mg maintained by the OpenBSD team.
 </longdescription>
 </pkgmetadata>
diff --git a/app-editors/teco/Manifest b/app-editors/teco/Manifest
index ea73e676c71a..a8114c1b9ae1 100644
--- a/app-editors/teco/Manifest
+++ b/app-editors/teco/Manifest
@@ -1,8 +1,9 @@
 AUX teco-double-free.patch 907 BLAKE2B 4be36191ed98cd9c210ff523dac796ec7a78697abcbb776ccff526cc1172e2bf6e5da0387df65e70020cbc7041ef6e7ca66245fb886fafe78b5d0f1e67e7ebc0 SHA512 01711be1a61217ed3040f3b13fbcaf52160118c90251098bdf65efe1551a3198ff41228bd9895be7f55e11344858898276f162cff1e207595e3f5e6dfef507ba
 AUX teco-gcc4.patch 294 BLAKE2B b09e7058029fb3d2fe2ded138ab92389f412cdc9613ae30eb3fd5b050f95e6efd48016e8f816a67d25b7d813e1ac2b813c20d60ac240b9138d635d958c7bc10f SHA512 ed7cf0fbe3a13dfb310be93460e07dcff50773ff1d0a1b5e3cfb304ecf5ef972243a7d3e7d429c743478b5cc2942a9ec562a25c1504324f59045685e69611d2b
 AUX teco-no-common.patch 289 BLAKE2B ce84e9132f53b0b465ab1118ef53246d83188f9c6b38ff617a63e52e91f2443ee718e495dceb9d32d8bc81b381923fbad5e837f9fb57474bcf98466244d821f3 SHA512 f0059e69090c345925e1ce50d9074d7c7d0e692e2d529233538cb640bb6705b0c27901ee4d780e2b99500f604e17f521db5a39e2a518396514631ee6c6bd05d7
+AUX teco-void-functions.patch 12115 BLAKE2B f72d87f9ae2a03d7b83aed09c009c05fbe89f80101fb9c62ec4273bdf347a554c0bbe80d9c0742c8d3afbcd176c16338641ca0a773ba731d711d4a5d85375b08 SHA512 27568f730408a6ed3d9cb02c32065a53c2b1f3f469824dc4d2c8e69444f190e266b5c396a8284f191880f59ab1ebd2e4422ba9bee716b96ac2f53a9befc56f9b
 AUX teco-warnings.patch 1206 BLAKE2B f9f8312c66e506d86cdd7544288965927895822eac3ad6f49dd0f1280ddc72f9d2cb2c6e4e7eca7c36c435677559e25bd4c9f6816a9e41816d23a39d64ee445b SHA512 7294ef66917eb549d9437327b32160317313d343c731423e34a07ed407e5595e7ac52d57c55bc1e5c6732f5ed0840533aa9c546ee32f4ea2bef54adf5a91b249
 DIST teco-36_p19940820.tar.gz 61305 BLAKE2B 9bb15fcb20948dbcac1928e32b4ac69c4861be3b0c01d5be68836138d9478e71cc0dd5198d9ac6816245605c34f8b21fcd4e62c48c097e56cd585579df119939 SHA512 686b3944a82d088a2fce12a9b770f4aa5f58aaadde064b3d3342114f0ece2d7cbae27d0e92fd026def6f62a3ff0dc82b37146e30a93b2ec195dc7f376b45fdf7
 DIST tecodoc.tar.gz 154109 BLAKE2B 70b9cd99281ab6180e4c13845f3fc97ccd6c142b4b9a3454ac9dcf189e2a65bfaf9b033312aeb9773301ff4d2ec166f79d587f79158b2b0f3f985f77b06f86c1 SHA512 1819450a08e296bdd3d4c282d9a9c7c58203acf82a67bdc9713b0cdfa2d0c4aa046c86ee4ee6f3b2d9ef0f3052705a13dd3d8afbf372bd3b1be8d4c5e8e96fef
-EBUILD teco-36_p19940820.ebuild 1496 BLAKE2B e6ab0702aa988e1323ff018dce667cd482848e6feaa34600faa33158fdbea82f447db576c46160c2cfd41314c857864f274693be722236e543dd543d8a3cb1e6 SHA512 dd772f5da48194e7b48115a05235b526a225bb41ae274f6a53aac4db2e3eb0a96b16078c2cd3721c1c4c020cdfb8b60790566c5090b0983eef7ba4fdf8c0addb
+EBUILD teco-36_p19940820.ebuild 1538 BLAKE2B 41ed663d279ca03df2e125f02b29f66b63c3e722942717a6b2cff570d03d79422b05521e887286920d8c422f43b85bcc05998bf49f2bed6b6cc1200fdae9b35b SHA512 0560fc4a55badd2b184d5971014fe45f59b5258e99016370f836e4736b08c9e6a53b1408a12ddbe0792863675b472cc9d98eb8ca79bfb7ecb4fdf0fd64f8c5c6
 MISC metadata.xml 1356 BLAKE2B a433a260d80042f9a4e034f93e94793b8ae3e9725d44cf4369f5baf506d6dcf9be045d3a4ccbefa842004c8bccd629d55f947ef591ce37a662c4199d4f27f2ca SHA512 3e8680b16e6de3e239f453d13d4b0cb41545aace84af0e9cf8103c0f605cec29467bb0b5feebd592dbded84cd109360c42f63da69115870fb57c97f8137dfdc0
diff --git a/app-editors/teco/files/teco-void-functions.patch b/app-editors/teco/files/teco-void-functions.patch
new file mode 100644
index 000000000000..f8a1d7ad346e
--- /dev/null
+++ b/app-editors/teco/files/teco-void-functions.patch
@@ -0,0 +1,536 @@
+https://bugs.gentoo.org/729254
+
+--- teco-orig/te_chario.c
++++ teco/te_chario.c
+@@ -24,6 +24,8 @@
+ #define SIGINTMASK 2
+ #endif
+ 
++void crlf(), type_char();
++
+ int lf_sw;                                  /* nonzero: make up a LF following an entered CR */
+ int ttyflags;                               /* flags for (stdin) file descriptor */
+ #ifndef _POSIX_SOURCE
+@@ -44,6 +46,7 @@
+ /* operation; normal mode is none of the above.  TTY_OFF and TTY_ON do this     */
+ /* absolutely; TTY_SUSP and TTY_RESUME use saved signal status.                 */
+ 
++void
+ setup_tty(arg)
+     int arg;
+     {
+@@ -213,6 +216,7 @@
+ #ifdef _POSIX_SOURCE
+ sigset_t  oldmask;
+ 
++void
+ block_inter(func)
+     int func;
+     {
+@@ -313,6 +317,7 @@
+ 
+ /* type a crlf */
+ 
++void
+ crlf()
+     {
+     type_char(CR);
+@@ -340,6 +345,7 @@
+ 
+ /* routine to type one character */
+ 
++void
+ type_char(c)
+     char c;
+     {
+--- teco-orig/te_defs.h
++++ teco/te_defs.h
+@@ -320,7 +320,7 @@
+ extern char mapch[], mapch_l[];         /* char mapping tables              */
+ extern unsigned char spec_chars[];      /* special character table          */
+ 
+-extern char skipto(), find_endcond(), getcmdc(), getcmdc0();    /* routines that return chars */
++extern char skipto(), getcmdc(), getcmdc0();    /* routines that return chars */
+ 
+ extern FILE *eisw;                      /* indirect command file pointer    */
+ extern FILE *fopen();
+--- teco-orig/te_exec0.c
++++ teco/te_exec0.c
+@@ -8,6 +8,7 @@
+ #include <time.h>
+ #include <sys/time.h>
+ 
++void
+ exec_cmdstr()
+     {
+     char c;
+--- teco-orig/te_exec1.c
++++ teco/te_exec1.c
+@@ -6,6 +6,7 @@
+ /* version for multiple buffers  04/13/89 15.55                             */
+ #include "te_defs.h"
+ 
++void
+ exec_cmds1()
+     {
+     char command;                   /* command character */
+--- teco-orig/te_exec2.c
++++ teco/te_exec2.c
+@@ -12,6 +12,9 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
++void do_en_next(), set_var(), write_file(), write_stream();
++void kill_output(), pop_iteration(), find_enditer(), find_endcond();
++
+ struct qh oldcstring;                       /* hold command string during ei */
+ 
+ /* file stuff for input/output files */
+@@ -26,6 +29,7 @@
+ 
+ /* process E commands */
+ 
++void
+ do_e()
+     {
+     char c;                         /* temps */
+@@ -567,6 +571,7 @@
+ 
+ /* routine to get next file spec from "EN" list into filespec buffer */
+ 
++void
+ do_en_next()
+     {
+     char c;
+@@ -669,6 +674,7 @@
+ 
+ /* fetch or set variable */
+ 
++void
+ set_var(arg)
+     int *arg;           /* argument is pointer to variable */
+     {
+@@ -764,6 +770,7 @@
+ /* arguments are qp to start of text, number of characters, */
+ /* and an "append FF" switch                                */
+ 
++void
+ write_file(wbuff, nchars, ffsw)
+     struct qp *wbuff;
+     int nchars, ffsw;
+@@ -779,6 +786,7 @@
+ /* Unix processes.  Arguments wbuff, nchars as above; file  */
+ /* is stream pointer, crlf_sw zero converts CRLF to LF      */
+ 
++void
+ write_stream(file, wbuff, nchars, crlf_sw)
+     FILE *file;
+     struct qp *wbuff;
+@@ -809,6 +817,7 @@
+ 
+ /* routine to kill output file: argument is pointer to an output file structure */
+ 
++void
+ kill_output(outptr)
+     struct outfiledata *outptr;
+     {
+@@ -825,6 +834,7 @@
+ 
+ char panic_name[] = "TECO_SAVED.tmp";           /* name of file created to save buffer */
+ 
++void
+ panic()
+     {
+     if (!outfile->fd && pbuff->z) outfile->fd = fopen(panic_name, "w"); /* if buffer nonempty and no file open, make one */
+@@ -838,6 +848,7 @@
+ 
+ /* do "F" commands */
+ 
++void
+ do_f()
+     {
+     struct buffcell *delete_p;
+@@ -954,6 +965,7 @@
+ /* pop iteration: if arg nonzero, exit unconditionally */
+ /* else check exit conditions and exit or reiterate */
+ 
++void
+ pop_iteration(arg)
+     int arg;
+     {
+@@ -973,6 +985,7 @@
+ 
+ /* find end of iteration - read over arbitrary <> and one > */
+ 
++void
+ find_enditer()
+     {
+     register int icnt;
+@@ -988,7 +1001,8 @@
+ 
+ 
+ /* find end of conditional */
+-char find_endcond(arg)
++void
++find_endcond(arg)
+     char arg;
+     {
+     register int icnt;
+--- teco-orig/te_main.c
++++ teco/te_main.c
+@@ -44,6 +44,8 @@
+ 
+ #include "te_defs.h"
+ 
++void cleanup(), print_string(), save_args(), read_startup(), get_term_par();
++
+ main(argc, argv)
+     int argc;           /* arg count */
+     char *argv[];       /* array of string pointers */
+@@ -103,6 +105,7 @@
+ 
+ /* reset screen state, keyboard state; remove open output files */
+ 
++void
+ cleanup()
+     {
+     window(WIN_OFF);            /* restore screen */
+@@ -115,6 +118,7 @@
+ /* print string for error message */
+ /* argument is subscript of a qreg qh, prints text from that buffer */
+ 
++void
+ print_string(arg)
+     int arg;
+     {
+@@ -137,6 +141,7 @@
+ 
+ /* copy invocation command line to a text buffer */
+ 
++void
+ save_args(argc, argv, q)
+     int argc;
+     char *argv[];
+@@ -171,6 +176,7 @@
+ 
+ char startup_name[] = "/.tecorc";       /* name of startup file */
+ 
++void
+ read_startup()
+     {
+     char *hp, *getenv();
+@@ -192,6 +198,7 @@
+ 
+ /* routine to get terminal height and width from termcap */
+ 
++void
+ get_term_par()
+     {
+     char tbuff[1024];   /* termcap buffer */
+--- teco-orig/te_rdcmd.c
++++ teco/te_rdcmd.c
+@@ -6,6 +6,7 @@
+ /* version for multiple buffers  04/13/89 10.22                             */
+ #include "te_defs.h"
+ 
++void retype_cmdstr();
+ int ccount;             /* count of chars read in */
+ 
+ int read_cmdstr()
+@@ -227,6 +228,7 @@
+ 
+ /* retype command string: entirely (arg = '*') or most recent line (arg = ' ') */
+ 
++void
+ retype_cmdstr(c)
+     char c;
+     {
+--- teco-orig/te_subs.c
++++ teco/te_subs.c
+@@ -17,6 +17,7 @@
+ /*    n is the returned number of chars moved   */
+ /* max is the maximum number of chars to move   */
+ 
++void
+ movenchars(from, to, n)
+     struct qp *from, *to;       /* address of buffer pointers */
+     register int n;             /* number of characters */
+@@ -69,6 +70,7 @@
+ 	}
+     }
+ 
++void
+ moveuntil(from, to, c, n, max, trace)
+     struct qp *from, *to;       /* address of buffer pointers   */
+     register char c;            /* match char that ends move    */
+@@ -249,6 +251,7 @@
+ /* leaves bb pointing to end of that text */
+ /* insert2() copies rest of buffer */
+ 
++void
+ insert1()
+     {
+     int nchars;             /* number of chars in cell */
+@@ -269,6 +272,7 @@
+ 
+ 
+ 
++void
+ insert2(count)              /* count is the number of chars added */
+     int count;
+     {
+@@ -289,6 +293,7 @@
+ /* subroutine to delete n characters starting at dot    */
+ /* argument is number of characters                     */
+ 
++void
+ delete1(nchars)
+     int nchars;
+     {
+@@ -314,6 +319,7 @@
+ 
+ struct qh obuff;        /* tag string buffer */
+ 
++void
+ do_o()
+     {
+     int i, j;           /* i used as start of tag, j as end */
+@@ -460,6 +466,7 @@
+ 
+ /* find number of characters to next matching (, [, or {  (like '%' in vi) */
+ 
++void
+ do_ctlp()
+     {
+     int i, l;
+--- teco-orig/te_utils.c
++++ teco/te_utils.c
+@@ -37,6 +37,7 @@
+ 
+ 
+ /* free a list of buffcells */
++void
+ free_blist(p)
+     struct buffcell *p;
+     {
+@@ -51,6 +52,7 @@
+     }
+ 
+ /* free a list of buffcells to the "delayed free" list */
++void
+ dly_free_blist(p)
+     struct buffcell *p;
+     {
+@@ -92,6 +94,7 @@
+ 
+ 
+ /* free a list of cells */
++void
+ free_dlist(p)
+     struct qp *p;
+     {
+@@ -107,6 +110,7 @@
+ 
+ /* build a buffer:  called with address of a qh */
+ /* if no buffer there, get a cell and link it in */
++void
+ make_buffer(p)
+     struct qh *p;
+     {
+@@ -178,6 +182,7 @@
+ 
+ /* set up a pointer to a particular text buffer position */
+ 
++void
+ set_pointer(pos, ptr)   /* first arg is position, 2nd is addr of pointer */
+     int pos;
+     struct qp *ptr;
+--- teco-orig/te_window.c
++++ teco/te_window.c
+@@ -21,6 +21,10 @@
+ #define MAX 0x7fffffff          /* maximum positive integer, for "last modified" location */
+ #define W_MARK 0200             /* "this loc is special" in screen image */
+ 
++void window(), window0(), window1_both(), window1(), window1_abs();
++void window1_inc(), window1_after(), w_rmcurs(), window2(), vtm();
++void w_makecurs(), w_type(), w_init(), w_separators(), w_move();
++void w_scroll(), w_ebol();
+ 
+ /* image of current window */
+ 
+@@ -74,6 +78,7 @@
+ /* routine to perform simple scope operations */
+ /* (an attempt to concentrate VT-100 specific things in one place) */
+ 
++void
+ vt(func)
+     int func;
+     {
+@@ -132,6 +137,7 @@
+ int win_max[]  = { 4,  W_MAX_H, W_MAX_V, 1, MAX, 12, -1,  20,   20, -1, -1 } ;  /* max values */
+ int win_data[] = { 4,  132,     24,      0, 0,    0,  0,   0,    0,  0,  0 } ;  /* window parameters    */
+ 
++void
+ do_window(ref_flag)
+     int ref_flag;                   /* nonzero forces "refresh" operation */
+     {
+@@ -196,6 +202,7 @@
+ /* routine to update screen size with numbers obtained from environment */
+ /* (called by main program's initialization)                            */
+ 
++void
+ set_term_par(lines, cols)
+     int lines, cols;
+     {
+@@ -215,6 +222,7 @@
+ /* WIN_LINE:    does WIN_REFR unless that wouldn't do anything, in which case       */
+ /*              it does effective 1EV output                                        */
+ 
++void
+ window(arg)
+     int arg;
+     {
+@@ -288,6 +296,7 @@
+ /* used for ev, es, and <BS> or <LF> as immediate commands                  */
+ /* starting char position is in w_p1; argument is number of lines           */
+ 
++void
+ window0(num)
+     int num;
+     {
+@@ -364,6 +373,7 @@
+ 
+ struct bh *old_pbuff;
+ 
++void
+ window1_both()
+     {
+     pw0 = &win_1;
+@@ -396,6 +406,7 @@
+ /* if scroll mode is enabled, the VT100 screen is split and only the upper part */
+ /* is used by this routine; else the whole screen is used.                      */
+ 
++void
+ window1()
+     {
+     int i, j, m, lflag;
+@@ -500,6 +511,7 @@
+ 
+ /* routine to redraw screen absolutely */
+ 
++void
+ window1_abs()
+     {
+     int i, j;
+@@ -531,6 +543,7 @@
+ 
+ /* redraw screen incrementally */
+ 
++void
+ window1_inc(wd)
+     int wd;                     /* argument is earliest change */
+     {
+@@ -559,6 +572,7 @@
+ 
+ /* routine to move window downwards: scroll up or redraw as appropriate */
+ 
++void
+ window1_after()
+     {
+     int i, lflag;
+@@ -591,6 +605,7 @@
+ 
+ /* routine to remove the existing cursor */
+ 
++void
+ w_rmcurs()
+     {
+     register struct w_data *pw = pw0;
+@@ -609,6 +624,7 @@
+ /* called with w_p1 at starting char, curr_y, curr_x at starting coordinate         */
+ /* rewrites to end of screen if arg = 0, or only until line with cursor if arg = 1  */
+ 
++void
+ window2(arg)
+     int arg;
+     {
+@@ -794,6 +810,7 @@
+ 
+ /* routine to move cursor to current location and then call vt */
+ 
++void
+ vtm(arg)
+     int arg;
+     {
+@@ -807,6 +824,7 @@
+ /* routine to set reverse video and save cursor location */
+ /* first argument is char at cursor, 2nd is value for curs_crflag */
+ 
++void
+ w_makecurs(wc, crflag)
+     char wc;
+     short crflag;
+@@ -851,6 +869,7 @@
+ /* routine to type one character:  arguments are char and a */
+ /* "mark" bit.  If mark is set, the char is always retyped  */
+ 
++void
+ w_type(c, m)
+     char c;
+     int m;
+@@ -875,6 +894,7 @@
+ 
+ /* initialize display image */
+ 
++void
+ w_init()
+     {
+     short i, j;
+@@ -907,6 +927,7 @@
+ 
+ /* write separator lines between windows on screen */
+ 
++void
+ w_separators()
+     {
+     int i;
+@@ -929,6 +950,7 @@
+ /* put character followed by appropriate number of nulls for "other control function" */
+ /* if argument is 0, output filler chars only */
+ 
++void
+ putchar_d(c)
+     char c;
+     {
+@@ -942,6 +964,7 @@
+ 
+ /* put out appropriate number of filler chars for display function that scrolls (LF, etc.) */
+ 
++void
+ scroll_dly()
+     {
+     int i;
+@@ -952,6 +975,7 @@
+ /* move terminal cursor to stated y, x position */
+ /* uses incremental moves or absolute cursor position, whichever is shorter */
+ 
++void
+ w_move(y, x)
+     short y, x;
+     {
+@@ -993,6 +1017,7 @@
+ 
+ /* scroll screen: argument is count: + up, - down */
+ 
++void
+ w_scroll(count)
+     int count;
+     {
+@@ -1025,6 +1050,7 @@
+ /* clear line to left of curr_x */
+ /* if some chars nonblank, does erase from start of line */
+ 
++void
+ w_ebol()
+     {
+     short i, j;
diff --git a/app-editors/teco/teco-36_p19940820.ebuild b/app-editors/teco/teco-36_p19940820.ebuild
index 4dd048a4f2d5..cb7d37feb456 100644
--- a/app-editors/teco/teco-36_p19940820.ebuild
+++ b/app-editors/teco/teco-36_p19940820.ebuild
@@ -26,6 +26,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-gcc4.patch
 	"${FILESDIR}"/${PN}-warnings.patch
 	"${FILESDIR}"/${PN}-no-common.patch
+	"${FILESDIR}"/${PN}-void-functions.patch
 )
 
 src_prepare() {
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index d62f625f29ae..6c67900816b4 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/blogmax/Manifest b/app-emacs/blogmax/Manifest
index 07c5094051c5..94d1fe50c776 100644
--- a/app-emacs/blogmax/Manifest
+++ b/app-emacs/blogmax/Manifest
@@ -1,4 +1,4 @@
 AUX 50blogmax-gentoo.el 203 BLAKE2B 13d5f7436a13426fc3b33f9d84f45c011386d3b062acf4297c81f48d2cfc02fcd24c80292fb66152b9b0e4c968423648a99ddd6ef0bf9a4d5164e3ee5bfb330f SHA512 33bfaa0a6861bf4dcd402e3f24e999f5206235d69a9e7674c43d408e85438fd450810522a2e3bc42f5457ded290d67700e71a512603f62d64ecab82d4d2fd78c
 DIST blogmax-20170321.tar.xz 81704 BLAKE2B f7f45cb0d5981a0af09ad75b8b004aca950dad59efb0182f81596d6777caf31df6089c2cabb856168d5c031c5e60282e9a88f822219f5ec728f5dddc1c6adcb6 SHA512 bca3fd0bb10d98604426b4091831e709b2a731aa2e4cfc0737f14714bc6648a279c1909e1939f4504cf49aa470737458a00da598139d7797128563212997a4c1
 EBUILD blogmax-20170321.ebuild 996 BLAKE2B 548a4b315331d5c4f87925dab2095940b30b778af677ff48b9c4102be89d37879e07bd3b80317995cee3558e83ec8f5c50a3f87882aeb6d02474c9f523806004 SHA512 08b4313f0be8e2533daf091a62e4c4405c3be77641b18a492f4756e77a6ad7cf6bf1594958fe1319c9986a64efeff76b8fe64cf2cdbf5431e9c2b428e7ee02e7
-MISC metadata.xml 388 BLAKE2B 14e7039960527342a1837a45bc3d4a5da96f924573067aab0066b053dc24b26197d6bd4c113c87526c3c2f50bdf152df43bbbc25885e7d76c9cd5f846094e899 SHA512 b794dbcab7f297bb941a561495b2d4b7863476f7204c7d240bbb99391c99441ff8e482b88f9664ad75a96f1cb4bf77a2e709301d4897d836297adf551aa519c2
+MISC metadata.xml 490 BLAKE2B 22c64acc36ba56929b3b81104b1a4d9348a14ccd306039fb5a594b2ce9e6a8c86a0fa2841929b98c89c5086ade37997a772baf766ce189cc2577662063da57e5 SHA512 ef6bc20f8dc484f6a6321987a72eeadb9f569a728927575d832c69feb103041cf460c2461b51aa0e13e2cba26f93aed9dbadf8cebdf2feb3f1b63cc74716f794
diff --git a/app-emacs/blogmax/metadata.xml b/app-emacs/blogmax/metadata.xml
index 18aa34682d6d..0240753d62dd 100644
--- a/app-emacs/blogmax/metadata.xml
+++ b/app-emacs/blogmax/metadata.xml
@@ -6,7 +6,9 @@
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
 <longdescription>
-  BlogMax is an Emacs package that aids in the creation of a weblog.
+  BlogMax is an Emacs major-mode for maintaining a weblog. It lets you
+  focus on the text of your web site, while wrapping a template that
+  you define around each page.
 </longdescription>
 <stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index ae7c9e189561..af4137fe91ab 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -1,8 +1,6 @@
 AUX 50org-mode-gentoo.el 95 BLAKE2B 9c74869edce0915d9793a3b10f61e8002dec553a93fe9856c526d77e5e988a35203c35322a1ea7ce9e19b02ff9a5ce1b2b4d73b8ba19bada30b7fbf453e43b01 SHA512 aa2e47c060d441ef1f631f2a44f3b7adc7cf5306155b9cc3f3f808aa053b411980671a89933c77fe02aac79bb6f25f2fe98c676e13e097dd885f23bc9d8cb000
 DIST org-8.3.2.tar.gz 4442361 BLAKE2B f21f07578e870cd3edaa3721a53f679627c0115c320c666c2086e201e272c0ef03540bfdd90936a624cd4c4dcbac21b91346ba975b6006ada2d46184f73574f3 SHA512 3e1ff47c875a2db3239add8b060f555da357e465161ca62860c0ac2734c2e31c5387d2df4223ab7ea8ea60050f9a845d160b0bcb3afcf36f1d3cabcaa961e6a2
 DIST org-9.3.6.tar.gz 4669953 BLAKE2B 1d221918f8145b789d979ee7822640dd37c5722e9f65ba36e945f7d574cfb89d48e2da1812d5dc727301ef1ad8bd2ef5628f54cbbfef5bffbab48656ed4c1e65 SHA512 47b5b81f47474d399cc7aada0e32f376d4c8758f6e955b7d889035610c20a4c372ea0571a510695822d2b87bd1e8002c2d0d8c73dc730144540c59b5ef25e090
-DIST org-9.3.tar.gz 5189006 BLAKE2B 1e082988a47e2058fe248dd1f8f5f0e75291279be1a7abf75d507786f84f93e9701607d15688162ff4d3e4f590ac8391c37d1f6d047ed55d9d9bfb498b47cfa4 SHA512 e00f15750b76350765b6a01e5b0021fec4dcbd9dd5ca4de6745e0df6881b9d62ad496b7d579c0cc0f6dbb206bb27e5a219e0a668a6167ccc7f629d763eafa24c
 EBUILD org-mode-8.3.2-r1.ebuild 1746 BLAKE2B df764e008c1f4bebde801dfd922c16988d863f598e39619b953aba8013d1737f6aebca910bd395cb4ad2f8004c2d0fc326e40b6daa3f534e74e1223da752751a SHA512 f5d1edbc5eba7d392823bccc0ab9338baa2db8687ad1112be351a4fade13c94cc3727c9a91f0cef2137cc8efc727aec86e9dbf3115a16f9e4894aa19280562ca
-EBUILD org-mode-9.3.6.ebuild 1723 BLAKE2B d07d2342272f740a2837a3fcb046456a1ea59f030849f29d5346f0660d74c5bd8364328cb5ebb0b86aac5629e78d3b0ec4dafaaa963e808310b3479b139b7488 SHA512 138d6d5de547a4fa13787634f387c51ada66de1867079885d6efd7179df0c38ae224dd95d42923f859c953c64777873cfd180f7d6ff78d8146bd778a9de1f785
-EBUILD org-mode-9.3.ebuild 1720 BLAKE2B 0b0b38326d521754bc7a3b4148f21f290b39ba55c17c28423f31b6e130933f843b698472db4cff1d9a5bb738d14ee959504c9465e0712542823a71116ab5cdb5 SHA512 8827962425b24c573ae7f6b72dd96cfcc5c9c495b57c1516a6139da8ed9b8e79c96949c57db75401e70c9df7baf097a7cc6d3a5faa2f4c6aa8cddae86e9e8669
+EBUILD org-mode-9.3.6.ebuild 1720 BLAKE2B 0b0b38326d521754bc7a3b4148f21f290b39ba55c17c28423f31b6e130933f843b698472db4cff1d9a5bb738d14ee959504c9465e0712542823a71116ab5cdb5 SHA512 8827962425b24c573ae7f6b72dd96cfcc5c9c495b57c1516a6139da8ed9b8e79c96949c57db75401e70c9df7baf097a7cc6d3a5faa2f4c6aa8cddae86e9e8669
 MISC metadata.xml 1368 BLAKE2B 2680c11ca69b9acd8b96b6dc76586037bd1b7ce0e9cdc183781742f373ce8d0be5b8820b7fa4d18c4f59523e10d3b40df3edbba5178169fb993bacc8d10cdfe1 SHA512 6c557a3a3ecb9b1993bd8c976d0a81460cd1ecc6e53fbaeb0d086e8d78497485a1b34470b72a73e779878b4947a22d61ef36259037cf6ff0315a823e15e09c66
diff --git a/app-emacs/org-mode/org-mode-9.3.6.ebuild b/app-emacs/org-mode/org-mode-9.3.6.ebuild
index 60448056b54a..d8248f25435b 100644
--- a/app-emacs/org-mode/org-mode-9.3.6.ebuild
+++ b/app-emacs/org-mode/org-mode-9.3.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
 
 LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~x86-macos"
 IUSE="contrib doc odt-schema"
 RESTRICT="test"
 
diff --git a/app-emacs/org-mode/org-mode-9.3.ebuild b/app-emacs/org-mode/org-mode-9.3.ebuild
deleted file mode 100644
index d8248f25435b..000000000000
--- a/app-emacs/org-mode/org-mode-9.3.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
-NEED_EMACS=24
-
-inherit elisp readme.gentoo-r1
-
-DESCRIPTION="An Emacs mode for notes and project planning"
-HOMEPAGE="https://www.orgmode.org/"
-SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
-
-LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-macos"
-IUSE="contrib doc odt-schema"
-RESTRICT="test"
-
-BDEPEND="doc? ( virtual/texi2dvi )"
-
-S="${WORKDIR}/org-${PV}"
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	emake datadir="${EPREFIX}${SITEETC}/${PN}"
-	use doc && emake pdf card
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		ETCDIRS="styles $(use odt-schema && echo schema)" \
-		lispdir="${EPREFIX}${SITELISP}/${PN}" \
-		datadir="${EPREFIX}${SITEETC}/${PN}" \
-		infodir="${EPREFIX}/usr/share/info" \
-		install
-
-	cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}" || die
-
-	if use contrib; then
-		elisp-install ${PN}/contrib contrib/lisp/{org,ob,ox}*.el
-		( docinto contrib; dodoc -r contrib/README contrib/scripts )
-		find "${ED}/usr/share/doc/${PF}/contrib" -type f -name '.*' \
-			-exec rm -f '{}' '+'
-		# add the contrib subdirectory to load-path
-		sed -i -e 's:\(.*@SITELISP@\)\(.*\):&\n\1/contrib\2:' \
-			"${T}/${SITEFILE}" || die
-	fi
-
-	elisp-site-file-install "${T}/${SITEFILE}"
-	dodoc README etc/ORG-NEWS
-	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
-
-	DOC_CONTENTS="Org mode has a large variety of run-time dependencies,
-		so you may have to install one or more additional packages.
-		A non-exhaustive list of these dependencies may be found at
-		<http://orgmode.org/worg/org-dependencies.html>."
-	readme.gentoo_create_doc
-}
diff --git a/app-emacs/php-mode/Manifest b/app-emacs/php-mode/Manifest
index 770ec101d870..a85a5fb38e05 100644
--- a/app-emacs/php-mode/Manifest
+++ b/app-emacs/php-mode/Manifest
@@ -2,5 +2,5 @@ AUX 50php-mode-gentoo.el 286 BLAKE2B 1c823d8244e714811c5f1be402d1cd41e7b81951aaf
 DIST php-mode-1.22.1.tar.gz 90539 BLAKE2B 3cf2f282cbf87d7dc0ef15d81341de851ad95b7f5426ab6495e55729774fa9d1a32bbc36dff40869c219c71e0ff5d55642f99782a18722c94abeda78b45e0023 SHA512 482f07bec5f8ce21396cd4d39b14dbfe47d73f4e06b7b178b3e01c2dc51f89f1693a032384e4ad812c46a344e531a4a626c4f8eb414fe22dfadd9f1a71c55238
 DIST php-mode-1.23.0.tar.gz 94451 BLAKE2B 324eda995ba8d93ca9bec691c88b05caac3d6786b2d1caac39dc34f513e8a026b3803ad3712729b147a8ee839fe337bf11ebaa1b718cb4c741997a9e1c9279a3 SHA512 051adf317ac1dc4ae14b3aaad9aa15ef650a74c7c1ff134ff9a26664cc7494b522957d9cbed981ec398e9bdc6ccae4437c628b2fe3535e8f2a95da34363ec88a
 EBUILD php-mode-1.22.1.ebuild 489 BLAKE2B 3e5205d2c9e19753905442d8d85ca9bbde730cb100a6d377a006d26a39f88f038e76168e67e2ceee540efdd9623dd155c3a5c3794eec621117107563064095a1 SHA512 4b666428f344d42e2d672eb481d715aefb0b5f45c984f9f1782a004d903a1c21a2bb9d9119f6beb5f306faff3266cb074c79d11756ac34e02253c4dbd45a0f47
-EBUILD php-mode-1.23.0.ebuild 493 BLAKE2B f0b338f0c4a4878b7a19df0ed6b08c7b00e6be95dd2700b1ab5bda0a4fa39c03c35936c11626c3a2c57ae14a0989f3de4f74af22937567359919ba0e78f7464c SHA512 48b20b80aa6a528c2f7a7b5766999e28104d17075f36aeee3924402f9d2f027a4b607e7d0bad13c15457dfcec1c46c2f609e9715371cbfef81131f4bbd3fee89
+EBUILD php-mode-1.23.0.ebuild 489 BLAKE2B 3e5205d2c9e19753905442d8d85ca9bbde730cb100a6d377a006d26a39f88f038e76168e67e2ceee540efdd9623dd155c3a5c3794eec621117107563064095a1 SHA512 4b666428f344d42e2d672eb481d715aefb0b5f45c984f9f1782a004d903a1c21a2bb9d9119f6beb5f306faff3266cb074c79d11756ac34e02253c4dbd45a0f47
 MISC metadata.xml 358 BLAKE2B e43dc1a1d876d29121c6745f2e66c3b3585ea5ab0aed824c28bece59078fea9df0f6f438701dfc64fdbf90cb258091d5b96b4dc8fa320161ee241fc17be0a4b9 SHA512 eadc968656b4fe2150fd3d360c32d3fc66d42408c61ea60b3df5be2ba6cd3ed6abec1ba45e37269f5d06721eea30d3dbf95f3a747000e5b5d60e614c56ce3f85
diff --git a/app-emacs/php-mode/php-mode-1.23.0.ebuild b/app-emacs/php-mode/php-mode-1.23.0.ebuild
index 3a75d798770b..2924a48fb04d 100644
--- a/app-emacs/php-mode/php-mode-1.23.0.ebuild
+++ b/app-emacs/php-mode/php-mode-1.23.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ejmr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 SITEFILE="50${PN}-gentoo.el"
 DOCS="README*.md CHANGELOG.md CONTRIBUTING.md"
diff --git a/app-emacs/scim-bridge-el/Manifest b/app-emacs/scim-bridge-el/Manifest
index dbd516362a04..c8e0b323e140 100644
--- a/app-emacs/scim-bridge-el/Manifest
+++ b/app-emacs/scim-bridge-el/Manifest
@@ -1,4 +1,4 @@
 AUX scim-bridge-el-0.8.2-im-agent.patch 1052 BLAKE2B 4b84943a73ddfc0b30218d27cff86e89294412c9c4a4b2a108283902ac5ab5ec6c300f077482aea79be39c30be39708b9c2d5500dd442118ec22db5c740f6779 SHA512 bded77c74c13d0c0a3a3ba13cb5865d9ecd6abf00ed5d4a0d01e6e482a52211ca3a665a3a8ed5a098e6840b13327a80f9ebc2258023fe5d1b7c1f50693fd527b
 DIST scim-bridge-el-0.8.2.tar.gz 67369 BLAKE2B 453c6d458e9ade8971de1adcceeb10e0d9c6ee7a090a0986cdcf419ec8b2b4422eb8b6ebe1e2a8f3d22330759b2af5e9cc3aac5db37a4d837de9d3d677a9ceff SHA512 2d173acb2d0182cd4c1fb6301cb34de0a5a08f4776e9dcec16bf2d1342bea98765c55d61cb7d666c42c2bb8c63d3083f4d4e59dbbec13a6ec72c7c48350c5c0c
 EBUILD scim-bridge-el-0.8.2-r1.ebuild 472 BLAKE2B 7921cb52f10f73d1122e1145a2aa521a06585e838465243ba602a91c6517e6999e9a1c50241f22f091de574d427f8ca381aa468a032eba7657cbace68178ac94 SHA512 ea8b17e406724aa7484cb026785add8a8b0b1ed25baa0269a5862849c03a048f8542e00cff076d2e186efe833d0eb15c5c37c00261a7ad1164a1a7a477abefb0
-MISC metadata.xml 510 BLAKE2B 55249e3ffff3f3b164cf313e805bf248d11903bb812ddfe12d075eba914321a1e66511417f32b1d420134b3645582129a6c3039a9b8f07d556ac71201a687d40 SHA512 b9f40804261cc6282cf473b77ad7bd938abe6dd19b44d09654ac549544349bfca039f12aa8b3c5cef09298a326dc4fe4f9cdd79582137ea9fdf0856e89e53b1d
+MISC metadata.xml 1027 BLAKE2B c6f8545d24b05c07e2fbe042ae4b286553e3f5baccf624f00ec0c67608db721532b03bfaa3d4b329751babb53cb19e82321a20d1364d00f627ae498f291ce9e5 SHA512 b79dbc3d393c4b2accb9112f478ae6dc3179126d8f1fb89e3fd172889d51220c649166e0fc3588bb42c3e6e896fd5d10e4caefbb0f82228045c0b286f23f837e
diff --git a/app-emacs/scim-bridge-el/metadata.xml b/app-emacs/scim-bridge-el/metadata.xml
index 43c14ac67d16..d351407087a4 100644
--- a/app-emacs/scim-bridge-el/metadata.xml
+++ b/app-emacs/scim-bridge-el/metadata.xml
@@ -9,7 +9,16 @@
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
 <longdescription>
-  A SCIM-Bridge client for Emacs.
+  The Smart Common Input Method platform (SCIM) is an input method (IM)
+  platform containing support for more than thirty languages (CJK and
+  many European languages) for POSIX-style operating systems including
+  Linux and BSD.
+
+  scim-bridge.el is a SCIM-Bridge client for Emacs. This program allows
+  users on-the-spot style input with SCIM. The input statuses are
+  individually kept for each buffer, and prefix-keys such as C-x and C-c
+  can be used even if SCIM is active. So you can input various languages
+  fast and comfortably by using it.
 </longdescription>
 <stabilize-allarches/>
 <upstream>
diff --git a/app-emacs/xrdb-mode/Manifest b/app-emacs/xrdb-mode/Manifest
index fb0b68ad99ec..5cc3e741d644 100644
--- a/app-emacs/xrdb-mode/Manifest
+++ b/app-emacs/xrdb-mode/Manifest
@@ -1,6 +1,5 @@
 AUX 50xrdb-mode-gentoo.el 223 BLAKE2B 2d2d85455f676760bcce88965406a226528da07d29f34b409c35f539e2dafe6750a35e6472194c0969fec7dda3a04abb65ded5dd6b1be3ea0a0cd63fa9a2f03d SHA512 324609b05517c26d58759bf3c4445b690bb8c8ab00361f3157b06964458f9ca777d8963ac9c5e49df6c75d4d8eb27ea7754639bbbb8d1550b96fdbc954b3ed5b
 AUX xrdb-mode-3.0-backquotes.patch 355 BLAKE2B b465b94aa8960d2d2309fa72db08236deb63ed4d3c7b763f93e7ab9c10f08636c8f5e7f5eb095b102fc50c46b67c48c3e2c126f6e8f3b6714a86734fc1e7e889 SHA512 75379ce55eda18df7102c35ea8786eebf18a015ae3e7c6a936ac7794b5a4e24b610ad21c228761d390467622c876cc34d97e3709d8be91c8fc70fd049f09e01f
 DIST xrdb-mode-3.0.el.xz 5448 BLAKE2B 32ce6b427ab2338d66a52c722ae3c69e1966c53cd63be15c35e218b17cb2c7476da5d5c1e49df3df1114b97382724f273f2f302abaef5995b5aa53824673867a SHA512 1ad0f92edf08cca604b9534a5a715f79d019f73f8ad80bf8297fa3b4a201f8dbd864c23bed86579b7c48ddd9180add7b39e22469f6c23dceef4be9fdfd1ae290
-EBUILD xrdb-mode-3.0-r1.ebuild 550 BLAKE2B 811c30e5d0dfe922e736ef17398381f7ea32340547c3d50182f6904ebce2660b318788c1ce12260fd87da45613faebdf1357f8cb84f952999e784053551c26d2 SHA512 6b9158ff80745ff7cb21b193f7a6c2c02097f016354250b59f1507c85e733226d9da4d192a41bd6f5dd76a6ead92796e3b242e6ae01cb9199ec9c051aa8c1026
-EBUILD xrdb-mode-3.0.ebuild 505 BLAKE2B bf3d1f240e3be4d56e1315cad7bf5c14d962196d7f55f74720e5cd7a8ef2519aeea2f9b04d9bfcf444b2b90afa7bd22eb128b0d9e52027a6a1917ff27a44c503 SHA512 6da052641466348b40dd059761a3591dbe69bc7750650088367fe14034d5e7b799aaa7f33087fca4277d287128b33ae53fa5fbd89230aa2641c8e36c2236b82c
+EBUILD xrdb-mode-3.0-r1.ebuild 548 BLAKE2B 6ba052e3cd76466fdd3c02f303b2e0f257cf83bf02366cf5ebe3edac8651442b7f1e8dc9b8eca381c5a32f27e2373907cf7b311681a3f4cbfdf71c934f5eaecf SHA512 c9bb514c3e2dd232e578bccdffd1f0c372d3b81330d062c33e9569917d2a40dadb1689501c236c6c2086790ecb4855f8c927302623b41c13578e3c3e7709c647
 MISC metadata.xml 357 BLAKE2B 5f0984d66c30be81bdd275c54b1171fc16a714b95f74da7700518cfece8d773433d1ce8151968849ebc3b02c255686e086e2f2282fd9b09a340c2c24da48b334 SHA512 3a98228940548b16f0ff1e6a33bc4d5a2c0d4b650187533dfd431e8c1fbcc59c3c5587a9df1d2bbfcf8c161ade94af51a5b95475fe3900e68108dd86924904d7
diff --git a/app-emacs/xrdb-mode/xrdb-mode-3.0-r1.ebuild b/app-emacs/xrdb-mode/xrdb-mode-3.0-r1.ebuild
index 9f7879241eac..03d4f884c458 100644
--- a/app-emacs/xrdb-mode/xrdb-mode-3.0-r1.ebuild
+++ b/app-emacs/xrdb-mode/xrdb-mode-3.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 PATCHES=("${FILESDIR}"/${P}-backquotes.patch)
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/xrdb-mode/xrdb-mode-3.0.ebuild b/app-emacs/xrdb-mode/xrdb-mode-3.0.ebuild
deleted file mode 100644
index 1405fd18bf3e..000000000000
--- a/app-emacs/xrdb-mode/xrdb-mode-3.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="An Emacs major mode for editing X resource database files"
-HOMEPAGE="https://launchpad.net/xrdb-mode
-	https://www.emacswiki.org/emacs/ResourceFiles"
-# taken from https://launchpad.net/${PN}/trunk/3.0/+download/${PN}.el
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index a421c56ede48..d494c63b8616 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/dosemu/Manifest b/app-emulation/dosemu/Manifest
index baf50294a42f..2043259cb3c5 100644
--- a/app-emulation/dosemu/Manifest
+++ b/app-emulation/dosemu/Manifest
@@ -8,5 +8,5 @@ AUX dosemu-1.4.1_pre20130107-lto.patch 921 BLAKE2B 6b36f4e5502fb8b8202ab4396e6c9
 AUX dosemu-1.4.1_pre20130107-no-glibc.patch 559 BLAKE2B 93ba50a5acda4b0b556e5393c34babe0b9172a8c9c1b168432f454ff120673496d279496d76821eda49886aaa998244bd411d4db6b465517712c4f6683d2850d SHA512 c53e3f7ed1b7a74e1112ea5507d0912ef1d16ff657aa5a03132f6b4c35ddb638ecde40ef554254f429316ffd74fc2d8afb59548d97547eeed231c80c0c057eed
 DIST dosemu-1.4.1_pre20130107.zip 2767256 BLAKE2B 068c38108257b83d046682d4e9bda6f2da84195cff3aa5eb73764e88ba48bd415a6af9fa1b57059dee12ddd75b379df730fe6957014b554cc13b12ac029eed8d SHA512 eb8dcb914a74b235f2b37ff4dd5c1c84b4916ff195c7bf76cdbe6a4d5e6247c57297eef0c579f219ff7f475e727d66fa5a0f314da46d79cc97a0d794e9ad5864
 DIST dosemu-freedos-1.0-bin.tgz 1205628 BLAKE2B e88a23b14cf1ccccb4f648b3c3af39330d8af29940e228b951cc7e48595f9838236066b67f841328e75ee7aee18f9e7814ea33382bb48902ca7947806b646852 SHA512 d0c4235ceac55de63ce5f72e51b7d57a82b8104f4bf2df6f4dc25c9889d3337b40d75665c2dfc98492ec7123e0959a725f5c7579e145895024bd80a07036e3bd
-EBUILD dosemu-1.4.1_pre20130107-r5.ebuild 2786 BLAKE2B aa4b8d47fd518bf58899bb182397ecbde1b6a67c1c64cd34aebb58831f1cbfa9d25c63e22388dba52f4a42521e0bb0932e859c648a29c22a896bc65ed46493b0 SHA512 e2b507f6b9f6d7a09ae8e66da4c24bdcab08fe5d9e6aa95c552f04b8b02e25f2478b78c42fa5aceb2d1f5f87f5287c023b9eaf43a9b503875f252683f62802ae
+EBUILD dosemu-1.4.1_pre20130107-r5.ebuild 2955 BLAKE2B e7685142e60dc5556ded4f452802bdea49ad52e3bb5aa1e45b31cb074ce8d3cf9d354002ab646ebb1d4e420af9284016733bb9e66ded3911797eb6be4c928b5e SHA512 6221a00a8d3663fbc1ba2839a63ffc9f923cc8f150428b76805089a6e81ed3fab85940dd2435bc437704c38b1d5c8dafb35bde48ab67186083228dd70a0841c6
 MISC metadata.xml 432 BLAKE2B 06cd4821f41961fdcf266bb1175ee118cd181d17c3b38508e2a30dbbfab9e5cb02608e2b8e5af905abc24718d410a24d112c073fd6ee460b33d904c975358a61 SHA512 da0538836dc326d714141ab6c7b9f00bc1604fa5b51df7d9d548a8e3d889072b3ee8890a25705e2a7c2c1c31645c0b9af85ce6a2d1e4aa142a4d83a08fd6f9d8
diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
index c7771af9cd8f..61a15bd1f53c 100644
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
+++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
@@ -58,6 +58,12 @@ PATCHES=(
 	"${FILESDIR}"/${P}-as.patch
 )
 
+pkg_pretend() {
+	if tc-is-clang; then
+		die "${P} does not work on clang due to missing 16-bit assembly support: https://bugs.gentoo.org/729240. Please try gcc."
+	fi
+}
+
 src_prepare() {
 	default
 
diff --git a/app-emulation/libpod/Manifest b/app-emulation/libpod/Manifest
index d180ff9e8de2..a8406942dc29 100644
--- a/app-emulation/libpod/Manifest
+++ b/app-emulation/libpod/Manifest
@@ -3,7 +3,9 @@ AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690ca
 DIST libpod-1.8.2.tar.gz 30065262 BLAKE2B 1bf4ca9b9547a710f1882ac40aee0cf295fecdb9d43dc6fa30633331ca9e19d15e6d671075627939167cdf100d30e8299e50bd51425226ff1994778782cf261b SHA512 c6e1426f66299a21be66be033460c44830b422f8a3319f37bbe53030f6a2bf84b140a29f30b83f6b61199f1df373f81a6d73787d16423ad942fc8a9154c68366
 DIST libpod-1.9.3.tar.gz 8869143 BLAKE2B 52c049c3a9c96729f32c1b7a9fc4b182614d18edd12ee1d5b19730a870b694f5c4489577bbf547cf86baf51b6fadfdf1a1513ff784a4c549f5b737549187f3a3 SHA512 d85cdf49b740f47a341b7717a4bc22ff326d22234e224bd572a3d879b75eaa33139bebdc293c2e7bc41a9902289d89380b9b56975a0826172324e9a54f8f5e03
 DIST libpod-2.0.0.tar.gz 9126598 BLAKE2B 3c2d18a921b88ef235b14f069e7571f83b1add39ec4ecd20b98f4879d287c481a525e01969c9b62f8b81e0be43eb864266f32f78af3f1a5ca92c4b1c4a9a16ce SHA512 29f7e365dbd4ab6d20ee3e85939804f74dcfe95f65a6d030d1c10a36512c29d3934907cbb014047d659fd96ed3a2946570ef7922cd77cc729370ac099b4b58a2
+DIST libpod-2.0.1.tar.gz 9136153 BLAKE2B 4c60dc047ae7fd6a2918589a30f6dc94c13251ed0002e77919adfb9dbe0a3c7b14e40e204c5879273589673a573aa318a3d5b972c32236143e166cb96a7cc3c8 SHA512 e52d3eef3d698360a0196dca6338c319511b6685c0237bd4d24a3763eb5e46262946d7609d1f36798dec6eb63d4511efdc8b77fa22c06bd55b666505f4fe6730
 EBUILD libpod-1.8.2.ebuild 3881 BLAKE2B 4555be189f9d335b03b6eb074155c039d604395b5ae0772cf3da1502b6a626266c80b9a2ec997dc4c13b31bdfb9f30877da749a0810ec2beac594ee4c0502f1f SHA512 001f631f58a2e0d11f07c5739ed7e2a3c36b0de5dfbe0637e3cb06d31ba68e730de59e05e0e155c92702f39bcd4da05d43e795c1030b800d50198158fd06bed4
 EBUILD libpod-1.9.3.ebuild 3920 BLAKE2B d65bd39116779af1c238061b5d8696615a789c2a5874a0aec558d67d5f760be6785c84be56f75a310cd312078db14b937a4695b7432a50b1236296af4155600b SHA512 e9f823ad0f4a513e760ce0108af2621a1f9f029a603cc87be4f743e99cde57c44bd28242c89f3702d2ddef3af65cfe51ecce5ea552e5320f8bd27f34c1c6777a
 EBUILD libpod-2.0.0.ebuild 4335 BLAKE2B 7d9c3f7bbbc09135dfb63034d24ffd7b23b06a107a5d00967ce4a1ec978a7d6e647e2fac818289ca5cff060f46d93075e7d8dc01762e4a0a616885d668ccad4c SHA512 cf72840fde4a723ccb39573fb6ffc460195c7fe8a056241003de385dda9e3a48a0af4e9d8130d58c70614f1d7ea84fbe5e7d1ef3a3329f725d6464688e64796c
+EBUILD libpod-2.0.1.ebuild 4335 BLAKE2B 3d031ce218cd8b0f258c3caaab69e6c337f0a54e8c4507e85cd8fe4d77a2d95ed3ab4047850584a5a0a095c82755d67a9965be93d8c0978f11b3a95e636cec3d SHA512 182349484588aa6c169fee9af2d615b7102d9fc7deae0e9cf0ebffbf853b3e7c99b82d6bf3e4407cb746daf067205263dbed6211f753b068e696622878064979
 MISC metadata.xml 999 BLAKE2B 4cc701468adb97983a347a94a76ad7966a54a5d4d5e3dcdae0a87e6bc81a45eac46ff120c576d16ea1f8145d6ab86b51b3671d9baa35945d4f104a7f8237854e SHA512 679b1a932037e7f7d209e7f6485dac8c3f2cd7be161fd342dc8158567f03c5692e487d23de4dda62c4ff629c96f0e2ea715dd9c8523e457b090bae5824bd3646
diff --git a/app-emulation/libpod/libpod-2.0.1.ebuild b/app-emulation/libpod/libpod-2.0.1.ebuild
new file mode 100644
index 000000000000..bfded9611d46
--- /dev/null
+++ b/app-emulation/libpod/libpod-2.0.1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="a11c4ead10177a66ef2810a0a92ea8ce2299da07"
+
+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 +fuse +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:=
+	>=net-misc/cni-plugins-0.8.6
+	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}
+	fuse? ( sys-fs/fuse-overlayfs )"
+
+src_prepare() {
+	default
+
+	# Disable installation of python modules here, since those are
+	# installed by separate ebuilds.
+	local makefile_sed_args=(
+		-e '/^GIT_.*/d'
+		-e 's/$(GO) build/$(GO) build -v -work -x/'
+		-e 's/^\(install:.*\) install\.python$/\1/'
+		-e 's|^pkg/varlink/iopodman.go: .gopathok pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: pkg/varlink/io.podman.varlink|'
+	)
+
+	has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
+
+	sed "${makefile_sed_args[@]}" -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
+
+	# Avoid this error when generating pkg/varlink/iopodman.go:
+	# cannot find package "github.com/varlink/go/varlink/idl"
+	mkdir -p _output || die
+	ln -snf ../vendor _output/src || die
+	GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die
+	rm _output/src || die
+
+	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/lxc-templates/Manifest b/app-emulation/lxc-templates/Manifest
index 91af56492006..2331ee32b252 100644
--- a/app-emulation/lxc-templates/Manifest
+++ b/app-emulation/lxc-templates/Manifest
@@ -1,6 +1,4 @@
 AUX lxc-templates-3.0.1-no-cache-dir.patch 241 BLAKE2B ba9fc4fe3d663384a64600977de1c5aba413e876e6ca43464b5f5986d21d5e01729c82eb1e6ea03b087644611b9fc7bf083436e467bc69e2b3779020ca287984 SHA512 504721074d9aa4c1d71e5fb5f59c8179cbb0247b6d56d7622a68a7c55a5fdd5fa25cb92199e5400457f1bf2e4bc8e2d91d5169fb02180688c7bbca655881bdb5
-DIST lxc-templates-3.0.3.tar.gz 257085 BLAKE2B b53a057e1da23997318c2bcee095fbffb97c37b656eec9643e5a5ac2e7bdfeb9599710a8ccfb5d61aaf523d754f1dbbe7748c4cd1990205c6e28a17cd5e61ee0 SHA512 3e9d5304f5e06580eeb766570ddfebb0c80061c2d7e47c9ea37d834fe0cf4fabe7eedd667e4937df3f2451bc3e7aa1e98a1b386f3b19964dc218ff0e21011632
 DIST lxc-templates-3.0.4.tar.gz 257015 BLAKE2B 599c0cb083cf358c8252467b3870450e754b2aa30daf8d72e07e746ce37e2fb26fecc0adf416325c9e02b1f98f5745af5985360e9494e5ed54a242a3e17330d4 SHA512 e5b628b40e7108fca858dbd9ae92495016069ff3cba7feb34e9559c7f61dfc36944a9ef441369952a988e821f8b5d883ae97b81f6eef0683a22f1f702b5b913e
-EBUILD lxc-templates-3.0.3.ebuild 517 BLAKE2B 1caf949f9631ad3a9d131d33a5e53e97a0015e9052f38c47ab44a470874543ce6f3af0c70658cb3a7733fab7eb98b195aefc1d6c11eff6e89df3f40127ebe21a SHA512 9a55e11c97768065397efa35377db21d2e929a4ec6cdd02ee762d7c3eb58a0c31c10fbcb7d49fa4cf2545ee9478c6604160a818601fe7b18de1213e20d57912b
-EBUILD lxc-templates-3.0.4.ebuild 557 BLAKE2B 1bcd8e1cfa156a39edffd0061f4e28698f1db858279528805ac11eb446c0424fe4dffe254cb19214e3ed03270096b3e72577dd514c7cb029c6215277817cd7c5 SHA512 5e932450edd2753d83d49d3256911aef9d34f2bb736a4e57b0773bb820c70eb5decda5bab35c143ce7fea63f7db6874122a554a58971f5acfca6372064ac42be
+EBUILD lxc-templates-3.0.4.ebuild 555 BLAKE2B 5af800a304cee234005d77195897746132c1eee02a048cb273705614c27258483e78df9991d9a4e7a16b75dc7c2f1de33ba135bd287cc88e277ad40e010c07db SHA512 258b51d75a1ed265668362be716e84477c5fec913a5ff6faedd8f9405fbb9e55bd554534e7fcba49628cb975d2afcc0edb893e2f5784d70a209a3ccf2dc15cf3
 MISC metadata.xml 363 BLAKE2B 51b326108ff85ddc7cd01c4348ac3d2117a97ffc9970da0de2843fe26a998a093d04d2faf80dc9600ef84f1e5539687abfb65aebb55be63ee9390f2096e57d75 SHA512 79e8e82f7f9596f2add9eed5c3bfb2b56a0902dc1af37710c63d06f34ce4d4359758547d7bc745238389612d44ca9052e0865a312e3e285d229d9ac1580f2ae4
diff --git a/app-emulation/lxc-templates/lxc-templates-3.0.3.ebuild b/app-emulation/lxc-templates/lxc-templates-3.0.3.ebuild
deleted file mode 100644
index 38950a11f0aa..000000000000
--- a/app-emulation/lxc-templates/lxc-templates-3.0.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Old style template scripts for LXC"
-HOMEPAGE="https://linuxcontainers.org/"
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
-
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-
-RDEPEND="
-	>=app-emulation/lxc-3.0"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-3.0.1-no-cache-dir.patch" )
-DOCS=()
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild b/app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild
index 2c8e085f0d2f..32a572462f8b 100644
--- a/app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild
+++ b/app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Old style template scripts for LXC"
 HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc-templates"
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 42351bc40f05..67de090b7fc9 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,11 +1,9 @@
 AUX lxc-2.0.5-omit-sysconfig.patch 259 BLAKE2B 977e151fbb8c9d98e89aaa5ee0426e64ab4286b4440af1582086a0ced8c6568efb470ccf68786da6ea52c82d1f4e81feac45bec411febc04fc31d108f05ccde2 SHA512 0aed9aca687accc6df79e97f48ab333043256e8ae68c8643f2b2452cc8013191238867d64ec71f7d399c59a43d3ba698b35d965090c5cb149b4f41302432e6e7
 AUX lxc-3.0.0-bash-completion.patch 915 BLAKE2B 8bb879e391cec349d211b47d321c64ea091c8475ac9a8c4adfb45918c044f6c49d9b9bce546082907d696f697baf0870893c4427abeafa496db89f99190cd091 SHA512 2f3728fcf5e88eecc1ae05bf038ef83baa375194c5bef0d0ef68feaf4d8092cdd8efef6b3c27207c4abd28b085f087af517242c65747b47d0a8fa840f6b9d279
-AUX lxc.initd.7 3468 BLAKE2B 37b0d044594f1c66631f991315e49c4ceea4640bf6c459e6bba713fb76ef9a8ee1fcbc49da68bd0f1e2929cf9904e0113a3b321166f7c3d360fcebeab6665e5a SHA512 c5841cff7d8b58d4283a26719e8a5db1be2c4add0f31065393b863b6626460180d91632106bc50cde4d3e74ae46a57d581fa1f01140dfa95522aba12277f9eaa
 AUX lxc.initd.8 3669 BLAKE2B 50d41e0923ba26b9653ca3b5b559dd0905e61ec81969e709650fe7f1b26a4dcdc17158b7e449d666e2103047d9f196e53df8beca15fffd529fa8e743de97bd82 SHA512 1182b53a65399746f6d6bced0df5c1fde09c1ede4a28bfe95b5ed0bbd969d6f6423f63021d4b6f1dc62c7b2703f6963c03d881291650bdf21cfcf8432586c1b4
-AUX lxc_at.service.4 265 BLAKE2B 4454528e69a5c986c23c0c4ccc10ebe03a0650e47cd30208355d2f4a70a4cb46392473eccddd736988f1b72954948876601aaf99977d8e6014a7c774a416160f SHA512 d61e7103e90e6ffb3202533e7d7555d8c02b943f06ec6c0d673713c1c0ede58641312c65d6dd6a15907c1171522e6148c2313d7b11acbd85d59fe65758cd52b3
 AUX lxc_at.service.4.0.0 284 BLAKE2B 1adc76b9861f2499b7b703f7076782a258f9b21a3d1e32b69334f753faca9ecd8c6fb2a03baf04698e765f079e73ee683434d8c7c6d3b3082427a6af74ab33b1 SHA512 4c2f9846ca60bb78df7e652309900c0e788b45d569f268a9e5b98842518542b35fce253e2aedeb0eded3d37274390988ef887b01d1d37859ccddf6225286b4bb
-DIST lxc-3.0.3.tar.gz 1263371 BLAKE2B 77d0f593119654f570ae748d305e86c27117fd4e9ec7bdab1110f5356afb4a00d81c105ae9757d9da5827f6883a4a5d8ddc43b5b6e56a2927ed990e757f7c7b6 SHA512 cdc411364153d7ed494bab604260f5cbdfd5bd7734a59af970b3198c7b3cb340b6736856a2189d5989e169945a817ac8b531bc3ab62217a4285dd63a851f9c8a
 DIST lxc-4.0.2.tar.gz 1352667 BLAKE2B 2ecc076bacb9bb1c2a808422f7b2e0cbfc74bf3bec6ca89ea58eb6ef4a414353c2e58163bff17b3304beb39f4980d10f54365f739645c1581bfca9f6079bf57c SHA512 0de6c1f9649d161579b45fc28a735f703c4498eff9c588462b838220aeab73f91921db628f77bc461eff38c7583cac10a38951263181956e2d33412a406f3ef3
-EBUILD lxc-3.0.3.ebuild 5047 BLAKE2B a648bfd8160f61c1798a6540350ad2b45ae38b5ac8587a5b1a7db7a4f750756b2d65f798c022500c7ea1bfef312aa083f403e8cb61dc116f6ebc91ae5510b077 SHA512 273ff2df6188f58bdc55efb702bd6c92f276bee3baa2cfe0ec550f7ee9707ce6dc2db0bd0ec60276fcfb137c5963dfc7840a6b750a3036a65378bb108d17f47e
-EBUILD lxc-4.0.2-r2.ebuild 4415 BLAKE2B 13a6aec708e20cc54dfd3d48e34183ed760367fa18f9c3f7ac36e9491f166350fc91f66fc1c3656e1fcbf89bf0f1120e9675561caf1c523d4214daf2be51c578 SHA512 4420cb4a4856408d66f49b15348e6cafde2efc68300b188c89ce752f337bab1bb9dd368146fdb38ef0cfc9c9a0e448667d806199401ec0d4f8acdfb7239b383a
+DIST lxc-4.0.3.tar.gz 1368461 BLAKE2B 861bd8f3736ecda9075c57338845d386811ae3aeceb72cd054023a25a9758d5d7c9ceec917fc634c118a13f8fb142b28bd93f27138b9ee1d0817f8360fda88da SHA512 a5d45626b1f26c0f098f6f0f5852472ea065f65f9918b972826e087a9a71a34253c85dd6f1b6b6837ca97303f8d43478a66595057d65a6e72a72334a3257ef88
+EBUILD lxc-4.0.2-r2.ebuild 4413 BLAKE2B cefb6671714dc8b83bc346743cc2021f02e7a24ac6943905cb67f69bf2305f556a8151207659460487088c811576420a19a847469860517dc475ecf08d763a97 SHA512 63d40850523186a87e4c9539d4da43cbc8a45a2823a812479d8a7a75652f6d9ba425f7bfb7d2e32684a27267ed5caca00d08a263315d3991f0c47e0d7daf4e33
+EBUILD lxc-4.0.3.ebuild 4415 BLAKE2B 13a6aec708e20cc54dfd3d48e34183ed760367fa18f9c3f7ac36e9491f166350fc91f66fc1c3656e1fcbf89bf0f1120e9675561caf1c523d4214daf2be51c578 SHA512 4420cb4a4856408d66f49b15348e6cafde2efc68300b188c89ce752f337bab1bb9dd368146fdb38ef0cfc9c9a0e448667d806199401ec0d4f8acdfb7239b383a
 MISC metadata.xml 614 BLAKE2B 8c637599d38ecb5fd975fbb4385998886e450cd01d71c342a212258acf6fa0de3a377189544ab744da55b1d85ad5dd8fd2bbbb2daef7389ce61dd7d17bab7f00 SHA512 a14166b818647f0c5c6bb8402f82b333ce52591645c7ec86c8fff953889d61d00db0bcf46faca630a2f472c2918484a230b7b3fcc06099fbdbe4e31ec6bb9270
diff --git a/app-emulation/lxc/files/lxc.initd.7 b/app-emulation/lxc/files/lxc.initd.7
deleted file mode 100644
index 6a42b6aac520..000000000000
--- a/app-emulation/lxc/files/lxc.initd.7
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-CONTAINER=${SVCNAME#*.}
-
-LXC_PATH=`lxc-config lxc.lxcpath`
-
-lxc_get_configfile() {
-	if [ -f "${LXC_PATH}/${CONTAINER}.conf" ]; then
-		echo "${LXC_PATH}/${CONTAINER}.conf"
-	elif [ -f "${LXC_PATH}/${CONTAINER}/config" ]; then
-		echo "${LXC_PATH}/${CONTAINER}/config"
-	else
-		eerror "Unable to find a suitable configuration file."
-		eerror "If you set up the container in a non-standard"
-		eerror "location, please set the CONFIGFILE variable."
-		return 1
-	fi
-}
-
-[ $CONTAINER != $SVCNAME ] && CONFIGFILE=${CONFIGFILE:-$(lxc_get_configfile)}
-
-lxc_get_var() {
-	awk 'BEGIN { FS="[ \t]*=[ \t]*" } $1 == "'$1'" { print $2; exit }' ${CONFIGFILE}
-}
-
-lxc_get_net_link_type() {
-	awk 'BEGIN { FS="[ \t]*=[ \t]*"; _link=""; _type="" }
-		$1 == "lxc.network.type" {_type=$2;}
-		$1 == "lxc.network.link" {_link=$2;}
-		match($1, /lxc\.net\.[[:digit:]]+\.type/) {_type=$2;}
-		match($1, /lxc\.net\.[[:digit:]]+\.link/) {_link=$2;}
-		{if(_link != "" && _type != ""){
-			printf("%s:%s\n", _link, _type );
-			_link=""; _type="";
-		}; }' <${CONFIGFILE}
-}
-
-checkconfig() {
-	if [ ${CONTAINER} = ${SVCNAME} ]; then
-		eerror "You have to create an init script for each container:"
-		eerror " ln -s lxc /etc/init.d/lxc.container"
-		return 1
-	fi
-
-	# no need to output anything, the function takes care of that.
-	[ -z "${CONFIGFILE}" ] && return 1
-
-	utsname=$(lxc_get_var lxc.uts.name)
-	if [ -z "$utsname" ] ; then
-		utsname=$(lxc_get_var lxc.utsname)
-	fi
-
-	if [ "${CONTAINER}" != "${utsname}" ]; then
-	    eerror "You should use the same name for the service and the"
-	    eerror "container. Right now the container is called ${utsname}"
-	    return 1
-	fi
-}
-
-depend() {
-	# be quiet, since we have to run depend() also for the
-	# non-muxed init script, unfortunately.
-	checkconfig 2>/dev/null || return 0
-
-	config ${CONFIGFILE}
-	need localmount
-	use lxcfs
-
-	local _x _if
-	for _x in $(lxc_get_net_link_type); do
-		_if=${_x%:*}
-		case "${_x##*:}" in
-			# when the network type is set to phys, we can make use of a
-			# network service (for instance to set it up before we disable
-			# the net_admin capability), but we might also not set it up
-			# at all on the host and leave the net_admin capable service
-			# to take care of it.
-			phys)	use net.${_if} ;;
-			*)	need net.${_if} ;;
-		esac
-	done
-}
-
-start() {
-	checkconfig || return 1
-	rm -f /var/log/lxc/${CONTAINER}.log
-
-	rootpath=$(lxc_get_var lxc.rootfs)
-
-	# Check the format of our init and the chroot's init, to see
-	# if we have to use linux32 or linux64; always use setarch
-	# when required, as that makes it easier to deal with
-	# x32-based containers.
-	case $(scanelf -BF '%a#f' ${rootpath}/sbin/init) in
-		EM_X86_64)	setarch=linux64;;
-		EM_386)		setarch=linux32;;
-	esac
-
-	ebegin "Starting ${CONTAINER}"
-	env -i ${setarch} $(which lxc-start) -l WARN -n ${CONTAINER} -f ${CONFIGFILE} -d -o /var/log/lxc/${CONTAINER}.log
-	sleep 1
-
-	# lxc-start -d will _always_ report a correct startup, even if it
-	# failed, so rather than trust that, check that the cgroup exists.
-	[ -d /sys/fs/cgroup/cpuset/lxc/${CONTAINER} ]
-	eend $?
-}
-
-stop() {
-	checkconfig || return 1
-
-
-	if ! [ -d /sys/fs/cgroup/cpuset/lxc/${CONTAINER} ]; then
-	    ewarn "${CONTAINER} doesn't seem to be started."
-	    return 0
-	fi
-
-	# 10s should be enough to shut everything down
-	ebegin "Stopping ${CONTAINER}"
-	lxc-stop -t 10 -n ${CONTAINER}
-	eend $?
-}
diff --git a/app-emulation/lxc/files/lxc_at.service.4 b/app-emulation/lxc/files/lxc_at.service.4
deleted file mode 100644
index 64ae7457096c..000000000000
--- a/app-emulation/lxc/files/lxc_at.service.4
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Linux Container %I
-After=network.target
-Wants=lxcfs.service
-
-[Service]
-Restart=always
-ExecStart=/usr/bin/lxc-start -n %i -F
-ExecReload=/usr/bin/lxc-restart -n %i
-ExecStop=/usr/bin/lxc-stop -n %i
-Delegate=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-emulation/lxc/lxc-3.0.3.ebuild b/app-emulation/lxc/lxc-3.0.3.ebuild
deleted file mode 100644
index 136493184f47..000000000000
--- a/app-emulation/lxc/lxc-3.0.3.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 linux-info flag-o-matic systemd readme.gentoo-r1 pam
-
-DESCRIPTION="LinuX Containers userspace utilities"
-HOMEPAGE="https://linuxcontainers.org/"
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
-
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="apparmor examples pam python seccomp selinux +templates"
-
-RDEPEND="
-	net-libs/gnutls
-	sys-libs/libcap
-	pam? ( sys-libs/pam )
-	seccomp? ( sys-libs/libseccomp )
-	selinux? ( sys-libs/libselinux )"
-
-DEPEND="${RDEPEND}
-	>=app-text/docbook-sgml-utils-0.6.14-r2
-	>=sys-kernel/linux-headers-3.2"
-
-RDEPEND="${RDEPEND}
-	sys-apps/util-linux
-	app-misc/pax-utils
-	virtual/awk"
-
-PDEPEND="templates? ( app-emulation/lxc-templates )
-	python? ( dev-python/python3-lxc )"
-
-CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
-	~CPUSETS ~CGROUP_CPUACCT
-	~CGROUP_SCHED
-
-	~NAMESPACES
-	~IPC_NS ~USER_NS ~PID_NS
-
-	~CGROUP_FREEZER
-	~UTS_NS ~NET_NS
-	~VETH ~MACVLAN
-
-	~POSIX_MQUEUE
-	~!NETPRIO_CGROUP
-
-	~!GRKERNSEC_CHROOT_MOUNT
-	~!GRKERNSEC_CHROOT_DOUBLE
-	~!GRKERNSEC_CHROOT_PIVOT
-	~!GRKERNSEC_CHROOT_CHMOD
-	~!GRKERNSEC_CHROOT_CAPS
-	~!GRKERNSEC_PROC
-	~!GRKERNSEC_SYSFS_RESTRICT
-	~!GRKERNSEC_CHROOT_FINDTASK
-"
-
-ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES:  needed for pts inside container"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:  needed to freeze containers"
-
-ERROR_UTS_NS="CONFIG_UTS_NS:  needed to unshare hostnames and uname info"
-ERROR_NET_NS="CONFIG_NET_NS:  needed for unshared network"
-
-ERROR_VETH="CONFIG_VETH:  needed for internal (host-to-container) networking"
-ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) networking"
-
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
-
-ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting."
-
-ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT:  some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE:  some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT:  some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD:  some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS:  some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC:  this GRSEC feature is incompatible with unprivileged containers"
-ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT:  this GRSEC feature is incompatible with unprivileged containers"
-
-DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt)
-
-pkg_setup() {
-	kernel_is -lt 4 7 && CONFIG_CHECK="${CONFIG_CHECK} ~DEVPTS_MULTIPLE_INSTANCES"
-	linux-info_pkg_setup
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
-	"${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	# --enable-doc is for manpages which is why we don't link it to a "doc"
-	# USE flag. We always want man pages.
-	local myeconfargs=(
-		--localstatedir=/var
-		--bindir=/usr/bin
-		--sbindir=/usr/bin
-		--with-config-path=/var/lib/lxc
-		--with-rootfs-path=/var/lib/lxc/rootfs
-		--with-distro=gentoo
-		--with-runtime-path=/run
-		--disable-apparmor
-		--disable-werror
-		--enable-doc
-		$(use_enable apparmor)
-		$(use_enable examples)
-		$(use_enable pam)
-		$(use_with pam pamdir $(getpam_mod_dir))
-		$(use_enable seccomp)
-		$(use_enable selinux)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
-	bashcomp_alias ${PN}-start \
-		${PN}-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,stop,unfreeze,wait}
-
-	keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc
-	rmdir "${D}"/var/cache/lxc "${D}"/var/cache || die "rmdir failed"
-
-	find "${D}" -name '*.la' -delete
-
-	# Gentoo-specific additions!
-	newinitd "${FILESDIR}/${PN}.initd.7" ${PN}
-
-	# Remember to compare our systemd unit file with the upstream one
-	# config/init/systemd/lxc.service.in
-	systemd_newunit "${FILESDIR}"/${PN}_at.service.4 "lxc@.service"
-
-	DOC_CONTENTS="
-	For openrc, there is an init script provided with the package.
-	You _should_ only need to symlink /etc/init.d/lxc to
-	/etc/init.d/lxc.configname to start the container defined in
-	/etc/lxc/configname.conf.
-
-	Correspondingly, for systemd a service file lxc@.service is installed.
-	Enable and start lxc@configname in order to start the container defined
-	in /etc/lxc/configname.conf.
-
-	If you want checkpoint/restore functionality, please install criu
-	(sys-process/criu)."
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/lxc/lxc-4.0.2-r2.ebuild b/app-emulation/lxc/lxc-4.0.2-r2.ebuild
index 9f71458a5e7e..18554a5e703a 100644
--- a/app-emulation/lxc/lxc-4.0.2-r2.ebuild
+++ b/app-emulation/lxc/lxc-4.0.2-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="LinuX Containers userspace utilities"
 HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc"
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/app-emulation/lxc/lxc-4.0.3.ebuild b/app-emulation/lxc/lxc-4.0.3.ebuild
new file mode 100644
index 000000000000..9f71458a5e7e
--- /dev/null
+++ b/app-emulation/lxc/lxc-4.0.3.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 linux-info flag-o-matic pam readme.gentoo-r1 systemd
+
+DESCRIPTION="LinuX Containers userspace utilities"
+HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc"
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="apparmor +caps doc examples libressl pam seccomp selinux +ssl +templates +tools"
+
+RDEPEND="app-misc/pax-utils
+	sys-apps/util-linux
+	sys-libs/libcap
+	virtual/awk
+	caps? ( sys-libs/libcap )
+	pam? ( sys-libs/pam )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sys-libs/libselinux )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	>=app-text/docbook-sgml-utils-0.6.14-r2
+	>=sys-kernel/linux-headers-3.2
+	apparmor? ( sys-apps/apparmor )"
+BDEPEND="doc? ( app-doc/doxygen )"
+PDEPEND="templates? ( app-emulation/lxc-templates )"
+
+CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
+	~CPUSETS ~CGROUP_CPUACCT
+	~CGROUP_SCHED
+
+	~NAMESPACES
+	~IPC_NS ~USER_NS ~PID_NS
+
+	~CGROUP_FREEZER
+	~UTS_NS ~NET_NS
+	~VETH ~MACVLAN
+
+	~POSIX_MQUEUE
+	~!NETPRIO_CGROUP"
+
+ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:  needed to freeze containers"
+ERROR_UTS_NS="CONFIG_UTS_NS:  needed to unshare hostnames and uname info"
+ERROR_NET_NS="CONFIG_NET_NS:  needed for unshared network"
+ERROR_VETH="CONFIG_VETH:  needed for internal (host-to-container) networking"
+ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) networking"
+ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
+ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting."
+
+DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
+
+pkg_setup() {
+	linux-info_pkg_setup
+}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
+	"${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# --enable-doc is for manpages which is why we don't link it to a "doc"
+	# USE flag. We always want man pages.
+	local myeconfargs=(
+		--bindir=/usr/bin
+		--localstatedir=/var
+		--sbindir=/usr/bin
+
+		--with-config-path=/var/lib/lxc
+		--with-distro=gentoo
+		--with-init-script=systemd
+		--with-rootfs-path=/var/lib/lxc/rootfs
+		--with-runtime-path=/run
+		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+
+		--disable-asan
+		--disable-coverity-build
+		--disable-dlog
+		--disable-mutex-debugging
+		--disable-rpath
+		--disable-tests
+		--disable-ubsan
+		--disable-werror
+
+		--enable-bash
+		--enable-commands
+		--enable-doc
+		--enable-memfd-rexec
+		--enable-thread-safety
+
+		$(use_enable apparmor)
+		$(use_enable caps capabilities)
+		$(use_enable doc api-docs)
+		$(use_enable examples)
+		$(use_enable pam)
+		$(use_enable seccomp)
+		$(use_enable selinux)
+		$(use_enable ssl openssl)
+		$(use_enable tools)
+
+		$(use_with pam pamdir $(getpam_mod_dir))
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
+	bashcomp_alias ${PN}-start \
+		${PN}-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,stop,unfreeze,wait}
+
+	keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc
+	rmdir "${D}"/var/cache/lxc "${D}"/var/cache || die "rmdir failed"
+
+	find "${D}" -name '*.la' -delete -o -name '*.a' -delete || die
+
+	# Gentoo-specific additions!
+	newinitd "${FILESDIR}/${PN}.initd.8" ${PN}
+
+	# Remember to compare our systemd unit file with the upstream one
+	# config/init/systemd/lxc.service.in
+	systemd_newunit "${FILESDIR}"/${PN}_at.service.4.0.0 "lxc@.service"
+
+	DOC_CONTENTS="
+	For openrc, there is an init script provided with the package.
+	You _should_ only need to symlink /etc/init.d/lxc to
+	/etc/init.d/lxc.configname to start the container defined in
+	/etc/lxc/configname.conf.
+
+	Correspondingly, for systemd a service file lxc@.service is installed.
+	Enable and start lxc@configname in order to start the container defined
+	in /etc/lxc/configname.conf.
+
+	If you want checkpoint/restore functionality, please install criu
+	(sys-process/criu)."
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 4d38dedd79c5..c4c509e429ce 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,11 +1,9 @@
-AUX de-translation-newline-1.patch 432 BLAKE2B 2b546cd7200f0d736bffd255bbb79d4e997241a35159e052598d4b9da77ca402a0eb90fcb6fae74ac7d9dca9b8383843fd67fb88b6cab474e547d892ac414d4b SHA512 2857ec4e4856d47340163c10644805ee7a65a0095539c7fdc422b874d1af645187a1de0aff4844d9ed0387cebbd82dbb33da32a839b6dda02df4c3d741e88d76
 AUX lxd-4.0.0.confd 582 BLAKE2B 88ce8ec99eb50174bffea7d3b8bddc67b50fe6677d54df115c9069311b5fb59a72170a15988f50714740074f7ec4f2cd32fb47b6d8c52cf69b8c6fa332162a06 SHA512 96d922ae81677eebace3f8d2dff7f67d58701c40c09e2435677f9289cca89fe260c0d9526059d3772c3405a5b8ec52466bf7d7a920dcdd7551f1b3f01f2fc9c4
 AUX lxd-4.0.0.initd 1097 BLAKE2B 8cd967f37edc7c87a5d225dc77a39e6696596fb9d53829289b75b3f136572aaaaede5ad78360c0ca2055bcf23627fd75102616ff9da604785bdcbdcb57ae81ff SHA512 5a40f0e7a6fe5e8b301f8fc22344fed64fe8b8894a175600e938f147f49ccf4fa71c75fdfe25ba936c65435fcabdc5f7a606993093e5ffdb7dbc4e0b9f03621d
-AUX lxd.confd 538 BLAKE2B f020d83375bddc3e88f752d4be49c65893901893eaa572f212c655f4d3c5631b41238ed917c70f16b4c092d82ced13011edd6e91140cda251ebf8745591cd886 SHA512 9ea61647a8da82bc595f78882adf5a6c71483c7adf8965d7d32016a67a0da6510f8dc3d09fd29f77d5f6d5f18282bca3b3b5c2abffaa67265a4fd4ddb07f31a8
-AUX lxd.initd 853 BLAKE2B 0b48de1a596767db356850adcb5682c5c351e7477b0d49d81aebf857a01e4eb75067087d323ba4b5d6fbf8765a76cf161ad2cfaa0eba480fb86e91fdb95b0e79 SHA512 960aceb2845cc3b454b2f916c73273f4b1ec6f87e5d569c27c8c58e0db153c084e03addbdcc91dc8761fc6f0e306261d87db73f8610fda197e55f9ec6756fd56
+AUX lxd-4.0.1-clang.patch 2566 BLAKE2B 1cc6db796393569512dda9b483afaac810a0d2f852308901d1a79e76ffd6def7b4d6a269054c1ec9180de616d0550f4e2542f6aa5417ce91d51ab3ac6cb72fca SHA512 748cf9bf93d4b86de230bf85313ba90e435e8e7011383cba39f4a5767c9cf9e818eb8eae3213d8745ed114a62ae633b311d2088e3e35b1ccef6f5ede5a0f424c
 AUX lxd.service 174 BLAKE2B 8686d57a79fbc3a9ec2e1a3197012599a5d6b81b62188e779cdb9a86f9f413fa485090c79dab8c4aa8891e0e35604b85fb1cdb1da313918b34a974b61699b24a SHA512 6f9d71d5c08c49653f28511bc793d1365604af6bf105789caea27f4685d721fbb283f888e3b7310997b73ff2fc5bb1a47e7500c4678cb3d39124cab723523140
-DIST lxd-3.14.tar.gz 26141949 BLAKE2B 69004501012c9a873eef77a60df7e5dba25c692224d27b02cd2d2b27533012e71bd7562cb64a17920234746e8be2819bb773365c01422c0b776dd2b7c36b69fe SHA512 3d2d4e61298fc9fde49defad776a398fcccf7639485e810173c9c7f7d939c354a9ad8112a4a631b0850f6eb54435012d289236ff61839416caf95434eb23c8ff
 DIST lxd-4.0.1.tar.gz 25027762 BLAKE2B 1154a427558ad5eda62b63501a2f62a5c3a1b740fac061432b06a1034b75cb906f38d6c43e8215cab8ae0bed328d75a7612c1bb7af3272cdbe3f93235d5bb920 SHA512 1f47f8239cc1d3425fc4cd075487678e219e94deddec10f52a1cd18fbdc0515f54b67552e7b41d0052803c317a861b34cfc83a25776eae7b9673b5c5fd50d70f
-EBUILD lxd-3.14.ebuild 6865 BLAKE2B 56a86d6bb704c3c562654d01953b566f34e9d57abf915972899b663b61e8d9fe1e50523a439a406b013e7396c3286e104859bf4ca23106306ee719ef41810d80 SHA512 aadb152acac7f5784028bbd89c8ebc105992dd6898e22ed36b26889969b7ce1cffdb79e8db1c0e0a43ca98cae7feee3f133165c3f624b87611dfed1dbe0c8511
-EBUILD lxd-4.0.1.ebuild 5667 BLAKE2B 0d264505373865191a0db35f39e93a02783696904f1e254e8e4eb4b698652db207bc22e222f7c70337a9db648f0af3d64f3faad0b21541a158e73cbf0bc7179d SHA512 6ce8d93d08af5f15984d4f0a099edb478a3bc42ea13a4028b01288e8436de0352e97f78a35edc8451f5f8399bb37faaf9fef5c110b71fc0ef5cb53fee36c8fd5
-MISC metadata.xml 925 BLAKE2B 74a89f515bf441f62686a9a2fc2576ec8986705b681e52c9e8267acd6839b06fdafe82dd27df43c39b5e09bba87e63bbb27cc4da18ed31931393946b90add05b SHA512 e4fc6d70a790e164366349e4980f5161db0ca1b4d1996c1ce32223a75926a38ea46f8e08e6c708c6f41c2c81aebde3dbe0d0ce5c63f9340f7ae6f895b5fde144
+DIST lxd-4.0.2.tar.gz 25350601 BLAKE2B 2abecb61759a1a717960671516157dc7b7a36865ecdbcec1f211e5b653b2b4afc41932a4a289430de0dd4ac1e2c777de471ab26e31dbf2b8d1855f67d03886ad SHA512 6c1c668055e9677850f24e142e6741cb6b5aa8d4d9cce29af566e8090c28e04b4baf973f486aef28b7f6b34be5b9ab9bb45e77956879ff7feff6bec8e4db3077
+EBUILD lxd-4.0.1.ebuild 5715 BLAKE2B 7b5da6fd786bfbcd0381d02fe00a3f6d2da680f3ac497d2e890cac11f5b577271496540ac1e48c200a70f9d7be61887f95de0d209075386d55da509e416cef56 SHA512 c8083ec436f116f3bad879c05ab75f33c4113b79ec4ea241e2f95a85edd636166468cc76b991c53ad7469fb98ffefb8ce94de807c8d1db86f3d47026e48a27a7
+EBUILD lxd-4.0.2.ebuild 5646 BLAKE2B a12ba65e48ddbb509d7f4776581cf6347efc6a5fe9f2cd155f9da61cb7bb2b1f3201b5e9287976663727b553ac0a1de0b6510af3ccd5f5c71bcdb257ff6ac261 SHA512 4ca17c1526bdafa38fea05d19a0e9cd6c960d90bd4ef146545fd8a19c90d580fdbf07f599ccbe3db72c35716a236b72c7e6b0ba1d3150919ba2bf8b61dbb8347
+MISC metadata.xml 677 BLAKE2B 4349c9e18f865c5036e53c6cc5e6492ef35d73786408dbb54f8ad77b7e5edcdf48f5636cbd571e0a510c1faffcc17cfda32461185266af8e3f5fd541bae389b9 SHA512 0e1639760f475f9c77dfe0e1457b5ee2dec81cdb87ba92c179882ad820d82d9fa2606d88eb16eea847f0cfebab7327106abe984bead69ac6670929c181dce86b
diff --git a/app-emulation/lxd/files/de-translation-newline-1.patch b/app-emulation/lxd/files/de-translation-newline-1.patch
deleted file mode 100644
index 4c731e9023dc..000000000000
--- a/app-emulation/lxd/files/de-translation-newline-1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /po/de.po	2018-06-27 19:57:56.759130047 -0500
-+++ /po/de.po	2018-06-27 20:01:09.694634346 -0500
-@@ -167,7 +167,7 @@
- "###\n"
- "### Each property is represented by a single line:\n"
- "### An example would be:\n"
--"###  description: My custom image"
-+"###  description: My custom image\n"
- msgstr ""
- "### Dies ist eine Darstellung der Eigenschaften eines Images in yaml.\n"
- "### Jede Zeile die mit '# beginnt wird ignoriert.\n"
diff --git a/app-emulation/lxd/files/lxd-4.0.1-clang.patch b/app-emulation/lxd/files/lxd-4.0.1-clang.patch
new file mode 100644
index 000000000000..765f2f38be5d
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-4.0.1-clang.patch
@@ -0,0 +1,76 @@
+From c7ce94825871ea5d0946e92762e981354628b8ad Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@ubuntu.com>
+Date: Mon, 22 Jun 2020 22:17:02 -0400
+Subject: [PATCH] lxd: Fix building with clang
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Closes #7573
+
+Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
+---
+ lxd/main_forksyscall.go |  8 --------
+ lxd/seccomp/seccomp.go  | 16 ++++++++--------
+ 2 files changed, 8 insertions(+), 16 deletions(-)
+
+diff --git a/lxd/main_forksyscall.go b/lxd/main_forksyscall.go
+index a304405c2e..14895b6ce0 100644
+--- a/lxd/main_forksyscall.go
++++ b/lxd/main_forksyscall.go
+@@ -34,12 +34,6 @@ extern void attach_userns_fd(int ns_fd);
+ extern int pidfd_nsfd(int pidfd, pid_t pid);
+ extern bool setnsat(int ns_fd, const char *ns);
+ 
+-static inline bool same_fsinfo(struct stat *s1, struct stat *s2,
+-			       struct statfs *sfs1, struct statfs *sfs2)
+-{
+-	return ((sfs1->f_type == sfs2->f_type) && (s1->st_dev == s2->st_dev));
+-}
+-
+ static bool chdirchroot_in_mntns(int cwd_fd, int root_fd)
+ {
+ 	ssize_t len;
+@@ -209,8 +203,6 @@ const char *ns_names[] = { "user", "pid", "uts", "ipc", "net", "cgroup", NULL };
+ 
+ static bool change_creds(int ns_fd, cap_t caps, uid_t nsuid, gid_t nsgid, uid_t nsfsuid, gid_t nsfsgid)
+ {
+-	__do_close int fd = -EBADF;
+-
+ 	if (prctl(PR_SET_KEEPCAPS, 1))
+ 		return false;
+ 
+diff --git a/lxd/seccomp/seccomp.go b/lxd/seccomp/seccomp.go
+index 8945fd9197..025efb3141 100644
+--- a/lxd/seccomp/seccomp.go
++++ b/lxd/seccomp/seccomp.go
+@@ -91,21 +91,21 @@ static int device_allowed(dev_t dev, mode_t mode)
+ {
+ 	switch (mode & S_IFMT) {
+ 	case S_IFCHR:
+-		if ((dev == makedev(0, 0))) // whiteout
++		if (dev == makedev(0, 0)) // whiteout
+ 			return 0;
+-		else if ((dev == makedev(5, 1))) // /dev/console
++		else if (dev == makedev(5, 1)) // /dev/console
+ 			return 0;
+-		else if ((dev == makedev(1, 7))) // /dev/full
++		else if (dev == makedev(1, 7)) // /dev/full
+ 			return 0;
+-		else if ((dev == makedev(1, 3))) // /dev/null
++		else if (dev == makedev(1, 3)) // /dev/null
+ 			return 0;
+-		else if ((dev == makedev(1, 8))) // /dev/random
++		else if (dev == makedev(1, 8)) // /dev/random
+ 			return 0;
+-		else if ((dev == makedev(5, 0))) // /dev/tty
++		else if (dev == makedev(5, 0)) // /dev/tty
+ 			return 0;
+-		else if ((dev == makedev(1, 9))) // /dev/urandom
++		else if (dev == makedev(1, 9)) // /dev/urandom
+ 			return 0;
+-		else if ((dev == makedev(1, 5))) // /dev/zero
++		else if (dev == makedev(1, 5)) // /dev/zero
+ 			return 0;
+ 	}
+ 
diff --git a/app-emulation/lxd/files/lxd.confd b/app-emulation/lxd/files/lxd.confd
deleted file mode 100644
index 8e342cc62d16..000000000000
--- a/app-emulation/lxd/files/lxd.confd
+++ /dev/null
@@ -1,24 +0,0 @@
-# Group which owns the shared socket
-LXD_OPTIONS+=" --group lxd"
-
-
-
-# Enable cpu profiling into the specified file
-#LXD_OPTIONS+=" --cpuprofile /tmp/lxc_cpu_profile"
-
-# Enable memory profiling into the specified file
-#LXD_OPTIONS+=" --memprofile /tmp/lxc_mem_profile"
-
-
-
-# Enables debug mode
-#LXD_OPTIONS+=" --debug"
-
-# For debugging, print a complete stack trace every n seconds
-#LXD_OPTIONS+=" --print-goroutines 5"
-
-# Enables verbose mode
-#LXD_OPTIONS+=" --verbose"
-
-# Logfile to log to
-#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
diff --git a/app-emulation/lxd/files/lxd.initd b/app-emulation/lxd/files/lxd.initd
deleted file mode 100644
index b1fa7caac546..000000000000
--- a/app-emulation/lxd/files/lxd.initd
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON=/usr/sbin/lxd
-PIDFILE=/run/lxd.pid
-
-extra_commands="stopall"
-
-depend() {
-    need net
-    use lxcfs
-}
-
-start() {
-    ebegin "Starting lxd service"
-
-    start-stop-daemon --start \
-		      --pidfile ${PIDFILE} \
-		      --exec ${DAEMON} \
-		      --background \
-		      --make-pidfile \
-		      -- \
-		      ${LXD_OPTIONS}
-
-    eend $?
-}
-
-stop() {
-    if [ "$RC_GOINGDOWN" = "YES" ] || [ "$RC_REBOOT" = "YES" ]; then
-	stopall
-    else
-	ebegin "Stopping lxd service (but not containers)"
-	start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
-	eend $?
-    fi
-}
-
-stopall() {
-    ebegin "Stopping lxd service and containers"
-    if "${DAEMON}" shutdown; then
-	/etc/init.d/lxd zap
-	rm -f ${PIDFILE}
-    fi
-    eend $?
-}
diff --git a/app-emulation/lxd/lxd-3.14.ebuild b/app-emulation/lxd/lxd-3.14.ebuild
deleted file mode 100644
index 3639d12ad028..000000000000
--- a/app-emulation/lxd/lxd-3.14.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
-
-LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-
-IUSE="+daemon +ipv6 +dnsmasq nls test tools"
-RESTRICT="!test? ( test )"
-
-inherit autotools bash-completion-r1 linux-info systemd user
-
-SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
-
-DEPEND="
-	dev-lang/tcl
-	>=dev-lang/go-1.9.4
-	dev-libs/libuv
-	dev-libs/protobuf
-	nls? ( sys-devel/gettext )
-	test? (
-		app-misc/jq
-		net-misc/curl
-		sys-devel/gettext
-	)
-"
-
-RDEPEND="
-	daemon? (
-		app-arch/xz-utils
-		>=app-emulation/lxc-2.0.7[seccomp]
-		dev-libs/libuv
-		dev-libs/lzo
-		dev-util/xdelta:3
-		dnsmasq? (
-			net-dns/dnsmasq[dhcp,ipv6?]
-		)
-		net-firewall/ebtables
-		net-firewall/iptables[ipv6?]
-		net-libs/libnfnetlink
-		net-libs/libnsl:0=
-		net-misc/rsync[xattr]
-		sys-apps/iproute2[ipv6?]
-		sys-fs/fuse
-		sys-fs/lxcfs
-		sys-fs/squashfs-tools
-		virtual/acl
-	)
-"
-
-CONFIG_CHECK="
-	~BRIDGE
-	~DUMMY
-	~IP6_NF_NAT
-	~IP6_NF_TARGET_MASQUERADE
-	~IPV6
-	~IP_NF_NAT
-	~IP_NF_TARGET_MASQUERADE
-	~MACVLAN
-	~NETFILTER_XT_MATCH_COMMENT
-	~NET_IPGRE
-	~NET_IPGRE_DEMUX
-	~NET_IPIP
-	~NF_NAT_MASQUERADE_IPV4
-	~NF_NAT_MASQUERADE_IPV6
-	~VXLAN
-"
-
-ERROR_BRIDGE="BRIDGE: needed for network commands"
-ERROR_DUMMY="DUMMY: needed for network commands"
-ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
-ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network commands"
-ERROR_IPV6="IPV6: needed for network commands"
-ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
-ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network commands"
-ERROR_MACVLAN="MACVLAN: needed for network commands"
-ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for network commands"
-ERROR_NET_IPGRE="NET_IPGRE: needed for network commands"
-ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands"
-ERROR_NET_IPIP="NET_IPIP: needed for network commands"
-ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network commands"
-ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network commands"
-ERROR_VXLAN="VXLAN: needed for network commands"
-
-EGO_PN="github.com/lxc/lxd"
-
-src_prepare() {
-	eapply_user
-	eapply "${FILESDIR}/de-translation-newline-1.patch"
-
-	cd "${S}/dist/dqlite" || die "Can't cd to dqlite dir"
-	eautoreconf
-}
-
-src_configure() {
-	export GOPATH="${S}/dist"
-	cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir"
-	econf --enable-replication --disable-amalgamation --disable-tcl --libdir="${EPREFIX}/usr/lib/lxd"
-
-	cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir"
-	PKG_CONFIG_PATH="${GOPATH}/sqlite/" econf --libdir=${EPREFIX}/usr/lib/lxd
-}
-
-src_compile() {
-	export GOPATH="${S}/dist"
-
-	cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir"
-	emake
-
-	cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir"
-	emake CFLAGS="-I${GOPATH}/sqlite" LDFLAGS="-L${GOPATH}/sqlite"
-
-	# We don't use the Makefile here because it builds targets with the
-	# assumption that `pwd` is in a deep gopath namespace, which we're not.
-	# It's simpler to manually call "go install" than patching the Makefile.
-	cd "${S}"
-	go install -v -x ${EGO_PN}/lxc || die "Failed to build the client"
-
-	if use daemon; then
-
-		# LXD depends on a patched, bundled sqlite with replication
-		# capabilities.
-		export CGO_CFLAGS="-I${GOPATH}/sqlite/ -I${GOPATH}/dqlite/include/"
-		export CGO_LDFLAGS="-L${GOPATH}/sqlite/.libs/ -L${GOPATH}/dqlite/.libs/ -Wl,-rpath,${EPREFIX}/usr/lib/lxd"
-		export LD_LIBRARY_PATH="${GOPATH}/sqlite/.libs/:${GOPATH}/dqlite/.libs/"
-
-		go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon"
-	fi
-
-	if use tools; then
-		go install -v -x ${EGO_PN}/fuidshift || die "Failed to build fuidshift"
-		go install -v -x ${EGO_PN}/lxc-to-lxd || die "Failed to build lxc-to-lxd"
-		go install -v -x ${EGO_PN}/lxd-benchmark || die "Failed to build lxd-benchmark"
-		go install -v -x ${EGO_PN}/lxd-p2c || die "Failed to build lxd-p2c"
-	fi
-
-	use nls && emake build-mo
-}
-
-src_test() {
-	if use daemon; then
-		export GOPATH="${S}/dist"
-		# This is mostly a copy/paste from the Makefile's "check" rule, but
-		# patching the Makefile to work in a non "fully-qualified" go namespace
-		# was more complicated than this modest copy/paste.
-		# Also: sorry, for now a network connection is needed to run tests.
-		# Will properly bundle test dependencies later.
-		go get -v -x github.com/rogpeppe/godeps
-		go get -v -x github.com/remyoudompheng/go-misc/deadcode
-		go get -v -x github.com/golang/lint/golint
-		go test -v ${EGO_PN}/lxd
-	else
-		einfo "No tests to run for client-only builds"
-	fi
-}
-
-src_install() {
-	local bindir="dist/bin"
-	dobin ${bindir}/lxc
-	if use daemon; then
-
-		export GOPATH="${S}/dist"
-		cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir"
-		emake DESTDIR="${D}" install
-
-		cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir"
-		emake DESTDIR="${D}" install
-
-		# Must only install libs
-		rm "${D}/usr/bin/sqlite3" || die "Can't remove custom sqlite3 binary"
-		rm -r "${D}/usr/include" || die "Can't remove include directory"
-
-		cd "${S}" || die "Can't cd to \${S}"
-		dosbin ${bindir}/lxd
-	fi
-
-	if use tools; then
-		dobin ${bindir}/fuidshift
-		dobin ${bindir}/lxc-to-lxd
-		dobin ${bindir}/lxd-benchmark
-		dobin ${bindir}/lxd-p2c
-	fi
-
-	if use nls; then
-		domo po/*.mo
-	fi
-
-	if use daemon; then
-		newinitd "${FILESDIR}"/${PN}.initd lxd
-		newconfd "${FILESDIR}"/${PN}.confd lxd
-
-		systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
-	fi
-
-	newbashcomp scripts/bash/lxd-client lxc
-
-	dodoc AUTHORS doc/*
-}
-
-pkg_postinst() {
-	elog
-	elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
-	elog "including a Quick Start."
-
-	# The messaging below only applies to daemon installs
-	use daemon || return 0
-
-	# The control socket will be owned by (and writeable by) this group.
-	enewgroup lxd
-
-	# Ubuntu also defines an lxd user but it appears unused (the daemon
-	# must run as root)
-
-	elog
-	elog "Though not strictly required, some features are enabled at run-time"
-	elog "when the relevant helper programs are detected:"
-	elog "- sys-apps/apparmor"
-	elog "- sys-fs/btrfs-progs"
-	elog "- sys-fs/lvm2"
-	elog "- sys-fs/zfs"
-	elog "- sys-process/criu"
-	elog
-	elog "Since these features can't be disabled at build-time they are"
-	elog "not USE-conditional."
-	elog
-	elog "Be sure to add your local user to the lxd group."
-	elog
-	elog "Networks with bridge.mode=fan are unsupported due to requiring"
-	elog "a patched kernel and iproute2."
-}
-
-# TODO:
-# - man page, I don't see cobra generating it
-# - maybe implement LXD_CLUSTER_UPDATE per
-#     https://discuss.linuxcontainers.org/t/lxd-3-5-has-been-released/2656
-#     EM I'm not convinced it's a good design.
diff --git a/app-emulation/lxd/lxd-4.0.1.ebuild b/app-emulation/lxd/lxd-4.0.1.ebuild
index 21a6fcee0663..578a64630a10 100644
--- a/app-emulation/lxd/lxd-4.0.1.ebuild
+++ b/app-emulation/lxd/lxd-4.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
 # Needs to include licenses for all bundled programs.
 LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+ipv6 nls"
 
 DEPEND="app-arch/xz-utils
@@ -67,6 +67,8 @@ QA_PREBUILT="/usr/lib/lxd/libdqlite.so.0.0.1
 EGO_PN="github.com/lxc/lxd"
 GOPATH="${S}/_dist" # this seems to reset every now and then, though
 
+PATCHES=( "${FILESDIR}"/lxd-4.0.1-clang.patch )
+
 common_op() {
 	local i
 	for i in dqlite raft; do
diff --git a/app-emulation/lxd/lxd-4.0.2.ebuild b/app-emulation/lxd/lxd-4.0.2.ebuild
new file mode 100644
index 000000000000..8317a5bc6fb0
--- /dev/null
+++ b/app-emulation/lxd/lxd-4.0.2.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 eutils linux-info systemd
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd"
+SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
+
+# Needs to include licenses for all bundled programs and libraries.
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+ipv6 nls"
+
+DEPEND="app-arch/xz-utils
+	>=app-emulation/lxc-3.0.0[seccomp]
+	dev-lang/tcl
+	dev-libs/libuv
+	dev-libs/lzo
+	net-dns/dnsmasq[dhcp,ipv6?]"
+RDEPEND="${DEPEND}
+	acct-group/lxd
+	net-firewall/ebtables
+	net-firewall/iptables[ipv6?]
+	sys-apps/iproute2[ipv6?]
+	sys-fs/fuse:0=
+	sys-fs/lxcfs
+	sys-fs/squashfs-tools
+	virtual/acl"
+BDEPEND="dev-lang/go
+	nls? ( sys-devel/gettext )"
+
+CONFIG_CHECK="
+	~BRIDGE
+	~DUMMY
+	~IP6_NF_NAT
+	~IP6_NF_TARGET_MASQUERADE
+	~IPV6
+	~IP_NF_NAT
+	~IP_NF_TARGET_MASQUERADE
+	~MACVLAN
+	~NETFILTER_XT_MATCH_COMMENT
+	~NET_IPGRE
+	~NET_IPGRE_DEMUX
+	~NET_IPIP
+	~NF_NAT_MASQUERADE_IPV4
+	~VSOCKETS
+	~VXLAN
+"
+
+# Uses internet connection.
+RESTRICT="test"
+
+# Go magic.
+QA_PREBUILT="/usr/lib/lxd/libdqlite.so.0.0.1
+	/usr/bin/fuidshift
+	/usr/bin/lxc
+	/usr/bin/lxc-to-lxd
+	/usr/bin/lxd-agent
+	/usr/bin/lxd-benchmark
+	/usr/bin/lxd-p2c
+	/usr/sbin/lxd"
+
+EGO_PN="github.com/lxc/lxd"
+GOPATH="${S}/_dist" # this seems to reset every now and then, though
+
+common_op() {
+	local i
+	for i in dqlite raft; do
+		cd "${GOPATH}"/deps/${i} || die "failed to switch dir to ${i}"
+		"${@}"
+		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
+	done
+}
+
+src_prepare() {
+	default
+
+	export GOPATH="${S}/_dist"
+
+	sed -i \
+		-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \
+		-e "s:make:make ${MAKEOPTS}:g" \
+		Makefile || die
+
+	sed -i 's#lib$#lib/lxd#' "${GOPATH}"/deps/libco/Makefile || die
+	sed -i 's#zfs version 2>/dev/null | cut -f 2 -d - | head -1#< /sys/module/zfs/version cut -f 1#' "${GOPATH}"/deps/raft/configure.ac || die
+
+	common_op eautoreconf
+}
+
+src_configure() {
+	export GOPATH="${S}/_dist"
+
+	export CO_CFLAGS="-I${GOPATH}/deps/libco/"
+	export CO_LIBS="${GOPATH}/deps/libco/"
+
+	export RAFT_CFLAGS="-I${GOPATH}/deps/raft/include/"
+	export RAFT_LIBS="${GOPATH}/deps/raft/.libs"
+
+	export SQLITE_CFLAGS="-I${GOPATH}/deps/sqlite"
+	export SQLITE_LIBS="${GOPATH}/deps/sqlite/.libs"
+
+	export PKG_CONFIG_PATH="${GOPATH}/sqlite/:${GOPATH}/libco/:${GOPATH}/raft/"
+
+	cd "${GOPATH}/deps/sqlite" || die
+	econf --enable-replication --disable-amalgamation --disable-tcl --libdir="${EPREFIX}/usr/lib/lxd"
+
+	common_op econf --libdir="${EPREFIX}"/usr/lib/lxd
+}
+
+src_compile() {
+	export GOPATH="${S}/_dist"
+
+	export CGO_CFLAGS="${CGO_CFLAGS} -I${GOPATH}/deps/sqlite/ -I${GOPATH}/deps/dqlite/include/ -I${GOPATH}/deps/raft/include/ -I${GOPATH}/deps/libco/"
+	export CGO_LDFLAGS="${CGO_LDFLAGS} -L${GOPATH}/deps/sqlite/.libs/ -L${GOPATH}/deps/dqlite/.libs/ -L${GOPATH}/deps/raft/.libs -L${GOPATH}/deps/libco/ -Wl,-rpath,${EPREFIX}/usr/lib/lxd"
+	export LD_LIBRARY_PATH="${GOPATH}/deps/sqlite/.libs/:${GOPATH}/deps/dqlite/.libs/:${GOPATH}/deps/raft/.libs:${GOPATH}/deps/libco/:${LD_LIBRARY_PATH}"
+
+	local j
+	for j in sqlite raft libco; do
+		cd "${GOPATH}"/deps/${j} || die
+		emake
+	done
+
+	ln -s libco.so.0.1.0 libco.so || die
+
+	cd "${GOPATH}/deps/dqlite" || die
+	emake CFLAGS="-I${GOPATH}/deps/sqlite -I${GOPATH}/deps/raft/include" LDFLAGS="-L${GOPATH}/deps/sqlite -L${GOPATH}/deps/raft"
+
+	cd "${S}" || die
+
+	for k in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
+		go install -v -x ${EGO_PN}/${k} || die "failed compiling ${k}"
+	done
+
+	go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon"
+
+	use nls && emake build-mo
+}
+
+src_test() {
+	export GOPATH="${S}/_dist"
+
+	# This is mostly a copy/paste from the Makefile's "check" rule, but
+	# patching the Makefile to work in a non "fully-qualified" go namespace
+	# was more complicated than this modest copy/paste.
+	# Also: sorry, for now a network connection is needed to run tests.
+	# Will properly bundle test dependencies later.
+	go get -v -x github.com/rogpeppe/godeps || die
+	go get -v -x github.com/remyoudompheng/go-misc/deadcode || die
+	go get -v -x github.com/golang/lint/golint || die
+	go test -v ${EGO_PN}/lxd || die
+}
+
+src_install() {
+	local bindir="_dist/bin"
+	export GOPATH="${S}/_dist"
+
+	dosbin ${bindir}/lxd
+
+	for l in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
+		dobin ${bindir}/${l}
+	done
+
+	for m in dqlite libco raft sqlite; do
+		cd "${GOPATH}"/deps/${m} || die "failed switching into ${GOPATH}/${m}"
+		emake DESTDIR="${D}" install
+	done
+
+	cd "${S}" || die
+
+	# We only need libraries, and we don't want anything to link against these.
+	rm "${ED}"/usr/bin/sqlite3 || die
+	rm -r "${ED}"/usr/include || die
+	rm -r "${ED}"/usr/lib/lxd/*.a || die
+	rm -r "${ED}"/usr/lib/lxd/pkgconfig || die
+
+	newbashcomp scripts/bash/lxd-client lxc
+
+	newconfd "${FILESDIR}"/${PN}-4.0.0.confd lxd
+	newinitd "${FILESDIR}"/${PN}-4.0.0.initd lxd
+
+	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
+
+	dodoc AUTHORS doc/*
+	use nls && domo po/*.mo
+}
+
+pkg_postinst() {
+	elog
+	elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+	elog "including a Quick Start."
+	elog
+	elog "Optional features:"
+	optfeature "apparmor support" app-emulation/lxc[apparmor]
+	optfeature "btrfs storage backend" sys-fs/btrfs-progs
+	optfeature "lvm2 storage backend" sys-fs/lvm2
+	optfeature "zfs storage backend" sys-fs/zfs
+	elog
+	elog "Be sure to add your local user to the lxd group."
+}
diff --git a/app-emulation/lxd/metadata.xml b/app-emulation/lxd/metadata.xml
index bc72b24a7262..6711afb51f17 100644
--- a/app-emulation/lxd/metadata.xml
+++ b/app-emulation/lxd/metadata.xml
@@ -18,15 +18,4 @@
 	<upstream>
 		<remote-id type="github">lxc/lxd</remote-id>
 	</upstream>
-	<use>
-		<flag name="daemon">
-			Build the system daemon, not just the client tool
-		</flag>
-		<flag name="dnsmasq">
-			Depend on dnsmasq to provide DHCP and DNS
-		</flag>
-		<flag name="tools">
-			Build and install optional tools
-		</flag>
-	</use>
 </pkgmetadata>
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index f2434716baff..0d08e9d3a261 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -12,6 +12,6 @@ DIST qemu-4.2.0-patches-r2.tar.xz 17868 BLAKE2B 3783d0f923ded66cce1195248981c83b
 DIST qemu-4.2.0.tar.xz 62222068 BLAKE2B 27c9fbcd5093af425764674817ab9299224bd03f37b5983786f6f437fff1fab3b7da247c55c4ca8b8c42726b9867005944a2f7f04f2d0d94d753961615f901ef SHA512 2a79973c2b07c53e8c57a808ea8add7b6b2cbca96488ed5d4b669ead8c9318907dec2b6109f180fc8ca8f04c0f73a56e82b3a527b5626b799d7e849f2474ec56
 DIST qemu-5.0.0.tar.xz 62426192 BLAKE2B 785d02ef79c95b5c4f0556186054885f9893d4e8a9f4b4f2d6199a4e1ae9c31d7c79dd900305469217f85d61bbe74134b601d5c6c1b0eee2b74792d010f1fd63 SHA512 21ef0cbe107c468a40f0fa2635db2a40048c8790b629dfffca5cd62bb1b502ea8eb133bfc40df5ecf1489e2bffe87f6829aee041cb8a380ff04a8afa23b39fcf
 EBUILD qemu-4.2.0-r6.ebuild 24465 BLAKE2B 039d18ecffc0e41943b4b2263f5edf06e7bc4adfa8d1c95644c6d0d2e0fceb823c8e52e2549f939a4e699640fdc22dd68c3420054a933f335b008de888a70da4 SHA512 5585d835b938bb20a8959cbd41a9e86f9d0f993e9968e4b51e77028c536ee530d3bc2b25bdc31b0a3e13d27c2342b242f02a9478d28a66d5f588bfb7c9928c2f
-EBUILD qemu-5.0.0.ebuild 24541 BLAKE2B 041d0452317346b71370de0c9153a5906a4556e1154beec7fcb3e9c5fdce863a7cafa85cd9e54b6805efe086738fc2c2d19cec2038dc9cf9e86ecdcca8ca129e SHA512 ffb5465f32d1449a0e053bfa0e59a98bcecd77360e30c93a53bfbc06a4d19a442f212eca9c1900d420b8d240a9e79ed7cf7055eb5a4274d82959d9b669a35440
+EBUILD qemu-5.0.0.ebuild 24539 BLAKE2B 556790420f61cbc42129e0996b0f95a90faa1053469bdc4c6b006fdb9f76233267e899fafc58c1c64baf947d5239638fae9198ef4604f1cb7f6bcc5d005a0ee2 SHA512 83c7093c429fcbf8a1b582f8672c486f79f76e1fdf94c1014b4f3e895c8c08bf294dac511ea8bd46554758a0b8d2ec8d9d3d8fbc76f9b60613056810b53dc896
 EBUILD qemu-9999.ebuild 24541 BLAKE2B 041d0452317346b71370de0c9153a5906a4556e1154beec7fcb3e9c5fdce863a7cafa85cd9e54b6805efe086738fc2c2d19cec2038dc9cf9e86ecdcca8ca129e SHA512 ffb5465f32d1449a0e053bfa0e59a98bcecd77360e30c93a53bfbc06a4d19a442f212eca9c1900d420b8d240a9e79ed7cf7055eb5a4274d82959d9b669a35440
 MISC metadata.xml 4465 BLAKE2B ef8f4fcd42539604fd5d05228dc89b9bebe56490c20da6cd3244a9b9d8c5c66036562ff64e4a740c824a80f2fbfa70b6540873d223f4bb9f901337fe78e3012c SHA512 103ee38332f04a84527e177e9efc36847daa0bcdb6ea90a33ed8656139b7464f8d99dd6cdf7cc33460c87701786e8573cac532af2f84d5ae53d1b78c750ef770
diff --git a/app-emulation/qemu/qemu-5.0.0.ebuild b/app-emulation/qemu/qemu-5.0.0.ebuild
index db4f361eae93..31bb16d73133 100644
--- a/app-emulation/qemu/qemu-5.0.0.ebuild
+++ b/app-emulation/qemu/qemu-5.0.0.ebuild
@@ -24,7 +24,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.qemu.org/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
diff --git a/app-emulation/virtio-win/Manifest b/app-emulation/virtio-win/Manifest
index 2c83629faec5..43099d3880f1 100644
--- a/app-emulation/virtio-win/Manifest
+++ b/app-emulation/virtio-win/Manifest
@@ -1,3 +1,5 @@
 DIST virtio-win-0.1.173.iso 393902080 BLAKE2B a90da9d4e23a95c4cf9f02cc010664d87c987d7a9b82a90b534ec69041f763d73d7b37b1378078a162e7ef4f06b9d4cd6c5b7c4b98d77ff75bcd0d06a8ede8a2 SHA512 49cba35d74a3f480f6d23a57b68217f5732e8bcfb7657a4a87f16b286ad2c6ffd2509f034d0b4f363a389ce50d4d0e80e241f7ddff3e93b5dc315dad1713f08a
+DIST virtio-win-0.1.185.iso 413564928 BLAKE2B 84aa2d0ce16292b95431044618538f6dc176ff834f5e01b245414e27a74775a0e202c7b9262495de9d5f54476fe4dfa5e853f30b994e301080fee1a1c840f823 SHA512 62992baafce1f2eb52c23ba62291765c535c513e2598910083a8519eff58e8c57366d46add702e791fb07ec96c0fb65c9cff03b57e8f32b4357799c86b46c198
 EBUILD virtio-win-0.1.173.9.ebuild 630 BLAKE2B 5d5d9ddedd33ca2ad52c1b213edd46f7fbf2b3c310e2cbc176398bcdd29dd576bb542d1ba280720c8e717aa2f37e8aa88aa22f92c04cf42d520e45e99cb9a46c SHA512 7adef1a78a2173de5c41cb2bb2b0325a3163800c0089f6936dd21fa56d7aa8f94889c7b9da7c2a387342c27623e7e6ff55fb55ff5cd15a08025d89dec6b7a96b
+EBUILD virtio-win-0.1.185.1.ebuild 697 BLAKE2B 107141d59a78989c5cc47a712ace77c3c40be624a50fe76d0a576ed9581249701ba2edda868a5cab56f863978824817273e516137d62ee469e6dc4f816183de7 SHA512 37872fc77a00eb0c0ea43be87e53fce6743a249511861c8b357c489bc656664c4d0101ae1aac6d5875c93179965f17ed2b8c8fd626d964acc8f541ae7b2f74ba
 MISC metadata.xml 359 BLAKE2B 6a34261ec10702f5bec40975ab7723eee34e015afa5a4544146834c43a9a3b040d9ead5d5a617da0b8253e9e9a7e05fe9efae38588b02b8fa16f653d9bfc5340 SHA512 43bdd93da8962e2ca6d852356e206511754f1e5f0bda721ac6458c54abab89367fc137f686583dd9df6d83be82bad66f9858efc52ed1e5a002d6b3bacd8fdbb4
diff --git a/app-emulation/virtio-win/virtio-win-0.1.185.1.ebuild b/app-emulation/virtio-win/virtio-win-0.1.185.1.ebuild
new file mode 100644
index 000000000000..317b5b926c06
--- /dev/null
+++ b/app-emulation/virtio-win/virtio-win-0.1.185.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=$(ver_cut 1-3)
+MY_DW=$(ver_rs 3 -)
+
+DESCRIPTION="VirtIO drivers for Windows virtual machines running on KVM"
+HOMEPAGE="https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html"
+SRC_URI="https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/${PN}-${MY_DW}/${PN}-${MY_PV}.iso"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/drivers/windows
+	doins "${DISTDIR}/${PN}-${MY_PV}.iso"
+	dosym "${PN}-${MY_PV}.iso" "/usr/share/drivers/windows/${PN}.iso"
+}
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 9b49e2f1d7f9..aa4dd40b8565 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -26,6 +26,6 @@ EBUILD virtualbox-5.2.40.ebuild 14429 BLAKE2B 1cb2f4e3a7c88984ad60aece1250e4bc1f
 EBUILD virtualbox-5.2.42.ebuild 14269 BLAKE2B f90265001cf0b4e5c5595e2c186ec57c12d274958d418cffb38b1671094460dae3683f762c6ce3d6b8f5d6e7eba3a7bc166f20ed6f541237ecaf0681c3233f75 SHA512 364d837d39f08905fbb133ff0cbdf83383f7f59733590c13f3cf88f637e3c6f5f7d51d9bfb618fa01610c667cbdc1fbf7bd11318183812e6100c0578bd0ff72e
 EBUILD virtualbox-6.0.20.ebuild 14663 BLAKE2B 5ece72f1aebadd85661d5af78e683067faecde668c7da1f3399c9bcf647ccb7b7da6aaf29f5a97915ba341aeadcb68d8f5521f203d33a3ba4ddf8b68bb1be84e SHA512 a5b7d584deeaf72e0970c592b36d96b7ec8a450c28c068615109d7ce09b915427ebf193b741d002a45c35540f4679c76851790e9e202e7616df8c5778ab76fed
 EBUILD virtualbox-6.0.22.ebuild 14363 BLAKE2B 0445a9c2f57615035d217dcf0a8a27978893b97ad7015dd930581d75b0640a7db5d1ae487b19f99d5191e28aa25e0c38c085048a75c73dfc4bbf394a4f5dbba0 SHA512 35fd8870bd1eac3199846d023eb2e68caed508189f1bc80b9a542cf494af81598dfea89be441277be17a33311b52f554412575f32310a5aa56ed9bf8ce86f879
-EBUILD virtualbox-6.1.10-r1.ebuild 14457 BLAKE2B 8dc8c0af62c8a506db6d3132bc48c45b9ef30100ca59aaaccb3fd914de02f1342c7c93c8b1f783f2fcc9be67773da9671e0facdfb2f2f56201b81a8f749500f2 SHA512 7a578827be81d285c935a19bd85c183f7d0b2c94f55726d19fb47b9d05686299bc0a5e8bbc44b2c20f3a788fe721429711e88887737b7bdd9fbf29911c69a72f
+EBUILD virtualbox-6.1.10-r1.ebuild 14407 BLAKE2B 8251d9a86e45884268d7edc7c3267d13d5ee8563b18e40e82ef318063f326c244b1969a37d2c14541fc528e46f9d5d3cd732bc1d3631fdde07546c9570d8cf86 SHA512 f38efad5689f2e1ef6ea8012069f9ee38a07ff038b0e95098cd032e9663451f393f9d6a068c1f06a41d899ee11428c7d565588bd033459b160316a95a17a4a4b
 EBUILD virtualbox-6.1.6.ebuild 14594 BLAKE2B 5b2ae3063e1e46a9808824f21666f67b7a95bba447b4811009678041c825d20728db80d9b446213b9b718478df262140bf89a6d55807382c2046cb63aa78a621 SHA512 ff526c7444a9c1c27535d8d24fb52d60e80d5a82b224e3926df4749459703a85924ad1be7b3df70feef1fcbc61da32da7d4ee184c64c14b1f8e25c115010259f
 MISC metadata.xml 774 BLAKE2B 74d422bee5013b3875828aa2f192a8269815c567ae79c135b7cab1cc71175a923668e1c7e6f5ff76f19c7c359dbb1a20edfcc59570e95ec83418d8a6a0dae46b SHA512 bea193854ac55683c6c4fdcab3c2a4e9144ca4806b261ff7a6bf50f7fffd005f7de3dbb44a4a833ba7bf7f0cb535a46a4586c59bca9a46bf664b4b06ce425549
diff --git a/app-emulation/virtualbox/virtualbox-6.1.10-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.1.10-r1.ebuild
index ba14c3938f30..48c20b4aecc2 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.10-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.10-r1.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Id: 8881f0924916cef4ba5f7bfa39c3c3d8e02a7704 $
 
 EAPI=7
 
diff --git a/app-emulation/x48/Manifest b/app-emulation/x48/Manifest
index 5eb35ce52925..ca1176fc7cab 100644
--- a/app-emulation/x48/Manifest
+++ b/app-emulation/x48/Manifest
@@ -1,3 +1,5 @@
+AUX x48-0.6.4-static.patch 317 BLAKE2B 0ba80504f6dfdb992735496198808445778d6f75ecd7d21f276801857efcbf5a6d215d081b8ea79031fe5fcadf2dc1875854f80f6003575d9e2be03c2f7cb21f SHA512 22c97b2236b78c148cab19386718ea0be333eef8ab356da20f80d7805fdae4e73a1552faab15bd86a4644e2b149a924f65ba57cba5bef8f740ecb69930e7b794
+AUX x48-0.6.4-void_return.patch 657 BLAKE2B d72125691d4cabe90ea326f03204061ef3eca46e2b47cc43c91a67b3a994f8f995fbc313d368bbec1d3782d1aff46ff7064ebaf65f503efa28f0d468874f1256 SHA512 48d8fffff6f7a9727c813dbbc6332577d8d9f8622466af9658c135a2503a2b5b961f4c193cab3127352308716a9ab92bb6eb120897bdca9ae52482eacd12ac6e
 DIST x48-0.6.4.tar.bz2 227991 BLAKE2B 8db2962860eeb161a8efc9d46730c71d95d0331157e3e2481a978385ad54b04b7a4eb601c68e7df966194b23e0cd04bed4e80511d22695bb7ccdd3959d8fd8d7 SHA512 60fdba1171a02e4a5f9bcefb29fff9398fdbda50553c3d3b952fab0b4ebf87b219d4615139ca3673b1c61ff6d6559aab3e93218334aa6cdb442d4861347138ce
-EBUILD x48-0.6.4-r2.ebuild 1677 BLAKE2B 2714c1760be4efb7c50365b2873a3db3a548cd819478d4df54db06fd6efc616bb73890c064e83c712abc536b9d49a6fc263f72c991dedeb944d98aea425735a1 SHA512 0742749fb892adbe543155c3ef58ddf8e0458c7c2c3cc81372e2af638716aa9d98524047dc3761cf33fc50e5727fa12c588a17d4a1224d57d16b788a2005ffcd
+EBUILD x48-0.6.4-r2.ebuild 1659 BLAKE2B 0563a9afe94bc637528c92ed63968023877031529daa67e8cb5086ac1fb2fab124666278e95cec50a1ea0e9c75de408ab6626c9c79c9d6deac1ed3e58fb96b66 SHA512 ebf6faa4954df214b72082c0b22b34734ccac4a5909a6e6b0996ba1a05050e9c80d4dd9e756e2b8eddaf80877bc8aa948b4f8dc3e51acf5a29757669819f05ee
 MISC metadata.xml 723 BLAKE2B 98911516312cc5d5617bbf9d6e33915608b30639c2354024cc74407888a699cf7464261fc7d40afad3fd6632ae39da74b5f90ede1bd51e491d0193c759d8ed07 SHA512 0de7f42012bc6624f1eca6d08c3807185f5fcd7b44a34fd701cd7af2ede5b0ab21f41b41fc7b784b3fe641b3b12b58ae412a2969679fbfcc1edbfd99b6e39685
diff --git a/app-emulation/x48/files/x48-0.6.4-static.patch b/app-emulation/x48/files/x48-0.6.4-static.patch
new file mode 100644
index 000000000000..f832e877b76e
--- /dev/null
+++ b/app-emulation/x48/files/x48-0.6.4-static.patch
@@ -0,0 +1,12 @@
+diff -Naur x48-0.6.4.orig/src/emulate.c x48-0.6.4/src/emulate.c
+--- x48-0.6.4.orig/src/emulate.c	2011-11-15 04:03:40.000000000 +0100
++++ x48-0.6.4/src/emulate.c	2020-06-23 21:30:30.895538239 +0200
+@@ -695,7 +695,7 @@
+   }
+ }
+ 
+-inline int
++static inline int
+ #ifdef __FunctionProto__
+ decode_8_thru_f(int op1)
+ #else
diff --git a/app-emulation/x48/files/x48-0.6.4-void_return.patch b/app-emulation/x48/files/x48-0.6.4-void_return.patch
new file mode 100644
index 000000000000..521ab6cd0546
--- /dev/null
+++ b/app-emulation/x48/files/x48-0.6.4-void_return.patch
@@ -0,0 +1,24 @@
+diff -Naur x48-0.6.4.orig/src/debugger.c x48-0.6.4/src/debugger.c
+--- x48-0.6.4.orig/src/debugger.c	2011-11-15 04:03:40.000000000 +0100
++++ x48-0.6.4/src/debugger.c	2020-06-23 21:33:16.071667987 +0200
+@@ -1528,7 +1528,7 @@
+   struct se *se_next;
+ };
+ 
+-char *
++void
+ #ifdef __FunctionProto__
+ get_stack (void)
+ #else
+diff -Naur x48-0.6.4.orig/src/x48_x11.c x48-0.6.4/src/x48_x11.c
+--- x48-0.6.4.orig/src/x48_x11.c	2011-11-15 04:03:40.000000000 +0100
++++ x48-0.6.4/src/x48_x11.c	2020-06-23 21:33:32.132680745 +0200
+@@ -3833,7 +3833,7 @@
+ 
+ int last_button = -1;
+ 
+-extern char *get_stack(void);
++extern void get_stack(void);
+ 
+ int
+ #ifdef __FunctionProto__
diff --git a/app-emulation/x48/x48-0.6.4-r2.ebuild b/app-emulation/x48/x48-0.6.4-r2.ebuild
index 47413f324968..9e603e25e582 100644
--- a/app-emulation/x48/x48-0.6.4-r2.ebuild
+++ b/app-emulation/x48/x48-0.6.4-r2.ebuild
@@ -22,15 +22,15 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	x11-libs/libXt"
 
-src_unpack() {
-	mkdir -p "${S}"
-	cd "${S}"
-	unpack ${A}
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-static.patch
+	"${FILESDIR}"/${P}-void_return.patch
+	)
+
+S=${WORKDIR}
 
 src_prepare() {
 	default
-	sed -i '698s/inline/static inline/' src/emulate.c || die
 	eautoreconf
 }
 
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index e07f57c86f64..63ab410a0289 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -9,10 +9,10 @@ DIST polarssl-1.1.4-gpl.tgz 611340 BLAKE2B 613da06dda9e4b86db5a4d616a0a0afee98c9
 DIST xen-4.12.2.tar.gz 26985135 BLAKE2B 530821011a6dd0ac0a99fb135ff5311eb8e975c3791818093b5e250eed7854d153de6d4340197f9b949c0ad2c3d7b2b7180deb42bc71748ff70ff6fad195269d SHA512 7d9e7921271830c9eadf1bb8eca1aec20d343ad7475b0dc3165ef6d681759e7cb70739f8d9f85622a23aef960988820e822267fb198b12ee3dd657ad6164069f
 DIST xen-4.12.3.tar.gz 26985230 BLAKE2B 403de519a552f1cd49e5a85b63f48df1b7a47ff8381385860b67df32af0b33be1c13c92ca2234e4479b7f415e711e0f46c396c3f62dfb5b2465d2991723cf6ef SHA512 7bbf4e752477f18143ac9a62fb633b1fbe115a1a9b03d0132f33dfca025bc9b76d9c2e9b66a3e407d14aff161b940b1a82e3e3ca43213798e9dd38b6970194e0
 DIST xen-4.13.1.tar.gz 39024612 BLAKE2B efff138699fac2c14fad2e0dfd4535ebd744577df3dddccc2a589b81a76f24fc81c75e295f4cd33ca2e820929417b22d714504b576cb0737a563037bd56b6a95 SHA512 b56d20704155d98d803496cba83eb928e0f986a750831cd5600fc88d0ae772fe1456571654375054043d2da8daca255cc98385ebf08b1b1a75ecf7f4b7a0ee90
-DIST xen-4.14.0-rc1.tar.gz 39946385 BLAKE2B af4d4d0d205b76d7cfb954c4c8ef95afbab7209de522691a875e3b2fc55d843ba6b1d71c693a472dbcf8cdf6b4cf4aa8f27065fdcf06145a50e6708fe63ea0e2 SHA512 90442feb6e5f1e853c337972217762e4c4ea44719275de74211bf0e7101746c33e0e437db544d03b5528d75b2e5bc97468b448e587ca0345b38b850f2aa393e9
+DIST xen-4.14.0-rc3.tar.gz 39943460 BLAKE2B 12356947738cfc7b43d0fa1bcbc8912f87fa5f0368b02b2bd8cc1d2681edc2f26d8edce50991e5fab65aa40f32ce263a2ded80f8ae827f182ea5a0f63274ddc2 SHA512 c6771003f2f66334c9181faeb01cb3283fcbfda78064cfde3a14ae9dca2454c35766d78df23dc480a9daba1edb7fd31db9ebfc3a4f57dd2b07852dd486e859ed
 DIST zlib-1.2.3.tar.gz 496597 BLAKE2B 603020b70cd52b83e48bde420b86e2acfd29d69bf7476eecbeeb07d1b8bcab703d2cbd3eab77772990bddb8c268f13594592ce985798d49e2d6ba25104d49f22 SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e
 EBUILD xen-pvgrub-4.12.2.ebuild 4462 BLAKE2B c59b5b69a1d319637ea6ef75d2291957ff4d2c287d6b8744d55ded9c294122ee7fe0be38df368316aa5698a5f9f187364d3dbd42ff55259b48bfd2fd3e844df2 SHA512 9b6247b8762c03a02209b84b4f6303813ea4dcb9de9071cc88fe478c24708b4344f21e73fb1ba823b1484d574df078d476b10616bb03d1418b013e7fb8d03afa
 EBUILD xen-pvgrub-4.12.3.ebuild 4462 BLAKE2B c59b5b69a1d319637ea6ef75d2291957ff4d2c287d6b8744d55ded9c294122ee7fe0be38df368316aa5698a5f9f187364d3dbd42ff55259b48bfd2fd3e844df2 SHA512 9b6247b8762c03a02209b84b4f6303813ea4dcb9de9071cc88fe478c24708b4344f21e73fb1ba823b1484d574df078d476b10616bb03d1418b013e7fb8d03afa
 EBUILD xen-pvgrub-4.13.1.ebuild 4531 BLAKE2B d02b6eb33a83ab30f33a6c382a3d1874c0d213b802f7a86287019b8af791499dc03a2f7f3e9414b08ecb3d4793a56a1f1ef5db5f5829e376e22c1378d83edd5a SHA512 80072e65336fc1eb94586a70187a85ff4a0d87ed95b7bc241b7ece0556374b3a78c0f91d38274da14ef9e9bc95de1f3e89d91e1df45269bd7ee25b213f656572
-EBUILD xen-pvgrub-4.14.0_rc1.ebuild 4543 BLAKE2B ed1d139dca8a51cb02799b73c40e27e9f962c779dd0be2cd687bd70dbfdeb5ba46e5723cb849b511e481116c410981bd6b7e231d5f99e25d0562a3d8a9ba29ac SHA512 cf81c20dbc2e954e80c879442a2e5cf324a7e9456864f377bc63e3da84c8ebc41378c37906f84e7ee1316a74a4fbbcdcd635d50314311c8402884846aba1106d
+EBUILD xen-pvgrub-4.14.0_rc3.ebuild 4543 BLAKE2B ed1d139dca8a51cb02799b73c40e27e9f962c779dd0be2cd687bd70dbfdeb5ba46e5723cb849b511e481116c410981bd6b7e231d5f99e25d0562a3d8a9ba29ac SHA512 cf81c20dbc2e954e80c879442a2e5cf324a7e9456864f377bc63e3da84c8ebc41378c37906f84e7ee1316a74a4fbbcdcd635d50314311c8402884846aba1106d
 MISC metadata.xml 477 BLAKE2B 663101aa83713fa70e98a41985f3ec3d4c78765b862fb9df1f35ed31d1b32640bc093a0d680252d7b0116eca7f758145bb6337618ac4fea8a0ed108df83ca57a SHA512 907e17ebf2262b71644a8b2d863f5d4cdaee775026eb1a9da736a4ef003a45e8c6eaa2439184865706e57aea0afdf5f3f363e98dc63762ea8706ffad640c9046
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.14.0_rc1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.14.0_rc3.ebuild
index 7dbff03ddf2e..7dbff03ddf2e 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.14.0_rc1.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.14.0_rc3.ebuild
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 55faef35f2e2..81a2a1307c5e 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,4 +1,4 @@
-AUX gentoo-patches.conf 2282 BLAKE2B 203f67494340144d139aad0149555293aad1489eaadded057ae3bd8a6f9d827b968e1fbafe354611fb2849684467f3cbed5ecbee3402674d7dbdc98ebfc4c591 SHA512 9ed9b37dbba6e9dacd8f9371f3f9a0f6e2fe19a98f2766b1dc30be4b83c8f2c3e37fe8f06e3f93447cef950b1dfb4e2779adf062669beb840fce6ce516353310
+AUX gentoo-patches.conf 2282 BLAKE2B f0c369e500213ed72736082719f1b6a7188d1ab92151451704947cce3f8fe597328385cc85c97e9c249da7699d32edf3f97bfe07922e14eb01c8dee4367ee624 SHA512 d6673d82224ac01e7257110aa213ab4c898adabc653fa99d78314731d410ac094f87d16a625e682bddf2cc9dac1365780f44cbe592f02f32c064c37707714a71
 AUX stubs-32.h 537 BLAKE2B 456f57c4a4ba574c737f1b84b62a085d0290ebc8981a5f96fdebc16b6c86c801c5ca8dde135e803f46c5ec875fdd74770f6ed754880bc7af930b8ce1ce972fb7 SHA512 55308dbedaa91909a2213940f7a7b574cabe6b5a3104761a2a6f28d6aed00164544488c00cbf9d66a9a370a14c6b6d3a00434efd3ff0228cc8e4d81af19c0e68
 AUX xen-consoles.logrotate 63 BLAKE2B 4ae650876035d2815dbcacc6ed618c58cc61d9cfd9cde1b6c2f792cbf51898c577ef979443ad827fc82ced4d21ae24836883160b20d697965ef5377d50c2973c SHA512 ab2105c75cfe01768aecd5bcbb56269d63666e8a44e42b6a83aee87df6c84ee2f9ab249171c21b2e09f8fec2cae8318f6e87d160989398a3e7dd68db8d52c426
 AUX xen-watchdog.initd 181 BLAKE2B b8529db36016b6f71520c1e4119a2ea5c4d3f52f2c77ccb5603efb67bcdd88b8273a359f6ae0df61763ea31a50bd8a0be775df5aabbd17c90e7928c8ed5b7c0e SHA512 5f6da91c0067b93f1b9f1a2f181caf34034896944ab26f5820e860336e3b3159a65e8a7f39ea273927d64d58a2fe4d918d2c3234f2b03ab0770e0c15d6dfe84b
@@ -29,12 +29,12 @@ DIST xen-4.12.3-upstream-patches-0.tar.xz 7236 BLAKE2B d795e2be6f1edb31f1d794912
 DIST xen-4.12.3.tar.gz 26985230 BLAKE2B 403de519a552f1cd49e5a85b63f48df1b7a47ff8381385860b67df32af0b33be1c13c92ca2234e4479b7f415e711e0f46c396c3f62dfb5b2465d2991723cf6ef SHA512 7bbf4e752477f18143ac9a62fb633b1fbe115a1a9b03d0132f33dfca025bc9b76d9c2e9b66a3e407d14aff161b940b1a82e3e3ca43213798e9dd38b6970194e0
 DIST xen-4.13.1-upstream-patches-0.tar.xz 7156 BLAKE2B 246b30cd8bc0ee8853a4e85ae0140d0ae52e69f3e4220bd97af8564491cf8285a7a592cd1392467a30acf6947733c8af355c110a44cb565927fb4f0bb7867113 SHA512 9059de696cb984c1891b5a87d1832562aa34b6568a21867c6744b603180f2b628905c81031f3c7c24867122d07432906750e0cfc6ca2fdacd31b82d35488455f
 DIST xen-4.13.1.tar.gz 39024612 BLAKE2B efff138699fac2c14fad2e0dfd4535ebd744577df3dddccc2a589b81a76f24fc81c75e295f4cd33ca2e820929417b22d714504b576cb0737a563037bd56b6a95 SHA512 b56d20704155d98d803496cba83eb928e0f986a750831cd5600fc88d0ae772fe1456571654375054043d2da8daca255cc98385ebf08b1b1a75ecf7f4b7a0ee90
-DIST xen-4.14.0-rc1.tar.gz 39946385 BLAKE2B af4d4d0d205b76d7cfb954c4c8ef95afbab7209de522691a875e3b2fc55d843ba6b1d71c693a472dbcf8cdf6b4cf4aa8f27065fdcf06145a50e6708fe63ea0e2 SHA512 90442feb6e5f1e853c337972217762e4c4ea44719275de74211bf0e7101746c33e0e437db544d03b5528d75b2e5bc97468b448e587ca0345b38b850f2aa393e9
+DIST xen-4.14.0-rc3.tar.gz 39943460 BLAKE2B 12356947738cfc7b43d0fa1bcbc8912f87fa5f0368b02b2bd8cc1d2681edc2f26d8edce50991e5fab65aa40f32ce263a2ded80f8ae827f182ea5a0f63274ddc2 SHA512 c6771003f2f66334c9181faeb01cb3283fcbfda78064cfde3a14ae9dca2454c35766d78df23dc480a9daba1edb7fd31db9ebfc3a4f57dd2b07852dd486e859ed
 DIST xen-gentoo-patches-20.tar.xz 17376 BLAKE2B 909795f611a089ab1eee86db5f034cec963c831873b3088f0682cdb7ec5284e75a4d49a5a1c93ee7a7e7ba3a899648b38928a1c7b726e019c2a90b66e31fee4a SHA512 d06b846ccb8c488f7155437cdf220533fc2d23ad13b0a2bd4d69d68938c4858fdb961c9e59f57c5228368b4e60dbbdf81ec15b77ecb0639bbf475333f8bf4b97
 DIST xen-gentoo-patches-21.tar.xz 18280 BLAKE2B 95446da72fc16cb82e4e51df8796c64db05a30894a351a98dbd6700ce354c34956ca09a1af98125a4e56c337936e8fae296d806519b8afa23a82b078aa0db8f1 SHA512 3cffac162606a09b10b47dca604f167897e6ac8d153411d3464ef29a7a4d46ac5b92340884cb21279cb2d053b131f1ea5cb2111e3e9a21b3298b5ab3320ee34d
 DIST xen-gentoo-patches-22.tar.xz 18764 BLAKE2B e0da49b39fbc6b689db47e40a4fbb4f6568644fe192b114cce01b0406cba4bf23339ad1bf39b972f895df004916827b6e774f97fc079aeb8ac436763efda5fc3 SHA512 5b7959af4ed30edd2526698ab60a86353e35d9dc48dc941b6df7659a7c4904260461e0decbd8d788542bd69384736f2175861d4943c3738618d20788b19ea9b1
 EBUILD xen-tools-4.12.2-r1.ebuild 14966 BLAKE2B df7d4e20a1184631204f0e6f31f041c52bfd09a4c6d883a80d58f0d88cc96ec1cff25659a8995383a00f153d020b22c1e8a3a3f0e7c807dff382cae9411f2db6 SHA512 f26b572cd184cf0243d9b0c54dfb6746ecf52696e5e96858262def32530515d503a5cfbdf3f39ab8d029f4cb72a32f84f78f842f7fdfb4cf0f6e8b346a593090
 EBUILD xen-tools-4.12.3-r1.ebuild 15181 BLAKE2B 39160d51e8c2d0a6452d4a4eaa6e95237f3e5fe5d8d945733a69402c9ac16aee82879605cc61020035ca9a82ef6f6e8c7030a21daadf7de8815147040d9bdad3 SHA512 7f85d1919c6d9c93bff1b1b22cf86660cc4b776de4d910549840add24c209fb67c57cc802ef448852b85b1c8236f57457e258469916801fa5858aed22f73010c
 EBUILD xen-tools-4.13.1-r1.ebuild 15865 BLAKE2B b5c85654d0c166053891f045db686be4ed88c3252bbdf370e480500d94b7b189934d3930658159b6c6734d3b7d4664201e3c61c02b9be891cd491e584e0d6a66 SHA512 993b4b5675932eab2a2748d89faa58e0666d7dd36a39ed86da0ee21d45b4a002dbb559cdcf7b4ed3120a5a4eb9b56e64eb49daf4f525cb77188f3c24b116bcff
-EBUILD xen-tools-4.14.0_rc1.ebuild 15877 BLAKE2B ff7c4dab2e1dcf2c8dcd13c819d1890b2667079f2f08d23fe4c0661b7345a3c2b36f010c0635308a5193de6c60285ee6933c56608848c3bd2f8064bf15f4f481 SHA512 b17973909ed7c3811b9d907ab3f37074211a7cea070a25b138b7aebb370f4eed763d49d69d0bd46732cfc361a7ce094d12a15be22169bf2d67f2ad5959de7bcc
+EBUILD xen-tools-4.14.0_rc3.ebuild 15877 BLAKE2B ff7c4dab2e1dcf2c8dcd13c819d1890b2667079f2f08d23fe4c0661b7345a3c2b36f010c0635308a5193de6c60285ee6933c56608848c3bd2f8064bf15f4f481 SHA512 b17973909ed7c3811b9d907ab3f37074211a7cea070a25b138b7aebb370f4eed763d49d69d0bd46732cfc361a7ce094d12a15be22169bf2d67f2ad5959de7bcc
 MISC metadata.xml 1662 BLAKE2B 1b243436df5eb36e30f73b36db45d859aa03f7e9d3360fcdb91c35e3a1c00f1217e5e7cd1461b65d9da2883f5e8ca969b958f9b2160def4c1f15347c1887b2cd SHA512 d6cdf124c7767727f7c8d16a2dc0f85a7213db21f8d1595f7d8899c7cb81d47849fd05759ccfc460630c32917e64ea31ef6384dc050ab0eb392f571b12db68ed
diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf
index 5ef7519e2242..052e818a82eb 100644
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -84,7 +84,7 @@ ${_gx060}
 "
 
 # xen-tools-4.14.0 patches set
-_gpv_xen_tools_4140_rc1_0="
+_gpv_xen_tools_4140_rc3_0="
 ${_gx039}
 ${_gx027}
 ${_gx028} ${_gx029}
diff --git a/app-emulation/xen-tools/xen-tools-4.14.0_rc1.ebuild b/app-emulation/xen-tools/xen-tools-4.14.0_rc3.ebuild
index d629c5334896..d629c5334896 100644
--- a/app-emulation/xen-tools/xen-tools-4.14.0_rc1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.14.0_rc3.ebuild
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 7f54aca4b79a..937068f7c953 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -4,8 +4,8 @@ DIST xen-4.12.3-upstream-patches-0.tar.xz 7236 BLAKE2B d795e2be6f1edb31f1d794912
 DIST xen-4.12.3.tar.gz 26985230 BLAKE2B 403de519a552f1cd49e5a85b63f48df1b7a47ff8381385860b67df32af0b33be1c13c92ca2234e4479b7f415e711e0f46c396c3f62dfb5b2465d2991723cf6ef SHA512 7bbf4e752477f18143ac9a62fb633b1fbe115a1a9b03d0132f33dfca025bc9b76d9c2e9b66a3e407d14aff161b940b1a82e3e3ca43213798e9dd38b6970194e0
 DIST xen-4.13.1-upstream-patches-0.tar.xz 7156 BLAKE2B 246b30cd8bc0ee8853a4e85ae0140d0ae52e69f3e4220bd97af8564491cf8285a7a592cd1392467a30acf6947733c8af355c110a44cb565927fb4f0bb7867113 SHA512 9059de696cb984c1891b5a87d1832562aa34b6568a21867c6744b603180f2b628905c81031f3c7c24867122d07432906750e0cfc6ca2fdacd31b82d35488455f
 DIST xen-4.13.1.tar.gz 39024612 BLAKE2B efff138699fac2c14fad2e0dfd4535ebd744577df3dddccc2a589b81a76f24fc81c75e295f4cd33ca2e820929417b22d714504b576cb0737a563037bd56b6a95 SHA512 b56d20704155d98d803496cba83eb928e0f986a750831cd5600fc88d0ae772fe1456571654375054043d2da8daca255cc98385ebf08b1b1a75ecf7f4b7a0ee90
-DIST xen-4.14.0-rc1.tar.gz 39946385 BLAKE2B af4d4d0d205b76d7cfb954c4c8ef95afbab7209de522691a875e3b2fc55d843ba6b1d71c693a472dbcf8cdf6b4cf4aa8f27065fdcf06145a50e6708fe63ea0e2 SHA512 90442feb6e5f1e853c337972217762e4c4ea44719275de74211bf0e7101746c33e0e437db544d03b5528d75b2e5bc97468b448e587ca0345b38b850f2aa393e9
+DIST xen-4.14.0-rc3.tar.gz 39943460 BLAKE2B 12356947738cfc7b43d0fa1bcbc8912f87fa5f0368b02b2bd8cc1d2681edc2f26d8edce50991e5fab65aa40f32ce263a2ded80f8ae827f182ea5a0f63274ddc2 SHA512 c6771003f2f66334c9181faeb01cb3283fcbfda78064cfde3a14ae9dca2454c35766d78df23dc480a9daba1edb7fd31db9ebfc3a4f57dd2b07852dd486e859ed
 EBUILD xen-4.12.3-r1.ebuild 4438 BLAKE2B 19b7c8084893bbe6541dc3fcfabbbf6c2f940a0153bb310c23fb66624dc7b5e8ab4108847f5d68879766adae727df6f1a2373ef39f3f080e8f99c093ed20dd6d SHA512 ba04b747df09c27dc0d99ed2b9b585c00eb0da1b6537d0022c3c542f7a4a1febaeda8ea2d11a960075ec53620679c4543f5f924f8af62e0b1d6050362c09b60a
 EBUILD xen-4.13.1-r1.ebuild 4445 BLAKE2B 8b289338889c90f355c4a8e87d851394a7148606ea4443f026fc02a174ad8d73f44f291b68427cd1427d54509b8615918435271edec126a7a89267d28cc874bb SHA512 03169328b982de9905dd3e9e6099b6b1bb78b23ec8c00a12e99c2d7fd39abf005f5e9278817d3c567a1a9dd2442e3f00b443188d4158121f2913704a93f51585
-EBUILD xen-4.14.0_rc1.ebuild 4457 BLAKE2B 69ce574c00d0f6b60746619ddb18236ce21a637e94807957e43550a9529a67ff094ea70d311743a5af445225c59b38b1dabb0416d56b3fa784618405847d362c SHA512 f44a41e679e5d63b3b1eadb29cde9bd17e3706ee99f561b67bb90333c0b49735ff01c64ae964c10e03f61567e67173eb697e0772e0ec4b8c99158aba741d2ba2
+EBUILD xen-4.14.0_rc3.ebuild 4457 BLAKE2B 69ce574c00d0f6b60746619ddb18236ce21a637e94807957e43550a9529a67ff094ea70d311743a5af445225c59b38b1dabb0416d56b3fa784618405847d362c SHA512 f44a41e679e5d63b3b1eadb29cde9bd17e3706ee99f561b67bb90333c0b49735ff01c64ae964c10e03f61567e67173eb697e0772e0ec4b8c99158aba741d2ba2
 MISC metadata.xml 645 BLAKE2B ad902c521cc93a54b16faaea212f23c7bdf83a9efe19606eca7bf00b49104386dbc095ff30c4287bb79d5fcd073b77e7c1bbf929ee7b025039a50f8238572f17 SHA512 313d501abeb906c360d7965e35a18d9851e38af73a72a95351517c60a1a39553555a0a250f0bee5bfc8f6496312d6e9c70874be267c14edab45cb4841e34c248
diff --git a/app-emulation/xen/xen-4.14.0_rc1.ebuild b/app-emulation/xen/xen-4.14.0_rc3.ebuild
index c2aafff59da8..c2aafff59da8 100644
--- a/app-emulation/xen/xen-4.14.0_rc1.ebuild
+++ b/app-emulation/xen/xen-4.14.0_rc3.ebuild
diff --git a/app-emulation/xtrs/Manifest b/app-emulation/xtrs/Manifest
index 8b605bec37b0..046ff9c1d0eb 100644
--- a/app-emulation/xtrs/Manifest
+++ b/app-emulation/xtrs/Manifest
@@ -2,5 +2,5 @@ AUX xtrs-4.9d-lcmod.patch 3717 BLAKE2B 1172d6bd65ab10f983cd7793157a45505e16d6300
 DIST ld4-631.zip 106955 BLAKE2B 1c0e04186f14fcc840568521b09c7b55318a87dc49e394d516aa742fe7e5c499ac79771782f9b7ee687cdf55df159cef09897d19976879d4c60fff2a33f7f7c6 SHA512 8c6a24bc0af9326b5b935d7cdb1932b4cb714ab336167fed36f4f6d976cd80fe1d4d6a76e6374366fdc3fce623b2bdd6f9059a964bd6d29f59d6a052a1924c4a
 DIST ld4-631l.xd3 692 BLAKE2B 7870135e999cd358d7a3e5c254908757fa059a61654403ba146b8b866bda450b53fd1821dd3e3f8fc5c0acd17d0935d83b5df814c8e12eb5748bfcdf5688c509 SHA512 401d36fdfbceaf90673c5e9f821d26aa0a58b901d7e950d34361e5cde3252a070ff902019fcc1eb820fb1b2d3277e4c1da57ccc442ee407b0be4e5ca26dc2d13
 DIST xtrs-4.9d.tar.gz 455355 BLAKE2B b7ffda48f9a9bb534e33711b85c02734b7d3f8cee8d3cf2c2bc0a801954dcc1851b12451da03a14a7196368a9066cbaea953e871e8b68b4951f7439412e9e34e SHA512 5d6a2e1d4c2f2df63eaec8d015ea9e485615d82b7923af5c03c394862a31b1e6be2329aca18c0fa0c7d6b984164bb9b4d18f94a3d8cd140a683c5197ddff2249
-EBUILD xtrs-4.9d-r5.ebuild 2262 BLAKE2B 6985dd489ca79968ce445b8a247db8370cfb7d9ebc12dc543f28467121160af0a8db95f80711379eba1d232a26ae13f1545a14a4927dbb7ea1ea66fc1bd8abd5 SHA512 ce5dc1899a0de416862f0bf2c2adaee90adc54f25d4b124a5d328a6a9e789734a6e035c783eab229bf2f11413be87692234732183794a2f08c2bf9dc9b6fee3d
+EBUILD xtrs-4.9d-r5.ebuild 2265 BLAKE2B 01bd54df7e249888f978685334a91b7e6aedb6d5cdaa9072d9bab7a52fc92f684c15490cf873ffbd4d3748a4f31ca0d79090113bc9b546838f0e1b84f79718c6 SHA512 6645283559e7f820ad17bd1b13daac7deda694c6c3e321d6dd9b05190b0596990e7b4f30e19cb3e0ec0413d20852f709bc8ec57714a16b55beeeea67afe4cddd
 MISC metadata.xml 1106 BLAKE2B c19193deafa9ffc2b7e00df6386b1633b9180bad0ac7a6884822d38d8539f3734375a3ba5ce74c5cef895bb41d54c0b252971bd8dd03da7faa79c327c1db1b22 SHA512 fc12b813ea60239dbf8a94d98263cd77d4e35051fc7f9772547c0f52e37c02ed466f72eb5f63070d67bc86a6c546cfab4b2b01e4f994a91ae4e88569cb1beacd
diff --git a/app-emulation/xtrs/xtrs-4.9d-r5.ebuild b/app-emulation/xtrs/xtrs-4.9d-r5.ebuild
index 34629601e862..4785a873f452 100644
--- a/app-emulation/xtrs/xtrs-4.9d-r5.ebuild
+++ b/app-emulation/xtrs/xtrs-4.9d-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
@@ -6,10 +6,10 @@ EAPI=6
 inherit flag-o-matic toolchain-funcs readme.gentoo-r1
 
 DESCRIPTION="Radio Shack TRS-80 emulator"
-HOMEPAGE="http://www.tim-mann.org/xtrs.html"
-SRC_URI="http://www.tim-mann.org/trs80/${P}.tar.gz
+HOMEPAGE="https://www.tim-mann.org/xtrs.html"
+SRC_URI="https://www.tim-mann.org/trs80/${P}.tar.gz
 	ls-dos? (
-		http://www.tim-mann.org/trs80/ld4-631.zip
+		https://www.tim-mann.org/trs80/ld4-631.zip
 		https://dev.gentoo.org/~ulm/distfiles/ld4-631l.xd3
 	)"
 
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 32be6d10a760..ae5f305dcc2b 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/honggfuzz/Manifest b/app-forensics/honggfuzz/Manifest
index 91d3f5db6924..e57cbc3f4dee 100644
--- a/app-forensics/honggfuzz/Manifest
+++ b/app-forensics/honggfuzz/Manifest
@@ -1,4 +1,4 @@
 AUX honggfuzz-2.0-no-werror.patch 518 BLAKE2B aaf123687ea5f7fd584d1fd5e57f2f6ac50a8d80c3a1555d8b01d42df91a106848ec1d73007e6b67127e767770d91effa5e95dd9016f47fecac0e465e74cfe61 SHA512 7775f683cd5b22d91d3cf16cb0f8e7df50f5159a3f16ef42dc6125c961a856ddfc59c944319575e403747a2af768cd3f93437fc0bbc32bfc12f833f4cd7db0eb
 DIST honggfuzz-2.2.tar.gz 65219878 BLAKE2B f842c6d3dea22525d1335fbdbdffa349ace743762386e81e40f1eab99dafa8f34b935c1cb4871b25ade76e3ac8f846d0329ef01bc0097a888e60b400819ada2d SHA512 8e6a0cf027d521967a69828afa6e0ae5306ad7387c595405f9d3151344e2aa91f9537355fafdf03f06e6702014e2faa0609c3d249f22af5793663f3c9d09180d
-EBUILD honggfuzz-2.2-r1.ebuild 725 BLAKE2B efd2a59d70673ccec16ff9b5d7ceac00666c70d631a9de09b970674ae3c0e69023b754bca761f82a01d738c8fc1a20afeb55f57d17ad8b8565014eb9441f4742 SHA512 bf2756e1958817778bed394a37ae88ac7579d726e5d43c41767a8cf0f08c069e9b22828da6b1181fca2aaf8f50f7daaff41b957765386d94cf2a6adbe7e4fde5
+EBUILD honggfuzz-2.2-r1.ebuild 889 BLAKE2B fb3cb5de46a07de47eae801c194c7f9bac6ba2db50e6b4f1b5461605b609ae645d7f0d2ab8e3406e8042309c203bf7c619381713d75f9ded986ec6344104f7bf SHA512 b5424870b89000c22109c02c43d0d673841e9930f9bf717a3456bce6ba7cf167c9dee31f779a74c296ced287a152d5a517a7e5beecb2dc229f9cc9c98645604e
 MISC metadata.xml 332 BLAKE2B 72702618670b8f8ef24ef68d5f9b1b29c8d25c3630cc5fb22ef859ea7879af84d0c7fc758a02a0b4175e10707f2c161930151b65e2e3d07f154a1b2c48fee152 SHA512 1f75a39cce6995d550344225849dafb3a980df19cc6afd10025e58e6c08086a27a67173ff435c084660970cb4ed18183914afeba712dc461d7fd55f83f9e679d
diff --git a/app-forensics/honggfuzz/honggfuzz-2.2-r1.ebuild b/app-forensics/honggfuzz/honggfuzz-2.2-r1.ebuild
index cb8aa2480619..31cf4b0e9447 100644
--- a/app-forensics/honggfuzz/honggfuzz-2.2-r1.ebuild
+++ b/app-forensics/honggfuzz/honggfuzz-2.2-r1.ebuild
@@ -33,6 +33,12 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.0-no-werror.patch
 )
 
+pkg_pretend() {
+	if tc-is-clang; then
+		die "${P} does not work on clang due to incomplete -fblock support: https://bugs.gentoo.org/729256. Please try gcc."
+	fi
+}
+
 src_prepare() {
 	default
 	tc-export AR CC
diff --git a/app-forensics/quickfuzz/Manifest b/app-forensics/quickfuzz/Manifest
index 6aae82ce7449..76cc0e0579cb 100644
--- a/app-forensics/quickfuzz/Manifest
+++ b/app-forensics/quickfuzz/Manifest
@@ -4,4 +4,4 @@ AUX quickfuzz-0.1_p20160920-ghc-8.0.2_rc1.patch 250 BLAKE2B d6de3b6acec0fcf3a61c
 DIST quickfuzz-0.1_p20160920.tar.gz 1073894 BLAKE2B fdf9cf9f1b3aaf7e21221d62417aa5bd80dd67bab3e09d67344b0eaf8d6a50e9eee585a6d234b1c6472f7c17a9b4057a242ba19f48fbfa859cfd0ef8111c409b SHA512 52068c35cef580e4719f1b7128ae069a80581f176adc4a2abbbdfc7fc48849e4ff1c228d342b7eaddc780e5b50eabb285b398c334753fca0dc70d3d3ec9f55f8
 EBUILD quickfuzz-0.1_p20160920.ebuild 4204 BLAKE2B d72192e4cf8b63711737bd206f29037140dc63aa2ae43990f8334410b262c4a2a875de732007802a15018430f7dd170fda629a3ca351fdce79c1eb35d09f3ce2 SHA512 fac8e0f1c6d1410416173e9bf41596af097c25dbac5ddeb8563185fca9898fb1a7b1744deb1af3763726c9f05b52f5d678f5e8be1811320d9798799ae5c437bd
 EBUILD quickfuzz-9999.ebuild 4742 BLAKE2B a500d924c2e4f2ef7d784d51ca444dae882fd556ffb164cc2f43d92560ea75926f463c276837423e6b62383166a97a448c9580eb7286775d253e77fc95db7a17 SHA512 19b839da33747eabbeb8e1d8fdf30d777a62080cf73061ae0463e7b61a5a6429a79bcc036d32c0cce4a274aa3a560a3bbe3643f00ffb85c46a5ebf04d468d531
-MISC metadata.xml 805 BLAKE2B 5e8884355c25d4387fa5a96d25aa773cc87481a9767a2824e2987319979fe1f42e78fee3ce1a6a07d3aa1290cb1a3e3ce5de67fecad1486e621d86b5b1c70b42 SHA512 c0546197822adc83a8339312fcbf88d3f81effe6689508d4b1bbe34c42a91b407be5539713599ba087985d6780db4788f328a7f7a3d4925fe7d4ca03ec115989
+MISC metadata.xml 704 BLAKE2B b8508a5cad42bb11e33fb60c8eeb73a67aad16c2a52fa04c264ccc390176f3eb0184643eaad1c751d0798e5d0ee45cd23b9b9a584332c52d83d0759840ef70d7 SHA512 3c8c74b4611afd70c650809b63ea86cabadb215d942f98780deb90cd894412a7d9f5ab1db64bdf428b2789f118884cb90ecf46489ee7b295153a9e73f6878f59
diff --git a/app-forensics/quickfuzz/metadata.xml b/app-forensics/quickfuzz/metadata.xml
index 1e1e29136406..ed6765a28fdd 100644
--- a/app-forensics/quickfuzz/metadata.xml
+++ b/app-forensics/quickfuzz/metadata.xml
@@ -14,9 +14,6 @@
 		<flag name='net'>support networking formats</flag>
 		<flag name='pki'>support PKI formats</flag>
 	</use>
-	<longdescription>
-		An experimental grammar fuzzer in Haskell using QuickCheck.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">CIFASIS/QuickFuzz</remote-id>
 	</upstream>
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 38a08e060527..f35eb101333e 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/alertmanager/Manifest b/app-metrics/alertmanager/Manifest
index ab61fdcce750..d13bf001dfbe 100644
--- a/app-metrics/alertmanager/Manifest
+++ b/app-metrics/alertmanager/Manifest
@@ -2,6 +2,8 @@ AUX alertmanager.confd 135 BLAKE2B 7a3dd341e63a73e9782d44dc59c8a65ea1c855ae0589c
 AUX alertmanager.initd 817 BLAKE2B 74a7e6c292ac52f4d6d00644038e74624be41ed632a6db389a7c226b3a37d43f22f1c8c098d34f652d9b6b9cb407523b375c884e75fe3740578f26e822df21c7 SHA512 34ae9348f5e054543bdbffd29e30d1fb6147d47e74cecb1755c29bf4327bd56ac4fae4cecddf2c515b6ddffbce4ad7151ae3a3e7f283db2d6b74619f5faa44ac
 DIST alertmanager-0.18.0.tar.gz 5181819 BLAKE2B efcc856ccacb97646915e8d622179cf3cc7554351036cf556347ec46cdede5c9223139cb209b52376964c7b19b119f3683f82698d1e7c07b1432bb3e4bb37239 SHA512 59faec308abaac3d2b59198fef25109b208de1a807b38803dc10722ff0caf1bac9d9795005fefb3b4e2acda62be136bfcafe7b9702ae52565021a424f99fa730
 DIST alertmanager-0.19.0.tar.gz 5862442 BLAKE2B a79336286ca1099dcc73cce897eccaff8d40f8d3140ebf1943a1189cf1d2ec58738cbe7fc02221826ffc0e1535954a11a461ac6ea222113c79a44d43cc9eda83 SHA512 2c21bfbb1001e07e81b1115439ad15e7c0e7089839e56a19c445177e322b8ef9aa2b85e96478f3c3d709cbbd3a5447662a8c55da370b84aa4b6b24f83848744b
+DIST alertmanager-0.21.0.tar.gz 5704209 BLAKE2B 646ac0b05eb194d1c35f49e38c0a206d09a9c45d4f2f7c371a53ecfff5deba6e2c2af82f3f4ce2b591338c557241766395f42b8bd3c91ae2da4ef7e570666fda SHA512 72568407af4e90455975eff504ed49f4877eb517673532f655b6b0459725db5df7bbd1a3be120106c46b30dd7056714cc0b34b46df9c4d8c98e1f8c9eb0c39da
 EBUILD alertmanager-0.18.0.ebuild 1389 BLAKE2B 4757558e01287f8afff1a39c04dfd1cccaaae3ee14584c8196300280acea50393a05b56e6a255cc35cca408464044273e9935e37ecfd03f86ceb17867ac814f9 SHA512 e64b174b7433b0bab0d6c549d470582737a6b138f0d79e042a9bb7e9b7220dcfe5f22652188f159b6a550622a9bd160c6dac34a910ab2f8b0a30ce5ba4910e32
 EBUILD alertmanager-0.19.0.ebuild 1389 BLAKE2B e4845bb46c400e9185c28f13b43432c177a8708bb08cbc36f27ea1c9cb90ca5c8d6172090dc84c156acd288b5f812b5a64ce1668f5aff318d4a59e60c583c329 SHA512 fa273caa4bc24e6cfb118b370605ae0513975c8184f1e14ce98f48fd036d10aa21f0e5b5c45393dbfee0e1f1002c03c3571c09ba1701c6a7fe8a2a0eb2b8802c
+EBUILD alertmanager-0.21.0.ebuild 1100 BLAKE2B 8399e968c5543a8ee3c7301d372fdffb954bd3ce0d23830d654d557234a8007802509dd58faad9b8a152c0c0a4efb90ff22f29b1081308f484a7dc94cc46ad51 SHA512 7a9ddb85663a61eebb95be83a77a5adbcb9179564850dd6cb9e1f22adb23d09cc380c4f76ddc31c2bc9758645e3315d0864281b4863cca7444c7d7a84a2c5d4d
 MISC metadata.xml 336 BLAKE2B 2cab21f76be9803ce08848025fd889354e4595fe5195f36361a4b5a2f2bc2e8e3e0c697fef2933db48d178d10f838a960e7ad2a8ea74bae42ebe395a6d150484 SHA512 63a13c6b9bff1f75c79b2c0cf1cb16e4973d58e666e04e1ef50bb746caaea8e5358cb61a39c257c082b67264960dbcc78da5ae24dcad94d7e72f833483c8e5bd
diff --git a/app-metrics/alertmanager/alertmanager-0.21.0.ebuild b/app-metrics/alertmanager/alertmanager-0.21.0.ebuild
new file mode 100644
index 000000000000..028f242a3a36
--- /dev/null
+++ b/app-metrics/alertmanager/alertmanager-0.21.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module user
+GIT_COMMIT=4c6c03eb
+MY_PV="${PV/_rc/-rc.}"
+
+DESCRIPTION="Alertmanager for alerts sent by client applications such as Prometheus"
+HOMEPAGE="https://github.com/prometheus/alertmanager"
+SRC_URI="https://github.com/prometheus/alertmanager/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+BDEPEND="dev-util/promu"
+
+RESTRICT+=" test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${GIT_COMMIT}/" .promu.yml || die
+}
+
+src_compile() {
+	promu build -v --prefix bin || die
+}
+
+src_install() {
+	dobin bin/*
+	dodoc {README,CHANGELOG,CONTRIBUTING}.md
+	insinto /etc/alertmanager/
+	newins doc/examples/simple.yml config.yml.example
+	keepdir /var/lib/alertmanager /var/log/alertmanager
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	fowners ${PN}:${PN} /var/lib/alertmanager /var/log/alertmanager
+}
diff --git a/app-metrics/buildbot-prometheus/Manifest b/app-metrics/buildbot-prometheus/Manifest
deleted file mode 100644
index 4bfe590f8b9e..000000000000
--- a/app-metrics/buildbot-prometheus/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch 2430 BLAKE2B 1c7cc11d95301cf119b3cf0a1d9b1c0af9e48fd486a03350138d97c625abcb72e0f13b0eb4c826341f4e9a6938a708f0afee4c1cd36750a99580a34b23aa290b SHA512 ef63fbfabe5bef28eae222dca2509e24f5f1ec3aa71aa3af3c0092cf78cb9efe58296d54e46760c43ecd38c3d9ab741d1c83c79f2eee7f96572a82f125a389b6
-DIST buildbot-prometheus-17.7.2.tar.gz 10101 BLAKE2B 25c060b5368aa1dea6145b6d380db8001f3cd1fb49f9b3bb1e4ecccdb771591abc269d5aee9d022a9b182b19650a0c398b580004f20def0675b86ca9f3a1e2db SHA512 8a0ecaf57eade3d69fabc57a19a1c02af8e398c3bc4732e40f39e8904a16c9b751d4f6f8ace0dd7893b380d1ffc8a51360279aeb7b4059a6cd9438145344e74b
-EBUILD buildbot-prometheus-17.7.2-r2.ebuild 1105 BLAKE2B c594e9c1749758239a800ceee83ea86cb43ac941091f84998feaf04fac5f77cd413eb7d97a096596ddbd40a5bd5d9017130863468e34105f7511401f779a66c9 SHA512 be6dde29eafb22270a4617ec9c620755672a489a2f1711685cc7dd71418c341eb7fccfa635107765237df322370a60bf49872acc931ee22d29a954fc4a6736ba
-MISC metadata.xml 314 BLAKE2B 7ea3af51048358bd6291056e64324eee54fdd041b5a6199c14058e54ccafdffcbfddad12490cc6a6a5baf0aff47648c23ee8e7df6234e5aac10d15740b93d47e SHA512 73b0984af8b92c14a21617b3977d2f7b84f5ac33b9cb3ec26dbb12d59789f8c50c839c3de6044667e9d2ab12c420a28511ab4fa445f043c98e22bdf0b16fb68e
diff --git a/app-metrics/buildbot-prometheus/buildbot-prometheus-17.7.2-r2.ebuild b/app-metrics/buildbot-prometheus/buildbot-prometheus-17.7.2-r2.ebuild
deleted file mode 100644
index 739ad58b123e..000000000000
--- a/app-metrics/buildbot-prometheus/buildbot-prometheus-17.7.2-r2.ebuild
+++ /dev/null
@@ -1,35 +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="A Prometheus metrics exporter for Buildbot"
-HOMEPAGE="https://github.com/claws/buildbot-prometheus"
-SRC_URI="https://github.com/claws/buildbot-prometheus/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-python/prometheus_client[${PYTHON_USEDEP}]
-	>=dev-util/buildbot-0.9.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch"
-)
-
-python_prepare_all() {
-	sed -i -e "/^install_reqs.*$/d" -e "/^from pip.*$/d" -e "s/requires = .*/requires = ['buildbot', 'prometheus_client']/" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	einfo "This version has been patched to be compatible with the current buildbot releases >=0.9.0"
-	einfo "For older buildbot-0.8* releases, please use dev-python/buildbot-prometheus-17.7.2-r1 version"
-}
diff --git a/app-metrics/buildbot-prometheus/files/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch b/app-metrics/buildbot-prometheus/files/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch
deleted file mode 100644
index 7fbdbdd09133..000000000000
--- a/app-metrics/buildbot-prometheus/files/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From ceddea3f55773e104c628ef6316ce74785d235f3 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <brian.dolbec@sony.com>
-Date: Tue, 6 Mar 2018 02:30:56 +0000
-Subject: [PATCH] Migrate duration calculations to >=buildbot-0.9
-
----
- buildbot_prometheus/prometheus.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/buildbot_prometheus/prometheus.py b/buildbot_prometheus/prometheus.py
-index a766f41..ebf41a1 100644
---- a/buildbot_prometheus/prometheus.py
-+++ b/buildbot_prometheus/prometheus.py
-@@ -302,7 +302,7 @@ class Prometheus(service.BuildbotService):
-             build_started = msg['started_at']
-             build_finished = msg['complete_at']
-             build_duration = build_finished - build_started
--            duration_seconds = build_duration.total_seconds()
-+            duration_seconds = build_duration
-             self.g_builds_duration.labels(**labels).set(duration_seconds)
- 
-             build_status = resolve_results_status(msg['results'])
-@@ -401,7 +401,7 @@ class Prometheus(service.BuildbotService):
-             buildset_started = msg['submitted_at']
-             buildset_finished = msg['complete_at']
-             buildset_duration = buildset_finished - buildset_started
--            duration_seconds = buildset_duration.total_seconds()
-+            duration_seconds = buildset_duration
-             self.g_buildsets_duration.labels(**labels).set(duration_seconds)
- 
-             bs_success = resolve_results_status(msg['results'])
-@@ -444,7 +444,7 @@ class Prometheus(service.BuildbotService):
-             br_started = msg['submitted_at']
-             br_finished = msg['complete_at']
-             br_duration = br_finished - br_started
--            duration_seconds = br_duration.total_seconds()
-+            duration_seconds = br_duration
-             self.g_build_requests_duration.labels(**labels).set(duration_seconds)
- 
-             br_success = resolve_results_status(msg['results'])
-@@ -491,7 +491,7 @@ class Prometheus(service.BuildbotService):
-             step_started = msg['started_at']
-             step_finished = msg['complete_at']
-             step_duration = step_finished - step_started
--            duration_seconds = step_duration.total_seconds()
-+            duration_seconds = step_duration
-             self.g_steps_duration.labels(**labels).set(duration_seconds)
- 
-             step_success = resolve_results_status(msg['results'])
---
-libgit2 0.24.6
-
diff --git a/app-metrics/buildbot-prometheus/metadata.xml b/app-metrics/buildbot-prometheus/metadata.xml
deleted file mode 100644
index 7499dcce7171..000000000000
--- a/app-metrics/buildbot-prometheus/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="pypi">buildbot-prometheus</remote-id>
-		<remote-id type="github">claws/buildbot-prometheus</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-metrics/prometheus-bin/Manifest b/app-metrics/prometheus-bin/Manifest
index c77ba667c584..c886b3ada104 100644
--- a/app-metrics/prometheus-bin/Manifest
+++ b/app-metrics/prometheus-bin/Manifest
@@ -1,5 +1,5 @@
 AUX prometheus.confd 43 BLAKE2B c83afa8ad1133c9e93abd40c862ff5b3ac9a3b3c4447b915ae1482d92096dec9f200d089de2458a6cdb0e72d2bf0652d56e3afd6d5a3cd8a3ed7a6c9a0e3e42c SHA512 37468e897cd34b50b0edc65ada3f0c2e05459c3d96bb7f82d58b6de5bf10a127f1bf7912af93d83d94e3ea7287cfeb2311e36535f291d01a11d152a0b438591c
 AUX prometheus.initd 929 BLAKE2B d48650b11b77d4d04b5458682456fb20f8085dc3efe9d0ddd2a6c75751ddae156bbb83c20082bc7b6833395602c24da61e2f7610bdff291e05e3eeb4fb651317 SHA512 504122eb8ed19beac81987b77eb78bba9b36b2ef15f28b1a542804271046e06363baf464f3c303982f647eba65fbc2b5459235f56625e1ff3fed9834937cd0d2
 DIST prometheus-2.15.2.linux-amd64.tar.gz 59204993 BLAKE2B 700d61063cddea02ca4445257b11b782c3b6fc84ed3d48f8d196c5602819f0d44b218d15b870281293bf0661929b02930b937e66fec34918b81cd3d010a6fa21 SHA512 a3b95fe6101d5587329d84adb18c0c261babe5a909e62ab1a39f42df28c058d311b0b2ea9ecbdad9227789ed83c0fae4a12776348999cda3a70cdc457f6d3611
-EBUILD prometheus-bin-2.15.2.ebuild 1503 BLAKE2B f99d34d3633e91878c7c64223ee071c717dfe6aa438e7ff548cbcd62a10b62d1802a946c44486f539b263076f8b14dcb9705d1de5355d5945fc19f18f06ebca3 SHA512 54ae33cb31f85b53735eb29c6f0b0377f94b73eb5b7838a762c2a0c649f887c46e5de6437e88493961b5f871eb6a0e5d058405cd9343309a7cd0ffd52e631e2e
+EBUILD prometheus-bin-2.15.2.ebuild 1504 BLAKE2B c08a028d48056ae10bd5f25e0f083d04118746ae5f99c7bbd3fe7e6ff6d52769d9d3b272bb058e132af1b7fd8ac0709cfd2106cf25a69618338a45c1f7844ce3 SHA512 78d134521d15cd3c322ac3365d725ddeef86f7608354b6c23726c8cd845a3f683d9416b6d3cd38520c12fffd9638d582f892825fc1777f1f6c691dd48cfcaf29
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-metrics/prometheus-bin/prometheus-bin-2.15.2.ebuild b/app-metrics/prometheus-bin/prometheus-bin-2.15.2.ebuild
index 89e508d0cf53..877bf429003d 100644
--- a/app-metrics/prometheus-bin/prometheus-bin-2.15.2.ebuild
+++ b/app-metrics/prometheus-bin/prometheus-bin-2.15.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="prometheus monitoring system and time series database"
-HOMEPAGE="http://prometheus.io"
+HOMEPAGE="https://prometheus.io"
 MY_PN=${PN%%-bin}
 MY_P=${MY_PN}-${PV}
 SRC_URI="https://github.com/prometheus/prometheus/releases/download/v${PV}/${MY_P}.linux-amd64.tar.gz"
diff --git a/app-metrics/prometheus/Manifest b/app-metrics/prometheus/Manifest
index 5d45b5ce0a84..01dcdc5e5483 100644
--- a/app-metrics/prometheus/Manifest
+++ b/app-metrics/prometheus/Manifest
@@ -1,5 +1,8 @@
 AUX prometheus.confd 43 BLAKE2B c83afa8ad1133c9e93abd40c862ff5b3ac9a3b3c4447b915ae1482d92096dec9f200d089de2458a6cdb0e72d2bf0652d56e3afd6d5a3cd8a3ed7a6c9a0e3e42c SHA512 37468e897cd34b50b0edc65ada3f0c2e05459c3d96bb7f82d58b6de5bf10a127f1bf7912af93d83d94e3ea7287cfeb2311e36535f291d01a11d152a0b438591c
 AUX prometheus.initd 929 BLAKE2B d48650b11b77d4d04b5458682456fb20f8085dc3efe9d0ddd2a6c75751ddae156bbb83c20082bc7b6833395602c24da61e2f7610bdff291e05e3eeb4fb651317 SHA512 504122eb8ed19beac81987b77eb78bba9b36b2ef15f28b1a542804271046e06363baf464f3c303982f647eba65fbc2b5459235f56625e1ff3fed9834937cd0d2
 DIST prometheus-2.13.1.tar.gz 15249891 BLAKE2B 35cd3c81bdb4f3a783c2ab1f1318946db5b25c94496fe351739a59259a726bf54d418d6b29efeff44c8007353ed63368819ce89ffe6a4f380b7ae216da3c4d63 SHA512 aed3b44db97cd2a67add64d13e950246b25c2b459f6b1081a6c548862c4e85c055254a0dfb94b08ac85f83dbbe30afceb1c54a8ad6f7ff1367aeb6af6d270e8a
+DIST prometheus-2.19.1-assets.tar.gz 5032055 BLAKE2B 75bc247d3dfbcccf3a9d7ef8a23fabe2d92d698670f5aabb19e1ee019e0197aa4fd49cfd53353e09a765a014af70ad860c7d1b6bce292632e5ed1175dd206ae9 SHA512 52d1f80d9ab2de778e8a0c81549ff83647d3d8af37ccf535a6fc4ac45fe29f25f6592e9b5eb137cd5ed6f6730835e4ba52b6c4c82e5b0bb2336b90c809d756de
+DIST prometheus-2.19.1.tar.gz 13343138 BLAKE2B 042f2c6e10e3d7f50b2373d9c3977db0318c8c9839e313463890ccae58c91d6d46c306d5aaeb795fb1a9649477b179999cb6b182aca9dee222d8fba557bf6d74 SHA512 a54a83b21ac8f3477e678ca365b8f04adcbe5cdd8a17d842eb9cd2e3428238841fb0492da6f4ec973f48803b0739667c734ae8a88b48d12555e23410e6461629
 EBUILD prometheus-2.13.1.ebuild 2059 BLAKE2B 4614929b87ff860eac5b7b46d9b8f60474c51faab659699a0866dccaaef4d149214430d370dc5f0420c756d8d240da4cc8bb33b1948e6b4baf690c20b8905f06 SHA512 aac4922659750e6bcde07a8ef7823a5d8c4d47ccd1107a9f593b95079322031f4c8546b7d0d6df20f736a6a24d869105866c30eaf9e81773e21a6dcad27beac9
+EBUILD prometheus-2.19.1.ebuild 1942 BLAKE2B 4a644da79ba0ec628ede6636469a478d5c6166349c33b86d0667b55e927fb78be8e2e037ca8a87144860f7962b33da55c2d5d7892c556ae3635ec3208311b094 SHA512 7d63dff9863a248b2fee4e26e059d3ceda546c5c6d97f3cc08e0d11ba5030ac88c309370aedd3ac23b69289719be650dcaa670f1a78a56e37caca4074db485ba
 MISC metadata.xml 334 BLAKE2B f35628a28c6087863ab4d96e1a4a3705f470845fe6c963c47457caf85e14cb1f99938b1b78bad2f87653f525c154f76c8e0e7b18d6f21d2cf10016eacc565984 SHA512 1a64169c81388848bb26d32e8706fb6d4fbcbde847b1e075f1eee297d5fd4b35ecc835e9ed16ac79825f8c17efac78271e6c8735809a57a8b4ed73b5a789300a
diff --git a/app-metrics/prometheus/prometheus-2.19.1.ebuild b/app-metrics/prometheus/prometheus-2.19.1.ebuild
new file mode 100644
index 000000000000..86894dfc6925
--- /dev/null
+++ b/app-metrics/prometheus/prometheus-2.19.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module user
+
+MY_PV=v${PV/_rc/-rc.}
+GIT_COMMIT=eba3fdcbf
+
+DESCRIPTION="Prometheus monitoring system and time series database"
+HOMEPAGE="https://github.com/prometheus/prometheus"
+SRC_URI="https://github.com/prometheus/prometheus/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~williamh/dist/${P}-assets.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+BDEPEND=">=dev-util/promu-0.3.0"
+DEPEND="!app-metrics/prometheus-bin"
+
+PROMETHEUS_HOME="/var/lib/prometheus"
+
+RESTRICT+=" test"
+
+pkg_setup() {
+	enewgroup prometheus
+	enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${GIT_COMMIT}/" .promu.yml || die
+	mv ../assets_vfsdata.go web/ui || die
+}
+
+src_compile() {
+	promu build --prefix bin -v || die
+}
+
+src_install() {
+	dobin bin/*
+	dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
+	insinto /etc/prometheus
+	doins documentation/examples/prometheus.yml
+	insinto /usr/share/prometheus
+	doins -r console_libraries consoles
+	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
+	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
+
+	newinitd "${FILESDIR}"/prometheus.initd prometheus
+	newconfd "${FILESDIR}"/prometheus.confd prometheus
+	keepdir /var/log/prometheus /var/lib/prometheus
+	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
+}
+
+pkg_postinst() {
+	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
+		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
+		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
+		ewarn "This release requires a clean storage directory and is not compatible with"
+		ewarn "files created by previous beta releases"
+	fi
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 3c2879bc3f39..d5f96527abc3 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/beep/Manifest b/app-misc/beep/Manifest
index 041ca3197e4f..299874880bd0 100644
--- a/app-misc/beep/Manifest
+++ b/app-misc/beep/Manifest
@@ -1,7 +1,3 @@
-AUX beep-1.3-CVE-2018-0492.patch 3292 BLAKE2B fafed7dbe65438869adccf674b19c4e5b6655dca794043bbb9914879fc8e9bb6eac67b35254f47ec61a9ad5147aac6b819edb3fc8633e81c79d555023a422147 SHA512 e7ba3db3e70d2560c2a8701d9424db43a2e94988728b84bc84c5e6d777fc1e0596d767470fca41774a104cba9d2e58ef59f6449570c3d3887c1bf97861bc5bad
-AUX beep-1.3-Makefile.patch 516 BLAKE2B f69b5907e7a1342a574bedc273e609415e5853939aa694894c732333e482f2507462748cfb9ba1f0945f4778653d44c3fa04c4aca3eb78afb7152597beba759a SHA512 b21f788780a13bbef436b80ec020b8727b9c1a8ddac3552cb8bf05d7ab937851d05d72279b53b51dd0ae1f99e44f55caa494b7e61b59800d91dd186497b65009
-DIST beep-1.3.tar.gz 19344 BLAKE2B 4f9cf12f6983eeb53502fd85e5e1d428e1c1af481f8f424f6ae18cbe104462e8fdcc96670a72daa8a8a0d1430d00824d8795b4db53437e7bb7320cddfd84cfd3 SHA512 3f71146202208fa0c0cda360d125dd972ea003cf8cd62da21d67eb544c92f7b82640e7ce7c3835cbc65c75909a882edfa54dbd8d8b748d6f243711ea331477fd
 DIST beep-1.4.9.tar.gz 83154 BLAKE2B 073169ccb4919c17c0291951834fea682c87021f18562629013293432292750f6d6b3235e8882fa9cf26c9e055e1283cfa629c2e88e0f87a301b238c38380498 SHA512 46e6066cb4d9ad4a0c55a03bf5a2163426648ce3831fe1f7bafa2f02d0e407b50c52e58cc2b123c346df96e92b73d2458b473c3fb001d9a0d1470b7cf38cc35b
-EBUILD beep-1.3-r3.ebuild 678 BLAKE2B 8544f8f0ff6aa10875b13d401de593f49c1e6e1b14aca45dff03a053fc2b7c4350dc671766706b05ca87af655ad4db0c154f5eb67f524ca7c20c40501bd978de SHA512 e05d59079f1d8931e7c9626598a47e9d335f7fbd8fa564a35ff566656abfc09b10010922bbcb8d05a5b926820fd529620c3f678d994faf95769915f0925c8e84
-EBUILD beep-1.4.9.ebuild 1046 BLAKE2B 44ec88e8d8af64abb6be9e3b3c33338bbab93ba4e1a52f3836a899b6192baa222ba94b05bce2e5f5d4f72768181f5c1861d201810673646c9c1eb434b273044f SHA512 a802abf9efefcfa2e29974b8c5a0423774a76fe0f62acb65f93c9dc30f5614d4292e8826347f16c6eec8c3cb40647889feb5559e79443a97a39e93a54eaaa9d6
+EBUILD beep-1.4.9.ebuild 1044 BLAKE2B 2de3a51eb677557cc0012aad4573594c5bf0f86d489e95e1f32cfc73f2a33d18606e35158aa3af342833a768547d86a71f7c33a62ea3d98624b03ee57b7c2d57 SHA512 1a66a24c42965a2b2c80e4ba9698aa710d2beefc7bc40c3cae0933198a2a2f51a5b319c6f5fde1249dc47edc044332c2ae65409071640b1bdd84641c8c56f675
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/beep/beep-1.3-r3.ebuild b/app-misc/beep/beep-1.3-r3.ebuild
deleted file mode 100644
index 602be70f287a..000000000000
--- a/app-misc/beep/beep-1.3-r3.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
-
-inherit toolchain-funcs
-
-DESCRIPTION="The advanced PC speaker beeper"
-HOMEPAGE="http://www.johnath.com/beep"
-SRC_URI="http://www.johnath.com/beep/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86"
-IUSE="suid"
-
-PATCHES=(
-	"${FILESDIR}/${P}-Makefile.patch"
-	"${FILESDIR}/${P}-CVE-2018-0492.patch"
-)
-
-pkg_setup() {
-	tc-export CC
-}
-
-src_install() {
-	dobin beep
-	if use suid; then
-		fowners :audio /usr/bin/beep
-		fperms 4710 /usr/bin/beep
-	else
-		fperms 0711 /usr/bin/beep
-	fi
-	unpack "./${PN}.1.gz"
-	doman "${PN}.1"
-	einstalldocs
-}
diff --git a/app-misc/beep/beep-1.4.9.ebuild b/app-misc/beep/beep-1.4.9.ebuild
index d6a43378d510..e8c215dbe0b6 100644
--- a/app-misc/beep/beep-1.4.9.ebuild
+++ b/app-misc/beep/beep-1.4.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/spkr-beep/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86"
 IUSE="suid"
 
 # Tests require a speaker
@@ -48,7 +48,7 @@ src_install() {
 	dobin beep
 	doman "${PN}.1"
 
-	if use suid ; then
+	if use suid; then
 		fowners :audio /usr/bin/beep
 		fperms 4710 /usr/bin/beep
 	else
diff --git a/app-misc/beep/files/beep-1.3-CVE-2018-0492.patch b/app-misc/beep/files/beep-1.3-CVE-2018-0492.patch
deleted file mode 100644
index f4894b51fc81..000000000000
--- a/app-misc/beep/files/beep-1.3-CVE-2018-0492.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-diff --git a/beep.c b/beep.c
-index 7da2e70..4323d31 100644
---- beep.c
-+++ beep.c
-@@ -109,6 +109,7 @@ void do_beep(int freq) {
-      /* BEEP_TYPE_EVDEV */
-      struct input_event e;
- 
-+     memset(&e, 0, sizeof(e));
-      e.type = EV_SND;
-      e.code = SND_TONE;
-      e.value = freq;
-@@ -124,10 +125,6 @@ void do_beep(int freq) {
- /* If we get interrupted, it would be nice to not leave the speaker beeping in
-    perpetuity. */
- void handle_signal(int signum) {
--
--  if(console_device)
--    free(console_device);
--
-   switch(signum) {
-   case SIGINT:
-   case SIGTERM:
-@@ -257,7 +254,7 @@ void parse_command_line(int argc, char **argv, beep_parms_t *result) {
-       result->verbose = 1;
-       break;
-     case 'e' : /* also --device */
--      console_device = strdup(optarg);
-+      console_device = optarg;
-       break;
-     case 'h' : /* notice that this is also --help */
-     default :
-@@ -276,26 +273,6 @@ void play_beep(beep_parms_t parms) {
- 	"%d delay after) @ %.2f Hz\n",
- 	parms.reps, parms.length, parms.delay, parms.end_delay, parms.freq);
- 
--  /* try to snag the console */
--  if(console_device)
--    console_fd = open(console_device, O_WRONLY);
--  else
--    if((console_fd = open("/dev/tty0", O_WRONLY)) == -1)
--      console_fd = open("/dev/vc/0", O_WRONLY);
--
--  if(console_fd == -1) {
--    fprintf(stderr, "Could not open %s for writing\n",
--      console_device != NULL ? console_device : "/dev/tty0 or /dev/vc/0");
--    printf("\a");  /* Output the only beep we can, in an effort to fall back on usefulness */
--    perror("open");
--    exit(1);
--  }
--
--  if (ioctl(console_fd, EVIOCGSND(0)) != -1)
--    console_type = BEEP_TYPE_EVDEV;
--  else
--    console_type = BEEP_TYPE_CONSOLE;
--  
-   /* Beep */
-   for (i = 0; i < parms.reps; i++) {                    /* start beep */
-     do_beep(parms.freq);
-@@ -305,8 +282,6 @@ void play_beep(beep_parms_t parms) {
-     if(parms.end_delay || (i+1 < parms.reps))
-        usleep(1000*parms.delay);                        /* wait...    */
-   }                                                     /* repeat.    */
--
--  close(console_fd);
- }
- 
- 
-@@ -328,6 +303,26 @@ int main(int argc, char **argv) {
-   signal(SIGTERM, handle_signal);
-   parse_command_line(argc, argv, parms);
- 
-+  /* try to snag the console */
-+  if(console_device)
-+    console_fd = open(console_device, O_WRONLY);
-+  else
-+    if((console_fd = open("/dev/tty0", O_WRONLY)) == -1)
-+      console_fd = open("/dev/vc/0", O_WRONLY);
-+
-+  if(console_fd == -1) {
-+    fprintf(stderr, "Could not open %s for writing\n",
-+      console_device != NULL ? console_device : "/dev/tty0 or /dev/vc/0");
-+    printf("\a");  /* Output the only beep we can, in an effort to fall back on usefulness */
-+    perror("open");
-+    exit(1);
-+  }
-+
-+  if (ioctl(console_fd, EVIOCGSND(0)) != -1)
-+    console_type = BEEP_TYPE_EVDEV;
-+  else
-+    console_type = BEEP_TYPE_CONSOLE;
-+
-   /* this outermost while loop handles the possibility that -n/--new has been
-      used, i.e. that we have multiple beeps specified. Each iteration will
-      play, then free() one parms instance. */
-@@ -365,8 +360,8 @@ int main(int argc, char **argv) {
-     parms = next;
-   }
- 
--  if(console_device)
--    free(console_device);
-+  close(console_fd);
-+  console_fd = -1;
- 
-   return EXIT_SUCCESS;
- }
diff --git a/app-misc/beep/files/beep-1.3-Makefile.patch b/app-misc/beep/files/beep-1.3-Makefile.patch
deleted file mode 100644
index f4b891e8b824..000000000000
--- a/app-misc/beep/files/beep-1.3-Makefile.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/Makefile	2002-03-29 09:37:22.000000000 -0800
-+++ b/Makefile	2009-03-27 22:19:18.000000000 -0700
-@@ -1,17 +1,18 @@
--CC=gcc
--FLAGS=-Wall
-+CC ?= gcc
-+LDFLAGS ?=
-+CFLAGS ?= -Wall
- EXEC_NAME=beep
- INSTALL_DIR=/usr/bin
- MAN_FILE=beep.1.gz
--MAN_DIR=/usr/man/man1
-+MAN_DIR=/usr/share/man/man1
- 
- default : beep
- 
- clean : 
--	rm ${EXEC_NAME}
-+	rm -f ${EXEC_NAME}
- 
- beep : beep.c
--	${CC} ${FLAGS} -o ${EXEC_NAME} beep.c
-+	${CC} ${CFLAGS} ${LDFLAGS} -o ${EXEC_NAME} beep.c
- 
- install : 
- 	cp ${EXEC_NAME} ${INSTALL_DIR}
diff --git a/app-misc/binclock/Manifest b/app-misc/binclock/Manifest
index c76664cc4f43..2dd392327942 100644
--- a/app-misc/binclock/Manifest
+++ b/app-misc/binclock/Manifest
@@ -1,4 +1,4 @@
 AUX binclock-1.5-Makefile.patch 479 BLAKE2B 72cb38107301d133e6c17f43f5b3cb35d9401d6c41712603e3c8c6231c4ea560e3e24958ab46a1a9878272ddbcb6ce7cb82e64d2716736eae2b5e4007078e209 SHA512 7f120eeed63f27753875c7a4b8924f5db9bfc9c5048d414c1e5de7f53cf36138bfc185843e14292c9f47e87e2aeec1fd08a31254f7ac0716e4549588776fc773
 DIST binclock-1.5.tar.gz 12301 BLAKE2B 598185f21d257bd02cd4d91e0ddc707d5eaa9ff52160bd9af0d8d50238fe6ca134952bfc99d285568b77c747ec388ed7e23e3c4bac0fec5fd150e34e55687ed3 SHA512 f3650c8befb999a7e6261bc72ee4f81be670fe95899efc742112102c4107ebbbb25d015d57a702630ce2104cf8c738953c7fe70f24814514d8a2705240000e75
 EBUILD binclock-1.5.ebuild 641 BLAKE2B 3cba39a9b3af121c1b1e3af26d7836d2377b1c52b690be4b6e88173347a27a27386515fc8ea458d13b83f9fc9ae61d7a98481a58c96eb1bb2dc25505c347e07d SHA512 d1feef6b90ec1dd93ee6e3d46ab7ea34f14775bf995e35d05a621e9bf7970105b838388a67edccba28f924cfd6180094acaffd7b542a5f5976a577700dbc91a2
-MISC metadata.xml 352 BLAKE2B 27cde27260dedf58780e1e1a2d53eababedd9d5166a2894ba4de8c50ecf78f3367c40e9fdcd4d8e55109bee2e6f371d5cb90ca57884dee5aca45845109d986c1 SHA512 f4fb925a021543b198c3fb8d4a53e5d1c5450fd7f49cd76c99d9252e1c52747359c327fa99ea3a1a8882d51949b298c39c368049f86b7890c84dccaa6746226c
+MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/binclock/metadata.xml b/app-misc/binclock/metadata.xml
index 0ca0fe608d0d..3cf14bf74636 100644
--- a/app-misc/binclock/metadata.xml
+++ b/app-misc/binclock/metadata.xml
@@ -5,5 +5,4 @@
 		<email>shell-tools@gentoo.org</email>
 		<name>Gentoo Shell Tools Project</name>
 	</maintainer>
-	<longdescription>binclock displays a binary clock in your terminal.</longdescription>
 </pkgmetadata>
diff --git a/app-misc/byobu/Manifest b/app-misc/byobu/Manifest
index b8bb849de4a9..380a28fedb6b 100644
--- a/app-misc/byobu/Manifest
+++ b/app-misc/byobu/Manifest
@@ -1,11 +1,3 @@
-DIST byobu_5.123.orig.tar.gz 581421 BLAKE2B 450804be3d625c31a493edef0f398b528b5c3b21dd38bb8c9319857ead9c5bd1b5cfa01bfa190ad6fe0f5a99007ac68d068ec6082bc1fcf32c667d6035f1e296 SHA512 915ad330e85a4405ad808a6f03205c468800c0942507fc0183a883bb0b33be4023b5ef9d7a63b3fce328f771ac1a4952735ee6119a26d6a5f2b01afec7a04059
-DIST byobu_5.124.orig.tar.gz 582725 BLAKE2B 1bf4de3cfd5ce3a31c020f3a56ac495e89688a856e50b592f6999d3aae278358f7b0736b8b4c749fe577a1e9a326d3e1c5d4f08f15b033464cf890c47f4a3c96 SHA512 4ee12cdf2272532f35d2f7251e6f2aadb191f64db9f59cf63df54b2e4b1dacbac6ee9b65b8fed141204f9d309fb1a485ce86dd726c79106be0d52c2493a73bb7
-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-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 979 BLAKE2B 4d27530fb0965cb9e33ad34cda4211ad9f36992ef135efb9fe52febd93a7948db80aa22a19573a6ab0283692e14189737161cf453bcb9c188a39126eaa76fec0 SHA512 b09f18f9e7495814e9de79105e12bcd3d81f162c0f8d62287791f62dc9b65b3d7a75b06cfca78ae93383d2ddea395d944b6e4a1507dfcc10fc35e0878bf3569f
-EBUILD byobu-5.130-r1.ebuild 992 BLAKE2B 0cdcc9ab649b456a61254f9c5aa8229e859b7b6459fcea5af7204e5d07f60b9b3fd8a6375b8b33d83b63b027d8c7aeb4072d47205ed7e52b14e22f2efb73859d SHA512 30ee9fd03cf65004eb0ef05e3b7d39da0e70a9d29a0d88e857544a436ba655b0ea490a8ba04d6f6d3814d60464090c51b2e0b9e82bbcd87b00e80cabac5abd58
+EBUILD byobu-5.130-r1.ebuild 990 BLAKE2B 7ee65e526b9a7d20bd5634e4c5c54342821ceed51c28040759875a04192b1f0c6218d4a708dc0e667856e6059febcb5db18d68945209eabaeaf0c95a5dd9785c SHA512 2df7ad9733bc9f12a3e895581c4630e7610b5671c8fe3cf5073e6853e689e206809e5f80fb2373863c32f91dc363baec63502fa110427580770d76999e3d1b49
 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
deleted file mode 100644
index 058f7590d893..000000000000
--- a/app-misc/byobu/byobu-5.123-r1.ebuild
+++ /dev/null
@@ -1,45 +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 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.124.ebuild b/app-misc/byobu/byobu-5.124.ebuild
deleted file mode 100644
index b8e2216b67cf..000000000000
--- a/app-misc/byobu/byobu-5.124.ebuild
+++ /dev/null
@@ -1,45 +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 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.125.ebuild b/app-misc/byobu/byobu-5.125.ebuild
deleted file mode 100644
index b8e2216b67cf..000000000000
--- a/app-misc/byobu/byobu-5.125.ebuild
+++ /dev/null
@@ -1,45 +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 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.129.ebuild b/app-misc/byobu/byobu-5.129.ebuild
deleted file mode 100644
index 9529149bb4e5..000000000000
--- a/app-misc/byobu/byobu-5.129.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
-PYTHON_COMPAT=( python3_6 )
-
-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-r1.ebuild b/app-misc/byobu/byobu-5.130-r1.ebuild
index fa00fb9e9729..9b21e5cd6582 100644
--- a/app-misc/byobu/byobu-5.130-r1.ebuild
+++ b/app-misc/byobu/byobu-5.130-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="screen"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 50723c398fa5..c6d16a0c07f0 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -9,10 +9,13 @@ AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a735
 DIST elasticsearch-6.8.8.tar.gz 149927766 BLAKE2B 329bb778100125d9624acc84252fe8281cd4ee3823fbafeabf8aeeca529c3cd8902b197d5e5a852d55f7a56ec410312e3932b34736607890dedad9e12c3afe2e SHA512 c703d6230a42b77fb0f169158afbc18517118375e341ef889c231acc0f096a44716ba4fc1a2558fd000b0ceff4d9c3aff2f2c792f2c2ae92f0e7f82c6a70eaec
 DIST elasticsearch-7.6.2-no-jdk-linux-x86_64.tar.gz 148140124 BLAKE2B 9a850011533052d7a4041484936dfa2c8fe7f7976314147bc2b1d5f239bbdfe68a3593d3e0d2bb4d709a71e81aa7c200f9530921dab9d50c0ab3e349f4769ffb SHA512 aa5f499b26e92e19a673093fe2ff73c1c03a8da029b59cb83db43f9e2dfd7c650ee6a122bcf647b7e83f658ad9b9cc64092e6e7c1b4f8476f2973a6006b8df3c
 DIST elasticsearch-7.7.0-no-jdk-linux-x86_64.tar.gz 157716656 BLAKE2B 812c4db511f844fb23cb79bdfe3778281f1b6dad6a45553380829e330231304ce0e18eb975867e8474f652a63bdab2f4fb8c14158753aa8b29db5debfd3f00ae SHA512 a8d6cb7186301f50ba72ee5cde6c26390bdb6a8c13d902a75c63038b3dbb3cd7e544bbf6934d88324d722a213b7bf2efc0b27f9cae64428e6842d640bda5ee54
+DIST elasticsearch-7.8.0-no-jdk-linux-x86_64.tar.gz 162422169 BLAKE2B 035b8405cfad0cc440c5732526b0b9bbf42466598a921c42e4964ffb441475244f6b45803556a93a207e63dfdbfb92eef731add3d71ebe737cdef70e0cb50d34 SHA512 0fdc8e3d9c83c35bc1a01ceeabdbcfe192c6a0243a2def923a14198d5e41ba804725ac39a2b6287a932b4807b3cb359adb0348fd96506d556d4cb280b6c01071
 DIST elasticsearch-oss-6.8.8.tar.gz 68655829 BLAKE2B 808b9dd49f7d9c9968e6e1c5dcd8d1150d3638b8380ad0608f1e85f00d98c6da6d0c9c324f244b510d35ecec0f37b40e29fd0761b83118e137cf394c231cc0e8 SHA512 7c5972d365a8a2a80c351039ff54a274bb1f95379d6f4feab4fa01360541bffa58409ffac6030acade24be54d1cc57e7ea24a7cf29531aba35a565718e30288d
 DIST elasticsearch-oss-7.6.2-no-jdk-linux-x86_64.tar.gz 72570377 BLAKE2B 5a5ec3e79cba236dd4a6ffd279b0fca4ad882c877b418261b0314d8101885a2d2496c837b44e5dbefe5ed994aeeca488a8f08a2ba26c4b44b156c180dae6004c SHA512 6197a0b62f577cd0692c1fb97a473a9971f8fef383dc6ef618035785dbc662947d2adbc425ce130ef531cbfaf9add9ed5da5a698387e770c49af820644d67e72
 DIST elasticsearch-oss-7.7.0-no-jdk-linux-x86_64.tar.gz 73216528 BLAKE2B f0f1a3d3347ea37703e90bd896b24f6e3c58406d9fb20f3607a4d08eee325b5ae293db48d1afdc208468ee775b9085a28f39f2e175b67e4881bfb61d5cb85a9a SHA512 f9b323cff078a0dc856f99efd164775a9cd0718bb0ddb6c4d4817fa53cae71748f1aec5158afa45d4b29076043cbada9743a996e685439436e93d94a9eff2768
+DIST elasticsearch-oss-7.8.0-no-jdk-linux-x86_64.tar.gz 75549734 BLAKE2B 8223e0083d9a5199457957d22c8413f6d0d90c5c21bdcf4d9b573a7f3dc09dfce6c7dce5959e23c3d9c543df21d7fbbe1f7ba1124d40966d13cd7ddf8aeb4813 SHA512 4fe29f5395d938cf51d23ef7531f4d1b4c4a052d842ba2f77fe822a0986703315b2211602bf250170b99bc672fc0de09f0d1a04752322f398b6a55a057d9090b
 EBUILD elasticsearch-6.8.8.ebuild 2539 BLAKE2B 4fd8e35d07ece1117ca5b6ebaf8d75b1d67a4d870ca7986841fb360ff6948f22701048a591a200e6072f533091f08bc8d5a3d980d56b85de397618015540fe3f SHA512 972e2fca78cc29bcdef9c96dc0fcb0571dede8318b7afe907427b8bc1c46677e4b6b87333c65de1138a8fde6a9c04f605b69131509776b54cfa8712ca813aed1
 EBUILD elasticsearch-7.6.2.ebuild 2438 BLAKE2B 5d1a2238fde509ebb732488bf84c4a8dd39a2edb7a4362967ee80efe703115909710b64a34e475c5e8bf23380b3ef64948adb7cac7c497988fd98f9ee98d7a6e SHA512 d99accc6cc99c9e1dbc78f12dbebb4c337d4330fb76a3feeb4ff04fd4af8e0007a7d36bfff61c8b7fa1fa65dc513c5761be642494c6fee3efc285a87889854d9
 EBUILD elasticsearch-7.7.0.ebuild 2438 BLAKE2B 5d1a2238fde509ebb732488bf84c4a8dd39a2edb7a4362967ee80efe703115909710b64a34e475c5e8bf23380b3ef64948adb7cac7c497988fd98f9ee98d7a6e SHA512 d99accc6cc99c9e1dbc78f12dbebb4c337d4330fb76a3feeb4ff04fd4af8e0007a7d36bfff61c8b7fa1fa65dc513c5761be642494c6fee3efc285a87889854d9
+EBUILD elasticsearch-7.8.0.ebuild 2438 BLAKE2B 5d1a2238fde509ebb732488bf84c4a8dd39a2edb7a4362967ee80efe703115909710b64a34e475c5e8bf23380b3ef64948adb7cac7c497988fd98f9ee98d7a6e SHA512 d99accc6cc99c9e1dbc78f12dbebb4c337d4330fb76a3feeb4ff04fd4af8e0007a7d36bfff61c8b7fa1fa65dc513c5761be642494c6fee3efc285a87889854d9
 MISC metadata.xml 567 BLAKE2B 3123e01d77b67569afb2bb4908b38c702ebe1d308ea236b8ebba11709bc421af27ec29d72398a3af0aaefb39a2a2f34e27bffbbd1b3306dbc299e49bfd48cd35 SHA512 74669ea5437ad23c604c82a734973d58a31d78f0f4a2b7e2db655d884bf017d32ea25e451517601b35d406789e661ed2e173752bc232a03c3564e971c5a83a0c
diff --git a/app-misc/elasticsearch/elasticsearch-7.8.0.ebuild b/app-misc/elasticsearch/elasticsearch-7.8.0.ebuild
new file mode 100644
index 000000000000..2155270debec
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-7.8.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
+HOMEPAGE="https://www.elastic.co/products/elasticsearch"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${P}-no-jdk-linux-x86_64.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}-no-jdk-linux-x86_64.tar.gz )"
+LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RDEPEND="acct-group/elasticsearch
+	acct-user/elasticsearch
+	virtual/jre"
+
+QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
+
+src_prepare() {
+	default
+
+	rm LICENSE.txt NOTICE.txt || die
+	rmdir logs || die
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /etc/${PN}/scripts
+
+	insinto /etc/${PN}
+	doins -r config/.
+	rm -r config || die
+
+	fowners root:${PN} /etc/${PN}
+	fperms 2750 /etc/${PN}
+
+	insinto /usr/share/${PN}
+	doins -r .
+
+	exeinto /usr/share/${PN}/bin
+	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
+
+	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
+
+	if use x-pack; then
+		chmod +x "${ED}"/usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin/* || die
+	fi
+
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	fperms 0750 /var/{lib,log}/${PN}
+	dodir /usr/share/${PN}/plugins
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
+
+	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
+	newinitd "${FILESDIR}/${PN}.init.7" ${PN}
+
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
+	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
+}
+
+pkg_postinst() {
+	elog
+	elog "You may create multiple instances of ${PN} by"
+	elog "symlinking the init script:"
+	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
+	elog
+	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
+	elog "from /etc/${PN} into the configuration directory of the instance:"
+	elog "/etc/${PN}/instance"
+	elog
+	ewarn "Please make sure you have proper permissions on /etc/${PN}"
+	ewarn "prior to keystore generation or you may experience startup fails."
+	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
+	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
+}
diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index c0cc80a85ca3..d916481cbd7e 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -1,5 +1,5 @@
 DIST gnote-3.30.0.tar.xz 4017364 BLAKE2B e53240162d4814a0f004863ca5d309dce0b428d8ce4f7e8dc64c0ce683a830ebedc4809191e55818dba98de7d968413ae080f86367abacf3e4f3a404bbd62157 SHA512 7c1348b9fdbc84ea8cc74e214de50b594a1585031a40406ba73a8635362ef1769a37dbce79347188983970debf72d3c0f81523739a48bf27823f0233cc6cfd2b
 DIST gnote-3.36.1.tar.xz 3512000 BLAKE2B 00f5f8049085c855722f92fb3231684d53c4a15b96b7148a2a810d8fdd4c02b22510f4c4f9296fd7e2f4ba96e44d55215f71a2eb78ecb60170f8bb7ffbdef6ef SHA512 4c0c9d469836366a7886928beb0b47c48e60ee41591de193b9af597214f373c2c14b25745f6238ccbede8df8e7d4d83f39a34aed1b155895479bba3e043d2cce
 EBUILD gnote-3.30.0.ebuild 1606 BLAKE2B 74048690188d8e0c430082d90bde2b84b224437b0eb1cf5ba6ef094523fc985205ad1fbc6b5f0d9a5190f662180e1feed1ef9f27512bdadac4cffa00702035b1 SHA512 fc3688fa697ba4fc36b2140e31951cfae2b69092161bee5ec3e333bcae7b1167798c2a4b6796e469da5fa9ace62419bd20e5882f12f5dbb9464fec459019a0fd
-EBUILD gnote-3.36.1.ebuild 1548 BLAKE2B 6edd95f88dc91cb497d0c381d70ff6372ecdbfb576fea1b52225ccefe7e6ef1eecf1ff35fa2131c1778679c119a82121488f3f9777e8a01176324ffc4e9c01a5 SHA512 9a3d035a3eec9d4b03f3209cde5d15eb0ba39c882213999972eac931301d5a64f053c3927d79d293461047ad8ba6c4b5a7eff1665aa546c4ff3a847caaca76ab
+EBUILD gnote-3.36.1.ebuild 1547 BLAKE2B a78b2bfc54a7c1f323ef2bf6544e7518f2d54dd6ce11a4fde129bcc0fcf1fbb3e31c3fceede6fcdb29605069b4f549ac60d5ba4c9d62e8806f5bb2b9a754406c SHA512 942bc8c4f6024679ffda5dbfef0aa700d1c1f6f595d9f8f48283c1b7049dd7bb4dfaab25875b1d5227a2f455c54d2f9356f97c708b81e1b707e41c412dfb4ec1
 MISC metadata.xml 342 BLAKE2B 51d98560833845aa6d1f2b9f4c85021fd317434efcd81ba31d106c7b4945acd23cfefc2de2a601ffef3d330adcf93ec0377f69107fa37771d80f7dff056d32ff SHA512 c68c058e279222cc9293a5b97fbf450f95a940a70a32b1adcac3e6276783d2bcc545f39895e92e7bd62c9ac5dc98139dc9800513c2a828895ba1fcf023227d21
diff --git a/app-misc/gnote/gnote-3.36.1.ebuild b/app-misc/gnote/gnote-3.36.1.ebuild
index 95d5527ca525..c31e6fee60f5 100644
--- a/app-misc/gnote/gnote-3.36.1.ebuild
+++ b/app-misc/gnote/gnote-3.36.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
 
 LICENSE="GPL-3+ FDL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="debug"
 
 # Automagic:
diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index ca412dc28f46..a4e7442cc7cd 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,3 +1,8 @@
+AUX golly-3.3-allow-py23-exec.patch 688 BLAKE2B d72ba8e9264f2b677818f46e94efac0b185cfb72fdac045b124a931ed8c727d644df8e76cc8d237bdb09a8adcc4a085a780c7f443a9c5c5df510efc3e3f028e2 SHA512 af7a7e132464594726d71d056105f88661e0e585f6833ea222977c5f659d3b02f4c12f2231e645955a3fea1de31cf9481cdf0949bc71adec12876550ee190393
+AUX golly-3.3-allow-py3.patch 3018 BLAKE2B ca05bc615f2bce230bb80bddcfca5d017181fba11c3117c438ec8cbff16fbd645a49b0f8f1cb3f52efb6a5c6548e2398b95167b738dfa3df36336ff43fc59d4f SHA512 409f765d7107b1f9d7df8389a57a06c7be37c050eed26f5724f24bed36fa5d93ff074d6ded991faf1c02341c726c4c8ceca268f89b64fef38f98c5c331a51f23
+AUX golly-3.3-glife-py23.patch 1087 BLAKE2B bc00e95ac7f07bae2c778f1faf93fee7e1ccd92947e12bb1fbc97c0a074c5a347c6ff084a47085c656a94bd2add2fe14c313aff39f60174c983670be006ad9b3 SHA512 814c8a9ac2e96bf4ff61bd46b86a5ef7cfd5a4ba027fd5af78029cfbfb2b8334c76bede82770912509b0c858a2e3ff3af8258aec6e8ee328710d805d527a2863
+AUX golly-3.3-nondynamic-python.patch 1830 BLAKE2B b202aebb3975f55de4748a925d3e4ef87e2033fa6dca7773327e5ca272872bdd817000a02a9bf5a6630eb1716ffa220844bfc324271d9b9a889a4f3cb25257e4 SHA512 5e12d9e6800cf4f3a495964d9320dae1a8a9ad4350d374c9ffa0ec61316d48d4d545d95e200a4b04a700fdb923a841214788da05d0d05bb8768018f83e5bf9a4
 DIST golly-3.3-src.tar.gz 5465595 BLAKE2B e74da3799d1086a46fba523e6b087e6bc50c908098b27a80573936629fd5ad6195968df46b2933a9984cff85068222a80040761254298c5f648b040d5532a7ba SHA512 2aa9c2e7b2ebe3fe85bcb6177e58ee83bd08475e0a37a04cdb7e649b9faf5c2f936c534af62c8cf2322baade65c6e5197768901dfb464c17b20b941e1fa77265
-EBUILD golly-3.3-r1.ebuild 927 BLAKE2B 622e0e227aae28d5d59f91728dda34f82bf3b5ddd86edebaeff2f6ac421ad2f5f83544476f7b8468e307763202cce818cb2fc076a88aba59fec24aa34a4ed7c5 SHA512 a4ccc1e2bd716c75d65ea612d4191c5eee371265ee389098f6717330acae8dc60459e24da877bb77aa84c97ada77c9438d5d4f1b59bb5f02928a477031531c20
+EBUILD golly-3.3-r1.ebuild 1026 BLAKE2B 8cde2168e0b3ee5608ad790dc1d6197f715d012260bdecdc572e5a5c4ebe2887ef612b17b4064b8b1f2fc6a127ac067f678c79afad774a7bd053c95010860d5c SHA512 e14e63e356a06d1e78c0837636c3d34cca9ead96c5e10ded6f119c0df00f6a7cc968108e4a9017389973fe26441f4e56cd71618263bad4780fc0265e8fa82018
+EBUILD golly-3.3-r2.ebuild 1352 BLAKE2B 890bee53df3849f02d929b52a1947271d0e67991c0a2a4e8e4ba0b166d4139edbe36117f0e9b0092eae32a5c79fe5b5bb7cc47c5244a1bb8254e5fe6a579dd3a SHA512 6e5853d8a28373452f7c35104bbc3348ba2876642363ec041e38195b0672206f3da62af10eed4505dda15fe92157cf4d8b3c2656158650f487a4b805423bb5df
 MISC metadata.xml 326 BLAKE2B 6064832ecd0867971a46cd3c998419df96a09aea31c361b98cc81212e1a84bb99053f14a86321b194196df7e74d1859d7c82c2f55adcf0dd887224754aed381e SHA512 be4d2ed3256cbb48987657dc4a6569c4fa415a495488f17bffe0954bd54127bfc4f6652912b18666a02887bfe31769d1b0c1a67c311e286abca347a9b756301f
diff --git a/app-misc/golly/files/golly-3.3-allow-py23-exec.patch b/app-misc/golly/files/golly-3.3-allow-py23-exec.patch
new file mode 100644
index 000000000000..e46b608ed6c5
--- /dev/null
+++ b/app-misc/golly/files/golly-3.3-allow-py23-exec.patch
@@ -0,0 +1,12 @@
+'execfile' is python-2-only. 'exec/open' works for both python2 and python3.
+--- a/gui-wx/wxpython.cpp
++++ b/gui-wx/wxpython.cpp
+@@ -3356,7 +3388,7 @@ void RunPythonScript(const wxString& filepath)
+     // for the global namespace so that this script cannot change the
+     // globals of a caller script (which is possible now that RunScript
+     // is re-entrant)
+-    wxString command = wxT("execfile('") + fpath + wxT("',{})");
++    wxString command = wxT("exec(open('") + fpath + wxT("').read(),{})");
+     PyRun_SimpleString(command.mb_str(wxConvLocal));
+     // don't use wxConvUTF8 in above line because caller has already converted
+     // filepath to decomposed UTF8 if on a Mac
diff --git a/app-misc/golly/files/golly-3.3-allow-py3.patch b/app-misc/golly/files/golly-3.3-allow-py3.patch
new file mode 100644
index 000000000000..54a047830818
--- /dev/null
+++ b/app-misc/golly/files/golly-3.3-allow-py3.patch
@@ -0,0 +1,90 @@
+The patch allows python3 as a python implementation.
+Ports module loading to conditional python3 support.
+--- a/gui-wx/configure/configure.ac
++++ b/gui-wx/configure/configure.ac
+@@ -19,7 +19,7 @@ AC_ARG_WITH([python-shlib], [AS_HELP_STRING([--with-python-shlib=ARG],
+ 	, [with_python_shlib=check])
+ AC_ARG_VAR([GOLLYDIR], [golly data directory [default=DATADIR/golly]])
+ AC_ARG_VAR([PERL], [Perl 5 interpreter])
+-AC_ARG_VAR([PYTHON], [Python 2 interpreter])
++AC_ARG_VAR([PYTHON], [Python interpreter])
+ 
+ # Check for build tools:
+ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+@@ -76,7 +76,7 @@ AS_IF([test "x$enable_perl" = xyes], [
+ ])
+ 
+ # Find Python
+-AC_PATH_PROGS(PYTHON, [python2 python])
++AC_CHECK_PROGS(PYTHON, [python python3 python2])
+ AS_IF([test "x$PYTHON" = x], [AC_MSG_ERROR([missing Python])])
+ AC_SUBST([PYTHON_INCLUDE], [-I"'`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())"`'"])
+ AS_IF([test "x$with_python_shlib" = xcheck],
+--- a/gui-wx/wxpython.cpp
++++ b/gui-wx/wxpython.cpp
+@@ -90,6 +90,12 @@
+     #include <Python.h>
+ #endif
+ 
++#if PY_MAJOR_VERSION >= 3
++    // python-3 got rid of int/log distinction
++    #define PyInt_AsLong PyLong_AsLong
++    #define PyInt_FromLong PyLong_FromLong
++#endif
++
+ #ifdef USE_PYTHON_DYNAMIC
+ 
+ #ifndef __WXMAC__
+@@ -3268,6 +3274,22 @@ static PyMethodDef py_methods[] = {
+     { NULL, NULL, 0, NULL }
+ };
+ 
++#if PY_MAJOR_VERSION >= 3
++static PyModuleDef golly_module = {
++    PyModuleDef_HEAD_INIT,
++    "golly", /* name */
++    NULL,    /* doc */
++    -1,      /* size */
++    py_methods, /* methoods */
++};
++
++PyMODINIT_FUNC
++PyInit_golly(void)
++{
++    return PyModule_Create(&golly_module);
++}
++#endif
++
+ // =============================================================================
+ 
+ bool pyinited = false;     // InitPython has been successfully called?
+@@ -3280,6 +3302,13 @@ bool InitPython()
+             if (!LoadPythonLib()) return false;
+         #endif
+         
++        #if PY_MAJOR_VERSION >= 3
++            // Autoload 'golly' builtin module at interpreter start.
++            if (PyImport_AppendInittab("golly", PyInit_golly) == -1) {
++                Warning(_("Error: could not extend in-built modules table\n"));
++            }
++        #endif
++
+         // only initialize the Python interpreter once, mainly because multiple
+         // Py_Initialize/Py_Finalize calls cause leaks of about 12K each time!
+         Py_Initialize();
+@@ -3287,9 +3316,12 @@ bool InitPython()
+         #ifdef USE_PYTHON_DYNAMIC
+             GetPythonExceptions();
+         #endif
+-        
+-        // allow Python to call the above py_* routines
+-        Py_InitModule((char*)"golly", py_methods);
++
++        // Python-3 uses module constructor
++        #if PY_MAJOR_VERSION < 3
++            // allow Python to call the above py_* routines
++            Py_InitModule((char*)"golly", py_methods);
++        #endif
+         
+         // catch Python messages sent to stderr and pass them to py_stderr
+         if (PyRun_SimpleString(
diff --git a/app-misc/golly/files/golly-3.3-glife-py23.patch b/app-misc/golly/files/golly-3.3-glife-py23.patch
new file mode 100644
index 000000000000..8b1599712508
--- /dev/null
+++ b/app-misc/golly/files/golly-3.3-glife-py23.patch
@@ -0,0 +1,32 @@
+Use python-3 compatible syntax.
+--- a/Scripts/Python/glife/__init__.py
++++ b/Scripts/Python/glife/__init__.py
+@@ -90,7 +90,7 @@ def rule(s = "B3/S23"):
+ def description(s):
+     """Supply a textual description to the whole pattern."""
+     for line in s.split("\n"):
+-        print "#D", line
++        print("#D", line)
+ 
+ # --------------------------------------------------------------------
+ 
+@@ -161,7 +161,7 @@ class pattern(list):
+   It is also the base for computing generations subsequent to N-th."""
+         if N < 0:
+             raise ValueError("backward evolving requested")
+-        if self.__phases.has_key(N):
++        if N in self.__phases:
+             return self.__phases[N]
+         M = 0
+         for k in self.__phases.keys():
+--- a/Scripts/Python/glife/text.py
++++ b/Scripts/Python/glife/text.py
+@@ -173,7 +173,7 @@ def make_text (string, font='Snakial'):
+         unknown = '-'
+ 
+     for c in string:
+-        if not f.has_key (c): c = unknown
++        if not (c in f): c = unknown
+         symbol = f[c]
+         p += symbol (x, 0)
+         x += symbol.width
diff --git a/app-misc/golly/files/golly-3.3-nondynamic-python.patch b/app-misc/golly/files/golly-3.3-nondynamic-python.patch
new file mode 100644
index 000000000000..bc1c81a61917
--- /dev/null
+++ b/app-misc/golly/files/golly-3.3-nondynamic-python.patch
@@ -0,0 +1,51 @@
+Don't use runtime python loading via dlopen().
+
+Just link to libpython directly. That makes python dependency
+more explicit and allows catching more compile-time bugs.
+--- a/gui-wx/configure/Makefile.am
++++ b/gui-wx/configure/Makefile.am
+@@ -22,7 +22,7 @@ golly_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(PYTHON_INCLUDE) \
+ 	$(PERL_CPPFLAGS) $(PERL_INCLUDE) \
+ 	$(liblua_a_CPPFLAGS) -I$(top_srcdir)/../../lua
+ golly_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CXXFLAGS_ONLY)
+-golly_LDADD = $(WX_LIBS) libgolly.a liblua.a
++golly_LDADD = $(WX_LIBS) $(PYTHON_LIBS) libgolly.a liblua.a
+ 
+ if WINDOWS
+ golly_LDADD += gollyres.o
+--- a/gui-wx/configure/configure.ac
++++ b/gui-wx/configure/configure.ac
+@@ -86,6 +86,16 @@ AS_IF([test "x$with_python_shlib" = xcheck],
+ AS_IF([test "x$shlib" = x], AC_MSG_ERROR([could not determine Python shared library name]))
+ AC_DEFINE_UNQUOTED([PYTHON_SHLIB], [$shlib])
+ 
++# Find python interpreter
++# 1. --embed is needed for python>=3.8
++# 2. statuc check is needed because python-3.7-config outputs error to stdout, not stderr
++if ${PYTHON}-config --libs --embed; then
++    PYTHON_LIBS=`${PYTHON}-config --libs --embed`
++elif ${PYTHON}-config --libs; then
++    PYTHON_LIBS=`${PYTHON}-config --libs`
++fi
++AC_SUBST(PYTHON_LIBS)
++
+ # Find zlib (unless explicitly disabled)
+ AS_IF([test "x$with_zlib" != xno],
+ 	[	AC_CHECK_HEADER([zlib.h], , [AC_MSG_ERROR([missing zlib])])
+--- a/gui-wx/wxpython.cpp
++++ b/gui-wx/wxpython.cpp
+@@ -59,8 +59,12 @@
+     #undef SIZEOF_SIZE_T
+     #undef SIZEOF_VOID_P
+ #else
+-    // load Python lib at runtime
+-    #define USE_PYTHON_DYNAMIC
++    // On gentoo just link against python to make
++    // python dependency more explicit.
++    # if 0
++      // load Python lib at runtime
++      #define USE_PYTHON_DYNAMIC
++    #endif
+ 
+     #ifdef __UNIX__
+         // avoid warning on Linux
diff --git a/app-misc/golly/golly-3.3-r1.ebuild b/app-misc/golly/golly-3.3-r1.ebuild
index 27ee1bae14e8..26742c324c99 100644
--- a/app-misc/golly/golly-3.3-r1.ebuild
+++ b/app-misc/golly/golly-3.3-r1.ebuild
@@ -4,8 +4,9 @@
 EAPI=7
 
 WX_GTK_VER=3.0
+PYTHON_COMPAT=( python2_7 )
 
-inherit desktop eutils flag-o-matic wxwidgets xdg-utils
+inherit desktop eutils flag-o-matic python-single-r1 wxwidgets xdg-utils
 
 DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
 HOMEPAGE="http://golly.sourceforge.net/"
@@ -15,11 +16,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="tiff"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="virtual/opengl
 	sys-libs/zlib
 	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,tiff?]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}"
 
 S=${WORKDIR}/${P}-src
 
diff --git a/app-misc/golly/golly-3.3-r2.ebuild b/app-misc/golly/golly-3.3-r2.ebuild
new file mode 100644
index 000000000000..e3a3e4a7e591
--- /dev/null
+++ b/app-misc/golly/golly-3.3-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER=3.0
+PYTHON_COMPAT=( python{2_7,3_{7,8,9}} )
+
+inherit autotools desktop python-single-r1 wxwidgets xdg-utils
+
+DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
+HOMEPAGE="http://golly.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tiff"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="virtual/opengl
+	sys-libs/zlib
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,tiff?]
+	${PYTHON_DEPS}
+"
+
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P}-src
+
+PATCHES=(
+	"${FILESDIR}"/${P}-nondynamic-python.patch
+	"${FILESDIR}"/${P}-allow-py23-exec.patch
+	"${FILESDIR}"/${P}-glife-py23.patch
+	"${FILESDIR}"/${P}-allow-py3.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	setup-wxwidgets
+}
+
+src_prepare() {
+	default
+
+	# patches change configure.ac and Makefile.am
+	pushd gui-wx/configure
+		eautoreconf
+	popd
+}
+
+src_configure() {
+	ECONF_SOURCE=gui-wx/configure econf \
+		--with-wxshared
+}
+
+src_install() {
+	emake docdir= DESTDIR="${D}" install
+	dodoc docs/ReadMe.html
+	newicon --size 32 gui-wx/icons/appicon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "Golly" ${PN} "Science"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/app-misc/lfm/Manifest b/app-misc/lfm/Manifest
index 4fe87c3d89c0..d0d4cb9796c5 100644
--- a/app-misc/lfm/Manifest
+++ b/app-misc/lfm/Manifest
@@ -1,6 +1,3 @@
-AUX lfm-2.3-no-doc.patch 418 BLAKE2B afefe598a4ad9d1540234cd92c7574fef10e59bfeb13a9e9e2156bfc9296d9c7bd72fa2f7221c25533bb286014f8f73e5ccf1f1de023db49ec773952164aabce SHA512 d914da807c56a8ba38a9c9c2d6ac8c1ab5a9ec935cc55fd0a8ca5d12ecda571fd64a41938942586c9cc0e80a53a8d83cecc347decc66ebec719f78ce9a0b0d3b
-DIST lfm-2.3.tar.gz 119120 BLAKE2B 12d72d1caed7745dc336644589fba359c198c145d29bb419dbd0586ebe5e170d1a743e24638913a4581137c6e0d2f312a58fb84b22218ecb3f93942cf3d63db9 SHA512 d244cd03ebf4b145c0d364d9d7038a2b640010e7e6bc413a3613d4519afac4856ee7694a962176d7693bef6503b80703685b1cefab1eda0f8d0768ae10abf6c7
 DIST lfm-3.1.tar.gz 88878 BLAKE2B 409b61d24de671db33c25ff78c039f690fb376fce7bf146c452a67e72d3b50d54b461994ae7a2fb9a17fb64fc94de83f58d5faa0bd960970a53ee5c42fc9c166 SHA512 9e6142c0d871fe19b4b82e5333e03de562ca87a7498bd7fb496cca27e0b42c56a33913f2a7eb46439447ab7adb4a87da44bfcc1548101e15703aaa21ec105af8
-EBUILD lfm-2.3-r1.ebuild 487 BLAKE2B b90afce9b3e1fcccf340b916a6f559a2ab9045072b90f413ee168da331aadf158d178f745a74426db6d463629dfcd74225ce48aa4c32574b9f24149dca28e024 SHA512 0a336f8697a43fe176bc3001182be2eae2ca6e5058095247e6e5af3eccd89b89ce6d2af4bd486d4ba5912dc8d72d345b408f8d681b7a563929afe50aca0c0d26
 EBUILD lfm-3.1.ebuild 424 BLAKE2B 67781cc586f7dc65f4ad081c1bc561ea28089d473a5bf915ccb6c3499564bc9c28b059625d18d4dd92abbd46c364b31f778532c207b71ffcea18c1dbdc638af7 SHA512 6a10a255d627b5dd091223e25c9cfccc993ea9390905204290fa3930fc4901aa7fed5417801c2d617da5257ebbc47142b61862d277f8c7d00f6fdc8d9d7103ba
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/app-misc/lfm/files/lfm-2.3-no-doc.patch b/app-misc/lfm/files/lfm-2.3-no-doc.patch
deleted file mode 100644
index 3b69881589e0..000000000000
--- a/app-misc/lfm/files/lfm-2.3-no-doc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- lfm-2.3/setup.py.orig
-+++ lfm-2.3/setup.py
-@@ -56,8 +56,7 @@
-                     'lfm/actions', 'lfm/compress', 'lfm/utils', 'lfm/vfs',
-                     'lfm/config', 'lfm/pyview'],
-       scripts = ['lfm/lfm', 'lfm/pyview'],
--      data_files = [('share/doc/lfm', DOC_FILES),
--                    ('share/man/man1', MAN_FILES)]
-+      data_files = [('share/man/man1', MAN_FILES)]
- #      **addargs
-      )
- 
diff --git a/app-misc/lfm/lfm-2.3-r1.ebuild b/app-misc/lfm/lfm-2.3-r1.ebuild
deleted file mode 100644
index 63105cd4a3a5..000000000000
--- a/app-misc/lfm/lfm-2.3-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Last File Manager is a powerful file manager for the console"
-HOMEPAGE="https://inigo.katxi.org/devel/lfm/"
-SRC_URI="https://inigo.katxi.org/devel/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-doc.patch
-}
diff --git a/app-misc/oneko/Manifest b/app-misc/oneko/Manifest
index 00f8163231ab..0a06da9810db 100644
--- a/app-misc/oneko/Manifest
+++ b/app-misc/oneko/Manifest
@@ -7,5 +7,5 @@ DIST oneko_1.2.sakura.6-14.debian.tar.xz 10996 BLAKE2B 4507243c28371d99976a3ef4d
 DIST oneko_1.2.sakura.6.orig.tar.gz 64623 BLAKE2B 262f9373b1739c0181a52377dd72c5f35bd9d8e4e54364304704bb6794216585a7617525ccf439cef4783556aa732ac84f60a45424021b5963d69485c21a15fe SHA512 3f06b1c23ac6e3d9864530904bccbe0fdbeebb512233e35555ae44d2b45b2e6e50480081f46b048994c9415dca05691a0796357d86b4b7e8dc0bbcf1642ae348
 EBUILD oneko-1.2-r2.ebuild 1662 BLAKE2B 016fc1f8ce45f304683bb4a56d5d1a5acf7029f4704d46ca5d3cf8c9089be0389cb03f444db45681cbaaab7e70e0b3e5b8076f6ff47ed9d5491b50f8d6fa5519 SHA512 031f740ec81e3e4b6a8b94191c8422bd274a68c3c36f038208cf3253bcfe522c1ba923b44eb0ef9ee4b0ba5837ea5ecb2068109b9b5266fef58789921f5f8fff
 EBUILD oneko-1.2_p5.ebuild 1369 BLAKE2B 0c43a1c58a73538b6ab7ecf59723b9160cddb68094ec4e415ada1a94bea85cca0934e6e3a6584cbfeb62088ba0279872b2c4a68ac477f5879b637f4996aea9a8 SHA512 517d0576f509b3f99ece67b42c7da2a2ace712cf79fe0902cfd44609cd22594dfac3fe6332a3738aabeb86c7b32b8ca69955b99f4203c9928e3e15e65cd80a23
-EBUILD oneko-1.2_p6_p14.ebuild 1551 BLAKE2B 21076d5e0dc7418a430e3a7c24f8125138e0804ceca34014ae47743ba900a70482a83f1f61aa2834f66d03bdb0c33d89555b26b8004c3c5a660d76a2d5e53114 SHA512 65310ec4c4e785e6835791fdd1cbc58559af545d0faa0d450e0313cf8b737dfec46e88535887968e27bfed0b9a098d8bd915217bce915d271c30b72fc5481144
+EBUILD oneko-1.2_p6_p14-r1.ebuild 1669 BLAKE2B f7a597f8670b5592e25fee76ad97c9c8e7fcfe6b7bb9f9d2fd1d5ed39387fd6885c0d38f9bc76fc1f835b811c94e6e2d2473c16650498facc7da9f433e3d161b SHA512 7729a838492ed85ef5fca9fba6f1664bc438b6bc2c05ec0c9a84a05365a55c3fd3c903c582b788c1ca84973570fbdd83304aa555db68dc215d3f9c681c1a0639
 MISC metadata.xml 623 BLAKE2B 55087cf6c20ffb041c6f80bb0adbdcc561c282e8de2284e139bf2b9e7156469f356210018f23229e826cc2822e84e88513e29b7dc25dc55eec583e2cb456ed72 SHA512 5f78a9557c5e87edff59075bb5a7d4dac93b4b1745244ad8b89ddcb02e997dc859bf682b7ce4dd774eab4d82e48f8895a86679b24a702e3b054f825b5d6f14f3
diff --git a/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild b/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild
new file mode 100644
index 000000000000..eb47a60002a6
--- /dev/null
+++ b/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop toolchain-funcs
+
+DESCRIPTION="A cat, dog and others which chase the mouse or windows around the screen"
+HOMEPAGE="http://www.daidouji.com/oneko/"
+SRC_URI="
+	mirror://debian/pool/main/o/${PN}/${PN}_$(ver_cut 1-2).sakura.$(ver_cut 4)-$(ver_cut 6).debian.tar.xz
+	mirror://debian/pool/main/o/${PN}/${PN}_$(ver_cut 1-2).sakura.$(ver_cut 4).orig.tar.gz
+	mirror://gentoo/${P/_p*}-cat.png
+	mirror://gentoo/${P/_p*}-dog.png
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	app-text/rman
+	x11-misc/gccmakedep
+	x11-misc/imake
+"
+PATCHES=(
+	"${FILESDIR}"/${P/_p*}-include.patch
+)
+S=${WORKDIR}/${PN}-$(ver_cut 1-2).sakura.$(ver_cut 4).orig
+
+src_prepare() {
+	for patch in $(< "${WORKDIR}"/debian/patches/series); do
+		eapply "${WORKDIR}"/debian/patches/${patch}
+	done
+
+	default
+
+	printf '#!/bin/sh\n%s ${*}\n' "$(tc-getLD)" > "${T}"/ld
+	chmod +x "${T}"/ld
+	export PATH="${T}:${PATH}"
+}
+
+src_configure() {
+	xmkmf -a || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CCOPTIONS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin oneko
+	newman oneko._man oneko.1x
+	dodoc README README-NEW README-SUPP
+
+	newicon "${DISTDIR}"/${P/_*}-cat.png cat.png
+	newicon "${DISTDIR}"/${P/_*}-dog.png dog.png
+
+	make_desktop_entry "oneko" "oneko (cat)" "cat" "Game;Amusement"
+	make_desktop_entry "oneko -dog" "oneko (dog)" "dog" "Game;Amusement"
+	make_desktop_entry "killall -TERM oneko" "oneko kill" "" "Game;Amusement"
+}
diff --git a/app-misc/oneko/oneko-1.2_p6_p14.ebuild b/app-misc/oneko/oneko-1.2_p6_p14.ebuild
deleted file mode 100644
index 24af54e6b8a2..000000000000
--- a/app-misc/oneko/oneko-1.2_p6_p14.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
-inherit desktop toolchain-funcs
-
-DESCRIPTION="A cat, dog and others which chase the mouse or windows around the screen"
-HOMEPAGE="http://www.daidouji.com/oneko/"
-SRC_URI="
-	mirror://debian/pool/main/o/${PN}/${PN}_$(ver_cut 1-2).sakura.$(ver_cut 4)-$(ver_cut 6).debian.tar.xz
-	mirror://debian/pool/main/o/${PN}/${PN}_$(ver_cut 1-2).sakura.$(ver_cut 4).orig.tar.gz
-	mirror://gentoo/${P/_p*}-cat.png
-	mirror://gentoo/${P/_p*}-dog.png
-"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXext
-"
-DEPEND="
-	${RDEPEND}
-	app-text/rman
-	x11-base/xorg-proto
-	x11-misc/gccmakedep
-	x11-misc/imake
-"
-PATCHES=(
-	"${FILESDIR}"/${P/_p*}-include.patch
-)
-S=${WORKDIR}/${PN}-$(ver_cut 1-2).sakura.$(ver_cut 4).orig
-
-src_prepare() {
-	for patch in $(< "${WORKDIR}"/debian/patches/series); do
-		eapply "${WORKDIR}"/debian/patches/${patch}
-	done
-
-	default
-}
-
-src_configure() {
-	xmkmf -a || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CCOPTIONS="${CFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin oneko
-	newman oneko._man oneko.1x
-	dodoc README README-NEW README-SUPP
-
-	newicon "${DISTDIR}"/${P/_*}-cat.png cat.png
-	newicon "${DISTDIR}"/${P/_*}-dog.png dog.png
-
-	make_desktop_entry "oneko" "oneko (cat)" "cat" "Game;Amusement"
-	make_desktop_entry "oneko -dog" "oneko (dog)" "dog" "Game;Amusement"
-	make_desktop_entry "killall -TERM oneko" "oneko kill" "" "Game;Amusement"
-}
diff --git a/app-misc/realpath/Manifest b/app-misc/realpath/Manifest
index db52cbb796b0..0b83a061ec4b 100644
--- a/app-misc/realpath/Manifest
+++ b/app-misc/realpath/Manifest
@@ -7,5 +7,5 @@ DIST realpath_1.17_i386.deb 16372 BLAKE2B c8d7c2eb410c8c8129d6847d7cfe13265136fe
 DIST realpath_1.18.tar.gz 17618 BLAKE2B c42cbade8022a0aaafbf012c5f4db899bdadac6d06743a64fa0cf58c0533e9574fe1389939d296986fc1307362399753f58650d9029bf240fc6dc980c17a59f4 SHA512 98daa53b7a6d4b40ea3ff9ea89b7cb97782dd53f031e41a228a5aa8d2a41ae7920cbc1e2213f568098496e5c25da1381f08fb939f8668733a3c391f744fd16ed
 DIST realpath_1.18_i386.deb 16426 BLAKE2B 934d4d61bda3ce069959f3cf818b8d0b206c95ef458487f12c8afa59014dc141dcdf0ebd18a9540dd3104358139ce7f9317aabd8027dca6883f55905cc198d83 SHA512 fb2062041f8089a5ff07f76a9833e9d8bbe9560d72d4d5803c9524aeb782f9f4a135921b9984432ccfa361edc785a0f33785377ddf031a07ed316861a00a6f37
 EBUILD realpath-1.17.ebuild 1895 BLAKE2B cb908eb328e6dec2d6c6ef972b1af4f4dcbcfcf62e8d57ccf5c3eb145940a45b339bddae384562af8be7dc41c7e59d16fc6a39c54b32a3ea1303695c6a324bc1 SHA512 9df8b4c9b5d1083aca8430e6ca880eded53c7459d1731a51c1382e8b672541e1bd711754b6755c45725a173487ec4fd67321537401e00c01aba752e4592a16d4
-EBUILD realpath-1.18.ebuild 1912 BLAKE2B 9870745e68efaa1dc8ddb51b8813e817267fe376776b347e72dae60dd8ae6fe0da51b3de0142397e78e4851d8f47f1d54b355b6db60404340592b353dbaa81d4 SHA512 5c9cb987f33525f0999727918464d933c94468800e86a6c0745ed30c8c713a2b9cf9adab59a7ec547198a94caace9949c1bfe1ccc2522dd45c2f2ef8608e0e65
+EBUILD realpath-1.18.ebuild 1911 BLAKE2B 6b288e1c4c57d2015a9d6addbd3295511ebc9744bb630f2270edfa80900a4fef4ca35324019665c26cfa41f1936d0d96efb871ea8f4cdd942c7988ddb3e305b9 SHA512 b26b93a85e8689e52a8ab313f1659754d00f943ecc4ebc58e3217c9f8fe53027e0309f8b3734ae9c0ab7f790cd6f21be5e81ccd587b7cc959a5df95eef71231b
 MISC metadata.xml 437 BLAKE2B 57ad5c49f2a37e30ac6d2f4e4a169f3fca789aa45169d0b9acfb16ab2bdf714c0b2c32cc2c609dc96e6ba516991b667884714d4bb7fb74b9fb519ae3d4b32c23 SHA512 db21930053e4af656fc8043dd5f60b8a78010aacb019435076db21c201fe0bafb4e742e347c430026991ff32819cb30c9e17819a302dc927c2b513301b5d06a1
diff --git a/app-misc/realpath/realpath-1.18.ebuild b/app-misc/realpath/realpath-1.18.ebuild
index 2589135ee379..1068c25a2dee 100644
--- a/app-misc/realpath/realpath-1.18.ebuild
+++ b/app-misc/realpath/realpath-1.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="
diff --git a/app-misc/rl/Manifest b/app-misc/rl/Manifest
index 6d7e86bea996..f35c7b0c7fb2 100644
--- a/app-misc/rl/Manifest
+++ b/app-misc/rl/Manifest
@@ -1,3 +1,3 @@
 DIST rl-0.2.7.tar.gz 131028 BLAKE2B 06db6d6e9c2dd88bce3145d0436544b5f5b848bc2e985db64ccc2146cf61be1b76b02bfe071169f6e346ad4f5ff9b9089c940ecf02e3c68efcfa2f74a9fe131a SHA512 c9db8564832494148ed8e60df844a2a383e52b9d293564cf46b393e57a88f773b7307a1dd749d4e5e2daef1632b5350de00ab2585478ff3c18bffa1c5c573f8d
 EBUILD rl-0.2.7-r1.ebuild 667 BLAKE2B 1f23d3f31c48b45bd25f7e0d4a558ecf4eb58d95b60bb35ede7c819d8aa6dcd87898f05f24db99a8ebd232c659cc19ea9fc5ff2b6d6887c3c0923aea4485422f SHA512 f0331652f2cd6729ae5dc517a70224a349e765047e0bd13e197caaadf1c3e4ce026c156b7f48218e6af484256dc562a1b587bed7600d02ccb98ac826422968b5
-MISC metadata.xml 468 BLAKE2B 4c1af622a68e3143bd38cf066917ea736fb59716aedb6d43e23579eed67d2f0180f7b3eb0565f7bd98c546e223cae59454aad21aa803c2898d6147d4fb4ec7e1 SHA512 0cffb46412913a382016065cf31b162d6043e94a4dc05f1f7b979e057717365ffd9702518330b0582218b792c8ac307184b22902c978e49b5e3de5471b1c959c
+MISC metadata.xml 345 BLAKE2B d9d62b5d814ad0d01c87bf7561708d2bb4924efab4e514830ac5e9791924d6ba26aee9f0974f36fedbd1445909aee5de079bba52de05f0f618b15a6fddcdae07 SHA512 95bf677226356a879a65b5c77b2134ec8efe29dcf194f7e01bda205eb90717b33fed0fb1559021eaf234996368d1f47c8a658161c69e587821c71c19fc66f765
diff --git a/app-misc/rl/metadata.xml b/app-misc/rl/metadata.xml
index b78a944212a5..33f5f6d36521 100644
--- a/app-misc/rl/metadata.xml
+++ b/app-misc/rl/metadata.xml
@@ -8,5 +8,4 @@
 		<email>shell-tools@gentoo.org</email>
 		<name>Gentoo Shell Tools Project</name>
 	</maintainer>
-	<longdescription>randomize lines can be used to randomize the contents of text files or standard input.</longdescription>
 </pkgmetadata>
diff --git a/app-misc/transfolio/Manifest b/app-misc/transfolio/Manifest
index eb023cf0de18..d3b502292abd 100644
--- a/app-misc/transfolio/Manifest
+++ b/app-misc/transfolio/Manifest
@@ -1,3 +1,3 @@
 DIST transfolio-1.0.1.zip 158362 BLAKE2B 291e80e3576c3d92f00905c49d891c9ff926229cc2d843520b9b69f44660ec16ea274b4b68f4d8f3e353d140a6f8549697f3d2456310a5cd3a0e736ff6e0b61a SHA512 5d8c348cabcc3765c192a200ec011344960704085e815d249db23ac3669760c15ec343b16ecdce3469f49f76872f6f93563d50a96cf305f75ed19235d3a5d665
-EBUILD transfolio-1.0.1-r1.ebuild 640 BLAKE2B 19fbe0b0803d0cb1255ac8f5b4210cd5a1280c646e64240b16430790b25b96f55257b7fed3ae38648bd98cfd574d09477cf3089eb33e57dc5598e9966a24fa1c SHA512 cdd7e2b2107978f67f2f89b8591099446edf179da81aef5976ffaba6ba2ebbc2996e47bc63589246a1cd0f23e9b255e518bab034bb08e8d063a3d735d90d044c
+EBUILD transfolio-1.0.1-r1.ebuild 639 BLAKE2B 630fa4a2eb20c434ba41283f54ad3a450376ab6a5449551087c6d5c8f78b4c38d92a6bdfa804c6a5ca69fc82640611b24a76c5c05028ef1f493f51a8af5f7f77 SHA512 79ce9e3eb31350470bc00a05e471f60e2bde7cd880e58d9e7e81619e4a7ca7aafc1e5035bdc7e53b484ce36f0ab885615f64a894c7a21ba7237a20d5f3a1ac6d
 MISC metadata.xml 455 BLAKE2B daac1fc9779cbf0d98aa7e7bb3a42bb5b39b23a2e37f286252f7a427a327e6f15bb7357cf08d98a7f13331fc2b34d721f3723d28d5ca770b82eecaff07e96835 SHA512 b3422e3bf6f540318733516149e402521f2ccb83c3ebe89d5554a1fb505023eae6bdba8649a85c820208704213ec355555309189a49815cbc2408fafb7e5f99e
diff --git a/app-misc/transfolio/transfolio-1.0.1-r1.ebuild b/app-misc/transfolio/transfolio-1.0.1-r1.ebuild
index fb39bd28deaf..abcad10102f8 100644
--- a/app-misc/transfolio/transfolio-1.0.1-r1.ebuild
+++ b/app-misc/transfolio/transfolio-1.0.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://leute.server.de/peichl/transfolio.zip -> ${P}.zip"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/app-misc/vlock/Manifest b/app-misc/vlock/Manifest
index d7f0b22934ea..54e1082bcc35 100644
--- a/app-misc/vlock/Manifest
+++ b/app-misc/vlock/Manifest
@@ -1,5 +1,6 @@
 AUX vlock-2.2.2-asneeded.patch 393 BLAKE2B 1434b168d0f55c3a88e08f280d213850ed676343296f6a9244d6b8e2726aea1b67ef19a8813a402bb0d8e3257cc6478d9a8559d5a035d9413dfe3c9e1b966f25 SHA512 5fa18db0c5ce37d15ea1d1b0b1653b43cf33a2c0f8f56708973a6d5fc59f5357efa2e6cab7113893ebedb1eb3943c6a1c8a9649c7bb407ddf4c6cfaded6e52df
 AUX vlock-2.2.2-test_process.patch 905 BLAKE2B 89d80dddc8b13c23a9da34b3570d44984f66156a756027ae6787e1678973375dfdaaae449f771cf925411f17bd03f733ec2bdb94be9736a75a7f3be0da8c097b SHA512 5963bad2bbbaa639cc917adb594e47df156a12dd832bc252343416152934b9e78b3b0ed2f46d529fd7612fc2c8188340a84d249ea9b7e5e31638711428efa597
+AUX vlock-2.2.3-echo-printf.patch 375 BLAKE2B ae93fbf307dfd0a911a38b2426d89d0a7a864c47db4c533af01bf2b12f89227e4af38e1eba00dac677b1c467bf688166647681265b3ff7006a323cc91e971306 SHA512 30d1f3d20e7e7881b0fa759f0cba1fed3249cd27c91a784624de23df07db821b2c0ec73b5ae54ce90bb8f58d9d68c4cc3bf10f738d99fda6d7bd1f16a429de7d
 DIST vlock-2.2.3.tar.gz 54860 BLAKE2B 140b38dda15dd5c269729db1fbc3cc36dfea035c79e7998adb7f6ec56806408748701b986a2a1509aab6118a796a13b96a1de24f2837f94c4cdf058df736f37c SHA512 7eba8fe4f7085be7ef9169843d0814e55840b823dfc061727db037d2420e8ff4b669a3b08e15f61cdd9d5048c1e088288a46acad341cbe97585e64da2b58c855
-EBUILD vlock-2.2.3-r1.ebuild 1285 BLAKE2B 8495bed231ede5cef27cab97370ba7c4850861fbe4259843771157888eac85359f240854f776f14c6a642565088ab2f5eebe0d8ef7d7439136cb8972bb999f35 SHA512 76eb51ee9ac94da221f765da4004a17a2fe8be7865b8fdfc512e9256a01d2678b4f56e4fd550d0fdb003804ab6ac74c8d2db2210d034f5c2b9199d7989a8e18c
+EBUILD vlock-2.2.3-r1.ebuild 1352 BLAKE2B f8a6948b22083a18fcfd9fe367d58d9c1df57410908a87cc2d232eaa06661d21acf4cbaf21129e46d2577328fb8a301be98bcd6c452e93d7466eeb481525a1a7 SHA512 35711aaf093d31cdd9bcd9670d7bb7323c0753b5460618109343010594f7d2672a8e05a2d6c2a5556b7803c17b69030f6317e5bc9543b7c461f694237a6c7a81
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/vlock/files/vlock-2.2.3-echo-printf.patch b/app-misc/vlock/files/vlock-2.2.3-echo-printf.patch
new file mode 100644
index 000000000000..fd3653fb2824
--- /dev/null
+++ b/app-misc/vlock/files/vlock-2.2.3-echo-printf.patch
@@ -0,0 +1,11 @@
+--- a/vlock       2020-06-22 10:03:48.700469805 -0000
++++ b/vlock       2020-06-22 10:03:57.880385148 -0000
+@@ -17,7 +17,7 @@
+ set -e
+ 
+ # Magic characters to clear the terminal.
+-CLEAR_SCREEN="`echo -e '\033[H\033[J'`"
++CLEAR_SCREEN="`printf '\033[H\033[J'`"
+ 
+ # Enter message that is common to different the messages.
+ VLOCK_ENTER_PROMPT="Please press [ENTER] to unlock."
diff --git a/app-misc/vlock/vlock-2.2.3-r1.ebuild b/app-misc/vlock/vlock-2.2.3-r1.ebuild
index b6c8a2c4b177..6bac4b08b79e 100644
--- a/app-misc/vlock/vlock-2.2.3-r1.ebuild
+++ b/app-misc/vlock/vlock-2.2.3-r1.ebuild
@@ -54,5 +54,9 @@ src_configure() {
 
 src_install() {
 	default
+
+	# See bug #637598.
+	epatch "${FILESDIR}/${P}-echo-printf.patch"
+
 	use pam && pamd_mimic_system vlock auth
 }
diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index 8c8ad60b0faa..cea6d9dca59b 100644
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
diff --git a/app-mobilephone/smstools/Manifest b/app-mobilephone/smstools/Manifest
index 41f25011e8fb..a70207f34089 100644
--- a/app-mobilephone/smstools/Manifest
+++ b/app-mobilephone/smstools/Manifest
@@ -7,5 +7,5 @@ AUX smsd.tmpfiles 28 BLAKE2B 1f7dc406901d08d362ad2ca8ad236c8d5c45166c97501d0b314
 DIST smstools3-3.1.15.tar.gz 300088 BLAKE2B 4dcafad43979fff642a26da2ce7850ff09d66678525171643f1fec6bb1358cc48705d73de7b22f77b267a741f740a408ddea5062d75d98561e2381010e56a37b SHA512 6a4cc852327fac27b00fc58def4bbc8caa395552586fe1b84f0f4a9f7f6b00008943b85c86de0821036629c58cf04840a189d711b4ac96f7ddaafd6b340b11fa
 DIST smstools3-3.1.21.tar.gz 356548 BLAKE2B 8bbb65761128a86200a6d47e90456fef076be10cd4081b4e3cdc9456c0176996ee6ee9afbe3d9f2a989d93db706bf5461ddf7f739bc8d70337a842b96eb27a5c SHA512 0587e5020a0318351ca99b68baa1c19411824279055857a5b5aa4e346cae373fe94a811eaca6767bcf991cf849eaaa66ec120f046420531a6088cdde9373db31
 EBUILD smstools-3.1.15-r2.ebuild 1705 BLAKE2B f66f24b406e7e6a54677b72072c0233a4ac89289347e2dfc73f177c69a12288b5feb0e44e26bbe413fb5eea1b58935125b6218b15c346ab486634a7747ff51fe SHA512 6c00b3592f0f6b5b10646f4620bf241a9a4da9922558ef2fca790623cf9b8b4fc5e462eb4f2c0ccb188ccb7330cd2754c24e3c2265b0c1558e27ee3322db1693
-EBUILD smstools-3.1.21-r1.ebuild 1708 BLAKE2B 5f68bcbd5b9a6ae83db684f9ac1a53e9f2050d3e2d2ae5812f1b37591ccc9a5a783faa63588a7285a47184dd56f1f68c170d93b7eaf0d84340ae6931a42bb129 SHA512 59637148a7d5f28b01f7662a2a805cfb45ea875c06debfeaaffa39af58afb962449d681e2ee49eea49bb03bcb862a0860e311cf857870b9b1ca8fb9712dc5f65
+EBUILD smstools-3.1.21-r1.ebuild 1707 BLAKE2B 426053dd73de6533ed4067a5443c2569beb28f347b31b15d28622b22414db05f87f269668cbd789720f8f135f819b142a0664982034abb22668eb1f1f9c57c7b SHA512 7893129b52974d6b0948c9a840b7099a99c007c4a8b414b2d0fe704db21b09765343b47c164a17e902d4a92706c792e757f7e28b8383c42fe87fb5b4afef190d
 MISC metadata.xml 311 BLAKE2B 7f50942d5ff32e7025c5f0289555117e7c3b22d22ba9a2589ceae11c80d98d8ca00658ab0540a79576ba2b9f807c4a59f4539d253645d4c336079f4db4a5c7f0 SHA512 0ff7191917f66832a0c60952bc0e187f5c82656f6e422d81d4bf4d4d38c9edef5519d696976a3668682c40feb932b510fd96591ea698d7f08d9e4d84d12f641d
diff --git a/app-mobilephone/smstools/smstools-3.1.21-r1.ebuild b/app-mobilephone/smstools/smstools-3.1.21-r1.ebuild
index 79106a338bf4..b3330c6fb686 100644
--- a/app-mobilephone/smstools/smstools-3.1.21-r1.ebuild
+++ b/app-mobilephone/smstools/smstools-3.1.21-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 @@ SRC_URI="http://smstools3.kekekasvi.com/packages/smstools3-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="stats"
 
 DEPEND=""
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index d21461745efc..aa5f7fcb9525 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index dfa0f67c2055..d36468592fd1 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -13,6 +13,8 @@ AUX calligra-3.1.0-stage-qt-5.11.patch 656 BLAKE2B 1a4d8f005fd03395617ba0b225302
 AUX calligra-3.1.89-no-arch-detection.patch 404 BLAKE2B ef2ea38d3fdabedd98eafd4b9526a3dd5a7c02f4af8109301f3535969475034795483cfb0fa1f1ddad9fa41ef81409d39bf3a06fb781016217355be646d1affd SHA512 d97d2a26622f43987446ac87b14952b9e46f3b919c84c6ada4b18ebde5aa94e6f69b931ec5d61ab391f9a4811e81eb11f2136f0a3384f644679c0db87943102a
 DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50 SHA512 ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b
 DIST calligra-3.2.0.tar.xz 55205468 BLAKE2B 4e59e0e22195894ccd11db4e54841079ec4225ab3e35c166af3bf7a55e96db92a1e9818affa34bc4d99743257569abebc6c14db07dc8e3ac9f62e8e30f944c9e SHA512 625886ae6f0e81eb4c489a9f6bd45b57fdb35fd8131ddf9b59a6fe0a80e338b487f70a90bd28e138281309dbfeb23e49d7ef93856fe1815f4fa16fa37964c013
+DIST calligra-3.2.1.tar.xz 55207684 BLAKE2B 332629f18adbee649e8d25a1eedf4ee48af7d8cbb79382c70678bacfa89d9a10797eb0ff42cb5aad51ef2c28aa7071e687bd34053cadcc40ac1936bb9a40dc20 SHA512 e53a939aa1b277c2291cfd626868c77085fc9cc7774df160b5b1afceb33314b4381fa8ffe03636cbde6e35cc2abd170a51e7f9c1a99191339313b9c9c3b1526f
 EBUILD calligra-3.1.0-r4.ebuild 6221 BLAKE2B 8630aeac685fb914e46be46f4dfa33c92881af8ebed52aa838b3611532efacac93e2a0d0f5d78b142bfce08c368f03408935c2ca0900328b2d52b45237decf61 SHA512 a4785918d0f7e6c08e3524f2b8373ebf477dc0845d3c96d4749af53282ab343e19b25207340efe9d2c5d510af8ae09744047f97645affda26e01d2ef4dc12f89
 EBUILD calligra-3.2.0.ebuild 5781 BLAKE2B 0b0c9530796f94d21717d456dbcb438d55c931649926df9a4227d1d3a4d62c3198a882fb77c061a96e8bdcdc0c2534e902378d64b59158b28aa8aee1f967d55f SHA512 613faa76d8e036ab887db9b4eb87b73fc8febd80ae973e2c5e57499694e1dfa93f04fea1165fe03c6312216fd3c46b5c4267e2bc124e3f538d8523a2fc4509dc
+EBUILD calligra-3.2.1.ebuild 5300 BLAKE2B 0d171d8f3fbe3f520b2fbdb84d05e74b03de6d89bd43716b248d528cf724be6cb220edf0e3b1c398bba8cbb95dcf9b75f29996bc6f673b6ad9cc4b530ebe7e7e SHA512 3e863f34dd8d9d7b205ae9f32419b2c7f38ca639a8572369911b2840a25e6459fe207c20955aae43c25c68c53dc42676651bf0f8697dbe9390834d0ab25f2e2b
 MISC metadata.xml 1149 BLAKE2B e5461ec7fe1747ce0f4f1b68e3573bcad14183e9a6522f4e2a47fc14cb2a2c968f1bee6d6bf91304d23b981df8c2bdf086222f823ccc6abbe44ff3fcd630ceb0 SHA512 2c6b8ac3f48fa278faf079cfc42b6bdc8ecba994222adfe735489088e1fbb26c60f5f6ef4ff773a64e9a6e5026ef4dff368ec3c2c3c96cd6b0a38b6711b2d7a9
diff --git a/app-office/calligra/calligra-3.2.1.ebuild b/app-office/calligra/calligra-3.2.1.ebuild
new file mode 100644
index 000000000000..240ca9b02ecf
--- /dev/null
+++ b/app-office/calligra/calligra-3.2.1.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CHECKREQS_DISK_BUILD="4G"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit check-reqs ecm kde.org
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="https://calligra.org/"
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+CAL_FTS=( karbon sheets stage words )
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="activities +charts +crypt +fontconfig gemini gsl +import-filter +lcms okular openexr
+	+pdf phonon spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
+
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
+# Required for the matlab/octave formula tool
+BDEPEND="
+	sys-devel/gettext
+"
+COMMON_DEPEND="
+	dev-lang/perl
+	>=dev-qt/designer-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtscript-${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/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/kdelibs4support-${KFMIN}:5
+	>=kde-frameworks/kemoticons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${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/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kross-${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-frameworks/sonnet-${KFMIN}:5
+	sys-libs/zlib
+	virtual/libiconv
+	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+	charts? ( dev-libs/kdiagram:5 )
+	crypt? ( app-crypt/qca:2[qt5(+)] )
+	fontconfig? ( media-libs/fontconfig )
+	gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] )
+	gsl? ( sci-libs/gsl )
+	import-filter? (
+		app-text/libetonyek
+		app-text/libodfgen
+		app-text/libwpd:*
+		app-text/libwpg:*
+		>=app-text/libwps-0.4
+		dev-libs/librevenge
+		>=kde-frameworks/khtml-${KFMIN}:5
+		media-libs/libvisio
+	)
+	lcms? (
+		media-libs/ilmbase:=
+		media-libs/lcms:2
+	)
+	okular? ( kde-apps/okular:5 )
+	openexr? ( media-libs/openexr )
+	pdf? ( app-text/poppler:=[qt5] )
+	phonon? ( media-libs/phonon[qt5(+)] )
+	spacenav? ( dev-libs/libspnav )
+	truetype? ( media-libs/freetype:2 )
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+	calligra_features_sheets? ( dev-cpp/eigen:3 )
+	calligra_features_words? ( dev-libs/libxslt )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	test? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
+	gemini? (
+		>=dev-qt/qtquickcontrols2-${QTMIN}:5
+		>=kde-frameworks/kirigami-${KFMIN}:5
+	)
+"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.1.89-no-arch-detection.patch )
+
+pkg_pretend() {
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	ecm_pkg_setup
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	ecm_src_prepare
+
+	if ! use test; then
+		sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \
+			-i libs/pigment/CMakeLists.txt || die
+	fi
+
+	# Unconditionally disable deprecated deps (required by QtQuick1)
+	ecm_punt_bogus_dep Qt5 Declarative
+	ecm_punt_bogus_dep Qt5 OpenGL
+}
+
+src_configure() {
+	local cal_ft myproducts
+
+	# applications
+	for cal_ft in ${CAL_FTS[@]}; do
+		use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
+	done
+
+	use lcms && myproducts+=( PLUGIN_COLORENGINES )
+	use okular && myproducts+=( OKULAR )
+	use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
+
+	local mycmakeargs=(
+		-DPACKAGERS_BUILD=OFF
+		-DRELEASE_BUILD=ON
+		-DWITH_Iconv=ON
+		-DPRODUCTSET="${myproducts[*]}"
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package charts KChart)
+		-DWITH_Qca-qt5=$(usex crypt)
+		-DWITH_Fontconfig=$(usex fontconfig)
+		$(cmake_use_find_package gemini Libgit2)
+		$(cmake_use_find_package gemini Qt5QuickWidgets)
+		-DWITH_GSL=$(usex gsl)
+		-DWITH_LibEtonyek=$(usex import-filter)
+		-DWITH_LibOdfGen=$(usex import-filter)
+		-DWITH_LibRevenge=$(usex import-filter)
+		-DWITH_LibVisio=$(usex import-filter)
+		-DWITH_LibWpd=$(usex import-filter)
+		-DWITH_LibWpg=$(usex import-filter)
+		-DWITH_LibWps=$(usex import-filter)
+		$(cmake_use_find_package phonon Phonon4Qt5)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON
+		-DWITH_LCMS2=$(usex lcms)
+		-DWITH_Okular5=$(usex okular)
+		-DWITH_OpenEXR=$(usex openexr)
+		-DWITH_Poppler=$(usex pdf)
+		-DWITH_Eigen3=$(usex calligra_features_sheets)
+		-DBUILD_UNMAINTAINED=$(usex calligra_features_stage)
+		-ENABLE_CSTESTER_TESTING=$(usex test)
+		-DWITH_Freetype=$(usex truetype)
+	)
+
+	ecm_src_configure
+}
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index e19c18548b86..8701268d4bda 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,5 +1,3 @@
-DIST gnumeric-1.12.46.tar.xz 18282960 BLAKE2B f10fd8620dd2b865a4205b93f68ba78a07b94e72a147692bf875747cb8f128c54fad38e33162770d71422aed659f77b156679ca2f65836530c02b56cc2351ac6 SHA512 b3b3befe79f3ec8db6d7d9c80a1eed5293f5c0a9ca1d8dd131320eb031952b296147c51df1c775c6f9a0c466912e5523360373ee0b6e453e928929394ab517ea
 DIST gnumeric-1.12.47.tar.xz 18309764 BLAKE2B 8b800a6749d208a445abfc7189618abb20907118f274b313cf81436ab3665d50edeab4c49b03adea505448138bd32b8d3efcd041eba54342d9fb293c574cac08 SHA512 f6298fee752b062672acc20e18388d7424719d69ce9586888f33be07ca92bbd7d99e46b98e9ab2a546d1954d3113b59a5105d46c4e8a13e65e1ae9acc38391ab
-EBUILD gnumeric-1.12.46.ebuild 2291 BLAKE2B f9c948c25c38cab4435375f8354661a5d3770a6af23960d0e1f63405982052afc44386945b4f5563ae1583888b61df42582bd33cae4f5caeb056126fdd525189 SHA512 e7e00f6701c132b636fc61be08323f59b9c92009d3fdd16fccd4bf6d4e0212c1c8e9d2ee405e2257bc84933bd804c3647a07882b890f710d2d8a7d04bb7f99b4
-EBUILD gnumeric-1.12.47.ebuild 2293 BLAKE2B 455908346275cb6a29e0443ef6b8e913441c03d112495e06735d12330666d7ed64ce7ab1caaa4630be35605c0e056213de95edad0348cc7b41291038b2ba63ae SHA512 67857e31f358494977057ff671844ba65a3a5abb0521a75b5b3af752d26d39d865ad299aa766cd13d0f6ebf5dfe1a302babdb4e5d7909f85041ce07f24fabfa3
+EBUILD gnumeric-1.12.47.ebuild 2291 BLAKE2B 773493d673d5aaa1106e4ec80e55370dc5f90fe1f4ea673a53406565771862da27fd1a3194a84e5c9cf30bc6ba5ce11a6232d2ba63c107981ea601c188f788ca SHA512 6894fbdf3b90d821fd3b630d86dc054c705cd9158b605d8f914074dc3ad37b4a9af826a5ba692899f1fff412a752a77a6434a2435b03c40aeaa7eb52b0095f6f
 MISC metadata.xml 519 BLAKE2B 07b0ba6ff606de990d5fb97de46aa20f0581ab63f789f2238446e6f87dc93283a0873dfec3ee4a3fd38372aa3fa17e50349abffbd5eb5cc73d4cbdbffe1e5592 SHA512 a03730e0ccc7c2fb4df57f0d63da93e9254c8df99594a26215ff9919302919eb0bfdd21622b9d73f84011c5cd28397cc0b5b2add2fce0624d7a59fc1877601d3
diff --git a/app-office/gnumeric/gnumeric-1.12.46.ebuild b/app-office/gnumeric/gnumeric-1.12.46.ebuild
deleted file mode 100644
index 555906ea41be..000000000000
--- a/app-office/gnumeric/gnumeric-1.12.46.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..8} )
-
-inherit gnome.org libtool python-r1 xdg
-
-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"
-REQUIRED_USE="introspection? ( ${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"
-
-# Gnumeric has two python components
-# 1. The python loader for loading python-based plugins.
-#    This component is pure python 2 and a port "is not currently being worked on".
-# 2. The python gobject-based introspection API. This component is compatible
-#    with python 3.
-# Component 1. can only be re-enabled once someone has ported the upstream
-# codebase to python 3.
-# https://gitlab.gnome.org/GNOME/gnumeric/issues/419#note_618852
-RDEPEND="
-	app-arch/bzip2
-	sys-libs/zlib
-	>=dev-libs/glib-2.40.0:2
-	>=gnome-extra/libgsf-1.14.33:=
-	>=x11-libs/goffice-0.10.46: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? (
-		${PYTHON_DEPS}
-		>=dev-libs/gobject-introspection-1:=
-	)
-	perl? ( dev-lang/perl:= )
-	libgda? ( gnome-extra/libgda:5[gtk] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.5
-	app-text/yelp-tools
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# Manage gi overrides ourselves
-	sed '/SUBDIRS/ s/introspection//' -i Makefile.{am,in} || die
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--disable-gtk-doc \
-		--disable-maintainer-mode \
-		--disable-schemas-compile \
-		--disable-static \
-		--without-psiconv \
-		--without-python \
-		--with-zlib \
-		$(use_with libgda gda) \
-		$(use_enable introspection) \
-		$(use_with perl)
-}
-
-src_install() {
-	default
-	dodoc HACKING MAINTAINERS
-
-	if use introspection; then
-		python_moduleinto gi.overrides
-		python_foreach_impl python_domodule introspection/gi/overrides/Gnm.py
-	fi
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-office/gnumeric/gnumeric-1.12.47.ebuild b/app-office/gnumeric/gnumeric-1.12.47.ebuild
index 1321853ea988..032ed0e45ec1 100644
--- a/app-office/gnumeric/gnumeric-1.12.47.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.47.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gnumeric.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="+introspection libgda perl"
 REQUIRED_USE="introspection? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/app-office/homebank/Manifest b/app-office/homebank/Manifest
index 197a5696b2e9..ab7b60de19e9 100644
--- a/app-office/homebank/Manifest
+++ b/app-office/homebank/Manifest
@@ -3,7 +3,7 @@ DIST homebank-5.2.8.tar.gz 2730743 BLAKE2B e5a1cd143f72cdb09b5e097853c89b2dac8ad
 DIST homebank-5.3.2.tar.gz 2906468 BLAKE2B 0672890c469e9580a2128f130230a73d5bdc9e6b50830b1c0ead4f83d7e83837a2df4f50b49218dac9da6eb89f484a6866fcc748e65d5705ba5691e9772b7977 SHA512 777ee682f816f1b3a8f5d018148d79743be9fd17301d16e9c837e9fd46f8bd67cd393bfe9ef2960d87a7066a7f80fa7b88d7826ce62d4542693d3e09d7d5e887
 DIST homebank-5.4.2.tar.gz 2974448 BLAKE2B 0b6f6ad57633ecf560f821295797e9bcc83bb7f69b7b74ad38792f091593b5ae9dc79693b9d44f46414ee3e6f9e9d4fdc2dd5a174f2a50e79177d68506a2235c SHA512 6c28fed7f7a0019be87cd86d37f52a0ddedb0c2752bd311986a4ddfe33913a34e362eadc69e9238e391009fddb45a3a2b59e1176f2ca3f1901293a1b0989223e
 EBUILD homebank-5.2.2.ebuild 999 BLAKE2B 53aec6f626399963ea20591bb4a5f0e94d25b0d47b8df2da17f8886e4231349a6f15d1183f8c58848342c813f196ec26e375c8e98cdb4a605bfcff127d462aac SHA512 0ea5bd890af50e49811afdc5d8fe1fc49ef708a96b633fe84ffce587591eea33bb83a63a2ab87ed0a0a22879d475c2c20931003c90ead0fd3ba8ade029e00ba7
-EBUILD homebank-5.2.8.ebuild 1000 BLAKE2B e00d26335b16c8c8259b77def0ca672c24770509f78372dc980284154c2b741d40f9926aea3a84e163ac68887abeb55ccaf29683dc66e90b361655f941b81aa4 SHA512 49255b4446750ac941565eeb23dfb3b3844da00d70220045a05a5b8d1539d72c4c0c5f35c3429225f163047438a26a4bdfaee91e6d6b107a13da02a77450b6e4
+EBUILD homebank-5.2.8.ebuild 999 BLAKE2B a2b342fa53c59a07fb5a73a7c51db35adbef8e49e65b7ff05b8b28ab18a249f26860c1ad54ea6e470003a959f13deef7b80453a591cb90c2f981320228a8d244 SHA512 78b3e07a2d7204d89d30407aee02dec098514946140096f34c327102f314c9f5f9edcc56731ce28a3778a4261b2c92be59635e3df3b13f902de11a2ab61fa9e5
 EBUILD homebank-5.3.2.ebuild 1002 BLAKE2B 1e3ade82f00114fb00d503c99f520cbfc7afa149735c89eb9b9c668c63175ee5c5155b376f68e83a61b181ad6f91a4233e2f889492cc23e9a7a7a08e6fd2de5b SHA512 724dbdaf809d5bba8fa6f4251a2e348c6d1fc4e08411d223f6f10d97e43b42f5a8d25a5da508ed52257af967c6a68808fd5c3efbd317f7f7793ac065ec4103d5
 EBUILD homebank-5.4.2.ebuild 1002 BLAKE2B 1e3ade82f00114fb00d503c99f520cbfc7afa149735c89eb9b9c668c63175ee5c5155b376f68e83a61b181ad6f91a4233e2f889492cc23e9a7a7a08e6fd2de5b SHA512 724dbdaf809d5bba8fa6f4251a2e348c6d1fc4e08411d223f6f10d97e43b42f5a8d25a5da508ed52257af967c6a68808fd5c3efbd317f7f7793ac065ec4103d5
 MISC metadata.xml 246 BLAKE2B 1c5c874dba813702c9e2e0147a6d99d357e2570756e7e15379e972c638d820c953aa010c7a00e26efce9a5d9936c88111176a47c540a90c38c49b889239deea9 SHA512 4f7ed62ba7f03a650ba8db92de0fd24d5a5fecb9866aa28011f7bb10d13f7fcff92bae46d1b68c5d5c03fe39b45a36dc264db290c8518cb2ed77ffbca93af563
diff --git a/app-office/homebank/homebank-5.2.8.ebuild b/app-office/homebank/homebank-5.2.8.ebuild
index e071ac7d4868..6ce67e8a1086 100644
--- a/app-office/homebank/homebank-5.2.8.ebuild
+++ b/app-office/homebank/homebank-5.2.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://homebank.free.fr/public/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+ofx"
-KEYWORDS="~amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 
 RDEPEND=">=dev-libs/glib-2.39
 	>=net-libs/libsoup-2.26
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 956a10813fb0..6d8ebef4984d 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,3 +1,5 @@
 DIST kmymoney-5.0.8.tar.xz 11753276 BLAKE2B 0c4967b3f39ec675b9bd7e8e81e230c7f5efa574671138db57396984add802d9b6c28e383eaaddb4ee8d486e6dcc2b0ac54f5cf1129aa4dafb9bd1cf4235914f SHA512 f332327dd40cc5667cd0141bd8e0c9cd81a2d996a4d482b2976f6bbd258cc27c73b2190d4631b8e0b9ee9d435ef8934312da399234830eb51b3e4ec942350988
+DIST kmymoney-5.1.0.tar.xz 12005824 BLAKE2B 4eaeefba29d4df85c485d8d94db80b418c0086f6cac81295f1251e3d4883a78c71d0401286a918831ee2a39571a70583675ee303775bffdb3333e11d5624bbf6 SHA512 143161efd708ae05923d68510945c24f08d85cd6482b3e6015c6061bc28c80e095ca56b768e595bfae50ea3340855e021dde5c715546c0641f94adcd91639334
 EBUILD kmymoney-5.0.8-r1.ebuild 3462 BLAKE2B 331250e84ccd0c2529f9fa2a403d4ace132291cec1464e4e04c21e8403b3775d351c34510aefcaa893cf915ee4e1501cef2e28b90c73b49d86be05ad58a585c2 SHA512 ed3ac3d35531752656a072b610fe201a5a365447d2e10d209835e66538db12b23cc61a6f0c0af97556a3651643effb25caf2999875b88457e44e5c56a73abbde
+EBUILD kmymoney-5.1.0.ebuild 3500 BLAKE2B 85c2940dccb780a454a4854df2b319e94025da6b593963020a563e994b5b775c57bb7a4f41291b8022239d65c33e6869a793e1185182cea6dd7a995beba81ee7 SHA512 39e70bbfe80617711071e4bccf120bb80f3054f01f0377801c861d67f35e7eae29d0bf745d01dd12a8502b39e56f730d2af3bc8171f0d12c3f44dd6129300433
 MISC metadata.xml 793 BLAKE2B 0ecca47b6d189eb9d19c4b61d43579429def819e075267f203a382fe3fb55cedfc14faeb409efed1e975688df260e3574bf03c29601e102f9cce662ecc15d81c SHA512 5c52ef57a4c75b2b439036ba561fed505a9bb331e1eac61a0816287b068687cfe3c22c260baba788aae68c0a304ad9e6aa72599d12a1fb511765d9722749e06c
diff --git a/app-office/kmymoney/kmymoney-5.1.0.ebuild b/app-office/kmymoney/kmymoney-5.1.0.ebuild
new file mode 100644
index 000000000000..f43a35d8d49f
--- /dev/null
+++ b/app-office/kmymoney/kmymoney-5.1.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_BRANCH="5.1"
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+VIRTUALDBUS_TEST="true"
+inherit ecm kde.org
+
+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 quotes webkit"
+[[ ${KDE_BUILD_TYPE} = live ]] && IUSE+=" experimental"
+
+BDEPEND="virtual/pkgconfig"
+COMMON_DEPEND="
+	>=app-crypt/gpgme-1.7.1-r1[cxx]
+	>=app-office/libalkimia-7.0.0:=
+	dev-db/sqlcipher
+	dev-libs/gmp:0=[cxx]
+	dev-libs/kdiagram:5
+	dev-libs/libgpg-error
+	dev-libs/libofx:=
+	>=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-apps/akonadi:5
+		kde-apps/kidentitymanagement:5
+		>=kde-frameworks/kcontacts-${KFMIN}: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 )
+	webkit? (
+		>=dev-qt/qtwebkit-5.212.0_pre20180120:5
+		>=kde-frameworks/kdewebkit-${KFMIN}:5
+	)
+	!webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-office/kmymoney:4
+	quotes? ( dev-perl/Finance-Quote )
+"
+
+pkg_setup() {
+	ecm_pkg_setup
+
+	if [[ ${KDE_BUILD_TYPE} = live ]] && use experimental; then
+		ewarn "USE experimental set: Building unfinished features."
+		ewarn "This *will* chew up your data. You have been warned."
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_OFXIMPORTER=ON
+		-DENABLE_WEBOOB=OFF
+		-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_WEBENGINE=$(usex !webkit)
+	)
+	[[ ${KDE_BUILD_TYPE} = live ]] &&
+		mycmakeargs+=( -DENABLE_UNFINISHEDFEATURES=$(usex experimental) )
+
+	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/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index 5f5005d36bcc..96f67eba7afc 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -335,6 +335,175 @@ DIST LibreOffice_6.4.4.2_Linux_x86-64_rpm_langpack_xh.tar.gz 293468 BLAKE2B 6b72
 DIST LibreOffice_6.4.4.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz 839489 BLAKE2B db106ccc68b59b39996dd2e2244b1d01ad8190522ac5d13b734884f2eb885cb58fc9997c32ca7afa03c2488016d2bd7a31125ef97af73336901b2d97b204b850 SHA512 5cd514c8a428fbd7f0573859a5fd7eaab6f5b6b5413bc5aa9b5d8aa84f87183015dbe88e227689d36bf6cc921317cac8104fea8c7f692991ef4ae547307a798f
 DIST LibreOffice_6.4.4.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz 845999 BLAKE2B 2cc863bf481b05d94b9a8112d31791641ae50d7f4331c56f2a8623da2fa067e580e5ba6fd84bfd981ba2cb28383a3ca5a5fa102055e92e2b11addbaeed5a4a0f SHA512 44db4591a23a0baa5d707e17113df17c4f8526b29d555a57b5cce9cda578223ba070dedb9c5cd5bcc896d9fb6e464802841822924d90e3976df82f0ea8b8ce06
 DIST LibreOffice_6.4.4.2_Linux_x86-64_rpm_langpack_zu.tar.gz 323892 BLAKE2B 286c82394158d90476cc6d8c474239c3ab61f25759b18e5df1e9f3cdbf2b20cbe80396c083b3579e66f7cb0b347c9265748f1b0a5bb4ed82bc8c56619ef61dd3 SHA512 70435cd9c1eac3bee2809741640039526f2e80ed5a88014d7cb7171659004ba24ce1431026d0e9dba658c6a2e736ed73bb8808c1acae4467cf3a82d42e704bf5
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_am.tar.gz 3552341 BLAKE2B c3f3e1ec14351ea2ed28259c1f787e2a2cc14341fcddadc56c329abca03ee786d4030cb3ba9f881858b205fedd28145d43585d6b85653a3ebfca1d9d11fe7fb6 SHA512 f092438182480f0400a59e71ed14e888e6954981a0a635dd8e7bddcc5d56b0a3ba2c3121e38a7026d8a5bd722e5cccbf33cc84f09ca1219d9477d688a2070be5
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ast.tar.gz 3295154 BLAKE2B 8dc642c482fb0b1cb75593b810d644b48e8f4a8ca66b0224770c5cf18d72ce9729bede36ee25c55c15f104e492a9f76f89a85b6e25525a4b55d19a8f75c1769d SHA512 3f43b156b46fcebf9978b3f1da5dee54f749ded38a723d698645658087ae484fdf10e7d7de030ce759b443e275fb2d638aada043b12f39a5b45bd1d3a47eb4aa
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bg.tar.gz 3579496 BLAKE2B 70a4ee26ebfc3d24ae8da314158b153c52faa2b08a242a652e87f2677352f59934cb2545356a8ae8a0478cd773dd0ec265cc4a9385fe9f0393f1f5f794065b30 SHA512 0bf44bbc5c19260036a0fe09bace20bb4d5d49c07741eecfcd18c972b4206d2240fc02ef1547d1ac6f80087a9173218aabe6cb4621ee2fe676600edcd8c78dab
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz 3705854 BLAKE2B 5242a94ab1bd06eefb16fa69cf8cf4f9ee9805249c2a34e6c192bf6fcc831e69e5b31c9b5fbcac937a9242c621e097c435afe97b3b3f417836b233a6512c27ff SHA512 ffcfc0c732f2c48e2c8256fb6bc1153ddad7b5f2a8c97c1dc2b1a83b0deb92a06a24a053bd13469be764642832193557595c6242370745f8c406a031d861ce83
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bn.tar.gz 3437287 BLAKE2B 6279817a527e848fb8c259e429de9480e357fed665903c5594fdf26a0f82e898b73a446a18ba3af9c0da3eba86ce1fce174f91647bf74b9f5cf7e06d1960539c SHA512 c348ea16aa4d6b3f04a6258b692fb92f62c4496ec15fdb8fa7aa5fef4cf823d8ec7abeaa4ded1f80abe2d1c714632585e03507b00970b4c5acf6dbdd5ef26faa
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bo.tar.gz 3455706 BLAKE2B 5bec23e9577d037d8ae3f11a43ab8863fd1a3b3b543db5bf8d80298d02fc7064e36a48087d7589b048ec1cef14108ae551c992b68b801d122a523c5596a74d88 SHA512 e3b2e76c427167bc728c6cf46af70e9d23c0c9c6a2a813b70640e2652c9576c1b045c6b9bf04ca2cbc90e66225253392bb0fb9375c771fa111b4ba8d9a6daa25
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bs.tar.gz 3187073 BLAKE2B 3417c3ac345c0a7360d6a22e7853a7ec5a52b6cf0fb585cd86ab02770fe13065c3923ef14d32ffc5be9c55eb340820cd273fd82960a64ec67546ad797013670d SHA512 ec48a356498ca002914016dea5ef1dd375a1f18a65a47598632cd0a61c115032d723e2876ee5543cf10a4ff1a2dabe924419b0e4aa3126c4930d3f425b56f7c1
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz 3299051 BLAKE2B 624752098798ba094694cf39475ff5a230916a5b58d7da0e7df56068bfc6c48d9fa23d2a033834d47e78d6e07c5c1180b334adb702c3d34701815b1f123e7c41 SHA512 6ce460db684cc8585e88bef9e2ff447a3c1ddcf6f61e54eafa277977dd64f3485402cf9a696f8cdc76bb781aaeb78d6a9a52f531c2bf1b2402e5b187486b8c3f
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ca.tar.gz 3290126 BLAKE2B 96c31161a4f5c412ca3fa7aea8ef55332776938a3c21e43885e106c8793c096ef17ec5d101d5cbe48338cdb05437e4718181d56b6847690f8443d1e79d28c726 SHA512 f409ce93623907c51e4dc1e0cc85a9d6b67c08a60a42ea1a787c1fc54b95b5921860a61003dfc25af539d9feba12ad43e40937f7933b8adfc2eeb4f4252a09e8
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_cs.tar.gz 3318290 BLAKE2B 71d478cdc1bffe5ea8e3d4354d5110e36a9c3a7e9325813914c25143ab400fd2beb8e7bec6dd7ee747a0f2c0b23330192233b7ea8b762286eecf968f141499d1 SHA512 166cb31ed76b7479009eff6485ff9a8f7dbb23d0b2229e860097485dbf730b04ddac6e5d647cd87bbfabd14c560ade7efa4f12fa6d0ee55448ee63fad545b404
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_da.tar.gz 3239566 BLAKE2B 33a6c804725370156d2dfac7e627cedda2fe15281c8d97c1e5ccc794fa34547fb74a424a386a16631c57f56749174ee07288ffac0983b08972ee3436a9a4da2c SHA512 02fe51cc7357d342440112129a4094be774d73a361d88631205ca6b845771664414e64f223f74426232b83f95883c370433dafc49de8cd6c0c2ff566a1866c1d
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_de.tar.gz 3381518 BLAKE2B b625142a352cf5f4cb96fcadd595f9c66f2e5b4649b76d6e0105d1a12771476229fb293f2b840bf9b362c6faca76554278a078552ddcd3ed706fb342317d29d2 SHA512 e5bdb74b6c3a4301a9c00553ccc28a511d929095193351c259ce7f822f7b74ace6a4fa8f669c0e0fd93e1b68d9e172bb49d3272c6e51f30f2ac26482af57f39d
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_dz.tar.gz 3604322 BLAKE2B e8a019f7fe5a94a9f958276a98f4e5e069c76efc37f6bc8c2a7ab6465a5b8225955f5d43aede70fa657594ea0dbe45922acda585e4eb69b4ad0ed8effacada92 SHA512 9e1b8a245781956257d6dfd4bff372213119d10c7edfe9c4e6c9c4ebb3cfe95f4e9c5c707d1cc55d7467791ef39a8dfb29ed7908bcd45ee065391459e9d2d642
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_el.tar.gz 3958021 BLAKE2B c8db28733a867bfb9f373ad29557816507a690b0b2ead35fb3391277aeb836157f043cf64a1bc9f9f71d1004683aaa52220fbffe0c927954ed178ce13bad25eb SHA512 8d8e5c67129002dc9d9c32d5c182f34bb91401714359515bc6b493c9baf6051e2c043b17c2992b1c1158f722859a2f08351d92c97dd3ff06d0aa9865655b4565
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz 3081792 BLAKE2B a29640479dbeccab73b548f4744229200bf0cabf889d16edaccd3dec92c5d330c332333463a169ac61ae369a3c091d4b45c5cb2c4621b8cdcec4452f541c8e94 SHA512 01e11f6f2d3637c972abbd16f477ef0cf135cb9719801c573584976a7d6573f21ee82fa1b2a86326946ad8b7caddbc99ea7fb9c839318e4f217b5d0031fa621e
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_en-US.tar.gz 2178819 BLAKE2B 1a279ff976bfc172352638a39547aa0d4dd4bf4134ff499153f1c1d096429d8a0286b4f07e233f947c2caa31060ffb76f338cb08e296ff2d18b72f2bd8fb0656 SHA512 b236d443f552149c234f32190867e0c4967552f0aaae40bb0f4c3a6d2945ef6c14819064bf1c7d538e8e3a3c8750f4112efd7c34972640540b69e4b05ce7716a
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz 3075163 BLAKE2B 7f35cb98f502f0b80e7572ba8e8399c051e5299609314defd10263320741743b0bb799761c2ef8fdbd49d76da96ba403c63b7e50eb8c1596e54a3522f2b4689e SHA512 b418a804ab88efe9906662af7981efbf08246f36448d3df25e83437292d6a59991b8c014cb7a80d84d6154c3887214fd8cb0922375667d39752424046fb06424
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_eo.tar.gz 3156487 BLAKE2B 1c3a7661446b969a9c75e54bc5c9f84a3055b0463d7ac5bf2fb35fc7d1a4980e88058d9b9006a84bddd02e8d0bf640a622968094bd93c533ae339748706d7e8b SHA512 b3c8e3ccda0638bcd7a1a426979ba7f3a9cf9ad904911594de7c3c88eea8a0d71461242f5d8b0c1a037d8ece86aec70965669cf37e424d90cec31dfee648c495
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_es.tar.gz 3336089 BLAKE2B 35ac87a1fd77d75ad31fd7cad594832acb48adcc2ed808aa79de88536a64cb358fcae9798801fa147e0d524f448d748d268af8b26e38593b27d6247ba1c9a32d SHA512 8794e513171ead973074ffda7c71dba49e66b2b6bdfb81f7ac52ddf1df38a7139940a2bcccad6673eef02a2d7d911327c06badf3a5b917be2b9ec1c2f513a221
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_et.tar.gz 3215428 BLAKE2B 0d4c3c437eca8f204094e27a8689ff97c02ae928e975a6adffea10e400c264dd1536e5517cad79431cde5a3308f352f059cce5d6b1a31432f4139fb00f7fae95 SHA512 b46d70a845c313c5c2ecaca6c49233c38ed00bec82fb04ead165b9b7b904eda56e142aa5d96c49d4c6d0998c0264507049b515d6152be831e8e06d6134181b94
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_eu.tar.gz 3174617 BLAKE2B f076b5c2a20657e6e9c9b785821203472af01ae6214af188dfe91f8fc3034a6471edf807f313f97ecb686ed484896e3b739fe03ae1bbf4f6d4dd957b97196129 SHA512 1a66b377797617ae761140c19504edf54da948e83c3db0043e1ab851031c9727bcd3b7ed965a612c21c20afb372f5e545ee039db1f0b939793a7feb0f25f36f5
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_fi.tar.gz 3223578 BLAKE2B e016279c833e1d9446c09aa162282bab16b6de1fa376995bb12032dbe2fe53a298ca7809ef74b6bb31f7aee85e9ccf26092d294e42ff2922363649c3643860f0 SHA512 b6bdd61d2078057a363585bcacd21d07c27d05d9489a47c8f81d5f528b1285902bf260edbea9eee448de5c312990cd9190e2c75a7c53603edac56c810ed025b4
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_fr.tar.gz 3329515 BLAKE2B 49a92a3d73a522bacff94ec6ebaf43bf76e8a6032aabd4a073530f1a770e0e6cfc009670ce5d4b3d3cc896a1ccd7ac8de19f87736835775fd3a9d50af26622f3 SHA512 cabac0c4995e05b96b85ae0dd95ed6319f32632b8dc55c7b39135371025888a2884a058f4e907a71c5fd464352b40a337e26c460e35347695e202eb4d13d6281
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_gl.tar.gz 3283448 BLAKE2B 971584184fa8a20c36149c899fe2a6057b095abb1f1402672742672d47f3af9f8180fbed7787502adefde36db0f7a5cc8ab68c8010491254a32617490bfd721a SHA512 821aae3045979eede4a70fea3287aaad6f25e70a0b21be6ec7734b3b75f9bde50b009a2289cccc4718752261be04bd411e9d8eed07dccd4b7d59e4c6e69803e7
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_gu.tar.gz 3144676 BLAKE2B 5c8f4fbb92f1f8448d99cb5799b665560192606de0611e62964d4cdbcb620658b573c4bcad68c1aedbb5a8749d8706ff1737027248c1ed06195489a37f902c02 SHA512 9dde5f6cd56fe9a58c11e3bc9b7ce1eef8a6d7c625dbbdb6c6dcd382fc9292360c847d52a8047f6bb7c50101971b277244368b762eb358c43f3c2553457c2c84
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_he.tar.gz 2965534 BLAKE2B dc1bc148b614ba1bc899bafb7f1dd2aabefaf4ecd4459a09e30a59a803e353d15aacefd8abfb639f3c3d4be1a02ab41f902f2fee99400ba5795c80374827090e SHA512 600af264902e39302d384c510fa1569bcc61d6d05f7791375590948872c9b76a74ce8a734741c6406cb694d78be251ae18e2c6a3dd07df924bb53dbd14d1a81e
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_hi.tar.gz 3269188 BLAKE2B a268f047a3c531a0f730eda0bc6be29b112ec9fedb891be9656ef8120a569736123be05f7986cc021bbb21728dea1cd0d02988acb9ad7f58ee99aaabf856da8d SHA512 da6c856737ca9026e1b41e3d043a728130bb3fae9f045bf452ceca3d9d5b07ce9981c8de39403dac39e0d2d770ae63e2792e7e317308294da2f0a1126d83f452
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_hr.tar.gz 3188418 BLAKE2B f145824bc270aac05679ea9725514d1526b007520314d8c5789d2c823ed5f69e5dba9c03565db4a74ce3f465397583025bb68f97236a75542c7a5abf0f3fa7a9 SHA512 c35a927fc9c31e29b87bd6b9fe14144b91fd29130e503356f2c1c6a7ddd01fd919be23c296624681432caa905d125a90f4ca4c7ce95db5671b85f3a55723591f
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_hu.tar.gz 3443888 BLAKE2B 78ae8aa01906f5c2fbbab72f5e63c27183625f9d1caaff45c8bbbb59b602cb4af7c2569909736df3764a7a52cd5565809cf9709cbdca6e09626768aebe57410f SHA512 50389ea83c825d780d0b7d65c7646f0c831d74f279be5bb4cb968b0dc102e4446cd1958db6d210fd4d73f386624d635dabdc8d2338ccba77117ba1429f8c9d63
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_id.tar.gz 3134929 BLAKE2B dfaf95de2587e74c7ed93eebe609598db37e6e3a76b4e96203f8b68d1b187aac42495a8b6c3ef91435c87e5c38f821ae96e2d670f9b144e3657cedcc8b70f41e SHA512 f2dc51361a04c2e4c3ac39f44f83591c7249448ccbe1052ed0dbea3efb82542f67ff0da64dbca1cc15b79b24241daa7f6ce7c83b7fab8aa7fc687fd42beb80f2
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_is.tar.gz 3208890 BLAKE2B baec2aa38dd3fd92c36f78e0e09531cc67869d4c313277269334aabc9daa8b26d897786a60a659dde968f2a3020cd24fbc1121905babe8efc98dc0a19e12f5d9 SHA512 fb765593a1d9eea6fe58c9bb20044ad0e7554b6f24f4fb02b01c293c44da1123452517935daee71a94d3d96e89df14829cdf3c97f04a8e8cfbf964c60644e691
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_it.tar.gz 3253932 BLAKE2B 3000e677bf88a64003e33acb9aa7836d7354d019b12004623f750c8c3fc5683e0074b88439d613fcc67ae1b7aa51081e57f7977940dfd5649a0705c4cd6088b5 SHA512 e3e023931c4c33d8418809fba50ca6e7be4dd821821ee66cde81e25d243ca3d18324bd16782f128c5b024813532c116672c606b06a6965f31dddcfc816bff49e
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ja.tar.gz 3757718 BLAKE2B 9efc234454a3027f23ce68c7e7df4c61507fb73a4e90765d55f57c67e29cc3c9c69410133eb53bd8d03a6202fab2b8052510a02833c001a16893f5eece83ed6d SHA512 b2df97b6fd496856827e9aed66bc912890c2ede44723af65c1a6cbbb9a0eb25a961b93ce517ea754b022db57bf454de6bd487396c98fdaf2e12721358ca2dd59
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ka.tar.gz 3372282 BLAKE2B ea8a120ba9ad48a94f81622c19a3cc00eb53e30accaeeaf46629b49add7862d9a7b8685b05a6caa928832724a05fdbdf6a10a63c763d3c8ceda4e2f9fad0055e SHA512 c4493a03e8aabf578591ba7042e61b8d4ecc6173661350b6f08b8f1eca2cc81a6c5d1b26aadd5eb3fd09832ad3f5d09950834b8b9fcdaa7698becb80e0f622dd
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_km.tar.gz 3706145 BLAKE2B db1f1f93839cfdf005421ba3ae21e0701868d45848ee36bcd6b610aa3cbe8212df80d1399cf13417533951841c241431812bc248c264394e04f9765098bca128 SHA512 9134f8e5b2792c758d8f18e9ba8755e20e74fc30bf380286fec245772fe21ec0a059839aa2d6a24bd9a6bb4422290ceb8c31b80bdaa2e4b59bdbb00e9b056fb4
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ko.tar.gz 3338772 BLAKE2B f05e3bf9ac939c61cd3fa14a878e02d5e9604e54f207b69fd4757a5a6d3b9604f6e93f16597724592501f31e0591f574c24b491e1b77e5a3beb9c95c76edd120 SHA512 f354dfdf115321792a9023b90368e5f82dfb0b75233106e4938744aaca68328a3bb580de441e2cf5839ae86ae041998004b3a8fb861a0f46ff7072f7c22164b4
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_mk.tar.gz 3255430 BLAKE2B 1ff5a8d16c129dbb1c53129fb08ea22a606bf6ad50b7ff19cdf597da40d428688e0fe4e70293a2d5a455f37ced303cc3ba4f3792ae61c0a3af39ff0d3d6fb415 SHA512 69d88a0e62d4cdfe2377d2ea1ddd61df16cda4fd8e05798cc53b13d43d28ba3cdd9a8f04dba641a425cfbc33bcf86c4c120e3dddadc7dc321e8d21d5c34c888b
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_nb.tar.gz 3192773 BLAKE2B 698373d705371ec5b161fe07f1c6cadca1a9a9b315f6c8ba4527d7eb47d4ac3d32aee90886e222aa31f0d71d9a4d7f7d4a1c94ea0154dc370f1d60ab99a19a40 SHA512 e6f339f8c082d857449ae11aaff9c59c6d17fedf4cf72e80e9275a1457dab02ec8c2e034efe8a4561a0cfeb8f48b2eea35e782bafb65b79ed49c5784914f0065
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ne.tar.gz 3483259 BLAKE2B 429bd0448dd33f385ce632cacb180f98daab29d60df83ab94e25cb8697f04ea9d9121f06846987d944dc291d1b0eac008ec93a5e5a1860a698e4fcb3c050f22b SHA512 67b272d16c37636d7499315e8633c07abd28b17ad4f78aff58813ee884c7ccc6af6037411fd79e0cb28d95761d3fc9045efe87ee24087f6ea64287e16118fd81
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_nl.tar.gz 3303298 BLAKE2B 6a55c97b0fe761f4ebfeeaa03bf790bb617eb8e55b2e46d2a046cbd0f53e91132648a5582eeaab07016e6a0faf1f36f27bee8c731e1dd87ede003251a37f5a3f SHA512 78315e0b60b9c06662bb0a1f4a333578c29ae9accf610d6d03ddb596cd0e7be74b62ecf9b56147e52025a820b6453640eabb070bb43f9efc89a171bc9c2ddac2
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_nn.tar.gz 3193534 BLAKE2B 158038bdc26066f42a328249e6546f20ae2deed9984cb8357bf567788d8e0f48af573af9a29e577dfef4c4aa267c849f0a2f19bc49e1556af10020a7289a72dd SHA512 56c9cc6faa22e4a3fac4aa2e82b7eb60ff446f1fff132cb9cfd2f559b4e3ca018642c1c9104d463002dd9cbde11d6e79e8840f1a9d5b06bdd17b0f65c9722898
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_om.tar.gz 3258653 BLAKE2B ff6b54c7b0c14c50b664b0970b65df7bdcf211c3ce6d977f8556e7a3d01a34695e88a7d6f0c4b24daa976b52f82949cf13ea47163ec6d03613a55ec2332569b5 SHA512 7713eee0cedb13ccdec76163bd7edebf46e58b9c2104a14d121adc69a54895f4df3cb4213f709e80d72077472bd292784bf5f1d8fef3b7b5e666e90995e58540
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_pl.tar.gz 3468903 BLAKE2B 8d38dc22e7111629c08b5456ad44b27a786e5bf1c999f9e4238d3b0af0db04489ab22ec413ceb51836bd0649b652ebdadd6ee7657d4af6f8d117049c6df5e90f SHA512 edb8a272d198be8112abcedee50aefc3517ac7f4a9a8ca4d055066e4fc654c2fe488e53a9f5c2d58950361cdc30cd55d748bc8f5b559f20b1547753328b6e389
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz 3304817 BLAKE2B d969f43820a02fd88d25b95711b48e6323e6d3ba0df017d740687151d7c96311cb0f6360cb4ab9118906e627bd2c8e0bd2ee1c0d9c88ae2f6f2b9db580f78a91 SHA512 c402761f960813f2d6fc247bb0ab3086fb722ac65b46f850c80f053fa8d24d390810db526bebf88accd00938ac90f48bcffc2a8c798d5b730dd235fa6a529823
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_pt.tar.gz 3266936 BLAKE2B 7623cb0595851ee8786ff8fcd3006661a1766deca027fbf3691c18db7aba89813aaddd4cc1f010540224092f42b6e08926efdb678957598ac72925fda0ca87bc SHA512 86a9e3da86dfd8d467aef521ab77b20c1fd910e4d5b78789eff00514dc8570135866b0f88ac8138f452f4f0de0e084215e3be2d66f3add87ed5a471435b912a2
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ru.tar.gz 3626044 BLAKE2B 10743d3f8294fd92388fc123eace20450a3cd45c6e6d79cb48279d44e339db7455a384b62e8c089e97f9fdeb48ba9c2482e2145cf148fbc4b4e163163cf911e7 SHA512 99bbbd3d8ecd4079f083cbb0b610c5278ed04998645a8a0b802e91e1a945edbfee257e9f5b76c32a245c1897b33316022315c0033a6db1072fe256c4d10d908f
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_si.tar.gz 3347905 BLAKE2B 7c807b34d50552c344dc57d822dd4c16ecdab2e276ca7282ddf2ba3fe77b761ace13cde070acc6f4559cc11952009aa929b9367f63143f88928420a3bb0a2425 SHA512 7324f6f9bc68220b4d4db36c422f2ddd63806d0a5c1e9da6208bd32b5f05022b585dc678a363ce30f7cfaaa21eb501df61b4c8202a0fca4e4cf1c34fcb9c8845
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_sk.tar.gz 3365573 BLAKE2B f696a3349b5560e7fbcb2ff0c477dc585bb3f3c4fea2dadbbfd617bb30f4d0931edfa4df01f5ad3916955e8ffd3f019bc1bc526eb74c38a0be797ef927c364d3 SHA512 21c7e0e68ffdcb5338e57ce82894695dc4465388c4fe8c919f002dad0c574baf1634a17ce08b76dfed4f53c59f2ebd28ee9417e90af7de618c1c780d8ee309e2
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_sl.tar.gz 3248124 BLAKE2B af25a3b991617701ed515691fbd66a1112d1473654d33ab4c5187b318cff473fab84a1c0a5adb7d2ae0e49ff67fe181aefddfd5bd9d18e47123fe8ee8e27337a SHA512 cebfafce0c184398572c657ca8bcd69f3936d11490c43b9cb46784052b60443fa57022dcd57dcd6768b1b346edd3cc56eee4acf7ca3d81e818a36608772f0124
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_sq.tar.gz 3162329 BLAKE2B da2473d0bb8baf2b7a7670c241a7f454adf2b86309348057a42decfb45906f655783a7799a9262c964a945b22b23094cbb6b2fa1a217e50aee72bd5dfc1a9046 SHA512 de4661a0d09de1f0b3322131bc94bcae562330c10fe5c006f3bec5d7248969ece5e8db1b8a552b1d2ce00051ec53d6b7ff83b8d8b4423ea472581ede221dff55
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_sv.tar.gz 3238795 BLAKE2B ed61a1f710924fb69c7ef40a9509d5bb4390b8192c918b979074934810fbf593e44df955e429056d4a158477a565f3d914e10abd67035dd3be2712b4f0b015a1 SHA512 7917f628033df3846ab63c73f4d1b59ce34def6ae3856ab55bdd4efb8e2022df50c1b364fc94660eaecb3a41fa27104f07d14ff085689b310b3ab865156c5bef
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_tg.tar.gz 3217994 BLAKE2B 0a20bab85ace8b944df195e2f3a81f01112e0755c8089dc2933b0e956cd3a2244bb34bb5fd70443b7e9aedb789aec7bb793782a92975fe6b7f672a9b0362156c SHA512 7ff457139d85e56ee7eec1375dfd92f0c24021b4426d29f0d30c13908b5ed6a46469bf0f9a49c02fb204cdfa4c7f68b207d4f4f86a4c8d0cba6d9bf89e22eaad
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_tr.tar.gz 3298238 BLAKE2B 1e99d2107e9999d6490de68f6b1c7f91f8a1ca8685815a20a4acff02d9042e5b4babf01e3305dfe4bf680ca47986096bbaa9d7ae635206067eb309dae222f5a8 SHA512 11c51150a37282446a8cc07dc6df8965bf45a5d709f8007997f7d0df64e0b24bc7991e1ec0cdeb06d727367d925ff51ae3fb73523ac3b463bea5e45e9ee4f736
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ug.tar.gz 3307026 BLAKE2B cddef88ee01deb9fd7bc1c04c5e9333618d4bd32a5233b3496d8902ef9c64bac2b404fa5df0eb34b0add51980de58e0e100f3eec5ef45af2c87c3b2ebf69cdf8 SHA512 6d30b6952abe3d35c446f2bd25868f6190e3b1f74d823a411dec6a80392f99cd56e35d4e9c6f42743c1182aa1251da2358e0f65613191a19087e1327acfdb817
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_uk.tar.gz 3597387 BLAKE2B 8318d71c92683306a83e8902a885254cd8b41866579f52648b0ab9bd67f592419bb6d40e2502400449e4e9010ae87fbcbb037cbfb0acd8445495a64aeabf6cc9 SHA512 e1b1c559dfa11388d1143bfe064f2d12b15d2883a528ae14840298fb3a394fe354b76fc743c49ac10fe986eb953bf7cd64dd6d950f5390b62167ec1bc858a930
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_vi.tar.gz 3285407 BLAKE2B 9ac6cff8024c18e1c29818eb1bd29cd88550e5eaa3097ed020a40f1bc13713561b0239489d033aac6e202a7fca20050cf54249f0cf909ef4ec81f9c26cd0953f SHA512 b8867be846a1a0ffae68b1e809c346dcfa493b38fc711819e53e106ea13a3f989fd2f83077434f45370c204826e202404e8b8595bfa357de325a8c5720257ecf
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz 3395319 BLAKE2B c198bfb76e2358f3ace9ce5f4053ce7cea1f791c500736430fc45e69f5a15e4fca34e0877bbb44f03681d6c42b5a3e377a6d7f2b3e959d53a6f4ab6b92c92de9 SHA512 e8c83e6a293a4a15644ffbfff6b7912e157263765cea3a887a0195dff39d0a079b1db4f341dae683ae3d95f5ec5bb6c13ba8cf617bd4919192fed12d78dfa263
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz 3525582 BLAKE2B 7a1774a7d579aebb67bebb5cb3fe14f2e5a5bc60cd5a41e121475fc9eed03de1c2b9796fc8b0dd9fdf5fe1a24d21bd758a1a193bcba0d2187220271949deae6d SHA512 31ddb7f682915f099c60a6a8df7ce77df1752317764980bda58221e7cb69d32f296cc23b2d3961b5faec6c725cace3e5ea13d874a26ee1a2921feb8e051020ce
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_af.tar.gz 1085775 BLAKE2B f870220124e609909cc25cbbca753975de7b43ecdf10e5939b50cf5d26fcded0a1f0b7b67b1c9ea0a4a207e6a8802a7247b8c2c7fcba6e846c3cb898d57e5265 SHA512 2e2a734d4ba7d1a850c7506407b4a12f356cc9c3d2e79c9394bce1626d451f99f4d6c7e2dff3f62b5eac71ddc0ff3ecb2143add1abd4fc4ccf244af9051bb6a8
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_am.tar.gz 771675 BLAKE2B a4cf0e7fbc0f1fb498725125e93b314b077bea43bea68097fbb135dc5105d8165cc1986b54b8ef7044d9ce7c04b3fc6b0f8b1a4a774e0d5cf7831ac369833a7e SHA512 a65a58d172e27d67ec848dcfa9e9ea29f64c85789700e1a17c9f062a2116b891e13a1de856d907809cd3c8a5f30ec17ad4e01ef27a23b395f27e8bf46ed184dd
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ar.tar.gz 2409982 BLAKE2B 75f51a7ea5ea39e53f98e63c56fe5df9fddf589288d6c3095de4844e974509b6bdda91fcf8d8032e9f938a74947352ba7882167a8a25b354034576da4a9371c4 SHA512 2106bb2948d7218fcc7399db82a80dd3e33dedd207ed890a9324f51a1c1664a173b0f927a8d8ecf26afbfce357bf1079a511eef2ca6fbcd947b8e425c6ad55b9
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_as.tar.gz 530564 BLAKE2B b09a8ed4ebc60967b59abc1a590ecef817fe34b877460e61e32da54befbbeb449c07cc574f79df6eebc31c6f16e2dd94123e7f9f90dc4cd229f2cf1b8021e54e SHA512 12a0660b0d63e872d1ad1e1e34ca61a21d947fd7be78c3523c0ffb4ca444ff1fa7cda8a6c1328883ac9291fe59029f3bc252938ca5914e1dfb531d9bb4fbc409
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ast.tar.gz 490528 BLAKE2B 762d97a0bbaa0333017751e84bfbcfe6593fc575e61de7e7dd565e277c86c7a0440181e641d21cc367ef3552a0cc74d6e0cccbb0f4f3d28e53c674dd6fc49f7c SHA512 7e89ae0b0db843def1d616aa3a518d4c05e18c1f724ccc51faff9fa72ae2a5692fb58ce9c3f28164d2f1977a0374572f582be3f3eaea91a0be52cbad8562346d
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_be.tar.gz 1048807 BLAKE2B 38cc129f9693b1ccd0fbceb7e3df15d18389bb101bd7c342e5f262e95c4f3cdb18893acf2f4193ecea56becdb589942b23d3db6090095753bd35afc7628289f6 SHA512 ae3154dab91023bffb1dcf6d7a2d5dcf216b8d4b0dff449028d47f21af0b5625ed3bc66690a6723c4ec33fa76d3bda9babdbbdebe234c2bf899673000e625369
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bg.tar.gz 2488154 BLAKE2B bec258ad51d0822a8e41ed6b5209422b8750400fa12cdf80b3f37bc18321e9f02942c674343545cb9894aff8d18d81444d5182d10593706d68de7f8e86873c59 SHA512 579b41ef11ab1d4e92147a630880f0d3e27b0c43387661949ce1f44da4031a0c48b25506e2407b02dcf57f5c106ae5acc1d04a53ab803890b4ca897422c698f5
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz 643842 BLAKE2B 5d80346cbf35e8db42297bab6f4180b7995c030fcb87dd66365f5f190b326ffb60c899273920792d6ff08b2fa0c6adaa134a6806df5255b42c7a2f9ab7cc0a4c SHA512 617adc63044bfe2039feaba7a2b2357e1dff07380845bd76bc1a48e666e38a5034922545dfc5a741bfb7af8dde0256d68d16c9ff066d4d3806b6aeb951ceaf35
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bn.tar.gz 789555 BLAKE2B 3169b84786b6749c328b3071ff54183ea50d6b544ec52d1f4169942bd4bd963be4477f8bae9adc26c8f938890a9138e1c4b26979fce7cef880dbe09c25e176f8 SHA512 7b86ebd5fbda1244985a1c15ba7e90e1b51e0169e19523ff3424d901d31f8dcacf8dc9de00fb61e29466b586d1238ffef45184b5177a56cd25c7ff7d04a44d82
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bo.tar.gz 382460 BLAKE2B a7f84ea44b8dd5881bf2dc6e246d40490428e43c8357f9a2fefd3497dccb2d4fb33944487bf01ed869689436479c53723954461db5252e03fdd2ca5f3b00946a SHA512 d862fb00532d443cdf5cf95ec11fec388d1465f5ab7fbb9fcb6198195e182caf22b39e54c1ef53f88fdd002eb8669e5b64399bc781a70f35025b3c8c7d5b4cf2
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_br.tar.gz 1534486 BLAKE2B bf1e22ec92e111cf93c3458ea65c739c18e3eb2d8bf487859f13e914f19d5554abe47e68d045c122fc70fda0b5707cac6ea5546560a7ed3b28de39d756aaca7b SHA512 22bec6769e3089b009a30b7d0dc96f58140582a7abdeddfe031b6aaa3f62ecffd6a1066a3335acdb275789d8dfecf65474b56003ed4c71e7d397945e3faafb4c
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_brx.tar.gz 339505 BLAKE2B 09783f1373045b897a5af8160e9556fba07b2888e620e869c9aac3138fdbf3fef55e498be6ce489a2eb8bb286b3a4bdf407af2319174244fc5c1050d87765af8 SHA512 37269c1839384602ebddede5440c2aed9dc7a21e2b2d5d3d36c6033a7d804b6d9b6c3507c910f0ac68d82d73b83be2156bb9ffda8c67982dc91329cdcfafc449
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bs.tar.gz 636271 BLAKE2B e2d5cbe0879ee3e703f60316d89fcd55093f2d9bb132aeb66ea80866921b323914633b0c875649cff6272820a9d23fbe2b1dd45ea4554ae994cda3c8795d2056 SHA512 4967c92caa0bfd0cdb3ef4efa621b4f9719296dfcc47c12534324c1946ba24848167c474d0574bf1e921a551e3731ae84c9f5c353e8c83d62fb8698661c30336
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz 2046152 BLAKE2B 35525a1bf951b2bd46befcde009aae8be168256a033ac69c0a59db4b7bf43607f7070e0188fd092c12fbdea94fc4220a06a911cbf797f02ffcae78b222b1c744 SHA512 986df7750b9a7345f64f4caee04041a18751598f1bb889b5331c7831e64b66f5dd46db54bc1c6569984a202b1fce824e0988d6e80f8e421879e87aa2d3b08fbe
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ca.tar.gz 2045407 BLAKE2B 75f68b1a57544e3a19775132b9ec7144df8490537bfc330ace11212769537894153514844c23aa6047c56413aaaf0fe7befd662c276d50aa5c268982f9a8fe2a SHA512 8d226198b090030760ffad649f88ccf8413e60e05d0af96bb44afc82e4ed251f2627fd48287585f9ccab2cd983c0b1a71b357dddffde86733dc969a1e63e4a0b
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_cs.tar.gz 3227425 BLAKE2B afb1dcdf00a04a55cb16a99c52f60a842cce897735522c26d88552eb0f8236f008fe3d8bb30493bdcff46c934f66390f40eae74f065574e11c61e7daa42f0c31 SHA512 ef80c99491aeaf37d3bbc11a6150db4a0f943fe8c70cb69961871b62da87a8b0c01f6813e60cc298d45dccd5e1e4dcde52804dd89587d955cf30eaa7480c8030
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_cy.tar.gz 766489 BLAKE2B e0bd0e99e72168540440156458f3cffa69486d7c4c403574f480eb31463c0eaf4a0a6ef2bb823b8299017f3a9f5ac96dfdbf703f1cb4cf9241410ffd6cca5df6 SHA512 71a7f1e9ceb16d855d0c728c2906e452ee6b8eb2181878b33f592b0cca233d8a08a5d8526a490a296a1ce3756c5b0c4f124f2846ddec080357ad716b45a59c3e
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_da.tar.gz 2864584 BLAKE2B 9ea633bcdf06904a65cd64f4e9e6b80314c2b84721e462605d78c66a9e235fd8853ea956a8414ccf7abe550c0bf69c9a25a1bf9f427e333f1a92994089a0f85f SHA512 b9802c167e2f30a3a00ce7dcde182fbd5306f159bbd75312e2c36ff0a1bbfddbaa527da51288025d285d7e5c322dd1a2a226068d280c2f90e810c5e433e0b567
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_de.tar.gz 21794746 BLAKE2B 189760793eb75febfb9c83474cb5cffea342b06d6c7a2173fcb5d8ef1aa1b543d72a2090a564faffcdc66bc22a02505ff2023d14b11fa3030e5b3ce0a2614a5d SHA512 7c563e1ed778577d7f398b0da8f1ffedabe1c4ad446d4343bcdc063b1a672eb571c23425ca06c2a69c55d23bbf3d57c97941544b750738ea47dd63cd1da0855a
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_dgo.tar.gz 441212 BLAKE2B eb9cdea63c896be172f516eb2eed82a70e48023a0e09732279fc8face26f84caae2255bf536320dfc538df4416910f28a0ea614e74174f5bd8ac5871125e132d SHA512 f775aa9c42c81579d37589704c12a040da6b8681d535f55c1fd1d2ec9428b12de8460bbb0d01dba0a7b823c30ec8cbe4eb2cbb2b1ac4058c18695a100719a085
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_dz.tar.gz 370012 BLAKE2B 2be26d1855895d705e10f34e8b4a518d05e0f89c1fa24459e830cd6f003c552838f1d116baca89f3d64e780a2af1dc71f11a130ee7262e1e00322927151befa8 SHA512 2e290831df5a2a4ec9c274821ab0258bdbcba84e81c1c5e8a3945c411b4a90dd1a72fdc7d8fcfb0dbd32d41092717b353b9fb85e00d52d697f3f34bf0dd0e47e
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_el.tar.gz 2875236 BLAKE2B 65592733dc403766be5b6efe917687c14414786a614c062e21d15deac75ed29e65bc69334de086a1ac9259b435efe43c09c753b01afb15dbc921efff268eee36 SHA512 8eee72c85fc819fb1a271e8258e6e06bbb7a48ebfa298fdd353e2a1b0386ad5374817b7b333ef137a6e3c106a56be3c70fae342068c16143627c02ffa4248447
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz 7381622 BLAKE2B 4e90bb8c8a2f534e4199577de815a8603adb8ffd609714c0ae1841a9bb7f48031a62959b02ad93e1b422daeaf29b71d978ac156418ae6a29f7b0df5e476c7a26 SHA512 d72b2f0e63b195c3e818fc8eef6c4fda0c660717d0b8c8e60d7d21ccdc55d9e6eec6e7eb894ea5dbe4d1a6c355a9ab9cc313623ccc78ccb01c80973023e917b2
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz 6929845 BLAKE2B a59b4ea247721ecab8ac81a3642b6791cdc2e2b1270cff31d3925f66bed273cd41ab1064007949249271e7ddd87be63ee26509558e750c8cb67c7f3630688674 SHA512 0bfc7d2cbce8fe1dce19dc043b3d47b6ad1c4a330f4ebf5468a4837b45f6d0131bd2349e6a345ec43366e7817697333112b8e98d9bdf4136dac23660ace59161
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_eo.tar.gz 762150 BLAKE2B eb23a7c977228d0005f6bc3cee1d6cf94a86e98019440d2926e8d9291d8efe3d0e062888f2da807ed3fd51d9b2e20ced0504ca06f8b42c0b3a0b0f4107124fdd SHA512 eae6f4bbc199e913f5e8591585b9fcba17d6a0080011fd8f66709d658641b57981c814f92391027b0499ca06b5d97ce74fc0520fcb864732c57cfe27cb411635
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_es.tar.gz 2277894 BLAKE2B 9157ea00fdd6cbb26252e5387f5d178601dff7b920dea11fe7aa706923a0e9976a1389de28318892e88835d67c9a58bf01254262183792bf61dfdca472a17dc7 SHA512 5bafc2391162bdf488c8b12c59083caf492a5cdafce1740559347a97f773ce22a696f50215b9d50b147663e77362713a0ae381234c4d2ba8be2aef3eaf244f36
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_et.tar.gz 1678262 BLAKE2B d0b3e3a30decbf173f28f778702d720e92f720e177ca8ae2aeaeaae15d54ba3d32a61e9257c486f732f900c210eb6ad3e788e7abf6f54cdc8e542f2f3a617a26 SHA512 c7cdd7be95db7c0ce4ca1e7db23d634422a0225186a6e77de0664a405d42627739acbf6f102f274215a480466d676961af293056e85f7ac84854f522eb37fb38
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_eu.tar.gz 772400 BLAKE2B ecd7b4a7c1208d9f52cef02702c2ec794bd52c900f337fd40b8437cf72f7d95ec0648c7f1762d43249f1ea252320b4cafa09247a372e53aa3462dc48e61814fb SHA512 43529a8ec078770d2142f6a5f847938f9aade128f10da38c078a0171b19f9c6eb1c737594c3d8840e2a1700de41a730446fa05dad48f7c30437403e38612c2de
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_fa.tar.gz 340069 BLAKE2B d0d92a3b1185e5c21b7321cbd7a44aa8b177c4128895058bc333c01d5689ca514e855a08431884cdeeea0a844281c23ec23859e4ff1686e04570f9cf81401898 SHA512 45dd08c05fe07e4f0e1391339fed533732ce07666dff1d2cf90f0c60eea89a4845e9f05ba8001f2902a0a9ce35166db322d0a73a2cf71dd3fe86741a1cf175c4
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_fi.tar.gz 745246 BLAKE2B da8e048e9ca33de8e462f81760a36275c7664ad3c165bc06836c107fcf4624e9f3d6104301dbd81626c6f2e482f82da9de6e24e4005bbaf0405b25c1a3d49452 SHA512 a5fb0d9c9bc967136590a47af4c353cbde5471c39d6887601dc805c14b5a06eae1afcf5f0b64635fea8f42560ca4eb28754eb5b699abd40126192d9ec15ef7e8
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_fr.tar.gz 3073426 BLAKE2B 73ec4af3c33035c7048f028a6622a9bf5c37b51412e501ca40bc1426e704848450ea93729a82c886ab32a243cb84a82d27dc5b9dbeed4dc5066387a8f1c8d291 SHA512 7f5bf491e2bf57a1fbbb58bfe72c8ec08cae96058eacbbdb8ff3bbab5f49d7ec94f78318cd29a5ad8334b6f437ceebc890f6709f52bc3ea53109ba78bfc41dca
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ga.tar.gz 737950 BLAKE2B 8b9cc4ee4e2e65a6b241c20158f8577ac5963e95a490940260050358e1d156bb0c611cd2660c107de25754889b2fbd0c2f8e833e7a2dd2cd04bb2e5a311dcb3e SHA512 b408fd5bdec5e48cbcef6aa4901246d525536baf3d63ac570751521c7cfde658783cbe05c600cb4f115203046891e4d26c9e896dce113225881cd9973bec3f11
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_gd.tar.gz 1792185 BLAKE2B 9ae12f72d334029b1ef5a7522a6021d0339227f1eb1a7556b744ca069c26d5587c3121c9df4f57d5b20671e9f4854c731cae103695b7be83562f365ed1443c43 SHA512 44b0212a1b1ddc39feef2f699148914f237a7325f6939246dc142ef1153cd0fd2471f542bd6a8e5eb37c2c8dd641ee98d4369ee3bd17a6c4b806dbe1224837f4
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_gl.tar.gz 2664151 BLAKE2B 3f4c783fc81ce7b2bdf76261b717ffd54740b1db98d901d33a850af3d261aacee2eadd64e8f38cb2a2fc6b8226bc96f02fd9ed6543456bf17f8b759190abf571 SHA512 f228891815575cb98e05283d6b4178e9fb44056df21d28e68202e9c0286d1c9a37ac02dda152f5b0ea9d0b95078418a466d07c203b21aa06b61a8297f936ad61
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_gu.tar.gz 1227264 BLAKE2B 9f84a389fc493f6960a0c52e0b82b684b7263b3bbfee15f7b01bf35986bd956e75add333047f7a8b67515a3e70df17e16ccf451c2401bd9e6d59131e0489ee0a SHA512 9cefc13b66e4b821f6b6c3b20d57dc3296b3fe3b30c7c15448f469d5d370b9744d5fdc2be8c000a1afebc15768d68a817f4e32dc992b8a12a5384a574c410777
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_gug.tar.gz 520289 BLAKE2B 95be058f52647e3014770128bd6ba144e1588a8b5cb0e4b393ba363b5f98d056c08690b7de3a569bc1423eea0b410a081432d709571c542229c26cab98e73107 SHA512 3c6896084b7f5891c2653e83382b2f8c866522c2fdb76e48890c3976697aba6c2dff16aad472d2ddc2800c575a10bd8db1fa0f6b94b7da6494973ad50187bf95
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_he.tar.gz 1638804 BLAKE2B b48157b436a68dd2b235980b1b50c3b06d0d8884a43850289ff990f50e68066d516ba8ea54466466fc152141ae26560d55b44debd5aaa6edb3ecbd5f9917bd09 SHA512 774ecc3c8019e18515408b06bbc926ae55450311ae30df3cd95e6ab3631e39855993796d53e3fc6a7bba450645017fe37c123680898bbfa0cfb1beea387a723d
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_hi.tar.gz 569912 BLAKE2B 49538b68b633a97383d19964b87f9ae139462b7885e991c7d96df8b3b9c6fe361a83a4678860824aefe25895699ea8de0a98dc4e56783d1520e1b9d3f99c03b2 SHA512 54855711f3a5c87f6d93464e0c0a97f1507605d2121bf8baf8ea3ab1bbeab0a899216f9e4bc91ac9db3aab3487f35df95560e02a1d5bdaf02ee546c09d51e1e2
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_hr.tar.gz 1004999 BLAKE2B 15cbc9cc37948c1b701f36e4a26a31240fb1fe4cfacd90044339b729806c4861f10bd9fe02f4f23075f52ec3f86269dfceab43a37b0a4047b380584e9f1fae9f SHA512 8729a8d7a768745c28e644d1c9e1d2f56e592c0495ba4df9fcee5a8622d7ff42f689cb389f8bea54fb03d0013f48f07d0a2e13ec7e5a9b0a724f1055719a26ba
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_hu.tar.gz 3043510 BLAKE2B f5c25cd09b898c00f3cdc70626c6a728c1beaa1d98f71ee832094732f7f6a8eda96420dce4d15a285394208d3cee48bea14a8dc95221fddd489279eec6a64916 SHA512 27f26d09b633bbc7a4d54b8fac3d9ab03eaa203baa202c209426307299bed69a83012e4112eee56d92fae78e7e0c7f20f1e39b466a0ffeb6b662e9bbc85985b9
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_id.tar.gz 1629537 BLAKE2B 1815a552efe7b8d82ffe595ccb06c5ae57ce89365a193592d00185efec2b24f44adffa8e5822e954169732f87efd087f9b3a36b3dd56aa642a5325874e03804b SHA512 7ba193bbf71229480956e7f6beff30acbafc35ba461c4d5ef7d3d26fb532840d1bd0726aed177bc46c8e96c8d8f0c325241ac5002f11e447f5203e2ce93e3f3a
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_is.tar.gz 1540029 BLAKE2B 8f0ecdfdc32b8153a785310a5392e316e5187116ca159d5dd88142f9cb0aa9e2e087f64efd00393182f9a41f2761760cddefe217a7ad400342bb248f812b1bea SHA512 8ffab51218ab70f92a56c95efcea268bb0bd7d52eeb77941d2bdae842d4237e3477d75a33ec361417e8f7ce7df7501b5611050e5377b8671a30dbf44b8aadf10
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_it.tar.gz 2105815 BLAKE2B b87f50dd22f4f24eacf886d841ba41c6de0da84cad50cf9fafc22cff3c40eccf4f7fa21c656de0a313ee1adb6c97e81c0e871779c40694d714c69b0b7d3e420c SHA512 f230f69a555b3998ecc0d83ca465c652f0f74bc60e0829b6166bd20e700bdfb613b410aba45d66b92e714bcbc751b4016fede4fa7a075da91bc5d41dfd208457
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ja.tar.gz 821045 BLAKE2B 1d3731dad9f01d2bc39f3dd9a510b12762274456caa8555e54da266a080ce2c818bf818f630fae63ad1b6b8d194d7a874b23bc45615d6deb175030454b628105 SHA512 e348f03af5d5dc5c603ff7966436cc93246373c89251991e5554bb47440b7e06f9dc7c97123410b74962cba824ca4c05387f11b453e1c6a6ffc51c75f9636b80
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ka.tar.gz 362414 BLAKE2B 3b3ff493916b3debd6950dd162c6d1b913f2866c25a1d0317ad3bce4b18e4ecdfafc6a28fc16e4cb09faf6f689557bc38a3200a9143afe04e922e1e0a9436c03 SHA512 ad5e3c30b83629a2c5cbb644dc3ec8362dd06343c8f1bd89ea51ac8b71dd1136c5a70de516f75fee49fd6b618ad39f87855a73e921039beb171978de64b10acb
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_kk.tar.gz 808128 BLAKE2B 3bfd5c6202fe8eb8185b22ac3d29c47e5841ff795c6c04be1a1935f7678bf85c7a62d9d60c94469ec87bb26b8f1754b4ff80fd428f9978629ee00247b5d75be5 SHA512 1c60c1d521efafd66d2655b2070d5a6e42854b884afedbd0c0241a08ffc09fa4a9a69dcd971c130439b8f805c124170879cb26167cce53388516cd68c31c325b
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_km.tar.gz 676246 BLAKE2B d95a021c97e8c9df336581a0c20ef8b8d2489742bdd23850c59e0aa81a8bdd73604504a069f62c448d06ba06214b0649415ea5b6f4dfe9d3c800489469e9c6af SHA512 ce8b501e670df2707a3831b07cb9dbb92610327d39d8d8b5b11ddee5b91b6c22b401828d13025dba18e516fe2faec5b828670982389cad3c800afe226fd8edc2
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz 339236 BLAKE2B 32791317b7c4ffca4a51ecafd3f54330073bd13089424e3ad290ac4c8719587f545df7e59728c04b81490751b13c2ab4d64a2283acc0cde29a40c0631fd9b737 SHA512 23e09e9b6258cf93d95ca6551ef65956719cabf03b288a972a8d45c30e7604f1ba7f186eb4db161915b0ef903deecd558b7545c7655312442b5c1492047bdc1a
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_kn.tar.gz 582021 BLAKE2B a1fc7070173e198c6c1891c234fc09ffabb7335259452e00096d7457f6db198df372af77dbe027f0cf0a54ddce5278acc39986ef3b65dff121b01b8bf55b467f SHA512 71c91fd803d519e1b981cbd155afd162a2834e38cfef9e83535a63e839116fefcab077b7201f1e7f2c4efdfb1d3a8383e898988899e47cde428fd1ae2f973d42
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ko.tar.gz 801683 BLAKE2B 1b2bf9752362173b81340b1b61f8dccc861ee4d6b6477a4f1659b13963a6d10a4f89dcca562382e10fb67648a9fc36f1e1ae72fef400cb01067105646831f68c SHA512 1633c3774b14311847fbea2c22ab5166ceddb4c57ff2a9aabcf2cca6f28f715e775d790a2690d2388dd36182cefbf0b19ea7c31fdd778b7e160d4e51e703ed94
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_kok.tar.gz 413987 BLAKE2B d85236a20afbd6467fb36d9febedf54bcc828d19aa250c516fab226a3bcac1701dcaa5f8591ca996043e06f728e131cd1786f00d06e3d8a8e1830f0f1ff0d13d SHA512 ffc8676a00966b5d0cac7da42fea5b1f2fa9ed1028c2ca016acc22a7b1994b5969ce539e1b4c9cb5fdac634c955fc252c6f45849684bd7355505fad63ea48632
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ks.tar.gz 332659 BLAKE2B 6e467d3f7df1830eb1b71ec8de9edbf3f996a8a0724f9b0762a787262e6558f2bf6228adea34641b18d6255d2fde9ef8991ce08b82ef1d86da0992f9b73ee24a SHA512 efc828e5bf084a723f83e6752a0fc2575b1bedeae433710f80c72e0a6a03d60fd67e5b82570b4e9b37537e885a9260ed838e4d6590e9c722890502b4d4026cb2
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_lb.tar.gz 148469 BLAKE2B 4a73489fb6a2816b2bce6d9372d2106c26a907dd99c25c4df80cfcb7063063697a9dcc86c5a0ebe2b31023754b41e4b9af058cc449fe3aedb743e7b639dce672 SHA512 7d478be798a3debac050cda069debbe360ef250a8eb38892f4c122b383c5acad07917cc4d3eebf6bec498468facb40ae6cb9b28349e73bd36ea10b3587f7bdc5
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_lo.tar.gz 435593 BLAKE2B a272d8c47804f30ee60069f54d3557cb833b3bd0c2adc4beccf0ae76314a83860f7fa95d71c4ecaabfe677f36f816ecc54c7c254667358d00e509a9effd75c4d SHA512 fbb0c7d5e3e4ab6a956697ab6d69acc9eeb3310ed1fba704deee3edb7ccc833edacbd0a2cdc24f6b82ae0137134dcf6c0de4f4cd0c09bb19d40084d84dc5ea3f
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_lt.tar.gz 1072806 BLAKE2B 0869de89fd9e82d420a889e5ee2b29d179b3cd4c7ca5f9b7698022c88f76b6e8d0a4a5212963956c4fb527e314041ddf339c6cda3ce0b2fed1a3dec98ca23384 SHA512 3c9bd497ef5d32db154d7bec7ced4d4060d61cd1a7e09c4ed7cb41fbdcb6c4f742f203347a9f12cb5af5bf2c98ca26d2dc90d43b03f5f03f6bc30bc896276e2e
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_lv.tar.gz 1497971 BLAKE2B af23a8a6fd82237de55f849dcc2d5111b5d150e970f16f246d428fa03029e2f821663b0f83b50fc1bfa875f2115970eafdd5958ae1a3daff10ac503aeafe5d7b SHA512 7b6ef7a1c36b77d3b932430c1843523feb8f0d81a9dae6a399259fa9ef24a795d08500b2267b4a54f33c01f0e94c8145a4a80792074430ed220a23a7ddd1be55
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mai.tar.gz 334590 BLAKE2B d557e64b0725a268cb58bfc7d417dd2ecac361330d636ebf58b9a068ca54785c25bedd785c47a318f961ad3dbade0f921e77e8fb1ef2f3fd9e373ee473c98429 SHA512 7ab192365366a61d46478ee627591798b40fe478e12fa264a422506ffb0469def3e9e0234fa18378ea4ce5ad89433ab0e26c0968929b8bb067a77b5caeba1f8f
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mk.tar.gz 386084 BLAKE2B b907e4639522cbea862fad267fc0ead47d844289dac60733c033528bf91e0a5147aedf68ddae77ffd2c17d2110f147201aaa6ddc89847d0912557a4d55e12744 SHA512 1ca202e60144f0a9de21c0489cb5e7f1b0e684de93c659a91e38a7c1d7c9bfc87d67d5b152dfa13e53f07debb4127c4d0da64e74d1b174d2c59a74ec1bdba6ae
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ml.tar.gz 541112 BLAKE2B fa998988decdbc49026eab3ca8f008e721e6328db21535f021dee4d7474666a8baf13ff4d943cf1093203ba7fd53f891a14ba8203d2d26671f4de3a51eaef71b SHA512 e165290aa8946f4ce0b267b14054bf86e4080b4ed2f2e3dc974d1fec221ecdecbcf56cdb1782a8cee9811996527b0a25638ed36df318f15c42bbfde3c3615306
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mn.tar.gz 531440 BLAKE2B c1891078908bc3633e14b3d5d5849d27adc156f2f34698611ad9204fcb2bee44f540a95fa8ab532808a84f21bbeb4f56ee9d7167664b9ab31aab929018115557 SHA512 05ca5a5055b8fdc5a24fc070fedb68a3f032df8668ab0aca3ba8530425a52f6bec59cadaf25d7c50268d4f52c4f028a3472ee5ef472c2e4faad8b8cf97506963
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mni.tar.gz 404511 BLAKE2B 7a6a9cd287173e2c28f34a3b8b297d51f083bdb2f92ed31332ced34bea393f67c6afee69113974f89af79fc298b291ed0235c49fc4d11f41e7e342c52e512202 SHA512 8f57be18608b3df2c1a93e39ff7b382a25266ddc3bb97e82402fc822de7072f4095b238219860b6d029e288befa4a821502e59c2cfcc8d774ac1d95bdae5e57d
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mr.tar.gz 575839 BLAKE2B 48869f92997e3dae2cd2304499c938cc6c738a25fa63b7d0275ca9050c67261b841db10d5ad7cb913f2dcc4a213c3b4a3b3c60a2d3e89d8e7978851103ecef2b SHA512 70218c831692b3a83f6ef90d629c9aaf39578b528a7bb0ae7e63ab9299e19851a243d23d4d6eaac24a0cca5e78dafb36d0e5208c76c65d259e290e72178bfeb7
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_my.tar.gz 465513 BLAKE2B f712273fe8fbb7ccf43fe66b9e678bc2c4ffd3731a73283dd972a1686a4bf5beb92c7e96838c56fc04b4c864f20846686c8e1fd4767ad5896163fa25401efe64 SHA512 6032c0f1a194a0df1d9e112d791e8601aa734d9b008bad89288edda051ad16f3e4b95b148cfea7a8a23906375386a0df6bfb6f36109a2d077646df3c70830ec6
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nb.tar.gz 4107373 BLAKE2B 5665369768b5f4b874c5f9f108bc6bf738324a6799e74876b084c4cbef633b69e94ac414075bc9f8d863e3cb6e9c02b28086b5c7bc0e4b8ca596f34b17711011 SHA512 d26bcbfc25b2dc52ff559abbb4b04d85db95250cacd6eb893e44d8e359beeac5abb31a460510d969dd113720f3b4e26132c39951d478445f6b924e421cf48c15
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ne.tar.gz 845425 BLAKE2B 160491f0e87f7f2faa563e32fa4e3a39ee0c1f512104d57f62e04fa73d4b3ef82f1da756592d3589c2b1772e540cd89267d47fa90cbc6979bd6c907b6cade93d SHA512 f301c8f5d981fe611a2b9f26b52198d51054a1fa0d960ea4f2a277716c4f56866540d18dca19aa433c086516a22faba0d05aab7c55331e92e14c226384bf33cf
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nl.tar.gz 1561961 BLAKE2B bda7d521f85ff18fb9062aee4fb323f7bbea5f69ac56d89fec22531d51f66f923e3d0939a04c9767e32a4852154da2908be52b4e1f9481e0c7a4bdd4cafc9e97 SHA512 179f696fe8f9e189681620a4f48a8005987670f84d6e585fd623ce395beae83efc40cfa3b0f245e1948f6473100a43bfdc745510886cb0cfefa619120cbee7ee
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nn.tar.gz 4105951 BLAKE2B 6e076044f28ff7a6344f364944b0ad8a9f4afe9c71955d15a53c01bf52d9da18316c9bae89a3a3cfd7ca9ebded51b727d7d91dd550be4a0b4b58f8e64a86e13c SHA512 2d3a035808f9b8ea76da17d51d83a3ec8cec3f21e4d8619addc0d829a94a790738ee70dd6626ca12a1de49e1657fc6600c11c2a5cd0aa13b4aef1dbb6a312261
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nr.tar.gz 282236 BLAKE2B ce878cc147d3cbf58907cbac65989f137de5e23a7e2f42c0121422fef85f6bf3da4069a6d20698200b5bf27629d27d78658054188ff8cd6132cf0eac1f3e73a8 SHA512 dc60c642392cf1551caff543dd6f1e55bd2274ad36958fc4e3760be69702950df7eac983cda240e918d3c35cb0d42f0ff1e2422eac82846175709aa5c7bb8581
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nso.tar.gz 324568 BLAKE2B 6b44361448a4e09d3e58372163bb382794db5bb16ad16c967a701c94de077dddff732337bbd2cc2ab6b8b4f85b1965055325c03c9f7aa8ef8053be5969420b76 SHA512 d635686f7f29975c2b7c930e2efaf6376c4441ee3bb10278c9e7c85f5dd5f8d73e1a1fd324152427520b9bf8fc0496a52802ddadd52317143912239b7962daa1
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_oc.tar.gz 884671 BLAKE2B b95ca69ca6b2b09ea8cd94504dd6381e6c9d11847bac30f31920dacd66b7a22092afe07477953ab4a281bab1012b8bb3e570468f0755e423d2272a236ac4238f SHA512 f198e017771c4ec63af1ec3907185e85ad8b3f51d16cf26b4e4dfcd3dbc62a475cccfb936aef0a277860f6082fe482baa2e676096d1a8aab006a0a672c55ac10
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_om.tar.gz 372890 BLAKE2B 251e39492a5d27940623b8c081d46f34092395d7e9c25c7713ca04c0e5ade5edb840f14a989c25426bd5725a028781b195c0ad5a89cf832e120c26d6158226fb SHA512 b88b0508ac2a7e2d4c8892012d483479896864f8292aec9ccbbc035e1f1da0c4182c86c3aff9dee14c88987cfe2e512d58211f335687faea25cdc4b4c7bd4c7e
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_or.tar.gz 599425 BLAKE2B c5f191af38c97b09572195c2ede5fdf3113d969e2cccf34b46615d0f2eabf217a7f2165027e919e37f56720e420ec18d7a1976e6453395fedd17b783d28acace SHA512 02b8a7a82e39a8e5d9698ca6f4ea96769d1026504768b3829701e3cf66b19b0f9799ed88011cfc8ec95d29c7d367259194f953dab212f929988f3f56d057040e
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz 475828 BLAKE2B a5c2a5fd3678a05df51651d0ce22d2b30a7022e7452b46ec773f05091f740dc8db5719d5f8f2bc9b96c23d48dc1c83568049eaac7f96f4fc5ea111e89f26b730 SHA512 c9459a50c1d5c6694cf89e65fa511fc674ea5a187c2ca66d3897424fc1825f487f02224b272d1eeb5cebfec28113a1cf1e4e09430e7a56a7781dec69173a9a59
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_pl.tar.gz 3133919 BLAKE2B 93d4183ae1f384da0baef7614c96526306444b0927f17bf376175d75903ebdb79e28bbbad8f7deee71f48d5dacb52a48c04e1f41f7b1068689cd84f015584dfb SHA512 02c9d5ebdfbe5bd08676b8b4ee31b516e8b81741dca5cf94089fb8ffe3d8bb5bdef9fe998e8b34a8f19e5dfd773b057036b24727f8e75698b428e06f499d723d
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz 2852945 BLAKE2B 16d0cc78c9c7e18373518f55bc647ae4f0e5ac7675b620b9aded756dcccfc5ca0bab8e0080538e4e89b2c71f4f3653052c81c59b56540669784c7aa3e532edf8 SHA512 865c2ea55d26451467522b0e37bdd16187f440356d4566f4ca5090d4e819d6fc57e698001a066112bcc302b9e4ea1b32e262a5aeb2ef22e71af44bbb186e09b3
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_pt.tar.gz 2407951 BLAKE2B b79e9c2b7dd5eab1da093e21e6c75417cb4345aba495754bd71d51e98148486b4013913360825d205706475f99af6d45d2e5e9d5c7e2cdc2d623ea17cc9510b7 SHA512 d12bb24e4f52144b73207644cea2b31f92c72318cba0ace05ad1bec9dcbefc536f7cefe1769037f1123d226c443bf25d4243fe293e569fad8275616748f2a667
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ro.tar.gz 2522585 BLAKE2B d01c63bf12c26de6d14e61b90a0ca9c6e25ad77af477e3446dc285337161b6f88af9a08e1deb00ec1826c3bff6add1dc2f1dd9438a11f3b43d447e4bf6278b57 SHA512 f358705dbdf917c8ce0d9d730428d31c1dad3519f640bc4e3e0fc04920e6bc85e7d87898facab40b45182968a7b52a8fd5cef316bc52f8a9568d0136330db3fb
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ru.tar.gz 1941390 BLAKE2B ae460c6de978b691822501eff2d3eb57aee89595953695ce14f9352820b6fa28b8e36b04de0e15eee0d440664c7531d21d14174a2142dd8cf0af1f9c562bb9da SHA512 a6e2c198eff9a93c0c1eb44e49392dc4d75c32bd6ddcc24ee8fb18e949019d1396aae84f3bd849431cd85add4433e340503348b2f92ac97d916f5b5463b29b64
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_rw.tar.gz 349176 BLAKE2B fed259126cf062b7daf2f471840f16c9db738dee002cd95b2e285ae208d75d480750dcd2b3023e7f1b68ca8dff8d1ff22c9932fbf4b094e03eb014bb0fd8794a SHA512 62bd6013e2ced0718375c0d7aaca2641e1987de7f3f7298c501f87c30cd5ed1fb11f7b9e07877f1aeca5637f994b022265ef05064ab0d96d7686743cf0cf5fe3
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz 451411 BLAKE2B 93a7429483a80a1cbcbf8e24923364ad72184aa66c4ecc9997d84b164ac2939423e1458ca39da2f8870d9e470a171ade1b146aaa6cddc3945e3c41598f22525c SHA512 d17e7a914ede830a0f973efd1860fdfd46e0dc6fe8e34067817406f335b344847de3652917c95bd697607e7d0348a14e0a5f245e5763451d960a6fd7cac3892e
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sat.tar.gz 521555 BLAKE2B 87c346afef7b4fb009e47dca369ea53795f9fdcab8187a6f0a1ad26f1c25c83cd6fb9cde44663e18684b802f7633740e73f3315fff35a1711c3a8095266f6d25 SHA512 f6d557278edf9ba72054f03332399fe0aef27d1e1c656f86f6eada3e2fa8acd0a48b5e4a4ecbbff7ad46b84c1bd6fd2169b4a96c1d34a527f26e4d986cddd7a6
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sd.tar.gz 438553 BLAKE2B 888ac02c1a5ce794c46e336eb851266625efe1aa7b03a32648dffe6439c9f0e46b287318cf658e182412dc5b9dbe05383f2c63527bcdb35284b2b06140556e0e SHA512 5e42c70dbb099530a250c2dc5e2e9fb05eed68c21cd203ec17c0b501c9067e6840366d13307c7f5b3d87a37d7ee12d4ef18c3e6261bedd0e1062c8fbf8a926cd
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_si.tar.gz 738708 BLAKE2B b86981aa994c42a2daa2f2fe244077c128163bd978f56a589ebff55c08a6130ae272f7f443ed0844ff48734599f312f79a1250428483ae900b9448818ea78f45 SHA512 80968795f192eb8495bf0b4609004797bb942621ac8ffbaeed1ee9b46cd6fcf1379ff3e3eae8a733bfc398211c5c7a2929c8c8c23a490f22a5ad016d758a6540
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sid.tar.gz 451384 BLAKE2B 28338b0cc14b1c3fd5ab8b907799d5f27802fc8d387a91ce1976f60116c11d2662dc2c86e8de9f9a194b91ef6bf5c9fa375c4a0c9bbd28bf51089b6665914afa SHA512 83811038c342c11d3c035626ca1001e7eea678fe2bb34b3de1c49c66067411abd3f29184b3fc68b535330267bbea07361010dc1fc0539e64fbf1f19b80d7178d
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sk.tar.gz 2049744 BLAKE2B 9c7a6d62036dc9436c0a3428276cce28013262daff07338ed24c625a86b919037ec3001e2bd2a81a780e4ebd7a392d844568758f2677186c7fcb654a33c17868 SHA512 5f52f0764488426784b80b252fa0a94839ac4133dd324a22523385697efd56618b37ce0d31669cba0260d5451ecdab423e39086e8062c6662a932a9f1d5d193e
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sl.tar.gz 2500684 BLAKE2B d958cb53b02e4ee4d9cf12c0f6a669580c65c971bd905f5997bb748f8a288ef148c96f0a1135b86caeaf37f76bc587aeab97f868b136ad73c8d1e1f475740682 SHA512 1918fb985c1aa0812d3166e047f77995b45d2b76255fceddc2bb4970dab34652bb832ab859712602befdb0da63ad03e6f7f656d13904badba05be7c56aae4fab
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sq.tar.gz 1175448 BLAKE2B 39813dbdb682e66b0a3f8dd62e3feb13bde54f68b50ac73474426271669924ce873e071e930e8ea132053f1dc7e6e8ce6b9914b6e3374ec8004e41aab535ae84 SHA512 26d8b089ac28ede7899d576c4ca6cc33490ca8c1da212c9d69a0eb8ddcc8c5c5ff4ed755d38ffecab5e24858e2c652574f329c09a893d1ce63a50c1c05ddeebd
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz 2408994 BLAKE2B 023c4183a7e21d044e92074fd697fe9bcd432368c4b9b3bb268b4ff2d2b1cd98379e0e6ae3e789a49ae85788326301df71c01d68d63bdbd2849c9a5ae68ca951 SHA512 b3d4055e458a91564a2647f9fa916cf70cc4a80f0ebba7d088f7002d185910d793772cd11f730c1a38f680697d28717885bbf1e60a91146505734ff6cccca1c1
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sr.tar.gz 2471789 BLAKE2B 1689427c926ae85b5705bf62fdcfc556952b766ffcdb5318d5585e77a8d69a8813d38ee19942842b142d8f1fabc10f5e4780eb8c572cefc0cdfc46a8b5516b8e SHA512 b8ecd3df2e818a8d702df49139d6ee0f12966d4b5e1443a35f037cd6701ca347952cce10ed04c5a0bbba1cf476eee18861d878b83ff9e57bedb850a1189e65b5
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ss.tar.gz 289688 BLAKE2B fe7038bda09b0db62fb2ce3d3d8f658ee2e5ce21f97c86ee04a169e26dbd5a8874394ee581d14002041b65b513858dafdca0a94513fe1a95e418343aeb4ef7eb SHA512 a5283b58214cef630ea38642b9051e85f0efb061012a101c677fa5690d87f7ba00330888a4c839857d39f9b3d5ce105e82221a6af847d1c49b31cc3e2b5039ad
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_st.tar.gz 283359 BLAKE2B 4279222721695c892284d265e33cb61c1d3f6795fbc93e45c9c867db9f800adac02f0bd3526c1bc13bf2370dbd0147d92595717fcd489ef60944e874101ea722 SHA512 1da8a975318247521f0155d06bee5a147049bdd1d8528ff9bf2ac7c87cf250e00cf7645734148822888b5bb1d63063a31bc55079a24af27d418978f8cd1df1e1
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sv.tar.gz 2637161 BLAKE2B fe5f3c80b459cb4a2bdb02e1fdc3c31aa86fd3530f0478781f30998d5c3301d7c39d0eafedf0d52c0bfb3db9afc98a9d344f90e98322d47a38755b63c58cbebf SHA512 9a9e4ad7d6fa408fce2f6850462989db5ec674c42635bc35fea3eb2ae450b1a5f4dbaa9d338e80f10d5a7f3b707ecbe3d02db35f73a47d7524689bfd1b9a2414
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz 321827 BLAKE2B 3badc0f8b9858fe741bd040eb69a35cc9e9825af02ddbf899ec188e530768472d5a60101f13f10793d97afb2c070cd57e6f5ae0d8d2fe6e210bae96ec4c283db SHA512 b2775583856ee9b0965d2664cf57fd256515c52a4be87b873812e36c644febf356fcd95fa2956092d8b5e69fec8274d149f96abc1a0a8388ae7f0d248f96951d
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ta.tar.gz 680427 BLAKE2B 3ea58f008b4cf96e1f5d36cd4c177430762314ae9796a72db7056a0f0afa392361863436a0b2e2cbb3c622f833ad2c20cb29d594bcab8b0a6f7e77d3be1c2970 SHA512 e434007a89d8747d6a2a45c5ed069f3a79538336f7d09bbb3500332e308a726335f7166818abd34ed3d42861fa2fd93198bcce20acc1ff5ff9b072d8eec4d91a
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_te.tar.gz 1085827 BLAKE2B f4d211aa46fb45382bbccf5572d32f236b02d349339b6d535db7548b8396484c24de13b777982646dd5692e5198150d7f056731e5d4d2788a1e9014ec10113cd SHA512 2dafcbd9a2577676b56186d8e9838e42c7aac16fc337a126d3617e01e3aa533ef799ebaaae9f6796d832ae7f0f0c9d3d762b5c0a2434e76cb613718db78630ba
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_tg.tar.gz 360841 BLAKE2B 0ed3dbe14281705eea78a58175f5c81e29f64b7263f50c2a7d0e03a05b1075a07a7d75871cf2ecf4eaf202cd6739c2320f307ef59469a5259ee3f7674a0fda42 SHA512 9acd1869de192715d3451ddec99a1e82111d6006a9c8c4dad9cf8549aa3155785184c9a7418b444f8182938caf700c1847e3eea9eb16ffd7fb4d30781d77da1b
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_th.tar.gz 746983 BLAKE2B f529235b3b89d278fe3065c2c23b1edae702582760cb76bcfe98f1dced2b74109414a1dbf72a45b86dbc61f8b0ffedac140ccd0789fcb575e3a83f5a3cfcc775 SHA512 1d00516ac58f811dd2fe6bdda99446edd397b109d962f6870fee740ce04e715b3ce8e5570306a42f902436bd72a3eac7f8bd8a9d273b9f02ea63c0d15e682214
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_tn.tar.gz 263852 BLAKE2B 58fb63aab98a347c5f0a0073bac4bc02c6cf3fb8638c219515c953a836c307df9b065b2b4e0c1b7cc5e0502d7776afb407a252c31ba91f63ea90d1fd56db9687 SHA512 eaaeb728fd62ae261c4c1baae405505bfcf6e8684edc52baf6a0f9123f03d9fa7be365a895d7074190c3b2b26aca3aa94a71e3a224aeb563f9553f6e04e1e8ea
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_tr.tar.gz 781343 BLAKE2B c9a289786f8fc809c51f281ec7e80ce1a6b60f821785b291878882183295fec529731618f9d7160a0322721ac4a1d10cb182aec46a0d29dc37e78302b8d138e2 SHA512 e165b741df089886431dcf90e7f94758c0c72df5d2141d9951064bb5c5d1cc9d528d837cc47aa43eb34b96d13a3b4fd0dcb8aa8a4f3297efbe2784d2eda39310
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ts.tar.gz 281965 BLAKE2B 97ed5d3359e0e5d4b7ab0743ea6c075d3f8dbb7003cf7f7c6764270637f4271f73c30bf53c2c017ab1887532a1b29ab3cc1a2c0d0d6683cf7a87bb0b040fba7f SHA512 bdb0e3a15af06b6f2910da8ed1098ae83ac53d503c8c63e9a8637d8bdfecc8589560c8dd271c3ddaf3b4bbd5006a175ff882d869c999ade5f945a66256c94baf
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_tt.tar.gz 188291 BLAKE2B 2f6abaae832d295f3da61f410fdd773fd212198028056443f6bfd142a7257868f5518eb189acbb9874980672f52699f55cfc2499a0735a6f552a504166b944a1 SHA512 221739f9d35ecb5c77d73e049ef16644867eda55edf573cbb6fba36de47f32338463092777f03ca004af42d02e69a2304f10260206d52a0e0da205f8d8195132
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ug.tar.gz 547441 BLAKE2B d4f7a7e5a0fd0ebcd9e8c5e22329a8c5c57b8d9d392d9d780ec2d847fea45c963c45f54249fb49d358e1ca7039d1fdbbcc0753c333e8e3f63e0df5d5cb7bcb48 SHA512 d594df7cf4080916111d92a2504dab7a0ecd2d79f6b02f54ce7fcac812721ecb8355a1f81db4a6893de9d50b711fb988cbde8dd95a80bb7102841da05f9f50cf
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_uk.tar.gz 1655092 BLAKE2B 401347c8391e213b257218288831202475804cf1c22170ea4b9c50e5f061e6345de5471f310547a616df2e91e46fc427c15fe8259113890c6b968365154d015b SHA512 314a2b1ad894860e0ba80465e4d384473d45328cc38ac14dc23cda48f0215da160efcbc43806ee01e8df3d8d4e43773c3c862113e55a55eed742ea5c4a46df2e
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_uz.tar.gz 317091 BLAKE2B d4db88bfa1765ff0dec367dc35fd05938cc38f5d4ce6ac3a080cabf97dbaf8b5ff53c1edef4984dfcaa49dccbfbd775da6891541e58d486437398cd68a91099d SHA512 1a2917e5c85046181d1013ef4fa94631f044a16dceebef8f72374534f25f93b96e438bd56fe06c14191856bfece185c02885f961e55a4f9dcbf7aa67a5cbeb62
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ve.tar.gz 286292 BLAKE2B 2794ab904bc08f67164b8119e8fb0b6befbedf53825698b663c5f96a016b939ed1763cf3bf8fb801635d6bb6e067744126b05477be8fe0800fa33ecf1d89ab0a SHA512 b0719a25587f2460e9987b6812d8997d1cf11a1b3c68f6ec1cfbd9eddd0b532f370ddf141296099b6d77672352e0a47ee123d3eaaa8f8b056e118fad4462fe7d
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_vi.tar.gz 459744 BLAKE2B be456df7da1e21dc72ec2188629ba957f6107129fe0b22fdbdceafed67190b8e3bb98413552a54d0de0c54f963dcdf9b4ba6e962eb2612fbe1a0259428933575 SHA512 f036b40e09a985610b5f86772e5910d677b9e5fabe9c65008019325665f761f32e13dcdbf3e3cfadbfe55fbd9ecb18b22b2d4951e84b8eab14e5ec32c0625d7c
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_xh.tar.gz 292841 BLAKE2B de54353be8a61bb0b1a54fc1c8f994d92a2b5da3037ef2b4ae2eac61f48d8bdcbeebada69fe9ceb4e63cbb542ff2cb18ad0a22ea7510df2e7f46de479d5dacde SHA512 6325c59a4bcf0032c3fac1d70011a11726500903bb30abf59619c8ffdaefa5841c79ccdc9173ad5d00524392b547ac9043d7f4c5631e6a23eb0bea31521aa671
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz 844811 BLAKE2B ff9efb6ce3208c52f9c4157de8541f3ac660ef95da1bc635625e7ec4912dd896cabf94254409a3b18e973ab75af69001e2e48f78ab151dffdcd93704ffa6f26e SHA512 2fc8de8aabeb91aa41baddc17bc4f8c257ca37e82a6d2f9df95fdb4ab6a6b732489159975614df0daad9d09a7dd33ad4e97471b22801b85812cb14d9e6465243
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz 845987 BLAKE2B 0d99b01aef5dd828d2cfb23c52527313de15fbd9aa197d3351977fa571b966bdef5a3b06f7d86625d7bb4ff8987ebf23a73449e645ec125e924307a7031928fc SHA512 a1b6d235bb9e0e85d80a5b4a993520a94180abc78b11f26062746903302d2561ca67cd63441b88472cd85038fa132eaa6f0533edb47768e0e7df0deef05fdc05
+DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_zu.tar.gz 323261 BLAKE2B 6d77026a0f011c371b5b42572a7a2cc3ef6be22492b138baf29735a287939bf76f159a37898d687f60b8b9387a89f9ce6de33a14b75b83f71b16219ca24df6d1 SHA512 11313d12673754c8ec70b3dc1537d8737b5a8dd9da81389163d6d3f1d59d359f261697e1ba7d259d49723caad8fcba7638a3ff7ccff3d7efabc455f12ed787c4
 EBUILD libreoffice-l10n-6.4.3.2.ebuild 3666 BLAKE2B a92cc04049b2c291c0d9d9ab1b2de57aa3d183ec7b6c17a49b5852367380620f730f02b30a0472d5e6514e73efd181cfd4e26cc8f6dd18b9e25bb277ce008b37 SHA512 c9cb96aeb7fc40138b78beb3865f441df3ed644d594ee25790412eb952c5d3ee0ac3507a3fa7f5f5a2c7ae4134aa5a5a70af94d71c42c4309e6a015a8bf2fc4c
 EBUILD libreoffice-l10n-6.4.4.2.ebuild 3668 BLAKE2B fbc125fad00192ac341515af6db62649fc5f7db51253c7d45f7737e62a9510f180dfc56a5963b1ed73ddc9ad062a6d764e4400ed6a9c3b0811c3f65ed0e31ea0 SHA512 59a3ff2a3c756a28e22af165267215ff9a7ea23fd68639a87cd04fd7e6afc9e0789b54c907506bf5251ef3b4249c91b77c22f12e59b8af03af5771f3f5496a08
+EBUILD libreoffice-l10n-6.4.5.2.ebuild 3681 BLAKE2B 9af02d7638bde79e883d285bf0f806e713108c6a5e64d745cf20784beac8e11e64210f6f88ad7d584794e3b29d7f3c1879cb8efea6048181ccf387369c8a306d SHA512 4d5c3d95be3f3da926fcce7f13e00397dd2ed9cb0aa7651e971e0047cd3fd664f49603a25c9d507fd9c2aa88a6fcfaaad92cabd0639531b88b45e9943389d723
 MISC metadata.xml 369 BLAKE2B 7629064f409fe8ba7f0daa435ff56eaf0870f70b45961c635119725e9a78ca40bbdf77a39e70f83a31103944f579b13db5fb07f8dc9e7ecb77491d36220370e9 SHA512 8cc7592062150a5472a5b8cf4106d0c3fd7270c7e6d0d566852bbc6670a90be2c73e6c04f085e32b41f40dd1adf9800a53a1af8df5cb297c20394c55e3df45c6
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-6.4.5.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-6.4.5.2.ebuild
new file mode 100644
index 000000000000..9c65521b06c3
--- /dev/null
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-6.4.5.2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rpm
+
+BASE_PV=$(ver_cut 1-3)
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+[[ ${PV} == *alpha* || ${PV} == *beta* ]] && PN_DEV="Dev"
+
+DESCRIPTION="Translations for the Libreoffice suite"
+HOMEPAGE="https://www.libreoffice.org"
+BASE_SRC_URI_TESTING="https://download.documentfoundation.org/${PN/-l10n/}/testing/${BASE_PV}/rpm"
+BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable/${BASE_PV}/rpm"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+KEYWORDS=""
+#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="offlinehelp"
+
+#
+# when changing the language lists, please be careful to preserve the spaces (bug 491728)
+#
+# "en:en-US" for mapping from Gentoo "en" to upstream "en-US" etc.
+LANGUAGES_HELP=" am ast bg bn-IN bn bo bs ca-valencia ca cs da de dz el en-GB en:en-US en-ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt-BR pt ru si sk sl sq sv tg tr ug uk vi zh-CN zh-TW "
+LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr-Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa:pa-IN ro rw sa:sa-IN sat sd sid sr-Latn sr ss st sw-TZ ta te th tn ts tt uz ve xh zu "
+
+for lang in ${LANGUAGES_HELP}; do
+	helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86_64/LibreOffice${PN_DEV}_${BASE_PV}_Linux_x86-64_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86-64_rpm_helppack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86_64/LibreOffice${PN_DEV}_${MY_PV}_Linux_x86-64_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86-64_rpm_helppack_${lang#*:}.tar.gz )"
+	SRC_URI+=" l10n_${lang%:*}? ( ${helppack} )"
+done
+for lang in ${LANGUAGES}; do
+	if [[ ${lang%:*} != en ]]; then
+		langpack="${BASE_SRC_URI_STABLE}/x86_64/LibreOffice${PN_DEV}_${BASE_PV}_Linux_x86-64_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86-64_rpm_langpack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86_64/LibreOffice${PN_DEV}_${MY_PV}_Linux_x86-64_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86-64_rpm_langpack_${lang#*:}.tar.gz"
+		SRC_URI+=" l10n_${lang%:*}? ( ${langpack} )"
+	fi
+	IUSE+=" l10n_${lang%:*}"
+done
+unset lang helppack langpack
+
+RDEPEND+="app-text/hunspell"
+
+RESTRICT="strip"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	local lang dir rpmdir
+
+	# First remove dictionaries, we want to use system ones.
+	find "${S}" -name *dict*.rpm -delete || die "Failed to remove dictionaries"
+
+	for lang in ${LANGUAGES}; do
+		# break away if not enabled
+		use l10n_${lang%:*} || continue
+
+		dir=${lang#*:}
+
+		# for english we provide just helppack, as translation is always there
+		if [[ ${lang%:*} != en ]]; then
+			rpmdir="LibreOffice_${MY_PV}_Linux_x86-64_rpm_langpack_${dir}/RPMS/"
+			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
+			rpm_unpack ./${rpmdir}/*.rpm
+		fi
+		if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then
+			rpmdir="LibreOffice_${MY_PV}_Linux_x86-64_rpm_helppack_${dir}/RPMS/"
+			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
+			rpm_unpack ./${rpmdir}/*.rpm
+		fi
+	done
+}
+
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	local dir="${S}"/opt/${PN/-l10n/}$(ver_cut 1-2)/
+	# Condition required for people who do not install anything e.g. no l10n
+	# or just english with no offlinehelp.
+	if [[ -d "${dir}" ]] ; then
+		insinto /usr/$(get_libdir)/${PN/-l10n/}/
+		doins -r "${dir}"/*
+	fi
+	# remove extensions that are in l10n for some weird reason
+	rm -rf "${ED}"/usr/$(get_libdir)/${PN/-l10n/}/share/extensions/ || \
+		die "Failed to remove extensions"
+}
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 575e788cd8a9..07a7f2a801a6 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -24,12 +24,15 @@ DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a3
 DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
 DIST libreoffice-6.4.3.2.tar.xz 230409812 BLAKE2B f9cdad1540c45525bd70596dc3033e3466fcdf3d96547222b936141e49ff6d45581ca59d0e42c4bb79fcb63586d748ccafae712369e024105235e2a9b69be7ce SHA512 ee11c704fa7184ffe371aa36c835c4c7fb06ef03d08fa0a5a9e647e80610db275e091d1ac79c1fe11af0c7f14dd72c821da9e7e6ba59573fc88cec79f84c873a
 DIST libreoffice-6.4.4.2.tar.xz 231325236 BLAKE2B 25e1c765cb0ff9c195ca46a9fe857eef22ab6319da6b069e2c5c093a8f13eac2e1c5efa31fbacd4e3acbdc07e75745ff5c62c180cb61141319422720405a4638 SHA512 8e2b6a2d34fbc182ce4ec0b6d6bfb30665ff5cee0a27a22551c71d4eddf63b812d676ea8dea9a2e4bb028a2365b5e23908679efbe4696032e1abeedecb85b8d3
+DIST libreoffice-6.4.5.2.tar.xz 236255044 BLAKE2B a83ad0c50d1b7e686188c35c5f319b73e7984ad214e125102824789d1f56083a4ed8795cf7d8942fc0b3ddf3cad13f326225812458007a97a166bc5543c47eda SHA512 f0a5ac37b9c8e46bfd50bf9137d193a83d55d8d451c5b27d86b7f257633e861eb79422e1e64f7c462ae4a9045e00827beed302ab6f0773f8864c03bb11d3b752
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-6.4.3.2.tar.xz 88297704 BLAKE2B bbd1af159c8b8db1909335f37095812ec3ce81d73644a30a85f3e37daeabeb9a158451b8e586f24d4b7544c8cd0948eeb20ede464384c3277d196f33322e63fb SHA512 9f8c1bcde27d153389d124af1393d0939262c85a1624f0b475a5515b5737612cb607d04742a069534771eee51ba98896926804ec7001d6bc2110dccdd6e7615a
 DIST libreoffice-help-6.4.4.2.tar.xz 88296340 BLAKE2B 73ef558b830e0e2899eb72727e0eb81327807ff2d474c8d956700a09bcadc73cbff26688063f91d3a496afa55ab9a7d4847d84334b89fe4fafe17fb445fbb33d SHA512 7084428e63a458c4e35c135b16dd980fa98695be0ba974cac656a7ef6cb15b059a082891c3f74b72a62f92549afefe46c14ab30b5491fd9e3fea6d5923720b3d
+DIST libreoffice-help-6.4.5.2.tar.xz 88376816 BLAKE2B 8c5f8a3379dd77f41e3350314fa250ede503d998afda3cb2c8c95a4dd3b565bd6d0004b4dd7ff7b079fdb4de766fa105a8dbbd49b5ced5587e5a716aba31ba26 SHA512 fffa5338baa5ebd7bdf607f83b31440c66c19c42136b41505074fe1a7a4bb1630e080e4fc2dd114f8ab0654507f4a84d4190bb134a4756d895ec350cccc10e11
 DIST skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz 8218672 BLAKE2B cfeb805d82ce1f5dd70c7365983fa8107d5ccda9409b2654c032115cdf8a1c32fa0451162b0cceec3dcc0054e3d0d0e13583ea93843b0d0a6eb948cc31c15ce0 SHA512 1018fc1cc8a7edc15745cc20791f9a22e5b318018ba619d6cb5b6995d3e81ab93c910bb3a42734872d3be54893c2ce7db507b2c61088660b2ce6630ff9b36ebb
 EBUILD libreoffice-6.4.3.2.ebuild 15773 BLAKE2B 58373db2eb7ec7afe91cdb5cfa9632cedb8ff375ff07474aaffcbbe3c6ce150644d7d49639bfff3c2c8aa1eaa689e1ee3ac5348d8e1272bc0232d8a0a92eaf2a SHA512 15b27b4dbf1e4ba5938e506eca8265a717dd660046be6bdee4e06f8188fb9d51a9483b3b4149734419b9c6528405b47acf5f9c86e0ddec457ddad15e653adeee
 EBUILD libreoffice-6.4.4.2.ebuild 15803 BLAKE2B 01d2996181c7b6b8dbe08ca568fe8998015aedca2e66b554212865eef400a99b0b76dd694031c9f0369b846bba2c955ef7e8a836d936fa36f92f4233c4d48335 SHA512 ea3795d62c5d18bc4259dd40f454b0a1020ccc5e093f809a5b34f8886c4c1c8aac19b79682c43fa8b7fe56fcc8df76ec8795ca17c7c9273748cf700cd6a25867
+EBUILD libreoffice-6.4.5.2.ebuild 16586 BLAKE2B a8a7d63d254ff75804362dc9c78564c0d931cefe0a4b5230644d1bf26a60f2994ee26a3cb4cd8e7e71bec4f91c5cd0ee940fb5203bf565b536f03098bff28886 SHA512 294eb37885209a78b7c6647b7117d7dc5a0711fe557066ee1ddbfcd7b0c952dfd25533d242f6b9fc62f9059e5617fc793febcf9c9f92fb8b914454e279855036
 EBUILD libreoffice-6.4.9999.ebuild 16499 BLAKE2B 9e8d530dd8e39d33e0912442012c9ec8cf1ffba8b6284ad09812fc76b6f22c8c0daafae9274167aee9f73a88be550aa52c0eb69950d525dc6a4eba0fe01a7ee7 SHA512 ee1dd9f1b844f8f546f321ae5307c4c077b7f1a383cf2002afbe7893dff08fba52f80d2bd18a9c020d7a884b59546114ff8600fa0dd6e43f6219a46bdf06b4a0
 EBUILD libreoffice-9999.ebuild 16713 BLAKE2B 2e327cfac337d2182052ae46d0759f0fc252aa404f2f0c7c39d380d0410ace457b131e828e92fb85ca4639747234a7406ee76e54f770defa7682d10fe3cb7a12 SHA512 5ba0132582197dbace16f978bacf9e2da6355b6211beee8ac5e27469720919019da377d7c75b12c5eb8b12f6bcad72359f4a402b508521986140742d52c25ec9
 MISC metadata.xml 1065 BLAKE2B 3ff11b03c5ab432a25d91b6e727f964c82fb31f23663669dbe5f85e2b425bb99ee3d7dd2f2fe3fe95063e0403bb4561487566e213125e861711ef79912747980 SHA512 da4cf59feab680dbcfa9a3e4f7760315c9f99aaff105b9712304c64e2ae3b7c2535f96c3cfb8e9b08124b59e55b460c831a0e116d6ec5bd670cecdfc85323b18
diff --git a/app-office/libreoffice/libreoffice-6.4.5.2.ebuild b/app-office/libreoffice/libreoffice-6.4.5.2.ebuild
new file mode 100644
index 000000000000..8d83fe8214b2
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.4.5.2.ebuild
@@ -0,0 +1,566 @@
+# 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=(
+	# QR code generating library for >=libreoffice-6.4
+	"${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
+	"base? (
+		${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+		${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+		${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+		${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+		${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+		${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+		${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+		${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+		${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+		${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+		${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+		${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+	)"
+	"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 base bluetooth +branding coinmp +cups +dbus debug eds firebird
+googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	base? ( firebird java )
+	bluetooth? ( dbus )
+	gtk? ( 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=""
+#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-1.72.0:=[nls]
+	dev-libs/expat
+	dev-libs/hyphen
+	dev-libs/icu:=
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+	>=dev-libs/liborcus-0.15.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[X] )
+	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] )
+"
+# 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/1.5
+	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
+	)
+"
+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.8 )
+	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"
+
+	# git master
+	"${FILESDIR}/${PN}-6.4.3.2-boost-1.73.patch" # bug 721806
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+	CHECKREQS_MEMORY="512M"
+	if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		CHECKREQS_DISK_BUILD="22G"
+	else
+		CHECKREQS_DISK_BUILD="6G"
+	fi
+	check-reqs_$1
+}
+
+pkg_pretend() {
+	use base ||
+		ewarn "If you plan to use Base application you must enable USE base."
+	use java ||
+		ewarn "Without USE java, several wizards are not going to be available."
+
+	[[ ${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
+	# --without-system-qrencode: has no real build system and LO is the only user
+	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-epm
+		--disable-fetch-external
+		--disable-gtk3-kde5
+		--disable-online-update
+		--disable-openssl
+		--disable-pdfium
+		--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-jfreereport
+		--without-system_apache_commons
+		--without-system-sane
+		--without-system-qrcodegen
+		$(use_enable base report-builder)
+		$(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 kde kf5)
+		$(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
+	emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+	# 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-portage/Manifest.gz b/app-portage/Manifest.gz
index d4cee25013ef..2172decbfc67 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/fquery/Manifest b/app-portage/fquery/Manifest
index 3b428e41b3c8..74283d4a8d13 100644
--- a/app-portage/fquery/Manifest
+++ b/app-portage/fquery/Manifest
@@ -1,5 +1,3 @@
-DIST fquery-0.2.2.tar.gz 14489 BLAKE2B 091c7893b835c41f071bfbd1d516b7e92aee57c67ddc3a31062e346a51002d1e235d4b35278a0d5e087c69ba1482210110a08dc7f020390a5b94304eff4aafdc SHA512 d8560a043a3e9d489232427c5911b650cca932cda1c2185c881834c8fd54d316bc650bf4d187da53cd9785adf17381e1cb7cddaf21e73d89f7854cbb33738587
 DIST fquery-0.2.3.tar.gz 14511 BLAKE2B ccc0162095cf270320c1e7a27ef6f19902ddc591ea04742b9645bbb80e67132d85c3f182d1f7fd536a819e96b64abc734b42728faf46a0f2ab01943f660705ee SHA512 0dc345b189bd18f5f1084ab2aea07390b547b6c663d03fa9cec968e5cef598fe58b6a294845ca12b020c78ff2a01ce7e5da0bb06a513c53b8b5aa357b071fb88
-EBUILD fquery-0.2.2.ebuild 589 BLAKE2B d267ee6f8d5086fac0b66c9498d674a12991a5872a6c9f80e56f72516b7638e710f31cc86bc3c680c52a76e9adc8d4da4018bed6bfb3ad681e537a9b62c710c0 SHA512 7fa67c7f57b30b750729cc8c01d207e4e54a0a622acac15b012d156e82b047f8fbc94221b595b899262545c55909cb1ced918bb0cf50fa85eabc210f85219905
 EBUILD fquery-0.2.3.ebuild 589 BLAKE2B d267ee6f8d5086fac0b66c9498d674a12991a5872a6c9f80e56f72516b7638e710f31cc86bc3c680c52a76e9adc8d4da4018bed6bfb3ad681e537a9b62c710c0 SHA512 7fa67c7f57b30b750729cc8c01d207e4e54a0a622acac15b012d156e82b047f8fbc94221b595b899262545c55909cb1ced918bb0cf50fa85eabc210f85219905
 MISC metadata.xml 290 BLAKE2B c5f2085bf717e6abb78ef95ec2221398667bd38a5bb4915ea6b89b17bb846f9b6ed47089c47b1f2c6baeab6147f8cacac9b4e913a20ac5d909432e6525863326 SHA512 89b8856e1eb7618964811ce381d36e758b17b7d3c9d364a1d715d31b4873599304c6f1883abf1f401841c760f7f7d6fa117bb1e0111702998ac79b6f08744874
diff --git a/app-portage/fquery/fquery-0.2.2.ebuild b/app-portage/fquery/fquery-0.2.2.ebuild
deleted file mode 100644
index ddd516e3ee51..000000000000
--- a/app-portage/fquery/fquery-0.2.2.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
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="Installed package query tool for Gentoo Linux"
-HOMEPAGE="http://hackage.haskell.org/package/fquery"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hashtables:=
-	dev-haskell/parsec:=
-	dev-haskell/regex-compat:=
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/app-portage/hackport/Manifest b/app-portage/hackport/Manifest
index e047af0b14b6..6881c1c992a9 100644
--- a/app-portage/hackport/Manifest
+++ b/app-portage/hackport/Manifest
@@ -1,11 +1,7 @@
 AUX hackport-0.6.3-missing-ffi.patch 911 BLAKE2B 625631a2d2179f0568fa2d6f697cc591d88ba358e334a7cf574f10568b394acc28d8bc1b7a0ab13c6ab6d2fccdda56694fdc558387f03de13feda7192703c836 SHA512 f51b403d8781a064ba3c7ae00dec8f4d65e98d59b521586f8c2ce7060bfe49df94fcc00de0d41f39df38c92db2c520d59b65884fb09e96e4de9f9c286d16aa37
 AUX hackport-0.6.3-missing-test-deps.patch 2191 BLAKE2B 16ea252c7588cb8e64fc25e489a30cff629328f1e75068c1bea4a619c71dd95802a45cfcf28750b0348164848ed018dc8d4b73d3ee9168f5fafa69f3a78db6f3 SHA512 a73c0c80dd7081ead18d64664fbfe8b41483f60de6e1df9f3403c3334f9a7af9a405b78fcc7539cf788bf2faf47649585751bff24513a88c26bbc298a280b275
 AUX hackport-0.6.3-old-filepath.patch 1305 BLAKE2B de9aa9413b6611c7c1729420cf41e123cbef72fb222fd49d91845f5c2cd6b080fecb3492799d2a382ceba9b615b617aea42d600876753b8d89885aec519db980 SHA512 77715036e58be9eaa2e0e3e28b34c85d7742a3af9d129445ee0dce6d3f12fc94b38779ee2446c5547d554f2a43de5b2241bcb056bd3939ad2e48770ad310a317
-DIST hackport-0.5.6.tar.gz 1639896 BLAKE2B 2c5892b3206b4cbb10f8dcbce1d043446b7b804ae0b5d1e59c49c733c80194e79c9091cfc933cbc7e7a592c0747ee034d56969d4261ad0a6a585259d5e8b4f76 SHA512 5dc20f11392757224a6cf79d525792e14aba64ffb44c9dd9b4f0df4acd9c00127d85f2b1f23cf2063f80895dbcc90ccc745e8f9aba3ef82f7ae8364db155fe4f
-DIST hackport-0.6.2.tar.gz 1625948 BLAKE2B 9dbb7695d3ca806cfef342697717fa232be2156bcb76c87413907460a9cea2f8cdd517dce453ae7846a00df53ab46058c8f42bd36bc33580cb32452b82c77816 SHA512 99207c4903ee5f3fdcc648edcc3a39ed06f0629a1d5bda577fc2c443c544bfd746154bc5e9de044810c148b1a38028ec0fdf908513b4252c05bb6c9c6eb9aa92
 DIST hackport-0.6.3.tar.gz 1986620 BLAKE2B 6878b3f378b1c5303047c4e6ea27edd587527bc0f303dae8947f0e2a066452b5c4cf3a13594499c3b367ff515114f43c2fa7dece935a704f0f6855fc23f14100 SHA512 ef2f2125c89352207f82e02668bfd84c9e38d5ed3f8643d19d4f270cf7440169c7e6d24513f90e7d616900a06a429e54cf01a42363ff463d536fa37700b7d1cc
-EBUILD hackport-0.5.6.ebuild 1265 BLAKE2B 14c0e4692bdfa62cb118639e681886b537354b8f02132baa69e7098ec50e03e09d8f1da81a7ce5e1255e2423907e9af6fbb1e1c08250e256ea7c1a0bb1021140 SHA512 e7367caa9ee201016caa31e56aad82066a1e34989266594c60d42dfc44d45121dcc8c79304ecc71348e4d1d6b569666091908b368fd9f0b591b2b6a1b97cd6a5
-EBUILD hackport-0.6.2.ebuild 1263 BLAKE2B 4e1bda2c18c368209c20f6df94c664efeaf0fd5fbcd0e7e02da7d8fe0048963e7714bb06e5960fecd4dd1555449a44aa8ee7ca2497973b10c45fd1b0796dca5d SHA512 45a93a427efee5fecde630f9fa35e02267b58300f17498645d8bc11de6314421c10aa597009482bd97492b194988cab5c8c888aa26f218410a704c4b5331e681
 EBUILD hackport-0.6.3.ebuild 1420 BLAKE2B deab9182864e89057f0a0a646eb0badecb723e166c988d860a37fd3acb57d7bae4a8a18ae932c3008ad4c31b3d6ff1599016cc3119794fb9ea524e6829dc433c SHA512 349ef2d5b76c3e2150bf6d84849d014ef3762ca717c363851afaa9020c9d8ea7b7617a81851ee2bb6d3e2a8538f61e838ab6dbae805183652046e9bde29872e9
 EBUILD hackport-9999.ebuild 1387 BLAKE2B f216639e69d90b1559cd6cfab740b70876e3bf987cd336d1928a6ec0237cff4e9a051342e94d597eb1293be23bc0865a9be3502d3c155d390c5c6a317d7260c8 SHA512 e97c2b38bffb404301a528e4da160c0b6456a3485e11cc4e921577026be978ab30488fbbe78c1b37e6aeee46cd5c88aab2719b3ea1caf0d8ecee2c66790b5fc0
 MISC metadata.xml 497 BLAKE2B 513f311e8507da5bc7ab496ee848d1d50459839bd7df3b318583807d4d2ab056faf8284fe4417a5a81eea35c0b51ddc18b21b77c2569143d48eecc57a66e97ad SHA512 8f4884fa20eb6a46b2007e99a6787f51a7d8f6a8cbb18b1c7f12541914f6d6959274ace8f9576529e5ab6a372d3904f54d11470e9f5d81f6ee066628e1fc2de3
diff --git a/app-portage/hackport/hackport-0.5.6.ebuild b/app-portage/hackport/hackport-0.5.6.ebuild
deleted file mode 100644
index feeb100454d4..000000000000
--- a/app-portage/hackport/hackport-0.5.6.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
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Hackage and Portage integration tool"
-HOMEPAGE="http://hackage.haskell.org/package/hackport"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # tests are broken: need path to ebuild tree
-
-RDEPEND="
-	app-portage/repoman
-	dev-haskell/async:=
-	dev-haskell/base16-bytestring:=
-	dev-haskell/base64-bytestring:=
-	dev-haskell/cryptohash:=
-	dev-haskell/ed25519:=
-	dev-haskell/extensible-exceptions:=
-	dev-haskell/hashable:=
-	>=dev-haskell/http-4000.0.3:=
-	dev-haskell/missingh:=
-	dev-haskell/mtl:=
-	>=dev-haskell/network-2.6:=
-	>=dev-haskell/network-uri-2.6:=
-	dev-haskell/old-locale:=
-	dev-haskell/old-time:=
-	dev-haskell/parsec:=
-	dev-haskell/random:=
-	dev-haskell/regex-compat:=
-	dev-haskell/split:=
-	dev-haskell/stm:=
-	>=dev-haskell/tar-0.5:=
-	>=dev-haskell/xml-1.3.7:=
-	dev-haskell/zlib:=
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hunit )
-"
-src_install() {
-	haskell-cabal_src_install
-	doman man/hackport.1
-}
diff --git a/app-portage/hackport/hackport-0.6.2.ebuild b/app-portage/hackport/hackport-0.6.2.ebuild
deleted file mode 100644
index ec10c7ce40f1..000000000000
--- a/app-portage/hackport/hackport-0.6.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Hackage and Portage integration tool"
-HOMEPAGE="http://hackage.haskell.org/package/hackport"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # tests are broken: need path to ebuild tree
-
-RDEPEND="
-	app-portage/repoman
-	dev-haskell/async:=
-	dev-haskell/base16-bytestring:=
-	dev-haskell/base64-bytestring:=
-	dev-haskell/cryptohash:=
-	dev-haskell/ed25519:=
-	dev-haskell/extensible-exceptions:=
-	dev-haskell/hashable:=
-	>=dev-haskell/http-4000.0.3:=
-	dev-haskell/missingh:=
-	dev-haskell/mtl:=
-	>=dev-haskell/network-2.6:=
-	>=dev-haskell/network-uri-2.6:=
-	dev-haskell/old-locale:=
-	dev-haskell/old-time:=
-	dev-haskell/parsec:=
-	dev-haskell/random:=
-	dev-haskell/regex-compat:=
-	dev-haskell/split:=
-	dev-haskell/stm:=
-	>=dev-haskell/tar-0.5:=
-	>=dev-haskell/xml-1.3.7:=
-	dev-haskell/zlib:=
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hunit )
-"
-src_install() {
-	haskell-cabal_src_install
-	doman man/hackport.1
-}
diff --git a/app-portage/porticron/Manifest b/app-portage/porticron/Manifest
index 165bf67ce128..0995c2dbfc3f 100644
--- a/app-portage/porticron/Manifest
+++ b/app-portage/porticron/Manifest
@@ -1,3 +1,3 @@
 DIST porticron-0.7.1.tar.gz 6530 BLAKE2B 6eec2bcab3e3d7661783c4fcf8f5521aac5700e4c642112d074187af372ea51137a7bfc06cd14c86f55e6b1414b2af766454a829c815294606a8bd18141e7c07 SHA512 ba2f365011e1ad2f7cb67d655839fa425791ab95309753719b4a4206db735f141d473d24bbb68da25a88db54919d033f53efaf497c26de71f3edb4a39dcc957c
-EBUILD porticron-0.7.1.ebuild 575 BLAKE2B 4c2e18dc7536f663d4ca95413e577de85042619aef1dacde59d1ca2fa510954e2ec89fdfe2779865374817998d958b9785da71e8717fdf4ba384ef6eba02e69e SHA512 619b91e8aed8b818ebf63eb1c5cf411a9064083b02bce5128241ce42d720dcc3d5809c80c197b77a533e9c5429efb4c8a69c8136a67e555528b3a89802e320d8
+EBUILD porticron-0.7.1.ebuild 573 BLAKE2B 608ef8b6a2ea94b6179fd330ed5c08e93b6fa059aa97d00a8ad9a6feb0beb11f4b2142b0b015330e291aacc95fcf47c47bbd4204083495822e660892f8b9087e SHA512 2ddf7297c7e438d2ac84f87d7c2dec43db94128fdb7aff4f2f646c488c2e106a0c29d0ce9c600f492ee649ddad070bae7f3b2057a9f80d7d208c2c5586f7c157
 MISC metadata.xml 253 BLAKE2B ad8e5cfca6065d748c657aa2b9d8aef6bb41bde317916762fb57b6c64ee9a08d3e085dfcd260c49df33ff3fe4dda7d0e72cfd0e99d0513a04ebdd3f9639d5346 SHA512 912bcda064b63efa5586eadc7702c84081b57478a2be9a31293c94e86b8d0e7f98344c8426a99972885981ff25efd6b705c3a3a3ab4b931f5cc56237f021aaaa
diff --git a/app-portage/porticron/porticron-0.7.1.ebuild b/app-portage/porticron/porticron-0.7.1.ebuild
index 74ceba2df79e..0dc432df2d72 100644
--- a/app-portage/porticron/porticron-0.7.1.ebuild
+++ b/app-portage/porticron/porticron-0.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/gentoo/porticron/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index d5604ef3b141..5600b6323710 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -1,10 +1,6 @@
-DIST repoman-2.3.16.tar.bz2 86739 BLAKE2B dc3e3b5e72df751cfacc17e6f5c847160438a4d6f5d86b4dd17ab8a3a69cd0502f2965934c456ea7538f228c40364535e861c489ab2a09a0df14183b111e9a38 SHA512 d0e8bee1e3bd6dd8aecb1278fc7877768552612c4638488b61a9b8856ad9cd7333c7d52f0c334925d90170a1d8af20e9ead6533edbc10cae02baec629dece121
-DIST repoman-2.3.20.tar.bz2 87313 BLAKE2B cc0ff9b651e01b12202b32d48979f42ffde6e8a7c72095a3f75228a54892bc11c521f015738443133bec223f9ca0faf5687388680ddfd19e07514f873094b0f9 SHA512 edb5564de920156fd89b4df136d86b73401d4d5cf591abc2fbbf97f0ebb7bb43ed17d076560a76a1f3269d19a64c7c52d48540134a9fb86d9fa952d1702e01e2
-DIST repoman-2.3.21.tar.bz2 87094 BLAKE2B feb972d9585440d2a5ed6800146a1d7027fde4c5e7a70904905837261776b9c09bc9bfc6c4da8248a1420635ad8443b31d7716990e6425db3403c8bb74ddca5d SHA512 537c6f6152134df4cd99321b812a1e02608ef0621e674214789dc79ca6540ff1ddab05d100e2bbc2fd0d85664cd92549fb39f8da3cf6850c1a190a88a95814e5
 DIST repoman-2.3.22.tar.bz2 87026 BLAKE2B 52262339410b95d47df19e225493075d6e9f763e85b7fa9c982c47ed88b652620d3ab083781c9e4747d8e3659795de7a05163b00339065ce5d84f8babfadc1dd SHA512 8be75f58127452ed162b0f5feac96110b82f7a06fa904c65f6084dff4c542602870cde7fde5cf4108b04142d433c1167dc5bccdf839064dbce2278ea789f77ae
-EBUILD repoman-2.3.16.ebuild 1938 BLAKE2B d9d1b277e1d47c55860fa63cc64679506a9804ff377901040b9544193b822837e9badcf226e43e14d347fe3affdb37a07725d60e770f382aaa72062795857046 SHA512 24d352d5e56a61297459450f976cbb585a6d6cbdf6b995a85443596d7f92b457d40f2c3ba162c1bdd728306668794cbd81374ced5d949fea2713fbc6a4c2ff23
-EBUILD repoman-2.3.20.ebuild 1968 BLAKE2B 73858d208a8664ade18846502077c7d612b00cd17cd4d075ef0fdba27933f1654a039b1ffb7a3812de8be6b00623e52da004bbcf6c4e91fca2899a421ded3c76 SHA512 1d1ab128783bc184c40565e27bdf9d878fdf9e8a8918c9a823b1cde4fae8b070ef39e65430de2acd7857301302c415fc7f9eaa8382667c994f833c090efa6a48
-EBUILD repoman-2.3.21.ebuild 1977 BLAKE2B 41da484879b21c481600ce57bcfbc1c64cd0561d0d67803651596d89a447c6a4b0a2053f652b0e8e3074b4c22356096d54bd5e0c9b00aadcd6e66f6d3909109f SHA512 68e092e1446425de2d01488a8257888d1487547653bce8a4a13b7ff99a01033d1307a27df2d8e55e520661a18db1993a48e7bae0db24eb4ac4f92123cb5720cb
+DIST repoman-2.3.23.tar.bz2 87108 BLAKE2B c1190433bd8aedf59e1ddf192dd14cca13e3bdae7367decd6bf64a79021f54a63f21ec49d5737b90c46be3894f4d3ff11bf5bd2868c9ebf65e44b4eb3bb4eee0 SHA512 9d01fadc5820501a9bfb9c1b6d9634ecbc14aacdc448bb440d1e37d47f7e4bcdea8269f8ba90e3783d84f31121870a9d7b165f58b78f0d0f0f4e822a25687d1b
 EBUILD repoman-2.3.22.ebuild 1968 BLAKE2B 73858d208a8664ade18846502077c7d612b00cd17cd4d075ef0fdba27933f1654a039b1ffb7a3812de8be6b00623e52da004bbcf6c4e91fca2899a421ded3c76 SHA512 1d1ab128783bc184c40565e27bdf9d878fdf9e8a8918c9a823b1cde4fae8b070ef39e65430de2acd7857301302c415fc7f9eaa8382667c994f833c090efa6a48
+EBUILD repoman-2.3.23.ebuild 1968 BLAKE2B 73858d208a8664ade18846502077c7d612b00cd17cd4d075ef0fdba27933f1654a039b1ffb7a3812de8be6b00623e52da004bbcf6c4e91fca2899a421ded3c76 SHA512 1d1ab128783bc184c40565e27bdf9d878fdf9e8a8918c9a823b1cde4fae8b070ef39e65430de2acd7857301302c415fc7f9eaa8382667c994f833c090efa6a48
 EBUILD repoman-9999.ebuild 1974 BLAKE2B 006e49015b7b252a4105f4f5f4c2bdbe2e828a44004c93a2a263be178793d245346b2eabf9688ac8c69f33066f393550aeec18fd5b1a90c52f0dac533743a503 SHA512 b568772c42fc7cd3ba1ea6daae580c3ca3c0fd5aebea530d3c47e3762f66deae9f8b4ac09a22412ec3dfb6372cc112e0851ac3d69da4649abd9d0fbc73bd5190
 MISC metadata.xml 472 BLAKE2B 7433ca0ddf5b8554caba0893b28e5681419f18e7f8d28c1c202c98b9a198ea4222958dd537247e29e2f3300ee051860315b15ca7fbd92ba2c4fe614a43171942 SHA512 53566a405056159de7412ea3b447ce6a7b73833fe927a04b5576bc77b2f4b181de8413956ff2b0b1836025352566b0a44252c2ebaf313cfea4020ea5490f3ab0
diff --git a/app-portage/repoman/repoman-2.3.16.ebuild b/app-portage/repoman/repoman-2.3.16.ebuild
deleted file mode 100644
index d142e1a16cfb..000000000000
--- a/app-portage/repoman/repoman-2.3.16.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,7} )
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
-	S="${WORKDIR}/${P}/repoman"
-else
-	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=sys-apps/portage-2.3.43[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-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" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-pkg_postinst() {
-	if [[ -z {REPLACING_VERSIONS} ]]; then
-		elog ""
-		elog "This release of repoman is from the new portage/repoman split"
-		elog "release code base."
-		elog "This new repoman code base is still being developed.  So its API's"
-		elog "are not to be considered stable and are subject to change."
-		elog "The code released has been tested and considered ready for use."
-		elog "This however does not guarantee it to be completely bug free."
-		elog "Please report any bugs you may encounter."
-		elog ""
-	fi
-}
diff --git a/app-portage/repoman/repoman-2.3.21.ebuild b/app-portage/repoman/repoman-2.3.21.ebuild
deleted file mode 100644
index 43a2b3082a48..000000000000
--- a/app-portage/repoman/repoman-2.3.21.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
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
-	S="${WORKDIR}/${P}/repoman"
-else
-	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=sys-apps/portage-2.3.80[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-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" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-pkg_postinst() {
-	if [[ -z {REPLACING_VERSIONS} ]]; then
-		elog ""
-		elog "This release of repoman is from the new portage/repoman split"
-		elog "release code base."
-		elog "This new repoman code base is still being developed.  So its API's"
-		elog "are not to be considered stable and are subject to change."
-		elog "The code released has been tested and considered ready for use."
-		elog "This however does not guarantee it to be completely bug free."
-		elog "Please report any bugs you may encounter."
-		elog ""
-	fi
-}
diff --git a/app-portage/repoman/repoman-2.3.20.ebuild b/app-portage/repoman/repoman-2.3.23.ebuild
index 9dfe116e98f2..9dfe116e98f2 100644
--- a/app-portage/repoman/repoman-2.3.20.ebuild
+++ b/app-portage/repoman/repoman-2.3.23.ebuild
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index c56abee26623..2dccf32a0002 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/hstr/Manifest b/app-shells/hstr/Manifest
index f2f2f0431b66..bf0011447303 100644
--- a/app-shells/hstr/Manifest
+++ b/app-shells/hstr/Manifest
@@ -1,7 +1,6 @@
 AUX hstr-2.0-fix-ncurses-configure.patch 2626 BLAKE2B 69fb12826fcab4f086b9e951b4e75daf84565f96c519776593d4b6f5f6d16c1745867742849b590bc29e1ab58ca1609f85a5645713da688c5e53fc22712c3c81 SHA512 65e29a8e2b5840d335d741072df44d2a36b260c24cd6e8df68b45b4bd2d6cb18e729d0b695703b95bb968dfc44c6dde28f26ab61c458444200c40862a6281a99
-AUX hstr-2.1-fix-ncurses-configure.patch 2626 BLAKE2B 69fb12826fcab4f086b9e951b4e75daf84565f96c519776593d4b6f5f6d16c1745867742849b590bc29e1ab58ca1609f85a5645713da688c5e53fc22712c3c81 SHA512 65e29a8e2b5840d335d741072df44d2a36b260c24cd6e8df68b45b4bd2d6cb18e729d0b695703b95bb968dfc44c6dde28f26ab61c458444200c40862a6281a99
 DIST hstr-2.0.tar.gz 1242802 BLAKE2B 24f1a870e6aa12b6544a38601c6bc654e01aa1a185c4f7735559aa3220ed8d9fb840e298526b9e4a177000f2ec5c08caee5da97e13783e4114bde5276ee1e85e SHA512 50d5e8e61aa853dab0093f4225d3329e98bc59609d8d59abf832cd4cb616d78a2fa091d1ad8d16f3543276c4ead95a419f33a13a96f423bf93dc648da32740b7
 DIST hstr-2.1.tar.gz 1244067 BLAKE2B aa37f26a5ba8ee465a03212cc80e55b9581e59cbb535f17fda8e59bed062f0b0065d456d8566927c089595b92270b83235f0bf73f26ac88704bd933c1926cd5b SHA512 ea217ac2b6dcb7e283f83d15524b47f88c5c8cfb82e5728537750a2ec8526f03304503a5bb67970d893e10057aba087aa86a67548aa361c892b6ee3e81903122
 EBUILD hstr-2.0.ebuild 642 BLAKE2B 83c4bdcd14bea1f873828f3856183a529144bca3876b960895b86c2c1f2bb82d66d48d9d68a541aa719c9e07f2a072ce7d77783bc32dbc2a5db89de945503140 SHA512 30d50d5190f4476969aa97af6e1af4111f91cbe457fca2b51b34c9c4ac42e24d9e68fb305cd1898c3088faa23ad581b27c03084fc306992b8af4b657304d6a07
-EBUILD hstr-2.1.ebuild 644 BLAKE2B 94d5fe5cb75e3e6c718de6b62c55456393c1ecbb2e3250c9d746000ebb048d04ab0c156c65838d15f9cd284dcb54e0f3956be7778243abf0b8f7da0886832a70 SHA512 64c8372683a3b43ce27845c0b168e99263fc6b06defc2ebd498654711c683873e9bcf9e8c2317be19a19c8f4e4ab2f4b82d9a310b7c702a3481d03676776f204
+EBUILD hstr-2.1.ebuild 649 BLAKE2B e71c9b05847367cbd4b9f2fdb2f00343a7d27b49e7e891958760876bae7daff742b357fcd384df029e3fa4d3b5e10c3a5d491ec5910b67aaaf813709ac3db890 SHA512 56b66c6985ffdce179d99e2456c95a87ff26eaebcbda4dec771786ddf5120d13381dac342c62d97f8ccb39fded57431041061bc2562150c666d570019699fa61
 MISC metadata.xml 453 BLAKE2B f0d991ae15d9b76c28a58f73be00cbb4824451019e9ef2858611681c4472c13cc4367166a130b3a313ac8ecafb859593610c52dab6c0cb7783ab079e31abeb27 SHA512 07997cef95d27c283b525f9a09d2762338c5bc8c2129904672cabf85e0d441ef7dc9b06608c0d38f0ae8d5d86e3fe8fc22bf8ebc7b29a81f8e9469436e62cf3e
diff --git a/app-shells/hstr/files/hstr-2.1-fix-ncurses-configure.patch b/app-shells/hstr/files/hstr-2.1-fix-ncurses-configure.patch
deleted file mode 100644
index 215fd5cedfc9..000000000000
--- a/app-shells/hstr/files/hstr-2.1-fix-ncurses-configure.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 1676ec8..73c8be5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -47,39 +47,33 @@ then
- fi
- 
- # PKG_CHECK_MODULES macro is NOT used to avoid confusing syntax errors in case that pkg-config is NOT installed
--AC_CHECK_LIB(ncursesw, killwchar, [],
--[
--    AC_CHECK_LIB(ncurses, killwchar, [], 
--    [
--        AC_SUBST([NCURSESW_CFLAGS])
--        AC_SUBST([NCURSESW_LIBS])
--        if pkg-config --exists ncursesw
--        then
--            AC_MSG_NOTICE([Module ncursesw found])
--            NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
--            NCURSESW_LIBS=`pkg-config --libs ncursesw`
--        else
--            if pkg-config --exists ncurses
--            then
--                AC_MSG_NOTICE([Module ncurses found])
--                NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
--                NCURSESW_LIBS=`pkg-config --libs ncurses`
--            else
--                AS_CASE([$host_os],
--                  [darwin*],
--                    [
--                      AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
--                      AC_CHECK_HEADER(curses.h)
--                    ],
--                  [
--                    AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
--                    AC_CHECK_HEADER(ncursesw/curses.h)
--                  ]
--                )
--            fi
--        fi
--    ]) # FAIL of ncurses
--]) # FAIL of ncursesw
-+AC_SUBST([NCURSESW_CFLAGS])
-+AC_SUBST([NCURSESW_LIBS])
-+if pkg-config --exists ncursesw
-+then
-+		AC_MSG_NOTICE([Module ncursesw found])
-+		NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
-+		NCURSESW_LIBS=`pkg-config --libs ncursesw`
-+else
-+		if pkg-config --exists ncurses
-+		then
-+				AC_MSG_NOTICE([Module ncurses found])
-+				NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
-+				NCURSESW_LIBS=`pkg-config --libs ncurses`
-+		else
-+				AS_CASE([$host_os],
-+					[darwin*],
-+						[
-+							AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
-+							AC_CHECK_HEADER(curses.h)
-+						],
-+					[
-+						AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
-+						AC_CHECK_HEADER(ncursesw/curses.h)
-+					]
-+				)
-+		fi
-+fi
- 
- 
- # Checks for libraries.
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 7640d21..17a82b7 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -37,4 +37,4 @@ hstr_SOURCES = 						\
- install-exec-hook:
- 	ln $(DESTDIR)$(bindir)/hstr$(EXEEXT) $(DESTDIR)$(bindir)/hh$(EXEEXT)
- 
--hstr_LDADD = $(NCURSES_LIBS)
-+hstr_LDADD = $(NCURSESW_LIBS)
diff --git a/app-shells/hstr/hstr-2.1.ebuild b/app-shells/hstr/hstr-2.1.ebuild
index f9bffba4e61d..95a0c74991ac 100644
--- a/app-shells/hstr/hstr-2.1.ebuild
+++ b/app-shells/hstr/hstr-2.1.ebuild
@@ -22,7 +22,7 @@ DEPEND="
 
 DOCS=( CONFIGURATION.md README.md )
 
-PATCHES=( ${FILESDIR}/${P}-fix-ncurses-configure.patch )
+PATCHES=( ${FILESDIR}/${PN}-2.0-fix-ncurses-configure.patch )
 
 src_prepare() {
 	default
diff --git a/app-shells/rrs/Manifest b/app-shells/rrs/Manifest
index a485c63b5072..e2cf89a221af 100644
--- a/app-shells/rrs/Manifest
+++ b/app-shells/rrs/Manifest
@@ -1,5 +1,5 @@
 AUX rrs-1.70-asneeded.patch 1436 BLAKE2B ab35e22a351024935c13433d49e9c7e1ae452b597e179810a58a9e181895d6731a81d472abd2147865ff76bd4ad338429d41eadcead229a5ce243a66b66e8c17 SHA512 05972478d2e27290a430b0d80343f25c494a9f0f82ad87df2bc400dc652775dff447d8914e367d3092db2fcb5c4700e5d5873452767943e3d0b27410bef51188
 AUX rrs-1.70-drop-old-ssl-algos.patch 2855 BLAKE2B 86194d554b477bd1efb0e2b6950cde48202224efb0e87675f4b571efd95e509a9262236a6852a2e821b20f0e25c68d4d748a2cac3c6019b972a30366076b17e7 SHA512 9b5516a32a0c824dfb52d3cee07747b1931432ed3f7db96ca5121ecef914065b024ea4bb920e9b560f344dfad5d0eb6429ed7fcaff7cf0acc05b62a9b5135b45
 DIST rrs-1.70.tar.gz 49579 BLAKE2B 0345f559239f64d51891100c11f3b80d2b41277eaa0e283c86dbd990496f083e1da60aa6937c870c133bfe8e7f905848d0da1a17b827a2bb07bd8ee1be4b36de SHA512 58a3d34bd80f2ddaa62112819d83ab2175daf1b9e66605d0b629a15d1fc6b43b482e1a4a763b99a07d85bbb0fa6df339d0dfcc203e3a3da3d5cfdabbd14a4bfa
-EBUILD rrs-1.70-r2.ebuild 763 BLAKE2B 106557e897790963e75a34d7765c10df70a1305ea40a5084d566279ee61150f33f69420bbf0f68ac90ab43344e9ac1a3a960739986bab465c2d2e492482ce5f9 SHA512 d2c90454a1dd04cd86c4143782a6a1582f57152699744fff5b49843088854ec60ff34680657e82b0b31d0bdf9db233bacc5db3524231ed1ba475a8e37008b978
+EBUILD rrs-1.70-r2.ebuild 776 BLAKE2B b2b00b21fae82ab9be96e7cc13d845ff95ec562ad46c7e64263c2ec563db57728a7bdccafb666c768b31cef46a1e8036c0fa8c696962423e05805e7412979981 SHA512 e1ec88ca60e30c912ed9f3d9620e463f371319a48be7c982614cdcbeb5caf6cc62f61dda1a34f1523613e94245ba734216787a1fdc450e480c65ca403221b205
 MISC metadata.xml 317 BLAKE2B 79bf68384cb06bb254c6bd8757a368e929ae41d5dcd793c7123ea0e336c9187c9062013fc4feeb032c18515fa865d05f1f61272555f2e137e419c23b289246e7 SHA512 b80e5e730f8ee1225f73e1c1651c9cec243f117f3b983ef0814699ba367f373ada228e1fe2b6b8f1928eeb5cd854c1a7bf07d59075607a992a4a0e0dd3482ee4
diff --git a/app-shells/rrs/rrs-1.70-r2.ebuild b/app-shells/rrs/rrs-1.70-r2.ebuild
index 50056840ca19..58f401d896ac 100644
--- a/app-shells/rrs/rrs-1.70-r2.ebuild
+++ b/app-shells/rrs/rrs-1.70-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
@@ -6,7 +6,7 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Reverse Remote Shell"
-HOMEPAGE="http://freecode.com/projects/rrs"
+HOMEPAGE="http://freshmeat.sourceforge.net/projects/rrs"
 SRC_URI="http://www.cycom.se/uploads/36/19/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index e51c26e04faa..b82900d4008d 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index a94bd67f3145..3ca5f22f58bd 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,3 +1,3 @@
 DIST ansifilter-2.16.tar.bz2 441932 BLAKE2B 7a6af4e4b78cd4c26551791b4661a6f41c397a65abe19667f049bd393af0c5e1453a3f7f5f56c7d321c41c2cf36acc05575bb866f5dbf04184de1069d6c64a20 SHA512 ef621087e6d522e08423802d223f826f2fd6fe3b2efd8ed26e09f64e666202cdcdf68d19ebe5ac4b858a4339a8aa4d5f2ba309efa310837808381e09e39d4f90
-EBUILD ansifilter-2.16.ebuild 1004 BLAKE2B f80c1c12d0e25bc8596b4432bc8c1c72129650a2377d11d57b022fe17d67a1bdf1a957121bc88b0402f94b87a23f2f12f32bdb0cbf10dfdb2fe3d98fe5955b35 SHA512 411f165414fea2f9832135a2b9702e1f9d41cf41f00968e801cff6864ca3b2a34944eec63362c6eec0815def4094b124ba79dc05538db1a53486019eb89b4d01
+EBUILD ansifilter-2.16.ebuild 1009 BLAKE2B ee7751cce471e0093badb09bf41e5369cebaf6a17542c019d06a5a37f70b5ba6ccc6d94e6d3fece85ba24b1cb8e08e0b68e4634ea018608ad5947b72842fea5d SHA512 ca385e86a7c2b698369f939498fa85fd50e03d6ac5eee42acffca46e5650b24b93c724da4fb248df3a45ec6458b968dffd1245fe04eb3440c84301e002e4a0ce
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-text/ansifilter/ansifilter-2.16.ebuild b/app-text/ansifilter/ansifilter-2.16.ebuild
index 0481ddcea6a1..d6ef6e4cc8c8 100644
--- a/app-text/ansifilter/ansifilter-2.16.ebuild
+++ b/app-text/ansifilter/ansifilter-2.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 IUSE="qt5"
 
 RDEPEND="
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index e545342fb9eb..d20c2bf7afe8 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,5 +1,5 @@
 DIST asciidoc-8.6.10_p20181016.tar.gz 576694 BLAKE2B 4d255606675346d00ab03398bf48cb30d357f9f9366944e4faf66ae4c96dafce49acdd930fc848f3dbb2d704a004bb5815d17b53416a76c8368a92e4716328b2 SHA512 801f360b0c444e932f1c50897d446de0ec3f0fb2206080b5aa6dda396fede96065f7bb629a84c8a8e40c5d8897f305fdb1877512f04ae757f3b142fd3a7305d0
 DIST asciidoc-9.0.0_rc2.tar.gz 1145229 BLAKE2B e820a957a5e03f8b28e94fb0e9514b2beebe5b08a30357b7ab70db326894270972cfee1b44c30d51dc1c4794e91a09e36acbf9e464386d9e932ac7d32e2f8e93 SHA512 61ea1eb74a2e2da76f92e32ef279f8940fa4ea77a82078e15b54c7c6f134e9d177b0425c6eb8a239cfd2dc6a6f85ad5e93883a447a3e0e92850c0898747b5ea3
-EBUILD asciidoc-8.6.10_p20181016-r1.ebuild 2619 BLAKE2B f0ae58d358cd1399aedac9776787d2a0e28261521d31b0bf6ca9fc02777469cbf5ac8d992eb51eb82a968510a1abb33dba35a24a9e9faa196acc172d60434db3 SHA512 9756d4447b3d8e77a21a182dbb865ce8ce1af6c523258aabb4b5aa7daedd49e7d446cca88654f8197d61e8b7157d2db631a1c08fdfc7f36b920d4f5cea33a183
-EBUILD asciidoc-9.0.0_rc2.ebuild 2717 BLAKE2B af40448addb4dc1cab464a8770573a63d185024a64eec0cb3c3fede736e8918e27d81896e9511b63979a3eecb44bae416011e011fa1166555f711abcd77e60d0 SHA512 cc6e444bbc783d2f4ef336c41caeab9ee76895beafc9ed72088ab6cbaa4716865245acca901500d5552e470eb5de6aae0638247e31a0c0669d902aa5d8705eba
+EBUILD asciidoc-8.6.10_p20181016-r1.ebuild 2620 BLAKE2B e29260b9b80ccd796662ea0ce4d207a66c4b99ffc371ff7ad02e38350ae9564a21c98740d4de7fb967ebb17cba1ff243e19e51e575ddcf08fa32e34549b2e255 SHA512 21e1a6e7d72d96265be242b2234faff0aa777f22895a4b051fab26be6e36c0d0b9a91463097e87c485cde39168e3ed4bc0033d9eaa164407f051db806281ad58
+EBUILD asciidoc-9.0.0_rc2.ebuild 2718 BLAKE2B 7663a75927e76607a54d7ab8d22b27feb041881cb229f66fafaff69848fbcb725ded0bed61f18252160bf323f4b448fbe0896f2ba65d260fa266672db22bdd45 SHA512 7108bca1b61ac986342c6b8f513ce4cedb6e82913078a6971fbfebea8e4917eee13bb68eb922f20feecdaa409d62b4573b12abe40ea5eacf5deea0e58f17c2d6
 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
index 8d8cc443b8dc..df890701933c 100644
--- a/app-text/asciidoc/asciidoc-8.6.10_p20181016-r1.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.10_p20181016-r1.ebuild
@@ -8,7 +8,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/"
+HOMEPAGE="https://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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/app-text/asciidoc/asciidoc-9.0.0_rc2.ebuild b/app-text/asciidoc/asciidoc-9.0.0_rc2.ebuild
index c32f51787ff6..a9c28a003493 100644
--- a/app-text/asciidoc/asciidoc-9.0.0_rc2.ebuild
+++ b/app-text/asciidoc/asciidoc-9.0.0_rc2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 inherit autotools eutils 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/"
+HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/"
 SRC_URI="https://github.com/${PN}/${PN}-py3/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index 7fb34c532e59..c4405ad6162d 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,9 +1,4 @@
-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
 DIST cherrytree-0.99.0_p20200523.tar.gz 10452221 BLAKE2B cbac9b5b1c4fc1454d229a56784a59f1622b134d640db720e496cc0f1b4f95ee097343572f33d8b0626903f58ae188e8b85065144fcad8c647732e7eddadd0b9 SHA512 4eb142368bd1d3838879669d5bf1742689b02f08f50edd51a6fa6f22fef83d0f1871147aca3c346e9fcd1193c3f494e112cdc9e10eda4b3124587f605f89cc54
-EBUILD cherrytree-0.37.0-r1.ebuild 1189 BLAKE2B 3f56b8ab0077d13fc2bdabccdb44a07cedf5de5308aee8f0a4a7122856f2341762fca3d7e8f354c19ded1387458f22f90a87dca8ef39cf22bbf5d37cc152c787 SHA512 928f4b904c7047936caa78239615895a1365a76ee3b1260e5db1cce3688ce1627438f7c5cc87f3825210b3be736a155f9be847c91c07fbc1879f7e6f1699ec80
-EBUILD cherrytree-0.38.9-r1.ebuild 1279 BLAKE2B 4eabfb8f4c185c614cd17e7310199fc6b18acae898b3c286f2e458e6a7c34c663526c059df1ea4a227ace16be5d2ce463f936cfd4671472c9e365e4b30148481 SHA512 97b0318bb9270fe1c18cf85b7330437633375f72933dae02f9918a5848bf388bd409fd8d8c639a874280341c4a739a1897cab253c8d38530db5f6482af9b688d
 EBUILD cherrytree-0.99.0_p20200523.ebuild 2084 BLAKE2B 1992fe81d385769e086f1a00b00074f156e7496b43c5bd785fe8e25cd4a9dbc0e987e417354e00af1aec7ff71b18da5bae6d9516984bcfaad16a18b8078c5f35 SHA512 1d774275218de66e367f5e1bb871691a9ada75a43376e71bfac7fc7a4f4c4b74ed460e55bd3615b695f40574fc7e7b44963e4f20b66c0bb8b5c2570dc7f1233a
 EBUILD cherrytree-9999.ebuild 2084 BLAKE2B 1992fe81d385769e086f1a00b00074f156e7496b43c5bd785fe8e25cd4a9dbc0e987e417354e00af1aec7ff71b18da5bae6d9516984bcfaad16a18b8078c5f35 SHA512 1d774275218de66e367f5e1bb871691a9ada75a43376e71bfac7fc7a4f4c4b74ed460e55bd3615b695f40574fc7e7b44963e4f20b66c0bb8b5c2570dc7f1233a
 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
deleted file mode 100644
index 1e0aa58e0412..000000000000
--- a/app-text/cherrytree/cherrytree-0.37.0-r1.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
-
-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}]
-	')"
-
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-python_prepare_all() {
-	sed -r -i \
-		-e '/\bupdate-desktop-database\b/d' \
-		setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	use nls || mydistutilsargs+=( --without-gettext )
-}
-
-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-r1.ebuild b/app-text/cherrytree/cherrytree-0.38.9-r1.ebuild
deleted file mode 100644
index 3451ffc2b7e6..000000000000
--- a/app-text/cherrytree/cherrytree-0.38.9-r1.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
-
-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/files/cherrytree-0.38.9_update_setup_py.patch b/app-text/cherrytree/files/cherrytree-0.38.9_update_setup_py.patch
deleted file mode 100644
index aad93f93a154..000000000000
--- a/app-text/cherrytree/files/cherrytree-0.38.9_update_setup_py.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur a/setup.py b/setup.py
---- a/setup.py	2019-08-17 14:23:16.000000000 +0300
-+++ b/setup.py	2019-11-17 15:33:44.243070851 +0300
-@@ -195,7 +195,7 @@
-                       ("share/mime-info", ["linux/cherrytree.mime", "linux/cherrytree.keys"]),
-                       ("share/application-registry", ["linux/cherrytree.applications"]),
-                       ("share/metainfo", ["linux/cherrytree.appdata.xml"]),
--                      ("share/man/man1", ["linux/cherrytree.1.gz"])
-+                      ("share/man/man1", ["linux/cherrytree.1"])
-                    ],
-        cmdclass={
-             'build': BuildData,
-@@ -205,4 +205,3 @@
-           },
-        distclass=CherryTreeDist
-     )
--    subprocess.call("update-desktop-database")
diff --git a/app-text/convmv/Manifest b/app-text/convmv/Manifest
index 71d216c0d17d..faf8cd79e36b 100644
--- a/app-text/convmv/Manifest
+++ b/app-text/convmv/Manifest
@@ -1,5 +1,7 @@
+AUX convmv-2.05-manpage_nocompress.patch 495 BLAKE2B e1f3b981d99cbd44aca2cac0d18165caf8be9771ba99acd3edb349225c05a7fa56e40707b234cdd1ffa0a82b5d05ed2191df00dcf7c12b45c19bcf0810fa8b4d SHA512 b57ede3b3b8982630d66ab5d21fce22b975e75941d9c2c5e4d33fd1c5ad8f9acfc893605d89bd7f11706d11f0afb3f6eb40d923fd5818a0bbbf8b93dcaccfc1a
 DIST convmv-2.04.tar.gz 30082 BLAKE2B 51521e5e44c635b72c406b6b732850e7f5e50b64d30bfd8770ca1ab49e3fd10d45447114f8adbf8b79fd381dfaf6b4782246d3e10aae471a49a52a20c8ce0405 SHA512 987411047af0b1e952cd11937c70ddd972b2e3534f4fcc6c659243dedef69af4aad90ceaa3789aec6bad6cba0999c38839451f90844b171773165b6e5899f6ac
 DIST convmv-2.05.tar.gz 30680 BLAKE2B b0d4bb14995e42e55fa34cbdaa8cb8881e48972abb296af44eebfdf76664e837b05398e0cc4e9208ddee41213bc1dd7f11c3f503e39f9a6791d08797864776a1 SHA512 7fb0d1e2b64c3105c48d8a2cbb59fa4ea23202f17abc7cbf63acfca785683f00955fdcb03517e9dd8fe01be0171458ab2583e1c52d62c6081684462b0fec4125
 EBUILD convmv-2.04.ebuild 696 BLAKE2B 4b4bcd977727970df9ad3f760e7612b4fb39f55ea60bfd30a973a21f65864ab2470ae7222ad015aaf8ac66b57b8520285e7b87d8b37be22309c7c822bc81dbba SHA512 f69f37a90cce7e27142523d2124d2708706387a0c034435972ecc4af2e8d1f80615c9b0855adb6907234a719205b61b7354fde5394cdd47438c71c7dd242ca74
+EBUILD convmv-2.05-r1.ebuild 801 BLAKE2B 3b6d6da040354faac8599cf483751f1d009fb8a00ec6f9b307b872f9327a768c9cc8040ddf011a4ca5704be991a368a9e44061693142b3da8841d1bf65c140f6 SHA512 0e828ac5896b76a7404ee3cfd16c057f1e2d03b1f68968100a4baf2bf0cd701765ff1217b90eb489d5e11fb10b2c9a7c2c47746c18292e2994a643da8a97b100
 EBUILD convmv-2.05.ebuild 712 BLAKE2B 0c338bcf39f82f15cb1e72fa53e7702a926f22890f548af0ae1aee2827ff1010dc5e809c012afab3e1a51dd4ddc4a0aed07fd0b1bb534d29c8f613b35f4a1f2c SHA512 fa5230e72fdf9e78df8c6b0e1d1c1170d96005660cedb3c829005312af4ab44ae7f9067adc8f6cdf30828b37e2cd6dbaa44731092f9540a53ab861705b57ffd5
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/app-text/convmv/convmv-2.05-r1.ebuild b/app-text/convmv/convmv-2.05-r1.ebuild
new file mode 100644
index 000000000000..3384fadada92
--- /dev/null
+++ b/app-text/convmv/convmv-2.05-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="convert filenames to utf8 or any other charset"
+HOMEPAGE="https://www.j3e.de/linux/convmv/"
+SRC_URI="https://www.j3e.de/linux/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
+BDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.05-manpage_nocompress.patch" #729544
+)
+
+src_prepare() {
+	default
+	sed -i -e "1s|#!/usr|#!${EPREFIX}/usr|" convmv || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+	dodoc CREDITS Changes TODO VERSION
+}
+
+src_test() {
+	unpack ./testsuite.tar
+
+	cd "${S}"/suite || die
+	./dotests.sh || die "Tests failed"
+}
diff --git a/app-text/convmv/files/convmv-2.05-manpage_nocompress.patch b/app-text/convmv/files/convmv-2.05-manpage_nocompress.patch
new file mode 100644
index 000000000000..02f0c41032ee
--- /dev/null
+++ b/app-text/convmv/files/convmv-2.05-manpage_nocompress.patch
@@ -0,0 +1,16 @@
+--- convmv-2.05/Makefile
++++ convmv-2.05/Makefile
+@@ -10,11 +10,11 @@
+ install: all
+ 	mkdir -p $(DESTDIR)$(MANDIR)/man1/
+ 	mkdir -p $(DESTDIR)$(PREFIX)/bin/
+-	cp convmv.1.gz $(DESTDIR)$(MANDIR)/man1/
++	cp convmv.1 $(DESTDIR)$(MANDIR)/man1/
+ 	install -m 755 convmv $(DESTDIR)$(PREFIX)/bin/
+ 
+ manpage:
+-	pod2man --section 1 --center=" " convmv | gzip > convmv.1.gz
++	pod2man --section 1 --center=" " convmv > convmv.1
+ 
+ clean:
+ 	rm -f convmv.1.gz convmv-*.tar.gz MD5sums SHA256sums .files .name
diff --git a/app-text/discount/Manifest b/app-text/discount/Manifest
index 795c80feeb75..63f3c1957d62 100644
--- a/app-text/discount/Manifest
+++ b/app-text/discount/Manifest
@@ -1,5 +1,6 @@
+AUX gethopt-undefined.patch 518 BLAKE2B aedc512451453d3e09d8572bbd3d2304947487553ba02b61b365f954b8cedd3ecc6a4ab2a5e35ef08985fbdf28d1a31894c38ad5916b83794c31c1bad37c882b SHA512 39f3eea0b1c9e1e0b4d34a09ef2aebb787088608b078c593fd02ca7ba715cf6cf114e8ae9ebc263945ebc8d9d1ef6fc00c9e749481d637a884d3ded3f7712af3
 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 1821 BLAKE2B f4a6861947e64cff3200ecddbc162543df545cc6b06fb87394c6f5a64d1637c11cafea16db2417352e33600ff6e946e5250bf0feb15c29c6cea130dee72eb663 SHA512 0a73f39f35c11fb0dc7f5321ee754516db1f24e4b1c9dbf831dd9cc3be248ede956093c1b04360b11edca04f5d33f5ee45c18537cefbe3f9ff9b5ac39cafc75f
-EBUILD discount-2.2.6.ebuild 1644 BLAKE2B cae59787e6c97ee3b5dcbffdd230e19269ae2a980350ff934aa03df176890fcf89888b53e5376ae7c428f3bcad97e091ce784afe9ed8af304e58146120fac427 SHA512 fba1613daea073dfa0da73df18721b677513ea1bf5067bbec2688c051743cb69adffca37f76422741fb11568725d55fd479991b4dcac18ac5c55443f8b68510a
+EBUILD discount-2.2.6.ebuild 1695 BLAKE2B cfbbb57f39a7da1c13a3aa259ad7cf104c5878eed9fe693e43abd0b755a218f203ed4feb25c8f226159d6ae2b3d3ff6a41a04c9c9570d81acd8a166bc278ef89 SHA512 1e15684ee950a536168ac56806138e49dc473d2f5e525dde90dd4bb7113340a6e9022f38a72690e24b852d5f1db80768f203e33b8f43410c5bf794a2878ccdcc
 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 9e5705492517..9cb5d5ea9f15 100644
--- a/app-text/discount/discount-2.2.6.ebuild
+++ b/app-text/discount/discount-2.2.6.ebuild
@@ -15,6 +15,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="minimal test"
 RESTRICT="!test? ( test )"
 
+PATCHES=( "${FILESDIR}"/gethopt-undefined.patch )
+
 src_prepare() {
 	default
 
diff --git a/app-text/discount/files/gethopt-undefined.patch b/app-text/discount/files/gethopt-undefined.patch
new file mode 100644
index 000000000000..5b081877a7a2
--- /dev/null
+++ b/app-text/discount/files/gethopt-undefined.patch
@@ -0,0 +1,12 @@
+diff -aur discount-2.2.6/Makefile.in discount-2.2.6-new/Makefile.in
+--- discount-2.2.6/Makefile.in	2019-04-16 03:28:20.000000000 +1200
++++ discount-2.2.6-new/Makefile.in	2020-06-21 07:39:32.256757588 +1200
+@@ -139,7 +139,7 @@
+ 
+ pandoc_headers.o: tools/pandoc_headers.c config.h
+ 	$(BUILD) -c -o pandoc_headers.o tools/pandoc_headers.c
+-pandoc_headers: pandoc_headers.o
++pandoc_headers: pandoc_headers.o $(MKDLIB)
+ 	$(LINK) -o pandoc_headers pandoc_headers.o $(COMMON) -lmarkdown 
+ 
+ branch.o: tools/branch.c config.h
diff --git a/app-text/djview/Manifest b/app-text/djview/Manifest
index 89ebb78cbd85..d5bbf05b098d 100644
--- a/app-text/djview/Manifest
+++ b/app-text/djview/Manifest
@@ -1,4 +1,4 @@
 AUX djview-4.10.6-hidpi.patch 2313 BLAKE2B 4d3356baa36cf830a8e01314f6fbf081c0b8fe8b6a43b2e14e4966fab2d07932088c66e1f68802282537d490503586a528c2a4b86eea26615fc8eefbf6b7d058 SHA512 922b0c321edaeed3a76ee206fa4353366e3d744dd30612d034070c251ecfca6bc18a2ddaf110cfbc811ea47426f2d9e370d5a58cce41b396b793ba27223bb881
 DIST djview-4.10.6.tar.gz 1113072 BLAKE2B db965ad7dc3b8191855e9c5f23af3cd963901ca649a937e6f85bad8f9f924e0636b30a9a5350c114dcfecea570f013ba395508eb6cf1d45afda674892bcd196e SHA512 c06b9c4c7addd9dededdc9d441094bca685c4d23744e3d1208eab33d9d341a85f120176bf9f1b879ac6620f591eefe05ac774870b1ba3215c43baf1eaf9d14f8
-EBUILD djview-4.10.6-r1.ebuild 2087 BLAKE2B 742ec6af8b08b40bf5951e79bbfcb4ac5ecd6a6f1727d57f700166e9a47d00f0c40add3c29e7fe79290fe7b4179cbdf7dd5b526936ee5e5d67bc92512867553e SHA512 b3745bd57c512a6926b90266fce1281971209bb853c4ef2ccbb4a8286f9b21977b3482381a8e69782fdf04efd45f599c2867c6ff8c61031580679a8dc9077278
+EBUILD djview-4.10.6-r2.ebuild 2043 BLAKE2B 9885dfdf080ebe6c466416f043e6f3dc27e14af98816c4ac591dcd8c31069ef4558f2afc4b59e8e1e305dcd12d935bab66f05ee611b299fc42a97e2518e44ff3 SHA512 d37aa3ade52eb1c18ade20eea3134ce4f8b3319b6dc90c8fc29a42e2e98618bdeb10f9fc8f05a2af0126bec5b156325d07bee0229017970927da29a6b39110ce
 MISC metadata.xml 323 BLAKE2B c8498cdd0e1820eb610a9e2ede4e10287977c2eb71dd1b6b9862e3d11a34760cf8dcb5e9e59535ab0ceed04f3be2b00aa4942657a25fffc87b23966c2b2c1caf SHA512 53a7a7290a2286fd31248db31160697a3b2693275013a1ea453258f9ac52fa3ea7111718ca35a5eb1652050699e5be1111c7ebb73b2a3c699383d8305509a5c4
diff --git a/app-text/djview/djview-4.10.6-r1.ebuild b/app-text/djview/djview-4.10.6-r1.ebuild
deleted file mode 100644
index 8bb483e12649..000000000000
--- a/app-text/djview/djview-4.10.6-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
-
-inherit autotools flag-o-matic nsplugins qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="Portable DjVu viewer using Qt"
-HOMEPAGE="http://djvu.sourceforge.net/djview4.html"
-SRC_URI="mirror://sourceforge/djvu/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE="debug nsplugin"
-
-RDEPEND="
-	>=app-text/djvu-3.5.22-r1
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	>=sys-devel/autoconf-2.67
-	virtual/pkgconfig
-	nsplugin? ( dev-libs/glib:2 )"
-
-DOCS=( README NEWS )
-
-PATCHES=( "${FILESDIR}/${P}-hidpi.patch" )
-
-src_prepare() {
-	default
-
-	# Force XEmbed instead of Xt-based mainloop (disable Xt autodep)
-	sed -e 's:\(ac_xt=\)yes:\1no:' -i configure* || die
-	sed 's/AC_CXX_OPTIMIZE/OPTS=;AC_SUBST(OPTS)/' -i configure.ac || die #263688
-	rm aclocal.m4 config/{libtool.m4,install-sh,ltmain.sh,lt*.m4} || die
-	AT_M4DIR="config" eautoreconf
-}
-
-src_configure() {
-	# See config/acinclude.m4
-	use debug || append-cppflags "-DNDEBUG"
-
-	QTDIR=$(qt5_get_libdir)/qt5 \
-	econf \
-		--with-x \
-		--disable-desktopfiles \
-		$(use_enable nsplugin nsdejavu)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} \
-			install
-
-	einstalldocs
-
-	insinto /usr/share/icons/hicolor/32x32/apps
-	newins desktopfiles/prebuilt-hi32-djview4.png djvulibre-djview4.png
-	insinto /usr/share/icons/hicolor/64x64/apps
-	newins desktopfiles/prebuilt-hi64-djview4.png djvulibre-djview4.png
-	insinto /usr/share/icons/hicolor/scalable/apps
-	newins desktopfiles/djview.svg djvulibre-djview4.svg
-	sed -e 's/Exec=djview4/Exec=djview/' \
-		-i desktopfiles/djvulibre-djview4.desktop || die
-	domenu desktopfiles/djvulibre-djview4.desktop
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-text/djview/djview-4.10.6-r2.ebuild b/app-text/djview/djview-4.10.6-r2.ebuild
new file mode 100644
index 000000000000..89ea0c6b9f2b
--- /dev/null
+++ b/app-text/djview/djview-4.10.6-r2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop flag-o-matic qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="Portable DjVu viewer using Qt"
+HOMEPAGE="http://djvu.sourceforge.net/djview4.html"
+SRC_URI="mirror://sourceforge/djvu/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+IUSE="debug"
+
+RDEPEND="
+	>=app-text/djvu-3.5.22-r1
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=sys-devel/autoconf-2.67
+	virtual/pkgconfig"
+
+DOCS=( README NEWS )
+
+PATCHES=( "${FILESDIR}/${P}-hidpi.patch" )
+
+src_prepare() {
+	default
+
+	# Force XEmbed instead of Xt-based mainloop (disable Xt autodep)
+	sed -e 's:\(ac_xt=\)yes:\1no:' -i configure* || die
+	sed 's/AC_CXX_OPTIMIZE/OPTS=;AC_SUBST(OPTS)/' -i configure.ac || die #263688
+	rm aclocal.m4 config/{libtool.m4,install-sh,ltmain.sh,lt*.m4} || die
+	AT_M4DIR="config" eautoreconf
+}
+
+src_configure() {
+	# See config/acinclude.m4
+	use debug || append-cppflags "-DNDEBUG"
+
+	QTDIR=$(qt5_get_libdir)/qt5 \
+	econf \
+		--with-x \
+		--disable-desktopfiles \
+		--disable-nsdejavu
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} \
+			install
+
+	einstalldocs
+
+	insinto /usr/share/icons/hicolor/32x32/apps
+	newins desktopfiles/prebuilt-hi32-djview4.png djvulibre-djview4.png
+	insinto /usr/share/icons/hicolor/64x64/apps
+	newins desktopfiles/prebuilt-hi64-djview4.png djvulibre-djview4.png
+	insinto /usr/share/icons/hicolor/scalable/apps
+	newins desktopfiles/djview.svg djvulibre-djview4.svg
+	sed -e 's/Exec=djview4/Exec=djview/' \
+		-i desktopfiles/djvulibre-djview4.desktop || die
+	domenu desktopfiles/djvulibre-djview4.desktop
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index fd9efc3b6c2e..9d249528470d 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -1,6 +1,4 @@
 AUX fix-CVE-2019-18804.patch 1130 BLAKE2B d83e7f74fca659d58731cb051aface930f1f3d0ffc737056e59323d436bfbad9b43aba5fb2c353b368a4fdbe9c257ca34ba53769e8aa2f0a42ebbd0a8d48181f SHA512 587aa61a9f9f7f845f1f0a23f59503efa7247862074096c707368316ad91aee40025d48c76a7351dc09ec1687c3902198fdbd6aa8623c4f1d8654d0c549ec4e7
 DIST djvu-3.5.27.zip 3567522 BLAKE2B c074468a2fedf097b9b8fea4c449f26b61bffb31d10114081554e59256a23315ecffc203b5223468ca0c3338118b53aba65eee4cb5e7ad5c8d55470e90f43843 SHA512 dc1cd1bce2fb6245946f9409b3a3826ef2dc77a20be079c929b17508c3d967a0b5d8acd61bad00357e46a845f7f97717a043db9ffd1fe23e9a09441b7d21cbd6
-DIST djvulibre-3.5.27.tar.gz 3648522 BLAKE2B e1907b4b64c48304ceb24360cfd451e4690d38803f22231d4e136dbe754715527fa0300c623bb709fa05bba206348257137b2a755651bb51ca26259680e142d0 SHA512 62abcaa2fe7edab536477929ba38b882453dab1a06e119a3f838b38d5c61f5d8c252e4769e6534582b826e49bcfb490513179580fab9c3afa84aa92053ccebee
-EBUILD djvu-3.5.27-r1.ebuild 1574 BLAKE2B aa47ac7501b211d0f56a90cd4d82f33d287cb575216c78f27603d7d81a7b585637ee02ba81c5e9a918421dabac9d23f338a60bec5377821ed35f750140568481 SHA512 9bcc71de91a7cb092b635fb9b6456966faa03ef25154f145307da888fb219c419e6907517280c0dc85673de5b9d7914829d3ebf505f2333156e859ac9a0bbeb1
-EBUILD djvu-3.5.27-r2.ebuild 1698 BLAKE2B a774bee0b263b3f166f98dc5b22ebcdbd37746d67ec33fc23e5172d89003be0c9d18e69f4fdab137a3b2e3c2f77b03ffe51acc18840225dde58bbd2671120b6e SHA512 d627b593fa6cf288b4fb89eb16230cf09fe6b44fc8a4d2d83c43d5250d4e4c40a35af379b3045aedc8c8ea3bc44f1eaac4ef8d20f7ecf345b5cf55907725a395
+EBUILD djvu-3.5.27-r2.ebuild 1656 BLAKE2B 1543bc005f55a9ecf74f95295a29aed25100f056da963b5ed75fcde148928ef10e4fa05830b6ad8c17d2e8bc07a0daef3baa1fddc4bc085fb343b667a8edb33a SHA512 30dbaf5409bdf414fcc53246882f6dda413dc25d1689bd489e383a05a39699b2efcaa5eb3d24ec3fc8949a169f51a3642a8552911579e34c8f4970b12c56d945
 MISC metadata.xml 948 BLAKE2B 1d15a217967f10397d747f2cc0844ea76d4f876ed0ee8cb56733b74a3b92f023e3eeff11bfcb4265766c14dad4b1e35a18f7d2fdd7442068bf82c4a8302690db SHA512 e5cfa3a2b2077a3f0dbfcc99165fb678e8c8759724790d520f1bed670fed5e753a47207bbbcd7d2ff2d55def5b34bf32201771918c9e7a16583d91553ac75e42
diff --git a/app-text/djvu/djvu-3.5.27-r1.ebuild b/app-text/djvu/djvu-3.5.27-r1.ebuild
deleted file mode 100644
index 607b51c18958..000000000000
--- a/app-text/djvu/djvu-3.5.27-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop eutils flag-o-matic xdg-utils
-
-MY_P="${PN}libre-${PV#*_p}"
-
-DESCRIPTION="DjVu viewers, encoders and utilities"
-HOMEPAGE="http://djvu.sourceforge.net/"
-SRC_URI="http://downloads.sourceforge.net/djvu/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="debug doc jpeg tiff xml"
-
-PATCHES=( "${FILESDIR}"/fix-CVE-2019-18804.patch )
-
-RDEPEND="jpeg? ( virtual/jpeg:0 )
-	tiff? ( media-libs/tiff:0= )"
-DEPEND="${RDEPEND}
-	|| ( gnome-base/librsvg media-gfx/inkscape )"
-
-S=${WORKDIR}/${MY_P%%.3}
-
-src_configure() {
-	use debug && append-cppflags "-DRUNTIME_DEBUG_ONLY"
-
-	# We install all desktop files by hand.
-	econf \
-		$(use_enable xml xmltools) \
-		$(use_with jpeg) \
-		$(use_with tiff) \
-		--disable-desktopfiles
-}
-
-DOCS=( NEWS README )
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-
-	use doc && dodoc -r doc
-
-	# Install desktop files.
-	cd desktopfiles
-	for i in {22,32,48,64}; do
-		insinto /usr/share/icons/hicolor/${i}x${i}/mimetypes
-		newins prebuilt-hi${i}-djvu.png image-vnd.djvu.png
-	done
-	insinto /usr/share/mime/packages
-	doins djvulibre-mime.xml
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	has_version app-text/djview || \
-		optfeature "For djviewer or browser plugin" app-text/djview
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-text/djvu/djvu-3.5.27-r2.ebuild b/app-text/djvu/djvu-3.5.27-r2.ebuild
index ed3eea609053..e5debec50dbb 100644
--- a/app-text/djvu/djvu-3.5.27-r2.ebuild
+++ b/app-text/djvu/djvu-3.5.27-r2.ebuild
@@ -10,11 +10,11 @@ MY_P="${PN}-${PN}libre-git-${COMMIT}"
 
 DESCRIPTION="DjVu viewers, encoders and utilities"
 HOMEPAGE="http://djvu.sourceforge.net/"
-SRC_URI="https://sourceforge.net/code-snapshots/git/d/dj/djvu/djvulibre-git.git/${MY_P}.zip -> ${P}.zip"
+SRC_URI="https://ajakk.github.io/${P}-${COMMIT}.zip -> ${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="debug doc jpeg tiff xml"
 
 RDEPEND="jpeg? ( virtual/jpeg:0 )
diff --git a/app-text/flpsed/Manifest b/app-text/flpsed/Manifest
index 19a250017638..c0748af315e7 100644
--- a/app-text/flpsed/Manifest
+++ b/app-text/flpsed/Manifest
@@ -1,4 +1,4 @@
 AUX flpsed-0.7.2-desktop.patch 247 BLAKE2B 2b1269b3c3ca1fb451db11f0a0b310ccea40612226227574dd4eab020aff348fcfd8c82f3908b253148a5e5135cd3a29a8306ac480c53e3410f19701290b79ca SHA512 b632a6b4948a12910916ef71a4710dcbabf91fdfbc302e3242d9101310101377023e58a12b24b6139d26fa37261a779db21773a8329e3f74d2e74c5cd1c6190f
 DIST flpsed-0.7.3.tar.gz 146788 BLAKE2B 5721d973b1efe02c8c014104d1ed4991dd630a8da86bc191b58df4a7ed469065e37b80248c7a7ab4946e636f869ecbfbfe457ed15a6cc7c4243642a48790ab67 SHA512 b0a8bf2ea08630d280f83f7c32b4574ba4cf7fd989943492e77d1b73c8d83c81a5df40e64bfff744b5518de845eba21119242ff752e16b20816b225ccb7c3321
-EBUILD flpsed-0.7.3.ebuild 587 BLAKE2B b80e1ecdfc2850a3bff1c645140fdeb5170696419e646590e91c201191f7d3a07df76bd107af1117e92276529df877dbd01a8c75d9edfe1734fbe20ce50ab4e4 SHA512 4a302416b5cd54eb596199f0d612600fac0294b00a0da0083d3c22cff139f901e149f294e9635fa94da5f31a4c7237e6c48d1f2216e9f9ad1606f1523decdf12
+EBUILD flpsed-0.7.3.ebuild 589 BLAKE2B ceb75d5abcb17569aeff307c9457ec35f7d8bb0386bd5fc735c9a35a46a75bc3f08c7625f9d5319c150d1824397f7284ea34dd43637078298019231a4d68c18c SHA512 69890343f5d72b20be15921a38cdc7c9294111fe0388c35c3aaeb6e75524d04065d7d43b06389e2c8e68d2fd3508860a805aa0f9a8d5b7d6ed74d10b966fe644
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/flpsed/flpsed-0.7.3.ebuild b/app-text/flpsed/flpsed-0.7.3.ebuild
index 71ddce38048f..d5c909badb01 100644
--- a/app-text/flpsed/flpsed-0.7.3.ebuild
+++ b/app-text/flpsed/flpsed-0.7.3.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 inherit desktop
 
 DESCRIPTION="Pseudo PostScript editor"
-HOMEPAGE="http://flpsed.org/flpsed.html"
-SRC_URI="http://flpsed.org/${P}.tar.gz"
+HOMEPAGE="https://flpsed.org/flpsed.html"
+SRC_URI="https://flpsed.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/grip/Manifest b/app-text/grip/Manifest
index bc06ccb2a376..0f2cb537bda5 100644
--- a/app-text/grip/Manifest
+++ b/app-text/grip/Manifest
@@ -1,5 +1,3 @@
-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 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
deleted file mode 100644
index d5e458d1fbb6..000000000000
--- a/app-text/grip/grip-4.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( pypy3 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Preview GitHub Markdown files like Readme locally before committing them"
-HOMEPAGE="https://github.com/joeyespo/grip"
-LICENSE="MIT"
-
-SLOT="0"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-KEYWORDS="~amd64"
-
-DEPEND="app-arch/unzip"
-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
-"
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index ad9c358bd492..a733ebd11e9f 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -1,6 +1,3 @@
-AUX highlight-3.42-qmake-fix.patch 1051 BLAKE2B ad9436c010cb1f9b8db5a21234ec6b80ae73bf49cd165f99638c93b251a53db4918bc1fd70260a5a9310f9d28b86b25190ec5b21cda09b7f4138c3f39dc6088d SHA512 5f74b45995b953c815c9e820fbb73693f3f28927b5785fbc86537f55d2f411f9a6b420e45a4834babda54fddf44c1640bc32cc2cd35d3ec22be07781f05108fc
-DIST highlight-3.42.tar.bz2 1294770 BLAKE2B 22c79258be6a665eda8ee17d1de6a97811f97dc4b4491c24b466dc5375d98d865e07ac4e462288d066613bef8bb5a469fa0bdb3065ecf098fc6c4f6090ecb63e SHA512 362150ee396d2b203f11ecc3d011e23b6f8c7d93ff9f8cb0e9e980be6da21e7b3b1ea1e347e3f09129ab0fb1a0aab19ff19f021e643b93a163a99d3882f9bf80
 DIST highlight-3.57.tar.bz2 1412857 BLAKE2B c0ee8189294feac3b5e8c6d356634d8074a8960f2010918de52f23515ad4a13626971e9106ecc6d2adbdb45e0ebb66ff60eb3cbe86d2449666e3424f1c0dc3a6 SHA512 a086f6b8c4a4fc0b6651d456b178350a6c59a32cd613451d81b53fe3294eb0f80d673cb64fb615ef91d6c4d4bbc8a57413aec2490d2a5ad67e695ec6e92b3d99
-EBUILD highlight-3.42-r1.ebuild 2202 BLAKE2B 0b5d44fa0a2a9075e5b55ccb8c09f80dfd6bf0f00b0df7e21ea61d620db70442cb06ae5f0890fd0ee834673975255b9131cb77fff5d316109bd876f81c40e55e SHA512 24666e1693f84bf9f3f285f2fd0130769890ebce3fd67dce262cd9411a3c5d35d5b1cd28115d38269f1811f14322d676bd07f1cc521a529206408681326bc0e4
-EBUILD highlight-3.57.ebuild 2188 BLAKE2B 849955be9504de05df9edaafc02f2af7b598c9934c257b1bf7ee9046e910e2f77e9377b2899942fd20f9fda04919d9d9a53dc5728f5e5383447156450191dfd7 SHA512 92e151a33d1eda74cfcd374af26cea251ba81793507995241ab06bbc3958ba33139d51cabda92a31291867c65d2801a5595b6cfa41f0efc34db5a9a960b5dfda
+EBUILD highlight-3.57.ebuild 2179 BLAKE2B 361a74f80a3b8d9ffca9528b15a644911712ea3da02acb6afaf354a2900302aa25d7c5484e75c8e9327d61df2a239e630cdb526ebd1a9f45a8a022852ac4ee7f SHA512 b5c3296235114c356d3abcd187a12ef00cc3ffb0f374a009da088a085b9af9e27b08b4eaa68692e37e8e34156901ba7a953cf693cf5c2a58c13ebdbead80810e
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/app-text/highlight/files/highlight-3.42-qmake-fix.patch b/app-text/highlight/files/highlight-3.42-qmake-fix.patch
deleted file mode 100644
index 31970057d9a6..000000000000
--- a/app-text/highlight/files/highlight-3.42-qmake-fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 8464afed560fa1096d37aa82aef99c00819fec87 Mon Sep 17 00:00:00 2001
-From: Chris Mayo <aklhfex@gmail.com>
-Date: Fri, 2 Mar 2018 19:15:35 +0000
-Subject: [PATCH] fix directories passed to qmake being ignored
-
-contains() matches the whole value, add regular expressions for the path
-components.
----
- src/gui-qt/highlight.pro | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/gui-qt/highlight.pro b/src/gui-qt/highlight.pro
-index bae8d7c..0380a90 100644
---- a/src/gui-qt/highlight.pro
-+++ b/src/gui-qt/highlight.pro
-@@ -43,13 +43,13 @@ unix {
-     PKGCONFIG += lua
- 
-     # to make it run within Qt Creator
--    !contains(DEFINES, DATA_DIR) {
-+    !contains(DEFINES, DATA_DIR.*) {
-         DEFINES+=DATA_DIR=\\\"/usr/share/highlight/\\\"
-     }
--    !contains(DEFINES, CONFIG_DIR) {
-+    !contains(DEFINES, CONFIG_DIR.*) {
-         DEFINES+=CONFIG_DIR=\\\"/etc/highlight/\\\"
-     }
--    !contains(DEFINES, DOC_DIR) {
-+    !contains(DEFINES, DOC_DIR.*) {
-         DEFINES+=DOC_DIR=\\\"/usr/share/doc/highlight/\\\"
-     }
- }
diff --git a/app-text/highlight/highlight-3.42-r1.ebuild b/app-text/highlight/highlight-3.42-r1.ebuild
deleted file mode 100644
index 513d088c6f28..000000000000
--- a/app-text/highlight/highlight-3.42-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
-
-inherit flag-o-matic qmake-utils toolchain-funcs
-
-DESCRIPTION="Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight"
-HOMEPAGE="http://www.andre-simon.de/"
-SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="examples qt5"
-
-RDEPEND="
-	dev-lang/lua:0=
-	qt5? (
-		dev-libs/double-conversion:=
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	virtual/pkgconfig
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-
-myhlopts=(
-	"CXX=$(tc-getCXX)"
-	"AR=$(tc-getAR)"
-	"LDFLAGS=${LDFLAGS}"
-	"CFLAGS=${CXXFLAGS} -DNDEBUG -std=c++11"
-	"DESTDIR=${D}"
-	"PREFIX=${EPREFIX}/usr"
-	"HL_CONFIG_DIR=${EPREFIX}/etc/highlight/"
-	"HL_DATA_DIR=${EPREFIX}/usr/share/highlight/"
-	"doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
-	"conf_dir=${EPREFIX}/etc/highlight/"
-)
-
-PATCHES=( "${FILESDIR}"/${P}-qmake-fix.patch ) # bug 649398
-
-src_prepare() {
-	default
-
-	sed -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
-		-i src/core/datadir.cpp || die
-
-	if has_version "<dev-lang/lua-5.2"; then
-		sed -e "s/-DUSE_LUA52//" -i src/makefile || die
-	fi
-
-	# We set it via eqmake5, otherwise it forces clang...
-	sed -e "s/QMAKE_CC/#QMAKE_CC/g" \
-		-e "s/QMAKE_CXX /#QMAKE_CXX /g" \
-		-i src/gui-qt/highlight.pro || die
-}
-
-src_configure() {
-	if use qt5 ; then
-		pushd src/gui-qt > /dev/null || die
-		eqmake5 \
-			'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
-		popd > /dev/null || die
-	fi
-}
-
-src_compile() {
-	emake -f makefile "${myhlopts[@]}"
-	if use qt5 ; then
-		pushd src/gui-qt > /dev/null || die
-		emake
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	emake -f makefile "${myhlopts[@]}" install
-	if use qt5; then
-		emake -f makefile "${myhlopts[@]}" install-gui
-		docompress -x /usr/share/doc/${PF}/{ChangeLog,COPYING,README,README_PLUGINS}
-	fi
-
-	if ! use examples ; then
-		rm -r "${ED}"/usr/share/doc/${PF}/extras || die
-	fi
-}
diff --git a/app-text/highlight/highlight-3.57.ebuild b/app-text/highlight/highlight-3.57.ebuild
index 90bd4a859636..f1f062f7d23e 100644
--- a/app-text/highlight/highlight-3.57.ebuild
+++ b/app-text/highlight/highlight-3.57.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples qt5"
 
 RDEPEND="
diff --git a/app-text/htmlmin/Manifest b/app-text/htmlmin/Manifest
index 224a83783247..08d0ba1cc046 100644
--- a/app-text/htmlmin/Manifest
+++ b/app-text/htmlmin/Manifest
@@ -1,3 +1,3 @@
-DIST htmlmin-0.1.12.tar.gz 19940 BLAKE2B 66e9596f687b70fa44362078075cb5f70553e65a7a1a6c55a4abac6adc5d0821b8936507cbb56f4e8ea96575a8801ec341416fead54b18ff9e10d199ed506529 SHA512 5669327dc64d8d28accdfe0d9a222e723fccdc12b52e7f0315fb9caf958a734a0cf0514ad476cbd0b7d0f2d83514a207867127f135f5e51cfda9b15dbfe24b78
-EBUILD htmlmin-0.1.12.ebuild 502 BLAKE2B 153cbfaaf0ad87a086a7a3d699eaa8db44d492af5f3b54e3933e59f097cdf26f6c76e5ea502455606a1a53185951f70cebb9fa4522abb65713f03910c46e7d99 SHA512 d03810cfb4d4d71bbd69c89edaecd72a9b8a9e546e9f8a9f172c9c52d7441aa90824317729fc2b9ce959642de525570d7fb5623b854560469e11208994a89bd6
+DIST htmlmin-0.1.12.gh.tar.gz 134130 BLAKE2B 5a9996bfea469f273c37bd0bd72c0e27b8636cb4552681de1b7e9a4849ab215815f7fc8ce430392b8ca3a849b3e51d8188ca248a8ce23242905799258ceeae29 SHA512 6d9db4b6bcdd6d223be8b4e3830da4d63ac6d7d28ee83abd97809b0b901968c994c8434c992fbdd148101ba25d8d786c93657cb5f82881af44dadbba40bf3252
+EBUILD htmlmin-0.1.12.ebuild 687 BLAKE2B e16da15d3ca3b741f324db20f52f09cc6a57471863068908c54635fa26ec84f99fd30043f03dcd14d11072a5c06734c86263461da77b8ac8de486ea54daf4953 SHA512 df59d6c9f9eb20b9db4eb4b4547c68607964f9abd9b5be4fbb0fc85cf5afe446241237031234c6c30f608ed2d56471eb024072ff83a793ceae94c0ec62e68c13
 MISC metadata.xml 424 BLAKE2B 1026b0d3b470845caf9f575527f76c10b691c855426e5fe48972943ca067e9c4211f3e5af025b85f3881c321614c174f6c2f751c2f3f0764aedf04abb2dfe125 SHA512 53ae65ab7e6dd530f398c228e7ad38242a367efdd398a5bd321704e42f33b997c4fc5bfb942a90722b164ff29b35c1f6e3d3e15414241995bd371c3090c250e0
diff --git a/app-text/htmlmin/htmlmin-0.1.12.ebuild b/app-text/htmlmin/htmlmin-0.1.12.ebuild
index fc8e480e3b33..080c078b2222 100644
--- a/app-text/htmlmin/htmlmin-0.1.12.ebuild
+++ b/app-text/htmlmin/htmlmin-0.1.12.ebuild
@@ -1,25 +1,29 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
+# upstream doesn't do tags much
+EGIT_COMMIT=220b1d16442eb4b6fafed338ee3b61f698a01e63
 DESCRIPTION="A configurable HTML Minifier with safety features"
 HOMEPAGE="https://github.com/mankyd/htmlmin"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="
+	https://github.com/mankyd/htmlmin/archive/${EGIT_COMMIT}.tar.gz
+		-> ${P}.gh.tar.gz"
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="BSD"
-
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+distutils_enable_tests setup.py
 
 src_prepare() {
 	sed '/prune/d' -i MANIFEST.in || die
-	default
+	distutils-r1_src_prepare
 }
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index 940dc60712ed..e582c67e5a89 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -1,5 +1,7 @@
+AUX hunspell-1.7.0-CVE-2019-16707.patch 811 BLAKE2B 5adc2e6009a0381bbe6ea10a64fb8847b070a37eb7fd6858f2e5180a19f4aff9f8ce007c5a948c6caa3b0de8454f3f87953bbe2c18a2ea43aaea3504d4d3c460 SHA512 e7674819a9da4c3d742d34338d68d137d8613f97be2d25bf20db5219d4dd626f59a63ed4757b92f34307f499f2d687014065cdea97b55c98db295a8290300d2d
 AUX hunspell-1.7.0-renameexes.patch 6399 BLAKE2B d852305da0dc0330e293a028a1e178d7887a3567a35bc6feebe48e7a4bf205103155ec31b5a483a1002c505ae89bdf47ae80c1b6ccd866eb62cc7e6851c1a1b9 SHA512 3703b49728e8ce92637a602478995d38deb64c1b3281a06447f66c352ca0e2adb7d8aa9167debd9cb15e4009ee4efeb7618065bf16dda47155245c0266d97eaa
 AUX hunspell-1.7.0-tinfo.patch 1719 BLAKE2B 1b612edd63dc04fe57a27fc94937b1cabcb32c4158009c3444d43f506d19b94d0aa79d746ba409ec429d467e29619cd32894e935b8f8c0deda7f0ed2600841c6 SHA512 297f337895f805c9ce27ae63f424c88e8f153fb8f6724aedc11dd564acee6264b8eba01b09f43d75585d6d5bf3eb245db69b3da00c349c3c1c0d04a5a99b1b48
 DIST hunspell-1.7.0.tar.gz 482156 BLAKE2B daf689ab44872c78d27bd035d996c61da9b01b7bbe5ced120034b2d64bbead573ad3807dfe5a06ecdbd96c610f42e4ea015be4b2046ebafad13347c08e60913a SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903
 EBUILD hunspell-1.7.0-r1.ebuild 2317 BLAKE2B 9557168fd901afe16a8402a682cf06cb97f6a6fd367caef811e31acc92f04f2b77a907d409e9d77b6389425eaad901a0084bb8d38d69935648da4bda9ae6ac47 SHA512 e2926c1860838c46fcddb6bb7c05462d6908fb188791ddcc677243394cf46902ed01198c53e137f7860c418c27c20ac59de21d4033fc624c168fdd60c104c69b
+EBUILD hunspell-1.7.0-r2.ebuild 2372 BLAKE2B b65efc24aa4e71a043e86a747a3d5ec257a6ad584129fb540aa2003c6d31656b6b3d96d0c53c47baec5538df71d187a2719e7699aa31c1435a1b65e209020ef2 SHA512 d40ad309340d7822093aff140760d189f6e54061951c32e5c168df83a2f4b42541cd8e485021c5a18efd2e0f13c2ae1defb426bc348c0d8069452a457b4c7d3c
 MISC metadata.xml 300 BLAKE2B 03418bffa5dab48a3d9f5f7de46a79b8b5de44296b7c39d8d75d021f3c5693eea63148fbed02c8a77b1a0846e1d39d8e11caeb003297839fda0c5dc679aaca08 SHA512 b541c90d84ee8c1541d588948286428f065ebf0bb393108e7521ba8d45ab3fb235eaba61ca61eebc61f371e399e7d98ccf3c2994d8df97d1b6a7972e92cffa71
diff --git a/app-text/hunspell/files/hunspell-1.7.0-CVE-2019-16707.patch b/app-text/hunspell/files/hunspell-1.7.0-CVE-2019-16707.patch
new file mode 100644
index 000000000000..649eef5b293d
--- /dev/null
+++ b/app-text/hunspell/files/hunspell-1.7.0-CVE-2019-16707.patch
@@ -0,0 +1,22 @@
+From ac938e2ecb48ab4dd21298126c7921689d60571b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Tue, 12 Nov 2019 20:03:15 +0000
+Subject: [PATCH] invalid read memory access #624
+
+---
+ src/hunspell/suggestmgr.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/hunspell/suggestmgr.cxx b/src/hunspell/suggestmgr.cxx
+index dba084e9..c23f165a 100644
+--- a/src/hunspell/suggestmgr.cxx
++++ b/src/hunspell/suggestmgr.cxx
+@@ -2040,7 +2040,7 @@ int SuggestMgr::leftcommonsubstring(
+   int l2 = su2.size();
+   // decapitalize dictionary word
+   if (complexprefixes) {
+-    if (su1[l1 - 1] == su2[l2 - 1])
++    if (l1 && l2 && su1[l1 - 1] == su2[l2 - 1])
+       return 1;
+   } else {
+     unsigned short idx = su2.empty() ? 0 : (su2[0].h << 8) + su2[0].l;
diff --git a/app-text/hunspell/hunspell-1.7.0-r2.ebuild b/app-text/hunspell/hunspell-1.7.0-r2.ebuild
new file mode 100644
index 000000000000..209dab4e6da2
--- /dev/null
+++ b/app-text/hunspell/hunspell-1.7.0-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic
+
+MY_P="${PN}-${PV/_beta/b}"
+
+DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo"
+SRC_URI="https://github.com/hunspell/hunspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/hunspell"
+
+SLOT="0/$(ver_cut 1-2)"
+LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
+IUSE="ncurses nls readline static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	ncurses? ( sys-libs/ncurses:0= )
+	readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+LANGS="af bg ca cs cy da de de-1901 el en eo es et fo fr ga gl he hr hu ia id
+is it kk km ku lt lv mi mk ms nb nl nn pl pt pt-BR ro ru sk sl sq sv sw tn uk
+zu"
+
+PDEPEND=""
+for lang in ${LANGS}; do
+	IUSE+=" l10n_${lang}"
+	case ${lang} in
+		de-1901) dict="de_1901" ;;
+		pt-BR)   dict="pt-br"   ;;
+		*)       dict="${lang}" ;;
+	esac
+	PDEPEND+=" l10n_${lang}? ( app-dicts/myspell-${dict} )"
+done
+unset dict lang LANGS
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(
+	AUTHORS ChangeLog NEWS THANKS license.hunspell
+	license.myspell README.md
+)
+
+PATCHES=(
+	# Upstream package creates some executables which names are too generic
+	# to be placed in /usr/bin - this patch prefixes them with 'hunspell-'.
+	# It modifies a Makefile.am file, hence eautoreconf.
+	"${FILESDIR}/${PN}-1.7.0-renameexes.patch"
+
+	"${FILESDIR}/${PN}-1.7.0-tinfo.patch" #692614
+	"${FILESDIR}/${PN}-1.7.0-CVE-2019-16707.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# missing somehow, and I am too lazy to fix it properly
+	[[ ${CHOST} == *-darwin* ]] && append-libs -liconv
+
+	# I wanted to put the include files in /usr/include/hunspell.
+	# You can do that, libreoffice can find them anywhere, just
+	# ping me when you do so ; -- scarabeus
+	local myeconfargs=(
+		$(use_enable nls)
+		$(use_with ncurses ui)
+		$(use_with readline readline)
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	#342449
+	pushd "${ED}"/usr/$(get_libdir)/ >/dev/null
+	ln -s lib${PN}{-$(ver_cut 1).$(ver_cut 2).so.0.0.1,.so}
+	popd >/dev/null
+}
diff --git a/app-text/libspectre/Manifest b/app-text/libspectre/Manifest
index 273f631876f1..20f276a1e572 100644
--- a/app-text/libspectre/Manifest
+++ b/app-text/libspectre/Manifest
@@ -1,6 +1,4 @@
 AUX libspectre-0.2.0-interix.patch 654 BLAKE2B 5be37013c202c2191c8169ebd5b769737a361ab8adde830ffc4bf8487faaf5b1875e1eeb1baae0af0150001a784dad2449e4c6d2259e570dfcd9578e1dae0f00 SHA512 9ccb697cc2cce7798bfff799f7e041d02967af49832a692a3dc7292b52a31f1ebe37fe3b2f02b4908f7e38aaee11028b9e949512fbf02bfb4c8886fd5a7a3bba
-DIST libspectre-0.2.8.tar.gz 421791 BLAKE2B bbefa06cf80ecb91f0f780493e1829eadc34061b6f2b3004f9ae01e06fc4609edd440df290be9ff1c9f43e580b53791aae033feb4115743a0f03f703bc18e0c7 SHA512 ebbe7f6adcbc7f7d6af61f24e23b114116c878755dbe90f1163546c1284a005b4d539be01986c1f940611e84141ca19768b8effc2abf1013606da7c93547da86
 DIST libspectre-0.2.9.tar.gz 433384 BLAKE2B ed75a7013763a86c0f0702e0e47dcfb8401db6c957ed4851ecc85e27db6a49c8d4dae6443b302bcce5b0ae0da18dce3294a010eee5531a253020a650c19388c5 SHA512 7c24b5c83c6d356c89417d09dc76566afbe886ec189fe80d030a239c23ad25b061db071768117fa06805aa3d86f749fb232b7491bd7d467f26a40e348e74d5d2
-EBUILD libspectre-0.2.8.ebuild 1089 BLAKE2B ee022b1c6cb7ca03c227c14a230e2275c07ef04c68fa58e140d250a2280d344949f8f2d1afed6ac78a12e9fa622ab34878dc017a647ef2bc89e8bdb8b97461f0 SHA512 c610aaca45b156d883188f1fc661cf0972d9fbba3bbac5c2535ed41c9692713d49a6691410d4d0e4ca44c6fe987a2d04d81d459ecf7b1d90e9e06f92acc4f9c1
-EBUILD libspectre-0.2.9.ebuild 1136 BLAKE2B 193aecdd217e2b1d6c06216ece1f22a3f001a3c8873e4ab77499e8fba209a2aa3c029eeeea0a695acb4e046d8afc5faaf29baced0f4aad4897b4fc3fb469e978 SHA512 3c705f4bd1e41180ad02d51d4e84fe9f9270e163247a1a64ac228152e1f129b75e967ebec92eac8a930fcead7a31e7027016238945e891f20dc1a42d0567fc1e
+EBUILD libspectre-0.2.9.ebuild 1137 BLAKE2B 1c6c7b6c96cef12d9648e7d9dc93d8e7807d541fa2a129f17979012ded7d89880198588625f6b96cc649a277fff934230b83ada5682163b23254f90622e08c27 SHA512 ecf738dc31d6fbfb0a51d6bca863c5875b9a327fafe176de85ab266bf4425610556536b7b72bd68db9b6375840b2978396d139fbe714bd7d9c7b0c03b85a1fa5
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/app-text/libspectre/libspectre-0.2.8.ebuild b/app-text/libspectre/libspectre-0.2.8.ebuild
deleted file mode 100644
index 0de9370f91ef..000000000000
--- a/app-text/libspectre/libspectre-0.2.8.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils ltprune
-
-DESCRIPTION="A library for rendering Postscript documents"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libspectre"
-SRC_URI="https://libspectre.freedesktop.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="debug doc static-libs"
-
-RDEPEND=">=app-text/ghostscript-gpl-8.62"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-# does not actually test anything, see bug 362557
-RESTRICT="test"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${PN}-0.2.0-interix.patch
-	eautoreconf # need new libtool for interix
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug asserts) \
-		$(use_enable debug checks) \
-		$(use_enable static-libs static) \
-		--disable-test
-}
-
-src_compile() {
-	emake
-	if use doc; then
-		doxygen || die
-	fi
-}
-
-src_install() {
-	default
-	use doc && dohtml -r doc/html/*
-	prune_libtool_files
-}
diff --git a/app-text/libspectre/libspectre-0.2.9.ebuild b/app-text/libspectre/libspectre-0.2.9.ebuild
index 0d295f6fe89e..d8a1a897bd0e 100644
--- a/app-text/libspectre/libspectre-0.2.9.ebuild
+++ b/app-text/libspectre/libspectre-0.2.9.ebuild
@@ -11,14 +11,14 @@ SRC_URI="https://libspectre.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="debug doc"
 
 BDEPEND="
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
-RDEPEND=">=app-text/ghostscript-gpl-9.24"
+RDEPEND=">=app-text/ghostscript-gpl-9.24:="
 DEPEND="${RDEPEND}"
 
 # does not actually test anything, see bug 362557
diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest
index 3e55718a7bf8..0d3c1c12eee5 100644
--- a/app-text/podofo/Manifest
+++ b/app-text/podofo/Manifest
@@ -1,5 +1,5 @@
 DIST podofo-0.9.6_p20180715.tar.xz 747444 BLAKE2B 96d90add6d290d6722cd7412fd75433f87303bac385964f0967b4f119db4962f6ddbd93b49af8454051f421d77de70ad7ea0f5b01a66eeb690a75dbeec256eff SHA512 4c9b09c716128110b47d6a02f118eb80b6009e9e79dbc83ff804a57f0abc011b789de9287b68a6c1d6704ef386f8062a3a495408af8a832782f0bf0128190a1f
-DIST podofo-0.9.6_p20200526.tar.xz 752264 BLAKE2B 52eb40a63e8462b6d1f975c76c2112b93ae98c19ad6cb65906bef018e99a3d92e26781cee9d4ef1c4de74779db7eca6589c320849be84b70c20d5c7d988c0a49 SHA512 7baa58c9a524ccc5aa954bd5fe891b9add8b8f4ec29e3ebbc1c8a467d2787e6c3f9e4652db08e50cb4c28a73691215947940634975e292ec01fb57e2e45efbe4
+DIST podofo-0.9.6_p20190928.tar.xz 747532 BLAKE2B 39d051e6adca85bf0f124e5d48e1ff88dc951d7c1b38bc76dc7e3640ea9c3f8a59c6ba9a9105a263234e94932e450bec12dde455850dbf96cd7eec3e69a1a28d SHA512 b9d46fb02eeba61190a0efd17b507bba62d7246af6fff3c3514c9970e99e085f9aad92baa05cc6cf0a8c3c2843554099c904bff10be54dbb4d4cb7de460fc3cc
 EBUILD podofo-0.9.6_p20180715.ebuild 4661 BLAKE2B c5e6616218c01a583ef3bcd8e93a80edd060b9fe010cf9f91372a5ce3e9f34d592d69fe20cc8e9ba02dceefa6ac70679c5d66783580fd7d70b40cc2f74c5a85d SHA512 b6b6a274d5ee92d13d4b573844cd0d1629f13b552f5d8257e884a0c555ba1d14425abe3fab1be9e01d27c5c1da9eae07519ad0916862569a0495808d2719449f
-EBUILD podofo-0.9.6_p20200526.ebuild 4591 BLAKE2B 14522471c08143d9adbee39ec8301e705169a48fc2557b44707432ce25c26e0e2eab8b822bc188f11795f55092e8c85ebc22384ac747e1285098aa20ed722f62 SHA512 ad7feded62a43adfd9d807087109816ef637d8e2ce7046a9dc0eebce27b7aee6cda9c93059aedcc999828b6cc13455899bc9a80de30bfc1ce2cd90f366da3e7b
+EBUILD podofo-0.9.6_p20190928.ebuild 4670 BLAKE2B df7e653e7251ee6a8c82f45cff91ab7703aa73045d1dd16b7bdaf0ba10d9475e5736566411600d473f1b4ba79df8742e96f616e8d1b45b524382d569b568b2b8 SHA512 f0d481bbf173348d0da77ac046aa4fafa5301e91fb888107f6bad455ee366edd1a7fbfa56a1b8533e9f72c1a9cf27ff45668769b86c6820e99c84d266746f19a
 MISC metadata.xml 509 BLAKE2B 5bcba752f845dba107a60068a4be60776e8fba516b42a2434bed1173786117054eb77e933b667604c96c10bbc5ced810b8590c77626d13a575857ec1ba253dbb SHA512 ad2bbc4598d80be1fcd4fdbfe0a08bec65795f23e768762dc02be766d82cf1549b6861bd8e96bd72b468674ab1e36ebbead3464dc647378b72a8679fcf422236
diff --git a/app-text/podofo/podofo-0.9.6_p20190928.ebuild b/app-text/podofo/podofo-0.9.6_p20190928.ebuild
new file mode 100644
index 000000000000..0c3c7b2bd809
--- /dev/null
+++ b/app-text/podofo/podofo-0.9.6_p20190928.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format"
+HOMEPAGE="https://sourceforge.net/projects/podofo/"
+SRC_URI="https://dev.gentoo.org/~zmedico/dist/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/${PV%_*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+boost idn libressl debug test +tools"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( tools )"
+
+RDEPEND="dev-lang/lua:=
+	idn? ( net-dns/libidn:= )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	media-libs/fontconfig:=
+	media-libs/freetype:2=
+	virtual/jpeg:0=
+	media-libs/libpng:0=
+	media-libs/tiff:0=
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	boost? ( dev-util/boost-build )
+	test? ( dev-util/cppunit )"
+
+DOCS="AUTHORS ChangeLog TODO"
+
+src_prepare() {
+	cmake_src_prepare
+	local x sed_args
+
+	if use libressl; then
+		sed -e 's:^#ifdef PODOFO_HAVE_OPENSSL_1_1$:#ifndef PODOFO_HAVE_OPENSSL_1_1:' \
+			 -i tools/podofosign/podofosign.cpp || die #663602
+	fi
+
+	# bug 620934 - Disable linking with cppunit when possible, since it
+	# triggers errors with some older compilers.
+	use test || sed -e 's:^FIND_PACKAGE(CppUnit):#\0:' -i CMakeLists.txt || die
+
+	# bug 556962
+	sed -i -e 's|Decrypt( pEncryptedBuffer, nOutputLen, pDecryptedBuffer, m_lLen );|Decrypt( pEncryptedBuffer, (pdf_long)nOutputLen, pDecryptedBuffer, (pdf_long\&)m_lLen );|' \
+		test/unit/EncryptTest.cpp || die
+
+	sed -i \
+		-e "s:LIBDIRNAME \"lib\":LIBDIRNAME \"$(get_libdir)\":" \
+		-e "s:LIBIDN_FOUND:HAVE_LIBIDN:g" \
+		CMakeLists.txt || die
+
+	# Use pkg-config to find headers for bug #459404.
+	sed_args=
+	for x in $($(tc-getPKG_CONFIG) --cflags freetype2) ; do
+		[[ ${x} == -I* ]] || continue
+		x=${x#-I}
+		if [[ -f ${x}/ft2build.h ]] ; then
+			sed_args+=" -e s:/usr/include/\\r\$:${x}:"
+		elif [[ -f ${x}/freetype/config/ftheader.h ]] ; then
+			sed_args+=" -e s:/usr/include/freetype2\\r\$:${x}:"
+		fi
+	done
+	[[ -n ${sed_args} ]] && \
+		{ sed -i ${sed_args} cmake/modules/FindFREETYPE.cmake || die; }
+
+	# Bug #439784: Add missing unistd include for close() and unlink().
+	sed -i 's:^#include <stdio.h>$:#include <unistd.h>\n\0:' -i \
+		test/unit/TestUtils.cpp || die
+
+	# TODO: fix these test cases
+	# ColorTest.cpp:62:Assertion
+	# Test name: ColorTest::testDefaultConstructor
+	# expected exception not thrown
+	# - Expected: PdfError
+	sed -e 's:CPPUNIT_TEST( testDefaultConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testGreyConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testRGBConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testCMYKConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testColorSeparationAllConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testColorSeparationNoneConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testColorSeparationConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testColorCieLabConstructor ://\0:' \
+		-i test/unit/ColorTest.h || die
+
+	# ColorTest.cpp:42:Assertion
+	# Test name: ColorTest::testHexNames
+	# assertion failed
+	# - Expression: static_cast<int>(rgb.GetGreen() * 255.0) == 0x0A
+	sed -e 's:CPPUNIT_TEST( testHexNames ://\0:' \
+		-i test/unit/ColorTest.h || die
+
+	# Bug #352125: test failure, depending on installed fonts
+	# ##Failure Location unknown## : Error
+	# Test name: FontTest::testFonts
+	# uncaught exception of type PoDoFo::PdfError
+	# - ePdfError_UnsupportedFontFormat
+	sed -e 's:CPPUNIT_TEST( testFonts ://\0:' \
+		-i test/unit/FontTest.h || die
+
+	# Test name: EncodingTest::testDifferencesEncoding
+	# equality assertion failed
+	# - Expected: 1
+	# - Actual  : 0
+	sed -e 's:CPPUNIT_TEST( testDifferencesEncoding ://\0:' \
+		-i test/unit/EncodingTest.h || die
+
+	# Bug #407015: fix to compile with Lua 5.2
+	if has_version '>=dev-lang/lua-5.2' ; then
+		sed -e 's: lua_open(: luaL_newstate(:' \
+			-e 's: luaL_getn(: lua_rawlen(:' -i \
+			tools/podofocolor/luaconverter.cpp \
+			tools/podofoimpose/planreader_lua.cpp || die
+	fi
+}
+
+src_configure() {
+
+	# Bug #381359: undefined reference to `PoDoFo::PdfVariant::DelayedLoadImpl()'
+	filter-flags -fvisibility-inlines-hidden
+
+	mycmakeargs+=(
+		"-DPODOFO_BUILD_SHARED=1"
+		"-DPODOFO_HAVE_JPEG_LIB=1"
+		"-DPODOFO_HAVE_PNG_LIB=1"
+		"-DPODOFO_HAVE_TIFF_LIB=1"
+		"-DWANT_FONTCONFIG=1"
+		"-DUSE_STLPORT=0"
+		-DWANT_BOOST=$(usex boost ON OFF)
+		-DHAVE_LIBIDN=$(usex idn ON OFF)
+		-DPODOFO_HAVE_CPPUNIT=$(usex test ON OFF)
+		-DPODOFO_BUILD_LIB_ONLY=$(usex tools OFF ON)
+		)
+
+	cmake_src_configure
+	mkdir -p "${S}/test/TokenizerTest/objects" || die
+}
+
+src_test() {
+	cd "${BUILD_DIR}"/test/unit || die
+	./podofo-test --selftest || die "self test failed"
+}
diff --git a/app-text/podofo/podofo-0.9.6_p20200526.ebuild b/app-text/podofo/podofo-0.9.6_p20200526.ebuild
deleted file mode 100644
index 058f8499ab01..000000000000
--- a/app-text/podofo/podofo-0.9.6_p20200526.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake-utils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format"
-HOMEPAGE="https://sourceforge.net/projects/podofo/"
-SRC_URI="https://dev.gentoo.org/~zmedico/dist/podofo-0.9.6_p20200526.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/${PV%_*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+boost idn libressl debug test +tools"
-RESTRICT="test"
-REQUIRED_USE="test? ( tools )"
-
-RDEPEND="dev-lang/lua:=
-	idn? ( net-dns/libidn:= )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	media-libs/fontconfig:=
-	media-libs/freetype:2=
-	virtual/jpeg:0=
-	media-libs/libpng:0=
-	media-libs/tiff:0=
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	boost? ( dev-util/boost-build )
-	test? ( dev-util/cppunit )"
-
-DOCS="AUTHORS ChangeLog TODO"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	local x sed_args
-
-	if use libressl; then
-		sed -e 's:^#ifdef PODOFO_HAVE_OPENSSL_1_1$:#ifndef PODOFO_HAVE_OPENSSL_1_1:' \
-			 -i tools/podofosign/podofosign.cpp || die #663602
-	fi
-
-	# bug 620934 - Disable linking with cppunit when possible, since it
-	# triggers errors with some older compilers.
-	use test || sed -e 's:^FIND_PACKAGE(CppUnit):#\0:' -i CMakeLists.txt || die
-
-	# bug 556962
-	sed -i -e 's|Decrypt( pEncryptedBuffer, nOutputLen, pDecryptedBuffer, m_lLen );|Decrypt( pEncryptedBuffer, (pdf_long)nOutputLen, pDecryptedBuffer, (pdf_long\&)m_lLen );|' \
-		test/unit/EncryptTest.cpp || die
-
-	sed -i \
-		-e "s:LIBDIRNAME \"lib\":LIBDIRNAME \"$(get_libdir)\":" \
-		-e "s:LIBIDN_FOUND:HAVE_LIBIDN:g" \
-		CMakeLists.txt || die
-
-	# Use pkg-config to find headers for bug #459404.
-	sed_args=
-	for x in $($(tc-getPKG_CONFIG) --cflags freetype2) ; do
-		[[ ${x} == -I* ]] || continue
-		x=${x#-I}
-		if [[ -f ${x}/ft2build.h ]] ; then
-			sed_args+=" -e s:/usr/include/\\r\$:${x}:"
-		elif [[ -f ${x}/freetype/config/ftheader.h ]] ; then
-			sed_args+=" -e s:/usr/include/freetype2\\r\$:${x}:"
-		fi
-	done
-	[[ -n ${sed_args} ]] && \
-		{ sed -i ${sed_args} cmake/modules/FindFREETYPE.cmake || die; }
-
-	# Bug #439784: Add missing unistd include for close() and unlink().
-	sed -i 's:^#include <stdio.h>$:#include <unistd.h>\n\0:' -i \
-		test/unit/TestUtils.cpp || die
-
-	# TODO: fix these test cases
-	# ColorTest.cpp:62:Assertion
-	# Test name: ColorTest::testDefaultConstructor
-	# expected exception not thrown
-	# - Expected: PdfError
-	sed -e 's:CPPUNIT_TEST( testDefaultConstructor ://\0:' \
-		-e 's:CPPUNIT_TEST( testGreyConstructor ://\0:' \
-		-e 's:CPPUNIT_TEST( testRGBConstructor ://\0:' \
-		-e 's:CPPUNIT_TEST( testCMYKConstructor ://\0:' \
-		-e 's:CPPUNIT_TEST( testColorSeparationAllConstructor ://\0:' \
-		-e 's:CPPUNIT_TEST( testColorSeparationNoneConstructor ://\0:' \
-		-e 's:CPPUNIT_TEST( testColorSeparationConstructor ://\0:' \
-		-e 's:CPPUNIT_TEST( testColorCieLabConstructor ://\0:' \
-		-i test/unit/ColorTest.h || die
-
-	# ColorTest.cpp:42:Assertion
-	# Test name: ColorTest::testHexNames
-	# assertion failed
-	# - Expression: static_cast<int>(rgb.GetGreen() * 255.0) == 0x0A
-	sed -e 's:CPPUNIT_TEST( testHexNames ://\0:' \
-		-i test/unit/ColorTest.h || die
-
-	# Bug #352125: test failure, depending on installed fonts
-	# ##Failure Location unknown## : Error
-	# Test name: FontTest::testFonts
-	# uncaught exception of type PoDoFo::PdfError
-	# - ePdfError_UnsupportedFontFormat
-	sed -e 's:CPPUNIT_TEST( testFonts ://\0:' \
-		-i test/unit/FontTest.h || die
-
-	# Test name: EncodingTest::testDifferencesEncoding
-	# equality assertion failed
-	# - Expected: 1
-	# - Actual  : 0
-	sed -e 's:CPPUNIT_TEST( testDifferencesEncoding ://\0:' \
-		-i test/unit/EncodingTest.h || die
-
-	# Bug #407015: fix to compile with Lua 5.2
-	if has_version '>=dev-lang/lua-5.2' ; then
-		sed -e 's: lua_open(: luaL_newstate(:' \
-			-e 's: luaL_getn(: lua_rawlen(:' -i \
-			tools/podofocolor/luaconverter.cpp \
-			tools/podofoimpose/planreader_lua.cpp || die
-	fi
-}
-
-src_configure() {
-
-	# Bug #381359: undefined reference to `PoDoFo::PdfVariant::DelayedLoadImpl()'
-	filter-flags -fvisibility-inlines-hidden
-
-	mycmakeargs+=(
-		"-DPODOFO_BUILD_SHARED=1"
-		"-DPODOFO_HAVE_JPEG_LIB=1"
-		"-DPODOFO_HAVE_PNG_LIB=1"
-		"-DPODOFO_HAVE_TIFF_LIB=1"
-		"-DWANT_FONTCONFIG=1"
-		"-DUSE_STLPORT=0"
-		-DWANT_BOOST=$(usex boost ON OFF)
-		-DHAVE_LIBIDN=$(usex idn ON OFF)
-		-DPODOFO_HAVE_CPPUNIT=$(usex test ON OFF)
-		-DPODOFO_BUILD_LIB_ONLY=$(usex tools OFF ON)
-		)
-
-	cmake-utils_src_configure
-	mkdir -p "${S}/test/TokenizerTest/objects" || die
-}
diff --git a/app-text/q-text-as-data/Manifest b/app-text/q-text-as-data/Manifest
index 86a4ef761ea6..d118a0f829d9 100644
--- a/app-text/q-text-as-data/Manifest
+++ b/app-text/q-text-as-data/Manifest
@@ -1,3 +1,3 @@
-DIST q-1.5.0.tar.gz 58746 BLAKE2B a35f7ea605a42e81be1ee4899ed9e8c2b4e81e896b6e4c1eb6045b64cc7fa3ffdf6f754be168b3ebe25faa4c8b80f63e2ffff3174231357260263acf335b8d5c SHA512 d21dd16a31629e36f0dee72ebc574283c7937821cb2da7ccaacb8484a35b53193dad05fe9857d1498434a0c1083514ea5b9e5d8a636bcd51d4c5924cb7bb1b55
-EBUILD q-text-as-data-1.5.0.ebuild 989 BLAKE2B 75751694983c2558990cfb4e3cb595185f1093f81e173e60a39c6c6eee2ab5831d037ea31436afb52004d11d138b5ff190079e2170561e6271b5669d0f708095 SHA512 0061a746a1432124970ff40722fd756938f9e50b63ed916d21a814aea7beaece049df2c5ccb9308824972928f4c9ac5fdaf31497731acf9609c8d5453809a7f4
+DIST q-2.0.10.tar.gz 218824 BLAKE2B 91f6485d94325768d7bfd32223d379cd90f3ade3760e44c859ec25aee6aeb73c943b3dedbf56b378222f6bc094faf160d86dcacab3dd0ce5ebf93230ca61696d SHA512 ab503a555380b6d17500972256db5e9eb19066d7a1f480091e777681d694746d6d7743254f3839bfd2f08697308aee8cea60e4583a0b1a4d93caf522342f25b2
+EBUILD q-text-as-data-2.0.10.ebuild 1112 BLAKE2B 1d1965e6f65978d209a8248165c46f296a3c1fc0f4d9b0668d4b16eb0727b843b95e7b77316f80fafc0eb1c4dd7b34ee1b3f7682d795c6c3857ffe968a77eaa8 SHA512 f778dee4e4177edd6682a64ec56b3afc410a519f4b9d42db3ee5f2e88083b220af418f33ebd7dfed4e94cf5c8615bd6d023b1039a676f91b99e79deb49270f1f
 MISC metadata.xml 300 BLAKE2B 57b125311f9ec6ca94d329e91209e85c77c3c739c2e2ca885dbe4a8c3d9a13627fcd4b64c79c9c672d30c0265eab241fb57114e0c23b46e01c60fb969d7d6f9c SHA512 3b90282d1ba8092665a1421e81e53a82dadcdf3c70ecdcc0c71e97e00d0ad2f7ba1e970d507ab9d354721cd13e08582ae21c482955372c5d8bc0caeb3d4505aa
diff --git a/app-text/q-text-as-data/q-text-as-data-1.5.0.ebuild b/app-text/q-text-as-data/q-text-as-data-1.5.0.ebuild
deleted file mode 100644
index 3441091a9944..000000000000
--- a/app-text/q-text-as-data/q-text-as-data-1.5.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-# Does not yet support py3
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-r1
-
-DESCRIPTION="A CLI tool that allows direct execution of SQL-like queries on text"
-HOMEPAGE="http://harelba.github.io/q/"
-MY_P="q-${PV}"
-SRC_URI="https://github.com/harelba/q/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# No dependencies other than python >= 2.5
-# http://harelba.github.io/q/requirements.html
-RDEPEND="${PYTHON_DEPS}"
-DEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-q_install() {
-	python_newexe bin/q q-text-as-data
-}
-
-src_install() {
-	python_foreach_impl q_install
-	newdoc bin/.qrc dot-qrc
-	dodoc doc/*
-}
-
-pkg_postinst() {
-	einfo "On Gentoo, the 'q' binary is most often provided by app-portage/portage-utils;"
-	einfo "Thus, this tool is install as 'q-text-as-data' rather than 'q'."
-}
diff --git a/app-text/q-text-as-data/q-text-as-data-2.0.10.ebuild b/app-text/q-text-as-data/q-text-as-data-2.0.10.ebuild
new file mode 100644
index 000000000000..f3c988259f1b
--- /dev/null
+++ b/app-text/q-text-as-data/q-text-as-data-2.0.10.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-r1
+
+DESCRIPTION="A CLI tool that allows direct execution of SQL-like queries on text"
+HOMEPAGE="http://harelba.github.io/q/"
+MY_P="q-${PV}"
+SRC_URI="https://github.com/harelba/q/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Upstream is wrong
+# http://harelba.github.io/q/#requirements
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+	')"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	: # Do not use the Makefile
+}
+
+q_install() {
+	python_newexe bin/q.py q-text-as-data
+}
+
+src_install() {
+	python_foreach_impl q_install
+	newdoc bin/.qrc dot-qrc
+	dodoc doc/*
+}
+
+pkg_postinst() {
+	einfo "On Gentoo, the 'q' binary is most often provided by app-portage/portage-utils;"
+	einfo "Thus, this tool is install as 'q-text-as-data' rather than 'q'."
+}
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
index 84185121d2b6..2bf36a47156b 100644
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@@ -1,8 +1,9 @@
 AUX recode-3.6-as-if.patch 472 BLAKE2B b42518eea02219eae014faea4eea71e475b778de61c8645e21d86fd97bcae8f86accd5063370fdec40054263ede74842491841db48688c85d1796c93c311eff1 SHA512 5209779be9d03b770f679c2be736bc68a710e1c064b1f4a2fbb9963a8ca59a258a22b5d34ed6ac19e7a40ca83c64995f37aa9f466e49841ba2662b89d0789763
 AUX recode-3.6-gettextfix.diff 514 BLAKE2B cbe2dc00927ce9215d1719f78eb78bdea0cc8c5b6b72bc46f43ed14d658396c977053aad83df25a666739e8a431a512ffe4f7d6da9a36b0a5eb90d1c634c8380 SHA512 71408313ed269aeb8b015c171a6d16663e2bc7a3fe5ad4e0dc16ae0ec0e1f769605d92d7e32aec908a42a5ee148cd1f00ad2c069e947c0c4f64fb3b9f7dfb1b3
+AUX recode-3.6-recode.texi.patch 445 BLAKE2B d612b6b513908fdd7756cf3b0d8bf2730071d71acd91d330f32b149bb42fcdc2da353f00bd77e5d39d87abfce3ecb917b97c5471ceb79f6777778f36854fcd9d SHA512 bb25c3d36e77e415577518561f1c4060e923c0f2a992eaa4cf561cc27372820810e7bc8ae3db70dcbf20dc1ba7384370a51c6072a71b1a22c4b71d5a1369fcdb
 DIST recode-3.6.tar.gz 1751886 BLAKE2B 94436343969da0ee6d16ed69a211d4f36b7a9cb59ce931ef71cfc1e0f11e5709e67ee1e0bb24f5320e6c7d6d01920a6c4d9edce87ff2c6aaaa8c80e30f3b536d SHA512 68de277ac8cd5f6023bb077b959ab5778a78edac1299d507bab906824080b6f86e9bfcd89169aa474197c2faa9af2ceb1ed272c8dd4d50caef373afa05daed1b
 DIST recode-3.7.6.tar.gz 2210564 BLAKE2B 8c99b6d2eb93482785fe7e36063514e4c153516cc8059a9b98fc9f1b08704314b7933390a5fd7921525648ef58e9f995242182b8de23b7db33cbf94383e28f29 SHA512 ababefc445fcc47b6bf9ed640b767aed374bb8ce93cdccb641dd1ba5d298360583dd79070a0bb458f1190a8d6f1ddeb3b04eec34a61305b69def0963cec5843f
 DIST recode_3.6-20.debian.tar.gz 341117 BLAKE2B 748ee36b68f1d1501edde23e8afcbd58df70a86745e7c366a27a33496e539dcae11b746fb46767e95ae99b68a18684e3e85c1ea961692ac57ad1a01a895734a7 SHA512 bc586534e77b49da7d387187a8ddb042a12871f87f4f32c818ce7218b7254ac5ba6eccb14aaaf0312579f27958883f2da620016a7049c3af24c8bfba81acc3ef
-EBUILD recode-3.6_p20-r1.ebuild 1639 BLAKE2B df12bfe979aa5b6cedaec6ca58148d972e8ab71905088cbccecaf8ebb516c6fffe53ac96d7a266c5e32756ac2207892219c9634ad540d9a6c88554d13d717f78 SHA512 b0afd29e6b220be63f88ffe9cccc00bed68582ea01b7486490a9ae90f8dc094b3427b15cdb7cb6b0505489782231bc002a7e8a77d41af73cbdaa4e3193cda3d2
+EBUILD recode-3.6_p20-r1.ebuild 1683 BLAKE2B 41458adc86e9e77bf02c0ad8aa3405024efd4ea808f61cda13842ba82f5e4740af30a37432c0a9d332c4c64bfbe027cab73b4a5f7410fe6d40e0d63e9866254b SHA512 d96dfcb1094e9a7b8af27c1b8c42637b59aa3a1a0113787ba19fe0fae3f69b3ef6cf16ccee0e098752da4263e5c4b86b98223ada5741a1cfff65af1e04274050
 EBUILD recode-3.7.6-r1.ebuild 1024 BLAKE2B ecc79b0cc686ea88b765bb1fa035d7c41fd908496daf094dd2c11573a94843faeef067d91ecac570f0058ed81d645c0ab58e4d5fbe6809288e7bb25eaec4dee9 SHA512 a9ed1b358366995d2905796458379ad713bea5ef1e7a807b708b4a22869841b27a14f46adc4af300635dec1333c7bba786259be3546c96602f3977bf42e7da3e
 MISC metadata.xml 346 BLAKE2B 0a6af84d8b6ea322f62bf1f741e332892a60eee2704265685615240a178ddd965f524586179882867e609cef66ef021cfc56950581d1c0915f04a2a669dea9ba SHA512 6c5caba02d69998dc08954f52c9e126db6546eaa0d0f4abc166e96896fdfa8e73371f1206318fa00ebd0f266600c79105d43d5e300c07e7f7b0c3645f9537b2e
diff --git a/app-text/recode/files/recode-3.6-recode.texi.patch b/app-text/recode/files/recode-3.6-recode.texi.patch
new file mode 100644
index 000000000000..bb5b1bcc274d
--- /dev/null
+++ b/app-text/recode/files/recode-3.6-recode.texi.patch
@@ -0,0 +1,11 @@
+--- a/doc/recode.texi	2020-06-23 07:43:20.959074594 -0000
++++ a/doc/recode.texi	2020-06-23 07:43:32.262338563 -0000
+@@ -3713,7 +3713,7 @@
+ between HTML and various other charsets.
+ 
+ Here is a list of those HTML variants which @code{recode} supports.
+-Some notes have been provided by François Yergeau @email{yergeau@@alis.com}.
++Some notes have been provided by Francois Yergeau @email{yergeau@@alis.com}.
+ 
+ @table @code
+ @item XML-standalone
diff --git a/app-text/recode/recode-3.6_p20-r1.ebuild b/app-text/recode/recode-3.6_p20-r1.ebuild
index 5c5b4edfe9e0..6157d48a39db 100644
--- a/app-text/recode/recode-3.6_p20-r1.ebuild
+++ b/app-text/recode/recode-3.6_p20-r1.ebuild
@@ -35,8 +35,9 @@ src_prepare() {
 
 	rm "${WORKDIR}"/debian/patches/series || die
 	epatch \
+		"${FILESDIR}/${MY_P}-recode.texi.patch" \
 		"${FILESDIR}/${MY_P}-gettextfix.diff" \
-		"${FILESDIR}"/${MY_P}-as-if.patch \
+		"${FILESDIR}/${MY_P}-as-if.patch" \
 		"${WORKDIR}"/debian/patches/*
 	sed -i '1i#include <stdlib.h>' src/argmatch.c || die
 
diff --git a/app-text/scdoc/Manifest b/app-text/scdoc/Manifest
index 65c2c453456c..298bb2add157 100644
--- a/app-text/scdoc/Manifest
+++ b/app-text/scdoc/Manifest
@@ -1,8 +1,10 @@
 DIST scdoc-1.10.0.tar.gz 12414 BLAKE2B 3111b3ace102aca2f7da86e510e00f552874817b6b9d754770bd94f9482e4e444a4bc4d44a8317376a6c374bb7363eae96a49281fefd95dd663134087123034b SHA512 546743376380d84aa9c8be65529dbbe1634e574203220ce1c057341436bd3a15297f393ca79d29372cb125bf457cfc00f64ba2867b8d2e910ca6531acb552e97
 DIST scdoc-1.10.1.tar.gz 12422 BLAKE2B 4aa5b28994cd03f5d3fc9fff253a02f1052653d25d41225665219ebb6322ebe69f2671d91c5cfe201fd7f9b1ac06f38db3dd126492da06fef0b692fc040300d5 SHA512 356aee85c4676a1fbd7367c6087dd7f6f4d33793be0f3fef74803ceb93c0a9e45c78022d219dc08a7d79d71c393849fa3113c36a85d5d60ed474b62bf5f89743
+DIST scdoc-1.11.0.tar.gz 12616 BLAKE2B 3aec60e51b949dc94e8339e400c366428a217c1bd44f79716cbd6993a7f8051a0796dc96163e071db4808c0edde071408e3eb1ee0ae3bb8ccd718479960ab8f3 SHA512 4c8248a12e69e53cc2182af5375912f7af64f3807163dbe3c52e85d817b1bfa7e461d02a627c73d93bdaa96e49668ff894d37817ceb70ee3186da9e3f8372d49
 DIST scdoc-1.9.3.tar.gz 11479 BLAKE2B 79aa3f18104e06722f087e9c2fa047f6e19fe8eb47ba0b4e6fa86f7abdc52b06a2dfcfd632b16dc7bce6e5ef3b0dbb40ce9170e678bc17c0a4e43dcc0099a1dc SHA512 77be81f042e2099de7fc84b0161bc8a95d5c3dde662284613d84a1e249fa0aa51dad73f53f265c833526d40f5e1f19fce99dc5cd6df35efb0a323c3db6084a55
 EBUILD scdoc-1.10.0.ebuild 1165 BLAKE2B aa225065ba9decac9e3a4beb0331f740c3d1513e2d775d0e74e7d619609c474915d75b3b18b84284a353eaf197681a050e68eae0c0cbf5fe6d82dea0fc6e7738 SHA512 ddd56e88a5e19c0282252035b653512bd62cec03de42b6311e443954f86708440d8488522c0dc0d3e575513ceff313c6b630914d746eedc4582bb8ba00fe076d
 EBUILD scdoc-1.10.1.ebuild 1168 BLAKE2B ebe65c78c3eefe79dc5efa4a5a76abe1480ce975ca0dec3de56e74e37f8af799cf1f878e0019b4d69231470aaa507287dcae8c3005bbda2c48007784a2f2b0d1 SHA512 bcfd36c54713470010a6ccb3d3066a83d9e4090fb1ec9c365ab0e9aebac743275dfb79a0ddb9e0392122711dd7e55d2a2e83911c5f7bc9471cffaadf58b9d591
+EBUILD scdoc-1.11.0.ebuild 1168 BLAKE2B ebe65c78c3eefe79dc5efa4a5a76abe1480ce975ca0dec3de56e74e37f8af799cf1f878e0019b4d69231470aaa507287dcae8c3005bbda2c48007784a2f2b0d1 SHA512 bcfd36c54713470010a6ccb3d3066a83d9e4090fb1ec9c365ab0e9aebac743275dfb79a0ddb9e0392122711dd7e55d2a2e83911c5f7bc9471cffaadf58b9d591
 EBUILD scdoc-1.9.3-r1.ebuild 1165 BLAKE2B acddab79253fec1c4e2c59f8ee70b9ab0d86c4fea2784a41afe94aa62909af7b2664e20f69b610484452aaeaf1ed597567439af8b4aa12e0462226b9c8108522 SHA512 9e8bf612cf40478c23dae4fa2934a09115f9ee813d2a9eb904710c638b605ad28a9938a7f90a0e6da024e0338e7dfbce66cf79f3e202c992a1140a0bc0b10eba
 EBUILD scdoc-9999.ebuild 1168 BLAKE2B ebe65c78c3eefe79dc5efa4a5a76abe1480ce975ca0dec3de56e74e37f8af799cf1f878e0019b4d69231470aaa507287dcae8c3005bbda2c48007784a2f2b0d1 SHA512 bcfd36c54713470010a6ccb3d3066a83d9e4090fb1ec9c365ab0e9aebac743275dfb79a0ddb9e0392122711dd7e55d2a2e83911c5f7bc9471cffaadf58b9d591
 MISC metadata.xml 422 BLAKE2B ec662d4bd34390be05318e8816524f206decf6e3cf97ee6e132405a7a2bdd33839b5b82e8083bd3fedc8d390871275ecc9490252cdeb883994e35d511cb8b7d4 SHA512 09dc27076a9ffd2c3f94b40b9df84cbb02317dee7235cb0ce358890c93667dacfc3a7adfe09cf949b8f63970983a7ed7ff654a9ec290b58c6f4ac6b05f9579e1
diff --git a/app-text/scdoc/scdoc-1.11.0.ebuild b/app-text/scdoc/scdoc-1.11.0.ebuild
new file mode 100644
index 000000000000..15ecbe1b112a
--- /dev/null
+++ b/app-text/scdoc/scdoc-1.11.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Standalone tool for generating man pages with a simple syntax"
+HOMEPAGE="https://git.sr.ht/~sircmpwn/scdoc"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/scdoc"
+	inherit git-r3
+else
+	SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+src_prepare() {
+	default
+
+	sed -e 's/-Werror//' \
+		-i Makefile || die 'Failed to patch Makefile'
+}
+
+src_compile() {
+	local MY_HS="./scdoc"
+	if tc-is-cross-compiler; then
+		tc-export_build_env
+		MY_HS="./hostscdoc"
+		emake scdoc HOST_SCDOC="./hostscdoc" OUTDIR="${S}/.build.host" CC="$(tc-getBUILD_CC)" \
+			CFLAGS="${BUILD_CFLAGS} -DVERSION='\"${PV}\"'" LDFLAGS="${BUILD_LDFLAGS}"
+		mv scdoc hostscdoc || die 'Failed to rename host scdoc'
+	fi
+	emake LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" \
+	PCDIR="${ED}/usr/$(get_libdir)/pkgconfig" install
+}
diff --git a/app-text/texlive/Manifest b/app-text/texlive/Manifest
index 8ceee5037055..113ff209b5b7 100644
--- a/app-text/texlive/Manifest
+++ b/app-text/texlive/Manifest
@@ -1,2 +1,2 @@
-EBUILD texlive-2020-r1.ebuild 7176 BLAKE2B 4c2b8a642956e537d8d285680addb2d5753d01b0627c1dc910e4f4b3740b5afdc3d14ad0fba94213eab23d63045716487f5859b45d738288305afb00ac17ec4f SHA512 80f64b08b905c05c392207c9a98cb1c72c0c59cf2f2595d1ffdc50f68eb1569611b7a212fe0e5fb71ee70f0478fddad1e9ff56548e8e34b381cadbd83b82f88c
+EBUILD texlive-2020-r3.ebuild 6984 BLAKE2B 4e5eff7a8c961922a2ba012a65d8d6ce239e11d9137839ac6fcc39a7f892e0c14c348941c69cea86b0fc8d4e0a229ec9a2658aac3016de2c8e02eb201b3b84ad SHA512 5b65064c1ff7b810e1a606a89321bb513bd18427c6ab13c9fe214e29e0f40243207b2a73d61cdbd51f3f1416eb91410ad4176c97ecc74715af2f8c283e2e71e3
 MISC metadata.xml 2321 BLAKE2B fc9c387d08100e543a6752ee7644f878c9430db5f2f66b5d16991dc292cf8ac01fc80bb6d805a8d6694edabffb68bc23f031974eece051114809c90deaa32941 SHA512 ca224c87c1bae60752d3d77b62b5a54632bd42379551523f479d8b470ad61c91ac34ddd4c7539f4bd667ae4f60f08d10726f31329b7fc194a24b6d4c642ab536
diff --git a/app-text/texlive/texlive-2020-r1.ebuild b/app-text/texlive/texlive-2020-r1.ebuild
deleted file mode 100644
index 37295dbf78dd..000000000000
--- a/app-text/texlive/texlive-2020-r1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="A complete TeX distribution"
-HOMEPAGE="http://tug.org/texlive/"
-
-LICENSE="metapackage"
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="cjk context detex dvi2tty extra epspdf games graphics
-humanities jadetex luatex metapost music pdfannotextractor png pstricks publishers
-science tex4ht texi2html truetype xetex xml X"
-
-LANGS="af ar as bg bn br ca cs cy da de el en eo es et eu fa fi fr ga gl gu he
-	hi hr hsb hu hy ia id is it ja ko kn la lo lt lv ml mn mr nb nl nn no or pa
-	pl pt rm ro ru sa sco sk sl sq sr sv ta te th tk tr uk vi zh"
-
-for X in ${LANGS}; do
-	IUSE="${IUSE} l10n_${X}"
-done
-
-TEXLIVE_CAT="dev-texlive"
-
-DEPEND=">=app-text/texlive-core-${PV}"
-RDEPEND="${DEPEND}
-	app-text/psutils
-	>=${TEXLIVE_CAT}/texlive-fontutils-${PV}
-	media-gfx/sam2p
-	texi2html? ( app-text/texi2html )
-	sys-apps/texinfo
-	app-text/t1utils
-	>=app-text/lcdf-typetools-2.92[kpathsea]
-	truetype? ( >=app-text/ttf2pk2-2.0_p20150521 )
-	detex? ( dev-tex/detex )
-	app-text/ps2eps
-	dvi2tty? ( dev-tex/dvi2tty )
-	png? ( app-text/dvipng )
-	X? ( >=app-text/xdvik-22.87 )
-	>=${TEXLIVE_CAT}/texlive-basic-${PV}
-	>=${TEXLIVE_CAT}/texlive-fontsrecommended-${PV}
-	>=${TEXLIVE_CAT}/texlive-latex-${PV}
-	luatex? ( >=${TEXLIVE_CAT}/texlive-luatex-${PV} )
-	>=${TEXLIVE_CAT}/texlive-latexrecommended-${PV}
-	>=dev-tex/latex-beamer-3.36
-	metapost? ( >=${TEXLIVE_CAT}/texlive-metapost-${PV}-r1 )
-	>=${TEXLIVE_CAT}/texlive-plaingeneric-${PV}
-	pdfannotextractor? ( dev-tex/pdfannotextractor )
-	extra? (
-		dev-tex/chktex
-		app-text/dvisvgm
-		dev-tex/latexdiff
-		>=dev-tex/latexmk-418
-		>=app-text/pdfjam-2.02
-		>=${TEXLIVE_CAT}/texlive-bibtexextra-${PV}
-		>=${TEXLIVE_CAT}/texlive-fontsextra-${PV}
-		>=${TEXLIVE_CAT}/texlive-formatsextra-${PV}
-		>=${TEXLIVE_CAT}/texlive-latexextra-${PV}
-			>=dev-tex/glossaries-2.07
-			>=dev-tex/leaflet-20041222
-			>=dev-tex/currvita-0.9i-r1
-			>=dev-tex/g-brief-4.0.2
-			>=dev-tex/envlab-1.2-r1
-			>=dev-tex/europecv-20060424-r1
-			>=dev-tex/svninfo-0.7.3-r1
-	)
-	xetex? ( >=${TEXLIVE_CAT}/texlive-xetex-${PV} )
-	graphics? ( >=${TEXLIVE_CAT}/texlive-pictures-${PV}
-		dev-tex/dot2texi )
-	epspdf? ( app-text/epspdf )
-	science? ( >=${TEXLIVE_CAT}/texlive-mathscience-${PV} )
-	publishers? ( >=${TEXLIVE_CAT}/texlive-publishers-${PV} )
-	music? ( >=${TEXLIVE_CAT}/texlive-music-${PV} )
-	pstricks? ( >=${TEXLIVE_CAT}/texlive-pstricks-${PV} )
-	context? ( >=${TEXLIVE_CAT}/texlive-context-${PV} )
-	games? ( >=${TEXLIVE_CAT}/texlive-games-${PV} )
-	humanities? ( >=${TEXLIVE_CAT}/texlive-humanities-${PV} )
-	tex4ht? ( >=dev-tex/tex4ht-20090611_p1038-r3 )
-	xml? (
-		>=dev-tex/xmltex-1.9-r2
-		app-text/passivetex
-	)
-	jadetex? ( >=app-text/jadetex-3.13-r2 )
-	l10n_af?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_ar?    ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
-	l10n_fa?    ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
-	l10n_hy?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	cjk? ( >=${TEXLIVE_CAT}/texlive-langcjk-${PV}
-		   >=dev-tex/cjk-latex-4.8.4 )
-	l10n_hr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_bg?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	l10n_br?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_ru?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	l10n_uk?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	l10n_cs?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV}
-	              >=app-text/vlna-1.3 )
-	l10n_sk?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} )
-	l10n_da?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_nl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_en?    ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
-	l10n_fi?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_eu?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
-	l10n_fr?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
-	l10n_de?    ( >=${TEXLIVE_CAT}/texlive-langgerman-${PV} )
-	l10n_el?    ( >=${TEXLIVE_CAT}/texlive-langgreek-${PV} )
-	l10n_he?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_hu?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_as?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_bn?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_gu?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_hi?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_kn?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_ml?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_mr?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_or?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_pa?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_sa?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_ta?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_te?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_it?    ( >=${TEXLIVE_CAT}/texlive-langitalian-${PV} )
-	l10n_ja?    ( >=${TEXLIVE_CAT}/texlive-langjapanese-${PV} )
-	l10n_ko?    ( >=${TEXLIVE_CAT}/texlive-langkorean-${PV} )
-	l10n_la?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_lt?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_lv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_mn?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	l10n_nb?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_nn?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_no?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_cy?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_eo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_et?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_ga?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_rm?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_hsb?   ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_ia?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_id?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_is?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_lo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_ro?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_sq?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_sr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV}
-	              >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	l10n_sl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_tr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_pl?    ( >=${TEXLIVE_CAT}/texlive-langpolish-${PV} )
-	l10n_pt?    ( >=${TEXLIVE_CAT}/texlive-langportuguese-${PV} )
-	l10n_ca?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
-	l10n_gl?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
-	l10n_es?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
-	l10n_sco?   ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_sv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_tk?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_vi?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_zh?    ( >=${TEXLIVE_CAT}/texlive-langchinese-${PV} )
-"
diff --git a/app-text/texlive/texlive-2020-r3.ebuild b/app-text/texlive/texlive-2020-r3.ebuild
new file mode 100644
index 000000000000..a75573b772d6
--- /dev/null
+++ b/app-text/texlive/texlive-2020-r3.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="http://tug.org/texlive/"
+
+LICENSE="metapackage"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="cjk context detex dvi2tty extra epspdf games graphics
+humanities jadetex luatex metapost music pdfannotextractor png pstricks publishers
+science tex4ht texi2html truetype xetex xml X"
+
+LANGS="af ar as bg bn br ca cs cy da de el en eo es et eu fa fi fr ga gl gu he
+	hi hr hsb hu hy ia id is it ja ko kn la lo lt lv ml mn mr nb nl nn no or pa
+	pl pt rm ro ru sa sco sk sl sq sr sv ta te th tk tr uk vi zh"
+
+for X in ${LANGS}; do
+	IUSE="${IUSE} l10n_${X}"
+done
+
+TEXLIVE_CAT="dev-texlive"
+
+DEPEND=">=app-text/texlive-core-${PV}"
+RDEPEND="${DEPEND}
+	app-text/psutils
+	>=${TEXLIVE_CAT}/texlive-fontutils-${PV}
+	media-gfx/sam2p
+	texi2html? ( app-text/texi2html )
+	sys-apps/texinfo
+	app-text/t1utils
+	>=app-text/lcdf-typetools-2.92[kpathsea]
+	truetype? ( >=app-text/ttf2pk2-2.0_p20150521 )
+	detex? ( dev-tex/detex )
+	app-text/ps2eps
+	dvi2tty? ( dev-tex/dvi2tty )
+	png? ( app-text/dvipng )
+	X? ( >=app-text/xdvik-22.87 )
+	>=${TEXLIVE_CAT}/texlive-basic-${PV}
+	>=${TEXLIVE_CAT}/texlive-fontsrecommended-${PV}
+	>=${TEXLIVE_CAT}/texlive-latex-${PV}
+	luatex? ( >=${TEXLIVE_CAT}/texlive-luatex-${PV} )
+	>=${TEXLIVE_CAT}/texlive-latexrecommended-${PV}
+	>=dev-tex/latex-beamer-3.36
+	metapost? ( >=${TEXLIVE_CAT}/texlive-metapost-${PV}-r1 )
+	>=${TEXLIVE_CAT}/texlive-plaingeneric-${PV}
+	pdfannotextractor? ( dev-tex/pdfannotextractor )
+	extra? (
+		dev-tex/chktex
+		app-text/dvisvgm
+		dev-tex/latexdiff
+		>=dev-tex/latexmk-418
+		>=app-text/pdfjam-2.02
+		>=${TEXLIVE_CAT}/texlive-bibtexextra-${PV}
+		>=${TEXLIVE_CAT}/texlive-fontsextra-${PV}
+		>=${TEXLIVE_CAT}/texlive-formatsextra-${PV}
+		>=${TEXLIVE_CAT}/texlive-latexextra-${PV}-r2
+		>=dev-tex/glossaries-2.07
+	)
+	xetex? ( >=${TEXLIVE_CAT}/texlive-xetex-${PV} )
+	graphics? ( >=${TEXLIVE_CAT}/texlive-pictures-${PV}-r2 )
+	epspdf? ( app-text/epspdf )
+	science? ( >=${TEXLIVE_CAT}/texlive-mathscience-${PV} )
+	publishers? ( >=${TEXLIVE_CAT}/texlive-publishers-${PV} )
+	music? ( >=${TEXLIVE_CAT}/texlive-music-${PV} )
+	pstricks? ( >=${TEXLIVE_CAT}/texlive-pstricks-${PV} )
+	context? ( >=${TEXLIVE_CAT}/texlive-context-${PV} )
+	games? ( >=${TEXLIVE_CAT}/texlive-games-${PV} )
+	humanities? ( >=${TEXLIVE_CAT}/texlive-humanities-${PV} )
+	tex4ht? ( >=dev-tex/tex4ht-20090611_p1038-r3 )
+	xml? (
+		>=dev-tex/xmltex-1.9-r2
+		app-text/passivetex
+	)
+	jadetex? ( >=app-text/jadetex-3.13-r2 )
+	l10n_af?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ar?    ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
+	l10n_fa?    ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
+	l10n_hy?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	cjk? ( >=${TEXLIVE_CAT}/texlive-langcjk-${PV}
+		   >=dev-tex/cjk-latex-4.8.4 )
+	l10n_hr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_bg?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_br?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_ru?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_uk?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_cs?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV}
+	              >=app-text/vlna-1.3 )
+	l10n_sk?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} )
+	l10n_da?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_nl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_en?    ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
+	l10n_fi?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_eu?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
+	l10n_fr?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
+	l10n_de?    ( >=${TEXLIVE_CAT}/texlive-langgerman-${PV} )
+	l10n_el?    ( >=${TEXLIVE_CAT}/texlive-langgreek-${PV} )
+	l10n_he?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_hu?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_as?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_bn?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_gu?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_hi?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_kn?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ml?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_mr?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_or?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_pa?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_sa?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ta?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_te?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_it?    ( >=${TEXLIVE_CAT}/texlive-langitalian-${PV} )
+	l10n_ja?    ( >=${TEXLIVE_CAT}/texlive-langjapanese-${PV} )
+	l10n_ko?    ( >=${TEXLIVE_CAT}/texlive-langkorean-${PV} )
+	l10n_la?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_lt?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_lv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_mn?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_nb?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_nn?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_no?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_cy?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_eo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_et?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_ga?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_rm?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_hsb?   ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ia?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_id?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_is?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_lo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ro?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_sq?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_sr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV}
+	              >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_sl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_tr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_pl?    ( >=${TEXLIVE_CAT}/texlive-langpolish-${PV} )
+	l10n_pt?    ( >=${TEXLIVE_CAT}/texlive-langportuguese-${PV} )
+	l10n_ca?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_gl?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_es?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_sco?   ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_sv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_tk?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_vi?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_zh?    ( >=${TEXLIVE_CAT}/texlive-langchinese-${PV} )
+"
diff --git a/app-text/txt2man/Manifest b/app-text/txt2man/Manifest
index 8bf0eca7df60..9fb73b95190d 100644
--- a/app-text/txt2man/Manifest
+++ b/app-text/txt2man/Manifest
@@ -1,5 +1,7 @@
 DIST txt2man-1.6.0.tar.gz 16941 BLAKE2B 4ca7d13bb61b0b65ff47a6a6f37c5035910804cff71f0c6d848105d7ee9b8285fd6433fe019fc075a5b28769df5044a462296ad63514d44a75abc1fa552b64ba SHA512 7ec2cc0bb685d890cf06504d4faacf7a02c5a321963effb71ff63b7310f64f092e666c055c1dbdb699958a62272fe4dc0f31f3947ca6895aa425753a11b75379
 DIST txt2man-1.7.0.tar.gz 17142 BLAKE2B 56dd6e09ed52cac0b203f68b6fe56550b13f4d2e6ca54cc816cc89e29e9ad65b5b9d36e94fb107139d4d4afd400f0b33c35eb824a0ca66dd7ec66b6b4eb25f7d SHA512 55cc51d32bbc47f3ec1b33aeb733fdbf4194d5cc8ed124a3f3f4afa90ed6f025a7684a8c1babdb5b5a65f716eb76ea2a6628261523b00110406b94f922ba825a
+DIST txt2man-1.7.1.tar.gz 15976 BLAKE2B 6d9d3947b3ed76e62c1295431f22a1eb00e9e9068623cae7a3ac853aa6fc4b5bda1db8969fbf2798b84daf84a46ad29e9bf9945cf62b51b90592300e255a3e2b SHA512 550b1d30a4435f35d03920d89f5f2adc2a937de7575c4ddc51ee9f4fe370975b45e51f5aec0eb865ead4b16d88ad31f3150cd3235362b1fc7e6d7b3c6233852a
 EBUILD txt2man-1.6.0.ebuild 609 BLAKE2B 5791269461f773391ba2080795d7689a9347d36bde85bd2152e62f7215368c47df1e82f2b31d7827c6bb2765976871e31dee9cd06efb3b4811cc657d72332f60 SHA512 312045664e536ae8147e641fda6a3726ad629682f1fe3ef1696a8cd8163fd115ee6082747612157e003cdc62269e108afff65d75c68d505d4865092923bf794f
 EBUILD txt2man-1.7.0.ebuild 615 BLAKE2B b48cb60e8d392a7b2fb1f17aa04a83da7cff32574027cd5fe02551225cf0c43c3405a470157cfd3ec6abb96a14d64e894354f2a4d0c032b90d5e1476b8a95baa SHA512 e619cb6677bf3da4f88993c8b0dbe0efa74ae3a986c9888297d09c741a0d313cef7c4133d8609a04eafd09dd23058b98d7bb498b4952f15d39b782a17c2d9380
+EBUILD txt2man-1.7.1.ebuild 602 BLAKE2B 623ab5c12b5e67319fcc11bb43a44aca60e01f581842f0aad6cff719eba6551e2f35e9b716d7f60dc5b4a5b99e761d7fd2652e541cce1779328c8d5fbc32f5c8 SHA512 74c78ac586d3a8dd930853de88dfa429ceba69f4dfb58d166dfe8d601b88248d97e5f308468345b1396261b11d064aabe880ec8bcd29cee30c8d917e5545e211
 MISC metadata.xml 308 BLAKE2B ed6f6f83ed571ef3966c646eb0b58cb8e711f9ddce51fe8e97e0a961c5d2c88fbce7199308f5460005a393ae8b1854037e152d81290e97aba71465d96cc67159 SHA512 bf9580b121de871786c26826a398b5e0c5108b61da60fbbd797a6ff58360f7c983541574bddcf4ee8809ea0ca603a4bb1ace88e725484227fe810a44608ed51b
diff --git a/app-text/txt2man/txt2man-1.7.1.ebuild b/app-text/txt2man/txt2man-1.7.1.ebuild
new file mode 100644
index 000000000000..bc21fe17a3aa
--- /dev/null
+++ b/app-text/txt2man/txt2man-1.7.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Scripts to convert regular ASCII text to man pages"
+HOMEPAGE="https://github.com/mvertes/txt2man"
+SRC_URI="https://github.com/mvertes/txt2man/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND="app-shells/bash
+	sys-apps/gawk"
+
+S="${WORKDIR}/${PN}-${P}"
+
+DOCS=( Changelog README )
+
+src_install() {
+	emake prefix="${ED}/usr" install
+	einstalldocs
+}
diff --git a/app-text/vgrep/Manifest b/app-text/vgrep/Manifest
new file mode 100644
index 000000000000..8ff2f50aeda1
--- /dev/null
+++ b/app-text/vgrep/Manifest
@@ -0,0 +1,3 @@
+DIST vgrep-2.3.1.tar.gz 1149421 BLAKE2B c4c9a414bba5e509d57faa9ca6f6ce5cae1dbb001ff8b410ad54691ec6bf39f41c535fd25bdd5d93fdf89b4e4b49acf4dfa9a8956653e5c5e2ce39bd7da8d484 SHA512 0fa65151ae40f7fefc4e5b1af8e6ea332b50b1136849ec0902dd110786ca14204441e27c65a036b08fa56bf04a6325d8aa8ef2d4d02cdb0e0fe219896e24d694
+EBUILD vgrep-2.3.1.ebuild 656 BLAKE2B 8d1ec68257d10e042ec75ca12b8f8a0df43f7ecb92ae3be1dffed18cbb326e713b95e460b3c630919b40ec51af30dbe71f82e0f011381b2ba8ce754cffd7e45c SHA512 254a81ae86eed74e50457ebe1041eb526340c6f9075044a68853d802d7f2d724791790b5912db9eae76e3180046d0ef7f4aef253623eb8d0f0c43a20310ab5b8
+MISC metadata.xml 394 BLAKE2B 52d95eb8f47c5002203258b8077e0104423472b1f4bdae387fa8194b5056fd4986a9b795d0bbaa7939497ce45ff2ee0ca90e1c44ebeaf31b40725b36ddf1390a SHA512 9f44f00b50a654d27819e20172dc338d3dac8abcdac3933df88153156871612e1c414dcc5b0590795eb58c972302c3b54546b7dbbd539ca60737bcfa5a8989f3
diff --git a/app-text/vgrep/metadata.xml b/app-text/vgrep/metadata.xml
new file mode 100644
index 000000000000..4965843d0e80
--- /dev/null
+++ b/app-text/vgrep/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>whissi@gentoo.org</email>
+		<name>Thomas Deutschmann</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/vrothberg/vgrep/issues</bugs-to>
+		<remote-id type="github">vrothberg/vgrep</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/vgrep/vgrep-2.3.1.ebuild b/app-text/vgrep/vgrep-2.3.1.ebuild
new file mode 100644
index 000000000000..f50049ccd32f
--- /dev/null
+++ b/app-text/vgrep/vgrep-2.3.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit go-module
+
+DESCRIPTION="A pager for grep, git-grep and similar grep implementations"
+HOMEPAGE="https://github.com/vrothberg/vgrep"
+SRC_URI="https://github.com/vrothberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-3+ MIT MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Uses golangci-lint
+RESTRICT="test"
+
+DOCS=( README.md )
+
+# go binary
+QA_PRESTRIPPED="usr/bin/vgrep"
+
+src_compile() {
+	emake build
+}
+
+src_install() {
+	local prefix="${D}/usr"
+	mkdir -p "${prefix}"/bin || die
+
+	emake PREFIX="${prefix}" install
+}
diff --git a/app-text/xapers/Manifest b/app-text/xapers/Manifest
index 6595defbca3b..2f81c2f80b66 100644
--- a/app-text/xapers/Manifest
+++ b/app-text/xapers/Manifest
@@ -1,3 +1,4 @@
 DIST xapers-0.8.2.tar.gz 160938 BLAKE2B cb21d04146f0cca39f1a706641e4cd2a83a796cbf4eb096379367203d91811c20798638a27215e9fdd9ffb32de908a389b0af57200f19bf4d2c8477a9c82ca93 SHA512 cdf1d4791dd48f579f9ee019492c26d10c9855c1ceef2c15bdc81dfdab0f1d74f54db453bb60a9d297a155a55d73cd26ff192875b4ee2b80d8f9f5d35a4bbcc9
+EBUILD xapers-0.8.2-r1.ebuild 753 BLAKE2B 56018b0006954269ce43a991bb2c80a0fcb8bdba21437bc36b522b33209c565b961539830eb038b7858bc73cc041d1b4d1c0e2ee7f6dd43b5817bb5474e0ab7e SHA512 52a5b97d1f454e8ddd90a2b5342f91e09dbce32aa63a4ad31211c4638615def445bc0ac317fc67d6c650270e8c4f0e55e6aa14e557e15b0c296e6e8e390da3ed
 EBUILD xapers-0.8.2.ebuild 665 BLAKE2B 74ded3c69b277243be799924fe3abd57f517dbb2075f01c67ab955f88cfdd4c050c8fb9d5df415c60917d24973c6d9f567ede69038a0f13f74b6fc34d2cd5330 SHA512 f9d2eb51bd7a2c33c1ff1e44a1f2b3c04a205856c2adefaa03096e1fc4652ca4d282e2b112fb5bb414f657faa7489054a3c53258ca6ba96f2652f2bdfc3dbc67
-MISC metadata.xml 687 BLAKE2B b94d3d3f42be513d61d5e594ed9fbf13e83f3141d4dab74c48f396b411994c512a6aeb401e884b4891e17ac45f0329f52672dd3513420084e524a2548337bd26 SHA512 15bc8e58aec03907425c6d2ed011223b1e0b5925329e137f4f4ce0ff92b3ead2b22a3988a417164d51546c01c36172969bb6cd50fbd36a21f6dd99db1b89a944
+MISC metadata.xml 553 BLAKE2B 94c65255d3a407dd26f92c44f904dbf5e3d5a969a0e93203c11d68c92766060bdfd62615513cff9f1bd74ba7e124b066b6eec2a8fc434c564ec7c5486ecb728c SHA512 41a492b7a1c2e33d2ea0c44bdd480027e7e578139faf00da7f1e0226b3011d03963dcd7b221e5d065c762797a24f8c04c8a34c16dbe92c70ee7aa30764423758
diff --git a/app-text/xapers/metadata.xml b/app-text/xapers/metadata.xml
index b2b0bbc66d70..5b6ab9a1eabd 100644
--- a/app-text/xapers/metadata.xml
+++ b/app-text/xapers/metadata.xml
@@ -9,9 +9,6 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy maintainers</name>
   </maintainer>
-  <longdescription>
-    Xapers is a personal document indexing system, geared towards academic journal articles.
-  </longdescription>
   <upstream>
     <maintainer status="active">
       <name>Jameson Graef Rollins</name>
diff --git a/app-text/xapers/xapers-0.8.2-r1.ebuild b/app-text/xapers/xapers-0.8.2-r1.ebuild
new file mode 100644
index 000000000000..808db0ee8572
--- /dev/null
+++ b/app-text/xapers/xapers-0.8.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2016-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="Personal document indexing system"
+HOMEPAGE="https://finestructure.net/xapers/"
+SRC_URI="https://finestructure.net/xapers/releases/${P}.tar.gz"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="app-text/poppler[utils]
+	dev-libs/xapian-bindings[python,${PYTHON_USEDEP}]
+	dev-python/pybtex[${PYTHON_USEDEP}]
+	dev-python/pycurl[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]
+	x11-misc/xclip
+	x11-misc/xdg-utils"
+
+BDEPEND="test? ( ${RDEPEND} )"
+
+src_test() {
+	cd test || die
+	./all || die
+}
diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index 21a8b93b91ae..4a6d2eebb3aa 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-r2.ebuild 2052 BLAKE2B f3f70ce614ebcf02b6111d1c04d6a9a644132e53cdd1c685db721ebb21fef1d9c2ff58c549e74d46ed6000446965a2c64eef991fbc7d33d1b040bd9f72a4dd19 SHA512 cff5d3d6b097e1ec7ee6b48db0bc06dcefc35e2b202384624d8b0c2426237839b676fc0eb84b927441dfe96727c576c78a4d7f26e121d8a198e35571d22181ff
-EBUILD xiphos-4.1.0-r2.ebuild 2005 BLAKE2B 5510d77d42d30c111a5b94b7126ceb36810d33cfe054df99c8be7e41b8354ff6f5cb06b3d91419ff6fe62ee847e2805ab4e852c81f4b851fa14399cef4f69812 SHA512 9b61fe086183c8710bdebe616ad6f6ea6b6b231e9c70eb8a9877efc66d8dab5110e5162925d0a5e7b13f9eb0b0e789aafdfa93ed23d568097ee9914074c90384
+EBUILD xiphos-4.0.6a-r2.ebuild 2053 BLAKE2B b9bd97ee6e3da5a10b98db3eaf45e6d5a746e852e4b7762e9fafca1213c471794035170fb9b43563144e7666709e749aa8748701435331e399d647441ca12ec6 SHA512 1a9b16294c1013f4b35da37c3bd3c6169e3e067f95f8d9505ab1042294df1c5d4877eb9353018f1ff71843e915c676127157b4c4a8d27ac77a4ee42f64c629d5
+EBUILD xiphos-4.1.0-r2.ebuild 2006 BLAKE2B 2c54a0561b481fffd95e5a88257b19033725c970c21e45fcb579ef1cded0506d5b08bbbdb91486cfff6709798b541f9978cc164c7458a7267c9417e55335c0b4 SHA512 a8fec9304f9136dcc9be657bbde58871ce4f2433a94919a769dba56dc1992278cc3906c5817812343504a47cfedbc514b9a0b5f3519fa3be5cd4ce8d58c35964
 MISC metadata.xml 300 BLAKE2B 84a7c7a8de67cb50a6c042a07d91b56067bec4e449c2a888d77f9c17ae23f5cf82f59d32237dd649af9b34bcd13df34f0fe19997ac57f7b468db4f50b281829c SHA512 0e8ea5d19ca48a68c4266c8cefb5c29d43d56c2ba61f271460ac35d5d8be18486c84ade898e2a8b647648afa24a19ee04ee60f2fca5a0fe358920deec2418340
diff --git a/app-text/xiphos/xiphos-4.0.6a-r2.ebuild b/app-text/xiphos/xiphos-4.0.6a-r2.ebuild
index dd5177d45fa9..7521fa24db4e 100644
--- a/app-text/xiphos/xiphos-4.0.6a-r2.ebuild
+++ b/app-text/xiphos/xiphos-4.0.6a-r2.ebuild
@@ -8,7 +8,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/"
+HOMEPAGE="https://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"
diff --git a/app-text/xiphos/xiphos-4.1.0-r2.ebuild b/app-text/xiphos/xiphos-4.1.0-r2.ebuild
index 24314a606c49..49bfe5394fce 100644
--- a/app-text/xiphos/xiphos-4.1.0-r2.ebuild
+++ b/app-text/xiphos/xiphos-4.1.0-r2.ebuild
@@ -6,7 +6,7 @@ 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/"
+HOMEPAGE="https://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"
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index e4ed970e2dd3..89c7facbf300 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -1,8 +1,8 @@
 DIST zathura-0.4.3.tar.xz 145796 BLAKE2B fe360d6ea2a11138324784beec8e8ebe0eaa83e4e682785a50265bbd0a77be0dcab4cd523923462398faaf918a4d304de148d64972dc9b6cb96578476e0ae6eb SHA512 427948025c20b2badb00921d03ec83e26806fd90d0d50cdcf0f3bcf645cd7206695faa3b5a7698d3d70b9bd60e8e68c920cf1e7f29855dd11a1a8ce6a7f8160b
 DIST zathura-0.4.4.tar.gz 194105 BLAKE2B dc99005c6e967a46af0db0001193d1b1551e9adb78acc88343096407ed4a61b889be600acaf83b45bd603e3b7c4b93402f619e06e7146089d4990309d3301d5f SHA512 8d1e5969cc2f9502d7d966d3341c8f7437422f2dcf952bc2567a5061e611c6fe90c2bc6670963d81b608aa621d70f77ec513d6ab9f03304894bd9ac648aaa6e7
 DIST zathura-0.4.5.tar.gz 195275 BLAKE2B c50793fac6e473c7ccc4cccf15674dd8f33c504675e95501d05dc396dc4803f327e0144c72e6182671118ec1234cbd5a75ad8b6ea129bc7d471e683ff90ad392 SHA512 9ce6c7745d83d7e21fcbbc6a7c799a4223cf77afbe1c933b710c1c7920c98ae1edcf683ae42433f448a091eb317f2b71b3bde9d1b27c8089d1adbc9aa0ab4e78
-EBUILD zathura-0.4.3.ebuild 1333 BLAKE2B ad5146cdea9826b8d22bf95d47dc0dcfc02989ae7acd5c085cdbccb61a3b69fe2eb3aa7a44866efe71387da6d63490f37f4d19f01a4a0cdffdd680a52cd60e02 SHA512 cca06811020ead3fbc6d56aa54f1d6e5b73ab03874c5a59c885db015aeb8a9841f6f3d43562bcd0dc3a305d1faec8b7f4473f16ff7107740fc02b330869390fd
-EBUILD zathura-0.4.4.ebuild 1346 BLAKE2B bc8eae75f9e3c766eafbfd96e692cf5733d82c502159b0d56007f8dcb0238b13aed2543e23e3737419fc54b5dfe1ed4ac83b1c27bdeffc05ae18940517a7377f SHA512 d241a6f6daa64522e99f188c17b87dd0d89473800d487dcb50fda99942f05c58d66f2a551bb314e82bb2f691ea88e4efa27c715fc3d3163dd7e5818c20012337
-EBUILD zathura-0.4.5.ebuild 1349 BLAKE2B eb2974163405117618ac3fd188b48270ae117d519206e71aa10fb675ae26009a5d8966a81ed5484ff266cd96a1bccdb3a9166d1a207d12f87457841a87be43cb SHA512 1e9c6535854d0b17dd49165097fa30bb52b34e95806e9df9387e9f183d88af85c883249f215322091c23d02fc4df64abba9bf91427b838b3fa664ffe7aade14b
-EBUILD zathura-9999.ebuild 1349 BLAKE2B 1e27a0335f223fcab2330c4650a736f6c7c595c711ba1be8f04eec3375ead89f735c347eb2231d3ea2ba29153d713e63b354d4623012cf4ad94bcca338154ea6 SHA512 bc8c191d8c2bd6e507080cc845f71ea4533791499af345b23742d6a5710d2d5322884e8c6a2ebb3e8087eeda25fc09bc839dc72d1e03ec6a1f30daf28627a322
+EBUILD zathura-0.4.3.ebuild 1334 BLAKE2B b8887cbbf8b755c44d79bf4c517ea4c6669566b5576584cf5f6b20fd918ef53ca36ec8918608070548556978a776fa80873716c108e32be0e252f9acc350ea1b SHA512 c9a38f2029607e41eac29b14446028eb6969317360039add7b3d7d8fa9add0c3fbba40d900053db498c7d0e6e83af67f6aec774259a2bb7613f6901631b7bb39
+EBUILD zathura-0.4.4.ebuild 1347 BLAKE2B 48da5928fb897cb42e2d76dfe24b4d6b55aefd8fd336d41af466b00a01dd75d59566f0b1d9a57d982ed94d543f8862f8205979e2bb2c084b162c77219b9dbe2e SHA512 58a2e7db42b483c922412a74bd47e938355ce828b9aa172c1a2bfd4a10690892101641fada3ff080cbdd0ca9dc8e491768ac114ab36a7cb560061b830b393d2a
+EBUILD zathura-0.4.5.ebuild 1350 BLAKE2B 8f4d976a62b7ab8ec19e300a85742aa270c965ab2dcdcb3a43aa81b2db3faceaf7cee4a5dc41870edd96b6180487026f965743e4fcc2cdc2b0221be1e33241e9 SHA512 195dcff04cd249ab9860f0468e9df0f3470256d52a03bd37d982f1469ad6a6fdf2539bce2afa47996fe5316c7f173b851cb343d51e75545333236ad91dd4b281
+EBUILD zathura-9999.ebuild 1350 BLAKE2B 8f4d976a62b7ab8ec19e300a85742aa270c965ab2dcdcb3a43aa81b2db3faceaf7cee4a5dc41870edd96b6180487026f965743e4fcc2cdc2b0221be1e33241e9 SHA512 195dcff04cd249ab9860f0468e9df0f3470256d52a03bd37d982f1469ad6a6fdf2539bce2afa47996fe5316c7f173b851cb343d51e75545333236ad91dd4b281
 MISC metadata.xml 763 BLAKE2B 1a98b02634dd4017052820cb2103b81d7bc8308c8832edb28f65127f43e9a673926b76091e2062a66c701b25e9d5866051e2268fa3fb4f53a681257132618789 SHA512 5afbabe1726a25ba2b0ae5c66533bbc247deaf1c745534487895bfafa2671ba87d9fc4333ac824176f78db64a940cc53a87d018fa4d7e5d201cfc6f41cfb50d6
diff --git a/app-text/zathura/zathura-0.4.3.ebuild b/app-text/zathura/zathura-0.4.3.ebuild
index 26887b29c3f2..b73544c83c5c 100644
--- a/app-text/zathura/zathura-0.4.3.ebuild
+++ b/app-text/zathura/zathura-0.4.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
@@ -6,7 +6,7 @@ EAPI=7
 inherit meson virtualx
 
 DESCRIPTION="A highly customizable and functional document viewer"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
diff --git a/app-text/zathura/zathura-0.4.4.ebuild b/app-text/zathura/zathura-0.4.4.ebuild
index 1167454be534..cccc28f4066c 100644
--- a/app-text/zathura/zathura-0.4.4.ebuild
+++ b/app-text/zathura/zathura-0.4.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
@@ -6,7 +6,7 @@ EAPI=7
 inherit meson virtualx
 
 DESCRIPTION="A highly customizable and functional document viewer"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
diff --git a/app-text/zathura/zathura-0.4.5.ebuild b/app-text/zathura/zathura-0.4.5.ebuild
index 4a62e043c71b..08b6a2a8e21d 100644
--- a/app-text/zathura/zathura-0.4.5.ebuild
+++ b/app-text/zathura/zathura-0.4.5.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit meson virtualx
 
 DESCRIPTION="A highly customizable and functional document viewer"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild
index 83ead1f313eb..08b6a2a8e21d 100644
--- a/app-text/zathura/zathura-9999.ebuild
+++ b/app-text/zathura/zathura-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 @@ EAPI=7
 inherit meson virtualx
 
 DESCRIPTION="A highly customizable and functional document viewer"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index fb09041086f9..69c784ffd199 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/easytags/Manifest b/app-vim/easytags/Manifest
index 049be10074f7..9f6c9c6edd1e 100644
--- a/app-vim/easytags/Manifest
+++ b/app-vim/easytags/Manifest
@@ -1,4 +1,5 @@
 AUX easytags-3.11-fix-ctags-detection.patch 2964 BLAKE2B eafaddd9877d8732eeace0197ab29cedba38a89a1f7c4e1fb2192cb075bc7a4541e6a5e5448a8944a7f6a0b47fb1cd481035529d6b11d5508df35089f2e85865 SHA512 f3ef6cfce5cbbebc4d33fc5f6fe0b7df037c9ec80da6f4a2b29bccb15e00b385719e654238f6becea1372900ac5f9e5e6d6af481537dde12c03cda24ee49e674
 DIST easytags-3.11.tar.gz 40572 BLAKE2B a6b228743f493bd467aff6685b6799de7e4862d384e14c81a084d7a211cf165d62cf902415a3c98a69858eded64c606bd4565f6e0c43fab7c078ba81d0ec5217 SHA512 9c1985a02b2718315d825ed29c06cbf78050e693893a9a7530a774031cbe9e6a27ee1dc91878950a1fbcaf7ea685faeb799d1e5b218b9ce25718783409f66130
+EBUILD easytags-3.11-r1.ebuild 1224 BLAKE2B d1784173bec8c978278e59586254b2bf6c9eaa9ac9ca744ff448eef65ae23f16d95476abd31d542ffdb2edbef70856142cc156bbb883bc57bfa93db6689fb370 SHA512 f1161fdfce9aa8ca733b25bb3ddcc187957e989b3b256fecdc4d314daa57e3b0979294d3ed2ad047748bbea48f573017531ba68df8270573e47cd4c2514760eb
 EBUILD easytags-3.11.ebuild 996 BLAKE2B c3211f023786914dc5d9c9f76cff7295cc8c3ead593438d74cb31565aee0f5c0a7057a6d2b3581d63a1bbcc2d2e5a70add77b2e84e3e78d7b9cab5478b3942f9 SHA512 c351e922c7d4656a1d92e2aaed798b125b40bee89a7e4d758ba0ea197a204b4905d5d8f017dcf5d781ee865350c68fddc2814a856ef3f16abf404486595274a8
 MISC metadata.xml 342 BLAKE2B 5e7e191544a04bc4ae28e482deef1c44c8ee11f6afe01d9ed6b138364f771411e341b5827e92bdfeae1edffdc166979c72a53034886530b0cdb55e34d9c2ce6e SHA512 0f4fbbedc023ccccc74ef8e020c3a90a0ccb0184164a52dd733699c5d4bf729d09478ea87fda093197679f7b44b3c1b64d3c64845d91d3fb92f9e3a1eab8fc78
diff --git a/app-vim/easytags/easytags-3.11-r1.ebuild b/app-vim/easytags/easytags-3.11-r1.ebuild
new file mode 100644
index 000000000000..cbd424d4f07a
--- /dev/null
+++ b/app-vim/easytags/easytags-3.11-r1.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,3_8} )
+
+inherit python-single-r1 vim-plugin
+
+DESCRIPTION="vim plugin: automated tag file generation and syntax highlighting"
+HOMEPAGE="http://peterodding.com/code/vim/easytags/"
+SRC_URI="https://github.com/xolox/vim-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-vim/vim-misc
+	dev-util/ctags"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+S="${WORKDIR}/vim-${P}"
+
+PATCHES=( "${FILESDIR}/${P}-fix-ctags-detection.patch" )
+
+src_prepare() {
+	default
+	rm addon-info.json INSTALL.md README.md || die
+}
+
+src_install() {
+	vim-plugin_src_install
+
+	fperms 755 /usr/share/vim/vimfiles/misc/easytags/{normalize-tags,why-so-slow}.py
+
+	# fix scripts
+	local f
+	for f in $(find "${ED}" -type f -name \*.py); do
+		ebegin "Fixing $(basename ${f})"
+		if [[ $f =~ highlight.py ]]; then
+			sed -e '1 i\#!/usr/bin/env python3' -i "${f}" || die "can't sed patch ${f}"
+		fi
+		2to3 -w -n --no-diffs "${f}" >& /dev/null || die "can't convert ${f} to Python 3"
+		python_fix_shebang -q -f "${f}"
+		eend $?
+	done
+}
diff --git a/app-vim/exheres-syntax/Manifest b/app-vim/exheres-syntax/Manifest
index ee5a918b07cc..afd4c0dfd286 100644
--- a/app-vim/exheres-syntax/Manifest
+++ b/app-vim/exheres-syntax/Manifest
@@ -1,4 +1,4 @@
 DIST exheres-syntax-20090310.tar.bz2 3670 BLAKE2B 27a6f075f80b7fc2e172b9586211a248f8075affd6a20ea52cafe06cda4f6d489a56a539e6a7619b3f7ce7fd29084ea990e66efbbdef7198a6857912eb9288c8 SHA512 616ef17367c68157d715321e457aaf0c65c97329f0848cb964d8974b6a85b4147f2e192b2ea3fcbfa3970e095bd9874203ce9723c73d1ef8350200732198c79f
-EBUILD exheres-syntax-20090310.ebuild 429 BLAKE2B ac967a7af33014986c90134098220abd47f0af841b35643a04b4205eead5f728bdd07fc578b9ab42075227e2f91966717119cc4921938c861b07e9eaa8e4bb3b SHA512 9da67961cc12debd0077fa9e280617ea01f6087c28ab0fae488dcc168f63efbcd76f5a323c64b50d982a356044a57b7950bf03a4ac9f1ed68b3cd8f16bf8dfa9
-EBUILD exheres-syntax-99999999.ebuild 456 BLAKE2B 1b3e21ae23744ad4695c2733ff4193899fe12cb2a59d051600082efd0458cc8930480d6edd18ce4c89aeb77989b651f3dd5b8f05853264f363437ac48006cdef SHA512 672617538cde07bafa27bad4feeea22448f579ae9069faab5687fd08579bf7d51366e9ecca63163c7bdda030fe2ccbd721b8a4580d160544774c91474271e91a
+EBUILD exheres-syntax-20090310.ebuild 428 BLAKE2B 439e309b11ea2127485ef5d2c0525da507e4479b757e2ee18a6e379d3ee7a26e483c9c452e99c0e2748ff8ae5d1c69de0a719b6628ebfe46e1bc9749969629b4 SHA512 3f179920aae04f25709b0f458b04854b64565f0f3622a89b768301106583f2e753f2c66d92417c8a6ced5a80486051e90c51541c82a665e1f2155a4022f0a3ff
+EBUILD exheres-syntax-99999999.ebuild 454 BLAKE2B f2252c222665d279c4000984f5b695b8a90bf9c7bf3c140727c4b863712affc37b79601aa78a61130d1347daab5a02aff216d833cbf64a912bf81d2f80ad7e79 SHA512 ddf73bff11158e783c466536f6f6561b57c8af34206b7b83a2307292679930bc666535fe06dea9fea487eee46be0b2a8920b91b53752c5a93e80faca922ec812
 MISC metadata.xml 251 BLAKE2B 4951201e33801e19bf0cf7b2bb87164107d87f074a28da579e90da44077e2833c36b51b63f92780ec4aa611d482a80a03723b56175bc041adcbe5573b537072d SHA512 5c10f22ced866afcb94b97662e270d3d4164ca9f988621c13d6a7c4508da8d9e9bbb804798cd468a2cc84ae9fd61aff32c782a372b0b8de145c1ea71751bab34
diff --git a/app-vim/exheres-syntax/exheres-syntax-20090310.ebuild b/app-vim/exheres-syntax/exheres-syntax-20090310.ebuild
index 98ebebae3200..7a014b993ceb 100644
--- a/app-vim/exheres-syntax/exheres-syntax-20090310.ebuild
+++ b/app-vim/exheres-syntax/exheres-syntax-20090310.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
@@ -6,8 +6,8 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: exheres format highlighting"
-HOMEPAGE="http://www.exherbo.org/"
-SRC_URI="http://dev.exherbo.org/~ahf/pub/software/releases/${PN}/${P}.tar.bz2"
+HOMEPAGE="https://www.exherbo.org/"
+SRC_URI="https://dev.exherbo.org/~ahf/pub/software/releases/${PN}/${P}.tar.bz2"
 
 LICENSE="vim"
 SLOT="0"
diff --git a/app-vim/exheres-syntax/exheres-syntax-99999999.ebuild b/app-vim/exheres-syntax/exheres-syntax-99999999.ebuild
index 21106c1f23b8..437d26234642 100644
--- a/app-vim/exheres-syntax/exheres-syntax-99999999.ebuild
+++ b/app-vim/exheres-syntax/exheres-syntax-99999999.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
@@ -6,7 +6,7 @@ EAPI=6
 inherit vim-plugin git-r3
 
 DESCRIPTION="vim plugin: exheres format highlighting"
-HOMEPAGE="http://www.exherbo.org/"
+HOMEPAGE="https://www.exherbo.org/"
 EGIT_REPO_URI="https://git.exherbo.org/git/exheres-syntax.git"
 
 LICENSE="vim"
diff --git a/app-vim/gitgutter/Manifest b/app-vim/gitgutter/Manifest
index 4c0502c0a020..422ebba46a56 100644
--- a/app-vim/gitgutter/Manifest
+++ b/app-vim/gitgutter/Manifest
@@ -2,5 +2,5 @@ DIST gitgutter-20180316.tar.gz 46344 BLAKE2B f981753a0f8d066b7cb5c16c49cfdd1a1aa
 DIST gitgutter-20180815.tar.gz 46741 BLAKE2B 85189390a2d8c5feaf8d2fabfd2c72bf79954fd1e9f2c3ffeca748e84caf13924f71ef5837ab62aef0ae003a01304305e73bbcb12dca27294c8164e960249fec SHA512 b6d3bd0f779d9afbd38df33888ab3ee0f1d8d10de0a6c5c6766f7f73a292cdd589a6774faa2871877075f6cedd29f14bba07c9a769d706e0e67d8817db86cfaa
 EBUILD gitgutter-20180316.ebuild 789 BLAKE2B 5117f2eef5b3fac7d0edd8c84bce91362c796a28b6c75deb880741c7524da061c9060e3e175c7ffebd35bcd7b81fbfbecfad73585027c784289869ea99d1a56e SHA512 bef6a4759f414ac8d01bd7214fbbb868b5fdccbf2f68fc58aff2f1591a5e552cb912fe0e61ade6f25f287843d65760c6fcba04b091af1a726cd495e42211b253
 EBUILD gitgutter-20180815.ebuild 791 BLAKE2B 43ecb9ad564614b597a3af65e92ff79e43910be3a3bb8303f26668bd26da7b5541c96284274c16f89f5708dca1d12fc3c0e2459777c46f7c1a4565442b7145dd SHA512 b032fc92d27d6c23ef0ce7a80e2778254fdd1a1d25f4f9a4f097050fcf6849afe55939575160403e784f32d46b12b0380807d5201b4db2c912794b9045868a0d
-EBUILD gitgutter-99999999.ebuild 791 BLAKE2B 1765bd9bdeb6234d90d831181bdf2ad0ef975edcfa959e7ea309c5522bdb6779163d1e5850a6715bcc8471db15c922125e80ec248d0ad822986657984475d4c8 SHA512 5b7fab9be3eabfe64a67535937883939ea3d1ba62184f55f25f18384ddf1d24416b22d1f88d6025d0b98249536984c6f8b6d0e9b7f0c467a64c14f34dfafde11
+EBUILD gitgutter-99999999.ebuild 766 BLAKE2B bc86221c26e432cbff853cc89c5486f6fab5eb9d5bfd334d1481fc2ae674a9f93a727688d541686f0722a3ca76c94b07bf7a0a211e37bdaca48930de1b2d15cc SHA512 7085549d5c06d53062f025ac634aafc1de70e290c297f5acc7edb3858f104ceae99cd3149af1479f74b2d1395a4df3689e5912b05463aa3e5cdffca9f7ef7250
 MISC metadata.xml 346 BLAKE2B 89acd12a36beb7b027e42b7f094bba4e229e345ad6f0024bbd3e550784459975aff10e88f5de53de3f2150000b7349ee97348723110a43130b213404292b562a SHA512 4ada20b8f4f308445854b0e0ab229271a603e38370675691790dce0303ca4c2a7f00b247363b0f13bcebe78397fd3ebbbd157403260664171b548b8964da7a0a
diff --git a/app-vim/gitgutter/gitgutter-99999999.ebuild b/app-vim/gitgutter/gitgutter-99999999.ebuild
index 002f6583087d..472b9617df4c 100644
--- a/app-vim/gitgutter/gitgutter-99999999.ebuild
+++ b/app-vim/gitgutter/gitgutter-99999999.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
@@ -25,6 +25,5 @@ src_prepare() {
 	default
 
 	# remove unwanted files
-	rm LICENCE README* screenshot.png unplace.vim || die
-	rm -r test || die
+	rm -rv LICENCE README* screenshot.png test || die
 }
diff --git a/app-vim/notes/Manifest b/app-vim/notes/Manifest
index 04ee974aa4b1..9967f523bd97 100644
--- a/app-vim/notes/Manifest
+++ b/app-vim/notes/Manifest
@@ -1,3 +1,3 @@
 DIST notes-0.33.4.tar.gz 239372 BLAKE2B f326c5d6adf25cce9261ac555541261750926c55f73d3a3f57885f7f03f9fae97e03f20882cb74f5fcd78b1ec06c2e0a5b1eb977aadf6a9771c679205a4a48e9 SHA512 7f2147e786582e69760c6d76d7144bc1fd0f8934ce6574184e16f463f5ca9c21e9e0fc87f88b56922b8195b26be7b0f99435cef773ccbc360077cf568b98b98a
-EBUILD notes-0.33.4.ebuild 688 BLAKE2B e222ddbabb1bc5791c7aad52f476d9cc19cf70c8cc25decce0d59e6ecf544d5593ae04ad3a732945012635f85dd00186639d8be399e1a062ca8eda0a6db24c67 SHA512 e643ca31ca9124cc94db3727999fe66189233c2ce3985d66b036fa9493e839da7e053b3deba489be3aecf42371f8825126f79463d414fb418d1cd1c0f54640bb
+EBUILD notes-0.33.4-r1.ebuild 709 BLAKE2B a042e2ba158971a026b5dbdb11721510c2963a2ca44f7fc3407e6b70f6845427f9768057809d1916f7b1a1b55b7da4711808645f08de35a7aeb8fb50fac8adf0 SHA512 1f1bb3192f9504a9255c4210f0bd55cf8f951d4ae3206552a18043889ed0bc4e5f6414d3c5e755bf42b7853aa0ea1be25e3e8c24813ccaee669a52d8a29b95d3
 MISC metadata.xml 339 BLAKE2B 7d1ee9c5de677bd78ad2a5e0bca15deb9dc48bbfa56c7da216d47c0924fdab4e28c9db8878177471d2d4a7504770cf0395fd03a786d807971d07b61c31d8d7bb SHA512 ebc2c6981c7bb2ad9c8281e69d29203e5700bd5b930ee17feb16e5f1f581eb164971bcfc5584eb639404d70e2f13a3b8c51f4514759798ecc47ee8ec4776bbd1
diff --git a/app-vim/notes/notes-0.33.4-r1.ebuild b/app-vim/notes/notes-0.33.4-r1.ebuild
new file mode 100644
index 000000000000..d436975d1828
--- /dev/null
+++ b/app-vim/notes/notes-0.33.4-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=( python{3_6,3_7,3_8} )
+
+PYTHON_REQ_USE="sqlite"
+
+inherit vim-plugin python-single-r1
+
+DESCRIPTION="vim plugin: easy note taking in vim"
+HOMEPAGE="http://peterodding.com/code/vim/notes/"
+SRC_URI="https://github.com/xolox/vim-notes/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-vim/vim-misc"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+S="${WORKDIR}/vim-${P}"
+
+src_prepare() {
+	default
+
+	# remove unnecessary files
+	rm addon-info.json INSTALL.md README.md || die
+
+	python_fix_shebang "${S}"
+}
diff --git a/app-vim/notes/notes-0.33.4.ebuild b/app-vim/notes/notes-0.33.4.ebuild
deleted file mode 100644
index 9006ecc51f8c..000000000000
--- a/app-vim/notes/notes-0.33.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 vim-plugin
-
-DESCRIPTION="vim plugin: easy note taking in vim"
-HOMEPAGE="http://peterodding.com/code/vim/notes/"
-SRC_URI="https://github.com/xolox/vim-notes/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-KEYWORDS="amd64 x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-vim/vim-misc-1.17.6"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-S=${WORKDIR}/vim-${P}
-
-src_prepare() {
-	# remove unnecessary files
-	rm addon-info.json INSTALL.md README.md || die
-
-	python_fix_shebang .
-}
diff --git a/app-vim/pyclewn/Manifest b/app-vim/pyclewn/Manifest
index 0925548ec74d..ff3be219f23b 100644
--- a/app-vim/pyclewn/Manifest
+++ b/app-vim/pyclewn/Manifest
@@ -1,3 +1,3 @@
 DIST pyclewn-2.1.tar.gz 129697 BLAKE2B 0dfef92cb36ea9fa89c7f0d85ed45e21c634732fc2d3d888dd792de22529bea86719f8ac8ed870dd5ab00efbfdb08011013a36880781abf9e0c64a62b2aa301a SHA512 346b98a9e37957a5bf97b8901247f56fa8e38bddac38727867773cf4e78e555d6a85848c4c400d1faf1159ba61122cfd4931c95a67e3b2abdfaae7996beb4f1b
-EBUILD pyclewn-2.1-r1.ebuild 934 BLAKE2B d7021c1f48fc67a74433389eccac41441b1b12c4fe246dc79685e2a42250b4fd44299f9c92b83ec7b82ab600d92d6492de2432469b387f349f86730eea38432d SHA512 4a77578d914d36a2976546b4c06f744206099b3c9d5cdf2a085ecb90f143214d3780299bb7c6eecb599c6759f78788e90cd3b38c61b0baff4ff7d6661be571ca
+EBUILD pyclewn-2.1-r2.ebuild 1043 BLAKE2B 8486be082ed725b74a9201ec5cff0e8f426841819f661b345a47a887997d752fba66288e16cffaeef59fcb1f79637ea59841158587d261b7447f0bd019cbb82e SHA512 d65597aa71406e979c0f2b134c225e9fd9092eebf14a12566dac4ba47b5389061bc55c99ffefb48aa38c70ef94f9f921fd59049b1e8d2dddffce2894c34c5f41
 MISC metadata.xml 499 BLAKE2B 4955bd7a080dc2ae909143477040d191cb48ab4badfd47b6b7c11fd4686139bbbe77475f005e10c3b2bba50d0615b94600a55cda57a7d02ecaaffe1e504219dd SHA512 30b127677f0d5a9afce208e5cbb00c9b98f6d7e771ef273155f9acad764da789e71249289104e8006420cf5ff62075bb7572527150f9b339e0e51cb219c76a81
diff --git a/app-vim/pyclewn/pyclewn-2.1-r1.ebuild b/app-vim/pyclewn/pyclewn-2.1-r1.ebuild
deleted file mode 100644
index 67459d86ff7e..000000000000
--- a/app-vim/pyclewn/pyclewn-2.1-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=5
-
-PYTHON_COMPAT=( python3_6 )
-
-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
-	>=app-editors/gvim-7.3[netbeans]
-)"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/vimball"
-
-RDEPEND="
-	${DEPEND}"
-
-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-r2.ebuild b/app-vim/pyclewn/pyclewn-2.1-r2.ebuild
new file mode 100644
index 000000000000..e57e74a67364
--- /dev/null
+++ b/app-vim/pyclewn/pyclewn-2.1-r2.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=( python{3_6,3_7,3_8} )
+
+inherit 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"
+
+SLOT="0"
+
+CDEPEND="|| (
+	app-editors/vim
+	app-editors/gvim[netbeans]
+)"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/vimball"
+
+RDEPEND="
+	${DEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	default
+
+	# async in a now a reserved keyword.
+	sed -e 's#async#_async#g;' \
+		-i lib/clewn/gdb.py || die "can't patch gdb.py"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	python_optimize
+
+	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/vim-latex/Manifest b/app-vim/vim-latex/Manifest
index e3904181e9be..6a7da8105632 100644
--- a/app-vim/vim-latex/Manifest
+++ b/app-vim/vim-latex/Manifest
@@ -1,3 +1,4 @@
 DIST vim-latex-1.10.0.tar.gz 260820 BLAKE2B 2314ad5ded3bea51def3172e8f2b7a7483839b58804f9d8c1cc1c8f1139c1da731f91525691d47dba57d07a7db85c371e87c5ce0d3d22a004a9402df7e7cad3a SHA512 1d22b675c124e402a280dcc3a675b49a92fb9f4d42efdda0ea97be26379cd6c023589a35e165f4231524d853380e22411901bfbcc98f171c938ba800821a1213
 EBUILD vim-latex-1.10.0-r1.ebuild 1569 BLAKE2B 528be5ca5ef37bad2794a1f8990bc768b6d47fd8427609fd574311d6474306c5a087d4ddfc1669f36dcbfc26434f704887f9ac7ad197585fea4023ffef906676 SHA512 33daa51732a577e0f75cdf70d591fa8008eaae823473813ea7d293a614987389333a941baf05364b18bb1d4f3440b8308e0a8c934a72e1696a07e18e940c4650
+EBUILD vim-latex-1.10.0-r2.ebuild 1577 BLAKE2B d8619c6debee550dc49df52b0db4555408aa77e07a958c6d0eeb9b13f8ac44bc07285e1f9e67a46c7d744262ab02ea59a7e00f70dcc5b5e2ad6e5e8176efd1eb SHA512 a1ac6495641601608159b9237faa3f47d478c272cbe4a275bc0d2f7807f6cece5bfa7756efb19bd84dd694086a0a897218e5d467c7c0dce75f82c884d5391812
 MISC metadata.xml 328 BLAKE2B bcf4c9979e43da6c141669c218e852e7a0c062d900c35790709e393f6cabc56f646f7a84e8057d9dbafa0a73e5786135a7cfe3ef825af867500bcd502f03a61f SHA512 e14b88742b6d8143cb578ddac61dbc0ac5e84c90659e8d9b5c40882ebdf35dc001b1ffae26eb90617434b2c8a898055c838738bf7cf18a45cd2a2ce66a30bdce
diff --git a/app-vim/vim-latex/vim-latex-1.10.0-r2.ebuild b/app-vim/vim-latex/vim-latex-1.10.0-r2.ebuild
new file mode 100644
index 000000000000..ed03b0f51f16
--- /dev/null
+++ b/app-vim/vim-latex/vim-latex-1.10.0-r2.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=( python{3_6,3_7,3_8} )
+
+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"
+
+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/vimoutliner/Manifest b/app-vim/vimoutliner/Manifest
index 3ff2e4eecad6..8d94547740a3 100644
--- a/app-vim/vimoutliner/Manifest
+++ b/app-vim/vimoutliner/Manifest
@@ -3,5 +3,5 @@ DIST vimoutliner-0.3.6.tar.gz 210251 BLAKE2B d50b3d1c752fba80e26d7430801baf30a79
 DIST vimoutliner-0.4.0_p20180301.tar.gz 367361 BLAKE2B a97df5c154e6ed9b3209bd90bd57b4166877f02b9513351fda0e841de84334a1e592e1ed56b46cc59bc6bb64f3c763cdca81df3f8696f3c348a8ef4744124c02 SHA512 f9f369e7e7f09dac04b58a27a86dc2121b3aacd0002537db348517e779fd1b7c9e88ae905b4b42aace10f79cb8f91acada1ad58e26f2257e46d1af98347eab62
 EBUILD vimoutliner-0.3.6-r1.ebuild 692 BLAKE2B eaba6b518a890480abaac5eb234a0ff96a37d93f03f0f323aeed19b754f6a77267b97619aa0e30e8f10d320af2d8e0ed3235d25ab442e1933af659485039d2c8 SHA512 7b66c1a82d6537e631f9ef4268f375e4c4b883a973be0492689580de46b39f70220588dff9b2eb31edd1f8e262f4faf11ab2e5c100a449cb5074ee4f5e5333cc
 EBUILD vimoutliner-0.3.6-r3.ebuild 1330 BLAKE2B 021a5c03383c7b23d98b2076f8139ca9e311e8710c234cc6c257817707660425f382e2b9011f8513f56674901d4617da19719ba1f89b396e01c7adb366e79dd2 SHA512 8e6762e23b3c0c423784401d77309fa5bf9b68361f9c1493a1f632520a83450b21adc457c9b0e5d6116b805156ce389c053fed37686c05e7826d42c2eb25b990
-EBUILD vimoutliner-0.4.0_p20180301-r2.ebuild 1148 BLAKE2B cfa5d5fcd95ee8924480ee8787918eaf3693dce75d4b9cb2fbef9e22a80eb5c4b5de5e5970daadc010106f129e53e5d690668f67ddb8a4b57f3deb84e053e3e9 SHA512 8b4859df3548df3eb93bb05fbe6e60822511e0bf6935358966fb4b2dbe34aac54b0381e9155d888ec90f694a8de1adce00185eb3857cad609baf47c6b2312418
+EBUILD vimoutliner-0.4.0_p20180301-r2.ebuild 1263 BLAKE2B 11d197e2641bdf5f335e641b797fddaec23b6be79819062711c6b7b44e0e56e422187af2c43793c6c3aca6092baad3f02c48a2b9ae537053d1beb96570bea51d SHA512 307a8c310122890a3a2729c2299b7354e4f85b12c25aa7b13564233b0a0b33b4d240100525fa469fd937885d7138f25d389b79bf1d80cba429661402d251d62a
 MISC metadata.xml 337 BLAKE2B c4ae899109190b6ad14fcc71ff0dbea76f7ab6b731992174b4623847291d63bb8cbdc7e73cd92343beafdba086e0b54c4cda686593ef8b836f8add578b0459d0 SHA512 782f682a6837436ee5db28f818b2168035fbae243aa466077053e17842fec96672d702b818ad28a9f1d0b8fa1a1e2fb79b056d2e31bc09d5bf522d5f18ea1c7b
diff --git a/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild b/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild
index e35b5c0b1473..0e9694fa01f4 100644
--- a/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild
+++ b/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit python-single-r1 vim-plugin vcs-snapshot
 
@@ -22,16 +22,19 @@ 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}"
+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
+	sed -e '1s:^:#!/usr/bin/python\n:' \
+		-i "${S}"/vimoutliner/scripts/otl2latex/otl2latex.py || die
 	find "${S}" -type f -exec chmod a+r {} \; || die
 }
 
@@ -39,7 +42,9 @@ 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}"
+		[[ ${_pyscript} == "otl.py" ]] && continue
+		2to3 -w -n --no-diffs "${pyscript}" >& /dev/null || die
+		python_fix_shebang -f -q "${pyscript}"
 	done
+	rm -v README.detailed || die
 }
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index fe55d2508317..e262d9f318d2 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/gnatcoll-bindings/Manifest b/dev-ada/gnatcoll-bindings/Manifest
index 4144ebd04f17..f37db6ae6a31 100644
--- a/dev-ada/gnatcoll-bindings/Manifest
+++ b/dev-ada/gnatcoll-bindings/Manifest
@@ -1,5 +1,5 @@
 DIST gnatcoll-bindings-20.0-20191009-1B2EA-src.tar.gz 139910 BLAKE2B 5441c277d5888b040930960ed656a1b1264c7de02834995c6040c891b99bf7e8773029b9f722d5a3ed30036e7bd441318989ce3f7839d47928af5f4f7c396f90 SHA512 2b723ba4327966dc06594ccff45da3a01f65b8f8b91130ddc44d1b727d23ccbfe35f082c73810418da9d0705f1dc8ca9b471748eecee42adce34be722a4a201b
 DIST gnatcoll-bindings-2019-20190430-1928C-src.tar.gz 138935 BLAKE2B c72398b51bf383b163ac10000c4dd5441334a6f24d7ad075d8115f25c030b43bc1dace6a1121e1e69add1eead93a5389aff09ef013deb4682ccb1d31bb85313f SHA512 6db1d35a1cdf5188001084750f7aa32b193768f8c3dfb6d7db8a8314c745fc054b0a6d2234a6dd64c5acd4b1bafffa7ce7f1080bd51fbb8bc88edfcc855b7a48
 EBUILD gnatcoll-bindings-2019-r1.ebuild 2183 BLAKE2B 0406c1a302581dacd187b74cdf44ae71623ffc41426ad8bf15373bc84ac854be225490ababea7bdf5f22055ba94398fde7b9af5e3de552500f29f23d09de0e2a SHA512 da2e5688800c07c427918cdb67b0fb3f531751eae2d1f65c7a7e82c228184f7bab5d50af3d39937cf43cd8921c20099bc7bb834883fa0c849e2c5d73047e3405
-EBUILD gnatcoll-bindings-2020.ebuild 2241 BLAKE2B c9e24941626c7946b82efb7d6fdb29453c7f23d285b0674d13ee29f120dc9536a72efd5957e8aa87d7b864c5ac7f95637d0b806f1bb74b17a9e372349c3aaf6c SHA512 787c88ff6919ebe481a0132807e3e07bdd7e7d3ce5b68c2c83d0ecaac50c5a8c24bb13df5ff380a78137128fddcecbc1d1df349bba2f812ba74a0d04f1303f9f
+EBUILD gnatcoll-bindings-2020.ebuild 2255 BLAKE2B 6baa307af1ea2e0ab3016765abb0d9bc8291ea0df175167bb1d42271d01386b9d39e6d7d11ba7de56e6fa58633538171a33b0348bb1a59c95591ccace98f6dd7 SHA512 c409abc18f53bae4079a4c108ef1fc7327b6afdf12f162ea564e371ca7e46bbfaccf8d4ff49a70d9b8e5b7fe17a5f7ee5015f77314dee9de0b28b26e8a1f6b07
 MISC metadata.xml 1081 BLAKE2B a4c643dd943c019ebb42f81dc078391885d80fb3abf3afb52494d33802592eacbf43c33560855239c7e88e86f306444392b9a6336a8255d18762f095d8283838 SHA512 7e4006ffc2f972dc45efb174451c9450545c10b1b55c63bad0157940d5c64da2ac7a908f51c4a0244e2df3b09e448aac610b97dfdfa8e80a32d913de2f6c31af
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020.ebuild
index 82893ce57cab..e5c1fdd5914b 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020.ebuild
@@ -32,7 +32,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 S="${WORKDIR}"/${MYP}-src
 
 pkg_setup() {
-	python-single-r1_pkg_setup
+	use python && python-single-r1_pkg_setup
 	ada_pkg_setup
 }
 
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index e66c043c0d3a..4a89567fae79 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index 06d374e04237..bf875880ce63 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 810 BLAKE2B 4dc1b7c249d29055bbcfc7129fd087a94b96778910cdf029fdab8f2fe98980be83fb4584b76bbcadfaaeec71e36a6fe8f417698c44face10d96ec0fb059e2688 SHA512 8a6a263f3c3f1c8c9c434902ce1c906b7a9954e6cc757ce74d6d658c1131aa5e40f246a62ae7cf78b33048a16902d7223a8d135f6dc8316e970727007df9ac8e
+EBUILD catch-1.12.2.ebuild 815 BLAKE2B a9ea5197107864cbb14399cd3b2e0bb063c5c83661a6d536dff4f4c5a53db8f670b3e0175f91c07300154cae382ab7de6e2099db6b413e6644bebfcb8157c161 SHA512 8ebe9a5a73b5adfbbccd4f59cc57ca286440bec4c305ef4aed81ce8406a0da3c9d88c432d704b7bc5b67145abc11a536ca1142622425b1596b6c1b66579a5a55
 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-2.9.1.ebuild 918 BLAKE2B 129b9dc31df3fe17122df5597b993618eec0852c8dd1295b8c3c4ae53e8b929724ad0c11ecd858331a5ae312344d33bb68c91470ba1cdd49beaac582963e2828 SHA512 c472d00e9313dcade5be7001a8acf7c07815e0e77db013f23c58aa7c613f7413181ac249e1c8d7153c5c19be8ed28642e0ad9490796a8717d4ba6a85c8e3aa6b
 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 f0d846f42bdc..62eb5b9f606f 100644
--- a/dev-cpp/catch/catch-1.12.2.ebuild
+++ b/dev-cpp/catch/catch-1.12.2.ebuild
@@ -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 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~ppc64 x86"
 
 	S="${WORKDIR}/${PN^}2-${PV}"
 fi
diff --git a/dev-cpp/catch/catch-2.9.1.ebuild b/dev-cpp/catch/catch-2.9.1.ebuild
index 07de51f32521..b450352957d4 100644
--- a/dev-cpp/catch/catch-2.9.1.ebuild
+++ b/dev-cpp/catch/catch-2.9.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MY_P=${PN^}2-${PV}
 	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 
 	S=${WORKDIR}/${MY_P}
 fi
diff --git a/dev-cpp/mm-common/Manifest b/dev-cpp/mm-common/Manifest
index 2d0eda2f85eb..80951d4c9836 100644
--- a/dev-cpp/mm-common/Manifest
+++ b/dev-cpp/mm-common/Manifest
@@ -1,5 +1,5 @@
 DIST mm-common-0.9.12.tar.xz 304588 BLAKE2B 8fd443b4077d803bb1513c897aa44965e50591cf36518469f1f2f74c40ff2b4f687152f9fc31e2d543ac97ae7a5a0a58efdc8c362959e015eee54b8bd518809e SHA512 99701d91994ca2783fe5b8bfd44cdea9f14e16dbbc116f894d9f3df746912cdbcdbdb0d5fdf6e235c9d22621a314de7aaac9b87a18f3ab742a0ad2ebbaad8ec7
 DIST mm-common-1.0.0.tar.xz 269312 BLAKE2B 549708486f3c7df699b966e818dde4888048f30db94a78b721b8ba0e6cffa949f0c6b32e3f03861a3646f4547724997441a2f4eee1a597fb78c28e89882344e6 SHA512 5f90964ae7f47ef16919c5ae20fa38436d04e0cf6eb4b868c3a498631e1995dc5363728ebfed2678266de08adbd1c326d1a77755b232d98d02acc034f08412db
 EBUILD mm-common-0.9.12.ebuild 374 BLAKE2B 761688952a2c2f907224e80564df215b25e30a9b2d831ffc3d57c51c6295dd9b2968ebde20b7a7625f9181417020cbac4e764e400830552005d3430025df95aa SHA512 f2cfe433cd4affb0c4d687f575b0eb90783272ddbc0ada8fc8fa295c82211e49df3e9ca9051733cfd57efe30a94ace4671f00fbad632444287ae04c2d4fc35ac
-EBUILD mm-common-1.0.0.ebuild 531 BLAKE2B 6e540e5027321225708ac778195b5f6735e5586e567f54917cc1cd0c852134805d81a7cec2f3ddae38925ed12cb69214d9ff6c3b59685ea007163da02afe9408 SHA512 dbf6e0b3094be4c596db837498826b41b74baf51e85cbb48c8072830460e2573913266ae3477ecd05e7695eed8a21126bc4cd3b5cb108255e3d57482655b4c0f
+EBUILD mm-common-1.0.0.ebuild 530 BLAKE2B 85d38bfad8d5b5a5e5c73656a219ac9050f5bed04de1d27a572d9460d5b95982c7d861305f44b58033887a5f50f81a19236ccb7e99084962d67ccc3deb47192d SHA512 942cc639e44d95a14e01b6bbda16bfad8673d1bf11b99b9735ce368cabc29e54695d0e0e22944191ff0374d84723ce10bc57926ecca1b68f865ac702d2461da5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/mm-common/mm-common-1.0.0.ebuild b/dev-cpp/mm-common/mm-common-1.0.0.ebuild
index ba4c89f0371d..42b9cdc2119a 100644
--- a/dev-cpp/mm-common/mm-common-1.0.0.ebuild
+++ b/dev-cpp/mm-common/mm-common-1.0.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gtkmm.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-cpp/waylandpp/Manifest b/dev-cpp/waylandpp/Manifest
index b70985cbee72..eb493ea2bb51 100644
--- a/dev-cpp/waylandpp/Manifest
+++ b/dev-cpp/waylandpp/Manifest
@@ -1,3 +1,4 @@
+AUX waylandpp-0.2.7-fix-std-runtime_error.patch 743 BLAKE2B 4f528ce32190cbc6d54c07beab484297a3bb17982f94162c74f87302bcbe692f252b6f359cd1d3f8571d5e70587c49bef53596e869e3e4b766af5c30817dd5dc SHA512 485272837f4d32b251678cd15a581b8f174ea01a58fd91aa78219b22470426734ce610ca397ff86ff1828d0757e0a66417e18f60b5380324afee14338d26df3e
 DIST waylandpp-0.2.3.tar.gz 180539 BLAKE2B 8941200b46235c8b65926065a3a758871581fe21ffbcc17dc33a00c546c920247739d3137b528fe8971b7c1c2240b5a056387dcbaa1437047709e079cb2e58c2 SHA512 424ccef67e1faedfb03aa7465917e4dfc0eae578a1eb42bcdbe71df02955fef00fc1b480acb4828e168f051a82a13f923e0c9be93d3ede221e791a7af88647a5
 DIST waylandpp-0.2.4.tar.gz 240718 BLAKE2B 4493f3e19dd546412f110227c44440a422d0e1156eb24ed8bc3e58e5ebda22c0aee16e5f2a2efc1328a697c5436f81c11c67d7c46855f32f7531783a1d514ae1 SHA512 74855ea86926692a9f6ccb5645a7ed30000bab0f01a2f37a30f2c0a341d67d511ae217b8f69adc52fa2c25ac65afa182a6dbf2318360435a02b6ff428b4c9d51
 DIST waylandpp-0.2.5.tar.gz 177735 BLAKE2B 9add6147b7694d275f2f15f03476aef5bddebdca029f012743a0c0c388c7ef7394536b4401c78830487bb1c36a0b29ea348bc2acf60617af7bcbf917a5b691dd SHA512 a8c80282022b2ede3c3d0f5516e236aedaf3ef685565da8c61214fe37eda139bf152093eb29960be1889798eef5631b9d68a5e832c10cf1160c4a90f45eccb6e
@@ -7,6 +8,6 @@ EBUILD waylandpp-0.2.3.ebuild 833 BLAKE2B 7556dc863efb653831be0c99d190726c9e8729
 EBUILD waylandpp-0.2.4.ebuild 757 BLAKE2B d142eade552ed0a09e10de4c4dda27b167b94f1be1f0797196c89a089c52244e92a1646ab7be804f20608e749546f173fcb281c8c12f00177316f6bf3d649d45 SHA512 79f2f9fddd63335d46edf4edb5312c0c62a7deef0ccfb78eb3fe3989f841455c3350f28225c25dd513a8294a81d6a11cfb140b42031dc5612808b61ba40a777f
 EBUILD waylandpp-0.2.5.ebuild 760 BLAKE2B 521de67f5f289aa32a539b6d5e86aa85b270e794acc3a6272deac56004fff5c60c07350151267f7c77af2f73cb339a2086c84ea17b0b9158605e8745a1bc47d6 SHA512 7620b5e841fbead64b3211f1968e3e7b3f1a83a0cd5769ef4e19104bb4be71884fa4f9eca9ca9b13637409bea4a6d921efa3a50e976e9df7a3244b2754fffe92
 EBUILD waylandpp-0.2.6.ebuild 760 BLAKE2B 521de67f5f289aa32a539b6d5e86aa85b270e794acc3a6272deac56004fff5c60c07350151267f7c77af2f73cb339a2086c84ea17b0b9158605e8745a1bc47d6 SHA512 7620b5e841fbead64b3211f1968e3e7b3f1a83a0cd5769ef4e19104bb4be71884fa4f9eca9ca9b13637409bea4a6d921efa3a50e976e9df7a3244b2754fffe92
-EBUILD waylandpp-0.2.7.ebuild 760 BLAKE2B 521de67f5f289aa32a539b6d5e86aa85b270e794acc3a6272deac56004fff5c60c07350151267f7c77af2f73cb339a2086c84ea17b0b9158605e8745a1bc47d6 SHA512 7620b5e841fbead64b3211f1968e3e7b3f1a83a0cd5769ef4e19104bb4be71884fa4f9eca9ca9b13637409bea4a6d921efa3a50e976e9df7a3244b2754fffe92
+EBUILD waylandpp-0.2.7.ebuild 828 BLAKE2B fe842549de3930510b371966d7e7a53c64bab7360e63b21634605659b2c27289757f6517a27f3e9758b99a803ea299cf0b698e0fa989abaa2eb09abc081ccf60 SHA512 c3dcd8f3a29e946655bd831e212b49d153b3f00d959fbc1aa982e78e4375dd2d0aeb7b1b4ef834a7d240ee0cad8e76cac473a2b76eed43d6525069ee8debb2c3
 EBUILD waylandpp-9999.ebuild 760 BLAKE2B 521de67f5f289aa32a539b6d5e86aa85b270e794acc3a6272deac56004fff5c60c07350151267f7c77af2f73cb339a2086c84ea17b0b9158605e8745a1bc47d6 SHA512 7620b5e841fbead64b3211f1968e3e7b3f1a83a0cd5769ef4e19104bb4be71884fa4f9eca9ca9b13637409bea4a6d921efa3a50e976e9df7a3244b2754fffe92
 MISC metadata.xml 401 BLAKE2B 3270a9fb51a7a5a0cede7e9bc863f1445db1eda5a3b132b8ed9d2eaaaddeb60b85720484a136e09d3e00b80240a637a9f8a9533311e2b6f17fb9798e2ed19ef6 SHA512 3501904a23158eeae58c78bcc7cc3549bd877cf13f6490a8d63a0586ed080c28e27a6d302a9170020b571460dd0ca64acde471d765c8880bb2427d6c8ed76ada
diff --git a/dev-cpp/waylandpp/files/waylandpp-0.2.7-fix-std-runtime_error.patch b/dev-cpp/waylandpp/files/waylandpp-0.2.7-fix-std-runtime_error.patch
new file mode 100644
index 000000000000..41e71eb237bc
--- /dev/null
+++ b/dev-cpp/waylandpp/files/waylandpp-0.2.7-fix-std-runtime_error.patch
@@ -0,0 +1,25 @@
+From 695c0881101435a57d24c84d04cbcb79eec49903 Mon Sep 17 00:00:00 2001
+From: Rechi <Rechi@users.noreply.github.com>
+Date: Sat, 18 Jan 2020 23:37:46 +0100
+Subject: [PATCH] [fix] add missing stdexcept include after 2d834a6
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fixes error: ‘runtime_error’ is not a member of ‘std’
+---
+ include/wayland-util.hpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/wayland-util.hpp b/include/wayland-util.hpp
+index 9cf5d04..1609651 100644
+--- a/include/wayland-util.hpp
++++ b/include/wayland-util.hpp
+@@ -28,6 +28,7 @@
+ 
+ #include <algorithm>
+ #include <memory>
++#include <stdexcept>
+ #include <string>
+ #include <typeinfo>
+ #include <utility>
diff --git a/dev-cpp/waylandpp/waylandpp-0.2.7.ebuild b/dev-cpp/waylandpp/waylandpp-0.2.7.ebuild
index 6fda559666cb..58a4949eaafd 100644
--- a/dev-cpp/waylandpp/waylandpp-0.2.7.ebuild
+++ b/dev-cpp/waylandpp/waylandpp-0.2.7.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/NilsBrause/waylandpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 RDEPEND="
@@ -32,6 +32,10 @@ DEPEND="${RDEPEND}
 	)
 	"
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-std-runtime_error.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_DOCUMENTATION=$(usex doc)
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index a6e5e2019b69..c08251395660 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/clickhouse/Manifest b/dev-db/clickhouse/Manifest
deleted file mode 100644
index 9732363848b4..000000000000
--- a/dev-db/clickhouse/Manifest
+++ /dev/null
@@ -1,21 +0,0 @@
-AUX clickhouse-server.confd 74 BLAKE2B ccb1d957ce0ec20a65968bb1fe24d756d3f0d73bb0b2bec5b1de7913fdac71fcc04eef0e7d0ca7708b87cccb4ef08b4d5ec2ab514c24c1f39862dc1aced77725 SHA512 3f89e1d592d46c8173df42835c5c9ee541e6fc01eb4448f3351517110650fac3144a6da066f2ebf01bda9a004a972e47dc6c48967f914e541dfe26fb0637cd5c
-AUX clickhouse-server.initd 445 BLAKE2B 166b867de3ad86f814cfbbdfa86a9328a3a54a88438e628f790cc6be1e0eee272effa06db37bdb0d31a41ac1551321b5a756bbfe3a9a8381e327e12515253da1 SHA512 98d396709899a428012fb8f01fbd861359913e12d765924a6a20e5f5cf0da73a2c8b0561a061d4c581443259605841f55fa33ee881f8eb764d6d2446dd4bf849
-AUX clickhouse-server.initd-r1 552 BLAKE2B 39a75038f2cce6c09623b0c90b87a7536995da05fdedbc261e4a92e4add8bfdfb46c59856f9d0df8b49d115b3ea52e684827037c3da40a8fc02948ff47edcde6 SHA512 40324e870c8d0d2bb62acc78bf2c08be9cc0e64e94d00538d41961fb53d2df45f3d811b75c81a0b3e12ee17d99d2b9c0cbca623f7e1ffe5eadf3674bafb97832
-AUX clickhouse-server.service 307 BLAKE2B 1f443f68db97408cb2b0a8e9007195cdc5d6e29f54e55b3bd2b023cfbcb9d3ee4c1083503f83a42cfd18bca3320dfa86571434fe89612fb0a1f5a9e178eb706b SHA512 185db8aed69b178540225fa41f623a78af09e30d2dd1e033baf4d7c80451e702f5d6b9ce5240f7f6fb6d63a4ebed5af4d483515c7e6fe019e7fd44334df4ab37
-DIST cctz-4f9776a.tar.gz 290009 BLAKE2B 532eb7d590f9814c05cc7fdd3c75efe0a6b3f81d85201b14163a9600dd858c4fbac592270d0afccd7d5eef0080d7e70e9d716023bdb60d55479585e2cd3d3f59 SHA512 ba0dfc404cc70f03ef2be29fa3b0c70ea881c92a92525ea4ba1b5bcfc9e45df1b62a5eec180f498293e64bdd5cb9b41f97361cbb7e8baf299dcfdcd1557ca205
-DIST clickhouse-18.10.3.tar.gz 6136661 BLAKE2B 5564bbe85f4ca43f18df702148af0e4e5b5a8826994d90f29beb3a37cdbeb36f9d3ec77d9c7bc6f843e7586e5441aeb0937548eb5eb61d27cecc5790d8c21a5b SHA512 c78386922388cf910a995b569724eb22fc41ab60e765a4d3644c4a48d8b9a67ef28b7e375186b2eb00c43b4f06e90783084f4ac4d3789f1b6e4251ee30e8833c
-DIST clickhouse-18.12.17.tar.gz 6495521 BLAKE2B 00dfb823b9e36923beb50a88bee88af3918bedc7b20079785699a42e36e52f32739f786bd78c5b350f58ae59251e3846da6202d04e24e9a750c92e16065cc395 SHA512 876c5fb6011c65b8ec201126678dad6f5de3430b7d320316ced5c6d22e8086ce337d20b73badbd053bf141097b8fe6cd94910ed607b4bbedb681cfa7921d1fb6
-DIST clickhouse-18.6.0.tar.gz 5852534 BLAKE2B 5634fd26907b21d4a35cff3ed816696205be4aff1cdd1acfe222e24214b1842eb18a4e499e888b0d92b78f5c3023c2962a385af2c0ea889055e473dfa0198bf5 SHA512 e8ea2d4457122513cad47b1cdb2a58dd2ffaec77a7a08bf82179aca12a369d39970520a995bb5db2e5ea4b0939da827b7d4b1f3929cf71c149c965438ebb3633
-DIST clickhouse-19.13.1.11.zip 11502726 BLAKE2B c2788702a2c27c995abc072a94f3945ed6f9039fe0c7840312a86987faf52d2f7801d531e89a02848fa8ee1319247c41de0f3ad0c0cb51c1df1dbcfca3bd3b0a SHA512 095a0e63eff6989ea1f70fac593069e1cdb6ea207a99d8cfd610c4eb8f3f7411a784d9f100c9fc899898e68dd88dd54bec3c136764793c8cae986d920a651f8c
-DIST clickhouse-19.15.2.2.zip 11425217 BLAKE2B 3a2288d771cd92dc283713a44df84df8c3c946ef92efd781d7619c8ffc0d7a3884f1a988c81f1703a7d373e78e413bdaea0fd100cebf7090be9bba16779209ff SHA512 029376b9d540c592d30a32457deb9e605d512fc448eb3dc6896b0ca48a5e92f390ef2dc3a4ea63ce19c264a8b2810ff952e95a6c7a8d4506f733ac6253c079d3
-DIST clickhouse-19.5.3.8.zip 11247905 BLAKE2B f72289f55bddf9b3ad2e16a4d1fc6e4f7681477e742eda3694c3c16975820c93affc01c70b194c5992226d79bee714f706c04402c62bd0ed3d1701a16fb22192 SHA512 f578abbd43c3ccf721e079ce2bafac22be0c5d619388be192c59a2053ae1cf1e7f0a025e0323f0f8f004f879990a88c0ca0cd4d135606de51c576619fe0172b8
-DIST clickhouse-19.9.5.36.zip 11708002 BLAKE2B 075f9b1556c5ee207a608047fa559cec7a0b1f044236e412189ae6dabe25aa04abf881726e4ffa17d4aad6937250c704f050935e61470994b57eaa1ac9ea07e4 SHA512 b0aa04a1c0f7c15316c83a2711f9b64f8235e664956f933530a9f2dc26fcb8b817adb8ca43c96db1cad498e06f4291ce13c0bb259726039c5caa52ae523fa4ab
-EBUILD clickhouse-18.10.3-r1.ebuild 4903 BLAKE2B 9cb7ccd5890de60558174b1bbde464674bf37bff3ee6e8c40dd2d8c2f72053fca4ea5bde568178b847c1dedcd3c21c31d57bce688e4e5ee2e3d1e6174a2a0b00 SHA512 6ac6da034c8673a6957c6a57377a963b045ee7a9d25f5d69ec37f34c500d5a5cee66606b1e5964fd5f3131d2d85e33ac0bf5f889a299bb9a1b4ca6eb2cf6fbb5
-EBUILD clickhouse-18.12.17-r1.ebuild 4900 BLAKE2B 0ce87b58051aeef81c62e41246290cda4680a647ead0761cd58723cd1e269953a18e8f8ca66368c13860fe3b31aae308e79c4be3d6ab6440ed5cabb5a42f40cf SHA512 9602f6bf0092a5661ebd903dc1033d76cefdfe8b286f4363cc5d1de65252cf2b6b262d3a8aa6f33f79b345570593569e282c5e4101814799559de30f7d823968
-EBUILD clickhouse-18.6.0-r1.ebuild 4891 BLAKE2B 12f3ad5a0633b0ea65af7939083ed150460efacc420ac33605273b18e9ac9ae93a2930ae5b70cf98b06bbc32ba9a4e3d69f57885bca2bde5b21c8957efe5021c SHA512 753764286274f3403863fe9947fc60253f05d876b7278a7fee625c262ad1d2a5dcbc3ce7fb58fd44074eab6654528c4e93c74d4a931a027d52b62494058c8e07
-EBUILD clickhouse-19.13.1.11-r2.ebuild 5045 BLAKE2B 35b733010bb514bc27d74200ca86f72a275016ba8928b76066a09b1498c18e48af5cb6a901ad91fe0b74d3f32557d74b5264669d19af5de206227c63e7e7739a SHA512 c0d441c5abebb86339211d4cf56009bbebcb03d46d2d16034e21de6321a97270b80a567190f020e21348c937ce6fa8b1b80a799494956a720056480ae0c1d33c
-EBUILD clickhouse-19.13.1.11-r3.ebuild 5135 BLAKE2B 03e1a841aa058202ac43186b90d1f1fb63fb28c4f281c1458d624dc37d6fbcd13a81eca3c4fff3db326a7a02654b7d1871e190cf76908d114160f4ad44bb8d8f SHA512 edb341c9ac550e058088d90774f427f382eb09c72d4aca3528faf2d27ab3259ba6693136c0970e3cb6e96a9cf425cc64cc6eb2347e86205ab54c1da3040f65ab
-EBUILD clickhouse-19.15.2.2.ebuild 5265 BLAKE2B 11f57fba5525c51e0c41a08ab21a03dbaa2aa767efd5ae36c21b8cbbcec9228992c47fe45512acae7d013752ebed935a4b8c089f6cb25d99eca9723a0596aa33 SHA512 01a0f276651d18278ae1f8c993e94388876519d812ce9f8dbab995bed70a859cbd1c57aea15509b0380b61effa94effd787e837d57db9c9a5d2c35767bc1dd6d
-EBUILD clickhouse-19.5.3.8-r1.ebuild 5026 BLAKE2B 2bd7e6c85e282d9ba768b596539f2460783fec539be1f10b58ad139cef85e2b8fd8f85e8e0cea981997edd47c588381d446f343f4be7fd15c594daf97b32f40c SHA512 4f6e69e5b3cdb9de4b53f17887c8958e3286f2436a35c3c337a12ec884d439b08d0dbf732c750de21d3738836c8ae948b73edc2abb1e413ac6edf2e9e9a8eb19
-EBUILD clickhouse-19.9.5.36-r1.ebuild 5026 BLAKE2B 2bd7e6c85e282d9ba768b596539f2460783fec539be1f10b58ad139cef85e2b8fd8f85e8e0cea981997edd47c588381d446f343f4be7fd15c594daf97b32f40c SHA512 4f6e69e5b3cdb9de4b53f17887c8958e3286f2436a35c3c337a12ec884d439b08d0dbf732c750de21d3738836c8ae948b73edc2abb1e413ac6edf2e9e9a8eb19
-MISC metadata.xml 657 BLAKE2B ea02627178df53a81cf2cb46f47e51ebf0437d5e70ec745a7d5d92d430e2055f3112280d3cbed5d7d7eccd1ce892ff1b184f042b850de1f9071716bda5176e82 SHA512 1a3810659c43b9191a8a37aac652c070fb05e663090575c4908e5dc248dfb1e20d9dd3d832a71b95c36b17a6f3a802dacbea2866f33c530c3d5d6c93f8a58690
diff --git a/dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild b/dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild
deleted file mode 100644
index 351b11c198be..000000000000
--- a/dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils systemd toolchain-funcs user
-
-DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
-HOMEPAGE="https://clickhouse.yandex"
-LICENSE="Apache-2.0"
-
-MY_PN="ClickHouse"
-TYPE="stable"
-
-CCTZ_COMMIT="4f9776a"
-SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.tar.gz -> ${P}.tar.gz
-	https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
-"
-
-SLOT="0/${TYPE}"
-IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools zookeeper"
-RESTRICT="!test? ( test )"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="
-	server? ( cpu_flags_x86_sse4_2 )
-	static? ( client server tools )
-"
-
-RDEPEND="
-	dev-libs/re2:0=
-	!static? (
-		>=app-arch/lz4-1.8.0:=
-		>=app-arch/zstd-1.3.4:=
-		client? (
-			sys-libs/ncurses:0=
-			sys-libs/readline:0=
-		)
-
-		dev-libs/double-conversion
-		dev-libs/capnproto
-		dev-libs/libltdl:0
-		sys-libs/libunwind:0
-		sys-libs/zlib
-		|| (
-			dev-db/unixODBC
-			dev-libs/poco[odbc]
-		)
-		dev-libs/icu:=
-		dev-libs/glib
-		>=dev-libs/boost-1.65.0:=
-		dev-libs/openssl:0=
-		dev-libs/zookeeper-c
-		kafka? ( dev-libs/librdkafka:= )
-		mysql? ( dev-db/mysql-connector-c:= )
-	)
-
-	>=dev-libs/poco-1.9.0
-	dev-libs/libpcre
-"
-
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/mkdocs-1.0.1 )
-	static? (
-		>=app-arch/lz4-1.8.0[static-libs]
-		>=app-arch/zstd-1.3.4[static-libs]
-		client? (
-			sys-libs/ncurses:0=[static-libs]
-			sys-libs/readline:0=[static-libs]
-		)
-		dev-libs/capnproto[static-libs]
-		dev-libs/libltdl[static-libs]
-		sys-libs/libunwind:0[static-libs]
-		sys-libs/zlib[static-libs]
-		|| (
-			dev-db/unixODBC[static-libs]
-			dev-libs/poco[odbc]
-		)
-		dev-libs/icu[static-libs]
-		dev-libs/glib[static-libs]
-		>=dev-libs/boost-1.65.0[static-libs]
-		dev-libs/openssl[static-libs]
-		dev-libs/zookeeper-c[static-libs]
-		dev-db/mysql-connector-c[static-libs]
-		kafka? ( dev-libs/librdkafka[static-libs] )
-	)
-
-	sys-libs/libtermcap-compat
-	dev-util/patchelf
-	>=sys-devel/lld-6.0.0
-	|| (
-		>=sys-devel/gcc-7.0
-		>=sys-devel/clang-6.0
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
-
-_clang_fullversion() {
-	local ver="$1"; shift
-	set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
-	eval echo "$ver"
-}
-
-clang-fullversion() {
-	_clang_fullversion '$1.$2.$3' "$@"
-}
-
-clang-version() {
-	_clang_fullversion '$1.$2' "$@"
-}
-
-clang-major-version() {
-	_clang_fullversion '$1' "$@"
-}
-
-clang-minor-version() {
-	_clang_fullversion '$2' "$@"
-}
-
-clang-micro-version() {
-	_clang_fullversion '$3' "$@"
-}
-
-pkg_pretend() {
-	if [[ $(tc-getCC) == clang ]]; then
-		if [[ $(clang-major-version) -lt 6 ]]; then
-			eerror "Compilation with clang older than 6.0 is not supported"
-			die "Too old clang found"
-		fi
-		:
-	elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
-		eerror "Compilation with gcc older than 7.2 is not supported"
-		die "Too old gcc found"
-	fi
-}
-
-src_unpack() {
-	default_src_unpack
-	[[ ${PV} == 9999 ]] && return 0
-	cd "${S}/contrib" || die "failed to cd to contrib"
-	mkdir -p cctz zookeeper zstd || die "failed to create directories"
-	tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_POCO_MONGODB="$(usex mongodb)"
-		-DENABLE_RDKAFKA="$(usex kafka)"
-		-DENABLE_TESTS="$(usex test)"
-		-DUSE_STATIC_LIBRARIES="$(usex static)"
-		-DMAKE_STATIC_LIBRARIES="$(usex static)"
-		-DUSE_MYSQL="$(usex mysql)"
-		-DENABLE_CLICKHOUSE_SERVER="$(usex server)"
-		-DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
-		-DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
-		-DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
-		-DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
-		-DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
-		-DENABLE_CLICKHOUSE_ALL=OFF
-		-DUSE_INTERNAL_SSL_LIBRARY=False
-		-DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
-		-DUNBUNDLED=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if ! use test; then
-		rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
-	fi
-
-	if use doc; then
-		pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
-		./build.py || die "Failed to build docs"
-		popd || die "Failed to exit docs build directory"
-
-		dodoc -r "${S}/docs/build"
-	fi
-
-	if use server; then
-		newinitd "${FILESDIR}"/clickhouse-server.initd clickhouse-server
-		systemd_dounit "${FILESDIR}"/clickhouse-server.service
-	fi
-}
-
-pkg_preinst() {
-	if use server; then
-		enewgroup clickhouse
-		enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
-	fi
-}
diff --git a/dev-db/clickhouse/clickhouse-18.12.17-r1.ebuild b/dev-db/clickhouse/clickhouse-18.12.17-r1.ebuild
deleted file mode 100644
index fa18cc2e59f7..000000000000
--- a/dev-db/clickhouse/clickhouse-18.12.17-r1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils systemd toolchain-funcs user
-
-DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
-HOMEPAGE="https://clickhouse.yandex"
-LICENSE="Apache-2.0"
-
-MY_PN="ClickHouse"
-TYPE="stable"
-
-CCTZ_COMMIT="4f9776a"
-SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.tar.gz -> ${P}.tar.gz
-	https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
-"
-
-SLOT="0/${TYPE}"
-IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools"
-RESTRICT="!test? ( test )"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="
-	server? ( cpu_flags_x86_sse4_2 )
-	static? ( client server tools )
-"
-
-RDEPEND="
-	dev-libs/re2:0=
-	!static? (
-		>=app-arch/lz4-1.8.0:=
-		>=app-arch/zstd-1.3.4:=
-		client? (
-			sys-libs/ncurses:0=
-			sys-libs/readline:0=
-		)
-
-		dev-libs/double-conversion
-		dev-libs/capnproto
-		dev-libs/libltdl:0
-		sys-libs/libunwind:0
-		sys-libs/zlib
-		|| (
-			dev-db/unixODBC
-			dev-libs/poco[odbc]
-		)
-		dev-libs/icu:=
-		dev-libs/glib
-		>=dev-libs/boost-1.65.0:=
-		dev-libs/openssl:0=
-		kafka? ( dev-libs/librdkafka:= )
-		mysql? ( dev-db/mysql-connector-c:= )
-	)
-
-	>=dev-libs/poco-1.9.0
-	dev-libs/libpcre
-"
-
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/mkdocs-1.0.1 )
-	static? (
-		>=app-arch/lz4-1.8.0[static-libs]
-		>=app-arch/zstd-1.3.4[static-libs]
-		client? (
-			sys-libs/ncurses:0=[static-libs]
-			sys-libs/readline:0=[static-libs]
-		)
-		dev-libs/capnproto[static-libs]
-		dev-libs/libltdl[static-libs]
-		sys-libs/libunwind:0[static-libs]
-		sys-libs/zlib[static-libs]
-		|| (
-			dev-db/unixODBC[static-libs]
-			dev-libs/poco[odbc]
-		)
-		dev-libs/icu[static-libs]
-		dev-libs/glib[static-libs]
-		>=dev-libs/boost-1.65.0[static-libs]
-		dev-libs/openssl[static-libs]
-		dev-db/mysql-connector-c[static-libs]
-		kafka? ( dev-libs/librdkafka[static-libs] )
-	)
-
-	sys-libs/libtermcap-compat
-	dev-util/patchelf
-	>=sys-devel/lld-6.0.0
-	|| (
-		>=sys-devel/gcc-7.0
-		>=sys-devel/clang-6.0
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
-
-_clang_fullversion() {
-	local ver="$1"; shift
-	set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
-	eval echo "$ver"
-}
-
-clang-fullversion() {
-	_clang_fullversion '$1.$2.$3' "$@"
-}
-
-clang-version() {
-	_clang_fullversion '$1.$2' "$@"
-}
-
-clang-major-version() {
-	_clang_fullversion '$1' "$@"
-}
-
-clang-minor-version() {
-	_clang_fullversion '$2' "$@"
-}
-
-clang-micro-version() {
-	_clang_fullversion '$3' "$@"
-}
-
-pkg_pretend() {
-	if [[ $(tc-getCC) == clang ]]; then
-		if [[ $(clang-major-version) -lt 6 ]]; then
-			eerror "Compilation with clang older than 6.0 is not supported"
-			die "Too old clang found"
-		fi
-		:
-	elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
-		eerror "Compilation with gcc older than 7.2 is not supported"
-		die "Too old gcc found"
-	fi
-}
-
-src_unpack() {
-	default_src_unpack
-	[[ ${PV} == 9999 ]] && return 0
-	cd "${S}/contrib" || die "failed to cd to contrib"
-	mkdir -p cctz zstd || die "failed to create directories"
-	tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_POCO_MONGODB="$(usex mongodb)"
-		-DENABLE_RDKAFKA="$(usex kafka)"
-		-DENABLE_TESTS="$(usex test)"
-		-DUSE_STATIC_LIBRARIES="$(usex static)"
-		-DMAKE_STATIC_LIBRARIES="$(usex static)"
-		-DUSE_MYSQL="$(usex mysql)"
-		-DENABLE_CLICKHOUSE_SERVER="$(usex server)"
-		-DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
-		-DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
-		-DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
-		-DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
-		-DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
-		# As of now, clickhouse fails to build if odbc is disabled
-		-DENABLE_ODBC=True
-		-DENABLE_CLICKHOUSE_ODBC_BRIDGE=True
-		-DENABLE_CLICKHOUSE_ALL=OFF
-		-DUSE_INTERNAL_SSL_LIBRARY=False
-		-DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
-		-DUNBUNDLED=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if ! use test; then
-		rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
-	fi
-
-	if use doc; then
-		pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
-		./build.py || die "Failed to build docs"
-		popd || die "Failed to exit docs build directory"
-
-		dodoc -r "${S}/docs/build"
-	fi
-
-	if use server; then
-		newinitd "${FILESDIR}"/clickhouse-server.initd clickhouse-server
-		systemd_dounit "${FILESDIR}"/clickhouse-server.service
-	fi
-}
-
-pkg_preinst() {
-	if use server; then
-		enewgroup clickhouse
-		enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
-	fi
-}
diff --git a/dev-db/clickhouse/clickhouse-18.6.0-r1.ebuild b/dev-db/clickhouse/clickhouse-18.6.0-r1.ebuild
deleted file mode 100644
index f5c30296ab3d..000000000000
--- a/dev-db/clickhouse/clickhouse-18.6.0-r1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils systemd toolchain-funcs user
-
-DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
-HOMEPAGE="https://clickhouse.yandex"
-LICENSE="Apache-2.0"
-
-MY_PN="ClickHouse"
-TYPE="stable"
-
-CCTZ_COMMIT="4f9776a"
-ZSTD_COMMIT="2555975"
-SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.tar.gz -> ${P}.tar.gz
-	https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
-"
-
-SLOT="0/${TYPE}"
-IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools zookeeper"
-RESTRICT="!test? ( test )"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="
-	server? ( cpu_flags_x86_sse4_2 )
-	static? ( client server tools )
-"
-
-RDEPEND="
-	dev-libs/re2:0=
-	!static? (
-		>=app-arch/lz4-1.8.0:=
-		>=app-arch/zstd-1.3.4:=
-		client? (
-			sys-libs/ncurses:0=
-			sys-libs/readline:0=
-		)
-
-		dev-libs/double-conversion
-		dev-libs/capnproto
-		dev-libs/libltdl:0
-		sys-libs/libunwind:0
-		sys-libs/zlib
-		|| (
-			dev-db/unixODBC
-			dev-libs/poco[odbc]
-		)
-		dev-libs/icu:=
-		dev-libs/glib
-		>=dev-libs/boost-1.65.0:=
-		dev-libs/openssl:0=
-		dev-libs/zookeeper-c
-		kafka? ( dev-libs/librdkafka:= )
-		mysql? ( dev-db/mysql-connector-c:= )
-	)
-
-	>=dev-libs/poco-1.9.0
-	dev-libs/libpcre
-"
-
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/mkdocs-0.17.3 )
-	static? (
-		>=app-arch/lz4-1.8.0[static-libs]
-		>=app-arch/zstd-1.3.4[static-libs]
-		client? (
-			sys-libs/ncurses:0=[static-libs]
-			sys-libs/readline:0=[static-libs]
-		)
-		dev-libs/capnproto[static-libs]
-		dev-libs/libltdl[static-libs]
-		sys-libs/libunwind:0[static-libs]
-		sys-libs/zlib[static-libs]
-		|| (
-			dev-db/unixODBC[static-libs]
-			dev-libs/poco[odbc]
-		)
-		dev-libs/icu[static-libs]
-		dev-libs/glib[static-libs]
-		>=dev-libs/boost-1.65.0[static-libs]
-		dev-libs/openssl[static-libs]
-		dev-libs/zookeeper-c[static-libs]
-		dev-db/mysql-connector-c[static-libs]
-		kafka? ( dev-libs/librdkafka[static-libs] )
-	)
-
-	sys-libs/libtermcap-compat
-	dev-util/patchelf
-	>=sys-devel/lld-6.0.0
-	|| (
-		>=sys-devel/gcc-7.0
-		>=sys-devel/clang-6.0
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
-
-_clang_fullversion() {
-	local ver="$1"; shift
-	set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
-	eval echo "$ver"
-}
-
-clang-fullversion() {
-	_clang_fullversion '$1.$2.$3' "$@"
-}
-
-clang-version() {
-	_clang_fullversion '$1.$2' "$@"
-}
-
-clang-major-version() {
-	_clang_fullversion '$1' "$@"
-}
-
-clang-minor-version() {
-	_clang_fullversion '$2' "$@"
-}
-
-clang-micro-version() {
-	_clang_fullversion '$3' "$@"
-}
-
-pkg_pretend() {
-	if [[ $(tc-getCC) == clang ]]; then
-		if [[ $(clang-major-version) -lt 6 ]]; then
-			eerror "Compilation with clang older than 6.0 is not supported"
-			die "Too old clang found"
-		fi
-		:
-	elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
-		eerror "Compilation with gcc older than 7.2 is not supported"
-		die "Too old gcc found"
-	fi
-}
-
-src_unpack() {
-	default_src_unpack
-	[[ ${PV} == 9999 ]] && return 0
-	cd "${S}/contrib" || die "failed to cd to contrib"
-	mkdir -p cctz zookeeper zstd || die "failed to create directories"
-	tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_POCO_MONGODB="$(usex mongodb)"
-		-DENABLE_RDKAFKA="$(usex kafka)"
-		-DENABLE_TESTS="$(usex test)"
-		-DUSE_STATIC_LIBRARIES="$(usex static)"
-		-DMAKE_STATIC_LIBRARIES="$(usex static)"
-		-DUSE_MYSQL="$(usex mysql)"
-		-DENABLE_CLICKHOUSE_SERVER="$(usex server)"
-		-DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
-		-DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
-		-DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
-		-DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
-		-DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
-		-DENABLE_CLICKHOUSE_ALL=OFF
-		-DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
-		-DUNBUNDLED=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if ! use test; then
-		rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
-	fi
-
-	if use doc; then
-		pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
-		./build.py || die "Failed to build docs"
-		popd || die "Failed to exit docs build directory"
-
-		dodoc -r "${S}/docs/build"
-	fi
-
-	if use server; then
-		newinitd "${FILESDIR}"/clickhouse-server.initd clickhouse-server
-		systemd_dounit "${FILESDIR}"/clickhouse-server.service
-	fi
-}
-
-pkg_preinst() {
-	if use server; then
-		enewgroup clickhouse
-		enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
-	fi
-}
diff --git a/dev-db/clickhouse/clickhouse-19.13.1.11-r2.ebuild b/dev-db/clickhouse/clickhouse-19.13.1.11-r2.ebuild
deleted file mode 100644
index 0184d7fe5a7c..000000000000
--- a/dev-db/clickhouse/clickhouse-19.13.1.11-r2.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils systemd toolchain-funcs user
-
-DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
-HOMEPAGE="https://clickhouse.yandex"
-LICENSE="Apache-2.0"
-
-MY_PN="ClickHouse"
-TYPE="stable"
-
-CCTZ_COMMIT="4f9776a"
-SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.zip -> ${P}.zip
-	https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
-"
-
-SLOT="0/${TYPE}"
-IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools"
-RESTRICT="!test? ( test )"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="
-	server? ( cpu_flags_x86_sse4_2 )
-	static? ( client server tools )
-"
-
-RDEPEND="
-	dev-libs/re2:0=
-	!static? (
-		>=app-arch/lz4-1.8.0:=
-		>=app-arch/zstd-1.3.4:=
-		client? (
-			sys-libs/ncurses:0=
-			sys-libs/readline:0=
-		)
-
-		dev-libs/double-conversion
-		dev-libs/capnproto
-		dev-libs/libltdl:0
-		sys-libs/libunwind:0
-		sys-libs/zlib
-		dev-libs/poco[odbc]
-		dev-libs/icu:=
-		dev-libs/glib
-		>=dev-libs/boost-1.65.0:=
-		dev-libs/openssl:0=
-		kafka? ( dev-libs/librdkafka:= )
-		mysql? ( dev-db/mysql-connector-c:= )
-	)
-
-	>=dev-libs/poco-1.9.0
-	dev-libs/libpcre
-	dev-libs/jemalloc
-	dev-libs/protobuf
-"
-
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/mkdocs-1.0.1 )
-	static? (
-		>=app-arch/lz4-1.8.0[static-libs]
-		>=app-arch/zstd-1.3.4[static-libs]
-		client? (
-			sys-libs/ncurses:0=[static-libs]
-			sys-libs/readline:0=[static-libs]
-		)
-		dev-libs/capnproto[static-libs]
-		dev-libs/libltdl[static-libs]
-		sys-libs/libunwind:0[static-libs]
-		sys-libs/zlib[static-libs]
-		|| (
-			dev-db/unixODBC[static-libs]
-			dev-libs/poco[odbc]
-		)
-		dev-libs/icu[static-libs]
-		dev-libs/glib[static-libs]
-		>=dev-libs/boost-1.65.0[static-libs]
-		dev-libs/openssl[static-libs]
-		dev-db/mysql-connector-c[static-libs]
-		kafka? ( dev-libs/librdkafka[static-libs] )
-	)
-
-	sys-libs/libtermcap-compat
-	dev-util/patchelf
-	>=sys-devel/lld-6.0.0
-	>=sys-devel/gcc-7.0
-	>=sys-devel/clang-6.0
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
-
-_clang_fullversion() {
-	local ver="$1"; shift
-	set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
-	eval echo "$ver"
-}
-
-clang-fullversion() {
-	_clang_fullversion '$1.$2.$3' "$@"
-}
-
-clang-version() {
-	_clang_fullversion '$1.$2' "$@"
-}
-
-clang-major-version() {
-	_clang_fullversion '$1' "$@"
-}
-
-clang-minor-version() {
-	_clang_fullversion '$2' "$@"
-}
-
-clang-micro-version() {
-	_clang_fullversion '$3' "$@"
-}
-
-pkg_pretend() {
-	if [[ $(tc-getCC) == clang ]]; then
-		if [[ $(clang-major-version) -lt 6 ]]; then
-			eerror "Compilation with clang older than 6.0 is not supported"
-			die "Too old clang found"
-		fi
-		:
-	elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
-		eerror "Compilation with gcc older than 7.2 is not supported"
-		die "Too old gcc found"
-	fi
-}
-
-src_unpack() {
-	default_src_unpack
-	[[ ${PV} == 9999 ]] && return 0
-	cd "${S}/contrib" || die "failed to cd to contrib"
-	mkdir -p cctz zstd || die "failed to create directories"
-	tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
-}
-
-src_prepare() {
-	eapply_user
-	cmake-utils_src_prepare
-}
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_POCO_MONGODB="$(usex mongodb)"
-		-DENABLE_RDKAFKA="$(usex kafka)"
-		-DENABLE_TESTS="$(usex test)"
-		-DUSE_STATIC_LIBRARIES="$(usex static)"
-		-DMAKE_STATIC_LIBRARIES="$(usex static)"
-		-DUSE_MYSQL="$(usex mysql)"
-		-DENABLE_CLICKHOUSE_SERVER="$(usex server)"
-		-DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
-		-DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
-		-DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
-		-DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
-		-DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
-		# As of now, clickhouse fails to build if odbc is disabled
-		-DENABLE_ODBC=True
-		-DENABLE_CLICKHOUSE_ODBC_BRIDGE=True
-		-DENABLE_CLICKHOUSE_ALL=OFF
-		-DUSE_INTERNAL_SSL_LIBRARY=False
-		-DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
-		-DUNBUNDLED=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if ! use test; then
-		rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
-	fi
-
-	if use doc; then
-		pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
-		./build.py || die "Failed to build docs"
-		popd || die "Failed to exit docs build directory"
-
-		dodoc -r "${S}/docs/build"
-	fi
-
-	if use server; then
-		newinitd "${FILESDIR}"/clickhouse-server.initd clickhouse-server
-		systemd_dounit "${FILESDIR}"/clickhouse-server.service
-	fi
-
-	keepdir /var/log/clickhouse-server
-	chown clickhouse:clickhouse "${D}"/var/log/clickhouse-server
-}
-
-pkg_preinst() {
-	if use server; then
-		enewgroup clickhouse
-		enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
-	fi
-}
diff --git a/dev-db/clickhouse/clickhouse-19.13.1.11-r3.ebuild b/dev-db/clickhouse/clickhouse-19.13.1.11-r3.ebuild
deleted file mode 100644
index aafc89dc7813..000000000000
--- a/dev-db/clickhouse/clickhouse-19.13.1.11-r3.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils systemd toolchain-funcs user
-
-DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
-HOMEPAGE="https://clickhouse.yandex"
-LICENSE="Apache-2.0"
-
-MY_PN="ClickHouse"
-TYPE="stable"
-
-CCTZ_COMMIT="4f9776a"
-SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.zip -> ${P}.zip
-	https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
-"
-
-SLOT="0/${TYPE}"
-IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools"
-RESTRICT="!test? ( test )"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="
-	server? ( cpu_flags_x86_sse4_2 )
-	static? ( client server tools )
-"
-
-RDEPEND="
-	dev-libs/re2:0=
-	!static? (
-		>=app-arch/lz4-1.8.0:=
-		>=app-arch/zstd-1.3.4:=
-		client? (
-			sys-libs/ncurses:0=
-			sys-libs/readline:0=
-		)
-
-		dev-libs/double-conversion
-		dev-libs/capnproto
-		dev-libs/libltdl:0
-		sys-libs/libunwind:0
-		sys-libs/zlib
-		dev-libs/poco[odbc]
-		dev-libs/icu:=
-		dev-libs/glib
-		>=dev-libs/boost-1.65.0:=
-		dev-libs/openssl:0=
-		kafka? ( dev-libs/librdkafka:= )
-		mysql? ( dev-db/mysql-connector-c:= )
-	)
-
-	>=dev-libs/poco-1.9.0
-	dev-libs/libpcre
-	dev-libs/jemalloc
-	dev-libs/protobuf
-"
-
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/mkdocs-1.0.1 )
-	static? (
-		>=app-arch/lz4-1.8.0[static-libs]
-		>=app-arch/zstd-1.3.4[static-libs]
-		client? (
-			sys-libs/ncurses:0=[static-libs]
-			sys-libs/readline:0=[static-libs]
-		)
-		dev-libs/capnproto[static-libs]
-		dev-libs/libltdl[static-libs]
-		sys-libs/libunwind:0[static-libs]
-		sys-libs/zlib[static-libs]
-		|| (
-			dev-db/unixODBC[static-libs]
-			dev-libs/poco[odbc]
-		)
-		dev-libs/icu[static-libs]
-		dev-libs/glib[static-libs]
-		>=dev-libs/boost-1.65.0[static-libs]
-		dev-libs/openssl[static-libs]
-		dev-db/mysql-connector-c[static-libs]
-		kafka? ( dev-libs/librdkafka[static-libs] )
-	)
-	=dev-cpp/gtest-1.8*
-	sys-libs/libtermcap-compat
-	dev-util/patchelf
-	>=sys-devel/lld-6.0.0
-	>=sys-devel/gcc-7.0
-	>=sys-devel/clang-6.0
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
-
-_clang_fullversion() {
-	local ver="$1"; shift
-	set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
-	eval echo "$ver"
-}
-
-clang-fullversion() {
-	_clang_fullversion '$1.$2.$3' "$@"
-}
-
-clang-version() {
-	_clang_fullversion '$1.$2' "$@"
-}
-
-clang-major-version() {
-	_clang_fullversion '$1' "$@"
-}
-
-clang-minor-version() {
-	_clang_fullversion '$2' "$@"
-}
-
-clang-micro-version() {
-	_clang_fullversion '$3' "$@"
-}
-
-pkg_pretend() {
-	if [[ $(tc-getCC) == clang ]]; then
-		if [[ $(clang-major-version) -lt 6 ]]; then
-			eerror "Compilation with clang older than 6.0 is not supported"
-			die "Too old clang found"
-		fi
-		:
-	elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
-		eerror "Compilation with gcc older than 7.2 is not supported"
-		die "Too old gcc found"
-	fi
-}
-
-src_unpack() {
-	default_src_unpack
-	[[ ${PV} == 9999 ]] && return 0
-	cd "${S}/contrib" || die "failed to cd to contrib"
-	mkdir -p cctz zstd || die "failed to create directories"
-	tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
-}
-
-src_prepare() {
-	eapply_user
-	cmake-utils_src_prepare
-}
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_POCO_MONGODB="$(usex mongodb)"
-		-DENABLE_RDKAFKA="$(usex kafka)"
-		-DENABLE_TESTS="$(usex test)"
-		-DUSE_STATIC_LIBRARIES="$(usex static)"
-		-DMAKE_STATIC_LIBRARIES="$(usex static)"
-		-DUSE_MYSQL="$(usex mysql)"
-		-DENABLE_CLICKHOUSE_SERVER="$(usex server)"
-		-DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
-		-DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
-		-DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
-		-DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
-		-DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
-		# As of now, clickhouse fails to build if odbc is disabled
-		-DENABLE_ODBC=True
-		-DENABLE_CLICKHOUSE_ODBC_BRIDGE=True
-		-DENABLE_CLICKHOUSE_ALL=OFF
-		-DUSE_INTERNAL_SSL_LIBRARY=False
-		-DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
-		-DUNBUNDLED=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if ! use test; then
-		rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
-	fi
-
-	if use doc; then
-		pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
-		./build.py || die "Failed to build docs"
-		popd || die "Failed to exit docs build directory"
-
-		dodoc -r "${S}/docs/build"
-	fi
-
-	if use server; then
-		newinitd "${FILESDIR}"/clickhouse-server.initd-r1 clickhouse-server
-		newconfd "${FILESDIR}"/clickhouse-server.confd clickhouse-server
-		systemd_dounit "${FILESDIR}"/clickhouse-server.service
-	fi
-
-	keepdir /var/log/clickhouse-server
-	chown clickhouse:clickhouse "${D}"/var/log/clickhouse-server
-}
-
-pkg_preinst() {
-	if use server; then
-		enewgroup clickhouse
-		enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
-	fi
-}
diff --git a/dev-db/clickhouse/clickhouse-19.15.2.2.ebuild b/dev-db/clickhouse/clickhouse-19.15.2.2.ebuild
deleted file mode 100644
index 22b038f2ebdd..000000000000
--- a/dev-db/clickhouse/clickhouse-19.15.2.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=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils systemd toolchain-funcs user
-
-DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
-HOMEPAGE="https://clickhouse.yandex"
-LICENSE="Apache-2.0"
-
-MY_PN="ClickHouse"
-TYPE="stable"
-
-CCTZ_COMMIT="4f9776a"
-SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.zip -> ${P}.zip
-	https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
-"
-
-SLOT="0/${TYPE}"
-IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools"
-RESTRICT="!test? ( test )"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="
-	server? ( cpu_flags_x86_sse4_2 )
-	static? ( client server tools )
-"
-
-RDEPEND="
-	dev-libs/re2:0=
-	!static? (
-		>=app-arch/lz4-1.8.0:=
-		>=app-arch/zstd-1.3.4:=
-		client? (
-			sys-libs/ncurses:0=
-			sys-libs/readline:0=
-		)
-
-		dev-libs/double-conversion
-		dev-libs/capnproto
-		dev-libs/libltdl:0
-		sys-libs/libunwind:0
-		sys-libs/zlib
-		dev-libs/poco[odbc]
-		dev-libs/icu:=
-		dev-libs/glib
-		>=dev-libs/boost-1.65.0:=
-		dev-libs/openssl:0=
-		kafka? ( dev-libs/librdkafka:= )
-		mysql? ( dev-db/mysql-connector-c:= )
-	)
-
-	>=dev-libs/poco-1.9.0
-	dev-libs/libpcre
-	dev-libs/jemalloc
-	dev-libs/protobuf
-	dev-cpp/sparsehash
-"
-
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/mkdocs-1.0.1 )
-	static? (
-		>=app-arch/lz4-1.8.0[static-libs]
-		>=app-arch/zstd-1.3.4[static-libs]
-		client? (
-			sys-libs/ncurses:0=[static-libs]
-			sys-libs/readline:0=[static-libs]
-		)
-		dev-libs/capnproto[static-libs]
-		dev-libs/libltdl[static-libs]
-		sys-libs/libunwind:0[static-libs]
-		sys-libs/zlib[static-libs]
-		|| (
-			dev-db/unixODBC[static-libs]
-			dev-libs/poco[odbc]
-		)
-		dev-libs/icu[static-libs]
-		dev-libs/glib[static-libs]
-		>=dev-libs/boost-1.65.0[static-libs]
-		dev-libs/openssl[static-libs]
-		dev-db/mysql-connector-c[static-libs]
-		kafka? ( dev-libs/librdkafka[static-libs] )
-	)
-	=dev-cpp/gtest-1.8*
-	sys-libs/libtermcap-compat
-	dev-util/patchelf
-	>=sys-devel/lld-6.0.0
-	>=sys-devel/gcc-7.0
-	>=sys-devel/clang-6.0
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
-
-_clang_fullversion() {
-	local ver="$1"; shift
-	set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
-	eval echo "$ver"
-}
-
-clang-fullversion() {
-	_clang_fullversion '$1.$2.$3' "$@"
-}
-
-clang-version() {
-	_clang_fullversion '$1.$2' "$@"
-}
-
-clang-major-version() {
-	_clang_fullversion '$1' "$@"
-}
-
-clang-minor-version() {
-	_clang_fullversion '$2' "$@"
-}
-
-clang-micro-version() {
-	_clang_fullversion '$3' "$@"
-}
-
-pkg_pretend() {
-	if [[ $(tc-getCC) == clang ]]; then
-		if [[ $(clang-major-version) -lt 6 ]]; then
-			eerror "Compilation with clang older than 6.0 is not supported"
-			die "Too old clang found"
-		fi
-		:
-	elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
-		eerror "Compilation with gcc older than 7.2 is not supported"
-		die "Too old gcc found"
-	fi
-}
-
-src_unpack() {
-	default_src_unpack
-	[[ ${PV} == 9999 ]] && return 0
-	cd "${S}/contrib" || die "failed to cd to contrib"
-	mkdir -p cctz zstd || die "failed to create directories"
-	tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
-}
-
-src_prepare() {
-	sed -i -e 's~add_subdirectory(contrib/libunwind-cmake)~~' cmake/find/unwind.cmake || die "Failed to succeed"
-	eapply_user
-	cmake-utils_src_prepare
-}
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_POCO_MONGODB="$(usex mongodb)"
-		-DENABLE_RDKAFKA="$(usex kafka)"
-		-DENABLE_TESTS="$(usex test)"
-		-DUSE_STATIC_LIBRARIES="$(usex static)"
-		-DMAKE_STATIC_LIBRARIES="$(usex static)"
-		-DUSE_MYSQL="$(usex mysql)"
-		-DENABLE_CLICKHOUSE_SERVER="$(usex server)"
-		-DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
-		-DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
-		-DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
-		-DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
-		-DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
-		# As of now, clickhouse fails to build if odbc is disabled
-		-DENABLE_ODBC=True
-		-DENABLE_CLICKHOUSE_ODBC_BRIDGE=True
-		-DENABLE_CLICKHOUSE_ALL=OFF
-		-DUSE_INTERNAL_SSL_LIBRARY=False
-		-DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
-		-DUNBUNDLED=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if ! use test; then
-		rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
-	fi
-
-	if use doc; then
-		pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
-		./build.py || die "Failed to build docs"
-		popd || die "Failed to exit docs build directory"
-
-		dodoc -r "${S}/docs/build"
-	fi
-
-	if use server; then
-		newinitd "${FILESDIR}"/clickhouse-server.initd-r1 clickhouse-server
-		newconfd "${FILESDIR}"/clickhouse-server.confd clickhouse-server
-		systemd_dounit "${FILESDIR}"/clickhouse-server.service
-	fi
-
-	keepdir /var/log/clickhouse-server
-	chown clickhouse:clickhouse "${D}"/var/log/clickhouse-server
-}
-
-pkg_preinst() {
-	if use server; then
-		enewgroup clickhouse
-		enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
-	fi
-}
diff --git a/dev-db/clickhouse/clickhouse-19.5.3.8-r1.ebuild b/dev-db/clickhouse/clickhouse-19.5.3.8-r1.ebuild
deleted file mode 100644
index 80e66a29108b..000000000000
--- a/dev-db/clickhouse/clickhouse-19.5.3.8-r1.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils systemd toolchain-funcs user
-
-DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
-HOMEPAGE="https://clickhouse.yandex"
-LICENSE="Apache-2.0"
-
-MY_PN="ClickHouse"
-TYPE="stable"
-
-CCTZ_COMMIT="4f9776a"
-SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.zip -> ${P}.zip
-	https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
-"
-
-SLOT="0/${TYPE}"
-IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools"
-RESTRICT="!test? ( test )"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="
-	server? ( cpu_flags_x86_sse4_2 )
-	static? ( client server tools )
-"
-
-RDEPEND="
-	dev-libs/re2:0=
-	!static? (
-		>=app-arch/lz4-1.8.0:=
-		>=app-arch/zstd-1.3.4:=
-		client? (
-			sys-libs/ncurses:0=
-			sys-libs/readline:0=
-		)
-
-		dev-libs/double-conversion
-		dev-libs/capnproto
-		dev-libs/libltdl:0
-		sys-libs/libunwind:0
-		sys-libs/zlib
-		dev-libs/poco[odbc]
-		dev-libs/icu:=
-		dev-libs/glib
-		>=dev-libs/boost-1.65.0:=
-		dev-libs/openssl:0=
-		kafka? ( dev-libs/librdkafka:= )
-		mysql? ( dev-db/mysql-connector-c:= )
-	)
-
-	>=dev-libs/poco-1.9.0
-	dev-libs/libpcre
-	dev-libs/jemalloc
-"
-
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/mkdocs-1.0.1 )
-	static? (
-		>=app-arch/lz4-1.8.0[static-libs]
-		>=app-arch/zstd-1.3.4[static-libs]
-		client? (
-			sys-libs/ncurses:0=[static-libs]
-			sys-libs/readline:0=[static-libs]
-		)
-		dev-libs/capnproto[static-libs]
-		dev-libs/libltdl[static-libs]
-		sys-libs/libunwind:0[static-libs]
-		sys-libs/zlib[static-libs]
-		|| (
-			dev-db/unixODBC[static-libs]
-			dev-libs/poco[odbc]
-		)
-		dev-libs/icu[static-libs]
-		dev-libs/glib[static-libs]
-		>=dev-libs/boost-1.65.0[static-libs]
-		dev-libs/openssl[static-libs]
-		dev-db/mysql-connector-c[static-libs]
-		kafka? ( dev-libs/librdkafka[static-libs] )
-	)
-
-	sys-libs/libtermcap-compat
-	dev-util/patchelf
-	>=sys-devel/lld-6.0.0
-	>=sys-devel/gcc-7.0
-	>=sys-devel/clang-6.0
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
-
-_clang_fullversion() {
-	local ver="$1"; shift
-	set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
-	eval echo "$ver"
-}
-
-clang-fullversion() {
-	_clang_fullversion '$1.$2.$3' "$@"
-}
-
-clang-version() {
-	_clang_fullversion '$1.$2' "$@"
-}
-
-clang-major-version() {
-	_clang_fullversion '$1' "$@"
-}
-
-clang-minor-version() {
-	_clang_fullversion '$2' "$@"
-}
-
-clang-micro-version() {
-	_clang_fullversion '$3' "$@"
-}
-
-pkg_pretend() {
-	if [[ $(tc-getCC) == clang ]]; then
-		if [[ $(clang-major-version) -lt 6 ]]; then
-			eerror "Compilation with clang older than 6.0 is not supported"
-			die "Too old clang found"
-		fi
-		:
-	elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
-		eerror "Compilation with gcc older than 7.2 is not supported"
-		die "Too old gcc found"
-	fi
-}
-
-src_unpack() {
-	default_src_unpack
-	[[ ${PV} == 9999 ]] && return 0
-	cd "${S}/contrib" || die "failed to cd to contrib"
-	mkdir -p cctz zstd || die "failed to create directories"
-	tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
-}
-
-src_prepare() {
-	eapply_user
-	cmake-utils_src_prepare
-}
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_POCO_MONGODB="$(usex mongodb)"
-		-DENABLE_RDKAFKA="$(usex kafka)"
-		-DENABLE_TESTS="$(usex test)"
-		-DUSE_STATIC_LIBRARIES="$(usex static)"
-		-DMAKE_STATIC_LIBRARIES="$(usex static)"
-		-DUSE_MYSQL="$(usex mysql)"
-		-DENABLE_CLICKHOUSE_SERVER="$(usex server)"
-		-DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
-		-DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
-		-DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
-		-DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
-		-DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
-		# As of now, clickhouse fails to build if odbc is disabled
-		-DENABLE_ODBC=True
-		-DENABLE_CLICKHOUSE_ODBC_BRIDGE=True
-		-DENABLE_CLICKHOUSE_ALL=OFF
-		-DUSE_INTERNAL_SSL_LIBRARY=False
-		-DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
-		-DUNBUNDLED=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if ! use test; then
-		rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
-	fi
-
-	if use doc; then
-		pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
-		./build.py || die "Failed to build docs"
-		popd || die "Failed to exit docs build directory"
-
-		dodoc -r "${S}/docs/build"
-	fi
-
-	if use server; then
-		newinitd "${FILESDIR}"/clickhouse-server.initd clickhouse-server
-		systemd_dounit "${FILESDIR}"/clickhouse-server.service
-	fi
-
-	keepdir /var/log/clickhouse-server
-	chown clickhouse:clickhouse "${D}"/var/log/clickhouse-server
-}
-
-pkg_preinst() {
-	if use server; then
-		enewgroup clickhouse
-		enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
-	fi
-}
diff --git a/dev-db/clickhouse/clickhouse-19.9.5.36-r1.ebuild b/dev-db/clickhouse/clickhouse-19.9.5.36-r1.ebuild
deleted file mode 100644
index 80e66a29108b..000000000000
--- a/dev-db/clickhouse/clickhouse-19.9.5.36-r1.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils systemd toolchain-funcs user
-
-DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
-HOMEPAGE="https://clickhouse.yandex"
-LICENSE="Apache-2.0"
-
-MY_PN="ClickHouse"
-TYPE="stable"
-
-CCTZ_COMMIT="4f9776a"
-SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.zip -> ${P}.zip
-	https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
-"
-
-SLOT="0/${TYPE}"
-IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools"
-RESTRICT="!test? ( test )"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="
-	server? ( cpu_flags_x86_sse4_2 )
-	static? ( client server tools )
-"
-
-RDEPEND="
-	dev-libs/re2:0=
-	!static? (
-		>=app-arch/lz4-1.8.0:=
-		>=app-arch/zstd-1.3.4:=
-		client? (
-			sys-libs/ncurses:0=
-			sys-libs/readline:0=
-		)
-
-		dev-libs/double-conversion
-		dev-libs/capnproto
-		dev-libs/libltdl:0
-		sys-libs/libunwind:0
-		sys-libs/zlib
-		dev-libs/poco[odbc]
-		dev-libs/icu:=
-		dev-libs/glib
-		>=dev-libs/boost-1.65.0:=
-		dev-libs/openssl:0=
-		kafka? ( dev-libs/librdkafka:= )
-		mysql? ( dev-db/mysql-connector-c:= )
-	)
-
-	>=dev-libs/poco-1.9.0
-	dev-libs/libpcre
-	dev-libs/jemalloc
-"
-
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/mkdocs-1.0.1 )
-	static? (
-		>=app-arch/lz4-1.8.0[static-libs]
-		>=app-arch/zstd-1.3.4[static-libs]
-		client? (
-			sys-libs/ncurses:0=[static-libs]
-			sys-libs/readline:0=[static-libs]
-		)
-		dev-libs/capnproto[static-libs]
-		dev-libs/libltdl[static-libs]
-		sys-libs/libunwind:0[static-libs]
-		sys-libs/zlib[static-libs]
-		|| (
-			dev-db/unixODBC[static-libs]
-			dev-libs/poco[odbc]
-		)
-		dev-libs/icu[static-libs]
-		dev-libs/glib[static-libs]
-		>=dev-libs/boost-1.65.0[static-libs]
-		dev-libs/openssl[static-libs]
-		dev-db/mysql-connector-c[static-libs]
-		kafka? ( dev-libs/librdkafka[static-libs] )
-	)
-
-	sys-libs/libtermcap-compat
-	dev-util/patchelf
-	>=sys-devel/lld-6.0.0
-	>=sys-devel/gcc-7.0
-	>=sys-devel/clang-6.0
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
-
-_clang_fullversion() {
-	local ver="$1"; shift
-	set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
-	eval echo "$ver"
-}
-
-clang-fullversion() {
-	_clang_fullversion '$1.$2.$3' "$@"
-}
-
-clang-version() {
-	_clang_fullversion '$1.$2' "$@"
-}
-
-clang-major-version() {
-	_clang_fullversion '$1' "$@"
-}
-
-clang-minor-version() {
-	_clang_fullversion '$2' "$@"
-}
-
-clang-micro-version() {
-	_clang_fullversion '$3' "$@"
-}
-
-pkg_pretend() {
-	if [[ $(tc-getCC) == clang ]]; then
-		if [[ $(clang-major-version) -lt 6 ]]; then
-			eerror "Compilation with clang older than 6.0 is not supported"
-			die "Too old clang found"
-		fi
-		:
-	elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
-		eerror "Compilation with gcc older than 7.2 is not supported"
-		die "Too old gcc found"
-	fi
-}
-
-src_unpack() {
-	default_src_unpack
-	[[ ${PV} == 9999 ]] && return 0
-	cd "${S}/contrib" || die "failed to cd to contrib"
-	mkdir -p cctz zstd || die "failed to create directories"
-	tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
-}
-
-src_prepare() {
-	eapply_user
-	cmake-utils_src_prepare
-}
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_POCO_MONGODB="$(usex mongodb)"
-		-DENABLE_RDKAFKA="$(usex kafka)"
-		-DENABLE_TESTS="$(usex test)"
-		-DUSE_STATIC_LIBRARIES="$(usex static)"
-		-DMAKE_STATIC_LIBRARIES="$(usex static)"
-		-DUSE_MYSQL="$(usex mysql)"
-		-DENABLE_CLICKHOUSE_SERVER="$(usex server)"
-		-DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
-		-DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
-		-DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
-		-DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
-		-DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
-		# As of now, clickhouse fails to build if odbc is disabled
-		-DENABLE_ODBC=True
-		-DENABLE_CLICKHOUSE_ODBC_BRIDGE=True
-		-DENABLE_CLICKHOUSE_ALL=OFF
-		-DUSE_INTERNAL_SSL_LIBRARY=False
-		-DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
-		-DUNBUNDLED=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if ! use test; then
-		rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
-	fi
-
-	if use doc; then
-		pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
-		./build.py || die "Failed to build docs"
-		popd || die "Failed to exit docs build directory"
-
-		dodoc -r "${S}/docs/build"
-	fi
-
-	if use server; then
-		newinitd "${FILESDIR}"/clickhouse-server.initd clickhouse-server
-		systemd_dounit "${FILESDIR}"/clickhouse-server.service
-	fi
-
-	keepdir /var/log/clickhouse-server
-	chown clickhouse:clickhouse "${D}"/var/log/clickhouse-server
-}
-
-pkg_preinst() {
-	if use server; then
-		enewgroup clickhouse
-		enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
-	fi
-}
diff --git a/dev-db/clickhouse/files/clickhouse-server.confd b/dev-db/clickhouse/files/clickhouse-server.confd
deleted file mode 100644
index 0e7344672b4b..000000000000
--- a/dev-db/clickhouse/files/clickhouse-server.confd
+++ /dev/null
@@ -1,4 +0,0 @@
-user="clickhouse"
-group="clickhouse"
-logdir="/var/log/clickhouse-server"
-
diff --git a/dev-db/clickhouse/files/clickhouse-server.initd b/dev-db/clickhouse/files/clickhouse-server.initd
deleted file mode 100644
index 5e787c0c1fa6..000000000000
--- a/dev-db/clickhouse/files/clickhouse-server.initd
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-pidfile="/run/clickhouse-server.pid"
-command_background=1
-command="/usr/bin/clickhouse-server"
-start_stop_daemon_args="--user clickhouse --group clickhouse \
-	--chdir /etc/clickhouse-server \
-	-1 /var/log/clickhouse-server/stdout.log \
-	-2 /var/log/clickhouse-server/stderr.log"
-
-depend() {
-	need net
-	after mongodb
-}
diff --git a/dev-db/clickhouse/files/clickhouse-server.initd-r1 b/dev-db/clickhouse/files/clickhouse-server.initd-r1
deleted file mode 100644
index efc11f5e54c0..000000000000
--- a/dev-db/clickhouse/files/clickhouse-server.initd-r1
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-user="clickhouse"
-group="clickhouse"
-logdir="/var/log/clickhouse-server"
-pidfile="/run/clickhouse-server.pid"
-command_background=1
-command="/usr/bin/clickhouse-server"
-start_stop_daemon_args="--user ${user} --group ${group} \
-	--chdir /etc/clickhouse-server \
-	-1 ${logdir}/stdout.log \
-	-2 ${logdir}/stderr.log"
-
-depend() {
-	need net
-	after mongodb
-}
-
-start_pre() {
-    checkpath -m 0755 -o "${user}:${group}" -d "${logdir}"
-}
diff --git a/dev-db/clickhouse/files/clickhouse-server.service b/dev-db/clickhouse/files/clickhouse-server.service
deleted file mode 100644
index 64d2cbacf6ec..000000000000
--- a/dev-db/clickhouse/files/clickhouse-server.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=ClickHouse Server (analytic DBMS for big data)
-
-[Service]
-Type=simple
-User=clickhouse
-Group=clickhouse
-Restart=always
-RestartSec=30
-ExecStart=/usr/bin/clickhouse-server --config=/etc/clickhouse-server/config.xml
-LimitCORE=infinity
-LimitNOFILE=500000
-
-[Install]
-WantedBy=multi-user.target
diff --git a/dev-db/clickhouse/metadata.xml b/dev-db/clickhouse/metadata.xml
deleted file mode 100644
index bb224e97f7c5..000000000000
--- a/dev-db/clickhouse/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">yandex/Clickhouse</remote-id>
-	</upstream>
-	<use>
-		<flag name="client">Build CLI client.</flag>
-		<flag name="server">Build server.</flag>
-		<flag name="kafka">Enables support for kafka consumer.</flag>
-		<flag name="mongodb">Enabled support for MongoDB-based dictionaries</flag>
-		<flag name="tools">Build various tools, like benchmark, copier, etc.</flag>
-		<flag name="zookeeper">Enable support for clustering (based on Zookeeper).</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest
index 62631932df9b..81389003a26b 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -3,8 +3,10 @@ AUX mariadb-connector-c-3.1.3-fix-pkconfig-file.patch 616 BLAKE2B 650c5a794da6d3
 DIST mariadb-connector-c-3.1.6-src.tar.gz 742858 BLAKE2B 416cc33cf7a01fee9649f6c35e0a7e16b889a1fad10f2b204e259a2672535d1ad7f9ade9723989a4ce00cf8a2c4660f40357516bfdc4547118a54637911f9b60 SHA512 44309e706cb49451a0d1a91f907ab7cfa1fb1bf95d26cf3bbce1caa367c2fa8ad377a691361e297dd2fcbc444c10115f18aec66dd6d69c458f282ace3025a3e8
 DIST mariadb-connector-c-3.1.7-src.tar.gz 742923 BLAKE2B 641c3c49cf83af918e5dab06f9b8afecd59bd7b6486cc55b33749cd0ef317ab6cff86da9b85829b0309305a190e16f4ecc369210c54070e265387a5818c48ca1 SHA512 0b7f6497b6b88b2bbcb870b7c3a8f3fe0bf547c6b5d9b95cc99423aa8ea02ac510c5fb71079e7cd79a49741c7f26f3e68c39e245b18fab46754e8640f79ff670
 DIST mariadb-connector-c-3.1.8-src.tar.gz 744745 BLAKE2B 24f4f6a8bb3a1fcbdf2c5a7434303e6a2295cb4aed0c59ee4cb776399516a9895eb51d6ef18dde429d7246750cad797f4f89c3838dfd54e835683021d712041b SHA512 005fdacd7e7b353b97b5c1305f973a90744e495d7bf5d407fc6c75d49323e13a743e6c3877c00ada2b3fc49a0f33e5c2dcd70b1f8fe8eb8f579af1bce3b3e6b9
+DIST mariadb-connector-c-3.1.9-src.tar.gz 745374 BLAKE2B 47c1bf1ffe888f6c2aefdb4661ad8bfe41c527d6ddc2b2aaf8da8003eebce90da420a52143265510ac47f07286d6dbfa27c4d82ce193c23aa928d0b22f83b87a SHA512 cf7cd3a7592a15e2a4800c6a899e6b515ef899f4525c9f5f7d09faafbd72ac5b70a85e1c60119f58d1b5caa0f0f3657a544555bb47cdc22eabe74308c0c4bf42
 EBUILD mariadb-connector-c-3.1.6.ebuild 2336 BLAKE2B f17769bbdc21d9a16c77f50699931b6b154f19a816a302700ef35c6668aa9145dcb68092a8fbdfc8c726655c391e905fa6836d3711171fac83a5ff7e6e21ac7c SHA512 51c996013e51d496d2225d3299977120ba297e58c48769c9ae644bb889ad4b9647c85584603949a0b05555420ea960c92d6b9f9136dd1c223c2af87733ca22b9
 EBUILD mariadb-connector-c-3.1.7.ebuild 2351 BLAKE2B 1c1a5117a6615079960b336fe290a2623a31fe16e14c2407370c9f3c945d23b72eacdd193aa79035d7e3220d02a00c9a035727ec65df78e498ed40c999b7f465 SHA512 a66f34d61aa78d017e078abc060ab589aec28afcc318785439c430b73ebb8b8c47140c3c1fb3fa39f4ee0794d76c751a8ccab31b12360ad24d51a51dd83f1e0f
 EBUILD mariadb-connector-c-3.1.8.ebuild 2351 BLAKE2B 1c1a5117a6615079960b336fe290a2623a31fe16e14c2407370c9f3c945d23b72eacdd193aa79035d7e3220d02a00c9a035727ec65df78e498ed40c999b7f465 SHA512 a66f34d61aa78d017e078abc060ab589aec28afcc318785439c430b73ebb8b8c47140c3c1fb3fa39f4ee0794d76c751a8ccab31b12360ad24d51a51dd83f1e0f
+EBUILD mariadb-connector-c-3.1.9.ebuild 2344 BLAKE2B 77752558e7dfd75b65013b5f1830a0a021ddc6b848b5716df95561ea0012e02257237c17869eba99c999879307ba69a9e700a55edadde4e41a4008d98c2e9f6c SHA512 6203dda2e0af3ffe974701d61c68138fd1a0b28c76426ddf39a04ea7783fdbd3ad5cd7e974edc59f38d12e380143f1bbf9caa3b5808cd33fa2df73d9aa85450b
 EBUILD mariadb-connector-c-9999.ebuild 2351 BLAKE2B 1c1a5117a6615079960b336fe290a2623a31fe16e14c2407370c9f3c945d23b72eacdd193aa79035d7e3220d02a00c9a035727ec65df78e498ed40c999b7f465 SHA512 a66f34d61aa78d017e078abc060ab589aec28afcc318785439c430b73ebb8b8c47140c3c1fb3fa39f4ee0794d76c751a8ccab31b12360ad24d51a51dd83f1e0f
 MISC metadata.xml 243 BLAKE2B f247f748a23e4cda2f518ad7e4e53b9027ff08ec62289010e6dfc8cd2ad49412430c4095e80f2156c8e6f1226bcda0163b4faae83759550f79e9998928398713 SHA512 7c227a1fadd8d61aae9baabeb5d964c93fe0c4d82fb838c83fe0360cf38b24bebf51037726f13188ecd8f52c335368a693b81e74d79ba949576a6dbcb54887a9
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
new file mode 100644
index 000000000000..f06e270fdc2c
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VCS_INHERIT=""
+if [[ "${PV}" == 9999 ]] ; then
+	VCS_INHERIT="git-r3"
+	EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git"
+else
+	MY_PN=${PN#mariadb-}
+	MY_PV=${PV/_b/-b}
+	SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
+	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 s390 sparc x86"
+fi
+
+inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
+
+MULTILIB_WRAPPED_HEADERS+=(
+	/usr/include/mariadb/mariadb_version.h
+)
+
+DESCRIPTION="C client library for MariaDB/MySQL"
+HOMEPAGE="https://mariadb.org/"
+LICENSE="LGPL-2.1"
+
+SLOT="0/3"
+IUSE="+curl gnutls kerberos libressl +ssl static-libs test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	virtual/libiconv:=[${MULTILIB_USEDEP}]
+	curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}]
+			app-crypt/heimdal[${MULTILIB_USEDEP}] ) )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
+		!gnutls? (
+			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		)
+	)
+	"
+RDEPEND="${DEPEND}"
+PATCHES=(
+	"${FILESDIR}"/gentoo-layout-3.0.patch
+	"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
+)
+
+src_configure() {
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DWITH_EXTERNAL_ZLIB=ON
+		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
+		-DWITH_CURL=$(usex curl ON OFF)
+		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF)
+		-DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DINSTALL_LIBDIR="$(get_libdir)"
+		-DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
+		-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
+		-DINSTALL_BINDIR=bin
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${D}" -name "*.a" -delete || die
+	fi
+}
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 805d67ac398b..de0fdc7e5174 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -15,12 +15,16 @@ DIST mongodb-src-r3.6.13.tar.gz 40853787 BLAKE2B de9621de4f570d569df5cfe026ea5da
 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.16.tar.gz 50091501 BLAKE2B a383f9fef8e5b2ceda9646dfc4f4f46bc3bee66be45e94a846b1a7ce859826273812d4ce11aa96d1766071bf5fb422771bf2176350145deae99e64e59c164e38 SHA512 90458dea29a4c9a3078e1f13ffd2163911bf5a5f42884553ad9b3c2a2fafea2f73e506640c78f55f27bc16551582ad22244437356b89786fef383ce4b24bb617
+DIST mongodb-src-r4.0.19.tar.gz 50126414 BLAKE2B 2691e2a9c8833ff9a086b28fd137bc8e8f10d58570117657c7cc01edbf61568ae62f58440d72e8711de98b9fc6868c1095b4ee88eb7b0eb63ea45ce19e842edd SHA512 57032a009ea7e79de4cac496a2d1266b83b99cc45eb9f1169be2fcdca1ed2003a659ceedf9eafbd4aa7fc5b3b0513066a5d712af7666cee5a897b2a2d7dd30cb
 DIST mongodb-src-r4.2.3.tar.gz 61565615 BLAKE2B 695310a497e57f1c735f175f5b321c93cda376ec734bb08d4cabbd562a865b327f529560220be9c22f571cc70af333a77f0116f04c7f7e3a40f275ab53ab1bf9 SHA512 60e9091cfab4a189a937dfa7ce232eb6ead2ca192c916579f4fb5da2040aa340ae9de0ea8c7a4ccb0edcfdbdf6e666144657f171c3f23c0a62bccf27cd351c69
 DIST mongodb-src-r4.2.6.tar.gz 61671088 BLAKE2B 7f2b6240b05639d2bbe37ea148cbb225b30813879f71a5fc3c135ef7debd58edf75abe925d00f9ff96dc6a75a525b4504e25254b0046326069c05bb1dfd60827 SHA512 117c910807a8363aab6b899b436a4b06564b6e53abfa7f0fe6e01c1e242401ab5a3634d9edc5e0a5e2d548a480c90b70ac492eb199b3f2476d9045a78e376af8
+DIST mongodb-src-r4.2.8.tar.gz 61730247 BLAKE2B f1d98b8ac8f62c0c7aff100ef663bb20345de0e77e0ff420817db0843fe735b58af8075578a7f8d83cc9dc4e597c95ae09f89ce7a21cf8146ff15bcb11eba924 SHA512 163fce480762bd377d6c78b661bfe51fc883223a5309a68f9556e1bafb99e26e476d81dbe6de825d90469e835442be097be630ca9678e54b9d09091e0b5d67c4
 EBUILD mongodb-3.6.13.ebuild 4253 BLAKE2B 9c549c4a4f86d0642845b704af18c2f6e813ac71c188b1cc770b188e634dc388368607f92bc164afb24f0e4de09ee77d52a126450a89fa0af3f0254f6d8258d7 SHA512 aeacc08eb48dbd86141d694b1a71579b79da29cfc9f1f2e7727c25ccbb47bdc3f9b4d0091fd269ef04aff7bfce27059ac4059e7f7c14f8258ccc194996999c3b
 EBUILD mongodb-3.6.17.ebuild 4239 BLAKE2B 2e88b7f99c60bdc724aba683ac6397634e005ebd0ede16d40620f84de196d77b616defcb2faa1fd84434a922826ebcd53c2902f4cb9fdf052a4b4a4d767b638d SHA512 10425c5c499a7182a22bf80479ddd61bcea5f51c4b99fd64aaf4c8fe29fec9db7dfeca211ead81431faf98f800d5dd3f381be32737acde01d4608d14a9d4f77c
 EBUILD mongodb-4.0.12.ebuild 4314 BLAKE2B 6e1d33a0d5e3948e2c6d7258379050b8b090a2debd04623f7f51a1e35a54fdf6fe3407eb6ff7afea121f8274f329564f192e26104d2173a08b5ad31ca52f669d SHA512 4509e201ec92554b3b5cc7c2f1d2daba1195357e8e064ad2f639667136194f2c683a420b95a69d086f8abc00da32daab64e33b921a5278eb4ea095022d2048e9
 EBUILD mongodb-4.0.16-r1.ebuild 4593 BLAKE2B 25a75906f5b037572499b8f5a51bc5df9be6e4e413055c85c340a653809587b9467bb51a6b6bd69d5e9609a062727540b7ca90a71e738958b6d50ae21fb46683 SHA512 661332d0421a768ac8b22d9e5f8bc44c5e7ef986dc2180d3c2163e72190fab3557c378d162a63029c897fa1dc1e1a2e5ed2dde5b22d33e7a84de61fa02a52a08
+EBUILD mongodb-4.0.19.ebuild 4593 BLAKE2B 25a75906f5b037572499b8f5a51bc5df9be6e4e413055c85c340a653809587b9467bb51a6b6bd69d5e9609a062727540b7ca90a71e738958b6d50ae21fb46683 SHA512 661332d0421a768ac8b22d9e5f8bc44c5e7ef986dc2180d3c2163e72190fab3557c378d162a63029c897fa1dc1e1a2e5ed2dde5b22d33e7a84de61fa02a52a08
 EBUILD mongodb-4.2.3-r1.ebuild 4716 BLAKE2B a58003ae719b3726ef7ae083c03f753bbec1ad98f9a211c2274f81fa01a7dd96f46d505bf555b19eaa5ea12cb733d5437fd0bacf145fe35379048ac4e69d87a2 SHA512 a2b478e4a8d9f20aed3a653325ed6c47dc141421cec1e2782996443eefc5b7059931f21fb21781d1ccbe62d5809d127dc5658b39eeb98742317fc2ec0a42d3e5
 EBUILD mongodb-4.2.6.ebuild 4716 BLAKE2B a58003ae719b3726ef7ae083c03f753bbec1ad98f9a211c2274f81fa01a7dd96f46d505bf555b19eaa5ea12cb733d5437fd0bacf145fe35379048ac4e69d87a2 SHA512 a2b478e4a8d9f20aed3a653325ed6c47dc141421cec1e2782996443eefc5b7059931f21fb21781d1ccbe62d5809d127dc5658b39eeb98742317fc2ec0a42d3e5
+EBUILD mongodb-4.2.8.ebuild 4716 BLAKE2B a58003ae719b3726ef7ae083c03f753bbec1ad98f9a211c2274f81fa01a7dd96f46d505bf555b19eaa5ea12cb733d5437fd0bacf145fe35379048ac4e69d87a2 SHA512 a2b478e4a8d9f20aed3a653325ed6c47dc141421cec1e2782996443eefc5b7059931f21fb21781d1ccbe62d5809d127dc5658b39eeb98742317fc2ec0a42d3e5
 MISC metadata.xml 901 BLAKE2B f7fde58679ba05518634b82bf5fcc371897165364fe5b023a2ec161790c869de82b4a3dd769d5e1bb450f99679869b60bb1e35beb8d41c54d3448dfca580a7ae SHA512 48f133d396aa31b992bac5f947e5a262b2d07a1016c6d49fa3c86dabb85981edfa332abb867413826762d88051ff3981cc77c2ec92e992d7a231c3b542336e36
diff --git a/dev-db/mongodb/mongodb-4.0.19.ebuild b/dev-db/mongodb/mongodb-4.0.19.ebuild
new file mode 100644
index 000000000000..651219492475
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.0.19.ebuild
@@ -0,0 +1,173 @@
+# 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 '
+		test? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+		>=dev-util/scons-2.5.0[${PYTHON_USEDEP}]
+		dev-python/cheetah[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/typing[${PYTHON_USEDEP}]
+	')
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	debug? ( dev-util/valgrind )"
+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
+}
+
+python_check_deps() {
+	if use test; then
+		has_version "dev-python/pymongo[${PYTHON_USEDEP}]" ||
+			return 1
+	fi
+
+	has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/cheetah[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/typing[${PYTHON_USEDEP}]"
+}
+
+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.8.ebuild b/dev-db/mongodb/mongodb-4.2.8.ebuild
new file mode 100644
index 000000000000..b88bcf9c846f
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.2.8.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=( 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 ~arm64"
+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 '
+		test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] )
+		>=dev-util/scons-2.5.0[${PYTHON_USEDEP}]
+		dev-python/cheetah3[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	')
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	debug? ( dev-util/valgrind )"
+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}"
+
+python_check_deps() {
+	if use test; then
+		has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1
+		has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1
+	fi
+
+	has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+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/percona-xtrabackup/Manifest b/dev-db/percona-xtrabackup/Manifest
index 39d3848ef73d..d0095dcf4f93 100644
--- a/dev-db/percona-xtrabackup/Manifest
+++ b/dev-db/percona-xtrabackup/Manifest
@@ -1,9 +1,13 @@
 AUX percona-xtrabackup-2.4.11-fix-gcc6-isystem.patch 4034 BLAKE2B 0ce65196d4679481d3197e95d9efc3783c1e4f37dcd602588fc3e8da5957f63cf68b9222a7ab12fe2e8fd19d69e8a24e9f86cc7dd2ba776d473a95b9279a1f24 SHA512 4dd9352b8d8ae46782925daae27cd5ad1765c5f4ab26f1f5f07fbac68f0cb83e4979009dddacd8a55ba818c93014b46dee997b43f6951820337e0cb79733f60e
+AUX percona-xtrabackup-2.4.20-fix-gcc10.patch 931 BLAKE2B 77c433ab006f2fc5c36c5cee17fd37d98136779884ad0075b4547671690307a253dec9ac7aa80998bb1ee02b5568d053d7b41b5df348b5338c83497c744d421f SHA512 2a6f4f745a57df0f8df4f684e8ab194de0b00c1578e91823c7cafce1338bbfea873d1fb7d34f94233e40fb7a0b9d7edd869a482e7cb46f3706caf3d297983397
 AUX percona-xtrabackup-2.4.6-remove-boost-version-check.patch 485 BLAKE2B c9330c5b0a163a0d95682a81cee9e3c99cebdb2a6ed124cb5f424ade92728b11b29685e2c1eee0fbf9df613f5a1b08cc4021daec8b60a6c66ab51b08a397b33d SHA512 31277d6bef14a6b642ce425ce9f2c92fe49f905c42c720a583cb45406c1ee18ccbf2bef224b9b89bb02de18aecc1ec48576f5ca0c9bfef0cc683d78218506906
+AUX percona-xtrabackup-8.0.13-remove-rpm.patch 1139 BLAKE2B c2ada7337f6596ac5c37b1ebe7f2324fb4ee43e14ec41cfeb8d861bc2df0614ca1957c9d44cf81530b1f4bac9d6143edc906721aeebfe4551fe37dec9a41ed7b SHA512 99d4e92c5f979b4d3e9edb6ebae73e88f81d5696826d4f477f8cd885d8c54d955c879eed45779aca092facfef7aa29f818cf467c3302a7e8db6ca89fa5e38e28
 DIST boost_1_59_0.tar.gz 83709983 BLAKE2B 8c6676fa05fa401a6ecb3b890d95aceb4421ec48dd0eab38ce8d170c618e177c82dc67a165938f6be1a01daab24ce41888f5442dbc19ad3dd41368a01a6f89e4 SHA512 05fdbe5637543defdbc630b921515425885593d16db14534ed7b9aa60925ade8fb598d50cb894aed6dae688e789047216daa1bf03fa1aeb6b531060d9dae52ae
-DIST boost_1_69_0.tar.gz 111710205 BLAKE2B 4a6d151ba10553641045a08bf4658c165862e05903b48bc700437104be468070785c67eed6dfcf1ed0923d5cf583a684b448e2a985e201bda298a3b839e62407 SHA512 89da45aca0774f68f897434882e8ec58f0673807c3a862315b90e893be90184722c098ad5822b89602b98ac3cc5a9f89c807079fd0f7e9c3f97be0d415414014
+DIST boost_1_70_0.tar.gz 116000903 BLAKE2B aefeddf5671295ae46fcfed033cef37cca1c70f88d7d3305636e0add98c277fc8170c7e3e0de58ff83a64389b5b430b81077b6852da5941aa4867845a7b08554 SHA512 3d8800d0aa864fb5484a5339ab75dee9bceca063122108e92d971f1d1295a9f09399b2dd88b117da7f0c4558b4f9fb1494eda1e3035498557bbe90e8f058668f
 DIST percona-xtrabackup-2.4.15.tar.gz 57357749 BLAKE2B fcc64736230636a3a5584a300229e0507f00bcd64a3d0b8e00f834b15ec757347a55a85521dd0aea939761c3a26b1ef99466ff7e633133b8088cd290bd835444 SHA512 789b6870d3ad06861126f67190717ffb31224628d1b9631ec5f39d0a41b3c66aaf2127e3ec4b38d3e8f7858a1438a74f0e89b07b9f4248b637b2ed39143ab599
-DIST percona-xtrabackup-8.0.7.tar.gz 149143566 BLAKE2B 0a6c832f44725230023c01b50ed3d188358e7d2ba073422652a258cdf416b9d3c2a18bda4730bc5d9eb77aab17612bf93204fc2838c521e90b8571706a31d3c6 SHA512 9947b4a943f52e4d07fbde4d3b590146da19b94ce40305fc0230fc67c39e93fa4f3a30a55029cdcdb582cce7efe93831164a96f985d19d1f7b64a75aea552f47
+DIST percona-xtrabackup-2.4.20.tar.gz 59782001 BLAKE2B 25deaa3044d89d6f884734bbaee20004d792f4b0bf86bd0d456177cd2b149c29af13900b32e29f92c04cf810b34584ec2d9a74b443be27b8c7dca54b330ced99 SHA512 bac5d276bb78209eacc34ea9950dc128a636c549795b6b071597ac3c8a43fefe9db085a42827b8176647affc2fcfc6caa51462dbc0ae7a1a716ba6fdc9092478
+DIST percona-xtrabackup-8.0.13.tar.gz 272887474 BLAKE2B d0ac4c602c7c3197ca0a7c361f9658bd2da00bdac5c6dc0a4d56b92e04e4e6c86f22b70e7cf2b375f121983ea7f134edae93116c91945b2c3314a51565033ae5 SHA512 b1fdb0dea1c8b6e39b5451153f01c8ce0dcf411fd88fe8f9f686e562e0950ff9270a39574230ada928b734cc8bb4517da0f01310e75d5c9beba0e35cfeaa11ff
 EBUILD percona-xtrabackup-2.4.15.ebuild 1778 BLAKE2B 74e30f27b5dc192c2fe8050cb881b1c5450a0f0d39c630580bf93b8bb95312602b30fa827a06df1794410b2d655f8adc2be9fef596ea26bdf00d071800f99f72 SHA512 fa47544c2b83c281d04a3b9f2e435a36a47d94bce872b3b0fce45071cdffc196c0bd03ca41837a2d2132a09880c1a443216f9b7d98ffe856a3323f8de9067bed
-EBUILD percona-xtrabackup-8.0.7.ebuild 1429 BLAKE2B bf48714752ff3c18035b8ff456820d64048a1e99d0c07b3c18efbe60edb122465a3e18124085657cadca2863e36d92c367a9d8316e8c1219d6a589863a796fa2 SHA512 6e154f9e6168da154c4869ddd56c951a521456fd7f745ac2c97cd24b20335952796d42022525d31746746f717c9488fa1bcfb25161bdab575a45438ca200f416
+EBUILD percona-xtrabackup-2.4.20.ebuild 1535 BLAKE2B 41170fcaab472910dde609fb7b12aa6918a708018a7fde9cc182276b8383fd041c322141aea8dcf599752a88e2ed5872f4087ac11cc27387495f7574af1be594 SHA512 592dacff26ec640eec56853e8a9bbe63ba8ecae859463e55aac9478c393d05409e3b0bd9a7aefbd4795f37ef213e183c9e24f9929ea05f470c33a6034e5a1fd3
+EBUILD percona-xtrabackup-8.0.13.ebuild 1572 BLAKE2B 04e9412cf2c65c49aeb71762c6e9ffc4438593a2cdcf2b9d5015d37960d9d040613da48f5c3d9e041077595228a062acab7b6a0113fec20500604ddaf5fe6b44 SHA512 1e1c4b232a72bbe58e7e17c991ca2cce8b59b231066808b5cac69484a913322f9ceab280f824d4da73519697c99c568089a96fd595d7a97ea9d9cb4366a1926d
 MISC metadata.xml 564 BLAKE2B 428ee8f4bba052e58061a5eb643feee71e5f02728b17d63a228436d0988babdb60b1d8acc887e7f142fc715994d1c4fef26cfb4644b5afac65869cdc3f02e887 SHA512 5eead923c1daed6ed5663b9d9d9b6995e5f8fc248064d48da2e2c89cbe1957ac3aee07781df37979cbdb41c37351f25bb6530f2aa0531008437899f82459ba31
diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.20-fix-gcc10.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.20-fix-gcc10.patch
new file mode 100644
index 000000000000..8987082d1f9c
--- /dev/null
+++ b/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.20-fix-gcc10.patch
@@ -0,0 +1,26 @@
+diff --git a/sql/mysqld.cc b/sql/mysqld.cc
+index 3801448b..83098498 100644
+--- a/sql/mysqld.cc
++++ b/sql/mysqld.cc
+@@ -625,7 +625,7 @@ struct system_variables global_system_variables;
+ struct system_variables max_system_variables;
+ struct system_status_var global_status_var;
+ 
+-MY_TMPDIR mysql_tmpdir_list;
++extern MY_TMPDIR mysql_tmpdir_list;
+ MY_BITMAP temp_pool;
+ 
+ CHARSET_INFO *system_charset_info, *files_charset_info ;
+diff --git a/storage/innobase/xtrabackup/src/xbstream.c b/storage/innobase/xtrabackup/src/xbstream.c
+index 611f8c04..f0c57588 100644
+--- a/storage/innobase/xtrabackup/src/xbstream.c
++++ b/storage/innobase/xtrabackup/src/xbstream.c
+@@ -55,7 +55,7 @@ datasink_t datasink_xbstream;
+ datasink_t datasink_compress;
+ datasink_t datasink_tmpfile;
+ datasink_t datasink_encrypt;
+-datasink_t datasink_buffer;
++extern datasink_t datasink_buffer;
+ 
+ static run_mode_t	opt_mode;
+ static char *		opt_directory = NULL;
diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.13-remove-rpm.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.13-remove-rpm.patch
new file mode 100644
index 000000000000..759598637a82
--- /dev/null
+++ b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.13-remove-rpm.patch
@@ -0,0 +1,32 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1b9865e2..e3c82cdd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -181,27 +181,6 @@ ENDIF()
+ OPTION(FORCE_UNSUPPORTED_COMPILER "Disable compiler version checks" OFF)
+ MARK_AS_ADVANCED(WITHOUT_SERVER FORCE_UNSUPPORTED_COMPILER)
+ 
+-# Use 'uname -r' and 'rpm -qf /' to figure out host system.
+-# For Docker images we cannot trust uname, so use rpm instead.
+-IF(UNIX)
+-  FIND_PROGRAM(MY_UNAME uname /bin /usr/bin /usr/local/bin /sbin)
+-  IF(MY_UNAME)
+-    EXECUTE_PROCESS(COMMAND ${MY_UNAME} -s
+-      OUTPUT_VARIABLE MY_HOST_SYSTEM_NAME
+-      OUTPUT_STRIP_TRAILING_WHITESPACE
+-      RESULT_VARIABLE MY_UNAME_RESULT
+-      )
+-  ENDIF()
+-  FIND_PROGRAM(MY_RPM rpm /bin /usr/bin)
+-  IF(MY_RPM)
+-    EXECUTE_PROCESS(COMMAND ${MY_RPM} -qf /
+-      OUTPUT_VARIABLE MY_HOST_FILESYSTEM_NAME
+-      OUTPUT_STRIP_TRAILING_WHITESPACE
+-      RESULT_VARIABLE MY_RPM_RESULT
+-      )
+-  ENDIF()
+-ENDIF()
+-
+ IF(CMAKE_HOST_UNIX AND NOT FORCE_UNSUPPORTED_COMPILER
+     AND NOT CMAKE_C_COMPILER AND NOT CMAKE_CXX_COMPILER)
+   # Cannot INCLUDE(CMakeDetermineSystem) prior to PROJECT initialization below.
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.20.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.20.ebuild
new file mode 100644
index 000000000000..f15f04741bfc
--- /dev/null
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.20.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Hot backup utility for MySQL based servers"
+HOMEPAGE="https://www.percona.com/software/mysql-database/percona-xtrabackup"
+SRC_URI="https://www.percona.com/downloads/Percona-XtraBackup-2.4/Percona-XtraBackup-${PV}/source/tarball/${P}.tar.gz
+	mirror://sourceforge/boost/boost_1_59_0.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	app-arch/lz4:0=
+	app-editors/vim-core
+	dev-libs/libaio
+	dev-libs/libedit
+	dev-libs/libev
+	dev-libs/libevent:0=
+	dev-libs/libgcrypt:0=
+	dev-libs/libgpg-error
+	dev-python/sphinx
+	net-misc/curl
+	sys-libs/zlib:="
+
+RDEPEND="
+	${DEPEND}
+	!dev-db/percona-xtrabackup-bin
+	dev-perl/DBD-mysql"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.6-remove-boost-version-check.patch
+	"${FILESDIR}"/${PN}-2.4.20-fix-gcc10.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CONFIG=xtrabackup_release
+		-DBUILD_SHARED_LIBS=OFF
+		-DWITH_BOOST="${WORKDIR}/boost_1_59_0"
+		-DWITH_EDITLINE=system
+		-DWITH_LIBEVENT=system
+		-DWITH_LZ4=system
+		-DWITH_SSL=bundled # uses yassl, which isn't packaged
+		-DWITH_ZLIB=system
+		-DWITH_PIC=ON
+	)
+
+	local CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
+}
+
+src_install() {
+	local p="${BUILD_DIR}/storage/innobase/xtrabackup"
+
+	dobin "${p}"/src/{xbcloud/xbcloud,xbcrypt,xbstream,xtrabackup}
+	dosym xtrabackup /usr/bin/innobackupex
+
+	einstalldocs
+	doman "${p}"/doc/source/build/man/*
+}
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.13.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.13.ebuild
new file mode 100644
index 000000000000..edbb5af4c04a
--- /dev/null
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.13.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake flag-o-matic
+
+BOOST_VER="1_70_0"
+MY_PV="$(ver_rs 2 '-')"
+
+DESCRIPTION="Hot backup utility for MySQL based servers"
+HOMEPAGE="https://www.percona.com/software/mysql-database/percona-xtrabackup"
+SRC_URI="https://www.percona.com/downloads/Percona-XtraBackup-LATEST/Percona-XtraBackup-${MY_PV}/source/tarball/${P}.tar.gz
+	mirror://sourceforge/boost/boost_${BOOST_VER}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	app-arch/lz4:0=
+	app-editors/vim-core
+	dev-libs/icu:=
+	dev-libs/libaio
+	dev-libs/libedit
+	dev-libs/libev
+	dev-libs/libevent:0=
+	dev-libs/libgcrypt:0=
+	dev-libs/libgpg-error
+	dev-libs/openssl:0=
+	dev-libs/protobuf:=
+	dev-libs/rapidjson
+	dev-libs/re2:=
+	dev-python/sphinx
+	net-misc/curl
+	sys-libs/zlib:="
+
+RDEPEND="
+	${DEPEND}
+	!dev-db/percona-xtrabackup-bin
+	dev-perl/DBD-mysql"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-8.0.13-remove-rpm.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CONFIG=xtrabackup_release
+		-DBUILD_SHARED_LIBS=OFF
+		-DWITH_BOOST="${WORKDIR}/boost_${BOOST_VER}"
+		-DWITH_SYSTEM_LIBS=ON
+	)
+	local CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
+}
+
+src_install() {
+	local p="${BUILD_DIR}/storage/innobase/xtrabackup"
+
+	dobin "${p}"/xbcloud_osenv
+	dobin "${BUILD_DIR}"/runtime_output_directory/{xbcloud,xbcrypt,xbstream,xtrabackup}
+
+	dolib.so "${BUILD_DIR}"/plugin_output_directory/{keyring_file.so,keyring_vault.so}
+
+	doman "${p}"/doc/source/build/man/*
+}
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.7.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.7.ebuild
deleted file mode 100644
index 3776aa32ffd3..000000000000
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.7.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"
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake flag-o-matic
-
-BOOST_VER="1_69_0"
-MY_PV="$(ver_rs 2 '-')"
-
-DESCRIPTION="Hot backup utility for MySQL based servers"
-HOMEPAGE="https://www.percona.com/software/mysql-database/percona-xtrabackup"
-SRC_URI="https://www.percona.com/downloads/Percona-XtraBackup-LATEST/Percona-XtraBackup-${MY_PV}/source/tarball/${P}.tar.gz
-	mirror://sourceforge/boost/boost_${BOOST_VER}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	app-arch/lz4:0=
-	app-editors/vim-core
-	dev-libs/icu:=
-	dev-libs/libaio
-	dev-libs/libedit
-	dev-libs/libev
-	dev-libs/libevent:0=
-	dev-libs/libgcrypt:0=
-	dev-libs/libgpg-error
-	dev-libs/openssl:0=
-	dev-libs/protobuf:=
-	dev-libs/rapidjson
-	dev-libs/re2:=
-	dev-python/sphinx
-	net-misc/curl
-	sys-libs/zlib:="
-
-RDEPEND="
-	${DEPEND}
-	!dev-db/percona-xtrabackup-bin
-	dev-perl/DBD-mysql"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_CONFIG=xtrabackup_release
-		-DBUILD_SHARED_LIBS=OFF
-		-DWITH_BOOST="${WORKDIR}/boost_${BOOST_VER}"
-		-DWITH_SYSTEM_LIBS=ON
-	)
-	local CMAKE_BUILD_TYPE="Release"
-	cmake_src_configure
-}
-
-src_install() {
-	local p="${BUILD_DIR}/storage/innobase/xtrabackup"
-
-	dobin "${p}"/xbcloud_osenv
-	dobin "${BUILD_DIR}"/runtime_output_directory/{xbcloud,xbcrypt,xbstream,xtrabackup}
-
-	doman "${p}"/doc/source/build/man/*
-}
diff --git a/dev-db/pgmodeler/Manifest b/dev-db/pgmodeler/Manifest
index 5b50f8bef9d4..85dace2dc2fb 100644
--- a/dev-db/pgmodeler/Manifest
+++ b/dev-db/pgmodeler/Manifest
@@ -1,5 +1,3 @@
-DIST pgmodeler-0.9.1.tar.gz 3569027 BLAKE2B 4d91d430554f739b585ed155aa2d87dc648ea5d2d6a1c22ddd9ae829afb63654fe052091de5dea51b0fee20ef2ccaf5b77587f036c4072bbc623bffba9a67b27 SHA512 bb6f093e00f0e41a9dd2a9b7e3723459af759e79835b73ab67b01c23ae6b29f1453b5cf61e987c6f1a2a3908e700d048f0a7dcbed3ac1636493d6b6e657917ba
 DIST pgmodeler-0.9.2.tar.gz 3930988 BLAKE2B 36d89c3bb400cd82199492208acf40fb872cb832a4911f818581672478d80e43bf56246a4485dd9b3a65a378bc261ad1c4b40243f1007aa2e67e75b62233ded4 SHA512 1bc48998623e39139e930c028095aace808084bb05d837273386a96aaeccd292890bbee58059b27710331f87d6e89a79005f2b0cdf901d229be6f777958fe051
-EBUILD pgmodeler-0.9.1.ebuild 1241 BLAKE2B 440d707fda8d0e7c052660d57ef4d56518576a9f9dd8d698d759c87e23f8a07d8a0e785f60edc0415197c374f3b6fd9587101f8d70506e79593200c350b2228d SHA512 ed0d7576a98c1a736778447cc6507fb5bfbf58c00319f94c767116fe0c7ed18dc6528bc541aaed93cefa3a689582a65a773a770bc162f1951533f589784b1544
 EBUILD pgmodeler-0.9.2.ebuild 1247 BLAKE2B 7bfbe91ee4e4dfd60cea2bbe863ce20dc153587da485fd24e445f4a9664cf3b99f2638f05b46af0de09e41e415711fe839d4de6fedd25c023a09c22924cb0cda SHA512 2e93e90361d7ef10c22c6a26e021987dadbc43696d4b3ff81a79b5e840468642168b1e1e456fd9f68d603a203e7ca266cc0af536f28698aa5025d6e07bed0845
 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
deleted file mode 100644
index 931497289212..000000000000
--- a/dev-db/pgmodeler/pgmodeler-0.9.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
-
-POSTGRES_COMPAT=( 9.{4..6} 10 )
-
-inherit desktop postgres qmake-utils
-
-MY_PV=${PV/_/-}
-
-DESCRIPTION="PostgreSQL Database Modeler"
-HOMEPAGE="https://pgmodeler.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="${POSTGRES_DEP}
-	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
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md RELEASENOTES.md )
-
-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}" \
-		NO_UPDATE_CHECK=1 \
-		-r ${PN}.pro
-}
-
-src_test() {
-	cd "${S}/tests" || die
-	eqmake5 tests.pro
-	emake
-	emake check
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	rm "${D}"/usr/share/${PN}/{CHANGELOG.md,LICENSE,README.md,RELEASENOTES.md}
-
-	einstalldocs
-
-	doicon conf/${PN}_logo.png
-	make_desktop_entry ${PN} ${PN} ${PN}_logo Development
-}
diff --git a/dev-db/pgxnclient/Manifest b/dev-db/pgxnclient/Manifest
index 26d4af64f433..69ac61303ff4 100644
--- a/dev-db/pgxnclient/Manifest
+++ b/dev-db/pgxnclient/Manifest
@@ -1,3 +1,3 @@
 DIST pgxnclient-1.3.tar.gz 51976 BLAKE2B 84ae5573588e6da0b01d5b05e296adc09f28a0b21ff81e5f2f14f3035a98ad5eb834d6793acf0a48a8b19190b989562e75094341f7c01b371028a0dd6a87b0f4 SHA512 fd9326107334d473db3466f776021186a5add389a93266b000c143131a0214b9773dd4cdd4688575cd720c8357afce1473838dea4aa5ff2564dcbc2c359de2dd
-EBUILD pgxnclient-1.3-r1.ebuild 975 BLAKE2B a3fe17330a8488386d3c0b658db12ecbc7c3abfb388db490909540a67311484df405aeb14327e7c6ff5d8c56b1f7d2cf793bea14f1daed319a85d116a4adfe9f SHA512 9a431ba0a95cbb8abb96bb1cda59958f4588cfb2767c7c5ecc483f6ccd2659c56e985efd2150083a47f5474cae6c2bfc5a051238a21e81f92c7a46f1cab9e734
+EBUILD pgxnclient-1.3-r2.ebuild 802 BLAKE2B f4845b035cfaaf7d9dfbb986561adbf1498bff3d3b4369c81b8b92e875cd0ad35dc49c43b546b1850c6e6d2aff349eac949141f25c55e8a69638913792ec091a SHA512 497d87ee6c7fb68212294a0b293ae68f364b1798eac23ecdff1369568aa2e72e881d727887e163be812909cbc241011101d84a62b678201ca7dc4c3e92a71223
 MISC metadata.xml 477 BLAKE2B 69bcece85da5b9490a5aec5f94264a420d5babb983d602188b4bcad58f35da663216bb52e694009562e518b716a12b05734a2ee81a1219d93641268630a68e3b SHA512 63a1019650d2bfec1f0dab904cabd0de847f5d7cb5ad62dd04ca93a6cf7c25ef2a727a8dc0700a00958b841f7ffaa2c99f608b4cb1872a31a1dc920d0834d22d
diff --git a/dev-db/pgxnclient/pgxnclient-1.3-r1.ebuild b/dev-db/pgxnclient/pgxnclient-1.3-r1.ebuild
deleted file mode 100644
index 7b785a380af5..000000000000
--- a/dev-db/pgxnclient/pgxnclient-1.3-r1.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..8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="PostgreSQL Extension Network Client"
-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 ~sparc ~x86"
-
-LICENSE="BSD"
-SLOT="0"
-
-IUSE="test"
-
-# Test data isn't included in releases. So, the tests fail.
-# https://github.com/pgxn/pgxnclient/issues/36
-RESTRICT="test
-	!test? ( test )"
-
-distutils_enable_tests pytest
-
-RDEPEND="dev-db/postgresql:*[server]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-src_prepare() {
-	sed "s/find_packages()/find_packages(exclude=['tests'])/" -i setup.py || die
-
-	default
-}
diff --git a/dev-db/pgxnclient/pgxnclient-1.3-r2.ebuild b/dev-db/pgxnclient/pgxnclient-1.3-r2.ebuild
new file mode 100644
index 000000000000..4af1585476da
--- /dev/null
+++ b/dev-db/pgxnclient/pgxnclient-1.3-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+RESTRICT="test"
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="PostgreSQL Extension Network Client"
+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 ~sparc ~x86"
+
+LICENSE="BSD"
+SLOT="0"
+
+IUSE=""
+
+distutils_enable_tests pytest
+
+RDEPEND="dev-db/postgresql:*[server]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND+="${RDEPEND}
+"
+
+src_prepare() {
+	sed "s/setup_requires/#/" -i setup.py || die
+
+	sed "s/find_packages()/find_packages(exclude=['tests'])/" -i setup.py || die
+
+	default
+}
diff --git a/dev-db/pspg/Manifest b/dev-db/pspg/Manifest
index 11f5b87d1aec..033be45a704d 100644
--- a/dev-db/pspg/Manifest
+++ b/dev-db/pspg/Manifest
@@ -3,9 +3,11 @@ DIST pspg-1.6.8.tar.gz 1017316 BLAKE2B 0150b4577365000b2fdd9de93307acbb513391591
 DIST pspg-2.5.4.tar.gz 1346559 BLAKE2B 01c0a35a6372ccb7ad007595d01eb0c8380428722418a4f4b6040a549757d2eab601371ded51a762d81677adc259abf5f8af4311fca6427fb24244e0c33035d2 SHA512 2a9c677bbff4eb032403b90f44dbe9f62a46775c1cf180e90fc3df2853973c4b584b674fa11e2b3be844402f5c00777388ff05782fdecee3b27d92280fc288ff
 DIST pspg-2.5.5.tar.gz 1346896 BLAKE2B 7b5b64affcc6ec52ae9712fab06089db3a8ae208d94190fa6695d2285d29a13ac2c5ca3854a1a13ec6907eed04dd6bb188b31cc6440963a069a2715ecf109eba SHA512 74e8c8c5a156d9115a2bc6c9957d302b5e48182181c9560100c09dea765f9a382d78b5fe74ca11fdccd40bdd2f8a165218edf89ffd7713e479f0443a49766c4d
 DIST pspg-2.6.6.tar.gz 1355951 BLAKE2B 134f6af029f070bac66e9f514fee985b7ce77f788b44280cc4df969801d2776a60aa9dd679ae848c4fe68ce58d593c10fd1e2305734d0f76e08f1d2e51ad17bd SHA512 963a4bb3e93880c5dd8538b2ba777977585b2e9766a29001f1e5dd8d4692ccc333cf8bdcf0d7ae3f0cf02568e5645d4534cc58dc540d22df5debc5b4e034114c
+DIST pspg-3.1.2.tar.gz 1368987 BLAKE2B 7eff4134ee97db4df4dfada08ede5e88ea0c37a681c95ba9529f30be98f05cb3a7805e5dcb165b34f5afc2d4d7ca6de0e705334967ade0fdb813636c73df658d SHA512 1446200bdfe88787083da32629acaedab6eaee68b3dccbff3f52c82165029cb0f558790951d5103876c84562fcd6b5578042bca134f4ed37b9c5de96fdc5602f
 EBUILD pspg-1.6.5.ebuild 375 BLAKE2B 1eb56e1d31c91e2766faf5f196d3c7498cc7006b0715f57af5e879f2a65a93bd7061330bb278c193792ead58752fea4de8bc39523b35da546e6896373bd374af SHA512 bce1d5b5642d92cc5aae26905b48e940699f42fcad58b4df3988effa9f14a51bfee55cee95eb72f65a810c99ab59576728e5b63377770f149a2dbf470cd20f86
 EBUILD pspg-1.6.8.ebuild 377 BLAKE2B 59e6f8cefb4a9347304231161958a8915a8cf375dd2096b4d1fdc19b00d3fa4093780ac7b33a78814673191514fbb5d965f5d7c5904b63a9abeab6a9f82819a2 SHA512 589f39286408970b9118c3cad7a343278adbd1c539d42e92bd293cf549c8ba5064a77a23649e55d60559e5a1380e77a92647ebb7a25716cbf7cb28a5389bc26c
 EBUILD pspg-2.5.4.ebuild 417 BLAKE2B e546c8ac11ad8abeb004a3471ef1aa09c8c75c14d84e8598d1743227183c9bba787280aad2c168e8db72ff5b0fdf6517e9941179de55b47bbb0756338bc16d34 SHA512 59a6ae7ac90bc01e5628133110a63f00ab5bdde45c8b21d886efc1a9e7209dee24ebc2f1e30a63fdabb06ab04242c4bc16df2b7fa34086de52d1d3fac3171f6f
 EBUILD pspg-2.5.5.ebuild 417 BLAKE2B e546c8ac11ad8abeb004a3471ef1aa09c8c75c14d84e8598d1743227183c9bba787280aad2c168e8db72ff5b0fdf6517e9941179de55b47bbb0756338bc16d34 SHA512 59a6ae7ac90bc01e5628133110a63f00ab5bdde45c8b21d886efc1a9e7209dee24ebc2f1e30a63fdabb06ab04242c4bc16df2b7fa34086de52d1d3fac3171f6f
 EBUILD pspg-2.6.6.ebuild 415 BLAKE2B b60c5abaf49da08566e205a33fa33030a041b3df0882348dc5eb0ea3a0b90fcb885c4ac2f41ffb054ee80bd105c9f707f4f576bff71c2e4dca3e80a4ad0ed594 SHA512 243e3124bd436d36081aa7a7b0250329a2c772b94d55438faefcb6d4c4e923a9e5c102c37ab5011cd2e057c3b24535d11822a862956a8d0e59f92ea929e9a6ec
+EBUILD pspg-3.1.2.ebuild 417 BLAKE2B 0ec9f20546abc9e992a1f02b26fdfc2a84f506a285528f4a83c360512362a5440e3843aaf8bc9391ea9ffe8cf409b35aa484cb8526087c9e5ef5573905dbb6a1 SHA512 0622265d4550b2fe99cb42f3204bf8338d1399a9eaf8a16f93e948c7933fbcc742f315ee942dc74a04b6ca96267d53949d0a435af0d36b671da347506fed7600
 MISC metadata.xml 298 BLAKE2B 40abb765b052aa2cbbf749c54c686f1c98968cb1af2e93c149bfbfe6244d3c17e827189d7a1da90a566016758bfbed63b16ad0a0328725349748d1b18b2437b1 SHA512 167896d1d92ccb4b171cce16d63405369a9e28b0d01c12b2ed94fcec1f982892e179c007287fc3386e1c00393d6570a2ae9e8efe9420e53a82308426075d5c89
diff --git a/dev-db/pspg/pspg-3.1.2.ebuild b/dev-db/pspg/pspg-3.1.2.ebuild
new file mode 100644
index 000000000000..67b53cc4d812
--- /dev/null
+++ b/dev-db/pspg/pspg-3.1.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="A better pager for psql and mysql"
+HOMEPAGE="https://github.com/okbob/pspg"
+SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-libs/ncurses:*
+dev-db/postgresql:=
+sys-libs/readline:="
+RDEPEND="${DEPEND}"
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 40df5947f0f2..bf70ab727ac4 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -21,7 +21,7 @@ DIST redis-5.0.8.tar.gz 1985757 BLAKE2B e46af2133e066ccb91a8eb2c2fbfefe3747e1cfa
 DIST redis-5.0.9.tar.gz 1986574 BLAKE2B 7802d0556d11c9be8577b9bb3f4dbad8c2419b38659001421f96040e8a64a4a304e9dc1f06d82802ce1c92515d166cfd37c2f347df4c4cda0c2c4c2bb10d27c5 SHA512 d2c7bc1f769bc5d179bfe6e71954962813b50597eafc752a9b1edf2fd87e84707b7daf0910db56dd0e89cb3bdb3e551da7f111ae4899f505bac5f77f99744c13
 DIST redis-6.0.5.tar.gz 2217666 BLAKE2B 6c85b344ada4a8b9981bf0403e883d7584b391b5275f14b4335f51924c2e9dc2eb7886694cd62eec2ac2c4e747468161b75cde3a4b373e496453787cbc994c43 SHA512 62ce42bb5ac9443e0736f5dfeffa7609542cef5b3c6c7d689ad8427cf788f3daf321531fdaa0329942e746e2eee47461be9d8771b89ae25adcc5badc225ebf26
 EBUILD redis-4.0.14.ebuild 4641 BLAKE2B 970a3440789c6bc964339b0de7df7c7882a492e259e503a65f0182aa77c7e54b2d477903f623dda0f1526de8e9985075a658a2050952484a3070a04ddfa49c60 SHA512 0ec94984ce74d537d13028d64d1a503f7de7cd5514f25a57d89872e6389a69d8cc747e1e9448f13e8395faed6e7d733c5183174029cb10af8d7b27320c659670
-EBUILD redis-5.0.8.ebuild 4670 BLAKE2B 50c9fa61224453be6a8196121f82feb8c1a5896f66d57e2400235061bcf5767a8f89cef89020975b060af2ecebaf69a880dfb8e21ad6e4b3aedbe2d1771ae445 SHA512 d82e7f2408c47d5966d400c56846e07ea8b75e604b13afd7afcbec76e6d77d764945f9e3ab9d9a0569fb1fc4e59d34250733b9627e1dc0f4681e500606df4e13
+EBUILD redis-5.0.8.ebuild 4669 BLAKE2B 79265c316a1ecb3a7ce5bf5b0af70c68ba9cf4f0439f67a190cdd19dc16158ee40b7379e088de990b122d21157a6aaa415f4f70e1e237861fb5c268dc8e60175 SHA512 340ec29034e795225dc54a2ccb120046bbd8ea3d241988b6ef10d249f3070e17857098d2d3c742e6737205b3adf5b0fbafd79ec53d0fe0ec8caf6abfcd2e7f78
 EBUILD redis-5.0.9-r1.ebuild 4744 BLAKE2B 911a324ae75ab43090425efbb15fec52b2568e09944656450d13eb82d730466466b638adab70bf71378726d08da982a05d1a7b0bf0db7e8d7fc65606ded549de SHA512 270f9e9b8037799c2e59037c968796155d9c5dcbb29a69e72e1544cd310f0921a9e26101e37b6d4d6701b40ad6114bd1f931d36d8be2d96994ad861ce6cc39ac
 EBUILD redis-5.0.9.ebuild 4676 BLAKE2B 2de30fcbfb59d8b8fb75fe956d493f1ea7af8b6e5c9345a063722f5b85a31865d8acfad4cfd2b97dbe96e13f9734dc772a5b3c67eabf68239035721e6c0391b9 SHA512 ad8055de14691a842f160f0dfdd9530ed290417cca01f7e668fccece5433c18da26c153d20fd9df15ec58deaf56c6f7cc6aca83540fc6bd3e12c9bc2be27e43c
 EBUILD redis-6.0.5.ebuild 4705 BLAKE2B f7082975e525a81280bbbfef7ca72e662cdcde23391f033cd7851c8ec780d3239cba21b71a0808a721d28356233590ec41eb6160f7e9c4b82664ceb7ae33e9bc SHA512 47cf629bf66800b00a545fff07aecc6889bd28c526e666763254d8598e9ad8dd567c08c73f3c006843f161f369278bca27e3b62a3927ac1af1ba18177545d6c9
diff --git a/dev-db/redis/redis-5.0.8.ebuild b/dev-db/redis/redis-5.0.8.ebuild
index 61a50565cc94..17942c1e4f61 100644
--- a/dev-db/redis/redis-5.0.8.ebuild
+++ b/dev-db/redis/redis-5.0.8.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://redis.io"
 SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+jemalloc tcmalloc luajit test"
 RESTRICT="!test? ( test )"
 SLOT="0"
diff --git a/dev-db/rqlite/Manifest b/dev-db/rqlite/Manifest
index e299f6e4331f..d18f124719a8 100644
--- a/dev-db/rqlite/Manifest
+++ b/dev-db/rqlite/Manifest
@@ -77,5 +77,5 @@ DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c99852
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST rqlite-5.2.0.tar.gz 304914 BLAKE2B eb455a1f30c5f431c657fa04a09fdadbd471c34788b3a86e0440c1fb0301c51318e0d9e96e9d948d3093665e1aff612f8429acbf9c572f7497f691d3ee49665f SHA512 80f0af92c9f3af158094d728a032c87e2cd3fc7631207e5aa300ef1866a8bfd5915ad652de09874b75bf9ef155a8795d736aba275414a9d6ae912b01082a0aa2
-EBUILD rqlite-5.2.0.ebuild 5047 BLAKE2B 40d7bbf44cf38f436bdddddac496ae6e73ab510e57d85934720f2f9bfd7c6dc7cb51f92df40a33c2b5d3a9c97e23cdb7d9664a4f499ddebafb0833f8e1e31cf5 SHA512 7e21c2795676da8434ebe592ef7d46ac9a4ab4a9c786749694168ce59dd2da3120c76dc6d6ed2676eefd0a34a88efa1d792dbe822cbfd28ff8a1af3433638c59
+EBUILD rqlite-5.2.0.ebuild 5048 BLAKE2B b0c3407cd790070136cf7b35deaf3fd5bc4bf04696092f94ac72607596b85879cb7e26634174cdf82d0b9054febe44c737180f9caa6675dfbfe22d2f5bfd7ad2 SHA512 f2b880e179a4c037cd48e08506091ab8f2da9e6a1c2aa320d83f6f8cff5983f9ccf693cb130bb31fe3917db14ae3dec1f4b559858b45e0669ac4e1829854a803
 MISC metadata.xml 304 BLAKE2B aa848abaaeaf54cb85ddb9600c6044a9ed2f3e446f3131f3725431b3a3eefa0058a8c962c708f1735dd97caee1c25a461da3f6fd622b521ad36234157580f6f4 SHA512 3e536da8ed6a50cbffad3574074029e67b25627d80050f388742e7b086ffa73e6fd93fa307cc267bc23b4eca080ddefa7845a3ac90ad3736862362f9c0e29c92
diff --git a/dev-db/rqlite/rqlite-5.2.0.ebuild b/dev-db/rqlite/rqlite-5.2.0.ebuild
index b0f87c9c7b35..46bff9b3335f 100644
--- a/dev-db/rqlite/rqlite-5.2.0.ebuild
+++ b/dev-db/rqlite/rqlite-5.2.0.ebuild
@@ -6,7 +6,7 @@ inherit go-module
 EGIT_COMMIT=77863e5a13110f1fca87b6fce84a7169c3aa58f5
 
 DESCRIPTION="Replicated SQLite using the Raft consensus protocol"
-HOMEPAGE="https://github.com/rqlite/rqlite http://www.philipotoole.com/tag/rqlite/"
+HOMEPAGE="https://github.com/rqlite/rqlite https://www.philipotoole.com/tag/rqlite/"
 
 EGO_SUM=(
 	"github.com/Bowery/prompt v0.0.0-20190916142128-fa8279994f75"
diff --git a/dev-db/sqlitestudio/Manifest b/dev-db/sqlitestudio/Manifest
index 34174b75a6de..01e113613431 100644
--- a/dev-db/sqlitestudio/Manifest
+++ b/dev-db/sqlitestudio/Manifest
@@ -1,4 +1,4 @@
 AUX sqlitestudio-3.2.1-libressl.patch 1248 BLAKE2B 7500c5231d03a2c1e2006631b77076a0cb6af49609446544f7e3901b748e87a2be03b232ef8f93714220542fff56f48e92c2de39d8a54889d7472b142071c71f SHA512 6fafceed80e8d072d06060f15787d855bfcfb55a502a73655beca043a73c45101bf5d3168781a2579c9e6aee5d924318240c886fe982cb0c833779d57be97405
 DIST sqlitestudio-3.2.1.tar.gz 9405867 BLAKE2B 53cd8465a6140cf17c602094cceef2fdf74f513f33257b22e1a3d7adcb9c78d8eb2cdaff047920836a9d98429ba0025924ce608f2eab97319feabf063de4c9ee SHA512 9c07f0dc50bf35ad04d0cb06cfc1a306d3f0aa9446e7d737c8187c63cb7dd2c44fb4b960693f2c30a15ece3aac0878701874a9ce3cebfe0c6bf48df10814a574
-EBUILD sqlitestudio-3.2.1-r1.ebuild 3775 BLAKE2B 434145097a1175605418515b53506f536e7c97981119040c579c20d8aae4abc20ecf649578d5a94bb475d27001d449be6cfe57706e987c6219644d4556d18937 SHA512 01087e85a42c66ddce282fe74e21314298a25ed7e73e6f02c21ec10f7e5169b8c7e9a5d47503d26d7ee6ef312f9b4f89b3c5db8c9511ad36d009ccd7b034480a
+EBUILD sqlitestudio-3.2.1-r1.ebuild 3812 BLAKE2B 6f9ea8c4bfde3e9c323edb9cac312a1e03731b8e2d9d389e4fb99509107c156115d24023b58c0b62b30afbefd4c6918b8c3a871ecb831dc43ba6dc39bf38b1f1 SHA512 abedf192358de6e4dc06b1852431557a6082940127f0a9f0399573b9364766a5071ca0eeac0c9adf349c62d1df8c7237fca57f82b7c05a31c4a0582ee9a43aa8
 MISC metadata.xml 427 BLAKE2B 937831b3acf561038a945599a81766c4fd1712d889b8bb0ba2c7b8c0d2414c547e270363b6ece7fd7956b66f1eec2e12bb4b83a2adf2718c14d0271d3c0f0155 SHA512 a6948ce576abceb4df085f103e097a720ef5f959c6f4bb79cc1f1d858e43cea625d5af3c5edf47f5e61c0a537368e60abd77ed3fcf39a9526543de315ef125b2
diff --git a/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild b/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild
index eed8e84a6d17..af6ff97a5db8 100644
--- a/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild
+++ b/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild
@@ -1,10 +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
+EAPI=7
 
 PLOCALES="de es fr it pl pt_BR ro_RO ru sk zh_CN"
-
 inherit desktop l10n qmake-utils xdg
 
 DESCRIPTION="Powerful cross-platform SQLite database manager"
@@ -15,9 +14,9 @@ KEYWORDS="~amd64 ~x86"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="cli cups tcl test"
-RESTRICT="!test? ( test )"
 
 REQUIRED_USE="test? ( cli )"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-db/sqlite:3
@@ -37,6 +36,10 @@ DEPEND="${RDEPEND}
 	dev-qt/qtconcurrent:5
 	test? ( dev-qt/qttest:5 )
 "
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+
 PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
 
 S="${WORKDIR}"
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 1fb6c59ba6ca..9b847eab57fb 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/zmac/Manifest b/dev-embedded/zmac/Manifest
index e28ae01cc927..496450d7b0f9 100644
--- a/dev-embedded/zmac/Manifest
+++ b/dev-embedded/zmac/Manifest
@@ -1,3 +1,3 @@
 DIST zmac13.zip 82067 BLAKE2B 8f15cc17d92ed8bdfc16504c2c958db1f158cf8cceda6aba01e626342961975c68e41321349c95721053b1d10f07373b76385ebf9c1b74dd70f69c5d6fd82b70 SHA512 84c1206e3abf19809ab4358c0b5d46771cdcfdeb4ded14aa39d81ca7f9d3780ca1917823bd06f49ee9fafaaa079bdbe8b614ce842d44181f55d4287515a187a2
-EBUILD zmac-1.3-r1.ebuild 541 BLAKE2B 66c3ebd531a991a28c46bfb182dbc4084eac2ab62e6b81f092763a9011be40c4becf9ae4e55d554231c745804a15d81cb955f537c247a02c20dde9cb2c838ed1 SHA512 f2ebe349bd5d00c8d50d23604811a4a3dc81db06cc72bb63f47f42ed6b77d5bf92035e03736cc200ed3d8ecf87e205acaef54d2316b7f3eeb0368c8839aecc3f
+EBUILD zmac-1.3-r1.ebuild 543 BLAKE2B 83b5a058de13e98b2358198dd460a754527b3371a25a71fa46af023a33173f95ced5d2d874c7bc9e3736a50d83802b5df6b1bd44c2a8a8e2121a3a10d266d705 SHA512 f78566c41365573706fc0d71ff38343e337c297409dc3fa44a1c1850ba63eac066f75fb41e29ee0421049c633345c2909eeca1f7588ab208b89910d03a3505f1
 MISC metadata.xml 635 BLAKE2B bb2ec2e726bb24ab5f0010979b01368ce0644a46ad589433377609863d3da769c5660f6613d2b775a9359aae44eee3fee7e7a578e320d840f5ade31a78b14fa0 SHA512 ce5a690df0362dfd32802e9e3d64bec1a00ca4a15c9dbbde2d3383baed657f701c516ff24dfc42f459f0fc7796386ce23ba249af7a6d88e98f9b9f3f345a43f0
diff --git a/dev-embedded/zmac/zmac-1.3-r1.ebuild b/dev-embedded/zmac/zmac-1.3-r1.ebuild
index bb78b19a8768..ce0ee4a4f916 100644
--- a/dev-embedded/zmac/zmac-1.3-r1.ebuild
+++ b/dev-embedded/zmac/zmac-1.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
@@ -6,8 +6,8 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Z80 macro cross-assembler"
-HOMEPAGE="http://www.tim-mann.org/trs80resources.html"
-SRC_URI="http://www.tim-mann.org/trs80/${PN}${PV//.}.zip"
+HOMEPAGE="https://www.tim-mann.org/trs80resources.html"
+SRC_URI="https://www.tim-mann.org/trs80/${PN}${PV//.}.zip"
 
 LICENSE="public-domain"
 SLOT="0"
diff --git a/dev-erlang/Manifest.gz b/dev-erlang/Manifest.gz
index 241f5c091b8e..d0953e085bb5 100644
--- a/dev-erlang/Manifest.gz
+++ b/dev-erlang/Manifest.gz
diff --git a/dev-erlang/eimp/Manifest b/dev-erlang/eimp/Manifest
index 523c86f14981..c230caaafc9b 100644
--- a/dev-erlang/eimp/Manifest
+++ b/dev-erlang/eimp/Manifest
@@ -1,7 +1,9 @@
 DIST eimp-1.0.12.tar.gz 3476420 BLAKE2B 147b910aa65fd28a73799353df6ff653dc815c5fc4ad878e8611748d79bd19fbf453bb24604ecde8669d24bcba2ac843a0d127e26086f4c9cf889104d176372f SHA512 512570da35e398094bbe7c3eb68b769b6510dd8a52897f23a425600782463c3dd7d2fdca67bb97de1cb86d29cf3c50076e56fadd10a79bb466d56c7672f98795
 DIST eimp-1.0.14.tar.gz 3476416 BLAKE2B a2aa13cf128133cfb504b2879e02ab8b60ea617deaf12eca4bb7aa65063ecb092bc6284dd92084477aedbd7ca274c2a1ce92f0a7271cb1237fa1cd29ef8a19cc SHA512 4f5f8c8c54dfcb6df0cfbdd2ab67c940c701c0dfea11c5cf4c689458d514897ab32733e6d3f606e5f8aa111983dd6a6db950ed0b36c0607e712a27606d8f9ce4
+DIST eimp-1.0.15.tar.gz 3476420 BLAKE2B 09836d8fcb4ff653da37f3be52ae2f2ec930e88d49e774d4915202fe96bab2eb3374786e294ceafe0e97bade804fb70945011ef6d8c8d655fc8a480468c7aee1 SHA512 53038a71c5bb834cd22d1c6cffaf2fbeb09317f2faf69156f6e908f8e70f5322f19ae18ab27ea881dacc4b28c2795529c7e747a83c8ded9037487c2665ad0c41
 DIST eimp-1.0.9.tar.gz 3471343 BLAKE2B 672e14cda50917a431d5bb29ef127c6bdf026234a5aeb66777540cd59167b48cfa1f264fdd631ef09c33a5ec9817d6d13c9763eecc5b076431976700f3af0ea7 SHA512 a86bf4927cf1da8004f140861a86d358c953a4871af34aa4768877f2b0618918c5a95d557e8535ce1615e272bfc3c9f27275ad4e5f5365c91a4a381ac2463977
 EBUILD eimp-1.0.12.ebuild 612 BLAKE2B 4752873f3af05a4a66b175e9d5658ba052bd06951f167a44edbadf88b4a92bd5cf8e6532fdfb4a986439ecf8886412e315d81b4d4a13ab0e5460949c7cff44e8 SHA512 85ea2af9e56e35f7fc991a33c85acd03537352aeeefec1ca7a4abfbb4ce45d24f9a33f086adea1c8aad0fe0a3b477a659d935cdbc3c981990c401dee7c06c4f3
 EBUILD eimp-1.0.14.ebuild 612 BLAKE2B 0e680d85e36f7eaa62738fda8bba7c205536739e010c4a0eb380bfbc79bd9ba03ee1f66b686362ad441bfa9cc730dfb497b9b23a4cd0c70c5af3dddda4284a99 SHA512 871ac91d6ec845c381a619e3aee8725a617c089716e3a65722d4c305099d21b473d37eb511179d784ea5d7f7744db655f18229948e7a4bf37b260a7c238c6f29
+EBUILD eimp-1.0.15.ebuild 612 BLAKE2B fd1c9332d33c50466f67b313828010636a0ff99e43aa872c8ec3102949b870ae700083dcc2103f92e083073684eae6fcee57c53ea142f12676224e84bc5959d7 SHA512 1a63ef987b0ff641584a36b3cbabdbec8e21395ffe80a6f494032ebcafe7fb2d74f7f4330e3ca7fb01fe2a077dba9373142072cb278e359a3847dcfc2c154cbe
 EBUILD eimp-1.0.9.ebuild 779 BLAKE2B 1638a892e479ddce06d341f7b4a1bbfe4341c6913595b8d2c834dc3879c5f7aca6b8df89f1c70b1e6d6c148002d677a1ddbb2d9ba309e7f895a445c3263047ac SHA512 e6220bb3347a467d01a05cbeeafb066d050ffbad6fb1e83c8c2eeb479b36c7207b37c402e597094c2f8b270d5965981de33dbabc322bebc38cd2bba5f1f7e617
 MISC metadata.xml 300 BLAKE2B 42710a5ed8bf7db4b090862b3a24ca028ebc0dda2f869857b11f7a02be03f2dd7bbd6fb0ede4d81c99fa0821642a092615aaab76dd3494b14a4b867a45e2e848 SHA512 bf280078b8e095533909d040da770268ff65d376e32f01745d1241758bc7bfd2f3d49eead64cffe409367ec852bbc3db5c578a80f52c914bab231fa7f018afa1
diff --git a/dev-erlang/eimp/eimp-1.0.15.ebuild b/dev-erlang/eimp/eimp-1.0.15.ebuild
new file mode 100644
index 000000000000..add9a0df8a24
--- /dev/null
+++ b/dev-erlang/eimp/eimp-1.0.15.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Erlang Image Manipulation Process"
+HOMEPAGE="https://github.com/processone/eimp"
+SRC_URI="https://github.com/processone/eimp/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-lang/erlang-17.1
+	>=dev-erlang/p1_utils-1.0.19
+	media-libs/gd[png,jpeg,webp]"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_test() {
+	mkdir -p .eunit/priv/bin || die
+	cp priv/bin/eimp .eunit/priv/bin/ || die
+	rebar_src_test
+}
diff --git a/dev-erlang/jose/Manifest b/dev-erlang/jose/Manifest
index 688ed34a9fd5..9387b982ad02 100644
--- a/dev-erlang/jose/Manifest
+++ b/dev-erlang/jose/Manifest
@@ -1,3 +1,5 @@
+DIST erlang-jose-1.10.1.tar.gz 279187 BLAKE2B 18b606e5a2fd93b96a26b989a52235af08bd925eb610a9010b4ff930c1feb50bf8143456bd6b4743b53342948185eb5e4d4df760f774fc4bce1dc6a11fb2acf6 SHA512 2887a1d43e212516b32a0a690d5a94e6a797b4802b21fa0a51cc4830790f56625575db38af8fb1c0f4cf4694740c6149eb75989cfbd51867af69c1b23b7ba8ee
 DIST erlang-jose-1.9.0.tar.gz 258407 BLAKE2B c6036e743b062cd18518537ffee03cc138f55f3973a2ab538410d362757747e2c8880a899326d494914068f36ffaf2bb902e83ba7899c3256d6cfc7b89f07156 SHA512 59f7123fe589c8e9bf0bab5a21089301d6b3a1c35316b9f530386bd0d9de8da8f5f956769ea6b1166c545a51d119668ed18db57e8adfa02e6f4327b01168db68
+EBUILD jose-1.10.1.ebuild 968 BLAKE2B d104720a8c4ce732608efef8fd982f2359313a1f900f94fa7905c4a7714a1ace905f98c86e95de6e2e6ae1f29c3cb9751622d5a5d007ba7a012b6ea1a894f63d SHA512 37373bc6135bb2d26378f56cd3635df662abd63905ac905f51d3b249e6cfa6788e8ce600229fba2067a50ef01f9c20bd14dfd7b139ab9d12c4b753d19203e619
 EBUILD jose-1.9.0.ebuild 758 BLAKE2B e48f6253daca6746cc534cea3a66ebf5d477763d2bcf1fe955ba83613c5dbf7f58a691b91d1d2a776c4f7424dfaa4bdc87c66029ebe999ce52519def93b78089 SHA512 2c811754d4d59acf2fd9e369b41fd19a7ea45a75f8f49115fcfce611c1157ffaa8361e229ccd75dc1f2d427bbee01e1e036e1202bc74ab791c3c3bb1aba28a1e
 MISC metadata.xml 308 BLAKE2B 7206d5d69299b11b8f0e595423649507bd340034f021e7dad826f984f42ddac0b09ba0ad9c5a537a7b15773c5196f7c48f5fc36157a6abd141096f813cff500a SHA512 f64bf6d1f188bc6c61ca8390db4619a7a06d94be956cc0736943b9287a379e8f5372fed00a4ad123068a2829432ef289fd697d0f74d86c46fafe1255e109a519
diff --git a/dev-erlang/jose/jose-1.10.1.ebuild b/dev-erlang/jose/jose-1.10.1.ebuild
new file mode 100644
index 000000000000..2edbf510886e
--- /dev/null
+++ b/dev-erlang/jose/jose-1.10.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="JSON Object Signing and Encryption (JOSE) for Erlang and Elixir"
+HOMEPAGE="https://github.com/potatosalad/erlang-jose"
+SRC_URI="https://github.com/potatosalad/erlang-jose/archive/${PV}.tar.gz
+	-> erlang-${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/erlang-19.0"
+RDEPEND="${DEPEND}"
+
+DOCS=( ALGORITHMS.md CHANGELOG.md README.md examples/KEY-GENERATION.md )
+
+# TODO: jose has test suite, but it require lots of dependencies. It may not be
+# TODO: urgent, but it would be nice to have those sooner or later.
+RESTRICT=test
+
+S="${WORKDIR}/erlang-${P}"
+
+src_prepare() {
+	# disable warnings_as_errors for erlang 23 compatibiltiy
+	# https://github.com/potatosalad/erlang-jose/issues/87
+	sed -i -e 's|warnings_as_errors||g' \
+		-e 's|debug_info,|debug_info|g' rebar.config
+	rebar_src_prepare
+}
diff --git a/dev-erlang/p1_utils/Manifest b/dev-erlang/p1_utils/Manifest
index 95d2c2a1b87f..5fbb155ed0f5 100644
--- a/dev-erlang/p1_utils/Manifest
+++ b/dev-erlang/p1_utils/Manifest
@@ -1,7 +1,9 @@
 DIST p1_utils-1.0.13.tar.gz 56548 BLAKE2B a92aa78960673f2a52b5247dc48ea94e73e018f1a9504b57c15ebfb3b12eb9b6b5dd4e706782f4200cd35f07d3193c4cf07eff462bc74b4714d1e3da4d97077d SHA512 eb4fa41a46973c300b752efa273554e293c19235c3649166f1cb52d9512d0bfa3f032053a35ca10aec1d6594f352c386720ecb193233cebea226f45e0c0add34
 DIST p1_utils-1.0.16.tar.gz 63418 BLAKE2B f7384737ba2c758ef25aedf9b1ddbe870c858172db5ed37dd146eeda0640cd589f9176f946e6c53d04d1f3d5c711d9c58e3fdd66245b603e94d9b04ce72ba086 SHA512 f7e2ae20771cb7405092b194af4f63c5d25d5f7a245ee343994ce626d5e80626f94af1bf3ec75c3d102d10c8b64238e3f90437ec6a932d8fd22877f9d4764b6a
 DIST p1_utils-1.0.18.tar.gz 63459 BLAKE2B 6b08dd1dfd68a473e014cbf5ef98f74c92ab14b3e78d2dc31e5cf9b88e1f81c18a4850aaab46ff5d43b3200b9b93004cbc05ac633f1d92756edb4f5b28fe1d8c SHA512 e7719c090ece0b86ee674eaff28bf20402542730d7f25771f95a6c53e5ee727d82b856fa9d83857979cd1991f80620d4a6255231b6e0de332607f9b6a3d571a9
+DIST p1_utils-1.0.19.tar.gz 63649 BLAKE2B 0fe55dc6fdd436b5e77ad02bba923afe17cbac71374aee53a752739a93bb1d07c1ad85327e7c198cc442722a57928b750efd6d35f4a30cacb923045dd39e57c5 SHA512 bcc4b2abcd7d783d307e53b154da22bb548be05dd0636e455485423e8ab74acf097f1b3be58989dcdd5cc178746777b3062c332e73d2d9e4771973aa6e523376
 EBUILD p1_utils-1.0.13.ebuild 482 BLAKE2B 5906c03cbb6673196e9f888ba30df322323a1c5966c120baf6930240c71294b642a7c56f50ef2f5c02636a4ed4d2e83212e9de814691a4a4d88c355b370e6d41 SHA512 e21379cd2211b2c6f30b385fef30b3c58b92114c28263387234d567f7c4ad0cab85d9beb8aed1a335d9223327b43c488350ed07a8faf19b1607eb61f7a63f807
 EBUILD p1_utils-1.0.16.ebuild 486 BLAKE2B 9e1a80202c2afec5529539817013875c7d8588c964132b748e5a3673a2fc0598bc325ea512e39d0a632932252757568b4a772580453350a67f90a04f30ea0fc0 SHA512 0e8df6f8ee701d707b140c524de9a6fb83beacdbe6ce867634fae8c91792c381219cdfefe3b7d2dfb1a02617f694f0bbe4a01fac923bc666637d24ccc37bb6f3
 EBUILD p1_utils-1.0.18.ebuild 486 BLAKE2B 86ce01267391c253b07922deb8ac5cac27e7f5e3b9a7a52923a8fa12a5febb87bd14379b462ea3b1a4f545e86f6a02172acb7c020c5146fa3122d515701ce445 SHA512 0e11efc76d8f71deded0b65216894a9239629d74cc9429afbdadce65bc86f29a85aeab1bd1171fdf54a3a1b69ce362c1447359e58ccc7653d1122e690c410bc3
+EBUILD p1_utils-1.0.19.ebuild 486 BLAKE2B 86ce01267391c253b07922deb8ac5cac27e7f5e3b9a7a52923a8fa12a5febb87bd14379b462ea3b1a4f545e86f6a02172acb7c020c5146fa3122d515701ce445 SHA512 0e11efc76d8f71deded0b65216894a9239629d74cc9429afbdadce65bc86f29a85aeab1bd1171fdf54a3a1b69ce362c1447359e58ccc7653d1122e690c410bc3
 MISC metadata.xml 474 BLAKE2B dd0f46e4c69d981a6341dc888b33f3bab4bc233df0208fbf09c16dc3bbacde133af147ed348f3f619836f3b3c52137b3b861c903d305a018ea61d535b3b5909c SHA512 9b19dd7b2c377527c69241c9af6d5599c9f8413c329297ea29fe38ea481a9a05e10c7f91656cc77e3b090dba6152d1d59f64f71e74b0530eced45af0ae7fd121
diff --git a/dev-erlang/p1_utils/p1_utils-1.0.19.ebuild b/dev-erlang/p1_utils/p1_utils-1.0.19.ebuild
new file mode 100644
index 000000000000..3be8c65fcfc9
--- /dev/null
+++ b/dev-erlang/p1_utils/p1_utils-1.0.19.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Erlang utility modules from ProcessOne"
+HOMEPAGE="https://github.com/processone/p1_utils"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1:="
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index e5eb20f5c13b..7c6b745a8bd3 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/goatee/Manifest b/dev-games/goatee/Manifest
index 02f4c1f3b313..fbfc1bd7e321 100644
--- a/dev-games/goatee/Manifest
+++ b/dev-games/goatee/Manifest
@@ -1,4 +1,3 @@
-AUX goatee-0.3.0-ghc-7.10.patch 546 BLAKE2B a14a14f4b1f5a4cb5f896f1a79a5c3113d85bfc2b2f7092f12728147b7db9cb7ab466eb14657abaa2c2acfc3cbc7be080683ddf693d58a2497a86388f062b62b SHA512 2551f95738d40fdb231244612ce795170bc829017f547512351975a52f608adb9feb7275fca57eddbb4cf6b6f0c178dafa3e805942c9373dff19cdcee4346ce2
 DIST goatee-0.3.1.2.tar.gz 84576 BLAKE2B 66eea2e0685279acadba0ae857786bc8bf5eec26d4856745f6a040ac220a824d02e7c9ccf36e38d81ad8a60e90972681f9e2ab2e5f67fa4af267e5f8bb5cc98c SHA512 b8723679823dbb092346f8a6c556c3391888f004d609d6b61c73c9f590901abc5d4024d0ad4063692078637be0171d78e9a91c9436735423d597f310226ee9db
 EBUILD goatee-0.3.1.2.ebuild 764 BLAKE2B 2b7979b1d4dc4383a1bb3bd77a9ad7ab972edd476f16f3d851a5f475f1818be10486a6e3c7644b77898c651dfb0a2a27673a5930825dea28eba0dba5924a380c SHA512 6842c143397d197efb6ba355092d80418636850cd0ff27e8695b46168b0153d0d784b9fa7535424ff64e1d177cd86de1acd7b110d5ce099f12165f1d621f65ca
 MISC metadata.xml 815 BLAKE2B ec7785235c9879ff74718aa5240e07455f1e36ecf3fccef95e7a49cad7f4f79d3dcb729ea2d50271e277410a3dfdcbcdbd63f155c84d0fcb061761ccbe1bd2fb SHA512 34c22d6f4785a966025c02f5e51ae0159e4dea45359a97e795865b3c75a119dbeb5d9c9485c897381ed932e21c7ce846753de66926b0bf4ff0a5a08a4472ef49
diff --git a/dev-games/goatee/files/goatee-0.3.0-ghc-7.10.patch b/dev-games/goatee/files/goatee-0.3.0-ghc-7.10.patch
deleted file mode 100644
index e2881220fec4..000000000000
--- a/dev-games/goatee/files/goatee-0.3.0-ghc-7.10.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/tests/Game/Goatee/CommonTest.hs b/tests/Game/Goatee/CommonTest.hs
-index bf27662..33e4f24 100644
---- a/tests/Game/Goatee/CommonTest.hs
-+++ b/tests/Game/Goatee/CommonTest.hs
-@@ -1 +1,2 @@
-+{-# LANGUAGE FlexibleContexts #-}
- -- This file is part of Goatee.
-diff --git a/tests/Game/Goatee/Lib/MonadTest.hs b/tests/Game/Goatee/Lib/MonadTest.hs
-index c5b505f..bf10f4e 100644
---- a/tests/Game/Goatee/Lib/MonadTest.hs
-+++ b/tests/Game/Goatee/Lib/MonadTest.hs
-@@ -1 +1,2 @@
-+{-# LANGUAGE FlexibleContexts #-}
- -- This file is part of Goatee.
diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest
index af2663d9cd86..117ce99f8d94 100644
--- a/dev-games/tiled/Manifest
+++ b/dev-games/tiled/Manifest
@@ -1,5 +1,7 @@
 DIST tiled-1.3.4.tar.gz 15860089 BLAKE2B cdc06f82a5bd92179ff4c6402da7094dfa33d1281f358cd82a5125fe9672b5f317f578f3332c1b07c4603bb8930dd50c736f0a41a156594fbd419d94147c0525 SHA512 f78772f74d9f7a241ff9191ed6152f965b7a5342db877fa63a2d84f266d956cb2fa487776cf503db36bc5da9aa825c8bab87e13293e43a129f560020e323bd61
 DIST tiled-1.3.5.tar.gz 15899657 BLAKE2B 3540fb9f4c6994d7b3df382aded53f16a2861f9864836ce295b0d6ab7cc8971b28272d52ff039c8281b7e453e4fbd98651d5b7cf6a2a8fc04f7ea4ab908f2496 SHA512 a8c5faba7eaf14c1062acf693cc0fd43b64003d886f876ac179d21b9aa18bbc1859a2b13dfabe4c0363ebe21a4d64bdd0adb697427ef68c82072cf8e706d7de8
+DIST tiled-1.4.0.tar.gz 17480656 BLAKE2B e98abc86554b830ae882173c4a9e90e5bbc2872a2c2be21468154e305f3f7f5d7eb629d827a07755aa59b938a02abfaa0f8fa9303deb2de4f11c86373f568486 SHA512 1c4cca9c4f5b884a99a6e10f27dc435c2acb93f2c350a4d69927aef524b8d06dd8de8687235929747d087d3ac5d4539ded174cab59bfaf82042e28d7e9b39ad0
 EBUILD tiled-1.3.4.ebuild 1316 BLAKE2B fa1511b48fc88dc9ef40ef246a0653720051c4c61e8224359e250a56a6f05df81d52fe41a4e0660c32df7d7218a6bc286b6452d686110038462f3a7aacadfd65 SHA512 e9396a9925d1d960a84067a78d694675d0212af603fb359d206474fa5b422505a9b0092ef8b44f75570cf7b6c26c93396372360b350926f900806cd7256cdc5b
 EBUILD tiled-1.3.5.ebuild 1321 BLAKE2B ce90087721e5494c1a894eed8ead807558a934e8bada5bb2edcbdb5df4d90abefba7bf9b539d695ac724396b06542df7b47151545b32fcc46693ba590b734dcd SHA512 0dd25ec9d68e69aebf01d64563fbea71638eb73b7e0058c9ad0b596dabccc60a3448c78e18136eb42b758baa06fa6d13a083964e8b6cef19f3d442088d3f49e3
+EBUILD tiled-1.4.0.ebuild 1321 BLAKE2B ab15b2fee6c14e086cb5bc4f01d994df292f9f147509b7f4adc06ee83893c85403492e5500279c32a4c9dfe27b745bb19dc2bcc78324f7118d3bd0ed29a99a27 SHA512 77f7c7f1840b9fc54bd78b35e02eaef1c0657084bbba21940405a83ced2820102e20fc8b174ce25f07a85185f1d647fe689e908bbff0bcb6bd1fc570b41b46f1
 MISC metadata.xml 297 BLAKE2B aaa357a6b59433dc43e1d4c13d13e700e56bb2cb54806defc8defb0880abe067ada43f24a0ca5e02e0acf2be8d294a907d066599cabc1873881092d2fd86fe38 SHA512 0875fcc01853efe23097a84f854432b8450ef0419a6329a813dc0e3d4eee46943ed7e80ff2df52700c822bba60cf56f2dbdac99a54cb2a3f58bf18db0baea069
diff --git a/dev-games/tiled/tiled-1.4.0.ebuild b/dev-games/tiled/tiled-1.4.0.ebuild
new file mode 100644
index 000000000000..a2edacbcb2a7
--- /dev/null
+++ b/dev-games/tiled/tiled-1.4.0.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 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.14:5
+	>=dev-qt/qtdeclarative-5.14:5
+	>=dev-qt/qtgui-5.14:5
+	>=dev-qt/qtnetwork-5.14:5
+	>=dev-qt/qtwidgets-5.14: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 ba628a6c3748..87f0c4de0a0c 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/lhs2tex/Manifest b/dev-haskell/lhs2tex/Manifest
index d24c9e87f636..909088f19f0b 100644
--- a/dev-haskell/lhs2tex/Manifest
+++ b/dev-haskell/lhs2tex/Manifest
@@ -1,6 +1,6 @@
 AUX lhs2tex-1.18.1-mandir.patch 790 BLAKE2B b0de9a0630e6801c48484a172555cc29c9db2cd7df86a10c2cbf6479beeab338685428ecb4050029125d212d5406f4918e6ef901deb658aa8f7e2441f1cc3396 SHA512 2d97ce0015e9844f1b8954ae658807116293ebea07e12d3a8553c48c515e02625b6390c6640ae17e68394a00d908a821783fa5a063a7e6ad10a80f436f73c4ae
 DIST lhs2tex-1.18.1.tar.gz 661053 BLAKE2B 64dbefde30d3a6a00c47d5b3397b6f7b4cb44bdf272768ed84f66db1d3e99e95df99f16e537d3959ef0566424151a44fdd70e975ac156abd2a5907bed8044520 SHA512 c44b4c5972b833ae41921d86e13c71ea60ac876a9996fb9a4e8d69ba25d000bbddb85f82d223b8a73381e3a4453c2757154a866fbbb48473f121dd88efb917d7
 DIST lhs2tex-1.19.tar.gz 658353 BLAKE2B 2a6d0ca1bc23fce29579d1f020ad9db178801177d1b0c171771d24470bf604359b85f5afab6aacc6a566fecca1d0edd26ddb01d97d8e9bc3c8bc98e042d47690 SHA512 63d4cb626c14dccc6e0989b358299078427d0c22ab726fd3d933bfef3b0d072a35113d132c87b61b7b8ac2c259c856e192d04e04d3eb744b958fc0df54c80abf
-EBUILD lhs2tex-1.18.1-r1.ebuild 913 BLAKE2B 8e2ebb8034c42dcaa6ae426ff1e237ed1639ce33d04bdfccb1c040b2383cb2fb96da902a5b331235f219c6d8ebe386a3aee1c7e82c75bfe65136c0ebb6d81464 SHA512 13051b0af111d2f673cc24ab06be79c19b376d32b216ce92c0575ad3c7943b21653a2603d4408d428513016c0fbcefda7c88f7c52309eb23152febdeb79a5e39
-EBUILD lhs2tex-1.19-r1.ebuild 913 BLAKE2B 8e2ebb8034c42dcaa6ae426ff1e237ed1639ce33d04bdfccb1c040b2383cb2fb96da902a5b331235f219c6d8ebe386a3aee1c7e82c75bfe65136c0ebb6d81464 SHA512 13051b0af111d2f673cc24ab06be79c19b376d32b216ce92c0575ad3c7943b21653a2603d4408d428513016c0fbcefda7c88f7c52309eb23152febdeb79a5e39
+EBUILD lhs2tex-1.18.1-r1.ebuild 965 BLAKE2B 2c1bf0a12918bd3107b7e28266faa195207e2b09305abf6c1e76e19002a348681d82036f69262cee2e548a5b29a6f98bc64b8c1ea72816ea2866e928aba5677a SHA512 c461305eb6d99a708fdbeb24044f3c11cfdd8e60a312a9bebd460a7e72da692d18657e6ce5015b0e060da7b649176149b80a090b3ceb9310331aa6907c530186
+EBUILD lhs2tex-1.19-r1.ebuild 965 BLAKE2B 2c1bf0a12918bd3107b7e28266faa195207e2b09305abf6c1e76e19002a348681d82036f69262cee2e548a5b29a6f98bc64b8c1ea72816ea2866e928aba5677a SHA512 c461305eb6d99a708fdbeb24044f3c11cfdd8e60a312a9bebd460a7e72da692d18657e6ce5015b0e060da7b649176149b80a090b3ceb9310331aa6907c530186
 MISC metadata.xml 358 BLAKE2B 3f5e83a9b333d6c597ffa57ca34c74186b48789ca4fbfb10087d31740e53ec215052d9a10b659d5f7006641a34fb47d83179f93b1eba92fa19514a238a38ae88 SHA512 dbc254e5e7925c09f99e64a91fba2f8f63d4b7a12c41a5c13bf315352885f24058cec0becc6e25e98153d2a82f49772f4bc61d1cb21ae5e9ad061b58771fb7fb
diff --git a/dev-haskell/lhs2tex/lhs2tex-1.18.1-r1.ebuild b/dev-haskell/lhs2tex/lhs2tex-1.18.1-r1.ebuild
index 8dbd1b377847..81391c36b1b2 100644
--- a/dev-haskell/lhs2tex/lhs2tex-1.18.1-r1.ebuild
+++ b/dev-haskell/lhs2tex/lhs2tex-1.18.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=5
@@ -17,7 +17,8 @@ IUSE=""
 
 # dev-texlive/texlive-mathscience contains 'stmaryrd' font used
 # for guide generation
-RDEPEND=">=dev-tex/polytable-0.8.2
+# dev-texlive/texlive-latexextra for polytable
+RDEPEND="dev-texlive/texlive-latexextra
 	dev-texlive/texlive-mathscience"
 
 DEPEND="${RDEPEND}
diff --git a/dev-haskell/lhs2tex/lhs2tex-1.19-r1.ebuild b/dev-haskell/lhs2tex/lhs2tex-1.19-r1.ebuild
index 8dbd1b377847..81391c36b1b2 100644
--- a/dev-haskell/lhs2tex/lhs2tex-1.19-r1.ebuild
+++ b/dev-haskell/lhs2tex/lhs2tex-1.19-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
@@ -17,7 +17,8 @@ IUSE=""
 
 # dev-texlive/texlive-mathscience contains 'stmaryrd' font used
 # for guide generation
-RDEPEND=">=dev-tex/polytable-0.8.2
+# dev-texlive/texlive-latexextra for polytable
+RDEPEND="dev-texlive/texlive-latexextra
 	dev-texlive/texlive-mathscience"
 
 DEPEND="${RDEPEND}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index bb1659580b10..1302c8d6486d 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index f79bdb6866ef..2d5c7b271a3e 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,7 +1,7 @@
 AUX java-config-2.2.0-prefix.patch 653 BLAKE2B 837f741e45b8228944e6287a57b05e933d85db00375ea68690e32b101da45b8150bcc6665d1d03ed6836724bbe43c4bfe1e89fb9449723fb4532dca4f4dcf01a SHA512 591591828ddadf76b5ed65811f7ed9e1e60583c5575926edf175ebc7ed1d76562ec980ec3bb530dedc7626f841dc7d143383bad25303399eac2ad49328d63dc0
 AUX java-config-2.2.0-py38.patch 1685 BLAKE2B 3fe59a1839a9fe1f954e6c96bdf42bd28f795881601b0e53353864ee4cdec57d891a5c1fee7e7f7060aba521da23934be8b5ea2717339e16f291671937df1af7 SHA512 9fa254fd108ec05d69d39260841fb8f946d6405b3fa37223af3b53117383bad94243c7a20f3f53de1a5d0609f433a14deb50fb7b9f857c56b41d1f3e8d5c4ef0
 DIST java-config-2.2.0.tar.bz2 51851 BLAKE2B 7b7c15dc988d2f5f54ebacba224f57193577e24f99a798657b40d83d723280562e314ba71319958a83be44defc6a48ac1114cce37eaeddea025ea31f26cf331a SHA512 a491cfe86bde8afadfc5b875740d79f9077526d8650ffb034fdad67a7ffa1b02646f67b1ef0eab7b0fe3ae57b5d767fa6a0d5593fe07416993d60588a8ed595a
-DIST java-config-2.3.tar.gz 26586 BLAKE2B 00fbc9bd606cb87bfde9f72837a062de540465a0299393016fc34543b89cf381a85b68ec5a884c0f76fe6b3188aa27498ed93e858187f2e51f6a23a2dcea7b67 SHA512 06e7c1ffe3fa0b903c5444ddcb9f72052773870c6543122440089a24bf0d8ec6c475e5f72a7ee9c3790432fdfeb786976af28e8aa7d18484168af16f5bb1b2ea
+DIST java-config-2.3.1.tar.gz 26165 BLAKE2B 948506663513db369d0ed8ffdfaa54c643989431430ea03440551a6a4b6725d8eec38f5cb4fde3b64e8936c0f43de0e65a7368469032c646c7b6b3bb7ec3ed13 SHA512 62db555b2d8a37a03b6a03aa133010848d54be33ba6e3c43807abefe665a9d8ff2790baf1af79b98d4a7bd3e9ba6bc64382a24c3fcf7038338123dabd146b7b4
 EBUILD java-config-2.2.0-r4.ebuild 1063 BLAKE2B ad07cf002078f3adba19c4c59d00f084640349d64a728758bfe968eedd372e3a6e47ef0ef9b45751ec9a51c17851c764e6edd5a1d6ccf063fbc2beae25165f52 SHA512 e2976feaf12b9e208f39b33457e72a410bc74844e1ac283efefb989d0028083c6c663f96b5eb1ac15c2b13214dfe18b44c1f8621bf2ed6b82ec1ac58713825b2
-EBUILD java-config-2.3.ebuild 981 BLAKE2B 0008b72941bb915b5b7286cbff96da84a0e46120b898acaca9ebf3d45dbe61d014ccfb7e845326798720c548e1937bcdca2bc3c66e5b641202b0481326376b5b SHA512 a3f91027edc4f8abecb6d76d904980b3608df04f6fc3356db0c32d90915dce64b374f1036e2f7a356e75be9d558e9e8f122959c02ded259a4c9e0b6d0a54ae88
+EBUILD java-config-2.3.1.ebuild 981 BLAKE2B 70fda09145a45807c9f8c45e3a77a2350640ab4694f45c7fe41d6a81198f71ac0d184e708c813747238d9ad1e26e257371e8f6444589ca37b9914338200476e6 SHA512 07c75d5aff5c125046303376f049a9020ce75f2434a19e5d92498e312a2ac4fe3fd2011a52f849fe90d435af5bbc7f2e52702b282044afa4f1715f35fa1aa2ee
 MISC metadata.xml 560 BLAKE2B a2cc44cb88cb8e0b80ef1fb56ed610fc10257a0858725fc01f793ae9275fc5ef6e37708c377ccf56425c08eacceea6e52a84eee35a7b2c239484080b6203c4d7 SHA512 9bd085048548f98faa638b23333ee0cf83b870c962b1aba62fa2df897393ce37c2b2e60736c988230252f29fc42e9dbe58ab8e720f7ec05a3e0b3d4c999e2c8a
diff --git a/dev-java/java-config/java-config-2.3.1.ebuild b/dev-java/java-config/java-config-2.3.1.ebuild
new file mode 100644
index 000000000000..8a71761b2180
--- /dev/null
+++ b/dev-java/java-config/java-config-2.3.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# jython depends on java-config, so don't add it or things will break
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="Java environment configuration query tool"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
+SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
+
+# baselayout-java is added as a dep till it can be added to eclass.
+RDEPEND="
+	!dev-java/java-config-wrapper
+	sys-apps/baselayout-java
+	sys-apps/portage[${PYTHON_USEDEP}]"
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# This replaces the file installed by java-config-wrapper.
+	dosym java-config-2 /usr/bin/java-config
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-java/java-config/java-config-2.3.ebuild b/dev-java/java-config/java-config-2.3.ebuild
deleted file mode 100644
index 3c47fcea4971..000000000000
--- a/dev-java/java-config/java-config-2.3.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
-
-# jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="Java environment configuration query tool"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
-SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
-
-# baselayout-java is added as a dep till it can be added to eclass.
-RDEPEND="
-	!dev-java/java-config-wrapper
-	sys-apps/baselayout-java
-	sys-apps/portage[${PYTHON_USEDEP}]"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# This replaces the file installed by java-config-wrapper.
-	dosym java-config-2 /usr/bin/java-config
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index fbb477b3e4a7..66f7ed3b26ed 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -10,7 +10,6 @@ DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713
 DIST apache-tomcat-7.0.103-src.tar.gz 5279592 BLAKE2B a8ab36fb84cf158fcd8b888276576cd523d211ab0f6fe0933f600d1990a8f68076f192177a574987e52440037c0ebefd3edaf3c84fee541afb076c5ad33cce9b SHA512 812fce83c7242ebc16dc2365f0b363f1fb2691cd6a2f19f1209ea467557c42ee2d108c8bef89f23bb4a20c800d0ecdb4afc37567ef8079966b4eec0331a2ef9b
 DIST apache-tomcat-7.0.104-src.tar.gz 5309794 BLAKE2B 0d4d5d668e1131bb533af1d56fe37ee1f5c252c2c4dd987e24aae67484f27805f88750b27248c6acfd0585eacd0d3f2155c723e9a25c8613652101944add2a15 SHA512 788eab3ac343815362decf4c0d5db91f3697cc669e7e051f93bf82905cc52f9b040d00b7e07f7b85bcf470e802418896a678f991e523e08a3ae5a2f212a53257
 DIST apache-tomcat-8.5.54-src.tar.gz 5689648 BLAKE2B 7d4c80cb86261bba46b1879d8f2b9218a63cfb069d32dfe72bd5d73baf87887cdff37c5841c44196ded1dbafcfe2d525cb09d8a15905c24600caf107255416cf SHA512 fe4a82fc58aed0df203abf03367f840d7ac498a3ba317eb2b08826e8ab5e705ea13b99f3af1e17878b2cf96271c5d9ff4e7cecf3b2631e061f1b02988449f9e2
-DIST apache-tomcat-8.5.55-src.tar.gz 5719386 BLAKE2B 4d5d20cf81e0a9aba1fe2b0fc2e9641696a2c7b4bfe1cefd1e86025612484ef06a8171e28722bcde91b671df5bd6e148b22c2fc267828109c6af762fe35f8fdb SHA512 214758bf4dc868c38fd92a19e405f3cd8e47008dee82610f8f7373d92ab5f8800c160a42c96c293f599b702c1c9d2967ca40d3410c1f6a14745edac4739f177d
 DIST apache-tomcat-8.5.56-src.tar.gz 5724546 BLAKE2B 623dc2d1f6808f012f19fdd0d914c4bb200e8328ab6b6855666c1db1704e198d069ff74d227bf51e8376c20daf0640002e5d6907edadfde294d8c62a64d55f83 SHA512 75529e567a7be48f2c1034f3eeada571478d0babb63fb2d368061573d7e64d5fc0a937304e2e2ffa956b5d8a403936c1543a93ee78b258b532939fb9ce80ef3d
 DIST apache-tomcat-9.0.34-src.tar.gz 5843244 BLAKE2B e4124c5986b0be26f17cf5e62443fa945ebea6dd713db6a7f96c8e4c7eed7d8e38610763adda928a7099c1574b00e072635576d9d29cc8ae1b98658f0e341acb SHA512 8ac8a916bfe2d3daf679dab9f299bc50f138f3cc9a6e8679a22862d122dea1e5ce3b9101472295398366f5b5d8477097a3cfb536f01136e72ff09d69b2f6c3df
 DIST apache-tomcat-9.0.35-src.tar.gz 5887816 BLAKE2B 8103a50a62aa527861fdc35ce8256d9ff0b7185bfa647e25c30c226f9850e88632e0c1e3575bac3a07513fe9c9777b4ef230275e685f48b0bbc733bc68ff7dad SHA512 8931c0f7c30f50d352879f8dfddc02fa59d7128813399e4eca3994be7cf2448e32e726a3cb8b387a5470ccbfa3fb74d0192c825b5f68bbb9fb6b43a9353cb24a
@@ -21,9 +20,8 @@ EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 962 BLAKE2B 6abe44ba77bb16d78f1529cac
 EBUILD tomcat-servlet-api-7.0.103.ebuild 901 BLAKE2B d0ee4ec8ba0e77f5c555ce53b1dad3558371a7667e55a3991b9753e135eedd67af5627b7c819620ea5f52c741f14b53fbc1fb1a6cd0cc680f62e0d651de6b22c SHA512 57e57d722ed3ae8c3cd99c0a0351242c6c74bc556babb4719db51ace5b73ea57eb538e69ce3b19c32cb33defcd1ffbaea99bf401d856539560c0a4cc9f5bd685
 EBUILD tomcat-servlet-api-7.0.104.ebuild 902 BLAKE2B 67cf14b835e7ce4ee75dc7739a31ffbc5c80d858087296ea98a1d1bc080079967350683f79d8b1db67977b9d82458a720cf7213a2ae4df8de72792fb81d3d771 SHA512 ab872c195c057c032267e3b1ac6e8093823f63d3b1e268dba9be610126b88ed0de2b3419d62ebc7379835c8cff0e109bdfa272abc777d67f70ada13daddae9a4
 EBUILD tomcat-servlet-api-8.5.54.ebuild 1005 BLAKE2B 81ce97c43775137f7c4760a58abe4d7a6192dded9e9cbcef8d29fa10b5cc0868740aa0683c94a349494232c64e42dfc0b09aeac3571260dcb6d8405dc233ec6e SHA512 520be8a3bb582a0b3dc783f5bc1763076d94a84a71e7678dc9d2def1d1c2be228097282667ecd9c3a5ba84b57b2403c5a446d45cfa249468932576df81e9d0ad
-EBUILD tomcat-servlet-api-8.5.55.ebuild 1007 BLAKE2B 8024ac34183cbcd4a4b682ec1dd586c8fef7c263cc0976e951249e6d71278bf1738e5224a5034c6d32611cc398ccd02b84621875d8c74d8980c4a62206d328ba SHA512 d2173e0e1be773992f67c77be7333e270a401d8f7e4c085a876f568e0e93055f9a7506ef8ae8774a98a576d58e0419f6367347ad34daf207b6e844b1d6b23edd
-EBUILD tomcat-servlet-api-8.5.56.ebuild 1008 BLAKE2B 1560f356f09d29d3cfa9c0e69a4bab73a412cd2d174745164d1d0efae7760cff91f21c6692bfc90adb5eaed11c090ec11aec3b77fd7d2116a0d2dfdf0eb7f4c0 SHA512 5f9233d432a3710356b31633a42f16e1a500423f8fb8722772d0f8f18e95b435debedc3e53d4a87adcfd12989570d4682cc7308990b8ff00b4d15e696d5864b8
+EBUILD tomcat-servlet-api-8.5.56.ebuild 1006 BLAKE2B 5e5f54bc4204bbc7d2543b89b551af46bc871dc5e7e1056f0bec42e525dadb35060626df00bfa71557cf463979e734d5eb3d7fa526257b200f77b63ce3c8b826 SHA512 0e33cb31632341a749c1d3aed42882b8789be0909eb2b2a5d9685148a16ce6f1a3fd2f669f23f2ce2caf2993c2745248a2adab5f879396fadb776f1e9e60866d
 EBUILD tomcat-servlet-api-9.0.34.ebuild 1000 BLAKE2B cf72ff5044130696fc74a4ee7cfd28e55e82077d8972c56ce9324007e5d5776e4ed7fc4d00e10ba8c08ffdcf6fc862ecd8a86f177d41fc5264d4a1f9d110f6d4 SHA512 a72ac598d71fd597c238b4fd9d7aa6365540874cb8f1ae5aff63f6bf32d0f7f8195c9a1248d05bf2fa7d03a7d12a11e18c4641ce29b0a60939f03110c9ac454d
 EBUILD tomcat-servlet-api-9.0.35.ebuild 1001 BLAKE2B 0c3a54000bca6bac53d53bce38b3caa85dff31bcefb40f257408ad2113fba2e44b819630307492287f26984fdf5e4d88b68337c39768141b4ff17dea1d1353b6 SHA512 757be3ac0c480bacc7c03cf7bf1341189c5848b66b9eeb5520c82e67dd7b704bfbf3eb9f80f54130796b814c15e5d46b35eb4e1d2aeef02183d3b0bad1c90ca8
-EBUILD tomcat-servlet-api-9.0.36.ebuild 1001 BLAKE2B 0c3a54000bca6bac53d53bce38b3caa85dff31bcefb40f257408ad2113fba2e44b819630307492287f26984fdf5e4d88b68337c39768141b4ff17dea1d1353b6 SHA512 757be3ac0c480bacc7c03cf7bf1341189c5848b66b9eeb5520c82e67dd7b704bfbf3eb9f80f54130796b814c15e5d46b35eb4e1d2aeef02183d3b0bad1c90ca8
+EBUILD tomcat-servlet-api-9.0.36.ebuild 1000 BLAKE2B cf72ff5044130696fc74a4ee7cfd28e55e82077d8972c56ce9324007e5d5776e4ed7fc4d00e10ba8c08ffdcf6fc862ecd8a86f177d41fc5264d4a1f9d110f6d4 SHA512 a72ac598d71fd597c238b4fd9d7aa6365540874cb8f1ae5aff63f6bf32d0f7f8195c9a1248d05bf2fa7d03a7d12a11e18c4641ce29b0a60939f03110c9ac454d
 MISC metadata.xml 343 BLAKE2B a80748e0afc76957694f9e0c5d086c538d4c88de015f5e66d7f1e0e21d38a2449f6986e708714610bc0ea3054b1330db2754f930c4500f213d8d6ca57f0b6c42 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.55.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.55.ebuild
deleted file mode 100644
index 2fb70f36de13..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.55.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
-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-8.5.56.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.56.ebuild
index b6216e53c6b0..4d0bf5c4de6e 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.56.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.56.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.36.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.36.ebuild
index 9ddac4eebd99..146f9bc7ea9f 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.36.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.36.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 558e9b2b25c1..1cf4592e2ee4 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index a1a8cb9fda44..f2cd0a7a72bc 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -4,9 +4,9 @@ AUX R-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch 469 BLAKE2B ee716b068316bbac0c07
 AUX R-3.6.2-no-gzip-doc.patch 443 BLAKE2B 1154e9f67f08e1d8b286152bd093789a0b94b3a2422bdb54d1d1d03729bd892811e68121309c41ef4323ed31efcea82f3e265b37445e9870bbd88c5413311345 SHA512 99678dbf809761a2991cd5cbe6ff5ba8d1c3e9388f69d94b30726caae4eee29ae50ee74aa24e3851d41559f804381ec18a2cd818b97b5417bf7ae660c93ad2a6
 DIST R-3.4.1.tar.gz 30200109 BLAKE2B 03602e9a48759caee8ce047fa6273df7a54af089de4489e21953c0e3fc7bfdf720d924f1e0167d3dbf65f63ed42ac10dea8b45289b921cda1c0e6d25a0063ebb SHA512 19bd50c87dc001ef947c15c1760f27ac8986ff6b43c6d90d3093ae184e42963027ef06faf31ec57ac9e519af7a35a2f53f8ea23ef75d800ebbd02945cedc4651
 DIST R-3.6.3.tar.gz 33308185 BLAKE2B f82751e21d3b502132f8f27d4fc47a921fb085a50c3da3b45e08fbbdd1ab3d42e89b4fa6653a570c21176d79f492277b1d0b86c3c9f4da1386d8b6e4771d4d2c SHA512 9b1dc78922e431bd1af81e6e560b10ad04d121718f680fed32db735d561fd40ea6028759976722db11559f1a78fe684119b766f0567128cb2ee5003aa87a0931
-DIST R-4.0.0.tar.gz 33173947 BLAKE2B 6b67ba5b008f1fd3d5fa3c92805c1e206ece64e821124e3b2d6f72a550ed8084699916b88d41dcc1985b57a286518dcf63d240503aeb2ae7fe31e66c0d30396d SHA512 fa8b684fd0c8a1c9784b8e0e749b34141e513a83d4f3b6792cdf97826264191e7484f6705014974c9268570e717e1a1d39f6a88225fc751189b6f51e1a303163
+DIST R-4.0.2.tar.gz 33191186 BLAKE2B 2d5b99c17a9df48a36871f18701efacfaa1e6bb89c0e5c6516fc20966547f34f9079dc52ab18ac7816e0fed25d6230076246e83dc648501553fa2d0cad67b8e4 SHA512 b7330613ee9795f54cde3dd9f7509be83d9156fb8577c17179727ee01450db27704249f68bd48e0331e2df09c2d9833d8bb019c4f9ce9ba669df74650ff2e842
 DIST R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion 13596 BLAKE2B 53338e4a1c4f68beb69247216e553dbcac47f660fbf032bfebf7a660e32d2cff5b11ed35411c52de7e1fd6e00bbf5b5ea19369a325fa0a38bd93d63dc3288cbd SHA512 9ccd19bb1b0c18a2f13035ccd6809447429e197e298fb4d1df808ef345d723b42f75a1b91c349f6dbb46e4a82e59ef33e11300c495d79b63d670d0c0f2b16a06
 EBUILD R-3.4.1.ebuild 6238 BLAKE2B 92ddb9e8d95509538d9be5048e36a4e084f22a095e77b1caffe840c54af031268819bd0b6cb4c92aa547920ab124ec8df70be7b2e9b4b9c4140256bd9adf38c1 SHA512 f0c5c8ff2c52bb948621aad27a44c9fa815380871f56ec531a645e8122e0b55a210e0e6831619237adc0a49dedec71fad4d9695c78a759e8bfe19ad2cb446c20
 EBUILD R-3.6.3-r1.ebuild 7188 BLAKE2B d79f440aa388348bcf4deb7bb34b9b16e16f5877486c71c3373f0b9698baf135d296e141e88dffaef61914a92943805543eb97ffd996128bda821e6a49de3420 SHA512 b6a232374b8f17c1d94b65c37aefd32aefb2d53e699fd09af9f02aa81ce06acd6a3932f0e1b9b2f9ddb1207ae23f16406b0d114b234c2043c6b1db4f6f774bf2
-EBUILD R-4.0.0.ebuild 7188 BLAKE2B 480de517645fce25a09ed00b706f2c70d8b3667d89a32880babd6e804b88f5ff8d99f2b2d234611be5a0ec824e69be94ecb0dbe7e2a1a9bbb66b9f6e0b87c190 SHA512 3f19262129c831ae7829fbcfbcb4e607e4b4c4590187835c4a1d10a64dceac1b486948a5a0e32c8ab9b23c2ae1beb75c7282e2ada11d06abb07b48ed0bb02c39
+EBUILD R-4.0.2.ebuild 7342 BLAKE2B 0d4dafa01c0a42076feddc4c23518f180fdebadfec6ff59893680d87bbcf646586b831eb4d943ea526dc431f2719cdb211ccdddfce50737bbb6b46dc26d47eff SHA512 e0173d2b15fc9b1905ef3d0d56712d3c5e42779a863dc73de5ff94f1deed687bac01d95cde149f7a002126206b0e01ece1c22662f71d6a502a32e19bba8ece60
 MISC metadata.xml 1140 BLAKE2B 774221eb531b4e80f0650b627b9ce53d9a2daf6342b1f19579d2d046e1c83aa497cc764870406b7ea3cf6cbae899cb6d460af92991d62bc6aea8da026a441822 SHA512 297c7e17998f92fb836b0599ce5221aee1ba1e7b1504edb348a602b695faf381d51f32f6118f5ef4bb353f02e92ffc5b3520b8d317d3e30a68a3cce0254fa6b1
diff --git a/dev-lang/R/R-4.0.0.ebuild b/dev-lang/R/R-4.0.0.ebuild
deleted file mode 100644
index 64a0a4e0b491..000000000000
--- a/dev-lang/R/R-4.0.0.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib toolchain-funcs
-
-# latest git commit for R bash completion: https://github.com/deepayan/rcompletion
-BCPV=78d6830e28ea90a046da79a9b4f70c39594bb6d6
-
-DESCRIPTION="Language and environment for statistical computing and graphics"
-HOMEPAGE="http://www.r-project.org/"
-SRC_URI="
-	mirror://cran/src/base/R-4/${P}.tar.gz
-	https://raw.githubusercontent.com/deepayan/rcompletion/${BCPV}/bash_completion/R -> ${PN}-${BCPV}.bash_completion"
-
-LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs test tiff tk X"
-REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )"
-
-# At least one package installation in the test suite requires TeX,
-# and will fail without it (bug #718056).
-BDEPEND="virtual/pkgconfig
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-fontsrecommended
-	)
-	test? ( virtual/latex-base )"
-DEPEND="
-	app-arch/bzip2:0=
-	app-arch/xz-utils:0=
-	app-text/ghostscript-gpl
-	dev-libs/libpcre:3=
-	net-libs/libtirpc
-	net-misc/curl
-	virtual/blas:0
-	|| ( sys-apps/coreutils app-misc/realpath )
-	cairo? ( x11-libs/cairo:0=[X=] x11-libs/pango:0= )
-	icu? ( dev-libs/icu:= )
-	jpeg? ( virtual/jpeg:0 )
-	lapack? ( virtual/lapack:0 )
-	perl? ( dev-lang/perl )
-	png? ( media-libs/libpng:0= )
-	readline? ( sys-libs/readline:0= )
-	tiff? ( media-libs/tiff:0= )
-	tk? ( dev-lang/tk:0= )
-	X? ( x11-libs/libXmu:0= x11-misc/xdg-utils )"
-
-RDEPEND="${DEPEND}
-	sys-libs/zlib:0[minizip]
-	java? ( >=virtual/jre-1.5 )"
-
-RESTRICT="minimal? ( test )
-	!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.4.1-parallel.patch
-	"${FILESDIR}"/${PN}-3.4.1-rmath-shared.patch
-	"${FILESDIR}"/${PN}-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch
-	"${FILESDIR}"/${PN}-3.6.2-no-gzip-doc.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		FORTRAN_NEED_OPENMP=1
-	fi
-	fortran-2_pkg_setup
-	filter-ldflags -Wl,-Bdirect -Bdirect
-	# avoid using existing R installation
-	unset R_HOME
-	# Temporary fix for bug #419761
-	if [[ ($(tc-getCC) == *gcc) && ($(gcc-version) == 4.7) ]]; then
-		append-flags -fno-ipa-cp-clone
-	fi
-}
-
-src_prepare() {
-	default
-
-	# fix packages.html for doc (gentoo bug #205103)
-	sed -e "s:../../../library:../../../../$(get_libdir)/R/library:g" \
-		-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}\"':" \
-		-i src/unix/Makefile.in || die "sed unix Makefile failed"
-
-	# fix HTML links to manual (gentoo bug #273957)
-	sed -e 's:\.\./manual/:manual/:g' \
-		-i $(grep -Flr ../manual/ doc) || die "sed for HTML links failed"
-
-	use lapack && \
-		export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
-
-	if use X; then
-		export R_BROWSER="$(type -p xdg-open)"
-		export R_PDFVIEWER="$(type -p xdg-open)"
-	fi
-	use perl && \
-		export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}"
-
-	# don't search /usr/local
-	sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die
-	# Fix for Darwin (OS X)
-	if use prefix; then
-		if [[ ${CHOST} == *-darwin* ]] ; then
-			sed -e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \
-				-e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \
-				-e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \
-				-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:" \
-				-i src/nmath/standalone/Makefile.in || die
-		else
-			append-ldflags -Wl,-rpath="${EROOT}/usr/$(get_libdir)/R/lib"
-		fi
-	fi
-	AT_M4DIR=m4
-	eautoreconf
-}
-
-src_configure() {
-	#	--with-system-tre \
-	# tre is patched from upstream
-	econf \
-		--enable-byte-compiled-packages \
-		--enable-R-shlib \
-		--disable-R-framework \
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
-		rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable java) \
-		$(use_enable nls) \
-		$(use_enable openmp) \
-		$(use_enable profile R-profiling) \
-		$(use_enable profile memory-profiling) \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs R-static-lib) \
-		$(use_with cairo) \
-		$(use_with icu ICU) \
-		$(use_with jpeg jpeglib) \
-		$(use_with lapack) \
-		$(use_with !minimal recommended-packages) \
-		$(use_with png libpng) \
-		$(use_with readline) \
-		$(use_with tiff libtiff) \
-		$(use_with tk tcltk) \
-		$(use_with tk tk-config "${EPREFIX}"/usr/$(get_libdir)/tkConfig.sh) \
-		$(use_with tk tcl-config "${EPREFIX}"/usr/$(get_libdir)/tclConfig.sh) \
-		$(use_with X x)
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}/fonts"
-	emake AR="$(tc-getAR)"
-	emake -C src/nmath/standalone \
-		shared $(use static-libs && echo static) AR="$(tc-getAR)"
-	use doc && emake info pdf
-}
-
-src_install() {
-	default
-	emake -j1 -C src/nmath/standalone DESTDIR="${D}" install
-
-	if use doc; then
-		emake DESTDIR="${D}" install-info install-pdf
-		dosym ../manual /usr/share/doc/${PF}/html/manual
-	fi
-
-	cat > 99R <<-EOF
-		LDPATH=${EROOT}/usr/$(get_libdir)/${PN}/lib
-		R_HOME=${EROOT}/usr/$(get_libdir)/${PN}
-	EOF
-	doenvd 99R
-	newbashcomp "${DISTDIR}"/${PN}-${BCPV}.bash_completion ${PN}
-	# The buildsystem has a different understanding of install_names than
-	# we require.  Since it builds modules like shared objects (wrong), many
-	# objects (all modules) get an incorrect install_name.  Fixing the build
-	# system here is not really trivial.
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		local mod
-		pushd "${ED}"/usr/$(get_libdir)/R > /dev/null
-		for mod in $(find . -name "*.dylib") ; do
-			mod=${mod#./}
-			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/R/${mod}" \
-				"${mod}"
-		done
-		popd > /dev/null
-	fi
-
-	# Users are encouraged to access some of the the R documentation
-	# interactively, through functions like "contributors()" that
-	# tries to open the "AUTHORS" file. Other files can be accessed
-	# by name with RShowDoc(), and the documentation for e.g. license()
-	# and RShowDoc() suggests a few of these names. Here we try to
-	# collect as many names as possible that a user might actually
-	# try to view through R, because if we don't decompress them,
-	# then R doesn't know what to do with 'em. Bug #556706.
-	INTERACTIVE_DOCS=(
-		AUTHORS
-		COPYING
-		FAQ
-		NEWS
-		THANKS
-	)
-
-	# Other data sources that are shipped as "documentation," but which
-	# need to be accessible via their original unmolested filenames.
-	INTERACTIVE_DATA=(
-		BioC_mirrors.csv
-		CRAN_mirrors.csv
-		KEYWORDS.db
-		NEWS.rds
-	)
-
-	NOCOMPRESS_DOCS=( "${INTERACTIVE_DOCS[@]}" "${INTERACTIVE_DATA[@]}" )
-
-	for f in "${NOCOMPRESS_DOCS[@]}"; do
-		docompress -x "/usr/share/doc/${PF}/${f}"
-	done
-}
-
-pkg_postinst() {
-	if use java; then
-		einfo "Re-initializing java paths for ${P}"
-		R CMD javareconf
-	fi
-}
diff --git a/dev-lang/R/R-4.0.2.ebuild b/dev-lang/R/R-4.0.2.ebuild
new file mode 100644
index 000000000000..83d1ecd9385a
--- /dev/null
+++ b/dev-lang/R/R-4.0.2.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib toolchain-funcs
+
+# latest git commit for R bash completion: https://github.com/deepayan/rcompletion
+BCPV=78d6830e28ea90a046da79a9b4f70c39594bb6d6
+
+DESCRIPTION="Language and environment for statistical computing and graphics"
+HOMEPAGE="http://www.r-project.org/"
+SRC_URI="
+	mirror://cran/src/base/R-4/${P}.tar.gz
+	https://raw.githubusercontent.com/deepayan/rcompletion/${BCPV}/bash_completion/R -> ${PN}-${BCPV}.bash_completion"
+
+LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs test tiff tk X"
+
+# One test required profiling in v4.0.2, check the upstream bug:
+#
+#   https://bugs.r-project.org/bugzilla/show_bug.cgi?id=17836
+#
+REQUIRED_USE="png? ( || ( cairo X ) )
+	jpeg? ( || ( cairo X ) )
+	tiff? ( || ( cairo X ) )
+	test? ( profile )
+"
+
+# At least one package installation in the test suite requires TeX,
+# and will fail without it (bug #718056).
+BDEPEND="virtual/pkgconfig
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-fontsrecommended
+	)
+	test? ( virtual/latex-base )"
+DEPEND="
+	app-arch/bzip2:0=
+	app-arch/xz-utils:0=
+	app-text/ghostscript-gpl
+	dev-libs/libpcre2:=
+	net-libs/libtirpc
+	net-misc/curl
+	virtual/blas:0
+	|| ( sys-apps/coreutils app-misc/realpath )
+	cairo? ( x11-libs/cairo:0=[X=] x11-libs/pango:0= )
+	icu? ( dev-libs/icu:= )
+	jpeg? ( virtual/jpeg:0 )
+	lapack? ( virtual/lapack:0 )
+	perl? ( dev-lang/perl )
+	png? ( media-libs/libpng:0= )
+	readline? ( sys-libs/readline:0= )
+	tiff? ( media-libs/tiff:0= )
+	tk? ( dev-lang/tk:0= )
+	X? ( x11-libs/libXmu:0= x11-misc/xdg-utils )"
+
+RDEPEND="${DEPEND}
+	sys-libs/zlib:0[minizip]
+	java? ( >=virtual/jre-1.5 )"
+
+RESTRICT="minimal? ( test )
+	!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.1-parallel.patch
+	"${FILESDIR}"/${PN}-3.4.1-rmath-shared.patch
+	"${FILESDIR}"/${PN}-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch
+	"${FILESDIR}"/${PN}-3.6.2-no-gzip-doc.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		FORTRAN_NEED_OPENMP=1
+	fi
+	fortran-2_pkg_setup
+	filter-ldflags -Wl,-Bdirect -Bdirect
+	# avoid using existing R installation
+	unset R_HOME
+	# Temporary fix for bug #419761
+	if [[ ($(tc-getCC) == *gcc) && ($(gcc-version) == 4.7) ]]; then
+		append-flags -fno-ipa-cp-clone
+	fi
+}
+
+src_prepare() {
+	default
+
+	# fix packages.html for doc (gentoo bug #205103)
+	sed -e "s:../../../library:../../../../$(get_libdir)/R/library:g" \
+		-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}\"':" \
+		-i src/unix/Makefile.in || die "sed unix Makefile failed"
+
+	# fix HTML links to manual (gentoo bug #273957)
+	sed -e 's:\.\./manual/:manual/:g' \
+		-i $(grep -Flr ../manual/ doc) || die "sed for HTML links failed"
+
+	use lapack && \
+		export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
+
+	if use X; then
+		export R_BROWSER="$(type -p xdg-open)"
+		export R_PDFVIEWER="$(type -p xdg-open)"
+	fi
+	use perl && \
+		export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}"
+
+	# don't search /usr/local
+	sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die
+	# Fix for Darwin (OS X)
+	if use prefix; then
+		if [[ ${CHOST} == *-darwin* ]] ; then
+			sed -e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \
+				-e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \
+				-e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \
+				-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:" \
+				-i src/nmath/standalone/Makefile.in || die
+		else
+			append-ldflags -Wl,-rpath="${EROOT}/usr/$(get_libdir)/R/lib"
+		fi
+	fi
+	AT_M4DIR=m4
+	eautoreconf
+}
+
+src_configure() {
+	#	--with-system-tre \
+	# tre is patched from upstream
+	econf \
+		--enable-byte-compiled-packages \
+		--enable-R-shlib \
+		--disable-R-framework \
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
+		rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable java) \
+		$(use_enable nls) \
+		$(use_enable openmp) \
+		$(use_enable profile R-profiling) \
+		$(use_enable profile memory-profiling) \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs R-static-lib) \
+		$(use_with cairo) \
+		$(use_with icu ICU) \
+		$(use_with jpeg jpeglib) \
+		$(use_with lapack) \
+		$(use_with !minimal recommended-packages) \
+		$(use_with png libpng) \
+		$(use_with readline) \
+		$(use_with tiff libtiff) \
+		$(use_with tk tcltk) \
+		$(use_with tk tk-config "${EPREFIX}"/usr/$(get_libdir)/tkConfig.sh) \
+		$(use_with tk tcl-config "${EPREFIX}"/usr/$(get_libdir)/tclConfig.sh) \
+		$(use_with X x)
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	emake AR="$(tc-getAR)"
+	emake -C src/nmath/standalone \
+		shared $(use static-libs && echo static) AR="$(tc-getAR)"
+	use doc && emake info pdf
+}
+
+src_install() {
+	default
+	emake -j1 -C src/nmath/standalone DESTDIR="${D}" install
+
+	if use doc; then
+		emake DESTDIR="${D}" install-info install-pdf
+		dosym ../manual /usr/share/doc/${PF}/html/manual
+	fi
+
+	cat > 99R <<-EOF
+		LDPATH=${EROOT}/usr/$(get_libdir)/${PN}/lib
+		R_HOME=${EROOT}/usr/$(get_libdir)/${PN}
+	EOF
+	doenvd 99R
+	newbashcomp "${DISTDIR}"/${PN}-${BCPV}.bash_completion ${PN}
+	# The buildsystem has a different understanding of install_names than
+	# we require.  Since it builds modules like shared objects (wrong), many
+	# objects (all modules) get an incorrect install_name.  Fixing the build
+	# system here is not really trivial.
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		local mod
+		pushd "${ED}"/usr/$(get_libdir)/R > /dev/null
+		for mod in $(find . -name "*.dylib") ; do
+			mod=${mod#./}
+			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/R/${mod}" \
+				"${mod}"
+		done
+		popd > /dev/null
+	fi
+
+	# Users are encouraged to access some of the the R documentation
+	# interactively, through functions like "contributors()" that
+	# tries to open the "AUTHORS" file. Other files can be accessed
+	# by name with RShowDoc(), and the documentation for e.g. license()
+	# and RShowDoc() suggests a few of these names. Here we try to
+	# collect as many names as possible that a user might actually
+	# try to view through R, because if we don't decompress them,
+	# then R doesn't know what to do with 'em. Bug #556706.
+	INTERACTIVE_DOCS=(
+		AUTHORS
+		COPYING
+		FAQ
+		NEWS
+		THANKS
+	)
+
+	# Other data sources that are shipped as "documentation," but which
+	# need to be accessible via their original unmolested filenames.
+	INTERACTIVE_DATA=(
+		BioC_mirrors.csv
+		CRAN_mirrors.csv
+		KEYWORDS.db
+		NEWS.rds
+	)
+
+	NOCOMPRESS_DOCS=( "${INTERACTIVE_DOCS[@]}" "${INTERACTIVE_DATA[@]}" )
+
+	for f in "${NOCOMPRESS_DOCS[@]}"; do
+		docompress -x "/usr/share/doc/${PF}/${f}"
+	done
+}
+
+pkg_postinst() {
+	if use java; then
+		einfo "Re-initializing java paths for ${P}"
+		R CMD javareconf
+	fi
+}
diff --git a/dev-lang/crystal/Manifest b/dev-lang/crystal/Manifest
index 1b1b9435e3e4..87327aa8e2a5 100644
--- a/dev-lang/crystal/Manifest
+++ b/dev-lang/crystal/Manifest
@@ -5,7 +5,6 @@ AUX crystal-0.27.0-gentoo-tests-long-unix-2.patch 469 BLAKE2B 66bcc1d0dd9582cac4
 AUX crystal-0.27.0-gentoo-tests-long-unix.patch 3317 BLAKE2B df1040abdb587ac3fffb8129d4f1bafc492e38ad5dcfdea5cfbf4426849b099c4d94dac61c93ae7fcae46b60dea1809f52ad373efcd89796a3c1f119614063c1 SHA512 a9ed819a864465e062b4d6a568f14fbb8adc1db01071c79164dede8b2b8d83e07b785cd8196826097de5119e0bdc7d6e194cf4e10cc677bd2bdf158d124c2ad2
 AUX crystal-0.27.0-max-age-0-test.patch 632 BLAKE2B d41416f4045b23d0a9c4e11e525d8537277090ee316d01cab9cce0373b07583b9e80a495c8f4db997fc4f1b15b17c080d590f8cb8b6f454dc1c0d1d48015a127 SHA512 7608cb37850e52af406fab0378f0748af7db9239f878720041d56751ce36e0f5874a79b1a971fdc6f261292d23868e3e35c9ddb0d3c10c2bb987767954a77988
 AUX crystal-0.31.0-verbose.patch 701 BLAKE2B 34b74f073edf2979074cfa9042c73945b4856c33ae5037a30e8e096c17939d4d041d569ef01236db5162ffd5574b6b5ba591861d7777c3cd70882f224108ce5c SHA512 c78d636ed7646fdab9ca5335ecd43ddaafeb8b7f0749a323e7d495df1e1d08093ab3cac582a7f2ddff1437da326c873d74ca7b474388e6cf3421e1318e2e5484
-AUX crystal-0.34.0-no-usr-lib.patch 506 BLAKE2B 373fbd5c963734a17c53385d36dc37fbe24a0886ac25b3badb56b8da802566499fb838016a3683f2d3c323118b7d0d942fffcdb71b938250b61c822bfc81f6e1 SHA512 2fd7c280a98390efbf7c9993e970dd8d541889ddedd27694d5fe3884860c717bb8304d66d1730ea7bb9ebeaa3b908656ce2c2a1ad4e5d454d0b11181456bcd91
 DIST crystal-0.35.1-1-linux-i686.tar.gz 28330633 BLAKE2B 1f393ad53f2643b4514de54192047f549cffa22b14afbf25d9de00bf815378ec65a5049a9eee28753dc13bc9fea40447be109f21b55518a6ed8f06353a0b26e6 SHA512 333c2cdbd40ef65de52c1056e6089628ed83daf1a1e9d5243e876b622545d767077b485003ae7efaedeb7807c03c40e6f356cbdcce4dab2319c1686da120dac0
 DIST crystal-0.35.1-1-linux-x86_64.tar.gz 26653426 BLAKE2B a4ab58e784af3cd0298057a35079dfb48c9ca8d56388394377b86d7475d143a07cc3a800cdee3c9af3054d249ac9b87808d86b25747fc8f9322d01f25a3e3dec SHA512 1cceea5742651e2708e19ea49a7a884500d21beec3eaed75fc9e4b82e7dabaa521143b6c576ec48d2f5e27951163fd8c2ae417f46a1847c68f6e91c9b2a9a72a
 DIST crystal-0.35.1.tar.gz 2349984 BLAKE2B bf9078c949499e3f8469a055908c23335b04f2a58ab323345bdcdf1de70d00cdfe3aae7baf93e5098e21852c59d1cd8a0fb4faa91c9877d7ef2347a5faeaa69c SHA512 0381568330802de5838f8e66600567817b60ba0087bb3cc2b5df2944c5c42779039b606c81e0207bef34082bf25331b590a8140830f65ba4106ae465f717000b
diff --git a/dev-lang/crystal/files/crystal-0.34.0-no-usr-lib.patch b/dev-lang/crystal/files/crystal-0.34.0-no-usr-lib.patch
deleted file mode 100644
index 4dc0b42d90a0..000000000000
--- a/dev-lang/crystal/files/crystal-0.34.0-no-usr-lib.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-On amd64 linux /usr/lib does not match default 64-bit ABI.
-
-Let's rely on default compiler and linker paths instead.
---- a/src/compiler/crystal/codegen/link.cr
-+++ b/src/compiler/crystal/codegen/link.cr
-@@ -106,7 +106,7 @@ module Crystal
- 
-     private def lib_flags_posix
-       library_path = ENV["LIBRARY_PATH"]?.try(&.split(':', remove_empty: true)) ||
--                     ["/usr/lib", "/usr/local/lib"]
-+                     [] of String
-       has_pkg_config = nil
- 
-       String.build do |flags|
diff --git a/dev-lang/duktape/Manifest b/dev-lang/duktape/Manifest
index 3fc7b21d874e..579a5a963fbb 100644
--- a/dev-lang/duktape/Manifest
+++ b/dev-lang/duktape/Manifest
@@ -1,6 +1,6 @@
 AUX duktape.pc 218 BLAKE2B 3864f90f3ec1d77733736e16f99c0bab796502d3306759106357cb500d038304dfd6dc9849c9cde2e77683bf1f38dc7707119b39b66a6b55961b802e8d679520 SHA512 0f4b4e20ea9b348ed8b69623ed4fa09c20a2a951ef4f281b6313961c4aa085be9fc511a948d67713a7d2d9dede984761d5409b25e09da1db10698eb615f7c6fb
-DIST duktape-2.2.1.tar.xz 966496 BLAKE2B fc458035fea9b3c5f26ac538b0ddb19ca0f93b8d20e3d51b3428e72a18797c15e6aeb6111ff05818e54529f199084b2803582d54b19040d16e58462405889449 SHA512 af78a1680cb796e1eedca78264a9c3344cd8149b3c54dc5109f21a0c65ee24097f6f18eceefbf336cda9eda7cb347a0484badfe765f3b93e1c1620b099999f25
 DIST duktape-2.4.0.tar.xz 1027744 BLAKE2B 9fb74b0586a5ccf5ef80d69955ab0ddb94428d463e300a558b5ab6e279d2c416b794434466604caa80581883df85f889694af1dd3ea0aaa4a3d53babb855f3ef SHA512 be6b7c73ae7c3419e8ced375fcff9680946e780b71d30e3be4e4e3b4b3a2710aa8f86530081c64958507a11fc215cacc5409c7d3a1d30b757838a00c748fa281
-EBUILD duktape-2.2.1.ebuild 980 BLAKE2B 1269eaec8defb134e5a7baf4478ef855efbd50763037826db314d7e91703f2e3fc8479923ec0cb0c9062c63e8d867cb8bd4d9937eb776083846efd3d06a97219 SHA512 8c3cddb808fdc353762b946a4128a0e9aae4a1b6025dc7157993988d6c10e094d5ac46a090734bd9a9cfaf3307f3b066c23941e227b87ea3cbd5793d8993138e
+DIST duktape-2.5.0.tar.xz 1031188 BLAKE2B 15d9190e9c723bacf8249ea31bf528793ca06e86d2697648192fee50b4ba2f7cf091e1392ac14a7a5c35b05a3ff5f200e0318cc8a4b873ad26f0c97683a2cb72 SHA512 230e298a91cb48407d7c2a4b7c85cf9d53151d550e2fd7ba6cb8f9115682abce295fb78a3c3cd22b4812ce86944dd6d28c2b25c3845668a17232e3a08ea63837
 EBUILD duktape-2.4.0.ebuild 984 BLAKE2B 639c3dbdb610048fc33134671a428deca1fe106f5f54cc7baee3d21b921265c63e168208501e6aaea0f91a578f2d33dd5b110d14f25a7d198542be944346a957 SHA512 7bcadb6b1e5a246bf2b62b3f3ccb7dfc50e9232508d86fbef1481b8b08fdd1b810e5010eff72fb8f88eb590f39ba711294bbd1b9207eeeb524032a57fb10170e
+EBUILD duktape-2.5.0-r1.ebuild 1075 BLAKE2B 0cb12b8e5dbd66d81f49d34b480dfdf65e67f7a98aae8c897b83bf3a3f69596fcfc5271d8943ea4654b356d800db200500ef27d838835ef1397496c1a8d07e33 SHA512 c4d322316d757d5f74e2962c5d516776ce4dd97d4f29f670b4c57cc51ea980be51c687628ad55a5f74b74eb6ee4e1aed941a491ab97093c8c60449ea794e6d08
 MISC metadata.xml 477 BLAKE2B 8aa33e556bbac581fbf57393f8ba92e731e03ab91df9c34f442bec4f02f9ce69d455673e5074b037bd1b134653f1c11850b4f20eb0fa282fb0aa22d9e5c8517d SHA512 72024950f8fdb4c54f48cafd73d139c52230108fa9ba032c72a2bc847ec2d760d280879b17fb032ee22e147a4b9dcab5281e69985a157711a9d03c75c55a06c5
diff --git a/dev-lang/duktape/duktape-2.2.1.ebuild b/dev-lang/duktape/duktape-2.2.1.ebuild
deleted file mode 100644
index 311fee357a5a..000000000000
--- a/dev-lang/duktape/duktape-2.2.1.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
-
-DESCRIPTION="Embeddable Javascript engine"
-HOMEPAGE="https://duktape.org"
-SRC_URI="https://duktape.org/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eapply_user
-
-	# Set install path
-	sed -i "s#INSTALL_PREFIX=/usr/local#INSTALL_PREFIX=${D::-1}/usr#" \
-			Makefile.sharedlibrary || die "failed to set install path"
-
-	# Edit pkgconfig
-	sed "s#VERSION#${PV}#" "${FILESDIR}/${PN}.pc" > "${S}/${PN}.pc" || die
-	sed -i "s#LIBDIR#$(get_libdir)#" "${S}/${PN}.pc" || die
-
-	# Set lib folder
-	sed -i "s#(INSTALL_PREFIX)/lib#(INSTALL_PREFIX)/$(get_libdir)#" \
-		Makefile.sharedlibrary || die
-
-	mv Makefile.sharedlibrary Makefile || die "failed to rename makefile"
-}
-
-src_install() {
-	dodir /usr/$(get_libdir)
-	dodir /usr/include
-	emake install
-
-	insinto /usr/$(get_libdir)/pkgconfig/
-	doins "${S}/${PN}.pc"
-}
diff --git a/dev-lang/duktape/duktape-2.5.0-r1.ebuild b/dev-lang/duktape/duktape-2.5.0-r1.ebuild
new file mode 100644
index 000000000000..096bdf229105
--- /dev/null
+++ b/dev-lang/duktape/duktape-2.5.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
+
+inherit toolchain-funcs
+
+DESCRIPTION="Embeddable Javascript engine"
+HOMEPAGE="https://duktape.org"
+SRC_URI="https://duktape.org/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64  ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	eapply_user
+
+	# Set install path
+	sed -i "s#INSTALL_PREFIX = /usr/local#INSTALL_PREFIX = ${D%/}/usr#" \
+			Makefile.sharedlibrary || die "failed to set install path"
+
+	# Edit pkgconfig
+	sed "s#VERSION#${PV}#" "${FILESDIR}/${PN}.pc" > "${S}/${PN}.pc" || die
+	sed -i "s#LIBDIR#$(get_libdir)#" "${S}/${PN}.pc" || die
+
+	# Set lib folder
+	sed -i "s#(INSTALL_PREFIX)/lib#(INSTALL_PREFIX)/$(get_libdir)#" \
+		Makefile.sharedlibrary || die
+
+	mv Makefile.sharedlibrary Makefile || die "failed to rename makefile"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dodir /usr/$(get_libdir)
+	dodir /usr/include
+	emake install
+
+	insinto /usr/$(get_libdir)/pkgconfig/
+	doins "${S}/${PN}.pc"
+}
diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest
index f5c2e94bbae0..373ea896e96b 100644
--- a/dev-lang/elixir/Manifest
+++ b/dev-lang/elixir/Manifest
@@ -1,4 +1,3 @@
-AUX elixir-1.10.2-test-regex-fix.patch 1092 BLAKE2B 132d75468b1128dc20a51d39cd7ea53640a89e037c10781aa368e965a303d4411ab176e92ff57c5109d28ae02f0e51f621f3816eaef9a65be6f93eb7c0e43bfb SHA512 98e0a19f5e911cfd930c15615c6a651b8510bdd01bd34994f3edaa475665fe4e1d284368ad685fe6acf461dd7ff4648c140fa949b93bcb62d645920c642d75d1
 AUX elixir-1.10.3-epmd-daemon.patch 512 BLAKE2B c767cf4336214396d953efe568f0302d6852ec5332575202c167f38553deb9878b69d0744ed8a4062bbcb996df840f759f390ddc0c5e467aeab99250dee5a72e SHA512 dfe12ca0b47529a29d87871c9b31728099f816a0bd416512dd2409686fe6ceeb0e80e9da322ff38df27600da3235d174b365c80b8cae0e55eaee328b1260bc0d
 AUX elixir-1.10.3-no-Q.patch 355 BLAKE2B 903e5a7149f6e7f7030a533ae437b0e40b97c82c6baa7f90c1dff37fedf96c2e821e98529007e2300a92b8b3e9284428d91d6ee45888da7d79b18d35dfd89e58 SHA512 21d28b63fee2877337c0df095cfa200ae11ec2f0c76556e971957bb92e2b8e9d811c939b1efa458c633b61d3525f47a8b04d1b6f23df04e50ffb3ed5225f7c18
 AUX elixir-1.9.1-disable-network-tests.patch 569 BLAKE2B fda6b9b99f80e81883723280de31933c1740167d41ef4783dc663bad277cf58b8782326abc4a72e0d989c513afb9cdf4494e7d79754b18d62baf75255a74aa45 SHA512 465831a389891680412d51d9209497d5b750ff0a5ff72d45807a7dba6ec7757156ee96048bbc81f46c9c24a5b13cdd5161539fdeb4ffcea655c407e29f6675fc
diff --git a/dev-lang/elixir/files/elixir-1.10.2-test-regex-fix.patch b/dev-lang/elixir/files/elixir-1.10.2-test-regex-fix.patch
deleted file mode 100644
index 01b27a050276..000000000000
--- a/dev-lang/elixir/files/elixir-1.10.2-test-regex-fix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 8491f0dc74f8bc89bb926b8130b45eaa5ba92c4b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@dashbit.co>
-Date: Sat, 28 Mar 2020 10:49:16 +0100
-Subject: [PATCH] Fix improper regex use, closes #9914
-
----
- lib/elixir/test/elixir/regex_test.exs | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/lib/elixir/test/elixir/regex_test.exs
-+++ b/lib/elixir/test/elixir/regex_test.exs
-@@ -91,8 +91,10 @@ defmodule RegexTest do
-     assert <<0xA0::utf8>> =~ ~r/[[:space:]]/u
-     assert <<0xA0::utf8>> =~ ~r/\s/u
- 
-+    # Erlang/OTP 23 raises badarg on invalid UTF-8.
-+    # Earlier versions simply would not match.
-+    assert catch_error(if <<?<, 255, ?>>> =~ ~r/<.>/u, do: flunk("failed"), else: raise("failed"))
-     assert <<?<, 255, ?>>> =~ ~r/<.>/
--    refute <<?<, 255, ?>>> =~ ~r/<.>/u
-   end
- 
-   test "ungreedy" do
-@@ -349,6 +351,6 @@ defmodule RegexTest do
-   end
- 
-   defp matches_escaped?(string, match) do
--    Regex.match?(~r/#{Regex.escape(string)}/simxu, match)
-+    Regex.match?(~r/#{Regex.escape(string)}/simx, match)
-   end
- end
--- 
-2.26.1
-
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 5b593c696293..a33878d1f3c9 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -13,7 +13,6 @@ DIST erlang-21.1.1.tar.gz 53854332 BLAKE2B 32ab508b5a305eb92eac9f49bd513374c5739
 DIST erlang-22.3.2.tar.gz 55856668 BLAKE2B d5d2ae17b8fb1b7c3da0c145e4e17d38e47d5291d6bc77228c9280eaa114630003f0e75cc0b6eafd21642a86448d8fd907d95c006cdfe6f18978e796e20585bd SHA512 02333fed57394012834452aff38d9a3340c52b109b14e444b6e7975ac3a65485de1deda6ae6c732a28f75ca2518000de576f70497118306699e35af5f249a0d1
 DIST erlang-22.3.4.tar.gz 55861416 BLAKE2B 881eb664ea449fa021cdb6daaeb998ea5f736eae0900ad67c1416c0e0e0888b212e1fd1fc0ee655f1c05821b56bae52f150c3f29c2eddbac205d2a6f2fce5494 SHA512 14e90efb40568a1fd7a32b82fcdf32df8ccbda938b9e538bb3b1a77d343ae16f5721abb3d47e8dd567d7aa91d1dea6da8b7ada8a5cd8d33c38ba324f1d65eca1
 DIST erlang-23.0.1.tar.gz 56387006 BLAKE2B 4ecbb5a4de0f83d80da179071d5bed7c6e7eca11f5f8f8c5681673967eaf6f0573240b9ac59e00e7162fdaa3d41e89b357263f47371f0ff9365b448a9f7cf4a9 SHA512 fc9114312327f2b7289078b29ae658a1100c860dfae03e892c1b316007b5ff286cfc301772b336eb1f5b983b3d5f507f03eff2917f418b1b9cb9714f42a59db4
-DIST erlang-23.0.tar.gz 56384864 BLAKE2B 8e1ec1e430ecf327884d0e2ebd0ae354469e46805624ce36dc8215aa99df73bda5de338efeec7a3d8a2c5439269e538c1d3636b89dd68a26ebf973f1359de311 SHA512 e5d1e4b52951234f8bd4f8db7bef59a330d2783aae317468e0b94ad23cd55a60afba5d3841efad49dfcda6d7ba0a51e60208bb6a950951683fd297df56636f83
 DIST erlang_doc_html_21.1.tar.gz 32692731 BLAKE2B a7fa8ebe1c876ab7eecd2dd46ffd4d288db6d308e0f131d53c26ee4b67a92cb6fcb89b6c880ef34df395c7ad61fcdc81eac32e0fcf7336be7d517263218146bc SHA512 0d659f55bfb01eecf140a310154724489ef56b6ccbe9ac30f6b053f598276721b80de7b5b3200707cf8a6e77b8854eae5453f655225f431fcc982550539f767f
 DIST erlang_doc_html_22.3.tar.gz 34041790 BLAKE2B 76372acf5d6a581fb97cac9fa8230f1505650e9398d0a8e6ed163718f6d64cbbb3b7c79a1b7129827482345ddf950be4a5d83f0dac44e173f0ef45b148b73faa SHA512 9199b6229b73a22e271c232ce03b83b65c265367062d57ca5babd23a2f0a088fde3054b25c65c1bf2cb714cb70354ce4324aa8e865db72beb1f788c27389558c
 DIST erlang_doc_html_23.0.tar.gz 36238699 BLAKE2B bce5fb1d766d3a795728cf7c00529129690f52e5dbe7363095cb7e63d5331a4dfc05c2042d24f10c7f3facbd187284aa323a92c0ed7515c1750aee4cd890fbd4 SHA512 bd0b1adf8639674d31152024e1351105249c6e6f93f28362e9e4b66ce6daadbe5eef5917a5889c926130e81bd000cfc44895ebaa309bf9a0c1c125713b715927
@@ -23,6 +22,5 @@ DIST erlang_doc_man_23.0.tar.gz 1383486 BLAKE2B 63a9989c26797fe07fbd0ccca0d8425d
 EBUILD erlang-21.1.1.ebuild 4646 BLAKE2B 50adc94870a8efc3d0762bcfd3dd21e9edb746ec0313fd9dd5f30fdffbb4441fd1967a47937c3d23cd7e2b6b10554208448ac52b4a2302e9fa28149226678087 SHA512 66b7743c497112da8a4c56cd6f9279e3ea88c672d0a6d2b311e828e7e057f2ff2950816dc294bd87e98d3f589bb67c0c0c24633a34df183a10ef61967aea2f7e
 EBUILD erlang-22.3.2.ebuild 4592 BLAKE2B 5878bb1e07cec281ed45e69d548be922dba88245f86948c24740e93c4cf5ae810e7c251fdd6960420513dae09b20fa2ed1bb82556b21385761a788305145d70f SHA512 7b2e131cf48313dbc38692ff5f4bd671347db050d85de41b9b7312ea23495b2ac5d62144810ac7f95478bfc14a3b1aeb39413b91dac2dd032fc079c8897591da
 EBUILD erlang-22.3.4.ebuild 4597 BLAKE2B 8ec18ffdd47e90c2d85c77d8be0ac3102d44e9f58e4fa9f67832ce5a43d6a35f55d98116684b800ec904e4785201e6cd218ec46ccf1f1bc13a2f1f44801f62df SHA512 207fc0f0d45a5d84ec5b49f212b8d87df831650e3d426db9ce4cd84e40407c19e2574010ef09b62e8d150a4bdbf9f4ea6284be7aaf31319b155d2b4e912f303f
-EBUILD erlang-23.0.1.ebuild 4596 BLAKE2B c541374e99ff6d966dcf25b8455be1c1083c5b80a2e28982946836b322cef0634de627cac5b7d76bf0143d80a7d8dbdf27b506db0d1e8e14fcf52b3c73bfdc98 SHA512 99d55e973f14a8b42a87c40d8d0ed3180c53785b920fb9b73bb388fb9abff04772f12543bba1555e9ac0363bc3121fc464a5e9eab96091b90e1d3548a3774ce5
-EBUILD erlang-23.0.ebuild 4592 BLAKE2B 5878bb1e07cec281ed45e69d548be922dba88245f86948c24740e93c4cf5ae810e7c251fdd6960420513dae09b20fa2ed1bb82556b21385761a788305145d70f SHA512 7b2e131cf48313dbc38692ff5f4bd671347db050d85de41b9b7312ea23495b2ac5d62144810ac7f95478bfc14a3b1aeb39413b91dac2dd032fc079c8897591da
+EBUILD erlang-23.0.1.ebuild 4592 BLAKE2B 5878bb1e07cec281ed45e69d548be922dba88245f86948c24740e93c4cf5ae810e7c251fdd6960420513dae09b20fa2ed1bb82556b21385761a788305145d70f SHA512 7b2e131cf48313dbc38692ff5f4bd671347db050d85de41b9b7312ea23495b2ac5d62144810ac7f95478bfc14a3b1aeb39413b91dac2dd032fc079c8897591da
 MISC metadata.xml 905 BLAKE2B c1277904d14789138212ad1c83291d30301558aba707d1eb43765573c32617bfcb0eea43acc80225870cf2fbab011920b64bbecbdd28d414d73eb3c86a00937c SHA512 f79228f075fc6ac58785bc8a6c574546674b7ddd6c4f7420cb616414cf5178c2fa08284668b0d863ae3638891567184d1e8a490e31c4e093724ebff5c177a461
diff --git a/dev-lang/erlang/erlang-23.0.1.ebuild b/dev-lang/erlang/erlang-23.0.1.ebuild
index f0e394d6e153..10e018b031dd 100644
--- a/dev-lang/erlang/erlang-23.0.1.ebuild
+++ b/dev-lang/erlang/erlang-23.0.1.ebuild
@@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
 # 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"
+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="
diff --git a/dev-lang/erlang/erlang-23.0.ebuild b/dev-lang/erlang/erlang-23.0.ebuild
deleted file mode 100644
index 10e018b031dd..000000000000
--- a/dev-lang/erlang/erlang-23.0.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# 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"
-)
-
-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
-		# Note: we explicitly install docs into:
-		#     /usr/share/doc/${PF}/{doc,lib,erts-*}
-		# To maintain that layout we gather everything in 'html-docs'.
-		# See bug #684376.
-		mkdir html-docs || die
-		mv "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* html-docs/ || die
-		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" html-docs/. )
-		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/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest
index 21e25b58b334..c2fa5fef2bd9 100644
--- a/dev-lang/gnat-gpl/Manifest
+++ b/dev-lang/gnat-gpl/Manifest
@@ -8,8 +8,13 @@ AUX gnat-gpl-2016-finalization.patch 8125 BLAKE2B dae1c3f3bc98c6d4e5638888857648
 AUX gnat-gpl-2016-gentoo.patch 2811 BLAKE2B 9bc0b4fe62229a05b446f029265f6c04762b7054d735cd22d73719370c8a91ae95d1ac1c546b95af608037f8447c932765434e8cd5fc5db1a7e77ec908c75425 SHA512 f75e22607e52cebc22a1f72e8548372ee7c36a2bd3a43cd995b406c35eb824c668f3188f239fcf39b85315c407ac16a27dad77b55035105e53b79218aaf6a34f
 AUX gnat-gpl-2016-profile.patch 5593 BLAKE2B fe874e0543be671a9ede195c3cb01b9902357df4b412eaf3bf300bf032abd6e0a26fe2fd0dc0e71528ce9a6e454b83d9621a437c9efab629086f354eb1b3ff9f SHA512 ea45d2fcf98f4859676afb01439639e54e30cced8dbaf12fd9562dd805bd35ed2711a618834fe3acc8ad855386e58c9aeed007d046e300b60bbe6155d07386b7
 AUX gnat-gpl-2017-gentoo.patch 4510 BLAKE2B 6884a6c098c4208423e0494e9db10d4529efc176653e71d1feae6bb1c795618acdc50e29e373ad1efda49a479b2238c885b3548a94d3db33d45fd04b968a8cbe SHA512 28decd292d70ddbc3b01a7251ab44b0fee76b5dfd05bb3bac6d62767cb6ba8ce46c8908d0feeb21209c761b18f1a5048f2f39bf5b65175616f02d3705c3c9e54
+AUX gnat-gpl-2017-libatomic-Werror.patch 558 BLAKE2B 8bf880b8979f4e03e4401b98e5156beaf6a4127d1ca66331801ce49b957ab60d3726e51ecc55b833981bccaba91c7966b1f14d8b518204aece0fdcfe9df0937e SHA512 4246b1bb570a5976d2a4ef843035fe706f13f8f5838515513265a2d12bd6c80fe09d2f93327e333bcd816dc225c9638ba919e0e0cd81c02ef96813b261d968a2
+AUX gnat-gpl-2017-libgomp-Werror.patch 575 BLAKE2B bf4f3d585b9b9439a94ce83325f18ca8a1a94a474ee561371466cae5b58a95f5b80ab8382f98b2baf1cecc400c6bead6c68a3e44a5bed0b8d6d0498fbfd41059 SHA512 4d42047c159df3fd9397c3a81b9a182c55aad9345d3328a50af7b3d4b8b67b6538fbab1edc709e3a5e754fdaa9802a12a1b8b3de002819c25f1f1babd88ab80e
+AUX gnat-gpl-2017-libitm-Werror.patch 543 BLAKE2B d29dfefdd81f529c9574f5339666ee49876f4d44d87bf7002a5baab348349e0e60b1180904cc4d0b90d0b3229cfb6bb41370fb69e1a2d57f2424503c3df67205 SHA512 9b626ce710476d5b361ab4b2bb06ad195ab043c76bcdf52197c74379ee2698d24d5a158ed6b42a84727c2e4937e7e6d3db52d7e45885d19103fcd68ef3d9b4a2
 AUX gnat-gpl-2017-ustat.patch 1325 BLAKE2B 35a55480e64b62932c13999e5f858b7e82a326a37244bf169e56df9998425941844783471a73bec719a3664d21444c57afa179a9df9d08253d318341b39372f7 SHA512 f829601cbe6e835746664cf5b7b1ddf71dcc4b45c65cd40818a7c9a5ed935e2e9127ae95744770a837f7be0df1680049db3287891233b782b9b0d78ce8eb5e22
 AUX gnat-gpl-2018-gentoo.patch 634 BLAKE2B ad330b625cb495a294a6fecc57ae097c1d19bc52a9f406229ef9afc75cb322aedb7441931b247668a4cba1804588dec6aa0a5d18ba54dbe7d7c3675cdb8f57fa SHA512 136d9de26a4690de7f87771903e75e7dc36353ea23a0d73ea395223729baf51abd531f166b86e6a5ff8332a246e4c35746936fc291cc895344c7a58765cb8cb5
+AUX gnat-gpl-2018-libsanitizer-p1.patch 1268 BLAKE2B ee6fef473572eeea162eaac8e4726c51f82034a07cc9cf3b3717b0d77149325108113da4e589ca30d4fb178bd55afbab8e2fe3e7c704d2f9f25a9815c9f4d088 SHA512 e4e68e1cccd3c20aa7e69b30d47f2eca89d39ba6cc966bab51635a01f3e2b787863ccf3a28f251921636e2693e06360ac15602d9dad5727ea0ad1bb2133880a1
+AUX gnat-gpl-2018-libsanitizer-p2.patch 2162 BLAKE2B 31fd332aaf66bd6b1a9675792744940c33d1e44743d0e3b4c07c8c0037acc7a728538dfe92a4599850426c255c774b65e90953c7dad45d9aac7f5114cd8ac57a SHA512 67bbd9bda8ec8bd7b44b81474dbf3601156cbebb5a0f0948553786bec979294c2786d8fc3cfad3c898b0561414b5bc15d5da0fdfa29bbfd7c9401237fd70bf56
 AUX gnat-gpl-2019-gentoo.patch 1408 BLAKE2B 5234c542cc33af3c1bcb256fbe266613ec2e9f0b21d143029bf527ee03b4b363b2de7467eb79fadf4c8e8d3f39e589cfa3c0fadee1723e87938c74b8547d5ecf SHA512 2b9f0081d7aae5c71f73ebf43683fde033966288a937769e9b49e21805f31b5f0b4190e31431def58fcc93cd09f9b0e061096cffe61616073612f53d7e3e724b
 DIST ecj-4.5.jar 1470676 BLAKE2B 793c10ba09fd8040c0e1181204141aea16780c9c9088e07126e00da2b510af2ad6f58d876357d7e98cbb02d783a3be434469d5de1df134ccb8cc508e45028d80 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e
 DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 BLAKE2B 96f5ba2028bc6e0ef71e009857c37118a54d13d30de24d697c85e5772f9f2b7853615648cf2e4ee81d8385f6518c64588c0b56675c00f95ef39fca2a808f075e SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517
@@ -35,7 +40,7 @@ DIST gnat-gpl-2016-src.tar.gz 8857249 BLAKE2B 3ff0fe247990e2a612ac989aa389e9ccae
 DIST gnat-gpl-2017-src.tar.gz 8783473 BLAKE2B b0415b42f4d3a5e8675591a5602ff0a96945670104064671a232c0c12271ee141a3a5d148b8507bdab83cb8a0677c57b78e690060088308c51732bad3715964f SHA512 ae7314a2241107ed4d962dce08306eeb34c5f11e26183935bbb1ccf3a5eb011d6457c1b6fcded93dd0ee9ba31d791971ebe2a5a5a0ae04ff80d87a670325a098
 DIST gnat-gpl-2018-src.tar.gz 8706578 BLAKE2B ba245fd91cc5263d5b8c159d9e75caf6bed21dcaa5fa43734af8775a4008ce5f96bfb84a8b5e6e734ff883314ab3219dacec3fe95a5baa33fb712bfb5ff8bce8 SHA512 0ff7e848ef77f7e772e2a1b01905307a91c332f32329456f5238c4b7eb46cc118709e8682a5fc826d98a7d99fd15a92c194f4a278f04bc465165cfa616cc3c2e
 EBUILD gnat-gpl-2016-r4.ebuild 4309 BLAKE2B d09b887127874269dae21ef5befa8643b49702b4f7934af0c5d06dd5c0bd3bf7255fa5c63c644b696738a127bd5e602cc88ace982738af7453c3a5523a10f730 SHA512 62b8d6f9c09b600119af3d8fac1130e8f366bcf234a82c4bf4ce84ff8799889b9ca462f0b884ee2f78bc1744c9042d55111e8fe5d3b6d0613928981fb27bd5f9
-EBUILD gnat-gpl-2017-r1.ebuild 3750 BLAKE2B be2513ac0e0f9c899b6660355d9417e83ac7ac3c200012bef5b817f4ba8ae916f81438fcc7478bb096b0271a40f83ae8f2a4b5f52a627fc71fe0458127a21c4e SHA512 4626e97ee7c0841bc78c4128584a07b6a4f0f0f42e11b67aab0e569a00c6ec02a0bfb3cb78b740bd1e3430fc5bbcf80831ccadc7dfd1673594a14c51186563e2
-EBUILD gnat-gpl-2018-r3.ebuild 3760 BLAKE2B ffd8d01aecf4c70d9f00176c3d71b8c71fbe0913618e4350c77dbe4d3425376720b10e2a57e30254fb1924c9862a433c1640ab29a036b6faa0e627d3cb6c88b2 SHA512 630636ebac26b66014ffd389faff5693ec40718db7dc9649233c367bbce68d295c31fdb18c896c9b1ce51c57e064db79267c88d5a5e7f9a3f81e17a10ed28724
+EBUILD gnat-gpl-2017-r1.ebuild 3895 BLAKE2B 2f9e145372267d9ecc971bb4de65bacb13eceb79cdda9c425d6e1b9dcec301daecbb605b2333cbaaf13a7eb68b1e97ebe7d2feb6a13103edebf41da04d5039fb SHA512 f646e5a21721ee83f21e7801f3693880b78907bc5985473349a6a22c9eac30bfeaed2d69cedcb3d165566525a26a8989df05a6e51372e6d4293e272a3c3f6bf0
+EBUILD gnat-gpl-2018-r3.ebuild 3858 BLAKE2B 4f3e1f2d5ae63df871f8037b223b13c0dedba5f4ce2440dd443d9cd8a9de4931e14ebad13a2f8f1fb00d8a3f62b3afb8e990d3ae7089b6d3b8164d9c5793049f SHA512 419f760f4ba7c2bfa394cdfb5b3406867cef2ea8887a4372692d6d35d022ab4e23872c79395f9a5337e23cfd201545062a2dd7318e861a3f3454ef02c4f45fa7
 EBUILD gnat-gpl-2019-r2.ebuild 3603 BLAKE2B 2df7cbc37b3080ae88c911fa75c977f48ba69e8f8d52ddfe8bca7f2f558a4a8362bfc1ab9285806a004ef70ea11dd89747214094caa8ad9aa48db89af33107bf SHA512 3c05ab26066429d83dd6efff65fdeb3e91f05446a83d8b4fc68b3d534a4c5e7ef6769f16b5d02b00747e68cc617a5b7035fd011721b9b4916b52245419405cec
 MISC metadata.xml 2217 BLAKE2B 3862fbb5ca8625a16c4031de574ff280c9aef0522dee6a8578615d5161daefaf636c8564cb4995e0096ff74728c9bb68e61af93c799c736c1f0fb69b34a4d1d3 SHA512 5880952bc0f2de368250178859059204fc527dd8e3b178ef689e5f1cebae90dd65840658afeda3f1ac18115ef6023b9ebea45a485e56dcfec719ce091f36c274
diff --git a/dev-lang/gnat-gpl/files/gnat-gpl-2017-libatomic-Werror.patch b/dev-lang/gnat-gpl/files/gnat-gpl-2017-libatomic-Werror.patch
new file mode 100644
index 000000000000..0550722d170b
--- /dev/null
+++ b/dev-lang/gnat-gpl/files/gnat-gpl-2017-libatomic-Werror.patch
@@ -0,0 +1,19 @@
+libatomic does not respect --disable-werror
+
+https://bugs.gentoo.org/475350
+--- a/libatomic/configure.ac
++++ b/libatomic/configure.ac
+@@ -4282,4 +4282,4 @@ save_CFLAGS="$CFLAGS"
+ # Add -Wall -Werror if we are using GCC.
+ if test "x$GCC" = "xyes"; then
+-  XCFLAGS="$XCFLAGS -Wall -Werror"
++  XCFLAGS="$XCFLAGS -Wall"
+ fi
+--- a/libatomic/configure
++++ b/libatomic/configure
+@@ -4282,4 +4282,4 @@ save_CFLAGS="$CFLAGS"
+ # Add -Wall -Werror if we are using GCC.
+ if test "x$GCC" = "xyes"; then
+-  XCFLAGS="$XCFLAGS -Wall -Werror"
++  XCFLAGS="$XCFLAGS -Wall"
+ fi
diff --git a/dev-lang/gnat-gpl/files/gnat-gpl-2017-libgomp-Werror.patch b/dev-lang/gnat-gpl/files/gnat-gpl-2017-libgomp-Werror.patch
new file mode 100644
index 000000000000..416808a63b15
--- /dev/null
+++ b/dev-lang/gnat-gpl/files/gnat-gpl-2017-libgomp-Werror.patch
@@ -0,0 +1,20 @@
+libgomp does not respect --disable-werror
+
+https://bugs.gentoo.org/229059
+http://gcc.gnu.org/PR38436
+--- a/libgomp/configure.ac
++++ b/libgomp/configure.ac
+@@ -4282,4 +4282,4 @@ save_CFLAGS="$CFLAGS"
+ # Add -Wall -Werror if we are using GCC.
+ if test "x$GCC" = "xyes"; then
+-  XCFLAGS="$XCFLAGS -Wall -Werror"
++  XCFLAGS="$XCFLAGS -Wall"
+ fi
+--- a/libgomp/configure
++++ b/libgomp/configure
+@@ -4282,4 +4282,4 @@ save_CFLAGS="$CFLAGS"
+ # Add -Wall -Werror if we are using GCC.
+ if test "x$GCC" = "xyes"; then
+-  XCFLAGS="$XCFLAGS -Wall -Werror"
++  XCFLAGS="$XCFLAGS -Wall"
+ fi
diff --git a/dev-lang/gnat-gpl/files/gnat-gpl-2017-libitm-Werror.patch b/dev-lang/gnat-gpl/files/gnat-gpl-2017-libitm-Werror.patch
new file mode 100644
index 000000000000..27181e02cfbd
--- /dev/null
+++ b/dev-lang/gnat-gpl/files/gnat-gpl-2017-libitm-Werror.patch
@@ -0,0 +1,19 @@
+libitm does not respect --disable-werror
+
+https://bugs.gentoo.org/475350
+--- a/libitm/configure.ac
++++ b/libitm/configure.ac
+@@ -4282,4 +4282,4 @@ save_CFLAGS="$CFLAGS"
+ # Add -Wall -Werror if we are using GCC.
+ if test "x$GCC" = "xyes"; then
+-  XCFLAGS="$XCFLAGS -Wall -Werror"
++  XCFLAGS="$XCFLAGS -Wall"
+ fi
+--- a/libitm/configure
++++ b/libitm/configure
+@@ -4282,4 +4282,4 @@ save_CFLAGS="$CFLAGS"
+ # Add -Wall -Werror if we are using GCC.
+ if test "x$GCC" = "xyes"; then
+-  XCFLAGS="$XCFLAGS -Wall -Werror"
++  XCFLAGS="$XCFLAGS -Wall"
+ fi
diff --git a/dev-lang/gnat-gpl/files/gnat-gpl-2018-libsanitizer-p1.patch b/dev-lang/gnat-gpl/files/gnat-gpl-2018-libsanitizer-p1.patch
new file mode 100644
index 000000000000..80cc074d7f34
--- /dev/null
+++ b/dev-lang/gnat-gpl/files/gnat-gpl-2018-libsanitizer-p1.patch
@@ -0,0 +1,32 @@
+From 54d87ffe4b34052f159ac5b72b250129ce813b2a Mon Sep 17 00:00:00 2001
+From: Jakub Jelinek <jakub@redhat.com>
+Date: Fri, 14 Feb 2020 12:33:27 +0100
+Subject: [PATCH] backport: re PR sanitizer/92154 (new glibc breaks arm
+ bootstrap due to libsanitizer)
+
+	Backported from mainline
+	2019-10-22  Tamar Christina  <tamar.christina@arm.com>
+
+	PR sanitizer/92154
+	* sanitizer_common/sanitizer_platform_limits_posix.cc:
+	Cherry-pick compiler-rt revision r375220.
+---
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -1147,8 +1147,12 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid);
+ CHECK_SIZE_AND_OFFSET(ipc_perm, gid);
+ CHECK_SIZE_AND_OFFSET(ipc_perm, cuid);
+ CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);
+-#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)
++#if (!defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)) && \
++    !defined(__arm__)
+ /* On aarch64 glibc 2.20 and earlier provided incorrect mode field.  */
++/* On Arm glibc 2.31 and later provide a different mode field, this field is
++   never used by libsanitizer so we can simply ignore this assert for all glibc
++   versions.  */
+ CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
+ #endif
+ 
+-- 
+2.25.2
+
diff --git a/dev-lang/gnat-gpl/files/gnat-gpl-2018-libsanitizer-p2.patch b/dev-lang/gnat-gpl/files/gnat-gpl-2018-libsanitizer-p2.patch
new file mode 100644
index 000000000000..bdd8dcbe3d02
--- /dev/null
+++ b/dev-lang/gnat-gpl/files/gnat-gpl-2018-libsanitizer-p2.patch
@@ -0,0 +1,59 @@
+From dbdf86838aaaef76620c00c53096cfe157d5af6e Mon Sep 17 00:00:00 2001
+From: Jakub Jelinek <jakub@redhat.com>
+Date: Fri, 14 Feb 2020 12:38:30 +0100
+Subject: [PATCH] backport: re PR sanitizer/92154 (new glibc breaks arm
+ bootstrap due to libsanitizer)
+
+	Backported from mainline
+	2019-11-26  Jakub Jelinek  <jakub@redhat.com>
+
+	PR sanitizer/92154
+	* sanitizer_common/sanitizer_platform_limits_posix.h: Cherry-pick
+	llvm-project revision 947f9692440836dcb8d88b74b69dd379d85974ce.
+	* sanitizer_common/sanitizer_platform_limits_posix.cc: Likewise.
+---
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -1147,12 +1147,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid);
+ CHECK_SIZE_AND_OFFSET(ipc_perm, gid);
+ CHECK_SIZE_AND_OFFSET(ipc_perm, cuid);
+ CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);
+-#if (!defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)) && \
+-    !defined(__arm__)
+-/* On aarch64 glibc 2.20 and earlier provided incorrect mode field.  */
+-/* On Arm glibc 2.31 and later provide a different mode field, this field is
+-   never used by libsanitizer so we can simply ignore this assert for all glibc
+-   versions.  */
++#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31)
++/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit
++   on many architectures.  */
+ CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
+ #endif
+ 
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
+@@ -210,20 +210,13 @@ namespace __sanitizer {
+     unsigned long __unused1;
+     unsigned long __unused2;
+ #elif defined(__sparc__)
+-# if defined(__arch64__)
+     unsigned mode;
+-    unsigned short __pad1;
+-# else
+-    unsigned short __pad1;
+-    unsigned short mode;
+     unsigned short __pad2;
+-# endif
+     unsigned short __seq;
+     unsigned long long __unused1;
+     unsigned long long __unused2;
+ #else
+-    unsigned short mode;
+-    unsigned short __pad1;
++    unsigned int mode;
+     unsigned short __seq;
+     unsigned short __pad2;
+ #if defined(__x86_64__) && !defined(_LP64)
+-- 
+2.25.2
+
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild
index 4e65591d29ce..bff11256c1f6 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild
@@ -125,6 +125,9 @@ src_prepare() {
 	eapply "${FILESDIR}/${P}-ustat.patch"
 
 	toolchain_src_prepare
+	eapply "${FILESDIR}"/${P}-libgomp-Werror.patch
+	eapply "${FILESDIR}"/${P}-libatomic-Werror.patch
+	eapply "${FILESDIR}"/${P}-libitm-Werror.patch
 }
 
 src_configure() {
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild
index 7dbb27439ea7..bb4782b8d4be 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild
@@ -123,6 +123,8 @@ src_prepare() {
 	EPATCH_EXCLUDE+=" 95_all_libsanitizer-avoidustat.h-glibc-2.28-part-1.patch"
 	EPATCH_EXCLUDE+=" 98_all_msp430-partial-int.patch"
 	toolchain_src_prepare
+	eapply "${FILESDIR}"/${P}-libsanitizer-p1.patch
+	eapply "${FILESDIR}"/${P}-libsanitizer-p2.patch
 }
 
 src_configure() {
diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest
index d8bda5fa002d..fd1597133c2e 100644
--- a/dev-lang/ispc/Manifest
+++ b/dev-lang/ispc/Manifest
@@ -1,4 +1,12 @@
+AUX ispc-1.13.0-cmake-gentoo-release.patch 507 BLAKE2B e67be17f40dce55895ce307bd5383ad3f9dc8ec460c7195e23ce344f3a0324c53f9f69b695b6feb70d18da813d5d855d675a00e8dfd3e651aaaebf510de1138b SHA512 bdfd7d3f023ace4a0209201e05b7528e50cff644794bc48b5160d8051c2d70dad6690e509ca69102b08843ebb5fd7a76241954b22a0bb1f3c4714708df405d65
+AUX ispc-1.13.0-llvm-10.patch 4670 BLAKE2B 31fa72f49af116e253b45cd1a5750fcc32cb0b9986582b6501326194903d6c56fc8efcc0b86975eb153c725b5310c613012d670c2b6badf0b4da04204d4df38b SHA512 b8c83e8fd290b2c37e1ca5cec158e4aec4c0c5aa291069b0935851bbd8198a3784ee75a6bf38d1c57ee69f6712d10e292af809d1ac38199514cc45c2f1a82994
+AUX ispc-1.13.0-werror.patch 737 BLAKE2B 13ac7eb6f9db4a7379d5acd1f0fa8f44ddca7290329c1231c1b515b374438f5119d9e129c8b5326cfd084956a4ba005549bd30b67a9f64034e0ade8218b8f50c SHA512 254e0e21db59f2b8768d0953c9b0950bb7d860ea9eab7c4d450b3b006382959ab60eb650df9c1ddd4fda7628d5040f7b4779369cf67a99012d5fc2c4b9ef2f7b
+AUX ispc-9999-cmake-gentoo-release.patch 507 BLAKE2B e67be17f40dce55895ce307bd5383ad3f9dc8ec460c7195e23ce344f3a0324c53f9f69b695b6feb70d18da813d5d855d675a00e8dfd3e651aaaebf510de1138b SHA512 bdfd7d3f023ace4a0209201e05b7528e50cff644794bc48b5160d8051c2d70dad6690e509ca69102b08843ebb5fd7a76241954b22a0bb1f3c4714708df405d65
+AUX ispc-9999-llvm-10.patch 4670 BLAKE2B 31fa72f49af116e253b45cd1a5750fcc32cb0b9986582b6501326194903d6c56fc8efcc0b86975eb153c725b5310c613012d670c2b6badf0b4da04204d4df38b SHA512 b8c83e8fd290b2c37e1ca5cec158e4aec4c0c5aa291069b0935851bbd8198a3784ee75a6bf38d1c57ee69f6712d10e292af809d1ac38199514cc45c2f1a82994
+AUX ispc-9999-werror.patch 737 BLAKE2B 13ac7eb6f9db4a7379d5acd1f0fa8f44ddca7290329c1231c1b515b374438f5119d9e129c8b5326cfd084956a4ba005549bd30b67a9f64034e0ade8218b8f50c SHA512 254e0e21db59f2b8768d0953c9b0950bb7d860ea9eab7c4d450b3b006382959ab60eb650df9c1ddd4fda7628d5040f7b4779369cf67a99012d5fc2c4b9ef2f7b
+DIST ispc-1.13.0.tar.gz 19202295 BLAKE2B 5fae81429acbda0d65d33e56609d05fb8b5a7db6dd0af5ff779d1e8954f6a98d1fcb0f7ecf0c1b9813630026557c21c2a70bfc87ed75959a8bd24e06fcd2e351 SHA512 d23c127beb9bb17e1ad2509f9ad51dd660c473458b939a6b64ca7f6319b3c2f25318ea2ceac00e4100a059f3f67fb97b6973f18e3432c82ff9691f2a08d15d5d
 DIST ispc-1.9.2.tar.gz 19283765 BLAKE2B 500cca8a69a78ad9a21dc1e39dcb3ed01730e78deed61e4871ce5a9761829c80ac7b1b987d8e8a48c34b67ac96692b2c5026cfb5059a32c71e228c73550584eb SHA512 77a66086cbfd6c4dc855b3137a270cc40f24829255639aee5f562b0831c21938157667b20cfadc660cd67525c47e2e73b46692f7a11bf0c834dc60b69d40d76d
+EBUILD ispc-1.13.0.ebuild 1117 BLAKE2B b5ebcac60a1c4adf8753ab5db9721ce69217b3368bf2682c95e1db30e6ccc1e3e1f96574005433cc000d483184161ad1c829dbfee1ace996c389ed90570e8de5 SHA512 1b2389d5c1a2d068240b6e76feff615e56179d08a003a2eca4e8bb756aa351dbd64d08f8cb5353da2868b1407b496a25f22dd34149216006f8340f675e8ec610
 EBUILD ispc-1.9.2.ebuild 1100 BLAKE2B 4bfdcf2d708ddc9e5c9e84f9a8adbab0111ceda9c5a10d7b11b21ef21cb24e56cca857e9cde0d593b0b1c49f1098a1ab0035d239ccc1b268ce1d5832c5979463 SHA512 5595b9a47e860adbfd6c7c9e3fa94f39f68f3d167cf17f3da964e51e8dfff170cf9ef6dcbee8ea82f1813f9a66d3724721ad2b44269e69703842a80d2aa25129
-EBUILD ispc-9999.ebuild 1100 BLAKE2B 4bfdcf2d708ddc9e5c9e84f9a8adbab0111ceda9c5a10d7b11b21ef21cb24e56cca857e9cde0d593b0b1c49f1098a1ab0035d239ccc1b268ce1d5832c5979463 SHA512 5595b9a47e860adbfd6c7c9e3fa94f39f68f3d167cf17f3da964e51e8dfff170cf9ef6dcbee8ea82f1813f9a66d3724721ad2b44269e69703842a80d2aa25129
-MISC metadata.xml 327 BLAKE2B 54a38462b0fe6a1ed78bf0098fa3e85c3c7e745e4777a90d9da67286f8f4bd5b3b1df035de5274c6c2cc3f04c4fd454bacf93e6a09ebf6ddb6fa3b832ec82b77 SHA512 94078b0d77481ac78255fc9fbceec4e204b7fa20da59f103d163eb22f33fb78d0dd2ae039157666f6e80eee81922a6e89acc2ddf89d29275ff19ce5e9391ca83
+EBUILD ispc-9999.ebuild 1117 BLAKE2B b5ebcac60a1c4adf8753ab5db9721ce69217b3368bf2682c95e1db30e6ccc1e3e1f96574005433cc000d483184161ad1c829dbfee1ace996c389ed90570e8de5 SHA512 1b2389d5c1a2d068240b6e76feff615e56179d08a003a2eca4e8bb756aa351dbd64d08f8cb5353da2868b1407b496a25f22dd34149216006f8340f675e8ec610
+MISC metadata.xml 241 BLAKE2B 26c98e9f68d20d2275e5a9aef2d4c1cf74bd65e331e2e4869297a0a4d2b4dccab2e7709ad9ff844b973a97da0ee6eaae4fe17c6446ca06ed63f46804c8af5a82 SHA512 b9bb777e446879d214fab1adfa4b9dca1d3bd11c4084dfa449fb16d1896da27b85e11b869ed76b7b492814a1899b5fb00dbbeded579a0ed00666d4b204ddee14
diff --git a/dev-lang/ispc/files/ispc-1.13.0-cmake-gentoo-release.patch b/dev-lang/ispc/files/ispc-1.13.0-cmake-gentoo-release.patch
new file mode 100644
index 000000000000..b89e61504008
--- /dev/null
+++ b/dev-lang/ispc/files/ispc-1.13.0-cmake-gentoo-release.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 13e66268..27ff8364 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -137,7 +137,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin )
+ 
+ if(CMAKE_BUILD_TYPE)
+     # Validate build type
+-    set(CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo")
++    set(CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo;Gentoo")
+ 
+     string(FIND "${CONFIGURATION_TYPES}" "${CMAKE_BUILD_TYPE}" MATCHED_CONFIG)
+     if (${MATCHED_CONFIG} EQUAL -1)
diff --git a/dev-lang/ispc/files/ispc-1.13.0-llvm-10.patch b/dev-lang/ispc/files/ispc-1.13.0-llvm-10.patch
new file mode 100644
index 000000000000..6911a76d9e18
--- /dev/null
+++ b/dev-lang/ispc/files/ispc-1.13.0-llvm-10.patch
@@ -0,0 +1,106 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 13e66268..27ff8364 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -218,7 +218,7 @@ if (WASM_ENABLED)
+     list(APPEND ISPC_TARGETS wasm-i32x4)
+ endif()
+ 
+-set(CLANG_LIBRARY_LIST clangFrontend clangDriver clangSerialization clangParse clangSema clangAnalysis clangAST clangBasic clangEdit clangLex)
++set(CLANG_LIBRARY_LIST clang clang-cpp)
+ set(LLVM_COMPONENTS engine ipo bitreader bitwriter instrumentation linker option)
+ 
+ if (${LLVM_VERSION_NUMBER} VERSION_GREATER_EQUAL "10.0.0")
+@@ -402,11 +402,8 @@ if (ISPC_USE_ASAN)
+ endif()
+ 
+ # Link against Clang libraries
+-foreach(clangLib ${CLANG_LIBRARY_LIST})
+-    find_library(${clangLib}Path NAMES ${clangLib} HINTS ${LLVM_LIBRARY_DIRS})
+-    list(APPEND CLANG_LIBRARY_FULL_PATH_LIST ${${clangLib}Path})
+-endforeach()
+-target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_FULL_PATH_LIST})
++find_package(Clang REQUIRED)
++target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_LIST})
+ 
+ # Link against LLVM libraries
+ target_link_libraries(${PROJECT_NAME} ${LLVM_LIBRARY_LIST})
+diff --git a/src/llvmutil.cpp b/src/llvmutil.cpp
+index 06fab989..57a7130f 100644
+--- a/src/llvmutil.cpp
++++ b/src/llvmutil.cpp
+@@ -42,6 +42,7 @@
+ #include <llvm/IR/BasicBlock.h>
+ #include <llvm/IR/Instructions.h>
+ #include <llvm/IR/Module.h>
++#include <llvm/Support/raw_ostream.h>
+ #include <map>
+ #include <set>
+ #include <vector>
+@@ -1394,7 +1395,7 @@ static void lDumpValue(llvm::Value *v, std::set<llvm::Value *> &done) {
+         return;
+ 
+     fprintf(stderr, "  ");
+-    v->dump();
++    v->print(llvm::outs(), false);
+     done.insert(v);
+ 
+     if (inst == NULL)
+diff --git a/src/opt.cpp b/src/opt.cpp
+index d78ac374..a607594a 100644
+--- a/src/opt.cpp
++++ b/src/opt.cpp
+@@ -142,7 +142,7 @@ static llvm::Pass *CreateFixBooleanSelectPass();
+                                                                        getenv("FUNC"), strlen(getenv("FUNC")))))) {    \
+         fprintf(stderr, "Start of " NAME "\n");                                                                        \
+         fprintf(stderr, "---------------\n");                                                                          \
+-        bb.dump();                                                                                                     \
++        bb.print(llvm::outs(), false);                                                                               \
+         fprintf(stderr, "---------------\n\n");                                                                        \
+     } else /* eat semicolon */
+ 
+@@ -152,7 +152,7 @@ static llvm::Pass *CreateFixBooleanSelectPass();
+                                                                        getenv("FUNC"), strlen(getenv("FUNC")))))) {    \
+         fprintf(stderr, "End of " NAME " %s\n", modifiedAny ? "** CHANGES **" : "");                                   \
+         fprintf(stderr, "---------------\n");                                                                          \
+-        bb.dump();                                                                                                     \
++        bb.print(llvm::outs(), false);                                                                               \
+         fprintf(stderr, "---------------\n\n");                                                                        \
+     } else /* eat semicolon */
+ #else
+@@ -453,7 +453,7 @@ void Optimize(llvm::Module *module, int optLevel) {
+ #ifndef ISPC_NO_DUMPS
+     if (g->debugPrint) {
+         printf("*** Code going into optimization ***\n");
+-        module->dump();
++        module->print(llvm::outs(), nullptr);
+     }
+ #endif
+     DebugPassManager optPM;
+@@ -666,7 +666,7 @@ void Optimize(llvm::Module *module, int optLevel) {
+ #ifndef ISPC_NO_DUMPS
+     if (g->debugPrint) {
+         printf("\n*****\nFINAL OUTPUT\n*****\n");
+-        module->dump();
++        module->print(llvm::outs(), nullptr);
+     }
+ #endif
+ }
+@@ -4256,7 +4256,7 @@ char DebugPass::ID = 0;
+ bool DebugPass::runOnModule(llvm::Module &module) {
+     fprintf(stderr, "%s", str_output);
+     fflush(stderr);
+-    module.dump();
++    module.print(llvm::outs(), nullptr);
+     return true;
+ }
+ 
+@@ -4303,7 +4303,7 @@ void DebugPassFile::run(llvm::Module &module, bool init) {
+     snprintf(fname, sizeof(fname), "%s_%d_%s.ll", init ? "init" : "ir", pnum, sanitize(std::string(pname)).c_str());
+     llvm::raw_fd_ostream OS(fname, EC, llvm::sys::fs::F_None);
+     Assert(!EC && "IR dump file creation failed!");
+-    module.print(OS, 0);
++    module.print(OS, nullptr);
+ }
+ 
+ bool DebugPassFile::runOnModule(llvm::Module &module) {
diff --git a/dev-lang/ispc/files/ispc-1.13.0-werror.patch b/dev-lang/ispc/files/ispc-1.13.0-werror.patch
new file mode 100644
index 000000000000..3fa144b78dbc
--- /dev/null
+++ b/dev-lang/ispc/files/ispc-1.13.0-werror.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 13e66268..27ff8364 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -352,7 +352,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE
+                            ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR})
+ # Compile options
+ if (UNIX)
+-    target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-sign-compare -Wno-unused-function -Werror ${LLVM_CPP_FLAGS})
++    target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-sign-compare -Wno-unused-function ${LLVM_CPP_FLAGS})
+     # Security options
+     target_compile_options(${PROJECT_NAME} PRIVATE -fstack-protector -fdata-sections -ffunction-sections
+                            -Wformat -Wformat-security -fpie -fwrapv)
diff --git a/dev-lang/ispc/files/ispc-9999-cmake-gentoo-release.patch b/dev-lang/ispc/files/ispc-9999-cmake-gentoo-release.patch
new file mode 100644
index 000000000000..b89e61504008
--- /dev/null
+++ b/dev-lang/ispc/files/ispc-9999-cmake-gentoo-release.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 13e66268..27ff8364 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -137,7 +137,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin )
+ 
+ if(CMAKE_BUILD_TYPE)
+     # Validate build type
+-    set(CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo")
++    set(CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo;Gentoo")
+ 
+     string(FIND "${CONFIGURATION_TYPES}" "${CMAKE_BUILD_TYPE}" MATCHED_CONFIG)
+     if (${MATCHED_CONFIG} EQUAL -1)
diff --git a/dev-lang/ispc/files/ispc-9999-llvm-10.patch b/dev-lang/ispc/files/ispc-9999-llvm-10.patch
new file mode 100644
index 000000000000..6911a76d9e18
--- /dev/null
+++ b/dev-lang/ispc/files/ispc-9999-llvm-10.patch
@@ -0,0 +1,106 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 13e66268..27ff8364 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -218,7 +218,7 @@ if (WASM_ENABLED)
+     list(APPEND ISPC_TARGETS wasm-i32x4)
+ endif()
+ 
+-set(CLANG_LIBRARY_LIST clangFrontend clangDriver clangSerialization clangParse clangSema clangAnalysis clangAST clangBasic clangEdit clangLex)
++set(CLANG_LIBRARY_LIST clang clang-cpp)
+ set(LLVM_COMPONENTS engine ipo bitreader bitwriter instrumentation linker option)
+ 
+ if (${LLVM_VERSION_NUMBER} VERSION_GREATER_EQUAL "10.0.0")
+@@ -402,11 +402,8 @@ if (ISPC_USE_ASAN)
+ endif()
+ 
+ # Link against Clang libraries
+-foreach(clangLib ${CLANG_LIBRARY_LIST})
+-    find_library(${clangLib}Path NAMES ${clangLib} HINTS ${LLVM_LIBRARY_DIRS})
+-    list(APPEND CLANG_LIBRARY_FULL_PATH_LIST ${${clangLib}Path})
+-endforeach()
+-target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_FULL_PATH_LIST})
++find_package(Clang REQUIRED)
++target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_LIST})
+ 
+ # Link against LLVM libraries
+ target_link_libraries(${PROJECT_NAME} ${LLVM_LIBRARY_LIST})
+diff --git a/src/llvmutil.cpp b/src/llvmutil.cpp
+index 06fab989..57a7130f 100644
+--- a/src/llvmutil.cpp
++++ b/src/llvmutil.cpp
+@@ -42,6 +42,7 @@
+ #include <llvm/IR/BasicBlock.h>
+ #include <llvm/IR/Instructions.h>
+ #include <llvm/IR/Module.h>
++#include <llvm/Support/raw_ostream.h>
+ #include <map>
+ #include <set>
+ #include <vector>
+@@ -1394,7 +1395,7 @@ static void lDumpValue(llvm::Value *v, std::set<llvm::Value *> &done) {
+         return;
+ 
+     fprintf(stderr, "  ");
+-    v->dump();
++    v->print(llvm::outs(), false);
+     done.insert(v);
+ 
+     if (inst == NULL)
+diff --git a/src/opt.cpp b/src/opt.cpp
+index d78ac374..a607594a 100644
+--- a/src/opt.cpp
++++ b/src/opt.cpp
+@@ -142,7 +142,7 @@ static llvm::Pass *CreateFixBooleanSelectPass();
+                                                                        getenv("FUNC"), strlen(getenv("FUNC")))))) {    \
+         fprintf(stderr, "Start of " NAME "\n");                                                                        \
+         fprintf(stderr, "---------------\n");                                                                          \
+-        bb.dump();                                                                                                     \
++        bb.print(llvm::outs(), false);                                                                               \
+         fprintf(stderr, "---------------\n\n");                                                                        \
+     } else /* eat semicolon */
+ 
+@@ -152,7 +152,7 @@ static llvm::Pass *CreateFixBooleanSelectPass();
+                                                                        getenv("FUNC"), strlen(getenv("FUNC")))))) {    \
+         fprintf(stderr, "End of " NAME " %s\n", modifiedAny ? "** CHANGES **" : "");                                   \
+         fprintf(stderr, "---------------\n");                                                                          \
+-        bb.dump();                                                                                                     \
++        bb.print(llvm::outs(), false);                                                                               \
+         fprintf(stderr, "---------------\n\n");                                                                        \
+     } else /* eat semicolon */
+ #else
+@@ -453,7 +453,7 @@ void Optimize(llvm::Module *module, int optLevel) {
+ #ifndef ISPC_NO_DUMPS
+     if (g->debugPrint) {
+         printf("*** Code going into optimization ***\n");
+-        module->dump();
++        module->print(llvm::outs(), nullptr);
+     }
+ #endif
+     DebugPassManager optPM;
+@@ -666,7 +666,7 @@ void Optimize(llvm::Module *module, int optLevel) {
+ #ifndef ISPC_NO_DUMPS
+     if (g->debugPrint) {
+         printf("\n*****\nFINAL OUTPUT\n*****\n");
+-        module->dump();
++        module->print(llvm::outs(), nullptr);
+     }
+ #endif
+ }
+@@ -4256,7 +4256,7 @@ char DebugPass::ID = 0;
+ bool DebugPass::runOnModule(llvm::Module &module) {
+     fprintf(stderr, "%s", str_output);
+     fflush(stderr);
+-    module.dump();
++    module.print(llvm::outs(), nullptr);
+     return true;
+ }
+ 
+@@ -4303,7 +4303,7 @@ void DebugPassFile::run(llvm::Module &module, bool init) {
+     snprintf(fname, sizeof(fname), "%s_%d_%s.ll", init ? "init" : "ir", pnum, sanitize(std::string(pname)).c_str());
+     llvm::raw_fd_ostream OS(fname, EC, llvm::sys::fs::F_None);
+     Assert(!EC && "IR dump file creation failed!");
+-    module.print(OS, 0);
++    module.print(OS, nullptr);
+ }
+ 
+ bool DebugPassFile::runOnModule(llvm::Module &module) {
diff --git a/dev-lang/ispc/files/ispc-9999-werror.patch b/dev-lang/ispc/files/ispc-9999-werror.patch
new file mode 100644
index 000000000000..3fa144b78dbc
--- /dev/null
+++ b/dev-lang/ispc/files/ispc-9999-werror.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 13e66268..27ff8364 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -352,7 +352,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE
+                            ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR})
+ # Compile options
+ if (UNIX)
+-    target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-sign-compare -Wno-unused-function -Werror ${LLVM_CPP_FLAGS})
++    target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-sign-compare -Wno-unused-function ${LLVM_CPP_FLAGS})
+     # Security options
+     target_compile_options(${PROJECT_NAME} PRIVATE -fstack-protector -fdata-sections -ffunction-sections
+                            -Wformat -Wformat-security -fpie -fwrapv)
diff --git a/dev-lang/ispc/ispc-1.13.0.ebuild b/dev-lang/ispc/ispc-1.13.0.ebuild
new file mode 100644
index 000000000000..244bb728565a
--- /dev/null
+++ b/dev-lang/ispc/ispc-1.13.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake toolchain-funcs python-any-r1
+
+DESCRIPTION="Intel SPMD Program Compiler"
+HOMEPAGE="https://ispc.github.com/"
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ispc/ispc.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD BSD-2 UoI-NCSA"
+SLOT="0"
+IUSE="examples"
+
+RDEPEND="
+	>=sys-devel/clang-3.0:*
+	>=sys-devel/llvm-3.0:*
+	"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+	sys-devel/bison
+	sys-devel/flex
+	"
+
+PATCHES=(
+	"${FILESDIR}/${P}-cmake-gentoo-release.patch"
+	"${FILESDIR}/${P}-llvm-10.patch"
+	"${FILESDIR}/${P}-werror.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		"-DARM_ENABLED=$(usex arm)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	dobin ${BUILD_DIR}/bin/ispc
+	dodoc README.md
+
+	if use examples; then
+		insinto "/usr/share/doc/${PF}/examples"
+		docompress -x "/usr/share/doc/${PF}/examples"
+		doins -r ${BUILD_DIR}/examples/*
+	fi
+}
diff --git a/dev-lang/ispc/ispc-9999.ebuild b/dev-lang/ispc/ispc-9999.ebuild
index d1c2c2331127..244bb728565a 100644
--- a/dev-lang/ispc/ispc-9999.ebuild
+++ b/dev-lang/ispc/ispc-9999.ebuild
@@ -1,11 +1,11 @@
-# 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
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit toolchain-funcs python-any-r1
+inherit cmake toolchain-funcs python-any-r1
 
 DESCRIPTION="Intel SPMD Program Compiler"
 HOMEPAGE="https://ispc.github.com/"
@@ -34,19 +34,26 @@ DEPEND="
 	sys-devel/flex
 	"
 
-src_compile() {
-	#make all slient commands ("@") verbose and remove -Werror (ispc/ispc#1295)
-	sed -e '/^\t@/s/@//' -e 's/-Werror//' -i Makefile || die
-	emake LDFLAGS="${LDFLAGS}" OPT="${CXXFLAGS}" CXX="$(tc-getCXX)" CPP="$(tc-getCPP)"
+PATCHES=(
+	"${FILESDIR}/${P}-cmake-gentoo-release.patch"
+	"${FILESDIR}/${P}-llvm-10.patch"
+	"${FILESDIR}/${P}-werror.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		"-DARM_ENABLED=$(usex arm)"
+	)
+	cmake_src_configure
 }
 
 src_install() {
-	dobin ispc
-	dodoc README.rst
+	dobin ${BUILD_DIR}/bin/ispc
+	dodoc README.md
 
 	if use examples; then
 		insinto "/usr/share/doc/${PF}/examples"
 		docompress -x "/usr/share/doc/${PF}/examples"
-		doins -r examples/*
+		doins -r ${BUILD_DIR}/examples/*
 	fi
 }
diff --git a/dev-lang/ispc/metadata.xml b/dev-lang/ispc/metadata.xml
index c214c07655f0..285bd7dd7050 100644
--- a/dev-lang/ispc/metadata.xml
+++ b/dev-lang/ispc/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">ispc/ispc</remote-id>
 	</upstream>
diff --git a/dev-lang/janet/Manifest b/dev-lang/janet/Manifest
index db0e6924d7d3..5f366b993e18 100644
--- a/dev-lang/janet/Manifest
+++ b/dev-lang/janet/Manifest
@@ -1,6 +1,6 @@
 AUX janet-1.7.0-fix-ldflags-in-pkgconfig.patch 473 BLAKE2B d7e99647a8b25b715c9261e3178db5ff024bee48c9a677b70a542e4f60a359ce349e130f15425694315dacc0e6a1151da8026f6f6cf0104e8137645302dae729 SHA512 d935b96d08f03160b88b33b61b2d1aafcce2184b622964ca8ee257978c8466f806e0491ba4e2f36f30c1bedfb7aa1e10df074b32a49a547fe3dee3b6b99adc8d
-DIST janet-1.7.0.tar.gz 968936 BLAKE2B 49e6381d0f632fe43eefd498b9aaca2ec049e1f0d4fa7b3463bc00ac1ece67c8c3d108515702bfead1934434a8039e7c1f6eaae46aec7340330e5cda78eeaca4 SHA512 c180172f3016d1ca55ac39f2116789027bf622f08f585bf702b17acadd99d07bf91320e09ce21be76c3a1e60d1a8923591d0e07acc90884dac823a2c414f65e7
 DIST janet-1.8.1.tar.gz 977929 BLAKE2B 4cdf9e5dd7f4a1128438db8bec43c4f1919392bf6c317e2fca42b73826058cd98cec812c245354cc26f21edd4b9640f94dce1e82daa785b53e7e1e8fb45148a9 SHA512 e2296b16ad7df35e0f6ff0f56b9cd5071e887288df195ac0a14a73284a48f010cc26a413ea836aa3faa4385e25f7f313b183f0fbb8e6eebdc3975b69c62e4ebf
-EBUILD janet-1.7.0.ebuild 1306 BLAKE2B a126e8066b5bb4dc506a66f68140484c9c88980642d99a49de367408701c5c9f58bd71d4be78bf2a0e97649889ccb56fe6d58af9f14cc46c60fcc7740a173e9b SHA512 f726aca8eec331ca1690a0a38553fb609481493b7618df71b5991c3493248379d1f1715a7299e94e41e501e4ba93ade4ca5e4171c71407aa7a0f71f12a6cf057
+DIST janet-1.9.1.tar.gz 995046 BLAKE2B c65f59e874690b124b61811406670ed6bf9e23d930b5206a9fefebd64629a2287076a40db885b8a820d733a353237fea65dadccdf4efdd33f1537127f67e66b1 SHA512 4024b2f5bc52338b77c954e384157234ef3cecf21142ef60158adb656396b42accae3af8acb8e54f602f5fbce0e1e1f7f29030878ef2ac7055e933dd710db879
 EBUILD janet-1.8.1.ebuild 1313 BLAKE2B 7bd321b692a7b8772c610c6705b4ad1cda3e60bb8e1fccde281d60135516320890c9dd4068b0589f9674ae31b999c7ddc9332b9acec56cf958a6913ed96d4aea SHA512 a6250a88f336db50367b9bb23c3c75645e3aa8083937b86577f60a91008fa1afc4bfa9a0ae0be879b242981a4b8a7aa3dd70c8a724b360e460571b423072099d
+EBUILD janet-1.9.1.ebuild 1236 BLAKE2B 4fecac4c852138871a7773b18d3990c47cb750a96d3357739f9c763fd01d6e7f7a5f82b9cf0123aef3d6fdd35f21dfcae51806574bf96990a1b24d99f1589f58 SHA512 44295b27d54b8c99914918dbe834c4d23eb7edbe8f6e440a3255e35153977b9bf47dcc5aa31920b0b6a42ac6978eb6b2a92a7aafcc986a7b127dd99753964d36
 MISC metadata.xml 960 BLAKE2B fe836e1f5b7313091bf2c4341a30f7c395056fd4c63a2477a83a55daecede052eea148dc44cb253e8bead356e7b501b7698be4c787f05fdabc08638b2db7163c SHA512 a54e679498bc1239c6eda2302213e220a69eb25e5be02d3c945c89ed3943849adb7043ea6794aa5ad6e3a53026f7b06c16e7ba2ea35d5022d1cc97a9f561a4ba
diff --git a/dev-lang/janet/janet-1.7.0.ebuild b/dev-lang/janet/janet-1.7.0.ebuild
deleted file mode 100644
index 99870fa39172..000000000000
--- a/dev-lang/janet/janet-1.7.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="A dynamic Lisp dialect and bytecode vm"
-HOMEPAGE="https://janet-lang.org https://github.com/janet-lang/janet/"
-SRC_URI="https://github.com/janet-lang/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-PATCHES=(
-	"${FILESDIR}/${P}"-fix-ldflags-in-pkgconfig.patch
-)
-
-src_configure() {
-	append-ldflags -Wl,-soname,libjanet.so.0
-}
-
-src_compile() {
-	# janet_build is the git hash of the commit related to the
-	# current release - it defines a constant which is then shown
-	# when starting janet
-	local janet_build='\"f7ee8bd\"'
-	emake PREFIX="/usr" JANET_BUILD="${janet_build}"
-	emake PREFIX="/usr" build/janet.pc JANET_BUILD="${janet_build}"
-	emake PREFIX="/usr" docs JANET_BUILD="${janet_build}"
-}
-
-src_install() {
-	dobin "build/janet"
-	dobin "auxbin/jpm"
-
-	doheader "src/include/janet.h"
-	doheader "src/conf/janetconf.h"
-
-	dolib.so "build/libjanet.so"
-	dosym libjanet.so /usr/$(get_libdir)/libjanet.so.0
-
-	if use static-libs; then
-		dolib.a "build/libjanet.a"
-	fi
-	doman "janet.1"
-	doman "jpm.1"
-
-	insinto /usr/$(get_libdir)/pkgconfig/
-	doins "build/janet.pc"
-	dodoc -r examples
-	dodoc "build/doc.html"
-}
diff --git a/dev-lang/janet/janet-1.9.1.ebuild b/dev-lang/janet/janet-1.9.1.ebuild
new file mode 100644
index 000000000000..d853136872c9
--- /dev/null
+++ b/dev-lang/janet/janet-1.9.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="A dynamic Lisp dialect and bytecode vm"
+HOMEPAGE="https://janet-lang.org https://github.com/janet-lang/janet/"
+SRC_URI="https://github.com/janet-lang/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+src_configure() {
+	append-ldflags -Wl,-soname,libjanet.so.0
+}
+
+src_compile() {
+	# janet_build is the git hash of the commit related to the
+	# current release - it defines a constant which is then shown
+	# when starting janet
+	local janet_build='\"4ae372\"'
+	emake PREFIX="/usr" JANET_BUILD="${janet_build}"
+	emake PREFIX="/usr" build/janet.pc JANET_BUILD="${janet_build}"
+	emake PREFIX="/usr" docs JANET_BUILD="${janet_build}"
+}
+
+src_install() {
+	dobin "build/janet"
+	dobin "jpm"
+
+	doheader "src/include/janet.h"
+	doheader "src/conf/janetconf.h"
+
+	dolib.so "build/libjanet.so"
+	dosym libjanet.so /usr/$(get_libdir)/libjanet.so.1.9
+
+	if use static-libs; then
+		dolib.a "build/libjanet.a"
+	fi
+	doman "janet.1"
+	doman "jpm.1"
+
+	insinto /usr/$(get_libdir)/pkgconfig/
+	doins "build/janet.pc"
+	dodoc -r examples
+	dodoc "build/doc.html"
+}
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index 431252be5087..b67ea875b3ae 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -14,7 +14,9 @@ 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
+DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 EBUILD julia-1.2.0.ebuild 5338 BLAKE2B 60f77129192f392a3abf31556de86df1bf16564e7c1597bacffe601edc231715db077903b32d244504e7672b9971d19cf22d735808e51983fa0793666aa4b6f4 SHA512 727270ae0b4c99c2da7cdf9f877f194bb2976be6b633aefde56381657bef6521dee6ca047bcdf9a7ebe736fe44871e23a45c7c81ad592759e604c58a20836744
 EBUILD julia-1.3.0.ebuild 5334 BLAKE2B 0b0f07c68075f5418348fc980ea810bad34f100c3c29414347f4c4b9d9f78c943e22bd677c3686deb8846f22c29b7cfcfee3f226550b3fc08827f208fd17c98a SHA512 ed1a6e6f9413e3eb5b7bd1f4d5381a4473fe5ddb2f6a275914e2ab070a03fc3e5cfda60d199cb9f14e5ccfc136ed91fac43ace8416e46692555836b1dd6c2f93
 EBUILD julia-1.4.0-r1.ebuild 5240 BLAKE2B ecf34fe8db9778f2b092ec1db23314ef24f8e3f209129a796bc74b665b3fbacddc0da942f25d26eaf422cfa4a4235d824d81a508ff5b58e56f89ba87d138cf2a SHA512 92722ea1d525b1ce6c92b8bafac1b2436915cbb24243b79f837c65671e4baf0ddfe9d02bc2fbc5567957e70d514b19471fdc80c0d5cc98dd320ea195caaaecc0
-MISC metadata.xml 1291 BLAKE2B 98782d71b9f74e628e4e6dc5264b7bcddfb61f4ce42c4e3baa0a2ec0cc6e2ef6368d1c2b1d755972b214823533c3935b4558c79bd920072649d9072b985efcd4 SHA512 0bbe350eef4d0daaa4a971b843b4359d2513dea5e2dc9e8a3b6241ff403c043f605634615c39a3fdb2a4d090851a19d6b20ebd5c7b3886f009ade3b5c16dfaaf
+EBUILD julia-1.4.0-r2.ebuild 5697 BLAKE2B 63622cc3928470a690e6780496fbf2c819456cf14006e23a1eae2b3017145be29b11c23bacde38e9e93c214bc551a8a9b80c67a024487cf8e6ef316b5176f4ea SHA512 77966db0e5db93e1bd74f1f5ad464157e20621e659d8a1b8eb63755813c049d5232d4410cff1d72407ca885748072d5ed71c692faa879bc269c645244d34836c
+MISC metadata.xml 1388 BLAKE2B b58f320281f3b56151e4f647b3124b2bd915c9194041c7aa3e228cceb56f1d4d6625b9b86394a39c1fb7c0bb524e792cd60576ec76a766dba41204297d792ddd SHA512 91835d230909a2d10ac26280e49d3538e57fc708f141ce366d55d21dc66b588e551aa4e054e76a44695c065a82e6aa09962b84e86eb1f4f12b87ecd90ca256b5
diff --git a/dev-lang/julia/julia-1.4.0-r2.ebuild b/dev-lang/julia/julia-1.4.0-r2.ebuild
new file mode 100644
index 000000000000..c55c6fab3a64
--- /dev/null
+++ b/dev-lang/julia/julia-1.4.0-r2.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+RESTRICT="splitdebug"
+
+inherit llvm pax-utils toolchain-funcs
+
+MY_PV="${PV//_rc/-rc}"
+MY_CACERT_V="2020-01-01"
+MY_DSFMT_V="2.2.3"
+MY_LIBGIT2_V="b3e1a56ebb2b9291e82dc027ba9cbcfc3ead54d3"
+MY_LIBUV_V="35b1504507a7a4168caae3d78db54d1121b121e1"
+MY_LIBWHICH_V="81e9723c0273d78493dc8c8ed570f68d9ce7e89e"
+MY_LLVM_V="8.0.1"
+MY_PKG_V="49908bffe83790bc7cf3c5d46faf3667f8902ad4"
+MY_UTF8PROC_V="5c632c57426f2e4246e3b64dd2fd088d3920f9e5"
+
+DESCRIPTION="High-performance programming language for technical computing"
+HOMEPAGE="https://julialang.org/"
+SRC_URI="
+	https://github.com/JuliaLang/${PN}/releases/download/v${MY_PV}/${PN}-${MY_PV}.tar.gz
+	https://api.github.com/repos/JuliaLang/libuv/tarball/${MY_LIBUV_V} -> ${PN}-libuv-${MY_LIBUV_V}.tar.gz
+	https://api.github.com/repos/JuliaLang/utf8proc/tarball/${MY_UTF8PROC_V} -> ${PN}-utf8proc-${MY_UTF8PROC_V}.tar.gz
+	https://api.github.com/repos/libgit2/libgit2/tarball/${MY_LIBGIT2_V} -> ${PN}-libgit2-${MY_LIBGIT2_V}.tar.gz
+	https://api.github.com/repos/vtjnash/libwhich/tarball/${MY_LIBWHICH_V} -> ${PN}-libwhich-${MY_LIBWHICH_V}.tar.gz
+	https://curl.haxx.se/ca/cacert-${MY_CACERT_V}.pem -> ${PN}-cacert-${MY_CACERT_V}.pem
+	http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${MY_DSFMT_V}.tar.gz -> ${PN}-dsfmt-${MY_DSFMT_V}.tar.gz
+	https://dev.gentoo.org/~tamiko/distfiles/Pkg-${MY_PKG_V}.tar.gz -> ${PN}-Pkg-${MY_PKG_V}.tar.gz
+	!system-llvm? ( http://releases.llvm.org/${MY_LLVM_V}/llvm-${MY_LLVM_V}.src.tar.xz )
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="system-llvm"
+
+RDEPEND="
+	system-llvm? ( sys-devel/llvm:9=[llvm_targets_NVPTX(-)] )
+"
+LLVM_MAX_SLOT=9
+
+RDEPEND+="
+	dev-libs/double-conversion:0=
+	dev-libs/gmp:0=
+	>=dev-libs/libpcre2-10.23:0=[jit,unicode]
+	dev-libs/mpfr:0=
+	dev-libs/openspecfun
+	>=net-libs/mbedtls-2.2
+	sci-libs/amd:0=
+	sci-libs/arpack:0=
+	sci-libs/camd:0=
+	sci-libs/ccolamd:0=
+	sci-libs/cholmod:0=
+	sci-libs/colamd:0=
+	sci-libs/fftw:3.0=[threads]
+	sci-libs/openlibm:0=
+	sci-libs/spqr:0=
+	sci-libs/umfpack:0=
+	sci-mathematics/glpk:0=
+	>=sci-visualization/gr-0.50.0-r1
+	>=sys-libs/libunwind-1.1:0=
+	sys-libs/readline:0=
+	sys-libs/zlib:0=
+	>=virtual/blas-3.6
+	virtual/lapack"
+
+DEPEND="${RDEPEND}
+	dev-util/patchelf
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0-fix_build_system.patch
+	"${FILESDIR}"/${PN}-1.1.0-fix_llvm_install.patch
+	"${FILESDIR}"/${PN}-1.4.0-no_symlink_llvm.patch
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+pkg_setup() {
+	use system-llvm && llvm_pkg_setp
+}
+
+src_unpack() {
+	tounpack=(${A})
+	# the main source tree, followed by deps
+	unpack "${A/%\ */}"
+
+	mkdir -p "${S}/deps/srccache/"
+	for i in "${tounpack[@]:1}"; do
+		if [[ $i == *Pkg* ]] || [[ $i = *Statistics* ]]; then
+			# Bundled Pkg and Statistics packages go into ./stdlib
+			local tarball="${i#julia-}"
+			cp "${DISTDIR}/${i}" "${S}/stdlib/srccache/${tarball}" || die
+			# and we have to fix up the sha1sum
+			local name="${tarball%-*}"
+			local sha1="${tarball#*-}"
+			sha1="${sha1%.tar*}"
+			einfo "using patched stdlib package \"${name}\""
+			sed -i -e "s/PKG_SHA1 = .*/PKG_SHA1 = ${sha1}/" "${S}/stdlib/${name}.version" || die
+		else
+			cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
+		fi
+	done
+}
+
+src_prepare() {
+	default
+
+	# Sledgehammer:
+	# - prevent fetching of bundled stuff in compile and install phase
+	# - respect CFLAGS
+	# - respect EPREFIX and Gentoo specific paths
+
+	sed -i \
+		-e "s|git submodule|${EPREFIX}/bin/true|g" \
+		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
+		-e "s|/usr/include|${EPREFIX}/usr/include|g" \
+		deps/Makefile || die
+
+	sed -i \
+		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
+		-e "s|GENTOOLIBDIR|$(get_libdir)|" \
+		Make.inc || die
+
+	sed -i \
+		-e "s|,lib)|,$(get_libdir))|g" \
+		-e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \
+		Makefile || die
+
+	sed -i \
+		-e "s|ar -rcs|$(tc-getAR) -rcs|g" \
+		src/Makefile || die
+
+	# disable doc install starting	git fetching
+	sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die
+}
+
+src_configure() {
+	# julia does not play well with the system versions of dsfmt, libuv,
+	# and utf8proc
+
+	use system-llvm && ewarn "You have enabled system-llvm. This is unsupported by upstream and may not work."
+
+	# USE_SYSTEM_LIBM=0 implies using external openlibm
+	cat <<-EOF > Make.user
+		USE_BINARYBUILDER:=0
+		USE_SYSTEM_LLVM:=$(usex system-llvm 1 0)
+		USE_SYSTEM_LIBUNWIND:=1
+		USE_SYSTEM_PCRE:=1
+		USE_SYSTEM_LIBM:=0
+		USE_SYSTEM_OPENLIBM:=1
+		USE_SYSTEM_DSFMT:=0
+		USE_SYSTEM_BLAS:=1
+		USE_SYSTEM_LAPACK:=1
+		USE_SYSTEM_GMP:=1
+		USE_SYSTEM_MPFR:=1
+		USE_SYSTEM_SUITESPARSE:=1
+		USE_SYSTEM_LIBUV:=0
+		USE_SYSTEM_UTF8PROC:=0
+		USE_SYSTEM_MBEDTLS:=1
+		USE_SYSTEM_LIBSSH2:=1
+		USE_SYSTEM_CURL:=1
+		USE_SYSTEM_PATCHELF:=1
+		USE_SYSTEM_ZLIB:=1
+		USE_SYSTEM_P7ZIP:=1
+		VERBOSE=1
+		libdir="${EROOT}/usr/$(get_libdir)"
+	EOF
+}
+
+src_compile() {
+
+	# Julia accesses /proc/self/mem on Linux
+	addpredict /proc/self/mem
+
+	emake julia-release \
+		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+	pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
+	emake
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	emake install \
+		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+
+	if ! use system-llvm ; then
+		cp "${S}/usr/lib/libLLVM"-?jl.so "${ED}/usr/$(get_libdir)/julia/" || die
+	fi
+
+	dodoc README.md
+
+	mv "${ED}"/usr/etc/julia "${ED}"/etc || die
+	rmdir "${ED}"/usr/etc || die
+	mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/${PF} || die
+	rmdir "${ED}"/usr/share/doc/julia || die
+}
diff --git a/dev-lang/julia/metadata.xml b/dev-lang/julia/metadata.xml
index dcc7817059df..3acb5a656485 100644
--- a/dev-lang/julia/metadata.xml
+++ b/dev-lang/julia/metadata.xml
@@ -28,4 +28,7 @@
   <upstream>
     <remote-id type="github">JuliaLang/julia</remote-id>
   </upstream>
+  <use>
+    <flag name="system-llvm">(Try to) Use the system LLVM install. YMMV.</flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-lang/logtalk/Manifest b/dev-lang/logtalk/Manifest
index d2fd957318da..0fa239954bf2 100644
--- a/dev-lang/logtalk/Manifest
+++ b/dev-lang/logtalk/Manifest
@@ -3,5 +3,5 @@ AUX logtalk-3.36.0-portage.patch 1179 BLAKE2B aa40ea0df4f01778d01e2f7c174f9587d5
 DIST logtalk-3.18.0.tar.bz2 3280635 BLAKE2B 0105c0816d3b265f15f9ba6e82a4e6dbc877869c2ade6deac3f2748da12e14bd5de2e82ca8f1793c6553a635ca8a55138e79645219f09146c8adec4b60f70b30 SHA512 1575a564ff23d35b4d1581e7f5725515a548ea57d128fbfa13f8138e41791c50cc9626bdc26a85f5e676500b3f232faf742e434b1416707134e4c9b3f8afe424
 DIST logtalk-3.36.0.tar.bz2 18373894 BLAKE2B 3f4917dea47b32760edfde0538a260e5405b566520c514ec137766d17ad532f1d3e3a7a6d05b4b643b21933073951ed41bf92161ae49545eb458619444b10210 SHA512 0e93f091cb24aed3b08db05df29484e708e14cf58a673a42df70c899f3bafae30896be118d89dfdf3f3cb7d4ba520a815e46d563dd7418f80912b7067ed7da8e
 EBUILD logtalk-3.18.0.ebuild 3882 BLAKE2B e1df1f189373ef4292ad98bf16b17a4045455d756fc963072334b407684827dd7d791955817d9f97fea58f21a0806605a07d2432e50e290179e7d23dd91e0547 SHA512 b621d6ade513a690d1c0ea82071b5e295914156e6e5353d19485bdf856438b34c2d9a84149ebe9b9092ccda19d8a6027e70e7fed7ff70dd1eabac1cb2535aa61
-EBUILD logtalk-3.36.0.ebuild 3882 BLAKE2B e1df1f189373ef4292ad98bf16b17a4045455d756fc963072334b407684827dd7d791955817d9f97fea58f21a0806605a07d2432e50e290179e7d23dd91e0547 SHA512 b621d6ade513a690d1c0ea82071b5e295914156e6e5353d19485bdf856438b34c2d9a84149ebe9b9092ccda19d8a6027e70e7fed7ff70dd1eabac1cb2535aa61
+EBUILD logtalk-3.36.0.ebuild 3879 BLAKE2B b9ba2a59b142186a616cb7f71bd3341e744cebf1cf458a7b96816bcee6fdf709891c008e6e92cc657a81a9af7f62bdc8e8257251fcdbb6fbd13afb3eac1b3546 SHA512 d247953afb63546c1bcf9abada9c78f2994c23e869c7e8e53750d9bcbef74afdfcaffcf5259981bf5a32c5da508bd2cdc08a5ea58a9d0b4b01fbbcabb56b1081
 MISC metadata.xml 404 BLAKE2B 8eee9851c967beb38e36f649b8eaefc8b8329f06adf298702a06b427edeb9a0e556a2f47e63c2b4cf4219027ed18502336b4a9e032d876bde18897985aea7dd8 SHA512 1faeefef2f7670809936eb73c4e9e4e18f44ee6e5851cc7386e996768ab88dbfa7c24801daa2cf4edca8646427eec1c871136540d71b7e0b0add3d00c78691ed
diff --git a/dev-lang/logtalk/logtalk-3.36.0.ebuild b/dev-lang/logtalk/logtalk-3.36.0.ebuild
index 63726459ddf6..dc96c5d1fc5a 100644
--- a/dev-lang/logtalk/logtalk-3.36.0.ebuild
+++ b/dev-lang/logtalk/logtalk-3.36.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://logtalk.org/files/${P}.tar.bz2"
 LICENSE="Apache-2.0"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="fop xslt"
 
 DEPEND=""
diff --git a/dev-lang/mozart-stdlib/Manifest b/dev-lang/mozart-stdlib/Manifest
index 175fb2af624f..18d08c7483da 100644
--- a/dev-lang/mozart-stdlib/Manifest
+++ b/dev-lang/mozart-stdlib/Manifest
@@ -1,5 +1,8 @@
 AUX mozart-stdlib-1.4.0-docroot.patch 770 BLAKE2B fb8474a1dbc33dae9fff1bb0011f0a8de0a22f78305d2820d1f5f982339097e9d0170833d94e824b61d86af3d3515703fe31bc312a63f87c8769eaa0506da893 SHA512 5d506dedb42194083afe56c3a22f3653fef1616f69956c8e11de3aa592d29e95d45de507cc630007c0c29970d21b7dbc12bb34b74f33ada255578054d9dbe731
 AUX mozart-stdlib-1.4.0-ozload.patch 719 BLAKE2B db5dd3e738698c8ef6c5b6b827a0fae93d7d7d6af43f764d9a0aad163b2d3e4d4cb367cf558c33b7472fb97ee1e4a848cac9a7aa10afbc0976524ff9cc796302 SHA512 08ad85533a6aaa846c3fcb3839f319890084d32d39439b2aa432cbcc39e1483201abed0716d3d2eff4d3d5c03ca1916dc6ffec6882110b625cdc549626b262b2
 DIST mozart-1.4.0.20080704-std.tar.gz 1305359 BLAKE2B 1dc665a801f2ab1a87b6256279cf097053865b6d78c8131f15188b5b5e25d4b70c34c8dc590b9c4c708ece9821ba1d46fc62ddec698471ff5c629dfcee171a71 SHA512 5b9d9811d739c3533b7f1fa98757d842b506d58a3fd5d89ee2c1d9c036b3130f152da05b19036c8c1609057e361d71b106a728afea47140ebab3b4fc82441aed
+DIST mozart-stdlib-2.0.1-gentoo-patchset-0.tar.gz 1237 BLAKE2B c18fbaba2860faed1ab1b53cc9ead90af338da8fc673c08e167463c784e1b31ec9b6edadb1a55cf70d25f545e88fa226ccec313df09f1ecaa16eb619f9242b8d SHA512 84f2c44124901f63ee11706cdd573b2f6a4eb8427d12560be8f0772bb872ca9f5a14ad3f047ce64da8060188f21ccf774b1866ecc439381294822c6d9a41f2eb
+DIST mozart2-stdlib-2.0.1.tar.gz 1315353 BLAKE2B b2bd25634dc9194af6dc5e23da369515b3a55e0b23bf6d1bf312d0b8eb9f92eee732ea9cf14ebd659e0e296f77c1b1cffa13a74885279bfc5fc0be5d583fd8c3 SHA512 8bb481b00cd9b62aef348dba9e905b3210d1a2fd219cf561d7d243dc0ead135d3ca53378a5945deedfc67ae076ca72008dd098f4a326f00992764123b682f79c
 EBUILD mozart-stdlib-1.4.0-r2.ebuild 800 BLAKE2B 0a6015a5a715b5c331dd8c5b6dddb3f294f687645cf8cdf2ffb490aceb476ee11e1e3806b8a7019f99c6fb76e21eb52324a0567491174a864cc529d89feb3855 SHA512 baaa5bf0c1b6eda92a4a529a133cd50a73fe5d867d5914ae42b378a8c6a5ff7266d22f334dfafeae183f50e89363560e923d201c7516aad42c2fc48962d2bd08
+EBUILD mozart-stdlib-2.0.1.ebuild 741 BLAKE2B 1df920f92ab1493819ac32d678fa8a725489da5a7d5b399c1b4c8704ad0a4c3f48616f67e59f06dec7089d2043bbe53cd7ac8fc52c0158005610daba5183bfca SHA512 7040e8cc51583437782dd87d4e8c52bcb49354947f0a1a91d8d7884066108195859a873ca3305b5ec0c40680349d01b2df27b04e17098611438edf24381abe94
 MISC metadata.xml 240 BLAKE2B 6b5ab0d76c5748af7bd1800d11864869d7365b8d53e2fd2ec66c1092dd1fdac8461b20c029ffe835357542ca69f789ce867988d64c43019e02fe9e3691f0f9bd SHA512 7cd99ce62ca4f9307fa7dfdbfd0ff9d8ff7485c58cd08cd684065aca4b570f8655587425f6a240453a9e86452de41f26f8b82aa81c023764d0beb47daa1b15d3
diff --git a/dev-lang/mozart-stdlib/mozart-stdlib-2.0.1.ebuild b/dev-lang/mozart-stdlib/mozart-stdlib-2.0.1.ebuild
new file mode 100644
index 000000000000..c599cda1e3a0
--- /dev/null
+++ b/dev-lang/mozart-stdlib/mozart-stdlib-2.0.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+MY_PN=mozart2-stdlib
+
+PATCHSET_VER="0"
+
+DESCRIPTION="The Mozart Standard Library"
+HOMEPAGE="http://mozart2.org/"
+SRC_URI="https://dev.gentoo.org/~keri/distfiles/mozart-stdlib/${MY_PN}-${PV}.tar.gz
+	https://dev.gentoo.org/~keri/distfiles/mozart-stdlib/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="Mozart"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/mozart-2.0.1"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}"
+BUILD_DIR="${S}/build"
+CMAKE_USE_DIR="${S}"
+
+src_prepare() {
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		eapply "${WORKDIR}"/${PV}
+	fi
+	eapply_user
+
+	cmake-utils_src_prepare
+}
diff --git a/dev-lang/mozart/Manifest b/dev-lang/mozart/Manifest
index d7730eefebb6..06999d145b32 100644
--- a/dev-lang/mozart/Manifest
+++ b/dev-lang/mozart/Manifest
@@ -3,6 +3,9 @@ DIST mozart-1.4.0-gentoo-patchset-5.tar.gz 24700 BLAKE2B c3b14bd7d8a762b84a098a9
 DIST mozart-1.4.0-gentoo-patchset-6.tar.gz 25878 BLAKE2B 831fa3accc587c769ab40ae4289e45ca28171af572095b7c3b93b69e82ff4bcaeb425d68c7a76aa9b2724b610ba21020647b6d1e3aa525ce58edbc9446d88791 SHA512 5a292bcc81c8062ebd5a948b224e8131302fc61b60303b8e3257ed20e751d0a874303611aeba6d1aacddbf92ec611428e49c2c17bc1dff5e182d0198afe655bf
 DIST mozart-1.4.0.20080704-doc.tar.gz 4085020 BLAKE2B 33eaf57c91dd62d9aa79651095aa5d095086d76dfa16bd5f520962229338c00556fcf3ac01eca1769c687f990110e95fa887d56391346af780d55166708338a1 SHA512 25f8f4b603ae7f4ef054a79a2baa4e10074f8a95f762b75fd88480526fb073b5b4874c269d116a960017a9e7ef989dd9f41853b0ff76e08b2cad2de2090c2eb4
 DIST mozart-1.4.0.20080704-src.tar.gz 11848201 BLAKE2B 0ceeb7dbd3f6858d1a4fee76f2a99eeb3127a07fd31b6760748ac8b8b638c36caaa873154be6481c3dc4b5196ef04cb0c10be421bd87dc3bc4e6b29357622d8d SHA512 f1114662c8c603cc2ac530d4ea1d22a0581f6e1b4d5cb57ccf899b8051ea48dbcf2fa2b62173359a754367a5456a7cb121a208d6a246248207599b0470525229
+DIST mozart-2.0.1-gentoo-patchset-1.tar.gz 39069 BLAKE2B 7490d13665314b3a998fb21bd8a342f262d92a395c3b0bbfa9a7813c044220c82ac02eb0103409127862c9bb4e4c44765b1228a7bdea2cb247492c94264f4fe0 SHA512 ce3cdb8ffebd95d6065439432905ad68b9cd8b86f58478092ab55df7ae7c72498a3e29bda462f3305aff6c99d010c45d786f905e2e906550ee61656ba122bbc6
+DIST mozart-2.0.1.tar.gz 2281261 BLAKE2B 7f071e9ec130a0b482b299f4dac15d64f632702d6ecf55b7af0993087064e533b4de80f77520a725f69f68648a9ce763c8c8826bb24e52af49eda8c3ccfba0b5 SHA512 a72a6fa68296d06af72327fd11310b3be152e5ad9a56f1fc4200ac7b89cd177e9a23a38c6721e1885d4f2ed0870065e919fb9fe3c9a2833fcd8e4ac0fd43aeb4
 EBUILD mozart-1.4.0-r3.ebuild 2907 BLAKE2B 51d3f72aa2e7fa96029a9ff8abb21f52153dbaf044a6a9c84ea6c9ab6431447e5b2c469166bede84c5f6fb9e2a3b62a059424d569f455eb9723db7cff1783a7f SHA512 f860e6013bb7e8efeecb8ec020f7884718e082ea7917b70e9c9343961ae0f72d188b256ce647897d7e2f284dc6ac3cb349ace59eaf00fd69d775f43fae11b11f
 EBUILD mozart-1.4.0-r4.ebuild 3080 BLAKE2B 1363240805a389a5e111d30a5e38287dff565d1716b39b10f7a80ac73aa5f0c6f3e4c8fb2ab8ed93dc7512c8e18ed045421db1a750105d4098761425606769ea SHA512 e4347d58bf3233a4db2aebb7c94d71ff3a1e5408179e72975a84e8f31a0a53b59b75ebffa0a3c510a6fb80d6b3995095abdd07b955cc259047bdb71b1a76b029
+EBUILD mozart-2.0.1.ebuild 1798 BLAKE2B d1315b03d485433b8c769150fbef0cd080d8f700dc2cc46c612a0801e17593f56e606694fbf97650ff937ce37dc025b4e39534e4abc8a9db2da4af106d0a0caf SHA512 2ded16b20db0f87504b4fc850f3c03c3be569d18e5f928603d2800042193924fd6e69d156838e038167e20ba1a1cc914dd48e66d8a1b51fa473a0249b7abea36
 MISC metadata.xml 248 BLAKE2B 15dcca8e423036aaf3d73f9557507d39f7a22a6fa36d83405d8180df441adc50b9d61f8dd720a9d0045f5b3e6ebc9785fcf8f1340c253b2d277404672d395c1b SHA512 b296da55efb17a1040203bc1f5f3bfa8160711fdb72f0543739e6efe48b75427c082eb6c405d99b3256e8d536d3d29f71fdd0fd8d281cb9a9967060ea467a034
diff --git a/dev-lang/mozart/mozart-2.0.1.ebuild b/dev-lang/mozart/mozart-2.0.1.ebuild
new file mode 100644
index 000000000000..b44def58b107
--- /dev/null
+++ b/dev-lang/mozart/mozart-2.0.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils java-pkg-2 java-ant-2
+
+PATCHSET_VER="1"
+
+DESCRIPTION="Advanced development platform for intelligent, distributed applications"
+HOMEPAGE="http://mozart2.org/"
+SRC_URI="https://github.com/mozart/mozart2/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~keri/distfiles/mozart/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/boost:=
+	dev-libs/gmp:0
+	dev-lang/tcl:0
+	dev-lang/tk:0
+	emacs? ( >=app-editors/emacs-23.1:* )"
+
+DEPEND="${RDEPEND}
+	dev-java/ant-core
+	>=virtual/jdk-1.8:=
+	dev-lang/scala:2.12
+	test? ( dev-cpp/gtest:= )"
+
+S="${WORKDIR}/${PN}2-${PV}"
+BUILD_DIR="${S}/build"
+CMAKE_USE_DIR="${S}"
+
+src_prepare() {
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		eapply "${WORKDIR}"/${PV}
+	fi
+	eapply_user
+
+	touch "${S}"/stdlib/CMakeLists.txt
+	touch "${S}"/vm/vm/test/gtest/CMakeLists.txt
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DMOZART_BOOST_USE_STATIC_LIBS=OFF
+		-DEMACS=$(if use emacs; then echo /usr/bin/emacs; fi)
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH="scala:2.12"
+	cd "${S}"/bootcompiler
+	ANT_OPTS="-Xss2M" eant jar
+
+	cd "${S}"
+	cmake-utils_src_compile
+}
+
+src_test() {
+	cmake-utils_src_compile vmtest platform-test
+	cmake-utils_src_test -V
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	cd "${BUILD_DIR}"
+	dolib.so vm/vm/main/libmozartvm.so
+	dolib.so vm/boostenv/main/libmozartvmboost.so
+}
+
+pkg_postinst() {
+	if use emacs; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use emacs; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+	fi
+}
diff --git a/dev-lang/mujs/Manifest b/dev-lang/mujs/Manifest
index 2c6f219f4c7f..0d3297529172 100644
--- a/dev-lang/mujs/Manifest
+++ b/dev-lang/mujs/Manifest
@@ -1,6 +1,6 @@
 AUX mujs-1.0.5-flags.patch 839 BLAKE2B 843d1bf60167dfb91a5736ee936098c8f6b716f7a70118512d102adb3dc00223d5a3f1fb8da3a57b89797d5b26ebf8120cc1ef2013162aeff288be07cb99d99f SHA512 35681b868e129edffe27e41b793ef073b9ebeb5842212116f9740257515a3fb0d2f00d828a72d96b630c7632184ff9340325a5d79503e5a4c5a52892bd26f4bd
-DIST mujs-1.0.5.tar.gz 119353 BLAKE2B 48f1b598e50d5804b0d64230cdd6b4d3f719187ea0906f45c9f45baee2c8df59c6fd09dc25afc9e1ce4e20a9866d158d16a4632bec552fddd8fac70b20e2363f SHA512 c1c59b5e80e0e5f580f30dfc0b4707b6a1e44a73c746b9783bb24d91429ddf8ed670a7663478300cc568cfc15a511720b6d18be2ade40a3a66fc7ab8f3933c2d
 DIST mujs-1.0.6.tar.gz 121385 BLAKE2B b74da9cc9df6c51d81fe4b6170fddd9bfd3e37cc1c48509ddbcc9b657feb7169cfa98427770a118fb9c0923e70320668198739ea111cbd5d1c2303b2ada7093d SHA512 c3062348dcc79b8ea3726fc528b3ba765d3462232059617b9ab221ba47fa904cc81a305a6199a9a2cea24a2d891ca63d475b4884cd4e53fa715b3a55f51ca4d9
-EBUILD mujs-1.0.5.ebuild 1162 BLAKE2B efc8e665c069ad1ad0b23a65de80321bc8ed5fb9b150cad7f421d1c6b5a65bf6701cd5bee504bd3dc09e35414d21e5e24b6e2558ef2d3eacb35c3d296630ba0b SHA512 872ef01acfc92d628ed12e397edc337f6661f10f8c718a387e57261d8147561a80ca3d3a1c3338d4150ed9667ca92b88bdb7c3a7b08c1326d2beb4d7e248427b
-EBUILD mujs-1.0.6.ebuild 1309 BLAKE2B f5f95b81f059d9ccd9f9e50f0a9c1dc5ee8a2273e30b96fa81816b423f3fcf167f3636834f9e7be3db24256e9d9cd35fbb224c8f157f30567d5d3f9faac67c2d SHA512 d82d2cf3ed715b3878de2a7bf78a9ebf385bb44499cb1ce537d4c563811422b9ccd3c058ac79ad8db8e1466ab1d38c67de5aff9f8049db3a1d6f92568cdf83bc
+DIST mujs-1.0.7.tar.xz 93928 BLAKE2B 3c29ad3c23b75ee310824a36c0b08ede07b4ebaebff78558d07bc0eda55d6a994551502089cebd5b53ae24364ec1170e0865b7f1560d909dd15a18040666fea2 SHA512 30cc06ce4a608e091d46ba903ffc2eda29972cf583eb077d7824627fa20423c4721a406bf4271ebd5e5cade74f34e19acc9cffbc6d4d44314085a5525e91564f
+EBUILD mujs-1.0.6.ebuild 1306 BLAKE2B 3b8443a25740336511efe985d48079fccb76a8c8c5e9bf69ca307c0393923423339a673eab22310cec31739e88bf62799126a17f4b6fa6e52de111978731a0dd SHA512 cbd0bfdccee68ea8d01c5438fc6f27169f3afade7f5fb809c117b4d9fe8fcc3dff98473480983c17fc7ca6ba6969e474e6ddc021ab966eb5895fc740ccddb537
+EBUILD mujs-1.0.7.ebuild 1286 BLAKE2B 05622422cd99265401c1e125524aaaf371fbb995042d2eadb27126db935fcd5a4150ad0c21bc825accf1eb711d0f2a7ee95a1065ef1fea8c871fd107bb597726 SHA512 0c2ae5eed5cf070094a80de3912e44d8df563caeb93d720ad3bb219d0029d1ae4d50ba6ec353afe0042d2ba2d3cca56cf0f6b247e4f319888d65a38aefc1c303
 MISC metadata.xml 475 BLAKE2B c27925d0ece3e21984317e079213d568ed5dc278ed8855dc169bfb2e065c29e9845a2d6de4d8ee85a5c1b1a9fc47685318a8e13ec0c5665d63f5ebb9983d1249 SHA512 e73d572d699516550dcf6e4c3feaea5ad5eaeeb724dba92e5b58596cfda6697ebc1de9f04646aa0a1ad4177c1306106cb45b63d3c1797f57d08b7aca700099ae
diff --git a/dev-lang/mujs/mujs-1.0.5.ebuild b/dev-lang/mujs/mujs-1.0.5.ebuild
deleted file mode 100644
index dc4a3e214e27..000000000000
--- a/dev-lang/mujs/mujs-1.0.5.ebuild
+++ /dev/null
@@ -1,55 +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
-
-DESCRIPTION="An embeddable Javascript interpreter in C."
-HOMEPAGE="
-	https://mujs.com/
-	https://github.com/ccxvii/mujs/
-"
-SRC_URI="https://github.com/ccxvii/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="static-libs"
-
-RDEPEND="sys-libs/readline:0="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-flags.patch"
-)
-
-src_prepare() {
-	default
-
-	tc-export AR CC
-
-	append-cflags -fPIC -Wl,-soname=lib${PN}.so.${PV}
-}
-
-src_compile() {
-	emake VERSION=${PV} prefix=/usr shared
-}
-
-src_install() {
-	local myeconfargs=(
-		DESTDIR="${ED}"
-		install-shared
-		libdir="/usr/$(get_libdir)"
-		prefix="/usr"
-		VERSION="${PV}"
-		$(usex static-libs install-static '')
-	)
-
-	emake "${myeconfargs[@]}"
-
-	mv -v "${ED}"/usr/$(get_libdir)/lib${PN}.so{,.${PV}} || die
-
-	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so
-	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV:0:1}
-}
diff --git a/dev-lang/mujs/mujs-1.0.6.ebuild b/dev-lang/mujs/mujs-1.0.6.ebuild
index e3c08c2bd56b..c6663ac60e38 100644
--- a/dev-lang/mujs/mujs-1.0.6.ebuild
+++ b/dev-lang/mujs/mujs-1.0.6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 "
 SRC_URI="https://github.com/ccxvii/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="AGPL-3"
+LICENSE="ISC"
 # subslot matches SONAME
 SLOT="0/${PV}"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
diff --git a/dev-lang/mujs/mujs-1.0.7.ebuild b/dev-lang/mujs/mujs-1.0.7.ebuild
new file mode 100644
index 000000000000..e6ca251d080e
--- /dev/null
+++ b/dev-lang/mujs/mujs-1.0.7.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="An embeddable Javascript interpreter in C."
+HOMEPAGE="
+	https://mujs.com/
+	https://github.com/ccxvii/mujs/
+"
+SRC_URI="https://mujs.com/downloads/${P}.tar.xz"
+
+LICENSE="ISC"
+# subslot matches SONAME
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="static-libs"
+
+RDEPEND="sys-libs/readline:0="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.5-flags.patch"
+)
+
+src_prepare() {
+	default
+
+	tc-export AR CC
+
+	# library's ABI (and API) changes in ~each release:
+	# diff 'usr/includemujs.h' across releases to validate
+	append-cflags -fPIC -Wl,-soname=lib${PN}.so.${PV}
+}
+
+src_compile() {
+	emake VERSION=${PV} prefix=/usr shared
+}
+
+src_install() {
+	local myeconfargs=(
+		DESTDIR="${ED}"
+		install-shared
+		libdir="/usr/$(get_libdir)"
+		prefix="/usr"
+		VERSION="${PV}"
+		$(usex static-libs install-static '')
+	)
+
+	emake "${myeconfargs[@]}"
+
+	mv -v "${ED}"/usr/$(get_libdir)/lib${PN}.so{,.${PV}} || die
+
+	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV:0:1}
+}
diff --git a/dev-lang/nasm/Manifest b/dev-lang/nasm/Manifest
index 94efc4c333b3..f8eb9a277bbb 100644
--- a/dev-lang/nasm/Manifest
+++ b/dev-lang/nasm/Manifest
@@ -1,4 +1,9 @@
 AUX nasm-2.13.03-bsd-cp-doc.patch 357 BLAKE2B 2611aa3e7f817530c8012f1849d5d80f47105a2e35950795826b3b9d128493ab7e8c1da106b9d22e24a025f8bf24f142cad385c5fca13e09423168bc2fc69f65 SHA512 6562f98e08953b5ac667df4f89f401cc520cf24dfaf112121ca0f7a039b96a328316afd62d118ae98ec9d2c1c3f2c1c9b88d2d66f19197637b7b785a48964f9c
+AUX nasm-2.15-bsd-cp-doc.patch 278 BLAKE2B eb2d6fffb03da68a43df8db6cbadeb72753f0474f91011038b6ec0b3a449fbd0e3cde59abfb1b22fa0c991629960f456815b1c86ec55292f54a879d8a0a079f1 SHA512 ba691e4f0fd3b676280de5b79e6872f7efe034da28fc66e247c3f757761e2191c54f585ca724747812fa55afb4b9d76366f50659702561c7eb69483de265b3e5
 DIST nasm-2.14.02.tar.xz 827620 BLAKE2B deb1f3c806ffbe48eefe4163271c68f02a782f75f21980331cb03e64de20da61c118621536c1c869c1629e558cab45ce98fed8443d29c1126fb4255cd6a36ce4 SHA512 c7a228095f37321d57f2813d04f58ee66949e8f81fc49ef6c4ecd391301e308217583ce1a265d4fe8c13d54b5b9c72aeb132caa3caee36e31b6555fbfff34c81
+DIST nasm-2.15.01.tar.xz 975376 BLAKE2B 86cd93c4b9c8f96e0d82d525f558e5240c2152c523d610078918eff176327736084718655cc97fb84cb762f21e6d0598b459243f22d76e006a8f0f58e02699ed SHA512 0eaac219d33243e0f35daea5222432226a27cb119e44e5c666773cd472fd032a1b1deb0b5eb950e5470ebf604ce7d31482d2dcb44ce5627465d006b7071a6153
+DIST nasm-2.15.tar.xz 975180 BLAKE2B 86fe345ddcc1817471e07fe17ba9009afa02fda152301e3d1cedff624cbd6ebb0e016a2fda339bd53f30fb3d60ae19f806d21c9dbe433ebb7d0e9a74d9db1576 SHA512 c88ff62d08aac86c4ce994bb83e80f1644e0433b01c40cebf183281d31bb4c79471f78e3beab6e7cafb28b3e92298aef89d75672444ea5e8d65c3b019e219583
 EBUILD nasm-2.14.02.ebuild 1047 BLAKE2B d739f62a39b65ba506c720f1595e84b65ef7e211ec65088ec69d614d25d733237b7845e27b44d7f6f3aff481314ce723498f05c427d65ac6edfd245a24e28ed7 SHA512 cd4140764c9c6f415d4ada92e6916b1b0100c0d260734da90524fecd4606771c1421074c2771b24c356dbcd3900aaca24366156efde71cca55bc12dab8d3a874
+EBUILD nasm-2.15.01.ebuild 1003 BLAKE2B 0683358ff8c4649306b4569b5e5cc24fb6ed8562a50b45cf2cbc1b126ffef80d184613c936744584351f7bc1c616be37e52024f4b71494efbbb4a90c2ccf9cee SHA512 ce0394577cf05936a80c7beb21f6524d7ec06649530206cb0371a5145384f9be3ee964f9a49e6be312c363bffc015c82e0c21cb8a550ef8e1b03b71e3a10ee1c
+EBUILD nasm-2.15.ebuild 1003 BLAKE2B 0683358ff8c4649306b4569b5e5cc24fb6ed8562a50b45cf2cbc1b126ffef80d184613c936744584351f7bc1c616be37e52024f4b71494efbbb4a90c2ccf9cee SHA512 ce0394577cf05936a80c7beb21f6524d7ec06649530206cb0371a5145384f9be3ee964f9a49e6be312c363bffc015c82e0c21cb8a550ef8e1b03b71e3a10ee1c
 MISC metadata.xml 869 BLAKE2B 6acbe39b23e071849e6afd42da7ec5a56f017b708745e5efd09a288775da944fbb1185cead3ceaa573398f5874115139834584323e5b4cff360cf6cd9cca4ccd SHA512 a6bf522dfa6c43ea58a432577fbc31bcc9d262f7262c16d165b3cbacf8394a6d9e6d1eea9480cdb27b692cacada0c5fba3906e913259c2809a48159bce53e5bf
diff --git a/dev-lang/nasm/files/nasm-2.15-bsd-cp-doc.patch b/dev-lang/nasm/files/nasm-2.15-bsd-cp-doc.patch
new file mode 100644
index 000000000000..5c7f6cfafea1
--- /dev/null
+++ b/dev-lang/nasm/files/nasm-2.15-bsd-cp-doc.patch
@@ -0,0 +1,13 @@
+Avoid 'cp -u' as it's not portable.
+
+In this case we can unconditionally copy files.
+
+Reported-by: Michał Górny
+Bug: https://bugs.gentoo.org/655444
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -28,3 +28,3 @@ RM_RF		= rm -rf
+ CP_F		= cp -f
+-CP_UF		= cp -uf
++CP_UF		= cp -f
+ 
diff --git a/dev-lang/nasm/nasm-2.15.01.ebuild b/dev-lang/nasm/nasm-2.15.01.ebuild
new file mode 100644
index 000000000000..1451280eeac2
--- /dev/null
+++ b/dev-lang/nasm/nasm-2.15.01.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="groovy little assembler"
+HOMEPAGE="https://www.nasm.us/"
+SRC_URI="https://www.nasm.us/pub/nasm/releasebuilds/${PV/_}/${P/_}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc64 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND=""
+# [fonts note] doc/psfonts.ph defines ordered list of font preference.
+# Currently 'media-fonts/source-pro' is most preferred and is able to
+# satisfy all 6 font flavours: tilt, chapter, head, etc.
+BDEPEND="
+	dev-lang/perl
+	doc? (
+		app-text/ghostscript-gpl
+		dev-perl/Font-TTF
+		dev-perl/Sort-Versions
+		media-fonts/source-pro
+		virtual/perl-File-Spec
+	)
+"
+
+S=${WORKDIR}/${P/_}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.15-bsd-cp-doc.patch
+)
+
+src_compile() {
+	default
+	use doc && emake doc
+}
+
+src_install() {
+	default
+	emake DESTDIR="${D}" install_rdf $(usex doc install_doc '')
+}
diff --git a/dev-lang/nasm/nasm-2.15.ebuild b/dev-lang/nasm/nasm-2.15.ebuild
new file mode 100644
index 000000000000..1451280eeac2
--- /dev/null
+++ b/dev-lang/nasm/nasm-2.15.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="groovy little assembler"
+HOMEPAGE="https://www.nasm.us/"
+SRC_URI="https://www.nasm.us/pub/nasm/releasebuilds/${PV/_}/${P/_}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc64 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND=""
+# [fonts note] doc/psfonts.ph defines ordered list of font preference.
+# Currently 'media-fonts/source-pro' is most preferred and is able to
+# satisfy all 6 font flavours: tilt, chapter, head, etc.
+BDEPEND="
+	dev-lang/perl
+	doc? (
+		app-text/ghostscript-gpl
+		dev-perl/Font-TTF
+		dev-perl/Sort-Versions
+		media-fonts/source-pro
+		virtual/perl-File-Spec
+	)
+"
+
+S=${WORKDIR}/${P/_}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.15-bsd-cp-doc.patch
+)
+
+src_compile() {
+	default
+	use doc && emake doc
+}
+
+src_install() {
+	default
+	emake DESTDIR="${D}" install_rdf $(usex doc install_doc '')
+}
diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest
index 21097b0ddba5..f24fb930e25c 100644
--- a/dev-lang/nim/Manifest
+++ b/dev-lang/nim/Manifest
@@ -1,4 +1,4 @@
 AUX nim-0.20.0-paths.patch 934 BLAKE2B 6a4e44c5656cde6d5127bf6a6b8db92cdf8aada0892c27d536d0c1030ed7da8dc97138a8941030101918021f2a301fa683169c8a656fefc6fb7d0fcdb24029d4 SHA512 bf8dbc3e3861ec3ea2718092b981e495194ead5b547e69d01d5d842d128dc4b96b0ba3e95c78afd8fd822d594199315a01de370851ed8f594c091231b9a10ee9
-DIST nim-1.2.2.tar.xz 5680316 BLAKE2B e7c0b2d3f4624f4287c364bc7e9571c21bd41327ab35ef4f6c23b0d1e70ad3e41fa944464299b252faac4fe34a8a15625ef732083a41a02cc5686892162b6f4d SHA512 95f7b03a091113382298d438d27641cf612fc187a29bda66c3b88a4b6d29f5c20a33dd22c63cbd402f4ccd921bf05fbd144a8bea9c6155ab865b4b5d14b93a13
-EBUILD nim-1.2.2.ebuild 2026 BLAKE2B c421e7b9d31c89822e99b11a7e56e4c78f6fd26c717af43d2009aa8e3ec06b1303ccf7f4f9ceef12661bc70de0fd8bf52e42db49baad5a8acdc7fbf370ed9a1d SHA512 4f69ee0ae3526ccbea8ef8cbf8665679ce3bdcb5b7c6e960228150c05df1dd3bec03daa7d88a4b8baffc10aa976bee8477887a8ab5a08acba8f956d444a6fceb
+DIST nim-1.2.4.tar.xz 5680128 BLAKE2B d8bb186862bf8c8e7e20dd5d1035013c6d48de777512658736ddcd49723e5789dc1e8fe6b5dc8bfbda36d204aeaeba3fdb4e10c6d7955fdc47d9fe78ce17082c SHA512 ed5dd7a744229685c9c034700eb0f7d7c51030ea344c1c371cf2731632fd3376b577a3a9731ed79d65a8fb69f3507a8a88408f2e5c46359a8bbd3b3092d991cc
+EBUILD nim-1.2.4.ebuild 2026 BLAKE2B c421e7b9d31c89822e99b11a7e56e4c78f6fd26c717af43d2009aa8e3ec06b1303ccf7f4f9ceef12661bc70de0fd8bf52e42db49baad5a8acdc7fbf370ed9a1d SHA512 4f69ee0ae3526ccbea8ef8cbf8665679ce3bdcb5b7c6e960228150c05df1dd3bec03daa7d88a4b8baffc10aa976bee8477887a8ab5a08acba8f956d444a6fceb
 MISC metadata.xml 328 BLAKE2B 9205920d8c9b12118456bd186f2e882b3e6f75b7cc3f766def1e79e2e4f7ac695370409ff1555e379516606568f181f4ba3625322f70e41bfffd21d319b0035f SHA512 bf02bc0a8c25d6e157b7ab1ef87c2eac3241d42bc4cf0632a159dcb5d429051018848be81d0cbce228124660ced8694f5de48d64fe10bc7ff5b536b7e7579e49
diff --git a/dev-lang/nim/nim-1.2.2.ebuild b/dev-lang/nim/nim-1.2.4.ebuild
index 78fadad3c55e..78fadad3c55e 100644
--- a/dev-lang/nim/nim-1.2.2.ebuild
+++ b/dev-lang/nim/nim-1.2.4.ebuild
diff --git a/dev-lang/orc/Manifest b/dev-lang/orc/Manifest
index 701a15278f37..e1d6fd79e0af 100644
--- a/dev-lang/orc/Manifest
+++ b/dev-lang/orc/Manifest
@@ -4,5 +4,5 @@ DIST orc-0.4.29.tar.xz 465076 BLAKE2B f7c81429d95af7031f190a4c3d52959eda1835d309
 DIST orc-0.4.31.tar.xz 177768 BLAKE2B f06fd6be70063ebc82b45c1801a53aab66b5fc8a85c33991602488ec8ed29f2271df20c3780655953cabe33e865530b1218aafa0592261bcc5dccc4a4b3945e7 SHA512 4e97597e70982dbfc239d1ef9a8913b0155e5aaac15d91162d7f73a1095bd944e27fbe6d6194b9f74af07b985a44b1d9dddbe917425e1ad9e8da17ce86495696
 EBUILD orc-0.4.28-r1.ebuild 2175 BLAKE2B d90883c71906dd89a7d53275a7405d87b6e9480e3a1fbaba83336d632648e940082d9a0bc9321564978f0cafad10db4ddf2b2d357dcf42c4fdff2bcd3feb4edf SHA512 42eab1ff8c1bcc6f9940d07da5cc50d31cde38b4fd6ccaf889b8180fc463aa6c0b825238175095f98a0cc2ddf3324a5ce731e93549be734f8d4cc39227dbb9bd
 EBUILD orc-0.4.29.ebuild 2389 BLAKE2B 8596c3980308a2c3faf657cea9ff368ca8e08288d571c5837eb3892db2518436cd09e5b4a7ec1a51dff50f552821628c5e49ebff60a926b68c941dfb61f03743 SHA512 3965d2cf6cd0ba3c816639b55864e95b5cb2f50ca832fa711ef4e524728c78d0402263d0ca8e7e2b567c449896314183b15c844cf2367e8be9e14fd1e028fd40
-EBUILD orc-0.4.31.ebuild 1318 BLAKE2B 7477cfea1d615d9f5390fda81514c62b881af2778d1cab815447274daf55b7137674746875e146ac106517463f1de9e7daaac8e64f06362af5edf8c1c8aa2140 SHA512 29e963691f5d66048fa7a381b10dc737e6b4c5b019d3b6b98e4bf025d622a82cbce02a0a0883ac8193e2d177b684b6b796d440ad70d7cc5f1e240886e5e43ed0
+EBUILD orc-0.4.31.ebuild 1317 BLAKE2B 1d7ca2b33b9d2326bdc5fcbe494eb35888268c039e55a8fb4d54d3ede6a31363a4a68b90b42d40561e1c69da7da32353fe21e56d090f9e03ff70375de898af7c SHA512 eb81745cbdd43cc9aeddeee7f306426dfdc312d32011878a2996846b127b493155e32e14f9c2a8628a8cefa11c6b77f704bfbfc4698b759cb0632e8d7dba690e
 MISC metadata.xml 354 BLAKE2B b24bce431d7ad10e9231e89b522e67de16192ee4e48281b8a17f002692632449ab676cb9df6ff5a22563d6f9657ee6be11e452bac41f8a537c598822efab85d1 SHA512 4f17c4c3faa3f2c5feaefe4727b3500360f7cc5486c794e9a34608c3e437b4e2cc266bc9e0e2b3824952a8da62421fda59e9bc5140ee88898f8f7bdde402762f
diff --git a/dev-lang/orc/orc-0.4.31.ebuild b/dev-lang/orc/orc-0.4.31.ebuild
index 024578c73267..f382bd5a2b94 100644
--- a/dev-lang/orc/orc-0.4.31.ebuild
+++ b/dev-lang/orc/orc-0.4.31.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="BSD BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 RESTRICT="!test? ( test )"
 IUSE="gtk-doc static-libs test"
 
diff --git a/dev-lang/qu-prolog/Manifest b/dev-lang/qu-prolog/Manifest
index 0d2a967ba79b..e01bc21a888e 100644
--- a/dev-lang/qu-prolog/Manifest
+++ b/dev-lang/qu-prolog/Manifest
@@ -1,10 +1,13 @@
+AUX qu-prolog-10.5-gcc-version.patch 872 BLAKE2B 0ca594ff48e9c58c7f99d2f4774308e0e6024188157197da75846b849f11a05f3d8331f8a16a7f31c648bf6e1f60fd2f184619dd64201ec0239fd64caf098919 SHA512 b120b532101b8adf69fe1ed7ded1cf3dc8a78a59fc74fc287cf6627f593b792b33ab2bbaa4022f2ec654e0bf2e3b64cb8bca5c5f6b2c3a41c2a1a243f703e60f
 AUX qu-prolog-10.x-qt5.patch 1037 BLAKE2B 91287f26c97c0c2f1c9cd3bae3a007cf27e4b8121aca4a42cabbbb37c224b7399ed06468b7a725977f27bad2fcda8d2165bfeb569f36491d227dd472036de5ed SHA512 9dd1c8245f725d552bf23ad9ef1bb858a06c69b66778fa851013775081751a77923e2145f6575966e8394666b8dc2e04724d102be28b32efaa44b7e474b3dd7f
 DIST qp10.1.tar.gz 1521610 BLAKE2B a4d6d277a35284accfff1afd70901218df198b2b33f5c95ca5649bf06abcb153890f2f21b0e8d62ed93484b452a230074f93c983ab231c8fc58b51a29119d838 SHA512 8fb30fcbc086384d7e265695a7d24a9599ed306b5da0ea964e60aef4bb01c7b6789fc361449f908736c57d86c204e574d745f277d5b0ec2b725a8eca52f14f1a
 DIST qp10.2.tar.gz 1667066 BLAKE2B fe466bc892a0923f463347bfa22618061d8a8baf9e2fc60ea27694c66be6dc8ac9b0bacd3084bccff95ff06ef949660cb9a0637a8e3e3595d04c44eb2b682bc9 SHA512 5cfebab17a812513bb4ddf4c04890af32339bef18d746dd6503cee13d295c43f1ef687a6c7814b2f40473766c695459f8234541ae8a6945a0f2930556985ad96
 DIST qp10.3.tar.gz 1669345 BLAKE2B 9dc14f683555b22e7bb2119dd6d29cad7c934bb162def4358d69da65cd259b586fac593c7770dc1d665ab56da2e1129a696e84b01a271b747a9e3a8598c0d7fa SHA512 e28519fccf58f2b755382f2b8e56c15f2622508822c920975577feb6b837f96346a14eb23a5209ed126e617264ed7846b8a35d5936e99284503d5c435c0a1c18
 DIST qp10.4.tar.gz 1671144 BLAKE2B 293cbc09a058714f762e5d371074ca1b87e8177868851a3db2606a837810b474e926c43f6715c5088c718f2b1841c46f9668795ac53edc0266a9a6d5d04386f5 SHA512 39193ba2c39dc24b234092a47f9834af5b8dff6edc34ba6e0ceb6a4bda60c2f30b951bc17ef72da1dd220ef62563c88f4106dd0115a5bf8e51045abfb96151c6
+DIST qp10.5.tar.gz 1670927 BLAKE2B 74fd47beb18f7081ade39bf215a999066a2a5e99753ee8e48751c37d7bff111d355a7713f13af43a1cffc2fa6ca5efdf89a633fba45accdef17ee265f068e57a SHA512 6a7d46f09015304ffa222c82be5d9fb28c272ce27641455113740f3a4a08887369208456c478320b30d9464d8eeea0f7fcc1c1e56e1a130134e2fe54d5446958
 EBUILD qu-prolog-10.1.ebuild 1947 BLAKE2B 2c5dff2cf601a8822592aed684a241ae61b17e42a4ea7bbeb704778cddadc97208813b656a8b44a581c46decfaa17fdc9cadd5be2c0d0aaabbe7e08feb3f0c93 SHA512 38a37103ab77155890f9fd59ce921a9211357f26dd00b7d211908c77d39371cb780ed1e498e04fc0486d9e38578af71adea0ac97d0e16731b0bcea40126367d0
 EBUILD qu-prolog-10.2.ebuild 1950 BLAKE2B 7afc003d0f75a3abaa8459188c10dd06e422eb60a985e69a00559e8dcb83455408932817302468a689af01061d2b3ce0201e65f88d5bb98c2644b95f6ad3a5ab SHA512 dc8389b186f7a84a14593bdce6bd33829061287f338e68894ce117dcf7e5e5f32f5e9099f324d5f7cc17ce7295f393e7ba49d49f442559bad5bd010ed0235e3e
 EBUILD qu-prolog-10.3.ebuild 1909 BLAKE2B 772953fc1daee919d422764968f6df52da0f7ea04b316ee353cf188ef6e276a64d648c2da2c5312b257f5c7f255a86c3949c9462e9afaeafa67d471115efec2a SHA512 1ce44624dcbc29f65f20d232836556837641d75cf2b6ba002f20b6de351f08ccb6a8937949add4b13969370dcc24f3b6da6f09dd6a628d353d88ad264dfa80c4
 EBUILD qu-prolog-10.4.ebuild 1889 BLAKE2B ba7059b8d5c3f86122cdeff8868e095f18109eb604896912e1343037a14f6ba8008efe750542190648f1b92a76fca70c0014ad8583b95171ea78ba98cf835a3d SHA512 ef85143c8391ec647a3e92d934a7b2172bc9fbb270cd71c5d803925188345cf9cf1cef0af13f50de3718f938a31112a19e714182b54f76af7a503a9ef1e2ddca
+EBUILD qu-prolog-10.5.ebuild 1962 BLAKE2B 56670281e663d1a51649fde6740370ea7f7454b094f16c514cc4daa356180d5e518ebb882bcbb576978d2875b4c8dde5bba86a3a21f7fc1774d178e5d6ccc597 SHA512 b18807094d8944eec12347d07f5624aed4d5b98d3130700e3e924ba78080832b7879c9b9791ba3c3120db978bf1a95a4bae6f5e1f9282a0a04f3b65b6390dae9
 MISC metadata.xml 347 BLAKE2B d0d2ead501a46ff84953eceee649d58e406ebf5a83e7b7862b9501b2e665ad71b5c9c31f4790161074debb7b86ce7e53ff8d0904c39c37ddcac6250668685aca SHA512 7a7bb3ccaa42fa120c3702d963719d5fdfcf0a413685cad98bd34a515a4cc83a213a71e7f3b6b0ce67947fa347229caecf699879192f0d930c9c6577e0ce59cc
diff --git a/dev-lang/qu-prolog/files/qu-prolog-10.5-gcc-version.patch b/dev-lang/qu-prolog/files/qu-prolog-10.5-gcc-version.patch
new file mode 100644
index 000000000000..cfc7cbfd4c14
--- /dev/null
+++ b/dev-lang/qu-prolog/files/qu-prolog-10.5-gcc-version.patch
@@ -0,0 +1,25 @@
+--- qp10.5.orig/configure.in	2019-12-29 00:57:44.000000000 +0100
++++ qp10.5/configure.in	2020-06-25 08:53:32.610430095 +0200
+@@ -209,22 +209,6 @@
+ 		uname \
+ 		)
+ 
+-#----------------------------------------------------------------------------
+-dnl Check for CPP version
+-AC_MSG_CHECKING([for GCC version])
+-qp_cpp_ver=[`gcc --version 2>/dev/null | head -1 | sed -e 's/^[^[:digit:]]*\([[:digit:]][^[:space:]]*\).*$/\1/'`]
+-if test -n "$qp_cpp_ver"; then
+-    AC_MSG_RESULT($qp_cpp_ver)
+-    case "$qp_cpp_ver" in
+-      2.*)
+-        AC_DEFINE(GCC_VERSION_2, 1, [Whether or not the GCC is gcc 2])
+-        ;;
+-    esac
+-else
+-    AC_MSG_RESULT(not found)
+-    AC_MSG_ERROR(Could not determine GCC version)
+-fi
+-
+ #-----------------------------------------------------------------------------
+ dnl Check for -fno-strict-aliasing
+ AC_MSG_CHECKING([for -fno-strict-aliasing])
diff --git a/dev-lang/qu-prolog/qu-prolog-10.5.ebuild b/dev-lang/qu-prolog/qu-prolog-10.5.ebuild
new file mode 100644
index 000000000000..36fdb457ce21
--- /dev/null
+++ b/dev-lang/qu-prolog/qu-prolog-10.5.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils multilib qmake-utils
+
+MY_P=qp${PV}
+
+DESCRIPTION="Extended Prolog supporting quantifiers, object-variables and substitutions"
+HOMEPAGE="http://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html"
+SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc examples pedro qt5 readline threads"
+
+RDEPEND="
+	!dev-util/mpatch
+	!dev-util/rej
+	qt5? (
+		dev-qt/qtwidgets:5
+		dev-qt/qtgui:5
+	 )
+	pedro? ( net-misc/pedro )
+	readline? ( app-misc/rlwrap )"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-10.x-qt5.patch
+	eapply "${FILESDIR}"/${PN}-10.5-gcc-version.patch
+	eapply_user
+
+	eautoconf
+}
+
+src_configure() {
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		$(use_enable debug) \
+		$(use_enable threads multiple-threads)
+
+	if use qt5; then
+		cd "${S}"/src/xqp || die
+		eqmake5 xqp.pro
+	fi
+}
+
+src_compile() {
+	emake OPTIMISATION="${CXXFLAGS}"
+
+	if use qt5; then
+		cd "${S}"/src/xqp || die
+		emake
+	fi
+}
+
+src_install() {
+	sed \
+		-e "s|${S}|/usr/$(get_libdir)/qu-prolog|g" \
+		-i bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp || die
+
+	dobin bin/{qc,qecat,qp,kq}
+
+	use qt5 && dobin src/xqp/xqp
+
+	into /usr/$(get_libdir)/${PN}
+	dobin bin/{qa,qc1.qup,qdeal,qem,qg,ql,qppp}
+
+	insinto /usr/$(get_libdir)/${PN}/bin
+	doins bin/rl_commands
+	doins bin/{qc1.qup,qecat,qg,qp}.qx
+
+	insinto /usr/$(get_libdir)/${PN}/library
+	doins prolog/library/*.qo
+
+	insinto /usr/$(get_libdir)/${PN}/compiler
+	doins prolog/compiler/*.qo
+
+	doman doc/man/man1/*.1
+
+	dodoc README
+
+	if use doc ; then
+		docinto reference-manual
+		dodoc doc/manual/*.html
+		docinto user-guide
+		dodoc doc/user/main.pdf
+	fi
+
+	if use examples ; then
+		docinto examples
+		newdoc examples/README README.examples
+		dodoc examples/*.ql
+	fi
+}
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 8d9ab84f15f5..a2840f35ac68 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -10,9 +10,9 @@ DIST vala-0.46.7.tar.xz 3402828 BLAKE2B c028875e2c6036a6657244bff62d3a2eec2104c0
 DIST vala-0.48.6.tar.xz 3451004 BLAKE2B 9c880cff885b934e1d82d21285839e040addecb0b3ce81936d5be118a951bd219eea2b8381ea42f13e6e858a1937a3789a3dee6d067735e5ee21eaced38b4646 SHA512 220a916d42cbae3853afdd7c35a72afb446a92fca039d8c660a478fd793686a0c82cbaf90a7c94ae182c1f41eec6df1aedb804013ab38e6e4bcc6d26e40e5375
 EBUILD vala-0.36.20.ebuild 801 BLAKE2B 28a0b45feb749184a38652c09c10e4e10fa89e13ae613394fc89395244249783d5d66e63b9a808a3d2b6d0585f6f03c70d418874ab103032502df7830e64ef0f SHA512 fb5d44393b0ecb62098873f25f16ee9f9f2b268faa5524268923ba88258ada9b6e9d74f3ab4d0d9c11d1972d869ae1e97bae848f4005ebbe29069219a4078d47
 EBUILD vala-0.40.20.ebuild 1188 BLAKE2B 9754e3990f8b9d97a9db2d475a8338dbad1ac0daa74118a4966d08709bbb8d713817ae4a163bdc79ef2ce26aad00e633418734a2333a4e2c72b8a10b6a53d814 SHA512 d55a8a950eda084f4d527d090fa768436808922b4adafbd756cdaed73fb7214d9a1f74c77fc1c0d232e3dc6bd7548ded04ff3fbe566c609c7c2677404e757636
-EBUILD vala-0.40.23.ebuild 1196 BLAKE2B e2c6de7f13f532e577c26db204f440ee0d9256844618ab02d1f4761646f1cb74f1f268fadb5d043701aa64f014464bc9b6c9116856ef7c96abde436f10c5d62f SHA512 a4bbd7dfdcf4e6351f7abb0a4ffe7fbfe09846e883152c9e178f78f108c22e8cc9c3d2d340eb409f60fe923c97805fe503254b16e3a3e7f6779a32c48188c3f3
+EBUILD vala-0.40.23.ebuild 1192 BLAKE2B 8cd79869c3512138da2ab52498a892fad173d0342769492548efdfa6e4ed08cef794e8d4ea15e49f51baf7acb87a3849e47bd04bb131c1b70075add943db6901 SHA512 7d1f7800856de33add6c0ee96cfde82197fbd82be4bd7d8c4fc537e949eba27b3b5e2d30613d59fa95146ae0b0dab10251d201eb28f165fbd69f2d92761ca618
 EBUILD vala-0.44.11.ebuild 1110 BLAKE2B caa359b186daa04e09b9f3c2185280dfedabd8428ad060304e78cad7fe106ec00c1ec023dcd2f0a7f4239ab5be705413667cfa9683fc30ac88ee2b0b1389e588 SHA512 e14b37221c39f2b50c788c31c28b929251db44e944bae83cb81907c2d304e4b6a9838c7173fc5c74f2ffdecc89d8d0f1ee3cb8d6ffea023491e8f7f92e25c79f
-EBUILD vala-0.46.10.ebuild 1312 BLAKE2B 4419e7f83b6eff1279058671fbe8ff62e2d1cf562a07f10d22d09e41c5dccf2b3a4b9694c7be6ce2c671efbb258d0e5caa66c5ce5b30edbc04ae534acc4d27b7 SHA512 3edde48c1cef97c1ef17b3c4587bf26763f14ca300017acb178e32fdf40b7dd25ba462b93b870859ec584e3a1ae1bbf935570c0f783df5871194d8ca033c5ae2
+EBUILD vala-0.46.10.ebuild 1307 BLAKE2B f1c0d8e87c900ec98719352d2ba000704cb7b2e93bb33862d2efebf1096a5efc7af7c88acafa710703598b099c59f1b1be98389fefd212e2635a709743174522 SHA512 ee7be937ba394509dd3acbdb4f6730a240ff0df3f4fa9a69abb897934df714e9b520812b44c2b2cce52668f6b29d0f211b8b3df11ff02dc3a20784135c5cc606
 EBUILD vala-0.46.7.ebuild 1303 BLAKE2B 9eab2887ca949595c7673fb81cd9066bacdcec0a3a3608924ae7d42ce38f8c60609a7ea641d48e379ed882908743d4dd3b62401ec1f97ba12992b5a8ff755efa SHA512 a7d042b51962a8e9d921d2dd04bc4dc6a3e6db4061c894aad3eb60bd142c655f1982f3277224ed85107ee1b20f8d407c2c2f836885f446c9392203cb08b103de
-EBUILD vala-0.48.6.ebuild 1312 BLAKE2B 2a5c969f40a6f1ec8869e5de0e41e16ee78db748069bc0016e9b5b5ecb1dbc2be307995939134fe36a37b94e4a89284478d4704c04f32db9ae9c0a2786b875b8 SHA512 7354b9ffa72a263f0035b6803d6ab4071c7870cc90a1c9a57355ca637392420e78be6d5bedb866f327a522c0f852f1c78ea798ba66c62f8b5753fac9ec21a969
+EBUILD vala-0.48.6.ebuild 1307 BLAKE2B e48e7ef5951e028dda4130e587dcfc22bef733e6d89d16ec8f6a6f6417eb4210902c9d74de29b28357596fa421f7dba296dd9df6d806faf6dafe3f25aca273bd SHA512 05d1a26e85ec6af5e07a39682434d97a09f8d43d904d9cd357deccbb8a3c186fea5f05742ff1913eb2e540096be3544ed308bb2517371718e9b27dba6124d3c0
 MISC metadata.xml 345 BLAKE2B de3110ae281a87f8cb8f6c10d93705f56f0cfed972cd893a063e66c2629150d491498a29b35b4efe19fa5b6baa740f1d989bad440924befc60ef56423096f108 SHA512 163aa55430a075974d504a5bbb71ad9a249cb215de12a82b3141de18bb05f1e0c2078c02c617cf7d98a97c7f8dd407077183754d8c82c77e80dd0d7b2ec38283
diff --git a/dev-lang/vala/vala-0.40.23.ebuild b/dev-lang/vala/vala-0.40.23.ebuild
index 661aaba47561..a68691cfb8a5 100644
--- a/dev-lang/vala/vala-0.40.23.ebuild
+++ b/dev-lang/vala/vala-0.40.23.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0.40"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~x86-linux"
 IUSE="test valadoc"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/vala/vala-0.46.10.ebuild b/dev-lang/vala/vala-0.46.10.ebuild
index afe20bbc8ab5..b2cf09e6053f 100644
--- a/dev-lang/vala/vala-0.46.10.ebuild
+++ b/dev-lang/vala/vala-0.46.10.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.46"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~x86-linux"
 IUSE="test valadoc"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/vala/vala-0.48.6.ebuild b/dev-lang/vala/vala-0.48.6.ebuild
index 1f7c05bd15c1..15356e7b1f79 100644
--- a/dev-lang/vala/vala-0.48.6.ebuild
+++ b/dev-lang/vala/vala-0.48.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.48"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~x86-linux"
 IUSE="test valadoc"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/whitespace/Manifest b/dev-lang/whitespace/Manifest
index c653533d9155..ffc0c3b19f81 100644
--- a/dev-lang/whitespace/Manifest
+++ b/dev-lang/whitespace/Manifest
@@ -1,7 +1,5 @@
 AUX whitespace-0.4-ghc-7.10.patch 814 BLAKE2B f9746fd7bd9e51b7429a14b89d617c256ea76004384a1773b3ef35aeaa8518e96db9d53cf52dba025a96d44b3f97d11b42a3c0fa51bb40c15bfa2dfa65a66d22 SHA512 b0202b848539ef1d04974fce40facc8c0090d35da77d6fc98cb7da296efb89a8b81efda1f3dd045115417fc1471b4298be913992dd4a9772642c31ec5960fa90
 AUX whitespace-cabal.patch 948 BLAKE2B 89d35a4a65cbc9e85e652a16e7c3ed8eb01b77b4aeb1f498d97a5c7e0697540cae0aa351114b5abb001949994df7b7ed5e64dfbf911564b845f3cd9cb4956741 SHA512 5c160defe828f6a533a0faa91ef3db19c8cb0edccc421fbf387f28d7dc681a5f66b4c098108893fad41e22643ec74f265f7ce00119e70f0b98dc2d1a9f7aba46
 DIST whitespace-0.4.tar.gz 16428 BLAKE2B d5353b05b80a14ed0583513568d2889816c9e8b7fca8d5253bb5def584c5d43cb0ed8fa46943e7c6c0f82b6424dd01879b7beaaad813a5beb6fc3081f4dfd618 SHA512 2a1c932d650f6cfd55bb7c08b8882086143bc9ec2b0f639a7452116d86f12daff1a1268d7451003a6bf8635fbf1ad23e9203410fd423ce16d4239c1b552d7046
-DIST wspace-0.3.tgz 15471 BLAKE2B 7b5d5435b78d9ff794c69b21332328d0f21dddd07663076c1d3e8e76469196d109827082cd2dd26b74ecd6305631cb254adf5ffa917707146ace29cd107df192 SHA512 d162e804b0b6c4cba164552678ef3a094153e89a0df5f684e52b93229d88699cf9c7fd31641b88fd8c4653c158b1e77193ebd9cd1edfc47863a09798f67d3487
-EBUILD whitespace-0.3.ebuild 625 BLAKE2B bb7fd44ac70e16f80462fd78d878c1ac8123416931b9e19b1b6dcddf72509835c78ebbbca5ddb72e1d1fadbabe1531c4172939554a464678ceb15b9ad3c3996a SHA512 4c39ef5bc1a90d011c60b4bcfe9188b902a69f2a0da83e3b3c5a50ef98f6120eaad8ef493d0f41f5601b9094e3d54d764e04c776af800e4148f7d7c79a01d674
 EBUILD whitespace-0.4.ebuild 604 BLAKE2B 4ccb2c26db55366652837e711a44dd559467438dccd82de1482e25673311f7d7723d4cf874f229270e1f7ce75a583100f33974dc82b36a82d5c8ee5f1e298901 SHA512 12062df7bafcb906af123c13a86c6e6810645c1fea32c6db7747e714ed7a188a732a29985143d2a16ef1e49339620b6a6b9566de72104b6b318f7a78f6ed3a16
 MISC metadata.xml 335 BLAKE2B aed6ce9148bbca7ce32faf271998e85b612514fd59accd2010735b4971664479b2ce4fd16673a2a1e534ea92cf5d1df7774038937e7d428d649171bde27937f5 SHA512 eea77baf66a4e0d4bd5a703a6cf31258f47bd2f9f2f6975fa7b4ee401db4fdd6a27e6f0698313d71a059f2ae14b05f5148d2e844f4b7a05d7e5e49b4302a803a
diff --git a/dev-lang/whitespace/whitespace-0.3.ebuild b/dev-lang/whitespace/whitespace-0.3.ebuild
deleted file mode 100644
index 92b1bb97583b..000000000000
--- a/dev-lang/whitespace/whitespace-0.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CABAL_FEATURES="bin"
-
-inherit haskell-cabal
-
-DESCRIPTION="Whitespace language interpreter in haskell"
-HOMEPAGE="http://compsoc.dur.ac.uk/whitespace/"
-SRC_URI="http://compsoc.dur.ac.uk/whitespace/downloads/wspace-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND="dev-lang/ghc"
-RDEPEND=""
-
-S="${WORKDIR}/WSpace"
-
-src_prepare() {
-	epatch -p1 "${FILESDIR}/${PN}-cabal.patch"
-}
-
-src_install() {
-	cabal_src_install
-
-	dohtml docs/tutorial.html
-	use examples && dodoc -r examples
-}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 55eff45faee3..90cb745ee662 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index fedd43ce15ef..367a4fd0f1f0 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -2,5 +2,5 @@ AUX 0.7.16-fix-tests-run-in-2020.patch 1506 BLAKE2B 344cd06a1070f7d36fa6653d9a20
 DIST appstream-glib-0.7.16.tar.xz 2243684 BLAKE2B 101a964822cc2421608e04a342b89248d16fff006c1843433f5db11703533fb7d0b2cb390d1e2f85274c51d0bd989502fc453700dfb9c32005a7b7c64cb59348 SHA512 a2991dbd26deeb1fb1daef1811c38ff5b55b2fae0bf2d8cc612c2e370613cb6b0468cf287ab3b575f6e6e3203aabcca12dd95474f70a54d6052a34dcb27b951b
 DIST appstream-glib-0.7.17.tar.xz 2245372 BLAKE2B 88173b209b275962ecd4b0a5d3cc344b317dec39a57cb6ebcdbc1c4447017b69c8e68ae19e336b1780477120269deda28b7e53d935a057fac193f123d91013d0 SHA512 72eae6057a4b18b6eca34c795c2bfd982fd7a31500b70beb9553bdf8a7617a03319a2813eb93af20f2e39678ef6ee524dee48b2cbcccde0736f9d10a547ca223
 EBUILD appstream-glib-0.7.16.ebuild 1701 BLAKE2B 7fea4d96b083a99439e2fe5e98e6f76d80ec4a9dd2233c82d12344119388364725c614dc89451e1d763162498db82226badf603c88529bddc52ea62a4cd6417f SHA512 ccfff59f9b7f034d63eda0ee1ed099b5073f6aac2a11d0d3485b38bcadf55cba34e025d72151817c4d88ebbc7cba06dc88f66ee7e924b4705dd35577bcf20d95
-EBUILD appstream-glib-0.7.17.ebuild 1647 BLAKE2B 20a250abf1dcfd2ba376b2b3bef172a655a3b9598baf154e67901a832b097170f7ea65c9d1f1d797784da05667c6f3f4e1cfd9c8ad0153f9522144629dc24369 SHA512 d4eac6ef8d2897666571e44e3c0642ca1ef09cdb5ac80eabce25363de1262efaa5914dcf7d28f328619b107fd3a01fe2b2bffb53e0208f2a78cd0c5cee0fceed
+EBUILD appstream-glib-0.7.17.ebuild 1642 BLAKE2B 33502810a7e501ebe55e8186a3f1441c58bd81900b9c7db0a7b5e4721be99a2003d7a2a65251425ef2988114e123a56ebe828af8872ac69fbdf01a1116933cbe SHA512 5a2f0021bbbe76b9fb0236c3a1e0e45ec74d5c34147636681d69771f5ee602f0d8ce3c6a7f36a57733e95e0d586c153f3e42641a5d72d1a7eebaf960468444e7
 MISC metadata.xml 422 BLAKE2B 2e5bf4c5c2d13bf78b471e1dd96805a9ccfe89dc4c9d0e580d8248f2217516c661c150589d810ed63a5d157188adfbddd0e14aff27066c30abf3b890a40fea39 SHA512 c4466112e9b673bab1ddd4787d13b39bb12be7c646a801f5583ffbf8edee2010b0309e6dd2e0cc65cc127a2c4fa7c2182a4c7cbaa5a7011e569d31ca2d1217ca
diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.17.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.17.ebuild
index 3ac1858dbde7..8d2dc97256c5 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.7.17.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.7.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/8" # soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="gtk-doc fonts +introspection stemmer"
 
 RDEPEND="
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index e43e9f6a258c..807664276141 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -10,5 +10,5 @@ AUX boost-1.73-property-tree-include.patch 1832 BLAKE2B 7488cf768209bde32af608f3
 DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6
 DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca97531baa8355f488be0987b9426289dd85d6ce25b7eb03ccd690109f05ba56252a95bca50505ad9cd66f4e0e234e8 SHA512 86c296511c0766145097625a62bf099c3d155284d250ad6e528e788bc90b2945838498dfe473c6c6c78d1694b6fba8e19f7dee0d064a043841e6231603fff668
 EBUILD boost-1.72.0-r1.ebuild 11337 BLAKE2B bb6e82cc6c0dd49627cbd9841a4e02cf80e5e4dc3588a10c93abe587327bf3ad0d2e427bd3eb4944a8c0dee53c48de617e7305ba80091385e1a448c3e86cb544 SHA512 f07607be1571a204f050a9ae7d8c2994b944259301c1c3cb0bb81d7c84c4721b8baba8bd2795abaf01585e6a36749492527b5c8ce56c2d3fe81ba52590d9e2e0
-EBUILD boost-1.73.0.ebuild 11203 BLAKE2B 606b48ca8b250af8d7a23cc545229d56de31478f66c33bac345892c1b3ba3c9ddc1bb057ab38b83267a1cd5b9ee8a1e3ca751dbcc5df9e48cb413e0d927bff77 SHA512 5eb05cf61066eb6db9e7ef8a7ada144dc649d53e373c0bea2189f125930cdde2413b07eb5b2ca0a395dfb8af0845c6a2d39dcb098543fbfdcb92f3a538d7c40f
+EBUILD boost-1.73.0.ebuild 11236 BLAKE2B 13312c8b44e2c0ac3633d773e7790d241557342d494887357a6f62d561bcd622715245e4b02259cb6d3ed92d7566453034f463fa4370234146892367e4207c08 SHA512 37deefaf6f5eed06e96774782fca198e508f69c2c26c5337e23c5598d68834c85da0d188a0cd8cca46b479cc54a5d2cf5e09cbbf145b403a1317e6dff573c204
 MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd
diff --git a/dev-libs/boost/boost-1.73.0.ebuild b/dev-libs/boost/boost-1.73.0.ebuild
index ae462476523a..bcc792402694 100644
--- a/dev-libs/boost/boost-1.73.0.ebuild
+++ b/dev-libs/boost/boost-1.73.0.ebuild
@@ -32,6 +32,7 @@ RESTRICT="test"
 RDEPEND="
 	!app-admin/eselect-boost
 	!dev-libs/boost-numpy
+	!<dev-libs/leatherman-1.12.0-r1
 	bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
 	icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
 	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
diff --git a/dev-libs/boxfort/Manifest b/dev-libs/boxfort/Manifest
index e4dd730f16fa..c390554a624e 100644
--- a/dev-libs/boxfort/Manifest
+++ b/dev-libs/boxfort/Manifest
@@ -1,3 +1,3 @@
 DIST boxfort-1456d9a3a3bcb506cdcd1b5d4b852e967deb5e57.tar.gz 41705 BLAKE2B 89644ecf64e5a5df718fa4f873d21e281c777c893af5a8f71c8a1913270ca6c67dc36113e5d219540bb04c7f9e26be22f7e778bd9bdce230df8c0edf3a707612 SHA512 249b0bd0048c53c74d2b50f1b7caf84b0ac0823679bb6adaade095a2ff26586f14f58cee960610d99dbc38c8196cbdb99143815b14d10b7f13a12f96d309e302
-EBUILD boxfort-0.0.1_pre20200110.ebuild 947 BLAKE2B 988aef44b60cb262fc05095e8489442c156de8f0a96a6adbbd2f1a72e89a1d8dfcac65499784aa2b030dcab69e24e11e4f385926fcfc4b2bcfe3b1f26a23f95e SHA512 a84b29f219540489281aa49c1072f41808a97b3ec9a439249a4e1326d5eced987fff31571f5b1c4214cfc0293d48c0ba42d2441c86cfbb696cf2256110db6141
+EBUILD boxfort-0.0.1_pre20200110.ebuild 946 BLAKE2B 955d51f99410c6fad234b3809d39dcf4ddcfb9767926a0d10faa29d3617ca268f74a17186cfead644abe7c299e33ada7df528921e8e93800d4e223e647370bdb SHA512 e9d41bc6d42a6aafe88143bc18ab77a2951edf9da7979a8df27e84b3e55bf3ad88db4fd11a41d64ccb6f69d166b34048fcd2d9472903648fd0af93016cf4d069
 MISC metadata.xml 462 BLAKE2B 36e684c3f60dbb9b8a300c2ac9e93aa2ecae94578ac292601f926d371462ffdded78318860f37407a3c4bb4753f173b298f73e8863b4eaa1e873aefab9053546 SHA512 be917138f28a526bd0bea7f17b719a93de749a923bf7fe380ac06db3ae7abc23ceac0a97504f2ca22a19f99bc0f53dac5a524e1025faa8edafcf0452ef5230ad
diff --git a/dev-libs/boxfort/boxfort-0.0.1_pre20200110.ebuild b/dev-libs/boxfort/boxfort-0.0.1_pre20200110.ebuild
index a5088a597a6a..9d66cafaad8c 100644
--- a/dev-libs/boxfort/boxfort-0.0.1_pre20200110.ebuild
+++ b/dev-libs/boxfort/boxfort-0.0.1_pre20200110.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Snaipe/BoxFort/archive/${BOXFORT_COMMIT}.tar.gz -> b
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/cereal/Manifest b/dev-libs/cereal/Manifest
index 4ffd0fac7862..533a7542390f 100644
--- a/dev-libs/cereal/Manifest
+++ b/dev-libs/cereal/Manifest
@@ -1,5 +1,3 @@
-DIST cereal-1.2.1.tar.gz 301994 BLAKE2B 0fd5649b5e9c12615a0ca68939dd48544c749483ac114c35e3e7238de0ede624b12ded8e0f529df186fbdfd1069bf35821504b04cc1a40d87dbaf7a8ff82b15f SHA512 f0050f27433a4b544e7785aa94fc7b14a57eed6d542e25d3d0fda4d27cf55ea55e796be2138bf80809c96c392436513fe42764b3a456938395bf7f7177dd1c73
-DIST cereal-1.2.2.tar.gz 335759 BLAKE2B 6804b9aabb235a546758c70554502208f1b7b6bcab9b602fa075123335331f0522191a83027fdbac4ee947881c6866f24f48223a00b9490fca5ca961f3e4b260 SHA512 9567b2e19add9446b24f8afd122eea09ba6ecd1a090335cf0ab31fdc8f64c6c97daa3d9eaf0801c36a770737488e0eebf81d96d7b7a65deed30da6130f2d47eb
-EBUILD cereal-1.2.1.ebuild 609 BLAKE2B 50f1e95aa7f6170f7586debde95765334529ce70252f594305f4f84802a28258c2baac1ded2d14a7584784707e77158ee989f45f9adc4531da2cd932eae37a33 SHA512 7704b66514c95b9ea8f0135157b144588ab86b1519937a847c6430273f9ec0aad090fcc7651e9a100b62e65ea3722c5d7374b4c3d731a10552039f82aa786c33
-EBUILD cereal-1.2.2.ebuild 557 BLAKE2B 683cddc30d6e8c41ce82b813bd42ae684d4b443a01244fb7767beabcc03a522eab55e102df1d0d8da954cc777af8c7937244a93d76225b20c3c72bb373d59649 SHA512 dbf756221e0eef4ab69e8396056200e9c184da2eb62951aa84c0c0e06c3b5b2192c3f389b58c5b4cb8c81dbc56c128b1b46e85d91f8cdb1dd805c1efe125d090
-MISC metadata.xml 332 BLAKE2B a679c74a4685ee5284dec4d538af8be073746c2a00f777949a891942870bba3d06e732ec4d195c84c822036a060015984dc05b529696fe9a256348c435efe6c2 SHA512 efca0ade811924778a8cf3694bb6615636e8dcb9ae131b48659671293b49c8970be2e66dad7d413877246c8b0178656216c361364c02834e1eef8784e772191c
+DIST cereal-1.3.0.tar.gz 374585 BLAKE2B 67bcdf8715585d8913c6ae4ff1a20d77df0eb95816b37a77620a3f08000b6e911afbd295236a6cd0394d3242ae0a3b2619f6e168503724517c9c66bc20f1d07c SHA512 2bb640a222d4efe7c624c6ec3e755fecae00ef59e91c4db462e233546c5afe73c065ba1d16d9600f7cd3cc185593109148008b0b2b870208e2f1d6984fd40c72
+EBUILD cereal-1.3.0.ebuild 553 BLAKE2B ae9b5d7897c871ef8f67495e0162f1fd5c88abb03eb146c17321d49b53454d5369725a80bf421a75a60b977aaa5eb98007f4fce258a83f1b45e7f3c0099abf52 SHA512 9d6f822c803d6da65184219b0644b1f6941824ecc67de12c6325be3e6391bdce32826f993de434ac7ab690579956bb6c2f6688c54b5db4511856c1686f96e618
+MISC metadata.xml 246 BLAKE2B 70c6851c1f49e3762973bad9dc77d74feb88e75748b113e8c55df939e1dabada66a25008a73f29e0f3cc7d4c62295f3289fe12eae44c0ad250342027abba6993 SHA512 728b85be92686499b77af7d61d7a22d28fd8f41e8bbfa637021d033021d3f43c7516308763f02157cd5317766f9dd39f01ec55eae6b00b7592535de53bc23830
diff --git a/dev-libs/cereal/cereal-1.2.1.ebuild b/dev-libs/cereal/cereal-1.2.1.ebuild
deleted file mode 100644
index 3e62e1429c37..000000000000
--- a/dev-libs/cereal/cereal-1.2.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="header-only C++11 serialization library"
-HOMEPAGE="http://uscilab.github.io/cereal/"
-SRC_URI="https://github.com/USCiLab/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-libs/boost )"
-
-src_prepare() {
-	sed -i 's/-Werror//' CMakeLists.txt || die
-	default
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DJUST_INSTALL_CEREAL=$(usex !test)
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/cereal/cereal-1.2.2.ebuild b/dev-libs/cereal/cereal-1.2.2.ebuild
deleted file mode 100644
index fc09025d5883..000000000000
--- a/dev-libs/cereal/cereal-1.2.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=6
-
-inherit cmake-utils
-
-DESCRIPTION="header-only C++11 serialization library"
-HOMEPAGE="http://uscilab.github.io/cereal/"
-SRC_URI="https://github.com/USCiLab/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-libs/boost )"
-
-src_configure() {
-	mycmakeargs=(
-		-DJUST_INSTALL_CEREAL=$(usex !test)
-		-DWITH_WERROR=OFF
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/cereal/cereal-1.3.0.ebuild b/dev-libs/cereal/cereal-1.3.0.ebuild
new file mode 100644
index 000000000000..463e000b4b75
--- /dev/null
+++ b/dev-libs/cereal/cereal-1.3.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Header-only C++11 serialization library"
+HOMEPAGE="https://uscilab.github.io/cereal/"
+SRC_URI="https://github.com/USCiLab/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-libs/boost )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DJUST_INSTALL_CEREAL=$(usex !test)
+		-DWITH_WERROR=OFF
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/cereal/metadata.xml b/dev-libs/cereal/metadata.xml
index 121a5e6a9585..9758da161376 100644
--- a/dev-libs/cereal/metadata.xml
+++ b/dev-libs/cereal/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">USCiLab/cereal</remote-id>
 	</upstream>
diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest
index 917579374b07..2b9b23cfdb79 100644
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@@ -1,4 +1,6 @@
 AUX check-0.14.0-r2-disable-automagic-dep.patch 769 BLAKE2B 286eeaa0e45e524c400f1967756b2e2912d76826c2fb92d9008afc338f19a4edc55b23e2751ce46f52e2fccc3e091f7143647a42a017c02ee580e138c3a50536 SHA512 4370bb6551c3e2f414b6580f26ed3a7429278139d5835b44c8769f1583363aaf8e25982e6f86bbcf2e7fc06d3c406d9a2af4a47fbb99377c6589f276aa9f29a3
 DIST check-0.14.0.tar.gz 303471 BLAKE2B d602bb56d205eccf06e4177e3f6d3f7270c3a0cba0e1d397480f0409a916ec4118c48340ad6f6a8955ea30d9e22252ff8381a687d000c3f8e62828cf656f1245 SHA512 54ad175c00cf0c73b4386cf6b3d6a404a5da4f57897d099e772f148f410108c44767c3266a940113be73a6861b3f3ee1706c558cc71ec51df99687f19f3a3bb4
+DIST check-0.15.0.tar.gz 306428 BLAKE2B fea2a169b86248a6657f890469f41cd699dd95efb91e311ccf188548a6c8c28568decf0b5f03b08aed31e14c69d50707b418e1e71c6db7e1b7938ee36aa19cd8 SHA512 efde93977a38520b3b83a9e2f678d07b916fc27e41cf839a663900c4153d645fe4274ec3b7e2dabf475457f909f61734632c97b7257c49f5853fd11d920b0c84
 EBUILD check-0.14.0-r2.ebuild 1498 BLAKE2B f9c8ceaf6000ce5c0878bf85a2a88f3098d40f6c77c7f928f81fd91624bd9293fc447f94498e5e475b3f699d115b80b5705169ab99560b15fa779c924be81a14 SHA512 815f57a1c3474e680dbd55b1d514daea2626fea087aef056b5d0547cce11ba9815f6ff4ef5e36d4e9b1b8264191d3ba30b40d29b882446c09ea6e90c1b91b100
+EBUILD check-0.15.0.ebuild 1507 BLAKE2B 8e46aa33a062e1f98734c5e7181e594484d59921e57fce8e3acadaabc5dfc6a8b23fba210a27c85c51e17ec2493659786796b5e3b776ffef5486c449fc793721 SHA512 c3193e289ae1d6ad1d9563f052a5ceb7fd582b30f312b7e6f00e5af2d444e83eb73f6660f2a69358fb626d144e8533d5310f63ec59f939e9daa2f409f38979e4
 MISC metadata.xml 488 BLAKE2B 27eb0323a4d7cac50b2f4ee935c75e7a35c34066a0dbc5bf21f8b4fb93abe82aa79a5fa1fafed0e623417ceaa553dc8395f201a24c3e0123df3104be44106bb7 SHA512 4b69b4b1ca91bfe4b04d03935d3d6e9b8ca10ecaa538884834f357708db5380a90e9cf1fdcef7996b7c4d8a23c0cb8e1d9eb9d34faa584637804ebc67657be69
diff --git a/dev-libs/check/check-0.15.0.ebuild b/dev-libs/check/check-0.15.0.ebuild
new file mode 100644
index 000000000000..d882baeb2af9
--- /dev/null
+++ b/dev-libs/check/check-0.15.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="A unit test framework for C"
+HOMEPAGE="https://libcheck.github.io/check/"
+SRC_URI="https://github.com/libcheck/check/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc subunit test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="subunit? ( dev-python/subunit[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	sys-apps/texinfo"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+PATCHES=( "${FILESDIR}/check-0.14.0-r2-disable-automagic-dep.patch" )
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Fix wrong libdir, probably caused by multilib
+	sed -i "s|\${libdir}|/usr/$(get_libdir)|g" check.pc.in || die "sed .pc failed."
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+		-DCHECK_ENABLE_SUBUNIT=$(usex subunit ON OFF)
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+
+	if use doc && multilib_is_native_abi; then
+		cd "${S}"/doc/ || die "Failed to switch directories."
+		doxygen "." || die "Failed to run doxygen to generate docs."
+	fi
+}
+
+multilib_src_install_all() {
+	use doc && local HTML_DOCS=( "${S}"/doc/html/. )
+	einstalldocs
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/dev-libs/chmlib/Manifest b/dev-libs/chmlib/Manifest
index be74a686c0e3..34f3e27164f5 100644
--- a/dev-libs/chmlib/Manifest
+++ b/dev-libs/chmlib/Manifest
@@ -1,5 +1,5 @@
 AUX chmlib-0.39-stdtypes.patch 624 BLAKE2B 29de38c9de0faf7b924c0220a6ef77d338755fa57b87a120db99866b85cf7b8b4bdcacb2d5ba301eeecc6ed167384aceedf059f232a933ee920ff3ad8b9e1388 SHA512 123c28fb581c59f7aba886a0ef9ccdc31586411ad23a716759738075fa9006b2bb170f371c2e272dd21816fed3e426ab4259f16fd2ea9220c4eb005a9edf8194
 AUX chmlib-0.40-headers.patch 361 BLAKE2B 182336c3e3ac3c30226c4860315ecae2d6fec900a84e49b4f7daaa84ecf7ef1e249d46fb059978afa43ed00bffef6eb915ac19b1f78eff98714d9e633f642b5d SHA512 985cdee377e53f7df8d3d53aa305069fa138388397494094498415ec1b026bcb5e2e218ac91ed8977c930840a73f371124b0f7bdadbc1b79a65384b333a4b8d0
 DIST chmlib-0.40.tar.bz2 252036 BLAKE2B 69216120f7efcc7bfaa30faa46d9f2e2490923a6b42a766fe39838bda2b3b033ea39cb0c05eeab85a66b5a69f9297a6a412c375a2d790a463c7f6338610432fc SHA512 3a3e151cf455b19e9e7c163a1d1e5ac52e8196f0b98f77932c72af58f3517824b9244667a18279ae754ccea784f6d6ab0c47465e74e3768ce98bb7dca0ca16e3
-EBUILD chmlib-0.40-r1.ebuild 673 BLAKE2B 9ca18204cdcd9818771936774c21ec51d491aad72bc1f5a190e168bc5912ab4a145ee7bdff6de602e416a5d0a9290e4213376ebfea9e5ad8e699972633097614 SHA512 e16f31720eface2e52419432bb6c412f2b26177b1977ce6c8c3f88747aed316d21285da1d8b3249e0c66af4a52a36da549ed26ee98b1b51e6d018d61584b7049
+EBUILD chmlib-0.40-r1.ebuild 824 BLAKE2B e3274916e314e100665532627205f82bf7b3b2b2ad8c9b473d2ee48a87700c899cff75f000503ee150b3a52740ea91df16cfd058b5ca9273f5890d1691a42f80 SHA512 e1d7ef48841086cad69905923995c67c161829182822786654d26c393df36a4f17c2e5d29e8a3fdbe44636b4577c087f8cf5ca3a1e06fff21053ccff8863b33e
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/chmlib/chmlib-0.40-r1.ebuild b/dev-libs/chmlib/chmlib-0.40-r1.ebuild
index bb9a74993b78..957e5d88bca4 100644
--- a/dev-libs/chmlib/chmlib-0.40-r1.ebuild
+++ b/dev-libs/chmlib/chmlib-0.40-r1.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
 
-inherit out-of-source
+inherit autotools out-of-source
 
 DESCRIPTION="Library for MS CHM (compressed html) file format"
 HOMEPAGE="http://www.jedrea.com/chmlib/"
@@ -19,13 +19,21 @@ PATCHES=(
 	"${FILESDIR}"/${P}-headers.patch
 )
 
+src_prepare() {
+	default
+	# Required for CONFIG_SHELL != bash (bug #668408)
+	eautoreconf
+}
+
 my_src_configure() {
-	econf \
-		$(use_enable examples) \
+	local myeconfargs=(
+		$(use_enable examples)
 		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 my_src_install_all() {
 	einstalldocs
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/dev-libs/criterion/Manifest b/dev-libs/criterion/Manifest
index 94e4e94b6d81..c13ac10c8390 100644
--- a/dev-libs/criterion/Manifest
+++ b/dev-libs/criterion/Manifest
@@ -5,5 +5,5 @@ DIST debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz 5613 BLAKE2B 787
 DIST klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz 99303 BLAKE2B 7804c030106ffab44afcbc1ac77d644e7dfef7c107d4f9679a3a4b7506e41ada65e87113831f94fc5c6f70073356c38a317153e01f1985522029990e9af40544 SHA512 fe4f0cd9b5ff2d5605d388f8a67d6c7211320d0fea6fb9b2df0c9b1e67a1f683b80b86cac007b0cfbd264b75bc0e4849e772506c2ee66b86967e5ee24cc89e1d
 DIST nanopb-6a6903be6084bb3f5a98a3341acef2aa05c61df9.tar.gz 248884 BLAKE2B 5ab65dbee87686ac8fb4985c3a8c71cdc946580248318a4f566550e5f7dab492c00cf3be471e04313a15c4ad3659f71744bbb30686506d2950588aa3c26a37fb SHA512 14ddc420e8a38116d0f7fbf01623728f14048ddb41b3ac6024d7610532071ecb8ce88b25e3440f9f4bfe9ee7d376071e2eb9e0c166f3e2982f35cc155dcf0362
 EBUILD criterion-2.3.3.ebuild 1072 BLAKE2B 11263468ead77bec500b65fad1873f37f11d01041843e1aa137812d4e1385b706920d397c32b9c23671a0a061b4ef0eaf38cd70e75ca8b31037cd69ba02f5b04 SHA512 1592287e01a1ebebfd13658db3de23a5c10d8ed162da81460519d522de23a898c994660861ba825ee57b6863f1aeb01930d98bfaf096f370d33de40c6eabc2e7
-EBUILD criterion-2.4_pre20200110.ebuild 1855 BLAKE2B d779528295bb21d92af34fda959032a1303d62e9e79f86ff5439deae42bb02d58365b11ef572973115d0506ca0641cee1438963d84de851dd99724b598c6f96f SHA512 cc297c64de4d778b0ed4156c3015c39380fad8a79536267985fdb953c7898cbc8006b87a59c4344d10d41171915cce757bd2c0e7a297b1279d90db34537955e5
+EBUILD criterion-2.4_pre20200110.ebuild 1856 BLAKE2B a2cd76c4874eed3a9d604425023d545453ee3b66467454fa0282ca775632e2eb7a66b9df539c15c3692e6b41e9b5b96b7509a293214c3b082e764d3d17780050 SHA512 4aef26ada1b00047dd2a5a73d1e3f016b3223d0f135962f568a2bbf558c6597da18b7f362b5a331b3ee4e3e261cb0ded78a2c7a21045b8dfc5ee46df26459645
 MISC metadata.xml 464 BLAKE2B 336514e525410272f84e05c76be4fad57be4198bc88ebcc5f048615f233a0b69035b27728e15b2190ba04c13671aee6756be24b4fe8a5b09118b78abef918529 SHA512 42131d0130a9d260ac5f305a261c883a3c6222c21abdeef290d9f71f3080932acbd4127eb44266b4c69c782eb63f18df4fcf4a5a97829d9f8483fc1d3d853a1c
diff --git a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild
index d26ebb1a9568..c96a9344ef58 100644
--- a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild
+++ b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit meson python-any-r1
 
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/Snaipe/Criterion/archive/${CRITERION_COMMIT}.tar.gz
 
 LICENSE="BSD-2 MIT ZLIB"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/crossguid/Manifest b/dev-libs/crossguid/Manifest
index 0447fbd39fe7..1c3a99f6c11f 100644
--- a/dev-libs/crossguid/Manifest
+++ b/dev-libs/crossguid/Manifest
@@ -1,3 +1,3 @@
 DIST crossguid-0_pre20150817.tar.gz 46569 BLAKE2B 3384b6c507c4713f5ea0d6012138f3543445a42c7353e934e267b91275f7cf75720a446f5fe24f334b1022946f856a65f5c158d0036c999c761e626c1e30062a SHA512 823ca301f1d3b78a778649cd9169194d98dd33c65cadd5bfb9f86429e82049c99c17e09f093b92675981d2aac2aac25b60cbb157fad57a3e1bada826edd8ba0a
-EBUILD crossguid-0_pre20150817.ebuild 1032 BLAKE2B 4a0aa8d7db11510c8d8c2e57b91dfd9745f1e6ed15d6e98b50dbdab73ff05d4e2a407568620becca250f62e931ec14ba8b9f2eb104eb1c21182ff25aabbc655d SHA512 ecda745d797e6ea79d8aefc5d6edb5f1d956ec3db12a9e8a8ca3ae616e23d611af2c4e2cf9217c6da956c051ef48035f2a3a4a06f5b40d0e872db37ef53085eb
+EBUILD crossguid-0_pre20150817.ebuild 1036 BLAKE2B 1c235494b810a15de702903f40321cd5144c4f564c706e4d5ea96a4c3edde29d7c87084c9c11ce3ed140277c5ab3677d0c46a6f323677d66653b20ef4d49edb1 SHA512 19b9dd47f589650f72b8232fa6b1812231e5ec505e61727ae452eb9302f67f19283f8ef12a1cff92a7bc42cb2abbaa1f7533da413eb565afd32e2b75fb9c536e
 MISC metadata.xml 249 BLAKE2B e76b8e1b26522b43a97fca8a4678caf478be9cf4c7c6acdc0a51ea6bfaafe545ab12ffcd28dcca146549b0b2cc790fd764e39f0684ec9d369ff7f54f7cad16bb SHA512 81a2303b39a3473f4974960abbafdee923ca794264443e4f54ebba440a3d3ff9cfd247964cb226c6170d1d2a48642e6da25ab9b95f748b7ea1fa7e88afcdcc52
diff --git a/dev-libs/crossguid/crossguid-0_pre20150817.ebuild b/dev-libs/crossguid/crossguid-0_pre20150817.ebuild
index f2987df8d078..cf3fcbb50163 100644
--- a/dev-libs/crossguid/crossguid-0_pre20150817.ebuild
+++ b/dev-libs/crossguid/crossguid-0_pre20150817.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"
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/graeme-hill/crossguid"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 # We use libuuid from util-linux.
diff --git a/dev-libs/cyberjack/Manifest b/dev-libs/cyberjack/Manifest
index cd62e4bfa882..5645c9406ffd 100644
--- a/dev-libs/cyberjack/Manifest
+++ b/dev-libs/cyberjack/Manifest
@@ -1,6 +1,4 @@
 AUX cyberjack-3.99.5_p14-gcc10.patch 344 BLAKE2B c535dd6c5d034b0ad81dd6ce6364d2c8807e1adfb2391d5b801cf285260c6f55c2bdf9f56e3bf4c0fc06cc8f87128855f34f6e3519a6ebc67a7b6eba10aa8008 SHA512 7ee096fbca22ffccff1ae941c7e16578ee10ab3b7704902dee4643bdf1a3d1592ae5cd19625414245fd4c1ee6f10d8a869e273e47d71c47a3300356a0709995d
 DIST pcsc-cyberjack-3.99.5final.SP14.tar.bz2 1090014 BLAKE2B 15c9d0225f03d1fcbc636b6f8ae29f265243af35bc78c48f2e9cca27c7731ebb30069eb5bf377ce66d2c7afb31e1fb5d839001fa21e854a4bdc56237bf780327 SHA512 f39e4f13776d8c4e4bc5ea3cc64e64649d8dea334f50b9bcc9cc6f1fc9e7433ef32b8fcb00b5dad78867029dab0a099c0d7799d7e8f80d0f310b0f53dbd2a7b9
-DIST pcsc-cyberjack_3.99.5final.SP13.tar.gz 1617714 BLAKE2B 344f00217fa5dfb18e5318d2b8ccb88a3cc12b86a9c14d41a9800d701d0fc7a0a486a0b3c05188d07d1f7c51c4c514c48a55d987d8d9d2af574f427e550c8654 SHA512 74ac56a0f74a69006c87e2c22e147b65d26582d29753de03d56e4ad76413f4477a031d47f5eb074323b4ffd000b0908a1fb2b12fb7d91e9b3ee67e983e09e968
-EBUILD cyberjack-3.99.5_p13.ebuild 2053 BLAKE2B db68e22e63e6baef0a5ef2c0a1bee7a80a7230029baba274da4d4adcb48e71ad9d75c231f8e45372e047658c0f392f1f87639b29ef43e072695f91cc9f5edeba SHA512 7e6e012f1c60baf55b6565144dacef25022336f8895731363f561837330dfd60d5e54b6b4d8b2af502a4a87405ccf32eb9d323f8b92db6b75001a8b7191d38a6
-EBUILD cyberjack-3.99.5_p14.ebuild 1951 BLAKE2B f942b44b30284cbd3057c260df7aadb3de3e141c3ff5d16b8a9356e76496e6f5d5056123115245de62e442957ba1cabb2b5ef63ef4dc1aea8aad834f971c2fa6 SHA512 5643599f37a04cf0c9d501c17ea023a1df22157a91c1c3cf17067e89b2ff5a469973c1a6d10b011a85aa944bf541c32e4e12e41251c5feddc4c3c28ea143f73e
+EBUILD cyberjack-3.99.5_p14.ebuild 1950 BLAKE2B 92c1ac90af31182ede791bca864e48a1d703ca105b06b804ee8201662efe4a9ab7b3d76d3671b1dfd8b6246ac935295fb80bba5f33da065e61274b3e9a6ef93a SHA512 4a50cd74805265cda12a2a8737f57c403f1fdd204daa405e36d7173b6b0d6eff70ac087904c28737867886148ec85c5a23c7d77292ad7e1190ed92cc41a27258
 MISC metadata.xml 622 BLAKE2B 4238fe4ea370787f4542d53d161afaa0c0df5788d7a2da5ee6b99b788ae6d4456cd43d6ea8df0a174431b4582127fb49712a59ed2acdbeaf4808f57b8fa44930 SHA512 2062ac48ee73a6a58a2663e39f467e8e55f06af48b7a04b5f174e467c3f33d4b92b93b8fff3747447503b3256fc514fc40c8e07f7cbec8e1608d6389d9aed4ba
diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p13.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p13.ebuild
deleted file mode 100644
index 97f2ad1beba3..000000000000
--- a/dev-libs/cyberjack/cyberjack-3.99.5_p13.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="pcsc-${PN}"
-MY_PV="${PV/_p/final.SP}"
-MY_P="${MY_PN}_${MY_PV}"
-
-inherit autotools flag-o-matic linux-info toolchain-funcs udev
-
-DESCRIPTION="REINER SCT cyberJack USB chipcard reader user space driver"
-HOMEPAGE="https://www.reiner-sct.de/"
-SRC_URI="https://support.reiner-sct.de/downloads/LINUX/V${PV/_p/_SP}/${MY_P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-IUSE="static-libs threads tools +udev +usb xml"
-
-RDEPEND="
-	sys-apps/pcsc-lite
-	usb? ( virtual/libusb:1 )
-	udev? ( virtual/udev )
-	xml? ( dev-libs/libxml2:2= )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P/_/-}"
-
-CONFIG_CHECK="~USB_SERIAL_CYBERJACK"
-
-pkg_setup() {
-	# Add workaround for GCC-10,
-	# by defining narrowing as warning like GCC-9 did.
-	append-cxxflags -Wno-narrowing
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-debug
-		--disable-error-on-warning
-		--disable-hal
-		--disable-mac-universal
-		--disable-mac-arches-i386
-		--disable-mac-arches-x86_64
-		--disable-visibility
-		--enable-pcsc
-		--enable-release
-		--enable-warnings
-		--sysconfdir="/etc/cyberjack"
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		$(use_enable udev)
-		$(use_enable usb nonserial)
-		$(use_enable xml xml2)
-		--with-usbdropdir="$($(tc-getPKG_CONFIG) libpcsclite --variable=usbdropdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use tools; then
-		# cjBingo can't be compiled, as it's defines stuff, which got dropped
-		cd "${S}"/tools/cjflash && emake
-		cd "${S}"/tools/cjgeldkarte && emake
-	fi
-}
-
-src_install() {
-	default
-
-	use tools && dobin tools/cjflash/cjflash tools/cjgeldkarte/cjgeldkarte
-	use udev && udev_newrules debian/libifd-cyberjack6.udev 99-${PN}.rules
-
-	dodoc debian/changelog doc/{LIESMICH,README}.{pdf,txt,xml}
-
-	docinto html
-	dodoc doc/{LIESMICH,README}.html
-
-	docinto source
-	dodoc doc/*.c*
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p14.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p14.ebuild
index bc4e83876eeb..eb2bb547afb8 100644
--- a/dev-libs/cyberjack/cyberjack-3.99.5_p14.ebuild
+++ b/dev-libs/cyberjack/cyberjack-3.99.5_p14.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="REINER SCT cyberJack USB chipcard reader user space driver"
 HOMEPAGE="https://www.reiner-sct.de/"
 SRC_URI="http://kernelport.com/reiner-sct/SP$(ver_cut 5)/${MY_P}.tar.bz2"
 
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 IUSE="static-libs threads tools +udev +usb xml"
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 0360cf8cd954..cee53168495e 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -2,6 +2,6 @@ DIST gjs-1.58.6.tar.xz 637972 BLAKE2B 553f29808723e48cee39c62e260d9c09f5db160756
 DIST gjs-1.58.8.tar.xz 639372 BLAKE2B 53be0d5353213e7fdc6009aeed16db79f61ee5b800d66cd79f87e577b44adbb05ae741d73550237027a902d2e038c8e8247d3269bf058b64622a1a261f5a2501 SHA512 373b400b884096b6746c1ac7f2c2915857aa888dfb8bbf19bb8469fb75e081e4df36dcab06723f03654c34354a5a69a7865727ab9e36d3fb0d2b2652713e5cd6
 DIST gjs-1.64.3.tar.xz 422436 BLAKE2B ade874085962f43fe7cd1412966557e4c40daf030b71a04b61f2b811b6056ae3abaff0cca04d9bf852dbb045a5a687dc27f5301c19235138f3d5d50be41f10c6 SHA512 9d92e52a7fef07853f3beb181798f89deb60b97b928d916cd827c99a6ab8f83abf7c352a1aa46be476a50e2efadfaf09befa54ccab0d51b0ac7127f2fe794801
 EBUILD gjs-1.58.6.ebuild 1606 BLAKE2B 2f10f926af7b704a16765b7cadd0ceee510b0f996ef160338abe019483384b4682a7fb89ec50d8958b0fb504be30574dd04ff7493af23df9bd44d8dbe071ca7b SHA512 e72901d389173016cab161a5126d3fd82a0dfa6a4d7fd6c21a381b73868ac2db891418742c88acdfd8769b8a13f01552173c19c31af39a47178681f870269490
-EBUILD gjs-1.58.8.ebuild 1613 BLAKE2B 3857ae2f6b7f9fc589a9abb4b3dbff4042cd7ee7cd543630d7eeab4ab0b55e18c408bb84ffe1e6ed7de552d2d64580d0b1f966f259f5c465f59ed3042c04ece2 SHA512 eb4ef64e73ca226340352e5e5426cde2b95ec3bf4034b5a43a1c9ec98515aa3148ec25e2259a28d524a290bf9bbeddda55d7e81e8358e61098f4813fa3cb7e23
+EBUILD gjs-1.58.8.ebuild 1609 BLAKE2B 7b3b395b5797547d9984ff0dce4576d86448d909772271176aa1978e8889237b14c3e4e1529bb1c7d08de086382afc985122eeda0a887045f1ae7f5f1bcfbc56 SHA512 0ffb57edb3de50003184dcdae1d418bb285db39e14e761586b5ecb042493cbeda12465cd7d413a7492dfd5818a12d588e39e3716a0297126aae11fe2c08c753c
 EBUILD gjs-1.64.3.ebuild 1041 BLAKE2B 711d626dacf32d9a896d23d0998103dcb2aac96bc7216b8edbce016233c42f9f26b11809690f9a62938bb0700ae0a3b415be02b676d8dc3c90973970558f81fe SHA512 17bdd21a6489b139c4fe1fd10f580fab3553250e825745e499050aa07ac00b8fa110eee88deb17f1a36c42f0ee109f55f7d3a3da26911aa74f556c72dacc7a3e
 MISC metadata.xml 388 BLAKE2B 9b4ab74929619cfb6c4405385667aa00521f59865df8338e9078286f2efa593dc49412153bd5b45e4fc4cbcd4c13a75c4743cd4381f05b07bed92cde09bf28fe SHA512 8aaf5f422cd8b63a71aa7773690607fb2d8ad6e6a7e350686da8e26ff4e6856c7f352ab02a79a7f2917b28758ff523a6aa6ddcfb2a1ad876aac94e6b2bd48072
diff --git a/dev-libs/gjs/gjs-1.58.8.ebuild b/dev-libs/gjs/gjs-1.58.8.ebuild
index c0859f6c9be3..f03433ba7e3d 100644
--- a/dev-libs/gjs/gjs-1.58.8.ebuild
+++ b/dev-libs/gjs/gjs-1.58.8.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk readline +sysprof test"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.58.0
diff --git a/dev-libs/iniparser/Manifest b/dev-libs/iniparser/Manifest
index 69cc407fe65f..908f5b44b0e6 100644
--- a/dev-libs/iniparser/Manifest
+++ b/dev-libs/iniparser/Manifest
@@ -4,6 +4,6 @@ AUX iniparser-4.0-out-of-bounds-read.patch 768 BLAKE2B d1de412aa113ed5e0c7f4f91b
 DIST iniparser-3.1.tar.gz 39097 BLAKE2B 4ada36f5bb95476c06deffa7938a750bcdeb0bd5bb817b24274c1e1c588d9abbd23c3a58f3cb3b6f961912f3e12e74aadf224da4cd81863b874e4a84d11c1744 SHA512 8fd8324c5629fdc3e3eff00afb5f0832402ccc760c5b92db82aa29b340ec891419ca2c4fee3a4d4d67cf9bc51c76b095bc0c458e087c2b8e72ac36867c47ae86
 DIST iniparser-4.1.tar.gz 44732 BLAKE2B a3480dab512b41eb9635c733b76048ab089a311c2970aae5ce89d103ff6ab1923d5824a5fca3bf445ba213ecd9954018fdef2831fd98c1a43c9ae7d4fb1cb388 SHA512 a8125aaaead1f9dfde380fa1e45bae31ca2312be029f2c53b4072cb3b127d16578a95c7c0aee1e3dda5e7b8db7a865ba6dfe8a1d80eb673061b3babef744e968
 EBUILD iniparser-3.1-r1.ebuild 1124 BLAKE2B 60426fa1400c834afff787171c63412c07fc3f7b091e0b740445b9d8b667e5d58c107c302cd3fe216bf2c500e41f8396bb1552312ae5c5504a83bf78fc118a52 SHA512 367f845f53ee952e7dbb43fcd9716205b0d24c9ac271a5732cc783d5c11c5b85aa2d35dcb7304edf264aeb214aa2db445e761112c87cb3315452562773a33ed9
-EBUILD iniparser-3.1-r2.ebuild 1175 BLAKE2B 03a2ab0f2d034b16811028d768cf57feefab79ec369430c0a407d84362418ed189781c75389d83ed17412de7bfbdf22b3b358a714a983201182d07b1bf7d8a05 SHA512 24563f7aa7e29e9f1a908f0ab122d09a74abe25829d06022b8f5cd43e1efdb98d3e17197a2626c30f3156393f2c5dba4e1a567995abf2aafcd1cbaa201868766
+EBUILD iniparser-3.1-r2.ebuild 1174 BLAKE2B 34cf773316a4448856fccf1f3fab4dfbc14ba847b64dfb71e1da7350b476a1f6a6eec9c082e9d9a953aff544090aaefb623c17e3070a07924db2aec13303af36 SHA512 c472f665c77a614ed87bbd319ddc29c2305e4180388bf34c2355c20d3d2eb3e83e1f29f3ace908f5d0afc65434b26f9dea3e90e029a3fdb0dc70fb0a8ae1819c
 EBUILD iniparser-4.1.ebuild 1734 BLAKE2B 72bb745a5ef7d4981b1a773d02d4b74d4a6d050f201a63ca9d1dcf64e909d5192b52db804b41bc44150db2e393c56fb6c4205520debf60a0b1b878bba4065173 SHA512 5a7fc67c611460747db3ce304ad9f79b3750f86d757838a7afea3da18e0395dc0d428058090907bcc99d90b5a6e6b174b5105127c94733e5db05c97ac65d716d
 MISC metadata.xml 435 BLAKE2B 788d24983bfab5491f783ec20479370e6e01686d0f5a379c490a0b93d8379a3062e46b497cb911298df3d0de7f0eaaf1606e11a365e92ca5b93041dc935fc9ad SHA512 452ccec03580def2966c0eb2f50af057776387e01819e1ce5226e628204ea94554658309dfb0c54d413f95ed588f44b84133526b164ae557ad6ac7926aa51a51
diff --git a/dev-libs/iniparser/iniparser-3.1-r2.ebuild b/dev-libs/iniparser/iniparser-3.1-r2.ebuild
index 85704921387a..357f9b4f3b5f 100644
--- a/dev-libs/iniparser/iniparser-3.1-r2.ebuild
+++ b/dev-libs/iniparser/iniparser-3.1-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://ndevilla.free.fr/iniparser/"
 SRC_URI="http://ndevilla.free.fr/iniparser/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~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="doc examples static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )
diff --git a/dev-libs/intel-neo/Manifest b/dev-libs/intel-neo/Manifest
index 319463c95176..91a51a9568a2 100644
--- a/dev-libs/intel-neo/Manifest
+++ b/dev-libs/intel-neo/Manifest
@@ -1,7 +1,3 @@
-DIST intel-neo-20.03.15346.tar.gz 2671869 BLAKE2B cf1e242563a377d533b1e5adc89257e3fdd879a0f275f069e9c1c3c8436e269a1ec57e951394d2a487148bfc5393fed0ce1f3feb6954c7ece9de59cccffd628c SHA512 4d2cc8fdcba714832306e6353e8688e12c44eb0f848aad981951ee092274ba8ae032db462b49e874b7ac72e1b8b2b9ba71a84b6715ca241c06a1c70e753e5ed3
-DIST intel-neo-20.10.16087.tar.gz 2942516 BLAKE2B ed77e5dfe950794e9e34cc6a0d8c053292b5673b9fa244ef7b861da93bb6aa58161ad890719013c838b0bbd80f3c22aaafc60dcb72a1e1e565cab51e5467c810 SHA512 8a728a3cffb5960dba8e8ecc160a6f0dd9c2cbadead3db3af2df71af492fdb346628a20c55112e64debb32eb25cf549e42dc78a606ef4bb8f746913781dbb446
 DIST intel-neo-20.16.16582.tar.gz 3042531 BLAKE2B adfc0aee2a315e67ccb3e4fe39ab09b618930607d3de931d1367881642d8e542385589299f593d3ab1cd6e16de7a8fce7b55fa1b4259097e15da7e55034d344b SHA512 700bee3ccf72c2bc89f5c8a75591de9dafbfe0a6480e3216258842c6b68ce1b527569d5fe1327a0a80cfbf79dca1d956820f060b602feefa83fc9b47cb46d7d0
-EBUILD intel-neo-20.03.15346.ebuild 1173 BLAKE2B f60a497821520ee0e8402232e480e3781cbf7655bfdf50bfa20ca15fe6c9fbc80718ed90b552ee860357f7e33511d30030eb0dec2c16fb4de14db311a04ad3c9 SHA512 f9a6835c271660e575a774a5ce24ca900a278f0e00381805030df82b5634aa852c24feccf08a60ddfc2cb576acd7bf954441686c33184fa8ce32016233652e5c
-EBUILD intel-neo-20.10.16087.ebuild 1129 BLAKE2B a9ad6866a2b9362550211617314806262b2cf3ebdf742cbaabd6e3d26d5927b583334339289360afc5bfc7a1329092ebaa809856c60dae8cd1682d47483ff115 SHA512 46626c7cd9917287d4f510e72ce6980a54be44717689fde51ca20db6096b69ca66d0e3f77b9bdb01a460d52e23a9834f47065ba1c389e8c1f65a56db9e3cf45e
-EBUILD intel-neo-20.16.16582.ebuild 1393 BLAKE2B 9721ab84c7db31319ca70b60434629f194769dae897f1b50e1ac1fc7fed513a47823e2faf0dae76a4c48c359793b402327972805fd877f5da4728e399baf3eba SHA512 8d38ea567d1be50ba379866b161c5c8ca399f64290d5890e372a782176ef5e3ef5f95a4beb5aced515164995855bfe5ce34f6067278235dcfd8fded6aeff64bd
+EBUILD intel-neo-20.16.16582.ebuild 1200 BLAKE2B 3581a6099e1188d6708b6dcedc5eb5c6711b9b42d26c31d1f5ce5140db25aed5e6ac408f9e4523b976138cddc53f62b29035d60f987a52fb466fca4da0e2d489 SHA512 0136784383570ab314f8b50196c4ac40010e845d29d812bc72a21e747167880caaa1d6f2cf454cbe14fddf6ad8005147778c201dd1861c82eb2b2e3e5267d9e6
 MISC metadata.xml 1173 BLAKE2B 60913d5c1e3b546b4a9a8f35341761a89a4c8e1a7ed3c63ba992eabfc28c01f790f1eb006220ccb3c764a0b6325e6e8f56186a058ec9387226eb2a911c9b73c2 SHA512 f2b373b08f2b599a1dcaef3ea32157a7278c8088a247d8275f68a35730ee28d065acdf8e99287a853a0a761bc497a5e48c72c3352a8f8cdbc9828134bab6c602
diff --git a/dev-libs/intel-neo/intel-neo-20.03.15346.ebuild b/dev-libs/intel-neo/intel-neo-20.03.15346.ebuild
deleted file mode 100644
index befda95eedd5..000000000000
--- a/dev-libs/intel-neo/intel-neo-20.03.15346.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
-
-inherit cmake
-
-MY_PN="compute-runtime"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Intel Graphics Compute Runtime for OpenCL, for Gen8 (Broadwell) and beyond"
-HOMEPAGE="https://github.com/intel/compute-runtime"
-SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="vaapi"
-
-BDEPEND="virtual/pkgconfig"
-COMMON=">=virtual/opencl-3
-	>=dev-util/intel-graphics-compiler-1.0.3151
-	>=media-libs/gmmlib-19.4.1
-	vaapi? (
-		x11-libs/libdrm[video_cards_intel]
-		x11-libs/libva
-	)"
-DEPEND="${COMMON}
-	media-libs/mesa"	# for Khronos OpenGL headers
-RDEPEND="${COMMON}"
-
-DOCS=(
-	README.md
-	documentation/FAQ.md
-	documentation/LIMITATIONS.md
-)
-
-S="${WORKDIR}"/${MY_P}
-
-src_configure() {
-	local mycmakeargs=(
-		-DKHRONOS_GL_HEADERS_DIR="${EPREFIX}/usr/include"
-		-DDISABLE_LIBVA=$(usex vaapi "OFF" "ON")
-		# If enabled, tests are automatically run during the compile phase
-		# - and we cannot run them because they require permissions to access
-		# the hardware.
-		-DSKIP_UNIT_TESTS=ON
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/intel-neo/intel-neo-20.10.16087.ebuild b/dev-libs/intel-neo/intel-neo-20.10.16087.ebuild
deleted file mode 100644
index cebb0b1a0ca1..000000000000
--- a/dev-libs/intel-neo/intel-neo-20.10.16087.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
-
-inherit cmake
-
-MY_PN="compute-runtime"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Intel Graphics Compute Runtime for OpenCL, for Gen8 (Broadwell) and beyond"
-HOMEPAGE="https://github.com/intel/compute-runtime"
-SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="vaapi"
-
-BDEPEND="virtual/pkgconfig"
-COMMON=">=virtual/opencl-3
-	>=dev-util/intel-graphics-compiler-1.0.3445
-	>=media-libs/gmmlib-19.4.1
-	vaapi? (
-		x11-libs/libdrm[video_cards_intel]
-		x11-libs/libva
-	)"
-DEPEND="${COMMON}
-	media-libs/mesa"	# for Khronos OpenGL headers
-RDEPEND="${COMMON}"
-
-DOCS=(
-	README.md
-	FAQ.md
-)
-
-S="${WORKDIR}"/${MY_P}
-
-src_configure() {
-	local mycmakeargs=(
-		-DKHRONOS_GL_HEADERS_DIR="${EPREFIX}/usr/include"
-		-DDISABLE_LIBVA=$(usex vaapi "OFF" "ON")
-		# If enabled, tests are automatically run during the compile phase
-		# - and we cannot run them because they require permissions to access
-		# the hardware.
-		-DSKIP_UNIT_TESTS=ON
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/intel-neo/intel-neo-20.16.16582.ebuild b/dev-libs/intel-neo/intel-neo-20.16.16582.ebuild
index 4cad60483991..dfa0c9b9156d 100644
--- a/dev-libs/intel-neo/intel-neo-20.16.16582.ebuild
+++ b/dev-libs/intel-neo/intel-neo-20.16.16582.ebuild
@@ -27,7 +27,6 @@ COMMON=">=virtual/opencl-3
 		x11-libs/libva
 	)"
 DEPEND="${COMMON}
-	dev-util/opencl-headers
 	media-libs/mesa"	# for Khronos OpenGL headers
 RDEPEND="${COMMON}"
 
@@ -40,9 +39,6 @@ S="${WORKDIR}"/${MY_P}
 
 src_configure() {
 	local mycmakeargs=(
-		-DKHRONOS_HEADERS_DIR="${EPREFIX}/usr/include"
-		# CMake only sets this automatically for bundled OpenCL headers
-		-DNEO_EXTRA_DEFINES="CL_TARGET_OPENCL_VERSION=220"
 		-DKHRONOS_GL_HEADERS_DIR="${EPREFIX}/usr/include"
 		-DBUILD_WITH_L0=$(usex l0)
 		-DDISABLE_LIBVA=$(usex vaapi "no" "yes")
diff --git a/dev-libs/keystone/Manifest b/dev-libs/keystone/Manifest
index 6e4446dbecd3..4a83047cea23 100644
--- a/dev-libs/keystone/Manifest
+++ b/dev-libs/keystone/Manifest
@@ -1,5 +1,5 @@
 DIST keystone-0.9.1.tar.gz 4326151 BLAKE2B 2d41388f4beeff3c424386c77cb75eeca613c66f80e807035f709822f241ef74f64085260678772580cb82bcceda83b4b3c31b92393f8d70f24d54f77f7ba224 SHA512 3bd9c3793d5862a0a8628b52da381625e62445f661dbd5ed715723e7d9db01ce3f9586e5ca0a5cc71e8ceb6c912050f5c28e3ccd540e72c8abcfd2f0d1bbae17
-EBUILD keystone-0.9.1-r1.ebuild 1989 BLAKE2B 8ce13f3d075df104c223f8c54d1e96a2dbf8723c5c830a2e644369dc77d95b05daeb2dade431df45d6c7334b749919ad7cc2df5ddce5d8c243a66cf2d553b2b7 SHA512 08d5158aa067724c075dc495f977e6f140d9ecb48fdf745db8d00e3cdeebf320cabda30b8c5623837f8998415bc3fc8fd3530c537de29290c1982e22078bad69
-EBUILD keystone-0.9.1.ebuild 1739 BLAKE2B ceaa4d25089477e82afa431e3f1563ea70b19cb5bc99e1cbe360052323b4ac95468a2fba4dfb5218cd8cbcf24112cd1a79afc8ca38f29289e2995c7a7abbba34 SHA512 84a30e655c0ed51a72ff01c70779c72d5e088d6803c242933c8bc05e6b1e19003f7668b3ec7d58672b85dbd06ac1b360cbd7530cd28aed561cdd511ffc323fdc
-EBUILD keystone-9999.ebuild 1989 BLAKE2B 8ce13f3d075df104c223f8c54d1e96a2dbf8723c5c830a2e644369dc77d95b05daeb2dade431df45d6c7334b749919ad7cc2df5ddce5d8c243a66cf2d553b2b7 SHA512 08d5158aa067724c075dc495f977e6f140d9ecb48fdf745db8d00e3cdeebf320cabda30b8c5623837f8998415bc3fc8fd3530c537de29290c1982e22078bad69
+EBUILD keystone-0.9.1-r1.ebuild 1990 BLAKE2B 58a06e5983847c4e0c67ec4b84628eaf62e5fab8acdafd60e7b18a4b03d518c545fe372304bec7ac286d70456a8fce993515eea3520d72b7f4ccf7723e6c6e15 SHA512 08a33874baf524cd32526c684c5f9b66bdfe7054b09def953e952bece51a2bfc3a6dd462a001f4104e510c412dca32627b7d5aea43d6bbfb209e68c90412916b
+EBUILD keystone-0.9.1.ebuild 1740 BLAKE2B f1266df26be8551da6310d93d6e4972458c0692136ba02d2741dbb7cf75de629c0190f48ce58e8a630e662fc165605e708a4420edddcf3025c0ddd2834d7e421 SHA512 e3941b5166ef543cba6d6247e21aa6a8b0c49aa7faa72a0b28375012160134bcdb2f7029ead47b13e604fc373d3b948729e37b395c5485554c580ada86b5a9fa
+EBUILD keystone-9999.ebuild 1990 BLAKE2B 58a06e5983847c4e0c67ec4b84628eaf62e5fab8acdafd60e7b18a4b03d518c545fe372304bec7ac286d70456a8fce993515eea3520d72b7f4ccf7723e6c6e15 SHA512 08a33874baf524cd32526c684c5f9b66bdfe7054b09def953e952bece51a2bfc3a6dd462a001f4104e510c412dca32627b7d5aea43d6bbfb209e68c90412916b
 MISC metadata.xml 464 BLAKE2B c4a2f085ab1343377cc2f2579511924578e22d74b1204ed517e8cebfd163455b36bae21cf6454ae5a723b52d50a7fb228db363f38d0de032ab1ee5e84c6ccaf1 SHA512 b1b21373ba08d12d1e6508dc7aea5f65922436cd71eb864f20da08214e93d419a181da6af4a59397e632cdd27d279efaaac3bdf91e28c1b6145f61fdf2ae4490
diff --git a/dev-libs/keystone/keystone-0.9.1-r1.ebuild b/dev-libs/keystone/keystone-0.9.1-r1.ebuild
index a4863b0bced5..b5390fca67d2 100644
--- a/dev-libs/keystone/keystone-0.9.1-r1.ebuild
+++ b/dev-libs/keystone/keystone-0.9.1-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit cmake distutils-r1 llvm
 
 DESCRIPTION="assembly/assembler framework + bindings"
-HOMEPAGE="http://www.keystone-engine.org/"
+HOMEPAGE="https://www.keystone-engine.org/"
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/keystone-engine/keystone.git"
diff --git a/dev-libs/keystone/keystone-0.9.1.ebuild b/dev-libs/keystone/keystone-0.9.1.ebuild
index eefe42cfab59..862e1fa15569 100644
--- a/dev-libs/keystone/keystone-0.9.1.ebuild
+++ b/dev-libs/keystone/keystone-0.9.1.ebuild
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python3_6 )
 inherit cmake-utils distutils-r1 llvm
 
 DESCRIPTION="assembly/assembler framework + bindings"
-HOMEPAGE="http://www.keystone-engine.org/"
+HOMEPAGE="https://www.keystone-engine.org/"
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/keystone-engine/keystone.git"
diff --git a/dev-libs/keystone/keystone-9999.ebuild b/dev-libs/keystone/keystone-9999.ebuild
index a4863b0bced5..b5390fca67d2 100644
--- a/dev-libs/keystone/keystone-9999.ebuild
+++ b/dev-libs/keystone/keystone-9999.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit cmake distutils-r1 llvm
 
 DESCRIPTION="assembly/assembler framework + bindings"
-HOMEPAGE="http://www.keystone-engine.org/"
+HOMEPAGE="https://www.keystone-engine.org/"
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/keystone-engine/keystone.git"
diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index e30239365dcf..8ac742ce2000 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -4,7 +4,7 @@ AUX libbpf-9999-paths.patch 1020 BLAKE2B 6a194c3ecf8ec2600e50b02d231a282a489d3d2
 DIST libbpf-0.0.6.tar.gz 213791 BLAKE2B 9f0a08cc7bae41f7fa93d5ba2f535f76ce47fe691efb6bac6257b88a5607deb62fa53f59984d83b6070ccd573c902899f7528b376d9acbfd77317659de6ab061 SHA512 1678133d9a2bd1cf13d4d1f9b83bb3f0642de91e3e3c8d785e2993257035573aff39b9a1a457e73d9c4c1c66b6a52544a8ad06ac560766d335428bb3fc421e71
 DIST libbpf-0.0.7.tar.gz 262068 BLAKE2B e77ff25449274881ddb9d32f25cd6ad8988e4524102bd109049ee6cfce3e2753fd99ebe2a080f809a4c5422dbf6b17633e4b0cea156f289bf95b92f8375a273c SHA512 c2cbc869b7e11339deab3152a6e2d0b3bba25da513d18d77fb0a698cbe61d6bd48175a58e7dd7a3695fbf27faf48b4f517ac5d3a3c66c086df2e5d1b73a2595d
 DIST libbpf-0.0.8.tar.gz 262519 BLAKE2B 2a3620c97834cc23e716476b6966c1c65c1c82064b3ba1ae4ab4906ae362a777d9aa7ae40620f9a259fe969a5a897e97c14d97f627f39c47fa28c89abb1efa9a SHA512 1074fb52b7a158e4e2713c4c7083528ccf2d99b899853078f230234ba112071bfa66e174d8800d36516e26d5bf06da44d100a5b2f866d267f62c9308f431220c
-DIST libbpf-0.0.9.tar.gz 273706 BLAKE2B 54dc77a8e415c24e6394877fc9ad54daca78a4e4f4779607e977708e8b88b6d7bb5854b618a808b1758529b9fdd574fc85f5969791a88b9a124cc42b63f7a161 SHA512 597ac41ab1727c48f2c53c9626b482ae7abd558b4c7d237e33206e3292295d5e5c2f56d31063d30caedccdc3fd289c040f718ff9aaaf210920f1b9c4c772660d
+DIST libbpf-0.0.9.tar.gz 273726 BLAKE2B 1277ce5b9dab9037e287910c43a71ee33cd6607d7cbe59d40c6930bf49407e04fcdfa6f4795f98202930fd564c1569c2feef0bca73294334f00abd601a288ed0 SHA512 d54bbdee6f7ea83ffef3fd0abe07f71644bcf83e5cf4a307fb4e03d885503617f1af2d324cc869f0f01a92bcb58836780a4802ac4db83b9f037ea196edc1131a
 EBUILD libbpf-0.0.6.ebuild 1000 BLAKE2B 160f3b9d575fd2553735b2f26ec0ab8b681a002964ae31eba4e9599f541c867f350d55fe4c6e1dfbe6077790bcf3fe9089166538b02973040b51c7bb37d7ce04 SHA512 95785c36fb8ad5130ba55c1c8b996d5e5c1bafd5eb80879494902f7f1fd3c3760c7604d51f36423e121898955b4879b88bb68bdaade76d0c90a2e0f51d27a269
 EBUILD libbpf-0.0.7.ebuild 1005 BLAKE2B b74c9b8a780943160237a87ae3833c996ec5a51685afa4c416ad5ba45f7a932785fd602b51758d2abb9df30e6d5e0b8b44f2ff44c647f473883e696c3eeaadef SHA512 6bf1a72e9bd4e531e35d8914ebac32ce6bac68462dfb5d181b51933108874c65ec50e1de8b31579b5db31d6eb3527159a087bfa730bb2c534dc8bbaed62b9daf
 EBUILD libbpf-0.0.8.ebuild 1005 BLAKE2B b74c9b8a780943160237a87ae3833c996ec5a51685afa4c416ad5ba45f7a932785fd602b51758d2abb9df30e6d5e0b8b44f2ff44c647f473883e696c3eeaadef SHA512 6bf1a72e9bd4e531e35d8914ebac32ce6bac68462dfb5d181b51933108874c65ec50e1de8b31579b5db31d6eb3527159a087bfa730bb2c534dc8bbaed62b9daf
diff --git a/dev-libs/libcec/Manifest b/dev-libs/libcec/Manifest
index 37f8ec9d0099..f108b94115eb 100644
--- a/dev-libs/libcec/Manifest
+++ b/dev-libs/libcec/Manifest
@@ -2,5 +2,5 @@ AUX libcec-4.0.2-no-tinfo.patch 829 BLAKE2B 2051bef2e92fa61f4afa90728c99f7943d1d
 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 2146 BLAKE2B df530ef55089bb3f35de91a3dcd0166688c437526d6e6129d730326b8bf20ac1ea0a226417d4ac893fcaba43103fb1106186c74b72de2bc23f4d6cdd83d6a883 SHA512 28e88a43c8dc584161f256b174f6151dbcb5d97b326a1b9da784083e16616dcbb971a11c4894dc65b2c762fef1c870f284da0133ec1e81f631c6b931358f6296
-EBUILD libcec-4.0.4-r1.ebuild 2033 BLAKE2B 7adc6020a53a50172778413142b1c1c33eb907ee23b291e4d566fbafc8e8d390610c60854478020d6b7e28c202439bf0d58ece4efc8ccb2506967756de35b061 SHA512 d8f5a212b8447b717f7ba8c9c8c575dd9b2bcce43d3b5b5d7ce6f6d5c0db57efeb5397648f640daac15c908b64f66a83995d4070ee397a4609cf98e894816ec3
+EBUILD libcec-4.0.4-r1.ebuild 2040 BLAKE2B e304595a2b71afee365435d94118a21a3fd14098d2d88be082d96ccbd35d74e3bbf88eff89e880e26480af375505afc1d45ad5adddde687907e1ffa5bc95cc40 SHA512 2033915d614f6155ee1d5bcb287a4218ffa3b116247e33d06ce8979950abd202fcddb5fda32937310a46ad7180e86f78eb9a72f4b4476a52887e82828a65971b
 MISC metadata.xml 662 BLAKE2B d87a9b256eb1cec65184415c8172819e8ffd47f38da6ef0aab46c0b8c40ff09b6b365d4051d44d2fee46a4bb0a7c0fbc0a87d92a171e92961b6f6b7a50d5868d SHA512 5abf50f31e2a18c7a5fce12414dd74efab13be9ea00a70b84384de8f95722f327d7446f51369b7feb33616bc0ff182cbbb7dd0be2855f5b54aee4e3c69dbc59e
diff --git a/dev-libs/libcec/libcec-4.0.4-r1.ebuild b/dev-libs/libcec/libcec-4.0.4-r1.ebuild
index 4bf945f68362..d89298c497b1 100644
--- a/dev-libs/libcec/libcec-4.0.4-r1.ebuild
+++ b/dev-libs/libcec/libcec-4.0.4-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Pulse-Eight/${PN}/archive/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="cubox exynos python raspberry-pi +xrandr"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libclangformat-ide/Manifest b/dev-libs/libclangformat-ide/Manifest
new file mode 100644
index 000000000000..c61aef07544d
--- /dev/null
+++ b/dev-libs/libclangformat-ide/Manifest
@@ -0,0 +1,6 @@
+AUX clang-qtcreator-compat.patch 7480 BLAKE2B aabe085093786be2733f50259be355596b8f35ddcf524aa9437f67462e48c22532e51b113a1e839e6f1bb22548229ee111c0587e58b62e3a145a6bdf43b9b347 SHA512 6e8d761dcd7bcdda476326fa8b2e3d5966f15959aefc500c04a57b6396a035fc822ad1a57184519de3ac7340c680a5f49f5fc9841d24210e20e949d6b28a57b4
+DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
+DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
+EBUILD libclangformat-ide-10.0.0.ebuild 1719 BLAKE2B af595842b8e1928f435a93bdc04935bbfac86c90ec40a87344b1023e1bcb855dbcf3517e63f1c0d9093e652aa12aa8ceef8cc0e48a831831f445185e6687125d SHA512 c345fed4ed94521ec51ae5b998db71f29efc5b927bd3471c754649c787373939a396f0dcd16bfa3a2516eb415cbc2457cd7616b17a404b70712c94f8b99335d7
+EBUILD libclangformat-ide-9.0.1.ebuild 1719 BLAKE2B af595842b8e1928f435a93bdc04935bbfac86c90ec40a87344b1023e1bcb855dbcf3517e63f1c0d9093e652aa12aa8ceef8cc0e48a831831f445185e6687125d SHA512 c345fed4ed94521ec51ae5b998db71f29efc5b927bd3471c754649c787373939a396f0dcd16bfa3a2516eb415cbc2457cd7616b17a404b70712c94f8b99335d7
+MISC metadata.xml 247 BLAKE2B ab9618e71ad95ebd451d7b51076eb19801293790b027d4e390b35c1f2cc31ac20f8f41f91b8e167f700a3a42e7f366e2292e944fde98502016a4b0587c66d833 SHA512 be8285f713dca05e18b9ee5c5c45b4938cbc5ef707b0224a0aec98934633f7fcf526b6322e91a67b33804ca99a0997e1698bd2c772fa709256006517c89b7f51
diff --git a/dev-libs/libclangformat-ide/files/clang-qtcreator-compat.patch b/dev-libs/libclangformat-ide/files/clang-qtcreator-compat.patch
new file mode 100644
index 000000000000..72b9453ce7a4
--- /dev/null
+++ b/dev-libs/libclangformat-ide/files/clang-qtcreator-compat.patch
@@ -0,0 +1,185 @@
+From fa1b9053729ec6a4425a44ec5502dd388928274a Mon Sep 17 00:00:00 2001
+From: Ivan Donchevskii <ivan.donchevskii@qt.io>
+Date: Fri, 12 Oct 2018 08:19:25 +0200
+Subject: [PATCH] [clang-format] Introduce the flag which allows not to shrink
+ lines
+
+--------------------------------------------------------------------------
+* https://reviews.llvm.org/D53072
+--------------------------------------------------------------------------
+
+Currently there's no way to prevent to lines optimization even
+if you have intentionally put <CR> to split the line.
+
+In general case it's fine. So I would prefer to have such option
+which you can enable in special cases (for me it's an IDE related use case).
+
+Revert this change if upstream clang-format offers better solution.
+
+This is a cherry pick from commits b748c82e3664c2e2e3d29645ede472d87b8cde63
+and 1817513d4f3a2e4e26be124dbe395340f798fd51.
+
+Change-Id: I9d2935b937bb68ea8dc59fac8463718475e9c080
+Reviewed-by: Orgad Shaneh <orgads@gmail.com>
+---
+ include/clang/Format/Format.h         | 13 +++++++++++++
+ lib/Format/Format.cpp                 |  4 ++++
+ lib/Format/UnwrappedLineFormatter.cpp |  9 +++++----
+ lib/Format/UnwrappedLineParser.cpp    |  2 ++
+ unittests/Format/FormatTest.cpp       | 16 ++++++++++++++++
+ 5 files changed, 40 insertions(+), 4 deletions(-)
+
+diff --git a/include/clang/Format/Format.h b/include/clang/Format/Format.h
+index cb37b0c890c..b9c4df3d1af 100644
+--- a/include/clang/Format/Format.h
++++ b/include/clang/Format/Format.h
+@@ -22,6 +22,8 @@
+ #include "llvm/Support/Regex.h"
+ #include <system_error>
+ 
++#define KEEP_LINE_BREAKS_FOR_NON_EMPTY_LINES_BACKPORTED
++
+ namespace llvm {
+ namespace vfs {
+ class FileSystem;
+@@ -1200,6 +1202,16 @@ struct FormatStyle {
+   /// \endcode
+   bool JavaScriptWrapImports;
+ 
++  /// If true, no line breaks are optimized out (works only with ColumnLimit = 0)
++  /// \code
++  ///    true:                                  false:
++  ///    int foo(int a,                 vs.     int foo(int a, int b) {
++  ///            int b) {
++  ///      bar();                                 bar();
++  ///    }                                      }
++  /// \endcode
++  bool KeepLineBreaksForNonEmptyLines;
++
+   /// If true, the empty line at the start of blocks is kept.
+   /// \code
+   ///    true:                                  false:
+@@ -1767,6 +1779,7 @@ struct FormatStyle {
+            JavaImportGroups == R.JavaImportGroups &&
+            JavaScriptQuotes == R.JavaScriptQuotes &&
+            JavaScriptWrapImports == R.JavaScriptWrapImports &&
++           KeepLineBreaksForNonEmptyLines == R.KeepLineBreaksForNonEmptyLines &&
+            KeepEmptyLinesAtTheStartOfBlocks ==
+                R.KeepEmptyLinesAtTheStartOfBlocks &&
+            MacroBlockBegin == R.MacroBlockBegin &&
+diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
+index 2c4f8760540..61ea88626ee 100644
+--- a/lib/Format/Format.cpp
++++ b/lib/Format/Format.cpp
+@@ -417,6 +417,8 @@ template <> struct MappingTraits<FormatStyle> {
+     IO.mapOptional("JavaImportGroups", Style.JavaImportGroups);
+     IO.mapOptional("JavaScriptQuotes", Style.JavaScriptQuotes);
+     IO.mapOptional("JavaScriptWrapImports", Style.JavaScriptWrapImports);
++    IO.mapOptional("KeepLineBreaksForNonEmptyLines",
++                   Style.KeepLineBreaksForNonEmptyLines);
+     IO.mapOptional("KeepEmptyLinesAtTheStartOfBlocks",
+                    Style.KeepEmptyLinesAtTheStartOfBlocks);
+     IO.mapOptional("MacroBlockBegin", Style.MacroBlockBegin);
+@@ -678,6 +680,7 @@ FormatStyle getLLVMStyle() {
+   LLVMStyle.JavaScriptWrapImports = true;
+   LLVMStyle.TabWidth = 8;
+   LLVMStyle.MaxEmptyLinesToKeep = 1;
++  LLVMStyle.KeepLineBreaksForNonEmptyLines = false;
+   LLVMStyle.KeepEmptyLinesAtTheStartOfBlocks = true;
+   LLVMStyle.NamespaceIndentation = FormatStyle::NI_None;
+   LLVMStyle.ObjCBinPackProtocolList = FormatStyle::BPS_Auto;
+@@ -745,6 +748,7 @@ FormatStyle getGoogleStyle(FormatStyle::LanguageKind Language) {
+       {"^<ext/.*\\.h>", 2}, {"^<.*\\.h>", 1}, {"^<.*", 2}, {".*", 3}};
+   GoogleStyle.IncludeStyle.IncludeIsMainRegex = "([-_](test|unittest))?$";
+   GoogleStyle.IndentCaseLabels = true;
++  GoogleStyle.KeepLineBreaksForNonEmptyLines = false;
+   GoogleStyle.KeepEmptyLinesAtTheStartOfBlocks = false;
+   GoogleStyle.ObjCBinPackProtocolList = FormatStyle::BPS_Never;
+   GoogleStyle.ObjCSpaceAfterProperty = false;
+diff --git a/lib/Format/UnwrappedLineFormatter.cpp b/lib/Format/UnwrappedLineFormatter.cpp
+index 6b6a9aff461..c88efbc6867 100644
+--- a/lib/Format/UnwrappedLineFormatter.cpp
++++ b/lib/Format/UnwrappedLineFormatter.cpp
+@@ -684,7 +684,7 @@ public:
+   LineFormatter(ContinuationIndenter *Indenter, WhitespaceManager *Whitespaces,
+                 const FormatStyle &Style,
+                 UnwrappedLineFormatter *BlockFormatter)
+-      : Indenter(Indenter), Whitespaces(Whitespaces), Style(Style),
++      : Indenter(Indenter), Style(Style), Whitespaces(Whitespaces),
+         BlockFormatter(BlockFormatter) {}
+   virtual ~LineFormatter() {}
+ 
+@@ -727,7 +727,8 @@ protected:
+       // assert so that we can simply call this function for all tokens.
+       return true;
+ 
+-    if (NewLine) {
++    if (NewLine || (Previous.Children[0]->First->MustBreakBefore &&
++                    Style.KeepLineBreaksForNonEmptyLines)) {
+       int AdditionalIndent = State.Stack.back().Indent -
+                              Previous.Children[0]->Level * Style.IndentWidth;
+ 
+@@ -772,10 +773,10 @@ protected:
+   }
+ 
+   ContinuationIndenter *Indenter;
++  const FormatStyle &Style;
+ 
+ private:
+   WhitespaceManager *Whitespaces;
+-  const FormatStyle &Style;
+   UnwrappedLineFormatter *BlockFormatter;
+ };
+ 
+@@ -798,7 +799,7 @@ public:
+     while (State.NextToken) {
+       bool Newline =
+           Indenter->mustBreak(State) ||
+-          (Indenter->canBreak(State) && State.NextToken->NewlinesBefore > 0);
++          (State.NextToken->NewlinesBefore > 0 && Indenter->canBreak(State));
+       unsigned Penalty = 0;
+       formatChildren(State, Newline, /*DryRun=*/false, Penalty);
+       Indenter->addTokenToState(State, Newline, /*DryRun=*/false);
+diff --git a/lib/Format/UnwrappedLineParser.cpp b/lib/Format/UnwrappedLineParser.cpp
+index 3cd3c8f9cdf..3aa30c7cb3f 100644
+--- a/lib/Format/UnwrappedLineParser.cpp
++++ b/lib/Format/UnwrappedLineParser.cpp
+@@ -2554,6 +2554,8 @@ void UnwrappedLineParser::nextToken(int LevelDifference) {
+   else
+     readTokenWithJavaScriptASI();
+   FormatTok->Previous = Previous;
++  if (FormatTok->NewlinesBefore && Style.KeepLineBreaksForNonEmptyLines)
++    FormatTok->MustBreakBefore = true;
+ }
+ 
+ void UnwrappedLineParser::distributeComments(
+diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp
+index c05fceb4766..38906d9ee31 100644
+--- a/unittests/Format/FormatTest.cpp
++++ b/unittests/Format/FormatTest.cpp
+@@ -385,6 +385,22 @@ TEST_F(FormatTest, RemovesEmptyLines) {
+                    "  void funk() {}\n"
+                    "};",
+                    Style));
++
++  Style.KeepLineBreaksForNonEmptyLines = true;
++  Style.ColumnLimit = 0;
++  EXPECT_EQ("int foo(int a,\n"
++            "        int b)\n"
++            "{\n"
++            "}",
++            format("int foo(int a,\n"
++                   "int b) {}",
++                   Style));
++
++  EXPECT_EQ("[]() {\n"
++            "  foo(); }",
++            format("[]() {\n"
++                   "foo(); }",
++                   Style));
+ }
+ 
+ TEST_F(FormatTest, RecognizesBinaryOperatorKeywords) {
+-- 
+2.26.2
+
diff --git a/dev-libs/libclangformat-ide/libclangformat-ide-10.0.0.ebuild b/dev-libs/libclangformat-ide/libclangformat-ide-10.0.0.ebuild
new file mode 100644
index 000000000000..5c04b67cf27c
--- /dev/null
+++ b/dev-libs/libclangformat-ide/libclangformat-ide-10.0.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake llvm llvm.org toolchain-funcs
+
+DESCRIPTION="A static clangformat library patched for IDE use"
+HOMEPAGE="https://www.qt.io/blog/2019/04/17/clangformat-plugin-qt-creator-4-9"
+LLVM_COMPONENTS=( clang )
+
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="~sys-devel/llvm-${PV}:${SLOT}=[debug=]"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+PATCHES=( "${FILESDIR}/clang-qtcreator-compat.patch" )
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
+}
+
+src_unpack() {
+	llvm.org_src_unpack
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+	)
+
+	if [[ -n ${EPREFIX} ]]; then
+		mycmakeargs+=(
+			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		[[ -x "/usr/bin/clang-tblgen" ]] \
+			|| die "/usr/bin/clang-tblgen not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
+		)
+	fi
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile libclangFormat.a
+}
+
+src_install() {
+	into usr/lib/llvm/${SLOT}
+	newlib.a "${BUILD_DIR}/$(get_libdir)/libclangFormat.a" libclangFormatIDE.a
+	insinto usr/lib/llvm/${SLOT}/include/clang/Format
+	newins "${S}/include/clang/Format/Format.h" FormatIDE.h
+}
diff --git a/dev-libs/libclangformat-ide/libclangformat-ide-9.0.1.ebuild b/dev-libs/libclangformat-ide/libclangformat-ide-9.0.1.ebuild
new file mode 100644
index 000000000000..5c04b67cf27c
--- /dev/null
+++ b/dev-libs/libclangformat-ide/libclangformat-ide-9.0.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake llvm llvm.org toolchain-funcs
+
+DESCRIPTION="A static clangformat library patched for IDE use"
+HOMEPAGE="https://www.qt.io/blog/2019/04/17/clangformat-plugin-qt-creator-4-9"
+LLVM_COMPONENTS=( clang )
+
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="~sys-devel/llvm-${PV}:${SLOT}=[debug=]"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+PATCHES=( "${FILESDIR}/clang-qtcreator-compat.patch" )
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
+}
+
+src_unpack() {
+	llvm.org_src_unpack
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+	)
+
+	if [[ -n ${EPREFIX} ]]; then
+		mycmakeargs+=(
+			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		[[ -x "/usr/bin/clang-tblgen" ]] \
+			|| die "/usr/bin/clang-tblgen not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
+		)
+	fi
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile libclangFormat.a
+}
+
+src_install() {
+	into usr/lib/llvm/${SLOT}
+	newlib.a "${BUILD_DIR}/$(get_libdir)/libclangFormat.a" libclangFormatIDE.a
+	insinto usr/lib/llvm/${SLOT}/include/clang/Format
+	newins "${S}/include/clang/Format/Format.h" FormatIDE.h
+}
diff --git a/dev-libs/libclangformat-ide/metadata.xml b/dev-libs/libclangformat-ide/metadata.xml
new file mode 100644
index 000000000000..d472e560c734
--- /dev/null
+++ b/dev-libs/libclangformat-ide/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>pesa@gentoo.org</email>
+		<name>Davide Pesavento</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
index 554e179df415..b5be62eb0d5b 100644
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@@ -4,6 +4,6 @@ DIST libfmt-6.2.0.tar.gz 733403 BLAKE2B c7ff69a56b90ec8df7d1af5c9934592449f20520
 DIST libfmt-6.2.1.tar.gz 733646 BLAKE2B 74394efc67065bf7a2259f5c16521b1cc4fb08bd599fe99be86b97b712c60d8790f39d65257ab18fe95bcde3d115d97e91c41d23309596f279cf51ebd4d2957d SHA512 520ef3addfecd9796253c347e0ecf4c18ef2f86d3b1b6b714f7834741f4737f1b7ed8365d3be46c9186617898911b23680cad2ae3cb7aadaf641ab32e327b0dc
 EBUILD libfmt-6.1.2.ebuild 779 BLAKE2B 2683bb7f04d4d9280df07b28d745afa01f734bc3fd8d1d52def8b37e1188dd54fe381dc846b877e5978374fad89c0db31d06bac1bac37b533b76403c085fd87f SHA512 abb2693b00595db88f3906bb782213b53b9655de994832eb4a189f89f301506113bf9743eb9b64fd7f835f0707866bc170a20ad52ddb8c08248799d5fe19e797
 EBUILD libfmt-6.2.0-r1.ebuild 843 BLAKE2B bb2d750324db52df30d3f21c3141ae9d871527871d37a4ce26f7bf6364ad5152f59e100f4fc880ad588aa81cfd141378365a5537c619037f19b22a51317b7cba SHA512 d1cfbd8023705dc6e8456ea7c2412b3885ff0434803ceb1665477fff9b1c44d565bc4cc024036a9cf4be4801e5ab10db5b7fdfe182373e97f8b8b2847e58af44
-EBUILD libfmt-6.2.1.ebuild 772 BLAKE2B 53eaf21c8e01d31c44adc443812fa21ca3e48db4914131ce3a56e52cfa04bedc44e44fc1a7bdf11865336bbb0fee4d364b6521d60945aa5b87c153c5e8019b14 SHA512 0dfb8292beaa1a0f9cc942b303fe5bbfe391d6f6b59cd2399ba5c47d6549eb2077101af54f034a2bfcdcd99c39aad4b5fd3acc545e8a4a2b873fe0f598ebd755
+EBUILD libfmt-6.2.1.ebuild 784 BLAKE2B f8eb45e3e7e08ae2dbf3fb8adfe7d78c10f41e71eea97c9b3d7d6134c0150feeeaf55ba8cf2e52dc81fef4c5508668760dfd0c550fdcd206ce67a5e338854bfe SHA512 3bc0f2bafa17a2065cfbb9299fa816dce488ee036fab35bbbe5c9a3c4b30c56c3988c8add25d3f101a167d4897eb4e2aebb5c6f9c3407bc68233b65e537a1fcc
 EBUILD libfmt-9999.ebuild 772 BLAKE2B 53eaf21c8e01d31c44adc443812fa21ca3e48db4914131ce3a56e52cfa04bedc44e44fc1a7bdf11865336bbb0fee4d364b6521d60945aa5b87c153c5e8019b14 SHA512 0dfb8292beaa1a0f9cc942b303fe5bbfe391d6f6b59cd2399ba5c47d6549eb2077101af54f034a2bfcdcd99c39aad4b5fd3acc545e8a4a2b873fe0f598ebd755
 MISC metadata.xml 381 BLAKE2B f38f6a7691ef81c18b1170b7ca29264dac3c621f8de446d065d65b6e022e21fbb2475c4e2d3210e00254339d09681030c7e7b8fc41cec5549663b4086bb0c983 SHA512 200bb79fc448f40acf8a1be9a907a51461d82db3b5e6e92df1cef4b96418fa6217ebe1e5c8d4228d34bd9bc633022a34f399521a875c92232fb2254350a7605c
diff --git a/dev-libs/libfmt/libfmt-6.2.1.ebuild b/dev-libs/libfmt/libfmt-6.2.1.ebuild
index 78c2d74959bb..376757b05ade 100644
--- a/dev-libs/libfmt/libfmt-6.2.1.ebuild
+++ b/dev-libs/libfmt/libfmt-6.2.1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 	S="${WORKDIR}/fmt-${PV}"
 fi
 
diff --git a/dev-libs/libfstrcmp/Manifest b/dev-libs/libfstrcmp/Manifest
index 53e1733d7f54..d96023f7bbcc 100644
--- a/dev-libs/libfstrcmp/Manifest
+++ b/dev-libs/libfstrcmp/Manifest
@@ -1,4 +1,4 @@
 DIST libfstrcmp-0.7.tar.gz 394845 BLAKE2B a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e SHA512 aaeb0227afd5ada5955cbe6a565254ff88d2028d677d199c00e03b7cb5de1f2c69b18e6e8b032e452350a8eda7081807b01765adbeb8476eaf803d9de6e5509c
-EBUILD libfstrcmp-0.7-r1.ebuild 927 BLAKE2B 599323861b622381047549ec74c4a4bf08c081ce6040f844a243308847fb5bb52bb8a5d16c266927a38c7d3b7a97270eca563c16ecf1600c6941e68056a23541 SHA512 56e8f61aa6815ff315667b570fe2678bf4a0ee9715131baa5e2cc7a9e05912d00490efb3a4fddf93dfaf4927a8f0ec8f98da0d4cc37cec2e1049652c7aa72b5e
+EBUILD libfstrcmp-0.7-r1.ebuild 934 BLAKE2B cab55908b1ac579f63e2e9294d1171baa6b29a871b0f5896f544c8aa5c80495917889fb1cdd2708a4a73418d01b167a3a55870deff1dea5f057cc0bdbc993e54 SHA512 d196ae5b238eeb7e0c103f41c86e8b4e3be55d83405d46754331902f8ce68ad5399feb235a922d8dd791c8a73ba7a8b48bd656f66d00b6c361e8952fd229a3b1
 EBUILD libfstrcmp-0.7.ebuild 798 BLAKE2B 6b0fa888e5ecbad92001c73cc21a2371719b044e1054d79160b7f0ace9fd3706b60b623240555c99f60c6c139e91a8c97017df5c6350895e769786302fb32a14 SHA512 b2ba229672a48f925bf39d0d6246cb5e958f7290b8eecd226084875e9d8dbc0c71d656dd034da0e31b39531fbf7e0d4f836b7f41e2789c14eab2575f55172683
 MISC metadata.xml 325 BLAKE2B cc27381f0071006c05af2fe95a2dbbc481fbb8457976c4c4eec7c3321df75ca4957b7a626ebc1d20aa524bedae4730ca05bf0fb36f8e2b0177429993d73d5237 SHA512 f9baf25481af2a997d7f05610c68b7a3fb376d4bdf1526e59b172d2e3c4e4a2008b1fce9c66247bf01b488db4932872dc58eb0e1fffb9e6a2cc769023f7c75d6
diff --git a/dev-libs/libfstrcmp/libfstrcmp-0.7-r1.ebuild b/dev-libs/libfstrcmp/libfstrcmp-0.7-r1.ebuild
index d56c71db588a..cc653cb5ad7c 100644
--- a/dev-libs/libfstrcmp/libfstrcmp-0.7-r1.ebuild
+++ b/dev-libs/libfstrcmp/libfstrcmp-0.7-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 
 SRC_URI="http://fstrcmp.sourceforge.net/fstrcmp-0.7.D001.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/fstrcmp-0.7.D001"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 DEPEND="
 	sys-apps/groff
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index e149319ea270..4ab59abbcf4c 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -1,5 +1,5 @@
 DIST libgusb-0.3.3.tar.xz 38928 BLAKE2B 711bf59db0d86879961fbba1cd87d5a8557cd4c735f3eaf80bb75f1ac55ededecb4038125428c1297942d014dfd3ea995f7cee8355150f1e90e0fec4aa92cfa9 SHA512 8be37283f2c1719976bbd9bc33eacf5afd4cef107a6629e8f9523b49e66ab2782d9937e4d9fa18760b9083c991c91d6126cfcfa22921b3436a9ebc3a858d855a
 DIST libgusb-0.3.4.tar.xz 40636 BLAKE2B 8e43849395a0bce646d9b9493c883fc6db28572a75017e0309b6b2d1924bb6a978190d4b171416053cae424d272a7b43e1536abd92821198e4e7f553bb16d19f SHA512 abbec6b5a5f27b5061ff165db97915d7356b23757de12b640f54741927ac860264af3daed15d4b4b5f3df494acb20695070dcb5ad104df2defdcc7229634c42f
 EBUILD libgusb-0.3.3.ebuild 1476 BLAKE2B 328320f273a1faf71c2fdde39fe741b3ebb4b726fd660f674a6594c2800c61216a584b2a88c678bd24053eba5f3bd3a6b734854b184b4a9835eb1b907ca9aaa9 SHA512 8ac7f62f2179863c310c1b5caba41858bc55d2bab6fdfbe06802f9924a2a6c610ac54269336683adfead3649e691640abfccf1bb05fc899a960de9ee9e724b89
-EBUILD libgusb-0.3.4.ebuild 1701 BLAKE2B 726c75a45d210071e8c88edeb0f1600fbf4b765f25f34053e4454ef0c8a5d56347e5558c6cd4afb55af90162cc331be9b635605736438ade16f56ae8d76100ec SHA512 9755677a7daac0db38658389ee5843a988f5b891ab40770770f4a2f1998b72739953599dd3ea912d6ea11e7fc41035c816d7934ed1002ea3fe6b1d84bb35745b
+EBUILD libgusb-0.3.4.ebuild 1699 BLAKE2B 978f47743837dfaf275212fc1ca45179f2ae1c5f3aeca0b7c21b0b4be4fecc4539acfad6ba38d6a3f1c802539ec16ad27ed715d0633bb6a2792618e1684e8892 SHA512 44ac66885759c303111e317f3cee9ac953e801ca6314689c6176304c87dc866e391d21f27677603f61c3627e4cb230b70ca3b67035ec22ea07cf12b4a8c216a2
 MISC metadata.xml 343 BLAKE2B 5905d49c021f1b8d8e5167415d0f0c731c0b204fad7aa73f10f6a7dc8b8f417e9591ed26ce655e2d5e5963e84f0ce44d77e59cd79e8d1921899b0a9627d52911 SHA512 096d78e0613e0475d5499f3c30542bd22fc98a2598a7e2e5719747a809a19288a0a36897bc9bc647fceb98f3579f7148c32d16d78c6114d0b925f143daca91bc
diff --git a/dev-libs/libgusb/libgusb-0.3.4.ebuild b/dev-libs/libgusb/libgusb-0.3.4.ebuild
index 5ec7e1e7ab8e..bbf96feb85b6 100644
--- a/dev-libs/libgusb/libgusb-0.3.4.ebuild
+++ b/dev-libs/libgusb/libgusb-0.3.4.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 IUSE="gtk-doc +introspection static-libs test +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 58adb5622435..a5a0580a3f61 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,7 +1,5 @@
-DIST libinput-1.15.4.tar.xz 580616 BLAKE2B cac324f08b8dc3c6cc18ca62d528c3a00fbd70a1d434aa171da2e144d8d74f961bcb491f6dc39b365f766ea8e5ed87b29b1dd5aa9f62b12707f8e49e5c63a5d7 SHA512 4659818952dc729cd5bdb78ebe21edbbacbf8a66a592b13ba30f3bb4c4e264208ec94440a253cfa4edc8b2ef904954eecea6be0f8d63cf239e3858d3abb64a80
 DIST libinput-1.15.5.tar.xz 582800 BLAKE2B 8575dbe6699230610e05f4c7e9e72aebb1fb765be1d305ba6d9fcf69c6efc990ec78bd0746b29921a2414df99c536c3f267b1dd1d6d98c872e360fc16572e2a4 SHA512 a0a3a325048841fc017e19d3bc5f5490605972ab9e2730dc5678bda7efb7a5b1fa6f531f3c8abd8393899ec383d8d2bcfd586eacee04fc1fbda0e02ba2af956a
 DIST libinput-1.15.6.tar.xz 584184 BLAKE2B 9963e9df41cb32c40454a3dc76975315f74a2e8b2549c037868c651c2ada90f77a605048ba603a4c01d0641fc39154b578a766309f1c376c07d3bdd02dfd387c SHA512 90459e5a1f22fd42ffcbab157b461e4514c30803bcebdaced76c65c05cccfa6f259640a50497055fe7ed0b376a6979f6d1d01227ae447fe60ba88fa81142b969
-EBUILD libinput-1.15.4.ebuild 2146 BLAKE2B 546077aa2a928f10745d17235c84b840ae817ed8dfc124ec82e2504620b3bd65066c95ca945743f703acfbbf50d6968f2f7be6ad8d1e964087f8e2eab52380e5 SHA512 cc2a9d8013068f919e5e181e407870930ba2531eb7b0dfb7c1c1319ca62a5b919b0e227b0bb085377d32b5c5bfea5d24106aedb580f7cc3b5b1e15a9df23e42b
-EBUILD libinput-1.15.5.ebuild 2148 BLAKE2B 75cf7c0f05bea05613624287320fd32efad71d6911ada84d0e128e91ee999ef7246e751d01d0254e1a306a31834b605b2a71ba8658e838a1540164294c18396b SHA512 cb2237b750ef58ac2f4731d88767d9c322401b16c9419931de237ea499f084d5dd2a5a51704113f590125e677c9388d13f96b881905e7c6911f220a4fcc70173
+EBUILD libinput-1.15.5.ebuild 2146 BLAKE2B 546077aa2a928f10745d17235c84b840ae817ed8dfc124ec82e2504620b3bd65066c95ca945743f703acfbbf50d6968f2f7be6ad8d1e964087f8e2eab52380e5 SHA512 cc2a9d8013068f919e5e181e407870930ba2531eb7b0dfb7c1c1319ca62a5b919b0e227b0bb085377d32b5c5bfea5d24106aedb580f7cc3b5b1e15a9df23e42b
 EBUILD libinput-1.15.6.ebuild 2154 BLAKE2B 1db905d4b3cec898ea12d1bae75627c7597603fffb5f034aaeeeb24c97ef94d8bcdde5d97e9dc7293fcd1683ff64f8bd345c47486d4ad196d2aa39a3b395f7ae SHA512 679b56b53bdb4660d788f030987706c493f4033692b5ffa7e48dd5fe7feac48ce173ef18a943370cff6d1043c0b7ded113d1dce35bac8b38477b68472cac3506
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.15.4.ebuild b/dev-libs/libinput/libinput-1.15.4.ebuild
deleted file mode 100644
index 931b05cb869e..000000000000
--- a/dev-libs/libinput/libinput-1.15.4.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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 test"
-RESTRICT="!test? ( 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)
-		$(meson_use test tests)
-		-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() {
-	pkgname="dev-python/python-libevdev"
-	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "${pkgname}"; then
-		einfo "${pkgname} must be installed to use the"
-		einfo "libinput measure and libinput replay tools."
-	fi
-
-	udevadm hwdb --update --root="${ROOT}"
-}
diff --git a/dev-libs/libinput/libinput-1.15.5.ebuild b/dev-libs/libinput/libinput-1.15.5.ebuild
index defc7b185b3c..931b05cb869e 100644
--- a/dev-libs/libinput/libinput-1.15.5.ebuild
+++ b/dev-libs/libinput/libinput-1.15.5.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="doc input_devices_wacom test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest
index 7e14463b5e57..a05325a53ff2 100644
--- a/dev-libs/libjcat/Manifest
+++ b/dev-libs/libjcat/Manifest
@@ -2,5 +2,5 @@ AUX libjcat-0.1.1-disable_installed_tests.patch 1131 BLAKE2B fdefa9b78c1c8fa80ef
 DIST libjcat-0.1.2.tar.gz 62630 BLAKE2B cb333098d984f840a80c4ea4b7feab32ca7d04882f2f4aa788c01dd13c616b85576af5bbcd0ca343a7f5b7221ab69b202c7a8cacb230eeeefab9a3a9a61d7d3f SHA512 9184b761cad5a43ac1f0b0cd4ff54c372ec067785c9b796d813aab6a936fbb522f419e965b70d4d71fbec9f7c25f9d185f957cf1e73cb0e5bdeca9492e11b0fd
 DIST libjcat-0.1.3.tar.gz 63765 BLAKE2B a9847fe2a93f49773ba6451036d7908b8b615a6334557a68c94db3c402e1f502e2915bb1abc9f58c495fe1453cb5653cae9b548d2f9d7b39dcd5d7824e965bc2 SHA512 f021e10d740ac6d0f0c73cefc9deacdbc74882a5e340b249c28427ece4917358940413914ce19c5aac96c86d8056349ff2ee633c2a9541f4382f109d9e0d9e69
 EBUILD libjcat-0.1.2.ebuild 1405 BLAKE2B 6fce2d734bf40ca38ff11efef56a87b8fb68b987f3b51486a91e09c6175c6e2eaccdbf51a7214b5d63dbd500ba22fbb0be2ea06443771bc54a6b86b5c0878de9 SHA512 3813e816d8cedc1ad807ca59639a6caa607935cf315fb29ccbc685b10d6d92aee8dfc20e7f66f898c893d4170c0afd90493d40db284337316136b2c793c98478
-EBUILD libjcat-0.1.3.ebuild 1404 BLAKE2B 3c38e4f1043861e51a1ae77b4f1b16fc044db4bd5208a8ad1d2751a07133f4627c070042dd78b5af53735f18553f1591e86e8e0ef094e6f47540c4efb58c5222 SHA512 e6a3ac7afb7122b9c6045ab560dcd5a7319351e312dedbb45292237faca6f97ef4e8425c818fe1b1f44105241c62b8c9bc7c3904499dc8134ea0efd0a7296a9d
+EBUILD libjcat-0.1.3.ebuild 1403 BLAKE2B 95f1152cdf7bde258b549d08646f2de4f85c97af540f70b79e381143ecba366765fcc2971c9f5f983d435ffc47e6084a39bb9e13a75e0104f45f0af43c394904 SHA512 e4c17f8feab615a290f4495d03f24ca7a6a2371643476634165fc7db69abaa57185487f8477ddece2f60ec8e54cd2e000166e170320590dd1a3ce75b2bb0c73f
 MISC metadata.xml 993 BLAKE2B 3f186f6514cbea4951c5e2b4c26a305d615cfa52237ba5e21495c7843a82fd551557e53592e7aacbc568b8bd09832fef0054e4f095fdeb07194e9dc8258bbee3 SHA512 fa07148261c97c53718c489a0cd70d60eea42fccc1723a88d9a35b06c7a91b92e2e0d66bed11f719f160f749ea4a0cbb3eab89c6dc68eda5ff75386d4958e3bc
diff --git a/dev-libs/libjcat/libjcat-0.1.3.ebuild b/dev-libs/libjcat/libjcat-0.1.3.ebuild
index e20c8660675a..31d4ff92eb40 100644
--- a/dev-libs/libjcat/libjcat-0.1.3.ebuild
+++ b/dev-libs/libjcat/libjcat-0.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="gpg gtk-doc +introspection +man pkcs7 test"
 
 RDEPEND="dev-libs/glib:2
diff --git a/dev-libs/libmanette/Manifest b/dev-libs/libmanette/Manifest
index 5c0557734ba7..4f021db2c4e3 100644
--- a/dev-libs/libmanette/Manifest
+++ b/dev-libs/libmanette/Manifest
@@ -2,5 +2,5 @@ AUX 0.2.3-optional-introspection-vapi.patch 2854 BLAKE2B 3e5499fc4cc28a926489c1a
 DIST libmanette-0.2.3.tar.xz 33620 BLAKE2B ec811e0a939713e99eb931a2aa0c1b67a2de1fad4c4e399e47975b795da7672ab56a217cda94f4642f749aed1ff4379c67b58da349f8ac8434c95a80c7909980 SHA512 23d3feae3b0ba81deb75b0ff911eb37f3d0d767a0ae65815d34cadf69f78ca7f081177a2161105ea3979ba9222b3641e6b776bf4fcf3e46a9de716bdce475df6
 DIST libmanette-0.2.4.tar.xz 38196 BLAKE2B d9bd8817ec03c9414eb249ce50d3468e2eb2dee78ba36b7a1ac9b04d87e1888d086766594109ee8d89fc4f48fea8d6e7949c7fe44646cacae00145b14f416697 SHA512 713686e3fd515a09846def3283a9e687571dfe47357af00f95739b6e888a454ab14c526a11b38c4ad19bdf928fc3b13b8be32612557dd0ecc743efd2cb6e0792
 EBUILD libmanette-0.2.3.ebuild 977 BLAKE2B a0ee112e80695c4e1d08df111bd9d9005abb17f5b8df9528c36c6ca5a184d2c2282811ebbd21fd879106dddacd8c95432e988d137ba82243cf3c104a0850cf75 SHA512 7af56fce47f39cf1cb73432aa2c59cb7553818ddd93cd0fce881d262d2931ab20e8f567dd7c10821b4af9397dba37ead0f38e7c550226373a4ce6628aaf4ad7a
-EBUILD libmanette-0.2.4.ebuild 846 BLAKE2B 5765a65ddf53398ea75cd10b7201473005f8ab31e50f24f38369f599307c432b70f0dc6fd0072735856654671ef2d72bf9771331d77616ca1b986370f7a2103e SHA512 406c52b3f428ca8b8c02bcd039cc84d473f9bd9bcb8c5c5b64539c2bf36ee0a39baa08383ec095a16d71fb8de949118797ea3b27be286868f754d1dc01b58b8c
+EBUILD libmanette-0.2.4.ebuild 845 BLAKE2B de88398f90cfebc27b3b99ef78e3ce89170823f7cce940b66e4ccfe16263ec07a2900ecb13b892d66e713be8b2186f949a966f6f86846f4ecc16ae59a0a9d070 SHA512 c34366c5f83f7426408904a190edd90cd4151058b6194f60e16557ebe9c2156788b92cc0c93ff8658323ad50d67774382d7ef163dc586c84b4c2d284d7a7afa8
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libmanette/libmanette-0.2.4.ebuild b/dev-libs/libmanette/libmanette-0.2.4.ebuild
index 6e27d2729cea..d29401506c58 100644
--- a/dev-libs/libmanette/libmanette-0.2.4.ebuild
+++ b/dev-libs/libmanette/libmanette-0.2.4.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/aplazas/libmanette"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 IUSE="+introspection +udev +vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/dev-libs/libmaxminddb/Manifest b/dev-libs/libmaxminddb/Manifest
index 5451c03f84bd..5a3e61a8f505 100644
--- a/dev-libs/libmaxminddb/Manifest
+++ b/dev-libs/libmaxminddb/Manifest
@@ -1,6 +1,6 @@
 DIST libmaxminddb-1.3.2.tar.gz 619009 BLAKE2B 1fa2d528d47e14a75e5096072e6ba8136eb5060ab95cb472ef70907dd519540790f6bbc518371e0d276d6977bb3444dbfd179d526877ca740e56ebf6eb459244 SHA512 906e80531a901091fd9f88075ece5189b0885400216ea994889d9250dd37ead14e00dc14ca2a38eb2100e4814d0eb3a205ba1618606f1375ab0dcc3981097115
 DIST libmaxminddb-1.4.2.tar.gz 600664 BLAKE2B df78522d2d764f813ca708fdaefeef47f3a97afbb010c108ca4e47ef2d711c445b5ad7d3d059b31ef0e72b08be569050b31f461fc6acf2c17ee4ce43225acbd6 SHA512 bc18d2f19a74639888a466483afde1bccfc3a83787011a6f38808b76e5a513c9912ff369ccbf584091d4def657e0574b16b35dc69ab12ae4c439aaaf3669c4c1
 EBUILD libmaxminddb-1.3.2.ebuild 585 BLAKE2B 0781072137ac3a9af9dec68ab64aa5ceb28ad3b1044f1a5bebe08055f2cf65ca3321d3f4409e397ebe3fd57b4d5f395ef23fc4d0cff1917bdc5f82a631307606 SHA512 129705297149f3955fdb8509c0587fa0aa81c43be7b3e4282949671fbaf58763f3abd702e1eac6b4a550d5352b98f8e7e7dcbe55d4263b7900fdda5b2aecfb7e
-EBUILD libmaxminddb-1.4.2.ebuild 593 BLAKE2B 19a07c359071ecbeadeb97a0129ebb74720ab7622bafc83571beb12dab0ee1326cd0eb78d97e1eae1727d3644c89ef6135bf4b72c2df94a450f74e2e549435cd SHA512 1ea29c3bf96f26d00ba3bbb02469bf4ec812431a1f922e74ee42fe2df880ea94ff233c3a010bb0a804e776e65d410b423c971b4c2cd865434e91745c4c1eade5
+EBUILD libmaxminddb-1.4.2.ebuild 591 BLAKE2B 8d648d824fc80c5169a8a4d3ed636d6fd5728bb8f6e8d28e170d707ffa1636906947c0c693d32c09e82ebb76c2b6517d7082348154cde2810b98acf6becf344f SHA512 cf5de4880c80be800f22a1010f87ee6c1f93a6175b3181217c0272f469726a74322afdab9aff3aac1ba0349d5ff97b3f7404d24da92619efb04655ef1f5d619b
 EBUILD libmaxminddb-99999.ebuild 566 BLAKE2B 0b79eac4fdb7a49d85faa10074a3fa541521413f83891b3d40a32ad3b3c90f45b240f156f23b2d9bcb0eb709bdb6b2dcc17d975a9ffff94e590f0b3b266efd02 SHA512 4f45005dd929c7646724693227c05652de0b28fd491710ed2b95078738d5cef6f2813676b3886f3bc605d23ebf81db76e2668832d0fd7edf06b2427859f334ba
 MISC metadata.xml 365 BLAKE2B 3acd92dfb25bcbae837f784572887ffc5542121a91d6f2077f3410d03ddc3290d8b3485c4aa8d1c97af8f4f85a3dc8a621fc9eb5affacc1e27d41d4760ed53a4 SHA512 4e7a17cbf391683173f573d79f273e92184695e37bc68070c03ef4969e8b0e8a35a34b8b87d6582f365b93683b143f216a5a2365c9fe63a6f36ddd78e2ff8730
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.4.2.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.4.2.ebuild
index e33cbb9af17d..e43296f2809d 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-1.4.2.ebuild
+++ b/dev-libs/libmaxminddb/libmaxminddb-1.4.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
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/maxmind/libmaxminddb/releases/download/${PV}/${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0/0.0.7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="static-libs"
 
 DOCS=( Changes.md )
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index e51a058d3c6c..d96034f99810 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -8,6 +8,6 @@ EBUILD libnl-1.1.4-r1.ebuild 1151 BLAKE2B 4f0985dfaccfe22881176666c5d0c0226e3615
 EBUILD libnl-1.1.4.ebuild 1130 BLAKE2B f82bb5df7f1a038dbcd7fce4ba45647b7977b6afbaf72a607dfa1f45b2d4d3e7f922af597d03f5f6ede83c2b041228b723f1a8b1b629f6ea566cfb1c56cd433b SHA512 3e1b6edc66c242d55914af818ed8f6177282cbce83287d92deedc9a4f3273c3542e185137559bf3ae88dd9c399a2bcf6e38220e15b302c6be63c521617527e51
 EBUILD libnl-1.1.9999.ebuild 1055 BLAKE2B 89c39a6ec77da02bd2adf5aa55116bdd6a9c12771502bb5a7ae922ea58f6e6aa240e98332cc037d1320f30383488415e5edbc1ac45164382567c9160e70d6194 SHA512 c1648b9fd4003454d9bf54e5c5af1deb68eff4d048f450180675870cedb915f9e54350c6bba9649289e10aec654d2f2e8025e0fde72240394e9f2bed2e055738
 EBUILD libnl-3.4.0.ebuild 2374 BLAKE2B 244a5c7ab75393db34b8511ad0d694f89d5be5dd00c1cf9b3efdd2754f7d69029cd27df0cc1f1d76a7c19fe4e22cf8a807b39307842ccdb214be341773dedb97 SHA512 e475e155734081f30024553190903e2f158fbe7103508ccfcc1a2241dd3aa6758e56ca0414cf002def4e639795fabf847b512d413aa4fae7f6b64cc8f4b108ad
-EBUILD libnl-3.5.0.ebuild 2371 BLAKE2B 59ff09b75143388b8669814060edb7f4631dd4bf252c47b460b1d532494bfbdc36e6290ae9c3f257ae2a396051b047439f2eabe7448b709debe7440550e72ced SHA512 0a22661ebee3d4731c8d40476527eb30833e6d56ab43d8f7bdc311d652330eb24d2ea4b16027fe48820da5fad059828bf84eff8ed14924cb52e536cc22e0a52a
-EBUILD libnl-99999999.ebuild 2132 BLAKE2B 4ac29a14c07f5769cdba9af5a53f7c384ed0587a31ba3368011dcfee342269060dfcccd4904e4b6fdf567882882adc46dbb02a1a34edd3f75f27591598d83867 SHA512 3891de572c343840a201a4a5bdb4a02a9b1cf07af5d9fc2b9dd864d7fb5fd07d85eb5d8c2488f616f4700050b205a3514b3a81cba40e4d31dd3cb00717c4acc7
+EBUILD libnl-3.5.0.ebuild 2395 BLAKE2B 8d2315fe9b1872ffdc09a21cd49ac8bf782c2a860381115c52992452e806e0f065f7d42bfc3302e40238a992a54558c1a6671d838cd1fc71d4d65e29cf67085b SHA512 c303f495df5d8becdc2aaead9b094fe63368ce7a0292265617fe3eca3b2b4d202d6c291a620a09507faaaf22cce9f6d7054b9d67da0002b959656a07b2af113f
+EBUILD libnl-99999999.ebuild 2156 BLAKE2B a8285f3893c4b5587d8b2ba61202dfd05e383189b88d65da097a0007f3a4f4925ca0939d774a7597ece4a0f76dca873dd88edcd139c94620ec4a8f577e0c9938 SHA512 5e1968443ecc4b2344428c182d3d5193a4707a042ca3ecd7ca522c1360f8f8841d4af068f37aad6d405e2d09f09b109c2266fd3595c13850b0cda81092fb40ed
 MISC metadata.xml 584 BLAKE2B a20cc961918ee8685889b73f8fcdf5cd26a5b0da2ddb95164774461c2fd78754262619d7de2dcb6030f7ef3d27a34057662b2c01cde1fe3729ba1c34bd2a087f SHA512 0e8731a9aafb77b313583babfb2786c4fcbe655f3fcebe93fee90b2ea4c7f03a6ed559a253cb63f5f3a5eb9fd841babcbb5c85c4c93e51a670abe605e9d22a9c
diff --git a/dev-libs/libnl/libnl-3.5.0.ebuild b/dev-libs/libnl/libnl-3.5.0.ebuild
index d4c68b526048..d9edacc58f93 100644
--- a/dev-libs/libnl/libnl-3.5.0.ebuild
+++ b/dev-libs/libnl/libnl-3.5.0.ebuild
@@ -26,6 +26,9 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+"
+BDEPEND="
+	${RDEPEND}
 	python? ( dev-lang/swig )
 	sys-devel/bison
 	sys-devel/flex
diff --git a/dev-libs/libnl/libnl-99999999.ebuild b/dev-libs/libnl/libnl-99999999.ebuild
index bbdb3529b765..52f318b2f912 100644
--- a/dev-libs/libnl/libnl-99999999.ebuild
+++ b/dev-libs/libnl/libnl-99999999.ebuild
@@ -20,6 +20,9 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+"
+BDEPEND="
+	${RDEPEND}
 	python? ( dev-lang/swig )
 	sys-devel/bison
 	sys-devel/flex
diff --git a/dev-libs/libparserutils/Manifest b/dev-libs/libparserutils/Manifest
index 191ebf8fe478..ff14f600f6de 100644
--- a/dev-libs/libparserutils/Manifest
+++ b/dev-libs/libparserutils/Manifest
@@ -1,7 +1,4 @@
-DIST libparserutils-0.2.3-src.tar.gz 74509 BLAKE2B b9b68a91823181e7a95ec94b1a117da27180afe4ff2b05da279cf59a0b126cefb78712cae382c24b377292e4b5802273b1f9bd8ac52969a3a693da635ec88f65 SHA512 b68cbf3a3260bacea10c8115a1c247de3d7220e94a7f73da84ee4b400678132d8db71b8e84fe92eacafc4945c111f049779c8fead4cf9bd98c6e96340943d270
 DIST libparserutils-0.2.4-src.tar.gz 74521 BLAKE2B 85e39d64bb8365f95da227e3a52ea2a2a85b0f913f861117b496bdff1556b8ca880189325995cf02eeb51f2db76c917a63f59ee1a1fed8fec6ce43dc16f9b66f SHA512 e6a7b618e00e2bc69a0de63c29cc809f250fbd1c10544523c563f4bb9ac3281e02ba36c096518fc0a9074dad49a05346b04cc85b7d972f88f2645af0f869cbc2
-DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
-EBUILD libparserutils-0.2.3.ebuild 594 BLAKE2B de28d631a4441252c99427514903d940386ef97b58dd2c2ab887a99d523c97f18485274e4399d3b0924b4318397fe165699599e2479463403a0479cdcbf1b011 SHA512 da4fe6b526150b45a9bf6d16f412309122564fb1470bf92e5d4f54b425e98ba8ad33aeee0b5ed2f93c9c7383dc4cb320bb3e6ddac1f954ff5e4ec4bc1ea6240b
-EBUILD libparserutils-0.2.4-r1.ebuild 941 BLAKE2B 6aa42423fb0351a1d0d2d29ef53a3b5dca9a889290b7129daaae8c1397aaffc106da2cf878f6b9a188d2da7802d33fa4643633cf26c781aae9307710bec39231 SHA512 0673b7a4d2a59a5ccbc1fd55a2897eb1b958271f3f41161c33d9c8b62587f8942c4b164155f920f06eede93b872da97395aaea9e55ab9c006d2136bb1881dfd0
+EBUILD libparserutils-0.2.4-r1.ebuild 938 BLAKE2B 7dc85b3341b087fc97ee1eb6b34d1b067f7fbcaecfc080fef9741f64593dcfae4fd6186ab6805e6080ce9513b2691eb36f37a2851a0231b60290e3fc8a6821e4 SHA512 fa6ba1dd5c1114c073d8aec20ca766c85dc75c97e3e46c4846e23b763b93366f0f743cc0b8eceb7fb60b67fd18f937663c6670adb1d7e0964f41cd72a1eb71bb
 EBUILD libparserutils-0.2.4-r2.ebuild 928 BLAKE2B 1e6e4b6ece27cb25070da2778a6a183edf887187c4cd5883821adfc6cc7435087b69c9d84aa49fad2d7bb43686195a2e9a5aeaa939699b8abae35df1ee2cff81 SHA512 59d9bbb4411556fd49a12de75026d2737e8315c856e87eb32f7082dedee0757da854d404e5dc215327f6510709506ea2652f28062cd5f1e8851348e9dea5d248
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libparserutils/libparserutils-0.2.3.ebuild b/dev-libs/libparserutils/libparserutils-0.2.3.ebuild
deleted file mode 100644
index 6a0e8a19d96d..000000000000
--- a/dev-libs/libparserutils/libparserutils-0.2.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=5
-
-NETSURF_BUILDSYSTEM=buildsystem-1.5
-inherit flag-o-matic netsurf
-
-DESCRIPTION="library for building efficient parsers, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libparserutils/"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~ppc x86 ~m68k-mint"
-IUSE="iconv test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (	dev-lang/perl )"
-
-DOCS=( README docs/Todo )
-
-src_configure() {
-	netsurf_src_configure
-
-	append-cflags "-D$(usex iconv WITH WITHOUT)_ICONV_FILTER"
-}
diff --git a/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild b/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild
index f14d887ac486..41f74a09eb87 100644
--- a/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild
+++ b/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~m68k-mint"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86 ~m68k-mint"
 IUSE="iconv test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libplatform/Manifest b/dev-libs/libplatform/Manifest
index df8c927815f2..8da91b497214 100644
--- a/dev-libs/libplatform/Manifest
+++ b/dev-libs/libplatform/Manifest
@@ -2,7 +2,7 @@ AUX libplatform-2.0.1-arch-specific-libdirs.patch 1231 BLAKE2B 33a61d252b2f9b60f
 DIST libplatform-2.0.1.tar.gz 74676 BLAKE2B 11d7861a419fd50e26a6c27129ec45b27e65a1429ca822c2fced5803def8b818a224fcf46253aec2f76efafd930376c41f7db5d413cfdffc149c17279ab09981 SHA512 ac397ffc741617be4371dc2a4b44cdddd07f2bdbd54e20e91a77e7d00b90b4d54f9aa5d2908c389638f548a7b6f9aa0a93bb10697eaecfc23117dee6f789f555
 DIST libplatform-2.1.0.1.tar.gz 75257 BLAKE2B 99887e7d8b1b51578a5b84cdb63c71caf75cce1674ab2c7c658bb9bbf67b69a23f4facdef8d4a4a9e2f7c0101886a5350fd92708cde3aa3010589c7055bf6a50 SHA512 76e6f1ac64b61e4def7d99965708d0f05698379e0f3e846317174f0bc12a9654b3341afc84bd8a3a70f101ecab6c692dea96b57d7e000dfabf6cedee2b8dcd8a
 EBUILD libplatform-2.0.1.ebuild 594 BLAKE2B 4fd6968f8a5f3794aa03551497edbc8272c043d3e0d7a9fb4c9ed03c7944b8126629c4daedfc0e95f5f514e1a8c578382eba882e40c4611350fe13e3ab64f64e SHA512 8f9f2577bac435fddce66c3163634be3035fa6c6f8588c8007162a4370b24ee5ddff18dd402dbcb58f0b0f4234acb71a2af8c73e82736e488e2712b66e86b23f
-EBUILD libplatform-2.1.0.1-r1.ebuild 652 BLAKE2B 917369a687338cc365c74fc57511e5605457a95772f9a8a6b7ac4ca59e36dda3fd53d097470a0f5672052bb09ff70b2537e0f51cb9c8537379eaa398f1937773 SHA512 fcda25e97e51b1e83df9459db7f2c61fba84b3ec732f9ebd746346dd623752de1916549dcad46a13ea77175019ba2dea85ca28e8e52f68f1df8e88db21f96f09
+EBUILD libplatform-2.1.0.1-r1.ebuild 659 BLAKE2B ca09705470fa2717bf8e0bf973ea661961947aa6823bd7a4ec02ced0f05fb2cce08effa7ec44561f5235528b8e70a9eea381797c50a98a49c407339ec8982150 SHA512 d1f45edb3528333d2d4ab1d14667f32c346900b6cb5235d3619f291305aaba5cf5685bf7436018e6c5c022e8c4f8c5a71268bb3516c8c5759a15859c86d74336
 EBUILD libplatform-2.1.0.1.ebuild 536 BLAKE2B c79671e45158a442947ec6d3b883118323d763446841034a52996bcffa4e2136ace86b76342309dfd2ece9dee666525f2746978c43f5919b0d18745a3e46548b SHA512 f83ac1fff7329908485ad594a0174c790e0bca246fd741ac9cf8cf1035b7be7a6cd950275ec3db6079020211bcf89940656efa5ef7181890109995a65f63f556
 EBUILD libplatform-9999.ebuild 652 BLAKE2B 917369a687338cc365c74fc57511e5605457a95772f9a8a6b7ac4ca59e36dda3fd53d097470a0f5672052bb09ff70b2537e0f51cb9c8537379eaa398f1937773 SHA512 fcda25e97e51b1e83df9459db7f2c61fba84b3ec732f9ebd746346dd623752de1916549dcad46a13ea77175019ba2dea85ca28e8e52f68f1df8e88db21f96f09
 MISC metadata.xml 341 BLAKE2B f7f71cc610ac0604026427e72d3d5cbeb21f8a78aae2eb95fd3c242648a31fb1a8fa9fbd8c7e3e8a46e3381a85c2f2c68b08e19958e1a3e9455da14b6465480c SHA512 eec5401306206626e2f4cc37e587e1b4e5c69be08a62f877df58d25749f1fd12bb61a89bf9e68089e823876f9a125f8e613753df2d4bef3792526905af358951
diff --git a/dev-libs/libplatform/libplatform-2.1.0.1-r1.ebuild b/dev-libs/libplatform/libplatform-2.1.0.1-r1.ebuild
index 4ef9c153d093..93381cb5e792 100644
--- a/dev-libs/libplatform/libplatform-2.1.0.1-r1.ebuild
+++ b/dev-libs/libplatform/libplatform-2.1.0.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
@@ -21,5 +21,5 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://github.com/Pulse-Eight/${MY_PN}/archive/${MY_PN_PREFIX}-${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${MY_PN}-${MY_PN_PREFIX}-${MY_PN}-${PV}"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index aa603b8849d8..d257461384ca 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -1,7 +1,9 @@
 DIST librdkafka-1.4.0.tar.gz 2722992 BLAKE2B 590fa90805bc2dc728dd32be333eaf9b2a4e6a840403838406684794ca68f2bcf9fc831e252a637622f9e6cd209d779ed20d503e49dac20bdb28f5d3fbd676bd SHA512 cd343597707d22490dfcd513a6b24ca5487dca5230a5a6775e7d6f10be2dc5481deb3a76968bb244d5f7514db92aceca541823c5841a7b54d8e00aeb9088731c
 DIST librdkafka-1.4.2.tar.gz 2732806 BLAKE2B 140160fef4f228d877bcfa9d892fd053d2b74547abdbeb7dc661bd4b2b7d576f1ebeecaccd1ac3c3669e059746f0c63be6468cd4f066a9862b8c60d8f2d014a4 SHA512 3d8e496466c103829f5fe11f1a6e68d1299c847b637c6fad55adbe1ad28bd5c463508f3f3fb8b3316b15a104f74e551cd5e520950d76c0e4f8c876083397ced5
+DIST librdkafka-1.4.4.tar.gz 2734332 BLAKE2B 47c22f00d88d58eb6366e17a8f0ddaee4984bc65f01a627c5d3b8eee019519a2de9a7ae6e2ab2053354a5d72337107b7f515ad65ff205b6838e154b95d9f2331 SHA512 478d17f56efd39b312ea774695bc31d22a83aae3a94913fb0dd07e7f04f3f2a6e3f3610dc7501864dbacbcf4a3207603c6e1d5eebac4e5246ee868cde398021d
 EBUILD librdkafka-1.4.0.ebuild 1471 BLAKE2B 1fd23cd2970dd73085d1a2a584fb6f391568996946e87452e6fd283bfc78119d2c52ecd571a24892c843274744e5aab62266a3a5cba51279109efee4d691e311 SHA512 7e168e876ff25bb9fb83b4ac7401742ce9dbe437939e3c10dbd96c0bffe66270e5816413f7ab7a441897066658c4cd9a7319f6a5b38aaa13a0867f13ee3b4662
-EBUILD librdkafka-1.4.2-r1.ebuild 1651 BLAKE2B 66922dc4ea5f5a8714f94b9c30635cf00699cf1c9d9b0ea98713224cf83459544e4c34a391739fdadb2ede219c9a6b9e497635f5057ab813bb2792f4f97b4331 SHA512 d4a172131e3a07aafa3ea880ab38db623f3b1f63b117ffdf34db62384413d59a6f9d254d064cede12d7d6b5db688a472e0d81887deb5deabe557b103348bdb71
+EBUILD librdkafka-1.4.2-r1.ebuild 1649 BLAKE2B 3976c28357855aca82bb6427e40f82a114228fe173c6b72bbe745771abae529360ea98dd7e58cd4365fa22522df4ab9610d5bedec67e626e9004a1c718699a1f SHA512 3dfc64e2358c7856c6a9c5fdbe646c0a3931350520f16db5c77223c2670a64e25be57d9569992771149cdc4ac112ef93674221e5ec48c165acab370d3ffeda22
 EBUILD librdkafka-1.4.2-r2.ebuild 1657 BLAKE2B 3c168be95035f152fb212e5f45198398b8b14d869f8dc899530b10e0bccbebad0b4bb57437b1c88c58e7f4684388392f21108453cb5ea89486c9710b0f2e2fcb SHA512 60557ddff24f340cef825a30ee3a96cd928c6a5a3568932f6ae99323a2d6f09f292cb8203e7fc3cec22c0157b16da25154db53c0ad37a05f7f06609e1cf84d8e
 EBUILD librdkafka-1.4.2.ebuild 1483 BLAKE2B 4c0400891f9a7f903aa0e118d3bfd1c24570179cd7448240048013f15e5131c18ded63d6f3ac39d9cb4c81a1a7aa52b8a3a3740064fd6c24b40e58b13b1cff6e SHA512 66e5eeb55879174c24ded6b55ebae60db37838fefefdef4b7c7dfa24aca94c2d6048a38830dee7033090e9f72d542d0c72a605b07f2ec20090d9fef7854da989
+EBUILD librdkafka-1.4.4.ebuild 1657 BLAKE2B 3c168be95035f152fb212e5f45198398b8b14d869f8dc899530b10e0bccbebad0b4bb57437b1c88c58e7f4684388392f21108453cb5ea89486c9710b0f2e2fcb SHA512 60557ddff24f340cef825a30ee3a96cd928c6a5a3568932f6ae99323a2d6f09f292cb8203e7fc3cec22c0157b16da25154db53c0ad37a05f7f06609e1cf84d8e
 MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308
diff --git a/dev-libs/librdkafka/librdkafka-1.4.2-r1.ebuild b/dev-libs/librdkafka/librdkafka-1.4.2-r1.ebuild
index 58cf22a68315..794aa066dc5e 100644
--- a/dev-libs/librdkafka/librdkafka-1.4.2-r1.ebuild
+++ b/dev-libs/librdkafka/librdkafka-1.4.2-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/dev-libs/librdkafka/librdkafka-1.4.4.ebuild b/dev-libs/librdkafka/librdkafka-1.4.4.ebuild
new file mode 100644
index 000000000000..b87a68933f65
--- /dev/null
+++ b/dev-libs/librdkafka/librdkafka-1.4.4.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Apache Kafka C/C++ client library"
+HOMEPAGE="https://github.com/edenhill/librdkafka"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/edenhill/${PN}.git"
+
+	inherit git-r3
+else
+	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+LICENSE="BSD-2"
+
+# subslot = soname version
+SLOT="0/1"
+
+IUSE="lz4 sasl ssl static-libs zstd"
+
+LIB_DEPEND="
+	lz4? ( app-arch/lz4:=[static-libs(+)] )
+	sasl? ( dev-libs/cyrus-sasl:=[static-libs(+)] )
+	ssl? ( dev-libs/openssl:0=[static-libs(+)] )
+	zstd? ( app-arch/zstd:=[static-libs(+)] )
+	sys-libs/zlib:=[static-libs(+)]
+"
+
+RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	static-libs? ( ${LIB_DEPEND} )
+"
+
+src_prepare() {
+	default
+
+	if [[ ${PV} != "9999" ]]; then
+		sed -i \
+			-e "s/^\(export RDKAFKA_GITVER=\).*/\1\"${PV}@release\"/" \
+			tests/run-test.sh || die
+	fi
+}
+
+src_configure() {
+	tc-export AR CC CXX LD NM OBJDUMP PKG_CONFIG STRIP
+
+	local myeconf=(
+		--no-cache
+		--no-download
+		--disable-debug-symbols
+		$(use_enable lz4)
+		$(use_enable sasl)
+		$(usex static-libs '--enable-static' '')
+		$(use_enable ssl)
+		$(use_enable zstd)
+	)
+
+	econf ${myeconf[@]}
+}
+
+src_test() {
+	emake -C tests run_local
+}
+
+src_install() {
+	emake -j1 \
+		DESTDIR="${D}" \
+		docdir="/usr/share/doc/${PF}" \
+		install
+
+	if ! use static-libs; then
+		find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+	fi
+}
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index cd70a89a3785..4c5796c6fa29 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -14,7 +14,7 @@ EBUILD libressl-2.8.3.ebuild 1572 BLAKE2B aaeecb5de2282cc7ed5f925a7930abcbdaaa25
 EBUILD libressl-2.9.2.ebuild 1742 BLAKE2B 3ba8f8b51b4b89515c6dadfb4b5975b1d683b04aea39fee7a509953f900d35f62d365896d3a2c7e5a53af943c184c362629c214147a5f4c3115833ba62473b85 SHA512 745a0e3f946ed03e90a876e78cab5e36c59b1c5ffe121499c0c149ad510cc47e62078bf62c0b43d7a0d2aa75c6103c1650193df8ec87ed4354f76080660f7cdb
 EBUILD libressl-3.0.2.ebuild 1700 BLAKE2B 7e504f9f0cd914d6f6377df8a6ee579bc425645fcb86c679d94747aed2d0d35b88e1409fff4ca07f1bb3c002357e1bc6d591c2fa880ec71961987f9af8691990 SHA512 e562c9f2045fc553999e8afbf226c059ec99f96948559a6438f2d147ecf9452ec1c88bcd2303433e7a6c038301d96413ed916df6db03029717d6e50e65cf2bbe
 EBUILD libressl-3.1.1.ebuild 1706 BLAKE2B 5ce07e1a9288f5f08df63198eec6b6e88b96c3648d3d4f6c98772a14f76d62e7add706d950386cf58f3c6439f5453ffa3dd4441efc3b4ff1c9b8fa7792c19aff SHA512 bd7e013012d0cab433ede6dcf10d3ae135b85bbaec33dae33a7ec1ca94e02493f4c31a667285b3160208be30ce92788515537efc690e98dc13332631a4c4a539
-EBUILD libressl-3.1.2.ebuild 1704 BLAKE2B 5ac0555b7d9418b31d785ab6af057f9cfaa241b687adaa43b0c01ab0f347f69d46127443fe92e9340909fdc4b7326914de2970610d807b23b44e8a96eace48fe SHA512 0aa0400c9a672ab615675cf4694338f5c82b0b9034c9d3321f1880ccf2dfd02bd28ec08939b09d37d55ebecb980e1ad016ecce25ff5fba989dbafc5a19b8d5ac
-EBUILD libressl-3.1.3.ebuild 1704 BLAKE2B 5ac0555b7d9418b31d785ab6af057f9cfaa241b687adaa43b0c01ab0f347f69d46127443fe92e9340909fdc4b7326914de2970610d807b23b44e8a96eace48fe SHA512 0aa0400c9a672ab615675cf4694338f5c82b0b9034c9d3321f1880ccf2dfd02bd28ec08939b09d37d55ebecb980e1ad016ecce25ff5fba989dbafc5a19b8d5ac
+EBUILD libressl-3.1.2.ebuild 1703 BLAKE2B 11108f1b25dd38796ea7691f9050156d886e19dd3f456385cb254a4abb12f2a01cfa411032da454a6c731b6a91b8f6f5184e578c0bbdaffd84e82935892fd933 SHA512 3697c878f6cccf88b373311d1878b54ec1e6533db34fa20eeab8078b84960c0a7663a2bf5a4d2aadc2da288604d0c23a5a29edd71196404098276dc8f90e00f6
+EBUILD libressl-3.1.3.ebuild 1703 BLAKE2B 11108f1b25dd38796ea7691f9050156d886e19dd3f456385cb254a4abb12f2a01cfa411032da454a6c731b6a91b8f6f5184e578c0bbdaffd84e82935892fd933 SHA512 3697c878f6cccf88b373311d1878b54ec1e6533db34fa20eeab8078b84960c0a7663a2bf5a4d2aadc2da288604d0c23a5a29edd71196404098276dc8f90e00f6
 EBUILD libressl-3.2.0.ebuild 1704 BLAKE2B 5ac0555b7d9418b31d785ab6af057f9cfaa241b687adaa43b0c01ab0f347f69d46127443fe92e9340909fdc4b7326914de2970610d807b23b44e8a96eace48fe SHA512 0aa0400c9a672ab615675cf4694338f5c82b0b9034c9d3321f1880ccf2dfd02bd28ec08939b09d37d55ebecb980e1ad016ecce25ff5fba989dbafc5a19b8d5ac
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-3.1.2.ebuild b/dev-libs/libressl/libressl-3.1.2.ebuild
index ab31f2041689..1df45e25a730 100644
--- a/dev-libs/libressl/libressl-3.1.2.ebuild
+++ b/dev-libs/libressl/libressl-3.1.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/48"
-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/libressl/libressl-3.1.3.ebuild b/dev-libs/libressl/libressl-3.1.3.ebuild
index ab31f2041689..1df45e25a730 100644
--- a/dev-libs/libressl/libressl-3.1.3.ebuild
+++ b/dev-libs/libressl/libressl-3.1.3.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/48"
-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/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index ac3ef31939fd..61d47b624c59 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -4,5 +4,5 @@ DIST libsigc++-2.10.1.tar.xz 4062388 BLAKE2B 3bd988acae78b7d463c966fa5c8da68b35d
 DIST libsigc++-2.10.3.tar.xz 4558428 BLAKE2B fcaaae7bf3a3aea30c0b8b63d7a7c5fa137d16128ef9652b611613118e323f7bcabafe28d42407df0e08c323c540143c152ac91e04e9f101c1971ddaf0f9144c SHA512 3c7f90be84724e39073c05624ad2bee6a5835e2c6cb6cf9e605edc6574eb7cd99ec153aaca6e8fcf7e3a6c031c4e9c334da32d04177d36788e64a17667c70b4e
 EBUILD libsigc++-1.2.7.ebuild 949 BLAKE2B aee7ea02cc434e79e0ac7e5fb26a1c683c2a045c29ea44d689b2a24802811ae5bd00f30d1519cdfb20d323b9126018c98f4d3150990aa872f72f5597a40541c3 SHA512 0cdd9c8a8a3ba22d6acad0b24b4cddc00bbd934e320f0cd40811aab2b09dffed39a7f27cd3a824d54403b8e9b317579dfd67dbd4424fce4c47d29e474027f28d
 EBUILD libsigc++-2.10.1.ebuild 1524 BLAKE2B 8958c575e619e0639628cff6650aa5fa5e1a70f3a656044e3690a9420e11a2d46077e70783873d224df738be64ca0ecb5480f74a5d02f281da0a2cb4a8721a39 SHA512 618f3427ff9f4209179320aad14cf2a6837034ca978395f33bcaf3c402071b9371d3a8b22c5105622394447417b68b3a99bb23930d37d238934bfbf4b91073aa
-EBUILD libsigc++-2.10.3.ebuild 1531 BLAKE2B 1cd2554cd054de91c0d548c1a00258f7d76e651ddd63d37fee70ddbe542dbf74aa3cebf437b4e6ec2b74a614ef0fa40f23aa22d5368e2ce48b701b583a0c64c2 SHA512 cff06f398b5a2fef73f131af4dbc3b90b834f496386c024d0118657d52fc5fbd3f5b2b6e9d537c88a9945b6a4411a99f048bd9d6f6780e9364579fac5de95d24
+EBUILD libsigc++-2.10.3.ebuild 1528 BLAKE2B 152d23024866a8bf9298bf5989cc6345ddcc2af5e70da6085d73e770f5fdf9c904200b9334f2b7b1fe8d610d2437a6eded1885838aa4ece8ea1d060087afdd43 SHA512 6e98b9f7291159d7b141086d2b5a32156143fb11056b68fdb7f25251919cf605c23b9b109bdc27cf6425fcbd64a10d530927de058191daaac00f7145c02dc897
 MISC metadata.xml 330 BLAKE2B 0b22bbb61c537a54f586756a026c3928e861873d2c6455e4792109180381c6a7bef00fa64037d5ec21da81ab7edbc6aaaecc784d66407db09bcb6613fb7b0be8 SHA512 541cc8c579c995b2b31cb5534205f7cf7c5d68b9b098fc90c96662c02a20cbd55ddbd9c25bdc19e6494620aa5847ef87035022174d35204e442a7487cd56025e
diff --git a/dev-libs/libsigc++/libsigc++-2.10.3.ebuild b/dev-libs/libsigc++/libsigc++-2.10.3.ebuild
index a74aef481380..b0f3976e72c2 100644
--- a/dev-libs/libsigc++/libsigc++-2.10.3.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.10.3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://libsigc.sourceforge.net/"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-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 ~x64-solaris ~x86-solaris"
+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 ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libtecla/Manifest b/dev-libs/libtecla/Manifest
index b583cc4a1e3c..bae7f1eaf9a2 100644
--- a/dev-libs/libtecla/Manifest
+++ b/dev-libs/libtecla/Manifest
@@ -6,5 +6,5 @@ AUX libtecla-1.6.3-prll-build.patch 418 BLAKE2B b93d0f2c31b4675443fa50e804896270
 AUX libtecla-1.6.3-secure-runpath.patch 1210 BLAKE2B 87a6dc7fce949e86588bcbbb74050209ebafde1432ec2199bd2147d3bd1e7be22390d3a3e9e0cc3800a2cba5971c2cc38fc19f36993c62b61aaa81946da2b0d6 SHA512 591e2b1bba8d99cee516d32b7974d3108d108bc77db2a4f180eb80ec00618a248e368a4f736fb7a27cadef16992baaf2698f49de1a5e54dd8638bfcb3e17155e
 AUX libtecla-1.6.3-static-libs.patch 1024 BLAKE2B 190508440e2a0323c1991bb2179c495be3e4748d04bc87da9328ae4fd828da331aab7679d2769d2110c02c94eb36aba2962223fbdc7de21e8863d08d3e87d289 SHA512 01483100e837c90cfc604ac6c177f03d8d96ff3972c454d3f720270508356c18be336b77624d6c8c291c12fc1400a9e58531b3b7e12c5afc8aa116c15431e756
 DIST libtecla-1.6.3.tar.gz 531499 BLAKE2B 6cc585ce104a60138c8b1950f455be845f3db014f1b56585a6ff8c05101e187a3f9deb7546a24e28d8797a49c426606ff50ccb49065ec2dfe4999537c66579ba SHA512 e92da3e52f1e06f731378ea8d4529865526b7816f92c3cd41a24ee8b629453564ec1995cf528928dd0673826cdd88f57e057ec0641f9c00fc9ebb255c725df6b
-EBUILD libtecla-1.6.3.ebuild 1019 BLAKE2B 4c2c122d870285f3c41c85bff789a01782afad3d2db27d216b06a4485dd7b32c972fc124c301cad04fc86e68ff791cade46fea14c251f4b1828977ba1fffdae3 SHA512 f55f57f366d335bb74d9da6ab25db32a31885956898325940a0e9bb62c5b8fd48a90024eb180d8ef30a2f3f51789cd57d300c179c023344668a2bdd2478d2288
+EBUILD libtecla-1.6.3.ebuild 1021 BLAKE2B 88bbe90d3800fd5b148a3e14f605a889bdb4198f02e1c6b6b7f218234ddfedec692d4af9ce438e5999a97c9cf3b1157ccd149aa6d0c25f85b2ffc0bf597444f5 SHA512 74060e273c217ea4848466f59614d408ec686d0a944d512190a8c77e742e017676f86688e6a901a78ebb62787697236f39781098910619e892bca5e564f7fe77
 MISC metadata.xml 794 BLAKE2B 073e5013e838aadadaeb48afa161f06ffc2fe954299d44b80a1f9e527d3e7462e27373480274fffed37f60aaf1894e0d5865dc42e097775bb8c50e0e1f59f53f SHA512 80be7186ebcabddeb32cac439005d885a000696ee59ddf5c25a66b91ce9d37249091c9469c03c82669b706241476d6eed9a1a6aedb592c05778ef31479f31750
diff --git a/dev-libs/libtecla/libtecla-1.6.3.ebuild b/dev-libs/libtecla/libtecla-1.6.3.ebuild
index d7cd7848d68f..070399cd74d5 100644
--- a/dev-libs/libtecla/libtecla-1.6.3.ebuild
+++ b/dev-libs/libtecla/libtecla-1.6.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=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit autotools flag-o-matic
 
 DESCRIPTION="Tecla command-line editing library"
-HOMEPAGE="http://www.astro.caltech.edu/~mcs/tecla/"
-SRC_URI="http://www.astro.caltech.edu/~mcs/tecla/${P}.tar.gz"
+HOMEPAGE="https://www.astro.caltech.edu/~mcs/tecla/"
+SRC_URI="https://www.astro.caltech.edu/~mcs/tecla/${P}.tar.gz"
 
 LICENSE="icu"
 SLOT="0"
diff --git a/dev-libs/libtpms/Manifest b/dev-libs/libtpms/Manifest
index 7389e68702e9..18b75de7d335 100644
--- a/dev-libs/libtpms/Manifest
+++ b/dev-libs/libtpms/Manifest
@@ -1,7 +1,3 @@
-AUX libtpms-0.7.0-tpm12-Fix-potential-buffer-overflow-in-filename-creation.patch 4565 BLAKE2B a0df14afa6d95e36f75d9c74ddff9fed42a54ef3c0320e095f47cb7c1fbd4d29bfee870779aaa19a64663f18227877c79a47469c44338d6db528725ea0eb1e69 SHA512 f8a5fc3810e96bca2c9a4221f01b66177657f294bbf1537643551a1a6c0a816ef865e23030913196667dc21b10423c0cced2eba3e6667acdc6312a9376c27884
-AUX libtpms-0.7.0-tpm12-Initialize-a-few-variables-for-x86-gcc-O3.patch 6793 BLAKE2B 5462fc0a5ebe83a3c560519cb821b90b7c6b490c6a8046ea131cdbb5a65068b63d1edde55c5f80a967492a2615c07d049e496afbeb2a348a4186de885b65293a SHA512 8e570a081f24c19afb65d04b17c07680967453d29697b7fd3af72dff1bdf99e92f03e19b290db992859a7bd6665651c0bc90117656d016266fd289aa2afd6db8
-AUX libtpms-0.7.0-tpm12-Initialize-some-variables-for-gcc.patch 3972 BLAKE2B f2f0e3a93c36adaa9e8cef7bb6e6ee723408acd26046a7bb4d0ffb1361502aa7c6a3316e2d8df5225ab0651e1aac0e84e03186bc0aa83c98d21d8f0be220a30d SHA512 36975108af1f1a5914e6b35bff00f7ed63e5b349cf7433687d23faa87bf1072ffa779c35313feaba50c6758fee6d66ccdc2f151ecdb50cf4606fbedd518308a9
-AUX libtpms-0.7.0-tpm2-Fix-a-gcc-10.1.0-complaint.patch 2324 BLAKE2B 2d132eecdd410889ebf2452f83b24a6f9a8df53769d63cfcb0a4b5ab62d2cbd096b82208e73691d030a07968937c899e1dc606a492ceb68d4739a3a204c8808a SHA512 0f290bf4cd2a83176158bf0c67d1be6ea405cb7133ea2d83c5b86b05370b208e6266a050d49c4e5954e8da76eb4d15f24b8238625483d5f4c0d6a20061febf79
-DIST libtpms-0.7.0.tar.gz 1203837 BLAKE2B ca5a3b78dc63c09c4ff084124838fedeb5be0580f709ad6165680159ba7ba4b1f751b9fbc67f6b5a8f39b82bdd420afb47087412a47b72cbe5b418a97a4860fe SHA512 92d1eb5d1a1cae08e97cceaca56fc9bc6d43c54a93edae2accf19807a4e93e19d88064a0b11db796c79d32c821e6b320ebbacb65cd20da3e5b1205f3b861cef2
-EBUILD libtpms-0.7.0-r1.ebuild 958 BLAKE2B 0fcfec0ab17ca845399bc857776e2ef6bf4e9f47dc23e90aa80792d0a70f09fdc4dc7047ffb2a7662002554f93c4e0e6d18fbd0d0e5fce7338e3ad4ce7c94ab3 SHA512 8b079683c1a0aef0f925bf3199e0d464b0e83f62f6c9c26187a02e14614e6e142ff6e637da99d0468ed5470291ffa8ca3c57351433fd325130478c0951f58834
+DIST libtpms-0.7.2.tar.gz 1205662 BLAKE2B e549d94b6915b3a126aac76bc65c743acf9295fa4b4b836cfc34fb4cbe52e6da000d11d2995de377ccf5d0e2366d763dd1a881c4f4ab87631c52ad62b3792b7a SHA512 ddc1e00e01fe91977ac78e069a0005b7b6a4e34f41c2d53bfb24f3fdaea73945a83ae5aa344d01b6636fdd2f3dd30c4ec54b1ef58d0964700ba4cf688d436739
+EBUILD libtpms-0.7.2.ebuild 685 BLAKE2B 68f92d960b69dcf47f7857c5dcffb1779ca0590f55376dfd02fcc8aa2d0d59b12e378c575d4cdf43be97693a88f48c4cd306c0eb612d63e475a28381f4ba7221 SHA512 59ab00ed93f3fbcede655b7329ed028cc8cb25dc0f28234bc11b083916db6deaf821a82413f416b8811c4a67f4173d204a2a0efc0e68238cc9b83cc8ab970dbc
 MISC metadata.xml 370 BLAKE2B eb4d1a4a8e56cbdcb5b7f86029feb6e2151967f7b4801fbb3a8c2de35840969a4987ca2aada95792cb35ab03702715b1f66fe966c176969de743c64775bed0cb SHA512 5a2f5a0089bb0c54dd36821005a65cbe8c4fd05f1d7e0367eaff02031a39c749e005e5432da334081304af8c55b330b549821819455f1f0919d4525a254ca5c6
diff --git a/dev-libs/libtpms/files/libtpms-0.7.0-tpm12-Fix-potential-buffer-overflow-in-filename-creation.patch b/dev-libs/libtpms/files/libtpms-0.7.0-tpm12-Fix-potential-buffer-overflow-in-filename-creation.patch
deleted file mode 100644
index 9e7af9e88ed3..000000000000
--- a/dev-libs/libtpms/files/libtpms-0.7.0-tpm12-Fix-potential-buffer-overflow-in-filename-creation.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 1cdd950e7342240ed8edc695372365cf57fbc6cb Mon Sep 17 00:00:00 2001
-From: Stefan Berger <stefanb@linux.vnet.ibm.com>
-Date: Thu, 17 Oct 2019 10:19:23 -0400
-Subject: [PATCH 2/2] tpm12: Fix potential buffer overflow in filename creation
-
-Fix a potential buffer overflow bug in the creation of filenames
-that were using sprintf() rather than snprintf(). The buffer overflow
-could occurr if the buffer is longer than 4096 bytes. The state path
-may alone be 4096 bytes and could possibly trigger the overflow.
-
-Swtpm for example is not affected from this since it uses the callbacks
-that are invoked before the faulty function is called.
-
-Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
----
- src/tpm12/tpm_nvfile.c | 43 ++++++++++++++++++++++++++++++++----------
- 1 file changed, 33 insertions(+), 10 deletions(-)
-
-diff --git a/src/tpm12/tpm_nvfile.c b/src/tpm12/tpm_nvfile.c
-index c8e7bcf..0268bd0 100644
---- a/src/tpm12/tpm_nvfile.c
-+++ b/src/tpm12/tpm_nvfile.c
-@@ -70,7 +70,8 @@
- 
- /* local prototypes */
- 
--static void       TPM_NVRAM_GetFilenameForName(char *filename,
-+static TPM_RESULT TPM_NVRAM_GetFilenameForName(char *filename,
-+                                               size_t filename_len,
- 					       uint32_t tpm_number,
-                                                const char *name);
- 
-@@ -189,7 +190,10 @@ TPM_RESULT TPM_NVRAM_LoadData(unsigned char **data,     /* freed by caller */
-     /* open the file */
-     if (rc == 0) {
-         /* map name to the rooted filename */
--        TPM_NVRAM_GetFilenameForName(filename, tpm_number, name);
-+        rc = TPM_NVRAM_GetFilenameForName(filename, sizeof(filename),
-+                                          tpm_number, name);
-+    }
-+    if (rc == 0) {
-         printf("  TPM_NVRAM_LoadData: Opening file %s\n", filename);
-         file = fopen(filename, "rb");                           /* closed @1 */
-         if (file == NULL) {     /* if failure, determine cause */
-@@ -297,7 +301,10 @@ TPM_RESULT TPM_NVRAM_StoreData(const unsigned char *data,
-     printf(" TPM_NVRAM_StoreData: To name %s\n", name);
-     if (rc == 0) {
-         /* map name to the rooted filename */
--        TPM_NVRAM_GetFilenameForName(filename, tpm_number, name);
-+        rc = TPM_NVRAM_GetFilenameForName(filename, sizeof(filename),
-+                                          tpm_number, name);
-+    }
-+    if (rc == 0) {
-         /* open the file */
-         printf(" TPM_NVRAM_StoreData: Opening file %s\n", filename);
-         file = fopen(filename, "wb");                           /* closed @1 */
-@@ -339,14 +346,27 @@ TPM_RESULT TPM_NVRAM_StoreData(const unsigned char *data,
-    state_directory/tpm_number.name
- */
- 
--static void TPM_NVRAM_GetFilenameForName(char *filename,        /* output: rooted filename */
--					 uint32_t tpm_number,
--                                         const char *name)      /* input: abstract name */
-+static TPM_RESULT TPM_NVRAM_GetFilenameForName(char *filename,        /* output: rooted filename */
-+					       size_t filename_len,
-+					       uint32_t tpm_number,
-+                                               const char *name)      /* input: abstract name */
- {
-+    int n;
-+    TPM_RESULT rc = TPM_FAIL;
-+
-     printf(" TPM_NVRAM_GetFilenameForName: For name %s\n", name);
--    sprintf(filename, "%s/%02lx.%s", state_directory, (unsigned long)tpm_number, name);
--    printf("  TPM_NVRAM_GetFilenameForName: File name %s\n", filename);
--    return;
-+    n = snprintf(filename, filename_len,
-+                 "%s/%02lx.%s", state_directory, (unsigned long)tpm_number,
-+                 name);
-+    if (n < 0) {
-+        printf(" TPM_NVRAM_GetFilenameForName: Error (fatal), snprintf failed\n");
-+    } else if ((size_t)n >= filename_len) {
-+        printf(" TPM_NVRAM_GetFilenameForName: Error (fatal), buffer too small\n");
-+    } else {
-+        printf("  TPM_NVRAM_GetFilenameForName: File name %s\n", filename);
-+        rc = TPM_SUCCESS;
-+    }
-+    return rc;
- }
- 
- /* TPM_NVRAM_DeleteName() deletes the 'name' from NVRAM
-@@ -380,7 +400,10 @@ TPM_RESULT TPM_NVRAM_DeleteName(uint32_t tpm_number,
-     
-     printf(" TPM_NVRAM_DeleteName: Name %s\n", name);
-     /* map name to the rooted filename */
--    TPM_NVRAM_GetFilenameForName(filename, tpm_number, name);
-+    if (rc == 0) {
-+        rc = TPM_NVRAM_GetFilenameForName(filename, sizeof(filename),
-+                                          tpm_number, name);
-+    }
-     if (rc == 0) {
-         irc = remove(filename);
-         if ((irc != 0) &&               /* if the remove failed */
--- 
-2.26.2
-
diff --git a/dev-libs/libtpms/files/libtpms-0.7.0-tpm12-Initialize-a-few-variables-for-x86-gcc-O3.patch b/dev-libs/libtpms/files/libtpms-0.7.0-tpm12-Initialize-a-few-variables-for-x86-gcc-O3.patch
deleted file mode 100644
index e1c79875a02d..000000000000
--- a/dev-libs/libtpms/files/libtpms-0.7.0-tpm12-Initialize-a-few-variables-for-x86-gcc-O3.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 464083396ae1d242fb2a26c1ab6e39971e82f47e Mon Sep 17 00:00:00 2001
-From: Stefan Berger <stefanb@linux.ibm.com>
-Date: Fri, 17 Jan 2020 19:01:24 +0000
-Subject: [PATCH 3/3] tpm12: Initialize a few variables for x86 gcc -O3
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-gcc (Ubuntu 5.4.0-6ubuntu1~16.04.12) 5.4.0 20160609
-
-The above gcc on x86 with -O3 reports the following false positives:
-
- gcc -DHAVE_CONFIG_H -I. -I.. -include tpm_library_conf.h -I../include/libtpms -I../include/libtpms -fstack-protector-strong -DTPM_V12 -DTPM_PCCLIENT -DTPM_VOLATILE_LOAD -DTPM_ENABLE_ACTIVATE -DTPM_AES -DTPM_LIBTPMS_CALLBACKS -DTPM_NV_DISK -DTPM_POSIX -DTPM_NOMAINTENANCE_COMMANDS -O3 -DUSE_OPENSSL_FUNCTIONS_SYMMETRIC=1 -DUSE_OPENSSL_FUNCTIONS_EC=1 -DUSE_OPENSSL_FUNCTIONS_ECDSA=0 -DUSE_OPENSSL_FUNCTIONS_RSA=0 -Wall -Werror -Wreturn-type -Wsign-compare -Wno-self-assign -MT tpm12/libtpms_tpm12_la-tpm_nvram.lo -MD -MP -MF tpm12/.deps/libtpms_tpm12_la-tpm_nvram.Tpo -c tpm12/tpm_nvram.c -o tpm12/libtpms_tpm12_la-tpm_nvram.o
-tpm12/tpm_nvram.c: In function ‘TPM_Process_NVReadValue’:
-tpm12/tpm_nvram.c:1539:38: error: ‘isGPIO’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
-      if ((returnCode == TPM_SUCCESS) && !isGPIO) {
-                                      ^
-tpm12/tpm_nvram.c: In function ‘TPM_Process_NVWriteValue’:
-tpm12/tpm_nvram.c:2323:6: error: ‘isGPIO’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
-   if (!isGPIO) {
-      ^
-
-gcc -DHAVE_CONFIG_H -I. -I.. -include tpm_library_conf.h -I../include/libtpms -I../include/libtpms -fstack-protector-strong -DTPM_V12 -DTPM_PCCLIENT -DTPM_VOLATILE_LOAD -DTPM_ENABLE_ACTIVATE -DTPM_AES -DTPM_LIBTPMS_CALLBACKS -DTPM_NV_DISK -DTPM_POSIX -DTPM_NOMAINTENANCE_COMMANDS -O3 -DUSE_OPENSSL_FUNCTIONS_SYMMETRIC=1 -DUSE_OPENSSL_FUNCTIONS_EC=1 -DUSE_OPENSSL_FUNCTIONS_ECDSA=0 -DUSE_OPENSSL_FUNCTIONS_RSA=0 -Wall -Werror -Wreturn-type -Wsign-compare -Wno-self-assign -MT tpm12/libtpms_tpm12_la-tpm_process.lo -MD -MP -MF tpm12/.deps/libtpms_tpm12_la-tpm_process.Tpo -c tpm12/tpm_process.c -o tpm12/libtpms_tpm12_la-tpm_process.o
-tpm12/tpm_process.c: In function ‘TPM_Process_GetCapabilitySigned’:
-tpm12/tpm_process.c:5089:19: error: ‘transportEncrypt’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
-      returnCode = TPM_ProcessAudit(tpm_state,
-                   ^
-tpm12/tpm_process.c: In function ‘TPM_Process_SetCapability’:
-tpm12/tpm_process.c:5309:19: error: ‘transportEncrypt’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
-      returnCode = TPM_ProcessAudit(tpm_state,
-                   ^
-tpm12/tpm_process.c: At top level:
-
-gcc -DHAVE_CONFIG_H -I. -I.. -include tpm_library_conf.h -I../include/libtpms -I../include/libtpms -fstack-protector-strong -DTPM_V12 -DTPM_PCCLIENT -DTPM_VOLATILE_LOAD -DTPM_ENABLE_ACTIVATE -DTPM_AES -DTPM_LIBTPMS_CALLBACKS -DTPM_NV_DISK -DTPM_POSIX -DTPM_NOMAINTENANCE_COMMANDS -O3 -DUSE_OPENSSL_FUNCTIONS_SYMMETRIC=1 -DUSE_OPENSSL_FUNCTIONS_EC=1 -DUSE_OPENSSL_FUNCTIONS_ECDSA=0 -DUSE_OPENSSL_FUNCTIONS_RSA=0 -Wall -Werror -Wreturn-type -Wsign-compare -Wno-self-assign -MT tpm12/libtpms_tpm12_la-tpm_transport.lo -MD -MP -MF tpm12/.deps/libtpms_tpm12_la-tpm_transport.Tpo -c tpm12/tpm_transport.c -o tpm12/libtpms_tpm12_la-tpm_transport.o
-tpm12/tpm_transport.c: In function ‘TPM_Process_ReleaseTransportSigned’:
-tpm12/tpm_transport.c:2810:42: error: ‘t1TpmTransportInternal’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
-  returnCode = TPM_TransportLogOut_Extend(t1TpmTransportInternal->transDigest,
-                                          ^
-
-This patch initializes the variables.
-
-Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
----
- src/tpm12/tpm_nvram.c     | 4 ++--
- src/tpm12/tpm_process.c   | 4 ++--
- src/tpm12/tpm_transport.c | 2 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/tpm12/tpm_nvram.c b/src/tpm12/tpm_nvram.c
-index 1b9c005..620944e 100644
---- a/src/tpm12/tpm_nvram.c
-+++ b/src/tpm12/tpm_nvram.c
-@@ -1288,7 +1288,7 @@ TPM_RESULT TPM_Process_NVReadValue(tpm_state_t *tpm_state,
-     TPM_BOOL			ignore_auth = FALSE;
-     TPM_BOOL			dir = FALSE;
-     TPM_BOOL			physicalPresence;
--    TPM_BOOL			isGPIO;
-+    TPM_BOOL			isGPIO = FALSE;
-     BYTE 			*gpioData = NULL;
-     TPM_NV_DATA_SENSITIVE	*d1NvdataSensitive;
-     uint32_t			s1Last;
-@@ -2000,7 +2000,7 @@ TPM_RESULT TPM_Process_NVWriteValue(tpm_state_t *tpm_state,
-     TPM_NV_DATA_SENSITIVE	*d1NvdataSensitive;
-     uint32_t			s1Last;
-     TPM_BOOL			physicalPresence;
--    TPM_BOOL			isGPIO;
-+    TPM_BOOL			isGPIO = FALSE;
-     uint32_t			nv1 = tpm_state->tpm_permanent_data.noOwnerNVWrite;
- 							/* temp for noOwnerNVWrite, initialize to
- 							   silence compiler */
-diff --git a/src/tpm12/tpm_process.c b/src/tpm12/tpm_process.c
-index d6a3b8e..c433621 100644
---- a/src/tpm12/tpm_process.c
-+++ b/src/tpm12/tpm_process.c
-@@ -4844,7 +4844,7 @@ TPM_RESULT TPM_Process_GetCapabilitySigned(tpm_state_t *tpm_state,
-     unsigned char *	inParamEnd;		/* ending point of inParam's */
-     TPM_DIGEST		inParamDigest;
-     TPM_BOOL		auditStatus;		/* audit the ordinal */
--    TPM_BOOL		transportEncrypt;	/* wrapped in encrypted transport session */
-+    TPM_BOOL		transportEncrypt = FALSE;/* wrapped in encrypted transport session */
-     TPM_BOOL		authHandleValid = FALSE;
-     TPM_AUTH_SESSION_DATA *auth_session_data;	/* session data for authHandle */
-     TPM_SECRET		*hmacKey;
-@@ -5144,7 +5144,7 @@ TPM_RESULT TPM_Process_SetCapability(tpm_state_t *tpm_state,
-     unsigned char *	inParamEnd;		/* ending point of inParam's */
-     TPM_DIGEST		inParamDigest;
-     TPM_BOOL		auditStatus;		/* audit the ordinal */
--    TPM_BOOL		transportEncrypt;	/* wrapped in encrypted transport session */
-+    TPM_BOOL		transportEncrypt = FALSE;/* wrapped in encrypted transport session */
-     TPM_BOOL		authHandleValid = FALSE;
-     TPM_AUTH_SESSION_DATA *auth_session_data;	/* session data for authHandle */
-     TPM_SECRET		*hmacKey;
-diff --git a/src/tpm12/tpm_transport.c b/src/tpm12/tpm_transport.c
-index 2261670..7b9c520 100644
---- a/src/tpm12/tpm_transport.c
-+++ b/src/tpm12/tpm_transport.c
-@@ -2599,7 +2599,7 @@ TPM_RESULT TPM_Process_ReleaseTransportSigned(tpm_state_t *tpm_state,
-     TPM_BOOL			authHandleValid = FALSE;
-     TPM_BOOL			transHandleValid = FALSE;
-     TPM_AUTH_SESSION_DATA	*auth_session_data = NULL;	/* session data for authHandle */
--    TPM_TRANSPORT_INTERNAL	*t1TpmTransportInternal;
-+    TPM_TRANSPORT_INTERNAL	*t1TpmTransportInternal = NULL;
-     TPM_SECRET			*hmacKey;
-     TPM_KEY			*sigKey = NULL;		/* the key specified by keyHandle */
-     TPM_BOOL			parentPCRStatus;
--- 
-2.26.2
-
diff --git a/dev-libs/libtpms/files/libtpms-0.7.0-tpm12-Initialize-some-variables-for-gcc.patch b/dev-libs/libtpms/files/libtpms-0.7.0-tpm12-Initialize-some-variables-for-gcc.patch
deleted file mode 100644
index 309c78b3d1eb..000000000000
--- a/dev-libs/libtpms/files/libtpms-0.7.0-tpm12-Initialize-some-variables-for-gcc.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From aab357515eda564500290a4b3f542d2b4609af4f Mon Sep 17 00:00:00 2001
-From: Stefan Berger <stefanb@linux.ibm.com>
-Date: Tue, 14 Jan 2020 18:05:06 -0500
-Subject: [PATCH] tpm12: Initialize some variables for gcc ppc64el compiler
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-gcc (Ubuntu 9.2.1-21ubuntu1) 9.2.1 20191130
-
-The gcc compiler on Ubuntu Focal reports several false positives for
-potentially uninitialized variables:
-
-tpm12/tpm_session.c: In function ‘TPM_Process_SaveContext’:
-tpm12/tpm_session.c:3229:19: error: ‘tpm_auth_session_data’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
- 3229 |      returnCode = TPM_AuthSessionData_Store(&r1ContextSensitive, tpm_auth_session_data);
-      |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-tpm12/tpm_delegate.c: In function ‘TPM_Process_DelegateManage’:
-tpm12/tpm_delegate.c:1787:49: error: ‘familyRow’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
- 1787 |  if ((opCode != TPM_FAMILY_CREATE) && (familyRow->flags & TPM_DELEGATE_ADMIN_LOCK)) {
-      |                                        ~~~~~~~~~^~~~~~~
-tpm12/tpm_delegate.c: In function ‘TPM_Process_DelegateUpdateVerification’:
-tpm12/tpm_delegate.c:3575:48: error: ‘d1DelegateTableRow’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
- 3575 |      d1DelegateTableRow->pub.verificationCount = familyRow->verificationCount;
-      |      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-All of the variables are initialize under the same condition as they are
-accessed.
-
-Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
----
- src/tpm12/tpm_delegate.c | 4 ++--
- src/tpm12/tpm_session.c  | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/tpm12/tpm_delegate.c b/src/tpm12/tpm_delegate.c
-index 51d12f3..37ebc02 100644
---- a/src/tpm12/tpm_delegate.c
-+++ b/src/tpm12/tpm_delegate.c
-@@ -1629,7 +1629,7 @@ TPM_RESULT TPM_Process_DelegateManage(tpm_state_t *tpm_state,
-     TPM_SECRET			*hmacKey;
-     TPM_SECRET			savedAuth;		/* saved copy for response */
-     TPM_DELEGATE_PUBLIC		*delegatePublic;	/* from DSAP session */
--    TPM_FAMILY_TABLE_ENTRY	*familyRow;		/* family table row containing familyID */
-+    TPM_FAMILY_TABLE_ENTRY	*familyRow = NULL;	/* family table row containing familyID */
-     uint32_t			nv1 = tpm_state->tpm_permanent_data.noOwnerNVWrite;
- 							/* temp for noOwnerNVWrite, initialize to
- 							   silence compiler */
-@@ -3360,7 +3360,7 @@ TPM_RESULT TPM_Process_DelegateUpdateVerification(tpm_state_t *tpm_state,
-     TPM_DELEGATE_INDEX		d1DelegateIndex;
-     TPM_DELEGATE_OWNER_BLOB	d1DelegateOwnerBlob;
-     TPM_DELEGATE_KEY_BLOB	d1DelegateKeyBlob;
--    TPM_DELEGATE_TABLE_ROW	*d1DelegateTableRow;
-+    TPM_DELEGATE_TABLE_ROW	*d1DelegateTableRow = NULL;
-     TPM_FAMILY_ID		familyID = 0;
-     TPM_FAMILY_TABLE_ENTRY	*familyRow;		/* family table row containing familyID */
-     TPM_DELEGATE_PUBLIC		*delegatePublic;	/* from DSAP session */
-diff --git a/src/tpm12/tpm_session.c b/src/tpm12/tpm_session.c
-index 5e7b708..15b977f 100644
---- a/src/tpm12/tpm_session.c
-+++ b/src/tpm12/tpm_session.c
-@@ -3044,7 +3044,7 @@ TPM_RESULT TPM_Process_SaveContext(tpm_state_t *tpm_state,
-     TPM_STORE_BUFFER		b1_sbuffer;		/* serialization of b1 */
-     TPM_STCLEAR_DATA		*v1StClearData = NULL;
-     TPM_KEY_HANDLE_ENTRY	*tpm_key_handle_entry;	/* key table entry for the handle */
--    TPM_AUTH_SESSION_DATA	*tpm_auth_session_data; /* session table entry for the handle */
-+    TPM_AUTH_SESSION_DATA	*tpm_auth_session_data = NULL; /* session table entry for the handle */
-     TPM_TRANSPORT_INTERNAL	*tpm_transport_internal; /* transport table entry for the handle */
-     TPM_DAA_SESSION_DATA	*tpm_daa_session_data;	/* daa session table entry for the handle */
-     TPM_NONCE			*n1ContextNonce = NULL;
--- 
-2.26.2
-
diff --git a/dev-libs/libtpms/files/libtpms-0.7.0-tpm2-Fix-a-gcc-10.1.0-complaint.patch b/dev-libs/libtpms/files/libtpms-0.7.0-tpm2-Fix-a-gcc-10.1.0-complaint.patch
deleted file mode 100644
index 539ddb243d07..000000000000
--- a/dev-libs/libtpms/files/libtpms-0.7.0-tpm2-Fix-a-gcc-10.1.0-complaint.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From f3f78c72a5b6ef42119188ac5af73bb3a0a8bbba Mon Sep 17 00:00:00 2001
-From: Stefan Berger <stefanb@linux.vnet.ibm.com>
-Date: Tue, 12 May 2020 13:41:53 -0400
-Subject: [PATCH] tpm2: Fix a gcc 10.1.0 complaint
-
-This PR addresses issue 133: https://github.com/stefanberger/libtpms/issues/133
-
-bin/sh ../libtool  --tag=CC   --mode=compile x86_64-pc-linux-gnu-gcc \
-  -DHAVE_CONFIG_H -I. -I..    -include tpm_library_conf.h \
-  -I../include/libtpms -I../include/libtpms -fstack-protector-strong \
-  -D_POSIX_ -DTPM_POSIX -DTPM_LIBTPMS_CALLBACKS -I ./tpm2 \
-  -I ./tpm2/crypto -I ./tpm2/crypto/openssl -g -O2 \
-  -DUSE_OPENSSL_FUNCTIONS_SYMMETRIC=1 -DUSE_OPENSSL_FUNCTIONS_EC=1 \
-  -DUSE_OPENSSL_FUNCTIONS_ECDSA=1 -DUSE_OPENSSL_FUNCTIONS_RSA=1 \
-  -Wall -Werror -Wreturn-type -Wsign-compare -Wno-self-assign \
-  -c -o tpm2/libtpms_tpm2_la-NVDynamic.lo `test -f 'tpm2/NVDynamic.c' \
-  || echo './'`tpm2/NVDynamic.c
-libtool: compile:  x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. \
-  -I.. -include tpm_library_conf.h -I../include/libtpms \
-  -I../include/libtpms -fstack-protector-strong -D_POSIX_ -DTPM_POSIX \
-  -DTPM_LIBTPMS_CALLBACKS -I ./tpm2 -I ./tpm2/crypto \
-  -I ./tpm2/crypto/openssl -g -O2 -DUSE_OPENSSL_FUNCTIONS_SYMMETRIC=1 \
-  -DUSE_OPENSSL_FUNCTIONS_EC=1 -DUSE_OPENSSL_FUNCTIONS_ECDSA=1 \
-  -DUSE_OPENSSL_FUNCTIONS_RSA=1 -Wall -Werror -Wreturn-type -Wsign-compare \
-  -Wno-self-assign -c tpm2/NVDynamic.c  -fPIC -DPIC \
-  -o tpm2/.libs/libtpms_tpm2_la-NVDynamic.o
-tpm2/NVDynamic.c: In function ?NvNextByType?:
-tpm2/NVDynamic.c:126:10: error: ?nvHandle? may be used uninitialized in this function [-Werror=maybe-uninitialized]
-  126 |  *handle = nvHandle;
-      |  ~~~~~~~~^~~~~~~~~~
-tpm2/NVDynamic.c: At top level:
-
-Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
----
- src/tpm2/NVDynamic.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/tpm2/NVDynamic.c b/src/tpm2/NVDynamic.c
-index 32f46bb..4381658 100644
---- a/src/tpm2/NVDynamic.c
-+++ b/src/tpm2/NVDynamic.c
-@@ -114,7 +114,7 @@ NvNextByType(
- 	     )
- {
-     NV_REF           addr;
--    TPM_HANDLE       nvHandle;
-+    TPM_HANDLE       nvHandle = 0; // libtpms changed: gcc 10.1.0 complaint
-     while((addr = NvNext(iter, &nvHandle)) != 0)
- 	{
- 	    // addr: the address of the location containing the handle of the value
--- 
-2.26.2
-
diff --git a/dev-libs/libtpms/libtpms-0.7.0-r1.ebuild b/dev-libs/libtpms/libtpms-0.7.0-r1.ebuild
deleted file mode 100644
index a64f5e30012b..000000000000
--- a/dev-libs/libtpms/libtpms-0.7.0-r1.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 autotools
-
-DESCRIPTION="Library providing software emultion of a TPM"
-HOMEPAGE="https://github.com/stefanberger/libtpms"
-SRC_URI="https://github.com/stefanberger/libtpms/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="libressl"
-
-DEPEND=" !libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-tpm12-Initialize-some-variables-for-gcc.patch"
-	"${FILESDIR}/${P}-tpm12-Fix-potential-buffer-overflow-in-filename-creation.patch"
-	"${FILESDIR}/${P}-tpm12-Initialize-a-few-variables-for-x86-gcc-O3.patch"
-	"${FILESDIR}/${P}-tpm2-Fix-a-gcc-10.1.0-complaint.patch"
-	)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-	  --with-openssl \
-	  --with-tpm2
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libtpms/libtpms-0.7.2.ebuild b/dev-libs/libtpms/libtpms-0.7.2.ebuild
new file mode 100644
index 000000000000..1daf31882dc5
--- /dev/null
+++ b/dev-libs/libtpms/libtpms-0.7.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 autotools
+
+DESCRIPTION="Library providing software emultion of a TPM"
+HOMEPAGE="https://github.com/stefanberger/libtpms"
+SRC_URI="https://github.com/stefanberger/libtpms/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libressl"
+
+DEPEND=" !libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+	  --disable-static \
+	  --with-openssl \
+	  --with-tpm2
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libunique/Manifest b/dev-libs/libunique/Manifest
index 39eaa6b720d0..93ba6039724f 100644
--- a/dev-libs/libunique/Manifest
+++ b/dev-libs/libunique/Manifest
@@ -6,5 +6,5 @@ AUX run-tests 500 BLAKE2B ff93701e0eb4c78416581d5758e83654d1c3ce197a1c6834ce1170
 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 1560 BLAKE2B 41e93a872d142af410d831ea2339c31179513bd9981cff006aa6d94b589e32daa5cb14a1282e97a8cf301857370a769d81b0b32849b29539854b618a32688267 SHA512 eb2ca8b4e7124c92bf63752b93cd6c5f7bc0ee0a619e06ec9ff553c8ba70a74219481e1ea7916ee835c99719c3cb97f5948862e674e8454f8036cd1e35e8f2f8
-EBUILD libunique-3.0.2-r1.ebuild 1119 BLAKE2B 2fb80e154eebf7d331b43742fc613cb72aefe4d171b10dc58842b947583a4019735abde4a915e842d718cce0361471cfc5a00dddc3bbe9000c595921bc2fd2af SHA512 47d340073139517072d66946476dde17692a1a3722c2ef39e3832431509b0d8cda7dee39a6cc3f1512f557b67bc86349c6d93dba2758d05f87530da9047d90ab
+EBUILD libunique-3.0.2-r1.ebuild 1126 BLAKE2B e537f6b3431874fd7cf723475e4b7c3a7c663ce7da237754ea927d748169108b1e8a53995851043ea5a2b56bc20ad4994215625e37d47cf72447195615a10143 SHA512 f473f2224840225500e99900541eb86008788a077f098a69bdb1e84318a8bcca11c65e2790887ea22d14b721b56a1f0a850197f75a751588a625326b9ac8c302
 MISC metadata.xml 500 BLAKE2B 3416f2d8574c38adee051c11070f680ec248b554f3945872561aec335a42b712634416b9d1087b7cb6ca8504ae1ecf246f0dc9f4e0ded538c24a1ff0b09bc9fa SHA512 bcdaa87134abaef8a3490e11fb9716a20594a0dc862f5b07b446c266f39d4954e0fe3f7f89d6412687bc7a126387d469454d7d1b7ba46684e8cf174a8f78c169
diff --git a/dev-libs/libunique/libunique-3.0.2-r1.ebuild b/dev-libs/libunique/libunique-3.0.2-r1.ebuild
index f2f77d7d52ef..7a700c8eb031 100644
--- a/dev-libs/libunique/libunique-3.0.2-r1.ebuild
+++ b/dev-libs/libunique/libunique-3.0.2-r1.ebuild
@@ -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 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="debug +introspection"
 
 RDEPEND="
diff --git a/dev-libs/libxmlb/Manifest b/dev-libs/libxmlb/Manifest
index b10d6719c8d4..9a744a3f949d 100644
--- a/dev-libs/libxmlb/Manifest
+++ b/dev-libs/libxmlb/Manifest
@@ -3,5 +3,5 @@ DIST libxmlb-0.1.14.tar.gz 92388 BLAKE2B cf3057fadf87c866f456bb2eac773e056adba56
 DIST libxmlb-0.1.15.tar.gz 92923 BLAKE2B 97b6af812397dd279e7e3c038627fcf8228cbfa5c3af91ceeb5361e32d37d357eda6a193f627a5f4442426fb08abca1ff11684fe199d9d3a4add72ca4f3f5d08 SHA512 58268b3a690af36c0923afdee3ae58e88bf778eebbc6a439be1bc85ed985efdc20cd7006c976586f7be87310dc091d67dddd370f4bbec58379fc4e7349bfa3d8
 EBUILD libxmlb-0.1.12.ebuild 1226 BLAKE2B 2da2eb59aafd834aee0a69f64c1f9401d069b967554341158bd9af540f0c8c216bf2b2c4c0cabec3bb1936b21885d7444fe67509a8035bf313bb5b7efac0e013 SHA512 1507484678dc19da96ec68de1961075d0576b3d4c8d61dc5b913f1bdf0f836bac3185d029c36fa3c7deff9fc5a555a47d66ed95fe72d4bef8ebd2ab2bef4f87e
 EBUILD libxmlb-0.1.14.ebuild 1230 BLAKE2B fb853faad52a0fc56df9a1c29b9b7ca927fb2d5e58a4706d0c1828582ae948f6e94b94a9d2258e49828aaed1c1147ab326e90b99373f7b1fee95ea804609ac48 SHA512 61592c1d5a9a6244f83351ff73197ac5860d989abc9472f6eb90661be8083f6a5d4c917bfabf49b98f1fb4686a94227b2da63100ec3f8b34fcd1c381b7e14add
-EBUILD libxmlb-0.1.15.ebuild 1229 BLAKE2B 71097dff1918f904fdd4d1c1b2e14460e2627b336331c0d4feaf9a3c539a29524ca4ebcabd0581a68d979b401cc0a51c7089c667afed73301120eff3c7efb66e SHA512 1a9b673af39bc96c49ba4aa9ebffd5dd4002dce29e95ecfb2b19c14b6deb278f5d45294f12bab264eec55bd53d996fef0dd6be0b9387f5bd34d2788decb118d7
+EBUILD libxmlb-0.1.15.ebuild 1228 BLAKE2B 8cfdb11b371d1c9b710147e5963003e47d48006b137b183ce8995a85d565df9fe681555000c366b4e944979400eb3306c903eacbf460b2615c52a4731b3a4611 SHA512 ae8f7237ca068cea6e17feb6aa0182a593d6d49a61cfd5a5b4a90aa013d4cb64109f983a728867450c4798aefce2dd1eaf0873c25bda356e431f770ead431a08
 MISC metadata.xml 423 BLAKE2B 4f6fce646b2b255484b20c506f3a192ddfe0748987d76b4010bbc4efb69db159acfd8dff07e851f6c009aa2afac24ed2b252b7ee2a817fb583b11924d9f865a2 SHA512 b1d47209f5bb217313f0a4f6b27d0c54e4968f010c066c95b6f2df889b0914a5eae7ef8758b965f69475a4c8ce955120d6f452db5060b5f1bd93d5ca7d87e8c9
diff --git a/dev-libs/libxmlb/libxmlb-0.1.15.ebuild b/dev-libs/libxmlb/libxmlb-0.1.15.ebuild
index 845e8e45096d..68409989938f 100644
--- a/dev-libs/libxmlb/libxmlb-0.1.15.ebuild
+++ b/dev-libs/libxmlb/libxmlb-0.1.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hughsie/libxmlb/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="doc introspection stemmer test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index dfec52b04e32..d2d55888c06b 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,7 +1,5 @@
 DIST libzip-1.6.1.tar.xz 732932 BLAKE2B 6f63ecb56767b730e5c5639c01e3e050ed64d1c1508b11d4cd1c75e2834988e14140a5e49ba25454d77c40c59b101615a9e00823066a35eaca0519147a75f5e6 SHA512 dcf3790933c95f66bdcbdb276497b36e57776103b0b1064a94479e84eaa0a09df8dd91509cb4ccab3a6724f0650f076ca1e332d73acc94b653e99a3e94a64574
-DIST libzip-1.7.0.tar.xz 737184 BLAKE2B 4442925b77ad336793ecc891e2c096c8b98457d193a5ebda239462ef5120b3e041b1882d56dc0c4c94d0f3c00e5117d04964af0a8827230f0dbf937a8b07a5fa SHA512 9c1632b4e0b4cfe22c5670d815bc8893d540226e3e64cf8cce7039a90bdc7048dedadb4804b151291e312c97bb384bd671e43021401c4c3e33a4e597972bc681
 DIST libzip-1.7.1.tar.xz 737496 BLAKE2B bd4c73bf317fa767ff0ea3c10b7f2e96699dc7ed7bd05fdaf3c5d477cd42aa18b40627569498697be1b5360d43471a9b8132909781f8bd32bda6f46534e4a61b SHA512 e924749274e5e45b83ba4bc961bfd299b9dd05829c1f42880a9814f942dbf7afe79aa1ea4e2b33d6db1dba1f7f948c0de40517f2ef90cc8725650b8cb88d9a14
 EBUILD libzip-1.6.1-r1.ebuild 2288 BLAKE2B ac0aa25a70174fe99977e49f70beb4876a221e884411bc69fe8a4a570a9a207a2ca578c0064a1c22ea101cb8aab0e86907df5b629f2509230984cacd14aa4814 SHA512 2412dddca1bcbc6d3c5ab7550980f132ceec5d56bdcb3875a27feb539a3c648f522766fd68663d289ebfd41b8d31477751378b0e8c4371c08b437e9036f6fd71
-EBUILD libzip-1.7.0.ebuild 2353 BLAKE2B 4a01907cd29bf76e40ee13fa8c6226179cb79f51593c46307f0daba1ef171d7be315d217fe7042c791b1fbf59fcf6115417b980f95d849ef74641d3d64236343 SHA512 6c8784276e8e16b9c0a6c732aaf445cc2be74628f818e5cdf50b8135bdd01f195cf62633aa3fc5259ed8b8b615dac2c457c110ef58c48bd38e1e915cda742cef
 EBUILD libzip-1.7.1.ebuild 2353 BLAKE2B 4a01907cd29bf76e40ee13fa8c6226179cb79f51593c46307f0daba1ef171d7be315d217fe7042c791b1fbf59fcf6115417b980f95d849ef74641d3d64236343 SHA512 6c8784276e8e16b9c0a6c732aaf445cc2be74628f818e5cdf50b8135bdd01f195cf62633aa3fc5259ed8b8b615dac2c457c110ef58c48bd38e1e915cda742cef
 MISC metadata.xml 509 BLAKE2B e5012e29cc2157f4cd37b19edbdd2da53377f2671574681aff241dcab50e22d39b8db7bce14b7085cf39e4adbe89c486047f3089a9f91fde3411b02de45c8284 SHA512 bfa09ea8c47388786ec4fa938fbb2df96c4d2bf936f1a2a79765bc178ac34a9d69c19a1be53eef743d49548e32ce110f3e4b9776932248624192d4b92b7525f8
diff --git a/dev-libs/libzip/libzip-1.7.0.ebuild b/dev-libs/libzip/libzip-1.7.0.ebuild
deleted file mode 100644
index 8edc5a80ac6e..000000000000
--- a/dev-libs/libzip/libzip-1.7.0.ebuild
+++ /dev/null
@@ -1,112 +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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="bzip2 gnutls libressl lzma mbedtls ssl static-libs test tools"
-REQUIRED_USE="test? ( tools )"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2:= )
-	lzma? ( app-arch/xz-utils )
-	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=ON
-				-DBUILD_REGRESS=$(usex test)
-				-DBUILD_TOOLS=$(usex tools)
-			)
-		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/log4cxx/Manifest b/dev-libs/log4cxx/Manifest
index 38a26db30e14..fe74b06b068c 100644
--- a/dev-libs/log4cxx/Manifest
+++ b/dev-libs/log4cxx/Manifest
@@ -3,5 +3,5 @@ AUX log4cxx-0.10.0-gcc44.patch 357 BLAKE2B b70ff78b141b6952bc8a5f1eca9e251a7dd7b
 AUX log4cxx-0.10.0-missing_includes.patch 1554 BLAKE2B 9eacadeff4a26cf7eb97c9b4af43874c2640a0e7b0e0ed6b85424aa2e8d4d54d13d7eea1361c5b2d2d57f33cdc2260d6e3f5d6afd6b3d240fecc3565aab9f29f SHA512 8fb9017206bca39fa4481707cdb13b68195cc2fce66383a601bc8c7cc20869ca356f2616459b5f10615d5a40f0759c24058f22d7e08c02fee1ce367c34b2d707
 AUX log4cxx-0.10.0-unixODBC.patch 2989 BLAKE2B 8314e9777d41186e21bf7af1f2263a0461ec469af0f63ebe2b3a0787f88dcab4800342d3c707c89f271c92e966df3781ed41ace34211d158350b325743242a3f SHA512 8f21778cb797750071a5db025d50ef580c64ff9e634e18fa6b7d90082bf842f4470fe5996cc0dcf2cece6c8c0c4d5e2aa9852ff596d0c5d4ba6a33be8eb3f651
 DIST apache-log4cxx-0.10.0.tar.gz 1667425 BLAKE2B f753e1ddb1f2d7abfca92e60883752acfacc0491aa93cfe0ac26c12b32c1f6406df7be2aa83b65a176671debdaa67a69d68af6cb7901cb626eee572425de40c4 SHA512 1c34d80983db5648bc4582ddcf6b4fdefdc6594c2769f95235f5441cd6d03cf279cc8f365e9a687085b113f79ebac9d7d33a54b6aa3b3b808c0e1a56a15ffa37
-EBUILD log4cxx-0.10.0-r1.ebuild 1515 BLAKE2B a4d352438d0c23cb0f43127728b49c710ee73761f65fc0bf6579fc40e73dcf652d74541cf54b1f5bedf75be64e739b6ce4f9293cb39267a41f4ac136e5c18f82 SHA512 f714219e476744e899641d591e6a0773f0a80a1a6150fed7c6c14b1b80b97d05d8d97e537769fba71168e9b41284b54040cdded352e08893ba4def1e6e72e8b3
+EBUILD log4cxx-0.10.0-r1.ebuild 1514 BLAKE2B ba4a6471a0c2ef3e2670cfcf16d9ae705e330df40b0d0f43ee46638e6202867a381497101d1950af861af6a94f17235c95ecbca66b23bc491b561bce3e439562 SHA512 1c9fd0e8de77870aadee0cfda237c115b66819e26af647e644cfb0f6d13a5ec6260085c17c3537b576cc17967a1c763a038662f0e2acd8238bdb13f08d6874db
 MISC metadata.xml 258 BLAKE2B cf93caef61cf1a9150eb415d7449132b91513df5484adbd3865479cbf7b9c9dd51bff52faa129b190a4d56dd81c6285c9a58633dbccd9ca0f82a9ecc79661a80 SHA512 99d78b7a141de786112b116d0f2bcb6aa272e250c7b866b8f447f0aa778157910f0f491b79c36c6ae1a6326ad988c1e6bc9b704d8f9133ac48563c1dbe3f031c
diff --git a/dev-libs/log4cxx/log4cxx-0.10.0-r1.ebuild b/dev-libs/log4cxx/log4cxx-0.10.0-r1.ebuild
index f48d07a9ee88..a1756aaab0f3 100644
--- a/dev-libs/log4cxx/log4cxx-0.10.0-r1.ebuild
+++ b/dev-libs/log4cxx/log4cxx-0.10.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/logging/${PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos"
 IUSE="iodbc unicode odbc smtp"
 
 RDEPEND="dev-libs/apr:1
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index 8f65473c0aa1..411b93a643d0 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -1,10 +1,6 @@
 AUX newt-0.52.13-gold.patch 362 BLAKE2B 2f40cfe7e4b2b01b755c787d22d2006c2c55ca055c02f6ff2d807dc36fb15c15e67c2aa5d3ac4ae11288e710e6e0e4830dced12a0817e395fcc2331547228eb8 SHA512 6f3a68b75fae6693ddbb47b88f8ede4a6994daa4476b3ca472b3ec62db26e36785e3bb7fe7375a9e78ffd0761a4d82351f5d02c30f8ddd55fa5648257526e98f
 AUX newt-0.52.14-tcl.patch 3269 BLAKE2B dc542330cf49a43d63ca6e3edea141ae62664a701038c1086715b7de899f4b987c87069be8fd3a57f1f4c3fe8292d298876cf01f34e9d1f66f59ab7c08134d50 SHA512 6074f53b4070f4d8c7e1f4dfc4de7c549ac63a4af4bae70a3ebc3ebb03bd588923e8a952ffd93139041f5454318958a50a8ca8b0ecd98fb5d2ebde74b42aa313
-AUX newt-0.52.15-makefile.patch 403 BLAKE2B a7d85c4d99961894b21d051bb143059c6efbcd29fcf187de1e37344850d545ad98b974346483f2f1aadf1ab029d9d9a0fd64416e6892188cbd2bcfb60a64bc05 SHA512 146430581aa1811ac2f5aa03f6da6f193afda153eb3c3efd8576631f591f3671f05d9479182f593faedc79be17fc91852641259df93faa1231d3eda5e9dfd73d
 AUX newt-0.52.21-python-sitedir.patch 954 BLAKE2B ed2a504cc2e2c06200e209fdf55e9b3ce01c502bd1a6898c6c56e5ecedfcc5672ab619f52d3ad3828569996d11302bdc24cc484f3d65a85d27b5e8c564e12311 SHA512 3583b352d2e46e12f03a1d3b0fcaab606018765b1ae8855a7160bced34b36235a4ed0cd2b4cda1202e40680d6d8a7ad7a93aec0b46d2ee17a091509cf079c9b4
-DIST newt-0.52.20.tar.gz 181163 BLAKE2B c6def9fae612f8dcffb396ea4013cf3e034da8f346fb7bf71de6fc5a59ee3d9d43bb4ad3bdfab7535d4d2eddeed62f72cea1861ac537f2bd7a62e7f76069c692 SHA512 0c10c373c6a5299a85fc38f32d3590fff3b26c4be40e6c85ed73c20724ef2fb094bf37a8c3b1b80a4bcdfc14fe59254d4419c391245c298a4e16788954b88236
 DIST newt-0.52.21.tar.gz 174895 BLAKE2B a0d6a15f87fe04dc535e65fcd28606cd666142d006a53b6ee0c8387a6295215e44f1815ac56ceb56b561ca9b5bc8f3cab2d04b5decd62642f46b744333dc7e34 SHA512 d53d927996d17223e688bf54dccfabb2a3dc02bfe38ffc455964e86feaca3cd9f9ab5b19774433be430fa4d761cd9b6680b558f297acb86f80daeb6942f7d23c
-EBUILD newt-0.52.20.ebuild 2010 BLAKE2B 5511040fa591a77591849582adb578a69c38af1b7884cc8741e102ef6e602d5dc8b57c53ebf105593ef04e4773398f817e6e0ccb6a2b46eb230c51d6bb79155d SHA512 9dc54c30ba5c8d920b6c75576282bdd6e454e8db321af39cecd3fe3f11164b865f6a8cd802fa64c931f3f38226f2999c90525eabd5dfdedb0c01bef36b27f688
 EBUILD newt-0.52.21-r1.ebuild 2245 BLAKE2B 9a0d5fb29521c38714710175ad18a4c5de5b1b0a1988d255d809497dfdb272489b876420a1622b45299e8e7c452c5c12cb2b67a40813590ad53a349d6cf9a5db SHA512 e647f52683d7df3ca43e8ba31dd5de4add226f9ada32fc7e257a2bf17c71fb08acd035d97a2ce3d6cf7d530f08e5d1946eb40bcb641f90494c9a2c443ed57aae
-EBUILD newt-0.52.21.ebuild 1963 BLAKE2B 6f13f195dbcb4673bab8f816d81eb3c681ae1df05d0e331dcef12999644e8d2edf982c241277c902f2068e7a7cf1e3080da172a5358caa7b5a8924aa8360427d SHA512 cf562a3657a555797e45bba86fa4e49015cb20c096c70dd994396eeafe0e458aa5d76f599a6988d0e744505ba85793318e4af89478a7a774009012848f8a9182
 MISC metadata.xml 250 BLAKE2B b9f4109bece0ad2b6afb8c0b16fe12f39bf1851a9b1201e3a26cfd1eb86d9a9999ebbae97a6fdf8bbfc18cb213c9cfd8eba72c3731742429c44659795f33d87a SHA512 4ebf7bc5513be89eaf0f32aa1b41c095085cd95486e7ecc7cdc61e3f3a16119318f821a954cb2ba16e8408f6d00f1bee3923d7b4ae35aab54c0e21c6f33e56cd
diff --git a/dev-libs/newt/files/newt-0.52.15-makefile.patch b/dev-libs/newt/files/newt-0.52.15-makefile.patch
deleted file mode 100644
index 55812bf10460..000000000000
--- a/dev-libs/newt/files/newt-0.52.15-makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 4ae284b..cd5c4a7 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -127,7 +127,7 @@ $(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
- 	ln -fs $(LIBNEWTSONAME) libnewt.so
- 	ln -fs $(LIBNEWTSH) $(LIBNEWTSONAME)
- 
--$(SHAREDDIR)/%.o : %.c
-+$(SHAREDDIR)/%.o : %.c $(SHAREDDIR) 
- 	$(CC) $(SHCFLAGS) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
- 
- install: $(LIBNEWT) install-sh whiptail
diff --git a/dev-libs/newt/newt-0.52.20.ebuild b/dev-libs/newt/newt-0.52.20.ebuild
deleted file mode 100644
index e6482fc608c9..000000000000
--- a/dev-libs/newt/newt-0.52.20.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=( python{2_7,3_6} )
-
-inherit python-r1 multilib autotools toolchain-funcs
-
-DESCRIPTION="Redhat's Newt windowing toolkit development files"
-HOMEPAGE="https://pagure.io/newt"
-SRC_URI="https://releases.pagure.org/newt/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="gpm nls tcl"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/popt-1.6
-	=sys-libs/slang-2*
-	elibc_uclibc? ( sys-libs/ncurses:0= )
-	gpm? ( sys-libs/gpm )
-	tcl? ( >=dev-lang/tcl-8.5:0 )
-	"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# bug 73850
-	if use elibc_uclibc; then
-		sed -i -e 's:-lslang:-lslang -lncurses:g' Makefile.in || die
-	fi
-
-	sed -i Makefile.in \
-		-e 's|$(SHCFLAGS) -o|$(LDFLAGS) &|g' \
-		-e 's|-g -o|$(CFLAGS) $(LDFLAGS) -o|g' \
-		-e 's|-shared -o|$(CFLAGS) $(LDFLAGS) &|g' \
-		-e 's|instroot|DESTDIR|g' \
-		-e 's|	make |	$(MAKE) |g' \
-		-e "s|	ar |	$(tc-getAR) |g" \
-		|| die "sed Makefile.in"
-
-	local langs=""
-	if [ -n "${LINGUAS}" ]; then
-		for lang in ${LINGUAS}; do
-			test -r po/${lang}.po && langs="${langs} ${lang}.po"
-		done
-		sed -i po/Makefile \
-			-e "/^CATALOGS = /cCATALOGS = ${langs}" \
-			|| die "sed po/Makefile"
-	fi
-
-	eapply "${FILESDIR}"/${PN}-0.52.13-gold.patch \
-		"${FILESDIR}"/${PN}-0.52.14-tcl.patch \
-		"${FILESDIR}"/${PN}-0.52.15-makefile.patch
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	configuring() {
-		econf \
-			PYTHONVERS="${PYTHON}" \
-			$(use_with gpm gpm-support) \
-			$(use_with tcl) \
-			$(use_enable nls)
-	}
-	python_foreach_impl configuring
-}
-
-src_compile() {
-	building() {
-		emake PYTHONVERS="${EPYTHON}"
-	}
-	python_foreach_impl building
-}
-
-src_install() {
-	installit() {
-		emake \
-			DESTDIR="${D}" \
-			PYTHONVERS="${EPYTHON}" \
-			install
-		python_optimize
-	}
-	python_foreach_impl installit
-	dodoc peanuts.py popcorn.py tutorial.sgml
-	doman whiptail.1
-	einstalldocs
-}
diff --git a/dev-libs/newt/newt-0.52.21.ebuild b/dev-libs/newt/newt-0.52.21.ebuild
deleted file mode 100644
index 3d062d616728..000000000000
--- a/dev-libs/newt/newt-0.52.21.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=( python{2_7,3_6} )
-
-inherit python-r1 multilib autotools toolchain-funcs
-
-DESCRIPTION="Redhat's Newt windowing toolkit development files"
-HOMEPAGE="https://pagure.io/newt"
-SRC_URI="https://releases.pagure.org/newt/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="gpm nls tcl"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/popt-1.6
-	=sys-libs/slang-2*
-	elibc_uclibc? ( sys-libs/ncurses:0= )
-	gpm? ( sys-libs/gpm )
-	tcl? ( >=dev-lang/tcl-8.5:0 )
-	"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# bug 73850
-	if use elibc_uclibc; then
-		sed -i -e 's:-lslang:-lslang -lncurses:g' Makefile.in || die
-	fi
-
-	sed -i Makefile.in \
-		-e 's|$(SHCFLAGS) -o|$(LDFLAGS) &|g' \
-		-e 's|-g -o|$(CFLAGS) $(LDFLAGS) -o|g' \
-		-e 's|-shared -o|$(CFLAGS) $(LDFLAGS) &|g' \
-		-e 's|instroot|DESTDIR|g' \
-		-e 's|	make |	$(MAKE) |g' \
-		-e "s|	ar |	$(tc-getAR) |g" \
-		|| die "sed Makefile.in"
-
-	local langs=""
-	if [ -n "${LINGUAS}" ]; then
-		for lang in ${LINGUAS}; do
-			test -r po/${lang}.po && langs="${langs} ${lang}.po"
-		done
-		sed -i po/Makefile \
-			-e "/^CATALOGS = /cCATALOGS = ${langs}" \
-			|| die "sed po/Makefile"
-	fi
-
-	eapply "${FILESDIR}"/${PN}-0.52.13-gold.patch \
-		"${FILESDIR}"/${PN}-0.52.14-tcl.patch
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	configuring() {
-		econf \
-			PYTHONVERS="${PYTHON}" \
-			$(use_with gpm gpm-support) \
-			$(use_with tcl) \
-			$(use_enable nls)
-	}
-	python_foreach_impl configuring
-}
-
-src_compile() {
-	building() {
-		emake PYTHONVERS="${EPYTHON}"
-	}
-	python_foreach_impl building
-}
-
-src_install() {
-	installit() {
-		emake \
-			DESTDIR="${D}" \
-			PYTHONVERS="${EPYTHON}" \
-			install
-		python_optimize
-	}
-	python_foreach_impl installit
-	dodoc peanuts.py popcorn.py tutorial.sgml
-	doman whiptail.1
-	einstalldocs
-}
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 49dad4377379..b124ed2d3b08 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -6,5 +6,7 @@ AUX nspr-4.8.4-darwin-install_name.patch 1046 BLAKE2B 1182149b03bd2c03fc4051bf98
 AUX nspr-4.8.9-link-flags.patch 931 BLAKE2B 6aa6aa1cf3b856a95b7baa20f58e9ed83b8b29ccce37bab39e10e0e76c433ae5c79839b5f7f9bdaf8b2475c8e3692ff4a57c246dfa4e1fed6866ab284826ee0d SHA512 0bb61dc09d287f1324749c983404e1f03fdf7014fbbd32cc5abe452fc2f32b90b759d8f18d964a61da044b5a7221f5ba274d94c93c07c8a7359e3c937e44b975
 AUX nspr-4.9.5_nspr_config.patch 251 BLAKE2B 65ae8b981e758e2955b7a3358f24b7b17dc1ef59f0e78f9fd9ddee740a4da3825bafea34f3900200b3f6edefed7d0797c194cb0339d4e36551615d599156108d SHA512 3f118b7142a19dcc7e26b348cec6029c78d585a57cc2bfc2ab7ca13d2ef953e576dab0ac044316e3165d0201bf27253afa732109f914da6f7a39f19facff8310
 DIST nspr-4.25.tar.gz 1079633 BLAKE2B 377e5ec0e60cca13f1ee988adb10870bbb6cb9e4eb61e4434152418d4f8d446741a192d7019298ec2669b8e190cacb6a1ca9c4b2838e9b14dd3590ed40facdd2 SHA512 b9aa576e0da37e8729088fe559d94030cf18f277c1f7a30104d3088a804913343ed884645c0adb62144da475e20934b359f897bf3ae9a6ebb5f9daf283d5a562
+DIST nspr-4.26.tar.gz 1079778 BLAKE2B db83afa5e3ab2e0ef92aa236db6d9f25e963b77df7c71400e691dc3e882ec6d63cbf13996eb1ae1a03a294def419e1669e38fe42990c66efedce03f121087e6c SHA512 d6632cde3570ee386ee1459257eba99f91dd62fa905fd82679222c83d63c185b76d8dca0422d4349de2dfce603472ae52bc0dcced0f142acb733374c74155d3c
 EBUILD nspr-4.25.ebuild 3930 BLAKE2B 93e41000e906be98a34555fa1970189139db9d4b0c23dafac29ec4e5db93965981d614e15886333665db3d255ef3545a48efe7819755e973497d22367681d292 SHA512 b6edf7eb6685ec60f549c4ca542146fc02673c59369d6c691dbfe98106e319b7c0bc2817629296a447bfce720467f64c290106356b5eb26348227169d0841919
+EBUILD nspr-4.26.ebuild 3939 BLAKE2B 6ca8360a5ed7711cef58d81c9db313ecfd57dc76ce48485f3427e84ecccb21069da57547385ef3c7a25085c1caed77f9bbb86f7b9b6b2ebdd7452893f0287b91 SHA512 0ad73faf242f7b8813d1add48629132d4276b618f63860a134576b757dbf14b253bf642f404a57d87bf8978ea896e75602dddb9b14a44241469b1e0466e09150
 MISC metadata.xml 349 BLAKE2B 06dabb7ec8263989dcff436449a820af581cc04ce9de05d7c4553751c8d9c6dc43a2af221c69107fca9ae046a1b3ec807cd3f3122195cffd23de9c6ce8b1c258 SHA512 5185204ed18d7e0e4a48f918dfd871a18c62572968767566b6e0c028075e1054ec8028aac412de0c598936a79e3f70486ef889f96b720e2b15d862cf91b12b23
diff --git a/dev-libs/nspr/nspr-4.26.ebuild b/dev-libs/nspr/nspr-4.26.ebuild
new file mode 100644
index 000000000000..0c02c60c9fbd
--- /dev/null
+++ b/dev-libs/nspr/nspr-4.26.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs multilib-minimal
+
+MIN_PV="$(ver_cut 2)"
+
+DESCRIPTION="Netscape Portable Runtime"
+HOMEPAGE="http://www.mozilla.org/projects/nspr/"
+SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug elibc_musl"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nspr-config
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.23-prtime.patch
+	"${FILESDIR}"/${PN}-4.7.1-solaris.patch
+	"${FILESDIR}"/${PN}-4.10.6-solaris.patch
+	"${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
+	"${FILESDIR}"/${PN}-4.8.9-link-flags.patch
+	# We do not need to pass -L$libdir via nspr-config --libs
+	"${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
+)
+
+src_prepare() {
+	cd "${S}"/nspr || die
+
+	default
+
+	use elibc_musl && eapply "${FILESDIR}"/${PN}-4.21-ipv6-musl-support.patch
+
+	# rename configure.in to configure.ac for new autotools compatibility
+	if [[ -e "${S}"/nspr/configure.in ]] ; then
+		einfo "Renaming configure.in to configure.ac"
+		mv "${S}"/nspr/configure.{in,ac} || die
+	else
+		elog "configure.in rename logic can be removed from ebuild."
+	fi
+
+	# We must run eautoconf to regenerate configure
+	eautoconf
+
+	# make sure it won't find Perl out of Prefix
+	sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
+		"${S}"/nspr/config/rules.mk || die
+}
+
+multilib_src_configure() {
+	# We use the standard BUILD_xxx but nspr uses HOST_xxx
+	tc-export_build_env BUILD_CC
+	export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS}
+	tc-export AR CC CXX RANLIB
+	[[ ${CBUILD} != ${CHOST} ]] \
+		&& export CROSS_COMPILE=1 \
+		|| unset CROSS_COMPILE
+
+	local myconf=(
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		$(use_enable debug)
+		$(use_enable !debug optimize)
+	)
+
+	# The configure has some fancy --enable-{{n,x}32,64bit} switches
+	# that trigger some code conditional to platform & arch. This really
+	# matters for the few common arches (x86, ppc) but we pass a little
+	# more of them to be future-proof.
+
+	# use ABI first, this will work for most cases
+	case "${ABI}" in
+		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
+		n32) myconf+=( --enable-n32 );;
+		x32) myconf+=( --enable-x32 );;
+		s390x|*64) myconf+=( --enable-64bit );;
+		default) # no abi actually set, fall back to old check
+			einfo "Running a short build test to determine 64bit'ness"
+			echo > "${T}"/test.c || die
+			${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
+			case $(file "${T}"/test.o) in
+				*32-bit*x86-64*) myconf+=( --enable-x32 );;
+				*64-bit*|*ppc64*|*x86_64*) myconf+=( --enable-64bit );;
+				*32-bit*|*ppc*|*i386*) ;;
+				*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
+			esac ;;
+		*) ;;
+	esac
+
+	# Ancient autoconf needs help finding the right tools.
+	LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
+	ac_cv_path_AR="${AR}" \
+	econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	# Their build system is royally confusing, as usual
+	MINOR_VERSION=${MIN_PV} # Used for .so version
+	emake DESTDIR="${D}" install
+
+	einfo "removing static libraries as upstream has requested!"
+	rm "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries."
+
+	# install nspr-config
+	dobin config/nspr-config
+
+	# Remove stupid files in /usr/bin
+	rm "${ED}"/usr/bin/prerr.properties || die
+
+	# This is used only to generate prerr.c and prerr.h at build time.
+	# No other projects use it, and we don't want to depend on perl.
+	# Talked to upstream and they agreed w/punting.
+	rm "${ED}"/usr/bin/compile-et.pl || die
+}
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index c00b2dfc6edb..e984e51062fd 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,16 +1,15 @@
 AUX nss-3.21-gentoo-fixup-warnings.patch 178 BLAKE2B b51f80310db3db416d8aeaf9117ef801389b5b2df47c04aff51bf0759dd5bff41b09d1e9011f99b345d5769a3aab19acb943ee97f8437465518115f6902a0da1 SHA512 7667a020311ca11e8f1836bc146e4a3c94ff2a489882dbe87debcccfeaafeb50e6607574c64254a826b4b6f0bb436b310a3386fff4a58324f0e5e58debaa9d51
 AUX nss-3.23-hppa-byte_order.patch 460 BLAKE2B 97358cc8fbea0b0d3beee0697833e48ef01039ceb08fd00792a7f7ef68409eb076022c03764ab079fdaa971a0358130002fa11c0c182ebeb33dcdf660be26408 SHA512 ad0097bb6cf409d61eb28202d7460c87e983d6db977aba38ff9ef2749b3f7bb8fdadce4174f5bf806350ae33733097a1f444792d31cc43574b28341893642e5a
 AUX nss-3.47-gentoo-fixups.patch 5260 BLAKE2B 994233aad2a0016676e6aea2bf4331a131561aa2b67bf6bab369b86e3a31e2fe651b0cd3fe77c6b8127fd276a5a2b8fccf3db90e0ecf63cd6d3a43e4dc26849a SHA512 c917ee0a2e4c889613f0d931b2553a6338c60a4ef898ea30bcdb888f94a30994849a3d33cd0b9eb7c5d1baebd2c7d991f2dfef44b50a0b59bf2f6b332ee3ef84
+AUX nss-3.53-fix-building-on-ppc.patch 1205 BLAKE2B c003bbea956b4a84893880ebeb5a84cec64358437b3f08b14510173b112223704f5f4dc6150a147383c76e1337c5205aff6963d0aab48445899a5922b27f9c30 SHA512 cd7d8d25a6dae9d5e8ee51e6be1b9b1f146767dc0220fa7cf9ac5a329032f9924c28a35e4e9021338e10f9982a56efe2127731d954a177671befb402d2609d5b
 AUX nss-3.53-gentoo-fixups.patch 6886 BLAKE2B 1c605d8db02ebe0492c41955207368197a79990e43e219a71962cb28ac0cecd9e0acc2b76e16f5b116fdb8bf8790d96046cb4f376df9b8634ac48e54924589f8 SHA512 51031f92519f57d4b57a547cf549f2d5da1c5a7212d4b304fb0d71d6a85a5aefd64724ec9075c14c9b49c1e99c3ffe91cbec501c3504985aa9b16eacf2aa15ed
-DIST nss-3.51.1.tar.gz 78310874 BLAKE2B c295b5fdf6e1d24cc79474f2c5a9e91fccf777212fbb072e8a64576ed1b060fea6ecbde1fa59bb07c998b9aa92bb7d450e722a8f34a72eaa35aef6cbd693420a SHA512 1878780886cc330489a14a60ee5cb67b174f3167d020db256eacdce079652ef8af65813914cd0fb5684457053fa27acc9bff72d0713fbea28795613ca45a6d46
 DIST nss-3.51.tar.gz 78305125 BLAKE2B 2c7b90d4cc9fe283bf81e21d0dceefff503e5a31f0053828b140b2b927ddab8c8881b23c7d4c003f3e2d0dcd22efbe699baee63443cab6e72d33a552fd430e3c SHA512 9c894b1ea41449b000750a7b3a89fcb43dfc3d0d4d6dcc0dc288bc73996f76f1ee1ede927a8aecae6d4a07f9f3d3e3a042c6a60cf06e27e0cdc004fce2e510fd
 DIST nss-3.52.1.tar.gz 81222116 BLAKE2B e7a1a24c0a4765fb13a4c13a93187a26df6df68b3e8d623514928cf505215e67f5f22387b6a6b0680117b1c2af13752cb981c173bb50424784d05b459704d528 SHA512 be8746984e3028e5ed49f2132ca08687f6ac75e50208d8cfd6ffbcfd5db1ab8dcaf1f2a0a6c6c1920573de80490301b21c022759c7e2309a22d29698bb169dd6
-DIST nss-3.52.tar.gz 81220587 BLAKE2B 0208c9047c61233ed36f02d57fdc64fa1734ef69d17fa499707f4a3b14a2e880b1dcf4b19b17a38e9b41d2e46b4a9488613d82989be747ad82aebc35b8e491af SHA512 a45baf38717bceda03c292b2c01def680a24a846327e17d36044a85e30ed40c68220c78c0a2c3025c11778ee58f5d5eb0fff1b4cd274b95c408fb59e394e62c6
 DIST nss-3.53.1.tar.gz 81297900 BLAKE2B 7a053aa8322cb55b787730c87f1a6e8a799265574114d63257699348f4921007457d19e5fdc4684a512a91478d1912db45ce066daa8b9d9cde5130ff506aed9e SHA512 5d7572999a007c513df4cbdf74769c1a4eb53eb8680da27a89fea770763d88b6bea80cd9ab20426a905396745129276cffb6dd9e8e1e6377fa98c0a103b522d0
+DIST nss-3.54.tar.gz 81190188 BLAKE2B bf91aa3e2081f0d123d3adfbfc2e3cadfeccf6b15ce03f429fede73bd57ebf96ba7317b890762b01820d75020bb99383c022e2e6558aa1a6d44e8c92cd533bd2 SHA512 9b9253469514c085730ae580f6544e882a8264e253687950627a4fa1eeb956287c9da46caf7d8988cd6363f6dee26cb8db755203375751fe53795697d7ae9b7b
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
-EBUILD nss-3.51.1-r1.ebuild 9048 BLAKE2B 01e8547f889fd98894a91687a3951cd45c8d5876eb47535d14787bf9bd640315ecb411caa38223629a02448efbf68575075804de1a7675d25f3ba4eb92e6ad29 SHA512 222a970aaaa15c1f8b936c6f3448f3b7020eb8b27ba620d55fc50643ed489abb1807ebee94412fa2841b3cb55d099de4f134358dbc10dd2c31a9700622d78466
 EBUILD nss-3.51.ebuild 8973 BLAKE2B 38182caddafaa28743e15d70796912f523cdcb34ec6bf3fde4d8f5d147eab19cf3927aaf919a0f9f95ed71b3c4e45c8ae03bd60a9b75596d3428a5a661841e4e SHA512 631181fb368571224d9673fb2dfd70e01fe296c6ff27f5c4ffdb717e7ed2ac8b78ad7a17b29a93426f9e4815370b4c57391568c7ea7b2a141c36de3f3e2fb84f
-EBUILD nss-3.52.1-r1.ebuild 9088 BLAKE2B 86e158b71bb6de2a079ea5e332ffc68b8bc59de3a37720406aa8d406d36b22ec557a70400ebc1743027649aa772c1261bebc85ec065e0a9e19aca1b4370b37bf SHA512 9c3321d6e520a5750ab25936263b05c1074a519f05d7cafd2f1cd58d4c01135cfbd6755d9faf82e7235c01752f870720743af640c3d8a7e091f138085635e6e5
-EBUILD nss-3.52.ebuild 9048 BLAKE2B 01e8547f889fd98894a91687a3951cd45c8d5876eb47535d14787bf9bd640315ecb411caa38223629a02448efbf68575075804de1a7675d25f3ba4eb92e6ad29 SHA512 222a970aaaa15c1f8b936c6f3448f3b7020eb8b27ba620d55fc50643ed489abb1807ebee94412fa2841b3cb55d099de4f134358dbc10dd2c31a9700622d78466
-EBUILD nss-3.53.1.ebuild 8928 BLAKE2B 96404c6a1607af4edc143f212c006d01e50d37b3abd0c37291836ebb4b8603d600f8a6a963752381b472f67f275487fa1948fab6cd088d2dd749c675136f399e SHA512 48f702a67bd438f420283370d68d4293310e7920d9a15b9ed2c089d7de63e4d2289e28133f493f8a5ab6414bd15e28fc26e0d96112cf7db09477e58e0764b0c7
+EBUILD nss-3.52.1-r1.ebuild 9140 BLAKE2B b80cbfd2b1901b99006113fe76f0a280c9bc3e46065f4f585ab80f6e94d5b52b0bf4aab14530fb58e4ff3a61ae6f66aad2787ddd4f5858ca3a14912288cc45ac SHA512 08a7efc88e52b78fd149f72af2c39792b4911d2fa97d0d5b72ca1178322ab2227e1625d5cf69d0bc8bee6019440cff4b406d550b2d8d8b9aed2619bfb633d010
+EBUILD nss-3.53.1.ebuild 8980 BLAKE2B cbe93301acc7fa612b3557911e9b2607e643667e11fefefc8b6bd50f2f8e50766378f001a67231788febf0a429677a13b007cb04e390cbe309cbc9d26316df9d SHA512 99e517111617fef4186bc0fb691cc092567f4f3385ecb30e866835da5e2b7418d45aaa8fa51c728fc88b4c411a1e0b6ca7b34f93d8192f4c70f32873024266d6
+EBUILD nss-3.54.ebuild 8980 BLAKE2B cbe93301acc7fa612b3557911e9b2607e643667e11fefefc8b6bd50f2f8e50766378f001a67231788febf0a429677a13b007cb04e390cbe309cbc9d26316df9d SHA512 99e517111617fef4186bc0fb691cc092567f4f3385ecb30e866835da5e2b7418d45aaa8fa51c728fc88b4c411a1e0b6ca7b34f93d8192f4c70f32873024266d6
 MISC metadata.xml 515 BLAKE2B a63fb05a1a3e1b06f929f963ab0794ec1230e89903fc97a7c7db81a0b3c7b7e8b9277eaa7440f8929738ec0f805d8a8dd51c8262e569fb9be2fa0938b08ad7a2 SHA512 6bec952825416ba0ab8282669483eb75935f6b4a3052e0f78dad911c0246b8d8ce245c86cbd82b292d49338848fa50fb2009fb4a9def1ac8d81bf9a3320cd2b0
diff --git a/dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch b/dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch
new file mode 100644
index 000000000000..be2d4802c4c2
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch
@@ -0,0 +1,39 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=1642174
+
+From 9e4f30b3168a95243df0c0891e3e432bc95382ad Mon Sep 17 00:00:00 2001
+From: Lauri Kasanen <cand@gmx.com>
+Date: Mon, 1 Jun 2020 12:11:45 +0300
+Subject: [PATCH v2] Bug 1642174 /usr/bin/ld: OBJS/Linux_SINGLE_SHLIB/sha512-p8.o:
+ ABI version 2 is not compatible with ABI version 1 output
+
+Don't try to build the SHA-2 accelerated asm on old-ABI ppc.
+
+Currently make only, I don't have enough gyp-fu to do that side.
+However, the reporters of 1642174 and 1635625 both used make, not gyp.
+
+Signed-off-by: Lauri Kasanen <cand@gmx.com>
+---
+ lib/freebl/Makefile | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile
+index 5f7384429..d01587c7a 100644
+--- a/lib/freebl/Makefile
++++ b/lib/freebl/Makefile
+@@ -267,9 +267,12 @@ ifeq ($(CPU_ARCH),arm)
+ endif
+ ifeq ($(CPU_ARCH),ppc)
+     EXTRA_SRCS += gcm-ppc.c
+-    ASFILES += sha512-p8.s
++    PPC_ABI := $(shell $(CC) -dM -E - < /dev/null | grep _CALL_ELF | awk '{ print $3 }')
+ ifdef USE_64
+     DEFINES += -DNSS_NO_INIT_SUPPORT
++    ifeq ($(PPC_ABI),2)
++        ASFILES += sha512-p8.s
++    endif
+ endif # USE_64
+ endif # ppc
+ endif # Linux
+-- 
+2.19.1
+
diff --git a/dev-libs/nss/nss-3.51.1-r1.ebuild b/dev-libs/nss/nss-3.51.1-r1.ebuild
deleted file mode 100644
index 2c01890c4d30..000000000000
--- a/dev-libs/nss/nss-3.51.1-r1.ebuild
+++ /dev/null
@@ -1,358 +0,0 @@
-# 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"
-
-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 )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cacert utils"
-# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
-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}]
-	virtual/pkgconfig
-"
-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_prepare() {
-	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,cmac}.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/nss/nss-3.52.1-r1.ebuild b/dev-libs/nss/nss-3.52.1-r1.ebuild
index fcd9c6e73a80..56359ce59559 100644
--- a/dev-libs/nss/nss-3.52.1-r1.ebuild
+++ b/dev-libs/nss/nss-3.52.1-r1.ebuild
@@ -39,6 +39,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.47-gentoo-fixups.patch"
 	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
 	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+	"${FILESDIR}/${PN}-3.53-fix-building-on-ppc.patch"
 )
 
 src_prepare() {
diff --git a/dev-libs/nss/nss-3.52.ebuild b/dev-libs/nss/nss-3.52.ebuild
deleted file mode 100644
index 2c01890c4d30..000000000000
--- a/dev-libs/nss/nss-3.52.ebuild
+++ /dev/null
@@ -1,358 +0,0 @@
-# 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"
-
-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 )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cacert utils"
-# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
-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}]
-	virtual/pkgconfig
-"
-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_prepare() {
-	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,cmac}.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/nss/nss-3.53.1.ebuild b/dev-libs/nss/nss-3.53.1.ebuild
index df2971ed709b..d94d193dbe96 100644
--- a/dev-libs/nss/nss-3.53.1.ebuild
+++ b/dev-libs/nss/nss-3.53.1.ebuild
@@ -39,6 +39,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
 	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
 	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+	"${FILESDIR}/${PN}-3.53-fix-building-on-ppc.patch"
 )
 
 src_prepare() {
diff --git a/dev-libs/nss/nss-3.54.ebuild b/dev-libs/nss/nss-3.54.ebuild
new file mode 100644
index 000000000000..d94d193dbe96
--- /dev/null
+++ b/dev-libs/nss/nss-3.54.ebuild
@@ -0,0 +1,351 @@
+# 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"
+
+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 )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="cacert utils"
+# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
+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}]
+	virtual/pkgconfig
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nss-config
+)
+
+PATCHES=(
+	# Custom changes for gentoo
+	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
+	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+	"${FILESDIR}/${PN}-3.53-fix-building-on-ppc.patch"
+)
+
+src_prepare() {
+	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
+
+	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 FREEBL_NO_DEPEND=1
+	export FREEBL_LOWHASH=1
+	export NSS_SEED_ONLY_DEV_URANDOM=1
+	export USE_SYSTEM_ZLIB=1
+	export ZLIB_LIBS=-lz
+	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,cmac}.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/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index bc5ec177e1b2..5795b500d4ef 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -1,8 +1,9 @@
+AUX opencl-clang-10.0.0.1_find-llvm-tblgen.patch 379 BLAKE2B 23587b8500ad6215603326572a10aef71ce66fcec322834b7e6a7648bfee5a92ce698fa706ebd9cfc0fe3048005919b1d9ec1ebb1d4123412f2fd06593b64841 SHA512 b2e9ae0ceec231b33e2b70664c3cb7c56f5d30f62e2444c6a505c7ab300a463d32ad1a650e8afe1b1bd4b568b3a31c02c280ead3caa8a66548d96df16dc8f131
 AUX opencl-clang-8.0.0-clang_library_dir.patch 468 BLAKE2B 09315ce9250920caf8c84853a5cf08506b01d91f7c993273be910b38f9c97f1f31e1042d75a111734eaa86fad771bed5b09c6c9001e253c71f26bd7c1e668dcd SHA512 c5a715c05c7bc7b904a46cac8d6a10f161da6d978401c5c60853a19dfb63c65690994bdc57fe327ee36bb5b6151a0018d6931c38553917f2dc82e9cef44e0b0d
 DIST opencl-clang-10.0.0.1.tar.gz 23549 BLAKE2B 8663da4525507862835ebc14fb4666d9f2f3cca0a2c08aadfc2875bc285e604e81b21ccc7476976eea2e3eb1ce88ae7b187c2d0ce085fc3ede1a2dbfea0789eb SHA512 406e27d90ae26a2f8ade04172bf680f8786011c7e8357a40b15c8bbfd933d0f1c5e0c114e371036318439fcab999ec5f141dab2df4b498eb9d2548bf175f8502
 DIST opencl-clang-8.0.1.1.tar.gz 42534 BLAKE2B e0dc6a4cc6f738f0f5cecfa9ef5b2c219dc1f1714cb5ff2dbf0d7a9ff9efe4cdd4ce0b3780f0ca53f9582b0b73b2cbfad28a9ddec76ef8f6978ee31fa3ee111c SHA512 8456a99668f7709d601ab49c6f8219a1de74363f270e606b5832cb13f196d65b6fe6cb961430b3f45875fec49a2f06c178e935cf3d1b118d033583d90611df15
 DIST opencl-clang-9.0.1.tar.gz 24574 BLAKE2B 2e3b69c10b572678f91e92fa0ca885dd9332d172c483c394f4c1b140a5fd926b26eff4d4ab722733e1e164ff99a6eb397b8bc9e30a0b7e289506432fd1291b2b SHA512 01c5011dc1ea66288f3e425f85c921142fd3bc5a3d79eeafe5c14b5741b8281f17727cbffa7ed31869f7704be957d2fed5e5e8a57ab31e7b8c3a9688f048cced
-EBUILD opencl-clang-10.0.0.1.ebuild 925 BLAKE2B f6e350c58f52b4c2a007d83f6471c6b36d7a2a9886ad35c4363b97f7fe6f8e637b82950240f99220b81ee88816c5568e06350598a6cea51f297625370b452a8a SHA512 9113a60cb3f1ee68381d9f3257115f0b285c6c378903c7c16320db38831ed6deaad960ae79f61f80bda6a7be6e9f36f27b23cf0f65edc3fc535cd3159a85b6df
+EBUILD opencl-clang-10.0.0.1.ebuild 956 BLAKE2B 832324fffa6d9cec20fe2a6ecc6313aa56d03378de7b5e74b4b3909caa1038834eaca5952694809b526bb900c93c0c58795201089924376942fd4f8d6361883f SHA512 d60bb6c2ffb172aa551dc94fbabe372b8ba2ada94eedea313767cda68be5cc0903f66b1768b32017ec2cab0125f430e74584e50a169ee37e6cf843280ad08c03
 EBUILD opencl-clang-8.0.1.1.ebuild 921 BLAKE2B 8b2cf2b0c8bfe1b61bf1ffa4be24b19a136379e84243123239b2b701da9d3c65790cc331e979e64e8dddaa81b79cd25b701d23f6db6d8d1df9986b176e52df8b SHA512 bbf66ab48750c3f3bc6f4ed3209dd4e11d1fc7f6d45ff5b67a55e5670ea91420e19b02420b86e08a20162c826a2b613613df3311bf95591c438089156adf1f98
 EBUILD opencl-clang-9.0.1.ebuild 849 BLAKE2B ff47beb350350bae14ebcc1ead16831bed53855064681f3c43ff946cce77cd14117a97637f3bb7c18e9e3b3d6f91f7c9665eb9ea7927befa2cf01bdda3e6f667 SHA512 6176a5dfbd614ac9466b618ca50e4a4385097d2bb8520b85809327cc7caff722509c587532ac969883bb1deee24bdad96b1e07cb17131cd34ce4070eaff6a9ac
 MISC metadata.xml 329 BLAKE2B d50cf1fac225c2240bd4af19962089d9b7446549d9cc7067d860218e76013acfbc65f40abfffded01c098b06dd4c8a5688c94e40710ecdf6e7db71e05816498d SHA512 de4a3177f7091c00cd54f5eb52d8d88ae88d207ca72acd71c824220593d27ebdbf3673459ab48440373af19eb88603a5fcdd5956597d816927c9663be177eccb
diff --git a/dev-libs/opencl-clang/files/opencl-clang-10.0.0.1_find-llvm-tblgen.patch b/dev-libs/opencl-clang/files/opencl-clang-10.0.0.1_find-llvm-tblgen.patch
new file mode 100644
index 000000000000..bf013c33a596
--- /dev/null
+++ b/dev-libs/opencl-clang/files/opencl-clang-10.0.0.1_find-llvm-tblgen.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -137,7 +137,7 @@
+ set (COMPILE_OPTIONS_TD  opencl_clang_options.td)
+ set (COMPILE_OPTIONS_INC opencl_clang_options.inc)
+ 
+-set(LLVM_TABLEGEN_EXE "llvm-tblgen")
++find_program(LLVM_TABLEGEN_EXE "llvm-tblgen")
+ set(LLVM_TARGET_DEFINITIONS ${COMPILE_OPTIONS_TD})
+ if(USE_PREBUILT_LLVM)
+   set(TABLEGEN_ADDITIONAL -I ${LLVM_INCLUDE_DIRS})
diff --git a/dev-libs/opencl-clang/opencl-clang-10.0.0.1.ebuild b/dev-libs/opencl-clang/opencl-clang-10.0.0.1.ebuild
index d09e936af38b..6f62bb78ba53 100644
--- a/dev-libs/opencl-clang/opencl-clang-10.0.0.1.ebuild
+++ b/dev-libs/opencl-clang/opencl-clang-10.0.0.1.ebuild
@@ -19,7 +19,6 @@ KEYWORDS="~amd64"
 
 S="${WORKDIR}/${MY_P}"
 
-BDEPEND="dev-vcs/git"
 COMMON="sys-devel/clang:10=[static-analyzer,${MULTILIB_USEDEP}]"
 DEPEND="${COMMON}
 	dev-util/spirv-llvm-translator:10=[${MULTILIB_USEDEP}]"
@@ -29,6 +28,7 @@ LLVM_MAX_SLOT=10
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
+	"${FILESDIR}"/${PN}-10.0.0.1_find-llvm-tblgen.patch
 )
 
 multilib_src_configure() {
diff --git a/dev-libs/pigpio/Manifest b/dev-libs/pigpio/Manifest
index 228efdfd82e2..d806a90d1f3a 100644
--- a/dev-libs/pigpio/Manifest
+++ b/dev-libs/pigpio/Manifest
@@ -1,4 +1,4 @@
-AUX pigpio-70-makefile.patch 3244 BLAKE2B 3a8155c52ec15227c815a5bac7b42a1fddf9682fbc10dd4513d6c5d7da8b2e1ea9189bc4b28560650b69a857e65c3db00b7af1de30970e23d1bcd988bbba0255 SHA512 096af62d64e61fa6d6394484c58e55dcbe4aa22551c5b3448209e6dcd707688dc3033d219eba954c0e78635d2480b7c7de044aeb18a80d0ac0d701b4d4cc4fa8
+AUX pigpio-70-makefile.patch 4856 BLAKE2B ec3010a687ae8104ca09f3df6313e74aecf2d9583932b1c17a72a58ff043a3d1e22ef43ba4e7ce1b4bd8c21824bae929b8533d5adb9ecef49614b8db94bd095d SHA512 b355ddfde0e3771f023c651ca5f7cbe6dc99a9720f0d2ab23715ad7185aad6f7e1c05b494415247838b371968756fbabec9f5539b172f623048757fad72339cc
 AUX pigpiod.confd 201 BLAKE2B 6707d0f0f8772110b6e1167abcfcdcdfdb22936024f3c1234f05c198853cde3b55c5474922fdb64dcdf49440e9ad163216c0b11ffb80ebea2fd413cc17fdc685 SHA512 96431969640fef1b5ce317f0f9ce93fae081f186dfa89c00b4f469e3657a7792c5d157ccff7d019ea4bb4848a6657c8bb8f111f5a208440cc8a0723772e7c708
 AUX pigpiod.initd 215 BLAKE2B d7797cc0d1d388fd21831e33cbadd031e2cb974e26367596dd4c9ba054fbdd4b04200d0ff61dfe797520d2e0745420a5d973b44a41e15713800a7828f097cec1 SHA512 e1db38677a248c3dbc33aae6809eb8df1dd6253f60ca852d98d8d6d428d23d7a8a31a031da3b786b7105d90f0cc52687bfbfe320e5c6cbf0fbf02b5ad5c6e606
 DIST pigpio-76.tar.gz 2905839 BLAKE2B 7828a94fad9f110392dc114534a3b242f1f135d352885f3c4332a1d4a16f49d2fa58b57e9e3d64c2bf9b5f3bdd7e84a74775b518fc409daf75a55a87c5f3af57 SHA512 8cc1dc64ae32a07f4b6e200638065ba5fb26a94c1a730d81b64fa5f2bb9356b2b9910decb41def6932fc76f7ebd1df99a7966516ba3df9a09108de0afcd119d3
diff --git a/dev-libs/pigpio/files/pigpio-70-makefile.patch b/dev-libs/pigpio/files/pigpio-70-makefile.patch
index 10df7e872c6c..1102fa5b6253 100644
--- a/dev-libs/pigpio/files/pigpio-70-makefile.patch
+++ b/dev-libs/pigpio/files/pigpio-70-makefile.patch
@@ -1,6 +1,6 @@
---- a/Makefile	2019-08-10 10:10:22.834043361 +0200
-+++ b/Makefile	2019-08-10 10:43:15.797503591 +0200
-@@ -9,6 +9,9 @@
+--- a/Makefile	2020-06-05 20:28:12.691759233 +0200
++++ b/Makefile	2020-06-05 21:23:46.334235268 +0200
+@@ -9,8 +9,12 @@
  STRIP        = $(CROSS_PREFIX)strip
  SHLIB        = $(CC) -shared
  STRIPLIB     = $(STRIP) --strip-unneeded
@@ -9,8 +9,11 @@
 +PYTHON3      = $(shell type -P python3 || echo ':' 2> /dev/null)
  
  SOVERSION    = 1
++LIBVERSION   = 1.0
  
-@@ -25,7 +28,7 @@
+ CFLAGS	+= -O3 -Wall -pthread
+ 
+@@ -25,7 +29,7 @@
  
  LIB      = $(LIB1) $(LIB2) $(LIB3)
  
@@ -19,23 +22,23 @@
  
  LL1      = -L. -lpigpio -pthread -lrt
  
-@@ -66,28 +69,21 @@
+@@ -66,52 +70,43 @@
  	$(CC) -o x_pigpiod_if2 x_pigpiod_if2.o $(LL3)
  
  pigpiod:	pigpiod.o $(LIB1)
 -	$(CC) -o pigpiod pigpiod.o $(LL1)
+-	$(STRIP) pigpiod
 +	$(CC) $(CFLAGS) $(LDFLAGS) -o pigpiod pigpiod.o $(LL1)
- 	$(STRIP) pigpiod
  
  pigs:		pigs.o command.o
 -	$(CC) -o pigs pigs.o command.o
+-	$(STRIP) pigs
 +	$(CC) $(CFLAGS) $(LDFLAGS) -o pigs pigs.o command.o
- 	$(STRIP) pigs
  
  pig2vcd:	pig2vcd.o
 -	$(CC) -o pig2vcd pig2vcd.o
+-	$(STRIP) pig2vcd
 +	$(CC) $(CFLAGS) $(LDFLAGS) -o pig2vcd pig2vcd.o
- 	$(STRIP) pig2vcd
  
  clean:
  	rm -f *.o *.i *.s *~ $(ALL) *.so.$(SOVERSION)
@@ -51,7 +54,24 @@
  	install -m 0755 -d                             $(DESTDIR)$(includedir)
  	install -m 0644 pigpio.h                       $(DESTDIR)$(includedir)
  	install -m 0644 pigpiod_if.h                   $(DESTDIR)$(includedir)
-@@ -103,15 +99,13 @@
+ 	install -m 0644 pigpiod_if2.h                  $(DESTDIR)$(includedir)
+ 	install -m 0755 -d                             $(DESTDIR)$(libdir)
+-	install -m 0755 libpigpio.so.$(SOVERSION)      $(DESTDIR)$(libdir)
+-	install -m 0755 libpigpiod_if.so.$(SOVERSION)  $(DESTDIR)$(libdir)
+-	install -m 0755 libpigpiod_if2.so.$(SOVERSION) $(DESTDIR)$(libdir)
+-	cd $(DESTDIR)$(libdir) && ln -fs libpigpio.so.$(SOVERSION)      libpigpio.so
+-	cd $(DESTDIR)$(libdir) && ln -fs libpigpiod_if.so.$(SOVERSION)  libpigpiod_if.so
+-	cd $(DESTDIR)$(libdir) && ln -fs libpigpiod_if2.so.$(SOVERSION) libpigpiod_if2.so
++	install -m 0755 libpigpio.so.$(LIBVERSION)      $(DESTDIR)$(libdir)
++	install -m 0755 libpigpiod_if.so.$(LIBVERSION)  $(DESTDIR)$(libdir)
++	install -m 0755 libpigpiod_if2.so.$(LIBVERSION) $(DESTDIR)$(libdir)
++	cd $(DESTDIR)$(libdir) && ln -fs libpigpio.so.$(LIBVERSION)      libpigpio.so
++	cd $(DESTDIR)$(libdir) && ln -fs libpigpiod_if.so.$(LIBVERSION)  libpigpiod_if.so
++	cd $(DESTDIR)$(libdir) && ln -fs libpigpiod_if2.so.$(LIBVERSION) libpigpiod_if2.so
++	cd $(DESTDIR)$(libdir) && ln -fs libpigpio.so.$(LIBVERSION)      libpigpio.so.$(SOVERSION)
++	cd $(DESTDIR)$(libdir) && ln -fs libpigpiod_if.so.$(LIBVERSION)  libpigpiod_if.so.$(SOVERSION)
++	cd $(DESTDIR)$(libdir) && ln -fs libpigpiod_if2.so.$(LIBVERSION) libpigpiod_if2.so.$(SOVERSION)
+ 	install -m 0755 -d                             $(DESTDIR)$(bindir)
  	install -m 0755 pig2vcd                        $(DESTDIR)$(bindir)
  	install -m 0755 pigpiod                        $(DESTDIR)$(bindir)
  	install -m 0755 pigs                           $(DESTDIR)$(bindir)
@@ -72,27 +92,29 @@
  
  uninstall:
  	rm -f $(DESTDIR)$(includedir)/pigpio.h
-@@ -136,19 +130,19 @@
+@@ -136,22 +131,13 @@
  endif
  
  $(LIB1):	$(OBJ1)
 -	$(SHLIB) -pthread -Wl,-soname,$(LIB1).$(SOVERSION) -o $(LIB1).$(SOVERSION) $(OBJ1)
-+	$(SHLIB) -o $(LIB1).$(SOVERSION) $(OBJ1)
- 	ln -fs $(LIB1).$(SOVERSION) $(LIB1)
- 	$(STRIPLIB) $(LIB1)
- 	$(SIZE)     $(LIB1)
+-	ln -fs $(LIB1).$(SOVERSION) $(LIB1)
+-	$(STRIPLIB) $(LIB1)
+-	$(SIZE)     $(LIB1)
++	$(SHLIB) $(LDFLAGS) -Wl,-soname,$(LIB1).$(SOVERSION) -o $(LIB1).$(LIBVERSION) $(OBJ1)
  
  $(LIB2):	$(OBJ2)
 -	$(SHLIB) -pthread -Wl,-soname,$(LIB2).$(SOVERSION) -o $(LIB2).$(SOVERSION) $(OBJ2)
-+	$(SHLIB) -o $(LIB2).$(SOVERSION) $(OBJ2)
- 	ln -fs $(LIB2).$(SOVERSION) $(LIB2)
- 	$(STRIPLIB) $(LIB2)
- 	$(SIZE)     $(LIB2)
+-	ln -fs $(LIB2).$(SOVERSION) $(LIB2)
+-	$(STRIPLIB) $(LIB2)
+-	$(SIZE)     $(LIB2)
++	$(SHLIB) $(LDFLAGS) -Wl,-soname,$(LIB2).$(SOVERSION) -o $(LIB2).$(LIBVERSION) $(OBJ2)
  
  $(LIB3):	$(OBJ3)
 -	$(SHLIB) -pthread -Wl,-soname,$(LIB3).$(SOVERSION) -o $(LIB3).$(SOVERSION) $(OBJ3)
-+	$(SHLIB) -o $(LIB3).$(SOVERSION) $(OBJ3)
- 	ln -fs $(LIB3).$(SOVERSION) $(LIB3)
- 	$(STRIPLIB) $(LIB3)
- 	$(SIZE)     $(LIB3)
-
+-	ln -fs $(LIB3).$(SOVERSION) $(LIB3)
+-	$(STRIPLIB) $(LIB3)
+-	$(SIZE)     $(LIB3)
++	$(SHLIB) $(LDFLAGS) -Wl,-soname,$(LIB2).$(SOVERSION) -o $(LIB3).$(LIBVERSION) $(OBJ3)
+ 
+ # generated using gcc -MM *.c
+ 
diff --git a/dev-libs/popt/Manifest b/dev-libs/popt/Manifest
index 95b62905b688..dc08ada43274 100644
--- a/dev-libs/popt/Manifest
+++ b/dev-libs/popt/Manifest
@@ -1,4 +1,6 @@
 AUX fix-popt-pkgconfig-libdir.patch 519 BLAKE2B d31d6d121f745f208c743aed94c071343efd09b8396c777f7887e8931f87d4fd8e4fa1eff7ec340300a68ae67862cdd7bb05d6bd60e08289c406d3cc9f4ead6d SHA512 8862cb25283f38d734aa1abaa4d29d1f018718be77d03a4f0533b6b8b2518581abf277eefd3b3d56d5f9ab9e00b544e816e83fca6863e86a66dacae0f9abbfd0
 DIST popt-1.16.tar.gz 702769 BLAKE2B 37767ec50118f3675e8bfa780dca7989e092ea71c3ea1e1ab80d7cc13bf20a3b5f0681df2a7e0b1e3404404a0952f7b7f0135083d4166026dc26880a5a17ab3f SHA512 bae2dd4e5d682ef023fdc77ae60c4aad01a3a576d45af9d78d22490c11e410e60edda37ede171920746d4ae0d5de3c060d15cecfd41ba75b727a811be828d694
+DIST popt-1.18.tar.gz 580569 BLAKE2B c9c42eb12aa21764cde5e9b4a8b30125b547ae690b4d9d0d40b45bd3c1f7ae0b09d5086a588cf37e7bed71fe770ff840c0fd40ecf4ce5b7c1e874b938b6e0324 SHA512 86422e8762adda3d02d46c20ac74ffe389d4f991d552b6fea729f007345b6426cbeb71160284e2deaa2ce44ce754a9e6cf6ccbd64bff9bc2253df40cdc2f79a5
 EBUILD popt-1.16-r2.ebuild 874 BLAKE2B 881c6fad5ba54ce1d2fb79035fc4820adb5f863fc0f5f045481c51b089fdc528b1ff43546f59ed67e918dd8a93a3102db542e928fa58bde91904bbc1350a26b9 SHA512 dea4a0fb8a4a121ee6d2591d017e431095532e76dafb00abe6d2e07584dc626d44eb7fee0124942af9e1d811e01565dd1f9d5db7615c9f1840fabd2fa08c1337
+EBUILD popt-1.18.ebuild 952 BLAKE2B a99b227262456ecd3feeb3d1c71973f0c97d099cf574bb9771f752328a1111ffec777d1538dd7ad37a4b5469186e4351ae99c59b780254cf839c33bdad2a5b75 SHA512 99260d125e99c9e76077b181cc26af53379cf182a3fb9e086e5acadcc66224f0d4cdfee2cf96b094e85d006a7e4562c60792cf011135dafd66c832f5083d2e07
 MISC metadata.xml 347 BLAKE2B 1b9847aceced4a814bc94e483d32082dd6c2dcd4b99c48c8e2cfd062cff0d2f1a0fc102a7b7c4ba3f620db6837d61a880b0cdd395c7e19348acf0e2831640d6a SHA512 ab5ebecf77f7aee7c2de528a7e6b84dde079d33d020fa910420001b6a8dc63ca6c014f3d4122794d7e9099e3d7d53de60338a4fbca563a90fe6a5d2747f50d2f
diff --git a/dev-libs/popt/popt-1.18.ebuild b/dev-libs/popt/popt-1.18.ebuild
new file mode 100644
index 000000000000..6130f1283417
--- /dev/null
+++ b/dev-libs/popt/popt-1.18.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib-minimal libtool
+
+DESCRIPTION="Parse Options - Command line parser"
+HOMEPAGE="https://github.com/rpm-software-management/popt"
+SRC_URI="http://ftp.rpm.org/${PN}/releases/${PN}-1.x/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="nls static-libs"
+
+RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	default
+	sed -i -e 's:lt-test1:test1:' tests/testit.sh || die
+	elibtoolize
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable nls)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	dodoc CHANGES README
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/pugixml/Manifest b/dev-libs/pugixml/Manifest
index 778aba646cd6..085346efa5ba 100644
--- a/dev-libs/pugixml/Manifest
+++ b/dev-libs/pugixml/Manifest
@@ -3,7 +3,7 @@ AUX pugixml-1.9-always-install-the-pkg-config-file.patch 2820 BLAKE2B 768af20490
 AUX pugixml-1.9-pkg-config-Use-CMake-GnuInstallDirs-FULL-vars.patch 1641 BLAKE2B 281f24717276e7e21d380d048e6e6896fdc89de88f1ee8745b9880b0c39d5c0043af6f408bd2bfb6dbbea1ef3e516635ea486ed1f247e5b5ef19f7c7e01358a0 SHA512 60a1b80b26d663cccc2da4ed3b2fa631ffe1dd09a62d7e42a00d28844cb097be6c682aa6ecf92e2ce3d9c20569e23d2f1e8133af6c1eb4ceb3f99692fa5c1623
 DIST pugixml-1.10.tar.gz 381990 BLAKE2B ea446d11fe5213a5250b7e737a9e80a3976454724e1a1c326b689214ad4d3e183abd417a7782b3d5c68a0aabce42228e121352e4d2dd33f5f2bb2334f6c72c27 SHA512 bfc80661005d0a0fb82ca6d5299e5efdd1bb468e11ee52d7ee9367e15776d28efb60266ce03842715cd43aae023afc2b369797bb3cbecd6d6a65c3ae3903e469
 DIST pugixml-1.9.tar.gz 377369 BLAKE2B 39b5b0d63a20e9c15c5634e56f82207aed63843d252900db94dbf06d100d03916a16523ccb9de433cc94ded4a9e9d1dc11f47bfd6fd75e348a9a2af31c305db6 SHA512 853a9d985aae537391c6524d5413ef4de237d99d96cc58ea7fe7152f786df1e408cdacd2e4387697e23c3e67cdc1d42b29de554501309eae16d86edd0e24785f
-EBUILD pugixml-1.10.ebuild 569 BLAKE2B ec211c15417bba351d773d29d2dcfee760596e847be1767249e93fadccb6aee48f83aaba0c2149b5260a0bb3d4a163495793e163d50e0c1d02f1f84db5ae21ac SHA512 76d5aae611fca7d0cfa32d66ed574bd766c6a2052fe3a8a7570c8b31416f3c8db75524f297b7930f6cbb293bd645c6d0d9c7d9445a960aee4e8e7d41ac70afc6
+EBUILD pugixml-1.10.ebuild 576 BLAKE2B 03902967dd711c63b01b8e11c1769f769f7b4df57dd889b87f23c316abe8bf746339058de220644decefaf133d8032c45c480cfcf4d51addc164e8894543c800 SHA512 71bc00b077502f5592e41f36ab6faea344caaff4a8e5787c5ddf88f0ff151bc313811594d0ce83e6506a60879c2f8009c7e4c1f49532f2c8ba3a5f6b1499ec28
 EBUILD pugixml-1.9-r1.ebuild 776 BLAKE2B 85ff23be70e107f4163ad8e518bf8ae3a8b4ff0ac37cfd24a2375317e09d538908b1d729822ed44547577c3d73e0b9bafbebc1a9ca87adf05e3b474d2f89cfad SHA512 8c560bda6ace8d80345c3fcbed113e06321828709a3f080826242303ec2c8d8664bfe7c18b19b123c22913f398337d4f223d39d34f7ae50e9eebda2e0b6302e0
 EBUILD pugixml-1.9.ebuild 586 BLAKE2B 96f5e5452308058f3cc2fbc102cf679b216d24807f89cea88c63685089dac7a4ace3e6ec26bf9d46c7f50da59200f62f91b838d5b919cc7a3660c1ba47375681 SHA512 a43e0e3e7c28274910daaa84f7f8b85d4dace40ca5b380175146f48c4b689bb567685132c001de439e979affa504593e230338f06cb25379a202c5511ec529d8
 EBUILD pugixml-9999.ebuild 569 BLAKE2B 353fb5e610b766647e1e3bd921a05390dec00f185d193437f96d7a8cf0bbfda8813168243dc80bf0b3cc1fd8c4e1c9e8e83b27590e1a3018f3a5ef1947f66e41 SHA512 248a298f4cde950be75592de172fc89fd36d979fcd76684c63e652456a60cd84a6bc0f2312248de003e4bc0771ce3bf2c9b28ff5c72087be245c202af50fbc99
diff --git a/dev-libs/pugixml/pugixml-1.10.ebuild b/dev-libs/pugixml/pugixml-1.10.ebuild
index 4e1d8c3dce85..0750359ebd79 100644
--- a/dev-libs/pugixml/pugixml-1.10.ebuild
+++ b/dev-libs/pugixml/pugixml-1.10.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Light-weight, simple, and fast XML parser for C++ with XPath support"
diff --git a/dev-libs/rocm-device-libs/Manifest b/dev-libs/rocm-device-libs/Manifest
index 55cce08cde2c..899462757133 100644
--- a/dev-libs/rocm-device-libs/Manifest
+++ b/dev-libs/rocm-device-libs/Manifest
@@ -2,9 +2,11 @@ DIST rocm-device-libs-3.0.0.tar.gz 227811 BLAKE2B 8fb866611e82126b5909b752820813
 DIST rocm-device-libs-3.1.0.tar.gz 227951 BLAKE2B 06918195f4b7073089dbe3475fb12402f1ff9a514430b143f9135f63ea0f75b0ed125af69bb60995d80974661fb3f3fb8276d72dc935ce48f059bac0e9c23f85 SHA512 4238698011bb2501f15ab081e12f1c9959a92890093c8607188526e69d2a35483edf39fd55c3eba33dbc93fc1865771fde9affc7e1e0aa3bd26f1878af106e47
 DIST rocm-device-libs-3.3.0.tar.gz 227986 BLAKE2B 4d62002e06b4f69641d6733120dc6222aa9bf4a4f6af2709218f42e8d92cb1943fdc967ef6a88f62e19d46828472b91fa9b17a35dab1cda90ef2a0278398d6b7 SHA512 920d7bd6ccd423bab98c97fadb183d4d667a967e6843c41b4c5c6c0c14ceabf57ba10e7c8787cb86b0b8ddf14efa96b7422e6f4a12079e37c5da7053e8bf0a99
 DIST rocm-device-libs-3.5.0.tar.gz 228247 BLAKE2B 05b8e850e5ad4ae80bac92b6392dbc6d7bf78a63f5718e7ce5ed94fb85df356c2d1640a862ebd4587000df6c728c694535e5345a6a702e769c506fd8ebe5c606 SHA512 d8af9e93b0223ea18d96b80c3d9e0c97ef69448e3af823a802cf485ac8ed88c54dd0ac98cf5d6d2c9f66c3b197cd6991822310c7cde53b8c437083c0d6f984ac
+DIST rocm-device-libs-3.5.1.tar.gz 228311 BLAKE2B fcf6eb566a375015b521e3885c16868f6133a9ffbfb5f7ff766482a1f901811c86c5c8baaf8ece9bab4ad4655e907da6ab37ed8b25fba6637803e403267f9587 SHA512 182c901b837d57331f6d05280f17e2ee62339887dc61b6ddca66a8a7f58eecb9366a0abb3d483a86c227d5ed5cc2c7ca1c98a20b7db8214b27d1ceae0e68d2e0
 EBUILD rocm-device-libs-3.0.0.ebuild 812 BLAKE2B 830cff0de7f8ea43e929f86d5595a2842793372cc17d1463614127987651ce188b51ad46e2b7e1c0549cd7098800d6cb844b33adf74a14f1db884298a3051024 SHA512 4b123a3c24bb5d57720f8f8fd33d3105168d0fe7bbd750b7aba9410b155024d8b1632b95625a20cb8f4ed3c78058b13eb3ffef37485036a87ef2369611b790dc
 EBUILD rocm-device-libs-3.1.0.ebuild 812 BLAKE2B 830cff0de7f8ea43e929f86d5595a2842793372cc17d1463614127987651ce188b51ad46e2b7e1c0549cd7098800d6cb844b33adf74a14f1db884298a3051024 SHA512 4b123a3c24bb5d57720f8f8fd33d3105168d0fe7bbd750b7aba9410b155024d8b1632b95625a20cb8f4ed3c78058b13eb3ffef37485036a87ef2369611b790dc
 EBUILD rocm-device-libs-3.3.0.ebuild 814 BLAKE2B a86efd3afe14bbb6356226b215951c419cf764e7202b991b291e3e1cad4e7e68bfd100ab9e441866c9ae056876e094e7c9ee5a0b241e533401044426fed27dd7 SHA512 1c8f592d37e1865c5f55b1fe93aa4f1c25e9a0000baf1181a450b27b99c0748eb320756be50fb42e4c21aa18e7acc6bdfc897fd7fb296d13b2a0a0e37a551b30
 EBUILD rocm-device-libs-3.5.0.ebuild 820 BLAKE2B cdc41b86105554d1c1cab13cb4a832f90415ebb4f89a2631388db20030a6623b3db2472334113339dff8a4aeec26cd1b50dc8d33507bd14d907c49efd780973a SHA512 1e6499561fe0d0b6caccc77ac0d4d097366c59930ece799996d1cfcc53119ca285a9ea3a496d8f39fc03b8fe5f14135280f5f2c3272ab093c57d4f88efddbd36
+EBUILD rocm-device-libs-3.5.1.ebuild 829 BLAKE2B 34d2a6a8227d2a869ab6eca5d1bb53b19c95f2156d8ab55e7dcbf801a56d7fdd8858455038d19d86b5705a0de4c994749d6e8fddb1d62c6ea728b4683aa673bb SHA512 96dfc6a00940edf0ecf4a52b0eef9b76b83f883684716dac66fa349d9b6a7c8523862927d7db8000275c26920c0a3b7d2a3c4c58eed7f69d170207cb5d39c5da
 EBUILD rocm-device-libs-9999.ebuild 804 BLAKE2B 89a47136834feb8bebd6487d0fdc7ba0ca921764f01938812959bd6a006df704524acc14ccdb67a7d08bd032403837bfad358c5837bf4e6e8957293c3b159d72 SHA512 e76d6647cf9ecf6beebb15541503955cd469c50f39c462e1c45be51d87072cbff603fddc9979ad795ad5ec746d625485e24eb751d41610522fbefd8aad64496a
 MISC metadata.xml 477 BLAKE2B 75910bca37a606f3ca0b41122d64b786776930f7cf00e8125496b4722d887f31506f1abec272123b66e81ce5e5ff9ffad5e3176c29e64c314e46f71c8baefb4a SHA512 ea01d8303b071b1338e53361ec9b21e73447d42e4d96598f4b723496fa48dab4f811d743f1dd188da28c7240fdf4b132775181c177fc35702d8b99ef40ef7b01
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-3.5.1.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-3.5.1.ebuild
new file mode 100644
index 000000000000..6d4a832b910c
--- /dev/null
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-3.5.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/src"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCm-Device-Libs-rocm-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Device Libraries"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocr-runtime-$(ver_cut 1-2)
+	>=sys-devel/llvm-roc-${PV}:="
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 7980b145a1e1..eade5cbba736 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,6 +1,6 @@
 DIST spdlog-1.5.0.tar.gz 270416 BLAKE2B bac6c6650f8347458dd2dd66f318b43a769b0896d68f6a6f1310754527a69feaa52b2f6f48d67c7e811c2dafa5d3863a9a07c738df8c12abed2718fb06254b28 SHA512 78991c943dd95af563c4b29545b9b5d635caf1af5031262dde734ecf70c0b4ae866d954ee77b050f9f0cc089a3bc57ee9583895e51cb00dd1cc6c10ff905ca34
-DIST spdlog-1.6.0.tar.gz 285249 BLAKE2B 2acbc6b3cb9da93842e3a87367af219264347062cf007cf08bbcf512a6595adb9e68b3780b18e273a8a752db591c1b9a55236ee889c6b1b98fab2d7efd815c0d SHA512 5711fd5b1c7a1a2097eecfa386f75315c7a580f08a59e220ded57e7412df037a57ddf5cce60aa2904c1c579a801b727eaf0c6f951728ef731ce469b231da5851
+DIST spdlog-1.6.1.tar.gz 285531 BLAKE2B 525f29098fd0f771e14cc7c4bd8bf5d4054a0f68255aea29ef5158ce61516d9e5f0ae0fb72a2f54303d18194a54acb5c1731f53ee6edcd74ff487227bc332236 SHA512 1e15e7710744212240d79897af8c3bde14fe3b745a1377643d18dc0038f18fc7582236ff21836d3eae2c75cf1f4820ca4c642c5c3f63f9ae138289aa4d00e22e
 EBUILD spdlog-1.5.0-r1.ebuild 940 BLAKE2B 5bd3e51e37049d4f99d1e8b286a27942393788897cd5363a03d4a29aec2d19867c46cbbcbd90da1a55d8991dba17b87aa8380b04ad1c3d451dcd9b80e9fb9525 SHA512 4e8f4ba9a45110108c77a6f06e1fef14bc9240db69cf10b66aa86934f650a887f6ed3677aaa662f51eaf2c782b435fc2478f3b03719904dc314335c875652261
-EBUILD spdlog-1.6.0.ebuild 943 BLAKE2B a6081b7bca5944e6c2c62536e9e76e234179a2a7962d9b7dc721c77f146854adecd2232e115ef98ce22e5963d57b38fd2c1c16263e1d8c2e5a4c31845638fd42 SHA512 a15d952219c91851c7a89f25b1e9693cda0dd09cb4693ff8aa73bb4b5c700d80124ae91a3a026018df78142267823e96e9207929dc79ac42b884ea16ad19b0fd
+EBUILD spdlog-1.6.1.ebuild 943 BLAKE2B a6081b7bca5944e6c2c62536e9e76e234179a2a7962d9b7dc721c77f146854adecd2232e115ef98ce22e5963d57b38fd2c1c16263e1d8c2e5a4c31845638fd42 SHA512 a15d952219c91851c7a89f25b1e9693cda0dd09cb4693ff8aa73bb4b5c700d80124ae91a3a026018df78142267823e96e9207929dc79ac42b884ea16ad19b0fd
 EBUILD spdlog-9999.ebuild 914 BLAKE2B a5362a8845f61d921f2d136dd6a55beb3931539e07b4fd8950730c32975e160f5162e27862bae3d6ffddd3ae77c210128dd33cdfa22a509125f628e0869775ea SHA512 15f272868287039f55fbc82018bd5dd49074534d0efc50aeb022abb1442c9a9fdb90496528d2f2d8905cef3df311b1fc428451f605aac572a78e908ccb0f797a
 MISC metadata.xml 444 BLAKE2B 43dc7df0be06296bad03bcd8c479773dab68c409644907e7fc02f0467e1ff8bc291e090b1c9831acb1c66ee046326b6597edc7267be09498566a3f4abc2dd722 SHA512 3da6d49c08f56e11b065b4cd2cf3536fff75512ab729a958db07151c3bce234deeab22a95e7cc7f569edf5e42f7edc099a68c1572be936f2430144532e95b62c
diff --git a/dev-libs/spdlog/spdlog-1.6.0.ebuild b/dev-libs/spdlog/spdlog-1.6.1.ebuild
index 6da33cbbf3c6..6da33cbbf3c6 100644
--- a/dev-libs/spdlog/spdlog-1.6.0.ebuild
+++ b/dev-libs/spdlog/spdlog-1.6.1.ebuild
diff --git a/dev-libs/stfl/Manifest b/dev-libs/stfl/Manifest
index 4fdae32f4c21..a85f1c33bf50 100644
--- a/dev-libs/stfl/Manifest
+++ b/dev-libs/stfl/Manifest
@@ -2,6 +2,6 @@ AUX stfl-0.21-python.patch 1936 BLAKE2B fc0a8f02eaa30b900652304e34f383a6587769f4
 AUX stfl-0.22-ruby-sharedlib.patch 735 BLAKE2B 6b2b9e835f57f62ff1e1ff871103bc0b1106329916fc1be75eb22e550c9ff8abd007bbc201c66e15ce16a4697c0bbe0850b56ff41f666dd7006028432b1f77e5 SHA512 73a1b7aa7147100ab2f06264303c0a30463deb8bd0ce9e4111737393d07c4fb06174c5022c1dae8c7fd2688d1b544a4ab8c8ee5495f46e2bbc33ce89a7e46de7
 AUX stfl-0.22-soname-symlink.patch 444 BLAKE2B 9aa44343a18a8d7fb2f75a60ae94c30ef92b6f02190cefbefedacd9f8d5c877ac71b83c41b008bfd46a4d5ffe04f91f03f898e27ef098162d0b43f274ccff298 SHA512 e85c6f96edd8cd08d3408f976fff5f9fbcdc9892109233e78d932eb07502b00d3a0b52393542de8af5b2d26808b3574736f78b7ef9c7bdd0abffa3901fc55dab
 DIST stfl-0.24.tar.gz 45585 BLAKE2B a601f373f19baa3a11fb823852ada19ab824828935240280c74ff442a1e5c4abdf0abe56e445869e43785df3940a8c7269bc16457436abbe5e2853f907071059 SHA512 95df4574b1bc32d795751156dc5b93afbca3ba241607a3a55210c89dda61b9a26ad574bb5f729a0158c9052235dbf63d6c58b38e7f1061d14ab7062af6150fa0
-EBUILD stfl-0.24-r2.ebuild 3046 BLAKE2B 2b7bacdfb00882676a843164fbc6056d9def35ed5038eb41126d38027b5ef486c66eec92bade8b80dddbd736ead4574c2ea996fb9fa1d190b95bef8725d0e2fe SHA512 ff46e93c7d3dcd83f9667a8959437fa419bcc55383e37b0d37aecc5832fe8e13e3b0dc11d74582c9ff7c98a1496bbc472df2dc4361f3bdbe1cc48ddfffccf307
-EBUILD stfl-0.24.ebuild 2936 BLAKE2B fbdb5050f522b948cabd864be4aa4ac404b6139ac546d4a2e35a37c77f0ca955b4030528d2bd12c217569bf3d95664c1f88f5d484a62e0e351b3869906bc0201 SHA512 3751c26c9b9341b53b2120540bea6b66434b37e55cb4b26f3c833e580a060f77590ae1fae7b187eb382b65a7208fecf00d016f1ff0f2afdf6482b760046b4b9d
+EBUILD stfl-0.24-r2.ebuild 3105 BLAKE2B d2fe5ddd626f0d56a7f778e03a06f0822ab9dc09e16a683e0bc68a1c0584cb51c06026d43d64c199a530c1b601dc56ed96016be24273550dd915797eee18b2c5 SHA512 cf3e01bcc035141e8d68c247675d662c05e1d34ddb450f5760eaa798d43f39516205de094945b263f837421dbaf600d7ce14f23aa512a87a1ca1f9d39fad80b8
+EBUILD stfl-0.24.ebuild 2995 BLAKE2B 0f57b85f5677b818ddeff285cebc84a636b887c1d57fb587ce537cb66269500bf82916d5bdd1de02c138a23733b72e8f106daf4e2de1faeae484dcb29c61d6d9 SHA512 e213afd5c42bd6c321c82489acd6546ba2afca4e9f67ed34a8d64472bd7d1f5c8a9977d73f8f08cd5ea37f931f205f50b68246b7e0ddb6baadeda9e67ae22a0f
 MISC metadata.xml 883 BLAKE2B 57005ad40d9e2a363fd5487e77c77917c85b45c9b0ade87de3cdef7aa59af6ba674cd586b736bd46b0763d1bb60f2b14b0470551bf422df030b4ee285dd8e14b SHA512 e0aaa92e248cd4670280040affa1afca918e41c5db47b77edde1f438e20d4ef3a440ab79c8d1c610e7445fc5f99feca02a7fa055cf201cc50e7b581b0c897b0d
diff --git a/dev-libs/stfl/stfl-0.24-r2.ebuild b/dev-libs/stfl/stfl-0.24-r2.ebuild
index 97e5592ed6e7..ea2ac59c66cf 100644
--- a/dev-libs/stfl/stfl-0.24-r2.ebuild
+++ b/dev-libs/stfl/stfl-0.24-r2.ebuild
@@ -27,6 +27,7 @@ DEPEND="${RDEPEND}
 	python? ( >=dev-lang/swig-1.3.40 )
 	ruby? ( dev-lang/swig )
 "
+RESTRICT="test"  # Upstream does not provide tests #730112
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.21-python.patch"
diff --git a/dev-libs/stfl/stfl-0.24.ebuild b/dev-libs/stfl/stfl-0.24.ebuild
index bdce7f3941f3..063edf019c58 100644
--- a/dev-libs/stfl/stfl-0.24.ebuild
+++ b/dev-libs/stfl/stfl-0.24.ebuild
@@ -27,6 +27,7 @@ DEPEND="${RDEPEND}
 	python? ( >=dev-lang/swig-1.3.40 )
 	ruby? ( dev-lang/swig )
 "
+RESTRICT="test"  # Upstream does not provide tests #730112
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.21-python.patch"
diff --git a/dev-libs/tomsfastmath/Manifest b/dev-libs/tomsfastmath/Manifest
index affa52fff336..e49e7841eaf1 100644
--- a/dev-libs/tomsfastmath/Manifest
+++ b/dev-libs/tomsfastmath/Manifest
@@ -1,4 +1,4 @@
 AUX tomsfastmath-0.13.1-makefile-fix.patch 1703 BLAKE2B 2182f88b8569fac105eb179fdc7c10a7c9b7b17619a725c30d8374a2589f048e0ca0fe71ffb2431e058a264b104bc091deb800215a490399e722055b39adee0e SHA512 f5e5df821ecc7beb8684116294322dae8bf166bfbc7cf3d5262534e036f1d486854e58ad2c2da382b8f08aa6b9db71d91607289587c4247837bdfc3313ad5cff
 DIST tfm-0.13.1.tar.xz 322684 BLAKE2B 393c0e0e018b199c9fc975ab3013466399ea337f520f4634649a9e61b2218b9a6b218d11212b535fc8bbd2bf40d8722fc413dc60756f1b8ff7c78da049765083 SHA512 84225fe81bbcd1df7e40ed0b8c8077d60612246a76f3149b672dfd1066eb0179262fa4f5a42ffd2034e60cb74cfd86e0b49139371971ebbb4f41a4ecebca2111
-EBUILD tomsfastmath-0.13.1.ebuild 1644 BLAKE2B e1a5931e4bff08aa259175fa9848bad51e7af4caf6f60222ddba73d446d7323244acb1c7e2e4266e91aa1874e881ae9b6faadde82f7df25970077ce7cd5ced05 SHA512 74938776ab2d2be0b485052837e7bb36eb947c77d1035e9ea1921dadf724ad86ef975b0dd7b7907266246449bb2a8edf945931b63334d42ea9899bdc5ca8ef59
+EBUILD tomsfastmath-0.13.1.ebuild 1649 BLAKE2B 740e06df89c6e2a7fa009158ed8f32f6c3f4769bb0a11f9d1239e7248c546e2e9865a7d7f1bb591f4e703d7f585f5237d2bb807f6170d1efa871b5a64178fe5a SHA512 e2004cc6fbd4ad3adaf1a19762169a6e8cceab083b0af07eb0d165351b4a31657f4ff1abc140cf2148f5e8e028d1a6c75c621f3f978a8acd45b81f590817a04b
 MISC metadata.xml 481 BLAKE2B a61b20b9947cf71dcc385a04643a32c161c3314a65210f3d18d0743611890a066b9f9e7ddebb02c9ba39e6c6e82058dd78c796903357c432813f4e4323c06038 SHA512 1235eb2954bd7b7ea6e0ce326e50003255a49f558c7e2c08f40f2f7db71532643f1abd3ef28aaf3fa0c2f3e32d57ae07af7f9d49338bbe35bf9d690a023c5655
diff --git a/dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild b/dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild
index a4c45639df8e..8ddde1737502 100644
--- a/dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild
+++ b/dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild
@@ -17,7 +17,7 @@ LICENSE="Unlicense"
 # https://abi-laboratory.pro/index.php?view=timeline&l=tomsfastmath
 SLOT="0/1"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 PATCHES=(
 	"${FILESDIR}/${P}-makefile-fix.patch"
diff --git a/dev-libs/tre/Manifest b/dev-libs/tre/Manifest
index a4286763f3e5..639dd72dc066 100644
--- a/dev-libs/tre/Manifest
+++ b/dev-libs/tre/Manifest
@@ -2,5 +2,5 @@ AUX 0.8.0-CVE-2016-8559.patch 2658 BLAKE2B 12a7d12d35e2d61457fbb9e368cfa738bad74
 AUX 0.8.0-pkgcfg.patch 420 BLAKE2B 6b04ff4db2abc5dffdbca50bcbbe20974fdaa24ab25875f2538eca5af42921a729550e7ea5188225d3d73661e9ba05b96ff345fb4d931130ba4255b14c3944d2 SHA512 a6e4713aa0f9619abe256e9e1ea7c5bc8cbeb9ed173dd856972af70612ac435206e2b294ca5947e93223c17de875ba2620bf57949332b19ecff9965e2ee1a9e6
 DIST tre-0.8.0.tar.bz2 380714 BLAKE2B b2af6e805e9e19fd69debf2f881ddfb591317f69db4e29a04e1899eb69100b8ac7744f86fa438530509ca2ee8aa1d346d416c6391f13247cd9398f4c59c2ed85 SHA512 db7465993e0d25eee8e52f974427b8a040234cf0f017769eb94ee88bc6261821336aad7f762bfa82db7e2212d8449bc221592586f061c528a59a550773cbc263
 EBUILD tre-0.8.0-r1.ebuild 1412 BLAKE2B 5910c54dd847e5ced32abba2c747abcb86c73701332650aa2d937b5470a78bc00be5eaed6cfeb63346b0af0cac702a7baea357ed2dd53aa2c2d600501991fcaa SHA512 ecc2906825000bab1e1286282e445f3da63d36b8896086ba5212646c727300a0c133edfb04a221385b0dc3173156029993aa63f26b43c69d79f78a0ef3aa8d2e
-EBUILD tre-0.8.0-r2.ebuild 1460 BLAKE2B dfd363ff4e1140798d09024b74f93ac78ed498a4552edab0c478164b29954846a536ec46a652ab8fdcc7c02e17edbd4e8aa87d7b4e2ad501dc458fcc1d7dc7cb SHA512 ff58647ecb1f3bf8ce955a5b8d8b1a87fb1447f4355ac1e89de38368cb59bc3df97291b4204b6a5121f2e3f94b0674a3028ce71048efcbf18fa9cdce24e95122
+EBUILD tre-0.8.0-r2.ebuild 1455 BLAKE2B 681ff4583cc680620528c77556aba91a077e2502bb9f0c02fec1c95b1f90d2a6e855d1a86f8c7884bc0cf51143dee91acaba418599aca7e16489c321305c5085 SHA512 51afcd8965a0d723b3d8a52539e190ceab59db5ce2b98c47ad932c549fc98545b8f926990b9ed7db6e7f64eeac013d80693c898bd4e61300c4f2da175f5ac945
 MISC metadata.xml 353 BLAKE2B 0346462595f8f9a38758ce0817e787b87b35b329aef65d2921214d32bd9313023f006ee2ab31084a03a2f8a8ecf1d556dd11f190ac2467ebcd061bc144b977e4 SHA512 907b341e747fb9d7ba7b76f300d373284a21a59e3d649275c4a53ac681177f94e9d0d9f56b15365008262b2aba91236d9ac5623387313c7b74b65b2b70871d3b
diff --git a/dev-libs/tre/tre-0.8.0-r2.ebuild b/dev-libs/tre/tre-0.8.0-r2.ebuild
index 145fec0c583f..aad4e57c4865 100644
--- a/dev-libs/tre/tre-0.8.0-r2.ebuild
+++ b/dev-libs/tre/tre-0.8.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://laurikari.net/tre/${P}.tar.bz2"
 
 LICENSE="BSD-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="nls static-libs"
 
 RDEPEND="
diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest
index 6342b4dd166c..82ba3320379c 100644
--- a/dev-libs/uriparser/Manifest
+++ b/dev-libs/uriparser/Manifest
@@ -4,5 +4,5 @@ DIST uriparser-0.9.3.tar.bz2 173073 BLAKE2B daf4d4ef2801850b8b4b3622ec195c7bfdc1
 DIST uriparser-0.9.4.tar.bz2 174551 BLAKE2B b95f270685757052fca02fae0a029f08de8bc14bea733bd56e62f0bcdc6592f015453ed38c87171cea9054618328dc94a512ff816519f70594653451f751c4f8 SHA512 c5e671ce2589aacd2c562e66facbee9e1cad3101e840f40b7ebdb917fa669e0c3ae7ed75623692f601655c0b82c10bcfe3086ad628beac8f965e613228e67ecd
 EBUILD uriparser-0.9.1.ebuild 940 BLAKE2B 0c3b4d638419248d19cea2a00f20391019d62761a04feaba8aa644afa7578d555de3ca7f849ed5e8c1732714f8610c0647e824a02772e197f53f3b39092823cd SHA512 277cd3aa28ace11ee9963ef809c364e8faa5680a438d8fea5d13b9288d9b65fd4a879e6bf96cd91be71d91ae789f81101f21bae7eaee4e2a26424770db285398
 EBUILD uriparser-0.9.3.ebuild 1210 BLAKE2B e5de6e838c817756985b67c567328f90bf3bd9a79151db76bd57d4ab09bff0bf620437040c3eeb1b91946e0b34f9b230a22535b4b6bf029ad52c1803aaa884bb SHA512 7b1f78fdd8d432972f5e1b52ffdcc2629b437bf7d826d940f065ba91d8c2a0b65b567af4ae0995a2022e003dfce5ff2e6a976f12a79b4d0d10b8dfb847c01196
-EBUILD uriparser-0.9.4.ebuild 1165 BLAKE2B 153c1c78ef4746c117e1e3b45cbd142495e54beb5ecc0a854e362feba069042c3b06cc706dbaab4446e96c09e158a0d5a277c49dbd80f254af78d5abb411799d SHA512 c790b1de51df93327896c1aace2030400ddfaaa7197892b6fb9f979e6bee404d6cb09f6d54b684264be2b4f38167289a1cda6add6451829fa7603526416df118
+EBUILD uriparser-0.9.4.ebuild 1172 BLAKE2B 8c11815b6e08ddec0f48ee332542efb31bc5a85523690b18a410ac8c469fdb4c8ba33c8383fa4681e4f2ddc1cf3d801eb2edee96acab07dd124f9addac620edd SHA512 cfb4b4d50a803e786c337f51c9108f036fb15d543a1889ea5da2099fb275c4953352d3f363ddb7fa00f6ae092e28dc2dfe52019b74b70dfbbd0dbefdab788aa1
 MISC metadata.xml 542 BLAKE2B ea02a2f11456940eeab83ac904b7b8893c0c41428161f0391eeb9aecbeb51f7d22ec215455837932f0a2b193e937ce41290d5e795ab0cc434b23e13b37dc7146 SHA512 6798e6f833cbbb1ebd80cf04bc5950e5bafd8b689d79211a0a778467b9785b18720918b1822106dadcb96044df2ec8f681c3cda049b1bf3ca1fa072f409dfc45
diff --git a/dev-libs/uriparser/uriparser-0.9.4.ebuild b/dev-libs/uriparser/uriparser-0.9.4.ebuild
index 5625b6f4e915..819ef85e3a7b 100644
--- a/dev-libs/uriparser/uriparser-0.9.4.ebuild
+++ b/dev-libs/uriparser/uriparser-0.9.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc qt5 test unicode"
 
 RDEPEND=""
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index c7c2699eb7c4..aa7fd7a80ce6 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -3,5 +3,5 @@ DIST vala-0.46.7.tar.xz 3402828 BLAKE2B c028875e2c6036a6657244bff62d3a2eec2104c0
 DIST vala-0.48.6.tar.xz 3451004 BLAKE2B 9c880cff885b934e1d82d21285839e040addecb0b3ce81936d5be118a951bd219eea2b8381ea42f13e6e858a1937a3789a3dee6d067735e5ee21eaced38b4646 SHA512 220a916d42cbae3853afdd7c35a72afb446a92fca039d8c660a478fd793686a0c82cbaf90a7c94ae182c1f41eec6df1aedb804013ab38e6e4bcc6d26e40e5375
 EBUILD vala-common-0.46.10.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
 EBUILD vala-common-0.46.7.ebuild 645 BLAKE2B 5a40dd45432a9ba163abe1b2749d1ec4dd46b2dec2f8c343d548a13cffe1a9364f0fc5675944540cd3b5b0dfa03e7660a7c572a81462366416a7227c9b2da18d SHA512 2dd63a63255cb20f3fc7fab488f9ea2a15dcfd20723bfdbe190dac19b2d706cdd388343d39045aaaca06f7b5d148050cf3860eac74a658227ed6191f00304d33
-EBUILD vala-common-0.48.6.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
+EBUILD vala-common-0.48.6.ebuild 649 BLAKE2B 292741f770f51ed1fd594427a0f238f1681eac6605308963725a360b58d000efbef2fa7d0471899fc24e0780801535b1e5b8306afdd95a39aa361666d2d60f7d SHA512 1f23e8b2f37439234335429e25c897b03dc59f3d7a57dc0b8814ccd0a28a8285377e7e2c15833fede26e84fd49e22b6b6a2e4048385c031e5c9b671996c9acf1
 MISC metadata.xml 325 BLAKE2B f1a8eb879889fa0b33809e44ee815a95f07c1d65d1e4fcb3af8797e27f258f76e7774b4a8eba9677a9e6c8a1051fbbe70a0f3675a12f9d52531d361f70826087 SHA512 3be77f30dff008c941c9513d9b8a4c689aba5f2f1005ecdb98f6cf9bc1000f562bad638cddd373f223a5570b40ea83e44656dbf848544a96ce0d166cc46805e2
diff --git a/dev-libs/vala-common/vala-common-0.48.6.ebuild b/dev-libs/vala-common/vala-common-0.48.6.ebuild
index ee55cfcad100..4d6b87b913c1 100644
--- a/dev-libs/vala-common/vala-common-0.48.6.ebuild
+++ b/dev-libs/vala-common/vala-common-0.48.6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-libs/voikko-fi/Manifest b/dev-libs/voikko-fi/Manifest
index 3ef3cc7c6458..59c4b3559745 100644
--- a/dev-libs/voikko-fi/Manifest
+++ b/dev-libs/voikko-fi/Manifest
@@ -1,3 +1,3 @@
 DIST voikko-fi-2.3.tar.gz 694602 BLAKE2B 454afaa76be00645b8640f84c2c91ed0b31be5b46c98d31bba0f4967dce27919eee6a6c452941b3878b498c7f913a413a3d143d658bc38da2a07b32d876ac317 SHA512 b3478cbb6aecebcc25e1c4bce0881a657d664c11190a22c1c2c4ca7e7c62b4c4fd5d396718fbadc8c5ab3c9db5d4349d6cd81440a1394cf4c2f77c52ae608018
-EBUILD voikko-fi-2.3.ebuild 635 BLAKE2B df42cfd58115a7a0111413a0cdffe00647d00278f3f4e340f23141ce98e13df2c67e23aa659492b999ceedc75b75800bced1cb72c4bb33d7d25a0bd4f3acf27d SHA512 da935e783d55c1530586cf2106870291ada9dad586ed2658b2a59aa49eefc74eaaaffc22d2164d8dd95f00a6ad63e8bd734e2c75c8017b8b7015cca2c0a08ef0
+EBUILD voikko-fi-2.3.ebuild 635 BLAKE2B 82f2ed42dded10d4ade28fd967dae5a4c6970d15c548e347eb9c4d2465b9e0fe4d838fe9ac19426374284f2b9b76ccee8aad2f8b986b04322cd42080adbd87dd SHA512 f6d30fe1136fae9d9f18c56481fb5f7e7ea710bb983a4e77fbe206cab07197bcb7e58898f8308bd08e279defe3d14f71f9ddfea50aaf31a0835b2367e0d8fa8a
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/dev-libs/voikko-fi/voikko-fi-2.3.ebuild b/dev-libs/voikko-fi/voikko-fi-2.3.ebuild
index fe39034097df..a03999c04843 100644
--- a/dev-libs/voikko-fi/voikko-fi-2.3.ebuild
+++ b/dev-libs/voikko-fi/voikko-fi-2.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit python-any-r1
 
diff --git a/dev-libs/xxhash/Manifest b/dev-libs/xxhash/Manifest
index 09fdc9d5911d..229b91114178 100644
--- a/dev-libs/xxhash/Manifest
+++ b/dev-libs/xxhash/Manifest
@@ -3,5 +3,5 @@ DIST xxhash-0.7.1.tar.gz 76328 BLAKE2B 8ef64a1a44763417441dbec396d54b5d57ee22505
 DIST xxhash-0.7.3.tar.gz 126405 BLAKE2B 1304251c36a839f5d1b935c0633016222d6b517932d05b84d10ae8a3ee3fccd6cfd31d8e3768f033ca8adcbf2bb9728ffd6c4ccd7a9878ef59d289b49a497656 SHA512 72949010a267f063768241b182464c386005b4078f56902fee2f7804bd01f6c27878a6a4ec2a266cd59162934a7e471264ac5757dba570a97a2b5dad7703c664
 EBUILD xxhash-0.6.5.ebuild 847 BLAKE2B 4b206a9c96a4ea24487de943816c5667bd214fd0d857b6ae462d717b5d7543ab659168a61e1462c05b8d183a9277deaa9fa87c09857c07bae5a8c58e445323d9 SHA512 e8ad2fdc3669a693fd28fb3bfb0b5819bde5999e93daf34c8f0bf7eed0b375aec5f0224701d76fd4a7e0618e6c3e912f758d3beba9b702d71cd532100fe54d09
 EBUILD xxhash-0.7.1.ebuild 910 BLAKE2B 118856484115ecbd1b58396eb002359d7432528e53e22101a28d9f5c0b6873236eb30bbed6a6c30cb906fb2afd75539b23a0a0938c9d0722326d7d7bd4aca21d SHA512 220a7992f183bf059dc2346a9afc5b28ca2424086f59ecf76b58c8b725d4dd4df9752c0859de299ba4bf4479d96fd6fd1590636833e4169607b30f92dc4769eb
-EBUILD xxhash-0.7.3.ebuild 910 BLAKE2B 118856484115ecbd1b58396eb002359d7432528e53e22101a28d9f5c0b6873236eb30bbed6a6c30cb906fb2afd75539b23a0a0938c9d0722326d7d7bd4aca21d SHA512 220a7992f183bf059dc2346a9afc5b28ca2424086f59ecf76b58c8b725d4dd4df9752c0859de299ba4bf4479d96fd6fd1590636833e4169607b30f92dc4769eb
+EBUILD xxhash-0.7.3.ebuild 917 BLAKE2B 21a173f201fe946d152b2b9dc3b7f8cd0c8e1c73be3814919bc936ebed692ac37f106da8c4bcb245df9dbb6e603b1ae44bc86e12d37c4a0761c705709430714f SHA512 f0dd7cca98528af60bd36b5cad069f19321458fa694f99c266604fc787dea10a1f6a7fa4b549fc028ae553452559bafda88ce574dac48783537065bb4b47a8fc
 MISC metadata.xml 392 BLAKE2B 6a06ef26d04abe71ca14dda2435abf49b8f1adffbca5b0af6947b73e48bb6696b216bc6da4b5cdcf9eb61ead18154af6e51679b1be350d063eaccad5a5c86303 SHA512 96be044c0faa5d67ebe60b1d1c11ce876ad3e031d605846d6623a51cf0f57615db3855dda4ff129190bc12b137c9c05395464efb150ad57da4804b852ee6802e
diff --git a/dev-libs/xxhash/xxhash-0.7.3.ebuild b/dev-libs/xxhash/xxhash-0.7.3.ebuild
index 8973996851d3..baba81c88143 100644
--- a/dev-libs/xxhash/xxhash-0.7.3.ebuild
+++ b/dev-libs/xxhash/xxhash-0.7.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD-2 GPL-2+"
 # https://abi-laboratory.pro/tracker/timeline/xxhash
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="static-libs"
 
 S="${WORKDIR}/xxHash-${PV}"
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index 7dbcbbbff3be..2f795b93b4c4 100644
--- a/dev-lisp/Manifest.gz
+++ b/dev-lisp/Manifest.gz
diff --git a/dev-lisp/c2ffi/Manifest b/dev-lisp/c2ffi/Manifest
index 650f9859e4b4..ed09896cb586 100644
--- a/dev-lisp/c2ffi/Manifest
+++ b/dev-lisp/c2ffi/Manifest
@@ -1,5 +1,5 @@
-AUX c2ffi-9.0.0.20191017-fix-lib-location.patch 1382 BLAKE2B 93f11c43da622cf4bf9e5ee495117ff8613720af543bbfe9ff2e70b4893f86c26aaa5880c8cdba1ee283b3a7e81a5584218427129dce1debd9a58879f56d65e6 SHA512 21556242a0efdbf7bad98ac624ae5854aa7527cfa00a6ccb7cae4af08d2ead7328aa637bdfb8d3637d133b7de2d6110e6096d7766010f039b017d63b7994f46d
-DIST c2ffi-9.0.0.20191017.tar.gz 35139 BLAKE2B a080f2cf7743aab630365fd305c106ada0318afb24093508c7667d8d702ec8dfd95a0ea9f54233a3a4b4c9b411e2f4aba5dacf7b2f35f1545b7ca63e765a7e55 SHA512 7a4743d89f431fd9ca42808358bdde03bbd85fc56f3350fddc94532c524ce373989671e706fadeb03eb240a81fb3f418176169acbf3ccd0f0f0c595d0f697832
-EBUILD c2ffi-9.0.0.20191017.ebuild 605 BLAKE2B 467dfc5ab92699dd228aaa9a7f2f118ebcc968b7a6711407f311bede71b805d666e5d8881ddfe598751947c3b17d57ae321a20312fd58cac1d0faf2874dc7dcf SHA512 df33a7090a6da973113c0fd62067e102ed87b1deea3cd7098cce682cb92352b784531c88f6f83bfacd5cc5b5ff505da0e46a43f586bf215d96682d9935c0958d
-EBUILD c2ffi-9.0.0.9999.ebuild 497 BLAKE2B 7d4c7980e3cb1ccf4e7d27d6d83d6254eeef90053928c7016a1f48d2378c310bebef9ae1fd2f745f8bef27f370811150e326abe3f2d62e7ae5bd4398a69ff5ee SHA512 8ad098a2cb9714875358712e13f5ff41a5b9f57e295793d7148c17340feafad9ec3bd8725fd7d833a29d809126b50382f8756369ce1414e249d93074d3c8ef8a
+AUX c2ffi-10.0.0.20200527-add-target-link-directories.patch 394 BLAKE2B afc5089d594af74d9bf2707d22c120d17bc6a195756bdc89773369a29a3e727e96806392b7620dc9df60bb34546f60f2db1b0be2cb6a70577c69ccad52092918 SHA512 ad72f333e96947aa0ad660ccf683d64d17e377446001a7403cf1ab2ca7a9c05aaa5b28303ad616fb9b7e77044b5a971374c695220cc731b078ccc5198eb0c192
+DIST c2ffi-10.0.0.20200527.tar.gz 37554 BLAKE2B b1ebef370083d08513d0f02f8662ba1b090cba991864530c2304ac45e5c74d092f47e9d75a0646ae2f045d346585f371243d8a82bc37fe35f36dee1a75c0812b SHA512 452f2e8d3c81207e74334bc48dcea9bdf2770b4c77884c96abffc69ede20cc770183f363655ae853cddaee95d0512571426c6737d5db0324f7ceebbdf554cdf3
+EBUILD c2ffi-10.0.0.20200527.ebuild 619 BLAKE2B bce4f254a1ddc03e6e9b6ed46ee92d4cfadd817b2a5bc02ba5bb02cbcb21e7589ffcde6b859450a25399510b5104da97c751e741abf8fe8aba367b90ac87b5b7 SHA512 d25fe8a16b5ca4d595ef8e4db172e0562528a916d7cb542b10c45a4ea43006b0538e4e2a9b459c015fccac5c5a4fec2e97e7cbdea1cd55466ec1ac5a864003d2
+EBUILD c2ffi-10.0.0.9999.ebuild 512 BLAKE2B e95327514927fe23a58f75b9ff9e059f7b6db22d2507199ee53d465e5798e7063f2ecf873903ba38a7e4f72e557909be2dd924120898341042a38f72be8bf134 SHA512 681682bba4cc805e03a1e7fd24eedb75ce59c46b43392f9ca7583edf230375bd56967d69fd4faa17459fd354c0aa744fe7d4083c1c733df1066d5b1c8bd66670
 MISC metadata.xml 421 BLAKE2B 2df9693805f6968df30c8df0dbb1578c11b064b5f3b23f96321832c7551dbc751ebaeb81845147a7526f891b658aaaff8efeea185b239576e2885d3606944e87 SHA512 7bf517258ecbdf98192c055c451fe16315b34ac8875528b0fac4e844c15f2a4656d2252a88bbb642b54bc608a21d83af158cb5e6872b46e70d7c32f557b83de1
diff --git a/dev-lisp/c2ffi/c2ffi-10.0.0.20200527.ebuild b/dev-lisp/c2ffi/c2ffi-10.0.0.20200527.ebuild
new file mode 100644
index 000000000000..56aaeae61858
--- /dev/null
+++ b/dev-lisp/c2ffi/c2ffi-10.0.0.20200527.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake llvm
+
+MY_COMMIT="a2d1f667b707fb413fc8ab2413446f15cb23de51"
+
+DESCRIPTION="Clang-based FFI wrapper generator for Common Lisp"
+HOMEPAGE="https://github.com/rpav/c2ffi"
+SRC_URI="https://github.com/rpav/c2ffi/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="sys-devel/clang:10=
+	sys-devel/llvm:10=
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/c2ffi-${MY_COMMIT}"
+
+PATCHES=( "${FILESDIR}"/${PN}-10.0.0.20200527-add-target-link-directories.patch )
diff --git a/dev-lisp/c2ffi/c2ffi-10.0.0.9999.ebuild b/dev-lisp/c2ffi/c2ffi-10.0.0.9999.ebuild
new file mode 100644
index 000000000000..dac9e0eb3d31
--- /dev/null
+++ b/dev-lisp/c2ffi/c2ffi-10.0.0.9999.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake git-r3 llvm
+
+DESCRIPTION="Clang-based FFI wrapper generator for Common Lisp"
+HOMEPAGE="https://github.com/rpav/c2ffi"
+EGIT_REPO_URI="https://github.com/rpav/c2ffi.git"
+EGIT_BRANCH="llvm-10.0.0"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+DEPEND="sys-devel/clang:10=
+	sys-devel/llvm:10=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-10.0.0.20200527-add-target-link-directories.patch )
diff --git a/dev-lisp/c2ffi/c2ffi-9.0.0.20191017.ebuild b/dev-lisp/c2ffi/c2ffi-9.0.0.20191017.ebuild
deleted file mode 100644
index 53c06c021779..000000000000
--- a/dev-lisp/c2ffi/c2ffi-9.0.0.20191017.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake llvm
-
-MY_COMMIT="15fda06de0bad97bf91f5590f7f24623eab2f580"
-
-DESCRIPTION="Clang-based FFI wrapper generator for Common Lisp"
-HOMEPAGE="https://github.com/rpav/c2ffi"
-SRC_URI="https://github.com/rpav/c2ffi/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="sys-devel/clang:9=
-	sys-devel/llvm:9=
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/c2ffi-${MY_COMMIT}"
-
-PATCHES=( "${FILESDIR}"/${PN}-9.0.0.20191017-fix-lib-location.patch )
diff --git a/dev-lisp/c2ffi/c2ffi-9.0.0.9999.ebuild b/dev-lisp/c2ffi/c2ffi-9.0.0.9999.ebuild
deleted file mode 100644
index 6a2256dee41f..000000000000
--- a/dev-lisp/c2ffi/c2ffi-9.0.0.9999.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake git-r3 llvm
-
-DESCRIPTION="Clang-based FFI wrapper generator for Common Lisp"
-HOMEPAGE="https://github.com/rpav/c2ffi"
-EGIT_REPO_URI="https://github.com/rpav/c2ffi.git"
-EGIT_BRANCH="llvm-9.0.0"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-DEPEND="sys-devel/clang:9=
-	sys-devel/llvm:9=
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-9.0.0.20191017-fix-lib-location.patch )
diff --git a/dev-lisp/c2ffi/files/c2ffi-10.0.0.20200527-add-target-link-directories.patch b/dev-lisp/c2ffi/files/c2ffi-10.0.0.20200527-add-target-link-directories.patch
new file mode 100644
index 000000000000..2dc4a82413b2
--- /dev/null
+++ b/dev-lisp/c2ffi/files/c2ffi-10.0.0.20200527-add-target-link-directories.patch
@@ -0,0 +1,11 @@
+diff -Naur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2020-06-05 00:21:43.509980270 +0200
++++ b/CMakeLists.txt	2020-06-05 00:22:08.679979968 +0200
+@@ -36,6 +36,7 @@
+   ${LLVM_INCLUDE_DIRS}
+   ${SOURCE_ROOT}/src/include
+   )
++target_link_directories(c2ffi PUBLIC ${LLVM_LIBRARY_DIRS})
+ target_link_libraries(c2ffi PUBLIC clang-cpp LLVM)
+ 
+ set(APP_BIN_DIR "${CMAKE_BINARY_DIR}/bin")
diff --git a/dev-lisp/c2ffi/files/c2ffi-9.0.0.20191017-fix-lib-location.patch b/dev-lisp/c2ffi/files/c2ffi-9.0.0.20191017-fix-lib-location.patch
deleted file mode 100644
index 8b09b25aa739..000000000000
--- a/dev-lisp/c2ffi/files/c2ffi-9.0.0.20191017-fix-lib-location.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 3a496f89064de85af04ce101918c2ec5cebf7846 Mon Sep 17 00:00:00 2001
-From: Harald Judt <h.judt@gmx.at>
-Date: Fri, 8 Nov 2019 10:35:02 +0100
-Subject: Fix CLANG and LLVM libraries not found
-
-This commit gets the build working again here on Gentoo.
-
-Adding LLVM_LIBRARY_DIRS fixes the CLANG libs not found error.
-
-Adding llvm_map_components_to_libnames fixes LLMV not found error.
----
- CMakeLists.txt | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 99dbe4b..f93b9b3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -39,6 +39,15 @@ target_include_directories(c2ffi PUBLIC
-   ${LLVM_INCLUDE_DIRS}
-   ${SOURCE_ROOT}/src/include
-   )
-+target_link_directories(c2ffi PUBLIC
-+  ${LLVM_LIBRARY_DIRS}
-+)
-+message(STATUS "LLVM_LIBRARY_DIRS=${LLVM_LIBRARY_DIRS}")
-+
-+llvm_map_components_to_libnames(llvm_libs core support mcparser bitreader profiledata)
-+
-+message(STATUS "llvm_libs=${llvm_libs}")
-+
- target_link_libraries(c2ffi PUBLIC
-   clangFrontendTool
-   clangFrontend
-@@ -64,10 +73,9 @@ target_link_libraries(c2ffi PUBLIC
-   clangIndex
-   clangToolingCore
-   clangTooling
-+  ${llvm_libs}
-   )
- 
--llvm_config(c2ffi USE_SHARED core support mcparser bitreader profiledata)
--
- set(APP_BIN_DIR "${CMAKE_BINARY_DIR}/bin")
- set_target_properties(c2ffi PROPERTIES
-   RUNTIME_OUTPUT_DIRECTORY "${APP_BIN_DIR}"
--- 
-2.23.0
-
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 7a96835f454d..1dc5f1e19ba4 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/lua-openssl/Manifest b/dev-lua/lua-openssl/Manifest
index bb4300e7a28f..8be0567ffa2f 100644
--- a/dev-lua/lua-openssl/Manifest
+++ b/dev-lua/lua-openssl/Manifest
@@ -1,4 +1,3 @@
-AUX 0001-fix-libressl-compat.patch 14675 BLAKE2B a90784a7925c5f3eca792d54e60f6b2d56e983f6f72c3a43cc9092242a6f7dac59c33e558d854600a107075c07b412e517ddfd45b902d426f4ec7d7ffafb2d0e SHA512 ebd92ba95304883950719a56466c2abc230b5d77fbf9c58925e52e840089517b5f2c745b27b327ff4fa81b5b3e8908d4cebbafdbf6ba641c2b0fc866f278f966
 DIST lua-openssl-0.7.8_p0.tar.gz 397072 BLAKE2B 048ae34c195f6f0ff252f33d14a7151b629d5b9ba828c331459e58f23f0ee62e66f00b8fdbe5665eb7f247d4bb97986e158ea89107189aba4199fcb878f2d724 SHA512 a23b5010633aec70639903fe4d0473101e42c2690456ff2d730c45ef4710134058bc6b3e364c79d3cf3dd4c323a89bd98f07a17d23f226b0bb7e0bb1f2be32c5
 DIST lua-openssl-aux-b56f6937096acea34ddf241ec7ea08ac52414d18.tar.gz 3684 BLAKE2B 78e92c6cc1c2a29b00a9179db71a9404aff40a0e844f2f092b7868bbf98b6f3fa9519c63a2c38304ce2928b007bd4c015c5afa66ca32b1646035ebb949b3c655 SHA512 ba1eaf7c6b58fde48f47146d6c773368484ea10a229d6a45f317bda8d8cc21829ceda68071685f1b071e150936362b934b90532344ebb266febcc0efa45904f4
 DIST lua-openssl-compat-a1735f6e6bd17588fcaf98720f0548c4caa23b34.tar.gz 51950 BLAKE2B 16dbf5eb444393f093a5f2cc0fa2a8b394a8b2d62ca36882d02202304a2906b4e2bb87814c1ca198e4b77a9bc27d85627da75244ce9c68c3fd1e06e9262fa970 SHA512 2a8e1d3bb6475225f311995f70417c0620c5efa7384400b2002166daa6fc1baedb32f492dc65cc5b92bf63e850c293a36c1f8aed6e7cf0985e582aa0e52141a8
diff --git a/dev-lua/lua-openssl/files/0001-fix-libressl-compat.patch b/dev-lua/lua-openssl/files/0001-fix-libressl-compat.patch
deleted file mode 100644
index 19b0539c0820..000000000000
--- a/dev-lua/lua-openssl/files/0001-fix-libressl-compat.patch
+++ /dev/null
@@ -1,433 +0,0 @@
-From 44d5360d0caed1f4f364691f789fe825fcd17a3e Mon Sep 17 00:00:00 2001
-From: crito <crito@fnordpipe.org>
-Date: Mon, 1 Oct 2018 20:10:05 +0200
-Subject: [PATCH] fix libressl compat
-
-add conditions to build with libressl and add missing functions.
-backported from upstream repo.
----
- src/compat.c  | 11 ++++++++---
- src/digest.c  |  2 +-
- src/ec.c      |  2 +-
- src/engine.c  | 10 +++++-----
- src/lhash.c   |  7 ++++---
- src/openssl.c | 12 ++++++++++--
- src/ots.c     |  5 +++++
- src/pkcs7.c   | 24 ++++++++++++------------
- src/private.h |  7 ++++---
- src/sm2.c     |  2 +-
- src/srp.c     |  3 ++-
- src/x509.c    |  2 +-
- 12 files changed, 54 insertions(+), 33 deletions(-)
-
-diff --git a/src/compat.c b/src/compat.c
-index cc4cc21..cc45845 100644
---- a/src/compat.c
-+++ b/src/compat.c
-@@ -5,7 +5,7 @@
- #include "openssl.h"
- #include "private.h"
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- int BIO_up_ref(BIO *b)
- {
-   CRYPTO_add(&b->references, 1, CRYPTO_LOCK_BIO);
-@@ -16,6 +16,11 @@ int X509_up_ref(X509 *x)
-   CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
-   return 1;
- }
-+int X509_CRL_up_ref(X509_CRL *x)
-+{
-+  int refs = CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509_CRL);
-+  return (refs > 1) ? 1 : 0;
-+}
- int X509_STORE_up_ref(X509_STORE *s)
- {
-   CRYPTO_add(&s->references, 1, CRYPTO_LOCK_X509_STORE);
-@@ -464,7 +469,7 @@ const ASN1_BIT_STRING *TS_STATUS_INFO_get0_failure_info(const TS_STATUS_INFO *a)
-   return a->failure_info;
- }
- 
--#if OPENSSL_VERSION_NUMBER < 0x10002000L
-+#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
- int i2d_re_X509_tbs(X509 *x, unsigned char **pp)
- {
-   x->cert_info->enc.modified = 1;
-@@ -527,4 +532,4 @@ unsigned char *TS_VERIFY_CTX_set_imprint(TS_VERIFY_CTX *ctx,
-   return ctx->imprint;
- }
- 
--#endif /* < 1.1.0 */
-\ No newline at end of file
-+#endif /* < 1.1.0 */
-diff --git a/src/digest.c b/src/digest.c
-index 02e8fe1..0dcf65b 100644
---- a/src/digest.c
-+++ b/src/digest.c
-@@ -468,7 +468,7 @@ restore md data
- static LUA_FUNCTION(openssl_digest_ctx_data)
- {
-   EVP_MD_CTX *ctx = CHECK_OBJECT(1, EVP_MD_CTX, "openssl.evp_digest_ctx");
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   if (lua_isnone(L, 2))
-   {
-     lua_pushlstring(L, ctx->md_data, ctx->digest->ctx_size);
-diff --git a/src/ec.c b/src/ec.c
-index f0d2b6b..5db32db 100644
---- a/src/ec.c
-+++ b/src/ec.c
-@@ -611,7 +611,7 @@ static int openssl_ecdsa_set_method(lua_State *L)
- {
-   EC_KEY *ec = CHECK_OBJECT(1, EC_KEY, "openssl.ec_key");
-   ENGINE *e = CHECK_OBJECT(2, ENGINE, "openssl.engine");
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   const ECDSA_METHOD *m = ENGINE_get_ECDSA(e);
-   if (m) {
-     int r = ECDSA_set_method(ec, m);
-diff --git a/src/engine.c b/src/engine.c
-index 1a26d8b..f12ca53 100644
---- a/src/engine.c
-+++ b/src/engine.c
-@@ -14,7 +14,7 @@ enum
- {
-   TYPE_RSA,
-   TYPE_DSA,
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   TYPE_ECDH,
-   TYPE_ECDSA,
- #else
-@@ -24,7 +24,7 @@ enum
-   TYPE_RAND,
-   TYPE_CIPHERS,
-   TYPE_DIGESTS,
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   TYPE_STORE,
- #else
-   TYPE_PKEY_METHODS,
-@@ -150,7 +150,7 @@ static int openssl_engine_register(lua_State*L)
-       else
-         ENGINE_register_DSA(eng);
-       break;
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     case TYPE_ECDH:
-       if (unregister)
-         ENGINE_unregister_ECDH(eng);
-@@ -183,7 +183,7 @@ static int openssl_engine_register(lua_State*L)
-       else
-         ENGINE_register_RAND(eng);
-       break;
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     case TYPE_STORE:
-       if (unregister)
-         ENGINE_unregister_STORE(eng);
-@@ -392,7 +392,7 @@ static int openssl_engine_set_default(lua_State*L)
-     case TYPE_DSA:
-       ret = ENGINE_set_default_DSA(eng);
-       break;
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     case TYPE_ECDH:
-       ret = ENGINE_set_default_ECDH(eng);
-       break;
-diff --git a/src/lhash.c b/src/lhash.c
-index 564bb52..8057efb 100644
---- a/src/lhash.c
-+++ b/src/lhash.c
-@@ -130,21 +130,22 @@ static void dump_value_doall_arg(CONF_VALUE *a, lua_State *L)
-   }
- }
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- IMPLEMENT_LHASH_DOALL_ARG_CONST(CONF_VALUE, lua_State);
- #elif OPENSSL_VERSION_NUMBER >= 0x10000002L
- static IMPLEMENT_LHASH_DOALL_ARG_FN(dump_value, CONF_VALUE, lua_State)
- #endif
-+#if !defined(LIBRESSL_VERSION_NUMBER)
- #define LHM_lh_doall_arg(type, lh, fn, arg_type, arg) \
-   lh_doall_arg(CHECKED_LHASH_OF(type, lh), fn, CHECKED_PTR_OF(arg_type, arg))
--
-+#endif
- 
- static LUA_FUNCTION(openssl_lhash_parse)
- {
-   LHASH* lhash = CHECK_OBJECT(1, LHASH, "openssl.lhash");
- 
-   lua_newtable(L);
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-   lh_CONF_VALUE_doall_lua_State(lhash, dump_value_doall_arg, L);
- #elif OPENSSL_VERSION_NUMBER >= 0x10000002L
-   lh_CONF_VALUE_doall_arg(lhash, LHASH_DOALL_ARG_FN(dump_value), lua_State, L);
-diff --git a/src/openssl.c b/src/openssl.c
-index 994c22b..debea63 100644
---- a/src/openssl.c
-+++ b/src/openssl.c
-@@ -338,6 +338,9 @@ get FIPS mode
- */
- static int openssl_fips_mode(lua_State *L)
- {
-+#if defined(LIBRESSL_VERSION_NUMBER)
-+  return 0;
-+#else
-   int ret =0, on = 0;
-   if(lua_isnone(L, 1))
-   {
-@@ -353,6 +356,7 @@ static int openssl_fips_mode(lua_State *L)
-   else
-     ret = openssl_pushresult(L, ret);
-   return ret;
-+#endif
- }
- 
- #ifndef OPENSSL_NO_CRYPTO_MDEBUG
-@@ -405,7 +409,9 @@ void CRYPTO_thread_cleanup(void);
- 
- static int luaclose_openssl(lua_State *L)
- {
-+#if !defined(LIBRESSL_VERSION_NUMBER)
-   FIPS_mode_set(0);
-+#endif
- #if defined(OPENSSL_THREADS)
-   CRYPTO_thread_cleanup();
- #endif
-@@ -421,7 +427,7 @@ static int luaclose_openssl(lua_State *L)
-   CRYPTO_cleanup_all_ex_data();
- #ifndef OPENSSL_NO_CRYPTO_MDEBUG
- #if !(defined(OPENSSL_NO_STDIO) || defined(OPENSSL_NO_FP_API))
--#if OPENSSL_VERSION_NUMBER < 0x10101000L
-+#if OPENSSL_VERSION_NUMBER < 0x10101000L || defined(LIBRESSL_VERSION_NUMBER)
-   CRYPTO_mem_leaks_fp(stderr);
- #else
-   if(CRYPTO_mem_leaks_fp(stderr)!=1)
-@@ -541,13 +547,15 @@ LUALIB_API int luaopen_openssl(lua_State*L)
-   luaopen_dh(L);
-   lua_setfield(L, -2, "dh");
- 
--#if (OPENSSL_VERSION_NUMBER >= 0x10101007L) && !defined(OPENSSL_NO_SM2)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10101007L) && !defined(OPENSSL_NO_SM2) && !defined(LIBRESSL_VERSION_NUMBER)
-   luaopen_sm2(L);
-   lua_setfield(L, -2, "sm2");
- #endif
- 
-+#if !defined(LIBRESSL_VERSION_NUMBER)
-   luaopen_srp(L);
-   lua_setfield(L, -2, "srp");
-+#endif
- 
- #ifdef ENABLE_OPENSSL_GLOBAL
-   lua_pushvalue(L, -1);
-diff --git a/src/ots.c b/src/ots.c
-index 6b75946..762d17e 100644
---- a/src/ots.c
-+++ b/src/ots.c
-@@ -1265,7 +1265,12 @@ static LUA_FUNCTION(openssl_ts_resp_ctx_set_time_cb)
-   arg->cb_arg = luaL_ref(L, LUA_REGISTRYINDEX);
- 
-   openssl_valueset(L, ctx, time_cb_key);
-+#if defined(LIBRESSL_VERSION_NUMBER)
-+  ctx->time_cb = openssl_time_cb;
-+  ctx->time_cb_data = L;
-+#else
-   TS_RESP_CTX_set_time_cb(ctx, openssl_time_cb, L);
-+#endif
-   return 0;
- }
- 
-diff --git a/src/pkcs7.c b/src/pkcs7.c
-index f043c86..f0e5221 100644
---- a/src/pkcs7.c
-+++ b/src/pkcs7.c
-@@ -346,7 +346,7 @@ static int openssl_pkcs7_dataFinal(PKCS7 *p7, BIO *bio)
-     os = p7->d.signed_and_enveloped->enc_data->enc_data;
-     if (!os)
-     {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-       os = M_ASN1_OCTET_STRING_new();
- #else
-       os = ASN1_OCTET_STRING_new();
-@@ -364,7 +364,7 @@ static int openssl_pkcs7_dataFinal(PKCS7 *p7, BIO *bio)
-     os = p7->d.enveloped->enc_data->enc_data;
-     if (!os)
-     {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-       os = M_ASN1_OCTET_STRING_new();
- #else
-       os = ASN1_OCTET_STRING_new();
-@@ -383,7 +383,7 @@ static int openssl_pkcs7_dataFinal(PKCS7 *p7, BIO *bio)
-     /* If detached data then the content is excluded */
-     if (PKCS7_type_is_data(p7->d.sign->contents) && p7->detached)
-     {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-       M_ASN1_OCTET_STRING_free(os);
- #else
-       ASN1_OCTET_STRING_free(os);
-@@ -398,7 +398,7 @@ static int openssl_pkcs7_dataFinal(PKCS7 *p7, BIO *bio)
-     /* If detached data then the content is excluded */
-     if (PKCS7_type_is_data(p7->d.digest->contents) && p7->detached)
-     {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-       M_ASN1_OCTET_STRING_free(os);
- #else
-       ASN1_OCTET_STRING_free(os);
-@@ -474,7 +474,7 @@ static int openssl_pkcs7_dataFinal(PKCS7 *p7, BIO *bio)
-       goto err;
-     if (!EVP_DigestFinal_ex(mdc, md_data, &md_len))
-       goto err;
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     M_ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data, md_len);
- #else
-     ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data, md_len);
-@@ -577,7 +577,7 @@ int PKCS7_signatureVerify_digest(PKCS7 *p7, PKCS7_SIGNER_INFO *si, X509 *x509,
- 
-   md_type = OBJ_obj2nid(si->digest_alg->algorithm);
-   md = EVP_get_digestbynid(md_type);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   if (!md || !data || (hash && len != (size_t) md->ctx_size) )
-     goto err;
- 
-@@ -1137,7 +1137,7 @@ static LUA_FUNCTION(openssl_pkcs7_sign_digest)
-     os = p7->d.signed_and_enveloped->enc_data->enc_data;
-     if (!os)
-     {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-       os = M_ASN1_OCTET_STRING_new();
- #else
-       os = ASN1_OCTET_STRING_new();
-@@ -1155,7 +1155,7 @@ static LUA_FUNCTION(openssl_pkcs7_sign_digest)
-     os = p7->d.enveloped->enc_data->enc_data;
-     if (!os)
-     {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-       os = M_ASN1_OCTET_STRING_new();
- #else
-       os = ASN1_OCTET_STRING_new();
-@@ -1174,7 +1174,7 @@ static LUA_FUNCTION(openssl_pkcs7_sign_digest)
-     /* If detached data then the content is excluded */
-     if (PKCS7_type_is_data(p7->d.sign->contents) && p7->detached)
-     {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-       M_ASN1_OCTET_STRING_free(os);
- #else
-       ASN1_OCTET_STRING_free(os);
-@@ -1189,7 +1189,7 @@ static LUA_FUNCTION(openssl_pkcs7_sign_digest)
-     /* If detached data then the content is excluded */
-     if (PKCS7_type_is_data(p7->d.digest->contents) && p7->detached)
-     {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-       M_ASN1_OCTET_STRING_free(os);
- #else
-       ASN1_OCTET_STRING_free(os);
-@@ -1217,7 +1217,7 @@ static LUA_FUNCTION(openssl_pkcs7_sign_digest)
- 
-       if (hash)
-       {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-         if (l == (size_t) mdc->digest->ctx_size)
-         {
-           memcpy(mdc->md_data, data, l);
-@@ -1272,7 +1272,7 @@ static LUA_FUNCTION(openssl_pkcs7_sign_digest)
-     unsigned int md_len;
-     md = EVP_get_digestbynid(OBJ_obj2nid(p7->d.digest->md->algorithm));
-     EVP_DigestInit_ex(mdc, md, NULL);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     if (l == (size_t) mdc->digest->ctx_size)
-     {
-       memcpy(mdc->md_data, data, l);
-diff --git a/src/private.h b/src/private.h
-index 8e9d5b8..7140cae 100644
---- a/src/private.h
-+++ b/src/private.h
-@@ -46,9 +46,10 @@ extern "C" {
-   luaL_getmetatable(L,"openssl.bn");                    \
-   lua_setmetatable(L,-2)
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- int BIO_up_ref(BIO *b);
- int X509_up_ref(X509 *x);
-+int X509_CRL_up_ref(X509_CRL *x);
- int X509_STORE_up_ref(X509_STORE *s);
- int EVP_PKEY_up_ref(EVP_PKEY *pkey);
- 
-@@ -124,12 +125,12 @@ STACK_OF(X509) *TS_VERIFY_CTS_set_certs(TS_VERIFY_CTX *ctx,
- unsigned char *TS_VERIFY_CTX_set_imprint(TS_VERIFY_CTX *ctx,
-     unsigned char *hexstr, long len);
- 
--#if OPENSSL_VERSION_NUMBER < 0x10002000L
-+#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
- int i2d_re_X509_tbs(X509 *x, unsigned char **pp);
-+#endif
- void X509_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg,
-                          const X509 *x);
- int X509_get_signature_nid(const X509 *x);
--#endif
- 
- #endif
- 
-diff --git a/src/sm2.c b/src/sm2.c
-index 0655888..1db3198 100644
---- a/src/sm2.c
-+++ b/src/sm2.c
-@@ -1,7 +1,7 @@
- #include "openssl.h"
- #include "private.h"
- 
--#if (OPENSSL_VERSION_NUMBER >= 0x10101007L) && !defined(OPENSSL_NO_SM2)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10101007L) && !defined(OPENSSL_NO_SM2) && !defined(LIBRESSL_VERSION_NUMBER)
- 
- #  include <openssl/sm2.h>
- 
-diff --git a/src/srp.c b/src/srp.c
-index 85626b5..6fb0a50 100644
---- a/src/srp.c
-+++ b/src/srp.c
-@@ -1,6 +1,7 @@
- #include "openssl.h"
- #include "private.h"
- 
-+#if !defined(LIBRESSL_VERSION_NUMBER)
- #include <openssl/srp.h>
- #include <openssl/bn.h>
- 
-@@ -198,4 +199,4 @@ int luaopen_srp(lua_State *L)
-   lua_settable(L, -3);
-   return 1;
- }
--
-+#endif
-diff --git a/src/x509.c b/src/x509.c
-index 94e9982..07adb54 100644
---- a/src/x509.c
-+++ b/src/x509.c
-@@ -1196,7 +1196,7 @@ static int openssl_x509_extensions(lua_State* L)
-   else
-   {
-     STACK_OF(X509_EXTENSION) *others = (STACK_OF(X509_EXTENSION) *)openssl_sk_x509_extension_fromtable(L, 2);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     sk_X509_EXTENSION_pop_free(self->cert_info->extensions, X509_EXTENSION_free);
-     self->cert_info->extensions = others;
- #else
--- 
-2.16.4
-
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 102cb4e1404b..e2a202697e78 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest
index 999bb389c3ea..9c2d4396c95d 100644
--- a/dev-ml/lablgtk/Manifest
+++ b/dev-ml/lablgtk/Manifest
@@ -2,7 +2,7 @@ AUX lablgtk-2.18.10-cflags.patch 2852 BLAKE2B 9460dc7e50572f006eca3858b485d99b39
 DIST lablgtk-2.18.10.tar.gz 1068504 BLAKE2B 8f82cd8b31c136420bfbbeaf78ec2d7913b7c5fc16abd485c508f8de3ab587173b0b5c798cdbe851254b48754929c1f0063cfc9e3c5e0663b7cdebc380ec0e8a SHA512 73705aaa80db433d11a28df5f6f5d10bd282e477e90916152a87e71865ccfcd7dfbdbe77350ecadf61ba2ccc7a188de1c68f1e6385e20c75f167969001e8418d
 DIST lablgtk-2.18.5.tar.gz 808005 BLAKE2B 279fd9f018948438b616a12ab60fca3019330504a79d8b76c58fa0a99a7b36df9bf78f57f0e60c4eea6f0bad60f94c06b26490518ec25a5a72c342e4b7c42501 SHA512 7b6ba1a4dfa82cc3bbc502082ff4fccc23cc06ee4f30d01a2e423f3f99e945a4befe450d230b5aa19c5b810e9f46f2838655099d49da2db7c8a2e52eac213024
 DIST lablgtk-2.18.8.tar.gz 855263 BLAKE2B 92aeadcfac666756e50ea573c7a2119cc13eab5c2f2e033fcdf92d5c33d597d64bf2e860ff181d958b4d8e9a3d4002b3eaabbd1da7580444fee91dafaba26289 SHA512 1510b8886dd55b82fbc96f333d84779f51a4794d13b0934569d13b1975ded9ec684855b9856f636fb302fd8ff2f118d0d5f3ffb2b8086d22cdad442e963868ae
-EBUILD lablgtk-2.18.10.ebuild 1968 BLAKE2B 3b337ec377bf85ca60cb18197b5d702f3942056e45dd3ed5d8ea4b6dda727b4418fb5e6a759235955b8b31f86aab39cbac72705a9366a428bec1c281d4e9e50c SHA512 fcc1dd98df79f3416e0641a3a4f8cda052172822802fd41461dc6701c1e83f6a6b56ef289676c6fe41df2eb99667cf462ab10ba04cb1be3e761f064ae54c1c23
+EBUILD lablgtk-2.18.10.ebuild 1967 BLAKE2B 3676617c6432f73e7963e17d237dc0bfb1777f39837d9d8b9e2e6c0ad15325ed71d752c56ca3190b0b83c23012b41acd8b09c12837311835e9b8b105213f0135 SHA512 9efee6210973f352c5a2a9ac58a0ace0b550b6c6149bae88245b076716ffe1eb01f81ae907984058ebe16ae0059865127f7ef820c0c91a7fd5d4c28452330d0a
 EBUILD lablgtk-2.18.5.ebuild 2327 BLAKE2B debd856df94beb8f43f803b38f3a07c9b30e2636152be3af9e39defb3a78551c08e748e2096c4014ee22046a7cb121650271caee10ed6db7119bb140b5db7300 SHA512 e2b0225484f28971d02c02dde960095a60a0ef2db2b25263ad678a3f7a33473bdeafd96e100d671a11da5fe331d0c69f092fc23d64ffcf07e0d1d2ddfe60b268
 EBUILD lablgtk-2.18.8-r1.ebuild 1717 BLAKE2B 0f951f152a005cbe10ba78e829215087f3d32f27fcddba88af0ab943f23e30d053f3fbd364900f689aacce7896800a31731c87489109b6612b1eacb8fe802036 SHA512 db05d897d25054b497a16a531e7d13fb19de2e5f74aa3faf162cfc2d960e61b106511bec89a332586cc96633a1a92820bf9c03da91edbe0b7073424335177c32
 MISC metadata.xml 463 BLAKE2B 79b09024eeae81c18bf584e6341773512c569e348cea23294fd1354bbc6f5ac4da24ffa2a00cf89c44fe7b3af4b8214d6c53f2b36e7c2aca0fedbe2a7d944c97 SHA512 c4dc8d0ea137fa1d8694702fec3dc42eec83967f061c72097b77032ccfe8e6f47450d7a7486647acdf0387ac3d2cf8c028b772d71943d402bec5a7bd976a0ce1
diff --git a/dev-ml/lablgtk/lablgtk-2.18.10.ebuild b/dev-ml/lablgtk/lablgtk-2.18.10.ebuild
index 780d515a5e01..4fcf676df352 100644
--- a/dev-ml/lablgtk/lablgtk-2.18.10.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.18.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/garrigue/lablgtk/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2.1-with-linking-exception examples? ( lablgtk-examples )"
 SLOT="2/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug examples glade gnomecanvas +ocamlopt sourceview spell svg"
 
 DEPEND=">=dev-lang/ocaml-4.05:=[ocamlopt?]
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 165725d33958..c9020c6afefb 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -3,9 +3,9 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD llvm-ocaml-10.0.0.ebuild 3219 BLAKE2B 8d2ac0dc88b865f723c527315aaabb6bbd75773660b63197c833c72d7915495e494d73144f84a451dec3793d45a2f7f44dc22beb5c60f55dfd88a23bb04aede0 SHA512 fa83b587c1170564e25c040e2809daf6dc13d1718074d22a7093f08e7444d6378dbeb2f5ddc57f681f4a93b14c95275c87027c9e9191757b1fba4c9008464d38
-EBUILD llvm-ocaml-10.0.1.9999.ebuild 3288 BLAKE2B 7d5b7a5dd2c3a78eb9a5e57ce60bd4c1149d34c4b7c348c535a0999c04aa713df12710cd30dca54f0d76218e92c0e1e490bae7e662613c231f7600e88688dee7 SHA512 3d5c358dcbb34f39894a2c19d0ecd235b47dd8476e2699cce199f7517ef1ed12c06f881ac18a51f7f658c6b131c77fca16bd92fbc1cd604520c8a2cf653426a2
-EBUILD llvm-ocaml-10.0.1_rc1.ebuild 3245 BLAKE2B d97a0aec60d364da29f24529fb3f759c1a58539b7462d225849c4ef69de37b6a0f0043bdcb0cb1244505b202484116430c9f25c054b6c68be2637c9537a91547 SHA512 a68284736cd4b2f418cf19a3eef30f78bead858bd449da510e6b523b96365f42de2997abc27ffa6487398374e95be49465557cf779fd9603faaebba3d8d027e9
-EBUILD llvm-ocaml-11.0.0.9999.ebuild 3288 BLAKE2B ce014ec9c876645defb9484f374579aa69767cfbab0dc2ac96729ff91cde86be7090c3aa8fc58b9907aea0fff835c1141021e21c74cdd254893c3c9b0ebe522f SHA512 0593a39a81f0528bd6cc4a57d6c46c163c06cc19aa33915bccaa21ae17f5f3e33b26d7c9f8219e539246facc87f00da9ec561df13bc468acd6405b89b4aaf001
+EBUILD llvm-ocaml-10.0.1.9999.ebuild 2981 BLAKE2B 20e8be985a1a936e0eb43605f200d13e5d0c80d1622acce5289bb6e2558a62c3c68dbc9bc098d0d00546c582cec7d24290e945d73853fcd6183066488269b04b SHA512 d500a27f06f21979477307e42b971a9c098e784396e6964f1ae337c57d8ed2ebc464530c0b857b67b39cdb928e22d16dd46c1ee2a04e3f2d2d4a9da760fd6017
+EBUILD llvm-ocaml-10.0.1_rc1.ebuild 2944 BLAKE2B 90f05263b560f7efd2fa7ee1faa072dc53815c06539fae050d16547ca4d806041e6f4e93762a8faf74cd26a10d66f7da5f96930b6c2dc14d0857a6f329e7857e SHA512 577a51d77a5bac32c2d2f66659ea718b89691f5a0535abde10836aaafae0dddc84d6c328c85af24267a2a908956370dca902eb148e161bfd272318f1054fc73d
+EBUILD llvm-ocaml-11.0.0.9999.ebuild 2981 BLAKE2B 57a3eb858bd42118df84f90463f18a99e71f9c5f5c50afbb5e33dc22b9b283aa96eadb71a4a39be0d5b0dba877b77279c1a4b272ee69dde718d73b0026bd6850 SHA512 2316cc30a99d5045a2de69267e962be0cfa7d708ae919252390318504c37e3900cfa14af4887aba462d17d317588283c8f1e4b9887844ab03fcf869d48ebd4d0
 EBUILD llvm-ocaml-8.0.1.ebuild 3064 BLAKE2B 41792ef0b7764c4b7c297a05ee56d4e613cbfbcb2e2157e7b70c8ecbb71aea698079abca2324291f9e0b9565e36509e81ee313bd152bb0c15c74c6b69c5f4dd6 SHA512 042075a171609318603e93320a6080f6b75319b7a6490a85bced7138001d30a72b45a0bf348a0e7c5a80f56c8c7cf3e6f921ed5fea41b62ece3226d00dde49d3
 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.1.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.9999.ebuild
index c87d9f13cf31..c7b4967353fd 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
+inherit cmake-utils llvm llvm.org python-any-r1
 
 DESCRIPTION="OCaml bindings for LLVM"
 HOMEPAGE="https://llvm.org/"
@@ -38,24 +38,11 @@ BDEPEND="
 	test? ( dev-ml/ounit )
 	${PYTHON_DEPS}"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 pkg_setup() {
 	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
 	python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	# Python is needed to run tests using lit
-	python_setup
-
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake-utils_src_prepare
-}
-
 src_configure() {
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
@@ -89,7 +76,7 @@ src_configure() {
 	)
 
 	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)
 
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc1.ebuild
index ff77167a7661..7cff2bc42841 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc1.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm llvm.org multiprocessing python-any-r1
+inherit cmake llvm llvm.org python-any-r1
 
 DESCRIPTION="OCaml bindings for LLVM"
 HOMEPAGE="https://llvm.org/"
@@ -38,24 +38,11 @@ BDEPEND="
 	test? ( dev-ml/ounit )
 	${PYTHON_DEPS}"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 pkg_setup() {
 	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
 	python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	# Python is needed to run tests using lit
-	python_setup
-
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 src_configure() {
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
@@ -89,7 +76,7 @@ src_configure() {
 	)
 
 	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)
 
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
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 5a10d4d1de5c..f10bf23e527d 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
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
+inherit cmake-utils llvm llvm.org python-any-r1
 
 DESCRIPTION="OCaml bindings for LLVM"
 HOMEPAGE="https://llvm.org/"
@@ -38,24 +38,11 @@ BDEPEND="
 	test? ( dev-ml/ounit )
 	${PYTHON_DEPS}"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 pkg_setup() {
 	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
 	python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	# Python is needed to run tests using lit
-	python_setup
-
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake-utils_src_prepare
-}
-
 src_configure() {
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
@@ -89,7 +76,7 @@ src_configure() {
 	)
 
 	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)
 
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
diff --git a/dev-ml/ocaml-fileutils/Manifest b/dev-ml/ocaml-fileutils/Manifest
index 76c9e9016179..c5c40c464143 100644
--- a/dev-ml/ocaml-fileutils/Manifest
+++ b/dev-ml/ocaml-fileutils/Manifest
@@ -1,5 +1,7 @@
 DIST ocaml-fileutils-0.5.1.tar.gz 129639 BLAKE2B 12f4b33eb70caf3a106e87a484411f31d6924aae68c964350080698b723b39c7bae236d5a732a0546cd6a52b4215c9ddf2b46da613c171a1ef384ef5eee3d5fe SHA512 e2f60d16d9c25f43ea6bf5fcdf5810ae1722ef30a37e9ffcb6302a87bf3aa89777f3e3d43860258fb7c284861df1eafb4e5e2b6bd3f8d78d347ef8d139e460e8
 DIST ocaml-fileutils-0.5.2.tar.gz 129676 BLAKE2B 2534c28d134b297cf9f7838c6f33f6fe4a7fde6875cf7ae15990b1d2c2fd53be425ce8b37b6836642b26722fa0042f741e91d1c32211a2618e5f80345b6c63cb SHA512 264282c54ff693686ca9e60f371038f8ea9bce219d04556297dc7b6028c9f65c5a03b7cd263c3519cb212e29665200db1c95c88874bb2cb3d7b610e3b832018d
-EBUILD ocaml-fileutils-0.5.1.ebuild 597 BLAKE2B a2ff461f89767542ac3b0a26f3bd5136e81b4073dee298bb69ed55eac666850a4da224778f3ecefa769b253356ebfae2048af112f2ed85c88265306ba81e5747 SHA512 720b4de52aeeab6f1cd74ed4109b7844b4a458ac4169f7e0787de4d463e441049eea325cbb14354cead0a5b32fff653f14fddb43ac7bccedf805d4b0dfa27253
-EBUILD ocaml-fileutils-0.5.2.ebuild 597 BLAKE2B 15afd6b65d77f0589ad5e61b6f4f3495c4ce460b68b3fb9261234fbc9dfa1bb2bcf523881ca075800ee2ba7dcd5b0f6097a32ca34279d474d6db2ded6f682a7b SHA512 7f0709bea28f184905380f2f10f4e2693805fc30f3fe004a7d44c29614e294dba8da2e11cfc7c1fc5c2f949cdff5f2107229c9707630d51bd5362278ab852681
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+DIST ocaml-fileutils-0.6.2.tar.bz2 43060 BLAKE2B 20828875a25b1a9d2a41bf495cda00b0ac753efa20111b32a9d2ca439a56e9f07bf0953d16ee9148cf065e204fa1d8d624eaa89f6f4ae7e1613fdaa7cb44fc24 SHA512 104c7389832f22ec189ce6f1596144b28dcaeea7d23d5b19d369c44e54326e97fcb7b4f4c4a8d2965523e63b35b594a1351b7e630dde590871efe512fe38853c
+EBUILD ocaml-fileutils-0.5.1.ebuild 657 BLAKE2B 28f86d8927fa4834cdba0f3fca82e24d13d955dc6981010df27adaf20e92557217aa948f95a7c8b88b23602ea937d3f7122f9ad86ad04f781aa8484fdac86777 SHA512 31e36c96107f42ffe22818e45dd370fcbc18e966634aa120cd65698dd1a4e9b099f207477532a44d973142a7feb39078c1b43479561d3768c4971686faf433c4
+EBUILD ocaml-fileutils-0.5.2.ebuild 657 BLAKE2B f20ed4dce9dbd67e30f42c9e16941fbb6f540480f08402332074e95e5ecf9cc8f87f55d7effafe9fadc4856cd82bb4540a6e44e1998a226672aba712eafdb948 SHA512 9af55239baec33eaa231aea5d70cc4a9ac9bf5154c97ac40df43c80875550f18aa0b62600bdfdf4380e11c6afc85f9f985c2c24f20189430f76e34f257e9ca88
+EBUILD ocaml-fileutils-0.6.2.ebuild 649 BLAKE2B b3203abdd1edf69d46658ee97b4f52228d872d244c2c077b62f0875a3386e7c962ff444e5fafbcbc092d70ca05040eda5add67bc4417a2ed2678809894247a16 SHA512 a5d04dd27e325283a3513d73ca112989c81004209d06a3dd68b6f374ae7c136db315dbf17496660d94a2adcc4fd0373d2652f8b4b41330d277ee0bc9fd56db8a
+MISC metadata.xml 799 BLAKE2B 412e5e86cf787c2a3a63eff243337e4f8e54abee3d8cf0491e90c4e2e0cbdd2e5c4d452ec87b63cc0ad8d23286283eb1f17b295c422100cf412fa74ce99318d3 SHA512 c22647ffa2dba7aac8d3f401e6124e0acdc02526fb53ea35995ccd22984715a09d6b558097b9385c1c2fc31ca75a20864e22b0fd9ea9a6113620b31bdde7a691
diff --git a/dev-ml/ocaml-fileutils/metadata.xml b/dev-ml/ocaml-fileutils/metadata.xml
index 6f49eba8f496..cae1d28b2b3b 100644
--- a/dev-ml/ocaml-fileutils/metadata.xml
+++ b/dev-ml/ocaml-fileutils/metadata.xml
@@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+  <longdescription>
+    POSIX-like file manipulation functions inspired by
+    GNU coreutils and filename manipulation functions
+    for OCaml.
+  </longdescription>
+  <maintainer type="person">
+    <email>rkitover@gmail.com</email>
+    <name>Rafael Kitover</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">gildor478/ocaml-fileutils</remote-id>
+  </upstream>
+  <use>
+    <flag name="ocamlopt">
+      Whether the OCaml native code compiler is used. Must be set globally and
+      match dev-lang/ocaml.
+    </flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.1.ebuild b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.1.ebuild
index 9e105e66a76c..6b5395fafe13 100644
--- a/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.1.ebuild
+++ b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.1.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
@@ -18,7 +18,10 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=""
-DEPEND="${RDEPEND}
+
+# Does not build on 4.09+.
+DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]
+	${RDEPEND}
 	>=dev-ml/ounit-2.0.0"
 
 DOCS=( "AUTHORS.txt" "README.txt" "CHANGELOG.txt" "TODO.txt" )
diff --git a/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.2.ebuild b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.2.ebuild
index 40d4d20f42d6..d0082d821707 100644
--- a/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.2.ebuild
+++ b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.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
@@ -18,7 +18,10 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=""
-DEPEND="${RDEPEND}
+
+# Does not build on 4.09+.
+DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]
+	${RDEPEND}
 	>=dev-ml/ounit-2.0.0"
 
 DOCS=( "AUTHORS.txt" "README.txt" "CHANGELOG.txt" "TODO.txt" )
diff --git a/dev-ml/ocaml-fileutils/ocaml-fileutils-0.6.2.ebuild b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.6.2.ebuild
new file mode 100644
index 000000000000..1b299b6fd39d
--- /dev/null
+++ b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.6.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DUNE_PKG_NAME="fileutils"
+
+inherit dune
+
+DESCRIPTION="Pure OCaml functions to manipulate real file (POSIX like) and filename"
+HOMEPAGE="https://github.com/gildor478/ocaml-fileutils"
+SRC_URI="https://github.com/gildor478/${PN}/releases/download/v${PV}/${DUNE_PKG_NAME}-v${PV}.tbz -> ${P}.tar.bz2"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ocamlopt"
+
+DEPEND=">=dev-ml/ounit-2.0.0
+	>=dev-ml/stdlib-shims-0.2.0"
+
+DOCS=( "README.md" "CHANGES.md" "LICENSE.txt" )
+
+S="${WORKDIR}/${DUNE_PKG_NAME}-v${PV}"
diff --git a/dev-ml/stdlib-shims/Manifest b/dev-ml/stdlib-shims/Manifest
new file mode 100644
index 000000000000..b81d2785c01f
--- /dev/null
+++ b/dev-ml/stdlib-shims/Manifest
@@ -0,0 +1,3 @@
+DIST stdlib-shims-0.2.0.tbz 15980 BLAKE2B 4d83b8642a4bccc9f090c0a2f23a4d2f16bbf2ec686ab41e357f5f544d659e82f10cba85f9d578c939a2a874d0006b7fd17846bb8ffe1b6fc7cb760e4aa33db1 SHA512 19e8d8e004583e94ce060d3598c886dae1c24dd79dfd177aab4bd2865846f668a83071f087d9371393f226c14c90042eb2ec76619654c655995aeff9d4765621
+EBUILD stdlib-shims-0.2.0.ebuild 476 BLAKE2B 5010e59d3380e937bac49755b67779aefb8b5de880ef2c55eaebe497a0e37a456db440a12167072a57a4fa68d317a74031c68fd3ffb85989ab9b8c36aac44fdf SHA512 dcf9251828ec56f934e3a42eb28917e5cdeb56b0ef45c9ec3a2ceeb234b9138520db88392b4c39b6dfc3f82d04cfffb1b4cac74151f3f626d4083defea1a9389
+MISC metadata.xml 864 BLAKE2B bcf80992555101e1ba8eb6ca81df5a810b7351e4ce141842082c1981988b0a8529a83971f6f90be2a03cee9ba13a83679c5bfab6ed218e997b000c996ce6a0c1 SHA512 533ee9f2bedd5163669b6e23763ed90eb3ff180465a453e2a5d87271c0f4ac112aed7f073e88acf79eedc0d7495551e4670bfc1256a19053a2c021a91442a123
diff --git a/dev-ml/stdlib-shims/metadata.xml b/dev-ml/stdlib-shims/metadata.xml
new file mode 100644
index 000000000000..bf7379a1dd2b
--- /dev/null
+++ b/dev-ml/stdlib-shims/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <longdescription>
+    Compatibility library for OCaml compilers before 4.08 to allow calling
+    Pervasives module functions on Stdlib, which is the API in newer compilers.
+    Does not add newer Stdlib functions.
+  </longdescription>
+  <maintainer type="person">
+    <email>rkitover@gmail.com</email>
+    <name>Rafael Kitover</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ocaml/stdlib-shims</remote-id>
+  </upstream>
+  <use>
+    <flag name="ocamlopt">
+      Whether the OCaml native code compiler is used. Must be set globally and
+      match dev-lang/ocaml.
+    </flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-ml/stdlib-shims/stdlib-shims-0.2.0.ebuild b/dev-ml/stdlib-shims/stdlib-shims-0.2.0.ebuild
new file mode 100644
index 000000000000..bedd6b873ecc
--- /dev/null
+++ b/dev-ml/stdlib-shims/stdlib-shims-0.2.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Pure OCaml library that allows replacing Pervasives with Stdlib before 4.08"
+HOMEPAGE="https://github.com/ocaml/stdlib-shims"
+SRC_URI="https://github.com/ocaml/${PN}/releases/download/${PV}/${P}.tbz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ocamlopt"
+
+DOCS=( "README.md" "CHANGES.md" "LICENSE" )
diff --git a/dev-perl/Any-Moose/Any-Moose-0.270.0.ebuild b/dev-perl/Any-Moose/Any-Moose-0.270.0.ebuild
index 00d512d734a3..e4cf9c5ceacb 100644
--- a/dev-perl/Any-Moose/Any-Moose-0.270.0.ebuild
+++ b/dev-perl/Any-Moose/Any-Moose-0.270.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 @@ inherit perl-module
 DESCRIPTION="Use Moose or Mouse modules (DEPRECATED)"
 
 SLOT="0"
-KEYWORDS="amd64 hppa ppc x86"
+KEYWORDS="amd64 ~arm hppa ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 PERL_RM_FILES=(
diff --git a/dev-perl/Any-Moose/Manifest b/dev-perl/Any-Moose/Manifest
index d62b7cf2c6df..8ac3e217974a 100644
--- a/dev-perl/Any-Moose/Manifest
+++ b/dev-perl/Any-Moose/Manifest
@@ -1,3 +1,3 @@
 DIST Any-Moose-0.27.tar.gz 32856 BLAKE2B 0b11bdb2cb75d880c3f11778b0f6a6ee1a56043549fb356c5adbb9bca2e379f1aa3169642bea2f9daffd97b9c976b07f4662c5c652a6f4d63833cd2f02613baf SHA512 5c97caf2e64462bae95fc4d5dd41868c01f856bd8f74872985254b7cc6ce0e13b4accad7955047ff5c4013399f7aea2ad6d48ae3592883a3b6cd20c0e4478b7b
-EBUILD Any-Moose-0.270.0.ebuild 668 BLAKE2B 64e7a5610b27145dbf10325da57bf6f95aa8f25695ffbdd3a0ac011dc59a99f8625569210bd2a79737012f87f5e2d671493a78f80cf3b34c7ba50689614c88f1 SHA512 54b04f6ced40c4cfea088c326f7d252836cb5c0921c267683f454c322b96edabdb92bb00ad822b115b423b97d35afc4afa3f823420958398b0282863f0f774ae
+EBUILD Any-Moose-0.270.0.ebuild 673 BLAKE2B 7ad81d60fb0a78705f6ba6889f1b7f334545bc60b6a1d62b5af7fa9167c0650742cd9e41fac8174bfb878d6565c0868f86ef3c3fbe8a6ed1f4ce4c01e8d7031f SHA512 a6147fcf9135d3a652bc456f6797b88f0270eb7d7b01e70c150267d6305155b2d6865c4954ab6411d6f5f10b42c73c8d1feeea70ca26b707013974c00cc652c7
 MISC metadata.xml 390 BLAKE2B cb432d71e82e4cc88d553baa331db49ecc3d2b98f0e44a0befaef59d0420910b77d19462900ed3c2845ac936cdb28e70dd0b97e3e7fb37414167d8e62285f321 SHA512 76a800d7c4af41e0681ac8395650d6302e18fd3e4f787f2fbbe0b132aee5ea5302a2557af60d835cc69b048aeb5643ec8660d72bdee4e4e1cbce72beea19ea07
diff --git a/dev-perl/CGI/CGI-4.500.0.ebuild b/dev-perl/CGI/CGI-4.500.0.ebuild
new file mode 100644
index 000000000000..b6385de63a0b
--- /dev/null
+++ b/dev-perl/CGI/CGI-4.500.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=LEEJO
+DIST_VERSION=4.50
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Simple Common Gateway Interface Class"
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Encode
+	virtual/perl-Exporter
+	>=virtual/perl-File-Spec-0.820.0
+	>=virtual/perl-File-Temp-0.170.0
+	>=dev-perl/HTML-Parser-3.690.0
+	virtual/perl-if
+	>=virtual/perl-parent-0.225.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-IO
+		>=dev-perl/Test-Deep-0.110.0
+		dev-perl/Test-NoWarnings
+		>=virtual/perl-Test-Simple-0.980.0
+		>=dev-perl/Test-Warn-0.300.0
+	)
+"
+PERL_RM_FILES=( "t/compiles_pod.t" "t/changes.t" )
diff --git a/dev-perl/CGI/Manifest b/dev-perl/CGI/Manifest
index 4cdb4e13586a..2f7632d7c92d 100644
--- a/dev-perl/CGI/Manifest
+++ b/dev-perl/CGI/Manifest
@@ -1,7 +1,9 @@
 DIST CGI-4.22.tar.gz 194314 BLAKE2B 70f5746e1143103bf623d1e971637531e13dc1b8fd95ff95c849e1b7dea179cb56e5bfc068f29b4904e6446646a8e495ca41d5960b5df0287edf7deb31cc15df SHA512 becd37e56ca3fe8a6ab6069d99ddc65838d4aa00b57b6e30a5e2bcf73e84dff9a3f5f2841549f6627fe29d46607254197f3a03f308dc5fb6add3ece60719871d
 DIST CGI-4.40.tar.gz 200642 BLAKE2B a3b751ee9daec925654e9781bee03842c43730690b835fde5dea421607670a386f3bea5f60d36bd629206417de35bab1b46e51a13d57a9b6feeedd6cec9fa2eb SHA512 317cc410d8cc630067759cc05b8643e0c3fe4e55307c437176892a625b88d46443c3e0ff4361e066c54f95c3573e5fa8c21e23069071fa0dc74fc2d93dca13c1
 DIST CGI-4.47.tar.gz 204940 BLAKE2B fa0c4492b19543061403ff65be0d304fe166ece4cdfdb19c9c55de391001add2c03bd4c99019ddeae1b2fc70009a5419de8baa7159548f237351572d11c9c004 SHA512 1f46c15071254a691781a93cfdaed62da01486bb32d68ef6999ad1aa6f8b631452fad4aa95fdf8ce63a7314023853f01fddfb9aabf3f49460d174d118136822d
+DIST CGI-4.50.tar.gz 205316 BLAKE2B 7b6fe005545e2a3f9a0218f4bb3fc7f6acea879c87118675f72db5f7db78b0bd84788493199e94d2bfadcd07650dfed72c85d0db69ba1210bd3b372e19fb2cab SHA512 c8f898404ef8fb341ea741229939748b82ca94b231591b67f29ca2f06cfbab363653753289a795a2eb0b0a145eafc8e8a303e92fd90795071b123e0fb8cb79c6
 EBUILD CGI-4.220.0.ebuild 902 BLAKE2B de39062f1bb9c99fedd260234b7e390f67c7516ffba4a9df8df7dc5cc7f7d69917a59a9acd28f03ca25533927feb64517fb9680e1c3e3dfdfa441e7edb6f03c7 SHA512 1ff95219782d7dc49119a7285d493e927b50a8d874e0ae8730eb0e284a3691cdb5a7ffd05bf72baf2e9a16b58f605efc5cecda7ac897f789a7e7ce020ed3d466
 EBUILD CGI-4.400.0.ebuild 1009 BLAKE2B d06427303bc4e9c547f3789eb44b512bb3afee0b2d597a13168784a87f8a1e87f254748181513933973a309436e67ebb3ea527a1f141245e7eb184877b6e8dfe SHA512 3c1640bcce8b73a5788d3749da7de8da1a01262e80efa1a34afb308ef9c3ec90a70f97ee28ece3f0ca90bb8fe7f504395ea52405c5f2472ef94f29036403e13d
 EBUILD CGI-4.470.0.ebuild 1039 BLAKE2B d9f03a8e12c4f82155b82d425668f3d89324effc9d323fab5697fdd77f59ad22853bd0f7819759d89f77f6410a1f5004cf1f42bf05439ad84ce5f211442e795e SHA512 98b6f7562615e8205cc3ca6d97e0e079eb0c4d362bdfe0d5ea4c49aba56da2abe30d339e688e71c02eb426901725ec4dd6c8bc95ffc5e8ac8312857f73659345
+EBUILD CGI-4.500.0.ebuild 1039 BLAKE2B 9e785fd4ebf63f537f7895b493e44bd3221d0e25234fd8a7a6b4bc44d0901c543de590f71199d862d06e010b1a23321680c9a5fceb54c57d3bcb782fbbc64a7b SHA512 b306d5f43bb77587c12f5af559f29e4c7226cac4811422b0a3233aaae2ce8ee86d632bfc497a2ad06af7522cc51e1bad9d9b3dcc67396b0ec048ed095db4b4c4
 MISC metadata.xml 906 BLAKE2B dfdc7b33ffc98d0b9322c6682e0ff42ccb21f7cc52f5bf1f30e14284bd598bb02c1a63af712c20880d391f756855d31a77b21e6c37f35716fcda5d74cec8dff3 SHA512 89ff442464fb49a81c17538be8756521ce901bfdffc7e72b8ddaf56b00bbda42e1b9dd779c7e975986a930662ef1e3e57bfee10f51aef656db48e2a573ea04ec
diff --git a/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-5.202.6.200.ebuild b/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-5.202.6.200.ebuild
new file mode 100644
index 000000000000..7dc613da222e
--- /dev/null
+++ b/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-5.202.6.200.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=BINGOS
+DIST_VERSION=5.20200620
+inherit perl-module
+
+DESCRIPTION="Mapping Perl releases on CPAN to the location of the tarballs"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-IO
+		>=virtual/perl-Test-Simple-0.470.0
+	)
+"
+PERL_RM_FILES=( "t/author-pod-coverage.t" "t/author-pod-syntax.t" )
diff --git a/dev-perl/CPAN-Perl-Releases/Manifest b/dev-perl/CPAN-Perl-Releases/Manifest
index b0f63ed49e9a..4ea89273f8a6 100644
--- a/dev-perl/CPAN-Perl-Releases/Manifest
+++ b/dev-perl/CPAN-Perl-Releases/Manifest
@@ -1,7 +1,9 @@
 DIST CPAN-Perl-Releases-3.76.tar.gz 23487 BLAKE2B 1f9f8a39299ec8e1c5758c508796b5ec9e3e602a394554701c99a823f2eab458ab535db279ca1353e54da498bf5a2658f2f7ed25fe66569ac6b2915618b0fb89 SHA512 83fc38db852bdfac7a1e5c8b2d0f9689b91417c663a8d6b0182e583a76e5aa4d45efc84dc35b849a3d13590eaab69c70a1f785019cba749275c3768da15e20ac
 DIST CPAN-Perl-Releases-5.20200320.tar.gz 23688 BLAKE2B b481227e976bdd2e5e7495ecd727ae9ac339443350e646fc1f45de75b92a17bf9660edd6f2e9d246077a8182574db49e54e8030bb48830f205e7decbeae2c513 SHA512 cea4b73d1ca50a8caa6540abd9f9af6c45a7d7f1f6853af8b444050edff235072d234193aa4d48f1086c88b1657b478244ad74e18b705fe681bf0a26bb04770c
 DIST CPAN-Perl-Releases-5.20200428.tar.gz 23709 BLAKE2B 0ef30b30e482884d6a18d78402a7ead872ff8a0100723921e8b1e39d851af7c2dc432d5033b7524afa44cfdca87fdd8d8d9f5cc70d88df723a8bbd2962571079 SHA512 44ea58bd29d3db8715c92a1d1e5953a5a185669a08d5f01bd36a695ef8687c9fcf08a399a2d52a84c214f0b4dceaf829030fc17d29b6663bc50f9abb89378c9b
+DIST CPAN-Perl-Releases-5.20200620.tar.gz 23808 BLAKE2B a706903d3eeddf5251d48a8a3c9976841a04ee5905203d588d14a98a45e7568a0144909b5f4ef9c667d502786da22ab9d5a1483dd1617c28fa658ed95056e6bf SHA512 336b673bae6814825184f456aea829e95824417bb13b73ed7907248e24a39051633e599cf444165fa05e0deb2fbe1259398996ea357b6cc53d9cd853a299affc
 EBUILD CPAN-Perl-Releases-3.760.0.ebuild 542 BLAKE2B 9ecf7bd71655c6d82443fd8e6e11f34b1e9db702725fd45355259d4286cd0499ffc43ff3913b53b414a33f1d9358e7f5b47f9da4e49c3131b57ef4859c6c46dc SHA512 2215e0f261aa86de0dd123841ad6363bc562b76345470a19838c86790b2873538e139e3ea78daf84af5d723bda909e7cfd9e3bd52fb20de8a7d39d78765dd5f0
 EBUILD CPAN-Perl-Releases-5.202.3.200.ebuild 530 BLAKE2B e592299dbcadeee92bbef843dc66e84777ee8b7af244436c1d66e77e55b485024aadb210995017fabfaeae6800807c1ee1ce1a63ece5f2cea0e13485300de308 SHA512 97fb5729acde49802f36fa076ac3e71ae3bc043de4c370767fd6b594d2d1a86a78017caa352e3d39c0b7c6bcb09c256698aa4f4b29907d9d3848692cd63dd0d3
 EBUILD CPAN-Perl-Releases-5.202.4.280.ebuild 530 BLAKE2B 5f35ae833d6e67209d1e11ab6b3acdd8ebad33a879a187a71d26f52264c3ae9f639cf50c71d46d20158587841c0120783b457fae8762055ff8310eb795710a1a SHA512 e17a52c52f4af33d6d0dab5729bb51e7aaec0ab92f1bdbc8fbb3c715ab274d51cc8928bf3d314030a179e75aa452dc68ea61f95df936bc272547e5450a3e7482
+EBUILD CPAN-Perl-Releases-5.202.6.200.ebuild 530 BLAKE2B 1638554ee0a87e813038d90d306e375aff559a27a3a181a740201ea84f41aa3403778b7ab8f3167810816447770f78436765bf53d0768b47b11ff1887c696e5d SHA512 07021d0a36f5b917be3aa8a07b22e0461dadbae2dd6e091ac50abbdaabcd86d02d0e0dc95895c1262c6d9903d8abdf913b6c6930aa4aaf1095ca192ace73634a
 MISC metadata.xml 433 BLAKE2B a0b86cd3b77e9a90dffecb2d6b828713c337200098e616d348afcacc7871299a7f11d30b44b1211440f083d60eb81f28b8c6d92f6ed573bffa695b6bfb4bf217 SHA512 b890be772a432a55a6ff50c91180c9684754f167dadaf64ac05f638865e76960a36274207d7e816bcd85a53f6fc5f2b263fcf7adc3bfd609e64551aa23529363
diff --git a/dev-perl/CPAN-Uploader/CPAN-Uploader-0.103.14.ebuild b/dev-perl/CPAN-Uploader/CPAN-Uploader-0.103.14.ebuild
new file mode 100644
index 000000000000..1715e65381e3
--- /dev/null
+++ b/dev-perl/CPAN-Uploader/CPAN-Uploader-0.103.14.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DIST_AUTHOR=RJBS
+DIST_VERSION=0.103014
+inherit perl-module
+
+DESCRIPTION="upload things to the CPAN"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test minimal"
+RESTRICT="!test? ( test )"
+
+# r: File::Basename -> perl
+# r: HTTP::Request::Common -> HTTP-Message
+# r: HTTP::Status -> HTTP-Message
+# r: LWP::UserAgent -> libwww-perl
+# r: strict, warnings -> perl
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Data-Dumper
+	virtual/perl-Digest-MD5
+	dev-perl/File-HomeDir
+	virtual/perl-File-Spec
+	>=dev-perl/Getopt-Long-Descriptive-0.84.0
+	dev-perl/HTTP-Message
+	>=dev-perl/LWP-Protocol-https-1.0.0
+	dev-perl/libwww-perl
+	dev-perl/TermReadKey
+"
+BDEPEND="
+	${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		!minimal? (
+			>=virtual/perl-CPAN-Meta-2.120.900
+		)
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
diff --git a/dev-perl/CPAN-Uploader/Manifest b/dev-perl/CPAN-Uploader/Manifest
index 1b29581c87c8..a324e4114c3b 100644
--- a/dev-perl/CPAN-Uploader/Manifest
+++ b/dev-perl/CPAN-Uploader/Manifest
@@ -1,3 +1,5 @@
 DIST CPAN-Uploader-0.103013.tar.gz 20961 BLAKE2B 9da4ae22e049f05598a4d916410619a93c46fdfafc51242836a85aa2ed2ce2806fc6970da082d7bfa72d18f82c47259367ba1fdb478f072675018bd097d8424e SHA512 28133d7e5a9b12abf9f089402108314ca9fd68981d52006136b82a754b56581c7c5b38ad69b6080d247b46d0c68d258674c49218c1c5d61811bf89bcd9d773fd
+DIST CPAN-Uploader-0.103014.tar.gz 21562 BLAKE2B 09596c89e21eb3a4e8ee8b3375f668e156508857828f0d421ea4f2ee5f831ae58e10091e93be7c362fd4cb7cbd42b03d193974497ed8749ed3cf9b6e4b16671e SHA512 2c7434e0bb6afb6aa73b9ac5cb4d1a865d179c63eaf1f985fc2117ced877b9845c71144e5fda29cad24dbf0073d3e167235f4ba359adca58a081c167f5aabb80
 EBUILD CPAN-Uploader-0.103.13.ebuild 899 BLAKE2B 3de2f91e5de160f955ad59d1a7d1b186022e630355f7f7928cda3de630e960bf867d83413597648b644b49a0491822a5c7b4445a05f660fe6000b2914ec1ada9 SHA512 1f48635bb6cf4a831fac928f8346c09f1c31fbe3a61faff9ee4b0a4fb32ccf17abac60485e2896f15307b9cdc7d3745d28b95fa14817cbe10d96ae2c361bdafa
+EBUILD CPAN-Uploader-0.103.14.ebuild 900 BLAKE2B b901b43ab6c121646d005142067ff859168f41c5b2ee66306439e55af74677d63e3edb19e7a832d4fd80183945d0c055097452bf3eeedbe6a66dab9a17660e62 SHA512 04a8f29ef6f953c2b2612e1ab934924b7f7fd9f0cb7d2d98791cdf87f9d9132c4666790fc3bbcde4ac98585bd53c6163148db7c2fe48de8bc0cdc647d48c84d8
 MISC metadata.xml 398 BLAKE2B feb7c968153fec9cadca6c5973834b28161e94d0d4cbc062d1e5b65af914c1edcf2fbc731d5b6c2c264e3ac4eae748519a420c107e0777cc4553a5ed0bd2a6eb SHA512 07efe44d7a1e13c7678d188f012188cb8d5a0bae599a6d8b98ff881f7b99a1d6956c09053f4a345acddbddfad813e3e7aee6a352ce8b918ee5a03ff37481ce43
diff --git a/dev-perl/Calendar-Simple/Calendar-Simple-2.0.0.ebuild b/dev-perl/Calendar-Simple/Calendar-Simple-2.0.0.ebuild
new file mode 100644
index 000000000000..d945fd0192bc
--- /dev/null
+++ b/dev-perl/Calendar-Simple/Calendar-Simple-2.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=DAVECROSS
+DIST_VERSION=v2.0.0
+inherit perl-module
+
+DESCRIPTION="Perl extension to create simple calendars"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~ppc-aix"
+IUSE="minimal test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Time-Local
+	!minimal? (
+		dev-perl/DateTime
+	)
+"
+DEPEND="
+	dev-perl/Module-Build
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.28
+	test? ( virtual/perl-Test-Simple )
+"
+
+PERL_RM_FILES=( "t/pod_coverage.t" "t/pod.t" )
diff --git a/dev-perl/Calendar-Simple/Manifest b/dev-perl/Calendar-Simple/Manifest
index 634900c086d0..f17a011a9019 100644
--- a/dev-perl/Calendar-Simple/Manifest
+++ b/dev-perl/Calendar-Simple/Manifest
@@ -1,3 +1,5 @@
 DIST Calendar-Simple-1.23.tar.gz 7989 BLAKE2B 24c25e60021e6210e06645a51fd068c7e0887b5273c83b3fc2cf632deef2530e548d6c3282807c8564d4999ce2f133303a9bb2e6a40ae0aaa77cfb11f205bb5e SHA512 3d024e3de896a20b837adfc4fbac2bcd1dce969ac426445573ae0975e189ffde906e7c25d3c6f0595a7e49d47a09cd3e9bdfb6810ca7c9e20f9e01a4ecb7ec49
+DIST Calendar-Simple-v2.0.0.tar.gz 7024 BLAKE2B b86153bd0d50b14e6910bc0bafe5aa8c7343112c2538001714c62de3a2926a1b98e2cfbc05289e7fac702e638c5ad6090929baf611e33366bb309bfb5ae231ea SHA512 2e9e16a27d254cf68e38be2ee1715e1f8d0d3b224ed8fb1a2a5e56ac172a25f67beec08b7a18bf0bf69a66a3ed7d94d058faad46f3a266a24e2b39fa8e2d3efe
 EBUILD Calendar-Simple-1.230.0.ebuild 512 BLAKE2B 50e0f9718189111b0d902082cea8fdb4657709cda1e5503f753c5cefc0c0fc20904e36323b6ed2eeee4d19bbfa74f2b59fdf11ad049cc1b07ae8930c1e60600a SHA512 ebf87b3691574f6db0c80e6167857dc78bd1664e3828c8b2c0b80af6f3601bedfa101f99961953f4e20926f9cd7b8c397215eb9adfe9eb98922e85598d93c32c
+EBUILD Calendar-Simple-2.0.0.ebuild 595 BLAKE2B ef3d37ffd613e8f99ae319ae4e4dcb664602e267d22bf30159fe73d36162586db787270db3954afc00cb8ffea27eb75880480973169f0b447cb378830cb1b9da SHA512 c3e2c83f9e2c65358d90baf9cb42f6894454827290e323da3a31636fef13a357e5f462f11ad15e39b2d3b898f645c7694a25f6a29889dceb0c8824f694f58647
 MISC metadata.xml 402 BLAKE2B e465130f7fe7cb9d112ee98993aef5e231358cb81da41b3b69f0d32f06be9d7789d92322f8c3d42d6f4da3254b3aaac502aade47bc5c3da28754bf07ae803ab8 SHA512 d35e03eecd4213fc034e86a4d8786aeeadfce4e58bc210cdc50e39b89aad8cd407481ee44cc7bd96e510279087b782d5470eb8fcd4f653236c717bcea01e18cd
diff --git a/dev-perl/Class-MethodMaker/Class-MethodMaker-2.240.0-r1.ebuild b/dev-perl/Class-MethodMaker/Class-MethodMaker-2.240.0-r1.ebuild
index ab22cf620111..41dd18161224 100644
--- a/dev-perl/Class-MethodMaker/Class-MethodMaker-2.240.0-r1.ebuild
+++ b/dev-perl/Class-MethodMaker/Class-MethodMaker-2.240.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module eutils
 DESCRIPTION="Create generic methods for OO Perl"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 BDEPEND="
 	virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/Class-MethodMaker/Manifest b/dev-perl/Class-MethodMaker/Manifest
index ae617fd2a17b..f5b7060e6170 100644
--- a/dev-perl/Class-MethodMaker/Manifest
+++ b/dev-perl/Class-MethodMaker/Manifest
@@ -1,4 +1,4 @@
 DIST Class-MethodMaker-2.24.tar.gz 77242 BLAKE2B 741e1e592658637fd001e18d45b27410d3a522146decc61b458561b86e7cd2d866fd2762344224a999ecd661a89b8ad226c3b0383c562a55a3e40157bdc04edb SHA512 d78f89df41d5c566dee74d30ff1b71488e9510639e795dd2f21e95e0516b039d15dd6743342cb28841e0fc698f64b3b3f349b5da788220598dff6ad95225ae0c
-EBUILD Class-MethodMaker-2.240.0-r1.ebuild 496 BLAKE2B b57ca8d23eb6540ad6864f6edaacb2da5f7eb51a36501682b1d039def1167025fd8d6d0532b91e1f10a29cc83c26f1a7b425c858a1479c666f8652d0625a3df5 SHA512 d862d5f6062074fff5f58dfc242f5cb7c3c19f50ef93138de8cf23e6432cd1b01d53706c572310f58145ae937597cc144ca7336bbba22456fb6b6f1d4bee375c
+EBUILD Class-MethodMaker-2.240.0-r1.ebuild 503 BLAKE2B 515711852f9084d2bcd1ae4249b7a165eb4a0c5b2c959fda9905569e36d3826fd0deb9bef1722e36759f03e3e8fa3a2b50d6c278114d56de1d5aa4e20502fedf SHA512 52b734c35840d9889eb617f7ffb32314f379ab1f57c2a9d79608145cab41452f9b4f85ae2e939c069a06fe33e43643f82f856b4a15dacb04a18c192e6a46b2a7
 EBUILD Class-MethodMaker-2.240.0.ebuild 580 BLAKE2B 5a43c4f76421da8b38fb59cf6dcdfe5b259cf2c0614d2921c64cc78ecac84f051ed1786412ce3f61e80b02399978ff23c4e7bca4b192c9595f3981c569b86c0c SHA512 1dd5748909f2d28684c344cf45f39ed21ff6d9b573fd31a8bcbb5d459361442bfc64a89b974adbb78c73c3cefb738a4d7c1306fa39f77d474366d50387fb285c
 MISC metadata.xml 758 BLAKE2B d842a86fa76b0f8486dd8c28a164bcc3f9cdb5d892a8100e9e8ea582cd14ecf6017e6e396879a23615593e1c8d5887a51798be40b8c3b1b607cedb2ddb34f14d SHA512 a83c6b380017908016d6ea9367a2fffc746d87529e3f9df6c145afd07e2f45cc48e7900cc02ea443d0ff702381d920922316b07bb0683432352b359d6b8be3ee
diff --git a/dev-perl/Clone/Clone-0.450.0.ebuild b/dev-perl/Clone/Clone-0.450.0.ebuild
new file mode 100644
index 000000000000..040e2a89c354
--- /dev/null
+++ b/dev-perl/Clone/Clone-0.450.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=ATOOMIC
+DIST_VERSION=0.45
+inherit perl-module
+
+DESCRIPTION="Recursively copy Perl datatypes"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=dev-perl/B-COW-0.4.0
+		virtual/perl-Test-Simple
+	)
+"
+src_compile() {
+	mymake=(
+		"OPTIMIZE=${CFLAGS}"
+	)
+	perl-module_src_compile
+}
diff --git a/dev-perl/Clone/Manifest b/dev-perl/Clone/Manifest
index 346fde33b25b..7e76b3324b64 100644
--- a/dev-perl/Clone/Manifest
+++ b/dev-perl/Clone/Manifest
@@ -1,3 +1,5 @@
 DIST Clone-0.39.tar.gz 13785 BLAKE2B d3a1434a922f602110156e1eceb51709d8c41a292e69e9822f508d99c8868e617f46e71b3c640f15fd994700cbc8187e3dabdd43d1dfc1a7d2f19c8608f40e4a SHA512 5e3feeff7646fb2ea075267962f7f7013186310974cdbb87f779ece0f56baf62e7dbb0afa94816e20675dc03bc5fbe271b9594e12ea441863b78860691822b6b
+DIST Clone-0.45.tar.gz 16130 BLAKE2B 92c4dd90e26b14754a77452c9e185094cb4604aecd06261783dc3d805e75a3d8e0a93492002c1e771b0e562b06a942d987e6bf3f2cf9e2450d5749146b98cb1b SHA512 4d91580fb60876cca7670411748e42e6af0eaba8fac25d60e7a50685ae7b1e697e12c8a2835693e3e4abf3c13c060a2740344eb804ec26ed274b895f599340af
 EBUILD Clone-0.390.0.ebuild 600 BLAKE2B f71e4146798a547fea3c42b7d289172371b07c02741f759bfa92a664f9a1fec9d0fc76eae49fd39ea2bc2e0ea6ac8bcfd46dfa4dcebbce7e70a55f401792781f SHA512 f1b3d59162cf8d0db8e1c0dbec572e4a364834e03299f01787fa02e120d35fb7f064c432bba173417605eea5255e9139c6c99b023d7c71c27e918f508b5b08cd
+EBUILD Clone-0.450.0.ebuild 479 BLAKE2B dd53754fa1e48b90ef9e566ca6d15ceb6501167bca27e07baa72524b5fb2a1a0eb2a3239f9bac1ef0d29068837ca6250556497c635ff9c9a19420c0cc0b85ee4 SHA512 c36908119a38979bdf52a01eebc68d57773cdc4e765565e6823b173857a9ce342f7bec7f73558cc15dafa1019511ec62c8e3a35fcb5ed0e7cbc76aed0583d8a7
 MISC metadata.xml 381 BLAKE2B 5626d365cfa4134c5838d948102ade74dd9ea2625b20dd514c5b9156d8eb2dca021cd5a54cbfab4db4e2487527d8337cd85a538ffaa1d9693276275c8821873f SHA512 cdae589f0c32e71bff82bd75ce3953caea18dccba25b29661b396a740ac61d392b398399cab3a97e33c16d75750b2c2d1fc8a7e1c9599f9e64d53c042cf15fc5
diff --git a/dev-perl/Color-Library/Color-Library-0.21.0-r2.ebuild b/dev-perl/Color-Library/Color-Library-0.21.0-r2.ebuild
new file mode 100644
index 000000000000..b963957a0005
--- /dev/null
+++ b/dev-perl/Color-Library/Color-Library-0.21.0-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=ROKR
+DIST_VERSION=0.021
+inherit perl-module
+
+DESCRIPTION="An easy-to-use and comprehensive named-color library"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-perl/Module-Pluggable
+	dev-perl/Class-Accessor
+	dev-perl/Class-Data-Inheritable
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	test? (
+		dev-perl/Test-Most
+	)
+"
diff --git a/dev-perl/Color-Library/Manifest b/dev-perl/Color-Library/Manifest
index be2918045083..92c87cd2f190 100644
--- a/dev-perl/Color-Library/Manifest
+++ b/dev-perl/Color-Library/Manifest
@@ -1,3 +1,4 @@
 DIST Color-Library-0.021.tar.gz 343300 BLAKE2B f0debb8be5ef66111f24494509d75823faecad64f976cd229d8efc0212131b557b32a50fc85dd4c6c4e56efe3385af3fd59af92999b84923ba8bc72bef4719ea SHA512 2338ad5a4e313d0f47604678a511845be1d02ed62804109d7338cae0831130751933a4b0f6c0056e684da926e135542292a10cedd6b3d5cee6b3110bbb98cef8
 EBUILD Color-Library-0.21.0-r1.ebuild 613 BLAKE2B 7792968601968d8c093e9f2aa561b1c994beb355c6dfdbee6f2cf2f3bf665dab281dd9ac34a9f19470bb62a8192ea84da938380249adc28855e7fcf96a6f8e33 SHA512 5cad4a6729887433e0b4c38b7f526e18f30adfcf670fb01d5e015c272874b80efaadbf030769238bc36a20ba9fcc705743b4d93d03fafe8a1acd9098ca61f5f7
+EBUILD Color-Library-0.21.0-r2.ebuild 640 BLAKE2B 978588640fef098c4d0b2f36d9d5d4e7bf4b9355da29edd0ce9155a5d474230d890944df6865ae57f2adeb056ab9a0e1ba80607057c7d4c8154fceddaaf3e56b SHA512 12c8db638f4c820a78c01c71b628f6febba13fe8992b5c1484939f348b1abadf0b52c46ff04a8e6d0631143c3ad3591f5216b14e7cd887ead0447fd2dcc837e5
 MISC metadata.xml 2368 BLAKE2B 5a4c8e98f7f925a1b22fc75915b39aeab3bfd7e5bfdacc3bd5de9f1e68e460b448c18e57ac2f7af91ad82362b416ece3c0caf1ac9e82ab6c14b02e8817d97c2f SHA512 ce8f3b83c5a42176cc08d0cd7eb0ac57130020142ede964dff30f5dd491e635f1bca59984d161c8f5594223c58112ad09693cfc96b0836fa8331dcc7b7cac335
diff --git a/dev-perl/Compress-Bzip2/Compress-Bzip2-2.270.0.ebuild b/dev-perl/Compress-Bzip2/Compress-Bzip2-2.270.0.ebuild
new file mode 100644
index 000000000000..772c9cd6ebe8
--- /dev/null
+++ b/dev-perl/Compress-Bzip2/Compress-Bzip2-2.270.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_VERSION=2.27
+DIST_AUTHOR=RURBAN
+inherit perl-module
+
+DESCRIPTION="Interface to Bzip2 compression library"
+# perl5.x or newer license
+# https://bugs.gentoo.org/718946#c7
+LICENSE="|| ( Artistic GPL-1+ ) BZIP2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~mips ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-arch/bzip2
+	virtual/perl-Carp
+	virtual/perl-File-Spec
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
+PERL_RM_FILES=(
+	t/900_kwalitee.t
+	t/900_leaktrace.t
+	t/900_meta.t
+	t/900_perl_minimum_version.t
+	t/900_pod-coverage.t
+	t/900_pod.t
+)
+src_compile() {
+	mymake=(
+		"OPTIMIZE=${CFLAGS}"
+	)
+	perl-module_src_compile
+}
diff --git a/dev-perl/Compress-Bzip2/Manifest b/dev-perl/Compress-Bzip2/Manifest
index a36acc7a9bd6..38bde3be08da 100644
--- a/dev-perl/Compress-Bzip2/Manifest
+++ b/dev-perl/Compress-Bzip2/Manifest
@@ -1,3 +1,5 @@
 DIST Compress-Bzip2-2.26.tar.gz 886999 BLAKE2B b7107d522c172958f9cf137b2fa5ba7a88da8114b467eb20eb7da5d67f09d86105277ad4711cff0cfc3478518557fb37cbc8a1b80d1f37070d51e69b93747f3b SHA512 be1670303496a9f48989777468234d52276b34e6c0fdb6e99d2199134f353f1ee32e0489a3797ab3a2d4777bb5f03f78dff39f3bf75b8cc511b754da2b7e4959
+DIST Compress-Bzip2-2.27.tar.gz 895618 BLAKE2B d9ea154068caad5edc24888d23609a40be8006fb2d88b9eabf27142b3997e4e03eaa14fb04341eed9a8b896e911f737d3b0cc67803684c8fc37f5e1bff850578 SHA512 4c3ff0354a0fd4b561ed80f9a8cc63a98921a1dd584535805e5158d492424b5fb67aac6e02be76209910584f10dcebe3d3e954999346ed6cdf192aa340c2d2cd
 EBUILD Compress-Bzip2-2.260.0.ebuild 672 BLAKE2B 45273733edede821f3a1ffb540349256a30c575470a97cef3be89ff96e29c5060515af4aa6cdb30e948f85c318d4f724073e35116de2aa4033a810e5e3686d3f SHA512 a89f699f03d1894fb8b7f98a33991c83b37aa3ab0365fc2c7dff49307fef3c0326361bd4ed4558bdf9ee2e278068c94c9dcbdf2ac5b03a3d3d618bc728bfb620
+EBUILD Compress-Bzip2-2.270.0.ebuild 927 BLAKE2B 94b6332785c5b554ddaaba405f23fcd7a200b5e68bd8fd62fcb7ec4b5cbe1f4e1100c0262e35ee9ee04d5dfa0cd52c3b255a03b888b4bd21b15ece80305fd1db SHA512 8603cb1df677eae0fcf49521f33f370440e4d499aa2dfdaadd2d502fa79b87e0e23c3829d0c01ce6d9b9c13083f98d9a69e37cc246834041fbeda0c8421bf315
 MISC metadata.xml 400 BLAKE2B c512c84bdcbca2fb41f027d62b87c530dc853263a7f5b9fa60100817b32580e74e47a5957e2303de1dbb343c15d0ed4794185d505d38b67534a254dec1bf0bd2 SHA512 dfed7f8fa66ebd59fcb4cd990936135de4d58e0238d92c2b8969728a025bbcabc3b894308acd647f51a42e3b6a4d24320ea905e6f3232ceff6f50b5acae35c46
diff --git a/dev-perl/Compress-LZF/Compress-LZF-3.800.0-r1.ebuild b/dev-perl/Compress-LZF/Compress-LZF-3.800.0-r1.ebuild
new file mode 100644
index 000000000000..4c3508ba9f93
--- /dev/null
+++ b/dev-perl/Compress-LZF/Compress-LZF-3.800.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=MLEHMANN
+DIST_VERSION=3.8
+inherit perl-module
+
+DESCRIPTION="extremely light-weight Lempel-Ziv-Free compression"
+# lzfP.h for BSD/GPL2+
+LICENSE="|| ( Artistic GPL-1+ ) || ( BSD-2 GPL-2+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="virtual/perl-ExtUtils-MakeMaker"
+
+src_compile() {
+	mymake=(
+		"OPTIMIZE=${CFLAGS}"
+	)
+	perl-module_src_compile
+}
diff --git a/dev-perl/Compress-LZF/Manifest b/dev-perl/Compress-LZF/Manifest
index d780d24e8188..28f576fb6716 100644
--- a/dev-perl/Compress-LZF/Manifest
+++ b/dev-perl/Compress-LZF/Manifest
@@ -1,3 +1,4 @@
 DIST Compress-LZF-3.8.tar.gz 31727 BLAKE2B cc704d95ee8569c4ce9a28f09d8cca061011c534ff45b85285679ce713fb4741a01a821c0cac49b087c4ee70d16efa996b1e6988467f9b4f5947f5416f12cfb0 SHA512 363c8ee73f1791c1a772bfefc82da5f1b883a27de74205f8f15cf36223a683811f8de98fba6e94a72ff73b2a325ef9fa07ea8f7aa2feeb3045d5b36dd613c22e
+EBUILD Compress-LZF-3.800.0-r1.ebuild 468 BLAKE2B 8be1396db403367d9eee542d31aad1bef641e3e7823ea22a7f3de14f3403e51e3240558665a852d156f60badc332039ffb53660d87b1c1c78fcdcf0939fc4352 SHA512 d65b87aa4b6047fae6cb7210bf0ac6f01a2bc1193ec79992d53f69d067eb282a7d233702fb4605fe775132d0690f35c6a8974035c2ffcfe7c6850fa8f50169fd
 EBUILD Compress-LZF-3.800.0.ebuild 343 BLAKE2B 53685b68ac4b3ed198b4fa1351a6f0134e8dc5ca7ef41ca23b9106450bb5e6b6225be72338c8792f7cab67e70b0f59a8b244b5960d1575212ce35de062ed3d38 SHA512 c284e67de81eb80362e7a9f4b7040e6eae0a19da7c9d214728ad8335d90f78a2d642c7f2d3fd7010b82939fa0a098e424448c2e2fcfff51e3f6733a87e8f3519
 MISC metadata.xml 396 BLAKE2B 52f2b1b079444ff8a2f397cd5b3835629524ddde3798079d7e168966d4df3d6644bb36468892a4801bb982a529216c38992c4c61b1ddb2f32d450ccd4da5531e SHA512 dbfcea90c54880bb6814c65ced7a98996d4fe15374fbc5014bf2cec8c3bd4c745dde19cfb0e4e096309d9d59a159d51e0d5b8c0f75762b602ea4e7df9a16305c
diff --git a/dev-perl/Config-ApacheFormat/Config-ApacheFormat-1.200.0-r2.ebuild b/dev-perl/Config-ApacheFormat/Config-ApacheFormat-1.200.0-r2.ebuild
new file mode 100644
index 000000000000..794d06a64a28
--- /dev/null
+++ b/dev-perl/Config-ApacheFormat/Config-ApacheFormat-1.200.0-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=SAMTREGAR
+DIST_VERSION=1.2
+inherit perl-module
+
+DESCRIPTION="use Apache format config files"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	>=dev-perl/Class-MethodMaker-1.80.0
+	>=virtual/perl-File-Spec-0.820.0
+	virtual/perl-Scalar-List-Utils
+	>=virtual/perl-Text-Balanced-1.890.0
+
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Config-ApacheFormat/Manifest b/dev-perl/Config-ApacheFormat/Manifest
index 7dbd82d6f0fb..526eda719574 100644
--- a/dev-perl/Config-ApacheFormat/Manifest
+++ b/dev-perl/Config-ApacheFormat/Manifest
@@ -1,3 +1,4 @@
 DIST Config-ApacheFormat-1.2.tar.gz 56817 BLAKE2B afe86cf760842cf18a11794067aea3dba99816e6e40df3c92efd09bd50fb2937678747f340474171517d4cbfeb9361079bc8d0752ce07cdfdc6ed108b3d90346 SHA512 4e57d191692834128ce06510dbe9c94a9e2b5f45ef4d2177380b2800f5689c6178182e8843657f90a5374e348d2152856a305585ba8ec851eb9ae2d667b6b71d
 EBUILD Config-ApacheFormat-1.200.0-r1.ebuild 412 BLAKE2B da49c252e6e23e1e1ad05f7822b2cb875d6a455edb31832153608cfd5e0bfa8d6a16e3de03b824ee4263b9203dec7449bf9a53c53b0de63fbf68e8b18073dcb4 SHA512 5062c6192897a9cfadea03e706358e704d6f8bce46ace0ccea623d27779b1fbe2c671cc13ed07e8685b934638c0f5b93d03234b6a4d49281c7087759f62e7692
+EBUILD Config-ApacheFormat-1.200.0-r2.ebuild 486 BLAKE2B 26cb56c5cc356ba6dd212ca6caaaaa296e21e97c154648ad4c612e1bc4298693aae7416d93c80f774c757337cecd550dba62ed20c249d8bf9ea3da026514cfe5 SHA512 0fefd49af6e69391552cf3161574519def6173effb099267e5dc45f76b7b9ccda6da7dd0b6aa748ecab97bf712f1afc8524f5ca0595618efd1ca283b2c266929
 MISC metadata.xml 410 BLAKE2B 009aee663b43643cddf78ca36a65766d6425b1c90b10a5947f731922bd810464dadc70d21a3de057a804256c3afb99672463616c0826d2df4e057027798aedf6 SHA512 b654dc1858a472433d1b5b635757f7c561883c90e101cc2721fb7b77d8e1fb33bdde41cb3ddbebcd6f3d97aa05c4917ac21dcb9ddd06f5149b1291584e28673a
diff --git a/dev-perl/Config-Auto/Config-Auto-0.440.0-r1.ebuild b/dev-perl/Config-Auto/Config-Auto-0.440.0-r1.ebuild
new file mode 100644
index 000000000000..ced43262e822
--- /dev/null
+++ b/dev-perl/Config-Auto/Config-Auto-0.440.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=BINGOS
+DIST_VERSION=0.44
+inherit perl-module
+
+DESCRIPTION="Magical config file parser"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-perl/Config-IniFiles
+	virtual/perl-File-Spec
+	virtual/perl-File-Temp
+	dev-perl/IO-String
+	virtual/perl-Text-ParseWords
+	>=dev-perl/YAML-0.670.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
+PERL_RM_FILES=(
+	t/99_pod.t
+)
diff --git a/dev-perl/Config-Auto/Manifest b/dev-perl/Config-Auto/Manifest
index 611da9abf831..ea27951b00ed 100644
--- a/dev-perl/Config-Auto/Manifest
+++ b/dev-perl/Config-Auto/Manifest
@@ -1,3 +1,4 @@
 DIST Config-Auto-0.44.tar.gz 16668 BLAKE2B bcf0d89b86ef48b4e51db8a067e411c5820592e7c940e0c5937939243c094c9bc11136d12206f650d7ffedf414dac39dd1a62a35a1bf0da0b7dfc8c9f8629304 SHA512 8102100c6c8fb0f644aecf429c265a3ed502497576cfbcbb011697a0eced072ae8e912eec99dc74796382a394036ade88df7b93d1a2882cd381ae789c71196f9
+EBUILD Config-Auto-0.440.0-r1.ebuild 567 BLAKE2B 43c50fad208e95943bf59f5bdee0291fd70019c3b5b47f22b1cf3f35aaff4cd10ae450e4b79d7849275935453760e376d75c5ff59e107a5000e80d288e7fb244 SHA512 fcfb881b9e029c21847ad558aff5eeb101b13072cfc49e55ef2aac2b38943075fc99659d8e66c4f8e9ba58772162a6beda8d626ccc4c75f668e4544d48c3f43f
 EBUILD Config-Auto-0.440.0.ebuild 531 BLAKE2B d1c46f1a06c1b4e23781d34c8f43e16ce4aa569ae927e41f7f5fb67e79d1db2961c97d1c3b8b243c3ffe1a8f70cc723c303e711c5bad5efa65539864677c79a9 SHA512 d11a407fecba27be3babe9f3916dbd479fb71a02a31b2a3272e470fb8b5fb8bbfc7b72781198727819014fbcad3b5edc24d716df50b754e9cbbbfd9681c8e382
 MISC metadata.xml 382 BLAKE2B 2c9f88739d59f5f19fcb1e7b9b595723e540ac4187a177590975dd9ff3545e6f15a5870bf75387618e54324f87a9fa7fded8bae2f2c5482615e30664cc9e4a69 SHA512 24b77d65231d7d1477f1c309aebfb3ee38724b91c043152eaa7aab13054998b30f346067526bcf5b1de6de8eee9e78ee844887a5b8ef8f04ec46cf5da41cf97f
diff --git a/dev-perl/Config-AutoConf/Config-AutoConf-0.318.0.ebuild b/dev-perl/Config-AutoConf/Config-AutoConf-0.318.0.ebuild
new file mode 100644
index 000000000000..630fb458247a
--- /dev/null
+++ b/dev-perl/Config-AutoConf/Config-AutoConf-0.318.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=REHSACK
+DIST_VERSION=0.318
+
+inherit perl-module
+
+DESCRIPTION="A module to implement some of AutoConf macros in pure perl"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-perl/Capture-Tiny
+	virtual/perl-Carp
+	virtual/perl-Exporter
+	>=virtual/perl-ExtUtils-CBuilder-0.280.220
+	dev-perl/File-Slurper
+	virtual/perl-File-Spec
+	virtual/perl-File-Temp
+	>=virtual/perl-Scalar-List-Utils-1.180.0
+	virtual/perl-Text-ParseWords
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( >=virtual/perl-Test-Simple-0.900.0 )
+"
diff --git a/dev-perl/Config-AutoConf/Manifest b/dev-perl/Config-AutoConf/Manifest
index 5556fe11d218..5c5d863d7888 100644
--- a/dev-perl/Config-AutoConf/Manifest
+++ b/dev-perl/Config-AutoConf/Manifest
@@ -1,3 +1,5 @@
 DIST Config-AutoConf-0.315.tar.gz 49738 BLAKE2B e1fe0be1c113a66583d4db40c81c74bd7f1884155c1f0da180546c2c26a2bb4b496ab4f8fce9f5a5cf4e22a15ace8fae8f2bf51e5a4cb662e8a58d5a9e83a808 SHA512 ab52d4d19ede25b1f7030b461b931f5cd5bc5f0af50a584a015b367ff2085b2e58826f079290a22194f50ef063c2ba8b469ced913e4c306f788ef28efa41f2e1
+DIST Config-AutoConf-0.318.tar.gz 51016 BLAKE2B 816c74e2abc3087b5a89327e462092b6cd11005545510adc76c11ad84348a8f7f8b1fe7af37d10b79769d80ca35f44791b16658dbe4aca128b831898c26d009d SHA512 b125fb1c708a518a251695450ae4208d84c7b0de7e34081e22659bf2b93699868f14867d824805e1162fa99d8e15ed1072caf503d20b3c2cf0e27642b4213077
 EBUILD Config-AutoConf-0.315.0.ebuild 676 BLAKE2B 9eb69c1d3712a637d67637c2bd13b2bc55a34d0f691e543553fd68b5a5125a32fbb58864411a85a9f535a8b0327f8a736648b39a47d328df4bc3039a7f0516bd SHA512 b4232d65d0d2c1715f6c704108f3db2e0201cecff3194b01f62d2e682cf65b294a9a10337ea9802677cfb5f7453bc49fb113cb15b1a0bcce63b7e0a77cdfe114
+EBUILD Config-AutoConf-0.318.0.ebuild 697 BLAKE2B 8167980d31738b802063f1ddbeaa1624eed3d1e0e1c01910f5c5289112c950a8d614abe0d453e0096211d217f4582a6e8bddd3f1ebefe53c8f356f40338df527 SHA512 e3beaa1893bd8d864adc9205a074a537232138d2c868a2e6ad9f1b571b38985704071784bb4f5c76fa294223daed0f0a4a4f55fb32da0cb0792130be36ab6ca9
 MISC metadata.xml 402 BLAKE2B 4cdc91bf4199fc7257fd8e1e24844b3a7e5dc6dc365e9f2e1d62c8928427138f43219dae7d87168c6706d59da3218f6da9668937920fef89942e005e6052eb56 SHA512 89053a14b4b092051ebb66bf194123691701f5a4c85cf31a3d0c4b6f063c93f1bf2211bf38f98318fb1dc2bd5705eedc07ef6c37e83683cbdf9114512cb1a25e
diff --git a/dev-perl/Config-Grammar/Config-Grammar-1.130.0.ebuild b/dev-perl/Config-Grammar/Config-Grammar-1.130.0.ebuild
new file mode 100644
index 000000000000..18e4df9daa14
--- /dev/null
+++ b/dev-perl/Config-Grammar/Config-Grammar-1.130.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=DSCHWEI
+DIST_VERSION=1.13
+inherit perl-module
+
+DESCRIPTION="A grammar-based, user-friendly config parser"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test
+		virtual/perl-Test-Simple
+	)
+"
+PERL_RM_FILES=(
+	"lib/Config/Grammar.pm~"
+)
diff --git a/dev-perl/Config-Grammar/Manifest b/dev-perl/Config-Grammar/Manifest
index 426a08e05014..7ce33f9fd0a2 100644
--- a/dev-perl/Config-Grammar/Manifest
+++ b/dev-perl/Config-Grammar/Manifest
@@ -1,3 +1,5 @@
 DIST Config-Grammar-1.12.tar.gz 26163 BLAKE2B ed0e1e38698dc1d3d09f7eb5026765a6a91d599b2d222016ac82d44d8da18035603e2ae97e13c1066d7bf0259993e0e9bcde2257f17c18854b9e713b74896332 SHA512 44d46019b32d891830d224b6002c2c73fd59c772b0308ac27ab68b5899bb921c74184a0c354a41c8bef3eb876eb1fdc0f07334bcaf4394d907059fae903ba12e
+DIST Config-Grammar-1.13.tar.gz 26281 BLAKE2B a94ff7ab3fbeac8849798cc778d5b764396d51a541d43fdfa622ff702b0492ad73fa29baa85669f6b18893238fcdea7f3feb3f8a7fb0948382f8e3301599f455 SHA512 51b165ccec452e48906d3c8972bb68841de93f0ece11104fea837eebefa1569e921a7532f7e4a3d204e73cf4c9b592f8707fc4741481c99b67d1b7a3eb5644d9
 EBUILD Config-Grammar-1.120.0.ebuild 471 BLAKE2B ae70df8a722f226d1ca3485291c3c07ad0d53584e3821b809311a1daff34f8db68494310684db0e0a8f53060b3009ce5f9d60866419fd40749cd778cd7e6abad SHA512 5c360d9988a48de87d1075edea1c38f74fc5b6959cf3d027c4ed2aedbb431f7b4d13fd01ca1c8258fe8f8cf31226b3f9f2a2cea2b4e22d51189ba8321cd5776b
+EBUILD Config-Grammar-1.130.0.ebuild 463 BLAKE2B aacc613b4d2f3b3fbc29b497e23afa1e28c8e070557e4b01c99fdd9703b69e45867f1c4124ff62b273487d0f16e9a90d82447b61e94d494e772eaf9f4344f096 SHA512 72d182a125a774a1a7d32b5afb45f78fca3351857994ad4c61dcd1e64939428d940ba96585248978204776805cddef782583e2b57f80fa36dce42f98fe72daf0
 MISC metadata.xml 527 BLAKE2B aceb69a7d2d358c5c3339deea2ccc479069026967991a651445ee5afa53814fab8d4c1fbb4e4aa1aeb2e32cb4d86ae31866f040f8cbdab453c2c274de378c9f3 SHA512 10fe45c66639538110f15fe789bfce411ccfd738991fbd1d730861822fe4d5e4b4c2e2ac437f658dcc58af1eb080a87eca4d573c9eba96d402454b44a3fd7aa2
diff --git a/dev-perl/Config-IniFiles/Config-IniFiles-3.0.3.ebuild b/dev-perl/Config-IniFiles/Config-IniFiles-3.0.3.ebuild
new file mode 100644
index 000000000000..95751383bc0a
--- /dev/null
+++ b/dev-perl/Config-IniFiles/Config-IniFiles-3.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
+
+DIST_AUTHOR=SHLOMIF
+DIST_VERSION=3.000003
+inherit perl-module
+
+DESCRIPTION="A module for reading .ini-style configuration files"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# needs List::Util and Scalar::Util
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-File-Temp
+	dev-perl/IO-stringy
+	>=virtual/perl-Scalar-List-Utils-1.330.0
+"
+DEPEND="
+	dev-perl/Module-Build
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.280.0
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Exporter
+		virtual/perl-File-Spec
+		virtual/perl-IO
+		>=virtual/perl-Test-Simple-0.880.0
+		virtual/perl-parent
+	)
+"
diff --git a/dev-perl/Config-IniFiles/Manifest b/dev-perl/Config-IniFiles/Manifest
index de6b146e3d77..ea192100bbc9 100644
--- a/dev-perl/Config-IniFiles/Manifest
+++ b/dev-perl/Config-IniFiles/Manifest
@@ -1,3 +1,5 @@
 DIST Config-IniFiles-2.94.tar.gz 65322 BLAKE2B ae3271acf5ebea9f479fa9142c0931192134ea0d25d361c2a0caa90b7ad95234983d6b4469ab73d302bda7ce2a719374b593233de728e5428511675fe3766eba SHA512 9ca9950f31a00bde580dc73b5120971070aa053f36f9a0ee29532b17b9a070de8ad3184631427ad442dbcbe087a9680366849b5e10f264e20694ddade7e3ca7c
+DIST Config-IniFiles-3.000003.tar.gz 70024 BLAKE2B 215896e05d09ab5c7d6d6ddda768c7eccfbac808eed3b3a6c89218a06bb813af404c621e1dce28a3aa4869fe49d2dbd40da354ec3b3b36a2a1e5d1c50d9f0a32 SHA512 29278b7f6aaf9ffcc0cd8b48ca0e1f1084b10278e50764b2b93e3e9b156ef13d6e54f779f41d0a6cbf6e0b23da1b73a3bb83fbf873add0a604693a41312b91f5
 EBUILD Config-IniFiles-2.940.0.ebuild 874 BLAKE2B 7ad1f5f4cbe5aaf42d3cec580e93ea826e08fe3e04250e23cf83aaad4ba15f975e2012ba2be682a414d57347d3d6fd17f5cf95550e30d4d639a982050f0977c4 SHA512 c2150404fbd5024f5c889fbb94854a548c5f92c9a886d2bb6fce8abebb2e969c90bc1dd76c5df2018709cdaa983de1e0c3815ba9c13917cdbe1d31b65d0626a1
+EBUILD Config-IniFiles-3.0.3.ebuild 734 BLAKE2B f9521d8bfde5198d0b258bc203ac265fe8c518d49346a84d48e640cc895488749965a59785fec8801797b2dd8211e7bcaf5cb0bc63fece407b6955db59d09699 SHA512 c4b21bf5f0a8379fb2776b808f8ce072d8f0d4022e19d957dfd68b823f69ae167550ce95f3b9334b65f93faf28cd13192e1e59c34517ba4ed286080ff40cc08c
 MISC metadata.xml 402 BLAKE2B 6632689946b6483d11bfcf66259edcc54bb677611013bca728bb800259b3805a270dcaae3eeb2094991461d56f6fab6be52e19638dee1adaa34a2f2e5c1c7f31 SHA512 13672b5157b7f35dc04937cb69ebad2a00cd15e5e0105e92ba61fd40abdb2df51264868c7d990a1c448920b040123130f05fd91dd0aef679a12b4d653282611d
diff --git a/dev-perl/Config-JSON/Config-JSON-1.520.200-r1.ebuild b/dev-perl/Config-JSON/Config-JSON-1.520.200-r1.ebuild
new file mode 100644
index 000000000000..bc5ceeeb897f
--- /dev/null
+++ b/dev-perl/Config-JSON/Config-JSON-1.520.200-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DIST_AUTHOR=RIZEN
+DIST_VERSION=1.5202
+inherit perl-module
+
+DESCRIPTION="A JSON based config file system"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=virtual/perl-File-Temp-0.180.0
+	>=dev-perl/JSON-2.160.0
+	dev-perl/Moo
+	>=virtual/perl-Scalar-List-Utils-1.190.0
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	test? (
+		>=virtual/perl-Test-Simple-0.700.0
+		>=dev-perl/Test-Deep-0.95.0
+	)
+"
+PERL_RM_FILES=(
+	t/release-pod-coverage.t
+	t/release-pod-syntax.t
+)
diff --git a/dev-perl/Config-JSON/Manifest b/dev-perl/Config-JSON/Manifest
index ea62951e7bd4..be9a391c420d 100644
--- a/dev-perl/Config-JSON/Manifest
+++ b/dev-perl/Config-JSON/Manifest
@@ -1,3 +1,4 @@
 DIST Config-JSON-1.5202.tar.gz 18288 BLAKE2B 96630a8864623931969d50d824889dcba2a7ce67087c625c64a586ef1cabda5bd9bc710a2a568355bec275ea36010c2df49bc97eba67885b33870d92cebe3917 SHA512 13821db9318af9b3223e01bc28442a520880a098c333b89a67296fb34979bc0fa9c98a93470a72185e24789c66d607f2c932d6ff4e9a6e407359b86dc1be646f
+EBUILD Config-JSON-1.520.200-r1.ebuild 629 BLAKE2B 7685c462b79977d1db4cd29d2a16e68e319c9a7bfcb3d9073eb08c47d406e647b0b4e11d7453deaee5e08714f9a44b8ab14b0e7e7ae3704dc0b32cf404d69ba6 SHA512 840d8ab52eeb85966e23f35259c07f80782c6e58285f2d88b5a82cb5c5b3d1acd11e737a984ff2d280563522a8b0410adfe0f52d061c4184c1f49856315879ee
 EBUILD Config-JSON-1.520.200.ebuild 579 BLAKE2B 48f968605936d408dce3c58498a03c29c988fc4bd55f77ca2811ce97176abb6b0f89bfca9cadb465b78192c3c89a485f5d4bedace71e13e15e2ebeec3363e828 SHA512 bb1f921b48956dd591db565444eaa0d92ffa344b3631303dd49d7d1a153fe680a6078230ee51bb0616eb89212c414ac49197d30f96021eea1583031ab0deca7f
 MISC metadata.xml 466 BLAKE2B afd60a1e710a7f6a8daab61a85c7145ac3e1938ab93e5405d5a585652fe1f590e81f04729fde7f20cbd55106c4b5711fc325ac601a88a53662e68f35203afb01 SHA512 71241c10df29ebe1d728e12ae89476e2565c7a9e9f9bdd9417077d35b2ed7dcf5171bf794193c22db1f4e19e65f2c8908c38a35426e69a8d06946dc8be828690
diff --git a/dev-perl/Config-MVP/Config-MVP-2.200.11.ebuild b/dev-perl/Config-MVP/Config-MVP-2.200.11.ebuild
new file mode 100644
index 000000000000..bbfc6b109458
--- /dev/null
+++ b/dev-perl/Config-MVP/Config-MVP-2.200.11.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DIST_AUTHOR=RJBS
+DIST_VERSION=2.200011
+inherit perl-module
+
+DESCRIPTION="multivalue-property package-oriented configuration"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test minimal"
+RESTRICT="!test? ( test )"
+
+# r: Module::Pluggable::Object -> Module-Pluggable
+# r: Moose::Role -> Moose
+# r: Moose::Util::TypeConstraints -> Moose
+# r: Role::Identifiable::HasIdent -> Role-Identifiable
+# r: StackTrace::Auto -> Throwable
+# r: Test::More -> Test-Simple (Yes, Runtime)
+# r: overload, string, warnings -> perl
+RDEPEND="
+	>=dev-perl/Class-Load-0.170.0
+	virtual/perl-File-Spec
+	dev-perl/Module-Pluggable
+	>=dev-perl/Moose-0.910.0
+	dev-perl/MooseX-OneArgNew
+	dev-perl/Params-Util
+	dev-perl/Role-HasMessage
+	dev-perl/Role-Identifiable
+	dev-perl/Throwable
+	dev-perl/Tie-IxHash
+	dev-perl/Try-Tiny
+"
+# t: lib -> perl
+BDEPEND="
+	${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		!minimal? (
+			>=virtual/perl-CPAN-Meta-2.120.900
+		)
+		dev-perl/Test-Fatal
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
diff --git a/dev-perl/Config-MVP/Manifest b/dev-perl/Config-MVP/Manifest
index 787966f23cfd..f15c5bcc4f94 100644
--- a/dev-perl/Config-MVP/Manifest
+++ b/dev-perl/Config-MVP/Manifest
@@ -1,3 +1,5 @@
 DIST Config-MVP-2.200010.tar.gz 32947 BLAKE2B d49ef8bf74ee740ff4eac13696fd6bdb943030590e54fb80f14d3cb6a07b38b2ec4b0b5bc3623e89620669fd85139e2eeafc7492208cd01850f46602b6f31075 SHA512 b0febad2c80ab3e9d8c19b2a8b6c8a6bdb1e2358fa7a3c436e639d75ad15560ac4aa08f88c67f32f28dd9fe491ae7b156715e93d0078d27cee20e16016154052
+DIST Config-MVP-2.200011.tar.gz 33387 BLAKE2B cd57bc21b3106ee991dcaf07017a41dbec4453bc98b823820f431d86101ed0c0a0814a8617c37b3df1bf1a264ff07a184fedc94920c68946837e3852076b0f92 SHA512 8e4c178b355a5e4ef4a1d7f8b304a1411f19f6ca601e6ab6593b0b3e9002f7f5ba64eb49714bc155741651dc501b87296e2fc4a3388e7616efdd4dd893866606
 EBUILD Config-MVP-2.200.10.ebuild 1121 BLAKE2B 734a2e9809a647321392434b4f9b9807884d6005981708dc18787456e390cc12eb18acfb197c45150ac2cc73f2c90f9a0815b0bf2801c23325b5919d5b8e4d17 SHA512 ec0042dae46efdbff2c61ad1331cd3377ab3e55b176d62b98c309b0d9bf712b4b12434b7f00e666f7e44d2ae07d61fcf62114e997b1b73866d2ffc8186b976d8
+EBUILD Config-MVP-2.200.11.ebuild 1097 BLAKE2B ed8a4aa634c898c30e6d5e23bb8ac74fc7e32b60827e250c8aa2b8907149ed55694fda55560eb3ed30628137a2c7ca1ca6babd32e7347b710d6cd6e30cb28d6d SHA512 bd447399e64818371737947f12be16850dd94fcc84c673edc67c296aee0b2e5b58b2348bc30977c4ab7853ff26682fba8ce8f8c41fc39a68e458e7d2be9fc7c7
 MISC metadata.xml 1120 BLAKE2B 907f79c0e2bd0f6d98f0b29c6142e89560a33417cde5ce0c2a4b9c0c0d65aeab720cbd8775bec33df54635c4a25cd6e70306759118d732420abd1a793ed75c8f SHA512 5dbdd3e476561f08efd747c14edf5353ee9d8edd3ae50830167aa47f1d2498350dffe4eecc0fb6b9d79031f668b43865c3f25bcb7aba8ecf5ab4d63be64a7729
diff --git a/dev-perl/Config-Simple/Config-Simple-4.590.0-r2.ebuild b/dev-perl/Config-Simple/Config-Simple-4.590.0-r2.ebuild
new file mode 100644
index 000000000000..f5121e6b5d97
--- /dev/null
+++ b/dev-perl/Config-Simple/Config-Simple-4.590.0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=SHERZODR
+DIST_VERSION=4.59
+inherit perl-module
+
+DESCRIPTION="Simple configuration file class"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
diff --git a/dev-perl/Config-Simple/Manifest b/dev-perl/Config-Simple/Manifest
index de593f86ee25..1152b9dbcda1 100644
--- a/dev-perl/Config-Simple/Manifest
+++ b/dev-perl/Config-Simple/Manifest
@@ -1,3 +1,4 @@
 DIST Config-Simple-4.59.tar.gz 21010 BLAKE2B 2cd25d0ca38ec63b0dbfb91b87430859d349d1d578d3a222051f6cb67d0f63bc120ca00bd10b6ab95ce1c25d817fb4ba1c83491cfb281eb2167a0374e8fedeef SHA512 23eb4f5ace1288c3d2a6105fa109d08e8170f4c1b5f6a28b460bb9e0fb62c66c7d392712fca0c96d83c4a16f5c940fcbc348d700a7bef86bf2ba37cd114c8a14
 EBUILD Config-Simple-4.590.0-r1.ebuild 372 BLAKE2B a66833e85332cea711ccdf3aab395c9c9a89fab05fcb8d615f8e9fa022a80d2ddb30bf0ef191c625ea46f2a2998709684875986bb6d437407749e82cc818e86b SHA512 209736485201bc1cf540de7a27b2020b8bfd8afef85bcbfe95bdf98d59a42962eb38e7b717fe3ad3d61d3d95a59fad0f5d0f4b09fe34a3aee19de3638c3cc142
+EBUILD Config-Simple-4.590.0-r2.ebuild 329 BLAKE2B 73d250a87ece01288541d2e221362cc31994bc8ba38ab58ee072e16db33953c2db2f27eec3e34d180479034a55df25ea86c80f0ff5c2b287c994f30a5d2d7b1a SHA512 ebffbf8ccfe5b35b2dd82d8d15bde60b444d92ffdaadc187e509a56e73f04eba46f74835c1067cfa67b6502abb7fc1aa4fbb2a7a2218fef637efee0d3b700188
 MISC metadata.xml 398 BLAKE2B 7f9cd1b1ff3ca4f0123b6c02e3bb99d4fc82ef93c4018ab9af4c1440289ed0eb442d87cfc7cd818b2dd1b8d00058228e8a326148bff15af882b6cecf7d5f864f SHA512 5c87c7ad4958150b5ee898b012ea4898495d589aee787e439111b60b21eed4d236d99c15a80ac9d58b137c45c1fadabbae0d2954f115a76e31707055c2ce9a53
diff --git a/dev-perl/Config-Tiny/Config-Tiny-2.240.0.ebuild b/dev-perl/Config-Tiny/Config-Tiny-2.240.0.ebuild
new file mode 100644
index 000000000000..41ac6f0d9da7
--- /dev/null
+++ b/dev-perl/Config-Tiny/Config-Tiny-2.240.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=RSAVAGE
+DIST_VERSION=2.24
+DIST_A_EXT="tgz"
+inherit perl-module
+
+DESCRIPTION="Read/Write .ini style files with as little code as possible"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=virtual/perl-File-Spec-3.300.0
+	>=virtual/perl-File-Temp-0.220.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Test-Simple-0.470.0
+	)
+"
diff --git a/dev-perl/Config-Tiny/Manifest b/dev-perl/Config-Tiny/Manifest
index 96ea2251bea2..41c59a09cfd0 100644
--- a/dev-perl/Config-Tiny/Manifest
+++ b/dev-perl/Config-Tiny/Manifest
@@ -1,3 +1,5 @@
 DIST Config-Tiny-2.23.tgz 20487 BLAKE2B b9b801fe529d79c00d6e317b84df1619c0e3a7f998c8e090ed64405966d602abe3325581bac5b043e71f29f4fc70895ce3d20c818a44e16bd45ec80c6ef78da4 SHA512 c5c77aa18a387f181ba9bb2df8859c328073521e14163fe04fd7a104928bd68cf654eab88d24bd23e556e6ecc139dfed716fb7b8119e98cd2ab6f6915c976f01
+DIST Config-Tiny-2.24.tgz 24329 BLAKE2B c02333bf08f7f65187710e2ca333cfd4cb5ffdff69825fdd7cab371a47deedc1b3bc79df2e15aa1fa22b7dc4cdf85d241312e0f3ac5e8538b7d3b03041fee74f SHA512 7ce660f947351c346f553a1f0424e6c5710c9334090791525a5ab3d7462f6754315602028de4da7f2aeb72303df68d7419e15bea73c8f161830216b26fdfcb40
 EBUILD Config-Tiny-2.230.0.ebuild 726 BLAKE2B 30426e11b49c12919d078e6c75c4a57d92f28e65ce25e1be2addedeeda36c40fb696ee83c2ed0665ab3dc96b09a7f744a9c5305cb9c35d48904e95c45de6a104 SHA512 57a4049168ae59b4c5bdd15a45ccfd915004b9abb06b4121a2775ae23d09ded0996c1e95517ea89fa3e462e2d218b543e3d9c953bd08c4669ea0425fdf69942a
+EBUILD Config-Tiny-2.240.0.ebuild 704 BLAKE2B cf38a44550132e6019dd690b36f72843d29b3d185a97b0279c89df54f05a7377153653f285eb28485856fd3324f9d6e95e49d9abb459307c8b25f84f1ce1c1f8 SHA512 9d4f665f4e38fae77bbeea291b254db5445be4e0cbde891fc1a7f86eacb18735f3e292444b56069169c3442c41784676ff735171c3dfb045579c81404295d4da
 MISC metadata.xml 394 BLAKE2B 3dbf4d403e27f06b66f9782f8b72e29a753f65fee08cfc690cf6f5ec3f676b8d6274fdc6cdf05c375202c87858fd7dd2ace53f9c0c3aadd47e2cc3ee62de6a1a SHA512 678f52d06ea7925469aea4b382628a360020324f3ad5b7d1b63c0a31f68635616e2bdc9c7c1aea659db417e845b4464a7c617c524df61b00c72f9fe435fcedc3
diff --git a/dev-perl/Const-Fast/Const-Fast-0.14.0-r2.ebuild b/dev-perl/Const-Fast/Const-Fast-0.14.0-r2.ebuild
new file mode 100644
index 000000000000..27a9d59ba25f
--- /dev/null
+++ b/dev-perl/Const-Fast/Const-Fast-0.14.0-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=LEONT
+DIST_VERSION=0.014
+inherit perl-module
+
+DESCRIPTION="Facility for creating read-only scalars, arrays, and hashes"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Storable
+	>=dev-perl/Sub-Exporter-Progressive-0.1.7
+"
+DEPEND="
+	dev-perl/Module-Build-Tiny
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-Tiny-0.21.0
+	test? (
+		virtual/perl-Data-Dumper
+		virtual/perl-File-Temp
+		dev-perl/Test-Fatal
+		>=virtual/perl-Test-Simple-0.880.0
+	)
+"
diff --git a/dev-perl/Const-Fast/Manifest b/dev-perl/Const-Fast/Manifest
index 3b407ef18e48..7fd27e698efd 100644
--- a/dev-perl/Const-Fast/Manifest
+++ b/dev-perl/Const-Fast/Manifest
@@ -1,3 +1,4 @@
 DIST Const-Fast-0.014.tar.gz 12886 BLAKE2B 7df39021b15d15b8d3bde7519921bf7a3a685cc15be5706e880f10aaa1e7df299f3eb268807524c64a28413d35cfff7dd07a704b721641e61aaca666f17ede04 SHA512 89258205fe31aa5a60759ed955e6dae305de69f4bc08251242a82eec9e37251b045908585c470106ed9047f604d3292eb3231c80504b29734966b58b8402a929
 EBUILD Const-Fast-0.14.0-r1.ebuild 676 BLAKE2B b8f7ea47b9e1f9257b10aac36948dc18889df505dd4da2f86f027fa2243f3954d80a601aaef01b2f2e3cb9db3ceb54ebfeeded6e18eed5e1724a00faaa76a728 SHA512 b5185645645a21f542e835fedb606b3d6af2f72b041df40667963e50753205f5f19cfb8d9df74b73bc4c27645912f1a9b045c77c4dba8edc78b873dda9fd17a6
+EBUILD Const-Fast-0.14.0-r2.ebuild 683 BLAKE2B 548cad09e8a2f78d3f8977a055f361c5de2b843cddfd56f1f02c5fd07be866102775b20aecaef01e33aeb039cd2818da91ab62402b50c43eaf9b57a036031218 SHA512 34ef07a3efd59a069bfd43ebeea0adea55afb6aac6044812634257e2d8bd0e4d63f2cf09a686ab6801717c9cacf761ca6a139aedbf9437a47e926c0a66bc5eb9
 MISC metadata.xml 911 BLAKE2B 6814427d9855cb4d16ea42a1b46f146c1ab5e6c9c9eb9ae4e2bf5d20213e1581e8800ccc67c3e9aafcd65dca31ed65dd3668fa445472970a22f1fc9bf00764cf SHA512 8716a9bed0f681742c5353b6b604a60b0c01e1e1fd657a726a89301b1fae8e22491ed28940ccbe11158f674a398bc2ee5842458a9c7ec3b4dec70bddbfadccc5
diff --git a/dev-perl/Context-Preserve/Context-Preserve-0.30.0.ebuild b/dev-perl/Context-Preserve/Context-Preserve-0.30.0.ebuild
new file mode 100644
index 000000000000..3e3809e37f3f
--- /dev/null
+++ b/dev-perl/Context-Preserve/Context-Preserve-0.30.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=ETHER
+DIST_VERSION=0.03
+inherit perl-module
+
+DESCRIPTION="Return chained, modified values from subs, without losing context"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc-aix ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Exporter
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-CPAN-Meta-2.120.900
+		virtual/perl-File-Spec
+		dev-perl/Test-Exception
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/Context-Preserve/Manifest b/dev-perl/Context-Preserve/Manifest
index 30f1b42b83b4..2c4bff00eb0a 100644
--- a/dev-perl/Context-Preserve/Manifest
+++ b/dev-perl/Context-Preserve/Manifest
@@ -1,3 +1,5 @@
 DIST Context-Preserve-0.02.tar.gz 25305 BLAKE2B 6974a9a8827e67652e407dfb05099449bfd2ed8c672552235746dd13b1504799694390e537795946eb4fbdc703e5aee129b40128d35d0d9145fcfef56931d229 SHA512 e5c230e38430c6ea9b7ed75e075a12454262adf1883e5ab6ada4696099e2f246d0f9b613934b4197b0529e126ea083d12d9bbe4ece5cfb82a93f913b7d70b068
+DIST Context-Preserve-0.03.tar.gz 25915 BLAKE2B 78866e1c0d20f12fd95da981d42f8de2405a9bbd092d5518c777d7897955b8823c8607f49469b556fcfa58dc48643ec50a394e7e3e938f5777f8b3c65602f21b SHA512 a5f412d553ba2ded7302f594b920bd9c04021c5ec60e94939da097a0fa2de61a0b49dd864e3212eb9b3a7d5236295e1923452e81d56789ae6852c73ec3086cea
 EBUILD Context-Preserve-0.20.0.ebuild 580 BLAKE2B 5c5a50c7ec3166b43b19209a5820d1742fe6543753e39a58e4d64a3c8f6da05f8be39042d60908f4684626101548ed0dab4a88959e2c655173e1ef34e940bc65 SHA512 21de20680111f85a4c2eeaeaa4438aaea8d533894abad7792e968de1e04198f96ed49c24da7c8ede73f18663d427138ef6c5897485cd0ce36e3e62cef6cca0cb
+EBUILD Context-Preserve-0.30.0.ebuild 581 BLAKE2B 165a0494a4124e92653f9cf2fd5e8ac5fb149500787fad8a75d9197fff4238315718a40a3ab006b90cb1da1427532faeb4c32eadcf388ac8b4ed9548b51e3cc8 SHA512 73c1b9f8140aae2ace5328ff22514bbaf003bc09d77ddbda5fb10d2022d40df71ecca05862f59918c97e93e8cc181c2c4c16b66353f9164aa3ad2ad4a6273b0c
 MISC metadata.xml 404 BLAKE2B ec63adad9597a82a537ad43f1d34c8b7ff68378f565eb53c154de3ca7c7324700b8c025a3f77d50349a847c14e449d9395a8d101b95296dcabcc7cc4d4f18b3d SHA512 1601b335caac702807e3fa41aa6ba625b85ae3c3736e4dc2f47c39441feb6da54d3a19630b35d6d8d103fd1418a8b05e36d81aaee6ef4226a60afd26d6b9310e
diff --git a/dev-perl/Convert-ASCII-Armour/Convert-ASCII-Armour-1.400.0-r2.ebuild b/dev-perl/Convert-ASCII-Armour/Convert-ASCII-Armour-1.400.0-r2.ebuild
new file mode 100644
index 000000000000..3c426a736b2c
--- /dev/null
+++ b/dev-perl/Convert-ASCII-Armour/Convert-ASCII-Armour-1.400.0-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=VIPUL
+DIST_VERSION=1.4
+inherit perl-module
+
+DESCRIPTION="Convert binary octets into ASCII armoured messages"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+RDEPEND="virtual/perl-IO-Compress
+	virtual/perl-Digest-MD5
+	virtual/perl-MIME-Base64"
+BDEPEND="${RDEPEND}"
diff --git a/dev-perl/Convert-ASCII-Armour/Manifest b/dev-perl/Convert-ASCII-Armour/Manifest
index 0b66cfce50dc..4376be5d17a5 100644
--- a/dev-perl/Convert-ASCII-Armour/Manifest
+++ b/dev-perl/Convert-ASCII-Armour/Manifest
@@ -1,3 +1,4 @@
 DIST Convert-ASCII-Armour-1.4.tar.gz 6002 BLAKE2B 10d249bd435ab135675af1d43e7ead415f0e3a89fba098bed3f7c290e6350929d0a3fe59b6ec62e2dd7480439d582732bf851a31b3337c3c2b1e93644c59ff0b SHA512 ba3b26dc440099374a60b374e4c1f92c0824388b7247f5cd0fd3403d6c2b7c3e916bb0cb98654e4a215352bae5728d3db239d657964695ae4e9be6a44c484a34
 EBUILD Convert-ASCII-Armour-1.400.0-r1.ebuild 497 BLAKE2B 69fb562ba341af5ceebd4884be9a90edae8096401694d80c806d8272bb326aa925e594f6ecfa25a98a7560a61aa3228f1a628654fc6b6c9e40e1860e39ffb38a SHA512 15096479dad75cbfcc7e42db5a16afaa529b5071478077f97cd0d30b88dbe59aa81014c9857ada3e9bc383c552664eeafb22ded5ba9860023aa6ab06ff46b19f
+EBUILD Convert-ASCII-Armour-1.400.0-r2.ebuild 478 BLAKE2B aee52844554864b42e29b8c53810567b858c86aa869704654f1fad5a44819b6d3ef08bf1bc15bc16380c8aca52ad748e0520f05c863deaa125552723b34e1583 SHA512 99f1597420b749f1c11025b06730cde06a2edfc73e4d3e7f45eb08ca1e4812da1d4f0ffeff365e15a23d2e52f926996e32550ee87d8438c655f5af68c12da5de
 MISC metadata.xml 481 BLAKE2B b9bd20aafd91d204d9292203e7b78a51a63c7338267ca3105d0a81a59d6c4ae20295aca8994fc54bd8f5fa18186ba2688dac62d9baaa9646f3dd268937bbbfb0 SHA512 a5d604c4ad26b7575c77ef892b07201c1b941445e43355f4a0f50015dcb0d9389fde8c148f148faa22e279dd94e8d9df35b08d1b0b0820ddfda7ffddfd585ad3
diff --git a/dev-perl/Convert-ASN1/Convert-ASN1-0.270.0-r1.ebuild b/dev-perl/Convert-ASN1/Convert-ASN1-0.270.0-r1.ebuild
new file mode 100644
index 000000000000..99a786a4ec70
--- /dev/null
+++ b/dev-perl/Convert-ASN1/Convert-ASN1-0.270.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=GBARR
+DIST_VERSION=0.27
+inherit perl-module
+
+DESCRIPTION="Standard en/decode of ASN.1 structures"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	test? (
+		>=virtual/perl-Math-BigInt-1.997.0
+		>=virtual/perl-Test-Simple-0.900.0
+	)
+"
+PATCHES=(
+	"${FILESDIR}/${P}-perl-526.patch"
+	"${FILESDIR}/${PN}-0.270.0-CVE-2013-7488.patch"
+)
diff --git a/dev-perl/Convert-ASN1/Manifest b/dev-perl/Convert-ASN1/Manifest
index 576e1e82f29a..27247aa469be 100644
--- a/dev-perl/Convert-ASN1/Manifest
+++ b/dev-perl/Convert-ASN1/Manifest
@@ -1,4 +1,6 @@
+AUX Convert-ASN1-0.270.0-CVE-2013-7488.patch 1362 BLAKE2B 670b391c12cfa89051440fae8e796248b1f70695b95f47ad0bf420034b8b669a757b380be94ec530e6e692440170fd1b804e3c75b38d82bd5bccc41ea6083ff2 SHA512 6b4da9b77f9b7f7b0cb096858848568ca0ca2e52e359b53bb860965051356e310cfd5b916bcc16e0ac0562f4383aa2b9dbace394ca6e690b5aa39f44c850b5ef
 AUX Convert-ASN1-0.270.0-perl-526.patch 6189 BLAKE2B 93614ec863a4a90e195fb7e99e4e4a6b729fa1d154a85d9d9f72232ff9cdca50868d5ba320653853ae6da5d612533d57cb9470c56ad2e01e979613cf628509bb SHA512 a6805154a0b7da8af86c101521b74d88562e34f95890ab62221bd7d0d03a41a1dcc82b26eb79383d84274abbb9ed4c683f627e75434062b7cf0984b340f5192c
 DIST Convert-ASN1-0.27.tar.gz 74081 BLAKE2B 14929ec5f25ac85465204fb8f584384c5c65e73cb3ee5bfd9510a9bb2580e7c1a86f485af99ab7cd83813914ae6e277020720d26af8d2bda54acdd06fff7e984 SHA512 253bc0c1b2919841497a95bcbd05825217a3013c7f789fd9f3d389808fb015daca91f5c149797574bf32d38e94efb7f1d8df62e9e4c13928ec3b978cc9fd6fe8
+EBUILD Convert-ASN1-0.270.0-r1.ebuild 675 BLAKE2B 0611093a48c2e35bc4e989b7bde0062ea851868e10c82c7adfeeda25e47288717b14db7559ef8aa79669f5eec2e4ad56b031f15f3478e432c901908afc5d8f04 SHA512 784cca97c52362af554e641540104c9fb4aa3b06b5e2c7458cb986fb9ff59e40f2ca50d732f7e1ae55e307deff2ff6cf440ae4fae706767bd2c8913c5754c833
 EBUILD Convert-ASN1-0.270.0.ebuild 654 BLAKE2B 91f2a2ee6944fd0a713bc60d0f46dadb51888fb0ffa3d5e259a800df0daf1844578771d4f04b1bb29462b9562f45fa3ffa465273d4b17e96a5dbb0c7b4869398 SHA512 0b84c807e0e3306a8e87b8803362b9eb466cb4997505766c8b7b99c8b65ad7fcb9c7420d950ea738d01ffda5451326c3d6bafc5d5c4dc99187b965a725479ae3
 MISC metadata.xml 396 BLAKE2B 835109f7d055b2dad36326d3f8cff1c08596d68b70a2688a7800c5c7baaea3e3282d491e1b2a321aa2ea1d510a4f9cc69448ca3193317d08abff39717ca3c25d SHA512 8e9334d912a55b1da2071790da0a113a4f841babee48bcecbee7943c5a242548d7d4ae9cfbc8840bf29712444ea28090e784713929a0437c9086648c774357bf
diff --git a/dev-perl/Convert-ASN1/files/Convert-ASN1-0.270.0-CVE-2013-7488.patch b/dev-perl/Convert-ASN1/files/Convert-ASN1-0.270.0-CVE-2013-7488.patch
new file mode 100644
index 000000000000..1922eceaa300
--- /dev/null
+++ b/dev-perl/Convert-ASN1/files/Convert-ASN1-0.270.0-CVE-2013-7488.patch
@@ -0,0 +1,45 @@
+From ce148a2e0872b708450005cf0b3a944014aae990 Mon Sep 17 00:00:00 2001
+From: Dana Jacobsen <dana@acm.org>
+Date: Tue, 29 Oct 2013 08:37:48 -0700
+Subject: [PATCH 1/2] Fix unsafe decoding in indef case
+
+Bug: https://github.com/gbarr/perl-Convert-ASN1/pull/15
+---
+ lib/Convert/ASN1/_decode.pm | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/Convert/ASN1/_decode.pm b/lib/Convert/ASN1/_decode.pm
+index e811e8d..eb2b584 100644
+--- a/lib/Convert/ASN1/_decode.pm
++++ b/lib/Convert/ASN1/_decode.pm
+@@ -685,6 +685,7 @@ sub _scan_indef {
+     if((ord($tag) & 0x1f) == 0x1f) {
+       my $b;
+       do {
++	return if $pos >= $end;
+ 	$tag .= substr($_[0],$pos++,1);
+ 	$b = ord substr($tag,-1);
+       } while($b & 0x80);
+
+From 8125d99e15596fee1b5f904ed74a76bccf54082d Mon Sep 17 00:00:00 2001
+From: Dana Jacobsen <dana@acm.org>
+Date: Tue, 29 Oct 2013 08:53:09 -0700
+Subject: [PATCH 2/2] Add second part of position check
+
+Bug: https://github.com/gbarr/perl-Convert-ASN1/pull/15
+---
+ lib/Convert/ASN1/_decode.pm | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/Convert/ASN1/_decode.pm b/lib/Convert/ASN1/_decode.pm
+index eb2b584..67b95aa 100644
+--- a/lib/Convert/ASN1/_decode.pm
++++ b/lib/Convert/ASN1/_decode.pm
+@@ -679,6 +679,7 @@ sub _scan_indef {
+       $pos += 2;
+       next;
+     }
++    return if $pos >= $end;
+ 
+     my $tag = substr($_[0], $pos++, 1);
+ 
diff --git a/dev-perl/Convert-BER/Convert-BER-1.320.0-r2.ebuild b/dev-perl/Convert-BER/Convert-BER-1.320.0-r2.ebuild
new file mode 100644
index 000000000000..855f6b3db2cc
--- /dev/null
+++ b/dev-perl/Convert-BER/Convert-BER-1.320.0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=GBARR
+DIST_VERSION=1.32
+inherit perl-module
+
+DESCRIPTION="Class for encoding/decoding BER messages"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
diff --git a/dev-perl/Convert-BER/Manifest b/dev-perl/Convert-BER/Manifest
index 26c428294718..f887da83ff7f 100644
--- a/dev-perl/Convert-BER/Manifest
+++ b/dev-perl/Convert-BER/Manifest
@@ -1,3 +1,4 @@
 DIST Convert-BER-1.32.tar.gz 26983 BLAKE2B 92da9e925c4d7cf112c390bd4427fab5cd5b25b9dcf067a510bb5db9699e86c1dc3313d2450bc0feefcd7bb88ba87ecb4dfc043e40efc5094216b0860eb4bae9 SHA512 c9cf0640db640587d0d69b465d6f42dd2c09c2bc28adb81575508fa3d00c883fded7c66b1eba26aca36ef5b005b8678fcb74fd69f00d265f484b544d0086314c
 EBUILD Convert-BER-1.320.0-r1.ebuild 292 BLAKE2B bcfce01d302aa84e3f57df2d239d39f5ef50f9f232ae5d1817af689b96db97bc134e2dc5bb25b570beef0a6116bf134df50bac9843863531e69f380fccf72a71 SHA512 98a3197312c8bf10354ac24f57f5b92bc275c60d4b21da9be7060ff2fbac250a2f0ceca698591f28690035c97f9f97f3e946e7e7be7dfcdbb73a4b7577ce54ec
+EBUILD Convert-BER-1.320.0-r2.ebuild 270 BLAKE2B 7876fb56127c4487f25910e4af47a9e3a397bcb5446ef7761d1a3ce31e0ef8309c07f70ad176068df560d6acf039589b006bd0901bebb5a6c366460a0726a262 SHA512 e5978ac730df04d36e04353a626e4542d00c6839de75066dd1b012de5d26b2b4abc90e6ad25cb3ab52bf57e53e2635f092691bb7b1419239c33bf836cf847763
 MISC metadata.xml 1491 BLAKE2B eb721a40440b0b6621eda1ff875b4f876ce0e3d1e44f15cb07afde2733af9bc2136d59a73941a51e9f221a73a4908441f24aac98bfe8f9e5a156b72d762acf01 SHA512 3320340a96a304b9a2e39a4c3039502a8f9656b42db8c24e8b8d4ba83dbbc9e15ae20bbffe7adc082d567842ab38902ead04fe7ba003dca92383dff42d7ecaac
diff --git a/dev-perl/Convert-Binary-C/Convert-Binary-C-0.790.0.ebuild b/dev-perl/Convert-Binary-C/Convert-Binary-C-0.790.0.ebuild
new file mode 100644
index 000000000000..97d3d633f2fe
--- /dev/null
+++ b/dev-perl/Convert-Binary-C/Convert-Binary-C-0.790.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=MHX
+DIST_VERSION=0.79
+# NB: Examples are generated
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Binary Data Conversion using C Types"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# bison >= 1.31?
+BDEPEND="virtual/perl-ExtUtils-MakeMaker"
+
+PERL_RM_FILES=(
+	tests/802_pod.t
+	tests/803_pod_coverage.t
+)
+src_compile() {
+	mymake=(
+		"OPTIMIZE=${CFLAGS}"
+		# Parallel CC breaks
+		"-j1"
+	)
+	perl-module_src_compile
+}
diff --git a/dev-perl/Convert-Binary-C/Manifest b/dev-perl/Convert-Binary-C/Manifest
index 3ca12c0eda35..5bfc8e17adc9 100644
--- a/dev-perl/Convert-Binary-C/Manifest
+++ b/dev-perl/Convert-Binary-C/Manifest
@@ -1,4 +1,6 @@
 AUX Convert-Binary-C-0.780.0-perl-526.patch 5389 BLAKE2B 458c7dedc257f04d79edc1fa49dadeb72393874c1956ea8d7c8f382e81f5131691a5f7120b340437efa8278928403469b5b1a76157822e5438b82888cbcc6f9c SHA512 c6bffca0fe3bdf47d32821f6fff033828f03c4a26e23c4097556f0134a40e01bc47cae5672707cd875f11b9f63a1877b096eec76349e35e99ba4a1c4284aad4a
 DIST Convert-Binary-C-0.78.tar.gz 1564698 BLAKE2B 220f6221769a9907d9dcadd6ba6ffcd04114cdc8d03d4a63a43f95a492b7fa45fa97451c4dbda64bb54e9053914f0ab75821f9d6b84ae6e8b266c9cf89c9be41 SHA512 d9b85ce2ae870c2de6c2fa0838a6b20000ec8d33f19a989f8ebe1b026f2796ae7e924391a0fe387310a3217c75dcd797ea819ff964a9c3e448d007c16d41040c
+DIST Convert-Binary-C-0.79.tar.gz 1559047 BLAKE2B 71e509742abc71a444082b524485d4116b92e827979033bae21d2fc8cc68e8f0e9e556d33bc3cdd6ca5f219fe665cd2a706c4a439cb11fe1f160d8c1af3afd31 SHA512 2771d54136ed433b33b729c71a2d1ed30a6601ce63c8f40b0b580db34557fd2cedf7262d7ee990bd8f5ce33800588fc3532d806335a21ac51738a8a222059b02
 EBUILD Convert-Binary-C-0.780.0-r1.ebuild 535 BLAKE2B 819983cb503898300ed93b7f366195fa40e1d7f515891396a907174f9f6bc45df74f979fddba49c5a69efb984c95e97bb38e3151ba258cb299db0b61bf33b476 SHA512 c2f4629fa0806565e48709859d236304f317ab1a3550de6e69cfdfcd621683d6877b1756d9d2d5a8d50754a6a035ead89b238b55f483016dbb6918fe576b13ee
+EBUILD Convert-Binary-C-0.790.0.ebuild 542 BLAKE2B 4110510a112ad3ab1985668d1039eaf43c7e00004a10b275a8371e5fe00fbbb10dd57723553ce9554049c7a411d40ac810bad22d23eee5d2495c0a25591da44e SHA512 16ac2f1067ae9bc6a343d9cb963d5979cc2f0bcab983eb9bc2f569150660223bd358648dfddef33968214785bf77a7e69e98746e3e692d86cbdbc44df834b920
 MISC metadata.xml 478 BLAKE2B 0dab96e21fa8a982057859969e3ff5be89591a8141365a55abab6b12165243c20f81ba724af8fb5f1d0364face2606724567aa4d03cb2975eac7e5a554889f23 SHA512 589fee143714f35bf258db7a23b2d7539dd311b891f1c5132a8018f911296aa38fa45237a72be8fcbe38b890fb401d60bcb380cd1793eccfbc4287c114c0cda5
diff --git a/dev-perl/Convert-PEM/Convert-PEM-0.80.0-r2.ebuild b/dev-perl/Convert-PEM/Convert-PEM-0.80.0-r2.ebuild
new file mode 100644
index 000000000000..f659a54cd1e5
--- /dev/null
+++ b/dev-perl/Convert-PEM/Convert-PEM-0.80.0-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=BTROTT
+DIST_VERSION=0.08
+inherit perl-module
+
+DESCRIPTION="Read/write encrypted ASN.1 PEM files"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+RDEPEND="
+	dev-perl/Class-ErrorHandler
+	>=dev-perl/Convert-ASN1-0.100.0
+	dev-perl/Crypt-DES_EDE3
+	virtual/perl-Digest-MD5
+	virtual/perl-MIME-Base64
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.420.0
+"
+PATCHES=(
+	"${FILESDIR}/${P}-526.patch"
+	"${FILESDIR}/${P}-decryptiontest.patch"
+	"${FILESDIR}/${P}-testbuilder.patch"
+)
diff --git a/dev-perl/Convert-PEM/Manifest b/dev-perl/Convert-PEM/Manifest
index 6ddbe8d0c982..88a59d4528a8 100644
--- a/dev-perl/Convert-PEM/Manifest
+++ b/dev-perl/Convert-PEM/Manifest
@@ -3,4 +3,5 @@ AUX Convert-PEM-0.80.0-decryptiontest.patch 2509 BLAKE2B bf0da476d2ccdb72d55b88a
 AUX Convert-PEM-0.80.0-testbuilder.patch 802 BLAKE2B 267c7e62334e50039fb3db105e31d0ba799265e83b26f996f1c27b3a1f4954eb768131437cd95f07b4c78d96511b2252881e43cdabab97e9f77efdc0eaf98a95 SHA512 cb41dd95c3f5556e98a102bd3b776b8ad284407fbdc4eb669d9de6d5b5e78bf69ab90067d0d512a4527a3f82952b5405aa42bb17198a64d29a7cb196b981d09e
 DIST Convert-PEM-0.08.tar.gz 54089 BLAKE2B f550295b225539ac5ab91e05cf1b0fa8fdfb8d0f1e718d69c7c86a318173cabe4967efd4abba4e0a1f3ff86811a87ceb27b306cf1026b39652e4d1c7e402139e SHA512 d5e4342b40d01d534ec5f81ab009af185f795267c1bce792d26739ab07078a618093c720230ac2b6cf10c4b5ae1c282c94afa5b9db2eef6fd66e684d2080c273
 EBUILD Convert-PEM-0.80.0-r1.ebuild 648 BLAKE2B c92546ae8771b3d3cc65042fc28188d56b355c293dfdc694cb96c55326879f6b1b0b1d9dfb18fd904569f06c4fce95f202bbb311957ec63aa5ff4d558ea1a171 SHA512 21a375d55ab261c37554c77651d795235c81cce86083d746e3d7b15ccd0d5afa545bc321a14e3adbe51db9cff0bdb4b414d7c76e0215cf18f48ff8acde25136b
+EBUILD Convert-PEM-0.80.0-r2.ebuild 682 BLAKE2B 0a55f5115fd781ec29a9eb5700fcb2f4ed0aac4cf5db92cc861623bf3dfc584a16b0905c418522cf809bc6aa93ae78700f87d4bd14e8ea317848becbf14fa240 SHA512 e9475e6594e83803dacde1995e92f35132161b893cfa81b27cbfe95626edb48fa90606a35b6e3b76b1216aa0856643c484a8e85966f411b9d537c7c6c8db3b0c
 MISC metadata.xml 458 BLAKE2B 2ffb3c8e186ac6e6ccbab3281c9d0579f8705833bdc44c365bc0e8b076bb06f064c55ba4f2c7cf0e98bf322f89601e89bf780ace63653880dfd6b5c43ce1a6d2 SHA512 d53a244bc6d082ead7e3cc3baddb5233cb2b208541453e812fc41556c291a786978c56ce66d22962a602ca19d0e746cd22f915c32a7c60f4e392445eb9b00bc8
diff --git a/dev-perl/Convert-TNEF/Convert-TNEF-0.180.0-r3.ebuild b/dev-perl/Convert-TNEF/Convert-TNEF-0.180.0-r3.ebuild
new file mode 100644
index 000000000000..a09dd8150bfb
--- /dev/null
+++ b/dev-perl/Convert-TNEF/Convert-TNEF-0.180.0-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=DOUGW
+DIST_VERSION=0.18
+inherit perl-module
+
+DESCRIPTION="A Perl module for reading TNEF files"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-perl/MIME-tools-4.109.0
+	dev-perl/IO-stringy
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Convert-TNEF/Manifest b/dev-perl/Convert-TNEF/Manifest
index ea7e9350ab33..4c7896182e0d 100644
--- a/dev-perl/Convert-TNEF/Manifest
+++ b/dev-perl/Convert-TNEF/Manifest
@@ -1,3 +1,4 @@
 DIST Convert-TNEF-0.18.tar.gz 12533 BLAKE2B 83196443523f76763e229c553c075b5682aa27ce3ad622629363754f33fc7a2182038cac955e1ad00880fc6e32e6c7dd12f268e83555bf8800068251089e671b SHA512 00cbe54169c535e6d6d3b53a06eb47808a129d6397c73b5f2b53b93efba20f81d078c16edb7b0108bc037e2cb7f1c92719633519ea17088442ea8f63864eaf07
 EBUILD Convert-TNEF-0.180.0-r2.ebuild 378 BLAKE2B 158afb4391b68da2fd06c83460abd0f6d6bc7fea9c6aea441f54655170bdde7719cb2b73a10bdf2bd50365b24072d1612afd6625e00e4f2efb7a1a355e159d35 SHA512 7f2aab58be7bcb5ace348f366def618e67c34edf52a5f3cf8cb78e878c2053443f86c59f3f4c15c65c60eb44b509a5e58fff54360a6267f68f60b4dd37550a28
+EBUILD Convert-TNEF-0.180.0-r3.ebuild 406 BLAKE2B 1808c38c9fdbd79a074ac2f599e43f8b08623e79f8de374a6144996e84197e11e6c366d84782ee343e0694be17fad42f1c9970c1913ecdeb8e778bcb090fa2be SHA512 f4026129f536dc6440af2ff27f4afd6872b6834ea9eed319b0e73cea9b0220b3f567aaa75ea50b46de1f990d2cb7f56a3f5b89be9d198ed0dfb6469b056927da
 MISC metadata.xml 462 BLAKE2B 5a6061cd5c63f80126a9e5b38bc57bba39085a8ca3bbf093f546b79b9489bfc5225b26dd2003833d1f245802e849bf50fc0d9a19f63af7bb13c112d754bb0ee9 SHA512 4be5e3a516dda519daf9b04e841d36ad959ea0a00e3bf6d99d4e19d346a0561824ed272952046c21de9bf5e8b2f699b931d89dbd3f9a2438273951f93867cbbe
diff --git a/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r2.ebuild b/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r2.ebuild
index 029750bf3d2a..01f3334165fe 100644
--- a/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r2.ebuild
+++ b/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="OpenSSL support for LWP"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~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 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libressl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Crypt-SSLeay/Manifest b/dev-perl/Crypt-SSLeay/Manifest
index fdb4211276eb..98ee4e464c8e 100644
--- a/dev-perl/Crypt-SSLeay/Manifest
+++ b/dev-perl/Crypt-SSLeay/Manifest
@@ -2,5 +2,5 @@ AUX Crypt-SSLeay-0.720.0-no-dot-inc.patch 618 BLAKE2B 0574d1e23dda4f6208c4f3c5eb
 AUX Crypt-SSLeay-0.720.0-no-ssl3.patch 1140 BLAKE2B 96762c07735e29098aea42cb84005c41927deb19b785cf23187fde9b226a31929e6827c89dea52db7e1c95e22c0d44bead2016f30a03d68cc680a93d094351da SHA512 f414553c75f686e662b156cff1aae677ce46d8b38c9669107b2d21c0fd1c2a32db5618e401364ee31d68d155088c4b4834171ad8fa52725512d4f7e7c5f6826b
 DIST Crypt-SSLeay-0.72.tar.gz 129575 BLAKE2B 103e708075d24ac56d47e6ad8795be036cae29dac659c3727ca63950bc3a18e2b6119c32d2040e2bd544fcb3281bf2c5d303a2bb228733588f3450a5e05e916d SHA512 af7a2878df94e116e9aad9a0f028f2e4f89074aaf31672915162f86e55211632d65c1cb00f3ebd25644d77adf8eecdd244dba6a004d93ab90289ab34fe4caaf4
 EBUILD Crypt-SSLeay-0.720.0-r1.ebuild 1076 BLAKE2B a6db87d1919363c22b17b23c8538822ce7904fe9a3d95b0159a9df26040dd74a822e0f9abaa4f7874ad8746a8757a7b1a791af8e6ab710919f7c1fd54e99d3a8 SHA512 60513e9a3b9883ceb9ec96de2c19aacc9a0de719466e8d4fdbeb3f76f5782319f58c8144ead9ba69565ad95d100412016f37745205430c7ca871a96f84b997a9
-EBUILD Crypt-SSLeay-0.720.0-r2.ebuild 1053 BLAKE2B e55a1f005e77298a5433ae3d0d8fc1f91e029d9de4538b80570f37982b594c9cc4561e596e23e90be2c51f45aaebf5b4c1d908fad465fda143b7500ea60cdd6d SHA512 de7ee308890fbb66067db72b2e45c4c6872c7572830606ee5725dfdf022b7d352e05e7f1852183612843482d65d0e2efe8dbe5dc75207ea25cd1e2a796b165ed
+EBUILD Crypt-SSLeay-0.720.0-r2.ebuild 1060 BLAKE2B e2026ba22a01dd50af645bfa4b9c825f0c37f27b7fc1babefdb83795e04790e1b820b2bdce369636fc3c9bcc671971f493194314fd253047feee75e17eab0818 SHA512 bd5085dc4d9f70dc443a133eef53a1b201aa5181d0a60680c936a1f05e3f80c3290a6a0b866cf2e64daaf054caf49236114ca973a0ad570f468b8f28173c3246
 MISC metadata.xml 835 BLAKE2B 451d19ac81b5f7cd9fd4c5dcf25ccb95d79520abc2c86f4ab78fa7554bed770c88ed544a1fe0dc9fcab7e9a5aeb5a15aea2e2ef3b7cb63dc85c820a18c5e871d SHA512 6bb1c4a179395aca014afb35db6699deeee3428cf658f93e32e57a57789bd815cf4779a5544c56cd0aaffcf464c5c4d6d587cfa26c7ecc1096f39893c1ac6c9e
diff --git a/dev-perl/Cwd-Guard/Cwd-Guard-0.50.0.ebuild b/dev-perl/Cwd-Guard/Cwd-Guard-0.50.0.ebuild
index 7a5aa337f6b8..9124f2a50a6b 100644
--- a/dev-perl/Cwd-Guard/Cwd-Guard-0.50.0.ebuild
+++ b/dev-perl/Cwd-Guard/Cwd-Guard-0.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-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 @@ inherit perl-module
 DESCRIPTION="Temporary changing working directory (chdir)"
 
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc x86"
+KEYWORDS="amd64 ~arm hppa ~ppc x86"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 # Cwd -> perl-File-Spec
diff --git a/dev-perl/Cwd-Guard/Manifest b/dev-perl/Cwd-Guard/Manifest
index 48db32e1c49b..d53a117e2d98 100644
--- a/dev-perl/Cwd-Guard/Manifest
+++ b/dev-perl/Cwd-Guard/Manifest
@@ -1,3 +1,3 @@
 DIST Cwd-Guard-0.05.tar.gz 10253 BLAKE2B cd11c91769212a5b77ce267542d6ddc231ff4ee64baa5abf88035d3fedfe005141e571b516b799f611488347d89896f16660c66a58e20729b0cddc6753b89163 SHA512 14aa68e535cec8f7182d5648558c539cbf6eebe2fee9c59d0b06f5b45cca1c6c652104a58f71b5a56f796f03d139e3e74962e45fb127bf038803b05cb9f32b82
-EBUILD Cwd-Guard-0.50.0.ebuild 644 BLAKE2B 56eeb2c865f206ec83536c4b07f378a083990cd17ee351ff366297f92cd866eb73d5ab3cd2b414b9a5cb1b2f1a96a4e586e79cda46458861b7b9fbf122f97e79 SHA512 836c2bf6bca7a4511711720b902ddff6550d2e64f951aad9a5a7d7fb2d8dc08f2fa3b5955985b255414385ba16ecc66ad6f5fffbd1476fef9cf244b997a00d24
+EBUILD Cwd-Guard-0.50.0.ebuild 649 BLAKE2B ca55231692423838456e3cc1d8060b78674bb76ed2013efff34ab1804fe365a76fcdf4d92d2f13f0e51070061e9c2db7f7a86799dcf79b975b5bb68fe6973ee4 SHA512 73b0ab0b84d7edecb49b9b8f36b5f9181551968c6eb2a1c230bc7f9e95a5b48e09efb143444b795f5946881a823e8c1a68173b6d548f4888385faac4268c8a39
 MISC metadata.xml 390 BLAKE2B 1c9d88c362c73b45891121b3ed52681c244cce889a8dfb2f2285b61d74700106f9a7a1dbad243ce32576734ac6cfe29fde8e5131185f0bfd0170291e1b3a350e SHA512 b103d96a5b31e484d29b5f3043574dc7c4d1602a5ee2c904fc84f591fcc9758db92ddcfb1c1303ca22164f575af5e8ff809af8817ba78ae4e8d2f5d1d557aca5
diff --git a/dev-perl/DateTime-Format-SQLite/DateTime-Format-SQLite-0.110.0.ebuild b/dev-perl/DateTime-Format-SQLite/DateTime-Format-SQLite-0.110.0.ebuild
index 0c8316345365..6a2e913495b0 100644
--- a/dev-perl/DateTime-Format-SQLite/DateTime-Format-SQLite-0.110.0.ebuild
+++ b/dev-perl/DateTime-Format-SQLite/DateTime-Format-SQLite-0.110.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse and format SQLite dates and times"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-perl/DateTime-0.51
diff --git a/dev-perl/DateTime-Format-SQLite/Manifest b/dev-perl/DateTime-Format-SQLite/Manifest
index 993ac9b73eb3..f3eec8bc1779 100644
--- a/dev-perl/DateTime-Format-SQLite/Manifest
+++ b/dev-perl/DateTime-Format-SQLite/Manifest
@@ -1,3 +1,3 @@
 DIST DateTime-Format-SQLite-0.11.tar.gz 13089 BLAKE2B 6922db57ae3a067dd142815dddcfce968c21fd03a4e21cc1db8ae8c484f745d2a673ad67912e643711ce90aa01debe274761e56d41655a4186db22c6bc8ac731 SHA512 061f831c2a8d653706d315c1cff24ad887e3f8c65afdbd2140066735649c097be921f217e6e2761f8f34604066c618f296d40e9c650c3a1bb085cadbdfa7b7b9
-EBUILD DateTime-Format-SQLite-0.110.0.ebuild 408 BLAKE2B 991a1b9dd6537f200556791f2913dd6b0cab590c5375fc482f2fe4ae84d36395075ff228686de1ab3d0d5a7bc3bb18f0e3cae03822c43ce39393d2265d64dfb8 SHA512 74c3f2a98ecc68d405099519014e200dbe3d436f6775d1e55814e0287b2b1f755b0ecc19af928771a4b4fb4765ace1b7533045f2df3fbe3672443e0eef504564
+EBUILD DateTime-Format-SQLite-0.110.0.ebuild 415 BLAKE2B 94d1184a947eb09321f6dc26ec761bddc595ed3e010bd91b4ce6bc7f196b7dc7a7789aae93232cea9a7e2702966e85c486e00015215d95994a663463d91ba5ed SHA512 96273f65cf3c4da0a731ebc615d00c1a090b6cceb649a1599f5ef2ff441e7f2eb766f99e5fdf9bdcdd792f80f5b0b31ee64f5b9162de1bc5bfd537e5194b9478
 MISC metadata.xml 417 BLAKE2B 2cd7d6bf3ec6933b1fbb99b1442eacf90b3cb4d2cb30d76eb39271fa69e75f49480a1afd0112784d1a2cdc5d12efe84404105f3d09f21b841b710f6b9e340614 SHA512 6e441e2a22b8333eaf7e71454c0a549c3ca5f68e623dad808ee4cc60cee534224575cdc22a00aef2985c8daaa43d9a5caf151c2c073dec58e1e5bb91e9df1ac8
diff --git a/dev-perl/Devel-CheckCompiler/Devel-CheckCompiler-0.70.0.ebuild b/dev-perl/Devel-CheckCompiler/Devel-CheckCompiler-0.70.0.ebuild
index 21a9a4785e29..cafe7214afcb 100644
--- a/dev-perl/Devel-CheckCompiler/Devel-CheckCompiler-0.70.0.ebuild
+++ b/dev-perl/Devel-CheckCompiler/Devel-CheckCompiler-0.70.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-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 @@ inherit perl-module
 DESCRIPTION="Check the compiler's availability"
 
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc x86"
+KEYWORDS="amd64 ~arm hppa ~ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Devel-CheckCompiler/Manifest b/dev-perl/Devel-CheckCompiler/Manifest
index fabe5e8dbfba..761e94d99c40 100644
--- a/dev-perl/Devel-CheckCompiler/Manifest
+++ b/dev-perl/Devel-CheckCompiler/Manifest
@@ -1,3 +1,3 @@
 DIST Devel-CheckCompiler-0.07.tar.gz 11261 BLAKE2B 14321bacc94d45133e781007d644b9d4cbe0edba36a25cf15739e09bab214fd01b0b21616517bb7070f2082a17a22b7e925fde4cea0699cb6c30ae345a498138 SHA512 147fbdab382ff40bf1402d2d6be1143fe77403cd2444e854fdf11eb02e8acdcab8cb6bbdd7f3aef01cc64fac2862efaa044c5148c7770b84b464f7360c399d7a
-EBUILD Devel-CheckCompiler-0.70.0.ebuild 521 BLAKE2B 04949d4ad8d7f44e08b73433073cbd5dde91dc884e9b94740ff1413ccb403b3860507a15501a20790212f42f5463c04df225644ef8d93d47b525486464beca84 SHA512 85b4096dd8b2a9bf1c08d51413c6e0a6e249537be945b833feaf1107f09a6c3a1197b22be4c57c3b66e3b7168512e329e105cca28ddd331192e41bec1109bcf6
+EBUILD Devel-CheckCompiler-0.70.0.ebuild 526 BLAKE2B 1d238a503517c4b0042ac869e04926eaf6459aff4fae1e900f81b3aacacb6b56897ccbe038714937240993cd9974ca7cd6ef98fb81e7174221508c92a4816778 SHA512 c9f62cceee8837a969940735a76418a31e30cb759512aceaa02c172317419cdf2e3be61b3380840c3cbc91d98aaf043d878254af1225c7143ff3d92aed5dced6
 MISC metadata.xml 473 BLAKE2B 6a72a334871ba29f4279f17676bac22f26d393f45fb15aedf3afc1457c5f32fa83ed4606b007fdcb17b92f76f1e8827d95be4866356202eb50ce00297ed0faf3 SHA512 b3ec611f8b34ce584d67e24614695a34096923ecf2f5bea23764dc2f18881607eeb43e43ce6e24c143f3d82e7bbd963796d48e096a690a8d5eb10c6defd06335
diff --git a/dev-perl/Devel-Size/Devel-Size-0.820.0.ebuild b/dev-perl/Devel-Size/Devel-Size-0.820.0.ebuild
index 4ae7a11bc42f..7f1c0043431c 100644
--- a/dev-perl/Devel-Size/Devel-Size-0.820.0.ebuild
+++ b/dev-perl/Devel-Size/Devel-Size-0.820.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for finding the memory usage of Perl variables"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Devel-Size/Manifest b/dev-perl/Devel-Size/Manifest
index 8a935bc76b73..8c222c080ef1 100644
--- a/dev-perl/Devel-Size/Manifest
+++ b/dev-perl/Devel-Size/Manifest
@@ -1,3 +1,3 @@
 DIST Devel-Size-0.82.tar.gz 73638 BLAKE2B 6502f840af79fcf7d81d23cd8f823d4dcfa230acd1298ee1e5b6ac9cfa7b4ffba61c85e81d3020ea627d08b4d9c86891f404c9cb113bff67e14534e73b645936 SHA512 f82d415ededce605840000b07ec29f347e2d926f72e7d5ed1145c5175be92bd45cc0b9c6fad816013d42a34f4ed5f62932dd94d946345637e74cf78776d38271
-EBUILD Devel-Size-0.820.0.ebuild 486 BLAKE2B ab203f82dba6e6011e25c33518caa0354287c2e51d5d466d912887e50c21294fe8d8fd3405c0711020826b1d29b81999179543d952bb4ad61e7a2b7de597c6e9 SHA512 f43ced0a1ed2d960d1b7609d81e3e743d665f5c50b135cdd1e9331e6f2230cfa580005f11794a70a3b87410543bf89f35349f611f6d58740ba64b7c76db27888
+EBUILD Devel-Size-0.820.0.ebuild 485 BLAKE2B f3fd227acba6c9be522a57345ae837cd05d52f405e264aafb08c277323aa2b018b7969241d693aeb45a9576e1dc2e81416c91d2a5bc72f90e8847cbf32b7bb60 SHA512 81d70770383f3248a0d773a68a20fe9e216ebad43898891580bec6ede89626d540083ed71cc585caeb431de173eda4883e35439f4844df4ad2a4d91988b715ff
 MISC metadata.xml 392 BLAKE2B e026503c50a9d3b69c5f8747713e7f09f792714a80b2e27fec3b23b5c87b44e9a5163693db124193abb15dba5098f13e99e97564d45aee2eb86f6571c37d2912 SHA512 d276410010ad82f281235c712d46ee2ba6294c3a01ec6bd7ff5b1d0f06a05275aced05598fdc646a5e5d3ca08bca22c4e9c529cd0e984fa9a3a3c400a8475895
diff --git a/dev-perl/Email-Find/Email-Find-0.100.0-r1.ebuild b/dev-perl/Email-Find/Email-Find-0.100.0-r1.ebuild
index b20430f04f52..1c5b78bed2cb 100644
--- a/dev-perl/Email-Find/Email-Find-0.100.0-r1.ebuild
+++ b/dev-perl/Email-Find/Email-Find-0.100.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Find RFC 822 email addresses in plain text"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~mips ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-perl/MailTools
diff --git a/dev-perl/Email-Find/Manifest b/dev-perl/Email-Find/Manifest
index 2a729d8ddf59..dcc7a0c4947e 100644
--- a/dev-perl/Email-Find/Manifest
+++ b/dev-perl/Email-Find/Manifest
@@ -1,3 +1,3 @@
 DIST Email-Find-0.10.tar.gz 39511 BLAKE2B 846b6bfa5a02284d36b399ba32f944bba25ea07d3a352aeb9dab5f25039d34a988262c16cc043a60d8f611d8d28c7fe4f15ed07778bb79bb09c6375397a8a89f SHA512 0c31a108de7b146a9b1a35dad15d4a8afb6bf036f228b4997247e1406ea15a8a6c0ba6d79ba36c4262be69970211653b71587771d2d0170ca506a7f531265720
-EBUILD Email-Find-0.100.0-r1.ebuild 547 BLAKE2B fed27bea1909972ae7cf3adb50036087bdd2133f83af6489e452470075423b6ae189b4e2d3ff451f53240a88b95b6020a60adf2490d66f0a67d1a2beb5dd01b4 SHA512 d768e6fd287464d7e93ae2681fd38e96cb0f6210c3ec9e296d9256d903bcf6bd2ee3d107d1f59a77598f4db499c2738855600dec50bd105b64403788af0f32fa
+EBUILD Email-Find-0.100.0-r1.ebuild 554 BLAKE2B 32eb7615ae9443ff20245ddd55956a003864dec8082701a033f866528f7391a7c48f1d63f530f45d76813edbd3a4874766ffa40158164f1c520a5d7ef85cd83f SHA512 d4d755082b1ce2d810c248949435968869ec9bd68021279b4cbdd4071e2e4669db52212023317650cabe6c94f61e207b36ab6f4cf0a4cb4de7984d9ce9835f1c
 MISC metadata.xml 460 BLAKE2B dd55f62ad5512be7087e7bfa93df1daffc3213e6e89f106b8a062a803851700ab267bc7844d37f551fd04242da2f920f373f09e646d6931dec66607b1c5bcd1f SHA512 08ad3fde31149f98de29b5412129285e449859318855efc5c5ad61644d140ceba65543d0ce606b123247c25dfe83c3efdac9ceb9268a16d80136fb8ce151b8e9
diff --git a/dev-perl/Email-Valid/Email-Valid-1.202.0.ebuild b/dev-perl/Email-Valid/Email-Valid-1.202.0.ebuild
index 45bb51efcaba..e158fd481a04 100644
--- a/dev-perl/Email-Valid/Email-Valid-1.202.0.ebuild
+++ b/dev-perl/Email-Valid/Email-Valid-1.202.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-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 @@ inherit perl-module
 DESCRIPTION="Check validity of Internet email addresses"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~mips ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Email-Valid/Manifest b/dev-perl/Email-Valid/Manifest
index f416cbc19b6c..aeae0ced6a0a 100644
--- a/dev-perl/Email-Valid/Manifest
+++ b/dev-perl/Email-Valid/Manifest
@@ -1,3 +1,3 @@
 DIST Email-Valid-1.202.tar.gz 33891 BLAKE2B 439dd466fb9f28242531de30a1b3e6b90ee4db69c8680739fae3d97974eec8ca11f2c5f88a39e266851392bca221a429cd68b7f8ef628c93eb788d164b7200ac SHA512 16605a0f935cb429f83209e0b67a36339c74ce77aea1aefbb338a00d236f57648672bb179e543dcb28b02603ccdc0a9c6a696176eecb5075cbd119d1de7a114c
-EBUILD Email-Valid-1.202.0.ebuild 815 BLAKE2B cc5b607697bb46b8f072b5605f12ef65a650c72e7556f96d8b8dd3601fd58aeff8608c1049bf59cfb7a64166d5171f212cb6f4c76374f11ff8bb1c441dc3a3a9 SHA512 a4570808e2ba159e241918858fee80d9a2779e4a0049f61529625c6432979005717f0a157115ad5dcd0b3023a9af5c191f73e13a97d794b6f045630c3ab0bfbc
+EBUILD Email-Valid-1.202.0.ebuild 822 BLAKE2B 869cb2096b1243f6fb305d941a3ecf1f9bed486eb20d5f6bc6e54f3dbc391853fce0a081cc0ab5a0f2c141d22c86046940cae2e82483314735701445d4615121 SHA512 60b3395bf07ebe50171790f2d028a77bb54e65002d5736f5ddcd81786f895d1530d3e7e464afbdcd143efae3c91db964ffdd63154add216c053fe16a5c0fc405
 MISC metadata.xml 394 BLAKE2B 62ecef1e269014bc28e745ba5c635d9ce69009f5e2a43597225d64b7fc634ed94f52f1696ff06e32272fd96aec16e897f956dee18acb21dfda1316f6c4e04d45 SHA512 45933ff20d285de8387006ef8f07b7979bcdfc052e05c8fdcce68561025c19dd48990fdb3fcc9376ad90109d5ea8f8ffb9e006b078d39e689910ccc57ae493dc
diff --git a/dev-perl/File-Copy-Link/File-Copy-Link-0.140.0.ebuild b/dev-perl/File-Copy-Link/File-Copy-Link-0.140.0.ebuild
index 3a3a05b5fb93..0cb7ae1a2171 100644
--- a/dev-perl/File-Copy-Link/File-Copy-Link-0.140.0.ebuild
+++ b/dev-perl/File-Copy-Link/File-Copy-Link-0.140.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-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 @@ inherit perl-module
 DESCRIPTION="Perl extension for replacing a link by a copy of the linked file"
 
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc x86"
+KEYWORDS="amd64 ~arm hppa ~ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-Copy-Link/Manifest b/dev-perl/File-Copy-Link/Manifest
index 4cd3797977d8..5c45a9c60f17 100644
--- a/dev-perl/File-Copy-Link/Manifest
+++ b/dev-perl/File-Copy-Link/Manifest
@@ -1,3 +1,3 @@
 DIST File-Copy-Link-0.140.tar.gz 11157 BLAKE2B 4f751ffef556ac7cedb57bf8189f4e57a1e64210327c9bd28401f52c63437a88418fc41f5c1f8624b7b3bb66496eced9a36a3ed3cc320e614a6b6cb9dfb28548 SHA512 d937d8353c4be3070591c7e28ea177e587326936cea6d84d895d0fd951e663e506c5680f0d8acad756972db7c70147b31078a2e2595bcab4bb56879b97f3c8b1
-EBUILD File-Copy-Link-0.140.0.ebuild 566 BLAKE2B 0ca9cdadcc811c229ecf96315dddf8e3fc8b2c704636599df6cebe529703a8c3bfdf82f15d1647315ac7c16102d419d9dddcdadb1f85087b5e156901a658a0f2 SHA512 6a457a5e6d3c45497d1c2dbd00eb456ce8073d5c788fbcba4eb55c34ffb496f71ff548f41ae53bf7c8fb00715d1bf83450a0a8402c88507c91024a38808f3975
+EBUILD File-Copy-Link-0.140.0.ebuild 571 BLAKE2B f85e9d21c20bcd7508211038959931a6774c6bdb2f8118a2c0bb5a9b1b29bdead47bc3f06d636b925e52c30329adf09e952c4540634273a22eaf4bce7512a7b3 SHA512 858f72c5f591971fdd3d9654c53697ec7b22b15a2698cbf4eb20a0cf618c012075a350b37a4d5422d237c37aecf512fb4e696168b069260fcbcba0f892f33bee
 MISC metadata.xml 1088 BLAKE2B 710a32a76fd2672288a982401fbf586fd5df711673e934a1f519fd3b3431acfc33c122e26c57ec2502c4371f75799f805e5bb4613560b221a3681e9479060204 SHA512 e0d27b9ccfaf0a78843c818d7f9ad13da52c2f98cb2c9e732da6c78abb83ece2b1ab47959794c514fbad5834f6d994268427a1ac327a629f039761f69a1c429a
diff --git a/dev-perl/HTML-FromText/HTML-FromText-2.70.0.ebuild b/dev-perl/HTML-FromText/HTML-FromText-2.70.0.ebuild
index dd404f0425cf..f03a445bc303 100644
--- a/dev-perl/HTML-FromText/HTML-FromText-2.70.0.ebuild
+++ b/dev-perl/HTML-FromText/HTML-FromText-2.70.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-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 @@ inherit perl-module
 DESCRIPTION="Convert plain text to HTML"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~mips ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~mips ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTML-FromText/Manifest b/dev-perl/HTML-FromText/Manifest
index ce8cee5b5251..2812e39eab58 100644
--- a/dev-perl/HTML-FromText/Manifest
+++ b/dev-perl/HTML-FromText/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-FromText-2.07.tar.gz 23596 BLAKE2B a76f39aff15e4fe622ca3773e36f1c7cf7a8542dd3f084fd392438d569e4bf1a326d3c1b93b3b0de4aab37ae20529d4f2612255927c5b4c26af5a99784b985ac SHA512 4aacb6be9d1c860c1e758201be40a9c966cb43f1593714e65964bce4bf5d72c86028290ec584321365de36909b6e44e8851f5c2a417b6e38da984ec9c5c30112
-EBUILD HTML-FromText-2.70.0.ebuild 944 BLAKE2B 0aa2bc9c37c394c9e96b9daf6730ff3c0a8fd29baaa9b76795aa5120a70983f69ea06edd580db4b123dc622f2c0db7ff15bf1d135bf332b84e9db827c85e53a8 SHA512 6b36c5aedaf98f9b352d8466ce48c47410e590f036e0f8b097fcaac71cd80eba385c91fbc6dd992d07957c1556cda5f39473d885c5503235fee8d633b09f89e8
+EBUILD HTML-FromText-2.70.0.ebuild 951 BLAKE2B 052add858e8969c77a36deae542a438c978b0cec903684b69e795519e38b475d2a9456ba77bd277ab493424f109f5e72bfefa0f2ce432b77bbb62d786147a8ac SHA512 366813868dafc95f766b3936a73fdd824cfd76188b247c027250f74ac728f55691bcedda8ac31ef180a4c723ae4a2f82205b678759d2027ec61c340fb6a46a84
 MISC metadata.xml 398 BLAKE2B b3bd218856eec071a94e6ea14213b81fdbfc664a37e31b322d69c2a197cd9a7cba9c9b05e0bb1cdbd29c903c252d4ef1b79672b1e86e6e397cca2e59fee22435 SHA512 34d82e7ad99c3e1aea8182f086c82d7f2254e4845e81ce9df5fa57db567d147224a8eec17c0aff7149a270b53748c3fdbf504e5f3d1ff1952a8888d64bbc682f
diff --git a/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0.ebuild b/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0.ebuild
index 9638f9b41af8..2bd8248fd28e 100644
--- a/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0.ebuild
+++ b/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.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
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Cache the result of http get-requests persistently"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTTP-Cache-Transparent/Manifest b/dev-perl/HTTP-Cache-Transparent/Manifest
index 6c3d5511583d..7a5ab8f54138 100644
--- a/dev-perl/HTTP-Cache-Transparent/Manifest
+++ b/dev-perl/HTTP-Cache-Transparent/Manifest
@@ -1,3 +1,3 @@
 DIST HTTP-Cache-Transparent-1.4.tar.gz 10289 BLAKE2B ccbd8a232cb5ff9ef8354d9613a98546efe4e6bacd5c77b9e36affd3ee8e04dd1f5ffae979e9737cf03f3cdb077158683ca7a310cdb06ac019c661595d7a4b18 SHA512 bd48290de4aeffe64cc4748d2f4b054abef539770dd8679f88fd24d9478819c31d7201918335404ea5ed0251d4c4f7d19926ccdeb6b4da2cecf251d2618589a4
-EBUILD HTTP-Cache-Transparent-1.400.0.ebuild 607 BLAKE2B 33f07892682ae6516efd83ee5d6473bd0961b39a5db540fd4143f8b1c564b7169e2cfe13aae9808a394732b95862e9c2d68e8fd3b1420b8877f93ff60e162fa7 SHA512 d1112ab864184810c706822812b4768474e8ffed256ce34f4babdc103d4abc34f38be6f239a2c6b74df0dd27dbeb43d2216b740bb4acf99fdee4937afea1f3a8
+EBUILD HTTP-Cache-Transparent-1.400.0.ebuild 614 BLAKE2B 7b0e88d15659c9763743a3c48e8530a77ee8eabd2ec6f348f3643c5da6090ca50506999b3b9defde910f645b73b0f494e90cad18d72a03e79be0dad5316f5a7c SHA512 1931274c842949c4d3a206e7a99baf33433fd4aea8f8001faefd4173360f9ac6ac774d687c3e25ce3db095427a5abf80f3719c17d8044ab6d3db8cb7aa3d2192
 MISC metadata.xml 417 BLAKE2B 49052781b68ec3c65ad74d64fea3a8f6a3882bc859767e5ddf3cbde99001682c9ef2cca4387c7405b23c20af7a81390ea3d36e8d21e24ef102355e78ffc251ab SHA512 35a17abe4fa79ee41ec5ded2d9d4290a33b7eaeb0b802de27213c5769d3a8d34ec4017187c9ff31aaeba7d078c7f260222b3801680988092d3da7b513a34fa50
diff --git a/dev-perl/IO-SessionData/IO-SessionData-1.30.0-r1.ebuild b/dev-perl/IO-SessionData/IO-SessionData-1.30.0-r1.ebuild
index 68c635e020db..a5067f357dbe 100644
--- a/dev-perl/IO-SessionData/IO-SessionData-1.30.0-r1.ebuild
+++ b/dev-perl/IO-SessionData/IO-SessionData-1.30.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=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Session data support module for SOAP::Lite"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-perl/IO-SessionData/Manifest b/dev-perl/IO-SessionData/Manifest
index 738e59ec912b..df2c04965d56 100644
--- a/dev-perl/IO-SessionData/Manifest
+++ b/dev-perl/IO-SessionData/Manifest
@@ -1,3 +1,3 @@
 DIST IO-SessionData-1.03.tar.gz 5377 BLAKE2B ce17897159e8f0753abbbcf7d4bd19adfb20256f7c81257414db5b8edf1af0cc41636eaa7c8731aab69163210726ba5b2c9ce7c1fbfb64f7aab7a62cf9379cff SHA512 3fe6c9c275c64e4250933f6bc377172ed09d123b5aab3ac981b12b42c571be5638728bdd0d16438f973606da5b6a583aeaf6213008f249ccee7e275383eebd6e
-EBUILD IO-SessionData-1.30.0-r1.ebuild 374 BLAKE2B 018ae90e01cd6bbb16a8afa65d80249461a9b3ff51ef07224eb7d2b3840fc981260c6cdbb4f26f5c6b603a0447d59cf328512d0821f03add1b4872da7aaf78ab SHA512 5a35741e5929ca699086249979b40a680f2826aff1a318efbbbf5b35afa7daa8ce3fee733afdfc69cb7f8b8a9adfd8c1170a235417761a76ffef11512b514b6d
+EBUILD IO-SessionData-1.30.0-r1.ebuild 378 BLAKE2B 1882a9114ac74935e08fac646b83e272820aef774a12f695a2f9062123e3a259821fad0d6b05151915d9f208624f0e7314142d2d135987f6b80c3d7a68c24232 SHA512 9396a2bcd03672baab2fc0a80255c74d531c6e027bb970fca43a582e49524feacf457784ae4fc967feefc1722ff123ad5f270ed92ef9fe744077eaf5d03467fe
 MISC metadata.xml 447 BLAKE2B e3f8378831dcf5f3ab636e85389f02584fec49c7c320e4dfce83c3d2455dcf395fd6fcc1c42e5bab251f5f667bcccbaaaf087b6800e8b2132fa1b52c090673ab SHA512 d27e71d4ad5e1d61afd764feb4f4c9e6cc77d71f11a8707036ae1d981d9af19c50c4e536b148f3f7a552c45b228812109b4013da7a649c7f64f6ad4779a4a1fb
diff --git a/dev-perl/LWP-Online/LWP-Online-1.80.0-r2.ebuild b/dev-perl/LWP-Online/LWP-Online-1.80.0-r2.ebuild
index eda811e28257..936f1f299a13 100644
--- a/dev-perl/LWP-Online/LWP-Online-1.80.0-r2.ebuild
+++ b/dev-perl/LWP-Online/LWP-Online-1.80.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Does your process have access to the web"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/LWP-Online/Manifest b/dev-perl/LWP-Online/Manifest
index e45beba806d4..4f270be187db 100644
--- a/dev-perl/LWP-Online/Manifest
+++ b/dev-perl/LWP-Online/Manifest
@@ -1,4 +1,4 @@
 AUX 1.08-no-network.patch 1029 BLAKE2B dcd74d51a01bdd61d7ac6ca89f9198c57141168907d51179fe7d4dfb461b3aaa725a0493e25ed807095bab5c7e0cc97b2ec5d49fc6afb01d924dcff1fec57e2f SHA512 1bedc7075021fcf7e8be1fbe972ce26f39af5ac2b46ccad96697ae05ac87f6bb8303e78c4c2b67f096ec22f39265a95ff5d86a64b13f9d364ae608593f0bc0a1
 DIST LWP-Online-1.08.tar.gz 32250 BLAKE2B 4696ef7d50498b5373bd52568afac5876aa7afbe41ca6fed0029274bc0b52e05b005179fa520a63c2e43e9ba78df0dc1e99a2011f4ff13915f2cad829e706064 SHA512 2b255f60ee6521757ce3d49cc0720e3985ff17e3db7b7868ced6a9e1c5444dc067c80b7d34dbe7be9679c134f3de1dbe0e9421a1a20ff388c812aacd1d964497
-EBUILD LWP-Online-1.80.0-r2.ebuild 1006 BLAKE2B 2cdffd56af9d54df5d82fa4a8d5ba3bbb8987594579da76a0ae441536fa0cbe16194184082d8addaad290b34bb94bd195f4c3f1a796f536b7d4dfb42e26e89b2 SHA512 536c4846b446f8fe41614d316b0acc29ea55de90ba46c5222af4760d769f585011ffe61d2da312b3fc92ab2296dfcf704ffe851ae426f141c85dd302589741c1
+EBUILD LWP-Online-1.80.0-r2.ebuild 1013 BLAKE2B 8450f2a4c53f6f5c444d79c56f9d2acc78765f6085a9274adb6ed762c83ad6ca084f7343b39a28c7ff8dc18ee60f2cda91879821fdd4e7190a2142b4db13d9fb SHA512 fdbaffd7890b9dad9c374d57e700aeb280ead7577fe093abfd3350b4e769d587f439dc1f455aa6a3f847b93a8db11f84eaa110f025e109aa23947be7fd202e5c
 MISC metadata.xml 506 BLAKE2B 8946eac364e58e9d3965e0baa455a1b09fa28a77a6b021c52ce9fe168f172591142f2ff69a8a0988adaa6fb2b1e6ed63b428e8d5e4262628dc0b76583a55d859 SHA512 d8ba13433a74f5ce01cbf7f8813d5694ccafdd1eb5e6eb52aa37e5e5ead36063c782e777c791cc740850e69af6543b2122d7e714afa173b1748a9d40861ec7d4
diff --git a/dev-perl/LWP-UserAgent-Determined/LWP-UserAgent-Determined-1.70.0.ebuild b/dev-perl/LWP-UserAgent-Determined/LWP-UserAgent-Determined-1.70.0.ebuild
index f1107b033f2c..a145957af44c 100644
--- a/dev-perl/LWP-UserAgent-Determined/LWP-UserAgent-Determined-1.70.0.ebuild
+++ b/dev-perl/LWP-UserAgent-Determined/LWP-UserAgent-Determined-1.70.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A virtual browser that retries errors"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-perl/libwww-perl"
diff --git a/dev-perl/LWP-UserAgent-Determined/Manifest b/dev-perl/LWP-UserAgent-Determined/Manifest
index 9a7ff706048e..8f7a70c4447c 100644
--- a/dev-perl/LWP-UserAgent-Determined/Manifest
+++ b/dev-perl/LWP-UserAgent-Determined/Manifest
@@ -1,3 +1,3 @@
 DIST LWP-UserAgent-Determined-1.07.tar.gz 6822 BLAKE2B cf4afe4b535c82c70fdd30224a826c84ff47d98541181d4e2c299ffb6463917487995f7a98a67548f507ce6058ab6de6949009f5f0952582f1e5a3a76ade5253 SHA512 bed056468366bf86f0711a23c5bdb502a614efa2fd80d632f8d43d33295309d0ee88e439933cb3eda99192ad7d7025d0a7f6f0a53a45e79e70512771bb58ae7d
-EBUILD LWP-UserAgent-Determined-1.70.0.ebuild 407 BLAKE2B 8310d9bb63296d22bdaf3f19ea08bdf6a3a28c709bcfec43a8475bd7117a98704f2e3ffebdfa1fd129c1f334a82669911d30ee98f5e05d326805bdc0916a68ab SHA512 e7a33a2cad1514a00ed643a7d0cb258ee57334698aa474ae97220c05d456885fac6085916e6a7be0c634033eb49d94b60dd8a57d9df807d02cf5417157e0eeb5
+EBUILD LWP-UserAgent-Determined-1.70.0.ebuild 414 BLAKE2B 13f4f5d66d45de3b4265a0097d7b99921c3c97e171fa021748c9bb38276b2a0eecad6197c266bbe7d00465e9d1952f57c0dc04c9e40328851d546b628e423dec SHA512 505d4e458ca67651f58b955ce83a117c6fbce0f78275cdb482d53d860388a296dc63663a5eece5e0584c2d27c479c3edee5dd54d67fe542cee2cc38c49e64429
 MISC metadata.xml 421 BLAKE2B 62866760fb2b27cf79866578e67a1a2501cecf6880160c288649309d11e851bead88593cc0efb6a4d51e42cb08b7f2bc7961d5ea3b7556b67cc60d090f940654 SHA512 72a34aa7761d74c086ea3e8b6f4321b529a6f7cb01053f60ab43b3b08a606fbd25baacd9737cb3e07907996f0c908ed3e157996fd41557ec0a3b15032bb449f2
diff --git a/dev-perl/Lingua-Preferred/Lingua-Preferred-0.2.4-r1.ebuild b/dev-perl/Lingua-Preferred/Lingua-Preferred-0.2.4-r1.ebuild
index 1afdf5b0c9fa..1b2de0436b9b 100644
--- a/dev-perl/Lingua-Preferred/Lingua-Preferred-0.2.4-r1.ebuild
+++ b/dev-perl/Lingua-Preferred/Lingua-Preferred-0.2.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
@@ -10,7 +10,7 @@ DESCRIPTION="Pick a language based on user's preferences"
 
 SLOT="0"
 LICENSE="|| ( Artistic GPL-2+ )"
-KEYWORDS="amd64 ~arm ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86"
 IUSE=""
 
 RDEPEND="dev-perl/Log-TraceMessages"
diff --git a/dev-perl/Lingua-Preferred/Manifest b/dev-perl/Lingua-Preferred/Manifest
index 79ae8570596f..ba652ce6753d 100644
--- a/dev-perl/Lingua-Preferred/Manifest
+++ b/dev-perl/Lingua-Preferred/Manifest
@@ -1,3 +1,3 @@
 DIST Lingua-Preferred-0.2.4.tar.gz 6029 BLAKE2B d13dd3fb6dead2943ba15efcabb62fe7b1004b3dde7a5a7e0fe9ff1bed0e9d617b9f365bdc130278e255ba7ce2d774f8f64f7a14f8df6251cd0736728cfe7fcb SHA512 6946b2b8d5978c516688a63bd2126700f8ab0137d51959f0b8c2565c08f25d20dc3fe5f81c6473c3ef5d1faf94a6bd4510959f730cc104b61671bd9436de6353
-EBUILD Lingua-Preferred-0.2.4-r1.ebuild 376 BLAKE2B ec004be30c40b3b8407b7934230451cbd612b34f00f748f96f90b8b8d3577130346faa52039d71c86013d3a6bacf071242364977ed74a8d222a33dc5a7a2ef11 SHA512 67d18aa8b0ca9088165ed4f64a3781ceb52899b059d9124be88054f9b5772fb2cba9b559438249f05e6ea3af81f699ebce3dd7ba6426852e19eb33326ab19abb
+EBUILD Lingua-Preferred-0.2.4-r1.ebuild 383 BLAKE2B faf3d6712073da99d94ef9889492f5382c347939b4e8e06cec7f70f52d369eaefbffdc6f20dc4d058c671f40e5ed60147e419108e1f33c486e64c8d576d9b8c2 SHA512 f16955677d2e6042dd23707dbb608d6cde8379ab343b232d7c21104d35b7c0edf1a26574ebf7ff81d40d75da38b16561946cb45b71fd1807028d567fee1cfe2e
 MISC metadata.xml 404 BLAKE2B 3df8befcb846cfe9223048a3bb21f9ba412d11feff4a30b595aa435f561e1053ee2f23e6f1c3fd74451219db537c2a0b8a265f4674c1e39a4945eb7c60a3bd0b SHA512 a2743b3742db1d9a22697e4afbdb49efb04919aee18ca10110eb7bfb78c1e76e653c425d6876514696f8c57546e628048b952f49cc220dc29a8f6ff6423e5605
diff --git a/dev-perl/Log-TraceMessages/Log-TraceMessages-1.400.0-r1.ebuild b/dev-perl/Log-TraceMessages/Log-TraceMessages-1.400.0-r1.ebuild
index 5ff5fcb4bbd8..4b164415ee60 100644
--- a/dev-perl/Log-TraceMessages/Log-TraceMessages-1.400.0-r1.ebuild
+++ b/dev-perl/Log-TraceMessages/Log-TraceMessages-1.400.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Logging/debugging aid"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86 ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-perl/HTML-FromText-1.004"
diff --git a/dev-perl/Log-TraceMessages/Manifest b/dev-perl/Log-TraceMessages/Manifest
index e15f4dfe9091..39c02b82b7fe 100644
--- a/dev-perl/Log-TraceMessages/Manifest
+++ b/dev-perl/Log-TraceMessages/Manifest
@@ -1,4 +1,4 @@
 AUX Log-TraceMessages-1.400.0-posix-tmpnam.patch 2424 BLAKE2B 23edfdadd5a9652fd6a3d7abacdc5231fe8c85c2bc9a1b0fc6a7693515785fd37574a1fd4009bc234ae403775365a376ba16b0c0f212f1c26f465977800d9725 SHA512 307c6b54a1717664463c7295ea24d5b25bf3ceea0e83b7f6baf74478f273fb23e39b208257f694f2c0786629c1dc7af616a4db3fc40681c133fd4c9a9a888055
 DIST Log-TraceMessages-1.4.tar.gz 5437 BLAKE2B dcce3d5a80ece9fa24d1110c024a02c14eae99d2c7d596ea4a41355317729d12322d677a567f282c35faf0216f14c0a6154e82bbc97da5539689d5ddab1e203c SHA512 ccd298f7ecc0cb7e478812dbbe20b870baa2f87f19b8adfa003818d70e1118f7a3f59a7f50898ac22751d2dc4b96fe9bd1282b30b72cce7334e645b593a01aae
-EBUILD Log-TraceMessages-1.400.0-r1.ebuild 396 BLAKE2B c702a02ff9029a42119bafc564da3e802a528a038b8e077282839a763cbf0e1efaef80ea11f9ea6715e2ebe9bea16b3c3dc2bd4562bccf74b6d597ec473c5fd5 SHA512 de2a804b496089e0bb900ea0f014230a4b05a7d61a64ec76e96e56ea781224b15985d464bf9a825e3aec1343e6e26450ef77101cfbb4a342f7c8d0015854391a
+EBUILD Log-TraceMessages-1.400.0-r1.ebuild 400 BLAKE2B fac99a7597c90fea0a56dd84117a59496f584ced3edb7036fa648ff7399cb1b928be3e4eca873ad176d93ff8a921b0ff5f55cd46d633e86aea8722d869bef5c4 SHA512 f82dafc0b7c437a0c17ea6fdda1d3f8e771113e96f2c0aa1e9829d430fc29cd8ea9ce058490bb66e69a04e06ca0345c90a5ca30d330fea01d930f3ab0335a8fc
 MISC metadata.xml 406 BLAKE2B 4e7e3852d23ee6d62f3f8436eadb921136663e3109bb2d870f3597b876f5c2a7e9d28d59c9743103e37c92e54bc4daab69e1e11b76c0e5a04895497ff24fe206 SHA512 4778efe5353db60500a964dbeb8b5c229b76e59953ff8d4e2b82fddc0ccfd20d86dd8110b1d4903dd52070d0d4f20ee047b6bc72dda88ee4d3e828a6c9f202e9
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 336039358f1a..b889d24bbf3d 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Module-Build-XSUtil/Manifest b/dev-perl/Module-Build-XSUtil/Manifest
index e14d8661a886..b943e90b8ebe 100644
--- a/dev-perl/Module-Build-XSUtil/Manifest
+++ b/dev-perl/Module-Build-XSUtil/Manifest
@@ -1,3 +1,3 @@
 DIST Module-Build-XSUtil-0.18.tar.gz 15200 BLAKE2B 04885b37ba0e9dea8a57269ec8352e525d5149c6ccfc905a075b9901da902f37c5ca1fa77b192aa3026bbfd5ee096cbdfeb5cb12ca3a4a5bf871a0536311f8c1 SHA512 ff2b9efd23a91e16ae95e6abc283e9c64e4eca9e1bfde3d6d2b95b052e5bcdf4d00baa6bf07d44dc6ffbf426eb73b2b83b52c60f5cd208862d35d006dec692be
-EBUILD Module-Build-XSUtil-0.180.0.ebuild 1009 BLAKE2B 340aac2024e6332ed4f76f15384e3ef0cfc13a57dc6b7ca8393407fadfd5b963a32eca55755fab390ccc94ca196cc562e534aa6e6cc10fe3f9682ec21d1fa579 SHA512 1f9bf6838b34c7f9a709ba7bd0e30f4f2ff9a78465fd4d9f8de1b601f301076f835ee95494ac0b4134f898376c458f6bce2d2fefe0b0039b1ba407ad4f289892
+EBUILD Module-Build-XSUtil-0.180.0.ebuild 1014 BLAKE2B 8ce54ed7de176bb112a170217560b397bdc2fb89e2cee5874c037532ccbefbfa9739fd68409e5e99a7f4b5f05bb18b595bfebefcae1517ca51c9d67bc4c3778d SHA512 2b759e53d422ad7f9a2c08736652e73e97b4115681987462741e822e984e30f06520f74b42ee44433f6aa4209441ac65324e0a52ddaa0e9c418bd65fc14f4069
 MISC metadata.xml 411 BLAKE2B 1627cb3e870579d63bb01ac19928e9dbbc160bc7b3bf152d87ba2fd6ce2b285155deddc587943739877ed985ad2f909900865297e8361a5a577cd3239d23fc88 SHA512 431a75673c0fa2a510afd7fe371f5fcb4cc7988d81d9321aab878d901bb5b864f2d05864838cc15ad864dd53527aa502b8bddfe0684718320625b163df8362ef
diff --git a/dev-perl/Module-Build-XSUtil/Module-Build-XSUtil-0.180.0.ebuild b/dev-perl/Module-Build-XSUtil/Module-Build-XSUtil-0.180.0.ebuild
index e589a7d2bc23..cd07328a2094 100644
--- a/dev-perl/Module-Build-XSUtil/Module-Build-XSUtil-0.180.0.ebuild
+++ b/dev-perl/Module-Build-XSUtil/Module-Build-XSUtil-0.180.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-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 @@ inherit perl-module
 DESCRIPTION="A Module::Build class for building XS modules"
 
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc x86"
+KEYWORDS="amd64 ~arm hppa ~ppc x86"
 IUSE="test examples"
 RESTRICT="!test? ( test )"
 # File::Basename -> perl
diff --git a/dev-perl/MooseX-Types/Manifest b/dev-perl/MooseX-Types/Manifest
index 686471e9fb5e..ee97e24186b0 100644
--- a/dev-perl/MooseX-Types/Manifest
+++ b/dev-perl/MooseX-Types/Manifest
@@ -1,3 +1,3 @@
 DIST MooseX-Types-0.50.tar.gz 57252 BLAKE2B 14ba8c391578f738da9bd20c17c61e19aa17811ba60057de16167ec465ef8a063c89252e6b971e01ee5a7071f470e09657c726a2ac716fc34d6ada71a8dd3564 SHA512 42606b1caeb6423acaaa9288239c63512f398a2fba45492443d3e003c6ae3e93cbd8ea2631d487e428ea7d25b63744e4c2096a1e53012e262c99ff4b0c29484b
-EBUILD MooseX-Types-0.500.0.ebuild 1008 BLAKE2B e981fdf5e9f2543f81aac19699d892b2eda4034c6c8242351e0fafadc73848a6badc510a5992c5b75e01712376c59a88a59a5fe0819e0fe2d905a9c643caf791 SHA512 5671f91f8bf42e78fb89a6b32e52157b70fb97114ecdbaf7993dbdaf4312bfc129ed61bd3d5979b2a52bc7fdea1f18dd3e003d325c3b00bd6e8fc80f5664a283
+EBUILD MooseX-Types-0.500.0.ebuild 1013 BLAKE2B 5876a769569c6e4196f70864ea962ded007af90fafd2ab8d1c13de424cda9bdef727a00a85cc40b9e87bf7a7da1a1c250770704490d8c81e51f1db1c781f517c SHA512 58b49e10d6f3ec1ff3167c4ed616935fab176989d627796de5a40b866e1c20454bcdbfee6d3a473ffd2983cf6b233da28e7865d808ff2a3e1a25555369a74c43
 MISC metadata.xml 963 BLAKE2B e3bd72f4a14ac56d2a024b8573f235a153529986d26ff9667204f54e02d6f94eb6262e857fd7ca30c8f69a23d8f16aaab0b85545d2a126967eb9c3f36da4a50d SHA512 1d05ee0870c5bf83cb990f967e6933a7be94fc051580d7338cb403ec6af58f850efc34458b196faa750d42cf1fe2c147f0fc50d4d2306786eb642350be58ac38
diff --git a/dev-perl/MooseX-Types/MooseX-Types-0.500.0.ebuild b/dev-perl/MooseX-Types/MooseX-Types-0.500.0.ebuild
index df5be6097bd0..87d70632883f 100644
--- a/dev-perl/MooseX-Types/MooseX-Types-0.500.0.ebuild
+++ b/dev-perl/MooseX-Types/MooseX-Types-0.500.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
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Organise your Moose types in libraries"
 
 SLOT="0"
-KEYWORDS="amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Mouse/Manifest b/dev-perl/Mouse/Manifest
index bc9b3d2cf136..9d2a8217e59e 100644
--- a/dev-perl/Mouse/Manifest
+++ b/dev-perl/Mouse/Manifest
@@ -1,3 +1,3 @@
 DIST Mouse-v2.4.10.tar.gz 222745 BLAKE2B 3d0f5d3c6f9183f67db24ec9859bd945080bf5f9f9aa370dfb6803a6d32e7e01e589540d24bdc0a0fe338a08d9f89845bd8ef060d381717ec709877de066f2c5 SHA512 57d797bed24ccea66307d95395bb7d5dd860c0bc41e25a7701cf5a16fdf28776dc7633a6b8bbb1bcf6684b930385da71bf2d44f777a211988a500e30bdf8e9e5
-EBUILD Mouse-2.4.10.ebuild 774 BLAKE2B 3fdde85986654a588196caaeb57115d59811ae91b191beced10def10d606c4da46abbefe2037b03a4287dc9c73626bc156b77319b7e5f3bb589d3fd38bae3460 SHA512 24d113ecb2f3eeab233a6cb657e5ccdedcdf40f88d470d24e644379de7b33d80b93840ce3be15febebf6728d4b4f3af3d29d11a98f4e905c8dd2c27e2abf9aad
+EBUILD Mouse-2.4.10.ebuild 779 BLAKE2B 723cad968b42943604a31d6d59a8245bd7b2c3fa6f463b542bb902d6e66f3ab77159dc332cac93fba86e0d891b1225af9364dadfd798ea44a4b617955989a4c3 SHA512 1fc851112fc45afa346307f2e30c1d72c36caeecdc4c28068aa2bf6546882282fd1945203d36080dfdf6d8d43077f38403fb42b99feeaa45e278b7f20edad5f4
 MISC metadata.xml 2262 BLAKE2B 0916b57428ea820a1ca71f1487de36dfa3441b86241b9d372c30f32014af2901b7a79cdb1a9b3ff16cbd0a98818b7316c7555277f9bbda8075a5f6aa20c0cbbd SHA512 3221d09e315f504d05902d6d1417902c6d1cb8bddc517c2a541191f40ce7891f93dee31fa8b6da4a871960ba7bba4a2e3ed281dea90c8b847b28c164ab97a48f
diff --git a/dev-perl/Mouse/Mouse-2.4.10.ebuild b/dev-perl/Mouse/Mouse-2.4.10.ebuild
index bdfb555d046d..723415a04acb 100644
--- a/dev-perl/Mouse/Mouse-2.4.10.ebuild
+++ b/dev-perl/Mouse/Mouse-2.4.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-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 @@ inherit perl-module
 DESCRIPTION="Moose minus the antlers"
 
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc x86"
+KEYWORDS="amd64 ~arm hppa ~ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/MouseX-NativeTraits/Manifest b/dev-perl/MouseX-NativeTraits/Manifest
index 445fec30e799..f33697893887 100644
--- a/dev-perl/MouseX-NativeTraits/Manifest
+++ b/dev-perl/MouseX-NativeTraits/Manifest
@@ -1,3 +1,3 @@
 DIST MouseX-NativeTraits-1.09.tar.gz 50322 BLAKE2B f8d2d81bc386d83da7ec335217f6b59b26a5b9b295285e16a29401202c28b64628cf53e390e4cfe171f85d0d68654b5b9c21ac0d835404d2c2e71fbaccacfc37 SHA512 2aad717c7c78c1014f705a85b8bb8cab79febb827aa478a0884bcdd4d8d702a366785bc6104ba115513c234b8ca71cafcbbbc070ba37d6328255fe1f972c3619
-EBUILD MouseX-NativeTraits-1.90.0-r2.ebuild 740 BLAKE2B 924f66d7d8a6b3508aa136b4b5882f5748ce3eaa38c390feeb029c6aa9f501b11bd5aa442337c959d5b912a456b2b4d3874fc01d4af984762c427a0d60991f9b SHA512 f921ca59d5c89948884d5b746742ae8872271b5f1a5a7760e1f7b3bf5dc0d933262c6851db4beef1050bf0e7dcf03f10d6773eb84c02670711cf923045b2ecfb
+EBUILD MouseX-NativeTraits-1.90.0-r2.ebuild 745 BLAKE2B 0eb707a0e297d88f8338ee4f7d01dfd9df06097fcfc8dcffbbf4b04ccd4dc25046d19af11e0a1cc03f162d058ea6b49ebb69092e26674d40d42467dbb3f3bc45 SHA512 7a33fa9a9daba7a41b281769a779becf079fa7e7cafe25b24d45003a1ae7553e033a8833e69cd09badd4ebafd18fe74e6be2d3e9bc77c16bab848bd4bf59a0e2
 MISC metadata.xml 2364 BLAKE2B c6532279dd70a12125ce32c8bba7a864a4e5c8499386eb027c93e19611cf9bf37f32dfb78452c67c3492a3bfb1a23c7aba2651a34f228a7c9f3a0db357b32714 SHA512 89e91d4115edb18a15298ee555edc35e2fc1a75a6a3cb960d980883aad15bbd1c5f2e83bb25ad69bcbf562fd12425681108872b2abe2021b3cae7f842bde11c8
diff --git a/dev-perl/MouseX-NativeTraits/MouseX-NativeTraits-1.90.0-r2.ebuild b/dev-perl/MouseX-NativeTraits/MouseX-NativeTraits-1.90.0-r2.ebuild
index 2c034caf3962..667f0f544edb 100644
--- a/dev-perl/MouseX-NativeTraits/MouseX-NativeTraits-1.90.0-r2.ebuild
+++ b/dev-perl/MouseX-NativeTraits/MouseX-NativeTraits-1.90.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-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 @@ inherit perl-module
 
 DESCRIPTION="Extend your attribute interfaces for Mouse"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Net-Domain-TLD/Manifest b/dev-perl/Net-Domain-TLD/Manifest
index d9c09a11d55d..7668bf7de742 100644
--- a/dev-perl/Net-Domain-TLD/Manifest
+++ b/dev-perl/Net-Domain-TLD/Manifest
@@ -1,3 +1,3 @@
 DIST Net-Domain-TLD-1.75.tar.gz 39719 BLAKE2B c6b68374e7d738d4bb73e0a59e291c9adb612b8c1d3ae25db29563e5ff9566757a1fddeaf5a3973cff4f4d890d0038d56f78c267aaf19eb91e6a2e1fde300123 SHA512 88b090f427e7fccd8394059b643f260a83fe9ec3fd6741972ec388325bb8c178d9d89fc8da9b1338441972e6744117c4effe3551c2c3f95d52022496667fa4f1
-EBUILD Net-Domain-TLD-1.750.0.ebuild 571 BLAKE2B 80a2a9f9abe4d6cad251a1a8488ef79ab3d0d59a6d6bfb4667f8835ffddb3c574222842c9b34a645ca8505bed86c7cc7101a59ebd9a0748a4bbee6334cac7672 SHA512 a06367a24650439e55edda43b0481055d6f2813f1fbfc4d1c7a056f03dbb249e8035b7b1bc535761e8ea20f599e0d5c89cb8d7e1253b4f0a4005c87ad1b81a38
+EBUILD Net-Domain-TLD-1.750.0.ebuild 578 BLAKE2B 1bc1166c6d5f539df8bc85b9835d44f98f74b2c4c04834fe188a2472f73bcbf9ed9439017f41a8758976864f1c646c91ae85673a991b7e18c68f28545e215e0a SHA512 92544c77c2132607bcacf9fb59e4e78dfa6082e74b49c879dacba075d7bbc2dc7ea658426a2d886a2b028a3cfd9f36e4de44d05de132e54e56c9cbd73676c1ed
 MISC metadata.xml 401 BLAKE2B c448963ce478f79c767b536e41758ff64db2d0976c0f2384571c2edbc2a697d0d5add70aae603946823eb9f5fcb6fe9436a6dd5c7e08319b29cc93db9047c21a SHA512 2843912ba604beb75b986da3e4c24ce959db67bcbd069cd47dfb535f3aeefe9209d4381b705bbe1996617fcb438c432699cab9f85336ea65436e78b174ae1a6c
diff --git a/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.750.0.ebuild b/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.750.0.ebuild
index ddd0c83312db..ca2e69f4c067 100644
--- a/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.750.0.ebuild
+++ b/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.750.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-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 @@ inherit perl-module
 DESCRIPTION="Current top level domain names including new ICANN additions and ccTLDs"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Net-Jabber/Manifest b/dev-perl/Net-Jabber/Manifest
index 9399e941ba00..fada29714333 100644
--- a/dev-perl/Net-Jabber/Manifest
+++ b/dev-perl/Net-Jabber/Manifest
@@ -1,4 +1,4 @@
 AUX Net-Jabber-2.0-no-dot-inc.patch 18091 BLAKE2B c22754f61e5467d0a1464181d529cf3cb57f28e3f2ffff071b8b3a7b71087204e996dbde35087998f04130744b525463ec67bd436b62302e5c64893e9aabec51 SHA512 8c31a256e6c8d638f7f01d8490a2c3c5ea813d55aece342317b114ceaf0c3b5a27779002483005f3d37efe2c95ade2c59f7fb894d5991bf38cabd660efe290a1
 DIST Net-Jabber-2.0.tar.gz 112416 BLAKE2B c8cd86949a934650464ce8dc4e5eb5c12bdd0323caf18773a73df31f72ee6a185d963e43ade22c15d5f7da73f0c5a52ab2e67da478157d7829ab2aa83610fe47 SHA512 2ad275fdef8a7ed17dc464f692b974e71bc3a5df5239943cceaec9509e6454945023e220ddfb42763e18813124f6b7f2d6d43faf3059e0680b753486961a1b4c
-EBUILD Net-Jabber-2.0.0-r1.ebuild 583 BLAKE2B 54a6dd899afa363f8a4af0f0678db49b775beb610e5e46e7f16a5d99b2988fa70900a0a97d4e049fba1959230b519a051223529102293f6858aecbf9fba06e6f SHA512 ca3cd9d5632c9be3a5634bd32efaefd7311570f82fbf8c7cf0aa839e2aca2d15e9dde683ade3d851433a2186b26a81722baf14ab60d1ca37b8629112edd34600
+EBUILD Net-Jabber-2.0.0-r1.ebuild 590 BLAKE2B 7520034d87b272d7706f601752d1fdf6525deb2af2fea1608206e0b07db457b4a257fa88ec03fc0b7fe2c5d8b0a42b15a596cfd7aa115c948045979d549ed6a4 SHA512 e3f38cdb54edb6039e67937881b84428a4db372ade4028788850f30f081778ec630be1bec61cb540b91f5a746c40d50cb255decc048b5c8cccd8ec00b7da32a7
 MISC metadata.xml 1595 BLAKE2B 298932e0ffa8ac325be6fcea585343bd9855292e170e8483d8a1f53965807f21705e452dc64a524c302cecc8088149165e4e99dcd84cee2fa47a0c8ddc66e50f SHA512 9738ba4fca9b95a23888d6936b0837e08e91fae227209e1bf4b73331544ce8b17c5551bc382779a892cbb00df56bcf525a66d1921e99ac43abced1d846deca85
diff --git a/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r1.ebuild b/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r1.ebuild
index 17187577989d..c0a160a62397 100644
--- a/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r1.ebuild
+++ b/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Jabber Perl library"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-perl/XML-Stream
diff --git a/dev-perl/Net-XMPP/Manifest b/dev-perl/Net-XMPP/Manifest
index e22e8838e8c3..e93e49f18b4a 100644
--- a/dev-perl/Net-XMPP/Manifest
+++ b/dev-perl/Net-XMPP/Manifest
@@ -1,5 +1,5 @@
 AUX 1.05-no-dot-inc.patch 3578 BLAKE2B 7fea81108b326bc20a3bb804cad1a75dd6d8ae590bf392612f2745c4e95cdfebc73603a5b3178f74846372e5dce8258974548c63a53a3bbd329e8e38e1e0bbce SHA512 01c8572fdef916ff937d36356d308c441cb2512f34fd1a5e2458b02b9f9c79619addea75b108a5030668bb50f8f086c9f4b51faf1e7e16722d535335634ec405
 AUX 1.05-no-network-tests.patch 1569 BLAKE2B 68d736865c0f727c03b64ef1dc8654a903f8098056fb9d7b1975ebdb5f2b4e0c7493d712d2fe35c1bd5533e60cfee475e321b37b24f3d7d773df0134aa7c2a5b SHA512 a51cbbacd06b94a94881b5b36164d596d5ee2d9818fc1ae544ddc7468cb92f0c7041863cc9aad4eb16c9885bf4b946e8bfc9ef7087280417651b8c5d7f79dc56
 DIST Net-XMPP-1.05.tar.gz 103876 BLAKE2B 5ddc98125b26518c59aa4ab39a974b9cbf1575bd59bb66d5329a43e1d5c3d150f34cc93f545f2cd56846e7b4e46142c47aff7da9b279181a02a57bf95ff1757b SHA512 cdd5474fcbdf7ff6c7d1247f9828f5dfb1828c258af366a831bab8e5faab423b73aa16c34228818526ebcc3180ef0ccc52d6e6cb61e2fe689458b87ec7fab699
-EBUILD Net-XMPP-1.50.0.ebuild 914 BLAKE2B 0fd0b10c26a48b5ef30b9883b3d6e3f0924859a15ca9d21e2fc46790c95bcb16b09d184c7914d6105215b76885c9e860898b118b1d5b7443401613f55abb332d SHA512 bf0a66db212d7fa6c7ad8561540adaa0cc049539855f828837496bd1a49fdf6456a3a271b5de261018e256dbae72972c9841b448c4db06646d8eea9e919ef6be
+EBUILD Net-XMPP-1.50.0.ebuild 921 BLAKE2B 397c8318cbd0a261ae147016a1bc812d52a2f498dc156d101ffbe3ded435aa42f75d79cb2ef3f8399ecccc0dac5dbf2856df2ac6317f896682b4b5e24e46a374 SHA512 a2f9438d5a004f747b9b466c5082fcfa28c3d1c649ca6103097d47a2bd1c6615bc4b7b0d109144f9ba3ce26daf6362858cef65c1016a14469b09705706c8eaea
 MISC metadata.xml 1305 BLAKE2B 2ec03661e185b80764b28cce46f08bef4817cd3c1b2244b8222c1f5eb507afd77e143d7605b38cdf221639b8b1f13a959bf42dfce3da0cb0857e3112913f74f8 SHA512 4a016ed35a0d553609a3ce69b71095c00064f39a1960dad6bf53da42d3d9e65ee4fa7256128b5af2ca40779a69b28ea02286b6b0427a9692639fa8575c9068bd
diff --git a/dev-perl/Net-XMPP/Net-XMPP-1.50.0.ebuild b/dev-perl/Net-XMPP/Net-XMPP-1.50.0.ebuild
index 6bccbe58c2fe..b1e816b78d85 100644
--- a/dev-perl/Net-XMPP/Net-XMPP-1.50.0.ebuild
+++ b/dev-perl/Net-XMPP/Net-XMPP-1.50.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="XMPP Perl Library"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/SOAP-Lite/Manifest b/dev-perl/SOAP-Lite/Manifest
index 1f2f8d5b44b9..008810d70664 100644
--- a/dev-perl/SOAP-Lite/Manifest
+++ b/dev-perl/SOAP-Lite/Manifest
@@ -1,3 +1,3 @@
 DIST SOAP-Lite-1.26.tar.gz 272187 BLAKE2B ec4519c258b2822da74c41e20dc2c0ea3242a7d1936c2e8bf637f6cfa53fc721e4864f0ca0332986f5a1c912babe522c1b409d48dc0c433abd3f85c4aa207cb6 SHA512 b09e320cecbb4859f49dcb144a446af878219f6ba3d2f7999f8656f40989d3ead0707960f561d17a9f800706fcb53020327f9c85313f6dcca34f9699a4c74143
-EBUILD SOAP-Lite-1.260.0.ebuild 1152 BLAKE2B c330d97cbbf5c39dce7d0ce425b57a43c0a08d462aa09bac82e8a597c2872731be5b8bdfd03b107e06f803d13d58d91c31fb9016ebf105dccee50d1eb6278598 SHA512 b0868da07f2f395c6fd36d0fbba1c8cc6f5472cdbb25114153e4f0fe39f435dc3107b9735de558a4b875919dd53c09234f264e3054389fd55ef8b4864c233fd5
+EBUILD SOAP-Lite-1.260.0.ebuild 1159 BLAKE2B 501c6eb6f780130026f0307ffcee26a25e25ded511a1856f17733510fc48474460ebc4ecf72230216bf8f63960315f9df9022467232dd8a39aef032458dbebad SHA512 f4e496447f8b7d120617d969557c283728b4b25e42285460293e25706f841233a2f9c5d2f7ab388bc35883688c7cf0b7820b56e6c4fccd9b9de01aa48972cbfc
 MISC metadata.xml 4474 BLAKE2B ab605ed8948f1f6d511d6493acb0cf22290238b148be02a112964fcd7b44b63a8150ec366ca2b67c4f600c904f16600983deea47987a206a49c27a25cd90ae3c SHA512 8f12dfcd2e448904c05e1cd604ef0b4770764cf77a5fd585a249b9189b18b5d978232fcd8cacc7b8ff8d527bb78ef13e8973cf0aaf3b89c43f0e3f4e801d3ce6
diff --git a/dev-perl/SOAP-Lite/SOAP-Lite-1.260.0.ebuild b/dev-perl/SOAP-Lite/SOAP-Lite-1.260.0.ebuild
index c364c211460c..0a4ca09d3d6b 100644
--- a/dev-perl/SOAP-Lite/SOAP-Lite-1.260.0.ebuild
+++ b/dev-perl/SOAP-Lite/SOAP-Lite-1.260.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="Lightweight interface to the SOAP protocol both on client and serve
 IUSE="ssl test xmpp"
 RESTRICT="!test? ( test )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 
 myconf="${myconf} --noprompt"
 
diff --git a/dev-perl/Sub-Exporter-ForMethods/Manifest b/dev-perl/Sub-Exporter-ForMethods/Manifest
index f31b2a7affbe..89fee4b563d1 100644
--- a/dev-perl/Sub-Exporter-ForMethods/Manifest
+++ b/dev-perl/Sub-Exporter-ForMethods/Manifest
@@ -1,3 +1,3 @@
 DIST Sub-Exporter-ForMethods-0.100052.tar.gz 16421 BLAKE2B adba8e553cf0a3003fe0af1fcdf8904e7e15270d16b6c80d8558d536d5baf22f84bf7d9c2d0948fab69b90e41a13d7f02cb11286c86e9b31e8cc4ec2f6e8b1cd SHA512 75dc9d150f0d0fe33f727363582f99f1ca5c4b76e789e33e640f648588c23531516a99affd9097bc38e175e099dac817d307406dd2380f422aae401f3b5405ca
-EBUILD Sub-Exporter-ForMethods-0.100.52.ebuild 734 BLAKE2B ca55599e62d7363bfe85c2f2bf2e0b5c7e4f540391eca21ca01e3eba5bf3ea64f67a703b1d480d5ded97b3f3b3f6e09985df0fb9d86d1d638a670c9e41828b2c SHA512 713c2c74dca3f23147104166591c2d4f0744ed34f06c8d2f44f9f4983224815b4ae115035d950d0f5d7c0ec818f3062213e19dc68b2536153dbebb47f60f63bd
+EBUILD Sub-Exporter-ForMethods-0.100.52.ebuild 739 BLAKE2B 58cef5bab74521a27cfbd1b4c6cc15930ffb4c28557daf9c7bc771f27d3bd612d7c7d3de68b526f3d50c4bc8f9355c22598ce43e4af365e51ac514095f3051ff SHA512 fb3704d79de0561c59600711d63f78c5a8d4b39d21bed35059acd53df20584436e787f548194abff5ee015d5a4895ed0b106bd4a8e8df952142e81cbbf7825b3
 MISC metadata.xml 419 BLAKE2B 59e62f59a9605d708833d57df55c79eb420c2c299cf416cd178f2214b57c7dcf63b25e796a4bbdeab815a32952112353790d8bb6c9049d7780d9974f7c770fac SHA512 58ffe80ad5d1f7e109f249b6654a3bf575cf248f89772b50661ee40219a4bc7d85de8814463fd5bffa723d5004fbf07fa81a281161587c30d7602c40434551b4
diff --git a/dev-perl/Sub-Exporter-ForMethods/Sub-Exporter-ForMethods-0.100.52.ebuild b/dev-perl/Sub-Exporter-ForMethods/Sub-Exporter-ForMethods-0.100.52.ebuild
index a627b4d61bad..1a8b0a6a72b3 100644
--- a/dev-perl/Sub-Exporter-ForMethods/Sub-Exporter-ForMethods-0.100.52.ebuild
+++ b/dev-perl/Sub-Exporter-ForMethods/Sub-Exporter-ForMethods-0.100.52.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 @@ inherit perl-module
 DESCRIPTION="Helper routines for using Sub::Exporter to build methods"
 
 SLOT="0"
-KEYWORDS="amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Term-ProgressBar/Manifest b/dev-perl/Term-ProgressBar/Manifest
index be3cd53309c5..1b169e27f050 100644
--- a/dev-perl/Term-ProgressBar/Manifest
+++ b/dev-perl/Term-ProgressBar/Manifest
@@ -1,3 +1,3 @@
 DIST Term-ProgressBar-2.21.tar.gz 19309 BLAKE2B 0f5997c581f6f31eb82ed552c396c4c64f1f281724888a1b04e70f7339e155742980886a1c0a58f52e2b1a5f2aa2915332eabb06b4f7f93206c66d5d028d6766 SHA512 0d778b86edffe095c8a320b52b4e9f482937e75ef17d0dcb5b3bd6cba8acc8e0fe26c893fa2b48bb5482ae13d4901d26273a796bc77152839eb5b14165b7d617
-EBUILD Term-ProgressBar-2.210.0.ebuild 680 BLAKE2B cadac7a2b70d329ee38e79ac1aa68dba37982277499a5b36033d69cd37244ab20cfccb1d8fe326695ef01ef87e4fa3a426af1cc63bedcc3920281fc17b3c033e SHA512 1437f8f09cc18f2115b7613b1e371a799b64b869769c5a296fd06acbb9ba4cbf84758558600f620de6d135aef2aa3f55aea139e7eafde6d158cd9e1d47a422b7
+EBUILD Term-ProgressBar-2.210.0.ebuild 687 BLAKE2B 77af9270904da272c5ebc9772e8095bb206cb7af42c9fac35a9557b56147d437e9af24b14ee1b3746ac1401fface44b5740242f2471a07260be5c86847bc87d5 SHA512 ae0aaebeaf0aa91737b511acd25979ae962fab143fca0c3fe24661bab71fed137f0f9392e2b0ac6d7027fbb3907ee94ec922a59c18a74e1977e606dc9c4de46c
 MISC metadata.xml 472 BLAKE2B fe115f4604d77dd953364fc902003c38e05bb23c61308b8a23a7c4a8ea63d99de01c81ad8ae617cf59ce2fa02f7064263f632d5d475f7b9725bb21da87239480 SHA512 5bd7a7b5bd2fbd3e59ec03f1b22416a5eb6fa4f1cf9c23db503c5226604d31d241ded2764fd91216d082b3c3386a618de4d0413844728f622bc0f75132852e4b
diff --git a/dev-perl/Term-ProgressBar/Term-ProgressBar-2.210.0.ebuild b/dev-perl/Term-ProgressBar/Term-ProgressBar-2.210.0.ebuild
index 50b711289ff0..1de9f0a23dd1 100644
--- a/dev-perl/Term-ProgressBar/Term-ProgressBar-2.210.0.ebuild
+++ b/dev-perl/Term-ProgressBar/Term-ProgressBar-2.210.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Provide a progress meter on a standard terminal"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Text-Markdown/Manifest b/dev-perl/Text-Markdown/Manifest
index 928055f59783..a45ea4410328 100644
--- a/dev-perl/Text-Markdown/Manifest
+++ b/dev-perl/Text-Markdown/Manifest
@@ -1,3 +1,3 @@
 DIST Text-Markdown-1.000031.tar.gz 103428 BLAKE2B 0516c266827cb5712f9a4e95071dc18f39c6c181a9225994c66e00b2c2057c601c05991d4fec09574e98cc872991cbd3c501c236a20131a48617b67f0a765964 SHA512 58bef4eba58572c4990849209005109a969bf404a7bc5dfbaae25aa1d0b89317ea9b412658180dcfd96b2c809d5c6900e2118838535dfa9cad6d9b45969bee05
-EBUILD Text-Markdown-1.0.31-r1.ebuild 780 BLAKE2B f1fdc88b5b54764572f30950ccce02aed69bafb2704838fa74e54606cbf01a6166f3c5e4e8df0dcb7eef0b64b1001af8e2b0c584887981ff1e2dff84197efbb3 SHA512 994fbcc81997fea5698b3a7c30280572224d5630c774316df182ad3e196eb39f3bd372342a7e98905ffb1456b628605786eae8147ddcfe3cca9ff5981648f55b
+EBUILD Text-Markdown-1.0.31-r1.ebuild 787 BLAKE2B 51af26059f0c4968be4c7c5ede7f97f3d8653e3979c059c2589da817401d3184866f90206bd293b455ac5d71653602b692e308fb014b03ab41cc15adceee430e SHA512 a8a56523a454f1b127161a98721e06549602799f01055d3066daeabbb914ec299072f57138ae855c0a3764391aae4294e7fb9c5a0f11f480c65e613281bff96c
 MISC metadata.xml 398 BLAKE2B 4d061d48fadcd64d2e0354850a217458828a6113c1e6dec2f898c4bbacc73b38587b64a28bc8c7aa5a367ed8a71d2410b9d6be05a4085dec5b7f069da1f73542 SHA512 a85c55a5785e1f31a54b046c34f4217d92644f77b3981d546378d31fa53e8c5ba8a67c711d7cc95c0fb41ff0c815afc20ea60a09194279c6358a8680964a2864
diff --git a/dev-perl/Text-Markdown/Text-Markdown-1.0.31-r1.ebuild b/dev-perl/Text-Markdown/Text-Markdown-1.0.31-r1.ebuild
index 3b6bdd9bd7ca..2632848022c0 100644
--- a/dev-perl/Text-Markdown/Text-Markdown-1.0.31-r1.ebuild
+++ b/dev-perl/Text-Markdown/Text-Markdown-1.0.31-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 @@ DESCRIPTION="Convert MultiMarkdown syntax to (X)HTML"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Tk-TableMatrix/Manifest b/dev-perl/Tk-TableMatrix/Manifest
index fbcd1428073a..9ba757e77341 100644
--- a/dev-perl/Tk-TableMatrix/Manifest
+++ b/dev-perl/Tk-TableMatrix/Manifest
@@ -2,5 +2,5 @@ AUX Tk-TableMatrix-1.23-makemaker.patch 959 BLAKE2B f5d8eaf4abc648868baf553b880d
 AUX pTk-1.22.patch 558 BLAKE2B c62d921287899aa542a618168f26ff37f1bdf92373c8d72dd98cc52aed15a8d2741968487fab7d4091817517fb01dc541018c0129d7b781e82c8afea0bd30da7 SHA512 c709c5f6baf326389a794764a4b223c0fc154f0f6157e4696ba2e7af6cc029f1e977558be7a16bcdcd40a3e31cfc30bdd23e319ccd5cb33b227a84a55ab82631
 DIST Tk-TableMatrix-1.23.tar.gz 318954 BLAKE2B 9e6380cf0949aaf15861ad9a9209d7fb2cd69c3e1983f26b364aeaaa28143b00a063fc842da48c7d18ba1f9c69a60973519de07fdf91e39532b2347ddbcdd4fb SHA512 115eb2a71c3725392f2bcf5e468bc84844c8a5ad3db221205876d7de6486833a3fd4e98aa32e21f5dcf038a38f9d98721adeebb1f9cd0990359aec7d07f6f32e
 EBUILD Tk-TableMatrix-1.230.0-r1.ebuild 595 BLAKE2B bf88f9b81acacfddba5805bd4d1e28d8a82855130acb05505e62dc3e986af59b03cb09eeaaed75bb0d5166b59ede9341891160098afb3efa064c4c4c28a148f5 SHA512 a00066d79f454ff984f9fcf8306652a9a84beb8575693b89f8e30a17c406b4640aecde52c4ad3cb1b01cdad16b4240dc49ce9a0c4d663a014ba00bd9a8e49573
-EBUILD Tk-TableMatrix-1.230.0-r2.ebuild 658 BLAKE2B c5cbe93e35f8f3b70c13deafeb8cda7820f7bf0d14509b7fedd0644a47a2b575549b67d65a87a91e3a4489061857e366c39cd13658a0b1e11065b6276b0bcf09 SHA512 25fd81374e14c0ea71a4ca3c6edbe66e62dcba6b28584317af9b933dd12fa274a971f19fa55c2f481b8c98741cf5b962648b9c3f54eb1426679d6101d7fc3765
+EBUILD Tk-TableMatrix-1.230.0-r2.ebuild 662 BLAKE2B ea7cbde419a0efa08ecf791d177d76f885bb58dc333a62eef2954682f62cdffd644f9bfb788c231c9617d75d04b806187183e5361005d4e9ad95fff42e72033c SHA512 203978b972a56c49c221e733de1de4fa2eb82ead8bf1bad46f8778cf33a33cd4b98d14069c98c17bde87b70a13d0246a236913ab26d62738a5374fdee550b071
 MISC metadata.xml 558 BLAKE2B c5083c2c3ded4e3040fa2fbc2c2c0cc8c186239709ecc1d7cd700fe378a2ae0658f773fb7cff9bdd9c3f0e25756f0205526c154bc7156b270d28dd30e3f552c7 SHA512 1ef50a1d3e76c7885c300e68b39dd13d495a947a17da8ae292ba1996292de5647090cd3892c855e610c3557587f1705568562e7d216d85403556be273b05066b
diff --git a/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.230.0-r2.ebuild b/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.230.0-r2.ebuild
index f08215ade932..cb194b283990 100644
--- a/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.230.0-r2.ebuild
+++ b/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.230.0-r2.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 @@ DESCRIPTION="Create and manipulate tables in Perl + Tk"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND="dev-perl/Tk"
diff --git a/dev-perl/Unicode-String/Manifest b/dev-perl/Unicode-String/Manifest
index 36923f7eeecf..ef69bc3cbe5c 100644
--- a/dev-perl/Unicode-String/Manifest
+++ b/dev-perl/Unicode-String/Manifest
@@ -1,3 +1,3 @@
 DIST Unicode-String-2.10.tar.gz 121287 BLAKE2B 4d7769b74fd85e197aa1bf8a22a57f3dc519b30bb1c1d47fa1f1de6faeb47e2a0351a580a2c34c158b13a37a43d9e5b7864c2333143d335f129219efb5451857 SHA512 e1fad14dcda301d1e5199c9968efe2f33408fd56ef701d7ede40262a50d4d13a3b78ed7aab5c5319e63f551d40dd48b06dfd74e49f3e434b7b2f8d2f592f0b0e
-EBUILD Unicode-String-2.100.0.ebuild 403 BLAKE2B 91c4baad33e455c9127ccd5a9f0a047fa4196551f22ab19710e4024d3760b5fe6b1472de26a2748bce721a8e39ea14a6c6d49fc38a338a4b66def59acd40905f SHA512 ca842725458ad428c3e40fc553ece446fc6c6a09067facdd11e2308a96929ccdf797f02c7ef4583b5e135ec434e8e6c389435dbc081b551ed89f6bb6bfa1788a
+EBUILD Unicode-String-2.100.0.ebuild 410 BLAKE2B 32ca8ec7ac7a52a92fa202c321408d76a6e3f116859aa394ff36c7b3fd270f095216c4b29b17c02ce2d2cd7d07a6df1054b3181fdb43eca6109d138ead32e5a2 SHA512 0822fec83d15cc76c9c59ddd8f4c1c97280fe1467f6443be93fdae91191f3495db4697f663a00497771b0331567254ace59fd3e70b87514313b797d973f2ea12
 MISC metadata.xml 464 BLAKE2B 22020fd1ae466d0855ae2492769090602ad5a88d2084519d46bf58f00e03e337a13738aeb0a2d934f0d9b20b1979b41711db28c5cd0fea07add1d905c905f7be SHA512 f2486ee988a2cfaa196ed080011ed24cbcaf1fb2995080417f94a137958e4ecb5811784dc6008bc51c25f55dee4aa9cf375241c4f36cabb038ad8679e6e1c4c1
diff --git a/dev-perl/Unicode-String/Unicode-String-2.100.0.ebuild b/dev-perl/Unicode-String/Unicode-String-2.100.0.ebuild
index 5a13fcd8774b..c58696569c36 100644
--- a/dev-perl/Unicode-String/Unicode-String-2.100.0.ebuild
+++ b/dev-perl/Unicode-String/Unicode-String-2.100.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="String manipulation for Unicode strings"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
 IUSE=""
 
 RDEPEND=">=virtual/perl-MIME-Base64-2.11"
diff --git a/dev-perl/X11-XCB/Manifest b/dev-perl/X11-XCB/Manifest
index 2d90cf7d2e4c..a7bca232f307 100644
--- a/dev-perl/X11-XCB/Manifest
+++ b/dev-perl/X11-XCB/Manifest
@@ -1,3 +1,3 @@
 DIST X11-XCB-0.17.tar.gz 90833 BLAKE2B 7de56a99abb27373f0473e4d98c177d3db4f4811bdee358e79a85db26345e59f3dfa0998e10678fce1585ddbf1f58796f75d2adc198ec6d23ae521720b3d93ae SHA512 8a5457afdb3b32fd6d425a27dee1a6afbbded222cf71a9d7201ed2c0db0b0b7c803ae3e69a897c510b9b07b79e880efe0cf062ea025d2d3ff7ee16d364c568bc
-EBUILD X11-XCB-0.170.0-r1.ebuild 957 BLAKE2B b193b6d6d0a6416e43bd3a4dca6b73688bca3352d2c263c3c49c4caa660c0540920e6d97f1b029f180ad1ba5ec7baa542fca723102d1df760ba52bee349b5835 SHA512 daeec50f706d2cf8d069a73116835b5884ab86b9d28ba998e2aeec208613da3170843892a7ec36e29cb89fa25ed3d14f1aab49c5ef0601f46342adfd400d2aac
+EBUILD X11-XCB-0.170.0-r1.ebuild 962 BLAKE2B f63274d4b6034ae565b51579fc2d7087357d7993ebb81f3c13d763d39b86f8cf3b378d2f60b6a7d87b229e3bf6977b0925da846fc4debaa7e9e894a190e8d830 SHA512 825570c772bb31bd29e02b8a1463049fc5073bb0e2cd669330c97b5eb4b4ee418db2b45482c6c8702a0b17d92f4639727cea05b4c37214363fe407bff0e80d33
 MISC metadata.xml 1271 BLAKE2B 0ee20f9f998f19334c078ffdb26e9ec0cb8d7cb14ef8dfa9d7cb0aded10f89655048af8ab91d11079249b73d84e532d590202af181645df1df71b79b56d098fe SHA512 279d8c3522207df5f1fb7ab6188e8f8848bd18c25e127d1f59765ddb5a6b0fcb89e949ccb703513c592c781396f893befe7a46f9083e4c94640c3cd112da29c2
diff --git a/dev-perl/X11-XCB/X11-XCB-0.170.0-r1.ebuild b/dev-perl/X11-XCB/X11-XCB-0.170.0-r1.ebuild
index 03dc3f8b23f1..139e7903be78 100644
--- a/dev-perl/X11-XCB/X11-XCB-0.170.0-r1.ebuild
+++ b/dev-perl/X11-XCB/X11-XCB-0.170.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-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 @@ inherit perl-module virtualx
 
 DESCRIPTION="Perl bindings for libxcb"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/XML-Descent/Manifest b/dev-perl/XML-Descent/Manifest
index 0ac05f0b4148..3d30a520cf71 100644
--- a/dev-perl/XML-Descent/Manifest
+++ b/dev-perl/XML-Descent/Manifest
@@ -1,3 +1,3 @@
 DIST XML-Descent-1.04.tar.gz 15212 BLAKE2B be3f129dd27baa07231d5a8929a9f87307f7c7cb4fc12e81a0020b7a309ac68540b4c57c1dbacfb0cc084910ced7b48fbcfd83ce21dbf0afc8d76d29ff45a16e SHA512 779a476907ecfbe9c279fa1f476c3aa64de626c515719643be21fef8b945cdd5c1f654a189bf7ea9a6964a88818e101e1eddc019439a5dcb397f56b13bdfa415
-EBUILD XML-Descent-1.40.0.ebuild 503 BLAKE2B 058b7eeb0ed1c00bec94c1dbb5bc98bf1de334a4fabae1d24531d89e59f0baff544052e01eb77c63e1de60dd1962a30c96aff5be49db7b7b07cf9b6d9d55885a SHA512 4d6ee976c11903a3d81f950f7a44f597ea088e4a59ae265a969c2bfa8b7c4c3788449c4a3c102f0879b8fcaf2c8e53615b54d587bcb95378f3c460e910d8533d
+EBUILD XML-Descent-1.40.0.ebuild 508 BLAKE2B ff59d7f7f7804f45d37bbdeb9e65b54d87550af3641ffb97d0c8a41656375661543b0608610ca1406b4ff2618220e8390f197348aef752ad7e9ee1fcfd4a763b SHA512 6207c7dddac419b2d7c98b04192a335fe5abb9d6c692daa35bc7a56ecf13ed92a1fc9315f98024ae278bbd3fe1561b0276099b4a3767a484eb91d90ebbe0206f
 MISC metadata.xml 394 BLAKE2B 1d9879e93ce8e960d600870744aaf26691895fc6e242d89de9993a7e9ce264ba326d5378e81ab0f455fce5ecf267de0837ddf8aecffdf22a1b7f4f2682039d8f SHA512 821c81951697ad7164a18538068b5a6e391ce32318bcd5880d393415cb12681e3e66fd94c1e8d872fe9d65d4e47e4f7dff9b68efc31d2fff43cd5ac9a9eb9a46
diff --git a/dev-perl/XML-Descent/XML-Descent-1.40.0.ebuild b/dev-perl/XML-Descent/XML-Descent-1.40.0.ebuild
index 350333bc5785..59cc609bf7a2 100644
--- a/dev-perl/XML-Descent/XML-Descent-1.40.0.ebuild
+++ b/dev-perl/XML-Descent/XML-Descent-1.40.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-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 @@ inherit perl-module
 
 DESCRIPTION="Recursive decent XML parsing"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/XML-Parser-Lite/Manifest b/dev-perl/XML-Parser-Lite/Manifest
index 26fef5412ba6..581a03cb4571 100644
--- a/dev-perl/XML-Parser-Lite/Manifest
+++ b/dev-perl/XML-Parser-Lite/Manifest
@@ -1,3 +1,3 @@
 DIST XML-Parser-Lite-0.721.tar.gz 10303 BLAKE2B 80ee6b8afea85dac7bbfdd796d8e7388b99171a137d68177105a91027e263439932673528b7c163193ec7ca77278289bc28a58e303700dad40a8ec4ffefc8894 SHA512 23c0aa9363e87afc885e40bc92643c355a5e7be85a61b8f1d1e829a970538b2f0a9de6dd652387d4612528274da64e8812faa6328be2283a28675a6da09c707f
-EBUILD XML-Parser-Lite-0.721.0.ebuild 893 BLAKE2B 0243ad3f35b0582d287c19d00fcdcb40da59ed0ca5244003af1ec8df5288e997284d8392ce9fea9a9f019ea28adeb07ffd033246f05a31e7272a8824ddd2bb38 SHA512 324da015da51fb9042c2b5ffa0305798bf8f2cd621e0e2cd81066ac734e645057c43098e784b185897f0245a0e996f6a8f29875b1a9596ed26d8959249b2d816
+EBUILD XML-Parser-Lite-0.721.0.ebuild 900 BLAKE2B 6e175888bb3376d5abc10a7c88a2bc237bdc04ff5f2b4f31c6d981dbd2b52cb65babee55f386b84fa6bf18d6a6d21fb21a9e4724dd979e8a66bd7bc155dc9844 SHA512 1b9945a1e6a50dd1fc9dc69148c10773584cfa54a8c3efacbb7f830e174fe1359c8e0081a049134dc89e476b5e89f06db3fdd5fe1ee6c1f28c6ac65037f7da7a
 MISC metadata.xml 391 BLAKE2B e13dcbbd8367f121074f7f7b2bf6fba1dc3bda4d0efe06c8fd58196a2cd826f996d31c343a2cd5fdc318444c63c7a2684daaa55c4561c949e6ae38377f055386 SHA512 e5e6d6e1af6047f9b00216cfe035bd7145d7b14bdc11154b9267ad90298a67056272870e68dd572da92bb67015c9b035bf63647b56e880f7bd30f51cfb4be1bc
diff --git a/dev-perl/XML-Parser-Lite/XML-Parser-Lite-0.721.0.ebuild b/dev-perl/XML-Parser-Lite/XML-Parser-Lite-0.721.0.ebuild
index 96c95d548ae6..a17dc48cca13 100644
--- a/dev-perl/XML-Parser-Lite/XML-Parser-Lite-0.721.0.ebuild
+++ b/dev-perl/XML-Parser-Lite/XML-Parser-Lite-0.721.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 @@ inherit perl-module
 DESCRIPTION="Lightweight regexp-based XML parser"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/XML-Stream/Manifest b/dev-perl/XML-Stream/Manifest
index ac33fd87b503..e0439f7c0b61 100644
--- a/dev-perl/XML-Stream/Manifest
+++ b/dev-perl/XML-Stream/Manifest
@@ -1,3 +1,3 @@
 DIST XML-Stream-1.24.tar.gz 80952 BLAKE2B 1cbf8e745ffae9f9b266a37f7c47172e030684d63e6b667a0f3966b6115463566e9f90b05c12b5ee0090d6008fa47836dc083343a30e3537b80ccb64694c673f SHA512 f762e09197fa7f36cee8484e30a6ce972e407d92cbe55bdf96bcc0073187aff34630c5d9dd2555a14cd297e506875dc2ff153b09001c971b020c37340886025d
-EBUILD XML-Stream-1.240.0-r1.ebuild 619 BLAKE2B 7528390d1def00ae7c0449a5fd5cfc1d5d67d975f16537dfc1f3ee052a493ffe58a57acdefbb47420cebac66b7e22888519b460c6bb666577357bd2a4d51fdd0 SHA512 928efdf326baa9827d17a0c2b3ac6f581be9677ed94343f7312d78a95f7340c29421b22975139d189ec623b7c7bbfa90f83a90b6d3b44e872dc6d08b170f3adf
+EBUILD XML-Stream-1.240.0-r1.ebuild 626 BLAKE2B 9f6703c546d46c9d9125acc5cdb82a57105b9c83090a38b938eef1350a9b64d5e7655594d0dac1d2495c8bf485597494ad90a0bc30a1c2007ff440a8305529b8 SHA512 8867ba4a5074be089844f068820a4b3d1cc5e17ec6b6143495e54fd1d07db188c38581dafbbdd64da1f39514a95412bf4c1fc7deb0dececf5406eef6a1f3289b
 MISC metadata.xml 1893 BLAKE2B cccb18da4926356a449ed32ea451341c98dcff9dfc1d9fdd92a08518ad81dfbd5cb4561d331bb12d93887dce95e6bdfb73afc8575cd4c73fa4410dde8394421a SHA512 e2defe9b1edff7d849662e3529723c13bd474319f93cdcd840733d6f6fd5bb58a2e418500df7f80be78a937f851a13170af2119f10809eee5289b1f689005591
diff --git a/dev-perl/XML-Stream/XML-Stream-1.240.0-r1.ebuild b/dev-perl/XML-Stream/XML-Stream-1.240.0-r1.ebuild
index fd18bbf65b1d..ce1e3ecdb540 100644
--- a/dev-perl/XML-Stream/XML-Stream-1.240.0-r1.ebuild
+++ b/dev-perl/XML-Stream/XML-Stream-1.240.0-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Creates and XML Stream connection and parses return data"
 SLOT="0"
 LICENSE="LGPL-2"
 
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="ssl"
 
diff --git a/dev-perl/XML-TokeParser/Manifest b/dev-perl/XML-TokeParser/Manifest
index 560e01467fc7..e19fead19a18 100644
--- a/dev-perl/XML-TokeParser/Manifest
+++ b/dev-perl/XML-TokeParser/Manifest
@@ -1,3 +1,3 @@
 DIST XML-TokeParser-0.05.tar.gz 10989 BLAKE2B befe52db43a34d561931908e6bcaede89c93ed37b869a2dd47668af8299cbd3e4f27aa533ad82601546e5a1652841ce9d5ca035b24d6b71a4b6d47c66b55e0b5 SHA512 c19be15013a04908ae863ec1095af34785ad6050c8f895759e98053a0c097c9a80f5c99d33e30675c003cde7eb3b9340e866bc90c5fbcfcad93666df42439a7a
-EBUILD XML-TokeParser-0.50.0.ebuild 389 BLAKE2B 7aeb706990ae81a373d39940a24272bbc5b47909821f201cd45b2a37d1b99286ae90e7c0ff656811d5932a2bef0d2f6bce03033e26518bc2793b7a222ef8e9b4 SHA512 edec7644e4d02f846e246032b5c5db2d9832f5becaa87a758b8f0ce3892e735b4bb201be0201a08dde6abcc10cbae8db498931a09a58865d4848020d4af5fbba
+EBUILD XML-TokeParser-0.50.0.ebuild 394 BLAKE2B f8cae5853acf3de95fbe8671ba93721aafd751b8f708f7b36ed2ed0cc7dbde98e9548941999f002a3c9fa1bd23a7232d7f3e900a4e1a47b852829b77f0d72d4f SHA512 f3b546218e1ee090641cf0c8c76dc059dbabf3964eb87f930f6396501d5572700e6381b77a9c32aa3492510a42726c753a68012e39b3008d3eff4aab9d89a010
 MISC metadata.xml 469 BLAKE2B 9ad9e50687658d2147fdea29576b2aefadc0025636562706c220254704e3ded1778ffdba6c98bc7a3156836afbf38d4ce0def40e989d436f8af79f6338cd400c SHA512 17d907d75f629440fc25c606626a7c15ec0b37941f8954d9bc46334dc0407957a5f00a807e436ca6a70cfb16ece23e29fd43a1d583c0d478c0b929f3f775c88e
diff --git a/dev-perl/XML-TokeParser/XML-TokeParser-0.50.0.ebuild b/dev-perl/XML-TokeParser/XML-TokeParser-0.50.0.ebuild
index 3a6052c3da44..1a01e6e59969 100644
--- a/dev-perl/XML-TokeParser/XML-TokeParser-0.50.0.ebuild
+++ b/dev-perl/XML-TokeParser/XML-TokeParser-0.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-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 @@ inherit perl-module
 
 DESCRIPTION="Simplified interface to XML::Parser"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/XML-TreePP/Manifest b/dev-perl/XML-TreePP/Manifest
index 99b2dc43cd90..7b7362017c00 100644
--- a/dev-perl/XML-TreePP/Manifest
+++ b/dev-perl/XML-TreePP/Manifest
@@ -1,3 +1,3 @@
 DIST XML-TreePP-0.43.tar.gz 91382 BLAKE2B 2a7d89d6d5e3bcf965b001cf8e18465b1cdfdeb94cd96c77008beb16b559fc072bd24a5c954a12965e2a03d9707c372c779ac7ca1e2938807055e64f9e7ed077 SHA512 4289a0a8100ef15f62f0e303f13094371ac6f1b54d887be1ed7e2ea31d7f1f6fc28d4234cf96458074137f756db3fe452ded170d3ee576f7eb2cfc9996cc31d1
-EBUILD XML-TreePP-0.430.0-r1.ebuild 417 BLAKE2B 0377500e84919a5f1c55aad4072e2a43c044852ca26e0ce32f286d045b6c431e402eb4e8d06076d5eb78b32837ac3866f57002446fc8ab7f5f40cbd955742a9e SHA512 36fc5cc5a64a87bc031a5510ee350390816c963199abd679020700f3253d081e850e7bd2957071d31743b05ad7e3e7b69572ed92eecd0afec70f19547ea59874
+EBUILD XML-TreePP-0.430.0-r1.ebuild 421 BLAKE2B c34bd12b1c529cd300d34c19b10a1844b51bbcdbfde88f59653641f950502770046465ce3091660f8da1bfc2d567d491d2d9b5782bee608ec5ae93886767f086 SHA512 cbee65ebf8a4839b904adb9e1b9131ce84c11d16e938baa073d9898ccd03491c8a76797e1997e103b992dfb5f4430793418b9ea964e97b789fd8023d7d5f99e1
 MISC metadata.xml 464 BLAKE2B 08cb87d6a9682641c50be91f1d89cbc7bfb5f114f799bce0aaeff908675a7b3f2f559070597242bf9c2bc58408391be543adcb281999e8d159046312c54a743c SHA512 d5aeaa43384401788f7d1aa589615a31e6ce678a54b6bf960b7fb6740fa548cb0bfa69928ca6ff19c956920a83729409060b2c42dbb576bc7ce58fdc30134350
diff --git a/dev-perl/XML-TreePP/XML-TreePP-0.430.0-r1.ebuild b/dev-perl/XML-TreePP/XML-TreePP-0.430.0-r1.ebuild
index 1c2332884792..be2af25ebdd6 100644
--- a/dev-perl/XML-TreePP/XML-TreePP-0.430.0-r1.ebuild
+++ b/dev-perl/XML-TreePP/XML-TreePP-0.430.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=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Pure Perl implementation for parsing/writing XML documents"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/XS-Object-Magic/Manifest b/dev-perl/XS-Object-Magic/Manifest
index ca754ca1177f..280586f1871f 100644
--- a/dev-perl/XS-Object-Magic/Manifest
+++ b/dev-perl/XS-Object-Magic/Manifest
@@ -1,3 +1,3 @@
 DIST XS-Object-Magic-0.04.tar.gz 66287 BLAKE2B 74398a71b2a2cd2d867ab6624fe88de19e2730ea1d1ca641f265281de2c5024b38543d171d5505ba6e3271e523d390dcb14a7f0625c988efba472c6bffca4b42 SHA512 315288496c0bab79f16d010f7f140dc1483bb3a1053a7fc41a048308aa1f9ae01b03795be28f132c856360176372d2251315ae62db950e377be88ff222a441dd
-EBUILD XS-Object-Magic-0.40.0-r3.ebuild 735 BLAKE2B 746182f431fefd742a7352c1b060706b8c0fcba145323f997a94faba9f79a64890a671b9ddb2ed4e0433e3531159b4fa168ad2c21fecb38902f0109e71e599c0 SHA512 8602cfcd4ee51d639ad4e1c14fbf378dac5e94a6d5f4579225d08da257826951b1515ef1c0487a6d4de94c905be8f66c33d09e4bb0988b6861f690be6a9657d5
+EBUILD XS-Object-Magic-0.40.0-r3.ebuild 740 BLAKE2B c82b1873a168a1019d69201c430c110a264cb51b60ce9eb9dac6c7554ddbca0a83094bb379428c6f756ee2b62b283e00dc09bd13c14a8820e9fee4d5b983a1e4 SHA512 da8e6e44945a7bb39a092588bf492550cc0c57ba28e7d499409c12c4da9aeeb83eae414ae8052387736edefcfbb692c8127949f055f4b31951aaaafaa94adf3e
 MISC metadata.xml 483 BLAKE2B f0a889008afa432cd8596bf8927de8d92ca6766c16dd9ce168b4bf6306bbcd8ce589a320b595f057c891f019621a1d02f2e2299cf7ecd26c15b05afee1499f57 SHA512 b21aa3118b2cd7810c7cb81febb9a459b05e7daac49026de6497a510cfc8d8acb2739e290860a7f3af007ede273d62976360c70dc40dbc2fc1049ab3a7b4f11b
diff --git a/dev-perl/XS-Object-Magic/XS-Object-Magic-0.40.0-r3.ebuild b/dev-perl/XS-Object-Magic/XS-Object-Magic-0.40.0-r3.ebuild
index b916035b6247..4a37960786e5 100644
--- a/dev-perl/XS-Object-Magic/XS-Object-Magic-0.40.0-r3.ebuild
+++ b/dev-perl/XS-Object-Magic/XS-Object-Magic-0.40.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-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 @@ inherit perl-module
 
 DESCRIPTION="Opaque, extensible XS pointer backed objects using sv_magic"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/local-lib/Manifest b/dev-perl/local-lib/Manifest
index 325df5e3592c..b8c3e2cdf887 100644
--- a/dev-perl/local-lib/Manifest
+++ b/dev-perl/local-lib/Manifest
@@ -1,3 +1,3 @@
 DIST local-lib-2.000024.tar.gz 62941 BLAKE2B c618c320af46c9223f67109deb02857755b675223b0a71772227b2c7fec47225e323cdeaa9b2c66e78e9e69964fff0a19367c4e58fa4b9be5e120683e69e9078 SHA512 d23c984f0652ea8dd7028cd2dcc00991e69a5ad1ac6fce9707f953a5e6456d8173b444b7631884e764eb5ff18cea29e8e560c3835eacc0aa34382c0d172a7fd0
-EBUILD local-lib-2.0.24.ebuild 572 BLAKE2B de438186a56e86c837e42af3ab595e4f1afa7d1aee8fc2094d08087c16763bba0704dbafae60eb01dbcac3b998dec21875a26675f4721ab65d1a479998c0b732 SHA512 9cb61b8e1f3515e1e76ca8d1bd26bfefa418898ee0416e89471774a1f0674d5af56bf7328bff59cd501d69f1cbccf05a07a93779cd0151a989fd83c1ece1aed9
+EBUILD local-lib-2.0.24.ebuild 577 BLAKE2B 32b55107d0483067bebee6d737b385fd6dbb46683c3eacd64b5babed541ed186444ad8f0ecdf8ea7e263f036cd395579234a1c3a4a3aa9e7f01cedff72018577 SHA512 765dd3130220aa2cb28ca313eb5c204ecf07c85dc47a93ef6a17b3a9a09239b3a14d4e0fa9237ff65cb376cc0add57bada6f98f31967eae5d22c1ccfc57962bb
 MISC metadata.xml 480 BLAKE2B b2613e1c31939aa6096fde9b34df7ff601861371ffd532ea6c71d9dff0cb25d7151f2f34c5e7b3fc8b9e0706b383368fb116b4021a8290ea907860eb456572c7 SHA512 0c3b4a34e1c84b9eb03e7b9bae3d11473b60071709ddaae74812d1746d4c97af17f7c08981c8031930dd104dbc08cddaaf96cc081f06ce8c7f06d8126b79f9a6
diff --git a/dev-perl/local-lib/local-lib-2.0.24.ebuild b/dev-perl/local-lib/local-lib-2.0.24.ebuild
index 5f4dfab2c96d..2a37814b9b45 100644
--- a/dev-perl/local-lib/local-lib-2.0.24.ebuild
+++ b/dev-perl/local-lib/local-lib-2.0.24.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 perl-module
 
 DESCRIPTION='create and use a local lib/ for perl modules with PERL5LIB'
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/txt2html/Manifest b/dev-perl/txt2html/Manifest
index bea635139559..3e9a92db2a0b 100644
--- a/dev-perl/txt2html/Manifest
+++ b/dev-perl/txt2html/Manifest
@@ -1,3 +1,5 @@
 DIST txt2html-2.5201.tar.gz 141655 BLAKE2B f136f62911345c73eaec6ab12627b98caeb5f84ba95d0640cea870de908fc621f1eac60455beddc92021047835250877117e4740339bce02f9422a183e876dc8 SHA512 bd02872871338d3a431547a4eb4d924f42a40ad48537281c1ce77e4efc65098b50f241cd93f86e9e7d84edb7cf70bd1f372e71f30f5da191d955420be0fd0cb8
+DIST txt2html-2.53.tar.gz 134419 BLAKE2B 8b8af3dbe6dcd76e7c053c69a9cbbc671452d49f0d35497ef457608bda4763cb9ef06ccf898a711b2d9efd0b9e25f6c87d1201deb36e03b71cd3c45ceac9ae65 SHA512 171c3b3056d74e491d02722f9fabaa7ea4d8a86ea6a4e302ddb7cb00639260daa33fbccc9ee97709f085b7135a4358eed4172c7be285165115183f3fdef868b2
 EBUILD txt2html-2.520.100.ebuild 423 BLAKE2B b3118e29a0a4f5d8a23969031ec63b075ebf0816b7eae905b0eaff5a05e3536e4e0f1321634955eab1fbabd3a36785986677f2a16fa9d9bc4934e2130a345932 SHA512 7ee0d4984a84a84c8e8baad0ff928f375600fc042b3fc22d4656615d89e510f2ce552787e398c57dc8727924d157a2615574effe176a337806d3c6dc80855a83
+EBUILD txt2html-2.53.ebuild 543 BLAKE2B 26522650c65e18f773aaf7bf3c9ce461fe060019d6ff81c109f3c63a3c3058dacaeecd0de4681274a1247e20dcc46ae93a21e1b3b05c93583a8e97551eefa2b3 SHA512 d687634023731703fdccd6dc529fa0bd912290d542faae22b820f09fea21f14f20e4010920450663570e65d7cf22f943c9f07444b08aa406d7cbe598ab1387ef
 MISC metadata.xml 472 BLAKE2B 856ce749becc9601150ff408925d622108b7b575ff7dd1b9e5d5131ecb19db37ab45c2788a71e22a7bae947768d173e583a4a26e81605d28eb75da57828ce97e SHA512 3670307bdd83e7a6a6239d094fdf1a1efacca045adb7662896728d06fc0111bf10c260a7fc0fe42a4393043ab0145f1900f8954169641552408fbf2404aea724
diff --git a/dev-perl/txt2html/txt2html-2.53.ebuild b/dev-perl/txt2html/txt2html-2.53.ebuild
new file mode 100644
index 000000000000..ce679dc52463
--- /dev/null
+++ b/dev-perl/txt2html/txt2html-2.53.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit perl-module
+
+DESCRIPTION="Convert a plain text file to HTML"
+HOMEPAGE="https://github.com/resurrecting-open-source-projects/txt2html"
+SRC_URI="https://github.com/resurrecting-open-source-projects/txt2html/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	!dev-perl/TextToHTML
+	dev-perl/YAML-Syck
+	virtual/perl-Getopt-Long"
+
+DEPEND="
+	${RDEPEND}
+	dev-perl/Module-Build"
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index c4a37049019c..e11cbc06eb54 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-Mail_Mime/Manifest b/dev-php/PEAR-Mail_Mime/Manifest
index 1280d599fff3..10aca82ca417 100644
--- a/dev-php/PEAR-Mail_Mime/Manifest
+++ b/dev-php/PEAR-Mail_Mime/Manifest
@@ -2,8 +2,10 @@ DIST Mail_Mime-1.10.2.tgz 36501 BLAKE2B 59e900b99061e84d307eb46d295f843404ae06b0
 DIST Mail_Mime-1.10.4.tgz 36909 BLAKE2B 101d050d96b717ad970a6f8c170ba8ea7d94252274f0b006a266a5ef4ac9d49fb350d3bf120ce645e5a54af1f0ad0ab664c828abfa8a4a96170e7204c73dfd82 SHA512 6e58e1078292cf43605313e2402b60deb97be0b56c8eb5dbbb501cf92ca836ca4bdbc9e1ab878c89f8e59941962a91b73dd917c8e678f0944f271e5537f065e5
 DIST Mail_Mime-1.10.6.tgz 38355 BLAKE2B d12b0496122c67236090db84710aa1fa660570d82952f037ddeb795ac3184a427965e12b21a6dcd6bfaea692299fb6e610822a364470c444455369f96dbbe972 SHA512 223e4a3a3ab52497d7cee551108642aa8c90328cd5d28ec0f215e16e0f2066fbaa3e4d51e62080d322846f8410c2e4641cd7c743e736062b6f8215e637877518
 DIST Mail_Mime-1.10.7.tgz 38445 BLAKE2B 4e990a9a704aa8fd918dcbcd271946cd5a76c55783cfa207a9a8d171c1e0d407e19e2a30ce46689c8afddeee0037082d77ecbc0e3fb0b4e94f82a2b242ef22c6 SHA512 b3ac0076d3519c14f0331b73940a4fa47cfeb1d2c31d5a5ffa820042fc9b56a8b4d479f349dbe213164c157d5c56caaf0b4f70ef422cc3eba40443433c813d60
+DIST Mail_Mime-1.10.8.tgz 38783 BLAKE2B 5a9410dd0778bbd765a6c6f2e7880d2e7951d131c3e2195a840e0b31579fc2c8b722db434d3d104fa3d178e7033cb08d9ac15a9ebfa38911566d5e52a2ddbae8 SHA512 3f32b894ded49fc848650d684d98c9db6394074491a0ef92ed97be01f35ad01aab96845d4bc590034767fcc92631fdf475db3d0c926a000ad7879d6a9ac824b5
 EBUILD PEAR-Mail_Mime-1.10.2-r1.ebuild 648 BLAKE2B 735856e37be12bd6e5dd34237a939dc5dd589f5c32d38ffdbcf1c1df5ebb51e70438dd1df058ce63a705856c898b9e035a935f6fd20263b91602b09585021af5 SHA512 a2e35d79feb1beffd8db5cd4e850cdd4107b26c87f4ae2fe5c74c1eed9a64bd6a8773e1c7561f1cea96348b9d47be0af9fd36a09e429ff0079a0f96be2cfbc71
 EBUILD PEAR-Mail_Mime-1.10.4.ebuild 659 BLAKE2B 5d14d7d28e38dee39420268c0d300a8e50204360fa2e494770e65caf0caec3d90e531462222583f4df1af33e7d387f7b282ed8418af4fe19e1f477720f14d265 SHA512 27ad47c4f1ba14bd930279a9ea570952cd3305d47f770a4713ab312c32fd4666de43fcb1e8b1fcdf1aacc51fd3c72ec05650fff8cff50ea1aaee9c15a5839fbd
 EBUILD PEAR-Mail_Mime-1.10.6.ebuild 659 BLAKE2B 5d14d7d28e38dee39420268c0d300a8e50204360fa2e494770e65caf0caec3d90e531462222583f4df1af33e7d387f7b282ed8418af4fe19e1f477720f14d265 SHA512 27ad47c4f1ba14bd930279a9ea570952cd3305d47f770a4713ab312c32fd4666de43fcb1e8b1fcdf1aacc51fd3c72ec05650fff8cff50ea1aaee9c15a5839fbd
 EBUILD PEAR-Mail_Mime-1.10.7.ebuild 659 BLAKE2B 5d14d7d28e38dee39420268c0d300a8e50204360fa2e494770e65caf0caec3d90e531462222583f4df1af33e7d387f7b282ed8418af4fe19e1f477720f14d265 SHA512 27ad47c4f1ba14bd930279a9ea570952cd3305d47f770a4713ab312c32fd4666de43fcb1e8b1fcdf1aacc51fd3c72ec05650fff8cff50ea1aaee9c15a5839fbd
+EBUILD PEAR-Mail_Mime-1.10.8.ebuild 659 BLAKE2B 5d14d7d28e38dee39420268c0d300a8e50204360fa2e494770e65caf0caec3d90e531462222583f4df1af33e7d387f7b282ed8418af4fe19e1f477720f14d265 SHA512 27ad47c4f1ba14bd930279a9ea570952cd3305d47f770a4713ab312c32fd4666de43fcb1e8b1fcdf1aacc51fd3c72ec05650fff8cff50ea1aaee9c15a5839fbd
 MISC metadata.xml 358 BLAKE2B 0bfd697c80f3c64bff567b59cba40da1879b944b0775ed1d5e7fb4d80b057403dce613ffec5d5f06b46b7446dc16b3c95523f4b230b7f68ba3f6e05e502f9753 SHA512 c0a0fb9ceafd2378e774675500f9c1c60a7510a30c98f293bd5c92f83bfbe6a10b59d0b85ac6de1724b9e5deb1a7c0371e35871a8c7b9c63724df2762f3ca7a2
diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.8.ebuild b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.8.ebuild
new file mode 100644
index 000000000000..a88d469a1fcd
--- /dev/null
+++ b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.8.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit php-pear-r2
+
+DESCRIPTION="Create and manipulate mime messages with PHP"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-php/PEAR-PEAR )"
+
+src_test() {
+	# Requires the "pear" executable from dev-php/PEAR-PEAR.
+	pear run-tests tests || die
+
+	# The command succeeds regardless of whether or not the test suite
+	# passed, but this file is only written when there was a failure.
+	[[ -f run-tests.log ]] && die "test suite failed"
+}
diff --git a/dev-php/PEAR-Net_SMTP/Manifest b/dev-php/PEAR-Net_SMTP/Manifest
index 883581fe0a20..a8e7e79a66bb 100644
--- a/dev-php/PEAR-Net_SMTP/Manifest
+++ b/dev-php/PEAR-Net_SMTP/Manifest
@@ -2,8 +2,10 @@ 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
+DIST Net_SMTP-1.9.1.tgz 15146 BLAKE2B 1bc1a837cc658f68b5ff866758d624f4d916e1b97166b0fe1b3257200ab3fbc76c52fa567eb064f82e4dbed38ec1e2364962bf2c4cf7d60c3c6f2a0a45a0ecc6 SHA512 6426ef18203b93960bd85d346622fdb6a76cb3f2182ae6c7ab21c9cfddaf779a7fdd02b0ac5425443265b522147f54ca9ef8ff7eef4a17428c7c664d8dab5993
 EBUILD PEAR-Net_SMTP-1.7.2-r3.ebuild 687 BLAKE2B f632d99be12794263a34ee147804cc87abf5161fe448e0771baf8044bbe10d6b7217183db55dc8d0d79a592ed869c8a39bec149c81df216bb1baa71d4341c2d9 SHA512 6d27788351d4d6386a0bc223ae39913678a9a5c5043750e263ac5a643988b1b4d2edbd2c89e13eccd58c46811f0d40f554d3610a86cd62c8ae949cfc65243a53
 EBUILD PEAR-Net_SMTP-1.7.3.ebuild 694 BLAKE2B dde59da780a90922f27196bb86821dbfd50f4735e86192f4052db322c5f0bef921d2e85db403f8882c0a70ee974481043c0e9a069100bb1339a68a028c32a6a2 SHA512 c1d844784d9f311739f0b8dcef424fcffa6a5114ae62b1a34c660cc3e77f13f71fcb5eb78e55514dc6341dea9cd84beec7d8e2f6b673aba59435c66f2be7e3ec
 EBUILD PEAR-Net_SMTP-1.8.1.ebuild 647 BLAKE2B d18830a7373e02e2a6194013d9841d81d19ce099514a779ff4887a0d74a8fdff99113795e7699b7ba8cfaa757eb3bd987f2395c8505a3a6f051004ecbbbeffa6 SHA512 55c5116c262e00ee6b3bbd416e67a78bb88bbb7c5ff7d4ed94138f8340b67d107d767d5a2d40165ba8bb4afd99cc2b192bfab66977e3795f6ff38e0056db2337
 EBUILD PEAR-Net_SMTP-1.9.0.ebuild 647 BLAKE2B d18830a7373e02e2a6194013d9841d81d19ce099514a779ff4887a0d74a8fdff99113795e7699b7ba8cfaa757eb3bd987f2395c8505a3a6f051004ecbbbeffa6 SHA512 55c5116c262e00ee6b3bbd416e67a78bb88bbb7c5ff7d4ed94138f8340b67d107d767d5a2d40165ba8bb4afd99cc2b192bfab66977e3795f6ff38e0056db2337
+EBUILD PEAR-Net_SMTP-1.9.1.ebuild 647 BLAKE2B d18830a7373e02e2a6194013d9841d81d19ce099514a779ff4887a0d74a8fdff99113795e7699b7ba8cfaa757eb3bd987f2395c8505a3a6f051004ecbbbeffa6 SHA512 55c5116c262e00ee6b3bbd416e67a78bb88bbb7c5ff7d4ed94138f8340b67d107d767d5a2d40165ba8bb4afd99cc2b192bfab66977e3795f6ff38e0056db2337
 MISC metadata.xml 488 BLAKE2B 599d14f0128115db0ec6ff80d664e286e1b28dc8b0dcd5d0a94c1f3229b3290af47beee88825567ec1aea4eddd799a21f178a05849658e2d0f6bf0a45ceec94c SHA512 4833cacc6321078ce7696ac7f456e1ed368300879b71a133eb81a804e985207f5baa10b8305dbfa716f08057b74bb374347f9211924ecd3fb7a1c44562eb8aac
diff --git a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.9.1.ebuild b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.9.1.ebuild
new file mode 100644
index 000000000000..56fe101e706d
--- /dev/null
+++ b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.9.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit php-pear-r2
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A PHP implementation of the SMTP protocol"
+HOMEPAGE="https://pear.php.net/package/Net_SMTP"
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="examples sasl"
+DEPEND=""
+RDEPEND="dev-lang/php:*
+	dev-php/PEAR-Net_Socket
+	dev-php/PEAR-PEAR
+	sasl? ( dev-php/PEAR-Auth_SASL )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	DOCS=( docs/guide.txt )
+	use examples && HTML_DOCS=( examples )
+	php-pear-r2_src_install
+}
diff --git a/dev-php/phing/Manifest b/dev-php/phing/Manifest
index f46f095785ac..c79f1149d33b 100644
--- a/dev-php/phing/Manifest
+++ b/dev-php/phing/Manifest
@@ -1,4 +1,6 @@
 AUX autoload.php 418 BLAKE2B 8999ecee030a7d3eab49102bea8bf3aedff8c0e35021947279fee65ed9c0fa2f6bdc923a5e48437f314623cfed7545b3f4e30e8eb19610091c13a897c93278ca SHA512 81a22775a38d08e681e0f0a97fd6f125065be86fb491894f397cb25cc8240a7038b6cf061c77cc0c4837cc5a68aef909fe3a94ae84165a5f358050fac0164cd1
 DIST phing-2.16.1.tgz 4149013 BLAKE2B 266c124237d437361e9e18a42c9358fc18cfacfaa798a3a92a31858b7c1af847cde2cac43e0fcfe3759e8291639de9ec564f977fe00939316dbacdfd266e4e92 SHA512 e0832396dac9fbd43680f01acfa55f3ed2819726ace1db4ec9addf18c9c023c4f63143c6a63bbe1b16c2bd19dba54f503efdc77d772a3239bc8f9efe0ab375bb
+DIST phing-2.16.3.tgz 858508 BLAKE2B f1125420989af4ec9d1795044d96131a78012d5000eb8adaf9d076f4e2bbceeab0f11b9a24b79425fff179b4ec9dbe5a33aba65dbd4de6b70e64c1cb7c243004 SHA512 b564ddea969bd2a538e09768f6e4d88e9e61ecf6d783db4e328ef9be00099b1fee6ac6dac49b61bab6243e61969131d22869e95b8f063b9c233fd23afa314d30
 EBUILD phing-2.16.1.ebuild 1552 BLAKE2B 4ebbe638f537094ae2fc898f9fa9f3d1d6fa3955a4b0ba7f2da50cf03efc24e42917ccb02caed1855858ea8dea7885a0e5b7142848c42cec3cd35cfcc1842cbd SHA512 3e10a755f846b85b70e405839537c237c373b4c1a3428157077d2621ce023e4d0d59573e81d706a8cf85e505329b7511153bbc8e92292b7475db813a5ca55773
+EBUILD phing-2.16.3.ebuild 1549 BLAKE2B bb4a01d8042712ccc0e0562cd38be6569af3b368735013dd247ffc1de2c0aef73e7b707b443c14c379626aa334b1ddb3d4a5b659b49f1ee46d43b5d42d43231f SHA512 7936e5cb4e5d1487fd8ed20d44d334ec182ff285139a57f51c5fd5d4163bc0ae5d8f6c3619b9450b466d7572f2b641fb8065a1a40f3d1e5abb2631c51ffdd7ad
 MISC metadata.xml 471 BLAKE2B eed7a2c37fef52fce309821dbeb3dd30276d438cdd3b00b709b8fd5c5814f2e25c48465eaa1abd7aef190f3a3b1c502be1066e6b8479761001c71ffd94f91999 SHA512 a0b77b3717c96c2aa8807f967c5c5a61dbcaa543ac7467a6f36bfdb9a74897b975d543ea2515180718cd016d7ec72989e985ce45c87cec04923f9226a2c97254
diff --git a/dev-php/phing/phing-2.16.3.ebuild b/dev-php/phing/phing-2.16.3.ebuild
new file mode 100644
index 000000000000..a85ce522c145
--- /dev/null
+++ b/dev-php/phing/phing-2.16.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="PHP project build system based on Apache Ant"
+HOMEPAGE="https://www.phing.info/"
+SRC_URI="https://www.phing.info/get/${P}.tgz"
+
+LICENSE="FDL-1.3 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples minimal zip"
+
+RDEPEND="dev-lang/php:*[cli,xml,xslt,zip?]
+	dev-php/symfony-yaml
+	!minimal? (
+		dev-php/PEAR-HTTP_Request2
+		dev-php/PEAR-PEAR_PackageFileManager
+		dev-php/PEAR-VersionControl_SVN
+		dev-php/PHP_CodeCoverage
+		dev-php/phpDocumentor
+		dev-php/phpmd
+		dev-php/phpunit
+		dev-php/simpletest
+		dev-php/xdebug
+	)"
+
+S="${WORKDIR}"
+
+src_install() {
+	dodoc CHANGELOG.md CREDITS.md README.md
+	dodoc -r docs/docbook5/en/output/hlhtml
+	use doc && dodoc -r docs/api
+	use examples && dodoc -r docs/example
+
+	# Install the executable (and the PHP file it wraps) outside of the
+	# PHP include directory, since nobody should be including it.
+	exeinto "/usr/share/${PN}/bin"
+	doexe "bin/${PN}"
+	insinto "/usr/share/${PN}/bin"
+	doins "bin/${PN}.php"
+	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
+
+	# Phing tries to get the version number from this file.
+	insinto "/usr/share/${PN}/etc"
+	doins etc/VERSION.TXT
+
+	# The executable will only look for autoload.php in one place, so we
+	# create an (otherwise pointless) vendor directory to house it.
+	insinto "/usr/share/${PN}/vendor"
+	doins "${FILESDIR}/autoload.php"
+
+	# But install the library under /usr/share/php.
+	insinto "/usr/share/php"
+	doins -r "classes/${PN}"
+}
diff --git a/dev-php/phpmd/Manifest b/dev-php/phpmd/Manifest
index 5c6918920320..1f32232adccb 100644
--- a/dev-php/phpmd/Manifest
+++ b/dev-php/phpmd/Manifest
@@ -1,4 +1,6 @@
 AUX autoload.php 325 BLAKE2B 73cdf98199c37978e3a82ff70583220bc9a93494ca204d6a9da321b943407db5144ac376c40590a7bf784109633679a267838e9e52889977947395e5ee38528c SHA512 2cbb2349a598c9515cd995b22cb685d4ea6e9e5edc6c0e5ce602f7520c4aa70cc63872c31209720019c424ab188b063aedf7829899882608eafca9c83794d219
 DIST phpmd-2.6.0.tar.gz 57496 BLAKE2B 447e1b0a18372abc82746e8f2a47ea0df76fdeea51e7012ea63a0d644f7cd71790a3e354584d18f57bab3e7211f1037ff3f61aff367c3419caa44e77e79d1cbb SHA512 7c81bef8457f28dd40b908f535cf432d65ba6910c54f730b4d9f7a0bffa096653af029701a6ce4bd22910ec69453c5ff22c657100757d7d6eacff2226b597023
+DIST phpmd-2.8.2.tar.gz 68049 BLAKE2B 5135364fd77aa7e56bcbc7cda7b8bff1daf08211ff2a555aadb6f9fd6706d138bd89a3bfdb8b33f15df8746826d2c09435fa1d69109609a2e7b63843ba15e0fc SHA512 7c793181fa954b8c67334c0e0bdbb5bd93244233c404fb8b51ceacb3ede121e7fb66f69d555455fddbf333741a8d8636b85f20884a09988934e128f853f6faaa
 EBUILD phpmd-2.6.0.ebuild 1124 BLAKE2B 6e6e34fb5ddb5c00a14c76df601255368822c999ab8756fa35af633e4857759d6fa9d641ef25095bd5bbf703a46fef32d42c0d9e3e5f027e31811d425ce1ccac SHA512 1fe7d91ededcddcdc8b3b8b722be70592ee2f6d2fca08543a62abdc5e6dc7bbfee5cad97774fed9c3394134c230b35a45d2799043da2e609b36e64ae641ebc87
+EBUILD phpmd-2.8.2.ebuild 1121 BLAKE2B 6e0ecb3f10faa0d5c6aa42de1d6c1e68958a5e61aa3a9800c2204134e6d8a0675fdf71999d594b8c1880086d0fd816dd248ba71497243f93c4c1f2723c355c0f SHA512 9d28c9c06b28a7263cb0223e6abc5d77a857b20cff3bdb263230cda907610e70b0a411957acd8f3561d9972b93d754e1b3b39d8481404d3c47123ba3fef988e9
 MISC metadata.xml 325 BLAKE2B 80b920bf354b940ca23aaf02297c6ca21ef4d782831c2f4edfba9756c29dc13ed7c74d6d8e58635c0f3915e3c939dc6a4290ce00751965eaabad995b6969fff9 SHA512 d2f6eb6841f0c21aeea3e158ef62388d2cddb3eb4c9a363b211fe232d9b64e4d45d80856986d5293c1d5ad17948648bc606133d28b3001b912ed1fe022ee2432
diff --git a/dev-php/phpmd/phpmd-2.8.2.ebuild b/dev-php/phpmd/phpmd-2.8.2.ebuild
new file mode 100644
index 000000000000..e760429e045b
--- /dev/null
+++ b/dev-php/phpmd/phpmd-2.8.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="PHP mess detector"
+HOMEPAGE="http://www.phpmd.org/"
+
+# The test suite is absent from the release tarballs because
+# the only build system that Composer understands is "cp -r".
+# To obtain the tests, we would need to grab a VCS snapshot.
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/php[xml]
+	dev-php/phpdepend"
+
+src_install() {
+	dodoc AUTHORS.rst CHANGELOG CONTRIBUTING.md README.rst
+
+	# The executable will only look for autoload.php in one place, so we
+	# create an (otherwise pointless) vendor directory to house it.
+	insinto "/usr/share/${PN}/vendor"
+	doins "${FILESDIR}/autoload.php"
+
+	insinto "/usr/share/${PN}/src"
+	doins -r src/main
+
+	# The executable uses relative include paths, so the one users will
+	# actually run needs to be symlinked into the source tree.
+	exeinto "/usr/share/${PN}/src/bin"
+	doexe "src/bin/${PN}"
+	dosym "../share/${PN}/src/bin/${PN}" "/usr/bin/${PN}"
+}
diff --git a/dev-php/phpspec-prophecy/Manifest b/dev-php/phpspec-prophecy/Manifest
index 43f173ce4545..a7b82c97faaf 100644
--- a/dev-php/phpspec-prophecy/Manifest
+++ b/dev-php/phpspec-prophecy/Manifest
@@ -2,11 +2,13 @@ AUX autoload-1.10.0.php 544 BLAKE2B 82d40ed95ab0a807cf26997d39aa2b5559a4f6eec304
 AUX autoload.php 544 BLAKE2B d6ec873ca93869028f105eb90480031805bf2a377ca73824ae363456388d0ecbebcc5a736ec0e9ba507f7bb00e2843aa6cb3a1cad15ea849d825080ff0c6cb09 SHA512 4c75d70b199ca708d6dbd8975df0fe1e73db9b91bbce1f4360dca7405e3bc782f10331e83399a09fe2ea7373064f70538ba0b7525be008614be75b52ee7267fb
 DIST phpspec-prophecy-1.10.0.tar.gz 38663 BLAKE2B 44a292eb24cbef36217c108cc09497847b27e249fa3894bdd6846e7547aab7a514396deb9918f7b1ddfe4e71142beb266914669c1d3ce151dfac2aafe7be214b SHA512 f2f871dfe6db2b405ef57b859f82b7540c233ce3056601aee3a09394416a625445e4b94db50cef240a5b0da0fc972fb8b8ca3216750b6a658f09817a60da21b1
 DIST phpspec-prophecy-1.10.1.tar.gz 38707 BLAKE2B 1eaa3fe0043b0d03341778679683cd388d2cdcc3c386ee5801f22dce453fbc3c276023f1b9dc6f26ee332948f59081e09d0944948feff1a6332195523570e4c9 SHA512 f42d115969894b0c1f4887a2154fe310ddd3c7d5a49abbed3c3cb6ffa86d83b1458b9323203e68a7389f5df3c95b3a25037bed41cb8f3b5e824d45102579b9ca
+DIST phpspec-prophecy-1.10.3.tar.gz 38838 BLAKE2B 05150e31bcb5896768878672a2523499470541409796b6f4f0de2b8b8686cfa097b6a745e467ed3c9693b0498712d04f6f0e1ba0d19e2fa3677ab9f6423608de SHA512 ada5ecf157bcc5979a86c76448f72c8a890f7db4496327ecf2b7b723bdfe901dd53b0225f8ee3ae7cbc38d08933c863224c9661466428fb47da9bfebdb86627c
 DIST phpspec-prophecy-1.7.0.tar.gz 60338 BLAKE2B 8171120d8407f2e554150d5e3ea1972c54d4e2ce0e6698763f0b3c7e1645340ce22404da7844fed8412579c46f372852b4553c6d8a65c8094ef3065b0dbbd80c SHA512 e8efb3882d869f10fe39dff7c2185e1ec6f044c794fd6a5785e1c1c69c71b91dc3997f61bd2566d3243dde0becce568beba9a18fa0fd152e6ce74ca43a9a0fb0
 DIST phpspec-prophecy-1.8.0.tar.gz 37907 BLAKE2B 4bdd55d7fc14604c9fade23c60bf51f4c03accc182d7c5ad445dc6212a1e41b1bf392fe8f4a29768ecfcb2af479c0db3e29d5787d12e1f3222b032ba7e64dbc8 SHA512 992673f7cd148cf0b8752bbad614bbe34175a761cd4bf8849625794b505342d1bd918212a0f1463d94513f9e805d3dd127ba129d6622bcda29ea2b5c57a5582f
 DIST phpspec-prophecy-1.9.0.tar.gz 38262 BLAKE2B 1642d38afa368be504da73c0bcf34921fe167dff5665651af23142f33979a35d8d10112e3d1c5b1b38448b92b4741ebda2c183dca10473dce833090a603f95f6 SHA512 d0ba1840ca84cf4b0642083858326c593086f35ba3a6d83746956efbe5d538910efc01655eaa14b4e2b7e17e7bd19cd2494cdfad0dd5bdfb43cdee2402a55b05
 EBUILD phpspec-prophecy-1.10.0.ebuild 830 BLAKE2B e9972a363e07fe83f00a282b6c8f1404fcf7d8418c43cab20f72cd4a6b36880fa62e04149b2d82a657feb95719fffd31e58ea40508ab5be27ea10c2df7074f75 SHA512 3e381d989326b6f55ce31738eb4227dab625e1a8c9ddbbb236251ced16f68e103247a47f1ccca89730af2110f164009d5b1468247f0895ba270347d8d8b2d730
 EBUILD phpspec-prophecy-1.10.1.ebuild 830 BLAKE2B e9972a363e07fe83f00a282b6c8f1404fcf7d8418c43cab20f72cd4a6b36880fa62e04149b2d82a657feb95719fffd31e58ea40508ab5be27ea10c2df7074f75 SHA512 3e381d989326b6f55ce31738eb4227dab625e1a8c9ddbbb236251ced16f68e103247a47f1ccca89730af2110f164009d5b1468247f0895ba270347d8d8b2d730
+EBUILD phpspec-prophecy-1.10.3.ebuild 788 BLAKE2B 10db6dce9638c14927d090e6d7032db47a598d744946bcb4a6054b43533c3a6492365811c8c414d8cf2a399f067eb6b8f1f6202462842f2ec900af06a125ef55 SHA512 a77c1e2fb0c14db14bc292d7d3164ead2d5746382dad5ae6029303e128c042de1c7a73bbdfee03da9faa9ca125c15647c14ee8dc177ace31e831e40baf494b86
 EBUILD phpspec-prophecy-1.7.0.ebuild 801 BLAKE2B 07c8a7cbee0def8cf2f9762f6aeb01418193d16c16b2be983d78d67d7477b3f4d42c12f65432e9dc321510d7d0e4197cc3d17b616cb6d16c86c662d9704f841d SHA512 7dc9aaed41286dc22fb624b3d5762b493ae5c590ed5d5c0c0229a91650bff0676e6391aa59ad4ad09b7837b7d7ff1c296492fa98c18aa1d835172e46bf16c4df
 EBUILD phpspec-prophecy-1.8.0.ebuild 809 BLAKE2B 26753f262d4b9005ef9e5ee2fc0888687023aad9cb7608d22e713270755ee1214f46ae2535e04d2627e10c534b0aacbc1b904f48c6740fa678d2900c9978cd47 SHA512 9484b2eb57540008f72f7b653c6b953ba706ca83b87e041df7f476ed3529fbfbe8c5b8d15fb8b27d7917116c6060df75aa2307bb36756e7c3e5f6013d59bd705
 EBUILD phpspec-prophecy-1.9.0.ebuild 809 BLAKE2B 26753f262d4b9005ef9e5ee2fc0888687023aad9cb7608d22e713270755ee1214f46ae2535e04d2627e10c534b0aacbc1b904f48c6740fa678d2900c9978cd47 SHA512 9484b2eb57540008f72f7b653c6b953ba706ca83b87e041df7f476ed3529fbfbe8c5b8d15fb8b27d7917116c6060df75aa2307bb36756e7c3e5f6013d59bd705
diff --git a/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.3.ebuild b/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.3.ebuild
new file mode 100644
index 000000000000..1b8181046335
--- /dev/null
+++ b/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Highly opinionated mocking framework"
+HOMEPAGE="https://github.com/phpspec/prophecy"
+SRC_URI="https://github.com/phpspec/prophecy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+S="${WORKDIR}/prophecy-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+	<dev-php/doctrine-instantiator-2
+	<dev-php/phpdocumentor-reflection-docblock-6
+	<dev-php/sebastian-comparator-4
+	<dev-php/sebastian-recursion-context-4
+	>=dev-lang/php-5.6:*"
+
+src_install() {
+	insinto /usr/share/php/${MY_VENDOR}/Prophecy
+	doins -r src/Prophecy/*
+	newins "${FILESDIR}/autoload-1.10.0.php" autoload.php
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 2c09d43b05b5..4084c2eefd88 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index 9f82bb74aeb6..210b60c754cd 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -2,6 +2,6 @@ AUX argcomplete-1.11.1-fish-xpass.patch 1195 BLAKE2B 9ae2e5803359f2abca0b168e009
 DIST argcomplete-1.11.0.tar.gz 50555 BLAKE2B 7029b2bf442362f3dca804b75c32e000bf48e1ccee1e8e4e0e3c484d883a95f4c4774f7367b51f6310b653be457f3ad1ee5e4907cf9566c97a12ca85fbcb177d SHA512 30a594d7f3a9ad31b4a7c537bd81e6cc23bcb3861a9d2b9999c654c0f04b4f330bcb7dbab7fe7191d4b8bbbbecdb2ad3c1b8ab812c16bec880fe83733f75c5b6
 DIST argcomplete-1.11.1.tar.gz 50773 BLAKE2B 15c92929fc20a10a1f1e29cf8714b74dd9ab0ce11e7f77acd4b15a907ad885f944f8540a8b37fef13ea67ee8eb76107e1c72746434f2710ded7331830494ff50 SHA512 523d542cf1430d8ad7b056e3b9c52769847c6e0bb9e266d71cc961e56816b7811f488a5c412f89b8de0d022a321d74733af87a50b3c0d698e796fb5e322d16ce
 EBUILD argcomplete-1.11.0.ebuild 836 BLAKE2B 659835d8d5bd7656717849047d09a67b45b203159873a800ee38d0779d5852d965389a040f50d281559fcfeedf1a5fc554ea138bb61cc8586c34a77e68333a97 SHA512 f882eb57a2c9e4b7008f40ecf1cb0a354f36cbbd8f59a786036539dc75f288335ad83fd51011dc48daa134c7c3a18c4bfbd9b17bc1ad5309bcb480d79d1be8d8
-EBUILD argcomplete-1.11.1-r1.ebuild 901 BLAKE2B b849d4dd62faa60f580c1253982fff13318942ec3ac7c0b2be8ce7f779aeeb65b03cdcac4ba7425d0f91fed7e93609bdb0f210b2ebfb418daeb870ca9f304652 SHA512 1875bbcdb461030746970962ba27defdef005db61125dd87fbc5c1d7280567b7ef2e0de486f410d59b3d74c639a5da0db1320a20e87c081c389737bb51df11b0
+EBUILD argcomplete-1.11.1-r1.ebuild 899 BLAKE2B ca6391d1e844fbe1a46c00b5e4b8d2d1e257e7507ea731f0c5aafcbad91b2d18f1dc97f63ab369610522304f90998ac622e6a79fff64c45bd86c463431c41c3b SHA512 9381849961c660c5bb12469ccfa2e94e3e920c0b56e65d0dde191a187a2aa83e4a4a03dd8d150da5dbe9c67b834899cf632a9d37f0cfd2392947acaa1bf85cbc
 EBUILD argcomplete-1.11.1.ebuild 877 BLAKE2B 1447f620cf4b54262454de2f128b3e74e82b41b805ae4f50656c314d02030b868c6b02d70facc2f7e0de5304a94e8cf892abfb4dd84621bc1bb443b0eaae94cc SHA512 bb33d42173aedcc74bdb8ee41c144b22e7214dc71e10c42a66ec6f23c4e5e176387c449cb1e3d3093e166f0766eca6c5836be6e609e6255a5212bbf7fa90b483
 MISC metadata.xml 410 BLAKE2B 5cc57d8d5fce195e6c050674f8626a6b2a884a956306c668a40fb81c3bed51d9dd8a23c4b69cca5ece9facdd6d459341abc2e5fd4454b1f3614b5866b3501682 SHA512 9a04c26c63f40f33ed3f5d004e5a0478dcaa5f90c363f1364ee14f309433d65e3db5809b3fa8b504c4d4f961b79a8ae39efbd6b3af1fe1cf681ad1f4f9a89fc3
diff --git a/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild b/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
index ba290069e48d..eefc33c78356 100644
--- a/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/argon2-cffi/Manifest b/dev-python/argon2-cffi/Manifest
new file mode 100644
index 000000000000..ac5ebc0984dd
--- /dev/null
+++ b/dev-python/argon2-cffi/Manifest
@@ -0,0 +1,3 @@
+DIST argon2-cffi-20.1.0.tar.gz 1814415 BLAKE2B c216349beffa263fd96df23f40a8102b56a88b8320e64ac062ecfea4582efa34b298ba223437bfbfc422b68a3d9b9ea769c384db078c633103f2aae3cd38bd5b SHA512 d1d798e3e51ed67c4f523a66081fea99479ee986b5cfc36b250954e757b9846625681445447f9347519d9988f8a2ace2e3c8ce5817c5c6b4767819cf56ee0af2
+EBUILD argon2-cffi-20.1.0.ebuild 754 BLAKE2B 6d1a5af93bf210b9b9b34212ff9498078c97873e418556ec527f281daf918554a4977475f2e1012e287d77e52afa1ffccc4d9cdd27bb0ec6684d03c138b6b776 SHA512 e13ac8ec2b0f9927fb20670c6acfb94733d4e2caec97db5a8e6f04d0da734a0d70b9423da7f359e6f2bc541085d678d3b90258727c84d421782d361aae3038e3
+MISC metadata.xml 635 BLAKE2B f81f4a8996795ecf69d31587e460532fca7861c8bc5546c7511ee19389406601e0cfe84d67e9387163247833f4032c8c00f3c4de7fcdf8b9f4a0ff405a5299b5 SHA512 d50d5dbcf728218f7fa3accb7b105b6c879a0fef1382868a1d30159e91dcbb3aa818e986303c0c694ac3d8b00b53e17a66d6b9c9d69bfa8a8d20157cacd5f706
diff --git a/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild b/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild
new file mode 100644
index 000000000000..fd169244b16c
--- /dev/null
+++ b/dev-python/argon2-cffi/argon2-cffi-20.1.0.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} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="CFFI bindings to the Argon2 password hashing library"
+HOMEPAGE="https://github.com/hynek/argon2-cffi"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	app-crypt/argon2:=
+	dev-python/six[${PYTHON_USEDEP}]
+	virtual/python-cffi[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+BDEPEND="test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( AUTHORS.rst CHANGELOG.rst FAQ.rst README.rst )
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_configure_all() {
+	export ARGON2_CFFI_USE_SYSTEM=1
+}
diff --git a/dev-python/argon2-cffi/metadata.xml b/dev-python/argon2-cffi/metadata.xml
new file mode 100644
index 000000000000..12d0ade52d84
--- /dev/null
+++ b/dev-python/argon2-cffi/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>m.seifert@digitalernachschub.de</email>
+    <name>Michael Seifert</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">argon2-cffi</remote-id>
+    <remote-id type="github">hynek/argon2-cffi</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/argon2_cffi/Manifest b/dev-python/argon2_cffi/Manifest
deleted file mode 100644
index 728e50a673e8..000000000000
--- a/dev-python/argon2_cffi/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST argon2_cffi-19.1.0.tar.gz 1808120 BLAKE2B f30afe3c270fe4ff41ee97418a49480d7ec7235db659d033926cb7380afb664ab61cfb41fbae2f8581c6873c474746431a1360abc134244803acab73836ed533 SHA512 9bc10f0dfbb199e0ae0c9bd6a7c9183a5b0b108966d89bacf8ee744a926d400bccc14869b889a2482be4a5c48bd7ed0464cf316ecad74b758a5493beed7d466c
-EBUILD argon2_cffi-19.1.0.ebuild 826 BLAKE2B e7aa1e13b314417ef98a6a616c4eb868379d2cfa5b44fe40adbbeb9c89e22caeea6698a72e87251955e2ddcef9a91d38133b8d5a29386ad20d62d2ca13d6d499 SHA512 2bd2bf765da13ed0abadea66ce9dca59b509d086ab960956d7e35837fc22329255dbd6bc3c3ffcdf6314e4c2890f951ad2375d3527ea906fdbf33841f486a6fa
-MISC metadata.xml 727 BLAKE2B 8ca033f1a646a7d55dd8c78f483998d8ee34863d372c88b0d9e42c7d1fa7a14962b9a2e9c19aa13d0d35c7cd0e68599419a9641982dd376d76ade5c98d3cf338 SHA512 770cffcd4f6ecbf4fe93463bdb1670a9ec882844da62ac8ce18d606efcda6f314a3942b205d6a4ec54aee6b53f784faf6d19482601c9b570567217c31c6846b2
diff --git a/dev-python/argon2_cffi/argon2_cffi-19.1.0.ebuild b/dev-python/argon2_cffi/argon2_cffi-19.1.0.ebuild
deleted file mode 100644
index 511ca6b470b2..000000000000
--- a/dev-python/argon2_cffi/argon2_cffi-19.1.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
-
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="CFFI bindings to the Argon2 password hashing library"
-HOMEPAGE="https://github.com/hynek/argon2-cffi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="
-	app-crypt/argon2:=
-	dev-python/six[${PYTHON_USEDEP}]
-	virtual/python-cffi[${PYTHON_USEDEP}]
-"
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( AUTHORS.rst CHANGELOG.rst FAQ.rst README.rst )
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_configure_all() {
-	export ARGON2_CFFI_USE_SYSTEM=1
-}
diff --git a/dev-python/argon2_cffi/metadata.xml b/dev-python/argon2_cffi/metadata.xml
deleted file mode 100644
index 3404c181dec2..000000000000
--- a/dev-python/argon2_cffi/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>m.seifert@digitalernachschub.de</email>
-    <name>Michael Seifert</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <longdescription>CFFI bindings for the Argon2 password hashing library.</longdescription>
-  <upstream>
-    <remote-id type="pypi">argon2_cffi</remote-id>
-    <remote-id type="github">hynek/argon2_cffi</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/betamax/Manifest b/dev-python/betamax/Manifest
index 1e559e3538d4..8e178ad58abf 100644
--- a/dev-python/betamax/Manifest
+++ b/dev-python/betamax/Manifest
@@ -1,4 +1,4 @@
 AUX betamax-0.8.1-tests.patch 867 BLAKE2B d161db0b79eff7591bf87cf256a50357e1d82f7eeb0fdf39c27be287c97bf6a536a4e62defd173305ba598f388f2b49d22545443c6fcb589f66988930ae29a55 SHA512 001b26d84e4a02b242ee90b36df0a30c9c4890623191655a8eae5a87e106679197fa8090354b52a72ad07da97666190ebb3a7dcb9b4ffba7b9bea9c18bfed115
 DIST betamax-0.8.1.tar.gz 77526 BLAKE2B 2ce88326c5ef80082908912c4b14f149793c4457c47446ebcabaaffaa6b0ee64528096acc6bdd868fce0fad3d10ad66697cad5dc422c15b324e1cc9ae20eafa6 SHA512 89bfb56cf4004a70ec8c1f2342cfa0e02f850b8ed80b67f8b2b02c1a2093e8ac1cf1b9980354551e9d3a21fadde0d77d717f1559487024941973cd80bd451734
-EBUILD betamax-0.8.1.ebuild 1194 BLAKE2B 8a7b8e17ee2f07825c284ad8c4bde8c1c8f9202b037fa8af804c08607d53c882d3d7675017e1c1499be146b48219795be1e87ce7e46a37654d9c14a9ec2b838b SHA512 a2957b912eca66702d88c44183384186ae03648045d8c554940f4dad8faacf6022ef5d76f739a557a364249083269906594451c16ad12914d0e25b0067299c62
+EBUILD betamax-0.8.1.ebuild 1193 BLAKE2B 69ed66261a5610e2510e47d3433c1962f3b05ad114a2d3d0dd6439f2111c8e9952861d291f4800a9478b35cd295a2fdfd7b11c736c366fc7c5dfea0ebadcc882 SHA512 ea2d379c8241fa0e89e06f8db277f6965a02c6494bf6e288f3091fffd981e1994d20c1c3b8caae189819a707937ca7e261e9df20888438020b843f50a552d54e
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/betamax/betamax-0.8.1.ebuild b/dev-python/betamax/betamax-0.8.1.ebuild
index 93bbed43e931..f134539c79b9 100644
--- a/dev-python/betamax/betamax-0.8.1.ebuild
+++ b/dev-python/betamax/betamax-0.8.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 58ba37f1a44e..37895c5f7985 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -2,15 +2,19 @@ DIST boto3-1.10.2.tar.gz 272071 BLAKE2B 9c3b90ae751784946a84d0cf31ed0111526ed97b
 DIST boto3-1.12.48.tar.gz 292124 BLAKE2B 0baf8fb4cfa040ba05b296d15a523a5de32677684143145b12dd54182d4fedbffa5656d36ab854006c0cc6009a1bca351bb5ac2ea757cb70b446924bcae625a8 SHA512 3cf5533dd5d9aa51cf46ef81ba25bb7afbc73b1e745ea5ae47935b22da290c7d2101e377b3225f970168201dde0bf2ee967e24eed86548f9045eb72840afea6b
 DIST boto3-1.13.26.tar.gz 296782 BLAKE2B 117bb18679fe3ae8c4feee1a5fb2d1df1923764bba3dce72040ccc802d10bb88263744a0491195f414761b6755353775a8a413a121a5a0fc42373a4e9b8aac1a SHA512 513ea4b39a5af4ae8e45f6b8b315a19d5184998fa881782bf2e6074aee36a709b51813fc9fe403bb8dbfb9b51ead50367af18f0918a1c88a37eab263ccddd11a
 DIST boto3-1.14.0.tar.gz 297008 BLAKE2B 7f5eaf4958395b47e936596b385b5a4daa20dbed6b777a407b6c2f70d3004d89fb963f479a1a3c8be22a3cbbfdb21f59a1f3c3ea4b967fce4799fc965899bcf1 SHA512 12ce4765f22e848aac0c29d1f95ed7b63964868f18c14073f93c74e442babf8708aa69cb6c17bd7c3aa5dacda6beb67bb4a4afe86fcd298308c70abfb77802d4
+DIST boto3-1.14.11.tar.gz 298578 BLAKE2B c78ba0957c4252adeaefb7ac3e335e3db6044752cd06731b6f7367bbfdbbb2db25d717ddf8954eabce745bca07d2980445a725977d3f12a5914e8620502e7f88 SHA512 069e21ca8aa5b7d30ff7ea9f94bb4d939495f0ce30a831e985687eafe4cd22ce830af2427b645df16ddcd51126c366ff61243bb7251a2aecbef46b8573d2e124
 DIST boto3-1.14.2.tar.gz 297730 BLAKE2B 174bc2435247db4421ffbf1ca0ef2cb772a9b6f357cbb438996ad635fca8ae5cd1005df3f8fdc6c63607797115c2379bb10c43edcfaf8393394f241b1e7a1ca1 SHA512 6ad539e568fe90c2f7408f37d28f194ac7094f6393858e487bf2afa73b8b53c90c8ab489bbe56f7c594351b24aaa82bfc9f81c9d68fadaecaec5acc3352fad5e
 DIST boto3-1.14.5.tar.gz 297919 BLAKE2B 9428ddfa1a5549bfb8319cc91292dace9245a9db94eec373f571342808cdda7c1bf2b683ccddbcae532aca79666971b5cff7646756dff7baa24e291b348ff0f0 SHA512 7c65b1a1b6070b8954b7a705b1473543be6a4939c8594327cdaf8c91ff557bfdb49611e18f2bc6b0213fc13ef4cdbf57da7e632ac93dacf6d887f7a18889ff59
+DIST boto3-1.14.8.tar.gz 297922 BLAKE2B e71a74155a6e32b310063c6c80ceb960db816898271f01066099d9ef162e90c5c446ea29b7164d957cc4d02e546eec59eb62f9168aa7e5f6e149c2d97fa14928 SHA512 a5c1c63664c406dc6b923ee565d30572173084b43a4539605cfc36a959d5d8fbcf0864720732128f26ba84fe8e4aabb31842d656e6e189860a41b365955e63ae
 DIST boto3-1.9.122.tar.gz 258061 BLAKE2B 68903edd97e10693675e4c2fa77c2c54f2d3aab79307ee0a856f43aabe256f7782d027b0a23f433c593962c90f7364c26a87c27fe8770e67b5052e4ced73a9bc SHA512 31b8d8c2369b9076d825196d400c8a8b5579c38f87c7f41634eedbdaf6c2be01072018312e90e25d81b850c51f7c22a13fa565cd4e8b7672c238bad61e6a0810
 EBUILD boto3-1.10.2.ebuild 1232 BLAKE2B ea39ddf5aac9ceab82200259373aa821257c5662938abf976d444bd9ed950e7e4591d842fcb13b8f7a286f84e1ea555ba0d23b11e4ad3aa8b14fc38612b25d68 SHA512 2fcb3b55ab0ec0ab308bc5ca9014f6ff0ea199d47f1997fa7081f798667f70f9cb5d3d3f0396eacb20ca0163f82f508a7eef4717616032def79a1b581a112b26
-EBUILD boto3-1.12.48.ebuild 1291 BLAKE2B f99f5a2cf65a8598fdcb29cc0acc98919045b9e41de89ac7587cc62b2368f025671405721a411f7c23d7fb08410f7883882fe8f012be118ab4caa5c68674a7ae SHA512 28e4ed7ccb7af041e17eebdcf13027c3b80e0e30b83b098f212c032d03fc9a960433e360bdc741706d7dd4b5b20a6f425399d739190dd7257a5cba64ce4552ad
+EBUILD boto3-1.12.48.ebuild 1290 BLAKE2B 6e86e0733eb5c8477e9e3e4da68db82582831d19e6273eea3ef5e18e5cea40ff0ceae7fd968156ef36c6d6d4a5ca0b042e7c7bf5900292a5b01f53bb8b9a3b04 SHA512 5eb28743682edd63abbeafda5f28a38048cdd2ec9f46c6a26928d468509b4afd3690154af26a3d8fb578130dc856e6ce4980e06deb054c8cfae3145ba13c697c
 EBUILD boto3-1.13.26.ebuild 1233 BLAKE2B d5e4817534127c58a74846722b6b1251eaad1c040ec3bb87ffeecfaa71611367d589231b0b33f1d443bd4daeca4d830abfee1b6cf41236a0ff57b0286f82f8c4 SHA512 406144934c025d1901d9a5d9886622f0099749a5c729d4da945d7b95e1d6a3c3f4d2a2574f22bc57b3bdd03d6ef215787069524c0a9ce5ebf4cebe22539537b9
 EBUILD boto3-1.14.0.ebuild 1232 BLAKE2B cc6b7806a735f16a45f1f5ae6d5f17156fd1df95bf42e376e6120ef7941c884c172e2db1b759c11b274ab15c93c7181e1de4649f5f73f023ee8ea37f5fb066bf SHA512 c9afac98c0e91ad48a4cd9218d702a007a6fe917923ded672253322064082ed9caca85a32ce62621585adb22df118bb72eafe91c10e78ddb41f9778e80092fde
+EBUILD boto3-1.14.11.ebuild 1232 BLAKE2B cc6b7806a735f16a45f1f5ae6d5f17156fd1df95bf42e376e6120ef7941c884c172e2db1b759c11b274ab15c93c7181e1de4649f5f73f023ee8ea37f5fb066bf SHA512 c9afac98c0e91ad48a4cd9218d702a007a6fe917923ded672253322064082ed9caca85a32ce62621585adb22df118bb72eafe91c10e78ddb41f9778e80092fde
 EBUILD boto3-1.14.2.ebuild 1232 BLAKE2B cc6b7806a735f16a45f1f5ae6d5f17156fd1df95bf42e376e6120ef7941c884c172e2db1b759c11b274ab15c93c7181e1de4649f5f73f023ee8ea37f5fb066bf SHA512 c9afac98c0e91ad48a4cd9218d702a007a6fe917923ded672253322064082ed9caca85a32ce62621585adb22df118bb72eafe91c10e78ddb41f9778e80092fde
 EBUILD boto3-1.14.5.ebuild 1232 BLAKE2B cc6b7806a735f16a45f1f5ae6d5f17156fd1df95bf42e376e6120ef7941c884c172e2db1b759c11b274ab15c93c7181e1de4649f5f73f023ee8ea37f5fb066bf SHA512 c9afac98c0e91ad48a4cd9218d702a007a6fe917923ded672253322064082ed9caca85a32ce62621585adb22df118bb72eafe91c10e78ddb41f9778e80092fde
+EBUILD boto3-1.14.8.ebuild 1232 BLAKE2B cc6b7806a735f16a45f1f5ae6d5f17156fd1df95bf42e376e6120ef7941c884c172e2db1b759c11b274ab15c93c7181e1de4649f5f73f023ee8ea37f5fb066bf SHA512 c9afac98c0e91ad48a4cd9218d702a007a6fe917923ded672253322064082ed9caca85a32ce62621585adb22df118bb72eafe91c10e78ddb41f9778e80092fde
 EBUILD boto3-1.9.122.ebuild 1230 BLAKE2B 28aca5308ca0056019875d735de0d04a7332a3f995358a7646d454a48c37ed95f7d731bbb56f6635d82504742dea02f87357ed679435ed6c40d33a5aec47449c SHA512 9da14dcf92737efed3232f787430800eb897cd010a4ba33d49090d8146beea685e355f8a47bbe962122c04d4a86d0994f4e3f66ce898f0acfd13cfb42f7f1556
 EBUILD boto3-9999.ebuild 1286 BLAKE2B 5c835ede1c85a0d847b56c98e512fa34b95fe5edf01ed71eed44e0c849844a85070d03794cd57c1abde99e5f4c44e8c528ab987601ce33d426b49e20144155d3 SHA512 686f5d3e2a204b50ab55c518277ed718188aad5240e548aa31e01facaea330540cae9feb7fa5e56559af342cba6c0c09382e8805cfb6026440899c9a723221fe
 MISC metadata.xml 644 BLAKE2B 6d8196f27c8ec19e9d14cd52579809b40d036bea225d9c434125ddc4c210062a141d982285a2925400a34f7698ac660257e076bfdc3c9d067264af47ddce7b9d SHA512 b1c4acf5e1c9fd16381a43801c69a497505141ef3ec3d6aed6e2cced971fd310ade4714e436beceaf5c8a0d3b556e6f67b94e3cd3d296aa793b47c1b911894ce
diff --git a/dev-python/boto3/boto3-1.12.48.ebuild b/dev-python/boto3/boto3-1.12.48.ebuild
index f95d58504404..582b09db68d8 100644
--- a/dev-python/boto3/boto3-1.12.48.ebuild
+++ b/dev-python/boto3/boto3-1.12.48.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/boto3/boto3-1.14.11.ebuild b/dev-python/boto3/boto3-1.14.11.ebuild
new file mode 100644
index 000000000000..062b762234a9
--- /dev/null
+++ b/dev-python/boto3/boto3-1.14.11.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..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit tests/functional ||
+		die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.14.8.ebuild b/dev-python/boto3/boto3-1.14.8.ebuild
new file mode 100644
index 000000000000..062b762234a9
--- /dev/null
+++ b/dev-python/boto3/boto3-1.14.8.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..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit tests/functional ||
+		die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 5290e2658c02..1ce96b80cf6f 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -10,19 +10,23 @@ DIST botocore-1.16.26.tar.gz 6458468 BLAKE2B e753f7dcb3d75a86da78536883e44cbd493
 DIST botocore-1.16.6.tar.gz 6386032 BLAKE2B e909e2fa021d5b1be333a31758af408cdc6e11224addefac31b87b8ce9983350aeaaf862feaf040490fad8eb87d7dde800bd8a77156410e6a734f567e2cc1055 SHA512 1f265a0a8adb7f0172f02448d3be5aeacf11e3fb7023da8d81e6d19c39d97cac99cfe3a70997e682deb44a4fd78304e4a0c1df43787f3139bbccbe852c682a82
 DIST botocore-1.16.7.tar.gz 6391893 BLAKE2B 19a8770ef1058e5601a1c292e2e17e1625e4d5d0d1845b59bbd403a2c285da1a774935e9d1e1fa7ca26a1e3c4703b29fcbb2f021a7251aa3ca756c80b2ba0461 SHA512 0ab2b4ff4096049cd92b96c710a38867a53b2dba0f07a319ec1a2f9b3cbce60776026c62e3eaaebe571b6ad26eb5c1c258b2dd350a444d30e54b342bcd675768
 DIST botocore-1.17.0.tar.gz 6478558 BLAKE2B 761ff2d57079a52ce38a6d56639fb0771d1fc4fb6a3494badecaacd4cea1ef74a69fe23d9fe62827993a3b6c33b963a2a199300f37fa3e7dc42433135c00f035 SHA512 a43b2f99e44ef9de3cf740b8fc1d74976d9ff6831639229a704f9300011405861789c9af26ea657f64244f5d67cff19aa94f95e5d2df73ee4f2dc10ccdeabae3
+DIST botocore-1.17.11.tar.gz 6508848 BLAKE2B 91e38db3868fb2cba9ffa6a1dfc95bd6557bb5ed8844a148b99603fb8557dc269fd652bfac3132d0b0b07fbb9063ed2762ad461cb75280cef7570bd251268029 SHA512 7ae6129985b58d1f24d0892a4506681af23d45d68be217aa5ddd06cdc2e8440edab3983f3f7dd0bb1993275d2ae0cfdd5406aaa7643f807dca4ed3ed71bf9eee
 DIST botocore-1.17.2.tar.gz 6481390 BLAKE2B 009f8857be93c2fccb52e83176614401ae89835ea32fd0043248f7f66765d06e44df72ed31b5370cc1ed106cf45b531f4e4e7e7cbc3dc1d6e1524cb7914654d4 SHA512 ff19b1708686cbb574b01c9924a6acb7eaf7607b5f19a759d5c1dc1f7a7efae960e0c81d26d384101da5aaddc3bf0d8b4800d8908af34392d23779d4b9064487
 DIST botocore-1.17.5.tar.gz 6491397 BLAKE2B e6d45050e0f9d9919edff7dcea0866c9360fc8b8a09a82bcb6636621b49d7c9d06025639d8acf8740bf6d272371cabc9afff51e48214d240f1e81cd76abcab65 SHA512 2cf87d79a50f10d386907a0ef5b0e427b299b342d3661dfa64860828a0854dcd7f2ef3e0febdc30772aabf93efb39f4f35d52d3f28aec641e886fb5c05e30a3a
+DIST botocore-1.17.8.tar.gz 6499259 BLAKE2B bbec0755ac5c96f8b86d9391db36b58c28a2eff61b69ddccbbfcf0d7b349e1b5c99a2ab3619e50c6eda6a781e5361dd11f674126a596e23f505fde81a9b77949 SHA512 3f0c06e5fb335cc33ed589205ca378d4270d26dfb7f4b6196953205d24de4f71bf09c47b722449e51325d7643be6767f7a542d79765649ea3581247bc219f88d
 EBUILD botocore-1.12.122.ebuild 1496 BLAKE2B 99db83ccdf13386f7c3745508682fd6b3e996070917b770e23cdb5b977183c822d763355dc9dffa467fd8c45faa06a7794bd22df2a32ca3db4642d0d45630750 SHA512 b3f6629a2987d1be0f99adb92608bd58054d5556e68e5082efed002aa0a3f4b679bb1a51bcf2dbbadbadb10b0bfd7c6803ebfadc9ea792a944ffb04e425fa895
 EBUILD botocore-1.15.16.ebuild 1508 BLAKE2B 8320c38de9ccccf6cdd688aa704cfa23d031e607e03dd0b05ddbd04b7bae7ab7e6bfd90636b05ff451b2b8673d457a1a48fa6f94d822849a2e44d4fe36a5a5e8 SHA512 c2f0b19ebaa0288ff55e8554c07ff021d1c716a9d2a267c7d39289af6a2a9ca58166d901a90e1d737decaa3dd41ac82d86309291108844dffddc7e4647667466
 EBUILD botocore-1.15.32.ebuild 1508 BLAKE2B 8320c38de9ccccf6cdd688aa704cfa23d031e607e03dd0b05ddbd04b7bae7ab7e6bfd90636b05ff451b2b8673d457a1a48fa6f94d822849a2e44d4fe36a5a5e8 SHA512 c2f0b19ebaa0288ff55e8554c07ff021d1c716a9d2a267c7d39289af6a2a9ca58166d901a90e1d737decaa3dd41ac82d86309291108844dffddc7e4647667466
-EBUILD botocore-1.15.48.ebuild 1669 BLAKE2B e42d5f131c6466c9b2e6c6292bb5d2b5843207b92984800e5a0e6e67fc45c766cc5b7b027bc98e239e1d08665e6cb518d341b214bd717edafde64db6cb7ced05 SHA512 00e77660e59a125c83130b14d302f1192e307cc482e18e2bc67847b97128d449b94e83a5bd3c88bc71b52db0c0909f1f3e3695aa5856bfaf8e05032eda02d4c9
+EBUILD botocore-1.15.48.ebuild 1668 BLAKE2B 2256b2477d1d263584c285e5dbfea1b3174e6493b68d0787f3a2ac8b8f4930e8cd1e9f577ac2609bd55fc91bb9f3eedac4541f2be591d1de21eb612b8e16cb67 SHA512 6b63976638b227e5fc933bca9bcaf5490c16a4d64d78d970aaf307183193c06eee6f5304fb3b3f7cf6f64bb65b978e1176e2185fd2fc8d0ab4f0202c74cd3d7b
 EBUILD botocore-1.16.12.ebuild 1478 BLAKE2B c590fd3fefb93eaaff4d07bcbb7863f7c60f563ed9d8a8bf8b0ad7d0ed20bafe0b79288710b2821105a6f13a809d49572af5352b1c95d1cc28ef4dbb5ca3a0ae SHA512 b5721a4f2924d2bcb0c7501f762f3b8d1a6de664ae9f66dcd044931637420c74766248ebf7232d0de4857731e630537afa0d9bbe22c4f4f3941b9ad9bcc4a3cc
 EBUILD botocore-1.16.20.ebuild 1478 BLAKE2B c590fd3fefb93eaaff4d07bcbb7863f7c60f563ed9d8a8bf8b0ad7d0ed20bafe0b79288710b2821105a6f13a809d49572af5352b1c95d1cc28ef4dbb5ca3a0ae SHA512 b5721a4f2924d2bcb0c7501f762f3b8d1a6de664ae9f66dcd044931637420c74766248ebf7232d0de4857731e630537afa0d9bbe22c4f4f3941b9ad9bcc4a3cc
 EBUILD botocore-1.16.26.ebuild 1599 BLAKE2B ef0223905ba41457491b4a3343609b18de201e82e0c88589caf93ce9acc132a471672a6fa89b587b0eda34309c6755299e6e4a44c737a2399658b96713cf4969 SHA512 79a7d7c90b7404b1041cdd592052e6fbc79e960ffade799a20e6ee1d0b55b42e6e5f9f57d6f3dc032116146ddde7953934505e6ace0e513dbf06909045c38de0
 EBUILD botocore-1.16.6.ebuild 1508 BLAKE2B 8320c38de9ccccf6cdd688aa704cfa23d031e607e03dd0b05ddbd04b7bae7ab7e6bfd90636b05ff451b2b8673d457a1a48fa6f94d822849a2e44d4fe36a5a5e8 SHA512 c2f0b19ebaa0288ff55e8554c07ff021d1c716a9d2a267c7d39289af6a2a9ca58166d901a90e1d737decaa3dd41ac82d86309291108844dffddc7e4647667466
 EBUILD botocore-1.16.7.ebuild 1478 BLAKE2B c590fd3fefb93eaaff4d07bcbb7863f7c60f563ed9d8a8bf8b0ad7d0ed20bafe0b79288710b2821105a6f13a809d49572af5352b1c95d1cc28ef4dbb5ca3a0ae SHA512 b5721a4f2924d2bcb0c7501f762f3b8d1a6de664ae9f66dcd044931637420c74766248ebf7232d0de4857731e630537afa0d9bbe22c4f4f3941b9ad9bcc4a3cc
 EBUILD botocore-1.17.0.ebuild 1599 BLAKE2B ef0223905ba41457491b4a3343609b18de201e82e0c88589caf93ce9acc132a471672a6fa89b587b0eda34309c6755299e6e4a44c737a2399658b96713cf4969 SHA512 79a7d7c90b7404b1041cdd592052e6fbc79e960ffade799a20e6ee1d0b55b42e6e5f9f57d6f3dc032116146ddde7953934505e6ace0e513dbf06909045c38de0
+EBUILD botocore-1.17.11.ebuild 1599 BLAKE2B ef0223905ba41457491b4a3343609b18de201e82e0c88589caf93ce9acc132a471672a6fa89b587b0eda34309c6755299e6e4a44c737a2399658b96713cf4969 SHA512 79a7d7c90b7404b1041cdd592052e6fbc79e960ffade799a20e6ee1d0b55b42e6e5f9f57d6f3dc032116146ddde7953934505e6ace0e513dbf06909045c38de0
 EBUILD botocore-1.17.2.ebuild 1599 BLAKE2B ef0223905ba41457491b4a3343609b18de201e82e0c88589caf93ce9acc132a471672a6fa89b587b0eda34309c6755299e6e4a44c737a2399658b96713cf4969 SHA512 79a7d7c90b7404b1041cdd592052e6fbc79e960ffade799a20e6ee1d0b55b42e6e5f9f57d6f3dc032116146ddde7953934505e6ace0e513dbf06909045c38de0
 EBUILD botocore-1.17.5.ebuild 1599 BLAKE2B ef0223905ba41457491b4a3343609b18de201e82e0c88589caf93ce9acc132a471672a6fa89b587b0eda34309c6755299e6e4a44c737a2399658b96713cf4969 SHA512 79a7d7c90b7404b1041cdd592052e6fbc79e960ffade799a20e6ee1d0b55b42e6e5f9f57d6f3dc032116146ddde7953934505e6ace0e513dbf06909045c38de0
+EBUILD botocore-1.17.8.ebuild 1599 BLAKE2B ef0223905ba41457491b4a3343609b18de201e82e0c88589caf93ce9acc132a471672a6fa89b587b0eda34309c6755299e6e4a44c737a2399658b96713cf4969 SHA512 79a7d7c90b7404b1041cdd592052e6fbc79e960ffade799a20e6ee1d0b55b42e6e5f9f57d6f3dc032116146ddde7953934505e6ace0e513dbf06909045c38de0
 EBUILD botocore-9999.ebuild 1614 BLAKE2B 8a4ee3e4ae8733ab493bbf390bada866cedeaa3139b501566abc3dc8b56b6816328d885c84b2d4b2effe951d178c91641934129832260f07cd0d60024cd88635 SHA512 2a1c6901db5dee864b97e92ff15ae267f58814ade23fdf13e351dbcd7e6e3ed2faa3a189bd69872f0cc1623baf0c9b975ec616f95b4ed624d0389edef98b2437
 MISC metadata.xml 693 BLAKE2B 79fb75098be12506dd472260962bcbb2a9db5dffaa1a5237e317513f4392046b6116e3b2f9a56eda9e77f84842d2e1fb7604fe9b75808e0e36c8db02aa182597 SHA512 446695bb6e171362c741c8c5943e232acb012fa9df297637e0e41503e41b06eb3a14c0790a8a17d5b7b6f643a3e8483e04c28520cacec9ef81cf9d4344744516
diff --git a/dev-python/botocore/botocore-1.15.48.ebuild b/dev-python/botocore/botocore-1.15.48.ebuild
index cc5f5d311549..ec3ffeb5add6 100644
--- a/dev-python/botocore/botocore-1.15.48.ebuild
+++ b/dev-python/botocore/botocore-1.15.48.ebuild
@@ -18,7 +18,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/botocore/botocore-1.17.11.ebuild b/dev-python/botocore/botocore-1.17.11.ebuild
new file mode 100644
index 000000000000..c08c6f6ff899
--- /dev/null
+++ b/dev-python/botocore/botocore-1.17.11.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+	"${FILESDIR}/botocore-1.16.7-unlock-deps.patch"
+)
+
+distutils_enable_sphinx docs \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# py3.9
+	find -name '*.py' -exec \
+		sed -i -e 's:cElementTree:ElementTree:' {} + || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.17.8.ebuild b/dev-python/botocore/botocore-1.17.8.ebuild
new file mode 100644
index 000000000000..c08c6f6ff899
--- /dev/null
+++ b/dev-python/botocore/botocore-1.17.8.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+	"${FILESDIR}/botocore-1.16.7-unlock-deps.patch"
+)
+
+distutils_enable_sphinx docs \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# py3.9
+	find -name '*.py' -exec \
+		sed -i -e 's:cElementTree:ElementTree:' {} + || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/brython/Manifest b/dev-python/brython/Manifest
index a215f5062147..53269dd091f6 100644
--- a/dev-python/brython/Manifest
+++ b/dev-python/brython/Manifest
@@ -1,5 +1,3 @@
-DIST brython-3.7.2.tar.gz 10403203 BLAKE2B 1fb7778a961c68a873033321fdf7a5b24f422d52195ff1f0606384c76007ab87a1949ead2ffcd7b660b544a9833acf90b254a542ea8856510579bacd0be8477d SHA512 76bdbc005832b4980e38ff4bf2fd705291eb06ee6b9f0c4b25a90df9ab4e6da6638990abb37ebf526d064f54823a9b4ff387edd919db69b1eb3bfc8ed27d6290
 DIST brython-3.7.3.tar.gz 10403156 BLAKE2B a30c957925149f1b7eb736c1fcacd171dffb5846f6a343227596e759820c794c265befbb04137e797c1eabe8d9f0a3faa93fe425e4b0c13fda4c78b4c4bb1ecd SHA512 f234c7bc67d935e5bd5bfa8e473bccf90245ab4dabccd363bc5e9e01e1c9ea9d95989c5f8b323c158e286ac4a66106eb07722d1fcc82353ad036e35b4fda5669
-EBUILD brython-3.7.2.ebuild 753 BLAKE2B e58754d488cdcb191080848ae9848da3ea8bd57e9ae9e3b4e373ec4388645d9d40216ad3328089b7eccec4c27f74c4d5ba94348dd805c83b5094a42496abe30c SHA512 7849162fff9f817cbf48ed061737ecc01c260990971b79648aa52327428cec33a4e5adb8098e9b77be61d35dd7cd2069b80681655f55fe634ffbac54edbef205
-EBUILD brython-3.7.3.ebuild 757 BLAKE2B f47970819baf81a8075c0e4ffd5c57f3e44e9017089584ea73fc6f9bc4d4aaee1268494bb1ed288af4d02008f69fb28628492b379bf705c316fe7524f824f056 SHA512 0910457089178473cfe900d943a10d2362b50433719e3e642ce8bc11c848f2174c77e268697e4bdc96460a3c2017838aaecfcca46ce129fb3a44bb5d9b654105
+EBUILD brython-3.7.3.ebuild 761 BLAKE2B 35236dc8fac0d6f47e8cd45855538098cd50bc2de66467c552c55885237264913dab68a18671b0a83973c9716e5155fee029f7201863178a56ce889713fcec8a SHA512 ff84dbf08200f19b806d9e109772d7318dfb32fba4e1643023621af992f798e3eafcb1f6a676e5a2b982efe82630bfac73b3406ec051d5c365c96182100a3049
 MISC metadata.xml 345 BLAKE2B ab7c78390c35a156fed3a3507ab979347fef95259f4083a28ba2c925356907158a0e7249cc4e6e46cc9117e418a07a3f91a67ba34163aa5be657ca37bf11b318 SHA512 ff1357bc421a8f96fe10ddc253035271616da444fb6cca11d3b263629c12abfbfc17324d06e744c95c319fe525763ff752db69aa3439edaa3fdc3e7e56c5bb05
diff --git a/dev-python/brython/brython-3.7.2.ebuild b/dev-python/brython/brython-3.7.2.ebuild
deleted file mode 100644
index 8c1259305c3f..000000000000
--- a/dev-python/brython/brython-3.7.2.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 )
-
-inherit webapp python-single-r1
-
-DESCRIPTION="A Python 3 implementation for client-side web programming"
-HOMEPAGE="http://www.brython.info"
-SRC_URI="https://github.com/${PN}-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-
-need_httpd_cgi
-
-pkg_setup() {
-	webapp_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	dodoc LICENCE.txt README.md
-	rm -v LICENCE.txt README.md bower.json .{git*,tra*} server.py || die
-
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_src_install
-}
diff --git a/dev-python/brython/brython-3.7.3.ebuild b/dev-python/brython/brython-3.7.3.ebuild
index 715ffeb233e1..ce838901b946 100644
--- a/dev-python/brython/brython-3.7.3.ebuild
+++ b/dev-python/brython/brython-3.7.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit webapp python-single-r1
 
diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index aacae6bbea80..537e50dc265b 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -3,7 +3,7 @@ AUX cairocffi-1.0.2-test-deps.patch 671 BLAKE2B 489b14e3e9847f28c53211aedc9b3ef4
 DIST cairocffi-0.8.0.tar.gz 79217 BLAKE2B fefcee32e486c150d089b7d13b046c864b83fcc184f7880e86cfae0afc22c1e712ad7e835d76506b4ab0cefab6629abcc5bd86cd95c417dcc64c9374a8629110 SHA512 70179e05ca4a4efeaa39ade1ee1a96d280d198ecff5ae8c8fc634c24d8922ea6a3e1eb6cf5f55c5fc9d3f5b2fc3131a53051690eb86712762d8b6400df8a630a
 DIST cairocffi-0.9.0.tar.gz 84652 BLAKE2B 9f09c038619b0f44c568d6636861b0e12ffd7e9ab546f3a65bbd8e77eee7ff5f0c6f4d92a841696492b786d0067af86e25949b723ef6ef73ede370fbf2576d6d SHA512 0d3d54e0d54b3696c8336d8b3a6d745628da51d9d9f8c50f36006c007e1432a95dd9bafd8d865923059d040cc4e9f7989b3670a5318383b357ffc979eeb920d5
 DIST cairocffi-1.1.0.tar.gz 68744 BLAKE2B 604812572bb1a39ab52e41e03714acc93ddc7532e07ac36b693f53ad71cf0bcfd5d2f3bceb56b8e352fe7f179b174a244238b9cfcee690cbc0cb96e5b2934c75 SHA512 a9bc9ec5be767388aad9d06cc3b386b474dbacf097d3558b4033834cfb2f5418eede2f4b4080bec7e4725c6821f6e54d6c3366e8c4ee73bd3fa1cf444b395197
-EBUILD cairocffi-0.8.0-r1.ebuild 1142 BLAKE2B 4d5aeaf534b104e6869e25d24de9ec10df350d5fc27b0cfd624d8e1e7bf9399839bdcd63958404b27592bdf71468a534760b51fdf8273135913378c5985f04c2 SHA512 fcb08dc478ef62f2e0fb748fdb4e950f4465eb4f9ba0f0e3bd789f1d95b03f2b93a7d47cbf8ed7f15d78527959c39bf6ffbdd84271b6bdcae18c4c43d79316d8
+EBUILD cairocffi-0.8.0-r1.ebuild 961 BLAKE2B 1d0a9cb41737b18a356c3edf2b3659007fbf4ad3ebd161fa10cba51c87f1d9135368e6dad1e6d2018c7602313bb263d7becaa34675da26da2f44c108cacb2026 SHA512 75161a3bc22139d5196831ea4bf70a61fcdf7b04c54361da157e6d903ab463e7a582c475a0220065c5f8250a383d9c8dff881bce8e7cab939156f0f6ca6276a3
 EBUILD cairocffi-0.9.0-r1.ebuild 1146 BLAKE2B b6f2c3a480e75ba1dea7ac544bb6a36288437b9b02b0b4a8d0bb0654f0a61305cf04ba67226aca73b270763f0dc0347a2f1d8058ca8e26772633e2041eca6564 SHA512 2551858fc4cc26cf16fe17cdb5ddb5191a7da822f479d3905b0201613eadcd9bd46f5e7a5b1b1818263d65027c64e8ca7ffdc3e48cd5384e227cbb26858e5b32
 EBUILD cairocffi-1.1.0.ebuild 781 BLAKE2B fd97362eea8415a40d9cc60e7bfca532b3f095c2ce3cac892269c6bfd6865ba8b79fddbcb1640ecf8ecb798d5295dc311a7fa47d3d50d87f601dab22257e2d8a SHA512 2a0e41a651bc2918ffe90624ede77ae31d6a7e6cba871ac0c416efcc22cff4f6032817438a67a8e9eb9af2d0230c9bac580cc5f79c29e64cff9d18f9003ee8a9
 MISC metadata.xml 379 BLAKE2B 75baee69a9fff6d3c571bded0b1e6cfd8abbdfae7262faa2215fb3251ace498c33119ebe3bf74e4e4e0b2d1ba620b9bc60d4daf244917098e17c62af24d4b401 SHA512 b0bdbb3b144675f9e90a0421c694e0f0a782dbf315dd8203574bea69b9389d49d377797a28d9d86588d062e15071c1fe226dd4166a4fbf8e95a852d46cc20215
diff --git a/dev-python/cairocffi/cairocffi-0.8.0-r1.ebuild b/dev-python/cairocffi/cairocffi-0.8.0-r1.ebuild
index ba91b5f72454..bc4f5be94f97 100644
--- a/dev-python/cairocffi/cairocffi-0.8.0-r1.ebuild
+++ b/dev-python/cairocffi/cairocffi-0.8.0-r1.ebuild
@@ -28,7 +28,6 @@ RDEPEND="
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? (
 		${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
@@ -38,15 +37,8 @@ PATCHES=( "${FILESDIR}"/${P}-tests.patch )
 
 S="${WORKDIR}/${MY_P}"
 
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
+distutils_enable_sphinx docs
 
 python_test() {
 	virtx py.test -v --pyargs cairocffi
 }
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/chameleon/Manifest b/dev-python/chameleon/Manifest
index 6ce0d9a82b55..0cfaba3319cf 100644
--- a/dev-python/chameleon/Manifest
+++ b/dev-python/chameleon/Manifest
@@ -2,8 +2,10 @@ DIST chameleon-3.7.0.gh.tar.gz 135209 BLAKE2B 14e890eca1a3c211dfb5a658457473b219
 DIST chameleon-3.7.1.gh.tar.gz 135230 BLAKE2B f0bd4dd90f7ea976e96101c2937f0ae5db110531caf28890042d0cd7a628489f03f9e2e3eed16dea2981ebb6e064a53adf95638102dfde6c8218e41e0473b32d SHA512 158b418fa6fbd13cd48d913ab34fb4f16450aa0fa3b382c6c829efed3100753814449a1d4004c9bc45d327d2a66130db0518b9c28943af300b4b310e955c426c
 DIST chameleon-3.7.2.gh.tar.gz 135311 BLAKE2B da6803bc6c064151b9d0cbe7761bbb44f73b1fd24fcf77d2e906c410768a1c99fa04225ae4aa719282bbb1f4fd0d51a6c710901016bb5c24f78ba2184f978f27 SHA512 3025fa92bdff3279fc404ad08d73d46bee82afd421f1d81982bd5cd2ea3fdffadf22efdb8b66157dbdf4d0cd793ac06b1a0daac4eb17a2a1ce9f14a65d4a6f8d
 DIST chameleon-3.7.4.gh.tar.gz 135403 BLAKE2B 5cdcfb60975283a8c4d7623e002962dea336cf4414a9a212e9f9bab10ece4627ec36c80744d91428daea187e50956be89be128f25966e7d6069ad141992cfbde SHA512 429a2ff78b27996ee9c21cbc076614accf328e880f03f084e52395987a36c1eabd679428bf8400807bb909a60a31a5c899218640be0d0230ded7309e9ba6753b
+DIST chameleon-3.8.0.gh.tar.gz 135496 BLAKE2B ee21337bb59e4d724a2b9e647af399ceef2946ec3fc4679a78ba79c10ad78c7b41f0585bb0081c02604045e08f126e5f851bdf0c091679561e3591153c49cd1b SHA512 7eaeee53a215fe93142ad57e40d161816fdcfa9a24d68a4648f09ae0a49a2439ccf8f0ace700780025e196471dc1cb8941cd77b120c84876cec77c89e883534d
 EBUILD chameleon-3.7.0.ebuild 487 BLAKE2B b4bfce3c5bbcc2bf1499a36ce44295bcdb3f138b919192fea523e353747d291ee7c030f208642b1f7df7603e892fa0592d0c7c2c94e2ce0c8f232773df9ca073 SHA512 99e480305dd8870980bac8b4ccd2cca4eddb1d0b09d33810f9406d06dad42af6e51037d732fdb8b8abf4941b7f75d2121abeeab7bd7e1aff32dfff6a5662fcf2
 EBUILD chameleon-3.7.1.ebuild 489 BLAKE2B c13e3c34a531fb9154e0675285ca97ae1f8b0d13bc76d594ff31a2e9e8f67b035bf1b1ea91730f858952e43df9866618649aa537d8ab3863080e02712bb9d77d SHA512 b6afcef7a6e86273894e0588c9bc83102366137bdfd872ec40fa087228ec5efc47980130aea0e33ea7150efc8fc8b7451b2c66225287326776f7f9e3dd06a52b
 EBUILD chameleon-3.7.2.ebuild 488 BLAKE2B d129c6b090716b59d7e61f2e11d7d973cdffc5e733ca20a778213f72324280c6e3ae7eded94482883e97b277dc3cae3400abd3c7368097e33c71339834edde11 SHA512 a6f4ab4805f5dcee5fe8a2f58de74931430bb703b41516438360da8e1da1b8c673096610054757bb424df4a65efcc840240c60f96333af4714af452e19ed818f
 EBUILD chameleon-3.7.4.ebuild 488 BLAKE2B d129c6b090716b59d7e61f2e11d7d973cdffc5e733ca20a778213f72324280c6e3ae7eded94482883e97b277dc3cae3400abd3c7368097e33c71339834edde11 SHA512 a6f4ab4805f5dcee5fe8a2f58de74931430bb703b41516438360da8e1da1b8c673096610054757bb424df4a65efcc840240c60f96333af4714af452e19ed818f
+EBUILD chameleon-3.8.0.ebuild 488 BLAKE2B d129c6b090716b59d7e61f2e11d7d973cdffc5e733ca20a778213f72324280c6e3ae7eded94482883e97b277dc3cae3400abd3c7368097e33c71339834edde11 SHA512 a6f4ab4805f5dcee5fe8a2f58de74931430bb703b41516438360da8e1da1b8c673096610054757bb424df4a65efcc840240c60f96333af4714af452e19ed818f
 MISC metadata.xml 312 BLAKE2B 9cef667b151e7c744637259ffe810e24eff175a6c1544091effc28d2bfcbc8f7d221af7d572662a037a78af3dfeefdf70ee4ea2ec066b798525d686130632c8d SHA512 12c503e809af190746a7f59c4367083bf566e1d908e0166d109cfb507e1b7472ef8574d790d6f9403d9bb6d4246eafa2cdf77ece46dde74ced493c91acf52f1c
diff --git a/dev-python/chameleon/chameleon-3.8.0.ebuild b/dev-python/chameleon/chameleon-3.8.0.ebuild
new file mode 100644
index 000000000000..6f8ba1fc5c20
--- /dev/null
+++ b/dev-python/chameleon/chameleon-3.8.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Fast HTML/XML template compiler for Python"
+HOMEPAGE="https://github.com/malthe/chameleon
+	https://pypi.org/project/Chameleon/"
+SRC_URI="
+	https://github.com/malthe/chameleon/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index 78effb667b98..c09dced00520 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -2,6 +2,6 @@ AUX cheroot-8.3.0-test-unixsocket.patch 2069 BLAKE2B c948f064e6d8f7d9b650d3fdd00
 DIST cheroot-8.2.1.tar.gz 89470 BLAKE2B 57515ecf6e047ea67599631a98c15307ea5f9929b398a8143bc157bfe71129b11a1f4bc841f586f98167ac4c6c9680d476bd167323e5828163b4bff9bf24c360 SHA512 3f6b55c6b2403569eedb1fe7b473d3a65ad5d06cb99a38370316db38b6138b1a6921c6b7d8ba64424c5b8c20c9c58ada33da7cb8ebb6f313610f63c1f364f862
 DIST cheroot-8.3.0.tar.gz 100557 BLAKE2B f5f2fd8a11a1a8660fc37030d501e93787be46dbb79cae89cb4f6915cbf3975453c0ced6ec3bc0ebfc7dc77d555f7d86ed01bd751df6b0227cac3b1b11a82ab5 SHA512 29ff39f043b1a08b9ef653a41761ac4b97de4141cf15c5394f95736d28f7fad4c501d666fe7ff61f40c55b087d022784c7fe09c995c901040b7f2a8ed16b7d14
 EBUILD cheroot-8.2.1-r1.ebuild 2249 BLAKE2B 75bb493262711a58088d4539c27157dd37638e521e89c7e2f2675421d38346a62332dc9b71c183d56a7560f491636f05c894d01aed0a8b10c63cd5d08e5ab006 SHA512 8ca74fe3a2a5160b228cd7009550a8d9f59dc6c85c3614167716c4d1188aeece0c774ab4d711e76615476ab5315f2b4c9133e6d4b1a2df967e120d05717a99c6
-EBUILD cheroot-8.3.0-r1.ebuild 1384 BLAKE2B b65c177ddfb5568c3a20f55817961e5b19ff3b3794de9b9b492da1c7c105687aa234e4200e6946434e25e5fdabdd877381f7ae364393f3c31e037231b4129c18 SHA512 0fe2578a9a4528b8c81824287126f5fd063186384db77f36efc03bf894a70e761e30243981fced218fb2d25bae410a0369a818381c832def7715f6dd8005fdae
-EBUILD cheroot-8.3.0.ebuild 1184 BLAKE2B 0e4475484fa415fd60f57fcfecd7de829dc1a8e088f506c14e742fbd4e86b2a62f80161d1bdce869aff4c82ab2842943765c2d462a69b4be7049059561942b7a SHA512 da40357479d4ae2332d8f59cfbd0ab31ad5b281d81ce87906152dbb5ec4f3f6a5bc807c1276e8473112ff95720beba69cdbb4f2306a85fea4490663dbf366c7e
+EBUILD cheroot-8.3.0-r1.ebuild 1414 BLAKE2B 68c9dd50562bb0d7a872497e53272dbff24024859ee4a8ce25f79968ebfdf9236b3fb8a9d6be6b66d54f7c383dd62e7b87d7863482a3d1cc3a50017570a78193 SHA512 fd4d32399fa25060947a7e244d1b7b199da923a519256403a16d58113701441769f6f84eaec77d15a826102f0507fa7084d1e7f0426627adbdf8b4a133d1dfd5
+EBUILD cheroot-8.3.0.ebuild 1183 BLAKE2B 755a757906b89f04c200528c28695378feea8672e1e9edf7a35697e110c3d4e357346999a961e1aad31c0b314894e1152bd080fb99f281ce966a570e78f150ed SHA512 11c3c0c8015195ca04c295c3aaf29b1e588dc9987f57e64a97db206800147de0a22e3c342f628474d44b2779f80b75dab5ebfadf73dd0710ec8a231afe74ffed
 MISC metadata.xml 471 BLAKE2B e623692550af72f63a0df84767bfadcf9ee16beafc4f467cc6bd83d7a0deca6a66d73f9041e3e37a967a4d7451eebe0d9f7974e43ce90b2dac24134ed7aa6496 SHA512 19c39b453a668408550b250a96af25ea12c8a46285070aa4a1b1d7c3e6b4ee36ac287ead410e6b798d4fa607543d58c5cc8bec0f00992206d2a231de983b5976
diff --git a/dev-python/cheroot/cheroot-8.3.0-r1.ebuild b/dev-python/cheroot/cheroot-8.3.0-r1.ebuild
index 452444ad649b..70a6ae89fac9 100644
--- a/dev-python/cheroot/cheroot-8.3.0-r1.ebuild
+++ b/dev-python/cheroot/cheroot-8.3.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="
 	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cheroot/cheroot-8.3.0.ebuild b/dev-python/cheroot/cheroot-8.3.0.ebuild
index 5a42020fdd3e..0785fecc4cf2 100644
--- a/dev-python/cheroot/cheroot-8.3.0.ebuild
+++ b/dev-python/cheroot/cheroot-8.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+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"
diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index 72c5d7eab718..480bba996f1f 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -1,10 +1,11 @@
-AUX cherrypy-18.5.0-tests.patch 710 BLAKE2B 1e4e4b6ac77f759c4f4814e37da3a320f72e3d7bc76b1ebfb6db5c181d07ce49b15d2f83f83a1748c1d5fd8e6dab6ca8fe3cf62ca24f487059fc8ec4175f3f02 SHA512 c469aad925f71c2b417214b153c3de501679c72f1ebdd5f05285dda2486375964f1d30e6623bbec8ef3bb07dd58772fc847ded3d1d0e43654a2bc12ac98ad07e
 DIST CherryPy-13.1.0.tar.gz 687221 BLAKE2B ab9c8f50026e26d171877e4e68f1c5a53fa8519190bcc577e12999cdf8a7f52be37f4ba9ed83a276a9f33676839ec63bff68aa8f9f51ddf15557e09123bf2530 SHA512 c32cf009d6a5b557560a00cde0f47a01ae481c7f60b7f340e5c99bf2d7c757e7c7cbf3ef2f4f71c172057aa09ca332f2d211cc97623ea29ba9f17287c7bc42dd
 DIST CherryPy-18.1.0.tar.gz 682792 BLAKE2B 0e072bf21656778ff8d64e87a6b19c8c5e9a3057312ebd3155b3b876432709f6f205f267cd9a105727153d458daab3e7113ffe9b3c49f911bd956bf72a19086c SHA512 58ae40ef62efeda051bf5dd35768a599094792d06a0e7c6e34c21cc5b003b700f43a02460d38a00067d255939e341fc438d248e3499fad76ccc8100f8eac94d3
 DIST CherryPy-18.5.0.tar.gz 685362 BLAKE2B 36178ff6e374a89aa4fba9ba34947f1558a7bb3676f014528bb081efa9608ed70648bf2c46b8c4f95b8b14586a93c513ce342955677564f9202733104ba07102 SHA512 6ead115ac2a067cc9f2cb83117b8c53aac8a2a1580159993b7687b5810a41b64d1d1c603ef75a12660fe7aee9c6f403c8cb7bd5e78564f71dc813ae7f28b65fe
+DIST CherryPy-18.6.0.tar.gz 686804 BLAKE2B dae7f0ac403084acdf611e4a9e75f152355491e4383a1bd1374ae77ac68b415f41ce79f1e65a7a66c61aa0965ac94cd9bfd0d425cf7752ab54edf0bc0d8cabfb SHA512 cd33303fa9b9704ef427553091a6a6c2bbfea20e7d81acd2bcdc2855f8a36a084a0781bb19f3a084b24f0664bd7b318a667c8c79b5073381901acce4602de9d7
 DIST CherryPy-3.8.0.tar.gz 433711 BLAKE2B e1b4a554138a61e8c6313c3055723583d812e573a352d67bd5448f799e4f2f22694b800810b53cd041c665e46d9555b471d1da91c252ade96459778d7a5c07fa SHA512 25f84093e30d814c0980f7d77b98492113470c3297c66ee8652e40650757f8e2b7db01bb8de6d7a1ea9b4bed8b764502b1f563ac6f0d082970bc2d46739d19c2
 EBUILD cherrypy-13.1.0-r1.ebuild 1323 BLAKE2B 2d56bf87bf3b6179eec66a8b02c66f98f35c3c129fed2a31cdcc4163faa2658bcc53b72284ae0b82cca529b9abbb7677f9964241808047bd22d712cc77329eea SHA512 a53f1c3734d389d784ac49419f289bda1b8576f6d066c0b5d0c80aa0075ab2587874e875121882337938cf799af2415681976e8c1960e49de6bab2d9799c5f89
 EBUILD cherrypy-18.1.0-r1.ebuild 1879 BLAKE2B e6ca418791d306d45ce0f9d4a189e1c4675027dc14e5ad099a139195e3dd40365daea4ffa03f59e3433e464b4ba80c9c1186c24969d50293db6e836ac9408c1a SHA512 7ba691e2b421503f881930f1a829a4335e1b85037924510afa09e0c0583f879bc92d44e080091f54a82714a61694868fbd66ac42625ddc9b8228e736e4dbae51
-EBUILD cherrypy-18.5.0.ebuild 1856 BLAKE2B 6e3112f30907716e2cdebf0366225a536395c882638598cc06ae1812a144f9b8772f6e69af9c05d9ad7b2b39daced0cfd4fd4916e7211f03365a0cbc880276ad SHA512 107dbbf52c8cc60bebf2cb9da1c12c001cb1825f66e332378fbf9988de379cb78b014f0c4bbabe9675fa849ab87e76a151ada0c0154bf11f679c8526380007bf
+EBUILD cherrypy-18.5.0.ebuild 1918 BLAKE2B 0ea7694c961ad79c8c2ca8dcecd224037f9b0c6480eb59798d49697a13e428000e9329c3bcc2a15c5b47c104b2865b5ef69743c5040fd0b46100e1c24bbcac36 SHA512 2a786fc2cae7de0535073a6fdf1f34c62162b6aa532c3d1e2b74f1af3a2522e049eb997f0ef3929ee87d6c03ebb5552e93fed320885ee92df4d0373f6f052f82
+EBUILD cherrypy-18.6.0.ebuild 1919 BLAKE2B 6dec6f120773cc5051c066354ab4f55cad213fd989e95dfeb90df15938e324c283e8f16fa5a2289b0d7df095683381af560ab26a3acb98a453741a27391e617c SHA512 9ce886bac48d1de8c4a298c2e3f26443569bb741f77962bb5de568c6652883d1e3d1f3b4d80bc8c46d2d0c28347a66ef46271231ec5f569f6a345aebaa340663
 EBUILD cherrypy-3.8.0.ebuild 1639 BLAKE2B 404e81cf1f8e8752663409c02e3aad85d3e0088a6af5238fc745cf96fb81070ffb355a06d08e458a9de66f2d1753ebf753b6bc974b3972b7acc582d80b88d876 SHA512 3dbb263af36b1243536446022750e8f30f4bc629cee442bd39263d3d86658fe3aade5094929a469a43bca44cdca4bcbf92312e3f5f9a4d72f0688653553642df
 MISC metadata.xml 321 BLAKE2B 6636b11693e6e9d09f579bc88b203bd7c41f67222887365de5db2c3aca4c34d8cb2e341f217240ce562f43d60e78221442c12b08f2f7e516c36e06d928a9a995 SHA512 c777da5d545e3d626d663830437ec91a8f228c58734c7df4e4a16f0609904a5ad4613310d2d05b4e8ea89053371ad0bd4f0624137afe54ff6c4f5d9eef734d10
diff --git a/dev-python/cherrypy/cherrypy-18.5.0.ebuild b/dev-python/cherrypy/cherrypy-18.5.0.ebuild
index 7d90d9a6bf26..1156d983160d 100644
--- a/dev-python/cherrypy/cherrypy-18.5.0.ebuild
+++ b/dev-python/cherrypy/cherrypy-18.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="ssl test"
 
 RDEPEND=">=dev-python/cheroot-8.2.1[${PYTHON_USEDEP}]
@@ -25,24 +25,21 @@ RDEPEND=">=dev-python/cheroot-8.2.1[${PYTHON_USEDEP}]
 	dev-python/zc-lockfile[${PYTHON_USEDEP}]
 	dev-python/jaraco-collections[${PYTHON_USEDEP}]
 	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )"
-BDEPEND="${RDEPEND}
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
+		${RDEPEND}
 		dev-python/routes[${PYTHON_USEDEP}]
 		dev-python/simplejson[${PYTHON_USEDEP}]
 		dev-python/objgraph[${PYTHON_USEDEP}]
-		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
 		dev-python/path-py[${PYTHON_USEDEP}]
 		dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
 		dev-python/pytest-services[${PYTHON_USEDEP}]
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}/cherrypy-18.5.0-tests.patch"
-)
-
 distutils_enable_tests pytest
 
 python_prepare_all() {
@@ -50,6 +47,10 @@ python_prepare_all() {
 	sed -e 's|@pytest.mark.xfail(py27_on_windows|@pytest.mark.xfail(sys.version_info < (3,)|' \
 		-i cherrypy/test/test_static.py || die
 
+	# fragile, fails with newer versions of CPython
+	sed -e 's:testCombinedTools:_&:' \
+		-i cherrypy/test/test_tools.py || die
+
 	sed -r -e '/(pytest-sugar|pytest-cov)/ d' \
 		-i setup.py || die
 
diff --git a/dev-python/cherrypy/cherrypy-18.6.0.ebuild b/dev-python/cherrypy/cherrypy-18.6.0.ebuild
new file mode 100644
index 000000000000..66e4cc80ed0e
--- /dev/null
+++ b/dev-python/cherrypy/cherrypy-18.6.0.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..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+MY_P="CherryPy-${PV}"
+
+DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework"
+HOMEPAGE="https://www.cherrypy.org https://pypi.org/project/CherryPy/"
+SRC_URI="mirror://pypi/C/CherryPy/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="ssl test"
+
+RDEPEND=">=dev-python/cheroot-8.2.1[${PYTHON_USEDEP}]
+	>=dev-python/portend-2.1.1[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/zc-lockfile[${PYTHON_USEDEP}]
+	dev-python/jaraco-collections[${PYTHON_USEDEP}]
+	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/routes[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+		dev-python/objgraph[${PYTHON_USEDEP}]
+		dev-python/path-py[${PYTHON_USEDEP}]
+		dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
+		dev-python/pytest-services[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# UnicodeEncodeError: 'ascii' codec can't encode character u'\u2603' in position 0: ordinal not in range(128)
+	sed -e 's|@pytest.mark.xfail(py27_on_windows|@pytest.mark.xfail(sys.version_info < (3,)|' \
+		-i cherrypy/test/test_static.py || die
+
+	# fragile, fails with newer versions of CPython
+	sed -e 's:testCombinedTools:_&:' \
+		-i cherrypy/test/test_tools.py || die
+
+	sed -r -e '/(pytest-sugar|pytest-cov)/ d' \
+		-i setup.py || die
+
+	sed -r -e 's:--cov-report[[:space:]]+[[:graph:]]+::g' \
+		-e 's:--cov[[:graph:]]+::g' \
+		-e 's:--doctest[[:graph:]]+::g' \
+		-i pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/cherrypy/files/cherrypy-18.5.0-tests.patch b/dev-python/cherrypy/files/cherrypy-18.5.0-tests.patch
deleted file mode 100644
index d556b8678200..000000000000
--- a/dev-python/cherrypy/files/cherrypy-18.5.0-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/cherrypy/test/test_tools.py b/cherrypy/test/test_tools.py
-index 3a0fd389..e357a445 100644
---- a/cherrypy/test/test_tools.py
-+++ b/cherrypy/test/test_tools.py
-@@ -9,6 +9,8 @@ import unittest
- import operator
- from http.client import IncompleteRead
- 
-+import pytest
-+
- import cherrypy
- from cherrypy import tools
- from cherrypy._cpcompat import ntou
-@@ -343,6 +345,7 @@ class ToolTests(helper.CPWebCase):
-         expected_msg = tmpl.format(attr='items')
-         self.assertInBody(expected_msg)
- 
-+    @pytest.mark.skipif('sys.hexversion >= 0x03080000')
-     def testCombinedTools(self):
-         expectedResult = (ntou('Hello,world') +
-                           europoundUnicode).encode('utf-8')
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 9819875e8a3c..c8f42c6ee0c2 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -3,9 +3,9 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD clang-python-10.0.0.ebuild 926 BLAKE2B 9234b7b3e5159f7f9e9d99148a6b784be909d9241484200c6578d877e4b1f1266df92c16034e8758bbd0280a1b626b5a5f914b94b37b0fa1ad60306f1c09b215 SHA512 2afd8a595225835e276a62edfec73d0834a5b3d5d4fedf8416ce115db9208da87cd3f3ec5675fb46a4205001e5d734c7479ea5eef86571d1e2a54377fa14e9ad
-EBUILD clang-python-10.0.1.9999.ebuild 954 BLAKE2B de6f4430aad3d78ea95d8ec676c1dcba2d977139f16f1bec6494aba402d4f353654f3900a78a7bb3a27cd925e235efdb883dab145cce9a1e925bb8db0b0094b3 SHA512 eb4656837cf0e0ac87615530d46e3003ce6fd8a339e5ab33c9ea6eb748784690b5a416742f323088995140b5057d983c9fcc4bbbc1a2229890675300c10d1ca2
-EBUILD clang-python-10.0.1_rc1.ebuild 954 BLAKE2B de6f4430aad3d78ea95d8ec676c1dcba2d977139f16f1bec6494aba402d4f353654f3900a78a7bb3a27cd925e235efdb883dab145cce9a1e925bb8db0b0094b3 SHA512 eb4656837cf0e0ac87615530d46e3003ce6fd8a339e5ab33c9ea6eb748784690b5a416742f323088995140b5057d983c9fcc4bbbc1a2229890675300c10d1ca2
-EBUILD clang-python-11.0.0.9999.ebuild 954 BLAKE2B de6f4430aad3d78ea95d8ec676c1dcba2d977139f16f1bec6494aba402d4f353654f3900a78a7bb3a27cd925e235efdb883dab145cce9a1e925bb8db0b0094b3 SHA512 eb4656837cf0e0ac87615530d46e3003ce6fd8a339e5ab33c9ea6eb748784690b5a416742f323088995140b5057d983c9fcc4bbbc1a2229890675300c10d1ca2
+EBUILD clang-python-10.0.1.9999.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
+EBUILD clang-python-10.0.1_rc1.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
+EBUILD clang-python-11.0.0.9999.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
 EBUILD clang-python-8.0.1.ebuild 1110 BLAKE2B aa66d47aef5cad5d7819dc064d618a70e1b38fe6b6cf7c8ea15ac3a6b814770e95abd86a482f5fc874f4bdaf230c3330c0fdb39df1afd88e2c40ae9a6349b49b SHA512 a5b3aace7ab68a0bf9e8624e2b1b23f83dc79a299090479ddde3794f2ff7e344459e8c7167b256748a57ce73099272c2eeb8d8778901c710ccbb08d2c6c12a35
 EBUILD clang-python-9.0.1.ebuild 924 BLAKE2B 8a666866e1c2fa2806c29ae6c6787cee7dd7bbb33ac8d2d99e9072d13f8fd0b1a98388de9f655b9f26bc43085269af402592d62c29dd1ff3f2e1564c2e8a4c39 SHA512 c0c164894497d871a3016ec8dc19e09142f5f77d194dfe27d9ad12043daf22df7abaacefaa2294e7355aab2d45fe7f578e80ff7df87af6dcc0c75e8128f885ca
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-10.0.1.9999.ebuild b/dev-python/clang-python/clang-python-10.0.1.9999.ebuild
index e1b9340c6319..6d7cb294e651 100644
--- a/dev-python/clang-python/clang-python-10.0.1.9999.ebuild
+++ b/dev-python/clang-python/clang-python-10.0.1.9999.ebuild
@@ -27,11 +27,6 @@ RDEPEND="
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	cd "${WORKDIR}" || die
-	default
-}
-
 python_test() {
 	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/clang-python/clang-python-10.0.1_rc1.ebuild b/dev-python/clang-python/clang-python-10.0.1_rc1.ebuild
index e1b9340c6319..6d7cb294e651 100644
--- a/dev-python/clang-python/clang-python-10.0.1_rc1.ebuild
+++ b/dev-python/clang-python/clang-python-10.0.1_rc1.ebuild
@@ -27,11 +27,6 @@ RDEPEND="
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	cd "${WORKDIR}" || die
-	default
-}
-
 python_test() {
 	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/clang-python/clang-python-11.0.0.9999.ebuild b/dev-python/clang-python/clang-python-11.0.0.9999.ebuild
index e1b9340c6319..6d7cb294e651 100644
--- a/dev-python/clang-python/clang-python-11.0.0.9999.ebuild
+++ b/dev-python/clang-python/clang-python-11.0.0.9999.ebuild
@@ -27,11 +27,6 @@ RDEPEND="
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	cd "${WORKDIR}" || die
-	default
-}
-
 python_test() {
 	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/django-otp/Manifest b/dev-python/django-otp/Manifest
index 192cefddbf45..45f90c04a82f 100644
--- a/dev-python/django-otp/Manifest
+++ b/dev-python/django-otp/Manifest
@@ -1,7 +1,9 @@
 DIST django-otp-0.9.0.gh.tar.gz 60204 BLAKE2B c71b27e007580410fea3cf8110631801c8c08f7e325c3586cb5a41a9618b371b5d65e3b030a5b483cb6cda684fe837cd40aa1c5d04f54dc82cda750b8ba8aeb9 SHA512 dd3c99e928ebf1ba5b6f6b2f34fcf8a1f86ad64ece17a9bd97c56be239f165808f6d1025e2826a12a8eadc150fe49920a0b7ef398d83542cd97a4a6f391505fe
 DIST django-otp-0.9.1.gh.tar.gz 60230 BLAKE2B 1a912e35f8245d3411fc1a9b26dd53d99df5dba5f2a5f68003bc4d535365af336d8664f81cc42f140247bb0e7150c0a60a3308d96cda1e41681dc93520f112d2 SHA512 600286653c035527a2a7978f19c3b9683805ab4562f12afcc2140adf92705239b8f9141b9979a6c30110cf7f3cc13c67019f39448d3cb8db61c4e1b0cdbcee88
 DIST django-otp-0.9.2.gh.tar.gz 61366 BLAKE2B 5016e352db2cfd60d94cd38986185fddab84bf997b72ff5ec3b59cc5944afa74ef67deca7691fd78e28f2aa75bccb9b976707ab6822a6781e541157d4810d8cb SHA512 9634ab23d006d768cec8f3a6685a77e54f8bee89854af2d431eb99560819139518738eb9f1a124190633dbd99f47388f5fa9685bd199a0918f73b263894ea051
+DIST django-otp-0.9.3.gh.tar.gz 63488 BLAKE2B 186af524cdfa3084bfc14deab1a4422a2da2a61b94d85f6c84a01ca0876b68d3f4b478ab2ed37b7d73ca273a2cce3bf4a6ad16c07cc2961bb6e5a0f26c80b1aa SHA512 23e73c1fb0af43c9ba946af5bd1a4ea2dc5abd2b6e9e543a0b7ec37296f0132e9203e3df3d8d0a70448d63453b8111921343c04fc3f073c505d6dac332fc0042
 EBUILD django-otp-0.9.0.ebuild 765 BLAKE2B ece769006ba4a4f8ead9ee89cd15224526bf8f21ece4155b84f05fea4dad1009da5225571c2b5171fbea013153c844ce8c22c36cfc738171739d2777d5d3ea6e SHA512 8b151507dc42dbc5d82be55ba8290bdede0703b49fc4d03109a4264362d04e9f3fddd9a60212fecb5906ebec9f75359e01038363db045389508e151b1b4861f5
 EBUILD django-otp-0.9.1.ebuild 802 BLAKE2B 72eb8645f292fc55bb581e512cdfb51171b1a449e2767c717bf303906bab2bb7b71c11cc86b7227c19a55f0da45b6dbd897e1cfcf74649b4713b429f0fec7dbf SHA512 7b36b987c0c6f0144458b0b9d98cababde280f6fd0f4f04483decad56a1260444fce91c20b654e9e9987e7d88e2e375ba18b6ddac3ba43b2f218883e8a1d9074
 EBUILD django-otp-0.9.2.ebuild 839 BLAKE2B 450434a0df280094bb855c2bc6109b9080a95f36e76ce1d881acabfa72c65bc261e35daba69262c33a9c4482dcd79f5c2b0a2fefe8ef2615524ac2e69f40411d SHA512 822577452adcead3039eef453c11060c679dc22063a2f51f5326dfbcd105dfb621dbf63a5fc4ba3a42f137e34b63298fe3ffb029e22a152a1e6c6ab086beb8bb
+EBUILD django-otp-0.9.3.ebuild 839 BLAKE2B 450434a0df280094bb855c2bc6109b9080a95f36e76ce1d881acabfa72c65bc261e35daba69262c33a9c4482dcd79f5c2b0a2fefe8ef2615524ac2e69f40411d SHA512 822577452adcead3039eef453c11060c679dc22063a2f51f5326dfbcd105dfb621dbf63a5fc4ba3a42f137e34b63298fe3ffb029e22a152a1e6c6ab086beb8bb
 MISC metadata.xml 386 BLAKE2B 089280b44d70d41d6ac97b035d5346c7e484d53cb5cc4505a1953d46c2a618140fbc1a3094a14ef18d3c39023ae10b7d162977537b646563459f3a9912e765fe SHA512 6d181b8eaad8df98a615d06c292284c1f8fe28e6bbfbd467428fc387fb9553221646d2014a10c3d16a4613db7d6f0af75714dacacecf1daad0db053d08deb3e1
diff --git a/dev-python/django-otp/django-otp-0.9.3.ebuild b/dev-python/django-otp/django-otp-0.9.3.ebuild
new file mode 100644
index 000000000000..b14eef63539e
--- /dev/null
+++ b/dev-python/django-otp/django-otp-0.9.3.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..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Django framework adding two-factor authentication using one-time passwords"
+HOMEPAGE="https://github.com/django-otp/django-otp/"
+SRC_URI="
+	https://github.com/django-otp/django-otp/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-1.11[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/qrcode[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+python_test() {
+	local -x PYTHONPATH=test:${PYTHONPATH}
+	local -x DJANGO_SETTINGS_MODULE=test_project.settings
+	django-admin test -v 2 django_otp || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 619d2fecf751..ec020db2ad39 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -5,9 +5,9 @@ DIST Django-2.2.12.tar.gz 8877061 BLAKE2B 7d92e7f871606aaacc82528f3d7c26d134a7b1
 DIST Django-2.2.13.tar.gz 8879757 BLAKE2B 4a7986805c6a3674d47aa82b97f31ae63968dd7c0f12db672207cd1d97076acb681fe44e730147122911684b36d7f1e9d5ea18c054d4c40c68b460300fd9294b SHA512 6daf3486d2f19eb159193df77a7525e5173ba5889ad5c587a6ec6bbf02c4ea94fa90b9a30a5310932fc9353a22c413208ab724c05740f844eccfe610da3ca68a
 DIST Django-3.0.6.tar.gz 9070990 BLAKE2B 9f918f64baecc5fe18ec08293da0f81a5e6ba9dc034b7e43f11ac9e67fa8d16c155878342babad9fca8ed30caf5ec3335756e2e0312c463b46a23b4db92fd4a0 SHA512 4c92c51386919c389037d6c6d1de3cb6ec443bd1f216f20797fb20fb24ea8d021701a03805ba693deadfa82b1aee38ae0d7fc03cae94cd744b1d1fa47ddc46ad
 DIST Django-3.0.7.tar.gz 8947502 BLAKE2B c26752f41f04f23ea1db9863d0919c17ed27b75133e22cc342e453e40077f05f6458f8edd290bfdcf828a181e38d89a1b4faeaa9cb44176ff0f7d67910d6b9df SHA512 566a78c3686baaea2ea8f2db2c1762a78ec5e5ae44f0be43f49c83899c2a0a9d1b2297a05ce8f4bc6bc580c494dde66bb2be47a8269cce3e1b007fedd857e5d3
-EBUILD django-2.2.11.ebuild 2304 BLAKE2B 9c7961c57036af4e8e3878275033b0afb905b0a1e32ca07a8980b1745259a3c05cb239c642cf1d44a1074160dccf578f109db375c5a397fd203ee0aa73bf054c SHA512 1ec3cdeaf83d7d05c6f68e5216993fdd43be0dda13db401f248a4d81a0c93d5ff6dbf074d113c6be32bc830495e18bfb0022c9be3b6a1f5c333c2c6304c8fb95
-EBUILD django-2.2.12.ebuild 2319 BLAKE2B bbb771c0f705b919c27691bac19ec789cae02e247d5e6ad38d008fbdaeab3cbb04880838967b70ff75b28e3cd40c6f4a3fc8d89e6833f70883846d9393277761 SHA512 bf4087b350b4b5341102e9f3adcc0af00c1f21464d3d744a7c0fbd51b13c88c3720f61fde56a8f55819f981c623ba0a0fa70eb5a910105b6b7f864d88762b199
-EBUILD django-2.2.13.ebuild 2319 BLAKE2B bbb771c0f705b919c27691bac19ec789cae02e247d5e6ad38d008fbdaeab3cbb04880838967b70ff75b28e3cd40c6f4a3fc8d89e6833f70883846d9393277761 SHA512 bf4087b350b4b5341102e9f3adcc0af00c1f21464d3d744a7c0fbd51b13c88c3720f61fde56a8f55819f981c623ba0a0fa70eb5a910105b6b7f864d88762b199
+EBUILD django-2.2.11.ebuild 2344 BLAKE2B 124f5e9dd4fe7c19439ffa3f5586525499a1e02ebea738f2a515f2ee9c6a11efc909c56d556418a5a0a0f491c6c37d07c406576a69d012aea686c6d16047155f SHA512 629706bd162f4c45f80e4d37abe32d7ad99fb37ae34a25e76ea89776e7d3b76fc7ce80eaffbda2c48688d2f69f453ffef1c0a59e63ae4fb154b1f87709d8aeeb
+EBUILD django-2.2.12.ebuild 2358 BLAKE2B 14e5c853767cc003c733c94d58486c7371d93f961f34372296354ad89d023eeb6c8887aae4bb6b6c36da8ca42b232c749c2179bde0133821a031a92707dfe277 SHA512 701b220cd48ec6d3957cde5a57192553e0c158657fe94d26b5eb1d50a12c44ec8e5445e69f842c5f88ed2fa313872ee9a64d2c23448c8003f717d79afe094c39
+EBUILD django-2.2.13.ebuild 2357 BLAKE2B 42d33daa2c3ebf5c776f79617fb943a085f3f1965daf40033add0689634d25f16972cb5efb545416a3add02e7d13bc337e6a9de43a830a3670124dad93a4a8c5 SHA512 8627be383807f5820991ee57fca3aa3c213b13c751f57313e5148ab8eac1fed002b46bfdf5523b1e907f468202390b9854373e2522cba6be71f58b3be493ea56
 EBUILD django-3.0.6.ebuild 2348 BLAKE2B b4bf267890cc8ac02c653fb21ab7db9f63b8d3631a050244af1f561df91de9723f80319a7e72026330f2f3badf5b49e857c2ffd17f53408a2774a0d37d3f90f4 SHA512 79414bb07684ba02db7197e6f177b4986b4cabe647abdea46bca87d0a10ba4f6804547f36b1206c2515cb6e4211d60484fa1d5116a946cc84a92f111e54d8add
 EBUILD django-3.0.7.ebuild 2347 BLAKE2B dc296dee8bdb25be233fd02b686e1b3e34d46055ef9194ec2a0c3cadb751fcbe05e17cdd2793233b7657b0cd01a593f3770b805c6fbb4af3514212bfb853ef7b SHA512 c2a32dc0e7c29d6eda9e106d1a1444034a7fe826a5e8dabe96e39d6c818ea28416fe88f73dbfb8d8738d9f1745339ed92fa967b91e5eb5b19fc0d753160d304b
 MISC metadata.xml 374 BLAKE2B 79d646d66b955dfbc419783bcfe7677f92472872292dbe726e55bf873d066be9365664e14ff1d190578b0294fe14dcee1c43e648bf2508cb2ceff4000b6002b8 SHA512 9aa0b388987c115e18e0aaa8747605e67fc8c8b5125d2a634dfae2ba8c6627963029fe913401a0647026adaa4d0037d91075a46d20f924f4d4f8d45bff195cff
diff --git a/dev-python/django/django-2.2.11.ebuild b/dev-python/django/django-2.2.11.ebuild
index 06c2258d63d4..04943ce0049c 100644
--- a/dev-python/django/django-2.2.11.ebuild
+++ b/dev-python/django/django-2.2.11.ebuild
@@ -40,6 +40,7 @@ BDEPEND="
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pillow[webp,${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
 		dev-python/tblib[${PYTHON_USEDEP}]
 	)"
 
diff --git a/dev-python/django/django-2.2.12.ebuild b/dev-python/django/django-2.2.12.ebuild
index 2166d02e126f..60543908ceab 100644
--- a/dev-python/django/django-2.2.12.ebuild
+++ b/dev-python/django/django-2.2.12.ebuild
@@ -23,7 +23,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
@@ -40,6 +40,7 @@ BDEPEND="
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pillow[webp,${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
 		dev-python/tblib[${PYTHON_USEDEP}]
 	)"
 
diff --git a/dev-python/django/django-2.2.13.ebuild b/dev-python/django/django-2.2.13.ebuild
index 2166d02e126f..5b85d6f488d8 100644
--- a/dev-python/django/django-2.2.13.ebuild
+++ b/dev-python/django/django-2.2.13.ebuild
@@ -23,7 +23,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
@@ -40,6 +40,7 @@ BDEPEND="
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pillow[webp,${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
 		dev-python/tblib[${PYTHON_USEDEP}]
 	)"
 
diff --git a/dev-python/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index 007fe37dbe8f..82ba5d2ecdd0 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1,5 +1,5 @@
 DIST dogpile.cache-0.7.1.tar.gz 326127 BLAKE2B 358391033d1d22b2711052f1aa3003c0c5f2da42b33b3f4fbb2d582418b0b42695db5df638dabcb9ba81ba414d142ac7f52a6c80ea645f5fcba12ca21122a495 SHA512 39c0a1d3d5027bc61cc69eda46c846c72d09892b2de0ea2e9545b1f710911dce8726b4ee4a0daef0d3c409a16733920d437f6e833a5b3f55ccc80267bb0da39c
 DIST dogpile.cache-0.9.1.tar.gz 329015 BLAKE2B 23a33ccf024153e39bdccebefc33c866990733432abd2bdd715a0f180f0059a2ff8315024d59d3ad9c79a01561fda3a802a867d359961d7655bdf790556c7a2f SHA512 7d84325dd7ec2d85027472f07cddd51f495b75dc9dbbcbf26bad7aaabfee8c2da99e0c247851282b228528a87e54d98e04d8451a3ca3a571e84a4a2bb33e72f2
-EBUILD dogpile-cache-0.7.1.ebuild 915 BLAKE2B d5568c37cbb7e3f159a1d01965d8be452fc4061f66c231238492477f43030f728737dfbc046a3b1bfebe4ee8514dd5fafe06871014bfbd550c5f2b75ebfe9688 SHA512 eb7af2e2b2493692d41317eeaa590e2605cebdb4128eed07cbcfe58a10ce19130766e0436c43c33df0a2794b6e776cd836b67e4b85d37f31c756b26d782ddad1
+EBUILD dogpile-cache-0.7.1.ebuild 914 BLAKE2B a7e57119a7510f03420d5368c4bc05c8866f14d62090d18ddf8125eef1ce9d63ffe5bef5cf216a66c495c42683d03a463e1a6f7e2f99f97a88ddf85352d8a9da SHA512 bb34950106c425e39f9177455336e07799b996e92885ad771f5d1876f03a4907da91fc4a1e02bb81e97eef77af1d8160c421ad5a029666a485fc97956e89d592
 EBUILD dogpile-cache-0.9.1.ebuild 834 BLAKE2B 2494482ebf182b657d32a6d5df9b2abef8bb73bc28b4e8ae17fad0e498b0c7e58d52684a2d29405fcdbbb6784def2d2d72b9c2df6ff5c2075218ff3cde4798b0 SHA512 88d8de4defadb2027037a75f21745def85a929640bae912b67af27837c48c91da2591fc904df95ed8161d52cf1ed120e8eb692e3a956e30ede3024ddbf602032
 MISC metadata.xml 716 BLAKE2B 790b3d6205c7f01a122bdc92250cb507408742e973a33dcadf4be9180d4bc4d6c77a9a9283057b88406d852a461dbc46d834b6a95309b7641b2ad78430b0f553 SHA512 7d260f1511dd2507f67149e1dda7a5ef5e5fee21bdd45832d141cfda5794b32b5b99a31e0f351da5f076fe481f14c7b420cf11f5b14587a1858b61325f4ff59b
diff --git a/dev-python/dogpile-cache/dogpile-cache-0.7.1.ebuild b/dev-python/dogpile-cache/dogpile-cache-0.7.1.ebuild
index 5c7a7cc3fbec..c5765e5413bd 100644
--- a/dev-python/dogpile-cache/dogpile-cache-0.7.1.ebuild
+++ b/dev-python/dogpile-cache/dogpile-cache-0.7.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/dogpile.cache-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
index 50482daad22a..c287e4fe3dcb 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -9,5 +9,5 @@ DIST elasticsearch-py-7.7.0.tar.gz 128862 BLAKE2B 461b7ac3bc6d96bacdc1e8595c05b4
 EBUILD elasticsearch-py-7.0.5.ebuild 2689 BLAKE2B cced4decbebfa315773f41d19a85842af8883d90a782e4773e0df47fa56708ccb6c263165731822c62db524481af9da2dc83096b8de2914a28c52d222e3c1692 SHA512 c17f9a7b08fc263b530a5469e8c234d76ad78eb215ceb4e43265190f3a3eda20e6f912f7afdd725c1c40903e8d017edec805f0c09ebf14f704554dfa27845062
 EBUILD elasticsearch-py-7.5.1.ebuild 2718 BLAKE2B 14306f7a0f84989c4cad1c511032e0dd40647fa6170d516ba6a15b4d66dc16a6aef17b14d5603fc1216b8df5432ac27261016b974dd38e439a611ae5f6d400e6 SHA512 2b726c8e3fb031286937001c554d4f850acf9d471bdb613f7f163df50d0ae7765387147253dfeeb400903536998ac8092ce0874bd6b62ac23186c612ba2f2e05
 EBUILD elasticsearch-py-7.6.0.ebuild 2679 BLAKE2B d51d3c7e36adf473ed69e998e2ded217d1738b66611422956f53fb476835a547866b6c3697764345059a1de2845c9d907e7517bdbb755a6db85fe01f3272ca87 SHA512 03ab5dc5806d5c19e836a489d838c8892384845ea635962dce011a9982457f026403d5688510b9156bb883fdcd80d2dae46adf065217470b1bf7465a1f530035
-EBUILD elasticsearch-py-7.7.0.ebuild 2942 BLAKE2B 272c07a8cd72dc151d1abaa94ad667c88d0a1006516782b137d41bb0ca905a9d79f642342a2cbfd06d352e919df2b42eed7d2da69e7c29f8c430b88f40f1f064 SHA512 233508866bb93f1a1876430731cc277092e7d61f8d37fc786490f6c31133a9132410fdb29606a2599b97609c8cd6aab53f60406f18b154a02a4f1185b955465e
+EBUILD elasticsearch-py-7.7.0.ebuild 2940 BLAKE2B dc6e4d1499b436bb9ddd738fd1cb0ad84aca5d6286d775e27751c4c264d5b3cddf418f37ca1be66c93e7095e2fe9f05136affe7934701535b04bf3c605e057a1 SHA512 adb2a6cb8b75231f945a16ba0199303af42bb91137a7036f1f8643d0d9749f91d7325a9b4c1e487d085db0f0b18dd1aa04685ebbc7655c1c99b51413e0e85144
 MISC metadata.xml 592 BLAKE2B 3535c37456da9c7904e88e5921c6fd27bf6790178a0f847d0a302aae76e4c68889d31337383ac1d0a1dbb55d7f37bc056bced2f2de29c4d85864b881feeb3405 SHA512 752265ff356d02b2825ac2ef5e5177649cdcdd31b5a3738e3638af89a7bfef8b16fef8332e67c3ac03285318b22e455795c75d408a1abfc99068a1d4015eade0
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-7.7.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-7.7.0.ebuild
index 04145309f90a..338d6fcaddea 100644
--- a/dev-python/elasticsearch-py/elasticsearch-py-7.7.0.ebuild
+++ b/dev-python/elasticsearch-py/elasticsearch-py-7.7.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 # tests fail in chroot
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index 2c28a3b8c03f..589173a60b6f 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -2,6 +2,6 @@ DIST elementpath-1.4.4.tar.gz 119577 BLAKE2B 65724afc715dcdb4903779933559e85c833
 DIST elementpath-1.4.5.tar.gz 120091 BLAKE2B c9ac74c4b76b3a3204364532831563c5600bdc159cfe5e853852c08de0c7abbaec952304120da4f13b14d2239880c9c1612ae8db3535cf4ad1d8ea8498cc3f1a SHA512 be3908056af67f892696edd31d1c836bbd7083a96eca1217d2dc972c5fc3bc583d89b825bed3fedeebd775d5fca53dd9b9a918ff9a3238bba54efe8ac0a51e21
 DIST elementpath-1.4.6.tar.gz 121815 BLAKE2B 09014fc503c8a3a6a6865572fa48c515af19fc009512369d8e761ca5b4e516de1add7eb14c0681114331c4a8ef08cccb5fac8f4ce2b436523780cb4e41e2dc00 SHA512 ac1d7fc0ab07f22fa02550ac77f4067b5564f78619bf98d6fda257751d6404684622580002d69beb769fc471500ee0c08f6095b05ddc6b7d81276dc8e158c40b
 EBUILD elementpath-1.4.4.ebuild 693 BLAKE2B a5c69a7d2c34beef1c29d2d5394c5db94ec27ff6d44712813ad0cbf363ff4eb1da1e2665842d6fc829704adadc64071447b8942e29aaa524f64d9f8faf979c24 SHA512 b55d339102ba114133a7f0157037391e50f3dc3efa50563d064b95b0fbd82f347baa0cd5c064f61d96b3bb18321932084f2fb6c45d6bf7b18fd41ccda043d04c
-EBUILD elementpath-1.4.5.ebuild 662 BLAKE2B 4886298b0fb7e2c2ce2fd3d4b83aaff47fca63e8d540b713ffa8dbdc2a92abb386b852777fa86d48ce0a4630239e39af86ad7e64d6e453f090aa1020c89dfcf7 SHA512 a319805964a6bc9ae55dd8b2ae6378a7c1eed9a398d4ab328cabd30f0cbf2faee54b38076afe1c9e7d6e68efa54efc43ba81410a3b5a12a9f7ffcb33a1e7d819
+EBUILD elementpath-1.4.5.ebuild 661 BLAKE2B 5ea7028595fa2aa6b1bfd271de02597bc858845f52d4ef4e5acb4795c0bf5441f7aa748c07e303b9cb661523ec4e22a8332a915abe0990aba76db8b4eb6e97c3 SHA512 48ce7673bb91dfaf3b75334daf059a6b2bb95f5ac1001b2a1937d563c9f0513ebc89ef5b1153c32203b598ec5f446bbe232877028f72ab9e761572e721276155
 EBUILD elementpath-1.4.6.ebuild 666 BLAKE2B 819a17e4093e50dadd9e6d08aae99de55dd1c9bcf16fa45b390f7a062fa311221a62dda144f013201355747854747d25cb8c14059226f5849557d623bb85931c SHA512 6d7eaf90b255fb1af831f4ad7fbc785b92d2597e45cbc16a5d408fad509c6ce876e99834c62dafe4141899e533f42a1f839079e3ac4086f26371a235975654c4
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/elementpath/elementpath-1.4.5.ebuild b/dev-python/elementpath/elementpath-1.4.5.ebuild
index b472ce7b0450..5cd74ecf88b4 100644
--- a/dev-python/elementpath/elementpath-1.4.5.ebuild
+++ b/dev-python/elementpath/elementpath-1.4.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/falcon/Manifest b/dev-python/falcon/Manifest
index 4679e818748d..5292c1392d47 100644
--- a/dev-python/falcon/Manifest
+++ b/dev-python/falcon/Manifest
@@ -1,5 +1,3 @@
-DIST falcon-1.3.0.tar.gz 507250 BLAKE2B 3ba3a989f2e9eb281f519e36a24772fe329fee849097028f3183b0e0c7908b7e06dbf0a70ba28cf7570dccbe88fa87703c47d985ea3cf761ea7d6ec3d41ac04b SHA512 a92d0b641152f653f47c9cb9b2e368d643aae14dcabe7028450d190bd08b883d37116d23d3a1ae4e092207f15926f66b12f57e38dd2edd347f6f8df48baa65ce
 DIST falcon-2.0.0.tar.gz 1075333 BLAKE2B 338e0b2474d743171fb0bc9dc3a05da428e6d46fc25e7cf1e978f799ed70e76bf265f32ba2cdf16d6eec8ea03b7b6111f70aa5b8f59141b7029d8ba9b03cd0d1 SHA512 d5365f91eb312cd058773d0a3809b5d8631acc188b9ee884e7c7db35664138608998f397d3fd831c568cafaf261cca2734b9dc7fb60590062e316ad1dbc74614
-EBUILD falcon-1.3.0.ebuild 1477 BLAKE2B d8f01dc89eb074b1621e38ef61771531c31753e22d67092817aeef279420620f86d8289651f4be23af0f1384b4d373693d9400c22dbfe4e4a8330cf6c09480dd SHA512 94ad28281449ca0488efe1a3c25dd1a4696e362a6111a53849ce05ca2fbcc670a273cb280d2f4ee5410cbba5c43471806999d750327172d2047129a155f7d268
 EBUILD falcon-2.0.0.ebuild 812 BLAKE2B 1b29c7b5261f847df57c210882c121034b49d5a840d68cdf3062ab3ddf09db930b69b594449118162f6cfa6284f2505f22ecbd9b8a34a9708a71516b493ba70f SHA512 87db99c80f9ddbb9e232f50266f8262b77219b2f54a4d24eb1c67aeecb797285cc8501b800418dc94c1e6622a2784a963cfdcd4beb5122e4db79c7951c0f2979
 MISC metadata.xml 427 BLAKE2B 419677eaecb3e5eb3fb26781cc3df41cff373a70a4899ce89cef22efbce131c457ce2bdd489b92287ff80f6d12962bd210035a5db77e518e456898498a5eea1d SHA512 7221c24f2bfa8068d4f5516e094af7dfc01786c63ae8d3f040b8d1da0ec4a83a6c507332e524fbd78e0644c978c11c89bec8c9771e0247ef48de1f50c50d8fbe
diff --git a/dev-python/falcon/falcon-1.3.0.ebuild b/dev-python/falcon/falcon-1.3.0.ebuild
deleted file mode 100644
index 4f9fc7b9191e..000000000000
--- a/dev-python/falcon/falcon-1.3.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=5
-
-# Python 2.6 is supported, but depends on ordereddict, which has been in
-# improvise for months and is a minimal package. If needed
-# please let me know. PyPy also works
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A supersonic micro-framework for building cloud APIs"
-HOMEPAGE="http://falconframework.org/ https://pypi.org/project/falcon/"
-SRC_URI="https://github.com/racker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cython test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	dev-python/python-mimeparse[${PYTHON_USEDEP}]
-	cython? ( dev-python/cython[${PYTHON_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests || die "Testing failed with ${EPYTHON}"
-}
-
-src_prepare() {
-	if ! use cython; then
-		sed -i -e 's/if with_cython:/if False:/' setup.py \
-			|| die 'sed failed.'
-	fi
-
-	# fix tests installation : potential file collision
-	sed -e 's@^where = tests@where = falcon/tests@g' -i setup.cfg || die
-	mv tests falcon/
-}
diff --git a/dev-python/flask-babel/Manifest b/dev-python/flask-babel/Manifest
index 3497e8cc31fa..9ddb7fd3acc9 100644
--- a/dev-python/flask-babel/Manifest
+++ b/dev-python/flask-babel/Manifest
@@ -1,5 +1,5 @@
 DIST Flask-Babel-0.12.2.tar.gz 44567 BLAKE2B a164dd527595412c451ee7bd772c8579f76d0202df3e1cb4c4952dab4aa4225001f5fa35938e72892a6452da1a9b70b2fd661249b2f37953fe3963046631d384 SHA512 c43bf5cf6c66e3a8a52298f52bd6300cf0b0c53a1f0fb5862b1bcf8a9800ea0e043c9f85125bb9eb5c281a3c0583c63f0f9653792204883a6f82080547b37104
 DIST Flask-Babel-1.0.0.tar.gz 49680 BLAKE2B 29adeb7b4a6892fabf6e85da9f2fdb72f3871e3c3728c7521e06ffd80d8da505045eb1ef7a30223d8ef40064bc78514f6fc9acd1b8640232adb203ea55876e93 SHA512 3624b2e4877821551267e2719d76b714bda0a1da24e5a3c36d045273039823c4f3bbdf28cad5d8e0d4f0c896578248bfc40aebee720b543e500edf6de607ad8d
 EBUILD flask-babel-0.12.2.ebuild 1219 BLAKE2B 2a79a0d93377e862f9ead3fd702f789d940bd26522e3f8155843d289b00d1d4995ce26b3fc2d1825332125ac70b85ab2beb85a0765e8f9a41aa993468c08781b SHA512 e24f0e41a70cc1e98616d2a149f3cb247f0beff65fa8dd0df5e67d2534ccfc12f2d41d39a13c5b544bf8e36073124c63d92b305c6f514312c516d117f964b16d
-EBUILD flask-babel-1.0.0.ebuild 951 BLAKE2B d5956a986c4422b3caa6965d187da1aac3c340a9f330bc96c2021832c8a61cc6364ff078bfaad6a996430d7a409181b83f77eabc083b069db1ca9afb4fa0b34b SHA512 6b5c6d01136ec975c313d80674250258935dd6c4c658efe632be4dc07011769cba04b7c2258b9811efbe100c46d6c442ddc7071b9d18dc88264e8413f29ac30f
+EBUILD flask-babel-1.0.0.ebuild 950 BLAKE2B 4cc5104320e13c622cec76e155649f19c1a52f7cc45e6e79e1c4d12ae720e84ddab1f3ad8de4782cf58cbe8a30373d90f8087ac980073c69f4daa3beab7a0387 SHA512 2eedf1ba14d5916c6f406ba9dc6aeaa2ed93254847c5bfd68bfa1de7acc4c70a5f677f1929d8cf58d863bb853a48209f984ce661bc961cd5bba3eb14055f5592
 MISC metadata.xml 450 BLAKE2B db38ca56f4b683429248baf7411355305672c23126c4b6c7486971fb1e099bb3117b9246870a24f6ecd66e7f27647e80285461d046c02e9227970a111c58dd98 SHA512 d6fb2f7cdf0a8d4b54dce372bbb3d9728a5ebb0e6d714da9c58e5215d6711e3f4211e2a6ef5390cdfa663d375d7e2942a210bfa2822489dd04a911d9e9c24985
diff --git a/dev-python/flask-babel/flask-babel-1.0.0.ebuild b/dev-python/flask-babel/flask-babel-1.0.0.ebuild
index f04883a8808b..59c7c7d3d1ac 100644
--- a/dev-python/flask-babel/flask-babel-1.0.0.ebuild
+++ b/dev-python/flask-babel/flask-babel-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 inherit distutils-r1
 
 MY_PN="Flask-Babel"
diff --git a/dev-python/flask-babelex/Manifest b/dev-python/flask-babelex/Manifest
index d4cf8e3e281e..56f028007d2e 100644
--- a/dev-python/flask-babelex/Manifest
+++ b/dev-python/flask-babelex/Manifest
@@ -2,5 +2,5 @@ AUX flask-babelex-0.9.3-tests-fix.patch 1508 BLAKE2B 828c0932722c4a052e8360338a2
 DIST Flask-BabelEx-0.9.3.tar.gz 41040 BLAKE2B 010f8a7be2d59db143010456673a34e2a42f8978cf000d844f11d27969f120c0768038271b8c62b4f6965a3a60f9c845c4027daf26459fce1489482cad0f8856 SHA512 c759f990c4c96dab7cf2fbe83c1ac6dde4606adfd2f5d03ed293578bec621170be319b71fc3e38c1910d2edaba3e4394f32ede3754940e315abd917beaf3982c
 DIST Flask-BabelEx-0.9.4.tar.gz 43423 BLAKE2B 9aa6223cd29cd1ce3de0d8c8b771980457fa0ee76b7fd361b9b6d8ae79f521b36096b4d912281b7fe671655ac8c7b04032c68fcc59463c5630af073f264f5815 SHA512 0deec4b481876f4c76cde398157cd2bdc564e9d1076a7accf1720be86b41912466435412ad5f7e5e8b06f17ad5363ea503191b159b30625d067e76a45eaba957
 EBUILD flask-babelex-0.9.3.ebuild 1153 BLAKE2B fe7bbcecc3230f07262c3b04b5e73db6081723d47f8ab9a9c21762afdbe0e31a080878e812bf2f9805362047f97b7445412e2bffa72fd3608cb02214684265d7 SHA512 1f50e8322e1e8bb680e7ae8f7825b7a29ca239575e4b9b5e9d1ae6ceef1af61a16b9062ddb1d326c3d27a4c288cecdbb3fa243fe9fe476b49ca28c8f2b0b5251
-EBUILD flask-babelex-0.9.4.ebuild 959 BLAKE2B 53fa0118042a1a9913d519cc190f1da38ce13b8907dcf444dabb70fd11576ee96ab08b0399f6ce49bb301dcb0a6b850f809245f16dfa709b9448f5da178439b6 SHA512 dbec899355d76bbb85234a78f1c11ed0aed50f3395c09e721de74f7d21f3514d10c6cfdfc623f39e36927d8a2e3485c32fc8909e3fbafb91a4ef1de693cad3cf
+EBUILD flask-babelex-0.9.4.ebuild 958 BLAKE2B 9384812ec3c5e2614f144d3404fabdafb5ec48838f5626f2bada47a8a440a522ab4a7d4b018201d0f776a637a0d8b6ce0141079b0a6546ad0578747ee1a45688 SHA512 b3603509ac26afaaa703bd7de646991982b8051afa48e7a2373bd37dd518ec07e4260a26e2de266135e0eb453767a0b7cdcd59e803ae3e1793b6286fd4cdcf54
 MISC metadata.xml 388 BLAKE2B c961ae85719f00427bb3c616873c4cfbb3d928d1acfdbdedc2abcc3fcff8d0ef4d406dccedcb18748c99b094735ca9dd8f42df755ba6fc3155f229202e13ab36 SHA512 844d8f6784fdeb00484620a822f16256cbb7f07b9c0da936a3cc1b158219839612439e8158b30c4b4c713a88b70edf64068e1091ed102f7b5ecac17b1ef53ed0
diff --git a/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild b/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild
index 75210c43206e..b24481782f87 100644
--- a/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild
+++ b/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 MY_PN="Flask-BabelEx"
diff --git a/dev-python/flask-gravatar/Manifest b/dev-python/flask-gravatar/Manifest
index 1a418195fa9b..efca00663547 100644
--- a/dev-python/flask-gravatar/Manifest
+++ b/dev-python/flask-gravatar/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-Gravatar-0.5.0.tar.gz 17299 BLAKE2B 7dc16c609cdfbf690a39fbb3bd2810398030bd5c7a54394468902dd131116509da8de448a55907e4738fc984ef422f3c7970b8453b27971eadb106cbb8648562 SHA512 bb4ff064489a030fd763a46fc045109104535474d115aaabdf5c4d1a82a1e3303ee34f590a3f1203a9d009307fc8c45c37af7c30e76a4fb10bc46dd684d37751
-EBUILD flask-gravatar-0.5.0.ebuild 618 BLAKE2B 7eec95369ec2b2ea8962e5b0630124c5f926e7cf70d31f678d9fda711ad036433e7e9486f44803df8fe82f06c7548f52c9b38e759bf89cc6410fe6cf2805e78e SHA512 377fe83334951b2788226da4fefb9826a7ee75c8203ee7523729c0756694725b82a60409f3f134754aabcf95d9a4a2ca25b9e57e700d5b926dac4035f5b4c879
+EBUILD flask-gravatar-0.5.0.ebuild 822 BLAKE2B d24b2a1a305d569303885ff734681ff8d1d46556e188a6b5cda95197637d9e977c6c9723a8564df5b05a469fd9df9a1240347b7016a35acdd5bd4210ffa9f03f SHA512 34e4faa67034f67964743bec43283fb03f3b939edc3590883f895b04c215bab43ccd24a48614c2902941bfedd063a020efaf9955337b934c73177df25b3921a5
 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 42f669f664ff..978e75e8d1e3 100644
--- a/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild
+++ b/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild
@@ -6,23 +6,31 @@ EAPI=6
 MY_PN="Flask-Gravatar"
 MY_P=${MY_PN}-${PV}
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Small extension for Flask to make usage of Gravatar service easy"
 HOMEPAGE="https://github.com/zzzsochi/Flask-Gravatar/"
 SRC_URI="mirror://pypi/F/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
-
 SLOT="0"
-
 KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/pytest-runner[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
 
-S=${WORKDIR}/${MY_P}
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/pytest-runner/d' setup.py || die
+	sed -e 's:--pep8::' \
+		-e 's:--cov=flask_gravatar --cov-report=term-missing::' \
+		-i pytest.ini || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	cd tests || die
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/flask-htmlmin/Manifest b/dev-python/flask-htmlmin/Manifest
index a6e0bb73bb29..08b69db8ea74 100644
--- a/dev-python/flask-htmlmin/Manifest
+++ b/dev-python/flask-htmlmin/Manifest
@@ -1,3 +1,5 @@
 DIST Flask-HTMLmin-1.5.2.tar.gz 3807 BLAKE2B 226d0ba30ce3c0f0d8077f67d3a56aabf6606ac31858fd051f46203123fdbb2e3707575a91f545b7ec57a1e6f4cf62f87c3d387cc7ec321d7f1f9e4b3c6038fd SHA512 b468b95329054f996ad275b00f58dd2cddf52a029eeb08ff83acc5ef37ff0557af4e98181c445a980da2eeb21dd913ec1da08e0953fb97765d4790731353dcc2
-EBUILD flask-htmlmin-1.5.2.ebuild 670 BLAKE2B 17036e9b7baf7f89e96e775b360657bf169f6ff32eb45fc64f42a1b17eea4dd37da7bbbef4a088372efd17ffe2a287a20afeec5e8c4106552a2f10141530410b SHA512 3948bb2da1bb0516de195aa9ea190e656f7fcf3289f87978c80e257b94b1cc292ab2c0518fe40e02e9e25d54c08a1a2f753fb708fdf93fa650caedf597af3b36
+DIST Flask-HTMLmin-2.0.2.gh.tar.gz 12178 BLAKE2B 38d21e06058728be9f6a23c8b18dd0f209833723d63bdf07262f37ff0fd6ac0de810bc164bfb6e91ed446e6402f93f204468f9c2307cf45c3a1609361be33992 SHA512 ea863644baecdf54d6b0a920ad0cbd84880e6c029a7d5313f0964f03233a74b7d11b3e15431ecf02fc6c33b38241e472968ed1bcad5b8163d14001678a4833e2
+EBUILD flask-htmlmin-1.5.2.ebuild 618 BLAKE2B c072af5c880c4b618e6e55b6d6426b3b67a8d2511ce438a61a63049af4e02c53b208dfd0eaacc0a1c3f10c5ea471fc354c15f5c3ded39e005d16ded396071f5a SHA512 fcac3b12e5253cba9eb9fdf8324358f6e7aeba81ff655e0037a751b9b13170e08ff0a27d6575e8f8b63331c481f4352b39dbb159e92a096c26c088fe5ac74488
+EBUILD flask-htmlmin-2.0.2.ebuild 688 BLAKE2B 3aec15c31c78a377c2c98dfa2789d8edc692c6d5a7a120da03d12b94eb9d19bc490191690dc2406f5ff75da8f320ebb18de21b6605d2fe09d7c1b6c22adaaef5 SHA512 6969bcd5cb7bc7e4c88341f95fcaca2db5af0df158f807ae644b63638ed6cab5e68a93d2729773989cf405f173bec4aca16f781e784fe1038ba36c2fb0e83267
 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 489947e8b23b..7c60730ff5b9 100644
--- a/dev-python/flask-htmlmin/flask-htmlmin-1.5.2.ebuild
+++ b/dev-python/flask-htmlmin/flask-htmlmin-1.5.2.ebuild
@@ -12,24 +12,18 @@ inherit distutils-r1
 DESCRIPTION="Minimize your flask rendered html"
 HOMEPAGE="https://github.com/hamidfzm/Flask-HTMLmin"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
-
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="
-	app-text/htmlmin
-	dev-python/flask
-"
-
-DEPEND="${RDEPEND}
-	dev-python/pytest-runner[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
+	app-text/htmlmin[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
 "
 
-S="${WORKDIR}/${MY_P}"
-
-# Needs some kind of magic to actually test.
-RESTRICT="test"
+src_prepare() {
+	sed -i -e '/pytest-runner/d' setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-2.0.2.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-2.0.2.ebuild
new file mode 100644
index 000000000000..4a13092ac2d1
--- /dev/null
+++ b/dev-python/flask-htmlmin/flask-htmlmin-2.0.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="Flask-HTMLmin"
+MY_P=${MY_PN}-${PV}
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Minimize your flask rendered html"
+HOMEPAGE="https://github.com/hamidfzm/Flask-HTMLmin"
+SRC_URI="
+	https://github.com/hamidfzm/Flask-HTMLmin/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-text/htmlmin[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/pytest-runner/d' setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/flask-login/Manifest b/dev-python/flask-login/Manifest
index fb75ec06ae48..09a123e3b5b2 100644
--- a/dev-python/flask-login/Manifest
+++ b/dev-python/flask-login/Manifest
@@ -1,3 +1,3 @@
 DIST flask-login-0.4.1.tar.gz 43679 BLAKE2B f30df1cc84289bc2dd1e59a30284d7152cee0731daf8b6e58b8203007c0ba74eb512bf9f2e41608d9656138038f5b5c752509ef5a203ef1e8bdba9182912b133 SHA512 c87a2948ac37439ddd76f3f11584bdd5910cb00e96a7400343cf4dadc5a0f9bc84d40bdc068d2e8c05bd5a510046e18473e9ad71502c5039a5f05b371ce9bb4c
-EBUILD flask-login-0.4.1-r1.ebuild 1353 BLAKE2B 7ee3084c7c915978ffcd6bc27a01311897e24b6f6329f5bef75fd4bcef02d2d9af372b7810b2f4236de48986669e6a1c567f4fcef9a68fea2de9de2e7814abd5 SHA512 9401cd990e66ebe0d48cba107fc6a74c0eecd7a3fe97ec109f7c6a7d5859007ae765e2145377be8e66f5d5e4529cb9af3ec7f1790056177f6892d9ad40578b0b
+EBUILD flask-login-0.4.1-r1.ebuild 1352 BLAKE2B 9dc724adc0f52fa28a76f79cf8d51ea56833529ef01d4a0593a33fa4a8840a34d99d7366f0a67e5d7b2f656f62ab4595da92c4da7c03ce75d80fa7996b3179a3 SHA512 f862b535f22dba61154148c837a043309223ec5067ecf89f4f35845f7f6dda756f4854d722dea6ba5e5ceb874dc940f0d41bd63c7f81b76ca78d604ac1a5a6ae
 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
index 075238b8bd32..b65ef6f89e3c 100644
--- a/dev-python/flask-login/flask-login-0.4.1-r1.ebuild
+++ b/dev-python/flask-login/flask-login-0.4.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Login session support for Flask"
diff --git a/dev-python/flask-mail/Manifest b/dev-python/flask-mail/Manifest
index 5098b80463a7..c7e3215e6ab6 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 1019 BLAKE2B c45398ab4fb25686d6937fe2e27afb6c6a88f4b881ab4a272d67d4cb84ecca908a3f2fd88ff06b2f3781d9314a3d4123491ad6453e4afa0a297312abba786856 SHA512 d9918c766df44d100ffc0187c072cb14417b8f794f395a31080576f1275a0bef136b5bcaed171c688f58a5a72e2c618f3fba152ec307fa807b9f470b2cd0b3d7
+EBUILD flask-mail-0.9.1-r1.ebuild 713 BLAKE2B ac19b9e0a7223374ac6526f5d91d04ca55ab9f05f88d9427479bff352437ecb84766c469ebc2d76bc6d1c99267614939e9f1593b2df8a10189b68a7ca390303a SHA512 cbf1f8abe7551b8917cee1ef1a9a9e312761556440e44e5dd5cd2ebe4ce4bdddb15a535ae3e17df6d39dbcef2a8ef713710eac5a47209d4d05cb9bbe2f90359d
 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 9268034b9763..e8d56406bb8f 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
@@ -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,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 MY_PN="Flask-Mail"
@@ -12,32 +12,18 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Flask extension for sending email"
 HOMEPAGE="https://pythonhosted.org/Flask-Mail/ https://pypi.org/project/Flask-Mail/"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/blinker[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
+BDEPEND="
+	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/speaklater[${PYTHON_USEDEP}] )"
 
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
+distutils_enable_sphinx docs
+distutils_enable_tests nose
diff --git a/dev-python/flask-principal/Manifest b/dev-python/flask-principal/Manifest
index ff87d2bf50ff..a648573ca989 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 782 BLAKE2B 5ebb48f71aaaa71e086082349af8961951ca6f377a7ed2dc22ea0189caeddbe397baae6ec0df13eafb15f6fb97cf5944c72d2c6ab52e7c20bfbe766d2f429dc4 SHA512 27b9bbcd5098315b0f8cc838449fa2195b7caec554bcd7e1a354e02fc658ac0f9f2caf4e2ae6467f9527c09265f40ecfc3cfd571778f856d148dfe811c2b4847
+EBUILD flask-principal-0.4.0-r1.ebuild 592 BLAKE2B 2aba4cdeea247559ef022dee1424825891dc142bd69d5bf2c5d1a40eeea3e0bb82689f8ed9d1a51281bda0070162883fd07d4b8b8cd8a9cee7134c9edff0f7ba SHA512 d80825d420fcd1d54ec183ebdb5156b0a2b02650257faa44b4e952dd731c607b1bf77a2308e60148b17200d742fa9546609d6c18ecfead603992cd9f452b77e5
 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 ac5c8e80ea8f..19c475d31766 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,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Identity management for flask"
@@ -14,15 +14,8 @@ SRC_URI="https://github.com/mattupstate/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/blinker[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
-python_test() {
-	nosetests -v || die "Testing failed with ${EPYTHON}"
-}
+distutils_enable_tests nose
diff --git a/dev-python/flask-security/Manifest b/dev-python/flask-security/Manifest
index d8db89d9b265..14932d47bc64 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 1335 BLAKE2B 7eb37782be7c916a36fa8ebb94da4abccb17f27858437a6ad5648695c4502ccc7da17c57d50c12cb3216e5f8b5df2d5549172972a025f175969e229e91d29a63 SHA512 7aef4b7e6e94f07747e64ffb6085dd9f827dfe03fa4ace822b892e0c3ffc8cd481963bf4dabd8ead4e9a79f561543cf036094b49abdca343992b05e072ffea7e
+EBUILD flask-security-3.0.0.ebuild 1341 BLAKE2B fda0b3ef0eb3905478e61b3dd9b0728f974e090009af723aef9d5707196a875e992c0603f459cbc6c413ddae9bf4044ab6dbdf2dffe0f3deb5a02260eb28430c SHA512 9baf9297cc339569409cf9403bf9bf986433b236499e758406ecfb56751849fa3d1a2197da8e88f1aa64751224969c32330a6284def06806154f3a378774c90e
 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 349a0a18f98f..5544516760b3 100644
--- a/dev-python/flask-security/flask-security-3.0.0.ebuild
+++ b/dev-python/flask-security/flask-security-3.0.0.ebuild
@@ -31,8 +31,6 @@ RDEPEND=">=dev-python/flask-0.11[${PYTHON_USEDEP}]
 "
 
 DEPEND="${RDEPEND}
-	dev-python/pytest-runner[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
@@ -43,6 +41,11 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	sed -i -e '/pytest-runner/d' setup.py || die
+	distutils-r1_src_prepare
+}
+
 python_test() {
 	nosetests -v || die "Testing failed with ${EPYTHON}"
 }
diff --git a/dev-python/flask-wtf/Manifest b/dev-python/flask-wtf/Manifest
index 8b45dc1c493d..6adac3a01238 100644
--- a/dev-python/flask-wtf/Manifest
+++ b/dev-python/flask-wtf/Manifest
@@ -1,5 +1,5 @@
 DIST Flask-WTF-0.14.2.tar.gz 254903 BLAKE2B dd6b650d97622dbb56cc0bdd3c036f14e562181720ede0c48652b8fcbc88d2d684f013f0468e723b8b0746f2c6f44ca18ffe0ea353594680b47bc1212664ce52 SHA512 9d4b4b24eb24827aeb524699e6720eab384c42901a102daddd9fdc6b8dbc8eebec8c9d31a1e9052c9af4d61bd08eef8ef9dc4cdc8d9b950ff5bdd0201db1dfde
 DIST Flask-WTF-0.14.3.tar.gz 44507 BLAKE2B d160e10b1434c0578708c265468b77624953eb2d4ddde9a6ed2ff5b4f4651e0d5d2483020f51c9e512e3cb04895ecaa8fd1d0bf9380211d0a916acd8428f353a SHA512 58bdb87e442dd49dcbc9090e6466ecbd0b5c6bd2f097a26e071a5c73e09256ac46cc2f794f138f0e0b45e4f65ce70c231c275dc69aa44df408d7d79b15198832
 EBUILD flask-wtf-0.14.2-r1.ebuild 1375 BLAKE2B 413fd63e30135c2febc89379f662c314c7ffcce9cc3a1013ad07fd90a4088626bcc8b5717296e1b81bff0e14104ace4a6ebfb36be5c59d825b8df7230e8540d0 SHA512 ae65bf4d5f17491a29edc19f8688b26b489d2d239d4a808ce0c545f069c47294469b78ef9c8a1cab5fe5676c8c9f49df19f8190707aa50567ee1318b5f1f214d
-EBUILD flask-wtf-0.14.3.ebuild 1029 BLAKE2B db4d88a0915368bd60186c5bd2ff22d3202aa2e205f37a249af58ac36f4f4a7247f015362871420580a7ba39076e1d0bc8ee59011bb947df4bb0773bd388ff82 SHA512 0058c81453abc01de671933fbfac617b70776076c42085a843ea799efa3b425b2f4eb996cab4cb46103ae028eab8fbb89b996565549d1554a9943fc08da8b90a
+EBUILD flask-wtf-0.14.3.ebuild 1028 BLAKE2B 532cc5f12253ccecf24b2264af19416fd755a778e4cfa075e8160ca455fed54b5d6b5b140cfef33b51c8177a609eb8faf789be13d77de7590166dd1765a85470 SHA512 08e5d6b395079edc51a93c3b09a370576f59b5166b4e409dc5027c59e8330e9e3c41873d11300c63ea131ea329b0e38a4aa19227a76028cd10ec7af9e0f9fc65
 MISC metadata.xml 476 BLAKE2B 1f03a8124103425d2987148f9d83bdf1171b343c2025ad453504a020a3271801368aa2ef510c00f1779813336cd56955b40a0225d139bf82d74eb9fa8da8016b SHA512 5e4d7655da5bc99c41c4eab7f182ecc6d24626fad8bf74bc9baf47e6c9f6c692bc3e69f717fb4d7a149c5b097934d13064843a2846988dcb746fb8696257ac61
diff --git a/dev-python/flask-wtf/flask-wtf-0.14.3.ebuild b/dev-python/flask-wtf/flask-wtf-0.14.3.ebuild
index 507179b7af31..49e218201e0f 100644
--- a/dev-python/flask-wtf/flask-wtf-0.14.3.ebuild
+++ b/dev-python/flask-wtf/flask-wtf-0.14.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 MY_PN="Flask-WTF"
diff --git a/dev-python/flexmock/Manifest b/dev-python/flexmock/Manifest
index 5f4f3307cd7f..53f55d5d46b9 100644
--- a/dev-python/flexmock/Manifest
+++ b/dev-python/flexmock/Manifest
@@ -1,3 +1,3 @@
 DIST flexmock-0.10.4.tar.gz 45362 BLAKE2B 4ff79cff3b0d8fb0c97bd60b0d5aa5555a7b939d3d6275a17c9bd1002b1d7acb53d4f63f5f834faf0d349d8b8d429eb063f121c4d7b6d12aa1bb3e7bdbadb861 SHA512 d190fcb66f0c2c4e3be2384d68b95a22c695ffa0fe8f8a218f2baa68c91683641396197cac69ddab21e4b0990b9930f56423bb7cd85770ceade9c22ece72cedc
-EBUILD flexmock-0.10.4.ebuild 625 BLAKE2B de5d6a1fe4b12d464b82e21e18f00256a7ffb86b64569bc0993aa6c08d2df48342ee2ed6eb4782c4536f28e0d94a1491f15766a3ccd0d25db4866cf92d1c8b03 SHA512 244a63e5b77cb05779af6375b84d61348420b19dd02104d0931e4fc326f1b35c260cd7e99131c74702883e60e200c2ec0c069025a311104b329b9e49cb383abc
+EBUILD flexmock-0.10.4.ebuild 624 BLAKE2B 15105692325ac9653ab3587307672f4a65abf44eea9994c5275d7910123f4663d860a5a24268a52e81b01bb4bbeac3ba22e561d715b6a74a8a6d5a30f783bdf6 SHA512 fc38541d00c9daa94307fbb0b26175dd2d3032842ea6fbecf880078c69483111fa58d681e06665f24541dba6d2dc9d97f7d06f254062e77fb8283e039d531c0d
 MISC metadata.xml 603 BLAKE2B 7bc248befb25b5071da321c7ad0cbefb6c57ee6f4fb9870a27c4888dac3239c90cac23a7adb0cfe41f7301edcb453463decf1c1b2be644a5e0c2fac5a41c0c0a SHA512 30088206cc5e7f24858f474160bc646e4744a0ebf14ac39048d5c31cf767da5f97d02559062c1002abba59d0a1ecd08861e52c3d2a29ad6b7e9d1d35c06e96f8
diff --git a/dev-python/flexmock/flexmock-0.10.4.ebuild b/dev-python/flexmock/flexmock-0.10.4.ebuild
index d9be5c143fc8..0597aa309b2c 100644
--- a/dev-python/flexmock/flexmock-0.10.4.ebuild
+++ b/dev-python/flexmock/flexmock-0.10.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/gconf-python/Manifest b/dev-python/gconf-python/Manifest
deleted file mode 100644
index 404d1fbcdffc..000000000000
--- a/dev-python/gconf-python/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-python-2.28.1.tar.bz2 562220 BLAKE2B 9bd14132974b6d42183debfc8f492fcee168a1671dfd27eead7aaa8d5ca12108bcda239b30df87bf41de3a0ab68191f095d63fdad05c151f6204f34f3bf14bdf SHA512 632d91d416f8209c2bc8d576d1229069e00f2cfeedb3441a5f151e12973ed740c0bb26d18d5c16cfeeb64ca35933537997277450001cffd96d8d5077027d45f2
-EBUILD gconf-python-2.28.1-r1.ebuild 565 BLAKE2B 98577b7c34cb6a39f34b821ed3226b4148dbb7d2beef3144853848da1c1a82ef7c3dce2afd337560e301ca41e95b8e8b545ed913081aa3a1a0e2c97e60d5fa0b SHA512 764392d799c3c02bd768490359ec59053c92847aa6e1cafc4ce3e26185c889de530891ded5379cadcc7fed281c980b3129df4410b57faf57aedb08bc0e9039ef
-MISC metadata.xml 346 BLAKE2B 91249958bb5009cfc1acd263df53300b212a94fc654dc245e3f5540816d0260cd1e29d45a82677a5a38b66bb19579f05c8de49663f60c1827deaf71e0fe56504 SHA512 29ed867f32b1dc618689a6347b164ebe291bb061b90302dbfacd0c126a00bbcd7eaadcee11b075cb2c0fbf6e6534725a649a58e49dd1ea23cdd3f73af83ace77
diff --git a/dev-python/gconf-python/gconf-python-2.28.1-r1.ebuild b/dev-python/gconf-python/gconf-python-2.28.1-r1.ebuild
deleted file mode 100644
index d90a5968860b..000000000000
--- a/dev-python/gconf-python/gconf-python-2.28.1-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-GNOME_ORG_MODULE="gnome-python"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome-python-common-r1
-
-DESCRIPTION="Python bindings for the GConf library"
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="examples"
-
-RDEPEND="dev-python/pygobject:2[${PYTHON_USEDEP}]
-	>=gnome-base/gconf-2.11.1
-	!<dev-python/gnome-python-2.22.1"
-DEPEND="${RDEPEND}"
-
-EXAMPLES=( examples/gconf/. )
diff --git a/dev-python/gconf-python/metadata.xml b/dev-python/gconf-python/metadata.xml
deleted file mode 100644
index e4e250dd8100..000000000000
--- a/dev-python/gconf-python/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>python@gentoo.org</email>
-	<name>Python</name>
-</maintainer>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-python/gnome-python-base/Manifest b/dev-python/gnome-python-base/Manifest
deleted file mode 100644
index 16116ba8378b..000000000000
--- a/dev-python/gnome-python-base/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-python-2.28.1.tar.bz2 562220 BLAKE2B 9bd14132974b6d42183debfc8f492fcee168a1671dfd27eead7aaa8d5ca12108bcda239b30df87bf41de3a0ab68191f095d63fdad05c151f6204f34f3bf14bdf SHA512 632d91d416f8209c2bc8d576d1229069e00f2cfeedb3441a5f151e12973ed740c0bb26d18d5c16cfeeb64ca35933537997277450001cffd96d8d5077027d45f2
-EBUILD gnome-python-base-2.28.1-r1.ebuild 1122 BLAKE2B e2d232d836e324efb634df51a8cf9372c605198d9b43eeeb8e28b9100d164f3131651c3fbfcc58a4316b62076e2cec369d8becf58dff8247cb9350aa01d69522 SHA512 129b36b03a50e87ab339fa5a5d67208f6add3ddb191b771d1db394e985f5b30da523e9e5cff6c4131e1a564c24e43060c93cfb5b71f7e0d7d2b3d2b418411add
-MISC metadata.xml 346 BLAKE2B 91249958bb5009cfc1acd263df53300b212a94fc654dc245e3f5540816d0260cd1e29d45a82677a5a38b66bb19579f05c8de49663f60c1827deaf71e0fe56504 SHA512 29ed867f32b1dc618689a6347b164ebe291bb061b90302dbfacd0c126a00bbcd7eaadcee11b075cb2c0fbf6e6534725a649a58e49dd1ea23cdd3f73af83ace77
diff --git a/dev-python/gnome-python-base/gnome-python-base-2.28.1-r1.ebuild b/dev-python/gnome-python-base/gnome-python-base-2.28.1-r1.ebuild
deleted file mode 100644
index dc93502945e4..000000000000
--- a/dev-python/gnome-python-base/gnome-python-base-2.28.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator eutils gnome2 python-r1
-
-# This ebuild does nothing -- we just want to get the pkgconfig file installed
-
-MY_PN="gnome-python"
-DESCRIPTION="Provides the base files for the gnome-python bindings"
-HOMEPAGE="http://pygtk.org/"
-PVP="$(get_version_component_range 1-2)"
-SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP}/${MY_PN}-${PV}.tar.bz2"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-LICENSE="LGPL-2.1"
-SLOT="2"
-RESTRICT="${RESTRICT} test"
-
-# From the gnome-python eclass
-RDEPEND=">=x11-libs/gtk+-2.6:2
-	>=dev-libs/glib-2.6:2
-	${PYTHON_DEPS}
-	>=dev-python/pygtk-2.14.0:2[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-2.17:2[${PYTHON_USEDEP}]
-	!<dev-python/gnome-python-2.22.1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	python_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-allbindings
-}
diff --git a/dev-python/gnome-python-base/metadata.xml b/dev-python/gnome-python-base/metadata.xml
deleted file mode 100644
index e4e250dd8100..000000000000
--- a/dev-python/gnome-python-base/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>python@gentoo.org</email>
-	<name>Python</name>
-</maintainer>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest
index 9df61cb7cd5b..4c1d4451274e 100644
--- a/dev-python/gst-python/Manifest
+++ b/dev-python/gst-python/Manifest
@@ -2,5 +2,5 @@ AUX 1.16.2-python3.8.patch 1400 BLAKE2B 67e870a837f8fe2a2b7a5cc38ed0528a1afc5603
 DIST gst-python-1.14.1.tar.xz 405312 BLAKE2B 29be6f79b20a27e0d21f27cbf29b1881216e412c3c4ea016f3ee6bd921ec7b73139f74a20528f7f704526786347b065d246940f152d61a64e4eb926dbb44bb87 SHA512 32537e6556b69d00cb0b467239c148c0b9c282b76786be395e053a30554b84aea7c22e7fe6fc6faf77b35fca82fb799df4f52c114b282d0a6ea660f67dc40c53
 DIST gst-python-1.16.2.tar.xz 414912 BLAKE2B 016e59fc7d29047dcf49901d4ccb1ff2e96950dc723cd7e9dd31e0fe92257e881ced1c93e7e4e531320be8fb9d6cb8382d2c31e460448d5d630ec7c8a0378024 SHA512 c274591cb820a2576ca236de0d1a2c2c53a9db11afc689e0385afe3d38fadc59c9230d65198e79e4059abb90c0e5b6d71f1ee4cf1439d92feaaffd2ab5cd3a23
 EBUILD gst-python-1.14.1-r1.ebuild 1747 BLAKE2B 3c562186e3f902f20a05fb3e3dba066481ba7dbca29c727544188a4b478edc7e0a5f24de9b5e1ecdad1d886eaecf58b408985d85c272effce77b7bae1ea7d201 SHA512 ff68669724389d6e7ba1f93b44f5ab7487950b1ae26fd1bef6c9f923dbeed1de4902458112e80827c56d66d7522aed5da1f8ed2acb34a7d9898e7f52ea5686d3
-EBUILD gst-python-1.16.2.ebuild 1616 BLAKE2B f4e4a1a1cfc015ea6b1737a7059495ecd844fc261002b5c7d34aaa4852f23b236ba91375411aec39d4691117987f716b73e36c99ce4c4f929e8eb934d1c810c6 SHA512 85cbb09d1aa8ae49f9f8c0bd86007b8db3bd2982aa8a75068ae16ff7ab01a5c9a9aa35daa0bac937d4c14b9118ca8e122b09bbb1b7c989183b26f9417bf574e8
+EBUILD gst-python-1.16.2.ebuild 1615 BLAKE2B 2e9ce0f435b47537d2b09d4775d1af501cb281d1492e7fc72b127c96b2a13d93e22dfe6a83340a4c108586b8ae8f50961ab7d96840c1f19af57566a417e9d5b2 SHA512 e466fbe838b709abdeda2ab586a3c8fc281f7e2dcc726b56177d72511843e4f40968fafb5ca8461d2051e25e9e0b33d0e0081d5b66b9cae756b1cc979a414ef6
 MISC metadata.xml 272 BLAKE2B b1575d88177572e472e66c7cce4fb4c0d98aeb02edb03e800c2b2f2702b5c81c6c012c264655fce8c3170e44bfa117c81b85cdbb9f409714ab216c7a6f2b4482 SHA512 7dffa3bd729f24f9081f6b1c3db474cb26c54e95752a37140c5a9836299f26b3d0aa73e7c448e6b773478cb0112eaaf70f783d2b2f3d2868b1a2def8e6a9b8ea
diff --git a/dev-python/gst-python/gst-python-1.16.2.ebuild b/dev-python/gst-python/gst-python-1.16.2.ebuild
index d449b2151e04..34902abc4db6 100644
--- a/dev-python/gst-python/gst-python-1.16.2.ebuild
+++ b/dev-python/gst-python/gst-python-1.16.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/html5lib/Manifest b/dev-python/html5lib/Manifest
index 823bd5338b1b..557054fec7ec 100644
--- a/dev-python/html5lib/Manifest
+++ b/dev-python/html5lib/Manifest
@@ -1,5 +1,7 @@
 AUX html5lib-1.0.1-collections-abc.patch 1336 BLAKE2B 2b626d56830ff818168ca5b0fa272290e787a700c12b5295e085c0092dbe0746df1336f550573f1960bc0cb911d0639cbeb06a011a9bbeb3b2e42fcbe99e6bef SHA512 ad959536b627984948b984b700758a1e61d7f2e145a920d4020d23e7ff15fe88b31a3569c441df39122ffbedf2a1dfebf17fb00c3194c6ceb69a00f412622ecf
 AUX html5lib-python-1.0.1-support-pytest4.patch 13579 BLAKE2B 723c8a77f2008978378c54a889cdd3cc28f33993d16654dff6ad7dbff69a42dcdef7c3cbd57677c88bec9650fdccdd754b488c956146168290661090a4702c9e SHA512 51435c4094fa0e0c423e21c15709e5ebe10546cbea3ac97635c3d1ebef9287d6c42a479075cc790ccf233c67924a518638d6618f073df2b0871da3fb2838e10e
 DIST html5lib-1.0.1.tar.gz 252959 BLAKE2B d2a9fa19d6a18b9e0c39f737a22ff4d5a6533734843f787c083f9497fd94788dad0e1e96478fe48b262c208370cf58e91ab94cc06a3e2757a40e936363cd3148 SHA512 35939b4450893864da04e735ee5e0addacf1dd34bae6a6909c76572abf6bfded446a78a713dfde91c1485ba45867d7abeb6a45cf0545c16ea968707be7de5dd2
+DIST html5lib-1.1.tar.gz 272215 BLAKE2B 11a4fc3fb84bf8bab4af5da1de30b0892a9eb454505716b3db391187053c9aac159b1c82ae787896592b8fc850363bba9313b9d7fc617150771c3bfa1aeadefb SHA512 af7c29591007fded99be6c38e3d0ae5a4ac32d71d26046a615918ae732cb1c1ecbf754f47ceca1a53726c3843f3ecea7af87a7362281b45ff3af495815818626
 EBUILD html5lib-1.0.1-r2.ebuild 1006 BLAKE2B 7eeaa358a6864e61b9e9f99749d9ce0672fbce54142c36b24e8168fab3eb930f83ef9e763a225a0cf5a3707b5547d7b873c7ae4f21a9ddc4ab9f74f73e4c62fd SHA512 abe0b8cd95828e7e7e7308da3dfc512e4f25a01b19f4b48116f2c261b18a837411d8f9f9011b52f5ac55609c17e8a03704c0d7ef0dbaa1ac8fbec5a311cc2de4
+EBUILD html5lib-1.1.ebuild 810 BLAKE2B eb172bdbf08f5b9fa1e47cf62d8f8c95bb97280fcb300ed018582d8874e344bce06ad3b088be1a9407cd61c2a907e4adb42cdcfba6bd1ae38b9d72564ebcf786 SHA512 b952e9042a8ae86fa3c36423b373a7a4f8c95770f7e884f0df1878178b8676d05a1860ac515dbb2040d6469112093d440d70d38814f5a3f025fa9986e7a45284
 MISC metadata.xml 614 BLAKE2B 09fb1e4c136770b5e53aecf3af9681c9155bad58e2720e6e1af9aa8d5b44c184a48bbe0d204f8af0d3e61ddf9d3b60f19ae0034d6e66b4f8683fdf7e8ecd919f SHA512 1cd9bdc5fbbedc67023c31d24901c873a9d644b8dc4f26bb5b19eda8f0fe25c413b9bf0e2b52f7e73517d744d5757881cd26bd939c39eea748dd2f84c25d983b
diff --git a/dev-python/html5lib/html5lib-1.1.ebuild b/dev-python/html5lib/html5lib-1.1.ebuild
new file mode 100644
index 000000000000..16f72f8d42f7
--- /dev/null
+++ b/dev-python/html5lib/html5lib-1.1.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=( python{2_7,3_{6,7,8,9}} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTML parser based on the HTML5 specification"
+HOMEPAGE="https://github.com/html5lib/html5lib-python/ https://html5lib.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT+=" !test? ( test )"
+
+RDEPEND=">=dev-python/six-1.9[${PYTHON_USEDEP}]
+	dev-python/webencodings[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest-expect[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index 67dd499e32ae..37309094fce4 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,5 +1,7 @@
 DIST humanize-0.5.1.tar.gz 20507 BLAKE2B 55d7b598b32658b1d4c4741b37b5c33bdc9d63a5a779455e2fb93e1e4c3a0d8fd58e8522ef82734e1ba2b161fd881829373ba3569baffd9ea3271ad7ed3e7568 SHA512 dd7ad7f3c564cc6abcb6b128e50dbea7f19f7f418bfd936aae2472961c53ec71202133c5c2b5b930ef41ef807b51d6ba1210565627ed32c0b41acc0abd32a2d5
 DIST humanize-2.4.0.tar.gz 46489 BLAKE2B bb2cfeebd25f4aa073539bb616a5d05db2827dd2aaa6f093d46b51415ef3b954918a45f2434b9ce41845389be986200e23b1cb752e8a0bd03649377ea46fbec6 SHA512 20707a59f2f0bbc52e1e5d906e733561f53c3bc429ce24662ea9014d7f73f87a8f3ae9aa62f2564fafbe9de0d6b250e8fecec4a3cb81968c5b24d61ad9627d1b
+DIST humanize-2.4.1.tar.gz 46827 BLAKE2B e9b37283c5a4db1c5b2a9ef61919fe02a4e5720711129910e51b0b3481290c9bfa4e29225db75c37d83884c00065fa71b599ed42fac41414f481167d33091a98 SHA512 5d8534d2e97f375c7ec065dd239334a2a5da9d058f7c0312cb2683c3e42f5b8f99e117782e0888a6e5348f43958523df6609c294f5af7c971d81bd29679a0500
 EBUILD humanize-0.5.1.ebuild 877 BLAKE2B 53fe455e34cd55b205a800b213325e0d49fc5a34def7492befa0c85494ce456f1fb9cbbb9266933d3c53e88f5cfe46df1b5782b6ff64d1f0f926e34dee79ff6d SHA512 c654f8f6343dc8f481adbe71aadc5daeb01f7375d3fe995f59b71989620cb4fea377f4f1c918bff6461b794f6216bdf224bb43d023c6ea46dc306e1c21d525bd
 EBUILD humanize-2.4.0.ebuild 893 BLAKE2B a0353beecd55a641a35a578cfdb0d793733db71e55331cfca3bce3bd670b688845ed49f663348f605c817605cd9df25361db4da509166aa0d3a2ee9f3cb402e6 SHA512 e7810411998ee048f6be2007843c5edce290323f0e3b81f1ecb12335bc14b1ac1a015b170782c9c5924e3e73987827c74f78febe0f08fbef642bad3975e5062c
+EBUILD humanize-2.4.1.ebuild 893 BLAKE2B a0353beecd55a641a35a578cfdb0d793733db71e55331cfca3bce3bd670b688845ed49f663348f605c817605cd9df25361db4da509166aa0d3a2ee9f3cb402e6 SHA512 e7810411998ee048f6be2007843c5edce290323f0e3b81f1ecb12335bc14b1ac1a015b170782c9c5924e3e73987827c74f78febe0f08fbef642bad3975e5062c
 MISC metadata.xml 537 BLAKE2B 7b1184cce1bc82ce4a25986a86b6652a4504f3655f7d5eeba66f861230670988055c30523b64d1bcd889976f4b18299fd90e326f49eafd24c0e53b13e33bc59d SHA512 d72a8d89642dae3925593e9692108fef34a177937fa48823cecac9ecd1869a6dafdad73e1397a6a337b3517185c049ddc287eebaf0dde992b31f700ee9512fa6
diff --git a/dev-python/humanize/humanize-2.4.1.ebuild b/dev-python/humanize/humanize-2.4.1.ebuild
new file mode 100644
index 000000000000..4785489816a4
--- /dev/null
+++ b/dev-python/humanize/humanize-2.4.1.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} )
+# The package uses pkg_resources to determine its version
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Common humanization utilities"
+HOMEPAGE="https://github.com/jmoiron/humanize/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	# The package uses pkg_resources to determine its version
+	distutils_install_for_testing
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 44a9f17e507c..f71bb86c08c4 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -7,6 +7,10 @@ DIST hypothesis-python-5.15.1.tar.gz 9010924 BLAKE2B a00ebf581781e47fd85fa9d5044
 DIST hypothesis-python-5.16.0.tar.gz 9011031 BLAKE2B 65659f72094ac7fcc82c7e5a8b88c0156345530742412f13398dc72ce50d2466fa9b04b5cf4a79e87916aae770f2a89aa880d1d238890c7f8c8483c4c5068bcb SHA512 66366c172aaed84f1fb5fe0cef4e0fccfa4f65c31a94d52cf3a49b44b535f8366e71974f2aaa7b39d1d1b4171fd92cbfe4bbbac8ec4b9c4ccd2b0e5d15976d26
 DIST hypothesis-python-5.16.1.tar.gz 9011388 BLAKE2B 9d80cd296475846404ded5c466ee50f11957959f08a94a715f80e732da83bc31b66a2bbff2bb4ac1402dbeddda219eada772267f34705b8891137b8d910e5229 SHA512 ea1416c041c857fc184fcce10862d93fce1de888396527d120b2d5f3cd041084d85f8ab4b36693d52786c7162bf41d61c9700ebc4509902c6fcd1c2e87130dfb
 DIST hypothesis-python-5.16.2.tar.gz 9011495 BLAKE2B ecac1ddd0c214a06e8822fc04f9fd9378933b1c3721c1a3aabfa605d45df21b22b76a497f5fa1bef3009ceba52d582c9f69a0918fdcaf7df7b3c03405f8eb7a9 SHA512 91feb7b81c4c36468b05318c0db7ce3b607374b55bf2609bb587d316448f087fab44b99cde1cb5fc440df8d31ef2dd6c154281f13dd7bc6d1de4e463cdabf66a
+DIST hypothesis-python-5.16.3.tar.gz 9011952 BLAKE2B d74a68c4ee1e5aacf4be1da5a4656011b0a15f990106c21298101d36e9a097c5dfd165987ad90a45f3a0b74375c4da609cd750f618242b94f34e03b6de0ee866 SHA512 912d984995d4ad8f06e98eb2cc327629328990fc1c072527ce261b637e16622acaf4d0d93928f9dd2d6601ab78f69aa6cf129d5cd7c1c00e50754ebc06957df0
+DIST hypothesis-python-5.18.0.tar.gz 9013356 BLAKE2B 3863414e54e40ac5f2a45edbb57fbee058e82f04cbde9eadb99ed6b03a2a2684777b46eabdbe136aea74b835e343485d80cfe98c263afa537c7437e7566f796f SHA512 b1a1f37f1f58a6401a31f32ef0e7de452b8a8bd71fe5aeb72eeac197a23b78c3ff17b61f7940e2a2a755f7f008f0ea3df5b0f2ad5e4c0d2d316bf13dbd7cbdaf
+DIST hypothesis-python-5.18.1.tar.gz 9013452 BLAKE2B a513c19a19b3ff49c78d97839dea7d857d9a00f7d42e5e0376cd6fec9ff9a86f9b6b9471da474ec7724e41254105c0ac65fc7d772f01bfc40f6deda200f11629 SHA512 19455699ed50d30767edc5627f797992f2542aeb3ca9e38603a68ffe1108f0287baa183e4dca101f21eaea6c7c7501e135b5baf9e09117a2cae92ec1e437e8b5
+DIST hypothesis-python-5.18.3.tar.gz 9017453 BLAKE2B 85356e723fca66853e388a4a3e791dd4b1cfb80b7a4b62363a4f0d0aeffc44c051eeabd516eebd5737a96050edef978a87788c1141f87aa2e310eda9bf64a0a7 SHA512 baeb4644a90fd8694d88819a46ba1ea6c60ad13e00f07cb923a3d0f43cd4b4d61bd07bf25e45e6d1203f9db44fbe8ec7eca7e029c804659025df89a80520e550
 EBUILD hypothesis-4.50.8.ebuild 1712 BLAKE2B 95c6f8df5214b00e6c9be409c708e756024fd76ec0f56da54d92f417a26da4c912c3b20c1af086e26d3db594583bb5c9c6a8ae5ea90077d5f22dcd8c17e2da9a SHA512 0ad845bff356a4746ad94df6ae7f082ff93aa18053228622d282c244a36ffad5f167345e3a880c6611376a427e07d935c3613631b69453cd71fc3c4ae6fe4c83
 EBUILD hypothesis-4.57.1.ebuild 1835 BLAKE2B e78e8aad70d73ab036ec275cfe0a59c7ba38eafabf3e6a8273fc3a0ec88a8ae60f685d302963eea9e4e5d00c8e4b5ca05f3b5fbaeee3c822979eed460a7e0f83 SHA512 4d3ac5f3919ffac5cb5dbd134d939d71493b2fb9e8414b43185336e78a4d4a62f74c829efa512e32440ac4892e2857611f5dd1d076dd8469a477fc132e0d5834
 EBUILD hypothesis-5.11.0.ebuild 1586 BLAKE2B a4e4cf374d2432c1715b94be5690069ee808156a7fe0e6c5631068002162753ae7c3da70d875809f80c9b8be43beb586f70715c5c101f7617ad57fda5c663ced SHA512 a0b3faf6e5749ea1f20cc4ef20cc98a30ea916268bca4137707b84ee54e0c0501c32eb5e4f747a85f3fec8e5f50daf593bf0c6fdd803439d5061d84cc065d9c0
@@ -16,4 +20,8 @@ EBUILD hypothesis-5.15.1.ebuild 1595 BLAKE2B 6fbaf4b3a84adbfc6eb1251ba1df555904e
 EBUILD hypothesis-5.16.0.ebuild 1607 BLAKE2B e4035d40cafe12f01cc6c64381bdf1f9621c89064ea4a1979b376bdb82d60bca8faf68bfa27e2c764219eaa432b36de64de4f3b98090e4bd5b855b37570fe9b9 SHA512 d3af8aca80250ab9338310fe822553364dc8117146d5b791789ddd83a1ecd99e0c1476d99fa9f23bebc53d048d18899871fc3aa82c5e5216d5ec5628327e602f
 EBUILD hypothesis-5.16.1.ebuild 1607 BLAKE2B e4035d40cafe12f01cc6c64381bdf1f9621c89064ea4a1979b376bdb82d60bca8faf68bfa27e2c764219eaa432b36de64de4f3b98090e4bd5b855b37570fe9b9 SHA512 d3af8aca80250ab9338310fe822553364dc8117146d5b791789ddd83a1ecd99e0c1476d99fa9f23bebc53d048d18899871fc3aa82c5e5216d5ec5628327e602f
 EBUILD hypothesis-5.16.2.ebuild 1607 BLAKE2B e4035d40cafe12f01cc6c64381bdf1f9621c89064ea4a1979b376bdb82d60bca8faf68bfa27e2c764219eaa432b36de64de4f3b98090e4bd5b855b37570fe9b9 SHA512 d3af8aca80250ab9338310fe822553364dc8117146d5b791789ddd83a1ecd99e0c1476d99fa9f23bebc53d048d18899871fc3aa82c5e5216d5ec5628327e602f
+EBUILD hypothesis-5.16.3.ebuild 1607 BLAKE2B e4035d40cafe12f01cc6c64381bdf1f9621c89064ea4a1979b376bdb82d60bca8faf68bfa27e2c764219eaa432b36de64de4f3b98090e4bd5b855b37570fe9b9 SHA512 d3af8aca80250ab9338310fe822553364dc8117146d5b791789ddd83a1ecd99e0c1476d99fa9f23bebc53d048d18899871fc3aa82c5e5216d5ec5628327e602f
+EBUILD hypothesis-5.18.0.ebuild 1607 BLAKE2B e4035d40cafe12f01cc6c64381bdf1f9621c89064ea4a1979b376bdb82d60bca8faf68bfa27e2c764219eaa432b36de64de4f3b98090e4bd5b855b37570fe9b9 SHA512 d3af8aca80250ab9338310fe822553364dc8117146d5b791789ddd83a1ecd99e0c1476d99fa9f23bebc53d048d18899871fc3aa82c5e5216d5ec5628327e602f
+EBUILD hypothesis-5.18.1.ebuild 1607 BLAKE2B e4035d40cafe12f01cc6c64381bdf1f9621c89064ea4a1979b376bdb82d60bca8faf68bfa27e2c764219eaa432b36de64de4f3b98090e4bd5b855b37570fe9b9 SHA512 d3af8aca80250ab9338310fe822553364dc8117146d5b791789ddd83a1ecd99e0c1476d99fa9f23bebc53d048d18899871fc3aa82c5e5216d5ec5628327e602f
+EBUILD hypothesis-5.18.3.ebuild 1607 BLAKE2B e4035d40cafe12f01cc6c64381bdf1f9621c89064ea4a1979b376bdb82d60bca8faf68bfa27e2c764219eaa432b36de64de4f3b98090e4bd5b855b37570fe9b9 SHA512 d3af8aca80250ab9338310fe822553364dc8117146d5b791789ddd83a1ecd99e0c1476d99fa9f23bebc53d048d18899871fc3aa82c5e5216d5ec5628327e602f
 MISC metadata.xml 643 BLAKE2B f8871008e348f0d703ddbee0ce13928f14800f3c10a9f440e9afaa881ee8eb916aed20112469a40d6f7bd899848aa70a36de1d857374fd32fa6b127888be0cb2 SHA512 618ee045f44c096c6402a549ac2ec3abbff25aa76e511c326f8a8ea470bb33a1e5cb1bb1b7b4e149c911ccbd08f69ff72b99edcd92fe9e1237055515b19bd514
diff --git a/dev-python/hypothesis/hypothesis-5.16.3.ebuild b/dev-python/hypothesis/hypothesis-5.16.3.ebuild
new file mode 100644
index 000000000000..494668bd6a8e
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.16.3.ebuild
@@ -0,0 +1,56 @@
+# 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,9} 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"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+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() {
+	pytest -vv tests/cover tests/pytest tests/quality ||
+		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-5.18.0.ebuild b/dev-python/hypothesis/hypothesis-5.18.0.ebuild
new file mode 100644
index 000000000000..494668bd6a8e
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.18.0.ebuild
@@ -0,0 +1,56 @@
+# 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,9} 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"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+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() {
+	pytest -vv tests/cover tests/pytest tests/quality ||
+		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-5.18.1.ebuild b/dev-python/hypothesis/hypothesis-5.18.1.ebuild
new file mode 100644
index 000000000000..494668bd6a8e
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.18.1.ebuild
@@ -0,0 +1,56 @@
+# 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,9} 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"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+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() {
+	pytest -vv tests/cover tests/pytest tests/quality ||
+		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-5.18.3.ebuild b/dev-python/hypothesis/hypothesis-5.18.3.ebuild
new file mode 100644
index 000000000000..494668bd6a8e
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.18.3.ebuild
@@ -0,0 +1,56 @@
+# 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,9} 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"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+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() {
+	pytest -vv tests/cover tests/pytest tests/quality ||
+		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/idna/Manifest b/dev-python/idna/Manifest
index f277afe05781..69525748682d 100644
--- a/dev-python/idna/Manifest
+++ b/dev-python/idna/Manifest
@@ -1,5 +1,7 @@
+DIST idna-2.10.tar.gz 175616 BLAKE2B 2b109491a5751811e6e85244133a1c66b04b577441c250e600a9cb58511f4a0350f9dc386c64ce40464bf644c7434187c61e747c8e9a422443a740ebb766fe22 SHA512 83b412de2f79a4bc86fb4bdac7252521b9d84f0be54f4fb1bde1ee13a210bbfa4b1a98247affbc7921046fb117a591316c12694c1be72865767646554c5207ac
 DIST idna-2.8.tar.gz 174481 BLAKE2B 68e5dddaae30097522e4e661438d7f89a391c5a0e2f72a99e1da88e0af9380f15958d5315fccb4221e7d44a6390a7b0daa537a4752c26cd915bf2d433a4f7cc4 SHA512 8ca5cfe6350c51250bafdac7c6e4ddd54c4a5d6bf7acbcef896760a759868c8e9df1fdf550121d8512fa3eb316dcf031ec6058e03b4f66eadee21b63e2187d33
 DIST idna-2.9.tar.gz 175042 BLAKE2B d111bec6c5682321967818aa3fb828d1f7bc5c056e8c7418589a7b1f9e125aadfd21c6c3329a93b894977c41ad258c4bd38db166b85c1f85c52ca2f0b5acb242 SHA512 2bd3fdae46fe7045640912872b0a3955de3abce62fd222b16ea2c997a04755acc834eeb645e5610d621c176d4b963e1d4a71228fba14efad54999cdf3c02eaf4
+EBUILD idna-2.10.ebuild 650 BLAKE2B b1b8ae78c2afc7f5d7d4a33da9cfbbac6c4bbda198bea4ee0d3f175dfef0f5e92141e373d5324322bc75a6de02c975f9bf16f45d0391bde9db5d05c7b571a4c4 SHA512 e0c3b77a5f02c1e706b04fb3827ab6d5f1901f2516f93c2b5d15c12fdc34451f1024c27346e852f9159196385944586ebcfe8aac9f9cf46f7605b0ef4b9d2b07
 EBUILD idna-2.8.ebuild 691 BLAKE2B af17b44ed061c888ebcd1af6693d658403ba1c6eea0bea1e7e76036f9f4c013c8f2fb32f7fddba1f5ed049d5c9e04aab58fbf93aed74a34278fc905770aaf381 SHA512 7d32611ae1725f8eb2443aadaa9c23f5ed8e72fce06db75baf20098ec4f485104cba4e726748321d6f2b909cbd5b4bc6e10b8c08ad8bdb4931eafaaaf1d540b2
 EBUILD idna-2.9.ebuild 650 BLAKE2B b1b8ae78c2afc7f5d7d4a33da9cfbbac6c4bbda198bea4ee0d3f175dfef0f5e92141e373d5324322bc75a6de02c975f9bf16f45d0391bde9db5d05c7b571a4c4 SHA512 e0c3b77a5f02c1e706b04fb3827ab6d5f1901f2516f93c2b5d15c12fdc34451f1024c27346e852f9159196385944586ebcfe8aac9f9cf46f7605b0ef4b9d2b07
 MISC metadata.xml 367 BLAKE2B 363038f61cdb96780faecfb8c92d97d0cea8146d37374a731daa9618150b3f41c0bad724619d7bb353141834df9fcb88f075ece91a742ccca2da1621e5b8e2fc SHA512 50f13044fec18651463e6199826a39c7f28c783e7da389017e2dc2fd6f17b6c93e4e437a1019e0e31605a06a428c31a2fbc12744daa957cefbba2d76b511331e
diff --git a/dev-python/idna/idna-2.10.ebuild b/dev-python/idna/idna-2.10.ebuild
new file mode 100644
index 000000000000..4a4a7f4a56eb
--- /dev/null
+++ b/dev-python/idna/idna-2.10.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,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Internationalized Domain Names in Applications (IDNA)"
+HOMEPAGE="https://github.com/kjd/idna https://pypi.org/project/idna/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+distutils_enable_tests setup.py
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 93c2f1d11294..7f227f81f333 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -2,8 +2,10 @@ DIST importlib_metadata-1.4.0.tar.gz 26380 BLAKE2B b185183b5a71b822f068856a4b1af
 DIST importlib_metadata-1.5.0.tar.gz 26738 BLAKE2B b2ccc2244a2b9e0d384a22e0805d2a9931a3412afba98246692bc7a10684c9e1cc8435529461d45cd6d0b75c81a75c028b9269860d5de6cd376c70ad30700eed SHA512 074bc38df2a1b20dac62d88e209b2730cc56f8a8bb7f7b99bf766028f602700733448e7cb4d22ea099be38cfc9484ff6a235a46c6c114c3d70883393eeef3aa0
 DIST importlib_metadata-1.6.0.tar.gz 27136 BLAKE2B 55a987a75c78ff39fc5ac5d586cc7b7f9e7340edce505387be22cb291b53dec87e4f362bdb3f9a13f2797b6806f783b3cf0858c9db298266379f706402a43331 SHA512 4108d84a39da3c892a3b448027cca2835f6a68ac790b51b7cc4eb4ec925f5e8322847d86d8e89fbcec474258f592220f283116c82c536130aab70b96cea0435c
 DIST importlib_metadata-1.6.1.tar.gz 29039 BLAKE2B b193afecae1458b0d82fad0fe00878c17f8fa279d8eb43ec80d189d3f33b217fb376023c92be70027579484bbbc9ef949ca75f19660a40275d96ef88e1f2aaf9 SHA512 f5537d80bb72cfd97269e2d83b059fe1085e41ce9cc7eaac30abc819dae4b118bdfd2d17989b693c05f0084b2bb86f73837788087915c94724e8e5344752b626
+DIST importlib_metadata-1.7.0.tar.gz 29233 BLAKE2B a8cd97a384ab06201025fcbdc401fb25788c2eb1dd4f1697ca00e79634cbce32b984cb8a7c2aeacfb0871f92857d08f3ce9c3ae43d698df7401db91add07b6ca SHA512 31f7cda6a1149ca2040032945b19b55d2e97ef8be67db1423c2c2cbb79da3dead46338f3c9eb03b46f9202fca08ed7bf388adc25d34903ddff4b2873c8a89aba
 EBUILD importlib_metadata-1.4.0.ebuild 1071 BLAKE2B 13d171a070a2b9c48a96c33e869a2efcc549cf1bcc137066fed60132dff4f557f4b856680f9b0b999464bcc1899608e039fb159e15ea2a53c9b9217995863018 SHA512 e5af262c03a8376c09581f1b17a35a712de9d82e8397db067db7415f73242fef147f490bb2bcab5b108bfd3a7e676a14ec5490e018d9d16010be9dab53c4013a
 EBUILD importlib_metadata-1.5.0.ebuild 1108 BLAKE2B 2bfdc004450287617f23b183ac7bb52b46463b1894ad761294b2200d0de8244e00481372b7c5ba1fd3ea0472dcb1304bb29390f43b9d02ef07a44901f05dfd62 SHA512 267ad2f36025556162b81e3465b7eaf3baf383a06928b4799e044a309698c5e4196c0cd2483245fc45ee6d16fa930a1607789077fc1213b05826463a6363e828
 EBUILD importlib_metadata-1.6.0-r1.ebuild 1229 BLAKE2B 3672433212a43e40b6d7021586e6f6a09954a6a38b785463ab39fb56612faf05952100afd7b9c79e991f303c505b6deee6bf0013a9e2861e53c7bae36e575df1 SHA512 55abc3d9561efcbce67f47cca55458b268faa147c468ff788a84d263bd5e3f20eef3ea607577418b382c3dc0ac596d16871283617d327d5bc67f9b0a2126506d
-EBUILD importlib_metadata-1.6.1.ebuild 1341 BLAKE2B 8ca0bea280ab637940922dba9477f95ef9885a35ae0e56502e93a70f1eb4ffc760fca26d02ee58e827ce8d29e735ee39ce9cdd14a4d4e81402c924e61ce2d6e5 SHA512 741f7efedb7fa390e2ffc6fe70c827eee7105fbc81a10f4c48e6d3040a0e683a17fb187559b155b1fedc0bc5995a62f9e9d85e5d4285e398b3b43b3bdbff436d
+EBUILD importlib_metadata-1.6.1.ebuild 1348 BLAKE2B 71fc748ea9c04ecfb4502e07d8c209c92ce779f7775b56881474ab278e27eb94faced2c9bf32cf1e4462503341125546f0b985739da0dad2225454fb94424544 SHA512 9831f6baa508bb87d7ddeb3b675633d423106acce24e7a9d5858dcc71c80605bd7fe16d82755a5f6c435fde54f4d6372080896a14b4371f8834f8bfd585c217b
+EBUILD importlib_metadata-1.7.0.ebuild 1348 BLAKE2B 71fc748ea9c04ecfb4502e07d8c209c92ce779f7775b56881474ab278e27eb94faced2c9bf32cf1e4462503341125546f0b985739da0dad2225454fb94424544 SHA512 9831f6baa508bb87d7ddeb3b675633d423106acce24e7a9d5858dcc71c80605bd7fe16d82755a5f6c435fde54f4d6372080896a14b4371f8834f8bfd585c217b
 MISC metadata.xml 575 BLAKE2B fd32bd69ffa26679f44ae19012bf57e77219abea01918062e2290e48121209353d5a50eb2aa028ca8359b3c8f40a35c1cc4c48e2f05cb855a3016f2f01da41f2 SHA512 fdb2a87b50b50fd23d97c7dd9875958ad9ae6474f6e0a0e5fb8df12ed381c30e21a71ae2eaf3baf03ae1ab973c0c7827c8a84fa09c8ca52eb938439e4f66e17d
diff --git a/dev-python/importlib_metadata/importlib_metadata-1.6.1.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.6.1.ebuild
index 2dd30d987f03..0982cef9a7c3 100644
--- a/dev-python/importlib_metadata/importlib_metadata-1.6.1.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-1.6.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/zipp[${PYTHON_USEDEP}]
diff --git a/dev-python/importlib_metadata/importlib_metadata-1.7.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.7.0.ebuild
new file mode 100644
index 000000000000..0982cef9a7c3
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-1.7.0.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=( pypy3 python{2_7,3_{6,7,8}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="https://importlib-metadata.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/zipp[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/configparser-3.5[${PYTHON_USEDEP}]' -2)
+	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' -2)
+	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep '
+			>=dev-python/importlib_resources-1.3.0[${PYTHON_USEDEP}]
+		' pypy3 python{2_7,3_{6,7,8}})
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx "${PN}/docs" \
+	'>=dev-python/rst-linker-1.9'
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# remove dep on setuptools_scm
+	sed -i -r "s:use_scm_version=.+,:version='${PV}',:" \
+		setup.py || die
+	sed -i -e 's:setuptools-scm::' setup.cfg || die
+	sed -e 's:test_find_local:_&:' \
+		-i importlib_metadata/tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 2ef85ebd5197..dd5bf20959c8 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,6 +1,8 @@
 AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
 DIST ipython-7.15.0.tar.gz 5245923 BLAKE2B 36c9712c72a38e918403cdc91fc098904282a48faed3e7faf03a1791356d09b9953c080b1b6f73b958713984748ee8af6d586956ccdad3ddadc60292cefd6d83 SHA512 46b09a8b6e5611d7b11b26aac475e7b823b00653ea6a3bf1a66d294cef22762b38e63c79f1e4e9bea0fe3e6423b058a2a692dc544c082dca37b9bb91c816cd22
+DIST ipython-7.16.1.tar.gz 5136303 BLAKE2B 9baf42c9befa50d78eec29d012aeae7f01886f29642a01845afd4a96d0efb7a4df5b14b68aeeb22d1d621e5427b219f717688a1d5074a6e70ad0509c7ca73a46 SHA512 60259fd6270b0355be67b4f620a58b56ae86e69e14debe2df86df6118548f2290ab3927b8dfab20db1ebd675df697d05eb6994b93625a7b8b6ea07112ddf63bd
 DIST ipython-7.5.0.tar.gz 5118610 BLAKE2B 3f89babc292ea55724c2333076a673ef7fcd0a7a468e972a50c962194a71a0bc3cc9bdea4f96db4c21fe475b4d79dc87c124bcde53e1bc3ae7066a3c0c136e0d SHA512 564027879e53b3716ebe8cb1ed4b516835c15f326c865fd664aa7a4e5f26e1a78a329ff8e19d4acf6249e2acf7382501114cd2258c38bba89f0f382f7dcda09b
 EBUILD ipython-7.15.0.ebuild 3624 BLAKE2B 12e457cb52c926d5a2ab169310365b17202e34f502f6b76c8c3b38fc0e5699e250060576877c384802f2408ee670532544dd455808bb2f02d52e31a5fd3299c2 SHA512 0506305565cbc67e701a6b80776bd48e67df26523f16d1d6cf5788c58d16854c4b2a6a59cb6419abe5a60b198fe707b6b1e8eaa030431ee0219a974a6f8e914e
+EBUILD ipython-7.16.1.ebuild 3624 BLAKE2B 12e457cb52c926d5a2ab169310365b17202e34f502f6b76c8c3b38fc0e5699e250060576877c384802f2408ee670532544dd455808bb2f02d52e31a5fd3299c2 SHA512 0506305565cbc67e701a6b80776bd48e67df26523f16d1d6cf5788c58d16854c4b2a6a59cb6419abe5a60b198fe707b6b1e8eaa030431ee0219a974a6f8e914e
 EBUILD ipython-7.5.0.ebuild 3571 BLAKE2B cc3f3e60012b2f432d94b12d46e51723e31905d7536467efc031ec130afe1460ff17eafa6ae8c601338714ca0a5862437dcc95919c85b54c2cb0892a6cac4dae SHA512 044290fe2202ed785ee10f8809475ab25c4dda5ab3d5de43d345860a809d5a7dc4a90bdd335d2d1ffbc7fb482179cca55d0981d3a63a8e6a567d342f3f151836
 MISC metadata.xml 2857 BLAKE2B 89f6ea04a550e2e590f9e041c435fe578691118e24265d0f3c2465480cb32cbf4f5ca4d6c8fb2a08a665061347e19e361160f73aea080b1f67a4c9c743f6c23c SHA512 6b28c7f0be77e23656df143940074658a71ea872ba12238d3dc206f25662ddd589e3ebee11d5ca06498cfbbc651ae0effc95235feed91e853616706c87ca5bc4
diff --git a/dev-python/ipython/ipython-7.16.1.ebuild b/dev-python/ipython/ipython-7.16.1.ebuild
new file mode 100644
index 000000000000..72cb41ac0a13
--- /dev/null
+++ b/dev-python/ipython/ipython-7.16.1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE='readline,sqlite,threads(+)'
+
+inherit distutils-r1 eutils virtualx
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	dev-python/backcall[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/jedi[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${CDEPEND}
+	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
+
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.14[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
+	)"
+
+PDEPEND="
+	notebook? (
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
+	)
+	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	smp? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Remove out of date insource files
+	rm IPython/extensions/cythonmagic.py || die
+	rm IPython/extensions/rmagic.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html_noapi
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	distutils_install_for_testing
+	pushd "${TEST_DIR}" >/dev/null || die
+	"${TEST_DIR}"/scripts/iptest || die
+	popd >/dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Create ipythonX.Y symlinks.
+	# TODO:
+	# 1. do we want them for pypy? No.  pypy has no numpy
+	# 2. handle it in the eclass instead (use _python_ln_rel).
+	# With pypy not an option the dosym becomes unconditional
+	dosym ../lib/python-exec/${EPYTHON}/ipython \
+		/usr/bin/ipython${EPYTHON#python}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	optfeature "sympyprinting" dev-python/sympy
+	optfeature "cythonmagic" dev-python/cython
+	optfeature "%lprun magic command" dev-python/line_profiler
+	optfeature "%mprun magic command" dev-python/memory_profiler
+
+	if use nbconvert; then
+		if ! has_version app-text/pandoc ; then
+			einfo "Node.js will be used to convert notebooks to other formats"
+			einfo "like HTML. Support for that is still experimental. If you"
+			einfo "encounter any problems, please use app-text/pandoc instead."
+		fi
+	fi
+}
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index fc0a5029fe28..7c55adfe26cd 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -2,5 +2,5 @@ AUX isort-4.3.21_p1-tests.patch 1301 BLAKE2B c56ffa6dad9605def443bd1f714cd3a88e7
 DIST isort-4.3.15.tar.gz 67949 BLAKE2B e78960518928cd74c15733bbc14bf066798ecbcc3e906754c10e352e7b88843451a1d0616d1b450100c77e95974f863951d640c9568277e867fcdfba8f44abdb SHA512 a5774d4f3c49c978e9043e52681e80011591422e60178d72074142725d9d7fa5065553686fd42bffe9e71b38b2b5bdaaa6f20e32cd8dbe33beb9431c397d78e5
 DIST isort-4.3.21_p2.tar.gz 158539 BLAKE2B 316703ca754c939e4af0db4a1060fb13a5164797a672b3faeb585a81fa0c86453fb0f1953b789661588cd0f04267a28837d46a88093a838391f752afa43e9f8b SHA512 fc2aa00c87196864864d2516b8be7acdedcf40d71d1931510e4b878dbd2b6da0b579661b50221f03f4aa5560c8bf23d5e1e10a2694d2b741ca09a92e40a4c687
 EBUILD isort-4.3.15.ebuild 447 BLAKE2B 05640fd2f8789ab7457e0081519c72d6998623a61d6f5c8c6e2a7d2b7c7928949a578f283723d89c6a63f08e7d81670fba6f9be2905a033bab32a23dbcd35955 SHA512 b719b23a49a47897d115d38448ec3ca32a1f3e762113ac2f7b1e0493413afa2127599ff0282eec818ad914b15c9093055657870ac7e4d329a53428fe4087acce
-EBUILD isort-4.3.21_p2-r1.ebuild 825 BLAKE2B b28c5204dc8ebe6cc11e0964634510dbac30ea67f07f8a2a0db2b17041c8beb4074759aef97ded5f89a536750e968910014b3952d3484a0e22e03ecdaa35a813 SHA512 1ffa30f9ec836fa0d7d0cadfa079f1e8a4a47c23b7839f906fd2f62c438fc63a42392525ba0f42587f14bca1bf886c326d797feabdb54b283951bd9e0a5c7359
+EBUILD isort-4.3.21_p2-r1.ebuild 823 BLAKE2B b1dc630eadfdff875d062528563c85ea44a07835b7ff6a82b9cb55b87c91b41f7c42f38d0569dfa1b4f1f24dddc8912b99269fa169aae61ff65e59af419a1c9a SHA512 0412f312bab6a0bf93ad766668bb5b9d5298308f88728b5449d064f5bbb60bc98d73ef10a2c1063af223c1f09ab9340b867378486474bfcf300984c917183b96
 MISC metadata.xml 395 BLAKE2B 2fe78f812b341093dab53962f6c02a341b9c32221d3d318ce839f38ad2280369ca242f831cff95d18120a8104bd5cadfb1e77123872228411514a993b086772a SHA512 27076ca449e7effce88a4295218f20fcf89ba36ca0df51951f50d25b4f8b76945282136b6e972c0220567df3249c2c1fe2e956acfd36a5cf249401c88c721d4a
diff --git a/dev-python/isort/isort-4.3.21_p2-r1.ebuild b/dev-python/isort/isort-4.3.21_p2-r1.ebuild
index 80c482134f45..a6450aede40b 100644
--- a/dev-python/isort/isort-4.3.21_p2-r1.ebuild
+++ b/dev-python/isort/isort-4.3.21_p2-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ppc ppc64 sparc ~x86"
 
 RDEPEND="
 	dev-python/pipfile[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-classes/Manifest b/dev-python/jaraco-classes/Manifest
index b2f1ce9109e8..a84502356c57 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 1653 BLAKE2B 0debe2ad86864beccbb67d70d725a8ab4b228006cc7f63fce7981c69cc0a8ce0661c3b5bc79996f0bcb79d1e1539a393fe2847e2b97d5de0ca49dfa149c40090 SHA512 54fbd8c51e0471920e04dc42f6634bf84719a879417cb577d4634b1cb851dc5479b2a8f93f54b0ee7ff6e4b7a2a54cb0340cac4ba16f29e6aedcdf5839b35306
-EBUILD jaraco-classes-3.1.0.ebuild 1653 BLAKE2B 3792df63a58581cee829720d04effab64bef7105ec8b5f719aa467a8816e9b0a6ac242982fa95d30060de6af65a47bf121b4c4802d5104a58bcf51aa1b5e99d8 SHA512 ce9e7850fd67b776e3fb14e3d3491260fd65ec7302437b599879edaf0433f949d537e47dd459f9cf7a54e9456c2e77f0af3551f3bca8deaa83f46578bbe585c8
+EBUILD jaraco-classes-3.1.0.ebuild 1652 BLAKE2B c4a4c832a00a5e085150c24a3795d717dbcbabc97402576d52e50f4eddfe1f2a26568ec85da43801be6cc96e0b89e1d8ecbda5d35d8a340b855d6daabd2ad0aa SHA512 44db29a4fff0d6819089e1d5be5c44b5c35f424a16acb559980ea769c865b4f69bc0e78192b46f1da27b87987078689658aa5466e02efd88d402272ebca3641a
 MISC metadata.xml 553 BLAKE2B f5e492cbcab83e5783cb3be7f42c48654f7dd4ae620d92029d7e51c653a1c78b7488bfb6ffaa03a08fa3aa0e99b1b2384cd15de6846ea16ff4f89d948cef5900 SHA512 03759959ae7a56bcfb92581e9586cdc5afe0a5347009a74aa4394d4f65c9b929b15572f7faa02914d376443204b693544fde85e61558688c547a58652e4d2800
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
index 360b3c03b645..35e7247e99a7 100644
--- a/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
@@ -15,7 +15,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 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index 85e75ec06f38..829d455ed038 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -4,5 +4,5 @@ DIST jaraco.collections-2.1.tar.gz 16026 BLAKE2B b79b57b6bac1e18b6be44ea0e5ad65e
 DIST jaraco.collections-3.0.0.tar.gz 16439 BLAKE2B ff3690d85d91da8d88945e9ab8d16d13c7d0f67a9334f706701f9b392d8cffdd9450b2d6051a92799564cfc81310e45f50368ab729a0b68c08a9c8b0ccd9627d SHA512 c6c5d28fe4b3940c81c68bf877249805db3f508d83a0071947c7a5596d3636631df91cc6e87802b0fa6cd5c8bdd1ef2f39b924471666b44d2147cb64ad1533ad
 EBUILD jaraco-collections-1.5.3-r1.ebuild 1443 BLAKE2B a66ba6c46757c6f82a505bb3a878c628b9457f71060e82ad33fe1a29582ca5527ee915198641efce0333b099a6e27e50cee6b4aaad524652246e932c0a9992c2 SHA512 4923dc53f863e7ef112125a4ab233f858492618a3ad04a9754acec15e12f691337e429570c9ded5677553fa0eaf35ea8ccfe25d2549004e4d25ec2e8fbe5a247
 EBUILD jaraco-collections-2.1.ebuild 1605 BLAKE2B 71bcc1d73d2c0f0dc841f91af5e7f7eb52f4eee14c00ae3e4fb5fbba779f32e3fb7308e70d2633c179654e07281c0fcdeb883f853a994a6ab6d96ad20aa78d10 SHA512 727b8aecdde34c9ccbb6835d21c2e8df8824de36ce358cd5cedc914b4805f3f14eb2c1dc5aca1b7c741ca8abe53a578a733ae788dc016c16e24ae5d4516050f4
-EBUILD jaraco-collections-3.0.0.ebuild 1621 BLAKE2B 0d3173f46195a12ed52f8765f55f174c85f0ea87d5e15a2e46b2cc9393eede22ba34cf4bcc43a9359cecdffbac87ac235b8ea836eea62c2df8a9d095618ac6e0 SHA512 d34f6d25d23c607a0bd4910ee238a67d829dd4154bc3abf1a7d51bd85a4e6c4e6fa91ba412506d90c614a763777f7285d470739e5820f7b276b0fcd9bd76db51
+EBUILD jaraco-collections-3.0.0.ebuild 1620 BLAKE2B f765094cecc9c8e0d05b23820d7be0b363bd9325c2a054057751c904863b7bd4e95a71eaf184e91aea25625709cef00786ff1493de460e1cd1510dcdb658318d SHA512 047fb48a1d3bd2a410c991820eb8215afd250d4c3133aae6b73b91caa00e12a160e165fb4425849c668e9f59de857752000ed654eaaed0d04c9fcd807c1e545e
 MISC metadata.xml 659 BLAKE2B 93e69bff80e5efb51d41b24817d5aba23bf2a6cc6c45a81bd4b0fb43ae5da538f377ebc0441b14f3fdedbda8b3a7932defa5255087fec9cdf6ac4d35f86dfd1f SHA512 1609b6fb022a1880fde31a5e9c7096e373a3c5da4f8a7b2e256241bfdaa591d4247b259a7b5dfcb6c9ee06182c3b899eec468992b50a04eb3f1e1fba43f20b20
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
index fcddc6e1249e..937044b5f9fc 100644
--- a/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index 470db73acda9..ffe2622e0d60 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -1,5 +1,5 @@
 DIST jaraco.functools-3.0.0.tar.gz 15618 BLAKE2B dbf542148d18069e7e78c718f3f6b62c7a07c674c96d54dfb3c1cebded13f6e24ca579844453352d001d312e718acf58d311c198076e85217362ee1a1446dc23 SHA512 f1ec725e132477f7361f7d0a77f72b69603499c24df25c9e8e0cc9a6d34a4bd4bb10fde60dc324b8176c46035e2babde04de90fcb0aa82273bc2f8559b8b31f5
 DIST jaraco.functools-3.0.1.tar.gz 16996 BLAKE2B 8cad1532753ae5c941038d4b8cda17b49f2d131405bb010d3747ecafc1ea4f72ad2c91b1ce2c499cd2885b18a9fe2cd1ac1bf06d58ed6f13a7a379cf9deb0e66 SHA512 96696839d3405e571bd0120443c5494f13d737b7e0fd9324a7a003c88ff45bdaa89a717c81b9c5ecb4eded9781ba2c05f4735e5cf24c1d1c162fc3d55d38eedb
 EBUILD jaraco-functools-3.0.0.ebuild 1747 BLAKE2B 5bc3c6ec8723e01dff7b9953ce1653a77603e5bf10a913cf526cbe2546f09d05c85809e37254c7a504855c0d85d708b168b58f82710e4f1ce2e219f74ad11883 SHA512 ce4135a8607d136b7866d8c47401ed4c8d2d1c2412b8b3c3ed480963ab03f061a846ddf6bc1f54225c618e0a2594fa17f65e03cecc24eb638a59359db3437a6f
-EBUILD jaraco-functools-3.0.1.ebuild 1569 BLAKE2B e38c6cfbfeb98e8b278d0c9e07c210da51e2eefd7a3cded1f144b33cfa15866a45ce185c7cae0e30b624b5921339d8cff6b9390f1592838d7efd75438552059b SHA512 3635fe36926a4ed1d9e091ce5da803d962ab1ae1173260e7fea58f0f6372330b49b6706f4e03c7805e291a9754a6f4790df5e6478cb75e4834c2671f010f63ba
+EBUILD jaraco-functools-3.0.1.ebuild 1568 BLAKE2B 7c30bea609aa37abe807b81ebcd33d1826a41e9b365a39e77cb5872a8a4a7c9f92afc155db51f242d0e14de16800de313739e6a50b4ea7729c04d786c2a74c03 SHA512 f3926140dcbbe3bde7509e847936bfeb49ad1681a7ad6f17b48ce7ad60b1d68bdc1292b237c9d61d75dfba985457a45463e15fdc38c8c6d7c6eac94eea3f3013
 MISC metadata.xml 651 BLAKE2B 3b8c3e620ec97e632d9d67c336e08989f662e36cd55ed0c283f7f9f4020717e099f00a438e550d38ddde73ca2736e728e74e8110ac957c797b109aa4252503b2 SHA512 04cef990bef9e5c53188b1c5997549644588a0053c06109992ae4d1757c3cc76553b3a3bcb535f4e3a0b33d679083d4c2247a73bbe69a6b1b606f99a6c96abc0
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
index b997d09613d0..cb0e63963d26 100644
--- a/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index 818abc9278a7..89d47e70c95f 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -3,5 +3,5 @@ DIST jaraco.text-3.1.tar.gz 13220 BLAKE2B f52ca11b8b20a42d2c36102d4d48cf27952314
 DIST jaraco.text-3.2.0.tar.gz 14279 BLAKE2B aa8c8903bac61db3d1017408e1aa525f66060422c27b754af343a64e586b64c6623b66881bea62b9b2e89821a40c933d54c9a8cddc7bda08ac108ad08a9524dc SHA512 4107ef1078b44714b6ee5fb6ebd2bb7c35415debc6eaedd8bc18a70a2936cc7c7757acd7b3fac9587201ef52a25d9b29e49f2385a0a08afffb1d0c3de6ecc377
 EBUILD jaraco-text-1.10.1-r1.ebuild 1398 BLAKE2B a8ddc0d90f447a17d0660aa46cf19e57895edcd96678f0d1d664055cf84996a584c7c6bb189cce39aaecc02bb4fdf7000f853a46b119a0976e97aae700f053e5 SHA512 5feda10ad31693621278217fe811596f2b2a6c40c8bd6980cfed04a45fb79cb5ff6dd51fa12bce8e6cef285c176ee4716a114b98335d105bdcb0fb351d574b4a
 EBUILD jaraco-text-3.1.ebuild 1639 BLAKE2B 7ea163dcc304213bf92afde4b9c91eb9bdec7b6fabe41befa86115f82a78d3bf7df299e9e52fc3a0a95d82bfcf066e85d86bbe7da8c8c779456ac62294f8c59b SHA512 b347c1514a3f691d69458d5f97479a132a0f47bded24ab3144df6cec45a3446c41e695637e4d6a378c31928877fd4f3aa325f98c40c9dcca4dfc0d8d6e494b73
-EBUILD jaraco-text-3.2.0.ebuild 1498 BLAKE2B 87a0a81e619affa289ae89debf0cbb425c9afd92d753956e85127b4e5a6d611047289812182abfc51e32f5f213aebdccca706f700fcdfd47d66c65278f43de34 SHA512 fc2c3aa08a09fd8a216daa02f383ea5ea9e31f9c86702c1a19ab0ea6985a57fcd10e0c324a8ac11da6afde70e0ea39e230ad6e6b155d24565e7d25903643ae78
+EBUILD jaraco-text-3.2.0.ebuild 1497 BLAKE2B 4538e68f89544e19f3a3e2605b1118f3c3ac438adef9ec82e0f831d5fc2c93f6742f9c9ada5335dff6dca331661d1ef059e672ceab59c7e67e0bb983655fc752 SHA512 b16ce3ec7bc4a492751ba43c8eaabb043a85ddbf0d24e51753abdbbd7852664903135a43223ece51065d8ce53d01720d60876e703d123057dd493601299ade6c
 MISC metadata.xml 631 BLAKE2B aaa62e5e0d4cc048c1a279b16890d035cd0a60cc41e9b4c99b37876a21286248b5a00d193a2036d0c6d447ff57e635245583f571834daa5a2e994653570122b8 SHA512 84c01b2578aabd0fd5be4347ade555ca4f4ddd96e7009f7dd1b9d021465bc55f66431c72ed05a7e5633a81f3b401f8f77568bacc872198e145b5421aed05491e
diff --git a/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild b/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
index 2c978bef2db2..5690e9e1e5bf 100644
--- a/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jmespath/Manifest b/dev-python/jmespath/Manifest
index 732d71f5a034..0d38e0353303 100644
--- a/dev-python/jmespath/Manifest
+++ b/dev-python/jmespath/Manifest
@@ -1,5 +1,5 @@
 DIST jmespath-0.9.3.tar.gz 22967 BLAKE2B c640b0fb29863e833adf200f2d3e364e65ff782f0f6046cf53463194cb8a69289e0146fc519c0e4d73a0606821f6d43d943e820b429b6fb53de06546688b39f7 SHA512 eeab444df7a29c0bc64bd8064c942a5b02772d39d6d262dbef1d43ebaf7e4eb97c34fb1df3a47c6da011a632ec5f9b1ffe62ac51929e8d412368b907ebbb85a7
 DIST jmespath.py-0.10.0.gh.tar.gz 81860 BLAKE2B a6181bde0189badcf3ec9a8cf2a913ddea27634b89e181c4b990a0c1eeb3bb777f6f3758ed6ca8acd061b06d853b9857ad33faf037201132bc73572c5d009f4d SHA512 84d787a9547bf0d33dfb4cf42514d6a7a1e69fb8867ccb9d84aa0555ea52b3064a9c6a49b3c51564090bb1d1d2d067fe1887105d744a0f25a991d9e9595c85c5
 EBUILD jmespath-0.10.0.ebuild 550 BLAKE2B a21409d5eaf91c3228d361b8ff454157affc1850b3b8de665baf055f5daa1a3ee42ea15997f6b3e41084b8e3565349c42b7cdcc0d3fceb7ba02a33e1c57b93e6 SHA512 41c73c709bc9d28d61753a777fb5f26bfc7c3eac6debafead141150c59085616b36ddfaa278db999d5f8449e4e86d61faefa705e8fdd636af9b34c4dd0e445ee
-EBUILD jmespath-0.9.3-r1.ebuild 459 BLAKE2B 99f79b965fa04a54c6728eebddf6773db39f27fb8ff511a6f4514e4085a829640428245170791f1e26fbe12809aa0818d2c506ae97b7e19381a2420126f5cc0f SHA512 2524a64f620cf2e4e8b56d06032304fd39b52358177e235c512f1a99627b639002a1fb81f7e6d240d27a91225812d9b0f7147124f06356ac9dee2c1bed4d4515
+EBUILD jmespath-0.9.3-r1.ebuild 458 BLAKE2B dbe074158e147965fe930d33caf088383bf19ee87ec2da5e1df4c6cdbb7feac7df2a6140b0686500a952c3ae6a664670a13d0fcffac509264aedac82a7ad477c SHA512 071efe7e8fee445b4550d86e7f96827fabaf877d5aabdcc274507ef739d34729fe61df5a50485d10f785b0d5add0c9c53b50099fa5e84aa71abea905dec889d8
 MISC metadata.xml 383 BLAKE2B 499175b2782977a9f367d29b3e185c6e3981f40fc9ee0498c62a986ac8f96151d26f5d66af5091dd16f67ffffff2f713ad5194441afe5962e3dc1f9bb39fe3d5 SHA512 94e829e583c07a6b21e8b25c95e9eaefc697c3b1cb8d1b8d61b745369d0977c8040ea2aef4c72e826d0cda9156b023ef60e8db808f526a65a971e4c1161bbab7
diff --git a/dev-python/jmespath/jmespath-0.9.3-r1.ebuild b/dev-python/jmespath/jmespath-0.9.3-r1.ebuild
index bb8ec31e1837..744deec9e2ff 100644
--- a/dev-python/jmespath/jmespath-0.9.3-r1.ebuild
+++ b/dev-python/jmespath/jmespath-0.9.3-r1.ebuild
@@ -12,6 +12,6 @@ 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 arm64 x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests nose
diff --git a/dev-python/joblib/Manifest b/dev-python/joblib/Manifest
index 51828d8721e1..8e301d2adf0d 100644
--- a/dev-python/joblib/Manifest
+++ b/dev-python/joblib/Manifest
@@ -1,6 +1,6 @@
 DIST joblib-0.14.1.tar.gz 338930 BLAKE2B 6b84c43be8b8d32f28a3dbc3e6f4ce15574cf20571805501972d162d4b076c1fe144a9790b8132821f0acd439c8859873038813c7bdd4163d0535eca36a1a8fa SHA512 079eb4321ed95c8f05399abca2a1c46ecb7c28fe9a3a50b6eb106a2bd2f3566fb25bca59022fafbfcee5069f078921421d799eeb29a796f8f98881491cf9be08
 DIST joblib-0.15.1.tar.gz 342550 BLAKE2B c8ccf0b6d2e229a780939d9c4f39265bd18b5a452d014056001072b7daf7e46a5961c6d80f768c30ba7463aa36c5ec09959bb1e891028bf6f7862a9a265079aa SHA512 a0b0bde5b034af3eee0bce2875199fc9ac232a34a49c14daf6fbddd9bf3ad8fa0d77192827b7531704b81db7bdfbaf76c4755b8fc1035eaf73b2e08f9e6d8828
 EBUILD joblib-0.14.1.ebuild 1148 BLAKE2B c1d2b4eae9bea3d2bd1f3f23519f7504e43f3592ddca6217fd9b936989029c2a982a79875eb32f5dc40d7087ae82cf1b5f18cc7257e753f4ec696eeb2fa48eec SHA512 210e793e79ac3d74968105278c5550ebaef4716abd4a6873e152de6f373e672ab39e4d223a4973b7730eb867945dd7242788b2b7d8c411b8c433deccef98cd88
-EBUILD joblib-0.15.1-r1.ebuild 1401 BLAKE2B 38061dba3e69d17564285ce0dbbc3d5e53970d72bd17c533b420b94855bff7bfcafd5d213afee5fb2147c3a55bc8bfe5a5f52296dddfd639643e3b59c064ffe9 SHA512 e013c2196cd674f7280d8426a4be47e3b9bb57b669696f4ecf7fbea0cb2f8071c0ff1b34380ed4da3a188b673959bb05bc00b990fb4b1c60576bf393259dcce3
+EBUILD joblib-0.15.1-r1.ebuild 1408 BLAKE2B 5a48b7c4e23c3a035c69230c73364cfefd07ec68b6469c676afcfe455f6a3011a3278c9d9e7e3a6c002046a95a2f0032eb0c623ccdf71488cedda979c2b46d1d SHA512 5b035c5424cc5342b0713b62f07e55f1da5630c2de162b26575b7b8d18886e0e320a22e6ff28c96cd3e5412501f5a261f5f0facba2998e4c8848466a33060f97
 EBUILD joblib-0.15.1.ebuild 1150 BLAKE2B f1c0c586328977f4953818ec205ee4d4702fc2118f64a6c60dc248d1ecf115e6b2207764243805262a998616648b4014791d467d443d5769118ab6da9a6ab889 SHA512 051ee65d697022daf61083db84c88666c3f43bdb8c2572b6440ae5d59336f32b5447f7636beddc6487f87e8592f79bed06f90f790d39ae95e8860dfdcb2f0b51
 MISC metadata.xml 832 BLAKE2B a05bb08a1c94c3c589a2101ddade1fb6baea3a584ffda3af9374788ebe9aabe334697e5f44700261881324448a8c91d819046785fa29e2bf39e1b944bf7572e8 SHA512 af7c23a51fa4ad666546900aca84ebd07412ab36f305ce4650df5cecdfcda3c24ff7d56322495c191a83fa99d00d968fc19284053f77620885f03bf4555f2353
diff --git a/dev-python/joblib/joblib-0.15.1-r1.ebuild b/dev-python/joblib/joblib-0.15.1-r1.ebuild
index 094bc98ec490..23ccee52ebed 100644
--- a/dev-python/joblib/joblib-0.15.1-r1.ebuild
+++ b/dev-python/joblib/joblib-0.15.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonpatch/Manifest b/dev-python/jsonpatch/Manifest
index fd11c1211efb..d79cf56a160b 100644
--- a/dev-python/jsonpatch/Manifest
+++ b/dev-python/jsonpatch/Manifest
@@ -1,3 +1,5 @@
 DIST jsonpatch-1.25.tar.gz 24340 BLAKE2B 0022b4b0b3a0487958b86f14c1738a32593b8056510e3836e15385874b64f5d243d757c99a146a48da6563f0d9330eb38cb91ad6cde3e0a1b4cb8cbd3b15f9dd SHA512 5e1d5b6dcb6ee847ddd561400fe2d00e07aa1827a63ab98a38cd5e91fa0e52d8635eba1192edbccf9c7b9ce9c7ce0a414d580665c427c87a820e533d26092ad6
-EBUILD jsonpatch-1.25.ebuild 837 BLAKE2B 38a9af2ea62b2ddb74540111d27b533a83f539a05a5621a453f776788d42d68ea060d13447e1b5029e61d6f4fab23b0a19c3f24cf5f1702561a9c8343ef603e0 SHA512 57a33a8c7470bf63d0569af01c796b19dfb076a2e8d09d58da57e9c93b6588690a15aa0780d008636b7bc5f4d488bbb92a7ffc9e41ec66a37a6308cdaf4bd88a
+DIST jsonpatch-1.26.tar.gz 24440 BLAKE2B 345831bd9a9fc1902d0959685ed2dbbc0bf04d191bbc78567d27283e9ae52f7e22f50e9f400461300d1c3388712afa51d4d6a2ddd0a06dbc0a1b576b02bfe807 SHA512 1ab25c8e091cd0b772062a8c448fee4772081d8bd715489b2f7a76e4c0bdff8b26dd38b26c3037cf9bdf8780b97e62a20b6a5bdc43f43af16fdae51d1291bf52
+EBUILD jsonpatch-1.25.ebuild 836 BLAKE2B 6f5bb95ffeff9389bc8ce9db031e5a377ef62e087078faa70106acfd3bef29ec2dd3a3224ec92f5c53cd50ec8cac8c833560d16b02839a487d59f70a70803c3d SHA512 fcbe73e291c0a10303c9d61b04c7bcd6b210ef0ee546153759479665fd7f9b57d2b9194cd72859ca89324ecff2eac900c861b3ecbcc2bf6e10b4c79856fd825f
+EBUILD jsonpatch-1.26.ebuild 840 BLAKE2B 39ff73e16252a6c56d31e50eae213ad5e545f656c96a270d9f4b6617c062d94030f9a7412ebd00b8dc274f7d7a851493899f02994bf2c4edc6bb91dce7e602bf SHA512 c559364bd9a81241d076ade6cdf6b893c3bfb85ccd38856f32f45304a403e6a1887c4a5e21d9835b38e84880c939c3c8f3821bf432f243987dbb6c50c1300439
 MISC metadata.xml 679 BLAKE2B ecac7a9a6da1482f0585c29ab1e7f1ea3729dc4c2b4640440b0a1a5eddbbbdc7d2c029c4318ab3645a4025b5e21d11015ec76b21f5b069d49a37bd74dcad6e1f SHA512 37946af836c2d8b521618688ffee4b33c1864751081c1f1cd86442e6eb6cf822cfd9dbc228f834fbd31ca63b1dd24927cdb680076e2bd7ead941558ac1d2e436
diff --git a/dev-python/jsonpatch/jsonpatch-1.25.ebuild b/dev-python/jsonpatch/jsonpatch-1.25.ebuild
index a78accbc67f4..e8cf3b1d7450 100644
--- a/dev-python/jsonpatch/jsonpatch-1.25.ebuild
+++ b/dev-python/jsonpatch/jsonpatch-1.25.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/python-json-patch-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jsonpatch/jsonpatch-1.26.ebuild b/dev-python/jsonpatch/jsonpatch-1.26.ebuild
new file mode 100644
index 000000000000..789683263633
--- /dev/null
+++ b/dev-python/jsonpatch/jsonpatch-1.26.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..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Apply JSON-Patches like http://tools.ietf.org/html/draft-pbryan-json-patch-04"
+HOMEPAGE="https://github.com/stefankoegl/python-json-patch"
+SRC_URI="https://github.com/stefankoegl/python-json-patch/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/python-json-patch-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-python/jsonpointer-1.9[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( ${RDEPEND} )
+"
+
+python_test() {
+	"${EPYTHON}" tests.py || die "Tests of tests.py fail with ${EPYTHON}"
+	"${EPYTHON}" ext_tests.py || die "Tests of ext_tests.py fail with ${EPYTHON}"
+}
diff --git a/dev-python/latexcodec/Manifest b/dev-python/latexcodec/Manifest
new file mode 100644
index 000000000000..f37689f76641
--- /dev/null
+++ b/dev-python/latexcodec/Manifest
@@ -0,0 +1,3 @@
+DIST latexcodec-2.0.0.tar.gz 29919 BLAKE2B 163fe7332aba7628265f1462570c8d22ec4044dd7b7383de8280bbc617ba4dc26e90f12e6777d690c7a8ae4f6564dbf7519bd6f57cf3dca2820a1fc647a1d7ef SHA512 3c0540b4e5dbc88908b26c68b4c6fca573b45a6b17053733b35a16716510bb67ef6099fae8e48e094a6f08be4e4eac48e889366f035ab38f80e31dd61f08a3c1
+EBUILD latexcodec-2.0.0.ebuild 495 BLAKE2B 43632826c58ab7e82c9ec0f42cea7739d7bb3476890fa44480b1d3a446c87430e4c410bfce6cccb1fc2b33255ca9d134485760d16ddb4df5902bffc1fd23d0d6 SHA512 103439066102f8ee5aed09316925ed45903adbc245144cf0429934017d6ddac1353138182cc21ec651d7434284a8d36d7fb0e6afc22f0548be340c11bb5b73f8
+MISC metadata.xml 1105 BLAKE2B 888095a4dc47b0dc263a532afc635f4e673a3ecdfb268e0c7bdea292240aae883c9c477a11621991a9291fd528e72756da2dfcf83a1ca38c1e2ab2335abeaa49 SHA512 1643cfda1ab0bde15b47bfb5bf2ddb8f5f0c94981fc4d8cab9568fa8569b3ff7214419d2685699486cfb96bcfaa0e88d2da350d44f11fa321e23ab0a6571ffcf
diff --git a/dev-python/latexcodec/latexcodec-2.0.0.ebuild b/dev-python/latexcodec/latexcodec-2.0.0.ebuild
new file mode 100644
index 000000000000..d3f8bec601bf
--- /dev/null
+++ b/dev-python/latexcodec/latexcodec-2.0.0.ebuild
@@ -0,0 +1,20 @@
+# 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="Lexer and codec to work with LaTeX code in Python"
+HOMEPAGE="https://github.com/mcmtroffaes/latexcodec/ https://pypi.org/project/pybtex/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/latexcodec/metadata.xml b/dev-python/latexcodec/metadata.xml
new file mode 100644
index 000000000000..dda74f681e53
--- /dev/null
+++ b/dev-python/latexcodec/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>william@ewpettersson.se</email>
+    <name>William Pettersson</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy maintainers</name>
+  </maintainer>
+  <longdescription>
+    Latexcodec provides a convenient way of going between text written in LaTeX and unicode. Since it is not a LaTeX compiler, it is more appropriate for short chunks of text, such as a paragraph or the values of a BibTeX entry, and it is not appropriate for a full LaTeX document. In particular, its behavior on the LaTeX commands that do not simply select characters is intended to allow the unicode representation to be understandable by a human reader, but is not canonical and may require hand tuning to produce the desired effect.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">latexcodec</remote-id>
+    <remote-id type="github">mcmtroffaes/latexcodec</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index a533cfe5d21b..c690987299be 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -3,9 +3,9 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD lit-10.0.0.ebuild 878 BLAKE2B 547175d48388b3f2cbf56a4d43e1407e3ffdc3bbc0114f526e5a8022232af42fa8ff53ea91536c28511ae8d301bf9768fca03bad7a55a288279c3b85a4e792d7 SHA512 a2c001ea7099368852f53c488f348c92308a25a069e77b14212c7319e70a39f7a9f7c59f90b865079b3fc35435ad3632bb199e8aced8601f8bd427d1bec44383
-EBUILD lit-10.0.1.9999.ebuild 916 BLAKE2B e1b8a23b1a64a86f61c137977eff305731958d77d5b27185dc4c63841cab02a4e91165ff4ed9dd6810a40ce3058e544b3dbf93182683a88abe07e57696e8ad7d SHA512 cda7c70a9549ae77e097d5a210f75256a0370f45343bd59a543bcc5b36621411e587364fe11349fe2755ce350c4a7d800ec578349181c1ec7fdaf77246f320cb
-EBUILD lit-10.0.1_rc1.ebuild 916 BLAKE2B e1b8a23b1a64a86f61c137977eff305731958d77d5b27185dc4c63841cab02a4e91165ff4ed9dd6810a40ce3058e544b3dbf93182683a88abe07e57696e8ad7d SHA512 cda7c70a9549ae77e097d5a210f75256a0370f45343bd59a543bcc5b36621411e587364fe11349fe2755ce350c4a7d800ec578349181c1ec7fdaf77246f320cb
-EBUILD lit-11.0.0.9999.ebuild 916 BLAKE2B e1b8a23b1a64a86f61c137977eff305731958d77d5b27185dc4c63841cab02a4e91165ff4ed9dd6810a40ce3058e544b3dbf93182683a88abe07e57696e8ad7d SHA512 cda7c70a9549ae77e097d5a210f75256a0370f45343bd59a543bcc5b36621411e587364fe11349fe2755ce350c4a7d800ec578349181c1ec7fdaf77246f320cb
+EBUILD lit-10.0.1.9999.ebuild 878 BLAKE2B 1be4b6806f763182f310c13d0d98aac1e7f8ef440384c161887c1e0b9a41a7954f4059df2196858e144650741d73ba5452d3dcd5fc0d6a315759a0c8f1d73c03 SHA512 ebb181a5875c4451c04d39372411bd296934497aeebd518cdb1aa4ee6efc13ab185ce1542926eb5e750fb09f19a2c4cf4a33fdc3bb16d33731fc66604943ae56
+EBUILD lit-10.0.1_rc1.ebuild 878 BLAKE2B 1be4b6806f763182f310c13d0d98aac1e7f8ef440384c161887c1e0b9a41a7954f4059df2196858e144650741d73ba5452d3dcd5fc0d6a315759a0c8f1d73c03 SHA512 ebb181a5875c4451c04d39372411bd296934497aeebd518cdb1aa4ee6efc13ab185ce1542926eb5e750fb09f19a2c4cf4a33fdc3bb16d33731fc66604943ae56
+EBUILD lit-11.0.0.9999.ebuild 878 BLAKE2B 1be4b6806f763182f310c13d0d98aac1e7f8ef440384c161887c1e0b9a41a7954f4059df2196858e144650741d73ba5452d3dcd5fc0d6a315759a0c8f1d73c03 SHA512 ebb181a5875c4451c04d39372411bd296934497aeebd518cdb1aa4ee6efc13ab185ce1542926eb5e750fb09f19a2c4cf4a33fdc3bb16d33731fc66604943ae56
 EBUILD lit-8.0.1.ebuild 1022 BLAKE2B 8a84bd40ba13ff7a42357bb8a94c4589c3127f9601ca9ccd099f2ab0387319c4487a77bb1972499563e505f0ea8ffaaeb3c3952f3e1ff9a2cc63f04868ec074a SHA512 76a11a6df5516b37723818a956461f6dd303027de1f50321b581636e35c1704711266f3d2721e6846d9525bb0aed347273ce16baed2561c61be9085221fd0993
 EBUILD lit-9.0.1.ebuild 871 BLAKE2B 58a0933e8024a1dd2cf8cd09d08c3730e42a4c4480db7ac97eeb84569871df33156eda941c2965a1170be9eac7ac28950149e811d7cb75317b6b3fc6058bec8f SHA512 3d9e4a1f3348e215e9551cd7e419fdbc266a880d3ece2d0127eac5165f4b7f3089de7c188d4476666bcb525c50a8e5aff8ab4c8094b2f7aa233a4f0ea2e93e3d
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/lit/lit-10.0.1.9999.ebuild b/dev-python/lit/lit-10.0.1.9999.ebuild
index c9394c7a1190..b9123ef7bf14 100644
--- a/dev-python/lit/lit-10.0.1.9999.ebuild
+++ b/dev-python/lit/lit-10.0.1.9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{6..9} )
 
-inherit distutils-r1 llvm.org multiprocessing
+inherit distutils-r1 llvm.org
 
 DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
 HOMEPAGE="https://llvm.org/"
@@ -34,6 +34,6 @@ src_prepare() {
 
 python_test() {
 	local -x LIT_PRESERVES_TMP=1
-	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
-		-vv tests || die
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
 }
diff --git a/dev-python/lit/lit-10.0.1_rc1.ebuild b/dev-python/lit/lit-10.0.1_rc1.ebuild
index c9394c7a1190..b9123ef7bf14 100644
--- a/dev-python/lit/lit-10.0.1_rc1.ebuild
+++ b/dev-python/lit/lit-10.0.1_rc1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{6..9} )
 
-inherit distutils-r1 llvm.org multiprocessing
+inherit distutils-r1 llvm.org
 
 DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
 HOMEPAGE="https://llvm.org/"
@@ -34,6 +34,6 @@ src_prepare() {
 
 python_test() {
 	local -x LIT_PRESERVES_TMP=1
-	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
-		-vv tests || die
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
 }
diff --git a/dev-python/lit/lit-11.0.0.9999.ebuild b/dev-python/lit/lit-11.0.0.9999.ebuild
index c9394c7a1190..b9123ef7bf14 100644
--- a/dev-python/lit/lit-11.0.0.9999.ebuild
+++ b/dev-python/lit/lit-11.0.0.9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{6..9} )
 
-inherit distutils-r1 llvm.org multiprocessing
+inherit distutils-r1 llvm.org
 
 DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
 HOMEPAGE="https://llvm.org/"
@@ -34,6 +34,6 @@ src_prepare() {
 
 python_test() {
 	local -x LIT_PRESERVES_TMP=1
-	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
-		-vv tests || die
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
 }
diff --git a/dev-python/loky/Manifest b/dev-python/loky/Manifest
index 19fc994594ed..ab6f46db6ca0 100644
--- a/dev-python/loky/Manifest
+++ b/dev-python/loky/Manifest
@@ -1,3 +1,3 @@
 DIST loky-2.8.0.tar.gz 112383 BLAKE2B 5561d96c0e0d23951dff303bdb1789f200b88e74ca44ef75119112491693c5876a9a70ad3688b3af9eaf12c0000d891067c936ca984404146890fb131f8c261e SHA512 15fbdb56994e08f643b7bd5aa68d193f74ab61ef1230df9e2101fb4602a201a050e3ecf08229fc4ad61e478c893e0b34b81371ef9596733baa0e3d008125cd11
-EBUILD loky-2.8.0.ebuild 723 BLAKE2B 6a571782db1aec24fb01656aa6a80cb5c5c2d2777961d4ceb7ba1acf93ca4ef35b7763904a8d95571fb9efc47d139ab5416a144ef22d29a35dec3d93e52f0067 SHA512 708b6eb4291c3c9bef862c0112d61ce7e65427c07c5769b9f6671d2d68fd59938fb7a11b606c044cbee1371d36937b17ef1ceb75417962f963c48e1e8258df1d
+EBUILD loky-2.8.0.ebuild 730 BLAKE2B 09a62b500925d3b7707f8f3abb06e23ea964fad1e64eccbe34d43752f108b740715f1d27794e0113987750c98addcae8c09a45f4b44cf8169920981353cd4caa SHA512 2baacd860d51f84445e1e808ebdee79b56ee1ed0896c92df6f5b45c6800525dbbc1e2c7b93d9b05117972a999135b385e6d212f3c0975b1848fb0b46c092b3e9
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/loky/loky-2.8.0.ebuild b/dev-python/loky/loky-2.8.0.ebuild
index ade277177dee..19d795ff7893 100644
--- a/dev-python/loky/loky-2.8.0.ebuild
+++ b/dev-python/loky/loky-2.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 8a9f0d07cd69..6e697d335acb 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -3,6 +3,6 @@ AUX moto-1.3.14-py39.patch 1372 BLAKE2B 620592a897b8f2ddf1973fa3f00a7c2c2512d3da
 AUX moto-1.3.14-tests.patch 2306 BLAKE2B 83bf272204ba9128623ad13bfb4a468d6b2a4e5de89633b7915d2090be44b4a7823ca88ea6a706fd878e40434335a3d381e28b88806f7ed5f402fdb9977837a0 SHA512 549e1e6715f04b56729f5621f2806e8b9192ec9fd6e5bd4cacfdf4a1a5ee48ed8701f0a9acb5b1cc08e40efa4d3dc1ad5ff0821c794e97a9da6288dd3cd1be5a
 DIST moto-1.3.14.tar.gz 1829165 BLAKE2B 2ec30c4cc571492a9d2c08f66a39ad04cfc0baa7864db8a5be4ea9af24ecb59bad3e85c44fa8a7babc16bf66188cb6bef89484f1f302a11e6eec1f8dbf516492 SHA512 1fe7e9d49dadada82f24d6bef1c21419c414e027c21ed1099bd1eab7c269ac5638ed44a29d1557b37562a44b22a7c7251fc1ca8ba88cde6b82d39dbc620aa6a6
 DIST moto-1.3.8.tar.gz 1571716 BLAKE2B 8e79808d8488bcf8c15e8b5a55e93392ceb5f642f1f52c0af441cecb7adfe23a718f6d283e473e5dab82ddd21bcbed36ecb52b444cbd933405d13c8818e4f74d SHA512 901556249a2a28885b7f77e9f2c209b06391efcea66b78ce3c16edec14bcd03b251c37ef5d800d8f7a35180d59ce7568a68bcebf18e25b092eb5de801db6c587
-EBUILD moto-1.3.14-r1.ebuild 2776 BLAKE2B 1cea7381d46c92c8411e62717b1fad20465ac479cdb0c92c8d3b6b9bd16f838728097f92d2e62de079b61d1dd91b4728de03baabb08552817a7531636a565a94 SHA512 7838e1967746d2d41970dc649a6671d1d4420a51c259f4b8b65294f10c80b0ec453260a6e934b241175e348e680670e7aa2d2b4a23636f914c71927d9e805218
+EBUILD moto-1.3.14-r1.ebuild 2775 BLAKE2B 9e2f967235cd50ee71dce187ee58238937de62db595a2951e43e4558f85424a796944fefa54e743c1ee226727b0bbe7703e087e79ca867b0932e13abbed77384 SHA512 141e31aa51209c5a466c649617912a8c4c753f6edae743d871a5d34214459b5c8d2dcc7073ec2842205d2f521fc773d05bb7f7fbb209feb8238d15db11b04ab3
 EBUILD moto-1.3.8-r1.ebuild 2428 BLAKE2B da88df8c1a6c5d180277821ddd25da4d7d6e59e234c8d83663185a26d19233d989c074fca40ad7200617f73f799cbaecdbb96a0e0b1d2b9e3c70c31b7b6d13c4 SHA512 114b88548e04b616ee787bb96c338dda79f66942b58f9072519ec3274196358bc7cc658e675c5cbc3beaaf219b4f54044b06ddcf366f8902852307504b17f440
 MISC metadata.xml 486 BLAKE2B 5fbd350934c9a51d9b34d57a4031b6180acad41a2f981465b8ce78b76cf2ed25679fc4b5e9af59dab1e27cfe0eff2856419394902bcca26a2ffb7ece199d1838 SHA512 9e69d49c588ebbeef151cee987986de7a942a3daa9bf4d4f442314d7e47bd1ad8650c6190c6313e6f4303c03038313b6562d5e0a32ec536227c04e7702ef316f
diff --git a/dev-python/moto/moto-1.3.14-r1.ebuild b/dev-python/moto/moto-1.3.14-r1.ebuild
index 71f3637af836..915c8ed2a58b 100644
--- a/dev-python/moto/moto-1.3.14-r1.ebuild
+++ b/dev-python/moto/moto-1.3.14-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/munch/Manifest b/dev-python/munch/Manifest
index bf5245c9a44b..9671e0e281e3 100644
--- a/dev-python/munch/Manifest
+++ b/dev-python/munch/Manifest
@@ -2,5 +2,5 @@ AUX munch-2.5.0-revert-pbr.patch 1301 BLAKE2B ab22d6d9e73444d5e5240a5bd64662acce
 DIST munch-2.3.2.tar.gz 7598 BLAKE2B 0ff607c4821b675bb0710e185c82135ba031e2ad0e18aae07f8736e102ee73c53a6977155f250ff20e26e87671f8a20ed7bac625bb96625017be047704f63bc6 SHA512 7cbcd79b9506940f88a2090649e5ab6678164b468ed04feebeab8f85c9af861a1a8012aaafc869755c3c7957feefb231bc15426c382c014e82e9b806a879b8e7
 DIST munch-2.5.0.tar.gz 17015 BLAKE2B 17af271ae082a6e5f91781ba48a440f11cbe85ecb81d47ee2bc51910307080e3ba6c95e99e7475534400b2915a86d8f853bc65d419c3d3b7138bf021e66de25c SHA512 7eca31111f40782a19b49535322bc56d723022d52b0842c4beff512f32fa415a6c75851eb84950358cb6a11693095cafe56364028e48385b11135de414edca21
 EBUILD munch-2.3.2.ebuild 503 BLAKE2B bc9c75e8e823ff370cd75d59c326653ac1ff16f0f923d43b600314e42ac2ab9c6672ddd07b2999cf566efaf19a78d7802eaea1f918f6c86bb20930dd5e1a6ce5 SHA512 f4246ccdab778286cac951a7895d98a36916468231902f5c83a9a075ebe025efa475c9105d195d98f431ceff8d4eba564db6763ab646d790e71f2472636f8280
-EBUILD munch-2.5.0-r1.ebuild 735 BLAKE2B 00083a872bb052f0802c14331ae55be2a26cee7114317d65a60727c94bced61f3b90d96fa4a6c11552ddb5e0107c0f711141311ce1fe7f2b491b7ae5329ca83d SHA512 7b744d1faf42ac254cb477e111cf238c35b4da77f5b0ffd703843f5fd97ce03b752e95e68ca5222f6b7731b574ad486ad0ab231959ff505d75aeaaaea84366da
+EBUILD munch-2.5.0-r1.ebuild 734 BLAKE2B 144795255472d5d21b46551cb52bc61dcbfd78d8d64d0eeac24d7507cfc818c8973be04254d51676ca08e237a0a25b1ebb0a7df4e75bc4b94ad920cedcb0964e SHA512 3289269d643fb36189f557da333a4c902b06a9e7ee3dcc47564fcc094028d0eb5bffc3d0d029ed850d3d31716ad658cee36c4d528d42bb00ce6f24936e922bc7
 MISC metadata.xml 375 BLAKE2B 55482baad37c27ba7d0ec36732e880b82a635bbf7358e4219d96d0986e56eab1052c7f09d11a2cae544612643b524ca333c7217f92e569d5dc7cf89e025dd53c SHA512 333c300e6d943df9e1d7f43ccb7fb2b96ff13522dca55f8725ab71cf6e4f740d4c11a6bf136a1f1caec79adbafdaac51ea4ec36e0fb1b456edf4f39682036ada
diff --git a/dev-python/munch/munch-2.5.0-r1.ebuild b/dev-python/munch/munch-2.5.0-r1.ebuild
index 5f016a764937..f0a35b912d19 100644
--- a/dev-python/munch/munch-2.5.0-r1.ebuild
+++ b/dev-python/munch/munch-2.5.0-r1.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="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 SLOT="0"
 
 BDEPEND="
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 01722c42c148..81f9837d56fb 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -1,4 +1,7 @@
 DIST mypy-0.760.tar.gz 1986638 BLAKE2B a52be64ae23d6a0d5c29301599a10114f6260f665d658b93b387a2f9c120fe186940591dfc7479fea4160d2bebd8950dcf67a1c21bd7ed4c6d08093235f2107a SHA512 e4dc38741a8f446095e63ba734cf26440b1ebb0761f35553d0eb79bb58bedb00c0b04b8d2a2b845c39ab8fc418868dab89a5a19668c6862bf763609d37946eba
+DIST mypy-0.781.tar.gz 2056785 BLAKE2B aa95d71400d5d46223a141adae5a8d797d2f076d3b6b48a7c09db6f7f3f2193d571368759f0ca307331d8e8c241b0322e758716a10fabccca3aaa6b733a63347 SHA512 dd3173115720510b278d15f5083a57fdb41582dfcaaf16e587116e41e87d608f4e226b61a978f4b41ef6b5ec6d3d9279facd65c0a74888b367171dcbe25550f2
 DIST mypy-typeshed-0.760-a06abc5.tar.gz 498726 BLAKE2B 9a2b3621806101cab009ac38e73c8683fba2789cad55da0a6739afd37bfb3ac4d8ea4e6b9cb9ba154a6fd45790f8dfda9e921d98485305c244573adf745d2adf SHA512 82559a91cc482f0cbd0cf5042d5975de21abc143708605a08c54088ee9ce3c9f52607ed3c00950442f4f526fd57f9ad4ada12a4f2acfb383759ac05f2be1a0a4
+DIST mypy-typeshed-0.781-e199c2e.tar.gz 541588 BLAKE2B f663d0feccffb315efd1b6e3ebc54bbe3cf4c7873c240ed54c7be1042807e2213326db8756b5a540fd9bf5ae95a2c0850e8cb35ae2e849ec3e9a628367fabe72 SHA512 57f3159d909799838779c04ccc6541322c27c01efb026c26a145676fa75076f64b8cd3e99f7488501582c743e1102cad59320512d52d4a058d8731c54c0705cd
 EBUILD mypy-0.760.ebuild 1716 BLAKE2B 26e0aeded0092360541dd435e85965cf0ee3627e28669d5b58b1e88dcf5f29a8c2501cccb4c7f3ee86a580c6f87372a01dc1a0ac83994a0deb04e26379c30482 SHA512 8238bf9823d63090257b5cb2f2c8dfa0599d570234c00faf02226f4ddeec7e94ab1aedec1f424aaa0e8cf7818d877ccbc7d95521efa3981c487aba6fdb6148ae
+EBUILD mypy-0.781.ebuild 2053 BLAKE2B 1ecc47467899ab7014180aa21d20d49a969984eb17411e7593b67172c0994ce51447d6f884f0f81350ef41faa77d0605374586b80b436014ab2c87d7775e578d SHA512 783cb0064654e2aca66a19b253b73c7d11703cbb216ec800447316866dd1d4c1a41cb655d9ee508d80c45e212f72a91efdcf605dc7e8d14308e2128c8de7f5a4
 MISC metadata.xml 318 BLAKE2B 26aeab57c568a3ebc431f846d61405428034bf9cf8333e5f52f43ec68d51fbbc2cb71deef622c07291312f63f46f29007ba4b02c21e90b4af3db039a43fda4ed SHA512 9e3c8432730d94d7ad9c65ccd1a48d7afc1b43662097f0844048ad107e81ba30e03bea99f64ee8a4171ff0504f1ff04d8d9a84407f414ff228cecadcb80c7c43
diff --git a/dev-python/mypy/mypy-0.781.ebuild b/dev-python/mypy/mypy-0.781.ebuild
new file mode 100644
index 000000000000..78823c7e84b7
--- /dev/null
+++ b/dev-python/mypy/mypy-0.781.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,7,8} )
+
+inherit distutils-r1
+
+if [ "${PV}" == "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/python/${PN}"
+	SRC_URI=""
+else
+	TYPESHED_COMMIT="e199c2e"
+	SRC_URI="https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+			https://api.github.com/repos/python/typeshed/tarball/${TYPESHED_COMMIT} -> mypy-typeshed-${PV}-${TYPESHED_COMMIT}.tar.gz"
+fi
+
+DESCRIPTION="Optional static typing for Python"
+HOMEPAGE="http://www.mypy-lang.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/flake8[${PYTHON_USEDEP}]
+			>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
+			>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
+			>=dev-python/pytest-cov-2.4.0[${PYTHON_USEDEP}]
+			>=dev-python/psutil-5.4.0[${PYTHON_USEDEP}]
+			>=dev-python/lxml-4.1.1[${PYTHON_USEDEP}]
+			>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+"
+CDEPEND="
+	!dev-util/stubgen
+	>=dev-python/psutil-4[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/typed-ast-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
+	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
+	"
+
+RDEPEND="${CDEPEND}"
+
+RESTRICT="!test? ( test )"
+
+src_unpack() {
+	if [ "${PV}" == "9999" ]; then
+		git-r3_src_unpack
+	else
+		unpack ${A}
+		rmdir "${S}/mypy/typeshed"
+		mv "${WORKDIR}/python-typeshed-${TYPESHED_COMMIT}" "${S}/mypy/typeshed"
+	fi
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	local PYTHONPATH="$(pwd)"
+
+	"${PYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/namespace-repoze/Manifest b/dev-python/namespace-repoze/Manifest
index 308c55181a2f..4fd5a8a5dce5 100644
--- a/dev-python/namespace-repoze/Manifest
+++ b/dev-python/namespace-repoze/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-repoze-1.ebuild 756 BLAKE2B 4fa679b01710a2f05bf05e6cd3c5be39c4dfb80c67441b035a2f6e5e3dbb1923264ffcae586d8e07429522c968111a4252e8c51abfb152285f6f6e268112c99c SHA512 309504e2e192d44f45500390119256449f3a862faefeb72d098fa894fb06936ec030ecb071ae7cf6361a6a9ecfd5dcd539e3690d0fbd85f180fca02aadc93e6e
+EBUILD namespace-repoze-1.ebuild 755 BLAKE2B bc0249534844203cba784fcceee9d066054efac9f402fb095d1eb65b61751f411c71432e0a4234a88de1b99760952b0b78934c1ee8f195740c05f3968b2bb425 SHA512 9346da9418d67c1b06276aa9a1cfbe1afaccbbfd3d2eacd779d2ec5696ab188e7ef375e90438579f277bef0c0e0c189eb3d1f0487cad4cecaa2f63645fda8705
 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 adf448164b3c..ae9ae8dde346 100644
--- a/dev-python/namespace-repoze/namespace-repoze-1.ebuild
+++ b/dev-python/namespace-repoze/namespace-repoze-1.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/netifaces/Manifest b/dev-python/netifaces/Manifest
index 31456b167ac6..061e6f82e0ac 100644
--- a/dev-python/netifaces/Manifest
+++ b/dev-python/netifaces/Manifest
@@ -1,4 +1,4 @@
 AUX netifaces-0.10.4-remove-osx-fix.patch 353 BLAKE2B 49b66642156ada3e01e7a7fa28b6e12a36b5bacd38676972b1685a2c2710bcdb531849d3c27ce5279feafa1048d060eb227a79ddd5569c5d48accba600f32e69 SHA512 0c47d026e1be42fdae860aade01762d0c7e27083fbe17dbed76526e72852f0444e56617431d081de9e4e86c7ce65293d83e704e56a3219face4d07106730255c
 DIST netifaces-0.10.9.tar.gz 28844 BLAKE2B abbe36ef82c5fa70bac60abe4c7bda671f8bc009567dfd38fcf2084bac5b09cbd42cc16c5c8023f3219129892f8def296e3cad8f9241d8c904a9c362c8077aa6 SHA512 8fc593de4d2cbda46a3e2430ede031360f1abfc64d47d00fbec09f3395fd83479bf29d97cb6834b1df06850c9ac2745c9344b6814f34be5975d4d5df98e05e87
-EBUILD netifaces-0.10.9.ebuild 609 BLAKE2B 7cb45ac9f1627b3d64f48c0fe885a41ca1dee93053fb0f2850daa8dde498ea5e06ab3482b3b9768f69199b41876e8110d7c9e9e11c64aafb4b5b50c5d74fa6c8 SHA512 b69612b9e63913e9b50e9682a9bf534e6a26b174df8c275c051be754c3d830da0b624da9d5f646387dc5db02e7b4922c54744d58ca31b4455e46a6d1a757c6fa
+EBUILD netifaces-0.10.9.ebuild 608 BLAKE2B fd106943f6ed84b7b58250c5e9c090cddd9141c40ef60f8657f491a9ce4e85386ca0e9931a80b98e48656afc1a9062222baee229935224a3fa4c8ced80f641a0 SHA512 826a1e09e72809217edf9b427d2c5a7dfdeb1e7a59cd2e08da729c3263b86e919e9bd146fa09af69002274ece28ba628e279c548015f36567a5594d51baf59fd
 MISC metadata.xml 513 BLAKE2B 2668fe590efd338d410c10a71076e5de04297b18f998b07dbb88a3df99e1c4e66ed92f97fcf6d06b2496bfec3ec308d3812f08b1640b73f1d2221beb669ad3d6 SHA512 88793ae0c8b539b78d70e1af3a18e65b7702e3663d950a9ea1ce7528ed3300ea0b4c69c5a48a652fac4c2a32ede679062dc929c165035a3cd4dec13513669691
diff --git a/dev-python/netifaces/netifaces-0.10.9.ebuild b/dev-python/netifaces/netifaces-0.10.9.ebuild
index ef001cdeedf4..faa08acf317a 100644
--- a/dev-python/netifaces/netifaces-0.10.9.ebuild
+++ b/dev-python/netifaces/netifaces-0.10.9.ebuild
@@ -16,7 +16,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 x86 ~amd64-linux ~x86-linux"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/notify2/Manifest b/dev-python/notify2/Manifest
index 054d04ebb61d..f23fe3b1d0fe 100644
--- a/dev-python/notify2/Manifest
+++ b/dev-python/notify2/Manifest
@@ -1,3 +1,3 @@
 DIST notify2-0.3.1.tar.gz 17792 BLAKE2B 649df1934d1fffb97dabbf2f483204c55427fbede851840d642da2e4e62a9bda9d49670e60f5b2cda36b62ee47b7d0cd861d757d338867547dce3c7d61ddf7b4 SHA512 0b69a64e0a7e4955ee767c975db92c5c60d28c0e54f77498cfb98390771a8f536631fc34e42b5c46c138dfa1054b5516a0809b8e3b0cb9237a39825ddb827109
-EBUILD notify2-0.3.1-r1.ebuild 736 BLAKE2B f9d106bba3f2b85c3d92b13ed85fac5a09c65f660570b3dffd89f7e08f19d96cd074926aa6e7e4001a8f76773853ecc122fa7b66f35d78ae4aad1764b33bd214 SHA512 a0c81c6f952db062e2ff9e02dde8e9c1d9b070c1e90f970e2a5b9c51c5a97253b2c249e1120778b3261abdddc5762244549a175abb442b4d8e90af3e44aa28b6
+EBUILD notify2-0.3.1-r1.ebuild 743 BLAKE2B 162a00192344b3ac3455803dcff0b5e3ad8fe0e0dcfcc020fe9dbc7905f64bba6387e5d14d5a388af9d4278d9c3e0f435f090dac460ac87f520f76dfd23626e2 SHA512 731090b79e20c962fee5151d692751290c5773fe7f7b119dfbd5d74ce17ebf0d9d14754fd939c521dd7e2fdbac12ef996bf4bc5e9d1ce8b1d7a7e97d0d5ce63b
 MISC metadata.xml 465 BLAKE2B 477ef3b148c7916372b0c12fc450dc9bacb59c609a3e3e005be6f8d5a268661405744c16180b336e34f4782f7e3a38ba17e63747d46199d0eb161e23d8415eaa SHA512 8024b5c580d09b74bf6a258dad507bec09d0c7bbbd10861bc2f866dd71acd7a858e7175dcb1d670cfdbade64da3f607667434a8587de6ceaeee7da028ce332ba
diff --git a/dev-python/notify2/notify2-0.3.1-r1.ebuild b/dev-python/notify2/notify2-0.3.1-r1.ebuild
index f93b2de1c5ab..a6cead16420b 100644
--- a/dev-python/notify2/notify2-0.3.1-r1.ebuild
+++ b/dev-python/notify2/notify2-0.3.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
 IUSE="examples"
 
 RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]"
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index 7f296435f509..dfdce86e64c4 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,5 +1,5 @@
-DIST Nuitka-0.6.6.tar.gz 2276002 BLAKE2B 74ada1032d5eef3068e6c0fbd088437014de8752b71ce98b90bb868bb7241efe301d4fa1ef661f00f54730ca3d27470cc6c804bc2b394085349ad9a1aed0feb4 SHA512 82752105fc5b5d5d09d460ba25a6424420ff055ea841a32c6e32ec9099870ceefe06dcadab347fe689cec94f4d8891a4125910f7cff504a8aa736139b29c2a8b
 DIST Nuitka-0.6.7.tar.gz 2284868 BLAKE2B 91c2e5362697d8c14f0627d757c70922aff3ccc2c9eb359f6b303e9ae7580d594106328b9fe644e8f668018aae496e50041948bdfbf59c27fe1ce0e50eb90177 SHA512 9f3dbfe67f2618a5363aa47974fe0199428a4798e79ebfcf78f15365048a6c676b5b2c9d5569adcd264389c66f643b3190647dc17acb76e59b9b95ee6762f5a2
-EBUILD nuitka-0.6.6.ebuild 688 BLAKE2B be99eea725e484957bf4d260081f6bfa20b033bf1e91d57e5eaae809095be5b7b122ce9c3a72199e4653e413ccb74dee083107cd331ede7afba651f6990b83c8 SHA512 7e1c022f0ab929c82d536ae2ca54817fd1a644bc6c6ebe73887d2518041f29dd5e1eac51bf4284204887e5b68dbc69ce141b9b19e09f5c597bf192d6709ee0ca
+DIST Nuitka-0.6.8.tar.gz 2390759 BLAKE2B 5f207a2dcac6a2825143268d3c28eab113705c050b67dbbfd3b655a0221ca3c04b2b206f3e8a85b4f17d28db52c11f19ea6260d2e7853c382942a76a15dc1973 SHA512 d9a9add759736c35fda57bbf82382effbcebce954228e56bf7c124502b96513f17a7083ded66da3ee33c52443b18c92839bff59a5c081d8fe44d6eec6c15fe54
 EBUILD nuitka-0.6.7.ebuild 847 BLAKE2B acfa001eba5272a0475c1485dc8fa0d78f6332f55a6a31ff28ba7dfcbf7b3e6a79eacb034847c7640a9729734e240a1d2e84736ad43d97cb4b5bfdabbbabeefc SHA512 5966ce002682111f0cffd9be9563394580cfc8d961f4173836fc639c9b0ab8d9346b9fe0b7db31d77e0a52070bdf782aa3eaa0d61774b95b537f4a86ad971923
+EBUILD nuitka-0.6.8.ebuild 798 BLAKE2B 621164897d4845339bf233f9cab2a5d3ca696b31bef3ca89c972ab1341b64a38ac117ede67a69d57b660b06fac476a2ae2d42f9b0511c9c053c45fb2b14e8ccd SHA512 e9a855f2d946da21b8a2abf8248f991c5509eed06cacb64507326723171b6a88ff3e6518b25be258bcbd6df561848e17575b4ed9dc85ce37fb47ba0951516715
 MISC metadata.xml 750 BLAKE2B 56bff65b936301e2d0347e553a1ea85b89c4c991697f665b47b01dfd7e40b94726fca15c67e4387fb79ec19f77851e275bb80c48ded3f76e6cf4cb81d10ba90f SHA512 01ed4ef871d9d43ccb30b60e5051f513b56d7ab3eb46ad64b76e6ee8f53f0088c4a3d75227a0870e82664476954d6603f70614232735f107bb24a06702c014ab
diff --git a/dev-python/nuitka/nuitka-0.6.6.ebuild b/dev-python/nuitka/nuitka-0.6.6.ebuild
deleted file mode 100644
index 08ab6c59bf2b..000000000000
--- a/dev-python/nuitka/nuitka-0.6.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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 eutils python-utils-r1
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="https://www.nuitka.net"
-SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
-
-RDEPEND="${BDEPEND}
-	dev-python/appdirs[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${P^}"
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-}
-
-pkg_postinst() {
-	optfeature "support for stand-alone executables" app-admin/chrpath
-}
diff --git a/dev-python/nuitka/nuitka-0.6.8.ebuild b/dev-python/nuitka/nuitka-0.6.8.ebuild
new file mode 100644
index 000000000000..7c8d263ff4db
--- /dev/null
+++ b/dev-python/nuitka/nuitka-0.6.8.ebuild
@@ -0,0 +1,36 @@
+# 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} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="https://www.nuitka.net"
+SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
+
+RDEPEND="${BDEPEND}
+	dev-python/appdirs[${PYTHON_USEDEP}]"
+
+DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
+S="${WORKDIR}/${P^}"
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+	doman doc/nuitka.1 doc/nuitka3.1 doc/nuitka3-run.1 doc/nuitka-run.1
+}
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" app-admin/chrpath
+}
diff --git a/dev-python/objgraph/Manifest b/dev-python/objgraph/Manifest
index 6d7e8a57477d..963875e7dd6c 100644
--- a/dev-python/objgraph/Manifest
+++ b/dev-python/objgraph/Manifest
@@ -2,5 +2,5 @@ AUX objgraph-3.4.1-tests.patch 2708 BLAKE2B 2b2c78340c1be1c60fe3b43a671b1fab07bc
 DIST objgraph-3.4.0.tar.gz 634554 BLAKE2B d1e58370a50a9c9d8647c7633a780069581eec61cccef56e83b015f26a7ffbba6b872673d72dc138339b3c97a3f08c02067e203ddb1d1048ae6f3611e0837fca SHA512 f1e2b9f22dfdce56988bd40aaa865572c42688e73800bb7c188b903c67ef3726c03ba058ed30d40792133a2e2fe74d5ecda91be3de8cf7b80188ac0b9f6ac393
 DIST objgraph-3.4.1.tar.gz 634602 BLAKE2B 17424fa5b6b079e9b0dabdfb5facc88fef67bb3742252fd986b19cb0b674c40f335e0372cb08a86e89d42cce0d504830c24471e0d34483925b33d44f45859445 SHA512 174e097cd9f9b5bd2e83a389d2ce3bd05a1754c1535923cc75f59a3281a292b50014501f093ccf1b2350fdbb34757af950636819227e39cdad2f64cb7de5ebb8
 EBUILD objgraph-3.4.0.ebuild 658 BLAKE2B 1a70a174cdc6d7b43860e3006d136b8d912c9a98244b492ef1372589c7951fa01e5953d1833e0fdeadd81bf1a64a529897d56582919634d33b58ccd373f306d7 SHA512 6209380e4e502984ab691bd2525f1eb89f7b44dccd9e7a84a99c5814b8e011c0937d14b5e405b9f42d112a50650f4714eba0d69de3def539460f3a29229e0da5
-EBUILD objgraph-3.4.1.ebuild 742 BLAKE2B 50ae601cf65234dfcbe3eafa1b406528fa7c3044d907af3f1603a30e31158047cb1fa64f0684d7edbdd3eca397082e10cf56ac544236289f82f15bb03aabac83 SHA512 0a76a415c2430a083e8a3193aa8b7a1a2f2a6282863577e5ee9338dd8d97a48cbcca5d13840feed8b37f739597a3ba6dd5319f28a2b2397c16d46e3e11621925
+EBUILD objgraph-3.4.1.ebuild 685 BLAKE2B af7cb7f4e4a181c08dd8bb46b6718a79ec3ffe7b650132ea2d36389ed56563652af336d3f89924cbc4fc0426b11c16fd0d2741635037b507850628bd3f4d6738 SHA512 ae052b9e243a9a8f2d3fd5a0f09b895965a202a182e99639ed5678cfb1d9f05ea4379fbaf9d0d7e9ddd5a2605988a88f0f38e7f7c160dbccda646f8858b9fd91
 MISC metadata.xml 323 BLAKE2B 61446164eeea15b99f003a44e0b0c3eedf83a0797401922efc0d6509c86446823201e9c7b91a11264f852ce0a56a2d6d5d5b27fe9d2205a4276c2cce5a312625 SHA512 94389cd95cc8aab6c1acd18c2135eac25566894f9d793ab8dc2af68789ee464dde409350bd4dbe9fd9a87c7f81e45723331948a7d9cfc792dfa51cb86e74ccc9
diff --git a/dev-python/objgraph/objgraph-3.4.1.ebuild b/dev-python/objgraph/objgraph-3.4.1.ebuild
index 2df7123cb5fe..3c4bbdb00f8c 100644
--- a/dev-python/objgraph/objgraph-3.4.1.ebuild
+++ b/dev-python/objgraph/objgraph-3.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -12,14 +12,12 @@ HOMEPAGE="https://mg.pov.lt/objgraph/"
 SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
+IUSE="doc"
 
 RDEPEND="media-gfx/graphviz"
-DEPEND="dev-python/setuptools
-	test? ( media-gfx/xdot )"
+BDEPEND="test? ( media-gfx/xdot )"
 
 PATCHES=(
 	"${FILESDIR}/objgraph-3.4.1-tests.patch"
@@ -28,6 +26,6 @@ PATCHES=(
 distutils_enable_tests unittest
 
 python_install_all() {
-	use doc && local HTML_DOCS=(  docs/* )
+	use doc && local HTML_DOCS=( docs/* )
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/os-service-types/Manifest b/dev-python/os-service-types/Manifest
index 60d56cda29c3..3c5a099cec04 100644
--- a/dev-python/os-service-types/Manifest
+++ b/dev-python/os-service-types/Manifest
@@ -1,3 +1,3 @@
 DIST os-service-types-1.7.0.tar.gz 24474 BLAKE2B 8adf1cf29d61cc37d08e7282d5b07312345a59ed94898da71f13702f51d4f3651b18d34cb51789fbc560a10c5dfeb8d760aca0fe25f630c7c00fbfd0fd4072c1 SHA512 d73f826134ce9d26720e027a352d8a91a8a029ac92bbcf0ace022a041f3c0aaea900a4e50fa00027f699a793b53ecc538bad5ec3bd8e2efbbe8b18540322ee57
-EBUILD os-service-types-1.7.0.ebuild 551 BLAKE2B 15275c1839f341179831869f8d7526d05ba0da264ac1da31dc586b469753eab4704698317a019fc88a8c36518be21d6885cc41f84e1aba8834272816026a74c1 SHA512 424c8fe3189b0813d204746853752f6c2ea9ee5a38b75c4da43aea6dfc4924dd4ba5cfbbf3efa891b9e0453e0d96059848a835f0dd8a9380e213447a1196c939
+EBUILD os-service-types-1.7.0.ebuild 550 BLAKE2B 153e53bd3db528e55bf1c356f3e036e290d37ee8f1e74d69c0a3d7c4b705f314d81fe7467446ba25db1c39f17faa3ac2e58677fc6f2362ed6e3bd860a8c4bdc7 SHA512 ffa33bd37097055f4850b97b8d3ce29d0be5f51a6ab4cfe4113f0d2f74bf99787f8f90ba7518447f5120bbd59af4c84a914354d4ebda542c5bc8ae69d2af7e3f
 MISC metadata.xml 596 BLAKE2B cd24306b859d804610fccde33b67ec4e0e9ac1724449f67af93df2e98e840781d7a077daac575dd9401c03d53148192d3f520b488426d428f803ffe812fd631a SHA512 063efcfb4484e91c21d5b2d0ea66acb2362a791c402bc2f2fe5a7f8bd2401a732dc0859e9be2a87f5eed72454fc87e05eaaa7666a9f99f73b68c35baa1f734ba
diff --git a/dev-python/os-service-types/os-service-types-1.7.0.ebuild b/dev-python/os-service-types/os-service-types-1.7.0.ebuild
index 9934f1e7a8cc..6db0f3f857eb 100644
--- a/dev-python/os-service-types/os-service-types-1.7.0.ebuild
+++ b/dev-python/os-service-types/os-service-types-1.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.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-config/Manifest b/dev-python/oslo-config/Manifest
index 4885f68fce96..cf72820f2585 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,5 +1,5 @@
 DIST oslo-config-6.11.2.tar.gz 152842 BLAKE2B 9217232e11252cd59bed9ae35ebad28fe8013f5608fe45544f7fb1d35cfb0a27c1172fd2f565f812ca3d9672d30df2962ac51de551cc50c8fefaae2266943959 SHA512 47e92c14d873a127e12fa734d975032bfa560a624111625b622d1b1896ce6e786ca661312afa894176941d4e8b13a2f6f5b44a05092e23f5fe1f8f78596498ae
-DIST oslo-config-8.0.2.tar.gz 148224 BLAKE2B 5f3bc55857a01429063a0c7afbce041f48952ca1db7bd732e83d40d68f86951db9bcdb79a80926c5b7ec747fde574817cc6a562c217b441b0bb61381d70ca4b6 SHA512 675ec0602cc8850e7a25733d24ead104a85541f09983924d90b829687fde22c5fe3947a67e0b8a024927b3fd40973cc7c144b26ba751cd86650ca210686ea8e5
+DIST oslo-config-8.0.3.tar.gz 147691 BLAKE2B 9af2a1ff399b52261561d268f6b9cc673629af572faadc736e851826ccf84ea8fcb8b8846b62f85671934f5214f289301157da7197dd5a15ad6e9ec1792bdb31 SHA512 09c49b0917d20c74e59efd6b8cca0394f98c337b075f916ae21f6072ce6f28a90a701a3f63f0737e4b3161cf4795fdb2be9b01091fd00828990cbc715683b0f4
 EBUILD oslo-config-6.11.2.ebuild 1306 BLAKE2B b5487b165d8d0033e059f12e8659d65337cb5440bdb1842cdbe8a5f4cc7dc7955b35d0b903a1a3eb107c979debd205ef7de6346e21550a880536fa3a1b6f7806 SHA512 cfc567e14554504a9a4251a50cc6a6404938063868d19d5a4f9fc85d7a675c0870f4f2c50e32492400ff0a83cf1f3edea888ed4d16e528e7e9f49604a7c70893
-EBUILD oslo-config-8.0.2.ebuild 1265 BLAKE2B 3c283fc58e731e4e1de29a806bef99019966b6da3596add9434e02ac69b94a1c31064c76f011df5ec4e5c1074ceffee3277f1728532813e0aa2807b092c03c3b SHA512 43045a80be041b522081373fac8038f87f1b61103b48edc1c7f2fbbb7f63b219162571f4b3f7d557809186b996419307f57774c29a7fa51c00c3ce9a1fe13876
+EBUILD oslo-config-8.0.3.ebuild 1265 BLAKE2B 3c283fc58e731e4e1de29a806bef99019966b6da3596add9434e02ac69b94a1c31064c76f011df5ec4e5c1074ceffee3277f1728532813e0aa2807b092c03c3b SHA512 43045a80be041b522081373fac8038f87f1b61103b48edc1c7f2fbbb7f63b219162571f4b3f7d557809186b996419307f57774c29a7fa51c00c3ce9a1fe13876
 MISC metadata.xml 670 BLAKE2B 5e3551e2fb4d57226dd82ad46f361f624d1b05ccdeffc1ce86a90692a385841ed26739a3ab01e72284fd6dc47a2607ee1bf30548a2b754944a9b975629fef261 SHA512 c09cd1761655f29d25e689ec95939fa59f4fb9a3fbd48509c0a65d2d289e073b3c60faa838e4075efafe32b2caf2b7fc3ae46af556cd50f66c37ac5ed8a1d52c
diff --git a/dev-python/oslo-config/oslo-config-8.0.2.ebuild b/dev-python/oslo-config/oslo-config-8.0.3.ebuild
index ceaab62f1656..ceaab62f1656 100644
--- a/dev-python/oslo-config/oslo-config-8.0.2.ebuild
+++ b/dev-python/oslo-config/oslo-config-8.0.3.ebuild
diff --git a/dev-python/oslo-messaging/Manifest b/dev-python/oslo-messaging/Manifest
index 13d0023641c2..6ad0b501ef9e 100644
--- a/dev-python/oslo-messaging/Manifest
+++ b/dev-python/oslo-messaging/Manifest
@@ -1,5 +1,7 @@
 DIST oslo.messaging-10.2.0.tar.gz 255431 BLAKE2B 971f24845b4d0440fb600b459b4a41c94220e387cbe2ef16a5c93d72e0582116702254c4d8106f5f3f3a3435b1c5bfaceffbb1c6ed3e671f7c269fb6d5ca3cb3 SHA512 404aed31f2808de744d7fd141257aca3d2db2b65645eebfffa7edb364e50803621af98886dc60b46042e525a7a98a12f3208ba472dcf805524cd0defdd441060
 DIST oslo.messaging-12.1.0.tar.gz 253854 BLAKE2B 6db26884f69be59cecd904b8ca0edc44a7f4e6a50ada154f28bf3a2a431896345ea7981ad7b195c12abe3f4d78d259c036e18e5544d2564e04d373c7cf2575b0 SHA512 1649f3520b6785eb5bf0f68cf174c1f60f32675ab6fa1400997704e97df7b24dcd63de751ab2313b839619b4eb250612ea32996c6c3c9956f7145010ca38cba2
+DIST oslo.messaging-12.1.1.tar.gz 255540 BLAKE2B 54ab60244090d3602de9395ea4f6ffa4bfa78783642aecaf7bb37db62c1a5cb63d69c612d2d1085ef96611429a8c7b337ac1849d93ed857a2cb51bbae6265ed2 SHA512 0f55f2c21dfd5f83efbf53f8c0cfa65d8572166662a183998c896c61475a38c47ae6e2376c5a153049d2f91e3321d6a75accf4de4ef11b4ec8626b448c0637a9
 EBUILD oslo-messaging-10.2.0.ebuild 1659 BLAKE2B 2c7381dfc84b54ae7260f68699baba2f017233738829259c3623fd57b87ff988fa299be89f4c37bfeb10419f8876fe2e323a3ad94fcaabeb955354107042f60a SHA512 b08d716fc977fd966c27d0fe873f229fc6a8bdda96895e975436785c9e9d6f435e31176a914f0be6ffcd4f122a354d57b0452dbbf4e6c20a89dc8065f9ac039a
 EBUILD oslo-messaging-12.1.0.ebuild 1655 BLAKE2B 39675af234182615ecb6be434e76b453cca4b4c41decd32a56fcff6ce3a48063da0e3ef1c5aaca6c3c19b8a85abc4e7344b17a9150a42ea4236d3709b7a6e229 SHA512 826aa5ce473aa5b1f30e046adf856b9ba213a5762c4669c5df40bc6cad73c645dde5a9da87792d308404512156fa2284583851508db21f8a3c6f2f6bebd88ad6
+EBUILD oslo-messaging-12.1.1.ebuild 1657 BLAKE2B ee3291ac61488c7d758eacdf0c4e3464d4744b731305d652ac74196fff83c004a5cd0be289af1fe79644528b268dbeb2aeffa4ed9d0b045f2e8e39c1d7beedb3 SHA512 331e6a745f999bb295f5a1abc14c3a54126b4f63a9c78bfb093a951d601a2f0105237f66dea5606b154866590ea7705da2ef48776a3c708282a001c218346449
 MISC metadata.xml 606 BLAKE2B 8ec973e563bc5efc9566d127aed486c8ebb7e71183c845f87d9c073971800868e7c2eda9056dd05da0310f82a121aedfa73204709f34477e75df34937202830e SHA512 c59bfd0c40ee7623a4194afa2848759b968c81955986f5b6a692d9ec59cbf11a14734466383da626535f9fb795193ba4994f8e57ff6c6cb732a9748abdccfd35
diff --git a/dev-python/oslo-messaging/oslo-messaging-12.1.1.ebuild b/dev-python/oslo-messaging/oslo-messaging-12.1.1.ebuild
new file mode 100644
index 000000000000..9e9105ff46e7
--- /dev/null
+++ b/dev-python/oslo-messaging/oslo-messaging-12.1.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_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.37.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/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.5.2[${PYTHON_USEDEP}]
+	>=dev-python/kombu-4.6.6[${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/ovs/Manifest b/dev-python/ovs/Manifest
index b75bea123ac1..4c286a234ee0 100644
--- a/dev-python/ovs/Manifest
+++ b/dev-python/ovs/Manifest
@@ -1,7 +1,5 @@
-DIST ovs-2.10.0.tar.gz 98548 BLAKE2B 9ab3ea02dbfab1622106ead1e19a96b279d73ee758fbdcfadcb50526b8652a80443c817513b0df92b78a6e788d7215386f18c5e9e59d71536cf481eac8b3a264 SHA512 9b7de41aceb2f3c08df765b97c5149cd66579f361b427b3bb6c24ab20cf922de688a82a99b1d98778311f15b37c73be2769a95b01c96db4fed122e272aab2adf
 DIST ovs-2.11.0.tar.gz 98933 BLAKE2B 8735cd4db64291790327fc1e8b144b76e4804472a99990488d57686c9eaf51ec1ee4cc0d4e1b0c3aaf979b547936c77cdb6f7656b0b16e16df45fe0d9b8c5f8d SHA512 104d9f783a1ff0bfe93fc17235c7a9d595fab5007ee3bb490ef064f7893756fdc4c7306c0b03f4c2fb5179efbb038ed163ca4de8c9c417426c6e157c0f17c39b
 DIST ovs-2.13.0.tar.gz 100450 BLAKE2B 943486bf0aad0e8e9eac96c85aeccb32fd36c60689623acc76175eafc286f4689142d6ea6953224e0a4ea8e4437c56738cb5b113286114de0898bf783cd49668 SHA512 7ec8980257ae87d24dbabc5900cf81253490bcfa0431f96b79280603da04a972fc536055bf532d2b251e03e007b49b34e8118b0f323e5fee05c116824d68562c
-EBUILD ovs-2.10.0-r1.ebuild 482 BLAKE2B 5bf09859d32c50a0ecb761790eff692da2f01ea1715d92943179ec59fb4a5289fe133b8ca26d72fa4edf95300e7d16c10dbd48e1db0021568362f1f90c6f6079 SHA512 04012f532bb553c7dc24c2eccefba17c234f44d3295b0fca870b3741410b50e70a321b15c575938521ecd08e97f683ce23e731ea099f7581da065cadca154507
 EBUILD ovs-2.11.0.ebuild 482 BLAKE2B 5bf09859d32c50a0ecb761790eff692da2f01ea1715d92943179ec59fb4a5289fe133b8ca26d72fa4edf95300e7d16c10dbd48e1db0021568362f1f90c6f6079 SHA512 04012f532bb553c7dc24c2eccefba17c234f44d3295b0fca870b3741410b50e70a321b15c575938521ecd08e97f683ce23e731ea099f7581da065cadca154507
-EBUILD ovs-2.13.0.ebuild 485 BLAKE2B 3aafdca5b4f76c0505d9d31768b0d31f37afbaeb75910e56678dc17a34f4f294fe24d393966e416940f95e7da73491566ccb59f3e85933cb7f8cb32dfd33533e SHA512 2cb1a411010e17cce962f7ff12065f32fd46cab97312c2477384ae1a8be2d7edace524cf2f3dcd0f00564a70948cd2f68284c1102f782147310f64059dacdf1e
-MISC metadata.xml 455 BLAKE2B 4b3662feee3f99c83ee91117f441d7bae841764b4f6a153dfe96574e7f8181e0db9e6f94c93f59b009e419a3879f8825e2cd76699a7ca82b5c88fb9df449f87a SHA512 53fad2964967c6b5d0a17cea549a01a23b0365a22ea53aa8a82d5bc26a2491651cd0ee276566493bc497a2c033b1a2139a516865ef99ba639365d1709410be5b
+EBUILD ovs-2.13.0.ebuild 484 BLAKE2B 8e45f2127ac5826bf56a95f65623e147bc7f704d3d56eb6ea02a54ff90dac18e6d079c354fed1f3e4d2d9fcc5c931c63ac81c477624da963aac6bedad7e21e40 SHA512 34bc16b3c97ac0c56d0e6e89974be2daaf0a13bdcb6b74ea70e2e844425aa1913d1b2adc6e12fa4e2fc70410e642610654e898957e08037d14d8bf70a6520f15
+MISC metadata.xml 375 BLAKE2B 19b2550d0f82a3aa091d80fe888a2d1d1ff657a8cd74da54e47a5d7a888a8180309385b1677fe99fa76dbf94547f7686ddcc5abccec70b711c52922815f3f969 SHA512 c30b29dd16ce17b01bb126ea62b15ec72e740584e50ff5b329e29902969c080e7761fef4aa59900ccfb8a87aa38205e59afacc765cec513680872d53726e7444
diff --git a/dev-python/ovs/metadata.xml b/dev-python/ovs/metadata.xml
index 1e0143ee3736..e4b456ef3e39 100644
--- a/dev-python/ovs/metadata.xml
+++ b/dev-python/ovs/metadata.xml
@@ -5,9 +5,6 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-		Openvsywitch python bindings
-	</longdescription>
 	<upstream>
 		<remote-id type="github">openvswitch/ovs</remote-id>
 		<remote-id type="pypi">ovs</remote-id>
diff --git a/dev-python/ovs/ovs-2.10.0-r1.ebuild b/dev-python/ovs/ovs-2.10.0-r1.ebuild
deleted file mode 100644
index ffad9a0f0909..000000000000
--- a/dev-python/ovs/ovs-2.10.0-r1.ebuild
+++ /dev/null
@@ -1,19 +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
-
-DESCRIPTION="OVS bindings for python."
-HOMEPAGE="https://github.com/openvswitch/ovs/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ovs/ovs-2.13.0.ebuild b/dev-python/ovs/ovs-2.13.0.ebuild
index 2cdc6e7a0c2f..f6e3fdf10c2f 100644
--- a/dev-python/ovs/ovs-2.13.0.ebuild
+++ b/dev-python/ovs/ovs-2.13.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/pipfile/Manifest b/dev-python/pipfile/Manifest
index 8bcbeeaf6643..6a361ef7507c 100644
--- a/dev-python/pipfile/Manifest
+++ b/dev-python/pipfile/Manifest
@@ -1,3 +1,3 @@
 DIST pipfile-0.0.2.tar.gz 17395 BLAKE2B ac86dc6a725cfec0e3d23cd24ab9cdbaa5c803b15916e03e6d2a1e371eb137e25836e78b3393bf6ac42c6d98ebf85fd4ccf29f63b8ab9b87cdd4828b3499278e SHA512 070986a213d0d42c3f5391b303ee0c4a588269ad1889c79b6622c1a9817cfcec4365b8764dcd208aafd78394890d3367c7c9782e65dd3f04ea1bcce001f164f1
-EBUILD pipfile-0.0.2.ebuild 697 BLAKE2B 4c30b7fb412be74281e09672d67a952bdfd4bc2062bc15fd94fd14c6a924ecffb9f5b1d75147be77de9908eee545104fa983aaeae30fdf76e9baba603ce31a78 SHA512 1ce2151461e2b575e6a837e34f68b114e7dc2b573f1b59b02f8d7ad24d5a0d016712c038cf5cae5081862af30f97a25ac72fb69643097cf202d1f8d54299c9a4
+EBUILD pipfile-0.0.2.ebuild 695 BLAKE2B c12aa9ad85a596d63334ff990e902d14ca0d6fd906f331df9acbc49ff775769a41b097a28d66a467e8422a53c2e8b7497a56596b43d2bebbe18f4fa109631ea5 SHA512 97258793c32771bfce845158ce002c8cd624dc45af68b60f69f6553441b7c5aa08dce10eacfe1a5b58a3d10846309e674191184b825d4c591dc17fe0665ac780
 MISC metadata.xml 374 BLAKE2B 33a0b13410d7700b88daa529d089d32088b734da535af09b4b721017fad386338323207c58d94d517762f617d1d73a8e4bec44a5fcfb503ec8af83a65427e047 SHA512 7469685c63c03c2dd25a114bec9c2c3c8531858e45bc880f5cdc6066a9c22a7ca73d1be0d8ffbc5eabf3ca28ed80f17d18f4eaf86bb54ddd888a1fbcde53a49f
diff --git a/dev-python/pipfile/pipfile-0.0.2.ebuild b/dev-python/pipfile/pipfile-0.0.2.ebuild
index 2072a52b284f..9845ba0ce4a8 100644
--- a/dev-python/pipfile/pipfile-0.0.2.ebuild
+++ b/dev-python/pipfile/pipfile-0.0.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pypa/pipfile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ppc ppc64 sparc ~x86"
 
 RDEPEND="dev-python/toml[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}
diff --git a/dev-python/portend/Manifest b/dev-python/portend/Manifest
index 110333c14baf..a1321b9dfed6 100644
--- a/dev-python/portend/Manifest
+++ b/dev-python/portend/Manifest
@@ -1,3 +1,3 @@
 DIST portend-2.6.tar.gz 12295 BLAKE2B 307bb77bb7d73e201f00ca203204149bb4fba8a00277da08f804626be4d01b15bdd38ade7a49c7acafd37263cad6e8c62e0eb6e6bdec0d9e10267c1fbf469aa9 SHA512 9e53c668ba9d0ddb2e92d9b4c97d2b8a4d858a6fc44123414ee3c8ac433f51f50a4773ee08f85bb134e49aeace2a17baffd32962d36df0b19b505a2c6634bf7e
-EBUILD portend-2.6.ebuild 935 BLAKE2B 5ab99520aad767a0f6cc7c8b5993799db2652f0c03f62d2f90e31f023b37a657c5edb04ba704f14d6a7553d632a3e11a6ee6f2fef2f3b85d388d44fd3978e1e2 SHA512 5d7aeeb4b4255969f5d15c8e4c49b5770c451e8413d63801ecb446c80eb6f8cf79745e85260b97b6d0d9eed8d1d7717897c034fb439a16381a4dc449bc5bcd89
+EBUILD portend-2.6.ebuild 934 BLAKE2B a05c558881d592ba1cde8960bb846e672db63985da5995fa914869a1d2890003b3c44607da5b84f7c57dd5127ae4bcbf247476546f681389c2c1fd766c871d27 SHA512 4790e5c5954242b80af7138b10c6ed632a80ee99caf4756e1101e6c3ecaac91fa3e3243ef4244dff249edc32ea45c57182a34fa4fce2103720eb7ce24e5d0f85
 MISC metadata.xml 469 BLAKE2B d4b527da8fd402a1f9099000265ed003555c4a6f492a5d9c0ee5c350af1a044fae6505b6f847d55f45eb4551c1dc6f1ac8b946c6ab5b68768bc583521fc4a485 SHA512 3ab794a7c4545b3d5a5281499ae87a0ed377bf7f83acd0ab8bb2eedddc3005f03d793837ef9aa8e681374357067a5edf7bcf50da48c0b5d36bf0696d8bd2353f
diff --git a/dev-python/portend/portend-2.6.ebuild b/dev-python/portend/portend-2.6.ebuild
index 3fc08e4c32cd..0e7cb595daac 100644
--- a/dev-python/portend/portend-2.6.ebuild
+++ b/dev-python/portend/portend-2.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND=">=dev-python/tempora-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/pudb/Manifest b/dev-python/pudb/Manifest
index 7d0c86c8e491..7d42915b30a6 100644
--- a/dev-python/pudb/Manifest
+++ b/dev-python/pudb/Manifest
@@ -1,3 +1,5 @@
 DIST pudb-2018.1.tar.gz 56771 BLAKE2B 1c57392a2dcf1a178035fd5824b253a0b5ad19990d32360956b55696f76f40c69b3baaaff14bd4bbc4556bb7c7e12bbcf4f00aea057555480771bd27c1ec4ced SHA512 4f0311d5a8642ff7097c2bceecde9a45999ad4567e008507cc8f977cc1e452cbbb80be525d08703c3e22038831b6b94e9b5b46ea1f1a1dc2d4292c8df9ef7ca7
+DIST pudb-2019.2.tar.gz 59548 BLAKE2B 2df98688948ea79b8bbe125735aef04b3ea5d6db4adba503610c3fc88201cd0ae6da3249371f9ef78d1f4650901a02cc25738201e4891695f7726c919dcdd702 SHA512 231663b404e0e7d35f32235c02d4878b41a043054821c3d39d4a05d45c1e45aff0eaffb0a6d96669676b52538ca99a69de64014f922e3c80405d34198c6d4812
 EBUILD pudb-2018.1.ebuild 539 BLAKE2B ec979d5c3967cba0e7cf8a24e2dd611e0251c0729b168ee80737c0c813165e072a029942b86cb3f222f760aaaf4fb323255eaa5b719fa01c7d69e3117cc218d9 SHA512 27eddcff1341b0c5e3a3558bcf2c0a08805cbbab7e4545e5da51a4b40453a2815a51fd0257b9e134c897a30838e98c08a007908393477bbd31ec8f4496f8c55b
+EBUILD pudb-2019.2.ebuild 576 BLAKE2B c297570675de6ddb82781f4f855ab934d39b5b4b439e80b4a8a46115025618f95b968b00561d6b40817a4e698720c87b26d30bdfb08df96c8a1e1127fd733147 SHA512 5ce49e3062e596bb9d5a83631683092f60ed065205433f9c3f2c2ee6b874e900d7ee795519e947dd65a3b367a5b7a84d4f6ef7358e33e6d8971423099c423b0d
 MISC metadata.xml 414 BLAKE2B 1abe543a64e7bbe606dac8849179cdcfb7320ef31a7af659f0deef09cf34a75ee2c72f208637adc20c41fbfe5103bcb3e917d249db77abc62fb8c0bcb8a168c4 SHA512 a9655f42b68e2268f8e54d6a02bf94206ade7251f30ae35a1d9ed4b466901c3a06fc00178b325f2e8fe26e413c27326b826316b78da62ae6c1c0a256a4a12ff3
diff --git a/dev-python/pudb/pudb-2019.2.ebuild b/dev-python/pudb/pudb-2019.2.ebuild
new file mode 100644
index 000000000000..53fee37bef92
--- /dev/null
+++ b/dev-python/pudb/pudb-2019.2.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_{7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A full-screen, console-based Python debugger"
+HOMEPAGE="https://pypi.org/project/pudb/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pybtex/Manifest b/dev-python/pybtex/Manifest
new file mode 100644
index 000000000000..5dd3f637318e
--- /dev/null
+++ b/dev-python/pybtex/Manifest
@@ -0,0 +1,4 @@
+AUX pybtex-0.22.2-fix-test-installation.patch 410 BLAKE2B 6c9addde727e5e1c0001a92ad39c307399331e6ff6e1b5aa9cd691e4c8d6381f0d911fc8e622e8a2dd76736fbeb24513751651886a9db0b5e790a509b9043755 SHA512 d357f3f0566fb67b1ce2abb8669429b344f8d6f4bc8651ea913fba3337bfb33a1a7f6a6e1361b42b42cdf92ec09f60c42262f5c41f12da6b34593a1033c732db
+DIST pybtex-0.22.2.tar.gz 363094 BLAKE2B 6e59543a1178f2d3528c8b65b63afd720864fb8f31172e3fa76a36bee3d5dd9f32aa6226fa0a599af0a4705d3c37060417f6e902ec7b900efcc8a6f8487c31e1 SHA512 afabae8c47008651fa9c4c6546bf87f4a2c74d3184f1d0c1b4c2bd68ad8110ea37054026b5934312b86d97354a592bae5c0b6d384003b4e56f0157f6520b77a1
+EBUILD pybtex-0.22.2.ebuild 759 BLAKE2B df045fcdcefe4aa66649535908b9ef0fa351eaa65b4ad2b6d2c1b242ecf27dfc903e58bdbe3d28a2724fb4c3fbbde65b95b9bc203cd94de927eaebb76b9bc954 SHA512 68db3f850d94a9baa3324e00f2ee929bb54af9b165a957c02203a14a50c5a3eedb26ceccff8d0834524793b4324711c62074656bc07b400cb6acc25cf879890d
+MISC metadata.xml 522 BLAKE2B 62e314da62e360861bbe2fe0a8c71dab45a03aeb3161adde5680e19b3d42d51c75294d288b7e7d89483e9dd9392f52b935e1ae33e0f732376284d988061743ec SHA512 9a27f72f6b1c15e6f30f33afd02c830949032c5315bd3b4cde8fe136f82602b32b1e1f7fafb12c58d2decb18e14bc88dfc507014b263dc1911e2e4cf74b677a9
diff --git a/dev-python/pybtex/files/pybtex-0.22.2-fix-test-installation.patch b/dev-python/pybtex/files/pybtex-0.22.2-fix-test-installation.patch
new file mode 100644
index 000000000000..a5420314fd75
--- /dev/null
+++ b/dev-python/pybtex/files/pybtex-0.22.2-fix-test-installation.patch
@@ -0,0 +1,11 @@
+--- a/setup.py	2020-06-02 10:46:54.592360043 +0100
++++ b/setup.py	2020-06-02 10:47:00.482302281 +0100
+@@ -82,7 +82,7 @@
+     ],
+     install_requires=install_requires,
+     python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*',
+-    packages=find_packages(exclude=['docs']),
++    packages=find_packages(exclude=['docs', 'tests*']),
+     include_package_data=True,
+     cmdclass={'sdist': Sdist},
+     entry_points={
diff --git a/dev-python/pybtex/metadata.xml b/dev-python/pybtex/metadata.xml
new file mode 100644
index 000000000000..cf290da2e8b7
--- /dev/null
+++ b/dev-python/pybtex/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>william@ewpettersson.se</email>
+    <name>William Pettersson</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pybtex</remote-id>
+    <remote-id type="bitbucket">pybtex-devs/pybtex</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pybtex/pybtex-0.22.2.ebuild b/dev-python/pybtex/pybtex-0.22.2.ebuild
new file mode 100644
index 000000000000..5359af384462
--- /dev/null
+++ b/dev-python/pybtex/pybtex-0.22.2.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} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="BibTeX-compatible bibliography processor"
+HOMEPAGE="https://pybtex.org https://pypi.org/project/pybtex/"
+SRC_URI="https://files.pythonhosted.org/packages/source/p/${PN}/${P}.tar.gz"
+PATCHES=( "${FILESDIR}/${P}-fix-test-installation.patch" )
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/latexcodec[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]"
+
+BDEPEND="test?  (
+			dev-python/nose[${PYTHON_USEDEP}]
+		)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 5fa477e6e10f..71b023a8a6e9 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -2,6 +2,8 @@ AUX pycryptodome-3.9.4-parallel-make.patch 756 BLAKE2B 06a79eff056ecb98313183828
 AUX pycryptodome-3.9.4-tests.patch 2201 BLAKE2B 93bad5e716c968c1d1b765c0506f5e46680d3f1b71a89e6b6cc17c73475ca44433f75f03661bb5bb32905a9898c10ab13167e883a5240d08e540c6bf5adcc06a SHA512 8154064bcda7a4d7d9e87be09f1ecfdc1a7553b9fc82d7f9c7c9c12cef216d856d6135925c0cca64708e5f3f8009be27a97405ca7d31945af89248f77a0b8f5f
 DIST pycryptodome-3.9.4.tar.gz 11575825 BLAKE2B c153fe71179d633a5722480c4c42cc133100f524a8ba9d3cd9380b7e172564c276b70b97ef36437fa3a149c418903802f410c9d1807d5d72345dffb0aa568223 SHA512 d99e4e431d77856ce3ae33526984cadf2fa6aa82b1f692a2ad0ae893f6a1e9538e6d71d281578e6bd733a816664d1683364c64441196cbc6ee1278f9d6eac62c
 DIST pycryptodome-3.9.7.tar.gz 15451558 BLAKE2B dca2cf3500d4011b8c37937c3f844db3e8e4afbec2c421552bcdc08df32ae46d8a2dadfaa2d48aac2356374f30154d439cb9e988e1035c570b0adebc58b259e1 SHA512 2ee8ec1094ca2b3813c25b96c71988db479b23ea2e76937275d0fd6421653efd1ce7a1e279c7a20a9de7edcb59e0927121a42112b85afc052edcd6ab2db74c26
+DIST pycryptodome-3.9.8.tar.gz 15633268 BLAKE2B 8c4f8d4839be0fb09556677514ee6c7f832684f20eb4e355cee87eb5b52a5c09e12712c1865ff89fb5dd6c628ca027374c7cab8a2287aafa4eecedf1095f1a12 SHA512 894e763720df284804fd686d5805980853b86773bb3097bf03d929818b9944e5a257e47414275f302966864751e50ae34dea19ad749910f1ceac31833a53ef7c
 EBUILD pycryptodome-3.9.4.ebuild 1476 BLAKE2B 9cab4ddf6853756aa114c6ced6037c135320169548c7605e33c2adfb865bed5d72b8e81345dcfde5817922d037001b98fb181c011c9d2e011f3e6f6e153aaad3 SHA512 a7bf5e4dfd64cb10a5dfebd1695d015c56fcb602f6a5a8ce80ba43f036e4f0df02d8c871fb7766e77dd844c223e734a973cdb8bd5b7c5a35c7d68264188c2f8c
-EBUILD pycryptodome-3.9.7.ebuild 1339 BLAKE2B f179600a7b4cacb2ea5ea1f6f55466b548bb163ef9ca532f9fe67c359ebd3dc8b0d2b94b5f6b5c56e52184b0a2e8c18f28f3c868189e11dd963d7be1679d83b9 SHA512 af9134a206c03537c43ad478b25103e870e81f82fab1a67a36f8f41a37e20aa0df1a44ba195a9a4bd9d1cbf9ca31bce5cf2a54c90ad966e34ebd7696d9bba367
+EBUILD pycryptodome-3.9.7.ebuild 1332 BLAKE2B 919318590a20e2cf4127ac509611c7ad41c8a569341eff817e54f240694aa263ec26b995bff9c2d25a25761e371055a8854f63b0aa24aa90b3a9b31033cb6ebd SHA512 0cae21615849248874f83f36d6bc55354d0c2ecba39d20a30c3488c37ffcf84c11807bbca64faa871b8a5c0bcf6402045f0332d53bcd48d41ea5dd3bd2a7506a
+EBUILD pycryptodome-3.9.8.ebuild 1339 BLAKE2B f179600a7b4cacb2ea5ea1f6f55466b548bb163ef9ca532f9fe67c359ebd3dc8b0d2b94b5f6b5c56e52184b0a2e8c18f28f3c868189e11dd963d7be1679d83b9 SHA512 af9134a206c03537c43ad478b25103e870e81f82fab1a67a36f8f41a37e20aa0df1a44ba195a9a4bd9d1cbf9ca31bce5cf2a54c90ad966e34ebd7696d9bba367
 MISC metadata.xml 335 BLAKE2B 7e5036b03371769db2f3a8d0cb5d5cd9078f16d4dccc3bd012f0d4f96ba960388c3025df93bb165f3cdbe05d73da05537a373e01b799aac2dc59dcd44e6206b5 SHA512 a94a7c0c45ae597e5c4ac672a5e9151851448371ddae0fdbd9967651476681440f2d4a6071e2cd0c4a1553038a92f4e6649f0554b636d58a025366c57c80e899
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.7.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.7.ebuild
index 43e92f7ffb38..bf92dd941db7 100644
--- a/dev-python/pycryptodome/pycryptodome-3.9.7.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.9.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-libs/gmp:0
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.8.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.8.ebuild
new file mode 100644
index 000000000000..43e92f7ffb38
--- /dev/null
+++ b/dev-python/pycryptodome/pycryptodome-3.9.8.ebuild
@@ -0,0 +1,41 @@
+# 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,9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A self-contained cryptographic library for Python"
+HOMEPAGE="https://www.pycryptodome.org https://github.com/Legrandin/pycryptodome https://pypi.org/project/pycryptodome/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2 Unlicense"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="dev-libs/gmp:0
+	virtual/python-cffi[${PYTHON_USEDEP}]
+	!dev-python/pycrypto"
+BDEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/pycryptodome-3.9.4-parallel-make.patch"
+)
+
+distutils_enable_tests setup.py
+
+python_prepare_all() {
+	# parallel make fixes
+	#  Multiple targets were compiling the same file, setuptools doesn't
+	#  understand this and you get race conditions where a file gets
+	#  overwritten while it's linking. This makes the files look like separate
+	#  files so this race won't happen
+	ln src/blowfish.c src/blowfish_eks.c || die
+	ln src/mont.c src/mont_math.c || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index a88b903206f6..f09cae341a8e 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -2,6 +2,6 @@ DIST pyfakefs-3.7.1.tar.gz 179420 BLAKE2B 46f902527c2c69af1d7d5e296a25d5415b4fba
 DIST pyfakefs-3.7.2.tar.gz 180195 BLAKE2B f1e76b652fc67f630fb45798974dc22455e9e99509829fbcaa479f36887c90207d7b6f087e89c9e113bb44df8c4221dc4676129663740812a9426d84a1d47401 SHA512 33bdbf7e21f1135c0ee048943a4b7dffec96e018285e4ee2e6a1c6a7f9e595e27348c83af3803d80322e7fd12a59985a6bf6342aa6211ba95c74ffa20929fb5a
 DIST pyfakefs-4.0.2.tar.gz 177627 BLAKE2B a52bd900466203af6170bb9ce92f1e5f73f246d576f12390f5b52224de34fa69a3a4c426319b701953f040e343bcf267e20ea2a33df62c4a46f6397f760330aa SHA512 ba14cbc278ece50142d441b7731b01ba316ba9f11e5d442476e12b8b678490aace9578eb3b2fa2e47d6805795ceaf85574d3c5fb992a098585597c7e96d7143a
 EBUILD pyfakefs-3.7.1.ebuild 870 BLAKE2B 9747111d6a1176e1f095f24313bb9fc60fcbd96492b73b6268269bd7d177c81afb0671fcadbfba9d42557bd7ff16dd9e9eff19acfcdb8888895082791bcfa867 SHA512 b00d85a7831213a5cf428a0c01fdc6b3d5251cd9533a8b95caf86c553c0bfff7c2fcd342ed86d5ae37e611aed47cb08c022ef5c7963b1c7232d000c63d981af4
-EBUILD pyfakefs-3.7.2.ebuild 892 BLAKE2B 5fa1f7fe9d769114736eaa7889a697c6fe2842bffb8ad5cdc34f712b6f1fe8499241fad9eb22384b6e8badd04628e5cccc0fe2925ea11977f9ae3f0cbe311653 SHA512 a25afb667c5d99df015f9f87a4eab20e0747bdecdc91e69b2bd0e2230948bdf89e00e2b72536406cd03f8404da0b5ec3c9d513911d8d8c5e6ebe5dfe54606035
-EBUILD pyfakefs-4.0.2.ebuild 877 BLAKE2B 6ace2c771acc3bd1c8783b70c93d7939b93487040c75aa63786737ad959e1594132ed787058fb83f28154c25404070dbbad478548fc7da3347f68b10200944f6 SHA512 87a775c5effea040c51cc0998cfb9ed7e1ba57ffd13a0b28999c0a58c6c90cc9c55d3ba10a8345ad841c6d8347ec960bf50edb3524c68f689900acfccb6e6611
+EBUILD pyfakefs-3.7.2.ebuild 893 BLAKE2B 689b0b8470e1652b2a4a8b07fd4b653114fe06dd27d5c6cbf92a9884ddea12e9369c540445034cac8a992603f486d40ef111e949709c14ab0c578928bec1b8cd SHA512 68f886b385e8a9539e48c55f0113490504f03dfad5990a17165e6ddd676d92145798a2ed67645a947e8fd2cf8cc5ba9506bd4b13fd4a4617084dbc3874dc5c96
+EBUILD pyfakefs-4.0.2.ebuild 883 BLAKE2B c2f8841919d18ee508576c6220cffd28aae9850940e34f22558edee2ae0d05aa625c23481cca23f0a308d2a88f7354d06ad937b5cbba7fc23b5b849f4727ca55 SHA512 e39a85618b8cd7d063e5d2a7a61d924bf8cca756d281fb7a21bd14797b4d8405f5e307bdabf526eb5eb8d4e705ba0182d5c4129c1606c26a907f4571c6d44082
 MISC metadata.xml 370 BLAKE2B 9111da9b75b84d43a287c2d902b6b83b77b3c0e0a0f650fb73a904022304028678abb75f5620e93d15b0cac474b731c2c39ae2589a77e6dc96e1797253062e0f SHA512 674874289f039549b14d81863c992ab20053777049a25f3f9ba1f596cf345a7e463db7516738d35e78a5079f660fb63ec24e9029963ef0702d6c268eca384d8f
diff --git a/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild b/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild
index b866264b0c15..f2c68f229024 100644
--- a/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 DISTUTILS_IN_SOURCE_BUILD=1
 
diff --git a/dev-python/pyfakefs/pyfakefs-4.0.2.ebuild b/dev-python/pyfakefs/pyfakefs-4.0.2.ebuild
index d793aa33856b..f23510b3baab 100644
--- a/dev-python/pyfakefs/pyfakefs-4.0.2.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-4.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 DISTUTILS_IN_SOURCE_BUILD=1
 
@@ -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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygtksourceview/Manifest b/dev-python/pygtksourceview/Manifest
deleted file mode 100644
index 830cffda9128..000000000000
--- a/dev-python/pygtksourceview/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pygtksourceview-2.10.1.tar.bz2 290249 BLAKE2B adc3ef17b06a2c860c9d396aedec1cc3361d62539ffd6bfbf749d5e0ad14a1f567fd4fdeb829a8e9bfe4bdab5e1db3253f9469d2c068f5053a10342bc0c2d70c SHA512 6f8f35ba36cb26f256861ff7f14c3236cf566d6d02f3dea69f63844081caee969ad6288a2aa48d35d4eb542cda73da9d4bfe2cc57548ca15cd372011cab0276e
-EBUILD pygtksourceview-2.10.1-r1.ebuild 1239 BLAKE2B b4d880c639d5d5cd0aed25661507be247cd0a5f0ac0becb401b96101350b4ef9bab69e80264de13bc3c0dc7b0e153d08e250470a0a5ad943bf4262c8852f7d93 SHA512 be82ac7a279049fa8b11a2bee66e01f07d5d2c55020efb271fdaca9d3efc161dfc10ff945eb61834fe773fa37247adc49b90a0dea0140e1dc60fe49a59aa75eb
-MISC metadata.xml 371 BLAKE2B 17fcf46f5d1a6f78ffd2117fae5abc0b06eec36118e4093462637b9bf0e63b8f655cc9e910c5a250a36c39ca8ba275adb507fc106690c897e8114c37fad13f3f SHA512 4565cd4175e40911dd6f7ad7880b7a8e2214e0e4bcedc10b4eb37558309717bdae656257e87dbb1c9ee9220321e800336219e370b41e28437d11404b6a20f7ca
diff --git a/dev-python/pygtksourceview/metadata.xml b/dev-python/pygtksourceview/metadata.xml
deleted file mode 100644
index f49d4aada970..000000000000
--- a/dev-python/pygtksourceview/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<!-- <herd>python</herd> -->
-<longdescription>
-Python bindings for gtksourceview (text editing widget)
-</longdescription>
-</pkgmetadata>
diff --git a/dev-python/pygtksourceview/pygtksourceview-2.10.1-r1.ebuild b/dev-python/pygtksourceview/pygtksourceview-2.10.1-r1.ebuild
deleted file mode 100644
index d3fbdc891d0b..000000000000
--- a/dev-python/pygtksourceview/pygtksourceview-2.10.1-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-r1
-
-DESCRIPTION="GTK+2 bindings for Python"
-HOMEPAGE="http://www.pygtk.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/pygobject-2.15.2:2[${PYTHON_USEDEP}]
-	>=dev-python/pygtk-2.8:2[${PYTHON_USEDEP}]
-	>=x11-libs/gtksourceview-2.9.7:2.0
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.10
-	virtual/pkgconfig
-	doc? (
-		dev-libs/libxslt
-		~app-text/docbook-xml-dtd-4.1.2
-		>=app-text/docbook-xsl-stylesheets-1.70.1 )
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir gnome2_src_configure $(use_enable doc docs)
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	python_foreach_impl run_in_build_dir gnome2_src_install
-}
diff --git a/dev-python/pykerberos/Manifest b/dev-python/pykerberos/Manifest
index d70a55196dda..12245c273ff1 100644
--- a/dev-python/pykerberos/Manifest
+++ b/dev-python/pykerberos/Manifest
@@ -1,3 +1,5 @@
+DIST PyKerberos-1.3.0.tar.gz 41033 BLAKE2B 5805df2c258a75321dab5fe84fcbf1de706cb7c14a710c914ae4918dd39f79036a4f4033a068982778f73d9f00a4ca45b80e9cfc59c6a246a236f3c6931bacc5 SHA512 ed2644a236993d9737af43be951d57207fc787a74e82f343b265461b456923763610f1ce1b46d7d56f22d6452be1418b98707b8529b22fd8abf299143e52cf69
 DIST pykerberos-1.2.1.tar.gz 24535 BLAKE2B 5c6253d99857a5061f708e213e24e0ac34a6fa2a39332d5a0f27f30f1ac9eec45654966113c3036cf9bbe27ee9642748afe4cef845d2ceda26286ced1e2277e0 SHA512 048ed0238911b3e9970a5567ddc2b5e3b551e24bd8d08f06e5807f238c566ead9998e0efb0e3207f178ef2a8c9116f4ed4b7c728b9279f7a88f0945a7c4b081f
 EBUILD pykerberos-1.2.1.ebuild 538 BLAKE2B b91efdf6339c059e478a0933d84d2ea2e2bf185e6ef6e251c7bffa988464c5e7cc5b59cc4a05d178e6090de3650dc9bd8c45d2d08afa9e1d9bee17b01f5b06cd SHA512 3dd103eefc57a1a8f1c9d01f996639ca17300b2020627d6291589ad30e37837a1a237b74ba556360ad983b48b85d419f8c5f27b49ba9c689256f181ef4f216a2
-MISC metadata.xml 332 BLAKE2B c6badaa93a0f9f3000d4865e58d38f56d57ebf51fd4ee4f8d6d6bbf3926dd4b0b7c97e46df5206622579a788c86e12de778f2207da80ba97814ff16dc8d04d38 SHA512 a3246676e0c2f0430c285ae4f58b5ca754376936860c9d04d9ef46ce111bafbfebcd25e8dc28f1abfeca92dcbc6a329f711272ad7dd501bc9a1c7b34876cbbca
+EBUILD pykerberos-1.3.0.ebuild 1322 BLAKE2B c9966a85e9bbf2ca2494b04e90922d64f9924b383c44e5a717cbb6a922cb8a8e813080d5f19fbc474720846b2141979f427bd55a5bcee2acc618f474a5207f88 SHA512 f007f8269effa9ba8591c5eced37a1409e133db97897519e273e22289ba9829c4a4da1961dc4f2378ed307d11a1c695721dd4e66474561803cfd5fb4a8165e46
+MISC metadata.xml 423 BLAKE2B bc74606c5e0d18c76749904da2d388a2be603d2aad92538dbc0ab92974903a24a78788094eb6da7775028b8cd178334b243246fb0f4ba85f90f74fa31bd74f35 SHA512 c84e39a4e84b841aed995cd47aa349df5c4d3ec32757e826a7194c7f629e5f109e30c841f4f4bdf949e966937cde58ee555d6dbe02496baecc25937f06244950
diff --git a/dev-python/pykerberos/metadata.xml b/dev-python/pykerberos/metadata.xml
index f77c840a4c11..856e0e9fd9ca 100644
--- a/dev-python/pykerberos/metadata.xml
+++ b/dev-python/pykerberos/metadata.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>maksbotan@gentoo.org</email>
-    <name>Maxim Koltsov</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">pykerberos</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>maksbotan@gentoo.org</email>
+		<name>Maxim Koltsov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pykerberos</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pykerberos/pykerberos-1.3.0.ebuild b/dev-python/pykerberos/pykerberos-1.3.0.ebuild
new file mode 100644
index 000000000000..1a5dbde1c25e
--- /dev/null
+++ b/dev-python/pykerberos/pykerberos-1.3.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
+inherit distutils-r1
+
+MY_P=PyKerberos-${PV}
+DESCRIPTION="A high-level Python wrapper for Kerberos/GSSAPI operations"
+HOMEPAGE="
+	https://trac.calendarserver.org/wiki/PyKerberos
+	https://github.com/apple/ccs-pykerberos/
+	https://pypi.org/project/kerberos/"
+SRC_URI="
+	https://github.com/apple/ccs-pykerberos/archive/${MY_P}.tar.gz"
+S=${WORKDIR}/ccs-pykerberos-${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+# test environment is non-trivial to set up, so just use docker
+# (see python_test below)
+# also for alpha/beta Python releases support:
+# https://github.com/apple/ccs-pykerberos/pull/83/commits/5f1130a1305b5f6e7d7d8b41067c4713f0c8950f
+RESTRICT="test"
+
+RDEPEND="app-crypt/mit-krb5"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	set -- docker run \
+		-v "${PWD}:/app" \
+		-w /app \
+		-e PYENV=$("${EPYTHON}" -c 'import sys; print(sys.version.split()[0])') \
+		-e KERBEROS_USERNAME=administrator \
+		-e KERBEROS_PASSWORD=Password01 \
+		-e KERBEROS_REALM=example.com \
+		-e KERBEROS_PORT=80 \
+		ubuntu:16.04 \
+		/bin/bash .travis.sh
+	echo "${@}" >&2
+	"${@}" || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pylibmc/Manifest b/dev-python/pylibmc/Manifest
index cc28b26026e4..c5421271ad25 100644
--- a/dev-python/pylibmc/Manifest
+++ b/dev-python/pylibmc/Manifest
@@ -1,4 +1,4 @@
 AUX pylibmc-1.6.1-fix-test-failures-r1.patch 516 BLAKE2B b471ca80b11beff5ac0119f5eafaf437a74022c977a884b8bdf4ef2afdb3d535ad6602db9b1206fb6649bf57ffe5bbd17509d3dda3b6604fcfa428b592dbeae3 SHA512 802337b66cbd188cc81208420448da24cecde3c01d435d6814437f0ee31850b6ef8a53f61647740da340a69971e5fe570cc2a8c1b31226e425ce7ff88bca101c
 DIST pylibmc-1.6.1.tar.gz 72061 BLAKE2B ebaa6f9dfc341d862a8b46bbbf0db1420ff400cb40390f7bee6bf198ff941ad7967b578040ffe1209721ea84a163a39649108a2a23f3dadc2d579db740b2ccf3 SHA512 a3874435389486b29bab5f1d29e5c179d67655d90995bb27fcb7cd46ce7eb3b60117b94f901602f8a65dc0e587d5f8edfcf15e259effd439411adb58ddb7065e
-EBUILD pylibmc-1.6.1-r1.ebuild 1533 BLAKE2B 4e6154fe0dae4b8f18780176f623cc19c3911071070ef45681bd953f1449514676bfa4b97be48baf203bb630e1756e5276cac2186c9f07c7e751f82bc5eb29c8 SHA512 4892d7c6b72d2e5fac2584ca7e4c7e8d82a6446fac26bc7d807ee635ff760eaf63a165b8ce465af29cf4d8bf7b63b88c942b6d7b287deb255d63f79bda38b5b2
+EBUILD pylibmc-1.6.1-r1.ebuild 1532 BLAKE2B 5a85fa2b61ec982f5acb2892ba7391db378165c2f63d54bcbd59a3c88e4c12d2b43b5863176c552e1fd5b2f8694a91ec3aa6434e43e4a163526ca75bcbcb51c7 SHA512 e19f0d6484914db391a626a92659d5cf9552578127fc62813f746093f9bdc681ff367cad882d7f3655f28464d58bece934c59748eed0fecaf400e937fb333e17
 MISC metadata.xml 366 BLAKE2B 5dcc369c40a052fcc6ff72c6f8fc46ffc8334c1a91e3f2e8ba8f9bf0bea7414d91833e5627f3d53b10e9d3d9f230b0af333929820a616433ff9d439cae888d2d SHA512 974f19bd4dd8043c07fa0001072e25b553aa82f4b9e9c00e579cb88e8819a4411a04b2e59cace18e0a8e2ce7395057e520b0bc78435865c4536b3de2e402265d
diff --git a/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild b/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
index c07978f38906..42c032a8b630 100644
--- a/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
+++ b/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/lericson/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
index fe1df0c814ca..4d18b67b434d 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -1,3 +1,3 @@
 DIST pymongo-3.10.1.tar.gz 715892 BLAKE2B df1f8ae34366ea9de633be7e1ca103a2bc704a18a9b23cb1fbdbc8d116e939d4d5462e18a076149d93dcb8ada9f4737ed2d61b08803b546dce89dca4b2416689 SHA512 5a73ac17ef6f6783a573facd90879dbefa0c95d69123bc67c1a6af0987cb5786f637b8fa81a6810387acc34829a4cde33b848ac0f7b08f7d07faa90a8e13b595
-EBUILD pymongo-3.10.1.ebuild 2751 BLAKE2B 62898d50854f0f43c36a0dc6889cfcc8dfa5d734287294a3d9ec66019ab7184a37bbb27e3bac9d53a4a83dd9190049f880d48d30ded307bfd06be19df0019ef2 SHA512 abf389a07a0784900e278f06ceee2366618a421dcf79f9d621f05a539463150ac1c0c4000731aa3a74e99153afd3587ff7b877d734187aecd3bd155ddb6f89c6
+EBUILD pymongo-3.10.1.ebuild 2854 BLAKE2B 70c1f06d278465491dab6c124629c0ab7a2310e5521b8357a57e4db6bfe3c4347c55744f7c205256088b04b3f65402482b50292ac73d4ea7335bfff80e91fc65 SHA512 0b4185f73dbd81b07ae04e54cdcccba08dfeac591c3780e8a1572de7d0fe2971dd482492372525ee6d324fa38804847cead63c9ef2748251084163b71d900b41
 MISC metadata.xml 672 BLAKE2B 48cf6ce2f03ec2865a99fd033455a1b0a53cf9e55240ab6e993483929a6dd93661afcea7fa255095b66536f0a8cc05b5c4e6a12bd044547a5cf190559a9e480f SHA512 89b8a3551a5b0bd495bc98ac2f9324daeb3f3d81d0f6b991e5537e02c7b369201f9692be5acbe228ddcd3581002a39ac777ea5fc136957e9ccb9683f205e38ea
diff --git a/dev-python/pymongo/pymongo-3.10.1.ebuild b/dev-python/pymongo/pymongo-3.10.1.ebuild
index be2abc3cb002..e29624b5f6c5 100644
--- a/dev-python/pymongo/pymongo-3.10.1.ebuild
+++ b/dev-python/pymongo/pymongo-3.10.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
 inherit check-reqs distutils-r1
 
 DESCRIPTION="Python driver for MongoDB"
@@ -14,14 +14,12 @@ 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}] )
+BDEPEND="
 	test? (
 		>=dev-db/mongodb-2.6.0
 		dev-python/nose[${PYTHON_USEDEP}]
@@ -29,6 +27,8 @@ DEPEND="${RDEPEND}
 "
 DISTUTILS_IN_SOURCE_BUILD=1
 
+distutils_enable_sphinx doc
+
 reqcheck() {
 	if use test; then
 		# During the tests, database size reaches 1.5G.
@@ -46,11 +46,15 @@ pkg_setup() {
 	reqcheck pkg_setup
 }
 
-python_compile_all() {
-	if use doc; then
-		mkdir html || die
-		sphinx-build doc html || die
-	fi
+src_prepare() {
+	# network-sandbox probably
+	rm test/test_srv_polling.py || die
+	sed -e 's:test_connection_timeout_ms_propagates_to_DNS_resolver:_&:' \
+		-i test/test_client.py || die
+	# relies on exact exception message
+	sed -e 's:abstract methods:abstract:' \
+		-i test/test_custom_types.py || die
+	distutils-r1_src_prepare
 }
 
 python_test() {
@@ -111,9 +115,3 @@ python_test() {
 
 	rm -rf "${dbpath}" || die
 }
-
-python_install_all() {
-	use doc && local HTML_DOCS=( html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index a17641d74371..70a48043f9e6 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,5 +1,7 @@
 DIST pyopencl-2017.2.tar.gz 350145 BLAKE2B 12c481893158f97dec612256b36e710ab52356c8b5f644f3710b5e34d4d10df3b27137ad76f29543fe16b3da725471e206aa5f69c646a79a65246d6091c686a9 SHA512 49f2ff619d8c214a3962b8444e68ba415dda032abaf9eeab259fcd1b21fbaab10bd057035161baef7f0182995834082218a6667464c01645231a94c88aa5c18b
 DIST pyopencl-2019.1.2.tar.gz 343805 BLAKE2B 027b231231532403a5e18249bd438e1a5a67805a685e46fd9506f7286957b14068540f93a3733149aeba2a720f6c71e91db74351916ca974739374a05f2d2c74 SHA512 b2850622253f480cafacadbb9d13afea801af9d4dd52679f132fc0e5f1d4c2f4d3bdf83c9ed64c14c19ead75e6d36afa8b57ff52bbea135fc02291b1fe7b8636
+DIST pyopencl-2020.2.tar.gz 351600 BLAKE2B 47a733d7a552f5d1f69a1a9710c3262d50c26651ed9f46146829babe28962e236e2c1b9ba3d3d14207f28bdc562323a94ab4c51dbf5fcf1a0b12282b3c6aff50 SHA512 233bbf2e99507d3a832222cc8149bf7ac17332a550e4867f843fcc2b31104d961a3f0d972b0a1878d4716b2da4548f1390560141cd09cb1ba13300c541b058b9
 EBUILD pyopencl-2017.2.ebuild 1215 BLAKE2B 938e4a321eab8bf8e094f08c94cadaf199beb6e3b1e5e626c37781b74ca7715dc13a98747a751a86738eadc548ab2442d4d2dc6e0283e3be8aba9f24da030d87 SHA512 93fdd3bad38fea59c3ac2b4c33c51d42dc047cd863b4ea9773fbd7ae8e01f08476e12c61b2bcd5e5e8d54264d7a990d7b7969609874b6adefdc9f43a9f329bdf
-EBUILD pyopencl-2019.1.2.ebuild 1219 BLAKE2B 79a3dd93615e5d3150f078320f7a91b8377831ac10838d66d022485bc513e95bf8aa4b9146944316585acfd2ff2ab1a4b83862b533c355517350fe63b298d559 SHA512 f114c3be990cf856d2fba6f5158772b871d0adb60e561f0d140ff00eae31403ec3727b230ad58ba7fbc72c88dbad60036e4a71267674bb3d4fc3581219dbe066
-MISC metadata.xml 236 BLAKE2B 59768249a373ed1e6da78c07338e0564ee0e15a786b0593708ca607fa020c23e4aecfe3604250dcbae578e00bb282707cc4189f657bace89ed83e9fa9f208724 SHA512 9dfcdbfa8d38a57cd1183361f2065531af06022fe33f391aa351c4b708e6698a7303f90f4033989e9f040383a94390063f7a33734ec6d9dfbcf5c5b4af57f587
+EBUILD pyopencl-2019.1.2.ebuild 1471 BLAKE2B 5ba33cfae14074859d9e442ec35634fd250f52c56842130cf4b6abc5bff58c944983f13052b4a30537a289cbefe0691050e871a41640cbaa2a33c84703c7c180 SHA512 90d989e8b904f2c317350817dae1c5951ae494a644741eb4cd6c532217873697c09c5a7f00f3628cc9b74ea4f6b44c13280058837cf9c07acfce97937cd9c949
+EBUILD pyopencl-2020.2.ebuild 1458 BLAKE2B 432af46ec53efafe01f85fd3526802deccefcdcdd0a77e9e15a0ae92b42c9915c93a255c693504b8f586d0f8246945ce5173a144b2dc2e7440ebdfa8ecc613a1 SHA512 3f6c952a342a9d77ecea70ba6518c6204d46bb23ce18a004d0f69042848a071df099d0b7840d3036cbc0683f80cc5b6e3b97621972291d6878e722d9516e8750
+MISC metadata.xml 316 BLAKE2B 46de5d09541dbd7e1ae6cb3e46a87f0f7dde068ca48dfb4f8885b3f25a2c6ad258019a7585bc6dac42a01ce41292d5458aa7ba122fd81a1fe6f12307b0642966 SHA512 1ac69571c5ff5abb94dc68dc87d02d8675e12e120dedb0bece65a9cb81764f496a587e7345b43e8037f8d7ed6e269dfa276d8482ab42fdb4f3adda336570d703
diff --git a/dev-python/pyopencl/metadata.xml b/dev-python/pyopencl/metadata.xml
index f73783559fae..9b596f3ee11f 100644
--- a/dev-python/pyopencl/metadata.xml
+++ b/dev-python/pyopencl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pyopencl</remote-id>
 	</upstream>
diff --git a/dev-python/pyopencl/pyopencl-2019.1.2.ebuild b/dev-python/pyopencl/pyopencl-2019.1.2.ebuild
index 73b273d25bb7..2f72469ccad5 100644
--- a/dev-python/pyopencl/pyopencl-2019.1.2.ebuild
+++ b/dev-python/pyopencl/pyopencl-2019.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="examples opengl"
 
 RDEPEND="
@@ -28,7 +28,13 @@ RDEPEND="
 	>=virtual/opencl-2"
 DEPEND="${RDEPEND}"
 
-distutils_enable_tests pytest
+# The test suite fails if there are no OpenCL platforms available, and
+# even if there is one (which requires the presence of both an OpenCL
+# runtime *and* hardware supported by it - simply emerging any runtime
+# is not enough) the vast majority of tests end up skipped because by
+# default the portage user hasn't got sufficient privileges to talk
+# to the GPU.
+RESTRICT="test"
 
 python_configure_all() {
 	local myconf=()
@@ -41,11 +47,6 @@ python_configure_all() {
 		"${myconf[@]}"
 }
 
-python_test() {
-	cd "${S}/test" || die
-	pytest -vv || die "Testsuite failed under ${EPYTHON}"
-}
-
 python_install_all() {
 	if use examples; then
 		dodoc -r examples
diff --git a/dev-python/pyopencl/pyopencl-2020.2.ebuild b/dev-python/pyopencl/pyopencl-2020.2.ebuild
new file mode 100644
index 000000000000..e5fbb9b9f447
--- /dev/null
+++ b/dev-python/pyopencl/pyopencl-2020.2.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_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for OpenCL"
+HOMEPAGE="https://mathema.tician.de/software/pyopencl
+	https://pypi.org/project/pyopencl/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples opengl"
+
+COMMON="dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="${COMMON}
+	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/pytools-2017.6[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=virtual/opencl-2"
+DEPEND="${COMMON}
+	dev-python/pybind11[${PYTHON_USEDEP}]"
+
+# The test suite fails if there are no OpenCL platforms available, and
+# even if there is one (which requires the presence of both an OpenCL
+# runtime *and* hardware supported by it - simply emerging any runtime
+# is not enough) the vast majority of tests end up skipped because by
+# default the portage user hasn't got sufficient privileges to talk
+# to the GPU.
+RESTRICT="test"
+
+python_configure_all() {
+	local myconf=()
+	if use opengl; then
+		myconf+=(--cl-enable-gl)
+	fi
+
+	"${EPYTHON}" configure.py \
+		"${myconf[@]}"
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index 7b591e4dcc56..18ab52f968fc 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -2,7 +2,9 @@ AUX pytest-asyncio-0.10.0-py38.patch 7093 BLAKE2B 013901feddc45c5e5e832c5d2e016a
 DIST pytest-asyncio-0.10.0.tar.gz 13968 BLAKE2B 4e63d527b20c767b8f0777ed684a15abe54009be72db8a50ca3b37ef95dceb884168d8081c651e2bbd6d818529d6809bb3498055fedc7f951f5675d58f50e408 SHA512 78160d1918c5d3d2172f74fa07bf4bf6d0bc416666011dd5b83b3a7f385ec30fc65d49c01bba5dd0e16ad9dcd9d72d8ab062526f3268d60cd2e24a35b5a8f883
 DIST pytest-asyncio-0.11.0.tar.gz 14070 BLAKE2B a97cc52a013e126c7aa48b21e8fdfb69c589efffefdfe0f1cef09ce98c1dd150f4298bfa9d707dfc264a6d48c71839847f929237204ba2a36e1bb1aae4e95cbe SHA512 db1d6a9c4b3f6f24014eacf3b108d76e5b2d6761d35260f20023638cd898b6f0b499dd475bc07abd58bc73bee2a88b565c3ebcced2460e619a1b375fa6a27a64
 DIST pytest-asyncio-0.12.0.tar.gz 14294 BLAKE2B f62bb025bd3e35b5b4571b232ae2dabe5ef42075fa98f2f5ba28f78f16d81eadeb68b7dcd11a9f8170c1077c331c7abbb0fadc02863458ef03d238b399e6f37d SHA512 2e69bfff3f0b35cc82381b841229749d309967ce1d36972933f5bc6d5dff45934608310ed3fa1805dc38ab41bf913a881493c28d6d0e9be733b624cd2fda97d3
+DIST pytest-asyncio-0.14.0.tar.gz 14796 BLAKE2B 0a110dabde491293dc10452239971809ec6a4006a2036e848aac067df1af328d0d1d5c7afae8cfc1ecf5c919c0922050e2db182065500ec614a8094d3799c0cd SHA512 d1fadff152a0c94f80a8272a0dd293bd9d9300ad9e79c69556b5901c1a8ce00545f7715e503a383e3f4f35c8090d8f9ec33d16739b85378b59b1786a50441fca
 EBUILD pytest-asyncio-0.10.0.ebuild 833 BLAKE2B 7474a3709b045c8ba57623907eeb2fec75edff8f09d27be3ce9957c7dfc31836655ff2020a6c287a877df6705e9c11805bc33a870e8d407e076b3479f7cc6f48 SHA512 0211e34d00b6761465d543920a5341f5043317cc4d86a94401606647013efc3be81ea83e4d75ba9e1ef51f70ce00f26b8a590cc1d7635c4be7f24fd78a3fc3e5
 EBUILD pytest-asyncio-0.11.0.ebuild 762 BLAKE2B d55984ddaacc624f1f96457811448e4d3d9af28d8ab9ee5610b0def42beca68b2c6294afec80f55324451a623e3ed40151fac52f662eb35eaccb2bea22358763 SHA512 66f3e6661bf185adae6304480f4f5fec32ea0c8ea75177f8ce9111e00f87e7d8fc4b5bde230e7dfa3fe9899140d1ede0d4a1b42bf35dac5c8b8ba3dd887e8cb1
 EBUILD pytest-asyncio-0.12.0.ebuild 816 BLAKE2B a39d5df1cca40426e0c8d65eebb86d3720b530ddb51f365837575f311f26bb2253b5ff930762c26db4dbfe6909e0e7f56c831d28392e3b17a76fb47324fd8106 SHA512 63ba162d11959ef59261923d376f863ff5eada602eeb24c5ca9a6e8a3ebaf73e0eb541c489bd133ddb5b2e80d70fcb71a68ba4ccd9ca18795d04569ab6609d43
+EBUILD pytest-asyncio-0.14.0.ebuild 816 BLAKE2B a39d5df1cca40426e0c8d65eebb86d3720b530ddb51f365837575f311f26bb2253b5ff930762c26db4dbfe6909e0e7f56c831d28392e3b17a76fb47324fd8106 SHA512 63ba162d11959ef59261923d376f863ff5eada602eeb24c5ca9a6e8a3ebaf73e0eb541c489bd133ddb5b2e80d70fcb71a68ba4ccd9ca18795d04569ab6609d43
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
new file mode 100644
index 000000000000..64dfa2878e8f
--- /dev/null
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for testing asyncio code with pytest"
+HOMEPAGE="https://github.com/pytest-dev/pytest-asyncio
+	https://pypi.org/project/pytest-asyncio/"
+SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-python/pytest-5.4.0"
+BDEPEND="
+	test? (
+		dev-python/async_generator[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pytest-forked/Manifest b/dev-python/pytest-forked/Manifest
index 037ee7202ea4..cc785ecf98d2 100644
--- a/dev-python/pytest-forked/Manifest
+++ b/dev-python/pytest-forked/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-forked-1.1.3.tar.gz 7308 BLAKE2B 70711228a5a815de23cbd07b2b628e336a26ccecf420dc9d30d9e9b7ed33bc362b0ba74a8f90fb7cb8dc9e7e0f61d2ac22da55584a84e8ac3a26fcfc2878a802 SHA512 2086884b0e78841b3cdf8eb2b144b8fa60ba95e4be79bc58a2b5775a5f997dddef59377f7c993e54974fbbe13e73fe8688eed4d035e85293e35a143c5f0180f3
+DIST pytest-forked-1.2.0.tar.gz 9533 BLAKE2B f9762fd34ffa05eb0abe143388c9608563b0b3d8d5f8c6cbb2e5e36271f4625f10e573042e66d5be5f7f9e124cb5171e570e0d59f2bc1100d2d88ee54c9b4e9b SHA512 d7ed2c36213cfb81988e84e370e0504add77fdb79d31aed4d7aabb73943042f860b4a3ca6c9aad7de5b11234631b1e0f66eb067fcb46079d2cc4ba53ef0cabfb
 EBUILD pytest-forked-1.1.3.ebuild 812 BLAKE2B 4dcbcb5b13749ce80c6765485a8f985b011c699e044977e22de39e55caa0515f9d2b4b79f9591f3a65e8ac63693ceb2fde99ef59e717c3a780bc6c5ec7c06c80 SHA512 2eb71fa68ec40dc3039cf04651896c9a6541b72c22a4c657d9601412c1489422627f0c35d772c7f7fe8cb2cfddab27cd5220c32c930561417f80f72873597530
+EBUILD pytest-forked-1.2.0.ebuild 818 BLAKE2B 7c95bf22858fff4b783826567b8d6dfd56707a25429f9638261f8aab933425f98fe03b83e06a690f071ed7bc1fcbba9b9f1c4e2ba2feb5c464e486e532b89222 SHA512 111d5bd420826e272c6da5ddc2894e2ffae7021617c1fac351a62c4d667dc916d67d990a3b0e2be37233e6d646e47a47782fb556493c3253c3fff0f84daaf60f
 MISC metadata.xml 404 BLAKE2B f53cbdb55297b417dc11e904b9bb22d7576ee7df9fa2f5ac80968c31dd9580ffb908bdf1c5ee966b910d8642971410bde39800fb38a01545f5e361f512389a65 SHA512 f6dc614da0c972e76e4ccb2f2141e7da63ac6b6899108b57f3374ec0296652345b97882dab1bf958aaa23046a1070c11889fe3fbc6eecb111bb2bc420620bfff
diff --git a/dev-python/pytest-forked/pytest-forked-1.2.0.ebuild b/dev-python/pytest-forked/pytest-forked-1.2.0.ebuild
new file mode 100644
index 000000000000..d1217706c9c8
--- /dev/null
+++ b/dev-python/pytest-forked/pytest-forked-1.2.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="run tests in isolated forked subprocesses"
+HOMEPAGE="https://pypi.org/project/pytest-forked/ https://github.com/pytest-dev/pytest-forked"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/pytest-3.1.0[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )"
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv -p no:flaky || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest-services/Manifest b/dev-python/pytest-services/Manifest
index 90ec5d8d0513..847d2f6d67e7 100644
--- a/dev-python/pytest-services/Manifest
+++ b/dev-python/pytest-services/Manifest
@@ -2,6 +2,6 @@ AUX pytest-services-2.0.1-lockdir.patch 1085 BLAKE2B 09982cf4874d82a332b441e4538
 AUX pytest-services-2.0.1-no-mysql.patch 821 BLAKE2B 3a041e51c0e2c08ce8727eccdbfac36eacec2542d8d8cc7ab7544f46916b47a62e960437821f8fa85fe968b9e68808b94d9ac51fe06daf487008bfaf305ba81e SHA512 68788f6b6700793df2de4fbae85a41fad095f09ac9af717c786305fc1ca6b29438a65d096076b9469dc543a54ce8f72a40dc0f211eb9d517e658ce068e60ee23
 DIST pytest-services-2.0.1.tar.gz 20386 BLAKE2B 5ec94fdd0fbc5990216fcbae112973fa8b41902a6fa666dd4c5dee2422f76e128ce3a576ec93ecb86bddff5f6bca0e1afaf791583bd275b2543d0e780e45014b SHA512 445cd5346f0c19b68014eb3c27b06376ae6699e31d8c1fee0cb3cda6e927d0ecadbffe3b0b832dd38fe63bc1fe4e3108e2ecbcabf0641af0bdbff019681f0576
 DIST pytest-services-2.1.0.tar.gz 20552 BLAKE2B 6359c419591efed553e095e267c24f78f36b152f0eefe21d46742f7c15f05e92a9e86891f99762a3716fef5284b00d07d8d6eb825008dbbbf07e36dc62a7a6b4 SHA512 54a487546a2af7996acdbcd63bfc01626832aa41683617cdd345453cf6518afdf03cb8c2465e1f5d28c88b2cc801ffb0d9d4440582865f899e21fe42ab431ebc
-EBUILD pytest-services-2.0.1.ebuild 1230 BLAKE2B 5e7b007cd22490b6ef8790651ffe1bfe2b4fd6cd9378541fa8fee3df3955267040296a842339491bf8b915af7daaa2b89dce38ecbfd73fc4f7c270c58ffd57b0 SHA512 f1e5970a319ac54f3b5b7a19197258a1efa590acd6fc170a71f15a868216a2e2b2761d8fdf65ea059a7495656e8ca30410475f13e66d6101c0168042e0dd4e98
+EBUILD pytest-services-2.0.1.ebuild 1229 BLAKE2B ef6b0fdf6bb64443bf706514def64764cce7b5bef4819c29bc9c57da5316f967c115df766644841b49c728dfee70063a81c0a75e84742fe7a97b67062c67e330 SHA512 faca687909337b85976bf5b9a8a8fab7e57bc6cf238c722a33131aebfec30d2a92a57c7c8a3c05cea05b3fe3475873699ef8100dd224c10292a2020f7b0e02d1
 EBUILD pytest-services-2.1.0.ebuild 1230 BLAKE2B 5e7b007cd22490b6ef8790651ffe1bfe2b4fd6cd9378541fa8fee3df3955267040296a842339491bf8b915af7daaa2b89dce38ecbfd73fc4f7c270c58ffd57b0 SHA512 f1e5970a319ac54f3b5b7a19197258a1efa590acd6fc170a71f15a868216a2e2b2761d8fdf65ea059a7495656e8ca30410475f13e66d6101c0168042e0dd4e98
 MISC metadata.xml 384 BLAKE2B 3b55101f9c900a8570344ac9335687f3c505f5055022af866fe090878b2b44222a311d3166103e16be780d28a84d9142416acf2933be1a01712587910f7c5d77 SHA512 b18e80dac13f712ff61216f2b23f7c33fea7508634ad523b67f232fcb8301000edff1ca92307834878b6392ea38be8f03118abd2dc55ff6b9c03c8c4dd342e4d
diff --git a/dev-python/pytest-services/pytest-services-2.0.1.ebuild b/dev-python/pytest-services/pytest-services-2.0.1.ebuild
index 60d08abcefa8..7b9808fa2730 100644
--- a/dev-python/pytest-services/pytest-services-2.0.1.ebuild
+++ b/dev-python/pytest-services/pytest-services-2.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pytest-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 4b0faf14a5bf..f08f456847af 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -11,9 +11,9 @@ DIST pytest-5.4.3.tar.gz 1022353 BLAKE2B 70d4f23cbbfc4c4ce63c512ee0a01556973761a
 EBUILD pytest-3.10.1.ebuild 2366 BLAKE2B 7f7617f2d4bb90edbd0350297870c823f7525e2f18d984fe9a12cd8bbcd4dcce461e3a7f43c1d5ba8ecbb90d7606f76f0ecf336d7a0933baa6cff22417aa4efe SHA512 1104eea0003f68645660eebc1b3ca8736cea46f99de40637955169168c1efe07ca90ef8967d31bcb470f5e1aa831ed0b572b9156671bc718dc1da8d18c96a8cb
 EBUILD pytest-4.5.0.ebuild 2082 BLAKE2B d2e9edae4f7751ccdbccd6b3c98e77a67aa3aacc77eaec413fd05d1cb65eb6e48c52a181993d8e0cb83ce9d26d23ce4590d398ecddb2c6a72a15ec4d57538ffc SHA512 41dc00468a3b5f16275ced0ff703e9fe53a618a82b8da9e11a0a4a1dc5dc82c1eb666679498e1df1c7ff67540f786e8f419570a93be0d361fbf44678b7dd527b
 EBUILD pytest-4.6.10.ebuild 2474 BLAKE2B 91ab3acadcc8833e7e9b5414d20e2a55ed054563a8d4642b60065d27e6521e9817ef7d487b96ad4a88cc1ba6c9b2a58b83257a43f731b710555fa857f3ad6a80 SHA512 653f26ab3dab287537285a382b7b35b1e2fcc3383a7b06ba362bf84aaf104083ae047d0563f858470f459c804052081c04c1eadfdbd2a9023ee19927ae79909f
-EBUILD pytest-4.6.11.ebuild 2483 BLAKE2B 6ea7340e10caaeeae52dfa5f041ba93bc277b738dddfe863922a134f4e2d71569fb1ad1212aa03aec04e016801a31284bd8057fa158f5cf20a6a4837d67ad504 SHA512 82fe44010587208e774a0c514c00a283a84a42797473defa664d3d512b53fe39c5fc6a1c86b5ca272e6a8c8eee599ae05881706e6e72af1cfb58debe3b2ec946
+EBUILD pytest-4.6.11.ebuild 2481 BLAKE2B dc1fab11ccc7c3fcbc383d75b6a4c1acf6c85d4ed577291eb2799d936ce52a0897ac5b7e4ea85e9eb8802107c45fe51b82a86adec0f8cdce75d0e5b1d992ff18 SHA512 3959a6485abafca733d5382b652ef9c053a6757cb38ed29a38f583f1f94a9b35e3ee878eac202caf7042017001105112676fce2d0e1da7175452eac3627186f1
 EBUILD pytest-4.6.9.ebuild 2436 BLAKE2B f4bdbba1e7731e8dbfe4294acd1fc9e72d498bdb13c9cfa57c17da5f9d3aa0089caff3e32b6d68b5b66f4b48bd50f4d9310eeedb8502c50fff189ed2edc8c8bc SHA512 b4ead0e0d0d88175ee79b11af0f7e94790e0d82931defd425c71e138fec6008e6d244fa311e86549e11cc5a02c8a3df8ee9f55565a42f26855021c64f3561059
 EBUILD pytest-5.4.1.ebuild 1641 BLAKE2B 7e4fbe80e3ad011c67d7260bdef6044d5aa852bce7f4ebee0553c3699919ec69fe9da867cd000041b2cdca7443607c3adaf550e4ee5031cb339541bc56fe1b65 SHA512 c9c0eb717a245e038900b63f8db6929045686cc43df3aef51cd0d134f9e9840b05896ce5f926625eefcadaf336dca0ff7252c9143370e1e4962e3e87717f5f42
-EBUILD pytest-5.4.2.ebuild 1938 BLAKE2B 1cae7fb13190416aae69261e71f4c160d56cc92445a1145a2fe2d0c8c9895bd20ea616eadd66fb198faece158c0062d65feebd44ebf7d5971647228079f146a9 SHA512 a0ad4afcbec3cb06460e01db127575b3a20429619acf50e1e567e13a25c60348b70ba2c6bd2726a8c2b23b366b43d7b189e7dc6ff3a49dad8e1d5f5988e399f2
+EBUILD pytest-5.4.2.ebuild 1937 BLAKE2B 0daa6532a40c9f098d68909976723249039fafdbea364b9051e7d00596c6a99d8f1e0faf650ff4326f172e3a032c74f96bd30b98e198cd07b29ee21eb6852c9f SHA512 4f0c41aa9ba7c1029e3400786ff3b81be695ed7d0668c602324ffa41681c52ad87ad5c54361e16cdaf1d3fb22d8903e502287f796189da12700416bfa2f0ab9a
 EBUILD pytest-5.4.3.ebuild 1942 BLAKE2B c916fc49800604c6f732dd9ab8a3931da2c9f4a37e7095bec502fee038c8bb69c3486ceebeffa72f4824f0ae08c6aba7329367ced5e1615ccdfc30f61f45585b SHA512 93ca726ac64abb5dcea47f64b725c2d42b36c18eb0968224bc359ab725ce27f250ba7d69853cb09e36d2df149b191d03c1322e46722e9f666d9237647e776f50
 MISC metadata.xml 333 BLAKE2B 2155c30735de72aace8fe3e88a16c011f3961b4b644d761be31c45094f243f1eeeac1803f5a74219198039dcf1f7474531b2ec814a3ed591c59fd6d9ad5a914a SHA512 c59e04710dd640b2e7bb0214e52b05ec50367d895d057886ae9bf9342312006e7b21f5625e1c4f5d7a9e12a7f7b64a968e5371f8c2c45a8ac8b1c8ca6d39b10b
diff --git a/dev-python/pytest/pytest-4.6.11.ebuild b/dev-python/pytest/pytest-4.6.11.ebuild
index 916e44f6f36a..32e713dd573d 100644
--- a/dev-python/pytest/pytest-4.6.11.ebuild
+++ b/dev-python/pytest/pytest-4.6.11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest/pytest-5.4.2.ebuild b/dev-python/pytest/pytest-5.4.2.ebuild
index db2b97ff63b1..c8caedd2dddb 100644
--- a/dev-python/pytest/pytest-5.4.2.ebuild
+++ b/dev-python/pytest/pytest-5.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-distutils-extra/Manifest b/dev-python/python-distutils-extra/Manifest
index 94e9cf6e36b2..7ea1a7d98796 100644
--- a/dev-python/python-distutils-extra/Manifest
+++ b/dev-python/python-distutils-extra/Manifest
@@ -1,5 +1,7 @@
 AUX python-distutils-extra-2.44-skip-build.patch 2560 BLAKE2B 2c027fe6875b1b0b94f7a40b521bfdf226be5add5634958395c637918363ea6ad98d82b7befbd95b3c566581719cd316afbf487ce30683427eddde4d49ff2818 SHA512 07808a920eeb5b1519778bcc9dd24186715b90b82b32b5c21a2e1754e6cb89057c3da856a250874777311fdd38de277161999f50e03af7a60fcc9b295450469f
 AUX python-distutils-extra-2.44-test.patch 1020 BLAKE2B 5818c26d89980d5f1608a9d0ed59f4ebedecc942d5eee599a78b77ff331244b4969d265390c9e6b6dddd3a0886f2a39eaf7f4e7f631ab6dab9fcdd5dfc02cdc5 SHA512 3381a8ca6cd87635a260f37d349204cb5112718f7a2aa13b384d1c3622fa3e61685c2e4bdbd15e7f8421d2d8554a13cabbfd490e17975d5aa7084c293b161c55
 DIST python-distutils-extra-2.44.tar.bz2 37687 BLAKE2B 3d7e3ad277440bfb6fbade8b890b95aad37589700b69a26ec9a5c30e97491871bc8c8f82b540131859d2ce82cebd3758f29ca510abe28046ffcaa0e7240fad3e SHA512 517222b4e34efba730db53ffeee8b8c8d96bd9d1b6044e6ca84c0f2c1d5c0e044240b899d460c50295615c94c513f7e57db3e34e5db6588a01ec92a73999f822
+DIST python-distutils-extra-2.45.tar.bz2 38094 BLAKE2B b8c0adcb92d07e087e10389c9671e9eca78a9a634d0092c1633e184fb9d128b006903ce8f2c9deb504b3d1557a8afc78e3edea7f1a2e95734c55099b4a21dd41 SHA512 04d2be290726d7ceed599031bfa960468c6a8654c8d9105dd77cb5744f6908d1c9a6732095692aebde1f1e042ef70b2695d41586663e4d539ee96247a39f02a1
 EBUILD python-distutils-extra-2.44-r1.ebuild 1082 BLAKE2B e466ccbb2ca635c9d090ecc6a9e80181558ee4918bf1d6ca2a04df7b67775d0c00d9b6bd2a35fef3d9e6983054f9182dba0129cee05df61351210f239c7f41ec SHA512 17fdf960c10b6654bd19c2fac3d72497d3254fb44db577488a0e84221a968cf16665b3c6e059e1d0fc7016c8d0d1e79e3a755b54c8770dd1534ae9728ff299e0
+EBUILD python-distutils-extra-2.45.ebuild 920 BLAKE2B aa6eff79bbacae0546157626555ba8b46de2d7d12439fd0b761b87d649621e12f48a103842993a173794d7acb7f1a303afaa3bdc1d50dde0d4d7e35904406ac6 SHA512 689820557953e0e5dc7ef162ba8c35184a3cea23d33215445c8b6126c7cd47b86bba4f5129646a4f42dd1eed50986f3b55b07a07a8a06e406ff083f5205ddd91
 MISC metadata.xml 339 BLAKE2B c7a822f45ad521df2cf6837bdc46e1e8473d8fac77428f80561dfd518b84b47353a37064bd0b9ad1e77441e7f376f0f005755d9c07c67e742c38b7dda02e7348 SHA512 2b8f9ffa8823ba2e9f1811782e17e8a6b3011c2096454b3dfa9373d085b4404f6a0afd1d8d9346adedaa01e09f4410c0d154ca74a00d770b8ad5da33a1a151a0
diff --git a/dev-python/python-distutils-extra/python-distutils-extra-2.45.ebuild b/dev-python/python-distutils-extra/python-distutils-extra-2.45.ebuild
new file mode 100644
index 000000000000..426f03e80fb7
--- /dev/null
+++ b/dev-python/python-distutils-extra/python-distutils-extra-2.45.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Gettext support, themed icons and scrollkeeper-based documentation in distutils"
+HOMEPAGE="
+	https://salsa.debian.org/python-team/modules/python-distutils-extra
+	https://launchpad.net/python-distutils-extra"
+SRC_URI="
+	https://salsa.debian.org/python-team/modules/python-distutils-extra/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DOCS=( doc/{README,FAQ} )
+
+BDEPEND="
+	test? (
+		dev-libs/gobject-introspection
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/pygobject[${PYTHON_USEDEP}]
+		dev-util/intltool
+	)"
+
+python_test() {
+	"${EPYTHON}" test/auto.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/python-email-validator/Manifest b/dev-python/python-email-validator/Manifest
index be61a29dd999..f847fca79a45 100644
--- a/dev-python/python-email-validator/Manifest
+++ b/dev-python/python-email-validator/Manifest
@@ -1,3 +1,3 @@
 DIST python-email-validator-1.1.1.tar.gz 18497 BLAKE2B a65a5603854920d022062fb4f1575eafe7274e5501ae00fdb58a53a75c6582353ce2c46e20a6a172e7a4a1bbe2b25515b543ace2af4151102c5201ff1ac27132 SHA512 fb4dc5b728adca6041129aa3eecb3efbb358ecf47bf383737936132df7b24c3b9e47e56918d375d8eb4a2535d56ce22c9e03dc126dafd8894911b43fe30f5162
-EBUILD python-email-validator-1.1.1.ebuild 816 BLAKE2B 6300a9a48a042b0297be7b71d47d74750ca5d57b65ba16324c28184a501b47dc4154be9854545d94e33a39457436ac434486423ee37bf810022f5967dac6c20d SHA512 b092100af793fe71ed186fbe97f0e08ecd4e2b4d6de25288e64b01e7463c52300d6ce50473220eda044e8af006e9b60a06d2fb7d4693057afe4103a72dd56e02
-MISC metadata.xml 637 BLAKE2B 9f090a87448b7c9d0717bae76e4c049228eaeb97f2b996d934f9b13db9eef2d3d6ad7fec0f9dd4de427a1c6c9a42cc75e5b255ff68d2786ddbe5d3f2680f4eca SHA512 1643163af80661d85a36c004224fc748fe84111226517d3ca08e47b0d5e077e2df05759cbfc2428693efb44323b945872f282fbb1733c132225537d123030426
+EBUILD python-email-validator-1.1.1.ebuild 821 BLAKE2B 6fad7946d2b19b3323d766d00e670133033ddfc0c0d47edd382bf90f438814089f8baf541db23b43e033c77e8fdaf7014845c9b080f51e95b8d49514e16c026c SHA512 976766dd671f1bf7b10466fb0011e1701b1e642efb6f6c2ffc019ca986e3700a39a2953d4b0afbb053e4d60a11e52915e619a4c0f5734999bbeb19d4b1a8a534
+MISC metadata.xml 738 BLAKE2B 84c1f0f3fa44e391de12ddc2eabf45020499a8244f1a96bea47c49fa9f946c07cfaa68ded9c8b62f144431d322fc1bf7c5c2ac67b3a628f982e224b8fd920d2e SHA512 7b158b2e20c466264f02b338bb16d8fdd2b1ce527f35eb8f61c4f4692df50ae51f8bbdecd5a21f1660ec10323397daf1215fed2384ebb9c4df4ac9ff78a7b46f
diff --git a/dev-python/python-email-validator/metadata.xml b/dev-python/python-email-validator/metadata.xml
index a4be1b707b27..43109320ceb5 100644
--- a/dev-python/python-email-validator/metadata.xml
+++ b/dev-python/python-email-validator/metadata.xml
@@ -14,6 +14,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">JoshData/python-email-validator</remote-id>
 		<remote-id type="pypi">email-validator</remote-id>
diff --git a/dev-python/python-email-validator/python-email-validator-1.1.1.ebuild b/dev-python/python-email-validator/python-email-validator-1.1.1.ebuild
index d70287ef4b62..8cd9e9bd41e1 100644
--- a/dev-python/python-email-validator/python-email-validator-1.1.1.ebuild
+++ b/dev-python/python-email-validator/python-email-validator-1.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-python/python-nbxmpp/Manifest b/dev-python/python-nbxmpp/Manifest
index 07ed7e2667de..e69ed1e60105 100644
--- a/dev-python/python-nbxmpp/Manifest
+++ b/dev-python/python-nbxmpp/Manifest
@@ -1,3 +1,5 @@
 DIST python-nbxmpp-0.6.10.tar.bz2 1063786 BLAKE2B 6d7295a5e6f926cbca709e0774ae8c141e20293c723f3a431a52bacc64639e7cee5820b4e070fae35397a5e5d8c76089d5d1966bf53cef8f0da462134321df6e SHA512 0982a6035ee30edfe9f7d5cc11dcc870ad1dddca851fffc2c26088cd28083f56f5c57df49dcd28b5e6967f02aef03e0ad2f7b2036a908748c66e5e7510e6c7ed
+DIST python-nbxmpp-1.0.0.tar.bz2 111378 BLAKE2B 1dd0fff8e14bb438727a05ba0bd3db3613d91fa08f593cae3e77aec6240ece41a403a324aa3fee89e3173703f185e65e875aa1a49d877d2fc0235d664af9d083 SHA512 4eb1c4ec33ea4008b8ef4cf57e2a7a63450008974ae109af70455a49e716ea5ad612629fb2c7e0b06e69a77ee28b592a089469a645ecdd1bc2160a907804c2ac
 EBUILD python-nbxmpp-0.6.10-r1.ebuild 540 BLAKE2B 749d38849761b31533cb8216b168d70d713ae63b8e94174b4ac270679837283081aabea5565f96df77b2d155bad7faaf37d6a49ec3f2c6767a74422a03bbb414 SHA512 517b329bfb4ef46c6d370f6fe909fcdeb0a0c5306ce15176062bd2565ed1ccf9f936285c4a31be3154102942cbb825e69abff82d64b1d8faf990d15ff974633f
+EBUILD python-nbxmpp-1.0.0.ebuild 547 BLAKE2B 254f57a62604059093a247ed5aa4a31306a2a243a004a0b0d6ee5c633da16db3d4351b79456a1bed7c71f0829dcf9e82c1da1f952e6f68e10d4481f5ccd9488b SHA512 12e7438ee615e1485f765dd069ba482afa533fdfd8b7d35cefa98114c6dc408c6c808dab21534a77c7b40f452062aacb9afc420e33fd0e331e7b12896461e7ae
 MISC metadata.xml 400 BLAKE2B d91b7691b7e19817b6441875611ead242b77cf55dcf1668ee543d7e2fd705cae7a30cd64aceb08a05f79b02e0c7975418f398cdfb96e2dacf250e3ba43ec020d SHA512 e017ebcf7a834286a653ce9ffbe662cf5d1e021bd51fcae75ad09d8541654d8142044e6961de60ca96e45e5b9bf66e06d8671cb1c3bcf2ad3f41843028e52f97
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-1.0.0.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-1.0.0.ebuild
new file mode 100644
index 000000000000..32580d7acdac
--- /dev/null
+++ b/dev-python/python-nbxmpp/python-nbxmpp-1.0.0.ebuild
@@ -0,0 +1,17 @@
+# 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 vcs-snapshot
+
+DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
+HOMEPAGE="https://dev.gajim.org/gajim/python-nbxmpp/"
+SRC_URI="https://dev.gajim.org/gajim/python-nbxmpp/-/archive/nbxmpp-${PV}/python-nbxmpp-nbxmpp-${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
diff --git a/dev-python/python-sshpubkeys/Manifest b/dev-python/python-sshpubkeys/Manifest
index 2210789776db..a3e44e6a72f6 100644
--- a/dev-python/python-sshpubkeys/Manifest
+++ b/dev-python/python-sshpubkeys/Manifest
@@ -1,3 +1,3 @@
 DIST python-sshpubkeys-3.1.0.tar.gz 55289 BLAKE2B bf1836c173b542f0edc8dc0635a1f5bf109ef95936ffbabf6bbb79ac3bc34c10a769733d622c338b1f3a87d5be84b89ea9779f7fa293cad706f364d5e8867afc SHA512 4f07cb7bd2b1839a63bff842660499cee816e8675d8fde1e84ee567e354c82677a69e539b99505c6d1c5e0e7a5962a36175eb0cfcc763886a33952d2346c3405
-EBUILD python-sshpubkeys-3.1.0.ebuild 556 BLAKE2B 27c5a3f70c99bb8036a960409c4dafd18bbb34ee43126d9d5353fedee0f3c006c7ebc08968ea12d3ed88d2534566db77eac6b399eb387f0d4b59ad6ffe755f35 SHA512 93e17d37091342b4b96b0d6c2a45e1102e41dc847feba7d61adc0c707b5aea72bb431bc2fbff9580d8e6d0db2b7125f3c0f4059feeb8bf6c841c9713f1af6334
+EBUILD python-sshpubkeys-3.1.0.ebuild 555 BLAKE2B 1c6f48c6ec6d9d967051ec39b68b9da68e01024891dbe288ea4f253d1f95ffee0ad80db6c9446453cc6ea60dc9705d6a221c8949d26e8465334c4e6365cedef7 SHA512 4b9c7a8c954deb449701c02c097bea3c33be6d32c9aea90bc8954dc57f75d3420aed9b61dd85f6e217956e201d2da6b42ec854c2e5fa864bbc167dfecd77f1a9
 MISC metadata.xml 362 BLAKE2B 789c599311180046c3d8d7332e1c11989cde2dedc8abf68d6c72ef5924a8e9a15847426fc71a5c57905c022910e2db735879de2cf20c4b8f770a4ee51118a031 SHA512 78963cc8668296c4b984155d1cd7169a89da8b4950a1c3c95f2d1782c197d40e68e0e5e9c6b3b59b72bfad056986be367dcbfbcba489c915eb79a4f5770b56e0
diff --git a/dev-python/python-sshpubkeys/python-sshpubkeys-3.1.0.ebuild b/dev-python/python-sshpubkeys/python-sshpubkeys-3.1.0.ebuild
index 8d2ecb683814..295c1da3eca1 100644
--- a/dev-python/python-sshpubkeys/python-sshpubkeys-3.1.0.ebuild
+++ b/dev-python/python-sshpubkeys/python-sshpubkeys-3.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ojarva/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/python3-lxc/Manifest b/dev-python/python3-lxc/Manifest
index 0483f071b9e7..7f7b1d17bf55 100644
--- a/dev-python/python3-lxc/Manifest
+++ b/dev-python/python3-lxc/Manifest
@@ -1,3 +1,3 @@
 DIST python3-lxc-3.0.2.tar.gz 27300 BLAKE2B dc4ba71b156eb0f257bf9d717f07f22afee3d00666601b709341d9091a1a75d237c174f613a93b6ecf7c69b4e6cc75187316e656a02a1d52f0e9970b8f3af6ad SHA512 2fc776decf6248be39f9e8a607a967acf180f3a07e45fadd6be4450f01caa4a854f217dcf7e81e27b5b838c2cea04ef09c8ab8b87c5be5091185bba2eb6b6d23
-EBUILD python3-lxc-3.0.2.ebuild 485 BLAKE2B 5e8c8c56da9081c123cff19355c1e23390d1908eeb66485d909e06bd27b0469c8d993d4f04cb53b8db9e062169416ec70a97126749ccd0701189b2782c72c3e2 SHA512 94f0bf430ceb49e5de3fbbec843340ddc182637697a06c8e5c8daa5e1357e65d18f3f21a39e3ed286301655456c95d28a1bb77c61e19f5a6a78d3496c4f778c3
+EBUILD python3-lxc-3.0.2.ebuild 486 BLAKE2B 114bfbbf9370b773440b08190165071f08cbb5a997f863aaf600a37f6681b316bbf0a3ea3ca427f0a7aff4432c25fa4955d763ae3825010c2c7b9a25f118af4c SHA512 6fb456fdc342c4b2a325337dcff46b9c2335bf4374b959a30a2ea96c55e966e041d8f62b13eaa2090f463d581e3b71296019074c9745e1e5ebcd3ee210733539
 MISC metadata.xml 361 BLAKE2B ac875639b7fd2af373b46fa94f9d89755785417ab97ad2b89c3d795aae4d64516fa03c4d65d0872cb1f8b78e320f53dd71995b2a8a97f14420ecc6f8b0feeeb0 SHA512 8930d025f9924645eaf87661d863f6a049aa15fd9f965dc0ed483f77c37354f0fa075d00b19677bdb038bc122311ebb890d321453e0073e106554fa02aa3a589
diff --git a/dev-python/python3-lxc/python3-lxc-3.0.2.ebuild b/dev-python/python3-lxc/python3-lxc-3.0.2.ebuild
index eb00eef10ae6..3e6d2c45a800 100644
--- a/dev-python/python3-lxc/python3-lxc-3.0.2.ebuild
+++ b/dev-python/python3-lxc/python3-lxc-3.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=app-emulation/lxc-3.0"
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index 76a77aa84a3f..ab461801cab5 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,6 +1,6 @@
-DIST pytools-2017.4.tar.gz 51339 BLAKE2B 725518ea3aab7fb158134f9539fe1f42603beebb547260e3556466d89b084bcd0adc367bbad63a461553c88eb5c50e2c2f510a02bfb99b9e3affab29eaddf148 SHA512 4f588b725bc478303d539851110ad627baa2768d5d013434ca20e36fa315a842d0f7c3adebd5ae948f642fc5b9ad4940fbe1ee6afeaf0f16c4bc937210e9fa19
 DIST pytools-2020.1.tar.gz 60662 BLAKE2B fcab8af5e10a483f9fdbb835bbc18fc98ebf3da80da9c8e98ff5131eb4a9e780562827966ba15f64df17ee46c48ef2498caf292e29b6b838ebfc5a49a1dccbae SHA512 b8b6513677f84fe97dfee9b96449ce6f2bad5d1dbd51a4f36b080136efd3b1d97850f02ec52e8e70c317104f99ad383dd9d2b260f0c151eb11851b03efcefe58
-EBUILD pytools-2017.4-r1.ebuild 857 BLAKE2B fb0624e9692c96e958d1c55dd69d76c62658e0ac32f9a115447f7c9b0d9cdba88e90eeddb5d746fb4dd0897b3392f69b2bb9e2491a9a55151c2a357cd4436ccf SHA512 5391d85fd314fa46bdbdeab936a7176d58d7870647495c1cccc2e6a38c6c91c5905ecb91643ff03bcde8e14fee56ea6aa92b40d4f0964deee4cf3ee2ecd9736f
+DIST pytools-2020.3.1.tar.gz 67635 BLAKE2B e10f80ee743165b0c1f9ee7a171a313ef70644ce4a7bd10a04764bd0e1244b9c98077d659b119b34f0976bfae6ac3caa172f5b24ea967da487536b59aab4a9cd SHA512 819e4d10efffac95f75e07838cd05052136f5a62183680119763dde4952013530493a2292bcb73541b6d329823feca32befa89fcf2dfe5cbe5cd1b00240b40e8
 EBUILD pytools-2020.1.ebuild 723 BLAKE2B cf1dca7c8b57b9ca13710be55298ded50d235ee924d5ee4fdd9c578f5075d87ba82c61dd0c30176d0949f6c2275e40decdc2f77920f5f8c0d1420ee5dcc321b1 SHA512 1901b039414fe6899f1866b87298d39405e473a83f66c82aaa257b8d830fc719e284cece71961dc0c06b8d52ea4796ab7f5be64a00fdda8fdd73a8e12ec7e6ab
+EBUILD pytools-2020.3.1.ebuild 671 BLAKE2B d8e7e67f5e9ca2e79a22e2e933997d75095a6d4a87939ecfbcfa4674cad0dc2690e97198cdf97295c292c7dde9c712e8f7495762ed234ce6077d44aa7b370524 SHA512 012a0d25cd87188b9b19305b4e4a0b287994bbbdb96b23f9d25abe1e09cebbb19dee15117cef055bf382e84fa6358543454f3e5c5c84cd509b1b7078dada4312
 EBUILD pytools-9999.ebuild 836 BLAKE2B c2b0d7927b0e5cc98b599d95932709b787a3ea2235173a6b7d44a5275975a513d3159c9612be3c6df75482f83a1b0d0d105c1d6aea5d354e670030692b8a6338 SHA512 7e6dc6c51682ee388bfda2fd1844260a0c5c4c379ae274fde10d6535c5b2e479e880eb26b7bb040baae6860bb5bcf3c94ad14e28c41792e683392597dbbc51dd
-MISC metadata.xml 290 BLAKE2B 1e302edc59a80de5a6b011f4c662f3dc09eb410bc299d57d217f73062af31faaccb857360cdbd7b52b60e048ef59eb991401cfd01be6db775687655b0a29b936 SHA512 6da06290247b2194c5d394082a196af7f13f8b88f89959ed855594796da66d66fe2bc15bd8f89619267053161376651ba3e1ee216a60377a53f07954bdec8050
+MISC metadata.xml 370 BLAKE2B c7fc7fd9d90ddabb9b07a5a15677f36892a428e3d0394eaeba76b4828560d7ba0212cdebb6fc4a61e5768cbd8458dc069038e8e84c99fd7d92d1e014eeed04cc SHA512 8287dc77596e94cd8d3d34dcd6fbe979064efadda19124992b97d90cb14b561ed311e701769f29a1bfc9f3b0e612e3356b95bfa05106dc29dfaaca722cb79292
diff --git a/dev-python/pytools/metadata.xml b/dev-python/pytools/metadata.xml
index 2ba6d245c406..5ca4bd67b414 100644
--- a/dev-python/pytools/metadata.xml
+++ b/dev-python/pytools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pytools</remote-id>
 		<remote-id type="github">inducer/pytools</remote-id>
diff --git a/dev-python/pytools/pytools-2017.4-r1.ebuild b/dev-python/pytools/pytools-2017.4-r1.ebuild
deleted file mode 100644
index dfcbd576f345..000000000000
--- a/dev-python/pytools/pytools-2017.4-r1.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 distutils-r1
-
-DESCRIPTION="Collection of tools missing from the Python standard library"
-HOMEPAGE="https://mathema.tician.de/software/pytools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.8.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	>=dev-python/setuptools-0.7.2[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytools/pytools-2020.3.1.ebuild b/dev-python/pytools/pytools-2020.3.1.ebuild
new file mode 100644
index 000000000000..e822631055e5
--- /dev/null
+++ b/dev-python/pytools/pytools-2020.3.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_{7..9} )
+PYTHON_REQ_USE='sqlite'
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of tools missing from the Python standard library"
+HOMEPAGE="https://mathema.tician.de/software/pytools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.8.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index 312aa6d50706..26c9c7a8d0fe 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,7 +1,9 @@
 DIST qtconsole-4.3.1.tar.gz 416931 BLAKE2B ec47c2ae8527d7aee55d6cb8d2ebea39ab1bfd3a268c46306613b67f72c27904db1de52682a47d075d804dad9cd7c124296163b39532936fb1a497ae606b7ffc SHA512 f0f84d95143b4513c3d12af4712c6a5724143bf8c44e7a3fbc06d7a94e665b8d12072dd13eafb09476a3aa829155f4c75eb517ffb2bd6e8bd3c00af3c764e48f
 DIST qtconsole-4.6.0.tar.gz 426936 BLAKE2B dfd61258e2e8a0ba74421253f39392e2daa04acfd072361488fc93087e2aa4daa62203e4da501a24db43a79eafe7eaa8528f54edbf7b6bb6d547521cc92b8829 SHA512 196022af0d9ebe9e065bf46c07f90bddb2c314d4f0f778f828e20200b11085150ff3ad3adac944496b778b926a0ccdec7903de27be25b79be7fe3ba867148b0b
 DIST qtconsole-4.7.4.tar.gz 424884 BLAKE2B 79380a1619498a28eaf7e741a3408a63b58705fe7c0672108b57c5cd9bb7c35d77569ce59a3cdb8dc21b3e403cc41845a534c55838ecf2e82038677132e90fbb SHA512 4564c0ee15b1feaff235ae35a22bfb719497e5f74416ea0ab471018c4d68e13dd05cc4d0180b69151f81817180d4985589340698067b5a2166764a39147255fa
+DIST qtconsole-4.7.5.tar.gz 424850 BLAKE2B e2d2ba50ce57b13504bdf8ad1ee3374b76abc980f0b74dfe1177c3f066ba24382bc51f8d3db2614a8d74b198ed20f01fac67c288602ae6e31fe90165e63ab9e9 SHA512 ee57ad2de5b840ee4e7f439be08a3c82fd39ef1bf6113b7eda95fa1aabd132c799ff584a2ac7f7e2c89df4bcd9a9409bbaeee108a6bb49e6197d2e3395336ad7
 EBUILD qtconsole-4.3.1.ebuild 1680 BLAKE2B 249564f33745d57c14439acd6cec7af71829d3d31e4982ee5c57ce71ba469053cf5d5932f4480d1f30f3f0556b27bf2d57a59de54556673568f282011612fbb0 SHA512 ae28aef823f50eebce4ec374704bc83ba3accd1bd1a9df72709dbc3c46c8a45a74f5e33667360fc8b64a349210368ae4d5151ae73cb7d13f70b839f168d9b3ae
 EBUILD qtconsole-4.6.0.ebuild 1283 BLAKE2B e551099568780f4f9e05dceee530499b8e7953d8b3052a7a1b18125dca93d9df453ee7ad76da67999865acc6f81ae9946a7965c69e71de66ff6292e1f8bc2139 SHA512 0c48143d092b3b582314c07967bc9be1c727fcacbf37dc60676a7b6f146d17826c79fc847cd31feb194a16c093885685da1fb41af06e1964df2f362c60a54569
 EBUILD qtconsole-4.7.4.ebuild 1236 BLAKE2B 1c5f96f1dbec7e23921ce0c3d273b90b0db9601ea9daaa5459369a2cb78f227bc979c59ced22cda22311802cde2dd9efe818ef4d81ba7b7529ef3b9c8abf22de SHA512 961c7732cd730e3c6c0029b4006cc173226c50c813ea8644564f73f22dae9e4a7a89e88dc7010c1d90250e7b8e743a6d1ffb05839de99828ecf710ece40031a4
+EBUILD qtconsole-4.7.5.ebuild 1237 BLAKE2B 8cd414d9d54885e2f70846384f73cda49be0a75e464ca24aba07a69e37db86786c8fe0ae6c96a833fd0f2e45aa9e29d0debd313eb66e3f741cbc2e301b8c1789 SHA512 7d604d90441840f02810fcd32fcc7d03b4843b0bb103fa6a04efc410c803c7572a5a877ae36497f34d7bc072d2ba0713c7ed0aeb56f49c61d63a02a03504dcfb
 MISC metadata.xml 664 BLAKE2B 33ad7b3510f6778cf805068f3edd12fcb235980ceb60d06a94e977be60372f1bb8119545a47ba04fbb636a6cb9c072ae1e2581cbe71d3b7d598cf54c5c99ea83 SHA512 fdb5f97ebbd75a451b1247fa015fea8ded2b428453be34140bd5151d2c0a9cba74cd91258903826dd1e419bf8b818c37f3df74ab2b573119628b9b918f80f69b
diff --git a/dev-python/qtconsole/qtconsole-4.7.5.ebuild b/dev-python/qtconsole/qtconsole-4.7.5.ebuild
new file mode 100644
index 000000000000..eab98c37d95e
--- /dev/null
+++ b/dev-python/qtconsole/qtconsole-4.7.5.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..9} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	dev-python/QtPy[${PYTHON_USEDEP},svg]
+"
+BDEPEND="
+	test? (
+		dev-python/QtPy[${PYTHON_USEDEP},svg,testlib]
+	)
+"
+# required by removed tests:
+#		dev-python/pytest-qt[${PYTHON_USEDEP}]
+PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
+
+src_prepare() {
+	# TODO: these tests require virtx; however, running under virtx
+	# causes pytest to segv on exit (even though tests pass)
+	rm qtconsole/tests/test_00_console_widget.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/rarfile/Manifest b/dev-python/rarfile/Manifest
index 5351676c8945..913b4cdaba66 100644
--- a/dev-python/rarfile/Manifest
+++ b/dev-python/rarfile/Manifest
@@ -1,4 +1,6 @@
 DIST rarfile-3.0.tar.gz 110665 BLAKE2B bdafa33600f1c7791af40f4e8c7b6a43e502980dab22bf6792a1b19eab53ea6c29bb6cb2ae4989b9f43d58c326b89ce466b9e2f82f60bad4892131895b15d400 SHA512 b0b816bf09fe455e4d8d35b447c30e7810468a6927555164a1b513d4161f3fd4e77a37439620bd935c3a12e46b1e5eda3e35d7d281899d2f9fd26b6e989aa6e4
+DIST rarfile-3.1.tar.gz 121579 BLAKE2B 3419eb0433866e060cc55fb94806a1ef0591c811e3b88eac97b05519e8e72cdb7da1e7f19fec1d5cadf60fa4caba4717cafe3fb1133556ef2d6f327da52c8c34 SHA512 eb910b0adfd1f28497163aa7994ab268d7780707e09931cb01014ffa51d985410b0bc17e5fb9ca133992b28115a0b5f443d01215624145d280f29e7065abb9d9
 EBUILD rarfile-3.0-r1.ebuild 475 BLAKE2B 89071d439a3217d0d4c8b6626d37fcc539b3cb6e20651a4525d82fe449457d1294ad0a554b73fa889b0a82239592cbdf8e1daad2400f993639c752dacc0f7dab SHA512 411e674941ac140cbde53ccef37c8fcbc6a9e24308f286f9964a2ae524ec87959e12f43c981372d976e2b13c885d940c13d4527022aaf06aa58ed474c0ce453a
 EBUILD rarfile-3.0.ebuild 484 BLAKE2B ef54ff43da9b5c2cfc29f56d1efd1c98cde8394166bea02be00152a19772ef6fda05effc569c7efa6726ee95f0ad0927f25d813e24688d083b1b0dfe571b18f1 SHA512 0eacb1c5d1a69a61e0ea644d3236764100c58d9aae8da97f700970f0af101af482b83dc895fdfe3f13f1aca44b3bfbc524b60964b11749208f4aac60ed9fd15f
+EBUILD rarfile-3.1.ebuild 477 BLAKE2B 4f845acdf60dc1b1d44d5360ad17341d76a6a4cc723b842ff11fd5c84effdd3d3dc5139fd4ed94fa3f7779ddbe57af4aeeb37af896806d43b5bb55bedc25f90a SHA512 35b762ea0b2144e9881920e1bb14b05f6d44fedf5586f57827f404cea422ef7f5a1b8aad76986bec9376e08ca91246ecf857d3b50f5bdf2d9fa117eaabe865fd
 MISC metadata.xml 665 BLAKE2B 1e99ad6ff0a0a07251d392632d0f2443dd46b622ce8af2e7312e310c1d419459bd98d712c7d33660484b6357c7eedbb32bedbc7a714b2f8a42c9684b5e0db855 SHA512 265d14703bce5b7955872c2f415e537ebe1a6228a6b5b4eec112103679c8412073ffc9506a5dd4af648c20acac78da4c196e139d7f93bf280c77d28d9f024045
diff --git a/dev-python/rarfile/rarfile-3.1.ebuild b/dev-python/rarfile/rarfile-3.1.ebuild
new file mode 100644
index 000000000000..f7282bc66968
--- /dev/null
+++ b/dev-python/rarfile/rarfile-3.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Module for RAR archive reading"
+HOMEPAGE="https://github.com/markokr/rarfile"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+compressed"
+
+RDEPEND="compressed? ( || ( app-arch/unrar app-arch/rar ) )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index ecb3d9df705e..d556cdf025e2 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,5 +1,3 @@
-AUX reportlab-3.5.13-disable-network-tests.patch 886 BLAKE2B fec5e11e9219e0ca320263539ca50016fa94829029b36922bf213544b827e736c6e060cd6946bc1584cf1b2b0a1a026b7df41c68d1081acba50956686663777b SHA512 561fd5f5a3cca662317fad3ae8262880b825765537fd2746042c92f290a0ced95ace7cd8d02316250f02843b4a27e0cf916bba6fb2efd4166cb19f3da6c7d6f2
-AUX reportlab-3.5.13-pillow-VERSION.patch 915 BLAKE2B 91f1177441882f055f0d9b1fb3c5eceb2acc0130e81e98ea0fc9ca1e9de332d438ecb223771e2c91a4b6d12d368f7974cdb3e1389a36be735c7fbeb9679214f9 SHA512 04d2c6a5f93f0fd00e903cc64ed71a03cdc898b3dbd94e8065712acff3b9f55c8e04fa78832ee90d91dbad129767a0357b59646f7284ff545236f5a4978b4ae3
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
 DIST reportlab-3.5.42.tar.gz 2883081 BLAKE2B 22f4e7ebc233895a036eeb94c5beb9206be561a8a44895b36291a4f840603a2fec90107ac60e749f99be629202801c63ff67d5034d19b42383f2df12d457104d SHA512 f52717867190bf7812fd566d9ec3044198db809cdd0f53cc9dbfa92503a202540db659369e20bba3de07cd28eb10515d03b85700ac138c9394dc9eed1f08b8f8
 EBUILD reportlab-3.5.42.ebuild 1341 BLAKE2B d87fa7cb343d0b5d306045bc1e69f10566eb0f142b599131350eec98cd984ea91c2db5d20b386723771c206bc2aec88d06acec1fe6d15409d9790f73499ae625 SHA512 cab97db2c7a559bc516d7d9be0340280103294f3d2448939dbe64b3457214329b379aed40637e5f18cd0c07367400bac7d746b74e0e2472d131853493d94ea36
diff --git a/dev-python/reportlab/files/reportlab-3.5.13-disable-network-tests.patch b/dev-python/reportlab/files/reportlab-3.5.13-disable-network-tests.patch
deleted file mode 100644
index e1a760d4d464..000000000000
--- a/dev-python/reportlab/files/reportlab-3.5.13-disable-network-tests.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -r f52d1198146d tests/test_lib_utils.py
---- a/tests/test_lib_utils.py	Tue Jan 15 16:06:40 2019 +0000
-+++ b/tests/test_lib_utils.py	Sun Jan 27 10:21:29 2019 -0500
-@@ -112,7 +112,7 @@
-         "test open and read of a relative file: URL"
-         b = _rel_open_and_read('file:../docs/images/Edit_Prefs.gif')
- 
--    def test9(self):
-+    def xtest9(self):
-         "test open and read of an http: URL"
-         from reportlab.lib.utils import open_and_read
-         b = open_and_read('http://www.reportlab.com/rsrc/encryption.gif')
-diff -r f52d1198146d tests/test_platypus_general.py
---- a/tests/test_platypus_general.py	Tue Jan 15 16:06:40 2019 +0000
-+++ b/tests/test_platypus_general.py	Sun Jan 27 10:21:29 2019 -0500
-@@ -587,7 +587,7 @@
- 
- class PlatypusTestCase(unittest.TestCase):
- 
--    def test0(self):
-+    def xtest0(self):
-         "Make a platypus document"
-         run()
diff --git a/dev-python/reportlab/files/reportlab-3.5.13-pillow-VERSION.patch b/dev-python/reportlab/files/reportlab-3.5.13-pillow-VERSION.patch
deleted file mode 100644
index 3b2093d9a8c5..000000000000
--- a/dev-python/reportlab/files/reportlab-3.5.13-pillow-VERSION.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/src/reportlab/lib/utils.py
-+++ b/src/reportlab/lib/utils.py
-@@ -883,7 +883,13 @@
-                     im = self._image
-                     mode = self.mode = im.mode
-                     if mode in ('LA','RGBA'):
--                        if Image.VERSION.startswith('1.1.7'): im.load()
-+                        # Pillow 6.0.0 and above have removed the 'VERSION' attribute
-+                        # https://bitbucket.org/rptlab/reportlab/issues/176/incompatibility-with-pillow-600
-+                        try:
-+                            im_ver = Image.__version__
-+                        except AttributeError:
-+                            im_ver = Image.VERSION
-+                        if im_ver.startswith('1.1.7'): im.load()
-                         self._dataA = ImageReader(im.split()[3 if mode=='RGBA' else 1])
-                         nm = mode[:-1]
-                         im = im.convert(nm)
diff --git a/dev-python/repoze-lru/Manifest b/dev-python/repoze-lru/Manifest
index 2e431d10f632..774ab819cc7f 100644
--- a/dev-python/repoze-lru/Manifest
+++ b/dev-python/repoze-lru/Manifest
@@ -1,3 +1,3 @@
 DIST repoze-lru-0.7-r1.tar.gz 19489 BLAKE2B b0a33dab1fd69962f04e9c088b005a2a6d456ec8dd17f628b7077b51841bef5e9503034959c8b89e84bf5c471d9366d467ee6b7a610508c4b098775532628fc2 SHA512 52e7ab83979d34a4f0c97e62600e64bf430ed0311120fe948f6b407b7713446d5e954c54f811b85ade74eebf2a4d54653c12c38d07bdac51c456aea86334468f
-EBUILD repoze-lru-0.7-r1.ebuild 720 BLAKE2B b7597c8406e66d94113d03b4b15e4dd432dcd755809fb854bab7344516dda5eb655837fc7bf166b21abb7def6cb4bdb48e75b570043aff9b14827d3887203057 SHA512 9a9eb5a314c0f357baa550718dd5e477d5a62667bfd0bc994a480249654b98a34f5780ce98ed5561bd0accf01df95e1818b497cd6954b8743bee296e9430980b
+EBUILD repoze-lru-0.7-r1.ebuild 719 BLAKE2B 4fa1208118bbbcfd6389a161318376b6132cf52d3ddd2d3c5d4dbf4a4e2b7fa06f5e90a5aa8d22647abcf7ab2d36bdd3f76ef60c1e36dfd6f60d223c97554691 SHA512 70c20a3c1b6624e34c7cf1c6f4a88bce5456792b15c679157515b5101491f2a4ad3e9302c5c2ad1d1f8d7f91aa235bd8d08e98f4247c053d8a78381fdea742dd
 MISC metadata.xml 323 BLAKE2B e5e3343e9f27fdf721439dc80ca3704efa0bdf76a1c13b5d7d872c2541540cffa8ce4efff0ca2f5469af4130d2d37c52bc2dc3f0c535438a96e3dc2b7b3a41bc SHA512 cfe029f7e7fa262fecbd930ffd1f08e615e9f746678e28253bb0402bb3036858574595dbc03235e18b02ba08b7288a4f4f663d107f7f900e669d2b502b34e49d
diff --git a/dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild b/dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild
index 084a3b600770..46120582cb05 100644
--- a/dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild
+++ b/dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="repoze"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
 
 RDEPEND="dev-python/namespace-repoze[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/requests-toolbelt/Manifest b/dev-python/requests-toolbelt/Manifest
index a9c99835c2df..052aeff971e3 100644
--- a/dev-python/requests-toolbelt/Manifest
+++ b/dev-python/requests-toolbelt/Manifest
@@ -3,5 +3,5 @@ AUX requests-toolbelt-0.9.1-tests-internet.patch 1225 BLAKE2B 54af195690d8ac4754
 AUX requests-toolbelt-0.9.1-tests-py2.patch 3100 BLAKE2B 39ecfd8f0bbf2a4d0731c485ada404f405413117e7451d36eefbc4f05b0073f86310e66ad4320e8ce648175aa072306acab551a50a4a516470b0beb4b981124a SHA512 540813a2d69c84d37a4a6ec5b98d2b71693ba34bbf661bb44be69c646d164134702e9fadd341d07085205b476239260167c858983978488553a07bdbf205ba24
 AUX requests-toolbelt-0.9.1-tests.patch 5781 BLAKE2B ff7339a1daf0ba2df49914847000f0b8b5ff2d097a59bcb02bcb2b20a885f18223a1da1f44a99d846dcff423239108411c193da5092bbb27fdf50bf211dd59f7 SHA512 86919154164274efe8bceb42eb9fc17524d4e144a541e82bc10692da66e533220cdc7186362d77fd4f3acdc639744cdf5273c2e4e2091eb4d33c1fdc6c631ec5
 DIST requests-toolbelt-0.9.1.tar.gz 207286 BLAKE2B 6123677a9abafebddf7dffde2150b2426b5132ebe0c330ff891322ecc3d69232a5b15a0c66e3e1fb4832dc04f5a636a939613fba041e499e9fbca9814f548c7e SHA512 12229928df5df71cb57bc65ef453dc0e4a2bbe190c1579811b2c2823673bd81aeba856b00000fa20b253d0f0fa4fff55ea1e750794ca3785f71c376b1df7fd93
-EBUILD requests-toolbelt-0.9.1.ebuild 1142 BLAKE2B 21c77f4ba79d90284316a4a226fadbb9b09ccd375c762b817a1d8354108a3f5a9403c7f6e5209c3531e0ddf436a13ec265332684550e3d4004d1a80c5134f78a SHA512 3155921a9ab85f8a51fb681fdbf5aace3cd9801e8d2701be6c7c5cf9b10776e5bee68297a0f803be92ca725bf2880ec87297fd3e5b33789c1216d1548e26b2f1
+EBUILD requests-toolbelt-0.9.1.ebuild 1141 BLAKE2B 65fa3786fdf156281f67d0cc32e36c2b190860f3bd9d0f3d75602b2024f6884259fb3dbce8deb9f1245c8d41fbb705fd025e81d031f93a590c70957e5b226a90 SHA512 2de54016082a95e1461b1c919436bbd3e0d995e72ca773fc00329d80be76c1dc2e007b910ce40dcb81782249366458b8dbbd8e9aac96543f9dc102052b6cb1c3
 MISC metadata.xml 398 BLAKE2B fcde3c429bad373cc0b0f1c155b217a69aac285add9c7ad92b50d211e36ccbed9e8d6c8b4d3cf42ce3250e614085bdc241893a6f2354dfc8b7e6a60a8924f58b SHA512 57e6affb2231a071faaa01d60bc44832eafe1ae5b927383666b230492fbfcbeb27e5ccd9d06308041aaaa1626289b5e1328fa1ba1be6d845564dac56b4fe3321
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
index e56387117e47..c6e899c5d0f1 100644
--- a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
+++ b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND="<dev-python/requests-3.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/requests-unixsocket/Manifest b/dev-python/requests-unixsocket/Manifest
index 6ee06db54831..f93b26c0ffb6 100644
--- a/dev-python/requests-unixsocket/Manifest
+++ b/dev-python/requests-unixsocket/Manifest
@@ -1,3 +1,3 @@
 DIST requests-unixsocket-0.2.0.tar.gz 13303 BLAKE2B cda02b5d963b00fb06cf86819bcbf552ecc21e30064198da338f502f47547a1f93184fd06052047c6cb8a6181f0a2f7b7a7cc53183b18dc22165a41dc14144b5 SHA512 a670f136ff1d8fb427cd017d92d388fd48a8a853d50aaa6eed685f3b453e28c6dbf5a710d7394face3eec42f8bdd84f798c7c4c82dab7b53d7a8c229ade52405
-EBUILD requests-unixsocket-0.2.0.ebuild 693 BLAKE2B 556528d8ba9bbc283a6a7b03f805409d9bcfd1ceffa9f46520a4351c4923efde17a7332e6e53fe2e04b324e827f8cb6add0738031ec7774870f7490c4963df8b SHA512 f62ada55b01f1da2a1808388973958fbb33ad86bb24c54e470d899aa8d0c352b8904b2419744d64e4095fb2061f744fa6baf29e00a328adf2a958906604d7dd6
+EBUILD requests-unixsocket-0.2.0.ebuild 723 BLAKE2B 4e4fa04ea8d940a644a31b4edd0711a51a11744748022322b7ab101fde768c632e22591ff6f5c7a1f6933b17214264bc568e81322760a821b8c06c3c952ea081 SHA512 356781a05e22111be9bab14dfa59d21de7858bc3e49ada4ea9c821f061e816666bfb750012b7e7580d275c378e79a2f042d4ca20596e412480541b6f65007499
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/requests-unixsocket/requests-unixsocket-0.2.0.ebuild b/dev-python/requests-unixsocket/requests-unixsocket-0.2.0.ebuild
index 2934c5039ed0..473151bcab89 100644
--- a/dev-python/requests-unixsocket/requests-unixsocket-0.2.0.ebuild
+++ b/dev-python/requests-unixsocket/requests-unixsocket-0.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/requestsexceptions/Manifest b/dev-python/requestsexceptions/Manifest
index c71ff69f03e4..140ea2b69ca6 100644
--- a/dev-python/requestsexceptions/Manifest
+++ b/dev-python/requestsexceptions/Manifest
@@ -1,3 +1,3 @@
 DIST requestsexceptions-1.4.0.tar.gz 6880 BLAKE2B 7539cb7993de817a9d22db3f2e1121b65850cc80723c149243e6e540df7f1229abf66a5a443ca41eb855510caa3f10ca6829d89ad39745fe8180359a92037cff SHA512 f631fa650a969ccc74eebfe7522b16e969de4bf48b6f7140eba46a301cfc5a56b9a8354785990daabae025a8175f6b62bf0870d73468d96ba92fa09f4ef3c566
-EBUILD requestsexceptions-1.4.0.ebuild 561 BLAKE2B a6cd06a2c27db2a4892d6b175046a80c74095a559633f3bfc1131d259315dd0b67b8d0bc020fcbeb5ded2e8a824a12464fc6d818359c9b7704175135b9b4ddfd SHA512 c7fc3548f635db56f3e8e63864a14d48acefa7f3fb7b3a1567ed5940fa3bc4c4f5cc2403ac64d38c32447643f294c74091366dc553ac4453d393b68fdedf1602
+EBUILD requestsexceptions-1.4.0.ebuild 560 BLAKE2B b769c1545b27c579213a5524d591e12a55010c549cf328a548407c6ec261b09749b1832b0c1e0adf396a2d252dfb76f8d237e46b2b9cc3a83a6f5a88f819c15f SHA512 f2ea012e6fb207c6f4c6fe4ad1e6cafa6b3cefa1874b8835c9d0dc0d03cb811d1703acacc49eb943ff168eb80817be8e22d36dec11f969291fd4e156febf870c
 MISC metadata.xml 846 BLAKE2B 976db0a8f9189f66aced98438f40a832c3e059f5c4d5be2466d5de2baa99fb4420a6fac98948801b6d5d363e8884b7f3110e8005323eced4c01414358f2d3da9 SHA512 d2ee4202dd7751d3caddc2c90b3d3c309b29ba1c7caf3427853944a7a5bea1d26a171fa59fff4f80e07235b3853990faa9dbad24ac0075fb813c4b91ddc4ab08
diff --git a/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild b/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
index 80335091eb41..44dacc0e238c 100644
--- a/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
+++ b/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.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/rfc3986/Manifest b/dev-python/rfc3986/Manifest
index cae2b729b22f..2684d3312daf 100644
--- a/dev-python/rfc3986/Manifest
+++ b/dev-python/rfc3986/Manifest
@@ -1,5 +1,7 @@
 DIST rfc3986-1.2.0.tar.gz 40162 BLAKE2B d51db37285366fdc7a6d25632afe440bbcdf4fbca46488082286824f046cfd81129b8f0e0695f986120276cf446dde5751dc52ebeb5f2f61f60c5acb92f2da1a SHA512 b88bdc47fa2daa6a9ffc339b1b997a85d0c8b3bf3ab271554e2a1a684c0394370e9cba07a82a542f39533a4c8cae69414234545db6caa2508e0ee7e7f8bdff3d
 DIST rfc3986-1.3.2.tar.gz 44225 BLAKE2B f4cc72ed3c2dcc7132527cd33fd6b9f0136f789fdb229cc33b02bf2dd596b2f762e3e4cf8af63f239408b55cdf056cf54315a0a9cdf734a4203fad24b00ce594 SHA512 c086c55295d80ccf33dbfeff06059303119e7a407bfc405b7f75ec30413221ec58d3061d75fd3ca696b7acf9b1be1dfcc785e01280bf659a53be43ab1f300b15
+DIST rfc3986-1.4.0.tar.gz 44912 BLAKE2B 595a644f8f92823ad31113ce88218cb30d16b37ec7303c0d8e89d2d2b1e18448d99003e95d61dcf09cb64aae517037bae798d1e89c74b652d517a648e80856e8 SHA512 dbcddc09331b794eafed8c2d7b81b7b632ba5cae2741e33ad12e781bc923427a05febd2f2715d037f35769b18c8d790546dfd4bbebe6e71d35777745e446888b
 EBUILD rfc3986-1.2.0.ebuild 705 BLAKE2B ece20ae0f22fbf2613a84c3850ff059729fb5f7303ef889b550d6af4d0ad3fec096d3ccef91080bf9a7e5343e12682bd1043be238d5b93d9adf3b9e5ee5f5fc7 SHA512 73dfda5986bcdc5f1dbb55e5e3b31bd5a9446921929b74b04dc4c7257fc1a0dbb0d9f0966f8e6b93ecbeb54a449b564919d18f5e05e3084c0155089c4eb66024
-EBUILD rfc3986-1.3.2.ebuild 683 BLAKE2B 1a77eb643dbc2805fffd84b1fcc7d0569220ce1b595b579bc6174de2dd6d4ef2389e251c0be8043eede97ffa442dbd3ac87e2c47fe01a66c9a736b5fd1ddd252 SHA512 eb4be0f8fa4128f4292aa42cac8b9f7ffb35d39be6ddec53f552066367950f8c0769799dfe29fbf65ab84777a36ea1777a622b0b2cb56e6646efa0a571dd96ad
-MISC metadata.xml 633 BLAKE2B b228083fadc7671ce50c00091f30e09d49feae287a266f68b15c330044d86b039664b4680e62804a939b0a86c32aa423c0cdce35902d88e0a1ec237c2849afca SHA512 acab17f0537fd26fb63038eb2c670761809f7292935727d798cb56901ac5539b0a100b5baf9b15f4e78112b829363974040769fd13ec62b704788c58d499d85c
+EBUILD rfc3986-1.3.2.ebuild 682 BLAKE2B dd3a897b8c8d85ebad11d5a4e60f915c15a7928e80b62ffbc553f9821011d932f47c20cf4f61627bc064523b9dce8e5788d81f7f9501373377e1e43e7b52d200 SHA512 d0082e2014abeba57ef3e8bcc67857189a26ae3ff2244d0169b606a7db2cceea9352f2277cc540312405beaa95a98241cec2178a8cd5af51bc8938a132ca7bea
+EBUILD rfc3986-1.4.0.ebuild 682 BLAKE2B dd3a897b8c8d85ebad11d5a4e60f915c15a7928e80b62ffbc553f9821011d932f47c20cf4f61627bc064523b9dce8e5788d81f7f9501373377e1e43e7b52d200 SHA512 d0082e2014abeba57ef3e8bcc67857189a26ae3ff2244d0169b606a7db2cceea9352f2277cc540312405beaa95a98241cec2178a8cd5af51bc8938a132ca7bea
+MISC metadata.xml 740 BLAKE2B ad52fb6e822fe4ab8e910af9f4896079209f0704c649d240464eb283c9796f5bead9303b7bb02f5db5049b9afa430bd190871c1bc391a21647eceb0d353c02c0 SHA512 3b74fb8b21300169b3d9da6c8a14bcd950d277c56ea242a73fc56637d853cba64de931567b19c0cd8b9acd6f7b8e486fb9e1ce0716b1c291669e6588caf6611c
diff --git a/dev-python/rfc3986/metadata.xml b/dev-python/rfc3986/metadata.xml
index cb470c58926d..5768f78b1c5a 100644
--- a/dev-python/rfc3986/metadata.xml
+++ b/dev-python/rfc3986/metadata.xml
@@ -9,6 +9,10 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <stabilize-allarches/>
   <use>
     <flag name="idna">enable support for the IDNA specification (RFC 5891)</flag>
diff --git a/dev-python/rfc3986/rfc3986-1.3.2.ebuild b/dev-python/rfc3986/rfc3986-1.3.2.ebuild
index d30c59714ba3..a132830441ff 100644
--- a/dev-python/rfc3986/rfc3986-1.3.2.ebuild
+++ b/dev-python/rfc3986/rfc3986-1.3.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=( python2_7 python3_{6..9} pypy3)
 
 inherit distutils-r1
 
diff --git a/dev-python/rfc3986/rfc3986-1.4.0.ebuild b/dev-python/rfc3986/rfc3986-1.4.0.ebuild
new file mode 100644
index 000000000000..a132830441ff
--- /dev/null
+++ b/dev-python/rfc3986/rfc3986-1.4.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3)
+
+inherit distutils-r1
+
+DESCRIPTION="Validating URI References per RFC 3986"
+HOMEPAGE="https://tools.ietf.org/html/rfc3986
+	https://github.com/python-hyper/rfc3986
+	https://rfc3986.rtfd.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="idna"
+
+RDEPEND="
+	idna? ( dev-python/idna[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? ( dev-python/idna[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/routes/Manifest b/dev-python/routes/Manifest
index 33dc304a63c4..445cc7f4e1d1 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-r1.ebuild 1434 BLAKE2B f58b564def8cb7784370ddffc7b8540555a54c750d1308075125217f1493f4f69b7ec6012415169c09c0c83e8d466350dc6b1cba0a82666ef7b6b70418199cc5 SHA512 495b458fcae689818513c6e6780e345aa50cf51f82901022c752ab183851f598c421638732665b5d9d5af6e57a56967a62a51d6907bfea3c88be15c1c7fa6555
+EBUILD routes-2.4.1-r1.ebuild 1433 BLAKE2B ae23df3b34f073727894eb74a76ca27e1ca326b1371e147f62191322f93ae1a26663f6cd5b11e0ef2f14078a7d311a17f45561c2d4a0afb4b637c00da0522102 SHA512 e7db0cc738ceed78e1a4612468dccade02d03dd3b7869464ad91e78c1afc8077f44e8e0c7f7f2c1ed60781dc83ac7c4934f6135ed2fd148fea9330e778b63652
 MISC metadata.xml 309 BLAKE2B 58e1b02098e87fe7303e9a6ce962897750493b957d3b30f78feb58b9cbec84b5fcf80acde66da35caa71989b628a75d232ea567e679f891fb4b81d1c49f61d06 SHA512 6daa7dcc2ae185c198c2630961d68c19498e98bce96ea3b1390a4c159fb591a89af796f2ac90e00994bda52c36138792797a38975c772d6fabce09cf0536722a
diff --git a/dev-python/routes/routes-2.4.1-r1.ebuild b/dev-python/routes/routes-2.4.1-r1.ebuild
index 06e5798198e0..4af90af70c2f 100644
--- a/dev-python/routes/routes-2.4.1-r1.ebuild
+++ b/dev-python/routes/routes-2.4.1-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index 0cb6b843cfa1..457d567ded22 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -3,6 +3,6 @@ DIST s3transfer-0.2.0.tar.gz 118361 BLAKE2B 0cb0a29e6dfa82762084396db1950a9e1baf
 DIST s3transfer-0.3.1.tar.gz 118716 BLAKE2B 26c25c0eb50b423c08e7ac64e902ab7cbb9e3dcb9cdc7386e6ead17f42ef18bcbb0d60f8334653220f797a03b8a877ae2487de25d8c95344f852d71bb0716408 SHA512 75df6f66d4b0d4a87a88a160cc1c962348331596ae346ebd198fbfb1e1c4d2c216b19627a0600d5a7966d0e683e0a46f6dbae47c9b44bdd65340400f93ed9b3c
 DIST s3transfer-0.3.3.tar.gz 118872 BLAKE2B a8e10a135052a29cbc5949bd8dc82d0b7f76840e6dbc6ba5ccdfe23757d363476f1dc330cee36ceb88e5c5287f644a27ed50b518a346f1b6b8ae38a9ca5576c9 SHA512 e258958b47812d8620ea6ef604dadb2a13beef9bbed005e8d38153039a291099786a3cec68511f2ff4372ff57f60440ca700b6783967484d8284b4ad0c1ae754
 EBUILD s3transfer-0.2.0.ebuild 820 BLAKE2B e2a74d75a9ee0b875f86c7a9b509c10595bc1ea5465db832711e43a50b487afea933085fa07a88d20b213a091aa3b126e4f028c844c7f3c712e038a9dff71ef1 SHA512 0f7b59b068a027b6aeb9dff065bddb9fe1fb0ec4f9c004613291aa6ea8964e1dcc1a0cadcf1f55674e06f3d86ce74d4110d11682dd341723441b715830bca6d7
-EBUILD s3transfer-0.3.1.ebuild 922 BLAKE2B afa78438980a6bd51bd3bcc9966743185a46e9b4cf10614a6a57bc8fc6c6bffb3fadb37267ac5727b58391c31bb9f56a15157a07373278954270661884160791 SHA512 c49bd3aeb81dfbf12c14299e29a7b2afa8502592694b72a08fa712726b64d35739157aebc8e1b299a2222bb80a3eaf7f27719f538a6e051d650d3b31240eb5cc
+EBUILD s3transfer-0.3.1.ebuild 921 BLAKE2B d6b4d663dd55b4a54138d30f42d1c51a1c1937f4cd9d56a0714dbaa769274f06faf4e665f363ee6f38c72bbd2d766698e7b8619864ebeca2fc9dadb5ab3f851a SHA512 516346376b7f405136f7b8f0eb534e7273bdde69cb1d5fb7f8b8122fce2fc5a9cd765067a65e9fa2be7cdea80b7c6f0c9e5b5236e576ee285d6d8bdc4f31a4e7
 EBUILD s3transfer-0.3.3.ebuild 716 BLAKE2B 50de27aeab0e9251b793edaae04ed1e0cab3ef0c88f730b4e5b843b2e288f95c0149a645f20e7aa3fe2170e0fe8d71158322bfa4a3313d88911cf2d6952dab2c SHA512 11413cbab02052b563294a0f986cdbd72107273c379c00d215ed699a80536c5e0e7dda753812f75e89ed3fff866baf9c8d79e2ee40d5d399c3ba91ec49a5fae6
 MISC metadata.xml 478 BLAKE2B 8494fa51829bb778df3e7e93d1fccca86530c3577fe848f00b8f1c52dbfec8a56cbaaeedbdcd7db9eb5b542c8c2a73fbdceca9f46df3758b9f8636ee0fabedea SHA512 ba0e7c92da9cb77e61bfe7887fc97853f02379ebbffed62c08237bec954be080a64cc02e3d3e214b59c7a22e25c934fea3db5589c2f78462cce37186f63cea17
diff --git a/dev-python/s3transfer/s3transfer-0.3.1.ebuild b/dev-python/s3transfer/s3transfer-0.3.1.ebuild
index 18df49217ff7..d81234e7f387 100644
--- a/dev-python/s3transfer/s3transfer-0.3.1.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/semantic_version/Manifest b/dev-python/semantic_version/Manifest
index 785c7d9db976..0139b48c1224 100644
--- a/dev-python/semantic_version/Manifest
+++ b/dev-python/semantic_version/Manifest
@@ -1,3 +1,5 @@
 DIST semantic_version-2.8.4.tar.gz 49774 BLAKE2B 30dc1bbca9e24db993e2c9eae2ba05e7a102ba8baae10bc49640d74a3fe9ff943b7606b7c7cbad3d7b25d65a10df7ab587179b5a9bfe73822eb62b945074db23 SHA512 2ed9a8ae03384731865c0b160a9bc92f9c877b610a4ecf15c30969886f15e7cdf77cf384997f96126a8a77534e032c70f587c835fe288fe4ab3e9e2061cb6f47
-EBUILD semantic_version-2.8.4.ebuild 914 BLAKE2B c9cdc77edc587143ad0ea80b5e936cd6123c1b3d7d35dcc82443c426c4aba6920109e4a40c97098079794d4d68c90ae8c78eec4350564262e3d0382b9ed3c878 SHA512 42c0df6aeef381ebcd3ea78896fd4ebc5f42059acfe8a5cbda54f85f192776c1873dd83e90e28fe554942826cc0277fd79e9e0efe5be876c29a7d710e068bd86
+DIST semantic_version-2.8.5.tar.gz 50009 BLAKE2B 5f966ca68358d4963b3a41574c100a8f78275445285aebbfa47d1febb0b7a2eb3a638254d4d1bd8e093acbef47a101ef0a0d7a86475313aefa211d2a0a3cfc19 SHA512 2ab59024c148239d78de062ff3a357f81a33fd066b6be8b6f9ef0753841a4945829b1c11899cfbda6c3ff09e00aa3b689e1fb6f8b9a92bbb3c2a62dd713b6049
+EBUILD semantic_version-2.8.4.ebuild 913 BLAKE2B 8a63689d3c6e31eb89971c0d613fa43f839a93f133405195975ebbcc3d81a8658540f6eea289cc4660cf93888c856d718620ab605c1f2f40dbd29095975b5fb1 SHA512 d418d38fac8b30d3930784838e8b280c8029c2ac0561f06cdff23edd2aaff24f90e436a524b2e792b0155db792c5e8746323ae13f5662874fe8c18e446ddd4ee
+EBUILD semantic_version-2.8.5.ebuild 605 BLAKE2B 2054ff12f50e81844014206a02783ff8f83e0e7555882d30f6032a25fc11798702c730ee55568041c11cbcd0829ca0c9b055df2a7304624823b5aa66b5770fb3 SHA512 c45f25248f947ff3a060fc6ae4ffea36024f213f62537989e10c3cd6bf47f6b92a8b704ae2a2d50b7074eaad2478811cb2120b1958c794f5c6ea76841845c861
 MISC metadata.xml 819 BLAKE2B 3b85ef79ccc81d2c8a07e28697fef8e0eac70d9711b49bb194f9708ab5d734982d09fdebfb29174d8c9b0b8fe650641a07847e844182b5f78474f94844e182e7 SHA512 214c06da33a967f4ef3f8046dd88232f3916c59f5d220458b01151fa8db83cf1af889e02b2583281ea465de756c235766153ea2d5cc3a9dc39f5ea38fc8ba4da
diff --git a/dev-python/semantic_version/semantic_version-2.8.4.ebuild b/dev-python/semantic_version/semantic_version-2.8.4.ebuild
index cf11169d38f7..31cf61f76904 100644
--- a/dev-python/semantic_version/semantic_version-2.8.4.ebuild
+++ b/dev-python/semantic_version/semantic_version-2.8.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Python library providing a few tools handling SemVer in Python"
diff --git a/dev-python/semantic_version/semantic_version-2.8.5.ebuild b/dev-python/semantic_version/semantic_version-2.8.5.ebuild
new file mode 100644
index 000000000000..cad82361d1cd
--- /dev/null
+++ b/dev-python/semantic_version/semantic_version-2.8.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+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 ~arm ~arm64 ~x86"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
diff --git a/dev-python/speaklater/Manifest b/dev-python/speaklater/Manifest
index d4b0d7f1b74c..3f4ed56da918 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 821 BLAKE2B b1d043a19c77fa2a83ca852a06341a984cb5a7d3a837390694f67de90fa63cb04bdf9f680d88f888d8285fe12a00f5c9c4f17cfe9cfa26f76f51220a6d399faa SHA512 17709526c612947e0167a0d219cc2cf5def90e791f6db501507c9df8b16e78d17d0c3a1e33ff743cecb93c01da6209c97c464b65bc8279d8a37b308fdef29bb9
+EBUILD speaklater-1.3-r1.ebuild 689 BLAKE2B 35730ac4cf779f8d40ac2480318dbf06472b2a74d47383e4bfe84acab4db838a66ece113485298092846e7b6cd6fb3b8a4f9f04b8f3d3a37ece03408fc971c20 SHA512 54961b04f239d7b73f0c695487be56f29b2de6efcfadc206860d1924c0bcc9fd954393aac5544c81bf3d94405e21a09b80e93c97b81e5a004e7aaec2869514d5
 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 2be303dcc63a..d7bee32595a3 100644
--- a/dev-python/speaklater/speaklater-1.3-r1.ebuild
+++ b/dev-python/speaklater/speaklater-1.3-r1.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=( python{3_6,3_7,3_8} pypy )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Lazy strings for Python"
@@ -13,22 +13,16 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_prepare() {
+python_configure_all() {
 	# https://github.com/mitsuhiko/speaklater/issues/2
-	if python_is_python3; then
-		2to3 -n -w --no-diffs ${PN}.py || die
-		2to3 -d -n -w --no-diffs ${PN}.py || die
-		# fix unicode in doctests
-		sed -ri "s/(^ {4}l?)u'/\1'/" ${PN}.py || die
-	fi
+	2to3 -n -w --no-diffs ${PN}.py || die
+	2to3 -d -n -w --no-diffs ${PN}.py || die
+	# fix unicode in doctests
+	sed -ri "s/(^ {4}l?)u'/\1'/" ${PN}.py || die
 }
 
 python_test() {
-	"${PYTHON}" -m doctest -v ${PN}.py || die "tests failed with ${EPYTHON}"
+	"${EPYTHON}" -m doctest -v speaklater.py ||
+		die "tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/sphinxcontrib-spelling/Manifest b/dev-python/sphinxcontrib-spelling/Manifest
index 2b11d7d0d10f..691017ab0351 100644
--- a/dev-python/sphinxcontrib-spelling/Manifest
+++ b/dev-python/sphinxcontrib-spelling/Manifest
@@ -2,8 +2,10 @@ DIST sphinxcontrib-spelling-4.3.0.tar.gz 38316 BLAKE2B 4bfcbfb22c10b5bd181ef5ba7
 DIST sphinxcontrib-spelling-5.0.0.tar.gz 38479 BLAKE2B 5fb20cb08529e1db9d5df25a31f09849dacf41003893dcc74355d70161269b18b3bda7eb2dcc279250190e6eb2ead7a3bb1d40ac4a4d5db1a390f339a22da777 SHA512 bd608e13d1643924d69336da6a5fedac3f60ffbbf0d367c203936395270b2504f45db2ec0d2fe179a86dc91616e458c6fa0d2a6f66a20ee956c5f52ece1140ce
 DIST sphinxcontrib-spelling-5.1.0.tar.gz 22942 BLAKE2B 00861b429b66667ed45791f9dd8394b23cf2982875a9e3470c1e2dee22ff0500515d409821a73e46b49bcf397e9ef40f377f933e460b8673579b1f234bf157e4 SHA512 22c5c4eac56c0138e33aae38c2ed1d254211c502087e4c0ebebf2b3b7df69d2567cacde394abb2d8385eab48ea6e3ac9282c980bc8b52408f46bc06ab9634fa4
 DIST sphinxcontrib-spelling-5.1.1.tar.gz 22883 BLAKE2B eb5d13e73221dd4de86ebddc5222ee75b152a0e7681e93c0cfd66767903a949cb3d967c12bf553a67bfcd2854133f1164b965711781601753420f5f6a132bc7e SHA512 79825228d35e98fc85e4d1d6cfcc3f720df68b7f1493a0907e712369fcb76fc30d96de44fbbcc092e6978a797646da532489f420af42566ca4f9b5b932d85292
+DIST sphinxcontrib-spelling-5.1.2.tar.gz 22962 BLAKE2B c7b15289b4b6dce5e6c5fb529c4be2cd7c1f41d8bfc6ac86daf1a982f711bd2c426d9b3a615471538fe221197b64ccd907efd4620ea2440f6ec07b2a078d6bee SHA512 4a0398b7c79a035e12d9ae96100fcaa4df42aeae07a01a73f7d875ba04fbbeb3d7441c9debe77491876d78b0a3753677cff4cb3a575e3490364fe5780f5a70b2
 EBUILD sphinxcontrib-spelling-4.3.0.ebuild 1205 BLAKE2B 8aa26a7e4bb89148db02ed0b838fd5b03b8e85dfdd9e7929e39a3a9edfd7675a3f6673d3851f8af6f204b6f9164cdee62a9f3575a852afb55c4cb2a1cae68eb7 SHA512 77e9ded8067b711906e21eee5284d13381c4e602907598e9452fe238358db3c56d7bfee1ffe7f35c861f45aabd55c89f17cacdc06b9c6cba1d58c08b9d01a1ef
 EBUILD sphinxcontrib-spelling-5.0.0.ebuild 1232 BLAKE2B e25fe65bf383da4f7096536199c81372ad500b5b16174e9a61604f92edea230cee154455603ba434cdfdbe1c228849476be831979a7689c6a8bafb874a8d017d SHA512 ae2ccd4acb5132afdbc16f2685652d91a20d713abf256fde34753383184fe6c3737f93ca8a8513c46dbf62e9c733a5e9656a5874c6aac37031e5864f56cae0da
 EBUILD sphinxcontrib-spelling-5.1.0.ebuild 1231 BLAKE2B 3971148c1c3e13f254e4242920dc371ed336229408f01428c7704e97f9c825ab4d40172bfbfc32df2354ddced287df2be4f5cad306769534abff6554fb7b79a6 SHA512 26d3fd133d270786cfcbab7e568fab1cdf61e3983ac366c5915e4e36c3148abe77fbe9fc82058bfdcd1e47de5f6b4655bb23671025ec88a4abedd4f65214f544
 EBUILD sphinxcontrib-spelling-5.1.1.ebuild 945 BLAKE2B 3b395b17048904a7c84c44618f52e0e63929769f4ee90748e3958ea47378d2f11e675ba97d60d12152faf89de023e02737ca4bfc10cf16d08e8038e5e1cf2830 SHA512 5b79be68ae961bbc490168a4be3508ed6d77a0cf5d1ac423a2323d2ffdde2db5c083027dd9e0aba278466ed39cfdb7d0ccde02ef6b13d717722e83362d8bc03c
+EBUILD sphinxcontrib-spelling-5.1.2.ebuild 945 BLAKE2B 3b395b17048904a7c84c44618f52e0e63929769f4ee90748e3958ea47378d2f11e675ba97d60d12152faf89de023e02737ca4bfc10cf16d08e8038e5e1cf2830 SHA512 5b79be68ae961bbc490168a4be3508ed6d77a0cf5d1ac423a2323d2ffdde2db5c083027dd9e0aba278466ed39cfdb7d0ccde02ef6b13d717722e83362d8bc03c
 MISC metadata.xml 378 BLAKE2B 238ea1508c65e2b5c05360aafab23da6f6f25693c677232862302d372dcfbab0530ad8964d6e393935193b5f9341f697de28dc2a3634c7b726a7f10762df8d73 SHA512 b5b909cfff41351a21e2fcfda9a9c022d600943038676ba63cfb525cef2d7b85c78b61bc58e33965f14a0d559f74cfef1f943058a4bc7c70cac2be34cda8dceb
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.1.2.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.1.2.ebuild
new file mode 100644
index 000000000000..5b51077280e2
--- /dev/null
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.1.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx spelling extension"
+HOMEPAGE="https://github.com/sphinx-contrib/spelling"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		app-dicts/myspell-en
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source --no-autodoc
+distutils_enable_tests unittest
+
+RDEPEND+="
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
+"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/stevedore/Manifest b/dev-python/stevedore/Manifest
index d5089ee6987d..5e45e3596c99 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -1,7 +1,5 @@
 DIST stevedore-1.31.0.tar.gz 505482 BLAKE2B c69ecf61b32ab996f23aa913a9f226f64164b94e9420da8b7dd5a8ba568a228bd2f536052ab9378167fd2fe2e0d8d7b42515580a966eeffb5beeaf55dbba69ad SHA512 07b641b63766eddd094690acad81c1417a9721d785f81ca11da0ec2afed455d1beedfea5be4dcfd833d9379d650b193e26207ec0411d274bdf399ea2acd321a0
-DIST stevedore-1.32.0.tar.gz 510344 BLAKE2B 96de6598245e88900ba0f0bd69b976425fc5be2c783f32c551ebb2536dc5fde7fab18121947f3f9caa4d7d822372ad502d272285cc66368bfc39c566821a0160 SHA512 98c66b9ac827f69737cc2522029108831380b4bf4c633786d9819b52be930f6116ce5bfab58e724a2efad147830fcb6353409322fc5e01617d35d1c8aafb0259
-DIST stevedore-2.0.0.tar.gz 508206 BLAKE2B c8e8d1044d1af4e2d0366cd836c36783f49a97c54761070d0af3d7c31b7a3bbdc8d98dfadf2425b73b30d7a37b3bb5ca3cde71a6eea76513f9c565aa7c94511d SHA512 10b091749b638330703c256e8614a9519059edcaf109944a0ca04bda5c5fde0d9ab473dc8293cde809867dbd1c2a23cd96d0faaa1f7d802ad68aa0a5aa972a0e
+DIST stevedore-2.0.1.tar.gz 505248 BLAKE2B 2fee9467b70aa605ca89060e839a2c00deec571f15f014cb8118710e9221fef65ec15172d727dbafb5d5e2adf15ce0e94919804e2ec7ee72ae9e47afe2a6b88f SHA512 1efe46983975b1a0f176f847874c68dd91538fc3c029facbbf0f96891894176e0eeaf28c19e674baa9e9dae024deabae0555c846e36211a9be6cbba5e2ecd710
 EBUILD stevedore-1.31.0-r1.ebuild 1231 BLAKE2B 1d3b70997d0c968acdc791eadb19b5792f6f7a112fb7bc6bbb98c7f27c40df122d1460719d5201a0731bbd9b01539a1ba7f033bfed87b859389374c8c732f447 SHA512 7ba44275a50e9a70d996b2056d60d80e20c47371e3a11282dcd2d0287707042413db665e358f24db063a501d3c07f3d222ce4b75926a84bd33715087232ee12a
-EBUILD stevedore-1.32.0.ebuild 983 BLAKE2B f18f58031cf154999d335cbcdbf6e94c96dbafef31a6b18d7420fd9df4161ac5b0afaca02a08f58c71573f548d65e376e482e0d372037c24e80781cd4c740e28 SHA512 e4b783883a4ebcba529911c8aa61b5948f9eeff507bcc339b2b2efa2cde4064621e7ec1edab3843d803462504d321df295afed29652ed43dd78d54fabdb96e8b
-EBUILD stevedore-2.0.0.ebuild 983 BLAKE2B f18f58031cf154999d335cbcdbf6e94c96dbafef31a6b18d7420fd9df4161ac5b0afaca02a08f58c71573f548d65e376e482e0d372037c24e80781cd4c740e28 SHA512 e4b783883a4ebcba529911c8aa61b5948f9eeff507bcc339b2b2efa2cde4064621e7ec1edab3843d803462504d321df295afed29652ed43dd78d54fabdb96e8b
+EBUILD stevedore-2.0.1.ebuild 975 BLAKE2B a1214a513f6d8e9ce1169a75d78de1acc88d1a18bcca671364ba3431c2293830532967dcbb2f3f6f5b80299d93d41a418272c98b96c3394f4a7ded23581e23a8 SHA512 c72a9db74ad2cbbd020ca4e2f363f836735cdcf6d440517b452661953b62d8207e8ff71928c4849d0e22190ed8bb5061da0a0cf4e3d1688dc6c05e9b00269723
 MISC metadata.xml 521 BLAKE2B 6ac47530dc97a775a197bee97ee62ef419c402a134cb6785ba953a9efdd94bf0c4a79f01dbb7142774e9be25087334efbed7ad1f00b68544cdff9de8807078e5 SHA512 549144ae7c90fffb566c473e7301e3a461b47911cf7d2b1c03b5d0a39b1508f3462365e0ab27f5638d08c677556c8d2348a33b5fa018c68a5c64b2965a545fd2
diff --git a/dev-python/stevedore/stevedore-1.32.0.ebuild b/dev-python/stevedore/stevedore-1.32.0.ebuild
deleted file mode 100644
index 96df662c46eb..000000000000
--- a/dev-python/stevedore/stevedore-1.32.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..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Manage dynamic plugins for Python applications"
-HOMEPAGE="https://github.com/openstack/stevedore https://pypi.org/project/stevedore/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx 'doc/source' \
-	'>=dev-python/openstackdocstheme-1.18.1' \
-	'>=dev-python/reno-2.5.0' \
-	'>=dev-python/sphinx-2.0.0'
-
-python_prepare_all() {
-	# Delete spurious data in requirements.txt
-	sed -e '/^pbr/d' -i requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/stevedore/stevedore-2.0.0.ebuild b/dev-python/stevedore/stevedore-2.0.0.ebuild
deleted file mode 100644
index 96df662c46eb..000000000000
--- a/dev-python/stevedore/stevedore-2.0.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..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Manage dynamic plugins for Python applications"
-HOMEPAGE="https://github.com/openstack/stevedore https://pypi.org/project/stevedore/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx 'doc/source' \
-	'>=dev-python/openstackdocstheme-1.18.1' \
-	'>=dev-python/reno-2.5.0' \
-	'>=dev-python/sphinx-2.0.0'
-
-python_prepare_all() {
-	# Delete spurious data in requirements.txt
-	sed -e '/^pbr/d' -i requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/stevedore/stevedore-2.0.1.ebuild b/dev-python/stevedore/stevedore-2.0.1.ebuild
new file mode 100644
index 000000000000..6095da755c55
--- /dev/null
+++ b/dev-python/stevedore/stevedore-2.0.1.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..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Manage dynamic plugins for Python applications"
+HOMEPAGE="https://github.com/openstack/stevedore https://pypi.org/project/stevedore/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm64 hppa ~ia64 ~ppc64 sparc x86"
+
+RDEPEND="
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx 'doc/source' \
+	'>=dev-python/openstackdocstheme-1.18.1' \
+	'>=dev-python/reno-2.5.0' \
+	'>=dev-python/sphinx-2.0.0'
+
+python_prepare_all() {
+	# Delete spurious data in requirements.txt
+	sed -e '/^pbr/d' -i requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index 699d0ecf3f27..770d5902e9df 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -1,5 +1,5 @@
 DIST tempora-1.14.1.tar.gz 19383 BLAKE2B f65896391e839c3da43bb42715459b9ab870a724722bfc83c129f18032e731d69b2d12635a519226ef4ce99e77a3418e7e1a05a116a80c222b4e8138f9966f9e SHA512 4ecd5430d4d90959b0985908a1e4f239a56ce0026cd315ef6b8c204b645caccb135db76bb2ca9cb95bc65bdf337b61e7c31514eb9c85036771469b6a058edfbb
 DIST tempora-3.0.0.tar.gz 21500 BLAKE2B 7bf241d5ab60c78c0ea56df6b28e33504200eb5427cdffaf9d5f34da202c3ba4550fa4dcc48874ee870345fa5a10f2b874687fe7de2bbe049b1c14d05161b0e0 SHA512 2d397c1d17bb4c502817ad0278090137fb8ca00273c63a7336200ed7e621a99cd5c954cdc2da00d06eba34ed4f079429f5ddc68b928cc83feacb2335f995e1b7
 EBUILD tempora-1.14.1-r1.ebuild 1449 BLAKE2B e9fac10aad944f8398c0acaa739d2de2b9d57d0589507a3d8df4fb9092edefde4d42f4d938ed5bc773752376c4e17d84fe288606943fd2bfcd5064019d2c3242 SHA512 653192a76817d729dc297fc52d9bf2382e5316c7f8b6d2d53675e5ab57e1e739e2440dd56312efdd856ce6c60902ed28d763dc6cb46d6b25a46064daa34a0644
-EBUILD tempora-3.0.0.ebuild 1519 BLAKE2B b4876110a8194a262c5af7406b4f11780b40b628883d42c6adeba5f37ef3ba8d582f33f2582d8ac8d40189f43e86de674f2a1499b31f96482a27168bec3a0583 SHA512 77641499ab83b8cefab1bad7471c676d036706fa88051f840517925bdc3ba8b6a3f6437089b816cbbb9a016c3b31e090e70744401b7ef3c3dbac0113962c67c5
+EBUILD tempora-3.0.0.ebuild 1518 BLAKE2B d806ed0e7c1e6398498035ccde4be88dca743c5df92847a3ef4d424309c240e6d16cb2974c907d7b161f63779ac21ebd5f13954e8e7204a16e0b73cc98312f0d SHA512 acfeda48de1849892bb34a48ef046c127b85d9a51890d5113b8c5d4a3b56255684d68b70d8ec1475b73e64c02dc94c356a1a0172afdf07cf09c03fbf387fb50d
 MISC metadata.xml 615 BLAKE2B d393b579842c51e2dea6da1afde0a5571d5034905a9a4d5f4cbfa70cd80e918157ffbb1f98fbcefed28ee6c1ba20dc64e7583ea7ebd82fc1b8f9d3e57dc796da SHA512 7346fb2daa80f58a819462fe96220fa85d242795e24cc2fce5be013f4f0a678e1201b2b56bdcdd2881d95f0fd93386f47e900492862ed8b54e90ced91dd27f33
diff --git a/dev-python/tempora/tempora-3.0.0.ebuild b/dev-python/tempora/tempora-3.0.0.ebuild
index 6a6ecf1dc60d..68cf55980855 100644
--- a/dev-python/tempora/tempora-3.0.0.ebuild
+++ b/dev-python/tempora/tempora-3.0.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest
index 33a53f75074a..012fa5e6361e 100644
--- a/dev-python/terminado/Manifest
+++ b/dev-python/terminado/Manifest
@@ -1,5 +1,5 @@
 DIST terminado-0.8.1.tar.gz 21134 BLAKE2B 504fd13ab5efde77b38fbd79e4bbe4b08fb9bc1cf0f4aa8ca6cd90b4dbd20083088d6cc287f78ca159bf5f72a371c146dc0c648e310a0c892f283f2d9fd23199 SHA512 5cf5259954339d567c41b8ef3b4d77de4f69fe41fd371e63775c9d8d5870ee801795462654f16978f4c86e381fcd26437e307458db9ee4e575d31d5377f2a749
 DIST terminado-0.8.3.tar.gz 21165 BLAKE2B ec031cb7828840a4f299aa25de0030d5b7993119fd41b71e698dd032f4fd31ea725a9b610dc53a71d480ee74b49a1d072d76555b434da4f5fee2479efa03fdec SHA512 441355cdc919b6f04b1bf1eb870f24e0bd6c7ef412e72e1747707049b1fa0d6676644e3646007f2653b3df00e1f30048d9dc40d73f0827b2bbfc0821549e140b
 EBUILD terminado-0.8.1.ebuild 708 BLAKE2B 4f33b4de11fe0adb4bf493b397f3c5d037d50a9eb8239c8f1459832df54c3570ebf977d61775949358ba3442449c125b8c1ba5de9e022309aacd44ce587a81e7 SHA512 9ed263651d5291e4853b1bacebd4f9f7f5c0845ae9eb0d962af3fc9fb6f7cefde838e5bccf3ac507c38c679a2ff64ecd74c2c19a396d1834fbd3b0ea998c6dc0
-EBUILD terminado-0.8.3.ebuild 743 BLAKE2B c657f8b321f29c4b74966bb537c6b3d78e3be2bb1ec3ee9fb03b549211c39957909b22a29f658cfa3a7f449ce6cd0aba3546185c6a1d29156141aa1cb4347a2d SHA512 66e978fb915aba8154b109ad2c7fa147e4dbb8c36c9fd07ff7737fbf732da1f415a8d702cd6f1818be93e175c54a5dd82ded142b15aa2190d7aeb2e27a327229
+EBUILD terminado-0.8.3.ebuild 742 BLAKE2B 170266014647db99e70152f0c88191e6bbee77b6d01f7943b18f670816138a6e1620bd6e8ef4d531a83f0ba48c8ba0c6e45d6ec761a9f95fbb706da4a0aa48d1 SHA512 c2bbfa447ff1b2be0e598aee7a2334c40822e969b2b34c7da869d3866c5e39b49ba0b69f85bacc9ca820d9cf48f1aa8a35cc5970ffb10ac2f3c46be3ba0c5aa3
 MISC metadata.xml 406 BLAKE2B dec60c3428988bbfd3007f2b26d8ecab06a95cbe5c4394e19f063e9dcab48a31d20c6e07d1600ee2249b72fd95d48fc80e9c9c32e44a74f2b2adc9d3fef84742 SHA512 7dc32ac28a0fc70ec0616c821723e1ed3a754da904963eba60e1cd634e955994fbcff05ab7bbc05df2b0beff74aec441349ba0b9566294e9ea387e6928c8d6dc
diff --git a/dev-python/terminado/terminado-0.8.3.ebuild b/dev-python/terminado/terminado-0.8.3.ebuild
index 9b0ff3d216f6..71483920fd98 100644
--- a/dev-python/terminado/terminado-0.8.3.ebuild
+++ b/dev-python/terminado/terminado-0.8.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD-2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/ptyprocess[${PYTHON_USEDEP}]
diff --git a/dev-python/threadpoolctl/Manifest b/dev-python/threadpoolctl/Manifest
index 27e4a715ed87..778ef0ad13b2 100644
--- a/dev-python/threadpoolctl/Manifest
+++ b/dev-python/threadpoolctl/Manifest
@@ -1,3 +1,3 @@
 DIST threadpoolctl-2.0.0.tar.gz 23349 BLAKE2B d7752d862f8de5d61a95dd2e0db9a9cf5b3fde4c13cad9f654c0af4e2277b8bcc36b79028fbdf0e14af35daacee4b01a8778462364e070eaa194af65f4274739 SHA512 8ce823a6aef9f6d6af73e848c7a3bb1c7eee3f94bf480ca056ed5f435655756b9ad26cb71e392689cd8e6a34ee1ddfcf0d8510e424ac9c05bb1eda679d0f7a93
-EBUILD threadpoolctl-2.0.0.ebuild 612 BLAKE2B 48aa6a472fb702e8fd2bde90ed95b20b24ac6062b2b5877bfb708dc54113225e63da192ba9ef6b5a0479e64b5d8be411685730bf0a5306441502ec77f296ca17 SHA512 e365de736f942cc433518e04c79f55491792a7e440ae9ae3500c677a8da2f9bf6a3e0958515f24174e3f497d5810da3b12bfa4d62fa95e89d66c0ea1b8f36049
+EBUILD threadpoolctl-2.0.0.ebuild 619 BLAKE2B 5c9faff51172774d8296258829ae879122a85f01bff37e96bba20657cba754e270ccad837a5d40e7414c1cf31227ec517a8594659b23e8cb66fb6985c4bce388 SHA512 6ac3fc6c4cc6ab9a80380e1cb79a71cfa5618b6bbdfcf0dbd544b0a3b3e4657865d78f42a5f4d18517dd16d470ef49f93b79d8906ad04eaa97eee1b677e710bf
 MISC metadata.xml 338 BLAKE2B e8be381e5e42a081be3637b77a9b5356dd7d74d0352976badfca62bdf7b65c04554552703b3e12e169ec1c4b57d07cedcf75387a0fd65a8177213f0de8bffa9c SHA512 b3e03151085bcaa51e2108d7e69042523148aaba924415421323d53005c1d047103827ed99bf064cda4f02cc313b3ff4e5fc681bccb5f1f23a82b40a744ed9bc
diff --git a/dev-python/threadpoolctl/threadpoolctl-2.0.0.ebuild b/dev-python/threadpoolctl/threadpoolctl-2.0.0.ebuild
index 40adb724f621..832455b87380 100644
--- a/dev-python/threadpoolctl/threadpoolctl-2.0.0.ebuild
+++ b/dev-python/threadpoolctl/threadpoolctl-2.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/joblib/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 830a2cead0a8..208e2f71d2bb 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -7,13 +7,15 @@ DIST tox-3.14.5.tar.gz 290075 BLAKE2B 7e412e85981fe11cba4dc6a4ab3df824678b11fe59
 DIST tox-3.15.0.tar.gz 291890 BLAKE2B 9c42c587332eafcfd02d2d8a42588af6253baf9f62e82eb8a8bf10da291b4868b1fe319e38a583bc67bb26ab868b8a123feccd5bd008ce618ceb46d3121c68d2 SHA512 cb21574301d953b361eb5e1d89eefe22e68ae5871036f03d5753ee97c888cadde548d62a50622dd65b3c488143bbbdf8d309bafa3b6a4807871c9e78b6fcdb9c
 DIST tox-3.15.1.tar.gz 292044 BLAKE2B eb3062fb1a2494a6b23e1c6f2c6af56be5879664ae26918e60839d2f8cff98dc6b684a27469eac81c363a3cd3e90abdafe0ab4dc601840023e5263a42301f384 SHA512 334e2129d5418d4733a25419b81cc57e794a11954c21774231e32c93e977f1a7fb71c739adabccb5cdde9428ab69772e8623a0c0a1172855957f7cbcd4a917b1
 DIST tox-3.15.2.tar.gz 293523 BLAKE2B a1a1c84a987d2b2e5194321405775ee3828b8e2c8dcd38c7e780a9d508b789a42f1880cffcecd68c50dfdc37008a4e9a117660fa2c732864c82af6c2eaf5a99e SHA512 9448554452c79039289d2d2c05c974f451647329701372c3e4b154a0161fa768245c0068cd5e3f1221b4b51a07be806f7c66ab9d4ef83a3e8e5964e18b9cde85
+DIST tox-3.16.0.tar.gz 294040 BLAKE2B 2f5ca2c1b0b839b4fe6834cba69d772b9605e6bb00b24d75867de768042cd091a8fd7f5a349867a5de578b96eaad9f59f2ad019203fc6b2c39c9efc6933d2d96 SHA512 f92accae643b01867749f10d01ba0e18ebb36071af55a21cd38ac8f14fa3db1b1e708b22f8601e4d1b172e59fb62588c1252d064be3fb6007002eeaaef716373
 DIST tox-3.2.1.tar.gz 268827 BLAKE2B 764835d04fb0c17f32eb8e2041b83f90d6a729b781a5b5b95e9ecb1162f1c29ed595d4a6369524b390a31853b8003485b27a3a12d63e84f49e92675f1a9bee13 SHA512 79f5a1c8f6e818fbb8444754e3767d880fc1fdfe63b46c518d37440fe2b2f3ce572865aff83d9492c24486fded49893cc31bd9b11254bac4db507260304bc76f
 EBUILD tox-2.9.1.ebuild 1284 BLAKE2B 601887c581bbd95d0c6377a4383693b4dc9956a8bfc474ce73f77b22ed8f73593a3ec7ef002e1b415798024a6451ce8f85f7c9dc03dc01b3af392babb2ef3524 SHA512 730680951dda514c0b228f7f37b06537ee44893a0fc0dd812954350f4123519514b07a7394b83243c267c1e05c5c0917efe6c8ea1b04c11418a2f997cea38878
 EBUILD tox-3.12.1.ebuild 1470 BLAKE2B 328809a7f1aac4a932586a88ac9082a83f8f5aa66b09714747584ed6d4acb8ab18480d2da58d7b74992633ccda2e223214eb871206d2a1531de97f5165f991ba SHA512 3e3f7bb27056a9e5bbaf3c699b1618bbde793518aed71acdc639e4f7692417b23e669c79f9737eff6e21ae255551f6cc296519cf85c28126e897a8dfb414f6f4
 EBUILD tox-3.14.4.ebuild 2249 BLAKE2B 4a8e695a7625cfebed1fc86451ceec4459673d31385a3bc295bd311e5c9c045b86b4b5b6577bf6ba6fb4b2f142812dcbf8003a53668a1035c964d2c2c68f16f0 SHA512 10d73cfdf517bc0726ee19609134914bf8bdf3b79dfae810e7eb9ac3c7e9713b8a2da28e7927cbbba8da571fe56a9d8c4b7767ad4b22d88d97f92770167ec10b
 EBUILD tox-3.14.5.ebuild 2289 BLAKE2B 987bd969cf8477bfa0436717e70915918f1d97a2149ff1cc9f76df58d8f105ea959f8f50f2a684c09ea1613281e294694aa7f53c2992124c89e12f78261f02c5 SHA512 5e7a92de1f17558593d06f417b4d8655c20308f8d0af92ceeaf6570228835d53d3592c9183f9a6fc1f390dd3f6e2f3f63cd03b4e52677101a8166ca5efc7165a
-EBUILD tox-3.15.0.ebuild 2278 BLAKE2B 116d451fa83b57e7a0511cfc5648001316cefa089d763d28e0afbcc60a96feb1a6d415591571143dd9091a2c9a8056de16018782e1c8ec5d2301474d68b785fe SHA512 935cdd5ef0ec629bb9ce0b415aaba64420cddea749c841064e9004d9872a4c8869965079831d1da7f85e981b27a2b7a5c559a40d507e4eb07f1fb689da1377e6
+EBUILD tox-3.15.0.ebuild 2277 BLAKE2B 4dde45fa512c6b125f506b2ac4e2fff538e49f0c8b9b26106edfaac9bde6b0fc6025989a56dfa3e55660d0373f5cbaf65811474ad39957711fcea028881e29b0 SHA512 c9d973a77a9ad1f8b7c37af20184971bd41ce0233352dced8625f01b911c84c46d1e388cacdfdc19a7775b2ad27273e966e32515e9d671f2a7ec258eb025948d
 EBUILD tox-3.15.1.ebuild 2238 BLAKE2B 1e4399495275286778ef1b8de164a6515fb7796f30964f25fcd63072d8d263931774aa0f660da6cf7ec527da64d1172d9936d1d5f355ef75e2453cc89c668f52 SHA512 bff5d72963d921f7f06ca016d2c1f53a45c73bec78c7b0d00d59541c4a8a13db1721c1ad80b58a33b53f65ff3d7fbcc14ccb6af08dd086da843cfe22603e4c62
 EBUILD tox-3.15.2.ebuild 2238 BLAKE2B 1e4399495275286778ef1b8de164a6515fb7796f30964f25fcd63072d8d263931774aa0f660da6cf7ec527da64d1172d9936d1d5f355ef75e2453cc89c668f52 SHA512 bff5d72963d921f7f06ca016d2c1f53a45c73bec78c7b0d00d59541c4a8a13db1721c1ad80b58a33b53f65ff3d7fbcc14ccb6af08dd086da843cfe22603e4c62
+EBUILD tox-3.16.0.ebuild 2238 BLAKE2B 1e4399495275286778ef1b8de164a6515fb7796f30964f25fcd63072d8d263931774aa0f660da6cf7ec527da64d1172d9936d1d5f355ef75e2453cc89c668f52 SHA512 bff5d72963d921f7f06ca016d2c1f53a45c73bec78c7b0d00d59541c4a8a13db1721c1ad80b58a33b53f65ff3d7fbcc14ccb6af08dd086da843cfe22603e4c62
 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.15.0.ebuild b/dev-python/tox/tox-3.15.0.ebuild
index fee50bc8c521..dd501faa9ef5 100644
--- a/dev-python/tox/tox-3.15.0.ebuild
+++ b/dev-python/tox/tox-3.15.0.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="~alpha ~amd64 arm arm64 ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 
 # doc disabled because of missing deps in tree
 IUSE="test"
diff --git a/dev-python/tox/tox-3.16.0.ebuild b/dev-python/tox/tox-3.16.0.ebuild
new file mode 100644
index 000000000000..0365e6a79004
--- /dev/null
+++ b/dev-python/tox/tox-3.16.0.ebuild
@@ -0,0 +1,71 @@
+# 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="virtualenv-based automation of test activities"
+HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
+SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# doc disabled because of missing deps in tree
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
+	' python3_{5,6,7} pypy3)
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
+# TODO: figure out how to make tests work without the package being
+# installed first.
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
+		dev-python/pathlib2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
+	)"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# broken without internet
+	sed -i -e 's:test_provision_non_canonical_dep:_&:' \
+		tests/unit/session/test_provision.py || die
+	sed -i -e 's:test_provision_interrupt_child:_&:' \
+		tests/integration/test_provision_int.py || die
+	# broken with our mock version (?)
+	sed -i -e 's:test_create_KeyboardInterrupt:_&:' \
+		tests/unit/test_venv.py || die
+	# broken with Gentoo Python layout
+	sed -i -e 's:test_tox_get_python_executable:_&:' \
+		-e 's:test_find_alias_on_path:_&:' \
+		tests/unit/interpreters/test_interpreters.py || die
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index 48148ccbf0e1..d319a56250d1 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -5,11 +5,13 @@ DIST tqdm-4.40.0.tar.gz 129225 BLAKE2B 85030c11bdba6c1d6da461e3c648bae6ae173577f
 DIST tqdm-4.45.0.tar.gz 140990 BLAKE2B 8699b3a820859406e9bbafaaa48ba1b418e3083898d2b6c3401078996dd03431db259d5ad8a377226a50b80513ef0fc55bdaf2b67fc4a2bdd490bc5fdc04d681 SHA512 7b35f86205c6581ede9bdb0788e7f55be525c3f0f77952803046661c6a7a6cd3c15ed0323376ecedb5cddace1b32a41fee1932033dcaa49f9096dc3b9b674f10
 DIST tqdm-4.46.0.tar.gz 144312 BLAKE2B 93b902d9a362e658f244f3c1b15a3496425cb3e401adf291dc0a9c7c0bd551baa1171a753be8d1c3b877d2cd3ab25e81dddbd8492668d0b0f6ca3cb47d13be1c SHA512 ccdfce4d273e78ced172fc3edb24ac038465169f7b765e7bf779831ef3d0dc72c648c5fb165aba02e0c6dc86c5d0ea3d93d5530b642ddd84e3d284c7354739cf
 DIST tqdm-4.46.1.tar.gz 144383 BLAKE2B 4d72bfbf0c225c779ae2c9bf405f9effdb69cfe7862325b12e8408c17a03b7a87f9cf0d055de598a67132861114c89b237d0ad2509302e452cc67ce9aa34fa48 SHA512 de8710ceb44b6caa073aaa3c9dca281880d752d1b542a3dd87a54884478a185c35ab1969c6cb7242e30ee0511f967cde7bd4fa83a8d4f8c58d3e95ad2bf3bfc6
+DIST tqdm-4.47.0.tar.gz 145749 BLAKE2B 77a5efec763a8e58e071ee571077ee0db72d9243308592519ecd2c38f60d6b621fd7362dd87bdd0759a39f25c19cc3cc889e9a8376dc658ed565ca7e19fc68cd SHA512 4023988cef757f43a6f59f7eddc8f40246cbca4994cea91dbb4a788385c0706f376f4c0fd5c8c47146c10eb8c52be2c9d4855b7bea0a5036162c55447aac95d7
 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 1350 BLAKE2B 27dc08ff9bdfdb52222d625e442202eed0f2673a3e4c7e2640f6ab113fb5da118616bb08b69f5050eca5c17dcd6bfd1389c4dd17b7c8b20fd137e69c22b6e5c4 SHA512 b81e0ea43e76d9d3ae9440328d69c6998a3f76f788ac68be9d4ca81051ae9b15d0ba6b3cd4af4c02144ed781e52cb28de009bf03445f6a9810039380c480dc1b
 EBUILD tqdm-4.45.0.ebuild 1357 BLAKE2B 61a3712f9a48e6fdf639f3a93e98f45d8252fddf368a10047e29c88a8041db391d6a196642b82bb5afc8bea5329e0f178dbec286b0a7b3fce9fc075ff687e9f1 SHA512 6cc9c993115b72a3e91bc0cf135d67e166de30f538a503e2901b01648805012056d4326444ff56f4fc6469b61aa1fb9a3eaa856a64c268649235945e3efc8e9f
 EBUILD tqdm-4.46.0.ebuild 1382 BLAKE2B 4c22605d67ffa9f686148c836e55d696adf92a9c8ef16e5c6aeee371b5f232996673a33f179638b429e1ebb2d6870cdc6b4332ac5ae2eb4e3b5b522c062d9d7c SHA512 312a694be69f171f8b07be4c718bdd1955c95366b3adbdc16de2694353b1d2e92b68e948add38bba57092a8bada6d25bebb90b7ad289974d86278da1d727fba0
-EBUILD tqdm-4.46.1.ebuild 1333 BLAKE2B 73d52d1f1d6361229e073efef1f1b32f42c86bfb157d32390e4b771ccd7249c02f45080334b0e31791553192eef4808801bdd0300865bba4594a2fcad52b6ef5 SHA512 198935fef5bb0ae4d30611fa98554e80c4e9b397b688e4c283e3a1d0e181fb5e0e96e89c88f48010b2334ec98fa8a140d056a76e1d3746e90ef77e4f47184806
+EBUILD tqdm-4.46.1.ebuild 1338 BLAKE2B 0cd1d07f26f209430d54ca22e7f46f7184ee2acaddea6ad537076e5254c245a36bb3463b19d2d0d8bae75b1cad9fa5e7038cf4d1059b58ad57500f61fc1c48fa SHA512 c60c54ab192bcf45d49e561c01885591432ed6d385e8ae3092039102b6771bff1a86169953a38db5cb25c1d640df51d4871de8429fdafc56c10e2ec3c17f4bed
+EBUILD tqdm-4.47.0.ebuild 1338 BLAKE2B 0cd1d07f26f209430d54ca22e7f46f7184ee2acaddea6ad537076e5254c245a36bb3463b19d2d0d8bae75b1cad9fa5e7038cf4d1059b58ad57500f61fc1c48fa SHA512 c60c54ab192bcf45d49e561c01885591432ed6d385e8ae3092039102b6771bff1a86169953a38db5cb25c1d640df51d4871de8429fdafc56c10e2ec3c17f4bed
 EBUILD tqdm-9999.ebuild 1332 BLAKE2B c372057e509aec0113bf1fb8c8fefc3280f569e543c4f4d524bfdd1d6e52e78d5127edd3ba41d4e773e864f81da752d36d231a9ba909581c8f03f49128d882ec SHA512 560ccebe59bc49c9fcc04d9982e245a70d8d90cd3a571201f9a91c2a3fc91e2a096aaa55947646fc62e0fd2796df187de58647a39d0a9baa780a41fb69860836
 MISC metadata.xml 803 BLAKE2B 459df7dc960e21c114e5e688d60ade18cf4e2280fe7a55794d7097e8371c6daf3cc0bfad74ddf418684e2941ca97bdfde695e1398fddedbea10c65d962a1fec2 SHA512 673f0bc8c48f3d0c24d79304e6ac32e8da06d3004fdb7bb57f0b2db93ec555f9237812a894290b0999152e7fd5e1baadb43f45e0835bb6da7b2ca98f2e3aa85e
diff --git a/dev-python/tqdm/tqdm-4.46.1.ebuild b/dev-python/tqdm/tqdm-4.46.1.ebuild
index 75999c0d5faf..563276f5d141 100644
--- a/dev-python/tqdm/tqdm-4.46.1.ebuild
+++ b/dev-python/tqdm/tqdm-4.46.1.ebuild
@@ -13,7 +13,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="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Add a progress meter to your loops in a second"
diff --git a/dev-python/tqdm/tqdm-4.47.0.ebuild b/dev-python/tqdm/tqdm-4.47.0.ebuild
new file mode 100644
index 000000000000..563276f5d141
--- /dev/null
+++ b/dev-python/tqdm/tqdm-4.47.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8,9}} )
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Add a progress meter to your loops in a second"
+HOMEPAGE="https://github.com/tqdm/tqdm"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples"
+
+distutils_enable_tests nose
+
+python_prepare_all() {
+	sed -r \
+		-e "s:'nose'(,[[:space:]]*|)::" \
+		-e "s:'flake8'(,[[:space:]]*|)::" \
+		-e "s:'coverage'(,[[:space:]]*|)::" \
+		-i setup.py
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# tests_main.py requires the package to be installed
+	distutils_install_for_testing
+	# Skip unpredictable performance tests
+	nosetests tqdm -v --ignore 'tests_perf.py' \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	doman "${BUILD_DIR}"/lib/tqdm/tqdm.1
+	rm "${BUILD_DIR}"/lib/tqdm/tqdm.1 || die
+	distutils-r1_python_install --skip-build
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/traceback2/Manifest b/dev-python/traceback2/Manifest
index b6f1efdfed15..ee8ef50f7be8 100644
--- a/dev-python/traceback2/Manifest
+++ b/dev-python/traceback2/Manifest
@@ -1,3 +1,3 @@
 DIST traceback2-1.4.0.tar.gz 15872 BLAKE2B cd2e1fe91e1e71a6dd764675e083857f359cfa5aaa3d2fee7f1709e24c545bb9e337f0af1d87f9e286fa2c36dfa12dca84589a936dc9f9805a1c4891739f337b SHA512 84c7fc291c8f2d4cee10441cdef1820aa453e631dfa91ed58e40fc205e97a9dd2101388d5689e4fdf10edfbf06bdb5b895d1635ae7218ba0c9b697d3f95f9342
-EBUILD traceback2-1.4.0.ebuild 915 BLAKE2B a83214fc7ea11c803a2698907f91fcf98fb39e30022793b3fc785cb39cff0b358ae23c30742604130caafe9b7f851a6ecdf2f82a19e80571eb0a2b40e0b28a24 SHA512 3bf65eed2965984307c713042fc871b6e8bc3e5f42faf6727372fb1a78c1937ec6c7422007770cbabbda71123cf3cfa62622bb625ea8e5feed11dcd46b524913
+EBUILD traceback2-1.4.0.ebuild 961 BLAKE2B f9f1df56c3c09be7f4e6aeb73babe936c62a0814ba97b93292f803a13cb735e6f21f8d66b6351d7fa0e29bd712b7b547dcbf80f9f715efd36163ace86f1cea2f SHA512 9f4248c5055a83b9ccd82c71d2b3a90e51a9b74e0654604eda3fb444010c69c7bb43ecc74004c17eb8950a66d445b9651e342dba86310e69c93308f096cc227f
 MISC metadata.xml 377 BLAKE2B d9559b04f5b5494558e9441673f5f903a07e14d4f333a48c6b0091d1e254ac555f26d9fa4f48a794f197026f8683d80c7bd80020233839840cbf277bd72e3c9f SHA512 5323b19aa003404610d2ddfff36c8e7117412afa058486b02dc949e6b39a8a52dcad78aaec92ba62fed72f0dfe5ef501905ade41a3c018dfeffcdbc8ab9b6378
diff --git a/dev-python/traceback2/traceback2-1.4.0.ebuild b/dev-python/traceback2/traceback2-1.4.0.ebuild
index e0ffb58165cc..110badcd4a48 100644
--- a/dev-python/traceback2/traceback2-1.4.0.ebuild
+++ b/dev-python/traceback2/traceback2-1.4.0.ebuild
@@ -19,7 +19,10 @@ RDEPEND="
 	dev-python/linecache2[${PYTHON_USEDEP}]"
 BDEPEND="
 	dev-python/pbr[${PYTHON_USEDEP}]
-	test? ( dev-python/unittest2[${PYTHON_USEDEP}] )"
+	test? (
+		dev-python/contextlib2[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index 2b53c12909f8..9a188a74f880 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -2,6 +2,8 @@ AUX twine-1.15.0-tests.patch 731 BLAKE2B 8720a98cbcc69f20096aa0e7e19be78c6ebb842
 AUX twine-3.0.0-tests.patch 595 BLAKE2B 839f6a17293c23e3cc01bb2497b9e8402bafc725db39dc5dd555b4f87b468110e72b6f899835cf1dc3a129762bf9d162cff98e7453814cf917562c401315df3e SHA512 a3ed4afa3c4b4137e953adba6fd8994f95fdd7b5dac67a57b8f75247a78c09f59699e37e43fe3d38e9440d3ba41dd0713f6bed539538e521cce5501a80ee6d81
 DIST twine-1.15.0.tar.gz 135851 BLAKE2B 5e85c30e23615e9fa7e40ed767412560b29c42ec777afbb17850781a384bc2d3787534a8114a65ac2374ab80441eb2d3b6d75dcff400e7b47a42453a9210130d SHA512 e0eae05c108e1e766a0a8ec684e3423b0537c8aa671675f30403171fd4f48ec65666d407df53f6dd9eefa0b98e5fd2fdf7dbf1f0f9150686c499de131f6f2435
 DIST twine-3.1.1.tar.gz 138692 BLAKE2B d96e207b5ef1314f547f5e8fbf36565d5cf29f0dd19438d41fcbb154a98b854c669740b533a28cd79501933f0cef57767e63a83f135fcdbc196df8865cfc4d8a SHA512 446b36a1816db6131e279bda26e62c58f9659d86178d498ebb9f7c5287b61cf969e625debe4b4cb1e32832e0eecbcedcf4913319ae0bf7eb287f56e550d33ed9
+DIST twine-3.2.0.tar.gz 145280 BLAKE2B b25fa984486a375e09705703a47994b529f6e5b48c6733c0a07b57bec6c0dfcdf4096d6ac6b0f9b7a7bfebfb32ea1cfb49c5de79f29495eb2a8fc59a5f8de4e5 SHA512 9959430913ea570d22f2d8b94e929af36b409b71691b3f66de8ddb77cfbfbe36590e21a6062db2a4a4f56ce2eb96984b0a474a93ea96b7734f53ada7a6411c28
 EBUILD twine-1.15.0.ebuild 1316 BLAKE2B f3caf2ad608b788cbf8c221a52e192d4df24441a9cc6bde46131a44a117bc0e2300e507769a79945ab5afdff9d3ed3bd3fe8afa9611fab50561b9efe2c3a72db SHA512 4f55f1e3e359064f151a5975d5d28f45eac932a87a79ef7cfc9aa6aeceb5b94ce47b7da177fd8b3f78fded784b64501061308bf02fdac3a71acd495982640f80
 EBUILD twine-3.1.1.ebuild 1823 BLAKE2B e46de58b7fed306291dc6c7b534bb541911cd13ed5df63ac140673a68077240f4051569853355ef8d850262c0a228400b24962ec9ff268eac99b2a3d9d290fad SHA512 a4c0ea189edf18dfd23b4d45c6f354bfb1cd458613fe18f76bd94fe7160e38df2fa37932ddd1c3101948c0d08ace0369b7372b35610ef8cf67c58d9775def9e9
+EBUILD twine-3.2.0.ebuild 2000 BLAKE2B fdb7b5d3d8e7f454658ebdba4b7047c496931936e97f71b13e9f4e0d9d7af21ab3b925a61ab38e0271dbb798835fda14218b80dbe76958cc19ff5a3020832b05 SHA512 81c68f707a4a9e5a3d36d25a05bea66ba85d2adbb2200569779e4deba6fa052b3ef68f558aec33e5b42563080f94f5b56e546c547fa99400f095e1a35ccdb5b4
 MISC metadata.xml 358 BLAKE2B d4ec540be4b2496c1067200781bb8be0cc085bb4d85f922bd1bc66cd24e4514ba2ba7e8653e3c9dabe7295e24241e4de6c22701eb40328393ada4bcbfa7d77b7 SHA512 525abc4d0649347e2a0c121172aa16b94560d549a37d81712513e39e67046748d460bf07109baa373bc261938f79456ae81f361fa0d41915edb32382bc61de17
diff --git a/dev-python/twine/twine-3.2.0.ebuild b/dev-python/twine/twine-3.2.0.ebuild
new file mode 100644
index 000000000000..c41930434c29
--- /dev/null
+++ b/dev-python/twine/twine-3.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=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of utilities for publishing packages on PyPI"
+HOMEPAGE="https://twine.readthedocs.io/ https://github.com/pypa/twine https://pypi.org/project/twine/"
+SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/jaraco-envs[${PYTHON_USEDEP}]
+		dev-python/jaraco-functools[${PYTHON_USEDEP}]
+		dev-python/munch[${PYTHON_USEDEP}]
+		dev-python/portend[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pypiserver[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/tqdm-4.14[${PYTHON_USEDEP}]
+	>=dev-python/pkginfo-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/readme_renderer-21.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.8.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_{6,7} pypy{,3})
+	>=dev-python/keyring-15.1[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# avoid a setuptools_scm dependency
+	sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die
+	sed -r -i "s:setuptools(_|-)scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+|)[[:space:]]*::" \
+		setup.cfg || die
+
+	# requires internet
+	sed -e 's:test_check_status_code_for_wrong_repo_url:_&:' \
+		-i tests/test_upload.py || die
+	rm -f tests/test_integration.py || die
+
+	sed -i -e '/--cov/d' pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 73e2ee113ce5..0ba08f3b2e24 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -14,5 +14,5 @@ EBUILD virtualenv-16.7.10.ebuild 1764 BLAKE2B d3006a8462b7ecfd27c0ba82f239e95e39
 EBUILD virtualenv-16.7.9-r1.ebuild 1828 BLAKE2B a6092602da117163b2b6b7882a7e2fff1acd9334c5150b8d9f7ea37b5855dda60924d374e3b3ecc4f2426f3a0d426ec7dbb17a9c577f4285f499123ccfd39b62 SHA512 0c714cb640d21eabb8eafd0c641989b9d896748889f987b381ec137d15da79dc1caa757ef94ef1ecbdef790d9018fc8197b4337223b85eca4821770eaaf2b35f
 EBUILD virtualenv-20.0.18.ebuild 2272 BLAKE2B 0ae1219c1cb9d17e39912cd4963a3c2ee8898e71a61e894ab453e85c50926a2721be52a26652028a30decace9d4ad0eb0f30ba3d569e19d132e0472728f16cae SHA512 989f04d992e7699038ded65a15f5904fd077b6037b49711f0df91fb8b760207b2abb967fda53d2aa684371bb9dd38f30f2189be2d4d8e7de78c7098dfdde9768
 EBUILD virtualenv-20.0.21.ebuild 2597 BLAKE2B 0f6868368b0babd66fdcc7411f50bb9b3899bb75babca111e7f61610d3af7f1b84975a98f8b99ab36c1c42713931384dc3de0a7fa1b8218f91b3b201dcf12028 SHA512 b31cab9e92aa539977242293fa58392c5ef7826b85371f0357264b6e5601b8afbc9152ba365a99aee05de0728e4bdd1057d88191f06eb174b4e94394095d78d3
-EBUILD virtualenv-20.0.23.ebuild 2553 BLAKE2B 21b38ed667cb8ddd602e1e046bd793cafa8362bcfd17898762f7bcdf01bdbc8d37cf63c42e5c62b83388137caf13bcf3fbdf41dfea95e1d6ed72a36fcf9b7026 SHA512 4a0f8f025952fc93f8650539da26c2daa7e3c1e6b15069398fccc1258f401055f1de1cb7fbc778e8e686cb1570513cfc2d37952ff9b6d98a96fdeb6805a1902d
+EBUILD virtualenv-20.0.23.ebuild 2582 BLAKE2B 5c6421e1682a7878d89e40754b1a9445de3f5da7503ddbaa2b728499c0c1bbead6e3f6c1239950778a4c0c181326193e7d7dfc79aef5f0142ce24a7e4bf4828e SHA512 52bcf6f1ed5bc14634d31c250948efa486bfa9c25bf69f958fe3286ed43ad1f9e5ace94288907465e2b4d8d9da8f82669cdec7f2ef57056a3997f7bcb41c389d
 MISC metadata.xml 380 BLAKE2B 9a15805179f82d4e5c60aeb56191e690f9fe9260e34d9b4e0b893a51522fdc61246f02b20c1b55084709e06d6ce53b2e6436947aa178e2d413a923102d7ee125 SHA512 b6385fef70c6988548a00e6987bf5004979d139ad6c501d3f7b739bacef06eafa39a40bee8cc2d1164e01bb425f131aeea13f4b58ed6e75d66773a4f1c1df824
diff --git a/dev-python/virtualenv/virtualenv-20.0.23.ebuild b/dev-python/virtualenv/virtualenv-20.0.23.ebuild
index a7fac541d104..6c1825d6e7d5 100644
--- a/dev-python/virtualenv/virtualenv-20.0.23.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.0.23.ebuild
@@ -40,23 +40,24 @@ RDEPEND="
 	' -2 python3_6 pypy3)"
 # coverage is used somehow magically in virtualenv, maybe it actually
 # tests something useful
-BDEPEND="${RDEPEND}
+BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
+		${RDEPEND}
 		$(python_gen_cond_dep '
+			dev-python/coverage[${PYTHON_USEDEP}]
+			>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
+			>=dev-python/pytest-5[${PYTHON_USEDEP}]
+			>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
 			>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-		' -3)
+		' 'python3*')
 	)"
 
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme \
 	dev-python/towncrier
-distutils_enable_tests pytest
 
 src_prepare() {
 	# we don't have xonsh
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index d103c540dc40..1ec0dd88031b 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,7 +1,9 @@
 DIST watchdog-0.10.2.tar.gz 88902 BLAKE2B f6fc6b9dd867a69139289fe6189f90fbc35897a63db1685da85960358141e5eed8391c1aba0cbb899b197056ae80141795090de7f73d821a1819b5c63361cc65 SHA512 3563a9686ce304350f33bbf4b16933cd0db5d6ab17676dfcc779b86cf9ddd06c42462ec40ad5c046cf4aa4b603aa477865de45daef05f9c6af3a441bcab16dbb
+DIST watchdog-0.10.3.tar.gz 89215 BLAKE2B bbe8a2ab3f84b7eff60d4ebd38ac928db85998910fc5b107dcd645c9b91388a9e45d317777f08288ce3bc2befcf9310bb7c8aef4f8e3309481919dc87e84b2a1 SHA512 6061b1393cd07038ee22271101bd6d5c847ee9732b14f63bbb5d94fba9f8273ca728cdc58b6f53a95d8213d0ed35bc71e8bb9c54960bf3aea2f64da066a864f5
 DIST watchdog-0.8.3.tar.gz 83154 BLAKE2B d5d0635e83bbcd31544d5ea5811c2f202b0da76bd7a4086e8fc61e3293640e701b04599f95decaa82bee3705dbd6b91ad24b9dbd20edcfc329913600c8a3c932 SHA512 61f1db886e8e9a6d78b569329f4d5944c296778a5a34f94fbf115a748fb4c3be422bf4d3cc828e22fcdcd380fdf9009f5bd91a8a5edc87089afc58297a0b946f
 DIST watchdog-0.9.0.tar.gz 90597 BLAKE2B 4b83061f49204f13ccdb129c31bd53af256e5541d7a3f6452e59682ab64f37dc2a38e9a82ddcc2cec0ed5c52baed27d62b2fab7eebe2433d924209860b5d4a00 SHA512 97fca2642209150a611d931d6f2049a9941a3494a6c566bc18eaa45a8fc2fbd02c712b37a85cc1375eeb65715706ba6b8ecf781b99951721988c318f81eff7c6
 EBUILD watchdog-0.10.2.ebuild 887 BLAKE2B 4ff6f7b6e02352f34a22fe8259c6636a971bc07fa2cfdd5cea20332c71d4518bb2c013d01fee26bff3abb84cb6f4f5830ddc1511f111f6b9c664732c4c8f23d1 SHA512 dbb0853f88e75a34d59f0c56daa633371e9160a48c727b021f1e01a29818cfadf4f076a9e2dff2f3cf111e47ef250dedd20e95358c026c2f445eb59ffcec4795
+EBUILD watchdog-0.10.3.ebuild 887 BLAKE2B 4ff6f7b6e02352f34a22fe8259c6636a971bc07fa2cfdd5cea20332c71d4518bb2c013d01fee26bff3abb84cb6f4f5830ddc1511f111f6b9c664732c4c8f23d1 SHA512 dbb0853f88e75a34d59f0c56daa633371e9160a48c727b021f1e01a29818cfadf4f076a9e2dff2f3cf111e47ef250dedd20e95358c026c2f445eb59ffcec4795
 EBUILD watchdog-0.8.3-r2.ebuild 861 BLAKE2B 070bafe08d44109c44a77efdd0efb94020c183c6ed6dc7fbf3f737b80b4a81f23555925ec800891b9ab5ec59fa0ad15fedc4e25198ea8aaf8eef39be6d28c039 SHA512 7150865640631d784f9edfb2d2034d9c6bfe7bffd784cbe14eadc6a5b4dd1e5271da820e94a2b280753d3d4c47b2ec317e355b546e18226496b8377f2405bc38
 EBUILD watchdog-0.9.0-r1.ebuild 845 BLAKE2B 99fc184e8f2282d5e7b4291f7215bb6fc50accd843aa3b1b48150598bbf628ec9d37ab74521247de0d49f3fbb321f5cd518ecb6a04a0b5bfb5b6fb47c3f8bf9c SHA512 a2efaa1b2f6d6a8d21230a64deb919a52eb5289d56f94681bf3a10ca863451e9988f530bb64b20780d12fcc0b7c56c3e031b70001a6707b523ecea7c751f5562
 MISC metadata.xml 384 BLAKE2B 4aa02b5d26bb82f0f0ef9d7369f984114d6b0de77f662ec150e6433324f4500b5b5004b626e7ce3558dc1190a31cbe788793ddbeab4a10f13d2b9be5de36e77e SHA512 0883ee5d6169f36b061be829e7b2e4a69f7efada9f7a2b446a9baad15c8e119d24a7bb3d80bf253a760332bfb8a03ef06b3bc91cb97b7a86d0773252fbc3db90
diff --git a/dev-python/watchdog/watchdog-0.10.3.ebuild b/dev-python/watchdog/watchdog-0.10.3.ebuild
new file mode 100644
index 000000000000..6420d472f83a
--- /dev/null
+++ b/dev-python/watchdog/watchdog-0.10.3.ebuild
@@ -0,0 +1,35 @@
+# 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..9} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python API and shell utilities to monitor file system events"
+HOMEPAGE="https://github.com/gorakhargosh/watchdog"
+SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	dev-python/argh[${PYTHON_USEDEP}]
+	dev-python/pathtools[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	test? ( >=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/--cov/d' setup.cfg || die
+	default
+}
+
+pkg_postinst() {
+	optfeature "Bash completion" dev-python/argcomplete
+}
diff --git a/dev-python/wcwidth/Manifest b/dev-python/wcwidth/Manifest
index 68f6c7606699..d9bb26e7862b 100644
--- a/dev-python/wcwidth/Manifest
+++ b/dev-python/wcwidth/Manifest
@@ -2,8 +2,10 @@ DIST wcwidth-0.1.8.tar.gz 19957 BLAKE2B dd4ba31bec5161a9509b0ef7e73901c3ff31b2ce
 DIST wcwidth-0.1.9.tar.gz 24764 BLAKE2B c7a5a50a8628649810dddd37b1af4c7ea52b2d0d2e516bd24e04675849e6f402e6ef4b7cea0fb507c5446b455d8725f497771bb30cd4d7eafa90cbb6fc2d01b4 SHA512 3aee69efb8714f4426bfd424b80f4f4e5758174d84f725dd0e1448de1b4b4dd385ffd4f72440d5f763b7a82325857e9164742dbb7fa9e15d5db54744c262d0ba
 DIST wcwidth-0.2.2.gh.tar.gz 46929 BLAKE2B 8dac0a793417b04aaccd2235bdd3dee30e18b068a41e515934d2e7b6efb354039adba767db011a2782c9e1f5b8d2568f4ef73ae09361bf8f608491d252bccc21 SHA512 e644a8f83ac5974174e7dae35784c4f9310e39fcfd49d98d6da0f59efd19a0734d5c65e252689843346eb6adad62edfef76658648b34779191fbcf0655188d52
 DIST wcwidth-0.2.4.gh.tar.gz 47355 BLAKE2B 152befc1f9e8630f407a78c70c9121dcbf27a9bc165ef82ec80a6e0793eda5fa89829542dc14959eedf9cc7676edb0212b29bac95c8f041b9f007d03d2a05852 SHA512 69123170421f7f37a9d09e44860cace29b303701b7be8941d7af403b0f4044b273c136da5726689f13c061587fda24f944ef1da918712bed0eda8c00c7a208c0
+DIST wcwidth-0.2.5.gh.tar.gz 47514 BLAKE2B 0ac5fb08283c23039453408da2edac36e2079fde8fc903002785e2e0f8bed55d1d6a291181097f73e4ec8152b6eaa4f4553b0b39fe1cadc7a99bacb2d7e55d2c SHA512 3f1f1fefd3ee9f06ea2051842e8c3bb09a92501f031124b8514bec444eaa8594ab9649534b4264340d475716d5a6571dbe5ae932f685160defd75c19295e60f9
 EBUILD wcwidth-0.1.8.ebuild 551 BLAKE2B 1d03df81db5ec03f284bb30d9e26722bdcbcc691c9d8af0ea705bc709dc11e7b17b8e72ae08669d0cf3537a9027feb656b62d297046caad28e3fa7a9f8956dbf SHA512 d1e11dfc2d0556a6823fb23c81e284b0bd1171a6ecb6b4d251965c507373c1df3974e79576652eda7b9dff5e108184aad64ebbae89c224cd4806fd623b319487
 EBUILD wcwidth-0.1.9.ebuild 553 BLAKE2B 82ebb496ee479b35aaf0eee2c4fd155e3fa1c18f9d78de3f92cb05fb423a546558af0b91d5a94a67cb53455feee8cd52ca4c1edb8243a89926f8bf50eca1f9a0 SHA512 7f4d8348570e79a419c4a5c00e0aac3ac192589c7df7f8f5249f05fe4c8f8efa8b65894bac31faebef2945e48e8e7db2a39a0a95a1f11bde234343a4cbe6e116
 EBUILD wcwidth-0.2.2-r1.ebuild 920 BLAKE2B db6d3bf6acc5fb9c02b01816656ce095a10d0e77f15cbd6dba46d1c6265c5a6ba19d878439499d3ebb66a6451ddc4206694ea4d2ec5223a5f1b419eaa4c18a2f SHA512 f13a5e8a7e1b4f2da68bbb7eb5d55f58b1ebb73eca618b7926e324c712048df27414209c69673387b18e7fae58f90e847213305b20f71bb5d182257f2f394aa9
 EBUILD wcwidth-0.2.4.ebuild 926 BLAKE2B 65e5b8e219a822bbd731421d89c439948524be31be39ab3b614fb255419a6bf5aaaabc9c50f39f4eee2f37f09849227866552a96022ae7100fd9377aa2fa426b SHA512 ace40abcb90d04554135d508a69057ed6b6bbeac76737c4f6b92be6512d6439a63943d8cc48f0576ece6a26e0020d92d1431513e3e004a8afdf2dbdcf22f3846
+EBUILD wcwidth-0.2.5.ebuild 926 BLAKE2B 65e5b8e219a822bbd731421d89c439948524be31be39ab3b614fb255419a6bf5aaaabc9c50f39f4eee2f37f09849227866552a96022ae7100fd9377aa2fa426b SHA512 ace40abcb90d04554135d508a69057ed6b6bbeac76737c4f6b92be6512d6439a63943d8cc48f0576ece6a26e0020d92d1431513e3e004a8afdf2dbdcf22f3846
 MISC metadata.xml 401 BLAKE2B 539430ada34933bd8bebc7146f9fc472a9a6e076cce36d6e34026d54464da99cc520e3a473f246c807531fa7edbefec87cde6cb948c8d295f77aae122466a608 SHA512 d416016c92307a1ae828e8135fac401dca0c005d4d0739874f6cb90ef9c36b9f41674896f30298826b200aaffad674c985ab7d06f76ac8897e9dfe1652aba426
diff --git a/dev-python/wcwidth/wcwidth-0.2.5.ebuild b/dev-python/wcwidth/wcwidth-0.2.5.ebuild
new file mode 100644
index 000000000000..00627f52df55
--- /dev/null
+++ b/dev-python/wcwidth/wcwidth-0.2.5.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..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Measures number of Terminal column cells of wide-character codes"
+HOMEPAGE="https://pypi.org/project/wcwidth/ https://github.com/jquast/wcwidth"
+SRC_URI="
+	https://github.com/jquast/wcwidth/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]
+	' -2)"
+
+distutils_enable_tests pytest
+
+DOCS=()
+
+src_prepare() {
+	sed -e 's:--cov-append::' \
+		-e 's:--cov-report=html::' \
+		-e 's:--cov=wcwidth::' \
+		-i tox.ini || die
+	sed -i -e 's:test_package_version:_&:' tests/test_core.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/wtforms/Manifest b/dev-python/wtforms/Manifest
index bd2d21bef15b..5c3c32db2de8 100644
--- a/dev-python/wtforms/Manifest
+++ b/dev-python/wtforms/Manifest
@@ -1,3 +1,5 @@
 DIST WTForms-2.2.1.tar.gz 156904 BLAKE2B bec7c526f72b264888f7be45ba15d2bc4d194b09adc8ca5806cfc04cd1671663c851b7f1c99c602bb3e13d14a38733be61613058e46481bcea59901ac1f5b6b2 SHA512 06478790a8a4bf728e5436edaa63c7c0e596f71d63b273e1f296f9255d9fa3e31a7bfa95971c214a8cea684034ac3c77b05371f4b4e14da9d9ef2c5afadabde0
-EBUILD wtforms-2.2.1.ebuild 1337 BLAKE2B 478161ea4248270a709036aa87cd0fab8a46ac4727e68a5496c531a05cb671c4416349262a43deb84824541be4bd1f46ca2cb952c3eef6131bc6c5aafe13f7a0 SHA512 30c3afa4bfcc5acf11416d7f259a74ea48e772f9e8e07b9b1e23e1ccfbe7f40b91c077e9eeae5d27853ab9cdf68b4bbbef6360a91c2119a60fcdf520cf8376f7
+DIST WTForms-2.3.1.tar.gz 162773 BLAKE2B b51b5cb26c550a2502c8c70c1de91c7e6e320f60e2df3ab2b9a5cd755dbbb753d8d2fa05837657aa639929b380e8c65fd25182192538ccef837cae0869b19c80 SHA512 40b810d2d0ce6d2e7880615fb5c3b3e55cfade8e352be5d626d0de16f00a9ef4626ffa106b67d0cbef15e42513073db52ba1ceb04cb18146bba0ba9c26236fdd
+EBUILD wtforms-2.2.1.ebuild 1110 BLAKE2B 369f0b87e96599604b9c1d475f23388c352cde0ab926e6e54b5d541d2623f8b4d2f04a5ff1aa170e9949c20b6ff3deecb19c504ef8f21a9a17a5256b4637a9ac SHA512 d5853383f9b46dca6165d2c777122f429bb3160001f49a614aafab7c5f9371cf8ef8c4d662c05ad32ad7f19ee4cdc9ad7b2c2b41d536c7229acfbf6123e44601
+EBUILD wtforms-2.3.1.ebuild 1168 BLAKE2B 2390e15d8542eada503e79be88129728ec89b338bf90ef5fa5448cdfa7d354d47c5641731db6c92e68b919acc4008cd71534daa01a71e8b3c1c0e30ea1505372 SHA512 bf727d8066bf7f04e723063f61e675cde87def3d23c6aae76800cc9d21dc4ba5c29f8cfd9859c24bee652d8aadfb0c1e4cd478e3fa83233be7d9107cb741b6b3
 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 aeb0c540d6e9..e52ad989976d 100644
--- a/dev-python/wtforms/wtforms-2.2.1.ebuild
+++ b/dev-python/wtforms/wtforms-2.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python2_7 python3_{6..9} )
 inherit distutils-r1
 
 MY_PN="WTForms"
@@ -22,8 +22,6 @@ RESTRICT="!test? ( test )"
 S="${WORKDIR}/${MY_P}"
 
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
 	test? (
 		dev-python/Babel[${PYTHON_USEDEP}]
 		dev-python/python-dateutil[${PYTHON_USEDEP}]
@@ -32,6 +30,8 @@ BDEPEND="
 	)
 "
 
+distutils_enable_sphinx docs
+
 python_prepare_all() {
 	# Extension-tests are written for an older version of Django
 	# Disable pep8 even when it is installed
@@ -43,17 +43,6 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
 python_test() {
 	"${EPYTHON}" tests/runtests.py -v || die
 }
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/wtforms/wtforms-2.3.1.ebuild b/dev-python/wtforms/wtforms-2.3.1.ebuild
new file mode 100644
index 000000000000..6651bb04febe
--- /dev/null
+++ b/dev-python/wtforms/wtforms-2.3.1.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=( pypy3 python3_{6..9} )
+inherit distutils-r1
+
+MY_PN="WTForms"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Flexible forms validation and rendering library for python web development"
+HOMEPAGE="https://wtforms.readthedocs.io/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/markupsafe[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	test? (
+		dev-python/Babel[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/python-email-validator[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/webob[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# Extension-tests are written for an older version of Django
+	# Disable pep8 even when it is installed
+	sed \
+		-e "s|'ext_django.tests', ||" \
+		-e "/import pep8/d" \
+		-e "s|has_pep8 = True|has_pep8 = False|" \
+		-i tests/runtests.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${EPYTHON}" tests/runtests.py -v || die
+}
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index a0949d39416e..34a5a140551f 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -2,7 +2,7 @@ DIST xmlschema-1.1.3.tar.gz 298490 BLAKE2B 70c24424fd6a5e87e07591451db920d22c1bf
 DIST xmlschema-1.2.0.tar.gz 314580 BLAKE2B d42b221d2730d2b5cdab655269f7b885c72bce1794f12111b4110a80a1288e1996633ef5f00e9fc3ef7cd66a4267baffbdb6a906d0a0c3caf418d31abda93016 SHA512 1a6644b02e96beeea68bd737a4a66fd02693b4cb3c36a07e569a2b2c3e2b0db4fe01a475fcc3c4e5372c6000b27ef824ba5859215a03212fe4c0f2ec61f7103b
 DIST xmlschema-1.2.1.tar.gz 318674 BLAKE2B 686b94846b9cc8bc3dabfea9c9171a186561a0ad568a2806f5575a0c5808d3542f4e2cb7c01096036f5a54fb839cbdd95077fee9febad4cd7a82ead445228e62 SHA512 6d27ea5aea227e35f25a34a651b27084844bca015ae60d096fe1879150efb681141c368cd38cf376a2f0ea28b265cb844f1de82d2d7f704e3c2db67683f2af9b
 DIST xmlschema-1.2.2.tar.gz 318829 BLAKE2B 5ebb8749d56491e65a2c09b56e965ea6b3e9be3d453a01671fa0da065389ca4bf44993693517bed4ef9df22cb94b9398660a7a838405c1757ee1c6f40aedacd3 SHA512 51be4317530cd1055438a4bf8e484b70d8a9414da5507fd30ed506271317859e5255fc729ed9fa5df2230e2af049ff40e693c67a5062e61fda43a1329ef2138d
-EBUILD xmlschema-1.1.3.ebuild 707 BLAKE2B ddbddeec52163be9ac209376dc2e375cce95ee9ee9670e2b3b094e89c005517340af27627d382a9e4ec5b7d68f1393af0808ce1c3aa964a711c5265219bfa8bc SHA512 2b13c622bfc8d8f7941e2d67232e8fc517fd68f38f931055c246ae14ac2893acd73433d24ad2956e3569225983458af77f1ced481a7d8471b934d476a76afe94
+EBUILD xmlschema-1.1.3.ebuild 706 BLAKE2B afd9564f0490f8a2d88c4468ddb9f8cd785e65a16c2a09601cd1531b6fd00c20e43401ce2a70bc62852c061d7058097f619c493eb54001a9e767119612b3abe7 SHA512 ae6620c74b2d753dd4dd84217f4d6114833f50f60338b6aeb03cacec2921f36ca91343e28ceb9554aef5fc5e4247bb75b7e58c2b97401657bddfa9d79a214bff
 EBUILD xmlschema-1.2.0.ebuild 756 BLAKE2B 37a7a167f92596b068de0240b6920eae9293cccf6a714c19026ed8a46e87a8c727bd6a3cc7aa8749d0113b66d854eea2e9719dcf39911f6851cb3f72349f49b0 SHA512 2d0c6fbd5d0f0ae5618f8505e37b386cf77784b5b992d6cc36cbcc7ac4df9b60db7aeca59cb10c0006ee196e8ee143197f64baba9343418ee751760af4451156
 EBUILD xmlschema-1.2.1.ebuild 938 BLAKE2B e83eceb1494b64c00db3c534969e9742cf576341369040631f94e7ede7075ea738afbdfbbbe5f2099600a9eae7ff433c7681e379cef917766f516dbac5c7431f SHA512 208b0ff88e8eb5fcadfc831b391aa30106a522a2e1ee592626fd0918a84362fadd7abe7468729670bfd32f4cfb3ff3cae467f2305dac1b7bc609c17adb479153
 EBUILD xmlschema-1.2.2.ebuild 938 BLAKE2B e83eceb1494b64c00db3c534969e9742cf576341369040631f94e7ede7075ea738afbdfbbbe5f2099600a9eae7ff433c7681e379cef917766f516dbac5c7431f SHA512 208b0ff88e8eb5fcadfc831b391aa30106a522a2e1ee592626fd0918a84362fadd7abe7468729670bfd32f4cfb3ff3cae467f2305dac1b7bc609c17adb479153
diff --git a/dev-python/xmlschema/xmlschema-1.1.3.ebuild b/dev-python/xmlschema/xmlschema-1.1.3.ebuild
index fc99c030c534..970be7400279 100644
--- a/dev-python/xmlschema/xmlschema-1.1.3.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/yapf/Manifest b/dev-python/yapf/Manifest
index 829d4d0bb03c..b01353827ab7 100644
--- a/dev-python/yapf/Manifest
+++ b/dev-python/yapf/Manifest
@@ -1,5 +1,5 @@
 DIST yapf-0.28.0.tar.gz 157976 BLAKE2B 11dbbecd4a9cd77e6ff3f1f279cc4302b13445e3f0522f64a7e6b71155703f4c074a5bbf08cedc903533aeaee7338c63a98fc04870b8470a30377686dc66d2b4 SHA512 be9ed5278d085797aba4a582a37295716c76fd10a4cea4bb5090794dd53eba6d1340d8ba7508e33a146f189a863578c95b0a651bbfd90b0390076028e03ad9bf
 DIST yapf-0.30.0.tar.gz 168259 BLAKE2B 1c5955028531dbcc20870ef84f3ba225a203f94367edc4e7ee8245a641cd83de0e57b0d55a4c93e8ef6f7bbe8b56f26b06a257968e132a04beffd77a8f951d5f SHA512 a282213d0171671a24d44b7a00b69f65163e7a7b8edfbede5cc38c809236a71f7adc8bfc3c4a1d1e66ac3cb2d9c6bb54b1303a2875ec09cdaddaa71d2039f84b
 EBUILD yapf-0.28.0.ebuild 528 BLAKE2B ccefde6fb323f8acdda6f4114ef8767796cac43c1adc22f03a8bc57552bf8693e0c672cdb11d864ab433331365cda505877520099b13aedb96f9e1e198ee8df8 SHA512 f206142ff46ae32092fdf0eb535d3b30e7b17c7c6582338076448470319119db246a4d206285d6dc0a88784e98d64b14d857c945e9977cca8da4719b96860b56
-EBUILD yapf-0.30.0.ebuild 450 BLAKE2B fbaf06cc62b68b0c72a47649486e26ba1bb380cbaadc98313484af6c87ebe36c66e54b0c3859ed10abbf0f42765a0572ec6328c973a3570f7f614610f9b94ea8 SHA512 70f6e271561dfe0363041d47a1a7da99000b199b73c3e680e8a73d996c52190c7ac77b6f5ab80fdd968523cc370f3da0aef0d40655fccec44a8554b646634e78
+EBUILD yapf-0.30.0.ebuild 449 BLAKE2B ed3e5b118dccea79a474b89f6795c6e9265b0b9e529948aa3aef60fa15dca6ab2d7f6269feb24bad40142c8221f8678ab68d5828149de4571bb0938a4e7623c3 SHA512 cc2e4ebb46a974f61451795b15d70bc1d610bca0171ba0616f53bfdff5475d05c049a65599bbe08ef5b535b4359ca4bcd371445f4b4f07f7f4dbd3cd336edc9f
 MISC metadata.xml 658 BLAKE2B bd04267b635e205f88ad59f2005a9699ab10970e3ba7fc8917591259e78eec9f1ce7de08d75345635277ba996fed4f7a393989000b78100695e169636d7db999 SHA512 b8c79baca3d700b265485273bcb51394e15e9688b1bb834fd29f00809188032a711f8bc05af7038589c657e9329478542ed7e6b47e420c9aa91f6605eaca20d7
diff --git a/dev-python/yapf/yapf-0.30.0.ebuild b/dev-python/yapf/yapf-0.30.0.ebuild
index 24a461376faa..ca683033d50a 100644
--- a/dev-python/yapf/yapf-0.30.0.ebuild
+++ b/dev-python/yapf/yapf-0.30.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="https://github.com/google/yapf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/zc-lockfile/Manifest b/dev-python/zc-lockfile/Manifest
index 60d967b28d3e..78d71d8f3c2c 100644
--- a/dev-python/zc-lockfile/Manifest
+++ b/dev-python/zc-lockfile/Manifest
@@ -1,3 +1,3 @@
 DIST zc.lockfile-2.0.tar.gz 11923 BLAKE2B 7609f64eef4521f0aa95dc899b253570a317bd997cced00665a2dbe22cf7f834ce75daaf4fdf79520157dee31742758aad1844d49c5eccb780e7d5fd2e8e5ac5 SHA512 2586bafacb12540383695a24cb01fd284e61bfa3fcb16431ed0e91278e547c68983363fb69c1ffbd54f7c22db43300ba018ccd2fb3e21666c98860415b7a3c3b
-EBUILD zc-lockfile-2.0.ebuild 1060 BLAKE2B 5bab1e261f91fbdf8b3a8f6e97fe77e170d7307d51b40cc24df9ac3e444ca9fa96704e147b26aaa2979366c2b0592a0c930622d6a4beb035c078d1f0e9161192 SHA512 a8fbf3bf6f2e5bcc632b69f9e7b50662b9614c8e4235ae67ac7e1070c938c10a263b993814d1fe79efb3026895c262c1db5aeb8c694cc79b5a1f368e7a8e1e80
+EBUILD zc-lockfile-2.0.ebuild 1059 BLAKE2B f0de57fa4bb7da5510551d3c2229964a3fb81261d288402c213dfae6a378d65d84339ce0774fb7d2b23decd63aef22ebf00bf67f01867a79af2741dec07cca35 SHA512 17086394d93e07997c39b6f94a44c885cee0a051b6e8ba1fc23a2f5edad1083f22c9916daa87d4aeaee423e4fd8cb02590e39403600b72429099f7a69590865a
 MISC metadata.xml 349 BLAKE2B d750432001725ac1266b82b174011a342b115739dcce7a9ba4da4465a907f64620f0e5e4e38cf6b41beffc4021cfd070b1f68b6da88f2a309f44c45d23b4b40f SHA512 6152f78467097c2e5ed0c65dbdf6bcedd84310b74c9ee92efda96fb855db3f0f990387a48f58f34e2c9f4769bc0f7a28b1c6c4be7e9561f6a3c4a22fa279cf0f
diff --git a/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild b/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
index 048092af73c0..2fb597296ff4 100644
--- a/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
+++ b/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND=">=dev-python/setuptools-3.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/zope-testing/Manifest b/dev-python/zope-testing/Manifest
index 0366b2a6a50a..f78526cdccca 100644
--- a/dev-python/zope-testing/Manifest
+++ b/dev-python/zope-testing/Manifest
@@ -1,3 +1,3 @@
 DIST zope.testing-4.7.tar.gz 63474 BLAKE2B dc825849c288b9f8ab9e4edfe670e09aa49f28c64047da8e0fb36cbfa6cf24d70cf6a49ea8a51ca1831b152f3ffa4b0c62cde29750036f13c9f754df2bb80da2 SHA512 cdf87f95196880a0f55c740f6340286bb29e96e9273d0c645bbb50def54a0645cce22d971adba3f15ff57b1021a72749219af83abc4e8fa775fb982d8164791d
-EBUILD zope-testing-4.7-r1.ebuild 994 BLAKE2B 9b294a6ed8e9ebddf17fac26862a2172dd9fbc09cfc3b0afba05837a17ab10fb92a2aee95dfc96e72f82edee8920846d5c8805722f8f82a91b4d0aef1acb5322 SHA512 3d7fdd38b6a18558715a078bb544240fc2aedeff433ef3ff09ba21c014f980c10954a1a6a84fda52c157444c56c8351cba4cf2e0c7f4765f85873390166a799a
+EBUILD zope-testing-4.7-r1.ebuild 993 BLAKE2B ca655c07dd13fc76ff452a431c98f00ba6c6fd9e030b54462ab0ec5a095b423ff79dce9a2adf13eb4d71809aaa3f0f81abd980e15235cf997545268c8401447f SHA512 45330ae19ceb1533548cb6c4125c061f796c5e87bea3abba14a284fffa3164a77877390ff092470d4befae4ce0dcd2f1582c0e62e783e9af9675a453a140dfa1
 MISC metadata.xml 382 BLAKE2B 3931e1281c2947e5d4582aeb10a79579e4b3c7bddca959fb1f6a65f47cd1b42df2a54f8d3200d3ab4f1dba843b978a4bfc29a9cc23070977ddfee1a74b3c69e1 SHA512 ddd7e2cd30860e71eee851d969e3ea69f72edaf4dff87dba784925e203cd1f0fada3c51090291fd8b5aee8e715f097a0bd6be1e89abe37526f57dde529c5e61d
diff --git a/dev-python/zope-testing/zope-testing-4.7-r1.ebuild b/dev-python/zope-testing/zope-testing-4.7-r1.ebuild
index af8fdf5e136f..43f2959a1318 100644
--- a/dev-python/zope-testing/zope-testing-4.7-r1.ebuild
+++ b/dev-python/zope-testing/zope-testing-4.7-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 2825d109a74f..fdc6907ff22a 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 240d2b7a73a9..1b11631c8cf5 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,8 +1,10 @@
+AUX qt-creator-4.12.0-dylib-fix.patch 4022 BLAKE2B ea5d2b4a5daabc76515c1777a5df1738800d5cf79e9b52b60bb0d3d1c923b6d0daeb1f1a7e77f1e707aa7948f2a673f637e1e66bd3aa30f47c19ef89351114c5 SHA512 a81ed8b5616f816bc4ade87c159997f33a55c07417b93cbcbfc29f32fb36060370bf05f85cc94ac64297a7b33cf2852b3be2a8c7b99b58914085acd9dc533808
+AUX qt-creator-4.12.0-libclangformat-ide.patch 2463 BLAKE2B a99fc6e1354fde03ddbf60e5115fbec46fc5074353b5512973bb3802bb65d3401a4ac51e41a5d113ffea14faf85b48f334d97f21e210d173b534c6e2fdfec328 SHA512 f08a95d5e0e9201792f5c16e3b2a61e9a54f08a885e214ea237d3e49bad8d2d94a59cbdc35703641a1ed1ee4037f64bf7d6d6bbd4dab11fa153a3ac4ef67e050
 DIST qt-creator-opensource-src-4.10.1.tar.xz 26299716 BLAKE2B a72e05fc80cb4065851e5849f49c6ec8e35b08916e928a9fea856ba30710220d8632f4a1ffaf1d1d5e2cae8e9121ab188b8f9ed672f9c8695c9e572ae609397c SHA512 ec0ac4d37e4195e906b100405869cb8e6dff618b8862d8ab620e30e034553eb944de6e4a92478ab2e67b86bd4c3e9cff6fd6051411893be36387d7821d712ce3
-DIST qt-creator-opensource-src-4.12.0.tar.xz 32575196 BLAKE2B 193e10a790f35944473c2177ba84e6e15d00effc769b4d63a51a217e4da93a4d6ca0061976d0def31c625a73d49b0adcb40e551d02a70ab7225b40f441d9b6b6 SHA512 9c35ebf095c2874b89af54b06fd190976a27f7e753a23e47db3b26947bdba64e4fe7774ae8b252867cf7f6f0c86b35d773a4012cae6d4aaa9101d7a31973f215
+DIST qt-creator-opensource-src-4.12.3.tar.xz 34351356 BLAKE2B 7f1302df09bae10ebe1882552abd25333788d7185280e9a0c73e7da6fb8b4d929da326e42c500385fba3e044350cd46c2cf2e33e49b0cca2d9c3b4d68693115d SHA512 48cd5839cff724300516f78deba3b1a7199d46d6f9a6a4c662bf2f581db167e4376a9bdd544544071591c4ee43c319c92ffcaf5ebb85412297f4144c3c7db7bf
 DIST qt-creator-opensource-src-4.8.2.tar.xz 24600872 BLAKE2B c686ea4f0ab981cba98319d8d7dd8eee9fd967d17e80f2602e8416145bddcbd7cae928d06a950914d677c9b2e82ed855812e66d64ce7cc998742357284f41865 SHA512 9900a82b1298a1cc74b33eab6a1063ed77e11f3150b8f82a72b7703b88f979e5a332efee9a622554df5238b44470e99a061b6c70f0d8cdfc352a07ce51a4c450
 EBUILD qt-creator-4.10.1.ebuild 6229 BLAKE2B 9681c8465616bfa0d2ae0c1968285603e6840213c4da1fe34de0ef191c394306c8a935d3080919a590c71bbd04deb6e96828eb95ff691c378696c5f21059f953 SHA512 224693d7cfbddb31bc01ccec252c59e79f82f990b4178bde8aa8d2b647bea8b0b283421cc2e0c2e6076b5caaa430e4b4ac8028ff21f87d0d5d9b24031693f67a
-EBUILD qt-creator-4.12.0.ebuild 6338 BLAKE2B be92f41a4598ed751dd2d328d360bc8c4913f15d3bb6de6d6130fba2764caff9e87a703885f89e96cc9f5af05edc410f06d5182d380a4d565ee67dcfc54982ee SHA512 40f9da93e455e3cd8d7d89d92a0b1b53310f828df154871a9360e1c4a8d10b315e2f7d01e12abb55b3eb8a8799adeb15dcbde65916292bbfe25337d955035510
+EBUILD qt-creator-4.12.3.ebuild 7157 BLAKE2B b8496055e4c5fd6b97d80e3e9fc779f5789c30f615009c6b48440fef558f3f891630a4b7f17229985cc6148ae5a0beef32b9c960b248e6ae91e57538b8e0b30b SHA512 270cc34fcb6b32edeff23153cbab9ba78a7293cc024cdfd2a1162cf1eb779dcc551295e90a36f5be7d6a89205fbe62b46af5065579c0ed459b18ec8c62204345
 EBUILD qt-creator-4.8.2.ebuild 5826 BLAKE2B c3b87e94ae39f69abbefd189fe52dd946dbece17de5a301b3b4a651a683770c5ca58c5f2afcea0237ef18bb0d80e53d69f5078bb0d219f0c114331da5456320a SHA512 7f01324288b26da063d3d1d4d93232f74d0c7a7ad9e481d872a045935265aa1bed200ec24ce2d90469f17bb9da3c7de5aeecb8b8be1d2a04c510c51c533c99c4
-EBUILD qt-creator-9999.ebuild 6358 BLAKE2B 186f2c620c33176dbd83491e9291d55b637f12d07c9b39767ecf4bb2321ca4ad2134831d3c3f789aea36d94e66f6efed896dadd18bf25db055c33b7fbda9a6a6 SHA512 c67d24ea242ffd2a729d36894a6a8511e844ef4a41e1d150a004bac6b23d9b9ff9a6b54f8e96195745c77e3032568a20c4cc36dea966a80094afad57340243e2
+EBUILD qt-creator-9999.ebuild 7157 BLAKE2B b8496055e4c5fd6b97d80e3e9fc779f5789c30f615009c6b48440fef558f3f891630a4b7f17229985cc6148ae5a0beef32b9c960b248e6ae91e57538b8e0b30b SHA512 270cc34fcb6b32edeff23153cbab9ba78a7293cc024cdfd2a1162cf1eb779dcc551295e90a36f5be7d6a89205fbe62b46af5065579c0ed459b18ec8c62204345
 MISC metadata.xml 3297 BLAKE2B 02d12b1d65d5791fe108f75d76f01804d363c933b5b50317a2976d5a3099bf36c2a78d40390a6e16e341b462c7b7a86c0da1f1be9ca4e9cb29ea9e24285227dd SHA512 0597fb87fe7f82c0a4502c0299a0b0d6ab981d8923c1db58f0c26102a93507a8ec75005430a2c538a2621c37936b662a6f0acfc2c7168bc2d608cb3ed44db2cf
diff --git a/dev-qt/qt-creator/files/qt-creator-4.12.0-dylib-fix.patch b/dev-qt/qt-creator/files/qt-creator-4.12.0-dylib-fix.patch
new file mode 100644
index 000000000000..0d4deb2c7956
--- /dev/null
+++ b/dev-qt/qt-creator/files/qt-creator-4.12.0-dylib-fix.patch
@@ -0,0 +1,84 @@
+From 1c5faa6dcf16135ee31252d13766d01536a69405 Mon Sep 17 00:00:00 2001
+From: Peter Levine <plevine457@gmail.com>
+Date: Tue, 5 May 2020 03:45:35 -0400
+Subject: [PATCH] Fix building against clang configured with
+ CLANG_LINK_CLANG_DYLIB
+
+LLVM/Clang upstream only officially supports building shared
+components as a single dynamic library (via
+LLVM_BUILD_LLVM_DYLIB=ON, CLANG_LINK_CLANG_DYLIB=ON, etc..).
+Linux distros like Fedora and Gentoo have followed suit.
+
+Unfortunately, QT-Creator's src/shared/clang/clang_installation.pri
+file assumes clang is built with separate component libraries
+and the build fails.
+
+This change alters the build to check for the existence
+of clang component libraries and, if found, link to them, or
+otherwise to libclang-cpp.
+
+Task-number: QTCREATORBUG-23172
+Change-Id: I17df5822d7aeb471227f21f2cf4a71871d6f9b86
+---
+ src/shared/clang/clang_installation.pri | 35 +++++++++++++++----------
+ 1 file changed, 21 insertions(+), 14 deletions(-)
+
+diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri
+index 08838838bca..c191c57f1c7 100644
+--- a/src/shared/clang/clang_installation.pri
++++ b/src/shared/clang/clang_installation.pri
+@@ -204,19 +204,6 @@ isEmpty(LLVM_VERSION) {
+         }
+     }
+ 
+-    isEmpty(QTC_CLANG_BUILDMODE_MISMATCH)|!equals(QTC_CLANG_BUILDMODE_MISMATCH, 1) {
+-        CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h
+-        exists($$CLANGFORMAT_MAIN_HEADER) {
+-            CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
+-            ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \
+-                           -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \
+-                           -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \
+-                           -lclangASTMatchers -lclangAST -lclangLex -lclangBasic
+-            win32:CLANGFORMAT_LIBS += -lversion
+-        }
+-    }
+-    win32:ALL_CLANG_LIBS += -lversion
+-
+     LIBCLANG_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang-c/Index.h
+     !exists($$LIBCLANG_MAIN_HEADER) {
+         $$llvmWarningOrError(\
+@@ -237,10 +224,30 @@ isEmpty(LLVM_VERSION) {
+     LIBCLANG_LIBS += $${CLANG_LIB}
+ 
+     isEmpty(QTC_CLANG_BUILDMODE_MISMATCH)|!equals(QTC_CLANG_BUILDMODE_MISMATCH, 1) {
++        CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h
++        exists($$CLANGFORMAT_MAIN_HEADER) {
++            exists($${LLVM_LIBDIR}/libclangFormat.so*)|exists($${LLVM_LIBDIR}/libclangFormat.dylib) {
++                CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
++                ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \
++                           -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \
++                           -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \
++                           -lclangASTMatchers -lclangAST -lclangLex -lclangBasic
++                win32:CLANGFORMAT_LIBS += -lversion
++                win32:ALL_CLANG_LIBS += -lversion
++            } else {
++                CLANGFORMAT_LIBS=-lclang-cpp
++                ALL_CLANG_LIBS=-lclang-cpp
++            }
++        }
++
+         QTC_DISABLE_CLANG_REFACTORING=$$(QTC_DISABLE_CLANG_REFACTORING)
+         isEmpty(QTC_DISABLE_CLANG_REFACTORING) {
+             !contains(QMAKE_DEFAULT_LIBDIRS, $$LLVM_LIBDIR): LIBTOOLING_LIBS = -L$${LLVM_LIBDIR}
+-            LIBTOOLING_LIBS += $$CLANGTOOLING_LIBS $$LLVM_STATIC_LIBS
++            exists($${LLVM_LIBDIR}/libclangTooling.so*)|exists($${LLVM_LIBDIR}/libclangTooling.dylib) {
++                LIBTOOLING_LIBS += $$CLANGTOOLING_LIBS $$LLVM_STATIC_LIBS
++            } else {
++                LIBTOOLING_LIBS += -lclang-cpp $$LLVM_STATIC_LIBS
++            }
+         }
+     }
+ 
+-- 
+2.26.2
+
diff --git a/dev-qt/qt-creator/files/qt-creator-4.12.0-libclangformat-ide.patch b/dev-qt/qt-creator/files/qt-creator-4.12.0-libclangformat-ide.patch
new file mode 100644
index 000000000000..12c46c89ed0e
--- /dev/null
+++ b/dev-qt/qt-creator/files/qt-creator-4.12.0-libclangformat-ide.patch
@@ -0,0 +1,64 @@
+--- a/src/plugins/clangformat/clangformatbaseindenter.h
++++ b/src/plugins/clangformat/clangformatbaseindenter.h
+@@ -27,7 +27,7 @@
+ 
+ #include <texteditor/indenter.h>
+ 
+-#include <clang/Format/Format.h>
++#include <clang/Format/FormatIDE.h>
+ 
+ namespace ClangFormat {
+ 
+--- a/src/plugins/clangformat/clangformatconfigwidget.cpp
++++ b/src/plugins/clangformat/clangformatconfigwidget.cpp
+@@ -32,7 +32,7 @@
+ #include "ui_clangformatchecks.h"
+ #include "ui_clangformatconfigwidget.h"
+ 
+-#include <clang/Format/Format.h>
++#include <clang/Format/FormatIDE.h>
+ 
+ #include <coreplugin/icore.h>
+ #include <cppeditor/cpphighlighter.h>
+--- a/src/plugins/clangformat/clangformatplugin.cpp
++++ b/src/plugins/clangformat/clangformatplugin.cpp
+@@ -56,7 +56,7 @@
+ #include <texteditor/icodestylepreferences.h>
+ #include <texteditor/texteditorsettings.h>
+ 
+-#include <clang/Format/Format.h>
++#include <clang/Format/FormatIDE.h>
+ 
+ #include <utils/algorithm.h>
+ 
+--- a/src/plugins/clangformat/clangformatutils.h
++++ b/src/plugins/clangformat/clangformatutils.h
+@@ -27,7 +27,7 @@
+ 
+ #include <coreplugin/id.h>
+ #include <utils/fileutils.h>
+-#include <clang/Format/Format.h>
++#include <clang/Format/FormatIDE.h>
+ 
+ #include <QFile>
+ 
+--- a/src/shared/clang/clang_installation.pri
++++ b/src/shared/clang/clang_installation.pri
+@@ -227,7 +227,7 @@
+         CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h
+         exists($$CLANGFORMAT_MAIN_HEADER) {
+             exists($${LLVM_LIBDIR}/libclangFormat.so*)|exists($${LLVM_LIBDIR}/libclangFormat.dylib) {
+-                CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
++                CLANGFORMAT_LIBS=-lclangFormatIDE -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
+                 ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \
+                            -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \
+                            -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \
+@@ -235,7 +235,7 @@
+                 win32:CLANGFORMAT_LIBS += -lversion
+                 win32:ALL_CLANG_LIBS += -lversion
+             } else {
+-                CLANGFORMAT_LIBS=-lclang-cpp
++                CLANGFORMAT_LIBS=-lclangFormatIDE -lclang-cpp
+                 ALL_CLANG_LIBS=-lclang-cpp
+             }
+         }
diff --git a/dev-qt/qt-creator/qt-creator-4.12.0.ebuild b/dev-qt/qt-creator/qt-creator-4.12.0.ebuild
deleted file mode 100644
index a4ca520e9938..000000000000
--- a/dev-qt/qt-creator/qt-creator-4.12.0.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
-LLVM_MAX_SLOT=9
-PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW"
-
-inherit llvm qmake-utils virtualx xdg
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="https://doc.qt.io/qtcreator/"
-LICENSE="GPL-3"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git"
-else
-	MY_PV=${PV/_/-}
-	MY_P=${PN}-opensource-src-${MY_PV}
-	[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
-	SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 1-2)/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-# TODO: unbundle sqlite and KSyntaxHighlighting
-
-QTC_PLUGINS=(android +autotest baremetal beautifier boot2qt
-	'+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase
-	cmake:cmakeprojectmanager cppcheck ctfvisualizer cvs +designer git glsl:glsleditor +help ios +lsp:languageclient
-	mercurial modeling:modeleditor nim perforce perfprofiler python qbs:qbsprojectmanager
-	+qmldesigner qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher subversion
-	valgrind winrt)
-IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	clang? ( test? ( qbs ) )
-	qnx? ( remotelinux )
-	boot2qt? ( remotelinux )
-	python? ( lsp )
-"
-
-# minimum Qt version required
-QT_PV="5.12.3:5"
-
-CDEPEND="
-	>=dev-cpp/yaml-cpp-0.6.2
-	>=dev-qt/qtconcurrent-${QT_PV}
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qtnetwork-${QT_PV}[ssl]
-	>=dev-qt/qtprintsupport-${QT_PV}
-	>=dev-qt/qtquickcontrols-${QT_PV}
-	>=dev-qt/qtscript-${QT_PV}
-	>=dev-qt/qtsql-${QT_PV}[sqlite]
-	>=dev-qt/qtsvg-${QT_PV}
-	>=dev-qt/qtwidgets-${QT_PV}
-	>=dev-qt/qtx11extras-${QT_PV}
-	>=dev-qt/qtxml-${QT_PV}
-	clang? ( >=sys-devel/clang-9.0.1:= )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	help? (
-		>=dev-qt/qthelp-${QT_PV}
-		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
-	)
-	perfprofiler? ( dev-libs/elfutils )
-	qbs? ( >=dev-util/qbs-1.13.1 )
-	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${CDEPEND}
-	>=dev-qt/linguist-tools-${QT_PV}
-	virtual/pkgconfig
-	doc? ( >=dev-qt/qdoc-${QT_PV} )
-	test? (
-		>=dev-qt/qtdeclarative-${QT_PV}[localstorage]
-		>=dev-qt/qtquickcontrols2-${QT_PV}
-		>=dev-qt/qttest-${QT_PV}
-		>=dev-qt/qtxmlpatterns-${QT_PV}[qml]
-	)
-"
-RDEPEND="${CDEPEND}
-	sys-devel/gdb[client,python]
-	cmake? ( dev-util/cmake )
-	cppcheck? ( dev-util/cppcheck )
-	cvs? ( dev-vcs/cvs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	silversearcher? ( sys-apps/the_silver_searcher )
-	subversion? ( dev-vcs/subversion )
-	valgrind? ( dev-util/valgrind )
-"
-# qt translations must also be installed or qt-creator translations won't be loaded
-for x in ${PLOCALES}; do
-	IUSE+=" l10n_${x}"
-	RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
-done
-unset x
-
-pkg_setup() {
-	use clang && llvm_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# disable unwanted plugins
-	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
-		if ! use ${plugin%:*}; then
-			einfo "Disabling ${plugin%:*} plugin"
-			sed -i -re "s/(^\s+|\s*SUBDIRS\s*\+=.*)\<(${plugin#*:})\>(.*)/\1\3/" \
-				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
-		fi
-	done
-	sed -i -e '/updateinfo/d' src/plugins/plugins.pro || die
-
-	# avoid building unused support libraries and tools
-	if ! use clang; then
-		sed -i -e '/clangsupport/d' src/libs/libs.pro || die
-		sed -i -e '/clang\(\|pchmanager\|refactoring\)backend/d' src/tools/tools.pro || die
-	fi
-	if ! use glsl; then
-		sed -i -e '/glsl/d' src/libs/libs.pro || die
-	fi
-	if ! use lsp; then
-		sed -i -e '/languageserverprotocol/d' src/libs/libs.pro tests/auto/auto.pro || die
-	fi
-	if ! use modeling; then
-		sed -i -e '/modelinglib/d' src/libs/libs.pro || die
-	fi
-	if ! use perfprofiler; then
-		rm -rf src/tools/perfparser || die
-		if ! use qmlprofiler && ! use ctfvisualizer; then
-			sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die
-		fi
-	fi
-	if ! use qmldesigner; then
-		sed -i -e '/qml2puppet/d' src/tools/tools.pro || die
-		sed -i -e '/qmldesigner/d' tests/auto/qml/qml.pro || die
-	fi
-	if ! use valgrind; then
-		sed -i -e '/valgrindfake/d' src/tools/tools.pro || die
-		sed -i -e '/valgrind/d' tests/auto/auto.pro || die
-	fi
-
-	# automagic dep on qtwebengine
-	if ! use webengine; then
-		sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' src/plugins/help/help.pro || die
-	fi
-
-	# disable broken or unreliable tests
-	sed -i -e 's/\(manual\|tools\|unit\)//g' tests/tests.pro || die
-	sed -i -e '/\(dumpers\|namedemangler\)\.pro/d' tests/auto/debugger/debugger.pro || die
-	sed -i -e '/CONFIG -=/s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
-	sed -i -e 's/\<check\>//' tests/auto/qml/codemodel/codemodel.pro || die
-
-	# do not install test binaries
-	sed -i -e '/CONFIG +=/s/$/ no_testcase_installs/' tests/auto/{qttest.pri,json/json.pro} || die
-
-	# fix path to some clang headers
-	sed -i -e "/^CLANG_RESOURCE_DIR\s*=/s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die
-
-	# fix translations
-	local lang languages=
-	for lang in ${PLOCALES}; do
-		use l10n_${lang} && languages+=" ${lang/-/_}"
-	done
-	sed -i -e "/^LANGUAGES\s*=/s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die
-
-	# remove bundled qbs
-	rm -rf src/shared/qbs || die
-}
-
-src_configure() {
-	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
-		IDE_PACKAGE_MODE=1 \
-		$(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \
-		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
-		CONFIG+=qbs_disable_rpath \
-		CONFIG+=qbs_enable_project_file_updates \
-		$(use systemd && echo CONFIG+=journald) \
-		$(use test && echo BUILD_TESTS=1)
-}
-
-src_test() {
-	cd tests/auto && virtx default
-}
-
-src_install() {
-	emake INSTALL_ROOT="${ED}/usr" install
-
-	dodoc dist/{changes-*,known-issues}
-
-	# install documentation
-	if use doc; then
-		emake docs
-		# don't use ${PF} or the doc will not be found
-		insinto /usr/share/doc/qtcreator
-		doins share/doc/qtcreator/qtcreator{,-dev}.qch
-		docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
-	fi
-}
diff --git a/dev-qt/qt-creator/qt-creator-4.12.3.ebuild b/dev-qt/qt-creator/qt-creator-4.12.3.ebuild
new file mode 100644
index 000000000000..ff58c169e4e0
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-4.12.3.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+LLVM_MAX_SLOT=10
+PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW"
+
+inherit llvm qmake-utils virtualx xdg
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://doc.qt.io/qtcreator/"
+LICENSE="GPL-3"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git"
+else
+	MY_PV=${PV/_/-}
+	MY_P=${PN}-opensource-src-${MY_PV}
+	[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
+	SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 1-2)/${MY_PV}/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+# TODO: unbundle sqlite
+
+QTC_PLUGINS=(android +autotest baremetal beautifier boot2qt
+	'+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase
+	cmake:cmakeprojectmanager cppcheck ctfvisualizer cvs +designer git glsl:glsleditor +help ios
+	lsp:languageclient mcu:mcusupport mercurial modeling:modeleditor nim perforce perfprofiler python
+	qbs:qbsprojectmanager +qmldesigner qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal
+	silversearcher subversion valgrind webassembly winrt)
+IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	boot2qt? ( remotelinux )
+	clang? ( test? ( qbs ) )
+	mcu? ( cmake )
+	python? ( lsp )
+	qnx? ( remotelinux )
+"
+
+# minimum Qt version required
+QT_PV="5.12.3:5"
+
+BDEPEND="
+	>=dev-qt/linguist-tools-${QT_PV}
+	virtual/pkgconfig
+	doc? ( >=dev-qt/qdoc-${QT_PV} )
+"
+CDEPEND="
+	>=dev-cpp/yaml-cpp-0.6.2:=
+	>=dev-qt/qtconcurrent-${QT_PV}
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
+	>=dev-qt/qtgui-${QT_PV}
+	>=dev-qt/qtnetwork-${QT_PV}[ssl]
+	>=dev-qt/qtprintsupport-${QT_PV}
+	>=dev-qt/qtquickcontrols-${QT_PV}
+	>=dev-qt/qtscript-${QT_PV}
+	>=dev-qt/qtsql-${QT_PV}[sqlite]
+	>=dev-qt/qtsvg-${QT_PV}
+	>=dev-qt/qtwidgets-${QT_PV}
+	>=dev-qt/qtx11extras-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	kde-frameworks/syntax-highlighting:5
+	clang? (
+		|| (
+			( sys-devel/clang:10
+				dev-libs/libclangformat-ide:10 )
+			( sys-devel/clang:9
+				dev-libs/libclangformat-ide:9 )
+		)
+		<sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=
+	)
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	help? (
+		>=dev-qt/qthelp-${QT_PV}
+		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+	)
+	perfprofiler? ( dev-libs/elfutils )
+	qbs? ( >=dev-util/qbs-1.13.1 )
+	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${CDEPEND}
+	test? (
+		>=dev-qt/qtdeclarative-${QT_PV}[localstorage]
+		>=dev-qt/qtquickcontrols2-${QT_PV}
+		>=dev-qt/qttest-${QT_PV}
+		>=dev-qt/qtxmlpatterns-${QT_PV}[qml]
+	)
+"
+RDEPEND="${CDEPEND}
+	sys-devel/gdb[client,python]
+	cmake? ( dev-util/cmake )
+	cppcheck? ( dev-util/cppcheck )
+	cvs? ( dev-vcs/cvs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+	silversearcher? ( sys-apps/the_silver_searcher )
+	subversion? ( dev-vcs/subversion )
+	valgrind? ( dev-util/valgrind )
+"
+# qt translations must also be installed or qt-creator translations won't be loaded
+for x in ${PLOCALES}; do
+	IUSE+=" l10n_${x}"
+	RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
+done
+unset x
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.12.0-dylib-fix.patch
+	"${FILESDIR}"/${PN}-4.12.0-libclangformat-ide.patch
+)
+
+llvm_check_deps() {
+	has_version -d "sys-devel/clang:${LLVM_SLOT}" && \
+		has_version -d "dev-libs/libclangformat-ide:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	use clang && llvm_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# disable unwanted plugins
+	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
+		if ! use ${plugin%:*}; then
+			einfo "Disabling ${plugin%:*} plugin"
+			sed -i -re "s/(^\s+|\s*SUBDIRS\s*\+=.*)\<(${plugin#*:})\>(.*)/\1\3/" \
+				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
+		fi
+	done
+	sed -i -e '/updateinfo/d' src/plugins/plugins.pro || die
+
+	# avoid building unused support libraries and tools
+	if ! use clang; then
+		sed -i -e '/clangsupport/d' src/libs/libs.pro || die
+		sed -i -e '/clang\(\|pchmanager\|refactoring\)backend/d' src/tools/tools.pro || die
+	fi
+	if ! use glsl; then
+		sed -i -e '/glsl/d' src/libs/libs.pro || die
+	fi
+	if ! use lsp; then
+		sed -i -e '/languageserverprotocol/d' src/libs/libs.pro tests/auto/auto.pro || die
+	fi
+	if ! use modeling; then
+		sed -i -e '/modelinglib/d' src/libs/libs.pro || die
+	fi
+	if ! use perfprofiler; then
+		rm -r src/tools/perfparser || die
+		if ! use ctfvisualizer && ! use qmlprofiler; then
+			sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die
+		fi
+	fi
+	if ! use qmldesigner; then
+		sed -i -e '/qml2puppet/d' src/tools/tools.pro || die
+		sed -i -e '/qmldesigner/d' tests/auto/qml/qml.pro || die
+	fi
+	if ! use valgrind; then
+		sed -i -e '/valgrindfake/d' src/tools/tools.pro || die
+		sed -i -e '/valgrind/d' tests/auto/auto.pro || die
+	fi
+
+	# automagic dep on qtwebengine
+	if ! use webengine; then
+		sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' src/plugins/help/help.pro || die
+	fi
+
+	# disable broken or unreliable tests
+	sed -i -e 's/\(manual\|tools\|unit\)//g' tests/tests.pro || die
+	sed -i -e '/\(dumpers\|namedemangler\)\.pro/d' tests/auto/debugger/debugger.pro || die
+	sed -i -e '/CONFIG -=/s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
+	sed -i -e 's/\<check\>//' tests/auto/qml/codemodel/codemodel.pro || die
+
+	# do not install test binaries
+	sed -i -e '/CONFIG +=/s/$/ no_testcase_installs/' tests/auto/{qttest.pri,json/json.pro} || die
+
+	# fix path to some clang headers
+	sed -i -e "/^CLANG_RESOURCE_DIR\s*=/s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die
+
+	# fix translations
+	local lang languages=
+	for lang in ${PLOCALES}; do
+		use l10n_${lang} && languages+=" ${lang/-/_}"
+	done
+	sed -i -e "/^LANGUAGES\s*=/s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die
+
+	# remove bundled syntax-highlighting
+	rm -r src/libs/3rdparty/syntax-highlighting || die
+
+	# remove bundled yaml-cpp
+	rm -r src/libs/3rdparty/yaml-cpp || die
+
+	# remove bundled qbs
+	rm -r src/shared/qbs || die
+}
+
+src_configure() {
+	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
+		IDE_PACKAGE_MODE=1 \
+		KSYNTAXHIGHLIGHTING_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
+		KSYNTAXHIGHLIGHTING_INCLUDE_DIR="${EPREFIX}/usr/include/KF5/KSyntaxHighlighting" \
+		$(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \
+		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
+		CONFIG+=qbs_disable_rpath \
+		CONFIG+=qbs_enable_project_file_updates \
+		$(use systemd && echo CONFIG+=journald) \
+		$(use test && echo BUILD_TESTS=1)
+}
+
+src_test() {
+	cd tests/auto && virtx default
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}/usr" install
+
+	dodoc dist/{changes-*,known-issues}
+
+	# install documentation
+	if use doc; then
+		emake docs
+		# don't use ${PF} or the doc will not be found
+		insinto /usr/share/doc/qtcreator
+		doins share/doc/qtcreator/qtcreator{,-dev}.qch
+		docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
+	fi
+}
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index c6649849153f..ff58c169e4e0 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-LLVM_MAX_SLOT=8
+LLVM_MAX_SLOT=10
 PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW"
 
 inherit llvm qmake-utils virtualx xdg
@@ -20,11 +20,11 @@ else
 	MY_P=${PN}-opensource-src-${MY_PV}
 	[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
 	SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 1-2)/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~x86"
 	S=${WORKDIR}/${MY_P}
 fi
 
-# TODO: unbundle sqlite, yaml-cpp, and KSyntaxHighlighting
+# TODO: unbundle sqlite
 
 QTC_PLUGINS=(android +autotest baremetal beautifier boot2qt
 	'+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase
@@ -45,7 +45,13 @@ REQUIRED_USE="
 # minimum Qt version required
 QT_PV="5.12.3:5"
 
+BDEPEND="
+	>=dev-qt/linguist-tools-${QT_PV}
+	virtual/pkgconfig
+	doc? ( >=dev-qt/qdoc-${QT_PV} )
+"
 CDEPEND="
+	>=dev-cpp/yaml-cpp-0.6.2:=
 	>=dev-qt/qtconcurrent-${QT_PV}
 	>=dev-qt/qtcore-${QT_PV}
 	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
@@ -59,7 +65,16 @@ CDEPEND="
 	>=dev-qt/qtwidgets-${QT_PV}
 	>=dev-qt/qtx11extras-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
-	clang? ( sys-devel/clang:8= )
+	kde-frameworks/syntax-highlighting:5
+	clang? (
+		|| (
+			( sys-devel/clang:10
+				dev-libs/libclangformat-ide:10 )
+			( sys-devel/clang:9
+				dev-libs/libclangformat-ide:9 )
+		)
+		<sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=
+	)
 	designer? ( >=dev-qt/designer-${QT_PV} )
 	help? (
 		>=dev-qt/qthelp-${QT_PV}
@@ -71,9 +86,6 @@ CDEPEND="
 	systemd? ( sys-apps/systemd:= )
 "
 DEPEND="${CDEPEND}
-	>=dev-qt/linguist-tools-${QT_PV}
-	virtual/pkgconfig
-	doc? ( >=dev-qt/qdoc-${QT_PV} )
 	test? (
 		>=dev-qt/qtdeclarative-${QT_PV}[localstorage]
 		>=dev-qt/qtquickcontrols2-${QT_PV}
@@ -88,6 +100,7 @@ RDEPEND="${CDEPEND}
 	cvs? ( dev-vcs/cvs )
 	git? ( dev-vcs/git )
 	mercurial? ( dev-vcs/mercurial )
+	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
 	silversearcher? ( sys-apps/the_silver_searcher )
 	subversion? ( dev-vcs/subversion )
 	valgrind? ( dev-util/valgrind )
@@ -99,6 +112,16 @@ for x in ${PLOCALES}; do
 done
 unset x
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.12.0-dylib-fix.patch
+	"${FILESDIR}"/${PN}-4.12.0-libclangformat-ide.patch
+)
+
+llvm_check_deps() {
+	has_version -d "sys-devel/clang:${LLVM_SLOT}" && \
+		has_version -d "dev-libs/libclangformat-ide:${LLVM_SLOT}"
+}
+
 pkg_setup() {
 	use clang && llvm_pkg_setup
 }
@@ -131,7 +154,7 @@ src_prepare() {
 		sed -i -e '/modelinglib/d' src/libs/libs.pro || die
 	fi
 	if ! use perfprofiler; then
-		rm -rf src/tools/perfparser || die
+		rm -r src/tools/perfparser || die
 		if ! use ctfvisualizer && ! use qmlprofiler; then
 			sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die
 		fi
@@ -169,13 +192,21 @@ src_prepare() {
 	done
 	sed -i -e "/^LANGUAGES\s*=/s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die
 
+	# remove bundled syntax-highlighting
+	rm -r src/libs/3rdparty/syntax-highlighting || die
+
+	# remove bundled yaml-cpp
+	rm -r src/libs/3rdparty/yaml-cpp || die
+
 	# remove bundled qbs
-	rm -rf src/shared/qbs || die
+	rm -r src/shared/qbs || die
 }
 
 src_configure() {
 	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
 		IDE_PACKAGE_MODE=1 \
+		KSYNTAXHIGHLIGHTING_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
+		KSYNTAXHIGHLIGHTING_INCLUDE_DIR="${EPREFIX}/usr/include/KF5/KSyntaxHighlighting" \
 		$(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \
 		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
 		CONFIG+=qbs_disable_rpath \
diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
index d64095b40a9a..6e0bb1ff7061 100644
--- a/dev-qt/qt-docs/Manifest
+++ b/dev-qt/qt-docs/Manifest
@@ -31,6 +31,7 @@ DIST 5.14.2-0-202003291239qtquickcontrols-documentation.7z 9331828 BLAKE2B 08d52
 DIST 5.14.2-0-202003291239qtquickcontrols1-documentation.7z 1961340 BLAKE2B 46b1795874e9e29019427259c502ddd644c5de6e985700416fff1494b199b6f518fca17e07168cb3de1a201a2754518c4055559442301254f2bd86e87b1c354f SHA512 bf715dffa72e0369faa159d67ba9bacf31154da382a87a031577729acf7caa51af55cbf2fb94ab529afbfaa5dd65f1a011ef8e52b8ce764dbfff037358d0f22c
 DIST 5.14.2-0-202003291239qtquickdialogs-documentation.7z 183373 BLAKE2B e1b1d4ddb85ce48e9c744ce7566f1ec2789b2fcf03f65c2616fa63b2a7ccdabc0a2ab60811bc723f3e9aa4bfa304b04bcd5097b0e617dd4f8c72b19d499e2ee0 SHA512 18a0914c7d398fdeb065829e9f93f51efddb58c35e43962fc891a46538807ce7dad27644acd976886fbb441e8b9e35790f4ed1271546a155da38b9dcd803a027
 DIST 5.14.2-0-202003291239qtquickextras-documentation.7z 673822 BLAKE2B d06bead9f468325f1457fd41d047797f3618322131e5fbc095c1a78e0926b020a5f3012f86f251c96d52e8d52b0d79c05f4639c19338d67f0e6de65901bb5af7 SHA512 d6fa5acb6558fc840d731da25d9061fe3dfa4e3bbb47354bc8760afe0431bcdbd1cb21491416d7773bb171108492b35e14d2f5df0fdf67e307e3ccd6fa0cc598
+DIST 5.14.2-0-202003291239qtquicktimeline-documentation.7z 149836 BLAKE2B 28cc7173aea37167a7aaada170bb0fa7fa378ddf270c6237836c47bf2b741aefd7f0454e33be4c089742644bb72b91f9aec1e00d54d837790b21349d1d66092b SHA512 b92c321d486a49a586569dd248cf9a6f49a5acb7806bd3ba60e1f29b85919d2ef79749cef644d9f53be5cb242ef9475bf1358e38bfb4bdaedb4b02f2f90de86c
 DIST 5.14.2-0-202003291239qtscript-documentation.7z 601309 BLAKE2B 24b63ae7f20f60d5e2b2c1cbbc5dc47f3f19cc1bb0bc1dade609bcb0a253f483d49359a7b2f9f508936a8c3d22802907fdb64fcf388e4c6b42cb60c6b154f2d7 SHA512 8cbff7316c0b0f2dfd302b374bb78fb6b7f4f466e886299d9c2aa22097ff2b871e4a41bad2f4262c49b065e13892f1e155f1dd6aa179b9a9e898227bb0641d76
 DIST 5.14.2-0-202003291239qtscripttools-documentation.7z 85919 BLAKE2B 9da6dfdc7bb18e4fbb6bad8326040e35e55ac8be556d8cc7e280b8fb481d56c9e26fa1f8bce4fa47acb0024bf622c2d46f99f5199cf0dd8412626c23f3b06767 SHA512 545e3b7cfe5fc2a76928e5c75866e350f2a80c7d47104171252e734e9d0c2966c4dae3100118730854f3de9bba7e1bc84167f60f44956730db0e0543a10819a8
 DIST 5.14.2-0-202003291239qtscxml-documentation.7z 622979 BLAKE2B 6243b5dc2c17eb6c0727174f61327a7a687a0af6cdc99a27d6f3c796f29358873e2fdadc2384341bf4ebe57078ada9ba2e9633c64699a280c1dd148bff273f29 SHA512 19e836eda1e1f7d9dc278a2195309665a0962ba4ba339511a2060217751de5288e137139833dc6e5825a7a5914ec66f234ceb58497058ae183f57b663b7b9cd3
@@ -85,6 +86,7 @@ DIST 5.15.0-0-202005140838qtquickcontrols-documentation.7z 9346972 BLAKE2B d0085
 DIST 5.15.0-0-202005140838qtquickcontrols1-documentation.7z 1956754 BLAKE2B 397c522177dd6f0617001ac19b4186063b6769e5f43f79d3e0106dc56b72081c2b7ce5ea8cb321cc21b56d1c1137da7c4616bb5fe670d0e2ee5d48633c58cd74 SHA512 18ae89bf4f06cd82ab1b2035cffa6836c2f44d5c279c24020e4120e6e61be468a1880d702adbcabcda42c944e0cba0206e87b927fdc3ddcfb271b86ef4adc924
 DIST 5.15.0-0-202005140838qtquickdialogs-documentation.7z 182847 BLAKE2B d4f21132d5cf64495fcff0ef67b4d013cf2232c5e9def804e451fb23cf7637c79dcf4449fbf17ab29c424381b551c24878f0831f12222a31b8e5fb6aed03f0be SHA512 99238206e08daf62ce87361a8c80cdbabf0e08e84c7b517a8cabbdc569075f619e53e4fbdf57e02473ce69aa0aa30708fcfc354702153cb765c9c1b338d37710
 DIST 5.15.0-0-202005140838qtquickextras-documentation.7z 672364 BLAKE2B 7ceda31a991583da626a37b99153c3fa96011d9c6cbedb7a5215ed630c35a981b05eea83b144c805bf8ce23205e24c9c283dd4e174942e1e238c7654dc17c2f0 SHA512 80cf53613b769baca47ef4dff59d02484da1299844473418909bc9050baac49ad502ee11071977defea636da4a550c9023484317c8f1f9ab4c309a986a49e57c
+DIST 5.15.0-0-202005140838qtquicktimeline-documentation.7z 149475 BLAKE2B 3bb26c0600d3ec05394a9a42a7f3c78b0f149158469a42a18010bc1e9d8025d335045360c5e14996b2ed5a56b3fdddb5fe3924fe8f7b6ee5f62f55a3df87674a SHA512 24de8a2535398796f39a11a5cbc8551920a9f7befc255f54de58ef5c54d5ebc7c5bde203e503ccc56ffa9a39021ab4fc4f8c927d6d812d9a592bdd2467e1b842
 DIST 5.15.0-0-202005140838qtscript-documentation.7z 598991 BLAKE2B c0884b13cac91c18de7b281f8bc8885bec318669c4f2ab33ce6e11b77ebd8638b2d93a62d816051a449b84491fea0097eeb6e0b704aeb949e4301e4cc1825205 SHA512 5dd47de26a0f6b865482a01c5a498611f8daecc727b1183b5370345c0cdc60c8858a3662ffa558c824dea42a2978ae56ac05357306ff1d65ab106c69bb16b943
 DIST 5.15.0-0-202005140838qtscripttools-documentation.7z 85666 BLAKE2B 811ebe15745781c62bfecac034dba7abbdcb5156c1bc9e214810b65fd7df1cebb53b17b31277f65134664becbf218aee2eff3b4a04937bc60c50bcff7381ba6e SHA512 9bb9f3fe7d19ea9eaafe94ed13446fc55310f209aaa69cf56bd44f8cc77fa81277836bf32ad0d23311c2e4431773d6361ff0d19fdee4ba4fcfc6b306501a7a0c
 DIST 5.15.0-0-202005140838qtscxml-documentation.7z 618965 BLAKE2B 189b2986fe8264fe7c3b72519540fbdc4ff019e93a374aa623f4175bf6aeb7019ff783b22f0f675af076c6d81facd35530a6a119e0880d66c64bcdbd983ad5e9 SHA512 14de1ef2607a8d93fc8ed1a0392911113373ed1aa5bc2fdbc06312a74c46effe7c0f18d028f02a0e557dfe5be95fd8791302676be13bcc5a5c1cfeb8d9d47ad1
@@ -106,6 +108,7 @@ DIST 5.15.0-0-202005140838qtwidgets-documentation.7z 26787886 BLAKE2B 93cb5ff151
 DIST 5.15.0-0-202005140838qtx11extras-documentation.7z 36651 BLAKE2B 1e07affdcdfe26a83f76ef63cb82a840ed3d782bd028ac0f0f54ce3a64512923e69e570864b3ace689f41f698eb238ac77453dabf86f787088c1d951a26a478b SHA512 916fb288457047ffc6f61f8271b1c5fda9b0c94e37279a6e4c08d13697fbbcdaf020a07e6b846e561792eb46c9c663d3c486daa10cc15be85495a719206a60e9
 DIST 5.15.0-0-202005140838qtxml-documentation.7z 456330 BLAKE2B 362d5c395289d3fb250992bb7904f58270abe5ddcbdf47b2558e4078fb9060d6aafcfe14a3cb80dd90f36e68dce9e15f523afced066eae32b55c380661589e3c SHA512 790dc3b472a0a9c0acb9c20d12f645278bb6e70de9767f2aed59dc7079b853b0f4fb6466ff9bb62c507f4a0064c10e469401ddcd2057c9c23d2372b441cf3566
 DIST 5.15.0-0-202005140838qtxmlpatterns-documentation.7z 1191223 BLAKE2B 8113e532de5d1cfe11a3f4765da685ef0ec6172584189f005d37eda5aae42d784143a4abc810d4e49ef097657af03afb20385d1921f1dd0e7e030caae142c1aa SHA512 b534fe6d81acaa60ae1c243e41d173b0d84c4ed01fc4b0e55d50ffbc6c10530064d779b9f67a6e357c9ab94e77e01f7565d60bc7884d2dd44e8aa569489070e9
+EBUILD qt-docs-5.14.2_p202003291239-r1.ebuild 3066 BLAKE2B eb79fd4283c765a71f5fd60c475bc0d9ce807a95ead1719ceaf2b37ed11e6e2bdcd2ff2db8e7960040ff9ae67e809319d26c132a1a2a7b06cc31a90f616bc1ab SHA512 664feddd58aa974de01a00b8153390b41ab5377cfc61599a45d227f73c6ed2d8ff2fd1d615e9d07ef05fcd69a1c55ed272f0c36ddd22d9fbf7c3d2ba22dce602
 EBUILD qt-docs-5.14.2_p202003291239.ebuild 2968 BLAKE2B 05273c473995b9c11c5070c6dc38fef31a5b742a71151a77b7b68148704342a8c0ad8c52ff74c9d270300761272f1195a69a2a7c37106fdb0404fad7b797df67 SHA512 0195382e1ccf86f7fd4567922077c636fd7dcff58219302b550037508232dd7ec7e7e036ef2a69525c1d35c4b64581e6f3c2d52c44b774f59fc6c9f85b30e939
-EBUILD qt-docs-5.15.0_p202005140838.ebuild 2971 BLAKE2B 662b11ab88d36ed1335eb1320dacdd0242db8d3a028fd06eb18a339fc3af9ca873eb896b0b9a7aef82071d54929b1aa522d3b45c4e7af9411f19b39ba26a3e69 SHA512 6a868d567e6f140d95200b37510f442cf35c319100d9365ea9cc9a0db2927a8fda3880486d1a87951c16543ded3c8b715cef94318cfe60aa9d3a01dd66a48953
-MISC metadata.xml 3896 BLAKE2B 9ddb79d566a10dffbccfc8fca4f970c1a49b1d2c3f6885474d1919e1647a403877c565b186da92a5823ec49c0e4af92a4478643c608574f2e3b5675334bef2aa SHA512 6418b810cf78d5acee499340352b30589d483c8be74a9412cf9c7a43534b7c5d37fa9e2d5a49e2be079d40e0120e738fac21132ccc04f64aca12895bc3865c80
+EBUILD qt-docs-5.15.0_p202005140838.ebuild 3066 BLAKE2B eb79fd4283c765a71f5fd60c475bc0d9ce807a95ead1719ceaf2b37ed11e6e2bdcd2ff2db8e7960040ff9ae67e809319d26c132a1a2a7b06cc31a90f616bc1ab SHA512 664feddd58aa974de01a00b8153390b41ab5377cfc61599a45d227f73c6ed2d8ff2fd1d615e9d07ef05fcd69a1c55ed272f0c36ddd22d9fbf7c3d2ba22dce602
+MISC metadata.xml 3987 BLAKE2B 88a562c2f30685b8f20c14398020923ad320cfe14eedc8ca8bacb1ebce44857cc7795618376c4a66625ca30b50dfc0b348acfad8c323c83d10630af37d3e6b19 SHA512 0ef66e7526514436fcdece85ff01b17f6aff031a50ad2d7a1e86b04140d25de56645cc634290c41a1ae0dd077963afd7799341597158bf6d6d0b7a79c3884342
diff --git a/dev-qt/qt-docs/metadata.xml b/dev-qt/qt-docs/metadata.xml
index 37201cd0276d..af49c1ea8e0e 100644
--- a/dev-qt/qt-docs/metadata.xml
+++ b/dev-qt/qt-docs/metadata.xml
@@ -39,6 +39,7 @@
 		<flag name="serialport">Install documentation for <pkg>dev-qt/qtserialport</pkg></flag>
 		<flag name="speech">Install documentation for <pkg>dev-qt/qtspeech</pkg></flag>
 		<flag name="sql">Install documentation for <pkg>dev-qt/qtsql</pkg></flag>
+		<flag name="timeline">Install documentation for <pkg>dev-qt/qtquicktimeline</pkg></flag>
 		<flag name="virtualkeyboard">Install documentation for <pkg>dev-qt/qtvirtualkeyboard</pkg></flag>
 		<flag name="webchannel">Install documentation for <pkg>dev-qt/qtwebchannel</pkg></flag>
 		<flag name="webengine">Install documentation for <pkg>dev-qt/qtwebengine</pkg></flag>
diff --git a/dev-qt/qt-docs/qt-docs-5.14.2_p202003291239-r1.ebuild b/dev-qt/qt-docs/qt-docs-5.14.2_p202003291239-r1.ebuild
new file mode 100644
index 000000000000..9014281d55fc
--- /dev/null
+++ b/dev-qt/qt-docs/qt-docs-5.14.2_p202003291239-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PV_FULL=${PV/_p/-0-}
+PV_NODOTS=$(ver_rs 1-3 '' ${PV%_p*})
+BASE_URI="https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_${PV_NODOTS}_src_doc_examples/qt.qt5.${PV_NODOTS}.doc"
+
+declare -A QT5_DOCS=(
+	[3d]="qt3d"
+	[assistant]="qtassistant"
+	[bluetooth]="qtbluetooth"
+	[concurrent]="qtconcurrent"
+	[core]="qtcore qmake qtdoc"
+	[dbus]="qtdbus"
+	[declarative]="qtqml qtqmltest qtquick qtquickdialogs qtquickextras"
+	[designer]="qtdesigner qtuitools"
+	[gamepad]="qtgamepad"
+	[graphicaleffects]="qtgraphicaleffects"
+	[gui]="qtgui qtplatformheaders"
+	[help]="qthelp"
+	[imageformats]="qtimageformats"
+	[linguist]="qtlinguist"
+	[location]="qtlocation"
+	[multimedia]="qtmultimedia"
+	[network]="qtnetwork"
+	[opengl]="qtopengl"
+	[positioning]="qtpositioning"
+	[printsupport]="qtprintsupport"
+	[qdoc]="qdoc"
+	[quickcontrols2]="qtquickcontrols"
+	[quickcontrols]="qtquickcontrols1"
+	[scxml]="qtscxml"
+	[sensors]="qtsensors"
+	[serialbus]="qtserialbus"
+	[serialport]="qtserialport"
+	[speech]="qtspeech"
+	[sql]="qtsql"
+	[svg]="qtsvg"
+	[test]="qttestlib"
+	[wayland]="qtwaylandcompositor"
+	[webchannel]="qtwebchannel"
+	[websockets]="qtwebsockets"
+	[webview]="qtwebview"
+	[widgets]="qtwidgets"
+	[x11extras]="qtx11extras"
+	[xml]="qtxml"
+	[xmlpatterns]="qtxmlpatterns"
+)
+
+DESCRIPTION="Qt5 documentation, for use with Qt Creator and other tools"
+HOMEPAGE="https://doc.qt.io/"
+
+LICENSE="FDL-1.3"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE="charts datavis +html networkauth +qch script timeline virtualkeyboard webengine"
+REQUIRED_USE="|| ( html qch )"
+
+SRC_URI="
+	charts? ( ${BASE_URI}.qtcharts/${PV_FULL}qtcharts-documentation.7z )
+	datavis? ( ${BASE_URI}.qtdatavis3d/${PV_FULL}qtdatavisualization-documentation.7z )
+	networkauth? ( ${BASE_URI}.qtnetworkauth/${PV_FULL}qtnetworkauth-documentation.7z )
+	script? ( ${BASE_URI}.qtscript/${PV_FULL}qtscript-documentation.7z
+		${BASE_URI}.qtscript/${PV_FULL}qtscripttools-documentation.7z )
+	timeline? ( ${BASE_URI}.qtquicktimeline/${PV_FULL}qtquicktimeline-documentation.7z )
+	virtualkeyboard? ( ${BASE_URI}.qtvirtualkeyboard/${PV_FULL}qtvirtualkeyboard-documentation.7z )
+	webengine? ( ${BASE_URI}.qtwebengine/${PV_FULL}qtwebengine-documentation.7z )
+"
+
+for DOCUSE in ${!QT5_DOCS[@]}; do
+	IUSE+=" +${DOCUSE}"
+	for DOCTAR in ${QT5_DOCS[${DOCUSE}]}; do
+		SRC_URI+=" ${DOCUSE}? ( ${BASE_URI}/${PV_FULL}${DOCTAR}-documentation.7z )"
+	done
+done
+unset DOCTAR DOCUSE
+
+BDEPEND="
+	app-arch/p7zip
+	media-libs/libpng:0
+"
+
+S=${WORKDIR}/Docs/Qt-${PV%_p*}
+
+src_prepare() {
+	default
+
+	# Fix broken png file, bug 679146
+	local png=qtdoc/images/used-in-examples/demos/tweetsearch/content/resources/anonymous.png
+	pngfix -q --out=${png/.png/fixed.png} ${png} # see pngfix help for exit codes
+	[[ $? -gt 15 ]] && die "Failed to fix ${png}"
+	mv -f ${png/.png/fixed.png} ${png} || die
+}
+
+src_install() {
+	# must be the same as QT5_DOCDIR
+	insinto /usr/share/qt5-doc
+	use html && doins -r */
+	use qch && doins *.qch
+}
diff --git a/dev-qt/qt-docs/qt-docs-5.15.0_p202005140838.ebuild b/dev-qt/qt-docs/qt-docs-5.15.0_p202005140838.ebuild
index 466a8de3c9dc..9014281d55fc 100644
--- a/dev-qt/qt-docs/qt-docs-5.15.0_p202005140838.ebuild
+++ b/dev-qt/qt-docs/qt-docs-5.15.0_p202005140838.ebuild
@@ -56,7 +56,7 @@ LICENSE="FDL-1.3"
 SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
-IUSE="charts datavis +html networkauth +qch script virtualkeyboard webengine"
+IUSE="charts datavis +html networkauth +qch script timeline virtualkeyboard webengine"
 REQUIRED_USE="|| ( html qch )"
 
 SRC_URI="
@@ -65,6 +65,7 @@ SRC_URI="
 	networkauth? ( ${BASE_URI}.qtnetworkauth/${PV_FULL}qtnetworkauth-documentation.7z )
 	script? ( ${BASE_URI}.qtscript/${PV_FULL}qtscript-documentation.7z
 		${BASE_URI}.qtscript/${PV_FULL}qtscripttools-documentation.7z )
+	timeline? ( ${BASE_URI}.qtquicktimeline/${PV_FULL}qtquicktimeline-documentation.7z )
 	virtualkeyboard? ( ${BASE_URI}.qtvirtualkeyboard/${PV_FULL}qtvirtualkeyboard-documentation.7z )
 	webengine? ( ${BASE_URI}.qtwebengine/${PV_FULL}qtwebengine-documentation.7z )
 "
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 96664cc4a9f7..fe84bc10d748 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -4,7 +4,6 @@ AUX qtdeclarative-5.14.2-fix-subpixel-positioned-text.patch 3141 BLAKE2B 98aa282
 AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbfe541ba51745f62e3f02111a2f455c6d1a7959c7980284e3a655ce8335d4a166d65570f2b9d236c681d155c015cc14dc3bb54af SHA512 cd410c0e731a1e096bd8a77b7ecc769a5e3503f7a2f12668f2f4f1c3099973eaa2060d97708962e422c580ee76ee3db3712834cd994b7e1aeeb57c0a4c3b0b3d
 DIST qtdeclarative-everywhere-src-5.14.2.tar.xz 21305980 BLAKE2B 0ccbae8ddc46f4891af6732a4b3cf874c523c7ded5a06f78c7c5cd290fef8e32ad6efe5dcffe947024144128ab2f1108594e4a30da9ca79e1ce3008c73ca2a25 SHA512 48d3a547237514a8bdc2a4c0b3f97732abceacece0e0899d2f33787293eb99f54c28efce35a34b8c46dcd4d78ebbc88bfc820bc68496076eacace40aaceee004
 DIST qtdeclarative-everywhere-src-5.15.0.tar.xz 21493268 BLAKE2B c6b8365caa3e0eef3023d727adf086c16bafc171bcfa839a4dc83132b5c9a76c9a849b387f3815c1a9b12db5824ccc628cad22efd0ce0cb70059971cadfbb00b SHA512 0ec3403286efea6d6ac975ea6bd4464ea656c031f5f27b852235fd69d316a627ac3ff2ea2c3cca0a5375ca278f592df3ecade4e98aa15ec92816a16927f56e5e
-EBUILD qtdeclarative-5.14.2-r2.ebuild 1338 BLAKE2B 1cfe2dc4bb2dc7c9466c0cc2c69d272b3d4fd30be3035ab2999b9fd65f9453d855bab3a3bc79edb3d99038f30c380b1b26dbc7c8232c3f85f8c9142e73bee960 SHA512 f46b45e34b7ab08daa2466b6f5699055539a7901901082afb20d539fe8dedecc8978178f878f0e958612f27da759e448345ceb9e6174b71b6b23f437e6b103da
-EBUILD qtdeclarative-5.14.2-r3.ebuild 1421 BLAKE2B 759cf174be108b8d039158bfb67a82380e18bb6803bdfeac106249c1b80e126e23e2d141b36bd1a2ed74825ba3ceee6a9baa63f370fb4b00f9398698fec85e0c SHA512 9fc7eba36fa39f1cbc799a43aca9f704ea74b27397c950e180e73d87cad81f7280c42e7e7bef5bcefb002d56a3ca4c04755560402369304c80f12f19bbad9400
+EBUILD qtdeclarative-5.14.2-r3.ebuild 1417 BLAKE2B a7f6734e157acb79488a3e3cf283ccd909de12c1ffafdbc293c78179f5c37ac4a605e8916f1e047f7d4847e0391e38639b713904fccf31f8f0de466cad2d7351 SHA512 2a191231c2d9af1cd75adb94e9c1bee95894e75844234308b5169ad8eb4079c395156110a135b84ffb562bf22d7529a9a103adcf3e8832c474945b7770c34dfe
 EBUILD qtdeclarative-5.15.0.ebuild 1360 BLAKE2B 5d66999c92120e357aed3ac2828c8163fbe2f854be4794a4cf793417014a60a16adc794fa9cea50340c8df185c94a7aea5f1b6efd46aa0890765a9684118a816 SHA512 ae0b1468d90fef120f0e22cbe09bc2d33838d30f188167d54addb32f4f286377145b447f6dd4d0e4e914f528182e2b648079c8649ec5f2e0491544e077354fdf
 MISC metadata.xml 700 BLAKE2B 80c5bfdd7c6acd05795c20b36d062b76458fc4b3f83835eef83ed2f304e70dbae9dfe81908bf33e41fd944de4cc754e5f839451cf4c8ef4f06063817730b7cf6 SHA512 f1fbc57d96dc5b481d08da8c73ab9d1e183045ecefeb075a7ee8f1d6733583589077e3650ad5b2d52e4cafc67bf0894ae62fd4500e1974053e46d6a89377f3fd
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r2.ebuild
deleted file mode 100644
index 24d7551a2fd7..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2009-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit python-any-r1 qt5-build
-
-DESCRIPTION="The QML and Quick modules for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE="gles2-only +jit localstorage vulkan +widgets"
-
-BDEPEND="${PYTHON_DEPS}"
-# qtgui[gles2-only=] is needed because of bug 504322
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2-only=,vulkan=]
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qttest-${PV}
-	localstorage? ( ~dev-qt/qtsql-${PV} )
-	widgets? ( ~dev-qt/qtwidgets-${PV}[gles2-only=] )
-"
-RDEPEND="${DEPEND}
-	!<dev-qt/qtquickcontrols-5.7:5
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
-	"${FILESDIR}/${P}-fix-subpixel-positioned-text.patch" # QTBUG-49646
-)
-
-src_prepare() {
-	use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")
-
-	qt_use_disable_mod localstorage sql \
-		src/imports/imports.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/qmltest/qmltest.pro \
-		tests/auto/auto.pro \
-		tools/tools.pro \
-		tools/qmlscene/qmlscene.pro \
-		tools/qml/qml.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		-qml-debug
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r3.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r3.ebuild
index e75b8c2887e3..e306c7574439 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r3.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r3.ebuild
@@ -8,7 +8,7 @@ inherit python-any-r1 qt5-build
 DESCRIPTION="The QML and Quick modules for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE="gles2-only +jit localstorage vulkan +widgets"
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index ba9f95a94ed1..0ccee4756946 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,7 +1,6 @@
 AUX qtmultimedia-5.14.2-gstreamer-buffering.patch 1516 BLAKE2B 8e80c834a0bb5cc4bcd7b0995a62c7d23777ac4ff5ebe22dad4eb09c0428253b3a4ba28fc6440f5461bb5e1be1c32a3f7f63e63a20a19a6ab750884e26f8f643 SHA512 2ba151ea48aa5dee3e670cfe9b03adfe1ceef23e15d79fdbe2eedf7bb42bf406b8753d2a00fdf14953b6730503bd98687e760cec36b77aface52dc88a06810e0
 DIST qtmultimedia-everywhere-src-5.14.2.tar.xz 3793964 BLAKE2B 98f408e9a3ea48c053797ec20139d134a50d623a4092665695a435c754ee85a369830b23cc5ccce3d9a099cf707c1b28c2529050ff60d3f93f26809b3b2593c4 SHA512 5ebee0f96334d58b74ae344875aa93d32bfdd7c906856f84152e9ae0a3ebb12f627a0d3ab4552031b70c20ad59db1674b1a261ed0828e1efcc6ab48ba3718559
 DIST qtmultimedia-everywhere-src-5.15.0.tar.xz 3796364 BLAKE2B 3ab2137f811910c25c86aee10ee8266729ba186412bb0d61c02c655573cff66c2725f30c3d8782473820a1b9e0388d9fdb24c218c09afdcde26d899039bd7bb6 SHA512 120ff3be99c685fb5944da657d571d83c985e139a34b23f7527daf2a0fdde949a452d4c3691b41a86ed3f141decf1833f496b3b61fd87bc602b8164563cb79d6
-EBUILD qtmultimedia-5.14.2-r1.ebuild 1539 BLAKE2B d04ab86cfae242d4c54fa07a2964f0e1e2bf0d4c7a786f1af16bab48cbe41450a70ab9ffc57293ffa307a79019602e91e9b4998fe31ec167bc9cff176207fabe SHA512 660b1673b738f663e7a83a91420e0458d0582ca590fa6f9efb21d926afeca8d73a0ab1c29c097df68f74990699972b87bd3617490d53a42fa5146137a46aeeb7
-EBUILD qtmultimedia-5.14.2.ebuild 1462 BLAKE2B 9036ccdd8a1690afdf2a8fb07a38aed37365cc7a9059a192120c8a2136caff7ab592f9eb76308a85f285a50af4f074a4785c4340403bde2da72d49855a99982e SHA512 b4a2434eb36eddb127ee7f0d73c3af7c0c55950fe350dea2bdf7544bd9c91a3c30edb0ddb7548fc866f70c0068a60838aea8f5349fee7be8749ff14a35f4d00d
+EBUILD qtmultimedia-5.14.2-r1.ebuild 1535 BLAKE2B 94348292c210c42a846f888384cee6d863cc0c0d6dc27f2c63cfbdb7119f4460b648f7b9ae92e9437f526d4c9d5fd1968369521b019c58ee0da166109d26ba92 SHA512 a46fb3b2e26d3dbd6235236899632b29d0226b4734a93b94c163436e86f3866b1279f6d7ba9ff9b4cd2d729bb3e17bf958d1391cb85e5eca52d52a355ad656bc
 EBUILD qtmultimedia-5.15.0.ebuild 1468 BLAKE2B c0b9361755a7a2c37196ff417c2875c498a61e3e5a3c775a06cebbac9948242a960802bfb3b97cd21ae564763e71562563b550bf69151bcbfcb4d7e09e9cc1ec SHA512 f152a6f0fdec63bd1f699e15a79802d3a2b347e2dba7362a4d56dc8f0c22c70fecc30ee5d68ff1421226c04810496c1456dd39a2a66d5f781443d1927ea8b47a
 MISC metadata.xml 732 BLAKE2B f07c73041fca311cdae68d67a638926bcc124a879cb39d92a431c42c2eb5fdec65a483a24d4931534ecd0299a655c584fccd5d42d8694902a64e0da6d64c627e SHA512 bf4f77d5e918dccac25a31bba310f8a508efa0f0ccbe5c142b48443205f44e50477a46d7c363ba9313c623ff68d5a9bdf1dc699aa6ec3fbb3ab6b14afd1eff55
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.14.2-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.14.2-r1.ebuild
index 0382c0343d65..fdcd87079b9e 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.14.2-r1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.14.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-only gstreamer openal pulseaudio qml widgets"
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.14.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.14.2.ebuild
deleted file mode 100644
index 33eb59e9fbe4..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-5.14.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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"
-fi
-
-IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2-only=]
-	~dev-qt/qtnetwork-${PV}
-	alsa? ( media-libs/alsa-lib )
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	pulseaudio? ( media-sound/pulseaudio[glib] )
-	qml? (
-		~dev-qt/qtdeclarative-${PV}
-		gles2-only? ( ~dev-qt/qtgui-${PV}[egl] )
-		openal? ( media-libs/openal )
-	)
-	widgets? (
-		~dev-qt/qtopengl-${PV}
-		~dev-qt/qtwidgets-${PV}[gles2-only=]
-	)
-"
-DEPEND="${RDEPEND}
-	gstreamer? ( x11-base/xorg-proto )
-"
-
-src_prepare() {
-	sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
-		src/multimedia/multimedia.pro || die
-
-	qt_use_disable_config openal openal \
-		src/imports/imports.pro
-
-	qt_use_disable_mod qml quick \
-		src/src.pro \
-		src/plugins/plugins.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/gsttools/gsttools.pro \
-		src/plugins/gstreamer/common.pri
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		$(qt_use alsa)
-		$(qt_use gstreamer)
-		$(qt_use pulseaudio)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index e97109fcc853..1893b8e9ab59 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -2,7 +2,6 @@ AUX qtnetwork-5.14.2-CVE-2020-13962.patch 7797 BLAKE2B ad7f5fbbbafe784c7f88877f8
 AUX qtnetwork-5.15.0-libressl.patch 15934 BLAKE2B c4e3a48a345245150994f4edbac1b5289373518245eebbda34767d54a22d07890e0e44338647b42cb240ea42901226b5077170cdd84243ad1a8bcb34e492424c SHA512 e4c7dffb665ee1b0a64631a64abf5aa06d188983e30102e8ebaafdfb66db77f4dd116ee62665fee588dbf0c6ae33abe7a940bab3cbcb6f14c5bc9c0decd3076f
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
 DIST qtbase-everywhere-src-5.15.0.tar.xz 49931940 BLAKE2B f6675ddb8c6fcfe4d12f92b0c93d09ec160e65bb214694550c82c1ba1acea41c86064910cf76267815bd860b071a322bbbad19e994be52f0bf1450a73d09a1bf SHA512 c584d69e49f4959d9b8541f820f5ff1e6d1599697ad16976b47cbaaa902fc83e1ca4ae57d56d13574e42e5f602d4420245ad7fcfc13e224e10d4bbad6a537d1a
-EBUILD qtnetwork-5.14.2-r1.ebuild 1477 BLAKE2B 7184815bce2ff20e95adf7d5ec2a1647e24c12296978b6f23072307512e361fa17fd53306a56473a6cfbf0d01ddb1fae0f62de555e6e07c2e6ee6573a824c069 SHA512 00716703455019ab67331b32468d71fe6114cf8f5770666af32dfcac28ce41ad4f123fcdcaeba2d9ca49a382428381ea840e7187ca23a909f5c20b27746dced9
-EBUILD qtnetwork-5.14.2.ebuild 1393 BLAKE2B aa17c38a93c91e1d11be0c6f5731a010a4984d1b01c2e33ba9cc670db0b57cb0286fa594801182f8febd52e653b6dc8b5848e94ed18446d9c9451faa6bf9dab9 SHA512 408505f59f2c0d49780f832eeb1c1264e70ebdc3ae84e0c9a3c7e730dfdd1235e5cf545133f2e376e3c8ea4add9d2601388a492ad658b1b1856900acbe787386
+EBUILD qtnetwork-5.14.2-r1.ebuild 1473 BLAKE2B 4d867f30a6e11d2ae59c2d85b470aae5e5f697c31f9fe046dacd1c5389e1ae931042accabcffa41db58227b2ad4c8550f6741e6262aaddb6a79b5a77be73fb45 SHA512 6e3bec5875b1ba8919cf1aa46e678a51294f58f8af26211ae3d531023cc0fc70b285e7bc8b19abf9712c97124c498b41850550e047915de00868d2ff41cf0062
 EBUILD qtnetwork-5.15.0.ebuild 1549 BLAKE2B 7e3344b37988416d12b6cca4fac784589ae65adbc64165fd96d7e8c9d166b10acd2a5f95f59ed4bd877a9245b6ed5ff438aa6e648634b358ae043d668e352bb4 SHA512 e227aa30bbe97b8b303c858b42e83890cd0731faf9c518971d27687ae71246ac53035b3371d3ff9d4e6cff9496cdc5b6d33bfd98edac830f5b0096bfb4e2c705
 MISC metadata.xml 957 BLAKE2B 5c888322d402a3f037e194bd13001ff3a7e449fe423b8b4661c4b1365263a63e105be92ab0bd6a99ae79e7e8062c65e52e9e04763f9c15c50cb28c1215a06b0d SHA512 aa07869c984c4c2d7653820213b94fa4db247e4e30f0efad8df64c09b2578cd2143ab81890584521e1f561953312abb36d8e049dabd42893fecefea4182f176a
diff --git a/dev-qt/qtnetwork/qtnetwork-5.14.2-r1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.14.2-r1.ebuild
index b627687281a2..e26d2f3855c0 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.14.2-r1.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.14.2-r1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Network abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE="bindist connman gssapi libproxy networkmanager sctp +ssl"
diff --git a/dev-qt/qtnetwork/qtnetwork-5.14.2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.14.2.ebuild
deleted file mode 100644
index 88dfeb7a1579..000000000000
--- a/dev-qt/qtnetwork/qtnetwork-5.14.2.ebuild
+++ /dev/null
@@ -1,62 +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="Network abstraction library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE="bindist connman gssapi libproxy networkmanager sctp +ssl"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	sys-libs/zlib:=
-	connman? ( ~dev-qt/qtdbus-${PV} )
-	gssapi? ( virtual/krb5 )
-	libproxy? ( net-libs/libproxy )
-	networkmanager? ( ~dev-qt/qtdbus-${PV} )
-	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
-	ssl? ( dev-libs/openssl:0=[bindist=] )
-"
-RDEPEND="${DEPEND}
-	connman? ( net-misc/connman )
-	networkmanager? ( net-misc/networkmanager )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/network
-	src/plugins/bearer/generic
-)
-
-QT5_GENTOO_CONFIG=(
-	libproxy:libproxy:
-	ssl::SSL
-	ssl::OPENSSL
-	ssl:openssl-linked:LINKED_OPENSSL
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:network
-)
-
-pkg_setup() {
-	use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
-	use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
-}
-
-src_configure() {
-	local myconf=(
-		$(usex connman -dbus-linked '')
-		$(usex gssapi -feature-gssapi -no-feature-gssapi)
-		$(qt_use libproxy)
-		$(usex networkmanager -dbus-linked '')
-		$(qt_use sctp)
-		$(usex ssl -openssl-linked '')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest
index 4a7727b71345..e934de3908cf 100644
--- a/dev-qt/qtquickcontrols2/Manifest
+++ b/dev-qt/qtquickcontrols2/Manifest
@@ -1,7 +1,6 @@
 AUX qtquickcontrols2-5.14.2-account-for-scale-before-positioning.patch 2268 BLAKE2B e321a635cc94d92245291539d862aa1cfc63bc6a558d6ddc792800be409dff11b1777349aed394d0e9df5dbfae29cd71681271eda1c68745af3ec1e1e76eabed SHA512 6d559d5c128e0046319fb8d6bdd3914a30eae41315efd267e6271c3f69759024abb79c7cb3a604c8bb58936a2daf25fd1217ee877516b65b8d5262fd76dac39f
 DIST qtquickcontrols2-everywhere-src-5.14.2.tar.xz 8153752 BLAKE2B d1803007fb016276b75db9102ebfd82a6afa279b845d3507a04b76c2ab6fc8345840f3ea76c12607ed2b7be11e2b2c26bb76ff84b65a4c8df7cf9c66dbd95003 SHA512 de8b669417c2d039c0f49e805be72e757877991bc3c7feb13417202a4964cb6391924837751c520ed6234930e90dfe00417ca1c369418b2cdf4f09da679ba722
 DIST qtquickcontrols2-everywhere-src-5.15.0.tar.xz 8164236 BLAKE2B 7e5e2b2640d6eda1864d04a397f91e69a79b5b0590097f2c8a9a06e26ec8f9a0c09028f2fec87acba91d0df568d6085eae50ccb7962c50be6a3de64088f122b6 SHA512 560014b882ef9d274cb1532025cae79987eec3569541e111e91f047261fcd7f26fcb40689d8dd6921ae26fbf9cdee60a87d3a1c7212e547529ff4adf9c5cf136
-EBUILD qtquickcontrols2-5.14.2-r1.ebuild 697 BLAKE2B 4b940ac4ef6991a3cea58e3563240ce0d3ae9ba4f070c86cf2de7a98325087e405934427fca5e4e0198928935a446f55ffbb9433c17c38796a0278092634d486 SHA512 fb36c3016333e77ed78de7286d7467dd832aebc500f1b367c91ae7cacfb4800b7907f8d78da0f01786bda3885bb2371ba9a1d58431f5dccb190d7f85b05fdb25
-EBUILD qtquickcontrols2-5.14.2.ebuild 606 BLAKE2B 0d3d0105694c0a2be2ea02a6a4605dc3174de9535b4997f35a7dce5bb73ec782767e871e95ab1ff16103bc214eb9753b01085d1919827ad64d31b8cb6381f8bc SHA512 37a4182eb357133277b9e40af464ddf2d8cb0fd2a4990de23e986f5e764249e61a09674493042b13da62be44097fb3d717495161d771a99500241cd1db00fe0e
+EBUILD qtquickcontrols2-5.14.2-r1.ebuild 696 BLAKE2B eb186869701f065ef1b1f8bd3e51055bf796c388dd9f4511fbb5471911e193a0a9d451fcf3a1c1bde2699123420345c08c20ca6df221ea33cabc78b376fafada SHA512 c6103cf3fdabf9b9c105426032b0c41ee3397aa94363d098cc06e1abde3d1cd46591022c9d845b4c8a41eea3605eca126715b3e471c8623f55d2d4098c4932b4
 EBUILD qtquickcontrols2-5.15.0.ebuild 609 BLAKE2B 1406936acf30b318039b6616e2e91f0fce406aa4ac70566c4ace70105ab71325b436af86f8c9144adf2e928fa9257d47a6e2913c5f903ed53b48135d9593d7f3 SHA512 3e005ce1c3ffcf1090cea4d536bcd00328cb657cdefc9bb311bbf14fe072d7533b05b8cd41c66f0661feec85482883a01d3e52eb97da202e6513b6002448da93
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.14.2-r1.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.14.2-r1.ebuild
index 58fe1ee53d9d..05d48cade927 100644
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.14.2-r1.ebuild
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.14.2-r1.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="~amd64 ~arm arm64 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 fi
 
 IUSE="widgets"
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.14.2.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.14.2.ebuild
deleted file mode 100644
index d9241d146306..000000000000
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.14.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=7
-inherit qt5-build
-
-DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-fi
-
-IUSE="widgets"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	widgets? ( ~dev-qt/qtwidgets-${PV} )
-"
-RDEPEND="${DEPEND}
-	~dev-qt/qtgraphicaleffects-${PV}
-"
-
-src_prepare() {
-	qt_use_disable_mod widgets widgets \
-		src/imports/platform/platform.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtquicktimeline/Manifest b/dev-qt/qtquicktimeline/Manifest
new file mode 100644
index 000000000000..2245c0d3bd2d
--- /dev/null
+++ b/dev-qt/qtquicktimeline/Manifest
@@ -0,0 +1,3 @@
+DIST qtquicktimeline-everywhere-src-5.15.0.tar.xz 102460 BLAKE2B f563ba5ab8ec1171e32a85422529a9e4e14833377091f3bd66d3f72b14671acc74db9dd11f3d56719921bb516ead885ce6cf994f8b00ea6a734a0f7b9371c451 SHA512 14e0f52800bf7b347f03264f306f2c13f4c0bf590c8881135b3bfeb1a08cd07248345de7ab7d3ae9af39f75a5247c0c9f98dde33466481995e45a93717a937b0
+EBUILD qtquicktimeline-5.15.0.ebuild 373 BLAKE2B e4a74904400302a2ea41bbe2e7c1bfdb3328680237bffc51ce7baf646466622db9d79ec63074cf8d5346a2d2ac40809fe38065cc4dda22b1581437acd4bb8640 SHA512 aa4cfecbe7c393c19018f224954bd0161de3977fe1b64f99a68c0a935dbf8a99383fc4817ea3e8cb7339b1da96ad643fa4fc30dd778c440508b351f1c2bbd675
+MISC metadata.xml 382 BLAKE2B 3b12c68b32cd705b033f8750db3115587b76d52369a33481330d100e3bbd22dbfbcc0ea065f7659e6771af923477f2fbd1d4fc86743d13fc64f194e7b014567b SHA512 4825235a64c6320484a0bfd188dc1f4a0686f6222ee4abd29d6904899eed14f6471358562e8f08cd9b90743a718383e980925a432917dbbe3abba1872c631951
diff --git a/dev-qt/qtquicktimeline/metadata.xml b/dev-qt/qtquicktimeline/metadata.xml
new file mode 100644
index 000000000000..c3b4f7735310
--- /dev/null
+++ b/dev-qt/qtquicktimeline/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/qt-5/qtquicktimeline-index.html</doc>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-5.15.0.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-5.15.0.ebuild
new file mode 100644
index 000000000000..109d4654f8ba
--- /dev/null
+++ b/dev-qt/qtquicktimeline/qtquicktimeline-5.15.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="Qt module for keyframe-based timeline construction"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+"
+
+RDEPEND="${DEPEND}"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index c518840bdeb0..75e2ac0f631f 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/asciidoctor/Manifest b/dev-ruby/asciidoctor/Manifest
index 716dc76c9669..919a33c94500 100644
--- a/dev-ruby/asciidoctor/Manifest
+++ b/dev-ruby/asciidoctor/Manifest
@@ -1,5 +1,5 @@
 DIST asciidoctor-1.5.8.tar.gz 583484 BLAKE2B f0c654c5e43a0ed061dbf80eb382fac1ea393870c7c2530649a5a41f1a5bd5e72ffb11e8ad8dd2925510e18f4528079ae532b623e6e7f38a119565df01139f58 SHA512 3f767cdf945361d81b0a89137fb1e77377cbb4171da790027cbb9cd8cf1deb03f24a8ec780b427b7bce34538e851a44682515fbaccf8558d61e22356b9d216dd
 DIST asciidoctor-2.0.10.tar.gz 613180 BLAKE2B 46125c85276eb0c7cf4404ca04d854449233e2cd14e24687aed9f95eb64ceb6ebac3d3ed73918679b9a5b047e41d82d02383d0e08acd0df5cc9bc216f14c79a3 SHA512 9ef908081569188d9903c7a7619fe0b50197f6f0cc922c4070e116bcd3f988a55da87443e84b6e260aabcc653a804fcaf29b96a722ab36f7ebb27ec11eb7ddbe
 EBUILD asciidoctor-1.5.8.ebuild 960 BLAKE2B 9d86a4941af51a7000636ca77cb49a00586a9887137db078fa3e042ffe780b844cf2d7b1c8b591104cd741d219a72acf42572d7d1bf05aded09f969a8f29bb41 SHA512 7bd9c94f4f5067fc7538aca45d631897ec6f8d682077c8a105e47d2bd870b4a72abec6bb22f6197fcb285c6e974aaa82d156bca6cf4d7f2c5166ea3c7aa73da3
-EBUILD asciidoctor-2.0.10.ebuild 981 BLAKE2B 29b52eeedc2d3d663186a421915dbb4679de1fd974457c0df55fb878b6dcc1ad188051eb2377454c05563c2c6c8c22b72ec5e8756cc77ad85990e08db9be4329 SHA512 32251d550bcfc4daa8944904053c070662e0f9ea1750b8a4f6da4331eb8e366827642752427de9f5e4ea31ef9bc45a941ab62e1d0bf7c7ee5542d6823a406ed4
+EBUILD asciidoctor-2.0.10.ebuild 981 BLAKE2B 3fe164d46e60b6ff44f233b04d0d5157c69671093cfa970b531ea17d978707bfbf65593e77fdb0ce13547e367749f38f323ff9863443d3f1b16e9d55477a9a77 SHA512 dd122276dc5bdae342ebbd06440bad0226a167c6089b16f28fe06102c27e14f9b3fc4dcae2c095871d95c01ad03076aede4ed850abfe9c25b484047c198d8d19
 MISC metadata.xml 349 BLAKE2B 65a3f6dbbe523d1017d78e939c291e40edc3429d06ff16bd0f8150f3879e2b0840619653115be43c876d1cfeea8e95a3e29fea7447b18bc28bb0218ac03f11c1 SHA512 e3ed6253349df933eb4656c972f1a6cc71567c27a721195abceac0d28bfbc991cbda8772f661021c3cf954d2a917730bad54982e319655a204b6b30c1c67c6d1
diff --git a/dev-ruby/asciidoctor/asciidoctor-2.0.10.ebuild b/dev-ruby/asciidoctor/asciidoctor-2.0.10.ebuild
index 5f8e594c9af4..dc8549057553 100644
--- a/dev-ruby/asciidoctor/asciidoctor-2.0.10.ebuild
+++ b/dev-ruby/asciidoctor/asciidoctor-2.0.10.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
 IUSE=""
 
 ruby_add_bdepend "test? (
@@ -26,12 +26,12 @@ ruby_add_bdepend "test? (
 	dev-ruby/rspec-expectations:*
 	dev-ruby/asciimath
 	dev-ruby/coderay
+	dev-ruby/concurrent-ruby
 	dev-ruby/erubis
 	dev-ruby/haml
 	dev-ruby/nokogiri
 	dev-ruby/rouge
 	dev-ruby/slim
-	dev-ruby/thread_safe
 	dev-ruby/tilt )"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/asciimath/Manifest b/dev-ruby/asciimath/Manifest
index dd11a239a3b0..96dbbd5d6483 100644
--- a/dev-ruby/asciimath/Manifest
+++ b/dev-ruby/asciimath/Manifest
@@ -3,6 +3,6 @@ DIST asciimath-1.0.4.gem 14336 BLAKE2B 84aac2d2b987f72a17288cee6d00197c429e04c21
 DIST asciimath-1.0.9.gem 18944 BLAKE2B 3ccc3f594d7a0d8b6996349d85356179ef3a9052a84f923ad1d0976e42f58670a350473b41d1c4a0c4f70a3cc4687e6adaa7987bd811ef32bd3da41f100f4246 SHA512 32c4f2cb7e9d330c371e9b9abcdf9e31bf44014c5c0b0044589302116b55840a2e1a41ab006d61a2258e4a5c2d4a772dad77f579150fc9bf099a7a4d19c6cd44
 DIST asciimath-2.0.0.gem 57344 BLAKE2B 18cb2ca27a626bbb241768d070c47c981ae1f3a626cd9f476e7511f04f73154a1c3742338d92540bbd78fadbf775f4db7d2558c451fc8a276002fc5adc044ece SHA512 4823e7fa2e3107765d2804d15f5250dc30572099405df988ffe13f17ed584043bb7e48794cabc9b9853997083c57af5f3d73d20223ada95d00f997363130bedd
 EBUILD asciimath-1.0.4.ebuild 528 BLAKE2B 8f70ad1757f87729558831e9028f1d0534e0826aec3c87075338ece924dfdf13703057a8af6e98d38fecd29331673ea73eb4991dac6e9f85cf762c81b6730671 SHA512 04b3ef6e9a4c04c26e706c42ca8f9b25936f14f5dc682e4ac160f88035ab4e624b49eb8fcaf926fcb14bb7ecefb52fc634e782b2a2aeac6e097bca84a2e80d28
-EBUILD asciimath-1.0.9.ebuild 468 BLAKE2B 9cc93e15871738768a7758ea11e854bc1d00e17b812a046a8141c6f1e0d80b374ba98f6f5d151e5fd525fd60213b83ad41f4be76044a05482af6b4446324ce8f SHA512 28c38a53cb5dca7868e1a4bd5e3fc7c488e3f4c57fb7f15f06dac8d91c7703baeec2f7d4b9865c274a919d86a4a13e5eaeefae3751d3c94c40feee229adbf7bb
+EBUILD asciimath-1.0.9.ebuild 464 BLAKE2B ecb15cdb05aeef8fb9462f43e190986094ec591d51800a7343f28fbabf0ea910113bdfdee551b7a263a59e7487fa2bc7bfff9d4cf42ba8d016e33b8ebf18f0d4 SHA512 58ad31a73b15cbdb38f9b2fd74a08fad8db43d9337cfd1f8e1cc6adc73145941a8698d2dc94fb014682799e2a421ab925323c752d8be818c978d438a18ad572f
 EBUILD asciimath-2.0.0.ebuild 469 BLAKE2B 095aa4fb87bcb0f3d0be0a1843279c7a6606ad2780b8dd93a52816836197a91c549260f7cec682ca10309b1a8ca003d0bdd544828a77221d6df0cddd8098aa8c SHA512 cdab7e4b133f0c90f2c1bf37af3004ca03a8db870d48c1d73bf876361f33a6fefdc7d85b86514a096a5b67e841239f65999c05207e950ea9a92dd0121777f903
 MISC metadata.xml 344 BLAKE2B 7979667ff10553d0f1c80a34a03bca56057a4dcf856440b9f9bc4ea64aa018da426601b76dff578625481cb51f7384c7716a3aa98670f178c4209ad39a9af9d9 SHA512 606dd415c7a141188cc94a7d56c67d42be1c2420f8ba9ee7a44707b99a6035df1cd8d358de575e12008f0560aa2b87b57b5892c67f3d931aa28c5938373a8075
diff --git a/dev-ruby/asciimath/asciimath-1.0.9.ebuild b/dev-ruby/asciimath/asciimath-1.0.9.ebuild
index ad6d1f8bd2ab..988d1c7f49e3 100644
--- a/dev-ruby/asciimath/asciimath-1.0.9.ebuild
+++ b/dev-ruby/asciimath/asciimath-1.0.9.ebuild
@@ -15,5 +15,5 @@ HOMEPAGE="https://github.com/pepijnve/asciimath"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE=""
diff --git a/dev-ruby/autoprefixer-rails/Manifest b/dev-ruby/autoprefixer-rails/Manifest
index 5403f00513d2..fd8d9bc0334a 100644
--- a/dev-ruby/autoprefixer-rails/Manifest
+++ b/dev-ruby/autoprefixer-rails/Manifest
@@ -1,15 +1,15 @@
 DIST autoprefixer-rails-7.2.6.gem 196608 BLAKE2B 0f9224fbf765877b1b7414c68fc39a6587514d27fb5290e1a623db8dcdcbf6f668b66ddd0133906a97e63e877b8201168a45520a9919dc756021d5a7cffc0d38 SHA512 37b3f245291711f92ab9e264491637e753afb95e52f9fd4e2bda6655cd781b2d031934f3379cabdd5589bdf57b780d0727f2fff1cdf7887ca4cc323d23023396
 DIST autoprefixer-rails-8.6.5.gem 208896 BLAKE2B 50e8b8ef3fec9a0bb8d68afa8950989dbf84b58b79b8822e83bf22873c5172c2c514643c31dca88cfec49bd585563eb9b201c621d3ab6707ed0d49c6cd4c8fc8 SHA512 fddabc4d745ad1b4282622a52ab4e36c377eccec85c4e80b3e8d633ffcc2d1613f4fee9e9f2356c85d251e44b0010418029bb278894987119689435ac885e982
 DIST autoprefixer-rails-9.6.5.gem 221184 BLAKE2B 0a8d3dcd87cf4ad54252110bd60e86ab19563e614158575cb596aeaeab1d87946412625ce4bab4d8fc71d27abef1646822867aae19759b74445733f57ea076d5 SHA512 489e37e411fc86632d612b0d102955fd29b2654ba5bed3b648d89676e9d90aafb38139ea0d3f027fd9b23aff683c3f15979434d25c71d46560c3e1a1f1b4bc20
-DIST autoprefixer-rails-9.7.3.gem 222208 BLAKE2B cd091364f3089ece63dbfa13fad58c3e21b3275ebc845df543429f2952770a64221f4bda60567a37c3f4ee6031653856e4cda7d4cf4d24b3c08819c603f8db60 SHA512 08a78e4145f3d05c37c76d6ed137a2cb1951e36f4b36b9425f4429afb28e6eb2fb6a19e164189fad18f03e5d3540d02698f1466e95593f08ec4d064cbb21fd0a
-DIST autoprefixer-rails-9.7.4.gem 222720 BLAKE2B 6613552129f1a94a3d9acbef9f3b282b396d966706cf9321ba4b7ae31aa1054c3d589b1620862f21dd8a49f46a255b9d45e3e3155b4855ca42cad8a1d6079b46 SHA512 f0c8a4b0baed3024da732f47f2f836a1783cbe87c552d61f2a5d36f32a93ddc42e4dc987c826c6438ffdb0f61411d4ead37a001d6653a620f2ce110dbdbbdf3f
 DIST autoprefixer-rails-9.7.6.gem 226304 BLAKE2B 51481173acc0200e7287e8f448fa99f56f7548cf5df142705f6e4143f42bc079ab2c4d4459d4cbe62417b9f873b9e32d64a96ce61e0e8cdd7501203a33c0dae7 SHA512 4855843d270536607a705ab7a1fcb20fade8270ee957de3150b3892cf81442fecb5d501f07276761aba76c44edef15235d0f68e91ae76d2fe09dfa16179faa7c
 DIST autoprefixer-rails-9.8.1.gem 225280 BLAKE2B 8c6fac92414ba153fdeb974b5e82a9550bd2f18c00af1813984e5cc2b239ab961d597fe66dc8d7a160564f06597da5ac5415c77d73db3d6cfd966dc4cb94ab93 SHA512 5f9d514170551e0c657e5116e76745411d396a02815f44cd2bd0b6c45d7c85cca7af6705ecaa98f4ef069c9d68a941dc9b728d837e9158e56dd9aa9110043bad
+DIST autoprefixer-rails-9.8.2.gem 225280 BLAKE2B 50ba378c775c9781cc2fe5ac4e10cdb29848613a17f1f78811518dc1f58abee9176843a412703505d2ccf15c9dae6025c07f9a60b323db2878cc44e51f6be281 SHA512 6ab2d6106654a41095610dbf3eb383772eaf4c4e56e8790d8207ce2b9e218f276be00a011c6976c1b7b555f691366082d9a1fbeb53dae66e3599e67b2c3cb245
+DIST autoprefixer-rails-9.8.4.gem 224768 BLAKE2B 9d0d4691355c9d92e9e7f960549b40e19b10cf5024e7b23b6c36d99d6c48911237b289f191d0ecddf3e0cc2c12313f27ef5c4db047f5c6f6877c196b6bf75171 SHA512 3680da201cf4eb18eaeeeb8a9bc46af372f8aef035689525cf8354c362df23d329befa05c293d534d88eabedd984c510cf5b6753faba3184a6533a1a88cdbc5c
 EBUILD autoprefixer-rails-7.2.6.ebuild 827 BLAKE2B fd6aef469bd1e07f5100e88ebe523da96383c721dfc2bee9b7babb7d11f3d710bbb6debf4cf9cd57702f81150c8b7c7ef9a0f3de4efc1e6325240fd1bf2e4bf0 SHA512 f17f3e58a7cf0a8d960d683d3cdc6ddae7065ce7d28d3284b45b169210a068a9ec0dafcee100fcbda098aab73c809f455908df069ba72e5536b95aa1ddac7ace
 EBUILD autoprefixer-rails-8.6.5.ebuild 827 BLAKE2B 4bce491c80db4a8eb1d77467167c3c290c0af5311f4395424f5f0c4e2b30e1474fed1746c3dc5127413d48b9e7031f8e782f7b5d1a1987550747c3900d8954cd SHA512 8bd8a32ceb04e688ec4d149a67b98905b2ec975684f3fb2fe3dddcc4ff0d8a04e7556b41a3a804a6b1dd2d4c46d4b5ab45c6ed45f300c7171bf2335f73d42768
 EBUILD autoprefixer-rails-9.6.5.ebuild 889 BLAKE2B 85643bd01e0a4db78f304d55c7b75181e51258b83219073e17142c86ef025d746d9e34b6781adeb5a869fd4ab4643c1a039769ddbdf2ec45c8015a8ffc5d1bdf SHA512 dba75647eac0f7e41a6a20bb359fb137b982bd28a680c85c4240356005b4508613e4364d56b31e1db9a3f373809e9e84065184656086569b02f49815e118cee1
-EBUILD autoprefixer-rails-9.7.3.ebuild 889 BLAKE2B 85643bd01e0a4db78f304d55c7b75181e51258b83219073e17142c86ef025d746d9e34b6781adeb5a869fd4ab4643c1a039769ddbdf2ec45c8015a8ffc5d1bdf SHA512 dba75647eac0f7e41a6a20bb359fb137b982bd28a680c85c4240356005b4508613e4364d56b31e1db9a3f373809e9e84065184656086569b02f49815e118cee1
-EBUILD autoprefixer-rails-9.7.4.ebuild 889 BLAKE2B 3cf4bdf82de374a642587706e0c5ad4e6a4377592aa9d7eebe2f65daf65cf9ee1be4003adf1a3f9e8c549ed8a197bd2c30b27a2dc06e96ea4964a8e4cdc24af8 SHA512 e20ae08a2aa90c06045e77c4cc7a14776060f0e51a511aaf493d68a9d3fb02a5fd0980fa7d4d3f0bb4de36dc77aca0e83d9cc3ada663f04e9eb480d3e2db1224
 EBUILD autoprefixer-rails-9.7.6.ebuild 953 BLAKE2B 1df137ed718f8b17482bff93516285cabfb6f33a3af779a63fd8def74142d8c0b6dd50b5b7055ff20602104aa3ea10ef6f4fb83575c4950f40d7b256b5190422 SHA512 25ff7903940f546bbee37fd8588b1028191e3139e73da70df85e5f7977d0f029f659e23da06eea08c6d96d5cfbab15776a935cb63b1f09b1d69659b205ecad9e
 EBUILD autoprefixer-rails-9.8.1.ebuild 946 BLAKE2B f2c0e16792f3419aaecab7b112b21321c7c7640895fbcf9f5710f56807ff8828e4a2545617b5d4affbf20b77b18138276f592506175575b7f975e3a06574d415 SHA512 bbe425f71a781271fda28d0907fbe328d2d7672fb1c0f878b12c1efe4f28c0065d831bbe509ecc298391b7d1735c98cbad87a49ef09bc8f92a7a8e572ecc4731
+EBUILD autoprefixer-rails-9.8.2.ebuild 946 BLAKE2B f2c0e16792f3419aaecab7b112b21321c7c7640895fbcf9f5710f56807ff8828e4a2545617b5d4affbf20b77b18138276f592506175575b7f975e3a06574d415 SHA512 bbe425f71a781271fda28d0907fbe328d2d7672fb1c0f878b12c1efe4f28c0065d831bbe509ecc298391b7d1735c98cbad87a49ef09bc8f92a7a8e572ecc4731
+EBUILD autoprefixer-rails-9.8.4.ebuild 946 BLAKE2B f2c0e16792f3419aaecab7b112b21321c7c7640895fbcf9f5710f56807ff8828e4a2545617b5d4affbf20b77b18138276f592506175575b7f975e3a06574d415 SHA512 bbe425f71a781271fda28d0907fbe328d2d7672fb1c0f878b12c1efe4f28c0065d831bbe509ecc298391b7d1735c98cbad87a49ef09bc8f92a7a8e572ecc4731
 MISC metadata.xml 347 BLAKE2B 71b067345809944df1e70cdcaa44e44ae416d0c4ff80975aa796b8217170825e6be32a15d2549f464d9a65e8aa9ff1b2e9496989e66bce29d3dad672742495ec SHA512 b0985f41e9463a6c5bdbda0d5a84cc76cb6090614fa07395705b3207e0cd4fadbe9b1bb18fb7382f3c8bd00663db1232fd7107f6757bd20cfca0a0df99928426
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.7.3.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.7.3.ebuild
deleted file mode 100644
index 8c312ceb78ee..000000000000
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.7.3.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
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="vendor"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
-HOMEPAGE="https://github.com/ai/autoprefixer-rails"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/execjs:*"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/rails-5.0.0
-	dev-ruby/rake
-	dev-ruby/rspec-rails
-)"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
-	sed -i -e "/Bundler/,+3d" \
-		-e '/config.sass/ s:^:#:' spec/app/config/application.rb || die
-	sed -i -e '/standard/ s:^:#:' autoprefixer-rails.gemspec || die
-	rm -f spec/rails_spec.rb || die
-}
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.7.4.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.7.4.ebuild
deleted file mode 100644
index 2abda327ffb8..000000000000
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.7.4.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
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="vendor"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
-HOMEPAGE="https://github.com/ai/autoprefixer-rails"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/execjs:*"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/rails-5.0.0
-	dev-ruby/rake
-	dev-ruby/rspec-rails
-)"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
-	sed -i -e "/Bundler/,+3d" \
-		-e '/config.sass/ s:^:#:' spec/app/config/application.rb || die
-	sed -i -e '/standard/ s:^:#:' autoprefixer-rails.gemspec || die
-	rm -f spec/rails_spec.rb || die
-}
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.8.2.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.8.2.ebuild
new file mode 100644
index 000000000000..bc06b1290578
--- /dev/null
+++ b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.8.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="vendor"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
+HOMEPAGE="https://github.com/ai/autoprefixer-rails"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/execjs:*"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/rails-5.0.0
+	dev-ruby/rake
+	dev-ruby/rspec-rails
+)"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
+	sed -i -e "/Bundler/,+3d" \
+		-e '/config.sass/ s:^:#:' spec/app/config/application.rb || die
+	sed -i -e '/standard/ s:^:#:' autoprefixer-rails.gemspec || die
+	sed -i -e '1igem "tzinfo", "~>1.0"' spec/spec_helper.rb || die
+	rm -f spec/rails_spec.rb || die
+}
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.8.4.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.8.4.ebuild
new file mode 100644
index 000000000000..bc06b1290578
--- /dev/null
+++ b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.8.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="vendor"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
+HOMEPAGE="https://github.com/ai/autoprefixer-rails"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/execjs:*"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/rails-5.0.0
+	dev-ruby/rake
+	dev-ruby/rspec-rails
+)"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
+	sed -i -e "/Bundler/,+3d" \
+		-e '/config.sass/ s:^:#:' spec/app/config/application.rb || die
+	sed -i -e '/standard/ s:^:#:' autoprefixer-rails.gemspec || die
+	sed -i -e '1igem "tzinfo", "~>1.0"' spec/spec_helper.rb || die
+	rm -f spec/rails_spec.rb || die
+}
diff --git a/dev-ruby/backports/Manifest b/dev-ruby/backports/Manifest
index 2a0385887a41..87d7305fa111 100644
--- a/dev-ruby/backports/Manifest
+++ b/dev-ruby/backports/Manifest
@@ -1,13 +1,9 @@
 DIST backports-3.15.0.gem 152064 BLAKE2B a2c2a1f35ab6f682be23a5189bafec563a2d028ed5f0e0a4880ad85e09ac7af1085a601323ec3459c5be87a5271c6c3e47b6e80005c50e3084d4ac1dc9f2fd35 SHA512 4eb1f928c37596971fa274d838ab991bce462a7f571cb68501fc81e579693528e93536c25e4b64d93f4f0edfd313c8aacd8af014bb5c586cc182867e78f614d5
-DIST backports-3.16.0.gem 154624 BLAKE2B a35adb965c3f9f42fab5fe80fa1ca20a59511e9b265da28bef059e3477fa6a291c86e3b16f837e1f2d2f7e36e6660be29a9fc02713c3f46ad36767dd87baa1f9 SHA512 500386a74162e6c66e606c705dd26296f56118460f300005f0db44025f49bb8f516805921f23e17d0959056a2a8fc320b5ad4c514dd9c22ef811f6325113ae8a
 DIST backports-3.16.1{P}.tar.gz 156181 BLAKE2B c7cc842fb9bf8fcc7b55c8a572cc7a01a63008ad20f63142f339d24d7bf04202f4def2f03261d23d6c41c8c3bd0af8fce76a323e25585b6874c1428eb2a9ef90 SHA512 d907d729dd37ebfb175f8274078664fc4eee51de773cd0871b8bec9a8808052fbdea8571f0a402b1a6ca88ca7cd7b6b9984f66799abf92f300f1f8bc7b8f3f9b
-DIST backports-3.17.0{P}.tar.gz 158065 BLAKE2B 33df81f32aa36b8039e021dbbf9ebd265a73cc5f74069472773ccf8f71d9378820671055c8130282a95ee8a5b32d3fe13a04394fb8f9b4c01c38f13582447063 SHA512 4acea191916bb067856c42665c10fad52a275193fc5cd04cb73bc5ce7967033d055acbf682f5e7abc8058fafd5150fb8154495a964d09664bf1ffcf91dd154c8
-DIST backports-3.17.1{P}.tar.gz 158209 BLAKE2B caecc782c7949d2b6408a31c3d5f7e1599c49a0593761c2e75fc8181b28db42797fc10ea8149e6f6d3d60c6561bedea536b80b271ba4243c9cf933414e8aca71 SHA512 87cd790099c5265bbb3d6f91fd40429f65b97c4dcdd5126c2a8c4376efac047883271e447ecc3512999c2470b291258b1d45600fe55ad687d4eab8ab12cca37a
 DIST backports-3.17.2{P}.tar.gz 158235 BLAKE2B bc761ee147adec209f2dcc3ff95e8ba82b8388c58b3b6aeb11c4f294ebf8aed74ca8bea54833df5adf32b2fd65ec01b621d2e8422d344fe9e1fa228542cb6118 SHA512 2194dd0e89c111f02d161ebc60827fb0276ad32c9e611156687a0f83604db2b25bdec626d7671a7a6fd7ce1395dc818a3735e63a2c165f41a0dd37ff37487d4e
+DIST backports-3.18.1{P}.tar.gz 158453 BLAKE2B a50efaea7a97d25dd760a8fb592c664c011818933b346b959611d02592e2d7fda46fe16a805290340bd5323397f33ee4d613b9698b70a29714e5429a2d320783 SHA512 38a057d5eeaab45cea4d7a8dd9ec8d0e98c5efdf18056576574733387d84a4ec8388f4797c527e240ef0bc026dc730c7eebfcabd42e1111b2d5727b9cbca4016
 EBUILD backports-3.15.0.ebuild 666 BLAKE2B 582f77e0126ad733ec009687eef69942ec75f90bdae8be08cc460af4e28ef5f4e36d9ac16ab2edff4c1d632488a87e81645642b5c9c74405bebb9c0ca2fd688a SHA512 b61462d7b91475e48927a0c816c02c51d66876400225703ead490e73bfe5d4915da2a9b381f6947dbfb0931f3012c03df9b03f0dcae41ef64649a59b3a44dab9
-EBUILD backports-3.16.0.ebuild 623 BLAKE2B eae1b090445de4aa9d97da1975cf789739c9d8753549a3726c175caf1cf90f6012375e2ff4edf877fe924e0529b24c3f1f41438530dbbf121db72e4d45b203ab SHA512 81f78b10bf6d43d466c10a386e0e4291d84b384116bf67913347b12ab44026784ade8941f9584127883e6a93664fa152241fadbdaba3376a5bcb212cf4378811
 EBUILD backports-3.16.1.ebuild 752 BLAKE2B 5d8c699e1d0e589c3d7bea246a9b64fa2212a1c614a1c078d9c9f1efa7af79f584ea6ff3c20e1555991c4ada640f15bae70c0818fee54eb5c3b9b284f8bf8f08 SHA512 00c4e1cbccd845f5312581cde1bd443070fa579aa8966e7f36d743df610432e5a70f85d147be51aa03e1b418edef4f513c3651ceabffb11dac2120254265643f
-EBUILD backports-3.17.0.ebuild 800 BLAKE2B c6afee4193e95b9dd3d834d8e4fc7e64d6490d02d74303e625ac62caa77171d659bfaf23d73b14109d7a1123b1623d7468ae2c8df1af16c5d44c799fb738c034 SHA512 3548c93050d88b3622456d41bb9196298d62e51e4d618bcaad511d5658b8964345374e68caecf168ede3b290a343ce8571a5125288bf17cecf8b06b7c27d9505
-EBUILD backports-3.17.1.ebuild 800 BLAKE2B c6afee4193e95b9dd3d834d8e4fc7e64d6490d02d74303e625ac62caa77171d659bfaf23d73b14109d7a1123b1623d7468ae2c8df1af16c5d44c799fb738c034 SHA512 3548c93050d88b3622456d41bb9196298d62e51e4d618bcaad511d5658b8964345374e68caecf168ede3b290a343ce8571a5125288bf17cecf8b06b7c27d9505
 EBUILD backports-3.17.2.ebuild 800 BLAKE2B c6afee4193e95b9dd3d834d8e4fc7e64d6490d02d74303e625ac62caa77171d659bfaf23d73b14109d7a1123b1623d7468ae2c8df1af16c5d44c799fb738c034 SHA512 3548c93050d88b3622456d41bb9196298d62e51e4d618bcaad511d5658b8964345374e68caecf168ede3b290a343ce8571a5125288bf17cecf8b06b7c27d9505
+EBUILD backports-3.18.1.ebuild 793 BLAKE2B c44bf9a13dfbce3d8713b93edeadefc69407bf7f0575ef5629bb9401fccb82dab893ce806daaebe3b4c703a3680aa202a88cca8466ef75a9b55d1f98a0112d33 SHA512 60444bf27bbabc3ea8bf28ae0c54d6dce880933e58d386fee988f5dab15885ad401919a554d103d1577aa938cf58f66ce0d144dec11304301ec382130c56c738
 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
deleted file mode 100644
index fea2b86091ce..000000000000
--- a/dev-ruby/backports/backports-3.16.0.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
-
-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="~amd64 ~arm ~arm64 ~hppa ~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/backports/backports-3.17.0.ebuild b/dev-ruby/backports/backports-3.17.0.ebuild
deleted file mode 100644
index 10f3947595ba..000000000000
--- a/dev-ruby/backports/backports-3.17.0.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
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_GEMSPEC="backports.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Backports of Ruby features for older Ruby"
-HOMEPAGE="https://github.com/marcandre/backports"
-SRC_URI="https://github.com/marcandre/backports/archive/v${PV}.tar.gz -> $P{P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~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
-
-	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/backports/backports-3.17.1.ebuild b/dev-ruby/backports/backports-3.17.1.ebuild
deleted file mode 100644
index 10f3947595ba..000000000000
--- a/dev-ruby/backports/backports-3.17.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
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_GEMSPEC="backports.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Backports of Ruby features for older Ruby"
-HOMEPAGE="https://github.com/marcandre/backports"
-SRC_URI="https://github.com/marcandre/backports/archive/v${PV}.tar.gz -> $P{P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~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
-
-	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/backports/backports-3.18.1.ebuild b/dev-ruby/backports/backports-3.18.1.ebuild
new file mode 100644
index 000000000000..c1798ee2c098
--- /dev/null
+++ b/dev-ruby/backports/backports-3.18.1.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_TASK_TEST="test"
+
+RUBY_FAKEGEM_GEMSPEC="backports.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Backports of Ruby features for older Ruby"
+HOMEPAGE="https://github.com/marcandre/backports"
+SRC_URI="https://github.com/marcandre/backports/archive/v${PV}.tar.gz -> $P{P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~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
+
+	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index 3a3cd1d7328b..e4594355406f 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,13 +1,13 @@
 DIST capybara-2.18.0.gem 274432 BLAKE2B 992799362025b81a0d074fb06fdafef4c4385ca18ea85a7095d9e58625df6a59a349b60b462c5c4f403a6af955466bc46d82be6cd91724fc2b12cbe15ed74a4c SHA512 3bb994e022593d485a07296193a16cae7b45e96e87dd10b2bd4807ad2bc990801044c0493360598d1626c3e367e8de87e407f65c2c6f42674d5f1b9c0b5c1933
-DIST capybara-3.30.0.gem 360448 BLAKE2B c20173448903f96facdba007b81b43d74500a0e8ab1e15b9bef938df426ff8098a1fb54a3791d92d0342b594d609ca48b9d8c1f67a758d8164fbab2f5dad3bd6 SHA512 f10943a8f10c0a058d0737fd15814d4ff6e50dd4df2627d20f4646c13bb52dcd0e1042193525252d0009e637c52118ce030968e4451f823076e59b7fcd4cb90c
 DIST capybara-3.31.0.gem 363520 BLAKE2B 246a199d89f5120bd1be7b36b5aee5bd4143ee5d1c8953cc2e65e805c234d902c5d898f873c562b8457c6e09af507cf81ddc178bcb617f2730b5db1f9ddd97c8 SHA512 920dbd331eff5300cfa575689f7c62f502cea5782ad58eff168ffc274f2622a95869a7ab90e53fc010bc7f5c0847caa5dcf69cb74eecc2a82f0f449c11be3edb
 DIST capybara-3.32.0.gem 365056 BLAKE2B 13fa531ffef6be5711b3f88f7b40dc409c9e404a3815ced121e1b87d2a7aee7b1ac22b7c44673c2d14a79a0eae18a45e5f20b022625594c24ce8a30a4779b061 SHA512 930149822605a744ad3b802d27f9419542683b4d11322f4c71f25613b8c1a3653adf5b598710e2961a82a1d0181ae6c182473d19044456991af378601e4ae89b
 DIST capybara-3.32.1.gem 365056 BLAKE2B f866c90cfbaaf57387286436e877dfdd2c6b1cf4a581931c416656c6b687ab69c1a4cc1f70eb43faf306950bc1f4fd9e5b6e4741118bf7eb239a477f08851851 SHA512 20486897ccd282e1a73f26b94dbc89837527b253976b317df55b319174aa9eeaa499f1ff153aee1b463b93edca5f7f2886d01edabb7358262e57736111d758e6
 DIST capybara-3.32.2.gem 365056 BLAKE2B c193f188aec6089aabafb5d09cb540f914d8c257d3faafa0d59f674069a39c29a3750c80bb269bf2d010cc7608aec1699c7d75d96c7c85c201aaa0f99adddf83 SHA512 b1b21615b5f87012a71a7901a4f9bb9cda61f1a455299d4ad05b05e0281985a6c158a1549864e551c2ca4b97e921139b35843a1d23efc45557647328c0d1c2a3
+DIST capybara-3.33.0.gem 366592 BLAKE2B fb64b301051011aa82194480bb79a33d06345cbe250fd7a32d54cb32038651f8598e860269c67efc58a87410a213f07e8f7107b725bd6286ebb93e7fd6ff125a SHA512 b169a12f330fdc016dbba6c7478cf52a51006499197bba67e6953f36929099212e209d2803511ca623b7e2b1fc0288fad1975fd426047c95680309145abb9977
 EBUILD capybara-2.18.0.ebuild 1529 BLAKE2B 2c82eac2f07da03522e3d5cf719171ca3b81dc08b516ee37a9dcde586d5257fce47e8ca2c0a82de966ee79c19ce84772035e89efc1e28f97f240e54e64e75e50 SHA512 8c02414c863ea3a380821c127c3b8175f1a38ccf7a19abfdb493d702acce171e915bc76cac2ea94acaf1649647386bd78af1c80272fb6294246462c3c42a5d5d
-EBUILD capybara-3.30.0.ebuild 1782 BLAKE2B 98d775d959579d73277b3b53d72128b0d866af84a16da3b48e1c1e7aa512191dae70a1b1d6a205136a9f7502d79afc02655cdae858135cedb76816b21ecd3a72 SHA512 c50c6ec8d2a9d48107940084e266bd6f599c3fe1f8c41f4305fe218ec68940e5c4e430572434ee7ebb35325e2b3c51b507b37fb62dbcdebe242f1841735b4762
 EBUILD capybara-3.31.0.ebuild 1789 BLAKE2B 0144d4405f871d24f715b1ee0e8e6797b37178939ad921f64d83e033256aa8228900ace9df68358e1d1222ff0ae7adcae830e8cd9e8b6d4a5f521224c618ed71 SHA512 502598533960c4d2fb06e8bec9859067246321ea625c1961c7ef115c44664b3f9b533cedb6c630c9c7dd5093cf873e0d16ea80d3d2d704db950e22bd9a980601
 EBUILD capybara-3.32.0.ebuild 1790 BLAKE2B af90ef0b0042e3a0697337c24531debe853a05e167439ef8baa9ca4090f2834fcd54103ed9c9e1462b5b758e3e8dd38d6b4a6839c6a5b2786321b2025a76cfd2 SHA512 6d2926ea5491a5426d3730ab74946d0162b5a6e357868320606cd4e7015e216bd974446562d5407ca7911d5078855d6bbeb961a861b9438ecccdc42ca6af207d
 EBUILD capybara-3.32.1.ebuild 1790 BLAKE2B af90ef0b0042e3a0697337c24531debe853a05e167439ef8baa9ca4090f2834fcd54103ed9c9e1462b5b758e3e8dd38d6b4a6839c6a5b2786321b2025a76cfd2 SHA512 6d2926ea5491a5426d3730ab74946d0162b5a6e357868320606cd4e7015e216bd974446562d5407ca7911d5078855d6bbeb961a861b9438ecccdc42ca6af207d
 EBUILD capybara-3.32.2.ebuild 1790 BLAKE2B af90ef0b0042e3a0697337c24531debe853a05e167439ef8baa9ca4090f2834fcd54103ed9c9e1462b5b758e3e8dd38d6b4a6839c6a5b2786321b2025a76cfd2 SHA512 6d2926ea5491a5426d3730ab74946d0162b5a6e357868320606cd4e7015e216bd974446562d5407ca7911d5078855d6bbeb961a861b9438ecccdc42ca6af207d
+EBUILD capybara-3.33.0.ebuild 1783 BLAKE2B c9be1ebcbae6b2141e9c0f967d92284c736c57046a30eee07705567e16aa065033ee307ad722aafe07bbe8080e9bb56636f16b0596d8b7a03c48dfc4a091bb0e SHA512 83c5ba82043668977392824b28125859ccaf75fef8cd4dcf829cb163c09b3f5e7603def865ba66dcd2a5a88b7016146e819ab6df58316df11269f463bb95c92c
 MISC metadata.xml 343 BLAKE2B 93caed6f938d8f2c10a7106e7377812064351018521cbb63477340af9531c5c67940097580c5f7610cea03b0dde6853c9fcbe9ab8cf5daa2a49018b8888e20fc SHA512 1e526463690f3ff61390ed77cb528352bdd1c089b368c3f6ab587766d81167afe99f752b861233f755e10bf2aa6f09dde98a9dc359d51392f15b55462ba66e77
diff --git a/dev-ruby/capybara/capybara-3.30.0.ebuild b/dev-ruby/capybara/capybara-3.30.0.ebuild
deleted file mode 100644
index 38b2db211d8a..000000000000
--- a/dev-ruby/capybara/capybara-3.30.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=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-# Rake tasks are not distributed in the gem.
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit virtualx ruby-fakegem
-
-DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
-HOMEPAGE="https://github.com/jnicklas/capybara"
-LICENSE="MIT"
-
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-SLOT="3"
-IUSE="test"
-
-DEPEND="${DEPEND} test? ( || ( www-client/firefox www-client/firefox-bin ) )"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec:3
-	>=dev-ruby/launchy-2.4.0
-	>=dev-ruby/selenium-webdriver-3.5:3
-	dev-ruby/sinatra:2
-	www-servers/puma
-)"
-
-ruby_add_rdepend "
-	dev-ruby/addressable
-	>=dev-ruby/mini_mime-0.1.3
-	>=dev-ruby/nokogiri-1.8:0
-	>=dev-ruby/rack-1.6.0:*
-	>=dev-ruby/rack-test-0.6.3:*
-	>=dev-ruby/regexp_parser-1.5:1
-	>=dev-ruby/xpath-3.2:3"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' -e '/statistics/Id' spec/spec_helper.rb || die
-
-	# Avoid window-manager specific tests (sizes are specific for fluxbox)
-	sed -i -e '/#maximize/,/^  end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
-
-	# Avoid spec that requires unpackaged geckodriver
-	#sed -i -e '/describe.*register_server/,/^  end/ s:^:#:' spec/capybara_spec.rb || die
-
-	# Avoid test dependency on puma server for now
-	sed -i -e '/should have :puma registered/,/^    end/ s:^:#:' spec/capybara_spec.rb || die
-
-	# Update spec to catch the right error code. This seems to have
-	# changed recently accross ruby versions.
-	sed -i -e '/raise_error/ s/EOFError/Net::ReadTimeout/' spec/server_spec.rb || die
-}
-
-each_ruby_test() {
-	virtx ${RUBY} -Ilib -S rspec-3 spec
-}
diff --git a/dev-ruby/capybara/capybara-3.33.0.ebuild b/dev-ruby/capybara/capybara-3.33.0.ebuild
new file mode 100644
index 000000000000..b0688ebe995b
--- /dev/null
+++ b/dev-ruby/capybara/capybara-3.33.0.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="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+# Rake tasks are not distributed in the gem.
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit virtualx ruby-fakegem
+
+DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
+HOMEPAGE="https://github.com/jnicklas/capybara"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+SLOT="3"
+IUSE="test"
+
+DEPEND="${DEPEND} test? ( || ( www-client/firefox www-client/firefox-bin ) )"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec:3
+	>=dev-ruby/launchy-2.4.0
+	>=dev-ruby/selenium-webdriver-3.5:3
+	dev-ruby/sinatra:2
+	www-servers/puma
+)"
+
+ruby_add_rdepend "
+	dev-ruby/addressable
+	>=dev-ruby/mini_mime-0.1.3
+	>=dev-ruby/nokogiri-1.8:0
+	>=dev-ruby/rack-1.6.0:*
+	>=dev-ruby/rack-test-0.6.3:*
+	>=dev-ruby/regexp_parser-1.5:1
+	>=dev-ruby/xpath-3.2:3"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' -e '/statistics/Id' spec/spec_helper.rb || die
+
+	# Avoid window-manager specific tests (sizes are specific for fluxbox)
+	sed -i -e '/#maximize/,/^  end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
+
+	# Avoid spec that requires unpackaged geckodriver
+	#sed -i -e '/describe.*register_server/,/^  end/ s:^:#:' spec/capybara_spec.rb || die
+
+	# Avoid test dependency on puma server for now
+	sed -i -e '/should have :puma registered/,/^    end/ s:^:#:' spec/capybara_spec.rb || die
+
+	# Update spec to catch the right error code. This seems to have
+	# changed recently accross ruby versions.
+	sed -i -e '/raise_error/ s/EOFError/Net::ReadTimeout/' spec/server_spec.rb || die
+}
+
+each_ruby_test() {
+	virtx ${RUBY} -Ilib -S rspec-3 spec
+}
diff --git a/dev-ruby/childprocess/Manifest b/dev-ruby/childprocess/Manifest
index 678b7ead3db7..7be5eb70b522 100644
--- a/dev-ruby/childprocess/Manifest
+++ b/dev-ruby/childprocess/Manifest
@@ -8,5 +8,5 @@ EBUILD childprocess-0.9.0.ebuild 962 BLAKE2B d26c87e9845aa51baccebd6476f0aca6165
 EBUILD childprocess-1.0.1-r1.ebuild 1018 BLAKE2B bca39ddffc883a6f65d8c2c6eb3c096fd06a9f51b9bd450ed409ec3d238fc279a8456ececd874b75889f854495b16467c7476dfbd7161f2cd0a0a65219825226 SHA512 c80e6f854cac8db0e43113a407289a99634e7331fce0e7dd21d61bcec2b3d691ec16b0e1eac3c75fda2ac11c9a5546bbfe0b2a1ee1324ef9fb3fab07ae48e1d8
 EBUILD childprocess-2.0.0.ebuild 970 BLAKE2B b6e7dba15d68ea2ec47f833a00984b2956547ed5a58239b6f286051a2c07388b7d004b7387a0c2c24cfc799fd8755534721eb88d19e9e412b31f9928554e5a93 SHA512 03d8ec9f71dcfba4a1ec28393b4bdf9b32d71a20e0b546e9bb2fcd034589530f20b678a5bb63e71c4f662593b8315435f7fa869a26e4e152c82fb03bb7305e92
 EBUILD childprocess-3.0.0.ebuild 938 BLAKE2B 8c8b9eb9507f6bbcb8a0d8acc0d2866589382fe6c4844289fcb4e9312cbe7ed706387e69b93fbdbae4fecca1766ae59270bd1c4e8a7cd3ce3be66dd70f97b3ee SHA512 68764a79057da9084357a4e1bc67d0e450a0d8626a2aa7d55de7e9d34fa222fba8674564b0a2c4f5de841d9dec846b9ca27aa30c4142e2c15158e982e56df51e
-EBUILD childprocess-4.0.0.ebuild 939 BLAKE2B edc0f32e7177e5f7d1f07bf9f226b5f02e173ebcbf8483126e682e10e748a9c9413dbf6369f3e2ec5f98dae34ebd5ba183df3865b889360e3611af8dd68991d9 SHA512 b16a37346a3c8db72bfe847c8e1cf9d60c8d31ceac554c10b93a400dcdc24ff2fe41c6d38017c61899c0caed9695ded4b69e056c0fcb0fb90f010973c828fa23
+EBUILD childprocess-4.0.0.ebuild 1026 BLAKE2B a88e2d0058601472a79381f840474559736d335b85604df6f34d1a137e865a5c91ce5668a32b638547dde480a843fcbeca16a326e5acc49f22370a3abc34b7ca SHA512 2b463bfc64c98447978eddd7c448f20bd0a441c65764501a631c4a9d8b258229de334e71bac013fd9529035ac4d9cdac56250abdaf50375f623268d128b3abb0
 MISC metadata.xml 344 BLAKE2B 3cbaf9e4992ca3e9fa2283451433e35247418e190a6447453848988e305a4f04583a3ee563149774c347dbd6bac2ebb0451c19fba1d5447162707783c02ff6b9 SHA512 2995953d3ac4c6cc924859dcc2910bd303262f86d5771368956cb0a3d26db031302547154bd98cdcf189aad39e132020c0c22510c65c7830f528cbf2265d871a
diff --git a/dev-ruby/childprocess/childprocess-4.0.0.ebuild b/dev-ruby/childprocess/childprocess-4.0.0.ebuild
index 79eebd325338..f5e6313be959 100644
--- a/dev-ruby/childprocess/childprocess-4.0.0.ebuild
+++ b/dev-ruby/childprocess/childprocess-4.0.0.ebuild
@@ -32,7 +32,8 @@ all_ruby_prepare() {
 }
 
 each_ruby_prepare() {
-	sed -i -e "s:'ruby':'"${RUBY}"':" spec/childprocess_spec.rb || die
+	sed -i -e "s:'ruby':'"${RUBY}"':" spec/childprocess_spec.rb spec/spec_helper.rb || die
+	sed -i -e '/system/ s:ruby:'${RUBY}':' spec/spec_helper.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/diff-lcs/Manifest b/dev-ruby/diff-lcs/Manifest
index 8d79840a051a..af99e58a423a 100644
--- a/dev-ruby/diff-lcs/Manifest
+++ b/dev-ruby/diff-lcs/Manifest
@@ -1,3 +1,7 @@
 DIST diff-lcs-1.3.gem 46080 BLAKE2B 907536d75c34de86ef28fa044ae785d8ba34c8d1f4d38964f08ef80c14a4fb6176504a39c2e074fb58fc5456214555461a18ae42dc04f371d85dd335b1cbc3dc SHA512 b82de390d22e0c1337ddca923621b1cc842f583a93953ef07a303b428fe3a389f8a4a1a63617a58136c8d6215aff025a3bbec2a2f618e9ea81f471964f93b078
+DIST diff-lcs-1.4.1.gem 48128 BLAKE2B edd92f00b858c716787974772858f65d98b1a07ea4e8697eed190d09e2cead7b3f2518ee96521b0cda1cd4b938365705cf969ef2d8cf1333ff843202ea2b6c90 SHA512 d084ee628caafe4b61e66142d57e25dd2c8e9423a5d0d042911a4816ce391528f03ea2c6226d29c953a83e6642d0c3328ea5a22216011f112f64030c6808a7bc
+DIST diff-lcs-1.4.gem 48128 BLAKE2B 6ec3259dc366769c4008c6ea6c7e5f1fe75350dc0318c8d45991bb8173274630b3be734fe6375dbb131620d8124faa7c0567e57d299393c3165b0e1c2d29c138 SHA512 a352fdfb89587b38f3e518f76dddd048530501080dba5abb0c37033f44bee65bca12550ea7d6f1edb8a719092538c20d1c58dfe7a6f67ba1d46549608c09feae
 EBUILD diff-lcs-1.3.ebuild 640 BLAKE2B 802b2653e9789014d27eab658fb2e1857a5de107a9df5c1fba293b3ba2bbb5449106a9d5de14611f39490edbf9f283c8123de5cad42913a50fc33eb3412988d1 SHA512 6af2510987d3d6f4e5a8f7135ed35713acb08628b046538588aba4f201de74bee84b1b46ac4fd2a1cb6c2feac8e634593fcc0a9530ee269b54557379911b093b
+EBUILD diff-lcs-1.4.1.ebuild 610 BLAKE2B 11a886ef458a5df3fb76d4c506caae4c0232eaf3509e2006b26e743189ef437a49ecb9949c57dd4d3a3e48c530402468c9daa2a74120ca00311e978e91aba62b SHA512 4078c3811e8dd2d20791c13e3f9cb6f3a58a1ad77c2af59e61e09377e059264e8103554af1e6f4e4797c2dd5075559cdd20bd578e0d3ceee5574ee1a3e610c80
+EBUILD diff-lcs-1.4.ebuild 610 BLAKE2B 11a886ef458a5df3fb76d4c506caae4c0232eaf3509e2006b26e743189ef437a49ecb9949c57dd4d3a3e48c530402468c9daa2a74120ca00311e978e91aba62b SHA512 4078c3811e8dd2d20791c13e3f9cb6f3a58a1ad77c2af59e61e09377e059264e8103554af1e6f4e4797c2dd5075559cdd20bd578e0d3ceee5574ee1a3e610c80
 MISC metadata.xml 345 BLAKE2B 99a21f71cd3b7984131e3b43a14297bdfa3cb4238833deade649c4afb880ce6fca1bf4c3dfbd2fc75f68f42d5b7fcf97b1cc85a416da75490266a8bd57a36846 SHA512 b96c7243c3d4a6a3fb41e63d8dae54dc233e20b98698636d6d7f30f2c00bae3af9a01df68fa9c38aa0baa0b1bb3c267775dd8a5db539db3d8b46c497e85e860b
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.4.1.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.4.1.ebuild
new file mode 100644
index 000000000000..83d94225b6f1
--- /dev/null
+++ b/dev-ruby/diff-lcs/diff-lcs-1.4.1.ebuild
@@ -0,0 +1,19 @@
+# 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_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc History.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Use the McIlroy-Hunt LCS algorithm to compute differences"
+HOMEPAGE="https://github.com/halostatue/diff-lcs"
+
+LICENSE="|| ( MIT Ruby GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.4.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.4.ebuild
new file mode 100644
index 000000000000..83d94225b6f1
--- /dev/null
+++ b/dev-ruby/diff-lcs/diff-lcs-1.4.ebuild
@@ -0,0 +1,19 @@
+# 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_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc History.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Use the McIlroy-Hunt LCS algorithm to compute differences"
+HOMEPAGE="https://github.com/halostatue/diff-lcs"
+
+LICENSE="|| ( MIT Ruby GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
diff --git a/dev-ruby/faker/Manifest b/dev-ruby/faker/Manifest
index 344aaa3a61a5..5ac44be169f0 100644
--- a/dev-ruby/faker/Manifest
+++ b/dev-ruby/faker/Manifest
@@ -1,7 +1,9 @@
 DIST faker-1.9.6.tar.gz 1833392 BLAKE2B 826ee480515873d1e250147e5c3749e222b1273a00fd4ae0a2a28dca91c5981290c8540602d89d406e91d98a0f5dbc6fc4a54ab6d7d2b716a4d4957ab32254dc SHA512 1ea0c4194603b5eaec0f4abc2460fb39cb9de97179d7699c3cb37673731ebf8bf03d20fb422911d4725d4308691d4c92a82f5a661e034381cc04066ddcc955bc
 DIST faker-2.11.0.tar.gz 1033369 BLAKE2B 51677346980bd5070a145b1d8dd11a6426cf9da5c407e030d9722ed8ccc4ed1a0a8b2d5534c96b50fbe79e84fe71e4268f3228c223dc61fe4c74cda0de18a790 SHA512 9adc03cdef0714656738d354d787a99cb9fcc85718847db7b183b02f38d550ff86d65c8e6ed13be3c839cc64f36f3e95ff25dd5d2f8f45c7207dbe5735238e0a
 DIST faker-2.12.0.tar.gz 1100460 BLAKE2B 8be31911c9612d7433433121344a1fbfc735740898cb4fa7115a9ec33d22f610e5eca9ace3369da7f6e107478493e7b732a74650a233171ebb8b306f3e2d872e SHA512 7adc89cc3ba7e4d802d5f96199e21a6ed1dc9f0144d2da5a9a5adb705097d1acf4830c7ff0ce733fb9b0ddc11fba0290cade9f791824db5ab737b3facd93f93d
+DIST faker-2.13.0.tar.gz 1129212 BLAKE2B 358a959a600d5638681bbad20b05618cd2d67857de120a4ff6d8d6c3c723d1efd24ebfa617e3d2090862e111271bd3c12ac3f3f340e8eda6811760c1de31f642 SHA512 700a3d4d6f9019bd7c7e61ed770c6eb2e9dede6e4af9e3a06ca1858a2eebdd67491b94a41396ba1ab4940f0f7fd00f2203db78f5267adb08360b95823c633131
 EBUILD faker-1.9.6-r1.ebuild 720 BLAKE2B 19d8387ce2fe15cf1fff88f00219e630526321f37645f5011920c68056646c55c5f983f9f3bb8c291a4a90ee6503e118d4c6758a93f39cc78c881c46f4e0ae67 SHA512 50c6bffef40a9ff278234abc58cf4ab71e187dbbc9b48631f547ad6d40637150ca2dc040f5d3208126e1aba09fff97cc8a499437777b7113ba5be934510fcb10
 EBUILD faker-2.11.0.ebuild 799 BLAKE2B 3cb0a41f26666e42f9afcbb64b533cbb80c5624d5b04447f6c8136500f65968097c2476f6da5a13e1579dd463c4ee387f8482dc62c9a76fa67616cc0377a91a5 SHA512 cb773add5e5a637eb2a27e98b5229bdf4380f8c9ff2ac9d6061b1cbcc896331b458aa11c17c925749b5a4bad9aaec5b291f9dc121d9a68cfa3ccc6150d9b944b
 EBUILD faker-2.12.0.ebuild 801 BLAKE2B 609e08547e03c49ac7d62e9d5240aa3d8d8640d00d85ce44e1e6d22b3f5cdd73b0f1a43e7b4010ec608c53d4001ae94e169c4cd98497b271b9d7dbe6619bf21e SHA512 a65527c7764100b86d8399f0caa3b882139ffc4981cee878b20bd3e15e3b12f20fb4b11013f2da6e5a66310eb010f524dadda30193b8711bae03268f9cd283f6
+EBUILD faker-2.13.0.ebuild 794 BLAKE2B bf8cbf0dc5a7992dd7bf20b2352783abbd1d23e71e7ad710641473820fca5ea3e8828f132edefcac7b1c0d992230bc4da6166c0c29386214324fd90af4d0f1d3 SHA512 a953537117984f3169944b80a4707901a654f46f64240f94bda20676de0927ce2be8946412c27dd8599c6d59f49df88e0d6f919decb870bce69fff50e1182a1f
 MISC metadata.xml 452 BLAKE2B 70c3af75cc74dd28d3af9df670a4f2f0d898c702a5d5421d46e598ad14c380e288cec076d2a3aaa08e85a198b12daa2d69249feccffe24f07d6d73fea1010fcc SHA512 1c525fb78b733e6301acad7092799dcbba462c471cf3719f5634069a83c67bbb27a705c2ec6a27b8d431842efebef3209d7ca4167f8dda7e6439b1c0cda09eea
diff --git a/dev-ruby/faker/faker-2.13.0.ebuild b/dev-ruby/faker/faker-2.13.0.ebuild
new file mode 100644
index 000000000000..e02e94be8040
--- /dev/null
+++ b/dev-ruby/faker/faker-2.13.0.ebuild
@@ -0,0 +1,30 @@
+# 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_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:1 !!<dev-ruby/faker-1.9.6-r1"
+
+ruby_add_bdepend "test? ( dev-ruby/timecop )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(bundler\|rubocop\)/I s:^:#:' Rakefile || die
+	sed -i -e '/simplecov/,/^end/ s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/gh/Manifest b/dev-ruby/gh/Manifest
index 6c4bbf353958..4de82a7c06fa 100644
--- a/dev-ruby/gh/Manifest
+++ b/dev-ruby/gh/Manifest
@@ -1,5 +1,7 @@
 DIST gh-0.16.0.tar.gz 129499 BLAKE2B 6dea86bcaa8191b2eb19daed487d80e5b55adadccb1c063320b44e742895cad1956e06a917ff35659834b4cf541892d3cd0b432f03783b4b860cf4c7136c7c49 SHA512 141a432b8d5f43feea6cc86be504e35b5133590466f1a28c5ba60a208cde9d3cc1a6f19702757e132e4255220e1161f6dc9621ec18a789d963738b9801e52da1
 DIST gh-0.17.0.tar.gz 129494 BLAKE2B c7c777fb1f0f417c62c9ec0598716302c2cb0a6870ff9534cabf03baea33e73581cac9bbe1f803d23adeb16b15e5af06e4dcc61ab2300846b6c5c227ddf7aaea SHA512 b655552180dd48a9de05d925d9795278ba8f293d03e07fc0675aae9bcef264f45a840b37cc855718c1118c31964625775b1156facf52781e99255bb16e7895a1
+DIST gh-0.18.0.tar.gz 129730 BLAKE2B e4e9a3b158daf83f8a0f0a809eff87e169c7a0a23120b9ae002d0fee4be166d3e6a09ef85ed61b35148d4285dc358a8d616e09c71403b85293574f3bfbbf922c SHA512 a265d25984d4c40340d4e80ce615f2f291f5636725e7dcdc181e3351d00fe8c3355148f206807180041f20db7f09bf94f5d279ceb25ea12ec19215640fff7839
 EBUILD gh-0.16.0.ebuild 918 BLAKE2B 86306322fd2d9bd7df7c1eb2b01f06c140a235abbc01cc0075102e715e861b03822469e68cf120199617046ddfe3150dd5c346780be7d79b7f170f6f3d1f3d96 SHA512 41818e1f35626458e009b2728930e8c8cf12b380e5ceef46213b387b2f5831d25a3527c02e43b2e74005bcf6f2a15aa7ba7d503400bbb04eb8284185e6d8c9fd
 EBUILD gh-0.17.0.ebuild 912 BLAKE2B c6281e196cecedd284e61033de159a5b290bc97c6545dbd7a62dbf3202e8018e8d64604e07e360c42030fbac2dd59d14af275f7107e2bd4ef842a358a35144c6 SHA512 160debae74829ae66e9078b38fc256d50a8443f67fe30ee963fcc0b50c2b1cc8bb00e57f57352d9929007655c9253640a712749276bf6697289a0b8a5266d0d9
+EBUILD gh-0.18.0.ebuild 876 BLAKE2B 64cb4d3a134ead6ab2cb0c47b5017abd027e6fa90fc4fb99210fb8be10fa0dcb8ba579538e9ce181516f89aba6d6180b5b1000d9a013bd5ba1e6c490239836fe SHA512 c23991505c548bc715726a5de7b88dee6950342cb716d37d33eeaecd865b558b6f2d0ddd71ba826af73d3e1c22945b1ed3202f74f5c5478f7d9c488ea957b473
 MISC metadata.xml 328 BLAKE2B ffcac2532a59009124144d5a974ab68f58c35954d76523766184eadaa5ba9602d891c433f40e830cac3d5acc8ea80fe516b5ce69df6e2240454e5ec1d9f198a2 SHA512 827f41487bb4442546ace9b648b2153e910f4e38a9d3edb1d2c231add2ea537c6318da7c5f0b4ee48f016c7c0bc62fba36cf4745fb96f9ad90890b97049d9d29
diff --git a/dev-ruby/gh/gh-0.18.0.ebuild b/dev-ruby/gh/gh-0.18.0.ebuild
new file mode 100644
index 000000000000..8bdd3083a66c
--- /dev/null
+++ b/dev-ruby/gh/gh-0.18.0.ebuild
@@ -0,0 +1,41 @@
+# 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_GEMSPEC="gh.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="multi-layer client for the github api v3"
+HOMEPAGE="https://github.com/travis-ci/gh"
+SRC_URI="https://github.com/travis-ci/gh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "
+	dev-ruby/webmock
+"
+
+ruby_add_rdepend "
+	dev-ruby/activesupport:5.2
+	>=dev-ruby/addressable-2.4.0:0
+	dev-ruby/faraday:1
+	dev-ruby/faraday_middleware:1
+	>dev-ruby/multi_json-1.0
+	dev-ruby/net-http-pipeline
+	>=dev-ruby/net-http-persistent-2.9:*
+"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/net-http-persistent/ s/~> 2.9/>= 2.9/' \
+		-e 's/git ls-files/find/' \
+		"${RUBY_FAKEGEM_GEMSPEC}" || die
+}
diff --git a/dev-ruby/hoe/Manifest b/dev-ruby/hoe/Manifest
index 26f8eb634d7a..c9c82a4c1d53 100644
--- a/dev-ruby/hoe/Manifest
+++ b/dev-ruby/hoe/Manifest
@@ -1,5 +1,5 @@
 DIST hoe-3.16.0.gem 188416 BLAKE2B 48383c46512a359a269ca3475ec701b1443e0ef71b31d1ca1604de391ed4df6b0ad27dd1c5f6ed04751047d211f2c6299245361cf131e2418f224324ac9934c3 SHA512 66cefb5a24906e19bbf0c82c8539d6d101b84d0dc1d3ce1910e4117357639489968271e76e86bd3c432b9ef7e3b24a78294c06210cbef280860f7dac18100606
 DIST hoe-3.21.0.gem 193024 BLAKE2B 2ff65edc6e0aebc93ebc8f3e628261ac3fabec4034b8e7b1bb3c38ab45c8b4641267a8c46c851ad69425c08782553c628574ae0a1417257cf64ba05a86de08f3 SHA512 39da93520bdb4efcbc58af58562ff8abbdecf45f92071ddb31f68ac799eb6f704431cea3d699aa039ba3a5217dc9b0f2d87f8b553d62860c34cb63803b625754
 EBUILD hoe-3.16.0.ebuild 1486 BLAKE2B ef4749acf7b18cd10b8fdb37596f6f77cbfec6e4ec9d68780c4464391fda1f189330f0523bb1f26d3d1f3477bc80f6c67d5d2f44311f42c0d1cae2381df15985 SHA512 b306fc188c6fd21bd4860309a944d73a84d9db49c2fda484b8f895435dabad91ccbec593389e52ff815c36d805cbc48b97fdef6f0bf98cdd0eaa6153c33eed1a
-EBUILD hoe-3.21.0.ebuild 1483 BLAKE2B de43fad438aa992d995576e4881377d8f62aaeba96b54b377f23b9ac19e9db935d572d50423ea152f16e04825a1a4ffe7cddaa07a550c0a7fe7c5400e8608a0f SHA512 fd14abfc35e86a0d1479b792f0a625258e8138203e48e47c29ed5904bed2a160359b65ff062cce8cff1ad537381a2a8b830217112c328dbeb122a324de9ffe4b
+EBUILD hoe-3.21.0.ebuild 1478 BLAKE2B c16df76306a7555b17af895f8f7bf8ec47f277bb09f23e404fcd4be03c9810f260dbfc918a46b17394116bc8e8c3c29c926c341d23b4b3110ad312922cd18c67 SHA512 7a9a177b0b609f7b6a00fa1332cebee297b43ef42d583ccc823d7da1faaf26666d8a2801e3e8af6cfeb30bd1a17a5cabac94162ea1c951766d9417d0c93eda31
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/hoe/hoe-3.21.0.ebuild b/dev-ruby/hoe/hoe-3.21.0.ebuild
index 3843c843f735..2c6c7b46276e 100644
--- a/dev-ruby/hoe/hoe-3.21.0.ebuild
+++ b/dev-ruby/hoe/hoe-3.21.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~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 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
diff --git a/dev-ruby/lumberjack/Manifest b/dev-ruby/lumberjack/Manifest
index a3f8c7d239e8..81bc78bc9067 100644
--- a/dev-ruby/lumberjack/Manifest
+++ b/dev-ruby/lumberjack/Manifest
@@ -1,3 +1,5 @@
 DIST lumberjack-1.0.13.gem 26624 BLAKE2B 16e911d832425d0adf8ee1bd18435733c5451b705c48493dd80e5e8f6b07cb462be2686dcce7a8c46b799fb8a4fa1a82d4d9c06e675cd6e7a990d93140cea395 SHA512 e9e9c65bdeb42de51ad27b70c86d36c5e63e8d73c3568661d52619ca9eeab36cf6aede5e6cd6ab8e8d30446c0b0e7a9702f696e03e06d8b7a73e1c028953eef4
+DIST lumberjack-1.2.6.tar.gz 39474 BLAKE2B 2885a143afd4793ee78b0e8d849a677fbeae94c99bda0821f759b174f68d7c1de5e6e59ef2dc68f99e41c24c6228787098571276b2aef208cd1aecbd17afdea7 SHA512 d8b5a098c9a14fd5d4acc7fae5801a07fdb1927e456c90a666dae8107ee12cad20d34f0b9cf69f2d661fe07af11def74cd1d529c88e17df213754178492de44c
 EBUILD lumberjack-1.0.13.ebuild 490 BLAKE2B 4f960adbf78cf85621bd4b4e9b87c53a1d0a067bdb1b78eef88e1e8fe658338ed49f9837bb4eea1de0f3963d348a432c41ea7ebcd09e331c30c3ae1604bb2e57 SHA512 1cde4cb7d972656a39333a56bd81fab0e93303a80b87f48a3fdf5bbe51a2a366f3e9d8727538255055d054d55290be8dd39048749665112ac6439555c200a64a
+EBUILD lumberjack-1.2.6.ebuild 682 BLAKE2B cbc6a8075f767c6440593d562c39c1ecbebbcfe6c494a4faa40617820602c6e77eba7949a59db5997526c8d71ef3551d8658edeb5072c09696153ef4a037634d SHA512 e025670f600add0847240f0d382c32af2cdcc4ac31daa814bd849b4b116b92e28e22f6253ac1c2ed6e174e21f1e10d262fb8e67fbb9db520875954107a372e5c
 MISC metadata.xml 344 BLAKE2B 7e45c518c60301bd5f6124f1e3dd9efc6025f889e905e39738414e307cbc91408fbdd6d64b9cc186edaa5d87c4292f0581f4b3ee4d06a3784b30a7f3236d3dcd SHA512 7bcfe06a1c5aedd0ff84769299b67bb8fdb41f59f0eee95f7b39c05d1419b1b669083e46db61d04732937f38fa0735b9bd1bef86df1e36fafddb8ed038a4cb7e
diff --git a/dev-ruby/lumberjack/lumberjack-1.2.6.ebuild b/dev-ruby/lumberjack/lumberjack-1.2.6.ebuild
new file mode 100644
index 000000000000..941c0d361977
--- /dev/null
+++ b/dev-ruby/lumberjack/lumberjack-1.2.6.ebuild
@@ -0,0 +1,27 @@
+# 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_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="lumberjack.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple, powerful, and very fast logging utility"
+HOMEPAGE="https://github.com/bdurand/lumberjack"
+SRC_URI="https://github.com/bdurand/lumberjack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/timecop-0.8 )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/maildir/Manifest b/dev-ruby/maildir/Manifest
index 9da04547704e..6ac09a38dea8 100644
--- a/dev-ruby/maildir/Manifest
+++ b/dev-ruby/maildir/Manifest
@@ -1,5 +1,7 @@
 DIST maildir-2.2.1.gem 15360 BLAKE2B d3ea037ba38e83bc7b21bde9ccb2296fc922c3f657a73ad3637faf708cfa16ac75c2e6535714ba18b00aafc5a94265c56f6e086d25de5810c0a0112d6c876e1f SHA512 4c366333c802bbe0cbd19e6abaef1fa31ad84596518d24ddcc33aa3afe39890896d107bc864c68787c90c3a38115979f6a4fe8b442aecaead39306122d560f18
 DIST maildir-2.2.2.gem 15360 BLAKE2B 3e926057b4a625b95879a8ac91fbc5d0ae002ae7f4658c1a9b7a997a5071f30d05ff8e59df405139b0e3a0a060286c61112ca07671ae5e443b6eb2b2f0b33983 SHA512 90f4896cef297262d2bfafa9a2ec155d83f405114b80df8015cf0c6a5450e1b28807d073cf48b2ff03309bf2b7d50a77138cb524826cfb2c429b3c606e02c093
+DIST maildir-2.2.3.gem 15360 BLAKE2B 915abb1ee50a4151f22e0de4e92ff42d3f06b059478f6a4193866714e170cc88740a714bef54a530d3b85bf318c7f46dda6f42b48b7ceadf09c55eea31f5f5c2 SHA512 5dea021c49711f744429c6e5ea78bbb10e3aae1338f780107a1784f6ae8d3c598f9d17b8e0fa555dde4058041dbc7905d62f9d49375d6c4b822a7e88ca065a77
 EBUILD maildir-2.2.1-r1.ebuild 965 BLAKE2B ea320d6fcc95eb96158636d164bf2f51d9708057ccfc93bc1cd049b2095a5d4815d5b0a33760e6f767c45df35d5d4d2cd6ebfeb8e8c101ca363f106d768f5a75 SHA512 3a13e2d446a361cf86e28ab283c7c9ed651e0a3950cbc3d0ba8f9d23b45772380dee7d0679d39d0d1b870316da0eff8203e5ca8daa31ad8beaa7b34ddcdddfdf
 EBUILD maildir-2.2.2.ebuild 1003 BLAKE2B bebc2c9aaff3b3c458654215a5ec565786bffcc69a7a65802953ea56f0da94b9a3fd25d2c8eae8caaf29098857a3564787c3ba74069b333d7972f9192992cc1b SHA512 17be1f9d41365dbec7c98de06b0ac0dd1b8c372a86968c527e295489d413485de8d8f5b9669497828e4f425cc141af7baabb3ac889074ba484638a987796068e
+EBUILD maildir-2.2.3.ebuild 926 BLAKE2B 3f557b8b00e000a1e538f41ac687a2f35391e358636e0c227f5476f566ac9129e4056f68f2dc7ddb4a92b748640d283df0bfa70c553ae76b5bcd625bb7fa8a36 SHA512 55807ce5ff81dc0c76fc60ea3eb54f5c4b727ee618b5c973d458618f01b9f77939d4bda6502d55e31915a887e84b5033f4f1c9fa5b6e7a0e257227a9385bce66
 MISC metadata.xml 341 BLAKE2B 6081100c628ae44a08e012674babbb174a563ffc3c9239bb4dc117e372af60d23a68f8666b4f79c2a17c0270a8df39efc0106a07bacf600b76b5d85dfe9facc3 SHA512 68ef596ba601b4886488bf164b786fc0deaca4a10441ac164bd6eef0502c12e380ca27215f6599660467fafcfc3b6183fb7ae0dd847888aa8919437896e6119b
diff --git a/dev-ruby/maildir/maildir-2.2.3.ebuild b/dev-ruby/maildir/maildir-2.2.3.ebuild
new file mode 100644
index 000000000000..5e034bb678bd
--- /dev/null
+++ b/dev-ruby/maildir/maildir-2.2.3.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="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRAINSTALL="README.rdoc"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for reading and writing arbitrary messages in DJB's maildir format"
+HOMEPAGE="https://github.com/ktheory/maildir"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="2"
+IUSE="test"
+
+ruby_add_bdepend "
+	test? ( >=dev-ruby/fakefs-0.3.2 dev-ruby/mail dev-ruby/shoulda-context dev-ruby/test-unit:2 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile test/helper.rb || die
+	sed -i -e 's/shoulda/shoulda-context/' test/helper.rb || die
+
+	# Avoid tests that appear to need activesupport for .blank? support
+	sed -i -e '/add and remove flags/,/^    end/ s:^:#:' test/test_message.rb || die
+	sed -i -e '/be removed from flag list/,/^    end/ s:^:#:' test/test_maildir.rb || die
+}
diff --git a/dev-ruby/minitest-power_assert/Manifest b/dev-ruby/minitest-power_assert/Manifest
index d98f0def3a9a..150007ccc35c 100644
--- a/dev-ruby/minitest-power_assert/Manifest
+++ b/dev-ruby/minitest-power_assert/Manifest
@@ -1,3 +1,3 @@
 DIST minitest-power_assert-0.3.1.gem 8192 BLAKE2B d5b9a862d19776d673fb510d2cc52b6741ac20c9b286228a672e49f681d37d2d2c3517253c70b5d1a8d8dc08ca2ac35f8105717edb74a28b6a2ed8667d94a9c3 SHA512 178c70dbe0db2b2248fa83437241d80c7054bf51e21afce74c61bc178907b98ae5b691e0cb644d5754a497d4944520e1ebf7727f1d7f286b4aa28b4560a54cbc
-EBUILD minitest-power_assert-0.3.1.ebuild 529 BLAKE2B 43c4a787b2b0b1266f84bf91b8485fd3baa801c967e0f2aa7b3b09d727d39b1479af0bdeaf999d69854ed1f63b3457c9960d43280e39db0b3420a776e68e99c7 SHA512 1885b07837b6122884bdd3a6af3f3164e0eff98ad97eb3a1930388be3fe43c7a6b87c70c049e5c55350a4116e962371a22cb2a7433b8dde5c73ca2120b16f313
+EBUILD minitest-power_assert-0.3.1.ebuild 525 BLAKE2B 9c349e7bb2e04d4dfb5815bd92daaba5e3fdd37bc0aa859bcd1c99c1cb4aedccd93bbf489308ac53db5aeeada36344d6980a286ef8ee638148356dfae99b1aac SHA512 dc2c0293d2ca1ae7c0778a752ff438304b9aa430084dbfefd95457a1a43ec97c19baa547fde18c693f9ddf31213332ff8cf0d6a87d5303daa1bd085ff9b9e6b8
 MISC metadata.xml 352 BLAKE2B 602e40e72ddfc6763f110238ecd49ae67cf566e86a996e64514e4d0302e88e287faabf52cc27bbdd50dbc92b996d06b66e8eacca2f75e318c8fb98ebd08d28ba SHA512 bee51a932b3efd1dc3a3df1d6572f83ad7011b0947f9bdbbd42b5e5ec222bd642c27f235fe3646a903597e678f0894d6c8bfe1aefce1a3e3e9e42ecb53b5ab36
diff --git a/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1.ebuild b/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1.ebuild
index 08bfda66df0c..3e67847d11de 100644
--- a/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1.ebuild
+++ b/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/hsbt/minitest-power_assert"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/multi_xml/Manifest b/dev-ruby/multi_xml/Manifest
index a1fbb11daccf..8e022dd87aae 100644
--- a/dev-ruby/multi_xml/Manifest
+++ b/dev-ruby/multi_xml/Manifest
@@ -1,4 +1,4 @@
 AUX multi_xml-0.6.0-ox24.patch 866 BLAKE2B 366aa40e831d76b4dfd6516d0b80599c70e0b0c2cd804c2f8f96b82a1582c933e931153f81f27bba8176bbe3ee8f6c4517468b58bd8bc7b380fe6c6257cb953b SHA512 f054a4bba4990f1ff8d6236ed2a99b97182b96c343b749e18c90c63faef10ea25d8f40ca0dd92e58aac8924d0cee15915b3ae2ebe5a6e6c024ea6d4b38b5e05a
 DIST multi_xml-0.6.0.tar.gz 16571 BLAKE2B 1492eab7782823915167ebdb529b6d4699b31f3b66c48eee5acf7857dc25caae62b63a0da10a0bd862ade22865432bc6c4290a3f6ff8e99a889fcf09b56f6b7f SHA512 67e280d838ba07373a6ad5cbe4658b32655102906d8e0ed5429d21220475c21e07ea2ec0d2729df4d30a1bf7d0a5e6ff2d4482342098873135cb12e18c53194a
-EBUILD multi_xml-0.6.0-r1.ebuild 931 BLAKE2B 8300e5288bc1ff371037af51061413bbc3156e54f2738b1b6f01169c44b2ae476c0196778b806db81c68ae288f09ae0f424d81c4d369065111321f8f03d55634 SHA512 75530dc3af310a084eac071f7537c82ba9ce0d92b57ce076a83ae11281ee21f788525bcac2981bbb5c45d2ab94e20b751df447074f07ee63fbeef4c22de86a7f
+EBUILD multi_xml-0.6.0-r1.ebuild 966 BLAKE2B c5e47a049141247dbe3e93a922487cc011424d23a0e4b287d0d353740788a1b4589ce23b488a6568959f20b9a3da9c8e67547ac62990d348fd95f11c12188dd4 SHA512 8f04748d8d74ba669677a4b0ee30b037a9e13f70bf8569bfc988065c9ae6a7669bd19ef550bb28ea07086b224d5b088ab13799e9bd5da2855fb2d573e05d51ef
 MISC metadata.xml 332 BLAKE2B fc83aa0e31b636d7abd190715ebdb0e7b205444f571344bbddd7d9b130d7ea566c38ce12caf4429b54db3415181f229ba5e012408596b6dff701f34e7e5b3a6f SHA512 53ff80596848fb984f23e66f1eae8bbe9e844de4760fbea929405d6515a250a710dc9a05f61cc7bf84afb069b2bc52a7304a1c15fa1a109bc7d6494fb5e1ef93
diff --git a/dev-ruby/multi_xml/multi_xml-0.6.0-r1.ebuild b/dev-ruby/multi_xml/multi_xml-0.6.0-r1.ebuild
index daa192d2ecfb..d73279c77376 100644
--- a/dev-ruby/multi_xml/multi_xml-0.6.0-r1.ebuild
+++ b/dev-ruby/multi_xml/multi_xml-0.6.0-r1.ebuild
@@ -31,7 +31,10 @@ all_ruby_prepare() {
 	eapply "${FILESDIR}/${P}-ox24.patch"
 
 	sed -i -e '/simplecov/,/^end/ s:^:#:' spec/helper.rb || die
-	sed -i -e '/bundler/I s:^:#:' -e '/yardstick/,/end/ s:^:#:' Rakefile || die
+	sed -e '/bundler/I s:^:#:' \
+		-e '/yardstick/,/end/ s:^:#:' \
+		-e '/rubocop/I s:^:#:' \
+		-i Rakefile || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/mustache/Manifest b/dev-ruby/mustache/Manifest
index 363251e2264b..1b08981cd58f 100644
--- a/dev-ruby/mustache/Manifest
+++ b/dev-ruby/mustache/Manifest
@@ -1,5 +1,5 @@
 DIST mustache-1.0.5.gem 41984 BLAKE2B c063af6c9464884114b55c30df6c6cb2685b0394aa9280f006b6c35cd0681c8776edddccd1a33de75e291a2e1992477c1d70f6cb1c603e800b08be5b989a9ca0 SHA512 d9b2c55d758bd4e317732307b513e2a079b04ec7a1203233834fd08a3a32f7b1bf8283d207af2f7082a8c4847f9c5955a557f19bad9b08a1dee2f32417eca190
 DIST mustache-1.1.1.gem 42496 BLAKE2B bd1becb1c296abf03cdd6c7d5a6f29b71dc6328c126dbb27420872088b3b6988ac56d91c13f669cca94932f23f4290277d9ca6597ff842ff226e092c2532dccb SHA512 91a18a374a0348317d0801d6784fedd0782d7a08f128d3ab7050e631b34e45cecd49c4b1e2a9e17204f70bf169c107a92a1e210532bd3faa98edf8b1b5e8e43c
 EBUILD mustache-1.0.5.ebuild 880 BLAKE2B 3900c31778270f31adf59785138725ba225c2d04af90abf8ccebb4019789c38010e3baee9afd1b4ebbe24162846c2e7423de81272f1f85bb82208afac524a923 SHA512 87ac6cafca9586f7966b4b5a57d39a1edd1ce40d6b5bce04ef0be3c877858673331cfc7e4990f844b5671fb0cba999428050f0a7a4827c0948dd95aa30a6f741
-EBUILD mustache-1.1.1.ebuild 904 BLAKE2B ddbf4e025e270bb6087027eaf26d807aa8cda065e1b2d1a8be6f1865be99ef0ba819f6e098142dca50c4cc60f7b6644de4aa560618dfb465a8f278fbca951a11 SHA512 a09f0085ea8d3ed714b276ed61690199523ac1200ca9e20c3cc85a73bd71f6ddd030c1738128f0f86a11e48803fc7d44767100740d4d55afb4283f0150654195
+EBUILD mustache-1.1.1.ebuild 899 BLAKE2B 8cbc40da227a450d20d0a5cd453b4adbbfe45955858d3766a2b686de90466ea429307bfc5d7308886b80d99840380f97d2863f593bce7ced48cdcc5b20b988cd SHA512 c0cc645fb6359a5a3425746be4f4d949e97df3fc03ba086472e78ce886ee6d1d176cae3306e61d0994d7c8c57151471d4d6696e0cb7b7690911aa76123cca467
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/mustache/mustache-1.1.1.ebuild b/dev-ruby/mustache/mustache-1.1.1.ebuild
index 5e9c7ef9faba..12424c6fe07f 100644
--- a/dev-ruby/mustache/mustache-1.1.1.ebuild
+++ b/dev-ruby/mustache/mustache-1.1.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://mustache.github.com/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 ruby_add_bdepend "doc? ( app-text/ronn )"
diff --git a/dev-ruby/neovim-ruby-client/Manifest b/dev-ruby/neovim-ruby-client/Manifest
index d4933aa8a958..930d88519158 100644
--- a/dev-ruby/neovim-ruby-client/Manifest
+++ b/dev-ruby/neovim-ruby-client/Manifest
@@ -1,3 +1,3 @@
 DIST neovim-0.8.1.gem 43520 BLAKE2B 0b7401c1dfb1675725dbf50c45626d88b1a5932ccd4836e8a33974b8e71e44bafa10bf1a43e51b7f42e2702facec776cbcef3093c5cf86e500a5e94be9486b08 SHA512 2d56cd56c0817491622f9a4beee4cdc9244e9fd6a4a6b78d69b51f160b1a24395730f153800279b7fdebc99d61c55e3b8944d4b16c1028cfbf5d8c95308d0f53
 EBUILD neovim-ruby-client-0.8.1-r1.ebuild 894 BLAKE2B 30c318169345d750764cb546d3cd50e47bb005c2f6eecfaec64cfca2d6636c6158e284e7f329411cdd2c283f4785bf158b2f7c1e228e8eb37dd92b36b8e3e854 SHA512 0dfb217d3f99081be176a5b603cf073918ade6ab25775d52fbfebb2b862c4e08d97edb2ec0599f31c24654acc9d5ccf9aac5c8a7dac8e126082b657cd85fdd85
-MISC metadata.xml 469 BLAKE2B fd47786e5ede3d43dea030acb9327e101b34998eda45b0a88ee6073c8aaac316d9608bb650f382e75bb7150990733a39bc6d24171f2ba2c32e7a76838ee47004 SHA512 a1b032f8a56a7d849538c6517c516e2c6ec80b625f1404519bcede7726f6bd461f2e21e043a559beaf301e1e843f16de6ffd0efb792e449ac3921c72fdb828b2
+MISC metadata.xml 347 BLAKE2B 874c0ad5d49519c775bb2181aeb742ae08fa3c6e4b63de6975602ecfb3e03a8901b9a8f3eb0247152a82fe7101ed72911051ed94921672ddd47a4d5e823f9f6e SHA512 3ce78ce24378f88bdb189cc74a539f410be61e99a7c7dcbc011e0fb8f1a2e862a7a65b160f5dff73bf04009278dc77484e7ea39670ed68209a3a1ba1b8b0ae51
diff --git a/dev-ruby/neovim-ruby-client/metadata.xml b/dev-ruby/neovim-ruby-client/metadata.xml
index 60964a1230fe..fac91d927f18 100644
--- a/dev-ruby/neovim-ruby-client/metadata.xml
+++ b/dev-ruby/neovim-ruby-client/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>tranquility@gentoo.org</email>
-    <name>Ole Reifschneider</name>
-  </maintainer>
   <maintainer type="project">
     <email>ruby@gentoo.org</email>
     <name>Gentoo Ruby Project</name>
diff --git a/dev-ruby/net-sftp/Manifest b/dev-ruby/net-sftp/Manifest
index 52ff3a9b74cf..e0e5937193e5 100644
--- a/dev-ruby/net-sftp/Manifest
+++ b/dev-ruby/net-sftp/Manifest
@@ -1,7 +1,6 @@
 AUX net-sftp-2.1.2-net-ssh-4.patch 1628 BLAKE2B 1dc8caef775ca06c80f485732acdceeedc10aaa96e33c1c6c59ce5e1596a71a229aecb06092b3a265288ae46469d1c72b4a0de8ec3d50cba5fe0947158c3181e SHA512 dc4e99f13e32698bbcfe1b07e2ec4baa1ed9beec5bc3816c016f26b053f7134bb9646dc538a0d03f2f3bda4d8d51d9742a5be54dfc6f9340cf2861e296492855
 DIST net-sftp-2.1.2.gem 67584 BLAKE2B 6b8e15f42c7a18f8c9aa7118e5822281eda6505c34697282cc9c52375ea0e4042f3045f41c2e9a15b8fd20f02946bfe6f3ad557aa5859a8e54e4c0ae8bd1d53d SHA512 126a9537a4ac45150096db4d46ad19e0d8a1833fef3733a1b66ff01463c0d109415f0ef807706ff88be8c5c1395bbd4620e529f06e3c9f746a4ed6ec2cb7d18d
 DIST net-sftp-3.0.0.tar.gz 63542 BLAKE2B e09e209aa0d102a6da7611cabf49970c9a4e572d51946d5dc0688879db97c92e8a39713dd0011a4234391ff0ab685a978c491917c041f7d10a8f092fde5c876a SHA512 c28411cfa8522dec893fe7a1588a16bb761a9d7692c81c453d9a9ad817988637614c6afd754db8547e845a16062882e2b7e95974b889631676f092d9e84b83e7
-EBUILD net-sftp-2.1.2-r2.ebuild 581 BLAKE2B 245f088a1cdc169ee22d77c3528fd198ee92ab230c77fde7aeea6ef0909d2792be36545ee428ddc5ffb4469cd88a57129c94d48557e87f5011928515ccc6a026 SHA512 c2ba65891c5cc82556c5d08de5d32da771c06734285cf32671ab549acef378b9a1702220a85c64ef51851d7d0e88f6c286665bf2fa1f3e4002e4c351abbf2751
 EBUILD net-sftp-2.1.2-r4.ebuild 583 BLAKE2B 805645d80ea7d4e3e06ca3ddb57ac144f8dbb333bc7cfdbd1c8e6a1db760ec53a3526c73fb2ba84bfd420d50e2615b70d2d8c11977d5a7623d8f44cc6fcbd76f SHA512 123341bbb0bdd4c85530b479ef602fd4b8bbe77cb91e3b5780643cbbab1a367c0590a31be3c41f614ada76a7a262d8cecbba7af18ae1f86df10f64e05e132f5f
-EBUILD net-sftp-3.0.0.ebuild 833 BLAKE2B 82a36d550546e8f3293fb6ac6231f498e112dfb380a92777a28cd43a4b7347503827ad279865673dda9d8083c1ab9aab1bd43641102fdb9194e87de8db3c990f SHA512 d4d883685c8f8cd0d338457b62bb77679b3eaeab5a8d967a895ce0d35162c2f773b3351393f1807a9c679133e7214de80dfeef1492f7aca7324c64b1874c059b
+EBUILD net-sftp-3.0.0.ebuild 829 BLAKE2B 6eb91a452747e78a68c4b3cb27fc1e3fe3aff7403acb68eada666fe40d91202c7d266337a8c4b1655aed2304f177414de1c6674143a50dc6bf8588cef4c165a2 SHA512 da479b4ba05ef64da244581341e13d1160c0fa6e6e60d38b2b982f3f58d6942603aa007c93a36b61bdcf5bfefcad8625f09b3e19530dfbbf93c786795e4409bc
 MISC metadata.xml 342 BLAKE2B b52478d886842e044705cc42c177577f111b2c01140b58d322107ecaf20bc1b5db9763ec0f0e67397118515690f452b51c1e14dcf6bada17d7c5f18889571b07 SHA512 3ece29fffeee2912d0bc06514adca69c2bdfa95bd88173d4f42cf0aee00944adc71bfaec6df543f0c1fc1717b7a808459f30894977154f7acce289dfb491f6d9
diff --git a/dev-ruby/net-sftp/net-sftp-2.1.2-r2.ebuild b/dev-ruby/net-sftp/net-sftp-2.1.2-r2.ebuild
deleted file mode 100644
index 99deb87ee5c4..000000000000
--- a/dev-ruby/net-sftp/net-sftp-2.1.2-r2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="SFTP in pure Ruby"
-HOMEPAGE="https://github.com/net-ssh/net-sftp"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_PATCHES=( "${FILESDIR}/${P}-net-ssh-4.patch" )
-
-ruby_add_rdepend "dev-ruby/net-ssh:4"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/mocha-0.13
-	)"
diff --git a/dev-ruby/net-sftp/net-sftp-3.0.0.ebuild b/dev-ruby/net-sftp/net-sftp-3.0.0.ebuild
index 062730234f59..784229f0b9e3 100644
--- a/dev-ruby/net-sftp/net-sftp-3.0.0.ebuild
+++ b/dev-ruby/net-sftp/net-sftp-3.0.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/net-ssh/net-sftp/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "|| ( dev-ruby/net-ssh:6 dev-ruby/net-ssh:5 )"
diff --git a/dev-ruby/octokit/Manifest b/dev-ruby/octokit/Manifest
index 8f2c569133c6..d2961163fab4 100644
--- a/dev-ruby/octokit/Manifest
+++ b/dev-ruby/octokit/Manifest
@@ -1,6 +1,6 @@
 DIST octokit-4.17.0.tar.gz 3090364 BLAKE2B 42545bdaca8ecbbc3a3e78e70d535c634f20741651d41dfec254dd68254acbc82a992c93314b871d6bae7b4ca8321339b888fe7b5b7349fe9b48dbf6904f4524 SHA512 da6a90e77991d17697424da22c9481027f23f5ecb52e294748fe62c3a7c228412a276a01e6816b201e597b73f271b83e70c4d86ff9ea40c0204dae5c30df929a
 DIST octokit-4.18.0.tar.gz 3091587 BLAKE2B b48ccfa35f53b686e61a0f79c09bf20f063843c98f75a0896e71739a33cf9b770c8b5e5c27cda2c8a25ca6255cfa7c4e389b372ca269d4c46b499abf1838a4ad SHA512 e749afc4303f987b502f8c79ff60e33c6f49ff84d25f16cdb3d9165c7089912570a7b77af3716341cd5216e5c8e3534a805e4347081ec7765a4e4f54fc432ce3
 EBUILD octokit-4.17.0.ebuild 892 BLAKE2B 1d6b9c1f92a4e1c36c9bd7ad061b8b27bf06d4e8718d53f2fb0e7c7067b05de8c15da808a9249ec1e182468013eeccf54ba0c9d2020e2df394af932fabfaa897 SHA512 d8d8f441ddd10af5be514ab2add237dd29c78c3410fa499212bfa4b1e3c9a6ac0388d284c22b2041a227ea9aeb0b21483dc0f73ac34650ad35d269f310567950
-EBUILD octokit-4.18.0-r1.ebuild 926 BLAKE2B 57d6d75d183e2a451b361f99096cce94f19d19526381bbf03b4310966af43510fc670c659e9826557eeda143922887c70b37bdafaf2c54b396b89f2e8c964e8c SHA512 13ea7f71fbad7a4aa1e1940c51562914ec2c37a82afadde9fe58ef86a2d09edf42f0ca0d316ac2d3ce29932c3861878c7b46b5db5ea40467913cd3d2c044976c
+EBUILD octokit-4.18.0-r1.ebuild 932 BLAKE2B 6ef3040c27ac06c24042e13eea67ef3bf3adc4527822dbb1454e79519245cea8ec520f071c2c4c73a925b72a1b4af84e85083cc2aee105740ebc8565b6119494 SHA512 8a29e13202aba540a829d30cf28706b5b33947331ef418b1fd93c7c0b982e244f6e7541d5d970b850364f538f5f8c5d782341258a35100bd1f8bc0b803b2d0cd
 EBUILD octokit-4.18.0.ebuild 916 BLAKE2B f31fe1ecb2508b059ade36e017a53e3d4e62f126a14a30fe69939160f49c93d54c4c15b30027f51132bbbc0cccf0d4814500c49a017faebcf4069c15a9b62a03 SHA512 e87ef4c75d0150b41f38e58ef979d229c0d68181c6c8352f16c69f99b8196f11219e1b74bcaeeb35e6599a238261038359ec5f346963e7ccd8d634176b9dd9a8
 MISC metadata.xml 344 BLAKE2B a2013bc4988a44c7d4b2e9dd6005d30390a7fdaf39f37a4adf8b539825b43f5d0eec457dae147b782f90f15d77fa5f485a6bada65be086f67b7350603945cf64 SHA512 3866d3979a8749d780367b56ae524d8f78286d2174602452ba272d26a4fb49cbbe8945183e4a64e70400b758fba4fc6bf88bcdf24908e474a378b628a1263457
diff --git a/dev-ruby/octokit/octokit-4.18.0-r1.ebuild b/dev-ruby/octokit/octokit-4.18.0-r1.ebuild
index 0b3ff206b168..6749ed154883 100644
--- a/dev-ruby/octokit/octokit-4.18.0-r1.ebuild
+++ b/dev-ruby/octokit/octokit-4.18.0-r1.ebuild
@@ -31,7 +31,7 @@ ruby_add_bdepend "test? (
 	dev-ruby/jwt
 	dev-ruby/mime-types
 	>=dev-ruby/netrc-0.7.7
-	dev-ruby/vcr:3
+	dev-ruby/vcr:3[json]
 	dev-ruby/webmock:3 )"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/pkg-config/Manifest b/dev-ruby/pkg-config/Manifest
index 1c5598dd3a49..3db552957af9 100644
--- a/dev-ruby/pkg-config/Manifest
+++ b/dev-ruby/pkg-config/Manifest
@@ -1,5 +1,5 @@
 DIST pkg-config-1.2.8.gem 20480 BLAKE2B cc11b5eff30f0f5e1a91e64902931ed540da108fd326fe731b71527c9c4310f55e9002617e1baae4f71a4b705b20cf10f6fa112f8ef56971e82868145d372a47 SHA512 d83a599a48c7d404946054c6846b6cfd9fce2a264c288519a6eccd9787f05d45397dd46300bf97c80700921456318154ea6d44ba32cd159803471073c2a2b065
 DIST pkg-config-1.4.1.gem 22016 BLAKE2B efac610221b288bb669a3783c0e70af3951478147896315c53af2186912b60045096c0ba01a0a59ce09897a2e4e747d28a091b947281fe7f6dd6f85cea31aae7 SHA512 72d61466c1ea53a5eda66a8e8f8106fef0269fefdd349ac83959a34bb8f36796bd3e9c7fbcbad5763d2fca015c65436f9d410724e27b6d1c495e3957d26757a6
 EBUILD pkg-config-1.2.8.ebuild 808 BLAKE2B e966ce51b3bf4b5504b76194a6f75d293d50ac23d1c3538ecac2b37261074b798ec3eb6b2d2af73d87b2925f8be35f979373113b673d1c2a917a59ecf213d214 SHA512 2d5631b30ce63bb2273be43b50f0de5cf23f0a6a1f26ba13fc250118b37643a3bb6269155a02d498da6e4cae898829c27b8a2a2ab94e909d9a6c6d7c99df4194
-EBUILD pkg-config-1.4.1.ebuild 788 BLAKE2B 91a5f8b508dfe362661c2280b6d92c3d77ce08c350ca52b00d51174dfb063c7c516025c56cff59f4dcc0d710f6e4ae4442723684fa565349d2018102391ad60e SHA512 a8e9ecfbf33000ebb841cfc884149e9aed6be49455179941c892fc648d3401748d3103246b6c02d46986642bf672099e05857817770f770db61466faa750cbbe
+EBUILD pkg-config-1.4.1.ebuild 783 BLAKE2B f70ab15fb078095ebfed75d591ab2212329f21280f7414a03970905b9486e112d40510cd5f479902b6f6a643bfe3d04309a9dfd1bff07e434f2f4ce3d890d9ca SHA512 82d3f877607775ebcaa5c48b9e70ab09d98fb93c445d306b332c1321f4098f8ed4ffa47ed742b5fcbe0ff000df0dd085e51adfdc2490f4dd903cb6a4684a5282
 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
index 5eeff83b178f..2c1c5782020a 100644
--- a/dev-ruby/pkg-config/pkg-config-1.4.1.ebuild
+++ b/dev-ruby/pkg-config/pkg-config-1.4.1.ebuild
@@ -12,7 +12,7 @@ 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 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-ruby/rake-compiler/Manifest b/dev-ruby/rake-compiler/Manifest
index e45392a67c78..70e8247d6f07 100644
--- a/dev-ruby/rake-compiler/Manifest
+++ b/dev-ruby/rake-compiler/Manifest
@@ -1,5 +1,5 @@
 DIST rake-compiler-1.0.7.tar.gz 33444 BLAKE2B c3a92206d4d7defdf21295aaf094f704596962a3ee79c3517ea1058732e1f9f378b5f14bbe3b9652572564d11c566e26014e187dcdb488409bf95ea9a52e0a7c SHA512 fa901f5cc48891f07bd8d9a27cf4e745e87d5a667dbee0c9f4b43f9564fdfe3067b9c658f10ea8bcacd32ea7320a542ef0fca9373147057472f5572a4a4c5268
 DIST rake-compiler-1.1.0.tar.gz 34819 BLAKE2B ec4fec1eb92031f9f6b378b190c4e8a2f2627623afd6fb11922f71a93431de94bce640863deea2aab05656612533ee2b110f295f87590b48500583af71b08dae SHA512 77338776506df66c2e99e9b1b82dc4d54cc4e7c8fdb1f8b7b6d7507b9f9cb0718839e5139e9c0cb6295259e819dc8a011101e2427cdd387b568b639889321d60
 EBUILD rake-compiler-1.0.7.ebuild 1423 BLAKE2B c5893a5d99de366b4c86d631dd553b20caa3e4f3086a8e802039933dd2021ef6f7bfaad4acfb13e80262d16dca69006fcdfdc27c88212e2e8b5df60f19c44cc7 SHA512 fc0aa2f699b832f152719b4748ea17d1ce9ba51d1a7549b3fcda6523047430385d26fddf1f6db3a21ed12dc46d73c7c19131c1ce1b7ab089449ddf2bad853380
-EBUILD rake-compiler-1.1.0.ebuild 1480 BLAKE2B a3e034d4803993fd49bdd965a7bf1894d82079023af33193833a0b0329831feba0d6fa10201453ebe04692906364e9b2a0ea054685a7b2c41aa8c9c4786d54c8 SHA512 06968902a28412efe2ef124de8387dddfce273088a8902617929e19893ae59331d23f5df7e2872c9f2ca6b6e4f627b291811890dd77e5561f227ba05738c54ee
+EBUILD rake-compiler-1.1.0.ebuild 1475 BLAKE2B 7bb5a1fa35c32f9764ed434444c0143eda418856100e5aec2bbd54a79af9db88abf092080197c8b0c6e31315184e9ad24641607dd3b1d40103a6cc09c03ea135 SHA512 25ac756511f204ddcc845021d9e66a7eb0d7c58e6ada35b4ebb51143e37dbe3fc0b3967be643d6547bcc459411e3cddcd85b328f3a7ba6549f369705b70ac0be
 MISC metadata.xml 350 BLAKE2B 35df0cbf74d904e36dc5b5f34c31a41bf9659942415655f635a112d01e98833babfd42640d5155392f5563fd1756b104671348c077e8a62a2d6efaa68389a3f3 SHA512 2f027e154015dbb7a0535356a313b2f4bada336f6c1549aea9db77f57b43ed7ff19408e3ba507010d50e0953f5f6fd51d9bec956653725e1e087d94a6ae3eb83
diff --git a/dev-ruby/rake-compiler/rake-compiler-1.1.0.ebuild b/dev-ruby/rake-compiler/rake-compiler-1.1.0.ebuild
index a25e0df32ec4..d1c395fb3750 100644
--- a/dev-ruby/rake-compiler/rake-compiler-1.1.0.ebuild
+++ b/dev-ruby/rake-compiler/rake-compiler-1.1.0.ebuild
@@ -19,7 +19,7 @@ LICENSE="MIT"
 
 SRC_URI="https://github.com/luislavena/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/rouge/Manifest b/dev-ruby/rouge/Manifest
index 1d626331ee9b..d2ebc41597fe 100644
--- a/dev-ruby/rouge/Manifest
+++ b/dev-ruby/rouge/Manifest
@@ -2,6 +2,6 @@ DIST rouge-3.18.0.tar.gz 882486 BLAKE2B aca9f22b84a168423cf66189a29ba51611854e03
 DIST rouge-3.19.0.tar.gz 919603 BLAKE2B 53cffee53d8c6bd8e27dc0278f9ef8e9bff2a01d568d2342847ce0afe71ec72a8394f6e9184f575e38abad7893c61a4553ca73c8072bdcdb91f347ffe63a65e5 SHA512 4a59e5bebfb0c58be82bcc23e7a9906d9ff5cba8a636b47b94be00194ab0ab6cfae4d584586ee037e160245630abada889aa85332398289a214b7a493a8e825d
 DIST rouge-3.20.0.tar.gz 938340 BLAKE2B dcb61527f023e34be5c2fdc362f74b64be24cc26e32f88ce7122ab7fbbee5c44f5a29c5c1d8fb5e721ede2df0119cbb2c00b5e178d1462967c54a6d062ae2e53 SHA512 3eaee2d98c5cb252d783c5bae365de4c400d980917a59b943d6fe93490c48e9d36e51b7d92acf468c10e702c942074f1525fa7e1c81c7c37d9b0927e9d4f332b
 EBUILD rouge-3.18.0.ebuild 975 BLAKE2B f4047fe67e2f67878339557a3a3d2876793828b5e6931cd73064348f9f85bfe1bd56a50de4da7eb1db5cd5d51a4315e635c180e23c2c6975930f184759ed59e5 SHA512 f3559e9d6fe08b095fc13c0dcf27a59a2118a900ce258120479d0ca5cab01020d4323881e67aea25a84a3e1a134def2e1be883e5d4c5f4f609c743807dda2bfb
-EBUILD rouge-3.19.0.ebuild 975 BLAKE2B f4047fe67e2f67878339557a3a3d2876793828b5e6931cd73064348f9f85bfe1bd56a50de4da7eb1db5cd5d51a4315e635c180e23c2c6975930f184759ed59e5 SHA512 f3559e9d6fe08b095fc13c0dcf27a59a2118a900ce258120479d0ca5cab01020d4323881e67aea25a84a3e1a134def2e1be883e5d4c5f4f609c743807dda2bfb
+EBUILD rouge-3.19.0.ebuild 971 BLAKE2B 08e80a66dd9ea50b2e5e2f4f09a28fc40b5827b6a9783bcc50642442c15b6e0c1b3d2d0665828c1ab54c2cc4e56cb991f9c7ec1d1bc7f766a62c5e2784bf0930 SHA512 cbe03cc2f1d779dae389556c693be00d812b6bc5ccc1384d9f2d7fb72f0d3a9fa9297e3da274485e46a46b4b64558045c13108ff248c16e289b5878b9be8a9ac
 EBUILD rouge-3.20.0.ebuild 975 BLAKE2B f4047fe67e2f67878339557a3a3d2876793828b5e6931cd73064348f9f85bfe1bd56a50de4da7eb1db5cd5d51a4315e635c180e23c2c6975930f184759ed59e5 SHA512 f3559e9d6fe08b095fc13c0dcf27a59a2118a900ce258120479d0ca5cab01020d4323881e67aea25a84a3e1a134def2e1be883e5d4c5f4f609c743807dda2bfb
 MISC metadata.xml 337 BLAKE2B 0b11fe43cebeee93ba1543bf3784c624a91373b066b90485698e9f58ad95d2d4ae077fa5d18d097deb5d8678877b915a9df7154899169d35345fc8fc52bb1c44 SHA512 2517857c1be612b98601b4f92e3e20f3e404902faed1965f8e2e0573820ed6dfc12de25a292bc5f5971b498e310cdfe4a3a5aa13f46354f5139c53ae6a53b876
diff --git a/dev-ruby/rouge/rouge-3.19.0.ebuild b/dev-ruby/rouge/rouge-3.19.0.ebuild
index 1ce32a97ce3b..0e51302dab05 100644
--- a/dev-ruby/rouge/rouge-3.19.0.ebuild
+++ b/dev-ruby/rouge/rouge-3.19.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~x86"
 IUSE=""
 
 ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
diff --git a/dev-ruby/rrdtool-bindings/Manifest b/dev-ruby/rrdtool-bindings/Manifest
index 3a7e9b225fed..e95ced7e00ba 100644
--- a/dev-ruby/rrdtool-bindings/Manifest
+++ b/dev-ruby/rrdtool-bindings/Manifest
@@ -3,6 +3,6 @@ DIST rrdtool-1.6.0.tar.gz 2186538 BLAKE2B b56ef79b9d45a65cacd7c1d8da2158dcaaff3e
 DIST rrdtool-1.7.1.tar.gz 2881346 BLAKE2B e538c6ba3fb6726f0515ed655aa8d5e184f6d3066bb32e981b3254e41c53e29529698da5ef73f8365391180c76d15808d1d727a0834b8025893b01c3b9af8f46 SHA512 ee5c9ff234493442ccd9bfc7031700483011de3e05c01e026509b699cb0d7d3e286e2046357c5fff5807f3e709043c8f218b48b43f8b126a23e228a3927d7b14
 DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
 EBUILD rrdtool-bindings-1.6.0.ebuild 1367 BLAKE2B 3455abcee11a899fa33f558abe25e91658537e5a62afa1b50500bed126baf1d1f3f28542ae60ad2105a199565b0186453eea73d804ae50015e88b2210ab449ad SHA512 5e3215de973ca0445d5342eb54f81fe775dbbee389f725c43e04eb90926462cda1263d9f6125caab6a6af835108a2ec0676de1a01d66f36cd1e3bc55e07c8590
-EBUILD rrdtool-bindings-1.7.1-r1.ebuild 1377 BLAKE2B 724c142c37c860dc9023413ec8211e5cc3ee04116b584f3308d7fb9022370d8e20c6f4b2405583bc870a02ba21a634a2df9063e97e8cabca05a1d6956377fb4c SHA512 73c1e893f15c0ccafa287f0bce3c55a34452c442a2c82b16d2c1cabd803ccaf76d2d781cb97105c98253fb5426cc281316d4436f98aa4cfe484e2f32d715a9a5
-EBUILD rrdtool-bindings-1.7.2.ebuild 1391 BLAKE2B d35018b84058aea7e24e8309350fca2edd47b068b76500e1812054146019cfadbaeaa2a629730347fafcf06a6dcb9037f013a2988b83cfd35d15fa42ad8abffa SHA512 7561f712d3c49f2f669cc37a3d6f55df596d3526bab749f0f56202c5661a6885b14b05e43acc1c3ed3c83da3103e75d4df504269a227131dc27a587695711dd2
+EBUILD rrdtool-bindings-1.7.1-r1.ebuild 1381 BLAKE2B 3b3c799c16670c1aa030a38297418c72b7a7400870dcbaf3b21612e11aac4d1fa3588e199d62ec9f60def083d498dca278e22305762fa6daaa4eeab00fd769ff SHA512 da3f5306267fbe335c6dc74f7a49e6e187af0c040a0d78dc9f7e3e8fcb13be50bd607b8bcb3027e022bdca4103449baf1e5e119e48fec7f458933e29dc9bc3dd
+EBUILD rrdtool-bindings-1.7.2.ebuild 1393 BLAKE2B cafbe36ab4b3a0533d5bcfd77ad398e0aa5327735aa4af0dc8bf5cf94d1a2ba6b65863804c1350643a145c96531b3a320d6369753ad36b03e4c661fca6910db5 SHA512 a8a4a2706d5d6a5f934c73d698b33bccee00d133c70b3beffdb56adf7180b1fe0da2c84f5d8865b51da82ea5b0ba256b8cf99e62794470781c5a6c3ce1226817
 MISC metadata.xml 463 BLAKE2B edb3b1f3703163a7f6c28ea7d16a79158d108721a2a775e30967885fb6b7b31d6074585951cc5b1c7b640c88b0694b95f0aaf62b71df43a8d6d6a0d6f78e07c9 SHA512 60732861cde4604b50875b6bbba205f232a52c4d91e6e21bce49a46bcef824bc542140e73b07ce4c18518a366ff8c9bd34569895741b0ac292124f43b0f02aa1
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1-r1.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1-r1.ebuild
index 371902f19a89..b9c82b87c592 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1-r1.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1-r1.ebuild
@@ -32,7 +32,7 @@ DEPEND="
 "
 
 all_ruby_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.4.8-graph-ruby.patch
+	eapply -p3 "${FILESDIR}"/${PN}-1.4.8-graph-ruby.patch
 }
 
 each_ruby_configure() {
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
index b054ce03e312..ddafe5b470cc 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
@@ -16,7 +16,7 @@ RUBY_S="$MY_P"/bindings/ruby
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="graph test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( graph )"
@@ -32,7 +32,7 @@ DEPEND="
 "
 
 all_ruby_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.4.8-graph-ruby.patch
+	eapply -p3 "${FILESDIR}"/${PN}-1.4.8-graph-ruby.patch
 }
 
 each_ruby_configure() {
diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index 7bae1fb3065a..202b6fb66e99 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -7,5 +7,5 @@ EBUILD rspec-support-3.8.2.ebuild 1573 BLAKE2B 7e6dbaa451c95769b89830bb5abbd54a5
 EBUILD rspec-support-3.8.3.ebuild 1551 BLAKE2B 350867421421533e97e5b7ae3547d698fb71744ec5112a9e7a45532812a16a7c6bb46d8c03f20916249b98d64af607e652a0427d1f0e9fec3fd7521b82b7eb7c SHA512 03c3eb8c6832db34b293529003127d27ce722bcdaa8bc9e9cf49d40d2c28ad358d10c06443750bd0d8774dcd6992a1584061356ddf7c41dd342e0e58aa85924b
 EBUILD rspec-support-3.9.0.ebuild 1551 BLAKE2B 350867421421533e97e5b7ae3547d698fb71744ec5112a9e7a45532812a16a7c6bb46d8c03f20916249b98d64af607e652a0427d1f0e9fec3fd7521b82b7eb7c SHA512 03c3eb8c6832db34b293529003127d27ce722bcdaa8bc9e9cf49d40d2c28ad358d10c06443750bd0d8774dcd6992a1584061356ddf7c41dd342e0e58aa85924b
 EBUILD rspec-support-3.9.1.ebuild 1551 BLAKE2B 350867421421533e97e5b7ae3547d698fb71744ec5112a9e7a45532812a16a7c6bb46d8c03f20916249b98d64af607e652a0427d1f0e9fec3fd7521b82b7eb7c SHA512 03c3eb8c6832db34b293529003127d27ce722bcdaa8bc9e9cf49d40d2c28ad358d10c06443750bd0d8774dcd6992a1584061356ddf7c41dd342e0e58aa85924b
-EBUILD rspec-support-3.9.2.ebuild 1558 BLAKE2B 8963485bc4f58f917ac018bd85de56c4657d691946e94c7102bf7271c86d762d5f6b76647389268bcc9adcc4ba8877973358a296a024042fe43e13ef1fcd1363 SHA512 9542286978940ea0571aaa7528fe0eb4da279e11ae1e177a8758b12b88b5f0190be882a0599b33d40488753d822abd648aad39a1c4ec16c34cd7032325a63f25
+EBUILD rspec-support-3.9.2.ebuild 1712 BLAKE2B 27a447f54c51b617727aeda7164e96d3a506796c62795a19e767b2e5bdb9c137a6dd0c4036a6dcf7b39a221f6266ba782b7b6f19a64a9821c0ac1fc0b1cf9a89 SHA512 7d1cff7a840de7c500b55adf44e40a44e5b7b76d47360f8312fe76b3278ad1bcb26df8e7ed297fef86be33dd6224d03a2072f94d82d566515e56c3f6527ebdaa
 MISC metadata.xml 345 BLAKE2B 832a39e1b38a33b4b5238aaf4a79f08aaff0a7751d466ebe3dd6eeaca493cd10d7ed51766d12c17f589be48d450d3f7a36690ee171a5c650c1cdad334003446f SHA512 71b6ed77045b94efb05b0275574fdcf328678c7d0aef385703a40f5ff3300653638dc32911ff8f91c66881201c735df930c000c0283afa9f189dbba41e97628c
diff --git a/dev-ruby/rspec-support/rspec-support-3.9.2.ebuild b/dev-ruby/rspec-support/rspec-support-3.9.2.ebuild
index b0f14e38d54d..36a174b55d35 100644
--- a/dev-ruby/rspec-support/rspec-support-3.9.2.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.9.2.ebuild
@@ -40,3 +40,8 @@ all_ruby_prepare() {
 	# should be fixed upstream in next version
 	#sed -i -e '/returns a hash containing nodes for each line number/askip "ruby26"' spec/rspec/support/source_spec.rb || die
 }
+
+each_ruby_prepare() {
+	# Use the ruby version being tested
+	sed -i -e '/shell_out/ s:ruby:'${RUBY}':' spec/rspec/support/spec/shell_out_spec.rb || die
+}
diff --git a/dev-ruby/rubyzip/Manifest b/dev-ruby/rubyzip/Manifest
index 68b64140fddb..2843e858dd8f 100644
--- a/dev-ruby/rubyzip/Manifest
+++ b/dev-ruby/rubyzip/Manifest
@@ -1,7 +1,7 @@
 DIST rubyzip-1.3.0-git.tgz 156664 BLAKE2B 2bde6515ddc71da32fc2d2819770857f7dde8605718c868f73edb8493f7db5ce66a7115d09933ffc6a06ac0979ab07e8cbdcd47984707688b7a5db43394847bc SHA512 5a764725d1f6a797f710581dbe07bd7971f0a8a5b0ffb7fc9b1a627c32e6e342ff54e2ad39e74e294dd283b8cbf358ed2dc40857f6f656007adff80d4769b9f4
 DIST rubyzip-2.2.0-git.tgz 224109 BLAKE2B b1d879d04c4bd23f32f82260d386a0b0ff8bb4c1af705a4eca9fc279b4095551edad27e2187aa146b9c76f183df2687fc03dd7c6d62c2dde6d70c9137226316c SHA512 c10f3574c7948ae29ed665de69f79d714e146bda27a634c3bfdf7210240b535c6a9fba43fff0228fd85afd262ca56d25002393eda90237d8da1034edda62e2a7
 DIST rubyzip-2.3.0-git.tgz 225336 BLAKE2B 24b00e02c26881953c843761d38b8bf3a9a5a04da6cafa73bea6abdeea345a71a31241a557ff3c182df274210a970f17b3e866657153784df6b03cdf472681f6 SHA512 da9c446aa1a3c457decdaedb387f4030f84a2b1c1c3ca14a0e8588103f95cf893812e7a146362c083aba478828ccda4b127cd0b80fa2fa09022e06ad041506bf
-EBUILD rubyzip-1.3.0.ebuild 1207 BLAKE2B 5cd0462d17c48315be824d69984034ee736f68e0bd6a2d0a747d9645ba8bc8471e303e7f6d104fa4b12295c8abdbf35a9f76bd3f8d75b006dded27ba9fbbf8b2 SHA512 c8d6865c2aa049270291ff3ecc932a253ccf31117684698763a46e808230c9f3bcc2189c19bc4d694ace280cb84ab15fffc01b5d5761ed47ccf5e101bb80c41a
+EBUILD rubyzip-1.3.0.ebuild 1313 BLAKE2B f8776fbf25aae9ce16d14165c6392fdc24b820fb853d7f1f49bcad7dc7509328b8d1901a3ae2123e754af02e6a3dc1103cf41a153e6365064745808cc91ea2d3 SHA512 67bffc08d7ad6f8ab3af7bd9c1782d217a1bb9d841bd83dde30f0a69c7ced712466f6f47a5b1bd79c8e13c9b9a821e18127e17a3ddca4f59dc4066db0211159d
 EBUILD rubyzip-2.2.0.ebuild 1230 BLAKE2B 3b67eab314531caccf03ae0b6f347edeb67ad8fd21e617b64a17b38345beefba1634c04524a4d0a2ed29708f020265bca9b1e1015bff400d6f1beead932cfee5 SHA512 dda84818e3ee920eb3a68366e7e7861d296f7628397bf6073fd8ee36ec874c8b0f9d01daa62715ce9a013fc7ad1d906a83bc3f09b49f3a4afcb69d51b616dc87
-EBUILD rubyzip-2.3.0.ebuild 1275 BLAKE2B 0edb69c38171523afb61fdadfbd4af00b9be46b80ac3ef6101e0d8c32e5cff6d697633d71d5a84c823b73384cd3647d9385d31b91c19fc098b9a2fb329a13cd0 SHA512 2fdb196e89db283ff1a3d7deb3fc796837984bf20b54315efb35d1caba2b20e30c39f38f50a5825ac6314c0900a7833716e01f56ad4d3007809fb897ba21e316
+EBUILD rubyzip-2.3.0.ebuild 1383 BLAKE2B 24bbef1e0407c2ae84d50c2a517435674ac4afa6d35dc0134cb2cab02777a1635105e9c9b2841a71f3584744ac23c387ac43eafbfe386b3dba9261f09c2636d8 SHA512 7755d00156f154ddb8bdd85f905fa38dda36346159d9163902d928ce17e49909a5bfae7400c1fa6c138ca7bf90e0d4af596eb1b1eb68505e54d112345231d3fc
 MISC metadata.xml 341 BLAKE2B 2e04f2f0e3ee64a4d476ca38f166efc94dad160850cd08b42ed54e68a275ec1d26b76a751bf9a347da5f9c8851575a8a58b9021f91acd1a733be536f947e6743 SHA512 7928d7e4a5dcaeb924d44348981910cf0024939f6f169a00df46fcd80cc933b56e91423e8919ef7a74f03e4bc1eda7b7f8a8bc6e954f6195989c1a9eb574cf3f
diff --git a/dev-ruby/rubyzip/rubyzip-1.3.0.ebuild b/dev-ruby/rubyzip/rubyzip-1.3.0.ebuild
index cc2a60650cc9..6d2228025de4 100644
--- a/dev-ruby/rubyzip/rubyzip-1.3.0.ebuild
+++ b/dev-ruby/rubyzip/rubyzip-1.3.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rubyzip/rubyzip/archive/v${PV}.tar.gz -> ${P}-git.tg
 
 LICENSE="Ruby"
 SLOT="1"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=""
@@ -46,4 +46,7 @@ all_ruby_prepare() {
 
 	# Add missing requires
 	sed -i -e '1irequire "forwardable"; require "pathname"' test/input_stream_test.rb || die
+
+	# Fix broken test that uses native endian
+	sed -i -e '/pack/ s/LLS/VVv/' test/file_extract_test.rb || die
 }
diff --git a/dev-ruby/rubyzip/rubyzip-2.3.0.ebuild b/dev-ruby/rubyzip/rubyzip-2.3.0.ebuild
index 16bec97ba963..f7274c64078d 100644
--- a/dev-ruby/rubyzip/rubyzip-2.3.0.ebuild
+++ b/dev-ruby/rubyzip/rubyzip-2.3.0.ebuild
@@ -48,4 +48,7 @@ all_ruby_prepare() {
 
 	# Add missing requires
 	sed -i -e '1irequire "forwardable"; require "pathname"' test/input_stream_test.rb || die
+
+	# Fix broken test that uses native endian
+	sed -i -e '/pack/ s/LLS/VVv/' test/file_extract_test.rb || die
 }
diff --git a/dev-ruby/tdiff/Manifest b/dev-ruby/tdiff/Manifest
index 5849892e320f..89cf17df81de 100644
--- a/dev-ruby/tdiff/Manifest
+++ b/dev-ruby/tdiff/Manifest
@@ -1,5 +1,3 @@
-DIST tdiff-0.3.3.gem 9216 BLAKE2B 1171d354c4fa14e0f6813976ce82e44e24ef94089f090c2eec31767e032a143904f627df7634d3faae4d18f5591991fde77b26e0da7c37a6346d6487d881eec5 SHA512 18c8ee9025eedfbf78c24280bc318736e13d840a2be8b05257697d2c4de29831ed6a361ecd553fc1bcdf7961483fd0712ecb76dc3681a9549f4d3f7a18bc3d8d
 DIST tdiff-0.3.4.gem 10240 BLAKE2B fe764eaf70303670602758bba903202bb468c419e96909561c4d420a86b9237c9af4640947e9dbc27eaca7b7210e26236da20d41f03d3e8acd0556a23205a924 SHA512 2db5c9707a8654fb36b02c7fbdf2317da08c633c0d3768f0f76693ffffd1b2b44e5f4309ae97df944c3bf9f25b596fd3ae19cb88b20435c0f9e50989d22ece40
-EBUILD tdiff-0.3.3-r1.ebuild 594 BLAKE2B a0b35754c14be508eb4b1b5f0752c6e59ded074c20d8f17d58b9fb4ed5993dc6fbdca6700a97eded1d6f88120fba1f5035e188d2b7a752fed9ab6ff1d8a08eb5 SHA512 face3da40af10d74e407e9d4a14ce8ae1e69364eaf289527d66230ff3baeddd941baa29381bdf662d0f01aa08f519a0e64e7b92179c6d051325b54744b5377bb
-EBUILD tdiff-0.3.4.ebuild 596 BLAKE2B d368f8871d1d00022a1cfca695a2afb09ad0ad4ecc7c038afabbb617c1f5c7c2ad3cca40ba4a2a604d7c58b32871f3cf671936f033ac157f8e348ab1ffb02ca4 SHA512 97129b8ed5983e8e682eba8dee8c8f70dc44f6290376bd78e16ac795b3dcaccf035ebc0d523c7760ce0e84edf94f570080d42cf131dfc188c3f75b6ad55cc515
+EBUILD tdiff-0.3.4.ebuild 592 BLAKE2B e71a39eb950afa15b8ddaffbe164aae920d9973e9683c571f2f276ff8b7f1487da19e834f7201ae3f28a937fdea158355cc30065ebc46b501d03ebe35b7bb5ab SHA512 fcd7de7e572680047cf1eafff6da19f0ac2f116a2be0f41df9927fe1d0d4ee90dfb5f2ee098989bccd4b464e4843c5be4f6b6a3cb658658904dbd49a6d83213c
 MISC metadata.xml 342 BLAKE2B 58a84e55bd616d2031be360592c5e32fc734355379c59f76680acfba0727072817d3e7398ff849a50fa908c048c033fc668d008a8d68749be46198f2c6ca0a3d SHA512 c3d93ca88cfee5e58b40fa4f7538883d507ca4f84fa79b529080fed0c67ac23f83cc51524391796e8997b137ffd7c24890eeba7a13d788f24f382253965fd184
diff --git a/dev-ruby/tdiff/tdiff-0.3.3-r1.ebuild b/dev-ruby/tdiff/tdiff-0.3.3-r1.ebuild
deleted file mode 100644
index 3b0e4600b3eb..000000000000
--- a/dev-ruby/tdiff/tdiff-0.3.3-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Calculates the differences between two tree-like structures"
-HOMEPAGE="https://github.com/postmodern/tdiff"
-LICENSE="MIT"
-
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
diff --git a/dev-ruby/tdiff/tdiff-0.3.4.ebuild b/dev-ruby/tdiff/tdiff-0.3.4.ebuild
index af6135ff0db8..f75642c4a62b 100644
--- a/dev-ruby/tdiff/tdiff-0.3.4.ebuild
+++ b/dev-ruby/tdiff/tdiff-0.3.4.ebuild
@@ -16,6 +16,6 @@ DESCRIPTION="Calculates the differences between two tree-like structures"
 HOMEPAGE="https://github.com/postmodern/tdiff"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
diff --git a/dev-ruby/tokyocabinet/Manifest b/dev-ruby/tokyocabinet/Manifest
index f8983f1fa059..26111cdf5d1d 100644
--- a/dev-ruby/tokyocabinet/Manifest
+++ b/dev-ruby/tokyocabinet/Manifest
@@ -1,3 +1,3 @@
 DIST tokyocabinet-1.32.0.gem 18944 BLAKE2B d55ebba43bfb904dfe2b18bc0c22e92b30ced4cdbda8025f7e4d9088da03a2c8486f210473bd05be13fa8d8448830a8f11fc9dc9c34b9803514fd8fc5cce984c SHA512 274a72e166bfb776b66379f587a141c8d0407dec7aa17bcd2e1ce2a401784f52433e72bc356140f69dcca651351edb22d5c9da6fec09b1b1fcfd53cb5af666f3
-EBUILD tokyocabinet-1.32.0.ebuild 579 BLAKE2B e2ececf36438cb95e026c3c9b00f605d0ba07f04048e6c212696d84d35a24945bcc7acf9e2f8a938922df14981d359a308307d34d959483647a4779131b3d14d SHA512 05b71562332cf315d7f391a7d2e5a1c4d0debb3f9395cc14950745b916f87bae3500b71fe160736766f84c1cd6b2f653ab6d38a3cb5a6a7bbeab090445458081
+EBUILD tokyocabinet-1.32.0.ebuild 580 BLAKE2B c43caab9fa42cab9ed885d237221747deee82aa13c59aaee8d28d2e338d2e833b1daf0d5c81818f8530aabd272e718bcc068321614fc8de6294b3b6ff8f4078d SHA512 36a1ed6f99439c68dd35b754ae6d1c46320db0ceb62a8ab01a537aa0de78416bd7e4c9cb2cc8c138f36b8e0871145ee7ea22c2d94235c03b7a136b1dd83377fd
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/tokyocabinet/tokyocabinet-1.32.0.ebuild b/dev-ruby/tokyocabinet/tokyocabinet-1.32.0.ebuild
index 7861daae85fa..cff54aa3f694 100644
--- a/dev-ruby/tokyocabinet/tokyocabinet-1.32.0.ebuild
+++ b/dev-ruby/tokyocabinet/tokyocabinet-1.32.0.ebuild
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_TASK_TEST=""
 inherit ruby-fakegem
 
 DESCRIPTION="Ruby bindings for Tokyo Cabinet"
-HOMEPAGE="http://fallabs.com/tokyocabinet/"
+HOMEPAGE="https://fallabs.com/tokyocabinet/"
 LICENSE="GPL-2"
 
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/dev-ruby/vcr/Manifest b/dev-ruby/vcr/Manifest
index 01fe17bb1fd0..6d4a5df4819d 100644
--- a/dev-ruby/vcr/Manifest
+++ b/dev-ruby/vcr/Manifest
@@ -1,9 +1,7 @@
 DIST vcr-4.0.0.tar.gz 146920 BLAKE2B 19ae33d2f40821d2cfe5c0fc55d5e91e02b8e6ba2bba000c326d993987fd641dd5b4cedd6a8a441f86664ecb67dfe2501d335936af9271fa83aef6dc001b12f2 SHA512 2f98eedd021f7c125fc3f29189190ddc817bb95fc8e8e0ab53e65eaf94c5c0c41f3ca4abf9d829591acdefe97b931943c47129f95c21f2ef590ed500cc6f56f9
-DIST vcr-5.0.0.tar.gz 147602 BLAKE2B 031c9a70c9483b496ed3cda1c65138d214c257392aa5f9157135b0fd4c33d35dd6143afc0e775c5061bb823d936d1bdaa084eaf0024e87747e6101b582d8bd1e SHA512 88e4d82f1c5b3d48c89a75324a256c66858740d2889a4d86851ebb3a303745829e42f20b20d4cbc18d7b0510eb0b229a770bb6209be93dbb8c8b0be84bf5f645
 DIST vcr-5.1.0.tar.gz 150438 BLAKE2B 615a0ce570da29be402f97dcba1ba987c611c73cc9ebc561683333c752d57c1c2f0acae78b42164d8c56f71cded150a93566d45c0c84153bdc3dc8bb37199e4e SHA512 5297e46b1ffe31c3559df57f0af158cb8064ba48b83702ea3bf12eca4c7260bcb71d3df7ae645a3cc14817366992458beb4fd9771c1f98a56835dcd69ff107f9
 DIST vcr-6.0.0.tar.gz 153423 BLAKE2B 95f0794af34d4ce21c0ed3b3a77de64300fd3c844919624cd6021c2e74687d3a66b7d4f73b2b040f90774d9cea0305563cdfaab162b4a1df842f2367e72f6209 SHA512 9a19896ca4f5624c6e74772006aea4dfda0527d9ba733ec0d90418c6234fa5684121be1258badcfd647739cb47dbaae556b8c2e2636f309a79ea94e8835de40f
-EBUILD vcr-4.0.0.ebuild 709 BLAKE2B 360617e1a7aff37a255ea03f0af132648408024cbabf3737d85930124c304191824046d0290bedcadffd06cc48d0317165868e4dd970699eca76a70e7b0d9985 SHA512 e8424a267dc567b63e3d9d9da1214b3dcbf03ad3992f5e17dd8bae7436f70a8b0c5781455dee1832dd3cba67aca243fef7fb5159617ee245652ed8eb93e3d216
-EBUILD vcr-5.0.0.ebuild 703 BLAKE2B 46bf583f4250d89f7c4f8a189c7640fd8f5618ca9f5bb90964fd424dfd69977c561213aaf6417dca4f9c3a5a05f352ff854d0d5a5a9be02383016d780a6cf81c SHA512 ece96b85a4582222de655644e7031647149b6a21a907741ee80f139001352c36cb3ef1551256fd3602cf4982ed15347ee34e0f1e2ebf75bf4f45d843f5dd7245
-EBUILD vcr-5.1.0.ebuild 732 BLAKE2B 215ff9e86dd92891f4cb4d036c8d648bea16e8db53ff21927bdd696e466bffe37fb23939da819ef774e2a42d67e6f54c8dce81124cf9156950d5b9804eb27812 SHA512 d6bda4a9ecfff4963ccba5f78cd11a0298aab9521d3e23949b3f259498d23bf51b24c49361f95e931265e45bd7c68c21b97ccee4fc9140ee576daa59911923d0
-EBUILD vcr-6.0.0.ebuild 732 BLAKE2B 215ff9e86dd92891f4cb4d036c8d648bea16e8db53ff21927bdd696e466bffe37fb23939da819ef774e2a42d67e6f54c8dce81124cf9156950d5b9804eb27812 SHA512 d6bda4a9ecfff4963ccba5f78cd11a0298aab9521d3e23949b3f259498d23bf51b24c49361f95e931265e45bd7c68c21b97ccee4fc9140ee576daa59911923d0
-MISC metadata.xml 342 BLAKE2B 2e7bb825d3f1a6977404c0617c22057a8a0a487ce88c5cb46853b65987ac23d083bd9f1201e74a63a75e32c34862d836446a6fa2d6dd7da48cc33b7905fd18b2 SHA512 1fa01257b99e6ac0b535da28a6b30da72ee4ed4493b9b28427298216ef23a0d43417a5be745af3b10323fb86df38fc34942f0314fcf82d77b0e89e1f277a3431
+EBUILD vcr-4.0.0.ebuild 757 BLAKE2B 8311272847a0835c40add69aa2fbb9e7786d9897f1686d66d1bf823bf3ba47a1f9e95d566d9702828558b3be482ffcca44eee00ad583ee004bc53f26882c5c7c SHA512 ef3a7fe2bd5414a76ca389b1ad92e5601f47b0bac238a88984bf80c784f6e82c358c3a388827f7d8e637e24c86f00f46e0dbb7376b961a4c347f46221a998111
+EBUILD vcr-5.1.0.ebuild 787 BLAKE2B f9049aa0abc31db486d4d2c3b9ae551a5dbce57589a9874a17976136a6e0653c5d6e2fa3731f45a658a30c8ff5746bd239b002f40d94c50d7738ba0e84e87b44 SHA512 741fe620050fcf66fad5c144b5c863c48efd0ce752a865a70e29fc12e0d7c762fe23a7d9b71b090adc951a9ab58030f052c00a3de7326a701cc6bf107eaceda1
+EBUILD vcr-6.0.0.ebuild 781 BLAKE2B 2c32768fe421a77ca440ab62471451dde222261003b7eb250efcb17c4aab54fb63009389ad3008c321b62fb8f56008e30aa669c066509ad8fa27c19bf04e7b0d SHA512 e60f4a38a42723bcc2705fefddef1b80d302dae70877b92ef0ffbc30bb4a6227b33cb6b2c2a8764c206139049ac8e0bf55929123632e3640cf8505883f5cc53e
+MISC metadata.xml 434 BLAKE2B 1ca0dd18418173c3d463b6de56119e3ca95bfa7916c1e3a9b54b9d6137a60e00379e1d0ef2e02f2bfd444714c6b801b334b135e8631ffc2d547f6566198a0ab5 SHA512 d49cebc771dd4a5e0074576cc16c75a2893e2e55ab80ca15b15ef9f5c89c120e2e2815624c47153e9bf87aca8c28feb072ef72c23c7a47eda42b7659e047f3cc
diff --git a/dev-ruby/vcr/metadata.xml b/dev-ruby/vcr/metadata.xml
index 3e7ac4fc6b7b..588668ce56b8 100644
--- a/dev-ruby/vcr/metadata.xml
+++ b/dev-ruby/vcr/metadata.xml
@@ -8,4 +8,7 @@
   <upstream>
     <remote-id type="github">myronmarston/vcr</remote-id>
   </upstream>
+  <use>
+    <flag name="json">Add support for casettes serialized with JSON</flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-ruby/vcr/vcr-4.0.0.ebuild b/dev-ruby/vcr/vcr-4.0.0.ebuild
index cae5212ae316..096a7318138b 100644
--- a/dev-ruby/vcr/vcr-4.0.0.ebuild
+++ b/dev-ruby/vcr/vcr-4.0.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=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md CONTRIBUTING.md README.md Upgrade.md"
@@ -16,8 +16,10 @@ LICENSE="MIT"
 
 KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
 SLOT="3"
-IUSE="test"
+IUSE="json test"
 
 # Tests require all supported HTTP libraries to be present, and it is
 # not possible to avoid some of them without very extensive patches.
 RESTRICT="test"
+
+ruby_add_rdepend "json? ( dev-ruby/multi_json )"
diff --git a/dev-ruby/vcr/vcr-5.0.0.ebuild b/dev-ruby/vcr/vcr-5.0.0.ebuild
deleted file mode 100644
index ecf35311d517..000000000000
--- a/dev-ruby/vcr/vcr-5.0.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=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md CONTRIBUTING.md README.md Upgrade.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Records your test suite's HTTP interactions and replay them during test runs"
-HOMEPAGE="https://github.com/vcr/vcr/"
-SRC_URI="https://github.com/vcr/vcr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-SLOT="5"
-IUSE="test"
-
-# Tests require all supported HTTP libraries to be present, and it is
-# not possible to avoid some of them without very extensive patches.
-RESTRICT="test"
diff --git a/dev-ruby/vcr/vcr-5.1.0.ebuild b/dev-ruby/vcr/vcr-5.1.0.ebuild
index ca4669a2923a..c6e6cd0a24d1 100644
--- a/dev-ruby/vcr/vcr-5.1.0.ebuild
+++ b/dev-ruby/vcr/vcr-5.1.0.ebuild
@@ -17,8 +17,10 @@ LICENSE="MIT"
 
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 SLOT="$(ver_cut 1)"
-IUSE="test"
+IUSE="json test"
 
 # Tests require all supported HTTP libraries to be present, and it is
 # not possible to avoid some of them without very extensive patches.
 RESTRICT="test"
+
+ruby_add_rdepend "json? ( dev-ruby/multi_json )"
diff --git a/dev-ruby/vcr/vcr-6.0.0.ebuild b/dev-ruby/vcr/vcr-6.0.0.ebuild
index ca4669a2923a..9df479fba6a9 100644
--- a/dev-ruby/vcr/vcr-6.0.0.ebuild
+++ b/dev-ruby/vcr/vcr-6.0.0.ebuild
@@ -17,8 +17,10 @@ LICENSE="MIT"
 
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 SLOT="$(ver_cut 1)"
-IUSE="test"
+IUSE="json test"
 
 # Tests require all supported HTTP libraries to be present, and it is
 # not possible to avoid some of them without very extensive patches.
 RESTRICT="test"
+
+ruby_add_rdepend "json? ( dev-ruby/json )"
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 9245ab528174..1dc13e1c40e2 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/guile-json/Manifest b/dev-scheme/guile-json/Manifest
index 63233ebd1de2..bbaecaac18b2 100644
--- a/dev-scheme/guile-json/Manifest
+++ b/dev-scheme/guile-json/Manifest
@@ -1,3 +1,3 @@
-DIST guile-json-4.0.1.tar.gz 150225 BLAKE2B 343bc64876b35f2f8291635aa357df5ea85acec27b31fdf22a706530764323516bf64ca6edb4f96962e296e3522ee04ca1030487c75d9ee745ffafa1f5990c7c SHA512 45ec92489fec331d8f6e8b3398e09c663da96f41963f5e6f60c15dec19b3f12ebc8f344f023dd3c1f08177723672a2576fdcc41b5d9e441a96dc51b678da5998
-EBUILD guile-json-4.0.1.ebuild 670 BLAKE2B b86e74df8928cea0af49ff4a59f552f83db35eb5cdc86b35c1ae9a07aeeff6c8f8112a0408c4a0a7f2abbf65645e482f66a3fe8736f014ecf5a6199083c5dff8 SHA512 e90e4cc149e376f6ecc381b12a00955dcc6b1359405e59332b7a6d9a9998992109f142c43c3e59713dd886a59490ffa534b3ecc1f086ceaa509a556925ba4436
+DIST guile-json-4.1.0.tar.gz 150870 BLAKE2B 9bfd3642b41221fbc7a308b06e69dfa16a652a30ae18e8d53612fed61d26ddf8d39686f81f363c1b02de98b58f0bf6c0ba7003ee93f6777332e9e3574743765f SHA512 ea8eef22d027968bd9faf3170eee7f781837e3a614a5523afe8f89c450408966de11e8082e7ebeacb6c3c50f52c1a033526b9c2491e1cb625ef985ad16eed9b2
+EBUILD guile-json-4.1.0.ebuild 670 BLAKE2B b86e74df8928cea0af49ff4a59f552f83db35eb5cdc86b35c1ae9a07aeeff6c8f8112a0408c4a0a7f2abbf65645e482f66a3fe8736f014ecf5a6199083c5dff8 SHA512 e90e4cc149e376f6ecc381b12a00955dcc6b1359405e59332b7a6d9a9998992109f142c43c3e59713dd886a59490ffa534b3ecc1f086ceaa509a556925ba4436
 MISC metadata.xml 326 BLAKE2B d05d251d501000390dccc9c07656dc4a36a8c7b2fca80ccb9cc147ab6fcf270e03574e4614676a3e5c2a2a2b2c000463d3c73595a5f5da7941de840ce8b69a94 SHA512 08bc92338019e10651874c2a45053da7e5d61f9d0013849f3939902c452dc43abee97be085d8f6520dac35fc12bd01fd71e1a1ecaf48e5be947a203768f04449
diff --git a/dev-scheme/guile-json/guile-json-4.0.1.ebuild b/dev-scheme/guile-json/guile-json-4.1.0.ebuild
index 93ef24df851b..93ef24df851b 100644
--- a/dev-scheme/guile-json/guile-json-4.0.1.ebuild
+++ b/dev-scheme/guile-json/guile-json-4.1.0.ebuild
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 6f379633c3e8..6119f08c3e29 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/glossaries/Manifest b/dev-tex/glossaries/Manifest
index d51294f4b512..a635e4a1c0e0 100644
--- a/dev-tex/glossaries/Manifest
+++ b/dev-tex/glossaries/Manifest
@@ -1,3 +1,5 @@
 DIST glossaries-4.41.zip 6285205 BLAKE2B df3dc8e6a6a8cd2fc741c6891a9d0322b5d012e6ed9428e5b5b016eece4bba72647081a482a338c0b895b6aaf856c75f344b1327f88e854ea8c8c246d50398ff SHA512 4f93d7568e280da96c8e32dbbdeab48c71282fb8bbc2e8b88b74976b74f5f466683b1b3d983aec7c8749ee9807d76236366276754639e5ba68888584850fd243
+DIST glossaries-4.46.zip 7028263 BLAKE2B 3d1479a50ea938eb3bd273b2a17db2675275aece241f4bab0329656966d2d28fae2e82268c667998b111fa35f1a04f24ddb3b5130e897c13e2cef965783f9606 SHA512 6ade1039b91b719035cdaef5381cd4904c4baccdd7b9f9a2e655e47a833bfe5b20c6775e30ce08645c0c30d3cec140ce92e36c5a872b40217c5a82bca2a6ce5c
 EBUILD glossaries-4.41.ebuild 946 BLAKE2B f9157b7e2c2d14e21bfb96ba4fa9695811fe677eb0ea8b273ab88a56e0dc075115aa147579242fd6fcd00c3dce60f93a50a5b2a4e4d1a8bcf14cabff1df8d41e SHA512 195af621c4b81da1b7cc9f7a5e3602d935d1c644e40dd9b36ae6b1bdf3630c7ff51ddb7e8421db744eb4e8fd5acbd92e2a389a4c337740a12d8b020985820972
+EBUILD glossaries-4.46.ebuild 947 BLAKE2B ea36a4db4bdeddf895648b36df6f4b78396370dce0c941b203ad7bdd485e0fcc29f0ceacfb995773aedddb9c72053fd4f019cb6c9611a10a1ba4156fd6823907 SHA512 09741d2f50e95afc65e730a170c94fa3119dfb803c78f392e0e3e90d4bf7c884befb72b10599a9fc1d8924eacf01330e52e5d58a5cda1d283739f844aabd35bc
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/dev-tex/glossaries/glossaries-4.46.ebuild b/dev-tex/glossaries/glossaries-4.46.ebuild
new file mode 100644
index 000000000000..8d66ca465fb8
--- /dev/null
+++ b/dev-tex/glossaries/glossaries-4.46.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit latex-package
+
+DESCRIPTION="Create glossaries and lists of acronyms"
+HOMEPAGE="http://www.ctan.org/pkg/glossaries/"
+SRC_URI="http://mirrors.ctan.org/macros/latex/contrib/glossaries.zip -> ${P}.zip"
+
+LICENSE="LPPL-1.2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples"
+
+RDEPEND="dev-lang/perl
+	dev-texlive/texlive-latexrecommended
+	>=dev-texlive/texlive-latexextra-2012
+	dev-texlive/texlive-plaingeneric"
+BDEPEND="${RDEPEND}
+	app-arch/unzip"
+
+TEXMF="/usr/share/texmf-site"
+S=${WORKDIR}/${PN}
+
+src_install() {
+	latex-package_src_doinstall styles
+
+	dobin makeglossaries
+
+	dodoc CHANGES
+	if use doc ; then
+		latex-package_src_doinstall pdf
+	fi
+	if use examples ; then
+		docinto examples
+		dodoc samples/*.tex
+	fi
+}
diff --git a/dev-tex/latex2html/Manifest b/dev-tex/latex2html/Manifest
index 651a6c5c1817..2bc1e79bb847 100644
--- a/dev-tex/latex2html/Manifest
+++ b/dev-tex/latex2html/Manifest
@@ -9,6 +9,6 @@ AUX latex2html-perl_name.patch 445 BLAKE2B 5393870cd3c090c03c790235e36a255cf4d06
 AUX latex2html-tests.patch 1052 BLAKE2B 7f8e2f08d0f0dc102a08837333bfef91610075c316831721ea97f1efa3c65649c2efc61c071560621efe93e2789b5b9ee6b28080b56278a83c5dcd7f1dc106fe SHA512 b3c17ded5c45526f114c8bfdc9bc348e41d3297da377b99af2d0507f953b828d362ec9bdcf166677646b6350a7900f073ea7896dcdd7d3e6f7b265274ffaaeda
 DIST latex2html-2015.tar.gz 1217699 BLAKE2B e9daea005b7674ebb6a8c5902b77b609a633515b4127a2b3fe4d1b15bc2428c02ccc024df62545d5fe63e7034ad4b1532905fee97057d49730ec27f12913c55e SHA512 dd031944250efd28691edeba5e83b4c5c0deec3a2e7c2ab2a9bd285a911f6ab21a02cd0ef697bebc2c7c7c0ebd285493c1d6b01b0db9355fc7f3316a2af65e2c
 DIST latex2html-2017.2.tar.gz 1131438 BLAKE2B 0a13cca95e1f7d8a9fd7d6b077726e083a6d33fbc712b883be46d57fbdea91d1d02a2a2f1990c5827cf2a4b9db18033f41f326af0a69770988bf4ff5e53a010a SHA512 0e1ab1b2005dc71988b1500884d7a13bfbdce73a62ef7f6cc6e83e29d776c98eb09cff3f8d0c162493586094c9ca6f07d47e98d2137f223f27044d03e9bb3473
-EBUILD latex2html-2015.ebuild 2200 BLAKE2B db67e67585e4eb59b09e6013028bce0142b0a1dd787d7135dab71af53a0cfb132c392d50c1985d8009585cefcd8eef4ef5a4c170c96c22ca41643df1fd6528c6 SHA512 f0288fb21e8df66ecde1a8ddacba7b99ade25aff49e461d4230983a366b96445b14548e9ab0a52d1ef23445a3f3154af40bb167294e062d9ac40e6f37bcaeef5
-EBUILD latex2html-2017.2-r2.ebuild 2142 BLAKE2B 71bfb6fbbc76c055640f67bdaefe7e27223c90a3a7d261c1d3b94254b40cd9a02a39068761369cc35a50a8fa76f1569980865ca1b66be1d55776eb4d872e58de SHA512 5b5853958244a6de6c61b085f1ab2dd2a57693a316f7d69c2ff338b190748480e1612f330705be44c886c6b0b2c632bb993e7e6af9fc9063bab46cfea9e220e2
+EBUILD latex2html-2015.ebuild 2201 BLAKE2B eb029f4ed6a270a451bf30d27390965034bec92509b4aaf7ed4fe929c2c0ddaf7ade5d6adba004e7fa8e13817f7342a04dc59dca64dd61bbfed057fac45d136b SHA512 b4ae674c731fd638cbfe1feaa436e27754a80c2b0a8b3dce71d45bb681cb866283a9b7b8573ce401f95a5ebae50da09989c578cd7de756788caea3d7edef6cf0
+EBUILD latex2html-2017.2-r2.ebuild 2143 BLAKE2B 734e331ff240980a220b2f1de88b41bfb6bd92016b81fa215e57a6e7aab7cd01701374a7c6dffb7b61ad39b5e0a7dafaa59ec3e0387adb6079539c049543576f SHA512 cbb8382b12a75dbb102f95651dc58cfc532a5996ca6f5fb5ce0c84c55d45eddbca151cb78ba6dbc8bec52cee36e3d495f6e4f6acfdbce2d80d2bf4693d5f81df
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/latex2html/latex2html-2015.ebuild b/dev-tex/latex2html/latex2html-2015.ebuild
index f71b7ea764e5..608a2b110a6e 100644
--- a/dev-tex/latex2html/latex2html-2015.ebuild
+++ b/dev-tex/latex2html/latex2html-2015.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="Convertor written in Perl that converts LATEX documents to HTML"
-HOMEPAGE="http://www.latex2html.org/"
+HOMEPAGE="https://www.latex2html.org/"
 SRC_URI="http://mirrors.ctan.org/support/latex2html/latex2html-2015.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-tex/latex2html/latex2html-2017.2-r2.ebuild b/dev-tex/latex2html/latex2html-2017.2-r2.ebuild
index ca88c6d78f4b..5c8fe048f6a7 100644
--- a/dev-tex/latex2html/latex2html-2017.2-r2.ebuild
+++ b/dev-tex/latex2html/latex2html-2017.2-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="Convertor written in Perl that converts LATEX documents to HTML"
-HOMEPAGE="http://www.latex2html.org/"
+HOMEPAGE="https://www.latex2html.org/"
 SRC_URI="http://mirrors.ctan.org/support/latex2html/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-tex/tex4ht/Manifest b/dev-tex/tex4ht/Manifest
index 85ffe4949665..ff3114c12d74 100644
--- a/dev-tex/tex4ht/Manifest
+++ b/dev-tex/tex4ht/Manifest
@@ -1,7 +1,8 @@
 AUX 50tex4ht.cnf 192 BLAKE2B 38a4543a22281d9b757e823e95cc8743a0c18b3fe7d6ce028317c8cea9305b7643e540171693ef70bdd364b6f6ff72daabc0baf66f32bb8ea526dcb0406fb065 SHA512 fec1a4ab9a3a493476a255001303c84a30fcf67873bd2639d177b414cf90880a149d31a68d6ce0dfd104b877bfc3fc2d39b1bb38a0f9d7c511bd311e0bfefc48
+AUX tex4ht-format-security.patch 510 BLAKE2B 47f58dfb3c082bffa4a856a7cdb3ee52775e1bb79f18e01cdeb74126d8004664c1981ff6fa4592b77d1379169dfc0116169aca50197bb3be7420bb46868d50dd SHA512 892aac24dc46dc196d4cf67834a952a3be80c8a5a0006809e0aa2646af4f9772e9353c927f8f1c42bc5a38bfa4dc1a7c5ede8752fcbe0d0970f38624755eb762
 DIST tex4ht-1.0.2009_06_11_1038.tar.gz 2576719 BLAKE2B d04fd7b5f614414a200b01f11bea9880ea12561873fc08cb2f5f6f62167d6128cc50abbeeee0c7eae5d80046f6d3b504493d66262153c5a534fd1b56bfa1dfcd SHA512 868961c16da63ef20a8af3ec3e56a2b6c518a291cdbc3974f701773dbb55b844f0df06aae4c7b481c96b9e2ba29cb0f1ed1279b6f32340e4708e31bb67170963
 DIST tex4ht-texlive-2019-03-22.tar.xz 868992 BLAKE2B 662cc23de1b3b5f4e3d504655b5b3d87740fea045bef7987cbe2d81971e73375bd88d8ab111d48878ce1fe9d1eece4e4003e443ed0bc0f9b643b7e1653a5fc8c SHA512 44d9e2c4f92ae1ea1d7f14432d7fe1a9f11b30ec8602d55c4b8f3f46283671fb75b08641c8170bd46918e16db1bed696a613a0518acd4e195e173fe12e386833
-DIST tl-tex4ht-2020.tar.xz 909692 BLAKE2B ef566977a0a5a8d6ae5244fceac4ff378dc8adf86817e7bbbd1d0cd1931fc5fcb618b94353b044d461d94edd426ec3aa185e1b7d678490416bb1c122438046c3 SHA512 c385b90fcff5ba43884918bf616aa4beffc285def1a380b84909bf4dd44cffb479612268a37977adf87f8dc226394d3239503b5d6f2a083a9f078862f282f0c4
+DIST tex4ht-texlive-2020-06-24.tar.xz 880952 BLAKE2B d021efca48571711d06d7ed6ecefce068339a49fa83efeaa476329d892a77f73b27273a711dad2cb7ce212ece87ef8a776a10127cec5dc2e0096ce36adbc42a4 SHA512 b6109d27fd38eb0f2f9aab8b96adee2e69081c7317de3c9f527e47053d1520b93c0499e23fdc66f38f04c50633f72930e4fdf5d07612894427ae31dcbc1f66d4
+EBUILD tex4ht-20090611_p1038-r10.ebuild 3816 BLAKE2B 12218ae356afcdbaeabb323876280883365bd30c4ccf93f491b73809ddff76b8921c029e44d08f21143064204c2983a6e46d1cdec93818432d04d441b6d668b0 SHA512 6209c605fb5ed18463893664c80707fc683a1692861e067b56f3c700ad94ecc5f4234cf63d21fe50adbb886b2a4db698260b958eb103abd61902b5cb83a706ce
 EBUILD tex4ht-20090611_p1038-r8.ebuild 3644 BLAKE2B 57e046a3ee07c5d871d10a5c582002f070f8a8648cf2963075af4670451eb3525b6c7f1661c773e83c2ea4dee450efa1bd231d69922f732f10b65c0b5114692d SHA512 564011601c3af1cd93a28d1cea2fe75eed43be30aaeac50d3c27fcae2e1b2ff3eecce2f0c0092af2782a9c6e3fc4b39aee38b86cd95c3d24999974a4a6a2137e
-EBUILD tex4ht-20090611_p1038-r9.ebuild 3602 BLAKE2B d281be861aa73cacb967b61c8769d057ed47f06deaefec488ecfdd9a9f60fc8cb833188804e131d228bde90eee19e279ca835183ec49da60f2ab07096e636b0b SHA512 a8f2dcb7e37324ff373639c9b814192ba841ed87902f7755f88af5b48761247117a1f5a86f5f16167fd496ac9fa8528b0cb77ac3bcab6b5a4d546a2a6a7dab5a
 MISC metadata.xml 317 BLAKE2B feec903cd392ba092a0dc0f85e44788604c6fde736ebc5c81a930ed0109ecde56c0ba8220f5a56559b06fb1573cd2f159754dcda52c982601bb67306e2c15aa7 SHA512 33ba7a4fa5948eae907a650c1c53b3c5d3b71cef6ae9cc371017c14aca8e641f3badafaf3b3387b6638c877d10787d430bfc16a7e191b2b4327049a56a37b3af
diff --git a/dev-tex/tex4ht/files/tex4ht-format-security.patch b/dev-tex/tex4ht/files/tex4ht-format-security.patch
new file mode 100644
index 000000000000..fde075ce33d3
--- /dev/null
+++ b/dev-tex/tex4ht/files/tex4ht-format-security.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/554636
+
+--- a/src/htcmd.c
++++ b/src/htcmd.c
+@@ -418,7 +418,7 @@
+ #undef SEP
+ #endif
+ {  (IGNORED) fprintf(stderr,"--- error --- ");
+-   (IGNORED) fprintf(stderr, warn_err_mssg[n]);
++   (IGNORED) fprintf(stderr, "%s", warn_err_mssg[n]);
+    exit(EXIT_FAILURE);
+ }
+ 
+@@ -439,7 +439,7 @@
+ #undef SEP
+ #endif
+ {  (IGNORED) fprintf(stderr,"--- error --- ");
+-   (IGNORED) fprintf(stderr, warn_err_mssg[n]);
++   (IGNORED) fprintf(stderr, "%s", warn_err_mssg[n]);
+    exit(EXIT_FAILURE);
+ }
+ 
diff --git a/dev-tex/tex4ht/tex4ht-20090611_p1038-r10.ebuild b/dev-tex/tex4ht/tex4ht-20090611_p1038-r10.ebuild
new file mode 100644
index 000000000000..b88bcf3fcf0c
--- /dev/null
+++ b/dev-tex/tex4ht/tex4ht-20090611_p1038-r10.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit latex-package toolchain-funcs java-pkg-opt-2 flag-o-matic readme.gentoo-r1
+
+# from http://mirrors.ctan.org/systems/texlive/tlnet/archive/tex4ht.tar.xz
+TL_TEX4HT_VER="2020-06-24"
+
+# tex4ht-20050331_p2350 -> tex4ht-1.0.2005_03_31_2350
+MY_P="${PN}-1.0.${PV:0:4}_${PV:4:2}_${PV:6:2}_${PV/*_p/}"
+
+DESCRIPTION="Converts (La)TeX to (X)HTML, XML and OO.org"
+HOMEPAGE="http://www.cse.ohio-state.edu/~gurari/TeX4ht/
+	http://www.cse.ohio-state.edu/~gurari/TeX4ht/bugfixes.html"
+SRC_URI="http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/${MY_P}.tar.gz
+	https://dev.gentoo.org/~ulm/distfiles/${PN}-texlive-${TL_TEX4HT_VER}.tar.xz"
+
+LICENSE="LPPL-1.2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="java"
+
+RDEPEND="app-text/ghostscript-gpl
+	media-gfx/imagemagick
+	dev-libs/kpathsea
+	java? ( >=virtual/jre-1.5 )"
+
+DEPEND="dev-libs/kpathsea"
+
+BDEPEND="virtual/pkgconfig
+	java? ( >=virtual/jdk-1.5 )"
+
+S="${WORKDIR}/${MY_P}"
+PATCHES=("${FILESDIR}"/${PN}-format-security.patch)
+
+src_prepare() {
+	cp -a "${WORKDIR}/texmf-dist/"* texmf/ || die
+	default
+	cd "${S}/texmf/tex4ht/base/unix" || die
+	sed -i \
+		-e "s#~/tex4ht.dir#${EPREFIX}/usr/share#" \
+		-e "s#tpath/tex/texmf/fonts/tfm/!#t${EPREFIX}/usr/share/texmf-dist/fonts/tfm/!\nt${EPREFIX}/usr/local/share/texmf/fonts/tfm/!\nt${EPREFIX}/var/cache/fonts/tfm/!\nt${EPREFIX}${TEXMF}/fonts/tfm/!#" \
+		-e "s#%%~#${EPREFIX}${TEXMF}#g" \
+		-e "s#/usr/share/texmf/#${EPREFIX}${TEXMF}/#" \
+		tex4ht.env \
+		|| die "sed of tex4ht.env failed"
+
+	einfo "Removing precompiled java stuff"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -print -delete || die
+}
+
+src_compile() {
+	has_version '>=dev-libs/kpathsea-6.2.1' \
+		&& append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+
+	cd "${S}/src" || die
+	einfo "Compiling postprocessor sources..."
+	for f in tex4ht t4ht htcmd ; do
+		$(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o $f $f.c \
+			-DENVFILE="\"${EPREFIX}${TEXMF}/tex4ht/base/tex4ht.env\"" \
+			-DHAVE_DIRENT_H -DKPATHSEA -lkpathsea \
+			|| die "Compiling $f failed"
+	done
+	if use java; then
+		einfo "Compiling java files..."
+		cd java || die
+		ejavac *.java */*.java */*/*.java -d ../../texmf/tex4ht/bin
+		cd "${S}/texmf/tex4ht/bin" || die
+		# Create the jar needed by oolatex
+		jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
+	fi
+}
+
+src_install() {
+	# install the binaries
+	dobin "${S}/src/tex4ht" "${S}/src/t4ht" "${S}/src/htcmd"
+	# install the scripts
+	if ! use java; then
+		rm -f "${S}"/bin/unix/oo*
+		rm -f "${S}"/bin/unix/jh*
+	fi
+	dobin "${S}"/bin/unix/mk4ht
+
+	# install the .4ht scripts
+	insinto ${TEXMF}/tex/generic/tex4ht
+	doins "${S}"/texmf/tex/generic/tex4ht/*
+
+	# install the special htf fonts
+	insinto ${TEXMF}/tex4ht
+	doins -r "${S}/texmf/tex4ht/ht-fonts"
+
+	if use java; then
+		# install the java files
+		doins -r "${S}/texmf/tex4ht/bin"
+		java-pkg_jarinto ${TEXMF}/tex4ht/bin
+		java-pkg_dojar "${S}/${PN}.jar"
+	fi
+
+	# install the .4xt files
+	doins -r "${S}/texmf/tex4ht/xtpipes"
+
+	# install the env file
+	insinto ${TEXMF}/tex4ht/base
+	newins "${S}/texmf/tex4ht/base/unix/tex4ht.env" tex4ht.env
+
+	insinto /etc/texmf/texmf.d
+	doins "${FILESDIR}/50tex4ht.cnf"
+
+	insinto ${TEXMF}/tex/generic/${PN}
+	insopts -m755
+	doins "${S}"/bin/ht/unix/*
+
+	local DOC_CONTENTS="In order to avoid collisions with multiple packages,
+		we are not installing the scripts in /usr/bin any more.
+		If you want to use, say, htlatex, you can use 'mk4ht htlatex file'."
+	use java || DOC_CONTENTS+="\n\nODF converters (oolatex & friends)
+		require the java use flag."
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	latex-package_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/dev-tex/tex4ht/tex4ht-20090611_p1038-r9.ebuild b/dev-tex/tex4ht/tex4ht-20090611_p1038-r9.ebuild
deleted file mode 100644
index e5b3574cf7ea..000000000000
--- a/dev-tex/tex4ht/tex4ht-20090611_p1038-r9.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit latex-package toolchain-funcs java-pkg-opt-2 flag-o-matic
-
-TL_TEX4HT_VER="2020"
-
-# tex4ht-20050331_p2350 -> tex4ht-1.0.2005_03_31_2350
-MY_P="${PN}-1.0.${PV:0:4}_${PV:4:2}_${PV:6:2}_${PV/*_p/}"
-
-DESCRIPTION="Converts (La)TeX to (X)HTML, XML and OO.org"
-HOMEPAGE="http://www.cse.ohio-state.edu/~gurari/TeX4ht/
-	http://www.cse.ohio-state.edu/~gurari/TeX4ht/bugfixes.html"
-SRC_URI="http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/${MY_P}.tar.gz
-	https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-${PN}-${TL_TEX4HT_VER}.tar.xz"
-
-LICENSE="LPPL-1.2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="java"
-
-RDEPEND="app-text/ghostscript-gpl
-	media-gfx/imagemagick
-	dev-libs/kpathsea
-	java? ( >=virtual/jre-1.5 )"
-
-DEPEND="dev-libs/kpathsea"
-
-BDEPEND="virtual/pkgconfig
-	java? ( >=virtual/jdk-1.5 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cp -a "${WORKDIR}/texmf-dist/"* texmf/ || die
-	eapply_user
-	cd "${S}/texmf/tex4ht/base/unix" || die
-	sed -i \
-		-e "s#~/tex4ht.dir#${EPREFIX}/usr/share#" \
-		-e "s#tpath/tex/texmf/fonts/tfm/!#t${EPREFIX}/usr/share/texmf-dist/fonts/tfm/!\nt${EPREFIX}/usr/local/share/texmf/fonts/tfm/!\nt${EPREFIX}/var/cache/fonts/tfm/!\nt${EPREFIX}${TEXMF}/fonts/tfm/!#" \
-		-e "s#%%~#${EPREFIX}${TEXMF}#g" \
-		-e "s#/usr/share/texmf/#${EPREFIX}${TEXMF}/#" \
-		tex4ht.env \
-		|| die "sed of tex4ht.env failed"
-
-	einfo "Removing precompiled java stuff"
-	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -print -delete || die
-}
-
-src_compile() {
-	has_version '>=dev-libs/kpathsea-6.2.1' \
-		&& append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
-
-	cd "${S}/src" || die
-	einfo "Compiling postprocessor sources..."
-	for f in tex4ht t4ht htcmd ; do
-		$(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o $f $f.c \
-			-DENVFILE="\"${EPREFIX}${TEXMF}/tex4ht/base/tex4ht.env\"" \
-			-DHAVE_DIRENT_H -DKPATHSEA -lkpathsea \
-			|| die "Compiling $f failed"
-	done
-	if use java; then
-		einfo "Compiling java files..."
-		cd java || die
-		ejavac *.java */*.java */*/*.java -d ../../texmf/tex4ht/bin
-		cd "${S}/texmf/tex4ht/bin" || die
-		# Create the jar needed by oolatex
-		jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
-	fi
-}
-
-src_install() {
-	# install the binaries
-	dobin "${S}/src/tex4ht" "${S}/src/t4ht" "${S}/src/htcmd"
-	# install the scripts
-	if ! use java; then
-		rm -f "${S}"/bin/unix/oo*
-		rm -f "${S}"/bin/unix/jh*
-	fi
-	dobin "${S}"/bin/unix/mk4ht
-
-	# install the .4ht scripts
-	insinto ${TEXMF}/tex/generic/tex4ht
-	doins "${S}"/texmf/tex/generic/tex4ht/*
-
-	# install the special htf fonts
-	insinto ${TEXMF}/tex4ht
-	doins -r "${S}/texmf/tex4ht/ht-fonts"
-
-	if use java; then
-		# install the java files
-		doins -r "${S}/texmf/tex4ht/bin"
-		java-pkg_jarinto ${TEXMF}/tex4ht/bin
-		java-pkg_dojar "${S}/${PN}.jar"
-	fi
-
-	# install the .4xt files
-	doins -r "${S}/texmf/tex4ht/xtpipes"
-
-	# install the env file
-	insinto ${TEXMF}/tex4ht/base
-	newins "${S}/texmf/tex4ht/base/unix/tex4ht.env" tex4ht.env
-
-	insinto /etc/texmf/texmf.d
-	doins "${FILESDIR}/50tex4ht.cnf"
-
-	insinto ${TEXMF}/tex/generic/${PN}
-	insopts -m755
-	doins "${S}"/bin/ht/unix/*
-}
-
-pkg_postinst() {
-	use java ||	elog 'ODF converters (oolatex & friends) require the java use flag'
-	latex-package_pkg_postinst
-	elog "In order to avoid collisions with multiple packages"
-	elog "We are not installing the scripts in /usr/bin anymore"
-	elog "If you want to use, say, htlatex, you can use 'mk4ht htlatex file'"
-}
diff --git a/dev-tex/vc/Manifest b/dev-tex/vc/Manifest
index 74ce20f21c50..75133f9765ac 100644
--- a/dev-tex/vc/Manifest
+++ b/dev-tex/vc/Manifest
@@ -1,3 +1,3 @@
 DIST vc-0.6.zip 451356 BLAKE2B 776b72f33320e5ac129c646774b65fe3ce1757df31dbd8a70ef6e05ffe0606e6e1a85c7910388efad45503ca488d8d78be9c9219cb066f107ad020592ec703d3 SHA512 dde8f3028742e4de42bda3e77a18155954cac954e54db13b1ecba3c60aff54f6ced4961f808b1f539223032f04a39a6e086ca852d340b42dbe98b6989542678b
 EBUILD vc-0.6.ebuild 582 BLAKE2B ded51ab5059c6255ac0841b72a7391fad8828c082d59a53b76c2886eaf25e48fad911393d1a5380cb3b57a3b77c41cf0958399c429746098e56c5cc9503aa9b2 SHA512 0b300ceebc7fad7b76f62629ee68a24be1970fd951ea45e968169f8aa650db0af24ae5a84f3d2f542764886dfa26935e65277845cb492d593930cf52b228702a
-MISC metadata.xml 670 BLAKE2B 905650a8d2784e14e6de90485fd97c0432f76fecb99ad39f3fc83e6e7229ad0149685606e4e973992f1d0be610a64bf5bcb608c8fb5e28ea1ff90d3ab19de05d SHA512 fbe6ee77419d1305df5cd6656ff45fd334fa3bb9e3a92ce67735d084352faa5fddb600c7bed62071ca6861ea4d08f58ea6b326c14df9a0fc73b7a9b5077e03b9
+MISC metadata.xml 681 BLAKE2B 69cb2d35cac92e22aba343dec46d68d1d04be13fd3afeaf308609c54f981c88546bd2a57faa41f3df3b6feac2c0bc8222c4bdfcd659ef9473750f0aa8a62d14c SHA512 e197fe9936258cee892aa3af1ab7758747ba5489fcf6d8be54d81df4098a499aa7ae20884d65c53501aeaf821b2f0e1ba87ea2809740934f5eca9ad424cd686c
diff --git a/dev-tex/vc/metadata.xml b/dev-tex/vc/metadata.xml
index 13f8b9913d61..79a5740d6bc2 100644
--- a/dev-tex/vc/metadata.xml
+++ b/dev-tex/vc/metadata.xml
@@ -13,7 +13,7 @@
   It works more reliably than keyword substitution based approaches,
   since it tracks all files in a working copy, not only .tex files.
 
-  The vc bundle works with LaTeX and plain TeX. Currently, Bazaar, Git
-  and Subversion are supported.
+  The vc bundle works with LaTeX and plain TeX. Currently, Bazaar, Git,
+  Mercurial and Subversion are supported.
 </longdescription>
 </pkgmetadata>
diff --git a/dev-texlive/Manifest.gz b/dev-texlive/Manifest.gz
index 0bbe4c756e42..1f1ca50dc8bd 100644
--- a/dev-texlive/Manifest.gz
+++ b/dev-texlive/Manifest.gz
diff --git a/dev-texlive/texlive-latexextra/Manifest b/dev-texlive/texlive-latexextra/Manifest
index 72a6761e30b2..b7f15cc4b322 100644
--- a/dev-texlive/texlive-latexextra/Manifest
+++ b/dev-texlive/texlive-latexextra/Manifest
@@ -600,6 +600,9 @@ DIST tl-currency.source-2020.tar.xz 4164 BLAKE2B 71cceba827bcac8ad3762e7e900f107
 DIST tl-currfile-2020.tar.xz 3704 BLAKE2B ea01cdb5bebb13e59dd82d4f901dd3e436848a5bd04bb8e50836fd762995039c5a92bde382507689de5c111af5e10b0cb96a1eca710644532aaa3ffd686682c1 SHA512 5e67b659df7048a2f3e0d99f7e7da753fcabc4cc94d284d88b6b6922dffe2823eff3c07e96d0d4689d2c430a1cd66ef4693d0ceb344609c6aeeb919aa378a297
 DIST tl-currfile.doc-2020.tar.xz 170640 BLAKE2B 3895f650c69439a2a21624dc24acf9759cbf888680913857162ebb05e40a05f8c577b728cb00a012cbe3a77fa45f60e14dd6fa0b70e42a4375cf6fab152cc263 SHA512 d45abaaab826dd9dc8a7d5cccdeece29b26d8f56c0c74c2047f5ae7d43ffc3c0596f009536fca744fa9bede2e8d87a13b68b8ebf4a0ced31afc6bbab5b76ad72
 DIST tl-currfile.source-2020.tar.xz 11428 BLAKE2B daaf376b8315c87022dc206e6fb96e230b955df5d92a04ed5a36a0665c8f341ee9d97b6700fcfd63e131217ed35347a78b9f585945879f380363fc9b4090960d SHA512 0374496112e380b2c8cce8b00e3dd97d992dbe194f660118c3441fd9b0ba536f476b5e330bd363a624f71d5b3004f50d2ee315534929093ebf9f63f47e91c1fc
+DIST tl-currvita-2020.tar.xz 2340 BLAKE2B be7f021464a3269f94fac9d6a8bd382db4974c42be560ac8c8d594e5934787e1bcfa1e22fa02f28b12f3b17089711bcb51d8bdc906b97698395b8bc15a019ece SHA512 c555b0e9c7a500e086f0435a2dc6cde8da8b02df4d27be14534d28c77c1f546aafecb863bc652922e07191d0441a77db647f8d1d11e33ec9bc6014f73a5822c2
+DIST tl-currvita.doc-2020.tar.xz 89020 BLAKE2B dcfbf68a3b8dbcf5fb6aaf56b19e3d0cba2c4fa29bcefca6c8649fc350dcebbd8b32cd4e9c9f519476cdd25b5993aa4da811be22a5b6e925e148b770193193e8 SHA512 b3de1ad371cead2829225015d60a4defe604e63890ef06da65fa9223cce4e748707f0b6f4f0b0dcdf22c3096e381adc3432a7b21b36f834c18ae4eb32bfba024
+DIST tl-currvita.source-2020.tar.xz 16148 BLAKE2B 1af4e84f265493610650c9caf7b8fca1347d13a842a91d9d67d85678ef580ff2f564ef98f26db844e93b0e6ef334cf2ea0b2dbdf4e75cfe21b6ef95ba3af40c6 SHA512 a1dc7d983ac6badf9ced1492c712373205d5b0a91934f0a76eb1ac546470292e6c9dda4cd5f5d721e06c90d6237eb39236f1417d1c6992a774f7a9f7df9213bb
 DIST tl-cutwin-2020.tar.xz 2784 BLAKE2B 345839e2e4ccc1472d9368b11b7a50077e1106571c15f201032087011ab3cb05a532926d423d3a57b0a94b3ce1eb958f0e36c51109ac2e87756155699c044a3c SHA512 484c995cd3b18f723899fc04e3af7b49bc7ac90a02448c4b49643b8ebe09c445bab122bc2ca0f2cab872323438fb02af3e5a053977ae8ff6146cb4af96f08ba1
 DIST tl-cutwin.doc-2020.tar.xz 304448 BLAKE2B a63e769bbcdd88d6089fc19027f97534e8a7a345daa6e13d857d69f96eeee64f2cc5583987c1bfff175f20b5f025eeea7f550856540527a3dc07059049f39eb1 SHA512 89b4fb68d949b86eb3b5d90f7d8c828e10df591cf734f5e6908a221aa9e2d50820841e6095dc912619d4461c37b735907504e63fffbfd95c3371602144f87429
 DIST tl-cutwin.source-2020.tar.xz 9748 BLAKE2B c420770e3dd95d42b5f8133ce80ed86e8e97bf643f1997a59e5b220cf222de74298a8a8156cb32f16e95e6027d1521710df2d715fdf3103e4d73c9c3878c57a5 SHA512 0e6fbb5bdf3cc9b1d270979f379e2f50b356353533278495526275bab3211b1e6ef670a5269e412ae87c3fe4ca0ee8411dadfb42e4e2cce6dc200c863532b997
@@ -977,6 +980,9 @@ DIST tl-envbig.doc-2020.tar.xz 404 BLAKE2B 99743ef811e9571877e4a6be23b8a9537b45a
 DIST tl-environ-2020.tar.xz 1896 BLAKE2B 5299929cce985cb18c7f6782dba4a5196b46fa07849dea4f07842586b26852ec3e945b9fb1d13550b699fe8d7d6bad8d88df4173f768f8321bb688bd5489107c SHA512 4e5bb20e2a69875006e8d9ebc3a8744dcfff3240cc28ea44f7acfa3775914dc9ee108a89368b6a510eb0a7aed19d2d13b001f0270ef9ad011b881c3cbc6aab9f
 DIST tl-environ.doc-2020.tar.xz 156300 BLAKE2B 56644c2af4d587f7c9233c896ae71ff852e4612f49323d878cc6be22b1d75442b74e17330dca68c19a9d11f3e363a9e9f404d919a6f4c9ca72a74e90782389b5 SHA512 8d30310ae317193925c81eece58a3d3109c1396c7e486510826fd72cb8489234867583f438873affae766a32498e375eb46db51fd0d7f9989cd61ae2109e13d6
 DIST tl-environ.source-2020.tar.xz 6416 BLAKE2B 71c6ef03a9a19d627438852ab30dcc096ad6963e9cb4c9cd960b0bec89b3681206256d76fecb749c9b02bc17600ca6d701246dd5d1c49b40907c45b570c8fd2a SHA512 17531d5bcb727e94f7def5f49afd103cd6c280aff943dfdbdaed28f6cdb0a16db918ab21201447f069489f442aae93edbe77f1b4a80734d7f6e4fb6a5ebd3ee8
+DIST tl-envlab-2020.tar.xz 5524 BLAKE2B 9f632ffb56b978aa6da538b4da836b1d409c2278269e65e9d5a4d276896aab2f3ab6c5e34e64677114f9afdfa3b68989c87c05d15f3aca9cdabc9e768350ca7f SHA512 ba20028efa3c286132133d8c292fbc02d77881e64923ca98cece98fbe1e60acf4033b8308a3f9f31f144de071938698a75add803436e1205f7baa820a308a4f1
+DIST tl-envlab.doc-2020.tar.xz 341332 BLAKE2B d052417fed9452d66f39d7432bd1d9104ad94b3d9db15e52f093f9f2fb7abeaa7c9fb5b512dde2506b549222e5563efcebb17b33a466cfdee6622e47bad25541 SHA512 4dedc851e00f82ff3bb912e99bf112f4e464b129b89ed75ac41cab9e9ec8c54a32ace3901a3bdc11c90597cfc0481fc7cfc89b4b95bc9aa0c8850a1e8ec88cc9
+DIST tl-envlab.source-2020.tar.xz 14628 BLAKE2B 63190c058f0e2944954b7f7bdeb8d92e998806d70ef889d945df3725e31b9a9b44113b0c02551beca9746bb77ac111126b7db229381a21b8aa90c62e78a95053 SHA512 9181b7083e3b57329effd0c9ef462a626f8de6db5eb6dbf6800237348a010b74eaeaf11ffa2b491ddf324f0d9bb2c792b9fdda238b887df057b82dfa4fbf04cf
 DIST tl-epigraph-2020.tar.xz 1988 BLAKE2B f632f4e09d5e9d3e1924fa41e2c2eebb1a24e5b292807166b86b7f8eebd7ff50050fcd19d722716efeb32e513ae62a86fea2c19cc7fde16135c3cc1d68b02980 SHA512 7be9b7851f4e98b5b618dca8535d7e3443cd12c64784680ffd0fbd31b9097a0872a676f2fb0f8b031682d43427814aebc0225e1931db658ce14aae2431597b6b
 DIST tl-epigraph.doc-2020.tar.xz 315068 BLAKE2B 0ad3dc958e2110ee0c313620438d05925502f1d1cb135d7dbcb4eeb162159a3fcb7fafd3040021e2e283a4e5d37b0cdeb262475c7d17513a424587cb06b38085 SHA512 7b4b60e8ddfd8f3d899829cf057f7a3db93498cc5214fa03c7116e794722d523cb51846fac80455bf3610b73cb5820872c628d2fcbb754c79b5c7fade26ef4bd
 DIST tl-epigraph.source-2020.tar.xz 10584 BLAKE2B 73ab8dd020c125719d8fc943063a23acba2bda340e4f1ea12b6e7d8fe2e4c094c19504d6271be2b865f2af78cc079bca08ee9a93350ba9a7fff30dac34ff7f41 SHA512 8f0502015099e2e7465156b02681a2774701f53c97c690f97cb1ef5b6538b99141d93f3570893775d8fd702fad60934f5dd0161f5b540b7e77251cc689714cec
@@ -1029,6 +1035,8 @@ DIST tl-eulerpx-2020.tar.xz 2220 BLAKE2B 70e8728b4caae4686726237bb3cba077c8dc2f4
 DIST tl-eulerpx.doc-2020.tar.xz 1960 BLAKE2B fb0a7055a90f1f701f53bd231d3aa6aad0ba742c3d657620daf06c5803f8c6908126f0a03343186760e9ea80cadd00f7eeee9bb50f1de953644d68a6327aa254 SHA512 d755e9694d0631e80ccf81f78a2832ae22269ded788fd30f0acd83a4044ddb4ee4308c26ae5f79c0510a2986f146d28847eabe200015bb197805d57d149ba20e
 DIST tl-europasscv-2020.tar.xz 27944 BLAKE2B 8fc383b93b57b91f954e47545f7eb983730600d22d03d102be15edc5ef3a327770d5170bc790e2b4fcfeeecca98400881c7daefb8810a568548c7f5b071a9504 SHA512 b47453280812327a1528e7d2a484e0b92e5464381bda11b715c624bb8fb7a1f57e3df71ccaeba7dbe8b0f757297ad3c4515aed773a44bfe78efbe9f64297e180
 DIST tl-europasscv.doc-2020.tar.xz 449528 BLAKE2B 88f0d81d1db7cfcc5977be4e319b5930dec35b22ef49e9e2891fffadeaa21f3c2bf85ca61fbab95583db670af38a77af7dff581d78a38bb45eccdee46e089cf4 SHA512 e9041765db618541c6aa9a4142b047f4096bc335a9601186a26860d6b594d6b6125c0f5392fb6dae9a296392fb565ba0a8c288155e8d99e12bc12bec0bedf52d
+DIST tl-europecv-2020.tar.xz 38460 BLAKE2B 8bc02379416a54182283f002b949152e61ba10497458743e22c24dbfd6d771f343798cf4734eb35d894cfd90145f1aa207774f28d62af853e4b3437facfb45bc SHA512 669ffe621551e268c34b36efd783eb800e3632829f3d99c48ed26c4a9b39097113072c175af169ebe87760521cb671f84e95f2cfca400bf4076c3156c6ba0849
+DIST tl-europecv.doc-2020.tar.xz 949532 BLAKE2B d9c67aee5d410d2a7ced737957a36267bf1a3656fe40ae23427f014c68bd38ceea0df829b01891569dc4ac11e6778426c860ac61ee8ca7aff3a356f5687aa496 SHA512 730738ce31280560d3c37156cf53fecf0b0cb2f729041830ae9cc8396d9429d75d40fe0e756b7271ae08bfd71aab247e7d238f2112648a475726c97c2039a378
 DIST tl-everyhook-2020.tar.xz 2080 BLAKE2B 0be25f9d3f08fe52221a0a5a0b9aa656b01e216e85890a15a6afa246ad1dfa418f514e7ec94b139f8208e87dadc5230625df336cb89b6201198970114851b1d4 SHA512 56547973d184de21ff5d6d3eaf1baf9b8cdbcf93307c31fbbcf658350ef0d441509ce359266ea6f962ef9b40b1680b47e4c14a822aa043ab8174ab0610df1665
 DIST tl-everyhook.doc-2020.tar.xz 116288 BLAKE2B f5681c52ab30302b67a9d06a399bb6248c467f0f16417bf2c3bd1dc710bddc0e73c2bd52ab787a5efd2c803807d7309f541bd823d817f3aa6f63fcafed77fbe9 SHA512 331def0138dac385605b3ea1d88af6d5d1ae29bac696b76f41cdcfd070d50915eb3371a14a894b1e59bf35d55eb7dabecfe18e89f0bfbe6f028ce5fedfe1bbc2
 DIST tl-everyhook.source-2020.tar.xz 7344 BLAKE2B c026e33c66b784f77363844c2980a3c36d1d179795f9c467cda406826bc6ab884058f956acac697077e3c0ae3905810fd8b5477bac9bd0af807611c6ce257b7c SHA512 ba0d5e3f2661c4b5ba765b7509675f301dffa3fb3d9f158b3c3255d84b3a5620ec4d883a9c2f116319e6c70784eb5efa4a1cac270d1a299b23bd6fdcbaf60b2b
@@ -1297,6 +1305,9 @@ DIST tl-fvextra.doc-2020.tar.xz 817944 BLAKE2B a231f0e56d5a1eb3fd39eff60b409ea7f
 DIST tl-fvextra.source-2020.tar.xz 50964 BLAKE2B 597ff89a420d297ec2e975e56202258ab4d20217c09ee5fb8462fca42d0706e67ddf0b519b85d5d90b0774ec59801945b269c41da7166f518fa227153a023f4d SHA512 85330a89067d35c88c86ffaffb0445178b899a9f7727148ccb6cece070317f0d559e72e216c7ecd5a39bf830f5ca93f9f5f711a931fe8cc9d942e4572263f74d
 DIST tl-fwlw-2020.tar.xz 3064 BLAKE2B c5257320acd9d76bca7297ede6de99924158e7533605353f150a831fa043ce1ad67f357443d7e403b16ee37f6c40cbe0f2735e377869d5915995b069326b32ad SHA512 ac2c981bcc4da92a7f91c3ac17d66c4e0e7c94ff1bdb3bf3c7f6a4eef19fad1ecbbc6048a5c74627126c7e1190ee18c2c9373e80d52130a2d272c58ef70de6fc
 DIST tl-fwlw.doc-2020.tar.xz 36676 BLAKE2B 9150692505618832349a1392abbd4f2ac58b857ae82b16eab35dc84514e25c85c12169298da09117c171ed2296fee33070c4349ab6fa7be6e7d288c17e59e4b7 SHA512 bb55ca044aafb5b11b89b3c817066c4fb20facba8812667398ecf945bd8ed4b11bec2dfd21455db9cfa5e81e5f865655a3e6f4d3724bf40e47ad1db708896902
+DIST tl-g-brief-2020.tar.xz 5060 BLAKE2B 6f27d8c09bdc9a300e282d41eef0b39b05a7701d739b391903a0a1e3dbe41a8a8c79eea2f9f6ea8d51268c27270c6bfb3f9f799b113d927a769bf494b9797193 SHA512 6c0a8e653cab5f67a85d25e18b98371323b3dd09365f6a3d1b47eee409b233db4290f6e6de70128f5b45facfc7771475671990bb2c79a1718c74972bfba78070
+DIST tl-g-brief.doc-2020.tar.xz 258180 BLAKE2B 331609323c667d99421f9ce955385447194b636c1790cffa4fdce2911d277f1366b6fbd199c43db8fcffe031cedcb5856bae242a48d60d4df3fda884c58b0a2d SHA512 147d30be05a9224e141d9dc23a81750d0c43bf590d6e1dcb3e92fda6c668031522ef410904e5c7621c9b98879d6809fe604cf47de7f24891bc7e15c7be5ad05c
+DIST tl-g-brief.source-2020.tar.xz 12476 BLAKE2B 46e3f0be66f51c00fa44c3611a9bd08b301c0ce231a8275f383ea87e43c89c5fffe0ec60eaf04c147982433afdf77a004e2e95f5f6b0963003004a1f4c600eae SHA512 447a25d983f71d109bc747ee8ab9e120a0b7c698a9238ea5363d4d826383af5587f78f21c442d4e1d999eaf4cbfee813063f7547e786df962866e57c55673c8c
 DIST tl-gatherenum-2020.tar.xz 1724 BLAKE2B 2b6ef4734e993acd899c661f5f207b2a304cdb1f94e369001badee75997e03abe547641cfb2cce2f63a04f817736e2f6f055c9210bf087227c9cde7faf7b1c80 SHA512 f0a0897ca3b306341a8af5121d09b31d9169a90e073f3d2babc2b4a32b72d33b4f7ded73f2455e5b6e7454188112440cdff97c4332f3396c948ace8b2944598d
 DIST tl-gatherenum.doc-2020.tar.xz 406000 BLAKE2B 1fef9c19a900ee8ae03de1eac4ef835acc34ed032f7b85a2e1eda610d239590f827475b103a4dbd3684fa3f498752d4411c018efa69ab220d8b67f51c04b914f SHA512 9e6e1c322aa19a1c3ccaa622cf8657dd314dccc0fedeb7056e182bfc648fa21b06b67e8d1bf2d529fbf84652a0d6eec9d5a4ffeea1003dcfd2cd195ba628c6f5
 DIST tl-gatherenum.source-2020.tar.xz 4180 BLAKE2B b1ba64a8bd8fbf24766c59ec7eaef411f49c3b8d28d0a682bb86d560460e912d4286fc7c87ea142e1742c42b16a1b4d9300d0127c59477ddf0f0689fc5bf6099 SHA512 5696c57b7a05132487fa04c16a577531886e8e443aef06e2b3b6418f74d2d971160cb1d95df43ae29c81ebde9459f8611bdea151895f8390e03d5ff2193fb318
@@ -1704,6 +1715,9 @@ DIST tl-lcg.source-2020.tar.xz 6444 BLAKE2B a78cdc666fa5f8cd83f4f8d9e67c22d5f0f1
 DIST tl-leading-2020.tar.xz 1140 BLAKE2B 19c6c35cf18b0e1fb9a36401fb3d4439fcc86b139130df3259a7fb2c673a253c526aff953feee5d1ee35f84711ad0fe238cf372c894f3efcba5dd728c7ec9ffe SHA512 c326950e6c4b07782148ee4c9ac5b22f7e42512e0bc6e5e1f75be6ed757ca90ebf2bb6b30b91ceaac32c761d595ba5799f0f40ca15954f150d481ea366f1c72d
 DIST tl-leading.doc-2020.tar.xz 84128 BLAKE2B 04dba80a709c81b55ab0ce70ad74ff5c299afb3b11312b11466f3b2fa5b7f211761b58c77f46b61acf5a811d0816217db1905a0b17ed4bb0a4366309f6c5ec47 SHA512 3ede6910ccb0a30c3ae9c78b86cf00cd7e2c5d8905b648861d2113d0af6225b2ffdc30509a72a5f69dd9e1164525c3225cd4ecaa04471ddf5c346a862fe097e4
 DIST tl-leading.source-2020.tar.xz 3576 BLAKE2B 852c501597713c3f6ee8fc607ff399d30fb8d46550dea2ab937e3a249eacb0902db08d33bfcf71e1551407b6e5ca1f1f87951a3ce60689c9276668795cec8b1e SHA512 b42b230efc2508f4b3901de791424251c6e0ff003bb342fa11ea282f46b2dfd5c68a63c95fbb9aee146839944586218a3cec0ef182575a9760d3ed3f5924d78f
+DIST tl-leaflet-2020.tar.xz 5480 BLAKE2B 63cbd9b896b655bd00a2ef401ddde466606113a31b39938a997d2aaeb49d0647b1ff50f069c7de8a3c005d0a7fc704708b61c7aabcd64a6a39dfe669226cbf6d SHA512 b819cae65ac9f38d7170f4aec4f94adfc547afdeadc345091fad170def744247ed46d653975e493aa64a28117e89a5414463f693a4b2f7e28b9bf998b8859915
+DIST tl-leaflet.doc-2020.tar.xz 339136 BLAKE2B e1fd8f8f033bf27d57904556b35653564ba9b62c45e9603edf4c40280843826b37a4c135b39d558729b97281c068e2034724548506ab0ff8e641cb61c66d6cb9 SHA512 d2355c9b93ae490f4087bca09ed3acc815abb714fa7508b64155d8b5994c967b7296b79f8b3d68cd59d082d7d3d7c618c0d4d0fa50df23724ed50718f0433f8d
+DIST tl-leaflet.source-2020.tar.xz 13800 BLAKE2B 8c3b0c1b2183aff9bb448aadf3aa8e71b97a30d7adf3f4e97a0af0989d4f1c043de049a5c4c88c2f149b2f1a66a7114a75be5d603c57aa537bbc84d755375928 SHA512 38cdcd9b452afc6ff98e946d162119615e44f372322664894a479130035a2a05520b7b1e7f616f17b04914c5caac6910ff18fd71c06a31dae9d4e044c6106627
 DIST tl-lectures-2020.tar.xz 6740 BLAKE2B b43b167ca2af8dfd3950551f4b565c9b95206ff98d8f58d993529a3fca4c410ecbe0e522e25ea7d36b05704e36b310746e103c1050db2dc4598ed1a80b35920d SHA512 e3fb80a67dcb5198503050d61266cbd3890c91c1c5c93042a17f2aa410223c3943e3dcb73d7d6e7a4d5888d87ae9613fc89025f0435c122ab44a8f822732250f
 DIST tl-lectures.doc-2020.tar.xz 2080 BLAKE2B f876d5a86d9472149b679a61dcb409195a5f75f995c725a29f836431bbdda8cc06cf55846319e340bc1c523114aa8dbe4f10e554e79fe54f269d414605745ca6 SHA512 bc50485fd0a8782095bbc37b9185bbc61df2a6bdccaef359f2cedd553cedc14ffd0bb8e6690578f1d57b85e2efa650a68af3b579a7c360a737791ddd74373424
 DIST tl-leftidx-2020.tar.xz 944 BLAKE2B 091a10674c42eaeb09e13add126150a5a25fb824f2256fd74274f05ce4b12c42c8fea8cf776eeb9f57f58da9b9cb5ea7b500975bbc8c8425f79a84f4ea6b098b SHA512 a01d085af4ac4048b5659e7f2f1692dd787b7c4cc9a0c06acf9852ad9d5aaa9790bdad6db7a76ec2f1a268af520ac35975a7fc55ef0d6373f244c85b8b6e116c
@@ -2876,6 +2890,9 @@ DIST tl-svn-prov.doc-2020.tar.xz 242148 BLAKE2B 43dc9f6b7776f8077636f67193add7ab
 DIST tl-svn-prov.source-2020.tar.xz 10000 BLAKE2B b1990569fdea43f0db706a9750fd7ae462ceb686c7aaf40f51301f0dbc9da0213623298b46ed68323dc8847e9bccc551ab977d24a6645d2711285d2af4d823f2 SHA512 c7586e4592f9518d2a03218c9afe614422bc8021a192279d7be1b090bd09bc51191d8c0a2e760514206c53cecf5a7b89c617a4c209cdb878874a0e3396659a3c
 DIST tl-svn.doc-2020.tar.xz 441216 BLAKE2B 083b5cd316551df7ba9a5180a115775509dd5e37a2301bb4c18958abd31f88d493356894c5a4a4a327c0b6fb227ffe049af7b7b235b6cfc8bf32ef2a042b41c3 SHA512 123ce3eda16e4a1c44a85c6d2ef2bf4e5f6b9e9d939cf66eee52ad1326f06b35c457f4df054956dc16c169031909f2ea93aca380d2ba080f6049795a841dc34e
 DIST tl-svn.source-2020.tar.xz 7644 BLAKE2B 90a9d6180dbc670ed862223108ff857d3bb213162d9fb951d26707e5fb339e8bc1805b43ee76dd6c0858c092bdb4892a850dfa822e0c464840364e4d8d587f0e SHA512 0033fe1be2ede6984cbc0397c20187cc03520b5d893f7ae239bb688354d7198c4e96cfed09dcdffe7160769f6dafc9995d77f8f0f9def753048d4ecb8231ee69
+DIST tl-svninfo-2020.tar.xz 3940 BLAKE2B 5e9868dc8ab4f2050d24b9b3e7e98e4cce842c96f09e4106ec9cb683e9ea8c2cb77ac6eb575d8df6a3918773c73dcc18500649681f80d2998dd98e1995a73565 SHA512 efb2b358bbf5a05b17a591114d0f45a38ff42837751d00b88183265d9bf595ba39377fc53dfe69ca01ae8c1776e6d4ded9c0f636e0e697b946f1d193b39c1537
+DIST tl-svninfo.doc-2020.tar.xz 258436 BLAKE2B f235dae3c5e66d73d14ddceb8bd15dd49166a80d92f69dec78ae24ec1a7b2947f92447d4ea5a926100a0d6f367ee9c24d2144656713ddd36cf47c2c5a23a5a1b SHA512 f8f20578da98d54181475d23be625a80c35af5e464fdcfca80643f8701a029bfdf03cfb13ec42be34312eafc372e42e5bbb4260aaa5066fe004b2fd6fcb2acc7
+DIST tl-svninfo.source-2020.tar.xz 12712 BLAKE2B 797cb532b6510101f55dd65a20fe687be47a6824148750e8e4ae040d32ce61169842ae86130fe8bad2662096f81c0b5778f3e2ac02bb4b5cd3b972874418fd38 SHA512 7ce865a81c8fcd47ff2cf00b5304e40ca0d534ee63b23cf24eb716926f3258a8081ec6aa9bf160a3fce741f1dab6c62e069ada8f5298f9a354d92c34ab36058b
 DIST tl-syntax-2020.tar.xz 2632 BLAKE2B 87bcb2683b5f80eb2b6b2e5ba72467f6c44d30db45431b915397f645028a7681fdbe18c52811c6e2a8b70c1e3596ff1ce989b32d3bbd177a92cbc37350f1d5ea SHA512 be1e049a98cd7e45cec9675e707575107af9c613028012b8fbfa658c6c9cbbac5782d3a7111f37edc719fb90e7c168c9a98a3d30a4c997b6ac4ed0691fc7fdc3
 DIST tl-syntax.doc-2020.tar.xz 104576 BLAKE2B ebb1a644e5866bf1bf61f08f1aab5c5031ab87b9231c9fde17dde8f418ceb6f52f85cbbc0dc79d4bda86d84ff1a7a9de760d7ad9d522e85dc6838b239e7e4c56 SHA512 7d0754c08081abc9867d0d40fc910ae5f8b34518004bf698dddc184f0b514d75a7feb3085870cf8322b3d6f3bc4c32ab50acdaeb56b574bf41604a18c23a6656
 DIST tl-syntrace-2020.tar.xz 1496 BLAKE2B fc9755df6f72efc3ab3d53e84c069ed581c5730f37f02487a736af48e495ee6e7830d035331b8433cc1208802536f13922dab57e781ba1cc3c65e8a289efe422 SHA512 613c70859eb0c710c43fa4a62fe8b8d38a407ffe94c532d80927d00fd47c17b6570040f5d9ace5035f4dc53deef97419f52ecdf021ab11d5629445153b85ebd2
@@ -3348,5 +3365,5 @@ DIST tl-zwgetfdate-2020.tar.xz 1384 BLAKE2B 66eb7b908d42263478e92ba65da89482110d
 DIST tl-zwgetfdate.doc-2020.tar.xz 246032 BLAKE2B bcd8426a8fbc14f895243e70ae9b570d03a2854f68222cfd52f01d2d063136ff40a847343a8d932db2ebb0ce64f018ff2d82060e747f4bfa4d4393faacf9f7b6 SHA512 7ab61dc4252ef7f60d1d5be8d4415bcaeaed194384a1da14a3400617b36c6efae3679dbbd6c8d64b8cc9f9947babe88c064d637379f663408cbe63ca42334bfb
 DIST tl-zwpagelayout-2020.tar.xz 8880 BLAKE2B 566315ec2e12e47b766a77ec8c98259cfbb3f717493704050ee76bfcb6ebb0756590632ee5ef1b4446b1b89cf00ebaef8a38bb053151398be8704b601d706542 SHA512 b960d63e610cf28ff74d7ade9c297d1c6d23a801eaea2b4f9fde71a3b77defe43ea5625c098ded915b8c011cc0041177d3e4c3fb28359b522af63214accd362f
 DIST tl-zwpagelayout.doc-2020.tar.xz 635808 BLAKE2B 5827aeab15882c2c20d065595aedb248dbece1f717898c23776e17482074a292e8f5a8de9741634eed931205cb18d9d50fa4490759a559d1309f4f213046dee6 SHA512 16bf8b249fbc857bfef787862b1d8e0e0ff60d11e2b80377ad85d7db014ece77ecdbca91829b4dd8f92c811712be39e9ba30058b8c7e61805552f7f6b13fc817
-EBUILD texlive-latexextra-2020.ebuild 44516 BLAKE2B fcefa44210cbe72f4f179b13b6b0439e33e06271250513947fca74ff23e8ce83f996f67346697b23983a485c8ac59c2642ae2b83f18b56b20dacd7de07eb3ff6 SHA512 5a5e9673d079607da34137512340b12970f9e3c34f409232a941af5c66827725f86d3116cbe9994614d6c422ae9c82e6a09e42ccc6f2c9ece8d3c8650f0791d7
+EBUILD texlive-latexextra-2020-r2.ebuild 44713 BLAKE2B c1f6c9fb27a2c4a19ae904057a12f978261b5a6e2d8ceb9e933e4e48652fb934cd6ef17a2249e377d67af21ca7ae63c506be5f26db8495106575e5cee2f4bea0 SHA512 0f5bb17a169901096b75509a508094c090c38060350438e202edc351ae20eb1330953374f474cfc63d9dbf56ae2077ad49acbb16d3a12564876fa8453aa09632
 MISC metadata.xml 464 BLAKE2B f44661c9ab79ec9d3ca261cea4af7b64fbef81b0d63218137c940e804a8254b7a8638564d51b4f843e4ec59fc15711bbebd09f4b1fefd5a070ce0819345ce778 SHA512 f2f516eb45d8d405e29e91886fd2ffeb54e6126028d2ac218eb0bf43e009ab225f0a0661ce99436dda82b5f63b47e5930ab047e2bf16a2e306da510453fbe6a0
diff --git a/dev-texlive/texlive-latexextra/texlive-latexextra-2020-r2.ebuild b/dev-texlive/texlive-latexextra/texlive-latexextra-2020-r2.ebuild
new file mode 100644
index 000000000000..8a1040034261
--- /dev/null
+++ b/dev-texlive/texlive-latexextra/texlive-latexextra-2020-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+TEXLIVE_MODULE_CONTENTS="2up ESIEEcv GS1 HA-prosper Tabbing a0poster a4wide a5comb abraces abstract accessibility accsupp achemso acro acronym acroterm actuarialangle actuarialsymbol addfont addlines adjmulticol adjustbox adrconv advdate akktex akletter alertmessage alnumsec alphalph altfont amsaddr animate anonchap answers anyfontsize appendix appendixnumberbeamer apptools arabicfront arcs arraycols arrayjobx arraysort arydshln asciilist askinclude assignment assoccnt atenddvi attachfile aurl authoraftertitle authorarchive authorindex autofancyhdr autonum autopdf avremu axessibility background bankstatement bashful basicarith bchart beamer2thesis beamer-rl beameraudience beamerauxtheme beamercolorthemeowl beamerdarkthemes beamerposter beamersubframe beamertheme-cuerna beamertheme-detlevcm beamertheme-epyt beamertheme-focus beamertheme-light beamertheme-metropolis beamertheme-npbt beamertheme-phnompenh beamertheme-saintpetersburg beamertheme-upenn-bc beamerthemejltree beamerthemenirma bearwear beton bewerbung bez123 bhcexam bibletext bigfoot bigints biochemistry-colors bizcard blindtext blkarray block blowup bnumexpr boites bold-extra bookcover bookest booklet boolexpr bophook boxedminipage boxedminipage2e boxhandler bracketkey braket breakurl bullcntr bxcalc bxdpx-beamer bxdvidriver bxenclose bxnewfont bxpapersize bxpdfver bxtexlogo calcage calctab calculator calrsfs cals calxxxx-yyyy cancel canoniclayout capt-of captcont captdef carbohydrates cases casyl catchfile catchfilebetweentags catechis catoptions cbcoptic ccaption cclicenses cd cd-cover cdpbundl cellprops cellspace censor centeredline changebar changelayout changelog changepage changes chappg chapterfolder cheatsheet checkend chet chextras childdoc chkfloat chletter chngcntr chronology circ circledsteps classics classpack clefval cleveref clipboard clock cloze clrdblpg clrstrip cmdstring cmdtrack cmsd cnltx cntformats cntperchap codedoc codepage codesection collcell collectbox colophon colordoc colorinfo coloring colorspace colortab colorwav colorweb colourchange combelow combine comma commado commedit comment competences concepts concprog constants continue contour contracard conv-xkv cooking cooking-units cool coollist coolstr coolthms cooltooltips coordsys copyedit copyrightbox coseoul counttexruns courseoutline coursepaper coverpage cprotect crbox crossreference crossreftools csquotes css-colors csvmerge csvsimple cuisine currency currfile currvita cutwin cv cv4tw cweb-latex cyber cybercic dashbox dashrule dashundergaps dataref datatool dateiliste datenumber datetime datetime2 datetime2-bahasai datetime2-basque datetime2-breton datetime2-bulgarian datetime2-catalan datetime2-croatian datetime2-czech datetime2-danish datetime2-dutch datetime2-en-fulltext datetime2-english datetime2-esperanto datetime2-estonian datetime2-finnish datetime2-french datetime2-galician datetime2-german datetime2-greek datetime2-hebrew datetime2-icelandic datetime2-irish datetime2-italian datetime2-it-fulltext datetime2-latin datetime2-lsorbian datetime2-magyar datetime2-norsk datetime2-polish datetime2-portuges datetime2-romanian datetime2-russian datetime2-samin datetime2-scottish datetime2-serbian datetime2-slovak datetime2-slovene datetime2-spanish datetime2-swedish datetime2-turkish datetime2-ukrainian datetime2-usorbian datetime2-welsh dblfloatfix decimal decorule delimtxt denisbdoc diagbox diagnose dialogl dichokey dinbrief directory dirtytalk dlfltxb dnaseq doclicense docmfp docmute doctools documentation doi dotarrow dotlessi dotseqn download dox dpfloat dprogress drac draftcopy draftfigure draftwatermark dtk dtxdescribe dtxgallery duckuments ducksay dvdcoll dynamicnumber dynblocks ean13isbn easy easy-todo easyfig easyformat easylist easyreview ebezier ecclesiastic ecv ed edmargin eemeir efbox egplot ehhline elegantbook elegantnote elegantpaper elements ellipsis elmath elocalloc elpres elzcards emarks embedall embedfile embrac emptypage emulateapj endfloat endheads endnotes engpron engrec enotez enumitem enumitem-zref envbig environ envlab epigraph epiolmec eqell eqlist eqnalign eqname eqparbox errata erw-l3 esami esdiff esindex esint esint-type1 etaremune etextools etoc eukdate eulerpx europasscv europecv everyhook everypage exam exam-n exam-randomizechoices examdesign exframe example examplep exceltex excludeonly exercise exercisebank exercisepoints exercises exp-testopt expdlist export exsheets exsol extract facsimile factura fancyhandout fancylabel fancynum fancypar fancyslides fancytabs fancytooltips fbox fcolumn fetchcls fewerfloatpages ffslides fgruler fibeamer fifo-stack figsize filecontents filecontentsdef filedate fileinfo filemod fink finstrut fithesis fixcmex fixfoot fixme fixmetodonotes fjodor flabels flacards flagderiv flashcards flashmovie flipbook flippdf floatflt floatrow flowfram fmp fmtcount fn2end fnbreak fncychap fncylab fnpara fnpct fnumprint foilhtml fontaxes fontsetup fontsize fonttable footmisc footmisx footnotebackref footnoterange footnpag forarray foreign forloop formlett forms16be formular fragments frame framed frankenstein frege ftcap ftnxtra fullblck fullminipage fullwidth fundus-calligra fundus-cyr fundus-sueterlin fvextra fwlw g-brief gatherenum gauss gcard gcite gender genmpage getfiledate getitems gindex ginpenc gitfile-info gitinfo gitinfo2 gitlog gitver globalvals gloss glossaries-danish glossaries-dutch glossaries-english glossaries-estonian glossaries-extra glossaries-finnish glossaries-french glossaries-german glossaries-irish glossaries-italian glossaries-magyar glossaries-polish glossaries-portuges glossaries-serbian glossaries-slovene glossaries-spanish gmdoc gmdoc-enhance gmiflink gmutils gmverb grabbox graphbox graphicx-psmin graphicxbox grayhints grfpaste grid grid-system gridset gridslides guitlogo halloweenmath hackthefootline handin handout hang hanging hardwrap harnon-cv harpoon hc he-she hhtensor histogr hitec hletter hobsub hpsdiss hrefhide hvindex hvqrurl hypdvips hyper hyperbar hypernat hyperxmp hyphenat identkey idxcmds idxlayout iffont ifmslide ifmtarg ifnextok ifoddpage ifthenx iitem image-gallery imakeidx import incgraph indextools inline-images inlinedef inputenx inputtrc interactiveworkbook interfaces intopdf inversepath invoice invoice-class invoice2 iso iso10303 isodate isodoc isonums isopt isorot isotope issuulinks iwhdp jlabels jslectureplanner jumplines jvlisting kalendarium kantlipsum kerntest keycommand keyfloat keyreader keyindex keystroke keyval2e keyvaltable kix knowledge koma-moderncvclassic koma-script-sfs komacv komacv-rg ktv-texdata l3build labbook labels labels4easylist labelschanged lastpackage lastpage latex-amsmath-dev latex-base-dev latex-bin-dev latex-graphics-dev latex-tds latex-tools-dev latex-uni8 latexcolors latexdemo latexgit layouts lazylist lccaps lcd lcg leading leaflet lectures leftidx leipzig lengthconvert lettre lettrine lewis lhelp libgreek limap linegoal linop lipsum lisp-on-tex listing listingsutf8 listlbls listliketab listofsymbols lkproof lmake locality localloc logbox logical-markup-utils logpap longfbox longfigure longnamefilelist loops lsc lstaddons lstfiracode lt3graph ltablex ltabptch ltxdockit ltxguidex ltxkeys ltxnew ltxtools lua-check-hyphen luatodonotes macroswap magaz magicnum makecookbook makerobust mailing mailmerge makebarcode makebase makebox makecell makecirc makecmds makedtx makeglos mandi manfnt manuscript manyind marginfit marginfix marginnote markdown mathalpha mathastext mathexam mathfam256 mathfont maybemath mcaption mceinleger mcexam mcite mciteplus mdframed media9 medstarbeamer meetingmins memexsupp memory mensa-tex menu menukeys metalogox metastr method metre mfirstuc mftinc mi-solns midpage minibox minidocument minifp minipage-marginpar minitoc minorrevision minted minutes mla-paper mleftright mlist mmap mnotes moderncv modernposter moderntimeline modref modroman modular monofill moodle moreenum morefloats morehype moresize moreverb morewrites movie15 mparhack mpostinl msc msg mslapa mtgreek multenum multiaudience multibbl multicap multicolrule multidef multienv multiexpand multilang multirow mversion mwe mycv mylatexformat nag nameauth namespc ncclatex ncctools needspace nestquot newcommand newenviron newfile newlfm newspaper newunicodechar newvbtm newverbs nextpage nfssext-cfr nicefilelist niceframe nicetext nidanfloat nlctdoc noconflict noindentafter noitcrul nolbreaks nomencl nomentbl nonfloat nonumonpart nopageno normalcolor notes notespages notestex notoccite nowidow nox ntheorem numberedblock numname numprint numspell ocg-p ocgx ocgx2 ocr-latex octavo oldstyle onlyamsmath opcit optidef optional options outline outliner outlines outlining overlays overpic padcount pagecolor pagecont pagenote pagerange pageslts paper papercdcase papermas papertex paracol parades paralist paresse parnotes parsa parselines pas-cours pas-cv pas-tableur patch patchcmd pauldoc pawpict pbox pbsheet pdf14 pdfcolmk pdfcomment pdfcprot pdfmarginpar pdfoverlay pdfpagediff pdfpc pdfpc-movie pdfprivacy pdfreview pdfscreen pdfslide pdfsync pdfwin pdfx pecha perltex permute petiteannonce phffullpagefigure phfnote phfparen phfqit phfquotetext phfsvnwatermark phfthm philex phonenumbers photo picture piff pkgloader placeins plantslabels plates plweb pmboxdraw polynom polynomial polytable postcards poster-mac powerdot ppr-prv practicalreports preprint pressrelease prettyref preview printlen probsoln program progress progressbar proofread properties prosper protex protocol psfragx pstool pstring pxgreeks pygmentex python qcm qstest qsymbols quicktype quiz2socrative quotchap quoting quotmark ran_toks randtext rccol rcs-multi rcsinfo readarray realboxes recipe recipebook recipecard rectopma refcheck refenums reflectgraphics refman refstyle regcount regexpatch register regstats relenc relsize repeatindex repltext returntogrid rgltxdoc rjlparshap rlepsf rmpage robustcommand robustindex romanbar romanbarpagenumber romanneg romannum rotfloat rotpages roundbox rterface rtkinenc rulerbox rulercompass rvwrite sanitize-umlaut sauerj savefnmark savesym savetrees scale scalebar scalerel scanpages schedule scontents scrlttr2copy sdaps sdrt secdot secnum sectionbox sectionbreak sectsty seealso selectp selinput semantic semantic-markup semioneside semproc sepfootnotes seqsplit sesstime sf298 sffms sfmath shadethm shadow shadowtext shapepar shdoc shipunov shorttoc show2e showcharinbox showdim showexpl showhyphens showlabels sidecap sidenotes silence simplecd simplecv simpleinvoice sitem skb skdoc skeycommand skeyval skrapport slantsc smalltableof smartunits smartref snapshot snotez soul soulpos soulutf8 spacingtricks spark-otf sparklines sphack splitindex spot spotcolor spreadtab spverbatim srbook-mem srcltx sseq sslides stack stackengine standalone stdclsdv stealcaps stdpage stex storebox storecmd stringstrings sttools stubs studenthandouts subdepth subdocs subeqn subeqnarray subfigmat subfigure subfiles subfloat substitutefont substr supertabular svg svgcolor svn svn-multi svn-prov svninfo syntax syntrace synttree tabfigures tableaux tablefootnote tableof tablestyles tablists tabls tablvar tabstackengine tabto-ltx tabu tabularborder tabularcalc tabularew tabulary tagging tagpair tagpdf talk tamefloats tasks tcldoc tcolorbox tdclock technics ted templatetools termcal termlist testhyphens testidx tex-label tex-locale texlogos texmate texments texpower texshade texvc textfit textmerg textpos textualicomma theoremref thinsp thmtools threadcol threeparttable threeparttablex thumb thumbs thumby ticket titlecaps titlefoot titlepic titleref titlesec titling tocbibind tocdata tocloft tocvsec2 todo todonotes tokcycle tokenizer toolbox topfloat topiclongtable totcount totpages translations transparent trfsigns trimspaces trivfloat trsym truncate tucv turnthepage twoinone twoup txgreeks type1cm typed-checklist typeface typoaid typogrid uassign ucs uebungsblatt umoline underlin underoverlap undolabl units unravel upmethodology upquote uri ushort uspace uwmslide variablelm varindex varsfromjobname varwidth vdmlisting verbasef verbatimbox verbatimcopy verbdef verbments version versions versonotes vertbars vgrid vhistory vmargin volumes vpe vruler vtable vwcol wallcalendar wallpaper warning warpcol was webquiz widetable widows-and-orphans williams withargs wordcount wordlike worksheet wrapfig wtref xargs xassoccnt xbmks xcntperchap xcolor-material xcolor-solarized xcomment xcookybooky xcpdftips xdoc xellipsis xfakebold xfor xhfill xifthen xint xkcdcolors xltabular xmpincl xnewcommand xoptarg xpatch xpeek xprintlen xpunctuate xsavebox xsim xstring xtab xurl xwatermark xytree yafoot yaletter yagusylo ycbook ydoc yplan zebra-goodies zed-csp ziffer zref zwgetfdate zwpagelayout collection-latexextra
+"
+TEXLIVE_MODULE_DOC_CONTENTS="2up.doc ESIEEcv.doc GS1.doc HA-prosper.doc Tabbing.doc a0poster.doc a4wide.doc a5comb.doc abraces.doc abstract.doc accessibility.doc accsupp.doc achemso.doc acro.doc acronym.doc acroterm.doc actuarialangle.doc actuarialsymbol.doc addfont.doc addlines.doc adjmulticol.doc adjustbox.doc adrconv.doc advdate.doc akktex.doc akletter.doc alertmessage.doc alnumsec.doc alphalph.doc altfont.doc amsaddr.doc animate.doc anonchap.doc answers.doc anyfontsize.doc appendix.doc appendixnumberbeamer.doc apptools.doc arabicfront.doc arcs.doc arraycols.doc arrayjobx.doc arraysort.doc arydshln.doc asciilist.doc askinclude.doc assignment.doc assoccnt.doc atenddvi.doc attachfile.doc aurl.doc authoraftertitle.doc authorarchive.doc authorindex.doc autofancyhdr.doc autonum.doc autopdf.doc avremu.doc axessibility.doc background.doc bankstatement.doc bashful.doc basicarith.doc bchart.doc beamer2thesis.doc beamer-rl.doc beameraudience.doc beamerauxtheme.doc beamercolorthemeowl.doc beamerdarkthemes.doc beamerposter.doc beamersubframe.doc beamertheme-cuerna.doc beamertheme-detlevcm.doc beamertheme-epyt.doc beamertheme-focus.doc beamertheme-light.doc beamertheme-metropolis.doc beamertheme-npbt.doc beamertheme-phnompenh.doc beamertheme-saintpetersburg.doc beamertheme-upenn-bc.doc beamerthemenirma.doc bearwear.doc beton.doc bewerbung.doc bez123.doc bhcexam.doc bibletext.doc bigfoot.doc bigints.doc biochemistry-colors.doc bizcard.doc blindtext.doc blkarray.doc block.doc blowup.doc bnumexpr.doc boites.doc bold-extra.doc bookcover.doc bookest.doc booklet.doc boolexpr.doc bophook.doc boxedminipage.doc boxedminipage2e.doc boxhandler.doc bracketkey.doc braket.doc breakurl.doc bullcntr.doc bxcalc.doc bxdpx-beamer.doc bxdvidriver.doc bxenclose.doc bxnewfont.doc bxpapersize.doc bxpdfver.doc bxtexlogo.doc calcage.doc calctab.doc calculator.doc calrsfs.doc cals.doc calxxxx-yyyy.doc cancel.doc canoniclayout.doc capt-of.doc captcont.doc captdef.doc carbohydrates.doc cases.doc casyl.doc catchfile.doc catchfilebetweentags.doc catechis.doc catoptions.doc cbcoptic.doc ccaption.doc cclicenses.doc cd.doc cd-cover.doc cdpbundl.doc cellprops.doc cellspace.doc censor.doc centeredline.doc changebar.doc changelayout.doc changelog.doc changepage.doc changes.doc chappg.doc chapterfolder.doc cheatsheet.doc checkend.doc chet.doc chextras.doc childdoc.doc chkfloat.doc chletter.doc chngcntr.doc chronology.doc circ.doc circledsteps.doc classics.doc classpack.doc clefval.doc cleveref.doc clipboard.doc clock.doc cloze.doc clrdblpg.doc clrstrip.doc cmdstring.doc cmdtrack.doc cmsd.doc cnltx.doc cntformats.doc cntperchap.doc codedoc.doc codepage.doc codesection.doc collcell.doc collectbox.doc colophon.doc colordoc.doc colorinfo.doc coloring.doc colorspace.doc colortab.doc colorwav.doc colorweb.doc colourchange.doc combelow.doc combine.doc comma.doc commado.doc commedit.doc comment.doc competences.doc concepts.doc concprog.doc constants.doc continue.doc contour.doc contracard.doc conv-xkv.doc cooking.doc cooking-units.doc cool.doc coollist.doc coolstr.doc coolthms.doc cooltooltips.doc coordsys.doc copyedit.doc copyrightbox.doc coseoul.doc counttexruns.doc courseoutline.doc coursepaper.doc coverpage.doc cprotect.doc crbox.doc crossreference.doc crossreftools.doc csquotes.doc css-colors.doc csvmerge.doc csvsimple.doc cuisine.doc currency.doc currfile.doc currvita.doc cutwin.doc cv.doc cv4tw.doc cweb-latex.doc cyber.doc cybercic.doc dashbox.doc dashrule.doc dashundergaps.doc dataref.doc datatool.doc dateiliste.doc datenumber.doc datetime.doc datetime2.doc datetime2-bahasai.doc datetime2-basque.doc datetime2-breton.doc datetime2-bulgarian.doc datetime2-catalan.doc datetime2-croatian.doc datetime2-czech.doc datetime2-danish.doc datetime2-dutch.doc datetime2-en-fulltext.doc datetime2-english.doc datetime2-esperanto.doc datetime2-estonian.doc datetime2-finnish.doc datetime2-french.doc datetime2-galician.doc datetime2-german.doc datetime2-greek.doc datetime2-hebrew.doc datetime2-icelandic.doc datetime2-irish.doc datetime2-italian.doc datetime2-it-fulltext.doc datetime2-latin.doc datetime2-lsorbian.doc datetime2-magyar.doc datetime2-norsk.doc datetime2-polish.doc datetime2-portuges.doc datetime2-romanian.doc datetime2-russian.doc datetime2-samin.doc datetime2-scottish.doc datetime2-serbian.doc datetime2-slovak.doc datetime2-slovene.doc datetime2-spanish.doc datetime2-swedish.doc datetime2-turkish.doc datetime2-ukrainian.doc datetime2-usorbian.doc datetime2-welsh.doc dblfloatfix.doc decimal.doc decorule.doc delimtxt.doc denisbdoc.doc diagbox.doc diagnose.doc dialogl.doc dichokey.doc dinbrief.doc directory.doc dirtytalk.doc dlfltxb.doc dnaseq.doc doclicense.doc docmfp.doc docmute.doc doctools.doc documentation.doc doi.doc dotarrow.doc dotlessi.doc dotseqn.doc download.doc dox.doc dpfloat.doc dprogress.doc drac.doc draftcopy.doc draftfigure.doc draftwatermark.doc dtk.doc dtxdescribe.doc dtxgallery.doc duckuments.doc ducksay.doc dvdcoll.doc dynamicnumber.doc dynblocks.doc ean13isbn.doc easy.doc easy-todo.doc easyfig.doc easyformat.doc easylist.doc easyreview.doc ebezier.doc ecclesiastic.doc ecv.doc ed.doc edmargin.doc eemeir.doc efbox.doc egplot.doc ehhline.doc elegantbook.doc elegantnote.doc elegantpaper.doc elements.doc ellipsis.doc elmath.doc elocalloc.doc elpres.doc elzcards.doc emarks.doc embedall.doc embedfile.doc embrac.doc emptypage.doc emulateapj.doc endfloat.doc endheads.doc endnotes.doc engpron.doc engrec.doc enotez.doc enumitem.doc enumitem-zref.doc envbig.doc environ.doc envlab.doc epigraph.doc epiolmec.doc eqell.doc eqlist.doc eqnalign.doc eqparbox.doc errata.doc erw-l3.doc esami.doc esdiff.doc esindex.doc esint.doc esint-type1.doc etaremune.doc etextools.doc etoc.doc eukdate.doc eulerpx.doc europasscv.doc europecv.doc everyhook.doc everypage.doc exam.doc exam-n.doc exam-randomizechoices.doc examdesign.doc exframe.doc examplep.doc exceltex.doc excludeonly.doc exercise.doc exercisebank.doc exercisepoints.doc exercises.doc exp-testopt.doc expdlist.doc export.doc exsheets.doc exsol.doc extract.doc facsimile.doc factura.doc fancyhandout.doc fancylabel.doc fancynum.doc fancypar.doc fancyslides.doc fancytabs.doc fancytooltips.doc fbox.doc fcolumn.doc fetchcls.doc fewerfloatpages.doc ffslides.doc fgruler.doc fibeamer.doc fifo-stack.doc figsize.doc filecontents.doc filecontentsdef.doc filedate.doc fileinfo.doc filemod.doc fink.doc finstrut.doc fithesis.doc fixcmex.doc fixfoot.doc fixme.doc fixmetodonotes.doc fjodor.doc flabels.doc flacards.doc flagderiv.doc flashcards.doc flashmovie.doc flipbook.doc flippdf.doc floatflt.doc floatrow.doc flowfram.doc fmp.doc fmtcount.doc fn2end.doc fnbreak.doc fncychap.doc fncylab.doc fnpara.doc fnpct.doc fnumprint.doc foilhtml.doc fontaxes.doc fontsetup.doc fontsize.doc fonttable.doc footmisc.doc footmisx.doc footnotebackref.doc footnoterange.doc footnpag.doc forarray.doc foreign.doc forloop.doc formlett.doc forms16be.doc formular.doc fragments.doc frame.doc framed.doc frankenstein.doc frege.doc ftcap.doc ftnxtra.doc fullblck.doc fullminipage.doc fullwidth.doc fundus-calligra.doc fundus-sueterlin.doc fvextra.doc fwlw.doc g-brief.doc gatherenum.doc gauss.doc gcard.doc gcite.doc gender.doc genmpage.doc getfiledate.doc getitems.doc gindex.doc ginpenc.doc gitfile-info.doc gitinfo.doc gitinfo2.doc gitlog.doc gitver.doc globalvals.doc gloss.doc glossaries-danish.doc glossaries-dutch.doc glossaries-english.doc glossaries-estonian.doc glossaries-extra.doc glossaries-finnish.doc glossaries-french.doc glossaries-german.doc glossaries-irish.doc glossaries-italian.doc glossaries-magyar.doc glossaries-polish.doc glossaries-portuges.doc glossaries-serbian.doc glossaries-slovene.doc glossaries-spanish.doc gmdoc.doc gmdoc-enhance.doc gmiflink.doc gmutils.doc gmverb.doc grabbox.doc graphbox.doc graphicx-psmin.doc graphicxbox.doc grayhints.doc grfpaste.doc grid.doc grid-system.doc gridset.doc gridslides.doc guitlogo.doc halloweenmath.doc hackthefootline.doc handin.doc handout.doc hang.doc hanging.doc hardwrap.doc harnon-cv.doc harpoon.doc hc.doc he-she.doc hhtensor.doc histogr.doc hitec.doc hletter.doc hobsub.doc hpsdiss.doc hrefhide.doc hvindex.doc hvqrurl.doc hypdvips.doc hyper.doc hyperbar.doc hypernat.doc hyperxmp.doc hyphenat.doc identkey.doc idxcmds.doc idxlayout.doc iffont.doc ifmslide.doc ifmtarg.doc ifnextok.doc ifoddpage.doc ifthenx.doc iitem.doc image-gallery.doc imakeidx.doc import.doc incgraph.doc indextools.doc inline-images.doc inlinedef.doc inputenx.doc inputtrc.doc interactiveworkbook.doc interfaces.doc intopdf.doc inversepath.doc invoice.doc invoice-class.doc invoice2.doc iso.doc iso10303.doc isodate.doc isodoc.doc isonums.doc isopt.doc isorot.doc isotope.doc issuulinks.doc iwhdp.doc jlabels.doc jslectureplanner.doc jumplines.doc jvlisting.doc kalendarium.doc kantlipsum.doc kerntest.doc keycommand.doc keyfloat.doc keyreader.doc keyindex.doc keystroke.doc keyval2e.doc keyvaltable.doc kix.doc knowledge.doc koma-moderncvclassic.doc koma-script-sfs.doc komacv.doc komacv-rg.doc ktv-texdata.doc l3build.doc labbook.doc labels.doc labels4easylist.doc labelschanged.doc lastpackage.doc lastpage.doc latex-amsmath-dev.doc latex-base-dev.doc latex-bin-dev.doc latex-graphics-dev.doc latex-tds.doc latex-tools-dev.doc latex-uni8.doc latexcolors.doc latexdemo.doc latexgit.doc layouts.doc lazylist.doc lccaps.doc lcd.doc lcg.doc leading.doc leaflet.doc lectures.doc leftidx.doc leipzig.doc lengthconvert.doc lettre.doc lettrine.doc lewis.doc lhelp.doc libgreek.doc limap.doc linegoal.doc linop.doc lipsum.doc lisp-on-tex.doc listing.doc listingsutf8.doc listlbls.doc listliketab.doc listofsymbols.doc lkproof.doc lmake.doc locality.doc localloc.doc logbox.doc logical-markup-utils.doc logpap.doc longfbox.doc longfigure.doc longnamefilelist.doc loops.doc lsc.doc lstaddons.doc lstfiracode.doc lt3graph.doc ltablex.doc ltabptch.doc ltxdockit.doc ltxguidex.doc ltxkeys.doc ltxnew.doc ltxtools.doc lua-check-hyphen.doc luatodonotes.doc macroswap.doc magaz.doc magicnum.doc makecookbook.doc makerobust.doc mailing.doc mailmerge.doc makebarcode.doc makebase.doc makebox.doc makecell.doc makecirc.doc makecmds.doc makedtx.doc makeglos.doc mandi.doc manuscript.doc manyind.doc marginfit.doc marginfix.doc marginnote.doc markdown.doc mathalpha.doc mathastext.doc mathexam.doc mathfam256.doc mathfont.doc maybemath.doc mcaption.doc mceinleger.doc mcexam.doc mcite.doc mciteplus.doc mdframed.doc media9.doc medstarbeamer.doc meetingmins.doc memexsupp.doc memory.doc mensa-tex.doc menu.doc menukeys.doc metalogox.doc metastr.doc method.doc metre.doc mfirstuc.doc mftinc.doc mi-solns.doc midpage.doc minibox.doc minidocument.doc minifp.doc minipage-marginpar.doc minitoc.doc minorrevision.doc minted.doc minutes.doc mla-paper.doc mleftright.doc mlist.doc mmap.doc mnotes.doc moderncv.doc modernposter.doc moderntimeline.doc modref.doc modroman.doc modular.doc monofill.doc moodle.doc moreenum.doc morefloats.doc morehype.doc moresize.doc moreverb.doc morewrites.doc movie15.doc mparhack.doc mpostinl.doc msc.doc msg.doc mslapa.doc mtgreek.doc multenum.doc multiaudience.doc multibbl.doc multicap.doc multicolrule.doc multidef.doc multienv.doc multiexpand.doc multilang.doc multirow.doc mversion.doc mwe.doc mycv.doc mylatexformat.doc nag.doc nameauth.doc namespc.doc ncclatex.doc ncctools.doc needspace.doc newcommand.doc newenviron.doc newfile.doc newlfm.doc newspaper.doc newunicodechar.doc newvbtm.doc newverbs.doc nfssext-cfr.doc nicefilelist.doc niceframe.doc nicetext.doc nidanfloat.doc nlctdoc.doc noconflict.doc noindentafter.doc noitcrul.doc nolbreaks.doc nomencl.doc nomentbl.doc nonfloat.doc nonumonpart.doc nopageno.doc normalcolor.doc notes.doc notespages.doc notestex.doc notoccite.doc nowidow.doc nox.doc ntheorem.doc numberedblock.doc numname.doc numprint.doc numspell.doc ocg-p.doc ocgx.doc ocgx2.doc ocr-latex.doc octavo.doc oldstyle.doc onlyamsmath.doc opcit.doc optidef.doc optional.doc options.doc outline.doc outliner.doc outlines.doc outlining.doc overlays.doc overpic.doc padcount.doc pagecolor.doc pagecont.doc pagenote.doc pagerange.doc pageslts.doc paper.doc papercdcase.doc papermas.doc papertex.doc paracol.doc parades.doc paralist.doc paresse.doc parnotes.doc parsa.doc parselines.doc pas-cours.doc pas-cv.doc pas-tableur.doc patchcmd.doc pauldoc.doc pawpict.doc pbox.doc pbsheet.doc pdf14.doc pdfcolmk.doc pdfcomment.doc pdfcprot.doc pdfmarginpar.doc pdfoverlay.doc pdfpagediff.doc pdfpc.doc pdfpc-movie.doc pdfprivacy.doc pdfreview.doc pdfscreen.doc pdfslide.doc pdfsync.doc pdfwin.doc pdfx.doc pecha.doc perltex.doc permute.doc petiteannonce.doc phffullpagefigure.doc phfnote.doc phfparen.doc phfqit.doc phfquotetext.doc phfsvnwatermark.doc phfthm.doc philex.doc phonenumbers.doc photo.doc picture.doc piff.doc pkgloader.doc placeins.doc plantslabels.doc plates.doc plweb.doc pmboxdraw.doc polynom.doc polynomial.doc polytable.doc postcards.doc poster-mac.doc powerdot.doc ppr-prv.doc practicalreports.doc preprint.doc pressrelease.doc prettyref.doc preview.doc printlen.doc probsoln.doc program.doc progress.doc progressbar.doc proofread.doc properties.doc prosper.doc protex.doc protocol.doc psfragx.doc pstool.doc pstring.doc pxgreeks.doc pygmentex.doc python.doc qcm.doc qstest.doc qsymbols.doc quicktype.doc quiz2socrative.doc quotchap.doc quoting.doc quotmark.doc ran_toks.doc randtext.doc rccol.doc rcs-multi.doc rcsinfo.doc readarray.doc realboxes.doc recipe.doc recipebook.doc recipecard.doc rectopma.doc refcheck.doc refenums.doc reflectgraphics.doc refman.doc refstyle.doc regcount.doc regexpatch.doc register.doc regstats.doc relenc.doc relsize.doc repeatindex.doc repltext.doc returntogrid.doc rgltxdoc.doc rjlparshap.doc rlepsf.doc rmpage.doc robustcommand.doc robustindex.doc romanbar.doc romanbarpagenumber.doc romanneg.doc romannum.doc rotfloat.doc rotpages.doc roundbox.doc rterface.doc rtkinenc.doc rulerbox.doc rulercompass.doc rvwrite.doc sanitize-umlaut.doc sauerj.doc savefnmark.doc savetrees.doc scale.doc scalebar.doc scalerel.doc scanpages.doc schedule.doc scontents.doc scrlttr2copy.doc sdaps.doc sdrt.doc secdot.doc secnum.doc sectionbox.doc sectionbreak.doc sectsty.doc seealso.doc selectp.doc selinput.doc semantic.doc semantic-markup.doc semioneside.doc semproc.doc sepfootnotes.doc seqsplit.doc sesstime.doc sf298.doc sffms.doc shadethm.doc shadow.doc shadowtext.doc shapepar.doc shdoc.doc shipunov.doc shorttoc.doc show2e.doc showcharinbox.doc showdim.doc showexpl.doc showhyphens.doc showlabels.doc sidecap.doc sidenotes.doc silence.doc simplecd.doc simplecv.doc simpleinvoice.doc sitem.doc skb.doc skdoc.doc skeycommand.doc skeyval.doc skrapport.doc slantsc.doc smalltableof.doc smartunits.doc smartref.doc snapshot.doc snotez.doc soul.doc soulpos.doc soulutf8.doc spacingtricks.doc spark-otf.doc sparklines.doc sphack.doc splitindex.doc spot.doc spotcolor.doc spreadtab.doc spverbatim.doc srbook-mem.doc srcltx.doc sseq.doc sslides.doc stackengine.doc standalone.doc stdclsdv.doc stealcaps.doc stdpage.doc stex.doc storebox.doc storecmd.doc stringstrings.doc sttools.doc stubs.doc studenthandouts.doc subdepth.doc subdocs.doc subeqn.doc subeqnarray.doc subfigmat.doc subfigure.doc subfiles.doc subfloat.doc substitutefont.doc substr.doc supertabular.doc svg.doc svgcolor.doc svn.doc svn-multi.doc svn-prov.doc svninfo.doc syntax.doc syntrace.doc synttree.doc tabfigures.doc tableaux.doc tablefootnote.doc tableof.doc tablestyles.doc tablists.doc tabls.doc tablvar.doc tabstackengine.doc tabto-ltx.doc tabu.doc tabularborder.doc tabularcalc.doc tabularew.doc tabulary.doc tagging.doc tagpair.doc tagpdf.doc talk.doc tamefloats.doc tasks.doc tcldoc.doc tcolorbox.doc tdclock.doc technics.doc ted.doc templatetools.doc termcal.doc termlist.doc testhyphens.doc testidx.doc tex-label.doc tex-locale.doc texmate.doc texments.doc texpower.doc texshade.doc texvc.doc textfit.doc textmerg.doc textpos.doc textualicomma.doc theoremref.doc thinsp.doc thmtools.doc threadcol.doc threeparttable.doc threeparttablex.doc thumb.doc thumbs.doc thumby.doc ticket.doc titlecaps.doc titlepic.doc titleref.doc titlesec.doc titling.doc tocbibind.doc tocdata.doc tocloft.doc tocvsec2.doc todo.doc todonotes.doc tokcycle.doc tokenizer.doc toolbox.doc topfloat.doc topiclongtable.doc totcount.doc totpages.doc translations.doc transparent.doc trfsigns.doc trimspaces.doc trivfloat.doc trsym.doc truncate.doc tucv.doc turnthepage.doc twoinone.doc twoup.doc txgreeks.doc type1cm.doc typed-checklist.doc typeface.doc typoaid.doc typogrid.doc uassign.doc ucs.doc uebungsblatt.doc umoline.doc underlin.doc underoverlap.doc undolabl.doc units.doc unravel.doc upmethodology.doc upquote.doc uri.doc ushort.doc uspace.doc uwmslide.doc variablelm.doc varindex.doc varsfromjobname.doc varwidth.doc vdmlisting.doc verbasef.doc verbatimbox.doc verbatimcopy.doc verbdef.doc verbments.doc version.doc versions.doc versonotes.doc vertbars.doc vgrid.doc vhistory.doc vmargin.doc volumes.doc vpe.doc vruler.doc vtable.doc vwcol.doc wallcalendar.doc wallpaper.doc warning.doc warpcol.doc was.doc webquiz.doc widetable.doc widows-and-orphans.doc williams.doc withargs.doc wordcount.doc wordlike.doc worksheet.doc wrapfig.doc wtref.doc xargs.doc xassoccnt.doc xbmks.doc xcntperchap.doc xcolor-material.doc xcolor-solarized.doc xcomment.doc xcookybooky.doc xcpdftips.doc xdoc.doc xellipsis.doc xfakebold.doc xfor.doc xhfill.doc xifthen.doc xint.doc xkcdcolors.doc xltabular.doc xmpincl.doc xnewcommand.doc xoptarg.doc xpatch.doc xpeek.doc xprintlen.doc xpunctuate.doc xsavebox.doc xsim.doc xstring.doc xtab.doc xurl.doc xwatermark.doc xytree.doc yafoot.doc yaletter.doc yagusylo.doc ycbook.doc ydoc.doc yplan.doc zebra-goodies.doc zed-csp.doc ziffer.doc zref.doc zwgetfdate.doc zwpagelayout.doc "
+TEXLIVE_MODULE_SRC_CONTENTS="ESIEEcv.source GS1.source HA-prosper.source Tabbing.source abstract.source accessibility.source accsupp.source achemso.source acronym.source acroterm.source actuarialangle.source actuarialsymbol.source addlines.source adjmulticol.source adjustbox.source adrconv.source alertmessage.source alnumsec.source alphalph.source altfont.source amsaddr.source animate.source answers.source appendix.source apptools.source arcs.source arraycols.source arraysort.source arydshln.source asciilist.source askinclude.source atenddvi.source attachfile.source autonum.source autopdf.source avremu.source axessibility.source background.source basicarith.source beamercolorthemeowl.source beamersubframe.source beamertheme-cuerna.source beamertheme-metropolis.source beamertheme-saintpetersburg.source bearwear.source beton.source bewerbung.source bez123.source bhcexam.source bigfoot.source bizcard.source blindtext.source blowup.source bnumexpr.source boites.source bookcover.source booklet.source boolexpr.source bophook.source boxedminipage2e.source boxhandler.source breakurl.source bullcntr.source calcage.source calculator.source cals.source canoniclayout.source capt-of.source captcont.source catchfile.source catchfilebetweentags.source catechis.source ccaption.source cclicenses.source cd.source cd-cover.source cdpbundl.source cellprops.source changebar.source changepage.source changes.source chappg.source chapterfolder.source cheatsheet.source chextras.source childdoc.source chletter.source circ.source classpack.source clefval.source cleveref.source cloze.source clrdblpg.source clrstrip.source cmdtrack.source codepage.source codesection.source collcell.source collectbox.source colophon.source colordoc.source colorwav.source colorweb.source combine.source commado.source commedit.source competences.source constants.source continue.source contour.source contracard.source conv-xkv.source cooking.source cooking-units.source cool.source coollist.source coolstr.source coolthms.source cooltooltips.source coordsys.source copyedit.source counttexruns.source coverpage.source cprotect.source crossreference.source csvmerge.source cuisine.source currency.source currfile.source currvita.source cutwin.source cyber.source cybercic.source dashbox.source dashrule.source dashundergaps.source datatool.source dateiliste.source datenumber.source datetime.source datetime2.source datetime2-bahasai.source datetime2-basque.source datetime2-breton.source datetime2-bulgarian.source datetime2-catalan.source datetime2-croatian.source datetime2-czech.source datetime2-danish.source datetime2-dutch.source datetime2-en-fulltext.source datetime2-english.source datetime2-esperanto.source datetime2-estonian.source datetime2-finnish.source datetime2-french.source datetime2-galician.source datetime2-german.source datetime2-greek.source datetime2-hebrew.source datetime2-icelandic.source datetime2-irish.source datetime2-italian.source datetime2-it-fulltext.source datetime2-latin.source datetime2-lsorbian.source datetime2-magyar.source datetime2-norsk.source datetime2-polish.source datetime2-portuges.source datetime2-romanian.source datetime2-russian.source datetime2-samin.source datetime2-scottish.source datetime2-serbian.source datetime2-slovak.source datetime2-slovene.source datetime2-spanish.source datetime2-swedish.source datetime2-turkish.source datetime2-ukrainian.source datetime2-usorbian.source datetime2-welsh.source decimal.source decorule.source delimtxt.source denisbdoc.source diagbox.source dialogl.source dinbrief.source dirtytalk.source dnaseq.source doclicense.source docmfp.source docmute.source doctools.source documentation.source dotarrow.source dotseqn.source download.source dox.source dprogress.source drac.source draftcopy.source draftwatermark.source dtxdescribe.source duckuments.source ducksay.source dynamicnumber.source easyfig.source easyreview.source ebezier.source ecclesiastic.source ecv.source ed.source edmargin.source eemeir.source efbox.source egplot.source ellipsis.source elmath.source elocalloc.source elzcards.source emarks.source embedall.source embedfile.source emptypage.source endfloat.source endheads.source engpron.source engrec.source enumitem-zref.source environ.source envlab.source epigraph.source epiolmec.source eqlist.source eqnalign.source eqparbox.source errata.source erw-l3.source esdiff.source esint.source etaremune.source etextools.source etoc.source eukdate.source everyhook.source everypage.source exam-n.source examdesign.source exframe.source exercise.source exercises.source exp-testopt.source expdlist.source export.source exsol.source extract.source facsimile.source factura.source fancylabel.source fancynum.source fancypar.source fancytabs.source fancytooltips.source fcolumn.source fetchcls.source fewerfloatpages.source fgruler.source fibeamer.source fifo-stack.source filecontents.source filecontentsdef.source filedate.source fileinfo.source fink.source finstrut.source fithesis.source fixcmex.source fixme.source fixmetodonotes.source flabels.source flagderiv.source flashcards.source flippdf.source floatflt.source floatrow.source flowfram.source fmp.source fmtcount.source fnbreak.source fnumprint.source foilhtml.source fontaxes.source fontsize.source fonttable.source footmisc.source footmisx.source footnoterange.source footnpag.source forarray.source foreign.source forloop.source forms16be.source formular.source frankenstein.source ftnxtra.source fullblck.source fullminipage.source fundus-calligra.source fundus-sueterlin.source fvextra.source g-brief.source gatherenum.source gcite.source gender.source genmpage.source getitems.source ginpenc.source gitfile-info.source glossaries-danish.source glossaries-dutch.source glossaries-english.source glossaries-estonian.source glossaries-extra.source glossaries-finnish.source glossaries-french.source glossaries-german.source glossaries-irish.source glossaries-italian.source glossaries-magyar.source glossaries-polish.source glossaries-portuges.source glossaries-serbian.source glossaries-slovene.source glossaries-spanish.source gmdoc-enhance.source grabbox.source graphbox.source graphicx-psmin.source graphicxbox.source grayhints.source grid.source gridset.source guitlogo.source halloweenmath.source hanging.source hardwrap.source hc.source hhtensor.source histogr.source hpsdiss.source hrefhide.source hyper.source hyperbar.source hyperxmp.source hyphenat.source idxlayout.source iffont.source ifmtarg.source ifnextok.source ifoddpage.source iitem.source imakeidx.source indextools.source inlinedef.source inputenx.source inputtrc.source interfaces.source intopdf.source inversepath.source invoice2.source iso.source iso10303.source isodate.source isodoc.source isorot.source isotope.source issuulinks.source jvlisting.source kalendarium.source kantlipsum.source kerntest.source keycommand.source keyfloat.source keyindex.source keyvaltable.source knowledge.source komacv.source komacv-rg.source ktv-texdata.source l3build.source labbook.source labels.source labelschanged.source lastpackage.source lastpage.source latex-amsmath-dev.source latex-base-dev.source latex-graphics-dev.source latex-tds.source latex-tools-dev.source latexcolors.source latexdemo.source latexgit.source layouts.source lccaps.source lcd.source lcg.source leading.source leaflet.source leftidx.source leipzig.source lengthconvert.source lettrine.source lhelp.source libgreek.source limap.source linegoal.source lipsum.source listingsutf8.source listlbls.source listliketab.source listofsymbols.source lmake.source locality.source localloc.source logbox.source logpap.source longfigure.source longnamefilelist.source lstaddons.source ltxnew.source luatodonotes.source macroswap.source magicnum.source mailing.source mailmerge.source makebase.source makebox.source makecell.source makecmds.source makedtx.source mandi.source manfnt.source manuscript.source marginfit.source marginfix.source marginnote.source markdown.source mathastext.source mathexam.source mathfont.source mcaption.source mcite.source mdframed.source media9.source meetingmins.source memory.source menu.source menukeys.source metalogox.source metastr.source method.source metre.source mfirstuc.source mftinc.source mi-solns.source minibox.source minidocument.source minifp.source minipage-marginpar.source minted.source minutes.source mleftright.source mlist.source mnotes.source moderntimeline.source modref.source modroman.source monofill.source moodle.source morefloats.source morehype.source moresize.source moreverb.source morewrites.source mparhack.source mpostinl.source msg.source mtgreek.source multiaudience.source multibbl.source multicap.source multicolrule.source multidef.source multienv.source multiexpand.source multilang.source multirow.source mversion.source mwe.source mycv.source mylatexformat.source nag.source nameauth.source namespc.source ncctools.source needspace.source newfile.source newlfm.source newspaper.source newunicodechar.source newvbtm.source newverbs.source nicefilelist.source niceframe.source nicetext.source nidanfloat.source noitcrul.source nomencl.source nomentbl.source nonfloat.source nonumonpart.source normalcolor.source notes.source notespages.source nowidow.source ntheorem.source numprint.source ocgx.source octavo.source oldstyle.source onlyamsmath.source opcit.source outlining.source overpic.source padcount.source pagecolor.source pagecont.source pagenote.source pageslts.source paper.source papercdcase.source papermas.source papertex.source paracol.source paralist.source paresse.source parselines.source patch.source patchcmd.source pauldoc.source pawpict.source pbox.source pbsheet.source pdf14.source pdfcprot.source pdfoverlay.source pdfpc.source pdfpc-movie.source pdfprivacy.source pdfx.source perltex.source permute.source phffullpagefigure.source phfnote.source phfparen.source phfqit.source phfquotetext.source phfsvnwatermark.source phfthm.source photo.source picture.source plweb.source pmboxdraw.source polynom.source polynomial.source polytable.source powerdot.source ppr-prv.source preprint.source pressrelease.source prettyref.source preview.source probsoln.source proofread.source protocol.source psfragx.source pxgreeks.source qcm.source qstest.source qsymbols.source quotchap.source quoting.source quotmark.source ran_toks.source rccol.source rcs-multi.source rcsinfo.source realboxes.source recipecard.source reflectgraphics.source refman.source refstyle.source regcount.source regexpatch.source register.source regstats.source relenc.source repltext.source rgltxdoc.source rjlparshap.source robustcommand.source romanbar.source romanbarpagenumber.source romannum.source rotfloat.source rtkinenc.source rulercompass.source sauerj.source savefnmark.source savetrees.source scale.source scalebar.source schedule.source scontents.source sdaps.source secnum.source sectsty.source seealso.source selinput.source semantic.source semioneside.source semproc.source seqsplit.source sesstime.source sf298.source sffms.source shdoc.source shorttoc.source show2e.source showcharinbox.source showexpl.source showlabels.source sidecap.source sidenotes.source silence.source simplecd.source simplecv.source sitem.source skb.source skdoc.source skrapport.source slantsc.source snapshot.source soul.source soulutf8.source spacingtricks.source splitindex.source spot.source spverbatim.source srcltx.source sseq.source stack.source standalone.source stdclsdv.source stealcaps.source stdpage.source stex.source storebox.source stringstrings.source sttools.source subdepth.source subeqn.source subeqnarray.source subfigure.source subfiles.source subfloat.source supertabular.source svg.source svn.source svn-multi.source svn-prov.source svninfo.source syntrace.source synttree.source tabfigures.source tablefootnote.source tableof.source tablestyles.source tablists.source tablvar.source tabu.source tabularborder.source tabularew.source tabulary.source talk.source tcldoc.source ted.source templatetools.source termcal.source termlist.source testhyphens.source testidx.source tex-label.source tex-locale.source texmate.source texments.source texpower.source texshade.source texvc.source textfit.source textmerg.source textpos.source textualicomma.source thmtools.source threadcol.source thumb.source thumbs.source titling.source tocbibind.source tocdata.source tocloft.source tocvsec2.source todo.source todonotes.source toolbox.source totcount.source totpages.source transparent.source trfsigns.source trimspaces.source trivfloat.source trsym.source tucv.source twoup.source txgreeks.source type1cm.source typed-checklist.source typeface.source typogrid.source umoline.source underlin.source undolabl.source units.source unravel.source upquote.source uri.source ushort.source varindex.source versonotes.source vgrid.source vmargin.source volumes.source vwcol.source warpcol.source was.source widetable.source widows-and-orphans.source wordlike.source xargs.source xbmks.source xcolor-material.source xcolor-solarized.source xcookybooky.source xcpdftips.source xdoc.source xellipsis.source xfor.source xint.source xmpincl.source xpatch.source xpeek.source xpunctuate.source xsavebox.source xtab.source yafoot.source yaletter.source yagusylo.source ydoc.source zebra-goodies.source zref.source "
+inherit  texlive-module
+DESCRIPTION="TeXLive LaTeX additional packages"
+
+LICENSE=" Apache-2.0 Artistic BSD CC-BY-SA-4.0 GPL-1 GPL-2 GPL-3 GPL-3+ LPPL-1.3 "
+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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+DEPEND=">=dev-texlive/texlive-latexrecommended-2020
+>=dev-texlive/texlive-pictures-2020
+dev-perl/Spreadsheet-ParseExcel
+"
+RDEPEND="${DEPEND} "
+TEXLIVE_MODULE_BINSCRIPTS="
+	texmf-dist/scripts/perltex/perltex.pl
+	texmf-dist/scripts/splitindex/splitindex.pl
+	texmf-dist/scripts/svn-multi/svn-multi.pl
+	texmf-dist/scripts/vpe/vpe.pl
+	texmf-dist/scripts/authorindex/authorindex
+	texmf-dist/scripts/exceltex/exceltex
+	texmf-dist/tex/latex/pygmentex
+"
+
+PATCHES=( "${FILESDIR}"/lstlinebgrd-syntax.patch )
diff --git a/dev-texlive/texlive-latexextra/texlive-latexextra-2020.ebuild b/dev-texlive/texlive-latexextra/texlive-latexextra-2020.ebuild
deleted file mode 100644
index 5e722703a37d..000000000000
--- a/dev-texlive/texlive-latexextra/texlive-latexextra-2020.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"
-
-TEXLIVE_MODULE_CONTENTS="2up ESIEEcv GS1 HA-prosper Tabbing a0poster a4wide a5comb abraces abstract accessibility accsupp achemso acro acronym acroterm actuarialangle actuarialsymbol addfont addlines adjmulticol adjustbox adrconv advdate akktex akletter alertmessage alnumsec alphalph altfont amsaddr animate anonchap answers anyfontsize appendix appendixnumberbeamer apptools arabicfront arcs arraycols arrayjobx arraysort arydshln asciilist askinclude assignment assoccnt atenddvi attachfile aurl authoraftertitle authorarchive authorindex autofancyhdr autonum autopdf avremu axessibility background bankstatement bashful basicarith bchart beamer2thesis beamer-rl beameraudience beamerauxtheme beamercolorthemeowl beamerdarkthemes beamerposter beamersubframe beamertheme-cuerna beamertheme-detlevcm beamertheme-epyt beamertheme-focus beamertheme-light beamertheme-metropolis beamertheme-npbt beamertheme-phnompenh beamertheme-saintpetersburg beamertheme-upenn-bc beamerthemejltree beamerthemenirma bearwear beton bewerbung bez123 bhcexam bibletext bigfoot bigints biochemistry-colors bizcard blindtext blkarray block blowup bnumexpr boites bold-extra bookcover bookest booklet boolexpr bophook boxedminipage boxedminipage2e boxhandler bracketkey braket breakurl bullcntr bxcalc bxdpx-beamer bxdvidriver bxenclose bxnewfont bxpapersize bxpdfver bxtexlogo calcage calctab calculator calrsfs cals calxxxx-yyyy cancel canoniclayout capt-of captcont captdef carbohydrates cases casyl catchfile catchfilebetweentags catechis catoptions cbcoptic ccaption cclicenses cd cd-cover cdpbundl cellprops cellspace censor centeredline changebar changelayout changelog changepage changes chappg chapterfolder cheatsheet checkend chet chextras childdoc chkfloat chletter chngcntr chronology circ circledsteps classics classpack clefval cleveref clipboard clock cloze clrdblpg clrstrip cmdstring cmdtrack cmsd cnltx cntformats cntperchap codedoc codepage codesection collcell collectbox colophon colordoc colorinfo coloring colorspace colortab colorwav colorweb colourchange combelow combine comma commado commedit comment competences concepts concprog constants continue contour contracard conv-xkv cooking cooking-units cool coollist coolstr coolthms cooltooltips coordsys copyedit copyrightbox coseoul counttexruns courseoutline coursepaper coverpage cprotect crbox crossreference crossreftools csquotes css-colors csvmerge csvsimple cuisine currency currfile cutwin cv cv4tw cweb-latex cyber cybercic dashbox dashrule dashundergaps dataref datatool dateiliste datenumber datetime datetime2 datetime2-bahasai datetime2-basque datetime2-breton datetime2-bulgarian datetime2-catalan datetime2-croatian datetime2-czech datetime2-danish datetime2-dutch datetime2-en-fulltext datetime2-english datetime2-esperanto datetime2-estonian datetime2-finnish datetime2-french datetime2-galician datetime2-german datetime2-greek datetime2-hebrew datetime2-icelandic datetime2-irish datetime2-italian datetime2-it-fulltext datetime2-latin datetime2-lsorbian datetime2-magyar datetime2-norsk datetime2-polish datetime2-portuges datetime2-romanian datetime2-russian datetime2-samin datetime2-scottish datetime2-serbian datetime2-slovak datetime2-slovene datetime2-spanish datetime2-swedish datetime2-turkish datetime2-ukrainian datetime2-usorbian datetime2-welsh dblfloatfix decimal decorule delimtxt denisbdoc diagbox diagnose dialogl dichokey dinbrief directory dirtytalk dlfltxb dnaseq doclicense docmfp docmute doctools documentation doi dotarrow dotlessi dotseqn download dox dpfloat dprogress drac draftcopy draftfigure draftwatermark dtk dtxdescribe dtxgallery duckuments ducksay dvdcoll dynamicnumber dynblocks ean13isbn easy easy-todo easyfig easyformat easylist easyreview ebezier ecclesiastic ecv ed edmargin eemeir efbox egplot ehhline elegantbook elegantnote elegantpaper elements ellipsis elmath elocalloc elpres elzcards emarks embedall embedfile embrac emptypage emulateapj endfloat endheads endnotes engpron engrec enotez enumitem enumitem-zref envbig environ epigraph epiolmec eqell eqlist eqnalign eqname eqparbox errata erw-l3 esami esdiff esindex esint esint-type1 etaremune etextools etoc eukdate eulerpx europasscv everyhook everypage exam exam-n exam-randomizechoices examdesign exframe example examplep exceltex excludeonly exercise exercisebank exercisepoints exercises exp-testopt expdlist export exsheets exsol extract facsimile factura fancyhandout fancylabel fancynum fancypar fancyslides fancytabs fancytooltips fbox fcolumn fetchcls fewerfloatpages ffslides fgruler fibeamer fifo-stack figsize filecontents filecontentsdef filedate fileinfo filemod fink finstrut fithesis fixcmex fixfoot fixme fixmetodonotes fjodor flabels flacards flagderiv flashcards flashmovie flipbook flippdf floatflt floatrow flowfram fmp fmtcount fn2end fnbreak fncychap fncylab fnpara fnpct fnumprint foilhtml fontaxes fontsetup fontsize fonttable footmisc footmisx footnotebackref footnoterange footnpag forarray foreign forloop formlett forms16be formular fragments frame framed frankenstein frege ftcap ftnxtra fullblck fullminipage fullwidth fundus-calligra fundus-cyr fundus-sueterlin fvextra fwlw gatherenum gauss gcard gcite gender genmpage getfiledate getitems gindex ginpenc gitfile-info gitinfo gitinfo2 gitlog gitver globalvals gloss glossaries-danish glossaries-dutch glossaries-english glossaries-estonian glossaries-extra glossaries-finnish glossaries-french glossaries-german glossaries-irish glossaries-italian glossaries-magyar glossaries-polish glossaries-portuges glossaries-serbian glossaries-slovene glossaries-spanish gmdoc gmdoc-enhance gmiflink gmutils gmverb grabbox graphbox graphicx-psmin graphicxbox grayhints grfpaste grid grid-system gridset gridslides guitlogo halloweenmath hackthefootline handin handout hang hanging hardwrap harnon-cv harpoon hc he-she hhtensor histogr hitec hletter hobsub hpsdiss hrefhide hvindex hvqrurl hypdvips hyper hyperbar hypernat hyperxmp hyphenat identkey idxcmds idxlayout iffont ifmslide ifmtarg ifnextok ifoddpage ifthenx iitem image-gallery imakeidx import incgraph indextools inline-images inlinedef inputenx inputtrc interactiveworkbook interfaces intopdf inversepath invoice invoice-class invoice2 iso iso10303 isodate isodoc isonums isopt isorot isotope issuulinks iwhdp jlabels jslectureplanner jumplines jvlisting kalendarium kantlipsum kerntest keycommand keyfloat keyreader keyindex keystroke keyval2e keyvaltable kix knowledge koma-moderncvclassic koma-script-sfs komacv komacv-rg ktv-texdata l3build labbook labels labels4easylist labelschanged lastpackage lastpage latex-amsmath-dev latex-base-dev latex-bin-dev latex-graphics-dev latex-tds latex-tools-dev latex-uni8 latexcolors latexdemo latexgit layouts lazylist lccaps lcd lcg leading lectures leftidx leipzig lengthconvert lettre lettrine lewis lhelp libgreek limap linegoal linop lipsum lisp-on-tex listing listingsutf8 listlbls listliketab listofsymbols lkproof lmake locality localloc logbox logical-markup-utils logpap longfbox longfigure longnamefilelist loops lsc lstaddons lstfiracode lt3graph ltablex ltabptch ltxdockit ltxguidex ltxkeys ltxnew ltxtools lua-check-hyphen luatodonotes macroswap magaz magicnum makecookbook makerobust mailing mailmerge makebarcode makebase makebox makecell makecirc makecmds makedtx makeglos mandi manfnt manuscript manyind marginfit marginfix marginnote markdown mathalpha mathastext mathexam mathfam256 mathfont maybemath mcaption mceinleger mcexam mcite mciteplus mdframed media9 medstarbeamer meetingmins memexsupp memory mensa-tex menu menukeys metalogox metastr method metre mfirstuc mftinc mi-solns midpage minibox minidocument minifp minipage-marginpar minitoc minorrevision minted minutes mla-paper mleftright mlist mmap mnotes moderncv modernposter moderntimeline modref modroman modular monofill moodle moreenum morefloats morehype moresize moreverb morewrites movie15 mparhack mpostinl msc msg mslapa mtgreek multenum multiaudience multibbl multicap multicolrule multidef multienv multiexpand multilang multirow mversion mwe mycv mylatexformat nag nameauth namespc ncclatex ncctools needspace nestquot newcommand newenviron newfile newlfm newspaper newunicodechar newvbtm newverbs nextpage nfssext-cfr nicefilelist niceframe nicetext nidanfloat nlctdoc noconflict noindentafter noitcrul nolbreaks nomencl nomentbl nonfloat nonumonpart nopageno normalcolor notes notespages notestex notoccite nowidow nox ntheorem numberedblock numname numprint numspell ocg-p ocgx ocgx2 ocr-latex octavo oldstyle onlyamsmath opcit optidef optional options outline outliner outlines outlining overlays overpic padcount pagecolor pagecont pagenote pagerange pageslts paper papercdcase papermas papertex paracol parades paralist paresse parnotes parsa parselines pas-cours pas-cv pas-tableur patch patchcmd pauldoc pawpict pbox pbsheet pdf14 pdfcolmk pdfcomment pdfcprot pdfmarginpar pdfoverlay pdfpagediff pdfpc pdfpc-movie pdfprivacy pdfreview pdfscreen pdfslide pdfsync pdfwin pdfx pecha perltex permute petiteannonce phffullpagefigure phfnote phfparen phfqit phfquotetext phfsvnwatermark phfthm philex phonenumbers photo picture piff pkgloader placeins plantslabels plates plweb pmboxdraw polynom polynomial polytable postcards poster-mac powerdot ppr-prv practicalreports preprint pressrelease prettyref preview printlen probsoln program progress progressbar proofread properties prosper protex protocol psfragx pstool pstring pxgreeks pygmentex python qcm qstest qsymbols quicktype quiz2socrative quotchap quoting quotmark ran_toks randtext rccol rcs-multi rcsinfo readarray realboxes recipe recipebook recipecard rectopma refcheck refenums reflectgraphics refman refstyle regcount regexpatch register regstats relenc relsize repeatindex repltext returntogrid rgltxdoc rjlparshap rlepsf rmpage robustcommand robustindex romanbar romanbarpagenumber romanneg romannum rotfloat rotpages roundbox rterface rtkinenc rulerbox rulercompass rvwrite sanitize-umlaut sauerj savefnmark savesym savetrees scale scalebar scalerel scanpages schedule scontents scrlttr2copy sdaps sdrt secdot secnum sectionbox sectionbreak sectsty seealso selectp selinput semantic semantic-markup semioneside semproc sepfootnotes seqsplit sesstime sf298 sffms sfmath shadethm shadow shadowtext shapepar shdoc shipunov shorttoc show2e showcharinbox showdim showexpl showhyphens showlabels sidecap sidenotes silence simplecd simplecv simpleinvoice sitem skb skdoc skeycommand skeyval skrapport slantsc smalltableof smartunits smartref snapshot snotez soul soulpos soulutf8 spacingtricks spark-otf sparklines sphack splitindex spot spotcolor spreadtab spverbatim srbook-mem srcltx sseq sslides stack stackengine standalone stdclsdv stealcaps stdpage stex storebox storecmd stringstrings sttools stubs studenthandouts subdepth subdocs subeqn subeqnarray subfigmat subfigure subfiles subfloat substitutefont substr supertabular svg svgcolor svn svn-multi svn-prov syntax syntrace synttree tabfigures tableaux tablefootnote tableof tablestyles tablists tabls tablvar tabstackengine tabto-ltx tabu tabularborder tabularcalc tabularew tabulary tagging tagpair tagpdf talk tamefloats tasks tcldoc tcolorbox tdclock technics ted templatetools termcal termlist testhyphens testidx tex-label tex-locale texlogos texmate texments texpower texshade texvc textfit textmerg textpos textualicomma theoremref thinsp thmtools threadcol threeparttable threeparttablex thumb thumbs thumby ticket titlecaps titlefoot titlepic titleref titlesec titling tocbibind tocdata tocloft tocvsec2 todo todonotes tokcycle tokenizer toolbox topfloat topiclongtable totcount totpages translations transparent trfsigns trimspaces trivfloat trsym truncate tucv turnthepage twoinone twoup txgreeks type1cm typed-checklist typeface typoaid typogrid uassign ucs uebungsblatt umoline underlin underoverlap undolabl units unravel upmethodology upquote uri ushort uspace uwmslide variablelm varindex varsfromjobname varwidth vdmlisting verbasef verbatimbox verbatimcopy verbdef verbments version versions versonotes vertbars vgrid vhistory vmargin volumes vpe vruler vtable vwcol wallcalendar wallpaper warning warpcol was webquiz widetable widows-and-orphans williams withargs wordcount wordlike worksheet wrapfig wtref xargs xassoccnt xbmks xcntperchap xcolor-material xcolor-solarized xcomment xcookybooky xcpdftips xdoc xellipsis xfakebold xfor xhfill xifthen xint xkcdcolors xltabular xmpincl xnewcommand xoptarg xpatch xpeek xprintlen xpunctuate xsavebox xsim xstring xtab xurl xwatermark xytree yafoot yaletter yagusylo ycbook ydoc yplan zebra-goodies zed-csp ziffer zref zwgetfdate zwpagelayout collection-latexextra
-"
-TEXLIVE_MODULE_DOC_CONTENTS="2up.doc ESIEEcv.doc GS1.doc HA-prosper.doc Tabbing.doc a0poster.doc a4wide.doc a5comb.doc abraces.doc abstract.doc accessibility.doc accsupp.doc achemso.doc acro.doc acronym.doc acroterm.doc actuarialangle.doc actuarialsymbol.doc addfont.doc addlines.doc adjmulticol.doc adjustbox.doc adrconv.doc advdate.doc akktex.doc akletter.doc alertmessage.doc alnumsec.doc alphalph.doc altfont.doc amsaddr.doc animate.doc anonchap.doc answers.doc anyfontsize.doc appendix.doc appendixnumberbeamer.doc apptools.doc arabicfront.doc arcs.doc arraycols.doc arrayjobx.doc arraysort.doc arydshln.doc asciilist.doc askinclude.doc assignment.doc assoccnt.doc atenddvi.doc attachfile.doc aurl.doc authoraftertitle.doc authorarchive.doc authorindex.doc autofancyhdr.doc autonum.doc autopdf.doc avremu.doc axessibility.doc background.doc bankstatement.doc bashful.doc basicarith.doc bchart.doc beamer2thesis.doc beamer-rl.doc beameraudience.doc beamerauxtheme.doc beamercolorthemeowl.doc beamerdarkthemes.doc beamerposter.doc beamersubframe.doc beamertheme-cuerna.doc beamertheme-detlevcm.doc beamertheme-epyt.doc beamertheme-focus.doc beamertheme-light.doc beamertheme-metropolis.doc beamertheme-npbt.doc beamertheme-phnompenh.doc beamertheme-saintpetersburg.doc beamertheme-upenn-bc.doc beamerthemenirma.doc bearwear.doc beton.doc bewerbung.doc bez123.doc bhcexam.doc bibletext.doc bigfoot.doc bigints.doc biochemistry-colors.doc bizcard.doc blindtext.doc blkarray.doc block.doc blowup.doc bnumexpr.doc boites.doc bold-extra.doc bookcover.doc bookest.doc booklet.doc boolexpr.doc bophook.doc boxedminipage.doc boxedminipage2e.doc boxhandler.doc bracketkey.doc braket.doc breakurl.doc bullcntr.doc bxcalc.doc bxdpx-beamer.doc bxdvidriver.doc bxenclose.doc bxnewfont.doc bxpapersize.doc bxpdfver.doc bxtexlogo.doc calcage.doc calctab.doc calculator.doc calrsfs.doc cals.doc calxxxx-yyyy.doc cancel.doc canoniclayout.doc capt-of.doc captcont.doc captdef.doc carbohydrates.doc cases.doc casyl.doc catchfile.doc catchfilebetweentags.doc catechis.doc catoptions.doc cbcoptic.doc ccaption.doc cclicenses.doc cd.doc cd-cover.doc cdpbundl.doc cellprops.doc cellspace.doc censor.doc centeredline.doc changebar.doc changelayout.doc changelog.doc changepage.doc changes.doc chappg.doc chapterfolder.doc cheatsheet.doc checkend.doc chet.doc chextras.doc childdoc.doc chkfloat.doc chletter.doc chngcntr.doc chronology.doc circ.doc circledsteps.doc classics.doc classpack.doc clefval.doc cleveref.doc clipboard.doc clock.doc cloze.doc clrdblpg.doc clrstrip.doc cmdstring.doc cmdtrack.doc cmsd.doc cnltx.doc cntformats.doc cntperchap.doc codedoc.doc codepage.doc codesection.doc collcell.doc collectbox.doc colophon.doc colordoc.doc colorinfo.doc coloring.doc colorspace.doc colortab.doc colorwav.doc colorweb.doc colourchange.doc combelow.doc combine.doc comma.doc commado.doc commedit.doc comment.doc competences.doc concepts.doc concprog.doc constants.doc continue.doc contour.doc contracard.doc conv-xkv.doc cooking.doc cooking-units.doc cool.doc coollist.doc coolstr.doc coolthms.doc cooltooltips.doc coordsys.doc copyedit.doc copyrightbox.doc coseoul.doc counttexruns.doc courseoutline.doc coursepaper.doc coverpage.doc cprotect.doc crbox.doc crossreference.doc crossreftools.doc csquotes.doc css-colors.doc csvmerge.doc csvsimple.doc cuisine.doc currency.doc currfile.doc cutwin.doc cv.doc cv4tw.doc cweb-latex.doc cyber.doc cybercic.doc dashbox.doc dashrule.doc dashundergaps.doc dataref.doc datatool.doc dateiliste.doc datenumber.doc datetime.doc datetime2.doc datetime2-bahasai.doc datetime2-basque.doc datetime2-breton.doc datetime2-bulgarian.doc datetime2-catalan.doc datetime2-croatian.doc datetime2-czech.doc datetime2-danish.doc datetime2-dutch.doc datetime2-en-fulltext.doc datetime2-english.doc datetime2-esperanto.doc datetime2-estonian.doc datetime2-finnish.doc datetime2-french.doc datetime2-galician.doc datetime2-german.doc datetime2-greek.doc datetime2-hebrew.doc datetime2-icelandic.doc datetime2-irish.doc datetime2-italian.doc datetime2-it-fulltext.doc datetime2-latin.doc datetime2-lsorbian.doc datetime2-magyar.doc datetime2-norsk.doc datetime2-polish.doc datetime2-portuges.doc datetime2-romanian.doc datetime2-russian.doc datetime2-samin.doc datetime2-scottish.doc datetime2-serbian.doc datetime2-slovak.doc datetime2-slovene.doc datetime2-spanish.doc datetime2-swedish.doc datetime2-turkish.doc datetime2-ukrainian.doc datetime2-usorbian.doc datetime2-welsh.doc dblfloatfix.doc decimal.doc decorule.doc delimtxt.doc denisbdoc.doc diagbox.doc diagnose.doc dialogl.doc dichokey.doc dinbrief.doc directory.doc dirtytalk.doc dlfltxb.doc dnaseq.doc doclicense.doc docmfp.doc docmute.doc doctools.doc documentation.doc doi.doc dotarrow.doc dotlessi.doc dotseqn.doc download.doc dox.doc dpfloat.doc dprogress.doc drac.doc draftcopy.doc draftfigure.doc draftwatermark.doc dtk.doc dtxdescribe.doc dtxgallery.doc duckuments.doc ducksay.doc dvdcoll.doc dynamicnumber.doc dynblocks.doc ean13isbn.doc easy.doc easy-todo.doc easyfig.doc easyformat.doc easylist.doc easyreview.doc ebezier.doc ecclesiastic.doc ecv.doc ed.doc edmargin.doc eemeir.doc efbox.doc egplot.doc ehhline.doc elegantbook.doc elegantnote.doc elegantpaper.doc elements.doc ellipsis.doc elmath.doc elocalloc.doc elpres.doc elzcards.doc emarks.doc embedall.doc embedfile.doc embrac.doc emptypage.doc emulateapj.doc endfloat.doc endheads.doc endnotes.doc engpron.doc engrec.doc enotez.doc enumitem.doc enumitem-zref.doc envbig.doc environ.doc epigraph.doc epiolmec.doc eqell.doc eqlist.doc eqnalign.doc eqparbox.doc errata.doc erw-l3.doc esami.doc esdiff.doc esindex.doc esint.doc esint-type1.doc etaremune.doc etextools.doc etoc.doc eukdate.doc eulerpx.doc europasscv.doc everyhook.doc everypage.doc exam.doc exam-n.doc exam-randomizechoices.doc examdesign.doc exframe.doc examplep.doc exceltex.doc excludeonly.doc exercise.doc exercisebank.doc exercisepoints.doc exercises.doc exp-testopt.doc expdlist.doc export.doc exsheets.doc exsol.doc extract.doc facsimile.doc factura.doc fancyhandout.doc fancylabel.doc fancynum.doc fancypar.doc fancyslides.doc fancytabs.doc fancytooltips.doc fbox.doc fcolumn.doc fetchcls.doc fewerfloatpages.doc ffslides.doc fgruler.doc fibeamer.doc fifo-stack.doc figsize.doc filecontents.doc filecontentsdef.doc filedate.doc fileinfo.doc filemod.doc fink.doc finstrut.doc fithesis.doc fixcmex.doc fixfoot.doc fixme.doc fixmetodonotes.doc fjodor.doc flabels.doc flacards.doc flagderiv.doc flashcards.doc flashmovie.doc flipbook.doc flippdf.doc floatflt.doc floatrow.doc flowfram.doc fmp.doc fmtcount.doc fn2end.doc fnbreak.doc fncychap.doc fncylab.doc fnpara.doc fnpct.doc fnumprint.doc foilhtml.doc fontaxes.doc fontsetup.doc fontsize.doc fonttable.doc footmisc.doc footmisx.doc footnotebackref.doc footnoterange.doc footnpag.doc forarray.doc foreign.doc forloop.doc formlett.doc forms16be.doc formular.doc fragments.doc frame.doc framed.doc frankenstein.doc frege.doc ftcap.doc ftnxtra.doc fullblck.doc fullminipage.doc fullwidth.doc fundus-calligra.doc fundus-sueterlin.doc fvextra.doc fwlw.doc gatherenum.doc gauss.doc gcard.doc gcite.doc gender.doc genmpage.doc getfiledate.doc getitems.doc gindex.doc ginpenc.doc gitfile-info.doc gitinfo.doc gitinfo2.doc gitlog.doc gitver.doc globalvals.doc gloss.doc glossaries-danish.doc glossaries-dutch.doc glossaries-english.doc glossaries-estonian.doc glossaries-extra.doc glossaries-finnish.doc glossaries-french.doc glossaries-german.doc glossaries-irish.doc glossaries-italian.doc glossaries-magyar.doc glossaries-polish.doc glossaries-portuges.doc glossaries-serbian.doc glossaries-slovene.doc glossaries-spanish.doc gmdoc.doc gmdoc-enhance.doc gmiflink.doc gmutils.doc gmverb.doc grabbox.doc graphbox.doc graphicx-psmin.doc graphicxbox.doc grayhints.doc grfpaste.doc grid.doc grid-system.doc gridset.doc gridslides.doc guitlogo.doc halloweenmath.doc hackthefootline.doc handin.doc handout.doc hang.doc hanging.doc hardwrap.doc harnon-cv.doc harpoon.doc hc.doc he-she.doc hhtensor.doc histogr.doc hitec.doc hletter.doc hobsub.doc hpsdiss.doc hrefhide.doc hvindex.doc hvqrurl.doc hypdvips.doc hyper.doc hyperbar.doc hypernat.doc hyperxmp.doc hyphenat.doc identkey.doc idxcmds.doc idxlayout.doc iffont.doc ifmslide.doc ifmtarg.doc ifnextok.doc ifoddpage.doc ifthenx.doc iitem.doc image-gallery.doc imakeidx.doc import.doc incgraph.doc indextools.doc inline-images.doc inlinedef.doc inputenx.doc inputtrc.doc interactiveworkbook.doc interfaces.doc intopdf.doc inversepath.doc invoice.doc invoice-class.doc invoice2.doc iso.doc iso10303.doc isodate.doc isodoc.doc isonums.doc isopt.doc isorot.doc isotope.doc issuulinks.doc iwhdp.doc jlabels.doc jslectureplanner.doc jumplines.doc jvlisting.doc kalendarium.doc kantlipsum.doc kerntest.doc keycommand.doc keyfloat.doc keyreader.doc keyindex.doc keystroke.doc keyval2e.doc keyvaltable.doc kix.doc knowledge.doc koma-moderncvclassic.doc koma-script-sfs.doc komacv.doc komacv-rg.doc ktv-texdata.doc l3build.doc labbook.doc labels.doc labels4easylist.doc labelschanged.doc lastpackage.doc lastpage.doc latex-amsmath-dev.doc latex-base-dev.doc latex-bin-dev.doc latex-graphics-dev.doc latex-tds.doc latex-tools-dev.doc latex-uni8.doc latexcolors.doc latexdemo.doc latexgit.doc layouts.doc lazylist.doc lccaps.doc lcd.doc lcg.doc leading.doc lectures.doc leftidx.doc leipzig.doc lengthconvert.doc lettre.doc lettrine.doc lewis.doc lhelp.doc libgreek.doc limap.doc linegoal.doc linop.doc lipsum.doc lisp-on-tex.doc listing.doc listingsutf8.doc listlbls.doc listliketab.doc listofsymbols.doc lkproof.doc lmake.doc locality.doc localloc.doc logbox.doc logical-markup-utils.doc logpap.doc longfbox.doc longfigure.doc longnamefilelist.doc loops.doc lsc.doc lstaddons.doc lstfiracode.doc lt3graph.doc ltablex.doc ltabptch.doc ltxdockit.doc ltxguidex.doc ltxkeys.doc ltxnew.doc ltxtools.doc lua-check-hyphen.doc luatodonotes.doc macroswap.doc magaz.doc magicnum.doc makecookbook.doc makerobust.doc mailing.doc mailmerge.doc makebarcode.doc makebase.doc makebox.doc makecell.doc makecirc.doc makecmds.doc makedtx.doc makeglos.doc mandi.doc manuscript.doc manyind.doc marginfit.doc marginfix.doc marginnote.doc markdown.doc mathalpha.doc mathastext.doc mathexam.doc mathfam256.doc mathfont.doc maybemath.doc mcaption.doc mceinleger.doc mcexam.doc mcite.doc mciteplus.doc mdframed.doc media9.doc medstarbeamer.doc meetingmins.doc memexsupp.doc memory.doc mensa-tex.doc menu.doc menukeys.doc metalogox.doc metastr.doc method.doc metre.doc mfirstuc.doc mftinc.doc mi-solns.doc midpage.doc minibox.doc minidocument.doc minifp.doc minipage-marginpar.doc minitoc.doc minorrevision.doc minted.doc minutes.doc mla-paper.doc mleftright.doc mlist.doc mmap.doc mnotes.doc moderncv.doc modernposter.doc moderntimeline.doc modref.doc modroman.doc modular.doc monofill.doc moodle.doc moreenum.doc morefloats.doc morehype.doc moresize.doc moreverb.doc morewrites.doc movie15.doc mparhack.doc mpostinl.doc msc.doc msg.doc mslapa.doc mtgreek.doc multenum.doc multiaudience.doc multibbl.doc multicap.doc multicolrule.doc multidef.doc multienv.doc multiexpand.doc multilang.doc multirow.doc mversion.doc mwe.doc mycv.doc mylatexformat.doc nag.doc nameauth.doc namespc.doc ncclatex.doc ncctools.doc needspace.doc newcommand.doc newenviron.doc newfile.doc newlfm.doc newspaper.doc newunicodechar.doc newvbtm.doc newverbs.doc nfssext-cfr.doc nicefilelist.doc niceframe.doc nicetext.doc nidanfloat.doc nlctdoc.doc noconflict.doc noindentafter.doc noitcrul.doc nolbreaks.doc nomencl.doc nomentbl.doc nonfloat.doc nonumonpart.doc nopageno.doc normalcolor.doc notes.doc notespages.doc notestex.doc notoccite.doc nowidow.doc nox.doc ntheorem.doc numberedblock.doc numname.doc numprint.doc numspell.doc ocg-p.doc ocgx.doc ocgx2.doc ocr-latex.doc octavo.doc oldstyle.doc onlyamsmath.doc opcit.doc optidef.doc optional.doc options.doc outline.doc outliner.doc outlines.doc outlining.doc overlays.doc overpic.doc padcount.doc pagecolor.doc pagecont.doc pagenote.doc pagerange.doc pageslts.doc paper.doc papercdcase.doc papermas.doc papertex.doc paracol.doc parades.doc paralist.doc paresse.doc parnotes.doc parsa.doc parselines.doc pas-cours.doc pas-cv.doc pas-tableur.doc patchcmd.doc pauldoc.doc pawpict.doc pbox.doc pbsheet.doc pdf14.doc pdfcolmk.doc pdfcomment.doc pdfcprot.doc pdfmarginpar.doc pdfoverlay.doc pdfpagediff.doc pdfpc.doc pdfpc-movie.doc pdfprivacy.doc pdfreview.doc pdfscreen.doc pdfslide.doc pdfsync.doc pdfwin.doc pdfx.doc pecha.doc perltex.doc permute.doc petiteannonce.doc phffullpagefigure.doc phfnote.doc phfparen.doc phfqit.doc phfquotetext.doc phfsvnwatermark.doc phfthm.doc philex.doc phonenumbers.doc photo.doc picture.doc piff.doc pkgloader.doc placeins.doc plantslabels.doc plates.doc plweb.doc pmboxdraw.doc polynom.doc polynomial.doc polytable.doc postcards.doc poster-mac.doc powerdot.doc ppr-prv.doc practicalreports.doc preprint.doc pressrelease.doc prettyref.doc preview.doc printlen.doc probsoln.doc program.doc progress.doc progressbar.doc proofread.doc properties.doc prosper.doc protex.doc protocol.doc psfragx.doc pstool.doc pstring.doc pxgreeks.doc pygmentex.doc python.doc qcm.doc qstest.doc qsymbols.doc quicktype.doc quiz2socrative.doc quotchap.doc quoting.doc quotmark.doc ran_toks.doc randtext.doc rccol.doc rcs-multi.doc rcsinfo.doc readarray.doc realboxes.doc recipe.doc recipebook.doc recipecard.doc rectopma.doc refcheck.doc refenums.doc reflectgraphics.doc refman.doc refstyle.doc regcount.doc regexpatch.doc register.doc regstats.doc relenc.doc relsize.doc repeatindex.doc repltext.doc returntogrid.doc rgltxdoc.doc rjlparshap.doc rlepsf.doc rmpage.doc robustcommand.doc robustindex.doc romanbar.doc romanbarpagenumber.doc romanneg.doc romannum.doc rotfloat.doc rotpages.doc roundbox.doc rterface.doc rtkinenc.doc rulerbox.doc rulercompass.doc rvwrite.doc sanitize-umlaut.doc sauerj.doc savefnmark.doc savetrees.doc scale.doc scalebar.doc scalerel.doc scanpages.doc schedule.doc scontents.doc scrlttr2copy.doc sdaps.doc sdrt.doc secdot.doc secnum.doc sectionbox.doc sectionbreak.doc sectsty.doc seealso.doc selectp.doc selinput.doc semantic.doc semantic-markup.doc semioneside.doc semproc.doc sepfootnotes.doc seqsplit.doc sesstime.doc sf298.doc sffms.doc shadethm.doc shadow.doc shadowtext.doc shapepar.doc shdoc.doc shipunov.doc shorttoc.doc show2e.doc showcharinbox.doc showdim.doc showexpl.doc showhyphens.doc showlabels.doc sidecap.doc sidenotes.doc silence.doc simplecd.doc simplecv.doc simpleinvoice.doc sitem.doc skb.doc skdoc.doc skeycommand.doc skeyval.doc skrapport.doc slantsc.doc smalltableof.doc smartunits.doc smartref.doc snapshot.doc snotez.doc soul.doc soulpos.doc soulutf8.doc spacingtricks.doc spark-otf.doc sparklines.doc sphack.doc splitindex.doc spot.doc spotcolor.doc spreadtab.doc spverbatim.doc srbook-mem.doc srcltx.doc sseq.doc sslides.doc stackengine.doc standalone.doc stdclsdv.doc stealcaps.doc stdpage.doc stex.doc storebox.doc storecmd.doc stringstrings.doc sttools.doc stubs.doc studenthandouts.doc subdepth.doc subdocs.doc subeqn.doc subeqnarray.doc subfigmat.doc subfigure.doc subfiles.doc subfloat.doc substitutefont.doc substr.doc supertabular.doc svg.doc svgcolor.doc svn.doc svn-multi.doc svn-prov.doc syntax.doc syntrace.doc synttree.doc tabfigures.doc tableaux.doc tablefootnote.doc tableof.doc tablestyles.doc tablists.doc tabls.doc tablvar.doc tabstackengine.doc tabto-ltx.doc tabu.doc tabularborder.doc tabularcalc.doc tabularew.doc tabulary.doc tagging.doc tagpair.doc tagpdf.doc talk.doc tamefloats.doc tasks.doc tcldoc.doc tcolorbox.doc tdclock.doc technics.doc ted.doc templatetools.doc termcal.doc termlist.doc testhyphens.doc testidx.doc tex-label.doc tex-locale.doc texmate.doc texments.doc texpower.doc texshade.doc texvc.doc textfit.doc textmerg.doc textpos.doc textualicomma.doc theoremref.doc thinsp.doc thmtools.doc threadcol.doc threeparttable.doc threeparttablex.doc thumb.doc thumbs.doc thumby.doc ticket.doc titlecaps.doc titlepic.doc titleref.doc titlesec.doc titling.doc tocbibind.doc tocdata.doc tocloft.doc tocvsec2.doc todo.doc todonotes.doc tokcycle.doc tokenizer.doc toolbox.doc topfloat.doc topiclongtable.doc totcount.doc totpages.doc translations.doc transparent.doc trfsigns.doc trimspaces.doc trivfloat.doc trsym.doc truncate.doc tucv.doc turnthepage.doc twoinone.doc twoup.doc txgreeks.doc type1cm.doc typed-checklist.doc typeface.doc typoaid.doc typogrid.doc uassign.doc ucs.doc uebungsblatt.doc umoline.doc underlin.doc underoverlap.doc undolabl.doc units.doc unravel.doc upmethodology.doc upquote.doc uri.doc ushort.doc uspace.doc uwmslide.doc variablelm.doc varindex.doc varsfromjobname.doc varwidth.doc vdmlisting.doc verbasef.doc verbatimbox.doc verbatimcopy.doc verbdef.doc verbments.doc version.doc versions.doc versonotes.doc vertbars.doc vgrid.doc vhistory.doc vmargin.doc volumes.doc vpe.doc vruler.doc vtable.doc vwcol.doc wallcalendar.doc wallpaper.doc warning.doc warpcol.doc was.doc webquiz.doc widetable.doc widows-and-orphans.doc williams.doc withargs.doc wordcount.doc wordlike.doc worksheet.doc wrapfig.doc wtref.doc xargs.doc xassoccnt.doc xbmks.doc xcntperchap.doc xcolor-material.doc xcolor-solarized.doc xcomment.doc xcookybooky.doc xcpdftips.doc xdoc.doc xellipsis.doc xfakebold.doc xfor.doc xhfill.doc xifthen.doc xint.doc xkcdcolors.doc xltabular.doc xmpincl.doc xnewcommand.doc xoptarg.doc xpatch.doc xpeek.doc xprintlen.doc xpunctuate.doc xsavebox.doc xsim.doc xstring.doc xtab.doc xurl.doc xwatermark.doc xytree.doc yafoot.doc yaletter.doc yagusylo.doc ycbook.doc ydoc.doc yplan.doc zebra-goodies.doc zed-csp.doc ziffer.doc zref.doc zwgetfdate.doc zwpagelayout.doc "
-TEXLIVE_MODULE_SRC_CONTENTS="ESIEEcv.source GS1.source HA-prosper.source Tabbing.source abstract.source accessibility.source accsupp.source achemso.source acronym.source acroterm.source actuarialangle.source actuarialsymbol.source addlines.source adjmulticol.source adjustbox.source adrconv.source alertmessage.source alnumsec.source alphalph.source altfont.source amsaddr.source animate.source answers.source appendix.source apptools.source arcs.source arraycols.source arraysort.source arydshln.source asciilist.source askinclude.source atenddvi.source attachfile.source autonum.source autopdf.source avremu.source axessibility.source background.source basicarith.source beamercolorthemeowl.source beamersubframe.source beamertheme-cuerna.source beamertheme-metropolis.source beamertheme-saintpetersburg.source bearwear.source beton.source bewerbung.source bez123.source bhcexam.source bigfoot.source bizcard.source blindtext.source blowup.source bnumexpr.source boites.source bookcover.source booklet.source boolexpr.source bophook.source boxedminipage2e.source boxhandler.source breakurl.source bullcntr.source calcage.source calculator.source cals.source canoniclayout.source capt-of.source captcont.source catchfile.source catchfilebetweentags.source catechis.source ccaption.source cclicenses.source cd.source cd-cover.source cdpbundl.source cellprops.source changebar.source changepage.source changes.source chappg.source chapterfolder.source cheatsheet.source chextras.source childdoc.source chletter.source circ.source classpack.source clefval.source cleveref.source cloze.source clrdblpg.source clrstrip.source cmdtrack.source codepage.source codesection.source collcell.source collectbox.source colophon.source colordoc.source colorwav.source colorweb.source combine.source commado.source commedit.source competences.source constants.source continue.source contour.source contracard.source conv-xkv.source cooking.source cooking-units.source cool.source coollist.source coolstr.source coolthms.source cooltooltips.source coordsys.source copyedit.source counttexruns.source coverpage.source cprotect.source crossreference.source csvmerge.source cuisine.source currency.source currfile.source cutwin.source cyber.source cybercic.source dashbox.source dashrule.source dashundergaps.source datatool.source dateiliste.source datenumber.source datetime.source datetime2.source datetime2-bahasai.source datetime2-basque.source datetime2-breton.source datetime2-bulgarian.source datetime2-catalan.source datetime2-croatian.source datetime2-czech.source datetime2-danish.source datetime2-dutch.source datetime2-en-fulltext.source datetime2-english.source datetime2-esperanto.source datetime2-estonian.source datetime2-finnish.source datetime2-french.source datetime2-galician.source datetime2-german.source datetime2-greek.source datetime2-hebrew.source datetime2-icelandic.source datetime2-irish.source datetime2-italian.source datetime2-it-fulltext.source datetime2-latin.source datetime2-lsorbian.source datetime2-magyar.source datetime2-norsk.source datetime2-polish.source datetime2-portuges.source datetime2-romanian.source datetime2-russian.source datetime2-samin.source datetime2-scottish.source datetime2-serbian.source datetime2-slovak.source datetime2-slovene.source datetime2-spanish.source datetime2-swedish.source datetime2-turkish.source datetime2-ukrainian.source datetime2-usorbian.source datetime2-welsh.source decimal.source decorule.source delimtxt.source denisbdoc.source diagbox.source dialogl.source dinbrief.source dirtytalk.source dnaseq.source doclicense.source docmfp.source docmute.source doctools.source documentation.source dotarrow.source dotseqn.source download.source dox.source dprogress.source drac.source draftcopy.source draftwatermark.source dtxdescribe.source duckuments.source ducksay.source dynamicnumber.source easyfig.source easyreview.source ebezier.source ecclesiastic.source ecv.source ed.source edmargin.source eemeir.source efbox.source egplot.source ellipsis.source elmath.source elocalloc.source elzcards.source emarks.source embedall.source embedfile.source emptypage.source endfloat.source endheads.source engpron.source engrec.source enumitem-zref.source environ.source epigraph.source epiolmec.source eqlist.source eqnalign.source eqparbox.source errata.source erw-l3.source esdiff.source esint.source etaremune.source etextools.source etoc.source eukdate.source everyhook.source everypage.source exam-n.source examdesign.source exframe.source exercise.source exercises.source exp-testopt.source expdlist.source export.source exsol.source extract.source facsimile.source factura.source fancylabel.source fancynum.source fancypar.source fancytabs.source fancytooltips.source fcolumn.source fetchcls.source fewerfloatpages.source fgruler.source fibeamer.source fifo-stack.source filecontents.source filecontentsdef.source filedate.source fileinfo.source fink.source finstrut.source fithesis.source fixcmex.source fixme.source fixmetodonotes.source flabels.source flagderiv.source flashcards.source flippdf.source floatflt.source floatrow.source flowfram.source fmp.source fmtcount.source fnbreak.source fnumprint.source foilhtml.source fontaxes.source fontsize.source fonttable.source footmisc.source footmisx.source footnoterange.source footnpag.source forarray.source foreign.source forloop.source forms16be.source formular.source frankenstein.source ftnxtra.source fullblck.source fullminipage.source fundus-calligra.source fundus-sueterlin.source fvextra.source gatherenum.source gcite.source gender.source genmpage.source getitems.source ginpenc.source gitfile-info.source glossaries-danish.source glossaries-dutch.source glossaries-english.source glossaries-estonian.source glossaries-extra.source glossaries-finnish.source glossaries-french.source glossaries-german.source glossaries-irish.source glossaries-italian.source glossaries-magyar.source glossaries-polish.source glossaries-portuges.source glossaries-serbian.source glossaries-slovene.source glossaries-spanish.source gmdoc-enhance.source grabbox.source graphbox.source graphicx-psmin.source graphicxbox.source grayhints.source grid.source gridset.source guitlogo.source halloweenmath.source hanging.source hardwrap.source hc.source hhtensor.source histogr.source hpsdiss.source hrefhide.source hyper.source hyperbar.source hyperxmp.source hyphenat.source idxlayout.source iffont.source ifmtarg.source ifnextok.source ifoddpage.source iitem.source imakeidx.source indextools.source inlinedef.source inputenx.source inputtrc.source interfaces.source intopdf.source inversepath.source invoice2.source iso.source iso10303.source isodate.source isodoc.source isorot.source isotope.source issuulinks.source jvlisting.source kalendarium.source kantlipsum.source kerntest.source keycommand.source keyfloat.source keyindex.source keyvaltable.source knowledge.source komacv.source komacv-rg.source ktv-texdata.source l3build.source labbook.source labels.source labelschanged.source lastpackage.source lastpage.source latex-amsmath-dev.source latex-base-dev.source latex-graphics-dev.source latex-tds.source latex-tools-dev.source latexcolors.source latexdemo.source latexgit.source layouts.source lccaps.source lcd.source lcg.source leading.source leftidx.source leipzig.source lengthconvert.source lettrine.source lhelp.source libgreek.source limap.source linegoal.source lipsum.source listingsutf8.source listlbls.source listliketab.source listofsymbols.source lmake.source locality.source localloc.source logbox.source logpap.source longfigure.source longnamefilelist.source lstaddons.source ltxnew.source luatodonotes.source macroswap.source magicnum.source mailing.source mailmerge.source makebase.source makebox.source makecell.source makecmds.source makedtx.source mandi.source manfnt.source manuscript.source marginfit.source marginfix.source marginnote.source markdown.source mathastext.source mathexam.source mathfont.source mcaption.source mcite.source mdframed.source media9.source meetingmins.source memory.source menu.source menukeys.source metalogox.source metastr.source method.source metre.source mfirstuc.source mftinc.source mi-solns.source minibox.source minidocument.source minifp.source minipage-marginpar.source minted.source minutes.source mleftright.source mlist.source mnotes.source moderntimeline.source modref.source modroman.source monofill.source moodle.source morefloats.source morehype.source moresize.source moreverb.source morewrites.source mparhack.source mpostinl.source msg.source mtgreek.source multiaudience.source multibbl.source multicap.source multicolrule.source multidef.source multienv.source multiexpand.source multilang.source multirow.source mversion.source mwe.source mycv.source mylatexformat.source nag.source nameauth.source namespc.source ncctools.source needspace.source newfile.source newlfm.source newspaper.source newunicodechar.source newvbtm.source newverbs.source nicefilelist.source niceframe.source nicetext.source nidanfloat.source noitcrul.source nomencl.source nomentbl.source nonfloat.source nonumonpart.source normalcolor.source notes.source notespages.source nowidow.source ntheorem.source numprint.source ocgx.source octavo.source oldstyle.source onlyamsmath.source opcit.source outlining.source overpic.source padcount.source pagecolor.source pagecont.source pagenote.source pageslts.source paper.source papercdcase.source papermas.source papertex.source paracol.source paralist.source paresse.source parselines.source patch.source patchcmd.source pauldoc.source pawpict.source pbox.source pbsheet.source pdf14.source pdfcprot.source pdfoverlay.source pdfpc.source pdfpc-movie.source pdfprivacy.source pdfx.source perltex.source permute.source phffullpagefigure.source phfnote.source phfparen.source phfqit.source phfquotetext.source phfsvnwatermark.source phfthm.source photo.source picture.source plweb.source pmboxdraw.source polynom.source polynomial.source polytable.source powerdot.source ppr-prv.source preprint.source pressrelease.source prettyref.source preview.source probsoln.source proofread.source protocol.source psfragx.source pxgreeks.source qcm.source qstest.source qsymbols.source quotchap.source quoting.source quotmark.source ran_toks.source rccol.source rcs-multi.source rcsinfo.source realboxes.source recipecard.source reflectgraphics.source refman.source refstyle.source regcount.source regexpatch.source register.source regstats.source relenc.source repltext.source rgltxdoc.source rjlparshap.source robustcommand.source romanbar.source romanbarpagenumber.source romannum.source rotfloat.source rtkinenc.source rulercompass.source sauerj.source savefnmark.source savetrees.source scale.source scalebar.source schedule.source scontents.source sdaps.source secnum.source sectsty.source seealso.source selinput.source semantic.source semioneside.source semproc.source seqsplit.source sesstime.source sf298.source sffms.source shdoc.source shorttoc.source show2e.source showcharinbox.source showexpl.source showlabels.source sidecap.source sidenotes.source silence.source simplecd.source simplecv.source sitem.source skb.source skdoc.source skrapport.source slantsc.source snapshot.source soul.source soulutf8.source spacingtricks.source splitindex.source spot.source spverbatim.source srcltx.source sseq.source stack.source standalone.source stdclsdv.source stealcaps.source stdpage.source stex.source storebox.source stringstrings.source sttools.source subdepth.source subeqn.source subeqnarray.source subfigure.source subfiles.source subfloat.source supertabular.source svg.source svn.source svn-multi.source svn-prov.source syntrace.source synttree.source tabfigures.source tablefootnote.source tableof.source tablestyles.source tablists.source tablvar.source tabu.source tabularborder.source tabularew.source tabulary.source talk.source tcldoc.source ted.source templatetools.source termcal.source termlist.source testhyphens.source testidx.source tex-label.source tex-locale.source texmate.source texments.source texpower.source texshade.source texvc.source textfit.source textmerg.source textpos.source textualicomma.source thmtools.source threadcol.source thumb.source thumbs.source titling.source tocbibind.source tocdata.source tocloft.source tocvsec2.source todo.source todonotes.source toolbox.source totcount.source totpages.source transparent.source trfsigns.source trimspaces.source trivfloat.source trsym.source tucv.source twoup.source txgreeks.source type1cm.source typed-checklist.source typeface.source typogrid.source umoline.source underlin.source undolabl.source units.source unravel.source upquote.source uri.source ushort.source varindex.source versonotes.source vgrid.source vmargin.source volumes.source vwcol.source warpcol.source was.source widetable.source widows-and-orphans.source wordlike.source xargs.source xbmks.source xcolor-material.source xcolor-solarized.source xcookybooky.source xcpdftips.source xdoc.source xellipsis.source xfor.source xint.source xmpincl.source xpatch.source xpeek.source xpunctuate.source xsavebox.source xtab.source yafoot.source yaletter.source yagusylo.source ydoc.source zebra-goodies.source zref.source "
-inherit  texlive-module
-DESCRIPTION="TeXLive LaTeX additional packages"
-
-LICENSE=" Apache-2.0 Artistic BSD CC-BY-SA-4.0 GPL-1 GPL-2 GPL-3 GPL-3+ LPPL-1.3 "
-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-DEPEND=">=dev-texlive/texlive-latexrecommended-2020
->=dev-texlive/texlive-pictures-2020
-dev-perl/Spreadsheet-ParseExcel
-"
-RDEPEND="${DEPEND} "
-TEXLIVE_MODULE_BINSCRIPTS="
-	texmf-dist/scripts/perltex/perltex.pl
-	texmf-dist/scripts/splitindex/splitindex.pl
-	texmf-dist/scripts/svn-multi/svn-multi.pl
-	texmf-dist/scripts/vpe/vpe.pl
-	texmf-dist/scripts/authorindex/authorindex
-	texmf-dist/scripts/exceltex/exceltex
-	texmf-dist/tex/latex/pygmentex
-"
-
-PATCHES=( "${FILESDIR}"/lstlinebgrd-syntax.patch )
diff --git a/dev-texlive/texlive-luatex/Manifest b/dev-texlive/texlive-luatex/Manifest
index ac443bde0bf5..dae8df8cd803 100644
--- a/dev-texlive/texlive-luatex/Manifest
+++ b/dev-texlive/texlive-luatex/Manifest
@@ -110,5 +110,5 @@ DIST tl-spelling-2020.tar.xz 14072 BLAKE2B 30aec07552458814c1ce77b8a43238d9bb94b
 DIST tl-spelling.doc-2020.tar.xz 142556 BLAKE2B e2b3c457abec38a028c80a185be0af91f89400e74401bb519b5f31032ce76acb4d21a7db6928238cd4e8f4bdbb6ad2096f59aec32950336e1f17fbb2f8204110 SHA512 a51b8fb45701d318dd9b9736830b83ac34c84b781d61a3a247263167d527aad7cdb6e1917ce260d09e0304fba38bb2e2a25288f75aa2335bef479918036e1221
 DIST tl-typewriter-2020.tar.xz 25272 BLAKE2B 5a63be8eb8f5848dd1c8af2d24a5aea1903295a810eeb7317d5254445766796413b15a4a3928732f81eecee4b70911c44b24aa35a80b81670d549c47d47f4ae8 SHA512 f8b9edca6a860f0acf0d676fff381276594f7c13fb13da2e54caf5513a8a65fde378b4c16dc621d89d25d7492318b006d7c5d863c1f96a0a246064c0dad1f2d8
 DIST tl-typewriter.doc-2020.tar.xz 101056 BLAKE2B 6043494b217558258138bbdd27b32480923ed6b2608b51032328baa16157b08cd43a0eaacf6ac8fa771b46aa6154438fbb3d9610469b509cdb97f0a0dd72920d SHA512 12376247fd8500e7c147609bf47acab379e36126976ea9f2dc0a352b8b0d779b1cd43bd1394f3961b1a7fa894a8b6448b0369f612d8bbf8d1bec3175e850f89c
-EBUILD texlive-luatex-2020.ebuild 2312 BLAKE2B e8191e565d08439a76f777933acf8ad8085099b04dc291ef3fba9a05df227c8fe83a83ecdda77bd7418fca761d96701bd57aec9328b9da075929869f9fa407d1 SHA512 25945f2bc3e92f573bf0b991cadf7295f0afd0ac3a378d17534a808665b224052b208c8bb7f081251b019b7c3559b666cbee11a4e0aabfa29152d7ca6a2dcf51
+EBUILD texlive-luatex-2020-r2.ebuild 2356 BLAKE2B 86b5c694b03873e286fb55eed9fdd28d0fa28cb7bbb8c3b2667ca564cfe94b37a5a0a5094b1d4ec67f65d66f00af9e07ec71aa5b531b448fb687176136633361 SHA512 b610f1c28ff3c52b5c56c40cd13801fb9ea3fbab43a6f953c20a2839386c27154f61a07d476c479cfcf2343dbb7cd03e84c5c809fcde8ac685f0a9a06fad769c
 MISC metadata.xml 548 BLAKE2B 12926c8cbe1c42799921e43f05ea4b2ed0e314855e01131d271d97f1b72914ee3eeee039e959a81d27e6c39469a42f68443245420a50b7177815858f3a92924d SHA512 9952f37d3ba08676efe90c13476b43140d0039a6b698ac91dc028c26fb7704dbf9da880d5f38123b219f0af0c6a029bd463625a6af5527ebb94f2d56b1b1b166
diff --git a/dev-texlive/texlive-luatex/texlive-luatex-2020-r2.ebuild b/dev-texlive/texlive-luatex/texlive-luatex-2020-r2.ebuild
new file mode 100644
index 000000000000..ba8157da5373
--- /dev/null
+++ b/dev-texlive/texlive-luatex/texlive-luatex-2020-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+TEXLIVE_MODULE_CONTENTS="addliga auto-pst-pdf-lua barracuda bezierplot checkcites chickenize combofont cstypo ctablestack emoji enigma interpreter kanaparser lua-uca lua-ul lua-visual-debug luacode luacolor luahyphenrules luaimageembed luaindex luainputenc luaintro lualatex-doc lualatex-math lualatex-truncate lualibs luamplib luaotfload luapackageloader luarandom luatex85 luatexbase luatexko luatextra luavlna luaxml nodetree odsfile optex pdfarticle placeat plantuml selnolig spelling typewriter collection-luatex
+"
+TEXLIVE_MODULE_DOC_CONTENTS="addliga.doc auto-pst-pdf-lua.doc barracuda.doc bezierplot.doc checkcites.doc chickenize.doc combofont.doc cstypo.doc ctablestack.doc emoji.doc enigma.doc interpreter.doc kanaparser.doc lua-uca.doc lua-ul.doc lua-visual-debug.doc luacode.doc luacolor.doc luahyphenrules.doc luaimageembed.doc luaindex.doc luainputenc.doc luaintro.doc lualatex-doc.doc lualatex-math.doc lualatex-truncate.doc lualibs.doc luamplib.doc luaotfload.doc luapackageloader.doc luarandom.doc luatex85.doc luatexbase.doc luatexko.doc luatextra.doc luavlna.doc luaxml.doc nodetree.doc odsfile.doc optex.doc pdfarticle.doc placeat.doc plantuml.doc selnolig.doc spelling.doc typewriter.doc "
+TEXLIVE_MODULE_SRC_CONTENTS="chickenize.source ctablestack.source lua-uca.source lua-ul.source luacode.source luacolor.source luaindex.source luainputenc.source lualatex-doc.source lualatex-math.source lualatex-truncate.source lualibs.source luamplib.source luaotfload.source luatex85.source luatexbase.source luatextra.source nodetree.source placeat.source "
+inherit  texlive-module
+DESCRIPTION="TeXLive LuaTeX packages"
+
+LICENSE=" BSD FDL-1.1 GPL-2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free "
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+DEPEND=">=dev-texlive/texlive-basic-2020
+>=dev-texlive/texlive-fontsrecommended-2020
+"
+RDEPEND="${DEPEND} dev-texlive/texlive-latexrecommended
+"
+TEXLIVE_MODULE_BINSCRIPTS="
+	texmf-dist/scripts/luaotfload/luaotfload-tool.lua
+	texmf-dist/scripts/checkcites/checkcites.lua
+	"
+
+TEXLIVE_MODULE_BINLINKS="
+	luaotfload-tool:mkluatexfontdb
+	"
diff --git a/dev-texlive/texlive-luatex/texlive-luatex-2020.ebuild b/dev-texlive/texlive-luatex/texlive-luatex-2020.ebuild
deleted file mode 100644
index 586f407f6195..000000000000
--- a/dev-texlive/texlive-luatex/texlive-luatex-2020.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"
-
-TEXLIVE_MODULE_CONTENTS="addliga auto-pst-pdf-lua barracuda bezierplot checkcites chickenize combofont cstypo ctablestack emoji enigma interpreter kanaparser lua-uca lua-ul lua-visual-debug luacode luacolor luahyphenrules luaimageembed luaindex luainputenc luaintro lualatex-doc lualatex-math lualatex-truncate lualibs luamplib luaotfload luapackageloader luarandom luatex85 luatexbase luatexko luatextra luavlna luaxml nodetree odsfile optex pdfarticle placeat plantuml selnolig spelling typewriter collection-luatex
-"
-TEXLIVE_MODULE_DOC_CONTENTS="addliga.doc auto-pst-pdf-lua.doc barracuda.doc bezierplot.doc checkcites.doc chickenize.doc combofont.doc cstypo.doc ctablestack.doc emoji.doc enigma.doc interpreter.doc kanaparser.doc lua-uca.doc lua-ul.doc lua-visual-debug.doc luacode.doc luacolor.doc luahyphenrules.doc luaimageembed.doc luaindex.doc luainputenc.doc luaintro.doc lualatex-doc.doc lualatex-math.doc lualatex-truncate.doc lualibs.doc luamplib.doc luaotfload.doc luapackageloader.doc luarandom.doc luatex85.doc luatexbase.doc luatexko.doc luatextra.doc luavlna.doc luaxml.doc nodetree.doc odsfile.doc optex.doc pdfarticle.doc placeat.doc plantuml.doc selnolig.doc spelling.doc typewriter.doc "
-TEXLIVE_MODULE_SRC_CONTENTS="chickenize.source ctablestack.source lua-uca.source lua-ul.source luacode.source luacolor.source luaindex.source luainputenc.source lualatex-doc.source lualatex-math.source lualatex-truncate.source lualibs.source luamplib.source luaotfload.source luatex85.source luatexbase.source luatextra.source nodetree.source placeat.source "
-inherit  texlive-module
-DESCRIPTION="TeXLive LuaTeX packages"
-
-LICENSE=" BSD FDL-1.1 GPL-2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free "
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-DEPEND=">=dev-texlive/texlive-basic-2020
-"
-RDEPEND="${DEPEND} dev-texlive/texlive-latexrecommended
-"
-TEXLIVE_MODULE_BINSCRIPTS="
-	texmf-dist/scripts/luaotfload/luaotfload-tool.lua
-	texmf-dist/scripts/checkcites/checkcites.lua
-	"
-
-TEXLIVE_MODULE_BINLINKS="
-	luaotfload-tool:mkluatexfontdb
-	"
diff --git a/dev-texlive/texlive-pictures/Manifest b/dev-texlive/texlive-pictures/Manifest
index 8ec621a97f51..3536f6448ecb 100644
--- a/dev-texlive/texlive-pictures/Manifest
+++ b/dev-texlive/texlive-pictures/Manifest
@@ -75,6 +75,8 @@ DIST tl-ditaa-2020.tar.xz 1184 BLAKE2B d405d5f4c8f06b1f1e49b798fa47e1819aab9b990
 DIST tl-ditaa.doc-2020.tar.xz 105808 BLAKE2B 38475efefcbcb1999086e56345eb444828adda8691988037df7d65dad6cebed01dbe5b47ee73874fb316e2681254764edb1a5120cbf00cd9a81873fe964490a2 SHA512 345d6d7d3f21d2dc728b93e2cbfeb4fc1f589797e852604809b1ff3e7bca53414d684571faf8245c740a50205e7d8787afd5304beb89efd3545a389ec4a74331
 DIST tl-doc-pictex-2020.tar.xz 468 BLAKE2B a894250cf26ae780a8f1181ababe30c26ab94f96cbb0795d1f9fa6dab69bd493d8dfbab54fe244c8c5ec983d131a1aa832faa83047bd69ece3b46a4d76340666 SHA512 c866f0855f701917fa81966c16a7f1c869320ddaf38e2c1c2a71844fa7b224fe2216f267b7b700ef6e36a13f97fa6f33a1d05342d5a7a8dd47ccda761fc577f4
 DIST tl-doc-pictex.doc-2020.tar.xz 1508 BLAKE2B d9b37db6c733c75a46dcb4234b8f30f29bed5297c2d819f38ba9ecfa805a3d108ecc137fcb4e2f092b1761056aa94c763460baf21871b7754f6ef74279513170 SHA512 3440fd4d0e2117594d6b350dcfed891506ce7fc0500ecdd4f156431363a38e399061469f5def9082d59c39b14b65ebc19ccb3204fef71ade300825cf35659158
+DIST tl-dot2texi-2020.tar.xz 3740 BLAKE2B 4c792247a165100ec5f42a58cb5171118021e44e819d708e26e416053b82318b69025c7a319aeee9000c56a83ff17b8de31ef193cb9d4a870054fd5918b693ea SHA512 20cc54f907b00e2eb14e4641d5098dd4886ce8d4627f391421bc5e819614dec97e0ec42c92794bacb8ffcb03737cb8736c308fad6984abf13c127f6d1174ee0f
+DIST tl-dot2texi.doc-2020.tar.xz 216576 BLAKE2B 4e7190cfba4c0dd2ada60f0adc0ad1adff7f1ffdc9c1c935ebefcd86a8a140826e3fa6b745778d7148cadeb084725f14dbf0f509203e95ca946354336871b8b9 SHA512 9e8461946582e0c99ee35437522e25769e2afe5d7051f072937a57c5d4e1a0c8e144509c751f9ddb7ef576f43ca408ffca663f81c8b5e69fb176a4233ff45ea3
 DIST tl-dottex-2020.tar.xz 2596 BLAKE2B b92d717e24213ef7847505f190c9abf51b68bfd82f81c44bb044f10ae5b652fbf54be4bfef9602f4b0b36e62a30c13560d0939aa340ace9708d33674f76c921e SHA512 037586577425d8a38a2170bc4bb9a7fa28a7886ad852d1c85483f7c3b625321c41a204b613479382ff5fb9e8cc3f8f9d8ff6e0a07c14b71ce6fdc68280515e33
 DIST tl-dottex.doc-2020.tar.xz 88372 BLAKE2B b68114e7e42e9f6a82dbb5f792d6010476b7eb64732936518f777d00d537922e9ef52bc62b74dcca4c3dfb64856d868bcc0acccd1351f866f16c274745309c12 SHA512 3708e08c630e27d744c3a865cc02e91868a32b1648b4d390cea0f20ea6340c56ea1720348f6b82796df6cc3f4d5b7feaf59ffe7e24c32e34535a4e5763318df6
 DIST tl-dottex.source-2020.tar.xz 4668 BLAKE2B 0c03b5ec230d37eddbaddbe81e5965d9697617437ef9c0e900e042cc1bf97f949174fb43adde352381143cdcc5e852ed0853005292a3bf94836e5e52d8d6335b SHA512 adf26c722ad1e2fa26d10488125267516923db87c1185068a33a082c6f51bf5ec644ace69aefa0630eab9a604bfc28032cb5d10db15ef0c80ab28fc93839a13b
@@ -435,5 +437,5 @@ DIST tl-xpicture.doc-2020.tar.xz 1297960 BLAKE2B 8050df16058206e174fc31dbba5bbc0
 DIST tl-xpicture.source-2020.tar.xz 24428 BLAKE2B 5368f4004b717752dfbd3aa3a13eddfcba64b95976e03aa7ddcd8df62f8de3021e8f61ea713f6b4adc04d8c327979bab006ef63211400a23147df5568b0b68cd SHA512 e49b8512ef83ec38f20dafa1e5f191cfd4c2bbcc62016f209be06f969cccdf3cec9545a24756710c767946f8c532074d53de8a6bacd6c565fdf49c579b0cb6c7
 DIST tl-xypic-2020.tar.xz 709808 BLAKE2B 7192d7d06eb8fec456213d8124465258e325c86bb3ef7e6b898eba975f5e12857ee7f7f1e4c551b7caa7d0769862bddd3ac6b83fde7d2eaf32d9722c4f47ed3e SHA512 5bf1323499bd801e2d5e9ca2eaaf3d7726ed6b8063dee18180eec775ea4d2f86cca8bcae262375455af64ae00951a41b34386fd90666a2a89114a2fcf23ccb7f
 DIST tl-xypic.doc-2020.tar.xz 3923196 BLAKE2B 3a1598c0f34833f8336a9301102b259b8ccf293b1866126d67c812e933c3eddb4489dd733aa47e0b8b4a79fe0965a06a981c0d4420dfd8beac148edc581ac89e SHA512 cee264a3a8ee8f599b2310b4c9b722835a61fe8455c3f873ba91ad22ac7890cff8a1ef25f3d0b80aedd6420f31742f4e533fe20fc81dc83e4cc018684180c7ff
-EBUILD texlive-pictures-2020-r1.ebuild 6474 BLAKE2B fca85b79164b760030e8f9c8e617c828d0b5d9aa824e6f8eb25f367bfe71583be65845d9c11c9621e23a1277b97ed6a6ac32fc2ac1be5dd4a2cf612bf0dd4b28 SHA512 c7bb8f9fa009360d55406e57101bce3730421f1c77d9ea7d5ba73c269c0326cb351e224c4660dcbe22ea38740664235c5c40765259664fd4db3aac0960577a67
+EBUILD texlive-pictures-2020-r2.ebuild 6503 BLAKE2B 28a92d9cee20a1313220a66cbb28eb0afa58ff6c61f3ef4f4d1301ad1cb9442058cf762798fbdd227010e78c5f5d2cc8194c6de9f6fac57ee432e0cc8451dbbc SHA512 50d6f739932b71a2e966bc6481d687549fc0aa903245249fc52a539595ddfd5b424fb6ad1a8277a051ed4a19da0c8ccc4342a35244f8bc7a816916066d942839
 MISC metadata.xml 478 BLAKE2B e113025fb506c77cc1f2a8099b1182d3ce057e8067145dfe921af4289f22f3894e4a20eb6f941f4bdcad739df93975766490d62ce253a0710ff428dcc045ec11 SHA512 547880e196d638109a84a159cf694f201dc6e01ae15d26e252fc7da697cc2c466da0a3403c149d5847049da06e682557293cda020b77a05b0684611b4562f957
diff --git a/dev-texlive/texlive-pictures/texlive-pictures-2020-r1.ebuild b/dev-texlive/texlive-pictures/texlive-pictures-2020-r1.ebuild
deleted file mode 100644
index c927c734cdb9..000000000000
--- a/dev-texlive/texlive-pictures/texlive-pictures-2020-r1.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"
-
-TEXLIVE_MODULE_CONTENTS="adigraph aobs-tikz askmaps asyfig asypictureb autoarea bardiag beamerswitch binarytree blochsphere bloques blox bodegraph bondgraph bondgraphs braids bxeepic cachepic callouts celtic chemfig combinedgraphics circuit-macros circuitikz curve curve2e curves dcpic diagmac2 ditaa doc-pictex dottex  dratex drs duotenzor dynkin-diagrams ecgdraw eepic ellipse endofproofwd  epspdfconversion esk euflag fast-diagram fig4latex fitbox flowchart forest genealogytree getmap gincltex gnuplottex gradientframe grafcet graph35 graphicxpsd graphviz gtrlib-largetrees harveyballs here hf-tikz hobby hvfloat istgame kblocks knitting knittingpattern ladder lapdf latex-make lpic lroundrect luamesh luasseq maker makeshape mathspic milsymb miniplot mkpic modiagram neuralnetwork numericplots pb-diagram penrose petri-nets  pgf-blur pgf-cmykshadings pgf-soroban pgf-spectra pgf-umlcd pgf-umlsd pgfgantt pgfkeyx pgfmolbio pgfmorepages pgfopts pgfplots picinpar pict2e pictex pictex2 pinlabel pixelart pmgraph postage prerex productbox ptolemaicastronomy pxpgfmark qcircuit quantikz qrcode randbild randomwalk realhats reotex rviewport sa-tikz schemabloc scsnowman scratch scratch3 setdeck simpleoptics signchart smartdiagram spath3 spectralsequences swimgraf table-fct texdraw ticollege tipfr tikz-3dplot tikz-bayesnet tikz-cd tikz-dependency tikz-dimline tikz-feynhand tikz-feynman tikz-imagelabels tikz-inet tikz-kalender tikz-karnaugh tikz-ladder tikz-layers tikz-nef tikz-network tikz-opm tikz-optics tikz-page tikz-palattice tikz-qtree tikz-relay tikz-sfc tikz-timing tikz-trackschematic tikz-truchet tikzcodeblocks tikzducks tikzinclude tikzlings tikzmark tikzmarmots tikzorbital tikzpagenodes tikzpfeile tikzpeople tikzposter tikzscale tikzsymbols timing-diagrams tqft tkz-base tkz-doc tkz-euclide tkz-orm tkz-tab tsemlines tufte-latex venndiagram visualpstricks xpicture xypic collection-pictures
-"
-TEXLIVE_MODULE_DOC_CONTENTS="adigraph.doc aobs-tikz.doc askmaps.doc asyfig.doc asypictureb.doc autoarea.doc bardiag.doc beamerswitch.doc binarytree.doc blochsphere.doc bloques.doc blox.doc bodegraph.doc bondgraph.doc bondgraphs.doc braids.doc bxeepic.doc cachepic.doc callouts.doc celtic.doc chemfig.doc combinedgraphics.doc circuit-macros.doc circuitikz.doc curve.doc curve2e.doc curves.doc dcpic.doc diagmac2.doc ditaa.doc doc-pictex.doc dottex.doc dratex.doc drs.doc duotenzor.doc dynkin-diagrams.doc ecgdraw.doc eepic.doc ellipse.doc endofproofwd.doc epspdfconversion.doc esk.doc euflag.doc fast-diagram.doc fig4latex.doc fitbox.doc flowchart.doc forest.doc genealogytree.doc getmap.doc gincltex.doc gnuplottex.doc gradientframe.doc grafcet.doc graph35.doc graphicxpsd.doc graphviz.doc gtrlib-largetrees.doc harveyballs.doc here.doc hf-tikz.doc hobby.doc hvfloat.doc istgame.doc kblocks.doc knitting.doc knittingpattern.doc ladder.doc lapdf.doc latex-make.doc lpic.doc lroundrect.doc luamesh.doc luasseq.doc maker.doc makeshape.doc mathspic.doc milsymb.doc miniplot.doc mkpic.doc modiagram.doc neuralnetwork.doc numericplots.doc pb-diagram.doc penrose.doc petri-nets.doc pgf-blur.doc pgf-cmykshadings.doc pgf-soroban.doc pgf-spectra.doc pgf-umlcd.doc pgf-umlsd.doc pgfgantt.doc pgfkeyx.doc pgfmolbio.doc pgfmorepages.doc pgfopts.doc pgfplots.doc picinpar.doc pict2e.doc pictex.doc pinlabel.doc pixelart.doc pmgraph.doc postage.doc prerex.doc productbox.doc ptolemaicastronomy.doc pxpgfmark.doc qcircuit.doc quantikz.doc qrcode.doc randbild.doc randomwalk.doc realhats.doc reotex.doc rviewport.doc sa-tikz.doc schemabloc.doc scsnowman.doc scratch.doc scratch3.doc setdeck.doc simpleoptics.doc signchart.doc smartdiagram.doc spath3.doc spectralsequences.doc swimgraf.doc table-fct.doc texdraw.doc ticollege.doc tipfr.doc tikz-3dplot.doc tikz-bayesnet.doc tikz-cd.doc tikz-dependency.doc tikz-dimline.doc tikz-feynhand.doc tikz-feynman.doc tikz-imagelabels.doc tikz-inet.doc tikz-kalender.doc tikz-karnaugh.doc tikz-ladder.doc tikz-layers.doc tikz-nef.doc tikz-network.doc tikz-opm.doc tikz-optics.doc tikz-page.doc tikz-palattice.doc tikz-qtree.doc tikz-relay.doc tikz-sfc.doc tikz-timing.doc tikz-trackschematic.doc tikz-truchet.doc tikzcodeblocks.doc tikzducks.doc tikzinclude.doc tikzlings.doc tikzmark.doc tikzmarmots.doc tikzorbital.doc tikzpagenodes.doc tikzpfeile.doc tikzpeople.doc tikzposter.doc tikzscale.doc tikzsymbols.doc timing-diagrams.doc tqft.doc tkz-base.doc tkz-doc.doc tkz-euclide.doc tkz-orm.doc tkz-tab.doc tufte-latex.doc venndiagram.doc visualpstricks.doc xpicture.doc xypic.doc "
-TEXLIVE_MODULE_SRC_CONTENTS="aobs-tikz.source asyfig.source asypictureb.source beamerswitch.source binarytree.source blochsphere.source blox.source bondgraphs.source braids.source celtic.source combinedgraphics.source curve.source curve2e.source curves.source dottex.source ecgdraw.source ellipse.source esk.source euflag.source fitbox.source flowchart.source forest.source gincltex.source gnuplottex.source gradientframe.source graph35.source graphviz.source gtrlib-largetrees.source hf-tikz.source hobby.source latex-make.source lroundrect.source luasseq.source makeshape.source penrose.source pgf-blur.source pgf-cmykshadings.source pgfgantt.source pgfmolbio.source pgfopts.source pgfplots.source pict2e.source pixelart.source postage.source productbox.source ptolemaicastronomy.source qrcode.source randbild.source randomwalk.source realhats.source rviewport.source signchart.source smartdiagram.source spath3.source tikz-imagelabels.source tikz-page.source tikz-timing.source tikz-truchet.source tikzinclude.source tikzmark.source tikzpagenodes.source tikzpfeile.source tikzposter.source tikzscale.source tikzsymbols.source tqft.source venndiagram.source xpicture.source "
-inherit  texlive-module
-DESCRIPTION="TeXLive Graphics, pictures, diagrams"
-
-LICENSE=" Apache-2.0 BSD-2 GPL-2 CC-BY-SA-4.0 "
-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-DEPEND=">=dev-texlive/texlive-basic-2020
->=dev-tex/pgf-3.0.1
-"
-RDEPEND="${DEPEND} "
-TEXLIVE_MODULE_BINSCRIPTS="
-	texmf-dist/scripts/cachepic/cachepic.tlu
-	texmf-dist/scripts/fig4latex/fig4latex
-	texmf-dist/scripts/mathspic/mathspic.pl
-	texmf-dist/scripts/mkpic/mkpic
-	texmf-dist/scripts/getmap/getmapdl.lua
-	texmf-dist/scripts/petri-nets/pn2pdf
-"
diff --git a/dev-texlive/texlive-pictures/texlive-pictures-2020-r2.ebuild b/dev-texlive/texlive-pictures/texlive-pictures-2020-r2.ebuild
new file mode 100644
index 000000000000..ce9dd3a27ccc
--- /dev/null
+++ b/dev-texlive/texlive-pictures/texlive-pictures-2020-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+TEXLIVE_MODULE_CONTENTS="adigraph aobs-tikz askmaps asyfig asypictureb autoarea bardiag beamerswitch binarytree blochsphere bloques blox bodegraph bondgraph bondgraphs braids bxeepic cachepic callouts celtic chemfig combinedgraphics circuit-macros circuitikz curve curve2e curves dcpic diagmac2 ditaa doc-pictex dot2texi dottex  dratex drs duotenzor dynkin-diagrams ecgdraw eepic ellipse endofproofwd  epspdfconversion esk euflag fast-diagram fig4latex fitbox flowchart forest genealogytree getmap gincltex gnuplottex gradientframe grafcet graph35 graphicxpsd graphviz gtrlib-largetrees harveyballs here hf-tikz hobby hvfloat istgame kblocks knitting knittingpattern ladder lapdf latex-make lpic lroundrect luamesh luasseq maker makeshape mathspic milsymb miniplot mkpic modiagram neuralnetwork numericplots pb-diagram penrose petri-nets  pgf-blur pgf-cmykshadings pgf-soroban pgf-spectra pgf-umlcd pgf-umlsd pgfgantt pgfkeyx pgfmolbio pgfmorepages pgfopts pgfplots picinpar pict2e pictex pictex2 pinlabel pixelart pmgraph postage prerex productbox ptolemaicastronomy pxpgfmark qcircuit quantikz qrcode randbild randomwalk realhats reotex rviewport sa-tikz schemabloc scsnowman scratch scratch3 setdeck simpleoptics signchart smartdiagram spath3 spectralsequences swimgraf table-fct texdraw ticollege tipfr tikz-3dplot tikz-bayesnet tikz-cd tikz-dependency tikz-dimline tikz-feynhand tikz-feynman tikz-imagelabels tikz-inet tikz-kalender tikz-karnaugh tikz-ladder tikz-layers tikz-nef tikz-network tikz-opm tikz-optics tikz-page tikz-palattice tikz-qtree tikz-relay tikz-sfc tikz-timing tikz-trackschematic tikz-truchet tikzcodeblocks tikzducks tikzinclude tikzlings tikzmark tikzmarmots tikzorbital tikzpagenodes tikzpfeile tikzpeople tikzposter tikzscale tikzsymbols timing-diagrams tqft tkz-base tkz-doc tkz-euclide tkz-orm tkz-tab tsemlines tufte-latex venndiagram visualpstricks xpicture xypic collection-pictures
+"
+TEXLIVE_MODULE_DOC_CONTENTS="adigraph.doc aobs-tikz.doc askmaps.doc asyfig.doc asypictureb.doc autoarea.doc bardiag.doc beamerswitch.doc binarytree.doc blochsphere.doc bloques.doc blox.doc bodegraph.doc bondgraph.doc bondgraphs.doc braids.doc bxeepic.doc cachepic.doc callouts.doc celtic.doc chemfig.doc combinedgraphics.doc circuit-macros.doc circuitikz.doc curve.doc curve2e.doc curves.doc dcpic.doc diagmac2.doc ditaa.doc doc-pictex.doc dot2texi.doc dottex.doc dratex.doc drs.doc duotenzor.doc dynkin-diagrams.doc ecgdraw.doc eepic.doc ellipse.doc endofproofwd.doc epspdfconversion.doc esk.doc euflag.doc fast-diagram.doc fig4latex.doc fitbox.doc flowchart.doc forest.doc genealogytree.doc getmap.doc gincltex.doc gnuplottex.doc gradientframe.doc grafcet.doc graph35.doc graphicxpsd.doc graphviz.doc gtrlib-largetrees.doc harveyballs.doc here.doc hf-tikz.doc hobby.doc hvfloat.doc istgame.doc kblocks.doc knitting.doc knittingpattern.doc ladder.doc lapdf.doc latex-make.doc lpic.doc lroundrect.doc luamesh.doc luasseq.doc maker.doc makeshape.doc mathspic.doc milsymb.doc miniplot.doc mkpic.doc modiagram.doc neuralnetwork.doc numericplots.doc pb-diagram.doc penrose.doc petri-nets.doc pgf-blur.doc pgf-cmykshadings.doc pgf-soroban.doc pgf-spectra.doc pgf-umlcd.doc pgf-umlsd.doc pgfgantt.doc pgfkeyx.doc pgfmolbio.doc pgfmorepages.doc pgfopts.doc pgfplots.doc picinpar.doc pict2e.doc pictex.doc pinlabel.doc pixelart.doc pmgraph.doc postage.doc prerex.doc productbox.doc ptolemaicastronomy.doc pxpgfmark.doc qcircuit.doc quantikz.doc qrcode.doc randbild.doc randomwalk.doc realhats.doc reotex.doc rviewport.doc sa-tikz.doc schemabloc.doc scsnowman.doc scratch.doc scratch3.doc setdeck.doc simpleoptics.doc signchart.doc smartdiagram.doc spath3.doc spectralsequences.doc swimgraf.doc table-fct.doc texdraw.doc ticollege.doc tipfr.doc tikz-3dplot.doc tikz-bayesnet.doc tikz-cd.doc tikz-dependency.doc tikz-dimline.doc tikz-feynhand.doc tikz-feynman.doc tikz-imagelabels.doc tikz-inet.doc tikz-kalender.doc tikz-karnaugh.doc tikz-ladder.doc tikz-layers.doc tikz-nef.doc tikz-network.doc tikz-opm.doc tikz-optics.doc tikz-page.doc tikz-palattice.doc tikz-qtree.doc tikz-relay.doc tikz-sfc.doc tikz-timing.doc tikz-trackschematic.doc tikz-truchet.doc tikzcodeblocks.doc tikzducks.doc tikzinclude.doc tikzlings.doc tikzmark.doc tikzmarmots.doc tikzorbital.doc tikzpagenodes.doc tikzpfeile.doc tikzpeople.doc tikzposter.doc tikzscale.doc tikzsymbols.doc timing-diagrams.doc tqft.doc tkz-base.doc tkz-doc.doc tkz-euclide.doc tkz-orm.doc tkz-tab.doc tufte-latex.doc venndiagram.doc visualpstricks.doc xpicture.doc xypic.doc "
+TEXLIVE_MODULE_SRC_CONTENTS="aobs-tikz.source asyfig.source asypictureb.source beamerswitch.source binarytree.source blochsphere.source blox.source bondgraphs.source braids.source celtic.source combinedgraphics.source curve.source curve2e.source curves.source dottex.source ecgdraw.source ellipse.source esk.source euflag.source fitbox.source flowchart.source forest.source gincltex.source gnuplottex.source gradientframe.source graph35.source graphviz.source gtrlib-largetrees.source hf-tikz.source hobby.source latex-make.source lroundrect.source luasseq.source makeshape.source penrose.source pgf-blur.source pgf-cmykshadings.source pgfgantt.source pgfmolbio.source pgfopts.source pgfplots.source pict2e.source pixelart.source postage.source productbox.source ptolemaicastronomy.source qrcode.source randbild.source randomwalk.source realhats.source rviewport.source signchart.source smartdiagram.source spath3.source tikz-imagelabels.source tikz-page.source tikz-timing.source tikz-truchet.source tikzinclude.source tikzmark.source tikzpagenodes.source tikzpfeile.source tikzposter.source tikzscale.source tikzsymbols.source tqft.source venndiagram.source xpicture.source "
+inherit  texlive-module
+DESCRIPTION="TeXLive Graphics, pictures, diagrams"
+
+LICENSE=" Apache-2.0 BSD-2 GPL-2 GPL-2+ CC-BY-SA-4.0 "
+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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+DEPEND=">=dev-texlive/texlive-basic-2020
+>=dev-tex/pgf-3.0.1
+"
+RDEPEND="${DEPEND} "
+TEXLIVE_MODULE_BINSCRIPTS="
+	texmf-dist/scripts/cachepic/cachepic.tlu
+	texmf-dist/scripts/fig4latex/fig4latex
+	texmf-dist/scripts/mathspic/mathspic.pl
+	texmf-dist/scripts/mkpic/mkpic
+	texmf-dist/scripts/getmap/getmapdl.lua
+	texmf-dist/scripts/petri-nets/pn2pdf
+"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 8b17e3526818..a479280aa999 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-sdk-update-manager/Manifest b/dev-util/android-sdk-update-manager/Manifest
index de5392525e08..943535efea14 100644
--- a/dev-util/android-sdk-update-manager/Manifest
+++ b/dev-util/android-sdk-update-manager/Manifest
@@ -27,4 +27,4 @@ EBUILD android-sdk-update-manager-22.ebuild 3131 BLAKE2B e62927b86f4840cd333bacc
 EBUILD android-sdk-update-manager-23-r1.ebuild 3311 BLAKE2B 4f25cb3fc06c5f4ca34ea133974aad91a17d5f696007dde500eaf85da6ce8f8e4a29033a83f6cdf9e3768d6e63f000e1cdc8aedd302b8388b0b3b3ae1f1f17f1 SHA512 23af7109d479d4a8b041f26828c3c302b11d5e5c4cfc3c158355727c4882faa403cd950c1d532c0952c8580ac1e61a86bb4172b3ed139b22767c2f21ad0b45fb
 EBUILD android-sdk-update-manager-23.ebuild 3305 BLAKE2B a4cf54975b768d49ad116f36ce8e9e3b39045357da70bfe1f44ddd7a517ecec4e5cabca082116c5ead2ded35fae758e39b46ec06ff1721fb132059b9971ebff8 SHA512 b2e5272a3d742d73118642d98b4706086a878a0227a5fdce4cbbd473af28cc04b39189d230e43bf3e9ac32866ab2f7a35eb7014071762f63497f2d37f205162f
 EBUILD android-sdk-update-manager-24.4.1.ebuild 3353 BLAKE2B 05e979a96b88dba1be33559d2b8eb48eb6aec5cfc8a02b53416f809f31e8c7f043e6fafc0b2ca8ae8767656c624757f7f4357433de4e41756fdadc067793fa3e SHA512 7d04b34c7d6364106ff48ec5c79c5d3a4a4bf6f01511a5dbfd18e8ef6331002c0054ff98b86c0f039c27013d4bd755a4623f38a7b7d6c0653dd5015e9cc91423
-MISC metadata.xml 214 BLAKE2B 48fe26dc32218c5f83cecefd288be1d07314b03aa871c0c322ff125643f0a42598d39b0bf2fb46daf63f3f39df78b869dd4398ab4671dd0f57d62060ce148a2c SHA512 2d699278683037614d2dc6595d6ae71ca4eb3a5b22506ccb0926d932f00bde85c1759caf8c0b1729cd949e652fca33c8ced0e7ac6e65af144f0f66eb064ceed3
+MISC metadata.xml 174 BLAKE2B 1738b3b33ef242919964fb6a498f2215dbd528720bd193469bb20020fbedda0e9102ef85539fa9d2c3924bf2e6c0dd560671134200481054111467ba8e88fcb1 SHA512 281aa8b74dd6915f9856e5e70db000388f8b04bd5393871e67b57cec316374c6986124202dfdf4855ba57dd60f1e2cfc323a1f2cc4c6fbe0f634f67f8fb40b17
diff --git a/dev-util/android-sdk-update-manager/metadata.xml b/dev-util/android-sdk-update-manager/metadata.xml
index e97c89c421c2..942e57aad12a 100644
--- a/dev-util/android-sdk-update-manager/metadata.xml
+++ b/dev-util/android-sdk-update-manager/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>rich0@gentoo.org</email>
-</maintainer>
+        <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-util/anjuta/Manifest b/dev-util/anjuta/Manifest
index 2fb284809e72..15fc10f2580e 100644
--- a/dev-util/anjuta/Manifest
+++ b/dev-util/anjuta/Manifest
@@ -1,5 +1,5 @@
 DIST anjuta-3.28.0.tar.xz 6382736 BLAKE2B 8872736d80d0a09d35706ef69c0de56c84b9abf025f9552ae4b21b0b51c3ab8ad93f07dd1564601422890e92155cc7be80bae8de77106035621a54316608832b SHA512 c8de0b0debf0a511d6c50fe2582077a33c04290a045cce637c05c15df984cc3e8ee942c0c3a75bfd01c48e6c302d5424565c4e54fe6eb118c87a3590563505ef
 DIST anjuta-3.34.0.tar.xz 6420472 BLAKE2B a5e10ea3bb60499e54def8d1b78603b0c809167ad03a3e11f9dbd031514f1a7cb566d9c7694be23fe3165e617fbfc3d1e6ce36f7dc8c0672044f26390aed6d5a SHA512 9d5a4c23751893ff7e21cd55c1f112f27b53fe2ea5ac645c63e2da627efce202b88696e3e5d860ad75a5c13c88a9082775d74f4482208161b5e63d56c4004d57
 EBUILD anjuta-3.28.0-r1.ebuild 3936 BLAKE2B 683893d06cd59787db3911c2d68a3c8be2534ba4c387da7afa8a482f430d28305c0a5154bb7ed4bdf71b0697ca3cb2103245477eee828277172f167c7e9493ff SHA512 8ea1f8e247fd3b6bb7b89a246338f84a11a8950569144337f1ba398159cdd64632b2e9b7566bed8fcecb05fe61a9569caadf45cfad5a24a7cf7cb263f8ee5868
-EBUILD anjuta-3.34.0.ebuild 4575 BLAKE2B 02f49bcdfad667ebab69d78d1b66b6c29b8f26c486f20c3ff03d6db92d753fb9f813e04565bb10b119d2d622735d5c6eb9dc6eee361fdf9fd97a514ceeb74eaa SHA512 97ddc950d519bcd8048ba8e4e431a02222404484662c77c36b3629f4fe683865317127455dd3d36be85045a5dab44115f588ead011aa3ad41d1e7b3d50e60e7f
+EBUILD anjuta-3.34.0.ebuild 4574 BLAKE2B dc37c5fd31f27d36611df232e6dac0b704ec1a87d2c672946bd370a6e91bc6b44eeffc00ebbab856f73e2f44341449580409f1a12a4c65f5ea4d0d80898a58c7 SHA512 e7f48224566c0fd7e9ff11afd2a41dbc40d2f327a2f7ee58dd86f7fd0ce852b163986a62b13f5f68629c75f55e0310120ac235925bc8530973289577cf5d12dc
 MISC metadata.xml 562 BLAKE2B 928b16bacff2417a1b50749486d2dcd656184b6cd7bce6f17e534d253ab2e1af854e18bf40f3188714e973b9c49f1b2691d031bdaef0ec73d9a4844c05b99218 SHA512 c452f34b8489e3faeb8c272282233341e22c958f04d750d54e07c487895aab8b03f4df096e1f07fdb7686a0295c770cb1fcf38fdca01f71730e991148013d82f
diff --git a/dev-util/anjuta/anjuta-3.34.0.ebuild b/dev-util/anjuta/anjuta-3.34.0.ebuild
index e8778c511513..8ea2a7e3db66 100644
--- a/dev-util/anjuta/anjuta-3.34.0.ebuild
+++ b/dev-util/anjuta/anjuta-3.34.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Anjuta"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 
 IUSE="debug devhelp glade +introspection subversion terminal test vala"
 RESTRICT="!test? ( test )"
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index b96b6ae30bf2..a13010d1f7f2 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -9,7 +9,7 @@ DIST libbpf-0.0.5.tar.gz 160335 BLAKE2B 2cf4a3e6edc002b3a32f9d08bb22a07863d8f6f9
 DIST libbpf-0.0.6.tar.gz 213791 BLAKE2B 9f0a08cc7bae41f7fa93d5ba2f535f76ce47fe691efb6bac6257b88a5607deb62fa53f59984d83b6070ccd573c902899f7528b376d9acbfd77317659de6ab061 SHA512 1678133d9a2bd1cf13d4d1f9b83bb3f0642de91e3e3c8d785e2993257035573aff39b9a1a457e73d9c4c1c66b6a52544a8ad06ac560766d335428bb3fc421e71
 DIST libbpf-0.0.7.tar.gz 262068 BLAKE2B e77ff25449274881ddb9d32f25cd6ad8988e4524102bd109049ee6cfce3e2753fd99ebe2a080f809a4c5422dbf6b17633e4b0cea156f289bf95b92f8375a273c SHA512 c2cbc869b7e11339deab3152a6e2d0b3bba25da513d18d77fb0a698cbe61d6bd48175a58e7dd7a3695fbf27faf48b4f517ac5d3a3c66c086df2e5d1b73a2595d
 DIST libbpf-0.0.8.tar.gz 262519 BLAKE2B 2a3620c97834cc23e716476b6966c1c65c1c82064b3ba1ae4ab4906ae362a777d9aa7ae40620f9a259fe969a5a897e97c14d97f627f39c47fa28c89abb1efa9a SHA512 1074fb52b7a158e4e2713c4c7083528ccf2d99b899853078f230234ba112071bfa66e174d8800d36516e26d5bf06da44d100a5b2f866d267f62c9308f431220c
-DIST libbpf-0.0.9.tar.gz 273706 BLAKE2B 54dc77a8e415c24e6394877fc9ad54daca78a4e4f4779607e977708e8b88b6d7bb5854b618a808b1758529b9fdd574fc85f5969791a88b9a124cc42b63f7a161 SHA512 597ac41ab1727c48f2c53c9626b482ae7abd558b4c7d237e33206e3292295d5e5c2f56d31063d30caedccdc3fd289c040f718ff9aaaf210920f1b9c4c772660d
+DIST libbpf-0.0.9.tar.gz 273726 BLAKE2B 1277ce5b9dab9037e287910c43a71ee33cd6607d7cbe59d40c6930bf49407e04fcdfa6f4795f98202930fd564c1569c2feef0bca73294334f00abd601a288ed0 SHA512 d54bbdee6f7ea83ffef3fd0abe07f71644bcf83e5cf4a307fb4e03d885503617f1af2d324cc869f0f01a92bcb58836780a4802ac4db83b9f037ea196edc1131a
 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.13.0.ebuild 1925 BLAKE2B 4cf4fcfd74ca4a941be56ec92c003be585b81105dc0986e0a63cdcafbb0a9c22f7803aded42ff0214338312463019f6ba7938775dcd6538afd80d85a92b0d523 SHA512 69e3e78d7f6ead73c007e821f5ea2a6e3f5244cf716703b763427bb49e89f5012ec0327fdf142dee93b6c9091c572985a8cc3738b6b238e19e9ceef0a4a9e0d6
diff --git a/dev-util/bnfc/Manifest b/dev-util/bnfc/Manifest
index 0a0b0a261bb5..e84348be171a 100644
--- a/dev-util/bnfc/Manifest
+++ b/dev-util/bnfc/Manifest
@@ -2,7 +2,5 @@ AUX bnfc-2.8-alex-3.1.6.patch 207 BLAKE2B 3e14851866c8ae0dda9245dd1dc920bc4554eb
 AUX bnfc-2.8.1-ghc84-p2.patch 4144 BLAKE2B 19ac2a0e8edcbad7d441c248625904aa0021fc64e97d3f7ebcf3e0d1bdf693b442062a5126af1162404de59a022e8f573d7127c223209993755e99e60285eda8 SHA512 4a21d805f24d9f4729a2b95af04333651639324f7ec26996627007ffb5dc8657cb175b228e95e9356c2b47e70ac49576f58b024891c0ce6ddf299b4ee9299548
 AUX bnfc-2.8.1-ghc84.patch 986 BLAKE2B bf7ecd64654f04d701a2b7ec9dfc969cbf4a1bd51db7e6d31512c2cd7bfbaed83ae37a93bec7ce667cae2a98369086accf5d76dab84ae02df4af6d87703531bf SHA512 615ac9cf9b7eff19f675b4cb44e9a3b9d9acc53c827c57c2b556fb76c9c37832f8d137609df64c469eed0b298c0b9dbe01b1ba9cb8d5a1b3088fadadfe27af49
 DIST BNFC-2.8.1.tar.gz 225015 BLAKE2B 973f7a5ebc5fb995bf0014621ba7bfebe0d6adbb35bd276b3f7ec56e3fe1ab08c3811d27a2d58a73ca52ac4bf9ba35fba3d172a82684b1ef999a2fdd6dc4ece9 SHA512 d5ea9b4129a4f71c2d66cda2f859a2c39be6d4400cddbd5a5303b5b408f4cf03ce7a92825224f4674c6cc48bec07429c447b9b39fc4e6d144c922bf1b0829561
-DIST BNFC-2.8.tar.gz 183591 BLAKE2B cc14079bba767d85ae59a05057cba7db11bc7fcc39e28c29a5151e1ffae1c5b712351085eaa8affe79a36cac66e79df26335d48cfc24fbf41dff018727aa8dd6 SHA512 358700360dbfbeacf3276150856415e08e1498c6af27254302d406e5407b7b4f84ac0dcf9dcf8391128ac9d77a17a928c2427961ec8c3ffdb9af8d169145cafb
 EBUILD bnfc-2.8.1.ebuild 815 BLAKE2B 543658d36f34aa2d2e28eee8a953c35f53bceb1258d46ab950b0355b46cca9b61f7a7656978c49f91964dff38d5c2521ae14f3f38ebf049a823620f755c636f6 SHA512 c88a93a1294a99f20c8313cd70810a423e9236f46b72253614605ff3b8effdfd445fd759ee36b4451eafb4969dd82e5d53ac938643b75daf5d98f64be787d802
-EBUILD bnfc-2.8.ebuild 906 BLAKE2B 8d6c7e91b6f3fb2f10e4f85427f2af5eb414debea79eec8f2e210de9a39f600c9ceeff57a1985a77f00a79e3bf76370227d59329636d0a971d2f7b09c93f5a3b SHA512 12de94e7cf2fee3494d9aa5fccd0e819f746bd8213cc595f387198be769464e3b355efdb7bcd224b4be551bd52479b0ed2abfe4e18c8e3a80ce402a6bcf47d16
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-util/bnfc/bnfc-2.8.ebuild b/dev-util/bnfc/bnfc-2.8.ebuild
deleted file mode 100644
index af500808e92f..000000000000
--- a/dev-util/bnfc/bnfc-2.8.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="BNFC"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A compiler front-end generator"
-HOMEPAGE="http://bnfc.digitalgrammars.com/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RESTRICT=test # missing files
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.8
-	dev-haskell/happy
-	test? ( >=dev-haskell/doctest-0.8
-		dev-haskell/hspec
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.5
-		dev-haskell/temporary )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-alex-3.1.6.patch
-}
diff --git a/dev-util/buildbot-badges/Manifest b/dev-util/buildbot-badges/Manifest
index 1c7c7338f755..c3a35510ff1c 100644
--- a/dev-util/buildbot-badges/Manifest
+++ b/dev-util/buildbot-badges/Manifest
@@ -1,3 +1,5 @@
 DIST buildbot-badges-2.8.0.tar.gz 3935 BLAKE2B d5cf4dff1ebcb752b3b82377912d0a6e811d7def94dcf9e6f339a810d67b7eafcc699f4abdf32618aa71f231165e31be57be1834c9d0a8bf40012e66c7f19245 SHA512 2653393de1fa3c6e98d744144190e7f7999cc1955f67467c70609ae6531f5b5f05adc4bc84cce9092deda374103266e24397080998c3d62635bf44dcb8650609
+DIST buildbot-badges-2.8.2.tar.gz 3982 BLAKE2B d2320979c3c8530089ddad3c9c57e9f77576da8979b5834ab7f4e6766c5d210c822e7ab582103e897591db0efc63139dc7cb9f9d834bf81ae199dd25929c6b49 SHA512 e2f6ca0178428db90812633c9af47e8f5c40220f506e62745a150a5572a95f99d3a4115621c29b8188b4b5d48aa3b0bac1862b6c5793cd87a4971798a5aae28a
 EBUILD buildbot-badges-2.8.0.ebuild 934 BLAKE2B d0dcd4eeb7fae46b19a851c03585212352793045f54fa289a48fb085318dcfdfaa75984e8d04e32b1b783b7823f1010db7d00a5af35231ac1b098ecda2dd9e23 SHA512 c4302329a9cbbb3d2be9a353bf8c477ae3b39d7a575bf1fe6d955751e20ddb4e5d1ed82de394c552ddb6015a7066b33db0747bcd4dbcae54a9963994e5f93467
+EBUILD buildbot-badges-2.8.2.ebuild 934 BLAKE2B d0dcd4eeb7fae46b19a851c03585212352793045f54fa289a48fb085318dcfdfaa75984e8d04e32b1b783b7823f1010db7d00a5af35231ac1b098ecda2dd9e23 SHA512 c4302329a9cbbb3d2be9a353bf8c477ae3b39d7a575bf1fe6d955751e20ddb4e5d1ed82de394c552ddb6015a7066b33db0747bcd4dbcae54a9963994e5f93467
 MISC metadata.xml 761 BLAKE2B 5e3b300c2266a8f89672880260926a73744b83141b265f5a6e5ab11f9e2256165762d4371255d58a97c704479f281e160cb42e74269f35d4d623b2937fe8ff05 SHA512 72b794413f121ae9246da5fdf07b730c72949d84cac8fb881dabe31ef283d283afd83b62bcd71de7a6f92f247d07fb5d134f9945273032e2f21469bf9a030f73
diff --git a/dev-util/buildbot-badges/buildbot-badges-2.8.2.ebuild b/dev-util/buildbot-badges/buildbot-badges-2.8.2.ebuild
new file mode 100644
index 000000000000..c59f1ad4227a
--- /dev/null
+++ b/dev-util/buildbot-badges/buildbot-badges-2.8.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="Buildbot badges plugin produces an image in SVG or PNG format..."
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+IUSE=""
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+	dev-python/cairocffi[${PYTHON_USEDEP}]
+	media-gfx/cairosvg[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	dev-python/klein[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-console-view/Manifest b/dev-util/buildbot-console-view/Manifest
index d05927420bb7..1f0803cba861 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -1,5 +1,7 @@
 DIST buildbot-console-view-2.7.0.tar.gz 17939 BLAKE2B 1ea1848f0276bb7ef4adaf63dbe290ad5769689b15898682deed61e9797eb4945047dd26d492b118b75314621bf2777b77e992f1a3129e413c01c17b27b680c1 SHA512 22875fc4c3440892147db7c6ef1eba165a29f4ccd3583827394d0195c72dc8ec3d31940587e4da1f0133def074c72f87bc23bb210189a0e0d028c0be52368107
 DIST buildbot-console-view-2.8.0.tar.gz 18022 BLAKE2B 455ca2a1caed7d55a26d4b176cddf1a571f411dab191eda890698aa1d5150539c620ae90b2d1c5ab70cd47589466ca4534e2da1d1e73ab388761319f81434b39 SHA512 9344021b774f5cecf39384cff869ec0c9778630ec0015d654218ad03d83a18849e1b144dae74f7c85296efac6bbc767f387a1aa4b5271f3996c7e1b177f3b735
+DIST buildbot-console-view-2.8.2.tar.gz 17575 BLAKE2B e036429dd40fdfdadd65a10d4f6fc025b00d9a61153aecd4f31e0c6c133ba1e546b1c810254ec1fb83913cd4434db223c3cd782481ef5785ec48162a2f111682 SHA512 dbec358933865aa79ad86754ef454d89fa369fc64f3df54eb079c0f1ebadb027131d4bd7ac14dd29a16d34aa416e21f90cbecc873944a7ab8ef7da637e20c999
 EBUILD buildbot-console-view-2.7.0.ebuild 970 BLAKE2B 82003d6ab74edb27984e6a909be96c232d59c32807989ed535c51b50ccc3b46ec9c2c3a3f0ab423d88028035a1a47680a673ec27af5e167cde4b0ac4fed6a12c SHA512 c11fdbd0be9e12e6eb11f24d9bd79d93c6a7f6745e8d29b854c06e864753bf633a850aa0b7e09b196f64a7ae4895d67ef0242173d261a87271e55c24f64f7cf5
 EBUILD buildbot-console-view-2.8.0.ebuild 756 BLAKE2B 4efd6cf5e862092bc00e10f8951ba7cd54c9c5619908cb164f20e8b70f8eed9f4dff0a95d1368fc3c8fe7b383bafd1ea5454608939d7d31c1ad6503091795706 SHA512 bc65b167fc41c9869292a7665f14ce5045eb79d7c48115fde3fbce653c45e8e23ed6afe85eabb96e0ae5c7bef4c4729f02c7610001645c31fcbf7dab34520884
+EBUILD buildbot-console-view-2.8.2.ebuild 756 BLAKE2B 4efd6cf5e862092bc00e10f8951ba7cd54c9c5619908cb164f20e8b70f8eed9f4dff0a95d1368fc3c8fe7b383bafd1ea5454608939d7d31c1ad6503091795706 SHA512 bc65b167fc41c9869292a7665f14ce5045eb79d7c48115fde3fbce653c45e8e23ed6afe85eabb96e0ae5c7bef4c4729f02c7610001645c31fcbf7dab34520884
 MISC metadata.xml 660 BLAKE2B dd64f91ba93d64ffa1d1aec035eddab0863d2332664ae9292d54ddb394c3d406ca4f5c55cc4da7e0163563623d27602dbc51656e100e587797653b4fdd01f5b2 SHA512 975022375960d255342c24364513b4352e6eb6ec34ef8f16f8a7c08a978969202660516957eea8f61e4afe13622dec826ad8a5f69673d0cabffb9f52e91e0992
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-2.8.2.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-2.8.2.ebuild
new file mode 100644
index 000000000000..461db8d8fd20
--- /dev/null
+++ b/dev-util/buildbot-console-view/buildbot-console-view-2.8.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="Buildbot console-view plugin"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+IUSE=""
+
+RDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot-grid-view/Manifest b/dev-util/buildbot-grid-view/Manifest
index ba24891079ad..04b94304c77a 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -1,5 +1,7 @@
 DIST buildbot-grid-view-2.7.0.tar.gz 13342 BLAKE2B f37d7466d346c2db4083bdf0226f405fd48dec73306a91a24d77e38ef4f254bfd3a7b64604a5518f4fce5cd83c00ac4788626e06167cc6fc72f1dd4f31ab16b7 SHA512 a2ffa0ada87a2672b8839516bcf571ab8d884c953459b567fd87c8dbe1c65bdccc862d2bcfd4148f91959b1a942afabdacf98f37f2a0374393b57fe8c09aee04
 DIST buildbot-grid-view-2.8.0.tar.gz 13399 BLAKE2B bfecb49fb3f6b0a9b6147625f6214f2b4c3dd76ebb2698af3e49526d0a6a1241ddf519fa8d612c37e5f12f8c11f673db2a2aa4558bd503834ea3f167d880f631 SHA512 2466130b2227de378a005c0cd6086de3d58c96339bd4f662b3da78ee275cc24dad82388b5f7798a20bb921d76e01a69802dca14feff6213677a89a279e93245f
+DIST buildbot-grid-view-2.8.2.tar.gz 13373 BLAKE2B 0a7a73011655e9a57574575943a3560c395ca4358c0f2169def8413a60f8381644512a227b54f016b23e6dcd18641d1ea7a3295f6c0a983c6f3caa9ab1dda60d SHA512 9b136d96f5a38f0d28f6c37db6269e039eca0cff5bbc7d75d43346566ba2e9f7924e453098f4777792429a7a9bbbb5e02c34a9b81e131d40dc3e339f4dd377f1
 EBUILD buildbot-grid-view-2.7.0.ebuild 971 BLAKE2B 4718358889543a5c5080e754545927975ed1ca5b507671e79669c24b42b369f19b2ec9517765886ff5e6acb3644a8adaead1466fbf8e9d02c2bf8f4522555b3d SHA512 393978409823602087a1ea8cc8fbea175eaf17ab21d6958d4ecfc5b41312390bf376899ae92eec450dc04f946bd52a4718fa1a7cd399fe9913e36b3cf56095df
 EBUILD buildbot-grid-view-2.8.0.ebuild 757 BLAKE2B 19309fc37c0f499a196327984a3154e26e289d94dfa3ef194eb8e8901a895411f85a069850995209fed20b55971d5fef2001b409d7e6f58ee58cc3b507ec81ce SHA512 6c34f80ba22ab5c3d33d3b99a9fe4292ae0313a8ebb99bf660c73a228de78c3dde3288c68005f52f5b497c69c04c27f160db8c6550b49609dd9a6b2a8b9d0da9
+EBUILD buildbot-grid-view-2.8.2.ebuild 757 BLAKE2B 19309fc37c0f499a196327984a3154e26e289d94dfa3ef194eb8e8901a895411f85a069850995209fed20b55971d5fef2001b409d7e6f58ee58cc3b507ec81ce SHA512 6c34f80ba22ab5c3d33d3b99a9fe4292ae0313a8ebb99bf660c73a228de78c3dde3288c68005f52f5b497c69c04c27f160db8c6550b49609dd9a6b2a8b9d0da9
 MISC metadata.xml 639 BLAKE2B 563a20f38d4d1476b8833f8e858110adfcf70f9abbe589e5538eac0289ce0d232d5359a111d710b371030342571bab3298e3a2425bc360cecc11d0c976653835 SHA512 5f1f6e27005ff78eb008f4e9a74cac6fb58dc0b73155fa52325b2771f8723691755e5123382a33beb427a4a33c1832f796b56fc94eaafc7eb91c7042546e964d
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-2.8.2.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-2.8.2.ebuild
new file mode 100644
index 000000000000..d598731012b9
--- /dev/null
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-2.8.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="BuildBot grid view web interface"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+IUSE=""
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index cb63f3d0dd3b..0b497330671c 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -1,5 +1,7 @@
 DIST buildbot-pkg-2.7.0.tar.gz 4754 BLAKE2B 568c59e9ba60fb2a221794ea7cba44d0a1fb1f4e41368dfcc9199208733fdacb8052a90b64368e8cf5bd906c02ff2d4fddd65dfe4ea117566f176924d4dec621 SHA512 9a6b67dbee28ed352671c2da3b14a416761f49bee2e77cf7f55936cbd4556e5509a420c13c7d4d88756e01de8e1268e08b43fa48ac0cf6a00dbff8566042a33b
 DIST buildbot-pkg-2.8.0.tar.gz 4768 BLAKE2B c07e7a46681319ebf2d5bdc1a2228218d9b48378cb877277b1e9c88285f4ac4246eea4cea8018d652b8beba01587ccd9c5e25464645f283ba7e8400c7a8efbe4 SHA512 962b1b8c56d15ad3b40148d2802630b34f808d7699747e8c97c9a5f48c7b4cdf6762c4994da4fb1a495ae9fa9fa1e1ee2d5076b4eaeb593f9c2090d2329c03cc
+DIST buildbot-pkg-2.8.2.tar.gz 4736 BLAKE2B afbd5213b51240845f8becfcc727dc3280aa1510dd62305a5e029099da4f8e7cbbf749365baba568a2205354205e97dbdbff78a1740e464164e0c2bbc3148194 SHA512 611b5600df181adfbbe203947c36ad64a99c10c6c63c0f4e65ffd2ae4551f2d879559007b59302434cd1a2ae915a2a7125afb90f6c896110ebf514212434a2a7
 EBUILD buildbot-pkg-2.7.0.ebuild 870 BLAKE2B 4e53bd1ed3e5d0700da2d572dd291212076bc0f647ad1713a04e30816e137790ad918b615670230da705edeae4c99e442096690ca29a11e99776438d401561cb SHA512 f7dcf812c9fd1c2ed17999c7309852c25dd6d85d8a5f9122196d2a346feb6c5e1a196cbec4a9f5cda3efe2b6f0ddc18fd425eb50dea3f74ac67eb7249fcf2de1
 EBUILD buildbot-pkg-2.8.0.ebuild 697 BLAKE2B 180e58c11212eb4959cf774e6b573374d8ef435d10b08e3968479a0d78deac119ed09603fc3f3cc7d097792ba8c4504841d8efc8d54d83df6490c4cf45d1d193 SHA512 ba6850ef6aa66485dc2c1f32b599f17662c93e84e7213ee929946a2d0db4bced437bcf7333860da0089969234743367158c4628ae72e88ad04f0d0e383d6efa7
+EBUILD buildbot-pkg-2.8.2.ebuild 697 BLAKE2B 180e58c11212eb4959cf774e6b573374d8ef435d10b08e3968479a0d78deac119ed09603fc3f3cc7d097792ba8c4504841d8efc8d54d83df6490c4cf45d1d193 SHA512 ba6850ef6aa66485dc2c1f32b599f17662c93e84e7213ee929946a2d0db4bced437bcf7333860da0089969234743367158c4628ae72e88ad04f0d0e383d6efa7
 MISC metadata.xml 1198 BLAKE2B 3b336db0b25b79b1baa060ec52c8451732cb3d7a099c3cf148bc5db4c68276dd72e684b2aa82c50e4eb7aa0fc6b0d88a7e0e2d8a4ab15e423904b19f0102a664 SHA512 c85c49f440cb6fbbc0ddf0d522949d9132e71abac4ace66c93893fb29ccd70b240482f8a33176849889521e082913ed71225e8a4fe663d2602c8d5da3db3b95f
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-2.8.2.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-2.8.2.ebuild
new file mode 100644
index 000000000000..24f94f8cc0d5
--- /dev/null
+++ b/dev-util/buildbot-pkg/buildbot-pkg-2.8.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot common www build tools for packaging releases"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+# No real integration tests for this pkg.
+# all tests are related to making releases and final checks for distribution
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-util/buildbot-waterfall-view/Manifest b/dev-util/buildbot-waterfall-view/Manifest
index 8536f3785f6c..ad9af55c9402 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -1,5 +1,7 @@
 DIST buildbot-waterfall-view-2.7.0.tar.gz 191009 BLAKE2B 1730bc7caef0aa405ea0adf0585ec50f94b162286daa14755b6070af22d417a9a1b756ade226ac9950d7c0f9eed96c22817ba71cce5b6bb9a344c4dbed989c09 SHA512 7327766532062dc5dd09b210914af9d0e1ecffa6a0d94917cfff93274627f5896552fe191003f1895208702f83670f202b4fc735d0d9161c9efa3419dc46b12b
 DIST buildbot-waterfall-view-2.8.0.tar.gz 190508 BLAKE2B 3f406648c44d4717872056a5e4c048bcf50b9c2865427052a920c530ab3da1dfb622513fc12676d60a0553408310a233b591591b447ebe990bae539209fbffe6 SHA512 93b455fcfdb28e32267b77c6a379e59de063bcbd244225cab589b16e688d31184505de0645330ae8d3033014df124f3fb5803d3f0f2b6c941c49727716c820c0
+DIST buildbot-waterfall-view-2.8.2.tar.gz 190551 BLAKE2B 9db81d1cf17357a57c34eb8f3b1e4412635c4804708d3d99646a68293af52594952884f96f7d528c6a87302c3563a8d4f4411ed410da2fe1043b4439d4113d73 SHA512 e252874745a623c1ec8fefcfb10c742a783ec677f172d20ef8165687ec5981f4df09092096f7922381e886f4ea7ba4c795997ad8ff8fd58fd6aa40d8bc057b00
 EBUILD buildbot-waterfall-view-2.7.0.ebuild 950 BLAKE2B 421a2f6c248e518597353a533280a75a21f64d5272b76cfcb9c5d4ff4af2e604397b6fe52febc5871f972fd972842d490d38a3664ef395a072ba6d5396bb6e83 SHA512 5c78349930dd79ea931e126014a8f12f2c5eb013be1926e5bfdb1ce01aa994c1a64cef98d6254852d9921b65b9a253be3aacc480e4a512b1ff04a31edae72828
 EBUILD buildbot-waterfall-view-2.8.0.ebuild 737 BLAKE2B 2605c7faef8d318b3102ce2db0d28697146778a1015cdd6ec2f733e454b60c4d4af6b57d91efc3250344e62a459b77fcbb24f3e700e4b49c3fc914ed91aed7c3 SHA512 86800c7957c85078d5437df0b2d14bd46a02a1c89f5e6a7b1051bf0cc4a1b30ddcb575a818b6d95b3b6c97fe37c9f7e1d401e85be48ee6820cb45266ef5a7ab1
+EBUILD buildbot-waterfall-view-2.8.2.ebuild 737 BLAKE2B 2605c7faef8d318b3102ce2db0d28697146778a1015cdd6ec2f733e454b60c4d4af6b57d91efc3250344e62a459b77fcbb24f3e700e4b49c3fc914ed91aed7c3 SHA512 86800c7957c85078d5437df0b2d14bd46a02a1c89f5e6a7b1051bf0cc4a1b30ddcb575a818b6d95b3b6c97fe37c9f7e1d401e85be48ee6820cb45266ef5a7ab1
 MISC metadata.xml 680 BLAKE2B 47bfc9bb17933438a0c3ec478c1dad7da7f398cde2133ab96c472d0665e563f4d5c8d09ba04bcdccf820603cf3dcc18086b1e217aa86f7ae4d8067178922020b SHA512 266fd7fb76a1373c9342b438487d73a319209f320097981041bae9cf3892dc9d091fd253532457328a3f6f52ec37b0a0e6cd1119c6800de42bf19d7fc6054133
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.2.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.2.ebuild
new file mode 100644
index 000000000000..8e4b9cc0d871
--- /dev/null
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="Buildbot waterfall-view plugin"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+	KEYWORDS="~amd64"
+
+IUSE=""
+
+RDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index 59e8c07ad904..e5dfb63989a3 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -3,7 +3,9 @@ AUX buildbot_worker.confd2 366 BLAKE2B bfd08d2c6ee89c9e9d09e3280ded65765789b701c
 AUX buildbot_worker.initd2 1640 BLAKE2B 17a40547260004b40d77219aefa70f08846741e328a2a20bb0b075d5fa0007cc6ad63ecf600eee49251de14c4abb41f70ca813a9429dbce251509121157da9b9 SHA512 8eae575cb001b4750cd2033f9cb82d3985ad9bc2a4bc20ff0e4aaa0cbd05bacf8d6d885ec08112da15e0ccf8fd895006eed39b0b9a4bcaee86911b5180fab0f2
 DIST buildbot-worker-2.7.0.tar.gz 101075 BLAKE2B 2ee82434f565bef111685712b9b4dd7b0c522de59eefe3eda672827e4bcffae8288c5b9842221b52aa7d5907eeadd4bc5c635382b8c6c4e82977b3c139afdd4b SHA512 bdfce0a7b222fdddbf7830f90c1775e2bded7080e5053b114b7c136b3e114f6c8b26ee4ad802fce66514524e29e863a2f1a4366758c59ebbc6eeadb4b0a271db
 DIST buildbot-worker-2.8.0.tar.gz 102605 BLAKE2B 4cd6d8755803d7649acaf1b45e6632a7a9bddd8a58590a8caa73f686584fedf62d98911a9e148e5a6f34c99b8551cd80c2acbd03fc4f892300cad89a4f68e0b8 SHA512 62f3a72ed7d7ca724b667528e55673c20382ed95abc898dc43e43c5e09bc1d8116eeb2791145097a9b9f7ab2d38a90d974dfbbf5697d8c045a630632ece8512e
+DIST buildbot-worker-2.8.2.tar.gz 101707 BLAKE2B 451dff979c6934bf6dd4e1579abbe18e9cf43551c906bd516c788a6a5f6170650a5468927bec0a8d4ab242e5886247406b2e098e1908a8d9b5777744982c7be6 SHA512 0628825ac023a66cd249dc6b42ff2f3ad3b5c0cb97561fd332ce4775abaa5368a8b7b636115259ab4aa842c811178c9b641ef4453b06167315eb81117ffef815
 EBUILD buildbot-worker-2.7.0.ebuild 4824 BLAKE2B 89494ddf6d8a70d022bea3ee54ea7366cdceb698daa31225ce47b68ae07b3f0546b2607f7c53e7123cf0272c210d94fccd351010a0fb018510dd25fc9006baf5 SHA512 3ba8a04299340a2e372e2455f0e80edd81067281131f9f1673f803ff740ab7cb423ce3c24929bdcc6bbf03e87e99bedcad3f1127cb9bcfd046047dd82e83700e
 EBUILD buildbot-worker-2.8.0.ebuild 4614 BLAKE2B c42112272244fb8a1da208eaa6e3583d98b4465bfa39c2240012eeb4243fd6a5edf59321a54bc72f0918d353a43c0d89062fdeb523b7a5bc9078c6ef86475d80 SHA512 b655a8a68739e287f2f2e4a19ad22f3567801982342d491d0c75e949d0d7671869b0b624d8cf2c1d2f4003eb3a97938d893654c780939de6256f7706556b5bee
+EBUILD buildbot-worker-2.8.2.ebuild 4614 BLAKE2B c42112272244fb8a1da208eaa6e3583d98b4465bfa39c2240012eeb4243fd6a5edf59321a54bc72f0918d353a43c0d89062fdeb523b7a5bc9078c6ef86475d80 SHA512 b655a8a68739e287f2f2e4a19ad22f3567801982342d491d0c75e949d0d7671869b0b624d8cf2c1d2f4003eb3a97938d893654c780939de6256f7706556b5bee
 EBUILD buildbot-worker-9999.ebuild 4619 BLAKE2B a88900d63e3fb4e3b51e31b4736cacd7bc8f60a3aa7f27f6bd6200e9fa788147ad4073d5aea22ec55cc1a54148f87dda3de5f0953cac31f3152fba10d8399012 SHA512 79bdf14db42b15492932d100ee01c3bf043f7ad01dc72d35d68152d95601359aaee73b8661ada31d490218f5081465b7dac5c649aa2a704373e9bbe18426fa3f
 MISC metadata.xml 480 BLAKE2B 5ee99e9a87b5449742a0066a5c720137406a952a63f81574bb7d5cc94f235ee54c1fae5bd13e320e7b017d5005cc45a009360351c987609fe208089ed464cacb SHA512 95b7d71c74d693b93e2d0ff8943d97ffb2d9ea9fb2090bdb5fd8948444237ad20c571b97aa16f0ea5d20cf76e4d8e0392df276a0d1ba39b5263a72c57da3dea0
diff --git a/dev-util/buildbot-worker/buildbot-worker-2.8.2.ebuild b/dev-util/buildbot-worker/buildbot-worker-2.8.2.ebuild
new file mode 100644
index 000000000000..3bd934a50342
--- /dev/null
+++ b/dev-util/buildbot-worker/buildbot-worker-2.8.2.ebuild
@@ -0,0 +1,126 @@
+# 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 readme.gentoo-r1 distutils-r1
+
+DESCRIPTION="BuildBot Worker (slave) Daemon"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
+
+MY_V="${PV/_p/.post}"
+MY_P="${PN}-${MY_V}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/buildbot
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	!<dev-util/buildbot-1.0.0
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/setuptools_trial[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
+		to support starting buildbot_worker through Gentoo's init system. To use this,
+		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
+		Set up your build worker following the documentation, make sure the
+		resulting directories are owned by the \"buildbot\" user and point
+		\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
+		The scripts can	run as a different user if desired."
+}
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman docs/buildbot-worker.1
+
+	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
+	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
+
+	dodir /var/lib/buildbot_worker
+	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn
+		ewarn "More than one instance of a buildbot_worker can be run simultaneously."
+		ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
+		ewarn "is now the common base directory for all instances. If you are migrating from an older"
+		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
+		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
+		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
+		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
+		ewarn "    rc-update add buildbot_worker.myinstance default"
+		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
+		ewarn "Systems using systemd can do the following:"
+		ewarn "    systemctl enable buildbot_worker@myinstance.service"
+		ewarn "    systemctl enable buildbot_worker.target"
+		ewarn "    systemctl start buildbot_worker.target"
+	fi
+}
+
+pkg_config() {
+	local buildworker_path="/var/lib/buildbot_worker"
+	local log_path="/var/log/buildbot_worker"
+
+	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
+	einfo "Press Control-C to abort."
+
+	einfo "Enter the name for the new instance: "
+	read instance_name
+	[[ -z "${instance_name}" ]] && die "Invalid instance name"
+
+	local instance_path="${buildworker_path}/${instance_name}"
+	local instance_log_path="${log_path}/${instance_name}"
+
+	if [[ -e "${instance_path}" ]]; then
+		eerror "The instance with the specified name already exists:"
+		eerror "${instance_path}"
+		die "Instance already exists"
+	fi
+
+	if [[ ! -d "${instance_path}" ]]; then
+		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
+	fi
+	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
+	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
+		|| die "Moving sample configuration failed"
+	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
+		|| die "Unable to create link to init file"
+
+	if [[ ! -d "${instance_log_path}" ]]; then
+		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
+		chown --recursive buildbot:buildbot "${instance_log_path}" \
+			|| die "Setting permissions for instance failed"
+	fi
+	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
+		|| die "Unable to create link to log file"
+
+	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
+	einfo "To change the default settings edit the buildbot.tac file in this directory."
+}
diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest
index 379ef7c13230..b0948e8f6e9f 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -1,5 +1,7 @@
 DIST buildbot-wsgi-dashboards-2.7.0.tar.gz 5573 BLAKE2B e50576da2a86c3f63435c6ca721c0756e1bbe004e82a750d4f0a03799cde4b6c8db7a5199842ce46a835614ccfb588b4eca20035988f54c7d1b6dc9c43f31823 SHA512 018a103fd53f6c3fdca418a46d8576c6b1fd35c05b1cd2ef2dc2c8d30540fbf1528501369246c49d64cfc2d795bcb528fb672f0536a0239f64b87616c50c18c9
 DIST buildbot-wsgi-dashboards-2.8.0.tar.gz 5576 BLAKE2B cad5d728ab7811b6e5f0750dd4e74ad25ac92c72a8e5f58beed0c19ba38de1599f5f5977c087acfbf2a138e41aa927ded54fd7ff9f1719de46560e814bb3320a SHA512 98217a351b0d441ab346d385b8b72333d100c33f40812f2c248a893a31e9ca157cc9e19048ed5a6e49283bdd9dd15ddbf5f16fd9e47ec5a63fedc959a93f1a33
+DIST buildbot-wsgi-dashboards-2.8.2.tar.gz 5566 BLAKE2B 487b816862366acae9e55c39cb440a21c8e5c438299c43e2d6fad049ff946ece5ab647390955fbbad403ad1d7c0a2707a7612129442dc398cc7210d831aa49ef SHA512 2b75a61331aa457b3f168e1955b8905f95d11008ab6bee611ac92488f988cb0cf73fbf92321e594ac0a6e5ae03b82dfa05daab5a0647ae636a96922c0f4e8eff
 EBUILD buildbot-wsgi-dashboards-2.7.0.ebuild 997 BLAKE2B aea4b3352b6a2800846f11d2b2aae38d45cb7900bac975e2eff8dbee47b840fc235da2f6985c1d5396ce7a0a8a99726a09d26b9d357e26e844f410bb8eab4701 SHA512 1e12927a4530ceb2528f84c094e12a2761a5b94df7c3002d2b58cb1a358e4261dbd8480f1c5480866567da8a4b142c54cee26b493404570ab0a44ea697336cdb
 EBUILD buildbot-wsgi-dashboards-2.8.0.ebuild 783 BLAKE2B e86d4cd37741844a6a73194d8dbf87940cc4002db9d29f1d533d9be8f085e051d625369ae2ca4139c70e23e7feceff253c34a3cb659b18138546ac9fba5d6f59 SHA512 2341b355fb3868fc0f488c9a8b378e67b0e9ffcfa973628f235686467623f50c57d1e554f3781ea476a77dcf580bc3399e53d110cd39bd9a364ed83fc1c39884
+EBUILD buildbot-wsgi-dashboards-2.8.2.ebuild 783 BLAKE2B e86d4cd37741844a6a73194d8dbf87940cc4002db9d29f1d533d9be8f085e051d625369ae2ca4139c70e23e7feceff253c34a3cb659b18138546ac9fba5d6f59 SHA512 2341b355fb3868fc0f488c9a8b378e67b0e9ffcfa973628f235686467623f50c57d1e554f3781ea476a77dcf580bc3399e53d110cd39bd9a364ed83fc1c39884
 MISC metadata.xml 679 BLAKE2B 9ce30ea17fc3c2fa7f7c4fba8ad2f521bdf828662683893a8b6e8fc43f4c1ce8fcd8afdb1bc237153751eeb5d134df683b1abe9f0bf7a70f1b6c98517640d3b9 SHA512 47cebf0aa635cee9157445057c21b2d1272b222291874371791656823f75b20f59772ebae2eb1dd8230752808878f284879127650f7130e2b9820ce60fc6d92b
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.2.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.2.ebuild
new file mode 100644
index 000000000000..f124a0ef5c54
--- /dev/null
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index 07eac37f87fa..2aa5d10b9bcc 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -1,5 +1,7 @@
 DIST buildbot-www-2.7.0.tar.gz 3173804 BLAKE2B ac51e6b8c6860dfd98647cacd5a300099bee19b64bb796e8643fab149c96604bb63a565a25eea51dbdc458128cd4c431efbf46069f2ee0adf5f835992d860e5f SHA512 530c2e3926dbec743b9dbc3ed38ba32c421ee265dc5ff48618748a547b0e8da4d7064e6afa379a8187ec189f8031c1e24b99576d276bc5eab4ad1c6a5bc27a84
 DIST buildbot-www-2.8.0.tar.gz 3174211 BLAKE2B 32463f0456ba3fbc5eefd067bcffc4021e1b1dbe95d3a68b1a52c1657317c883a49c6b5baa0696f1bc90c7a519406eb6a4b0797e9c48f28d021cbd4480d80ff9 SHA512 916fe250f14bcc2cfdfe6d54d426c523b6a093e13ec60be65b93e3dcad2bf919d091b9b4ecd797e0d616c8bb6cd02974ee9d66931031d8e614740bb9f816fb16
+DIST buildbot-www-2.8.2.tar.gz 3172352 BLAKE2B 8ead9e9eb046bf773bd70d312ae612dced839b263b02d300f600d066fcf21ef98a7884fef36c494bdc8eb26129d5bf7897c319256f0fe6ef8e1515dc8507a26e SHA512 22d0ccb3e5b3badeb5a59db18dd7b0b925fe84936c1be1773437e899122df95bc9b0a4205a0c87182cf6be4ca4275ab20cb86a4da6098c9d9c73927cb9b3c784
 EBUILD buildbot-www-2.7.0.ebuild 898 BLAKE2B 208e8a8b89a9373a60e34502f08b81b6cd3a3bf93b5fa96b23eeb31b54ffe2a7b68cc22a57400d05688af492658d3141718b4e71a4bc355cf75998d13a22c5f5 SHA512 003cfc4e9a053e4ad986adceba39272293f67a8852658988a0987cf919206e672de274e8aad439b40163cf64480df5bd47e1bfaadb2b849901907a9d38350c54
 EBUILD buildbot-www-2.8.0.ebuild 684 BLAKE2B 039407715092e067fdbce4aa6ec39c384e359947513c1013b2ad85bc50150d2cbbc56936fe1296f15a3187a1df48349c821adbe77ca61d233dfd64b281f363b0 SHA512 22bd07189fb594572729155b7cb57e4d3cd95a81d7b29526835f2434dd7845491c2b9e68c403d0a53b597b31152492ace54a5e71330f3104772a44a2db440fa0
+EBUILD buildbot-www-2.8.2.ebuild 684 BLAKE2B 039407715092e067fdbce4aa6ec39c384e359947513c1013b2ad85bc50150d2cbbc56936fe1296f15a3187a1df48349c821adbe77ca61d233dfd64b281f363b0 SHA512 22bd07189fb594572729155b7cb57e4d3cd95a81d7b29526835f2434dd7845491c2b9e68c403d0a53b597b31152492ace54a5e71330f3104772a44a2db440fa0
 MISC metadata.xml 666 BLAKE2B 2fc8d01c607e9f1fc0de5d151e0256fd7adbc1572d2497126012b0792967dbafe2522b269232a72c5208a5c0a6b9eddb9094afdde5d99d4b27995ad506c08f03 SHA512 1d00795d602f0df5e1dac771d38dc068e80edd098add25231bafb11d0f8d2ce783e884e41c3b0eba1a52fc2dac26a62f4c1c29603e20d6cb0af7c6977f437907
diff --git a/dev-util/buildbot-www/buildbot-www-2.8.2.ebuild b/dev-util/buildbot-www/buildbot-www-2.8.2.ebuild
new file mode 100644
index 000000000000..c5f7aebcb28c
--- /dev/null
+++ b/dev-util/buildbot-www/buildbot-www-2.8.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+DEPEND="
+	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 58009c161898..14aa89c15d2b 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -10,7 +10,9 @@ AUX pypugjs.patch 3631 BLAKE2B 168c865da59c947a00f4025108ff9fdedba55a9ce3a588e7f
 DIST buildbot-2.7.0.tar.gz 3175050 BLAKE2B 0a41eccaa4ca8df6396455049e8c09a1b2fe6cde3072da7fd3715f2769015944e8880f41dbe6750dd7b26bd863fb82f8e8d8c6540f9e1bf3ea4378f11adc973d SHA512 9946fe0b1591d51e5136d9458526918e872174afee79b5f1c333823ef1d2ddae66f017e9b57e26a2451da7ca7672720f32544c606ce5652d0825fae563779669
 DIST buildbot-2.8.0-fakedb.tar.xz 16204 BLAKE2B 741676e2c9117b1ab174ce49747bdfcd07766ad3e471e308398dff476f167fd231b7772c2f02002cbafb27e2ef535242d84d5aa84f4bc8942d4d216b2d5bf1f6 SHA512 c2b00d8621b3a1e521f6c17e902ae331b606dda3d319187895f26629dbdaf50caefc5d49fb150fb780e682ae431515c7ded4950d62448e8a73b8efba821c0fa1
 DIST buildbot-2.8.0.tar.gz 3162882 BLAKE2B 19789f1fe9f572c978a1843a98cd01d752a614d89eb29f2de9db750808d1f96d7893b39d703f37cc0e81e022267c08603c86d59a5902d65194e236f7170d6b30 SHA512 18af8fe1bda6f7014f514bfd112ccf9837194c0e42cbdabaaa6c6202660670964421feff3e92e9dca4cf960f69a4bde9b3666287b54ef7e912284a0471dcc2b6
+DIST buildbot-2.8.2.tar.gz 3181035 BLAKE2B 40a3e424cc03c982549f25993a4abd2fe04bdc089ad22288af4d25724972f9f3541ef32549d2761c808845df44a972b00cf631adfc564bf4852c4b6b6ab14404 SHA512 7d7f15becc7fc1803ae4e9f1906d547c89dfe1efaa51e8fda0674a3d9b060bafbaae4cb671ec844750313247edb73f17c9014c545bce58070df0ca322a0fd9a2
 EBUILD buildbot-2.7.0.ebuild 6974 BLAKE2B 0a847a75805dd0342a55f46640c4f01f9982eefa2cc1aeb00b15c85a5bad0a958761bcc9f508f03545be943e51e2896493c590c69f50e64691480b1916413ff2 SHA512 1e63016e5593a2135c92b2072181fb714d16bc383d88d9fc9513c30ab5a60af6b2bf6d94b2f5c25bfeba31b119ff4e45ab7f5291d950fa373a03e4c1caf6f315
 EBUILD buildbot-2.8.0.ebuild 7458 BLAKE2B 5c5c805eb70bb4eccd7f7283951a6e0c39d0bec01b79866ff8bebcee043ce086faae455feffc722a82373390092edb3a79a0cbc522111fb2b160aec0fdce13f7 SHA512 36ce0b760b6b7705fb8ea1149c1580529bfce1ae1d9ea07ece8b8aa642439f3726ddf79f35e9494b531b533bf0fe98e82d018409f658ba696efb54ea73e91754
+EBUILD buildbot-2.8.2.ebuild 7414 BLAKE2B 8d4647eb94f2adc5492b562943f060087e665594a50b0e0d05d2fe2eeef49f0ae56dd250e65301735d0623c4b88f6b00981507d236e8a23f33f9f5b64d5e616c SHA512 f814f7c19ac342706467fce52c11c51f694bf9dc2c7ffcdbde0d69da8e74eb7683b81f71eabdbec4aaf504016b423ffd7ae9cb126f543657313ce50c1d59a966
 EBUILD buildbot-9999.ebuild 7329 BLAKE2B f53e6293558eae28a68340d8a44bcff355f0498396f350548d6362bd87098da7b0e8279fa9e241ac99a4021b6963264e1905fab3c12e6d00f9124755e256c878 SHA512 e7de2a20e0c287e3646ed1161f34272319ac676e2c90649310dff28a46d026dca2c4ed8dc727ee6d876c925c2586afab8aec261496070602cb9a9c59e61bac2e
 MISC metadata.xml 1359 BLAKE2B 33a6b0f21ad4255f28bc527fb18a384889eb34b2ddc5df5cfa03cc4b1960712b91c787706b95913154300b8e82a5879703dd90d0bf4d796cd6b8bb2a7c4b71cd SHA512 ded6f9cd25bef2df1431b71d5ffc9f0aa3efe9d2f7433cee7800fc27e1f6f76ad64cda9bbc4d3eb3fe0f44dbd7414c75b029f78307925dab5ed06df3d52d86e7
diff --git a/dev-util/buildbot/buildbot-2.8.2.ebuild b/dev-util/buildbot/buildbot-2.8.2.ebuild
new file mode 100644
index 000000000000..3a8aa883913f
--- /dev/null
+++ b/dev-util/buildbot/buildbot-2.8.2.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit readme.gentoo-r1 systemd distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot build automation system"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
+	https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
+
+IUSE="crypt doc docker examples irc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/buildbot
+	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
+	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
+	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
+	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+	crypt? (
+		>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
+		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
+		<dev-python/idna-2.9[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+	)
+	irc? (
+		dev-python/txrequests[${PYTHON_USEDEP}]
+	)
+	docker? (
+		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	doc? (
+		>=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}]
+		<dev-python/sphinx-2.1.0[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+		dev-python/pyenchant[${PYTHON_USEDEP}]
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/pypugjs[${PYTHON_USEDEP}]
+		dev-python/txrequests[${PYTHON_USEDEP}]
+		dev-python/lz4[${PYTHON_USEDEP}]
+		dev-python/treq[${PYTHON_USEDEP}]
+		dev-python/setuptools_trial[${PYTHON_USEDEP}]
+		~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+		~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+		crypt? (
+			>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
+			>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
+			<dev-python/idna-2.9[${PYTHON_USEDEP}]
+			dev-python/service_identity[${PYTHON_USEDEP}]
+		)
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+distutils_enable_tests setup.py
+
+PATCHES=(
+		"${FILESDIR}/pypugjs-2.8.0.patch"
+)
+
+pkg_setup() {
+	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
+		to support starting buildbot through Gentoo's init system. To use this,
+		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
+		The scripts can	run as a different user if desired."
+}
+
+src_compile() {
+	distutils-r1_src_compile
+
+	if use doc; then
+		einfo "Generation of documentation"
+		pushd docs > /dev/null
+		#'man' target is currently broken
+		emake html
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	doman docs/buildbot.1
+
+	if use doc; then
+		HTML_DOCS=( docs/_build/html/ )
+		# TODO: install man pages
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r docs/examples
+	fi
+
+	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
+	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
+	systemd_dounit "${FILESDIR}/buildmaster.target"
+	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
+	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn
+		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
+		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
+		ewarn "is now the common base directory for all instances. If you are migrating from an older"
+		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
+		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
+		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
+		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
+		ewarn "    rc-update add buildmaster.myinstance default"
+		ewarn "    /etc/init.d/buildmaster.myinstance start"
+		ewarn "Systems using systemd can do the following:"
+		ewarn "    systemctl enable buildmaster@myinstance.service"
+		ewarn "    systemctl enable buildmaster.target"
+		ewarn "    systemctl start buildmaster.target"
+		elog
+		elog "Upstream recommends the following when upgrading:"
+		elog "Each time you install a new version of Buildbot, you should run the"
+		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
+		elog "This will add files and fix (or at least detect) incompatibilities between"
+		elog "your old config and the new code."
+	fi
+	elog
+	elog "In order to create a new instance of buildmaster, execute:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_config() {
+	local buildmaster_path="/var/lib/buildmaster"
+	local log_path="/var/log/buildmaster"
+
+	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
+	einfo "Press Control-C to abort."
+
+	einfo "Enter the name for the new instance: "
+	read instance_name
+	[[ -z "${instance_name}" ]] && die "Invalid instance name"
+
+	local instance_path="${buildmaster_path}/${instance_name}"
+	local instance_log_path="${log_path}/${instance_name}"
+
+	if [[ -e "${instance_path}" ]]; then
+		eerror "The instance with the specified name already exists:"
+		eerror "${instance_path}"
+		die "Instance already exists"
+	fi
+
+	local buildbot="/usr/bin/buildbot"
+	if [[ ! -d "${buildmaster_path}" ]]; then
+		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
+	fi
+	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
+	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
+	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
+		|| die "Moving sample configuration failed"
+	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
+		|| die "Unable to create link to init file"
+
+	if [[ ! -d "${instance_log_path}" ]]; then
+		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
+		chown --recursive buildbot:buildbot "${instance_log_path}" \
+			|| die "Setting permissions for instance failed"
+	fi
+	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
+		|| die "Unable to create link to log file"
+
+	einfo "Successfully created a buildmaster instance at ${instance_path}."
+	einfo "To change the default settings edit the master.cfg file in this directory."
+}
diff --git a/dev-util/bustle/Manifest b/dev-util/bustle/Manifest
index 4b1da95ed914..85c8bfe7547f 100644
--- a/dev-util/bustle/Manifest
+++ b/dev-util/bustle/Manifest
@@ -1,10 +1,5 @@
 AUX bustle-0.4.2-restrict-gtk2hs-deps-to-gtkplus2.patch 1780 BLAKE2B 3dabdb99730f9581bd44d5c5ff9930aa57887e830db3226a37f9ba788e46b17e64ceb35f75476872936cc07c42cbda2241fd03a2d3fbb1ab5c3d2a59ece99811 SHA512 b5765864998fb4a65632657630faf499a7ece40e51c396e0055c574f524fef998f226f2bfca00b15b26ee20066ff4fef6627e6d0a94ff3cc9a5bb1b43b493588
 AUX bustle-0.4.7-gtk-0.13.patch 6428 BLAKE2B 20eea89172dbd4ef029ec598be9556721d8a5503aaf6cf1cefa3003e166dd12e1d1be3e41152ba530a49bf8bdd746495797887bb4c3ba9c91df965b3cd54c529 SHA512 49103d8b1019be025f52c2999dbbe34232a0133797a3e4ccc1e82e8ce61da71953c5b9084cdefc6f7cbba19c78032de1fcbd146f695abd07497ce867e5b03aff
-DIST bustle-0.4.0-tests.tar.gz 8340 BLAKE2B 0c0cf10a87c1fea6100828139e9781ff867e6b67490df99f403a7dc6d9665c3973e37c9e8e408549937750b262ff30aadf36658aec56f2f043f1381ac437dbd5 SHA512 c7685496f3a84c1615752ae9aad22202bfe703147441581abe599a5e5055cdef54f27b4e0d01603b23a83a4b42b0595b5538c5b4d65a522a9e76b8d187ae54b1
-DIST bustle-0.4.2.tar.gz 95707 BLAKE2B 12d8c08c7a3f71684831bc27c027db33902cc727d216801448e67ed18b717796038390ee7c63f2faea6e26ad677e618c51f9ad1353d3f54bd334d49fff621b7c SHA512 8a6c1860cb655fc9bd7d42d130d87416c74b988b81749ec8cc1c25cacd3dd4516f59f5cb5954b473c3f6ac32b11853e9bc8881708962144067a0325845dd8562
-DIST bustle-0.4.7.tar.gz 114231 BLAKE2B b783f4363171cab96463519806d18113012da3bdb9040a2394f5ad9cc1c7cfab7030b99ee71f1a5bd4bcd6906ef53f2fbc1eb8c504f3b4a526a9d55e27f2f6ab SHA512 c9b93ffda797a87342f5ba506db3c892bff8084fa0ec5897d676bef5e8367507970ae3e09555cda9b4de0c7b175dc396f2ccfb394d224e64225c0e7ded2164fd
 DIST bustle-0.5.4.tar.gz 122720 BLAKE2B b5a2315919644ab5c7712f9e9bde1bdea226b4e8898981f7150558bde648a5c7965be6ad8484c09727665292e5fe3f0cb545544dbb27f2a2553e513910289620 SHA512 56eaeef831fb5929d57a008ae71d8409048ce5d12eaada98830ef742baf3479264203465d77591cb338374096eac2dc2b68b44f075b2761f16df63fad54b91fd
-EBUILD bustle-0.4.2-r1.ebuild 1561 BLAKE2B 751abf9ca416371fd796a7dd362777780d3b92671d598b5a9da4f15583cad8b02fd9e2133e5a0bb1d89582ff09c36ab6a0698bd027983a6ff579eaac05da5dc9 SHA512 663114e86e31457b71880735a4d82a4cd587b05723b56779cb21c102a21ab405b925c873273fd57517a51fc3a4e47afedb452aaf63a0edf099d1fe4484bba67c
-EBUILD bustle-0.4.7-r1.ebuild 1512 BLAKE2B 210fd9295693ce97923fab2dfabb187c1e6a1b2b6927fd6249f728ed93d54bffa70e8dc06991aa3e63c7694b175816fab9421a0d32c0720bebb0cf69c49c8222 SHA512 60530014106fa0283cf54ecdd6cc26702e6dd9c05777d8ecbb75c61ce200f0c41cfd5540ffd46ed1f9f7233362abb8a0820aee0e70541e4030ebed3966c21f68
 EBUILD bustle-0.5.4.ebuild 1635 BLAKE2B 4e3e075dc2d7ca51a77112a26c86e975681d35f6ba41b5cf2d3b2d074b1d2d5be59f2bb63c713dfa5fbe5c8f6145c87388159060995897062e37de910d00e348 SHA512 f8b263727d6c917fa5a76f6f4462c07310181bac753763ffb44f5633fbdf7b63580f99eae5268e5f29c83df048ae5dfb37bd5aa49984bd6fefcd95e8f9b84af2
 MISC metadata.xml 502 BLAKE2B 3ab482910acd7936501b8c519d2da5c286d493a04afc6d5302989ca5662a4f166d84142489789cd5f5ea4071b5a5e54bc9d0586e6e6fe273f3f2f6f4c44149b8 SHA512 834e9820081006344e30580673ccb789750d1af67807f908b21fc5fe0cf1b8554b32b446aa592c52a1dd26e4d36f2f91c3cff569b8c4797ded9c5c6ea1bfa65d
diff --git a/dev-util/bustle/bustle-0.4.2-r1.ebuild b/dev-util/bustle/bustle-0.4.2-r1.ebuild
deleted file mode 100644
index 18e9dda482c3..000000000000
--- a/dev-util/bustle/bustle-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="bin test-suite"
-inherit base haskell-cabal toolchain-funcs
-
-DESCRIPTION="Draw pretty sequence diagrams of D-Bus traffic"
-HOMEPAGE="http://willthompson.co.uk/bustle/"
-SRC_URI="http://willthompson.co.uk/${PN}/releases/${PV}/${P}.tar.gz https://dev.gentoo.org/~slyfox/bustle-0.4.0-tests.tar.gz"
-
-LICENSE="LGPL-2 GPL-2" # bustle-dbus-monitor.c is GPL-2, rest is LGPL-2
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-		net-libs/libpcap
-		sys-apps/dbus
-		x11-libs/cairo
-		x11-libs/pango
-		gnome-base/libglade:2.0"
-DEPEND="${RDEPEND}
-		test? ( dev-haskell/hunit
-			dev-haskell/quickcheck
-			dev-haskell/test-framework
-			dev-haskell/test-framework-hunit
-		)
-		>=dev-haskell/cabal-1.8
-		dev-haskell/cairo:0
-		>=dev-haskell/dbus-0.10
-		dev-haskell/glib:0
-		>=dev-haskell/gtk-0.12.3:2
-		dev-haskell/mtl
-		dev-haskell/pango:0
-		dev-haskell/parsec
-		dev-haskell/pcap
-		dev-haskell/text
-		>=dev-lang/ghc-6.10.4"
-
-PATCHES=("${FILESDIR}"/${P}-restrict-gtk2hs-deps-to-gtkplus2.patch)
-
-src_compile() {
-	# compile haskell part
-	cabal_src_compile || die "could not build haskell parts"
-
-	# compile C part
-	emake \
-		"CC=$(tc-getCC)" \
-		"CFLAGS=${CFLAGS}" \
-		"CPPFLAGS=${CPPFLAGS}" \
-		"LDFLAGS=${LDFLAGS}"
-}
-
-src_install() {
-	# install haskell part
-	cabal_src_install || die "could not install haskell parts"
-
-	dobin "${S}"/dist/build/bustle-pcap
-
-	dodoc README HACKING NEWS
-}
diff --git a/dev-util/bustle/bustle-0.4.7-r1.ebuild b/dev-util/bustle/bustle-0.4.7-r1.ebuild
deleted file mode 100644
index 1161ffd6eefd..000000000000
--- a/dev-util/bustle/bustle-0.4.7-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="bin test-suite"
-inherit haskell-cabal toolchain-funcs
-
-DESCRIPTION="Draw pretty sequence diagrams of D-Bus traffic"
-HOMEPAGE="http://hackage.haskell.org/package/bustle"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2 GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	net-libs/libpcap
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/pango
-	gnome-base/libglade:2.0"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-	dev-haskell/cairo
-	>=dev-haskell/dbus-0.10
-	dev-haskell/glib
-	>=dev-haskell/gtk-0.13
-	>=dev-haskell/hgettext-0.1.5
-	dev-haskell/mtl
-	>=dev-haskell/pango-0.13
-	dev-haskell/parsec
-	dev-haskell/pcap
-	dev-haskell/setlocale
-	dev-haskell/text
-	>=dev-lang/ghc-6.12.1
-	virtual/pkgconfig
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gtk-0.13.patch
-}
-
-src_compile() {
-	# compile haskell part
-	cabal_src_compile || die "could not build haskell parts"
-
-	# compile C part
-	emake \
-		"CC=$(tc-getCC)" \
-		"CFLAGS=${CFLAGS}" \
-		"CPPFLAGS=${CPPFLAGS}" \
-		"LDFLAGS=${LDFLAGS}"
-}
-
-src_install() {
-	# install haskell part
-	cabal_src_install || die "could not install haskell parts"
-
-	dobin "${S}"/dist/build/bustle-pcap
-	doman bustle-pcap.1
-	dodoc README HACKING NEWS
-}
diff --git a/dev-util/cbindgen/Manifest b/dev-util/cbindgen/Manifest
index 8d2a6d94afbb..2f521b809957 100644
--- a/dev-util/cbindgen/Manifest
+++ b/dev-util/cbindgen/Manifest
@@ -3,6 +3,7 @@ DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST c2-chacha-0.2.3.crate 13336 BLAKE2B 0b548907ce4c9ee502ec96307ca003d168e8bcf9007ec667661d158f33de36fc2e832cb3c36cadc2523f6ba8b9aeff4dcb16e7f95a9a34ae02e8bd5d00f65cf2 SHA512 302498f75d1befdb8bf8b61d0eff2762f0e86000c3909d819a377be2fec72e830bfb4530e24059906b499cef17ab56229f5627fb998ad9ba34a7c6c0de748538
 DIST cbindgen-0.14.2.crate 165699 BLAKE2B c0964a66b3ef57a6eccaef83c7cd8a500605be0cb5bb0f571b5d35a2f924613fec3b4ee77190b74203057488c2402c6a11680ddbf395dca00baa5e69bf18210b SHA512 d3ab0a4c217c9047bc3ada7911d4ae1bdfc09092835f78d232bb56ef0d9a499df43e358532dfb828a04df61a0cacccd7e57214cd15f466791eb1b8edd9f92ed0
+DIST cbindgen-0.14.3.crate 165874 BLAKE2B 0155bccbacc70a2f8173117dde46c3bb48e07d0a0616b53ea56cade436cb6da1aa7106a82bf4ac55954cafbea1790f9200bdd3132032d3306ec755be0bb2f05c SHA512 abce798aff93260c28b0717df5fd25cf24b3eb89c9d05df4832d06169ec30db8e1c17a300f88087c6fbd4414a6aae6788e162dde838aac01c499afcb145c8461
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST getrandom-0.1.13.crate 24581 BLAKE2B a61df4369526f860eef6952a021c3f473562cc4171c373c105d8944c305370592cd98a6c28cc0f8d00496f6b47cb900a4498dad942d0b6f60b4d8163d8904f14 SHA512 534b01d28bc9e69a5ad1e84f34aa4154939c27d70c5f557f15e669fa8894c375486ee945a6a6d8adaf1b6b7accda0e24963f70e77dd51ee0638a6ae6daa38925
@@ -37,4 +38,5 @@ DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD cbindgen-0.14.2.ebuild 965 BLAKE2B 311220957f3598f4396f909942f788ee38e319825cef2fec927a83863f4c3b3b8aa83b78842e57d61e429e722baf4ae03ffa9f40ab65f543e1f31737c97bffe0 SHA512 64e24aa2e6714fd5d44011131f6b775e1daa7a1ca5a23a28f680a7edcfef3b28d99980ff39f072951ca49d1c71452f2066dc5449b199f7fc20612636dbfb42e4
+EBUILD cbindgen-0.14.3.ebuild 968 BLAKE2B 63506fd9c6e73f304b8e0179b7f6057a8673d58f9aba66b15fa6f23369abecb72cceb37d019661f9e2ebd23db2af909e195c5d6bb9392ed6f4d14f3c872a16b6 SHA512 9e07009c498cbc1731d437a54da5a50f278eb915b65381685911dce66de9debe4aa2f04676cb9fa4ef7ae35ac08d0724fac2cd3cdd1d82b325be5a02efe51d31
 MISC metadata.xml 334 BLAKE2B 5d7ffa9456ed3cca80fc3089f9bd508e652c600b8b013d03946b674409e45cd2ff52030e8c6a1dbc8fed2aef4caa9ab697c5a0a1b2fb4f0d8b44cf3c40d92f05 SHA512 a5e105a59463430347e5a44e36b8249faa1e84c73ae4e7fced96be371a7a59539d57accbf51065e9e5cf7e8108f69ab28d23f250182ba755e49a67991f4ff029
diff --git a/dev-util/cbindgen/cbindgen-0.14.3.ebuild b/dev-util/cbindgen/cbindgen-0.14.3.ebuild
new file mode 100644
index 000000000000..1a72d3a19dcf
--- /dev/null
+++ b/dev-util/cbindgen/cbindgen-0.14.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2017-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CRATES="
+ansi_term-0.11.0
+atty-0.2.13
+bitflags-1.2.1
+c2-chacha-0.2.3
+cbindgen-0.14.3
+cfg-if-0.1.10
+clap-2.33.0
+getrandom-0.1.13
+heck-0.3.1
+itoa-0.4.4
+libc-0.2.66
+log-0.4.8
+ppv-lite86-0.2.6
+proc-macro2-1.0.6
+quote-1.0.2
+rand-0.7.2
+rand_chacha-0.2.1
+rand_core-0.5.1
+rand_hc-0.2.0
+redox_syscall-0.1.56
+remove_dir_all-0.5.2
+ryu-1.0.2
+serde-1.0.104
+serde_derive-1.0.104
+serde_json-1.0.44
+strsim-0.8.0
+syn-1.0.11
+tempfile-3.1.0
+textwrap-0.11.0
+toml-0.5.5
+unicode-segmentation-1.6.0
+unicode-width-0.1.7
+unicode-xid-0.2.0
+vec_map-0.8.1
+wasi-0.7.0
+winapi-0.3.8
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="A tool for generating C bindings to Rust code"
+HOMEPAGE="https://github.com/eqrion/cbindgen/"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+LICENSE="MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index d39c67d5ef8c..e76e739a93ee 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,7 +1,10 @@
 AUX ccache-3.5-nvcc-test.patch 262 BLAKE2B b33b6372e8e6c597d7ed6c781f0a3ac22c435d1309fe387e62c5f9b61c783294ec81cfd1c8a0afc60e63148dcc89f95ebc6d313a0567431a8d05c96e3d59bae1 SHA512 651e26335df8eb551f95064d67925d6e7dd15c8a082b291cdea31fcbc2e5482b2358de71c205c668173b3dc5a75ef004d95dbdd92391e4a4aa6bc1283f5f3a72
+AUX ccache-3.7.10-objdump.patch 392 BLAKE2B 6c15a165aff5b2633b0c3571f8f89a3480d5608b006f9f3c0a80117d5c94039fc3e631d0f54c870df1904ac5c855d11007fb73178be8df7001be4f414d103ede SHA512 94f291d44a64ed9aff04da39467751aaf84262fd987c63e53213cbdedbaf30c36ff0aa0902e73418846153e8cdf5a912b021adf7c122bea9698cb296faa9ebf6
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
+DIST ccache-3.7.10.tar.xz 353792 BLAKE2B d7c06ee55a79afb4b72cdc20ec3d6413a5417301c63a0c822a4f82e6b9542c7a9cdf9f1bbd60a4698c335fdddfadcb9d674bff02c6dad1c2df9932212fdf6477 SHA512 64b0d42af7fd2dfdda65668b04dbd16807a22324e336e61f6c6a91c00110fb535c7ac9062a9c14c924a7ddaf42247f69a43d83dd0fd187ce3b0737158b5bb8fc
 DIST ccache-3.7.7.tar.xz 351592 BLAKE2B 0b211cb77ceb42b7ee5dfcde98d9f53bf222cf18b8d38a7cf6fc9631c5e1c79ca82e6d0a0dbacfe2d5f61b2acefebe202e06fc3b8035f0f25a5f9954554a18cd SHA512 f93380aeb45e815964abc3b62f1963abafe22e0c6a7b61d039e710c7f935221e02678e21af65add4fd59fd5a141824ab95f4a7afc8dd557de36737c365cab816
 DIST ccache-3.7.9.tar.xz 352948 BLAKE2B 791491c3f9da58f06bb0a58e411d9a7b3e39e460102793ef736820913d43d488ce7daffba572c21f507ea78d8da04edc3aaa47eb1a0fbec8cb35461a60b770e9 SHA512 5d39baeb66265451b0e9cef250f6d9c5f6869cd87e27c108c9a50bef80050122ed4280ff662a81bba8d1d1311f2004bcaf9ada6b783a42eedc67ca01ebc48bb4
+EBUILD ccache-3.7.10.ebuild 1531 BLAKE2B d1583ac3d2283f44e9feacef08092cf7852ebbbccf35ac82df08f48be3046aa0c89bbb7084d0b77b31c135e350c7f5528bab63c9663db5fc1918ff7d71199a18 SHA512 c1f7d9466122f2c77925cf885c7ef08c596589e7cf005416f169bd9b65eb387448d32fafebc7908d4c15bb3fd5a10b24e48fc45db0b48dcfcf1a70d52f5042d8
 EBUILD ccache-3.7.7-r1.ebuild 2204 BLAKE2B 168006b6402a929a5c4367d98fafcfac1f6bb0a4ae11c2aa495cc6c326a7ff21cedc81204451ffa592b1b6f04150aa7923f0eff851ad502496bc101641f7ae0c SHA512 f60bdfe797f15da5ce90a784029dce92971bd15b90e91d1503ff2da78d8ef6d57a9b98ffa75c1f9565f4e5a71bc09e0be58946a0613d3fe2fdbb20d1797c8ccf
 EBUILD ccache-3.7.9.ebuild 1419 BLAKE2B 6f248e8069578a8fd82ff7c425978c3656d45943e77c611d663cb3d63ca3ac526cba14d410dc3a3a5f46a140733d8fefc0b7580504b9008fc97c963c47669ce9 SHA512 c218ae20057eebf4242b51c5b3fa4dd6e3e9bc43428d4ecdff197773c80a6967c81e3df246c298c89cb028dff9caeba6c190e897bc60cc772445d43519444c0e
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.7.10.ebuild b/dev-util/ccache/ccache-3.7.10.ebuild
new file mode 100644
index 000000000000..900d8f39d692
--- /dev/null
+++ b/dev-util/ccache/ccache-3.7.10.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="fast compiler cache"
+HOMEPAGE="https://ccache.dev/"
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+
+DEPEND="app-arch/xz-utils
+	sys-libs/zlib"
+RDEPEND="${DEPEND}
+	dev-util/shadowman
+	sys-apps/gentoo-functions"
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+="
+	test? ( dev-libs/elfutils )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+	"${FILESDIR}"/${P}-objdump.patch
+)
+
+src_prepare() {
+	default
+
+	sed \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-3 > ccache-config || die
+
+	# mainly used in tests
+	tc-export OBJDUMP
+}
+
+src_configure() {
+	econf --without-bundled-zlib
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_test() {
+	emake check V=1
+}
+
+src_install() {
+	DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+	default
+
+	dobin ccache-config
+	insinto /usr/share/shadowman/tools
+	newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then
+		eselect compiler-shadow remove ccache
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${ROOT:-/} == / ]]; then
+		eselect compiler-shadow update ccache
+	fi
+}
diff --git a/dev-util/ccache/files/ccache-3.7.10-objdump.patch b/dev-util/ccache/files/ccache-3.7.10-objdump.patch
new file mode 100644
index 000000000000..bad334a5c546
--- /dev/null
+++ b/dev-util/ccache/files/ccache-3.7.10-objdump.patch
@@ -0,0 +1,15 @@
+Allow ${CHOST}-objdump (or any other override)
+--- a/test/suites/debug_prefix_map.bash
++++ b/test/suites/debug_prefix_map.bash
+@@ -24,9 +24,9 @@ objdump_cmd() {
+     if $HOST_OS_APPLE; then
+         xcrun dwarfdump -r0 $1
+     elif $HOST_OS_FREEBSD; then
+-        objdump -W $1
++        ${OBJDUMP-objdump} -W $1
+     else
+-        objdump -g $1
++        ${OBJDUMP-objdump} -g $1
+     fi
+ }
+ 
diff --git a/dev-util/chroot-wrapper/Manifest b/dev-util/chroot-wrapper/Manifest
new file mode 100644
index 000000000000..c85f6df9ab54
--- /dev/null
+++ b/dev-util/chroot-wrapper/Manifest
@@ -0,0 +1,3 @@
+DIST chroot-wrapper-0.9.1.tar.gz 12166 BLAKE2B 526c4c5630d603e726b27782433a19c67582afdae29e5775a34a5bc0e7ccff78523ad548f4645394863b1742e4f71a3755b1c371979470933eaa99a301623020 SHA512 c558f4abd14b083f4553cacd418de548cce1d73d46706485c57dc23fd3c8d7130933d50408a78bf621b39bbd9dc77dfbd1dbe5677e371dee5bf7840bc0fa645a
+EBUILD chroot-wrapper-0.9.1.ebuild 570 BLAKE2B baa678734074096c7f9bdc6bb2e0785233b93f81cb798a5a6bd30243b1fec1cbceb08315831422f83d065e212f7a3d07d9d7dd2542849195156db773408e7368 SHA512 1aacef74db849d5ee582e0a6044680af2f7959fbddd9f09ee215bf9a9f50552f388245fb27a9ed76c4a2ada8289d63d9d82d2f51d5fc1b1772fe8bde42bf7920
+MISC metadata.xml 249 BLAKE2B 51ba583d3f040316570785a91020f260c7eacf5a322cc4b905648f547f06f413976d1834f7f010db5b6183aad6d6503f9bccb21e74508b5a5af1a5d96e82c805 SHA512 276a98a5eb50222440ab5bba11bfc895a0f89be2c2f2e561214b97b6138fe7c4341f6ca1fcb29bc03fa5a89844ede7f82a942c20ed649ce3e7da459a1b2481d5
diff --git a/dev-util/chroot-wrapper/chroot-wrapper-0.9.1.ebuild b/dev-util/chroot-wrapper/chroot-wrapper-0.9.1.ebuild
new file mode 100644
index 000000000000..d5e93afab40d
--- /dev/null
+++ b/dev-util/chroot-wrapper/chroot-wrapper-0.9.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info
+
+DESCRIPTION="Wrapper for chroot to set up some bind mounts, namespaces, and control groups"
+HOMEPAGE="https://github.com/chutz/chroot-wrapper"
+SRC_URI="https://github.com/chutz/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=app-shells/bash-5.0
+	sys-apps/util-linux
+	sys-apps/coreutils
+"
+
+CONFIG_CHECK="
+	~TMPFS
+	~IPC_NS
+	~UTS_NS
+"
+
+src_install() {
+	newsbin src/chroot-wrapper chr
+}
diff --git a/dev-util/chroot-wrapper/metadata.xml b/dev-util/chroot-wrapper/metadata.xml
new file mode 100644
index 000000000000..126b9ca42a25
--- /dev/null
+++ b/dev-util/chroot-wrapper/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">
+		<name>Patrick McLean</name>
+		<email>chutzpah@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/cucumber-cucumber-expressions/Manifest b/dev-util/cucumber-cucumber-expressions/Manifest
index 6707edd05772..fe66312b878d 100644
--- a/dev-util/cucumber-cucumber-expressions/Manifest
+++ b/dev-util/cucumber-cucumber-expressions/Manifest
@@ -1,3 +1,5 @@
 DIST cucumber-cucumber-expressions-10.2.0.gem 22528 BLAKE2B beff2fb2229154f8bec7942be4679b876243f65621747482669041aafed099e27ca78f2696d67a39b0b05b3139a6eb1b0bc8da4a045724892a9e0656ee98dcc8 SHA512 9996bc084d10a56f7efe70220b4a0496fb540e4f288c1819be458d6e9e58443749dfb5e1ba6c6bfd36a95a8de51067cf27285ad175ebc9e0404233fdd4bfdba2
+DIST cucumber-cucumber-expressions-10.2.1.gem 23040 BLAKE2B 590f54eff3054a9d0e7e80732912b41fd314041578c0f4758a6fb0e175b7177f849dfdcd2eb32be5ab9ca4fbb282121c5ef0e2b18a0e66f287ade71acaff9cd3 SHA512 6f3ce32b70150d029febfa97d5bea5acbe7a59e588fa1f0b9961c6c64ca667a53514e2eaa6bf1160de916cc094f82aa341b03273f05fc54019bdb4e0940a3d02
 EBUILD cucumber-cucumber-expressions-10.2.0.ebuild 482 BLAKE2B 38b52c2ab5403e58f9b53d7922ec0e4b5013436490ff84bf424709f497f98fa8b916b194fb3ac0a070cca1e17ad2d6d10f4623b4d000e863e1849268bf190ccf SHA512 8d1885a702f9536a3f0c25977f7d34ca22285e849f5a2d34ae1704fab8b8c8b430065386ebc6778bb3b82c73574cfaad49198ea3d746f708b3426f67b7e5f3f6
+EBUILD cucumber-cucumber-expressions-10.2.1.ebuild 475 BLAKE2B 200a330f113a55b51d98ad04636633b38a369ad76fdd2b20d11fc609b904f40a3bb6ffc107877ec670843aebc9e5f065574916a6d5374754e480a9cff84097df SHA512 fbcc950bcb316eecfffbcdd4addc9a64a7c3c280bab6eb56bae67e5a6ba0973ccef92beeba9653c7310de441488776ef70fbd87852e4dba88c5ca663ec3f6ae1
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-10.2.1.ebuild b/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-10.2.1.ebuild
new file mode 100644
index 000000000000..10db2f04fa4f
--- /dev/null
+++ b/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-10.2.1.ebuild
@@ -0,0 +1,17 @@
+# 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_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="a simpler alternative to Regular Expressions"
+HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
+LICENSE="MIT"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+SLOT="$(ver_cut 1)"
diff --git a/dev-util/cucumber-rails/Manifest b/dev-util/cucumber-rails/Manifest
index 6ce0cfc98b14..0a289d0c4c3b 100644
--- a/dev-util/cucumber-rails/Manifest
+++ b/dev-util/cucumber-rails/Manifest
@@ -1,5 +1,7 @@
 DIST cucumber-rails-1.8.0.gem 43008 BLAKE2B ac2fbc89ea952add031429b281986de37b3a8511e398b34d49435c70221b3c454589c51acd5b1fcecdf0285a8e446d4c2c0e0a77216eb78f8fa222086fb6db36 SHA512 757f50719309418353cf1e6b42902ce6166806d2e2a9cd1a27842ffde3d8ce61af97de12f4ffa9e31a50693cc8c40ece9a74e5ec91973096e77860b56034d439
 DIST cucumber-rails-2.0.0.gem 41984 BLAKE2B e6dd46d1957478ede25ff226d7423d54fa6aa187f398483815fd9504b23308aca01d5336b62eca152e5384fbf23328d0cd1cd6d1200cd61dc4319508353a7b59 SHA512 d48472b4c6694c612a46ade99fa20add1ee1699cbcd14ddb91c0dcadab25c0f4c18c2f22f713ed8a00dcf765d583d4f46b7e9c99b0f94f0521296e3e4846ed95
+DIST cucumber-rails-2.1.0.gem 42496 BLAKE2B 7e2862ddb006becd6e74374e2075c9ac7aadc62600985c9742af76c90ede6a1506d714d7dd82ad364c2f70ce102f424471fadf9431253aee7937c2d9ee2e591e SHA512 43b7f09ec5829c4ce86579c5840830f6a3effb956cefa661ed66362bd2f71c1ebd97f90414198c8120df25803b309af94a6ab529f8ed48ecc7994e33cf49d26a
 EBUILD cucumber-rails-1.8.0.ebuild 1184 BLAKE2B 418d8325a0cd90834c31ef87e86d3fb7a7a8b6602fb73546e4c8b9cc86c492e6556055d5ef8bb2fdac12b97f9cd6b53594cf45e4892f8b356a209aaf57c3688c SHA512 fa921b40e01409ab7f3da2b5dc9b781059a2c8d05f6ef9d4e94360005f58e601d99423aae349af78c23ec17e390728f716375ac80784b2065e5c23d5f4ee91e8
 EBUILD cucumber-rails-2.0.0-r1.ebuild 1221 BLAKE2B c23a7bb31a02af2f57ddfa1820eae96c175ccd87bf7d15f74de8d0d824a6ae678b99bf1ea2bfbc8ac6f332f908418fa9ffd38739997ebb553495fcce5c0fec26 SHA512 8cc97442c6650b734bc458dcc972e6391994269a5ee03dea633548edae0b15e5e6782c06372b576d0673086bc852bbbf737235c9ec7ae3356ededf7a826e09b5
+EBUILD cucumber-rails-2.1.0.ebuild 1208 BLAKE2B ef4ed22a7df3bbdc445893f3a28d8be3b7bad1c1fdb7bbe4464c236d4c8da717c1be26ce65d1c03b6bd4ea75263421650c56509bcd8cd8d92c78b281e18e6f2b SHA512 890e64004bf2b4f84c11f3555e1246a0dfe4efe5c71ab9c660e289d9cf277acccabb0942290d2a197d6963c06917c97609c4ee663c86c5492bd2c70599f31609
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-rails/cucumber-rails-2.1.0.ebuild b/dev-util/cucumber-rails/cucumber-rails-2.1.0.ebuild
new file mode 100644
index 000000000000..22e786917fea
--- /dev/null
+++ b/dev-util/cucumber-rails/cucumber-rails-2.1.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+# There are also cucumber features. They require a Rails project with
+# factory girl which we don't have packaged yet.
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber-rails.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios for Rails"
+HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+# Restrict tests since Appraisal is now mandatory to manage different
+# rails versions, even for the specs.
+RESTRICT="test"
+#ruby_add_bdepend "
+#	test? (
+#		>=dev-ruby/ammeter-0.2.2
+#		>=dev-ruby/rspec-rails-2.7.0:2
+#	)"
+
+ruby_add_rdepend "
+	>=dev-util/cucumber-3.0.2 <dev-util/cucumber-5
+	>=dev-ruby/nokogiri-1.8
+	>=dev-ruby/capybara-2.12:* <dev-ruby/capybara-4:*
+	>=dev-ruby/rails-4.2:* <dev-ruby/rails-7:*
+	>=dev-ruby/mime-types-2.0:* <dev-ruby/mime-types-4:*"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '/git ls/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index 38cef08b0a99..50eaf0930252 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -6,5 +6,5 @@ DIST devices.tar.gz 47835 BLAKE2B 03bfe097fda12a7a0aa19d3308c0d44382ad945defea05
 EBUILD debootstrap-1.0.115.ebuild 1168 BLAKE2B 9a61918f4a713360d63fa16b54abfb0bf6570b7551763a05652c190d1f1fb1256d154b16d99f82c6a6067adecea19e9ad6560fdba9caccd1a7d1076b6178bc8d SHA512 532a18dd5662d3f40b26941e8211090de602c655ea557d998431092aeec77f3e41c65919a265a1c367a5f269da5cf9ab354d86824c00a11b3175a804acdcbaf2
 EBUILD debootstrap-1.0.116.ebuild 1175 BLAKE2B cccd238e7c0069376c7e3265113d1f18a0e307c8812e0e74da55b38dadeb3bdd57aaaa5c8203856053b1333198d8ed803fbeefc45e923ccd1556b23d1bf44721 SHA512 59a8f2bc22d53358247c82784f8461c7908ce65bd74ba119f7e840aa599fb9c5cc7ca0d4772a5bff8b47b14d866431c7e2d05b94743007691f4ccc02d7dd5225
 EBUILD debootstrap-1.0.117.ebuild 1175 BLAKE2B cccd238e7c0069376c7e3265113d1f18a0e307c8812e0e74da55b38dadeb3bdd57aaaa5c8203856053b1333198d8ed803fbeefc45e923ccd1556b23d1bf44721 SHA512 59a8f2bc22d53358247c82784f8461c7908ce65bd74ba119f7e840aa599fb9c5cc7ca0d4772a5bff8b47b14d866431c7e2d05b94743007691f4ccc02d7dd5225
-EBUILD debootstrap-1.0.123.ebuild 1194 BLAKE2B 93d11f54b4432c91f748c0211c962cb509aadc7b84c1613db70303f4ee4eb5ef2355eea4c5c9a62659aafc250dad0cb64a6eb094499f41c84287e3f625babef3 SHA512 94e5dcc182f32647c89d4dbc7ae96cc0d57bdae380cd5e4b1a40a5461a7a5adc979b6ac52af94c520b37b415c7c20e817ea13d3a133180813b364cd28ea0f59f
+EBUILD debootstrap-1.0.123.ebuild 1201 BLAKE2B 878a39bc4220fc8c46fde54cd64f6459749f064b164fb0ed2b08b3e79b70bcf77fea79e9d8604a43c23515cbeb7353eb6d1d78ceae23fea4931ac54aa24d39c2 SHA512 8b659771742077fa67d4d9e66ccdaea2ca93a3ea6934ad37f83c4b74815d13469e38c275f865b3b195e8d09c87c9f8d28e3b6205a3569f653f232afd88760c11
 MISC metadata.xml 258 BLAKE2B c36fff5f8f795a075268afaf56f3ca4d8c75dc6997bd32bf2dade7b1903a27eb31a1f3c248b60fafcf77024a9300e8d0a6f8b5a6ace6aefbbec9374a295c430b SHA512 07739557f72a6f241bb1d2e4f61ca138e5dab6996ccaa4b4072057f0aa3ad2adfdfffe65683becd9d467729efc574bf158d846a8b3a7782cb180a13f0033b6b0
diff --git a/dev-util/debootstrap/debootstrap-1.0.123.ebuild b/dev-util/debootstrap/debootstrap-1.0.123.ebuild
index 8ac0c3265c7f..5149fd9864e5 100644
--- a/dev-util/debootstrap/debootstrap-1.0.123.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.123.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~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"
 
 RDEPEND="
 	app-arch/dpkg
diff --git a/dev-util/dejagnu/Manifest b/dev-util/dejagnu/Manifest
index ba3a3aa61cca..d7b2e33f0116 100644
--- a/dev-util/dejagnu/Manifest
+++ b/dev-util/dejagnu/Manifest
@@ -1,5 +1,5 @@
 DIST dejagnu-1.6.2.tar.gz 525879 BLAKE2B 1a4cf8bea350d7fca8983fe9f5f77756746e9ef81a06e2bc733a9fa32f54e3c791f28d80ab563306df4082f2d5f9f30b87f1380b57b15213bf401783e5384dde SHA512 ae527ce245871d49b84773d0d14b1ea6b2316c88097eeb84091a3aa885ff007eeaa1cd9c5b002d94a956d218451079b5e170561ffa43a291d9d82283aa834042
 DIST dejagnu-1.6.tar.gz 523969 BLAKE2B 1cc9498aacd681570cd8d8834cd2fe0594bb49e6664cfe934b824dba0bd4a6766f977de6a1dc4596095a11d68844873f5687000423f4928f0432981023d26451 SHA512 a494dd5cde8d275b397116049c93e183f5f1731d63660ee8d2f4263b099fc5be7fbddde927fab3ccd5f000c43d50242f94bbb4d95497b915ea53be418bc145bc
-EBUILD dejagnu-1.6.2.ebuild 509 BLAKE2B 556079a425d5f7d5b875baf02c79950c1ef1ff8d0d030b4a18055d1d9c9c56583989fcc2e3d01bdbe3c01bae2c125e0e77455717f4d514a6b1284ea936568195 SHA512 9e371c5da0a0d8c9bdaab698bc2ff17e3bd815bcab7470351084f9a1e0edf84670e6488d5e9088db8229872737e542779bd3d14988d4f648e7aa2342ea7d2812
+EBUILD dejagnu-1.6.2.ebuild 501 BLAKE2B 5d08fbd32e0c747dd713db5df09d624e4405b27cbfcca94b9eb5f0276296866f27dcc03bb603b69a2cc718b2b1718c66afe15a38a1e691993a1b3bb954f486a4 SHA512 0d628d8b0c4fc49c37a40dc76b8394b09956a97e26af1fbfc5df896e7d94ada825f3a5a09333562a5585a7ed2172b7d9c6868a4fca594b7352d8b9ee66fabd46
 EBUILD dejagnu-1.6.ebuild 716 BLAKE2B 9c340eb716f73cb9d7387867dbe330dd6673f9e4ce0140ee3446e6acc01f960e8c589281480b22c99744c60c9e378b1b0c83cdded35844c758f306f31a882b5d SHA512 28faea8246eb42c74e33d65036234643b4fdf647ffbe57d10bb3c5225721afbf35de20a7f2dc9ef621a7861d8965dfb437c5b6b9f6c622fec633ea06e58780cf
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-util/dejagnu/dejagnu-1.6.2.ebuild b/dev-util/dejagnu/dejagnu-1.6.2.ebuild
index fc736f0e1e48..c38a0a001a68 100644
--- a/dev-util/dejagnu/dejagnu-1.6.2.ebuild
+++ b/dev-util/dejagnu/dejagnu-1.6.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/tcl
diff --git a/dev-util/desktop-file-utils/Manifest b/dev-util/desktop-file-utils/Manifest
index 1f0fb20b4944..62b64b38c129 100644
--- a/dev-util/desktop-file-utils/Manifest
+++ b/dev-util/desktop-file-utils/Manifest
@@ -1,4 +1,6 @@
 AUX 50desktop-file-utils-gentoo.el 250 BLAKE2B 6778fd6faecc6afe376598cdab5d890364edc33f0a55983b9a1ae76bcaf78a784fae92eaa66dc24c270ecf160f747e848872fa17e9c331dce7ad2deb498492b1 SHA512 5fc03fb9c9eea7d4c19c9b263413fb4f7f247b6bd40a7452b26f7e175646dc9b3af945d25cafc42a01a8d95059324652c56baa4bb5768b62dbd58f3ae4f05fe3
 DIST desktop-file-utils-0.24.tar.xz 137424 BLAKE2B 3cce27caa14782ef10886fdc0602c0378c1bad0d49a4b99077436a9951f13ccdb539fdc2b9d27b54430fce94fb0ee0268746b216cc5d6c1b9ba517e1af81b4ce SHA512 b19d700d4403c8757c62e49bb7650e0138a85e799f79de07b0d0099a52398a3ead90c8125ccc883df6e2a3f8f5f97696009ebb7452dc7acc25afeef20e06fde0
+DIST desktop-file-utils-0.26.tar.xz 83132 BLAKE2B fdbe5427a0278ebe4a9b1bc15a148ecdc3f54b54058b355ae4f9a962fb1c4ec309d24a075973caf8f187a1c74b013e9bed0a7c3668bf888274e77fac9e077ec8 SHA512 5b4e435f0b635d8f898ac7f5759f74a08ffbe2a56d41fee0e84ff57e73b98d08b57b4416f20b99f696dad8bcb1c20792b39acf836b0814220c0b386ea5f6b831
 EBUILD desktop-file-utils-0.24.ebuild 1287 BLAKE2B 7ac58a5fc22f86c48162d3ef0c5f5471031a36294d8e9a68c1bc6643db4bcabb51e0ad581115e18df0e97c1b119d9c0b65737c617f6cdd3dbb984c7c90e81fd5 SHA512 09ee0891f66b52b89f6f45e909c579408cb36f0e8e535636444ab82424cb1c93f89d9cebf48c141f8bd9322c362e3948a5bc6cc3d0e844d1d8d8cb758f129870
+EBUILD desktop-file-utils-0.26.ebuild 1168 BLAKE2B c08a06d6431c05bc1372593d4d1e4ecdfbb55febd338a60904fb21682534118183e31338f1be5425cff31aeced160c4551f4bc4e9874abe77da3a1e2cb370c05 SHA512 81cd3af901129f6e1f78f2fa140244e8e684e65230954a7871ef195f845eaceb4ad5a977a755a092f45c3b29c1b017113b44ae1a8c949fee63964072207ae861
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.26.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.26.ebuild
new file mode 100644
index 000000000000..c25251a74beb
--- /dev/null
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.26.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit elisp-common meson
+
+DESCRIPTION="Command line utilities to work with desktop menu entries"
+HOMEPAGE="https://freedesktop.org/wiki/Software/desktop-file-utils"
+SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="emacs"
+
+RDEPEND=">=dev-libs/glib-2.12:2
+	emacs? ( >=app-editors/emacs-23.1:* )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README )
+
+src_compile() {
+	meson_src_compile
+	use emacs && elisp-compile misc/desktop-entry-mode.el
+}
+
+src_install() {
+	meson_src_install
+	if use emacs; then
+		elisp-install ${PN} misc/*.el misc/*.elc || die
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 82fe74174c92..a6764fd8ed95 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -3,5 +3,5 @@ AUX 3.30.1-optional-introspection.patch 1266 BLAKE2B 95bc2dece601e561c95d420e3bb
 DIST devhelp-3.30.1.tar.xz 317956 BLAKE2B 8646fb97f0649bc166c8a21472f4c638f37bdfdc9e34b7214f0e5bd32c1c78664cc320f978fb27e313de54e88cf31685596f4bf7f43235ae96345292db6a9fc1 SHA512 f6f028948edd4c6954eaeeb026bf69c11284d725925d354ef42ecc67275cdcac66e8d3657d95d50926350543489b2bb2fa3a194d99d01494bedac60d3a2b4bbc
 DIST devhelp-3.34.0.tar.xz 288352 BLAKE2B 26c8c05c161e5607492fc26f012280468ed247ad4c166013e9df5fc1c76d59f98034a157cb58be9554ec65f46520b7d0d2ba78de00134570e84ca5a5ba0dc504 SHA512 34ed48ed323827b01f7d32e186da856c788ddfe37d6836082a81e6c8e4cd7bfc2265309cc3b298a0aea542b85e9261987d47a5a4396d865ec7e4cc13a9d05814
 EBUILD devhelp-3.30.1.ebuild 1812 BLAKE2B c91d39303521e9713889b705880ccf73844d384ef862ac44bc27da7dd89642330a53f1895c987c130d9a045f338f7a2e21556f71a1c52f74fd662c451bd91387 SHA512 7bbf8b15ed05ba91002737ade2f2bafd818c20a94237f7816e538aa9f5103d18968be82f1105e333e1b4cb50c8024c72e832775431aff18e892dd369dae54f1e
-EBUILD devhelp-3.34.0.ebuild 1787 BLAKE2B c12b19b022f1f5d1fb6d383a8d7e1a0362d8c1ef4925bde40b981071c95a9dc9ed0116f38866956973ecf5182e22177e0430faa6d4a609513c33b4420c043113 SHA512 d7bf74e684d8040bc06ac35bbe37f3230a4c8847045b6a18f8750ea4fb4632123cd6812323e5b282faadd13b3fa6e07ea31db2b9ef34ecabeac960a210b69867
+EBUILD devhelp-3.34.0.ebuild 1786 BLAKE2B 3312e9c7f12f38533dcea1b92905706b91867590534785c3849358a823d641c5ebaea14f9c9606a1630c357ce41fe94702ce8e3e5de342704c530910d3175083 SHA512 6ad7df312d6346a50f1461d0d40c31760e34501d657c3a1959326c64ef32c714435dfe46f7c2853511f4a72448451c724f8beeb3326fbb767c51ad84f05a18d1
 MISC metadata.xml 337 BLAKE2B b031370d8a469a93790b021e5d5f1bbd368ad0c13b144e4fb593d0abbe04d2408f6a7083ae1a1580ef5fdeaf26c59bcbcfcc0d5731f2fd42bde769cf1fb1ece2 SHA512 76931a5e5bff4c6f32aa55e27ff6ef6e320f79c21f1e3c3b3af4733dc0c141a7b782dfa38227fca4d6d50b763dcc3fd191581862ada051951b3185c596ca6753
diff --git a/dev-util/devhelp/devhelp-3.34.0.ebuild b/dev-util/devhelp/devhelp-3.34.0.ebuild
index f3b8ff316281..75ad41f460cd 100644
--- a/dev-util/devhelp/devhelp-3.34.0.ebuild
+++ b/dev-util/devhelp/devhelp-3.34.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
 
 LICENSE="GPL-3+"
 SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 IUSE="gedit gtk-doc +introspection"
 REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index c7f2406308b3..1a22aa6eef45 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,3 +1,3 @@
-DIST diffoscope-148.tar.gz 1570459 BLAKE2B 007900cd798b3371f3b779a35a2d12fc52222d2df3c1430ac091992550161ffe2be43efc6e4837173221bb75e72f9ca59afacbaad65420d0ad7310b80b924998 SHA512 e3012c97133e44009295fd3647012cf0e51e449b0e2b506be40169d8c444fc04654b0bf3ba92dcb0ec2ac85bab4577b75e986ce0e41e18ca69718004265f6117
-EBUILD diffoscope-148.ebuild 2161 BLAKE2B 9ef4a812c5fec5a923b0b796814052c00842cd36a447832fe65aed32c341454538ddccce2baac0b038d8bf02cbed98a2023eeba33e8a7868f34a882331098c34 SHA512 e508fee8307b2e634ec33877124156fcb8afd43307747b1f61e18ecfeaac00c1140c1906ef87015f3b76f70ac5679c28fed47539e52ce0adc29c6257ad6deacb
+DIST diffoscope-149.tar.gz 1570458 BLAKE2B 8182822f01805277937bf6993094a2ad2e32fde47a67a01a071691487582c22f9be9e299701ad2feda85ce79d5952747348e3180b22e60878d01f28f6e8a9ff5 SHA512 557f0edcd5620a097668108a223f3f58338890eaeb096982c398f1182e26219027c4d62dab688a19743be1167d0affa9dbd6b7b7440fcf86a7f55ade7e3be288
+EBUILD diffoscope-149.ebuild 2161 BLAKE2B 9ef4a812c5fec5a923b0b796814052c00842cd36a447832fe65aed32c341454538ddccce2baac0b038d8bf02cbed98a2023eeba33e8a7868f34a882331098c34 SHA512 e508fee8307b2e634ec33877124156fcb8afd43307747b1f61e18ecfeaac00c1140c1906ef87015f3b76f70ac5679c28fed47539e52ce0adc29c6257ad6deacb
 MISC metadata.xml 2137 BLAKE2B 6ff55f85ebf3f769c10c3e17a69900918abe142e491b7b8460bed8fe6a036763a743324bf1a10e7a3772761b38c9632ff1352e9c6677ef691f81acc29dc321e9 SHA512 e782e12dc91d86612768a2e0c498f54a9728691a76008ee1e6cdbc4d8719c2593344f6c37786982abb0de7b85d743d7614652a2e8c9cd9fef053c3a32e1e484c
diff --git a/dev-util/diffoscope/diffoscope-148.ebuild b/dev-util/diffoscope/diffoscope-149.ebuild
index 63058ee2f20a..63058ee2f20a 100644
--- a/dev-util/diffoscope/diffoscope-148.ebuild
+++ b/dev-util/diffoscope/diffoscope-149.ebuild
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index 981ce2fc7189..e9bbd360acf8 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -4,6 +4,8 @@ DIST gnome-builder-3.34.1-patchset.tar.xz 44680 BLAKE2B 91e91ac8d0fcf6b54d32ce9f
 DIST gnome-builder-3.34.1.tar.xz 11974748 BLAKE2B c34a31c50b327d02632ff18d48ad59f925306901e8874e0c7811b9258c56027403de0d9dc1877c696d96037bdfcdcc27f56f59a41d232e47b330382b1dbf67e9 SHA512 886c732f20563818dcf1deb96d4277fe96a9499b999cfbc7a64286e816e9a36bb978932d36a1e764b54c2d36891b7546fa058f51e036b0fa101c0872f4ce51d8
 DIST gnome-builder-3.36.0-patchset.tar.xz 136856 BLAKE2B a482f371313af4ef6a0881968846c4543d169b6bd36942ae4b72d493012d73c9705e4a7acc8f7dfc1e8cbcdeb2445b4e225f39c3a9a219e24b90be773c0768c1 SHA512 ebaec56950e0e45ba2851b13d4e1518163a291dca207bba25efe12eaaa3cd69e9bae06d2f4e5b9e9852a4305fc3933764ec9a882843f84ce58bd2246991d16fd
 DIST gnome-builder-3.36.0.tar.xz 12015980 BLAKE2B 1724c7b17e58fea08cd22894eb260236419f215c1b68d396359ce40432e8a0c08d0ead2b70e888cbb767f78362d4253395b98821fb1d1ff9a07d5881df88c8e3 SHA512 ccd6ca916ed6ad10b69e5573482e2ea48cf4227d858605825ab56989840ebbf5a6dfafc915a1f8df3a1061b37c80adfbd03fc9d616c67e08a5032069b11aa4a6
+DIST gnome-builder-3.36.1.tar.xz 12026976 BLAKE2B d833665bb71b1549fe789d05dbd89db588ae4cc7187e532f38f3bd9e779bccab644d9f9bfc4c84bd484ac678bcf8594e4aa4edff29ea8c87c5c557fc3e422a4f SHA512 284da6e5a9e766cb6f6122f1134c779cde8406b006728ae1fff3518020ef4b96239aa5037cd2d35cfe4728ea088d61c4eeabc39ea753a16208fdaba7b04e63c2
 EBUILD gnome-builder-3.34.1-r1.ebuild 7372 BLAKE2B a60c1261ab7251f3a0cfff69538f0f92bb8a197d2624e3aa62703b9e6b808e3c0793a048a61ff0b409c51c1f6467ca0f5df7d513a825103bbb4c71263fb0bd2b SHA512 e1fcba969d1a9ab368775a80cc7a0ebe35e76a11cd78d49509a2837ab5efd045f9cf1e058397ab943bcdce4eb99e71baea8d2c72f398baeca8500f40dca28bca
 EBUILD gnome-builder-3.36.0.ebuild 6904 BLAKE2B 53f8cc1b0aa6fb85a0fa208b45c68c932c264c477c256c095fdab539567a1ca5db7bc1ed81a97be58c59551902c64b0792165d0cd180b521a5bae62fb8d7d6ef SHA512 eb9469f65d67b9e582ee341a137bc1eceef75c9b37898e0d1c3c47012227f63af0bdae7f57192705fcdfb009d751f522e5e4f89752d72ef75fafd16296a98033
+EBUILD gnome-builder-3.36.1.ebuild 6735 BLAKE2B 3d58eef4f5c068bed48860140cf49ea6f8a787c185bfa63a4e4442787f76466c28b5a060e80e9ea1365330b7e96cc3d181fb392d299712d7d4259507ec426627 SHA512 7d52277f74434fb4ffc2d60e2e45576bd26811c3d6a1e821d96c944f748113f5efae1a1fc49fb213952263b7973532383df45089d734bf3169d5b2ed83d859f8
 MISC metadata.xml 1085 BLAKE2B 0b2bdcfec562b85e54880c819a0345c2aedf4f8b1c0bc34b7b4e3e8551697dcbb3ed93da1e016f3a164bb677459e8d628ba943252e51e842152282c3757f0232 SHA512 58890d32c2d04d63eaae8489ea68054ffc50df5bf9970af6b159b2dfbc99b8ed2d2db80aa29907463c137caf5eb8aa129c1470d1e19ccbf398ff8789f7f63987
diff --git a/dev-util/gnome-builder/gnome-builder-3.36.1.ebuild b/dev-util/gnome-builder/gnome-builder-3.36.1.ebuild
new file mode 100644
index 000000000000..b524cba0fea4
--- /dev/null
+++ b/dev-util/gnome-builder/gnome-builder-3.36.1.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISABLE_AUTOFORMATTING=1
+FORCE_PRINT_ELOG=1
+
+inherit gnome.org gnome2-utils llvm meson python-single-r1 readme.gentoo-r1 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 +glade gtk-doc spell sysprof 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 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, libsoup-2.4.pc >=2.52.0 and git plugin enabled
+# 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.33.90[introspection]
+	>=dev-libs/glib-2.61.2: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
+	>=x11-libs/pango-1.38.0
+	>=dev-libs/libpeas-1.22.0[python,${PYTHON_SINGLE_USEDEP}]
+	>=dev-libs/template-glib-3.28.0[introspection]
+	>=x11-libs/vte-0.40.2:2.91[introspection]
+	>=net-libs/webkit-gtk-2.12.0:4=[introspection]
+	>=dev-libs/libxml2-2.9.0
+	git? ( dev-libs/libgit2[ssh,threads]
+		>=dev-libs/libgit2-glib-0.28.0.1[ssh]
+	)
+	dev-libs/libpcre:3
+	dev-libs/libpcre2
+
+	>=dev-libs/gobject-introspection-1.54.0:=
+	$(python_gen_cond_dep '
+		>=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 )
+	>=dev-util/sysprof-capture-3.33.1:3
+	sysprof? ( >=dev-util/sysprof-3.33.4:0/3[gtk] )
+"
+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? ( $(python_gen_cond_dep '
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	') )
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	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
+# stylelint for stylesheet (CSS and co) linting
+# gvls for vala language-server integration
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	use clang && llvm_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dtracing=false
+		-Dprofiling=false # not passing -pg to CFLAGS
+		-Dtcmalloc=false
+		-Dchannel=other
+
+		$(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
+		$(meson_use git plugin_git)
+		$(meson_use glade plugin_glade)
+		-Dplugin_podman=false
+		$(meson_use spell plugin_spellcheck)
+		$(meson_use sysprof plugin_sysprof)
+		-Dplugin_update_manager=false
+	)
+	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/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index 68ee19632c16..baa81bd5e3cf 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -1,5 +1,5 @@
 DIST gtk-update-icon-cache-3.24.16.tar.bz2 91713 BLAKE2B 883c1437ecbff8cdec545fb3a59270569de32f59c48cb7e2401332a2547ccf41487ff2778e382815695eca34cf88baddc955acf8b2b7b7ab1edf06dec5be8683 SHA512 53bdaa8d29e1c343cf9e5d0acddd852d1a3d43a9c03e8e7c186245f5ab536742b39bd7c76b9fee3a2b5342ab573be621d59f7282f41b08097061c8f5df158c06
 DIST gtk-update-icon-cache-3.24.20.tar.bz2 91769 BLAKE2B 4fb1d4e06117924377e2e3f28f733ffd4f929414e6e36855a4486d6aa2a63f3a37cf5710c8dffdb6c32470c24861070a3160b8373dfa10a3831d098446f5701f SHA512 2ba23145e3cd46d3cd7129c68355c6918a271688935b828be110049e6a912879d25f88a8105c8dd1484de8b0c89d220bb6e8f4282aaf083602ad88e2cef9a54e
 EBUILD gtk-update-icon-cache-3.24.16.ebuild 894 BLAKE2B c3534d66ac52481507d5a722eba0b98eb780cc18be33e18e336228def9d67d0a41a067507e83d3cfddac74c57fe2d33f26f1caeca77565f64a1a6197e0c664df SHA512 a3173194e30215c653e2d10fc7e864c2a9f70a35f0bd0d8e3e72d5eed8e8f98552de249bd5c4ff59320fd4bd0be7aac90896434ec7b70a44de12e3c1afb899dc
-EBUILD gtk-update-icon-cache-3.24.20.ebuild 903 BLAKE2B ee0545f00fea8535537acbdcefb75666308de4370e36e89aa1ddae46dd81442ea3f01db5ae511e1ce459aea94d4bd756811888072de25c678f219d922a520d94 SHA512 972dd1ab10307c5d4d60a0333bbd06fcb84847566ed3fe9395064074230fd93afccfd38eb9872bb9f110960135a064bf09a50b34888265c05e92c8a39fe0f35e
+EBUILD gtk-update-icon-cache-3.24.20.ebuild 898 BLAKE2B e4bc664c4d25bdcab3ad69907f2284dcda7bdb32352178a9bc1a07142567bba578b76a11dc945801746263b4fe91f6a945f25f98ea34ff17f7fe314cc90b9995 SHA512 208835d78c7d045e6cebff5a074407f885b5a6976159275dd1928e4259eeeef3b7bc65e874090653b1ff8753567deedaa89b4ad44b78e406e9e4575a663ba5e8
 MISC metadata.xml 647 BLAKE2B 2846e4ac0b5816fe7699b197958118535cac7092930d7b6ba63c23b126242102edd832d60b13baeed23bf8781babe1058f06fece732c4ecd58c9b01b621042ae SHA512 7301a9425528d65112ec9dd1eca7291473905493b1b550119c6984141b3b216c4f3825d3b2a395a8375aa8b481b29d841153bd279d593586d5ea7d77ce46d7d3
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.20.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.20.ebuild
index 4c02aa74fa1a..7b31970bdef4 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.20.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.20.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # man page was previously installed by gtk+:3 ebuild
 RDEPEND="
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 5348b03df305..4cbe85c27ac6 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,6 +1,4 @@
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
-DIST intel-graphics-compiler-1.0.3826.tar.gz 6007014 BLAKE2B fc09d6443818403bca803f3f78fbb9ee9a25ab674372585b880e038227712f8114ca2b17d6b219149f54f9f5856b973d3500f6537027660d1c657d61992f9e9b SHA512 e4f06d6b8d2a7161f80956a8e9cbf23aa7293a31781405bc17ee512d27ca4114facc6bb0fa7f47fde3a37aa79ce288a98aef8b74c4e572e73d70bb50c21f6fbb
 DIST intel-graphics-compiler-1.0.4111.tar.gz 5781246 BLAKE2B 6fe47422b31b0c73d24c3cef1265772927a57751bf5648f862f7c73528f2174268fdb2271c30c49ab038b4dfbe530bc088fe727e66babc5db0a41759e7212733 SHA512 8f589ee83a27b7a8f5abcd008e36a73fb704c20c1ae17e1ef265c59641768b75a0a08f2d6f80355442fff7625154603db3ebe9be0a4ba702b45e85db434f8110
-EBUILD intel-graphics-compiler-1.0.3826.ebuild 1594 BLAKE2B e3a96e480f23b0ce4761cae5734c22ba4e835d9cd6f4225ac0a7539a7038443e0b4d25f6b2eadb0b40de4d275bd03fe1d1945f9e591883f8a37ec6f72db457fc SHA512 1b132608d543afc632148941dce4e50f63ce86a558a798201b2cf5dca7fc1a9f5ba7c3ba8f5dab67d51c2c369f1d844eb10b4d76702f4b7ed4a2cf1cbea1468f
 EBUILD intel-graphics-compiler-1.0.4111.ebuild 1595 BLAKE2B f096bc2bde19be56e368a11e2174f9aef4a412595dd96fa7736ea67d1293aa5325f894c84eb3b12c93a8a9f96230f934f07750202dfdaac56bbcbb9b3bc4b3d8 SHA512 74a2e5639030e4dcd4601005be37846f289ba25c13bbb452769659660a73f36f1e6dfdcd1c432639383f15c9f33cb4990e3446d8b469a47363918cdc1f28e791
 MISC metadata.xml 340 BLAKE2B 6c0e5d932084dffd300a1dc70b29eb0871dfe2187ed8591a5a2f8cba001bf681e908c58a6f9471f7b08842ff538365258305da91004ed63ff97314a07fda529f SHA512 d24016b4ae0ffb05be475f86bb8d72ab4a85475655f409b8826dcd69726e048aa048e321f26ac36f2f52aec40abbfa66a95354a711332df94dc3e57e6c396a0c
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3826.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3826.ebuild
deleted file mode 100644
index ecb03772f069..000000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3826.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
-
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib flag-o-matic llvm
-
-DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
-HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
-SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug"
-
-LLVM_MAX_SLOT=9
-
-COMMON="<=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]
-	<=dev-libs/opencl-clang-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}"
-RDEPEND="${COMMON}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.9-no_Werror.patch
-)
-
-S="${WORKDIR}"/${PN}-igc-${PV}
-
-multilib_src_configure() {
-	# Select the same slot as the best opencl-clang
-	local ocl_clang_ver="$(best_version -d dev-libs/opencl-clang:=)"
-	einfo "Selecting $ocl_clang_ver"
-	local llvm_slot=$(ver_cut 5 $ocl_clang_ver)
-	# opencl-clang brings the right slot as dep
-	has_version -d sys-devel/llvm:$llvm_slot || die "LLVM slot matching $ocl_clang_ver not found ($llvm_slot)"
-	einfo "Selecting LLVM SLOT $llvm_slot: $(best_version -d sys-devel/llvm:$llvm_slot)"
-
-	# Since late March 2020 cmake.eclass does not set -DNDEBUG any more, and the way
-	# IGC uses this definition causes problems for some users (see Bug #718824).
-	use debug || append-cppflags -DNDEBUG
-
-	local mycmakeargs=(
-		-DCMAKE_LIBRARY_PATH=$(get_llvm_prefix ${llvm_slot})/$(get_libdir)
-		-DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
-		-DIGC_PREFERRED_LLVM_VERSION=${llvm_slot}
-	)
-	cmake_src_configure
-}
diff --git a/dev-util/intel-ocl-sdk/Manifest b/dev-util/intel-ocl-sdk/Manifest
index 0e64985d837c..9394e0e7c58d 100644
--- a/dev-util/intel-ocl-sdk/Manifest
+++ b/dev-util/intel-ocl-sdk/Manifest
@@ -2,5 +2,5 @@ DIST intel_sdk_for_ocl_applications_2012_x64.tgz 28302946 BLAKE2B 991fe387c3bb0c
 DIST intel_sdk_for_ocl_applications_2014_ubuntu_4.4.0.117_x64.tgz 105808431 BLAKE2B 58b9bdf1979c070757beff7abaa2b16d43993e7dd4aeda05843facd556f25f3c695a6b2de4745890ce6b7b1a5cee1113b62ffae4059aad49a462d28d6d3461c3 SHA512 c0f65bf4d9b894f11076995744d32aef983e01b40472028e411c7be6b9117ef8b260b9abe46d6e936333aca525f98f81aaca2ab3e093ccefb09f525a3646d7e9
 EBUILD intel-ocl-sdk-2.0.31360.ebuild 1449 BLAKE2B cb0cc8870171f8eae58ce7acd3af4642c65836c71ae6ece4a58b7319e02b6e734c45c4acbc206048652b5145c3d41393f310e44652a6fa9757b9382d13115bd6 SHA512 63850e50ca33eb422e5ec9d401672188db6749fd70df2b6f99f6f09c8192c08655cc3726def1c35ff93486d9a6dfcddb656faa5cc7aa90a211538aac9aba7059
 EBUILD intel-ocl-sdk-4.4.0.117-r1.ebuild 2194 BLAKE2B 807b3d15f16547aa78f8391836cd2128dc838f4d8be70137e6f4831c3c41cf08ed372d05b866f3328b3582b7323c5a812ec8e1d4358c9f94fcfd417f3135c82f SHA512 d0f5af13de03b73ebc1aa35f7ac64f18b72087eee83e2f4911b375ce8d5140a0c492a776bfb86018a43a5c60a5252d744e6b2dbc1fc70d0c95b48b24858d4908
-EBUILD intel-ocl-sdk-4.4.0.117-r2.ebuild 2132 BLAKE2B 55650a4285aa867f3fd52396a122eed5cc29d155f2b6c65ed15a7a63f659f442e30318cbfae5c53af30d3d9e377205e8d65d7f04f00751198141fede738fdb4f SHA512 3e519c09f8e9ef63198f0de62ce1a323cb0282e4d757a2e34ed2544b72731267fbf45cf524990cef68b475e3043f27bba80a4b36843f2c33e5cbcfe723e9adb8
+EBUILD intel-ocl-sdk-4.4.0.117-r2.ebuild 2131 BLAKE2B 1d4c5b22e3cad945b429433b11ebad627ddf9e893f2d75ffa07b985b3fe757511e77e2c2aa5ba26f2f4738a9c97886d847d2e1e31a73abf6bad63aab5266bda7 SHA512 8d1bc5ca60546f2936225c4e746780eed603c1f663f0e13d926d9e76821c125cb7cabd794bf0f87705571026e2340ccf259ceb10a002c6eb7a209c242c0628bb
 MISC metadata.xml 670 BLAKE2B c3c011abaeab5730cfdc09bc89715eed709910246767fbe5b3c406189911e85ce4f2870740be95f6d1ecb9a0a3d9abeb932774de05742d275c77f1634c1754e9 SHA512 2ef3994dd0dc9ce67b02ea1d5bf5326a8dcbbe21c6a6c452376551cb803825c4cbb721b226c128bfb758b5fb6faf1d04f25c2be2929961888244f861543a78f6
diff --git a/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r2.ebuild b/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r2.ebuild
index 0d0b0d0a8d3c..9eaedd6076e3 100644
--- a/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r2.ebuild
+++ b/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://registrationcenter.intel.com/irc_nas/4181/intel_sdk_for_ocl_app
 LICENSE="Intel-SDP"
 SLOT="0"
 IUSE="android +system-tbb system-clang +system-boost"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 RESTRICT="bindist mirror"
 
 RDEPEND=">=virtual/opencl-3
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index bcedaf98371d..2c27f332b6ad 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -3,10 +3,8 @@ AUX jenkins-bin.confd 998 BLAKE2B 5c44e37118e15fdd76fc7eb0e10e06683828d3efe08687
 AUX jenkins-bin.init2 1782 BLAKE2B 25c78b64308be71d605f3c4f2d33c5cf1074ab431e23a170f7d36002d668def7dbd56b0b45590692047d7d88c6884ec1cc40cb4f077f7edcb853300301805002 SHA512 e0fd85f653bbf5ac80dc929cb265ac86a08047f9102d57f2ac6194cd31794310a3c062824423552a3ee65e298506332436fca037f96963358dc511982f900be8
 AUX jenkins-bin.service 499 BLAKE2B 28a90d5cf40e46880570e87acbc6d78766460faebc6e9a79b8c446fc05babf1de405cf79e29f527f0e9e0bf91093836fb6a50c7040320f59e78bf1971cd14ed3 SHA512 4ede5e0d55bf9d53239a1b8c152d1a3e38510982d6ff01c9c4288d63b8312ab7412979e0af3466638c7ef2803b711d49344692c14e72baa85d8eb4caa15f7506
 AUX jenkins-bin.service2 566 BLAKE2B 38511fddc783a70ae3deab70526c737a883ef090bcfb20216658b0775667022782f3ee8a6638515b46e6a4df96228fb2368521c74a0ddca2f121e9170549df8e SHA512 87b59349edcb1503e6c91440327092732f0dddb8cc35e4576c81da55e08a2ad67d462a4d871c46da4f3ed037de8b9109d766ba36ca9acf244506d129766ed5cb
-DIST jenkins-bin-2.222.4.war 66239216 BLAKE2B 0272f91b4460ac9f9cd0235df59f55e3135f593d8098d35aae4db6571e171d3c38c6b3e0ac0ae2f7825a3ac3e56c8e76cc4e15e28743cd2aa007395921eb7100 SHA512 8f82d8c69807c46eb0f0638d59777f10e1017b197a1d88295882e6b8aef6376609ed9da625691eafca786ed0a7314e7ab2abb000a39dcfb6da2d250bbd5e0c76
-DIST jenkins-bin-2.228.war 66137156 BLAKE2B acd1414745f0ffe12ca3025149d5ef8dcdebe6415e54e18f71eb4ef05bb578279409fbf5605763d86144726a82057ba796ea8ce3b79301ea33ddfed1f03ad9f4 SHA512 899c5838cc46f87020c18b0863b8f160c22b0422e7adec1bfd48dce5f06264b5e33ec8411bf9133e28fa8723daeeb5d2cd14a92c261d82e2b2b804d0b1c21250
 DIST jenkins-bin-2.235.1.war 66437256 BLAKE2B 900f5616db3e4e1913e9e07f1d40951fdb0a467e2acd93441a52fed7d9f5961103c46b34627e0add76da11a3e4787535d0a47e5eee20a474f65c14b03fefe9a4 SHA512 1be1f1845de87316107469b9b7c4d0e1e6b0f014f495981f2ecc2ce3acbfd820275c187c61b3f9664ad2a61312e4504171c45edf05e1711bbf61554c5f3fd653
-EBUILD jenkins-bin-2.222.4.ebuild 1105 BLAKE2B 161bf3f0ad77e74702cfdd1db69cfaa54f6e267e814b358d3fdcac2ca5c7210410d1cf87d03a9e6f987d2ede8459d37f6bf352bc2a7fcd7f2167edf81542aff9 SHA512 d86e52237449bda33bc052d7b1dd3bc15306c4b771c485d34843973a7a7df6c0d0593ab156837cc64a018466222fd0c09bb331bb5c820807f5038300517e2283
-EBUILD jenkins-bin-2.228.ebuild 1098 BLAKE2B 0bfaac37afbe842e4e1a5572a0f56a77b4bc5915be4cb9a79cd7a56105562e8877c9686a2963c347c2feb06dea8e4aad271bcda9a9e50f17433485f189d39981 SHA512 381e5dd3c921892b0df7497fa6028ced0df8c84a2a0731142c01023cf2d63d60233f24f19e62d40699c606ea162210f54641b6742ad63d6a6c99bd29b24c0835
+DIST jenkins-bin-2.242.war 67003152 BLAKE2B cc20efde5196ed66af3cfb0b52404e35bf3954422734278ce2c3bfad5402c0f005579a1c406e519e8e04b28e3d0f26cff2d4fb5a40c2b722dd3a93d54cf86cb4 SHA512 22e138d4c3291b2885b9cb9db51e5dedcca13ca93a2fb8b11bd1dc81da981e9404717ff791fa2a1d9dd4530fb806e8cf9c79931cdb968723f02177fc00321f92
 EBUILD jenkins-bin-2.235.1.ebuild 1105 BLAKE2B 161bf3f0ad77e74702cfdd1db69cfaa54f6e267e814b358d3fdcac2ca5c7210410d1cf87d03a9e6f987d2ede8459d37f6bf352bc2a7fcd7f2167edf81542aff9 SHA512 d86e52237449bda33bc052d7b1dd3bc15306c4b771c485d34843973a7a7df6c0d0593ab156837cc64a018466222fd0c09bb331bb5c820807f5038300517e2283
+EBUILD jenkins-bin-2.242.ebuild 1098 BLAKE2B 0bfaac37afbe842e4e1a5572a0f56a77b4bc5915be4cb9a79cd7a56105562e8877c9686a2963c347c2feb06dea8e4aad271bcda9a9e50f17433485f189d39981 SHA512 381e5dd3c921892b0df7497fa6028ced0df8c84a2a0731142c01023cf2d63d60233f24f19e62d40699c606ea162210f54641b6742ad63d6a6c99bd29b24c0835
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.222.4.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.222.4.ebuild
deleted file mode 100644
index 8ab8d5db213a..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.222.4.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
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="lts"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:0
-	>=virtual/jre-1.8.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.228.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.242.ebuild
index e3e0cd1a4eda..e3e0cd1a4eda 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.228.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.242.ebuild
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 8b1bf54b94ff..86c8ab8b9201 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,5 +1,3 @@
-DIST kdev-php-5.4.6.tar.xz 1046776 BLAKE2B b69539971ed666c7887e1aed0998da59c887000c785e965d2220e829e485f46c28e12e04b3c084681dd2a96dae1d4d5fa73bd2501359de8960f8bca0e64a1968 SHA512 6711dd9034054ce2bfd684d7fabb3349436a4a8ae0924b8a6ae56a8b39aa83d4501fec389cb73d3c4c20abcfcf8c5f7dd04f63e059b987adc7991806c7eee252
 DIST kdev-php-5.5.2.tar.xz 1060684 BLAKE2B 682b9f0aa479849966e125e789bd53c4747b050a8d6be287082ffaa3ea496d9b29e80070c96869ae546ab37cfb996922f9ce715c4c7de66f97b1a083f2ed1ace SHA512 5f92f2183af50ddc27c36065eb927d26b01b9f350e2ec8c3cf4136b1ab7c7933d77512669d71ae6bbf6c0fdf044987773427f37bd5bd96a9cf143038147e7709
-EBUILD kdevelop-php-5.4.6.ebuild 1237 BLAKE2B ae25bed02dd98e93b441ceb983dd48dfee27823b2f02b689fa4b1b232823998b7e0768c601dcf3f61b63f1ce66ed1b20e00138f494dca5afef3a393a9a09ad65 SHA512 256e896c11d6ce4d63debb844328371497fdb989dfc1c0c8051f481dd8c5a495f0daa6cf053e38eba87ec412c9e5a27744b7b065de07bbe0037042c764991425
-EBUILD kdevelop-php-5.5.2.ebuild 1239 BLAKE2B 6526b2b49468286947a82f4b9162a78c703156adc092d072d13942358ef06291fcc099d88bff7ebecf2a824f534d259bdd7ab34550e6a958ade58cd759087a11 SHA512 378dac28bdb17e0a93465bd2b2ed66f91eabdf98ed09899786207d455d261d26de2ce0f4b2c5ef771dd97ee0424d716cb786ed00f5760440dac48db91ee6608b
+EBUILD kdevelop-php-5.5.2.ebuild 1237 BLAKE2B a4870331cffa24769de5a8399cd2b90d76721e2c64b81a693164a04b28b51b5593deef87e5a1fcbd92fda9c8501dbcfaf38f8d5c60db36ede9d20d747c1810d9 SHA512 25fb5fa92f563a0b420eb1cf268cd79bdf56e33f482de93034f3f91fc9376ed426bc9beea36d1a82fb496ee998a5b9c1a4aac01eec7a7b4fccd5c1934d9d3c9b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.4.6.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.4.6.ebuild
deleted file mode 100644
index 085316c767e6..000000000000
--- a/dev-util/kdevelop-php/kdevelop-php-5.4.6.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="forceoptional"
-ECM_HANDBOOK_DIR="docs"
-ECM_TEST="true"
-KDE_ORG_NAME="kdev-php"
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="PHP plugin for KDevelop"
-HOMEPAGE="https://www.kdevelop.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5"
-IUSE=""
-
-BDEPEND="
-	test? ( dev-util/kdevelop:5[test] )
-"
-DEPEND="
-	>=kde-frameworks/kcmutils-${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/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-pg-qt:5
-	dev-util/kdevelop:5=
-"
-RDEPEND="${DEPEND}"
-
-# remaining tests fail for some, bug 668530
-RESTRICT+=" test"
-
-src_test() {
-	# tests hang, bug 667922
-	local myctestargs=(
-		-E "(completionbenchmark|duchain_multiplefiles)"
-	)
-	ecm_src_test
-}
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.5.2.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.5.2.ebuild
index dc3b73a1d4d4..c6c31a235060 100644
--- a/dev-util/kdevelop-php/kdevelop-php-5.5.2.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-5.5.2.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="PHP plugin for KDevelop"
 HOMEPAGE="https://www.kdevelop.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2 LGPL-2"
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 76f0db35d199..8890dd347ddf 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,5 +1,3 @@
-DIST kdev-python-5.4.6.tar.xz 1072228 BLAKE2B 199b8f1b0f6a4f072f2fdafa25b2653cfe855c10d601f3be7f47db84140aea84987cf1ae5f0ae19e08af5b3092cfab16aac0704f20ed46c6d872345482a663f3 SHA512 116b5649f59c2ec46aba083f9e0edebfb481c86d7677ce08fe69e161e344addbd6b4f9c955ebc2866ea118d3139377c59315c46b9e7defec119a47ff50bdd2ac
 DIST kdev-python-5.5.2.tar.xz 1076188 BLAKE2B 87ab49aef61459268c947cee543bc8eb0b8729f3e4f798c1de4b06b8db6c3d5920c23c2b9ca4e4645edc323b15392d418058a314f164f803e2f65eb8fd2d9ecb SHA512 2558e4ad7485abe8473b703a3d80a1faea9e4152eb7be314ea8c3d46c841f457983206b1bc55f454496b81a468a2f8718086e1b0db3e9e880c50011407e7866e
-EBUILD kdevelop-python-5.4.6.ebuild 1248 BLAKE2B 3c8f35f9469adeee5814470cbb1d48a8c2c5481e1621d3c8e81281771cb2e5ff0e74d1366ad4d5ad2f1b1f1870e35e3aef6b7a092160ed3d53beb7f4b772a7cb SHA512 ee6ae3311298a2a3e5ba52ce377265ce58e7fd927471821f55ec5e4ce5efeb6d0ab58701955c82a4c46fd09e9c754862917de0c6268e1d0fe00f1a5ff68b45cd
-EBUILD kdevelop-python-5.5.2.ebuild 1250 BLAKE2B dafd8b490d526fd076d91ec16dfd94fad989036b1e937bb8ac6fb8bd559044ebfde9dbd4787e3d44e3e58acfad7507baa75cce1f00b8d44c82cbabf5585929e7 SHA512 b6cb5a50cb1b4239b27aba1fc5936f6dea6a5cbe9835f770d436963b225b2a0e69cbae323d860f9479dac61a2a4141d252f95d9842dfd2ac1b98564e001be1c9
+EBUILD kdevelop-python-5.5.2.ebuild 1248 BLAKE2B 87a2468e90fe316b7ae048b260dd546af28c8020a5ec0d151f2880d82e5928ef0d70e1a9f27e6eefb61320c526fefef3afbd5a4d99fc8441f0f98decad76819b SHA512 27e09b1304f54c736c676416f512e13deaf36d55cea2aa972997ad4e6e06cf633478bf7401c48ff796a15aff5179a7faee4f019d491074f33f05488e88b89791
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.4.6.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.4.6.ebuild
deleted file mode 100644
index ed59051526ef..000000000000
--- a/dev-util/kdevelop-python/kdevelop-python-5.4.6.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_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.2.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.5.2.ebuild
index 37e1f1fdb0f2..4d844c56f1fd 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.5.2.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.5.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Python plugin for KDevelop"
 HOMEPAGE="https://www.kdevelop.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2" # TODO: CHECK
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index a78e7e1fc748..314b3c57b030 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,5 +1,3 @@
-DIST kdevelop-5.4.6.tar.xz 7011868 BLAKE2B f8dc80e88592aaff6c2cc90667006a235cb4930aa6249558ee69feee8180b012b3ca6ad39bf553743a3b35bdd2c40754dd1f6081d3630566cad1d71ec75e42f2 SHA512 bcc7ee982f48982c63dbe8ac3dcfc9bdb4dda855d0d8b82740e12a616eaca71fe9e2f4a39626d70ce28d09c5f805a462ade06829f04db682fde72a2594ea4234
 DIST kdevelop-5.5.2.tar.xz 7049088 BLAKE2B 93df5c982b8e141a5027b5eeddce55a4c4b915fa5f6b36b71c0125820ffb6692db1dfe3243b4b0333be01658f0d44a0767d9e63ad549a6bc54b0e19c42c215fc SHA512 d4e0b3369ed4762beea18e43275c75b801fa4efd8265734a6b676e579f17408dc5ace4aae1b8f7eccbc70e88f6d80ecaecfc4d2c633f77f80ad0b9d066995ca2
-EBUILD kdevelop-5.4.6.ebuild 4182 BLAKE2B 62d749e681d2ae1c04696116c07eb61febb5a8ba5037a940922ddd7af14152d286d975941adfca671e403ab6bc443c9c35e7f5a289095feeea414f9454c7b64a SHA512 805bc1f19cc1f7e83fcba44599a6c785a3dd6fdf2f283501f44e37e39643c649a3d82c35142d3108db428219cfe388966e60534b52062c82960734901f55ed85
-EBUILD kdevelop-5.5.2.ebuild 4361 BLAKE2B a27a2360ed1c627321a10e67fb0fa502c00277c00c6f008799e61b732651610b12c9a0fc16e6db311d0be5e0134f138e157d16e824bbabe442e6abd0be8aaa8b SHA512 bf02f90de84c5ffb66b3ba1767e5eb5efcac047c8cbcb90638a4e3368772dc290ee3a21593f9cb956aeeefb1caf4d9bf35c2155c7172d9ed15e92fc9f8ae161c
+EBUILD kdevelop-5.5.2.ebuild 4359 BLAKE2B 966aa4775d2bc00c8bdd88b90fce198ebc72b2b5d13f043739d71f7b602dca401686b14f251528fe03c76f6e80fd190242c3629bd30324cfd71f1bef9ee394dc SHA512 e105de2cd8514c35ccf551a6dccbeb10cd72b4e46892b9f8fc6ff534cd850914d3fde9a5b428e02b0185d160e4e5000c6258bb6a63bf9c42e3fb89de60812cf9
 MISC metadata.xml 698 BLAKE2B edf6f5784cae9be6ea0013e2f4b85234c748ff5b716511cea8b401e7267178a821d27bbd5b66d38833e018c6a90855ed28390be385818e67f25105674b73aacd SHA512 62228270953a089d69530e11f5dd9a55c86f9758d6d86f9a3eb46a1a6e3efaca38c066bacff5b5f49a409d6c65be96e84f1be63cf6aa3fc7bc04706b674501f0
diff --git a/dev-util/kdevelop/kdevelop-5.4.6.ebuild b/dev-util/kdevelop/kdevelop-5.4.6.ebuild
deleted file mode 100644
index aed3f2eb6593..000000000000
--- a/dev-util/kdevelop/kdevelop-5.4.6.ebuild
+++ /dev/null
@@ -1,138 +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"
-KDE_APPS_MINIMAL=19.04.3
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
-HOMEPAGE="https://www.kdevelop.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5/54" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
-IUSE="+gdbui hex +plasma +qmake reviewboard subversion webkit"
-
-COMMON_DEPEND="
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${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/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${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/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/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${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/threadweaver-${KFMIN}:5
-	>=kde-apps/libkomparediff2-${KDE_APPS_MINIMAL}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qthelp-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qttest-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}: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-${KFMIN}:5
-		>=kde-frameworks/plasma-${KFMIN}:5
-	)
-	qmake? ( dev-util/kdevelop-pg-qt:5 )
-	reviewboard? ( >=kde-frameworks/purpose-${KFMIN}: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-${QTMIN}:5[widgets] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-apps/kapptemplate-${KDE_APPS_MINIMAL}:5
-	>=kde-apps/kio-extras-${KDE_APPS_MINIMAL}:5
-	>=dev-qt/qdbus-${QTMIN}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	dev-util/ninja
-	>=sys-devel/gdb-7.0[python]
-	reviewboard? ( >=kde-apps/ktp-accounts-kcm-${KDE_APPS_MINIMAL}:5 )
-	!dev-util/kdevelop-clang-tidy
-"
-
-RESTRICT+=" test"
-# see bug 366471
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package gdbui KF5SysGuard)
-		-DBUILD_executeplasmoid=$(usex plasma)
-		$(cmake_use_find_package plasma KF5Plasma)
-		$(cmake_use_find_package hex OktetaKastenControllers)
-		$(cmake_use_find_package qmake KDevelop-PG-Qt)
-		$(cmake_use_find_package reviewboard KF5Purpose)
-		$(cmake_use_find_package subversion SubversionLibrary)
-		$(cmake_use_find_package !webkit Qt5WebEngineWidgets)
-	)
-
-	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if ! has_version "kde-apps/konsole" ; then
-		elog "For konsole view, please install kde-apps/konsole"
-	fi
-
-	if ! has_version "dev-util/cppcheck" ; then
-		elog "For static C/C++ code analysis support, please install dev-util/cppcheck"
-	fi
-
-	if ! has_version "dev-util/heaptrack[qt5]" ; then
-		elog "For heap memory profiling support, please install dev-util/heaptrack"
-	fi
-
-	if ! has_version "dev-util/clazy" ; then
-		elog "For static C++ Qt code analysis support, please install dev-util/clazy"
-	fi
-}
diff --git a/dev-util/kdevelop/kdevelop-5.5.2.ebuild b/dev-util/kdevelop/kdevelop-5.5.2.ebuild
index 8318287c0609..18f5ab2c9edd 100644
--- a/dev-util/kdevelop/kdevelop-5.5.2.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.5.2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and mu
 HOMEPAGE="https://www.kdevelop.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="GPL-2 LGPL-2"
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 652e907b2393..850d08fb1520 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -4,9 +4,9 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD lldb-10.0.0.ebuild 2481 BLAKE2B eec1740e4eb28b77a1416b27ce0ab11f95d6d2e81ae6b8aaca04647bda9124422ffe9d414aa5c5f9410b616e473f2609c21201289955b6fe595e9d082b5519c9 SHA512 dfbe98bde465360bcd86ba6ca49c26693430c4ef08e556826af0fe992c57934f397963b6babf106be6594bcfc22f94b0a2a554026af94a7eab286bf916a58282
-EBUILD lldb-10.0.1.9999.ebuild 2541 BLAKE2B bd2c91bb4ef638e1ea8386b0a5baf93587ea8a923e09c6ac9a3e8d59c584ac8112399ae391a5bbd003dcc8de28ab5eb441c903972f82335bb9e084b155f8319e SHA512 5baabcc77fa5cd3076a69aa8d72ee912f55cb55c455d9ab5bf800af05ba73ed2c75f17daa1444b9fc81dc30b16e4e2c9e7e52a1b9974bc03cec271f6f1bc56ba
-EBUILD lldb-10.0.1_rc1.ebuild 2541 BLAKE2B bd2c91bb4ef638e1ea8386b0a5baf93587ea8a923e09c6ac9a3e8d59c584ac8112399ae391a5bbd003dcc8de28ab5eb441c903972f82335bb9e084b155f8319e SHA512 5baabcc77fa5cd3076a69aa8d72ee912f55cb55c455d9ab5bf800af05ba73ed2c75f17daa1444b9fc81dc30b16e4e2c9e7e52a1b9974bc03cec271f6f1bc56ba
-EBUILD lldb-11.0.0.9999.ebuild 2541 BLAKE2B bd2c91bb4ef638e1ea8386b0a5baf93587ea8a923e09c6ac9a3e8d59c584ac8112399ae391a5bbd003dcc8de28ab5eb441c903972f82335bb9e084b155f8319e SHA512 5baabcc77fa5cd3076a69aa8d72ee912f55cb55c455d9ab5bf800af05ba73ed2c75f17daa1444b9fc81dc30b16e4e2c9e7e52a1b9974bc03cec271f6f1bc56ba
+EBUILD lldb-10.0.1.9999.ebuild 2295 BLAKE2B a3e876ca7ae4f0c1278848003cd69ac2b72ba643fede6abfd3ca1ef93243e12ace24a4fbf46315b7e39362f9404ea57aeeaea1d521ea3ca1d453a13f14711d03 SHA512 9e907448f9a3ac8e92fefcb09444214c9b5a27b5217b8fee74f5ffe90abd82530b9ff53fd19b6f2398d336e7c6573387b520bba0d28a00bb664df9f4795007a5
+EBUILD lldb-10.0.1_rc1.ebuild 2295 BLAKE2B a3e876ca7ae4f0c1278848003cd69ac2b72ba643fede6abfd3ca1ef93243e12ace24a4fbf46315b7e39362f9404ea57aeeaea1d521ea3ca1d453a13f14711d03 SHA512 9e907448f9a3ac8e92fefcb09444214c9b5a27b5217b8fee74f5ffe90abd82530b9ff53fd19b6f2398d336e7c6573387b520bba0d28a00bb664df9f4795007a5
+EBUILD lldb-11.0.0.9999.ebuild 2295 BLAKE2B a3e876ca7ae4f0c1278848003cd69ac2b72ba643fede6abfd3ca1ef93243e12ace24a4fbf46315b7e39362f9404ea57aeeaea1d521ea3ca1d453a13f14711d03 SHA512 9e907448f9a3ac8e92fefcb09444214c9b5a27b5217b8fee74f5ffe90abd82530b9ff53fd19b6f2398d336e7c6573387b520bba0d28a00bb664df9f4795007a5
 EBUILD lldb-8.0.1-r1.ebuild 3161 BLAKE2B 02f7f7c7461fed05baa15f6621ed8c32f669182395356a30e407582e74a63cf99b0d3b9c03031a976ea0b7734d3c61c64019b463ef68f315ae936ce679ceec77 SHA512 0a28c0147d2c37dc13dec96401f2d6e670db601735343c9befef24bf9626476a0effe715161703e4250066128c78b97b3f5e1ba5d6e67392b6cdacc0dd42dbfe
 EBUILD lldb-9.0.1-r1.ebuild 2391 BLAKE2B c0e73cf6e7c6fc153855681daa373618baffa2d45bd290855633d957464e99d86112918eec8aa0b43a975750e8ccd87fbffe2594b0110ac406eab8579c654f72 SHA512 8edadff2f01c15b75d894e30546a00826f140a81bc0ebfb5fb214eb5d133d8390b18a3075746fe94f061b36fcea9fb981ecd6de3d0567f73736c388af62c6320
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-10.0.1.9999.ebuild b/dev-util/lldb/lldb-10.0.1.9999.ebuild
index ecdb75359b11..2dfe01834ca3 100644
--- a/dev-util/lldb/lldb-10.0.1.9999.ebuild
+++ b/dev-util/lldb/lldb-10.0.1.9999.ebuild
@@ -4,8 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm llvm.org multiprocessing python-single-r1 \
-	toolchain-funcs
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
 
 DESCRIPTION="The LLVM debugger"
 HOMEPAGE="https://llvm.org/"
@@ -43,21 +42,11 @@ BDEPEND="
 		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_prepare() {
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DLLDB_ENABLE_CURSES=$(usex ncurses)
@@ -87,7 +76,7 @@ src_configure() {
 
 		-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)")}"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)
 
 	cmake_src_configure
diff --git a/dev-util/lldb/lldb-10.0.1_rc1.ebuild b/dev-util/lldb/lldb-10.0.1_rc1.ebuild
index ecdb75359b11..2dfe01834ca3 100644
--- a/dev-util/lldb/lldb-10.0.1_rc1.ebuild
+++ b/dev-util/lldb/lldb-10.0.1_rc1.ebuild
@@ -4,8 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm llvm.org multiprocessing python-single-r1 \
-	toolchain-funcs
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
 
 DESCRIPTION="The LLVM debugger"
 HOMEPAGE="https://llvm.org/"
@@ -43,21 +42,11 @@ BDEPEND="
 		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_prepare() {
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DLLDB_ENABLE_CURSES=$(usex ncurses)
@@ -87,7 +76,7 @@ src_configure() {
 
 		-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)")}"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)
 
 	cmake_src_configure
diff --git a/dev-util/lldb/lldb-11.0.0.9999.ebuild b/dev-util/lldb/lldb-11.0.0.9999.ebuild
index ecdb75359b11..2dfe01834ca3 100644
--- a/dev-util/lldb/lldb-11.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-11.0.0.9999.ebuild
@@ -4,8 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm llvm.org multiprocessing python-single-r1 \
-	toolchain-funcs
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
 
 DESCRIPTION="The LLVM debugger"
 HOMEPAGE="https://llvm.org/"
@@ -43,21 +42,11 @@ BDEPEND="
 		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_prepare() {
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DLLDB_ENABLE_CURSES=$(usex ncurses)
@@ -87,7 +76,7 @@ src_configure() {
 
 		-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)")}"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)
 
 	cmake_src_configure
diff --git a/dev-util/ltrace/Manifest b/dev-util/ltrace/Manifest
index 3e5e518878ef..238553d6b42c 100644
--- a/dev-util/ltrace/Manifest
+++ b/dev-util/ltrace/Manifest
@@ -1,3 +1,4 @@
+AUX ltrace-0.7.3-CXX-for-tests.patch 255 BLAKE2B cd213eff103c4efa9a96a28a333825b32b43333b07a6e25ccbf5a216ba12a0fa1e38f5a1b4644ca19f9eec0df0cddb8fae95a92e5e44af497aacc448a2eb58c6 SHA512 02ecca05ff34739c234f9b3a2331b10f2bb62289c2698095a4276fdb76d3494e1657c7551a5933876bf5b722db3a1c62dd839db7768ebd69c897b4a109bd5cc5
 AUX ltrace-0.7.3-alpha-protos.patch 541 BLAKE2B 727e9acb2c12cfda3d5c15903bda8bff9e8f8823a03daa3031d4cb022b9735026e14d9e6d756c568a92401f546589aa94b099c27d6fa1555d365b0d00ce041a2 SHA512 32738dd0688c861961703a5e5c0e14324218f3ecdfdbcef0977522e2de1c9d77fc0fa1a3ea0d2074190293bf360cf8b5adfa16c67a002a1df38e37c70c024595
 AUX ltrace-0.7.3-ia64-pid_t.patch 184 BLAKE2B 4d739f7ad6474541cec166cc1262637edbf30b32ef3335ac92e834bd611472de5473801ad307b7ba56eec0657bbcceea48d7fe17517663c6389d0843e9a9d5bc SHA512 1029f86f3b3e33eebcdbafa6dc56e2ece2a33234a6b7a0b05e4bb87424829c5f512e019e6c6a962e639a9cfeac56edea3d0ac250fc31489755e68d2181ce254f
 AUX ltrace-0.7.3-ia64.patch 1538 BLAKE2B 2a407d2e19e74ddf22da1371cf72585cec5c630d00670798c6c8e9b3991d3aac641784bceeda544b49e76ae572c487bc5455de4239aa967e25318625e0307e0f SHA512 c6e7576047aa06eca67a80ecaa008854a2e312b1d38693cc802a6b6be6f671003716c6a0d3268fb3f076f3311fb27c228f55220bcb2432afd0210542020764ad
@@ -8,7 +9,8 @@ AUX ltrace-0.7.3-no-error.h.patch 885 BLAKE2B a893550c62e4a479405f8dd3e4c41c01d0
 AUX ltrace-0.7.3-pid_t.patch 179 BLAKE2B 7782ab18e9ec8233ed4d60aed339175e1a30f6f3f589d8a7e9eeaa228918cfba6b00528790cf2908adc785c28231e208b96a7c76fd0daa914f9ce6bdb91b01ba SHA512 87e5f49c89dcdd3218547bcd57f0ae05253d4756abb4d4981d78501a6b1de2d5389987fd90d59fe41348a0ad2b56b62a8e087e9092533e12f2cdcd800abfa8db
 AUX ltrace-0.7.3-print-test-pie.patch 774 BLAKE2B e67bedbd0ea2470007390634fe588ee7cd074cff4b90f57fe821f6124d4aee9e2cb8f60b46b7007659d5a29d929cf579c38d858c31b8667ba50f64d579909c81 SHA512 9f407805719f21838fa3d2c48aaa96025fb4785a28b5b4e50b2593093067ed6cb406dbb662e0178e84e9db101b4cfa12867127cd212abf6417130e7cb4c21002
 AUX ltrace-0.7.3-test-protos.patch 2551 BLAKE2B 48998f9db4875b8e2af6727b51fc8666cc4f10cbc55bbc4bf32a2b54f1f1032f7c7f07c5196ffff53e23183010eb68df862b4fceaab56d30a580eeaadeeb6f17 SHA512 4652b3f920ad3669d2e6076775b9a598bd999a0fa5319c490f580d93c63f53bd0e3db61cf7a61c5db3a436789802b8fa9646f84ee76e8f37f4f3afb827b84f34
+AUX ltrace-0.7.3-tuple-tests.patch 460 BLAKE2B f8beacb8468f7842603e6abd1aeace86ad52cd9347fab1fb7ee243bfc1b536b42d91405380354476bc68c033687216561f6512e82bedca6e525407e79dcab2dd SHA512 07a1808ea6a9564c891ce0caec9cbb0e55975a171c46a6bb3358a9e16f217cd4bbd4b3c39a0e278b34e9c542199e13afdbe817bc2ba26390e879edbda71bf993
 DIST ltrace_0.7.3-4.debian.tar.gz 11373 BLAKE2B 3004bef4e0181e28606e1c50dcc2265d9869e51bf11288185da46f7a77a0aaffb41af75f84baa7d094f9f752071c9e8f53c565982a955e3250a7fc721c529b20 SHA512 67a868c95703ca9cd8407905e3be416e3a66920f41d9deb78fadb71719d7d3f1a3f67ffcb575acff4bf7e4715102f3a6b0f67c6adb74f37ee66c398c132ff04b
 DIST ltrace_0.7.3.orig.tar.bz2 482658 BLAKE2B 30d1dbb178a41043e4bbbac17a23676db202b64327c9bb4393ae7ace9f5e1a1e2a5ded56cabc7faf2ea55b22ed17126a94c121147aeefb40250710b7307a50d3 SHA512 a842b16dcb81da869afa0bddc755fdff0d57b35672505bf2c7164fd983b1938d28b126714128930994cc1230ced69d779456d0cfc16f4008c9b6d19f0852285d
-EBUILD ltrace-0.7.3_p4-r1.ebuild 1725 BLAKE2B 5b7a5b9f7aaeb0e0132ba550f35bee99ad18ea794e1242ce657049dad5346f1af9e51efb5492fa362b4aeb4d99f91ba15d518a972bc30b0d53bbc2fab18ec733 SHA512 eb2f6ca133e89b75a4ea1073a9cea10fc5b345861fc836c202aafa188669db062c77be99202af588a432f77aa1200500d5abc007a459b9b275f1a90f4b65ddcb
+EBUILD ltrace-0.7.3_p4-r1.ebuild 1817 BLAKE2B 9dc0e9cdcf0b311522e3eb466a0d3bd1a1c60c8625ed61bcd645a67de3b3745de8579bc5bd58fffa90c0210217c1a460175d7c08bd675dd8095e78c215033a3e SHA512 68a303ef5f31fee2ee4c1585dd8e2ec12c047566eaa2389660fb2dd54b7017991a8dc2dc5c763a9ad6bed8016a7253d3c4079d96bfd637568fdc17752312cc2b
 MISC metadata.xml 357 BLAKE2B 393847ec554b92576d20a2e88b3f89b86d93ad51107161c0e5fe198415ad6f8d941418d89b438237f52c6e2cef942b449e8112f5619e219058a7f797a6b261dc SHA512 fff13f831e3d3994abc654ab5c5cb97e14cbec653d42074300cf81b22da05e5318a55ae4b28198fdc7aa8169464385939f5a889ca5ba86c45aa39dfe24772a95
diff --git a/dev-util/ltrace/files/ltrace-0.7.3-CXX-for-tests.patch b/dev-util/ltrace/files/ltrace-0.7.3-CXX-for-tests.patch
new file mode 100644
index 000000000000..06db36c46818
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.7.3-CXX-for-tests.patch
@@ -0,0 +1,11 @@
+Testsuite uses CXX to trace mangled symbols.
+--- a/configure.ac
++++ b/configure.ac
+@@ -53,6 +53,7 @@ AC_SUBST(HOST_CPU)
+ 
+ # Checks for programs.
+ AC_PROG_CC
++AC_PROG_CXX
+ LT_INIT
+ # libtool-2:  LT_INIT()
+ AM_INIT_AUTOMAKE([foreign no-exeext dist-bzip2])
diff --git a/dev-util/ltrace/files/ltrace-0.7.3-tuple-tests.patch b/dev-util/ltrace/files/ltrace-0.7.3-tuple-tests.patch
new file mode 100644
index 000000000000..9abeb28b4883
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.7.3-tuple-tests.patch
@@ -0,0 +1,12 @@
+Use $CC instead of gcc in testsuite.
+--- a/testsuite/Makefile.am
++++ b/testsuite/Makefile.am
+@@ -39,6 +39,8 @@ env.exp: Makefile
+ 	rm -f env.exp
+ 	echo set libelf_LD_LIBRARY_PATH '"$(libelf_LD_LIBRARY_PATH)"' >> $@
+ 	echo set libunwind_LD_LIBRARY_PATH '"$(libunwind_LD_LIBRARY_PATH)"' >> $@
++	echo set CC_FOR_TARGET '"$(CC)"' >> $@
++	echo set CXX_FOR_TARGET '"$(CXX)"' >> $@
+ 
+ CLEANFILES = *.o *.so *.log *.sum *.ltrace site.bak setval.tmp site.exp env.exp
+ 
diff --git a/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild b/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
index 0f327a431cd5..bf48fa668be1 100644
--- a/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
+++ b/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
@@ -45,6 +45,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.7.3-no-error.h-2.patch #713428
 	"${FILESDIR}"/${PN}-0.7.3-no-REG_NOERROR.patch #713428
 	"${FILESDIR}"/${PN}-0.7.3-pid_t.patch #713428
+	"${FILESDIR}"/${PN}-0.7.3-tuple-tests.patch
+	"${FILESDIR}"/${PN}-0.7.3-CXX-for-tests.patch
 )
 
 src_prepare() {
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 5099181736b8..0325ed210f52 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -14,17 +14,17 @@ DIST cuda_8.0.61_375.26_linux.run 1465528129 BLAKE2B d52ddf1dcf5246f230f210d10d1
 DIST cuda_9.0.176_384.81_linux.run 1643293725 BLAKE2B 4155de544f877f6c420c2463bc68679cc89774f0516d1885d5c3f483ad86e7f25ecf6042b8240431b814230136f3026196a013bb18184fa2ec9af555bb7ea723 SHA512 00e24638c02d049c575732dee5237db21f7c451b606f37cf95e44e89d47d0cb055255e9f70dc013298c9e0d224147f239488558904556b68572e3f31935489a9
 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 3382 BLAKE2B cae51723741ab8df744632928215d37054ae752afe32f259cbb84c194c33a5abefb023253c49a9574fd4ffbbed44fb25c4f4bced6b7ac6cae7a10d9d5dbd0d73 SHA512 845c15e77c776515718b13d4ed9c8871abef20d5ebb7438d1df0deb73958ad35e131dfdb647defc4751b62ca7768cb4867bb6e1dab8acc320fb10379249dde07
-EBUILD nvidia-cuda-toolkit-10.1.105-r2.ebuild 3887 BLAKE2B c0f464d8cd2c52be80d7c7535a6ca7ab3e06ddcba52306f7f1227dda01cd8868e03eb9777989dd88f6287ff96feb6551767d814750bc0c9c7d99d575452d0ca0 SHA512 3c34d7d9f3d027d3fbfc4c8a69bb44811ade1591a6632a726062c091cae36bf63e300ee074cb4d4ea7a2a42ef732e03246e5a9a34537af37046a343b6f03e50b
-EBUILD nvidia-cuda-toolkit-10.1.168-r1.ebuild 3887 BLAKE2B e9df76e5cc921a5708a489fd657ccf742afcec6e09044ef9d92dc357d30c9ab8ae256c81ce2746354ae8d785b5cc74e695ecef83e0b41b52efafc0109c621dab SHA512 669f163ea20031634a9d706208b50b15e436c25145eab353ae805b92eb416d23e4fa4ac50160c854b35e8ad85b5cb0ecad7ee295b5bb5581b9a11d5d79b3ef94
-EBUILD nvidia-cuda-toolkit-10.1.243-r2.ebuild 4200 BLAKE2B 5406dabc6b45409da171afb0847087918adb5a2556be1d97e9ef7ce4a262f4ddc7ea19275e4c8e9615aa85dc718a0fc87bacbf9b38b0ce5d8e9116eec9611999 SHA512 719b3aa8ddbcfe91dc5cf69005425a9ce34f4b558da78a2623e149226fd9b1a519f23f532a025712f142117a30734faac85dad958df4d23dd53d92e921083ac7
-EBUILD nvidia-cuda-toolkit-10.2.89-r1.ebuild 3954 BLAKE2B 2fc75574df2c7aa5ea30dc8b7b52091990e6a533fdb50eac36709a334fa04a3718e76eee34512abf20997734a3594afc89db497f697b934fbcef1475443b3a38 SHA512 07f439585a77fefc4975f3dd01ab9b0181eb01611311d7cbcca023969df773b500d27d39c4dca4ff06d072bfb3a20178f0c91053d4471dd298431fe19a9cc9fc
-EBUILD nvidia-cuda-toolkit-6.5.14.ebuild 3864 BLAKE2B bd57f3d666603b50a9ec67893aac970f5e6dcb97942e49556e21ca5c95993654b5c604003e02cb449d8df472ae84ebb5bae1160574a0988c012601bb3357ce25 SHA512 f8f1a2dd806c389b89e04d117e4459dcf062e11896acf43bfa9e2c6b58ae0b0b2b7f3747bb4be04d24766970362a6bd8ea6503e124080a7f8cbe56782aa18801
-EBUILD nvidia-cuda-toolkit-6.5.19-r1.ebuild 3890 BLAKE2B f2d0faa2ef9cab8a89c5cab111052c06a4d2a672024e2d257418f1b29de943f553b09e3de5b09fc8d44b121a73a9e0951a7112479ceb582eddf853afc7d82b1b SHA512 2ffb2135346f3bf514f35b8d65b160547b2c304dda77d170798c53f7e38497129f311df48d91b5b82e6341d6d0e0e43c88ab0bb6545296c8642e37005ae013f9
-EBUILD nvidia-cuda-toolkit-7.5.18-r2.ebuild 3401 BLAKE2B eb2092bd784b30de4b74e761fe35e142bfb209463e898e803d3874d8137324969feef03db6a8bcbc71205c32dcab7eecdbdd91223a1de12ff969e1d49efa7d82 SHA512 3d19df13a3797af8fb7ec69311dbc733e62d6909fb94fab1aada02914cb9fb63a6be986d53f27133d7da8e33743419b96029991e26eae30663fab684653c3fce
-EBUILD nvidia-cuda-toolkit-8.0.44.ebuild 3342 BLAKE2B 0eab1f64b07bad73e97179997a8d11a64580289c0ca7f3e6460b2828615d3410831c22a50c8aee3ce9a9ef09dce030e32209ff3ea69989bb23cb9e5e4668eaae SHA512 612c8f48974d578c1b41cb3563b6e436cdd95e444e44e3dfaa44f08345cafa3d8875c2e9a910102c4ff49a2af240476559055928474480734f79217522b5d480
-EBUILD nvidia-cuda-toolkit-8.0.61.ebuild 3397 BLAKE2B dd77c3dea5fb0c938a1c7936f98c2e5fa143a6b2ac129f00cca3841062b89c12485df3cfd2890779ac549a798ac4f8da01445a17e2ead261792ea660d55d73f6 SHA512 e44c46cdc82386d414b4fc90169ec50cc572c0c8082b481901b6ed4f620c6c6398041ce485236e019c797e285c8ba41aea9d93a936e4aaadc7013bb77638766a
-EBUILD nvidia-cuda-toolkit-9.0.176.ebuild 3404 BLAKE2B 91d2ac0d318ba093b2b42ff1d4e14b512ab3c627e3018e1b620d3b18b32245325f216d785ae288300a9a092bb34e943230964ae8ae579dd78a30592cd86de9d6 SHA512 40010b7425d2b149fa05ee747f388cf02d2ec08b122ae490db4c28ddf42743b88cb73ee3873846c6cf192a8f38dd051ff8a611dc46e96bf023d75ed2b42613ed
-EBUILD nvidia-cuda-toolkit-9.1.85.ebuild 3380 BLAKE2B dd8b080e917b5d5f53debb7c87c652aab2bc58ffcddd50926bb26d387ace61e8e23123d79c2558ddf975626897c5984586ad61d6cce64f10cf1c5d64fae44235 SHA512 43de5a8255dbfd6601f708715f49a71ef86ecf4835d5062f7dd38e190374e0a62b644d24e323363a842ccc313c1f593a1f2b7ba08d71389ed7afa97968966889
-EBUILD nvidia-cuda-toolkit-9.2.88.ebuild 3382 BLAKE2B b8ddd4bad562e88ef49344669a8a3d6c7a121c356a5249ae7f1f6534cac4123416c818cc3d790afa2a8be5f5b2d34aa66267f5863d74bd5c1bf195de66b1716a SHA512 b87b444a0cf549c05022b2ca46523f8e4fc011f4f921bec7e91601331d296144a06b5f85e3b25ce904c8af9a1fbcaea761d0a29c11aea4f3a52fc9a0e7dbae45
+EBUILD nvidia-cuda-toolkit-10.0.130.ebuild 3420 BLAKE2B 5a3f19022476d35310212ca6950f0a57555caa8ea0af9e670f096eec342454b730323a856b129c20315ee9bd17f6576e4c132a7c8009ea0b999e532c35ce2949 SHA512 4d3a56c7b2319ee3fb00caccf21d7c173429f1e59a64be6c08a6eb35235e9eca4d9dc3f12e12ff6fb0d14d455fcc1c53220f7c356612a1b89c03cc9db92288d9
+EBUILD nvidia-cuda-toolkit-10.1.105-r3.ebuild 3925 BLAKE2B 6a5bef41d998a705c8abc75f4f19d5866063cf28f346c33833b698b3a55e942435c159d4c4a64314bbe78370f062c2f09db4becc28bd0059750ee1fb41eb314a SHA512 21cd3cdc06e4ca31cd3d4e279226c849849eb39f515612fcf2ea20110e333ff962960f3f6f4a8efa3344d58db8e6c241a8f74fb6d8e305ba045b4a6537856c2a
+EBUILD nvidia-cuda-toolkit-10.1.168-r2.ebuild 3925 BLAKE2B e43bab5926ca7649293281a6a964b93ee639da955519e616fe82b0d607c52874fa153f622496259d3848146ea08b4d447002714b10382ea417be26effe255746 SHA512 379e6ab18e78e5f66fdc9976556e3edc9b8937de57a7e582567e6237cfd5e412637ce0127e84504bb2b750f40062112488bd8a29faf0b8940a8f04d6e68ea1ee
+EBUILD nvidia-cuda-toolkit-10.1.243-r3.ebuild 4238 BLAKE2B 07fdf4e6eb0ac919a73b0f9d72e7859446f6c9a4f2500430537e79d8cb6f512659c2a56624bec7d7913723f9e6000ecf83746da30e745a43f7631a17648aecbb SHA512 3a5e9a96999c0f23b05f2b3c7452b0f662985e7e3a0ae94cf0619ffd12c96387d540fc2fa58ba2e69933f6fc046387668b06003a1e9d6efec127254ec3043d34
+EBUILD nvidia-cuda-toolkit-10.2.89-r2.ebuild 3992 BLAKE2B 858d1b4db64e393f061a36c3e8f22dfa83bb2e4d083ca5d987eb80b1e74ed2fb51923ecc49a4e32f52291d6ef84e1d82ab257bb345d11225e92be1368b5f4f9d SHA512 047735e7b92f12a7152b950c88d8c6b09da7772a31f4b133c8af5c8295f55d81b312b796b481dd7f6ae6767d3f2632a280533c6bcd5a22ec705dfcbd3933a94b
+EBUILD nvidia-cuda-toolkit-6.5.14.ebuild 3902 BLAKE2B fb559c6ca55638853cede289104f9528bc939f10c20b9c67d168caf6cc3962c06e56f25961a17acfef4c143a95648efbc7d37f2362ef4af3f40d9d289ef88dcf SHA512 c810885c9fd7747d61078fedcefe4180da8aaa4ee7fa8822908f7d8dc649fd488781ea570f9f078c6a91ac7949cef3f112e8fe8a6bca3bb0d662abbe0ba755e9
+EBUILD nvidia-cuda-toolkit-6.5.19-r1.ebuild 3928 BLAKE2B a3cc31983db891d496f5172bce661a5f1fd77a10afe0fb4ea1e243121530fc5560257c5846cc240da52986c7e6157feaace7047d0c675d0653144f5a42263a21 SHA512 9705c2ee7e76b5a66b20e08ca84c4ff998405a0816bbdd2e3d56eed21115ca154219d079943966525c71460baafdaf2858e2c7c6e08c44eff45db1be4d8c1f0f
+EBUILD nvidia-cuda-toolkit-7.5.18-r2.ebuild 3439 BLAKE2B d1f61624448cdcd69db1a592d6fa4a78004fa8021b591efaa64dcd46263a2803f4983782b87ec9a3a89834e4ed99ab26f7dd706dee2a631887b1ac96b2080d4d SHA512 0c191cb31f5349a7a09c88c1d06e52ce025421a61a2c2bfc925a058b33f855585ccf20d538943c8e7f4d77fd1bb926d16fed76efa467e0a4380ba4b7f93f2c7f
+EBUILD nvidia-cuda-toolkit-8.0.44.ebuild 3380 BLAKE2B b24971d859d08a3011f36751551b91fce3a39424bcbdd0dcdffa4eaa6a3f396f80397ea30e7233c28f2d04c6f22ad62d84ad25277e3d4840714e3b1c6fc4d77c SHA512 8779c0a248e9e6fe16e6eacd739f995c0d07f4d0d973487fe9c8faa64840df1df29ab925aaf940eb763e487f4e26869205dea93be7cf6ab31a240d33151783f5
+EBUILD nvidia-cuda-toolkit-8.0.61.ebuild 3435 BLAKE2B f404d22f374dad343031ed38a7223069e4e10c3b7f93122f415803bc3f6ec868f92bbcd3104b1e43899f77d990f429befcee77846e92c20830586b6e8c665e04 SHA512 1fa6bea7b82dd4264608ef3e73f589061617bd05c7c15e343a0f548c5f37845ea85ffdc4fe6151e7e798781beaeea015309f2cb42170a4991ca0db8f98ab6756
+EBUILD nvidia-cuda-toolkit-9.0.176.ebuild 3442 BLAKE2B da89d56a1c4e12b9048f3251464a21aa10b287c294f16e9e03d5182f4f7684efb05ab3c6f7fb0e1b7b326899405ce79f407468f00f04a5b12cfb6a4fcc4ceaca SHA512 469619f9ba3dac697353d0761b47e169833571bc20e3b7f59c124df3bc0237a9d1e8eaca74ffafa0fe615bbc0950cd829b358b10bf6939cd0236f7f37d22f6ff
+EBUILD nvidia-cuda-toolkit-9.1.85.ebuild 3418 BLAKE2B 27debd5814eb6814fbffdc2241015663643c5028d6144426bb530705f974383153c3a5a0480e8c3a837fb157811a44dfd3800c58a9e30ba919c91623b32d21a7 SHA512 4972987db01a4826a86386313caa11d27a6f3e7a5c0e87096a7a299a7a83314a10170e9d8f22c3d5dcda29c7ef000824226def568a968ebe668d437193d4f952
+EBUILD nvidia-cuda-toolkit-9.2.88.ebuild 3420 BLAKE2B c0b4f78b1a1947b8414ab2dd163365b189edf15b49465c24f104b424bc11b9b92bd36c633226f5b1a4c01b84721247e58b4501952f96f60531ed42b1eebff3f8 SHA512 c9e5bf620e9d29495d623c70a574e5f1847eef4464820229a77c6ceb25b150be5c8d0c2612193b2ba5fd1642d60d8d0a619f679825355cd7bd42cbaea03f1620
 MISC metadata.xml 456 BLAKE2B 9c2baf84429d6969aad82a907a25acb5080bcfb3a5eb996f235ad05ed6ef5345df1c268bee9398c105f5926184f6179f46f98b396397266eef82ee9f6e7db470 SHA512 7745eb56d4a3a9a7d01e3143e807f2018d288c00bcc6c3bd0624c989d4e15ac5521dc087553cd643ff04392c1ac9964578fe03d05947eb2ed4cae21bceb9c67c
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.0.130.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.0.130.ebuild
index b2be76e7a5c0..580358a10731 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.0.130.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.0.130.ebuild
@@ -48,6 +48,7 @@ src_unpack() {
 src_prepare() {
 	local cuda_supported_gcc
 
+	# ATTENTION: change requires revbump
 	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3"
 
 	sed \
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105-r2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105-r2.ebuild
deleted file mode 100644
index f22b3bd5b0b0..000000000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105-r2.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit check-reqs cuda toolchain-funcs unpacker
-
-MYD=$(ver_cut 1-2 ${PV})
-DRIVER_PV="418.39"
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
-
-LICENSE="NVIDIA-CUDA"
-SLOT="0/${PV}"
-KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="debugger doc eclipse profiler"
-RESTRICT="bindist mirror"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	<sys-devel/gcc-9[cxx]
-	>=x11-drivers/nvidia-drivers-396.24[X,uvm]
-	debugger? (
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses-compat:5[tinfo]
-		)
-	eclipse? ( >=virtual/jre-1.6 )
-	profiler? ( >=virtual/jre-1.6 )"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-
-CHECKREQS_DISK_BUILD="6100M"
-
-pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	local cuda_supported_gcc
-
-	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3 8.2 8.3 8.4"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-
-	default
-}
-
-src_install() {
-	local i remove=( doc jre run_files install-linux.pl cuda-installer.pl )
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}${cudadir}"
-
-	cd builds/cuda-toolkit
-	if use doc; then
-		DOCS+=( doc/pdf/. )
-		HTML_DOCS+=( doc/html/. )
-	fi
-	einstalldocs
-
-	mv doc/man/man3/{,cuda-}deprecated.3 || die
-	doman doc/man/man*/*
-
-	use debugger || remove+=( bin/cuda-gdb bin/cuda-gdbserver extras/Debugger share/gdb extras/cuda-gdb-${PV}.src.tar.gz )
-
-	if use profiler; then
-		# hack found in install-linux.pl
-		for i in nvvp nsight; do
-			cat > bin/${i} <<- EOF || die
-				#!/usr/bin/env sh
-				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
-					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
-					${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java
-			EOF
-			chmod a+x bin/${i} || die
-		done
-	else
-		use eclipse || remove+=( libnvvp libnsight nsightee_plugins NsightCompute-2019.1 NsightSystems-2018.3 bin/nsight bin/nsight_ee_plugins_manage.sh bin/nvvp bin/computeprof )
-		remove+=( extras/CUPTI bin/nvprof )
-	fi
-
-	for i in "${remove[@]}"; do
-		ebegin "Cleaning ${i}..."
-		rm -rf "${i}" || die
-		eend
-	done
-
-	dodir ${cudadir}
-	into ${cudadir}
-
-	# Install binaries separately to make sure the X permission is set
-	local bindirs=( bin nvvm/bin extras/demo_suite $(usex profiler "libnsight/nsight") )
-	for i in $(find "${bindirs[@]}" -maxdepth 1 -type f); do
-		exeinto ${cudadir}/${i%/*}
-		doexe ${i}
-		rm ${i} || die
-	done
-	exeinto ${cudadir}/bin
-	doexe "${T}"/cuda-config
-
-	# Install the rest
-	insinto ${cudadir}
-	doins -r *
-
-	cat > "${T}"/99cuda <<- EOF || die
-		PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
-	EOF
-	doenvd "${T}"/99cuda
-
-	#Cuda prepackages libraries, don't revdep-build on them
-	echo "SEARCH_DIRS_MASK=\"${ecudadir}\"" > "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
-
-pkg_postinst_check() {
-	local a b
-	a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
-	b="0.0"
-	for v in $a; do
-		if ver_test "${v}" -gt "${b}"; then
-			b="${v}"
-		fi
-	done
-
-	# if gcc and if not gcc-version is at least greatest supported
-	if tc-is-gcc && \
-		ver_test $(gcc-version) -gt ${b}; then
-			ewarn ""
-			ewarn "gcc >= ${b} will not work with CUDA"
-			ewarn "Make sure you set an earlier version of gcc with gcc-config"
-			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
-			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
-			ewarn "to the nvcc compiler flags"
-			ewarn ""
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105-r3.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105-r3.ebuild
new file mode 100644
index 000000000000..529ba9f63de0
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105-r3.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit check-reqs cuda toolchain-funcs unpacker
+
+MYD=$(ver_cut 1-2 ${PV})
+DRIVER_PV="418.39"
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
+
+LICENSE="NVIDIA-CUDA"
+SLOT="0/${PV}"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger doc eclipse profiler"
+RESTRICT="bindist mirror"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	<sys-devel/gcc-9[cxx]
+	>=x11-drivers/nvidia-drivers-396.24[X,uvm]
+	debugger? (
+		sys-libs/libtermcap-compat
+		sys-libs/ncurses-compat:5[tinfo]
+		)
+	eclipse? ( >=virtual/jre-1.6 )
+	profiler? ( >=virtual/jre-1.6 )"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/cuda/*"
+
+CHECKREQS_DISK_BUILD="6100M"
+
+pkg_setup() {
+	# We don't like to run cuda_pkg_setup as it depends on us
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	local cuda_supported_gcc
+
+	# ATTENTION: change requires revbump
+	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3 8.2 8.3 8.4"
+
+	sed \
+		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+	default
+}
+
+src_install() {
+	local i remove=( doc jre run_files install-linux.pl cuda-installer.pl )
+	local cudadir=/opt/cuda
+	local ecudadir="${EPREFIX}${cudadir}"
+
+	cd builds/cuda-toolkit
+	if use doc; then
+		DOCS+=( doc/pdf/. )
+		HTML_DOCS+=( doc/html/. )
+	fi
+	einstalldocs
+
+	mv doc/man/man3/{,cuda-}deprecated.3 || die
+	doman doc/man/man*/*
+
+	use debugger || remove+=( bin/cuda-gdb bin/cuda-gdbserver extras/Debugger share/gdb extras/cuda-gdb-${PV}.src.tar.gz )
+
+	if use profiler; then
+		# hack found in install-linux.pl
+		for i in nvvp nsight; do
+			cat > bin/${i} <<- EOF || die
+				#!/usr/bin/env sh
+				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
+					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
+					${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java
+			EOF
+			chmod a+x bin/${i} || die
+		done
+	else
+		use eclipse || remove+=( libnvvp libnsight nsightee_plugins NsightCompute-2019.1 NsightSystems-2018.3 bin/nsight bin/nsight_ee_plugins_manage.sh bin/nvvp bin/computeprof )
+		remove+=( extras/CUPTI bin/nvprof )
+	fi
+
+	for i in "${remove[@]}"; do
+		ebegin "Cleaning ${i}..."
+		rm -rf "${i}" || die
+		eend
+	done
+
+	dodir ${cudadir}
+	into ${cudadir}
+
+	# Install binaries separately to make sure the X permission is set
+	local bindirs=( bin nvvm/bin extras/demo_suite $(usex profiler "libnsight/nsight") )
+	for i in $(find "${bindirs[@]}" -maxdepth 1 -type f); do
+		exeinto ${cudadir}/${i%/*}
+		doexe ${i}
+		rm ${i} || die
+	done
+	exeinto ${cudadir}/bin
+	doexe "${T}"/cuda-config
+
+	# Install the rest
+	insinto ${cudadir}
+	doins -r *
+
+	cat > "${T}"/99cuda <<- EOF || die
+		PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")
+		ROOTPATH=${ecudadir}/bin
+		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
+	EOF
+	doenvd "${T}"/99cuda
+
+	#Cuda prepackages libraries, don't revdep-build on them
+	echo "SEARCH_DIRS_MASK=\"${ecudadir}\"" > "${T}/80${PN}" || die
+	insinto "/etc/revdep-rebuild"
+	doins "${T}/80${PN}"
+}
+
+pkg_postinst_check() {
+	local a b
+	a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
+	b="0.0"
+	for v in $a; do
+		if ver_test "${v}" -gt "${b}"; then
+			b="${v}"
+		fi
+	done
+
+	# if gcc and if not gcc-version is at least greatest supported
+	if tc-is-gcc && \
+		ver_test $(gcc-version) -gt ${b}; then
+			ewarn ""
+			ewarn "gcc >= ${b} will not work with CUDA"
+			ewarn "Make sure you set an earlier version of gcc with gcc-config"
+			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
+			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
+			ewarn "to the nvcc compiler flags"
+			ewarn ""
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.168-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.168-r1.ebuild
deleted file mode 100644
index e40b358d6b8f..000000000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.168-r1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit check-reqs cuda toolchain-funcs unpacker
-
-MYD=$(ver_cut 1-2 ${PV})
-DRIVER_PV="418.67"
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
-
-LICENSE="NVIDIA-CUDA"
-SLOT="0/${PV}"
-KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="debugger doc eclipse profiler"
-RESTRICT="bindist mirror"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	<sys-devel/gcc-9[cxx]
-	>=x11-drivers/nvidia-drivers-396.24[X,uvm]
-	debugger? (
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses-compat:5[tinfo]
-		)
-	eclipse? ( >=virtual/jre-1.6 )
-	profiler? ( >=virtual/jre-1.6 )"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-
-CHECKREQS_DISK_BUILD="6100M"
-
-pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	local cuda_supported_gcc
-
-	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3 8.2 8.3 8.4"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-
-	default
-}
-
-src_install() {
-	local i remove=( doc jre run_files install-linux.pl cuda-installer.pl )
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}${cudadir}"
-
-	cd builds/cuda-toolkit
-	if use doc; then
-		DOCS+=( doc/pdf/. )
-		HTML_DOCS+=( doc/html/. )
-	fi
-	einstalldocs
-
-	mv doc/man/man3/{,cuda-}deprecated.3 || die
-	doman doc/man/man*/*
-
-	use debugger || remove+=( bin/cuda-gdb bin/cuda-gdbserver extras/Debugger share/gdb extras/cuda-gdb-${PV}.src.tar.gz )
-
-	if use profiler; then
-		# hack found in install-linux.pl
-		for i in nvvp nsight; do
-			cat > bin/${i} <<- EOF || die
-				#!/usr/bin/env sh
-				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
-					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
-					${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java
-			EOF
-			chmod a+x bin/${i} || die
-		done
-	else
-		use eclipse || remove+=( libnvvp libnsight nsightee_plugins NsightCompute-2019.1 NsightSystems-2018.3 bin/nsight bin/nsight_ee_plugins_manage.sh bin/nvvp bin/computeprof )
-		remove+=( extras/CUPTI bin/nvprof )
-	fi
-
-	for i in "${remove[@]}"; do
-		ebegin "Cleaning ${i}..."
-		rm -rf "${i}" || die
-		eend
-	done
-
-	dodir ${cudadir}
-	into ${cudadir}
-
-	# Install binaries separately to make sure the X permission is set
-	local bindirs=( bin nvvm/bin extras/demo_suite $(usex profiler "libnsight/nsight") )
-	for i in $(find "${bindirs[@]}" -maxdepth 1 -type f); do
-		exeinto ${cudadir}/${i%/*}
-		doexe ${i}
-		rm ${i} || die
-	done
-	exeinto ${cudadir}/bin
-	doexe "${T}"/cuda-config
-
-	# Install the rest
-	insinto ${cudadir}
-	doins -r *
-
-	cat > "${T}"/99cuda <<- EOF || die
-		PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
-	EOF
-	doenvd "${T}"/99cuda
-
-	#Cuda prepackages libraries, don't revdep-build on them
-	echo "SEARCH_DIRS_MASK=\"${ecudadir}\"" > "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
-
-pkg_postinst_check() {
-	local a b
-	a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
-	b="0.0"
-	for v in $a; do
-		if ver_test "${v}" -gt "${b}"; then
-			b="${v}"
-		fi
-	done
-
-	# if gcc and if not gcc-version is at least greatest supported
-	if tc-is-gcc && \
-		ver_test $(gcc-version) -gt ${b}; then
-			ewarn ""
-			ewarn "gcc >= ${b} will not work with CUDA"
-			ewarn "Make sure you set an earlier version of gcc with gcc-config"
-			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
-			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
-			ewarn "to the nvcc compiler flags"
-			ewarn ""
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.168-r2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.168-r2.ebuild
new file mode 100644
index 000000000000..d9a0f446a8af
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.168-r2.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit check-reqs cuda toolchain-funcs unpacker
+
+MYD=$(ver_cut 1-2 ${PV})
+DRIVER_PV="418.67"
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
+
+LICENSE="NVIDIA-CUDA"
+SLOT="0/${PV}"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger doc eclipse profiler"
+RESTRICT="bindist mirror"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	<sys-devel/gcc-9[cxx]
+	>=x11-drivers/nvidia-drivers-396.24[X,uvm]
+	debugger? (
+		sys-libs/libtermcap-compat
+		sys-libs/ncurses-compat:5[tinfo]
+		)
+	eclipse? ( >=virtual/jre-1.6 )
+	profiler? ( >=virtual/jre-1.6 )"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/cuda/*"
+
+CHECKREQS_DISK_BUILD="6100M"
+
+pkg_setup() {
+	# We don't like to run cuda_pkg_setup as it depends on us
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	local cuda_supported_gcc
+
+	# ATTENTION: change requires revbump
+	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3 8.2 8.3 8.4"
+
+	sed \
+		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+	default
+}
+
+src_install() {
+	local i remove=( doc jre run_files install-linux.pl cuda-installer.pl )
+	local cudadir=/opt/cuda
+	local ecudadir="${EPREFIX}${cudadir}"
+
+	cd builds/cuda-toolkit
+	if use doc; then
+		DOCS+=( doc/pdf/. )
+		HTML_DOCS+=( doc/html/. )
+	fi
+	einstalldocs
+
+	mv doc/man/man3/{,cuda-}deprecated.3 || die
+	doman doc/man/man*/*
+
+	use debugger || remove+=( bin/cuda-gdb bin/cuda-gdbserver extras/Debugger share/gdb extras/cuda-gdb-${PV}.src.tar.gz )
+
+	if use profiler; then
+		# hack found in install-linux.pl
+		for i in nvvp nsight; do
+			cat > bin/${i} <<- EOF || die
+				#!/usr/bin/env sh
+				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
+					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
+					${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java
+			EOF
+			chmod a+x bin/${i} || die
+		done
+	else
+		use eclipse || remove+=( libnvvp libnsight nsightee_plugins NsightCompute-2019.1 NsightSystems-2018.3 bin/nsight bin/nsight_ee_plugins_manage.sh bin/nvvp bin/computeprof )
+		remove+=( extras/CUPTI bin/nvprof )
+	fi
+
+	for i in "${remove[@]}"; do
+		ebegin "Cleaning ${i}..."
+		rm -rf "${i}" || die
+		eend
+	done
+
+	dodir ${cudadir}
+	into ${cudadir}
+
+	# Install binaries separately to make sure the X permission is set
+	local bindirs=( bin nvvm/bin extras/demo_suite $(usex profiler "libnsight/nsight") )
+	for i in $(find "${bindirs[@]}" -maxdepth 1 -type f); do
+		exeinto ${cudadir}/${i%/*}
+		doexe ${i}
+		rm ${i} || die
+	done
+	exeinto ${cudadir}/bin
+	doexe "${T}"/cuda-config
+
+	# Install the rest
+	insinto ${cudadir}
+	doins -r *
+
+	cat > "${T}"/99cuda <<- EOF || die
+		PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")
+		ROOTPATH=${ecudadir}/bin
+		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
+	EOF
+	doenvd "${T}"/99cuda
+
+	#Cuda prepackages libraries, don't revdep-build on them
+	echo "SEARCH_DIRS_MASK=\"${ecudadir}\"" > "${T}/80${PN}" || die
+	insinto "/etc/revdep-rebuild"
+	doins "${T}/80${PN}"
+}
+
+pkg_postinst_check() {
+	local a b
+	a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
+	b="0.0"
+	for v in $a; do
+		if ver_test "${v}" -gt "${b}"; then
+			b="${v}"
+		fi
+	done
+
+	# if gcc and if not gcc-version is at least greatest supported
+	if tc-is-gcc && \
+		ver_test $(gcc-version) -gt ${b}; then
+			ewarn ""
+			ewarn "gcc >= ${b} will not work with CUDA"
+			ewarn "Make sure you set an earlier version of gcc with gcc-config"
+			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
+			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
+			ewarn "to the nvcc compiler flags"
+			ewarn ""
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.243-r2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.243-r2.ebuild
deleted file mode 100644
index c1a8bda01427..000000000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.243-r2.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit check-reqs cuda toolchain-funcs unpacker
-
-MYD=$(ver_cut 1-2 ${PV})
-DRIVER_PV="418.87.00"
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.download.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
-
-LICENSE="NVIDIA-CUDA"
-SLOT="0/${PV}"
-KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="debugger doc eclipse profiler"
-RESTRICT="bindist mirror"
-
-BDEPEND=""
-RDEPEND="
-	<sys-devel/gcc-9[cxx]
-	!prefix? ( >=x11-drivers/nvidia-drivers-${DRIVER_PV}[X,uvm] )
-	debugger? (
-		dev-libs/openssl-compat:1.0.0
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses-compat:5[tinfo]
-	)
-	eclipse? (
-		dev-libs/openssl-compat:1.0.0
-		>=virtual/jre-1.6
-	)
-	profiler? (
-		dev-libs/openssl-compat:1.0.0
-		>=virtual/jre-1.6
-	)"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-
-CHECKREQS_DISK_BUILD="6800M"
-
-pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	local cuda_supported_gcc
-
-	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3 8.2 8.3 8.4"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-
-	default
-}
-
-src_install() {
-	local i remove=( doc )
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}${cudadir}"
-
-	cd builds/cuda-toolkit
-	if use doc; then
-		DOCS+=( doc/pdf/. )
-		HTML_DOCS+=( doc/html/. )
-	fi
-	einstalldocs
-
-	mv doc/man/man3/{,cuda-}deprecated.3 || die
-	doman doc/man/man*/*
-
-	use debugger || remove+=( bin/cuda-gdb bin/cuda-gdbserver extras/Debugger share/gdb extras/cuda-gdb-${PV}.src.tar.gz )
-
-	if use profiler; then
-		# hack found in install-linux.pl
-		for i in nvvp nsight; do
-			cat > bin/${i} <<- EOF || die
-				#!/usr/bin/env sh
-				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
-					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
-					${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java
-			EOF
-			chmod a+x bin/${i} || die
-		done
-	else
-		use eclipse || remove+=( libnvvp libnsight nsightee_plugins nsight-compute-2019.4.0 nsight-systems-2019.3.7.5 bin/nsight bin/nsight_ee_plugins_manage.sh bin/nvvp bin/computeprof )
-		remove+=( extras/CUPTI bin/nvprof )
-	fi
-
-	for i in "${remove[@]}"; do
-		ebegin "Cleaning ${i}..."
-		rm -r "${i}" || die
-		eend
-	done
-
-	dodir ${cudadir}
-	into ${cudadir}
-
-	# Install binaries separately to make sure the X permission is set
-	local bindirs=( bin nvvm/bin extras/demo_suite $(usex profiler "libnsight/nsight") )
-	for i in $(find "${bindirs[@]}" -maxdepth 1 -type f); do
-		exeinto ${cudadir}/${i%/*}
-		doexe ${i}
-		rm ${i} || die
-	done
-	exeinto ${cudadir}/bin
-	doexe "${T}"/cuda-config
-
-	# Install the rest
-	insinto ${cudadir}
-	doins -r *
-
-	cat > "${T}"/99cuda <<- EOF || die
-		PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
-	EOF
-	doenvd "${T}"/99cuda
-
-	#Cuda prepackages libraries, don't revdep-build on them
-	echo "SEARCH_DIRS_MASK=\"${ecudadir}\"" > "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
-
-pkg_postinst_check() {
-	local a b
-	a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
-	b="0.0"
-	for v in $a; do
-		if ver_test "${v}" -gt "${b}"; then
-			b="${v}"
-		fi
-	done
-
-	# if gcc and if not gcc-version is at least greatest supported
-	if tc-is-gcc && \
-		ver_test $(gcc-version) -gt ${b}; then
-			ewarn ""
-			ewarn "gcc > ${b} will not work with CUDA"
-			ewarn "Make sure you set an earlier version of gcc with gcc-config"
-			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
-			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
-			ewarn "to the nvcc compiler flags"
-			ewarn ""
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-
-	if use prefix; then
-		ewarn "Gentoo Prefix does not manage kernel modules.  You need to make certain"
-		ewarn "the function counterpart to >=x11-drivers/nvidia-drivers-${DRIVER_PV}[X,uvm]"
-		ewarn "is available from the host"
-	fi
-}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.243-r3.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.243-r3.ebuild
new file mode 100644
index 000000000000..89bdb3d3e566
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.243-r3.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit check-reqs cuda toolchain-funcs unpacker
+
+MYD=$(ver_cut 1-2 ${PV})
+DRIVER_PV="418.87.00"
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.download.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
+
+LICENSE="NVIDIA-CUDA"
+SLOT="0/${PV}"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger doc eclipse profiler"
+RESTRICT="bindist mirror"
+
+BDEPEND=""
+RDEPEND="
+	<sys-devel/gcc-9[cxx]
+	!prefix? ( >=x11-drivers/nvidia-drivers-${DRIVER_PV}[X,uvm] )
+	debugger? (
+		dev-libs/openssl-compat:1.0.0
+		sys-libs/libtermcap-compat
+		sys-libs/ncurses-compat:5[tinfo]
+	)
+	eclipse? (
+		dev-libs/openssl-compat:1.0.0
+		>=virtual/jre-1.6
+	)
+	profiler? (
+		dev-libs/openssl-compat:1.0.0
+		>=virtual/jre-1.6
+	)"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/cuda/*"
+
+CHECKREQS_DISK_BUILD="6800M"
+
+pkg_setup() {
+	# We don't like to run cuda_pkg_setup as it depends on us
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	local cuda_supported_gcc
+
+	# ATTENTION: change requires revbump
+	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3 8.2 8.3 8.4"
+
+	sed \
+		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+	default
+}
+
+src_install() {
+	local i remove=( doc )
+	local cudadir=/opt/cuda
+	local ecudadir="${EPREFIX}${cudadir}"
+
+	cd builds/cuda-toolkit
+	if use doc; then
+		DOCS+=( doc/pdf/. )
+		HTML_DOCS+=( doc/html/. )
+	fi
+	einstalldocs
+
+	mv doc/man/man3/{,cuda-}deprecated.3 || die
+	doman doc/man/man*/*
+
+	use debugger || remove+=( bin/cuda-gdb bin/cuda-gdbserver extras/Debugger share/gdb extras/cuda-gdb-${PV}.src.tar.gz )
+
+	if use profiler; then
+		# hack found in install-linux.pl
+		for i in nvvp nsight; do
+			cat > bin/${i} <<- EOF || die
+				#!/usr/bin/env sh
+				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
+					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
+					${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java
+			EOF
+			chmod a+x bin/${i} || die
+		done
+	else
+		use eclipse || remove+=( libnvvp libnsight nsightee_plugins nsight-compute-2019.4.0 nsight-systems-2019.3.7.5 bin/nsight bin/nsight_ee_plugins_manage.sh bin/nvvp bin/computeprof )
+		remove+=( extras/CUPTI bin/nvprof )
+	fi
+
+	for i in "${remove[@]}"; do
+		ebegin "Cleaning ${i}..."
+		rm -r "${i}" || die
+		eend
+	done
+
+	dodir ${cudadir}
+	into ${cudadir}
+
+	# Install binaries separately to make sure the X permission is set
+	local bindirs=( bin nvvm/bin extras/demo_suite $(usex profiler "libnsight/nsight") )
+	for i in $(find "${bindirs[@]}" -maxdepth 1 -type f); do
+		exeinto ${cudadir}/${i%/*}
+		doexe ${i}
+		rm ${i} || die
+	done
+	exeinto ${cudadir}/bin
+	doexe "${T}"/cuda-config
+
+	# Install the rest
+	insinto ${cudadir}
+	doins -r *
+
+	cat > "${T}"/99cuda <<- EOF || die
+		PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")
+		ROOTPATH=${ecudadir}/bin
+		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
+	EOF
+	doenvd "${T}"/99cuda
+
+	#Cuda prepackages libraries, don't revdep-build on them
+	echo "SEARCH_DIRS_MASK=\"${ecudadir}\"" > "${T}/80${PN}" || die
+	insinto "/etc/revdep-rebuild"
+	doins "${T}/80${PN}"
+}
+
+pkg_postinst_check() {
+	local a b
+	a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
+	b="0.0"
+	for v in $a; do
+		if ver_test "${v}" -gt "${b}"; then
+			b="${v}"
+		fi
+	done
+
+	# if gcc and if not gcc-version is at least greatest supported
+	if tc-is-gcc && \
+		ver_test $(gcc-version) -gt ${b}; then
+			ewarn ""
+			ewarn "gcc > ${b} will not work with CUDA"
+			ewarn "Make sure you set an earlier version of gcc with gcc-config"
+			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
+			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
+			ewarn "to the nvcc compiler flags"
+			ewarn ""
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+
+	if use prefix; then
+		ewarn "Gentoo Prefix does not manage kernel modules.  You need to make certain"
+		ewarn "the function counterpart to >=x11-drivers/nvidia-drivers-${DRIVER_PV}[X,uvm]"
+		ewarn "is available from the host"
+	fi
+}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r1.ebuild
deleted file mode 100644
index ec0e6d2771ac..000000000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit check-reqs cuda toolchain-funcs unpacker
-
-MYD=$(ver_cut 1-2 ${PV})
-DRIVER_PV="440.33.01"
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.download.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
-
-LICENSE="NVIDIA-CUDA"
-SLOT="0/${PV}"
-KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="debugger doc eclipse profiler"
-RESTRICT="bindist mirror"
-
-BDEPEND=""
-RDEPEND="
-	<sys-devel/gcc-9[cxx]
-	>=x11-drivers/nvidia-drivers-${DRIVER_PV}[X,uvm]
-	debugger? (
-		dev-libs/openssl-compat:1.0.0
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses-compat:5[tinfo]
-	)
-	eclipse? (
-		dev-libs/openssl-compat:1.0.0
-		>=virtual/jre-1.6
-	)
-	profiler? (
-		dev-libs/openssl-compat:1.0.0
-		>=virtual/jre-1.6
-	)"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-
-CHECKREQS_DISK_BUILD="6800M"
-
-pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	local cuda_supported_gcc
-
-	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3 8.2 8.3 8.4"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-
-	default
-}
-
-src_install() {
-	local i remove=( doc )
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}${cudadir}"
-
-	cd builds/cuda-toolkit
-	if use doc; then
-		DOCS+=( doc/pdf/. )
-		HTML_DOCS+=( doc/html/. )
-	fi
-	einstalldocs
-
-	mv doc/man/man3/{,cuda-}deprecated.3 || die
-	doman doc/man/man*/*
-
-	use debugger || remove+=( bin/cuda-gdb bin/cuda-gdbserver extras/Debugger share/gdb extras/cuda-gdb-${PV}.src.tar.gz )
-
-	if use profiler; then
-		# hack found in install-linux.pl
-		for i in nvvp nsight; do
-			cat > bin/${i} <<- EOF || die
-				#!/usr/bin/env sh
-				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
-					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
-					${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java
-			EOF
-			chmod a+x bin/${i} || die
-		done
-	else
-		use eclipse || remove+=( libnvvp libnsight nsightee_plugins nsight-compute-2019.5.0 nsight-systems-2019.5.2 bin/nsight bin/nsight_ee_plugins_manage.sh bin/nvvp bin/computeprof )
-		remove+=( extras/CUPTI bin/nvprof )
-	fi
-
-	for i in "${remove[@]}"; do
-		ebegin "Cleaning ${i}..."
-		rm -r "${i}" || die
-		eend
-	done
-
-	dodir ${cudadir}
-	into ${cudadir}
-
-	# Install binaries separately to make sure the X permission is set
-	local bindirs=( bin nvvm/bin extras/demo_suite  $(usex profiler "libnsight/nsight") )
-	for i in $(find "${bindirs[@]}" -maxdepth 1 -type f); do
-		exeinto ${cudadir}/${i%/*}
-		doexe ${i}
-		rm ${i} || die
-	done
-	exeinto ${cudadir}/bin
-	doexe "${T}"/cuda-config
-
-	# Install the rest
-	insinto ${cudadir}
-	doins -r *
-
-	cat > "${T}"/99cuda <<- EOF || die
-		PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
-	EOF
-	doenvd "${T}"/99cuda
-
-	#Cuda prepackages libraries, don't revdep-build on them
-	echo "SEARCH_DIRS_MASK=\"${ecudadir}\"" > "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
-
-pkg_postinst_check() {
-	local a b
-	a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
-	b="0.0"
-	for v in $a; do
-		if ver_test "${v}" -gt "${b}"; then
-			b="${v}"
-		fi
-	done
-
-	# if gcc and if not gcc-version is at least greatest supported
-	if tc-is-gcc && \
-		ver_test $(gcc-version) -gt ${b}; then
-			ewarn ""
-			ewarn "gcc > ${b} will not work with CUDA"
-			ewarn "Make sure you set an earlier version of gcc with gcc-config"
-			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
-			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
-			ewarn "to the nvcc compiler flags"
-			ewarn ""
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r2.ebuild
new file mode 100644
index 000000000000..d33d713b5b09
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r2.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit check-reqs cuda toolchain-funcs unpacker
+
+MYD=$(ver_cut 1-2 ${PV})
+DRIVER_PV="440.33.01"
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.download.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
+
+LICENSE="NVIDIA-CUDA"
+SLOT="0/${PV}"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger doc eclipse profiler"
+RESTRICT="bindist mirror"
+
+BDEPEND=""
+RDEPEND="
+	<sys-devel/gcc-9[cxx]
+	>=x11-drivers/nvidia-drivers-${DRIVER_PV}[X,uvm]
+	debugger? (
+		dev-libs/openssl-compat:1.0.0
+		sys-libs/libtermcap-compat
+		sys-libs/ncurses-compat:5[tinfo]
+	)
+	eclipse? (
+		dev-libs/openssl-compat:1.0.0
+		>=virtual/jre-1.6
+	)
+	profiler? (
+		dev-libs/openssl-compat:1.0.0
+		>=virtual/jre-1.6
+	)"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/cuda/*"
+
+CHECKREQS_DISK_BUILD="6800M"
+
+pkg_setup() {
+	# We don't like to run cuda_pkg_setup as it depends on us
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	local cuda_supported_gcc
+
+	# ATTENTION: change requires revbump
+	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3 8.2 8.3 8.4"
+
+	sed \
+		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+	default
+}
+
+src_install() {
+	local i remove=( doc )
+	local cudadir=/opt/cuda
+	local ecudadir="${EPREFIX}${cudadir}"
+
+	cd builds/cuda-toolkit
+	if use doc; then
+		DOCS+=( doc/pdf/. )
+		HTML_DOCS+=( doc/html/. )
+	fi
+	einstalldocs
+
+	mv doc/man/man3/{,cuda-}deprecated.3 || die
+	doman doc/man/man*/*
+
+	use debugger || remove+=( bin/cuda-gdb bin/cuda-gdbserver extras/Debugger share/gdb extras/cuda-gdb-${PV}.src.tar.gz )
+
+	if use profiler; then
+		# hack found in install-linux.pl
+		for i in nvvp nsight; do
+			cat > bin/${i} <<- EOF || die
+				#!/usr/bin/env sh
+				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
+					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
+					${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java
+			EOF
+			chmod a+x bin/${i} || die
+		done
+	else
+		use eclipse || remove+=( libnvvp libnsight nsightee_plugins nsight-compute-2019.5.0 nsight-systems-2019.5.2 bin/nsight bin/nsight_ee_plugins_manage.sh bin/nvvp bin/computeprof )
+		remove+=( extras/CUPTI bin/nvprof )
+	fi
+
+	for i in "${remove[@]}"; do
+		ebegin "Cleaning ${i}..."
+		rm -r "${i}" || die
+		eend
+	done
+
+	dodir ${cudadir}
+	into ${cudadir}
+
+	# Install binaries separately to make sure the X permission is set
+	local bindirs=( bin nvvm/bin extras/demo_suite  $(usex profiler "libnsight/nsight") )
+	for i in $(find "${bindirs[@]}" -maxdepth 1 -type f); do
+		exeinto ${cudadir}/${i%/*}
+		doexe ${i}
+		rm ${i} || die
+	done
+	exeinto ${cudadir}/bin
+	doexe "${T}"/cuda-config
+
+	# Install the rest
+	insinto ${cudadir}
+	doins -r *
+
+	cat > "${T}"/99cuda <<- EOF || die
+		PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")
+		ROOTPATH=${ecudadir}/bin
+		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
+	EOF
+	doenvd "${T}"/99cuda
+
+	#Cuda prepackages libraries, don't revdep-build on them
+	echo "SEARCH_DIRS_MASK=\"${ecudadir}\"" > "${T}/80${PN}" || die
+	insinto "/etc/revdep-rebuild"
+	doins "${T}/80${PN}"
+}
+
+pkg_postinst_check() {
+	local a b
+	a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
+	b="0.0"
+	for v in $a; do
+		if ver_test "${v}" -gt "${b}"; then
+			b="${v}"
+		fi
+	done
+
+	# if gcc and if not gcc-version is at least greatest supported
+	if tc-is-gcc && \
+		ver_test $(gcc-version) -gt ${b}; then
+			ewarn ""
+			ewarn "gcc > ${b} will not work with CUDA"
+			ewarn "Make sure you set an earlier version of gcc with gcc-config"
+			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
+			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
+			ewarn "to the nvcc compiler flags"
+			ewarn ""
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild
index ec8e3bd4b4d0..b69c486109c1 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild
@@ -59,6 +59,7 @@ src_unpack() {
 src_prepare() {
 	local cuda_supported_gcc
 
+	# ATTENTION: change requires revbump
 	cuda_supported_gcc="4.7 4.8"
 
 	sed \
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild
index f77869c14a8f..3ff03afa853d 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild
@@ -59,6 +59,7 @@ src_unpack() {
 src_prepare() {
 	local cuda_supported_gcc
 
+	# ATTENTION: change requires revbump
 	cuda_supported_gcc="4.7 4.8"
 
 	sed \
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18-r2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18-r2.ebuild
index 3e361539e954..ee137a344a15 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18-r2.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18-r2.ebuild
@@ -48,6 +48,7 @@ src_unpack() {
 src_prepare() {
 	local cuda_supported_gcc
 
+	# ATTENTION: change requires revbump
 	cuda_supported_gcc="4.7 4.8 4.9"
 
 	sed \
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.44.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.44.ebuild
index 7156950eadbe..94cf8df882e9 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.44.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.44.ebuild
@@ -48,6 +48,7 @@ src_unpack() {
 src_prepare() {
 	local cuda_supported_gcc
 
+	# ATTENTION: change requires revbump
 	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4"
 
 	sed \
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.61.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.61.ebuild
index 6f903e84532f..419681eb64a4 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.61.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.61.ebuild
@@ -49,6 +49,7 @@ src_unpack() {
 src_prepare() {
 	local cuda_supported_gcc
 
+	# ATTENTION: change requires revbump
 	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4"
 
 	sed \
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.0.176.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.0.176.ebuild
index 990b4999eb84..e56db8e3b47d 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.0.176.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.0.176.ebuild
@@ -49,6 +49,7 @@ src_unpack() {
 src_prepare() {
 	local cuda_supported_gcc
 
+	# ATTENTION: change requires revbump
 	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4"
 
 	sed \
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.1.85.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.1.85.ebuild
index db75e1170292..532275f52c64 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.1.85.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.1.85.ebuild
@@ -48,6 +48,7 @@ src_unpack() {
 src_prepare() {
 	local cuda_supported_gcc
 
+	# ATTENTION: change requires revbump
 	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4"
 
 	sed \
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88.ebuild
index 335e9fc12a0d..12f63c702db5 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88.ebuild
@@ -48,6 +48,7 @@ src_unpack() {
 src_prepare() {
 	local cuda_supported_gcc
 
+	# ATTENTION: change requires revbump
 	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3"
 
 	sed \
diff --git a/dev-util/oprofile/Manifest b/dev-util/oprofile/Manifest
index 66a136e7f9ec..674888738924 100644
--- a/dev-util/oprofile/Manifest
+++ b/dev-util/oprofile/Manifest
@@ -1,3 +1,4 @@
+AUX binutils-2.34.patch 5670 BLAKE2B 20cf23c45d94d9c71f5fb5c432e832d8db53f6428b7f2849ad3f5854de36e371addd0883174eed4537b66367dbbf842ca557ae7842561a9f643769191929964a SHA512 be14f319c3e1c7486534e91e1dfb88c853148d58435ccf2ecef5e8ec690f20adea1edc48f3b6c88e900382d2dc342319ee28172150682bf1cf2a3e6fea9a1f4b
 DIST oprofile-1.3.0.tar.gz 1547258 BLAKE2B d8777e41856dc2f082570a1542609bd730fd7076000443f2e17c77eaf75df7a7a772ebb49d82ee657f563797858cecb4c23b130b0174d154c54d5619b8528ad1 SHA512 02a940cd8d38834dca2a97c8ac0fff04ef95b3819cfdf74a462b9326c7abbf2dc55d2a9b9d1fbefc7f455465bf85516be2b879d7daf1861ba2c4af51214377ba
-EBUILD oprofile-1.3.0.ebuild 1598 BLAKE2B 061dfaba66945c51667d21f529a14fbaeaccc8acda4ca9b84271c826450317420fd35589f678a662315c80101d474f40ca89f570159468608d92c29138f732a9 SHA512 4705fc1db66537f6630ac525ed844a87dff2d89f712d92ecfe77b0235a5dcd921218a2ac6b4ff1011fb212d5c72cd058cdc54eb978898a9b25150a82a7335c96
+EBUILD oprofile-1.3.0.ebuild 1710 BLAKE2B f8e293e267d697ac5032aa086dcee205a86709b2c26b9ae730e105cd5b2045aec0550c6672ff8fc300c203d53b5d1bae26cdf1a310cd0226f60a58aaf38bbdcb SHA512 b0e87f0a90f21f35cdc9dd21b32d0a93e3bb26ec7517a28669ae5b7086a3d597c1a64f6ca117cec1625cdf239a191c4b028388ca7f3e5ff24fbbf695a55e1234
 MISC metadata.xml 423 BLAKE2B f94e15abeacab93798df7566bd1dc4d8e820aa57ddd71c2e5bfcf0c983bce5961a7c8bffb4f0ebdd92785002745314feece144e29000dd38f29426d2b35b8897 SHA512 01f96b806fca3e20eb84908a1cd77edbe11291be0098aff2e4d20f0fbf86ea0ef9972c7148c791bc826152a109d16903781cc2f2f367a2ac8b8fb7e5efee378a
diff --git a/dev-util/oprofile/files/binutils-2.34.patch b/dev-util/oprofile/files/binutils-2.34.patch
new file mode 100644
index 000000000000..6337191a21d4
--- /dev/null
+++ b/dev-util/oprofile/files/binutils-2.34.patch
@@ -0,0 +1,157 @@
+commit 377610414fb6cd7ac30e4485d9d6482fcf29aca6
+Author: William Cohen <wcohen@redhat.com>
+Date:   Wed Mar 18 21:19:16 2020 -0400
+
+    Macro wrappers to handle the binutils 2.34 api changes
+    
+    Changes in binutils 2.34 API prevented oprofile from compiling with
+    it.  This patch tests for the changes in the binutils API during
+    configuration and selects the appropiate wrappers to allow oprofile to
+    compile.  This allows oprofile to compile with both older and newer
+    versions of binutils.
+
+diff --git a/configure.ac b/configure.ac
+index ac2fd35e..df032a78 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -224,6 +224,26 @@ if test "$host_cpu" = "powerpc64le" -o "$host_cpu" = "powerpc64"; then
+ fi
+ AC_SUBST(PFM_LIB)
+ 
++HAVE_BINUTILS_234='1'
++AC_MSG_CHECKING([whether binutils 2.34 is being used])
++rm -f test-for-BINUTILS
++AC_LANG_CONFTEST(
++	[AC_LANG_PROGRAM([[#include <bfd.h>]],
++		[[asection * sect;
++		bfd_size_type buildid_sect_size = bfd_section_size(sect);
++		return 0;]])
++	])
++$CC conftest.$ac_ext $CFLAGS $LDFLAGS $LIBS $PERF_EVENT_FLAGS -o test-for-BINUTILS  > /dev/null 2>&1
++if test -f test-for-BINUTILS; then
++	echo "yes"
++	HAVE_BINUTILS_234='1'
++else
++	echo "no"
++	HAVE_BINUTILS_234='0'
++fi
++AC_DEFINE_UNQUOTED(HAVE_BINUTILS_234, $HAVE_BINUTILS_234, [Using binutils 2.34])
++rm -f test-for-BINUTILS*
++
+ AC_ARG_WITH(java,
+ [  --with-java=java-home        Path to Java home directory (default is "no"; "yes" will use /usr as Java home)],
+ JAVA_HOMEDIR=$with_java, [with_java=no])
+diff --git a/libutil++/bfd_support.cpp b/libutil++/bfd_support.cpp
+index fa904839..cd0f4f71 100644
+--- a/libutil++/bfd_support.cpp
++++ b/libutil++/bfd_support.cpp
+@@ -19,6 +19,7 @@
+ #include "locate_images.h"
+ #include "op_libiberty.h"
+ #include "op_exception.h"
++#include "op_bfd_wrappers.h"
+ 
+ #include <unistd.h>
+ #include <errno.h>
+@@ -137,7 +138,7 @@ static bool get_build_id(bfd * ibfd, unsigned char * build_id)
+ 		}
+ 	}
+ 
+-	bfd_size_type buildid_sect_size = bfd_section_size(ibfd, sect);
++	bfd_size_type buildid_sect_size = op_bfd_section_size(ibfd, sect);
+ 	char * contents = (char *) xmalloc(buildid_sect_size);
+ 	errno = 0;
+ 	if (!bfd_get_section_contents(ibfd, sect,
+@@ -188,7 +189,7 @@ bool get_debug_link_info(bfd * ibfd, string & filename, unsigned long & crc32)
+ 	if (sect == NULL)
+ 		return false;
+ 	
+-	bfd_size_type debuglink_size = bfd_section_size(ibfd, sect);  
++	bfd_size_type debuglink_size = op_bfd_section_size(ibfd, sect);
+ 	char * contents = (char *) xmalloc(debuglink_size);
+ 	cverb << vbfd
+ 	      << ".gnu_debuglink section has size " << debuglink_size << endl;
+@@ -346,7 +347,7 @@ void fixup_linenr(bfd * abfd, asection * section, asymbol ** syms,
+ 	// first restrict the search on a sensible range of vma, 16 is
+ 	// an intuitive value based on epilog code look
+ 	size_t max_search = 16;
+-	size_t section_size = bfd_section_size(abfd, section);
++	size_t section_size = op_bfd_section_size(abfd, section);
+ 	if (pc + max_search > section_size)
+ 		max_search = section_size - pc;
+ 
+@@ -819,10 +820,10 @@ find_nearest_line(bfd_info const & b, op_bfd_symbol const & sym,
+ 	else
+ 		pc = (sym.value() + offset) - sym.filepos();
+ 
+-	if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0)
++	if ((op_bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0)
+ 		goto fail;
+ 
+-	if (pc >= bfd_section_size(abfd, section))
++	if (pc >= op_bfd_section_size(abfd, section))
+ 		goto fail;
+ 
+ 	ret = bfd_find_nearest_line(abfd, section, syms, pc, &cfilename,
+diff --git a/libutil/op_bfd_wrappers.h b/libutil/op_bfd_wrappers.h
+new file mode 100644
+index 00000000..b229cc12
+--- /dev/null
++++ b/libutil/op_bfd_wrappers.h
+@@ -0,0 +1,28 @@
++/**
++ * @file op_bfd_wrappers.h
++ * Wrappers to hide API changes in binutils 2.34
++ *
++ * @remark Copyright 2020 OProfile authors
++ * @remark Read the file COPYING
++ *
++ * @author William Cohen
++ */
++
++#ifndef OP_BFD_WRAPPERS_H
++#define OP_BFD_WRAPPERS_H
++
++#if HAVE_BINUTILS_234
++#define op_bfd_section_size(ibfd, sec) bfd_section_size(sec)
++#define op_bfd_get_section_flags(abfd, sec) bfd_section_flags(sec)
++#define op_bfd_set_section_flags(abfd, sec, flags) bfd_set_section_flags(sec, flags)
++#define op_bfd_set_section_vma(abfd, sec, vma) bfd_set_section_vma(sec, vma)
++#define op_bfd_set_section_size(abfd, sec, size) bfd_set_section_size(sec, size)
++#else
++#define op_bfd_section_size(ibfd, sec) bfd_section_size(ibfd, sec)
++#define op_bfd_get_section_flags(abfd, sec) bfd_get_section_flags(abfd, sec)
++#define op_bfd_set_section_flags(abfd, sec, flags) bfd_set_section_flags(abfd, sec, flags)
++#define op_bfd_set_section_vma(abfd, sec, vma) bfd_set_section_vma(abfd, sec, vma)
++#define op_bfd_set_section_size(abfd, sec, size) bfd_set_section_size(abfd, sec, size)
++#endif
++
++#endif /* !OP_BFD_WRAPPERS_H */
+diff --git a/opjitconv/create_bfd.c b/opjitconv/create_bfd.c
+index 48db143b..da1e6d29 100644
+--- a/opjitconv/create_bfd.c
++++ b/opjitconv/create_bfd.c
+@@ -16,6 +16,7 @@
+ 
+ #include "opjitconv.h"
+ #include "op_libiberty.h"
++#include "op_bfd_wrappers.h"
+ 
+ #include <bfd.h>
+ #include <assert.h>
+@@ -86,12 +87,12 @@ asection * create_section(bfd * abfd, char const * section_name,
+ 		bfd_perror("bfd_make_section");
+ 		goto error;
+ 	}
+-	bfd_set_section_vma(abfd, section, vma);
+-	if (bfd_set_section_size(abfd, section, size) == FALSE) {
++	op_bfd_set_section_vma(abfd, section, vma);
++	if (op_bfd_set_section_size(abfd, section, size) == FALSE) {
+ 		bfd_perror("bfd_set_section_size");
+ 		goto error;
+ 	}
+-	if (bfd_set_section_flags(abfd, section, flags) == FALSE) {
++	if (op_bfd_set_section_flags(abfd, section, flags) == FALSE) {
+ 		bfd_perror("bfd_set_section_flags");
+ 		goto error;
+ 	}
diff --git a/dev-util/oprofile/oprofile-1.3.0.ebuild b/dev-util/oprofile/oprofile-1.3.0.ebuild
index 826af1f43b98..da8d69f7b576 100644
--- a/dev-util/oprofile/oprofile-1.3.0.ebuild
+++ b/dev-util/oprofile/oprofile-1.3.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit java-pkg-opt-2 linux-info user
+inherit autotools java-pkg-opt-2 linux-info user
 
 DESCRIPTION="A transparent low-overhead system-wide profiler"
 HOMEPAGE="http://oprofile.sourceforge.net"
@@ -39,6 +39,12 @@ pkg_setup() {
 	use java && java-pkg_init
 }
 
+src_prepare() {
+	eapply "${FILESDIR}/binutils-2.34.patch"
+	java-pkg-opt-2_src_prepare
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		--disable-werror \
diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest
index c984390fbb69..a4a2e4940a00 100644
--- a/dev-util/ostree/Manifest
+++ b/dev-util/ostree/Manifest
@@ -1,6 +1,6 @@
 DIST ostree-2018.9.tar.xz 1951732 BLAKE2B c6fba1321fe21bff569fe1dadd1aa649f23059a35dc906c3a0b7dcca29f7acbe8338e19541d8f7d854452bf6a6b1ac293d4350c7056a9b13b9ed1eacf358d4b3 SHA512 407b6b67add54e80a55fc35f08bde56561009db93ec202a10dd1ec1e66bd32b439c1d66c759e4e173e44fce6fbc2c162cae928a477c9d7abafbf007ed8f7bfb5
 DIST ostree-2019.5.tar.xz 1972452 BLAKE2B a8b015118855b8b0097f535ac074aeffc599c3f6f654967043e8e4de339d2a51e85ad1b4b3f3b22e18d39235e6ad9c1973334a2c4fc9b5c694f2ff40d68ae703 SHA512 27150802ed9af16e698ed163f6ad235f0f99a1410df52b4b1e266585fe665880c0b9490bf245b5593cb277007b7229d808be7403dd964c58aded6e567349c912
 EBUILD ostree-2018.9-r1.ebuild 3497 BLAKE2B b4a027cf64a64083caec1a5c48538d73194366a1e46e4ded6aff322c7007eb5a13b2247295ce59ab5b40e54ffdce3201646ec250778a0247845e1a9e0ecb4b55 SHA512 46a2e9cb4e2d962fb5fb330a7412d9c651c13fc965e800c6d92cb8cc15a4b98b8843e5b6d37d791b7235402a11a192909ac621070c30bd559878039d537375ff
-EBUILD ostree-2018.9.ebuild 3265 BLAKE2B 046872e6bb85337738b2e32eaefa649040d07d391e76d6840d296d9fcf2f231f4b246bcd26f601a4c216b613caed7bceee86328b53f945b1c0bf500c01076bde SHA512 f66e58ddfbe73dac33c1bde4e6538b3a5fba47b3532b36baa0569b6fba87a7c37954d46e73bf3c76005ead855c064af333fff77619cb08c014d3180c5f723c3a
-EBUILD ostree-2019.5.ebuild 2220 BLAKE2B 38b9a5e4181699dfa99f274d29ace6e7e0970a5c5f1f3a2f8e345633e68707ac38830b0023640deb113c79e3dade0d2b24f4b724deef9ddce62926780860db53 SHA512 77751f604a7377404f9eb73ed227ef14f724c775d6420ddab0967c6b8e1f448f57037ed947af6f93813e4e819d1b1458613942b7aa6086e8b64822d6491de6f9
+EBUILD ostree-2018.9.ebuild 3266 BLAKE2B b433adf09f65abdc163f517b97731790a7c2ef9570dc14cedfba8ffd151990c9a3cee2977ff17862228d3547e831c0aecc80446068f4787ca1f0d704d921a56b SHA512 cfc839b02b9007498d7b3ded28c651bc52c1015c4b7fc3e5e3cc7f4a0ef072d15a55fc962b76282e331ef26c99700457317d216cb37f4a48fcb30ce73adc350f
+EBUILD ostree-2019.5.ebuild 2220 BLAKE2B c56fbde79b750df4de06f3ed175ad15011070c9b36bacc7bad3d2efc676b485c3c72b5b138e69ef0bf1f43293ef23f71699d5b9609a94d1a8aef4a267c81a3ef SHA512 829b080ab7ec39f2de945ef3c0ae23bdba3b17b544e2556809e4a25537e454ff5eee26674068eab80e8c326688020d26ba43c01f2059fc4aaaee67538d929ded
 MISC metadata.xml 1889 BLAKE2B 58b5a7ce03d273da942cc88468ccc1e8758c2f1e3004a0424567f56e5e6fb589f457e50a1edc759e77b9177aa9472441f68911c8cc5ed39c2c4d5b8b56839521 SHA512 697a3f44a7df7b1e7425afedece72693c77821a6c55a3d5bf735a724ccb1a6655dfabd4262b3136b7af0856eeaf8404adb0c203826f0f8422035c6d66ebb11d4
diff --git a/dev-util/ostree/ostree-2018.9.ebuild b/dev-util/ostree/ostree-2018.9.ebuild
index c7c0813520bb..6f86406b9deb 100644
--- a/dev-util/ostree/ostree-2018.9.ebuild
+++ b/dev-util/ostree/ostree-2018.9.ebuild
@@ -22,7 +22,7 @@ COMMON_DEPEND="
 	dev-libs/libgpg-error:=
 	dev-libs/openssl:0=
 	sys-apps/util-linux:=
-	sys-fs/fuse:=
+	sys-fs/fuse:0=
 	sys-libs/zlib:=
 
 	archive? ( app-arch/libarchive:= )
diff --git a/dev-util/ostree/ostree-2019.5.ebuild b/dev-util/ostree/ostree-2019.5.ebuild
index f8d2fec39755..68c74d15f958 100644
--- a/dev-util/ostree/ostree-2019.5.ebuild
+++ b/dev-util/ostree/ostree-2019.5.ebuild
@@ -32,7 +32,7 @@ COMMON_DEPEND="
 	ssl? (
 		gnutls? ( net-libs/gnutls )
 		!gnutls? ( dev-libs/openssl:0= ) )
-	>=sys-fs/fuse-2.9.2:*
+	>=sys-fs/fuse-2.9.2:0
 	sys-libs/zlib
 	libmount? ( sys-apps/util-linux )
 	selinux? ( sys-libs/libselinux )
diff --git a/dev-util/rebar/Manifest b/dev-util/rebar/Manifest
index dc9bf8eedcde..6ff0a4ca808d 100644
--- a/dev-util/rebar/Manifest
+++ b/dev-util/rebar/Manifest
@@ -1,5 +1,5 @@
 AUX rebar-erlang23.diff 602 BLAKE2B 761b7e35408487698b27b0169989937305e9c7db14b49f5cbd411f4cfe19525a82e50d3c105f38d1fedc75f4c51d264fbf4a4a496b9bbce826b994241073fea3 SHA512 5f57f199dcd5544dec48119feeb288c2d6f5f0a45307b09489a37702609f6e79db08982764bd07f898c7858d45d8c154e314fab131b70996c95a1473561ba8c4
 DIST rebar-2.6.4.tar.gz 213158 BLAKE2B a71c525948697f9ba44a7faa9183f1aadce031b8b85857da87c5b2376f3b7511c78d02c183b115836605a6d3830e9b9ceac754ab64ec11d9d1bb66f37ea78665 SHA512 4e53d1ab7db296c60fb039443da7e3b31b63410fc614690c6faa7ec330d9e9393dbc1c8507aa4aea2c99397e1b443ff9d25e4d57ec57f616ee748aa97d055ffa
-EBUILD rebar-2.6.4-r1.ebuild 675 BLAKE2B df8993a85ef3dd529f3e0c22c5c56df96b9ae0dc46efdb7778d385f07197c566e4ecc5978a02e74b2b7b990d000c46cee5779449976d5a94ff489a47add8dd74 SHA512 fe8e12f494869b1a9561e28e2c061cb147b81df3ac74ccd96130398832ee75e6cef46600313cfd277f6e62e6156f71fc20608c81a1db6a154de7f4de6ea80eee
+EBUILD rebar-2.6.4-r1.ebuild 671 BLAKE2B e2634bb01418f81f97c9d30a91083efb2ed87416b7e42a48e83acd5f07956ce14e8fed23f782bbba6437139da730c2cdabe7d0c523a447966b43c6e2dabf8033 SHA512 95cd7d605d4a3fe6940be8fe90d42db7b413bd0b1983a4ed44cd511308244e64e88d49a70306c9262556a1717402c41e42849c7420f1e958dfc300ce631eb382
 EBUILD rebar-2.6.4.ebuild 624 BLAKE2B d634bc46b48270d5c5a4b1c2d3680102d61a469ed8d904faea392a257c161295a2175a26afffaf367b3b2feba3b5268805af142f9cb685a29d6b6945c22ad983 SHA512 08a934a6d39eb91cba297036d22f40f0b6024e05c46630a4096f58cbee55928aeabee71ed0cb3c46a7db0791b7d62ddc6f6306a06756d00987439b0f7b7c4914
 MISC metadata.xml 248 BLAKE2B 404382bd4b92d22cc627b066d14310ac5f538e3bcac366e8cddb43c871c13d4efade2036bb49f5e8ac3c7511f28e6eae58a1e350bc48ef8b9f2031b460c741c1 SHA512 c6b32cd3a892084eff028d3afb657fef0e0921e6636628cfc2d81b7bada9d0c7d03005f8c8ed1ffddc7d491bd6725c771506dd3da20dc5a60619efaccf0974aa
diff --git a/dev-util/rebar/rebar-2.6.4-r1.ebuild b/dev-util/rebar/rebar-2.6.4-r1.ebuild
index c38856039c16..30174d040b6a 100644
--- a/dev-util/rebar/rebar-2.6.4-r1.ebuild
+++ b/dev-util/rebar/rebar-2.6.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rebar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="dev-lang/erlang:="
diff --git a/dev-util/rt-tests/Manifest b/dev-util/rt-tests/Manifest
index 0cacf716a6f4..8c4a5094975d 100644
--- a/dev-util/rt-tests/Manifest
+++ b/dev-util/rt-tests/Manifest
@@ -1,4 +1,4 @@
 AUX rt-tests-1.8-musl.patch 10834 BLAKE2B 54bc0e20a9bc7c251985b8e21c94b0e6261345d02a23dc510ee6a303843ea88aa13750680adb3954d63561246dfb26e6427adf2bc2012f9161357d0fae207b83 SHA512 196b0d1d19aeab83710edddcaec7064d4e4770cd514f8b8a61b23980932b793d044cfb4d69c91e61c4ee912eb24cd3a87ee8da05612c1ee02e2a5885f32bb9e5
 DIST rt-tests-1.8.tar.xz 105820 BLAKE2B 478ac14732393f718e6be818b82b24b1e53d2f293140012bc17fd1c9242bd885b4d70dca3c7f3187e9ba22334e5f83d9ad1993ab9f70079e1765b918deab4411 SHA512 41c0b18e84d1f76de22a4ab239d43ac678b8c8419b508c96204bef346734122b9a42df51fcea97b1e0675bd25ed1e262730236ec0cb189732d5810122e96aa39
-EBUILD rt-tests-1.8.ebuild 847 BLAKE2B c55213743b396727a0626ccc80617f6b62722ba93fb9c0245981b896a02bbf1fe757e0f22a6d783b4e58ab95328526b1505916014491d764ed844b005589b88a SHA512 b36dab246f8eb4477183e7c1ffb5f65f997f5c2bcc9b7bddd3c301f3da1e5b65166b83a7fcb42fb28315446f28e0a8f2f79eab7ed62fced4e8ac88c100caedfd
+EBUILD rt-tests-1.8.ebuild 923 BLAKE2B cf4dacc192b38ffac20e7dda97a4f775e71ae9c4a602b6fef39a7ecdf99be7395ece533d2f901c08de91ece2edf7e4791f8755159032aeb6b588bd599bbc6874 SHA512 18609c388c6d6d87700b5e308911f797ff85fdcf3e91983d14a9acecef66fceb2ee543b4015ae2b0b640115f890a17ed3cedcbca45a058c3cb3b5166b263af28
 MISC metadata.xml 718 BLAKE2B e09ef2dd4bd98df6e36e684105242e579fd86dfa28fd02f6b04ea78f91dc2089485a54497edb0a9a1b3c36fe5033eb1e98b626735b82d2a765150812f724bb93 SHA512 8b7eb83545e11f2f5786f0e5fbc47ce15fbb9a364ad9fcf51a7c47e8a05e70d3d0c48c2f69b5f6abd4b839514bc2575a66a43202204340137ec3d8a9f41564e1
diff --git a/dev-util/rt-tests/rt-tests-1.8.ebuild b/dev-util/rt-tests/rt-tests-1.8.ebuild
index 994e2f56115f..f94e433d66c0 100644
--- a/dev-util/rt-tests/rt-tests-1.8.ebuild
+++ b/dev-util/rt-tests/rt-tests-1.8.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6..8} )
 
-inherit python-single-r1
+inherit python-single-r1 toolchain-funcs
 
 DESCRIPTION="A collection of latency testing tools for the linux(-rt) kernel"
 HOMEPAGE="https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/about/"
@@ -27,6 +27,10 @@ src_prepare() {
 	use elibc_musl && eapply "${FILESDIR}/${P}-musl.patch"
 }
 
+src_compile() {
+	emake CC="$(tc-getCC)" AR="$(tc-getAR)"
+}
+
 src_install() {
 	emake prefix=/usr DESTDIR="${D}" MAN_COMPRESSION=none install
 	python_fix_shebang "${ED}"
diff --git a/dev-util/shellcheck/Manifest b/dev-util/shellcheck/Manifest
index 51613238efba..eacc35661fdc 100644
--- a/dev-util/shellcheck/Manifest
+++ b/dev-util/shellcheck/Manifest
@@ -1,5 +1,3 @@
-DIST ShellCheck-0.7.0.tar.gz 163027 BLAKE2B 2d6348f21cb9598c0133cc1548f43727d56155883db83c38483b581b3565c67d5bf9d5333b6c39569dac1f07b19b21db1d62d83e675bb4aa9735725879aaf6e2 SHA512 88a0cb2a2879f597b832979fd934ee63e0f1ca256e5f9e7c51667744d09848817fdbe3988898f49226fc52ec27d92c314a9075995c3110ee10b24468cb60c657
 DIST ShellCheck-0.7.1.tar.gz 163288 BLAKE2B efc8c56348ba924baf660ae16d84e023cdd1a5ef8b355b492844ca41aeb3242eb1e5862bea7f12c69fa43cce285a44afaf95125816f62fbe316d9bdca467b1ae SHA512 fc84bd67e30af1378a92c1e378693a2c181e9567d53f2590e76aedb9f607276b90abd2ac83818c36524bd77a480df347af5a0879a925a846f35440ab207fad8a
-EBUILD shellcheck-0.7.0.ebuild 925 BLAKE2B d1dd5dcf799243cfbf7aabf519ee605386dd4593eb58f061bb31ffaac0a7918d84bf0682414e746ac562a15774ac11e0dab287bd39b71da1594168f41ff8b6b8 SHA512 dffb168c017cf90df2e1b428a7e77b8c5d2850fd7372b027da64c68feb384c1179698a14bce07abbbf94ee35d6c0ca072f1d0f8752a4378bdbd48860ee2568b6
 EBUILD shellcheck-0.7.1.ebuild 849 BLAKE2B 2365d8fc4a090efeae8d407a4f9bcba47446276bcbfd3e3ec8cca544766651593b5d0ef7963f2f59e520393fe5027331fc0b9dc1679e61b755b208c320610b08 SHA512 b3e2ccb90f1405940aa7a373ba92de9d0329826ba5ed7f7b85c3ff0ec57b4ac1f50a1944fd14c6c5b32666df425c72470795833adec930f83f27905c6fa0d74b
 MISC metadata.xml 354 BLAKE2B 147d2403f29d6faf487627ed1bcc9b16cc02936a1afe0f25f7bab24071b7b0009960ec950c2bcbcc3738033c5e10f5d790f0b90a7e75d3f9242b694e1bb96cc7 SHA512 033d85c60d488513cec6cbd63c406ff12882909629acd2417e4d0b1e2046ff9aebda7dcca7b95ee144deb3d876ccc422211cc31eb259f306deb35938b56183af
diff --git a/dev-util/shellcheck/shellcheck-0.7.0.ebuild b/dev-util/shellcheck/shellcheck-0.7.0.ebuild
deleted file mode 100644
index 572de9c65f0b..000000000000
--- a/dev-util/shellcheck/shellcheck-0.7.0.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
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="ShellCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Shell script analysis tool"
-HOMEPAGE="https://www.shellcheck.net/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/diff-0.2.0:=[profile?]
-	>=dev-haskell/mtl-2.2.1:=[profile?]
-	>=dev-haskell/parsec-3.0:=[profile?]
-	>=dev-haskell/quickcheck-2.7.4:2=[template-haskell,profile?]
-	dev-haskell/regex-tdfa:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0 <dev-haskell/cabal-2.5
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	cabal_src_install
-	doman "${PN}.1"
-}
diff --git a/dev-util/shelltestrunner/Manifest b/dev-util/shelltestrunner/Manifest
index 25ac29f30c9c..c534b091f3e6 100644
--- a/dev-util/shelltestrunner/Manifest
+++ b/dev-util/shelltestrunner/Manifest
@@ -1,5 +1,3 @@
-DIST shelltestrunner-1.3.5.tar.gz 21428 BLAKE2B af7573a16159baf5dbcbedc10a454b1f09875031cc9d619b287aeaf507744a2a1dc5cde8ea509949097b5364b5b9ac9438705e58d2d08647e5fa6c4eccceec37 SHA512 f0cc03c41fe176ddfd0e498121f5ebafda721b93e9a84f320b445bf797022545e1046ffb3814e2eaac72f0975a2a11fb1de5e0a007c5700de028e57ee66fa093
 DIST shelltestrunner-1.9.tar.gz 39538 BLAKE2B 45dc5acbfd35d65a818938382e62eacc7aa3798e8f0ab9cdd4d4a358f470de9854bedbd2335bae6b4195ea05b2305de84e0b13c86206ac0e53039726fbc59354 SHA512 bdb5476e30189f0997f3a9505d954a828475a5d95e1220dc9ed342e96100f4dfa0cfadc1afd9a5758223cf1a659d1f77d7d0a0533c32bd80b325c9a7ad48178d
-EBUILD shelltestrunner-1.3.5-r1.ebuild 1196 BLAKE2B f560c4f4094152431de55a6878fff2f9a70bda9e74f22d0c9d4c965ee34d5a12dd80b0c5765481291abac07e763c068ede1cbe9af3660a527faa52d32c517df0 SHA512 bc939c9ca6c8e545a6781e1d23bbdf426bff73198d4838b1ea24a5d3c4a48ad733a273f69063b413eae43b727d711dcf2f686acf8da536ecbaf95a2858dc9409
 EBUILD shelltestrunner-1.9.ebuild 1424 BLAKE2B 7a8585896b41fe1680bd82550aca07c0e44b75f0f8ccd4e15d72848c6ed46d1fcf0441253b799ec6dbc80e9e35d99189f07fcdbe40eb18a3632eca22b184e1c2 SHA512 7771d6a5ae08f580506a249185f991dc0ee8b1af80e5985eae77f2a7d33053189e8de88a1c2f427d849353bc1776dcd78476e57e5595b20395c60c903fef357d
 MISC metadata.xml 635 BLAKE2B d6582231d4828a390bf96dd9c75dfebc87ef599a2e659f281bee36ac2a1ca3cd73702e38518e47343753766caf772180f19c97b1805f236993d4486d2f15ea2a SHA512 a398308f38fffe954bdcb052e6b22997442c2a303896790c643e3e95cc38976f2d5b8fb9d08a713411fd5ec0aca2d2904a5a388276d69ad132e8780115bac6f8
diff --git a/dev-util/shelltestrunner/shelltestrunner-1.3.5-r1.ebuild b/dev-util/shelltestrunner/shelltestrunner-1.3.5-r1.ebuild
deleted file mode 100644
index d51ce4d5631f..000000000000
--- a/dev-util/shelltestrunner/shelltestrunner-1.3.5-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
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="A tool for testing command-line programs"
-HOMEPAGE="http://joyful.com/shelltestrunner"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cmdargs-0.7:= <dev-haskell/cmdargs-0.11:=
-	>=dev-haskell/diff-0.2.0:= <dev-haskell/diff-0.4:=
-	>=dev-haskell/filemanip-0.3:= <dev-haskell/filemanip-0.4:=
-	dev-haskell/hunit:=
-	<dev-haskell/parsec-3.2:=
-	>=dev-haskell/pretty-show-1.6.5:=
-	>=dev-haskell/regex-tdfa-1.1:= <dev-haskell/regex-tdfa-1.3:=
-	dev-haskell/safe:=
-	>=dev-haskell/test-framework-0.3.2:= <dev-haskell/test-framework-0.9:=
-	>=dev-haskell/test-framework-hunit-0.2:= <dev-haskell/test-framework-hunit-0.4:=
-	>=dev-haskell/utf8-string-0.3.5:= <dev-haskell/utf8-string-1.1:=
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'HUnit                            < 1.3' 'HUnit' \
-		'process                          < 1.3' 'process'
-}
diff --git a/dev-util/source-highlight/Manifest b/dev-util/source-highlight/Manifest
index e68eb60ae373..5e8a1b7d055f 100644
--- a/dev-util/source-highlight/Manifest
+++ b/dev-util/source-highlight/Manifest
@@ -1,5 +1,5 @@
 DIST source-highlight-3.1.8.tar.gz 1648351 BLAKE2B 1ce1590c86f7aed9d27bb21bce6b0869828b28068d71404410e080b85f6354eb6f520cec8c81d1e9170dd90b158dc4536e5287a04bf2d271fa26354fb853ea32 SHA512 00a49ab180460750614b38be9a569478d1d34d01f601ebc7452a4fee8475a19faf9bb9fb2f256c6b40d43fbc3d34962a77ba8b9833483345c4e4a42faad6976c
 DIST source-highlight-3.1.9.tar.gz 1717234 BLAKE2B 6eb40b2274df0772c4a241504e5db5dfdaac600549e0b11aba726f7b4d5ab600c3849a8815bc782ad1bb1f99b69766527645dd202731bde4b2466c663842c47c SHA512 d8e154e9a5d62c77807e4e5d36c0faed5ce2964291be5f8b83e2968a6de52229503689a4ca2109a717ae2632a14b63ec937ca0430c91684c72063f6bc0294195
 EBUILD source-highlight-3.1.8.ebuild 1389 BLAKE2B 57af29c1e8206f9851eeb8c9c3bc4a38bde9e8d7584afac23de65e757c3d5f02b5e37b58488cddb9082e0c2ffdb7c074b510ace4ab1104557852a05b1d9950dd SHA512 f01ae5c89cec2611909a5fd60c0a63520d840b3c6d48ad6a358e45e96cb93528392e0ce496e70d6e13e8da1c56adca0d35053e4d9d8f241a62a19e2472ddffc2
-EBUILD source-highlight-3.1.9.ebuild 1406 BLAKE2B 11d538bd779af48b3ee317b266f5dc88a99adaa3d956a5360388d897427e0ed46e377152b63a17345c00ad09148b3bbd79adb31b8d8fee775aa8f6417fd8c5fd SHA512 0f15dece013549a5a1d179465e237de7d85e1af516fdd4d2833e2a21d1131cb7346b3f069df2edaf035640590a2529342f5f57455e773e6108b7c331a5a4943d
+EBUILD source-highlight-3.1.9.ebuild 1399 BLAKE2B b6713101735506d5f085067fcf6af4fadfc70afa515e03b24e65bc3a0c4302b9cd95bde25d4407dbcfd6b49dcefae24b44e7da18f31abf74dece4ecfa2c9a195 SHA512 ddc297ad181adea42bb8a11f8512a5c83e8329fe26e24d9a277f057334e720fd5904b2c427b12103b502e7c028639ac04dd2659aa239997aa02bb5ae222e6c6f
 MISC metadata.xml 267 BLAKE2B 5267526ad53ec7bedfe46f8cba86c810629394fa4f3c59e1b69619b0a11a9edbb746ae6abf818182da7ade72c862360f43a19209007a23da9701df26b96f77dd SHA512 715bb37d958c1e508b2ef00711ab3a4abee982efe90867fd2bcf91fa91305d5a413a4f3d13d01ea6e27eb15f5f9dcb58fa13ecfed7025cae43745792ac1a105d
diff --git a/dev-util/source-highlight/source-highlight-3.1.9.ebuild b/dev-util/source-highlight/source-highlight-3.1.9.ebuild
index 79dc0516a190..205374a14a52 100644
--- a/dev-util/source-highlight/source-highlight-3.1.9.ebuild
+++ b/dev-util/source-highlight/source-highlight-3.1.9.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Generate highlighted source code as an (x)html document"
 HOMEPAGE="https://www.gnu.org/software/src-highlite/source-highlight.html"
 SRC_URI="mirror://gnu/src-highlite/${P}.tar.gz"
 LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 SLOT="0"
 IUSE="doc static-libs"
 
diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index fa3a8cda4908..1413f3916a33 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -3,6 +3,6 @@ DIST umockdev-0.11.3.tar.xz 753152 BLAKE2B 9f78d160a653ba2c56e97d1b331dfeecd4dd8
 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 1008 BLAKE2B 2c759f19cab5a3386d0c0fd5226e08d82c903577e7923ee2fd5ed035de80aaee3d2414d20fd9b5aee6d031ec46b999d39818d58bdf5e70ca61ea6973f149df08 SHA512 c59bc1154a73886962f992517da4b4585c8ac8ce99642cebe815d5a691240b1efc2ed323002c2bbd2ecbc752cc24341d2e367987f9eecc46f0a24f6ff79e9b79
-EBUILD umockdev-0.12.1.ebuild 1196 BLAKE2B a5fad4a1391a63b280495c7668724c286c51693a3a6e785bb608ec975a3fc0717cd2c1814fc7cd7513b9e465ab9da3aebc975bcf52ee5a2fec7cd932f62e6af9 SHA512 74f84a5bf5d3b3516d7753f8cc0cea4ce2d99899d9aac29a301b9dba6f1737f9b368cd29efde5f71dd06825a2508abb39aa78a0ef11fe8eeaaf98dc30ec08531
+EBUILD umockdev-0.12.1.ebuild 1195 BLAKE2B 96364a0cbac6f75dbc5368b3e31092bced2d3abf726a882c8ca21132f032c6e627913709bb2b1875d873f3144de3f25c6845730d1d8cbcbb2f23f5143a397491 SHA512 0b687886638645c816b8442011cc3eff3b452629804a0f665a1b516deac6b8e8b524a4364df854367bf4815c2e7362547a1403d91afe356ea04fbf012bd03ae7
 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.12.1.ebuild b/dev-util/umockdev/umockdev-0.12.1.ebuild
index 105da8e53ea0..6f0275625128 100644
--- a/dev-util/umockdev/umockdev-0.12.1.ebuild
+++ b/dev-util/umockdev/umockdev-0.12.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+introspection static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 6689be387134..852cebc56a2a 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -3,8 +3,10 @@ AUX valgrind-3.7.0-respect-flags.patch 360 BLAKE2B 020b9e3af2c6393193edd8be99ff2
 DIST valgrind-3.14.0.tar.bz2 16602858 BLAKE2B 00d601593388180cc874cf2f0c78e79f705f145e45ea82996117cb91ba881e7888ef241fb7e45927f82f99666d76ed35cb5d451e9a3ef123c04a0dff233b2269 SHA512 68e548c42df31dc2b883a403e0faff7480c49b3054841870f5d2f742141ba199eca5d83c96bbf283115f0633f2bdb0860161d422f98e3ec720ec65760d250f97
 DIST valgrind-3.15.0.tar.bz2 20241437 BLAKE2B a1bd46d46b3cd9f963773d011e7c74bf5e09e59be13afe38229a3c66a89eeb416498faed67d6ec21489b630b55ac73cc212e17ba515884f8b6374849a60e3720 SHA512 5695d1355226fb63b0c80809ed43bb077b6eed4d427792d9d7ed944c38b557a84fe3c783517b921e32f161228e10e4625bea0550faa4685872bb4454450cfa7f
 DIST valgrind-3.16.0.tar.bz2 16267317 BLAKE2B 4ab7a248bc46a772a03fecdab4658b059e65dc328f422f51d23d116d658b8fcfe1dc4b3b26b43ca7bd824169b169506f67cd14a1db2b767b5b5a34c949687d25 SHA512 6c82a0121e0ffde79f84943ea0f5791159ad3e37a490c1a18ff23f41cd4de62b62110e9c4d48b95b06d542f2a6d638492ecaeba9fed48f7e909e959aa4b4856d
+DIST valgrind-3.16.1.tar.bz2 16262776 BLAKE2B 1c333c26827f7a8356869e8758da9dd6a7444642ac4f6377c84fdab8349b9cee1e9bf2cf2eb86043c4feffab342dd97da20e76d7566d0296189e6ea8483a8c65 SHA512 2a4173efe1b6facdd2f5c5ee8ed006704168eba1813736fccc8191d60363afd96197512cf42037e65f18d4ddd49adc74a54c47210df216fba3c46bf68ef0f950
 EBUILD valgrind-3.14.0.ebuild 3682 BLAKE2B b5c775610622d2aa48db013dfe9cfc6d8db508b825df2cc3f7759de9d0467161cb7d5eb8c18aee8532ebf04a9aebfa3663b88661bc4d3d747916997a71d1904f SHA512 8fddf0b86912858fcd60ba23e301934dbd256efbbd8f08ba9972167cd04ab512f5f759acd3dd2a7c12e45428bb25ebb3674bd60b84cc6ab1dac38f492f9a8952
 EBUILD valgrind-3.15.0.ebuild 3761 BLAKE2B 0f839a8e208e33a879331b3791668987d51bac4bc8e9cff2eb03172736a3b9a8b24a256c01065d688f3a43845e4d915e6c68c61f68c4599f3bb7298cd5e82fbe SHA512 77bd2fce8757ef1b7e9f940c24aa184551781dfe139acfca63c92fa643e018e34b746b70e4f5f55a1a5738e4988beab986d5932711cb7c97d1e48e0daf85f72c
 EBUILD valgrind-3.16.0.ebuild 3766 BLAKE2B 820536cd71c55c9fa35f77b014d7a5c5936fc845773b1523ef79c9c6e47d632e1633e2f60cd378b33610c396d57ca71241517de1817aad86402836376b954320 SHA512 454562b3e6725accb06c4d06450eb2e30cc5e4819932ad227d5b6f8b58b0b9b9d8f9966ac1c2294e8f7dc05a0f75bc29eb31c7084c27c3259d47306246481e26
+EBUILD valgrind-3.16.1.ebuild 3766 BLAKE2B 820536cd71c55c9fa35f77b014d7a5c5936fc845773b1523ef79c9c6e47d632e1633e2f60cd378b33610c396d57ca71241517de1817aad86402836376b954320 SHA512 454562b3e6725accb06c4d06450eb2e30cc5e4819932ad227d5b6f8b58b0b9b9d8f9966ac1c2294e8f7dc05a0f75bc29eb31c7084c27c3259d47306246481e26
 EBUILD valgrind-9999.ebuild 3753 BLAKE2B 546a516d9a909f44e1c8dc20ace9025826335e2910e3652e1c7592804765fd4d679f6422276399c7629e2b711236181958dfe435198b8ebd8327b6f637cd67fd SHA512 64831f5594eee66cb5ed5a1afbc44708cf0f334e05b22e46c4675f35528628f5bb6f89981de420bcae568b18dee4767150a6465f75f1451cdd128bf297dd04bd
 MISC metadata.xml 1027 BLAKE2B df13361ec401ce5e0bfa11e51378c432405bd296a874d8c71c26c9cbdf0171689e4b3134b5e05672dfc22bbcd6e2b6c74b96c47367725c209990d3e1fcc65e7b SHA512 da5bcaf596f2adaa552cc3b7296891b40be0bafec8a12695076ce8fbe660b8aabe70508eb02ab3fb66b0d9dd0c0c8615f430c1ee0ce3f3579732ea2406c8a778
diff --git a/dev-util/valgrind/valgrind-3.16.1.ebuild b/dev-util/valgrind/valgrind-3.16.1.ebuild
new file mode 100644
index 000000000000..33873a0e69c3
--- /dev/null
+++ b/dev-util/valgrind/valgrind-3.16.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
+
+DESCRIPTION="An open-source memory debugger for GNU/Linux"
+HOMEPAGE="http://www.valgrind.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="mpi"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
+	KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+fi
+
+DEPEND="mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Correct hard coded doc location
+	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
+
+	# Don't force multiarch stuff on OSX, bug #306467
+	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
+
+	# Respect CFLAGS, LDFLAGS
+	eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
+
+	eapply "${FILESDIR}"/${PN}-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# upstream doesn't support this, but we don't build with
+		# Sun/Oracle ld, we have a GNU toolchain, so get some things
+		# working the Linux/GNU way
+		find "${S}" -name "Makefile.am" -o -name "Makefile.tool.am" | xargs \
+			sed -i -e 's:-M,/usr/lib/ld/map.noexstk:-z,noexecstack:' || die
+		cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in
+	fi
+
+	# Allow users to test their own patches
+	eapply_user
+
+	# Regenerate autotools files
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+
+	# Respect ar, bug #468114
+	tc-export AR
+
+	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
+	#                       while compiling insn_sse.c in none/tests/x86
+	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
+	#                       because valgrind doesn't link to glibc (bug #114347)
+	# -fstack-protector-all    Fails same way as -fstack-protector/-fstack-protector-strong.
+	#                          Note: -fstack-protector-explicit is a no-op for Valgrind, no need to strip it
+	# -fstack-protector-strong See -fstack-protector (bug #620402)
+	# -m64 -mx32			for multilib-portage, bug #398825
+	# -ggdb3                segmentation fault on startup
+	filter-flags -fomit-frame-pointer
+	filter-flags -fstack-protector
+	filter-flags -fstack-protector-all
+	filter-flags -fstack-protector-strong
+	filter-flags -m64 -mx32
+	replace-flags -ggdb3 -ggdb2
+
+	if use amd64 || use ppc64; then
+		! has_multilib_profile && myconf+=("--enable-only64bit")
+	fi
+
+	# Force bitness on darwin, bug #306467
+	use x86-macos && myconf+=("--enable-only32bit")
+	use x64-macos && myconf+=("--enable-only64bit")
+
+	# Don't use mpicc unless the user asked for it (bug #258832)
+	if ! use mpi; then
+		myconf+=("--without-mpicc")
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	if [[ ${PV} == "9999" ]]; then
+		# Otherwise FAQ.txt won't exist:
+		emake -C docs FAQ.txt
+		mv docs/FAQ.txt . || die "Couldn't move FAQ.txt"
+	fi
+
+	dodoc FAQ.txt
+
+	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_names on shared libraries, can't turn them into bundles,
+		# as dyld won't load them any more then, bug #306467
+		local l
+		for l in "${ED}"/usr/lib/valgrind/*.so ; do
+			install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}"
+		done
+	fi
+}
+
+pkg_postinst() {
+	elog "Valgrind will not work if glibc does not have debug symbols."
+	elog "To fix this you can add splitdebug to FEATURES in make.conf"
+	elog "and remerge glibc.  See:"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"
+}
diff --git a/dev-util/xdelta/Manifest b/dev-util/xdelta/Manifest
index b1b2e475e803..32eca5e926cc 100644
--- a/dev-util/xdelta/Manifest
+++ b/dev-util/xdelta/Manifest
@@ -4,7 +4,7 @@ AUX xdelta-1.1.4-pkgconfig.patch 2551 BLAKE2B 606dd386fbfb768c931e2c08b5508f6bc3
 DIST xdelta-1.1.4.tar.gz 423529 BLAKE2B b565f82ba0504118b74127096939e5699ea312be5c6c8a345abfcf0fb01b45e759abe595b33619b2714671e2f0307d603366a1f7a6b1fb5a786378716a51df6b SHA512 eef45f7977e9a7f490b881f33ab8a948cc5eff9300ea850cc30062905c8e883c104961f075f56f7ce8e385142c35de168aef1e0b8169bda66786ea4bee33168b
 DIST xdelta3-3.0.11.tar.gz 683605 BLAKE2B bc33c9d6a3bb21bc52d72bba54f5e2b1058ea8d7cd7474aaf6dbdc27e165e0fbea644c584402f5bbc8ace7cd6a3aefae18588a659418f93eb041168545363bf4 SHA512 41c48e28f92ad50a737cf0acac150fe17d1132e9a652c482d751c8c4e745c6922d576a183eeabae343a1a238ed8c53353e537977628c86eb599ab3d1c01e7c52
 DIST xdelta3-3.1.0.tar.gz 727607 BLAKE2B 1dd7846dad0414071a8af172fc3b73a0321fc9c841786563fe92ebe5c53d80d3eb07cc553cb5a9813432d9df5aae51d5b4a4c32a8c06a34dace5868297b5a68b SHA512 848c90a28018ec3c541ec43be59ea90328142c4705d3b59907fd89e8f6ac2758e288b1a1112fea601884c50ef7f6cf2c1634f539a76bea65a2741d3bb0e9b990
-EBUILD xdelta-1.1.4-r2.ebuild 717 BLAKE2B cb71ff2580f5e8053922eef0e7049f6088e524b6deeb06fb6762ea1bc61e1815f1010c22386d8ecc43785ed829660e459da226ab4f139c0259f3c5eacfa70286 SHA512 9426f88e3d7bcdc9c9572662f2c8b29a5466f9295b649cb72b195cc6994f57dbaa86891e51a2880c983678f0b033731f5e152da5eab969f624f3aa4e520ba963
+EBUILD xdelta-1.1.4-r3.ebuild 826 BLAKE2B f343b7544101220c0b46001ee153aa46dffcd80d6277fc987864b5cc9d421a3aa4cf24bfe2539e0f885ea04c83f6ac14930e6bcaa60eebb5e72f9326dfc8b1c7 SHA512 3b1432ada0657927ca43abfc466de768758bdea5f6673bfe2d038a2b5646f635c65d12b2531f633f5d22b31ff1b20b7a4e2b9dd5fa8a2dccc6c79ec3b22b1633
 EBUILD xdelta-3.0.11.ebuild 839 BLAKE2B d6d4f4d5c9ff3f7d1c59aeab589969a7325eaf1181e3f6576c14dff9632cb26c930e890b7ff8b5e2ccdde018bff17577de30415a020f6677b49b77256e254115 SHA512 a5b275381ef15e9907052214debb03900ede767a8b14130d9028a8376902ae21ffe7919af64544fbf20478873feedd976c67f2939ea542f8a562aa8008e3893b
 EBUILD xdelta-3.1.0.ebuild 1146 BLAKE2B 214a9cd0019516af48e204567cba7d68cd370896622ffbf2e86c518ef3ac66d2900174a6fa34034e9788dafaf8d20816120e594f157470839ef6394c5433c9c3 SHA512 1e767dc1456bb84b68866d511423d916fbf1593a68d3a34ec3c863769f37442390f4a96388848e653997ae8cd81b1e12d81926580dc7fd9ee64728ed3ed7b6ce
 MISC metadata.xml 381 BLAKE2B 1e67843f342c5d64a78b0ec5f6b20cb6c091f020be78355e83cc5ab8d53312fa97e025d9f819e73fd0c4fe936d15bf87600835bcf2d9040ba67dc740d270d2cf SHA512 2c439c35f726e18396d3a0f2e923cf2f2d0eb7a9798907fd0f039dddcc9fdbac95d6e89d113fc8a937ceb260c90901e0657ecdea2f0bf423ca9456627b2912d3
diff --git a/dev-util/xdelta/xdelta-1.1.4-r2.ebuild b/dev-util/xdelta/xdelta-1.1.4-r2.ebuild
deleted file mode 100644
index 2a2f44f7aaad..000000000000
--- a/dev-util/xdelta/xdelta-1.1.4-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Computes changes between binary or text files and creates deltas"
-HOMEPAGE="https://xdelta.googlecode.com/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2
-	>=sys-libs/zlib-1.1.4:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	eapply_user
-	eapply "${FILESDIR}"/${P}-m4.patch
-	eapply "${FILESDIR}"/${P}-glib2.patch
-	eapply "${FILESDIR}"/${P}-pkgconfig.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	default
-}
diff --git a/dev-util/xdelta/xdelta-1.1.4-r3.ebuild b/dev-util/xdelta/xdelta-1.1.4-r3.ebuild
new file mode 100644
index 000000000000..13f4fe56b9fc
--- /dev/null
+++ b/dev-util/xdelta/xdelta-1.1.4-r3.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 toolchain-funcs
+
+DESCRIPTION="Computes changes between binary or text files and creates deltas"
+HOMEPAGE="https://xdelta.googlecode.com/"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+
+RDEPEND=">=dev-libs/glib-2
+	>=sys-libs/zlib-1.1.4:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	eapply_user
+	eapply "${FILESDIR}"/${P}-m4.patch
+	eapply "${FILESDIR}"/${P}-glib2.patch
+	eapply "${FILESDIR}"/${P}-pkgconfig.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
index d5679c61c297..c2a69363b789 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-dev-tools-4.14.0.tar.bz2 292275 BLAKE2B 18f28394ded038a7bcf0e754ebb359464358df245903a0c4441df2845e57c9059de6e6775a90c0e6c3cde4936a847ddf26ae88ff61fe7612fc2626b00f1d56a7 SHA512 e22b139ff7516ec0e510f882cc6a9e8e8b2b7bd41093c8e67e5ef11eb6c2c2848637513369d652f7238f10b5005c5483a938d3348020b48a4c1fadadd6d635f8
+DIST xfce4-dev-tools-4.15.0.tar.bz2 336453 BLAKE2B 9072d86b4b1645e72c04f26b5609162f50aac9d90ad007d2f629bb1ec67d242f3addea4bdd6f129f3336658b04f0eaecbd039154dfd98ccb87a85840b502d11f SHA512 125c8a7d594b17ce822dc5f57f5c700e69ee6208b06931cb0fefcbd1aa70281f388a9eebe8b451ffb55f16682070f9119a43b148f97adcdfd2278b4901910425
 EBUILD xfce4-dev-tools-4.14.0.ebuild 579 BLAKE2B 366d376277ef62122256194b0d4dfdd747e30e82097009b8c41d83473497f5b285b2b75b4584d2293236a17c9efc1ef152a331a398a7f1e67b68dc904c55eb58 SHA512 68fadca9308eb50c5c2be9f50847df966457518cebe86263c21d2f4b8aa64bc5b0f7146f25c16df281924c643ce4de2f38e2fe8db8efb155dde8b3dd9771363e
+EBUILD xfce4-dev-tools-4.15.0.ebuild 584 BLAKE2B 6b2f6fcd2f8ed91d4a09138a3ea90c1ecb1e5cf8236dc7e16bbf4889d0aabb9a08d822b7cca7b0888ee586837e41a5c055d71836cb2255ac82c99af875a58cf7 SHA512 35e950fba2c4de9b286afa8d9af5560c8c1ec72c8df70ab2fafc67015005bee23f5e7b59e79e8d631e668cb1ceb423106c4a1fddfdbd39e8e7741e6fb9fe1c9e
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.15.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.15.0.ebuild
new file mode 100644
index 000000000000..665633a8f721
--- /dev/null
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.15.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A set of scripts and m4/autoconf macros that ease build system maintenance"
+HOMEPAGE="https://www.xfce.org/ http://users.xfce.org/~benny/projects/xfce4-dev-tools/"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.42"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index d77aacf33ffb..21354b5ab3f3 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index d690389670ed..590d14674f8e 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -5,5 +5,4 @@ AUX git-annex.bash 440 BLAKE2B af7b2b47e98386cef417051a11ae4baff07ea8cd96177c95b
 AUX git-annex.xpm 1961 BLAKE2B 0fe6e0cf9c43b1b16db1e8394ccda5eef2fdc41727aa3aa97fef8f955e8fdd71336c29f439ed2ad46553f8d67ef8be9d3dbcc6a93c81686f5e746a08b1113c6d SHA512 4a22ac448852160d66838c272f41b8c7599aa1b904e35ac03ea294d9ed15b855bde24b7e5407a2578937bfd51d482837ed6680af680166d030f71666316ae4d3
 DIST git-annex-6.20170818.tar.gz 1111837 BLAKE2B ff18ffd101b3f9dc2b74caaed57c8f8f568fc51beeedddccf7f76ef5a27a99801cb994a52f09e5467be2f030842f4fa3b38bfd0a19a207057ffe269dfc8f240c SHA512 06587bf0d3056e4b94d4c40aaae820efda133dcbc876a2ac3db3183fb511ec20aae4c495323b4886868a3e66b5b1f53a04c5f3abb0362c718bbadc8e2f6e15d0
 EBUILD git-annex-6.20170818-r1.ebuild 4424 BLAKE2B 3f8bfdcb1c4ff2e328def3aa19df4ecaf37f63af2f13abc6da4d9e5083feecb67d61693a9045fa3b7f5b0a0671140d6cad803cf1880c51e9b41d7ce792c8e7bd SHA512 cd13af30010593bd53b55711478c8941e963f76f71bb52fcef1207c0275118d2ff95d693066fab96384bbba8d7deb808f0e3ec30563d1fa917b55d02cb52e5bc
-EBUILD git-annex-6.20170818.ebuild 4436 BLAKE2B d0f7708835679700a53744352a3d7c78e4d5c7f9b4ce8072f7d0534f64b18d2acfb82c6168733116e004fc969f9c35a19309275b61bb5889548923eb1390268f SHA512 8a618c518acdb2883788bc65c5ae99fee4c2ffb92dcbc643d47c10342dc2ce6ede7422bb23b74383ffc307eb8800dfb7e5d74bfd638ad7e5eda6abcafff3c8d0
-MISC metadata.xml 1735 BLAKE2B 7722b62eae4ad8f3859262d67f6ed9223b6eb86962fa52a4d53ed9f9569dfd6045be8bd7c975fe8719a25fc13ae7c64d7be2fbd5993f77583f2b5d8a77d83c20 SHA512 33e68df57c88e73f1d1b88d051a0f9a22a84dea82e26b8b552a36f213c63680fd780bbc8c2cdf1f1c9e57b47d982218a4b096ac59e8137b019af7164fe72ea69
+MISC metadata.xml 1661 BLAKE2B 356d0921a762cfb657a0da795457c4016c2b131d0465e214cd24ca1b61b6b2666d0d4d3888abcaad00c70bae8f45b25400abfcba669aaa0e6f136f7e782424f0 SHA512 711b59db225918c774489ce308f16fd372377ff64c1449030bc75c4ae17212515ddeac741ee11978a6e3212b3edc75fd45d730664bd625a54d7887bc12dab928
diff --git a/dev-vcs/git-annex/git-annex-6.20170818.ebuild b/dev-vcs/git-annex/git-annex-6.20170818.ebuild
deleted file mode 100644
index ac78674adb6d..000000000000
--- a/dev-vcs/git-annex/git-annex-6.20170818.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
-
-# ebuild generated by hackport 0.5.3.9999
-#hackport: flags: -production,-android,-androidsplice,-testsuite
-
-CABAL_FEATURES=""
-inherit haskell-cabal bash-completion-r1
-
-DESCRIPTION="manage files with git, without checking their contents into git"
-HOMEPAGE="http://git-annex.branchable.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-RESTRICT="test"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+assistant benchmark +concurrentoutput +dbus doc +magicmime +network-uri +pairing s3 +torrentparser +webapp +webdav"
-
-RDEPEND="dev-haskell/aeson:=
-	dev-haskell/async:=
-	dev-haskell/bloomfilter:=
-	dev-haskell/byteable:=
-	dev-haskell/case-insensitive:=
-	dev-haskell/crypto-api:=
-	dev-haskell/cryptonite:=
-	dev-haskell/data-default:=
-	dev-haskell/disk-free-space:=
-	dev-haskell/dlist:=
-	dev-haskell/edit-distance:=
-	dev-haskell/esqueleto:=
-	>=dev-haskell/exceptions-0.6:=
-	>=dev-haskell/feed-0.3.9:=
-	dev-haskell/free:=
-	dev-haskell/hslogger:=
-	dev-haskell/http-client:=
-	>=dev-haskell/http-conduit-2.0:=
-	>=dev-haskell/http-types-0.7:=
-	dev-haskell/ifelse:=
-	dev-haskell/memory:=
-	dev-haskell/monad-control:=
-	dev-haskell/monad-logger:=
-	>=dev-haskell/mtl-2:=
-	dev-haskell/old-locale:=
-	>=dev-haskell/optparse-applicative-0.11.0:=
-	dev-haskell/persistent:=
-	dev-haskell/persistent-sqlite:=
-	dev-haskell/persistent-template:=
-	>=dev-haskell/quickcheck-2.1:2=
-	dev-haskell/random:=
-	dev-haskell/regex-tdfa:=
-	dev-haskell/resourcet:=
-	dev-haskell/safesemaphore:=
-	dev-haskell/sandi:=
-	dev-haskell/securemem:=
-	dev-haskell/socks:=
-	dev-haskell/split:=
-	>=dev-haskell/stm-2.3:=
-	dev-haskell/stm-chans:=
-	dev-haskell/text:=
-	dev-haskell/unix-compat:=
-	dev-haskell/unordered-containers:=
-	dev-haskell/utf8-string:=
-	>=dev-haskell/uuid-1.2.6:=
-	>=dev-lang/ghc-7.8.2:=
-	assistant? ( >=dev-haskell/dns-1.0.0:=
-			dev-haskell/hinotify:=
-			dev-haskell/mountpoints:=
-			sys-process/lsof )
-	benchmark? ( dev-haskell/criterion:= )
-	concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= )
-	dbus? ( >=dev-haskell/dbus-0.10.7:=
-		>=dev-haskell/fdo-notify-0.3:= )
-	magicmime? ( dev-haskell/magic:= )
-	network-uri? ( >=dev-haskell/network-2.6:=
-			>=dev-haskell/network-uri-2.6:= )
-	!network-uri? ( >=dev-haskell/network-2.4:= <dev-haskell/network-2.6:= )
-	pairing? ( dev-haskell/network-info:=
-			dev-haskell/network-multicast:= )
-	s3? ( >=dev-haskell/aws-0.9.2:=
-		dev-haskell/conduit:=
-		dev-haskell/conduit-extra:= )
-	torrentparser? ( >=dev-haskell/torrent-10000.0.0:= )
-	webapp? ( dev-haskell/blaze-builder:=
-			dev-haskell/clientsession:=
-			>=dev-haskell/path-pieces-0.1.4:=
-			>=dev-haskell/shakespeare-2.0.0:=
-			dev-haskell/wai:=
-			dev-haskell/wai-extra:=
-			>=dev-haskell/warp-3.0.0.5:=
-			>=dev-haskell/warp-tls-1.4:=
-			>=dev-haskell/yesod-1.2.6:=
-			>=dev-haskell/yesod-core-1.2.19:=
-			>=dev-haskell/yesod-default-1.2.0:=
-			>=dev-haskell/yesod-form-1.3.15:=
-			>=dev-haskell/yesod-static-1.2.4:= )
-	webdav? ( >=dev-haskell/dav-1.0:= )
-"
-# not generated by hackport:
-RDEPEND="${RDEPEND}
-	dev-vcs/git
-"
-
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-# not generated by hackport:
-DEPEND="${DEPEND}
-	dev-lang/perl
-	doc? ( www-apps/ikiwiki net-misc/rsync )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.20160114-QC-2.8.2.patch
-	"${FILESDIR}"/${PN}-6.20161210-directory-1.3.patch
-	"${FILESDIR}"/${PN}-6.20170101-crypto-api.patch
-)
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-android \
-		--flag=-androidsplice \
-		$(cabal_flag assistant assistant) \
-		$(cabal_flag benchmark benchmark) \
-		$(cabal_flag concurrentoutput concurrentoutput) \
-		$(cabal_flag dbus dbus) \
-		$(cabal_flag magicmime magicmime) \
-		$(cabal_flag network-uri network-uri) \
-		$(cabal_flag pairing pairing) \
-		--flag=-production \
-		$(cabal_flag s3 s3) \
-		--flag=-testsuite \
-		$(cabal_flag torrentparser torrentparser) \
-		$(cabal_flag webapp webapp) \
-		$(cabal_flag webdav webdav)
-}
-
-src_test() {
-	if use webapp; then
-		export GIT_CONFIG=${T}/temp-git-config
-		git config user.email "git@src_test"
-		git config user.name "Mr. ${P} The Test"
-
-		emake test
-	fi
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	newbashcomp "${FILESDIR}"/${PN}.bash ${PN}
-
-	dodoc CHANGELOG README
-	if use webapp ; then
-		doicon "${FILESDIR}"/${PN}.xpm
-		make_desktop_entry "${PN} webapp" "git-annex" ${PN}.xpm "Office"
-	fi
-}
diff --git a/dev-vcs/git-annex/metadata.xml b/dev-vcs/git-annex/metadata.xml
index e35251395d35..556f1c584b7f 100644
--- a/dev-vcs/git-annex/metadata.xml
+++ b/dev-vcs/git-annex/metadata.xml
@@ -23,7 +23,6 @@
 		<flag name="assistant">Enable git-annex assistant and watch command</flag>
 		<flag name="benchmark">Enable benchmarking</flag>
 		<flag name="concurrentoutput">Use concurrent-output library (experimental)</flag>
-		<flag name="magicmime">Use libmagic to determine file MIME types</flag>
 		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
 		<flag name="pairing">Enable pairing of git annex repositories</flag>
 		<flag name="s3">Enable Amazon S3 remote</flag>
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 5dcebbccdb12..519908726400 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -2,9 +2,9 @@ AUX 70mercurial-gentoo.el 76 BLAKE2B 2b9488757b2516dc494ce4f38c89b63669886eefaeb
 AUX cacerts.rc 51 BLAKE2B 8b42b2f4514d938b051feb7e59c69e6b06d1ceabe6c5a252a3cb4033555bcccda9375ae1fa9a5607f07296bd094c425077f5788e2c9fbca9b22914da41ddf132 SHA512 39c40c6cc95c54dcae13effb5c23f541f49fd89e0f040e214673afd906c6d5140eb18801d55330f4455507b467f0fae011998e60932e9a2accf37a0e7a047b90
 DIST mercurial-5.2.2.tar.gz 7333065 BLAKE2B 9cec5a6ebe4693a1b96fe268211aa2eaa06643d5b8812c427757839d5389319f0e2ff3c1ed964a56bf8a3c46f7630321abf508c61691102856dfbdbd72fed662 SHA512 875e75587ab1f1c54edd2f7198dff21e6b287425f215a9d28ef98d5359420df90ca7ef0128ec7b772c4a31dc95b1082b4d6d28f1754968a08408516ba9ec91ee
 DIST mercurial-5.3.2.tar.gz 7514256 BLAKE2B 250ecd5c0a64138cbcda599513efba7b040c0fed0f020c73ade2525e0ef8a9ad06c10c5df4e16eb9bbeb3ab0f2cbb622a65f6d4827b269654c662810ef0385fb SHA512 b0afcf82b51676d2e7592eb9b29f9611d59816399166400027b6c8b29c10c9ddc96b57f7913e78f938b1345bb7ac29ecd4ddc793165b7cf192c3c7a95712cc99
-DIST mercurial-5.4.tar.gz 7722447 BLAKE2B 9abd7b62ca6e44ede626331d080f7a0e8e7fb980c169fbfc2e847549c915b65789e317b674a8317bf58ced3cab4e2de790513e45c6556d32cac649fe23e04fdc SHA512 5f92d653ab74da4696ba7f1402e6cb219c0c514a5eeecb9d7282ab95aef2c6f16d5c8e3d0149525f3dc694a133c713b671ba92327e1b0dc3ad8701d522986d8d
+DIST mercurial-5.4.1.tar.gz 7725893 BLAKE2B 3205647b4a8d14ad6d02d7494d3f41b0a6d306ef039ebbcd2f62ca1f00f4a870794de968edafc9379e4e29c59da0aa4c92308facdf8f151f390ed7309782c3c5 SHA512 6173853c38f0aba59d2e29bec7da1c384c27a6004d5d00d1aee70571155122e07514fe6e56cecfdae48ec5f670823a2e6a5c9c8a36dd7041def2b8956fd35703
 EBUILD mercurial-5.2.2-r1.ebuild 4255 BLAKE2B 5c5674ed8531f928586ce757e427d993b807fd60a468cbcd20dd7808887ce08a2bc3895998defc5b710811d5da879f2f988206a77f864d2b3e30ed4656ccf494 SHA512 3f2a17bf0cfa8ab76402ffb5f125b6e8f1de461a86be0ba6ea4d59f0a9f0437118358257f29a9b05adf8101f9094764f1ce4440cb2a75f82da0ffaa837078f76
 EBUILD mercurial-5.3.2.ebuild 4262 BLAKE2B 33d5f02a567bc2ad2e408e128fc086f0cf677c43505a91a6a2cf09839bf9cf3746d066a92f53b88749f9d113e77ca7489fb4cf3b66d4a9786439c3d31b5385b7 SHA512 18bea024806a77d0c6b24c23ed87bb1de4831066abe55d6f0b385d7cf39a276399dd89400ae6b6988a70b31f4190d97b4548610c82693713264979f8d022bbc0
-EBUILD mercurial-5.4.ebuild 4266 BLAKE2B 070746bf6e8b7a1ab4ee60dba7cfaf9d3e6c7e9ed513cbdc31039c28eef80e7aa0f7c4749a5527a511d8627d4d4e43e157482fe2f164af8f79f0761cd3b900bf SHA512 725e6dda70241f4688783104c9cddc5048d61c071f4be85ea37c16d12a7b1257da8666031e3b4bd8b00b7d95f4b199adb1f0bb95755b71cc2b067791d3020a39
-EBUILD mercurial-9999.ebuild 4219 BLAKE2B 567a43e6491cf5317dd96998a57a6d562d07583a9b45ff4f45d01f1f2e1b61243ac646356efb90d86da51dad6634d5ea9a574a348ed73f4a2acf484a2608083f SHA512 d4e0373b8374205a72141e1376b7b17a209cd0e83456e5a0f95d382fa8b20173274f65cac74151a7dd99afb56a50cddf1fe352007fa5e1d7e198b5a37529f3c1
+EBUILD mercurial-5.4.1.ebuild 4069 BLAKE2B 29c243c2ec8289596271a0555f40cf8c3740f372279a0586cda67b8ddaf6e9d294c7b18cd777557283b0cb448d601577c2c203230d24ccd5b4c6ba1fbc9683a0 SHA512 20606c5a0b4f29e688c465954917ed7c72c51c410a5ab948262e34d9056a792aef952a611bd0da3e005579f0c73306092feb4b0c5dc80ea31c577a1ce7d318bd
+EBUILD mercurial-9999.ebuild 4032 BLAKE2B 802015b5f8f386bf38d7397aec896b4ae0557b6096295dd103adb29c75fad955e280d90032ecb8f28686fe7b7f69faa523775ce19b770c43dac17378db8ee451 SHA512 1c5cad662f4482fa1ec1f25824f367b72fd9e2a3b79b058ef852c3a30ef1a974aecdd39d0e8da19aedf7d7a92f3ac49c718d200b1699e106c685d448efe8f250
 MISC metadata.xml 483 BLAKE2B f81d3e855c41f0f5bef819cf4fbb537591f187917c76b5d153f9bf5f4cc14959c5aeef17ec9e5a0596d8e6bd2d8db0ad86dd4dea5ddfdd44a4c063acdc6a8a81 SHA512 3132d4cf6a2ba22ee8f93aef8de590bd576143dd80f56d515afb14cd5962899c0dfc4aee8552f041bac77b997055b2b407bad104591286be985de839f159fc83
diff --git a/dev-vcs/mercurial/mercurial-5.4.1.ebuild b/dev-vcs/mercurial/mercurial-5.4.1.ebuild
new file mode 100644
index 000000000000..904d75ce7a99
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-5.4.1.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 python3_{6..8} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
+
+DESCRIPTION="Scalable distributed SCM"
+HOMEPAGE="https://www.mercurial-scm.org/"
+SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+chg emacs gpg test tk zsh-completion"
+
+RDEPEND="
+	app-misc/ca-certificates
+	dev-python/zstandard[${PYTHON_USEDEP}]
+	gpg? ( app-crypt/gnupg )
+	tk? ( dev-lang/tk )
+	zsh-completion? ( app-shells/zsh )"
+
+DEPEND="emacs? ( >=app-editors/emacs-23.1:* )
+	test? ( app-arch/unzip
+		dev-python/pygments[${PYTHON_USEDEP}] )"
+
+SITEFILE="70${PN}-gentoo.el"
+
+# Too many tests fail #608720
+RESTRICT="test"
+
+python_prepare_all() {
+	# fix up logic that won't work in Gentoo Prefix (also won't outside in
+	# certain cases), bug #362891
+	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
+	# Use absolute import for zstd
+	sed -i -e 's/from \.* import zstd/import zstd/' \
+		mercurial/utils/compression.py \
+		mercurial/wireprotoframing.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	filter-flags -ftracer -ftree-vectorize
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile build_ext --no-zstd
+}
+
+python_compile_all() {
+	rm -r contrib/win32 || die
+	if use chg; then
+		emake -C contrib/chg
+	fi
+	if use emacs; then
+		cd contrib || die
+		elisp-compile mercurial.el || die "elisp-compile failed!"
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install build_ext --no-zstd
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newbashcomp contrib/bash_completion hg
+
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		newins contrib/zsh_completion _hg
+	fi
+
+	dobin hgeditor
+	if use tk; then
+		dobin contrib/hgk
+	fi
+	python_foreach_impl python_doscript contrib/hg-ssh
+
+	if use emacs; then
+		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	local RM_CONTRIB=( hgk hg-ssh bash_completion zsh_completion plan9 *.el )
+
+	if use chg; then
+		dobin contrib/chg/chg
+		doman contrib/chg/chg.1
+		RM_CONTRIB+=( chg )
+	fi
+
+	for f in ${RM_CONTRIB[@]}; do
+		rm -rf contrib/${f} || die
+	done
+
+	dodoc -r contrib
+	docompress -x /usr/share/doc/${PF}/contrib
+	doman doc/*.?
+	dodoc CONTRIBUTORS hgweb.cgi
+
+	insinto /etc/mercurial/hgrc.d
+	doins "${FILESDIR}/cacerts.rc"
+}
+
+src_test() {
+	pushd tests &>/dev/null || die
+	rm -rf *svn*			# Subversion tests fail with 1.5
+	rm -f test-archive*		# Fails due to verbose tar output changes
+	rm -f test-convert-baz*		# GNU Arch baz
+	rm -f test-convert-cvs*		# CVS
+	rm -f test-convert-darcs*	# Darcs
+	rm -f test-convert-git*		# git
+	rm -f test-convert-mtn*		# monotone
+	rm -f test-convert-tla*		# GNU Arch tla
+	rm -f test-largefiles*		# tends to time out
+	if [[ ${EUID} -eq 0 ]]; then
+		einfo "Removing tests which require user privileges to succeed"
+		rm -f test-convert*
+		rm -f test-lock-badness*
+		rm -f test-permissions*
+		rm -f test-pull-permission*
+		rm -f test-journal-exists*
+		rm -f test-repair-strip*
+	fi
+
+	popd &>/dev/null || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	local TEST_DIR
+
+	rm -rf "${TMPDIR}"/test
+	distutils_install_for_testing
+	cd tests || die
+	"${PYTHON}" run-tests.py --verbose \
+		--tmpdir="${TMPDIR}"/test \
+		--with-hg="${TEST_DIR}"/scripts/hg \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	elog "If you want to convert repositories from other tools using convert"
+	elog "extension please install correct tool:"
+	elog "  dev-vcs/cvs"
+	elog "  dev-vcs/darcs"
+	elog "  dev-vcs/git"
+	elog "  dev-vcs/monotone"
+	elog "  dev-vcs/subversion"
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/mercurial/mercurial-5.4.ebuild b/dev-vcs/mercurial/mercurial-5.4.ebuild
deleted file mode 100644
index 25750d8586ff..000000000000
--- a/dev-vcs/mercurial/mercurial-5.4.ebuild
+++ /dev/null
@@ -1,171 +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..8} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
-
-DESCRIPTION="Scalable distributed SCM"
-HOMEPAGE="https://www.mercurial-scm.org/"
-SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+chg emacs gpg test tk zsh-completion"
-
-BROKEN_PYTHON="
-	!~dev-python/python-3.5.0
-	!~dev-python/python-3.5.1
-	!~dev-python/python-3.5.2
-	!~dev-python/python-3.6.0
-	!~dev-python/python-3.6.1"
-
-BDEPEND="${BROKEN_PYTHON}"
-
-RDEPEND="${BROKEN_PYTHON}
-	app-misc/ca-certificates
-	dev-python/zstandard[${PYTHON_USEDEP}]
-	gpg? ( app-crypt/gnupg )
-	tk? ( dev-lang/tk )
-	zsh-completion? ( app-shells/zsh )"
-
-DEPEND="emacs? ( >=app-editors/emacs-23.1:* )
-	test? ( app-arch/unzip
-		dev-python/pygments[${PYTHON_USEDEP}] )"
-
-SITEFILE="70${PN}-gentoo.el"
-
-# Too many tests fail #608720
-RESTRICT="test"
-
-python_prepare_all() {
-	# fix up logic that won't work in Gentoo Prefix (also won't outside in
-	# certain cases), bug #362891
-	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
-	# Use absolute import for zstd
-	sed -i -e 's/from \.* import zstd/import zstd/' \
-		mercurial/utils/compression.py \
-		mercurial/wireprotoframing.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	filter-flags -ftracer -ftree-vectorize
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile build_ext --no-zstd
-}
-
-python_compile_all() {
-	rm -r contrib/win32 || die
-	if use chg; then
-		emake -C contrib/chg
-	fi
-	if use emacs; then
-		cd contrib || die
-		elisp-compile mercurial.el || die "elisp-compile failed!"
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install build_ext --no-zstd
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newbashcomp contrib/bash_completion hg
-
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		newins contrib/zsh_completion _hg
-	fi
-
-	dobin hgeditor
-	if use tk; then
-		dobin contrib/hgk
-	fi
-	python_foreach_impl python_doscript contrib/hg-ssh
-
-	if use emacs; then
-		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	local RM_CONTRIB=( hgk hg-ssh bash_completion zsh_completion plan9 *.el )
-
-	if use chg; then
-		dobin contrib/chg/chg
-		doman contrib/chg/chg.1
-		RM_CONTRIB+=( chg )
-	fi
-
-	for f in ${RM_CONTRIB[@]}; do
-		rm -rf contrib/${f} || die
-	done
-
-	dodoc -r contrib
-	docompress -x /usr/share/doc/${PF}/contrib
-	doman doc/*.?
-	dodoc CONTRIBUTORS hgweb.cgi
-
-	insinto /etc/mercurial/hgrc.d
-	doins "${FILESDIR}/cacerts.rc"
-}
-
-src_test() {
-	pushd tests &>/dev/null || die
-	rm -rf *svn*			# Subversion tests fail with 1.5
-	rm -f test-archive*		# Fails due to verbose tar output changes
-	rm -f test-convert-baz*		# GNU Arch baz
-	rm -f test-convert-cvs*		# CVS
-	rm -f test-convert-darcs*	# Darcs
-	rm -f test-convert-git*		# git
-	rm -f test-convert-mtn*		# monotone
-	rm -f test-convert-tla*		# GNU Arch tla
-	rm -f test-largefiles*		# tends to time out
-	if [[ ${EUID} -eq 0 ]]; then
-		einfo "Removing tests which require user privileges to succeed"
-		rm -f test-convert*
-		rm -f test-lock-badness*
-		rm -f test-permissions*
-		rm -f test-pull-permission*
-		rm -f test-journal-exists*
-		rm -f test-repair-strip*
-	fi
-
-	popd &>/dev/null || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	local TEST_DIR
-
-	rm -rf "${TMPDIR}"/test
-	distutils_install_for_testing
-	cd tests || die
-	"${PYTHON}" run-tests.py --verbose \
-		--tmpdir="${TMPDIR}"/test \
-		--with-hg="${TEST_DIR}"/scripts/hg \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	elog "If you want to convert repositories from other tools using convert"
-	elog "extension please install correct tool:"
-	elog "  dev-vcs/cvs"
-	elog "  dev-vcs/darcs"
-	elog "  dev-vcs/git"
-	elog "  dev-vcs/monotone"
-	elog "  dev-vcs/subversion"
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild
index a62bf9062fdc..3be5d10a8454 100644
--- a/dev-vcs/mercurial/mercurial-9999.ebuild
+++ b/dev-vcs/mercurial/mercurial-9999.ebuild
@@ -17,17 +17,9 @@ SLOT="0"
 KEYWORDS=""
 IUSE="+chg emacs gpg test tk zsh-completion"
 
-BROKEN_PYTHON="
-	!~dev-python/python-3.5.0
-	!~dev-python/python-3.5.1
-	!~dev-python/python-3.5.2
-	!~dev-python/python-3.6.0
-	!~dev-python/python-3.6.1"
+BDEPEND="dev-python/docutils[${PYTHON_USEDEP}]"
 
-BDEPEND="${BROKEN_PYTHON}
-	dev-python/docutils[${PYTHON_USEDEP}]"
-
-RDEPEND="${BROKEN_PYTHON}
+RDEPEND="
 	app-misc/ca-certificates
 	dev-python/zstandard[${PYTHON_USEDEP}]
 	gpg? ( app-crypt/gnupg )
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 72ad6243947a..99ddebb7d9ff 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -3,10 +3,8 @@ AUX svnserve.confd 322 BLAKE2B 53eb3105691af05e4dde3451569f46621ed78a1ea7e7650b0
 AUX svnserve.initd3 575 BLAKE2B 4bc540dd8693c792fca8fd1061a49608ce7ee9a82d79fc43ab3f2f6eb6d1946dd8efb86e532df3576487ad9f49acdb3b9d95b804019d296fae0f757541957a95 SHA512 3efca4e5065cbe37f5137f3f67a0a654195e50ce0b00468f5edb1e5d476daa82422b1e833281d8edba111360b20d001a5991731e9f32bf3c88ffba75042e2b10
 AUX svnserve.xinetd 332 BLAKE2B 95af871ddd83c405cd4072a8bb6293376383d5437562aa604a5eff8e0f34c8763056bf1ea92b11be4f4d4ac5af3fa191b24d4c2040c3a41458103015e24bf09e SHA512 80b486507d03f430e189ef65901ed185f487651400bada5709f544954eb6175d20a11cf98893f80ec963e434c5db5642bf9d1603d698ad8bbf96b88fa45ddbae
 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
 DIST subversion-1.14.0.tar.bz2 8497531 BLAKE2B 261f1401a96b181ccbdea9ab6e1dde301aa2c67296a0dc458a1d7e544530411b656d0d5335f985c9222c2d44fc8f962b1a960b81e4ff4883d373cb4405af2461 SHA512 af6b706fdc91f7ab292fce9d9de582da306fd11e92767dc852687e71a6a8b65bb867fa70d5afd7f76a46005acb1b3c2d3193e690def48cd26875b3a7851cd13b
-EBUILD subversion-1.12.2.ebuild 15517 BLAKE2B 6a8573f750eb273d22f67a7857652305284e8b8fc7a32fda5a00f9f826854635ef7c708cae0196a10c41804881ec5f3fa68f35415eaf3073efe4a6dae79fd965 SHA512 051325815cbea5de0ecc001c5c7d30156dce016082a92ec038f0298de24d8fde4b07b506d82567c3ae932b98466fed13da1cf790c98956f73c37a277ab1ca5fe
 EBUILD subversion-1.13.0-r1.ebuild 15766 BLAKE2B 10c9688414713da03840f7ccee255156f50a1faad64c0513fbc39820bf21d42e1ff6c87cb8bd40270595cf795c0de0d41d3cdabd95b5eb40711826eb2dc2ec7a SHA512 e467b90ff4e7636cafcce5f60387c1a1446937b7fc6abf464bcfa2252c41e7117d9f0717f29c6d89c60c2185e9050c642667827fcb6a8805e13cda0bab02ea24
 EBUILD subversion-1.14.0.ebuild 15293 BLAKE2B 7d6d2377b26f6a17894f07335b1ef56f97f46595c4bfe1d4291ccfdd511d60428c8ba2a66c2b56a8da23e362bb34394756c63064df2087a5208a72caa5118095 SHA512 ae1781c78c6d17117f2c93af19f7308ae34d4e862e5f27d49c9aa3667a63d0ebc32f6ee3a0cf9ac05210555300e964b1b895335b835b682a99de678f5f733e68
 MISC metadata.xml 770 BLAKE2B 3fc171f38c8332b6ebf65452866062a0c1e9e0019f5b84e5a61da936396641fac71a96d2c06c3179fb9545df163a8888c8460034284089076e3c1f7c281ef0bb SHA512 0ad45cbda96545bf72ff456f1b7c4d295580bead15e37c8861a571769731623ecca00f4a18b565cdd3c370d3e2ded68854bdf0fca3229434584c8ab340be90ff
diff --git a/dev-vcs/subversion/subversion-1.12.2.ebuild b/dev-vcs/subversion/subversion-1.12.2.ebuild
deleted file mode 100644
index 91f542b990f9..000000000000
--- a/dev-vcs/subversion/subversion-1.12.2.ebuild
+++ /dev/null
@@ -1,532 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby26 ruby25 ruby24"
-DISTUTILS_OPTIONAL=1
-WANT_AUTOMAKE="none"
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 flag-o-matic java-pkg-opt-2 libtool ltprune multilib perl-module ruby-single toolchain-funcs xdg-utils
-
-MY_P="${P/_/-}"
-DESCRIPTION="Advanced version control system"
-HOMEPAGE="https://subversion.apache.org/"
-SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}-1.10.0_rc1-patches-1.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Subversion GPL-2"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	app-arch/lz4
-	>=dev-db/sqlite-3.7.12
-	>=dev-libs/apr-1.3:1
-	>=dev-libs/apr-util-1.3:1
-	dev-libs/expat
-	dev-libs/libutf8proc:=
-	sys-apps/file
-	sys-libs/zlib
-	berkdb? ( >=sys-libs/db-4.0.14:= )
-	ctypes-python? ( ${PYTHON_DEPS} )
-	gnome-keyring? (
-		dev-libs/glib:2
-		gnome-base/libgnome-keyring
-		sys-apps/dbus
-	)
-	http? ( >=net-libs/serf-1.3.4 )
-	kwallet? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kwallet:5
-		sys-apps/dbus
-	)
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( ${RUBY_DEPS} )
-	sasl? ( dev-libs/cyrus-sasl )"
-RDEPEND="${COMMON_DEPEND}
-	apache2? ( www-servers/apache[apache2_modules_dav] )
-	java? ( >=virtual/jre-1.8 )
-	nls? ( virtual/libintl )
-	perl? ( dev-perl/URI )"
-# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
-DEPEND="${COMMON_DEPEND}
-	!!<sys-apps/sandbox-1.6
-	ctypes-python? ( dev-python/ctypesgen )
-	doc? ( app-doc/doxygen )
-	gnome-keyring? ( virtual/pkgconfig )
-	http? ( virtual/pkgconfig )
-	java? ( >=virtual/jdk-1.8 )
-	kwallet? (
-		kde-frameworks/kdelibs4support:5
-		virtual/pkgconfig
-	)
-	nls? ( sys-devel/gettext )
-	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-	ruby? ( dev-lang/swig )
-	test? ( ${PYTHON_DEPS} )"
-
-REQUIRED_USE="
-	ctypes-python? ( ${PYTHON_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? (
-		${PYTHON_REQUIRED_USE}
-		!dso
-	)"
-
-want_apache
-
-pkg_setup() {
-	if use berkdb ; then
-		local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \
-			| grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \
-			| sed 's:.*b::')"
-		einfo
-		if [[ -z "${SVN_BDB_VERSION}" ]] ; then
-			if [[ -n "${apu_bdb_version}" ]] ; then
-				SVN_BDB_VERSION="${apu_bdb_version}"
-				einfo "Matching db version to apr-util"
-			else
-				SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")"
-				einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB."
-			fi
-		fi
-		einfo "Using: Berkeley DB ${SVN_BDB_VERSION}"
-		einfo
-
-		if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then
-			eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying"
-			eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}."
-			eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"."
-			eerror "Aborting to avoid possible run-time crashes."
-			die "Berkeley DB version mismatch"
-		fi
-	fi
-
-	depend.apache_pkg_setup
-
-	java-pkg-opt-2_pkg_setup
-
-	if ! use http ; then
-		ewarn "WebDAV support is disabled. You need WebDAV to"
-		ewarn "access repositories through the HTTP protocol."
-		ewarn "Consider enabling \"http\" USE flag"
-		echo -ne "\a"
-	fi
-
-	# https://issues.apache.org/jira/browse/SVN-4813#comment-16813739
-	append-cppflags -P
-
-	if use debug ; then
-		append-cppflags -DSVN_DEBUG -DAP_DEBUG
-	fi
-
-	# http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E
-	[[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__
-
-	# Allow for custom repository locations.
-	SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
-
-	if use ruby ; then
-		local rbslot
-		RB_VER=""
-		for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do
-			if has_version dev-lang/ruby:${rbslot} ;  then
-				RB_VER="${rbslot/.}"
-				break
-			fi
-		done
-		[[ -z "${RB_VER}" ]] && die "No useable ruby version found"
-	fi
-}
-
-src_prepare() {
-	eapply "${WORKDIR}/patches"
-	eapply_user
-
-	chmod +x build/transform_libtool_scripts.sh || die
-
-	sed -i \
-		-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
-		-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
-
-	# this bites us in particular on Solaris
-	sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \
-		die "/bin/sh is not POSIX shell!"
-
-	eautoconf
-	elibtoolize
-
-	sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
-		-i build-outputs.mk || die "sed failed"
-
-	if use python ; then
-		# XXX: make python_copy_sources accept path
-		S=${S}/subversion/bindings/swig/python python_copy_sources
-		rm -r "${S}"/subversion/bindings/swig/python || die
-	fi
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	local myconf=(
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		$(use_with apache2 apache-libexecdir)
-		$(use_with apache2 apxs "${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_enable dso runtime-module-search)
-		$(use_with gnome-keyring)
-		$(use_enable java javahl)
-		$(use_with java jdk "${JAVA_HOME}")
-		$(use_with kwallet)
-		$(use_enable nls)
-		$(use_with sasl)
-		$(use_with http serf)
-		--with-apr="${EPREFIX}/usr/bin/apr-1-config"
-		--with-apr-util="${EPREFIX}/usr/bin/apu-1-config"
-		--disable-experimental-libtool
-		--without-jikes
-		--disable-mod-activation
-		--disable-static
-		--enable-svnxx
-	)
-
-	if use python || use perl || use ruby; then
-		myconf+=( --with-swig )
-	else
-		myconf+=( --without-swig )
-	fi
-
-	if use java ; then
-		myconf+=( --without-junit )
-	fi
-
-	case ${CHOST} in
-		*-aix*)
-			# avoid recording immediate path to sharedlibs into executables
-			append-ldflags -Wl,-bnoipath
-		;;
-		*-cygwin*)
-			# no LD_PRELOAD support, no undefined symbols
-			myconf+=( --disable-local-library-preloading LT_LDFLAGS=-no-undefined )
-			;;
-		*-interix*)
-			# loader crashes on the LD_PRELOADs...
-			myconf+=( --disable-local-library-preloading )
-		;;
-		*-solaris*)
-			# need -lintl to link
-			use nls && append-libs intl
-			# this breaks installation, on x64 echo replacement is 32-bits
-			myconf+=( --disable-local-library-preloading )
-		;;
-		*-mint*)
-			myconf+=( --enable-all-static --disable-local-library-preloading )
-		;;
-		*)
-			# inject LD_PRELOAD entries for easy in-tree development
-			myconf+=( --enable-local-library-preloading )
-		;;
-	esac
-
-	#version 1.7.7 again tries to link against the older installed version and fails, when trying to
-	#compile for x86 on amd64, so workaround this issue again
-	#check newer versions, if this is still/again needed
-	#myconf+=( --disable-disallowing-of-undefined-references )
-
-	# for build-time scripts
-	if use ctypes-python || use python || use test; then
-		python_setup
-	fi
-
-	if use python && [[ ${CHOST} == *-darwin* ]] ; then
-		export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
-		export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
-		export ac_cv_python_compile="$(tc-getCC)"
-	fi
-
-	# allow overriding Python include directory
-	ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby${RB_VER}" "none") \
-	ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc${RB_VER}" "none") \
-	ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake local-all
-
-	if use ctypes-python ; then
-		# pre-generate .py files
-		use ctypes-python && emake ctypes-python
-
-		pushd subversion/bindings/ctypes-python >/dev/null || die
-		distutils-r1_src_compile
-		popd >/dev/null || die
-	fi
-
-	if use python ; then
-		swig_py_compile() {
-			local p=subversion/bindings/swig/python
-			rm -f ${p} || die
-			ln -s "${BUILD_DIR}" ${p} || die
-
-			python_export PYTHON_INCLUDEDIR
-			emake swig-py \
-				swig_pydir="$(python_get_sitedir)/libsvn" \
-				swig_pydir_extra="$(python_get_sitedir)/svn"
-		}
-
-		# this will give us proper BUILD_DIR for symlinking
-		BUILD_DIR=python \
-		python_foreach_impl swig_py_compile
-	fi
-
-	if use perl ; then
-		emake swig-pl
-	fi
-
-	if use ruby ; then
-		emake swig-rb
-	fi
-
-	if use java ; then
-		emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl
-	fi
-
-	if use extras ; then
-		emake tools
-	fi
-
-	if use doc ; then
-		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
-
-		if use java; then
-			emake doc-javahl
-		fi
-	fi
-}
-
-src_test() {
-	if has_version ~${CATEGORY}/${P} ; then
-		default
-
-		if use ctypes-python ; then
-			python_test() {
-				"${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \
-					|| die "ctypes-python tests fail with ${EPYTHON}"
-			}
-
-			distutils-r1_src_test
-		fi
-
-		if use python ; then
-			swig_py_test() {
-				pushd "${BUILD_DIR}" >/dev/null || die
-				"${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}"
-				popd >/dev/null || die
-			}
-
-			BUILD_DIR=subversion/bindings/swig/python \
-			python_foreach_impl swig_py_test
-		fi
-	else
-		ewarn "The test suite shows errors when there is an older version of"
-		ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*"
-		ewarn "before running the test suite."
-		ewarn "Test suite skipped."
-	fi
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" local-install
-
-	if use ctypes-python ; then
-		pushd subversion/bindings/ctypes-python >/dev/null || die
-		distutils-r1_src_install
-		popd >/dev/null || die
-	fi
-
-	if use python ; then
-		swig_py_install() {
-			local p=subversion/bindings/swig/python
-			rm -f ${p} || die
-			ln -s "${BUILD_DIR}" ${p} || die
-
-			emake \
-				DESTDIR="${D}" \
-				swig_pydir="$(python_get_sitedir)/libsvn" \
-				swig_pydir_extra="$(python_get_sitedir)/svn" \
-				install-swig-py
-		}
-
-		BUILD_DIR=python \
-		python_foreach_impl swig_py_install
-	fi
-
-	if use perl ; then
-		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
-		perl_delete_localpod
-		find "${ED}" \( -name .packlist -o -name "*.bs" \) -delete || die
-	fi
-
-	if use ruby ; then
-		emake DESTDIR="${D}" install-swig-rb
-	fi
-
-	if use java ; then
-		emake DESTDIR="${D}" install-javahl
-		java-pkg_regso "${ED%/}"/usr/$(get_libdir)/libsvnjavahl*$(get_libname)
-		java-pkg_dojar "${ED%/}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
-		rm -fr "${ED%/}"/usr/$(get_libdir)/svn-javahl/*.jar
-	fi
-
-	# Install Apache module configuration.
-	if use apache2 ; then
-		keepdir "${APACHE_MODULES_CONFDIR}"
-		insinto "${APACHE_MODULES_CONFDIR}"
-		doins "${FILESDIR}/47_mod_dav_svn.conf"
-	fi
-
-	# Install Bash Completion, bug 43179.
-	newbashcomp tools/client-side/bash_completion svn
-	bashcomp_alias svn svn{admin,dumpfilter,look,sync,version}
-	rm -f tools/client-side/bash_completion
-
-	# Install hot backup script, bug 54304.
-	newbin tools/backup/hot-backup.py svn-hot-backup
-	rm -fr tools/backup
-
-	# Install svnserve init-script and xinet.d snippet, bug 43245.
-	newinitd "${FILESDIR}"/svnserve.initd3 svnserve
-	newconfd "${FILESDIR}"/svnserve.confd svnserve
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/svnserve.xinetd svnserve
-
-	#adjust default user and group with disabled apache2 USE flag, bug 381385
-	if ! use apache2 ; then
-		sed -e "s\USER:-apache\USER:-svn\g" \
-			-e "s\GROUP:-apache\GROUP:-svnusers\g" \
-			-i "${ED%/}"/etc/init.d/svnserve || die
-		sed -e "0,/apache/s//svn/" \
-			-e "s:apache:svnusers:" \
-			-i "${ED%/}"/etc/xinetd.d/svnserve || die
-	fi
-
-	# Install documentation.
-	dodoc CHANGES COMMITTERS README
-	dodoc tools/xslt/svnindex.{css,xsl}
-	rm -fr tools/xslt
-
-	# Install extra files.
-	if use extras ; then
-		cat <<- EOF > 80subversion-extras
-			PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
-			ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
-		EOF
-		doenvd 80subversion-extras
-
-		emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools
-
-		find tools \( -name "*.bat" -o -name "*.in" -o -name ".libs" \) -print0 | xargs -0 rm -fr
-		rm -fr tools/client-side/svnmucc
-		rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}*
-		rm -fr tools/{buildbot,dev,diff,po}
-
-		insinto /usr/share/${PN}
-		find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || die
-		doins -r tools
-	fi
-
-	if use doc ; then
-		docinto html
-		dodoc -r doc/doxygen/html/*
-
-		if use java ; then
-			java-pkg_dojavadoc doc/javadoc
-		fi
-	fi
-
-	prune_libtool_files --all
-
-	cd "${ED%/}"/usr/share/locale
-	for i in * ; do
-		if [[ ${i} != *${LINGUAS}* ]] ; then
-			rm -r ${i} || die
-		fi
-	done
-}
-
-pkg_preinst() {
-	# Compare versions of Berkeley DB, bug 122877.
-	if use berkdb && [[ -f "${EROOT}/usr/bin/svn" ]] ; then
-		OLD_BDB_VERSION="$(scanelf -nq "${EROOT}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
-		NEW_BDB_VERSION="$(scanelf -nq "${ED%/}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
-		if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then
-			CHANGED_BDB_VERSION="1"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then
-		ewarn "You upgraded from an older version of Berkeley DB and may experience"
-		ewarn "problems with your repository. Run the following commands as root to fix it:"
-		ewarn "    db4_recover -h ${SVN_REPOS_LOC}/repos"
-		ewarn "    chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
-	fi
-
-	ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches."
-}
-
-pkg_postrm() {
-	:
-}
-
-pkg_config() {
-	# Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
-	# already has EPREFIX in it
-	einfo "Initializing the database in ${SVN_REPOS_LOC}..."
-	if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then
-		echo "A Subversion repository already exists and I will not overwrite it."
-		echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
-	else
-		mkdir -p "${SVN_REPOS_LOC}/conf"
-
-		einfo "Populating repository directory..."
-		# Create initial repository.
-		"${EROOT}/usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos"
-
-		einfo "Setting repository permissions..."
-		SVNSERVE_USER="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
-		SVNSERVE_GROUP="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")"
-		if use apache2 ; then
-			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
-			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
-		else
-			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
-			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers"
-		fi
-		chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf"
-		chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos"
-		echo "Please create \"${SVNSERVE_GROUP}\" group if it does not exist yet."
-		echo "Afterwards please create \"${SVNSERVE_USER}\" user with homedir \"${SVN_REPOS_LOC}\""
-		echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does not exist yet."
-		echo "Finally, execute \"chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\""
-		echo "to finish the configuration."
-	fi
-}
diff --git a/dev-vcs/svn2git/Manifest b/dev-vcs/svn2git/Manifest
index 05ab8e9662b5..d98540db7d38 100644
--- a/dev-vcs/svn2git/Manifest
+++ b/dev-vcs/svn2git/Manifest
@@ -1,16 +1,6 @@
-AUX svn2git-1.0.10-version.patch 900 BLAKE2B 748f66cf3fcb3937365b5d2b01d2bd1bd7d91932b2057be81063b55ee93d94c62806e3e9abd3e2392358b0527c7e29f59caa849f3928ebd17352c92296ba31fb SHA512 51d69b34c5d2a481b04d3ef43368815a406fd709aeaa358e60e41c75b776895e79a11b402d87cb4d0c4b0b70776dd31f34809fbece9b069bc834510872af4b03
-AUX svn2git-1.0.13-src-pro.patch 744 BLAKE2B ee9250e1bcfb620e2b768ca769ba42676f25218a45a9fa7305d1a2c39f2a77a1442525f087f6f30a409fbf87f61ee3ed53a23e80e82b85219e9b04b4d3ee20cd SHA512 0b046d0c6e77ce284712a93d9d2ae590100f5a3d49c37bd8119ba50a06e2988cb70ad475b6fdec98648e0cabeb5e688e3afe80c5472151b1ce02e18eb3d1a135
-AUX svn2git-1.0.2.1-include-path.patch 641 BLAKE2B 4df6dbbb8935377355cf9fa35c005e349f5ce5b7d7decb7fb5038db5b70bff25aa1ff91b345c1f3b3d9a3c4a7c566417a49b4385a7f7e6660dcd54f528990210 SHA512 2be52266425ba4b287eb5adde4f2a643759a65b5ece00a7ef1982256dc0f460c069afd4b7d4aee63f2e4a99ebcaabc6f24b5688dd939cb172f333c2d4755a36f
-DIST svn2git-1.0.11.tar.gz 30986 BLAKE2B 76300c05e070364b4bec8340534dd494fb93bc6b3965c938918821c3321eb59d2e691163b418e2ab7ece131776d9fd550a05345fb56d449d68c530c3f90d3f95 SHA512 8fa082d8da2dfc9687ebb4269b3861a053f83afb71a5c0666155bdb179d7799de3f37f3d58cabe02069bda8e8fd306bb729ba04709c0654ba8a5c24952142de9
-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
 DIST svn2git-1.0.18.tar.gz 53514 BLAKE2B 1e40318e484df4eee9ab3586b73cc6a7d9599f8f04e31531e2591dc0bb6f84190d35fb6b9128dd512bab59648e838f479fd81894f97cfce7af4365e0932b26e4 SHA512 ff851a5c3a225c8b6efa9fbf90bd72439bc1303f8138384c2bac779d6cfe52c77125ec3b80b320205e08bbee9910c5203a95c112909c3336750938d2271c2517
-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-1.0.18.ebuild 1034 BLAKE2B bf4bc2dd9ccd89a21f5161275c5d4b6536c3824cb0f4f8218b0603ee24f01d2d0d87f63aac37bd47b6f673946d688aff9e6888aa6f51c333db683567cab49b03 SHA512 f0993c376ae1c3949cc00a51d09112eca009230d8a671dd37cc30b385a474f19d3ac135a3f3b22f1e789d5498f6ebbaafa19d169a3df32e295f67c31cdf2f230
diff --git a/dev-vcs/svn2git/files/svn2git-1.0.10-version.patch b/dev-vcs/svn2git/files/svn2git-1.0.10-version.patch
deleted file mode 100644
index 894cf2c2a10e..000000000000
--- a/dev-vcs/svn2git/files/svn2git-1.0.10-version.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From d8b1c8c774a61666e7c62bf5beb8f0f1b4a3e01a Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Tue, 21 May 2013 23:11:25 +0200
-Subject: [PATCH] Stop using Git SHA1 version string
-
-diff --git a/src/src.pro b/src/src.pro
-index da6d40d..2626a6f 100644
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -6,10 +6,7 @@ SVN_INCLUDE = /usr/include/subversion-1 /usr/local/include/subversion-1
- APR_INCLUDE = /usr/include/apr-1.0 /usr/include/apr-1 /usr/local/include/apr-1
- exists(local-config.pri):include(local-config.pri)
- 
--VERSION = $$system(git --no-pager show --pretty=oneline --no-notes | head -1 | cut -b-40)
--    !isEmpty(VERSION){
--      VERSION = $${VERSION}
--    }
-+VERSION = $$(SVN_ALL_FAST_EXPORT_VERSION)
- 
- VERSTR = '\\"$${VERSION}\\"'  # place quotes around the version string
- DEFINES += VER=\"$${VERSTR}\" # create a VER macro containing the version string
--- 
-1.8.2.1
diff --git a/dev-vcs/svn2git/files/svn2git-1.0.13-src-pro.patch b/dev-vcs/svn2git/files/svn2git-1.0.13-src-pro.patch
deleted file mode 100644
index 74ee4306b3c1..000000000000
--- a/dev-vcs/svn2git/files/svn2git-1.0.13-src-pro.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 59a038796e6bb55b11b6d82f7d5aae42399da38a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Kautler?= <Bjoern@Kautler.net>
-Date: Fri, 12 Apr 2019 01:39:51 +0200
-Subject: [PATCH] Fix evaluation of emptyness of SVN_LIBDIR that sometimes
- always gives false, sometime always true, but never what is intended
-
----
- src/src.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/src.pro b/src/src.pro
-index 426d304..cfbd865 100644
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -28,7 +28,7 @@ DEPENDPATH += .
- QT = core
- 
- INCLUDEPATH += . $$SVN_INCLUDE $$APR_INCLUDE
--!isEmpty($$SVN_LIBDIR): LIBS += -L$$SVN_LIBDIR
-+!isEmpty(SVN_LIBDIR): LIBS += -L$$SVN_LIBDIR
- LIBS += -lsvn_fs-1 -lsvn_repos-1 -lapr-1 -lsvn_subr-1
- 
- # Input
diff --git a/dev-vcs/svn2git/files/svn2git-1.0.2.1-include-path.patch b/dev-vcs/svn2git/files/svn2git-1.0.2.1-include-path.patch
deleted file mode 100644
index e5c898ba9738..000000000000
--- a/dev-vcs/svn2git/files/svn2git-1.0.2.1-include-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/src.pro	2011-01-11 09:02:15.696463807 +0100
-+++ b/src/src.pro	2011-01-11 09:03:59.793959849 +0100
-@@ -3,8 +3,8 @@
- # Automatically generated by qmake (2.01a) dim. dc. 23 13:49:28 2007
- ######################################################################
- 
--SVN_INCLUDE = /usr/include/subversion-1 /usr/local/include/subversion-1
--APR_INCLUDE = /usr/include/apr-1.0 /usr/include/apr-1 /usr/local/include/apr-1
-+SVN_INCLUDE = /usr/include/subversion-1
-+APR_INCLUDE = /usr/include/apr-1
- exists(local-config.pri):include(local-config.pri)
- 
- VERSION = $$system(git --no-pager show --pretty=oneline --no-notes | head -1 | cut -b-40)
diff --git a/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild b/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild
deleted file mode 100644
index 5df2948ca14b..000000000000
--- a/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 )
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch )
-
-src_prepare() {
-	# Note: patching order matters
-	default
-
-	if [[ "${PV}" != "9999" ]]; then
-		eapply "${FILESDIR}"/${PN}-1.0.10-version.patch
-		export SVN_ALL_FAST_EXPORT_VERSION=${PVR}  # for src_compile
-	fi
-}
-
-src_configure() {
-	eqmake5 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/svn2git/svn2git-1.0.12.ebuild b/dev-vcs/svn2git/svn2git-1.0.12.ebuild
deleted file mode 100644
index f9d80383124c..000000000000
--- a/dev-vcs/svn2git/svn2git-1.0.12.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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/svn2git/svn2git-1.0.13-r1.ebuild b/dev-vcs/svn2git/svn2git-1.0.13-r1.ebuild
deleted file mode 100644
index 7ff0f668cf45..000000000000
--- a/dev-vcs/svn2git/svn2git-1.0.13-r1.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 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 )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-src-pro.patch
-)
-
-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/svn2git/svn2git-1.0.13.ebuild b/dev-vcs/svn2git/svn2git-1.0.13.ebuild
deleted file mode 100644
index f9d80383124c..000000000000
--- a/dev-vcs/svn2git/svn2git-1.0.13.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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/eclass/Manifest.gz b/eclass/Manifest.gz
index ddbdf39fb9be..b511174dc4b5 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/dune.eclass b/eclass/dune.eclass
new file mode 100644
index 000000000000..9ab6ec204c21
--- /dev/null
+++ b/eclass/dune.eclass
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: dune.eclass
+# @MAINTAINER:
+# rkitover@gmail.com
+# @AUTHOR:
+# Rafael Kitover <rkitover@gmail.com>
+# @SUPPORTED_EAPIS: 5 6 7
+# @BLURB: Provides functions for installing dune packages.
+# @DESCRIPTION:
+# Provides dependencies on dune and ocaml and default src_compile, src_test and
+# src_install for dune-based packages.
+
+# @ECLASS-VARIABLE: DUNE_PKG_NAME
+# @DESCRIPTION:
+# Sets the actual dune package name, if different from gentoo package name.
+# Set before inheriting the eclass.
+
+case ${EAPI:-0} in
+	5|6|7) ;;
+	*) die "${ECLASS}: EAPI ${EAPI} not supported" ;;
+esac
+
+EXPORT_FUNCTIONS src_compile src_test src_install
+
+RDEPEND=">=dev-lang/ocaml-4:=[ocamlopt?]"
+DEPEND="${RDEPEND}
+	dev-ml/dune"
+
+dune_src_compile() {
+	dune build @install || die
+}
+
+dune_src_test() {
+	dune runtest || die
+}
+
+# @FUNCTION: dune-install
+# @USAGE: <list of packages>
+# @DESCRIPTION:
+# Installs the dune packages given as arguments. For each "${pkg}" element in
+# that list, "${pkg}.install" must be readable from "${PWD}/_build/default"
+dune-install() {
+	local pkg
+	for pkg ; do
+		dune install \
+			--prefix="${ED%/}/usr" \
+			--libdir="${D%/}$(ocamlc -where)" \
+			"${pkg}" || die
+	done
+}
+
+dune_src_install() {
+	local pkg="${1:-${DUNE_PKG_NAME:-${PN}}}"
+
+	dune-install "${pkg}"
+
+	# Move docs to the appropriate place.
+	if [ -d "${ED%/}/usr/doc/${pkg}" ] ; then
+		mkdir -p "${ED%/}/usr/share/doc/${PF}/" || die
+		mv "${ED%/}/usr/doc/${pkg}/"* "${ED%/}/usr/share/doc/${PF}/" || die
+		rm -rf "${ED%/}/usr/doc" || die
+	fi
+}
diff --git a/eclass/gnome-python-common-r1.eclass b/eclass/gnome-python-common-r1.eclass
deleted file mode 100644
index f4a52bde8148..000000000000
--- a/eclass/gnome-python-common-r1.eclass
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# @DEAD
-# @ECLASS: gnome-python-common-r1.eclass
-# @MAINTAINER:
-# GNOME team <gnome@gentoo.org>
-# @AUTHOR:
-# Author: Michał Górny <mgorny@gentoo.org>
-# Based on the work of: Arun raghaven <ford_prefect@gentoo.org>
-# which in turn was based on the work of Jim Ramsay <lack@gentoo.org>
-# @SUPPORTED_EAPIS: 5
-# @BLURB: Common functionality for building gnome-python* bindings
-# @DESCRIPTION:
-# This eclass provides python-r1 support for the GNOME2 library Python
-# bindings.
-
-: ${GNOME_ORG_MODULE:=gnome-python}
-: ${GNOME_TARBALL_SUFFIX:=bz2}
-: ${GNOME2_LA_PUNT:=yes}
-: ${GCONF_DEBUG:=no}
-
-# @ECLASS-VARIABLE: G_PY_BINDINGS
-# @DESCRIPTION:
-# The actual '--enable-<binding>' name. If multiple bindings are to
-# be enabled, must be an array.
-: ${G_PY_BINDINGS:=${PN%-python}}
-
-# @ECLASS-VARIABLE: EXAMPLES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# The set of example files to be installed if the 'examples' USE flag
-# is set.
-
-case "${EAPI:-0}" in
-	0|1|2|3|4)
-		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
-		;;
-	5)
-		;;
-	*)
-		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
-		;;
-esac
-
-inherit eutils gnome2 python-r1
-
-EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
-
-HOMEPAGE="http://pygtk.org/"
-
-RESTRICT="${RESTRICT} test"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-if [[ ${GNOME_ORG_MODULE} != "gnome-python" ]]; then
-	DOCS="${DOCS} MAINTAINERS"
-fi
-
-RDEPEND="~dev-python/${GNOME_ORG_MODULE}-base-${PV}[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-gnome-python-common-r1_src_prepare() {
-	gnome2_src_prepare
-
-	# The .pc file is installed by respective gnome-python*-base package
-	sed -i '/^pkgconfig_DATA/d' Makefile.in || die "sed failed"
-	sed -i '/^pkgconfigdir/d' Makefile.in || die "sed failed"
-#
-#	python_copy_sources
-}
-
-gnome-python-common-r1_src_configure() {
-	local myconf=(
-		--disable-allbindings
-		"${G_PY_BINDINGS[@]/#/--enable-}"
-	)
-
-	ECONF_SOURCE=${S} \
-	python_foreach_impl \
-		gnome2_src_configure "${myconf[@]}" "${@}"
-}
-
-gnome-python-common-r1_src_compile() {
-	python_foreach_impl default
-}
-
-gnome-python-common-r1_src_test() {
-	python_foreach_impl default
-}
-
-# Do a regular gnome2 src_install and then install examples if required.
-# Set the variable EXAMPLES to provide the set of examples to be installed.
-# (to install a directory recursively, specify it with a trailing '/' - for
-# example, foo/bar/)
-gnome-python-common-r1_src_install() {
-	python_foreach_impl gnome2_src_install
-
-	if in_iuse examples && use examples; then
-		docinto examples
-		dodoc -r "${EXAMPLES[@]}"
-	fi
-}
diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass
index 7239737810f1..9f7a8e3296f0 100644
--- a/eclass/kernel-build.eclass
+++ b/eclass/kernel-build.eclass
@@ -36,7 +36,9 @@ inherit savedconfig toolchain-funcs kernel-install
 
 BDEPEND="
 	sys-devel/bc
-	virtual/libelf"
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
 
 # @FUNCTION: kernel-build_src_configure
 # @DESCRIPTION:
@@ -77,6 +79,11 @@ kernel-build_src_configure() {
 	restore_config .config
 	[[ -f .config ]] || die "Ebuild error: please copy default config into .config"
 
+	if [[ -z "${KV_LOCALVERSION}" ]]; then
+		KV_LOCALVERSION=$(sed -n -e 's#^CONFIG_LOCALVERSION="\(.*\)"$#\1#p' \
+			.config)
+	fi
+
 	mkdir -p "${WORKDIR}"/modprep || die
 	mv .config "${WORKDIR}"/modprep/ || die
 	emake O="${WORKDIR}"/modprep "${MAKEARGS[@]}" olddefconfig
@@ -108,9 +115,10 @@ kernel-build_src_test() {
 	emake O="${WORKDIR}"/build "${MAKEARGS[@]}" \
 		INSTALL_MOD_PATH="${T}" INSTALL_PATH="${ED}/boot"  "${targets[@]}"
 
-	kernel-install_test "${PV}" \
+	local ver="${PV}${KV_LOCALVERSION}"
+	kernel-install_test "${ver}" \
 		"${WORKDIR}/build/$(kernel-install_get_image_path)" \
-		"${T}/lib/modules/${PV}"
+		"${T}/lib/modules/${ver}"
 }
 
 # @FUNCTION: kernel-build_src_install
@@ -134,16 +142,17 @@ kernel-build_src_install() {
 	# note: we're using mv rather than doins to save space and time
 	# install main and arch-specific headers first, and scripts
 	local kern_arch=$(tc-arch-kernel)
-	dodir "/usr/src/linux-${PV}/arch/${kern_arch}"
-	mv include scripts "${ED}/usr/src/linux-${PV}/" || die
+	local ver="${PV}${KV_LOCALVERSION}"
+	dodir "/usr/src/linux-${ver}/arch/${kern_arch}"
+	mv include scripts "${ED}/usr/src/linux-${ver}/" || die
 	mv "arch/${kern_arch}/include" \
-		"${ED}/usr/src/linux-${PV}/arch/${kern_arch}/" || die
+		"${ED}/usr/src/linux-${ver}/arch/${kern_arch}/" || die
 
 	# remove everything but Makefile* and Kconfig*
 	find -type f '!' '(' -name 'Makefile*' -o -name 'Kconfig*' ')' \
 		-delete || die
 	find -type l -delete || die
-	cp -p -R * "${ED}/usr/src/linux-${PV}/" || die
+	cp -p -R * "${ED}/usr/src/linux-${ver}/" || die
 
 	cd "${WORKDIR}" || die
 	# strip out-of-source build stuffs from modprep
@@ -154,20 +163,20 @@ kernel-build_src_install() {
 			'(' -name '.*' -a -not -name '.config' ')' \
 		')' -delete || die
 	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${PV}"/ || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${ver}"/ || die
 
 	# install the kernel and files needed for module builds
-	insinto "/usr/src/linux-${PV}"
+	insinto "/usr/src/linux-${ver}"
 	doins build/{System.map,Module.symvers}
 	local image_path=$(kernel-install_get_image_path)
-	cp -p "build/${image_path}" "${ED}/usr/src/linux-${PV}/${image_path}" || die
+	cp -p "build/${image_path}" "${ED}/usr/src/linux-${ver}/${image_path}" || die
 
 	# strip empty directories
 	find "${D}" -type d -empty -exec rmdir {} + || die
 
 	# fix source tree and build dir symlinks
-	dosym ../../../usr/src/linux-${PV} /lib/modules/${PV}/build
-	dosym ../../../usr/src/linux-${PV} /lib/modules/${PV}/source
+	dosym ../../../usr/src/linux-${ver} /lib/modules/${ver}/build
+	dosym ../../../usr/src/linux-${ver} /lib/modules/${ver}/source
 
 	save_config build/.config
 }
diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass
index efccd70608c0..ab886d28faf0 100644
--- a/eclass/kernel-install.eclass
+++ b/eclass/kernel-install.eclass
@@ -20,6 +20,13 @@
 # Additionally, the inherited mount-boot eclass exports pkg_pretend.
 # It also stubs out pkg_preinst and pkg_prerm defined by mount-boot.
 
+# @ECLASS-VARIABLE: KV_LOCALVERSION
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# A string containing the kernel LOCALVERSION, e.g. '-gentoo'.
+# Needs to be set only when installing binary kernels,
+# kernel-build.eclass obtains it from kernel config.
+
 if [[ ! ${_KERNEL_INSTALL_ECLASS} ]]; then
 
 case "${EAPI:-0}" in
@@ -260,6 +267,29 @@ kernel-install_test() {
 	EOF
 }
 
+# @FUNCTION: kernel-install_pkg_pretend
+# @DESCRIPTION:
+# Check for missing optional dependencies and output warnings.
+kernel-install_pkg_pretend() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	if ! has_version -d sys-kernel/linux-firmware; then
+		ewarn "sys-kernel/linux-firmware not found installed on your system."
+		ewarn "This package provides various firmware files that may be needed"
+		ewarn "for your hardware to work.  If in doubt, it is recommended"
+		ewarn "to pause or abort the build process and install it before"
+		ewarn "resuming."
+
+		if use initramfs; then
+			elog
+			elog "If you decide to install linux-firmware later, you can rebuild"
+			elog "the initramfs via issuing a command equivalent to:"
+			elog
+			elog "    emerge --config ${CATEGORY}/${PN}"
+		fi
+	fi
+}
+
 # @FUNCTION: kernel-install_src_test
 # @DESCRIPTION:
 # Boilerplate function to remind people to call the tests.
@@ -288,21 +318,22 @@ kernel-install_pkg_postinst() {
 	if [[ -z ${ROOT} ]]; then
 		mount-boot_pkg_preinst
 
+		local ver="${PV}${KV_LOCALVERSION}"
 		local image_path=$(kernel-install_get_image_path)
 		if use initramfs; then
 			# putting it alongside kernel image as 'initrd' makes
 			# kernel-install happier
 			kernel-install_build_initramfs \
-				"${EROOT}/usr/src/linux-${PV}/${image_path%/*}/initrd" \
-				"${PV}"
+				"${EROOT}/usr/src/linux-${ver}/${image_path%/*}/initrd" \
+				"${ver}"
 		fi
 
-		kernel-install_install_kernel "${PV}" \
-			"${EROOT}/usr/src/linux-${PV}/${image_path}" \
-			"${EROOT}/usr/src/linux-${PV}/System.map"
+		kernel-install_install_kernel "${ver}" \
+			"${EROOT}/usr/src/linux-${ver}/${image_path}" \
+			"${EROOT}/usr/src/linux-${ver}/System.map"
 	fi
 
-	kernel-install_update_symlink "${EROOT}/usr/src/linux" "${PV}"
+	kernel-install_update_symlink "${EROOT}/usr/src/linux" "${ver}"
 }
 
 # @FUNCTION: kernel-install_pkg_prerm
@@ -322,15 +353,40 @@ kernel-install_pkg_postrm() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	if [[ -z ${ROOT} ]] && use initramfs; then
+		local ver="${PV}${KV_LOCALVERSION}"
 		local image_path=$(kernel-install_get_image_path)
 		ebegin "Removing initramfs"
-		rm -f "${EROOT}/usr/src/linux-${PV}/${image_path%/*}/initrd" &&
-			find "${EROOT}/usr/src/linux-${PV}" -depth -type d -empty -delete
+		rm -f "${EROOT}/usr/src/linux-${ver}/${image_path%/*}/initrd" &&
+			find "${EROOT}/usr/src/linux-${ver}" -depth -type d -empty -delete
 		eend ${?}
 	fi
 }
 
+# @FUNCTION: kernel-install_pkg_config
+# @DESCRIPTION:
+# Rebuild the initramfs and reinstall the kernel.
+kernel-install_pkg_config() {
+	[[ -z ${ROOT} ]] || die "ROOT!=/ not supported currently"
+
+	mount-boot_pkg_preinst
+
+	local ver="${PV}${KV_LOCALVERSION}"
+	local image_path=$(kernel-install_get_image_path)
+	if use initramfs; then
+		# putting it alongside kernel image as 'initrd' makes
+		# kernel-install happier
+		kernel-install_build_initramfs \
+			"${EROOT}/usr/src/linux-${ver}/${image_path%/*}/initrd" \
+			"${ver}"
+	fi
+
+	kernel-install_install_kernel "${ver}" \
+		"${EROOT}/usr/src/linux-${ver}/${image_path}" \
+		"${EROOT}/usr/src/linux-${ver}/System.map"
+}
+
 _KERNEL_INSTALL_ECLASS=1
 fi
 
 EXPORT_FUNCTIONS src_test pkg_preinst pkg_postinst pkg_prerm pkg_postrm
+EXPORT_FUNCTIONS pkg_config pkg_pretend
diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
index 405ef5571e1c..11a890889e4f 100644
--- a/eclass/linux-info.eclass
+++ b/eclass/linux-info.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: linux-info.eclass
@@ -166,7 +166,7 @@ qeerror() { qout eerror "${@}" ; }
 # done by including the configfile, and printing the variable with Make.
 # It WILL break if your makefile has missing dependencies!
 getfilevar() {
-	local ERROR basefname basedname myARCH="${ARCH}" M="${S}"
+	local ERROR basefname basedname myARCH="${ARCH}"
 	ERROR=0
 
 	[ -z "${1}" ] && ERROR=1
@@ -184,11 +184,8 @@ getfilevar() {
 
 		# We use nonfatal because we want the caller to take care of things #373151
 		[[ ${EAPI:-0} == [0123] ]] && nonfatal() { "$@"; }
-		case ${EBUILD_PHASE_FUNC} in
-			pkg_info|pkg_nofetch|pkg_pretend) M="${T}" ;;
-		esac
 		echo -e "e:\\n\\t@echo \$(${1})\\ninclude ${basefname}" | \
-			nonfatal emake -C "${basedname}" M="${M}" ${BUILD_FIXES} -s -f - 2>/dev/null
+			nonfatal emake -C "${basedname}" M="${T}" ${BUILD_FIXES} -s -f - 2>/dev/null
 
 		ARCH=${myARCH}
 	fi
diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass
index b4b80df06d85..36c4f52650fd 100644
--- a/eclass/llvm.org.eclass
+++ b/eclass/llvm.org.eclass
@@ -63,6 +63,8 @@ fi
 [[ ${PV} == ${_LLVM_MASTER_MAJOR}.* && ${_LLVM_SOURCE_TYPE} == tar ]] &&
 	die "${ECLASS}: Release ebuild for master branch?!"
 
+inherit multiprocessing
+
 
 # == control variables ==
 
@@ -167,6 +169,11 @@ llvm.org_set_globals() {
 		fi
 	fi
 
+	# === useful defaults for cmake-based packages ===
+
+	# least intrusive of all
+	CMAKE_BUILD_TYPE=RelWithDebInfo
+
 	_LLVM_ORG_SET_GLOBALS_CALLED=1
 }
 
@@ -174,6 +181,9 @@ llvm.org_set_globals() {
 # == phase functions ==
 
 EXPORT_FUNCTIONS src_unpack
+if ver_test -ge 10.0.1_rc; then
+	EXPORT_FUNCTIONS src_prepare
+fi
 
 # @FUNCTION: llvm.org_src_unpack
 # @DESCRIPTION:
@@ -217,3 +227,41 @@ llvm.org_src_unpack() {
 		fi
 	fi
 }
+
+# @FUNCTION: llvm.org_src_prepare
+# @DESCRIPTION:
+# Call appropriate src_prepare (cmake or default) depending on inherited
+# eclasses.  Make sure that PATCHES and user patches are applied in top
+# ${WORKDIR}, so that patches straight from llvm-project repository
+# work correctly with -p1.
+llvm.org_src_prepare() {
+	if declare -f cmake_src_prepare >/dev/null; then
+		# cmake eclasses force ${S} for default_src_prepare
+		# but use ${CMAKE_USE_DIR} for everything else
+		CMAKE_USE_DIR=${S} \
+		S=${WORKDIR} \
+		cmake_src_prepare
+	else
+		pushd "${WORKDIR}" >/dev/null || die
+		default_src_prepare
+		popd >/dev/null || die
+	fi
+}
+
+
+# == helper functions ==
+
+# @ECLASS-VARIABLE: LIT_JOBS
+# @USER_VARIABLE
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Number of test jobs to run simultaneously.  If unset, defaults
+# to '-j' in MAKEOPTS.  If that is not found, default to nproc.
+
+# @FUNCTION: get_lit_flags
+# @DESCRIPTION:
+# Get the standard recommended lit flags for running tests, in CMake
+# list form (;-separated).
+get_lit_flags() {
+	echo "-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+}
diff --git a/eclass/netsurf.eclass b/eclass/netsurf.eclass
index d2da56ba39d7..3d371811752b 100644
--- a/eclass/netsurf.eclass
+++ b/eclass/netsurf.eclass
@@ -1,6 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# @DEAD
 # @ECLASS: netsurf.eclass
 # @MAINTAINER:
 # maintainer-needed@gentoo.org
diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass
index a78c118c89ed..21f317fd34a2 100644
--- a/eclass/qmail.eclass
+++ b/eclass/qmail.eclass
@@ -117,8 +117,7 @@ qmail_spp_src_unpack() {
 
 # @FUNCTION: qmail_src_postunpack
 # @DESCRIPTION:
-# Unpack common config files, apply custom patches if supplied and
-# set built configuration (CFLAGS, LDFLAGS, etc)
+# Unpack common config files, and set built configuration (CFLAGS, LDFLAGS, etc)
 qmail_src_postunpack() {
 	cd "${S}"
 
@@ -144,33 +143,27 @@ qmail_base_install() {
 	einfo "Setting up basic directory hierarchy"
 	diropts -o root -g qmail -m 755
 	keepdir "${QMAIL_HOME}"/{,bin,control}
-
-	einfo "Installing basic qmail software"
-	insinto "${QMAIL_HOME}"/bin
-
-	insopts -o root -g qmail -m 755
-	doins datemail elq forward maildir2mbox maildirmake \
-		maildirwatch mailsubj pinq predate qail \
-		qmail-{inject,qmqpc,showctl} sendmail
-
-	einfo "Adding env.d entry for qmail"
-	doenvd "${GENQMAIL_S}"/conf/99qmail
-
-	declare -F qmail_base_install_hook >/dev/null && \
-		qmail_base_install_hook
-}
-
-qmail_full_install() {
-	einfo "Setting up full directory hierarchy"
 	keepdir "${QMAIL_HOME}"/users
 	diropts -o alias -g qmail -m 755
 	keepdir "${QMAIL_HOME}"/alias
 
+	einfo "Adding env.d entry for qmail"
+	doenvd "${GENQMAIL_S}"/conf/99qmail
+
 	einfo "Installing all qmail software"
+	insinto "${QMAIL_HOME}"/bin
+
 	insopts -o root -g qmail -m 755
-	doins bouncesaying condredirect config-fast except preline qbiff \
-		qmail-{qmqpd,qmtpd,qread,qstat,smtpd,tcpok,tcpto} \
-		qreceipt qsmhook tcp-env
+	doins bouncesaying condredirect config-fast datemail except forward maildir2mbox \
+		maildirmake mailsubj predate preline qbiff \
+		qmail-{inject,qmqpc,qmqpd,qmtpd,qread,qstat,smtpd,tcpok,tcpto,showctl} \
+		qreceipt sendmail tcp-env
+
+	# obsolete tools, install if they are still present
+	for i in elq maildirwatch pinq qail qsmhook; do
+		[[ -x ${i} ]] && doins ${i}
+	done
+
 	use pop3 && doins qmail-pop3d
 
 	insopts -o root -g qmail -m 711
@@ -183,8 +176,8 @@ qmail_full_install() {
 	insopts -o qmailq -g qmail -m 4711
 	doins qmail-queue
 
-	declare -F qmail_full_install_hook >/dev/null && \
-		qmail_full_install_hook
+	declare -F qmail_base_install_hook >/dev/null && \
+		qmail_base_install_hook
 }
 
 qmail_config_install() {
@@ -207,8 +200,14 @@ qmail_man_install() {
 
 	into /usr
 	doman *.[1578]
-	dodoc BLURB* CHANGES FAQ INSTALL* PIC* README* REMOVE* SECURITY \
-		SENDMAIL* TEST* THANKS* THOUGHTS UPGRADE VERSION*
+	dodoc BLURB* INSTALL* PIC* README* REMOVE* \
+		SENDMAIL* TEST* THANKS* VERSION*
+	# notqmail converted the files to markdown
+	if [ -f CHANGES ]; then
+		dodoc CHANGES FAQ SECURITY THOUGHTS UPGRADE
+	else
+		dodoc CHANGES.md FAQ.md SECURITY.md THOUGHTS.md UPGRADE.md
+	fi
 
 	declare -F qmail_man_install_hook >/dev/null && \
 		qmail_man_install_hook
@@ -334,7 +333,6 @@ qmail_ssl_install() {
 qmail_src_install() {
 	export GROUP_ROOT="$(id -gn root)"
 	qmail_base_install
-	qmail_full_install
 	qmail_config_install
 	qmail_man_install
 	qmail_sendmail_install
diff --git a/eclass/texlive-common.eclass b/eclass/texlive-common.eclass
index 2072d3ad1605..67e06adf0909 100644
--- a/eclass/texlive-common.eclass
+++ b/eclass/texlive-common.eclass
@@ -39,7 +39,7 @@ texlive-common_handle_config_files() {
 	[[ -d ${ED}${TEXMF_PATH} ]] || return
 	cd "${ED}${TEXMF_PATH}" || die
 
-	while read -r -d '' i; do
+	while read -r f; do
 		if [[ ${f#*config} != ${f} || ${f#doc} != ${f} || ${f#source} != ${f} || ${f#tex} != ${f} ]] ; then
 			continue
 		fi
diff --git a/eclass/texlive-module.eclass b/eclass/texlive-module.eclass
index 75ef570cdd8c..15988fb4b54d 100644
--- a/eclass/texlive-module.eclass
+++ b/eclass/texlive-module.eclass
@@ -383,9 +383,11 @@ texlive-module_src_install() {
 		cp -pR tlpkg "${ED}/usr/share/" || die
 	fi
 
-	insinto /var/lib/texmf
 
-	[[ -d texmf-var ]] && doins -r texmf-var/.
+	if [[ -d texmf-var ]]; then
+		insinto /var/lib/texmf
+		doins -r texmf-var/.
+	fi
 
 	insinto /etc/texmf/updmap.d
 	[[ -f ${S}/${PN}.cfg ]] && doins "${S}/${PN}.cfg"
diff --git a/eclass/unpacker.eclass b/eclass/unpacker.eclass
index 865e2e1a1a58..63aedee4480e 100644
--- a/eclass/unpacker.eclass
+++ b/eclass/unpacker.eclass
@@ -17,6 +17,8 @@
 if [[ -z ${_UNPACKER_ECLASS} ]]; then
 _UNPACKER_ECLASS=1
 
+inherit toolchain-funcs
+
 # @ECLASS-VARIABLE: UNPACKER_BZ2
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -279,8 +281,7 @@ unpack_deb() {
 			done
 		} < "${deb}"
 	else
-		local AR=${AR-ar}
-		${AR} x "${deb}" || die
+		$(tc-getBUILD_AR) x "${deb}" || die
 	fi
 
 	unpacker ./data.tar*
diff --git a/games-action/0verkill/0verkill-0.16-r4.ebuild b/games-action/0verkill/0verkill-0.16-r4.ebuild
index 478fcc1bbda7..e1b5419bf8c6 100644
--- a/games-action/0verkill/0verkill-0.16-r4.ebuild
+++ b/games-action/0verkill/0verkill-0.16-r4.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
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools
 
 DESCRIPTION="A bloody 2D action deathmatch-like game in ASCII-ART"
-HOMEPAGE="http://freecode.com/projects/0verkill"
+HOMEPAGE="http://freshmeat.sourceforge.net/projects/0verkill"
 SRC_URI="http://artax.karlin.mff.cuni.cz/~brain/0verkill/release/${P}.tgz"
 
 LICENSE="GPL-2"
diff --git a/games-action/0verkill/Manifest b/games-action/0verkill/Manifest
index 642d42166de3..f5900b7dd5d5 100644
--- a/games-action/0verkill/Manifest
+++ b/games-action/0verkill/Manifest
@@ -6,5 +6,5 @@ AUX 0verkill-0.16-ovflfix.patch 805 BLAKE2B 206ca5dc584e09bdaab577e559bc45cd9f9b
 AUX 0verkill-0.16-segv.patch 1560 BLAKE2B c7ab421261b7168d53c77b7baf800cdc4b4e3bb1c5756078729a17f82c391ce9276ab846b65428eae5f0513facc995b90f182ce810c81dee70eb23ded69d0f19 SHA512 05ce966d80cf199a9602cb7143a2d7e8479ccb4b03da2275dc8a93a9065d387fe15426c48559279acb73eb3c371306a02706de899d5c6a97c123319426b3f6bc
 AUX 0verkill-0.16-underflow-check.patch 675 BLAKE2B 12ebde16b9eb4e825a34259103fec200d174e9b9b3ee3d9b689a47f53406abb7c36e8c5cc9d444cd53d84553cc18658bdc7346c02bced87ed4279189af33dd87 SHA512 3b5bff2c18c1862fadbb3d932be23f35559ed9eb3ffb979cf11c50bbac9fff8928b5ead8349ddfc78c84d07a5d1afe4431af56263568b3b82fd7cb015f442e42
 DIST 0verkill-0.16.tgz 276579 BLAKE2B 125a441bfce8433f750180653323059409495c41ff318cec58c31840102739d7a911cd73c07e64ea459c8dd4062fd8bbdbd4a26b6b280b359fe7f61d52ef5ae2 SHA512 6ab273085f2be3a6d0a2b785a51a9bfd52add0212b3c8522b22255c4e3e48a9470f20d9d678158233da9c9465563279079c29ca5526d322247f2ef1d74107144
-EBUILD 0verkill-0.16-r4.ebuild 1371 BLAKE2B c077b1dddf99fd5d4b71f2ae90a09697ea0c312bac60443e341bbf5926a59ae23d83b0f68ea3de6b088f5673f5572497687654a54135fcfc697fcd48806ad396 SHA512 35c019c33ffbc2b9429770b697b58b15368fbc251a13e16a345409224e9fd1a1dac8a6c1b9ac5cee609cbb8d2ef1a7342596f2bc9c8b9ad5ee900a6634008795
+EBUILD 0verkill-0.16-r4.ebuild 1381 BLAKE2B af13b0674049c56dac5832ce656971c4473cd178b719695b283ad5b750a641ecbd0fad55c07466872c7e8abbe7d1f0bc0303c72b7e76b086a3ec6cac1dec9cb0 SHA512 c241a1d91dfb8753c6a55fd19029fe4bdcd0097867e7bc48de73160d568930055fdd6c2944a1654381ca667aaccf35af0d6d42eb555b0246c5733a8decec897c
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index fbf03c8920da..ae73ab2eef9b 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/luola/Manifest b/games-action/luola/Manifest
index 431ffcbfda78..771c90d8e6e2 100644
--- a/games-action/luola/Manifest
+++ b/games-action/luola/Manifest
@@ -2,5 +2,5 @@ AUX luola-1.3.2-underlink.patch 249 BLAKE2B b6cc9e7d9b3acc7b2772c8596357a38bfd31
 DIST luola-1.3.2.tar.gz 1774711 BLAKE2B 017327e47066a4ba5d4e1a8f1a7f923f74dc0b3770b43237ba8bfc9f91835d1c8ef18728be5cb85b42a66cc99185942ddd059206fa155d5fa95a897b0176aa5b SHA512 4e8b2f5e813dbb4d951632ded20f013aae6837d525d0068b430ae41319503f206ec27f2873cff241af8ba4cd1728ec89dcf8279a94dbb3094330de1ca531712f
 DIST nostalgia-1.2.tar.gz 1475672 BLAKE2B fda721e35b9afcb50d96309c0fe693d81cee43ae2410299ad026c8a36727870331008e866a0725f88977292fec85d01f4da9618c6070c8ea7265a2a316a9acb2 SHA512 06a03b3398204c04f88fccbbf6a59f11da043c73dc203fe258e09e036364ee73cae337b9828bd27b52ebee6ff456c317143444c3b6c395addcdedf720988731f
 DIST stdlevels-6.0.tar.gz 1850148 BLAKE2B cd621d2e42cf10950fd7c81b6753bd6f8f8df178a8009de9219a40141de4bd73ee7e410e107b7ba99e3e1e7af978291604995cf1f2e52975a3de5ecaeb776837 SHA512 d1823ca8340dea8766310962507bc5aad06c0f737c16c3ce32afaafc0e83a8b7b4d301d5cf65a0466fdaee9ec2a7ce718d03be61b383ac6fe030101466eff11a
-EBUILD luola-1.3.2-r1.ebuild 1172 BLAKE2B c1869fc5dbe7f6c7c228f55b5822d6f6d24adf6cdd8f65b53be4c4f82397b60edb9a891a662804da1076179002310b2111c0b4c0c94b7f818f3ada677ccc143e SHA512 de297cd68c23699d8529c3249dc306402393c9b3a3fe328391b1a7b80bb98a075c90bbe898c0a673da02f0a342db690cf361057be9c892ea3d913bc17eff650a
+EBUILD luola-1.3.2-r1.ebuild 1181 BLAKE2B b71f327e9ad80ae0522f12d0d2b9686d160f9b965dcba2990167d30f8f4b688129f33799ee0b07665bdcd2e11cf7630f97b1939eb82f7aad0e144bee602ecfe0 SHA512 816539b2276bcc5e5b01f78c978ef57e51b7462aa00c417cb6dc8f95a7be3ec0e52cd142832022b66759bb87fb427174c81fd6a3770e6d6fbdcaa1137b74b66f
 MISC metadata.xml 325 BLAKE2B 2c5d6a18895f3af0049678aa6eb707808345a81f2d96ce5faa254dba43fe54ab2dac6e1997b44ea3a4dff2bb4d65233864158f5b211b6ef85e234f51b59d9159 SHA512 5e693021a9b1e4a0cff7c4b953648d3e8d9c0acb40d910288f8ed16a558117455e52841ebb32b78909f850b9f5a3b00165aafb343ab15a3e86e7d45a4e00f8c1
diff --git a/games-action/luola/luola-1.3.2-r1.ebuild b/games-action/luola/luola-1.3.2-r1.ebuild
index a31ff566421a..ff2ec53aa188 100644
--- a/games-action/luola/luola-1.3.2-r1.ebuild
+++ b/games-action/luola/luola-1.3.2-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
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools desktop gnome2-utils
 
 DESCRIPTION="A 2D multiplayer arcade game resembling V-Wing"
-HOMEPAGE="https://freecode.com/projects/luola"
+HOMEPAGE="http://freshmeat.sourceforge.net/projects/luola"
 SRC_URI="mirror://gentoo/${P}.tar.gz
 	mirror://gentoo/stdlevels-6.0.tar.gz
 	mirror://gentoo/nostalgia-1.2.tar.gz"
diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index dd55f5e3631a..181e96a7f68a 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -1,5 +1,6 @@
 AUX minetestserver.confd 313 BLAKE2B 51af7c8d6c23461028774e459d3ff24a867102ac56c239da056e31ba800ec0904d4ad2daa26a9fd5069ecffc2fded37a8409d966403456c239e78d2a7c369345 SHA512 75442376afb031ad65880fd2b9cad034c520c7bed489543d5e1cee65fc998d0ae082d5736528dcdfaca41681b01ee895d7e0471f8581e8f0cba1a8cbbe20b3bc
 AUX minetestserver.initd 555 BLAKE2B 307f310338ded815dc8a6f8ba29d51ae77ef94a1530125ad82ab3b7dc6d9a1b8a40a48b6dfb53d17230418bc8e5e05ffe5493c897150a853338fb01c8ef21b5b SHA512 b9103841e18586e9877b1a1b7fc9510545d02b947d5558cfee79de09a8c770767aeeb1b29b35bd47bf3670d739996a782f347f2274a94f3b3a9435d37ba566f1
+AUX minetestserver.logrotate 74 BLAKE2B 1e842c4d523436b25741a839074777d6e74cc23580b23c5d06204c32e27114caa21898bea4b13473a6dc5e221c5976e3c5d492c8b5fe7a9698521417edd58304 SHA512 ba675801d6845532108a473cc9fe21982e47a77535c8a27c92ab24d854c0671f9ada1b1ed3224a4af16e2d84ed27b6b880557e6894b1892c7b4e5e07d3d9a185
 DIST minetest-5.2.0.tar.gz 10361815 BLAKE2B 244cacc92f08f571f45bedef9a8f2154a8105fc83c1396d626e78dcb0d4050c3ba9610ccf2ec2864a5d4b73d9d31aac0dc162fdcc277ef35cc1ead53158cc51f SHA512 47e3cdf488d50ea61659ac3b72960c9971270d1a793e0d79dcb649c89f7a6e65a16c21e1b903d08c916a2ebcbd3fd2164ec67173a3d4f2a2e9bb3a6351b48851
-EBUILD minetest-5.2.0.ebuild 3167 BLAKE2B bd19cb7d7294dcd39fc2646601b8596c1f73def726f36a6a39ed9bc557abf24ce483bce69c122ba074d8270609412d8fad2b5c5ea2e6a776470f3b582bf22805 SHA512 1c8786341dab656a3203fc8e06e18142de91353e918dec3cbdb70d10683c8f34e6ed7fd7f0884c6bd219601608ddda4dbaf5439361efeb81402815ce4fccfb47
+EBUILD minetest-5.2.0.ebuild 3259 BLAKE2B 12c9c62b77158d90ed2ba059247f77dc68e4e2e682e304c48bd694ba6622776beee0129b3bf7c08e280c194bfd9b0743d11646c7b7855bb338c2067e1c089fcb SHA512 96731ed8ef82c5cb7c30b870537ec4bb0b4b03dd07c00cd39beb2071657f872270fda1c0d95c6047a5c02c7c363b7bfbb821ee8c01190a64fa60eff3a5937acd
 MISC metadata.xml 2238 BLAKE2B 71d17709848d892d3eb5e99165bc21f41b3d3c4ff51f4b9923f078156eb48c743308cb74c5f84ecc147aa9284332e0968b6e47a34c0c412e32abde9685c1bb1f SHA512 33d80f695f354f623e7dd927881865e074c430b4b562f2ac2bcc716a6be0d9ef89bcd2eb773d9207d3887a00b8ff7b9017b8d613cd603499cb6b0226ed3ffce4
diff --git a/games-action/minetest/files/minetestserver.logrotate b/games-action/minetest/files/minetestserver.logrotate
new file mode 100644
index 000000000000..879170349454
--- /dev/null
+++ b/games-action/minetest/files/minetestserver.logrotate
@@ -0,0 +1,5 @@
+/var/log/minetest/minetest-server.log {
+	rotate 5
+	weekly
+	copytruncate
+}
diff --git a/games-action/minetest/minetest-5.2.0.ebuild b/games-action/minetest/minetest-5.2.0.ebuild
index 73950475263b..9f99e55d2d4d 100644
--- a/games-action/minetest/minetest-5.2.0.ebuild
+++ b/games-action/minetest/minetest-5.2.0.ebuild
@@ -114,6 +114,9 @@ src_install() {
 
 		newconfd "${T}"/minetestserver.confd minetest-server
 		newinitd "${FILESDIR}"/minetestserver.initd minetest-server
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/minetestserver.logrotate minetest-server
 	fi
 }
 
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index c822874fcca2..39d62cb761fe 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/berusky/Manifest b/games-arcade/berusky/Manifest
index 2a96470e7f2e..4829f249da2f 100644
--- a/games-arcade/berusky/Manifest
+++ b/games-arcade/berusky/Manifest
@@ -1,5 +1,5 @@
 DIST berusky-1.7.1.tar.gz 483794 BLAKE2B 8e1d6f6c2c47d72fdba73506f8d3ea231649b4eb4fae3e663e9111ed99fbf300b2a160573d54781f9dcb3f9bf62bcb57634d0b3e8abb77f8baffc70254b4640e SHA512 0b0c4d736bfd9b0b62accf11d932271e355cbcbf911e35adb0ccd0bb1b45e06c392d60830bddef04a24689ccfcee7302f2653f6357474ccceba4fd66c44d4383
 DIST berusky-data-1.7.tar.gz 5366663 BLAKE2B 88dbb0063be83b2cc60208e9e5d95ee3014ad381ba1a070d5e781b527324d9d1d4d8a8a56da64e76672995e09f9b57630cd7ba282e2da543dbc6773628362403 SHA512 1ccae352b8033df0dd8fe6f09b1daa83b0e25a67999d41a0f21019014620825551a4e22827f96bc28ccdf0958df85c9f3cfd2e8f1e83dd7edac5b0479413d438
 DIST berusky.png 1714 BLAKE2B 31c8c9c820fa030c5329c3a990bd2430797794e460c22301bb8f7f9577a4d5cfaae23e1ba0640389ffea7dad0146afd5d20ff2ca0fa3d65085207af1a0f625df SHA512 a8a5f7f8dca8d686bc05239adda10673e937361514b1aea07dc9fe66f2e009ae7c20b75ab63fd4db8ed206026a009d8620af3471bbb966b5e9b576ce89f66e54
-EBUILD berusky-1.7.1-r1.ebuild 744 BLAKE2B 0175d17f9d04d05ac36b8d646788509e358f663312a1001160a36c8d30673d026fa55e55bfb067a8b71b3037579eaf9aa4aa200e714f100c4156552f84cdb83c SHA512 40031b87dd26eacdd5180709eb60e22cd3a04a8246b23e889163c550b735e8e2307d5ee98a14ebdb875e6c33bc7e8f138b113bb325a119c362eb37f97a745cf9
+EBUILD berusky-1.7.1-r1.ebuild 745 BLAKE2B 53ac8329a31131a346d61477548a02e411a3dce90da4a83652cb6b6ea2e4b018671e6856f48dbea5964e477db5646fd4aee7f2be099dcf8fd0972522ccf86a81 SHA512 a19aa6b233b50c16fc849b283758b1fed95d4f27b61b91cdee801f3427155e69aed4dd858b91b054fa41aed156c538e6ae80741a2eda208eb75fc1ccf69aea19
 MISC metadata.xml 763 BLAKE2B 8aca8e43b681e917a1746a8e8932dee1aeaf0485f32a5e253874c28765b85e90c7a13c722d1c959a12ab5a419936df968f6e5d99fe54d6c4b432a8ae09441f4b SHA512 07baeac7dc22893b3e6bdf8c7ab687ba05ea622bd044e92d364d32358b2961bced3ea1263fb3434cb4ca386d9f90818834a5a3bc8d016cdc69a06e248d694ee1
diff --git a/games-arcade/berusky/berusky-1.7.1-r1.ebuild b/games-arcade/berusky/berusky-1.7.1-r1.ebuild
index d56b0203f7d5..57077ecfc396 100644
--- a/games-arcade/berusky/berusky-1.7.1-r1.ebuild
+++ b/games-arcade/berusky/berusky-1.7.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
@@ -6,12 +6,12 @@ inherit desktop gnome2
 
 DATAFILE="${PN}-data-1.7"
 DESCRIPTION="Free logic game based on an ancient puzzle named Sokoban"
-HOMEPAGE="http://anakreon.cz/?q=node/1"
-SRC_URI="http://www.anakreon.cz/download/${P}.tar.gz
-	http://www.anakreon.cz/download/${DATAFILE}.tar.gz
+HOMEPAGE="https://anakreon.cz/?q=node/1"
+SRC_URI="https://www.anakreon.cz/download/${P}.tar.gz
+	https://www.anakreon.cz/download/${DATAFILE}.tar.gz
 	https://dev.gentoo.org/~hasufell/distfiles/${PN}.png"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/games-arcade/blobwars/Manifest b/games-arcade/blobwars/Manifest
index bc5169bdbf86..56a402713acb 100644
--- a/games-arcade/blobwars/Manifest
+++ b/games-arcade/blobwars/Manifest
@@ -1,3 +1,4 @@
 DIST blobwars-2.00.tar.gz 66982603 BLAKE2B 273b5eab5a569f7f4b78982499a85daf63e6fdfb7d4348290d64bbcbeb9be830bb7cf81a0a387df0daa176e7a2a82d62404e88c95f02d6af485bae054170ad38 SHA512 412afd029554e59e7947466f36b51ef863faf1712898397498d5497e9a38dced92777b7684c1fb231998d893a6ce2c435b8f4278429df41168385de8fa18725b
+EBUILD blobwars-2.00-r1.ebuild 1616 BLAKE2B 713c26a8d9111f20e96a4ecb81b8351533fe110874aac2f3a6276b75b8e635039dbd78820d477dc2e15c3b732cf08f6f9c5b24a0bc1020364203c2f605e0c8f7 SHA512 6cda604671dadc10c408cc2d032a6bea24ab9364b6f1407dc4cfb2d63c8de4011fa2cdb6de05f78592f336f620013867ad5da464546428c937ed4148ce1dbd80
 EBUILD blobwars-2.00.ebuild 1124 BLAKE2B fae1ab03f69036eff035e706ebbcaa069ffafe3e3506915530fc6f68ee33832c9562853ab148673f3e5e70c3a216987355a9f26e4e0f30ec8359f15da8463fc3 SHA512 307dc3ab6bec986c2883e47a2520a7505f1bb7167be768ef21f6fc253c84d72c678d2fe73b232ff973e3a0ebd110b2459f68b7d0678b9952eb571a51398814a9
 MISC metadata.xml 321 BLAKE2B 615ad32064001afb9fb3a3c4038f5e36e388193fef6855f157feb05085a5a803878035a225935e1c1350b10bc483c3ebd46c38f1f365828d2807d4387ce3a6d5 SHA512 9e885b0215caa2c061cfe52c19a389227087691b6ec1bca4fcd8c7279468454b21e32027c5f1d03aafdb982b873251ee8cddcad28987085d0960e3f39ad77867
diff --git a/games-arcade/blobwars/blobwars-2.00-r1.ebuild b/games-arcade/blobwars/blobwars-2.00-r1.ebuild
new file mode 100644
index 000000000000..1d51f12f8b9d
--- /dev/null
+++ b/games-arcade/blobwars/blobwars-2.00-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils xdg
+
+DESCRIPTION="Platform game about a blob and his quest to rescue MIAs from an alien invader"
+HOMEPAGE="https://sourceforge.net/projects/blobwars/ https://www.parallelrealities.co.uk/games/metalBlobSolid/ https://github.com/perpendicular-dimensions/blobwars"
+SRC_URI="mirror://sourceforge/blobwars/${P}.tar.gz"
+
+LICENSE="BSD CC-BY-SA-3.0 CC-BY-3.0 GPL-2 LGPL-2.1 fairuse public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/libsdl2
+	media-libs/sdl2-mixer
+	media-libs/sdl2-ttf
+	media-libs/sdl2-image
+	media-libs/sdl2-net
+	sys-libs/zlib
+	virtual/libintl
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+src_prepare() {
+	default
+
+	# Fixes from Fedora and OpenSuSE
+	sed -i -e 's|$(PREFIX)/games|$(PREFIX)/bin|;
+		s|$(PREFIX)/share/games|$(PREFIX)/share|;
+		s| -Werror||;
+		s|$(CXX) $(LIBS) $(GAMEOBJS) -o $(PROG)|$(CXX) $(GAMEOBJS) $(LIBS) -o $(PROG)|;
+		s|$(CXX) $(LIBS) $(PAKOBJS) -o pak|$(CXX) $(PAKOBJS) $(LIBS) -o pak|;
+		s|$(CXX) $(LIBS) $(MAPOBJS) -o mapeditor|$(CXX) $(MAPOBJS) $(LIBS) -o mapeditor|' \
+		Makefile || die
+	sed -i -e 's|gzclose(pak)|gzclose((gzFile)pak)|;
+		s|gzclose(fp)|gzclose((gzFile)fp)|' src/pak.cpp || die
+}
+
+src_compile() {
+	# USEPAK=1 breaks music
+	emake \
+		RELEASE="1" \
+		USEPAK="0"
+}
+
+src_install() {
+	emake \
+		BINDIR="/usr/bin/" \
+		USEPAK="0" \
+		DESTDIR="${D}" \
+		DOCDIR="/usr/share/doc/${PF}/html/" \
+		install
+
+	mv -vf \
+		"${D}"/usr/share/doc/${PF}/html/{changes,hacking,porting,readme} \
+		"${D}"/usr/share/doc/${PF}/
+}
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index b7d4c0363beb..2fe8db159540 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/cockatrice/Manifest b/games-board/cockatrice/Manifest
index 058264043609..0f81b3052ccf 100644
--- a/games-board/cockatrice/Manifest
+++ b/games-board/cockatrice/Manifest
@@ -1,4 +1,5 @@
+AUX cockatrice-20190304-qt-5.15.patch 691 BLAKE2B 60e82838530df13436d8409263565a37e730bafe2eb1d94dc13dcd77ba830d3b01f032e8e69725fa7e94de15e027852bc468ee9e82ed6d6e47a846b40cda424b SHA512 791b9228d9c1d0be23bebee9fe9eeae7ade906e1f6c68f4d0520778528c05576c59562d8986d5abad498df9771a8aee341fdb23a27424de0cbf3b5718969f9ee
 AUX use-ccache.patch 950 BLAKE2B e514c416c7c8821f79a195f968ae9804b83cd9a4a23be3391967a758cca12443e9acf5ee1d568f2b5b1536a9f351df4393a5dc91a08d865d3e038608989df916 SHA512 1140d2dc007474cf192a0a1fa2f9388c8cbd68214a31bc8c5d02f6ced0fd440400f0632a3b76ce1e172ed4ffd481c76b8e3d6a28c8aefa7816b3292c78182a1c
 DIST cockatrice-20190304.tar.gz 8464830 BLAKE2B 6e6b41593d7eddc8599fa894eed63f993fb69888c57fdfc4a45d71e6e7990d7d716663b69902139f5fd7ead455acdba76ac1d649977e26dceb2948293c34b74e SHA512 6a76e5de2aa7a4d2c9943bee9225ebf01aca7679bcd2542450b7e8b919e401992019f5bfb69597e8845bb2d8db568d7a6549600b85b576f9fb29be712bbfc9e5
-EBUILD cockatrice-20190304-r1.ebuild 1607 BLAKE2B 1e3e52c1691020bc554fb47d97ce9b73f607fd5167ec86b8fe871a40ca0fece23582d142e5883be162fa68b2acbda630ce3ee37420b63f3366a5806337f71379 SHA512 e5e10ffe2398c3128d60c1f8b10da287ca88ef5c7278c30094f42b3ede30928593a4207f9e74a7e6735f748a033e4346c291e8f62bbc69718e2b113c0bc15974
+EBUILD cockatrice-20190304-r1.ebuild 1590 BLAKE2B 775a2e1130296784552ebe202d302216cf67a5d15c57df197e2b85b7743f69589b4ae62dea46d61f52ef9bbd30f78ca8c0e15fd01fc809ca541f5c6c0a53112b SHA512 98ef6cc95424d8bc041c0e81fb0c7ba129eca7bc39531bbc266725dc0394516902aa827f0f2f20055d1032817033d401002d0cec39124b9823f395ee9ae4d42c
 MISC metadata.xml 1187 BLAKE2B b04809289e20d3d8e98c474cf7673c4620ee337edaf7a61b94fdb0e56a1957b459350032a725a25bce4fd262768bb1f09937320450902966698d6140978a9656 SHA512 cc3711f5230ae38cdeca3da9d1ed9f23a71f4790567433fc1a60e5035412c2259633fb3a5200d248b0247bc282903fa0f2e8d741900bde1b990ef0ce56f38b0b
diff --git a/games-board/cockatrice/cockatrice-20190304-r1.ebuild b/games-board/cockatrice/cockatrice-20190304-r1.ebuild
index 39f89707cad8..50792e3ce5f8 100644
--- a/games-board/cockatrice/cockatrice-20190304-r1.ebuild
+++ b/games-board/cockatrice/cockatrice-20190304-r1.ebuild
@@ -17,23 +17,21 @@ IUSE="+client +oracle server"
 
 RDEPEND="
 	dev-qt/qtconcurrent:5
-	dev-qt/qtprintsupport:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtprintsupport:5
 	dev-qt/qtwebsockets:5
 	dev-qt/qtwidgets:5
 	client? (
 		dev-libs/protobuf:=
 		dev-qt/qtmultimedia:5
-		dev-qt/qtprintsupport:5
 		dev-qt/qtsvg:5
 	)
 	oracle? ( sys-libs/zlib )
 	server? (
 		dev-libs/protobuf:=
 		dev-qt/qtsql:5
-		dev-qt/qtwebsockets:5
 	)
 "
 BDEPEND="
@@ -41,8 +39,7 @@ BDEPEND="
 	client? ( dev-libs/protobuf )
 	server? ( dev-libs/protobuf )
 "
-DEPEND="${RDEPEND}
-"
+DEPEND="${RDEPEND}"
 
 # As the default help/about display the sha1 we need it
 SHA1='294b433'
@@ -51,6 +48,7 @@ S="${WORKDIR}/Cockatrice-${MY_PV}"
 
 PATCHES=(
 	"${FILESDIR}"/use-ccache.patch
+	"${FILESDIR}"/${P}-qt-5.15.patch
 )
 
 src_configure() {
diff --git a/games-board/cockatrice/files/cockatrice-20190304-qt-5.15.patch b/games-board/cockatrice/files/cockatrice-20190304-qt-5.15.patch
new file mode 100644
index 000000000000..878a8d428246
--- /dev/null
+++ b/games-board/cockatrice/files/cockatrice-20190304-qt-5.15.patch
@@ -0,0 +1,20 @@
+From 7fa1936d0f4efffa16ae28d6bd3f9e727e207046 Mon Sep 17 00:00:00 2001
+From: ebbit1q <ebbit1q@gmail.com>
+Date: Fri, 19 Jun 2020 16:50:09 +0200
+Subject: [PATCH] qt 5.15 compatibility (#4027)
+
+---
+ cockatrice/src/replay_timeline_widget.cpp      |  1 +
+ 27 files changed, 101 insertions(+), 39 deletions(-)
+
+diff --git a/cockatrice/src/replay_timeline_widget.cpp b/cockatrice/src/replay_timeline_widget.cpp
+index 6d04dce80..e79ad5f5c 100644
+--- a/cockatrice/src/replay_timeline_widget.cpp
++++ b/cockatrice/src/replay_timeline_widget.cpp
+@@ -1,6 +1,7 @@
+ #include "replay_timeline_widget.h"
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPalette>
+ #include <QTimer>
+ #include <cmath>
diff --git a/games-board/gnuchess/Manifest b/games-board/gnuchess/Manifest
index f387d90ea48a..34b7b4e89e05 100644
--- a/games-board/gnuchess/Manifest
+++ b/games-board/gnuchess/Manifest
@@ -1,7 +1,3 @@
-DIST gnuchess-6.2.4.tar.gz 757985 BLAKE2B bbb83a9fe7a7ace155b869deebdb67474d6c23538e7852167e846d5570bcd878634b0b2576f3ee33407913976103c637d3b024a8b81f290325c88c84d573d85c SHA512 53546d3319cd6a7bc70be5cc11c29cf33c71b747de2244a7d8d4aff6b00318ad35ee0e27058b40a265c62ef02c188d2e34cba9bbf439306220796e7332904d42
-DIST gnuchess-6.2.5.tar.gz 782359 BLAKE2B d9ae979023ea6265e89a25223935df3847adfc52d46df2a9fe96700081f613f7817b4add22e3a63aa4e035adea9c1f4856cb1e9b80d751c3ee63818b5924c388 SHA512 f3f65a85eb4c93f6f10c7058bde7ee7f4a48c2f465b24a7cc0d5bcafe4df186b434ce23bf8c032d012efffba39c6c3c60ada484ff22d87114ce2be5dd0da6835
 DIST gnuchess-6.2.7.tar.gz 802863 BLAKE2B 2fea825cdf0e629b3c2e9965d16f432edff81ceac8e7fbfd99b7be93f7281f813b10b91a62b3823acbf8967af538b04d2d87f93abde4a580e659e1fbdc5966e9 SHA512 1ed9e9344fbfc8e78504290a44e2710acab53f211c4349cafb7b64cc9a1fa923fbef4b4cbe3dd96438049b1da21415db3eb81fe663a94551c30105207086e343
-EBUILD gnuchess-6.2.4.ebuild 436 BLAKE2B bd1be6c822b90e0af3b3a6751ef813e9548837da149589a9b30ef6525f60abf5aa7338e24a1abb5fb4f73ad49d03c271016383fd0d34381a39289ad437e818ed SHA512 545ca9057cc22f01ffca401e32db9a1bbe5bb0e89d1712e2a6743a5668a19d44a8bd7925853e5414a871333041dc3005a91d250b3e392ddcbd9039808af7e61c
-EBUILD gnuchess-6.2.5.ebuild 443 BLAKE2B 8cfd191557073ef39505219bde801f90d28f6ff785a44446d5aa68f0d6365ca35773d2194dfb0240f6b0c04725a1c39f23d3142f7219c7b9656b2feb1e6e808d SHA512 40bcb82fa16ed49715eb105e2351822bf69b18aaedc05ef3b1efed3cdca534788304373eb5f54349132eed2fa26c566e81592b1a974e8b5231de1c29e9d71bae
-EBUILD gnuchess-6.2.7.ebuild 380 BLAKE2B 66db1c83f76ee2f208f68a1eb73d4c8db5b06d4a5fee431d07985511a9d95c7092b4cb346595cf49829285859c638e717d9e1556a4cff1505728cbc67a1e995c SHA512 373120d5df32bd7cf5dc9ac37701f53cc2d3b45271df17fc6c9b37e362853fc8f027d4b65c4f6faed908c63c927fd9c199c4d3ed13db4101e4f04bf339e6f187
+EBUILD gnuchess-6.2.7.ebuild 379 BLAKE2B 40744e6f5027920c0b3b9689f8eef8343fa152ff3af013772389aa7bcb04563364a00579b71e345da527ae3f6393a5520d543f7da7d870ab02b558a0afa7b3c0 SHA512 ad55b40e15bce4b2d77f29d64582b76412a99f82e1224e58efa805285889de13abf545196ed6c88342db943a1a5bef9d339bd2449c007d2be2562a341e46b1fb
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/gnuchess/gnuchess-6.2.4.ebuild b/games-board/gnuchess/gnuchess-6.2.4.ebuild
deleted file mode 100644
index 09272e6f0341..000000000000
--- a/games-board/gnuchess/gnuchess-6.2.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="Console based chess interface"
-HOMEPAGE="https://www.gnu.org/software/chess/chess.html"
-SRC_URI="mirror://gnu/chess/${P}.tar.gz"
-
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-src_configure() {
-	strip-flags # bug #199097
-	econf --without-readline # bug 491088
-}
diff --git a/games-board/gnuchess/gnuchess-6.2.5.ebuild b/games-board/gnuchess/gnuchess-6.2.5.ebuild
deleted file mode 100644
index e368ad19a379..000000000000
--- a/games-board/gnuchess/gnuchess-6.2.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="Console based chess interface"
-HOMEPAGE="https://www.gnu.org/software/chess/chess.html"
-SRC_URI="mirror://gnu/chess/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-src_configure() {
-	strip-flags # bug #199097
-	econf --without-readline # bug 491088
-}
diff --git a/games-board/gnuchess/gnuchess-6.2.7.ebuild b/games-board/gnuchess/gnuchess-6.2.7.ebuild
index a79c72f20cb7..37bd1f102543 100644
--- a/games-board/gnuchess/gnuchess-6.2.7.ebuild
+++ b/games-board/gnuchess/gnuchess-6.2.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/chess/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 src_configure() {
 	econf --without-readline # bug 491088
diff --git a/games-board/gnugo/Manifest b/games-board/gnugo/Manifest
index ee0822387eb5..2652507211c4 100644
--- a/games-board/gnugo/Manifest
+++ b/games-board/gnugo/Manifest
@@ -1,6 +1,7 @@
+AUX gnugo-3.9.1-autotools.patch 171 BLAKE2B 158e2fa553952be116466eae58ea1f7f9793a9cd22e763afd8479d26c693b8137f88d039ebcaf25a54d6c4185536f6de71ee4ed230716d26130c40ecc34db86b SHA512 5b29b62d7d2b6bf80b3d863931c8bad46fa005cd1a183a96dbdc229d47fd4fc44279f66b5659dbb27a69e4811e60fef573df767b7a37d9b9a05a6295b208c706
+AUX gnugo-3.9.1-fno-common.patch 635 BLAKE2B 922834d23e953bf5fb28b74c22e59a764c92098b72abc6cda9bbbc0965e53487c15a7cfce0cac3236768ca6b0b1ee740bb9ea66a9c7d9713ce888ff5756073bc SHA512 2677082b6e5ab78444c600e240f5a06a36d8f9cdc201db1e29a10f0cda8dd83e703d7d6181f9ac4c3de32e08f16e72e25063c7b76c304eed95fb2be6032e98f4
 AUX gnugo-3.9.1-format-security.patch 1943 BLAKE2B 2dd1c6f7b69da62baac53336e1b017136b16392b85a343aeb41d47fd10f5464a98eee1c8383e31531b21f72456a037bf72fb206752818f2fb39939d46bccb35a SHA512 5d53c53173980c9e73ce1f19c5c5e9228308cb00a61a623e942a3cc8598b73cc188ef24fda0b44feddcf0f381dbebdccf85716a187de730a9bb6412d1f9d61a7
 AUX gnugo-3.9.1-invalid-move.patch 727 BLAKE2B 5c5a13e3b00175627a45a4ef1d32b4a3dc049114281219ec70a22985c2deb027938b2e4ee1c0a58c1da8759800fdd9f98d6bb4981405f51af6269e0a01dedb74 SHA512 a1f20761e714670e2173b36390492304252bf30e46f93e37dee3cc72de346a59a8daaaaa6f0cf2e20834637598831f0f55d4c6c0825021d6fd00055a57db2bdb
 DIST gnugo-3.9.1.tar.gz 3207748 BLAKE2B 4251e125eac20188926210db8640f1ae4ff2b79f6a59b429af9e10fcfd6b0d34f9bf180b32194c519a7b59905a4b5e8bc1a2e45a071a8b8696bf16dd04f6a342 SHA512 b2b215fb8c1ebb0b58e54d14dcc02af3b76bde3a1b84a842a11a0a6018c77a2464c44b26fe0e7ad73b2b2e7fa22005466821bf762108c2c2e04428d3d459af97
-EBUILD gnugo-3.9.1-r1.ebuild 662 BLAKE2B 48296b632f9c05b031b7550e76af9a25217e21c7503a17f65fd859b4170ef8436251fa8ec911278cf4c469c5544f41c79975a197612c0938169211a89554de73 SHA512 287f9f4e6b7a7daa14cbfa7efe45d8f784c08fd4805a1b6f249e269156d9320a9d490ae1204a7c7bf52881e4bfd3b9e4982b3428a73f1cbae2f4db45f452fc58
-EBUILD gnugo-3.9.1-r2.ebuild 631 BLAKE2B c3d6006c4c0d1204237e44e81665b7cb9d8255f0e51a883ce78474eef683c4e4b208af7167c170164eebac16f15c7572b031681932cf1b5d2c0ac5dae362508c SHA512 2822f4e6e0c11a8bbd1d8b8c0c23bb500f874ba5d23671222deae93174e1b8b5e1e422beee4d18f164333193898a9ba35e7cb6973e4b6c4cadb10943ea1d9e51
+EBUILD gnugo-3.9.1-r2.ebuild 792 BLAKE2B f43cfd7efea54f57086f24f526818e36a924d8b62172f33dfc6800227ed8919665d06fe61cba563a28e43bbbb74b5c04b586e53f6d206c1a47b3c306f32187bd SHA512 8acf607deae33d1b9c8d8589c3b57ed1130a726bc8980ccd2b50723dfc7ab17009d50e407dbad5b9848a3e399748400ccda01605a6920d2f0f0c989b8a8f05df
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/gnugo/files/gnugo-3.9.1-autotools.patch b/games-board/gnugo/files/gnugo-3.9.1-autotools.patch
new file mode 100644
index 000000000000..79e28fa9b7bf
--- /dev/null
+++ b/games-board/gnugo/files/gnugo-3.9.1-autotools.patch
@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -151,6 +151,7 @@
+ 
+ AC_PROG_CPP
+ AC_PROG_RANLIB
++AM_PROG_AR
+ 
+ dnl required since we use SUBDIRS in Makefile.am
+ AC_PROG_MAKE_SET
diff --git a/games-board/gnugo/files/gnugo-3.9.1-fno-common.patch b/games-board/gnugo/files/gnugo-3.9.1-fno-common.patch
new file mode 100644
index 000000000000..db8215ecf90f
--- /dev/null
+++ b/games-board/gnugo/files/gnugo-3.9.1-fno-common.patch
@@ -0,0 +1,25 @@
+--- a/engine/globals.c
++++ b/engine/globals.c
+@@ -136,6 +136,9 @@
+ 				 * move generation is enabled.
+ 				 */
+ 
++int meaningless_white_moves[BOARDMAX];
++int meaningless_black_moves[BOARDMAX];
++
+ float best_move_values[10];
+ int   best_moves[10];
+ float white_score;
+--- a/engine/liberty.h
++++ b/engine/liberty.h
+@@ -859,8 +859,8 @@
+ extern struct worm_data worm[BOARDMAX];
+ 
+ /* Unconditionally meaningless moves. */
+-int meaningless_black_moves[BOARDMAX];
+-int meaningless_white_moves[BOARDMAX];
++extern int meaningless_black_moves[BOARDMAX];
++extern int meaningless_white_moves[BOARDMAX];
+ 
+ /* Surround cache (see surround.c) */
+ 
diff --git a/games-board/gnugo/gnugo-3.9.1-r1.ebuild b/games-board/gnugo/gnugo-3.9.1-r1.ebuild
deleted file mode 100644
index aba4225ac342..000000000000
--- a/games-board/gnugo/gnugo-3.9.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="A Go-playing program"
-HOMEPAGE="https://www.gnu.org/software/gnugo/devel.html"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="readline"
-
-DEPEND="readline? ( sys-libs/readline:0= )
-	>=sys-libs/ncurses-5.2-r3:0="
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-invalid-move.patch
-}
-
-src_configure() {
-	egamesconf \
-		$(use_with readline) \
-		--enable-cache-size=32
-}
-
-src_install() {
-	default
-	prepgamesdirs
-}
diff --git a/games-board/gnugo/gnugo-3.9.1-r2.ebuild b/games-board/gnugo/gnugo-3.9.1-r2.ebuild
index cfcbcca0fbbb..b0bf4b8a8278 100644
--- a/games-board/gnugo/gnugo-3.9.1-r2.ebuild
+++ b/games-board/gnugo/gnugo-3.9.1-r2.ebuild
@@ -1,7 +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
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="A Go-playing program"
 HOMEPAGE="https://www.gnu.org/software/gnugo/devel.html"
@@ -14,15 +16,22 @@ IUSE="readline"
 
 RDEPEND="
 	readline? ( sys-libs/readline:0= )
-	>=sys-libs/ncurses-5.2-r3:0=
-"
+	>=sys-libs/ncurses-5.2-r3:0="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-invalid-move.patch
 	"${FILESDIR}"/${P}-format-security.patch
+	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		$(use_with readline) \
diff --git a/games-board/scid/Manifest b/games-board/scid/Manifest
index 364a8d1e5348..cda07e75b971 100644
--- a/games-board/scid/Manifest
+++ b/games-board/scid/Manifest
@@ -1,8 +1,9 @@
 AUX scid-4.6.2-gentoo.patch 4508 BLAKE2B ea08a9b215e7e80a33912db552cf3d5e79c8c252f6c9dc557d997b9df43f4dffcd9e74aa06a9a7eca064ec1304b66b3d9495ef152cebb0bd30a507641b321006 SHA512 52a32a6250b293a0fe145ebd45cf6b4d283f3d883cffa278e9599e36a57c129e0b6ccc2a637f200b5fa1e4b8c8a7956fa63a60ceb5d83ba877ca54920346de83
+AUX scid-4.6.2-pgnfix-python3.patch 3475 BLAKE2B 45da2f9c0c3f4d7db045d00e0bb9028b383ae4067c2ce5e104bb9a54d9e6831e90dd0015a40a87ee481f37a039ad7ccca1d71ad91f6413a9f962157bc045d8c4 SHA512 620f9610675236c688b818274bbb2f1b5e6dc7ed7e984721e84318a6fc35ce921dce3c3c8e76b53b89a04d0e6cfa6b46035f6de64ff3d7828e2e1606da1b90e1
 DIST photos.zip 1007488 BLAKE2B 8b0f9b0402d9102bda4cfe1333cafdf048592004b2b8cb7f8f085eacc10b6b89811afd39c3d849a4f6288ad63145fc760e60bcd70867ae339459a451c537cbf3 SHA512 c04fc810b457d4dbd9a9cfaac90feaa8c32a2abee05e28a79042ae81cb01e8580e2a1cf0abeff230ec2928da883f862b8901d679cb1448fd9ca0923323fbddd6
 DIST ratings.zip 969347 BLAKE2B 47d050f7c0e00e96aa0371db7f328e699cd0e34eafa3652664f00df7fe08b98adc4197c5235303d6df2c5bcf7ea568c753d23ac5fffe3616de6db9dae21a31a3 SHA512 9b2a7280a7e72e2b464cc3da6be82ec9825b11d3c7e2219ab03a711c69f185f7d954eb3acdd441bff210e9296613df79a7e147a2ccbb4ed37b50af762abbd243
 DIST scid-4.6.2.zip 9768139 BLAKE2B 8e9baf2fe67c3566111f23ead005cba34d32f986afbaaed2117dc46aab65190dd8675df721c6fff3e7c5f338a07d7b787265dee63480141258625f6b6f54ec6d SHA512 d33f730857362dfefe55aaf395b0fc42087e190743ed63072128509fc6ac33791a4c2f67f89f03ec39170660fc6b7a6804fea084b383cf97cbb21661ce0569b2
 DIST scidlet40k.zip 242632 BLAKE2B a16c5a3c04f721a40221db33f9ff7192dba724203ff81a61286903c2f4ab8a33b442503882550a7a59ab0a0e6d735a74b3f34bf9dd89f9677f2b7a8b8082d398 SHA512 e8cb4ca276ca94378f224fad972b0659f3e8159668fa395dcae4be1de6cdd9d29082fdddba393bbea6c909bab4f388042ea05c7dff41edf850d731bc7479850d
 DIST spelling.zip 3147998 BLAKE2B 40b33e0c5fab487247af13b0e3fa22d91b17cfb1dbc7d3fafd080db306700e684b30bf46a7222dd7ae16dc1407239973be8de1ee619b31cbcb373684a7f1487c SHA512 394a8835f23336b6f4bebe4e33ab9f64ffa505e9d9bb984de82396e671df0b57b088aab28c5cf648c1a11bc28370b431cb6db54765ac4ab6056a707276ba8f42
-EBUILD scid-4.6.2-r1.ebuild 1986 BLAKE2B 994e81c6e581857d50870aadda8fba830f0859a7cf20d40da40c16981a6864ddbfb904053ee533d81d8a4476578b373c2621c7f372c320a71d0cc6f4191c42f8 SHA512 ba0364fb05c468a6048fdad1fe0462ed0b6d1c979d601de30a7d9b363893b262c89cf86b3a6afac65997e91c3ad26a4e7d5ee47b19073db72ddbc1ec22cf78ee
+EBUILD scid-4.6.2-r1.ebuild 2030 BLAKE2B c479cc958780e594ca850faad1b61876670b4e93588224bf7eee9b3a6ac1089058dabda1a04f4c132a5f8ffc6c164618e18af0b35654f01f15c3d73922d34dc9 SHA512 02c9a37b7334a5a935d3e4dcdcda71596fee5a6dfb8b3de4abd1d5731a8d02b389af8ead6681180dec1f135f11fe37d10146526fdaeaa681851be572e7973eeb
 MISC metadata.xml 327 BLAKE2B 26037c210c23b4fc0936c22b8ae22f33622b2b19a183bcbb69de69c4ed2b02aec5121198ba555cd7049421ae9a0e9824ed1115725bc0e4c9deff9639f88fcd6b SHA512 b3551509e319eba4e682673f363044c3f3b7973299618405e6aa29f44a86527e0f397a6baaface9d95806da7ec2c361c152729b753741694fb9c13760433e5c1
diff --git a/games-board/scid/files/scid-4.6.2-pgnfix-python3.patch b/games-board/scid/files/scid-4.6.2-pgnfix-python3.patch
new file mode 100644
index 000000000000..79b64e5ef6f3
--- /dev/null
+++ b/games-board/scid/files/scid-4.6.2-pgnfix-python3.patch
@@ -0,0 +1,97 @@
+--- a/scripts/pgnfix.py
++++ b/scripts/pgnfix.py
+@@ -12,7 +12,6 @@
+ # put in the Site or Event field, and move them to the Date field.
+ 
+ import sys
+-import string
+ import re
+ 
+ if len(sys.argv) < 2:
+@@ -69,16 +68,16 @@
+             if match:
+                 full = match.group(0)
+                 last, first = match.groups()
+-                first = string.strip(first)
+-                full  = string.strip(full)
+-                last  = string.strip(last)
++                first = str.strip(first)
++                full  = str.strip(full)
++                last  = str.strip(last)
+                 if first:
+                     for name in (full, last,
+                                  last + " " + first,
+                                  last + ", " + first[0],
+                                  last + " " + first[0]):
+-                        name = string.lower(name)
+-                        if spelling.has_key(name):
++                        name = str.lower(name)
++                        if name in spelling:
+                             del spelling[name]
+                         else:
+                             spelling[name] = full
+@@ -107,16 +106,16 @@
+                 if error:
+                     out = sys.stderr
+                     error = 0
+-                out.write(string.join(current, ""))
++                out.write("".join(current))
+                 current = []
+                 bad_lines = []
+         else:
+             if headers:
+                 for field, value in specials.items():
+-                    if not headers.has_key(field):
++                    if not field in headers:
+                         headers[field] = value
+                 for field in order:
+-                    if headers.has_key(field):
++                    if field in headers:
+                         current.append('[%s "%s"]\n' % (field, headers[field]))
+                         del headers[field]
+                 for field, value in headers.items():
+@@ -172,7 +171,7 @@
+                 specials["Date"] = "%04d.%02d.%02d" % (year, month, day)
+                 value = re.sub("\(?([0-9]+)/([0-9]+)/([0-9]+)\)?", "", value)
+ 
+-        value = string.strip(value)
++        value = str.strip(value)
+ 
+         if field in ("White", "Black"):
+             name = re.sub("[MW][0-9]{5}", "", value)
+@@ -193,21 +192,21 @@
+                     name = re.sub("_", " ", name)
+                     name = re.sub("\.", "", name)
+                     name = re.sub("([A-Za-z])([0-9])", "\\1 \\2", name)
+-                    name = string.strip(name)
++                    name = str.strip(name)
+                     name = re.sub("^([A-Z]+?)\s*([A-Z][a-z].+)", "\\2, \\1",
+                                   name)
+ 
+                 name = re.sub(",\s*([GI]M)?$", "", name)
+ 
+-            name = string.strip(name)
+-            t = string.lower(name)
++            name = str.strip(name)
++            t = str.lower(name)
+ 
+-            if spelling.has_key(t):
++            if t in spelling:
+                 name = spelling[t]
+ 
+             headers[field] = name
+ 
+-        elif not bogus.has_key(field) or not re.search(bogus[field], value):
++        elif not field in bogus or not re.search(bogus[field], value):
+             headers[field] = value
+ 
+ if current:
+@@ -215,7 +214,7 @@
+     if error:
+         out = sys.stderr
+         error = 0
+-    out.write(string.join(current, ""))
++    out.write("".join(current))
+     current = []
+     bad_lines = []
+ 
diff --git a/games-board/scid/scid-4.6.2-r1.ebuild b/games-board/scid/scid-4.6.2-r1.ebuild
index f31b6be08e89..9a9a52b97b9a 100644
--- a/games-board/scid/scid-4.6.2-r1.ebuild
+++ b/games-board/scid/scid-4.6.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit eutils toolchain-funcs gnome2-utils python-any-r1
 
 DESCRIPTION="a free chess database application"
@@ -38,6 +38,7 @@ src_unpack() {
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-pgnfix-python3.patch
 )
 
 src_prepare() {
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 372a62926e5c..9849dec0c40d 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index f479067f853f..e2f42d47ee56 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -4,5 +4,5 @@ AUX dolphin-5.0-soundtouch-exceptions.patch 591 BLAKE2B 7a5f25041214f58e99f8e6d5
 AUX dolphin-5.0-xgetbv.patch 1137 BLAKE2B d736d25127fae4c552c1e28b0c152037a2c0a16c59dbec873596e1488f9a9872672684f23517c6ceeef0c8b50e0f1914882a1ccd123660e4458fc9e73d1e07bd SHA512 d627829270acc69ed3dc420c57762c6a68713482c29fd0b33a38864558380c5d9547ace9ab054d2892108ccfe7751147e51c0d5495a57d02fa29c02ac93ef391
 DIST dolphin-5.0.tar.gz 38246344 BLAKE2B 540eb5d0d3f2250d0b562caaef113bcae66ea47c3b6c2884f5612f36f990592d2c83ad0348cb83d71f5329414580f6cbf07081bdef2661bd277ee2f7613dc661 SHA512 8de76f811abfb82e19502336734e86ba600c11d9fa95bcf7f70a2a525165d07ead826854c39377602aab7856a057af9ba91bff458cf2dd008712527290489d3a
 EBUILD dolphin-5.0.ebuild 4596 BLAKE2B 81fe5abe2b7779f189346605b6b3900066c6463d0e89be39984ee3ce92046c0ae3fff747e19467b3a105826ab5f1955d89a4e611d56111a15b173e0c77f01bad SHA512 6bf62074ba5f228119d19e23cac7621b96d63191367e60900ca5c82ae7deb5329c3eeb1cf2b898ca38e14d307f4f91703dcde53b753e85c841610070b9f2f382
-EBUILD dolphin-9999.ebuild 4103 BLAKE2B 9320f4654e103c73b3588f53464e48e88f5058a21cb1456f4573de486fc3e77248f67202c536f94b4182575fc8fa23d6f24cc64624157c692e1e9bd2efe6ef35 SHA512 4b3419c5db0e73410f88d61c9b7e2df335b349887c93879d2c823ca8ec3920d2a20d6fc4902a87bc13e02cfda1c7ddd618f569d7deb11d9013e5cd88b37d2aee
+EBUILD dolphin-9999.ebuild 4238 BLAKE2B 9520643739ca295e5f4aaa2e02182de8382f485330c5b3ae733599b2cb0f1f8f6f0df7501b4ec79ee20227d835eea9762edbad03352c2b964684a7d3236e77f3 SHA512 ef5c0c081c8f55c38aa22b831f42aed57bf22e2e0e37a68cf9c710a0bb2129aa69e0bf20e899a92a753ec707fd568f4304aa4df2f74beb6c3758d034b49e24f1
 MISC metadata.xml 825 BLAKE2B 47bce78aa687f194ff5fb0252f3cdaf76336ab5460cdf72ddaa2913f36dd69aa916cbfc7684ae276248e14d092d8107ab67c7d8c37b71bfca15778b171d725f2 SHA512 33a3c378f2ed7fd25a155b29a03dd3b87730e9c910e7b2d35148a7f6eafbb75e96eab0a0f9608a9ae34e1aa2ccb5d6cc849d895cd28912c88193640a8ac5a6b5
diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild
index 9645554b04fb..55392d47b0fd 100644
--- a/games-emulation/dolphin/dolphin-9999.ebuild
+++ b/games-emulation/dolphin/dolphin-9999.ebuild
@@ -61,7 +61,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	app-arch/zip
-	dev-util/vulkan-headers
 	media-libs/freetype
 	sys-devel/gettext
 	virtual/pkgconfig"
@@ -79,6 +78,12 @@ src_prepare() {
 	local KEEP_SOURCES=(
 		Bochs_disasm
 		FreeSurround
+
+		# vulkan's API is not backwards-compatible:
+		# new release dropped VK_PRESENT_MODE_RANGE_SIZE_KHR
+		# but dolphin still relies on it, bug #729832
+		Vulkan
+
 		cpp-optparse
 		# no support for for using system library
 		glslang
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 984fb578ed8b..d4d7ea69862e 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/fortune-mod-mormon/Manifest b/games-misc/fortune-mod-mormon/Manifest
index 914f72358ec8..e08a34b9ebca 100644
--- a/games-misc/fortune-mod-mormon/Manifest
+++ b/games-misc/fortune-mod-mormon/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-mod-mormon-1.1.0.tar.bz2 4750745 BLAKE2B 82fb85e6b78368e2c4541a8af5de7e5e1b4f01b222095fa662395b7f4bf0e3fa041cf3039ba265b572c4242a4531f5902805a8d3aa329170efb043a94df4d602 SHA512 4684e63b1eb2b1fdb2fbe7241f971c9401777a8364333394db0929aca2ee57456ba30bd601df8d2a8077ad41c1aa71737e20806b79e8541d5dd942092be02d4f
-EBUILD fortune-mod-mormon-1.1.0.ebuild 723 BLAKE2B 3dc5232d77a595c65f7dcd0f5f78db75200c0a55b53f49976ca9607d26e53b59e7906b0a441b8fc9bae55216f339ff9281665995f0cbecbaad35e047c1f7ff8f SHA512 b0c34cb7bd63c2b0981a621e44110d99fbfad1f9e23041436a9053864c406209ac39dda7f2e10669a32f1b415b8afadd72e8aac35369bdf0a061d72b8dd7dcee
+EBUILD fortune-mod-mormon-1.1.0.ebuild 724 BLAKE2B 7684edbc05411f6214c649e5b4e88ab4167e2114411d0a0474458f4cd4857f34a8c6efad12495b789ccd92bdaaaf8651beb70102d77129e9eef987829acd97df SHA512 96ab3d2b33cb9d0b4ebd021a722cd2e5340aef5825e6cd6e4430b38ef6992ad262bf3e4bfc963b01a1330cff2df79356ab0e953a0aaa395500f470e79a6d8740
 MISC metadata.xml 434 BLAKE2B 0585865a2419c0913cfac7f40e0f233e289b436f3dd2943c477547dd66f7f777a5302abc144aef28935cd6f9b6c6e3c6209f3d124cbedf1830a11fbed20611b7 SHA512 4ac23fd0a13784c1c142bad8d7d0d32ddd8923bde4925fe1154d1622e667ed57f36dade59d3efce4a58d5db3ef17d1aa6cafbf151e840b9aef6ec22dd64c6a21
diff --git a/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild b/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild
index 2762f733657e..fd0add976e98 100644
--- a/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild
+++ b/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 
 DESCRIPTION="Fortune modules from the LDS scriptures (KJV Bible, Book of Mormon, D&C, PGP)"
-HOMEPAGE="http://scriptures.nephi.org/"
+HOMEPAGE="https://scriptures.nephi.org/"
 SRC_URI="mirror://sourceforge/mormon/${P}.tar.bz2"
 
 LICENSE="public-domain"
diff --git a/games-misc/fortune-mod-scriptures/Manifest b/games-misc/fortune-mod-scriptures/Manifest
index 28095ac96214..ddaa7e7f39ac 100644
--- a/games-misc/fortune-mod-scriptures/Manifest
+++ b/games-misc/fortune-mod-scriptures/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-mod-scriptures-1.1.0.tar.bz2 2621853 BLAKE2B ac1ff1f4e5fea8e46d065a421c11303bc640fc01d4712c26b47655360a1e816fb451ee8447b6875f384afcafb76ff0ab0978769a7cda205ab66c58a67439d504 SHA512 dc9c98c3f7924c9a1775955a8d1f972035cea27a7505bf51aac9c1ffa323e1447287ec50472f3caca16f31f1a2d2cdc1a17b5b311eb8e5a9746124b19a1d4c67
-EBUILD fortune-mod-scriptures-1.1.0.ebuild 545 BLAKE2B ef5070ac02a62aa074ccda3f45d93859512c0a9f25a369ce4dd0b8ff21cfe981c743db9210b0cea357cf95e329a60329d3c9bf37f9b02c3f075f8d7169cdf1b8 SHA512 cab241e60f8e0556c6c93ded7dd7ce99e4b1624bfacbe3cde64fae420966ea524c928a49ebc4835614f53bf855b17222d6adf2c86a5452079c69d25ef71cdfcf
+EBUILD fortune-mod-scriptures-1.1.0.ebuild 546 BLAKE2B adb034f5b6e057c4249be74bad1cdbf3e37760f03eaf8b857da3d0f2e4c035de28f443ed35953351c4f40d38d7304e87361f5f419576b09292002e850cb456f3 SHA512 8f6c66d0e6de4eafa30be34e356a16f3099f4ad21690e9a15584e18c2e5c740fd508331ea57db5b8c3fb2abffa7de360743657d9053dac49b5bebd4605cf6725
 MISC metadata.xml 434 BLAKE2B 0585865a2419c0913cfac7f40e0f233e289b436f3dd2943c477547dd66f7f777a5302abc144aef28935cd6f9b6c6e3c6209f3d124cbedf1830a11fbed20611b7 SHA512 4ac23fd0a13784c1c142bad8d7d0d32ddd8923bde4925fe1154d1622e667ed57f36dade59d3efce4a58d5db3ef17d1aa6cafbf151e840b9aef6ec22dd64c6a21
diff --git a/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild b/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild
index 4a96e439b6ee..9ccd00556484 100644
--- a/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild
+++ b/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 
 DESCRIPTION="Fortune modules from the King James Bible scriptures"
-HOMEPAGE="http://scriptures.nephi.org/"
+HOMEPAGE="https://scriptures.nephi.org/"
 SRC_URI="mirror://sourceforge/mormon/${P}.tar.bz2"
 
 LICENSE="public-domain"
diff --git a/games-misc/usolitaire/Manifest b/games-misc/usolitaire/Manifest
new file mode 100644
index 000000000000..cfef8b2b0a37
--- /dev/null
+++ b/games-misc/usolitaire/Manifest
@@ -0,0 +1,3 @@
+DIST usolitaire-0.2.1.tar.gz 118199 BLAKE2B 99b828d8aeb91897f5d070250a20c1a5f9b49b3be889781dcc3f2348e8f4946fde3ad07d915d87cbd309b2fa6b87777ab8ecd1bfaf65d76bc6989e36a0263785 SHA512 5bd7b222643e2decfc6e1f7749b8632bb0b99f5af28d49088f28746b8ffbd07443855b557e969f40f427ca71f8d2ac9386d8d90c2121880eb8bce5e3b5d4f4f4
+EBUILD usolitaire-0.2.1.ebuild 511 BLAKE2B a5213cdf1ad2c38b69342bd619dc0b8b00ec01e01a99614219a19a5eb535c5791df51962009d15eb2e52505f9e6d0174d09dfa8c285485d67c72fae24c5d67d6 SHA512 617959cf7a3276c702c7914ce30564c3f52262f4bdb59b0a8ca6592dc756565290d9dbd3f5917ea77b811c10ae9cb04a175a8b6c81102b9ad03aa143c9df34ae
+MISC metadata.xml 413 BLAKE2B 0376b5f01922a8bd36d48d3525c9fdd1659ff1a936a7fda8fe0af3ce7ff669b603d80e560bb02bf690cf77f5fc6ddd830c1cf4d76942fee38e6fa3e6c539c861 SHA512 88efad0cf6e816ef512ca7d821cba3bcfdb3c81f2e54d26458a139a876631703f2a147077b077ab7c1dca74fd05a58a8b003db14625175bd3fb9e9545f6c103b
diff --git a/games-misc/usolitaire/metadata.xml b/games-misc/usolitaire/metadata.xml
new file mode 100644
index 000000000000..b09023bbc390
--- /dev/null
+++ b/games-misc/usolitaire/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>monsieurp@gentoo.org</email>
+        <name>Patrice Clement</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>shell-tools@gentoo.org</email>
+        <name>Gentoo Shell Tools Project</name>
+    </maintainer>
+</pkgmetadata>
diff --git a/games-misc/usolitaire/usolitaire-0.2.1.ebuild b/games-misc/usolitaire/usolitaire-0.2.1.ebuild
new file mode 100644
index 000000000000..84f9ac2b0bbd
--- /dev/null
+++ b/games-misc/usolitaire/usolitaire-0.2.1.ebuild
@@ -0,0 +1,23 @@
+# 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="solitaire in your terminal"
+HOMEPAGE="https://github.com/eliasdorneles/usolitaire"
+SRC_URI="https://github.com/eliasdorneles/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/urwid[${PYTHON_USEDEP}]"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index f590ae7a8bcb..47c5adc215dc 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/anagramarama/Manifest b/games-puzzle/anagramarama/Manifest
index 251355711db0..4eda88461f6b 100644
--- a/games-puzzle/anagramarama/Manifest
+++ b/games-puzzle/anagramarama/Manifest
@@ -1,4 +1,5 @@
-AUX anagramarama-0.2-gentoo.patch 918 BLAKE2B da8f286fd932f9bf8f8b00541565ea11f60e3d13581a46b86c4b9cb0572fbaa821b672554b3448da026ad15e97c87e39766fcba8ab4ece464cf605cbbb582712 SHA512 d87759b401efc4bb51dcf7f121548038b736d89b026cfc9fb82e467c131dae10cc933dd0aa2ec668c3636d93cb37bb8b6325691ed46366b7668605d8921308ab
+AUX anagramarama-0.2-fhs.patch 3247 BLAKE2B 0d80f5bb60ad7a92c229a2446ecdefe386afea162b09495f777a61c81acc852f07341115ac24e1fbb73919baed3ca0ed5192e38e5df47e6f1e675e1ed34091a9 SHA512 bda05fbdc7bc4449c98cad198f04595613ecb9d462015b58ba358548e0b1a7c1b80b9632252fa4d2f977c4ed4e37d88bfebc45b6c0d83b50a30e2eef34963172
+AUX anagramarama-0.2-gentoo.patch 1043 BLAKE2B a71b7c6fdeaa10146a8b6e924e8bfb5d3f7e87a9c2d71959e49c4c2e10e68d8c8dd6c040debe8581bc44d58f2240ed257cfd727ff19b69c769849fce868a0759 SHA512 2c679972b82fe054118e938392069284738f5a71e11a4dc0e4cf33f06beba0c39b503563ca346d1084155b18d28e85689193c085522194d2e6e4b47508cbb844
 DIST anagramarama-0.2.tar.gz 861484 BLAKE2B 9fb6b759b9d2f7a797e8ecf214c8723676577b8a7a88049da7b59a1e4287363c3ac58ee203033e7d7cad777d175599433fffc37fe824da4ca5511e85918b6ae8 SHA512 7cdafaf489100c184a71859f50b64fe8534210d953c4144d822727815ae2f7dd12302447b159039d95c9b3097711ab14931538789ac81c01233cc2c767291603
-EBUILD anagramarama-0.2-r1.ebuild 981 BLAKE2B c9684174378d228f6c147cd4677cb15c680073988797472fbde1f98b3fb624e4b31d0976b068948c8c32c37277ff1a2c46e814c1f8eb5762ca4db63430040398 SHA512 fbe12367b60218d971a180506d29b077aa7d8561874ff067b0b49570a81aea8fce7c0b199d7e684feb83dd7268e7b0603e7e2d70f43bba111ff5155349e4726a
+EBUILD anagramarama-0.2-r1.ebuild 905 BLAKE2B 42753d712ad5a1a44353062c83a8427f3535c2c08deba7248f80b7138e5f9311b30cb77ebe77dd98451e726290b542ae3958b5fcd15e3f8216842851ecd12036 SHA512 4f26ae77bf119530cbe7f09ef192d97da04e29d5a91a8a97c5da01a8618acf5f2e81264a82905787e0de6fc43062653e9eac2d1a334248c486b8418642ed392b
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/anagramarama/anagramarama-0.2-r1.ebuild b/games-puzzle/anagramarama/anagramarama-0.2-r1.ebuild
index 4e1bc1d0b0b2..2fb8281f6204 100644
--- a/games-puzzle/anagramarama/anagramarama-0.2-r1.ebuild
+++ b/games-puzzle/anagramarama/anagramarama-0.2-r1.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=6
-inherit desktop vcs-clean
+EAPI=7
+
+inherit desktop toolchain-funcs vcs-clean
 
 DESCRIPTION="Create as many words as you can before the time runs out"
 HOMEPAGE="http://www.coralquest.com/anagramarama/"
@@ -11,34 +12,39 @@ SRC_URI="http://www.omega.clara.net/anagramarama/dist/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND=">=media-libs/libsdl-1.2
+DEPEND="
+	>=media-libs/libsdl-1.2
 	>=media-libs/sdl-mixer-1.2
 	>=media-libs/sdl-image-1.2"
 RDEPEND="${DEPEND}
-	sys-apps/miscfiles
-"
+	sys-apps/miscfiles"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${PN}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fhs.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
 src_prepare() {
 	default
 	ecvs_clean
-	sed -i \
-		-e "s:wordlist.txt:/usr/share/${PN}/wordlist.txt:" \
-		-e "s:audio/:/usr/share/${PN}/audio/:" \
-		-e "s:images/:/usr/share/${PN}/images/:" \
-		src/{ag.c,dlb.c} \
-		|| die "sed failed"
-	eapply "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_configure() {
+	tc-export CC PKG_CONFIG
 }
 
 src_install() {
 	newbin ag ${PN}
+
 	insinto "/usr/share/${PN}"
 	doins wordlist.txt
 	doins -r images/ audio/
+
 	dodoc readme
+
 	make_desktop_entry ${PN} "Anagramarama"
 }
diff --git a/games-puzzle/anagramarama/files/anagramarama-0.2-fhs.patch b/games-puzzle/anagramarama/files/anagramarama-0.2-fhs.patch
new file mode 100644
index 000000000000..f30e3450b958
--- /dev/null
+++ b/games-puzzle/anagramarama/files/anagramarama-0.2-fhs.patch
@@ -0,0 +1,87 @@
+--- a/src/ag.c
++++ b/src/ag.c
+@@ -184,15 +184,15 @@
+ ***********************************************************/
+ void bufferSounds(struct sound** soundCache){
+ 
+-	pushSound(&(*soundCache),"click-answer", "audio/click-answer.wav");
+-	pushSound(&(*soundCache),"click-shuffle", "audio/click-shuffle.wav");
+-	pushSound(&(*soundCache),"foundbig", "audio/foundbig.wav");
+-	pushSound(&(*soundCache),"found", "audio/found.wav");
+-	pushSound(&(*soundCache),"clear", "audio/clearword.wav");
+-	pushSound(&(*soundCache),"duplicate", "audio/duplicate.wav");
+-	pushSound(&(*soundCache),"badword", "audio/badword.wav");
+-	pushSound(&(*soundCache),"shuffle", "audio/shuffle.wav");
+-	pushSound(&(*soundCache),"clock-tick", "audio/clock-tick.wav");
++	pushSound(&(*soundCache),"click-answer", "/usr/share/anagramarama/audio/click-answer.wav");
++	pushSound(&(*soundCache),"click-shuffle", "/usr/share/anagramarama/audio/click-shuffle.wav");
++	pushSound(&(*soundCache),"foundbig", "/usr/share/anagramarama/audio/foundbig.wav");
++	pushSound(&(*soundCache),"found", "/usr/share/anagramarama/audio/found.wav");
++	pushSound(&(*soundCache),"clear", "/usr/share/anagramarama/audio/clearword.wav");
++	pushSound(&(*soundCache),"duplicate", "/usr/share/anagramarama/audio/duplicate.wav");
++	pushSound(&(*soundCache),"badword", "/usr/share/anagramarama/audio/badword.wav");
++	pushSound(&(*soundCache),"shuffle", "/usr/share/anagramarama/audio/shuffle.wav");
++	pushSound(&(*soundCache),"clock-tick", "/usr/share/anagramarama/audio/clock-tick.wav");
+ 
+ }
+ 
+@@ -982,7 +982,7 @@
+ int done = 0;
+ 
+ 	filelocation = rand()%10000;
+-	wordlist=fopen("wordlist.txt","r");
++	wordlist=fopen("/usr/share/anagramarama/wordlist.txt","r");
+ 
+ 	for (i=0;i<=filelocation;i++){
+ 
+@@ -992,7 +992,7 @@
+ 		else{
+ 			// go back to the start of the file
+ 			fclose(wordlist);
+-			fopen("wordlist.txt", "r");
++			fopen("/usr/share/anagramarama/wordlist.txt", "r");
+ 		}
+ 	}
+ 
+@@ -1011,7 +1011,7 @@
+ 			else{
+ 				// go back to the start of the file
+ 				fclose(wordlist);
+-				fopen("wordlist.txt", "r");
++				fopen("/usr/share/anagramarama/wordlist.txt", "r");
+ 				fscanf(wordlist, "%s", wordFromList);
+ 			}
+ 		}
+@@ -1485,7 +1485,7 @@
+ int i;
+ 
+ 	// show background
+-	ShowBMP("images/background.bmp",screen, 0,0);
++	ShowBMP("/usr/share/anagramarama/images/background.bmp",screen, 0,0);
+ 
+ 	destroyLetters(&(*letters));
+ 
+@@ -1760,9 +1760,9 @@
+ 	createDLBTree(&dlbHead);
+ 
+ 	// cache in-game graphics
+-	letterBank = SDL_LoadBMP("images/letterBank.bmp");
+-	smallLetterBank = SDL_LoadBMP("images/smallLetterBank.bmp");
+-	numberBank = SDL_LoadBMP("images/numberBank.bmp");
++	letterBank = SDL_LoadBMP("/usr/share/anagramarama/images/letterBank.bmp");
++	smallLetterBank = SDL_LoadBMP("/usr/share/anagramarama/images/smallLetterBank.bmp");
++	numberBank = SDL_LoadBMP("/usr/share/anagramarama/images/numberBank.bmp");
+ 
+ 	rootWord = malloc(sizeof(char)*9);
+ 	newGame(&head, dlbHead, screen, &letters);
+--- a/src/dlb.c
++++ b/src/dlb.c
+@@ -100,7 +100,7 @@
+ 	//printf("createDLBTree\n");
+ 
+ 	// open wordlist file
+-	wordlist = fopen("wordlist.txt", "r");
++	wordlist = fopen("/usr/share/anagramarama/wordlist.txt", "r");
+ 
+ 	// get each word from the list
+ 	while (fscanf(wordlist, "%s", wordFromList) != EOF){
diff --git a/games-puzzle/anagramarama/files/anagramarama-0.2-gentoo.patch b/games-puzzle/anagramarama/files/anagramarama-0.2-gentoo.patch
index fb60615055db..77ef37bd4046 100644
--- a/games-puzzle/anagramarama/files/anagramarama-0.2-gentoo.patch
+++ b/games-puzzle/anagramarama/files/anagramarama-0.2-gentoo.patch
@@ -1,34 +1,40 @@
---- a/makefile.old	2009-02-08 18:24:33.000000000 +0100
-+++ b/makefile	2009-02-08 18:29:12.000000000 +0100
-@@ -1,5 +1,4 @@
+--- a/makefile
++++ b/makefile
+@@ -1,6 +1,13 @@
 -LFLAGS=-Wall -funroll-loops -fomit-frame-pointer -pipe -O9
 -CFLAGS=-Wall `sdl-config --cflags --libs` -funroll-loops -fomit-frame-pointer -pipe -O9 -lSDL_mixer
-+LDLIBS=`sdl-config --cflags --libs` -lSDL_mixer
- CC=gcc
+-CC=gcc
++PKG_CONFIG ?= pkg-config
++
++SDL_CFLAGS = `$(PKG_CONFIG) --cflags sdl`
++SDL_LIBS = `$(PKG_CONFIG) --libs sdl`
++
++SDL_MIXER_CFLAGS = `$(PKG_CONFIG) --cflags SDL_mixer`
++SDL_MIXER_LIBS = `$(PKG_CONFIG) --libs SDL_mixer`
++
++LDLIBS=$(SDL_LIBS) $(SDL_MIXER_LIBS)
++CPPFLAGS+=$(SDL_CFLAGS) $(SDL_MIXER_CFLAGS)
  
  C_FILES=src/dlb.c src/linked.c src/sprite.c src/ag.c
-@@ -9,19 +8,19 @@
+ OBJ_FILES=src/dlb.o src/linked.o src/sprite.o src/ag.o
+@@ -9,19 +16,7 @@
  all:ag
  
  ag: $(OBJ_FILES)
 -	$(CC) $(CFLAGS) -o $(OUT_FILE) $(OBJ_FILES)
-+	$(CC) $(LDFLAGS) -o $(OUT_FILE) $(OBJ_FILES) $(LDLIBS)
- 
- src/dlb.o: src/dlb.c
+-
+-src/dlb.o: src/dlb.c
 -	$(CC) $(LFLAGS) -c -o $@ $^
-+	$(CC) $(CFLAGS) -c -o $@ $^
- 
- src/linked.o: src/linked.c
+-
+-src/linked.o: src/linked.c
 -	$(CC) $(LFLAGS) -c -o $@ $^
-+	$(CC) $(CFLAGS) -c -o $@ $^
- 	
- src/sprite.o: src/sprite.c
+-	
+-src/sprite.o: src/sprite.c
 -	$(CC) $(LFLAGS) -c -o $@ $^
-+	$(CC) $(CFLAGS) -c -o $@ $^
- 
- src/ag.o: src/ag.c
+-
+-src/ag.o: src/ag.c
 -	$(CC) $(LFLAGS) -c -o $@ $^
-+	$(CC) $(CFLAGS) -c -o $@ $^
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $(OUT_FILE) $(OBJ_FILES) $(LDLIBS)
  
  clean:
  	rm -f src/*.o
diff --git a/games-puzzle/mures/Manifest b/games-puzzle/mures/Manifest
index 99ec18b21954..23974a94b28c 100644
--- a/games-puzzle/mures/Manifest
+++ b/games-puzzle/mures/Manifest
@@ -1,5 +1,6 @@
+AUX mures-0.5-fix-fno-common.patch 2310 BLAKE2B 7ea4cd8bc666c8983a608f660282d5ec50f56016ed4bdb471a9d07209bcb7e136693ca5daace566b7217ff1a2fdacf085fe09e00c196a8c71caeefd399a4e4cf SHA512 8aa7cf142609f41102f31aa5d629e6da55bb18aec067af650058b838551b7e2903a9b7ace7dd452f6929f6b89f670e17afb05ac5a0af812cae28078dd6e6e889
 AUX mures-0.5-save.patch 654 BLAKE2B 57992955c9bb850ec7f13c50039eaa02d81540abbe94dba7cc0d034d5dab3c0f63d82fcdeb666efc664494e39f47c152f84efebaa1b3c2a108b55ff5c960dacc SHA512 b1762660ecd5cd373d39957003a0e455c3f981886191955eca2ccdd54d6ce2a302f6eaed3d022ac5acd64cabed364a6c1dc6cbdf53e0fd32208ce3d12db0a187
-AUX mures-0.5-underlink.patch 300 BLAKE2B f20a6a2e2e82e0f16a9ed8f49d2cf4071d4f19c2149f12b98572e0e4a8e42e04556d02bd93675f5805dae96a496ea4586ce064ea2f33c33586a24afecab889ce SHA512 ffbd6e23fab8fff7ccb191c1fcc4f405b2c5cc6cffaa388eca11185244a5328d16b8f3301ce1dd29ba036637e281e55b08ac39c039ff187cac35f01f078ced21
+AUX mures-0.5-underlink.patch 382 BLAKE2B bd7a9cbf3225b9579a8f618f0c1eb3b2a2fdda37d8fe69c615af71bc084fea3d07f6b5a6c8e48148dc890c6075438573c3c70aa0ed9d7b5b6a9f67756fdac176 SHA512 9eb4dc66ad72ee3b9b7169b6d6f1922bfdca78cda5594c70f8a82231c096bbfea509cfa0d32881ee295b426fc3669dc5bdf8c44b203d8402d15464c6bbdac5c8
 DIST mures-0.5.tar.gz 638528 BLAKE2B 35861cbc0497091c716664a6a1d38884a64981f6228637cbeb93b4be64c42bf84b8033c2f5d95f197c26436fbf621ff8322ffb5aa3dc241b50372e94a395599b SHA512 907b22adffcc0457d866da27bd11d61663c6a1eed1c0aa4b437f8e341065df86f2ab06851619e2fa4088aa0b2becaf9376bad693c83345f8d1ee862c31740eff
-EBUILD mures-0.5-r1.ebuild 2079 BLAKE2B 9fded27b1529d579f3dd27673472396507f14061ea14f43c2d1997cc059241e432fd63bbdfc4bf9aefd597499f50f5069fd46072eb48b3879f48a193129414d7 SHA512 7bcaf4b664fe92b1ec3b4f5da68875daf5f6c0c64705ace569b082a6a8b6a6ed4c5609a2b3c9c7993d7b5efbcd4e56ba6b48b1b6843fec94f48466075cdac049
+EBUILD mures-0.5-r1.ebuild 2160 BLAKE2B 4b135fca198a1f1765eeeae334211c307e52016866f8969be5f0572c5396b4c344d0c2feeecb245edc7f723212af242fe3717aa543a98171a1aad568e474311c SHA512 3f1d1c0d98fb60ecfc617170be76f31a9247dda73dbb7a77d60cd50e4c59fd93d5ad01c6fde61ae26e51f435e33cb85ba85d4c0475ec4960e19e4ca0ccff77c3
 MISC metadata.xml 328 BLAKE2B 10dbb393d6e09fe667ad28913d38f785c0d8d51da581bbc2fe2d19c18faea716bc901097829cc4927b6d3d0265ecd53e62635461f6bb3619cba1540b7b033c66 SHA512 f6818639d9ff510efe1dc98505eb03086d46024def2a1b5fef5273181e6eef91135ef4e7902613776da51a951c50373b5cc80848a9887d3919f7adfd9ef40f18
diff --git a/games-puzzle/mures/files/mures-0.5-fix-fno-common.patch b/games-puzzle/mures/files/mures-0.5-fix-fno-common.patch
new file mode 100644
index 000000000000..b07be91c0175
--- /dev/null
+++ b/games-puzzle/mures/files/mures-0.5-fix-fno-common.patch
@@ -0,0 +1,114 @@
+--- a/src/client.c
++++ b/src/client.c
+@@ -37,7 +37,7 @@
+ 
+ int client_initialized = 0;
+ UDPsocket local_socket = NULL;
+-UDPpacket *packet;
++extern UDPpacket *packet;
+ 
+ #define PACKET_POOL_SIZE 20
+ 
+--- a/src/game_output.c
++++ b/src/game_output.c
+@@ -31,6 +31,11 @@
+ #include "go_sdl.h"
+ #include "go_gl.h"
+ 
++void (*game_output_handle_event)(game *g, int event, float x, float y, direction dir);
++void (*game_output_refresh)(game *g, SDL_Surface *out);
++void (*game_output_bigchange)(game *g);
++void (*game_output_exit)(game *g);
++
+ void game_output_init(game *g, int type)
+ {
+   switch(type) {
+--- a/src/game_output.h
++++ b/src/game_output.h
+@@ -38,10 +38,10 @@
+   GL
+ };
+ 
+-void (*game_output_handle_event)(game *g, int event, float x, float y, direction dir);
+-void (*game_output_refresh)(game *g, SDL_Surface *out);
+-void (*game_output_bigchange)(game *g);
+-void (*game_output_exit)(game *g);
++extern void (*game_output_handle_event)(game *g, int event, float x, float y, direction dir);
++extern void (*game_output_refresh)(game *g, SDL_Surface *out);
++extern void (*game_output_bigchange)(game *g);
++extern void (*game_output_exit)(game *g);
+ 
+ void game_output_init(game *g, int type);
+ 
+--- a/src/gi_sdl.c
++++ b/src/gi_sdl.c
+@@ -60,6 +60,7 @@
+ #define GI (*(gi_sdl_data*)g->input)
+ 
+ SDL_Joystick *js;
++gi_sdl_settings ks;
+ 
+ int gi_sdl_player_exists(game *g, int p)
+ {
+--- a/src/gi_sdl.h
++++ b/src/gi_sdl.h
+@@ -88,7 +88,7 @@
+   int joy_y[MAX_JOY];
+ } gi_sdl_settings;  
+ 
+-gi_sdl_settings ks;
++extern gi_sdl_settings ks;
+ 
+ int gi_sdl_player_exists(game *g, int p);
+ grid_int_position gi_sdl_player_grid_pos(game *g, int p);
+--- a/src/gui.h
++++ b/src/gui.h
+@@ -47,6 +47,6 @@
+ void gui_remove_object(int i);
+ void gui_clear();
+ 
+-int factor_h, factor_w;
++extern int factor_h, factor_w;
+ 
+ #endif
+--- a/src/lua.c
++++ b/src/lua.c
+@@ -22,6 +22,7 @@
+ }
+ */
+ 
++lua_State *L;
+ 
+ static int lua_write(lua_State *L)
+ {
+--- a/src/lua.h
++++ b/src/lua.h
+@@ -4,7 +4,7 @@
+ #include "lua/lua.h"
+ 
+ 
+-lua_State *L;
++extern lua_State *L;
+ 
+ int lua_init();
+ void lua_exit();
+--- a/src/main.c
++++ b/src/main.c
+@@ -44,6 +44,7 @@
+ #include "lua.h"
+ 
+ root_type root;
++int opengl;
+ 
+ void root_quit()
+ {
+--- a/src/main.h
++++ b/src/main.h
+@@ -44,6 +44,6 @@
+ 
+ void root_quit();
+ 
+-int opengl;
++extern int opengl;
+ 
+ #endif
diff --git a/games-puzzle/mures/files/mures-0.5-underlink.patch b/games-puzzle/mures/files/mures-0.5-underlink.patch
index 3acf0b0f7233..614a2880cf3b 100644
--- a/games-puzzle/mures/files/mures-0.5-underlink.patch
+++ b/games-puzzle/mures/files/mures-0.5-underlink.patch
@@ -1,5 +1,15 @@
---- a/src/Makefile.am.old	2011-06-21 14:39:14.404333493 +0200
-+++ b/src/Makefile.am	2011-06-21 14:39:30.538340283 +0200
+--- a/configure.in
++++ b/configure.in
+@@ -7,6 +7,7 @@
+ AC_PROG_MAKE_SET
+ AC_PROG_CC
+ AC_PROG_RANLIB
++AM_PROG_AR
+ AC_PROG_INSTALL
+ 
+ dnl Checks for libraries.
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -1,8 +1,8 @@
  bin_PROGRAMS = mures
  
diff --git a/games-puzzle/mures/mures-0.5-r1.ebuild b/games-puzzle/mures/mures-0.5-r1.ebuild
index 36b51630c7e7..6a16b35658b0 100644
--- a/games-puzzle/mures/mures-0.5-r1.ebuild
+++ b/games-puzzle/mures/mures-0.5-r1.ebuild
@@ -1,7 +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
+EAPI=7
+
 inherit autotools desktop
 
 DESCRIPTION="A clone of Sega's Chu Chu Rocket"
@@ -13,12 +14,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="opengl"
 
-DEPEND="media-libs/libsdl
+DEPEND="
+	media-libs/libsdl
 	media-libs/sdl-image
 	media-libs/sdl-net
 	media-libs/sdl-ttf
-	opengl? ( virtual/opengl )
-"
+	opengl? ( virtual/opengl )"
 RDEPEND="${DEPEND}"
 
 dir="/usr/share/${PN}"
@@ -39,12 +40,14 @@ src_prepare() {
 		src/maps/battle/Makefile.am \
 		|| die "sed failed"
 
+	# GCC 10 / -fno-common
+	eapply "${FILESDIR}"/${P}-fix-fno-common.patch
 	eapply "${FILESDIR}"/${P}-underlink.patch
 
-	mv configure.in configure.ac
+	mv configure.{in,ac} || die
 	eautoreconf
 
-	cd src
+	cd src || die
 
 	# Save to HOME
 	eapply "${FILESDIR}"/${P}-save.patch
@@ -81,10 +84,14 @@ src_prepare() {
 src_install() {
 	# Remove makefiles before installation
 	rm -f src/*/Makefile* src/*/*/Makefile* || die "removing makefiles"
+
+	dobin src/mures
+
 	insinto "${dir}"
 	doins -r src/{gui,images,sounds,textures,maps,*.lua}
+
 	einstalldocs
-	dobin src/mures
+
 	newicon src/images/cat_right.png ${PN}.png
 	make_desktop_entry ${PN} "Mures"
 }
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index d90d9151a236..070ccd7bc6a1 100644
--- a/games-roguelike/Manifest.gz
+++ b/games-roguelike/Manifest.gz
diff --git a/games-roguelike/dwarf-fortress/Manifest b/games-roguelike/dwarf-fortress/Manifest
index 99ea9b6bfc90..88bd0e04287a 100644
--- a/games-roguelike/dwarf-fortress/Manifest
+++ b/games-roguelike/dwarf-fortress/Manifest
@@ -2,5 +2,5 @@ AUX Makefile.native 1016 BLAKE2B ea40a1f90bf52e52c7cf88e99c73c981c00506eddb4ad9c
 AUX dwarf-fortress 516 BLAKE2B 9d2faffac265e99698fa1c481eec8598fbe66b4ab205b18c76d285cd16fe1b32d3bfa9bc415bceae6e1e350e955ac3b3cebd7d46943a06ff71715fd1cb5402df SHA512 1f1fada35e33cb99c28835d600f6567ecaaf7b2c6111a2e96b1a88c54e5d727f94ae1c0213327bc70a623dbdf19a8433e3c59edcab5a40e898b0124eb2eb9006
 DIST df_44_12_linux.tar.bz2 12081683 BLAKE2B 2410e8da6af6a8ced45d3e95dc06e2d0f4e31dbdcd6b8d9945a761d2278532bb24c1095418aa22639eedded256b3d485fa128984e6282a491d4dc7bd9af8671b SHA512 03cd7f6800d44873b573cc5bffb12c7a246c3aba0ee8535001372df689a5179dc02592670fd87f2fd5de82421605f34152f6241307c8f7b9fb4d7b8704aed70c
 DIST df_44_12_linux32.tar.bz2 12686340 BLAKE2B bf1e1370930d91d2c9e72d3366bc79706092d1505853eb63c6160fea39822551d3276958ac6d2916b8f7825be0c054a037219210f0c2c18a731065a2dd1bb842 SHA512 5cd352acf310592c7e30442205b7fe590f421c5e3562959dcfd32a17d3d562347c2b32e3bc5835637c5550ce2c696c17b6dc910ee4cf766be07af306e83537db
-EBUILD dwarf-fortress-0.44.12.ebuild 2340 BLAKE2B 7a7f1e620345917ec3f3bd50718ac70c3542dcfa1efa68dc6af4e258bda1c89103265fdd5906507297a807504f03502260a8f5a49fd130c7d9ee6a139b415a11 SHA512 dea3a21f4b69854a6ef8eaf5fd7688c67595a8b4bebef745c85ae8a32786fd37200723113b644b87da1af16ecbba91b25af768519ba719ec24ee4181a2d24526
+EBUILD dwarf-fortress-0.44.12.ebuild 2343 BLAKE2B 0eb61350aad85953aacb00e1ee9503a765d1bd45e276229dcb6174549efc6070b9cf13884bf9dae51da2724a968bd5c4509231c81d1523457a0dc155e61312c9 SHA512 8fee92a9c804fb04ed8adccb4691ffc9185a6739ced24ff171f6b78a9da666fde980fcd5adda1184e3d0b8156d525968f503542a89fff38e4fe63f323564f4f9
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.12.ebuild b/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.12.ebuild
index 1407c994deae..dfcfe78cf3cf 100644
--- a/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.12.ebuild
+++ b/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.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
@@ -10,9 +10,9 @@ MY_PN=df
 MY_P=${MY_PN}_${MY_PV}
 
 DESCRIPTION="A single-player fantasy game"
-HOMEPAGE="http://www.bay12games.com/dwarves"
-SRC_URI="amd64? ( http://www.bay12games.com/dwarves/${MY_P}_linux.tar.bz2 )
-	x86? ( http://www.bay12games.com/dwarves/${MY_P}_linux32.tar.bz2 )"
+HOMEPAGE="https://www.bay12games.com/dwarves"
+SRC_URI="amd64? ( https://www.bay12games.com/dwarves/${MY_P}_linux.tar.bz2 )
+	x86? ( https://www.bay12games.com/dwarves/${MY_P}_linux32.tar.bz2 )"
 
 LICENSE="free-noncomm BSD BitstreamVera"
 SLOT="0"
diff --git a/games-roguelike/wrogue/Manifest b/games-roguelike/wrogue/Manifest
index b2e0547f6179..c7f991fbea5f 100644
--- a/games-roguelike/wrogue/Manifest
+++ b/games-roguelike/wrogue/Manifest
@@ -1,4 +1,5 @@
-AUX wrogue-0.8.0b-ldflags.patch 677 BLAKE2B df5466af213d598171c5439aacacbe5c1698ea27ce15a19b0e931ed6af644c8e7a3fcac27a255f976e04979558833144159594f9c14df6d77966fbe2cc616aa3 SHA512 7ab086f4ee1f41ef6bad9dcb3e936b17389beadcbfcb451312c57ab1539992198795844264a56a5d9ef3afcc031e46d5b3e97714891723c0fe1185ba15a2d498
+AUX wrogue-0.8.0b-fix-build-system.patch 844 BLAKE2B 2d5a90199a745990f01ca0b65b55e5fee802024ba3c5869b263ab7679fb20442df9c167e0ebb0d1dfe1e63831840eb8154342781a95ffced8ffbb067253e9fde SHA512 8b9ad1cbce1c2e2a156632a4d3e3ae270fe1e30a3195fff82b8b0b4390febfde8f4cc37e6f63c4f9c891d3489b7af4c61769f56cccf718f1200b4c2dcc4435d7
+AUX wrogue-0.8.0b-string-allocation.patch 661 BLAKE2B c716bb56543535debfb18922416779b31d379bb54c7362a0e70a7377e485ebcf4878aae10f956f1a9a8506ccc8b35a6e9208fe0cf424a38ca5238481d62283a0 SHA512 d31544df6b8a92c877b8114d3f73060d99875ba56e176643a27f3b49f993efc85081a03d4eb41b2af9cc2e44094e5f9005e0fe9b8154500519eb7fc7850bd27f
 DIST wrogue-0.8.0b.zip 433553 BLAKE2B 9a634fe3b20497aab3431824e86b5905eeff90d757d15118227f9e2ffd8e5db9e81c12c43140b8dcd4b4a459f4c6b1b76ff54cf3be1d92dbfc8db5ab23a49fe2 SHA512 f8da3ccc26e36723bbf7654023cdd73747c2ffcb45420b77cc66495b596cc82ca9d90a2d239b12ea95c1185b11bad332cf41fe1b278ee34af6ff1479eb6e4d81
-EBUILD wrogue-0.8.0b-r1.ebuild 1019 BLAKE2B 4a8be6cdb1425e65714b2b644dfdc643b65fc6cc5feacbc03bfdbecd104d0a79ef638fff3eef7989391e13a726d9ce0f461dc2b4c128a7bf39409603d802d824 SHA512 456e58aef2c6b2e10ae47a98b082eba1a1cc51adabcedcb1eaa1c46d7207582b009432f911f34285d124789d1c48b62b47137208b9f07e6e9db0a55a78a95ac3
+EBUILD wrogue-0.8.0b-r1.ebuild 810 BLAKE2B 691419c8748d8662bf41059b72e9b0334e91f91bd1981a9b0fdc869bdabc9a417b2fb8a8b87393aaab909e45d898ccf14f5b45aa27a356b3d88c9b71ecf7bda0 SHA512 09bf22de0a73bb735b9e64186ad3342f41f059dfd118a7f8709b6405f5af2c123550dd10c36ca31cf8772b04f3ffcdc92b0d9df15aa5fb68c9d85244f9af8d16
 MISC metadata.xml 508 BLAKE2B 7de11c7aab57d63ea14d970499459d6d9e9293532b5d87766a2e7b4c26716599ae536aa6d4ecb640684ce917c358a5caceeb15703692fc28043a704b372a0960 SHA512 f4e516bfae05e77bc60eacecaba362ee1709b6d787271df4fa302a438ce682725cb22d7f7b81d3531d0bff548774626ce6b14ac4225e73a4057a505750ae214f
diff --git a/games-roguelike/wrogue/files/wrogue-0.8.0b-fix-build-system.patch b/games-roguelike/wrogue/files/wrogue-0.8.0b-fix-build-system.patch
new file mode 100644
index 000000000000..b17ea5c196be
--- /dev/null
+++ b/games-roguelike/wrogue/files/wrogue-0.8.0b-fix-build-system.patch
@@ -0,0 +1,47 @@
+--- a/src/linux.mak
++++ b/src/linux.mak
+@@ -18,8 +18,9 @@
+ #

+ # common compiler/linker flags

+ #

+-CFLAGS=-I./include -I./lib -std=c89 `sdl-config --cflags`

+-LDFLAGS=-lm `sdl-config --libs`

++CFLAGS+=-std=gnu99

++CPPFLAGS+=-Iinclude -Ilib -Iui -Igenerate `sdl-config --cflags`

++LDLIBS+=-lm `sdl-config --libs`

+ 

+ 

+ SRC=\

+@@ -30,7 +31,6 @@
+ OBJ=$(SRC:.c=.o)

+ EXE=./wrogue

+ 

+-CC=gcc

+ RM=rm -f

+ 

+ 

+@@ -39,9 +39,7 @@
+ # target: release 

+ #

+ .PHONY: release

+-release: CFLAGS += -pipe -O2 -fomit-frame-pointer -march=i686

+-release: LDFLAGS += -Wl,-O1

+-release: STRIP_BINARY = yes

++release: STRIP_BINARY = no

+ release: build

+ 

+ 

+@@ -89,12 +87,8 @@
+ 

+ 

+ 

+-%.o: %.c

+-	@echo Building $<

+-	@$(CC) $(CFLAGS) -o $@ -c $<

+-

+ $(EXE): $(OBJ)

+-	@$(CC) $(OBJ) $(LDFLAGS) -o $@

++	$(CC) $(LDFLAGS) $(OBJ) -o $@ $(LDLIBS)

+ 

+ 

+ 

diff --git a/games-roguelike/wrogue/files/wrogue-0.8.0b-ldflags.patch b/games-roguelike/wrogue/files/wrogue-0.8.0b-ldflags.patch
deleted file mode 100644
index d3ec216b4c13..000000000000
--- a/games-roguelike/wrogue/files/wrogue-0.8.0b-ldflags.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/linux.mak	2010-10-14 11:07:22.000000000 +0200
-+++ b/src/linux.mak	2010-10-14 11:08:00.000000000 +0200
-@@ -19,7 +19,7 @@
- # common compiler/linker flags

- #

- CFLAGS=-I./include -I./lib -std=c89 `sdl-config --cflags`

--LDFLAGS=-lm `sdl-config --libs`

-+LDLIBS=-lm `sdl-config --libs`

- 

- 

- SRC=\

-@@ -40,7 +40,7 @@
- #

- .PHONY: release

- release: CFLAGS += -pipe -O2 -fomit-frame-pointer -march=i686

--release: LDFLAGS += -Wl,-O1

-+release: LDLIBS += -Wl,-O1

- release: STRIP_BINARY = yes

- release: build

- 

-@@ -94,7 +94,7 @@
- 	@$(CC) $(CFLAGS) -o $@ -c $<

- 

- $(EXE): $(OBJ)

--	@$(CC) $(OBJ) $(LDFLAGS) -o $@

-+	$(CC) $(LDFLAGS) $(OBJ) $(LDLIBS) -o $@

- 

- 

- 

diff --git a/games-roguelike/wrogue/files/wrogue-0.8.0b-string-allocation.patch b/games-roguelike/wrogue/files/wrogue-0.8.0b-string-allocation.patch
new file mode 100644
index 000000000000..66afe8ea1d7b
--- /dev/null
+++ b/games-roguelike/wrogue/files/wrogue-0.8.0b-string-allocation.patch
@@ -0,0 +1,20 @@
+--- a/src/lib/appdir.c
++++ b/src/lib/appdir.c
+@@ -149,7 +149,7 @@
+         CreateDirectory(UserData, NULL);

+ 

+         /* Determine app data directory */

+-        AppData[0] = '.'; AppData[1] = ADIR_DELIMITER; AppData[2] = '\0';

++        strcpy(AppData, "/usr/share/wrogue/");

+ 

+         /* Initialize internal data */

+         Handle = INVALID_HANDLE_VALUE;

+@@ -558,7 +558,7 @@
+         }

+ 

+         /* Determine app data directory */

+-        AppData[0] = '.'; AppData[1] = ADIR_DELIMITER; AppData[2] = '\0';

++        strcpy(AppData, "/usr/share/wrogue/");

+ 

+         /* Initialize internal data */

+         DirectoryStreamValid = ADIR_FALSE;

diff --git a/games-roguelike/wrogue/wrogue-0.8.0b-r1.ebuild b/games-roguelike/wrogue/wrogue-0.8.0b-r1.ebuild
index 074880df4a8e..f86e97b92362 100644
--- a/games-roguelike/wrogue/wrogue-0.8.0b-r1.ebuild
+++ b/games-roguelike/wrogue/wrogue-0.8.0b-r1.ebuild
@@ -1,44 +1,38 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=7
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Gothic science fantasy roguelike game"
-HOMEPAGE="https://freecode.com/projects/wrogue"
+HOMEPAGE="http://freshmeat.sourceforge.net/projects/wrogue"
 SRC_URI="mirror://gentoo/${P}.zip"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="media-libs/libsdl[video]"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-ldflags.patch
+	"${FILESDIR}"/${P}-fix-build-system.patch
+	"${FILESDIR}"/${P}-string-allocation.patch
 )
 
-src_prepare() {
-	default
-
-	sed -i \
-		-e "/AppData\[0\]/ s:AppData.*:strcpy(AppData, \"/usr/share/${PN}/\");:" \
-		src/lib/appdir.c \
-		|| die "sed failed"
+src_configure() {
+	tc-export CC
 }
 
 src_compile() {
-	local myCPPFLAGS="-std=c99 -Iinclude -Ilib -Iui -Igenerate"
-	local myCFLAGS="$(sdl-config --cflags) ${CFLAGS}"
-	emake -C src -f linux.mak STRIP_BINARY=NO \
-		CFLAGS="${myCPPFLAGS} ${myCFLAGS}" release
+	emake -C src -f linux.mak release
 }
 
 src_install() {
 	dobin ${PN}
+
 	insinto /usr/share/${PN}
 	doins -r data
 	dodoc changes.txt
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index e546fea44b1c..260707cb30a6 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/lgeneral/Manifest b/games-strategy/lgeneral/Manifest
index 2e34028e4957..2445739b32cf 100644
--- a/games-strategy/lgeneral/Manifest
+++ b/games-strategy/lgeneral/Manifest
@@ -1,5 +1,5 @@
 AUX lgeneral-1.4.3-fix-utf8.patch 466 BLAKE2B ccfdc447ddf0eaf24ac56989007277c4e94f48fe69dfb4dc1030a8c80c5764b8dbc84876f539c4fb99703f578c69ac8ba2b49ecf61e69f31d0621d06379feef0 SHA512 abccea722ea34de06832525b5c936c829119327b44421655884fe7f648bab0b9dcea104543dcf1d2a363ceda55bb74edf360b60a30608e50aca865b1c975a02a
 DIST lgeneral-1.4.3.tar.gz 1924730 BLAKE2B a0f3be4a50e384b7f6baddc705825f12fc4298eb3b73ac7164c0eb6330dd3e204ceb4218e88a322aa438b2fba1b6204dedab21e528713889a67a84f6b0cff768 SHA512 09f8e29b8f6c1af593f56f4d4b7c8437bfa4dfc69bfd0dbe158b7add0bc5ff505fe1ed83bbb8daca17ae43e91ae1a47c5efe2c7700a3ea456505a51d293f1101
 DIST pg-data.tar.gz 410454 BLAKE2B 70b325636c43b69b7cdc2f074a0ac49af46db5c60ebeea5ecefaae18169509b05b4c452c34e8b0cd483d3565c54191623ff3eb900f24683252fd8c775ecdf847 SHA512 b0df30dd9a9d0652acd8702d601c489e5d3a030854ceeb173d2daa656c00633a78a3f45814da9f4157b86544dec34eda02495742242653c7cdebba5ec9951516
-EBUILD lgeneral-1.4.3.ebuild 1582 BLAKE2B 7a9141e5b108777bde58cc6e60c86c6eb01c7fe61aac2d881f312d664c5bbda30e2bfcc08f3b9da3eb7f2b79cd4d88c71096d0ae196fda3091bd381c83ee059e SHA512 0125bbc4dae261daf462d3118778f6ad0c26724ecfb46a3fe255e9dd71b30365e8636dd9093a07e0b1714f972569a5122173b917ddba2e726142c40f0a2775cb
+EBUILD lgeneral-1.4.3.ebuild 1632 BLAKE2B e1448e95d55cdc22bd082b6f3f962c470515965b0c82d55ca62f7ba5743c33c16eec212180055cc2c6336cd149b547739d49c49d00f10de70d355f4c1ada822e SHA512 11c031ac2e0e7245c150744f7a29da982a188a0cca42474f858ec7b11932b95f86e42a64d42324652ed2b8e43412cdb60e5450107f2aac0e59a609e95ae56114
 MISC metadata.xml 331 BLAKE2B ed6b281fa54a304ddd752e6bda476635922a0d9be37524a0e988666502279b85c793d455de63929c93e02f5b105367b78bea2eeb004e1a996d558159fe6443e2 SHA512 eef1e23a9d81b81e39f84ba41d70d39bf11f52acad42dc312548239919b7ce359a671f9b76dcdee92be92bc11c798d9031f3a641c13ab6febfe5bd978a4bbeeb
diff --git a/games-strategy/lgeneral/lgeneral-1.4.3.ebuild b/games-strategy/lgeneral/lgeneral-1.4.3.ebuild
index 3d0b24d9ab9e..def5b5f87a24 100644
--- a/games-strategy/lgeneral/lgeneral-1.4.3.ebuild
+++ b/games-strategy/lgeneral/lgeneral-1.4.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop xdg
+inherit desktop toolchain-funcs xdg
 
 DESCRIPTION="A Panzer General clone written in SDL"
 HOMEPAGE="http://lgames.sourceforge.net/LGeneral/"
@@ -53,10 +53,10 @@ src_configure() {
 }
 
 src_compile() {
-	emake
+	emake AR="$(tc-getAR)"
 
 	# Build the temporary lgc-pg:
-	emake -C "${WORKDIR}"/tmp-build
+	emake -C "${WORKDIR}"/tmp-build AR="$(tc-getAR)"
 }
 
 src_install() {
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index 13f8ed2d6500..475209ea1bd6 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -2,6 +2,6 @@ DIST warzone2100-3.2.3-qt_compile_fix.patch 680 BLAKE2B 1073ea1619640455326c63dc
 DIST warzone2100-3.2.3.tar.xz 81314060 BLAKE2B 231be8c24d1c0967adb0a76ac9e441c2ea9f835720df9951f74227988473d100b24bccbfe4b5882a36c63a798368ed1a1f871751b6b363d90a82fea48c44ba65 SHA512 4b1bc0a0bb50a8b4726a2762a922ee233b92f9835e38bbab80c159a9cb301df7434a73ba5acfb17404031467c02a9b3480d6a0d44906d70896311b3468141746
 DIST warzone2100-3.3.0_src.tar.xz 86605304 BLAKE2B 70bad66966e31009de7f16a039525b2bc3e84a9991e7d95227f8789ceca7313a219044f41c0ceec0ce357e8368a30833d7dc1cc35e9575d9b56efa20b9e35c03 SHA512 876e36578472d9de4c00651af9b26a79bbbc85161d03c58e381aac90be710999b9091524425332e950ed42b79d872ace6848798829e7d3d7bb6ae7dae0003559
 DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db2f3db4b0289edadeb58059a21aba7038b95219dc44cb807754461d1a9bdca60f0d7698be68622b8bd64a55efa949622d3 SHA512 ca1a1af51296afdaca137114821508c5783f077090e665eae0f6df895855f57c43f84434706309e819417f5f35d1c649bd14e96dc9fbbb1252d30a4f9a223cf6
-EBUILD warzone2100-3.2.3.ebuild 2574 BLAKE2B 025a756979b5c40a2c486ed84a08013ddd3a3b7f397ba83e5d420b16410ddfe58d6bae20bdf75922a4289f5bee84d16179529c79cbe03d45ee581bcd1b1989d7 SHA512 448c367a65c0dd1f1ce5fd83c6e6ffa5e023767acd1e32f5cef15546911eb67c1ff315baa9afa0f4cc2f370bcde7ead305f8cb0aa7e7cf2a00976b84a7a09340
-EBUILD warzone2100-3.3.0.ebuild 2346 BLAKE2B a45c71a3e0f6b6592513e37d66658db108420f69a6ebc0a47213d151d3713c85d377ecb21bd07461b8affaee604f11410db0fe09d6a36d3400d8ce6dae9a9538 SHA512 0ae2aed3202e84c34f35fe77b16cfc903ce9aad6333c7a2974fd5cd3df98606c465bf27091de177ea38bf3d27aba648019be954df681aa352869e870135292dc
+EBUILD warzone2100-3.2.3.ebuild 2575 BLAKE2B 2712f209478693da3b3e106ac00149ab01fe49a798f29c1ec3397d6d39bc552fbf63a6e915f59ec9569276dfd235e9c44392fa09d40fe181516a8814b3cbbcbf SHA512 f19f25b22e9664053c07741990976fc297ed8d6389a4449d30f14ee4616261c63d72943ed5a50f4c223fd14695de8bbdd7a19b2bb983480cac64f898be48e70a
+EBUILD warzone2100-3.3.0.ebuild 2347 BLAKE2B d0e8bb5e2c3927e309e732db9be52ae8198d6b05c8bd37f5a391bdb5d78c83c9b1299cf100dca97ebc418431bb79cba3539c32dff69fef3c7c55e6c3bb67ad36 SHA512 49ed12f8483c013d28281069c38e49c6b7699295fc2bec91b2eebf71f68d5b9b24307812818a49c013062bf84e9ef7c1638a1c5adc8111f163468426bf9941aa
 MISC metadata.xml 674 BLAKE2B b0c40e88934cfbdbcbb7ffdbc277abcc3da3400de71f7508af51301f7ec5b6e00083ff2b59f59f7435a8e3f588291d7e5dbde19fa193b6fc78677b842cfb44ee SHA512 00aa4a109f41a0469e2b0e5daadcd33f9f3b255fdd2a724b7d116912ecb0b5fa4eb5e0dd7e4ae3e45f00c062c1034aa7d40143e48da0e66bab48da3d4e047dcc
diff --git a/games-strategy/warzone2100/warzone2100-3.2.3.ebuild b/games-strategy/warzone2100/warzone2100-3.2.3.ebuild
index 56daf63618e0..74fa50ea82f2 100644
--- a/games-strategy/warzone2100/warzone2100-3.2.3.ebuild
+++ b/games-strategy/warzone2100/warzone2100-3.2.3.ebuild
@@ -8,7 +8,7 @@ MY_PV=$(get_version_component_range -2)
 VIDEOS_PV=2.2
 VIDEOS_P=${PN}-videos-${VIDEOS_PV}.wz
 DESCRIPTION="3D real-time strategy game"
-HOMEPAGE="http://wz2100.net/"
+HOMEPAGE="https://wz2100.net/"
 SRC_URI="mirror://sourceforge/warzone2100/${P}.tar.xz
 	videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/${VIDEOS_PV}/high-quality-en/sequences.wz -> ${VIDEOS_P} )"
 
diff --git a/games-strategy/warzone2100/warzone2100-3.3.0.ebuild b/games-strategy/warzone2100/warzone2100-3.3.0.ebuild
index fe91974e0f39..8f0f5308698f 100644
--- a/games-strategy/warzone2100/warzone2100-3.3.0.ebuild
+++ b/games-strategy/warzone2100/warzone2100-3.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=7
@@ -8,7 +8,7 @@ MY_PV="$(ver_cut 1-2)"
 VIDEOS_PV=2.2
 VIDEOS_P="${PN}-videos-${VIDEOS_PV}.wz"
 DESCRIPTION="3D real-time strategy game"
-HOMEPAGE="http://wz2100.net/"
+HOMEPAGE="https://wz2100.net/"
 SRC_URI="mirror://sourceforge/warzone2100/${P}_src.tar.xz
 	videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/${VIDEOS_PV}/high-quality-en/sequences.wz -> ${VIDEOS_P} )"
 
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index fdd2f6ae4f04..8d7a5e278da2 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/acc/Manifest b/games-util/acc/Manifest
new file mode 100644
index 000000000000..23c2b9e19acd
--- /dev/null
+++ b/games-util/acc/Manifest
@@ -0,0 +1,3 @@
+DIST acc-1.57.tar.gz 70969 BLAKE2B 0c5d9f6778505881d9fa698da0958aea410a8d42f4b81c24277f59d0e9a601d44213e9399f0e693a210d0b935e57df4b6878fe1575005e5d573e19993404f570 SHA512 997bb6bb262743cacbf0606e7f6dcd00132a1f54eb24eddad92948c31ed552b3b678e72932150856fee57df2ab01fd25c29408f6c46a804614b883cf07532f3a
+EBUILD acc-1.57.ebuild 684 BLAKE2B 8866afd11b232d9d02ee8e5e564c6aedd0cd74ba25e0a7b53f4c21a2456d15e424ae528b77c58e8ebb57d54257384e0fa285f470b4cbd2fb2cfc851c5a846f25 SHA512 840682b7043e73eaa446d78b85cd7d057ba637f239344f1ada9a01103a7ab446f1b91fceadd170d329ec00c9266afa16b4fe83a89ffdac8a5d87d21fe59bcb78
+MISC metadata.xml 327 BLAKE2B 56e2211185f35bb2cee5dc0ea79748bd2edbf488b79da4204b03eb9015a9ac3bfa3c8dedea6b647b2ab228e1bc41bc461eebdc38f3b62b388529f330771707ef SHA512 b9bc86d737231f3c729665fd1238b36cc0da253747c94ec8b994381a75fef37a8a2dfe43384dca189518786e4c5dd2750fb192c4d7c264569cc94f2b1e8ffef1
diff --git a/games-util/acc/acc-1.57.ebuild b/games-util/acc/acc-1.57.ebuild
new file mode 100644
index 000000000000..ca25dbd7690e
--- /dev/null
+++ b/games-util/acc/acc-1.57.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="ACS script compiler for use with ZDoom and Hexen"
+HOMEPAGE="https://zdoom.org/wiki/ACC"
+SRC_URI="https://github.com/rheit/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Activision"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# The Activision EULA is inappropriate but this was never resolved. :(
+# https://doomwiki.org/wiki/Raven_source_code_licensing
+RESTRICT="bindist mirror"
+
+src_configure() {
+	tc-export CC
+	append-cflags -Wall -Wextra
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc readme.md
+
+	insinto /usr/share/${PN}
+	doins *.acs
+}
diff --git a/games-util/acc/metadata.xml b/games-util/acc/metadata.xml
new file mode 100644
index 000000000000..95907e587a83
--- /dev/null
+++ b/games-util/acc/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">rheit/acc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-util/loki_patch/Manifest b/games-util/loki_patch/Manifest
index 9e09480a90f5..3d0edb4c021d 100644
--- a/games-util/loki_patch/Manifest
+++ b/games-util/loki_patch/Manifest
@@ -1,6 +1,6 @@
-AUX loki_patch-20091105-build.patch 4617 BLAKE2B 2dd2804ee90c88e8cc055a26dcf75ade6fc96d7e194a25909b97df745b74d8a67e80190b60af824538e82458e67648f7fa9390456000d31cc071001481bde5e0 SHA512 eabc0db3f6594b99ef76d57e1fdd738c96e4ef45c0bb67127907fa6a19d19002e2a97acc2735e7353915047ecf626bacd6bcdc7bf42446cd42c6b10f79dc6ca7
-AUX loki_patch-20091105-patchdata.patch 257 BLAKE2B 0bab64cabdfc931e06f61b140a5a079267028c7e975a742344cb593b5144776152f2b88c12877de26fef23e1b8efe8db5448b123d889c19eaf61ccc229e640ab SHA512 e21da8ce772f38c1bc2acb52bedeb96042e5bb2168c76ec3efde995bfd4b113000a20b4c6efba92fc79f7ebc16486cc7871d628bf71494bf4bb8ce7dfd7dfed4
+AUX loki_patch-20091105-build.patch 4619 BLAKE2B df4baad3059b3f147570f9af23664ebbd6f9e156c3cd248c1b6775b2fad9db058144a178f265ec6e62e95ddc731ce8c7bb10a8ca20199ae1ddd1970c863d3993 SHA512 477dea6fe3c66416205ff583f2c220e3cd7b25bb97dffc21b8420ce08ffe02e0c6705c51942298cfb867e7a04bc30ce80859f905e7dbfb0121f5b62e47501d85
+AUX loki_patch-20091105-patchdata.patch 261 BLAKE2B b55e36397b3ebf9fc1255b32a60a2fb527c89003d353c4fb9a118b9b150d314f397cfe53f52214abb3c3b2c9d4bdfe50e818b17ed745a4eac24c9f43346dc514 SHA512 858d1a792743ab9295ec2d3d23b9c4334425f6e8b1c79bdf960fb3e93d5c4066678aa764e84362034a44404dbc5e48a283acec504ae02fa694195909fce15e3f
 DIST loki_patch-20091105.tar.bz2 331725 BLAKE2B a3fa2e1c594d3484830527276ebd24f6e1c56f924b815fd3e2a12f802bccfd556017084a094508c531badd568158eb68fa3d608c30a55110de24410088fc5275 SHA512 9db40b1746ecf5603c09be3ddf01bf92cfc6b3d1c35ac7153751e1871840175c538af98c22f458658bcbebac65ccddccc1aee92a88300a243b8e68bda13ca323
 DIST loki_setupdb-20091105.tar.bz2 60725 BLAKE2B d3bed3d6b9123093b307f9c735f14c630f8ebfd2b228d6268cf97e8016ec83fa18b3b390e84facd42afe5d3f707bfb63a48e21a6b002a7d0583fdbde907567dc SHA512 ba55b24a6e2b2b6268dec9df8ec0581d852461b5c07ca97a24ebee3e55fe5764dffbbcfdb6b18a80677f2fae1e7701df4fbca0f6af8ef8050c662f5a39daf25d
-EBUILD loki_patch-20091105.ebuild 874 BLAKE2B c67c080b6639c66bf20d26522b13bfdabfd169ac6696092e03a9aa44d222428b7aaf2cb94aa29835b4ee6e43b15ef53d40f128fbdd0cdd6eac215286528f4638 SHA512 4e6e08b74cb19c7dd3e20a5b7a35bae1d25140ed1e41af95af2d106534aef94a5b2a37cce2f3085ac3c23b0548cc216fdcc6fec6438604d27332c6ae41003543
+EBUILD loki_patch-20091105.ebuild 974 BLAKE2B c4c45c9997dded498912f271d457bb2542d1457fc87957ed4b640a7ff089510511ba6470d9c3357b68c918f009d80fae7bfab5873c9c2dc5e8fe3497aeae75e3 SHA512 eeda30dcff747f41dcb322d65f0d7c8bbaae25ecd2f1e08e36ee73d3ab9d66685d109795fbab78eb21c19fe215e7bca22a956a5a7311e512d89500ee182cf330
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/loki_patch/files/loki_patch-20091105-build.patch b/games-util/loki_patch/files/loki_patch-20091105-build.patch
index 8e2b5bbf1557..e17007e57a75 100644
--- a/games-util/loki_patch/files/loki_patch-20091105-build.patch
+++ b/games-util/loki_patch/files/loki_patch-20091105-build.patch
@@ -1,5 +1,5 @@
---- loki_patch/configure.in
-+++ loki_patch/configure.in
+--- a/loki_patch/configure.in
++++ b/loki_patch/configure.in
 @@ -1,4 +1,4 @@
 -AC_INIT(README)
 +AC_INIT(loki_patch, 1.0.2)
@@ -60,8 +60,8 @@
  CFLAGS="$CFLAGS -I$SETUPDB"
  
  AC_SUBST(SETUPDB)
---- loki_patch/loki_xdelta.c
-+++ loki_patch/loki_xdelta.c
+--- a/loki_patch/loki_xdelta.c
++++ b/loki_patch/loki_xdelta.c
 @@ -49,7 +49,7 @@
  
  #define LOKI_PATCH
@@ -71,8 +71,8 @@
  
  static HandleFuncTable xd_handle_table;
  
---- loki_patch/Makefile.am
-+++ loki_patch/Makefile.am
+--- a/dev/null
++++ b/loki_patch/Makefile.am
 @@ -0,0 +1,12 @@
 +COMMONSRC = load_patch.c size_patch.c print_patch.c \
 +	loki_xdelta.c mkdirhier.c log_output.c
@@ -86,8 +86,8 @@
 +AM_CPPFLAGS = $(XDELTA_CFLAGS)
 +
 +LDADD = $(top_builddir)/../loki_setupdb/libsetupdb.a $(XDELTA_LIBS) $(XML_LIBS) -lz
---- loki_setupdb/configure.in
-+++ loki_setupdb/configure.in
+--- a/loki_setupdb/configure.in
++++ b/loki_setupdb/configure.in
 @@ -1,4 +1,4 @@
 -AC_INIT
 +AC_INIT(setupdb, 1.6.5)
@@ -111,7 +111,8 @@
 +AM_INIT_AUTOMAKE(foreign no-dependencies)
  AC_PROG_CC
  AC_PROG_MAKE_SET
- AC_PATH_PROGS(AR, [ar gar])
+-AC_PATH_PROGS(AR, [ar gar])
++AM_PROG_AR
 +AC_PROG_RANLIB
  
  AC_CHECK_HEADERS(unistd.h)
@@ -165,8 +166,8 @@
  
  AC_ARG_WITH(vendor,
  [  --with-vendor           with specified vendor prefix  [default=loki]], 
---- loki_setupdb/Makefile.am
-+++ loki_setupdb/Makefile.am
+--- a/dev/null
++++ b/loki_setupdb/Makefile.am
 @@ -0,0 +1,9 @@
 +noinst_LIBRARIES = libsetupdb.a
 +
diff --git a/games-util/loki_patch/files/loki_patch-20091105-patchdata.patch b/games-util/loki_patch/files/loki_patch-20091105-patchdata.patch
index 74ec3dae7568..403c24ed79f9 100644
--- a/games-util/loki_patch/files/loki_patch-20091105-patchdata.patch
+++ b/games-util/loki_patch/files/loki_patch-20091105-patchdata.patch
@@ -1,5 +1,5 @@
---- loki_patch/load_patch.c
-+++ loki_patch/load_patch.c
+--- a/loki_patch/load_patch.c
++++ b/loki_patch/load_patch.c
 @@ -8,7 +8,7 @@
  #include "load_patch.h"
  #include "log_output.h"
diff --git a/games-util/loki_patch/loki_patch-20091105.ebuild b/games-util/loki_patch/loki_patch-20091105.ebuild
index b3084027a98d..1fc2b57f633a 100644
--- a/games-util/loki_patch/loki_patch-20091105.ebuild
+++ b/games-util/loki_patch/loki_patch-20091105.ebuild
@@ -1,41 +1,49 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="Loki Software binary patch tool"
 HOMEPAGE="http://www.icculus.org/loki_setup/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
+SRC_URI="
+	mirror://gentoo/${P}.tar.bz2
 	mirror://gentoo/loki_setupdb-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="dev-util/xdelta:0
+RDEPEND="
+	dev-util/xdelta:0
 	dev-libs/libxml2
 	dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-S=${WORKDIR}
+S="${WORKDIR}"
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-patchdata.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-patchdata.patch
-	cd loki_setupdb
+	default
+
+	cd loki_setupdb || die
+	mv configure.{in,ac} || die
 	eautoreconf
-	cd "${S}"/${PN}
+
+	cd "${S}"/${PN} || die
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
 src_configure() {
-	cd loki_setupdb
+	cd loki_setupdb || die
 	econf
-	cd "${S}"/${PN}
+	cd "${S}"/${PN} || die
 	econf
 }
 
@@ -45,7 +53,7 @@ src_compile() {
 }
 
 src_install() {
-	cd ${PN}
+	cd ${PN} || die
 	dobin loki_patch make_patch
 	dodoc CHANGES NOTES README TODO
 }
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 8c49e3afb7df..c27de00d7147 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 8b5c2178fb9a..69c5c5d72045 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -2,5 +2,5 @@ AUX 3.32.2-optional-introspection.patch 1376 BLAKE2B de57d769aab0cdc6a7fda25c026
 DIST gnome-desktop-3.34.5.tar.xz 718008 BLAKE2B a09daf4f575b26774beeef8e9edb4ed757ead7c0155aab4d7c132bf503d29096c40b06d52aa261594c6db367ac7a638c33de4445748ab3d94a095c23f8ddd705 SHA512 bc59b420d5698b15697404efcf452e830933efa23b6dba9011eade1c7521dbd4fb6f6e6e2be822d231611b2133e36f2ec42ed49ecabd175127366e0e7d59955c
 DIST gnome-desktop-3.34.7.tar.xz 718220 BLAKE2B 89bfd00a356cd47d865aa4df1079b37b08c6a85f4380b5424181ce247248c7f11f0ca135858afb0c00fc4ff47175ff2acbb0b67cebe75e0b0a9f27263f0a9d69 SHA512 efc466d2a7a8a142e76a07c8cb75bad51aafbb2e70432e339713965890e6a83554a5f77ef6cdb6aa9e3ebace4883fb6d3d06004d7a2446d6960319cacbec7639
 EBUILD gnome-desktop-3.34.5.ebuild 2022 BLAKE2B 67eb2266a63db598d5fa7fe26a7f8ca9206335685c310d821da32c5bd47319aafd703e4f12353310776098734eb5496e3842c20ed3dff55213843ed3eb1037b1 SHA512 0a32a031cb21a1b977997aa498edae51979674b01f15cf79f8876e3dca0e6498280eab2242a0fd948b1a7443239fc87d69113ca6b3b8b103f32dab5bba889301
-EBUILD gnome-desktop-3.34.7.ebuild 2025 BLAKE2B d6d578b59bc7154ca8d5e5c452c4fb96c187f4e9c5cb8d33de6a443d83f410a9b027aec5352a70ce46aeb681495f414ce51fe03b95b837c4487fb57f8012a493 SHA512 14d7eac731b31f23346dadbcc00eb7f3a99da34a085a278fd3c1ce7f46bae40d75ce5eb9c7567fe603c31b15520fa873806d7777e5f5fd6376c26f60b86a082e
+EBUILD gnome-desktop-3.34.7.ebuild 2023 BLAKE2B 21b641e0e1f04590e6651f2373bf8dbe09a7670f2cb4c0be4f89bdd8aa5c53372802df8a02efa7e32eb0545695181f42883f7425781cc1f9bb291e3d07b5e7a5 SHA512 e5ca37cf2d1f44e8afa88b15158454104590fd614191311a2ca3242860dc98916819ab49177b89fc3bf87d238b7e97fffe018b7cd5b2abdd733e0f8d5e93d960
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.34.7.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.34.7.ebuild
index 5018ba92f323..722d6fb9276f 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.34.7.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.34.7.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
 SLOT="3/18" # subslot = libgnome-desktop-3 soname version
 IUSE="debug gtk-doc +introspection seccomp systemd udev"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 # cairo[X] needed for gnome-bg
 COMMON_DEPEND="
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index b67f79fa7e96..d9b7c397dfde 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -4,5 +4,5 @@ AUX 3.34.2-pango-1.42-compat.patch 3896 BLAKE2B 022cc2667db62a9956684f3b16f466a6
 DIST nautilus-3.34.2.tar.xz 3196976 BLAKE2B 38424061cb5591fc1df5824dd80e282637345bde148955c81632d4894153e10f3840389bb4e43dffe8c28f10eb6e64c1cc89f1bffdcf80fa581a5d47b7724dee SHA512 1a4e24fea3201f68b0316b95425bbc90078baa1ae7dccef2d2e48beda4007ecf2986254cde243d310c548e47a4693d84d1255654199649ce08429a99fb3a3a51
 DIST nautilus-3.34.3.tar.xz 3213260 BLAKE2B a417ee5d5e032befed704b71b9ffd29cc9a2a6fae0612f96601756b876b0990625cc78eb2c7679bdce914f3dd30208b60243f403a508cf87a6761ea56251140d SHA512 f8ef86b5b67ef2b8eced492ee6b8d77155a9d6ec5ba6bb18132d678e6f12870963da9bcf4ff0bfbb8f4791bf068314557f9551febc23234c48d722e529c6ed9d
 EBUILD nautilus-3.34.2.ebuild 2962 BLAKE2B c0a87c1adcb6841b57ac3cc1b191d6ba26be33c12b6b83b22296c44d176c0e9f88a979e823d5903910687692353680327ae56f2815e0989b0d59274c4562d9aa SHA512 e7e8e8e78239a423c330202811f7ca3303654af1159d30c46102aac0e3ce14eee61fbd175c7699db9d42048b925a2aca18804739313b12dea9ea0d5c31092980
-EBUILD nautilus-3.34.3.ebuild 2907 BLAKE2B e484133c3eef2d6422ad6fa45818443909432c66c6a7ec1b69a32215096f66029f1aa76191191e9714227b651ab791fda39911749878fb3a3547ecf251064b62 SHA512 f3ee64f03564eb1b994c06c3629dbe3aeaf04004bd9ea4821a51a42efe1796523f62a821c9d955ded85b9d4aaf6f1c37ff896c2f528333bac4086be924ee0711
+EBUILD nautilus-3.34.3.ebuild 2905 BLAKE2B d0a1c694c20c587728f8f1a4d43e362101ef987c9947a3ccc868e285db63b80b69c00af9bbb5dd8d845b834547409783baa93da28b488423f2a24e3d58ac59cf SHA512 7823eccd75fa4e7e11a28c5e4dc5979aa167f2c25d316f27ea4e6a6f75019da1018a3989100093ce6cb6ff4c5f8a848b2a23f89f48e2768bcae1c8669583da89
 MISC metadata.xml 652 BLAKE2B e4161f58861954981a6837a9b6c7f6dd0b76dc84378ce2d9caea1375973d490751ce966753829b7b972a6c75d04519820f4cde8b6d4edc3b9a9abb7477c68a90 SHA512 a1906e74bd47437d2226ffb977f3f3d8c981a32f8d54d0f9e0156932b001b6e205b0e5b78ed5badb0b89c1ed1ff107f67e026bf5c4b088cfe95e2b69de8c6981
diff --git a/gnome-base/nautilus/nautilus-3.34.3.ebuild b/gnome-base/nautilus/nautilus-3.34.3.ebuild
index 1c66ba5253ee..3c04b20204ed 100644
--- a/gnome-base/nautilus/nautilus-3.34.3.ebuild
+++ b/gnome-base/nautilus/nautilus-3.34.3.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
 IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-libs/glib-2.58.1:2
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index cd2eb2f20f91..5c8f98377270 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 6037e74277d7..f08580a85b7b 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -4,5 +4,5 @@ DIST evolution-data-server-3.36.2.tar.xz 4631984 BLAKE2B 946a2c30a631f3e7efa5f08
 DIST evolution-data-server-3.36.3.tar.xz 4632948 BLAKE2B e2830bd8340280f56e0fd1d32b6a85b5ee73b5704ad9ffaa73e83ef0aee395d23a80aa59aa5bd4b1e2211bf3020368b1f0e2d9a1d8eeaa6e047fbf406137e80b SHA512 bde03a84d262606ba8e43f084735db3072b7fa5641dda6053ad798ce8cffb3003aaa7065fab0f684cfbaaa8300855bb42b259ac1c22a8f4bb8b50032263ea75d
 EBUILD evolution-data-server-3.34.4.ebuild 4329 BLAKE2B 32512b88545711e9bddfcec3b7efdf6e384ac0397751eb5fa41f47ce97d3fc726a0f63a8e174d07137b8b0d42433cc837b35f27d098800fb1180099921f56a39 SHA512 d708438396f55a08e7a407a3e0967779afa38e7e08e0da61ae01b8e18d37a972ccee4c937d974fe14d8fb8cee210cc6a3e27578654bbcd1d338e018dc46e811e
 EBUILD evolution-data-server-3.36.2.ebuild 4202 BLAKE2B 720a0c22cc6bd7d06d1f7d3425f03907f099e441a8636ea5a968b336ce03133707635c268360f3d7a12264cacca4dff03e6b0f4311ec6a9e25a5455184494297 SHA512 cf6a4418e275ae0da4152f6d7db564878ccefc9975050c6c80a68906535c98af769eb1282cb20a992fc3365e99a319c90d7fec4697b0a441b429e83d6d9d1352
-EBUILD evolution-data-server-3.36.3.ebuild 4202 BLAKE2B 720a0c22cc6bd7d06d1f7d3425f03907f099e441a8636ea5a968b336ce03133707635c268360f3d7a12264cacca4dff03e6b0f4311ec6a9e25a5455184494297 SHA512 cf6a4418e275ae0da4152f6d7db564878ccefc9975050c6c80a68906535c98af769eb1282cb20a992fc3365e99a319c90d7fec4697b0a441b429e83d6d9d1352
+EBUILD evolution-data-server-3.36.3.ebuild 4201 BLAKE2B f4d3b4a3782ead43ff322de94c642e9775d8216783414ed85cd57f3c6731904f667058499a4305068c1dc2a721c46a7e8051a4708630f0b77e2d42e25e2b975e SHA512 800c7dc24c7b8efa2466e5d54299900475b9854cfa7069ce8b39188aeb8e2accd22ce2c9ad43abfdf70f851684cb77b616240a0e28637c66b0d1bc1e58061dc0
 MISC metadata.xml 849 BLAKE2B a02a770ca4498189e14588af9aa58d82a7e28fbbfd99d891dfaa7e4148c71a0d7c89ae33a6b41899a174fd6dfa8ba012a2c0a3e342b58c8d84369010859f4b8c SHA512 da5fba1f5313c6bb027d870279ead3f9cf6da27a3fed183dced79abaaf3de4bbbc49076a01968e3af5dbe004f1641c7f0773801a040ba824924955894bcbbb1a
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.36.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.36.3.ebuild
index 5089f36061ec..3de5e4b82c8a 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.36.3.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.36.3.ebuild
@@ -16,7 +16,7 @@ SLOT="0/62-24-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so so
 IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 # gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
 # berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index 3d85d69c623e..2c4c4a1b0565 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -3,5 +3,5 @@ DIST evolution-ews-3.36.2.tar.xz 552680 BLAKE2B de7b0d9155de895401d52ad4b82126f0
 DIST evolution-ews-3.36.3.tar.xz 553676 BLAKE2B ec9c0e167c05f7606585d5bbce8c0f53ec9c48b3f8b68c6ec5b6f3776cce12e34a75eae658df704519111022f60353a0b114d3aa186b93c8a8b3ded3240ccd79 SHA512 d625a70410db238ce0ad9dc8bb048346d20c43053406aa98bc81e0c087621b5d0701644a548d525be5a21b283923bb505499b8826e3a23a753465411f2c600a8
 EBUILD evolution-ews-3.34.4.ebuild 1408 BLAKE2B 4c50c511fc049d334447938e4e2027bc4e3b353a684f453e90d4e20c3988e113632826b9107ed5726b5cbf59991bca285512cb80ab51071d45eb9e5eb307bfd0 SHA512 b845c4d3b3cfb3760e89c2f8cb8787f5a09db8840984cbc43ab427808db7436b9d58584514b4d83c5eb8e4ad6286f86bf2014c9656e32bade0c7b5dba307b91a
 EBUILD evolution-ews-3.36.2.ebuild 1410 BLAKE2B 0d8b0f84ad75a021656eb7dac6207d129ed4e8fdf4af60f31bbee26a0692d570a113bc04647f03d03f6a3567152fcc2d515d02dc4890afe9198b82916985f93e SHA512 76193cf66e8908e03cad8da4d315939ebc5daf657483b53119ec50e0d2a38655fb218767f31ff44157d7af1f9ea4f0063dbb4adcacaf9dc470903d4366329afd
-EBUILD evolution-ews-3.36.3.ebuild 1410 BLAKE2B 0d8b0f84ad75a021656eb7dac6207d129ed4e8fdf4af60f31bbee26a0692d570a113bc04647f03d03f6a3567152fcc2d515d02dc4890afe9198b82916985f93e SHA512 76193cf66e8908e03cad8da4d315939ebc5daf657483b53119ec50e0d2a38655fb218767f31ff44157d7af1f9ea4f0063dbb4adcacaf9dc470903d4366329afd
+EBUILD evolution-ews-3.36.3.ebuild 1409 BLAKE2B 571ba89b0b15e0b6c80a24d0233939018a58f5af7a62815d72d2730590388ce4930d8cea2f49ba57c914a18952b16d4d08a044b0347694e56fe11013df81a570 SHA512 b02e94faed0aa3be3fd45d9f73173cf7a72ec32aa160d16ea4943b64b32ef3e65d585639e7747f3a69aba71b0d5351ffe52d829f3d05326cbfcf4006f06e9672
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.36.3.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.36.3.ebuild
index b3b87637eb31..073b7890b043 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.36.3.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.36.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 
 # libical-glib currently (2020-02-29) oddly behind USE=introspection
diff --git a/gnome-extra/filemanager-actions/Manifest b/gnome-extra/filemanager-actions/Manifest
new file mode 100644
index 000000000000..099ae0b31c53
--- /dev/null
+++ b/gnome-extra/filemanager-actions/Manifest
@@ -0,0 +1,7 @@
+AUX fix-desktop-file.patch 1052 BLAKE2B 99e0c5c7a710e71fccaf315af57d3c1717cad9944f5a12d753674dbe0b7c63e45c4cd305a59aa8e303dcdc593e4fa2dfe61a20872a6dc3102341f52063972855 SHA512 8b3bd596ad13c54f6d7f5ee0a6de613df44c560d9db6b3a3a6fe25fce9fed782adfb120a650d8a3b2c4bd2084ace29b6aac5b6e6c7331cc2276fba2c4e48b449
+AUX fix-help-file.patch 1076 BLAKE2B 8689ef4b36cf5a2226b8a8c559d1cbb7e65e21e5a290d137fa6af9ab26427172a1fd8c88f76d79c7fc23f03cb043b531ec50184c75a71ec9f2fb22a73713739a SHA512 ed62712133ac7a25f9524a679d76652dd52c49a213a2fae9e5387848dce366fcb8e257f20267e4f1c8d8002665150dcfc78a0f2d51357fdba909ae98b903ccf0
+DIST filemanager-actions-3.4.tar.xz 3280320 BLAKE2B 140da4441c4408b57ee0e5de04a792b7376eb89e77ea6132b679058af117149f69c1dca0b614f1dd1153f5663b867859d98036bfc3d9b9d313453f1b4ee1510e SHA512 05e47832e5d97a664be617c7ad998ac94022f272369b7d23704f3f809e72f21b5087653ecccda663cca2c61553ebc3d009742004b2c59d3c99af92fa39af2010
+DIST nautilus-actions-3.2.4.tar.xz 5148812 BLAKE2B e81edf846219b89f3585743d8a3601f21483dff86d601415a968d7f50f9fb4b889038593796d1b442f0395f0c649e7c5c3639b2fc0a42dc05bb7ba6588247709 SHA512 1f8e90fe040b76b0ce9a26f99725e717e6c60a1a838339ec1e26acb5db46b1382e6468e6cabc542e51438b63da2501728cd117e9f77a1710a296e9bd59e402f0
+EBUILD filemanager-actions-3.2.4.ebuild 1253 BLAKE2B 74f2918cc126ec18beb6c6aa8f3cb9e8b990df12ff55054d4be9b22b4d0f7b6650662627c52c43b3033400ac57d5e5a66610a06d268a06959186d6c0b54a85ce SHA512 91ee195089c4534315900754362d75b9ebe9bca7e68d713a68e63a233a48749d65dbcc9691bd85e2f397b9c3c97e6adfbeaf4b16928d2dd302f41901514113f1
+EBUILD filemanager-actions-3.4.ebuild 1951 BLAKE2B 807fad9411638aa66315dd73e23016a1a3aaa65c6d86bc2c13149b24904da980b26e9ce06dced806e37ede3c4363d891c648a530b03ec74bc4f87bff195cb026 SHA512 5e208258e124739c032e22d3777b0f6ff56dcd7bc4f8d258a622949277d8c29d477e2c5781bf90afde801ad0138f8d16d15f0bc60c6c380c22c12ec2368fd0a0
+MISC metadata.xml 495 BLAKE2B c4215a3c06445cfc6d281058d6d4a18a6d6e58ce10f1b3cac8dd95c6fda7c937b02b9766cdfb5bd874eacbac466c488011b1b19acb0c33eca8bc588e2b3a46f2 SHA512 849883913086efb500105e737f8e12d32911012e687dff4398c6e3beaef0f36b91331b707ebee2b21176d2eb3a4e5039243068d0db666331c6cfbd3e9928dbfb
diff --git a/gnome-extra/filemanager-actions/filemanager-actions-3.2.4.ebuild b/gnome-extra/filemanager-actions/filemanager-actions-3.2.4.ebuild
new file mode 100644
index 000000000000..424cea5de1c1
--- /dev/null
+++ b/gnome-extra/filemanager-actions/filemanager-actions-3.2.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_ORG_MODULE="nautilus-actions"
+
+inherit gnome2
+
+DESCRIPTION="Configures programs to be launched when files are selected in Nautilus"
+HOMEPAGE="http://www.nautilus-actions.org/ https://git.gnome.org/browse/nautilus-actions/"
+
+LICENSE="GPL-2 FDL-1.3"
+SLOT="3"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.30:2
+	>=dev-libs/libxml2-2.6:2
+	dev-libs/libunique:3
+	>=gnome-base/libgtop-2.23.1:2
+	>=gnome-base/nautilus-3
+	sys-apps/util-linux
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libICE
+	>=x11-libs/libSM-1
+
+	!gnome-extra/nautilus-actions:2
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	>=dev-util/intltool-0.35.5
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# install docs in /usr/share/doc/${PF}, not ${P}
+	sed -i -e "s:/doc/@PACKAGE@-@VERSION@:/doc/${PF}:g" \
+		Makefile.{am,in} \
+		docs/Makefile.{am,in} \
+		docs/nact/Makefile.{am,in} || die
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-deprecated \
+		--disable-gconf \
+		--with-gtk=3
+}
+
+src_install() {
+	gnome2_src_install
+	# Do not install COPYING
+	rm -v "${ED}usr/share/doc/${PF}"/COPYING* || die
+}
diff --git a/gnome-extra/filemanager-actions/filemanager-actions-3.4.ebuild b/gnome-extra/filemanager-actions/filemanager-actions-3.4.ebuild
new file mode 100644
index 000000000000..da8e35ae11e9
--- /dev/null
+++ b/gnome-extra/filemanager-actions/filemanager-actions-3.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="File manager extension which offers user configurable context menu actions"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/filemanager-actions"
+
+LICENSE="GPL-2+ FDL-1.3"
+SLOT="3"
+KEYWORDS="~amd64 ~x86"
+IUSE="caja +nautilus nemo"
+REQUIRED_USE="|| ( caja nautilus nemo )"
+
+RDEPEND="
+	>=x11-libs/gtk+-3.4.1:3
+	>=dev-libs/glib-2.32.1:2
+	>=gnome-base/libgtop-2.28.4:2
+	>=dev-libs/libxml2-2.7.8:2
+	sys-apps/util-linux
+	nautilus? ( >=gnome-base/nautilus-3.4.1 )
+	nemo? ( >=gnome-extra/nemo-1.8 )
+	caja? ( >=mate-base/caja-1.16.0 )
+	x11-libs/gdk-pixbuf:2
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	>=dev-util/intltool-0.50.2
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/fix-desktop-file.patch
+	"${FILESDIR}"/fix-help-file.patch
+)
+
+src_prepare() {
+	# install docs in /usr/share/doc/${PF}, not ${P}
+	sed -i -e "s:/doc/@PACKAGE@-@VERSION@:/doc/${PF}:g" \
+		Makefile.{am,in} \
+		docs/Makefile.{am,in} \
+		docs/manual/Makefile.{am,in} || die
+	# Don't install HTML manual, there's already ghelp manual in /usr/share/gnome/help, opened in yelp via F1
+	sed -i -e "s|install-data-local: install-manuals|install-data-local:|g" docs/manual/Makefile.{am,in} || die
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-docs \
+		--enable-deprecated \
+		--disable-gconf \
+		$(use_with caja) \
+		$(use_with nautilus) \
+		$(use_with nemo)
+}
+
+src_install() {
+	gnome2_src_install
+	# Do not install files we don't really want in docdir
+	rm -v "${ED}usr/share/doc/${PF}"/COPYING* || die
+	rm -v "${ED}usr/share/doc/${PF}"/INSTALL* || die
+	rm -v "${ED}usr/share/doc/${PF}"/objects-hierarchy.odg* || die
+	# Currently empty AUTHORS (but newline including, so it doesn't get automatically deleted) - this is not the case in next release after 3.4
+	rm -v "${ED}usr/share/doc/${PF}"/AUTHORS* || die
+}
diff --git a/gnome-extra/filemanager-actions/files/fix-desktop-file.patch b/gnome-extra/filemanager-actions/files/fix-desktop-file.patch
new file mode 100644
index 000000000000..73b0bf4b4694
--- /dev/null
+++ b/gnome-extra/filemanager-actions/files/fix-desktop-file.patch
@@ -0,0 +1,27 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Sat, 1 Dec 2018 03:25:18 +1100
+Subject: Fix desktop file to use correct icon and keywords.
+
+Description: Fix desktop file to use correct icon and keywords.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: https://gitlab.gnome.org/GNOME/filemanager-actions/merge_requests/2
+Last-Update: 2018-12-04
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ src/ui/fma-config-tool.desktop.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/ui/fma-config-tool.desktop.in b/src/ui/fma-config-tool.desktop.in
+index ee0b7c3..b66713d 100644
+--- a/src/ui/fma-config-tool.desktop.in
++++ b/src/ui/fma-config-tool.desktop.in
+@@ -4,6 +4,7 @@ Type=Application
+ _Name=FileManager-Actions Configuration Tool
+ _Comment=Configure items to be added to the File-Manager context menus
+ Exec=fma-config-tool
+-Icon=fma-config-tool
++Icon=filemanager-actions
+ Categories=System;FileTools;FileManager;
++Keywords=file tools;file manager;custom menu;custom action;
+ StartupNotify=true
diff --git a/gnome-extra/filemanager-actions/files/fix-help-file.patch b/gnome-extra/filemanager-actions/files/fix-help-file.patch
new file mode 100644
index 000000000000..419fbda91c3b
--- /dev/null
+++ b/gnome-extra/filemanager-actions/files/fix-help-file.patch
@@ -0,0 +1,27 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Sat, 1 Dec 2018 03:33:29 +1100
+Subject: Launch the correct Gnome help file for spa-config-tool.
+
+Description: Launch the correct Gnome help file for spa-config-tool.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: https://gitlab.gnome.org/GNOME/filemanager-actions/merge_requests/3
+Last-Update: 2018-12-04
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ src/ui/fma-menu.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ui/fma-menu.c b/src/ui/fma-menu.c
+index f31037a..deb2d73 100644
+--- a/src/ui/fma-menu.c
++++ b/src/ui/fma-menu.c
+@@ -281,7 +281,7 @@ on_app_help( GSimpleAction *action, GVariant *parameter, gpointer user_data )
+ 	g_return_if_fail( user_data && FMA_IS_APPLICATION( user_data ));
+ 
+ 	error = NULL;
+-	gtk_show_uri( NULL, "ghelp:filemanager-actions-config-tool", GDK_CURRENT_TIME, &error );
++	gtk_show_uri( NULL, "ghelp:fma-config-tool", GDK_CURRENT_TIME, &error );
+ 	if( error ){
+ 		g_warning( "%s: %s", thisfn, error->message );
+ 		g_error_free( error );
diff --git a/gnome-extra/filemanager-actions/metadata.xml b/gnome-extra/filemanager-actions/metadata.xml
new file mode 100644
index 000000000000..b7c4c750db60
--- /dev/null
+++ b/gnome-extra/filemanager-actions/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+	<flag name="caja">Install the <pkg>mate-base/caja</pkg> extension</flag>
+	<flag name="nautilus">Install the <pkg>gnome-base/nautilus</pkg> extension</flag>
+	<flag name="nemo">Install the <pkg>gnome-extra/nemo</pkg> extension</flag>
+</use>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-characters/Manifest b/gnome-extra/gnome-characters/Manifest
index 6a9ec7c818ec..560544394371 100644
--- a/gnome-extra/gnome-characters/Manifest
+++ b/gnome-extra/gnome-characters/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-characters-3.32.1.tar.xz 186516 BLAKE2B f6c6b95fbaab9f2e2e6454256bff87b243629927b1806161de2294a8b497cc1f601da747252f14dc8c232bbbaa581140b513a4db0c9993ee05295a82e294787b SHA512 d2c18b136da6ab35938de4adf74ee6c3841f5f8e46f3b1ed2bbb8f9d0e953bba1dc43e105ae2aafc880f3cba37b75a55d274e6776d2bc17a5e30364f5d625537
 DIST gnome-characters-3.34.0.tar.xz 188012 BLAKE2B 9e4f6dd972bb1a19a4ef91312bc35b8a4936dcdf8e40c97cb2e1286241ab405136b717e0ae6ec283c2b11a43d29509dcec45f0c8e59a196e98eeb1a19ed825e3 SHA512 4dc2f0027c7079034d50c2743607391a0e529bcaf4f8fdd495b05aa776027609a43686f4621bcf30f09a29fa6f4d5fba6ed6166e51ab66f03dedf3032bc65632
 EBUILD gnome-characters-3.32.1.ebuild 825 BLAKE2B 73d721a8275cb379b193488127e154617302a7b36ce42b3713ff090cad221334b8dce8b0c84131a4c55757177fc27474044df04f64882112eb85bdc265dd67c2 SHA512 a199cd5a561638a33cf2bb31576055c0b234d0e665c3359723ef990fb05df0231ed77335135783dae9dc335ebc2b89f2ff9e706b8771a4971a69eeee593451ae
-EBUILD gnome-characters-3.34.0.ebuild 810 BLAKE2B 0af8f5f86de3717933bb7e91a9cd1d1e04b708cbe69c60549cd54c147897cef742a15bdbc1535ae297bfe7e0a3a05cf69743fabdddb1ebfd70118d38075044c9 SHA512 91d63fb471c596f8d102aeffac9f23d7119e2bd54e70bd2eba981577354e78f415ac5ecb9b047c11fcfb8820fc306428050cb924f6a8294b665a8f4caccfb58a
+EBUILD gnome-characters-3.34.0.ebuild 809 BLAKE2B 77f1822dcdddb692dfcf0f158a2cf139de16616a8cd7487dc4e14fa2f0cb87a3f81d43ff411e10a58e3372b4668b19f75a354ab8a6c929662f28a65666970307 SHA512 1ca263ccc0d2a44c486c44f29ba27a32876df085dccb0a56e23d55fe19613cfbd849f325ff5a69d4fd5f27d06bbb5c5c57a8486ba5421e79d450ddf07c29db3d
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-characters/gnome-characters-3.34.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-3.34.0.ebuild
index bf9a1454f775..4164b5dbe886 100644
--- a/gnome-extra/gnome-characters/gnome-characters-3.34.0.ebuild
+++ b/gnome-extra/gnome-characters/gnome-characters-3.34.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
 
 LICENSE="GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-commander/Manifest b/gnome-extra/gnome-commander/Manifest
index d792942b6e7d..8d41006eb612 100644
--- a/gnome-extra/gnome-commander/Manifest
+++ b/gnome-extra/gnome-commander/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-commander-1.10.2.tar.xz 7433468 BLAKE2B a62a39490b154a8dc7a5e05c4d4c59fc79447b7b9ddae139542552f809b7a53cf729d636f1fabb85c6390520a25d84477ec6dfcd4394eefe59a8039b51b0ddf2 SHA512 7a411ca6f604771445119cb2b9d14f7f5d91622d28975e92ae5f5da3fc4f76fe51cca0de3712377ef95064879089c1c723dce9a824e5784cfcd484b869702dad
 DIST gnome-commander-1.10.3.tar.xz 7474512 BLAKE2B f27f86a470bc919327980ba21c577241034290d74b663d4479195fa21249ce9bd238b12a0fae70c3cc6ab26953a595414efbe04508c73f8deb5e7c6e2de6f784 SHA512 87c4df1534747f21b15e48141180601aef02152b1eef097986b0f8675a6d24e75a81ccb7d0b41b2df38cd40eadae2b0bd09f8e0274a5e5cd8bbd8d23df6ffd7f
 EBUILD gnome-commander-1.10.2.ebuild 1628 BLAKE2B 40fc3001f8fe0b58d2c7f9dee7d1bc595d63ba2da9d8e07067f916986d05246cd7f31acdf16548d41a788f4e31226cbc6f8b8a6d62ef7927d47ade4c0ea66fe4 SHA512 a6ebfb3340918098967cef277a616438c0de4a617bddb6c0fba61bf74c005476edef258d9a7af66e3953186aa02c26dcecdf07c7422c5991d5e4175ed64e12f3
-EBUILD gnome-commander-1.10.3.ebuild 1547 BLAKE2B 34af84604facd72fde3444443212dfb7fd76c0732c7b10b2fa1b2d5816863db61b053de70cb6b413a4a27ce3aa867d33db68998b54968079cb2dd6379009581c SHA512 a329ffa2978acc56521959eee1c952ba39889ea3c39de2b9d42fa57f42857f0b6e3cc8448f51e3ab8486a19d2b52409e6a7aad31d28ef9305512d0dc7f70263a
+EBUILD gnome-commander-1.10.3.ebuild 1544 BLAKE2B cea8b081cc1a991d126c482af2cce1a9a3a69223d92c933158218bebe506250d677616fe7cfd1be8c5f60e5c673c3bcabc1d78f5ab4ead198400d48f8369bfc4 SHA512 a6c7db6c2b392550a847c176375c04a6a1c2f7fa30f7e4c20e2e691119703551e0cbc7c1116e5d59a7bfdf6e8d7fcc48548f10eb25ba426a85c869aaea344aeb
 MISC metadata.xml 1154 BLAKE2B a63442239df95b58fab2bce3dd1fcff690b37b5ffd90ada27ae772e118205bdab1567d5a9eabe0140827e30aefe5521d9646f46ccd18b9a5db7de8bbf9a40d75 SHA512 e38f3268f6c44152c0c071d0efc66b805872a67de1a81f19379ccccfc599c6bb0355bf1f37ee0d034f1384ca95e3c2527dadf2bcd5358cb506380f8488b00afc
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.10.3.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.10.3.ebuild
index a6d873b281f6..8718e53d59e9 100644
--- a/gnome-extra/gnome-commander/gnome-commander-1.10.3.ebuild
+++ b/gnome-extra/gnome-commander/gnome-commander-1.10.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/gnome-extra/gnome-getting-started-docs/Manifest b/gnome-extra/gnome-getting-started-docs/Manifest
index 2191233c1474..9e4d70fb0da4 100644
--- a/gnome-extra/gnome-getting-started-docs/Manifest
+++ b/gnome-extra/gnome-getting-started-docs/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-getting-started-docs-3.34.1.tar.xz 91398724 BLAKE2B fc208c7f88ee2ea00af74362540d22ff70cef14aad246021e416ef1b36c3cd33ca783c9947c0a60c8d83f65c7cf289c3c2e284d84efe61d6ec24f7a6d1843673 SHA512 a4e7088cf1eeb11ae8f863ce0496ca312d527b678df3867a5995d51b620a1db56e57afeb7623edbfbb6184aaf792864f4759d237a255a2fd51d0dda64aeff356
 DIST gnome-getting-started-docs-3.34.2.tar.xz 82634148 BLAKE2B 0e21096e57b8e622b48cc174f15a16c3bd4a99cd6fe54920cca743aefcab2643ad3b4b686fb16de0f0b3b412c58119c9bfa0c12982211d7efdd5cb8fa27cf2f5 SHA512 8ff540e095f5afc07b93b52412e92a6854e83435415ed2c9d6f61a5fdba5a70debfacafaa3c7fde3ccc274b880bf01d98d67dc1023b7c7dafefd7eff5c329419
 EBUILD gnome-getting-started-docs-3.34.1.ebuild 418 BLAKE2B ec3e85f27f7e6ebb7833f2e9ac90911d98e807a4b8b1b8dd7655cd3071179f91a7f7bce9f40c9f68a1df246e8f70444aaa777ae0735c29173adbccf67c358983 SHA512 e86cce3515aef24960dfe44e05ae429e49ec2f892a44098ff8ab3aed1a13410369486f5f90672e18cb08d7566c5d92580e413f2d06e35d35be80a42ac6ac908a
-EBUILD gnome-getting-started-docs-3.34.2.ebuild 420 BLAKE2B c538a7321e2b358c714d90c017d76e6a8802de11b7f3ed293b8d826c007b3838d828235f8130d6ea84b1b2d18073f53eefffb54385f82628b33828c0e8ccb9dc SHA512 4c2f07f20e0915386a005900534b626443edfa3e15c67ebbd749bdfe4899d2e989cc527492dcfe7a474ada7c60cb2901e0fd178382f9f173aaedc9a069c5719f
+EBUILD gnome-getting-started-docs-3.34.2.ebuild 419 BLAKE2B b01c360f66d525e81f4c8f7c3ebd235819fdc855f012359ef6c8fb4c996500da5c94153b3873feabe860af8bd48f5647f10e53a73d82eba735080e5985f78a06 SHA512 38e5fec8f3700be66d47362bd61ae4284a7ba7589d7bdc77a80bba4fe8230f1c7a01f55911aa3a6c84076f5a018367575917fa6fcd1ce0ee6f84f0d570eb4ea1
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.34.2.ebuild b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.34.2.ebuild
index 643475314c66..3a6f737099b9 100644
--- a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.34.2.ebuild
+++ b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.34.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://help.gnome.org/"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="gnome-extra/gnome-user-docs"
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest b/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
index 367b432bfd0c..03f09f1bc1d6 100644
--- a/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
+++ b/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
@@ -2,5 +2,5 @@ AUX restore-3.22-compat.patch 1800 BLAKE2B 0289a7849eb57f614945b19872427d56a0873
 DIST gnome-shell-extensions-topicons-plus-22_p20190929.tar.gz 2759460 BLAKE2B 2eb001f472395ade58503a860d3ea8248bb8aeb36b4d6f13f65e1074694aecc02f814d18d449206e1055984177896ac787fd925b4cf2680f226ffaace042cc5d SHA512 47cb156f7a61780a53311855d716c4e4f539832080fc011db634b472b5a8aa0e9fad5b6f44bf2da30665cd97b850725822ee9fb9ed9da014388cf4adeee60fbe
 DIST gnome-shell-extensions-topicons-plus-27.tar.gz 2759687 BLAKE2B 854e5c8c1f749bdb3d8b83ac98d39ddcf22cfbe7221601a80b7b961c1d0dbe8ee2242ec5378c409c786957ff47602a7828fca55a09e7fa6225d4477a156a61de SHA512 3df28397bcefda7a43e6eaa520629f08a3538c98675243af2b1e109ec913d70b55f142169ad0035d0d29cacdf8f2c908eedf222e852591ed1dd5b6aa6b34591e
 EBUILD gnome-shell-extensions-topicons-plus-22_p20190929.ebuild 1488 BLAKE2B b4e6fc474080d082bab98cb5dd7d5a1e71a8a225216ca64308d5502cff7ad2294764b1669529fc8615d889a688d2f9cd6b5576e349cd7a45cc2c25bdba031e5d SHA512 ec7e20f84b1b16e3c7f42eae287cbe11520b081a953fc73363bf5905dc83cf3d8279d315ab2600cfd30764c25365332d020803b33daf35c6de98ac2fb15f55a5
-EBUILD gnome-shell-extensions-topicons-plus-27.ebuild 1193 BLAKE2B 6cdf96aa2fb39a50dcdd76ae9f12b66e2a5ff9661d73985ee4e2143291f07c382be2e10c8b420a33ba0220d911ad52b3b2a838279d3e9161bcec1c2b07a9d8df SHA512 db77f5c4b94b01613a201235be5bc975182eccedfc76b6f4eaf8523604f8a13dd55e4487eaee3cd37528763db6fbfb18f586dfc746106d119a35f6e1e9200857
+EBUILD gnome-shell-extensions-topicons-plus-27.ebuild 1192 BLAKE2B 99cd39b3181cca57f26ba557af2129d8c4c9d68db7365ed9f5661f0be9fca66822856de782c9cb0bd4946bba277125ef0fd8c147d9fac049796a1dbb5c7858ef SHA512 d19f1404ddedef5fc5e6e1ce624839b0acbb1c22ef39315db3dfdf7f396623da41e91fd134551f0539aabab8b6dc4958b3042f8cced5eeb7488af6f7cbdd24cd
 MISC metadata.xml 339 BLAKE2B 0fff96ce59c258cfb52c0616844df2bad11bf14fa283831d608ab862d2ac4fc26af0c4445d906d174290f0abee98149f12b24c85de79adfe2b959c17f14c3b42 SHA512 6bd54fe410561f215eba59872c742b9a11016cede62ddaf0aa8f899bf2c2abffde29cb63c9b819486a750be66b3dadd72257f6e26dcd87798aece31e0a752b40
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-27.ebuild b/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-27.ebuild
index e4e9c8470997..944f1dd0d65d 100644
--- a/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-27.ebuild
+++ b/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-27.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/TopIcons-plus-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 # glib for glib-compile-schemas at build time, needed at runtime anyways
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
index c9b10b3e6f12..2f31a7acff16 100644
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-user-docs-3.34.1.tar.xz 15983924 BLAKE2B 5e9c07cb1e5d33b4fc220a00e679e26d804963fa7ee8d42d4e805e8abaa1e8717028c03815ff3bd82f81d3a61fcf38b258940ec88ef2e9b1fbdf4df6d94bb8d0 SHA512 f9e65f4d0770ce97493f2eaa6b7743575e3bca3d816d0cd06ee35af99016722631086502450db5900693527a71bec9d65c97829c1486b6aff4a137a7f6016baf
 DIST gnome-user-docs-3.34.2.tar.xz 15979452 BLAKE2B cf91c33731ced37a685318ebef0948bd175670cdbfe555b1581ecac8f04b1206e4259f7a1c729e3fddc79322a1cc9cadd1e98a5f95646dc7b1afd64f0d324e9c SHA512 3e9c9e720959b758419201b9e0481ea7d352c77e9a195880f1085ba54485ccf787aaba6ef1cbf48c0a9955e879ebd5fc3d4003d195f522d35d4df047038e1fa2
 EBUILD gnome-user-docs-3.34.1.ebuild 947 BLAKE2B 2d63b7d012c49dd350c274f6e7bc2776c58cc2637512bd9dbf139f53a0d1500c7869832f7a0bfd4ed3ca941e459e3d0ba411c4183ac4df738a91f01cacf6bf32 SHA512 e53c4bbe490e9ae8b08abf8bce2e297c665b38bad680cb52866ffa567240d90757a0f9e1bb8f1e9746ed27d227a5f5b0dfc582cf9a25231d73eb50d462e51dbe
-EBUILD gnome-user-docs-3.34.2.ebuild 949 BLAKE2B 4e576f3a233baa42375a2086e5a18db47ee0d0316063faff9f6bfcf6e4cf766ccf64e12f93d2d300907ac06ff085cd21544782e5d81abc76fa69883b92b2e8fe SHA512 b0cf4e019833cda7ab1e35eef0855fc82fe9e648d4cc3f9f56fbdb2f6290023430645f59540fecd1fdbb316e6e42f68c744118d5f1026590bf17e2c677123888
+EBUILD gnome-user-docs-3.34.2.ebuild 948 BLAKE2B 455b9ca4768808459d147442ac07f054876167e08a92373ea5dcb55e1332425582ee1c7f60400a5e0dc64645c2d6d27844e0f4eadecb0ef256d7bec1e083ffbb SHA512 84a600d012a0955446ea9a2ab017010e3d74e3c5015c0b3a882419fba3a3795f3613a32ea104f14a8b265f14bf806ff9bb4862e8d006e83aa27f1ec5e2c51870
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.34.2.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.34.2.ebuild
index 1c83d246f5a8..40cb7a81b786 100644
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.34.2.ebuild
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-3.34.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-user-docs"
 
 LICENSE="CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/gnome-extra/nautilus-actions/Manifest b/gnome-extra/nautilus-actions/Manifest
deleted file mode 100644
index 8457f4b5723c..000000000000
--- a/gnome-extra/nautilus-actions/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST nautilus-actions-3.2.4.tar.xz 5148812 BLAKE2B e81edf846219b89f3585743d8a3601f21483dff86d601415a968d7f50f9fb4b889038593796d1b442f0395f0c649e7c5c3639b2fc0a42dc05bb7ba6588247709 SHA512 1f8e90fe040b76b0ce9a26f99725e717e6c60a1a838339ec1e26acb5db46b1382e6468e6cabc542e51438b63da2501728cd117e9f77a1710a296e9bd59e402f0
-EBUILD nautilus-actions-3.2.4.ebuild 1220 BLAKE2B 547c8cc69486b962f48533d0cc4726950cd3cf9b92366bb90a85afb3e03e12942f6d08a2ac411f8095a0113f6b6abcfc19640c6175618720f26a7485102c0488 SHA512 add9a5a3aa85abc2a8b2e168dd2604d0e2f443ad13e54406c2283d4416449b2adfccdf03e642b9be7670f20dd54bcc8ad7fd9a0f3f66e4c2201bdbd87c140298
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/nautilus-actions/metadata.xml b/gnome-extra/nautilus-actions/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/nautilus-actions/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>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/nautilus-actions/nautilus-actions-3.2.4.ebuild b/gnome-extra/nautilus-actions/nautilus-actions-3.2.4.ebuild
deleted file mode 100644
index e26c5a7c91ab..000000000000
--- a/gnome-extra/nautilus-actions/nautilus-actions-3.2.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Configures programs to be launched when files are selected in Nautilus"
-HOMEPAGE="http://www.nautilus-actions.org/ https://git.gnome.org/browse/nautilus-actions/"
-
-LICENSE="GPL-2 FDL-1.3"
-SLOT="3"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.30:2
-	>=dev-libs/libxml2-2.6:2
-	dev-libs/libunique:3
-	>=gnome-base/libgtop-2.23.1:2
-	>=gnome-base/nautilus-3
-	sys-apps/util-linux
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libICE
-	>=x11-libs/libSM-1
-
-	!gnome-extra/nautilus-actions:2
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.35.5
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# install docs in /usr/share/doc/${PF}, not ${P}
-	sed -i -e "s:/doc/@PACKAGE@-@VERSION@:/doc/${PF}:g" \
-		Makefile.{am,in} \
-		docs/Makefile.{am,in} \
-		docs/nact/Makefile.{am,in} || die
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-deprecated \
-		--disable-gconf \
-		--with-gtk=3
-}
-
-src_install() {
-	gnome2_src_install
-	# Do not install COPYING
-	rm -v "${ED}usr/share/doc/${PF}"/COPYING* || die
-}
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 595b35e9aee7..5bf6a38dafab 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,6 +1,8 @@
 AUX 1.8.24-fix-bashisms.patch 5304 BLAKE2B d564e84e12033826ed4e1663336d20a0591058a0d50201b3d91180f26f9d46380dea35cd95fc2b0e3bb94dbda70d8f55b7885c13c73f14a526a3e6473863d7d6 SHA512 c8acde4a746d83666671aa0bd1c64b24710219dd932d28eae7ddc56de2e430ef745f92953608ef277ff5d4d94270876ca4d1b6c8ac338571a0af6cef6516b804
 DIST network-manager-applet-1.16.0.tar.xz 1944244 BLAKE2B b5181474da55d9b320d217638a960a9bba1c103d8ff69f171aea57458d425ee8347e8a525b051f1b72888cf33d9b20a850b9e10fb0a487998a5502d2acb92105 SHA512 0ad8ac1d05cf76b9a82602c6f8f7034ae52fc11bae0b5ee17cf5bd89c6c91ba3ef7b07f770397b22484d54fd69e7a9a73f8c08a4d3d9f492f11d09d0b0379ff5
+DIST network-manager-applet-1.18.0.tar.xz 1950696 BLAKE2B d89f4d3c94af2c6bf514fc388fc445415b50508bf7e26f7888d8e212a63879abb24bf860002372bcae71eee94c3b8e9f2bfa9f16814a3537b0f81c486f82e396 SHA512 adca7c723600ec1cb2eed0110e369cf707fde1d64a81489440a167516d178a501fe883c08db06371b8aac896188eb2037a7577ecca721d764be33f4025a386d4
 DIST network-manager-applet-1.8.24.tar.xz 2062132 BLAKE2B fed75ab78e05b59a4f20c7570b84ac6fe3dd2cf6f8ad060f6c65bc9e2a32e29d295fc919de1037ba30c2609d35079dccb3f625ffc019150c9c69cfa94388e2c8 SHA512 76e914ec4f2e6eadd21ccc3e1f613fb97cb72d9551730a1dc09454177365dcaa2cdeea4b855c53732ad6a22cfa5e62e03f09fc8b04a277ce213dcf8c3beaf77c
 EBUILD nm-applet-1.16.0.ebuild 1219 BLAKE2B c8707d4e45ebeee88390da129fa33b80af68a2e269776cf92f06ab9aecee64d7afc1a525be33c68fe66f91d05f27ad9d0185500ab919fa3999869e28d8ad69e3 SHA512 d43c76284ca2bcbcb02edbd5f985ec6a44ceed40d3dda90a10dc8bcdfe08206a8323a5c1a9ef6332bfb05ddf8971dad0a31af9817d8654cef26b337444f2cfb1
+EBUILD nm-applet-1.18.0.ebuild 1219 BLAKE2B c8707d4e45ebeee88390da129fa33b80af68a2e269776cf92f06ab9aecee64d7afc1a525be33c68fe66f91d05f27ad9d0185500ab919fa3999869e28d8ad69e3 SHA512 d43c76284ca2bcbcb02edbd5f985ec6a44ceed40d3dda90a10dc8bcdfe08206a8323a5c1a9ef6332bfb05ddf8971dad0a31af9817d8654cef26b337444f2cfb1
 EBUILD nm-applet-1.8.24-r1.ebuild 1769 BLAKE2B 0b45a7183222fd774830e2ace5d253392d107c35621c83b4195cbbaff7a081a937166b505dbd1a434b3d6fc9c885141fbde7f75e999ea41b8b0bbbfa6b85cc9a SHA512 30956c606f4a35c346ee2260582053bb41137724fc3c7a46d4a3a4d6a8cafe924b27d5f272e6bdcb71e6df9f676fa72d3a38351793c1f2eee8c63248a28e3898
 MISC metadata.xml 548 BLAKE2B 2b7a8b83983ab5c3477f2fbd75b35176f875dd6c9dccd28d8cb010168b10df3ca13307ee525db41c4309f9caab8e7c8e96b0822d3bb8480479a5cec8a25650c1 SHA512 3a163bc5738f3ee35fe00273788f2a3bd943db38832096c9e8a8d7c3676e0b90ba891ed0cc4903109e11c2dbbda950c100b66a79ddfb09b4a5fcb160b6a55067
diff --git a/gnome-extra/nm-applet/nm-applet-1.18.0.ebuild b/gnome-extra/nm-applet/nm-applet-1.18.0.ebuild
new file mode 100644
index 000000000000..49e66011c5f5
--- /dev/null
+++ b/gnome-extra/nm-applet/nm-applet-1.18.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="network-manager-applet"
+
+inherit gnome.org meson xdg
+
+DESCRIPTION="NetworkManager connection editor and applet"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="appindicator modemmanager selinux teamd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	>=app-crypt/libsecret-0.18
+	>=net-libs/libnma-1.8.27
+	>=x11-libs/gtk+-3.10:3
+	>=dev-libs/libgudev-147:=
+	>=x11-libs/libnotify-0.7.0
+	>=net-misc/networkmanager-1.16:=[modemmanager?,teamd?]
+	appindicator? (
+		dev-libs/libappindicator:3
+		>=dev-libs/libdbusmenu-16.04.0
+	)
+	modemmanager? ( net-misc/modemmanager )
+	selinux? ( sys-libs/libselinux )
+	teamd? ( >=dev-libs/jansson-2.7 )
+
+	virtual/freedesktop-icon-theme
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dappindicator=$(usex appindicator ubuntu no)
+		$(meson_use modemmanager wwan)
+		$(meson_use selinux)
+		$(meson_use teamd team)
+		-Dmore_asserts=0
+		-Dld_gc=false
+	)
+	meson_src_configure
+}
diff --git a/gnustep-apps/Manifest.gz b/gnustep-apps/Manifest.gz
index c7d7ba9c35fa..cfca29d99a94 100644
--- a/gnustep-apps/Manifest.gz
+++ b/gnustep-apps/Manifest.gz
diff --git a/gnustep-apps/aclock/Manifest b/gnustep-apps/aclock/Manifest
index 674c2c86c26b..c760836c3d0a 100644
--- a/gnustep-apps/aclock/Manifest
+++ b/gnustep-apps/aclock/Manifest
@@ -1,3 +1,4 @@
 DIST AClock-0.4.0.tar.gz 299488 BLAKE2B 36f41fe1abcc0de77b4d4c9f9be1af46a5c7741b7f71596803bb2debbd57cf750d4c8c87e86f00f185e20ef8f26ac3e795edd8fe4a5e462f3cfdb991780ff8b7 SHA512 45435e6b1e02b8fb6b924c7fbb5546f3836b7ee8a072323a5b7df0cf855b1a7f838234fb6318c558189f5a12e29275c2c85f61c4c989bfb5dbebfd087a5a7561
+EBUILD aclock-0.4.0-r1.ebuild 598 BLAKE2B 8e1c031d3aaa6e463856efab1ad81f058bad7c98e434a6404f9ac01028647e939922d2552fe1d969a0911f4aeb128f593587ec1188c05e6716368557db8b3a6e SHA512 24651210277f9c1b336655a0fd9591e671dd6a92e69536bff1698261b2069c3094d1a1774a7a3f7e50d030c00c6415f78d7f11c26616a2b3b9ae2cd6d282fed9
 EBUILD aclock-0.4.0.ebuild 600 BLAKE2B 8f2ff54d8d2a83e33ed4c1b62f4fdff948f2b1915d2335bb3719128cd1cb42daf2d483796a8cde78e3dc44644c5309870c98390cfd9068e2834029fbc9cace61 SHA512 29e54acef6fcdac6fefe0e4e8545a58472a6b03b19f3c1ad4125778d978d69fca16995965f417b9de4d8fd61617ee0154d9db1fd2f67dbbc453f2f863b7ca9d1
 MISC metadata.xml 502 BLAKE2B 90c79de83b11e608a34c9e89eddf66384af448441b98f78baecfe41c6abf39217679cea26dc8e7557521003bca52c0cdd5f83f2cef111dd46a4299d76022485a SHA512 0503620550f83aabe426fdad0dea14e0087ff4adc0013c69047b2330896b8afcad2d926d25817ec991a7607487810904f0a2438965c9738cda9414313e7c5e33
diff --git a/gnustep-apps/aclock/aclock-0.4.0-r1.ebuild b/gnustep-apps/aclock/aclock-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..f92175f8780e
--- /dev/null
+++ b/gnustep-apps/aclock/aclock-0.4.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnustep-2
+
+MY_P="${P/ac/AC}"
+DESCRIPTION="Analog dockapp clock for GNUstep"
+HOMEPAGE="http://gap.nongnu.org/aclock/"
+SRC_URI="https://savannah.nongnu.org/download/gap/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+S="${WORKDIR}/${MY_P}"
+
+gnustep_config_script() {
+	echo "echo ' * using smooth seconds'"
+	echo "defaults write AClock SmoothSeconds YES"
+	echo "echo ' * setting refresh rate to 0.1 seconds'"
+	echo "defaults write AClock RefreshRate 0.1"
+}
diff --git a/gnustep-apps/addresses/Manifest b/gnustep-apps/addresses/Manifest
index a8f5b431bd19..d4957c87ee1c 100644
--- a/gnustep-apps/addresses/Manifest
+++ b/gnustep-apps/addresses/Manifest
@@ -1,4 +1,5 @@
-AUX addresses-0.4.7-as-needed.patch 1041 BLAKE2B d31e425f7a6807bb0ada248e749d43695c5d0a304a3b6310bbe67c8e65c3d12beed374b6f15dda56b2bb63cbd8d81c90feeab0266e3ae99351a61c23dbddc615 SHA512 7999d1f420af2300f30efa96763b390cda9c16a9c37a8ea1fe0dc816874239857f3c5df8d1861203ab06c94e92e0887954c0acb7fcf6eb3ff074158c3a3ebb99
+AUX addresses-0.4.7-as-needed.patch 1049 BLAKE2B 57f087d56fbc1b92f134ebeb8dc3fe04493bbd614002b90e2570e0179d174d4e4a91171b8a78e07c7d18664c0586fad465121ab721d6f97529cb1de5216bf3aa SHA512 926347e920eb6a02cb13dce60a45dacc095f131feeef26b2bb504ec108ed436c0efe725ce662d569cb19840a67bbadb84e84da6c20b7343146a2203cd01ce339
 DIST Addresses-0.4.8.tar.gz 287207 BLAKE2B 68387772f7fe1597b898afcd5f2c4254aa3174cd7ee494f155a9e79c84e3fc4c526c358f37464d6e2cddafaf5ec6b92b5bd646f03afedad3954fe5068bed0d56 SHA512 2cd6bd16620d3fa4136242dd89c3281800bba0caeb99e986d3d6beacf31ae19b3dd7f563da2fe52038781cca639815dfc740c15b0e5273facf8cc2400d90fc0f
+EBUILD addresses-0.4.8-r1.ebuild 451 BLAKE2B 733c361ecee6d02d24c543806d13b67272e67a3f6cbb378c529a3bfb6dc1c264460c7740637e2d64aec93989e115c6d43490627253bcfadd6b9bafaa984ff7bc SHA512 eeaaf7b015530f0215b91937df9f8019bf7fb3f56c2e8019824d3d32e46f86e170be55f55551a2e63b481cb5e9e1944ab82f707703688fc5f5d3552b12c13617
 EBUILD addresses-0.4.8.ebuild 486 BLAKE2B 75562568f27139f2547605084841e68363b83a0ba2b6e4865ed13fb973f84614d7821b7577d614684387d8518a9a5004ca176910f4e43e68c2dcef3586c4be75 SHA512 1a754e5d6e597ad10e70e084ce0db51eed1141c3bf650e309ac3585b6d29067cb9e359d2b29bf6799fe68253d484db9bf449073cdc722f7cb14278646fc0c6c9
 MISC metadata.xml 585 BLAKE2B 301402f548058abc9225d7d41df354c9c2fa6c86890c0381461405d8c56b482e4e3193c732a9af6735f88200128e782f395bd70418d303026ba1c2b3fe644ed3 SHA512 0080e2aebc0af5124766886742c73d4c999e07dec9c17c78e771889feb14cf60b0201b3f7c8e1c8105af1a525df0b3bbdc82116a02485e2566c0c41108ae6f14
diff --git a/gnustep-apps/addresses/addresses-0.4.8-r1.ebuild b/gnustep-apps/addresses/addresses-0.4.8-r1.ebuild
new file mode 100644
index 000000000000..19301377b79c
--- /dev/null
+++ b/gnustep-apps/addresses/addresses-0.4.8-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnustep-2
+
+DESCRIPTION="Apple Addressbook work alike (standalone and for GNUMail)"
+HOMEPAGE="http://gap.nongnu.org/addresses/"
+SRC_URI="https://savannah.nongnu.org/download/gap/${P/a/A}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+S="${WORKDIR}/${P/a/A}"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.4.7-as-needed.patch )
diff --git a/gnustep-apps/addresses/files/addresses-0.4.7-as-needed.patch b/gnustep-apps/addresses/files/addresses-0.4.7-as-needed.patch
index cdb7a84755e3..483627fbda17 100644
--- a/gnustep-apps/addresses/files/addresses-0.4.7-as-needed.patch
+++ b/gnustep-apps/addresses/files/addresses-0.4.7-as-needed.patch
@@ -1,6 +1,6 @@
 diff -Naur AddressManager.orig/GNUmakefile AddressManager/GNUmakefile
---- AddressManager.orig/GNUmakefile	2008-12-08 17:19:03.000000000 +0100
-+++ AddressManager/GNUmakefile	2008-12-08 17:19:28.000000000 +0100
+--- a/AddressManager.orig/GNUmakefile	2008-12-08 17:19:03.000000000 +0100
++++ b/AddressManager/GNUmakefile	2008-12-08 17:19:28.000000000 +0100
 @@ -24,8 +24,7 @@
  AddressManager_OBJCFLAGS=-I../Frameworks -Wall
  AddressManager_LDFLAGS=\
@@ -12,8 +12,8 @@ diff -Naur AddressManager.orig/GNUmakefile AddressManager/GNUmakefile
  -include GNUmakefile.preamble
  -include GNUmakefile.local
 diff -Naur AddressManager.orig/GNUmakefile.preamble AddressManager/GNUmakefile.preamble
---- AddressManager.orig/GNUmakefile.preamble	2008-12-08 17:19:03.000000000 +0100
-+++ AddressManager/GNUmakefile.preamble	2008-12-08 17:19:24.000000000 +0100
+--- a/AddressManager.orig/GNUmakefile.preamble	2008-12-08 17:19:03.000000000 +0100
++++ b/AddressManager/GNUmakefile.preamble	2008-12-08 17:19:24.000000000 +0100
 @@ -27,7 +27,7 @@
  # ObjC stuff
  ADDITIONAL_OBJC_LIBS +=
diff --git a/gnustep-apps/gmines/Manifest b/gnustep-apps/gmines/Manifest
index 22581c14f9ff..dd1b8e49fd3c 100644
--- a/gnustep-apps/gmines/Manifest
+++ b/gnustep-apps/gmines/Manifest
@@ -1,3 +1,4 @@
 DIST GMines-0.2.tar.gz 6768 BLAKE2B 7ff0abddef4d56245b35105d387e0994b2c4ed1c52fec5bd2166fced92153779f5cbd7e7f0b5e0e63f00463662719880db83a50d00c94b3221ef5435d7c4bcaf SHA512 592facdfb5db04418d79404ea2e6908fb7b7d67c4c55ab62e157bc18a7c69f3a5653bf2579257c56f91858f96785c424df7edcb8036c603fc1fb0740e68dd764
+EBUILD gmines-0.2-r1.ebuild 379 BLAKE2B 2868fe7a93c0296a10b1f6805af194012d7724f91c6f3291b8718859467c0b12c1ef28cbfb4b0ee741d1c9d18287f19697aff55ac2b4f98921f8fd5bc3090752 SHA512 ce14b39eb7d49f6a9d12fbaa2a3ff4d65a02ab2c081094850271b0240552311741324af27570d99f820fdfa45d36cadf3a31178cb94d6041efe9a8b5148759dc
 EBUILD gmines-0.2.ebuild 383 BLAKE2B de7f3d0bc5c490f2a9818000b2462a61112ca21898ea558e71388df0a2fdaab6ca5d932df93d5e6d0f74807462057e97122b681d19b4a4abb1c5ae06c5460726 SHA512 ffe6c92f1951efc5ebb6efb13b22154740134287f36719985541556d8df46cf8e584b5e0077b35ce2855cd80037c1a0491cb13e0ea403c5e2e0db5665d3e061c
 MISC metadata.xml 421 BLAKE2B 1bc3a8e001ac097510721f0927bb1779c61a8498508b8265838fba9106c33d2bb88e3da388a14b0b70e4c4ef76e31f789e3282a07dce0a71d2c87d60a3385b47 SHA512 f27f202c480fdcb3dfc9bbf082f35404c4f25baf6cbaa195f04f7a4934c77cb27d83740ae8bcf14cab86f1412aa0dcbf48af87afc0ccfe868acc8922f45ae408
diff --git a/gnustep-apps/gmines/gmines-0.2-r1.ebuild b/gnustep-apps/gmines/gmines-0.2-r1.ebuild
new file mode 100644
index 000000000000..d49c77a2fa02
--- /dev/null
+++ b/gnustep-apps/gmines/gmines-0.2-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnustep-2
+
+DESCRIPTION="The well-known minesweeper game"
+HOMEPAGE="http://gap.nongnu.org/gmines/index.html"
+SRC_URI="https://savannah.nongnu.org/download/gap/${P/gm/GM}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="GPL-2+"
+
+S="${WORKDIR}/${P/gm/GM}"
diff --git a/gnustep-apps/gspdf/Manifest b/gnustep-apps/gspdf/Manifest
index 216e897a4154..a32151f5c1e9 100644
--- a/gnustep-apps/gspdf/Manifest
+++ b/gnustep-apps/gspdf/Manifest
@@ -1,3 +1,3 @@
 DIST GSPdf-0.5.tar.gz 44357 BLAKE2B d0c49fac60281c2d6dfa16f70b34cc31bafc265dd8bde064fd2311499388f3990aefbe1fcaa8f9056336450d31f70cd77e2e3e26795852a1a2cc201c5590607c SHA512 ad173c0301bb3d6395e52f911b4657ad8c69e989366035a50c05705c08dc5afd1561c4acfd1a0fea53b2a02842261351407c479919332c65545bde6a10744041
-EBUILD gspdf-0.5.ebuild 461 BLAKE2B deb8e8e805dd1659ffee5dfb350e7574a8ab34d513e07d40950b5c0df6a5cbc6f1ec988f3d1b64b30ac97ed7534637083958d14dadf744daa26b7d21e3c36894 SHA512 91c585d819fd37599da7011dc4198104c52a1b5621ae01b559793b47cd34bbe249de744cddaac0c82decb290cce3c1fd177d4d9f903b16842a424ba2d4ff5602
+EBUILD gspdf-0.5.ebuild 448 BLAKE2B 0b86ee94bc4a7bc6f094062e5b1b622c0f0e95fd279bc066de951460086c4cd2ea909d456b9e93b044ca807ab713b5f6fcebcdf0677d2b0587a9ae48a469ab60 SHA512 201ad50d58e852b5caf1655cb4508c77f09a5340b9c509c602b12d2bc87bce017f670fbbedab9535d260146971d3c35f1fc4cff548cfc23506e9579070cd0308
 MISC metadata.xml 413 BLAKE2B a70404defc045cb71cb9ef405dfe0031ba5a48f7a5ceaaf1ea1388d7631d492270646cc06a73df0b53c87e0ad5eb68dced9199e06de93df682da6b0985333512 SHA512 5038f7a95ddebf9bd2f2a862749603e5b12832573c0bf6770643a06178d5647cce20883f7b30ed15eda05016d5db9ebf8e1132fc3c441ccde57b3fbe9730f8c3
diff --git a/gnustep-apps/gspdf/gspdf-0.5.ebuild b/gnustep-apps/gspdf/gspdf-0.5.ebuild
index fdc73ac613c8..ce036fe99602 100644
--- a/gnustep-apps/gspdf/gspdf-0.5.ebuild
+++ b/gnustep-apps/gspdf/gspdf-0.5.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils gnustep-2
+EAPI=7
+inherit gnustep-2
 
-MY_PN=GSPdf
+MY_PN="GSPdf"
 DESCRIPTION="Postscript and Pdf Viewer using GhostScript"
 HOMEPAGE="http://gap.nongnu.org/gspdf/index.html"
 SRC_URI="https://savannah.nongnu.org/download/gap/${MY_PN}-${PV}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
 RDEPEND="app-text/ghostscript-gpl"
 
-S=${WORKDIR}/${MY_PN}-${PV}
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/gnustep-apps/lapispuzzle/Manifest b/gnustep-apps/lapispuzzle/Manifest
index 4a677a8d1273..6d2bf6f0526f 100644
--- a/gnustep-apps/lapispuzzle/Manifest
+++ b/gnustep-apps/lapispuzzle/Manifest
@@ -1,3 +1,3 @@
 DIST LapisPuzzle-1.2.tar.gz 30188 BLAKE2B 75f5a0c0b748c7be91ac11fd1d3d6b6b44e46d3c446508cc8f54ac7d810b0427b7305868e5045b2e23b1b0f643c6aea9a9ba318d9651b473dcbc7c8c2b2a0b50 SHA512 d7fc846ad2e771a0adace983d4d6c07a71680ab8164e9ca459e2be44774df393602338d125a4c4dac8c8c0d8315a861118e4fa56c59139d964bba64aa7bb443b
-EBUILD lapispuzzle-1.2.ebuild 467 BLAKE2B e52b6a6e9d763cd2e47a4403fa1d6c74ae638074d397862cdab036ccf2215d7d96f5955bbc5b60625ff1b9254b993255f80b3bff50de2080870abc7645b7bf68 SHA512 e1f13f242bc8a270f360e1728c87d8b6329c8a3a52aa848580a13c9b724feb2f5268c12a8a6d846b3ff8d8f5559796eb12f300c3403e4825702d77bac4e721f6
+EBUILD lapispuzzle-1.2.ebuild 430 BLAKE2B c3f096bd5009643bc6070bf8038f015614c6f2cc1128e9502108f6ccb35b7350f0c768e2c7792bb449fa4ff154016c5b000583fd162479e4b76661c075a2a5eb SHA512 a6d946627d202a06be7e53372bdd14c79fa87847e86f1525492e25e8ed465fbcf366618a1ed40c19ed9f8d8ff0ffda731a9ebfeda548a655bbb997765ccda2f6
 MISC metadata.xml 427 BLAKE2B b94984b58a33447d1a947a17df89b9112b87c425ba6a89ccd2a8c2f4f664c9e6b75100272ed9c4c94a24144f1e3616b07cad4824d3e496b791b9f9cd5150b116 SHA512 cd109c7f9cf95dc765849ae3780b977e5e7de40cfd909fc064e4bf29cf4ca50e3cfefd022861eaac65c79f31ad5f863b5c7d82255b5254373b459e8c343a1495
diff --git a/gnustep-apps/lapispuzzle/lapispuzzle-1.2.ebuild b/gnustep-apps/lapispuzzle/lapispuzzle-1.2.ebuild
index 628a8ba5a0bd..d488f677560b 100644
--- a/gnustep-apps/lapispuzzle/lapispuzzle-1.2.ebuild
+++ b/gnustep-apps/lapispuzzle/lapispuzzle-1.2.ebuild
@@ -1,21 +1,17 @@
-# 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 gnustep-2
 
-MY_P=LapisPuzzle-${PV}
+MY_P="LapisPuzzle-${PV}"
 
 DESCRIPTION="a Tetris-like game where each player is effected by the others game play"
 HOMEPAGE="http://gap.nongnu.org/lapispuzzle/"
 SRC_URI="https://savannah.nongnu.org/download/gap/${MY_P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
diff --git a/gnustep-apps/laternamagica/Manifest b/gnustep-apps/laternamagica/Manifest
index 48ffc0eec281..de59352ae520 100644
--- a/gnustep-apps/laternamagica/Manifest
+++ b/gnustep-apps/laternamagica/Manifest
@@ -1,5 +1,3 @@
-DIST LaternaMagica-0.4.tar.gz 127317 BLAKE2B facd517eeb6d271d9aed2dfa89db2d44488d12c39fa31b227847598e6e7127f33338929cd5318989b15127302db9c8891b9827f24c66c746a662c83bc0060603 SHA512 ba07abcd3a8f5e700fc1190bdc9664e34d2e26034ec6e2ac1688ed3e5b31659d9a59cbd1df9d4bea5a913e48c5c431a13e646a0be1b1b457e0ce8189d25eecef
 DIST LaternaMagica-0.5.tar.gz 124896 BLAKE2B 90db269b5b7e4e0810cd3c6d0341034d36fb154534d16d0e60dd9ec109a7e93cb1146c6ca434f6dae7fd1afb2fd123f7bc7c2922618c6c4e052b0a7b87178c26 SHA512 830ba5432a8c5f7e4ec15523d53ad16a3e2bf9502ac4324ecfcf71131f4fd0b562424e5b4990732f0841ab06ee668115b5ef2c1ff8066390a193d2f655d207ce
-EBUILD laternamagica-0.4.ebuild 420 BLAKE2B d8619e64b96d25809cd250aca68973564c1c2387a567efd35dcefe5ad80a75ceb34643721130c34989314dc764dfcb353d2b3318ae9901cd6b9ca69c5897d946 SHA512 927b67130f5881eb5078a93896a3cd7b9440a7e85ece86be2426cd1a845255c2503f3ed59dc5e848ce5f76ec307ecc11e3cfd8b786982b3d6de1cad145a802d7
-EBUILD laternamagica-0.5.ebuild 420 BLAKE2B faf285a749f2e7c2e0a075dedf3591767b202c863627d85aadffd730498f915a0e406ab59fddd8ce0369beaeea423bfdf6aa801ea0b57ecc372533f2809a719c SHA512 7e613400eca1203b9fa5e98445619ce9138c0bf35215bd862c494db17ab2407b1a8b3ca562620191edf1a1e0842eddcd102dc000dc83575888a95572472c64a2
+EBUILD laternamagica-0.5.ebuild 412 BLAKE2B cf7ce5355b0e8b2d09dc455abef8a6859686a56ef3b2e25c199b1a5c1c93ca2999c9deb6a00f10e9debcc471cc45d978b63d494beb45fc5c0f85555fe59915a0 SHA512 586d37ce99ebf4d606f5f9e869d6b62acf268558eb65392ad933ac9c3fce829df630abbc239b41f00eb56ca37488b7ac0094a278bf11768c3365b063fa68faf6
 MISC metadata.xml 775 BLAKE2B af9fc6832c8c4487135fc6c88ddb004301f8bbec8724fd94d44b021d56e7e1ff6be3f59c00ec48c76fd1b7440029714c7e8361dccb79476291bb3c1fcc97170e SHA512 0c8640c874db01ddd4b2f4def0684e2e93f19d6f638925dca78c1d86f2149f6f1abfeff795bd5c0b6d678aaabda324ce1ba659b488bb2933797e6e5ecc7f4238
diff --git a/gnustep-apps/laternamagica/laternamagica-0.4.ebuild b/gnustep-apps/laternamagica/laternamagica-0.4.ebuild
deleted file mode 100644
index 73582ce66670..000000000000
--- a/gnustep-apps/laternamagica/laternamagica-0.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit gnustep-2
-
-MY_P="LaternaMagica-${PV}"
-DESCRIPTION="an image viewer and slideshow application"
-HOMEPAGE="http://gap.nongnu.org/laternamagica/index.html"
-SRC_URI="https://savannah.nongnu.org/download/gap/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/gnustep-apps/laternamagica/laternamagica-0.5.ebuild b/gnustep-apps/laternamagica/laternamagica-0.5.ebuild
index 02e182c088b0..7002a4023082 100644
--- a/gnustep-apps/laternamagica/laternamagica-0.5.ebuild
+++ b/gnustep-apps/laternamagica/laternamagica-0.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit gnustep-2
 
 MY_P="LaternaMagica-${PV}"
@@ -9,9 +9,8 @@ DESCRIPTION="an image viewer and slideshow application"
 HOMEPAGE="http://gap.nongnu.org/laternamagica/index.html"
 SRC_URI="https://savannah.nongnu.org/download/gap/${MY_P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 232c5f19d349..d5aeec897b7b 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/wf-config/Manifest b/gui-libs/wf-config/Manifest
index 07d4a64402a8..9604e2b13505 100644
--- a/gui-libs/wf-config/Manifest
+++ b/gui-libs/wf-config/Manifest
@@ -1,4 +1,4 @@
-DIST wf-config-0.4.0.tar.xz 64108 BLAKE2B 83999dd246e6b7a6c54bbbcdf7abf08767b31bd29e75cd41d9844c4b98c66fbe787b7d87ec433e2c5e860e476f4f621116aac16c7f3f56903ee1689c5d1bc6c9 SHA512 30358ada695012b9f4be835f2b2d032e0d8d52c3e9d49d39ae975c74bc0cac188341e507124a088d8cdb3d62c77645a7d435262d15a6cc604b4738861362a299
-EBUILD wf-config-0.4.0-r1.ebuild 679 BLAKE2B 258a4d4918c3c5a55a31b905f22e3af4e8361d5e925a69511027b802448020bd93b975d466f3ed7dbdf35611c45dfe70436ce3508777366983935cff2ae506c5 SHA512 d359fce329fd2cc9809e36ae29bb9f4f946333fb3a0e4c77e66bef5d4554bb14ac40d79aac91f1149476fe4f10f6f6ecae1ae405de04a34b494330e43ed63ca8
+DIST wf-config-0.4.1.tar.xz 64752 BLAKE2B ed873ee15b860690a3ac2d8623c0af933f2892c24ff6c9a10ec090bf8e7b2787970b71869c07d5e8281417ed59a4881cf3117ecb085a6d7a1eeb8fdac7375245 SHA512 99d11dfc04e80645cc29491c9ef913015a6ad6f49f351b041b277ecc2e24f9b47fc96a22ce031e51b577fe4b31df07c448d2fafb715e8fe5118e677ccbf9abe8
+EBUILD wf-config-0.4.1.ebuild 679 BLAKE2B 258a4d4918c3c5a55a31b905f22e3af4e8361d5e925a69511027b802448020bd93b975d466f3ed7dbdf35611c45dfe70436ce3508777366983935cff2ae506c5 SHA512 d359fce329fd2cc9809e36ae29bb9f4f946333fb3a0e4c77e66bef5d4554bb14ac40d79aac91f1149476fe4f10f6f6ecae1ae405de04a34b494330e43ed63ca8
 EBUILD wf-config-9999.ebuild 677 BLAKE2B a34dbc8b675f9432906844a41d78ff79479f4a0e66bf5850a90e527d4c5417e929116039a6ffbd2bab46b247742f48b01b449d1c8d9256a0fb2ee8b14453c855 SHA512 e3290ade7af238c02e1a913d78318a4179e2cee18a09391e86c9c416546d703f7e22404cca91467759645a0000d7719eb70e24b4ce70b695cb13169471425a34
 MISC metadata.xml 635 BLAKE2B 9152d0eb342e1cd50821c22beb370e0fb62acb40edefc5f0c2bb8f2c61852239f596975692c6ab6cbb36304a074357ee567f807577facd768025e9452072db4b SHA512 acdaed58e3430342773bec4dff0c0879c371b4cd26fb8ddf84606fd3ab2eee3f4d19b1a471b843e6880d2678f47fdf8533e872c37357639094084a9480cd91ed
diff --git a/gui-libs/wf-config/wf-config-0.4.0-r1.ebuild b/gui-libs/wf-config/wf-config-0.4.1.ebuild
index d415dd76e3da..d415dd76e3da 100644
--- a/gui-libs/wf-config/wf-config-0.4.0-r1.ebuild
+++ b/gui-libs/wf-config/wf-config-0.4.1.ebuild
diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 89ea62a65149..57fea9c1f1c3 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/hikari/Manifest b/gui-wm/hikari/Manifest
index 6b7799c6e7e0..22a7bd6ecb92 100644
--- a/gui-wm/hikari/Manifest
+++ b/gui-wm/hikari/Manifest
@@ -1,7 +1,7 @@
 AUX hikari-1.2.0-gnu-make.patch 9378 BLAKE2B 77cb4dce472803167db411114f3259a21d15f46e0427d5c0ecfd59611440581120b6a1488c619ab0b85d8a97312878b59e6f7228392b5a41a740c52c8cc70fde SHA512 15fcdb0a4bcbcb846ce0cb8abb2b7980ff2f6aae191b592b254805a99149f63f65af572e848b9f7a19820b11fd4cd4dce8e6de5ea24e2fc2bac42a81ad98380d
-AUX hikari-2.0.1-gnu-make.patch 10167 BLAKE2B 70c1620b331cac9f3df11576d52f93ebc7c87465ddf9cc1b250a364b88276b8d4a5882d22f3ad4f773ac4bebcc71ef6c997344fa21d41d0dd06338dae34cc826 SHA512 83ab45d6e7debb7ac3304c4314bd02949e507eac10b91f4aba1a1d6692d497df155d93abefd55849bc6f3d18eae9b722be43c01bc3a9ba04b8d5d724822f7c9b
+AUX hikari-2.0.2-gnu-make.patch 10167 BLAKE2B 01b068ecb4921ff57238bac80079bbc399a292c5a22b62b85846f316a5961d7ea7724f9d4a95a3db1e8a4f8394b9f46b44f7fe5b7f4b193c3b4091fc42035cca SHA512 1e1d2a10d2d70bb5561e84007a0393b5ce5e99036caa27b7590877caf61895521cf3aa82aa7864797a7c6d77e5f30d058ec5feece455f259f9323c4d0387fc96
 DIST hikari-1.2.0.tar.gz 98941 BLAKE2B 0b882d483143e307d4b173560f335e85b4c5613b75c51c6b70b68df9b4f70f9a009d95cb8eda1c211f4968b5c8600e7113bca5e014cecfb1917db2acae7e6f3d SHA512 2bd0b6032541ca63a2bd12aee9155e9b0d08e4c541ec2f837073f1498ecb39df969f8821fcbd066e44c5ddaf658e4875bea25f344226b7ea97fe008a0db4d328
-DIST hikari-2.0.1.tar.gz 1003467 BLAKE2B 8a299fe1d85fac5df04f2475295250d78706c5da9c14a965ff8c7c91af36eaf5711675dc07c43c83974411719b88d483eee24ebd24a87eb1b3280a89b521a19e SHA512 18f8f46ae38fa307b63c44011da084ee0ec4a0925ff8ea3677fda9171bfd25b42853719cea812aabee2d377e6208ddcaf69692e1fb0655110f8d1905d1be00e8
+DIST hikari-2.0.2.tar.gz 1003593 BLAKE2B 89a2ec29673e7ac371a7e4f179b3dc398fbacb3daf859a9f1a53cf74aac9dc36ca33f3dc1878360fdae80ef39315a0b06d0988d897c9ce58693404fd3099d6bf SHA512 12e6cf2f1f24a4c0b64e6c035c518bdc5dbfa094a220147c374f599df8b52a4ee4c1f3cdffe1080fe87c665841a6ca018de4a48ec65aaa5b60e9e968087d83d6
 EBUILD hikari-1.2.0.ebuild 1081 BLAKE2B ff23f482966cb8b8487bbe001618d9fcfffc6eb4e2e76e49a8160e5859eeb5240432be3f0ff3ad2d796ac441e0bb4cf0a71dedbb1c701b6d470b26c68d4b578c SHA512 78676b87836d736bc6c7cf8f905e5d74b93c6739117089694db827307d1ecaa362c93399c3c73e5ce8a1035129b6acebe471bbf595ce35f9f496e1992abefc2b
-EBUILD hikari-2.0.1-r1.ebuild 1242 BLAKE2B eca47da1d671e007c9974754ff7dcba0c79f69108252f986e71557022cd44bf125ebee3556ac8b80c63c9cb43784129eeeb33e4540b1846969696c67df7f2cf7 SHA512 7219322dd4310a02b2b620edcef313ac780c77baec2ccc80bbaed4832b0b067e5607a7d0d88cd8bb38abe080f6321895d6c131797bd0113a2d0beeccb866dc4a
+EBUILD hikari-2.0.2.ebuild 1266 BLAKE2B 6a4010e117e93d65079736dffb07cedcf4074152b9ed60783a910ceb2c4bcafa79e62b4420008decb879d53d8b18d597a2fe407c5e7f64e97cc72bd61345657b SHA512 f371790d40e13c191b9deffa805f0929a3ea61a597b89d0fcffc950ac468511165d29ad4e0505ced4c6c2e3855ff092e31696a2da5b31b9aff9280161ac067d3
 MISC metadata.xml 970 BLAKE2B 3862fa99df4057da6ef427fefe51f33b1ac2adcc2c9ce51393f5189fa85ffea7b19b06898b23433e1980e32c08f5597f92e133095a4a849f3447bf77e1e4623e SHA512 c1032c3c177cdc0ad4afea2276f451bf39a7220c6d7f015d89c7a193b6fc194dae9e0711382126cf6df828c8b93e2445f3c28d93a2459cae1991d39fb2340430
diff --git a/gui-wm/hikari/files/hikari-2.0.1-gnu-make.patch b/gui-wm/hikari/files/hikari-2.0.1-gnu-make.patch
deleted file mode 100644
index 0f5a67a62425..000000000000
--- a/gui-wm/hikari/files/hikari-2.0.1-gnu-make.patch
+++ /dev/null
@@ -1,327 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 0f104d0..39d6972 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,22 @@
-+TARGET =	hikari
-+
-+DESTDIR	?=
-+
-+prefix ?=	/usr/local
-+exec_prefix ?=	$(prefix)
-+bindir ?=	$(exec_prefix)/bin
-+sysconfdir ?=	$(prefix)/etc
-+
-+PKG_CONFIG ?=	pkg-config
-+
-+VERSION ?=	"CURRENT"
-+
-+### Upstream variables
-+PREFIX ?=	$(DESTDIR)$(prefix)
-+ETC_PREFIX ?=	$(DESTDIR)$(sysconfdir)
-+
- OS != uname
--VERSION ?= "CURRENT"
--PREFIX ?= /usr/local
--ETC_PREFIX ?= ${PREFIX}
-+INSTALL_GROUP != id -gn
- 
- OBJS = \
- 	action.o \
-@@ -29,7 +44,6 @@ OBJS = \
- 	layout.o \
- 	layout_config.o \
- 	layout_select_mode.o \
--	main.o \
- 	mark.o \
- 	mark_assign_mode.o \
- 	mark_select_mode.o \
-@@ -56,116 +70,127 @@ OBJS = \
- 	xwayland_unmanaged_view.o \
- 	xwayland_view.o
- 
--WAYLAND_PROTOCOLS != pkg-config --variable pkgdatadir wayland-protocols
--
--.PHONY: distclean clean clean-doc doc dist install uninstall
--.PATH: src
-+WAYLAND_PROTOCOLS != $(PKG_CONFIG) --variable pkgdatadir wayland-protocols
- 
- # Allow specification of /extra/ CFLAGS and LDFLAGS
--CFLAGS += ${CFLAGS_EXTRA}
--LDFLAGS += ${LDFLAGS_EXTRA}
-+CFLAGS += $(CFLAGS_EXTRA)
-+LDFLAGS += $(LDFLAGS_EXTRA)
- 
--.ifdef DEBUG
-+ifdef DEBUG
- CFLAGS += -g -O0 -fsanitize=address
--.else
-+else
- CFLAGS += -DNDEBUG
--.endif
-+endif
- 
--.ifdef WITH_POSIX_C_SOURCE
-+ifdef WITH_POSIX_C_SOURCE
- CFLAGS += -D_POSIX_C_SOURCE=200809L
--.endif
-+endif
- 
--.ifdef WITH_XWAYLAND
-+ifdef WITH_XWAYLAND
- CFLAGS += -DHAVE_XWAYLAND=1
--.endif
-+endif
- 
--.ifdef WITH_GAMMACONTROL
-+ifdef WITH_GAMMACONTROL
- CFLAGS += -DHAVE_GAMMACONTROL=1
--.endif
-+endif
- 
--.ifdef WITH_SCREENCOPY
-+ifdef WITH_SCREENCOPY
- CFLAGS += -DHAVE_SCREENCOPY=1
--.endif
-+endif
- 
--.ifdef WITH_LAYERSHELL
-+ifdef WITH_LAYERSHELL
- CFLAGS += -DHAVE_LAYERSHELL=1
--.endif
-+endif
- 
--.ifdef WITHOUT_SUID
-+ifdef WITHOUT_SUID
- PERMS = 555
--.else
-+else
- PERMS = 4555
--.endif
-+endif
- 
--CFLAGS += -Wall -I. -Iinclude -DHIKARI_ETC_PREFIX=${ETC_PREFIX}
-+CFLAGS += -Wall -I. -Iinclude -DHIKARI_ETC_PREFIX=$(ETC_PREFIX)
- 
--WLROOTS_CFLAGS != pkg-config --cflags wlroots
--WLROOTS_LIBS != pkg-config --libs wlroots
-+WLROOTS_CFLAGS != $(PKG_CONFIG) --cflags wlroots
-+WLROOTS_LIBS != $(PKG_CONFIG) --libs wlroots
- 
- WLROOTS_CFLAGS += -DWLR_USE_UNSTABLE=1
- 
--PANGO_CFLAGS != pkg-config --cflags pangocairo
--PANGO_LIBS != pkg-config --libs pangocairo
-+PANGO_CFLAGS != $(PKG_CONFIG) --cflags pangocairo
-+PANGO_LIBS != $(PKG_CONFIG) --libs pangocairo
- 
--CAIRO_CFLAGS != pkg-config --cflags cairo
--CAIRO_LIBS != pkg-config --libs cairo
-+CAIRO_CFLAGS != $(PKG_CONFIG) --cflags cairo
-+CAIRO_LIBS != $(PKG_CONFIG) --libs cairo
- 
--GLIB_CFLAGS != pkg-config --cflags glib-2.0
--GLIB_LIBS != pkg-config --libs glib-2.0
-+GLIB_CFLAGS != $(PKG_CONFIG) --cflags glib-2.0
-+GLIB_LIBS != $(PKG_CONFIG) --libs glib-2.0
- 
--PIXMAN_CFLAGS != pkg-config --cflags pixman-1
--PIXMAN_LIBS != pkg-config --libs pixman-1
-+PIXMAN_CFLAGS != $(PKG_CONFIG) --cflags pixman-1
-+PIXMAN_LIBS != $(PKG_CONFIG) --libs pixman-1
- 
--XKBCOMMON_CFLAGS != pkg-config --cflags xkbcommon
--XKBCOMMON_LIBS != pkg-config --libs xkbcommon
-+XKBCOMMON_CFLAGS != $(PKG_CONFIG) --cflags xkbcommon
-+XKBCOMMON_LIBS != $(PKG_CONFIG) --libs xkbcommon
- 
--WAYLAND_CFLAGS != pkg-config --cflags wayland-server
--WAYLAND_LIBS != pkg-config --libs wayland-server
-+WAYLAND_CFLAGS != $(PKG_CONFIG) --cflags wayland-server
-+WAYLAND_LIBS != $(PKG_CONFIG) --libs wayland-server
- 
--LIBINPUT_CFLAGS != pkg-config --cflags libinput
--LIBINPUT_LIBS != pkg-config --libs libinput
-+LIBINPUT_CFLAGS != $(PKG_CONFIG) --cflags libinput
-+LIBINPUT_LIBS != $(PKG_CONFIG) --libs libinput
- 
--UCL_CFLAGS != pkg-config --cflags libucl
--UCL_LIBS != pkg-config --libs libucl
-+UCL_CFLAGS != $(PKG_CONFIG) --cflags libucl
-+UCL_LIBS != $(PKG_CONFIG) --libs libucl
- 
- CFLAGS += \
--	${WLROOTS_CFLAGS} \
--	${PANGO_CFLAGS} \
--	${CAIRO_CFLAGS} \
--	${GLIB_CFLAGS} \
--	${PIXMAN_CFLAGS} \
--	${XKBCOMMON_CFLAGS} \
--	${WAYLAND_CFLAGS} \
--	${LIBINPUT_CFLAGS} \
--	${UCL_CFLAGS}
-+	$(WLROOTS_CFLAGS) \
-+	$(PANGO_CFLAGS) \
-+	$(CAIRO_CFLAGS) \
-+	$(GLIB_CFLAGS) \
-+	$(PIXMAN_CFLAGS) \
-+	$(XKBCOMMON_CFLAGS) \
-+	$(WAYLAND_CFLAGS) \
-+	$(LIBINPUT_CFLAGS) \
-+	$(UCL_CFLAGS)
- 
- LIBS = \
--	${WLROOTS_LIBS} \
--	${PANGO_LIBS} \
--	${CAIRO_LIBS} \
--	${GLIB_LIBS} \
--	${PIXMAN_LIBS} \
--	${XKBCOMMON_LIBS} \
--	${WAYLAND_LIBS} \
--	${LIBINPUT_LIBS} \
--	${UCL_LIBS}
-+	$(WLROOTS_LIBS) \
-+	$(PANGO_LIBS) \
-+	$(CAIRO_LIBS) \
-+	$(GLIB_LIBS) \
-+	$(PIXMAN_LIBS) \
-+	$(XKBCOMMON_LIBS) \
-+	$(WAYLAND_LIBS) \
-+	$(LIBINPUT_LIBS) \
-+	$(UCL_LIBS)
- 
--all: hikari hikari-unlocker
-+.PHONY: distclean clean clean-doc doc dist install uninstall
- 
- version.h:
--	echo "#define HIKARI_VERSION \"${VERSION}\"" >> version.h
-+	echo "#define HIKARI_VERSION \"$(VERSION)\"" >> version.h
- 
--hikari: version.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h ${OBJS}
--	${CC} ${LDFLAGS} ${CFLAGS} ${INCLUDES} -o ${.TARGET} ${OBJS} ${LIBS}
-+$(OBJS): %.o: src/%.c
-+	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
-+
-+main.o:
-+	$(CC) $(CFLAGS) $(INCLUDES) -c main.c -o main.o
- 
- xdg-shell-protocol.h:
--	wayland-scanner server-header ${WAYLAND_PROTOCOLS}/stable/xdg-shell/xdg-shell.xml ${.TARGET}
-+	wayland-scanner server-header $(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml xdg-shell-protocol.h
- 
- wlr-layer-shell-unstable-v1-protocol.h:
--	wayland-scanner server-header protocol/wlr-layer-shell-unstable-v1.xml ${.TARGET}
-+	wayland-scanner server-header protocol/wlr-layer-shell-unstable-v1.xml wlr-layer-shell-unstable-v1-protocol.h
-+
-+hikari: version.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h $(OBJS) main.o
-+	$(CC) $(LDFLAGS) $(CFLAGS) $(INCLUDES) $(OBJS) main.o $(LIBS) -o $(TARGET)
- 
- hikari-unlocker: hikari_unlocker.c
--	${CC} ${CFLAGS_EXTRA} ${LDFLAGS_EXTRA} -o hikari-unlocker hikari_unlocker.c -lpam
-+	$(CC) $(LDFLAGS) $(CFLAGS) $(INCLUDES) hikari_unlocker.c -lpam $(LIBS) -o hikari-unlocker
-+
-+share/man/man1/hikari.1:
-+	pandoc -M title:"HIKARI(1) $(VERSION) | hikari - Wayland Compositor" -s \
-+		--to man -o share/man/man1/hikari.1 share/man/man1/hikari.md
-+
-+doc: share/man/man1/hikari.1
-+
-+all: hikari hikari-unlocker
- 
- clean-doc:
- 	@test -e _darcs && echo "cleaning manpage" ||:
-@@ -177,66 +202,37 @@ clean: clean-doc
- 	@rm xdg-shell-protocol.h 2> /dev/null ||:
- 	@rm wlr-layer-shell-unstable-v1-protocol.h 2> /dev/null ||:
- 	@echo "cleaning object files"
--	@rm ${OBJS} 2> /dev/null ||:
-+	@rm $(OBJS) 2> /dev/null ||:
-+	@rm main.o 2> /dev/null ||:
- 	@echo "cleaning executables"
- 	@rm hikari 2> /dev/null ||:
- 	@rm hikari-unlocker 2> /dev/null ||:
- 
--share/man/man1/hikari.1:
--	pandoc -M title:"HIKARI(1) ${VERSION} | hikari - Wayland Compositor" -s \
--		--to man -o share/man/man1/hikari.1 share/man/man1/hikari.md
--
--doc: share/man/man1/hikari.1
--
--hikari-${VERSION}.tar.gz: version.h share/man/man1/hikari.1
--	@darcs revert
--	@tar -s "#^#hikari-${VERSION}/#" -czf hikari-${VERSION}.tar.gz \
--		version.h \
--		main.c \
--		hikari_unlocker.c \
--		include/hikari/*.h \
--		src/*.c \
--		protocol/*.xml \
--		Makefile \
--		LICENSE \
--		README.md \
--		CHANGELOG.md \
--		share/man/man1/hikari.md \
--		share/man/man1/hikari.1 \
--		share/backgrounds/hikari/hikari_wallpaper.png \
--		share/wayland-sessions/hikari.desktop \
--		etc/hikari/hikari.conf \
--		etc/pam.d/hikari-unlocker.*
--
--distclean: clean-doc
--	@test -e _darcs && echo "cleaning version.h" ||:
--	@test -e _darcs && rm version.h ||:
--
--dist: distclean hikari-${VERSION}.tar.gz
--
--install: hikari hikari-unlocker share/man/man1/hikari.1
--	mkdir -p ${DESTDIR}/${PREFIX}/bin
--	mkdir -p ${DESTDIR}/${PREFIX}/share/man/man1
--	mkdir -p ${DESTDIR}/${PREFIX}/share/backgrounds/hikari
--	mkdir -p ${DESTDIR}/${PREFIX}/share/wayland-sessions
--	mkdir -p ${DESTDIR}/${ETC_PREFIX}/etc/hikari
--	mkdir -p ${DESTDIR}/${ETC_PREFIX}/etc/pam.d
--	sed "s,PREFIX,${PREFIX}," etc/hikari/hikari.conf > ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
--	chmod 644 ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
--	install -m ${PERMS} hikari ${DESTDIR}/${PREFIX}/bin
--	install -m 4555 hikari-unlocker ${DESTDIR}/${PREFIX}/bin
--	install -m 644 share/man/man1/hikari.1 ${DESTDIR}/${PREFIX}/share/man/man1
--	install -m 644 share/backgrounds/hikari/hikari_wallpaper.png ${DESTDIR}/${PREFIX}/share/backgrounds/hikari/hikari_wallpaper.png
--	install -m 644 share/wayland-sessions/hikari.desktop ${DESTDIR}/${PREFIX}/share/wayland-sessions/hikari.desktop
--	install -m 644 etc/pam.d/hikari-unlocker.${OS} ${DESTDIR}/${ETC_PREFIX}/etc/pam.d/hikari-unlocker
-+install-doc:
-+	install -m 644 share/man/man1/hikari.1 $(PREFIX)/share/man/man1
-+
-+install:
-+	mkdir -p $(PREFIX)/bin
-+	mkdir -p $(PREFIX)/share/man/man1
-+	mkdir -p $(PREFIX)/share/backgrounds/hikari
-+	mkdir -p $(PREFIX)/share/wayland-sessions
-+	mkdir -p $(ETC_PREFIX)/etc/hikari
-+	mkdir -p $(ETC_PREFIX)/etc/pam.d
-+	sed "s,PREFIX,$(PREFIX)," etc/hikari/hikari.conf > $(ETC_PREFIX)/etc/hikari/hikari.conf
-+	chmod 644 $(ETC_PREFIX)/etc/hikari/hikari.conf
-+	install -m $(PERMS) hikari $(PREFIX)/bin
-+	install -m 4555 hikari-unlocker $(PREFIX)/bin
-+	install -m 644 share/backgrounds/hikari/hikari_wallpaper.png $(PREFIX)/share/backgrounds/hikari/hikari_wallpaper.png
-+	install -m 644 share/wayland-sessions/hikari.desktop $(PREFIX)/share/wayland-sessions/hikari.desktop
-+	install -m 644 etc/pam.d/hikari-unlocker.$(OS) $(ETC_PREFIX)/etc/pam.d/hikari-unlocker
- 
- uninstall:
--	-rm ${DESTDIR}/${PREFIX}/bin/hikari
--	-rm ${DESTDIR}/${PREFIX}/bin/hikari-unlocker
--	-rm ${DESTDIR}/${PREFIX}/share/man/man1/hikari.1
--	-rm ${DESTDIR}/${PREFIX}/share/backgrounds/hikari/hikari_wallpaper.png
--	-rm ${DESTDIR}/${PREFIX}/share/wayland-sessions/hikari.desktop
--	-rm ${DESTDIR}/${ETC_PREFIX}/etc/pam.d/hikari-unlocker
--	-rm ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
--	-rmdir ${DESTDIR}/${ETC_PREFIX}/etc/hikari
--	-rmdir ${DESTDIR}/${PREFIX}/share/backgrounds/hikari
-+	-rm $(PREFIX)/bin/hikari
-+	-rm $(PREFIX)/bin/hikari-unlocker
-+	-rm $(PREFIX)/share/man/man1/hikari.1
-+	-rm $(PREFIX)/share/backgrounds/hikari/hikari_wallpaper.png
-+	-rm $(PREFIX)/share/wayland-sessions/hikari.desktop
-+	-rm $(ETC_PREFIX)/etc/pam.d/hikari-unlocker
-+	-rm $(ETC_PREFIX)/etc/hikari/hikari.conf
-+	-rmdir $(ETC_PREFIX)/etc/hikari
-+	-rmdir $(PREFIX)/share/backgrounds/hikari
diff --git a/gui-wm/hikari/files/hikari-2.0.2-gnu-make.patch b/gui-wm/hikari/files/hikari-2.0.2-gnu-make.patch
new file mode 100644
index 000000000000..338fcd8745ff
--- /dev/null
+++ b/gui-wm/hikari/files/hikari-2.0.2-gnu-make.patch
@@ -0,0 +1,327 @@
+diff --git a/Makefile b/Makefile
+index 0f104d0..6a1d640 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,22 @@
++TARGET =	hikari
++
++DESTDIR	?=
++
++prefix ?=	/usr/local
++exec_prefix ?=	$(prefix)
++bindir ?=	$(exec_prefix)/bin
++sysconfdir ?=	$(prefix)/etc
++
++PKG_CONFIG ?=	pkg-config
++
++VERSION ?=	"CURRENT"
++
++### Upstream variables
++PREFIX ?=	$(DESTDIR)$(prefix)
++ETC_PREFIX ?=	$(DESTDIR)$(sysconfdir)
++
+ OS != uname
+-VERSION ?= "CURRENT"
+-PREFIX ?= /usr/local
+-ETC_PREFIX ?= ${PREFIX}
++INSTALL_GROUP != id -gn
+ 
+ OBJS = \
+ 	action.o \
+@@ -29,7 +44,6 @@ OBJS = \
+ 	layout.o \
+ 	layout_config.o \
+ 	layout_select_mode.o \
+-	main.o \
+ 	mark.o \
+ 	mark_assign_mode.o \
+ 	mark_select_mode.o \
+@@ -56,116 +70,127 @@ OBJS = \
+ 	xwayland_unmanaged_view.o \
+ 	xwayland_view.o
+ 
+-WAYLAND_PROTOCOLS != pkg-config --variable pkgdatadir wayland-protocols
+-
+-.PHONY: distclean clean clean-doc doc dist install uninstall
+-.PATH: src
++WAYLAND_PROTOCOLS != $(PKG_CONFIG) --variable pkgdatadir wayland-protocols
+ 
+ # Allow specification of /extra/ CFLAGS and LDFLAGS
+-CFLAGS += ${CFLAGS_EXTRA}
+-LDFLAGS += ${LDFLAGS_EXTRA}
++CFLAGS += $(CFLAGS_EXTRA)
++LDFLAGS += $(LDFLAGS_EXTRA)
+ 
+-.ifdef DEBUG
++ifdef DEBUG
+ CFLAGS += -g -O0 -fsanitize=address
+-.else
++else
+ CFLAGS += -DNDEBUG
+-.endif
++endif
+ 
+-.ifdef WITH_POSIX_C_SOURCE
++ifdef WITH_POSIX_C_SOURCE
+ CFLAGS += -D_POSIX_C_SOURCE=200809L
+-.endif
++endif
+ 
+-.ifdef WITH_XWAYLAND
++ifdef WITH_XWAYLAND
+ CFLAGS += -DHAVE_XWAYLAND=1
+-.endif
++endif
+ 
+-.ifdef WITH_GAMMACONTROL
++ifdef WITH_GAMMACONTROL
+ CFLAGS += -DHAVE_GAMMACONTROL=1
+-.endif
++endif
+ 
+-.ifdef WITH_SCREENCOPY
++ifdef WITH_SCREENCOPY
+ CFLAGS += -DHAVE_SCREENCOPY=1
+-.endif
++endif
+ 
+-.ifdef WITH_LAYERSHELL
++ifdef WITH_LAYERSHELL
+ CFLAGS += -DHAVE_LAYERSHELL=1
+-.endif
++endif
+ 
+-.ifdef WITHOUT_SUID
++ifdef WITHOUT_SUID
+ PERMS = 555
+-.else
++else
+ PERMS = 4555
+-.endif
++endif
+ 
+-CFLAGS += -Wall -I. -Iinclude -DHIKARI_ETC_PREFIX=${ETC_PREFIX}
++CFLAGS += -Wall -I. -Iinclude -DHIKARI_ETC_PREFIX=$(ETC_PREFIX)
+ 
+-WLROOTS_CFLAGS != pkg-config --cflags wlroots
+-WLROOTS_LIBS != pkg-config --libs wlroots
++WLROOTS_CFLAGS != $(PKG_CONFIG) --cflags wlroots
++WLROOTS_LIBS != $(PKG_CONFIG) --libs wlroots
+ 
+ WLROOTS_CFLAGS += -DWLR_USE_UNSTABLE=1
+ 
+-PANGO_CFLAGS != pkg-config --cflags pangocairo
+-PANGO_LIBS != pkg-config --libs pangocairo
++PANGO_CFLAGS != $(PKG_CONFIG) --cflags pangocairo
++PANGO_LIBS != $(PKG_CONFIG) --libs pangocairo
+ 
+-CAIRO_CFLAGS != pkg-config --cflags cairo
+-CAIRO_LIBS != pkg-config --libs cairo
++CAIRO_CFLAGS != $(PKG_CONFIG) --cflags cairo
++CAIRO_LIBS != $(PKG_CONFIG) --libs cairo
+ 
+-GLIB_CFLAGS != pkg-config --cflags glib-2.0
+-GLIB_LIBS != pkg-config --libs glib-2.0
++GLIB_CFLAGS != $(PKG_CONFIG) --cflags glib-2.0
++GLIB_LIBS != $(PKG_CONFIG) --libs glib-2.0
+ 
+-PIXMAN_CFLAGS != pkg-config --cflags pixman-1
+-PIXMAN_LIBS != pkg-config --libs pixman-1
++PIXMAN_CFLAGS != $(PKG_CONFIG) --cflags pixman-1
++PIXMAN_LIBS != $(PKG_CONFIG) --libs pixman-1
+ 
+-XKBCOMMON_CFLAGS != pkg-config --cflags xkbcommon
+-XKBCOMMON_LIBS != pkg-config --libs xkbcommon
++XKBCOMMON_CFLAGS != $(PKG_CONFIG) --cflags xkbcommon
++XKBCOMMON_LIBS != $(PKG_CONFIG) --libs xkbcommon
+ 
+-WAYLAND_CFLAGS != pkg-config --cflags wayland-server
+-WAYLAND_LIBS != pkg-config --libs wayland-server
++WAYLAND_CFLAGS != $(PKG_CONFIG) --cflags wayland-server
++WAYLAND_LIBS != $(PKG_CONFIG) --libs wayland-server
+ 
+-LIBINPUT_CFLAGS != pkg-config --cflags libinput
+-LIBINPUT_LIBS != pkg-config --libs libinput
++LIBINPUT_CFLAGS != $(PKG_CONFIG) --cflags libinput
++LIBINPUT_LIBS != $(PKG_CONFIG) --libs libinput
+ 
+-UCL_CFLAGS != pkg-config --cflags libucl
+-UCL_LIBS != pkg-config --libs libucl
++UCL_CFLAGS != $(PKG_CONFIG) --cflags libucl
++UCL_LIBS != $(PKG_CONFIG) --libs libucl
+ 
+ CFLAGS += \
+-	${WLROOTS_CFLAGS} \
+-	${PANGO_CFLAGS} \
+-	${CAIRO_CFLAGS} \
+-	${GLIB_CFLAGS} \
+-	${PIXMAN_CFLAGS} \
+-	${XKBCOMMON_CFLAGS} \
+-	${WAYLAND_CFLAGS} \
+-	${LIBINPUT_CFLAGS} \
+-	${UCL_CFLAGS}
++	$(WLROOTS_CFLAGS) \
++	$(PANGO_CFLAGS) \
++	$(CAIRO_CFLAGS) \
++	$(GLIB_CFLAGS) \
++	$(PIXMAN_CFLAGS) \
++	$(XKBCOMMON_CFLAGS) \
++	$(WAYLAND_CFLAGS) \
++	$(LIBINPUT_CFLAGS) \
++	$(UCL_CFLAGS)
+ 
+ LIBS = \
+-	${WLROOTS_LIBS} \
+-	${PANGO_LIBS} \
+-	${CAIRO_LIBS} \
+-	${GLIB_LIBS} \
+-	${PIXMAN_LIBS} \
+-	${XKBCOMMON_LIBS} \
+-	${WAYLAND_LIBS} \
+-	${LIBINPUT_LIBS} \
+-	${UCL_LIBS}
++	$(WLROOTS_LIBS) \
++	$(PANGO_LIBS) \
++	$(CAIRO_LIBS) \
++	$(GLIB_LIBS) \
++	$(PIXMAN_LIBS) \
++	$(XKBCOMMON_LIBS) \
++	$(WAYLAND_LIBS) \
++	$(LIBINPUT_LIBS) \
++	$(UCL_LIBS)
+ 
+-all: hikari hikari-unlocker
++.PHONY: distclean clean clean-doc doc dist install uninstall
+ 
+ version.h:
+-	echo "#define HIKARI_VERSION \"${VERSION}\"" >> version.h
++	echo "#define HIKARI_VERSION \"$(VERSION)\"" >> version.h
+ 
+-hikari: version.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h ${OBJS}
+-	${CC} ${LDFLAGS} ${CFLAGS} ${INCLUDES} -o ${.TARGET} ${OBJS} ${LIBS}
++$(OBJS): %.o: src/%.c
++	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
++
++main.o:
++	$(CC) $(CFLAGS) $(INCLUDES) -c main.c -o main.o
+ 
+ xdg-shell-protocol.h:
+-	wayland-scanner server-header ${WAYLAND_PROTOCOLS}/stable/xdg-shell/xdg-shell.xml ${.TARGET}
++	wayland-scanner server-header $(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml xdg-shell-protocol.h
+ 
+ wlr-layer-shell-unstable-v1-protocol.h:
+-	wayland-scanner server-header protocol/wlr-layer-shell-unstable-v1.xml ${.TARGET}
++	wayland-scanner server-header protocol/wlr-layer-shell-unstable-v1.xml wlr-layer-shell-unstable-v1-protocol.h
++
++hikari: version.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h $(OBJS) main.o
++	$(CC) $(LDFLAGS) $(CFLAGS) $(INCLUDES) $(OBJS) main.o $(LIBS) -o $(TARGET)
+ 
+ hikari-unlocker: hikari_unlocker.c
+-	${CC} ${CFLAGS_EXTRA} ${LDFLAGS_EXTRA} -o hikari-unlocker hikari_unlocker.c -lpam
++	$(CC) $(LDFLAGS) $(CFLAGS) $(INCLUDES) hikari_unlocker.c -lpam $(LIBS) -o hikari-unlocker
++
++share/man/man1/hikari.1:
++	pandoc -M title:"HIKARI(1) $(VERSION) | hikari - Wayland Compositor" -s \
++		--to man -o share/man/man1/hikari.1 share/man/man1/hikari.md
++
++doc: share/man/man1/hikari.1
++
++all: hikari hikari-unlocker
+ 
+ clean-doc:
+ 	@test -e _darcs && echo "cleaning manpage" ||:
+@@ -177,66 +202,37 @@ clean: clean-doc
+ 	@rm xdg-shell-protocol.h 2> /dev/null ||:
+ 	@rm wlr-layer-shell-unstable-v1-protocol.h 2> /dev/null ||:
+ 	@echo "cleaning object files"
+-	@rm ${OBJS} 2> /dev/null ||:
++	@rm $(OBJS) 2> /dev/null ||:
++	@rm main.o 2> /dev/null ||:
+ 	@echo "cleaning executables"
+ 	@rm hikari 2> /dev/null ||:
+ 	@rm hikari-unlocker 2> /dev/null ||:
+ 
+-share/man/man1/hikari.1:
+-	pandoc -M title:"HIKARI(1) ${VERSION} | hikari - Wayland Compositor" -s \
+-		--to man -o share/man/man1/hikari.1 share/man/man1/hikari.md
+-
+-doc: share/man/man1/hikari.1
+-
+-hikari-${VERSION}.tar.gz: version.h share/man/man1/hikari.1
+-	@darcs revert
+-	@tar -s "#^#hikari-${VERSION}/#" -czf hikari-${VERSION}.tar.gz \
+-		version.h \
+-		main.c \
+-		hikari_unlocker.c \
+-		include/hikari/*.h \
+-		src/*.c \
+-		protocol/*.xml \
+-		Makefile \
+-		LICENSE \
+-		README.md \
+-		CHANGELOG.md \
+-		share/man/man1/hikari.md \
+-		share/man/man1/hikari.1 \
+-		share/backgrounds/hikari/hikari_wallpaper.png \
+-		share/wayland-sessions/hikari.desktop \
+-		etc/hikari/hikari.conf \
+-		etc/pam.d/hikari-unlocker.*
+-
+-distclean: clean-doc
+-	@test -e _darcs && echo "cleaning version.h" ||:
+-	@test -e _darcs && rm version.h ||:
+-
+-dist: distclean hikari-${VERSION}.tar.gz
+-
+-install: hikari hikari-unlocker share/man/man1/hikari.1
+-	mkdir -p ${DESTDIR}/${PREFIX}/bin
+-	mkdir -p ${DESTDIR}/${PREFIX}/share/man/man1
+-	mkdir -p ${DESTDIR}/${PREFIX}/share/backgrounds/hikari
+-	mkdir -p ${DESTDIR}/${PREFIX}/share/wayland-sessions
+-	mkdir -p ${DESTDIR}/${ETC_PREFIX}/etc/hikari
+-	mkdir -p ${DESTDIR}/${ETC_PREFIX}/etc/pam.d
+-	sed "s,PREFIX,${PREFIX}," etc/hikari/hikari.conf > ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
+-	chmod 644 ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
+-	install -m ${PERMS} hikari ${DESTDIR}/${PREFIX}/bin
+-	install -m 4555 hikari-unlocker ${DESTDIR}/${PREFIX}/bin
+-	install -m 644 share/man/man1/hikari.1 ${DESTDIR}/${PREFIX}/share/man/man1
+-	install -m 644 share/backgrounds/hikari/hikari_wallpaper.png ${DESTDIR}/${PREFIX}/share/backgrounds/hikari/hikari_wallpaper.png
+-	install -m 644 share/wayland-sessions/hikari.desktop ${DESTDIR}/${PREFIX}/share/wayland-sessions/hikari.desktop
+-	install -m 644 etc/pam.d/hikari-unlocker.${OS} ${DESTDIR}/${ETC_PREFIX}/etc/pam.d/hikari-unlocker
++install-doc:
++	install -m 644 share/man/man1/hikari.1 $(PREFIX)/share/man/man1
++
++install:
++	mkdir -p $(PREFIX)/bin
++	mkdir -p $(PREFIX)/share/man/man1
++	mkdir -p $(PREFIX)/share/backgrounds/hikari
++	mkdir -p $(PREFIX)/share/wayland-sessions
++	mkdir -p $(ETC_PREFIX)/etc/hikari
++	mkdir -p $(ETC_PREFIX)/etc/pam.d
++	sed "s,PREFIX,$(prefix)," etc/hikari/hikari.conf > $(ETC_PREFIX)/etc/hikari/hikari.conf
++	chmod 644 $(ETC_PREFIX)/etc/hikari/hikari.conf
++	install -m $(PERMS) hikari $(PREFIX)/bin
++	install -m 4555 hikari-unlocker $(PREFIX)/bin
++	install -m 644 share/backgrounds/hikari/hikari_wallpaper.png $(PREFIX)/share/backgrounds/hikari/hikari_wallpaper.png
++	install -m 644 share/wayland-sessions/hikari.desktop $(PREFIX)/share/wayland-sessions/hikari.desktop
++	install -m 644 etc/pam.d/hikari-unlocker.$(OS) $(ETC_PREFIX)/etc/pam.d/hikari-unlocker
+ 
+ uninstall:
+-	-rm ${DESTDIR}/${PREFIX}/bin/hikari
+-	-rm ${DESTDIR}/${PREFIX}/bin/hikari-unlocker
+-	-rm ${DESTDIR}/${PREFIX}/share/man/man1/hikari.1
+-	-rm ${DESTDIR}/${PREFIX}/share/backgrounds/hikari/hikari_wallpaper.png
+-	-rm ${DESTDIR}/${PREFIX}/share/wayland-sessions/hikari.desktop
+-	-rm ${DESTDIR}/${ETC_PREFIX}/etc/pam.d/hikari-unlocker
+-	-rm ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
+-	-rmdir ${DESTDIR}/${ETC_PREFIX}/etc/hikari
+-	-rmdir ${DESTDIR}/${PREFIX}/share/backgrounds/hikari
++	-rm $(PREFIX)/bin/hikari
++	-rm $(PREFIX)/bin/hikari-unlocker
++	-rm $(PREFIX)/share/man/man1/hikari.1
++	-rm $(PREFIX)/share/backgrounds/hikari/hikari_wallpaper.png
++	-rm $(PREFIX)/share/wayland-sessions/hikari.desktop
++	-rm $(ETC_PREFIX)/etc/pam.d/hikari-unlocker
++	-rm $(ETC_PREFIX)/etc/hikari/hikari.conf
++	-rmdir $(ETC_PREFIX)/etc/hikari
++	-rmdir $(PREFIX)/share/backgrounds/hikari
diff --git a/gui-wm/hikari/hikari-2.0.1-r1.ebuild b/gui-wm/hikari/hikari-2.0.1-r1.ebuild
deleted file mode 100644
index ba2a76d4e9e3..000000000000
--- a/gui-wm/hikari/hikari-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="wayland compositor inspired by CWM"
-HOMEPAGE="https://hikari.acmelabs.space/"
-SRC_URI="https://hikari.acmelabs.space/releases/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="gamma layershell +man screencopy +X"
-
-DEPEND="
-	dev-libs/glib
-	dev-libs/libinput:=
-	dev-libs/libucl
-	gui-libs/wlroots
-	media-libs/libglvnd
-	x11-libs/cairo:=[X,svg]
-	x11-libs/pango:=[X]
-	x11-libs/pixman
-	x11-libs/libxkbcommon:=[X]
-	sys-libs/pam
-"
-
-RDEPEND="
-	${DEPEND}
-	x11-misc/xkeyboard-config
-"
-
-BDEPEND="
-	${DEPEND}
-	virtual/pkgconfig
-	dev-libs/wayland-protocols
-	man? ( app-text/pandoc )
-"
-
-# keep this as others OS's are using this as reference
-PATCHES=(
-	"${FILESDIR}/${P}-gnu-make.patch"
-)
-
-src_compile() {
-	emake VERSION="{PV}" \
-		  WITH_POSIX_C_SOURCE=1 \
-		  WITH_GAMMACONTROL=$(usex gamma 1 0) \
-		  WITH_LAYERSHELL=$(usex layershell 1 0) \
-		  WITH_SCREENCOPY=$(usex screencopy 1 0) \
-		  WITH_XWAYLAND=$(usex X 1 0) \
-		  all
-	if use man; then
-		emake doc
-	fi
-}
-
-src_install() {
-	emake PREFIX="${D}/usr" ETC_PREFIX="${D}" install
-	if use man; then
-		emake PREFIX="${D}/usr" ETC_PREFIX="${D}" install-doc
-	fi
-}
diff --git a/gui-wm/hikari/hikari-2.0.2.ebuild b/gui-wm/hikari/hikari-2.0.2.ebuild
new file mode 100644
index 000000000000..45ebbda8ca0d
--- /dev/null
+++ b/gui-wm/hikari/hikari-2.0.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="wayland compositor inspired by CWM"
+HOMEPAGE="https://hikari.acmelabs.space/"
+SRC_URI="https://hikari.acmelabs.space/releases/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="gamma layershell +man screencopy +X"
+
+DEPEND="
+	dev-libs/glib
+	dev-libs/libinput:=
+	dev-libs/libucl
+	gui-libs/wlroots
+	media-libs/libglvnd
+	x11-libs/cairo:=[X,svg]
+	x11-libs/pango:=[X]
+	x11-libs/pixman
+	x11-libs/libxkbcommon:=[X]
+	sys-libs/pam
+"
+
+RDEPEND="
+	${DEPEND}
+	x11-misc/xkeyboard-config
+"
+
+BDEPEND="
+	${DEPEND}
+	virtual/pkgconfig
+	dev-libs/wayland-protocols
+	man? ( app-text/pandoc )
+"
+
+# keep this as others OS's are using this as reference
+PATCHES=(
+	"${FILESDIR}/${P}-gnu-make.patch"
+)
+
+src_compile() {
+	emake VERSION="{PV}" \
+		  WITH_POSIX_C_SOURCE=1 \
+		  WITH_GAMMACONTROL=$(usex gamma 1 0) \
+		  WITH_LAYERSHELL=$(usex layershell 1 0) \
+		  WITH_SCREENCOPY=$(usex screencopy 1 0) \
+		  WITH_XWAYLAND=$(usex X 1 0) \
+		  all
+	if use man; then
+		emake doc
+	fi
+}
+
+src_install() {
+	emake PREFIX="${D}/usr" ETC_PREFIX="${D}" prefix="${SYSROOT}/usr" install
+	if use man; then
+		emake PREFIX="${D}/usr" ETC_PREFIX="${D}" install-doc
+	fi
+}
diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index c41a8912769b..830366653c17 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,6 +1,8 @@
 AUX sway-1.4-gcc-10.patch 1147 BLAKE2B 5ccd4d4b5320389f0b0f521bf40c1d68016098951b2196f5045b6323eb622ea865390d82c01b4a12ce3e77779fbde60a5ff452a58a3121bf83284af961bdf7b4 SHA512 1aaa87327c4f2b83325de3eb33d5976a62e60fab0d95e78bee7697f1293e326b039bbb135d2b0dce17328fe95705b87b4e206b4605cd212d914cb5714f03bb69
 DIST sway-1.4.tar.gz 5514489 BLAKE2B 31eb1aee32079e643cc7a0263a097000c089e36916ea2a681e1ec696f8329e7ecfe3c8a981ec3b6d4e3dd99c8e263b2c208dbe602308d6bdaf4cdabbb3c10971 SHA512 3b280bdfdbdae8fb9b4f555bc630c64e7c1d09f7b2c783b99413863a6b620d50cd2b6d10d63e11fdfb9c678fce9a403228ac52fa69fb52561ffbd06790505a71
+DIST sway-1.5_rc1.tar.gz 5535472 BLAKE2B 54ecad147a7ce262231196afd8853bef2093e43516b89397d3fdaeb891beafeab29ca23aa12de02801b875330864261454a63593c881a25a12f85c0dedecd200 SHA512 0841122414d719ba183caf4c4ecb314d8a262a091e674f6884ed2f4f37f1e922f1415ecf985e81c785d5646481628f14c684523087a2dd7664628120be423a28
 EBUILD sway-1.4-r2.ebuild 3133 BLAKE2B 84082c22f9aaee17f4779ca857aff8f0af679c1a1e114ea33198ee767dacfebd894134428b33cf141bfcfaeb7daebf7284281c9a18f7b38a4b8af3e31d5b4f28 SHA512 8e53dca4dd27e4b2b2f751299fc3eb3ca90bd965e13b378d1eada64c5d054fd1e7dbd750a9abf9d185074030fe61878f4caf02092e59d560385f261a6e357ff6
 EBUILD sway-1.4.ebuild 3042 BLAKE2B ed83ac7e11b7d9261a8f1ab419c625dfe79b5df0d4aaae40b7b8f19f0efc3c4566f1efe5e31388a90c7448ebad5afa2817d45453380a03d7793b0f28ccf463ba SHA512 bb74a92ffe6ebf4e6f167ceba1f2ab49c08d17ab7a3837d7245b9b917d3a83e788fc860d9612146456d21c4ed9039cc419b74ef940bac88a1f3d6eeb597a03a5
-EBUILD sway-9999.ebuild 3090 BLAKE2B e14238694d2cec935caf206e4cbd029f84760acc099539a76295f8ce659a29611387c5d716d2e9cb537700e17db9d010bebeb82efdd8bbf1036a879fb3c9aed5 SHA512 0ebf33f6efc5e0b9357b642c060c5877b294a7f60f7f623a16cdce779fb83061cdf8eb5bff1dfc95a9007ae909ea1e27c4ab4e746c498de8189497b8ef3025f1
+EBUILD sway-1.5_rc1.ebuild 3046 BLAKE2B 0e73428d39e84d4ddb6b8b5bbd5704820c38485144933864a9e332fd7287b78533bdd431a3ca3e64126198f185cfcda7184aed91a6d73105012c397d03bbe257 SHA512 7f8a97b261e970488f34d9e9cd1c3b0bdf6e3274272b6fc024ce243975791666a9ccd072d5ab403460ea61a4ce99e802c3cccd600c968de182b5cf0ddb94d543
+EBUILD sway-9999.ebuild 3099 BLAKE2B d0c795d635b4c5f449972597906f82bdc9f3fc04324071a5b74989a6496d8b93f686a3308535a81b0c420291d3b2ac0d9a9a86386911a208bc76975e2e560fd7 SHA512 feb93d35d39d6558aeb614af0008e0c4b1a2426250013998ab72784fee2144865966342a64c973eb7a41333da23133b3411b93cf9c1330259389749df5515aff
 MISC metadata.xml 2374 BLAKE2B e17f6ebbeca77d00043359eb5eec3cf6070c8b3ef1c852dbcbf9ef69e2ae558b78eebf37485e21d475d45f33015a97bc6a61740e158d2aafd1695b842262b5bd SHA512 e232fe896f8fd0c8e7293093fba00c03604771740e5984978f32605f62e86f5d97d5ba95a10488b354d30d65a94bb33a051e21196bba1b0693ee13cef09ce33d
diff --git a/gui-wm/sway/sway-1.5_rc1.ebuild b/gui-wm/sway/sway-1.5_rc1.ebuild
new file mode 100644
index 000000000000..86f96883dab7
--- /dev/null
+++ b/gui-wm/sway/sway-1.5_rc1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils meson
+
+DESCRIPTION="i3-compatible Wayland window manager"
+HOMEPAGE="https://swaywm.org"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+else
+	MY_PV=${PV/_rc/-rc}
+	SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	#KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd tray wallpapers X zsh-completion"
+REQUIRED_USE="?? ( elogind systemd )
+	tray? ( || ( elogind systemd ) )"
+
+DEPEND="
+	>=dev-libs/json-c-0.13:0=
+	>=dev-libs/libinput-1.6.0:0=
+	dev-libs/libpcre
+	dev-libs/wayland
+	x11-libs/cairo
+	x11-libs/libxkbcommon
+	x11-libs/pango
+	x11-libs/pixman
+	media-libs/mesa[gles2,libglvnd]
+	elogind? ( >=sys-auth/elogind-239 )
+	swaybar? ( x11-libs/gdk-pixbuf:2 )
+	swaybg? ( gui-apps/swaybg )
+	swayidle? ( gui-apps/swayidle )
+	swaylock? ( gui-apps/swaylock )
+	systemd? ( >=sys-apps/systemd-239 )
+	wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] )
+	X? ( x11-libs/libxcb:0= )
+"
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+="~gui-libs/wlroots-9999:=[elogind=,systemd=,X=]"
+else
+	DEPEND+="
+		~gui-libs/wlroots-9999:=[elogind=,systemd=,X=]
+	"
+fi
+RDEPEND="
+	x11-misc/xkeyboard-config
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.14
+	virtual/pkgconfig
+"
+if [[ ${PV} == 9999 ]]; then
+	BDEPEND+="man? ( ~app-text/scdoc-9999 )"
+else
+	BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
+fi
+
+src_prepare() {
+	default
+
+	use swaybar || sed -e "s/subdir('swaybar')//g" -e "/sway-bar.[0-9].scd/d" \
+		-e "/completions\/[a-z]\+\/_\?swaybar/d" -i meson.build || die
+	use swaymsg || sed -e "s/subdir('swaymsg')//g" -e "/swaymsg.[0-9].scd/d" \
+		-e "/completions\/[a-z]\+\/_\?swaymsg/d" -i meson.build || die
+	use swaynag || sed -e "s/subdir('swaynag')//g" -e "/swaynag.[0-9].scd/d" \
+		-e "/completions\/[a-z]\+\/_\?swaynag/d" -i meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dman-pages=$(usex man enabled disabled)
+		-Dtray=$(usex tray enabled disabled)
+		-Dxwayland=$(usex X enabled disabled)
+		$(meson_use wallpapers default-wallpaper)
+		$(meson_use fish-completion fish-completions)
+		$(meson_use zsh-completion zsh-completions)
+		"-Dbash-completions=true"
+		"-Dwerror=false"
+	)
+
+	if use swaybar; then
+		emesonargs+=("-Dgdk-pixbuf=enabled")
+	else
+		emesonargs+=("-Dgdk-pixbuf=disabled")
+	fi
+
+	meson_src_configure
+}
+
+pkg_preinst() {
+	if ! use systemd && ! use elogind; then
+		fowners root:0 /usr/bin/sway
+		fperms 4511 /usr/bin/sway
+	fi
+}
+
+pkg_postinst() {
+	if ! use systemd && ! use elogind; then
+		elog ""
+		elog "If you use ConsoleKit2, remember to launch sway using:"
+		elog "exec ck-launch-session sway"
+		elog ""
+		elog "If your system does not set the XDG_RUNTIME_DIR environment"
+		elog "variable, you must set it manually to run Sway. See wiki"
+		elog "for details: https://wiki.gentoo.org/wiki/Sway"
+	fi
+}
diff --git a/gui-wm/sway/sway-9999.ebuild b/gui-wm/sway/sway-9999.ebuild
index e4618c207ab9..bf84713b3e9a 100644
--- a/gui-wm/sway/sway-9999.ebuild
+++ b/gui-wm/sway/sway-9999.ebuild
@@ -33,7 +33,7 @@ DEPEND="
 	x11-libs/libxkbcommon
 	x11-libs/pango
 	x11-libs/pixman
-	media-libs/mesa[gles2]
+	media-libs/mesa[gles2,libglvnd]
 	elogind? ( >=sys-auth/elogind-239 )
 	swaybar? ( x11-libs/gdk-pixbuf:2 )
 	swaybg? ( gui-apps/swaybg )
diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest
index 4183e66a89e9..88dc2e3db549 100644
--- a/gui-wm/wayfire/Manifest
+++ b/gui-wm/wayfire/Manifest
@@ -1,4 +1,4 @@
 DIST wayfire-0.4.0.tar.xz 588904 BLAKE2B b720297b3ffb868761ea61615b4d0fefc2687f8a2060208f8cc002ff7adaf7622da906ad98e25664c3e72c04de2fb74741d0a417cce4826483407bdf10d63b43 SHA512 e96cdb90ce36c005476e08608683983aa167e58aea80fcfd3b24ab0836ec4aa50fb5a7eeb0872a1b1014e3073ed826e1c83d3146b39d3cdb2a8b3a0895155649
-EBUILD wayfire-0.4.0-r1.ebuild 2194 BLAKE2B 21a6e27a3588ff7363b677291d873e8a5a346cb6c563f4ab268b5ec10462f268690c41ba1e51d955f2bfb96723c65630feb6e6c8bef7caf3c0eabe05f24cab85 SHA512 1b0d24952d7625a212edc50255e579dafc0a4780ca28f1dc5b0fa38ad2fc0a9a93d70a1342e98bf22c7fbb84e1ea7756ab41a6ac5d31dcb85a50283e1b23dc12
+EBUILD wayfire-0.4.0-r2.ebuild 2195 BLAKE2B 5efde918474d27f67fc4f92d5f8698cc37f3c0c7a51ce9ec18c3de83665fa389bedcd216b6a677324d772bc0aac4932836ff78a0aa23f29d6fcfdfe14ca19e85 SHA512 f2ff58e2db827ecdaac14d00cfefca63d7bcba311733bfa38ecf9f3cdff23c1a7bcd9f0ae21110ced8752056bb86fdd6907716d5955ff7a656c2abbd61415451
 EBUILD wayfire-9999.ebuild 2192 BLAKE2B 2641ce27a3bf3aed1483d492d21500cba7a06028a462067b732e76e00771b6fb03782d8f9ec93e48935be2eeaebd6b743f2f55c45ba4165e561d1b2adfed04c1 SHA512 a5eaf39d90c03a99166b6193f6e11a82031055626103edb8a65f1c12a9a4b4e5a7e6870245c8a7fe757ef7226847a470ee75f2c8be8d2cc4ae715f21fe6865e7
 MISC metadata.xml 1050 BLAKE2B 4404ae0b4151d021c94faae90c340bfd76cdfc3885c543dfccbb7ce55b47811eaf3066c47026f3767c8b9289612605798db167783e3e466bb383336802649877 SHA512 da70122b6ba9cda31537d7c14b9c2d8b7b6097808e3d07f3e15fdfc9f8e21c3d5db0bf7105dcbafe80c08b22e979f338a702b36a7cbd7f2cade4a2c005d0fadf
diff --git a/gui-wm/wayfire/wayfire-0.4.0-r1.ebuild b/gui-wm/wayfire/wayfire-0.4.0-r1.ebuild
deleted file mode 100644
index 9de00654b844..000000000000
--- a/gui-wm/wayfire/wayfire-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="compiz like 3D wayland compositor"
-HOMEPAGE="https://github.com/WayfireWM/wayfire"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
-else
-	SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+gles +system-wfconfig +system-wlroots elogind systemd"
-REQUIRED_USE="?? ( elogind systemd )"
-
-DEPEND="
-	dev-libs/libevdev
-	dev-libs/libinput
-	gui-libs/gtk-layer-shell
-	media-libs/glm
-	media-libs/mesa:=[gles2,wayland,X]
-	media-libs/libjpeg-turbo
-	media-libs/libpng
-	media-libs/freetype:=[X]
-	x11-libs/libdrm
-	x11-libs/gtk+:3=[wayland,X]
-	x11-libs/cairo:=[X,svg]
-	x11-libs/libxkbcommon:=[X]
-	x11-libs/pixman
-	gles? ( media-libs/libglvnd[X] )
-	system-wfconfig? ( ~gui-libs/wf-config-${PV} )
-	!system-wfconfig? ( !gui-libs/wf-config )
-	system-wlroots? ( ~gui-libs/wlroots-0.10.1[elogind=,systemd=,X] )
-	!system-wlroots? ( !gui-libs/wlroots )
-"
-
-RDEPEND="
-	${DEPEND}
-	elogind? ( sys-auth/elogind )
-	systemd? ( sys-apps/systemd )
-	x11-misc/xkeyboard-config
-"
-
-BDEPEND="
-	${DEPEND}
-	virtual/pkgconfig
-	>=dev-libs/wayland-protocols-1.18
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature system-wfconfig use_system_wfconfig)
-		$(meson_feature system-wlroots use_system_wlroots)
-		$(meson_use gles enable_gles32)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	default
-	meson_src_install
-	einstalldocs
-
-	insinto "/usr/share/wayland-sessions/"
-	insopts -m644
-	doins wayfire.desktop
-
-	dodoc wayfire.ini
-
-	if ! use systemd && ! use elogind; then
-		fowners root:0 /usr/bin/wayfire
-		fperms 4511 /usr/bin/wayfire
-	fi
-}
-
-pkg_postinst() {
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Wayfire has been installed but the session cannot be used"
-		elog "until you install a configuration file. The default config"
-		elog "file is installed at \"/usr/share/doc/${P}/wayfire.ini.bz2\""
-		elog "To install the file execute"
-		elog "\$ mkdir -p ~/.config && bzcat /usr/share/doc/${P}/wayfire.ini.bz2 > ~/.config/wayfire.ini"
-	fi
-}
diff --git a/gui-wm/wayfire/wayfire-0.4.0-r2.ebuild b/gui-wm/wayfire/wayfire-0.4.0-r2.ebuild
new file mode 100644
index 000000000000..bf539ba4965a
--- /dev/null
+++ b/gui-wm/wayfire/wayfire-0.4.0-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="compiz like 3D wayland compositor"
+HOMEPAGE="https://github.com/WayfireWM/wayfire"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
+else
+	SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+gles +system-wfconfig +system-wlroots elogind systemd"
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+	dev-libs/libevdev
+	dev-libs/libinput
+	gui-libs/gtk-layer-shell
+	media-libs/glm
+	media-libs/mesa:=[gles2,wayland,X]
+	media-libs/libjpeg-turbo
+	media-libs/libpng
+	media-libs/freetype:=[X]
+	x11-libs/libdrm
+	x11-libs/gtk+:3=[wayland,X]
+	x11-libs/cairo:=[X,svg]
+	x11-libs/libxkbcommon:=[X]
+	x11-libs/pixman
+	gles? ( media-libs/libglvnd[X] )
+	system-wfconfig? ( >=gui-libs/wf-config-${PV} )
+	!system-wfconfig? ( !gui-libs/wf-config )
+	system-wlroots? ( ~gui-libs/wlroots-0.10.1[elogind=,systemd=,X] )
+	!system-wlroots? ( !gui-libs/wlroots )
+"
+
+RDEPEND="
+	${DEPEND}
+	elogind? ( sys-auth/elogind )
+	systemd? ( sys-apps/systemd )
+	x11-misc/xkeyboard-config
+"
+
+BDEPEND="
+	${DEPEND}
+	virtual/pkgconfig
+	>=dev-libs/wayland-protocols-1.18
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature system-wfconfig use_system_wfconfig)
+		$(meson_feature system-wlroots use_system_wlroots)
+		$(meson_use gles enable_gles32)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	default
+	meson_src_install
+	einstalldocs
+
+	insinto "/usr/share/wayland-sessions/"
+	insopts -m644
+	doins wayfire.desktop
+
+	dodoc wayfire.ini
+
+	if ! use systemd && ! use elogind; then
+		fowners root:0 /usr/bin/wayfire
+		fperms 4511 /usr/bin/wayfire
+	fi
+}
+
+pkg_postinst() {
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog "Wayfire has been installed but the session cannot be used"
+		elog "until you install a configuration file. The default config"
+		elog "file is installed at \"/usr/share/doc/${P}/wayfire.ini.bz2\""
+		elog "To install the file execute"
+		elog "\$ mkdir -p ~/.config && bzcat /usr/share/doc/${P}/wayfire.ini.bz2 > ~/.config/wayfire.ini"
+	fi
+}
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 1c7076335118..ad71cb2d62eb 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/krfb/Manifest b/kde-apps/krfb/Manifest
index bf51c5cc27a1..cd52f71f072f 100644
--- a/kde-apps/krfb/Manifest
+++ b/kde-apps/krfb/Manifest
@@ -1,5 +1,5 @@
 DIST krfb-19.12.3.tar.xz 1276964 BLAKE2B 59fb41031e70711888992ac91e0083f5ef5afb0590052ba5ce529073e361d6ad2656590ba2f4bb32c6129a071b0a30ef0095b061f6b075c40ca77152c02439b5 SHA512 d4cd5957034a42164756e226c8596816bcb19aca72f3b4b1af6967c4ab9881aaeed50c396630dd434dd9234fc3f8ddfd0783926f5e7f72a7de101a0c98ad4f36
 DIST krfb-20.04.2.tar.xz 1276828 BLAKE2B b477d7d6ba9c23bce8079450d68ea0ba35b15303eadd6c3e894fea1333882d4bf7024c6aa9eb64b5d0fe84d66b87da6262ee5d4e8e76f95eb02f34c522cc9763 SHA512 3435f095faa9e01338fc2f8937ad81aa61efe177f4efe2bf22d40dc95df5e4c100bd6f822c7a6bf788a05a40c034cbe57c00c6c478f607d846ebdf50b2c47358
-EBUILD krfb-19.12.3.ebuild 1402 BLAKE2B ad1739e1c69b79f20c8629dbdae976b23e458440df6510c0571f539253656b8906b9f51632f972290d86d23ead854725c7eeab5413354abc35a4f6da001fdd00 SHA512 414d494ffa9e23043410891e1af89f8b0c4cd9443b6b7754ecbd996c1690b6af6f9ad42fb594e1fceae609ccd830aec2fc1fd28d558deb019353c6edd54c3fdd
+EBUILD krfb-19.12.3-r1.ebuild 1406 BLAKE2B 821f2618c93dd7564fa32cb88c5ec1a49e75910e89d0f83e3c3b6e6b871a0f6e47271f65af0d2792241cc24fba43b73ea7f6a0651988e1ae434a69d654bb9c9f SHA512 554189cbb168ef62d85f92ecf2b8d5ad002cca6a2c13e698f8ebb863e8746c8a202a82976a54110fdd19c6b4a334503182f59270bd44ed4b4c0c1235ab7b9cac
 EBUILD krfb-20.04.2.ebuild 1405 BLAKE2B 1a6419fbdd650b65a531aa5457aa62c0d75cf9b1d40335143f9a98caaac28e60ee73bb35570adbfe3ef7e3cdcaafb22e35bec6d8354e8befc039806006057aa1 SHA512 10dbe05535ad9304899248b323153b3f491a9c77bcf65bc26fc8d60a631e1b1fc703665add4ee4b6cf14731d75aaf6b0b8029078ed865257b4955e7cd0517abb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krfb/krfb-19.12.3-r1.ebuild b/kde-apps/krfb/krfb-19.12.3-r1.ebuild
new file mode 100644
index 000000000000..7b8f0dfd6ffa
--- /dev/null
+++ b/kde-apps/krfb/krfb-19.12.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"
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="VNC-compatible server to share Plasma desktops"
+HOMEPAGE="https://kde.org/applications/internet/org.kde.krfb"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="amd64 arm64 x86"
+IUSE="wayland"
+
+DEPEND="
+	>=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/kdnssd-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}: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:0/0.2 )
+"
+RDEPEND="${DEPEND}
+	wayland? ( sys-apps/xdg-desktop-portal[screencast] )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package wayland PipeWire)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/krfb/krfb-19.12.3.ebuild b/kde-apps/krfb/krfb-19.12.3.ebuild
deleted file mode 100644
index 926471ea2971..000000000000
--- a/kde-apps/krfb/krfb-19.12.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.63.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="VNC-compatible server to share Plasma desktops"
-HOMEPAGE="https://kde.org/applications/internet/org.kde.krfb"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="wayland"
-
-DEPEND="
-	>=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/kdnssd-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}: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:= )
-"
-RDEPEND="${DEPEND}
-	wayland? ( sys-apps/xdg-desktop-portal[screencast] )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package wayland PipeWire)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index b86902c5f745..8bc8e0bfbae2 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 97dcce64359d..ecf421813afa 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,5 +1,7 @@
+AUX plasma-5.71.0-access-expandedView.item.patch 1079 BLAKE2B 136f75a730a9a9c864f341cf33e92a76eb1eac4932a8cc006b2c048f9fb4d60cd96db6f3a778027b568c0a5f604391eec08ea89f23c90274686d5fb4fbe23b28 SHA512 34b9abbb8a98638a89c4f28d08b687d22b5902b9a3766221fbcdb88bf350fdd9d974842da47f44fb2316f9737653f7993274e869df46b46bf97c9ad1a81ec9f5
+AUX plasma-5.71.0-introduce-PlaceholderMessage.patch 8863 BLAKE2B fabd80feda6496b465a4b0d6b2aaa00eb7c9c792b8367f4c9d63db8104814b83055c4e79c773c750721d9051e43b0abdb03c2c2758aeb2adda53bdc851958114 SHA512 751ddf6450d8270011053b03f7cd40cdae33d5fbbcc848058e581f3ea4a802eea24c57d8f6c3f40f060c0b08fb3b50b9323a11143395c813fedbe1a35fc7d1dc
 DIST plasma-framework-5.70.1.tar.xz 3132736 BLAKE2B 6f6dc34c6e9f5c433e2a6302fffc7172a7dbf187cc8ebeef1a5c47dc3b329269d71891508e41c3b0a7a7d8de8af519d7a9c320defec6726e9fdf9b859d158017 SHA512 2b022f0e1e6abec8b7cf0ff77dd862a78f17692d17a78ad5a42a1a784c98a57070a5a721b44e808e299f374248769b90449201ae3c6dba17a292726e3b646930
 DIST plasma-framework-5.71.0.tar.xz 3137672 BLAKE2B dc079b0d0dc17126a361fef849931ed63bbad9099f983405cc14a28abab4d592fb9b92fe66bc347dacbee1f93b48da03e449db25f2ecbc298a62b8b734b1e2c4 SHA512 900172458cd4d16e6374f6116470c2a5bf6cf16e52da5910b976b86e03a3c69182f1eefdc01aea2eac0471ae7416c82542e5e87c7af42ed15c9d9f3f228805ef
 EBUILD plasma-5.70.1.ebuild 1927 BLAKE2B 3b100a046afc977d7a11aba841275d4be2ba0e7ba6e489afb03f0cc4c7dd4c43b1abdb2b40240a55e4a70e783f24d75caf6fd5d341261ad78b6c55d965f738b6 SHA512 c7e7f6021addbd03c6cdf463376a4bdaadba600f070aff8365f0e86fd6fa47004846b6732717fa72d664e2fb0c6b6c93d221bd043fb0b142ffe80272279f053f
-EBUILD plasma-5.71.0.ebuild 1873 BLAKE2B ef017569089f89516da9ebb60687603c46e23dc0c49a83a64f512fd176250afcb87900869ffe67166ed662485476d1c8f7a05a9b73324df0d5f06e7c33e4a815 SHA512 42109bf9c7f59434b66666e0ad03c2ed3603e11d87629799ed07b827be1b177dac9e561d1ea3640da4f123200e9bbdcdd327ed9305ad78965d81d6abd1b0f05c
+EBUILD plasma-5.71.0-r1.ebuild 2028 BLAKE2B d921255742a08ddc793c1aee986b6599bc429d8d1644604cf9c5452bcd5382f65de90cec80b0d2e17dd1ca8dae9ad53c84bfe54aee6f007ece13aac604a9fae2 SHA512 086a6dfc34f16fcf628fefdfce2cee7aebb6024fa9c3a54f28590b4b8375aafbcb2e6f4094cb3d9f33c07b39ad69efe7e499ef04015e404b7b4703745b04aa4d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/plasma/files/plasma-5.71.0-access-expandedView.item.patch b/kde-frameworks/plasma/files/plasma-5.71.0-access-expandedView.item.patch
new file mode 100644
index 000000000000..ba1b35afbdeb
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.71.0-access-expandedView.item.patch
@@ -0,0 +1,29 @@
+From 7f9e189d87c040a952533713ff48d32872e0eadd Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Sun, 7 Jun 2020 08:46:39 -0600
+Subject: [PATCH] Add property to access the ExpandableListItem loader's item
+
+---
+ .../plasmaextracomponents/qml/ExpandableListItem.qml        | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml b/src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml
+index d9d0662ee..ed21ab8e4 100644
+--- a/src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml
++++ b/src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml
+@@ -261,6 +261,12 @@ Item {
+      */
+     property var customExpandedViewContent: actionsListComponent
+ 
++    /*
++     * The actual instance of the custom view content, if loaded
++     * @since 5.72
++     */
++    property alias customExpandedViewContentItem: expandedView.item
++
+     /*
+      * isBusy: bool
+      * Whether or not to display a busy indicator on the list item. Set to true
+-- 
+2.27.0
+
diff --git a/kde-frameworks/plasma/files/plasma-5.71.0-introduce-PlaceholderMessage.patch b/kde-frameworks/plasma/files/plasma-5.71.0-introduce-PlaceholderMessage.patch
new file mode 100644
index 000000000000..4255d235d1a6
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.71.0-introduce-PlaceholderMessage.patch
@@ -0,0 +1,280 @@
+From e1475e090747088288b05279633d19f12ae257aa Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Fri, 19 Jun 2020 22:45:19 +0000
+Subject: [PATCH] Introduce PlaceholderMessage
+
+This is a clone of the Kirigami component that we can use in Plasma
+applets until we arrive at a solution for styling QQC2 items using the
+Plasma style (https://phabricator.kde.org/T13256).
+
+See dependent patches:
+- plasma-workspace: https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/73
+- bluedevil: https://invent.kde.org/plasma/bluedevil/-/merge_requests/1
+- print-manager: https://invent.kde.org/utilities/print-manager/-/merge_requests/1
+- plasma-vault: https://invent.kde.org/plasma/plasma-vault/-/merge_requests/3
+
+Merge request: https://invent.kde.org/frameworks/plasma-framework/-/merge_requests/13
+---
+ .../qml/PlaceholderMessage.qml                | 237 ++++++++++++++++++
+ .../plasmaextracomponents/qml/qmldir          |   1 +
+ 2 files changed, 238 insertions(+)
+ create mode 100644 src/declarativeimports/plasmaextracomponents/qml/PlaceholderMessage.qml
+
+diff --git a/src/declarativeimports/plasmaextracomponents/qml/PlaceholderMessage.qml b/src/declarativeimports/plasmaextracomponents/qml/PlaceholderMessage.qml
+new file mode 100644
+index 000000000..958399a8f
+--- /dev/null
++++ b/src/declarativeimports/plasmaextracomponents/qml/PlaceholderMessage.qml
+@@ -0,0 +1,237 @@
++/*
++ *   Copyright 2020 Nate Graham <nate@kde.org>
++ *
++ *   This program is free software; you can redistribute it and/or modify
++ *   it under the terms of the GNU Library General Public License as
++ *   published by the Free Software Foundation; either version 2, or
++ *   (at your option) any later version.
++ *
++ *   This program is distributed in the hope that it will be useful,
++ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *   GNU Library General Public License for more details
++ *
++ *   You should have received a copy of the GNU Library General Public
++ *   License along with this program; if not, write to the
++ *   Free Software Foundation, Inc.,
++ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
++ */
++
++import QtQuick 2.0
++import QtQuick.Layouts 1.12
++import QtQuick.Controls 2.12 as QQC2
++
++import org.kde.plasma.core 2.0 as PlasmaCore
++import org.kde.plasma.components 3.0 as PlasmaComponents3
++import org.kde.plasma.extras 2.0 as PlasmaExtras
++
++/**
++ * A placeholder message indicating that a list view is empty. The message
++ * comprises a label with lightened text, an optional icon above the text, and
++ * an optional button below the text which can be used to easily show the user
++ * what to do next to add content to the view.
++ *
++ * The top-level component is a ColumnLayout, so additional components items can
++ * simply be added as child items and they will be positioned sanely.
++ *
++ * Example usage:
++ *
++ * @code{.qml}
++ ** Shows how to use PlaceholderMessage to implement a "this view is empty" message
++ * import QtQuick 2.12
++ * import org.kde.plasma.extras 2.0 as PlasmaExtras
++ *
++ * ListView {
++ *     id: listView
++ *     model: [...]
++ *     delegate: [...]
++ *
++ *     PlasmaExtras.PlaceholderMessage {
++ *         anchors.centerIn: parent
++ *         width: parent.width - (units.largeSpacing * 4)
++ *
++ *         visible: listView.count == 0
++ *
++ *         text: "There are no items in this list"
++ *     }
++ * }
++ * @endcode
++ * @code{.qml}
++ ** Shows how to use PlaceholderMessage to implement a "here's how to proceed" message
++ * import QtQuick 2.12
++ * import QtQuick.Controls 2.12 as QQC2
++ * import org.kde.plasma.extras 2.0 as PlasmaExtras
++ *
++ * ListView {
++ *     id: listView
++ *     model: [...]
++ *     delegate: [...]
++ *
++ *     PlasmaExtras.PlaceholderMessage {
++ *         anchors.centerIn: parent
++ *         width: parent.width - (units.largeSpacing * 4)
++ *
++ *         visible: listView.count == 0
++ *
++ *         text: "Add an item to proceed"
++ *
++ *         helpfulAction: QQC2.Action {
++ *             icon.name: "list-add"
++ *             text: "Add item..."
++ *             onTriggered: {
++ *                 [...]
++ *             }
++ *         }
++ *     }
++ *     [...]
++ * }
++ * @endcode
++ * @code{.qml}
++ ** Shows how to use PlaceholderMessage to implement a "there was a problem here" message
++ * import org.kde.plasma.components 3.0 as PlasmaComponents3
++ * import org.kde.plasma.extras 2.0 as PlasmaExtras
++ *
++ * PlasmaComponents3.Page {
++ *     id: root
++ *     readonly property bool networkConnected: [...]
++ *
++ *     PlasmaExtras.PlaceholderMessage {
++ *         anchors.centerIn: parent
++ *         width: parent.width - (units.largeSpacing * 4)
++ *
++ *         visible: root.networkConnected
++ *
++ *         icon.name: "network-disconnect"
++ *         text: "Network disconnected; unable to load content"
++ *     }
++ * }
++ * @endcode
++ * @code{.qml}
++ * import org.kde.plasma.components 3.0 as PlasmaComponents3
++ * import org.kde.plasma.extras 2.0 as PlasmaExtras
++ *
++ ** Shows how to use PlaceholderMessage to implement a loading indicator
++ * PlasmaComponents3.Page {
++ *     id: root
++ *     readonly property bool loading: [...]
++ *     readonly property int completionStatus: [...]
++ *
++ *     PlasmaExtras.PlaceholderMessage {
++ *         anchors.centerIn: parent
++ *         width: parent.width - (units.largeSpacing * 4)
++ *
++ *         visible: root.loading
++ *
++ *         icon.name: "my-awesome-app-icon"
++ *         text: "Loading this awesome app"
++ *
++ *         PlasmaComponents3.ProgressBar {
++ *             Layout.preferredWidth: units.gridUnit * 20
++ *             value: root.completionStatus
++ *             from: 0
++ *             to: 100
++ *         }
++ *     }
++ * }
++ * @endcode
++ * @code{.qml}
++ * import QtQuick.Controls 2.12 as QQC2
++ * import org.kde.plasma.components 3.0 as PlasmaComponents3
++ * import org.kde.plasma.extras 2.0 as PlasmaExtras
++ *
++ ** Shows how to use PlaceholderMessage to implement a "Here's what you do next" button
++ * PlasmaComponents3.Page {
++ *     id: root
++ *
++ *     PlasmaExtras.PlaceholderMessage {
++ *         anchors.centerIn: parent
++ *         width: parent.width - (units.largeSpacing * 4)
++ *
++ *         visible: root.loading
++ *
++ *         helpfulAction: QQC2.Action {
++ *             icon.name: "list-add"
++ *             text: "Add item..."
++ *             onTriggered: {
++ *                 [...]
++ *             }
++ *         }
++ *     }
++ * }
++ * @endcode
++ * @since 5.72
++ */
++ColumnLayout {
++    id: root
++
++    /**
++     * text: string
++     * The text to show as a placeholder label
++     *
++     * Optional. Not setting any text is useful when you only want to display
++     * an icon, action button, and/or other custom content
++     *
++     * @since 5.72
++     */
++    property alias text: label.text
++
++    /**
++     * iconName: string
++     * The icon to show above the text label.
++     *
++     * Optional
++     * Falls back to `undefined` if the specified icon is not valid or cannot
++     * be loaded.
++     *
++     * @since 5.72
++     * @see Icon::source
++     */
++    property string iconName: string
++
++    /**
++     * helpfulAction: QtQuickControls2 Action
++     * An action that helps the user proceed. Typically used to guide the user
++     * to the next step for adding content or items to an empty view.
++     *
++     * Optional
++     *
++     * @since 5.72
++     */
++    property alias helpfulAction: actionButton.action
++
++    spacing: units.largeSpacing
++
++    PlasmaCore.IconItem {
++        visible: source != undefined
++        opacity: 0.5
++
++        Layout.alignment: Qt.AlignHCenter
++        Layout.preferredWidth: units.iconSizes.huge
++        Layout.preferredHeight: units.iconSizes.huge
++
++        source: root.iconName || null
++    }
++
++    PlasmaExtras.Heading {
++        id: label
++
++        visible: text.length > 0
++        opacity: 0.5
++
++        Layout.fillWidth: true
++        Layout.alignment: Qt.AlignHCenter
++        horizontalAlignment: Qt.AlignHCenter
++
++        level: 2
++
++        wrapMode: Text.WordWrap
++    }
++
++    PlasmaComponents3.Button {
++        id: actionButton
++
++        Layout.alignment: Qt.AlignHCenter
++
++        visible: action && action.enabled
++    }
++}
+diff --git a/src/declarativeimports/plasmaextracomponents/qml/qmldir b/src/declarativeimports/plasmaextracomponents/qml/qmldir
+index 4ba4ed7b7..6eb4af8a9 100644
+--- a/src/declarativeimports/plasmaextracomponents/qml/qmldir
++++ b/src/declarativeimports/plasmaextracomponents/qml/qmldir
+@@ -7,6 +7,7 @@ ExpandableListItem 2.0 ExpandableListItem.qml
+ Heading 2.0 Heading.qml
+ Paragraph 2.0 Paragraph.qml
+ PageRow 2.0 PageRow.qml
++PlaceholderMessage 2.0 PlaceholderMessage.qml
+ ScrollArea 2.0 ScrollArea.qml
+ Title 2.0 Title.qml
+ DescriptiveLabel 2.0 DescriptiveLabel.qml
+-- 
+2.27.0
+
diff --git a/kde-frameworks/plasma/plasma-5.71.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.71.0-r1.ebuild
new file mode 100644
index 000000000000..a088f837b6bd
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.71.0-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_ORG_NAME="${PN}-framework"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plasma framework"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="gles2-only wayland X"
+
+BDEPEND="
+	>=kde-frameworks/kdoctools-${PVCUT}:5
+"
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kactivities-${PVCUT}*:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kdeclarative-${PVCUT}*:5
+	=kde-frameworks/kglobalaccel-${PVCUT}*:5
+	=kde-frameworks/kguiaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kirigami-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kpackage-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		=kde-frameworks/kwayland-${PVCUT}*:5
+		media-libs/mesa[egl]
+	)
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+RESTRICT+=" test"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-access-expandedView.item.patch # KDE-bug #423093
+	"${FILESDIR}"/${P}-introduce-PlaceholderMessage.patch # KDE-bug #422684
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package !gles2-only OpenGL)
+		$(cmake_use_find_package wayland EGL)
+		$(cmake_use_find_package wayland KF5Wayland)
+		$(cmake_use_find_package X X11)
+		$(cmake_use_find_package X XCB)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/plasma/plasma-5.71.0.ebuild b/kde-frameworks/plasma/plasma-5.71.0.ebuild
deleted file mode 100644
index d9665e885ee4..000000000000
--- a/kde-frameworks/plasma/plasma-5.71.0.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
-
-KDE_ORG_NAME="${PN}-framework"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.14.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plasma framework"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="gles2-only wayland X"
-
-BDEPEND="
-	>=kde-frameworks/kdoctools-${PVCUT}:5
-"
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kactivities-${PVCUT}*:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kdeclarative-${PVCUT}*:5
-	=kde-frameworks/kglobalaccel-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kirigami-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kpackage-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	!gles2-only? ( virtual/opengl )
-	wayland? (
-		=kde-frameworks/kwayland-${PVCUT}*:5
-		media-libs/mesa[egl]
-	)
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package !gles2-only OpenGL)
-		$(cmake_use_find_package wayland EGL)
-		$(cmake_use_find_package wayland KF5Wayland)
-		$(cmake_use_find_package X X11)
-		$(cmake_use_find_package X XCB)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index c418020a42f8..db0b688e1a51 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,5 +1,5 @@
 DIST solid-5.70.0.tar.xz 267924 BLAKE2B 6c441e84923ec69c10a9cb72384fc0cc4f4c5d018e763fb6109c1d4ba4c0054270bf965a004c83d7bdb164efaa53c341dd15af20796a46425f25f4d816f598c0 SHA512 31e7de3cd726d07452d40d43c6280a95f54abcccc63858e7af198ec0a5f01754b721539e26feb5f5cb16c07e58b6029b0a660d55d1efb3887a658ed93c5fe33f
 DIST solid-5.71.0.tar.xz 270104 BLAKE2B b950457565b35bbed2b74facf4f94326af67e98f4867234920c190af8c248b90a26852c2a6da389215e452e67175ce5d8a1b19c59bfe25fa23f659592c0200a3 SHA512 506d18c8eb7612e35369613d1f75927ecc5efcd1e9d4f3791ecf732226e3f20f81d36c708e5600f23d74a23caf28f20f64877f4cebb9987392fcac18f74b12db
-EBUILD solid-5.70.0.ebuild 828 BLAKE2B 42c3c955b9a98d81bb9cb6006b3da4e60a86581916ee8a6e30f65be6e58502164bdda1fb58976c7e5b61542936045572bc40225dd2e81229a84b7f045602419c SHA512 583dde1b33007e9df618f83e1b4398d6521df26d329b65301b32df945ca50809c489d09f2849028fde284b2ee42770411f5dd774940e5d5ef1af64272344aad1
-EBUILD solid-5.71.0.ebuild 831 BLAKE2B 00be905cc1a759a0980c7797379aafd8d066b7225796c033d03b824b27212150219ed2856a69c4c1f3e1396b086692d25f14b4dd8e730d20a06bbd832b23dc66 SHA512 4f2779348e479c5ad571cd1066fee60f428b9aa410cc4b9de8b0c279c4b5756655080ecbfb1e8d9730c211631f273c5f13cc965a9379b2337e8df0cf2feaac8d
+EBUILD solid-5.70.0.ebuild 861 BLAKE2B b88f445976d2accb94d0245aed6a32c2dc91575c53ce7d01bb14afda9cac70ab6776028d0e26acdfd46ac34ea7f6330cd3b7bb650d5c089cb4ba61b92f8bc4fa SHA512 fd98ad0aad610c30c9be22d9c7e3c1a8de9feee0f532bf041173ca6a0bba3a40e5703b87a92bea77c62b26f0bf8a85f10d3fb0a065f6b90fdda61e735ba25572
+EBUILD solid-5.71.0.ebuild 864 BLAKE2B 49e219fc9f38ee4dfce3b22fa8f4d9d3152f526f36253f442e93157c2e2b6ec5e9916c0cbba4a831fffc0990d79fb8aaf04cf8f0b44afccaa0a7cfa4a5c29b67 SHA512 e806fc672c50714baa042b5a4167fa075289b4ebb06577df88a2093be2ee2b480170da8c66d626a4cacaa2c298665d5cf8da00406887c2a883d3c9ad233f49b3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/solid/solid-5.70.0.ebuild b/kde-frameworks/solid/solid-5.70.0.ebuild
index 575a4ed6847f..e1d18f987c73 100644
--- a/kde-frameworks/solid/solid-5.70.0.ebuild
+++ b/kde-frameworks/solid/solid-5.70.0.ebuild
@@ -13,6 +13,8 @@ KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls"
 
 BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
 	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
 "
 RDEPEND="
diff --git a/kde-frameworks/solid/solid-5.71.0.ebuild b/kde-frameworks/solid/solid-5.71.0.ebuild
index 91da8e273384..e68f119233fa 100644
--- a/kde-frameworks/solid/solid-5.71.0.ebuild
+++ b/kde-frameworks/solid/solid-5.71.0.ebuild
@@ -13,6 +13,8 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="nls"
 
 BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
 	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
 "
 RDEPEND="
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 77067555778f..d445444d9ebf 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index e13a5d793ed0..5f2b1ad0c58d 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,4 +1,6 @@
 AUX kdiff3-1.8.2-crash-w-o-clipboard.patch 950 BLAKE2B a075e1e8a06958e5f849b024d65f7d709be49a7facda5b4bd2a223374735a80b19a94ee983c9d1245733fed6c46f6d4c70cf631d32c2c2aa5f345b999e437674 SHA512 43d0c4898841fb822571502257a0d7acd359deaa7e906a0a80fb9d2f9cb8b61008a6b96d08acf74d5a76534b519fc6f3435e08034651aa4572c637817be4e025
 DIST kdiff3-1.8.2.tar.xz 1039304 BLAKE2B de4052117bdade42fc489cf35ed9f4af4dfe8c1704dea36f2fa36ee8b14b4dd355052d0e9cdc0f32de9dde81e74862d1c10f7fcdde12db8f5e68d4e377e6f5f1 SHA512 c52dea38b8fa483344a840fb0f6eab04fdeb2dfc5f2a554f9fc095ed175c45f4c355fe7f04dceca4446ac483a1e97db2a296b947fb99315fc388a45e6298d7f0
+DIST kdiff3-1.8.3.tar.xz 1038904 BLAKE2B 43fccb146a2220661d5f7e1e836de06b00afe54b9bccbd37b76eaf1dc660eb81dae781b08071f581c5a3bd123b7b829c4339b72348c65829c4f977a61771e69e SHA512 5cadd1cfe7e85a1dfb81c4f1cb685f988b0155b581ffa38653d4df30172b6a1ee4ed4269869285b5add3ca163eae88645d702e6fc84380229ac09ea14dd20a4d
 EBUILD kdiff3-1.8.2-r1.ebuild 1092 BLAKE2B 9e32869ac25e4341b2604e001a6e7079ea02487d5a5349756fb7931e1554327814a22295978448a0bc164abd56cbcfa0991d4886b5cded7c19a8d8880207d06c SHA512 624c8c8d282bdcf5d0797b795decc55fbe558a590e240586967f064623281444a8f722c1a0d66db8eca3de22a058288bd14601d686afec33068c20aa29399e15
+EBUILD kdiff3-1.8.3.ebuild 1036 BLAKE2B 8c6d9b36f5eb10d6c2f5af8075ec1e4b08c28377b6c9e4cfab49ed2a4dcbc51a5ae40320e840559f897c4de0eb59b1b14458131c20296d71b3888ee5d43f6e07 SHA512 54a845c025f3c771e8d1eebec160d94dcc86c82958c0b5d9755ac5868d5f765ca94607178857d3a9dce88d121793e11ac46138e42d63e30372f81a3a6bd70962
 MISC metadata.xml 362 BLAKE2B 45686f239bfb936fe11982d8bd2b51380cdfef94c11e5a6fb224c030154bda8b27190052b1705e010fd22305dd2830b8f8b385b47fc647f7c80b2ec01a1f579a SHA512 1fb8f10c3632c0007e65be57dbeb2492ad0e90a79f0403ce4a350a6ea0e1764dd1ee5038b0381049a6715bab2d7c38fc83c0b8f338ea7958bb34df499f355100
diff --git a/kde-misc/kdiff3/kdiff3-1.8.3.ebuild b/kde-misc/kdiff3/kdiff3-1.8.3.ebuild
new file mode 100644
index 000000000000..50728ca4d608
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.8.3.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"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
+HOMEPAGE="https://kde.org/applications/development/org.kde.kdiff3
+https://userbase.kde.org/KDiff3"
+SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}: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/kparts-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	sys-apps/diffutils
+"
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index e030359e0c2b..90472f8faf03 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index ebee1d83ca46..8cc5c1795b79 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,5 +1,6 @@
+AUX bluedevil-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch 2204 BLAKE2B ec7b389b3bd663f7c4da29c6d4afbc770e6ed2e96c1c6335e1f92b13d05dd77fbcafa508676c27e9759684eaac8087606e8965e8106d55d23427cb63aef1b786 SHA512 a678b1c40cf40659caf3387b028f605d396a03ac08d04b4d74900ce0795208b344942acc1541d3fcd3ef102adc2ded9440f391d4bec501bac5955e108b7fd1e4
 DIST bluedevil-5.18.5.tar.xz 168016 BLAKE2B 06460bd1b40f70b7b6f3641ee3921819ee7c2137af906afb8ebc5a9ea3b3161bb8494b930eae95a18ec6aa8ce6191500421499a944fd9dbc9041a9a48a3a1492 SHA512 4e5e55626d02a7ae820a43e760397e3b221749cd940569d180a67adba141f9afce418f1cb07c9fb1e607757461317a76343b5c6b86b3940a96711be9b4b66323
-DIST bluedevil-5.19.1.tar.xz 168712 BLAKE2B c9e97919fef9e7034648df8cd04afbbc98b2f7e8791d01abdea054289e2e79473eb208a7f453351558ef01fa6bc6078bc168e02e82262eb2883ebc3de10ce2b6 SHA512 bcc4e3c8d9ce84e8938fcfba8aeec4a5eca4349a4bf4281445a7614c4a0846779b9faf9be38df6364111c0320f45f7770111bc3b15da908bf895f0f3779b3fd5
+DIST bluedevil-5.19.2.tar.xz 168344 BLAKE2B 9c61edf820366bbc56908d21cf3f8746d75b4718db387886ce5a8a8bebf6dfacf13c8b3a6d4d9ffd168c279afdf955c6b6bc973621372a497682eeea63b4b410 SHA512 827dc9ecc04ee8d385ff2c3eee2e8dce47551cd73ac82c2e8a050c596df2ea2657dcff3632f4bc2c7a1d993d61544ec3e42c307dd9f2bd06032cf265b51ed868
 EBUILD bluedevil-5.18.5.ebuild 1068 BLAKE2B f17fc8d025089aac350637564beaae3469673c38b538ffc97af05d20b458cc6a571973bcffd5220c8aeacaf672a8c80eda649f039813a5e0b401a1a6f08f473d SHA512 255d07652fc437a7d1c1569c69d4b27a38162481cde4518694e5768df90bd9dd50e2136ed3769ff0e8a923ae38f20ad1387dcec05e3270ceaceef8471c3e7486
-EBUILD bluedevil-5.19.1.ebuild 1066 BLAKE2B e42e54222cf5005f57b01a0e52bff882638e51cf51fec07091b209f5ac218343c6fa2c81e798cd71abf1cd48aab0a3c6740089a0e7a862da16052569a9325715 SHA512 b4757e370f8185dac9a8872c896adc945d0530d5b9d8d6efddeaf85e527e7cce495fcf17ce4b47675b2944a3bd8f0b601a790e37448b8b424eef7d8b4748243d
+EBUILD bluedevil-5.19.2.ebuild 1167 BLAKE2B 9c41b7339e01d851d7d529d6dbaccb0a06390104245b85810109ea458ccf5f17685a865243399183b4404ba714f880e6549027c63507270cd62957b08142e404 SHA512 369a15bc81c3074d7f9dea74646798240ff4eb1283a1b1f6f79043c2f386d12863c89ac2569044981ac578d17742b5dd971b06356fd5226652d250894c3487b0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/bluedevil/bluedevil-5.19.1.ebuild b/kde-plasma/bluedevil/bluedevil-5.19.1.ebuild
deleted file mode 100644
index 78d78881e450..000000000000
--- a/kde-plasma/bluedevil/bluedevil-5.19.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
-
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Bluetooth stack for KDE Plasma"
-HOMEPAGE="https://invent.kde.org/plasma/bluedevil"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/bluez-qt-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kded-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
diff --git a/kde-plasma/bluedevil/bluedevil-5.19.2.ebuild b/kde-plasma/bluedevil/bluedevil-5.19.2.ebuild
new file mode 100644
index 000000000000..ec72ed866756
--- /dev/null
+++ b/kde-plasma/bluedevil/bluedevil-5.19.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Bluetooth stack for KDE Plasma"
+HOMEPAGE="https://invent.kde.org/plasma/bluedevil"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/bluez-qt-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kded-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch" # KDE-Bug #422684
+)
diff --git a/kde-plasma/bluedevil/files/bluedevil-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch b/kde-plasma/bluedevil/files/bluedevil-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch
new file mode 100644
index 000000000000..3c41eb2c6942
--- /dev/null
+++ b/kde-plasma/bluedevil/files/bluedevil-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch
@@ -0,0 +1,57 @@
+From 161c1b92bced7996e92026ff9ae503593f6590f6 Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Sun, 14 Jun 2020 09:10:38 -0600
+Subject: [PATCH] Port applet to use PlasmaExtras.PlaceholderMessage
+
+The Kirigami version uses QQC2 elements which don't respect the plasma
+theme and color scheme, leading to thing slooking out of place
+especially when using a dark color theme or scheme.
+
+Depends on https://invent.kde.org/frameworks/plasma-framework/-/merge_requests/13
+---
+ CMakeLists.txt                                        | 6 ------
+ src/applet/package/contents/ui/FullRepresentation.qml | 4 +---
+ 2 files changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d9067851..5ddce978 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -33,12 +33,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+ find_package(KDED ${KF5_MIN_VERSION} REQUIRED)
+ find_package(SharedMimeInfo REQUIRED)
+ 
+-find_package(KF5Kirigami2 ${KF5_MIN_VERSION} CONFIG)
+-set_package_properties(KF5Kirigami2 PROPERTIES
+-    DESCRIPTION "A QtQuick based components set"
+-    TYPE RUNTIME
+-)
+-
+ include(KDEInstallDirs)
+ include(KDECMakeSettings)
+ include(KDECompilerSettings NO_POLICY_SCOPE)
+diff --git a/src/applet/package/contents/ui/FullRepresentation.qml b/src/applet/package/contents/ui/FullRepresentation.qml
+index 5bd32f15..e77bf295 100644
+--- a/src/applet/package/contents/ui/FullRepresentation.qml
++++ b/src/applet/package/contents/ui/FullRepresentation.qml
+@@ -27,8 +27,6 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
+ import org.kde.plasma.components 3.0 as PlasmaComponents3
+ import org.kde.plasma.private.bluetooth 1.0 as PlasmaBt
+ 
+-import org.kde.kirigami 2.12 as Kirigami
+-
+ PlasmaComponents3.Page {
+ 
+     Action {
+@@ -99,7 +97,7 @@ PlasmaComponents3.Page {
+         // Not inside the ListView because we want the listview to be hidden
+         // when Bluetooth is disabled, yet still show an "Enable Bluetooth"
+         // message
+-        Kirigami.PlaceholderMessage {
++        PlasmaExtras.PlaceholderMessage {
+             anchors.centerIn: parent
+             anchors.left: parent.left
+             anchors.right: parent.right
+-- 
+2.27.0
+
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index cd872a9603ac..23857e1afd7c 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-grub-5.18.5.tar.xz 3138804 BLAKE2B 236f590f19df0a8faf28bef3dfc0a555434902ff284a978576d67e0f7f2076f42d3cca8283d3b979cc3d7afddd1b50a2cde09dd3a23056798d7a6ad7c6db9635 SHA512 969154c602cbd7b334dd48550eb53cbffce16b355aaf971c6b5b372ac43b42aba507bc0e972f0de0051f34b75c80ac295b4f3ef8e64d5762b56a7d0a8d216d69
-DIST breeze-grub-5.19.1.tar.xz 3155772 BLAKE2B 0af9d473bc6c6b76d634aa9e96dbec96b0e3b0ce23659313ee761d15a21b6fa401dc0c1b25a5827770ffa2948d15fc4af8a06274412e99b08cf1b5006c875939 SHA512 798cf5baf5d5fcd59dedbf1b4080b7394fb0cc468d65568ea579d774c655f4910f6c932cb07a8accaa2843a37bf2803c8a3f0bc5115622ecb1639ab96355bed0
+DIST breeze-grub-5.19.2.tar.xz 3148832 BLAKE2B 7913d0ee2199a9813fd11e70981fd98a1cc2bcec0e66cdc565c3197274bf821398a080227a24e3a486128bc3b1a30f0f90ee60148725fc1c61bcfae0b7aa242d SHA512 21018bb07d667a9565c48c2aec624feb21372ce5abb98ac0ef907b20fcee56b1f0730c683393973449f7fcbbeb177b479ee4291cd0a54904eba7f14019c39f6d
 EBUILD breeze-grub-5.18.5.ebuild 401 BLAKE2B b40427f0cebd7be07839cd83567eca442698d69810c7cbc3e8ce420715978a4976efd2c5f0ae7bd584e6631bf9063c23a5286f10ee93e08ffcef4a56c8b9c75f SHA512 4eb3b349876f9bd17ab398d50b3990388ccbed8c07849c66476eb20c8b93199601e7d8266e25f238c3bc9eaef9d44b1b8de24e08e47344d6c5ea45cb0fe6376d
-EBUILD breeze-grub-5.19.1.ebuild 399 BLAKE2B 8ad9fdb656b8c7bf5c3ad633550744a7e7422edfb289b21987713459e14853295c19f92b58e898904618f503f090ddce2b235d397834278a4e98b408c4e0f2ac SHA512 7b31aec51e559406f5406583cc72c534b86c9e84f7fcd44e62f2d18629b274c98bea66f586f97db63daf1e0f65037b693f91779df8bd752e48b3279dfc88b105
+EBUILD breeze-grub-5.19.2.ebuild 399 BLAKE2B 8ad9fdb656b8c7bf5c3ad633550744a7e7422edfb289b21987713459e14853295c19f92b58e898904618f503f090ddce2b235d397834278a4e98b408c4e0f2ac SHA512 7b31aec51e559406f5406583cc72c534b86c9e84f7fcd44e62f2d18629b274c98bea66f586f97db63daf1e0f65037b693f91779df8bd752e48b3279dfc88b105
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.19.1.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.19.2.ebuild
index 3ffda41e0664..3ffda41e0664 100644
--- a/kde-plasma/breeze-grub/breeze-grub-5.19.1.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-5.19.2.ebuild
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index b20c6bd7aec4..be82c585ee0c 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,6 +1,6 @@
 AUX breeze-gtk-5.16.5-cmake-pre-3.16.patch 542 BLAKE2B 58af50232fc314cbab7f6d47a54bf87b2be75757354f0ad7fbf65e36822774dc96a3d7928360b1c27c7819e7d55253db73f5f883cddbdaf89ca62e94cf1732c1 SHA512 9065680b040447fa84d4f100bf5ed7fdde2631c53ab777abac238d9a319c33d40ac1f111ec942c9f32721363fd80e71514e405cb0dc429e07b80dbbb4233c0fe
 DIST breeze-gtk-5.18.5.tar.xz 42396 BLAKE2B bbfe9cd57c438ad1b1cb144b0393ee45d0ed0aeebb34b38e557e2950d7e0d8ec950c1404eb2e17fad7421becf6486cbd6d2c44b414fde62f27076f4fa2419791 SHA512 3dea9af26cd18dc0388c76c070c5a375054b6a03ffa97e298341924fd909e2dcc49a7c7b431b36a158c1012ce6f9d48f98ef84fc6cda0965d9a24ab18c7c0951
-DIST breeze-gtk-5.19.1.tar.xz 42596 BLAKE2B 54895f73b2064f02df90680a7af563dc7dda186d6c4e20a4ca7fdb604648172e4f42585a7b83ce505958d36654abde7cdac7b29179caf7816327479ded5c42bb SHA512 19ff4bc1665702f556021ade716f1173c5d445689546c86dffb71e48596d3578cd41d40d1db7b898b48011b59a2719fb0069723d6fb20d19a4b7ca369c7eb82d
+DIST breeze-gtk-5.19.2.tar.xz 42576 BLAKE2B 345e64235b7ffd3123511ab598f3860823a958d11764c467351e03dfec981874abd6364e8d0f52670e87ca025f21a831ce7066faf078ca5bbdd7cd692490a242 SHA512 6bb2be8fc59f16de6264b067fa60c0511c0cf49af8293cbdfcd08afd56649b51dc1c5c0f4955957d0bfa84d0a22776e8d486b72284f7133bc61dd41e06b3e54f
 EBUILD breeze-gtk-5.18.5.ebuild 1016 BLAKE2B ac9c25e163e1200f10fe3aa526e25acdd9ed5e71e933cffde1ce5a62201316e73a750d9376634dc4953e117fce62ca945c7b16a66f31dc18324e2c44af236d20 SHA512 64ab23938f10d4b5136412b58f2f6ef532d4bb36dac4081222eb852c149de9c38253e8a42e50ac0e8a6edcfd546f25b1e15409db628c8197c9ee836253e9feee
-EBUILD breeze-gtk-5.19.1.ebuild 1014 BLAKE2B ac27d8606a3ed9c9780636adccf736240ea42b64980b65ec5c775e567c63de4b7cc0413f793b632fa2f77e9efde7580504ee38b97073b3686e1f0c49e97a5ef9 SHA512 3e71dd5f9ac389b35bd481f55cdb7f7f767fc0de633c01a8664495f6ff7cbb7dd59bc415c4389b3f1a330e892b3bafd4c0c2ee04497c3f4e47a5647fb681ce9a
+EBUILD breeze-gtk-5.19.2.ebuild 1014 BLAKE2B ac27d8606a3ed9c9780636adccf736240ea42b64980b65ec5c775e567c63de4b7cc0413f793b632fa2f77e9efde7580504ee38b97073b3686e1f0c49e97a5ef9 SHA512 3e71dd5f9ac389b35bd481f55cdb7f7f767fc0de633c01a8664495f6ff7cbb7dd59bc415c4389b3f1a330e892b3bafd4c0c2ee04497c3f4e47a5647fb681ce9a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.19.1.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.19.2.ebuild
index b58d7dcec409..b58d7dcec409 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.19.1.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.19.2.ebuild
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index c04db38b1817..71f9759e6d70 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-plymouth-5.18.5.tar.xz 105672 BLAKE2B 6aceead2db0c977951cdd8e6d93314276fd920846e77a0ac5a9e195937b5ec116f3c2be371096d77dfaa9546bd2b44516ef8ae42ddd2aa6760684cc693418b3f SHA512 45206a6c99047b8b68fd5806dce608ddc09c4208c7966ef276bd7096949ad05138ffea2d6272e5c5ed5985ebbde9bfb7ce8b8a1074f56286dd3e1b840937b98d
-DIST breeze-plymouth-5.19.1.tar.xz 105732 BLAKE2B 20d6998ff9069b3439390d65f312477f0bb9e6ad9c11de244cf9e1822b90cca81797d8fde86ac5c44a2da11169a87495fd2ac936c4673528c51002f8f20d85ab SHA512 832fe17ce28f1d09b2f57a5fa5bbde3ff8de9ddb3899d65d086e5268e8446e2cf7eb4befe0746913297f9f76bd79de86deb54a08be91a228c4ff5a24c13aa05c
+DIST breeze-plymouth-5.19.2.tar.xz 105756 BLAKE2B 9bb14cab9146e5320ff9fd25dd6ac2cd7cbcf322e1cfeb45c118248cfc8d60d79ff1e61af7ee650569ecdfd5ea9ae50d3064ce98447fb9dbd832e1663f373075 SHA512 51ccd19ed27787df75b565acf401a46b41e822a32ef9967ce5861ba45c8920f99c42ed809d7b2cd2a6b11209227daf3a426ca0ba2e2b24121e8d0f8a1d31c4cf
 EBUILD breeze-plymouth-5.18.5.ebuild 515 BLAKE2B f41afede696bf0558e5a4a3b68e754031be382d6e0cbe0a483cb5da96741f87559dd1a4bbe91d7e2c85ef6be781c1f52ae236473de3288ba6ed34d2b02baa896 SHA512 a546c2747432ad3612603933b9142a001f7acbf7c6d4a45b9670b69bf9be342fbb98207ba451c478ac70570c0512ed4634e364c5bae51432e14b91e9e7476c0e
-EBUILD breeze-plymouth-5.19.1.ebuild 513 BLAKE2B b0ae8fa97f0b9dc802fa3edca5098ee06714669742bc569e8933f4a1fb1e57836bde5a75ae3186502e01c7ed696a7892ccbc55b198c8c61252490f45d1ce9b39 SHA512 b7f7bf8f82bd03c4fbff0052f929b57c7747762f0899e1ab93df24762be931cfb95c4a142ad14d213ab59c18e05a4ba300734428a8fdc00f07b53fd0de2964ae
+EBUILD breeze-plymouth-5.19.2.ebuild 513 BLAKE2B a6fbfa0869fe17234e31a7e59367b9ba5931a7a8a98fc1ae045af6ca6176da77afe0ea3400db6408b7002552f0c2d1ab54ff44a63622ec3859569c31e5351420 SHA512 04f3f72743b88fcf11086e7c7974ff9d53eeefc0256673f1a941311e677b0c54eb9d641ec8f078844915d7ab1f3ecab26d22a8f16514c5dbb1d4f428accbd484
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.19.1.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.19.1.ebuild
deleted file mode 100644
index 76ab66faa384..000000000000
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.19.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
-
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-inherit cmake kde.org
-
-DESCRIPTION="Breeze theme for Plymouth"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:5"
-DEPEND="sys-boot/plymouth"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISTRO_NAME="Gentoo Linux"
-		-DDISTRO_VERSION=
-	)
-
-	cmake_src_configure
-}
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.19.2.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.19.2.ebuild
new file mode 100644
index 000000000000..5b9bdb606fd1
--- /dev/null
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.19.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+inherit cmake kde.org
+
+DESCRIPTION="Breeze theme for Plymouth"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:5"
+DEPEND="sys-boot/plymouth"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISTRO_NAME="Gentoo Linux"
+		-DDISTRO_VERSION=
+	)
+
+	cmake_src_configure
+}
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 28f7c998e837..879938dec73d 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-5.18.5.tar.xz 21583276 BLAKE2B abd1afc0fcfde8a7b72923824908cdc18124ae2e544446a7923e1a6a88ed89876bdac127867a8c33473d0e0c83b360450fafa1c3f72fa938837de03b157de055 SHA512 d4797d9ecabd1d1bcaa483722c255f1a79aad5d15bca0daee571eced2e5c295e39ed8cd6039fca39d9e1a1456bd823f30fd332b2811a04df2b2e3663a04abff5
-DIST breeze-5.19.1.tar.xz 22760028 BLAKE2B dcc597f5a7a834921cf91566b503f93d96fc94efc0d8c4bb1ec3cc3e65f341ebb53c8481ad62ef37459af5b95b99ca7fbbc3bcf6dcd1a7dd1cb6cec7fee1a08e SHA512 6324af56b2a257898c38b8f0698625026a1b6e92bcab22bc955d2f7f6864caffc4cc286ffa63a9c76962cb96bdef5735cfe6a66565e54f8a240278f5f8f40e35
+DIST breeze-5.19.2.tar.xz 22759884 BLAKE2B fc75c1b60e173fd8baa789afe8ddee719be64f5afca9c35d393ef7a6e15b5df9d33c6e77b06c056e4a69b02159a2c83a2e5315d21e0945be48a8bc19a264183c SHA512 40d817d061bdff8ed25b0a365bd66e11d1f255eb47fb987fb31414139729fa37fa3cf86d617a0211ba1d82babe5f4159c3265b70447bc063d6111c00ddf42254
 EBUILD breeze-5.18.5.ebuild 1415 BLAKE2B acd856b73e24e7f705e4fb74bc9cdd68425d1954c8c318d71549558c145442428d86878526295f16dde5fe7dc57ae73d6c24e73fff32783cb14fdfb39627d157 SHA512 c08c90f4da1e1a49f18379111592ab9456827e5231e7c07e4695927b676c0f77e72a21482ea2a5879a6c2a5a87a55db5292a6e68bfc41c57390891f3e1292e22
-EBUILD breeze-5.19.1.ebuild 1352 BLAKE2B 3ffed51cfac512522f2e341ddb8a0e92961da8dddcd142b045c727404061b745fdf37e0575d60b7d48636d87d803fbfb09e6be8f5ef99a9cda8eb898b908dd02 SHA512 27a08dd480b27dbb2a356c885d188a62f5426f19c3804563ac68143c2d907381f5121704a46c42550fefb1896cf931092fa546c41a5dfd7c69cfb4fec74388f1
+EBUILD breeze-5.19.2.ebuild 1352 BLAKE2B 9695c37cbf8276b36e980aa398c44a0704145f4dddccfe2a3e3734169955d026cfcd90d99b3c165244d83f4e425e1a9dc4c031db3db0eb205b8bdb0f85e1dbc1 SHA512 7c898ee8d8940f6e4863ff74092c5490e9e45ff22d16be646dffa601460210fb8b4aa8b12e073622c943a0fc90e558b1a5603d52262209c9f97c9f288e10fa65
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze/breeze-5.19.1.ebuild b/kde-plasma/breeze/breeze-5.19.1.ebuild
deleted file mode 100644
index 8f9845655176..000000000000
--- a/kde-plasma/breeze/breeze-5.19.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Breeze visual style for the Plasma desktop"
-HOMEPAGE="https://invent.kde.org/plasma/breeze"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="wayland X"
-
-RDEPEND="
-	>=kde-frameworks/frameworkintegration-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-plasma/kdecoration-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	sci-libs/fftw:3.0=
-	wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libxcb
-	)
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kpackage-${KFMIN}:5
-"
-PDEPEND="
-	>=kde-frameworks/breeze-icons-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package wayland KF5Wayland)
-		$(cmake_use_find_package X XCB)
-	)
-	ecm_src_configure
-}
diff --git a/kde-plasma/breeze/breeze-5.19.2.ebuild b/kde-plasma/breeze/breeze-5.19.2.ebuild
new file mode 100644
index 000000000000..238d262e6159
--- /dev/null
+++ b/kde-plasma/breeze/breeze-5.19.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Breeze visual style for the Plasma desktop"
+HOMEPAGE="https://invent.kde.org/plasma/breeze"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="wayland X"
+
+RDEPEND="
+	>=kde-frameworks/frameworkintegration-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-plasma/kdecoration-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	sci-libs/fftw:3.0=
+	wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libxcb
+	)
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/kpackage-${KFMIN}:5
+"
+PDEPEND="
+	>=kde-frameworks/breeze-icons-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package wayland KF5Wayland)
+		$(cmake_use_find_package X XCB)
+	)
+	ecm_src_configure
+}
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index 718d355a2fbf..c24255e9eae9 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,5 +1,5 @@
 DIST discover-5.18.5.tar.xz 10475624 BLAKE2B 0085fbc4bc0225863fed7d0a01d21d512d283ba5d3289840a3ea6c423ca876121a90065220918e088b7652580cfb79d30a5f01e445374931f3a1279e27485417 SHA512 6ae578815d54ccb770d4d113ec04f0e75c4b93cb1b4a1d636009072da83721e440a4fe817613f1b676c852cf2fb3ee1bb7192c60b174753578449e0bdfee7195
-DIST discover-5.19.1.tar.xz 10293976 BLAKE2B fc00271fdfb24a9a05bf0b14f622604a6ecac781ebc1b6feaf0233a460f7b8b05fac110be60886f07e947a9ed8f20ff7955645809ad21c4318d659e18fc9274d SHA512 6c3f0a2cf195e2475dcc5f9f98eee7abd6b20b36a599d12aeddad2014069398a1d952603abe8df7257aeaddef26168cf6d9641126bc77b76a4efe6e91e80c90c
+DIST discover-5.19.2.tar.xz 10293452 BLAKE2B c1cd195067fcc46a2a49c09ed76cb097472d46bbc298cde3f680a82b24ce1dc93d75bcf1d45fe4de3bcc3f5e0ca6a9b79fe027c62d89f8734f6ddbe0ee242703 SHA512 689074f9072f5316fb0392ea589c5e5a363231014eac4913bec7f72ff924e01243416248d467bff4505c14def57299f97af14d8b6e932c4209773136fd6f24b1
 EBUILD discover-5.18.5.ebuild 1994 BLAKE2B 40ea5ec9b64f4ee9055f5db4140b0c0062dd1d206433914b0d7ed892d6694e5b9b296ef733362f6efe21ea38c9ec982fe3a55941db6c8f315a2e856fb943bea1 SHA512 13460232c4219a5e52f0fa97a47bb461fdaeb26e09addaef3ab4dd5ddd599afa87edaafdeae938659adad4770e929cb473220c1a09cd234a063deef8cbf012a8
-EBUILD discover-5.19.1.ebuild 1992 BLAKE2B c2084b3b076624b8977cb67dfe63222f3f7f6b29dae98577a040aadaa5f08e6c2fbc8af052df13c1cecb1adabb5bdc9e7dea162ce3c9baadcb480d42dd4f6709 SHA512 f5a694c4ffa094eddfa2be740b8d328cec260fced3f778479e39c7c8053364f681842bebf7cfea0ec96c5c3e6a2ed27cb4f9f709c8022e532ceac07bf29e201b
+EBUILD discover-5.19.2.ebuild 1992 BLAKE2B 0a8374d79ebfafc0b56c3acfb9066645ae7c470d419ab31db1abd2c6189b3aed80f8f2635b7b184d3243f83085d112be95101826dd2a0ee6bcff224a13fd2b12 SHA512 d47561628c66e8375b768bb7e44e0e9538a4943bb56d96f423cbe29df3f0c20a22651a58e265a02926317f8f3708958779c07ae1e5864c3072ce99abc16b54b5
 MISC metadata.xml 364 BLAKE2B 4ed8b5937febc1af9515c186ab7eefbfb7d7520c8befc9a6397e6bc69bb355715e1a1b536909a7966962d0791a7a272c5591facee0901256862322d2d984a4f0 SHA512 27da3a4431c2f81e442980f8044f93276f7c4e005d5fc2dc92ebc6ec008fa25a441b03185426587f6357da764262c305cbbf998de2fe6c82b3f56a903d88e15b
diff --git a/kde-plasma/discover/discover-5.19.1.ebuild b/kde-plasma/discover/discover-5.19.1.ebuild
deleted file mode 100644
index 247f7068932c..000000000000
--- a/kde-plasma/discover/discover-5.19.1.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
-
-ECM_TEST="forceoptional"
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma resources management GUI"
-HOMEPAGE="https://userbase.kde.org/Discover"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+firmware telemetry"
-
-# libmarkdown (app-text/discount) only used in PackageKitBackend
-DEPEND="
-	>=kde-frameworks/attica-${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/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	firmware? ( sys-apps/fwupd )
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}
-	>=kde-frameworks/kirigami-${KFMIN}:5
-"
-
-src_prepare() {
-	ecm_src_prepare
-	# we don't need it with PackageKitBackend off
-	ecm_punt_bogus_dep KF5 Archive
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON
-		-DBUILD_FlatpakBackend=OFF
-		-DBUILD_FwupdBackend=$(usex firmware)
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# bug 686392: needs network connection
-	local myctestargs=(
-		-E "(knsbackendtest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-plasma/discover/discover-5.19.2.ebuild b/kde-plasma/discover/discover-5.19.2.ebuild
new file mode 100644
index 000000000000..ff0edd8e95ef
--- /dev/null
+++ b/kde-plasma/discover/discover-5.19.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma resources management GUI"
+HOMEPAGE="https://userbase.kde.org/Discover"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="+firmware telemetry"
+
+# libmarkdown (app-text/discount) only used in PackageKitBackend
+DEPEND="
+	>=kde-frameworks/attica-${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/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	firmware? ( sys-apps/fwupd )
+	telemetry? ( dev-libs/kuserfeedback:5 )
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kirigami-${KFMIN}:5
+"
+
+src_prepare() {
+	ecm_src_prepare
+	# we don't need it with PackageKitBackend off
+	ecm_punt_bogus_dep KF5 Archive
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON
+		-DBUILD_FlatpakBackend=OFF
+		-DBUILD_FwupdBackend=$(usex firmware)
+		$(cmake_use_find_package telemetry KUserFeedback)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# bug 686392: needs network connection
+	local myctestargs=(
+		-E "(knsbackendtest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index 18b3c0df72ef..4ae1e791ef18 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,6 +1,6 @@
 AUX drkonqi-5.18.5-init-bools-w-false.patch 1702 BLAKE2B fb60d49278011acdd8ffc4eacc5cfa07afc34f3dbe240945bf87c2ed23f4f94bd4284fe3df25e53e28467a2d4ced54b47461a440cd70be41e17412ed9c2d9c52 SHA512 87d3ec1db263b1cb1eb27684da40815eafcfc8bf512ec771eebd3481bc032a6653686aa22f71313b46dfda7e1dcbdfd5b2bde9930d69f0939ed2ddf7b25529c9
 DIST drkonqi-5.18.5.tar.xz 747984 BLAKE2B b94f808c7edf8e02628badd63ecb5edc9dd80d3e157f46c72fb884d5c35a2a5c70e9080235a7be84150dc973765f42572fcd6e907bcf6a58c100d80b7188bbc6 SHA512 b4862297e969f501f526880560acbd02026b64a0bec2f6e3b2b30f4bfe5ff2abd1798e3bda920bd61adbb6c9a3455e0c4f304f3f37bcafed3f3d8e6de1bc67a9
-DIST drkonqi-5.19.1.tar.xz 747860 BLAKE2B c24435b3374ac91c6888de0045c59314e2fbe3e0118f5d87efc93131cf4e8b908405e2606c6a253801f20f8f7db72a69b55834880ecc13c7a5757a94e9c94bc8 SHA512 958015cadc04fac8bfa6d7ad499eb2ecdb547fb988933dfac9ec44fceaff1e473777747e10f5a1da0ca2ea634b99858972d3a548f8b8a424a6089130777f3c49
+DIST drkonqi-5.19.2.tar.xz 744256 BLAKE2B 40cee195ad2b5b6a85e5daac9174ca69e41291c251273dd61916c447d9f572c5837db836b63728590b63b82b1f7bb7965894f54273fbc8fc283a6e32068ab717 SHA512 07b3818c751e8dfc89efb63a8a058d657f216065c2cdc9ce81689e3136bcece301d7c9095adb09422db42dc6b074dc9ad93ee192a7de57f38cc488c090ef2696
 EBUILD drkonqi-5.18.5-r2.ebuild 1683 BLAKE2B f0edb1519a89f54fcae1960d4bdb68beb1a02a708a3f1608204179711e33644a656ab353b1e8901b9947c8124852fa5a1bc9d70fdd510cc87daef86c489c6807 SHA512 4027d7640d8706c79acb24245425dfb9542ca0814bf5462edfee89f9ed91586fe99c5dd6d58fafbd490d17851c4bf9b824e1442cdcad60a2188810dccc41147d
-EBUILD drkonqi-5.19.1.ebuild 1639 BLAKE2B 2c49584bed36a8d41d5199661a5cdcdd8063e8bf9cbaa40ed1e01523c4267656967da5c0d40771458c381d949e7230b82565a052b91e151f02432b53b25fc0f7 SHA512 11881f9612b48a9fb2600b5b0f89922242150b7a5a76264307a5c7305df12ff38b051c93baffea5fea554ffd9287eef2d048636bc273ec4491fafe1d5ff268bd
+EBUILD drkonqi-5.19.2.ebuild 1639 BLAKE2B 93405ea890ef7f0c7eb55352c7d8d42fa2265edd9f562da9c3db1b641d7b12c2b827baca610d5124a247399ee202a7cfd200c6e4dd2470ba4beef535f316b694 SHA512 31f1f13678c29568e8245075f90869eec9276ffcbe4e618ff9de3837eeb9d58d568acfcb51222dd44e45a48692a54b017644ebe26e680b8efc89d10462195fa1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/drkonqi/drkonqi-5.19.1.ebuild b/kde-plasma/drkonqi/drkonqi-5.19.1.ebuild
deleted file mode 100644
index 4d71de8e30b3..000000000000
--- a/kde-plasma/drkonqi/drkonqi-5.19.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
-
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="X"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=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/ki18n-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X Qt5X11Extras)
-	)
-	ecm_src_configure
-}
-
-src_test() {
-	# needs network access, bug #698510
-	local myctestargs=(
-		-E "(connectiontest)"
-	)
-
-	ecm_src_test
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	if ! has_version "sys-devel/gdb"; then
-		elog "For more usability consider installing the following package:"
-		elog "    sys-devel/gdb - Easier debugging support"
-	fi
-}
diff --git a/kde-plasma/drkonqi/drkonqi-5.19.2.ebuild b/kde-plasma/drkonqi/drkonqi-5.19.2.ebuild
new file mode 100644
index 000000000000..e6c39d7d9f20
--- /dev/null
+++ b/kde-plasma/drkonqi/drkonqi-5.19.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="X"
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=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/ki18n-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X Qt5X11Extras)
+	)
+	ecm_src_configure
+}
+
+src_test() {
+	# needs network access, bug #698510
+	local myctestargs=(
+		-E "(connectiontest)"
+	)
+
+	ecm_src_test
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	if ! has_version "sys-devel/gdb"; then
+		elog "For more usability consider installing the following package:"
+		elog "    sys-devel/gdb - Easier debugging support"
+	fi
+}
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index 24e0f899f947..e1f6c5ba75ac 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,5 +1,5 @@
 DIST kactivitymanagerd-5.18.5.tar.xz 86988 BLAKE2B b87b6f96d60d1d5f77d052c79f45559c5826f83a35f4a64b98b486bdd90daf4b31d05ac9f1f84d628d7651b1a76fb9bebaddea09f15d055b6924a80c44e9a334 SHA512 2ee59f78cc948fe11577373ea69f895efcaa7d4f239362d3e060382c3be0f67511a0baa64a404c1e0e53d5777775afba60f49e58476c70dcdef6c63358ca4dbc
-DIST kactivitymanagerd-5.19.1.tar.xz 84800 BLAKE2B 0b372907aa1c5fc2144d5df34cc7f07df930ef4616fdfb6b8722564e4fc03be272e5a7aa4d753a1498e7704c0292bf6967590f6cb87d499dfc3771628efb9595 SHA512 20f025edcbedde7c4281415131bf6f76cf6f654387b91aad235f60de5ce8922d9f0da667346dee244da5c0f684fa38de671ede8008675bf69e26a54979251294
+DIST kactivitymanagerd-5.19.2.tar.xz 84804 BLAKE2B 585d8fba04a2439729353de67aff6487c6c2ee30da574e77ff83dc930fe2b3c9e65ce3bae7f971baccee902a6e58f6e8350ee8dd2b3ee432289daec68b5862f4 SHA512 bddc8583546b0a8fdfdf18415aa4ac4663f688d965d21c00ad0c70bbd350ba2392d2b779400e2c6f1122aff7d637cae7d2f127b136e8f99d02128af02c0d36b9
 EBUILD kactivitymanagerd-5.18.5.ebuild 909 BLAKE2B 186668843d8dd45c3e02ff06babde90bbf84b790703232bdbe71bee67232f8bb04bac8d66e18911385f8d438afb7a453e2a74588dbc3c295486404394cbb6741 SHA512 c401c84644ef4b046a71715e1c9f55ea6fc58137258b6cb8b8c63211d79e720faa988ee26bf9dc14e2db38d0e5600b878f3a7f3ae46555af747dca7d3ce9fe13
-EBUILD kactivitymanagerd-5.19.1.ebuild 907 BLAKE2B 54f3162e8dfc12d12e672eaa16d5177cfd11ce1c6818005bf0d1d997c9c9956a919a6621a9eb67b87ac28d7bb44b631ce523c4fc6412daf0877359d9d4f65210 SHA512 c5d863d293ac2772119b632a92432528108063b9deaaf9506bbda6f3007f9cea247644bdc26edf45c9362def08d6d04c028b83a477ce58ae7a57218a16ba28ce
+EBUILD kactivitymanagerd-5.19.2.ebuild 907 BLAKE2B e5ae2dd9a2112367412f1a94e195d4017ba362769a47943c7eb4a4976cb6ccf56c580e97f9cfce8d00b7ce7c954b87396fd498479ce5b2edf83019ed47f597c4 SHA512 eb1aad5666b179f5b7e02ad81dc2b73fa67c31cb8c2891dc1f1d7f9bac7f7d2df59612035f8453d7202810c74d001cbe72909dbda8615b3a1246d702e132ccc2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.19.1.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.19.1.ebuild
deleted file mode 100644
index 5f6bb63f206c..000000000000
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.19.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
-
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="System service to manage user's activities, track the usage patterns etc."
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.19.2.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.19.2.ebuild
new file mode 100644
index 000000000000..06c8c9fbff2f
--- /dev/null
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.19.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="System service to manage user's activities, track the usage patterns etc."
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index faedeac6fe6e..5df197b4b464 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,6 +1,6 @@
 AUX kde-cli-tools-5.12.80-tests-optional.patch 345 BLAKE2B 19415ec444e631602193daf715a94481a672447f0e262a78787a23d7c352bb18cb775e5054986019e5b21796ae24ace44ab92f337160a11500330fb03c3c75c6 SHA512 bb15a8b6e65298cab07e5a7ea9e834b2d565b2689a0c8d06c0b257fae9bc8a18f7af3922404ae4c13518c6be63fcb7581f0d50ec93d3ba9a64310fd901e2f461
 DIST kde-cli-tools-5.18.5.tar.xz 592020 BLAKE2B 6a35db9d2e68d6ceeaad72553e5d295e54d053b624b1803080dc123451b804250ca0881d6c70b626dddb75ae48b6db398cec5b9c48a25cdd87d18e03873ff612 SHA512 c73695a1ecb81b9222e213f0e98c37354560e32dc56fe8e5ebe1665f7f86a88326bd7a32f4b66d2a73826c9d684f5410306ef5e6660751601c77eae0c6f16d4c
-DIST kde-cli-tools-5.19.1.tar.xz 600900 BLAKE2B 064a68254eed37f53a25e936a1bc01cd34291bb156e5f1def7d3d3d7e6bcc489a50d362625a11d468f18f43b43bf326ed89803709b66d4cb52566e2ba8e88e71 SHA512 a28bfe014622d8b94690c12e3ffddef9a5781a43253b5a58080184b1a14a26dc7ea66cab387e46fe99b55f3881e9196e3aac6cbe608b00230de3f7c80f2caf07
+DIST kde-cli-tools-5.19.2.tar.xz 600468 BLAKE2B 3147a40482492a376947764c1daee8332c2b1b5b80024f6ebcc866add05e9042a46a587e0182eac1c404dcc7529b3cd5bbddc6d1becbde9911ec2d6ca85375c2 SHA512 02079cb198ae39eb09e8928f6f93f562cd0200773189678937abcab2403b55ad66d51628151db211bc976751cc8a5dd1da5b6eab4bdff8d1f927b4f8ea1763fe
 EBUILD kde-cli-tools-5.18.5.ebuild 1723 BLAKE2B 6024fb092f668527899e80160ff9072ac44d417f4243ff9d0e6c42928c3a97a4120e3bd44a5b203825bf69b7fb925d19d06104142664cd03b71343bad4935fbf SHA512 629c9d412e063ff0783b9b931c49b15b9c18b54478ce38d8404c1aad478c2e067d1d102b50048e2a5019b370b2a902ede2e791ae4adae52b48859011f963b82f
-EBUILD kde-cli-tools-5.19.1.ebuild 1721 BLAKE2B 088b6761c0d49bdd0a2d10c2c586b416b79315079272a1bf3aa17f36ac0c08edd07a2b5b67a4ce543b0e5df0c09976d6c1b9eb49a0551e979877fc96738bbabc SHA512 620f62cd0bf8bb4db73f34731f609d9d0a6b5f0138e9cd34854443480606f1e0667a4ff4c52af26dc985618a6870d68ee74d0bde0ab3077ee0b8dbada9088f68
+EBUILD kde-cli-tools-5.19.2.ebuild 1721 BLAKE2B 5272cebf511f2a57859ad30b80cae6d04479c58391a6b9e077249e3819f25304277ceb6adede9efd466f0e77f1539123e1f9215399c21ba8cf1f613eab711b12 SHA512 57d597a8961b8a3248bac3319c5860d22c87ae90de1bf2b6e5474cccd5a04f08a2a2ddce29a7357eb2f50e01580e54fdc707104d79c78f4f4330cd8336f5e95d
 MISC metadata.xml 353 BLAKE2B ad99c3e645ceea1f0949334a63ba4e567b6572630f5e54f709d5d33915a6c7c027a2091f6bb9dfdaf1881e918361ad374dc78938b515245fe95bf260b77f933b SHA512 c8f393c7d9659412f4c2f5fe866ddc7bfe61af2d4202bc6d03aa70d895416a6aaedb7ed024bec03ab951264810d1804e48221a98306f5f41f89722c9664ef609
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.19.1.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.19.1.ebuild
deleted file mode 100644
index 1717c2c7bf3f..000000000000
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.19.1.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
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="optional"
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
-HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="kdesu X"
-
-REQUIRED_USE="kdesu? ( X )"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=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/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	kdesu? ( >=kde-frameworks/kdesu-${KFMIN}:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	kdesu? ( sys-apps/dbus[X] )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" )
-
-# requires running kde environment
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package kdesu KF5Su)
-		$(cmake_use_find_package X Qt5X11Extras)
-	)
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu
-}
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.19.2.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.19.2.ebuild
new file mode 100644
index 000000000000..3636812a588c
--- /dev/null
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.19.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="optional"
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
+HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="kdesu X"
+
+REQUIRED_USE="kdesu? ( X )"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=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/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
+	kdesu? ( >=kde-frameworks/kdesu-${KFMIN}:5 )
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+"
+RDEPEND="${DEPEND}
+	kdesu? ( sys-apps/dbus[X] )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" )
+
+# requires running kde environment
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package kdesu KF5Su)
+		$(cmake_use_find_package X Qt5X11Extras)
+	)
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu
+}
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index b0464fa339f0..1252eae00472 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,5 +1,5 @@
 DIST kde-gtk-config-5.18.5.tar.xz 24688 BLAKE2B 3c51e37b1df8c9a48d766158b166b5177727b51c3a5c59435a8b280383af5de74574396272c2900b7a801d8ff0c97dee39e84737f032dde11fd0b2ba2d89f5dd SHA512 2ef81b454789136692fead9af2b8d7383805ed5cf91f9f781e637f65cbc293b9ac03be7583f5b5848c4db956da4212027c5b54a878c3796ff975292deef9aa84
-DIST kde-gtk-config-5.19.1.tar.xz 26180 BLAKE2B e784dc184bf5a57e524610ce8d2b9ad130f730d55fc811138c058a904bac6c8b5a062217c915119eb6bd1af44b62bd3c7f77a447ea651f5e79d8fb91933c5d88 SHA512 a3eb6b44e0f1e3202fc71c66b66f6e4c5663824df0cf01dd6f5e35cdb33fa1bae70c83bbb02cc2b6ef4187c9d9eb7a4935973e75f2dbce8073015f193bdf7b90
+DIST kde-gtk-config-5.19.2.tar.xz 26188 BLAKE2B 9f1dbcec4eb96b3f2c5a2084997fa8e60a0f76d53466777c184af057668faa6c177da1dbbcbdb1b7e726674f330e6ee0c7279a72c420b57675b93f689696c7e2 SHA512 2167022d85c6f82e1c3346ce70e5a36097beb2dcb23032b8bc411f3193d3dc38737c6c5384c1ba5a4939a0c4145a345fe9b0cf63577df3f4410cdeaadd48db4c
 EBUILD kde-gtk-config-5.18.5.ebuild 1107 BLAKE2B 060f075b7c0a977800f69d8a03fde17eac20393675f41823639c415f9cdf6372b4712485600845b6769d9a8fd716de638118416af68d227bff12c50eca8dd6b0 SHA512 01d0f342aa3940290b552a06558c06ecc358463e4f498ef4fc07fc7cb0d8ccd27d79f8b7cbb88413a6f5df9d57386b2ae83c9742731b2e71571e8c663de6dd8e
-EBUILD kde-gtk-config-5.19.1.ebuild 1166 BLAKE2B f1c4df7e6edf1c55ca4eb6ac48d6d43415c910dee40bf144644dd8b175c222dc4760f47ea8d97a2f18ba25e07368650ee634a5c208928145e733a34c34b772f8 SHA512 677659d5f48534b219a235bb1504c9fcafdb0a42a077c794dec454764f0fb7464a1f9f281665a46a336946c3f15b4d034e3a78b1d472a0a09594e2ab8abb3db4
+EBUILD kde-gtk-config-5.19.2.ebuild 1166 BLAKE2B 0d9a3059a9f1923e432456e3658bb91dc411311c15812a58e81cf853c5916903b316602a6deee3b57cec3f8b30b3dab2b79dbac8df926ce93084d63174731009 SHA512 03596787b7e767d9b23c97523531a7651e67ed7d6e02a61008a946ca1c238b97d2ebb782de1286e323c62de89586f6db1119c6c3dff81db407b1d2922dcf6105
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.19.1.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.19.1.ebuild
deleted file mode 100644
index b30c9e04a46b..000000000000
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.19.1.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
-
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="GTK2 and GTK3 configurator for KDE Plasma"
-HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config"
-
-LICENSE="GPL-3"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-cpp/glibmm:2
-	dev-libs/glib:2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	gnome-base/gsettings-desktop-schemas
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	elog "If you notice missing icons in your GTK applications, you may have to install"
-	elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
-	elog "for example."
-}
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.19.2.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.19.2.ebuild
new file mode 100644
index 000000000000..f0ed666474d0
--- /dev/null
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.19.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="GTK2 and GTK3 configurator for KDE Plasma"
+HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config"
+
+LICENSE="GPL-3"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-cpp/glibmm:2
+	dev-libs/glib:2
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	gnome-base/gsettings-desktop-schemas
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	elog "If you notice missing icons in your GTK applications, you may have to install"
+	elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
+	elog "for example."
+}
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index 0adf40527423..75882b10248c 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,5 +1,5 @@
 DIST kdecoration-5.18.5.tar.xz 43884 BLAKE2B fb1ed23440ac6e1813bb02e9d714e4a6d85587c92f7d379d9c05c981469fee8d73351d38b9fedee84b8b016b5e0aa44074dcd666adf7e8fe511870f264b01131 SHA512 ecbeeea7e2239999995facee481794bb35da359b3e64c0b4e10dd7b0d18d8cd43a6a13ff216ed963cd7f59a78b0b190ab994e6d30f7b84572a8cf69a74abb164
-DIST kdecoration-5.19.1.tar.xz 43780 BLAKE2B 1d45764a94177b2bd298c585dccb2be97c42d9fc0311c3f5525b23a3117e9d2b12309857744c5378b5524ff0f8c43982c14b97a67f050eaa76d057a24fb9d330 SHA512 a67c373e0c959ce952be41e82ef046a623e6eb8327c4d5930a893a1474dfe7b484c9e861b4fe113c38c77789da773f118fa377446a68084b45af74a054ee21b9
+DIST kdecoration-5.19.2.tar.xz 43788 BLAKE2B 9f2265bbe950fa6b5926d9fdbf73c1c5041b81ecb0fb54a6673c94d674d447676e88992e8164071bd9be899d04c29474c53920e846542d134aed2935c57ff3f3 SHA512 e163c1b012640dc4f0dd7de23c5f3d7754ca585c00ba975cb22facbd14737b5bf6cfb5c194d68f608ef22872c8b2cfa9f68e7688a0408dd240e2fafc1c5dcff2
 EBUILD kdecoration-5.18.5.ebuild 479 BLAKE2B 4f8ea237078478db8e5e2e20e0db3c21adc7711a81d71e893c37cb01257c9089e0f1dd91a9891ea441ec32fb37b7da194cd3ea29dd6a22137d6b73c7d9ae6c24 SHA512 65dd0c311fb15f02cc0bc6f419a37cf9c0be4aca2f285083a9d0b27df820a65c848bf5ffba6df2519a4b9d7bd999e4ab48f4e9e5b4e9d86424a5eae2ba08ff0c
-EBUILD kdecoration-5.19.1.ebuild 477 BLAKE2B 58b6d12f1118799acaa87dc35024aaed9515a850f1670006f8976b0b72fd2d93017020a7c81d4485f85649226afe11274b47973941408f9df6916b3518275613 SHA512 3a08018391ecdc22ced982dfa9a5b6ce008f2835df66846848c2153d26951f27fda3a01ccda8d4ee878b79b8e3d4fed0b8d13b5917b811b5fcfc4456c42b5233
+EBUILD kdecoration-5.19.2.ebuild 477 BLAKE2B d16b9d711244f682c6b3d21d716dcc4138baa43e13cdf91ad12cdd24d97358a5eaf46b5a1db6e1c066448a879bc14d2cba5222e662f0cc6aeba89da39ffcdb40 SHA512 8d985f8be9016395e01dfe5718e5dec4552e4897061e7b919b12266857491b5a0fc55c7e678a2307e87352967ae1cb4d6b9ff020f85394249c45126cfc527db8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kdecoration/kdecoration-5.19.1.ebuild b/kde-plasma/kdecoration/kdecoration-5.19.1.ebuild
deleted file mode 100644
index deb898ca55f9..000000000000
--- a/kde-plasma/kdecoration/kdecoration-5.19.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=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plugin based library to create window decorations"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kdecoration/kdecoration-5.19.2.ebuild b/kde-plasma/kdecoration/kdecoration-5.19.2.ebuild
new file mode 100644
index 000000000000..8b2f939975f3
--- /dev/null
+++ b/kde-plasma/kdecoration/kdecoration-5.19.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plugin based library to create window decorations"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 8c4bb2e936d6..e27813c8bffd 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,5 +1,5 @@
 DIST kdeplasma-addons-5.18.5.tar.xz 623872 BLAKE2B 684c9e569575024fe96d6043a91e6a810db69205e3867db9840442b901c120db4f0dacb09540a145f5ae90b5fc6fcd934e26a3d4435e9d23eb374f4e5ca1e391 SHA512 7baa84335af5afc1af2cd47134863961df7a43c719bdde180754aa0b5a83975c3d5fb79435b523589751029f0fbb1751fae90db5db8e42c995c9dd24578cbeb6
-DIST kdeplasma-addons-5.19.1.tar.xz 629512 BLAKE2B d8dd4c4989f67e4d895d989cd85aca3c6524af12a13e92c1b8502e64f307a433dd445bfd639210d1ecbeee930ac79369b990d656b7fc70d4bf721bb59b720463 SHA512 92b28ed21bf1636c1f3f0c3212719cdfd439ff0ec5ba68e816e193b39d32ba1b42d71638d6f73834ac8b3205ca0cec8002c3ca4291562bfaeba6603272e30d2d
+DIST kdeplasma-addons-5.19.2.tar.xz 627952 BLAKE2B 13f6ce0cd5ab71f99d32e825302f561d6de13fa4cdea561ab456a635d2f902fe42e58c1e9d44aaabb4a71bf4bd3520c61d8731c66efef0934e3db5b29e493752 SHA512 8a09986dc994d66923b297022381213b0012763431146c4779af5d50ffac2834045ca3bb1a48c561b459914de29fe0502a3283f6bccacdc4a281ef0982fca712
 EBUILD kdeplasma-addons-5.18.5.ebuild 1752 BLAKE2B 010e42c867df1157c15996b23f68cbaf268508a53842c76caff7831975f60c9a3099798e9579167bd093584d690390ce9d43524ec3e7aba12a7c3d94c70ec2f4 SHA512 253c8e7abef4701ba3ec136ea225a4c181491056cf66ff3a4114522a041d6bcf36bd14da939d3e3979d793de50e845207dd4f9453b0a5d9335668373f79c479c
-EBUILD kdeplasma-addons-5.19.1.ebuild 1775 BLAKE2B f0534950e5f9de053dd7f6228a61be11f4bb9d0a012cd56e46d8bb2dbe5de12302a3b98c8168bec026fab6dd1373a7d8fa0e1eee5f2a71595ce856cf14becc5f SHA512 227720289c7adf70eb7d5b95a0092fde784ee6bfe30809f212d04d016c9024a0de222170b0f78df78e2fcb7f0ab61a4be1a24293210227b43faac94a907f0ea8
+EBUILD kdeplasma-addons-5.19.2.ebuild 1775 BLAKE2B fc4dc4e71a893d27562262e88d372b92fc15e5618596c8213f112db04dd20fa8d81ea7506a6608184bf67991ff55b7da8c868307578c5b182d48d2b6b5b9af74 SHA512 75f4a13801317b910fad9d2707c99d3fb6764cab1348a921cf54ec496c2f7b2960c09d2dd8ce2e46f369ed0e76f208028b69b134528eff23e9d1c2d7842374a4
 MISC metadata.xml 465 BLAKE2B 94fe9737b3b632b7c4cb0907ebe49ada7f7216ed88f5132f0b24f5f0b9532993744f9167c775a265bfe827d6b4d430c3949d82da49af275c286003f1d6f25bbc SHA512 c4800f7c56aad0ee306380ddc0f09f39c48565320d38349fa3d3a11e466b40bf35d2bc593fa70c3768dc940f635319ad848724f0ae537d12fa680e24d83110a8
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.1.ebuild
deleted file mode 100644
index 238bea24ebbb..000000000000
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.1.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
-
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Extra Plasma applets and engines"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="share webengine"
-
-DEPEND="
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kross-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kunitconversion-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/plasma-workspace-${PVCUT}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package share KF5Purpose)
-		$(cmake_use_find_package webengine Qt5WebEngine)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.2.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.2.ebuild
new file mode 100644
index 000000000000..1dacb6f5f385
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Extra Plasma applets and engines"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="share webengine"
+
+DEPEND="
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kholidays-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kross-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kunitconversion-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/plasma-workspace-${PVCUT}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package share KF5Purpose)
+		$(cmake_use_find_package webengine Qt5WebEngine)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index ab5751774406..850ec239ab55 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,5 +1,5 @@
 DIST kgamma5-5.18.5.tar.xz 80720 BLAKE2B 7dfc4f96389aa0004b6db92b03eed051a2c2651210069f9f86f6c430ad3d095b16296083c4d57524de092afb2306b841fdfd7166c6805f70761f9af55cf8bdb1 SHA512 a6d242293468eb702600334361bc1299823235b059df64ecc6b2a6219f7801a1fb7ac7f13e71475d877ac03623d72043a6c35c31531fda97af883265deca735c
-DIST kgamma5-5.19.1.tar.xz 80688 BLAKE2B a62b517b3ac21fc21e2f7b4f3434df148b5152abe64c2be438a53c2853d434bcb82ad39d4d6166f17a9a733b64d9b52b253076f8f86d5d95bafeaad0dc038820 SHA512 5950fbbab5a39b9d6263da8fafdbcb47a8e5043b2e2886b568c29b3e47a88630cbe203e10898f8d80dcdb9d2e1c761c052985b5724f5fc1ab2a915cf624aaab6
+DIST kgamma5-5.19.2.tar.xz 80664 BLAKE2B febfdd439558a75ebffd0b98e7670c967b336adda4f0090a3ff351888d2c7459f9047114e15bc63c2febc4a8a6dc9727275951a7dbde038db26023fa6450ea72 SHA512 758aefdb003bb92b2fb073115abccbc3f31425fc86643300cc32de72b298f1cc41d5f9ee74c4ae28a14119e90f74a68ced16da202d52a724fd7017ad72b13865
 EBUILD kgamma-5.18.5.ebuild 677 BLAKE2B d7dbd83318e6dc2d34d74b8389d41aaddaac1867ea15e84c2d7c677c6cfe7b3cc9c36c4d36b09ab77afc1f27b05cbaa419759ba37b7c8b7de59603767851e936 SHA512 96da9c6f596b496a9bd957fc74a34bb2f3daec9e7bd9ad307c748c4482e44a99df081bacda1044df36ba46b7084fad949063569259dac0f3a6e8be008eaf53cf
-EBUILD kgamma-5.19.1.ebuild 675 BLAKE2B a370ca0db5e5f31b6f75f3ff92d02cdf0ce8d109c55963a5a8f9b3df4dff9a5dd1a3e49432c24c7796af2f92e32ebefcc3ec92c9d0f2274bb96fe114dca69c9a SHA512 3e3fc5ff4279c062fc79cc6fddff1bfacf9797547653ace33db68611dfca95904e2db3acf3b9e6f126a28a4623b3dfabc54d73fe7773c558ff5f192deac2ed59
+EBUILD kgamma-5.19.2.ebuild 675 BLAKE2B ba02bafa5e4723b8ff2f6ae508a6bee903d372bfa2f7a9a37912fddc0b650fe35b4b79ce373d2c710595482f908e3e1b4ed31a20b77ed37afa26ffc1dcc6bdda SHA512 859ef8062332b8f370ac0c0b00abfa9f07105d12d37caae084112ab8d48903250461cc8173bf2008d7d5b76a8565d2b2e7d24dd5620340825a532997dac58a1b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kgamma/kgamma-5.19.1.ebuild b/kde-plasma/kgamma/kgamma-5.19.1.ebuild
deleted file mode 100644
index 4ad0597c5c41..000000000000
--- a/kde-plasma/kgamma/kgamma-5.19.1.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
-
-ECM_HANDBOOK="forceoptional"
-KDE_ORG_NAME="${PN}5"
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Screen gamma values kcontrol module"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	x11-libs/libX11
-	x11-libs/libXxf86vm
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
diff --git a/kde-plasma/kgamma/kgamma-5.19.2.ebuild b/kde-plasma/kgamma/kgamma-5.19.2.ebuild
new file mode 100644
index 000000000000..bb38c8ddf3ae
--- /dev/null
+++ b/kde-plasma/kgamma/kgamma-5.19.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KDE_ORG_NAME="${PN}5"
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Screen gamma values kcontrol module"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	x11-libs/libX11
+	x11-libs/libXxf86vm
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index 475925f717ea..817368b96645 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,5 +1,5 @@
 DIST khotkeys-5.18.5.tar.xz 1854812 BLAKE2B cec0db1fa589ddca9515e19fcff6dba580c7567ec381c2961e5211fc830398f4f3a29f9e67f8e7821096d5052f710357ffcec3517b8893930629c356590757b3 SHA512 67e5d904127764e89d4a5c5d1c5fcc6ff0070d2a298f1032189dd3e9e17246482431ae651869d157625fc81caedee2a897947a6cb0bbe7508b5d76c61f5fca85
-DIST khotkeys-5.19.1.tar.xz 1856012 BLAKE2B ba96b50e859ce07c46cfb8e1c8aa0313de1205222f201b502d2feced45fc39feb6086ea573f1d225ff53f915766991d73e53462137e94bcfc159e5512eed12d5 SHA512 648edf7b584d90206bcbe68b0bc38e02a26e680332ff8b75fc2f44cc34fe08537c1b6a893e50caefdd71d448ae713f8fd0c1a3d2b1d0367ba27b89b590020278
+DIST khotkeys-5.19.2.tar.xz 1856072 BLAKE2B b4267c7f82631d1e08c5ce60b524de052e7e1ae3467202913b41aff55be5707352fe9d7c084ec1e2401ca6c8c597a3e1e1ea3af481c2a7f513e79c5c45ce6575 SHA512 aa78ce1ca3c69fcd2686ad20edd8505f6edc3c7bffa9145f97c79558408d22b81a4da7a0f91337beaa63b61fd552e3127aaa973da72b06fc0ec74edf732a907c
 EBUILD khotkeys-5.18.5.ebuild 1346 BLAKE2B a48049323571b5962e3478b014d90e7e90d5df0d151a33c66839cbe98cb6a081e5b51fae3ae1d376c30af659210e3e159c35b429daf5a161766f3278ba82b8e2 SHA512 8e6e833dde654a7516f3c81e1c059835e99868ece482c7c992eb17275a57896b23636dbfb7ccb97025a29ea4311acb4a6ab0ab3336c3b8d38c805aa9f7c55667
-EBUILD khotkeys-5.19.1.ebuild 1344 BLAKE2B e4a84f2ac528a90d21e3cdf744af0a3acd31dc03ba7d77353b418244b661c9ce2dbec31994550e2c9070e38fd34f0855a38205ac9e362f45ddcb80d5f680748f SHA512 a411385f7838b3e05f782dc0fb15df184357e4d39c1a2d82105d6f50f4c31ea26b57b444251750ced4f2ba8a11308a86c0592fb4d3ae15875ad15a79549b64f6
+EBUILD khotkeys-5.19.2.ebuild 1344 BLAKE2B 4e872a66e8deb8f9de48f79e62744b94764d94f19e578e4fc479a4e091875e5c02fc5fb26f9e01f9931a20b9833ec11d5c66ce81f8f5daddefb8776404dbf787 SHA512 ec460e6233c36cdfc4f7fb703c98ca1e10caed2560cea266c9c1994a950013218472a2600f5a8d68b494f70a88082e2adbe725a5bbe7873fa6cec1c54647efeb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/khotkeys/khotkeys-5.19.1.ebuild b/kde-plasma/khotkeys/khotkeys-5.19.1.ebuild
deleted file mode 100644
index 0844dff80e5a..000000000000
--- a/kde-plasma/khotkeys/khotkeys-5.19.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" # not optional until !kdelibs4support
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma workspace hotkey module"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5[X]
-	>=kde-frameworks/kglobalaccel-${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/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	x11-libs/libX11
-	x11-libs/libXtst
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-	x11-libs/libxcb
-	x11-libs/libXtst
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kded-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
diff --git a/kde-plasma/khotkeys/khotkeys-5.19.2.ebuild b/kde-plasma/khotkeys/khotkeys-5.19.2.ebuild
new file mode 100644
index 000000000000..8192f158df8f
--- /dev/null
+++ b/kde-plasma/khotkeys/khotkeys-5.19.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma workspace hotkey module"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5[X]
+	>=kde-frameworks/kglobalaccel-${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/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	x11-libs/libxcb
+	x11-libs/libXtst
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kded-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 9140f798328f..882cf52d927b 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,7 +1,7 @@
 AUX kcm-about-distrorc 108 BLAKE2B 9324829040a699d8858a739b228b14035f8a33d4cc5e19af30545a6eb9780808b3350ca12c82a44a1868c32acddd76dcdb4e7b25e5792694b55fbb38ed23db8a SHA512 72f1dcaa04bfe435e64c8e584914eb56a15b63f7c6086f5e025f0c497b4fd5b9592d54aafd335f55d303790af274c9cbfa29c6c7ff87875da648ee16d7717467
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
 DIST kinfocenter-5.18.5.tar.xz 1256744 BLAKE2B d67951273bece9cd106a3d10857b18d005e6bc03faec8e9749b2111016c318c4c518611bb50240a01395b59838a47a6ce24df06ab870092aa425f04854fdf3ad SHA512 c9896870a92b3349c262698c4902b98f6aa12523c1757890367d1e277954b0ac7b040bbff0095f7a6abf47e6a31b008070e3a461713c7cf4a591617b76c37886
-DIST kinfocenter-5.19.1.tar.xz 1271776 BLAKE2B 7d14476be53481a0b995129be37cf689537de74f2d6314ed5f76ab61a3ea2469ccc59a85240a62ca707f7edf08f13f6cd6cc4ee3f4b17c1e06d8adff5db0a59c SHA512 dab82dcd170691d8be53eb062f542413b1302d8d190bf3861874aec76eaf2683282fcb08f1a4b34280b091ba7a829a99e59b918feed1e64f46efe5f627ead0f1
+DIST kinfocenter-5.19.2.tar.xz 1265484 BLAKE2B 4612d1336db91a30f59d2218f4e4514a1c65d32283ca322a5f9f83a80b72a2c89a1ac4835ca01e491c28ae2bb4f266d45f7f50917ba68da00efcc74f96b8d1a4 SHA512 edae6a37871609645034eb0f8ea6b55ad45778896dd9238b7b240103181edc8ef537ed4bbedad36cae26871669706f4c1c23714a939b0c8be444c345a627bd56
 EBUILD kinfocenter-5.18.5.ebuild 2837 BLAKE2B 4d8a032e2c3bd1c6b21110d3eb0268d1303c20a66c4d85eab8c1edf5770f9fcd580046307397a254bb41b038e69cc777f7c93eccc55cfa33a48a3c7438ef8b58 SHA512 7544ecb8264e79e29a8fb8541461c0af09bf099fc94e7f7c45d22fb3db3d8c6cb9c7ac2d936b5cbf34c61e5b860e1c0a3e024a70c398c9824c0a241741d1f2df
-EBUILD kinfocenter-5.19.1.ebuild 2835 BLAKE2B c3387a66b9b07632f6b8679796a701e91e0e7f38605fe1d443114d269f232248c0d5e5f8940bb4da9a42101c1b8256d455f343c3480df9514bcce31087e29c1f SHA512 7d0f9fc6cfcd959fbc245d3cbdd52e95adfbcb0e6bb5337596651676b1bf141497e7f43ff0f042a05472e69bacde9a7f03d6298a014977cedbd40011dbb1b835
+EBUILD kinfocenter-5.19.2.ebuild 2835 BLAKE2B a7ff43636d3d2ca02def89794472e02ddb5ace68fc65db6b63f0cae657507da77247560cc26d9b5727ba4ea819ac8e24dd4a188256857bbf336405a90b90a6ed SHA512 c646df6a444b74732ac3447dc87942bb328f29ed4d673177df24969f79d5a3cc1d8cf4246276faa0a23b975e309e8c5e36e26a580d8b630b8267a28dfc87ff44
 MISC metadata.xml 320 BLAKE2B a0e83642729b42cf0f6e8b5aad1937770df05aa01ea26d98a215a9a4f7534388f6b6992d1d8e7e4bb2b90007778d755f6b789fd80f1da316a99486a9ae35f9ec SHA512 5530f3ad6ccb8e826c297d0ed4c9d9197e73bd79ad428050f4c1ddd1c09136f34d1e8c48b1b87a5594369568647ea70972c78c6f1eb4b2936113646a858e6c2c
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.19.1.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.19.1.ebuild
deleted file mode 100644
index 4fccc072d142..000000000000
--- a/kde-plasma/kinfocenter/kinfocenter-5.19.1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Utility providing information about the computer hardware"
-HOMEPAGE="https://userbase.kde.org/KInfoCenter"
-SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="gles2-only ieee1394 +opengl +pci wayland"
-
-REQUIRED_USE="wayland? ( || ( opengl gles2-only ) )"
-
-BDEPEND=">=dev-util/cmake-3.14.3"
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=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/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	x11-libs/libX11
-	gles2-only? ( media-libs/mesa[gles2] )
-	ieee1394? ( sys-libs/libraw1394 )
-	opengl? (
-		media-libs/mesa[X(+)]
-		!gles2-only? ( media-libs/glu )
-	)
-	pci? ( sys-apps/pciutils )
-	wayland? (
-		>=kde-frameworks/kwayland-${KFMIN}:5
-		media-libs/mesa[egl]
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/plasma-${KFMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package ieee1394 RAW1394)
-		$(cmake_use_find_package pci PCIUTILS)
-		$(cmake_use_find_package wayland EGL)
-		$(cmake_use_find_package wayland KF5Wayland)
-	)
-
-	if has_version "dev-qt/qtgui[gles2-only]"; then
-		mycmakeargs+=( $(cmake_use_find_package gles2-only OpenGLES) )
-	else
-		mycmakeargs+=( $(cmake_use_find_package opengl OpenGL) )
-	fi
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	# TODO: Make this fully obsolete by /etc/os-release
-	insinto /etc/xdg
-	doins "${FILESDIR}"/kcm-about-distrorc
-
-	insinto /usr/share/${PN}
-	doins "${DISTDIR}"/glogo-small.png
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		has_version "net-fs/nfs-utils" || \
-			elog "Installing net-fs/nfs-utils will enable the NFS information module."
-
-		has_version "net-fs/samba" || \
-			elog "Installing net-fs/samba will enable the Samba status information module."
-	fi
-}
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.19.2.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.19.2.ebuild
new file mode 100644
index 000000000000..35cf4e8aa817
--- /dev/null
+++ b/kde-plasma/kinfocenter/kinfocenter-5.19.2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Utility providing information about the computer hardware"
+HOMEPAGE="https://userbase.kde.org/KInfoCenter"
+SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="gles2-only ieee1394 +opengl +pci wayland"
+
+REQUIRED_USE="wayland? ( || ( opengl gles2-only ) )"
+
+BDEPEND=">=dev-util/cmake-3.14.3"
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=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/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	x11-libs/libX11
+	gles2-only? ( media-libs/mesa[gles2] )
+	ieee1394? ( sys-libs/libraw1394 )
+	opengl? (
+		media-libs/mesa[X(+)]
+		!gles2-only? ( media-libs/glu )
+	)
+	pci? ( sys-apps/pciutils )
+	wayland? (
+		>=kde-frameworks/kwayland-${KFMIN}:5
+		media-libs/mesa[egl]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/plasma-${KFMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package ieee1394 RAW1394)
+		$(cmake_use_find_package pci PCIUTILS)
+		$(cmake_use_find_package wayland EGL)
+		$(cmake_use_find_package wayland KF5Wayland)
+	)
+
+	if has_version "dev-qt/qtgui[gles2-only]"; then
+		mycmakeargs+=( $(cmake_use_find_package gles2-only OpenGLES) )
+	else
+		mycmakeargs+=( $(cmake_use_find_package opengl OpenGL) )
+	fi
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	# TODO: Make this fully obsolete by /etc/os-release
+	insinto /etc/xdg
+	doins "${FILESDIR}"/kcm-about-distrorc
+
+	insinto /usr/share/${PN}
+	doins "${DISTDIR}"/glogo-small.png
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		has_version "net-fs/nfs-utils" || \
+			elog "Installing net-fs/nfs-utils will enable the NFS information module."
+
+		has_version "net-fs/samba" || \
+			elog "Installing net-fs/samba will enable the Samba status information module."
+	fi
+}
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index bef72da051ba..608de581ed0a 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,5 +1,5 @@
 DIST kmenuedit-5.18.5.tar.xz 813952 BLAKE2B d5c58ffa7cf3813955f9f87f119c11333215fcffb3b3dcdfc7e601839233d4611b3e0359c3313b4035d957d5890229d57109ab7b4929fe860b7b9c997d1f9d72 SHA512 647aed82a3190e2c27bac4e50eec681684dac08c6f3f7e8e0d2d02b8667e58b367a35a66b830083037570999655652a94f26ae063e253ceedd0db1df00ef834f
-DIST kmenuedit-5.19.1.tar.xz 897120 BLAKE2B 908d6916a7518e634b2f258de3060c521c280bbe514b897b207d25bfbee3e9acde22f7125760dc9312289982fa98e72eab591f81c1ca1ef33f5a9e57dace6c8a SHA512 0424f41aa4428b8ea999524331e0b73373925e8b4ba2e4760e71c30898a80128cf16c50e9613ac8e1366c1d7d15b2249a4e45c66b3aa05d3b382ad76b1ddc4e8
+DIST kmenuedit-5.19.2.tar.xz 896892 BLAKE2B 90037dc8bc28ecda5d1a190a31aadc62d40798de8139a9ed7d27fa7584a4431e1dfbf9f7b2f12aa3b0a056b0b0524203f16847d90dca5bf5515a3d6fb25e1c27 SHA512 9955ba1843411719d7adc4f0323899756f0cdbeea4d0d536a68c910b62035fe332ef24d353ca165344b4185717b708cf6e8d5a01e0781f1d7dd1f7d6a090919c
 EBUILD kmenuedit-5.18.5.ebuild 1096 BLAKE2B 896a8ad423a24adedc31aec1a314f4c0bc14634689704f7a19e412e918564397aab2310d77249d9231a8ee93ba9fa738f48d648259ccd300f174e2791325091a SHA512 a1584982a98dba6ecbdd3a3b447e900fd658ca3731846ddf0f9da36f8abb4825cc6a5fbc2487ee33bfb0641b5cbfc88ee5b8533580615e6c3ce129406bd24e34
-EBUILD kmenuedit-5.19.1.ebuild 1094 BLAKE2B 0a663a69513cc404ad03e194c3b40e81213227265fcf2c7e235aa44636f6cd0e9b0e0e770f3aff8696cab3ae4487660d7c54e536549be86d0f59c6fee7af548a SHA512 6b58955b403d01cc3c08d2e5a9b4c88f6489dee0946ffdfde4985f85a965725c06a5bd80bafb9905484e6570e8bea5f7d07f7d3106ea17d3591069ea5fc21bf5
+EBUILD kmenuedit-5.19.2.ebuild 1094 BLAKE2B 0f332a1b5ff77f4c1266c8eb712b3d24f0142311ac93c4a2626a143ba7d5aed51dee281a3d325fa7466829ac64e2d5fe9206d4294e7b4dfdc97b1efee0c39cc1 SHA512 81999947984c21202c173ebd26ff94b0bf26d897355d560c0b783d339f5cc3ca15c5940c2091ab006a079176ef1cfb52929481579d3f8c12494ad60e525957aa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.19.1.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.19.1.ebuild
deleted file mode 100644
index 7ddf6f3df6fc..000000000000
--- a/kde-plasma/kmenuedit/kmenuedit-5.19.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"
-KFMIN=5.70.0
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma menu editor"
-HOMEPAGE="https://invent.kde.org/plasma/kmenuedit"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=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/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kinit-${KFMIN}:5
-"
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.19.2.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.19.2.ebuild
new file mode 100644
index 000000000000..970f192ced75
--- /dev/null
+++ b/kde-plasma/kmenuedit/kmenuedit-5.19.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"
+KFMIN=5.71.0
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma menu editor"
+HOMEPAGE="https://invent.kde.org/plasma/kmenuedit"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=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/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/kinit-${KFMIN}:5
+"
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index f822803c69cf..b7571cf55754 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,5 +1,5 @@
 DIST kscreen-5.18.5.tar.xz 113256 BLAKE2B c4cde78164cf3b344fa2ff7905a37cbbf0f32bf3cb527a1e54493cd6f831e617ab85d80d15a489690c503e7f4fd35bb8350f4d1edd6149b3c3e21f52df0286de SHA512 310e9f1b2a46d4d81b78a2567e4b183847e22eeb08d1912748968c7cbd77bce7622aa51b1931144e732c1fac6bc3e7827c2db0d9d539e31e642b9d7c0827b36e
-DIST kscreen-5.19.1.tar.xz 115380 BLAKE2B a3aa97ba6c193ae2bb75470d9e08ae5190a13d30ad7023d5e130ae04f08a1c4dd739ba826c402138eadea5fadabbe459d647c33a8b4ea62601fdadccba147655 SHA512 f99d9a145c850f46447a3ec9e323f3453a35a507380d34b0fff0f33ea0beb11c1255ca4c2121219499f1b7fe1695fd2cf2a04da15cb2f2ae0ba873706f37fdb5
+DIST kscreen-5.19.2.tar.xz 113764 BLAKE2B b3b3bdd55db673cfa0faeb32ae0008e75ca57ac6bcfec9bb6100d54b9a0abb521317ba80e7ec495425236d43833d39aaffa8f12037a057cbc7863f0072cafbae SHA512 6539493c0b624879d309dac517e1590c479ec20c7b80c9697b276c9e15f63f1fe0a32d4f1185c3194df02e588c7657f7df4c846584f1b55ae8030abe22889fd8
 EBUILD kscreen-5.18.5.ebuild 1225 BLAKE2B e45dc9247578442c7fe08721baaddc265f0de50e93183d71eb3511d149830f333f8173a13e70927ebf69850896847e397c07313dbe8b2e852ed020a17e5003dc SHA512 353a602e69e79f14527ab39257988de7c47bf85fa38052564677528accbd1c042e9a1680f59afa8e3f8afdfaa83e5b2aa897f028dae1e05ad611c0edf2f525d6
-EBUILD kscreen-5.19.1.ebuild 1223 BLAKE2B 4ccc2a850d9e3858c5ba3a23ca6eba4ce6b3f95983268b902927a4e5b206bb74d2df984cb5d12341c447de8a2ddc6c541f1e1d777b1acb721a644aadc979e4da SHA512 f34ab6859268e55b9d56c06fdd4354f61b67d7f413f92d1cc6aa3d3587e4066f0a234e7444b4863272b90146a198a46aebaa52527d69cdb6e516fc89f75b66c4
+EBUILD kscreen-5.19.2.ebuild 1223 BLAKE2B 96266b1f8fc665fb27bd1068883dd54da5c69c3e32b939340ec2d6b54117f20b5d25bd505cfe28f7d542a10456a714b095ca4d5a71f1d9ee062c28cd6fbdb0de SHA512 cf197a497a3d9dda7e8aa6f8cff07cb54d3bef1e2d409207d75d3576f04a35dc8a2d58e4a27d3fc66e0dbb0f91c5e24248d6283dc3c3704a97a28160dacd0e4e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreen/kscreen-5.19.1.ebuild b/kde-plasma/kscreen/kscreen-5.19.1.ebuild
deleted file mode 100644
index 30e5bd92a731..000000000000
--- a/kde-plasma/kscreen/kscreen-5.19.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="forceoptional"
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma screen management"
-HOMEPAGE="https://invent.kde.org/plasma/kscreen"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-plasma/libkscreen-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsensors-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-"
-
-# bug #580440, last checked 5.6.3
-RESTRICT+=" test"
diff --git a/kde-plasma/kscreen/kscreen-5.19.2.ebuild b/kde-plasma/kscreen/kscreen-5.19.2.ebuild
new file mode 100644
index 000000000000..b22520ff34ac
--- /dev/null
+++ b/kde-plasma/kscreen/kscreen-5.19.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"
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma screen management"
+HOMEPAGE="https://invent.kde.org/plasma/kscreen"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-plasma/libkscreen-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsensors-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+"
+
+# bug #580440, last checked 5.6.3
+RESTRICT+=" test"
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index 7c40f2ccfac2..fa8354966a6d 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,7 +1,7 @@
 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
 DIST kscreenlocker-5.18.5.tar.xz 125144 BLAKE2B a4d4a570edbb6994eb42390c42a1193ebc7776c28483b9edb7ab4935c18be3e042459a9919216547a275e5c02794ac468364e1a65cfd62beb17a2f09b34cb659 SHA512 27e2e30c247b4030a618631f50edc8cbdbb26b51adb875a608f93fc4c0f4dff310819042a74170ff024b030dedda89c6a3a14b23aacfc5938db026adde225e47
-DIST kscreenlocker-5.19.1.tar.xz 126548 BLAKE2B 840c2fa444bb8839409c12c6b59033dd597e942e8754c660e35033a0fe43e7bb90e9941c83b764e10bbbba2a5c295385ce1637b2e932521c49e3157ee2e085fc SHA512 151003737e54a3ba783779a6cbb39aef7b56ade845080e68d02cb9adf6b00789c6f2e8e1d50dc62e46f6177e4256650a388437059f359e145ca1b62843dd4af7
+DIST kscreenlocker-5.19.2.tar.xz 126260 BLAKE2B 4eeb7d5e40f0a978b162f76abeb4755edffe599e06f6ad9ee8e1f55fb42a59a5f3c29c1f24cf314694dbcdbb6e2a3d1ec989ef376870b72596d9fdd10599c6a8 SHA512 c82ca7c49180dd4528b257296579730e4edbc59ba1dee2f79195e45ddaf22b5e00ae003cff4896934c591ebab10b84517ef2896d511e7299db6119d3d41b4ae8
 EBUILD kscreenlocker-5.18.5.ebuild 2352 BLAKE2B f28abd967b9d6fafb6a7c145d6cdcea966815165073f955c4fccfeaa70a134df0afe54da10a78b8dd8c0793bbe14d3fe6c94eebc18ac8d915ff635d5e7fc5b8c SHA512 e11ded96c0973a085cea50109e3206f8295633bd9b9710514d97499c2ca0b6e8497b73afcb5fcbc9d2eddbfae885ebee2ed0b12bdb69115c4b99b66e4cd7f94b
-EBUILD kscreenlocker-5.19.1.ebuild 2350 BLAKE2B 4475f0779182b905b46a4dc93fac0b604f10399973ba84d67a7f475ef1d01a2c401e7f09179b87a35ff24e858b1aee6e4931b4b5e024692690bff23f26027f1d SHA512 fa39c50942e63a47a52315c3b14f52af095842f77a909297e89d7eb04523888e5361618023ab035eb43c14d55fead0dcb89966f1856f89e84e01f78551d910a0
+EBUILD kscreenlocker-5.19.2.ebuild 2350 BLAKE2B 2e58693195fbcc6c4e149250ff9d298b2efbba1c8d335f570b617472b9fc9910c4684de736624984899f3998ea6a2037765f4f5f77262ca990b3e0ef99cb15be SHA512 b06de6916924606d7bdcc81d17289ed7c11f49d43ebc85ad8ac2e68ac94f2b4248591306b283b9dc601d128fd3e50810a50f9ed438e7302a31f47d6a7ab7156a
 MISC metadata.xml 393 BLAKE2B 92a1ec6717203a85b3a379c3d8646df9354f9b87171f4ecc73c0a8b3e442c5abe17b9dd58d0be0322b2fbf655b39ac7a052237ba6a61090240a2fd92f21e8ea8 SHA512 92a7a51e76d18a8dd2aceca5dc8c79fee369ddf9dc170f64f5c510c6554b46d3a912e358ac042bc25d9f115f49102d686d0df9496693043289cb8d2e628207a6
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.19.1.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.19.1.ebuild
deleted file mode 100644
index b392f24771aa..000000000000
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.19.1.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
-
-ECM_TEST="forceoptional"
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org pam
-
-DESCRIPTION="Library and components for secure lock screen architecture"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="consolekit +pam seccomp"
-
-REQUIRED_USE="seccomp? ( pam )"
-
-RDEPEND="
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	dev-libs/wayland
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-	consolekit? ( sys-auth/consolekit )
-	pam? ( sys-libs/pam )
-	seccomp? ( sys-libs/libseccomp )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-PDEPEND="
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	ecm_src_prepare
-
-	if ! use test; then
-		sed -e "/add_subdirectory(autotests)/ s/^/#/" \
-			-i greeter/CMakeLists.txt || die
-	fi
-}
-
-src_test() {
-	# requires running environment
-	local myctestargs=(
-		-E x11LockerTest
-	)
-	ecm_src_test
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package consolekit loginctl)
-		-DPAM_REQUIRED=$(usex pam)
-		$(cmake_use_find_package pam PAM)
-		$(cmake_use_find_package seccomp Seccomp)
-	)
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	use pam && newpamd "${FILESDIR}/kde.pam" kde
-	use pam && newpamd "${FILESDIR}/kde-np.pam" kde-np
-
-	if ! use pam; then
-		chown root "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
-		chmod +s "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
-	fi
-}
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.19.2.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.19.2.ebuild
new file mode 100644
index 000000000000..71661692dea5
--- /dev/null
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.19.2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org pam
+
+DESCRIPTION="Library and components for secure lock screen architecture"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="consolekit +pam seccomp"
+
+REQUIRED_USE="seccomp? ( pam )"
+
+RDEPEND="
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	dev-libs/wayland
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+	consolekit? ( sys-auth/consolekit )
+	pam? ( sys-libs/pam )
+	seccomp? ( sys-libs/libseccomp )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+PDEPEND="
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	ecm_src_prepare
+
+	if ! use test; then
+		sed -e "/add_subdirectory(autotests)/ s/^/#/" \
+			-i greeter/CMakeLists.txt || die
+	fi
+}
+
+src_test() {
+	# requires running environment
+	local myctestargs=(
+		-E x11LockerTest
+	)
+	ecm_src_test
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package consolekit loginctl)
+		-DPAM_REQUIRED=$(usex pam)
+		$(cmake_use_find_package pam PAM)
+		$(cmake_use_find_package seccomp Seccomp)
+	)
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	use pam && newpamd "${FILESDIR}/kde.pam" kde
+	use pam && newpamd "${FILESDIR}/kde-np.pam" kde-np
+
+	if ! use pam; then
+		chown root "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
+		chmod +s "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
+	fi
+}
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 6774289a3d66..ef0a592925c8 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,6 +1,6 @@
 AUX 05-ksshaskpass.sh 42 BLAKE2B 2fcef93ed56ab90d98078017924ccfcf3892914e0fc45c6733b538634743a79ae1603da4aabed1c9641750ceae24e167591989290427f6efa4a03b4d69008362 SHA512 780f4d0467bab82295f894f0547ea59c36e8f05cff51c4e64db8a7e8e4215e2d6363550fed16a4336019b2102e5c5bdcfe73524761ba04db3704ddec6efec669
 DIST ksshaskpass-5.18.5.tar.xz 22148 BLAKE2B 31521b28a840bfbb14cdef2484dde8908a0ffbeda5d54663243bd93a070d77d72019b5436f0a4f838e7c8b9f60992b06636e181b6ced51d17a13ba4f7c3918b6 SHA512 8cf75491c04537cdbab11613dc0f9317631c282e4f371664164dc0936d08f744a39777b696b772e05b06ef1257d42f7ae29abfbbd022e661073fdf880fe63fcf
-DIST ksshaskpass-5.19.1.tar.xz 23528 BLAKE2B a8ba394330116e81a40def8b340fbc687a0cc09ba75467f629761e95185698ec456c36cecc74c901cf0738ca88acf4a76dfc26fcb0a46ae4ddcc87d3b8e01822 SHA512 c507d5110114a0961eadefc91e931ed54ef463995c277a2618e92238c6c4d606f7325c748a69485385dd89bf29d4d17a34053c2b58ccf2dadf8f2c0e27e6bba6
+DIST ksshaskpass-5.19.2.tar.xz 23484 BLAKE2B 3ca4507fb0efe8b82b21939fc5c77dd1b670394d1de710843d1c24e1882ef271eed5bcae58c75ab46a4f2985a35eed1f10fe493714f6cfb2e6addaf82048be43 SHA512 0a2d22313777dcedf1c267f6627ec452226df156b290e758fe224a91fe608efdcf6881c754979fe47e35028eeb0ab24a54ed223a9653e87c82c0018c63e9a1de
 EBUILD ksshaskpass-5.18.5.ebuild 2200 BLAKE2B d61278bda981d6764b8472b12884bf4c6685d788eddbeab0acb76d1d7da7460040abbb73a88c092947b14ef303d730e27ccffadccba946676ac36476474692b9 SHA512 411797a3eaaf443b8236fa3f87124224baf03b91ab806bb56b238660529b0ea14e772afc4cdda82b9d5e13fddb7ba4e116ad97fbb97e64f922d62617fe5d90a9
-EBUILD ksshaskpass-5.19.1.ebuild 2198 BLAKE2B d61434ee40e57260c00c460d470a797491cddebd0cd1292ef2e1808c02565c31f46081b9d06e56765c4520cf444e1d8574ea1f717f149a1e13491d51edf13e7f SHA512 09ebd0559d00aacfe6c75b37ec1a246f9160c3a65519f1ea512f30ffe2ba16f8190ce7fd910ea60b9144d5d740d343c90bfe9411da55bdbd6545468b102ef338
+EBUILD ksshaskpass-5.19.2.ebuild 2198 BLAKE2B ed2bc2b383cdca9b5491df897db64e3d4b300bfee02a169ad341f7451c9693c88574ff32d2e8846770be55a0e1cb2824ce448becab90cf71a659cdb88f8f20b5 SHA512 f4e4e5c436c7a40db5723b6bd164b6aacd92c3a67a1a9f3ea57b9123ba240f8a4b4be9337460868103ef3c8a3c82ce0d8c75e5cd3e0934a6c5850394a4b56081
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.19.1.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.19.1.ebuild
deleted file mode 100644
index afc16d9e6a4b..000000000000
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.19.1.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
-
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
-HOMEPAGE="https://invent.kde.org/plasma/ksshaskpass"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	ecm_pkg_setup
-
-	local srcfile=/etc/plasma/startup/05-ksshaskpass.sh
-	local newfile=/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh
-	if [[ -f "${EROOT}"${srcfile} ]]; then
-		local md5=$(md5sum "${EROOT}"${srcfile})
-		if [[ ${md5%% *} != 615ae8f5b0090ff7f51d0edee7885d55 ]]; then
-			elog "Existing modified "${EPREFIX}"${srcfile} detected."
-			elog "Copying to "${EPREFIX}"${newfile}..."
-			cp -v "${EROOT}"${srcfile} "${T}"/ || die
-		fi
-	fi
-}
-
-src_prepare() {
-	ecm_src_prepare
-	if [[ ! -f "${T}"/05-ksshaskpass.sh ]]; then
-		cp "${FILESDIR}"/05-ksshaskpass.sh "${T}"/ || die
-	fi
-}
-
-src_install() {
-	ecm_src_install
-
-	insinto /etc/xdg/plasma-workspace/env/
-	doins "${FILESDIR}/05-ksshaskpass.sh"
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	elog "In order to have ssh-agent start with Plasma 5,"
-	elog "edit /etc/xdg/plasma-workspace/env/10-agent-startup.sh"
-	elog "and uncomment the lines enabling ssh-agent."
-	elog
-	elog "If you do so, do not forget to uncomment the respective"
-	elog "lines in /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
-	elog "to properly kill the agent when the session ends."
-	elog
-	elog "${PN} has been installed as your default askpass application"
-	elog "for Plasma 5 sessions."
-	elog "If that's not desired, select the one you want to use in"
-	elog "/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh"
-
-	# Clean up pre-5.17.4 script
-	if [[ -e "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh ]]; then
-		rm "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh || die
-		elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/05-ksshaskpass.sh"
-	fi
-}
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.19.2.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.19.2.ebuild
new file mode 100644
index 000000000000..49efe670a3c0
--- /dev/null
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.19.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
+HOMEPAGE="https://invent.kde.org/plasma/ksshaskpass"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	ecm_pkg_setup
+
+	local srcfile=/etc/plasma/startup/05-ksshaskpass.sh
+	local newfile=/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh
+	if [[ -f "${EROOT}"${srcfile} ]]; then
+		local md5=$(md5sum "${EROOT}"${srcfile})
+		if [[ ${md5%% *} != 615ae8f5b0090ff7f51d0edee7885d55 ]]; then
+			elog "Existing modified "${EPREFIX}"${srcfile} detected."
+			elog "Copying to "${EPREFIX}"${newfile}..."
+			cp -v "${EROOT}"${srcfile} "${T}"/ || die
+		fi
+	fi
+}
+
+src_prepare() {
+	ecm_src_prepare
+	if [[ ! -f "${T}"/05-ksshaskpass.sh ]]; then
+		cp "${FILESDIR}"/05-ksshaskpass.sh "${T}"/ || die
+	fi
+}
+
+src_install() {
+	ecm_src_install
+
+	insinto /etc/xdg/plasma-workspace/env/
+	doins "${FILESDIR}/05-ksshaskpass.sh"
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	elog "In order to have ssh-agent start with Plasma 5,"
+	elog "edit /etc/xdg/plasma-workspace/env/10-agent-startup.sh"
+	elog "and uncomment the lines enabling ssh-agent."
+	elog
+	elog "If you do so, do not forget to uncomment the respective"
+	elog "lines in /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
+	elog "to properly kill the agent when the session ends."
+	elog
+	elog "${PN} has been installed as your default askpass application"
+	elog "for Plasma 5 sessions."
+	elog "If that's not desired, select the one you want to use in"
+	elog "/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh"
+
+	# Clean up pre-5.17.4 script
+	if [[ -e "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh ]]; then
+		rm "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh || die
+		elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/05-ksshaskpass.sh"
+	fi
+}
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index 0be38e15d02f..b3fed5a50b47 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,5 +1,5 @@
 DIST ksysguard-5.18.5.tar.xz 517648 BLAKE2B b50623c28a3884adc5db326d7b0745c558f02e1f515efa9a5d591948026447f427e08cb72805d7f1c8821cdb0038c894e4322520cf2630656e464da6f69af401 SHA512 2cfb82caef5d074b945f0a7478b32af86d49e174d4d294dfe6a54acdb0b1d335e151828a4f239b52cf767ba04d9e93bf1632f2a37e2b1d611128543e0e0008a3
-DIST ksysguard-5.19.1.tar.xz 540012 BLAKE2B db38c71e64ed05387cfa6bc9a36663b8e5507f25d81651ddd5bd02a07d699b5c4d3581c2548b17f68c98c6c8771139379d9b1e143f24cc3513f6d41408331f09 SHA512 a48f747fcbbf24fdb681e648acaffd19124338c685478624c0a7e6e0d22e6b3d6d46a157ddf6204a19d0fa40a065455973e1fd6a6508b83a3241f3280262adca
+DIST ksysguard-5.19.2.tar.xz 539568 BLAKE2B 141592e65f0b0e3ac0744fad8967260b4ee13a3504d195dc671af15fa3b0c19e93f6698b67d78a6003c65f6e0ad438839161b449a2507b97810f333b2584a023 SHA512 ab9c8c1daba482c50b38dd35e8d1504634098a6339a65e542ecf98727b8d77b328520215f7008067084607b42a2c7fbc85e8c4102889108ff27d93fa4f7efc39
 EBUILD ksysguard-5.18.5.ebuild 1393 BLAKE2B 9252e8b44a28642a7f25d46e402e091850761f287aaf9fe85353ead5d60ac43ebc24cbeed8ea0aedd5708911224e7211f302e766711b6279de51bba55b364c50 SHA512 d5b2f2a5d1581b86bb86824848ad4e492335a3d079779136e8e94cd7ad5e2437ba9b605e56ec35fdb3e7d6d264271b5085cf5bd26903dd8d3d1dc9075bd38f84
-EBUILD ksysguard-5.19.1.ebuild 1391 BLAKE2B a91632998795bcb33d30f9f6a21e7fd71103ae7c2faf3ba5e01205967f09cf9f2d57e166adeb013047474d9380ec9c55f3bb65e33e664426cfe55cfbff60a503 SHA512 8dc37134b4f0ea880ca0b5dd3cfd84c0343d9550c9fe50ef8a73bc215fa2b2227d3f19ce445359006642c11827c7b87f29f3191851598e97e7d016a7421343c8
+EBUILD ksysguard-5.19.2.ebuild 1391 BLAKE2B e5c92db12519399bda5fc0587ec75a48cfa965ed27d67d70782297716fbe9230b341c1bdf38ca34d77b40ec94173932997805a470599bc018466778828830f30 SHA512 56dfe24c8b89857e38ad4441549a36ce3e40caef04ee6bc23462cc04f8b36ff340673d15a2bdade4b049775fe3a1b18a12648fc478e25d118d2368a3972719e6
 MISC metadata.xml 373 BLAKE2B 8d97f1bf96cb523b2832ca4bbb01ee86cf1d13b0b1b75809046da8601254283fa079361c1cf55708c851a08fb31b27beb8cf2df24ea9e14e4c32b8ca0692a7f9 SHA512 c1df9a56aba68a93ceae7cb2b9ea9216c40b6f619263cd8025cde82264206019a6b9d0eecb24f3a798d4f6e1a772752ceec500827e96caf8f050b0b132b08051
diff --git a/kde-plasma/ksysguard/ksysguard-5.19.1.ebuild b/kde-plasma/ksysguard/ksysguard-5.19.1.ebuild
deleted file mode 100644
index 3d0638cbe4d7..000000000000
--- a/kde-plasma/ksysguard/ksysguard-5.19.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Network-enabled task manager and system monitor"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="lm-sensors pcap"
-
-DEPEND="
-	>=kde-frameworks/kcompletion-${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/kinit-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5[-minimal(-)]
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	pcap? (
-		net-libs/libpcap
-		sys-libs/libcap
-	)
-	lm-sensors? ( sys-apps/lm-sensors:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package pcap libpcap)
-		$(cmake_use_find_package lm-sensors Sensors)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/ksysguard/ksysguard-5.19.2.ebuild b/kde-plasma/ksysguard/ksysguard-5.19.2.ebuild
new file mode 100644
index 000000000000..f205299c9025
--- /dev/null
+++ b/kde-plasma/ksysguard/ksysguard-5.19.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="forceoptional"
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Network-enabled task manager and system monitor"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="lm-sensors pcap"
+
+DEPEND="
+	>=kde-frameworks/kcompletion-${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/kinit-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-plasma/libksysguard-${PVCUT}:5[-minimal(-)]
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	pcap? (
+		net-libs/libpcap
+		sys-libs/libcap
+	)
+	lm-sensors? ( sys-apps/lm-sensors:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package pcap libpcap)
+		$(cmake_use_find_package lm-sensors Sensors)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index 69718e622c85..d85306e580e1 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,5 +1,5 @@
 DIST kwallet-pam-5.18.5.tar.xz 19800 BLAKE2B 695fb89d1a54bfc44b06bee4881ae357a42c82b6506a6ed7966c30bb28137ee379ac1beb9391982c15ac63e95c0a1bbba2e0950ee89e050a2ceaf296b98958d4 SHA512 050b3ca66f3b078bb7bccb4a3b7750787bf22d18af60972969f83141b99eac4441fa08d48022278cfe28c8f96f7a1d9ca346f155d8ddbdb60b17bc9c142521cc
-DIST kwallet-pam-5.19.1.tar.xz 19860 BLAKE2B 68c15de0b2b41722f1ef25a449223a84385483667914d53f15241cd001d45896a7c31be491dc733adb8036e6af1bc6c103e0cf026a94fa87c1d4b46f2e0740ed SHA512 c078c81b48f4f5e5c8de269184233d720bca215ee875d05c29d4b2bc45a4c90b0ba8a679d6380eb5a48748fcc49482020dad151799d999aafb72e8dae3b877fd
+DIST kwallet-pam-5.19.2.tar.xz 19856 BLAKE2B 5d8b48de8d739e50877f21e3d7d8850fb4420024bf3d9636586c6ce259eeba982abdf2295f83031e3db8e1356a57c2b8e1de7c52c10282710f01cc85fe7e90d7 SHA512 dc51ffdd1f8f372036a0340a0ead40dd3b6093c3ae920175cf3c614f464bd327b3be4cb2f3ffc6f188c0ed74f46b43df9971139f7242aad8f8d88e4ca1bbe533
 EBUILD kwallet-pam-5.18.5.ebuild 731 BLAKE2B e538e72a2a41b9af859f889eb338b22b2655dcba2243b4af5db9a91f0558856ab4a8166116acf0b119593fa3ddf307cb07bb55477cb0c73bd5b8bfa5d766ae19 SHA512 e142c7fa4b65c1540180371e4644bba6a6d49e214bc02336e1edf44c9ae7a0a1571ed3b9f4f69e788205893c60c306bf3f096750904842a33087fa9e61d0b4fe
-EBUILD kwallet-pam-5.19.1.ebuild 729 BLAKE2B 49d04707506f270455884a0c1453f993667b1bd8b5ee16a3233529af5cd1c8b840571b0c0cce7fdbbb84def50b10c3bff8c41d7c3c211a94e1a6dca55f07eb94 SHA512 52d6260fb13f28cd5c1fc262fec27d3afad0e324fa8725440d1e9f7e6703d2e8b16472331418461e1d06525bd793a88d049c885c286631009cb05a6ed90c63d6
+EBUILD kwallet-pam-5.19.2.ebuild 729 BLAKE2B 3e7526de2398ef96f90ee237a95dd16a72551e7c691ba506ab4f33ef13204c6b4e276dc46fe502f6248be4aa7f3c23f9b6c263d5bf98acd6ca96f6e23657cd3a SHA512 54902e2fa1bba401c8b1bd9ffe0cff73443145c69a0f558e949c42c061fecc5cd5a9203334ff76b650fda079247c25ca9e05239f1da522ffe1171fe3a63e6541
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.19.1.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.19.1.ebuild
deleted file mode 100644
index 8ff0747b5a1b..000000000000
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.19.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
-
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-inherit ecm kde.org
-
-DESCRIPTION="PAM module to not enter KWallet password again after login"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	dev-libs/libgcrypt:0=
-	sys-libs/pam
-"
-RDEPEND="${DEPEND}
-	net-misc/socat
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
-	elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
-}
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.19.2.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.19.2.ebuild
new file mode 100644
index 000000000000..9f35fa315b61
--- /dev/null
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.19.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+inherit ecm kde.org
+
+DESCRIPTION="PAM module to not enter KWallet password again after login"
+
+LICENSE="LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	dev-libs/libgcrypt:0=
+	sys-libs/pam
+"
+RDEPEND="${DEPEND}
+	net-misc/socat
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
+	)
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
+	elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
+}
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index b01110321ef0..b36f241bf85c 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,5 +1,5 @@
 DIST kwayland-integration-5.18.5.tar.xz 20496 BLAKE2B 74d2396b475a462710fe28f1ee710935a927579e852bd7105785159309ba745acddf527b4ee335ef0e233fd4a43404778af88cbc50e0413d393896d9eed2d299 SHA512 65d87f1e9e9c957e9e9e73dc04da65e23d0c12cb93eb52c86912f4b15a360d6848cc26edbb97be3444c9a5d7a16ade1aebf2d241d4d1a1530aaa5523d1e9f9b1
-DIST kwayland-integration-5.19.1.tar.xz 21284 BLAKE2B 3c6c10d35fc13fbc97de1471f62f3bb0221fefc0dce7a058beb0fb098d7e1f14893aa62ad530321f3453fdd2afb0c15ea68470a172da3f15cce25f9ed81eb903 SHA512 03f69f3d47e916d31ad4abaeb76c1738fe1612fa974a0e0de0bfc1a7bd5b3f8832f0eed059d9c7d1bededf410fac627636b44c51442ba3ec261251707d4050b0
+DIST kwayland-integration-5.19.2.tar.xz 21284 BLAKE2B 4b4603c24c0cbdf9ac6c611b9a134e5bd27178d393cafcb511678fee20b1f2a1bd17ce9421432726fb4e2519dc22f8e74ea7b07633e456a86ec577dabf66ad0c SHA512 718c3527226dbad614f00c06ba8dbd0f3a910e096c4d622cf4c55eba8c166df7a04d623a744c8f83f362663324d74d3bbfc2a3d265cd648fea653bf3b36c48da
 EBUILD kwayland-integration-5.18.5.ebuild 699 BLAKE2B fc20b6e47204ce57593ae3ec743ed702ea0bbdc0e29ec265d3b6102f65f539e5834ad2ea36fd1ebba581c7e6a9ed93ff29c00f59c894ec899f52767263a10763 SHA512 8974af9f97437d0249fde1b2ad429032e787c13a76f68b18f29e395d299f2742c86ddd600f9a43d33b843222f32a28b56e555cb3ab4da6a4fa3ac85212304fce
-EBUILD kwayland-integration-5.19.1.ebuild 697 BLAKE2B b26654d851cf82e5f300e3225389fb02e5b7dc5e415828ed240ec9f95ad1b68abd3da01cfe911135417656eb7a6d24a98d3161982480138ce2a0d05707450b2b SHA512 6636e487062af89cb78a4fd0301ccfc292da395bc946daa11268d3674b166a55302e8cd75e66440d674eccd36e5b98be8728eb467397ada8983d15e32aaa65eb
+EBUILD kwayland-integration-5.19.2.ebuild 697 BLAKE2B db33cc9bf4d6d73188bf14b83d230f97fb151ebe4a035ce1c2c22609dac6aa488bad7f8092d82db286d6095f4fc945faaab8bd50d49cf0923fc0895beaf44b6e SHA512 22edb95de6211867071db4f415abd1e3ddb2f9c756795b7e6669e0f8899401eb52d07dcb26584bacf4648adc1e03511796592e9e61c0093553e7241fe6a94086
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.19.1.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.19.1.ebuild
deleted file mode 100644
index c138022d1824..000000000000
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.19.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
-
-ECM_TEST="true"
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland"
-HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test" # bug 668872
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.19.2.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.19.2.ebuild
new file mode 100644
index 000000000000..8ee83cd7f0b8
--- /dev/null
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.19.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland"
+HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration"
+
+LICENSE="LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test" # bug 668872
diff --git a/kde-plasma/kwayland-server/Manifest b/kde-plasma/kwayland-server/Manifest
index 24ba81e38fa8..3abcc302d17d 100644
--- a/kde-plasma/kwayland-server/Manifest
+++ b/kde-plasma/kwayland-server/Manifest
@@ -1,3 +1,3 @@
-DIST kwayland-server-5.19.1.tar.xz 229700 BLAKE2B d2db64eefb86df4e50431b94be00dd3ca29d7681c50bc73dc13426a4f469a1a3f079f442eb8a2881fd283bcf5cda7589a6b8d6b35ce2614a5f0767721701234a SHA512 b6e0973c0db5c8c71367c18f497eb7343b3a7986b6f79d59d0c4d86df39779f9be8acb0b03ede6c65c9240254589ea8bc84d57865b17da73c1edf6147f836ae7
-EBUILD kwayland-server-5.19.1.ebuild 773 BLAKE2B df26b1b8ab419869085b80752d3bf94c4bfc604795ba07f9bce2dd94e8172341a7b1bbaa6faabb64bc78c36548143881a60d4244b8a67ba90a20b380ff824f5f SHA512 4ba3fa514b735c8b3175a6b3b08dd3fa926ac540be8c4c19bc0a5bcffab78a533cbba4f498734d34ac4e7d5202d8c485a61cf49c654bb80fc39a3ab386fd9681
+DIST kwayland-server-5.19.2.tar.xz 229664 BLAKE2B 38bde6b8ae5f42eaa1259a3a5a40aafcfb9704513519f0bfa1c9999a382fbe9b7f91591bf329165a1e52ce42521d827df66ec7fe89ee22095d3597959f86141c SHA512 6993f4faa61fcb570642ab6a755e8a40e75cebf534f6728774e27337a0dd772f70c134669c25f76408c7e10b7061ef3d8e3fefcfa901219fd90f235ec3f7fd9f
+EBUILD kwayland-server-5.19.2.ebuild 773 BLAKE2B 7e4570fba9f263c860b7e6ccfc9b3a0a98c3a3b9b1e6559a920e94467a215849906bf8346033214cd87763fb6a5e081c20d1c8fa762f292e8d7f2e60ada85913 SHA512 0076289206be16e2b0355dbdf72e5df2c6053214212a3c622428409a1d581cf46e034db1f57bcba5a1e279bb5f95f9bccc2f207071735992b0ddf8067d0fe93c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.19.1.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.19.1.ebuild
deleted file mode 100644
index 5abb2f445dc2..000000000000
--- a/kde-plasma/kwayland-server/kwayland-server-5.19.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_QTHELP="true"
-ECM_TEST="true"
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Wayland Server Components built on KDE Frameworks"
-HOMEPAGE="https://invent.kde.org/plasma/kwayland-server"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/wayland-1.15.0
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[egl]
-	>=dev-qt/qtwayland-${QTMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	media-libs/mesa[egl]
-"
-DEPEND="${RDEPEND}
-	dev-libs/plasma-wayland-protocols
-	>=dev-libs/wayland-protocols-1.15
-"
-
-# All failing, I guess we need a virtual wayland server
-RESTRICT+=" test"
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.19.2.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.19.2.ebuild
new file mode 100644
index 000000000000..47988e2d21dc
--- /dev/null
+++ b/kde-plasma/kwayland-server/kwayland-server-5.19.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Wayland Server Components built on KDE Frameworks"
+HOMEPAGE="https://invent.kde.org/plasma/kwayland-server"
+
+LICENSE="LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/wayland-1.15.0
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[egl]
+	>=dev-qt/qtwayland-${QTMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	media-libs/mesa[egl]
+"
+DEPEND="${RDEPEND}
+	dev-libs/plasma-wayland-protocols
+	>=dev-libs/wayland-protocols-1.15
+"
+
+# All failing, I guess we need a virtual wayland server
+RESTRICT+=" test"
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index de8e7df9653c..d051c9bf6217 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -4,8 +4,8 @@ AUX kwin-5.18.5-mesa-21.patch 8683 BLAKE2B 87f8ffe26103586cc9514bac2e2723b26a532
 AUX kwin-5.18.5-qt-5.15.patch 1718 BLAKE2B 8c1f51bfe1c91c588fb44bed8840ef216c0473fc41e7c5acaf0ad6e46280f1f5c843760351bf262638732b22aefdfa78c220acd65de389a79a948f39818755d1 SHA512 1995b8ec0de12576972c6a28db32dc108bf0d2f7a5a49eff007326fcea4fb070f4cbcca0783c2bb80389f92b64d3ad295107697a9363cf19f32f70e7202c507d
 AUX kwin-5.18.5-wayland-lockscreen-greeter.patch 2254 BLAKE2B ce05dd3389e5de51ffa960215c963765170b72a439e1b9440f3614bc64fdb7949c040f686ff935b357f6a96d88aced49f5aa23a0e36b6065555bea59b3e58547 SHA512 5b72401deb460d3d09f444f1a120d5bf75c0c3ed7e75c609b57a5a46a84159ba80be8e9277b50a9c1796e46ce34712fc5bce8bb7021b9e4199d7b5a798e42efa
 DIST kwin-5.18.5.tar.xz 6274772 BLAKE2B 1614515df60667fb6e8f45302db13dc43ca896c7266c2e2846fd1a1da75b4054cbe14a27b8b3f7d71ae6398e2cf4d9e8e2a68af1c1fa6809a271c5b29574a023 SHA512 b703891824ec31e8ae29df27a11499579ab95789a838e893d5904e40aeba27b0ddc04836038d5b4c062d75ceed277d07e67eeb1b4e957ccf414f03786037d562
-DIST kwin-5.19.1.tar.xz 6266504 BLAKE2B c439e3eafff2b95420a1a973aae13172097f068a20add43fa98ed8a6a7ea256ab32fb342b521c9f00bc027d125f0fc587f180c11af55c9c55e9f0084f0c1bb6e SHA512 1e786227dd85b39b15c8522218b0431bfb161845148c2e398a9149aed3ef501e38b91e1f9e4048b208243629bd09e58f57d228b88e63b3c1a9566c910c81397b
+DIST kwin-5.19.2.tar.xz 6256744 BLAKE2B 9c32059847b7feb40e14fc5f915a5a4ba6bbf10e34f2596b5c8998d315de129a2e0bbbfcb8792063beeacdbc9edbce35b10a0a9e896669206aafa6a61bb914f8 SHA512 60d1c3abb49d7d30dc6cbfc005f2bba45b5b4688ef2ff34f6e926e2ee3936272dc4257306969a3b0546d947f4a9635ac29a3c04de954b994df93ab63c7694ac4
 EBUILD kwin-5.18.5-r1.ebuild 3171 BLAKE2B abf91e2d96656acb472fde3ce1ae1247d72a4720427e2faae702a41a669d0cb2dd7db9b1b12ec0b5cf34edd27b3d494c700d9faa566435f0fb9b6ee75b08e133 SHA512 ebef4cfc82c7a4318739b9eff76c5ce32f526b451a67b5e2b0f44448dc4d3dfe837d069dfcafc3ad6cc31251071a41ef4e3e3ac89d330eea04d748fb9bd7ad8c
 EBUILD kwin-5.18.5-r3.ebuild 3280 BLAKE2B 8da770a19c7b40d1899c53a25e679d24037432fe7fb193bf99dc5eab2290f198462454f154120df9cbc2f89b1e60deff6bc106b1c006e4aa8ebe1e3f344847a6 SHA512 ce9379690dd33560d7dbdc2ee7a160781330fb1724b4f9a68eacbf1d32cdbd972e7e28cb4d1f608e96a75437a2568056ed213cf30e81a11bba8199dd248983f1
-EBUILD kwin-5.19.1.ebuild 3138 BLAKE2B 9e99438144842b8b1279254ece349847a6697d934b6227f9e2027ccaa58a30d54514f8b99170b23baaa45185c595fc428bc2fe23b4c8b6f1e46cff1eb5c5ff12 SHA512 a6de02e58cf9586013e627e906fcef837c4b2f4527f3ea6346c75295710657c784a557f056b85cc660a6a860173f771f641d27dbbb8171d60bd074837efb71c4
+EBUILD kwin-5.19.2.ebuild 3138 BLAKE2B 2ab7260f2c71fd169442d7da247c2da1030981e4c9807722e3d85d99de0d4257185b25e4a50e957ecbaa0fb653fbfd84e449c71ee2fa691f4f5091c1e28968cc SHA512 bbec5a83d67f28e2fb63a63c1f06eae7350ae31c933b9a0dce48751ebe315a8bea26aa32f1317e2faa7200c8819a283ac5ca3d4bf845ac45ef2090fc39c93032
 MISC metadata.xml 347 BLAKE2B 9288920f1da9d97be4ba082678abbd6c404efdd6d7c6b997015e38e7d1f36f2b6201bda92799af0ac02287e86d2525c0a7e783e7efd305ed67ff8b96715ffe59 SHA512 e9e82ec176a53e1bea1eb323c1d1daffdcf900f1787ae76fd3de0434ffb8ac77429131ebbfc11080a1771ed03195e7d98c98be2ebf6a444de95d6cd0eb539824
diff --git a/kde-plasma/kwin/kwin-5.19.1.ebuild b/kde-plasma/kwin/kwin-5.19.1.ebuild
deleted file mode 100644
index 97ba4ed7495b..000000000000
--- a/kde-plasma/kwin/kwin-5.19.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=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="optional"
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="caps gles2-only multimedia"
-
-COMMON_DEPEND="
-	>=dev-libs/libinput-1.14
-	>=dev-libs/wayland-1.2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[gles2-only=]
-	>=dev-qt/qtscript-${QTMIN}:5
-	>=dev-qt/qtsensors-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=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/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5=
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5=
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
-	>=kde-plasma/kdecoration-${PVCUT}:5
-	>=kde-plasma/kscreenlocker-${PVCUT}:5
-	>=kde-plasma/kwayland-server-${PVCUT}:5
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libepoxy
-	media-libs/mesa[egl,gbm,wayland,X(+)]
-	virtual/libudev:=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libdrm
-	>=x11-libs/libxcb-1.10
-	>=x11-libs/libxkbcommon-0.7.0
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-	caps? ( sys-libs/libcap )
-	gles2-only? ( media-libs/mesa[gles2] )
-"
-# TODO: sys-apps/hwdata? not packaged yet; commit 33a1777a, Gentoo-bug 717216
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
-	multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	x11-base/xorg-proto
-"
-PDEPEND="
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	ecm_src_prepare
-	use multimedia || eapply "${FILESDIR}/${PN}-5.16.80-gstreamer-optional.patch"
-
-	# Access violations, bug #640432
-	sed -e "s/^ecm_find_qmlmodule.*QtMultimedia/#&/" \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package caps Libcap)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/kwin/kwin-5.19.2.ebuild b/kde-plasma/kwin/kwin-5.19.2.ebuild
new file mode 100644
index 000000000000..2a3970ee45d1
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.19.2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="optional"
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="caps gles2-only multimedia"
+
+COMMON_DEPEND="
+	>=dev-libs/libinput-1.14
+	>=dev-libs/wayland-1.2
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[gles2-only=]
+	>=dev-qt/qtscript-${QTMIN}:5
+	>=dev-qt/qtsensors-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=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/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5=
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5=
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-plasma/breeze-${PVCUT}:5
+	>=kde-plasma/kdecoration-${PVCUT}:5
+	>=kde-plasma/kscreenlocker-${PVCUT}:5
+	>=kde-plasma/kwayland-server-${PVCUT}:5
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libepoxy
+	media-libs/mesa[egl,gbm,wayland,X(+)]
+	virtual/libudev:=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libdrm
+	>=x11-libs/libxcb-1.10
+	>=x11-libs/libxkbcommon-0.7.0
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-wm
+	caps? ( sys-libs/libcap )
+	gles2-only? ( media-libs/mesa[gles2] )
+"
+# TODO: sys-apps/hwdata? not packaged yet; commit 33a1777a, Gentoo-bug 717216
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
+	multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/designer-${QTMIN}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	x11-base/xorg-proto
+"
+PDEPEND="
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	ecm_src_prepare
+	use multimedia || eapply "${FILESDIR}/${PN}-5.16.80-gstreamer-optional.patch"
+
+	# Access violations, bug #640432
+	sed -e "s/^ecm_find_qmlmodule.*QtMultimedia/#&/" \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package caps Libcap)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 0c9cdb92984a..cc4311e76dc5 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,5 +1,5 @@
 DIST kwrited-5.18.5.tar.xz 20236 BLAKE2B 3dad52dd60ad24dda97165332bd2a6182ac3fd9aef57b2f3e90ece0cc899617d99e84d696d3647c84197d088f383eaa9c96e88367abc310e1bdff81e0c57f842 SHA512 2c28ba26228394989524b46e68cd2783eff5c412ccfdaf12947976bde6a2ba732e696c3d8af666f87cf67062c75485fb0ed01f58ff3d727fedf8d440ddfd4f84
-DIST kwrited-5.19.1.tar.xz 20204 BLAKE2B 4b6d41c5d302f99a8a64cc4d7e61d6c2053c9eea94aa6ba8b3be28d7b7d3089927446e6db7d291ab5a65ef76c5b58e45d7953380b2e9f7fb3ac218ac69ba5c4b SHA512 856cfbcad24c40e9ab09946b1cc017ad251d3771e9ff7bc33768bbfd25b93c26e44c0b485e189695ec7712d9b56eb35033df364baea74eb323734a6fbad10de4
+DIST kwrited-5.19.2.tar.xz 20208 BLAKE2B 6f5287efdfa2aa6f15e610f5dfee0e7bb3920fdf2cc603dc289c42d1af6c4c486b0b640eba7e3b490ff626c862b03c7a333dd62ecbfeed8d9ead261d32b6f66e SHA512 61dd9dea3c338997f6fdc851b564edce02a978d215cdf4a8740379eb351a266705f5efde1ef3801f4904bc9aec2d7eb40e93f897faedec87d9b87c19bf8c89bc
 EBUILD kwrited-5.18.5.ebuild 623 BLAKE2B 00ae1b0954de469354d8d4b73a5e29b73faa93811021d8269b3d599274ce632c6fd52d2b82bd7dd2f810b040e9d57fe2c6536d801a190072b78f7aca811d5830 SHA512 98da6e9ef2033c63328eac9b52033cbab5018f164b80c3921b9701a0e41b738e8aec2092be6a467f576431c9ac8f3ed102c1e3404d2ab604da1d9ff5d3022a99
-EBUILD kwrited-5.19.1.ebuild 621 BLAKE2B faa88a99ecb98644c7a2a9acba300ec83e458f61fc19b5eb8c79e66d38148949fa85e3f9c69110bccf3c70bc789c3629068d7440650fea35a1a74feb80ff9419 SHA512 6b5f6597a9ff0943a3830a7ed8f437a73418fc6cafe9c6211e42598c9055f4d29f2fa3ecfa7905c9578a285fccf40dad572d837ed071d0d0f579745ea0b50a48
+EBUILD kwrited-5.19.2.ebuild 621 BLAKE2B 837c4a902686b52056d81bc20101e0e7224c42d80bbb124e32865dea751285df54392b14ac9e085fa1d6dcdf137422a50609edc7f8b305f95c9538d5f71e2901 SHA512 28ef1c40336bc95cb52b0f686bec5fa246ac4ef3f0268204cb620a9a1247b4d939dc86ef8b15c62f0ab77f5934957767ac8f9b734708ebd32b23f54f3c670c23
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwrited/kwrited-5.19.1.ebuild b/kde-plasma/kwrited/kwrited-5.19.1.ebuild
deleted file mode 100644
index 323b674ec4b0..000000000000
--- a/kde-plasma/kwrited/kwrited-5.19.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
-
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpty-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kwrited/kwrited-5.19.2.ebuild b/kde-plasma/kwrited/kwrited-5.19.2.ebuild
new file mode 100644
index 000000000000..6069a1ebb5d0
--- /dev/null
+++ b/kde-plasma/kwrited/kwrited-5.19.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpty-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index 81d17c2fc9ef..878023a2352d 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,5 +1,5 @@
 DIST libkscreen-5.18.5.tar.xz 85532 BLAKE2B eb9c85c88888dc82486cce8cd55c06cc9c180ac84a9ebd005cbbeb26233bccd3a48daadbff42cff33c92bf871c89bd84c5f291210bbf7768c7ad7b45641d7a0a SHA512 8fc36bfd5aeb94fada51be1895ff2cf1b9fa98332f1795ac5e9d5339a35d87a24ed15c1f44af85205198c584eb411191f72ef8de370d1f97476d75db1458cb00
-DIST libkscreen-5.19.1.tar.xz 85472 BLAKE2B 85b829e869ee7b5c236df1e255ccd0558d8820dc2f0fc43fe15f17e9d5ea206a502271a741a9d3ebee0a8955d13e48350945d3e0e2199d482bb78578e763febf SHA512 79240edad1c839ee92616819f5d1a3551d96afd5a279c6d0253fc789705a59119099ce81d0fb326d87137e8f33bbd96071dce828951894d483639d6b8095d527
+DIST libkscreen-5.19.2.tar.xz 85464 BLAKE2B 61aeae22c2881907381d33614a05f6a5088b0747905fb45e80264a7d1bd23fb55c8ff25293b029b282e22e256301a2b4ccabd9338f7eece2cade1df009c5a997 SHA512 acddf4eca0f98457807cbfd80f8ea3b5ddc21940f629cb0f1d4f4d2af4a736041835f272f5e8389152dc681bab07fa435a7637019472e905061f648e442fdc3f
 EBUILD libkscreen-5.18.5.ebuild 606 BLAKE2B d4d29ae7fe2ace3772cfc632ca430cd06cd14cbe1a5407be22ef0992c4daa8b589714166863ce59506bf5503e05ed902e539e3e579c31aabfb78e2322974e215 SHA512 22931f06aa1ae659ef952558df3b2bce5a33fecbf2992fc19023ed379627c899c1e29768c2eec9656ac743cb3232c0b644691e50fc860b05c737948645fbdf79
-EBUILD libkscreen-5.19.1.ebuild 645 BLAKE2B ce0a2d3e94d2ebea0136578e3ce52ae0bca90a55b66f6ce1ae45a0baa3222cf807b4b682a7dadd09e6fb1646945fd88ad2b963c7ec255fad556f605462b3d235 SHA512 cf90ffed45ce862f5420d2484007dc6e490314cdea4a986b128e29ee684c07a5ab135552ecedbd71121afec6ad28cbaef3f994e2e9525484583887704cd62fc6
+EBUILD libkscreen-5.19.2.ebuild 645 BLAKE2B 671d1da92627eab109409f16d41f8cdecb08e903777648541d7f58a2e0bdd3a781d1c39090c1fa5409fe34959b98601c2b6e0a42cbde3f3009da74637605acf6 SHA512 0f967c9f70967d25ffed82b0b0bfefe169214b37d6ca951e97c7b51878a5772457b759db0246ac8523cfc5623582d1cb6dea85cec3dbea79778f717d9734433b
 MISC metadata.xml 337 BLAKE2B 9be36b63c5f53824f31a72360abc64456d7ac99fc2e798ec0653876215bea6faaf31490bb9ad775c4f38a548e7c32a61c425e301f53d6bf38a6b3cd99d100dcf SHA512 d515a27ce1085555a5268218a4db0ca594acab5210e2bb5e307c2e488fe69df1f5b5816123afb8e220ad435397e5ac89a9daa6dba94559ac0b9412e9756e3cdc
diff --git a/kde-plasma/libkscreen/libkscreen-5.19.1.ebuild b/kde-plasma/libkscreen/libkscreen-5.19.1.ebuild
deleted file mode 100644
index 996dd2b23227..000000000000
--- a/kde-plasma/libkscreen/libkscreen-5.19.1.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
-
-ECM_QTHELP="true"
-ECM_TEST="forceoptional"
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plasma screen management library"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5/7"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	x11-libs/libxcb
-"
-RDEPEND="${DEPEND}"
-
-# requires running session
-RESTRICT+=" test"
diff --git a/kde-plasma/libkscreen/libkscreen-5.19.2.ebuild b/kde-plasma/libkscreen/libkscreen-5.19.2.ebuild
new file mode 100644
index 000000000000..b7742f830500
--- /dev/null
+++ b/kde-plasma/libkscreen/libkscreen-5.19.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="true"
+ECM_TEST="forceoptional"
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plasma screen management library"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5/7"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	x11-libs/libxcb
+"
+RDEPEND="${DEPEND}"
+
+# requires running session
+RESTRICT+=" test"
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index a943f21f9560..13f396a9d36b 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,7 +1,7 @@
 AUX libksysguard-5.16.0-no-detailed-mem-message.patch 1039 BLAKE2B c05f1bf38ef733630ec4c2bcb36b8d0cffe0c4ca318e93dfce60dabea6a92e980e94e57f347683b0235499b95cc0f40734d322309321a5ddc792c3a110a5613e SHA512 dd54d1eda30655876916a517fc3f2a9f141975bc2eb3384a3434c23ef591285cf31188aef83a2f2597d8cc9b77800ba95d37e5e2a22a8f0c9b78fa6e767a00ee
 AUX libksysguard-5.18.90-unused-dep.patch 3054 BLAKE2B 9d48130d6754fd02a570ea91a17cc35fdb20a14b89e8408d041c983a4893dcf1fe3d35751ccacba845bcb4a8a5a230e0a78b722ba0a7cf720d2123abfdb6b78e SHA512 caf4a646361f3011a5926ae0ba7b10ab6b31bb01d8a5bead676735021096117492f531e8cd9d09dbfbfcfdc83b1d4d94d327c1766928fa6a7684989b967ba354
 DIST libksysguard-5.18.5.tar.xz 610320 BLAKE2B c644bfa216ae851eb1520b9135add670ecbc4733be7bde27437a876141ca9f37c3531a78c347e7c00149e1d1f287a680954c3e885cfdc0838398626d6ed3d651 SHA512 a648d0db1378165188187db9de78f816b1dfe647ce7e7ea2d505bc04c5008d2c24b2a113bc73c4fc4b3ddf467682ea3b306286f4bffa2c750918112892d78fb3
-DIST libksysguard-5.19.1.tar.xz 671584 BLAKE2B 43ae03e52661f72d84faf619b3b68a64ee66da88501740751bf6702b39aa1f1435012272e63d019f2a0753d995996b4677df798fa8f5437164f43cf36d5ada69 SHA512 7ea49f12af6ac3b0068ff4fa2587f04b158ffa8926e0dd0a5cd1f6d46dd6a1f0d451d40dc414ac5a4d5e795e6b6ae798bfdd5405c08044347556f2fa2aedc475
+DIST libksysguard-5.19.2.tar.xz 671616 BLAKE2B 1cd80a1e565468d34aecafccc21c38da4435de1a2d1b4f209da8007ef1515630d9d2c4c6c4e3ed1e9bf6eaeaf8854c9a1d756eb63f3353001704e6030066c725 SHA512 4cd07c08b9bbacbbb9f2accc7aa2708b95846a1b31f30c0879c8753febb80a303c0a8568eb087ab67cf595d56fcfd45d223817efca2218c014fca2055f067ed3
 EBUILD libksysguard-5.18.5.ebuild 1532 BLAKE2B bd23ce39743bd0d5f085771371fbe3bf352f0ca0b25191fdce0f3a4b3e638cfc9f3a757d3d5206ba528637bcda4a71f938fa0e5127d847328acfc8636d2d7ad8 SHA512 0987e280ae69e5ba924eb0de04d7163e652122d7e5d59dfa14ce0d5bbb1f09e761126a6f8f2b7c4eda99bae2640c0919ae7f3be9930cdae038758f0883f65772
-EBUILD libksysguard-5.19.1.ebuild 1636 BLAKE2B 28b3fe703e221a3eac2fd6820597d1300781c0aff9459e6be88b6935d7fd9e8f6200a4649a4aa3a4760d8c331aabbd2b7f8d6bdd745d9677f9f76ced662c29c9 SHA512 44edd2cc1c826e1f0da5222a65a871c4ca86457786108d2d1fe7c81c3d450e429c66b422527a8dcdb3957698bb40f82d8be2d3a427f6183a0277dfd14a1a92e9
+EBUILD libksysguard-5.19.2-r1.ebuild 1708 BLAKE2B 5801fd306cba9bcf04596e61dd6683dca8b7421f66aaa13daccf825f74ada8656b50af1bfc60f2cb9fa7db54ab5a72c728e3603977570b1fb8d780c86cf058c8 SHA512 41fd9c7880011795826313e15f22fb16ca1ab2f64d99af1c859117f271dab43612f3f059627b2ee9fc011cfff506abbf33d4c095a2e327f816f4c44eaba4e039
 MISC metadata.xml 379 BLAKE2B 98ef8b13c4f1d761a090ac8b0cb33cfb87b25625955018d7c91d6250b5f83d299058c87944004581eaf13649614667bf2b0301eb00e92a9ef6913dedb753e44f SHA512 036552355dd07f9e255bfb3bee4cd8949cfb437c9df36a85467735c5e4d63f7d7239015f83dbfae9b5151f9cb34b4b4f59a62f893da48f68ed82852411013a86
diff --git a/kde-plasma/libksysguard/libksysguard-5.19.1.ebuild b/kde-plasma/libksysguard/libksysguard-5.19.1.ebuild
deleted file mode 100644
index 7e6a63f6b5e5..000000000000
--- a/kde-plasma/libksysguard/libksysguard-5.19.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_TEST="true"
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Task management and system monitoring library"
-LICENSE="LGPL-2+"
-SLOT="5/9"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="minimal webengine X"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kauth-${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/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	sys-libs/zlib
-	webengine? (
-		>=dev-qt/qtwebchannel-${QTMIN}:5
-		>=dev-qt/qtwebengine-${QTMIN}:5
-	)
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libXres
-	)
-"
-DEPEND="${RDEPEND}
-	!<kde-plasma/plasma-workspace-5.18.80:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	X? ( x11-base/xorg-proto )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.16.0-no-detailed-mem-message.patch"
-	"${FILESDIR}/${PN}-5.18.90-unused-dep.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package webengine Qt5WebChannel)
-		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	LC_NUMERIC="C" ecm_src_test # bug 695514
-}
diff --git a/kde-plasma/libksysguard/libksysguard-5.19.2-r1.ebuild b/kde-plasma/libksysguard/libksysguard-5.19.2-r1.ebuild
new file mode 100644
index 000000000000..e20e1a9510b9
--- /dev/null
+++ b/kde-plasma/libksysguard/libksysguard-5.19.2-r1.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="true"
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Task management and system monitoring library"
+LICENSE="LGPL-2+"
+SLOT="5/9"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="webengine X"
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	sys-libs/zlib
+	webengine? (
+		>=dev-qt/qtwebchannel-${QTMIN}:5
+		>=dev-qt/qtwebengine-${QTMIN}:5
+	)
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+		x11-libs/libXres
+	)
+"
+DEPEND="${RDEPEND}
+	!<kde-plasma/plasma-workspace-5.18.80:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	X? ( x11-base/xorg-proto )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.16.0-no-detailed-mem-message.patch"
+	"${FILESDIR}/${PN}-5.18.90-unused-dep.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package webengine Qt5WebChannel)
+		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	LC_NUMERIC="C" ecm_src_test # bug 695514
+}
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index 889b4d2960b2..a77edc18dd24 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,7 +1,7 @@
 AUX libkworkspace-5.16.80-standalone.patch 4815 BLAKE2B 8269cba2d49020e643ae7aca211d9ecf2c38a8abf5c87cdb2185c80cb67824be1a3b79da67cd267e917c8d9ee3b67eef37b58b2845a6383d98c322b3ca90e4e9 SHA512 20bc3f75521e548311b2126ce40e59ce61e0beb85a0ce643e2b31e3a82ce3deb578e2b4049f5524d81129c4872661303bff9011623f0d8436358b3790115efa5
 AUX libkworkspace-5.18.80-standalone.patch 5188 BLAKE2B 5635ef59e36581aee87689dcc3b2b9acc66eb37de12b084f249c6f80ae18d727b830cdf7b2e9795ad4ecb956cce431ed25b4ff0b9b3be02a09c835f182f49fdb SHA512 02b36fc91b10b0dc38cd57f3e138cfab51994a31edf73727762ec92a6e8fd1d786724cc3591956d337f6cc46b87596004909503e0a21a52115828b594bb0cca4
 DIST plasma-workspace-5.18.5.tar.xz 5696256 BLAKE2B 7aaf19ff75eb796bbd687e6c63b9703431ecc567bc52c2c173718d45b3946b22572b3a097f7fb7e9726cedcb98cfbb2f20c580efefa4d9cb9d4f2473abeac636 SHA512 870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2
-DIST plasma-workspace-5.19.1.tar.xz 5683020 BLAKE2B 34d4ac284e35f3bdb56895f4df10345ca1f1c9c100eee77e7d73a8e6c6960d15ae60aadd3ce24a39be65ae54b49b964ac27f9c88c8fa2ac159d7ee8d44f1a51b SHA512 9e8a8af8bbfae07472363386aec41a76c7ea5d5242ccb376a276d546b819f3d28dd6961630c5e38026256a4ca219bdb1d86fe49eecc572327451b28f3c94e692
+DIST plasma-workspace-5.19.2.tar.xz 5676488 BLAKE2B cc7a5a156be2e98a4ddc7e8e80a286844f8438b2d17b79dd5dadd24cb28681b80255bad84c118949a815c47080afab380b81edfc3ba59b43f7b24c916cd62e9d SHA512 1c82ee7e1ea27c37c321487bc7bf109c451b3b966d795c7c3102a21e1bfb75bbd83e0ff2fda76e76ef838af3a054aa81a7aa8f89f789dfc16a234d1db3e03c77
 EBUILD libkworkspace-5.18.5.ebuild 1454 BLAKE2B a885654deeaf4d2fec1735b188f42d48f5660df726f69e27ab721fba9f4abc01b5f01e18dca2ba68e2632cfcc2916a177940dc8190420ed6646b2bb685de8a44 SHA512 544539081c4274d1c58728a8c35ee312915ba61f3687c757c4acdc71d80ef52e1517e6f80a3862a2eeae7af69ec95f3ea89e425022e0f36c9f1f5af5e34bb23f
-EBUILD libkworkspace-5.19.1.ebuild 1487 BLAKE2B 386fac986b3cd76b1f5178f36f6aa28b23396392215946e26aa577d8cc3547f354fc5bd071009e926e0b8875c93a9a2f3906a4b856bb090def675a18427ae3c1 SHA512 1dba7df5786b88d5dd64e7c17fa5f441d6246c883933df10ee1c714599285dd0e13b2105e0231ae433120eadac4ad911555292db942aab9095698f9f54b3830f
+EBUILD libkworkspace-5.19.2.ebuild 1487 BLAKE2B 1bc276398796f3e6d29ab5ce183bd6b0a51f94d596583ff130dd7d01b01b0336e4c00bd3a35eb05b24098fade870821ef865176153a383908a67991f43a3a825 SHA512 358f8b41e65f130ff8e2c46e6de3545cb04d04bee2741ea9a90113aa2c739df932235c9869b379a382b4f03336ce5c49ca2973d93404385fc25e535640ca0b73
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.19.1.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.19.1.ebuild
deleted file mode 100644
index 6e4bac4afb7b..000000000000
--- a/kde-plasma/libkworkspace/libkworkspace-5.19.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=7
-
-ECM_TEST="true"
-KDE_ORG_NAME="plasma-workspace"
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Workspace library to interact with the Plasma session manager"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-plasma/kscreenlocker-${PVCUT}:5
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-plasma/kwin-${PVCUT}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-plasma/plasma-workspace-5.14.2:5
-"
-
-S="${S}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.18.80-standalone.patch" )
-
-src_prepare() {
-	# delete colliding libkworkspace translations, let ecm_src_prepare do its magic
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die
-		rm -rf po/*/docs || die
-		cp -a ../po ./ || die
-	fi
-	ecm_src_prepare
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		cat >> CMakeLists.txt <<- _EOF_ || die
-			ki18n_install(po)
-		_EOF_
-	fi
-
-	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
-		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
-}
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.19.2.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.19.2.ebuild
new file mode 100644
index 000000000000..38aab5b72118
--- /dev/null
+++ b/kde-plasma/libkworkspace/libkworkspace-5.19.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_TEST="true"
+KDE_ORG_NAME="plasma-workspace"
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Workspace library to interact with the Plasma session manager"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kinit-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-plasma/kscreenlocker-${PVCUT}:5
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-plasma/kwin-${PVCUT}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-plasma/plasma-workspace-5.14.2:5
+"
+
+S="${S}/${PN}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.18.80-standalone.patch" )
+
+src_prepare() {
+	# delete colliding libkworkspace translations, let ecm_src_prepare do its magic
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die
+		rm -rf po/*/docs || die
+		cp -a ../po ./ || die
+	fi
+	ecm_src_prepare
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		cat >> CMakeLists.txt <<- _EOF_ || die
+			ki18n_install(po)
+		_EOF_
+	fi
+
+	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
+		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
+}
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index 8470e4cea511..752bf30eb233 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,5 +1,5 @@
 DIST milou-5.18.5.tar.xz 64264 BLAKE2B e4dba1cded6c5b833f35086b3cc943e4bfa4a0a6df530eb43aba7efbc40ea48aad8c88a2221546e7fdcc411c136232af84b7ab6a45d99233369c4a2c628f56d4 SHA512 3c1d0b032e8f26a637aed8067d919d95bcbf033e0b494bc9a2a0295d000773ac3900903dca96eb32d3fc1b831884e3435ab91a26c9cd179548c3b2cd0377577d
-DIST milou-5.19.1.tar.xz 64504 BLAKE2B 6bd07f9bf538b7c85075b56def70d6168dea7ac02e950c210ffd7dcbfebe38d1d13ab4735582d9d9c9264fac760c62f2dc7fb10a7facee0f841408fbdc57a498 SHA512 c977e59861c5dbc68c9a5567032da25c031aaf811553237e5cf56247f3020a34422724fa700ef3717772c3b7e0bd961a218713acc2db22ab38124ce24d50ccaa
+DIST milou-5.19.2.tar.xz 64500 BLAKE2B 93c7799a8a9db176b2375c0ce6419cbba0e42bf8a6058fae604ce2383c95e64341d950bbd0e4ff436d0b5ba7a84a45aed7b64adf42f4b87a28df528bb5fdb92e SHA512 d7b82d170343d19c3ca0f11fbc5d59da6746e67be453ce85e1880bbcf4365e7f3588d622849ae9dc334fb87d4b0b6fc5043b1b0cf239b4f69d50a8faa0a480b0
 EBUILD milou-5.18.5.ebuild 842 BLAKE2B db01ebcc996229b0918aeaebb5b58b798fc342f50eb5b4dc4d5c1e2d906a7171fd40ce1faf228ae04aed8611888086674d83f9ee3a4c48de2be24bf6bad09565 SHA512 965bdebf6546e32453e842dffef2b8b2f2ffd47d6eb314051a7f94f401542a1eed8b1e6eddfc26934607068eefca3c22768396aab649618b422da378193c9081
-EBUILD milou-5.19.1.ebuild 840 BLAKE2B ada25f6a7da5fd0d234b5139ecf71a42b9b8530ed42638a673331a71650dfe921e8d85c98701fdcd1179f45df880266f0778b301efced6e2d5226b41517c7bae SHA512 f8790dd184ef12d6681611e116cc17a3a98efcb03fd52d5fb1a8a1fe3354fd26012d799a919e6bd93855acf0abfa971bab4e190b598c6a8cbfdff5af93375564
+EBUILD milou-5.19.2.ebuild 840 BLAKE2B 41931cfdc0566ebc2d78fafa1e42d701d3012ae14ee0f1d8ff5f499d245b16edfe1be0cf7b248fc03a761697a009983bf82d0594cb10fa2351fb9980b239db25 SHA512 5aaa2283009a14dd5e2d2b3be4a94adc666206e4baaaacce25b07b43d244a8fc3836fda6ae8c07707e2114013a8645a235b0ab4035680ee7495dfab1f86d2301
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/milou/milou-5.19.1.ebuild b/kde-plasma/milou/milou-5.19.1.ebuild
deleted file mode 100644
index c475d42a45c1..000000000000
--- a/kde-plasma/milou/milou-5.19.1.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
-
-ECM_TEST="forceoptional-recursive"
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Dedicated search application built on top of Baloo"
-HOMEPAGE="https://invent.kde.org/plasma/milou"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/milou/milou-5.19.2.ebuild b/kde-plasma/milou/milou-5.19.2.ebuild
new file mode 100644
index 000000000000..965b1da6db1a
--- /dev/null
+++ b/kde-plasma/milou/milou-5.19.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="forceoptional-recursive"
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Dedicated search application built on top of Baloo"
+HOMEPAGE="https://invent.kde.org/plasma/milou"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index 9ab77ca83b25..5e602db4af6d 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,5 +1,5 @@
 DIST oxygen-5.18.5.tar.xz 4471212 BLAKE2B 72839684b00bd9382475c26dec2d4ff73b8f84318a326c12e4fc25f4452b731c23f853b1eace2d2257df5e82ddfb104fcd70231b7431546902384288438147dd SHA512 e965e8edbf94d2bd2241202030960615286c454c02bedfbca29670c9dacf55b5f34a8dda1ec3ef9f18f4bb864ff8721acaf559f14cfc1c22e7b5385865cec579
-DIST oxygen-5.19.1.tar.xz 4462996 BLAKE2B 9ec3528aa8f6482fd3edd4270493e20ef010ded06d71eb2b37e359bae708c72dab4c4d4390662facb50c14c0481bb1227c21d420b673a0d0af80ac661dfbdb50 SHA512 78f13f877fbc967d6374eacf6611ad4e6a905b43ac56988475f97d8ca6ac35e77a498a171d571b7de8a7d11e85abf9cdb16f8aa279d56ab77a1f69d8ec5f8406
+DIST oxygen-5.19.2.tar.xz 4461848 BLAKE2B bc34cbd6591050eb426dca48d92b0fb26bf5e9982125c5d98d5a7cf609395f02f6b7eb61bc2c8192fd5c5d59bb9abe7b279835654c3400766019e7c291c0edc4 SHA512 749cb2688f0b835c5bd2923f395b09fa4b159c6b8d636393f5a251cf1df009d997eb98e618e1940cfb4b952e7b2a9a7a4b289fe843fd8f45d7242f0bb3895259
 EBUILD oxygen-5.18.5.ebuild 1363 BLAKE2B c5fed27ea231e1a9bacd0cbaf9e14df7b5af1ab99e800b673804d05388ad62dbc24e6519fc2e14d00ab5357172861a98bf0ce19fc1082c2d54ae94706cced55d SHA512 851cd0fe3d8377280fd78f5c9a20a777ba13ad5afed901aa81f2b201f41b1276237256d3837fafc64ac5889e6e13fe5df4007159738ebdde6f23ba1a32b88dbc
-EBUILD oxygen-5.19.1.ebuild 1361 BLAKE2B 2ae1f80198bf4912263a6bf4db4139b0ca03972016a16f1db73618b55bb99be7612d477391f6ab6d6670abf705891da6ba4013a7e4222c02814bc2a9a04f5b15 SHA512 0e9ce548684f147be3a7da5592f688c179b4172d4abc13157c1eadbe55a043c1d5fe9df397920851d0d67ce1d87dfc699aa6bf84c7a084963ecca991dc037166
+EBUILD oxygen-5.19.2.ebuild 1361 BLAKE2B baefc9e22a5587f6da96e019b7e66c0292c735bdd4f276090abef4ffc3b397dc8eb0cf9942bc369d3621ff5bd432000117c0b2d7fe19ec1ed41d58dd056bdda8 SHA512 eb8560ce86beb858cdb248c32c9a33bacb397b907b38e9616f4cb20e124a2f8356eaf33aa67f899738fae23ddcaa591aa6bc2c80448ea5c3463e94268fca881e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/oxygen/oxygen-5.19.1.ebuild b/kde-plasma/oxygen/oxygen-5.19.1.ebuild
deleted file mode 100644
index cb964fd294d6..000000000000
--- a/kde-plasma/oxygen/oxygen-5.19.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
-
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Oxygen visual style for the Plasma desktop"
-HOMEPAGE="https://invent.kde.org/plasma/oxygen"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="wayland"
-
-COMMON_DEPEND="
-	>=kde-frameworks/frameworkintegration-${KFMIN}:5
-	>=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/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-plasma/kdecoration-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	x11-libs/libxcb
-	wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kservice-${KFMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-plasma/plasma-desktop-5.16.80
-"
-PDEPEND="
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package wayland KF5Wayland)
-	)
-	ecm_src_configure
-}
diff --git a/kde-plasma/oxygen/oxygen-5.19.2.ebuild b/kde-plasma/oxygen/oxygen-5.19.2.ebuild
new file mode 100644
index 000000000000..752aa3486dba
--- /dev/null
+++ b/kde-plasma/oxygen/oxygen-5.19.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Oxygen visual style for the Plasma desktop"
+HOMEPAGE="https://invent.kde.org/plasma/oxygen"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="wayland"
+
+COMMON_DEPEND="
+	>=kde-frameworks/frameworkintegration-${KFMIN}:5
+	>=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/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-plasma/kdecoration-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	x11-libs/libxcb
+	wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kservice-${KFMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-plasma/plasma-desktop-5.16.80
+"
+PDEPEND="
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package wayland KF5Wayland)
+	)
+	ecm_src_configure
+}
diff --git a/kde-plasma/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest
index 092f48c067dd..7c9a7d03b7fc 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-browser-integration-5.18.5.tar.xz 156428 BLAKE2B 9f83e33c871ea59fc73ed6dbf26e137f5dabfa4bb2403d71a0621cc0c41b1a15b461631b6ab864649780fe50c54f9428394716d8d5055453b51616c393daea96 SHA512 096bfc0940fa3a40fe5145078fe801e2436779ac3333e953a68f7a68d3d592e3978606b70f1678c83a0748221e4d992ce14e0cb72c671f242d13db41390e8730
-DIST plasma-browser-integration-5.19.1.tar.xz 159256 BLAKE2B 074dc3e31dbaed38b1719f4186c668ab5409a7481c8a1fa9b4dd51f766f96defb1d1bccdc10ae458221cede3679a9a82d086c99dda61e61ab290bc192b417c43 SHA512 c2f52b599939222bdfc3005bf482b1866d3af460ae81fc725566aa86bd7f6eb7b4df821f96bdf35eb1a5935b94581623f025c0ae9388ec0b1fa21d0577170f90
+DIST plasma-browser-integration-5.19.2.tar.xz 159188 BLAKE2B d33bff5563106fedeb5e90df1295d55d32b3213bf63e7cca03cca945509081a755e06cc338a8d6682ae8dd2d9c03fb80ce1989f97a35e0578e228c06ff38231f SHA512 c89a149b119925bf6ab24e3a6d00039364f755b8dea8fd708eaa7b6dd8f7fa5f83c3d25fe46cc9b877bfba24ae7ba7d82f3758ba0f379ccd77badf212e168758
 EBUILD plasma-browser-integration-5.18.5.ebuild 967 BLAKE2B 9cd19e00f7845e16fd4dbcac7752f182210a1986d02f3796bd26488319848c724267783538b6ea0636629e12e18cfcf8bdbea1347376b99d3286bb7195508388 SHA512 bc98bfc39553fbd53c65c8ef5f419e779cd5029d536a8494efdb27a177a522aac224e3a351d27a5392cc466e31398d7651916696df860a802a7cbb524e050746
-EBUILD plasma-browser-integration-5.19.1.ebuild 965 BLAKE2B 7bcd2017e193ef48992ebb523be3a5dfae43e306db5447f27b84212f515da403bccc45f4a4a9e4a5bd79c60b2cbff70bf48bb76b65e0a7ff33cb4d7fb8d0a58c SHA512 810fe44b767b1dcd8150a17c1c2be8cc9c038bae8aa5970699ba71680d8340c2f71dcf2e264d281519ba356fd11243e833f261bfac747ffb24e0b137486e321a
+EBUILD plasma-browser-integration-5.19.2.ebuild 965 BLAKE2B 3dfe2cbc808f5fb1d33e531544e9a32e535c0184b70dfb813d11ecedf134f57a49ef872ca2b8ae9abb605080054ee1d225163f73da7310939a64e4ad791c086f SHA512 ecb04131fa335b2128b99e8dacb6996acdd5eaf917726da462e2c910d16653e24d39bb56f0c568a5260e762a56efe4d5a73555e6e900913981e0cecb3a80c35f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.19.1.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.19.1.ebuild
deleted file mode 100644
index 0b999ff7927b..000000000000
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.19.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
-
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensions"
-
-LICENSE="GPL-3+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kfilemetadata-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/purpose-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DMOZILLA_DIR="${EPREFIX}/usr/$(get_libdir)/mozilla"
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.19.2.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.19.2.ebuild
new file mode 100644
index 000000000000..0c2424f3a822
--- /dev/null
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.19.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensions"
+
+LICENSE="GPL-3+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kfilemetadata-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/purpose-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DMOZILLA_DIR="${EPREFIX}/usr/$(get_libdir)/mozilla"
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index a2074d58a1df..2f5d7a739942 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -5,8 +5,8 @@ AUX plasma-desktop-5.18.5-findxorgserver.patch 5195 BLAKE2B b8ebbe59a5a2ef80a6cf
 AUX plasma-desktop-5.18.5-fix-animate-in-animation.patch 1434 BLAKE2B a84e839180ca1aeb5eddfd07e504d88d8fbfe52ca210d4f976955d753770b5572a5e55c7773368241fa3ff61c38ef7699879b829c19a54e6665d4dbf3fd2570e SHA512 7496b34f1243070160e9875998d1ab5ef5227acb68b4b3545c32f5e4be041459e3234fb56b186c2578cf573dd50251e8be751546bba68b11f6c2d170bb3b7fac
 AUX plasma-desktop-5.18.5-stop-multiplying-duration-values.patch 5184 BLAKE2B 35f25bc8a325b947a44cf64f81e42c53746220329a35335e997a4a6ef8f87834be03f68fff951641e78d322804e08aa4f9e0c76556d41b00335ddf44da4dd643 SHA512 9e604ba5b99bf5e48b2cf1ed5afd7a5a8b413348fbc0c4e7f663660ac27aed8f1f3d268ba2a2b376afe86fee0165e3a27c5c35471ffa7acfae9956a47a50b82f
 DIST plasma-desktop-5.18.5.tar.xz 9412644 BLAKE2B cc4ba658e42cf8956f07ef6cdf7e34191d14d922958155ed19a9c5224f6a8dcfc7f1ea0c605066c28eb0d08b714f2f19e321e499bed78055ad2592aa0176d10c SHA512 14f86d1158f976e8f0fbf80fb7f5bea74393febc35592bd95806548883b3bc2e77ee55cc300119275ad322f6b8bcfbed84bb6b78a3a19868ce4695a1fb57a029
-DIST plasma-desktop-5.19.1.tar.xz 9369416 BLAKE2B a4187d45e2000c9823785a0fd4100dc0c2c83cda001c6adad80a4368d5fc6e2e44b2d15f87fbef57f09963067f847e870456cf055f7589c0881f8093143f698c SHA512 364f10683f367c7df8bf54658533d252ad5fdcb54773f6cb6c53474cedcdc4acf0c9b2b26266f18d6301f0c4e50addcd3f1fed9efd0d18095852e72c0e8b8172
+DIST plasma-desktop-5.19.2.tar.xz 9357048 BLAKE2B 0928465086aa466c2dacbefdc387306c99ab2bc7f3e8ee3047302ebeb18dcf8b52804e2f5c05f54006002fc5cc010adfdff443d17c8b4ddd3ee8d21370a45934 SHA512 4ef19056060ec6084a4ee127dc27c6e2cea4d84791053271efa3b58fe97577c9852c5274af51d05f06a81497ac1c02de55a1b3bbfb213f6d4f526858867e9428
 DIST plasma-desktop-override-include-dirs-0.tar.xz 7504 BLAKE2B 781a2f0f7ca5a45b966edfc79012e80c6826262a211d95b725590191a8828e0002fd924a49cc63c12090535077a24f3e719ca3277aac89aba3092e86f73d7f61 SHA512 d23dc203b8b645472c9c192a3d73ef9b46c66d9c64df1c90efa05c9968ec125e0a256bc9b654f05a1f22bce4b1d8aad436f581b42d579f4195a44f062fd444bb
 EBUILD plasma-desktop-5.18.5-r1.ebuild 4865 BLAKE2B 87cf5b0e69bda73c0241cb0059e92b2344a87e625479201b683f20edc96f295dc5e80dfc46b234b5a513721d368c53d26d7df56425a434ee41adad44dc46dec5 SHA512 3290f48cf99c6810874e8c152d171770e57ee8d1400a2acb8d67046dab374c33c2ef2d454464e642b0a1f372742f8d79c9f26af2c4f49be31aab7640386edf46
-EBUILD plasma-desktop-5.19.1.ebuild 4550 BLAKE2B 18fdb4f36ae7edfe72d06b040ce46a601ab4dd6da4646c63c0a90d6d2cdadb74bce726659c1a9734f6e469027cb5b19e5a5d1606521223d12c4a6094732f7409 SHA512 2c49d4e77cd63170aa9bb133bcbcd46a25814959136f6dfe7bb5e1d2630edeb50e9538d6d7c1111073a20802d718016ef76aadf3b6b311d579ae51fb235a3c43
+EBUILD plasma-desktop-5.19.2.ebuild 4550 BLAKE2B 2fe4d5325c54410e8079adf93bf1eec11127b724204332ee532dd42f4f136e30d82eda069b999c9eb66dc303e3ae991e0821b2f2c087bec96a56a3155979d14d SHA512 4abc938bf62d3874cce1011e6311d03cd683425f938089c7a9c5bfcb57f8333ba37bef4335f4e22b0834ddfee44f795d3afa7a2b833e196a1ce76b71511304d9
 MISC metadata.xml 418 BLAKE2B f68267099811af01f47317ec163041980f834d34a61f6eb5584969e1172b9fa819a635664a1ec8ec49496a42fe0b27ed0cb0de34485e866836719aa185e2d37e SHA512 537579f9f3c1fe8b457826637da7b8fb5ea46986f2a71d28fb2de29fe010d5b08596059bb59160e36f346ba2fea4df18ad16896c27561528e2e9fef139e64ec5
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.19.1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.19.1.ebuild
deleted file mode 100644
index d638dad061a4..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.19.1.ebuild
+++ /dev/null
@@ -1,157 +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.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma desktop"
-XORGHDRS="${PN}-override-include-dirs-0"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+fontconfig ibus scim +semantic-desktop"
-
-COMMON_DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${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
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/attica-${KFMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${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/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kded-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kemoticons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${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/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-plasma/kwin-${PVCUT}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-	>=kde-plasma/plasma-workspace-${PVCUT}:5
-	media-libs/phonon[qt5(+)]
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxcb[xkb]
-	x11-libs/libxkbfile
-	fontconfig? (
-		media-libs/fontconfig
-		media-libs/freetype
-		x11-libs/libXft
-		x11-libs/xcb-util-image
-	)
-	ibus? (
-		app-i18n/ibus
-		dev-libs/glib:2
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-	scim? ( app-i18n/scim )
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	x11-base/xorg-proto
-	fontconfig? ( x11-libs/libXrender )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	>=kde-plasma/oxygen-${PVCUT}:5
-	sys-apps/util-linux
-	x11-apps/setxkbmap
-	!<kde-plasma/kdeplasma-addons-5.15.80
-"
-
-PATCHES=(
-	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
-)
-
-src_prepare() {
-	ecm_src_prepare
-
-	if ! use ibus; then
-		sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
-			-i applets/kimpanel/backend/ibus/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package fontconfig Fontconfig)
-		-DEvdev_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DSynaptics_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		$(cmake_use_find_package scim SCIM)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-	)
-	if ! use ibus; then
-		mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_IBus=ON )
-	fi
-
-	ecm_src_configure
-}
-
-src_test() {
-	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
-	# test_kio_fonts needs D-Bus, bug #634166
-	# lookandfeel-kcmTest is unreliable for a long time, bug #607918
-	local myctestargs=(
-		-j1
-		-E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.19.2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.19.2.ebuild
new file mode 100644
index 000000000000..24d9e43a7c32
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.19.2.ebuild
@@ -0,0 +1,157 @@
+# 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.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma desktop"
+XORGHDRS="${PN}-override-include-dirs-0"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="+fontconfig ibus scim +semantic-desktop"
+
+COMMON_DEPEND="
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${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
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/attica-${KFMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kactivities-stats-${KFMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${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/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kded-${KFMIN}:5
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5
+	>=kde-frameworks/kemoticons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${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/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=kde-plasma/kwin-${PVCUT}:5
+	>=kde-plasma/libksysguard-${PVCUT}:5
+	>=kde-plasma/plasma-workspace-${PVCUT}:5
+	media-libs/phonon[qt5(+)]
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxcb[xkb]
+	x11-libs/libxkbfile
+	fontconfig? (
+		media-libs/fontconfig
+		media-libs/freetype
+		x11-libs/libXft
+		x11-libs/xcb-util-image
+	)
+	ibus? (
+		app-i18n/ibus
+		dev-libs/glib:2
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+	scim? ( app-i18n/scim )
+	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	x11-base/xorg-proto
+	fontconfig? ( x11-libs/libXrender )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
+	>=kde-plasma/breeze-${PVCUT}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	>=kde-plasma/oxygen-${PVCUT}:5
+	sys-apps/util-linux
+	x11-apps/setxkbmap
+	!<kde-plasma/kdeplasma-addons-5.15.80
+"
+
+PATCHES=(
+	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
+)
+
+src_prepare() {
+	ecm_src_prepare
+
+	if ! use ibus; then
+		sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
+			-i applets/kimpanel/backend/ibus/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package fontconfig Fontconfig)
+		-DEvdev_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+		-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+		-DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+		-DSynaptics_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+		$(cmake_use_find_package scim SCIM)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
+	)
+	if ! use ibus; then
+		mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_IBus=ON )
+	fi
+
+	ecm_src_configure
+}
+
+src_test() {
+	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
+	# test_kio_fonts needs D-Bus, bug #634166
+	# lookandfeel-kcmTest is unreliable for a long time, bug #607918
+	local myctestargs=(
+		-j1
+		-E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index c5b4a1ce4b06..535b8fd519eb 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-integration-5.18.5.tar.xz 57656 BLAKE2B 3cf445f5d84de07e82369a3057a0ac390961634f8926d3491ca8dd0d603d4e4ff9e7487b69c1fbea44a4296c8960f4e3ef677e1bfd183154a36799fc95dbf3c8 SHA512 d217c49555ee17e3b18d006368ec7aa4d8585c05070bcf3a3c7e471b1c7dc830080d0405209979d8a27c7c2fc2adcd3d248e595f43f0b4a2928683f93c6d4b48
-DIST plasma-integration-5.19.1.tar.xz 57552 BLAKE2B d13ccf7c008684176de42df5760bfd32c96766e05af5b7e7a05fc399ce16cc21c7a9790416d35ac6110718196b7cb6477ef8b3523a3f0cbbab00007e1c07dd61 SHA512 0cdd5927ecd42f23a0002de3070b986b75792700e7f959489a6af794df1c46a023ba7051beb3028cf562bcb49f8518dfbcfa7590e78c4cff0502bde5590f3011
+DIST plasma-integration-5.19.2.tar.xz 57424 BLAKE2B 263dbe29784248377705f5148b59e1e882d54ecf352c7d30c439fe5a872f77927692982065684a3a54ef03fcb92e155dbb349ac5f0ac446c7823ab56375b12de SHA512 c7a23cd0b78dbed78c026d4b15d6236b90c876b07a87b086d3ab4b854f43aeae67f0fbd31873984f7e6adf60a86127ed6807cbb0f4ab554046c6e257001154ef
 EBUILD plasma-integration-5.18.5.ebuild 1235 BLAKE2B f1f0e5a637021d9d0ae8c0c3b6680a1f4ac63c8e2e4203bb8936f8693839bde3fa9f7e28082b5a4dca7c2dcabca95f7f18f0bb694e60d79421f10286c4446db5 SHA512 4877687f7608f7a8a1c24e6c8823ef4670ec5307996dcfec8e6682be227bb8e06a29e2c456d1e30f711d76f89855e70250904d3a602f2cbf2e9d45bb93e34dfd
-EBUILD plasma-integration-5.19.1.ebuild 1233 BLAKE2B d0107c7d140271a996f8d48835984d395ec50a2fdbfae52dc820a25717a5140ed2122c234cd7987ce0f1d6f0be36e21ba4fe7deeddf4b05ce48e128a86b090d4 SHA512 24543d8b26fb0140576fee02351e446f49225fa5e07d0169d07154f24c26c2fba3f3be06bc153495f93c5976a0e60cd4013d2b75b4130fe52bf764d46394a9fb
+EBUILD plasma-integration-5.19.2.ebuild 1233 BLAKE2B 386c2fb92043b111ce0d85ea193cf282babf56ad569990609797c903e6e685ad7b13b6c28a30289d1151e89a2ca80066792a89761e2fd5a86bf75aab593b3799 SHA512 c8b7eab77ae8931fcaae1aab2c5fcdabc0fbdffb44c6c0ed7dc6c227f436ac5ace92da079e62559d971eaf1e427f7781874f09b98d1c955692819e7b18f23a7a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.19.1.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.19.1.ebuild
deleted file mode 100644
index dfe49d28e7aa..000000000000
--- a/kde-plasma/plasma-integration/plasma-integration-5.19.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
-
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
-
-LICENSE="LGPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[dbus]
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	x11-libs/libXcursor
-	x11-libs/libxcb
-"
-RDEPEND="${DEPEND}
-	media-fonts/hack
-	media-fonts/noto
-"
-
-# requires running kde environment
-RESTRICT+=" test"
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.19.2.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.19.2.ebuild
new file mode 100644
index 000000000000..6bbac224e581
--- /dev/null
+++ b/kde-plasma/plasma-integration/plasma-integration-5.19.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
+
+LICENSE="LGPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=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/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-plasma/breeze-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[dbus]
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	x11-libs/libXcursor
+	x11-libs/libxcb
+"
+RDEPEND="${DEPEND}
+	media-fonts/hack
+	media-fonts/noto
+"
+
+# requires running kde environment
+RESTRICT+=" test"
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index f037bb901074..a285230727f3 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD plasma-meta-5.18.5.ebuild 3591 BLAKE2B 2bbb63bcbb24f978ebb1c45924f972a9a75ffeb0bcb057724da7ffbd1592b3568a7697f24dc243152d55d6bfe54d429c3cfadff2051b08eae57394ae707bae22 SHA512 aea46e2332c22dced31879348e8d8854f16e4150446a632bd7d51c6cccc8e928e8e54042821239550c1053349e2d9a3bd8841643ea9ae5789288c41a7c8dafa5
-EBUILD plasma-meta-5.19.1.ebuild 3633 BLAKE2B 619bde543f3a0b294fe7d36212ef65857069d28d747db24638dcbe20df8da3426cd7d2af16c9926979c41574d1ab5ec8972f3157007f66049157ec4877b385dd SHA512 3de099db5199fb5ca89648dcf984b7363f07a8fe772b8a588cc1d42677bda8e4643218bff6282a92e8a8bb3ca7975662203c01ef04d7ee5a0096dcf20e2bc13a
+EBUILD plasma-meta-5.19.2.ebuild 3633 BLAKE2B 619bde543f3a0b294fe7d36212ef65857069d28d747db24638dcbe20df8da3426cd7d2af16c9926979c41574d1ab5ec8972f3157007f66049157ec4877b385dd SHA512 3de099db5199fb5ca89648dcf984b7363f07a8fe772b8a588cc1d42677bda8e4643218bff6282a92e8a8bb3ca7975662203c01ef04d7ee5a0096dcf20e2bc13a
 MISC metadata.xml 1963 BLAKE2B 0273adb85723495addae8367af9da0ceb907cf86aa0bf4fbf6289aa291b1b19ecd66f191ee12d62427a5316f0f75d831ee2c0ac0d2b246812a52c476aa95fbb2 SHA512 18f5c9bd29f79478e7c976ff4ab4194de3256e4d7da75cf83fd7c8b4af02d39a4ccc1d85cf672529e17f3cb84fb7ab1226d452d5b669d055e88764d2f8b6e6c9
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.19.1.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.19.2.ebuild
index 08348f247127..08348f247127 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.19.1.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.19.2.ebuild
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index d95f13aa72da..d5a93e12b8ff 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,6 +1,7 @@
 AUX plasma-nm-5.18.5-missing-wireguard-icon.patch 1698 BLAKE2B 37bb63676905746999df50b87e5575d4ec1207dec37848e18216123760d84b577327c20346ede1dba263975253db6bcccfbf4b91167f59aa173b08baffb7e542 SHA512 485e56c592da9f30e5acc94f9f2e8af66989e70aa74ae0b4756dd4e7008729fa1eb1d43dd329983565366937eb7a057a74741b8b456db462cf7f7af00ed1b841
+AUX plasma-nm-5.19.2-fix-inline-password-field.patch 1458 BLAKE2B b169f54b842e38fb077a793778c9a923e2a5df906abd0c29edee7d5279cd81555617b0b70d50953724737d0aa068618bbff9eb341eb3d9fc542cbdcd982db3a5 SHA512 90be93b2a95cd2a69e7d8083d33b7c0ea11a4b09e4396e853f6147b304dc60635274a21ec91e23637c6045813586b6ef52b670d273c1bf29b5abe3a48ed65b39
 DIST plasma-nm-5.18.5.tar.xz 828008 BLAKE2B 557a31d5a0e7886be90e62be3f5328baf4a8bbfeb3e9decf1f2f106f33bef7e64fb886b94691faab57119f231b6bbcff58514d795df75f858ca9c8ea8c1af9a7 SHA512 8f785f257f274fb9384bf2afbe4231a057c46706483e26dd2270a93a6fc97e6198916ff119d258a67d4f8bb73facb0ff67412f43e5fa66812962edb64331db4a
-DIST plasma-nm-5.19.1.tar.xz 854588 BLAKE2B b97a4c4e1136ab508a67ee4f40cac6e704edb0ebe0c5af82ad9bf3abe1c689edca2f3708d449e0a1450ae82fcf914ec4da4508c7778998ef852733b1cd3dbb45 SHA512 d6198e2eb5ebb3dd5d427414371f14161968dc0bf3f8ca681ed2b374e4af6de2f3f4e5f6795493cf53438e609aa5dc524599491708108a1d8924993191a08aac
+DIST plasma-nm-5.19.2.tar.xz 853652 BLAKE2B 0c8a2c67aa24ff29cf43db7e8b8839a487f6a00e99a0277d3dcacfaf22bd01b835380950c6e6a97c6ff10f3120d29e061523fa49acacbb1deb0b3f596d7b276b SHA512 369c8d869b83db86e8c26054c788c44f2b0ca6eebac8f1fec3020ae77f4be62df0fe408fd1c9bc60c23012a75a97546d4f8ffda0483d4acdef1b6e902822d79b
 EBUILD plasma-nm-5.18.5-r1.ebuild 2368 BLAKE2B 6bb2e5feb6f4182e620ae1f410639b9794ba2e175bf053dc74d5efde0db63cfcf13e5b4595c387acacb68c4675c296e74c8de2d9c28c078bb7e263cd33fa4861 SHA512 1825154c7bd0d60f70cc4fe02ef3b1f5b82a9533c56f9bd19ae53d31b2a1c3576e098fffe83b5d8a778765c27b19065643327ba71823e129285d2eb40d6ec078
-EBUILD plasma-nm-5.19.1.ebuild 2326 BLAKE2B eaf2d6a35d1e5494302ef85fb17da80e215c9b091ff93749908f483d2f8e017dcb754498889acda52797ecdc65d2026c2c4ccea16eb9f7bd3b36bb33e0f1a08b SHA512 d95c22e3cc8bb2d94c763087b10efcc9f4f499b6e74e82698463aabac470efd06809f2cf9d4b0789a53d0cead1f44448ab4b30f8c2ec38bc79648723ea79721d
+EBUILD plasma-nm-5.19.2.ebuild 2417 BLAKE2B b7c01127090fdf1528b669382ac8a022285a976be3fbf9dffa6892974b8ebb3d7eddd3655e037f41975a35d384996ce88d29134a70480db755f796ad34f8981a SHA512 4c97ae2eb3bf98aa470871d6fa71ad785c27ed6db1f2a1fc82ee6fbeaca159b57b0c98c8572029d6dec404e801d5fa3244f1a8d604f19ccd33d2d418ecfe5f14
 MISC metadata.xml 479 BLAKE2B 501f2ff581390f3119e9474e1aeafb45f2e13f3cf25650482f39ab38c7fb0e70ac006f269693ef546ef324730f302c454d27d79f0346e43b6f37583ccad1ca93 SHA512 69a8ce09c5a437814562c315dc7ac3142ac6c71906f37a6ea98e7b76fdd332362cfa76e823d0ee1ec920e92c8f7dda2a557071c758e9937886d7df78943b5689
diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.19.2-fix-inline-password-field.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.19.2-fix-inline-password-field.patch
new file mode 100644
index 000000000000..170e20ea2256
--- /dev/null
+++ b/kde-plasma/plasma-nm/files/plasma-nm-5.19.2-fix-inline-password-field.patch
@@ -0,0 +1,30 @@
+From 271332cfc19ede398854113d037abfb35503179f Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Thu, 18 Jun 2020 15:34:40 +0000
+Subject: [PATCH] [WIP] [applet] Fix inline password field component not
+ working properly
+
+BUG: 423093
+FIXED-IN: 5.20
+---
+ applet/contents/ui/ConnectionItem.qml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/applet/contents/ui/ConnectionItem.qml b/applet/contents/ui/ConnectionItem.qml
+index 98240928..06c7ab25 100644
+--- a/applet/contents/ui/ConnectionItem.qml
++++ b/applet/contents/ui/ConnectionItem.qml
+@@ -231,8 +231,8 @@ PlasmaExtras.ExpandableListItem {
+                 if (!predictableWirelessPassword && !Uuid) {
+                     handler.addAndActivateConnection(DevicePath, SpecificPath)
+                 } else if (connectionItem.customExpandedViewContent == passwordDialogComponent) {
+-                    if (passwordDialogComponent.password != "") {
+-                        handler.addAndActivateConnection(DevicePath, SpecificPath, passwordDialogComponent.password)
++                    if (connectionItem.customExpandedViewContentItem.password != "") {
++                        handler.addAndActivateConnection(DevicePath, SpecificPath, connectionItem.customExpandedViewContentItem.password)
+                         connectionItem.customExpandedViewContent = detailsComponent
+                         connectionItem.collapse()
+                     } else {
+-- 
+2.27.0
+
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.19.1.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.19.1.ebuild
deleted file mode 100644
index 27d1a1749c0d..000000000000
--- a/kde-plasma/plasma-nm/plasma-nm-5.19.1.ebuild
+++ /dev/null
@@ -1,82 +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.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma applet for NetworkManager"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="modemmanager openconnect teamd"
-
-DEPEND="
-	>=app-crypt/qca-2.1.1:2[qt5(+)]
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/networkmanager-qt-${KFMIN}:5[teamd=]
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	net-misc/networkmanager[teamd=]
-	modemmanager? (
-		>=dev-qt/qtxml-${QTMIN}:5
-		>=kde-frameworks/modemmanager-qt-${KFMIN}:5
-		net-misc/mobile-broadband-provider-info
-	)
-	openconnect? (
-		>=dev-qt/qtxml-${QTMIN}:5
-		net-vpn/networkmanager-openconnect
-		net-vpn/openconnect:=
-	)
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)
-		$(cmake_use_find_package modemmanager KF5ModemManagerQt)
-		$(cmake_use_find_package openconnect OpenConnect)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if ! has_version "kde-plasma/plasma-workspace:5"; then
-		elog "${PN} is not terribly useful without kde-plasma/plasma-workspace:5."
-		elog "However, the networkmanagement KCM can be called from either systemsettings"
-		elog "or manually: $ kcmshell5 kcm_networkmanagement"
-	fi
-}
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.19.2.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.19.2.ebuild
new file mode 100644
index 000000000000..4d75d3c41a75
--- /dev/null
+++ b/kde-plasma/plasma-nm/plasma-nm-5.19.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma applet for NetworkManager"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="modemmanager openconnect teamd"
+
+DEPEND="
+	>=app-crypt/qca-2.1.1:2[qt5(+)]
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/networkmanager-qt-${KFMIN}:5[teamd=]
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	net-misc/networkmanager[teamd=]
+	modemmanager? (
+		>=dev-qt/qtxml-${QTMIN}:5
+		>=kde-frameworks/modemmanager-qt-${KFMIN}:5
+		net-misc/mobile-broadband-provider-info
+	)
+	openconnect? (
+		>=dev-qt/qtxml-${QTMIN}:5
+		net-vpn/networkmanager-openconnect
+		net-vpn/openconnect:=
+	)
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.19.2-fix-inline-password-field.patch # KDE-bug #423093
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)
+		$(cmake_use_find_package modemmanager KF5ModemManagerQt)
+		$(cmake_use_find_package openconnect OpenConnect)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	if ! has_version "kde-plasma/plasma-workspace:5"; then
+		elog "${PN} is not terribly useful without kde-plasma/plasma-workspace:5."
+		elog "However, the networkmanagement KCM can be called from either systemsettings"
+		elog "or manually: $ kcmshell5 kcm_networkmanagement"
+	fi
+}
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index 29625a142f6f..77add680b34d 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-pa-5.18.5.tar.xz 105148 BLAKE2B 19b79ead20bc54d6f1e8f515980590f402c00a3c3e82841c66e8cece4f9bb90e87a7a5bf0c02afaf5e7bbfa3715c418301926120d4cd69d94d4c3dc54b8de0cd SHA512 fff3049d4879e4f6fe428985dd14f91fa6bac8fe2e7c696ee1424d610038f61fd7eda2621bfd2c2643529956f7986b59c9eead1ceb79e1cfb1397fa52b470376
-DIST plasma-pa-5.19.1.tar.xz 108508 BLAKE2B 93b7f7052a84dac0e302724412ab388712c9686516fe792e61cee68df8d0d98acf85a942c6dd015a956e5fa53f8c8fc9ccede9b689db92a3f67de895b9889545 SHA512 d09319c2f72f1c748d86922e28f4f9c88dd70e0d594e6171ad49fb1fcab73dee4e670f77830d2713cfa9c80642de26c497b3f2ca28bf33416881e8b850ff5b77
+DIST plasma-pa-5.19.2.tar.xz 107988 BLAKE2B 495239a07ebbeefdcf8175e79a2de5c3691eb61469c4be5f09503266ae9d27c698c91e886094e35f00082dfee85febff44d7f97328191aad56eefce3e6087c68 SHA512 9087d3579e63e1fbd14fa085c59e13ffd108abd99325be2432c81ff1445b8ca6c30270c4cb3bd0f1d28533934446b45294ac30a5129f6633df4c3d680eddc699
 EBUILD plasma-pa-5.18.5.ebuild 921 BLAKE2B f91d1a72122c2e6f7e2615c64fec080bb8bd2ea9e1430f87b831af844bd925ef2be813d0a610f5ba6bea709978a71e74c9b2d5beac57224a87323cd5ecf07c78 SHA512 b22214bda000bb3eff9743e3f7f8dd5b2b73b7bdf932aefe34fd38309e8f212929bd36b5c3f775ffcda459e7b2841ab96cfcaa7f19f8cd8ca164a183358ac9f3
-EBUILD plasma-pa-5.19.1.ebuild 919 BLAKE2B 9cc0c5fe369525203a357ec55220a8e9352f595ead4b17422375a7c4b9170ce32de48bc1663adc76be8866c9e59e35d5a50ebd5b2046ba3f0088d97b6d757b8b SHA512 7e96b10c728014d2059b5522cff585836ec835a1dfcb49a57c17f9c423b8b0c76490217217cf50b9e1306f4dfb99cf64e9aad106647434c6f7a099850fd3c1df
+EBUILD plasma-pa-5.19.2.ebuild 919 BLAKE2B fbd93a2c86c2323fe84816b0f8f23d41783cad519b3f417d26ff05de00996fae89425fcb27e28cd0428e612abcaf1f6d3fe994752644e4b4c0fc142fbc726101 SHA512 4dca71991d79ef99ecb74fc7882e2772da359ab4b340c47be5598d1e468c5ac0f8ec631bca030903d83e701021ccf69d575ac9eb8cc6df157597841818aa20ae
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.19.1.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.19.1.ebuild
deleted file mode 100644
index 121c7f28463c..000000000000
--- a/kde-plasma/plasma-pa/plasma-pa-5.19.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_HANDBOOK="forceoptional"
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-libs/glib:2
-	media-libs/libcanberra
-	media-sound/pulseaudio
-"
-RDEPEND="${DEPEND}
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	media-libs/libcanberra
-	x11-themes/sound-theme-freedesktop
-"
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.19.2.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.19.2.ebuild
new file mode 100644
index 000000000000..95d2efb031da
--- /dev/null
+++ b/kde-plasma/plasma-pa/plasma-pa-5.19.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_HANDBOOK="forceoptional"
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-libs/glib:2
+	media-libs/libcanberra
+	media-sound/pulseaudio
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	media-libs/libcanberra
+	x11-themes/sound-theme-freedesktop
+"
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index e2f3a8d197a4..ecfbe3af87e9 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-sdk-5.18.5.tar.xz 263084 BLAKE2B 575235302ade4bc1bcfdcef33f9fd3cc4175d4362aaabd2a3bc8e7d7235d90f3c2f81c8b499e486c0f68e029b298e4879707ebb1d23052230c2403e825d5943e SHA512 1051aa84d70d7a02d3392d3b1628b1fb4d4b666efca6e34f0688dc0015b983527039bd52140cf17f947f2d266cacb63aab7c9b547e6679a0aab094e74c1783a1
-DIST plasma-sdk-5.19.1.tar.xz 263740 BLAKE2B 1f8ab44173655d35d4342e6b3982ee44993a670ce929fbda956b89c8deb25631c6f4cf9fb2f8ae3c07f2aada2b2158e12c195b762ccbd9a9cdce61a155868c50 SHA512 4e007244638e8f413e12b934ea0bdf6437fe35b6f8b37f6770fd6b1ab9a4c63fc6c8fccdba8b6c058202ad65ca8a18701c9d8abb5564429b247c823a6daba690
+DIST plasma-sdk-5.19.2.tar.xz 263480 BLAKE2B 2f27f26855323fb443b6a9020aaece143817e9f503c7769b7672009fb859c45b0a196a39327657bbf0425bd96b7ee3f1cef2be45a87965fa6afd62f882856bf8 SHA512 f3e364a6c834c3627385ea9c79a77e5c6da3a2718da36c30d7b4ee91df24edab4edae17b1015606016e1c36ab49e42e089236b3909ccb753d759758ab9ed6759
 EBUILD plasma-sdk-5.18.5.ebuild 1254 BLAKE2B 85b6ae2b9ca81257af4d98c697d33ddb57e5a62caf9f7f24afb4b35b6ba614f2920b39c0d0434fabce334802eef716262f4ffda8a9f183688bd36b66923befc6 SHA512 a2840b282743e897f7c5d0e67564a7310cdc622fee4187580e99578c63a5a9e86acb9af405895f29f6effdc4818c0b3526e406b6c0a0a0ac09d6ad3f7db14e76
-EBUILD plasma-sdk-5.19.1.ebuild 1252 BLAKE2B 85472bf6b5c28664df292f7f3d90f4ae0f1d84b58b1df2181c9fb99c14c56e68e5b44ba6db294109d1c138a0c728470706485e459df8b3481250f934c77989c4 SHA512 d0ea37dcbb7f5c12c9b9e3ed2d31077372c97a9656e50d48487ef8f4c597afb93d9245273db55f9fa92bc8fdb5d16d615687db232d3d02970b0c9287842984ea
+EBUILD plasma-sdk-5.19.2.ebuild 1252 BLAKE2B 24ef25e71a9869f9f6671f6dea3a67723d8738b3d825ab031c15087004bb0ea76b0ae41b5d1f548305112a5e235256eb8fe638294896c0c4a129ba3da91005b4 SHA512 914a754aea58f17067dbfbb5aa33b958c844cce3eb6bbe6c50bb68519f31bbb2433c15920b3c428a9d1afaa0c3012a7fdf54381fee3386a8974161c458f102d0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.19.1.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.19.1.ebuild
deleted file mode 100644
index 1bc696900ce8..000000000000
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.19.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="optional"
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Useful applications for Plasma development"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${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/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-"
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.19.2.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.19.2.ebuild
new file mode 100644
index 000000000000..12cb9227b8c9
--- /dev/null
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.19.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="optional"
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Useful applications for Plasma development"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${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/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+"
diff --git a/kde-plasma/plasma-thunderbolt/Manifest b/kde-plasma/plasma-thunderbolt/Manifest
index 56b2abdecef9..cdd1b24888eb 100644
--- a/kde-plasma/plasma-thunderbolt/Manifest
+++ b/kde-plasma/plasma-thunderbolt/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-thunderbolt-5.18.5.tar.xz 51248 BLAKE2B e87339f2d81bfcfb60e02284e1e57aa17b1a01844cd4e0157b3b10b1bee4d4de5b02378b15c750977350a768f2c5c2f01e629405c358afcbad0765d1c7943598 SHA512 4768a69abc474b9daa2c3f880ef12829ce4804a44b4502b31e083802a5ba4406ac52001fb397415958cd52d7f76aa7dc54f8945665957a8a5557ca93e345ff76
-DIST plasma-thunderbolt-5.19.1.tar.xz 51228 BLAKE2B 8fe58c4c9ea87be4a434e806a3a4016ca8c8371fe05e19fc6bea99901c6632a20985fae7b8d5698f58a4ae8e21b592890c6a3188f29c94975028936bdb4b5ae8 SHA512 edf523947bcef593a25846bd9ff7d497d629e4283f4cd35c5bfb294cecd07dfc338cb0e7284ba7fc6ee4a39b50e8457968716689e1878e9e3ebbd0692ff12fb2
+DIST plasma-thunderbolt-5.19.2.tar.xz 51292 BLAKE2B 0d4977df1b59e02bbc2e77d8c26adf36e16d396fc7b2f007f422aaba56e36a4caf8231e0eaba4d49b69b8bdcbf45e111488222625699e8713f2ece271894e4c5 SHA512 451b581739eb0fda2e4809bdd4e4d1045c532996f52e9367a82c0b4f606096f3c5b8647a0769198757873646a3f7c83b5167f608a7e198bfee3777206b2d33f5
 EBUILD plasma-thunderbolt-5.18.5.ebuild 776 BLAKE2B b25cc92413af7084f906f1e2fb7c6d504274667b34a06277b864ce0fe050d14da49319621a2117a2ea55102a5f2b820d2d39307a10c0d3fb4cfee9bafa17685b SHA512 e68c4c104dea6c3de072b40790526b39ecacbae0c1663d756711429c9e7cf91de2e305c1438c9c03894ee0816f49676317906d3a749f278bd5bb39cea52ecf26
-EBUILD plasma-thunderbolt-5.19.1.ebuild 816 BLAKE2B 47f13b07536e151fa9ebb9afa2e05ae20431104b5acf4c1a1cce7c75f5b33e57f63e9be8a5a5d054e26fcebf64c210c4a8f677473c376dcf9790985cfaa7eb89 SHA512 62d7a2f2fccb15f080aef1a1bf7bd07e7130f127658e9a09c8f7f973a4e33b39a2b702e650cfaa900d982c8601678cb1e01561c36df3ba1b0825d717efb2a9a7
+EBUILD plasma-thunderbolt-5.19.2.ebuild 816 BLAKE2B 8768e1f6b6d46ab4aaaf20a20c477e0fc21e2602255c70f0aea46bae03c1478dfd69bf073ff4da6a1631abe256d2a7b9a649da760e4ff3a9fc14d7dc4a8d0d87 SHA512 4b0219130a0282981c2e03ae4c707eceaee08f13ffedd04076a941747ced3574efb4e0d54b35a6b89fe6aa9074d310e0fd8fcf1ea006c44d14952e063cd818ae
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.19.1.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.19.1.ebuild
deleted file mode 100644
index dd16236206c6..000000000000
--- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.19.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
-
-ECM_TEST="true"
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Plasma integration for controlling Thunderbolt devices"
-HOMEPAGE="https://invent.kde.org/plasma/plasma-thunderbolt"
-
-LICENSE="|| ( GPL-2 GPL-3+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	sys-apps/bolt
-"
-
-# tests require DBus
-RESTRICT+=" test"
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.19.2.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.19.2.ebuild
new file mode 100644
index 000000000000..c182c1819267
--- /dev/null
+++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.19.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="true"
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Plasma integration for controlling Thunderbolt devices"
+HOMEPAGE="https://invent.kde.org/plasma/plasma-thunderbolt"
+
+LICENSE="|| ( GPL-2 GPL-3+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	sys-apps/bolt
+"
+
+# tests require DBus
+RESTRICT+=" test"
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index c982c5cd44ef..e947f3e35639 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,5 +1,6 @@
+AUX plasma-vault-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch 1928 BLAKE2B c7fc121bd0956d00f51831e92f7178f134cd777f50529a9f3269ee7248e2c984f44285b870f57b7e8252c3a7a74affcd0b0d5bcea8948d6e9e0c1c68c3e536cb SHA512 2dfeaa620444df7d6f5a36c9a4957c9783b8f37c2c75576a21712558b81f7b027f5753aa5b62560045476e26de822f0047d3670c8b3560d8f1606ed169b0e6c9
 DIST plasma-vault-5.18.5.tar.xz 136900 BLAKE2B 29b538760dbfae8cb83d820d51101bbf27436e46cff034fbc9b7541998ed6bc1870435d7fac9894b7bf105e173121e791c9d387a3c5c9476dfddc3a4b335e072 SHA512 66fcd87dee7e696aa0f5fa41adcb41134bb0da1ee9920f51057ee8729f8d88052b28f4e422795fc229767b7861226d1386086748afb356f4cb7281c1da4af7e8
-DIST plasma-vault-5.19.1.tar.xz 144888 BLAKE2B 8a9db49fbad1ae99f61aab841f7d2c29c632149bbda0b2d0827b01cdb75122ef4bc8fdef58182794b13286c3edc4ba61a56f17bb2b08510827206a6ad4d40007 SHA512 fb891dfc754572bf430a8ed812555e3c6da5141d04309aee9ad440831dceb808ad4a9b8344931b5c48073c0d7a840e91b1ca93f6bebcb8bc648a312b8e17c20d
+DIST plasma-vault-5.19.2.tar.xz 144952 BLAKE2B fc229de526e851af62e9382e3c6cfb1d54cc8bd8b97fe05798773b21c3f90f8b7b1e35412202fdd459ac7702af3a9e4ff050f3f6cd1ef82493cb4a2d7b3a2e0a SHA512 a2953087462bc68914a5ef6cf0b9fbe5bc35b0ccd86138542a0cecec91f996f5e7ea02f2ad8643bbe24b90649e9d39486feb014ff4d55d8b240f70de843c0e12
 EBUILD plasma-vault-5.18.5.ebuild 1229 BLAKE2B 3820124d691b0eb7422dd9967facc5c0a500e1bca599c5c295dc521a0d9d5e546b1613015679307cf0c65a5db0f92a6b60d396ed5f2c40f4cadaf3dea1b7d13f SHA512 7459542ca31413e9b88f3f9fb096757a5d699dda153839610d9b74a24f60ede9523715b267c76031502e6e48f2b809482a3577e774ed4c316780ad048c064a11
-EBUILD plasma-vault-5.19.1.ebuild 1227 BLAKE2B 9c5571a40b6e74308c6040a90739c642d5e0531da8cebd4ae5a487569b8f331291da95fcdcb66218a6f6b3c822c6c3e92d97ff7f278f0c88219d32570932336f SHA512 79f12f2797fb83c8fb0b38eb3b334e888cf3c1eafa21a1e73d73d57a25018de1362db4600d7e3199022a17cd4d94fc174885aa9765f3cc22db87fa1ad29ef1ed
+EBUILD plasma-vault-5.19.2.ebuild 1328 BLAKE2B c4e178e0ee023f0aeea99ded2ab0f77f435d8b06144094def5ead26825eb2a76b2e0e70ef413abac31dfe61c332991d4b7988e0f634b24f124a5bf3973fd5465 SHA512 aee6d5ea72df194fef42a535fc4c64874c7bb17b7aac67092074142ffd078001b929e50960b60be227538500a640eeae4267c1e0836a7959c3d785396c97c124
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-vault/files/plasma-vault-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch b/kde-plasma/plasma-vault/files/plasma-vault-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch
new file mode 100644
index 000000000000..9e5785d9d527
--- /dev/null
+++ b/kde-plasma/plasma-vault/files/plasma-vault-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch
@@ -0,0 +1,57 @@
+From f8f7179824f5540ee64900d20af39dfc9bacd490 Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Sun, 14 Jun 2020 09:09:48 -0600
+Subject: [PATCH] Port applet to use PlasmaExtras.PlaceholderMessage
+
+The Kirigami version uses QQC2 elements which don't respect the plasma
+theme and color scheme, leading to thing slooking out of place
+especially when using a dark color theme or scheme.
+
+Depends on https://invent.kde.org/frameworks/plasma-framework/-/merge_requests/13
+---
+ CMakeLists.txt                      | 6 ------
+ plasma/package/contents/ui/main.qml | 4 +---
+ 2 files changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e7aa0df..bc7c260 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -66,12 +66,6 @@ if (KF5NetworkManagerQt_FOUND)
+ endif()
+ find_package (KSysGuard REQUIRED)
+ 
+-find_package(KF5Kirigami2 ${KF5_DEP_VERSION} CONFIG)
+-set_package_properties(KF5Kirigami2 PROPERTIES
+-    DESCRIPTION "A QtQuick based components set"
+-    TYPE RUNTIME
+-)
+-
+ include_directories (
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/common
+diff --git a/plasma/package/contents/ui/main.qml b/plasma/package/contents/ui/main.qml
+index 22c7428..bfac7a9 100644
+--- a/plasma/package/contents/ui/main.qml
++++ b/plasma/package/contents/ui/main.qml
+@@ -26,8 +26,6 @@ import org.kde.plasma.plasmoid 2.0
+ import org.kde.plasma.components 2.0 as PlasmaComponents
+ import org.kde.plasma.extras 2.0 as PlasmaExtras
+ 
+-import org.kde.kirigami 2.12 as Kirigami
+-
+ Item {
+     property var vaultsModel: plasmoid.nativeInterface.vaultsModel
+     property var vaultsModelActions: plasmoid.nativeInterface.vaultsModel.actionsModel()
+@@ -77,7 +75,7 @@ Item {
+ 
+             interactive: false
+ 
+-            Kirigami.PlaceholderMessage {
++            PlasmaExtras.PlaceholderMessage {
+                 id: noVaultsMessage
+ 
+                 anchors.centerIn: parent
+-- 
+2.27.0
+
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.19.1.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.19.1.ebuild
deleted file mode 100644
index 03c0886e44e2..000000000000
--- a/kde-plasma/plasma-vault/plasma-vault-5.19.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
-
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Plasma applet and services for creating encrypted vaults"
-HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
-
-LICENSE="LGPL-3"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="networkmanager"
-
-DEPEND="
-	>=kde-frameworks/kactivities-${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/kio-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	|| ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package networkmanager KF5NetworkManagerQt)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.19.2.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.19.2.ebuild
new file mode 100644
index 000000000000..954b81f723f0
--- /dev/null
+++ b/kde-plasma/plasma-vault/plasma-vault-5.19.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Plasma applet and services for creating encrypted vaults"
+HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
+
+LICENSE="LGPL-3"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="networkmanager"
+
+DEPEND="
+	>=kde-frameworks/kactivities-${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/kio-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-plasma/libksysguard-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+"
+RDEPEND="${DEPEND}
+	|| ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch" # KDE-Bug #422684
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package networkmanager KF5NetworkManagerQt)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index 46968596e1e1..580286d68711 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-workspace-wallpapers-5.18.5.tar.xz 37110292 BLAKE2B 34dcfad8d3d47a32b63a3d002cd3ce4c59a4b5127002df4c5a39c7df4296890ef59713fbe4c52693ce728aa7a349ffbf3c133a28699f314791e485b28cbdda95 SHA512 75d5042fd955849cb67b1f7711b2e3e63d03ece7aacd4fc88bcd8c8652ca40a62351c1666b9c86275d1b495fa73d0089e8046dc1f65fc6fb23d9010ddc6f514e
-DIST plasma-workspace-wallpapers-5.19.1.tar.xz 41824612 BLAKE2B b7ecdcddd5b9a32f2874a102e582eb2a178d4cab9568e0449280f6357f62b1ea74c8850615ad5921687bb088676fcd9d9ac2f72d0fbd445f8bfcf857ed8548a9 SHA512 106747fc8554cf36c58792b71074efc1c46bc0216407bf86fe54a897f15ab1e37c3e0ddbc1e85450ca158dad720167144d3a2c8f08739873af7cbd965ea5951c
+DIST plasma-workspace-wallpapers-5.19.2.tar.xz 41824496 BLAKE2B 7c3f272a73e00f9c4020e280489782c504e26c0531c17e1132abac5ccfadddd4a4e239f50d91fa1f81a53d842291393f82d1790fed230eda31b53e481d8bc2a5 SHA512 8c5abcce71202a1c6ed6d95a57bcde9d5bad1e2a621eae2ac897796c8b15deb0e70a6f67bcc60b4e794b0a2896a0fbd25b2348c26935f786dfb29cc8885792b6
 EBUILD plasma-workspace-wallpapers-5.18.5.ebuild 348 BLAKE2B c449bc49a75155acc1348de26718af57f8bcc58c75effd5102f471f4b6acfd43a969d4a4cca058d3aea144dcc3d8dd133f22b52ff20ef2f10b5e73d53ca642a9 SHA512 0b1b68aa9a5b5c0f2b4964f71b1ff59f2cb2f1f6a542f6c3182b8ec838ee3d6778d5bbc99b665363a7e68a1247fac50d8c17184f90e1e0a99427a3b718c39412
-EBUILD plasma-workspace-wallpapers-5.19.1.ebuild 346 BLAKE2B 7eebffe9432178fac49f4ebb1b22d64906da2c3d44394c1eb325a66c682d7a2c3c3db4b1c5afaf9987e25315b879e98717a7e0f70d2c31047d8ba476d859558c SHA512 ff1cfd0d40b519f0527dfa4b85cb048a8ef2b7e8fcee7d45b29faf44d351cdc9cd2eea5808a6e679c8920e04f4abfcac09929d900f170cf851a4431ce77e781d
+EBUILD plasma-workspace-wallpapers-5.19.2.ebuild 346 BLAKE2B 7eebffe9432178fac49f4ebb1b22d64906da2c3d44394c1eb325a66c682d7a2c3c3db4b1c5afaf9987e25315b879e98717a7e0f70d2c31047d8ba476d859558c SHA512 ff1cfd0d40b519f0527dfa4b85cb048a8ef2b7e8fcee7d45b29faf44d351cdc9cd2eea5808a6e679c8920e04f4abfcac09929d900f170cf851a4431ce77e781d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.19.1.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.19.2.ebuild
index 34c486b8fe6e..34c486b8fe6e 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.19.1.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.19.2.ebuild
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 7ee551d229f2..f75a10c1db78 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -3,8 +3,9 @@ AUX 10-agent-startup.sh 2139 BLAKE2B 7ea9ee0e6d949eecbdfbc41bd0286919094b6d6837e
 AUX plasma-workspace-5.14.2-split-libkworkspace.patch 1100 BLAKE2B 7583bed4a71867de37c9741416d9a9711e2e8a9a26f5f50e826ec74a1b8efc03d4a592b06ca24df525381d7f98870329082cbafd86e1b29797ca68e78c928d81 SHA512 07a80880960719106ddb65d3b55fba5af7a71829dcb91bd9ae6bc1531ad019aeece968e01f243625f7fea2b34081590d317528797833fd9485b95cb1fd3f001d
 AUX plasma-workspace-5.18.5-sddm-theme-prevent-logo-leaking.patch 3503 BLAKE2B 360e27d03d8429d7d2b1c11f9b40ac0049108ab0461e9428cb5f2fe67241708190796d3a60a503e0ab1903dee61c27dfe7d2a187e36032518632a4966fe10215 SHA512 f7367acf43a4c3aed20ee42853fb0657f64182222a208511f97657b734a430eb8d24c6cf10b6a276ae3313d791938905abbc33387adc272725addc606a86f482
 AUX plasma-workspace-5.18.5-stop-multiplying-duration-values.patch 3899 BLAKE2B 434e8c1df5bac91b68085258641194a9ced7fbbaa35f7a97bc29a1921d00dd59c0a39fed948325d7d686c075514c9621391b1000869bd93de266cb179f538b6d SHA512 24927936b7940bf181c05a87a95e4b6d87f1658b9ab94cb980f0fc697b4cbd2fdbf8a7a141413c1bad6d040408ff24b419a44a3a404bc02accfaf9d9250cb110
+AUX plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch 1780 BLAKE2B 1462650fed75b2b33c945e34281cfec1304f9d325a41deeeea5d0030d5469f270e7d2c50cab3b897298229f9c285c335c37f9a5d330d8a19e15da7711a403b50 SHA512 c7fb22f77a8841450c1c6c3f448401bfa29f5ca4bd58d30674dae29b7acc8db9ac367f4eac2cd1dc151893dea526c167744ae2a52d08797d0e8bba8486224bbc
 DIST plasma-workspace-5.18.5.tar.xz 5696256 BLAKE2B 7aaf19ff75eb796bbd687e6c63b9703431ecc567bc52c2c173718d45b3946b22572b3a097f7fb7e9726cedcb98cfbb2f20c580efefa4d9cb9d4f2473abeac636 SHA512 870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2
-DIST plasma-workspace-5.19.1.tar.xz 5683020 BLAKE2B 34d4ac284e35f3bdb56895f4df10345ca1f1c9c100eee77e7d73a8e6c6960d15ae60aadd3ce24a39be65ae54b49b964ac27f9c88c8fa2ac159d7ee8d44f1a51b SHA512 9e8a8af8bbfae07472363386aec41a76c7ea5d5242ccb376a276d546b819f3d28dd6961630c5e38026256a4ca219bdb1d86fe49eecc572327451b28f3c94e692
+DIST plasma-workspace-5.19.2.tar.xz 5676488 BLAKE2B cc7a5a156be2e98a4ddc7e8e80a286844f8438b2d17b79dd5dadd24cb28681b80255bad84c118949a815c47080afab380b81edfc3ba59b43f7b24c916cd62e9d SHA512 1c82ee7e1ea27c37c321487bc7bf109c451b3b966d795c7c3102a21e1bfb75bbd83e0ff2fda76e76ef838af3a054aa81a7aa8f89f789dfc16a234d1db3e03c77
 EBUILD plasma-workspace-5.18.5-r1.ebuild 7241 BLAKE2B 7a1ea14452de71a0d514f8ad75f489ea9a9b549517cc1c51b91cf319c91de6988869fe9b1c962cf0f79a64129464f98410e5e63198c828bb2d0c8f61e739a775 SHA512 8e91e8b6e377aafd493fc6a1b64a797f6ac4a0433f9feeab945e1c48b6146e54fa625720b0995b00f4cf88f49e85af5818234c2088413eb024d65567eb4b6fe2
-EBUILD plasma-workspace-5.19.1.ebuild 6832 BLAKE2B 2ca79d4158d8f1e40b3b936ef64d11e1279c10d8be044576e81ae081ae5b670d98c0ce19f154d4811f598f64dbb7d268b4708a5b4b485a4f9f7990a239e01bb8 SHA512 e553e2c25051163f1cf6c778a199dc5e8e6efef61342adf5ce5fb07c9e0cfec48e87d1cbbff43bad4b80d4f7e6e8223758f0f986f7a4497d5752a9849b90e8a5
+EBUILD plasma-workspace-5.19.2.ebuild 6921 BLAKE2B eef3641660a3c61f611a0684be2476b47236d41af62dae940ea72e3f3af7a6509fece72ccd13e6512be0adb67aa6557bf1c27926c5633e166abbb9ba1a88dd17 SHA512 21954eeb5475c9d4c4b610d532529863a43a07996bed1fef572df75181d84260ee5324bc4d97865c2ade80373297f561669f7e295d19224b8c052b4a74b7943f
 MISC metadata.xml 752 BLAKE2B cd21241fe0de70e075d26290b647b72126b451e8da5f174c5b3616fe4c509fa7cc2beb090ad05e1eef6d4357ac5fa2b6c2425cc71403e0ff576611bf6916bbda SHA512 cc8629cb747580ae01c0fd102859055f93fd70b0d515e646e03e5d832447a0a4ae663f86cfa756b7c30ce7d49a29a513da8a243cfdfcfa1cff0f84234699097e
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch
new file mode 100644
index 000000000000..527e199cc66d
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch
@@ -0,0 +1,44 @@
+From faef126255222f727219bf69ac2b89857dc61ab2 Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Sun, 14 Jun 2020 09:08:21 -0600
+Subject: [PATCH] Port applets to use PlasmaExtras.PlaceholderMessage
+
+The Kirigami version uses QQC2 elements which don't respect the plasma
+theme and color scheme, leading to thing slooking out of place
+especially when using a dark color theme or scheme.
+
+Depends on https://invent.kde.org/frameworks/plasma-framework/-/merge_requests/13
+---
+ applets/clipboard/contents/ui/Menu.qml                          | 2 +-
+ .../notifications/package/contents/ui/FullRepresentation.qml    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/applets/clipboard/contents/ui/Menu.qml b/applets/clipboard/contents/ui/Menu.qml
+index 0bd6064a5..cac8380db 100644
+--- a/applets/clipboard/contents/ui/Menu.qml
++++ b/applets/clipboard/contents/ui/Menu.qml
+@@ -55,7 +55,7 @@ PlasmaExtras.ScrollArea {
+             onAction: menu.action(uuid)
+         }
+ 
+-        Kirigami.PlaceholderMessage {
++        PlasmaExtras.PlaceholderMessage {
+             id: emptyHint
+ 
+             anchors.centerIn: parent
+diff --git a/applets/notifications/package/contents/ui/FullRepresentation.qml b/applets/notifications/package/contents/ui/FullRepresentation.qml
+index b34dee7af..989cb4341 100644
+--- a/applets/notifications/package/contents/ui/FullRepresentation.qml
++++ b/applets/notifications/package/contents/ui/FullRepresentation.qml
+@@ -585,7 +585,7 @@ PlasmaComponents3.Page {
+                     }
+                 }
+ 
+-                Kirigami.PlaceholderMessage {
++                PlasmaExtras.PlaceholderMessage {
+                     anchors.centerIn: parent
+                     width: parent.width - (units.largeSpacing * 4)
+ 
+-- 
+2.27.0
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.19.1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.19.1.ebuild
deleted file mode 100644
index f7be49afa76c..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.19.1.ebuild
+++ /dev/null
@@ -1,218 +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"
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma workspace"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd telemetry"
-
-REQUIRED_USE="gps? ( geolocation )"
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5[jpeg]
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	>=kde-frameworks/kauth-${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/kded-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kidletime-${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/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kpeople-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-plasma/kscreenlocker-${PVCUT}:5
-	>=kde-plasma/kwin-${PVCUT}:5
-	>=kde-plasma/libkscreen-${PVCUT}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/xcb-util
-	x11-libs/xcb-util-image
-	appstream? ( dev-libs/appstream[qt5] )
-	calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
-	geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
-	gps? ( sci-geosciences/gpsd )
-	qalculate? ( sci-libs/libqalculate:= )
-	qrcode? ( >=kde-frameworks/prison-${KFMIN}:5 )
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	app-text/iso-codes
-	>=dev-qt/qdbus-${QTMIN}:5
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtpaths-${QTMIN}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-apps/kio-extras-19.04.3:5
-	>=kde-frameworks/kquickcharts-${KFMIN}:5
-	>=kde-frameworks/kdesu-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-plasma/ksysguard-${PVCUT}:5
-	>=kde-plasma/milou-${PVCUT}:5
-	>=kde-plasma/plasma-integration-${PVCUT}:5
-	x11-apps/xmessage
-	x11-apps/xprop
-	x11-apps/xrdb
-	x11-apps/xsetroot
-	systemd? ( sys-apps/dbus[user-session] )
-	!systemd? ( sys-apps/dbus )
-	!<kde-plasma/plasma-desktop-5.16.80:5
-"
-PDEPEND="
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" )
-
-RESTRICT+=" test"
-
-pkg_setup() {
-	ecm_pkg_setup
-
-	local md5
-	local srcfile=/etc/plasma/XX/10-agent-XX.sh
-	local newdir="${EPREFIX}"/etc/xdg/plasma-workspace
-
-	if [[ -f "${EROOT}"${srcfile//XX/startup} ]]; then
-		md5=$(md5sum "${EROOT}"${srcfile//XX/startup})
-		if [[ ${md5%% *} != 90caaabb40b56bfbe65388841a6dd6ca ]]; then
-			elog "Existing modified ${EPREFIX}${srcfile//XX/startup} detected."
-			elog "Copying to ${newdir}/env/10-agent-startup.sh..."
-			cp -v "${EROOT}"${srcfile//XX/startup} "${T}"/ || die
-		fi
-	fi
-
-	if [[ -f "${EROOT}"${srcfile//XX/shutdown} ]]; then
-		md5=$(md5sum "${EROOT}"${srcfile//XX/shutdown})
-		if [[ ${md5%% *} != d7bffa0273f92abd999c7c3c43dbc23d ]]; then
-			elog "Existing modified ${EPREFIX}${srcfile//XX/shutdown} detected."
-			elog "Copying to ${newdir}/shutdown/10-agent-shutdown.sh..."
-			cp -v "${EROOT}"${srcfile//XX/shutdown} "${T}"/ || die
-		fi
-	fi
-}
-
-src_prepare() {
-	ecm_src_prepare
-
-	if [[ ! -f "${T}"/10-agent-startup.sh ]]; then
-		cp "${FILESDIR}"/10-agent-startup.sh "${T}"/ || die
-	fi
-	if [[ ! -f "${T}"/10-agent-shutdown.sh ]]; then
-		cp "${FILESDIR}"/10-agent-shutdown.sh "${T}"/ || die
-	fi
-
-	cmake_comment_add_subdirectory libkworkspace
-	# delete colliding libkworkspace translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_xembed-sni-proxy=OFF
-		$(cmake_use_find_package appstream AppStreamQt)
-		$(cmake_use_find_package calendar KF5Holidays)
-		$(cmake_use_find_package geolocation KF5NetworkManagerQt)
-		$(cmake_use_find_package qalculate Qalculate)
-		$(cmake_use_find_package qrcode KF5Prison)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	# default startup and shutdown scripts
-	insinto /etc/xdg/plasma-workspace/env
-	doins "${T}"/10-agent-startup.sh
-
-	insinto /etc/xdg/plasma-workspace/shutdown
-	doins "${T}"/10-agent-shutdown.sh
-	fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
-}
-
-pkg_postinst () {
-	ecm_pkg_postinst
-
-	# Clean up pre-5.17.4 scripts
-	if [[ -e "${EROOT}"/etc/plasma/startup/10-agent-startup.sh ]]; then
-		rm "${EROOT}"/etc/plasma/startup/10-agent-startup.sh || die
-		elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh"
-	fi
-	if [[ -e "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh ]]; then
-		rm "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh || die
-		elog "Removed obsolete ${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
-	fi
-
-	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
-	elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
-	elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
-}
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.19.2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.19.2.ebuild
new file mode 100644
index 000000000000..f7116713959b
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.19.2.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma workspace"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd telemetry"
+
+REQUIRED_USE="gps? ( geolocation )"
+
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5[jpeg]
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kactivities-stats-${KFMIN}:5
+	>=kde-frameworks/kauth-${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/kded-${KFMIN}:5
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kidletime-${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/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kpeople-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-plasma/kscreenlocker-${PVCUT}:5
+	>=kde-plasma/kwin-${PVCUT}:5
+	>=kde-plasma/libkscreen-${PVCUT}:5
+	>=kde-plasma/libksysguard-${PVCUT}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
+	media-libs/phonon[qt5(+)]
+	sys-libs/zlib
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/xcb-util
+	x11-libs/xcb-util-image
+	appstream? ( dev-libs/appstream[qt5] )
+	calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
+	geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+	gps? ( sci-geosciences/gpsd )
+	qalculate? ( sci-libs/libqalculate:= )
+	qrcode? ( >=kde-frameworks/prison-${KFMIN}:5 )
+	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+	telemetry? ( dev-libs/kuserfeedback:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+	app-text/iso-codes
+	>=dev-qt/qdbus-${QTMIN}:5
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtpaths-${QTMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-apps/kio-extras-19.04.3:5
+	>=kde-frameworks/kquickcharts-${KFMIN}:5
+	>=kde-frameworks/kdesu-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-plasma/ksysguard-${PVCUT}:5
+	>=kde-plasma/milou-${PVCUT}:5
+	>=kde-plasma/plasma-integration-${PVCUT}:5
+	x11-apps/xmessage
+	x11-apps/xprop
+	x11-apps/xrdb
+	x11-apps/xsetroot
+	systemd? ( sys-apps/dbus[user-session] )
+	!systemd? ( sys-apps/dbus )
+	!<kde-plasma/plasma-desktop-5.16.80:5
+"
+PDEPEND="
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
+	"${FILESDIR}/${PN}-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch" # KDE-Bug #422684
+)
+
+RESTRICT+=" test"
+
+pkg_setup() {
+	ecm_pkg_setup
+
+	local md5
+	local srcfile=/etc/plasma/XX/10-agent-XX.sh
+	local newdir="${EPREFIX}"/etc/xdg/plasma-workspace
+
+	if [[ -f "${EROOT}"${srcfile//XX/startup} ]]; then
+		md5=$(md5sum "${EROOT}"${srcfile//XX/startup})
+		if [[ ${md5%% *} != 90caaabb40b56bfbe65388841a6dd6ca ]]; then
+			elog "Existing modified ${EPREFIX}${srcfile//XX/startup} detected."
+			elog "Copying to ${newdir}/env/10-agent-startup.sh..."
+			cp -v "${EROOT}"${srcfile//XX/startup} "${T}"/ || die
+		fi
+	fi
+
+	if [[ -f "${EROOT}"${srcfile//XX/shutdown} ]]; then
+		md5=$(md5sum "${EROOT}"${srcfile//XX/shutdown})
+		if [[ ${md5%% *} != d7bffa0273f92abd999c7c3c43dbc23d ]]; then
+			elog "Existing modified ${EPREFIX}${srcfile//XX/shutdown} detected."
+			elog "Copying to ${newdir}/shutdown/10-agent-shutdown.sh..."
+			cp -v "${EROOT}"${srcfile//XX/shutdown} "${T}"/ || die
+		fi
+	fi
+}
+
+src_prepare() {
+	ecm_src_prepare
+
+	if [[ ! -f "${T}"/10-agent-startup.sh ]]; then
+		cp "${FILESDIR}"/10-agent-startup.sh "${T}"/ || die
+	fi
+	if [[ ! -f "${T}"/10-agent-shutdown.sh ]]; then
+		cp "${FILESDIR}"/10-agent-shutdown.sh "${T}"/ || die
+	fi
+
+	cmake_comment_add_subdirectory libkworkspace
+	# delete colliding libkworkspace translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_xembed-sni-proxy=OFF
+		$(cmake_use_find_package appstream AppStreamQt)
+		$(cmake_use_find_package calendar KF5Holidays)
+		$(cmake_use_find_package geolocation KF5NetworkManagerQt)
+		$(cmake_use_find_package qalculate Qalculate)
+		$(cmake_use_find_package qrcode KF5Prison)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
+		$(cmake_use_find_package telemetry KUserFeedback)
+	)
+
+	use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	# default startup and shutdown scripts
+	insinto /etc/xdg/plasma-workspace/env
+	doins "${T}"/10-agent-startup.sh
+
+	insinto /etc/xdg/plasma-workspace/shutdown
+	doins "${T}"/10-agent-shutdown.sh
+	fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
+}
+
+pkg_postinst () {
+	ecm_pkg_postinst
+
+	# Clean up pre-5.17.4 scripts
+	if [[ -e "${EROOT}"/etc/plasma/startup/10-agent-startup.sh ]]; then
+		rm "${EROOT}"/etc/plasma/startup/10-agent-startup.sh || die
+		elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh"
+	fi
+	if [[ -e "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh ]]; then
+		rm "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh || die
+		elog "Removed obsolete ${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
+	fi
+
+	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+	elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
+	elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
+}
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index 2b4545608a48..5094d5ac2621 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST plymouth-kcm-5.18.5.tar.xz 41872 BLAKE2B 29e9f8e56478140c0f4d54d297c9efdc33d2f20b18d9e1b1f16640c1abd1a2f5b6033ebf3053384dda6380d2a51c476842fa8587d402cba2e9bc0f98d6d44823 SHA512 ab9c883d4ed23315e925884662c72b42b350a1938b7dcf24dc30e0486fdd4c4449dcdc30abc45b3007d586e07998c96834918d2e91fcda3163c0f9f5b62c37cf
-DIST plymouth-kcm-5.19.1.tar.xz 41764 BLAKE2B e007dfb90ae1664d01b55e16e177107728b99cedbf38596f063c7202a6c977e97cbe952eb2946f9257224b917b7fe50a9f741419d76994b2c6100f638ebde747 SHA512 f97f45f2d87bfa8ece2a5a190438657108edb6e2cf4badd8dc4b883655180ca7945800deea707df9941159ea9f1dd57b90af591e2578ab6f6fda38059d4ccfdc
+DIST plymouth-kcm-5.19.2.tar.xz 41568 BLAKE2B f476f804e8bbc1a63c30d894136526316d57526f41bf9320ac26384f80d9ceac1e527aeb32f2dbbc1cebf38afa9436bdcc419fba6e6a73a43a608fef8b9ee8f8 SHA512 1559fafb0c6383364df011e6720acf42dfdbd47a9de49e7127e7bbaaa74eb6a15522275b11777a02284e2d42b60058e87280cde73149c4f2f6f861c42f885a3b
 EBUILD plymouth-kcm-5.18.5.ebuild 958 BLAKE2B 21ee959fc8ec20b11b30b272728d545f94a78c85ed6ec54cac60f2d2b2b9611d34e116b75d362f574e6ec80ef8d1c68436a46306a3e91ee7a3796ea444286b68 SHA512 9af21656b05c7c475b25fd37040987bd4c020b226d6660cbe05ff529eecd5b79280b8facf5d1a7804c8b1055f5bd24b250a66545860b2d2d757022812b469695
-EBUILD plymouth-kcm-5.19.1.ebuild 956 BLAKE2B 01a2b6cf4c46cf1fea7787a281abf5315f45d6a331876bd273bab1aededaeaefdaae0f5aa1ef1ec4a944fd3e4fcdf94e698386c990d41495d9457e75fe341db4 SHA512 5d6c18986a41c871f6f7f44899ac381a183ca64d2a725527e62f9b90fd3f9d07177a6aeebede7d9361b4410dec4315026129436a5ade6162827941f313640b69
+EBUILD plymouth-kcm-5.19.2.ebuild 956 BLAKE2B caa7df51bdb70377c536136e88f9f8eda1cc347ae88aec9e56b6f81738312e3ff52acee0fd0bfee2be3ae50fd12ec27b85d833f56f59845a1673ff396e896de5 SHA512 5159e10442465da0b8d3a603c12b02dfee8aac1024686e9b9ab4becc2097b5436674284e05cb5bc3eac03e86a664d2036d295dc4b4dde89b326f1bf0a3caca41
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.19.1.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.19.1.ebuild
deleted file mode 100644
index 421713babe9b..000000000000
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.19.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
-
-BOGUS=1
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma control module for Plymouth"
-HOMEPAGE="https://invent.kde.org/plasma/plymouth-kcm"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	sys-boot/plymouth
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.19.2.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.19.2.ebuild
new file mode 100644
index 000000000000..ba8231468f83
--- /dev/null
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.19.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BOGUS=1
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma control module for Plymouth"
+HOMEPAGE="https://invent.kde.org/plasma/plymouth-kcm"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	sys-boot/plymouth
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index 456a2b7d2d66..b1b4e22ad360 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,5 +1,5 @@
 DIST polkit-kde-agent-1-5.18.5.tar.xz 44592 BLAKE2B c9fe8bdc719bf5719358ff2633a143690114f5d6aafa2321cc02e15f1ffcdb78bff0666e05f4a028d504d6fec85e40c7b18489782fa6dc10db71e45bb8d343a9 SHA512 d9441e2379b665aa28d79451e5390a22f7a06f946020fb8c498352b0202a7ecbf7ca2e8dfccc7ee390d51ad441aeb6d818610d0d2e6a753e63326e4c350aba30
-DIST polkit-kde-agent-1-5.19.1.tar.xz 44768 BLAKE2B f8e7faa1d3035de41e70700cf779c4654d2744a7b92e8e798ad044d5c3481d939fc6c45340ac6e78c7229426e0d1da9dafece60c1462955d0612e8002159a003 SHA512 929509f2d63117e049d91c48017bca35d5caf6dd96ee0dc03fd679fb4e8b4fabd7f9c683c27d8e54931980e795f3a5bb68478451ca210c1750fa2c96979e9623
+DIST polkit-kde-agent-1-5.19.2.tar.xz 44748 BLAKE2B 1b7f51b5e57f070b8bbb048b81d9a91ebc09587c18421122e009570fa0f4082e840d58460c24f095263b925e32403f098ea54760d790d6246bcd16b96e6534d1 SHA512 783f1838ec677489b9da2635a3c31ebcda4cdbbc825ab1401d83729361528f2a1236a90637eab97585b4eaaf174ddda2162dfbc373d2fa50855423527720f467
 EBUILD polkit-kde-agent-5.18.5.ebuild 805 BLAKE2B 3eafa464c89ff32e66657919a6993be2c96fc57e43001ebee550d1946b97705fa2bac08c905b5900e9d7b80187215a55b3d76c6b0b324d7c219de729ffcd360a SHA512 b0f4bb931f111dce6bc76a0a46848de76b46af967c1dc4a9c14c197d59a4ff46b546dfc151cc0c40d26f59fe6e08cdded592d566ef013c2980a190d8e206dc59
-EBUILD polkit-kde-agent-5.19.1.ebuild 803 BLAKE2B 1981d1c697da9c759975635aefae74d3d57400c1385cd63f06998cf3167ad977d2b449a8d761c95ffde562d9dd7239d538d2c00a5325e8d03c6fd72e8f1a75f0 SHA512 28a40d9a99d216f3759bd135320f1a5316f1caf58b662ec5eac46244041fe24d7c078688f73c4a369166b7729271057310fe7a088e228314f2bf01114f2e147f
+EBUILD polkit-kde-agent-5.19.2.ebuild 803 BLAKE2B 79d0a782dd3754ae9e0cc1967e196fb15739d1498f5341418b48d527960e9abbe67d952e9c3e4efacdf615ee25a5500ae83bf21d32bd4f19272d9f61dd335d9b SHA512 e9b00efd1e131da3d75ac5431e4137fbed6b9f3144ad852bd8077316875f8ae9be60375ecc6889bdb919cf6e05544f6dc3f895d506c0954391ea34a1a1f93237
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.19.1.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.19.1.ebuild
deleted file mode 100644
index 90b128919e21..000000000000
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.19.1.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
-
-KDE_ORG_NAME="${PN}-1"
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="PolKit agent module for KDE Plasma"
-HOMEPAGE="https://kde.org/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=sys-auth/polkit-qt-0.112.0[qt5(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.19.2.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.19.2.ebuild
new file mode 100644
index 000000000000..2c13e4cf3fb9
--- /dev/null
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.19.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_ORG_NAME="${PN}-1"
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="PolKit agent module for KDE Plasma"
+HOMEPAGE="https://kde.org/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=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/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=sys-auth/polkit-qt-0.112.0[qt5(+)]
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 61b0cc1c23b3..a12c4e99fddf 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,5 +1,7 @@
+AUX powerdevil-5.18.5-fix-powermgmt-inhibition.patch 3326 BLAKE2B 56eed72622b6432f3e823ef0cfe9f99d963ab7563fdcf95655072551d45d32a0dec83c5d125ea804a0749225c62f1f02e9d4df546acd3df225a7439d75b0cbaf SHA512 8713a906e70f5c11e8da95258c7db130ec8f81031813203472fb7696076296e59085fcb7b704152937efd7829a9bea7d4c9e1b3d60e3ac976d810d06f0a35941
 DIST powerdevil-5.18.5.tar.xz 597492 BLAKE2B 510d523b470f281c1b71902a6e2938d5566b3a653909d4b08d75cdfa190bd2f2a2a0befa7f71b3af331f1511733502690d58c2fed13262da82381eae66605885 SHA512 b7054099cbf3e176591e4fff68ce1dbb7eb9d2f332a75bea3e2ad5954246f6d4d3b0018de101d8ca0df8c7cfa1988abaed40840466a503e09251e4af623fd3b3
-DIST powerdevil-5.19.1.tar.xz 600072 BLAKE2B 17eb818523d06a78ae8fed9487acd52f388b63f8cddf2ab4eaf027f8ddcccfa5460993f3acdb6c8ec002acd168763c5cbad88fbd5ad83df5e43ab256e4847a7a SHA512 31cf3f0ffd6c4a7161c7facafa712aa8c55fbfb154b13cfb794f60c9097fa5d9bb02b98b9fdd5979e111e652d13cc8de18ba373120b8cc4e61aeab98dba87e3e
+DIST powerdevil-5.19.2.1.tar.xz 600120 BLAKE2B aaa6e4cac173ab6b16f05fdbc1ba436b5b15d8bebf8ab7f87745734c49b7433dd0dd08c54446bef01c8bc840e1bca12035dfbab50f829ee43dfffff68d338ff8 SHA512 937569c8b677a08e92f4daeb67d6e8c29de0debd64591f339ca5445d9248431d593852ea85ad62ebe27a6c5fa90c989826d1d8a6678bec14783687f3fd938c1f
+EBUILD powerdevil-5.18.5-r1.ebuild 1955 BLAKE2B dd399d4215373ca4e4ddcd8746d0d2f809bec25f3ab771723eded65fa3a9513780d50e33b8f808651e9059ff11ad595a15a19bb6f9f7f42f26bdd7d8d3071e4f SHA512 a6b9381c04af9a398640dfcb3c2752f94d1c7b35c6d04b232ff66b0ff8c58172d85376d71d35d151526298bac19dae53b55e53f6f8e815eb5f28292dacd91432
 EBUILD powerdevil-5.18.5.ebuild 1872 BLAKE2B 46ab9c544e709262b937789c9e04a04aeeb6ab849d79590f9e75a6cb558f9cdcac31e9961e17da24ef19ec3fa67e92cacd1438ec0943603de314d9832c3771b8 SHA512 612c2b81b1b6ee6b76c6d9d82ef0046f6ee007702c6870540dcd3b560e1f72dc42e4ba2df3d70396ba1f279b92beec234ed6e82fdf304ce6a40e47400ef91871
-EBUILD powerdevil-5.19.1.ebuild 1870 BLAKE2B 09be30cfc6f716ce31f7a11fb33688bf53c74ba18297c4b6aa7b179187f85b75c430d99af471812fbd89568c7716f58733e0dcd0e7e98434500a4f5904f85d0e SHA512 ed4a90ed86ca236aeb3e658ba8f4ce14308276406e58b229e846654167177a110a6fec0a40e8f8c3c47468296110da83f928f4851003bd4befbbe5fb8a57fe74
+EBUILD powerdevil-5.19.2.1.ebuild 1870 BLAKE2B 9fd4330cb18328f800f2c161a792df25a417ecc88ad855f53966a1001aa20ebab5273f28b1e816d5514ecf4380de9c42aa571d8912fbeb4343196383584e574f SHA512 d958b7ad5683f71b1e3eadd90f3d2d44bf5e97f14471960da2e3fe5241dd79075c35300c27c92d7a5ac7fb4e5ecf609194ff31ec1da0c1700ed73530d1b33f86
 MISC metadata.xml 528 BLAKE2B 9548d3d1af958f0ad037e7df6f12a844c0e0ff51376512732b03520856914321e34ba95a533a003f581759f878b61393cf573e90d7818b8ddab71441d9a67f05 SHA512 72536e575abbe4fcc7e3320b3649f87d33dff3af231b54d06707802397963e373962df1d8ffda7c3975b298804ca2d42254d339531861e88590c44fa49fce58f
diff --git a/kde-plasma/powerdevil/files/powerdevil-5.18.5-fix-powermgmt-inhibition.patch b/kde-plasma/powerdevil/files/powerdevil-5.18.5-fix-powermgmt-inhibition.patch
new file mode 100644
index 000000000000..cb6e27b7a977
--- /dev/null
+++ b/kde-plasma/powerdevil/files/powerdevil-5.18.5-fix-powermgmt-inhibition.patch
@@ -0,0 +1,80 @@
+From d21102cc6c7a4db204a29f376ce5eb316ef57a6e Mon Sep 17 00:00:00 2001
+From: Kai Uwe Broulik <kde@privat.broulik.de>
+Date: Fri, 19 Jun 2020 19:51:06 +0200
+Subject: [PATCH] Watch DBus service right away to discard pending inhibitions
+ reliably
+
+PowerDevil delays applying a power management inhibition by 5 seconds to avoid brief inhibitions
+to e.g. wake up the screen and similar.
+However, when an inhibition was posted and the process then quit, we would then still
+enforce the inhibition as it wasn't explicitly revoked.
+Fix this by always watching the inhibition sender and remove it from pending when the
+service goes away.
+
+BUG: 423131
+FIXED-IN: 5.18.6
+---
+ daemon/powerdevilpolicyagent.cpp | 26 ++++++++++++--------------
+ 1 file changed, 12 insertions(+), 14 deletions(-)
+
+diff --git a/daemon/powerdevilpolicyagent.cpp b/daemon/powerdevilpolicyagent.cpp
+index a7d92dfd..2c2b1152 100644
+--- a/daemon/powerdevilpolicyagent.cpp
++++ b/daemon/powerdevilpolicyagent.cpp
+@@ -513,6 +513,11 @@ uint PolicyAgent::addInhibitionWithExplicitDBusService(uint types, const QString
+ 
+     const int cookie = m_lastCookie; // when the Timer below fires, m_lastCookie might be different already
+ 
++    if (!m_busWatcher.isNull() && !service.isEmpty()) {
++        m_cookieToBusService.insert(cookie, service);
++        m_busWatcher.data()->addWatchedService(service);
++    }
++
+     m_pendingInhibitions.append(cookie);
+ 
+     qCDebug(POWERDEVIL) << "Scheduling inhibition from" << service << appName << "with cookie"
+@@ -532,11 +537,6 @@ uint PolicyAgent::addInhibitionWithExplicitDBusService(uint types, const QString
+ 
+         m_cookieToAppName.insert(cookie, qMakePair<QString, QString>(appName, reason));
+ 
+-        if (!m_busWatcher.isNull() && !service.isEmpty()) {
+-            m_cookieToBusService.insert(cookie, service);
+-            m_busWatcher.data()->addWatchedService(service);
+-        }
+-
+         addInhibitionTypeHelper(cookie, static_cast< PolicyAgent::RequiredPolicies >(types));
+ 
+         Q_EMIT InhibitionsChanged({ {qMakePair(appName, reason)} }, {});
+@@ -596,22 +596,20 @@ void PolicyAgent::ReleaseInhibition(uint cookie)
+ {
+     qCDebug(POWERDEVIL) << "Releasing inhibition with cookie " << cookie;
+ 
+-    if (m_pendingInhibitions.contains(cookie)) {
++    QString service = m_cookieToBusService.take(cookie);
++    if (!m_busWatcher.isNull() && !service.isEmpty() && !m_cookieToBusService.key(service)) {
++        // no cookies from service left
++        m_busWatcher.data()->removeWatchedService(service);
++    }
++
++    if (m_pendingInhibitions.removeOne(cookie)) {
+         qCDebug(POWERDEVIL) << "It was only scheduled for inhibition but not enforced yet, just discarding it";
+-        m_pendingInhibitions.removeOne(cookie);
+         return;
+     }
+ 
+     Q_EMIT InhibitionsChanged(QList<InhibitionInfo>(), { {m_cookieToAppName.value(cookie).first} });
+     m_cookieToAppName.remove(cookie);
+ 
+-
+-    QString service = m_cookieToBusService.take(cookie);
+-    if (!m_busWatcher.isNull() && !service.isEmpty() && !m_cookieToBusService.key(service)) {
+-        // no cookies from service left
+-        m_busWatcher.data()->removeWatchedService(service);
+-    }
+-
+     // Look through all of the inhibition types
+     bool notify = false;
+     if (m_typesToCookie[ChangeProfile].contains(cookie)) {
+-- 
+GitLab
+
diff --git a/kde-plasma/powerdevil/powerdevil-5.18.5-r1.ebuild b/kde-plasma/powerdevil/powerdevil-5.18.5-r1.ebuild
new file mode 100644
index 000000000000..79f0394f5fe1
--- /dev/null
+++ b/kde-plasma/powerdevil/powerdevil-5.18.5-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.66.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Power management for KDE Plasma Shell"
+HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="brightness-control +wireless"
+
+DEPEND="
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5[policykit]
+	>=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/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-plasma/libkscreen-${PVCUT}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	virtual/libudev:=
+	x11-libs/libxcb
+	brightness-control? ( app-misc/ddcutil )
+	wireless? (
+		>=kde-frameworks/bluez-qt-${KFMIN}:5
+		>=kde-frameworks/networkmanager-qt-${KFMIN}:5
+	)
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	>=sys-power/upower-0.9.23
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-powermgmt-inhibition.patch" ) # KDE-Bug 423131
+
+src_configure() {
+	local mycmakeargs=(
+		-DHAVE_DDCUTIL=$(usex brightness-control)
+		$(cmake_use_find_package wireless KF5BluezQt)
+		$(cmake_use_find_package wireless KF5NetworkManagerQt)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/powerdevil/powerdevil-5.19.1.ebuild b/kde-plasma/powerdevil/powerdevil-5.19.1.ebuild
deleted file mode 100644
index 74006f4b7781..000000000000
--- a/kde-plasma/powerdevil/powerdevil-5.19.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"
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Power management for KDE Plasma Shell"
-HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="brightness-control +wireless"
-
-DEPEND="
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5[policykit]
-	>=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/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-plasma/libkscreen-${PVCUT}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	virtual/libudev:=
-	x11-libs/libxcb
-	brightness-control? ( app-misc/ddcutil )
-	wireless? (
-		>=kde-frameworks/bluez-qt-${KFMIN}:5
-		>=kde-frameworks/networkmanager-qt-${KFMIN}:5
-	)
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	>=sys-power/upower-0.9.23
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DHAVE_DDCUTIL=$(usex brightness-control)
-		$(cmake_use_find_package wireless KF5BluezQt)
-		$(cmake_use_find_package wireless KF5NetworkManagerQt)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/powerdevil/powerdevil-5.19.2.1.ebuild b/kde-plasma/powerdevil/powerdevil-5.19.2.1.ebuild
new file mode 100644
index 000000000000..53be36d6572c
--- /dev/null
+++ b/kde-plasma/powerdevil/powerdevil-5.19.2.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Power management for KDE Plasma Shell"
+HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="brightness-control +wireless"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5[policykit]
+	>=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/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-plasma/libkscreen-${PVCUT}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
+	virtual/libudev:=
+	x11-libs/libxcb
+	brightness-control? ( app-misc/ddcutil )
+	wireless? (
+		>=kde-frameworks/bluez-qt-${KFMIN}:5
+		>=kde-frameworks/networkmanager-qt-${KFMIN}:5
+	)
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	>=sys-power/upower-0.9.23
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DHAVE_DDCUTIL=$(usex brightness-control)
+		$(cmake_use_find_package wireless KF5BluezQt)
+		$(cmake_use_find_package wireless KF5NetworkManagerQt)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index a2e8bb116056..2d450d73744d 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST sddm-kcm-5.18.5.tar.xz 62184 BLAKE2B d4d55383540882eefafd39cdc65b2f686e271f7e3bfa1f2859b2de55a46a25f03db3413533b74d73782415decbd2dd84fc6f2c9ed517381e55b0917929832c99 SHA512 614cb8780549592ffc8f4f310aca7bcdb68b04b847118d77308b039711c81aee7a9c04726d0e2002b3c00a06c09465752a8886374a286574dfb7aeaa0919089c
-DIST sddm-kcm-5.19.1.tar.xz 62664 BLAKE2B 92a574f8aa31a29aa611ff76b2e0d5b570aea06c4f6a2463c0da9f1f9d279c09d1d1d20fc937982c15e43f05ad24c3882182a34620dbb8c9c9ee2673b13553bc SHA512 b2dba2fb251439445ab8a5aaa026e1ebb59e745bd47282b5e412e8ba318849f7b79e004f952df4d68d177255d4d39ed71b7ce9942aced7b01ec2c76b621c27d1
+DIST sddm-kcm-5.19.2.tar.xz 62064 BLAKE2B 03afe527f3afd2e829cc94f61d4cd4fb745371445487aca99072c7101d0b670bf164d92641e7047684a73ffbffb0b4bf6b744250f9c4e5312e0845cb879a008a SHA512 166b19df988c5e8cb81122030e28c28afe1cad01bc9180749cac3f270d07d8ca49758bf18edd199c9cec305b5c48186274445f40ae38c4780e9d9da7bc12d079
 EBUILD sddm-kcm-5.18.5.ebuild 912 BLAKE2B d6782262b8cba1070aa63505619974da1511c983549e6a4a7aea9c7931dd8ba08378a9aa8563c62cfb8a9a3866229d28bdfe40193dd94879da287dddc9f0a4e5 SHA512 f66add63329fe686ef76e203db0698242eff2a1419b191305beaa38bf2bed68071ceef78e45fef52050bd5cce92d8b267f35b14c6ee0e999e517e3ed75a27a8f
-EBUILD sddm-kcm-5.19.1.ebuild 910 BLAKE2B c79b86e9bb83e3895319573fe6885fc035098983b5ac606919a1e0e46e3077e542ff0edbdf1e596c67bde803f26207ec83ddcc55a7e979a33159287a80b89700 SHA512 f92b495013053b8f17d007afbac245659544ac30a3e635438287d4c64965a79c5366fe135f3e101ba9baf466d28a3e8470dd90dd9cb1145a40d40dfc876dddca
+EBUILD sddm-kcm-5.19.2.ebuild 910 BLAKE2B 051c4cd8ecfda3afbc5976568bcc20be524d9a0264ee7a72e671ee1283f32e28ff601bb13aab9af9fc1b791d6b7cd8524bfc026021657e7a7395818cd19787dc SHA512 1c90557ad68a99f0c6ffe380de7f83d0837de586ad05e10bc1f8c4f5230683dac31a530c2add5df69ac87546f477fee54ae54814b8cad0a84967fd8687a52a3c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.19.1.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.19.1.ebuild
deleted file mode 100644
index 2f712db016d8..000000000000
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.19.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
-
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma control module for SDDM"
-HOMEPAGE="https://invent.kde.org/plasma/sddm-kcm"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kauth-${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
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	x11-misc/sddm
-"
-
-DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.19.2.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.19.2.ebuild
new file mode 100644
index 000000000000..db3ef8b28504
--- /dev/null
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.19.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma control module for SDDM"
+HOMEPAGE="https://invent.kde.org/plasma/sddm-kcm"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kauth-${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
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	x11-misc/sddm
+"
+
+DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index 3e36c59f9ed4..8338ca8930f8 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,5 +1,5 @@
 DIST systemsettings-5.18.5.tar.xz 178252 BLAKE2B ac8ec0ddb6eb54cf6133f1616284d41afbb630fd97ac55cc6eb68846c3a7e9028ecc2caed41c35f624235a74e28d810a81196ed3d6891cb0ff1387ff4bf45f32 SHA512 b6b9184570f188878daca140bd81ee13d47ba867eac5289b67295de9918205e5ebc7f7d644968fbbd9d9dfe1395cae6bd29f7ba4c4aa9a82f85b912693ae4e6a
-DIST systemsettings-5.19.1.tar.xz 183516 BLAKE2B d447c68df6d31c7d2f6df62ddbf1f13efe752c915f5b05dced2ac1414643c50fb8f5bb929bf5830b73fd14d25f3a846ba5e7f0bb51717e1d3dfc7595b39eb4ff SHA512 d51ef8fcfd8f5680ed30b2d9c91eec374890b99242f4124cc9956652fc9164cc550c91ee9ac881bfa705656d2c4cd75b0738106c4efa2ef60c3ddcd8e21df8b9
+DIST systemsettings-5.19.2.tar.xz 183100 BLAKE2B da83ab132732c073adc1b28cf412142a9cb5f6e65570adf73fdaca4e14bc9b0f502105dd5ea7a3a1739b56eea8f5ce89e3e1e5c68cca969631ab1226a37980f9 SHA512 74f211aa977c9fc2818ccf153c494aa225fe14526ba5cc31a81330b70bc3ca2635093c157b7840a46cad6b579976098f8200747ba1cdc27b0e5c3313e8ca32c0
 EBUILD systemsettings-5.18.5.ebuild 1825 BLAKE2B 59492e2f140213e274061c6a5decb4c0e0e5cd4858e3d43a39588aa214f7012039c21e738989efef2165055008d37f90e2f2cf3fe20615e424c94ef06f12971f SHA512 b3edc87210717f0e4354d2d0ac359aac653913f52bbf7d32a9cb884399ea4b931b1936c26589b3262ca54e52305837d55fcbe7b1b0614de56bcf9a119cdfe08c
-EBUILD systemsettings-5.19.1.ebuild 1863 BLAKE2B e0e4f4b638bf4bf372707e321f2f42356cf180973f3a8228bb9871adfc80c85bf9892b75ca00a757923b49eabcad24041b377e94963e9c767e93d8840e35b9e0 SHA512 26d52d3056738be05956903ccde5a94ac6259e7102f339108b00663639a40d3bd0fe0fbd491a2cd366378872d298b9aaff24f1e4f43876099f613bbe2da08544
+EBUILD systemsettings-5.19.2.ebuild 1863 BLAKE2B ecf232a2cc4efa705b7e18ebb54d685cb9cd76c46222d4375950abd3279b13bea4edee231599737ef8a3a248ac7dfa544445dc3e24be56fb897dd002e24ae738 SHA512 5ee1e368248be36e53d9ffa96304ef744ad371b1cc9dee9f39769954c1b5221b66fce68ca36fde3aad2b1efee0057c964eeaf1793630c34ae8b0ebfc61ee12e2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/systemsettings/systemsettings-5.19.1.ebuild b/kde-plasma/systemsettings/systemsettings-5.19.1.ebuild
deleted file mode 100644
index 3cd99d87519a..000000000000
--- a/kde-plasma/systemsettings/systemsettings-5.19.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Control Center to configure KDE Plasma desktop"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=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/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/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-"
-RDEPEND="${DEPEND}
-	!kde-misc/systemd-kcm
-	>=kde-frameworks/kirigami-${KFMIN}:5
-"
-
-src_prepare() {
-	ecm_src_prepare
-
-	# FIXME: hangs in chroot; similar to bug #640432
-	sed -e "s/^ecm_find_qmlmodule.*org\.kde\.kcm/#&/" \
-		-i CMakeLists.txt || die
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		has_version kde-plasma/kde-gtk-config || \
-			elog "Install kde-plasma/kde-gtk-config to configure looks for GTK+."
-	fi
-}
diff --git a/kde-plasma/systemsettings/systemsettings-5.19.2.ebuild b/kde-plasma/systemsettings/systemsettings-5.19.2.ebuild
new file mode 100644
index 000000000000..71a18096923e
--- /dev/null
+++ b/kde-plasma/systemsettings/systemsettings-5.19.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"
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Control Center to configure KDE Plasma desktop"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kactivities-stats-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=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/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/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
+"
+RDEPEND="${DEPEND}
+	!kde-misc/systemd-kcm
+	>=kde-frameworks/kirigami-${KFMIN}:5
+"
+
+src_prepare() {
+	ecm_src_prepare
+
+	# FIXME: hangs in chroot; similar to bug #640432
+	sed -e "s/^ecm_find_qmlmodule.*org\.kde\.kcm/#&/" \
+		-i CMakeLists.txt || die
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		has_version kde-plasma/kde-gtk-config || \
+			elog "Install kde-plasma/kde-gtk-config to configure looks for GTK+."
+	fi
+}
diff --git a/kde-plasma/user-manager/Manifest b/kde-plasma/user-manager/Manifest
index 447e3d688e1e..a1e600815d93 100644
--- a/kde-plasma/user-manager/Manifest
+++ b/kde-plasma/user-manager/Manifest
@@ -1,5 +1,5 @@
 DIST user-manager-5.18.5.tar.xz 2165888 BLAKE2B 011f40ce9cf18b9bc35c33ed56de416eca8ca6320f07ab725631ec335d58c2103425326c2c2e7d95385e0a70eda4b59419284dfe1d48259da45dfdc4dc04ba08 SHA512 fd3f26f1f95782e4e2ca04e92adc38953d026db9e840f823be38f66f9c790a9e154255dd821358f62c624194be8b4867354292df25289092ceaf87ce590cc9a8
-DIST user-manager-5.19.1.tar.xz 9932172 BLAKE2B c27f0438a1aeea70211b020e5ae4c52e98ee6ac7603a8fed3543b7e578b0b5fd86147e120c3369a615d9a798142a0d07f562059a5acd7bc3ef3c883979113ff6 SHA512 6262541a87c68294bb24fea676bdbd6b46e3d1ed26dd8ea50a75df1dad7244391ceaead7f6ff075f4e2b86b01ec03e5b3e065026a6172f19a2e30375f56e92dc
+DIST user-manager-5.19.2.tar.xz 9930300 BLAKE2B 8eee2d4d0aef076f864501d8c643447d7bbb205d2c04c4db5498d25188f53c52edf05d26f9ad9d502ed5af2de61c9350c4749fcad0e9c4827aee2f4b37517857 SHA512 e30c607a77adc34ab2ea620cb3468e2ac582f396725cf4c2b9f62c174b16552608dd8e4dce7b56ba2a66be631944f018917fedc25d98f0669d32f90443edb840
 EBUILD user-manager-5.18.5.ebuild 830 BLAKE2B 898ba4ca8eaf9707001ff3fa1c2862880c73c9932835b505ac7babacca39a7edefb9e89600d287eaf7b9c292b1f20eae7b9313e036bfebde69cf7db201b58d8b SHA512 063f2bd3657fe1156c21241d323d9cc5e591169db53130ecc42e2f45bd3820906458d555013cfce9790db6bad644213629b2218c0b5304d471e13efcb094daa6
-EBUILD user-manager-5.19.1.ebuild 828 BLAKE2B 7d402d141c2e7364a14f87eb8491915bed39276e415d6e188dd182e1cccfc64102256cd0ac968e096ab576486a4c004dedd82d605913298e27a4c5cdecd4d76f SHA512 b6c654a6126a49c65d61dbdc5268670e3666914e57fc802c7060b05cb3f7f595dda6c547b34fb90bbf609ad62c32052ea4d4a6f5652e6c25566c2e57610cd648
+EBUILD user-manager-5.19.2.ebuild 828 BLAKE2B 6f1583e83485c16e82c0e8ce4f762f5d1715cf6a4b40ad1821a3d0c820aa9c3fcb3f4ea82b902de7fd7bd70b7a75c83a1973d03755b58c5cb0afc29e62ea3776 SHA512 0b605c1c590ea635f7ac75e4f2335231159e5037252f7bc025454703e9afbc2541a7cf0278ef580fff008a6694c91df7354874f4460b66b6870ccb840be026a4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/user-manager/user-manager-5.19.1.ebuild b/kde-plasma/user-manager/user-manager-5.19.1.ebuild
deleted file mode 100644
index 3fc0e2e99551..000000000000
--- a/kde-plasma/user-manager/user-manager-5.19.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Simple system settings module to manage the users of your system"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${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/kwidgetsaddons-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-libs/libpwquality-1.3.0
-"
-RDEPEND="${DEPEND}
-	sys-apps/accountsservice
-"
diff --git a/kde-plasma/user-manager/user-manager-5.19.2.ebuild b/kde-plasma/user-manager/user-manager-5.19.2.ebuild
new file mode 100644
index 000000000000..bc387b32e249
--- /dev/null
+++ b/kde-plasma/user-manager/user-manager-5.19.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Simple system settings module to manage the users of your system"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${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/kwidgetsaddons-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-libs/libpwquality-1.3.0
+"
+RDEPEND="${DEPEND}
+	sys-apps/accountsservice
+"
diff --git a/kde-plasma/xdg-desktop-portal-kde/Manifest b/kde-plasma/xdg-desktop-portal-kde/Manifest
index 1073230b1994..259646f5dbed 100644
--- a/kde-plasma/xdg-desktop-portal-kde/Manifest
+++ b/kde-plasma/xdg-desktop-portal-kde/Manifest
@@ -1,5 +1,5 @@
 DIST xdg-desktop-portal-kde-5.18.5.tar.xz 65068 BLAKE2B 0455aafc8e9c0544bbb5df398ca80fa395391d5205e4e1a88a09e0f8bd399bfd5c5d56ef5b2cae8892cd48e4ddaf1c49dd583e04a0157204c646d3833005690f SHA512 2380250e4d159b69a518e6cffc0f9310386683d7d852ac9b5d6c63390ccf95f325197d3a6e27482b17602d0ce7e69bd12262dceaf178ce93a81f7ad6f95d7f6a
-DIST xdg-desktop-portal-kde-5.19.1.tar.xz 76160 BLAKE2B b515dbf104c6abdbe46ca58f7299d78eff130823f4a869515e7a098f8e8191783af1854ca78bf33454a1b329f844125b818cee127950e7fa167e4203a3874a51 SHA512 3867965aef6460c6daf8179cea9d6e8e198d02b84421453f8786c34be7d233c3e65288dc472c97a23f0521be55a502b6254b9a2ac5babc48cf701672a9d5d719
+DIST xdg-desktop-portal-kde-5.19.2.tar.xz 76056 BLAKE2B 6648070c0a84b9438700884c17ebc66c90bc72863838c508b0aea2948b403c399f0559ff1154d3f2083a881928126630a29d3b4ff13319887c7cfa901abb6ae8 SHA512 b2ace52ed067aaeb2ccc11b0717823e42f5cc432a191f4eeb53b8bcff390e7d2db6c044b7bb9ce29487643f16d6760ea7c61f8b685fc29007eb4684c335efdf0
 EBUILD xdg-desktop-portal-kde-5.18.5.ebuild 1310 BLAKE2B 21540d4659f2e56546b591e55aad777ac7f404cb506e223a2704855d231f64c7744627d4676d57d0d429b6084082b26769e8ddf25f017a546febc7c469e38b33 SHA512 9a32516c5a495ef62b2b668bca6cb0903ade52a91814df05fcb711b82f5f24816025b7e338a74ccba8dddf372cf6f1652a669c4713aab0793e3e25ee5245ed5f
-EBUILD xdg-desktop-portal-kde-5.19.1.ebuild 1211 BLAKE2B b20ba4105698ec9f114f8510c4344d7d609e7b5182d14927344e59f6446f8efdd42b0c1fe54bb6d3f50a1bd41a74ed73447d6c7c5244c15102c448ed1a9c72cd SHA512 3d541fac6e649be02e8e10dfaa5db5946c750d578d83fd9a1a0f7eb3a4fb86d886f93f51508d24c69f5552b7e344a722b9597502bac60c01f0cb995e22ede7d2
+EBUILD xdg-desktop-portal-kde-5.19.2.ebuild 1211 BLAKE2B d399c484598b35f78d88a6899b795ac19bb97f9e88f70fe3b8750027083d32f66ed864fb06534dedf705b9515722eb6dcca4d4f56e61b6685af0b91fdee2cdb3 SHA512 4bc27aeda44800acd6722912b94cd683f951ee50436b28592903ba8d034c7b66dd60358e635283fbcfd342d60173ec1bf39373ccd8e73af4c636be4f42bca742
 MISC metadata.xml 360 BLAKE2B 1e3fae0173fab20df0be6a2bd8432477d2c0ab2b9c4272e72a9d8a9eee3255c56311364ea079d288f87032fbc2ec8cad69f32a6bc41b152d19e307ee84493b49 SHA512 4e7232bd03fad6442491ce16c155b0d447050dfc383bb2c16b51297c8c2dcc2793b6d9ce6703451e9516d5a3017fb9e20e85ed7208c94c0faa4489bcbd897e22
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.1.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.1.ebuild
deleted file mode 100644
index 5571d319a260..000000000000
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.1.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
-
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks"
-
-LICENSE="LGPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="screencast"
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5[cups]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	screencast? (
-		media-libs/libepoxy
-		media-libs/mesa[gbm]
-		media-video/pipewire:=
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/xdg-desktop-portal[screencast?]
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PIPEWIRE=$(usex screencast)
-	)
-	ecm_src_configure
-}
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.2.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.2.ebuild
new file mode 100644
index 000000000000..ba4e751100c8
--- /dev/null
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks"
+
+LICENSE="LGPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="screencast"
+
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5[cups]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	screencast? (
+		media-libs/libepoxy
+		media-libs/mesa[gbm]
+		media-video/pipewire:=
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/xdg-desktop-portal[screencast?]
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PIPEWIRE=$(usex screencast)
+	)
+	ecm_src_configure
+}
diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index b983da278610..971c5eb69b5b 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1,6 +1,6 @@
 AUX xembed-sni-proxy-5.14.90-standalone.patch 1984 BLAKE2B e3d5b53479fc18612bd698d89e27c69e178aa1f9bcfc7ce118eb1271d29cd7ee18ced9ec5e4296a3e6d45a4331c9688185ac41bc00ca30f2158d5617feae94d6 SHA512 cef4a94f1a31495bc7e8fab80be4e145a5335f4a9d500680435919e7554efa2c4e87013c4d16d53e1f7b4b7e341092e53d314ccb2a6f7e09ab83d5571275b4e1
 DIST plasma-workspace-5.18.5.tar.xz 5696256 BLAKE2B 7aaf19ff75eb796bbd687e6c63b9703431ecc567bc52c2c173718d45b3946b22572b3a097f7fb7e9726cedcb98cfbb2f20c580efefa4d9cb9d4f2473abeac636 SHA512 870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2
-DIST plasma-workspace-5.19.1.tar.xz 5683020 BLAKE2B 34d4ac284e35f3bdb56895f4df10345ca1f1c9c100eee77e7d73a8e6c6960d15ae60aadd3ce24a39be65ae54b49b964ac27f9c88c8fa2ac159d7ee8d44f1a51b SHA512 9e8a8af8bbfae07472363386aec41a76c7ea5d5242ccb376a276d546b819f3d28dd6961630c5e38026256a4ca219bdb1d86fe49eecc572327451b28f3c94e692
+DIST plasma-workspace-5.19.2.tar.xz 5676488 BLAKE2B cc7a5a156be2e98a4ddc7e8e80a286844f8438b2d17b79dd5dadd24cb28681b80255bad84c118949a815c47080afab380b81edfc3ba59b43f7b24c916cd62e9d SHA512 1c82ee7e1ea27c37c321487bc7bf109c451b3b966d795c7c3102a21e1bfb75bbd83e0ff2fda76e76ef838af3a054aa81a7aa8f89f789dfc16a234d1db3e03c77
 EBUILD xembed-sni-proxy-5.18.5.ebuild 1045 BLAKE2B 7bd18d0916a8b9bf85c558043162a446f94860769f32cd741919a535ff3227170e2ee1afd9edbc48f98c99e4acfef71788c3e6f85dd1be035a494d930639f4f4 SHA512 bf1bfc4583de9178b0d525662baaaebe96cc600b90761c1c6516a8e2b1a757f5afae3edcf986486b63cc2c4849850d8720e97763488a3092c2acc98c1979b582
-EBUILD xembed-sni-proxy-5.19.1.ebuild 1043 BLAKE2B 3dc9341f9e818c70176513e4f57dc7c17c6c204916e94b6f2eff883b6da8c18dbe2a9a77e5a230d52a566b4653fdf0b37d77fa9b7c45f0db1568190f5c1aae23 SHA512 d67520ef6e7e23aa2ff36c845dd36a7f7300d12c37ef5abc39646c08d2386f7c5c0cdb0991267a9c79be39b812df3b9ebd3ccb9c3e0383a0c78fe6b18cbe222d
+EBUILD xembed-sni-proxy-5.19.2.ebuild 1043 BLAKE2B dd3d22fdfd710b0f2bd5dd9354a85f350d352ba6b8ac392daf2d5a666e9ead07ff5e605d1acb50bdad371c31fc295f61eabce57f3dc7035f7413c677a8d38c42 SHA512 c771e0491749b4bfc6dfed66c8d9d65b5b0ab3fadcd817219bd9d49e61db1046933118892feb0773e7efe5bc263445906b1d1d79c9906c7de674a8b8344d36ff
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.19.1.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.19.1.ebuild
deleted file mode 100644
index 2dc5cc78b13c..000000000000
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.19.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_ORG_NAME="plasma-workspace"
-KFMIN=5.70.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit cmake kde.org
-
-DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays"
-HOMEPAGE="https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-DEPEND="
-	>=dev-qt/qtcore-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/extra-cmake-modules-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	x11-libs/libxcb
-	x11-libs/libXtst
-	x11-libs/xcb-util-image
-"
-RDEPEND="${DEPEND}
-	!<kde-plasma/plasma-workspace-5.14.2:5
-	!kde-plasma/xembed-sni-proxy:0
-"
-
-S="${S}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.14.90-standalone.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
-		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
-}
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.19.2.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.19.2.ebuild
new file mode 100644
index 000000000000..c0b2e2cc10ab
--- /dev/null
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.19.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_ORG_NAME="plasma-workspace"
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+inherit cmake kde.org
+
+DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays"
+HOMEPAGE="https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	>=dev-qt/qtcore-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/extra-cmake-modules-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	x11-libs/libxcb
+	x11-libs/libXtst
+	x11-libs/xcb-util-image
+"
+RDEPEND="${DEPEND}
+	!<kde-plasma/plasma-workspace-5.14.2:5
+	!kde-plasma/xembed-sni-proxy:0
+"
+
+S="${S}/${PN}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.14.90-standalone.patch" )
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
+		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
+}
diff --git a/licenses/ATOK b/licenses/ATOK
deleted file mode 100644
index cba37268a268..000000000000
--- a/licenses/ATOK
+++ /dev/null
@@ -1,3 +0,0 @@
-ATOK for Linux is copyrighted by Justsystem Corporation.
-Please read /opt/atokx2/doc/information/license.html before
-using it.
diff --git a/licenses/Manifest.gz b/licenses/Manifest.gz
index 5d13da32cd10..fe812d981c95 100644
--- a/licenses/Manifest.gz
+++ b/licenses/Manifest.gz
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 958ddca28446..cfb88dbf9475 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest
index 83b20df2af1b..3a22eeea78e2 100644
--- a/mail-client/alpine/Manifest
+++ b/mail-client/alpine/Manifest
@@ -6,5 +6,5 @@ DIST alpine-2.23-chappa.patch.gz 172604 BLAKE2B f814a269fe316dd42e73f98b09a67b26
 DIST alpine-2.23.tar.xz 6330784 BLAKE2B e7be73dc0ccf04cfbd8712e70f8b114063983b971c1d967765b41ab0bf86369815d954e85fc4d9622539b1e3a6324ffda635a2808b9439a123302e7f9c9f421d SHA512 abc3675b18d6bd20a547b8e2c3f1f4c668aee2f2d20f426f28b4b3d4cfd66762777007441da3b0fda74e625c71bc2ef05434089508c2af804e62cf216df5554b
 EBUILD alpine-2.22-r1.ebuild 2309 BLAKE2B d294369cddf068bd2e7a01de85f2abeef467ff88db001fb6e1994975f422c16cf37fe07d659d156d9b7185035f9a131f58c85bae3e2b46a2dcdf02f0d5703654 SHA512 21d917188d5b94d01ca12bcabd65d41bd44e3b721a1081b1fadc69ff082d9f7fd32b8bf236b3074b824df22c39e2ec0b236d38c77173376f8871a2e2e5e323b2
 EBUILD alpine-2.22.ebuild 2060 BLAKE2B 5f58202d66033d9417c2d9eec597e2cef12c04c7d7953490fd680782d2a843afdea6791bbe2a2cb265ccff3934c55221f5495b7c656289874b64f6fd83fb78ce SHA512 6685cbdb825260de2da09d8a23c06be390235346aa93d411cdabe9741dff45c10399b4693baa3bd30355591de59b7dfc77e5e847924d5f24ae226645569d5301
-EBUILD alpine-2.23.ebuild 2230 BLAKE2B 8494d490310ab76d9d9caea5da895d2b94a66a0c715db3787407a13cfeceffa3f7bb880a4aef40614def220869738156f2e5ff828b0c7e78e8b2a188c0fd54ab SHA512 26cb1157828ed5f086cf293a89a7d34f78280e80cda9322c2a7d822c5326020a51a32249d18540f870982c2f275f4c00f4db6de81f829aef844960392ef77308
+EBUILD alpine-2.23.ebuild 2227 BLAKE2B 0dc55e814c736e2381e1ccc05b3b67e5b7f1ed065d8b854569bc4ec8e5db4028cf427fe1e24aa6ec8d07b792790402ee3a946811f2722b79e1cc498aff356dfe SHA512 b1ab7041333db6b69b4378a4f4f76e6309f460a2507bad2d5b2b2e509b2df2f8dd56a9e4020687f3bb5614796e676ea94bc28b3b749e97d838451a995990554e
 MISC metadata.xml 731 BLAKE2B 299d44541ef09d51036feeb36ca1d720fba218c526cbb34d7d7358f8baa8d227ee96f823a1960a3fe16313da57f3ea2cd83424d5228839d722a94f780680949e SHA512 fb53b04da391da15373da8dff24b64abd9bee04a24eea999f1331d175c2084d9267c056426b5a9d7cebec808002715782bc1d414a70c310ddbbad72c0540dbae
diff --git a/mail-client/alpine/alpine-2.23.ebuild b/mail-client/alpine/alpine-2.23.ebuild
index a3563213e20a..24bf8ef8ae89 100644
--- a/mail-client/alpine/alpine-2.23.ebuild
+++ b/mail-client/alpine/alpine-2.23.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://alpine.x10host.com/alpine/release/src/${P}.tar.xz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="+chappa doc ipv6 kerberos ldap libressl nls onlyalpine passfile smime spell ssl threads"
 
 DEPEND=">=sys-libs/ncurses-5.1:0=
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 78184cfd1865..e6137f43c59c 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -4,5 +4,5 @@ DIST evolution-3.36.2.tar.xz 12027568 BLAKE2B 3bf2eca4a26e16b34567b4a976ccaa0d31
 DIST evolution-3.36.3.tar.xz 12042584 BLAKE2B 164a901332db7e95461f45111bb3799c1b56fa3826c78059d4d8b12979e985d47983f5af0a529b5f772196d9a2134cc11f082419cfb67797f1a4ae76f4756165 SHA512 867482e4532ddddb63dbe382df0daa1058e1509172c1c80aa9f3b73574509f1def9ab0694f66ceaf9590bde761087ad7d0bcd62ddef3e477697614eb36ac530d
 EBUILD evolution-3.34.4-r1.ebuild 4430 BLAKE2B 038126aa987508944b795cc8ac73f48f24c0006cba40d9522058ed621422a7ce1f1587067e86493aade42351400023e16070abe1028e10e9aa112aac8871b3f6 SHA512 d027de5fef0f850d815c6e09b6ace58675dae79af7cf2fcd6da23f460feef7df305d8ecbe1acf8f8e55a54cb9ca5d1ec3131ad9c49dcbea440625abc449a2ba8
 EBUILD evolution-3.36.2.ebuild 4383 BLAKE2B 4f80579ac95b19852ef29127cd7d44eb7b3030aee511d426637731e8014abbe6c22f45a7904d458d1e3d4b0e2c55924466541dd41e8fca0e0ec399ae11809bdd SHA512 db923a977faa5a6c2141a5fb96468a9b39c7a5664d47af6623c34bfea65c28a7da0163c2d8617f43445d7d10b8a1ec64b0362ec57478b7667a7841b1eecca607
-EBUILD evolution-3.36.3.ebuild 4383 BLAKE2B 4f80579ac95b19852ef29127cd7d44eb7b3030aee511d426637731e8014abbe6c22f45a7904d458d1e3d4b0e2c55924466541dd41e8fca0e0ec399ae11809bdd SHA512 db923a977faa5a6c2141a5fb96468a9b39c7a5664d47af6623c34bfea65c28a7da0163c2d8617f43445d7d10b8a1ec64b0362ec57478b7667a7841b1eecca607
+EBUILD evolution-3.36.3.ebuild 4382 BLAKE2B 9facdfe29ea69aab55bb1b04b734d2083fa2199b32d2e5fa02711e28eee7513967a310a60b71b9bc2bf9ced40c4abd809f2c2c957aec58645862ba460fdd7de4 SHA512 4d8c6ec7a3574f218058ffab82c4817d0e21513c93678385d948c982b55cb9ea82ba3cab78ce90b09d57fc9353b13b6f23a93c68b3ff02888d1649a9b7e139b8
 MISC metadata.xml 1077 BLAKE2B b13424249bbf1c221b3d0981de923917fe7fd873666626104f28a528bd44a40011202b397992a32ed62886c7b637160ae61d4a323d37248c222d3b179b2cccf1 SHA512 0308a366fd296da924b5ab466d90acb4bd18b868769d06726bd7de94d92d88ac70d97c1eb8ce99ad493d45c528d0fd6d222b2eb9880cdac48d05859d1ec7709c
diff --git a/mail-client/evolution/evolution-3.36.3.ebuild b/mail-client/evolution/evolution-3.36.3.ebuild
index 2c90448a8995..a3cbc331a345 100644
--- a/mail-client/evolution/evolution-3.36.3.ebuild
+++ b/mail-client/evolution/evolution-3.36.3.ebuild
@@ -14,7 +14,7 @@ SLOT="2.0"
 
 IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 # glade-3 support is for maintainers only per configure.ac
 # pst is not mature enough and changes API/ABI frequently
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index e3837d8d2411..e6237731aef9 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,13 +1,10 @@
 AUX Muttrc 667 BLAKE2B 49aaefba7ceeefde9d727ad88574fc599a48bcd334ac8e99d8d5e555f2317f4595c480f1903df4b82854bfd272b8aee86a02369769f38a3cadf35f6a6348bf14 SHA512 b64d6e857f0c7de2e2e5b23cecd869f8a9807aa827ad6221e3c5864b2a31fb0136aeaf09ffdb2549645507fe92f724774a80395b6ab2345068903f5ee1269f29
 AUX Muttrc.mbox 486 BLAKE2B dd7f15b08f185800b2a7d26545e5a1b0f7b21f8f7cff2b4fce39fb58d8e336bec6fd500b88c0b14d026c9578d12cd1e4bca45c0d2f3d286d2c9d132b2b5e137e SHA512 aece9a734d292b6f638d2a0dd39f20d9894b4bb6e6888da606a49274faef9c1864e98eec907ffa7742af58d46456e46b8945d2d47c8b89fc95daa2a8833d3e90
 AUX mutt-1.14.4-no-imap-preauth-with-tunnel.patch 1001 BLAKE2B 20d5210ca085d26270be5588fa8058068715e91461832bbf09e21213cc6e84d7b118437a7e11a1e1202af7c3b76edc0f33d5fef2e3b61cd47cd2ddc03a578723 SHA512 07c243290f266b1446f83448796c1871234f38f05f0586cd1360bc6d80088a693451d7f85123da04004489d12d99191196c9bbf5291e90875955f05eb87fff02
-DIST mutt-1.13.5.tar.gz 4902500 BLAKE2B 24c7f40ca177a64118f30d3ea1af95ebbf88c4e9b53a12bab058544350606b85d47ed659eab5f59e5bf17964843243ce175b6e0f0571baca93367ed1bc866a94 SHA512 f2ea863626e5dad4854c98a1797faa97c9f14fb5161c590e88ee02afbdde7f48493bd2cce6109f9839501cf38aa238dc804f4c98f17ac97c68b48cb0bc0e5b4a
-DIST mutt-1.14.3.tar.gz 5003987 BLAKE2B 43e9be05e3da6f3c257bc405fdf45b87114efdeece169d2919390b5cf35a935d1c2798b0ab7eb213eb25eed3008e452fc4c9f02ca8fdb209dce8d9655fe7fb84 SHA512 d7ac53cd383e7491666aeb0b33703dee47cfb9a8671484b713f3b5051227ca2fa618320df0267b7d4eb43a22f9fc9d20d457ddb3f98f907ce49fe7f2915a865e
 DIST mutt-1.14.4.tar.gz 5007437 BLAKE2B 89d4327ddd86ec320c63db6ee9d3c07b7540a74aba7efdcb9605e5c5c242dec99fb5137d1cfc62fd4401e2af7589f03ebce78dfa2deae262aef408b804544656 SHA512 86484f009ca8bd1e26206694e03609a16f8a4e8c83620a07a4376fe160535a838e8c918a8a30799fb3d9cf46c059d67124f7425c42093fb5e5bf8ea4ac310daa
-DIST mutt-gentoo-1.13.5-patches-r0.tar.xz 35932 BLAKE2B 7f4488e6478ba2a2593a58d9905fd8cb857d95a7c05dd90d7d08843bafc060c0560fc5061a85a0a91baf063f055139fa09e5a54ea353e0118418f73baa333928 SHA512 1ddad0550a9bc772247d5ca468efd044c9eeccb497cbe391b19382d598fd0ec8dbdb3d34d4297cc5cd3a8ff43c881155a5874db24e89c0f2a4702b6e0ba4f0d9
-DIST mutt-gentoo-1.14.3-patches-r0.tar.xz 31148 BLAKE2B 49f5f7b446d635de31e5280bad09422bcf27543b58e2eade6ddec35524e9c49083fe59224e6103d6992f53571d77c606c6280e58d05606900ed01ccbd4c4d697 SHA512 444f6456b3c1eb423cd990c3f5a7f4f6ce7f0706f461ca507846ce6ee855e32331720bc7c0fa2cb834d5433d9e7a0d7d2d90c5b8c0ac917dbd3c63a622ae6ce5
+DIST mutt-1.14.5.tar.gz 5008208 BLAKE2B a7c2f7f63d2ee23e743114315cbb40903db720de7f2836f551739edb0b78857c525c40ebde083064dd2430b89b21d7a17745dfc1185672f86b15a9a082c3778e SHA512 950c8df3bdc552b41ba6209aed8d5ade6fff80fe4018a75856d0fdbcd6389bd995a6dee69e7badd05a9b40d2e2293ada9a9f9a96632e88af36b61162f226e2b9
 DIST mutt-gentoo-1.14.4-patches-r0.tar.xz 31124 BLAKE2B a9774a5bb5af18a275f7ea171cb08a12a98d63cbff57320d5d3fb4f995aac16f409689ac0015f3b5d37cfc20004c9fca72a3f63663aaa679a129d5f3886bc5cc SHA512 05506399a471c262479db88ef11d2a95d79598fd696fe50de5f5c1c3cae5adf30a2806a1500ba94a62bcbf7deed99acc59a8afb903f50169e41b77010e0ad8cc
-EBUILD mutt-1.13.5.ebuild 8370 BLAKE2B 73455bc38f547ad43a1fcd3eeca0f7bb3841fd9c03d1e76a4e9d7871d62a0f7867b4a27f78d209dcca177dd0b20dc5c404939f74153ef0efb6b0560564cc6aef SHA512 a5e12b65007bb43fcf329617a512fb6bb268bdf365df322c7869bc075c03df8ee67e206160a488d73bd0b8d5b4e50f23c4d7409cf0e84ac3ac53d5bd339a10a3
-EBUILD mutt-1.14.3.ebuild 8236 BLAKE2B 1a7f0c1b474f07992db19acd9ca1f4373435aa44cf06cd6f8b12066744f2bc559d11d83197b01d96634aba6b2d0e6495766adf0352c07a52334093ae6b13adfa SHA512 03e84726da1c032f536d81e55e111f899ed4b41bfb1462475fb4dfa7e642b0f8a03f6001ecd8ef647c97a1bb0ec849331a0781b0696726812d31aae8a791a114
-EBUILD mutt-1.14.4-r1.ebuild 8348 BLAKE2B 07dd0155ea61216acee9a8ded3a9e21bbe5c98f1a7c3ccad526823ba6c5bf90a5d926fc2c03dc903bac1ab20f690be858c0274bae41c38fb9a25cdf8ba5dcb30 SHA512 2e5e4b9842f1142de9c3f9b109a5ade95ca35bc7a62de867d690934702b9acbe292dff32d266c057e1337d19942657f8bdc0071a7e9e0a9f6c0b805c9ebd2aac
+DIST mutt-gentoo-1.14.5-patches-r0.tar.xz 31100 BLAKE2B 14525b54afa1414667ebe2dc0c58b9b5d5ad4dcc5dbae3c5db13cc23d33dbd9434fa929ad297625c891b2d690e34729a4f61c526fb94857e271ac85f5a07488e SHA512 fd8e473efa02e412aeaba258afee6dc02f9ca24f9edff643e4ef53c759a091e54c6a544e39cd7faa94cd680546bfcf845e282638045ae65a88d140ebb03a4631
+EBUILD mutt-1.14.4-r1.ebuild 8343 BLAKE2B 2d08378bb35052cce7c1ecd160dcdc8ccfbb2b58a7e0e5501a6c6309b85721163a41fd62b72334d205fd688898467053147fddbb60af12b48dfbd0170f314f4c SHA512 4829d3b8b530f805ed890f3989476e87f734d540c8cc11fdbf667c6e08be68b354ac5d61eb546f4fe8ed0eefbd5626b6b10640d07d2fa843186e64d3e27ded3d
+EBUILD mutt-1.14.5.ebuild 8047 BLAKE2B 279d9e639380381cd6baface920a0337c5c6b6993755aef36d8db7af9c8043302c57bd649cf229b6e5e96cfaad76f4de0f72f0fa5f0fe294465b6438083f0a7e SHA512 1aea842cd191fbc5f42b4c21a16efda23782d215dafc08fe44cbb9b723f00787d7c25aa847d312b4de4176c84892ce821d1418fc695be5c11020c14aa6012c15
 MISC metadata.xml 1297 BLAKE2B 67419e66fa917ae69f015d9af534edeb809c4371b2c004c6687a942f331c70ad0513fedb8b6f45a2cb7fc5bfd9ca80c91f888e58293dee00c198d2bca7b8cb12 SHA512 9d9c30b14ce952f8099fb60eac3e8dc25e1c5ef05b88b71c1207950766cb367b56cf7c60168c6f3e431e1aa823c0a345ce851414705e9f0af015cfa51e241350
diff --git a/mail-client/mutt/mutt-1.13.5.ebuild b/mail-client/mutt/mutt-1.13.5.ebuild
deleted file mode 100644
index 82de8485b7a2..000000000000
--- a/mail-client/mutt/mutt-1.13.5.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic autotools
-
-PATCHREV="r0"
-PATCHSET="gentoo-${PVR}/${PATCHREV}"
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org/"
-MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz"
-SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
-	https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
-	https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"
-IUSE="berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
-# hcache: allow multiple, bug #607360
-REQUIRED_USE="
-	hcache?           ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
-	imap?             ( ssl )
-	pop?              ( ssl )
-	smime-classic?    ( ssl !gnutls )
-	smtp?             ( ssl sasl )
-	sasl?             ( || ( imap pop smtp ) )
-	kerberos?         ( || ( imap pop smtp ) )"
-SLOT="0"
-LICENSE="GPL-2"
-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"
-# yes, we overdepend on the backend impls here, hopefully one day we can
-# have REQUIRED_USE do what it is made for again. bug #607360
-CDEPEND="
-	app-misc/mime-types
-	virtual/libiconv
-
-	berkdb?        ( >=sys-libs/db-4:= )
-	gdbm?          ( sys-libs/gdbm )
-	lmdb?          ( dev-db/lmdb:= )
-	qdbm?          ( dev-db/qdbm )
-	tokyocabinet?  ( dev-db/tokyocabinet )
-
-	ssl? (
-		gnutls?    ( >=net-libs/gnutls-1.0.17:= )
-		!gnutls? (
-			libressl? ( dev-libs/libressl:= )
-			!libressl? ( >=dev-libs/openssl-0.9.6:0= )
-		)
-	)
-
-	nls?           ( virtual/libintl )
-	sasl?          ( >=dev-libs/cyrus-sasl-2 )
-	kerberos?      ( virtual/krb5 )
-	idn?           ( net-dns/libidn2 )
-	gpgme?         ( >=app-crypt/gpgme-0.9.0:= )
-	slang?         ( sys-libs/slang )
-	!slang?        ( >=sys-libs/ncurses-5.2:0= )
-"
-DEPEND="${CDEPEND}
-	net-mail/mailbase
-	doc? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		|| ( www-client/lynx www-client/w3m www-client/elinks )
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mutt )
-	smime-classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
-	pgp-classic? ( app-crypt/gnupg )
-"
-
-src_prepare() {
-	local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV}
-
-	if use !vanilla ; then
-		# apply patches
-		export EPATCH_FORCE="yes"
-		export EPATCH_SUFFIX="patch"
-		# http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.10
-		local patches=(
-			patches-mutt
-			bugs-gentoo
-			features-common
-			features-extra
-			gentoo
-		)
-		local patchset
-		for patchset in "${patches[@]}" ; do
-			[[ -d "${PATCHDIR}/${patchset}" ]] || continue
-			einfo "Patches for ${PATCHSET} patchset ${patchset}"
-			EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
-				|| die "patchset ${patchset} failed"
-		done
-		# add some explanation as to why not to go upstream
-		sed -i \
-			-e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \
-			main.c || die "Failed to add bug instructions"
-	fi
-
-	local upatches=
-	# allow user patches
-	eapply_user && upatches=" with user patches"
-
-	# patch version string for bug reports
-	local patchset=
-	use vanilla || patchset=", ${PATCHSET}"
-	sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \
-		muttlib.c || die "failed patching in Gentoo version"
-
-	# many patches touch the buildsystem, we always need this
-	AT_M4DIR="m4" eautoreconf
-
-	# the configure script contains some "cleverness" whether or not to setgid
-	# the dotlock program, resulting in bugs like #278332
-	sed -i -e 's/@DOTLOCK_GROUP@//' Makefile.in || die "sed failed"
-}
-
-src_configure() {
-	local myconf=(
-		# signing and encryption
-		$(use_enable pgp-classic pgp)
-		$(use_enable smime-classic smime)
-		$(use_enable gpgme)
-
-		# features
-		$(use_enable debug)
-		$(use_enable doc)
-		$(use_enable nls)
-
-		# protocols
-		$(use_enable imap)
-		$(use_enable pop)
-		$(use_enable smtp)
-
-		$(use  ssl && use  gnutls && echo --with-gnutls    --without-ssl)
-		$(use  ssl && use !gnutls && echo --without-gnutls --with-ssl   )
-		$(use !ssl &&                echo --without-gnutls --without-ssl)
-
-		$(use_with sasl)
-		$(use_with idn idn2) --without-idn  # avoid automagic libidn dep
-		$(use_with kerberos gss)
-		"$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)"
-		"$(use_with !slang curses "${EPREFIX}"/usr)"
-
-		"--enable-compressed"
-		"--enable-external-dotlock"
-		"--enable-iconv"
-		"--enable-nfs-fix"
-		"--enable-sidebar"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}"
-		"--without-bundled-regex"     # use the implementation from libc
-		"--with-exec-shell=${EPREFIX}/bin/sh"
-	)
-
-	if [[ ${CHOST} == *-solaris2.* && ${CHOST#*-solaris2.} -le 10 ]] ; then
-		# arrows in index view do not show when using wchar_t
-		# or misalign due to wrong computations
-		myconf+=( "--without-wc-funcs" )
-	fi
-
-	# note: REQUIRED_USE should have selected only one of these, but for
-	# bug #607360 we're forced to allow multiple.  For that reason, this
-	# list is ordered to preference, and only the first is taken.
-	local hcaches=(
-		"lmdb"
-		"qdbm"
-		"tokyocabinet"
-		"gdbm"
-		"berkdb:bdb"
-	)
-	local ucache hcache lcache
-	for hcache in "${hcaches[@]}" ; do
-		if use ${hcache%%:*} ; then
-			ucache=${hcache}
-			break
-		fi
-	done
-	if [[ -n ${ucache} ]] ; then
-		myconf+=( "--enable-hcache" )
-	else
-		myconf+=( "--disable-hcache" )
-	fi
-	for hcache in "${hcaches[@]}" ; do
-		[[ ${hcache} == ${ucache} ]] \
-			&& myconf+=( "--with-${hcache#*:}" ) \
-			|| myconf+=( "--without-${hcache#*:}" )
-	done
-
-	if use mbox; then
-		myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" )
-	else
-		myconf+=( "--with-homespool=Maildir" )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	insinto /etc/${PN}
-	if use mbox; then
-		newins "${FILESDIR}"/Muttrc.mbox Muttrc
-	else
-		doins "${FILESDIR}"/Muttrc
-	fi
-
-	# include attachment settings, it's mandatory and shouldn't harm
-	# when not being referenced (index_format using %X)
-	{
-		echo
-		echo "# mandatory attachments settings, not setting these is a BUG!"
-		echo "# see https://marc.info/?l=mutt-dev&m=158347284923517&w=2"
-		grep '^attachments' "${ED}"/etc/${PN}/Muttrc.dist
-	} >> "${ED}"/etc/${PN}/Muttrc
-
-	# add setting to actually enable gpgme usage
-	if use gpgme ; then
-		{
-		echo
-		echo "# this setting enables the gpgme backend (via USE=gpgme)"
-		# https is broken due to a certificate mismatch :(
-		echo "# see http://www.mutt.org/doc/manual/#crypt-use-gpgme"
-		echo "set crypt_use_gpgme = yes"
-		} >> "${ED}"/etc/${PN}/Muttrc
-	fi
-
-	# A newer file is provided by app-misc/mime-types. So we link it.
-	rm "${ED}"/etc/${PN}/mime.types
-	dosym ../mime.types /etc/${PN}/mime.types
-
-	# nuke manpages that should be provided by an MTA, bug #177605
-	rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
-		|| ewarn "failed to remove files, please file a bug"
-
-	if use !prefix ; then
-		fowners root:mail /usr/bin/mutt_dotlock
-		fperms g+s /usr/bin/mutt_dotlock
-	fi
-
-	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		echo
-		elog "If you are new to mutt you may want to take a look at"
-		elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
-		elog "   https://wiki.gentoo.org/wiki/Mutt"
-		echo
-	else
-		ewarn "The nntp and notmuch patches were dropped from this release."
-		echo
-		elog "Due to too much maintenance cost, the nntp and notmuch patches"
-		elog "were dropped from this release.  If you need support for any"
-		elog "of these features, please consider using mail-client/neomutt."
-		echo
-	fi
-	# try to warn user in case none of the crypto flags appear enabled
-	if use !pgp-classic && use !smime-classic && use !gpgme ; then
-		ewarn "Please note that crypto related USE-flags of Mutt have changed."
-		ewarn "To comply with PMS, the following USE-flags were renamed:"
-		ewarn "(see https://bugs.gentoo.org/695078)"
-		ewarn "  pgp_classic   -> pgp-classic"
-		ewarn "  smime_classic -> smime-classic"
-		echo
-	fi
-}
diff --git a/mail-client/mutt/mutt-1.14.3.ebuild b/mail-client/mutt/mutt-1.14.3.ebuild
deleted file mode 100644
index 1080859254bb..000000000000
--- a/mail-client/mutt/mutt-1.14.3.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic autotools
-
-PATCHREV="r0"
-PATCHSET="gentoo-${PVR}/${PATCHREV}"
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org/"
-MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz"
-SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
-	https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
-	https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"
-IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
-# hcache: allow multiple, bug #607360
-REQUIRED_USE="
-	hcache?           ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
-	imap?             ( ssl )
-	pop?              ( ssl )
-	smime-classic?    ( ssl !gnutls )
-	smtp?             ( ssl sasl )
-	sasl?             ( || ( imap pop smtp ) )
-	kerberos?         ( || ( imap pop smtp ) )
-	autocrypt?        ( gpgme )"
-SLOT="0"
-LICENSE="GPL-2"
-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"
-# yes, we overdepend on the backend impls here, hopefully one day we can
-# have REQUIRED_USE do what it is made for again. bug #607360
-CDEPEND="
-	app-misc/mime-types
-	virtual/libiconv
-
-	berkdb?        ( >=sys-libs/db-4:= )
-	gdbm?          ( sys-libs/gdbm )
-	lmdb?          ( dev-db/lmdb:= )
-	qdbm?          ( dev-db/qdbm )
-	tokyocabinet?  ( dev-db/tokyocabinet )
-
-	ssl? (
-		gnutls?    ( >=net-libs/gnutls-1.0.17:= )
-		!gnutls? (
-			libressl? ( dev-libs/libressl:= )
-			!libressl? ( >=dev-libs/openssl-0.9.6:0= )
-		)
-	)
-
-	nls?           ( virtual/libintl )
-	sasl?          ( >=dev-libs/cyrus-sasl-2 )
-	kerberos?      ( virtual/krb5 )
-	idn?           ( net-dns/libidn2 )
-	gpgme?         ( >=app-crypt/gpgme-0.9.0:= )
-	autocrypt?     ( >=dev-db/sqlite-3 )
-	slang?         ( sys-libs/slang )
-	!slang?        ( >=sys-libs/ncurses-5.2:0= )
-"
-DEPEND="${CDEPEND}
-	net-mail/mailbase
-	doc? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		|| ( www-client/lynx www-client/w3m www-client/elinks )
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mutt )
-	smime-classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
-	pgp-classic? ( app-crypt/gnupg )
-"
-
-src_prepare() {
-	local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV}
-
-	if use !vanilla ; then
-		# apply patches
-		export EPATCH_FORCE="yes"
-		export EPATCH_SUFFIX="patch"
-		# http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.10
-		local patches=(
-			patches-mutt
-			bugs-gentoo
-			features-common
-			features-extra
-			gentoo
-		)
-		local patchset
-		for patchset in "${patches[@]}" ; do
-			[[ -d "${PATCHDIR}/${patchset}" ]] || continue
-			einfo "Patches for ${PATCHSET} patchset ${patchset}"
-			EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
-				|| die "patchset ${patchset} failed"
-		done
-		# add some explanation as to why not to go upstream
-		sed -i \
-			-e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \
-			main.c || die "Failed to add bug instructions"
-	fi
-
-	local upatches=
-	# allow user patches
-	eapply_user && upatches=" with user patches"
-
-	# patch version string for bug reports
-	local patchset=
-	use vanilla || patchset=", ${PATCHSET}"
-	sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \
-		muttlib.c || die "failed patching in Gentoo version"
-
-	# many patches touch the buildsystem, we always need this
-	AT_M4DIR="m4" eautoreconf
-
-	# the configure script contains some "cleverness" whether or not to setgid
-	# the dotlock program, resulting in bugs like #278332
-	sed -i -e 's/@DOTLOCK_GROUP@//' Makefile.in || die "sed failed"
-}
-
-src_configure() {
-	local myconf=(
-		# signing and encryption
-		$(use_enable autocrypt) $(use_with autocrypt sqlite3)
-		$(use_enable pgp-classic pgp)
-		$(use_enable smime-classic smime)
-		$(use_enable gpgme)
-
-		# features
-		$(use_enable debug)
-		$(use_enable doc)
-		$(use_enable nls)
-
-		# protocols
-		$(use_enable imap)
-		$(use_enable pop)
-		$(use_enable smtp)
-
-		$(use  ssl && use  gnutls && echo --with-gnutls    --without-ssl)
-		$(use  ssl && use !gnutls && echo --without-gnutls --with-ssl   )
-		$(use !ssl &&                echo --without-gnutls --without-ssl)
-
-		$(use_with sasl)
-		$(use_with idn idn2) --without-idn  # avoid automagic libidn dep
-		$(use_with kerberos gss)
-		"$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)"
-		"$(use_with !slang curses "${EPREFIX}"/usr)"
-
-		"--enable-compressed"
-		"--enable-external-dotlock"
-		"--enable-iconv"
-		"--enable-nfs-fix"
-		"--enable-sidebar"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}"
-		"--without-bundled-regex"     # use the implementation from libc
-		"--with-exec-shell=${EPREFIX}/bin/sh"
-	)
-
-	if [[ ${CHOST} == *-solaris2.* && ${CHOST#*-solaris2.} -le 10 ]] ; then
-		# arrows in index view do not show when using wchar_t
-		# or misalign due to wrong computations
-		myconf+=( "--without-wc-funcs" )
-	fi
-
-	# note: REQUIRED_USE should have selected only one of these, but for
-	# bug #607360 we're forced to allow multiple.  For that reason, this
-	# list is ordered to preference, and only the first is taken.
-	local hcaches=(
-		"lmdb"
-		"qdbm"
-		"tokyocabinet"
-		"gdbm"
-		"berkdb:bdb"
-	)
-	local ucache hcache lcache
-	for hcache in "${hcaches[@]}" ; do
-		if use ${hcache%%:*} ; then
-			ucache=${hcache}
-			break
-		fi
-	done
-	if [[ -n ${ucache} ]] ; then
-		myconf+=( "--enable-hcache" )
-	else
-		myconf+=( "--disable-hcache" )
-	fi
-	for hcache in "${hcaches[@]}" ; do
-		[[ ${hcache} == ${ucache} ]] \
-			&& myconf+=( "--with-${hcache#*:}" ) \
-			|| myconf+=( "--without-${hcache#*:}" )
-	done
-
-	if use mbox; then
-		myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" )
-	else
-		myconf+=( "--with-homespool=Maildir" )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	insinto /etc/${PN}
-	if use mbox; then
-		newins "${FILESDIR}"/Muttrc.mbox Muttrc
-	else
-		doins "${FILESDIR}"/Muttrc
-	fi
-
-	# include attachment settings, it's mandatory and shouldn't harm
-	# when not being referenced (index_format using %X)
-	{
-		echo
-		echo "# mandatory attachments settings, not setting these is a BUG!"
-		echo "# see https://marc.info/?l=mutt-dev&m=158347284923517&w=2"
-		grep '^attachments' "${ED}"/etc/${PN}/Muttrc.dist
-	} >> "${ED}"/etc/${PN}/Muttrc
-
-	# add setting to actually enable gpgme usage
-	if use gpgme || use autocrypt ; then
-		{
-		echo
-		echo "# this setting enables the gpgme backend (via USE=gpgme)"
-		# https is broken due to a certificate mismatch :(
-		echo "# see http://www.mutt.org/doc/manual/#crypt-use-gpgme"
-		echo "set crypt_use_gpgme = yes"
-		} >> "${ED}"/etc/${PN}/Muttrc
-	fi
-
-	# similar for autocrypt
-	if use autocrypt ; then
-		{
-			echo
-			echo "# enables autocrypt (via USE=autocrypt)"
-			echo "# see http://www.mutt.org/doc/manual/#autocryptdoc"
-			echo "set autocrypt = yes"
-		} >> "${ED}"/etc/${PN}/Muttrc
-	fi
-
-	# A newer file is provided by app-misc/mime-types. So we link it.
-	rm "${ED}"/etc/${PN}/mime.types
-	dosym ../mime.types /etc/${PN}/mime.types
-
-	# nuke manpages that should be provided by an MTA, bug #177605
-	rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
-		|| ewarn "failed to remove files, please file a bug"
-
-	if use !prefix ; then
-		fowners root:mail /usr/bin/mutt_dotlock
-		fperms g+s /usr/bin/mutt_dotlock
-	fi
-
-	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		echo
-		elog "If you are new to mutt you may want to take a look at"
-		elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
-		elog "   https://wiki.gentoo.org/wiki/Mutt"
-		echo
-	else
-		elog "The multiple fcc patch was dropped in favour of an implementation"
-		elog "from upstream.  If you use the feature, review the new"
-		elog "  \$fcc_delimiter"
-		elog "variable."
-	fi
-}
diff --git a/mail-client/mutt/mutt-1.14.4-r1.ebuild b/mail-client/mutt/mutt-1.14.4-r1.ebuild
index 2a138c892046..5ca782116a8d 100644
--- a/mail-client/mutt/mutt-1.14.4-r1.ebuild
+++ b/mail-client/mutt/mutt-1.14.4-r1.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
 	autocrypt?        ( gpgme )"
 SLOT="0"
 LICENSE="GPL-2"
-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"
 # yes, we overdepend on the backend impls here, hopefully one day we can
 # have REQUIRED_USE do what it is made for again. bug #607360
 CDEPEND="
diff --git a/mail-client/mutt/mutt-1.14.5.ebuild b/mail-client/mutt/mutt-1.14.5.ebuild
new file mode 100644
index 000000000000..eddd531443cc
--- /dev/null
+++ b/mail-client/mutt/mutt-1.14.5.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic autotools
+
+PATCHREV="r0"
+PATCHSET="gentoo-${PVR}/${PATCHREV}"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org/"
+MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz"
+SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
+	https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
+	https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"
+IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
+# hcache: allow multiple, bug #607360
+REQUIRED_USE="
+	hcache?           ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
+	imap?             ( ssl )
+	pop?              ( ssl )
+	smime-classic?    ( ssl !gnutls )
+	smtp?             ( ssl sasl )
+	sasl?             ( || ( imap pop smtp ) )
+	kerberos?         ( || ( imap pop smtp ) )
+	autocrypt?        ( gpgme )"
+SLOT="0"
+LICENSE="GPL-2"
+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"
+# yes, we overdepend on the backend impls here, hopefully one day we can
+# have REQUIRED_USE do what it is made for again. bug #607360
+CDEPEND="
+	app-misc/mime-types
+	virtual/libiconv
+
+	berkdb?        ( >=sys-libs/db-4:= )
+	gdbm?          ( sys-libs/gdbm )
+	lmdb?          ( dev-db/lmdb:= )
+	qdbm?          ( dev-db/qdbm )
+	tokyocabinet?  ( dev-db/tokyocabinet )
+
+	ssl? (
+		gnutls?    ( >=net-libs/gnutls-1.0.17:= )
+		!gnutls? (
+			libressl? ( dev-libs/libressl:= )
+			!libressl? ( >=dev-libs/openssl-0.9.6:0= )
+		)
+	)
+
+	nls?           ( virtual/libintl )
+	sasl?          ( >=dev-libs/cyrus-sasl-2 )
+	kerberos?      ( virtual/krb5 )
+	idn?           ( net-dns/libidn2 )
+	gpgme?         ( >=app-crypt/gpgme-0.9.0:= )
+	autocrypt?     ( >=dev-db/sqlite-3 )
+	slang?         ( sys-libs/slang )
+	!slang?        ( >=sys-libs/ncurses-5.2:0= )
+"
+DEPEND="${CDEPEND}
+	net-mail/mailbase
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		|| ( www-client/lynx www-client/w3m www-client/elinks )
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mutt )
+	smime-classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
+	pgp-classic? ( app-crypt/gnupg )
+"
+
+src_prepare() {
+	local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV}
+
+	if use !vanilla ; then
+		# apply patches
+		export EPATCH_FORCE="yes"
+		export EPATCH_SUFFIX="patch"
+		# http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.10
+		local patches=(
+			patches-mutt
+			bugs-gentoo
+			features-common
+			features-extra
+			gentoo
+		)
+		local patchset
+		for patchset in "${patches[@]}" ; do
+			[[ -d "${PATCHDIR}/${patchset}" ]] || continue
+			einfo "Patches for ${PATCHSET} patchset ${patchset}"
+			EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
+				|| die "patchset ${patchset} failed"
+		done
+		# add some explanation as to why not to go upstream
+		sed -i \
+			-e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \
+			main.c || die "Failed to add bug instructions"
+	fi
+
+	local upatches=
+	# allow user patches
+	eapply_user && upatches=" with user patches"
+
+	# patch version string for bug reports
+	local patchset=
+	use vanilla || patchset=", ${PATCHSET}"
+	sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \
+		muttlib.c || die "failed patching in Gentoo version"
+
+	# many patches touch the buildsystem, we always need this
+	AT_M4DIR="m4" eautoreconf
+
+	# the configure script contains some "cleverness" whether or not to setgid
+	# the dotlock program, resulting in bugs like #278332
+	sed -i -e 's/@DOTLOCK_GROUP@//' Makefile.in || die "sed failed"
+}
+
+src_configure() {
+	local myconf=(
+		# signing and encryption
+		$(use_enable autocrypt) $(use_with autocrypt sqlite3)
+		$(use_enable pgp-classic pgp)
+		$(use_enable smime-classic smime)
+		$(use_enable gpgme)
+
+		# features
+		$(use_enable debug)
+		$(use_enable doc)
+		$(use_enable nls)
+
+		# protocols
+		$(use_enable imap)
+		$(use_enable pop)
+		$(use_enable smtp)
+
+		$(use  ssl && use  gnutls && echo --with-gnutls    --without-ssl)
+		$(use  ssl && use !gnutls && echo --without-gnutls --with-ssl   )
+		$(use !ssl &&                echo --without-gnutls --without-ssl)
+
+		$(use_with sasl)
+		$(use_with idn idn2) --without-idn  # avoid automagic libidn dep
+		$(use_with kerberos gss)
+		"$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)"
+		"$(use_with !slang curses "${EPREFIX}"/usr)"
+
+		"--enable-compressed"
+		"--enable-external-dotlock"
+		"--enable-iconv"
+		"--enable-nfs-fix"
+		"--enable-sidebar"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+		"--without-bundled-regex"     # use the implementation from libc
+		"--with-exec-shell=${EPREFIX}/bin/sh"
+	)
+
+	if [[ ${CHOST} == *-solaris2.* && ${CHOST#*-solaris2.} -le 10 ]] ; then
+		# arrows in index view do not show when using wchar_t
+		# or misalign due to wrong computations
+		myconf+=( "--without-wc-funcs" )
+	fi
+
+	# note: REQUIRED_USE should have selected only one of these, but for
+	# bug #607360 we're forced to allow multiple.  For that reason, this
+	# list is ordered to preference, and only the first is taken.
+	local hcaches=(
+		"lmdb"
+		"qdbm"
+		"tokyocabinet"
+		"gdbm"
+		"berkdb:bdb"
+	)
+	local ucache hcache lcache
+	for hcache in "${hcaches[@]}" ; do
+		if use ${hcache%%:*} ; then
+			ucache=${hcache}
+			break
+		fi
+	done
+	if [[ -n ${ucache} ]] ; then
+		myconf+=( "--enable-hcache" )
+	else
+		myconf+=( "--disable-hcache" )
+	fi
+	for hcache in "${hcaches[@]}" ; do
+		[[ ${hcache} == ${ucache} ]] \
+			&& myconf+=( "--with-${hcache#*:}" ) \
+			|| myconf+=( "--without-${hcache#*:}" )
+	done
+
+	if use mbox; then
+		myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" )
+	else
+		myconf+=( "--with-homespool=Maildir" )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	insinto /etc/${PN}
+	if use mbox; then
+		newins "${FILESDIR}"/Muttrc.mbox Muttrc
+	else
+		doins "${FILESDIR}"/Muttrc
+	fi
+
+	# include attachment settings, it's mandatory and shouldn't harm
+	# when not being referenced (index_format using %X)
+	{
+		echo
+		echo "# mandatory attachments settings, not setting these is a BUG!"
+		echo "# see https://marc.info/?l=mutt-dev&m=158347284923517&w=2"
+		grep '^attachments' "${ED}"/etc/${PN}/Muttrc.dist
+	} >> "${ED}"/etc/${PN}/Muttrc
+
+	# add setting to actually enable gpgme usage
+	if use gpgme || use autocrypt ; then
+		{
+		echo
+		echo "# this setting enables the gpgme backend (via USE=gpgme)"
+		# https is broken due to a certificate mismatch :(
+		echo "# see http://www.mutt.org/doc/manual/#crypt-use-gpgme"
+		echo "set crypt_use_gpgme = yes"
+		} >> "${ED}"/etc/${PN}/Muttrc
+	fi
+
+	# similar for autocrypt
+	if use autocrypt ; then
+		{
+			echo
+			echo "# enables autocrypt (via USE=autocrypt)"
+			echo "# see http://www.mutt.org/doc/manual/#autocryptdoc"
+			echo "set autocrypt = yes"
+		} >> "${ED}"/etc/${PN}/Muttrc
+	fi
+
+	# A newer file is provided by app-misc/mime-types. So we link it.
+	rm "${ED}"/etc/${PN}/mime.types
+	dosym ../mime.types /etc/${PN}/mime.types
+
+	# nuke manpages that should be provided by an MTA, bug #177605
+	rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
+		|| ewarn "failed to remove files, please file a bug"
+
+	if use !prefix ; then
+		fowners root:mail /usr/bin/mutt_dotlock
+		fperms g+s /usr/bin/mutt_dotlock
+	fi
+
+	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		echo
+		elog "If you are new to mutt you may want to take a look at"
+		elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
+		elog "   https://wiki.gentoo.org/wiki/Mutt"
+		echo
+	fi
+}
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index baa89da40197..ffb71e3966dd 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -12,7 +12,7 @@ DIST roundcubemail-1.4.3-complete.tar.gz 7028284 BLAKE2B c53efbee437960339c6e80a
 DIST roundcubemail-1.4.4-complete.tar.gz 7029864 BLAKE2B 2a6764a65c29e3deac6275c3dfd19ab2bee1f33ae1a7767561fcac25688bb8f3f7eeaee3eece20d2a6210aff18a5e493d0be709f4a3ae2ad4f3cfd9a1b124f06 SHA512 ddea321b5266c547f67c010147e9aa1457bea4802bec37f9e9d87e691bdc8df27f5c90cff8770de2458822160b85f7359f62742072ae1d642a040b9d88651519
 DIST roundcubemail-1.4.6-complete.tar.gz 7031573 BLAKE2B 541147faeb2fafbf15fd3a4f42a5ecbb642113f02ea9135c91d3b359ec4582e490b80b2e20efa1f6afe8c35e5afe2263682a717a5342198a9eabb7e555e302bb SHA512 e86763ced58cfa8174f71d33ae45cd62f26a58853b9361b800003fa5bf883a4106c957f66b6b17b03172a3ee595ca74d7c19ac38e449a23377defd77cf555742
 EBUILD roundcube-1.3.10.ebuild 2432 BLAKE2B ebda963ec305ebeab3345e343e59e6994dd4c91115ac37bc19dca2b0b47ae5796b2594cc09df8b52c476f8d6fa5120dc4917ac2b302cddea931ea07c16972ae6 SHA512 8b3cc79dfb46a75c61aa6b22bc3f7f7bab50c7c80abcb4c6023a98bb45d98aaf67416468eadec8e91979e2dd72462f0da3f3a91838326e0bab6f213217cebbd3
-EBUILD roundcube-1.3.11.ebuild 2427 BLAKE2B 25d88242d52d8990dbb9b5c118195314a3cd0de45d0fd3adfd439986e974e99149eb640e1d1b08ebdf6fdaab129a3763fb28a2e2e6dcca8f09ab474d2a7224a2 SHA512 7ba7c654d35cc9d64045413bb2ad8d63ec200bffe0f12596d8090836222057162cd0ba389ffac3ca625fd1ecea1aac49194b9fc5b6f6b2abfea3d37a2704f8ce
+EBUILD roundcube-1.3.11.ebuild 2424 BLAKE2B b21ac1eeaddba1befe738129370f47f5a7b877f6b703c42ce5a21e86291a6d80b06ba1fdb9f515378b50b1fa8776ccc614d34b4ba6633f3d0ec524cfbd95c1a6 SHA512 60b521a535d877591139689f2c2a814794797e0b8fb9ab257bdd3a7e6a66070450975169a66439f5b9ad6f50fa3ac4375ae92ab217b22c617bd57e8ad0f86ad3
 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
diff --git a/mail-client/roundcube/roundcube-1.3.11.ebuild b/mail-client/roundcube/roundcube-1.3.11.ebuild
index 03c060ce602f..aae2f208e408 100644
--- a/mail-client/roundcube/roundcube-1.3.11.ebuild
+++ b/mail-client/roundcube/roundcube-1.3.11.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${PV}/${MY_P}-compl
 # roundcube is GPL-licensed, the rest of the licenses here are
 # for bundled PEAR components, googiespell and utf8.class.php
 LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 sparc x86"
+KEYWORDS="~amd64 arm ~hppa ppc ppc64 sparc x86"
 
 IUSE="change-password enigma ldap managesieve mysql postgres sqlite ssl spell"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
diff --git a/mail-client/trojita/Manifest b/mail-client/trojita/Manifest
index a2832c689eb3..a0cb9bb482d8 100644
--- a/mail-client/trojita/Manifest
+++ b/mail-client/trojita/Manifest
@@ -1,8 +1,13 @@
+AUX trojita-0.7-CVE-2019-10734.patch 4701 BLAKE2B d7c41789e57fcab16f616702d427bffce348376f0d9fc16fc02c37257409a819bc2d157652e5671a6a2c6f7b06b64b325b3f08d8977654cf52028f7cda25f2dd SHA512 db96a566924b5d7b80787ab624af3726d5dd3459653192436a377d6482ab73801a7dcca1df1b1d937cf0d0798b827e04f8ef2c1124f91dc9da3e8036ef61e28a
+AUX trojita-0.7-CVE-2020-15047.patch 3286 BLAKE2B 4cccc6eb6ad6826f176c19d8fd2cc1c23c661b222d8e884bd45ee700d8db856b45d76f90ad387bdd2b3996c3f97af89f60bd9b44c3bf4e8456a607b4f3c1e91f SHA512 82ed94860b8e71b66093548535cd5970dc28bbc5c023cb73e0474bfe33e49f889d08c095536cbda6242e260b742c59a7ada7a0a003bb4f6302f3e547da52cd48
+AUX trojita-0.7-cmake-cxx11.patch 2442 BLAKE2B ce2f29c96c93f254ccade934cfa6ad38f863c5e6b30cb9c45e92c6299a10e28a58a32a0515fe122e5beee0f82b154f9421519a6a211e6b9a3b6d1238ce09dd08 SHA512 2b2723be49d097fb1ca9d51ecbb30d2a4b3e766edc232eb8cc25b537f32c0dd0b8aeb24c3ae3b38929775f31262e36a0ba078e335076cab9b20d5ac8b41c0e60
 AUX trojita-0.7-gpg-tests.patch 1465 BLAKE2B f336368c8166987dc096991a0855a05d83374b7d509dbd8b39e7a12f6f8b14b86c6405ea55882192601163cee9eadaf9ab306bfbdcae347857bf4dc2f3c5908a SHA512 e494de83085dbbd7c545e47fcb1116cfb48e787f7b8706bee51f30f74a9047d1cf835f20086355671643ee0ef88d01428683999765d4bb59c3d9d943e92c69eb
 AUX trojita-0.7-gpgme.patch 1416 BLAKE2B dba95c0954a6ac704e5145d140e905bf6f886db4b84f7a5dbc67ea0494b188d9ff79ccf096faaedc6a179167bc9394ced0203e9df69cc6368694e885fbb61836 SHA512 4031feb66e7ce53e5669e00dd8ca91a6a53a22207aae90e13ef38012777b76275911d78fbdcd58809571a7c649fb4025cdb7de97e9793102c62f5e8b7b0561e1
 AUX trojita-0.7-qt-5.11b3.patch 9678 BLAKE2B 0bcf00db610594ff084f5ca3bcfe2d3ad40d44b461358c4b9fc730f6dba787d82837c16f2e6bc84df9d3f57ac404d7c006fc7db223efeacfb9e833b6209b4374 SHA512 c16f3a7b9555e70e61656eb8caf25f778ec14a1dfdd18f786ddc3d8ee49b28fd39c4f438d051dbf961afbaf8cafc3d84a5befa10111ba216b4dec300cd67e228
+AUX trojita-0.7-qt-5.13.patch 1044 BLAKE2B 4c110d49c9352f526470b2af255c98c8f8b80df0ddc6da5a8fdecee9a1d5000c473a17f64790ffa95e20f03431ddb7fc294bb1e20d11fd549ca4451bb030ebba SHA512 bce7713fb5bef29b2b189d281dee57ddfc57f1c0601f424aba2185668215878b9bfd3bb80f0d2f8b73219e782db5e64973e79190fe62afa8ba98327535139146
 AUX trojita-0.7-qt-5.15.patch 774 BLAKE2B 0c1de7d7eebc9782d2e3e889365b283b3c5c82b7d792f167783857e8544f29f0a29284923a9b5f2974a5dbf8b9b3e6147c14654d78a57b67b8151407a63863b6 SHA512 42d45246c49ae99d9a49ed2c2186042427c8ea35b84123c876951f1d9ddcf9236acd14fd36e592041296ca6f6200e20eca786c967dade37bf8be8148dd7b3cca
 DIST trojita-0.7.tar.xz 1038212 BLAKE2B 92dfb01fc1849d04958fd26ea731835c7287d5a6989d8e0c97c6679ce8f1c9f33a0f67c3f293fc85188e9d289c0dddee9847f4151b6f64396f3de86635b11f32 SHA512 fe4d9316f97d913619f27d24a5023c3d8dd4a6b9fb058651be12c67188f394aa8cbb60c7593e5eb28fc12fc883b76deeeb5f4f631edd255fdec4c5862c9a91c8
 EBUILD trojita-0.7-r2.ebuild 1732 BLAKE2B 4fe9fbd095244f6ca733b7fd7437669d671e96bc288161510f1c523f008abe061df3412d2303099a7511ffff96a5873cb69d8ac4b7bed7ff3176f89306c1fc17 SHA512 614426f9fe99c130354991db3fb4f1f986df2329912edbdd91a1bf201a40ea5eae8a05105f675d136a00563aea397e6ec1140f49c3a296a4b360f490dd565079
+EBUILD trojita-0.7-r4.ebuild 1931 BLAKE2B 4fbb5a511d7d756c79295344802e515d8f3d62aef2b82793d6be8be53d0fbe9383af5de8a949f3e3c6d4c608cef1d783f45e4fee538e112e21332477f832d364 SHA512 b34621b29c94c7758eb4741f3832e0da93b0a600444f3cd2d71105a51e7844a3bf741ea6d26bfc60095ea2fbb5405e7ed8de70e913a4a5e7cee0c1c6d24027fa
 EBUILD trojita-9999.ebuild 1791 BLAKE2B 13bf1d7c29c274cc473948fc40058de9757d6ad51911767c29c961303510f52d6f215365d90ad7d8e0085be610d4edc25df07e443757678f4ff71a8f245de14e SHA512 8f3e67e677262e29a2d26996d741f2fa4685f9c480791e95eb5d925c37dfcc2d3316b5129e0fc677951f0b174ae89e53e35223a6cbc9620f85fea5b16d0cc945
 MISC metadata.xml 766 BLAKE2B b3fccdefcadc2ab93429fd991581a8b085546605ad00e68899a2d731f2217113f7271d5b53cef35dfab8063db05fd9662bdaff715a95bf73cfd8fa9c636f184f SHA512 b13adf41bd68543886b25fb0dfdc3c924e5fc050de4f4bbea383e91cb2d4542de83050695bd67b913f2707d8f6a689d6d387253c718ec7c78dd50abed3a3f633
diff --git a/mail-client/trojita/files/trojita-0.7-CVE-2019-10734.patch b/mail-client/trojita/files/trojita-0.7-CVE-2019-10734.patch
new file mode 100644
index 000000000000..d52edb042ad8
--- /dev/null
+++ b/mail-client/trojita/files/trojita-0.7-CVE-2019-10734.patch
@@ -0,0 +1,104 @@
+From 8db7f450d52539b4c72ee968384911b6813ad1e7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jkt@kde.org>
+Date: Thu, 25 Jun 2020 21:39:34 +0200
+Subject: [PATCH] Prevent a possible decryption oracle attack
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Thanks to Jens Mueller (Ruhr-Uni Bochum and FH Münster) for reporting
+this. The gist is that an attacker can embed arbitrary ciphertext into
+their messages. Trojita decrypts that, and when we hit reply, the
+original *cleartext* gets quoted and put into a reply for the attacker
+to see.
+
+Fix this by not quoting any plaintext which originated in an encrypted
+message. That's pretty draconian, but hey, it works and we never came up
+with any better patch. Also, given that Trojita does not encrypt
+outgoing messages yet, this is probably also a conservative thing to do.
+
+Change-Id: I84c45b9e707eb7c99eb7183c6ef59ef41cd62c43
+CVE: CVE-2019-10734
+BUG: 404697
+---
+ src/Cryptography/GpgMe++.cpp | 2 ++
+ src/Gui/MessageView.cpp      | 9 ++++++++-
+ src/Gui/PartWidget.cpp       | 8 ++++++++
+ src/Imap/Model/ItemRoles.h   | 2 +-
+ 4 files changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/src/Cryptography/GpgMe++.cpp b/src/Cryptography/GpgMe++.cpp
+index e012f603..716b8aff 100644
+--- a/src/Cryptography/GpgMe++.cpp
++++ b/src/Cryptography/GpgMe++.cpp
+@@ -267,6 +267,8 @@ QVariant GpgMePart::data(int role) const
+     switch (role) {
+     case Imap::Mailbox::RolePartSignatureVerifySupported:
+         return m_wasSigned;
++    case RolePartDecryptionSupported:
++        return m_isAllegedlyEncrypted;
+     case RolePartCryptoNotFinishedYet:
+         return m_waitingForData ||
+                 (m_crypto.valid() &&
+diff --git a/src/Gui/MessageView.cpp b/src/Gui/MessageView.cpp
+index 7d649308..c95e0878 100644
+--- a/src/Gui/MessageView.cpp
++++ b/src/Gui/MessageView.cpp
+@@ -354,7 +354,6 @@ bool MessageView::eventFilter(QObject *object, QEvent *event)
+ QString MessageView::quoteText() const
+ {
+     if (auto w = bodyWidget()) {
+-        QStringList quote = Composer::quoteText(w->quoteMe().split(QLatin1Char('\n')));
+         const Imap::Message::Envelope &e = message.data(Imap::Mailbox::RoleMessageEnvelope).value<Imap::Message::Envelope>();
+         QString sender;
+         if (!e.from.isEmpty())
+@@ -362,6 +361,14 @@ QString MessageView::quoteText() const
+         if (e.from.isEmpty())
+             sender = tr("you");
+ 
++        if (messageModel->index(0, 0) /* fake message root */.child(0, 0) /* first MIME part */.data(Imap::Mailbox::RolePartDecryptionSupported).toBool()) {
++            // This is just an UX improvement shortcut: real filtering for CVE-2019-10734 is in
++            // MultipartSignedEncryptedWidget::quoteMe().
++            // That is required because the encrypted part might not be the root part of the message.
++            return tr("On %1, %2 sent an encrypted message:\n> ...\n\n").arg(e.date.toLocalTime().toString(Qt::SystemLocaleLongDate), sender);
++        }
++
++        QStringList quote = Composer::quoteText(w->quoteMe().split(QLatin1Char('\n')));
+         // One extra newline at the end of the quoted text to separate the response
+         quote << QString();
+ 
+diff --git a/src/Gui/PartWidget.cpp b/src/Gui/PartWidget.cpp
+index bb27604d..96eff338 100644
+--- a/src/Gui/PartWidget.cpp
++++ b/src/Gui/PartWidget.cpp
+@@ -378,6 +378,14 @@ void MultipartSignedEncryptedWidget::updateStatusIndicator()
+ 
+ QString MultipartSignedEncryptedWidget::quoteMe() const
+ {
++    if (m_partIndex.data(Imap::Mailbox::RolePartDecryptionSupported).toBool()) {
++        // See CVE-2019-10734, the point is not to leak cleartext from encrypted content. Even when Trojita starts supporting
++        // encryption of outgoing mail, we will have to check whether the encrypted cleartext is from the same sender, whether
++        // it matches the list of recipients (which is dynamic and can be set later on), etc etc.
++        // TL;DR, this is a can of worms.
++        return tr("[Encrypted message]");
++    }
++
+     return quoteMeHelper(children());
+ }
+ 
+diff --git a/src/Imap/Model/ItemRoles.h b/src/Imap/Model/ItemRoles.h
+index 4588d4d0..00adb3bb 100644
+--- a/src/Imap/Model/ItemRoles.h
++++ b/src/Imap/Model/ItemRoles.h
+@@ -193,7 +193,7 @@ enum {
+     RolePartSignatureVerifySupported,
+     /** @short Is the format of this particular multipart/encrypted supported and recognized?
+ 
+-    See RolePartSignatureVerifySupported, this is an equivalent.
++    If true, this message part represents content of an encrypted message that Trojita can attempt to decrypt.
+     */
+     RolePartDecryptionSupported,
+     /** @short Is there any point in waiting longer?
+-- 
+GitLab
+
diff --git a/mail-client/trojita/files/trojita-0.7-CVE-2020-15047.patch b/mail-client/trojita/files/trojita-0.7-CVE-2020-15047.patch
new file mode 100644
index 000000000000..44f1a5dab018
--- /dev/null
+++ b/mail-client/trojita/files/trojita-0.7-CVE-2020-15047.patch
@@ -0,0 +1,82 @@
+From 77ddd5d44f2bf4155d0c9b6f7d05f01713b32d5d Mon Sep 17 00:00:00 2001
+From: Jan Kundrát <jkt@kde.org>
+Date: Thu, 25 Jun 2020 11:30:51 +0200
+Subject: [PATCH] SMTP: Do not ignore TLS errors
+
+This fixes a CVE-2020-15047 (category: CWE-295). Since commit 0083eea5ed
+which added initial, experimental support for SMTP message submission,
+we have apparently never implemented proper SSL/TLS error handling, and
+the code has ever since just kept silently ignoring any certificate
+verification errors.  As a result, Trojita was susceptible to a MITM
+attack when sending e-mails. The information leaked include user's
+authentication details, including the password, and the content of sent
+messages.
+
+Sorry for this :(.
+
+Now, this patch re-enabes proper TLS error handling. It was not possible
+to directly re-use our code for TLS key pinning which we are using for
+IMAP connections. In the Qt TLS code, the decision to accept or not
+accept a TLS connection is a blocking one, so the IMAP code relies upon
+the protocol state machine (i.e., another layer) for deciding whether to
+use or not to use the just-established TLS connection. Implementing an
+equivalent code in the SMTP library would be nice, but this hot-fix has
+a priority. As a result, SMTP connections to hosts with, e.g.,
+self-signed TLS certs, are no longer possible. Let's hope that this is
+not a practical problem with Lets Encrypt anymore.
+
+Thanks to Damian Poddebniak for reporting this bug.
+
+Change-Id: Icd6bbb2b0fb3e45159fc9699ebd07ab84262fe37
+CVE: CVE-2020-15047
+BUG: 423453
+---
+
+diff --git a/src/MSA/SMTP.cpp b/src/MSA/SMTP.cpp
+index 3a05451..ac1eefc 100644
+--- a/src/MSA/SMTP.cpp
++++ b/src/MSA/SMTP.cpp
+@@ -21,6 +21,7 @@
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ #include "SMTP.h"
++#include "UiUtils/Formatting.h"
+ 
+ namespace MSA
+ {
+@@ -32,8 +33,8 @@
+     user(user), failed(false), isWaitingForPassword(false), sendingMode(MODE_SMTP_INVALID)
+ {
+     qwwSmtp = new QwwSmtpClient(this);
+-    // FIXME: handle SSL errors properly
+-    connect(qwwSmtp, &QwwSmtpClient::sslErrors, qwwSmtp, &QwwSmtpClient::ignoreSslErrors);
++    // FIXME: handle SSL errors in the same way as we handle IMAP TLS errors, with key pinning, etc.
++    connect(qwwSmtp, &QwwSmtpClient::sslErrors, this, &SMTP::handleSslErrors);
+     connect(qwwSmtp, &QwwSmtpClient::connected, this, &AbstractMSA::sending);
+     connect(qwwSmtp, &QwwSmtpClient::done, this, &SMTP::handleDone);
+     connect(qwwSmtp, &QwwSmtpClient::socketError, this, &SMTP::handleError);
+@@ -78,6 +79,12 @@
+     emit error(msg);
+ }
+ 
++void SMTP::handleSslErrors(const QList<QSslError>& errors)
++{
++    auto msg = UiUtils::Formatting::sslErrorsToHtml(errors);
++    emit error(tr("<p>Cannot send message due to an SSL/TLS error</p>\n%1").arg(msg));
++}
++
+ void SMTP::setPassword(const QString &password)
+ {
+     pass = password;
+diff --git a/src/MSA/SMTP.h b/src/MSA/SMTP.h
+index 453407d..913bb87 100644
+--- a/src/MSA/SMTP.h
++++ b/src/MSA/SMTP.h
+@@ -43,6 +43,7 @@
+     virtual void setPassword(const QString &password);
+     void handleDone(bool ok);
+     void handleError(QAbstractSocket::SocketError err, const QString &msg);
++    void handleSslErrors(const QList<QSslError>& errors);
+ private:
+     QwwSmtpClient *qwwSmtp;
+     QString host;
diff --git a/mail-client/trojita/files/trojita-0.7-cmake-cxx11.patch b/mail-client/trojita/files/trojita-0.7-cmake-cxx11.patch
new file mode 100644
index 000000000000..71ab15950b83
--- /dev/null
+++ b/mail-client/trojita/files/trojita-0.7-cmake-cxx11.patch
@@ -0,0 +1,66 @@
+From e2e35bfda75a2f4950408c93ede72fabfe86360e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jkt@kde.org>
+Date: Wed, 19 Oct 2016 22:15:16 +0200
+Subject: [PATCH] cmake: Speed up cmake by using native features for enforcing
+ C++11
+
+This saves about 8 seconds in my (limited) testing with a 2016-era
+laptop with plenty of RAM and a fast SSD.
+
+We still attempt to support ancient pre-3.1 CMake by adding that blurb
+into CXXFLAGS, maybe it even works.
+
+I should probably start tracking time I spend supporting old
+environments and evaluate whether this is worth the effort. Once we are
+ready to distribute flatpaks/appimages/whatevers, I suspect that my life
+will become much easier.
+
+Change-Id: Ibbbe3d8440a7d29ef27440a99938d313bfe9699f
+---
+ CMakeLists.txt                                |  26 ++--
+ 24 files changed, 8 insertions(+), 468 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9393b19c..92a682f7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -18,6 +18,14 @@ if(POLICY CMP0043)
+     cmake_policy(SET CMP0043 OLD)
+ endif()
+ 
++if(CMAKE_VERSION VERSION_LESS "3.1")
++    # If you aren't using and old Linux with an old GCC and old CMake, please just upgrade.
++    set(CMAKE_CXX_FLAGS "--std=c++11 ${CMAKE_CXX_FLAGS}")
++else()
++    set(CMAKE_CXX_STANDARD 11)
++    set(CMAKE_CXX_STANDARD_REQUIRED ON)
++endif()
++
+ # Set a default build type if none was specified. This was shamelessly stolen
+ # from VTK's cmake setup because these guys produce both CMake and a project that
+ # manipulates this variable, and the web is full of posts where people say that
+@@ -34,24 +42,6 @@ endif()
+ 
+ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+ 
+-include(FindCXXFeatures)
+-if(NOT CXXFeatures_auto_FOUND)
+-    message(SEND_ERROR "Your compiler doesn't support C++11's auto")
+-endif()
+-if(NOT CXXFeatures_static_assert_FOUND)
+-    message(SEND_ERROR "Your compiler doesn't support C++11's static_assert")
+-endif()
+-if(NOT CXXFeatures_alignof_FOUND)
+-    message(SEND_ERROR "Your compiler doesn't support C++11's alignof")
+-endif()
+-if(NOT CXXFeatures_nullptr_FOUND)
+-    message(SEND_ERROR "Your compiler doesn't support C++11's nullptr")
+-endif()
+-if(NOT CXXFeatures_lambda_FOUND)
+-    message(SEND_ERROR "Your compiler doesn't support C++11's lambda functions")
+-endif()
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_COMPILER_FLAGS}")
+-
+ include(TrojitaOption)
+ 
+ trojita_option(WITH_DESKTOP "Build desktop version" ON)
diff --git a/mail-client/trojita/files/trojita-0.7-qt-5.13.patch b/mail-client/trojita/files/trojita-0.7-qt-5.13.patch
new file mode 100644
index 000000000000..9f1ab3e7e887
--- /dev/null
+++ b/mail-client/trojita/files/trojita-0.7-qt-5.13.patch
@@ -0,0 +1,37 @@
+From 39772585033c1c0aff96f297e93de7be53f9b114 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Sat, 23 Mar 2019 01:17:11 +0100
+Subject: [PATCH] tests: Fix build with Qt 5.13
+
+QTest::toString(QModelIndex) was added in
+7ef0b575b38d267bd3dc14ff46935d556562ff00 and thus causes a build
+error with Qt 5.13 because it's redefined here.
+
+Change-Id: I015800e49cf8d0e87f3541642406396f150d0eeb
+---
+ tests/Imap/test_Imap_BodyParts.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tests/Imap/test_Imap_BodyParts.cpp b/tests/Imap/test_Imap_BodyParts.cpp
+index f1c577fa..b6e0421d 100644
+--- a/tests/Imap/test_Imap_BodyParts.cpp
++++ b/tests/Imap/test_Imap_BodyParts.cpp
+@@ -51,6 +51,7 @@ struct Data {
+ 
+ Q_DECLARE_METATYPE(QList<Data>)
+ 
++#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
+ namespace QTest {
+ template <>
+ char *toString(const QModelIndex &index)
+@@ -60,6 +61,7 @@ char *toString(const QModelIndex &index)
+     return qstrdup(buf.toUtf8().constData());
+ }
+ }
++#endif
+ 
+ using namespace Imap::Mailbox;
+ 
+-- 
+GitLab
+
diff --git a/mail-client/trojita/trojita-0.7-r4.ebuild b/mail-client/trojita/trojita-0.7-r4.ebuild
new file mode 100644
index 000000000000..e9b7c9e515a5
--- /dev/null
+++ b/mail-client/trojita/trojita-0.7-r4.ebuild
@@ -0,0 +1,86 @@
+# 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://anongit.kde.org/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+inherit cmake virtualx xdg
+
+DESCRIPTION="A Qt IMAP e-mail client"
+HOMEPAGE="http://trojita.flaska.net/"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+IUSE="+crypt +dbus debug +password test +zlib"
+
+REQUIRED_USE="password? ( dbus )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	zlib? ( virtual/pkgconfig )
+"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	crypt? (
+		>=app-crypt/gpgme-1.8.0[cxx,qt5]
+		dev-libs/mimetic
+	)
+	dbus? ( dev-qt/qtdbus:5 )
+	password? ( dev-libs/qtkeychain[qt5(+)] )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+
+DOCS=( README LICENSE )
+
+PATCHES=(
+	"${FILESDIR}/${P}-gpgme.patch"
+	"${FILESDIR}/${P}-gpg-tests.patch"
+	"${FILESDIR}/${P}-qt-5.11b3.patch"
+	"${FILESDIR}/${P}-qt-5.13.patch" # bug 730058
+	"${FILESDIR}/${P}-qt-5.15.patch"
+	"${FILESDIR}/${P}-CVE-2019-10734.patch" # KDE-bug 404697
+	"${FILESDIR}/${P}-CVE-2020-15047.patch" # bug 729596
+	"${FILESDIR}/${P}-cmake-cxx11.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# the build system is taking a look at `git describe ... --dirty` and
+	# gentoo's modifications to CMakeLists.txt break these
+	sed -e "s/--dirty//" -i cmake/TrojitaVersion.cmake || die "Cannot fix the version check"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_CRYPTO_MESSAGES=$(usex crypt)
+		-DWITH_GPGMEPP=$(usex crypt)
+		-DWITH_MIMETIC=$(usex crypt)
+		-DWITH_DBUS=$(usex dbus)
+		-DWITH_QTKEYCHAIN_PLUGIN=$(usex password)
+		-DWITH_TESTS=$(usex test)
+		-DWITH_ZLIB=$(usex zlib)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test
+}
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 18829ace0edb..1f2c4887ce61 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/libmilter/Manifest b/mail-filter/libmilter/Manifest
index 6ea8a6cd9a11..c4ab7f2a8d2c 100644
--- a/mail-filter/libmilter/Manifest
+++ b/mail-filter/libmilter/Manifest
@@ -1,10 +1,12 @@
 AUX gentoo.config.m4 168 BLAKE2B bbd9a011f6ca442aebb3f4e0177dfae6c1f8b246a493205be7b9b1b9837fd5bf0eac59cc46eebe639f9938d9d3eea99ff48962938a69198560ce76c8458a5906 SHA512 68b4c02527845ec54c694cbf6f4f7c589aa1317269d25cee6e65ea69243d29215790294180588c3436e72dd6f86163234111d3a762e926da3bfb7acf69f1c4b3
 AUX libmilter-build-system.patch 6855 BLAKE2B 987a71369b672d74835cb37a4ad5ceb58aa8b0fd451ffbcfbcba8ff89dafae58d0c9d412fec8c2a0f0621cce4b8bfce3ee618aa399feb6d7523bd22e3a210fe3 SHA512 d36adc49d5fec792139a921b5292ad0a6d71c11a31093cb1249f4e19b8255bb5a287beb3537b2ec0316d97505233cdd708bac27c0d4e1f54464918d4730be43b
 AUX libmilter-glibc-2.30.patch 686 BLAKE2B 51a3053970fea27ca54fad929148e47ca3091150c3330bbd1b3841a44bed1735e0b9941bd4042e7ccc1eb00b87a65639a4b156db664dfece0b5b146873305ce1 SHA512 5fe9d972e459f95268e56a1a7ddae9ec06c19a7bd070a2a32fc45b4cb99aaae335481f01bab5cd4e2a841e25928962749373cbffcaefb08692fda0b896a56cf1
+AUX libmilter-musl-disable-cdefs.patch 352 BLAKE2B 192218bd59e4b5b4b7b7dd8f0a7a3ea19a3df1de3d32ad11c3b7159e55d92d7a2a500c7449dcd2c63b2d84934a18205f45b2962e7a80621697e81bcfbd7e1bdf SHA512 1305d7b0d0742d26fcb742b8751672ec03033abc2b01bb95a31c533dd197903138c3d39468fe104fb4779017d036f5c1656e06454e891e08155b34bbe1718292
+AUX libmilter-musl-stack-size.patch 1522 BLAKE2B c2348f569cf69d52418beef8b2fc5fea31d5e100ab849220aca1ebbae44a955c482c375a02ddf43524894574355cebdc292b9566bfa420dead96df2d229a44a8 SHA512 d3e12943fe7e9babdf700a2d8c0229bc16fa2ea16097615600341dee13f137b157ffa4b03f76c92ba9c5552ca3bf01cb598f6a6201720408df3a37247001a219
 AUX libmilter-sharedlib.patch 2843 BLAKE2B d64be1f4f4561a4056bca9784f00b4c965adbf30e99e1b9318162e6a3dad043eb508e925234a586443a8e8fd992f8aee67557f6c3d1e54f644d9c6c8fa7c267a SHA512 31c36b57739946c1b9c7c85307fe5c53c45d7f8cbf427a0f2248db8b74871a6f5a30ef1af524915821aeca54310d28272bcd0a587cb918192214fa5c30e4a8da
 AUX sendmail-8.14.6-build-system.patch 12909 BLAKE2B 7643aad99583e533246834a069611588dc667ff2c664eb9c6c088d8f340f69306a9e2f56da6f967c34ebdfafcd697498f29f2a05dccce51083b59d9829f4bc8d SHA512 0e03b7cfd7f3002a36fed2fca60240314bac175a502ca9bda8397e7ad07e26faf8d3437bbdcdb9cda4dbc6b4917ca0ed1b5c9126ad246044dc7da8ce3ad70b54
 DIST sendmail.8.14.5.tar.gz 2092508 BLAKE2B 3d90fa9778ebb42f2f334b35e46d0f24e8fcfd46fe69d6032f246c90fc998fbeb21e70c70bc454c688a76ea00c90ee9b5f0e5e0fc9b89b9f16fa9c814a825f9c SHA512 178addd247f1c7c8ca90d70b9240db4cad4e55f0710d5df0fe979e5473a182d2035150c352836576a28bb2b9660b0d5ebfcd95269a156ac0d2c3dba3edb60452
 DIST sendmail.8.15.2.tar.gz 2207417 BLAKE2B 3d9dfb5bc2b535e30ef2fc61333e12a9b1fc45a5d730d2bed1ef956adb574721833f87aeba0475705b76e0c7d6cf00f9a10025bffb0de6c6b4dae606eb2ec399 SHA512 04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9
 EBUILD libmilter-1.0.2.ebuild 1902 BLAKE2B ca8b7252baddcc96ce6660356a29a8f1006a7d9ae737f7dff3306d3a80cda8ce553d4e7d53a5b2ad646e5cb12b987e0c6052b6eca9fcf65c60eb87d8f67bc8be SHA512 a02c5bd778ac79e6bdb66c6dd76687517a28f105622988330860257790d79b65edb514749a44df548480cbf27701f29db4117732e1cededfec8dff23350d4bde
-EBUILD libmilter-1.0.2_p1.ebuild 2028 BLAKE2B e995eefcaac442b1128fe4429353846f32dfc495d63798367de85b2c27b1f3a401c294e2ca9de38b114200bb28a4ea01e4d57999c193415b80045b1c5630b3b5 SHA512 200847443f1d65314a58c490341563deadaedb7bfb1186b76d7e6cbfc2050a7fe0e8d1d8591abb86585cb867e919fa7eaf5983d71c43ef57b182fdad3486683b
-MISC metadata.xml 300 BLAKE2B 410778ccb51b94b32d34d1c9b70f2deff712ad96143c4bd4bbf027f6910e7dfa700dfd8ee07c774043a3d4b7ad6507e5457af71a44fda6b3a81b46cd976b9185 SHA512 07af4a01f72fbe8c5ccdbfa72ea3a869e07a9907f8e878d6df03d1fc3061304280fc9e813958061f00f101571343ada901ec2fd1917760c60c631804498089e5
+EBUILD libmilter-1.0.2_p1.ebuild 2214 BLAKE2B 8452d0976b146f92d7a8684986c5ef8e9dceecbc504806b3b53e2778d982d8a51bf4e440fbbe04dbd3392386fd5b1afdc62106e4e5d0faf3e863215a9b9622e8 SHA512 128027206c5978e49ccec7469ef14b1a67f977478b8182dec00a478671dafb0599a7a3a8338f2d8c2077ec806209faa6cc51070c6bfe70164d5fc344a4fc0013
+MISC metadata.xml 241 BLAKE2B 7e817e3e8547331152f2d3378fe5681d02cccc2ec04dfbe21833282edc6c826a93b9493110f5f0afd05edbbbb84a1a185db7e17d154399aabd1e70ab044c3ecd SHA512 bec8ce3a2140871a48e34ad88eeefd1bf05b2d6508e2a5ca4c406aa0ca2729b0b827ae02dd4fd707630894e1c8fc367cdb9840b791ad8ee596d067d40c36aa42
diff --git a/mail-filter/libmilter/files/libmilter-musl-disable-cdefs.patch b/mail-filter/libmilter/files/libmilter-musl-disable-cdefs.patch
new file mode 100644
index 000000000000..6dc4ac63105e
--- /dev/null
+++ b/mail-filter/libmilter/files/libmilter-musl-disable-cdefs.patch
@@ -0,0 +1,11 @@
+--- a/include/sm/os/sm_os_linux.h	2020-06-09 11:57:46.789786561 +0200
++++ b/include/sm/os/sm_os_linux.h	2020-06-09 11:57:49.174781812 +0200
+@@ -33,7 +33,7 @@
+ # endif /* LINUX_VERSION_CODE */
+ #endif /* SM_CONF_SHM */
+
+-#define SM_CONF_SYS_CDEFS_H	1
++#define SM_CONF_SYS_CDEFS_H	0
+ #ifndef SM_CONF_SEM
+ # define SM_CONF_SEM	2
+ #endif /* SM_CONF_SEM */
diff --git a/mail-filter/libmilter/files/libmilter-musl-stack-size.patch b/mail-filter/libmilter/files/libmilter-musl-stack-size.patch
new file mode 100644
index 000000000000..9993adfece34
--- /dev/null
+++ b/mail-filter/libmilter/files/libmilter-musl-stack-size.patch
@@ -0,0 +1,42 @@
+Set default pthread stack size to 256 KB
+
+This patch tries to fix various crashes for applications depending on libmilter
+by setting the stack size for pthreads to 256 KB. The default stack size for
+musl libc is set to 80 KB whereas glibc has it set to 8 MB. This causes problems
+when a large amount of memory is allocated on the stack.
+
+For example, opendkim allocates blocks of 64 KB multiple times, which causes
+libmilter (and therefore opendkim) to crash. For now, a stack size of 256 KB
+looks sufficient and makes opendkim stop crashing.
+
+Fixes https://bugs.alpinelinux.org/issues/6360
+
+--- a/libmilter/libmilter.h
++++ b/libmilter/libmilter.h
+@@ -127,10 +127,10 @@
+ # define MI_SOCK_READ(s, b, l)	read(s, b, l)
+ # define MI_SOCK_READ_FAIL(x)	((x) < 0)
+ # define MI_SOCK_WRITE(s, b, l)	write(s, b, l)
+-
+-# define thread_create(ptid,wr,arg) pthread_create(ptid, NULL, wr, arg)
+ # define sthread_get_id()	pthread_self()
+
++extern int thread_create(pthread_t *ptid, void *(*wr) (void *), void *arg);
++
+ typedef pthread_mutex_t smutex_t;
+ # define smutex_init(mp)	(pthread_mutex_init(mp, NULL) == 0)
+ # define smutex_destroy(mp)	(pthread_mutex_destroy(mp) == 0)
+--- a/libmilter/main.c
++++ b/libmilter/main.c
+@@ -16,6 +16,12 @@
+ #include <fcntl.h>
+ #include <sys/stat.h>
+
++int thread_create(pthread_t *ptid, void *(*wr) (void *), void *arg) {
++	pthread_attr_t attr;
++	pthread_attr_init(&attr);
++	pthread_attr_setstacksize(&attr,256*1024);
++	return pthread_create(ptid, &attr, wr, arg);
++}
+
+ static smfiDesc_ptr smfi = NULL;
diff --git a/mail-filter/libmilter/libmilter-1.0.2_p1.ebuild b/mail-filter/libmilter/libmilter-1.0.2_p1.ebuild
index f2d436b1e73d..b9a1147970d6 100644
--- a/mail-filter/libmilter/libmilter-1.0.2_p1.ebuild
+++ b/mail-filter/libmilter/libmilter-1.0.2_p1.ebuild
@@ -42,6 +42,13 @@ src_prepare() {
 	use ipv6 && ENVDEF="${ENVDEF} -DNETINET6"
 	use poll && ENVDEF="${ENVDEF} -DSM_CONF_POLL=1"
 
+	if use elibc_musl; then
+		use ipv6 && ENVDEF="${ENVDEF} -DNEEDSGETIPNODE"
+
+		eapply "${FILESDIR}/${PN}-musl-stack-size.patch"
+		eapply "${FILESDIR}/${PN}-musl-disable-cdefs.patch"
+	fi
+
 	sed -e "s|@@CFLAGS@@|${CFLAGS}|" \
 		-e "s:@@LDFLAGS@@:${LDFLAGS}:" \
 		-e "s:@@CC@@:${CC}:" \
diff --git a/mail-filter/libmilter/metadata.xml b/mail-filter/libmilter/metadata.xml
index 473746684395..1f7cf13f9299 100644
--- a/mail-filter/libmilter/metadata.xml
+++ b/mail-filter/libmilter/metadata.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription>The Sendmail filter API (Milter)</longdescription>
-<use>
-	<flag name="poll">Use poll instead of select</flag>
-</use>
+  <!-- maintainer-needed -->
+  <use>
+    <flag name="poll">Use poll instead of select</flag>
+  </use>
 </pkgmetadata>
diff --git a/mail-filter/sqlgrey/Manifest b/mail-filter/sqlgrey/Manifest
index 6bb049129585..f2a455fde0d5 100644
--- a/mail-filter/sqlgrey/Manifest
+++ b/mail-filter/sqlgrey/Manifest
@@ -4,5 +4,5 @@ AUX sqlgrey.service 429 BLAKE2B 330c83bbe4f4ce4aabef28d9eb3c00d9c1659ad899e1c4aa
 DIST sqlgrey-1.7.6.tar.bz2 63738 BLAKE2B 7835079f3f220c2894781cb1ba8d1cac66f46e9fad7f17bfc0f1f7e2cfe1b1b05664179abacb873acf1829114093c48764c34e1a0a3128503f8e3f134dd0772d SHA512 62822d808aa5991a8d29f455be933cf782c9d5232b63bd1f357093a06982474018fb7a02dedf29274d8b7e9f12525063e6af744efceecf420cd01e74f561aa81
 DIST sqlgrey-1.8.0.tar.gz 69476 BLAKE2B f48aa9e41a988338a817026fbf022e145922db0bad9983e4d7cde7bc621560ce6189e494cfba5dd5f48ba4ff30e47686c54298f9a006b8fcc2b27444e102b0d1 SHA512 97ab057bf7111159166a6963d5948c10468731730136ddca6449d2d629f39235c09d00497a52408bb87057905c1bf43bc064571ee6302d7f1f8c6408af82d044
 EBUILD sqlgrey-1.7.6-r2.ebuild 8425 BLAKE2B 80f5698cc229439f5ae8f04ca118ef55b5b38536f28f8526c4e26f21a27993c085bed14c74ec96b8255992d68dbe2688ba35ead05d52321888a1e59219360513 SHA512 e1852b976f89d8721398dcf66224e70bac48a6bd97dd6629fc4a9b911a8c380a3c563dc1f633aafde8163b58c1e4e1cb0a8f0b29207e1016b74d1f8b73347e98
-EBUILD sqlgrey-1.8.0.ebuild 1648 BLAKE2B a4c694e130b6e9cceac7e8d96013f3272a770e75b53714c929fd713b278c6f227c7860cdb6f464d07f8b802b252d0da310199297d15cee1a0b7e2be89b048388 SHA512 09529b366a5b984d9f0d3879447d37d6320363d0fe603dcf1c2b470138e1e0300db37eff8f3635c24566928e2c96c9594e38b744f5cdbe92c61112c7ac83d151
-MISC metadata.xml 352 BLAKE2B 22d2cabf23b745a432e22edee82b9184fad33a5fe579cdd2b0efe584c9a34d422d16a7552dad88fe9ba93b11bd496920450d7510e627576d08ac9ed4c0df541b SHA512 4681c824087ebac9bd919143cc665481311fd503d58655323bef2d8e8f204a502daf7d0d05ba5aedfb32a67b97d2b942dc1f39eab35df92677a43d77fb1f04cb
+EBUILD sqlgrey-1.8.0.ebuild 1645 BLAKE2B 85b101cfd67e073a7bdcd6912b4ea51ee82660e15fa3ed40a043506f8623a3d94e74ddbb18025ab564963ad2856eef73a7ea042754be00fea95b460690ca01a4 SHA512 f42d5ad7a647b97cbc2e3a63dd9e1ee7d033b579f58868c06281cd62076594a40ec1f7786bf2479f80bb1a347ef1b810bbfeaeb1287905e3aa1910d112aa6391
+MISC metadata.xml 465 BLAKE2B fb0b2972766b6f5729e744b4028af9765e05150af88939f26256c106fa802cac8d74254404b655fb3713d72e6110068d7490825b9148777e1f2217e67f971189 SHA512 1b77ec96e116140f08e87028fe2c4c3e9e1b9428f89f9cb8349b9bdb3fdeaf7926f506aa55c7284fd430350c3091cad52f14a19ca1a9e9c322144a2001cb1999
diff --git a/mail-filter/sqlgrey/metadata.xml b/mail-filter/sqlgrey/metadata.xml
index 63614543d99c..2c49c7b239d6 100644
--- a/mail-filter/sqlgrey/metadata.xml
+++ b/mail-filter/sqlgrey/metadata.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>SQLgrey is a postfix policy service implementing a grey-listing
-policy.</longdescription>
+	<maintainer type="person">
+		<email>gentoo_bugs_peep@parallaxshift.com</email>
+		<name>Philippe Chaintreuil</name>
+	</maintainer>
+
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sqlgrey</remote-id>
 	</upstream>
diff --git a/mail-filter/sqlgrey/sqlgrey-1.8.0.ebuild b/mail-filter/sqlgrey/sqlgrey-1.8.0.ebuild
index 21a0450a89f1..1dccd8565268 100644
--- a/mail-filter/sqlgrey/sqlgrey-1.8.0.ebuild
+++ b/mail-filter/sqlgrey/sqlgrey-1.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/project/sqlgrey/sqlgrey-1.8%20%28stab
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~sparc ~x86"
+KEYWORDS="amd64 ~arm sparc x86"
 IUSE="mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index ac55200d2d2c..5a5e69ea28d9 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/notqmail/Manifest b/mail-mta/notqmail/Manifest
index 52f6df2f1cd8..86530272c380 100644
--- a/mail-mta/notqmail/Manifest
+++ b/mail-mta/notqmail/Manifest
@@ -5,6 +5,6 @@ DIST notqmail-1.08-tls-20200107.patch 50123 BLAKE2B 94bbab86bd089c6ac032bfabc300
 DIST notqmail-1.08.tar.xz 179500 BLAKE2B 6c774037b257849aea65e7761a6f6c9918079faa490c0ed027d73a8b32de5d5907a54a59162b9b68479229c4b92a23fe28cd2f334123cfe674a94502b90a3635 SHA512 c18d09e28c2e580522eea144e5344e814811108b12f3272b4cf10ad58d9d3d8e666616dcfea2f369e226b68db4fe8cf67cbae994b242d36e9e07c289a0539394
 DIST qmail-103.patch 2104 BLAKE2B 23721b3331c719f3b6deca8b2603bf824b66068d3901a84dda9edbe33b506d0c2b6e711364e2426d9e393453a54485f0286d4668f99cf6b9acabf10a5dc59b0a SHA512 b81062bb0b0023f474c0b6af40601926e1c04ad395de480d114809e48a8060c06d99bdbdeb6f44d9e24ae1acedabb094b979193d305371aed958f18fc6eee354
 DIST qmail-spp-0.42.tar.gz 18689 BLAKE2B df67f10f6daf9601fd074c774c5be4decca59f3e790774d502c28ebd495f9d7523ecebfd37abd333e347151647364d08d3ccc25099c82748bf7b7ea84bb18977 SHA512 03449862886a0ca20fbadab4c94b34b55d185f8df3261bd68aea99e9ded9edfab4477c6b38a8e0295e9b38b0045615da8b1a906a458f28745eadd3c4d882bcbf
-EBUILD notqmail-1.08.ebuild 4110 BLAKE2B 7aa42bde31307154135f71d3014a218d760ff57b62aed8be59ddc9440da1fe1fbf0e5ae2cd38c9bc375a25e71c92276ae63d8ec67470122ccf0bb82a3ee7cd3f SHA512 25738d78ef3d010c28199db3b12e6e73fb14065d6a8b14492b4b67ea65ff7227ee7a898d78921b5ddc0677bc913cd81bc904b655de43f2577d05436104c4da05
-EBUILD notqmail-9999.ebuild 4105 BLAKE2B f112f3b2c558d968aed2f459b8b4e4053626ddc0de41a24cbd91f6960e77d187def9a553852ee4f9e0c36ac1c6cd769567d32f3836773eb0b5289a511f8d9480 SHA512 746bf8db9db9bfd10c7e925222489626cebfb370ed8a9848152fa7c057831dd6be9899c76f2156e99a0d65185429b346d05eb0175ec18a31cd57806adf181a38
+EBUILD notqmail-1.08-r1.ebuild 4186 BLAKE2B 66033895ba0c99a73855dfe92fc7f09b372de8dfb778d2bcfcab2970e2ca6c39087862809c19a4b781381b71c8c644a616a4b0e8d74ddd6ea392e03062b16f10 SHA512 0a09696d10d0fe7aaf24f63b9e3c1c4aa1da691d5dcbe951fa61f59a6bdb7d150d58a22b932fb991b5bb0601cc6440d04ec476c44dcaac6f929bc4e2d9fe4b79
+EBUILD notqmail-9999.ebuild 4186 BLAKE2B 66033895ba0c99a73855dfe92fc7f09b372de8dfb778d2bcfcab2970e2ca6c39087862809c19a4b781381b71c8c644a616a4b0e8d74ddd6ea392e03062b16f10 SHA512 0a09696d10d0fe7aaf24f63b9e3c1c4aa1da691d5dcbe951fa61f59a6bdb7d150d58a22b932fb991b5bb0601cc6440d04ec476c44dcaac6f929bc4e2d9fe4b79
 MISC metadata.xml 777 BLAKE2B 8e69eece4987057c0ba550b3e82d92f28dc308c77e71db483146a7e3b09fcd8bb22938d44009ac1dbb437c8cfdf44ddee07fc9b76feefa83e018249311537cb7 SHA512 54cff14308dc5240e9288cb63490cc1dad34d76963d166f94cce00a86ae1fd31e4e0be3144a9dede5bf7973d89dafa2f3acc5b438d95a594400a1a56cdf6f5b0
diff --git a/mail-mta/notqmail/notqmail-1.08-r1.ebuild b/mail-mta/notqmail/notqmail-1.08-r1.ebuild
new file mode 100644
index 000000000000..eb09e7fa8d30
--- /dev/null
+++ b/mail-mta/notqmail/notqmail-1.08-r1.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENQMAIL_PV=20191010
+QMAIL_SPP_PV=0.42
+
+QMAIL_TLS_PV=20200107
+QMAIL_TLS_F=notqmail-1.08-tls-${QMAIL_TLS_PV}.patch
+
+QMAIL_BIGTODO_F=notqmail-1.08-big-todo.patch
+
+QMAIL_LARGE_DNS="qmail-103.patch"
+
+inherit qmail systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/notqmail/notqmail.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://github.com/notqmail/notqmail/releases/download/${P}/${P}.tar.xz"
+fi
+
+DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer agent"
+HOMEPAGE="
+	https://notqmail.org
+	https://cr.yp.to/qmail.html
+	http://qmail.org
+"
+SRC_URI="${SRC_URI}
+	https://github.com/DerDakon/genqmail/releases/download/genqmail-${GENQMAIL_PV}/${GENQMAIL_F}
+	https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
+	!vanilla? (
+		highvolume? (
+			https://github.com/notqmail/notqmail/commit/3a22b45974ddd1230da0dfa21f886c3401bee020.patch -> ${QMAIL_BIGTODO_F}
+		)
+		qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
+		https://github.com/notqmail/notqmail/commit/b224a3ceb63ff8ebc57648bf304e079d0bf55023.patch -> ${PN}-1.08-auth.patch
+		ssl? (
+			https://github.com/notqmail/notqmail/commit/ed58c2eff21612037bbcc633f4b3a8e708f522a0.patch -> ${QMAIL_TLS_F}
+		)
+	)
+"
+
+LICENSE="public-domain"
+SLOT="0"
+IUSE="authcram gencertdaily highvolume libressl -pop3 qmail-spp ssl test vanilla"
+REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	net-dns/libidn2
+	net-mail/queue-repair
+	sys-apps/gentoo-functions
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.1:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	test? ( dev-libs/check )
+"
+RDEPEND="${DEPEND}
+	acct-group/nofiles
+	acct-group/qmail
+	acct-user/alias
+	acct-user/qmaild
+	acct-user/qmaill
+	acct-user/qmailp
+	acct-user/qmailq
+	acct-user/qmailr
+	acct-user/qmails
+	sys-apps/ucspi-tcp
+	virtual/checkpassword
+	virtual/daemontools
+	authcram? ( >=net-mail/cmd5checkpw-0.30 )
+	ssl? (
+		pop3? ( sys-apps/ucspi-ssl )
+	)
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/msmtp[mta]
+	!mail-mta/nullmailer
+	!mail-mta/opensmtpd
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/netqmail
+	!mail-mta/sendmail
+	!mail-mta/ssmtp[mta]
+"
+
+src_unpack() {
+	genqmail_src_unpack
+	use qmail-spp && qmail_spp_src_unpack
+
+	[[ ${PV} == "9999" ]] && git-r3_src_unpack
+	[[ ${PV} != "9999" ]] && default
+}
+
+PATCHES=(
+	"${DISTDIR}/${QMAIL_LARGE_DNS}"
+)
+
+src_prepare() {
+	if ! use vanilla; then
+		if use ssl; then
+			PATCHES+=( "${DISTDIR}/${QMAIL_TLS_F}" )
+		else
+			PATCHES+=( "${DISTDIR}/${P}-auth.patch" )
+		fi
+		if use highvolume; then
+			PATCHES+=( "${DISTDIR}/${QMAIL_BIGTODO_F}" )
+		fi
+
+		if use qmail-spp; then
+			if use ssl; then
+				SPP_PATCH="${QMAIL_SPP_S}/qmail-spp-smtpauth-tls-20060105.diff"
+			else
+				SPP_PATCH="${QMAIL_SPP_S}/netqmail-spp.diff"
+			fi
+			# make the patch work with "-p1"
+			sed -e 's#^--- \([Mq]\)#--- a/\1#' -e 's#^+++ \([Mq]\)#+++ b/\1#' -i ${SPP_PATCH} || die
+
+			PATCHES+=( "${SPP_PATCH}" )
+		fi
+	fi
+
+	default
+
+	qmail_src_postunpack
+
+	if ! use authcram; then
+		einfo "Disabled CRAM_MD5 support"
+		sed -e 's,^#define CRAM_MD5$,/*&*/,' -i "${S}"/qmail-smtpd.c || die
+	else
+		einfo "Enabled CRAM_MD5 support"
+	fi
+
+	ht_fix_file Makefile*
+}
+
+src_compile() {
+	qmail_src_compile NROFF=true
+	emake qmail-send.service
+	use qmail-spp && qmail_spp_src_compile
+}
+
+src_install() {
+	qmail_src_install
+	systemd_dounit "${S}"/qmail-send.service
+}
+
+src_test() {
+	emake test
+}
+
+pkg_postinst() {
+	qmail_queue_setup
+	qmail_rootmail_fixup
+	qmail_tcprules_build
+
+	qmail_config_notice
+	qmail_supervise_config_notice
+	elog
+	elog "If you are looking for documentation, check those links:"
+	elog "https://wiki.gentoo.org/wiki/Virtual_mail_hosting_with_qmail"
+	elog "  -- qmail/vpopmail Virtual Mail Hosting System Guide"
+	elog "http://www.lifewithqmail.com/"
+	elog "  -- Life with qmail"
+	elog
+}
+
+pkg_preinst() {
+	qmail_tcprules_fixup
+}
+
+pkg_config() {
+	# avoid some weird locale problems
+	export LC_ALL=C
+
+	qmail_config_fast
+	qmail_tcprules_config
+	qmail_tcprules_build
+
+	use ssl && qmail_ssl_generate
+}
diff --git a/mail-mta/notqmail/notqmail-1.08.ebuild b/mail-mta/notqmail/notqmail-1.08.ebuild
deleted file mode 100644
index 7378c6d1a126..000000000000
--- a/mail-mta/notqmail/notqmail-1.08.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENQMAIL_PV=20191010
-QMAIL_SPP_PV=0.42
-
-QMAIL_TLS_PV=20200107
-QMAIL_TLS_F=notqmail-1.08-tls-${QMAIL_TLS_PV}.patch
-
-QMAIL_BIGTODO_F=notqmail-1.08-big-todo.patch
-
-QMAIL_LARGE_DNS="qmail-103.patch"
-
-inherit qmail
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/notqmail/notqmail.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://github.com/notqmail/notqmail/releases/download/${P}/${P}.tar.xz"
-fi
-
-DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer agent"
-HOMEPAGE="
-	https://notqmail.org
-	https://cr.yp.to/qmail.html
-	http://qmail.org
-"
-SRC_URI="${SRC_URI}
-	https://github.com/DerDakon/genqmail/releases/download/genqmail-${GENQMAIL_PV}/${GENQMAIL_F}
-	https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
-	!vanilla? (
-		highvolume? (
-			https://github.com/notqmail/notqmail/commit/3a22b45974ddd1230da0dfa21f886c3401bee020.patch -> ${QMAIL_BIGTODO_F}
-		)
-		qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
-		https://github.com/notqmail/notqmail/commit/b224a3ceb63ff8ebc57648bf304e079d0bf55023.patch -> ${PN}-1.08-auth.patch
-		ssl? (
-			https://github.com/notqmail/notqmail/commit/ed58c2eff21612037bbcc633f4b3a8e708f522a0.patch -> ${QMAIL_TLS_F}
-		)
-	)
-"
-
-LICENSE="public-domain"
-SLOT="0"
-IUSE="authcram gencertdaily highvolume libressl -pop3 qmail-spp ssl test vanilla"
-REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	net-dns/libidn2
-	net-mail/queue-repair
-	sys-apps/gentoo-functions
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.1:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	test? ( dev-libs/check )
-"
-RDEPEND="${DEPEND}
-	acct-group/nofiles
-	acct-group/qmail
-	acct-user/alias
-	acct-user/qmaild
-	acct-user/qmaill
-	acct-user/qmailp
-	acct-user/qmailq
-	acct-user/qmailr
-	acct-user/qmails
-	sys-apps/ucspi-tcp
-	virtual/checkpassword
-	virtual/daemontools
-	authcram? ( >=net-mail/cmd5checkpw-0.30 )
-	ssl? (
-		pop3? ( sys-apps/ucspi-ssl )
-	)
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/msmtp[mta]
-	!mail-mta/nullmailer
-	!mail-mta/opensmtpd
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/netqmail
-	!mail-mta/sendmail
-	!mail-mta/ssmtp[mta]
-"
-
-src_unpack() {
-	genqmail_src_unpack
-	use qmail-spp && qmail_spp_src_unpack
-
-	[[ ${PV} == "9999" ]] && git-r3_src_unpack
-	[[ ${PV} != "9999" ]] && default
-}
-
-PATCHES=(
-	"${DISTDIR}/${QMAIL_LARGE_DNS}"
-)
-
-src_prepare() {
-	if ! use vanilla; then
-		if use ssl; then
-			PATCHES+=( "${DISTDIR}/${QMAIL_TLS_F}" )
-		else
-			PATCHES+=( "${DISTDIR}/${P}-auth.patch" )
-		fi
-		if use highvolume; then
-			PATCHES+=( "${DISTDIR}/${QMAIL_BIGTODO_F}" )
-		fi
-
-		if use qmail-spp; then
-			if use ssl; then
-				SPP_PATCH="${QMAIL_SPP_S}/qmail-spp-smtpauth-tls-20060105.diff"
-			else
-				SPP_PATCH="${QMAIL_SPP_S}/netqmail-spp.diff"
-			fi
-			# make the patch work with "-p1"
-			sed -e 's#^--- \([Mq]\)#--- a/\1#' -e 's#^+++ \([Mq]\)#+++ b/\1#' -i ${SPP_PATCH} || die
-
-			PATCHES+=( "${SPP_PATCH}" )
-		fi
-	fi
-
-	default
-
-	qmail_src_postunpack
-
-	if ! use authcram; then
-		einfo "Disabled CRAM_MD5 support"
-		sed -e 's,^#define CRAM_MD5$,/*&*/,' -i "${S}"/qmail-smtpd.c || die
-	else
-		einfo "Enabled CRAM_MD5 support"
-	fi
-
-	ht_fix_file Makefile*
-}
-
-src_compile() {
-	qmail_src_compile NROFF=true
-	use qmail-spp && qmail_spp_src_compile
-}
-
-src_install() {
-	qmail_src_install
-}
-
-src_test() {
-	emake test
-}
-
-pkg_postinst() {
-	qmail_queue_setup
-	qmail_rootmail_fixup
-	qmail_tcprules_build
-
-	qmail_config_notice
-	qmail_supervise_config_notice
-	elog
-	elog "If you are looking for documentation, check those links:"
-	elog "https://wiki.gentoo.org/wiki/Virtual_mail_hosting_with_qmail"
-	elog "  -- qmail/vpopmail Virtual Mail Hosting System Guide"
-	elog "http://www.lifewithqmail.com/"
-	elog "  -- Life with qmail"
-	elog
-}
-
-pkg_preinst() {
-	qmail_tcprules_fixup
-}
-
-pkg_config() {
-	# avoid some weird locale problems
-	export LC_ALL=C
-
-	qmail_config_fast
-	qmail_tcprules_config
-	qmail_tcprules_build
-
-	use ssl && qmail_ssl_generate
-}
diff --git a/mail-mta/notqmail/notqmail-9999.ebuild b/mail-mta/notqmail/notqmail-9999.ebuild
index b5ff5be5d0e3..eb09e7fa8d30 100644
--- a/mail-mta/notqmail/notqmail-9999.ebuild
+++ b/mail-mta/notqmail/notqmail-9999.ebuild
@@ -13,13 +13,13 @@ QMAIL_BIGTODO_F=notqmail-1.08-big-todo.patch
 
 QMAIL_LARGE_DNS="qmail-103.patch"
 
-inherit qmail
+inherit qmail systemd
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/notqmail/notqmail.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc"
+	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 	SRC_URI="https://github.com/notqmail/notqmail/releases/download/${P}/${P}.tar.xz"
 fi
 
@@ -142,11 +142,13 @@ src_prepare() {
 
 src_compile() {
 	qmail_src_compile NROFF=true
+	emake qmail-send.service
 	use qmail-spp && qmail_spp_src_compile
 }
 
 src_install() {
 	qmail_src_install
+	systemd_dounit "${S}"/qmail-send.service
 }
 
 src_test() {
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 38c6e27035c1..657572952687 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -7,9 +7,9 @@ AUX smtp.sasl 42 BLAKE2B 67e9108101779b6027fa1e5cc7c9256a606d440e15bb037a0da186e
 DIST postfix-3.5.1.tar.gz 4609587 BLAKE2B 94b06ed536417ca72729d93f03d4fa2dce602508e4c5816ad902740d4203ad3df66d7380ea41859ab75ab327c0f53bc2bbaf09ba45fe83490d02808426a6253d SHA512 9c091cda6c2d54fefc7093736f69dc60dc4d9d2d858260bde1430427bc49caa59f81aea7a992b9764998a4edaaa015ddd50392b8f0a1bccd15f52b563887a698
 DIST postfix-3.5.2.tar.gz 4611518 BLAKE2B 4bdf1876c6e210644541fb4fad6ecc4aad2f95afc1d3b7aa30c79e4ca8d2e1c24ad5541f235b8fea91b9831b9b967d6234aae3084938e334bc11a5777004134b SHA512 04e37c4542952dba0f3e44f10775c0bedf343e6382df14a9c43ebc80c005c3f6de68a4e7a7469f32ae74b8e50d10c089d4930eac0cd2e2a9ff1bd8d7481b3a76
 DIST postfix-3.5.3.tar.gz 4611925 BLAKE2B bba4b4b2e88753aff20462936bf053a6026e6e84e348887c318e10d6070374c28478f905c69168c018387dfd2d9ad25a8a0c0494d80360938ab9f16883137bfe SHA512 1d020292f244e770353efb634909afdc9ac29b81707547fda1089631febbb8ecdac7c43f6b6ec9bdc4084da2be320bc433064d293811424873062d71d3545235
-DIST postfix-3.6-20200610.tar.gz 4634682 BLAKE2B 08bd449b1b5313f9896317ca764e0eb8a11906cb7057fafcfdd60a974bfc9678d8ec0143934bbcbc4549a13367fa3c5eefe652c05739eeb425b720374aec16eb SHA512 f34c69d712a17a7697ccd9424ce076ca71c1b9e0b46855e8c323f990ca31c74dded05573a44c3c55ee10093eddbe91702bc961729c50acceae6703647d18da01
+DIST postfix-3.6-20200620.tar.gz 4634959 BLAKE2B 3f4396f1d6ed8e25ab472284405ef352d8cb99e75bcbf4b036b7289f253bc9ccd5e37caa81324b0c9687b5279a7871e3154f0aa8c169e6415ffd89cf3d3096a0 SHA512 d28dccda01ef58bb2c60272e044f7bfc55c59b94d6af164592d9226909a1e1a96e7150df18700cdf87b017c79e6459331c8f5b797e2620a91c67d2dd699d67bd
 EBUILD postfix-3.5.1.ebuild 8830 BLAKE2B 5da9e3002be93402fa4b5d767bec9ee1e17571d492a776244210a98b639df1546cd01009348a7c8d1686d0408bdc07175afdc4fe420b55f898e83eb6ba91a440 SHA512 c121bd5ecca3a74d9dad9caf43cd44884f787bb27c146300f730c57590a24007d18a3cd04cea20a22db0e22ef44d355f549514d7a1c1bba6c865749972c90e5d
 EBUILD postfix-3.5.2.ebuild 8835 BLAKE2B 783402f5b3fb51890afbba59bb042fdfc26726804ede9d523882f759c870fbfcb63a66463100bc8bb5d21e1030c59a887de263239b4e0f9e37f38fd2383ddef7 SHA512 db14226c5259442c15a3c0ef3ec9bb6b00e331840df15764e6eec2f9bb8d6d93475334924445f31e1b8d1460da9d3c24f07f94809e5dea11149e6c7d0e6781ef
 EBUILD postfix-3.5.3.ebuild 8835 BLAKE2B 783402f5b3fb51890afbba59bb042fdfc26726804ede9d523882f759c870fbfcb63a66463100bc8bb5d21e1030c59a887de263239b4e0f9e37f38fd2383ddef7 SHA512 db14226c5259442c15a3c0ef3ec9bb6b00e331840df15764e6eec2f9bb8d6d93475334924445f31e1b8d1460da9d3c24f07f94809e5dea11149e6c7d0e6781ef
-EBUILD postfix-3.6_pre20200610.ebuild 8117 BLAKE2B 1468eefc69666723812aa440b38bfa6913c63b8044b221a6369ae7006a14ebc3968bb0df91103c7daa97864986acdf9f8cf836c495a424b4b33594747dc58847 SHA512 af5af7b2a8ddd2cd769ed4b56942cbdae05d01afadc9ccaa0ab575f80fd4973f407af2e82b129a575ac7f36a5c4a5114949bd849eef0e29fa073e2610207fbcf
+EBUILD postfix-3.6_pre20200620.ebuild 8117 BLAKE2B 1468eefc69666723812aa440b38bfa6913c63b8044b221a6369ae7006a14ebc3968bb0df91103c7daa97864986acdf9f8cf836c495a424b4b33594747dc58847 SHA512 af5af7b2a8ddd2cd769ed4b56942cbdae05d01afadc9ccaa0ab575f80fd4973f407af2e82b129a575ac7f36a5c4a5114949bd849eef0e29fa073e2610207fbcf
 MISC metadata.xml 939 BLAKE2B 01474efe62df1eda9a3ba5976847064d615b3c32d9c71838354ef375c851c7ab4d1fcc2bc0d2945ce3d259fc6a698938cee6d1354c4e0f02f1e66395e377a0c5 SHA512 8602700c2a21b66ecf2c024c06ce23452f7effd9c06a5d58c1ccb351bcdef43a3c89575cc9136efc72fcd4e06ecb0654017b51bb145e7ffeeda771e3f4e7a673
diff --git a/mail-mta/postfix/postfix-3.6_pre20200610.ebuild b/mail-mta/postfix/postfix-3.6_pre20200620.ebuild
index fc79ce127b82..fc79ce127b82 100644
--- a/mail-mta/postfix/postfix-3.6_pre20200610.ebuild
+++ b/mail-mta/postfix/postfix-3.6_pre20200620.ebuild
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 9a9a0f638c30..11d0915521a2 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 8d90dccb1392..590997411d31 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -9,7 +9,7 @@ DIST darktable-3.0.2.tar.xz 3931240 BLAKE2B 5f86579a43e396c8116aba63c43e13d7312e
 DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce SHA512 e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14
 DIST darktable-usermanual-3.0.0.pdf 16237603 BLAKE2B ff5c24bb038deb37269a84389937740fa0ff77a9fb5bef4c484cdd903e39609588f632f577ce53c690d3abb832ace451d0d9d3f563ebdb6196ae8e2dac008a01 SHA512 2523b48e2baaa71561dc119340aed3bbf2ab4481dceb0c3ca2bbb7b0cacfaab894fa4eef82b667648cd7bb049304dbda09fa1a638f7734219b672b3ea8ee0eac
 EBUILD darktable-2.6.2.ebuild 3879 BLAKE2B 58de04e0d0b727c939ece0f11a3fccf30f2cd7e81ef11e6a64a4857d2bdfe77592e2e748dc64f34bd27b20603f1a2270e1af0d78b5d280f5d8c98bc403c38e68 SHA512 176fc9b85a1c4d5c28032e435e92c59299c857731c4c1e01490ca57aca18704187e0b62c5d9b7dcca4ac760cbefdf7a00eb3b66b036902ff7c4a6e3769b27f80
-EBUILD darktable-3.0.2-r1.ebuild 3881 BLAKE2B 958ebc2d6d7b8057fbd2cea57708c415f7e17967705938d5178c705db3ab52a7684dd2aedc7d80f4603530d21bca5e536518f6ce67c83e25515764c92bb6c947 SHA512 5b9836520a9039fb06c68277e5dde1f4cf394aae92dd8fdb005d8cf0f6454148eaa769477247872c94152b2c132ad6d9a068b8e984c38c94216717f4d63798d7
+EBUILD darktable-3.0.2-r1.ebuild 3888 BLAKE2B e402484fa08d1bbb949ad7381d6b0f0a370fd5c644b9fcbf2e190f65b4eded72580a28decb556795ce7aec7a147a3a147ba601162484358925f6f61e69f826df SHA512 d8e34da86742f2fe5cf2e04023dd0ca2b2ec9d22cff984eefca8246fe5dc5dab4c9633e4aa0585376e5c943617e1808b7f04b9355c162652446f42f2b1783f24
 EBUILD darktable-3.0.2.ebuild 3782 BLAKE2B 79f1f8dbb810a10274c40ff93ec59a74291dd7c3d9d7fad52b44b97a1b8211fb3ef314a4cb937d6886fb6ba150e7ba0c7d4244d3e6aef70bf4ea949dd8d0830e SHA512 8094322d7c29078718354d5fac8f9e9c8be01d4cddac4d30a033b42a1d5c757171e1a90e234170d81eaece1a1dc4d699850fc8ec02ed87fdcb10ee4df384cffc
 EBUILD darktable-9999.ebuild 3262 BLAKE2B aeadead1b20cd782e263b4f67f20d18255034626b9898273827baa60fb528d632ecb831b584bb0c0ed71e1226a9e32049e2bcc96b4d03c2ee5a9a725ef3858d2 SHA512 c323d686bcd203fc58833fdb89429440c801015dab82f26dfb4133e048a2f59449f6120fb6d0165177aa30a7f7c1d6acad08016286d7b989e7731a9e2f0bc4af
 MISC metadata.xml 1045 BLAKE2B 2094a1de028b4db282941604a3af2e608a4694b47d269293c09c1874594054a2457f44a94d9802eb84502c64c714a5af0499e2d2d67a71f61980906fc78acaf8 SHA512 1e0e67191daac03f5aebed02b7981a4944d4b0da4b00b8781fb79a1a362f260e51d182fdf10cf37494ab854cb7627ea4f7d279fad7191a53c0118e8d3c791166
diff --git a/media-gfx/darktable/darktable-3.0.2-r1.ebuild b/media-gfx/darktable/darktable-3.0.2-r1.ebuild
index a27d9ec520c6..5b83be05e128 100644
--- a/media-gfx/darktable/darktable-3.0.2-r1.ebuild
+++ b/media-gfx/darktable/darktable-3.0.2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_P
 
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 LANGS=" ca cs da de es fr he hu it ja nb nl pl ru sl"
 # TODO add lua once dev-lang/lua-5.2 is unmasked
 IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index b325b86ea5ee..922bee3cdd76 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -18,5 +18,5 @@ EBUILD gimp-2.10.14-r1.ebuild 6140 BLAKE2B df34bd1bc35873d51aaec12fba454170ce08b
 EBUILD gimp-2.10.18-r1.ebuild 6157 BLAKE2B d877545e911f0d707447d885bb83b83dd1bd37cb3db79ee3afd23c52949d91e321ca748f7e632146b5b56264589f633a235b9b4fd9cea3783d29d2c6b5a2d503 SHA512 564dd35735219c97cb9b8caba0aa1aaf782231a6a1cc578596e06c5972bbaacbb0599bce9d8b1cb03ca95403db36bc3caa40cb934c957b2dd399b6d394857448
 EBUILD gimp-2.8.22-r2.ebuild 5139 BLAKE2B 7e659b356107042884fddaff1622c20f1b1d627840556cdba0293fc80c43832fe02883d65ef6b338847b80d0cc041d95f6cce02ea230d071aa5545d89f55e8f8 SHA512 5b32326f52e21dd544c1f92e0f51612fb8a662ac6fa0addce482d3a3e1e9516a55b0c6a9e679407afee94b77c60a0224719ff37cd5aabcc7936a949629d4f189
 EBUILD gimp-2.9.8-r1.ebuild 6068 BLAKE2B 86c853189f8a7aa5e6247d1f973337e3149ea44e13f4adc022b2e6f15eb51ecd4473e862721fd3ee841f5f36108230b2444039e5cb21898c274c97506a285800 SHA512 da7b01a4dafbd9d991ce050b3c8c5d1ce6b1f2d9cc8c4bde6463d5ebfcba2a8399c1f8f61062f1fb564c530acfea5036b6f8d5c3b4b1a291cd575a00df9deb28
-EBUILD gimp-9999.ebuild 6188 BLAKE2B 34635a209811691a453e984a089faf958ac048ddf63adb17b93a22807924021ef134281b824d378e6d57a5ce88b747e6c2a6150d55b04806b14acc592e83a815 SHA512 ed5727af778d9acc7b1c3b2851c4d25329bc706d2054ecbb61e960c2e45b6fc0ea35e4aeddd97c4c1d8a1b0b71598be3ea65b401a0a3345c83ae67ca59a800db
+EBUILD gimp-9999.ebuild 6314 BLAKE2B a0c08fcf0c8962d67b688a41d1beaf1469a83e55b4947062431a740379788a8d4f20216a7e176dcbe01a7f6d58a85de72ac0b870f3200da458f57b1b72870f55 SHA512 c1b8c2c627123aaf6164dd2c650d329c2824d52f40f29acb46ae0c052636d3ca7226fd812c307a1a54d76f254668ca51ae9c40304dfff9c62ffa740e40cc3d07
 MISC metadata.xml 628 BLAKE2B f1326f51db692d6e64d1bb7b44dfada65799d7ab94279771e6bd729189145a8a4bbe7a83c776bfc46acf682ad9f34c84598d25fb0a3606aabfa30383b35a9694 SHA512 cec60cde9763bdb9012fec754b95018f09da5cf7ff2f577206417651df5c18251dd5c58b1e32fb45e7c2121e06c0a5b7dc86d08b9511da4cf103bcf2fa1b6e52
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index f73b18199f44..1ba63b659607 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -5,8 +5,10 @@ EAPI=6
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 GNOME2_EAUTORECONF=yes
+VALA_MIN_API_VERSION="0.40"
+VALA_USE_DEPEND=vapigen
 
-inherit autotools git-r3 gnome2 python-single-r1 virtualx
+inherit autotools git-r3 gnome2 python-single-r1 vala virtualx
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/"
@@ -29,16 +31,16 @@ COMMON_DEPEND="
 	>=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/glib-2.56.2: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/babl-0.1.78[introspection,lcms,vala]
 	>=media-libs/fontconfig-2.12.4
 	>=media-libs/freetype-2.1.7
-	>=media-libs/gegl-0.4.20:0.4[cairo,introspection]
+	>=media-libs/gegl-0.4.24:0.4[cairo,introspection,lcms,vala]
 	>=media-libs/gexiv2-0.10.6
 	>=media-libs/harfbuzz-0.9.19
 	>=media-libs/lcms-2.8:2
@@ -99,6 +101,7 @@ DEPEND="
 		>=dev-util/gtk-doc-1.0
 		dev-util/gtk-doc-am
 	)
+	$(vala_depend)
 "
 
 DOCS=( "AUTHORS" "HACKING" "NEWS" "README" "README.i18n" )
@@ -125,6 +128,8 @@ src_prepare() {
 
 	gnome2_src_prepare  # calls eautoreconf
 
+	vala_src_prepare
+
 	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
 	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
 }
@@ -156,6 +161,7 @@ src_configure() {
 		--with-appdata-test
 		--with-bug-report-url=https://bugs.gentoo.org/
 		--with-xmc
+		--with-vala
 		--without-libbacktrace
 		--without-webkit
 		--without-xvfb-run
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 5aad2e1930e6..ccdfb79ccc1b 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -4,7 +4,7 @@ AUX graphicsmagick-1.3.35-CVE-2020-12672.patch 2753 BLAKE2B 864a77b650f5cec350d8
 AUX graphicsmagick-1.3.35-oss-fuzz-20045-20318-21956.patch 988 BLAKE2B 4906fffe43150ef209c4d2f87d433cf78cd5e3c03a9db22426e3c3455028a5ff63c189ace1f46f47e1fa04fe8d78388b76dcabc288a9a75e57b7ebbb68f8c90d SHA512 95776534891eed617b09873fd70af020c6d6370a6765ba7aaf8185268e8b73b774ce2aeb1b284641fb12260ca0047c4543b17a18ed4ef28db725b75f988c7215
 AUX graphicsmagick-1.3.35-oss-fuzz-23042.patch 1350 BLAKE2B 415bd540a7aa194235ce1e6482035dd9b8ee4d4f5192f4d898e178875d453fd8b481efcbe139db602d411f788e3067a95106ba128ab14af63d3848f92c035405 SHA512 d345b54570e3396db81f0f60980633e139f90a54b579ad953a36aa5e16c1edfe7a5186b4e2d5a2e02f759544b372981278b06d2b688324e6b091c841a5bae133
 DIST GraphicsMagick-1.3.35.tar.xz 5543224 BLAKE2B 8a284d85341c10939fdece5c565d5b881276afb9b4c5dfb2221b780a01b99f78ee62761722c372baf9155c63f7ef176b67310aeedcab0368f4f26f5b0150bcce SHA512 baae92089d52147ef961f93495abc8a9d8b1a963af61d87a650c1ab105d46816aa38c83f654edcb5a0e1b7f07ccc06eaeaa443b9bde3a63a0b9bfb45f3ae144c
-EBUILD graphicsmagick-1.3.35-r1.ebuild 3223 BLAKE2B 2e61401a1673a4a093eb8cefb1bb95b26ddffe581cf808a0e7927cb62a5cf41ef4e74e68ae3b4dcc03850ee2992e2470631907a1e87b9df6ecb15b892f28980e SHA512 13e27a919eb6e2d04837015e6641eb3d8041772b033f3e1e38833a7b875237ea8c6acda2d1e7dacb126005383c4d96e03370c0be4d0b92f93073552787689419
+EBUILD graphicsmagick-1.3.35-r1.ebuild 3220 BLAKE2B d91dc85c76795d64082470c7c684ea7ffe1884586f32e729d75ecfe50c645e221ff0423ba7cc51738dc16c9d0e50f0f68d35b470921fbe0dbd12d5059d96421f SHA512 ce44e7ac94afeb81a5a8db285e20d149b1045b5165b99d2f58aa9fc9e853b98a526f6f62b19a8b73d3d43c8fe5c4184b276161c0477a4c519831362cbf9901e6
 EBUILD graphicsmagick-1.3.35.ebuild 3085 BLAKE2B c0e6b0a3eae4087a3aa5130866629037ddeae03fb63dc0914b117ac9f7345f1f18c0ba2e41a9fe06fc80fe206013636f75d1a44c62e300487763bab2ed8f58ad SHA512 eeab4b3a5b8a8ffc5ee810125d5161b18339f06e10883a692592b9ec1f7c4296de9a56459f57f033d378a8638da4d8b30f1d04c5d16cff9d108ff99c8e2dc763
 EBUILD graphicsmagick-9999.ebuild 3079 BLAKE2B 5683335f38a7d90554e705f65bc84ea44643bd6c18b5d7f48f2608d949efc4ecd8f562a6f7f989ee0dbc4e208efbc4a1190154f88baf69c89ad17da1d70ad5ae SHA512 13f6d72eb95a1be93d70d685fc3296885c7084536a951e9158e989169e5e5768c98591af22b0221bcb951ce4b4bbdeb90b21b93f3fa8589026316880d1dbe8cd
 MISC metadata.xml 1057 BLAKE2B ced303553eccbba9ae91f30b3700b331149127c5a17a66bb166bff4139600cf208f3b15f8fa6fdb02594f3278ce7acd2bf6972df42c04dcb4f695710bb3870bf SHA512 9ac680de061b6dc0acd0d3a31587e0b53d3d7bcea7425909a3a4ef074fa0e32a999ecb1f48a64bb2ab55249fb5bbdc72974681fb26a879c4e5a4c9f3a04d0e82
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild
index 39851a6496d1..e2d3a8b1e668 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
 else
 	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 IUSE="bzip2 +cxx debug fpx imagemagick jbig jpeg lcms lzma modules openmp
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index ce90e9c22385..a11aa00d319b 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,17 +1,12 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.11-16.tar.xz 9075792 BLAKE2B 7cfa4a071ee09b9658e302db963cdcc393395305bd96d04ddc5ce7941bd3b26fec74206525ffb1d93a423a970ee91dcd308041c8cb407c783195dc98a337db5c SHA512 ae4c56afdde8d62f80cfc32e208595f50b4e1d3cdfffbf1f18a5ad1f715998bcc917fe595369cda216d13ebd7121c060376a3ed6c0558dcd508f0142b108e2ff
 DIST ImageMagick-6.9.11-19.tar.xz 9076632 BLAKE2B fb6e954052e4dc9b5db80fcb3868e627f3cbe5d9ccb02425fe3838dfef4deb1132360a30b561de28bf7d2051bc7c01ad5c4ebc0266b48f1d48d7af5ecae4b5e2 SHA512 fe8e7399b377c84155d3ad3c3963d58b8704233d9c858ff92ba1837e6e1f5d86846153660cc0973b8cd27917e4c8b4834874c510f00505142cd8165ae3e3526d
-DIST ImageMagick-6.9.11-9.tar.xz 9069640 BLAKE2B ab39f4723e4bc843a504ce29a840d24a0497d00ebaaf8a10589813d7bf13f5ef3774e9989dd38d667e1a9ad3dbc5357ca4a53533b5ef338781409c0b3bdde01a SHA512 8f8e6cdbbc4ff367304d29d3098dc208ac17e8037e31426e5e24d918ab13a292660e2944cb830fa814f297b69f8b2d693ac33b94f5ee4b8406cf52605ee00586
-DIST ImageMagick-7.0.10-16.tar.xz 9694880 BLAKE2B 6d0e0baeb99d9815255f10d04176b816694afb9d7e2169af60401eb57b13bc2dbf1223b1b3de6b67c2ed9f1581983801bfec017dee6f4b73319b68d0e16366fb SHA512 e1ba52cde03b1230789a9e538ea93bd8b0713b418cf268ab3c3be0c0da4b6144ff47479e554c27a9348d56b5e94a181944474f77568f502cf31885d871f2ea5e
+DIST ImageMagick-6.9.11-22.tar.xz 9084304 BLAKE2B 38df3e9535c23b246b6ededc1b9d083fc8c42f3abe85835d6ef29dffb06bbccaa7aae534efeaaf224b9f8495c1c116a6ce4c886e70fa0976cfbda0880a165e96 SHA512 9c6f4ab3f881b4aba4de3fde2d49ed66773b52dacbdc24c92eba6b8b1e97ea28b983cbd9fbcf4721f4b46ab8d249470f44e1cc7e173728d78f2ef049f4aa42c0
 DIST ImageMagick-7.0.10-19.tar.xz 9685552 BLAKE2B e3d6ca1e16ad4bc346153372f1122731a750876650cdb705985ef29ef30c5ceb7f2f473ff2734a38c50e2e531094a08526678cfe1e8f58eef79d30ea18c363bf SHA512 ed577e48ca88d37c01d7e889fa1364af3398e94864b393fcc70711a3317c34adababe5ac0ea7995bd23e10aac554522ed69d290c4c11b946e8a0de86c6365e84
-DIST ImageMagick-7.0.10-9.tar.xz 9681168 BLAKE2B 0a26df054f6799dcc0cc576dc3d3e30689d3311ce658b220f4575d6ddf31063e8e9b1de57d5065171480dad5ae4f3a0bdde0d5ef7a5a7cdd267f2e76a210f30c SHA512 db19b39c41e3401ce454016a14c83d1188d38d7e4a31848c29344bd86ef14d4250208bcfb4b9e519f7d2d193a61724d980ce39e9d6e2388c872281e9383e2f54
-EBUILD imagemagick-6.9.11.16.ebuild 7056 BLAKE2B 31393b291f0d6bec7dc70d794b1a84039d54c1a12b7b4417caacea9bb2dc693a91d00273243a6450c1e7b7044e6b4c66a5fa8ccf28d1634d610a767775dd566a SHA512 72e95675a0102e46604bc1161c687465d2b2acf58a7096dd0637e2b9bdbc4a53ce2fb3490e6d32fd00ce5767540abe39b03a93c187f33b0c6c21f5c96a897d49
-EBUILD imagemagick-6.9.11.19.ebuild 7056 BLAKE2B 31393b291f0d6bec7dc70d794b1a84039d54c1a12b7b4417caacea9bb2dc693a91d00273243a6450c1e7b7044e6b4c66a5fa8ccf28d1634d610a767775dd566a SHA512 72e95675a0102e46604bc1161c687465d2b2acf58a7096dd0637e2b9bdbc4a53ce2fb3490e6d32fd00ce5767540abe39b03a93c187f33b0c6c21f5c96a897d49
-EBUILD imagemagick-6.9.11.9.ebuild 7049 BLAKE2B a55cac8280b047983a972159734711175d78840a6d29c75ed38366fc07aa4be312c75f523ef4185318f9734df496373e36b0c3170cd89e0859d282935ef3b566 SHA512 524f10eb990b5a5df4af8d0c39e6cf00d30f6d3bda40c0f609a16825d23b2b1b18d5ea10413df97aca1c6a26b0ac05d06c7c902f8a7c0ded4c33106b05566d2b
-EBUILD imagemagick-7.0.10.16-r2.ebuild 7220 BLAKE2B 12b0db73d15e5d9b5af68912ae1b2907919cc875d73536c261477534fa17363fb8f75b2d63501ab6f844eb9e976893107513968d9e89ccce9d3490cfe93389db SHA512 19ce4536488e465e744a5da210566112de83a6d2df48a1cf9cc44c32a2e9d4ab3a65909ce17ac47e0dc29ccb734a5b52e81f6585dc015a3ad89faa3d72667747
-EBUILD imagemagick-7.0.10.16.ebuild 7332 BLAKE2B 9af4bd9448c7e96550c356a964f988a2c785bb7f6714508a036968c3b229e91af2f2ef247366ac6e012477adada079fef7064fec1d4a29b4d9d0f9ad03d648f8 SHA512 03641bc41782f7de1c9b264697d159ed990c2e1aa18fe836391f1be86df3bb3f9a50c7f327730b6ff9ef50ca997636c72e2e03b21c0fa12a50dd68fb45ce9f00
-EBUILD imagemagick-7.0.10.19.ebuild 7220 BLAKE2B 12b0db73d15e5d9b5af68912ae1b2907919cc875d73536c261477534fa17363fb8f75b2d63501ab6f844eb9e976893107513968d9e89ccce9d3490cfe93389db SHA512 19ce4536488e465e744a5da210566112de83a6d2df48a1cf9cc44c32a2e9d4ab3a65909ce17ac47e0dc29ccb734a5b52e81f6585dc015a3ad89faa3d72667747
-EBUILD imagemagick-7.0.10.9.ebuild 7324 BLAKE2B 1d67b3846e05b04487a5e9f154de9d8d19afb024fc11d8c117ed4d2bdba8124414dc348b93c3c012ec6884a03e77e8e2f06bc90c448767998ff38486a92dd179 SHA512 a5df77b164a1c6ac1c6867d39afea790c3f69ff021a312abeb5d6476316d2e78caf1081235242559af1297fdb14a4add48514dd3bf611778123026fd7bc2e8bc
+DIST ImageMagick-7.0.10-22.tar.xz 9710504 BLAKE2B bfa35f9bf28629656d97ab03c1adf2641761f40d7bad284af2dc199b3ac4006e656356762d753d0b3992c78f0a4155423a27de632ee5e9594398164f20bde576 SHA512 5a7023eb8dfddc34c8378f338335e13e4b235e6c3e8e8b0476ae4ca31db78ef8bbdc457f7de1356994ea25d6eb94bb944d725d15aee038196bf7060c934d0926
+EBUILD imagemagick-6.9.11.19.ebuild 7049 BLAKE2B a55cac8280b047983a972159734711175d78840a6d29c75ed38366fc07aa4be312c75f523ef4185318f9734df496373e36b0c3170cd89e0859d282935ef3b566 SHA512 524f10eb990b5a5df4af8d0c39e6cf00d30f6d3bda40c0f609a16825d23b2b1b18d5ea10413df97aca1c6a26b0ac05d06c7c902f8a7c0ded4c33106b05566d2b
+EBUILD imagemagick-6.9.11.22.ebuild 7056 BLAKE2B 31393b291f0d6bec7dc70d794b1a84039d54c1a12b7b4417caacea9bb2dc693a91d00273243a6450c1e7b7044e6b4c66a5fa8ccf28d1634d610a767775dd566a SHA512 72e95675a0102e46604bc1161c687465d2b2acf58a7096dd0637e2b9bdbc4a53ce2fb3490e6d32fd00ce5767540abe39b03a93c187f33b0c6c21f5c96a897d49
+EBUILD imagemagick-7.0.10.19.ebuild 7338 BLAKE2B c5bd8fa410de6a1fec8a11c9f11d4bc527acf4502ef3d02dfd2f845ee0db2831de6a1734c860aacf224df0e13895aed104d238420b5021b947ba35b91b60149c SHA512 2ff4dc18a4fe408c0aead424af26225f8590607a48a60ac11906603f0cd808e23c0b6b50813f3463f570d3e5c3a9675fb60edc67b2bd8428d073c7ebe0778a17
+EBUILD imagemagick-7.0.10.22.ebuild 7346 BLAKE2B 6b3c2522969859e905afddcb92679bed0944d991831822d5bf6e967e0faafed369380f793aa337ac87b3a1af7a1b7290dc0f71094cf6346fdd63d57d49823d97 SHA512 a21b1d1bd706370b2c044c7cd55c290dd7a9ffac55c0c92b86c8f4ac969a14d2d3eca6b9e97decc61099d3f0842e9029f145e0adc4366c1ae153a0333869da74
 EBUILD imagemagick-9999.ebuild 7220 BLAKE2B 12b0db73d15e5d9b5af68912ae1b2907919cc875d73536c261477534fa17363fb8f75b2d63501ab6f844eb9e976893107513968d9e89ccce9d3490cfe93389db SHA512 19ce4536488e465e744a5da210566112de83a6d2df48a1cf9cc44c32a2e9d4ab3a65909ce17ac47e0dc29ccb734a5b52e81f6585dc015a3ad89faa3d72667747
 MISC metadata.xml 1106 BLAKE2B e77cabff89df6b98687290ef0ee06d85111a7ddca6f5e1e31f820e6d186a6510c2afd0b85ba31004f102fd7f7b88f46af101f4ba45011aac75afa40b0a714857 SHA512 68a5f9a80b1e3f2e3004252703f9b3176d7c59880a2724ae431fdfd97e8f2adcd7ff7ad2cd8ea8bd35645a3b559052f2c38713647ce7ae889ff1a6061e6b2d92
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.19.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.19.ebuild
index 02b0c9655fe7..f37a0010b4c8 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.11.19.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.19.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/6.9.11"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 REQUIRED_USE="corefonts? ( truetype )
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.16.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.22.ebuild
index 02b0c9655fe7..02b0c9655fe7 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.11.16.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.22.ebuild
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.9.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.9.ebuild
deleted file mode 100644
index f37a0010b4c8..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.11.9.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-MY_PV="$(ver_rs 3 '-')"
-MY_P="ImageMagick-${MY_PV}"
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-
-LICENSE="imagemagick"
-SLOT="0/6.9.11"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-RESTRICT="perl? ( userpriv )
-	!test? ( test )"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-		)
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-#S="${WORKDIR}/ImageMagick6-${MY_PV}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local mesa_cards ati_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	rm "${ED}"/usr/$(get_libdir)/*.la || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.16-r2.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.16-r2.ebuild
deleted file mode 100644
index eb7593072ecd..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.10.16-r2.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-else
-	MY_PV="$(ver_rs 3 '-')"
-	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/7.0.10"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	svg? ( xml )
-	test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-		)
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		--without-jxl
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	if [[ ${PV} == "9999" ]] ; then
-		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
-	else
-		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	fi
-	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	rm "${ED}"/usr/$(get_libdir)/*.la || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.16.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.16.ebuild
deleted file mode 100644
index 4d2561accf79..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.10.16.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-else
-	MY_PV="$(ver_rs 3 '-')"
-	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/7.0.10"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-		)
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		--without-jxl
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	if [[ ${PV} == "9999" ]] ; then
-		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
-	else
-		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	fi
-	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	rm "${ED}"/usr/$(get_libdir)/*.la || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.19.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.19.ebuild
index eb7593072ecd..f54a5b0369e3 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.10.19.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.19.ebuild
@@ -13,7 +13,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.22.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.22.ebuild
new file mode 100644
index 000000000000..ac9609f64eff
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.22.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+else
+	MY_PV="$(ver_rs 3 '-')"
+	MY_P="ImageMagick-${MY_PV}"
+	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+SLOT="0/7.0.10"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	svg? ( xml )
+	test? ( corefonts )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:= )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-libs/libraw:= )
+	svg? (
+		gnome-base/librsvg
+		media-gfx/potrace
+		)
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	X? ( x11-base/xorg-proto )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		--without-jxl
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	if [[ ${PV} == "9999" ]] ; then
+		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
+	else
+		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	fi
+	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	# .la files in parent are not needed, keep plugin .la files
+	rm "${ED}"/usr/$(get_libdir)/*.la || die
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.9.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.9.ebuild
deleted file mode 100644
index 386e11f90ca1..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.10.9.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-else
-	MY_PV="$(ver_rs 3 '-')"
-	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/7.0.10"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-		)
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		--without-jxl
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	if [[ ${PV} == "9999" ]] ; then
-		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
-	else
-		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	fi
-	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	rm "${ED}"/usr/$(get_libdir)/*.la || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/meshlab/Manifest b/media-gfx/meshlab/Manifest
index 76273534c942..70a5ab19f699 100644
--- a/media-gfx/meshlab/Manifest
+++ b/media-gfx/meshlab/Manifest
@@ -17,6 +17,7 @@ AUX 2016.12/meshlab-2016.12-align2.patch 624 BLAKE2B 342231146ef2efc52ae4295d909
 AUX 2016.12/meshlab-2016.12-asString.patch 2309 BLAKE2B 8ff58d9a247e530e7965d186dfffc2e88bd4594a366439f9a8433269e3f20e33825673447a5ebac39929f02927a20cfa8d3dad0fae5787d6855de5653023ff31 SHA512 3ad05b637ad12a88a6e32f437cf6105b09c50eef16e815f11f3a1fbd6afdb3b01d9a0d31f08eaba26d075f6f2cba6c4694ca1afa2cc1e3973350294bc41f815b
 AUX 2016.12/meshlab-2016.12-fix-plugins-path.patch 509 BLAKE2B 3a4327b41743704255039f2c06713975c2d842a3af5077385d982107289d33a5a04473f68e21769ca97e45514ca1119244c2b66b5709b99a0b772324e1b0884f SHA512 613b3cec1c50c3d4d6fd3006b80fd4cb3b66a97c1493872d76f95c5ed16ee9c2a9aba5c1a5d021a302114e8e0e172619c4d344306004f109a1f211ee6a14e102
 AUX 2016.12/meshlab-2016.12-qprintable.patch 898 BLAKE2B 1a4802e758f8c7d29839eae49d5450b4d199011544223da7d7791045d44f2b2d71f7189d0cb655204d77736e63988079eeb64876411c62f09646887dae30aff8 SHA512 12836928f1848048afe769188285cc5a0a4e23b7d63f9c12ebae0298296607167d8e6198ea779cc475ca2cd39903c4a37dc77b20c928c49cddae1b4ee2fe2a7f
+AUX 2016.12/meshlab-2016.12-qt-5.15.patch 930 BLAKE2B d9bc0073c309006206411bcc48b3db65496aed4b32e5b8d30d582174f46038d34cac669e754516be4e07f51d448d92358666dded59a0ecc38cbbc78701a57a38 SHA512 c5c529c262d036346730247735c19f15eb11bf55dc2b876b230d81e3968941019b6dc6d8a64458b3da398b8ce4cb48a7bbfada375bac06ef73df9a25d827d820
 AUX 2016.12/meshlab-2016.12-qt-includes.patch 521 BLAKE2B 44d8cd045180d25810beb74da2a916fb6a8a01354be819d43fd960913f96863d8d3696a23440e8857081560326b78538446426d676f6d0c52b42fe3bc20ae1ca SHA512 ad9613bdafa1f812f4fd6b36a215b78416b2143af6ae96bc6c40d81eee47e16c0d2e62a7b292367333ff99b09f84630f1a9b5ba59d9a1ef3209a3caa28f1f5f6
 AUX 2016.12/meshlab-2016.12-remove-header.patch 1481 BLAKE2B c52f2eb980ebec98a534d2f5f6eadb9b89719e1d28d6fdc2912348fbe715103f2ca67684e29d1fa77b9b305cf552c12eb667634bfa22a0fad0312012e9b7b99d SHA512 ea0e24aa94d2595ed340c91c7a17e4028b2792bf316dfea0d8062324583dde62c03bb2d6af74317b9e448c657e5418100f40b18b172344697fe53e36657a45fc
 AUX 2016.12/remove-edit_mutualcorrs.patch 475 BLAKE2B 925756e7bed4fd9474b2a011f95118e00159457b91d04820166efae55d27eb19006af9ae92555b46adcd817646fcfcef82937221d59fef41899f94df1925a237 SHA512 03b4907fc484941d17d208d028b63cc0a1d1740fbdac8a6dd2b9ac8161efc5899d820cd0ec59b28ba1c39562ecd93c5e11e7b7af5564ee9aa429cb8745a4a5b9
@@ -25,5 +26,5 @@ DIST meshlab-2016.12.tar.gz 94194402 BLAKE2B 53dda75b51198d529d35ae64e1b9d8ec240
 DIST vcglib-1.0.1.tar.gz 9063634 BLAKE2B 91fba7ebf1ac18d0dfb33d3e26656e546b7c35ae753777730c44ebdf327413dfe94dd5e84907eb7e1644d70bfdf7d00ae8ecd0a81587d790a31354f7db09d626 SHA512 55d1854054744abae2d41e7b5041df89253bae108df5fc1cfe777013de7192dce04bc474475cb11a1d0343ebcab1ea61b381d9d9c36c452528043e85e75bc211
 EBUILD meshlab-2016.12-r2.ebuild 3497 BLAKE2B 9e3de165ab7cb48eec6289e55f2e1df0f88c9476ee0b67b7d99fdf052d0255143d48fac4002b3554d36ba967493ae3754fddd0a8c617b3aa30860cb887e6d547 SHA512 50433f5f61a00c4ecf33f901300156845ddc404ee427af7214fb42edd292cfe91cf26f5dc96d9cb7316e6b97d3934d9534a513c8d278d327fb82ff82df49712a
 EBUILD meshlab-2016.12-r3.ebuild 3539 BLAKE2B ce73969c0caf822ce458b4e3e40c591479f032fe9780b61bb2eb852cf9ae12eb933fb4b355b36b2af70f201a6a29135d8cba814be87af2369366b0fa798a6684 SHA512 a1df95a5610db88be56ed83e16ba4fd4fc71a7ff138435f1cfbaefe71d8dd9a56c193bdc32f9f7affd303c6ac4db4ffc244452cb20571e350d2f0a6dde6246f9
-EBUILD meshlab-2016.12-r4.ebuild 3628 BLAKE2B 4a8b4b1890378d70d4fa282d9814c9d39333c9b2b0cdd51e9ccf50f56d53b3bb5e9c723721f1e09bdff8728243266cd89f76af6b059197828ad2f99c6bedf547 SHA512 00166cb5e1f9ed0196ed6f96d8579be126a5778de93840545b5c536641204bac75365ea5f2430abc2f812090bca6ad18fe532e874d843c9de2861eba75cd27b7
+EBUILD meshlab-2016.12-r4.ebuild 3652 BLAKE2B 5ea94dd176d7229e6e07ea102b130d8e97907edbcd630258f704b14f47179ba02fe5ae44485132372b2bdfeef14317e2e10904b027b1f1d0081ba23e9cdccf82 SHA512 5bc637d6299fa057dd4549d6559c20e0a8e91d441794fa54de5963288a067fa8f435f8f38b172c8869659b334c313a2b05f4ecbe6433a37f8a69bc14b9abb130
 MISC metadata.xml 729 BLAKE2B 5c89ef346791f1aaecf313a580c18e32d37a116e87aa5955d21445816fd7a9fae30af5763dafe32f019fcda1333b3bfe48280abb1845fe096f223642badb9629 SHA512 f1d3b39a1c612b895463f0cb674411fce2614ff55855b964dee1b9c999aa1ad4bb6ec0a000cab9a1767f54474597836a92fda48722a3d8a90d21f412316e2b71
diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-5.15.patch b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-5.15.patch
new file mode 100644
index 000000000000..ab052cd69eb9
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-5.15.patch
@@ -0,0 +1,33 @@
+From c57222e79f1c7840e1ed01a4abd17d089f5e5185 Mon Sep 17 00:00:00 2001
+From: alemuntoni <muntoni.alessandro@gmail.com>
+Date: Tue, 26 May 2020 12:35:03 +0200
+Subject: [PATCH] missing include
+
+---
+ meshlab/glarea.cpp  | 1 +
+ meshlab/meshlab.pro | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/meshlab/glarea.cpp b/meshlab/glarea.cpp
+index 6c0421062..dfd7af229 100644
+--- a/meshlab/glarea.cpp
++++ b/meshlab/glarea.cpp
+@@ -34,6 +34,7 @@
+ #include <QFileDialog>
+ #include <QClipboard>
+ #include <QLocale>
++#include <QPainterPath>
+ 
+ #include <wrap/gl/picking.h>
+ #include <wrap/qt/trackball.h>
+diff --git a/meshlab/meshlab.pro b/meshlab/meshlab.pro
+index 26ef88d00..842eb5ea5 100644
+--- a/meshlab/meshlab.pro
++++ b/meshlab/meshlab.pro
+@@ -1,5 +1,6 @@
+ # You have to copy the file by hand into the meshlab.app/Contents/Resources directory.
+ # ICON += images/meshlab_obj.icns
++QT += gui
+ QT += opengl
+ QT += xml
+ QT += xmlpatterns
diff --git a/media-gfx/meshlab/meshlab-2016.12-r4.ebuild b/media-gfx/meshlab/meshlab-2016.12-r4.ebuild
index bea9e2857554..505a20ab0b58 100644
--- a/media-gfx/meshlab/meshlab-2016.12-r4.ebuild
+++ b/media-gfx/meshlab/meshlab-2016.12-r4.ebuild
@@ -1,21 +1,22 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit qmake-utils
+inherit desktop qmake-utils
 
-DESCRIPTION="the open source system for processing and editing 3D triangular meshes"
+DESCRIPTION="The open source system for processing and editing 3D triangular meshes"
 HOMEPAGE="http://www.meshlab.net"
 VCG_VERSION="1.0.1"
 SRC_URI="https://github.com/cnr-isti-vclab/meshlab/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	 https://github.com/cnr-isti-vclab/vcglib/archive/v${VCG_VERSION}.tar.gz -> vcglib-${VCG_VERSION}.tar.gz
+	https://github.com/cnr-isti-vclab/vcglib/archive/v${VCG_VERSION}.tar.gz -> vcglib-${VCG_VERSION}.tar.gz
 "
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="-minimal"
+
 DEPEND="dev-cpp/eigen:3
 	dev-cpp/muParser
 	dev-qt/qtcore:5
@@ -35,33 +36,34 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/meshlab-${PV}/src"
 
 PATCHES=(
-		"${FILESDIR}/${PV}/0001-set-shader-and-texture-paths.patch"
-		#remove ot working plugins
-		"${FILESDIR}/${PV}/remove-edit_mutualcorrs.patch"
-		"${FILESDIR}/${PV}/remove-io_TXT.patch"
-		#since structure synth doesn't seem to be compiling
-		"${FILESDIR}/${PV}/0001-disable-filter-ssynth.patch"
-		#this has been fixed in the tree
-		"${FILESDIR}/${PV}/0001-disable-edit-quality.patch"
-		#this causes segfaults
-		"${FILESDIR}/${PV}/0001-disable-filter-layer.patch"
-		#for when we use minimal
-		"${FILESDIR}/${PV}/0001-compile-server.patch"
-		"${FILESDIR}/${PV}/0001-use-external-lib3ds.patch"
-		"${FILESDIR}/${PV}/0001-use-external-openctm.patch"
-		"${FILESDIR}/${PV}/0001-use-external-muParser.patch"
-		"${FILESDIR}/${PV}/0001-use-external-bzip.patch"
-		"${FILESDIR}/${PV}/0001-use-external-jhead.patch"
-		"${FILESDIR}/${PV}/0001-use-external-glew.patch"
-		#cause gnu stack quickstart related qa
-		"${FILESDIR}/${PV}/0001-remove-not-sane-plugins.patch"
-		"${FILESDIR}/${PV}/${P}-fix-plugins-path.patch"
-		"${FILESDIR}/${PV}/${P}-align1.patch"
-		"${FILESDIR}/${PV}/${P}-align2.patch"
-		"${FILESDIR}/${PV}/${P}-asString.patch"
-		"${FILESDIR}/${PV}/${P}-qprintable.patch"
-		"${FILESDIR}/${PV}/${P}-qt-includes.patch"
-	)
+	"${FILESDIR}/${PV}/0001-set-shader-and-texture-paths.patch"
+	#remove ot working plugins
+	"${FILESDIR}/${PV}/remove-edit_mutualcorrs.patch"
+	"${FILESDIR}/${PV}/remove-io_TXT.patch"
+	#since structure synth doesn't seem to be compiling
+	"${FILESDIR}/${PV}/0001-disable-filter-ssynth.patch"
+	#this has been fixed in the tree
+	"${FILESDIR}/${PV}/0001-disable-edit-quality.patch"
+	#this causes segfaults
+	"${FILESDIR}/${PV}/0001-disable-filter-layer.patch"
+	#for when we use minimal
+	"${FILESDIR}/${PV}/0001-compile-server.patch"
+	"${FILESDIR}/${PV}/0001-use-external-lib3ds.patch"
+	"${FILESDIR}/${PV}/0001-use-external-openctm.patch"
+	"${FILESDIR}/${PV}/0001-use-external-muParser.patch"
+	"${FILESDIR}/${PV}/0001-use-external-bzip.patch"
+	"${FILESDIR}/${PV}/0001-use-external-jhead.patch"
+	"${FILESDIR}/${PV}/0001-use-external-glew.patch"
+	#cause gnu stack quickstart related qa
+	"${FILESDIR}/${PV}/0001-remove-not-sane-plugins.patch"
+	"${FILESDIR}/${PV}/${P}-fix-plugins-path.patch"
+	"${FILESDIR}/${PV}/${P}-align1.patch"
+	"${FILESDIR}/${PV}/${P}-align2.patch"
+	"${FILESDIR}/${PV}/${P}-asString.patch"
+	"${FILESDIR}/${PV}/${P}-qprintable.patch"
+	"${FILESDIR}/${PV}/${P}-qt-includes.patch"
+	"${FILESDIR}/${PV}/${P}-qt-5.15.patch"
+)
 
 src_prepare() {
 	mv "${WORKDIR}/vcglib-${VCG_VERSION}" "${WORKDIR}/vcglib" || die "vcglib mv failed"
@@ -93,7 +95,7 @@ src_configure() {
 
 src_install() {
 	dobin distrib/{meshlab,meshlabserver}
-	dolib distrib/libcommon.so.1.0.0
+	dolib.so distrib/libcommon.so.1.0.0
 	dosym libcommon.so.1.0.0 /usr/$(get_libdir)/libcommon.so.1
 	dosym libcommon.so.1 /usr/$(get_libdir)/libcommon.so
 	exeinto /usr/$(get_libdir)/meshlab/plugins
diff --git a/media-gfx/monica/Manifest b/media-gfx/monica/Manifest
index 123961384147..86280a884b1c 100644
--- a/media-gfx/monica/Manifest
+++ b/media-gfx/monica/Manifest
@@ -1,5 +1,5 @@
 AUX monica-3.6-makefile-cleanup.patch 907 BLAKE2B 13cf4d1a4950074f8909045fc0acd337482e343b51a800dbb87a585311ff776d4f87f8d0250b059e99b328a470e99bae23412646a5d8d89d09a4380e50bbd372 SHA512 cc151e238e89db9d3873133e1a637d5e2959c2460251fe7fe8feb62ef22c64963cec5b2533607996b2cf7d33abdfd1f42a59f5a769cad0bf2194e8d751da3bf6
 AUX monica-3.7-gcc44.patch 341 BLAKE2B c534884cca357cbc37a0092bb42faa9a3f29165e0e5622d811d08f4238a2d716f91a8ce731438a33323dd350e3b9da79e743b7d3f46fc5ba9eb084b14f359bd4 SHA512 837f3fc2c77d415067460f1aae80807daa9882b814494f2305be711db920a750ae183ec7b456527956b60ca3cf022729524990cd0febafeaab41bd1dbb080bfb
 DIST monica-3.7.tar.bz2 18330 BLAKE2B 26c5539d00867fd6ee80255a41fa363ee8cd3a720637b1b83546bfe9bf877f5b521ea47da456d965b65f57d7a351bc7c5dfe310ab9608b67a8db7b2b4d9cd1af SHA512 87565f33f3c3492b196905e5b8e17bd45a7eb8eb0a0281f02e23337eec888af82571ac6f2d229256ee97012d402b7f1b217cd56a8b87ff9c9296931bf63cb153
-EBUILD monica-3.7.ebuild 708 BLAKE2B 60d813aac6f40d7753c4dfbe038faada9b9ba5cbfa32dc9b020c01d5c6e09ccda57b7d70112593e8de808afaaa1eee257c8338e79ebe6a5072042ce3e1c46376 SHA512 a31da9af50f86ab6e4c45a4d32008ede5d6fcb992e2fe3205e9acd0a40904cfe0d367f766b78a67f8b3c4edfabd26311eaa81e9dc1271fe938d6e6920be69d77
+EBUILD monica-3.7.ebuild 718 BLAKE2B 50a1d50df2df9ff18ff9735b542b85cd5e5748f3e4dad8dcb66e03f4f76684d74e7899e130820eabd46cb31a29707ecc3822c930700370a704336d5868d6466f SHA512 56aaedd0adea9b91c69162ef8837caa4a1ddb472cf6b1e5aba251f30f11e8f9926b18902f8c1cd9ed7ce8393dea363162f6837cb10a906e0daef0d42fd891d96
 MISC metadata.xml 629 BLAKE2B 90f781b587a61b126e78d8d7e11bb2aacc1db7c58d5891f4781bcca8d9531d5b1373ffd35b0771ea8dcfab81493807742598846919fd9b657270d46f8265c1c2 SHA512 30f91e05861aa50f5d0af624459ea92cd2649fbad374bed1b0dc30c2ab2532df8bd6b27f42f23bc7e77480141bcd5760a5804c46d121b3fa1170a90fd1d0acd0
diff --git a/media-gfx/monica/monica-3.7.ebuild b/media-gfx/monica/monica-3.7.ebuild
index 7afd8b96e53f..08697029c232 100644
--- a/media-gfx/monica/monica-3.7.ebuild
+++ b/media-gfx/monica/monica-3.7.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
@@ -6,7 +6,7 @@ EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="Monica is a Monitor Calibration Tool"
-HOMEPAGE="http://freecode.com/projects/monica"
+HOMEPAGE="http://freshmeat.sourceforge.net/projects/monica"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="BSD"
diff --git a/media-gfx/mypaint-brushes/Manifest b/media-gfx/mypaint-brushes/Manifest
index bddb650f7cda..ee3c9876b08b 100644
--- a/media-gfx/mypaint-brushes/Manifest
+++ b/media-gfx/mypaint-brushes/Manifest
@@ -1,3 +1,3 @@
 DIST mypaint-brushes-1.3.0.tar.gz 2447093 BLAKE2B 26fc22ef7669f5d88b1cb2bbc4562baffe257c112baf4a782f5045becd17a0bea577f79f290ae51b38cb3030478ea9d2e251033cc95101caacc823d139fe4ce1 SHA512 f8e0050cd700358d75cd25e40acd73905e2a53f21c6177cf67e8012aa4fbba8dc445109f07601c3846f95532a40feff4441081c0aa4e958049fc0ed8008fb414
-EBUILD mypaint-brushes-1.3.0-r1.ebuild 554 BLAKE2B c0cc90e2c42672b96cc734918fe5222a71e7973ab303e1d9794e7fea8d9355c8016774b165134d8cac95cf29f0d8389f608b9f4387c3304c03a8b7943e3ed949 SHA512 3649d53e9012acec908e2441bfc9b7e2c7a5b8c89a890ac6d38b6b1c418167dab459796a1f3f6482e8795606b1473759154f9fc5a7dbd37868ed709114de1f86
+EBUILD mypaint-brushes-1.3.0-r1.ebuild 548 BLAKE2B f216508dd44e7d4a657e8dd30a0b136ad895b326cedaf0bc68c3c19537c22907d253ea0390a7c18363d2e097f7f348d8dc751400849cf21da5fe9b882fa34c55 SHA512 80d06275b8428302f71d29626847ec3b69cfa87f12fcac34a8e3d91d57119ba7a85eff76dbdbac8aec580fa28713ebe15def07259aff98898279483b9a851dda
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
index 62c440f74456..fa662603aa5c 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
@@ -6,8 +6,8 @@ EAPI=6
 inherit autotools
 
 DESCRIPTION="Default MyPaint brushes"
-HOMEPAGE="https://github.com/Jehan/mypaint-brushes"
-SRC_URI="https://github.com/Jehan/mypaint-brushes/archive/v1.3.0.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/mypaint/mypaint-brushes"
+SRC_URI="https://github.com/mypaint/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="CC0-1.0"
 SLOT="1.0"  # due to pkgconfig name "mypaint-brushes-1.0"
diff --git a/media-gfx/netpaint/Manifest b/media-gfx/netpaint/Manifest
new file mode 100644
index 000000000000..38b8c9795317
--- /dev/null
+++ b/media-gfx/netpaint/Manifest
@@ -0,0 +1,3 @@
+DIST netpaint-1.1.2.tar.gz 427241 BLAKE2B 7884dadf63849bf45caf84bc009da818bdf3277660411c486b32333bf0caf9e0e03ab6f56f77add68456896e4d16520b803c51e19c4dc6b01ef1227f0bd90a28 SHA512 f998714fe176c84074aaa710e2950c83d5c3ac0819e69c6bbbd93e19f6415a66f8ef21e0799d3112a7c468c1a99383a878ac1837157b079089aaf072c664ee53
+EBUILD netpaint-1.1.2.ebuild 756 BLAKE2B 4894fb73fdf76bf78ed6cea19604c029efdc229b4181a1679e53647d6c218b57c2bd8aca7e3f7d734fde1615aa81efb9932c89b8bec0ad949d4d383f921a9520 SHA512 fa56666e8024f58d14e041ff4ff8bae3c7d850fde6d6cca84d5699dc4b1fbf31a8a9b6458b9c31e85fb21330db37ca5cebc775fc015ea852fb806661b0c9d8a7
+MISC metadata.xml 413 BLAKE2B 0376b5f01922a8bd36d48d3525c9fdd1659ff1a936a7fda8fe0af3ce7ff669b603d80e560bb02bf690cf77f5fc6ddd830c1cf4d76942fee38e6fa3e6c539c861 SHA512 88efad0cf6e816ef512ca7d821cba3bcfdb3c81f2e54d26458a139a876631703f2a147077b077ab7c1dca74fd05a58a8b003db14625175bd3fb9e9545f6c103b
diff --git a/media-gfx/netpaint/metadata.xml b/media-gfx/netpaint/metadata.xml
new file mode 100644
index 000000000000..b09023bbc390
--- /dev/null
+++ b/media-gfx/netpaint/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>monsieurp@gentoo.org</email>
+        <name>Patrice Clement</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>shell-tools@gentoo.org</email>
+        <name>Gentoo Shell Tools Project</name>
+    </maintainer>
+</pkgmetadata>
diff --git a/media-gfx/netpaint/netpaint-1.1.2.ebuild b/media-gfx/netpaint/netpaint-1.1.2.ebuild
new file mode 100644
index 000000000000..36c3bcd4fe2a
--- /dev/null
+++ b/media-gfx/netpaint/netpaint-1.1.2.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
+
+DESCRIPTION="curses-based drawing tool"
+HOMEPAGE="https://github.com/SyntheticDreams/NetPaint"
+SRC_URI="https://github.com/SyntheticDreams/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+MY_PN="NetPaint"
+MY_P="${MY_PN}-${PV}"
+
+RDEPEND="
+	dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	mv netpaint.py netpaint || die
+	sed -e 's#netpaint\.py#netpaint#g;' \
+		-i setup.py || die "can't patch setup.py"
+}
diff --git a/media-gfx/pngquant/Manifest b/media-gfx/pngquant/Manifest
index 4aa8bcd32389..65e22a973f7a 100644
--- a/media-gfx/pngquant/Manifest
+++ b/media-gfx/pngquant/Manifest
@@ -2,5 +2,5 @@ AUX pngquant-2.12.2-respect-CFLAGS.patch 449 BLAKE2B fb3679a05e024a276b5ae1070f9
 DIST pngquant-2.12.3-src.tar.gz 143572 BLAKE2B 6f4cc9f36c9148f36734d9afa3765e206c09e833064cff5d98494d0d71610e857d7c605bc5673eb9fd5b38029ade60c9c1ffc18e745a3dfe5dbde6d39a81d0c7 SHA512 cf39f56750a49b2818fb86b168845e54f3797b664c3f49535ee93a3dc899299192a692039396ffcddc5988d040a778006c5f701f8bcd9f5c73583a47b711b01c
 DIST pngquant-2.12.6.tar.gz 69074 BLAKE2B 3573d54d94b0085de9ffd4dd34a8fd46c49a1e02d0a6419271c17bc7ac7ab6c05d811336a3a8a8ab21d4dea774c93ee1baae141b42c255838fb1eef9cdb1a871 SHA512 8ffff346df67edf1000c71b6d26371826bc4d236b3f57ef1ec73b3b61668cff9c3ca7d541417c39bc6c89e00176c91eb28867b7a91945ac84292ca0ac54984e9
 EBUILD pngquant-2.12.3.ebuild 1169 BLAKE2B 56452f5fa0d76b47151583ef5c4684781eeee2ad12736845790af6ac1a1bb06516c692156a54aa08bcafe5d9df3f5175e3be34e9564e79970ca43cb65428275f SHA512 648727074119405019a00eb3f252ff86e0157874821f3fb9e6025183937cb4639a8b15c19974ee31bb27313cf791a45c8569490e885f0a92b88b1b2d62eada44
-EBUILD pngquant-2.12.6.ebuild 1329 BLAKE2B 0dacb67b6294e461c2b8f098c1064a580e9c47f66de1bf7d38bb346c69aff6cf8b62e87908b2fd908f31385ebc5559549963d9eca8a5954257656d0d7b8dba1e SHA512 b07dc65fb7e5a6cefeff41c6ae48906cac8ff1a548d67309d4f35f38da9033af1111d2dc47d448acf9741d39e6af53c8e28b24d1599d6a8ff3bd0f945a5dfa44
+EBUILD pngquant-2.12.6.ebuild 1328 BLAKE2B 3fe65dc071f8f993c440ad318473eb71deccd0ad62ff635b5c57f8cef1fee1a7c4f85ac6332e92076962e2655e98c1cb16a5fee38ff80af9469feccd00ffe797 SHA512 afbea31a05dbe254316f102b47eae79a29123c5a535fe7d254bc6d3f9a95ec69cb2421499454491ca6fb8e1734c651e79dee6c61583d33d307c741ebe28affea
 MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2
diff --git a/media-gfx/pngquant/pngquant-2.12.6.ebuild b/media-gfx/pngquant/pngquant-2.12.6.ebuild
index 2fed8ebcbef0..26e19714bec4 100644
--- a/media-gfx/pngquant/pngquant-2.12.6.ebuild
+++ b/media-gfx/pngquant/pngquant-2.12.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/kornelski/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3 HPND rwpng"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 
 IUSE="cpu_flags_x86_sse2 debug lcms openmp test"
 REQUIRED_USE="test? ( lcms )"
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 5d33c27ebd1c..37e088e58901 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -4,11 +4,16 @@ AUX sane-backends-1.0.27-disable-usb-tests.patch 336 BLAKE2B 00fd225a4426405d515
 AUX sane-backends-1.0.27-network.patch 1022 BLAKE2B bcc929635fe62af4201f474cddd141b95bf1b7520f7279b713771ed9614990b3331ec1b42f309d88e375d6c9cffacb7195e7e3f063e491bb9cd6e4ae39f79eea SHA512 04b65a06d2c76dde6fce501ba823e999eb89ea41573f887f9e7d5347f3aa5e35310fad69313e99f873640e29a9849372d2ff995678593a0781fba73b464bec0d
 AUX sane-backends-1.0.27-revert-samsung.patch 14137 BLAKE2B ec41dcc9862a50f09518207b0db83f37d14f7e3ba6b101800144a8bc7059eb9c0fb5fcbab42dc8ec68001f61b304baa628c3f2ac73be9031b946fe8088e5cf37 SHA512 70e8d86291fbb21c7c9c5fa9ba5df54c808e5e75e3155af33ab9c18c768bc1eaa05890802c52daa3e60619fa8961b7162cac4c51e2dd2dd6c7114986d3a6136f
 AUX sane-backends-1.0.27-uninitialized-variable.patch 902 BLAKE2B 6f2e86d6d79f85f73d564bc1877667c1278108d876f61551cc89abb159dee68e6b454bec190cb44eee61255fa648010293382f5575d208dd7c1e33c1492be3e9 SHA512 b3c5675e5ec3a92345832d081025dae72bcfda9854f79565fc2801e6ea710a83e953a9f075ef9754c6d893fb099544989b4aaabf8a177d5c52b8a4b9c6eac052
+AUX sane-backends-1.0.30-add_hpaio_epkowa_dll.conf.patch 459 BLAKE2B d127c054b3e4f8aca5de54888e7a37c986515350aac84bb66ca195fca57138cbe3ac3f29b0982e4019b5b599b81984dceacd5523f794a04cfb5d416a051a1e61 SHA512 d9bcce33482db2f15ee094a244359fafdce196984a799509d9b16e24f46feb3aecd419520e65ca9513b40ff4975d793bec05924bfdd69586d9a6f3feb42cccc3
+AUX sane-backends-1.0.30-bigendian-depth.patch 372 BLAKE2B f93f510496f1234c586f57b4814ad45ea3dd0bf78a934edd6ab951c5423be235560e54d871d8f9edef6fe51b4d9e18ecf33367635cefa1e500f8ed29a722e0bd SHA512 0cfe593471be5a89666ad9bb112999368d9195f0bf3aa13597251b3a5ebf645eeb776b29df04291f4fda6e330f2bdfbbbc04865588d9af54c5f610b9e923d9fb
+AUX sane-backends-1.0.30-missing-stdint-include.patch 374 BLAKE2B e20005c96096a228126b7e1d414ae2c127bf7ad16894defc8e3c65230380449e61f75b3cd63bd80b16bf8b1ebc08e5f974eb621d16f9c6b994105bb9d95e1a89 SHA512 521a3275879e84f6727ebc3b8e5ae4fbbb1495d2c41cb6880e170c62f684da2af7ea47b0a89d0806687f8a48791f2562959158a31a30dd240880757b6c81a321
 AUX saned 150 BLAKE2B 306d57a0c09856b387c3c50eb27aaafdb194972c2fdb5d1cb7de3118f0c71cf234898ce958f0d6bd17a5e1f2b5bde458e014a7bfdec52403a6204ebf51aee039 SHA512 26f3d66c6b1e75d87d7d430518aa878c77d5ab8d76a45847cef3ff15566341938eedf46c50d0fa8cdeef828df9cddefdd6fdd767c5de30d3aa7d64ed1911d910
 AUX saned.confd 76 BLAKE2B cac74b6f117f7f78a71b951433bc6b155f8641e2cf1bd747871165764e97ed368d10551075761c34ff01f51f7cae1b8a9c5692fb9666a300b45134fe255ea3c1 SHA512 8f4a99ef24c19b3a7213b3d25ea16f5bca8623735cf25d21e3a706e9e0135ac8cce5d0b8fb8728845977f41dcefe6bd858076d755515fc91b00e05ee5817d751
 AUX saned.initd 294 BLAKE2B 571bd4032b2330c627a31459a18baf2044852ec1b40f0216bd5b5a546d61133522cdc98c7011669feaadc2d030ffeb49a86130075f22a18edab5f4c925780681 SHA512 655200141339f14bf7fc6f4fff3403cf9504809b7f023aa5425aad691c5baa65772100da0a6311669f83ed1dce73b7d65ca20aa31345b13c48dfdb1b30ce5dbd
 AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3cecdae79111fb1db1cfe3b4933eca15af5f985fc6b89e4d9af3844b6e9cfd542828b6b9e57ed9 SHA512 a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093
 AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965
+DIST backends-1.0.30.tar.gz 5721262 BLAKE2B 139d3ca908d54b94d14ef4145d44a89b939807c15870be03c3c028cf95351bf9a4abd3ea115b84396366bb054f37ade883f429467dceb0663c2855b92e0a4fa5 SHA512 19127c8109c1587d60d8cba713f73b1a24242df44fa49c3e59320f48022783f05d26d3242a3f87478e583a807d88b446ef7a51afb33b674be29656496c435d7b
 DIST sane-backends-1.0.27.tar.gz 6430188 BLAKE2B 90f910311e31a436eaa0ca0fedd998aac3331f89a346f31613776ebc860a10cc37055fd15db8de8d743498914ea0c16e4153dbaa101380eb6e36857d730c3456 SHA512 c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5
 EBUILD sane-backends-1.0.27-r3.ebuild 8101 BLAKE2B e6ff1e73fad9d33c8b9d4a475de311b5ddf60a66fe2604f6c8573bfd593688292a84ac554dc06d0c9d1181f443f31e0e9fc6e6e520a0e76fe62f373129f92388 SHA512 1434b237b354d84eecfab48624805dcbd8dcaaf42e5315ca25c980942551a2cb0cae39453907982d96ffe2a4042def9eb7d44b9ad768750aa35d65a18057c06c
+EBUILD sane-backends-1.0.30-r2.ebuild 8153 BLAKE2B 4a837163fb0ca438814f3ecb54f5a9d1ab6e229b243dc8348b624c2e28ecc489897f728252410e0409d0885d8fcbf6801a5bb5a67479a52284368aa25699ac96 SHA512 6f6ce83f0b66c15eb193c19916fc2978f49b19068efa6dbaa7e6ed9b414c71ecf6513978a725cb95d27a4f304cbc8f377e837aa42af6aeaa16495fd29fbc1f25
 MISC metadata.xml 266 BLAKE2B c76ad15982ba5b341a41155c75a5fda95a99ef658ed972c452bfb7b0968aafe33f83cc5bd0f2effb1c2b4f9721a8f61987f2fb7906855b3869e7787226f2b385 SHA512 67d43b02a8c1aab418ca79b30d88af0e78f9df9b95c93887cfed5976290e714409e7dc400f09170d7e7844a411aa3e3202f49f31f39b7f580a8c0b6f3d4db659
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.30-add_hpaio_epkowa_dll.conf.patch b/media-gfx/sane-backends/files/sane-backends-1.0.30-add_hpaio_epkowa_dll.conf.patch
new file mode 100644
index 000000000000..b92e14b67791
--- /dev/null
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.30-add_hpaio_epkowa_dll.conf.patch
@@ -0,0 +1,11 @@
+diff -Naur backends-1.0.30/backend/dll.conf.in backends-1.0.30-r1/backend/dll.conf.in
+--- backends-1.0.30/backend/dll.conf.in	2020-05-17 14:16:28.000000000 +0300
++++ backends-1.0.30-r1/backend/dll.conf.in	2020-06-27 08:24:18.378856341 +0300
+@@ -98,3 +98,7 @@
+ #umax_pp
+ v4l
+ xerox_mfp
++# Add support for the HP-specific backend.  Needs net-print/hplip installed.
++hpaio
++# Add support for the Epson-specific backend.  Needs media-gfx/iscan installed.
++epkowa
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.30-bigendian-depth.patch b/media-gfx/sane-backends/files/sane-backends-1.0.30-bigendian-depth.patch
new file mode 100644
index 000000000000..bac06593b9e6
--- /dev/null
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.30-bigendian-depth.patch
@@ -0,0 +1,14 @@
+Correct overlooked bigendian case.  This has been fixed upstream in a different
+way since the 1.0.30 release.
+
+--- a/backend/genesys/low.cpp
++++ b/backend/genesys/low.cpp
+@@ -539,7 +539,7 @@
+     }
+ 
+ #ifdef WORDS_BIGENDIAN
+-    if (depth == 16) {
++    if (session.params.depth == 16) {
+         dev->pipeline.push_node<ImagePipelineNodeSwap16BitEndian>();
+     }
+ #endif
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.30-missing-stdint-include.patch b/media-gfx/sane-backends/files/sane-backends-1.0.30-missing-stdint-include.patch
new file mode 100644
index 000000000000..14c97ae95bf6
--- /dev/null
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.30-missing-stdint-include.patch
@@ -0,0 +1,14 @@
+https://gitlab.com/sane-project/backends/-/issues/314
+https://gitlab.com/sane-project/backends/-/commit/6bb87fdf1f3dc190cfc4b7d64b0c8c8c3d10151b.diff
+--- a/sanei/sanei_usb.c
++++ b/sanei/sanei_usb.c
+@@ -48,6 +48,9 @@
+ 
+ #include "../include/sane/config.h"
+ 
++#ifdef HAVE_STDINT_H
++# include <stdint.h>
++#endif
+ #include <stdlib.h>
+ #include <ctype.h>
+ #include <sys/types.h>
diff --git a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
new file mode 100644
index 000000000000..d81a991ad811
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils flag-o-matic multilib-minimal systemd toolchain-funcs udev user
+
+# gphoto and v4l are handled by their usual USE flags.
+# The pint backend was disabled because I could not get it to compile.
+IUSE_SANE_BACKENDS="
+	abaton
+	agfafocus
+	apple
+	artec
+	artec_eplus48u
+	as6e
+	avision
+	bh
+	canon
+	canon630u
+	canon_dr
+	canon_pp
+	cardscan
+	coolscan
+	coolscan2
+	coolscan3
+	dc210
+	dc240
+	dc25
+	dell1600n_net
+	dmc
+	epjitsu
+	epson
+	epson2
+	escl
+	fujitsu
+	genesys
+	gt68xx
+	hp
+	hp3500
+	hp3900
+	hp4200
+	hp5400
+	hp5590
+	hpljm1005
+	hpsj5s
+	hs2p
+	ibm
+	kodak
+	kodakaio
+	kvs1025
+	kvs20xx
+	kvs40xx
+	leo
+	lexmark
+	ma1509
+	magicolor
+	matsushita
+	microtek
+	microtek2
+	mustek
+	mustek_pp
+	mustek_usb
+	mustek_usb2
+	nec
+	net
+	niash
+	p5
+	pie
+	pixma
+	plustek
+	plustek_pp
+	pnm
+	qcam
+	ricoh
+	ricoh2
+	rts8891
+	s9036
+	sceptre
+	sharp
+	sm3600
+	sm3840
+	snapscan
+	sp15c
+	st400
+	stv680
+	tamarack
+	teco1
+	teco2
+	teco3
+	test
+	u12
+	umax
+	umax1220u
+	umax_pp
+	xerox_mfp"
+
+IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf"
+
+for GBACKEND in ${IUSE_SANE_BACKENDS}; do
+	case ${GBACKEND} in
+	# Disable backends that require parallel ports as no one has those anymore.
+	canon_pp|hpsj5s|mustek_pp|\
+	pnm|mustek_usb2|kvs40xx)
+		IUSE+=" sane_backends_${GBACKEND}"
+		;;
+	*)
+		IUSE+=" +sane_backends_${GBACKEND}"
+	esac
+done
+
+REQUIRED_USE="
+	sane_backends_escl? ( zeroconf )
+	sane_backends_kvs40xx? ( threads )
+	sane_backends_mustek_usb2? ( threads )
+"
+
+MY_PN=${PN//sane-/}
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Scanner Access Now Easy - Backends"
+HOMEPAGE="http://www.sane-project.org/"
+SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
+RDEPEND="
+	gphoto2? (
+		>=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
+		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+	)
+	sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	sane_backends_dell1600n_net? (
+		>=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}]
+		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+	)
+	sane_backends_escl? (
+		net-dns/avahi[${MULTILIB_USEDEP}]
+		net-misc/curl[${MULTILIB_USEDEP}]
+	)
+	sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	sane_backends_pixma? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	snmp? ( net-analyzer/net-snmp:0= )
+	systemd? ( sys-apps/systemd:0= )
+	usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] )
+	v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	xinetd? ( sys-apps/xinetd )
+	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	dev-libs/libxml2
+	v4l? ( sys-kernel/linux-headers )
+"
+BDEPEND="
+	sys-devel/autoconf-archive
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch
+	"${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch
+	"${FILESDIR}"/${P}-missing-stdint-include.patch
+	"${FILESDIR}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch
+	"${FILESDIR}"/${PN}-1.0.30-bigendian-depth.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/sane-config
+)
+
+pkg_setup() {
+	enewgroup scanner
+	enewuser saned -1 -1 -1 scanner
+}
+
+src_prepare() {
+	default
+
+	# Patch out the git reference so we can run eautoreconf
+	sed -i -e "s/m4_esyscmd_s(\[git describe --dirty\])/${PV}/" configure.ac || die
+	eautoreconf
+
+	# Fix for "make check".  Upstream sometimes forgets to update this.
+	local ver=$(./configure --version | awk '{print $NF; exit 0}')
+	sed -i \
+		-e "/by sane-desc 3.5 from sane-backends/s:sane-backends .*:sane-backends ${ver}:" \
+		testsuite/tools/data/html* || die
+
+}
+
+src_configure() {
+	# From Fedora
+	append-flags -fno-strict-aliasing
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# the blank is intended - an empty string would result in building ALL backends.
+	local lbackends=" "
+
+	use gphoto2 && lbackends="gphoto2"
+	use v4l && lbackends="${lbackends} v4l"
+	for backend in ${IUSE_SANE_BACKENDS}; do
+		if use "sane_backends_${backend}" && [ ${backend} != pnm ]; then
+			lbackends="${lbackends} ${backend}"
+		fi
+	done
+
+	local myconf=(
+		$(use_with usb)
+		$(multilib_native_use_with snmp)
+	)
+
+	# you can only enable this backend, not disable it...
+	if use sane_backends_pnm; then
+		myconf+=( --enable-pnm-backend )
+	fi
+	if use sane_backends_mustek_pp; then
+		myconf+=( --enable-parport-directio )
+	fi
+	if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp; }; then
+		myconf+=( sane_cv_use_libieee1284=no )
+	fi
+
+	# relative path must be used for tests to work properly
+	# All distributions pass --disable-locking because /var/lock/sane/ would be a world-writable directory
+	# --without-api-spec to not automagically depend on tons of stuff
+	# that break in many ways, bug #636202, #668232, #668350
+	# People can refer to the "Programmer's Documentation" at http://www.sane-project.org/docs.html
+	ECONF_SOURCE=${S} \
+	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
+	BACKENDS="${lbackends}" \
+	econf \
+		--disable-locking \
+		--without-api-spec \
+		$(use_with gphoto2) \
+		$(multilib_native_use_with systemd) \
+		$(use_with v4l) \
+		$(use_enable ipv6) \
+		$(use_enable threads pthread) \
+		$(use_enable zeroconf avahi) \
+		"${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake VARTEXFONTS="${T}/fonts"
+
+	if tc-is-cross-compiler; then
+		pushd "${BUILD_DIR}"/tools >/dev/null || die
+
+		# The build system sucks and doesn't handle this properly.
+		# https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366
+		tc-export_build_env BUILD_CC
+		${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \
+			-I. -I../include -I"${S}"/include \
+			"${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \
+			"${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die
+		local dirs=( hal hotplug hotplug-ng udev )
+		local targets=(
+			hal/libsane.fdi
+			hotplug/libsane.usermap
+			hotplug-ng/libsane.db
+			udev/libsane.rules
+		)
+		mkdir -p "${dirs[@]}" || die
+		emake "${targets[@]}"
+
+		popd >/dev/null || die
+	fi
+
+	if use usb; then
+		sed -i -e '/^$/d' \
+			tools/hotplug/libsane.usermap || die
+	fi
+}
+
+multilib_src_install() {
+	emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \
+		docdir="${EPREFIX}"/usr/share/doc/${PF}
+
+	if multilib_is_native_abi; then
+		if use usb; then
+			insinto /etc/hotplug/usb
+			doins tools/hotplug/libsane.usermap
+		fi
+
+		udev_newrules tools/udev/libsane.rules 41-libsane.rules
+		insinto "/usr/share/pkgconfig"
+		doins tools/sane-backends.pc
+	fi
+}
+
+multilib_src_install_all() {
+	keepdir /var/lib/lock/sane
+	fowners root:scanner /var/lib/lock/sane
+	fperms g+w /var/lib/lock/sane
+	dodir /etc/env.d
+
+	if use systemd; then
+		systemd_newunit "${FILESDIR}"/saned_at.service "saned@.service"
+		systemd_newunit "${FILESDIR}"/saned.socket saned.socket
+	fi
+
+	if use usb; then
+		exeinto /etc/hotplug/usb
+		doexe tools/hotplug/libusbscanner
+		newdoc tools/hotplug/README README.hotplug
+	fi
+
+	dodoc NEWS AUTHORS PROBLEMS README README.linux
+	find "${D}" -name '*.la' -delete || die
+
+	if use xinetd; then
+		insinto /etc/xinetd.d
+		doins "${FILESDIR}"/saned
+	fi
+
+	newinitd "${FILESDIR}"/saned.initd saned
+	newconfd "${FILESDIR}"/saned.confd saned
+}
+
+pkg_postinst() {
+	elog "Optional backends:"
+	optfeature "Epson-specific backend" media-gfx/iscan
+	optfeature "HP-specific backend" net-print/hplip
+
+	if use xinetd; then
+		elog "If you want remote clients to connect, edit"
+		elog "/etc/sane.d/saned.conf and /etc/hosts.allow"
+	fi
+
+	if ! use systemd; then
+		elog "If you are using a USB scanner, add all users who want"
+		elog "to access your scanner to the \"scanner\" group."
+	fi
+}
diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest
index fe63cc331577..0aaccb32ac24 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -1,4 +1,5 @@
 AUX scrot-1.2.bash-completion 1990 BLAKE2B 6c99578185f7d69581854372344088398279af8227fccccff07dcb590ae1a90d6ef9122ba3cf02b0db634fe68554818e63d1cfa54bae0fb1ccb65cf0f84769b4 SHA512 76880911e6799894d68aae78313a114fc18c6bf2f0411a0fdce3f30d33c8ff266290aed9570a546c3a05a71503a130c5cbe2cb6e0f92c240edbc8e9f19362db4
+AUX scrot-9999-Xcursor.patch 594 BLAKE2B 6687cb0cb3640dabf7fa949639c908be2375a191a18872ed300a0524ec00b8a24e049583e367b470615025ba794ea0e1caef2b41e41959cf870211a0b15be1f6 SHA512 afcb6ffef4239c9a21d7e104efaa318261ee2600596c1762472078b41bd713dc1111428904fcb7329fde84f535d99eb334a169a5cd502bf85a7a514d2f291955
 AUX scrot.bash-completion 1063 BLAKE2B ab03add49bb68db845d1cb599e62dfd4070a8110b5bbf03584fec395a3b0c60262bf3f4fc0ddc1a35c17996a8986107ae3bad053a8974da7c456bdfe7410b424 SHA512 ce8df63bb5b10dbf19f465f2629ebe7045d84105f3da70a49f2bde6a0a416a8f14a02ba3e7d3a8aeba144a592b45a770929b56f6ae7ac867222213ac8f923a0f
 DIST scrot-1.2.tar.gz 36839 BLAKE2B 26ca05fb3c8fa9069ad87bdd5cc93791994e44e2f5cd7a4b729a6c9e3035c349049500b9627fd31532c280465f77f839370d095f1b0f2ccc10649b3e6fa01edb SHA512 b89e7a94e6317fdb7bd260190c6d68a2dfefc08691b4574337afdfff84f55b8b9c955a6ac60642ae9749c1deaa16bee7b855fbd15833a95f602536693daf8c37
 DIST scrot-1.3.tar.gz 141726 BLAKE2B 1972edfa3b61c95fd786d0b4db13633778293b2c671c395939ea0b77d49714e644abd60cfae5656f03fd1c701185d2c8961c45d62989e882f2cd8f4a824dee57 SHA512 45828824701c7574676d0746d01f3dc8313ea91a272fa169b616765442e8842b67d8aa73f47009a66d34dd6b89a230fd9fb42bc598e88baae70fc45345c13a4c
@@ -7,5 +8,5 @@ DIST scrot_0.8.orig.tar.gz 74324 BLAKE2B 56facc81c29f101279ffc6d5d323a0cecd32b1f
 EBUILD scrot-0.8_p13-r1.ebuild 975 BLAKE2B 4f0920e23cada110c426fcd1ef874379f8ae3d9ed272dc5fd8a8cc4ffa0253066ee1f26428cad4d771bc5875fc205daea8d3e5fa381a204e5d13edcec2bab881 SHA512 b26b4f5aaa5a522a602404197697b17cd04d53d23229c7d1078e851400019c2fc506b96ba72b6aa36c9fe084711c67b9a57f4b75113e0b3ebb64289fd03fbf75
 EBUILD scrot-1.2.ebuild 920 BLAKE2B b00fcbdf7665347b42716ce8ab78b8f6965f90b4b1f1a88acd2fffacd2978145208965afd206012c837ab22126ba7e78990b8760c5a58cccef373d2715991918 SHA512 341f2fbb5f4824b38d4c42e18929173cad358faf4b9b475d0c735ddc1a681962019c3a8a35892c5120afc42895ac1ac654c1faeb7a7fee5010725a61251bc7cd
 EBUILD scrot-1.3-r1.ebuild 971 BLAKE2B f4daabaf37c8e2d6ea724d1b96f12928b4f5ece6301a0fa44dcffbbfdf00d4b213f56b5b066116b64eb45bb78100c9b9fd2fb451e2e8d9da664b9624c7f67c63 SHA512 552252c5ca01774197b34dd862a458399004f5be2f78b5d889176c0ebf072b05b08cfa842953205dc64da4ed3d4d011f81fb964a071992ea5b772c0ae69fcacd
-EBUILD scrot-9999.ebuild 893 BLAKE2B b294cc0496f809a4066f2ddc84687a71b0dc5967dc09460e1dc1477f1d0a519051da24f6504afbdd2d57d66377e8d07178356c261fff7d7a9233b1d6795a1ef7 SHA512 10ee5b7d2afce6b7cf006575b25c71727854899032591725a22c9594e33821ceb2294398153eec59e5e7ff826b0f570e70ff676c5b0f292ea87ae3d6654eb00d
+EBUILD scrot-9999.ebuild 948 BLAKE2B 2a136ad3c3791d8d7a189f0becd731cdb87737f0574897813dd12084d8567b71a80a31c07a5d21b178327a6e283c065eac715d4dab0132600649ee0fd095756d SHA512 2bef97380ce7621fca3fc0af655baf3e47df4f4b73674d26000c4636cbc95f090bb0f4dbb655cba6ba88711282f8784100c1738fff9445adfc68217aee955087
 MISC metadata.xml 211 BLAKE2B 3e8296d37e4cf92be5d17d7f263807fad2fc9685607894f9f269f3123987c3baeff7fce17f80480419fb68f2eac48919541cd7aaa21de659d95dd647e05ade48 SHA512 58d7fc7dd62d18c69c3b30062d76c291bc795b7a53804d1380fc49ed6f6a4389805c327633297b9c56c40cbae9a6e5608e12d8a64c01e370954e551246c4b486
diff --git a/media-gfx/scrot/files/scrot-9999-Xcursor.patch b/media-gfx/scrot/files/scrot-9999-Xcursor.patch
new file mode 100644
index 000000000000..dbb935219b35
--- /dev/null
+++ b/media-gfx/scrot/files/scrot-9999-Xcursor.patch
@@ -0,0 +1,18 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -34,4 +34,4 @@
+ bin_PROGRAMS      = scrot
+ scrot_SOURCES       = main.c getopt.c getopt1.c getopt.h scrot.h \
+ options.c options.h debug.h imlib.c structs.h note.c note.h
+-scrot_LDADD         = -lX11 -lXfixes -lXcursor -lXcomposite @GIBLIB_LIBS@
++scrot_LDADD         = -lX11 -lXfixes -lXcomposite @GIBLIB_LIBS@
+--- a/src/scrot.h
++++ b/src/scrot.h
+@@ -40,7 +40,6 @@
+ #include <X11/cursorfont.h>
+ #include <X11/extensions/Xfixes.h>
+ #include <X11/extensions/Xcomposite.h>
+-#include <X11/Xcursor/Xcursor.h>
+ 
+ #include <stdio.h>
+ #include <string.h>
diff --git a/media-gfx/scrot/scrot-9999.ebuild b/media-gfx/scrot/scrot-9999.ebuild
index a3ef577a9be9..82d865e83c56 100644
--- a/media-gfx/scrot/scrot-9999.ebuild
+++ b/media-gfx/scrot/scrot-9999.ebuild
@@ -15,7 +15,7 @@ KEYWORDS=""
 RDEPEND="
 	>=media-libs/giblib-1.2.3
 	x11-libs/libX11
-	x11-libs/libXcursor
+	x11-libs/libXcomposite
 	x11-libs/libXfixes
 	|| (
 		media-libs/imlib2[gif]
@@ -31,6 +31,9 @@ DEPEND="
 DOCS=(
 	AUTHORS ChangeLog CONTRIBUTING.md README.md TODO
 )
+PATCHES=(
+	"${FILESDIR}"/${PN}-9999-Xcursor.patch
+)
 
 src_prepare() {
 	sed -i -e 's#-g -O3##g' src/Makefile.am || die
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 109002185826..8f7a3a62d20d 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,5 +1,5 @@
 DIST shotwell-0.30.8.tar.xz 6460512 BLAKE2B aecdfa8d90bcce19c38a55872671f6521d8808fa46decba4e9910392f9f8907dd99aaecc825f4e3f6ae747ab151bf5bfa3a807364d571db0fc2ddcaad9a492f5 SHA512 dccd496a083145283c79250329f88fdfe526a98ce84b6d1c52a9c48c9e52a4749bdf2449f3102474c994ef1e687e06767b9bcda03ea97d1168d3417743a6e866
 DIST shotwell-0.30.9.tar.xz 6465508 BLAKE2B 9b302d156b350d5cfa961afaa5d75e71db8b34a65a27de0d3b298841ca9be96d502dc98c85c681ca336965fce72db8034609f3f9c6c04fea1127db6c397e6499 SHA512 a232d717356d7e9f0a6b1ad825f4182dd9f6ee4cca9745717e3bd18ded03cdaba94c32256d055389ce2b0cda0c5828b25d1448c10598a474dc3ea0817fc303ee
 EBUILD shotwell-0.30.8-r1.ebuild 1783 BLAKE2B ea068d6335d7b5d4af0fef2bb571275f0218d384fb118706a948e79177814d6062cb2990ecb43fcf62352986d9f8fae0d02c0318c3481b1277d24524573f90d6 SHA512 c90464d3bd7749d57b3a36aa6352cea07ac47a487c0e7317d1717fb53cfc183dbcb438a22f0314b73d43a31b9555f08acad4eb27d73046d030ef6f3e041d6be4
-EBUILD shotwell-0.30.9.ebuild 1782 BLAKE2B 84211b71a3a4747a7cc42f7d8b2b5e873bdea2ef8abe7fd7b4ae1e3ac9cab0fdafe1de78a7ab09ae7b40d0591c78f715fb447ce3df86c7dbae80a2d758229bbf SHA512 02cb56548ebe4d6fe3efbedf31a5c6d02cb7f5424bc595f46dde6be8390bfb99dd58eb68b1b147bdb3d64cd893d083bbf877fa75ed2c9ec582b00865fe03fa9c
+EBUILD shotwell-0.30.9.ebuild 1781 BLAKE2B 32ec5d04a0b5050020cbe21753e780d67ae4ab47bd328d5b22136bd5c7215de6fc37b08e1b3f73508526b81d823ef40b699412048e34be11f7c6f041b00462f9 SHA512 210eeeac54dd43f26b7129f7d6ada56ffa823d526181823cb7729e8ff33101c22385588eb9a99ebb0c0fbb6003d4721683df9bfa8447e37ad7702ecfbe92bac5
 MISC metadata.xml 795 BLAKE2B 4b5da2cc205b128a0cb9d10a50c3743b8d12302d266e37d5e0479915824af75af8c22b7b12ffca57146aa0a999e2bff3d7c4969af9e19f317a70b9195b02333f SHA512 d3ceceeed90fd4cadd5e212d047b3d6f7882860d145cb80521a4db8e9baaf461910ff70cb5bb2c1cda991939bf2c8917bb7f252bf68c7487d40271b0419c6322
diff --git a/media-gfx/shotwell/shotwell-0.30.9.ebuild b/media-gfx/shotwell/shotwell-0.30.9.ebuild
index 905397252718..e79822b715c4 100644
--- a/media-gfx/shotwell/shotwell-0.30.9.ebuild
+++ b/media-gfx/shotwell/shotwell-0.30.9.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE="opencv udev"
 
 DEPEND="
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 682352083089..c1651a3bbec7 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -2,5 +2,5 @@ AUX 3.26-add-control-optional-deps.patch 2773 BLAKE2B e6c3faa98ecda13c926752defe
 DIST simple-scan-3.34.4.tar.xz 795228 BLAKE2B b6f185bfbc1954ae2573fd1dcfa54f67e26290654c1019bfd34c229235e27cfc1eb40de0e6d5249f97b73c57745e1133fbd6fd1c3f9bdedb795b61068d5ed25d SHA512 b16b653e0a8ce399ecbdb88c4663d7780793518809eb73681c9c6281b9cde784167090c41720b21c184b9fdece28b07ba61fe8a97f10d792cc7326a458741ba4
 DIST simple-scan-3.34.6.tar.xz 801064 BLAKE2B 94c6bc386c2d7701bd13067e384eb294ce145d2e02d66e366e76a2c85fb5e3ac4e9bae0efa37fe13d3fc857b57c1730bf01961f7968d6744a4ea4dc47308cb23 SHA512 7b2d0eab13f08d4110d2143c4572e249297891e3868e6eb178a7a765b2d56960820931fbda538ede318014c578871657aa0e27518d184f861efc18ad4fdd900c
 EBUILD simple-scan-3.34.4.ebuild 1322 BLAKE2B b6359d130e933254fa3e5350ebb2ac562d4682f5c1af219f07321202e3deab61adf6dc9cd34e1dbbc3a04b0211ed091273e494692fadceca6a52bfebd1383c04 SHA512 16e305af51c31b4f775de7b4afe58cbe7ca51622dfa073c890a3e179b83a5f5853d333042aad26a738fbb19253621cc347e7b8a0984717fa2d04629443a9d219
-EBUILD simple-scan-3.34.6.ebuild 1329 BLAKE2B 21944ee06e8464b55a1ff8240f6e0c8816fb736093614b698ba7a964e013214aec8c3c010867dc7c3d5ac6688d8a21cb2d0a457dcbfd033d0e41bc203551d908 SHA512 accbc4335878c4c83b2e9dd98821fd5594683456750f3f169d38c261f6c4410f9b09856cd2c78d84df50787f1aa70446704f5ef567a145a252569b2d7af19362
+EBUILD simple-scan-3.34.6.ebuild 1328 BLAKE2B dc23bc08fb3b54ca3493340fc40a10482f496d23e5311320369c9c5cf69268b0e037190fd6b853beddb5a3edc171b50093da9f14347e0cdc437292bbb9d8618a SHA512 1df4ff44d691a37f51ea67782cdd23594aaaa0aa5bf294c793652817d5ebea3115a15900ff0c5a83ee31011db19aa7a52421119b9a43ebe09c047046d73ba4b8
 MISC metadata.xml 616 BLAKE2B 576d986402f8cc708eae60f661640808751747c764d5fe729dd014f33758e0b484a2b80a214d9a3d1ed4bce7e455e34803a62048240e5de8e203184446cdc0df SHA512 6377cb9c20b1ce2db22ba959d386e4389939b72503d87da956d659144b8a6f8b521abdd19dd4c82ac0cb32e260ce6633b75136a353f63b86593f5e1f12394d47
diff --git a/media-gfx/simple-scan/simple-scan-3.34.6.ebuild b/media-gfx/simple-scan/simple-scan-3.34.6.ebuild
index a7a3d720bbeb..7735d1a8248f 100644
--- a/media-gfx/simple-scan/simple-scan-3.34.6.ebuild
+++ b/media-gfx/simple-scan/simple-scan-3.34.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="colord webp"
 
 DEPEND="
diff --git a/media-gfx/xdot/Manifest b/media-gfx/xdot/Manifest
index cf4651d403c0..fc97c960363f 100644
--- a/media-gfx/xdot/Manifest
+++ b/media-gfx/xdot/Manifest
@@ -1,4 +1,4 @@
 DIST xdot-1.1.tar.gz 134215 BLAKE2B e241a4fb1ec69a8613f7813dc159761e6bffb82ea9f58876287d01946f4c93e66e5eef66e6844abb7738979412c2c7d2d26f76bc0563ad0c3c8550d9e8023b47 SHA512 d67c45c8c071013551f79d671a21ce546b680fac5997ba9631a882ffa3c44c15a69949643ed5e8211417006152575a1d99450ccfb6062427521d1e2bc0814f55
-EBUILD xdot-1.1.ebuild 1130 BLAKE2B 643ba4bae26a1f433b26709c4dd8761ac8bc8b0d44295d805e927fa5babf3a21ca7b805091f58f2c43570ddc293750b14d8d314643a055a65b7bd7ec759256b8 SHA512 1da4a96976c1d0928648e4c99a774366025373368b6e45a1500557cb63b3fc384d18432c906bb63565303f2fc5470941b2343f4f25ffa254630c06587ce81f73
+EBUILD xdot-1.1.ebuild 1129 BLAKE2B 6316813447e8d0588018c93955c2bed5012df4669ce17b885122d267b512cdc65b2196a443a3398591e7b4063b58d0faed989f1d0ede51c269ecd333e81af031 SHA512 c73f5b741eac3a227435408eb57bb73dd832bb6e62217edd01a41ad9b285f2dccebed50ca976043053dd115568d7db8622e7e23576fe5bba6bad83e7cff613fe
 EBUILD xdot-9999.ebuild 1102 BLAKE2B 154a7034a320211af04a977697e0e8fd7ea53ab37de9ef0e5d34fc60f13ab8c7e8861c1d4e24ae8a0a2a2e727ab3cd57070338ce058f693946eacfc98e7b2ef7 SHA512 86d2c030cadded62e64e90466ade5733919487fb07e816b089e6cd98f88345ad5f0d00460e47dac10dbe536c84292b347e3b916e12fafa6c97448759ca92daed
 MISC metadata.xml 483 BLAKE2B 50b03bb7d189da9bd6ca793f30c1ba3d13d12151533b42c99321a849515d7664398ec1b10720596c0453c48d35e2a6083b0559eb127199e1d6f4fc2a93aa04c4 SHA512 7e734dd60daa1e74b28f0932f508787e8deebc75a8f46c41f77007b6c8f96751cd6b07f6638cb89b38eb81d4fd2c6f7ba9f6d449f24f17ad25fb001d7f4f5ff7
diff --git a/media-gfx/xdot/xdot-1.1.ebuild b/media-gfx/xdot/xdot-1.1.ebuild
index e7945acb3221..ab6cb8df3ba5 100644
--- a/media-gfx/xdot/xdot-1.1.ebuild
+++ b/media-gfx/xdot/xdot-1.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 	SRC_URI=""
 else
-	KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
 	MY_P="${MY_PN}-${PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/jrfonseca/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 635e4d8c2edc..968e16f309a7 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/aubio/Manifest b/media-libs/aubio/Manifest
index 1878fa218b66..aab597d65415 100644
--- a/media-libs/aubio/Manifest
+++ b/media-libs/aubio/Manifest
@@ -5,5 +5,5 @@ DIST aubio-0.4.8.tar.bz2 387933 BLAKE2B e30d0ce97360376edf8eba895dc3040157a139c8
 DIST aubio-0.4.9.tar.bz2 397604 BLAKE2B b849d92678ea8fb20e17921b1a61fdc85a84d4a528acfefa3278169ab5f7fe935217ec37dd9f931202f0f0a1fd3a9518372afbce34cc2dd3ca30c6b4e5d9a301 SHA512 0cb81bb4b15051db3f3f4d160d500af56fdfb237e0a74e3f366f53c2870030aa0a7cee8469a611a9694c36b8866d3d42ffb48241c999de08f3fee43e6d903130
 EBUILD aubio-0.4.7-r1.ebuild 2476 BLAKE2B bbb66cc2cdecae57c6ffd93e92199f06ac35c8b77c52a656e435956b1391a83d4ac117a471532fb99d713516254a8a6c27bf65653528dcd7493d7e1ba0901163 SHA512 d0c1d1ec2f24963f74748d83f490b7100f02682e2f15897686b0acef265175b2b821623d7a10b9f208c2b5007145022c191a764777a57c14ddc2904ae899421e
 EBUILD aubio-0.4.8.ebuild 2480 BLAKE2B 019e89355725965392524f13f48e85f346ba4c563e6c8d075428ac08dc2317f7b32001533c8d5ea9d0c0e391c1eedba989ce9e34f092cadccd39809480f558aa SHA512 644fbed7d586997c01c6a696f4329709115ed5860c0c9ab4e694004f44c22b9095e7b87a109bf908b115931c0d56aa54d41c46c929b60a35975be0247c685ac7
-EBUILD aubio-0.4.9.ebuild 2503 BLAKE2B 5ccaf8c7091c005be9d481f2689ee5e9c9d344f0fc851d6a5b77d1ae954e8e635de65f7803ebcff967be69799533fa5450cb82f02a8a6a2994f1700c5d0f2df9 SHA512 baab2d27ba3be1a91f9940b516270b94353433ca3fb6ec25a852de53e9ce5f893c0b99ddd726206c35105a2f61bf847c53384144496ca8392bf8cdca2c2f008f
+EBUILD aubio-0.4.9.ebuild 2837 BLAKE2B 4eb54f407991fb579ef4f23bde7dac337443d15c0c8f9daa357c395ee21f2fb8205fb5fd47f07828cf5f02f6147b44ca9edc00d1ac778905406a5aac105fbbb6 SHA512 e26ccf065778e2d11b17c41764dda9ba14caad4e5abffe43a1817422d302efc3cab35e8e9fc4f2276a1dd89ff916270d2d690de60304eb974d09d265dbe53405
 MISC metadata.xml 346 BLAKE2B 00429033f506bf3818f26f13062d21d0d04d8fc84185244615a09d008c5da6e350df5f32bdcba2c07103039ed64f802cc563a0ca8cd79e117741b947e421142d SHA512 ff3830c2d2322fabdb34458fd27c3e05ad825b1d707eee6150417e4c21480bdffbe4e639ff33a9914cc28189b91e970719326f065746f4241e186f7b27b168d1
diff --git a/media-libs/aubio/aubio-0.4.9.ebuild b/media-libs/aubio/aubio-0.4.9.ebuild
index 786cb94ce5e6..e7905fd67a9a 100644
--- a/media-libs/aubio/aubio-0.4.9.ebuild
+++ b/media-libs/aubio/aubio-0.4.9.ebuild
@@ -14,8 +14,14 @@ SRC_URI="https://aubio.org/pub/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0/5"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 IUSE="doc double-precision examples ffmpeg fftw jack libsamplerate sndfile python test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( double-precision libsamplerate )
+	doc? ( python )
+"
+
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -29,15 +35,13 @@ RDEPEND="
 	)
 	sndfile? ( media-libs/libsndfile )
 "
+
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	app-text/txt2man
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( double-precision libsamplerate )
-"
 
 DOCS=( AUTHORS ChangeLog README.md )
 PYTHON_SRC_DIR="${S}"
@@ -48,8 +52,11 @@ PATCHES=(
 
 src_prepare() {
 	default
+
 	sed -e "s:doxygen:doxygen_disabled:" -i wscript || die
 
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
+
 	if ! use test; then
 		sed -e "/bld.*tests/d" -i wscript || die
 	fi
@@ -81,14 +88,20 @@ src_configure() {
 src_compile() {
 	waf-utils_src_compile --notests
 
-	if use doc; then
-		cd "${S}"/doc || die
-		emake dirhtml
-	fi
-
 	if use python ; then
 		cd "${PYTHON_SRC_DIR}" || die
 		distutils-r1_src_compile
+
+		if use doc ; then
+			# No API function like distutils_install_for_testing available for this use case
+			pushd "${S}"/doc &>/dev/null || die
+			python_setup
+			LD_LIBRARY_PATH="${S}/build/src" \
+			PYTHONPATH="${S%%/}-${EPYTHON/./_}/lib${PYTHONPATH:+:${PYTHONPATH}}" \
+			emake dirhtml
+		fi
+
+		cd "${S}" || die
 	fi
 }
 
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index 0915e8bd59da..b14912c97d64 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -1,6 +1,8 @@
 DIST babl-0.1.66.tar.bz2 706100 BLAKE2B 0de443dd4ea32cd025c8b121f042c24528677f32a6c201f3abedd13fb3a2ce2636d03f4b45eefce2c9f7a86426355af9b584602ca9ebb1a2140ee88f500c2843 SHA512 41534eea6cad21eae704af3fdce4857e9dc2b0efa48a7cfd7f98b23428198e95fc9ca2f30e522abf2fa06e907eaf4f7bbafc048b356cb5890fabcb9be21001b3
 DIST babl-0.1.74.tar.xz 294156 BLAKE2B bb5df4db706f817d9cf8674caed9b758fc1380b9dd33a26b24990eae07543f097c5e5fb68788c02cb2a2c0e68e917bb7a1c68aa0d2f9871dfd3267934291d474 SHA512 97b4a5aad76b7d6dee1835774cee48f866a9513c6454d74c3378068a60359704c1ba106a7542b9ac6a7968b3cf632ed2626b835ec9c7f3fcc6e29968c1e39396
+EBUILD babl-0.1.66-r1.ebuild 1575 BLAKE2B c45a13adf99809857f345b0f0a3ef510c0a7b8d0b6f9407eba9e5c64c2a60498d5e211f6cd0feb4d7eeb053f4534e2be8ce03bacd281f402c1a20d49d4f5a58e SHA512 10137ee08bc7449f692885f661358c0c81e4065521aa3f64534c0ad0b9f5c572b983714ac214821df0204df41cca302a3dd1c65362527cab17886c1b30e5c601
 EBUILD babl-0.1.66.ebuild 1526 BLAKE2B fd0b0a8d90ecd659174bbbea81a30815bf6ba733a549bb9bec26122447c77095f4c40a76e4dc650cbeceab7c2f2cece0ca4f830a05acfa164a5fa64cc14c0abb SHA512 2ce3d9e86d9bee1423c9f9bab80b6c5b385f9be7fa6a0c0fb25c5cfeca46e64708c630c1fda4ce600c3cb61b1a47df3cc4bbcf8637d3fe15b46c95b1c4bcce70
+EBUILD babl-0.1.74-r1.ebuild 1604 BLAKE2B 75805349e710fcd3255f904c6ec4931f850ced00946d65827433e88115e13bcb686b1e020525cdb4a65ffb94b41a4b8ea2799a08662309064926aaf95c6cd35c SHA512 42102ff0ca81ea4a05eac5be4f9c4eae08ca738e352cc014da0f6c0b6aeed54b595ea386ddfeffe9bba1bfc0b5354233ae9333da466811b09ab41d2461839e09
 EBUILD babl-0.1.74.ebuild 1531 BLAKE2B 96d7fdedcedd21ca6a29d2431353cdbcc8ca192f0002565a2371c31eb54a5a4ab2eefdb2494b2eed4492dd16a9dafbb207a2f14be1b58abfdfa33b4985eed73d SHA512 b80760c10d05f679ea6511ee395dc595f14666bcbf6ef9a85733b56ece74592b91d914432eaed23f83ec960bb1fd81d93843386b4d429032a7035e7feab6ef7c
-EBUILD babl-9999.ebuild 1535 BLAKE2B fc17f623aac707e7c8d59277df8d01f3d9442d78288ed12f8eda21141789e8fd8ec7520011b093ccd8147799dfedb25b4b05ac31955bf2a405255b5d86345f2e SHA512 5b6b8a5901afd6408e4c9abc410423922110a923eefb6ca462f723b6fb709d45945abefc44dcdadef0c888efa7dba20373079407c23b191c3eda0e5719ca1c36
+EBUILD babl-9999.ebuild 1836 BLAKE2B 44380d3a91670a7a56e6e604cc912e3dccff04d8826272f006aeb9951a1140cbe0acfe0f412f26a7fab9d08bbbebcbd302d779f437b6a84fc01e6d4896faffc1 SHA512 7a469576467529eb1c2b3f388f67822c551d554a9013f3cc35e695e1e0d880f9baa31c37f7442d743a53313aad36484a20488ade7280b02d339ab837dd058865
 MISC metadata.xml 370 BLAKE2B 18f0dfd3b6fb8f284f888dbcd30d3d4ddce8753e58ef3e92ba0803bd6dadd36962f2f6e57dcd6ccebc547bf43b8972bdaf27e5817c77307172fdb835fe2d9c9e SHA512 9ad9dbdfc25d5a59c0129f1f83615d73bcb9026cc0411a71e9987bca46389fa5f3905a72d22ddac319b1838b770cc5755a2ec312a05db1752e10be5cca08ea38
diff --git a/media-libs/babl/babl-0.1.66-r1.ebuild b/media-libs/babl/babl-0.1.66-r1.ebuild
new file mode 100644
index 000000000000..5f6ba2b9f668
--- /dev/null
+++ b/media-libs/babl/babl-0.1.66-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999* ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git"
+	SRC_URI=""
+else
+	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
+	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"
+fi
+
+DESCRIPTION="A dynamic, any to any, pixel format conversion library"
+HOMEPAGE="http://www.gegl.org/babl/"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="altivec lcms cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c"
+
+RDEPEND="lcms? ( >=media-libs/lcms-2.8:2 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999* ]] && eautoreconf
+}
+
+src_configure() {
+	# Automagic rsvg support is just for website generation we do not call,
+	#     so we don't need to fix it
+	# w3m is used for dist target thus no issue for us that it is automagically
+	#     detected
+	econf \
+		--disable-docs \
+		--disable-static \
+		--disable-maintainer-mode \
+		$(use_enable altivec) \
+		$(use_enable cpu_flags_x86_f16c f16c) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable cpu_flags_x86_sse3 sse3) \
+		$(use_enable cpu_flags_x86_sse4_1 sse4_1) \
+		$(use_with lcms)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/media-libs/babl/babl-0.1.74-r1.ebuild b/media-libs/babl/babl-0.1.74-r1.ebuild
new file mode 100644
index 000000000000..16fe9b5de136
--- /dev/null
+++ b/media-libs/babl/babl-0.1.74-r1.ebuild
@@ -0,0 +1,49 @@
+# 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://gitlab.gnome.org/GNOME/babl.git"
+	SRC_URI=""
+else
+	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
+	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"
+fi
+
+DESCRIPTION="A dynamic, any to any, pixel format conversion library"
+HOMEPAGE="http://www.gegl.org/babl/"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="introspection lcms cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+	lcms? ( >=media-libs/lcms-2.8:2 )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	# Automagic rsvg support is just for website generation we do not call,
+	#     so we don't need to fix it
+	# w3m is used for dist target thus no issue for us that it is automagically
+	#     detected
+	local emesonargs=(
+		-Dwith-docs=false
+		$(meson_use introspection enable-gir)
+		$(meson_use lcms with-lcms)
+		$(meson_use cpu_flags_x86_avx2 enable-avx2)
+		$(meson_use cpu_flags_x86_f16c enable-f16c)
+		$(meson_use cpu_flags_x86_mmx enable-mmx)
+		$(meson_use cpu_flags_x86_sse enable-sse)
+		$(meson_use cpu_flags_x86_sse2 enable-sse2)
+		$(meson_use cpu_flags_x86_sse3 enable-sse3)
+		$(meson_use cpu_flags_x86_sse4_1 enable-sse4_1)
+	)
+	meson_src_configure
+}
diff --git a/media-libs/babl/babl-9999.ebuild b/media-libs/babl/babl-9999.ebuild
index e31e4dbc6a4d..be6f45add6b0 100644
--- a/media-libs/babl/babl-9999.ebuild
+++ b/media-libs/babl/babl-9999.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
-inherit meson
+VALA_USE_DEPEND=vapigen
+
+inherit meson gnome2-utils vala
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -19,12 +21,25 @@ HOMEPAGE="http://www.gegl.org/babl/"
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE="introspection lcms cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1"
+IUSE="introspection lcms vala cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1"
+REQUIRED_USE="vala? ( introspection )"
 
-BDEPEND="virtual/pkgconfig"
-RDEPEND="lcms? ( media-libs/lcms:2 )"
+BDEPEND="
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+RDEPEND="
+	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+	lcms? ( >=media-libs/lcms-2.8:2 )
+"
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	default
+	gnome2_environment_reset
+	use vala && vala_src_prepare
+}
+
 src_configure() {
 	# Automagic rsvg support is just for website generation we do not call,
 	#     so we don't need to fix it
@@ -34,6 +49,7 @@ src_configure() {
 		-Dwith-docs=false
 		$(meson_use introspection enable-gir)
 		$(meson_use lcms with-lcms)
+		$(meson_use vala enable-vapi)
 		$(meson_use cpu_flags_x86_avx2 enable-avx2)
 		$(meson_use cpu_flags_x86_f16c enable-f16c)
 		$(meson_use cpu_flags_x86_mmx enable-mmx)
diff --git a/media-libs/flickcurl/Manifest b/media-libs/flickcurl/Manifest
index 7f2f846e590f..d47daa948029 100644
--- a/media-libs/flickcurl/Manifest
+++ b/media-libs/flickcurl/Manifest
@@ -1,3 +1,3 @@
 DIST flickcurl-1.26.tar.gz 1870073 BLAKE2B 2e14565ee076b5fd83987fc4aadc00ef1561714ea30cefef9d79260ebefa4856eca18ada5afdf6b02ad6e8ed293dd0872927346083d9eb8209bece1f456ea6bf SHA512 5ffdef58e67cbf99da2e8eefad57e845627703d5b22c85d5635557cd2df53e47e74d8e3387523495708c5cc8952c290da5c4d5f1e86bd482312fc7e46e9af6cd
-EBUILD flickcurl-1.26.ebuild 961 BLAKE2B 66d0a3e98248434c6ce01e22af1e0448e83735112ea0a8c1f41e646da683ea8e66ab9fc61f48025341f45210872d725e2eb5385c869e8a617152a509f9eedb21 SHA512 04399b9c75f098f9314aedb9f153baa2d1ff215c69806bbe1577c8daafceab368fbcdba654b5cf1f7c29d6e57cc83e595eefca14cb78cc9290acb1d9b66df745
+EBUILD flickcurl-1.26.ebuild 968 BLAKE2B a054359ff97a9c20ed3e4a85c6129954273ce4a24879d3b86a9af2f154e5b2ebadddf40d7f3ff09c9804e70bbfd35fc019ceaa48b231da93fa40ee08b719b919 SHA512 2b3421ca8f224cf178640e4a22b242c0f0d4590d501888713a5d8c892e9e0cd5be1a8b53586a3a184a7ae9085f458a20000f54bbddf8bffd85d6204f45f936c6
 MISC metadata.xml 271 BLAKE2B b0687fe8ae2ec88c72e0ec255e0dd5f58947e593412c57d0c43e22614cdddc7cb0635a1c9f945d23e46dfc16876a45a6068b3be4dc35f71ce889e31dfc039515 SHA512 a479526f4526d3f6a474021c2226731726a8af01aadbae851a6cec31d32ba5a8e861109e9134a3dcef273512d098b8c13a5f34012573329745e780e2811ddf2b
diff --git a/media-libs/flickcurl/flickcurl-1.26.ebuild b/media-libs/flickcurl/flickcurl-1.26.ebuild
index 2372066e0167..ecaad8742122 100644
--- a/media-libs/flickcurl/flickcurl-1.26.ebuild
+++ b/media-libs/flickcurl/flickcurl-1.26.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.dajobe.org/flickcurl/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 GPL-2 Apache-2.0 )"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc raptor static-libs"
 
 RDEPEND=">=net-misc/curl-7.10.0
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 468a342ff156..07812169e19f 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -1,15 +1,6 @@
-AUX gd-2.2.5-CVE-2018-1000222.patch 2491 BLAKE2B 492923989fe07fa6993fd9ac7d234d8777b944e45cbce5f92aaf5bc53bd1502039ff75937e829f1ad6bceac8813bf68704a42d3688401a3b55fdfcd19649a533 SHA512 d12462f1b159d50b9032435e9767a5d76e1797a88be950ed33dda7aa17005b7cb60560d04b9520e46d8111e1669d42ce28cb2c508f9c8825d545ac0335d2a10b
-AUX gd-2.2.5-CVE-2018-5711.patch 3225 BLAKE2B f3e22fa172bb6d07a7bc1da59e25efed81afca5c65cf9dd20b1df286f11eee95be2e61fd094c2c568ec2c940372677553f4c3161e149c1ec294f90f35c3d3832 SHA512 4c8d756079cf4a5c856516ad3ad76c3913c26c3762064e564fd159a0f0b7c2d510f9e83353f89227238dbdb674e82e33ee6121a39a54222c6d67f1b8111a9d14
-AUX gd-2.2.5-CVE-2019-6977.patch 1167 BLAKE2B 7ec6fbd6c7a4841915d968558e8f8c647b873ece655e884661af1afe5732df66520de7b0c096c0faac5af57764fd0a8c6e9e83af155d93c3db74636944ff15d7 SHA512 5214ac4148c618f3fef3bb3b6675e41a76e31465cd8dac326ee99dc1ae4cfe760749997d2941743efa48e79b8dbdb536d6b6d79d9bc4e5363f2c50da52ab5cac
-AUX gd-2.2.5-CVE-2019-6978.patch 7852 BLAKE2B 2d9ced220950994fe3977c0ddbb3bf234fbc0912515ee1eb7e6f98510aabd4163b33ac4f0ccd4336538b20c27dea4f625a3e56ec865fe4bce610f7382415db42 SHA512 2a890d8b0c923e59b3d1b054f92999a48d7fa7065f64fdecc7bf80f719e5e10150a34549059a8edf13fba45c76c68be3ca698f38be0411cb2b9978daa2db3899
-AUX gd-2.2.5-ossfuzz5700.patch 2680 BLAKE2B 55beecdf63e280ab54b83b214d704bccc83a6779b650b4b6f31b3d6989deadaa179d4e733f0b07a4ee8aac5be043879619924ed21c0b6ede300b804783aded31 SHA512 cfac2479729105a9ed0200191b9e9a47e3e1962d4d9b0f811bc94006a79e9ac08ddb6ed424f60e8626c44e7316f0c1747de49e26890d5b454c8206fa22a65530
 AUX gd-2.3.0-disable-flaky-tests.patch 792 BLAKE2B 81d4d56f0365e51fd1f406f3f27cd788a670bc091e13c8d39e8fb8234dd934896d6161940e010e2c0118000a36012bc2f878674a7409bcc19662686afaf99cb3 SHA512 285c542ca60f25597c29c040c95bd1885dbd3c29d3c1af52123646bc06abbd271bd37d4dedc1fc0bb218a84063814c8d8176a30c1da8a19445064469e26a5ea6
 AUX gd-2.3.0-fix-tests-bug722448.patch 2231 BLAKE2B 629caa9cd7dbd63cab93c97466921ee9131c5542618fdb5ce772a9b1bd3fcf2e64f93da999ca9011917cf8e726cae914c76529eca1a24cd2c31f55c4e75aaa7c SHA512 6d66af4e5d70e1e919f81bf0fd7261bd13216da4873927826d5c4925cf1673a9a3e98d588f693bab7505ee02e7a231c19687e27c1efc1a606bab3b3ab20a93dd
 AUX gd-2.3.0-getlib.patch 2848 BLAKE2B 308577a8fce5b764cf96139d21d4aa6a6deb86244d0b858f520da1835547853d693f7c71621222744fe438f393aaaefa1fc6316ef27442a426af09df95c0faa2 SHA512 24d4774af36ca832504063c8327ff9a84956ae1a48cda3ef6f27d819e8a18b31a9083f2ce6d2587d5acb237d8c96c3d68cfe8eb8350a10715c15d16aca1cf37c
-DIST libgd-2.2.5-ossfuzz5700.dat 30 BLAKE2B 5ddd3d2be2adf05e1e2eb1852cc689be57d4d77c57b471e8b6021877f2fb137d15b4c73445fbb23a9ed585974a96dd154759a48712c1e7b5bdc5750d534aee4a SHA512 2394e92ff7a42c818e13a1ac9ad15bc81aa401adc917366ec8c440bb7f27a63777ab059aa03c501dafef0ac16b462dd23c7fb9f8086ce558203384a98a235fff
-DIST libgd-2.2.5-php_bug_75571.dat 1731 BLAKE2B 4b5d3f258b73e8089ede1b2c9f538855f410965a9e01e1f3f151ae52f072036172b184bd1a4d07b8355bb974bf088bebb0e812175a277bb67926274272bd80a0 SHA512 b3048640ce7828cca7901fadc989e867cfc6d31b44c0f5a1bda54d7428f317c8c8fc6403fef301e193869a95eb46eb7195d47710ec7f8c507ba049cb6cdcb281
-DIST libgd-2.2.5.tar.xz 2594092 BLAKE2B 222a7e012fbf9924ac391ee96c7cd3dec96afd78c6d43dfb680b33e7143e7df87fe6be75bbfe8fb93e916302d7daf08271214c84da28712e93a36465566cb2bd SHA512 e4598e17a277a75e02255402182cab139cb3f2cffcd68ec05cc10bbeaf6bc7aa39162c3445cd4a7efc1a26b72b9152bbedb187351e3ed099ea51767319997a6b
 DIST libgd-2.3.0.tar.xz 2539188 BLAKE2B a90f48be959d1bb6774ec44960e191b8be134ff3e74401eba4cbf9b165c72665f3dffe3beaaf92fa6069e0ef79533be5d57a5946a1839f55446072fa322ed808 SHA512 5b201d22560e147a3d5471010b898ad0268c3a2453b870d1267b6ba92e540cf9f75099336c1ab08217e41827ac86fe04525726bf29ad117e5dcbaef9a8d0622a
-EBUILD gd-2.2.5-r2.ebuild 3116 BLAKE2B 6d8149681eb1b178de4b816891602bc9eb978b7b05ff34ee84d3f9fa3c5f9c375a674f172bbf73d75fc148f30468aa108b992c9e1a9053f7ea4563d4f46b83c9 SHA512 0ac9ce9ba782762ce5c8c935edcc89270b7046a3e3b51078eddd1372bfe6ba9844226015c9b0c207b3670959652a4bb8f93ba0f9bf1bb1c5275e887c79efdea6
 EBUILD gd-2.3.0.ebuild 2546 BLAKE2B ddaa75cd04902204a36ddf712064bd542e4c2e16e59fb21e296bf081e7e13ba6311e52ed0dd2c0c36f4a83a79a35ebb83627afa815ed0d767c0a8abf730b0237 SHA512 643ba24e91561046794da0f4f9d07db97e7726cb9c61cb6b1d22a1ffd0d4c8b04cb2f4fc5a11d1d9e82c5a219e91befcbc745dbe9a619e5a730d0e81374d30b8
 MISC metadata.xml 1415 BLAKE2B eebc7a74a8d70d6d8c8eda0f59a752ce1f2589dfa0ab0df358a1fc0fbb843b285a270e626d1cd27f29b51ea46825184dfbfc9c4c252baed5092d2ab8cc33c0a4 SHA512 38aef9d6c1ad8b510a28aa54ed7d93c96d755fddc7a2693a6ab4667a38667ab37ba5eddce534f52e43c1ce9abe576ab4adefb2c17c64ff90ce1d24f44ae58cb6
diff --git a/media-libs/gd/files/gd-2.2.5-CVE-2018-1000222.patch b/media-libs/gd/files/gd-2.2.5-CVE-2018-1000222.patch
deleted file mode 100644
index 80f9712bf8e3..000000000000
--- a/media-libs/gd/files/gd-2.2.5-CVE-2018-1000222.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From ac16bdf2d41724b5a65255d4c28fb0ec46bc42f5 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 14 Jul 2018 13:54:08 -0400
-Subject: [PATCH] bmp: check return value in gdImageBmpPtr
-
-Closes #447.
----
- src/gd_bmp.c | 17 ++++++++++++++---
- 1 file changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/src/gd_bmp.c b/src/gd_bmp.c
-index bde0b9d3..78f40d9a 100644
---- a/src/gd_bmp.c
-+++ b/src/gd_bmp.c
-@@ -47,6 +47,8 @@ static int bmp_read_4bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp
- static int bmp_read_8bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp_hdr_t *header);
- static int bmp_read_rle(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info);
- 
-+static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression);
-+
- #define BMP_DEBUG(s)
- 
- static int gdBMPPutWord(gdIOCtx *out, int w)
-@@ -87,8 +89,10 @@ BGD_DECLARE(void *) gdImageBmpPtr(gdImagePtr im, int *size, int compression)
- 	void *rv;
- 	gdIOCtx *out = gdNewDynamicCtx(2048, NULL);
- 	if (out == NULL) return NULL;
--	gdImageBmpCtx(im, out, compression);
--	rv = gdDPExtractData(out, size);
-+	if (!_gdImageBmpCtx(im, out, compression))
-+		rv = gdDPExtractData(out, size);
-+	else
-+		rv = NULL;
- 	out->gd_free(out);
- 	return rv;
- }
-@@ -141,6 +145,11 @@ BGD_DECLARE(void) gdImageBmp(gdImagePtr im, FILE *outFile, int compression)
- 		compression - whether to apply RLE or not.
- */
- BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression)
-+{
-+	_gdImageBmpCtx(im, out, compression);
-+}
-+
-+static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression)
- {
- 	int bitmap_size = 0, info_size, total_size, padding;
- 	int i, row, xpos, pixel;
-@@ -148,6 +157,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression)
- 	unsigned char *uncompressed_row = NULL, *uncompressed_row_start = NULL;
- 	FILE *tmpfile_for_compression = NULL;
- 	gdIOCtxPtr out_original = NULL;
-+	int ret = 1;
- 
- 	/* No compression if its true colour or we don't support seek */
- 	if (im->trueColor) {
-@@ -325,6 +335,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression)
- 		out_original = NULL;
- 	}
- 
-+	ret = 0;
- cleanup:
- 	if (tmpfile_for_compression) {
- #ifdef _WIN32
-@@ -338,7 +349,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression)
- 	if (out_original) {
- 		out_original->gd_free(out_original);
- 	}
--	return;
-+	return ret;
- }
- 
- static int compress_row(unsigned char *row, int length)
diff --git a/media-libs/gd/files/gd-2.2.5-CVE-2018-5711.patch b/media-libs/gd/files/gd-2.2.5-CVE-2018-5711.patch
deleted file mode 100644
index 6d9de06998a4..000000000000
--- a/media-libs/gd/files/gd-2.2.5-CVE-2018-5711.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From a11f47475e6443b7f32d21f2271f28f417e2ac04 Mon Sep 17 00:00:00 2001
-From: "Christoph M. Becker" <cmbecker69@gmx.de>
-Date: Wed, 29 Nov 2017 19:37:38 +0100
-Subject: [PATCH] Fix #420: Potential infinite loop in gdImageCreateFromGifCtx
-
-Due to a signedness confusion in `GetCode_` a corrupt GIF file can
-trigger an infinite loop.  Furthermore we make sure that a GIF without
-any palette entries is treated as invalid *after* open palette entries
-have been removed.
-
-CVE-2018-5711
-
-See also https://bugs.php.net/bug.php?id=75571.
----
- src/gd_gif_in.c             |  12 ++++++------
- tests/gif/CMakeLists.txt    |   1 +
- tests/gif/Makemodule.am     |   2 ++
- tests/gif/php_bug_75571.c   |  28 ++++++++++++++++++++++++++++
- tests/gif/php_bug_75571.gif | Bin 0 -> 1731 bytes
- 6 files changed, 38 insertions(+), 6 deletions(-)
- create mode 100644 tests/gif/php_bug_75571.c
-
-diff --git a/src/gd_gif_in.c b/src/gd_gif_in.c
-index daf26e79..0a8bd717 100644
---- a/src/gd_gif_in.c
-+++ b/src/gd_gif_in.c
-@@ -335,11 +335,6 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromGifCtx(gdIOCtxPtr fd)
- 		return 0;
- 	}
- 
--	if(!im->colorsTotal) {
--		gdImageDestroy(im);
--		return 0;
--	}
--
- 	/* Check for open colors at the end, so
- 	 * we can reduce colorsTotal and ultimately
- 	 * BitsPerPixel */
-@@ -351,6 +346,11 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromGifCtx(gdIOCtxPtr fd)
- 		}
- 	}
- 
-+	if(!im->colorsTotal) {
-+		gdImageDestroy(im);
-+		return 0;
-+	}
-+
- 	return im;
- }
- 
-@@ -447,7 +447,7 @@ static int
- GetCode_(gdIOCtx *fd, CODE_STATIC_DATA *scd, int code_size, int flag, int *ZeroDataBlockP)
- {
- 	int i, j, ret;
--	unsigned char count;
-+	int count;
- 
- 	if(flag) {
- 		scd->curbit = 0;
-diff --git a/tests/gif/CMakeLists.txt b/tests/gif/CMakeLists.txt
-index 2b73749e..e58e6b09 100644
---- a/tests/gif/CMakeLists.txt
-+++ b/tests/gif/CMakeLists.txt
-@@ -4,6 +4,7 @@ LIST(APPEND TESTS_FILES
- 	bug00227
- 	gif_null
- 	ossfuzz5700
-+	php_bug_75571
- 	uninitialized_memory_read
- )
- 
-diff --git a/tests/gif/Makemodule.am b/tests/gif/Makemodule.am
-index 3199438f..5dbeac53 100644
---- a/tests/gif/Makemodule.am
-+++ b/tests/gif/Makemodule.am
-@@ -4,6 +4,7 @@ libgd_test_programs += \
- 	gif/bug00227 \
- 	gif/gif_null \
- 	gif/ossfuzz5700 \
-+	gif/php_bug_75571 \
- 	gif/uninitialized_memory_read
- 
- if HAVE_LIBPNG
-@@ -26,4 +27,5 @@ EXTRA_DIST += \
- 	gif/bug00066.gif \
- 	gif/bug00066_exp.png \
- 	gif/ossfuzz5700.gif \
-+	gif/php_bug_75571.gif \
- 	gif/unitialized_memory_read.gif
-diff --git a/tests/gif/php_bug_75571.c b/tests/gif/php_bug_75571.c
-new file mode 100644
-index 00000000..d4fae3ae
---- /dev/null
-+++ b/tests/gif/php_bug_75571.c
-@@ -0,0 +1,28 @@
-+/**
-+ * Test that GIF reading does not loop infinitely
-+ * 
-+ * We are reading a crafted GIF image which has been truncated.  This would
-+ * trigger an infinite loop formerly, but know bails out early, returning
-+ * NULL from gdImageCreateFromGif().
-+ *
-+ * See also https://bugs.php.net/bug.php?id=75571.
-+ */
-+
-+
-+#include "gd.h"
-+#include "gdtest.h"
-+
-+
-+int main()
-+{
-+    gdImagePtr im;
-+    FILE *fp;
-+
-+    fp = gdTestFileOpen2("gif", "php_bug_75571.gif");
-+    gdTestAssert(fp != NULL);
-+    im = gdImageCreateFromGif(fp);
-+    gdTestAssert(im == NULL);
-+    fclose(fp);
-+
-+    return gdNumFailures();
-+}
-
diff --git a/media-libs/gd/files/gd-2.2.5-CVE-2019-6977.patch b/media-libs/gd/files/gd-2.2.5-CVE-2019-6977.patch
deleted file mode 100644
index 0b67a596c6bc..000000000000
--- a/media-libs/gd/files/gd-2.2.5-CVE-2019-6977.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Heap-based buffer overflow in gdImageColorMatch
-Origin: other, https://gist.github.com/cmb69/1f36d285eb297ed326f5c821d7aafced
-Bug-PHP: https://bugs.php.net/bug.php?id=77270
-Bug-Debian: https://bugs.debian.org/920645
-Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2019-6977
-Forwarded: no
-Author: "Christoph M. Becker" <cmbecker69@gmx.de>
-Last-Update: 2019-02-01
-
-At least some of the image reading functions may return images which
-use color indexes greater than or equal to im->colorsTotal.  We cater
-to this by always using a buffer size which is sufficient for
-`gdMaxColors` in `gdImageColorMatch()`.
----
-
---- a/src/gd_color_match.c
-+++ b/src/gd_color_match.c
-@@ -31,8 +31,8 @@ BGD_DECLARE(int) gdImageColorMatch (gdIm
- 		return -4; /* At least 1 color must be allocated */
- 	}
- 
--	buf = (unsigned long *)gdMalloc(sizeof(unsigned long) * 5 * im2->colorsTotal);
--	memset (buf, 0, sizeof(unsigned long) * 5 * im2->colorsTotal );
-+	buf = (unsigned long *)gdMalloc(sizeof(unsigned long) * 5 * gdMaxColors);
-+	memset (buf, 0, sizeof(unsigned long) * 5 * gdMaxColors );
- 
- 	for (x=0; x < im1->sx; x++) {
- 		for( y=0; y<im1->sy; y++ ) {
diff --git a/media-libs/gd/files/gd-2.2.5-CVE-2019-6978.patch b/media-libs/gd/files/gd-2.2.5-CVE-2019-6978.patch
deleted file mode 100644
index 2eb9369a0bad..000000000000
--- a/media-libs/gd/files/gd-2.2.5-CVE-2019-6978.patch
+++ /dev/null
@@ -1,278 +0,0 @@
-From 553702980ae89c83f2d6e254d62cf82e204956d0 Mon Sep 17 00:00:00 2001
-From: "Christoph M. Becker" <cmbecker69@gmx.de>
-Date: Thu, 17 Jan 2019 11:54:55 +0100
-Subject: [PATCH] Fix #492: Potential double-free in gdImage*Ptr()
-
-Whenever `gdImage*Ptr()` calls `gdImage*Ctx()` and the latter fails, we
-must not call `gdDPExtractData()`; otherwise a double-free would
-happen.  Since `gdImage*Ctx()` are void functions, and we can't change
-that for BC reasons, we're introducing static helpers which are used
-internally.
-
-We're adding a regression test for `gdImageJpegPtr()`, but not for
-`gdImageGifPtr()` and `gdImageWbmpPtr()` since we don't know how to
-trigger failure of the respective `gdImage*Ctx()` calls.
-
-This potential security issue has been reported by Solmaz Salimi (aka.
-Rooney).
----
- src/gd_gif_out.c                  | 18 +++++++++++++++---
- src/gd_jpeg.c                     | 20 ++++++++++++++++----
- src/gd_wbmp.c                     | 21 ++++++++++++++++++---
- tests/jpeg/CMakeLists.txt         |  1 +
- tests/jpeg/Makemodule.am          |  3 ++-
- tests/jpeg/jpeg_ptr_double_free.c | 31 +++++++++++++++++++++++++++++++
- 7 files changed, 84 insertions(+), 11 deletions(-)
- create mode 100644 tests/jpeg/jpeg_ptr_double_free.c
-
-diff --git a/src/gd_gif_out.c b/src/gd_gif_out.c
-index 298a5812..d5a95346 100644
---- a/src/gd_gif_out.c
-+++ b/src/gd_gif_out.c
-@@ -99,6 +99,7 @@ static void char_init(GifCtx *ctx);
- static void char_out(int c, GifCtx *ctx);
- static void flush_char(GifCtx *ctx);
- 
-+static int _gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out);
- 
- 
- 
-@@ -131,8 +132,11 @@ BGD_DECLARE(void *) gdImageGifPtr(gdImagePtr im, int *size)
- 	void *rv;
- 	gdIOCtx *out = gdNewDynamicCtx(2048, NULL);
- 	if (out == NULL) return NULL;
--	gdImageGifCtx(im, out);
--	rv = gdDPExtractData(out, size);
-+	if (!_gdImageGifCtx(im, out)) {
-+		rv = gdDPExtractData(out, size);
-+	} else {
-+		rv = NULL;
-+	}
- 	out->gd_free(out);
- 	return rv;
- }
-@@ -220,6 +224,12 @@ BGD_DECLARE(void) gdImageGif(gdImagePtr im, FILE *outFile)
- 
- */
- BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out)
-+{
-+	_gdImageGifCtx(im, out);
-+}
-+
-+/* returns 0 on success, 1 on failure */
-+static int _gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out)
- {
- 	gdImagePtr pim = 0, tim = im;
- 	int interlace, BitsPerPixel;
-@@ -231,7 +241,7 @@ BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out)
- 		based temporary image. */
- 		pim = gdImageCreatePaletteFromTrueColor(im, 1, 256);
- 		if(!pim) {
--			return;
-+			return 1;
- 		}
- 		tim = pim;
- 	}
-@@ -247,6 +257,8 @@ BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out)
- 		/* Destroy palette based temporary image. */
- 		gdImageDestroy(	pim);
- 	}
-+
-+	return 0;
- }
- 
- 
-diff --git a/src/gd_jpeg.c b/src/gd_jpeg.c
-index fc058420..96ef4302 100644
---- a/src/gd_jpeg.c
-+++ b/src/gd_jpeg.c
-@@ -117,6 +117,8 @@ static void fatal_jpeg_error(j_common_ptr cinfo)
- 	exit(99);
- }
- 
-+static int _gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality);
-+
- /*
-  * Write IM to OUTFILE as a JFIF-formatted JPEG image, using quality
-  * QUALITY.  If QUALITY is in the range 0-100, increasing values
-@@ -231,8 +233,11 @@ BGD_DECLARE(void *) gdImageJpegPtr(gdImagePtr im, int *size, int quality)
- 	void *rv;
- 	gdIOCtx *out = gdNewDynamicCtx(2048, NULL);
- 	if (out == NULL) return NULL;
--	gdImageJpegCtx(im, out, quality);
--	rv = gdDPExtractData(out, size);
-+	if (!_gdImageJpegCtx(im, out, quality)) {
-+		rv = gdDPExtractData(out, size);
-+	} else {
-+		rv = NULL;
-+	}
- 	out->gd_free(out);
- 	return rv;
- }
-@@ -253,6 +258,12 @@ void jpeg_gdIOCtx_dest(j_compress_ptr cinfo, gdIOCtx *outfile);
- 
- */
- BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality)
-+{
-+	_gdImageJpegCtx(im, outfile, quality);
-+}
-+
-+/* returns 0 on success, 1 on failure */
-+static int _gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality)
- {
- 	struct jpeg_compress_struct cinfo;
- 	struct jpeg_error_mgr jerr;
-@@ -287,7 +298,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality)
- 		if(row) {
- 			gdFree(row);
- 		}
--		return;
-+		return 1;
- 	}
- 
- 	cinfo.err->emit_message = jpeg_emit_message;
-@@ -328,7 +339,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality)
- 	if(row == 0) {
- 		gd_error("gd-jpeg: error: unable to allocate JPEG row structure: gdCalloc returns NULL\n");
- 		jpeg_destroy_compress(&cinfo);
--		return;
-+		return 1;
- 	}
- 
- 	rowptr[0] = row;
-@@ -405,6 +416,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality)
- 	jpeg_finish_compress(&cinfo);
- 	jpeg_destroy_compress(&cinfo);
- 	gdFree(row);
-+	return 0;
- }
- 
- 
-diff --git a/src/gd_wbmp.c b/src/gd_wbmp.c
-index f19a1c96..a49bdbec 100644
---- a/src/gd_wbmp.c
-+++ b/src/gd_wbmp.c
-@@ -88,6 +88,8 @@ int gd_getin(void *in)
- 	return (gdGetC((gdIOCtx *)in));
- }
- 
-+static int _gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out);
-+
- /*
- 	Function: gdImageWBMPCtx
- 
-@@ -100,6 +102,12 @@ int gd_getin(void *in)
- 		out   - the stream where to write
- */
- BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out)
-+{
-+	_gdImageWBMPCtx(image, fg, out);
-+}
-+
-+/* returns 0 on success, 1 on failure */
-+static int _gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out)
- {
- 	int x, y, pos;
- 	Wbmp *wbmp;
-@@ -107,7 +115,7 @@ BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out)
- 	/* create the WBMP */
- 	if((wbmp = createwbmp(gdImageSX(image), gdImageSY(image), WBMP_WHITE)) == NULL) {
- 		gd_error("Could not create WBMP\n");
--		return;
-+		return 1;
- 	}
- 
- 	/* fill up the WBMP structure */
-@@ -123,11 +131,15 @@ BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out)
- 
- 	/* write the WBMP to a gd file descriptor */
- 	if(writewbmp(wbmp, &gd_putout, out)) {
-+		freewbmp(wbmp);
- 		gd_error("Could not save WBMP\n");
-+		return 1;
- 	}
- 
- 	/* des submitted this bugfix: gdFree the memory. */
- 	freewbmp(wbmp);
-+
-+	return 0;
- }
- 
- /*
-@@ -271,8 +283,11 @@ BGD_DECLARE(void *) gdImageWBMPPtr(gdImagePtr im, int *size, int fg)
- 	void *rv;
- 	gdIOCtx *out = gdNewDynamicCtx(2048, NULL);
- 	if (out == NULL) return NULL;
--	gdImageWBMPCtx(im, fg, out);
--	rv = gdDPExtractData(out, size);
-+	if (!_gdImageWBMPCtx(im, fg, out)) {
-+		rv = gdDPExtractData(out, size);
-+	} else {
-+		rv = NULL;
-+	}
- 	out->gd_free(out);
- 	return rv;
- }
-diff --git a/tests/jpeg/CMakeLists.txt b/tests/jpeg/CMakeLists.txt
-index 19964b0c..a8d8162f 100644
---- a/tests/jpeg/CMakeLists.txt
-+++ b/tests/jpeg/CMakeLists.txt
-@@ -2,6 +2,7 @@ IF(JPEG_FOUND)
- LIST(APPEND TESTS_FILES
- 	jpeg_empty_file
- 	jpeg_im2im
-+	jpeg_ptr_double_free
- 	jpeg_null
- )
- 
-diff --git a/tests/jpeg/Makemodule.am b/tests/jpeg/Makemodule.am
-index 7e5d317b..b89e1695 100644
---- a/tests/jpeg/Makemodule.am
-+++ b/tests/jpeg/Makemodule.am
-@@ -2,7 +2,8 @@ if HAVE_LIBJPEG
- libgd_test_programs += \
- 	jpeg/jpeg_empty_file \
- 	jpeg/jpeg_im2im \
--	jpeg/jpeg_null
-+	jpeg/jpeg_null \
-+	jpeg/jpeg_ptr_double_free
- 
- if HAVE_LIBPNG
- libgd_test_programs += \
-diff --git a/tests/jpeg/jpeg_ptr_double_free.c b/tests/jpeg/jpeg_ptr_double_free.c
-new file mode 100644
-index 00000000..df5a510b
---- /dev/null
-+++ b/tests/jpeg/jpeg_ptr_double_free.c
-@@ -0,0 +1,31 @@
-+/**
-+ * Test that failure to convert to JPEG returns NULL
-+ *
-+ * We are creating an image, set its width to zero, and pass this image to
-+ * `gdImageJpegPtr()` which is supposed to fail, and as such should return NULL.
-+ *
-+ * See also <https://github.com/libgd/libgd/issues/381>
-+ */
-+
-+
-+#include "gd.h"
-+#include "gdtest.h"
-+
-+
-+int main()
-+{
-+    gdImagePtr src, dst;
-+    int size;
-+
-+    src = gdImageCreateTrueColor(1, 10);
-+    gdTestAssert(src != NULL);
-+
-+    src->sx = 0; /* this hack forces gdImageJpegPtr() to fail */
-+
-+    dst = gdImageJpegPtr(src, &size, 0);
-+    gdTestAssert(dst == NULL);
-+
-+    gdImageDestroy(src);
-+
-+    return gdNumFailures();
-+}
diff --git a/media-libs/gd/files/gd-2.2.5-ossfuzz5700.patch b/media-libs/gd/files/gd-2.2.5-ossfuzz5700.patch
deleted file mode 100644
index 891c232115ec..000000000000
--- a/media-libs/gd/files/gd-2.2.5-ossfuzz5700.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 9fa3abd2e61da18ed2b889704e4e252f0f5a95fe Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 26 Jan 2018 01:57:52 -0500
-Subject: [PATCH] gif: fix out-of-bounds read w/corrupted lzw data
-
-oss-fuzz pointed out:
-gd_gif_in.c:605:16: runtime error: index 5595 out of bounds for type 'int [4096]'
-
-Add some bounds checking on each code that we read from the file.
----
- src/gd_gif_in.c           |   8 ++++++++
- tests/gif/CMakeLists.txt  |   3 ++-
- tests/gif/Makemodule.am   |   2 ++
- tests/gif/ossfuzz5700.c   |  13 +++++++++++++
- tests/gif/ossfuzz5700.gif | Bin 0 -> 30 bytes
- 6 files changed, 26 insertions(+), 1 deletion(-)
- create mode 100644 tests/gif/ossfuzz5700.c
-
-diff --git a/src/gd_gif_in.c b/src/gd_gif_in.c
-index afc08bf7..daf26e79 100644
---- a/src/gd_gif_in.c
-+++ b/src/gd_gif_in.c
-@@ -601,6 +601,10 @@ LWZReadByte_(gdIOCtx *fd, LZW_STATIC_DATA *sd, char flag, int input_code_size, i
- 				/* Bad compressed data stream */
- 				return -1;
- 			}
-+			if(code >= (1 << MAX_LWZ_BITS)) {
-+				/* Corrupted code */
-+				return -1;
-+			}
- 
- 			*sd->sp++ = sd->table[1][code];
- 
-@@ -610,6 +614,10 @@ LWZReadByte_(gdIOCtx *fd, LZW_STATIC_DATA *sd, char flag, int input_code_size, i
- 
- 			code = sd->table[0][code];
- 		}
-+		if(code >= (1 << MAX_LWZ_BITS)) {
-+			/* Corrupted code */
-+			return -1;
-+		}
- 
- 		*sd->sp++ = sd->firstcode = sd->table[1][code];
- 
-diff --git a/tests/gif/CMakeLists.txt b/tests/gif/CMakeLists.txt
-index 7d40cddc..2b73749e 100644
---- a/tests/gif/CMakeLists.txt
-+++ b/tests/gif/CMakeLists.txt
-@@ -3,6 +3,8 @@ LIST(APPEND TESTS_FILES
- 	bug00181
- 	bug00227
- 	gif_null
-+	ossfuzz5700
-+	uninitialized_memory_read
- )
- 
- IF(PNG_FOUND)
-@@ -12,7 +14,6 @@ LIST(APPEND TESTS_FILES
- 	bug00060
- 	bug00066
- 	gif_im2im
--	uninitialized_memory_read
- )
- ENDIF(PNG_FOUND)
- 
-diff --git a/tests/gif/Makemodule.am b/tests/gif/Makemodule.am
-index 0bdeab7e..3199438f 100644
---- a/tests/gif/Makemodule.am
-+++ b/tests/gif/Makemodule.am
-@@ -3,6 +3,7 @@ libgd_test_programs += \
- 	gif/bug00181 \
- 	gif/bug00227 \
- 	gif/gif_null \
-+	gif/ossfuzz5700 \
- 	gif/uninitialized_memory_read
- 
- if HAVE_LIBPNG
-@@ -24,4 +25,5 @@ EXTRA_DIST += \
- 	gif/bug00060.gif \
- 	gif/bug00066.gif \
- 	gif/bug00066_exp.png \
-+	gif/ossfuzz5700.gif \
- 	gif/unitialized_memory_read.gif
-diff --git a/tests/gif/ossfuzz5700.c b/tests/gif/ossfuzz5700.c
-new file mode 100644
-index 00000000..8fc9f88c
---- /dev/null
-+++ b/tests/gif/ossfuzz5700.c
-@@ -0,0 +1,13 @@
-+#include <stdio.h>
-+#include "gd.h"
-+#include "gdtest.h"
-+
-+int main()
-+{
-+	gdImagePtr im;
-+	FILE *fp = gdTestFileOpen("gif/ossfuzz5700.gif");
-+	im = gdImageCreateFromGif(fp);
-+	fclose(fp);
-+	gdImageDestroy(im);
-+	return 0;
-+}
-
diff --git a/media-libs/gd/gd-2.2.5-r2.ebuild b/media-libs/gd/gd-2.2.5-r2.ebuild
deleted file mode 100644
index b4896640b7bd..000000000000
--- a/media-libs/gd/gd-2.2.5-r2.ebuild
+++ /dev/null
@@ -1,98 +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 multilib-minimal
-
-DESCRIPTION="Graphics library for fast image creation"
-HOMEPAGE="https://libgd.org/ https://www.boutell.com/gd/"
-SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz
-	test? (
-		https://github.com/libgd/libgd/raw/e0cb1b76c305db68b251fe782faa12da5d357593/tests/gif/ossfuzz5700.gif -> lib${P}-ossfuzz5700.dat
-		https://github.com/libgd/libgd/raw/e0cb1b76c305db68b251fe782faa12da5d357593/tests/gif/php_bug_75571.gif -> lib${P}-php_bug_75571.dat
-	)"
-
-LICENSE="gd IJG HPND BSD"
-SLOT="2/3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cpu_flags_x86_sse fontconfig jpeg png static-libs test tiff truetype webp xpm zlib"
-RESTRICT="!test? ( test )"
-
-# fontconfig has prefixed font paths, details see bug #518970
-REQUIRED_USE="prefix? ( fontconfig )"
-
-RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
-	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
-	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
-	xpm? ( >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/lib${P}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-ossfuzz5700.patch"
-	"${FILESDIR}/${P}-CVE-2018-5711.patch"
-	"${FILESDIR}/${P}-CVE-2018-1000222.patch"
-	"${FILESDIR}/${P}-CVE-2019-6977.patch"
-	"${FILESDIR}/${P}-CVE-2019-6978.patch"
-)
-
-src_unpack() {
-	default
-
-	if use test ; then
-		cp "${DISTDIR}"/lib${P}-ossfuzz5700.dat \
-			"${S}"/tests/gif/ossfuzz5700.gif || die
-		cp "${DISTDIR}"/lib${P}-php_bug_75571.dat \
-			"${S}"/tests/gif/php_bug_75571.gif || die
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# bug 603360, https://github.com/libgd/libgd/blob/fd06f7f83c5e78bf5b7f5397746b4e5ee4366250/docs/README.TESTING#L65
-	if use cpu_flags_x86_sse ; then
-		append-cflags -msse -mfpmath=sse
-	else
-		append-cflags -ffloat-store
-	fi
-
-	# bug 632076, https://github.com/libgd/libgd/issues/278
-	if use arm64 || use ppc64 || use s390 ; then
-		append-cflags -ffp-contract=off
-	fi
-
-	# we aren't actually {en,dis}abling X here ... the configure
-	# script uses it just to add explicit -I/-L paths which we
-	# don't care about on Gentoo systems.
-	local myeconfargs=(
-		--disable-werror
-		--without-x
-		--without-liq
-		$(use_enable static-libs static)
-		$(use_with fontconfig)
-		$(use_with png)
-		$(use_with tiff)
-		$(use_with truetype freetype)
-		$(use_with jpeg)
-		$(use_with webp)
-		$(use_with xpm)
-		$(use_with zlib)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	dodoc README.md
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index b179be201775..a6e0dc4de44f 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -9,6 +9,8 @@ AUX gegl-0.2.0-introspection-version.patch 1233 BLAKE2B 1565b0600b5d5c55e0e39096
 AUX gegl-0.2.0-libopenraw-0.1.patch 1733 BLAKE2B 16aacee7c0a702b0965c0f342822710b8b791fc950e10040de92a4eef06b4d5010b1f8fb8c0d1b23d5bc43e92487e37d278dd750baf06a641d91bbd5205b676f SHA512 8eaa767c7d30e77ebffacb9ebb01789f05c82385ed7671767f0e04dba98a95ee22a4a8f0ca8f19365e0b26e74641dbe00939ff8baa40e84a8a26770c325ad980
 AUX gegl-0.2.0-underlinking.patch 2038 BLAKE2B 80dc1aeeb73d08ae7184f5eb57f97a16ec4d5b237bf7fb4232fef16c443f913d16b179a297e0bea8b8b459cd740720843d06d537e9cc703c66ae3b54b6c70255 SHA512 c952d015ac74eefea96c6b6c4190fc5c230654cb6efee20ea06f9b43e4f3dac8953ce94f604602489556e4ab59b44f85daff95e3e7c98c640b2b532d1de3dfc5
 AUX gegl-0.3.12-failing-tests.patch 888 BLAKE2B 548933991347ac397b98ac044d5524d0ae8e5307d52e8b48eb0168d30eda8b73350cec57bc5233abde708184c152ee94ec5c2b3213161ffff93b2a6494a2d36f SHA512 a7b8f58ff9057e086412ec5b12694ffc4e30e2a7b3a8bfa72ef34bc230d0d91c80aa45de94f8e48496844c96e257cee6d3791db0e520abc7cbcc2691d1a5ce84
+AUX gegl-0.3.34-failing-tests.patch 1076 BLAKE2B 39ebadca2d03708d6449849bf8a1c23d05c591493c229b55093d5308c277cb12b428e69b6410ce428cb5c9dbace91c5f3d4822ec3b32c0afc33aee95a58bdbf6 SHA512 084d42d50ba9d750d0a3d729f53da4fad177674862eacde17f2e4ea1bbc62d91fa62164fd7bb5dc1d3cda2fbf08a9db048f577927f203cc912ecf365eb4cc688
+AUX gegl-0.3.34-fno-common.patch 184 BLAKE2B a1994ad4171f60a52695ea36814d0051addb358413a49725d089667aa842f45da7e3e3027c8e29fdb7a5ce378186ae10eab685b538c2685c1f2d40c3bf5a9ac9 SHA512 4c1f787fabbfac1d13dd5f997fc799e3238f7b17cf8b51a63253ad7d5dac7f99c92990aa31aef14740e0e66d100ec0b532a0aef899f49f6142d785529d2b808f
 AUX gegl-0.4.0-ffmpeg-4-0-compat-1.patch 2181 BLAKE2B 8bf1c46395ee4981fad7c5518c9091043374b54c9c4a684e6decc376e8b57e2a60b7ff5c5b21e07f24d7835f92f62a7aebf976122391d206450cc1d5a52bcb30 SHA512 1edf86549a0a91b7e66ad1b59373b141c20e7f63fff981aaa5a0ba535b38e89b593c60a4a4573cf6fa723181cb38a10c6ac4a0838fc947bb54713a3bde299e4f
 AUX gegl-0.4.0-ffmpeg-4-0-compat-2.patch 786 BLAKE2B c2ee0da954aa16c755f76058c54ca9d19ceb70667aff40e126d52bb10b7ecaa6e346667fa9cf7f96605b87a1d41e511d4787a33b004409708d8e3496de391745 SHA512 1084d1cd802eebdeacc536115d4808ce310a85063110bfc06627c8836b86e65396d175a4c3bc6b2083a9a486b7fb21d0210e42fcc8ef3c404b6b930797ecc83a
 AUX gegl-0.4.18-cltostring_force_utf8.patch 910 BLAKE2B 9d5ca10ba4f7ba3b79726daef87fac72617cc627f2d4324409212f41255e524be2000aac415e361105afe2e0b488811e835f1e584c11dfda64eedfafd63a7bb9 SHA512 62d4ecf5f010648d479de674264ce428a8d71c542beeb92401c329c34f83a0bac22c4d805bceb7ca76c498f63276bdaa589588d96d735402346c55c2dd58a547
@@ -21,9 +23,13 @@ DIST gegl-0.4.16.tar.bz2 7304904 BLAKE2B a3f6021ed7b9d8b784b909057fcdc39e73b6b8b
 DIST gegl-0.4.18.tar.xz 4812756 BLAKE2B b8e5902b62c3549f57dd0ce52a0a406974bf8664d5b85389b79f7d698bcf2643d19861add3d8a9bd5c99036aba4da97b70884dcaacf2cb89170b995f1d1497a0 SHA512 e79874cd50e9f0c27c7dc9d9b952545c31d0a48e2b158aa54b92c3e933267877222f86ede7256f2528f18985dc85d6eadbcd809f7a3563efc4449ec7634f15fd
 DIST gegl-0.4.22.tar.xz 4826748 BLAKE2B 3b6ddca1dff17d0336614fb02cdf94c7497586f075fa548fef66f9f81f62a8055c58e008b9eed989dd283fa701a07d4e22ee81b85c35a0a55f4a92e51cf6b780 SHA512 3118fb17532bcd5893a77739eaf936f5d1e2020178abc497098d227c25f726679621503ac83e7d14a9883d259247d97b92016174e76a2e6e950be7e26ce251ab
 EBUILD gegl-0.2.0-r6.ebuild 4873 BLAKE2B 5bc1189a195da303ebbb13e7e211743cdd711561c399513139dbc098287e9333698fc106cfe2ed1959874e0a740f4a8b25f23134d5962aa6f3aa55bd87276239 SHA512 4c677caf2159ae4300244a84f05e28836c32327ad85abbb812435987756cd704f95557bb779f0a7510edf8263f3422004791ada25b6b9cf5ccc61d77d2e774a8
+EBUILD gegl-0.3.34-r1.ebuild 5237 BLAKE2B 126d2ae08ac5620cfdf77fc9f0dbfe5aac17936863c22cdf4114cf8702ea04dd23f0b47305ec35808819c91b77ba35cdba07f0e2892018b651e7492cbfa1d30f SHA512 ac2acdd2fa6dbe3f41855d0419b868905067e0932876a7554272de0578cf033bece1719127deaa180c1ac269328810c24f9325698091f2a64bd7854d3deeacbc
 EBUILD gegl-0.3.34.ebuild 5295 BLAKE2B a6fc62fd62139fa40fadb7e14ff1160c408e21a5b9e383fa79ddf4232452856c7235e2b74cc5a330ed38f4910b9223225ffaf8efc59f54fdc73c38036a66ac06 SHA512 58fc9363a644ce358c29217783c1beb0b2291605af9f507adcc34f8cff15a582087e03817398dc9c4d442e624a98035c46a27b9d7a440c97f6125286bb36128b
+EBUILD gegl-0.4.16-r1.ebuild 4832 BLAKE2B 5250f514403c6da6e62cd9dfd56b623af7affc9075f088ff687e205c269e62fcd72ab114d511f95c4cf7202b2fdb5a4de79165f7fd838a6dbeb8a6b2bf8d58cd SHA512 bbefeb2c55be67533b8428afb52a7dfc350fc653d45b6b69e30b4280439899bd0df3d725795afcba312ce1c4f3ecafd8491b625fccaa3f4c767f274d88fb6793
 EBUILD gegl-0.4.16.ebuild 4785 BLAKE2B a5a4eee532e7454cd5c154d2067a339a268d6cb5f2bcf58b602f853ba50f7e64beeeb8dfcb9145b888806e651778dd20c4419bd8885176dde8cbbd000978c38f SHA512 c351367b7445dc6bb360bea700638e1a23026abe8fd4707612325b2ac7096155b10941d8947976eefb76367f0b6b1695c209fb9f188736a4ec4eb3dfd63ae54a
+EBUILD gegl-0.4.18-r1.ebuild 4822 BLAKE2B e2d3604bdb9424d8a46b6b696dea3078df5a8c71b35e35beb18f2713f6e4ed2c9d5fd6f148cd7bd6efe4e3c1ac8e8b26217d0556eb173c0bfa548d4752c6dce1 SHA512 e699700774e5728354a708de6f704dfd67694cf37765c002b629b5f34875cf02aeffc568aa949e8e23330dfbf29a15343f84fc7f3bdd636352e478e4b5586613
 EBUILD gegl-0.4.18.ebuild 4815 BLAKE2B 071fdd84d129cbe18bb3c01a613d8286aaf5d464ce46e04b39b13368bd9eceba2400ece71a6b2becaece62e7933ea3737f1db58abde220ac6b3addf2d79e3057 SHA512 fe41c1f229eb5c34b0413bce192bd5ca03f2f94fad1a99928fad2e603b5bcbe0e9996b966a05a2f200b2eb2a1f2a29246086993276b8a1d29af471847e06eb51
+EBUILD gegl-0.4.22-r1.ebuild 4781 BLAKE2B fed7f87e693fa3d662b52c1729ce3eec8a606c78a6b8ade14e6d28f9456681854a28b31ebbc6c97c9601e77419489254b0b303861a86c150d0b7e2bd57575aa1 SHA512 04b9d4a338dbd4b3f45c2fd01fd9d0dc07d0f9d26d301992cb02154d327949a58ec8c52a73552a3cc49f023a91ef3e86a308f510531f35be827b1c395e081537
 EBUILD gegl-0.4.22.ebuild 4774 BLAKE2B 7d220b64f490ab65dbe3a87cafb7d1b55dae285b4d03179939479431eca4b44fd11edcc4eb3d31c1aee979cc6d3122b71c60b5ec9d980a8c2b8911f5497ede7b SHA512 5d321f47fd284e67f748115dbc87591fd4fe18463df747d43b54e8aac07fe763a9ece2e0eea1bc31481806c58bc58dbf84ec8c1b8c44ff39d0eb08b9fcf2df5b
-EBUILD gegl-9999.ebuild 4403 BLAKE2B dee34aa59338d92ca82042cb2ac1e2bb1d0f0297387c3aeb553f6d4ff6f64b9bca320c4d48f45e4126b484801337b9391caf18fa77ab090fd28145d5360ec265 SHA512 04bfd2589e01b4ada8e57a0878e3f3a2ef8f0b6c4716b3232f8cf07aa592e70a0049d1518e40c344fcc52466d58270f73530c3079a1151b027156688cacaf838
+EBUILD gegl-9999.ebuild 4395 BLAKE2B 18c36f50c02010c6fee96c1d90a6154b20f1338f66b824100e358210cee92385972d7b70b2fbafaf5a2a178c7184455017a5da607738cb7368024b9eb99999f3 SHA512 f221199f6db08de50b3f19fa6006528bed6754db0dd5afdf49da49a0031f467d09f76ae7314364df894ac26c0ccb2f1d1bd939c5df50409c61f99f6251962b46
 MISC metadata.xml 550 BLAKE2B 8afb3a5aa69ba6b3139f3183ed013cd0797edad0865b0aebcd2824a31549f4968e938017adb85506fea2e60c18ea1278fd3bce0ce1cf9be0efb74b1f0b020470 SHA512 8c5637454afcab249f671518153067a99cac9d60d8e9108688b4328a19ea653de21948a63c7e680585d208c0b3230fd2fb87c2d8a0a7266d31bc328342a47016
diff --git a/media-libs/gegl/files/gegl-0.3.34-failing-tests.patch b/media-libs/gegl/files/gegl-0.3.34-failing-tests.patch
new file mode 100644
index 000000000000..c388ac556e9b
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.3.34-failing-tests.patch
@@ -0,0 +1,27 @@
+diff -Naur a/tests/ff-load-save/Makefile.am b/tests/ff-load-save/Makefile.am
+--- a/tests/ff-load-save/Makefile.am	2017-09-21 22:11:00.000000000 +0300
++++ b/tests/ff-load-save/Makefile.am	2020-03-07 16:33:21.000000000 +0300
+@@ -6,13 +6,7 @@
+ 
+ EXTRA_DIST = $(TESTS)
+ 
+-check: vids images
+-
+-images: 
+-	for a in *.avi *.mp4 *.ogv ;do \
+-            GEGL_PATH=$(top_builddir)/operations $(top_builddir)/examples/gegl-video \
+-            $$a -s 74 -e 74 -of $$a- ;\
+-        done
++check: vids
+ 
+ vids: $(TESTS) $(top_builddir)/examples/frame-counter
+ 	GEGL_PATH=$(top_builddir)/operations $(top_builddir)/examples/frame-counter \
+@@ -27,8 +21,6 @@
+            --video-codec mpeg4 --fps 12 --video-bit-rate 128 128kb-12fps.mp4
+ 	GEGL_PATH=$(top_builddir)/operations $(top_builddir)/examples/frame-counter \
+            --video-codec mpeg4 --fps 100 --video-bit-rate 128 128kb-100fps.mp4
+-	GEGL_PATH=$(top_builddir)/operations $(top_builddir)/examples/frame-counter \
+-           --fps 28 --video-bit-rate 512 512kb-28fps.ogv
+ 
+ clean-local:
+ 	rm -f *.png *.avi *.ogv *.mp4 *.webm
diff --git a/media-libs/gegl/files/gegl-0.3.34-fno-common.patch b/media-libs/gegl/files/gegl-0.3.34-fno-common.patch
new file mode 100644
index 000000000000..8c1c045758b4
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.3.34-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/gcut/gcut.h
++++ b/gcut/gcut.h
+@@ -172,7 +172,7 @@
+   GMutex             mutex;
+ };
+ 
+-struct _GeglEDL
++extern struct _GeglEDL
+ {
+   GFileMonitor *monitor;
+   char         *path;
diff --git a/media-libs/gegl/gegl-0.3.34-r1.ebuild b/media-libs/gegl/gegl-0.3.34-r1.ebuild
new file mode 100644
index 000000000000..8abaed16a8d8
--- /dev/null
+++ b/media-libs/gegl/gegl-0.3.34-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+# vala and introspection support is broken, bug #468208
+VALA_USE_DEPEND=vapigen
+
+inherit gnome2-utils eutils autotools python-any-r1 vala
+
+SRC_URI="http://download.gimp.org/pub/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+DESCRIPTION="A graph based image processing framework"
+HOMEPAGE="http://www.gegl.org/"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0.3"
+
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	svg? ( cairo )
+	test? ( introspection )
+	vala? ( introspection )
+"
+
+RESTRICT="!test? ( test )"
+
+# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
+#       so there is no chance to support libav right now (Gentoo bug #567638)
+#       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	dev-libs/json-glib
+	>=media-libs/babl-0.1.66[introspection(-)?,lcms(-)?]
+	sys-libs/zlib
+	>=x11-libs/gdk-pixbuf-2.32:2
+	x11-libs/pango
+
+	cairo? ( >=x11-libs/cairo-1.12.2 )
+	ffmpeg? ( >=media-video/ffmpeg-2.8:0= )
+	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+	virtual/jpeg:0=
+	lcms? ( >=media-libs/lcms-2.8:2 )
+	lensfun? ( >=media-libs/lensfun-0.2.5 )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
+	>=media-libs/libpng-1.6.0:0=
+	raw? ( >=media-libs/libraw-0.15.4:0= )
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	svg? ( >=gnome-base/librsvg-2.40.6:2 )
+	tiff? ( >=media-libs/tiff-4:0 )
+	umfpack? ( sci-libs/umfpack )
+	v4l? ( >=media-libs/libv4l-1.0.1 )
+	webp? ( >=media-libs/libwebp-0.5.0:= )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-lang/perl
+	>=dev-util/gtk-doc-am-1
+	>=sys-devel/gettext-0.19.8
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+	test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
+	vala? ( $(vala_depend) )
+"
+
+pkg_setup() {
+	use test && use introspection && python-any-r1_pkg_setup
+}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
+	"${FILESDIR}"/${PN}-0.3.34-failing-tests.patch       # bug 631930, 686202
+	"${FILESDIR}"/${PN}-0.3.34-fno-common.patch          # bug 719198
+	"${FILESDIR}"/${PN}-0.4.0-ffmpeg-4-0-compat-1.patch  # bug 654172
+	"${FILESDIR}"/${PN}-0.4.0-ffmpeg-4-0-compat-2.patch  # bug 654172
+)
+
+src_prepare() {
+	default
+
+	# FIXME: the following should be proper patch sent to upstream
+	# fix OSX loadable module filename extension
+	sed -i -e 's/\.dylib/.bundle/' configure.ac || die
+	# don't require Apple's OpenCL on versions of OSX that don't have it
+	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
+		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
+	fi
+
+	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
+	sed -e '/clones.xml/d' \
+		-e '/composite-transform.xml/d' \
+		-i tests/compositions/Makefile.am || die
+
+	eautoreconf
+
+	gnome2_environment_reset
+
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	# never enable altering of CFLAGS via profile option
+	# libspiro: not in portage main tree
+	# disable documentation as the generating is bit automagic
+	#    if anyone wants to work on it just create bug with patch
+
+	# Also please note that:
+	#
+	#  - Some auto-detections are not patched away since the docs are
+	#    not built (--disable-docs, lack of --enable-gtk-doc) and these
+	#    tools affect re-generation of docs, only
+	#    (e.g. ruby, asciidoc, dot (of graphviz), enscript)
+	#
+	#  - Parameter --with-exiv2 compiles a noinst-app only, no use
+	#
+	#  - Parameter --disable-workshop disables any use of Lua, effectivly
+	#
+	#  - v4l support does not work with our media-libs/libv4l-0.8.9,
+	#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+	#
+	#  - There are two checks for dot, one controllable by --with(out)-graphviz
+	#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
+	#
+	#  - mrg is not in tree and gexiv2 support only has effect when mrg support
+	#    is enabled
+	#
+	# So that's why USE="exif graphviz lua v4l" got resolved.  More at:
+	# https://bugs.gentoo.org/show_bug.cgi?id=451136
+	#
+	econf \
+		--disable-docs \
+		--disable-profile \
+		--disable-workshop \
+		--program-suffix=-${SLOT} \
+		--with-gdk-pixbuf \
+		--with-pango \
+		--without-exiv2 \
+		--without-gexiv2 \
+		--without-graphviz \
+		--without-jasper \
+		--without-libspiro \
+		--without-lua \
+		--without-mrg \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable debug) \
+		$(use_with cairo) \
+		$(use_with cairo pangocairo) \
+		$(use_with ffmpeg libavformat) \
+		$(use_with lcms) \
+		$(use_with lensfun) \
+		$(use_with openexr) \
+		$(use_with raw libraw) \
+		$(use_with sdl) \
+		$(use_with svg librsvg) \
+		$(use_with tiff libtiff) \
+		$(use_with umfpack) \
+		$(use_with v4l libv4l) \
+		$(use_with v4l libv4l2) \
+		$(use_enable introspection) \
+		$(use_with vala) \
+		$(use_with webp)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gegl/gegl-0.4.16-r1.ebuild b/media-libs/gegl/gegl-0.4.16-r1.ebuild
new file mode 100644
index 000000000000..fe4898d8fc2a
--- /dev/null
+++ b/media-libs/gegl/gegl-0.4.16-r1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+# vala and introspection support is broken, bug #468208
+VALA_USE_DEPEND=vapigen
+
+inherit autotools gnome2-utils python-any-r1 vala
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
+	SRC_URI=""
+else
+	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A graph based image processing framework"
+HOMEPAGE="http://www.gegl.org/"
+
+LICENSE="|| ( GPL-3+ LGPL-3 )"
+SLOT="0.4"
+
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib"
+REQUIRED_USE="
+	svg? ( cairo )
+	test? ( introspection )
+	vala? ( introspection )
+"
+
+RESTRICT="!test? ( test )"
+
+# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
+#       so there is no chance to support libav right now (Gentoo bug #567638)
+#       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	dev-libs/json-glib
+	>=media-libs/babl-0.1.66[introspection(-)?,lcms(-)?]
+	>=media-libs/libpng-1.6.0:0=
+	virtual/jpeg:0=
+	>=x11-libs/gdk-pixbuf-2.32:2
+	x11-libs/pango
+	cairo? ( >=x11-libs/cairo-1.12.2 )
+	ffmpeg? ( 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-2.2.0:= )
+	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:= )
+	zlib? ( >=sys-libs/zlib-1.2.0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	>=dev-util/gtk-doc-am-1
+	>=sys-devel/gettext-0.19.8
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+	test? ( ffmpeg? ( media-libs/gexiv2 )
+		$(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]')
+	)
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.3.12-failing-tests.patch"
+)
+
+pkg_setup() {
+	use test && use introspection && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# FIXME: the following should be proper patch sent to upstream
+	# fix OSX loadable module filename extension
+	sed -i -e 's/\.dylib/.bundle/' configure.ac || die
+	# don't require Apple's OpenCL on versions of OSX that don't have it
+	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
+		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
+	fi
+
+	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
+	sed -e '/clones.xml/d' \
+		-e '/composite-transform.xml/d' \
+		-i tests/compositions/Makefile.am || die
+
+	eautoreconf
+
+	gnome2_environment_reset
+
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		# disable documentation as the generating is bit automagic
+		#    if anyone wants to work on it just create bug with patch
+		--disable-docs
+		# never enable altering of CFLAGS via profile option
+		--disable-profile
+		#  - Parameter --disable-workshop disables any use of Lua, effectivly
+		--disable-workshop
+		--program-suffix=-${SLOT}
+		--with-gdk-pixbuf
+		--with-pango
+		#  - There are two checks for dot, one controllable by --with(out)-graphviz
+		#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
+		--without-graphviz
+		# libspiro: not in portage main tree
+		--without-libspiro
+		--without-lua
+		--without-mrg
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable debug)
+		$(use_enable introspection)
+		$(use_with cairo)
+		$(use_with cairo pangocairo)
+		$(use_with ffmpeg libavformat)
+		--without-jasper
+		$(use_with lcms)
+		$(use_with lensfun)
+		$(use_with openexr)
+		$(use_with pdf popplerglib)
+		$(use_with raw libraw)
+		$(use_with sdl)
+		$(use_with svg librsvg)
+		$(use_with tiff libtiff)
+		$(use_with umfpack)
+		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
+		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+		$(use_with v4l libv4l)
+		$(use_with v4l libv4l2)
+		$(use_with vala)
+		$(use_with webp)
+		$(use_with zlib)
+	)
+
+	if use test; then
+		myeconfargs+=( $(use_with ffmpeg gexiv2) )
+	else
+		myeconfargs+=( --without-gexiv2 )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	[[ ${PV} == *9999* ]] && emake ./ChangeLog  # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped."
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gegl/gegl-0.4.18-r1.ebuild b/media-libs/gegl/gegl-0.4.18-r1.ebuild
new file mode 100644
index 000000000000..cad3f9ebf9b5
--- /dev/null
+++ b/media-libs/gegl/gegl-0.4.18-r1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+# vala and introspection support is broken, bug #468208
+VALA_USE_DEPEND=vapigen
+
+inherit meson gnome2-utils python-any-r1 vala
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
+	SRC_URI=""
+else
+	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A graph based image processing framework"
+HOMEPAGE="http://www.gegl.org/"
+
+LICENSE="|| ( GPL-3+ LGPL-3 )"
+SLOT="0.4"
+
+IUSE="cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
+REQUIRED_USE="
+	svg? ( cairo )
+	test? ( introspection )
+	vala? ( introspection )
+"
+
+RESTRICT="!test? ( test )"
+
+# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
+#       so there is no chance to support libav right now (Gentoo bug #567638)
+#       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/json-glib-1.2.6
+	>=media-libs/babl-0.1.72[introspection?,lcms?]
+	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? ( 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:= )
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-lang/perl
+	>=dev-util/gtk-doc-am-1
+	>=sys-devel/gettext-0.19.8
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+	test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
+	vala? ( $(vala_depend) )
+"
+
+DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-drop-failing-tests.patch
+	"${FILESDIR}"/${P}-program-suffix.patch
+	"${FILESDIR}"/${P}-meson_cpu_detection.patch
+	"${FILESDIR}"/${P}-cltostring_force_utf8.patch
+)
+
+python_check_deps() {
+	has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# don't require Apple's OpenCL on versions of OSX that don't have it
+	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
+		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
+	fi
+
+	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
+	sed -e '/clones.xml/d' \
+		-e '/composite-transform.xml/d' \
+		-i tests/compositions/meson.build || die
+
+	# fix skipping mipmap tests due to executable not found
+	for item in "invert-crop.sh" "invert.sh" "rotate-crop.sh" "rotate.sh" "unsharp-crop.sh" "unsharp.sh"; do
+		sed -i "s:/bin/gegl:/bin/gegl-0.4:g" "${S}/tests/mipmap/${item}" || die
+		sed -i "s:/tools/gegl-imgcmp:/tools/gegl-imgcmp-0.4:g" "${S}/tests/mipmap/${item}" || die
+	done
+
+	gnome2_environment_reset
+
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		#  - Disable documentation as the generating is bit automagic
+		#    if anyone wants to work on it just create bug with patch
+		-Ddocs=false
+		-Dexiv2=disabled
+		-Dgdk-pixbuf=enabled
+		-Dgexiv2=disabled
+		#  - There are two checks for dot, one controllable by --with(out)-graphviz
+		#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
+		-Dgraphviz=disabled
+		-Djasper=disabled
+		-Dlibjpeg=enabled
+		-Dlibpng=enabled
+		#  - libspiro: not in portage main tree
+		-Dlibspiro=disabled
+		-Dlua=disabled
+		-Dmrg=disabled
+		-Dpango=enabled
+		-Dsdl2=disabled
+		#  - Parameter -Dworkshop=false disables any use of Lua, effectivly
+		-Dworkshop=false
+		$(meson_feature cairo)
+		$(meson_feature cairo pangocairo)
+		$(meson_feature ffmpeg libav)
+		$(meson_feature lcms)
+		$(meson_feature lensfun)
+		$(meson_feature openexr)
+		$(meson_feature raw libraw)
+		$(meson_feature sdl sdl1)
+		$(meson_feature svg librsvg)
+		$(meson_feature test pygobject)
+		$(meson_feature tiff libtiff)
+		$(meson_feature umfpack)
+		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
+		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+		$(meson_feature v4l libv4l)
+		$(meson_feature v4l libv4l2)
+		$(meson_feature vala vapigen)
+		$(meson_feature webp)
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
diff --git a/media-libs/gegl/gegl-0.4.22-r1.ebuild b/media-libs/gegl/gegl-0.4.22-r1.ebuild
new file mode 100644
index 000000000000..f7d5f9dbbd43
--- /dev/null
+++ b/media-libs/gegl/gegl-0.4.22-r1.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+# vala and introspection support is broken, bug #468208
+VALA_USE_DEPEND=vapigen
+
+inherit meson gnome2-utils python-any-r1 vala
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
+	SRC_URI=""
+else
+	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A graph based image processing framework"
+HOMEPAGE="http://www.gegl.org/"
+
+LICENSE="|| ( GPL-3+ LGPL-3 )"
+SLOT="0.4"
+
+IUSE="cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
+REQUIRED_USE="
+	svg? ( cairo )
+	test? ( introspection )
+	vala? ( introspection )
+"
+
+RESTRICT="!test? ( test )"
+
+# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
+#       so there is no chance to support libav right now (Gentoo bug #567638)
+#       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/json-glib-1.2.6
+	>=media-libs/babl-0.1.74[introspection?,lcms?]
+	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? ( 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:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	>=dev-util/gtk-doc-am-1
+	>=sys-devel/gettext-0.19.8
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+	test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
+	vala? ( $(vala_depend) )
+"
+
+DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch
+	"${FILESDIR}"/${PN}-0.4.18-program-suffix.patch
+)
+
+python_check_deps() {
+	has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# don't require Apple's OpenCL on versions of OSX that don't have it
+	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
+		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
+	fi
+
+	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
+	sed -e '/clones.xml/d' \
+		-e '/composite-transform.xml/d' \
+		-i tests/compositions/meson.build || die
+
+	# fix skipping mipmap tests due to executable not found
+	for item in "invert-crop.sh" "invert.sh" "rotate-crop.sh" "rotate.sh" "unsharp-crop.sh" "unsharp.sh"; do
+		sed -i "s:/bin/gegl:/bin/gegl-0.4:g" "${S}/tests/mipmap/${item}" || die
+		sed -i "s:/tools/gegl-imgcmp:/tools/gegl-imgcmp-0.4:g" "${S}/tests/mipmap/${item}" || die
+	done
+
+	gnome2_environment_reset
+
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		#  - Disable documentation as the generating is bit automagic
+		#    if anyone wants to work on it just create bug with patch
+		-Ddocs=false
+		-Dexiv2=disabled
+		-Dgdk-pixbuf=enabled
+		-Dgexiv2=disabled
+		#  - There are two checks for dot, one controllable by --with(out)-graphviz
+		#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
+		-Dgraphviz=disabled
+		-Djasper=disabled
+		-Dlibjpeg=enabled
+		-Dlibpng=enabled
+		#  - libspiro: not in portage main tree
+		-Dlibspiro=disabled
+		-Dlua=disabled
+		-Dmrg=disabled
+		-Dpango=enabled
+		-Dsdl2=disabled
+		#  - Parameter -Dworkshop=false disables any use of Lua, effectivly
+		-Dworkshop=false
+		$(meson_feature cairo)
+		$(meson_feature cairo pangocairo)
+		$(meson_feature ffmpeg libav)
+		$(meson_feature lcms)
+		$(meson_feature lensfun)
+		$(meson_feature openexr)
+		$(meson_feature pdf poppler)
+		$(meson_feature raw libraw)
+		$(meson_feature sdl sdl1)
+		$(meson_feature svg librsvg)
+		$(meson_feature test pygobject)
+		$(meson_feature tiff libtiff)
+		$(meson_feature umfpack)
+		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
+		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+		$(meson_feature v4l libv4l)
+		$(meson_feature v4l libv4l2)
+		$(meson_feature vala vapigen)
+		$(meson_feature webp)
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index e48fb86ed8f7..c854f48fae02 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
-# vala and introspection support is broken, bug #468208
 VALA_USE_DEPEND=vapigen
 
 inherit meson gnome2-utils python-any-r1 vala
@@ -15,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
@@ -39,7 +38,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-libs/glib-2.44:2
 	>=dev-libs/json-glib-1.2.6
-	>=media-libs/babl-0.1.74[introspection?]
+	>=media-libs/babl-0.1.78[introspection?,lcms?,vala?]
 	media-libs/libnsgif
 	>=media-libs/libpng-1.6.0:0=
 	>=sys-libs/zlib-1.2.0
@@ -61,9 +60,7 @@ RDEPEND="
 	v4l? ( >=media-libs/libv4l-1.0.1 )
 	webp? ( >=media-libs/libwebp-0.5.0:= )
 "
-
 DEPEND="${RDEPEND}"
-
 BDEPEND="
 	dev-lang/perl
 	>=dev-util/gtk-doc-am-1
@@ -135,6 +132,7 @@ src_configure() {
 		$(meson_feature lcms)
 		$(meson_feature lensfun)
 		$(meson_feature openexr)
+		$(meson_feature pdf poppler)
 		$(meson_feature raw libraw)
 		$(meson_feature sdl sdl1)
 		$(meson_feature svg librsvg)
diff --git a/media-libs/giblib/Manifest b/media-libs/giblib/Manifest
index 4ee62614c205..8eee069c82cf 100644
--- a/media-libs/giblib/Manifest
+++ b/media-libs/giblib/Manifest
@@ -1,4 +1,4 @@
 AUX giblib-1.2.4-fix-build-system.patch 792 BLAKE2B 4e59d03acceb1ff6ea013660e2c6ce1435c47bfcd040800de7deda37346ec7b5687d4b7809222b2331c6b9f52e54c53524d30ca03fe4096b0134fcd5e1a11a7d SHA512 8dc2de904f9c0082b5be16d21d366e84f6912cf891e80b8c32681e4f589c911775fb5227f0ef3d4790920512b279b02b451f3afcbbada329d004c2eac494fe8f
 DIST giblib-1.2.4.tar.gz 287653 BLAKE2B 0b936fe3b56b933a5038751428ec56a872911d3c4ae972e9670cb1ce2496de6a8e21cb4718e7bab4eb1d547eb67ca71b25d77405ff04ebcb1ca0dc03fafea7ef SHA512 4866df223e6d219a5c9a327874bcd67260c83fba8f99862222df41ef86fb31efa0172a777bf46c853ca380dc2a64bbd41bf4fd658fcb84a924cab4e0f525dcfd
-EBUILD giblib-1.2.4-r1.ebuild 801 BLAKE2B b3c2275d63f13af5801fd51ee17c5b3ac5cca3c66e6b60d66047b2ab83973a0a5ecbcca9f7806568d2177771552d362012f8bbc191c6996aa694985f5edc490d SHA512 e22f9ca54c2b2370ce102ef135709ac869b39a2c85760a103f40e89d882dbc09e143835bcae503d15c257e44b08466ad7c82d608de49e0c41ca3bb6b3302e87c
+EBUILD giblib-1.2.4-r1.ebuild 814 BLAKE2B 85bb526cd28261d8c373141c3bc6b99f23d472c793a27a29794b8155cc5a8f2aee1a1967aac83cffb44036aab85da54c7224af7f5b3e9e86b521e5897d0470c4 SHA512 164bec70f857da07dd4911ab9eabbac2eda4e7fb1a268aa64966ead0f53c6eb172a39b0264cd3810ffeded0fb9104d05466597234d3a6afb7fc43b90e412560f
 MISC metadata.xml 658 BLAKE2B 95c037a832ab160962f89e9adb80b15500dba4e64283b0af8e1acb01deab70f34433e37b023a8d572b157be05c52c9c01c561e0ead3a0da3b5fa2ddcb4fac4c7 SHA512 f8302255d4ab8044f831945642b25865ee4c74bd8d77bbf1810f1641b4b1d164a9f0e0e7f983704a044ad44cececa8142c0a1a845e50a01b9d413ec6436e3793
diff --git a/media-libs/giblib/giblib-1.2.4-r1.ebuild b/media-libs/giblib/giblib-1.2.4-r1.ebuild
index 330368ff6628..f3a87af2e5a1 100644
--- a/media-libs/giblib/giblib-1.2.4-r1.ebuild
+++ b/media-libs/giblib/giblib-1.2.4-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools
 
 DESCRIPTION="a graphics library built on top of imlib2"
-HOMEPAGE="http://freecode.com/projects/giblib http://www.linuxbrit.co.uk/giblib/"
+HOMEPAGE="http://freshmeat.sourceforge.net/projects/giblib http://www.linuxbrit.co.uk/giblib/"
 SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
 
 LICENSE="feh"
diff --git a/media-libs/graphene/Manifest b/media-libs/graphene/Manifest
index 4e5e8dfad815..7392db1ee8e9 100644
--- a/media-libs/graphene/Manifest
+++ b/media-libs/graphene/Manifest
@@ -1,5 +1,7 @@
 DIST graphene-1.10.0.tar.xz 289452 BLAKE2B 41af96ffcdb2d8ad2fce7a242cef74cead09ce444514f85a97ac609c6518c60cbd5fb44b58b24973fe9a372f898ca99b79cfd776c968d53b72fc20c5d076a230 SHA512 842ac2c9c2046f07f8421b99292cac348276bb1e025250c7e0dc3ec7f90cb33094b765034862f325dd78f93aa5484ad75a4ad6139fe13330d9e41e3a7cb830d0
+DIST graphene-1.10.2.tar.xz 292372 BLAKE2B 94553a32dc57216402a9676e11525552c010d970caeb1256dde50ca842b4d673ad78d004d57e7c7a017b8c6e64ad75fc3b03603cba746027ab10befa76d32955 SHA512 a8a8ef1e4ccffee2313a18b9b8dda06c7ede6d49fdde8578694500634e3c90278fd30af7d88938d5ecb08c519cc3e09d21fe69d0f21cb766e056ceedbb3eafb0
 DIST graphene-1.8.6.tar.xz 127984 BLAKE2B 7f67b99796cca1a47324674b1871ddfbcce1193ded5f0a37c8c2894d52b6b5823b0fb1909018ea6adb90f7ed53ad6b09eeda9b1606a22a8b85cd0d661d500195 SHA512 ef6e9b5587bd540099216a7e3f7c86eb62368d49876dcd380c9767c6740c8267c9d510c5025dbe56402f3cd15084ef8fc634d3abe486b516f4f5328b87df277c
-EBUILD graphene-1.10.0.ebuild 1707 BLAKE2B 959d36339b1189b12d97f2fff7775581fc3948e79fda54e4a26035b8f2f6cb575d70c4da1e1556b4ecdfe80bd5f53bd2ae7962c8f8fe9adedf3d53ee18400e93 SHA512 907b1c22c6b2cc2928ff8eddf53c7a769c9d76cdbd436142fe1c88d7fcbf27bac949d91b2e073aeff590595762d561f6bd33e4b83ebe1e265721dac9a1b0eb52
+EBUILD graphene-1.10.0.ebuild 1704 BLAKE2B bb1f4522b2cf976eac4138a27376c7cd716919769ad91dc22b06a290a421a8a923622683222c769392219028b7b2d8504dace40b880a63a506e767e5112cdd6a SHA512 9fc0c0715727c7342f314dac54ea8d3569b6bee59c9bfde89742e03c272551098c79951dfeabe9c2c61df368f350f33fab9a809d5de8dd0df0223ce9b2f14bbc
+EBUILD graphene-1.10.2.ebuild 1707 BLAKE2B 959d36339b1189b12d97f2fff7775581fc3948e79fda54e4a26035b8f2f6cb575d70c4da1e1556b4ecdfe80bd5f53bd2ae7962c8f8fe9adedf3d53ee18400e93 SHA512 907b1c22c6b2cc2928ff8eddf53c7a769c9d76cdbd436142fe1c88d7fcbf27bac949d91b2e073aeff590595762d561f6bd33e4b83ebe1e265721dac9a1b0eb52
 EBUILD graphene-1.8.6.ebuild 1839 BLAKE2B eb06a3ebc7e3befed4777fabab55b9a670d5dad677a8cbba50f9afec801e29cc5557dd63a1bde8e4da675d1ececc5c760db8c983ed417c1bfee0fa96872a83ea SHA512 327723ed935545bc2cbbe5590724a2849bbef3e5f72160e4b1f768fbe9c954e39b1d97a7e4a43f81f3b30dff2abf73db66aef3e8b1c1108b0951f7f3a78c98a2
 MISC metadata.xml 333 BLAKE2B 3d34baf2b84e2ca8cc20638b381fdb4771e94f07df133f5d997b5d7bdf3704f8b8f77d2c79815f70246affa2e399d1118e03eae7c7cf8e419fec3dae89ef0405 SHA512 aef6b787ac7f14b56e4eacd746c91671b9a115cb40b312b415c7302d4339f5d3b3a887bd52a2b30ba31b3e0f027360a9fa55f6d3065cf7baedc4bd28dbbcd056
diff --git a/media-libs/graphene/graphene-1.10.0.ebuild b/media-libs/graphene/graphene-1.10.0.ebuild
index 672030936169..d8ea01f115ca 100644
--- a/media-libs/graphene/graphene-1.10.0.ebuild
+++ b/media-libs/graphene/graphene-1.10.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ebassi/graphene/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/graphene/graphene-1.10.2.ebuild b/media-libs/graphene/graphene-1.10.2.ebuild
new file mode 100644
index 000000000000..672030936169
--- /dev/null
+++ b/media-libs/graphene/graphene-1.10.2.ebuild
@@ -0,0 +1,57 @@
+# 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 xdg-utils meson multilib-minimal python-any-r1
+
+DESCRIPTION="A thin layer of types for graphic libraries"
+HOMEPAGE="https://ebassi.github.io/graphene/"
+SRC_URI="https://github.com/ebassi/graphene/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.30.0:2[${MULTILIB_USEDEP}]
+	introspection? ( dev-libs/gobject-introspection:= )
+"
+DEPEND="${RDEPEND}"
+# Python is only needed with USE=introspection or FEATURES=test, but not bothering with conditional python_setup, as meson uses it too anyway
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	virtual/pkgconfig
+"
+
+multilib_src_configure() {
+	# TODO: Do we want G_DISABLE_ASSERT as buildtype=release would do upstream?
+	local emesonargs=(
+		-Dgtk_doc=$(multilib_native_usex doc true false)
+		-Dgobject_types=true
+		-Dintrospection=$(multilib_native_usex introspection true false)
+		-Dgcc_vector=true # if built-in support tests fail, it'll just not enable vector intrinsics; unfortunately this probably means disabled on clang too, due to it claiming to be <gcc-4.9
+		$(meson_use cpu_flags_x86_sse2 sse2)
+		$(meson_use cpu_flags_arm_neon arm_neon)
+		$(meson_use test tests)
+		-Dinstalled_tests=false
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/media-libs/grilo/Manifest b/media-libs/grilo/Manifest
index 2d2e19c5ec52..681a375f3973 100644
--- a/media-libs/grilo/Manifest
+++ b/media-libs/grilo/Manifest
@@ -1,5 +1,5 @@
 DIST grilo-0.3.11.tar.xz 233516 BLAKE2B 4f239ae99bbd0fefe501e60bbb1249641a2996a26cc8342d5b8daf0665baaad268de9e295bf52b0b504da5c9a0a1f9174664c1afe1303e5dc8a5b547b2e1d160 SHA512 fd46d035982b14ed19681acce3f4878cc678919babc031ce5eb577a21d14f97b905eb5094b344b7fc732bf317fb504dae940cffb7875de2d577bae431b7f9c36
 DIST grilo-0.3.12.tar.xz 234340 BLAKE2B dd9f2558dee73080d87a98209816ca79a13fee4934a9e456190616e11565095e3c08e64f3ccec30e3bb7a102a9e23c25ba32a95f963676516a354a785bd6bdd6 SHA512 c0badc4b3f96efa04e6f3b5f32b2322855d9a660f748ce68012d266a6f5936f850bd63e559c782ae02ee24ba282c3b3882c6b8fae99019b913d74ff927a31017
 EBUILD grilo-0.3.11.ebuild 2180 BLAKE2B 61b553437971cc50a0e7dc2fd6422285a883c3cbcdd35c10a1c5a7247727c6dd3c7b03c51f3cda9a23e73a4e4da680f685788133b5e190c5c2014470dc8e9450 SHA512 c6089603299430d6da1a6f6635a72914816b0cff07852e86652f6c440cc440c9c26f41bc8fa4e84eea2ef730cbe62444d9281e2daf2d3f1c8f67a884f39dfd0c
-EBUILD grilo-0.3.12.ebuild 2182 BLAKE2B 451dcbbc8f1451da7d47da2b8382a27130a1566420cd3b32119ea0f71180bdd86c6d114b0f56f2a9b55bfde9875d9f41d574821b575b4703f8a3f6c8c1b9ac28 SHA512 0716c047277f67c5207a5e8c7ae09434b26f3866d6cb7f57b2dd051bb776b68d9cbf846cc4f926bbeab06a7763cbb13149c619b133e81188a42dacfc27c2a50f
+EBUILD grilo-0.3.12.ebuild 2181 BLAKE2B 09f0e64bb1d181a80b8a88f74631a7184d57b8f5403363c1e13833611a8aa5850f1f61bf60ebc3d81e8168a25397b2f41ce71f06243acdcff6f615ccdb1ff404 SHA512 659e5afafd4ac3321c6f4ddbffb0d60113095aa19b01370a6104b741a46cbb8fb721d38efe67b235c90af74c555362925608c1979fc8838aa03e22ca30cad0c9
 MISC metadata.xml 728 BLAKE2B f552b3317894c70912c17e3e46367198f4451940b5029508f83ba3ce904faea24ed3876195f1b062145582dd268064e0c63636ddd5d6033b7032b392e10abba0 SHA512 bbd75a063a5697c257dd9084961d6519fb71409dcd1375d66ff25218deee87841c822edfa66d440cd5c6bfbad70942f01b30f2b7e1a3cc9727beac23ca717b5f
diff --git a/media-libs/grilo/grilo-0.3.12.ebuild b/media-libs/grilo/grilo-0.3.12.ebuild
index a7f61b4df9dd..6ee66555a0d2 100644
--- a/media-libs/grilo/grilo-0.3.12.ebuild
+++ b/media-libs/grilo/grilo-0.3.12.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.3/0" # subslot is libgrilo-0.3 soname suffix
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="gtk gtk-doc +introspection +network +playlist test vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index e79502996aad..87bd736f4710 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -3,5 +3,5 @@ AUX gst-plugins-bad-1.16.2-make43.patch 7494 BLAKE2B f3207f46b7bb4a56acb70ca5a33
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-bad-1.14.5.ebuild 2705 BLAKE2B 7f6071a63b6b0d33e255f2982731f3693fba2a663bd19079e40c1a913a1fc2aefe0a476fe7b9603c85d64c6edf13fdd1952bfd188acb045b3dbbf12b4a1e724e SHA512 801628a4d531b1495e7c8b595c4e053fec91d31a56417cd6e37612bd28de07bdabecae53e9a54f5232b6f401a7608d64762b472640ff120fa3d9e5808bacd51d
-EBUILD gst-plugins-bad-1.16.2.ebuild 2333 BLAKE2B 25a50ff5b5de6923b1d06adb054db790cd5a6711a2e894995de319d1df47a0dbfe8ed117afd7eb3ff1f022f1cbdaf50c64778af460d6336e7339bb6713add2e1 SHA512 2e641f0aa74968fd1d534738e39d9e466b5b81eaaa6911fa92a175c8cbeb8c69baaa718ec521c1e47dab8098b3e75138565dc328daf746c0670e1c905648f345
+EBUILD gst-plugins-bad-1.16.2.ebuild 2331 BLAKE2B 1a49a33d379524a269b0bd6e1f813e3d5a9fb0d749df2eb2221b34c110ae64eb0fad49c6103a334a1f57f205b0bd6e29fed62c9c61e1eb73809ebb67e85b7880 SHA512 e59de592f8300d6f25989db500e398395a94feb519534735ce8295c573968b05e5d327c1e1ff936e933dbbf11485e228bc960e7e6076c0476173bc8010a097cd
 MISC metadata.xml 439 BLAKE2B 5a4a36ccf4bd485eaf1fa66650eec8fa592d4c5bbf9fa478f1645e1b39649b7115694bf55dee7aeb4a5c53b2ba3c4614591cdf4e7d745938397c304108e0aa7c SHA512 9bd27a1a513fc2d697f7d0f2ceb7fa0701c446fe21b597256afd4c2c1f44145e875323ed1ef6202bf7b85472ab4aab43a4b6db5795bb1d28ff53a2a7e484055e
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.2.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.2.ebuild
index 168be0bfd904..783d12d0ae3b 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.2.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Less plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-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="X bzip2 +introspection +orc vnc wayland"
 
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index 47f25740a7f7..ca05cfc4d33e 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -4,5 +4,5 @@ DIST gst-plugins-base-1.14.5.tar.xz 3717076 BLAKE2B 461e90df614c60d7efce6fabcf8a
 DIST gst-plugins-base-1.16.2.tar.xz 3939868 BLAKE2B 7313e50dc0842f02cde0113462c8d4b393dafe271da6e2a1af89dc997f2ec77a9f06bc467516c607c8b7b822e49efd1af829440a28a9af8356ef07e7fa899968 SHA512 f28e71bba8ba25d4f18ba3a196f057721151f1ebf1309d808bd6771a3f9a68facfa1970dc4353b6f2fd1e8945edf5272854d328ea11ef399544f8b330f754a42
 EBUILD gst-plugins-base-1.14.5-r1.ebuild 6025 BLAKE2B 0b7698e494efef8651973fb3ad48af145c9d7c94afa9964aa5598beacbd64d4e85147caa3b2d89d34925851bcdb3a6558f7e515fd3430c6bc35cf6a82b9adb46 SHA512 e19f197d53cc5758645db08e32e336004433270f897f8253200eac634480ea41ccfe162b625e27a0722e005e35ea05bf6fe9943ab9317803d91de21f6f225bb6
 EBUILD gst-plugins-base-1.14.5.ebuild 6037 BLAKE2B 7a94909cb8e237fb07c2dce50447647b92c6e1fc8fe5d859724f74468a045b8d9a04501c4dc167e8ca222f82a722e56499ed31f0534937c690737ee9ed84a816 SHA512 e9a8b42046bb5e59cc4771b7d033d3691c06ecb83f6b30b151d7f954be76e72432c37f0144d38af04771c77eefdab1b76b80a97780a81aa67e938933f7263867
-EBUILD gst-plugins-base-1.16.2.ebuild 6031 BLAKE2B 51cbc32332fdaa751b9cbcf90c0224d2e715c22fd455fe8d2478688997a6f822294e9c25830a439b804893623f8bda0699f32334afefced9c1c6d9b0dc1dd151 SHA512 7853d32ca7610cecb6ab15f79bdf3d3f6edfd294ef2230436c3367c8b1fb2be106b8dd9caf71ac34d1f3f8fdfd6f6662c061d4f44af8bd5c0d65a0836e6d7451
+EBUILD gst-plugins-base-1.16.2.ebuild 6029 BLAKE2B 0d3ed237fb0b9a970343fa6b56c1c25ac1ee1ed3af7c601da443d4c46e02da647224581b8fbb3797503999ca8b15b5b44adf871d6c8a489ec2b4d78feb7f7640 SHA512 06c26db41574d44ed79074a93996a1160f54407bf6294ed9b2358d3feb06cdbcd5ce1bb5e43565b339eb2f1e7c5382ded5d30605f056b3fed0aef0f3905f6f54
 MISC metadata.xml 1065 BLAKE2B 9736df3218c6157e5cc0f14e96a15ec6ab6140e8774c7361dd4fe9378efd37d1a3da593527313a81591818ad48a5585bd4395fbeb85d357449b00bf7e51bbb5c SHA512 520802b59fc6575e16edd765dacab4ff0ff6e51dd162f03fe7e4e07eb472aeb78f3974a32ba613939932e123179106a450c503234ed806a08416dc6b8dd534c2
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.16.2.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.16.2.ebuild
index 548dabb5e358..f0dbf9ecd1d6 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.16.2.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.16.2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # For OpenGL we have three separate concepts, with a list of possibilities in each:
 #  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index 3c71f545d039..245e2ff363ea 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -3,5 +3,5 @@ AUX gst-plugins-good-1.16.2-make43.patch 1927 BLAKE2B ff38be465f3300f8b6821b3787
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-good-1.14.5.ebuild 1506 BLAKE2B 4f7fa9ec216eba6ba101b8ffdfa9d35151f2c6956bb40fdfbacfc88fe8b800a0cdc5e645fc662f183d41eb569885da7036e5a82cfdb370d15485efc47110c212 SHA512 54bebe46bbede74adcb733677f92f4694cc770edae5cd1e45fe7aa0056cd67e4838a7612215f0ccee160eaa51d274d2fa0a38513cb695805966549d495767b32
-EBUILD gst-plugins-good-1.16.2.ebuild 1512 BLAKE2B 5a9926ceba4f784fc225871cd670482530faed4be13ad68130e67806dfde513db63dc0d4d27734cbbea5c16c32e3cb694675db57b1e0e1631bebda0c63b1cf14 SHA512 23dafeb2140c2833c25420d63997416fb0258133b353a4079e8118507e4a87833c2e6aac52e4b84669e862a56de414ddec4562e713bfcbf9b830f1ee3b4fed0a
+EBUILD gst-plugins-good-1.16.2.ebuild 1510 BLAKE2B c6ca5ad4a216113cf1ccadec7dcf159ec7ae93d3aa67b18ee17a1e18d5df37e7778046363175e6da54236250ccc47e6408d410f81690a9eff72675b6c13f780a SHA512 de8fa8eac2304c7c8ac37285607ade83dc4802232b8d91d0ac57deac4278c3867f5ca61415fa95e688680b305d46fe99d6a03599ab24de93f842e0691132fb43
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.16.2.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.16.2.ebuild
index 3c0781272852..d2b5fce632f8 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.16.2.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.16.2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-libs/gst-plugins-ugly/Manifest b/media-libs/gst-plugins-ugly/Manifest
index c66f432efd6e..afe9184bff98 100644
--- a/media-libs/gst-plugins-ugly/Manifest
+++ b/media-libs/gst-plugins-ugly/Manifest
@@ -2,5 +2,5 @@ AUX gst-plugins-ugly-1.14.3-make43.patch 540 BLAKE2B 13b53beb26c0f70233178c97433
 DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2af33536719913ec10229eb6bc64f1f957bc7f6afe45e1c528ab4015c25dec61b8b9d2c517fee78a8a992c76bd41ff9e75d1 SHA512 0866bbcc3f1d0d668e77b5ef83fa7469dc80c957d2c6526126e761db46e83ff18d941c247833d27336106d8ba043e9ad50cafbddbff241f95bb16f9b1a0fbacc
 DIST gst-plugins-ugly-1.16.2.tar.xz 893964 BLAKE2B c607a7aa3459625a930021d247705f00e418e57557c57b8f9793bce74cb5c4d708b253250f0bbebd9698e9ff80d5636d578dded8c360ca2d34e3d43c9a722416 SHA512 9f393043f51b12b376607e68b3b86437af86e321e3a3566e59c7f3507ed26622211df87e30a23bcc927f37bc11f53ca3b29f1b12bf58e623ce18edc88a9cdee3
 EBUILD gst-plugins-ugly-1.14.3.ebuild 1040 BLAKE2B b407e5fd151f84fdad9b7b15fcf3a26911a741fb38fe7e87cc8f85e983b7a98628bfc41ab1db9ebbd72542b0232f268b58c3bd86f90bf384de6ea4728fa1d98f SHA512 2dea55696ecad8c8e71dda5f882908a41eec0b29f127235eda786721052d28cee41a8fadd5b0bc44145b1b71a64829f053a8f45284e1c17854b6ea11c8e92945
-EBUILD gst-plugins-ugly-1.16.2.ebuild 1046 BLAKE2B 966147277fcc230f4515f53ceaa79ab30248bf3e7ade9c86252ac32f6489f4331542f6b2ebb83addcfca6071bb40dc1ba27b7c0992910dff680e9cdfd92fe617 SHA512 bfde5252529633c9b76556f14c2649966d34149bf5ed69282ba3d66abf34987c1775d3dc0e4033def1a11f47f20da120dc4d0597c3a992719ccef3455e06b903
+EBUILD gst-plugins-ugly-1.16.2.ebuild 1044 BLAKE2B d2e03418905ec81c826bd70b83d9c4e1601f8e5c182cf84e81731eb686cb7cf0408427e927c25516e640595528c1d71dec0af7d52240535679a585c6b5e85f91 SHA512 61329f93031ca1b5b125d2b3772d2e08056daf1fdc68e359ae7730afc45f5c351e89db66559b1bc42db218fb6348e139420edeb7c2a9c1abe0ef7164e5a8ef50
 MISC metadata.xml 345 BLAKE2B c8af39d4811da5ca9cad30110ed9b2a090fd27a957bf32f831b4c3f5a22bb87fcc15957151ce9752521d2a92c667568d8ab002c8f4f9ba3363d9b7ca79655ce8 SHA512 c8c693633f2fdbf66f2308a2ee82880bf0cdd58b0c1e42a2d3b2733b3a7411769da60e8beb375def6473fe50303f1a68a0c7712e48abf88935b045f93103b206
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.16.2.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.16.2.ebuild
index 20f7b7bd4a75..1224f858dc28 100644
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.16.2.ebuild
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.16.2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index de220a055780..cbdebeec2fed 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -3,5 +3,5 @@ AUX gstreamer-1.14.5-make43.patch 3176 BLAKE2B a221894affd68da53d475c65544cfe825
 DIST gstreamer-1.14.5.tar.xz 3268756 BLAKE2B 6ef5bdcb103b4d8fd581ae7342d6d467f4c6919610bdd620e4a531755347d8e3276a50f2e637045b9b97cbf7726495608437c180d37a1019ec8a79ab1bc4e4d6 SHA512 1a97ae17f8fff041db5e24d712d33c7116e408be1fabc2abd7b652b067b6ebe6c0943845a33a21335a5b4fa0a1ba178873158659f761f1e3aab04a969029c5d8
 DIST gstreamer-1.16.2.tar.xz 3328600 BLAKE2B 9bc12330fc5a7fa3a65e2c03f9d06172d787e9aadb4c2cb7d98f8f7c5850e05535cf23f747bf89514a609447f3894942bcb2fa4a6d3d3406e129e1eb67b49158 SHA512 a8dcdb452a88f411676e54016fcf83149068b2f0b60422bebdbc81220078c61c415512006010ba0299df81ffb59853695c3ce00580f8fc46a079f6aaaa42609f
 EBUILD gstreamer-1.14.5.ebuild 3519 BLAKE2B 68989e70071e43baa0b35007b7b42be640a1cadff4c0f8d494ac3fd2fa2e3b13c5e2063b7bca967b4f59b86ac9b41a9fe8aa5f2438f1e44fbc9835f3f8766a9b SHA512 3b6bcd25bd60f9706820412ec58c8781e8dd9ba8955392c4cacbdf8ebad89793429859e55acd0a8b9f720d0eb04e1a2126b3fde52eda6f223f644a83402e0cc6
-EBUILD gstreamer-1.16.2.ebuild 3443 BLAKE2B fa9a34626580d09f8e5dd01b1b5597ba5ec06edd7e769d9e58ad27d4a09f9460b2ef9b424df1bb609402824af28675986afa09b2a2182643855389b642b87c03 SHA512 029ae60f4177a0768512558cfd2b3578a92d76ecec3e059b69bed17dd92a5df06b10324b71980bd6e0660084dcbb2a3bf569fabcb89604c48b7152cbd5d7eb63
+EBUILD gstreamer-1.16.2.ebuild 3441 BLAKE2B b989354f650b26b9e00db9348be38f45b14256fd5bca95c51bc1f53c64d0fbc3b368bc59b13d9d43f81dc74ad443b8ea9d1b8e47f87edbcec35f699fd2687c4f SHA512 3a907da7af75e629b2309c781f0547caf86738551006dd2493c8cff2c989c2825dd0add7b30abec9ce0d14a64049fdf08eced133a918ed82dca33816caffb00a
 MISC metadata.xml 586 BLAKE2B 319df0c2c013f3018bdb31afddcd80b298f9b74d0a581981f30d483b0773339befe4dc62eb78a267b3a0f5a63a7e6462bd0ece4d4285c0ca91a1329c12ba1b93 SHA512 f7de0325f671119a5b787dcba9572d06d58375ba9d815854beffd668da55e4d4695f586365b3455e63cd56f4469fb8e1a92ab6de4e05847668f56c076dfdaf57
diff --git a/media-libs/gstreamer/gstreamer-1.16.2.ebuild b/media-libs/gstreamer/gstreamer-1.16.2.ebuild
index b93960892a1b..fc0a67edaecb 100644
--- a/media-libs/gstreamer/gstreamer-1.16.2.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.16.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+caps +introspection nls +orc test unwind"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 435ba22b3866..d4e95187c2b4 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -2,9 +2,11 @@ DIST harfbuzz-2.6.4.tar.xz 5967468 BLAKE2B 24d215324a408a724f47a901c4a56605144d1
 DIST harfbuzz-2.6.5.tar.xz 8510596 BLAKE2B e495fbba7e0cb58918afeb6beb3ebcf936be896ca606cef27dcbfb9b5f10add144f7fcaa50dec35a9f909d7e87deebadb7c9e6bbbadcbd799effd96076786cde SHA512 ae66211f9b4233c1da4b22b703ab4912f684390294c5c88113e6c927d5aeda8960da3ff607a7c7be5968d9fbb5a95b1f6933070d0aab2aa442a3ec8a112cd16f
 DIST harfbuzz-2.6.6.tar.xz 8530984 BLAKE2B 59ddbffdd6d7af44a1564079e8313cd24a5811cae2de46a632ebf7ec3e76b3c600d159b8be0e52cc1a776c9975955d0e888ce69c304467b3eaef41f09b2be493 SHA512 b0b6323b893a3540e36e2358cc7e7d27c98aa14f1debe65cd8eaf817a55752ea4f22369e37e195abefd03bbc787f178d1b64f167237683ac208b9a65b0ae09c8
 DIST harfbuzz-2.6.7.tar.xz 9001936 BLAKE2B bd3a195506253a1446e877c35c067cc874826fc6fdae3bc3a9bfd2b7682ce12de7e6d7fd4ebe03b8178d8b678c06aa2d71715b27236347224a68e4d98a72039e SHA512 6fdd6e0952a73e1949349aa5416ef8fb3fc351b15c95be4fe1f341b111159fe58113b73a334db2697f4e3aaef5a761bd8f1d8964514406cad40f9862768d59de
+DIST harfbuzz-2.6.8.tar.xz 8976516 BLAKE2B 46401ae06ec70172621d2aa354901f03173a273abdb0db909332946643e82b4286be690ac717a29304e9db121dd7f693b4ce19522de772f5d140986d6333e7ce SHA512 651b23d7d4fab6fef472ee57db39bbaebc31c2f40ea3a482c1499ad1a7b549b86a2bccbe9da191c8e9ecdf464191dd3c9a7485546b51695ad8ab3c0329732d9d
 EBUILD harfbuzz-2.6.4.ebuild 3031 BLAKE2B 6dc0820449927f7323cedcdb16c843b7d548695f53bb40aa1a57a994897e6cc79d86cd4205c67796a5d3ab07ae7dc42ac215bdf9e33ebb2a62f7e9f33aaf3d73 SHA512 163e5e15ab58531d6ed13484315435a35ae8227366f9f8074519384cfee804aa76d1fd14184efb67ed38aadcf0ff1a7f86faf73d42dc756e5d55b14c8c52f0e3
 EBUILD harfbuzz-2.6.5.ebuild 3164 BLAKE2B 205fecfb2ba8f0bbcbe68bff20c0e7136589a0415270ef4f96b62941e52da1fc26a99216324eddabdccc98465fa5c466411d360387f049b1f1184c4f22043416 SHA512 988a256f1994d61e0e7e1b526617f566e6c7fe3fa05057a445995a93dcd97a3ee8859bd40e1e0fb3043f46b3ce46bddabacbf6634823e47197372079a78ec8bd
 EBUILD harfbuzz-2.6.6.ebuild 3172 BLAKE2B 232619df1e95eb0caa3cb4c04697ed49b30f4a7703d71f42f23eea057537eac686217e64ec91db04b1cfa24bab37ea265d40523ddb41adf7e9da3f099073a042 SHA512 1142604a0975cd202231b58261d689bba20f4c38f13c50e81ce3d7c22f717530c8dece6c8e10824cf9c446d02096042d6caac071945115b36272aec9b2779540
-EBUILD harfbuzz-2.6.7.ebuild 3172 BLAKE2B 232619df1e95eb0caa3cb4c04697ed49b30f4a7703d71f42f23eea057537eac686217e64ec91db04b1cfa24bab37ea265d40523ddb41adf7e9da3f099073a042 SHA512 1142604a0975cd202231b58261d689bba20f4c38f13c50e81ce3d7c22f717530c8dece6c8e10824cf9c446d02096042d6caac071945115b36272aec9b2779540
+EBUILD harfbuzz-2.6.7.ebuild 3167 BLAKE2B 993bfa44c56b307800d73a4e5a27dc06b0a4c27c7646cbbad9177dc2f46b6f8fc0c6d886ca47cb810f046d249d3f83fc595f079b48b1e3b32cde6c1ad265f158 SHA512 c23c3ce0718ac8c2c004e2058fe5fe399884bacd331b6918e0330df34bb9edc7257b00b6aff8be1218e306fc85c0a006f0e05622957e9ab0205553f15e0c9232
+EBUILD harfbuzz-2.6.8.ebuild 3172 BLAKE2B 232619df1e95eb0caa3cb4c04697ed49b30f4a7703d71f42f23eea057537eac686217e64ec91db04b1cfa24bab37ea265d40523ddb41adf7e9da3f099073a042 SHA512 1142604a0975cd202231b58261d689bba20f4c38f13c50e81ce3d7c22f717530c8dece6c8e10824cf9c446d02096042d6caac071945115b36272aec9b2779540
 EBUILD harfbuzz-9999.ebuild 3172 BLAKE2B 232619df1e95eb0caa3cb4c04697ed49b30f4a7703d71f42f23eea057537eac686217e64ec91db04b1cfa24bab37ea265d40523ddb41adf7e9da3f099073a042 SHA512 1142604a0975cd202231b58261d689bba20f4c38f13c50e81ce3d7c22f717530c8dece6c8e10824cf9c446d02096042d6caac071945115b36272aec9b2779540
 MISC metadata.xml 739 BLAKE2B df7724d5cef26b569f76d41c808f99a1ecf44631f0bae96fbc2a9b4f5981061b55c60d69b1b64d966897f223a3d3b5cc4325a3ac780599ed76591fc2044b4988 SHA512 192f7abc191044f267bddb4db7d91f9b78926f4a361802f607bfe4635d7cf63398c289bc52009ad4d3bc6f92684cafd8b40e48f1e0f8cdaef9a4e27f538e7dbd
diff --git a/media-libs/harfbuzz/harfbuzz-2.6.7.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.7.ebuild
index bdc327af67b0..852ffebdf8bf 100644
--- a/media-libs/harfbuzz/harfbuzz-2.6.7.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.6.7.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-	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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/harfbuzz/harfbuzz-2.6.8.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.8.ebuild
new file mode 100644
index 000000000000..bdc327af67b0
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-2.6.8.ebuild
@@ -0,0 +1,116 @@
+# 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 libtool multilib-minimal python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
+	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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+
+IUSE="+cairo debug +glib +graphite icu +introspection static-libs test +truetype"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	test? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+if [[ ${PV} = 9999 ]] ; then
+	DEPEND+="
+		>=dev-libs/gobject-introspection-common-1.34
+		dev-util/ragel
+	"
+fi
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+		# on Darwin/Solaris we need to link with g++, like automake defaults
+		# to, but overridden by upstream because on Linux this is not
+		# necessary, bug #449126
+		sed -i \
+			-e 's/\<LINK\>/CXXLINK/' \
+			src/Makefile.am || die
+		sed -i \
+			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+			src/Makefile.in || die
+		sed -i \
+			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
+			test/api/Makefile.in || die
+	fi
+
+	sed -i \
+		-e 's:tests/macos.tests::' \
+		test/shaping/data/in-house/Makefile.sources \
+		test/shaping/data/in-house/Makefile.in || die # bug 726120
+
+	eautoreconf
+	elibtoolize # for Solaris
+
+	# bug 618772
+	append-cxxflags -std=c++14
+}
+
+multilib_src_configure() {
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	local myeconfargs=(
+		--without-coretext
+		--without-fontconfig #609300
+		--without-uniscribe
+		$(use_enable static-libs static)
+		$(multilib_native_use_with cairo)
+		$(use_with glib)
+		$(use_with introspection gobject)
+		$(use_with graphite graphite2)
+		$(use_with icu)
+		$(multilib_native_use_enable introspection)
+		$(use_with truetype freetype)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-libs/icclib/Manifest b/media-libs/icclib/Manifest
index aba211614790..937507994756 100644
--- a/media-libs/icclib/Manifest
+++ b/media-libs/icclib/Manifest
@@ -1,4 +1,4 @@
 AUX icclib-2.14-make.patch 3074 BLAKE2B 9f45af8c8c0041525e98352b9aa4b2743607d76b79dee02b17cf67e3410f9d45caf433f7e6490bb761c2b19616acf19275356f21a9b9a582f3f30a0e15997e70 SHA512 e2245b6f7aa24fcb135e8ce7a4332b6a689822c6429cf48cab5cd61285e80c72ff50adb6d8e691b948e45b9dd5d3df42935b810e1a25aba4f2d9d51ac9b9a1eb
 DIST icclib_V2.14.zip 158606 BLAKE2B a42a16a00d540f3e0036f86a4934ed8ac3c67bfea135df5fc893cef939b451f0298c576aa4067360597912fff1afe3315588af64e4edc9605ea5944ff9e42cf6 SHA512 ed038c8655968c794491f30c295ef115900bfcc2e8bfd8607f12f73d6f2236fc339c1ed53a364524478273097ab9065a372bb26f38231bfc6dc02773a11546a3
-EBUILD icclib-2.14.ebuild 805 BLAKE2B db0ef3c262563d5593fae5c59c534a0834c9d765b0b9f3cccd1853cccf748e3a1c485750c51d816f96f3cb5d1841eaec64295dc415053bdd40342e6ab98a151a SHA512 4ccf44eb5347c97c9e96a3640040095af3e5c20e210ece9f508ba0b6adae7e8a50801c7ba4886f3fb4be928310dc6bad99caabb56fcce1d78835a0d30cf0dc58
+EBUILD icclib-2.14.ebuild 818 BLAKE2B c84324a55a2cc9c80fe7fb18989d6e3e45119f0b793287eecb04acd937a49d6bc925bb3637b177d1b7520ec64f294c4d785b67c18242c86eee28cc1516f6d7e6 SHA512 1de661247080d6170f7bf973441b7809adbc32c06da3111dd67feddc4b25254278580e6f14ee5e6f3f1b24d676bade73472941a2bd16a1e300f128467f2da950
 MISC metadata.xml 332 BLAKE2B 228aac7bfb93c3611d6308bc9edb709395734cbbdc97d686647f8030ff1cd258191d734e1a94a7aec2dbac31081d081c5de0f70d7b4d09ef3f46ad377665a782 SHA512 079f7df30b6a832bd5d0b0ff76889c44c615126a9297a80c9fc8a3b0aa9b4cd4c8f63e2ea57fbc8d2bbf742a5cc95638f66d702aa50fd19477dcdefbd6a58717
diff --git a/media-libs/icclib/icclib-2.14.ebuild b/media-libs/icclib/icclib-2.14.ebuild
index c1c849efebaf..c9b8483e17a5 100644
--- a/media-libs/icclib/icclib-2.14.ebuild
+++ b/media-libs/icclib/icclib-2.14.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 toolchain-funcs
 MY_P="${PN}_V${PV}"
 
 DESCRIPTION="Library for reading and writing ICC color profile files"
-HOMEPAGE="http://freecode.com/projects/icclib"
+HOMEPAGE="http://freshmeat.sourceforge.net/projects/icclib"
 SRC_URI="http://www.argyllcms.com/${MY_P}.zip"
 
 LICENSE="BSD"
diff --git a/media-libs/libcddb/Manifest b/media-libs/libcddb/Manifest
index a4e3afeb353e..6fbe1eb87c19 100644
--- a/media-libs/libcddb/Manifest
+++ b/media-libs/libcddb/Manifest
@@ -1,3 +1,3 @@
 DIST libcddb-1.3.2.tar.bz2 352909 BLAKE2B 8386ea051f23004396d53ad228a595d13c8c194361223026e901ff859f8e3d2dadb93d5e779902ec4698c164a3e06073fc82f331b22b4cf42f5ab8b1fae562e6 SHA512 0e07e7d37f2013164d75b530a5528f54847271fd20f3b7bedb192a05d1f61dcf006d10dc2927efe155a01eddcc57b940bc31d8ac88d5dfc4f1a09771caa84e0a
-EBUILD libcddb-1.3.2-r1.ebuild 997 BLAKE2B 285ca275be6fe12a60906145a9a8cc8be86cf0aa7f4634d890e9b31268d044011b1095ab62375ad204b6e58b5d8f29d148ed6d1cd7fd62c34df5a41de9afce3e SHA512 67a1d9935dd81d06bdf9db2b18c42f324176bf0d38e8f03b91579c453450475a39ca566c705dc314461e588f806a11982138f3e550d09cce54e68b3075aa2c4c
+EBUILD libcddb-1.3.2-r1.ebuild 1205 BLAKE2B 0ae70b3aa111f95641b4089de2a1e781b3dd5616fbdba2d9c736c4da4f91e86033acff1826caf164d34149857780d780b17ac10fd2829174b4f3d9709609ccfd SHA512 3729f7eb3f98a9e5ad90955793cd3d6069a01c3796e7eb0bf69e71df360d97942d9e880ff76dc6688e131bb0b11300502862d04e6f8a36ae0dd0df7a3f4a45bd
 MISC metadata.xml 330 BLAKE2B 5a8314f4fd530d9866bfc3d9bf50a83e247705353cd3744b9bca49627e30bd683565e2abdbbdd9d04c062aa4ddc16f26deb06d4d4887b237d6fdb42142332c8e SHA512 db4acf96ddc4640b5e328063fc76160a6294aa850569c4466fa741ee0e223f9a325f563701d0d096b8a639c5ab0af1040aa2bea431981808e58bd1c2482c2b34
diff --git a/media-libs/libcddb/libcddb-1.3.2-r1.ebuild b/media-libs/libcddb/libcddb-1.3.2-r1.ebuild
index 06c26b854504..527e22390ba0 100644
--- a/media-libs/libcddb/libcddb-1.3.2-r1.ebuild
+++ b/media-libs/libcddb/libcddb-1.3.2-r1.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-
-inherit autotools-multilib
+inherit autotools multilib-minimal
 
 DESCRIPTION="A library for accessing a CDDB server"
 HOMEPAGE="http://libcddb.sourceforge.net/"
@@ -17,7 +15,8 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-lin
 IUSE="doc static-libs"
 
 RDEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
-DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND="${DEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 RESTRICT="test"
 
@@ -25,22 +24,36 @@ DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
 
 MULTILIB_WRAPPED_HEADERS=( /usr/include/cddb/version.h )
 
-src_configure() {
-	local myeconfargs=( --without-cdio )
-	autotools-multilib_src_configure
+src_prepare() {
+	default
+	# Required for CONFIG_SHELL != bash (bug #528012)
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--without-cdio
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
-src_compile() {
-	autotools-multilib_src_compile
+multilib_src_compile() {
+	default
 
-	if use doc; then
-		cd "${S}"/doc
+	if use doc ; then
+		cd "${S}"/doc || die
 		doxygen doxygen.conf || die
 	fi
 }
 
-src_install() {
-	autotools-multilib_src_install
+multilib_src_install_all() {
+	default
 
-	use doc && dohtml "${S}"/doc/html/*
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	if use doc ; then
+		docinto html
+		dodoc "${S}"/doc/html/*
+	fi
 }
diff --git a/media-libs/libdvbcsa/Manifest b/media-libs/libdvbcsa/Manifest
index 26cad0709d2d..d46d0fb678e1 100644
--- a/media-libs/libdvbcsa/Manifest
+++ b/media-libs/libdvbcsa/Manifest
@@ -1,3 +1,3 @@
 DIST libdvbcsa-1.1.0.tar.gz 345487 BLAKE2B ff5d9347f4255ca2c4e62477771715a7d8fcfca6eeb3a2e6cfdfcd903c9927a35d9049d18ec5a9d458328d6a3712d6cf81633e7ddc7c67d1a8099b8d56b2fd68 SHA512 f336bc90711261bb86bb42f897d5207a71da5a384bfb7d641de7e1fb3a43d20aeec250e9a5ceaf0b20f1e4335ccda70055675256c6889873bf1bfff55005a015
-EBUILD libdvbcsa-1.1.0.ebuild 804 BLAKE2B ca1b12f28e02ceaf199a0d3fb4da1596dbc49a9bfb7a7a276255858496bf3c96913b4544c835c313ccccc538d42233e2eb564541a00c614714719360134c0944 SHA512 18f56aaea857d6dd5466ae59c1782f70275373581c3d689ab42c412f0c197e1e3f925d38dc9cfaae0a993d3b034833498351b91c5f43c7813c5a55b17932faf7
+EBUILD libdvbcsa-1.1.0.ebuild 808 BLAKE2B d1155025350811cbd931982701908d711b3ce7629336897983ad412ee0e7af9ab939e65621a652f992d8c97a671443ace4f6e4533d411f141c6483220668363d SHA512 618331153077bb542d654a6fab79c71f17200eacb350f72bcfe1d2086b736536b690ae3cc4d768120cbc87f7e849ac1e28a0a2a8262b87605b060846ee2b04dd
 MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/media-libs/libdvbcsa/libdvbcsa-1.1.0.ebuild b/media-libs/libdvbcsa/libdvbcsa-1.1.0.ebuild
index 8c96eb334aa0..7f8e54937aec 100644
--- a/media-libs/libdvbcsa/libdvbcsa-1.1.0.ebuild
+++ b/media-libs/libdvbcsa/libdvbcsa-1.1.0.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,7 +7,7 @@ DESCRIPTION="Free implementation of the DVB Common Scrambling Algorithm - DVB/CS
 HOMEPAGE="https://www.videolan.org/developers/libdvbcsa.html"
 SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug cpu_flags_x86_mmx cpu_flags_x86_sse2 static-libs"
diff --git a/media-libs/libemf/Manifest b/media-libs/libemf/Manifest
index beadfca9f949..842c545efbe2 100644
--- a/media-libs/libemf/Manifest
+++ b/media-libs/libemf/Manifest
@@ -4,7 +4,7 @@ DIST libEMF-1.0.7.tar.gz 908973 BLAKE2B cfe2c67bfae9fd7387f5332fa7b5038510d81aab
 DIST libemf-1.0.12.tar.gz 1314880 BLAKE2B 61e1e56e713ce53c589a758ad01eca572d61ca336c0a6cb08f4becb9b850973a82d4fe124b8fd6f39530d2d4637c38ccb137d4c5eecb17469654fc921e9ef150 SHA512 a96f2b14e4dc0b0b388d21789890b3a89e20bdd6aaba3665a7af2c61c3da531718ed19eb0d70ef1ce1f46e1327530a7edc057c1b78f68e7e883b5357829c7453
 DIST libemf-1.0.13.tar.gz 1314905 BLAKE2B a2614aae1e34fdd65292d7feff3c0c002393aad806bbe398c665191e496ff0d3af676b04bf95400e732f09b846d033f98d3f08e47f6d7779dca9694372ef1451 SHA512 37fdc959d2269ad1ae97d49c4f75b914593b7b636024c035d96a5a47b4258b5b522cd1928a5b99392afcdfe54e46c7f2d4c157056f99c8c0d88d71c25813cc60
 EBUILD libemf-1.0.12.ebuild 637 BLAKE2B fda46e44496076d69cd53a97810544b9b52d324c0ea0cb674cb9fb4ffc3d26fd70ee1d1297d7aa387397427f3e82450dcbeb5323ca6bba919b7920f50f683014 SHA512 5f8b8104a0848f6089e551bba5b33ef104cda39ac0ab621df3abe2f1993780d3504db8e16550ac5bba86c1984a73ce2efa0b0fcfbb95c80d3be453eccf317c0a
-EBUILD libemf-1.0.13.ebuild 639 BLAKE2B 419e05149bec30f2799c6cb5e1b196b785bd302cc2796091b1d8c4293c45528eff21720aaf5b926eb450aa21da982036e796e727e62e974c738b2045de014dad SHA512 fdf9f34eb03d36f3a3f2be9cd346724f739f018eb800c8d8ac974e47e22e4573fdc42c10d43841a638a556327bfe18bdb79299d3e6bacf36bc1da72f715f226d
+EBUILD libemf-1.0.13.ebuild 635 BLAKE2B 11301d6497ae464144fbcd850946eadde0d09a6ee9f2381144041f134022a986d943266786bccbe3ac2a781a81ae72788ff1eda1023fd04562a4e66158e3ff57 SHA512 42ed14eadcf521e614d3e3d8a1afb1f0c6972a81d5893ee495d29ea8d24716ddfc55c0436cb7e1d10bd4e20ba39d89b4f1ac8ed17d9bf57988af59e2c1687e1f
 EBUILD libemf-1.0.4-r1.ebuild 864 BLAKE2B 7c6720af9200e2417baf17d34c8776e2ec9422a9d283d362807b3c8b69b6ddfc53872692fcdab74f83aa3151398b231a9401ebfe806b729883b1c73dbc5c13bb SHA512 dc75bcb21bcd45634877aae19feccbc2048c01e58abbf6e2bba6647c2f55ac1985fede7c38f701975562135327e7b5e7c6f77a5c80af9e10229771db20006fce
 EBUILD libemf-1.0.7.ebuild 815 BLAKE2B a6eba4cc0279401fb72110e17bcf082c6768fd18c3aa3ad94559622680bfba3b7936e15e623078c895cb9147882bca8d36751496cdb8199dcd7ae170bc590bd4 SHA512 b0b3c94474b8aaa809456b89222886f1f0fdf0672d355895f1835e7151a4f5bd8419b8abc31c5ad932afb31167e621049d5feccfa46309209b780a6a3efaccbb
 MISC metadata.xml 248 BLAKE2B dce07ccd35cdf8117e7f05bbe068c807c381bb91d899d48834974c1d362cc25c3d114dffba55b67c669b96893cfcb7cc56451a6ad833cc5b5cf89f577e714b27 SHA512 89826cb9b2687c78bf585335d0f103d00a5c58d9e5902003e18710e9a8afff7304bc39f3909de99f2b14b4b8a6a007a1f0e3aa5f90bf31d0b8d7314a3c7edf05
diff --git a/media-libs/libemf/libemf-1.0.13.ebuild b/media-libs/libemf/libemf-1.0.13.ebuild
index 66abe8cd1c61..c389b3d7a9b7 100644
--- a/media-libs/libemf/libemf-1.0.13.ebuild
+++ b/media-libs/libemf/libemf-1.0.13.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/libemf/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 -arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 -arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 src_configure() {
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index 4fd57fad63cc..f0bfc42da2e8 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -5,5 +5,5 @@ AUX libexif-0.6.21-fix-C89-compatibility-issue.patch 1138 BLAKE2B 5b3923a7fd82fc
 DIST libexif-0.6.21.tar.bz2 1368435 BLAKE2B 151e3ddcdd45759fd70be91db27511f48a9b7d5de72c8af510e5a231e2f053f8b5d62d1269a1206e419461b07fb723788492604f1f1142edcb5ab7a0876dd307 SHA512 4e0fe2abe85d1c95b41cb3abe1f6333dc3a9eb69dba106a674a78d74a4d5b9c5a19647118fa1cc2d72b98a29853394f1519eda9e2889eb28d3be26b21c7cfc35
 DIST libexif-0.6.22.tar.gz 2741296 BLAKE2B df57aa0ff7d20faa47ea34f4d8164c33b113887bc2179405481b2c12c0d0336dc9e5321a260ffda64d974bfa9ac6af55c0cfb4cc9a57a941c17944a3d049befd SHA512 e399804c9d67072861988638349115c585546be20f15c4d26bb6f411ff4ee5bce979c1a41305c1456ecc2f830837349f93cfa4136b7a864e0486cecd3607b469
 EBUILD libexif-0.6.21-r3.ebuild 1340 BLAKE2B 3af2fc92b0ae5c2b004ecb125b21fda1171c0b2318b882b927a8490a6a420d263ff8175fe52def0039d6f9723abc73e95cca7c27ef0104043ca23bff937369b0 SHA512 339383b4ac82b6b907465d08b06b53ec0c6e35bd839918085fcec2f61ff3eb6ffe72c454771703721d9520014c0b8deca317704b24ccd64182a3e477ca1c9ef6
-EBUILD libexif-0.6.22.ebuild 1291 BLAKE2B a42df6993fa399faf7e525951106af6af0818eb7d2f6dcede28ad8e2ebaee0339645036cf72b5449c57c914abfeb7e76b8b7579844c13c0412bb0aacf775da2b SHA512 aa1366b2cbc19028a2e850676d8b59d5125f17e6c80eb9a0e3a88e78279e060dcd6bbbfdba3008b327172480fd6ca60f2a2fb73097787396c9f11ae5fef924c6
+EBUILD libexif-0.6.22.ebuild 1285 BLAKE2B 94bc4fad00f8c4ee923b70e18a875c1b061ead7b067572cadb36f2e7acf6664ce9149161bef4a4a24dad99558c76bc50e6b3e12dc082b5f9ca8ae8eea340d178 SHA512 4b4dd8ff2e2bf256b7791509217ca4c9011ca583668227d5176ca285ec11caaba0febd87234ac0fc5dbf297346d128798b4e7c331ab4e3a6edbe345d1efa1397
 MISC metadata.xml 311 BLAKE2B 0109881067d004082c81401909d6605a6bc792700cabf760db3e62bda628664915647427a3034dbfb52e3f047ce692ec6f279df06dbe76be014c1b676cf796ac SHA512 3b3e7a9c989e72b817e59c9c35ca6cb81dcd00eb27001095f139b1a297f7f1e80d32eee11573344d42881641920aa6a1a2bffc85892f92b347f0d8326d97f7a0
diff --git a/media-libs/libexif/libexif-0.6.22.ebuild b/media-libs/libexif/libexif-0.6.22.ebuild
index 742ffe397dea..a1b021eb878c 100644
--- a/media-libs/libexif/libexif-0.6.22.ebuild
+++ b/media-libs/libexif/libexif-0.6.22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PN}-${PV//./_}-relea
 
 LICENSE="LGPL-2+"
 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 ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="doc nls static-libs"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index 83947497e22e..f9acf8a643bc 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,4 +1,6 @@
 DIST libglvnd-1.3.1.tar.bz2 714436 BLAKE2B 31b91f678b0335a7db3e697129dabd157c37fee0ec0f81f7d0be68ffcf9d6be2989a929f7b1fb87b505168ab4a3cc07b4cecf103f1d5a2a3b866eedb5a3a494b SHA512 99bbe8447f7791c8a4b2ab4e9f3067309ea3ffb9a042b0b5e80d1eac7e6e36af8b5ec56ec3266f34343d705521827956f2fdca27be386f40e130cec300e8342c
-EBUILD libglvnd-1.3.1.ebuild 1427 BLAKE2B 4c677c592779d22a9a5bd0eec7f703d4f9e2f04faa63aaee48bd3812d114cf0bd6544fd9f3181bcad9f1ea3a43a9530e690e721f267811d623398ea58bd4bdf6 SHA512 13add67754576bdc1c410159f4766baf2fb4616792403bfa3fe20c085500f12a64eda0302a3101c0c1dd4f0e5d832e359a18096f2cfb9d77ec7c9276afd3daa1
-EBUILD libglvnd-9999.ebuild 1435 BLAKE2B 749fea4a3780e72e805d8fd8191c1e20768746ea3ed68d6ce60f35257aa8ff77bd6f28a8aabd55919b32e1682b741bb0e55ffa3ac652912e22b9c6cd2d6a31c8 SHA512 a17c76e0c89890a585f1eda6f993b8f0fc3c52a64efe85ab068bb7dfa64a0672226504f7412ee5ff5ed83c5b6bf4953aac3a48a60fe7189731fcb485fc6f7b79
+DIST libglvnd-1.3.2.tar.bz2 715212 BLAKE2B 4f8d32d630a94dbce3d87926a25941fb915f9b1bb8ba167ee7392e32e55b26c5bb80db4000dd11188449f662b810f0c986b6ecf7f4c5ebf05d7a895b0fdb3c82 SHA512 4fea59150a7dd2c710ded26270e74ae73af00cc127d7141fe70e31263fb492c5c43eabc8ab27d5a568d12394a95023c22f1b60968f4c403dcf6ad6202bec508c
+EBUILD libglvnd-1.3.1.ebuild 1554 BLAKE2B 9262984fc8a25aca9a69be941e33f682664f22c6f830e0f9ff8f8e1ede4d0be76faada6bf92a3e3a075681eb4784627e301c66f8bfe117eda703ebc8563ea66f SHA512 f631b6da703bf214d4d03e86a695c586a4dad9f64f93f1038918021097d043abed4bf60978f3e6e52ec4e40f4f6bca49752e41e745f1d601ecb9c0339dc222ef
+EBUILD libglvnd-1.3.2.ebuild 1562 BLAKE2B 0116ea12b00f40491b76f30ddb5e98b9c1b62d4e16df367136fc6673656ca0300f6d9bc7c997fc144fe0b6a7050e7880212d433151f05fec69a43d5e14d32d30 SHA512 1753a9eb0e6f7d62176b9a4af37794d30f31ea3c5a522d44142e42cd981c2ed0c08d89c8cf6a3cd692654f83c16ca90b25ac88b1ab37ec616a2b4a82d4c06349
+EBUILD libglvnd-9999.ebuild 1562 BLAKE2B 0116ea12b00f40491b76f30ddb5e98b9c1b62d4e16df367136fc6673656ca0300f6d9bc7c997fc144fe0b6a7050e7880212d433151f05fec69a43d5e14d32d30 SHA512 1753a9eb0e6f7d62176b9a4af37794d30f31ea3c5a522d44142e42cd981c2ed0c08d89c8cf6a3cd692654f83c16ca90b25ac88b1ab37ec616a2b4a82d4c06349
 MISC metadata.xml 314 BLAKE2B 34c95a3e321c3059bca39c7beb5b7b15e8085b54affb267947fb3676018fa183040a157716e979c5e0381acdea6e738294b37841e75da308c3632fb3587dec33 SHA512 fa12f7fa880b0721baf2eb40b9fd8a68e51c143dd8ede7a199c5afcd5a208f84c51a80fc1f4bc68b266338bac8bf4137b2443d88567150f2c54b2f11913df89c
diff --git a/media-libs/libglvnd/libglvnd-1.3.1.ebuild b/media-libs/libglvnd/libglvnd-1.3.1.ebuild
index 6d4bfd94dd56..a11e7d7b630f 100644
--- a/media-libs/libglvnd/libglvnd-1.3.1.ebuild
+++ b/media-libs/libglvnd/libglvnd-1.3.1.ebuild
@@ -41,6 +41,12 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )"
 
+src_prepare() {
+	default
+	sed -i -e "/^PLATFORM_SYMBOLS/a \    '__gentoo_check_ldflags__'," \
+		bin/symbols-check.py || die
+}
+
 multilib_src_configure() {
 	local emesonargs=(
 		$(meson_feature X x11)
diff --git a/media-libs/libglvnd/libglvnd-1.3.2.ebuild b/media-libs/libglvnd/libglvnd-1.3.2.ebuild
new file mode 100644
index 000000000000..4c976349c6d9
--- /dev/null
+++ b/media-libs/libglvnd/libglvnd-1.3.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+VIRTUALX_REQUIRED=manual
+
+inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1 virtualx
+
+DESCRIPTION="The GL Vendor-Neutral Dispatch library"
+HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	SRC_URI="https://gitlab.freedesktop.org/glvnd/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
+	S=${WORKDIR}/${PN}-v${PV}
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test X"
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
+RDEPEND="
+	!media-libs/mesa[-libglvnd(-)]
+	!<media-libs/mesa-19.2.2
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+
+src_prepare() {
+	default
+	sed -i -e "/^PLATFORM_SYMBOLS/a \    '__gentoo_check_ldflags__'," \
+		bin/symbols-check.py || die
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature X x11)
+		$(meson_feature X glx)
+	)
+	use elibc_musl && emesonargs+=( -Dtls=disabled )
+
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	if use X; then
+		virtx meson_src_test
+	else
+		meson_src_test
+	fi
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/media-libs/libglvnd/libglvnd-9999.ebuild b/media-libs/libglvnd/libglvnd-9999.ebuild
index 772d3cb97ea0..4c976349c6d9 100644
--- a/media-libs/libglvnd/libglvnd-9999.ebuild
+++ b/media-libs/libglvnd/libglvnd-9999.ebuild
@@ -41,6 +41,12 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )"
 
+src_prepare() {
+	default
+	sed -i -e "/^PLATFORM_SYMBOLS/a \    '__gentoo_check_ldflags__'," \
+		bin/symbols-check.py || die
+}
+
 multilib_src_configure() {
 	local emesonargs=(
 		$(meson_feature X x11)
diff --git a/media-libs/libhdhomerun/Manifest b/media-libs/libhdhomerun/Manifest
index d1f6bc8af5f3..fd5e3fe06f08 100644
--- a/media-libs/libhdhomerun/Manifest
+++ b/media-libs/libhdhomerun/Manifest
@@ -2,6 +2,8 @@ AUX 20190621-use_shared_library.patch 524 BLAKE2B 51fa3fa3e8be71ce255b714f4c542e
 AUX dont-strip.patch 596 BLAKE2B 166f289c8e6027ce5c57accf6e2644afe6a275849b178993a37260dfee463b67bd7969e4b2b0365d27aba9da4239a4dc821fe4b9beb0846821312f3f04f29079 SHA512 58906ab0d472f3186f99c14d9fd3c6104b7df1ef9b20f5bb3a334ed357d6cc808ec04609108cc7aab6a1b6ed781624e728bb4f9a14cdc59a5cf84ace591268c6
 DIST libhdhomerun_20150826.tgz 49169 BLAKE2B 6b780d61624e9cca9ca6afbbcdf91377dc134782ee22752c8d92849c6eabac502a3a8a8659035b8a0fd66ae1d7404f6696f78758e0ff4484b46b84ca7282b48f SHA512 9b401c1649dc8c32ea9019b732631f9213cb66c43771aa148fa318202fc11739c005c474be6a77a6a7807818b5179f77debb5b2d2411d865cc87bb3d7ab629a6
 DIST libhdhomerun_20190621.tgz 50817 BLAKE2B 7d4293e38be5283fba5d46cb162ee19d90c30ed63481cd94445a055fa0f80597fdacedd59e35ba4edfb53934ce339e967eb0c42d0ae72289ce7d39eb1f91cd50 SHA512 d15c5b0703bf8ca1f3979a8cad93fc33d87c1309367ad5117354c60112a5505d90e80d4bf9055d16b0eef2b892015c5f4886e6544178090b3550c3a8dbd86576
+DIST libhdhomerun_20200521.tgz 51014 BLAKE2B bca7c09afd16dae9177cf8b8c828827818acf8bc24eff404591178519bd1b568bb8689721b452bf23ae5b37143cf85aa6fbce52177fcfbafcd5e30e6f1ceafce SHA512 ac253923b531a8e1f714b7fb98da5a2a062144c045117a63e5bb16b33a49ccafcffd24f5520d412d15ca55bc1810fc0ecb9ad05e2d7f5a196b5439b4e28d5c23
 EBUILD libhdhomerun-20150826.ebuild 624 BLAKE2B 118b8847494bc537d9ad5a71c06c8f3b704dc574bc0f5a85008e1099c6fa698ac338c8b03684073b1eb552e6bb44292947d02c8ee1fbdcfcfcb18b51bc0e3d8d SHA512 0d0a49bffdc67789ceb896db00191c65e40e2f02b21c9cc4aa5b312c6c1edad217f35509a61488a7d59ea7e5c55894cb67f509cf5b69a28df16c6f7918b530e7
-EBUILD libhdhomerun-20190621.ebuild 735 BLAKE2B d63aa11f27937c958f6ab03ac9802b41eb92723fe0a3d4ba8c31c33fcbcb80efcaaf37085c5c69d3faa929f1e99d0f56d69a3228a85fed37579e29cf59b62c21 SHA512 0548d8af29d0137ed06f018302ea66dd98ea9aeba2787aa91e83872811c86013819ae84a9a22735e3be8561d07c5e800c02c9b66f9c896c9bae35fecdc09e2f6
+EBUILD libhdhomerun-20190621.ebuild 742 BLAKE2B 4b318d87d60e18826d853bc92451f2d4659af5ed915aeb3c596f7fa33e17cb6e7a0ea2b45d53e2f9ed4237b2ddcfeb05a19afe882166c4596ccdf5c531838275 SHA512 d3ae13a413af9e8ad508d1f5834295dfedadfe1047b65fd360d4997c7b58d6c3e533bc66c09738e57261698c1c5630df463e4a063a92bc649acc7a6420d5e72e
+EBUILD libhdhomerun-20200521.ebuild 745 BLAKE2B 24f96b3e66c295f77841d2f6e5fd0bb50aceb6ab549925b82b87129c260eff20a8e49a85060d88a343097bdc47388dec7ef44efa4a7ce6f47744b29f2075497f SHA512 e6519e4fb53f129baef66b52c471cec82ee2380c91bcb70675221628c68792dbd330226cc44d8a5928f2d8707ee14b900713226fd42008c655863c3fc16a7719
 MISC metadata.xml 371 BLAKE2B d947e1bb44b48f4cb0bcdc6670cfc2158ee817b23054232a95dd2065160eef05f9c58120a7f9e8e5601bd28b52f2d3c0e26200d4895b3d9f4fd49c5d419a4632 SHA512 02d0a41cc9695ca052d6d9cef8c513a7e6a93c5048240c85b7f26e2510dd06429fa1ead13fa3052758fb2d8cdbe6dc75dcac98095d6ac451ebce062648cafbca
diff --git a/media-libs/libhdhomerun/libhdhomerun-20190621.ebuild b/media-libs/libhdhomerun/libhdhomerun-20190621.ebuild
index 6ce4dafdd0c8..0d2414e0360f 100644
--- a/media-libs/libhdhomerun/libhdhomerun-20190621.ebuild
+++ b/media-libs/libhdhomerun/libhdhomerun-20190621.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.silicondust.com/hdhomerun/${PN}_${PV}.tgz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 PATCHES=(
 	"${FILESDIR}/${PV}-use_shared_library.patch"
diff --git a/media-libs/libhdhomerun/libhdhomerun-20200521.ebuild b/media-libs/libhdhomerun/libhdhomerun-20200521.ebuild
new file mode 100644
index 000000000000..953fe13103b2
--- /dev/null
+++ b/media-libs/libhdhomerun/libhdhomerun-20200521.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="SiliconDust HDHomeRun Utilties"
+HOMEPAGE="https://www.silicondust.com/support/linux/"
+SRC_URI="https://download.silicondust.com/hdhomerun/${PN}_${PV}.tgz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}/20190621-use_shared_library.patch"
+)
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	default
+	#Remove forced optimization from Makefile
+	sed -i 's:-O2::' Makefile || die "Was the Makefile changed?"
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) STRIP=:
+}
+
+src_install() {
+	dobin hdhomerun_config
+	dolib.so libhdhomerun.so
+
+	insinto /usr/include/hdhomerun
+	doins *.h
+}
diff --git a/media-libs/libpano13/Manifest b/media-libs/libpano13/Manifest
index fafc543eaaba..4d9e351e627e 100644
--- a/media-libs/libpano13/Manifest
+++ b/media-libs/libpano13/Manifest
@@ -1,3 +1,3 @@
 DIST libpano13-2.9.19.tar.gz 3527845 BLAKE2B 59d6b46b75de60a3230eb46e42bbb0f7b8826ac5b84d1dc32d28cc384b6690b258c0c3a6b75d3423a1583daccbd0aecd3f010eb58fb356cae5c54d29e05672f0 SHA512 f9f147426d44d8babac09cb1a1b5111f88b9c2fc079f33df80133492bcf24cbd1edd771e6bec7bed4b0256bf15c700139c0a83119d3adf296ae5c567e006d868
 EBUILD libpano13-2.9.19.ebuild 901 BLAKE2B 5f3ad769bc933c544b99876fb0f1d11d492d54a8ed5a01f20ec9c3e59032c0cabb3b9f28895ee68a1a35b4b19207d5c27b4f636588269121934492713ac6e632 SHA512 0608f468d2c6f4ac0dc57612fd183986a673e9802194f5a7f716f62bf331488070d5c8ea84746c0b4471c2144c8e442a65341170cfc7f636755487e8f4b3cd07
-MISC metadata.xml 246 BLAKE2B 0044f92dfce4879b250fe370954c07fdeec406db6de55844505ef2a930bb27894ac74a33ac3fb3754bb862c76ed5e03e7214597ad01a22d81b3c7f8df1907187 SHA512 bf6e12f289f25afa6c54fd54591808a69365a18ab7a59051fbb7be668a5e2fe4f3b8a8e50410a4518f5022fce6c66fd3231774a28adc8e166d7cb9e242c93e38
+MISC metadata.xml 324 BLAKE2B 04d40b636b02143022e3a5e9d5733a8bb758937d86d0800faf7dcf21b501f97ff8e970e13b5e842492e74f237dfed8f07efb40ce3e952172c41a208196a4cf23 SHA512 40a9330f4bbbfdc98598c5677d7b9ce485fe13e96bfc976f3829e881c5da234e8abc6d5c9e8db7522ba32536d953b2a0daddc878bc09fb474d446139da33f3a6
diff --git a/media-libs/libpano13/metadata.xml b/media-libs/libpano13/metadata.xml
index cf2a5088ea2c..85d1086b8193 100644
--- a/media-libs/libpano13/metadata.xml
+++ b/media-libs/libpano13/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>maekke@gentoo.org</email>
+		<name>Markus Meier</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">panotools</remote-id>
 	</upstream>
diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index d21216308bf8..50b65877ae7f 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -5,7 +5,7 @@ DIST libplacebo-v2.43.0.tar.gz 356219 BLAKE2B b5f36dc4b7a0b35a47efc64064d0d7e9cf
 DIST libplacebo-v2.72.0.tar.gz 396124 BLAKE2B 8a9829add4cb8ffe94c0dc8e3c8f64e465992bb21aa8739086986b061e53fc2f0d00c5a512ad94f0b4998fe3e3bd784c0b8df3bef1ffc5ed92090a75c7e31ad7 SHA512 829d8805f8a52e082bf7c33f5be8a280480aa3cfbac73966cdf4ddaf0a01f25cc357b98a04fe85c82a53718b5d570a852edeafbb0cb12312c73cb23295fb9bd9
 EBUILD libplacebo-1.21.0-r1.ebuild 1323 BLAKE2B 6ecdd7d4492f64a25447be420154212b792ce79688c6551b6fc38eec39258d6946cd9701b4fa2ed032968619b876309375bccd52717b9ff7e3dc0730b7ad0319 SHA512 037369e0c9351435347946635cdd8aad4190bdd6faca193f98bc15a093099709105c8e469869bd2040aac3246adcb9c4eee1341f338ee24ab0dceaee44615a22
 EBUILD libplacebo-1.29.1.ebuild 1369 BLAKE2B 539cd7f857d41ae9e4881b9fd03136e08ff9cc0eea21891f49eb60f16637f42292bcccc7ccb60c1aa800d95467c56f3f8d74969423b44c3d810ee9c89ec65aa9 SHA512 717a952a19637c62d4f21585f47c675c545aec53a3579b209c4ecb5222bbdfd1c4c90b259a7f579cc82d1612aebd437dd744a62588b443456b543c16603a74ef
-EBUILD libplacebo-2.43.0.ebuild 1567 BLAKE2B 8ceafc1a60387029b217a0197676c1c7a227f33267ba13755e3f7a804f10140ea0c8b72820f66b08270c3ac873d3f360f70b2f8d1e331abe5a4770f16319c7c5 SHA512 23044ae8cea34b3d26e963ad4c48916898cb09d5d59e3602caa50fab03d73c9ccade741e1bc6b4e65ed1518e1123bb258f6aa3901398f03ae59c32a49526db99
+EBUILD libplacebo-2.43.0.ebuild 1566 BLAKE2B 4fe703b2fd5fd63a2ca4b68341e35de8d97aaa68407c152ffb202c6d7c05735426c1fceea58063a6fed21f1c78785bd419cedf23efe5455178ae7bac8c97e146 SHA512 63b0013136cda4bb08629b463d1c11a70e36c5502361b1bc76750f251b2f063bca70eac046ea0bb74babe30e852d7b00a2cd3cc885ad476079bf4dd1ae8b3ea1
 EBUILD libplacebo-2.72.0.ebuild 1889 BLAKE2B 6d0724bad61f28633b24a61782774d889ee13f33d0e0942b17651defadb19a9af77a0c8f430e746574bdd38d7b2f107ae9869ec1f3001b5f8fd76fdcda7f70ca SHA512 07d8dc86c3df956a34901bcf0e24a1f4455b1781d1357d636b8e18bfcadd37e3210a97e20f1ff7defbba767192d1bc5e03af735cf753ebbe97102a575a15c326
 EBUILD libplacebo-9999.ebuild 1924 BLAKE2B 5ed7fea860e50f3b0d568518ab853aaa6fe58576f9a2cd53efd5dd36c5d0968b0c927df2894ec8c5b9aabdee77a218d7f9578cfce5b07f601fcbc88da3699812 SHA512 d4d065dabde0e25e18f63afaee3086727667c27de2a510fee1420dcf36608da78864e74a3f4df58eddb72c9bc47b9f1b8e8ff54809a31657ff14d368f38eb8a3
 MISC metadata.xml 807 BLAKE2B f04df70a40523ad668bfa7dda7c841ce098f2105d2bc94ab6291bb194bf1fec18445b779952db33614d685ee0964c7ac6b7666b3d8cf89f8bd9391b1ccd2c553 SHA512 48d5e93ca7e964d80dc579789c6f626f9590d102b451c4f0fced538aed1301e0cb7f93fce4d03deaddb72dcad22489aa3846d8fa8ac443fcdbc4fcb90ef19040
diff --git a/media-libs/libplacebo/libplacebo-2.43.0.ebuild b/media-libs/libplacebo/libplacebo-2.43.0.ebuild
index 13e550979d0e..c8707672c456 100644
--- a/media-libs/libplacebo/libplacebo-2.43.0.ebuild
+++ b/media-libs/libplacebo/libplacebo-2.43.0.ebuild
@@ -7,7 +7,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 ~x86"
 	SRC_URI="https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz"
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
diff --git a/media-libs/libshout/Manifest b/media-libs/libshout/Manifest
index 62b93d8d77a7..5e6412a13735 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 1395 BLAKE2B 7d8b0a49f079d3e3eb814e7c6d13eca9b9562fbe2dc8eb3a7ecdec55ead4db3579ff5a0775fae75fa8eb659fc1446a906c27334525720b4b5902adacca6b7765 SHA512 488ee1e4c4524812f7f856dece390a5a2d73ce318a706f0242339659e1cf1614e8862149b6e5dec6655ffecd41b120c60fe2c313714d7552dde78f50b0c0f9ad
-EBUILD libshout-2.4.2.ebuild 1382 BLAKE2B 209d48ba0721786116ff2b921c5f9036909ed45b448307f0d8936b55f78596ab8d5c95c0fbf1830c06656f2ddbdd6b37c94021a0979c6957180c656259120f51 SHA512 758d5bffedeabec900c37b68258b6a9e92d142799844a1cfee4ba2020bc77ea500aa7d037ae9d55106f913cd61e06cf61beef1439e51ba8dd636685e57dd6d42
-EBUILD libshout-2.4.3.ebuild 1318 BLAKE2B 5099af5f05d87468e6594cfa0a0fa65a93f5a6904173edb999538705d99e2be19cfeab2975ad08081b5eca859bb74e99805e70cbe346a93b9dac173f5fe102c5 SHA512 752051d6db5e17ca86542bed6fd8785ad02b3e798d47599cab431e8cd74097ce8493601e0dc96de23a20b8dd438f1e4fed1769e204c9a7b0735e914fde131d14
+EBUILD libshout-2.4.1-r2.ebuild 1396 BLAKE2B 53e9e648a586d0abb1857e4364278b83365a5d1ebc5e0bb5d2c6bde6f72e0410f4e1dda0827601b713bee93ad8258c80db8aead1a4a086f15a29a0e5ee6f3c57 SHA512 bb887a8f8a04a8671a7e8e3429bd60745e8941339920653b1e105202402e846a99ca87495c1a88f76b0e28e923aa16ee1d55b3aee8dfcc84fe5f06c14c9c4a30
+EBUILD libshout-2.4.2.ebuild 1383 BLAKE2B 5c5567a62579400731e1e1ce748c01629a66d063757eb3d012a6cd9def0cbc14b40929f8f39c53260f2893f4cb614a82e00084826a0e7cc0d604acd60e0aec87 SHA512 39df9f891ac2b163c6cb60c20dc5b4ee2ed41aded6785bf0ae531fd606cc6ea1016d862d5dedf87c25237fcf9be8810be35019363ebbdddbef346b9d6303c6c6
+EBUILD libshout-2.4.3.ebuild 1319 BLAKE2B 904aa7904f0cb650763e4427a2fb50a8574a5a3afdeda7b7108931d989bc3cce19907b85f0ce02be86bf946678c016361527910d9e8676b0efaecb84f4c4475a SHA512 f555c27cad246eedc31c46e5c083ce5f9cb2416b7c3d687b31d32d14129886ecda55c2e61d85dee8e98d00d2c81029636f5d4e778b43a49e72d8e81ee051f93e
 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 3bfd7744c0d7..345c937f291e 100644
--- a/media-libs/libshout/libshout-2.4.1-r2.ebuild
+++ b/media-libs/libshout/libshout-2.4.1-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools multilib-minimal
 
 DESCRIPTION="library for connecting and sending data to icecast servers"
-HOMEPAGE="http://www.icecast.org/"
+HOMEPAGE="https://www.icecast.org/"
 SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
diff --git a/media-libs/libshout/libshout-2.4.2.ebuild b/media-libs/libshout/libshout-2.4.2.ebuild
index c3546dc90190..4a18881e6e10 100644
--- a/media-libs/libshout/libshout-2.4.2.ebuild
+++ b/media-libs/libshout/libshout-2.4.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools multilib-minimal
 
 DESCRIPTION="library for connecting and sending data to icecast servers"
-HOMEPAGE="http://www.icecast.org/"
+HOMEPAGE="https://www.icecast.org/"
 SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
diff --git a/media-libs/libshout/libshout-2.4.3.ebuild b/media-libs/libshout/libshout-2.4.3.ebuild
index 7677ed588858..f55122b4608d 100644
--- a/media-libs/libshout/libshout-2.4.3.ebuild
+++ b/media-libs/libshout/libshout-2.4.3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools multilib-minimal
 
 DESCRIPTION="library for connecting and sending data to icecast servers"
-HOMEPAGE="http://www.icecast.org/"
+HOMEPAGE="https://www.icecast.org/"
 SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index f518b3a93b36..84f6a963404b 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,17 +1,6 @@
-AUX mesa-20.0.4-meson-Specify-the-maximum-required-libdrm-in-dri.pc.patch 1179 BLAKE2B def1a82b31efd5a8aba5bc4869e296ddfa8f54698ba991e8327f3cb6b203cc5af8dd6faab7d43a650c7f0ced27131a58fac743b49452bbeabbb173cbdd65f7f4 SHA512 31ffed8ef5412fdbc478d327f8e6620ef0160628188457ba7934175a732432b6a8b05b91fd8f0bd63575ed219502af874178f9a464d254c3a3a5dc4b74f8680a
-DIST mesa-19.3.5.tar.xz 12064980 BLAKE2B a20ebfb149624f13951795e07154ab70dc1856a7a1261b339b0bdf0009511111756c88439e7b8729f768b0b4b298301b9a3c0c10d7f2fab3abd91649c12ba51c SHA512 413929573fab31e1bb2a1a04c0c770161c2db464a5aab3f0567d27603fff889ede70e1f6e197e7ff1c1639dc4cc543457bcf45761f0f8e6dffafccfa773a4e3f
-DIST mesa-20.0.4.tar.xz 12292888 BLAKE2B a14b747045ee4ff3bc07e527ad43d5b22047d6c9700cf290ba9c95e07bd88b9252bdd14380d4f0033dcb8fb652664987889d972db09462bcc69c8a7e843b606f SHA512 17d8bc3b56779a8e5648d81da9ee97b66bcec015710801edce4e8055fbb314cd9ebc1d112e3035480ba844c7d9ae6b5b1f1eac0cc0817e69e9253a7748451a55
-DIST mesa-20.0.7.tar.xz 12308160 BLAKE2B fac8dffd08ada27080ee4c6f1e0dce69218c8f15b97ca59d9a1dc84098b7d376cea6ccdf05957690beb47a7c2ecfd75497bfa150c7c46a0c509ba37abb0e5359 SHA512 00baae50f14bf2b08b5654dffb11cf67499dc1825e1700b137fb5719e767e0e78e789979df2c194f677ea9c5e531f34965d47b9e37c239944c38d0570c7a9685
 DIST mesa-20.0.8.tar.xz 12360736 BLAKE2B 19e3f8a40b34b5f17ed76077c5d92f728a134b2479c43d86674ed1818ab99639a9b732041f67488251df808564f6abe5b587d756ef9c7c13dcada87cd0fc05de SHA512 d906330c412899907dd05a84034a929107fccaf3044814c4b1f30ba5690cbcf1587b5f17534c6345111f3cb7cf292afd5984a60486643ff6f534b57cec615374
-DIST mesa-20.1.0-rc4.tar.xz 12601932 BLAKE2B a7d02e7f8f155ae1591df8c07aad642109cabfc64c0d015605bc0baa10233830b423e5aa57be23e450628f5ffc6f8655ce3962aecea08504574e54d7b2e1aa01 SHA512 31358470a330294fa4842997cd2e6f00c4ee6cac10d6c264aa673a10d82c29051fea2e83629e2a638b659df4cb17f4e2b9d0fff1c6f6259d07d9db4dbfa10824
-DIST mesa-20.1.0.tar.xz 12661712 BLAKE2B cdd5f1d9167ed2c2d1e4f63d5c8ededbaf3d10fc31a6366535a3424b89137fafa34df29f59443ca97eb071cad502e10fa85c32ca33982018d7a50299130d76c7 SHA512 f49230d18febe1bfd7c6282ab95fc244530f5cef56df0f804d8bece8a70bafcb445b8b83df96ad1b4c5af022c4e39a71f19a8f7e47b1fb09ada2b1a1317ff3be
 DIST mesa-20.1.1.tar.xz 12683180 BLAKE2B de602430ea91076f93b66d1be6da31bd3c74bc194709d36834bac6767c8c2f6047b0930cc070a19293f89a041dc881855ae1f1adedf02284ee4ebc3682487d61 SHA512 a8ae02915305488e5e0d8c104da73df1cdd61ab0b5c5d27a6851c418d25a2c9beeea9cddf93a341afa63cec52d356fe68b194c8c36e78c26f66fa884fc27f147
-EBUILD mesa-19.3.5.ebuild 14865 BLAKE2B d7b0fcc84cf17d248a23f8d3decadaf7e55165bec5a186633d4cfb01b738583e4c7cfa81de5f669445776ee8b10043af8f1328a5918f48529ec9750324e1a155 SHA512 b7132b00f57356a4b244e0a9dd4b618119efa85b539bc0228f8e770b28fb6f1ccfffbe235100748ff2834a674c49bca38b8282b6c2e47d20356349c244b9f6e9
-EBUILD mesa-20.0.4-r1.ebuild 14877 BLAKE2B b7221bc6c6c564f5621d19d01c7412fdf8b734304b3469b757f9fed0fe9aa67330eab2ab6e2b8595cfe6cc4b019474118cf50b0c7b156948f0ee8c5bec1ee167 SHA512 8ca4b2b70f08775a2fce7c857cb64fc5cdf5e10075e4b5d3723535380024585a17a34cd344ec5de47acb404acc9af76171f7e97c6f54354a8da2d78135cecbf2
-EBUILD mesa-20.0.7.ebuild 14914 BLAKE2B 0593a1fefdfa89754eb0b9880dd555b286ac9efdaa91d93a31e711ea0ef36686773f7449b33c933c23e614167764937978c8bae95e7682c712fd817b741fb4c9 SHA512 5e904f7560f0766ba1c72834e59c8353eb409f3f14d0f0df3275fd2b5a0d5fb6640e02bd1991cd15527747016663ec2bab5bc2e16e77dab2d567f7a18b03c0c0
-EBUILD mesa-20.0.8.ebuild 14908 BLAKE2B 63ebdb72ac3300968c253175282946c5497f9f07a90103df6d1b9d014920a99cfd5566ae7e5856bde9308a7f643db67cf42cc06899e985376f4fdca86fc7086f SHA512 b429df8009f73da07436028d76a74dd829b24696cd387f74ee98cd26d8ecd1fc0ecd62e46d21fd8881e6707389ec1ab1d96a9f0046d0e3be61502cd8e4956511
-EBUILD mesa-20.1.0.ebuild 14963 BLAKE2B 22006871378002e152a19853c37776d37576b644439836676ec21ac536a49c86f70b00bfd3815547ca5c2a967a40e9e7554589db69a75ded004d25b3aee64342 SHA512 7ff9297ebf9f9c68aa6d499824346f548e3369f17e585f63aaf5f0bb3dd235b2af9e210d60ad272a5e6261544e2818a32d7893e59123b13aa959864fe83592f3
-EBUILD mesa-20.1.0_rc4.ebuild 14914 BLAKE2B 0593a1fefdfa89754eb0b9880dd555b286ac9efdaa91d93a31e711ea0ef36686773f7449b33c933c23e614167764937978c8bae95e7682c712fd817b741fb4c9 SHA512 5e904f7560f0766ba1c72834e59c8353eb409f3f14d0f0df3275fd2b5a0d5fb6640e02bd1991cd15527747016663ec2bab5bc2e16e77dab2d567f7a18b03c0c0
+EBUILD mesa-20.0.8.ebuild 14906 BLAKE2B 6028e9a21a6a7953c705c930aab1097b9aa2336909e893174de4a96cbff442cc79110c04665cf44817e0dcf6103d9410a9ba3d530a2e6cb8327469fa1f3e2766 SHA512 89150f95c9bbf318ab327b637ba630d76e85d0e5d2c827d010744d536a581633aef5929f6b13585161a8f61acf0de38ee801da3e28665ccfbe3f76bf64ef6ca9
 EBUILD mesa-20.1.1.ebuild 14963 BLAKE2B 22006871378002e152a19853c37776d37576b644439836676ec21ac536a49c86f70b00bfd3815547ca5c2a967a40e9e7554589db69a75ded004d25b3aee64342 SHA512 7ff9297ebf9f9c68aa6d499824346f548e3369f17e585f63aaf5f0bb3dd235b2af9e210d60ad272a5e6261544e2818a32d7893e59123b13aa959864fe83592f3
-EBUILD mesa-9999.ebuild 14963 BLAKE2B 22006871378002e152a19853c37776d37576b644439836676ec21ac536a49c86f70b00bfd3815547ca5c2a967a40e9e7554589db69a75ded004d25b3aee64342 SHA512 7ff9297ebf9f9c68aa6d499824346f548e3369f17e585f63aaf5f0bb3dd235b2af9e210d60ad272a5e6261544e2818a32d7893e59123b13aa959864fe83592f3
-MISC metadata.xml 1989 BLAKE2B 239b50a1ebb1c70411ec31b3c1c2b85aa620f3ea7e0fcc104b3bdf9c1062df46948eeddbb5dc06258664b0a5c962d2af62d9d7f29091a82540ce170e2b1a3d21 SHA512 e8404153aa7d82b7c459afbab6483cb70372e3c69e366f71e3953d26a9299e5a82fc249751ba83a2a61329dae68e2aebb67d7989ea59fc2eb81c3d5c008ed2c0
+EBUILD mesa-9999.ebuild 14944 BLAKE2B a895cfa89de0912183fe1df8beaf09e9f428b87d21896278ad545506611f824ff61230cf2ab4bda1ac819fc4e379893a2dac63a7e9c13dc51ba15cbc5111ce45 SHA512 a6e52ff996da72b1af1d963f790af370861bb0fd07af97267f48c9d999ed2dcf79f69c77bb38559350d9bd83306890fb9e3752dbfba2e272456c4035ccef325c
+MISC metadata.xml 1876 BLAKE2B 83fc9abae54194bb0c9794a5ac0e663b31919bd0054ae8a0b48f1cebb67c5af7c0c4e92cfecbe7e8f56890a97c6769b7412a705c41e33eeec590277aaf666f90 SHA512 7caa29712af56b9d9cd3ff81ea2afccf8703d7e3c47cab10310d04db35356c5e0955c1f6dfa45280b51169708d381d82470b142b974990446eb792c46aa9d8b1
diff --git a/media-libs/mesa/files/mesa-20.0.4-meson-Specify-the-maximum-required-libdrm-in-dri.pc.patch b/media-libs/mesa/files/mesa-20.0.4-meson-Specify-the-maximum-required-libdrm-in-dri.pc.patch
deleted file mode 100644
index 09897526a65c..000000000000
--- a/media-libs/mesa/files/mesa-20.0.4-meson-Specify-the-maximum-required-libdrm-in-dri.pc.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 316b352e946a9993a20f28abc741d34455a957a8 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Mon, 13 Apr 2020 09:20:18 -0700
-Subject: [PATCH] meson: Specify the maximum required libdrm in dri.pc
-
-When dealing with a regression in libdrm-2.4.101, I masked the package
-in Gentoo. In doing so, we discovered that Mesa's dri.pc specifies a
-version requirement in dri.pc for >= the version of libdrm Mesa was
-built against, thus preventing packages from being rebuilt with the
-older version of libdrm installed.
-
-Let's reduce this version requirement to the latest libdrm required by
-Mesa instead, since libdrm is backward compatible.
----
- src/mesa/drivers/dri/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build
-index acf7d2eb128..b09ca16e38a 100644
---- a/src/mesa/drivers/dri/meson.build
-+++ b/src/mesa/drivers/dri/meson.build
-@@ -86,7 +86,7 @@ endif
- if with_dri
-   dri_req_private = []
-   if dep_libdrm.found()
--    dri_req_private = ['libdrm >= ' + dep_libdrm.version()]
-+    dri_req_private = ['libdrm >= ' + _drm_ver]
-   endif
- 
-   pkg.generate(
--- 
-2.24.1
-
diff --git a/media-libs/mesa/mesa-19.3.5.ebuild b/media-libs/mesa/mesa-19.3.5.ebuild
deleted file mode 100644
index 734d4a391c51..000000000000
--- a/media-libs/mesa/mesa-19.3.5.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} )
-
-inherit llvm meson multilib-minimal pax-utils python-any-r1 linux-info
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
-	lm-sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind
-	vdpau vulkan vulkan-overlay wayland +X xa xvmc"
-
-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 )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
-RDEPEND="
-	!app-eselect/eselect-mesa
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	libglvnd? (
-		>=media-libs/libglvnd-1.2.0-r1[X?,${MULTILIB_USEDEP}]
-		!app-eselect/eselect-opengl
-	)
-	!libglvnd? (
-		>=app-eselect/eselect-opengl-1.3.0
-	)
-	gallium? (
-		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-		llvm? (
-			video_cards_radeonsi? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_r600? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_radeon? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-		)
-		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-		opencl? (
-					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
-					dev-libs/libclc
-					virtual/libelf:0=[${MULTILIB_USEDEP}]
-				)
-		vaapi? (
-			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-		)
-		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	)
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="9"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:9[${MULTILIB_USEDEP}]
-		sys-devel/llvm:8[${MULTILIB_USEDEP}]
-	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	gallium? (
-		llvm? (
-			opencl? (
-				video_cards_r600? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${CLANG_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${CLANG_DEPSTR}
-						)
-					)
-				)
-			)
-			!opencl? (
-				video_cards_r600? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${LLVM_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${LLVM_DEPSTR}
-						)
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.1.0
-	usr/lib*/libGLESv2.so.2.0.0
-	usr/lib*/libGL.so.1.2.0
-	usr/lib*/libOSMesa.so.8.0.0
-	libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 )
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use gallium; then
-		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
-		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
-		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
-		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
-		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
-		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
-		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-}
-
-python_check_deps() {
-	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	# os_same_file_description requires the kcmp syscall,
-	# which is only available with CONFIG_CHECKPOINT_RESTORE=y.
-	# Currently only AMDGPU utilizes this function, so only AMDGPU users would
-	# get a spooky warning message if the syscall fails.
-	if use gallium && use video_cards_radeonsi; then
-		CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		linux-info_pkg_setup
-	fi
-
-	if use gallium && use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	if use classic; then
-		# Intel code
-		dri_driver_enable video_cards_i915 i915
-		dri_driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			dri_driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		dri_driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		dri_driver_enable video_cards_r100 r100
-		dri_driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-			! use video_cards_r200; then
-			dri_driver_enable video_cards_radeon r100 r200
-		fi
-	fi
-
-	emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo "wayland,")$(use gbm && echo "drm,")surfaceless )
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_use llvm)
-			$(meson_use lm-sensors lmsensors)
-			$(meson_use unwind libunwind)
-		)
-
-		if use video_cards_iris ||
-		   use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use d3d9 gallium-nine))
-		else
-			emesonargs+=(-Dgallium-nine=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-		else
-			emesonargs+=(-Dgallium-va=false)
-		fi
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vdpau gallium-vdpau))
-		else
-			emesonargs+=(-Dgallium-vdpau=false)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use xa gallium-xa))
-		else
-			emesonargs+=(-Dgallium-xa=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use xvmc gallium-xvmc))
-		else
-			emesonargs+=(-Dgallium-xvmc=false)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_lima ||
-		   use video_cards_panfrost ||
-		   use video_cards_vc4 ||
-		   use video_cards_vivante; then
-			gallium_enable -- kmsro
-		fi
-
-		gallium_enable video_cards_lima lima
-		gallium_enable video_cards_panfrost panfrost
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-
-		# Only one i915 driver (classic vs gallium). Default to classic.
-		if ! use classic; then
-			gallium_enable video_cards_i915 i915
-			if ! use video_cards_i915 && \
-				! use video_cards_i965; then
-				gallium_enable video_cards_intel i915
-			fi
-		fi
-
-		gallium_enable video_cards_iris iris
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-			! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_iris intel
-		vulkan_enable video_cards_radeonsi amd
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
-	fi
-
-	if use gallium; then
-		gallium_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
-	else
-		dri_driver_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=true
-		$(meson_use dri3)
-		$(meson_use egl)
-		$(meson_use gbm)
-		$(meson_use gles1)
-		$(meson_use gles2)
-		$(meson_use libglvnd glvnd)
-		$(meson_use selinux)
-		-Dvalgrind=$(usex valgrind auto false)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		$(meson_use vulkan-overlay vulkan-overlay-layer)
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-
-	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/pkgconfig/{egl,gl}.pc
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson test -v -C "${BUILD_DIR}" -t 100
-}
-
-pkg_postinst() {
-	if ! use libglvnd; then
-		# Switch to the xorg implementation.
-		echo
-		eselect opengl set --use-old ${OPENGL_DIR}
-	fi
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		DRI_DRIVERS+=("$@")
-	fi
-}
-
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-20.0.4-r1.ebuild b/media-libs/mesa/mesa-20.0.4-r1.ebuild
deleted file mode 100644
index 097105ff4c5b..000000000000
--- a/media-libs/mesa/mesa-20.0.4-r1.ebuild
+++ /dev/null
@@ -1,557 +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 llvm meson multilib-minimal python-any-r1 linux-info
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
-	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa xvmc +zstd"
-
-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 )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
-RDEPEND="
-	!app-eselect/eselect-mesa
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	libglvnd? (
-		>=media-libs/libglvnd-1.2.0-r1[X?,${MULTILIB_USEDEP}]
-		!app-eselect/eselect-opengl
-	)
-	!libglvnd? (
-		>=app-eselect/eselect-opengl-1.3.0
-	)
-	gallium? (
-		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-		llvm? (
-			video_cards_radeonsi? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_r600? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_radeon? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-		)
-		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-		opencl? (
-					>=virtual/opencl-3[${MULTILIB_USEDEP}]
-					dev-libs/libclc
-					virtual/libelf:0=[${MULTILIB_USEDEP}]
-				)
-		vaapi? (
-			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-		)
-		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	)
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="9"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:9[${MULTILIB_USEDEP}]
-		sys-devel/llvm:8[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	gallium? (
-		llvm? (
-			opencl? (
-				video_cards_r600? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${CLANG_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${CLANG_DEPSTR}
-						)
-					)
-				)
-			)
-			!opencl? (
-				video_cards_r600? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${LLVM_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${LLVM_DEPSTR}
-						)
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.1.0
-	usr/lib*/libGLESv2.so.2.0.0
-	usr/lib*/libGL.so.1.2.0
-	usr/lib*/libOSMesa.so.8.0.0
-	libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 )
-)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-meson-Specify-the-maximum-required-libdrm-in-dri.pc.patch
-)
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use gallium; then
-		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
-		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
-		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
-		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
-		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
-		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
-		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-}
-
-python_check_deps() {
-	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	# os_same_file_description requires the kcmp syscall,
-	# which is only available with CONFIG_CHECKPOINT_RESTORE=y.
-	# Currently only AMDGPU utilizes this function, so only AMDGPU users would
-	# get a spooky warning message if the syscall fails.
-	if use gallium && use video_cards_radeonsi; then
-		CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		linux-info_pkg_setup
-	fi
-
-	if use gallium && use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	if use classic; then
-		# Intel code
-		dri_driver_enable video_cards_i915 i915
-		dri_driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			dri_driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		dri_driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		dri_driver_enable video_cards_r100 r100
-		dri_driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-			! use video_cards_r200; then
-			dri_driver_enable video_cards_radeon r100 r200
-		fi
-	fi
-
-	emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo "wayland,")$(use gbm && echo "drm,")surfaceless )
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_use llvm)
-			$(meson_use lm-sensors lmsensors)
-			$(meson_use unwind libunwind)
-		)
-
-		if use video_cards_iris ||
-		   use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use d3d9 gallium-nine))
-		else
-			emesonargs+=(-Dgallium-nine=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-		else
-			emesonargs+=(-Dgallium-va=false)
-		fi
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vdpau gallium-vdpau))
-		else
-			emesonargs+=(-Dgallium-vdpau=false)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use xa gallium-xa))
-		else
-			emesonargs+=(-Dgallium-xa=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use xvmc gallium-xvmc))
-		else
-			emesonargs+=(-Dgallium-xvmc=false)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_lima ||
-		   use video_cards_panfrost ||
-		   use video_cards_vc4 ||
-		   use video_cards_vivante; then
-			gallium_enable -- kmsro
-		fi
-
-		gallium_enable video_cards_lima lima
-		gallium_enable video_cards_panfrost panfrost
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-
-		# Only one i915 driver (classic vs gallium). Default to classic.
-		if ! use classic; then
-			gallium_enable video_cards_i915 i915
-			if ! use video_cards_i915 && \
-				! use video_cards_i965; then
-				gallium_enable video_cards_intel i915
-			fi
-		fi
-
-		gallium_enable video_cards_iris iris
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-			! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_iris intel
-		vulkan_enable video_cards_radeonsi amd
-	fi
-
-	if use gallium; then
-		gallium_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
-	else
-		dri_driver_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=true
-		$(meson_use dri3)
-		$(meson_use egl)
-		$(meson_use gbm)
-		$(meson_use gles1)
-		$(meson_use gles2)
-		$(meson_use libglvnd glvnd)
-		$(meson_use selinux)
-		$(meson_use zstd)
-		-Dvalgrind=$(usex valgrind auto false)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		$(meson_use vulkan-overlay vulkan-overlay-layer)
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-
-	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/pkgconfig/{egl,gl}.pc
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson test -v -C "${BUILD_DIR}" -t 100
-}
-
-pkg_postinst() {
-	if ! use libglvnd; then
-		# Switch to the xorg implementation.
-		echo
-		eselect opengl set --use-old ${OPENGL_DIR}
-	fi
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		DRI_DRIVERS+=("$@")
-	fi
-}
-
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-20.0.7.ebuild b/media-libs/mesa/mesa-20.0.7.ebuild
deleted file mode 100644
index ff719014070b..000000000000
--- a/media-libs/mesa/mesa-20.0.7.ebuild
+++ /dev/null
@@ -1,559 +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 llvm meson multilib-minimal python-any-r1 linux-info
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
-	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa xvmc +zstd"
-
-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_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 )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
-RDEPEND="
-	!app-eselect/eselect-mesa
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	libglvnd? (
-		>=media-libs/libglvnd-1.2.0-r1[X?,${MULTILIB_USEDEP}]
-		!app-eselect/eselect-opengl
-	)
-	!libglvnd? (
-		>=app-eselect/eselect-opengl-1.3.0
-	)
-	gallium? (
-		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-		llvm? (
-			video_cards_radeonsi? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_r600? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_radeon? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-		)
-		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-		opencl? (
-					>=virtual/opencl-3[${MULTILIB_USEDEP}]
-					dev-libs/libclc
-					virtual/libelf:0=[${MULTILIB_USEDEP}]
-				)
-		vaapi? (
-			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-		)
-		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	)
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="10"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:10[${MULTILIB_USEDEP}]
-		sys-devel/llvm:9[${MULTILIB_USEDEP}]
-		sys-devel/llvm:8[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	gallium? (
-		llvm? (
-			opencl? (
-				video_cards_r600? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${CLANG_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${CLANG_DEPSTR}
-						)
-					)
-				)
-			)
-			!opencl? (
-				video_cards_r600? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${LLVM_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${LLVM_DEPSTR}
-						)
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.1.0
-	usr/lib*/libGLESv2.so.2.0.0
-	usr/lib*/libGL.so.1.2.0
-	usr/lib*/libOSMesa.so.8.0.0
-	libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 )
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_i965 &&
-		   ! use video_cards_iris &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, or radeonsi"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use gallium; then
-		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
-		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
-		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
-		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
-		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
-		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
-		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-}
-
-python_check_deps() {
-	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	# os_same_file_description requires the kcmp syscall,
-	# which is only available with CONFIG_CHECKPOINT_RESTORE=y.
-	# Currently only AMDGPU utilizes this function, so only AMDGPU users would
-	# get a spooky warning message if the syscall fails.
-	if use gallium && use video_cards_radeonsi; then
-		CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		linux-info_pkg_setup
-	fi
-
-	if use gallium && use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	if use classic; then
-		# Intel code
-		dri_driver_enable video_cards_i915 i915
-		dri_driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			dri_driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		dri_driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		dri_driver_enable video_cards_r100 r100
-		dri_driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-			! use video_cards_r200; then
-			dri_driver_enable video_cards_radeon r100 r200
-		fi
-	fi
-
-	emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo "wayland,")$(use gbm && echo "drm,")surfaceless )
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_use llvm)
-			$(meson_use lm-sensors lmsensors)
-			$(meson_use unwind libunwind)
-		)
-
-		if use video_cards_iris ||
-		   use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use d3d9 gallium-nine))
-		else
-			emesonargs+=(-Dgallium-nine=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-		else
-			emesonargs+=(-Dgallium-va=false)
-		fi
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vdpau gallium-vdpau))
-		else
-			emesonargs+=(-Dgallium-vdpau=false)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use xa gallium-xa))
-		else
-			emesonargs+=(-Dgallium-xa=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use xvmc gallium-xvmc))
-		else
-			emesonargs+=(-Dgallium-xvmc=false)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_lima ||
-		   use video_cards_panfrost ||
-		   use video_cards_vc4 ||
-		   use video_cards_vivante; then
-			gallium_enable -- kmsro
-		fi
-
-		gallium_enable video_cards_lima lima
-		gallium_enable video_cards_panfrost panfrost
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-
-		# Only one i915 driver (classic vs gallium). Default to classic.
-		if ! use classic; then
-			gallium_enable video_cards_i915 i915
-			if ! use video_cards_i915 && \
-				! use video_cards_i965; then
-				gallium_enable video_cards_intel i915
-			fi
-		fi
-
-		gallium_enable video_cards_iris iris
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-			! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_iris intel
-		vulkan_enable video_cards_radeonsi amd
-	fi
-
-	if use gallium; then
-		gallium_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
-	else
-		dri_driver_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=true
-		$(meson_use dri3)
-		$(meson_use egl)
-		$(meson_use gbm)
-		$(meson_use gles1)
-		$(meson_use gles2)
-		$(meson_use libglvnd glvnd)
-		$(meson_use selinux)
-		$(meson_use zstd)
-		-Dvalgrind=$(usex valgrind auto false)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		$(meson_use vulkan-overlay vulkan-overlay-layer)
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson test -v -C "${BUILD_DIR}" -t 100
-}
-
-pkg_postinst() {
-	if ! use libglvnd; then
-		# Switch to the xorg implementation.
-		echo
-		eselect opengl set --use-old ${OPENGL_DIR}
-	fi
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		DRI_DRIVERS+=("$@")
-	fi
-}
-
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-20.0.8.ebuild b/media-libs/mesa/mesa-20.0.8.ebuild
index 8b592738e83d..48dbdd650ef2 100644
--- a/media-libs/mesa/mesa-20.0.8.ebuild
+++ b/media-libs/mesa/mesa-20.0.8.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/mesa/mesa-20.1.0.ebuild b/media-libs/mesa/mesa-20.1.0.ebuild
deleted file mode 100644
index 00b4050b4e80..000000000000
--- a/media-libs/mesa/mesa-20.1.0.ebuild
+++ /dev/null
@@ -1,560 +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 llvm meson multilib-minimal python-any-r1 linux-info
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
-	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa xvmc +zstd"
-
-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_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 )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
-RDEPEND="
-	!app-eselect/eselect-mesa
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	libglvnd? (
-		>=media-libs/libglvnd-1.2.0-r1[X?,${MULTILIB_USEDEP}]
-		!app-eselect/eselect-opengl
-	)
-	!libglvnd? (
-		>=app-eselect/eselect-opengl-1.3.0
-	)
-	gallium? (
-		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-		llvm? (
-			video_cards_radeonsi? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_r600? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_radeon? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-		)
-		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-		opencl? (
-					>=virtual/opencl-3[${MULTILIB_USEDEP}]
-					dev-libs/libclc
-					virtual/libelf:0=[${MULTILIB_USEDEP}]
-				)
-		vaapi? (
-			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-		)
-		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	)
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="10"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:10[${MULTILIB_USEDEP}]
-		sys-devel/llvm:9[${MULTILIB_USEDEP}]
-		sys-devel/llvm:8[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	gallium? (
-		llvm? (
-			opencl? (
-				video_cards_r600? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${CLANG_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${CLANG_DEPSTR}
-						)
-					)
-				)
-			)
-			!opencl? (
-				video_cards_r600? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${LLVM_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${LLVM_DEPSTR}
-						)
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.1.0
-	usr/lib*/libGLESv2.so.2.0.0
-	usr/lib*/libGL.so.1.2.0
-	usr/lib*/libOSMesa.so.8.0.0
-	libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 )
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_i965 &&
-		   ! use video_cards_iris &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, or radeonsi"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use gallium; then
-		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
-		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
-		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
-		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
-		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
-		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
-		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-}
-
-python_check_deps() {
-	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	# os_same_file_description requires the kcmp syscall,
-	# which is only available with CONFIG_CHECKPOINT_RESTORE=y.
-	# Currently only AMDGPU utilizes this function, so only AMDGPU users would
-	# get a spooky warning message if the syscall fails.
-	if use gallium && use video_cards_radeonsi; then
-		CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		linux-info_pkg_setup
-	fi
-
-	if use gallium && use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	if use classic; then
-		# Intel code
-		dri_driver_enable video_cards_i915 i915
-		dri_driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			dri_driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		dri_driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		dri_driver_enable video_cards_r100 r100
-		dri_driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-			! use video_cards_r200; then
-			dri_driver_enable video_cards_radeon r100 r200
-		fi
-	fi
-
-	emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo "wayland,")$(use gbm && echo "drm,")surfaceless )
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_use llvm)
-			$(meson_use lm-sensors lmsensors)
-			$(meson_use unwind libunwind)
-		)
-
-		if use video_cards_iris ||
-		   use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use d3d9 gallium-nine))
-		else
-			emesonargs+=(-Dgallium-nine=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-		else
-			emesonargs+=(-Dgallium-va=false)
-		fi
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vdpau gallium-vdpau))
-		else
-			emesonargs+=(-Dgallium-vdpau=false)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use xa gallium-xa))
-		else
-			emesonargs+=(-Dgallium-xa=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use xvmc gallium-xvmc))
-		else
-			emesonargs+=(-Dgallium-xvmc=false)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_lima ||
-		   use video_cards_panfrost ||
-		   use video_cards_vc4 ||
-		   use video_cards_vivante; then
-			gallium_enable -- kmsro
-		fi
-
-		gallium_enable video_cards_lima lima
-		gallium_enable video_cards_panfrost panfrost
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-
-		# Only one i915 driver (classic vs gallium). Default to classic.
-		if ! use classic; then
-			gallium_enable video_cards_i915 i915
-			if ! use video_cards_i915 && \
-				! use video_cards_i965; then
-				gallium_enable video_cards_intel i915
-			fi
-		fi
-
-		gallium_enable video_cards_iris iris
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-			! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_iris intel
-		vulkan_enable video_cards_radeonsi amd
-	fi
-
-	if use gallium; then
-		gallium_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
-	else
-		dri_driver_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=true
-		$(meson_use dri3)
-		$(meson_use egl)
-		$(meson_use gbm)
-		$(meson_use gles1)
-		$(meson_use gles2)
-		$(meson_use libglvnd glvnd)
-		$(meson_use selinux)
-		$(meson_use zstd)
-		-Dvalgrind=$(usex valgrind auto false)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		$(meson_use vulkan vulkan-device-select-layer)
-		$(meson_use vulkan-overlay vulkan-overlay-layer)
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson test -v -C "${BUILD_DIR}" -t 100
-}
-
-pkg_postinst() {
-	if ! use libglvnd; then
-		# Switch to the xorg implementation.
-		echo
-		eselect opengl set --use-old ${OPENGL_DIR}
-	fi
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		DRI_DRIVERS+=("$@")
-	fi
-}
-
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-20.1.0_rc4.ebuild b/media-libs/mesa/mesa-20.1.0_rc4.ebuild
deleted file mode 100644
index ff719014070b..000000000000
--- a/media-libs/mesa/mesa-20.1.0_rc4.ebuild
+++ /dev/null
@@ -1,559 +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 llvm meson multilib-minimal python-any-r1 linux-info
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
-	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa xvmc +zstd"
-
-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_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 )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
-RDEPEND="
-	!app-eselect/eselect-mesa
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	libglvnd? (
-		>=media-libs/libglvnd-1.2.0-r1[X?,${MULTILIB_USEDEP}]
-		!app-eselect/eselect-opengl
-	)
-	!libglvnd? (
-		>=app-eselect/eselect-opengl-1.3.0
-	)
-	gallium? (
-		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-		llvm? (
-			video_cards_radeonsi? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_r600? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_radeon? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-		)
-		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-		opencl? (
-					>=virtual/opencl-3[${MULTILIB_USEDEP}]
-					dev-libs/libclc
-					virtual/libelf:0=[${MULTILIB_USEDEP}]
-				)
-		vaapi? (
-			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-		)
-		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	)
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="10"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:10[${MULTILIB_USEDEP}]
-		sys-devel/llvm:9[${MULTILIB_USEDEP}]
-		sys-devel/llvm:8[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	gallium? (
-		llvm? (
-			opencl? (
-				video_cards_r600? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${CLANG_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${CLANG_DEPSTR}
-						)
-					)
-				)
-			)
-			!opencl? (
-				video_cards_r600? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${LLVM_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${LLVM_DEPSTR}
-						)
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.1.0
-	usr/lib*/libGLESv2.so.2.0.0
-	usr/lib*/libGL.so.1.2.0
-	usr/lib*/libOSMesa.so.8.0.0
-	libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 )
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_i965 &&
-		   ! use video_cards_iris &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, or radeonsi"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use gallium; then
-		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
-		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
-		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
-		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
-		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
-		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
-		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-}
-
-python_check_deps() {
-	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	# os_same_file_description requires the kcmp syscall,
-	# which is only available with CONFIG_CHECKPOINT_RESTORE=y.
-	# Currently only AMDGPU utilizes this function, so only AMDGPU users would
-	# get a spooky warning message if the syscall fails.
-	if use gallium && use video_cards_radeonsi; then
-		CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		linux-info_pkg_setup
-	fi
-
-	if use gallium && use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	if use classic; then
-		# Intel code
-		dri_driver_enable video_cards_i915 i915
-		dri_driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			dri_driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		dri_driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		dri_driver_enable video_cards_r100 r100
-		dri_driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-			! use video_cards_r200; then
-			dri_driver_enable video_cards_radeon r100 r200
-		fi
-	fi
-
-	emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo "wayland,")$(use gbm && echo "drm,")surfaceless )
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_use llvm)
-			$(meson_use lm-sensors lmsensors)
-			$(meson_use unwind libunwind)
-		)
-
-		if use video_cards_iris ||
-		   use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use d3d9 gallium-nine))
-		else
-			emesonargs+=(-Dgallium-nine=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-		else
-			emesonargs+=(-Dgallium-va=false)
-		fi
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vdpau gallium-vdpau))
-		else
-			emesonargs+=(-Dgallium-vdpau=false)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use xa gallium-xa))
-		else
-			emesonargs+=(-Dgallium-xa=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use xvmc gallium-xvmc))
-		else
-			emesonargs+=(-Dgallium-xvmc=false)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_lima ||
-		   use video_cards_panfrost ||
-		   use video_cards_vc4 ||
-		   use video_cards_vivante; then
-			gallium_enable -- kmsro
-		fi
-
-		gallium_enable video_cards_lima lima
-		gallium_enable video_cards_panfrost panfrost
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-
-		# Only one i915 driver (classic vs gallium). Default to classic.
-		if ! use classic; then
-			gallium_enable video_cards_i915 i915
-			if ! use video_cards_i915 && \
-				! use video_cards_i965; then
-				gallium_enable video_cards_intel i915
-			fi
-		fi
-
-		gallium_enable video_cards_iris iris
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-			! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_iris intel
-		vulkan_enable video_cards_radeonsi amd
-	fi
-
-	if use gallium; then
-		gallium_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
-	else
-		dri_driver_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=true
-		$(meson_use dri3)
-		$(meson_use egl)
-		$(meson_use gbm)
-		$(meson_use gles1)
-		$(meson_use gles2)
-		$(meson_use libglvnd glvnd)
-		$(meson_use selinux)
-		$(meson_use zstd)
-		-Dvalgrind=$(usex valgrind auto false)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		$(meson_use vulkan-overlay vulkan-overlay-layer)
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson test -v -C "${BUILD_DIR}" -t 100
-}
-
-pkg_postinst() {
-	if ! use libglvnd; then
-		# Switch to the xorg implementation.
-		echo
-		eselect opengl set --use-old ${OPENGL_DIR}
-	fi
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		DRI_DRIVERS+=("$@")
-	fi
-}
-
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 00b4050b4e80..29a60e1a14fd 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -228,7 +228,6 @@ BDEPEND="
 	)
 	sys-devel/bison
 	sys-devel/flex
-	sys-devel/gettext
 	virtual/pkgconfig
 	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
 "
diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index a50cb625e992..d2020b8e602b 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -19,7 +19,6 @@
 		<flag name="lm-sensors">Enable Gallium HUD lm-sensors support.</flag>
 		<flag name="opencl">Enable the Clover Gallium OpenCL state tracker.</flag>
 		<flag name="osmesa">Build the Mesa library for off-screen rendering.</flag>
-		<flag name="pax_kernel">Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
 		<flag name="valgrind">Compile in valgrind memory hints</flag>
 		<flag name="vdpau">Enable the VDPAU acceleration interface for the Gallium3D Video Layer.</flag>
 		<flag name="vulkan">Enable Vulkan drivers</flag>
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 055baf23d471..37cb176cb012 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,34 +1,12 @@
-AUX opencv-2.3.1a-libav-0.7.patch 415 BLAKE2B f3aecdeae8c558edbca610d380a2c0862f2c69f8104b63564d3a07f9494dd474cfeee15438086c6e2abb74821ac482ebdeb896e2aac96d69088f089273cdd7f2 SHA512 b17466470a47876e1a8434367f47ce13ec989bdc35ec707d87188187e08b8ccca6af4c5563f20b3170758582b500323030cff22961a7fbbc6b4843d8bb808f1e
-AUX opencv-2.4.13-gcc-6.0.patch 1068 BLAKE2B cfbb70e2e3e9909fe8b37705faf51f88e754751e66073a767aa943144827817c2cfe1b84778ed6d3f7774de066a7aba76f070d621806d0f00065d7f6c1768a2e SHA512 b5dced5d0816d7560c827db06000e770de22b0b3a703ab078bf1cdde4202a5bbe223e5021c9d0e99eeb93c7622a89b9fa03e5ae8bd4a8d3b2df12f014b7e5ca9
-AUX opencv-2.4.13-imgcodecs-refactoring.patch 19899 BLAKE2B 106e5426091f3072b108d9750a6273f5201f77e190cbfba6e3a77da0b3cdfc2f83e276e1ff0506374ea1c4914314e036e921cf9324eb47eebff9f6a474c5f6c9 SHA512 2fae29c7190930f1a2657641d42e0484d4ce6a4562d52cd1522b3b4e9d56468ef7b3d313088270fbb778e5f412f02e149164c38174d95e397e9f2b7d5a1b404b
-AUX opencv-2.4.2-cflags.patch 742 BLAKE2B 15e523b500028cd5483a9eae16f3a200937876214b0f99d6ce08345f94050e7cc4c76b7c79b4e3ecee64e9a3a6ef7510c2b86ce7eef3608b24e61d3501ccbc16 SHA512 b92c07d8c9c40ad7721e0cca2d79b001f825478a336ad40cb43d02218fcd9e8b94b871575028ca8eaf6616cfce8138c796f32d4cf55d83d5cbe819ec50cf7c82
-AUX opencv-2.4.3-gcc47.patch 835 BLAKE2B 2e0f71fff77a23c2db9747d8bb7f9301de18acd4821b8223edd1979f2a1c62c86e71c4d4a5b0e3bf0057df81127d207230eb7b3f08507b17397b8370d454b570 SHA512 cc5e3e4c0def0745867403e990abf4b88d7d3edc72867a283403a991fd96f59c4cca6524ca184a52a40c913cd5d9cdfb52e98be71d5060fc4c7aa6b613a2a220
-AUX opencv-2.4.8-javamagic.patch 1165 BLAKE2B 0f12fd471145e1e303a517e5bc704fb5abc5ac5731fb1eadf08ef61e618bd70f9348c9c7a23296eefeb37826fd6701baaab0fc475ad0c441302b20516cf9bb9a SHA512 fd8a0d33997889c9316c0a4474c836b2528b676cd26bbb0e6ee2262377e45c5a0c465534831bd7fec3c0aa9cb198bc792a53f958b05a5217009314b678076d64
-AUX opencv-2.4.9-cuda-pkg-config.patch 373 BLAKE2B 389a27607926170c38c69cba955e91e0dfde65a51ee88dd0aec315056ba0f36a303ef2d4b95e226f323e92c59a251b93e9deae5cb3822ad69d257e1cb3cb1f34 SHA512 5b8f931758c6c8edfc3cae35a16d1c8674f17716f13b424ee0510eb313f06ed334b80205262e6bfcce22db235467cad81fddfa96e0cf669972794cc8524f6937
 AUX opencv-3.0.0-gles.patch 481 BLAKE2B 3eecd8c754abd9fdbfc2878b8b5a8b5ac3c6410342eb0756162ac901fe0903f7e1236bf2cc6e2ec5c7eeb638037f0dfad2b5aa9ebc905c485c4084936daed24e SHA512 37cac226bc39b91a87e4891e1d58169a0c2723240215670ebaecbfaf9b066b571296041fc5140aff7274cc44ca132b6f1b3bd4cf6d6dd23b950cac6eca548ad9
-AUX opencv-3.3.0-remove-tiny-dnn-autodownload.patch 1138 BLAKE2B 0bf85ca7a0e3759a4de14a844f2929120a47f9c0c212992d078b19cc7a602e157d5233ebc30d7eb6dcfa8c5a9606e3acea15e5a96717842fa80d2d8b3fa3189c SHA512 6824c3fc193491d0d776a7a904d71515309a5b67b0dfa1790bbd402c40b68e813c9fdfc3037a60f31893341ea78553d97470d152e90f34485004e0e50e6d66f6
 AUX opencv-3.4.0-disable-download.patch 1050 BLAKE2B 6f39f61588d9231cc8d877624538a49654ec8cf63091f8d0251cd01cc14684f2f5264c295a149c4a5754a9336e1ad4d1760cc26471fd85a6f571404f7c8d540d SHA512 95f2043c286a7de33fb4718fc1e2ded1fd943b20a5c4cc0c3d7af84fc317e53e3aa6358a33e4781195f8a80904d6bc615171142cde5d30a83d16045d36f85826
-AUX opencv-3.4.1-compilation-C-mode.patch 2077 BLAKE2B 78f55e49bd51ac4377a1db37125da6ca1ddfb9d723243eca7ef3df9d6d7b3922329cdd1c5915d480a9264af623c2953b4edaf81fd53afc950dc19cd49f04ea6f SHA512 203a4376728df6aa3dcaab147654139ebfd296a98d83847ac3ab0184dba828cf2ee298fedf7e7c2c64e1e8965237172fa6f1d5c7a4f6be5165a384d21b6875e7
 AUX opencv-3.4.1-cuda-add-relaxed-constexpr.patch 707 BLAKE2B 743a9c259c59fc4e3017539faef0723e0a80fb9c4bbde94811f32b3e6ae271b3db39fd35487d75078cfbe9e596604c4e37fb5c6c18619ed524c52683219dd8af SHA512 b37ce78495a3bbc439f203d9db81d9bff3e7f980c01ef5187dee537dd9c1025c5163ec3760b48d91a099a2fafb60526c9fe83f7183fc605fb3cc0f5c7a65f6bf
-AUX opencv-3.4.1-fix-build-with-va.patch 1459 BLAKE2B 20a65a5bef15fab56d277d78f747b883b5a008508c643ae877717dd0c524aa6c2ba398aff7ac8073d3ccfffdcd284223369c15de36214f62730bc62ca582cf71 SHA512 24186689afe73fd3e63d6d43073a88c65bc7cd5c0719701c8a014e5e85e179765e1b2d2adac5fcc3c8490e92aeaf65642f6d0276581d8311470328b55b74d441
-AUX opencv-3.4.1-fix-on-x86.patch 1256 BLAKE2B 785e718d7cea4bf72b03de5083d065449bad294c6bf5b6e7eb837e4c5f4ead34c1034988303410dba49e8376ca63caaaa209a4bd175d786c75ebfc548b71e271 SHA512 8ebf573e3f02b78b5769eaf828215698073096a1dade9214af0382cfbbe2353307df836a6af8c4e86246ad33fefe1f64a1087d0ff7a6dc7c5f3e231592c20b4c
-AUX opencv-3.4.1-popcnt.patch 890 BLAKE2B 553352472eaf2a2c97f148f97856a103e8a190970ef8a675d7a9b6fbf1ead0686279a4a5d961e8802164c73177da3f25cef016d40b59044f5c74b63613251512 SHA512 44f35d21c55e68b2125c5eba83c875c02c3822998d973257ab8a7d7e0baaeb5de70386b9294ff62a327732743253c588946eb8c59f87f1629b26e0f594c7b65f
-AUX opencv-3.4.1-python-lib-suffix-hack.patch 723 BLAKE2B bc4b1c68f2c73b40d20372ce4e3232b2db3b414ce2da16a8d84710fc53902211f17585c7ce6daf2d54025b53c04aa74f0c3eb3a30f26bfbc9af24e246f56b71a SHA512 54d2c8189fc1ff06ee1cacf5f375ea976faf339563ee804085feb0ec1f55cdbe10eea7335a786706b6a6152b6f9145156b3e74ce802c3d15b5a23014b25044b8
-AUX opencv-3.4.1-python37.patch 452 BLAKE2B c4a2850c17a0f9e01f537df6123e7c4262862ec0cd1dd43f8cebd21d4d6e8903205813b2a200eb6b60efdc43e74b0c9222d0b6bba504bacb84f87cfcf7d80d1a SHA512 c7fac2a6425c4afbef3b3cae5307e6035e3f4ef77ba0006c4dfd3a1cfc15c4648e978cc305ce598ec70c049e2cdc36f5f85cf24a75a4d3f3dc025091993e66e2
-AUX opencv-3.4.1-remove-git-autodetect.patch 1549 BLAKE2B 0ed44deddea20d5a57dded6a51d40645e5376411d9c055995fdbdbfbf4252817eaa9158925276661e4958f894898122ec273a352491be53511207345a481db52 SHA512 8496677542981c64ba9763f0d494885f71747884ae3e02de0bc8f96c1802356d917dcc7aed84ddfc2af093456c250bf2fafbdd06f7789aae8c720f5a412c07a0
 AUX opencv-4.1.2-opencl-license.patch 519 BLAKE2B 6dcdf809c3c75a39d0e44f02e157a0c0ee074fd15144565ed51ade7e7849cb313c084100f499cc1240424f4647a2ff73c8d5e61cbdf6d0499846db61b8a30729 SHA512 2874a5140ef5028eb6c64f36325904000edd722560cf876fc49d63b040633bcfea01cae27c156b18191564805cafd2986f26eea322b1376af4f2982d66ed7653
 AUX opencv-4.1.2-pkg-config-file.patch 345 BLAKE2B ba3968a5dbdcc981cc513055ca99b8726ba2fe993cb8c128d574688a748dbd6fc287089bc0c04af89f6b9b62b37cae9663a81c329b6a2dab4919470450b9f6c7 SHA512 0fa66ca24c0fa72dc9e13c0c40592cf5ca5aa5856d1747613f9c4528f0b00f05dd224662c022563db994f7e43879b97d1ba1f0afa2703c30e4a3efc520dc332d
-DIST opencv-2.4.13.tar.gz 91669572 BLAKE2B 7f6be39e29c0db5d005cb14215fdf5955fa69c34d72c4f1e1fa8bf8de1e748a0d2fe5febb43296ef529c57e4dec8d1b6739c0c4df9e64657b9550ed382fbc4b9 SHA512 efdc4340fdf557dae44ac604c8c20f61ced89f99274264b61c2640f28741504462c6b57076e207040ca2513e3921275bdfbe6c22fc123bd50df78745e6b7bcd6
 DIST opencv-3.4.0-face_landmark_model.tar.gz 63299830 BLAKE2B 58f08cd8c030ee1c8b66e76a561fd625e112face427d001185f8d7c0eaace55adbd8474663021841a1382bfe393a210e64c51223441713cdb9156fac866a845c SHA512 2cd29ce42c08b2966db3ef4a2bc217ab3d07051819757ec6de8f3deea29e28f60abab39f101dba03f766f17018598e411bd687a7eaab0c681c113e10a2de2b23
 DIST opencv-3.4.0-res10_300x300-caffeemodel.tar.gz 10036604 BLAKE2B 2a2de48fc420f13e7be146ac88f311901c5b4e409c30e466152e33cae1f8afd87dcb6d758af447c268d90bd67989c8798cd80cab172b10499a6ad5224509dbdf SHA512 96fee9f447d5739bc01a5cab37c453cf7237457dfb5d2bf93ac37f8e5aa557ac222316f449cd58e37e856abe4d8e9d4a7820daaba32f0b22cbcde8e340287d4b
-DIST opencv-3.4.1.tar.gz 87051748 BLAKE2B 87c83ab9b3d7fb048263f047aa5d6e95b153e1a28f3e34cc885eff7eb080a2258cfa1aa494cd56b32f1098ab158c17c23fc8464fcbe70642a3a1842f2fd1b4ac SHA512 e1fc14285090c6fe9e26e721f2d67d7096650c523147e925567426ef76aa7f4c6f12035d6f6ce3ec7991a75a6828a810fd4f9b75f78ed5fcccecefbadd79944b
-DIST opencv-3.4.1_contrib.tar.gz 57126844 BLAKE2B 63d9d5cb088371754eb132607789c8f1d4820f3e0e486593d6f64ee8f918ea4362152f050baec16f17904c03a6cdc0abc6e5fb2510308dcbabebe97b29285fbc SHA512 431dfba0f413071d7faa18bc6e6f5e4f015285e2cc730c5dd69b2a4d6aa4250b7e0bcb1814ac6f06f5c76f103aea1f93f72f32aee6bc0cd7ddacdaf1f40075c1
 DIST opencv-4.1.2.tar.gz 87468598 BLAKE2B 9e0fbd8499f783cd1a2b5ffddf557aef424b0a446f71f826522ffd4526d04742e0c408b99810fe6b39753d40c475922d2e273732fdc0a0b4ee0bc56052a7a26c SHA512 d18d2cc35dc1c95c8870d35feb14459db27ebf6d09ff89a185918b1faff1b36dedacc18f268a6483570c404aca19b83ba627ce7af2265af7195a029cb766c09f
 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-r4.ebuild 5973 BLAKE2B 2243648334c7c959d874b2255bc6743b3785f30b5f2a2a2884202f97568cea342d978e6247b33d4c069903f213f9cce970e73de5f9049ec72f0fcb2c2cc883ad SHA512 a35e75145fe2ca29570a9004a8526385654b26a41143eb104f2a7be61769542eefaca6020e79bf1ef4ad37f2e07168ce0aba0e2fea29ff3bdc07daab0f36cf84
-EBUILD opencv-3.4.1-r7.ebuild 18549 BLAKE2B 48af0cef62a6f3d672f21f97eecb34b6048a6b7cf6d3064c7166c226a645634137da33cfa91416eaec240ab82cc98d0191c5b668ff20f1cd19c6ddedc0c56aa6 SHA512 d277fae628589279850b35fc6b947b7f02137b21b87e88e80651825b9d75dc9eba0c524ffa265fa8ddc3998366f1122b383dfdfd508b77ed7967cf769a6054e3
-EBUILD opencv-4.1.2-r1.ebuild 18234 BLAKE2B cb0ad9fe36fe6b4c95ccd5fbb2234802a040d9eeff437999dd7b6b594b1d9f2d87d5d46322244a117e72fdab8a6f461173412a953bf9d8012b206efc3c10f8c5 SHA512 49baaa76d391452b611dd40dfb4b144b9c67c34f1e500397b3415f95860306532b167ab98ed9b0ed09f06b66abdcf77ce88c15957967229d0bd54363de56c0db
-EBUILD opencv-4.1.2-r3.ebuild 18318 BLAKE2B 8b7ae5933e6b6a7b7292eb112a8b2c5164726e5718dc0bb81fcb8c477f42bd31578f22516447dcf9f6649c368809f478759ee4810606d3315b2333433e001774 SHA512 730bb5c1ca8cc0d20ebf7b9720d74d950ebec413679b7dd6f4040cbff34df967417ba51169d156882f19d08fd1f9abf7d034dec8d749c7ed7c3785262f557aa3
+EBUILD opencv-4.1.2-r3.ebuild 18316 BLAKE2B 8775108cacc4c8f89fec915f73a4ba2c3908cf69c3e9c6d59c14dde2239c597845c04b5875591bef753ef6076e0009eb0630b95b0024660ac8d5ea773749eef2 SHA512 ed1cc7ba12fff122c700c5d88a2055677db459d0547a1eb465313a0b1db4efa75663618607facc1d33c97c9dd02a517d09bd627140082374851c97a9bec1a38c
 MISC metadata.xml 2786 BLAKE2B 1a29ddd9b75277f52d0a66cfb60fe2ad240ffdbdbf58a74038c684658405e90e858470b84fc0ff0935c972020152cfe6b6570a53ac68b71c299036e06516f469 SHA512 aa72fe71384691be664703e35c2f1342f9c90881d761b04e16357869c515fba551940b5bb624f9a7085f1ffa2e26067ac28b42fd97375d8a81a1901158b86ffc
diff --git a/media-libs/opencv/files/opencv-2.3.1a-libav-0.7.patch b/media-libs/opencv/files/opencv-2.3.1a-libav-0.7.patch
deleted file mode 100644
index 59090703d149..000000000000
--- a/media-libs/opencv/files/opencv-2.3.1a-libav-0.7.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- OpenCV-2.3.1.orig/modules/highgui/src/cap_ffmpeg_impl.hpp	2011-11-14 05:33:37.000000000 +0100
-+++ OpenCV-2.3.1/modules/highgui/src/cap_ffmpeg_impl.hpp	2011-11-14 05:33:18.000000000 +0100
-@@ -104,6 +104,7 @@
- #endif
- #if defined(HAVE_LIBAVCODEC_AVCODEC_H)
-   #include <libavcodec/avcodec.h>
-+  #include <libavutil/mathematics.h>
- #endif
- #if defined(HAVE_LIBSWSCALE_SWSCALE_H)
-   #include <libswscale/swscale.h>
diff --git a/media-libs/opencv/files/opencv-2.4.13-gcc-6.0.patch b/media-libs/opencv/files/opencv-2.4.13-gcc-6.0.patch
deleted file mode 100644
index b0a5084752ca..000000000000
--- a/media-libs/opencv/files/opencv-2.4.13-gcc-6.0.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From fb598bb76a0431aa3a880ecfa45054c996a070fb Mon Sep 17 00:00:00 2001
-From: Maksim Shabunin <maksim.shabunin@itseez.com>
-Date: Fri, 13 May 2016 13:28:09 +0300
-Subject: [PATCH] Disabled PCH support for gcc >= 6.0.0
-
-Command line generation routine uses "-isystem" to include headers outside of "<opencv>/modules" folder, but GCC 6 does not work when passed "-isystem /usr/include" option.
----
- cmake/OpenCVPCHSupport.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/OpenCVPCHSupport.cmake b/cmake/OpenCVPCHSupport.cmake
-index 13619daf27e..e6585cae020 100644
---- a/cmake/OpenCVPCHSupport.cmake
-+++ b/cmake/OpenCVPCHSupport.cmake
-@@ -19,7 +19,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
-         ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
-         OUTPUT_VARIABLE gcc_compiler_version)
-     #MESSAGE("GCC Version: ${gcc_compiler_version}")
--    IF(gcc_compiler_version VERSION_GREATER "4.2.-1")
-+    IF(gcc_compiler_version VERSION_GREATER "4.2.-1" AND gcc_compiler_version VERSION_LESS "6.0.0")
-         SET(PCHSupport_FOUND TRUE)
-     ENDIF()
- 
diff --git a/media-libs/opencv/files/opencv-2.4.13-imgcodecs-refactoring.patch b/media-libs/opencv/files/opencv-2.4.13-imgcodecs-refactoring.patch
deleted file mode 100644
index d1bea36580fe..000000000000
--- a/media-libs/opencv/files/opencv-2.4.13-imgcodecs-refactoring.patch
+++ /dev/null
@@ -1,580 +0,0 @@
-From 72d29259ca741950527c8cca7fb649030c01f658 Mon Sep 17 00:00:00 2001
-From: Alexander Alekhin <alexander.a.alekhin@gmail.com>
-Date: Tue, 15 Aug 2017 22:04:55 +0000
-Subject: [PATCH] imgcodecs: refactoring, improve code quality
-
----
- modules/core/include/opencv2/core/core.hpp       |   3 +
- modules/core/include/opencv2/core/operations.hpp |   3 +
- modules/highgui/src/bitstrm.cpp                  |   2 +
- modules/highgui/src/bitstrm.hpp                  |  19 ++--
- modules/highgui/src/grfmt_bmp.cpp                |  13 ++-
- modules/highgui/src/grfmt_pxm.cpp                | 119 +++++++++++++---------
- modules/highgui/src/loadsave.cpp                 | 120 +++++++++++++++++++----
- 7 files changed, 207 insertions(+), 72 deletions(-)
-
-diff --git a/modules/core/include/opencv2/core/core.hpp b/modules/core/include/opencv2/core/core.hpp
-index 6bb295f5c73..86f4eb182b2 100644
---- a/modules/core/include/opencv2/core/core.hpp
-+++ b/modules/core/include/opencv2/core/core.hpp
-@@ -3248,6 +3248,9 @@ template<typename _Tp, size_t fixed_size=4096/sizeof(_Tp)+8> class AutoBuffer
-     //! returns read-only pointer to the real buffer, stack-allocated or head-allocated
-     operator const _Tp* () const;
- 
-+    //! returns number of allocated elements
-+    size_t getSize() const;
-+
- protected:
-     //! pointer to the real buffer, can point to buf if the buffer is small enough
-     _Tp* ptr;
-diff --git a/modules/core/include/opencv2/core/operations.hpp b/modules/core/include/opencv2/core/operations.hpp
-index 1b7484aded2..37fd3d97c7a 100644
---- a/modules/core/include/opencv2/core/operations.hpp
-+++ b/modules/core/include/opencv2/core/operations.hpp
-@@ -2581,6 +2581,9 @@ template<typename _Tp, size_t fixed_size> inline AutoBuffer<_Tp, fixed_size>::op
- template<typename _Tp, size_t fixed_size> inline AutoBuffer<_Tp, fixed_size>::operator const _Tp* () const
- { return ptr; }
- 
-+template<typename _Tp, size_t fixed_size> inline size_t AutoBuffer<_Tp, fixed_size>::getSize() const
-+{ return size; }
-+
- 
- /////////////////////////////////// Ptr ////////////////////////////////////////
- 
-diff --git a/modules/highgui/src/bitstrm.cpp b/modules/highgui/src/bitstrm.cpp
-index dd8bec87cca..67792a27f28 100644
---- a/modules/highgui/src/bitstrm.cpp
-+++ b/modules/highgui/src/bitstrm.cpp
-@@ -208,6 +208,8 @@ int  RLByteStream::getByte()
-         current = m_current;
-     }
- 
-+    CV_Assert(current < m_end);
-+
-     val = *((uchar*)current);
-     m_current = current + 1;
-     return val;
-diff --git a/modules/highgui/src/bitstrm.hpp b/modules/highgui/src/bitstrm.hpp
-index 57956beb539..b22987bc911 100644
---- a/modules/highgui/src/bitstrm.hpp
-+++ b/modules/highgui/src/bitstrm.hpp
-@@ -48,13 +48,20 @@
- namespace cv
- {
- 
--enum
--{
--    RBS_THROW_EOS=-123,  // <end of stream> exception code
--    RBS_THROW_FORB=-124,  // <forrbidden huffman code> exception code
--    RBS_HUFF_FORB=2047,  // forrbidden huffman code "value"
--    RBS_BAD_HEADER=-125 // invalid header
-+#define DECLARE_RBS_EXCEPTION(name) \
-+class RBS_ ## name ## _Exception : public cv::Exception \
-+{ \
-+public: \
-+    RBS_ ## name ## _Exception(int code_, const String& err_, const String& func_, const String& file_, int line_) : \
-+        cv::Exception(code_, err_, func_, file_, line_) \
-+    {} \
- };
-+DECLARE_RBS_EXCEPTION(THROW_EOS)
-+#define RBS_THROW_EOS RBS_THROW_EOS_Exception(CV_StsError, "Unexpected end of input stream", CV_Func, __FILE__, __LINE__)
-+DECLARE_RBS_EXCEPTION(THROW_FORB)
-+#define RBS_THROW_FORB RBS_THROW_FORB_Exception(CV_StsError, "Forrbidden huffman code", CV_Func, __FILE__, __LINE__)
-+DECLARE_RBS_EXCEPTION(BAD_HEADER)
-+#define RBS_BAD_HEADER RBS_BAD_HEADER_Exception(CV_StsError, "Invalid header", CV_Func, __FILE__, __LINE__)
- 
- typedef unsigned long ulong;
- 
-diff --git a/modules/highgui/src/grfmt_bmp.cpp b/modules/highgui/src/grfmt_bmp.cpp
-index c8f8218cd3b..026b317467d 100644
---- a/modules/highgui/src/grfmt_bmp.cpp
-+++ b/modules/highgui/src/grfmt_bmp.cpp
-@@ -115,8 +115,9 @@ bool  BmpDecoder::readHeader()
- 
-                 if( m_bpp <= 8 )
-                 {
--                    memset( m_palette, 0, sizeof(m_palette));
--                    m_strm.getBytes( m_palette, (clrused == 0? 1<<m_bpp : clrused)*4 );
-+                    CV_Assert(clrused < 256);
-+                    memset(m_palette, 0, sizeof(m_palette));
-+                    m_strm.getBytes(m_palette, (clrused == 0? 1<<m_bpp : clrused)*4 );
-                     iscolor = IsColorPalette( m_palette, m_bpp );
-                 }
-                 else if( m_bpp == 16 && m_rle_code == BMP_BITFIELDS )
-@@ -282,7 +283,9 @@ bool  BmpDecoder::readData( Mat& img )
-                     else if( code > 2 ) // absolute mode
-                     {
-                         if( data + code*nch > line_end ) goto decode_rle4_bad;
--                        m_strm.getBytes( src, (((code + 1)>>1) + 1) & -2 );
-+                        int sz = (((code + 1)>>1) + 1) & (~1);
-+                        CV_Assert((size_t)sz < _src.getSize());
-+                        m_strm.getBytes(src, sz);
-                         if( color )
-                             data = FillColorRow4( data, src, code, m_palette );
-                         else
-@@ -371,7 +374,9 @@ decode_rle4_bad: ;
- 
-                         if( data + code3 > line_end )
-                             goto decode_rle8_bad;
--                        m_strm.getBytes( src, (code + 1) & -2 );
-+                        int sz = (code + 1) & (~1);
-+                        CV_Assert((size_t)sz < _src.getSize());
-+                        m_strm.getBytes(src, sz);
-                         if( color )
-                             data = FillColorRow8( data, src, code, m_palette );
-                         else
-diff --git a/modules/highgui/src/grfmt_pxm.cpp b/modules/highgui/src/grfmt_pxm.cpp
-index f73bbb1bf6b..e609d165966 100644
---- a/modules/highgui/src/grfmt_pxm.cpp
-+++ b/modules/highgui/src/grfmt_pxm.cpp
-@@ -43,50 +43,58 @@
- #include "precomp.hpp"
- #include "utils.hpp"
- #include "grfmt_pxm.hpp"
-+#include <iostream>
- 
- namespace cv
- {
- 
- ///////////////////////// P?M reader //////////////////////////////
- 
--static int ReadNumber( RLByteStream& strm, int maxdigits )
-+static int ReadNumber(RLByteStream& strm, int maxdigits = 0)
- {
-     int code;
--    int val = 0;
-+    int64 val = 0;
-     int digits = 0;
- 
-     code = strm.getByte();
- 
--    if( !isdigit(code))
-+    while (!isdigit(code))
-     {
--        do
-+        if (code == '#' )
-         {
--            if( code == '#' )
-+            do
-             {
--                do
--                {
--                    code = strm.getByte();
--                }
--                while( code != '\n' && code != '\r' );
-+                code = strm.getByte();
-             }
--
-+            while (code != '\n' && code != '\r');
-             code = strm.getByte();
--
--            while( isspace(code))
-+        }
-+        else if (isspace(code))
-+        {
-+            while (isspace(code))
-                 code = strm.getByte();
-         }
--        while( !isdigit( code ));
-+        else
-+        {
-+#if 1
-+            CV_Error_(CV_StsError, ("PXM: Unexpected code in ReadNumber(): 0x%x (%d)", code, code));
-+#else
-+            code = strm.getByte();
-+#endif
-+        }
-     }
- 
-     do
-     {
--        val = val*10 + code - '0';
--        if( ++digits >= maxdigits ) break;
-+        val = val*10 + (code - '0');
-+        CV_Assert(val <= INT_MAX && "PXM: ReadNumber(): result is too large");
-+        digits++;
-+        if (maxdigits != 0 && digits >= maxdigits) break;
-         code = strm.getByte();
-     }
--    while( isdigit(code));
-+    while (isdigit(code));
- 
--    return val;
-+    return (int)val;
- }
- 
- 
-@@ -119,13 +127,13 @@ ImageDecoder PxMDecoder::newDecoder() const
-     return new PxMDecoder;
- }
- 
--void  PxMDecoder::close()
-+void PxMDecoder::close()
- {
-     m_strm.close();
- }
- 
- 
--bool  PxMDecoder::readHeader()
-+bool PxMDecoder::readHeader()
- {
-     bool result = false;
- 
-@@ -155,10 +163,10 @@ bool  PxMDecoder::readHeader()
-         m_binary = code >= '4';
-         m_type = m_bpp > 8 ? CV_8UC3 : CV_8UC1;
- 
--        m_width = ReadNumber( m_strm, INT_MAX );
--        m_height = ReadNumber( m_strm, INT_MAX );
-+        m_width = ReadNumber(m_strm);
-+        m_height = ReadNumber(m_strm);
- 
--        m_maxval = m_bpp == 1 ? 1 : ReadNumber( m_strm, INT_MAX );
-+        m_maxval = m_bpp == 1 ? 1 : ReadNumber(m_strm);
-         if( m_maxval > 65535 )
-             throw RBS_BAD_HEADER;
- 
-@@ -172,8 +180,14 @@ bool  PxMDecoder::readHeader()
-             result = true;
-         }
-     }
--    catch(...)
-+    catch (const cv::Exception&)
-     {
-+        throw;
-+    }
-+    catch (...)
-+    {
-+        std::cerr << "PXM::readHeader(): unknown C++ exception" << std::endl << std::flush;
-+        throw;
-     }
- 
-     if( !result )
-@@ -193,27 +207,23 @@ bool  PxMDecoder::readData( Mat& img )
-     int step = (int)img.step;
-     PaletteEntry palette[256];
-     bool   result = false;
--    int  bit_depth = CV_ELEM_SIZE1(m_type)*8;
--    int  src_pitch = (m_width*m_bpp*bit_depth/8 + 7)/8;
-+    const int bit_depth = CV_ELEM_SIZE1(m_type)*8;
-+    const int src_pitch = (m_width*m_bpp*(bit_depth/8) + 7) / 8;
-+
-     int  nch = CV_MAT_CN(m_type);
-     int  width3 = m_width*nch;
--    int  i, x, y;
- 
-     if( m_offset < 0 || !m_strm.isOpened())
-         return false;
- 
--    AutoBuffer<uchar,1024> _src(src_pitch + 32);
--    uchar* src = _src;
--    AutoBuffer<uchar,1024> _gray_palette;
--    uchar* gray_palette = _gray_palette;
-+    uchar gray_palette[256] = {0};
- 
-     // create LUT for converting colors
-     if( bit_depth == 8 )
-     {
--        _gray_palette.allocate(m_maxval + 1);
--        gray_palette = _gray_palette;
-+        CV_Assert(m_maxval < 256);
- 
--        for( i = 0; i <= m_maxval; i++ )
-+        for (int i = 0; i <= m_maxval; i++)
-             gray_palette[i] = (uchar)((i*255/m_maxval)^(m_bpp == 1 ? 255 : 0));
- 
-         FillGrayPalette( palette, m_bpp==1 ? 1 : 8 , m_bpp == 1 );
-@@ -227,12 +237,16 @@ bool  PxMDecoder::readData( Mat& img )
-         {
-         ////////////////////////// 1 BPP /////////////////////////
-         case 1:
-+            CV_Assert(CV_MAT_DEPTH(m_type) == CV_8U);
-             if( !m_binary )
-             {
--                for( y = 0; y < m_height; y++, data += step )
-+                AutoBuffer<uchar> _src(m_width);
-+                uchar* src = _src;
-+
-+                for (int y = 0; y < m_height; y++, data += step)
-                 {
--                    for( x = 0; x < m_width; x++ )
--                        src[x] = ReadNumber( m_strm, 1 ) != 0;
-+                    for (int x = 0; x < m_width; x++)
-+                        src[x] = ReadNumber(m_strm, 1) != 0;
- 
-                     if( color )
-                         FillColorRow8( data, src, m_width, palette );
-@@ -242,7 +256,10 @@ bool  PxMDecoder::readData( Mat& img )
-             }
-             else
-             {
--                for( y = 0; y < m_height; y++, data += step )
-+                AutoBuffer<uchar> _src(src_pitch);
-+                uchar* src = _src;
-+
-+                for (int y = 0; y < m_height; y++, data += step)
-                 {
-                     m_strm.getBytes( src, src_pitch );
- 
-@@ -258,11 +275,15 @@ bool  PxMDecoder::readData( Mat& img )
-         ////////////////////////// 8 BPP /////////////////////////
-         case 8:
-         case 24:
--            for( y = 0; y < m_height; y++, data += step )
-+        {
-+            AutoBuffer<uchar> _src(std::max<size_t>(width3*2, src_pitch));
-+            uchar* src = _src;
-+
-+            for (int y = 0; y < m_height; y++, data += step)
-             {
-                 if( !m_binary )
-                 {
--                    for( x = 0; x < width3; x++ )
-+                    for (int x = 0; x < width3; x++)
-                     {
-                         int code = ReadNumber( m_strm, INT_MAX );
-                         if( (unsigned)code > (unsigned)m_maxval ) code = m_maxval;
-@@ -277,7 +298,7 @@ bool  PxMDecoder::readData( Mat& img )
-                     m_strm.getBytes( src, src_pitch );
-                     if( bit_depth == 16 && !isBigEndian() )
-                     {
--                        for( x = 0; x < width3; x++ )
-+                        for (int x = 0; x < width3; x++)
-                         {
-                             uchar v = src[x * 2];
-                             src[x * 2] = src[x * 2 + 1];
-@@ -288,7 +309,7 @@ bool  PxMDecoder::readData( Mat& img )
- 
-                 if( img.depth() == CV_8U && bit_depth == 16 )
-                 {
--                    for( x = 0; x < width3; x++ )
-+                    for (int x = 0; x < width3; x++)
-                     {
-                         int v = ((ushort *)src)[x];
-                         src[x] = (uchar)(v >> 8);
-@@ -329,12 +350,19 @@ bool  PxMDecoder::readData( Mat& img )
-             }
-             result = true;
-             break;
-+        }
-         default:
--            assert(0);
-+            CV_Error(CV_StsError, "m_bpp is not supported");
-         }
-     }
--    catch(...)
-+    catch (const cv::Exception&)
-+    {
-+        throw;
-+    }
-+    catch (...)
-     {
-+        std::cerr << "PXM::readData(): unknown exception" << std::endl << std::flush;
-+        throw;
-     }
- 
-     return result;
-@@ -410,8 +438,9 @@ bool  PxMEncoder::write( const Mat& img, const vector<int>& params )
-     char* buffer = _buffer;
- 
-     // write header;
--    sprintf( buffer, "P%c\n%d %d\n%d\n",
-+    sprintf( buffer, "P%c\n# Generated by OpenCV %s\n%d %d\n%d\n",
-              '2' + (channels > 1 ? 1 : 0) + (isBinary ? 3 : 0),
-+             CV_VERSION,
-              width, height, (1 << depth) - 1 );
- 
-     strm.putBytes( buffer, (int)strlen(buffer) );
-diff --git a/modules/highgui/src/loadsave.cpp b/modules/highgui/src/loadsave.cpp
-index 81c708acdd4..9b270c900f7 100644
---- a/modules/highgui/src/loadsave.cpp
-+++ b/modules/highgui/src/loadsave.cpp
-@@ -48,12 +48,32 @@
- #undef min
- #undef max
- 
-+#include <iostream>
-+
- /****************************************************************************************\
- *                                      Image Codecs                                      *
- \****************************************************************************************/
- namespace cv
- {
- 
-+// TODO Add runtime configuration
-+#define CV_IO_MAX_IMAGE_PARAMS (50)
-+#define CV_IO_MAX_IMAGE_WIDTH (1<<20)
-+#define CV_IO_MAX_IMAGE_HEIGHT (1<<20)
-+#define CV_IO_MAX_IMAGE_PIXELS (1<<30) // 1 Gigapixel
-+
-+static Size validateInputImageSize(const Size& size)
-+{
-+    CV_Assert(size.width > 0);
-+    CV_Assert(size.width <= CV_IO_MAX_IMAGE_WIDTH);
-+    CV_Assert(size.height > 0);
-+    CV_Assert(size.height <= CV_IO_MAX_IMAGE_HEIGHT);
-+    uint64 pixels = (uint64)size.width * (uint64)size.height;
-+    CV_Assert(pixels <= CV_IO_MAX_IMAGE_PIXELS);
-+    return size;
-+}
-+
-+
- struct ImageCodecInitializer
- {
-     ImageCodecInitializer()
-@@ -203,12 +223,26 @@ imread_( const string& filename, int flags, int hdrtype, Mat* mat=0 )
-     if( decoder.empty() )
-         return 0;
-     decoder->setSource(filename);
--    if( !decoder->readHeader() )
-+
-+    try
-+    {
-+        // read the header to make sure it succeeds
-+        if (!decoder->readHeader())
-+            return 0;
-+    }
-+    catch (const cv::Exception& e)
-+    {
-+        std::cerr << "imread_('" << filename << "'): can't read header: " << e.what() << std::endl << std::flush;
-         return 0;
-+    }
-+    catch (...)
-+    {
-+        std::cerr << "imread_('" << filename << "'): can't read header: unknown exception" << std::endl << std::flush;
-+        return 0;
-+    }
- 
--    CvSize size;
--    size.width = decoder->width();
--    size.height = decoder->height();
-+
-+    Size size = validateInputImageSize(Size(decoder->width(), decoder->height()));
- 
-     int type = decoder->type();
-     if( flags != -1 )
-@@ -242,7 +276,21 @@ imread_( const string& filename, int flags, int hdrtype, Mat* mat=0 )
-         temp = cvarrToMat(image);
-     }
- 
--    if( !decoder->readData( *data ))
-+    bool success = false;
-+    try
-+    {
-+        if (decoder->readData(*data))
-+            success = true;
-+    }
-+    catch (const cv::Exception& e)
-+    {
-+        std::cerr << "imread_('" << filename << "'): can't read data: " << e.what() << std::endl << std::flush;
-+    }
-+    catch (...)
-+    {
-+        std::cerr << "imread_('" << filename << "'): can't read data: unknown exception" << std::endl << std::flush;
-+    }
-+    if (!success)
-     {
-         cvReleaseImage( &image );
-         cvReleaseMat( &matrix );
-@@ -288,6 +336,7 @@ static bool imwrite_( const string& filename, const Mat& image,
-     }
- 
-     encoder->setDestination( filename );
-+    CV_Assert(params.size() <= CV_IO_MAX_IMAGE_PARAMS*2);
-     bool code = encoder->write( *pimage, params );
- 
-     //    CV_Assert( code );
-@@ -326,16 +375,34 @@ imdecode_( const Mat& buf, int flags, int hdrtype, Mat* mat=0 )
-         decoder->setSource(filename);
-     }
- 
--    if( !decoder->readHeader() )
-+    bool success = false;
-+    try
-     {
--        if( !filename.empty() )
--            remove(filename.c_str());
-+        if (decoder->readHeader())
-+            success = true;
-+    }
-+    catch (const cv::Exception& e)
-+    {
-+        std::cerr << "imdecode_('" << filename << "'): can't read header: " << e.what() << std::endl << std::flush;
-+    }
-+    catch (...)
-+    {
-+        std::cerr << "imdecode_('" << filename << "'): can't read header: unknown exception" << std::endl << std::flush;
-+    }
-+    if (!success)
-+    {
-+        if (!filename.empty())
-+        {
-+            if (0 != remove(filename.c_str()))
-+            {
-+                std::cerr << "unable to remove temporary file:" << filename << std::endl << std::flush;
-+            }
-+        }
-         return 0;
-     }
- 
--    CvSize size;
--    size.width = decoder->width();
--    size.height = decoder->height();
-+    // established the required input image size
-+    Size size = validateInputImageSize(Size(decoder->width(), decoder->height()));
- 
-     int type = decoder->type();
-     if( flags != -1 )
-@@ -369,11 +436,30 @@ imdecode_( const Mat& buf, int flags, int hdrtype, Mat* mat=0 )
-         temp = cvarrToMat(image);
-     }
- 
--    bool code = decoder->readData( *data );
--    if( !filename.empty() )
--        remove(filename.c_str());
-+    success = false;
-+    try
-+    {
-+        if (decoder->readData(*data))
-+            success = true;
-+    }
-+    catch (const cv::Exception& e)
-+    {
-+        std::cerr << "imdecode_('" << filename << "'): can't read data: " << e.what() << std::endl << std::flush;
-+    }
-+    catch (...)
-+    {
-+        std::cerr << "imdecode_('" << filename << "'): can't read data: unknown exception" << std::endl << std::flush;
-+    }
- 
--    if( !code )
-+    if (!filename.empty())
-+    {
-+        if (0 != remove(filename.c_str()))
-+        {
-+            std::cerr << "unable to remove temporary file:" << filename << std::endl << std::flush;
-+        }
-+    }
-+
-+    if (!success)
-     {
-         cvReleaseImage( &image );
-         cvReleaseMat( &matrix );
-@@ -490,7 +576,7 @@ cvSaveImage( const char* filename, const CvArr* arr, const int* _params )
-     if( _params )
-     {
-         for( ; _params[i] > 0; i += 2 )
--            ;
-+            CV_Assert(i < CV_IO_MAX_IMAGE_PARAMS*2); // Limit number of params for security reasons
-     }
-     return cv::imwrite_(filename, cv::cvarrToMat(arr),
-         i > 0 ? cv::vector<int>(_params, _params+i) : cv::vector<int>(),
-@@ -521,7 +607,7 @@ cvEncodeImage( const char* ext, const CvArr* arr, const int* _params )
-     if( _params )
-     {
-         for( ; _params[i] > 0; i += 2 )
--            ;
-+            CV_Assert(i < CV_IO_MAX_IMAGE_PARAMS*2); // Limit number of params for security reasons
-     }
-     cv::Mat img = cv::cvarrToMat(arr);
-     if( CV_IS_IMAGE(arr) && ((const IplImage*)arr)->origin == IPL_ORIGIN_BL )
diff --git a/media-libs/opencv/files/opencv-2.4.2-cflags.patch b/media-libs/opencv/files/opencv-2.4.2-cflags.patch
deleted file mode 100644
index d52e6b6a39f4..000000000000
--- a/media-libs/opencv/files/opencv-2.4.2-cflags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ruN OpenCV-2.4.2.orig/cmake/OpenCVCompilerOptions.cmake OpenCV-2.4.2/cmake/OpenCVCompilerOptions.cmake
---- OpenCV-2.4.2.orig/cmake/OpenCVCompilerOptions.cmake	2012-06-29 00:55:15.000000000 +0200
-+++ OpenCV-2.4.2/cmake/OpenCVCompilerOptions.cmake	2012-07-16 23:51:24.244907235 +0200
-@@ -110,17 +110,6 @@
-   endif()
- 
-   # Other optimizations
--  if(ENABLE_OMIT_FRAME_POINTER)
--    add_extra_compiler_option(-fomit-frame-pointer)
--  else()
--    add_extra_compiler_option(-fno-omit-frame-pointer)
--  endif()
--  if(ENABLE_FAST_MATH)
--    add_extra_compiler_option(-ffast-math)
--  endif()
--  if(ENABLE_POWERPC)
--    add_extra_compiler_option("-mcpu=G3 -mtune=G5")
--  endif()
-   if(ENABLE_SSE)
-     add_extra_compiler_option(-msse)
-   endif()
diff --git a/media-libs/opencv/files/opencv-2.4.3-gcc47.patch b/media-libs/opencv/files/opencv-2.4.3-gcc47.patch
deleted file mode 100644
index 13ac8f8fb58f..000000000000
--- a/media-libs/opencv/files/opencv-2.4.3-gcc47.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ruN OpenCV-2.4.3.orig/modules/highgui/src/grfmt_tiff.cpp OpenCV-2.4.3/modules/highgui/src/grfmt_tiff.cpp
---- OpenCV-2.4.3.orig/modules/highgui/src/grfmt_tiff.cpp	2012-10-12 00:55:12.000000000 +0200
-+++ OpenCV-2.4.3/modules/highgui/src/grfmt_tiff.cpp	2012-11-05 21:37:40.000000000 +0100
-@@ -47,6 +47,7 @@
- 
- #include "precomp.hpp"
- #include "grfmt_tiff.hpp"
-+#include "unistd.h"
- 
- namespace cv
- {
-diff -ruN OpenCV-2.4.3.orig/modules/highgui/src/window_QT.h OpenCV-2.4.3/modules/highgui/src/window_QT.h
---- OpenCV-2.4.3.orig/modules/highgui/src/window_QT.h	2012-10-18 00:55:38.000000000 +0200
-+++ OpenCV-2.4.3/modules/highgui/src/window_QT.h	2012-11-05 21:38:41.000000000 +0100
-@@ -41,6 +41,7 @@
- #define __OPENCV_HIGHGUI_QT_H__
- 
- #include "precomp.hpp"
-+#include "unistd.h"
- 
- #if defined( HAVE_QT_OPENGL )
- #include <QtOpenGL>
diff --git a/media-libs/opencv/files/opencv-2.4.8-javamagic.patch b/media-libs/opencv/files/opencv-2.4.8-javamagic.patch
deleted file mode 100644
index 766abc1e0941..000000000000
--- a/media-libs/opencv/files/opencv-2.4.8-javamagic.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ruN opencv-2.4.8.orig/CMakeLists.txt opencv-2.4.8/CMakeLists.txt
---- opencv-2.4.8.orig/CMakeLists.txt	2013-12-27 18:09:18.000000000 +0100
-+++ opencv-2.4.8/CMakeLists.txt	2014-01-24 22:06:12.000000000 +0100
-@@ -164,6 +164,7 @@
- OCV_OPTION(WITH_OPENCLAMDFFT   "Include AMD OpenCL FFT library support"      ON   IF (NOT ANDROID AND NOT IOS) )
- OCV_OPTION(WITH_OPENCLAMDBLAS  "Include AMD OpenCL BLAS library support"     ON   IF (NOT ANDROID AND NOT IOS) )
- OCV_OPTION(WITH_INTELPERC      "Include Intel Perceptual Computing support"  OFF  IF WIN32 )
-+OCV_OPTION(WITH_JAVA           "Include Java support"                        ON)
- 
- # OpenCV build components
- # ===================================================
-@@ -449,6 +450,8 @@
- include(cmake/OpenCVDetectPython.cmake)
- 
- # --- Java Support ---
-+if(WITH_JAVA)
-+
- include(cmake/OpenCVDetectApacheAnt.cmake)
- if(ANDROID)
-   include(cmake/OpenCVDetectAndroidSDK.cmake)
-@@ -466,6 +469,11 @@
-   SET(CAN_BUILD_ANDROID_PROJECTS FALSE)
- endif()
- 
-+else()
-+  SET(ANT_EXECUTABLE "")
-+  SET(CAN_BUILD_ANDROID_PROJECTS FALSE)
-+endif()
-+
- # --- OpenCL ---
- if(WITH_OPENCL)
-   include(cmake/OpenCVDetectOpenCL.cmake)
diff --git a/media-libs/opencv/files/opencv-2.4.9-cuda-pkg-config.patch b/media-libs/opencv/files/opencv-2.4.9-cuda-pkg-config.patch
deleted file mode 100644
index d7ff3c7eaf67..000000000000
--- a/media-libs/opencv/files/opencv-2.4.9-cuda-pkg-config.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/CMakeLists.txt

-+++ b/CMakeLists.txt

-@@ -528,6 +528,9 @@

-   if(HAVE_CUFFT)

-     set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} ${CUDA_cufft_LIBRARY})

-   endif()

-+  foreach(p ${CUDA_LIBS_PATH})

-+    set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} -L${p})

-+  endforeach()

- endif()

- 

- # ----------------------------------------------------------------------------

diff --git a/media-libs/opencv/files/opencv-3.3.0-remove-tiny-dnn-autodownload.patch b/media-libs/opencv/files/opencv-3.3.0-remove-tiny-dnn-autodownload.patch
deleted file mode 100644
index 6929a4c2ce4c..000000000000
--- a/media-libs/opencv/files/opencv-3.3.0-remove-tiny-dnn-autodownload.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -purN a/modules/dnn_modern/CMakeLists.txt b/modules/dnn_modern/CMakeLists.txt
---- a/modules/dnn_modern/CMakeLists.txt	2017-07-31 15:58:38.000000000 +0100
-+++ b/modules/dnn_modern/CMakeLists.txt	2018-01-15 17:15:15.202454388 +0000
-@@ -15,23 +15,6 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CU
- # MODULE REQUIREMENTS
- # ----------------------------------------------------------------------------
- 
--set(TINY_DNN_CPP_PATH "${OpenCV_BINARY_DIR}/3rdparty/tinydnn")
--set(TINY_DNN_CPP_ROOT "${TINY_DNN_CPP_PATH}/tiny-dnn-1.0.0a3")
--ocv_download(FILENAME "v1.0.0a3.tar.gz"
--               HASH "adb1c512e09ca2c7a6faef36f9c53e59"
--               URL
--                 "${OPENCV_TINY_DNN_URL}"
--                 "$ENV{OPENCV_TINY_DNN_URL}"
--                 "https://github.com/tiny-dnn/tiny-dnn/archive/"
--               DESTINATION_DIR "${TINY_DNN_CPP_PATH}"
--               STATUS TINY_DNN_DOWNLOAD_SUCCESS
--               ID "tiny-dnn"
--               UNPACK RELATIVE_URL)
--
--if(NOT TINY_DNN_DOWNLOAD_SUCCESS)
--  message(STATUS "Failed to download tiny-dnn sources")
--endif()
--
- find_package(TinyDNN QUIET)
- 
- include(CheckCXXCompilerFlag)
diff --git a/media-libs/opencv/files/opencv-3.4.1-compilation-C-mode.patch b/media-libs/opencv/files/opencv-3.4.1-compilation-C-mode.patch
deleted file mode 100644
index c94f206ed4f1..000000000000
--- a/media-libs/opencv/files/opencv-3.4.1-compilation-C-mode.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 549b5df22520b60b91dd77096434d79425b31ac2 Mon Sep 17 00:00:00 2001
-From: Alexander Alekhin <alexander.alekhin@intel.com>
-Date: Mon, 28 May 2018 18:07:23 +0300
-Subject: [PATCH] build: workaround issues with C compilation mode
-
-- cvdef.h + cvRound (double only)
-- highgui_c.h
----
- modules/core/include/opencv2/core/cvdef.h           | 8 +++++++-
- modules/highgui/include/opencv2/highgui/highgui_c.h | 2 ++
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/modules/core/include/opencv2/core/cvdef.h b/modules/core/include/opencv2/core/cvdef.h
-index a87ced09d78..4ab72b34cc1 100644
---- a/modules/core/include/opencv2/core/cvdef.h
-+++ b/modules/core/include/opencv2/core/cvdef.h
-@@ -480,7 +480,7 @@ Cv64suf;
- // Integer types portatibility
- #ifdef OPENCV_STDINT_HEADER
- #include OPENCV_STDINT_HEADER
--#else
-+#elif defined(__cplusplus)
- #if defined(_MSC_VER) && _MSC_VER < 1600 /* MSVS 2010 */
- namespace cv {
- typedef signed char int8_t;
-@@ -517,9 +517,15 @@ typedef ::int64_t int64_t;
- typedef ::uint64_t uint64_t;
- }
- #endif
-+#else // pure C
-+#include <stdint.h>
- #endif
- 
- 
- //! @}
- 
-+#ifndef __cplusplus
-+#include "opencv2/core/fast_math.hpp" // define cvRound(double)
-+#endif
-+
- #endif // OPENCV_CORE_CVDEF_H
-diff --git a/modules/highgui/include/opencv2/highgui/highgui_c.h b/modules/highgui/include/opencv2/highgui/highgui_c.h
-index 1eb414a76ca..35413139c79 100644
---- a/modules/highgui/include/opencv2/highgui/highgui_c.h
-+++ b/modules/highgui/include/opencv2/highgui/highgui_c.h
-@@ -135,8 +135,10 @@ CVAPI(int) cvNamedWindow( const char* name, int flags CV_DEFAULT(CV_WINDOW_AUTOS
- CVAPI(void) cvSetWindowProperty(const char* name, int prop_id, double prop_value);
- CVAPI(double) cvGetWindowProperty(const char* name, int prop_id);
- 
-+#ifdef __cplusplus  // FIXIT remove in OpenCV 4.0
- /* Get window image rectangle coordinates, width and height */
- CVAPI(cv::Rect)cvGetWindowImageRect(const char* name);
-+#endif
- 
- /* display image within window (highgui windows remember their content) */
- CVAPI(void) cvShowImage( const char* name, const CvArr* image );
diff --git a/media-libs/opencv/files/opencv-3.4.1-fix-build-with-va.patch b/media-libs/opencv/files/opencv-3.4.1-fix-build-with-va.patch
deleted file mode 100644
index 813eb7e4ae65..000000000000
--- a/media-libs/opencv/files/opencv-3.4.1-fix-build-with-va.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 20f5fa8e3e880bc8b2e5156e9f25f7fb756ed8e4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
-Date: Wed, 28 Feb 2018 19:21:31 +0000
-Subject: [PATCH] Fix build with VA
-
-This commit readd ${VA_LIBRARIES} ${VA_INTEL_LIBRARIES}
-that was missed in commit 2200e13c7193e0fe9db4b9f7c4bee3a7ef043909
-
-    diff --git a/samples/va_intel/CMakeLists.txt b/samples/va_intel/CMakeLists.txt
-    -    ocv_target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS} ${VA_LIBRARIES} ${VA_INTEL_LIBRARIES})
-    +  ocv_target_link_libraries(${tgt} ${OPENCV_LINKER_LIBS} ${OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS})
----
- samples/va_intel/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/samples/va_intel/CMakeLists.txt b/samples/va_intel/CMakeLists.txt
-index af51dd32061..04f2ea5fd40 100644
---- a/samples/va_intel/CMakeLists.txt
-+++ b/samples/va_intel/CMakeLists.txt
-@@ -17,5 +17,5 @@ ocv_include_modules_recurse(${OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS})
- file(GLOB all_samples RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp)
- foreach(sample_filename ${all_samples})
-   ocv_define_sample(tgt ${sample_filename} va_intel)
--  ocv_target_link_libraries(${tgt} ${OPENCV_LINKER_LIBS} ${OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS})
-+  ocv_target_link_libraries(${tgt} ${OPENCV_LINKER_LIBS} ${OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS} ${VA_LIBRARIES} ${VA_INTEL_LIBRARIES})
- endforeach()
diff --git a/media-libs/opencv/files/opencv-3.4.1-fix-on-x86.patch b/media-libs/opencv/files/opencv-3.4.1-fix-on-x86.patch
deleted file mode 100644
index f36d643cf731..000000000000
--- a/media-libs/opencv/files/opencv-3.4.1-fix-on-x86.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7dc162cb4252ccf461f1c63650abde3c8807b79c Mon Sep 17 00:00:00 2001
-From: Alexander Alekhin <alexander.alekhin@intel.com>
-Date: Mon, 9 Apr 2018 18:25:51 +0300
-Subject: [PATCH] core: fix mm_pause() for non-SSE i386 builds
-
-replaced to safe binary compatible 'rep; nop' asm instruction
----
- modules/core/src/parallel_impl.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/modules/core/src/parallel_impl.cpp b/modules/core/src/parallel_impl.cpp
-index 78d9eb63694..bc64fce7a81 100644
---- a/modules/core/src/parallel_impl.cpp
-+++ b/modules/core/src/parallel_impl.cpp
-@@ -49,7 +49,11 @@ DECLARE_CV_YIELD
- DECLARE_CV_PAUSE
- #endif
- #ifndef CV_PAUSE
--#if defined __GNUC__ && (defined __i386__ || defined __x86_64__)
-+# if defined __GNUC__ && (defined __i386__ || defined __x86_64__)
-+#   if !defined(__SSE__)
-+      static inline void cv_non_sse_mm_pause() { __asm__ __volatile__ ("rep; nop"); }
-+#     define _mm_pause cv_non_sse_mm_pause
-+#   endif
- #   define CV_PAUSE(v) do { for (int __delay = (v); __delay > 0; --__delay) { _mm_pause(); } } while (0)
- # elif defined __GNUC__ && defined __aarch64__
- #   define CV_PAUSE(v) do { for (int __delay = (v); __delay > 0; --__delay) { asm volatile("yield" ::: "memory"); } } while (0)
diff --git a/media-libs/opencv/files/opencv-3.4.1-popcnt.patch b/media-libs/opencv/files/opencv-3.4.1-popcnt.patch
deleted file mode 100644
index 51a6d554a252..000000000000
--- a/media-libs/opencv/files/opencv-3.4.1-popcnt.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a2d6fc7ac040c6ef94a36515f9ea24428f8f1ecc Mon Sep 17 00:00:00 2001
-From: Alexander Alekhin <alexander.alekhin@intel.com>
-Date: Tue, 24 Apr 2018 12:40:25 +0300
-Subject: [PATCH] cmake: fix popcnt detection
-
-via GCC/Clang __POPCNT__ define
----
- cmake/checks/cpu_popcnt.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/cmake/checks/cpu_popcnt.cpp b/cmake/checks/cpu_popcnt.cpp
-index 16e5575108b..44c7deda053 100644
---- a/cmake/checks/cpu_popcnt.cpp
-+++ b/cmake/checks/cpu_popcnt.cpp
-@@ -4,12 +4,14 @@
- #    define CV_POPCNT_U64 _mm_popcnt_u64
- #  endif
- #  define CV_POPCNT_U32 _mm_popcnt_u32
--#else
-+#elif defined(__POPCNT__)
- #  include <popcntintrin.h>
- #  if defined(__x86_64__)
- #    define CV_POPCNT_U64 __builtin_popcountll
- #  endif
- #  define CV_POPCNT_U32 __builtin_popcount
-+#else
-+#  error "__POPCNT__ is not defined by compiler"
- #endif
- 
- int main()
diff --git a/media-libs/opencv/files/opencv-3.4.1-python-lib-suffix-hack.patch b/media-libs/opencv/files/opencv-3.4.1-python-lib-suffix-hack.patch
deleted file mode 100644
index 248e5034a218..000000000000
--- a/media-libs/opencv/files/opencv-3.4.1-python-lib-suffix-hack.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/cmake/OpenCVDetectPython.cmake	2018-05-31 09:14:42.998873104 +0200
-+++ b/cmake/OpenCVDetectPython.cmake	2018-05-31 09:26:08.444914001 +0200
-@@ -140,8 +140,8 @@
-         else() #debian based assumed, install to the dist-packages.
-           set(_packages_path "python${_version_major_minor}/dist-packages")
-         endif()
--        if(EXISTS "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/${${packages_path}}")
--          set(_packages_path "lib${LIB_SUFFIX}/${_packages_path}")
-+        if(EXISTS "${CMAKE_INSTALL_PREFIX}/lib${LIBPY_SUFFIX}/${${packages_path}}")
-+          set(_packages_path "lib${LIBPY_SUFFIX}/${_packages_path}")
-         else()
-           set(_packages_path "lib/${_packages_path}")
-         endif()
diff --git a/media-libs/opencv/files/opencv-3.4.1-python37.patch b/media-libs/opencv/files/opencv-3.4.1-python37.patch
deleted file mode 100644
index 94d307b748c4..000000000000
--- a/media-libs/opencv/files/opencv-3.4.1-python37.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN a/modules/python/src2/cv2.cpp b/modules/python/src2/cv2.cpp
---- a/modules/python/src2/cv2.cpp	2018-02-23 11:38:33.000000000 +0300
-+++ b/modules/python/src2/cv2.cpp	2019-08-10 22:28:03.337071791 +0300
-@@ -886,7 +886,7 @@
-     (void)name;
-     if(!obj || obj == Py_None)
-         return true;
--    char* str = PyString_AsString(obj);
-+    const char* str = PyString_AsString(obj);
-     if(!str)
-         return false;
-     value = String(str);
diff --git a/media-libs/opencv/files/opencv-3.4.1-remove-git-autodetect.patch b/media-libs/opencv/files/opencv-3.4.1-remove-git-autodetect.patch
deleted file mode 100644
index 94b221ab9a8b..000000000000
--- a/media-libs/opencv/files/opencv-3.4.1-remove-git-autodetect.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/CMakeLists.txt	2019-01-10 19:29:06.831367707 +0100
-+++ b/CMakeLists.txt	2019-01-10 19:30:11.125364384 +0100
-@@ -522,23 +522,23 @@
- # ----------------------------------------------------------------------------
- #  Autodetect if we are in a GIT repository
- # ----------------------------------------------------------------------------
--find_host_package(Git QUIET)
-+# find_host_package(Git QUIET)
- 
--if(NOT DEFINED OPENCV_VCSVERSION AND GIT_FOUND)
--  execute_process(COMMAND "${GIT_EXECUTABLE}" describe --tags --always --dirty --match "[0-9].[0-9].[0-9]*"
--    WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}"
--    OUTPUT_VARIABLE OPENCV_VCSVERSION
--    RESULT_VARIABLE GIT_RESULT
--    ERROR_QUIET
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  if(NOT GIT_RESULT EQUAL 0)
--    set(OPENCV_VCSVERSION "unknown")
--  endif()
--elseif(NOT DEFINED OPENCV_VCSVERSION)
--  # We don't have git:
--  set(OPENCV_VCSVERSION "unknown")
--endif()
-+# if(NOT DEFINED OPENCV_VCSVERSION AND GIT_FOUND)
-+#  execute_process(COMMAND "${GIT_EXECUTABLE}" describe --tags --always --dirty --match "[0-9].[0-9].[0-9]*"
-+#    WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}"
-+#    OUTPUT_VARIABLE OPENCV_VCSVERSION
-+#    RESULT_VARIABLE GIT_RESULT
-+#    ERROR_QUIET
-+#    OUTPUT_STRIP_TRAILING_WHITESPACE
-+#  )
-+#  if(NOT GIT_RESULT EQUAL 0)
-+#    set(OPENCV_VCSVERSION "unknown")
-+#  endif()
-+# elseif(NOT DEFINED OPENCV_VCSVERSION)
-+#  # We don't have git:
-+# set(OPENCV_VCSVERSION "unknown")
-+#endif()
- 
- 
- # ----------------------------------------------------------------------------
diff --git a/media-libs/opencv/opencv-2.4.13-r4.ebuild b/media-libs/opencv/opencv-2.4.13-r4.ebuild
deleted file mode 100644
index 1e5584759aa4..000000000000
--- a/media-libs/opencv/opencv-2.4.13-r4.ebuild
+++ /dev/null
@@ -1,230 +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 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? ( 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/opencv/opencv-3.4.1-r7.ebuild b/media-libs/opencv/opencv-3.4.1-r7.ebuild
deleted file mode 100644
index 76c7ada5db8c..000000000000
--- a/media-libs/opencv/opencv-3.4.1-r7.ebuild
+++ /dev/null
@@ -1,501 +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:=ninja}
-inherit java-pkg-opt-2 java-ant-2 python-r1 toolchain-funcs cmake-multilib
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="https://opencv.org"
-TINY_DNN_PV="1.0.0a3"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
-	contrib? (
-		https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
-		contribdnn? (
-			https://github.com/tiny-dnn/tiny-dnn/archive/v${TINY_DNN_PV}.tar.gz -> tiny-dnn-${TINY_DNN_PV}.tar.gz
-			https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz
-		)
-		contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
-	)"
-
-LICENSE="BSD"
-SLOT="0/3.4.1" # subslot = libopencv* soname version
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux"
-IUSE="contrib contribcvv contribdnn contribhdf contribsfm contribxfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnnsamples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg lapack opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
-# OpenGL needs gtk or Qt installed to activate, otherwise build system
-# will silently disable it Wwithout the user knowing, which defeats the
-# purpose of the opengl use flag.
-REQUIRED_USE="
-	cuda? ( tesseract? ( opencl ) )
-	dnnsamples? ( examples )
-	gflags? ( contrib )
-	glog? ( contrib )
-	contribcvv? ( contrib qt5 )
-	contribdnn? ( contrib )
-	contribhdf? ( contrib )
-	contribsfm? ( contrib eigen gflags glog )
-	contribxfeatures2d? ( contrib cuda )
-	java? ( python )
-	opengl? ( || ( gtk qt5 ) )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tesseract? ( contrib )"
-
-# 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? ( !qt5 )
-#	openmp? ( !threads )
-
-RDEPEND="
-	app-arch/bzip2[${MULTILIB_USEDEP}]
-	dev-libs/protobuf:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
-	contribhdf? ( sci-libs/hdf5 )
-	ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
-	gdal? ( sci-libs/gdal:= )
-	gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
-	glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-	)
-	gtk? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-		opengl? ( x11-libs/gtkglext[${MULTILIB_USEDEP}] )
-	)
-	ieee1394? (
-		media-libs/libdc1394[${MULTILIB_USEDEP}]
-		sys-libs/libraw1394[${MULTILIB_USEDEP}]
-	)
-	java? ( >=virtual/jre-1.6:* )
-	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	lapack? ( virtual/lapack )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/opengl[${MULTILIB_USEDEP}]
-		virtual/glu[${MULTILIB_USEDEP}]
-	)
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qttest:5
-		dev-qt/qtconcurrent:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	tesseract? ( app-text/tesseract[opencl=] )
-	threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] )
-	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-	v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
-	vtk? ( sci-libs/vtk[rendering] )
-	webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] )
-	xine? ( media-libs/xine-lib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	eigen? ( dev-cpp/eigen:3 )
-	java?  ( >=virtual/jdk-1.6 )
-	vaapi?  ( x11-libs/libva )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/opencv2/cvconfig.h
-	/usr/include/opencv2/opencv_modules.hpp
-	# [contrib_cvv]
-	/usr/include/opencv2/cvv.hpp
-	/usr/include/opencv2/cvv/call_meta_data.hpp
-	/usr/include/opencv2/cvv/cvv.hpp
-	/usr/include/opencv2/cvv/debug_mode.hpp
-	/usr/include/opencv2/cvv/dmatch.hpp
-	/usr/include/opencv2/cvv/filter.hpp
-	/usr/include/opencv2/cvv/final_show.hpp
-	/usr/include/opencv2/cvv/show_image.hpp
-	# [contrib_hdf]
-	/usr/include/opencv2/hdf.hpp
-	/usr/include/opencv2/hdf/hdf5.hpp
-	# [vtk]
-	/usr/include/opencv2/viz.hpp
-	/usr/include/opencv2/viz/types.hpp
-	/usr/include/opencv2/viz/viz3d.hpp
-	/usr/include/opencv2/viz/vizcore.hpp
-	/usr/include/opencv2/viz/widget_accessor.hpp
-	/usr/include/opencv2/viz/widgets.hpp
-	# [cudev]
-	/usr/include/opencv2/cudaarithm.hpp
-	/usr/include/opencv2/cudabgsegm.hpp
-	/usr/include/opencv2/cudacodec.hpp
-	/usr/include/opencv2/cudafeatures2d.hpp
-	/usr/include/opencv2/cudafilters.hpp
-	/usr/include/opencv2/cudaimgproc.hpp
-	/usr/include/opencv2/cudalegacy.hpp
-	/usr/include/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
-	/usr/include/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
-	/usr/include/opencv2/cudalegacy/NCV.hpp
-	/usr/include/opencv2/cudalegacy/NCVPyramid.hpp
-	/usr/include/opencv2/cudalegacy/NPP_staging.hpp
-	/usr/include/opencv2/cudaobjdetect.hpp
-	/usr/include/opencv2/cudaoptflow.hpp
-	/usr/include/opencv2/cudastereo.hpp
-	/usr/include/opencv2/cudawarping.hpp
-	/usr/include/opencv2/cudev/block/block.hpp
-	/usr/include/opencv2/cudev/block/detail/reduce.hpp
-	/usr/include/opencv2/cudev/block/detail/reduce_key_val.hpp
-	/usr/include/opencv2/cudev/block/dynamic_smem.hpp
-	/usr/include/opencv2/cudev/block/reduce.hpp
-	/usr/include/opencv2/cudev/block/scan.hpp
-	/usr/include/opencv2/cudev/block/vec_distance.hpp
-	/usr/include/opencv2/cudev/common.hpp
-	/usr/include/opencv2/cudev/expr/binary_func.hpp
-	/usr/include/opencv2/cudev/expr/binary_op.hpp
-	/usr/include/opencv2/cudev/expr/color.hpp
-	/usr/include/opencv2/cudev/expr/deriv.hpp
-	/usr/include/opencv2/cudev/expr/expr.hpp
-	/usr/include/opencv2/cudev/expr/per_element_func.hpp
-	/usr/include/opencv2/cudev/expr/reduction.hpp
-	/usr/include/opencv2/cudev/expr/unary_func.hpp
-	/usr/include/opencv2/cudev/expr/unary_op.hpp
-	/usr/include/opencv2/cudev/expr/warping.hpp
-	/usr/include/opencv2/cudev/functional/color_cvt.hpp
-	/usr/include/opencv2/cudev/functional/detail/color_cvt.hpp
-	/usr/include/opencv2/cudev/functional/functional.hpp
-	/usr/include/opencv2/cudev/functional/tuple_adapter.hpp
-	/usr/include/opencv2/cudev/grid/copy.hpp
-	/usr/include/opencv2/cudev/grid/detail/copy.hpp
-	/usr/include/opencv2/cudev/grid/detail/histogram.hpp
-	/usr/include/opencv2/cudev/grid/detail/integral.hpp
-	/usr/include/opencv2/cudev/grid/detail/minmaxloc.hpp
-	/usr/include/opencv2/cudev/grid/detail/pyr_down.hpp
-	/usr/include/opencv2/cudev/grid/detail/pyr_up.hpp
-	/usr/include/opencv2/cudev/grid/detail/reduce.hpp
-	/usr/include/opencv2/cudev/grid/detail/reduce_to_column.hpp
-	/usr/include/opencv2/cudev/grid/detail/reduce_to_row.hpp
-	/usr/include/opencv2/cudev/grid/detail/split_merge.hpp
-	/usr/include/opencv2/cudev/grid/detail/transform.hpp
-	/usr/include/opencv2/cudev/grid/detail/transpose.hpp
-	/usr/include/opencv2/cudev/grid/histogram.hpp
-	/usr/include/opencv2/cudev/grid/integral.hpp
-	/usr/include/opencv2/cudev/grid/pyramids.hpp
-	/usr/include/opencv2/cudev/grid/reduce.hpp
-	/usr/include/opencv2/cudev/grid/reduce_to_vec.hpp
-	/usr/include/opencv2/cudev/grid/split_merge.hpp
-	/usr/include/opencv2/cudev/grid/transform.hpp
-	/usr/include/opencv2/cudev/grid/transpose.hpp
-	/usr/include/opencv2/cudev.hpp
-	/usr/include/opencv2/cudev/ptr2d/constant.hpp
-	/usr/include/opencv2/cudev/ptr2d/deriv.hpp
-	/usr/include/opencv2/cudev/ptr2d/detail/gpumat.hpp
-	/usr/include/opencv2/cudev/ptr2d/extrapolation.hpp
-	/usr/include/opencv2/cudev/ptr2d/glob.hpp
-	/usr/include/opencv2/cudev/ptr2d/gpumat.hpp
-	/usr/include/opencv2/cudev/ptr2d/interpolation.hpp
-	/usr/include/opencv2/cudev/ptr2d/lut.hpp
-	/usr/include/opencv2/cudev/ptr2d/mask.hpp
-	/usr/include/opencv2/cudev/ptr2d/remap.hpp
-	/usr/include/opencv2/cudev/ptr2d/resize.hpp
-	/usr/include/opencv2/cudev/ptr2d/texture.hpp
-	/usr/include/opencv2/cudev/ptr2d/traits.hpp
-	/usr/include/opencv2/cudev/ptr2d/transform.hpp
-	/usr/include/opencv2/cudev/ptr2d/warping.hpp
-	/usr/include/opencv2/cudev/ptr2d/zip.hpp
-	/usr/include/opencv2/cudev/util/atomic.hpp
-	/usr/include/opencv2/cudev/util/detail/tuple.hpp
-	/usr/include/opencv2/cudev/util/detail/type_traits.hpp
-	/usr/include/opencv2/cudev/util/limits.hpp
-	/usr/include/opencv2/cudev/util/saturate_cast.hpp
-	/usr/include/opencv2/cudev/util/simd_functions.hpp
-	/usr/include/opencv2/cudev/util/tuple.hpp
-	/usr/include/opencv2/cudev/util/type_traits.hpp
-	/usr/include/opencv2/cudev/util/vec_math.hpp
-	/usr/include/opencv2/cudev/util/vec_traits.hpp
-	/usr/include/opencv2/cudev/warp/detail/reduce.hpp
-	/usr/include/opencv2/cudev/warp/detail/reduce_key_val.hpp
-	/usr/include/opencv2/cudev/warp/reduce.hpp
-	/usr/include/opencv2/cudev/warp/scan.hpp
-	/usr/include/opencv2/cudev/warp/shuffle.hpp
-	/usr/include/opencv2/cudev/warp/warp.hpp
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.0-gles.patch"
-	"${FILESDIR}/${PN}-3.4.0-disable-download.patch"
-	"${FILESDIR}/${P}-compilation-C-mode.patch" # https://bugs.gentoo.org/656530
-	"${FILESDIR}/${P}-python-lib-suffix-hack.patch"
-	"${FILESDIR}/${P}-cuda-add-relaxed-constexpr.patch"
-	"${FILESDIR}/${P}-remove-git-autodetect.patch"
-	"${FILESDIR}/${P}-fix-build-with-va.patch" # bug https://bugs.gentoo.org/656576
-	"${FILESDIR}/${P}-popcnt.patch" # https://bugs.gentoo.org/633900
-	"${FILESDIR}/${P}-fix-on-x86.patch" # https://bugs.gentoo.org/682104
-	"${FILESDIR}/${P}-python37.patch" # https://bugs.gentoo.org/691480
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	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 -e '/add_subdirectory(.*3rdparty.*)/ d' \
-		-i CMakeLists.txt cmake/*cmake || die
-
-	if use dnnsamples; then
-		mv  "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die
-	fi
-
-	if use contrib; then
-		cd  "${WORKDIR}/${PN}_contrib-${PV}" || die
-		eapply "${FILESDIR}/${PN}-3.3.0-remove-tiny-dnn-autodownload.patch"
-
-		if use contribxfeatures2d; then
-			mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
-		fi
-	fi
-
-	java-pkg-opt-2_src_prepare
-
-	# this really belongs in src_prepare() too
-	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
-}
-
-multilib_src_configure() {
-	# please dont sort here, order is the same as in CMakeLists.txt
-	GLOBALCMAKEARGS=(
-	# Optional 3rd party components
-	# ===================================================
-		-DENABLE_DOWNLOAD=OFF
-		-DWITH_1394=$(usex ieee1394)
-	#	-DWITH_AVFOUNDATION=OFF # IOS
-		-DWITH_VTK=$(multilib_native_usex vtk)
-		-DWITH_EIGEN=$(usex eigen)
-		-DWITH_VFW=OFF # Video windows support
-		-DWITH_FFMPEG=$(usex ffmpeg)
-		-DWITH_GSTREAMER=$(usex gstreamer)
-		-DWITH_GSTREAMER_0_10=OFF	# Don't want this
-		-DWITH_GTK=$(usex gtk)
-		-DWITH_GTK_2_X=$(usex gtk)
-		-DWITH_IPP=OFF
-		-DWITH_JASPER=OFF
-		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_WEBP=$(usex webp)
-		-DWITH_OPENEXR=$(usex openexr)
-		-DWITH_OPENGL=$(usex opengl)
-		-DWITH_OPENVX=OFF
-		-DWITH_OPENNI=OFF	# Not packaged
-		-DWITH_OPENNI2=OFF	# Not packaged
-		-DWITH_PNG=$(usex png)
-		-DWITH_GDCM=OFF
-		-DWITH_PVAPI=OFF
-		-DWITH_GIGEAPI=OFF
-		-DWITH_ARAVIS=OFF
-		-DWITH_QT=$(multilib_native_usex qt5 5 OFF)
-		-DWITH_WIN32UI=OFF		# Windows only
-	#	-DWITH_QUICKTIME=OFF
-	#	-DWITH_QTKIT=OFF
-		-DWITH_TBB=$(usex threads)
-		-DWITH_OPENMP=$(usex openmp)
-		-DWITH_CSTRIPES=OFF
-		-DWITH_PTHREADS_PF=ON
-		-DWITH_TIFF=$(usex tiff)
-		-DWITH_UNICAP=OFF		# Not packaged
-		-DWITH_V4L=$(usex v4l)
-		-DWITH_LIBV4L=$(usex v4l)
-		-DWITH_DSHOW=ON			# direct show supp
-		-DWITH_MSMF=OFF
-		-DWITH_XIMEA=OFF	# Windows only
-		-DWITH_XINE=$(multilib_native_usex xine)
-		-DWITH_CLP=OFF
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_OPENCL_SVM=OFF
-		-DWITH_OPENCLAMDFFT=$(usex opencl)
-		-DWITH_OPENCLAMDBLAS=$(usex opencl)
-		-DWITH_DIRECTX=OFF
-		-DWITH_INTELPERC=OFF
-		-DWITH_IPP_A=OFF
-		-DWITH_MATLAB=OFF
-		-DWITH_VA=$(usex vaapi)
-		-DWITH_VA_INTEL=$(usex vaapi)
-		-DWITH_GDAL=$(multilib_native_usex gdal)
-		-DWITH_GPHOTO2=$(usex gphoto2)
-		-DWITH_LAPACK=$(multilib_native_usex lapack)
-		-DWITH_ITT=OFF # 3dparty libs itt_notify
-	# ===================================================
-	# CUDA build components: nvidia-cuda-toolkit takes care of GCC version
-	# ===================================================
-		-DWITH_CUDA=$(multilib_native_usex cuda)
-		-DWITH_CUBLAS=$(multilib_native_usex cuda)
-		-DWITH_CUFFT=$(multilib_native_usex cuda)
-		-DWITH_NVCUVID=OFF
-#		-DWITH_NVCUVID=$(usex cuda)
-		-DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
-	# ===================================================
-	# OpenCV build components
-	# ===================================================
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
-		-DBUILD_ANDROID_EXAMPLES=OFF
-		-DBUILD_opencv_apps=
-		-DBUILD_DOCS=OFF # Doesn't install anyways.
-		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
-		-DBUILD_PERF_TESTS=OFF
-		-DBUILD_TESTS=$(multilib_native_usex testprograms)
-		-DBUILD_WITH_DEBUG_INFO=$(usex debug)
-	#	-DBUILD_WITH_STATIC_CRT=OFF
-		-DBUILD_WITH_DYNAMIC_IPP=OFF
-		-DBUILD_FAT_JAVA_LIB=$(multilib_native_usex java)
-	#	-DBUILD_ANDROID_SERVICE=OFF
-		-DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
-		-DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
-	# ===================================================
-	# OpenCV installation options
-	# ===================================================
-		-DINSTALL_CREATE_DISTRIB=OFF
-		-DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
-		-DINSTALL_TESTS=$(multilib_native_usex testprograms)
-		-DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
-	#	-DINSTALL_ANDROID_EXAMPLES=OFF
-		-DINSTALL_TO_MANGLED_PATHS=OFF
-		# opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
-		# to set its destination libdir
-		-DLIB_SUFFIX=
-	# ===================================================
-	# OpenCV build options
-	# ===================================================
-		-DENABLE_CCACHE=OFF
-		-DENABLE_PRECOMPILED_HEADERS=$(usex pch)
-		-DENABLE_SOLUTION_FOLDERS=OFF
-		-DENABLE_PROFILING=OFF
-		-DENABLE_COVERAGE=OFF
-
-		-DHAVE_opencv_java=$(multilib_native_usex java YES NO)
-		-DENABLE_NOISY_WARNINGS=OFF
-		-DOPENCV_WARNINGS_ARE_ERRORS=OFF
-		-DENABLE_IMPL_COLLECTION=OFF
-		-DENABLE_INSTRUMENTATION=OFF
-		-DGENERATE_ABI_DESCRIPTOR=OFF
-		-DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
-	# ===================================================
-	# things we want to be hard off or not yet figured out
-	# ===================================================
-		-DBUILD_PACKAGE=OFF
-	# ===================================================
-	# Not building protobuf but update files bug #631418
-	# ===================================================
-		-DBUILD_PROTOBUF=OFF
-		-DPROTOBUF_UPDATE_FILES=ON
-	# ===================================================
-	# things we want to be hard enabled not worth useflag
-	# ===================================================
-		-DCMAKE_SKIP_RPATH=ON
-		-DOPENCV_DOC_INSTALL_PATH=
-	# ==================================================
-	# cpu flags, should solve 633900
-	#===================================================
-		-DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
-		-DCPU_DISPATCH=
-		-DENABLE_SSE=$(usex cpu_flags_x86_sse)
-		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2)
-		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3)
-		-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3)
-		-DENABLE_SSE41=$(usex cpu_flags_x86_sse4_1)
-		-DENABLE_SSE42=$(usex cpu_flags_x86_sse4_2)
-		-DENABLE_POPCNT=$(usex cpu_flags_x86_popcnt)
-		-DENABLE_AVX=$(usex cpu_flags_x86_avx)
-		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2)
-		-DENABLE_FMA3=$(usex cpu_flags_x86_fma3)
-	)
-
-	# ===================================================
-	# OpenCV Contrib Modules
-	# ===================================================
-	if use contrib; then
-		GLOBALCMAKEARGS+=(
-			-DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
-			-DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
-			-DBUILD_opencv_dnns_easily_fooled=OFF
-			-DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
-			-DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
-			-DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
-			-DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
-		)
-
-		if multilib_is_native_abi; then
-			GLOBALCMAKEARGS+=(
-				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
-			)
-		else
-			GLOBALCMAKEARGS+=(
-				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
-			)
-		fi
-	fi
-
-	# workaround for bug 413429
-	tc-export CC CXX
-
-	local mycmakeargs=( ${GLOBALCMAKEARGS[@]}
-		-DPYTHON_EXECUTABLE=OFF
-		-DINSTALL_PYTHON_EXAMPLES=OFF
-	)
-
-	cmake-utils_src_configure
-
-	# Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}
-	# TODO patch ocv_download to copy files into destination dirs
-	if use contribdnn; then
-		mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
-		cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
-	fi
-
-}
-
-python_module_compile() {
-	local BUILD_DIR=${orig_BUILD_DIR}
-	local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
-
-	# Set all python variables to load the correct Gentoo paths
-	mycmakeargs+=(
-		# python_setup alters PATH and sets this as wrapper
-		# to the correct interpreter we are building for
-		-DPYTHON_DEFAULT_EXECUTABLE=python
-		-DINSTALL_PYTHON_EXAMPLES=$(usex examples)
-		-DLIBPY_SUFFIX=64
-	)
-
-	# Regenerate cache file. Can't use rebuild_cache as it won't
-	# have the Gentoo specific options.
-	rm -rf CMakeCache.txt || die "rm failed"
-	cmake-utils_src_configure
-	cmake-utils_src_compile
-	cmake-utils_src_install
-
-	# Remove compiled binary so new version compiles
-	# Avoid conflicts with new module builds as build system doesn't
-	# really support it.
-	rm -rf modules/python2 || die "rm failed"
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	# Build and install the python modules for all targets
-	if multilib_is_native_abi && use python; then
-		local orig_BUILD_DIR=${BUILD_DIR}
-		python_foreach_impl python_module_compile
-	fi
-}
diff --git a/media-libs/opencv/opencv-4.1.2-r1.ebuild b/media-libs/opencv/opencv-4.1.2-r1.ebuild
deleted file mode 100644
index 19a98b7fe06d..000000000000
--- a/media-libs/opencv/opencv-4.1.2-r1.ebuild
+++ /dev/null
@@ -1,493 +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 java-pkg-opt-2 java-ant-2 python-r1 toolchain-funcs cmake-multilib
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="https://opencv.org"
-TINY_DNN_PV="1.0.0a3"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
-	contrib? (
-		https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
-		contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
-		contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
-	)"
-
-LICENSE="BSD"
-SLOT="0/4.1.2" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="contrib contribcvv contribdnn contribhdf contribsfm contribxfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnnsamples -download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack opencl openexr opengl openmp opencvapps pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
-# OpenGL needs gtk or Qt installed to activate, otherwise build system
-# will silently disable it Wwithout the user knowing, which defeats the
-# purpose of the opengl use flag.
-REQUIRED_USE="
-	cuda? ( tesseract? ( opencl ) )
-	dnnsamples? ( examples )
-	gflags? ( contrib )
-	glog? ( contrib )
-	contribcvv? ( contrib qt5 )
-	contribdnn? ( contrib )
-	contribhdf? ( contrib )
-	contribsfm? ( contrib eigen gflags glog )
-	contribxfeatures2d? ( contrib download )
-	java? ( python )
-	opengl? ( || ( gtk qt5 ) )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tesseract? ( contrib )"
-
-# 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? ( !qt5 )
-#	openmp? ( !threads )
-
-RDEPEND="
-	app-arch/bzip2[${MULTILIB_USEDEP}]
-	dev-libs/protobuf:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
-	contribhdf? ( sci-libs/hdf5:= )
-	ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
-	gdal? ( sci-libs/gdal:= )
-	gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
-	glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-	)
-	gtk? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-		opengl? ( x11-libs/gtkglext[${MULTILIB_USEDEP}] )
-	)
-	ieee1394? (
-		media-libs/libdc1394[${MULTILIB_USEDEP}]
-		sys-libs/libraw1394[${MULTILIB_USEDEP}]
-	)
-	java? ( >=virtual/jre-1.6:* )
-	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	lapack? ( virtual/lapack )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/opengl[${MULTILIB_USEDEP}]
-		virtual/glu[${MULTILIB_USEDEP}]
-	)
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qttest:5
-		dev-qt/qtconcurrent:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	tesseract? ( app-text/tesseract[opencl=] )
-	threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] )
-	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-	v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
-	vtk? ( sci-libs/vtk[rendering] )
-	webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] )
-	xine? ( media-libs/xine-lib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	eigen? ( dev-cpp/eigen:3 )
-	java?  ( >=virtual/jdk-1.6 )
-	vaapi?  ( x11-libs/libva )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/opencv2/cvconfig.h
-	/usr/include/opencv2/opencv_modules.hpp
-	# [contrib_cvv]
-	/usr/include/opencv2/cvv.hpp
-	/usr/include/opencv2/cvv/call_meta_data.hpp
-	/usr/include/opencv2/cvv/cvv.hpp
-	/usr/include/opencv2/cvv/debug_mode.hpp
-	/usr/include/opencv2/cvv/dmatch.hpp
-	/usr/include/opencv2/cvv/filter.hpp
-	/usr/include/opencv2/cvv/final_show.hpp
-	/usr/include/opencv2/cvv/show_image.hpp
-	# [contrib_hdf]
-	/usr/include/opencv2/hdf.hpp
-	/usr/include/opencv2/hdf/hdf5.hpp
-	# [vtk]
-	/usr/include/opencv2/viz.hpp
-	/usr/include/opencv2/viz/types.hpp
-	/usr/include/opencv2/viz/viz3d.hpp
-	/usr/include/opencv2/viz/vizcore.hpp
-	/usr/include/opencv2/viz/widget_accessor.hpp
-	/usr/include/opencv2/viz/widgets.hpp
-	# [cudev]
-	/usr/include/opencv2/cudaarithm.hpp
-	/usr/include/opencv2/cudabgsegm.hpp
-	/usr/include/opencv2/cudacodec.hpp
-	/usr/include/opencv2/cudafeatures2d.hpp
-	/usr/include/opencv2/cudafilters.hpp
-	/usr/include/opencv2/cudaimgproc.hpp
-	/usr/include/opencv2/cudalegacy.hpp
-	/usr/include/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
-	/usr/include/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
-	/usr/include/opencv2/cudalegacy/NCV.hpp
-	/usr/include/opencv2/cudalegacy/NCVPyramid.hpp
-	/usr/include/opencv2/cudalegacy/NPP_staging.hpp
-	/usr/include/opencv2/cudaobjdetect.hpp
-	/usr/include/opencv2/cudaoptflow.hpp
-	/usr/include/opencv2/cudastereo.hpp
-	/usr/include/opencv2/cudawarping.hpp
-	/usr/include/opencv2/cudev/block/block.hpp
-	/usr/include/opencv2/cudev/block/detail/reduce.hpp
-	/usr/include/opencv2/cudev/block/detail/reduce_key_val.hpp
-	/usr/include/opencv2/cudev/block/dynamic_smem.hpp
-	/usr/include/opencv2/cudev/block/reduce.hpp
-	/usr/include/opencv2/cudev/block/scan.hpp
-	/usr/include/opencv2/cudev/block/vec_distance.hpp
-	/usr/include/opencv2/cudev/common.hpp
-	/usr/include/opencv2/cudev/expr/binary_func.hpp
-	/usr/include/opencv2/cudev/expr/binary_op.hpp
-	/usr/include/opencv2/cudev/expr/color.hpp
-	/usr/include/opencv2/cudev/expr/deriv.hpp
-	/usr/include/opencv2/cudev/expr/expr.hpp
-	/usr/include/opencv2/cudev/expr/per_element_func.hpp
-	/usr/include/opencv2/cudev/expr/reduction.hpp
-	/usr/include/opencv2/cudev/expr/unary_func.hpp
-	/usr/include/opencv2/cudev/expr/unary_op.hpp
-	/usr/include/opencv2/cudev/expr/warping.hpp
-	/usr/include/opencv2/cudev/functional/color_cvt.hpp
-	/usr/include/opencv2/cudev/functional/detail/color_cvt.hpp
-	/usr/include/opencv2/cudev/functional/functional.hpp
-	/usr/include/opencv2/cudev/functional/tuple_adapter.hpp
-	/usr/include/opencv2/cudev/grid/copy.hpp
-	/usr/include/opencv2/cudev/grid/detail/copy.hpp
-	/usr/include/opencv2/cudev/grid/detail/histogram.hpp
-	/usr/include/opencv2/cudev/grid/detail/integral.hpp
-	/usr/include/opencv2/cudev/grid/detail/minmaxloc.hpp
-	/usr/include/opencv2/cudev/grid/detail/pyr_down.hpp
-	/usr/include/opencv2/cudev/grid/detail/pyr_up.hpp
-	/usr/include/opencv2/cudev/grid/detail/reduce.hpp
-	/usr/include/opencv2/cudev/grid/detail/reduce_to_column.hpp
-	/usr/include/opencv2/cudev/grid/detail/reduce_to_row.hpp
-	/usr/include/opencv2/cudev/grid/detail/split_merge.hpp
-	/usr/include/opencv2/cudev/grid/detail/transform.hpp
-	/usr/include/opencv2/cudev/grid/detail/transpose.hpp
-	/usr/include/opencv2/cudev/grid/histogram.hpp
-	/usr/include/opencv2/cudev/grid/integral.hpp
-	/usr/include/opencv2/cudev/grid/pyramids.hpp
-	/usr/include/opencv2/cudev/grid/reduce.hpp
-	/usr/include/opencv2/cudev/grid/reduce_to_vec.hpp
-	/usr/include/opencv2/cudev/grid/split_merge.hpp
-	/usr/include/opencv2/cudev/grid/transform.hpp
-	/usr/include/opencv2/cudev/grid/transpose.hpp
-	/usr/include/opencv2/cudev.hpp
-	/usr/include/opencv2/cudev/ptr2d/constant.hpp
-	/usr/include/opencv2/cudev/ptr2d/deriv.hpp
-	/usr/include/opencv2/cudev/ptr2d/detail/gpumat.hpp
-	/usr/include/opencv2/cudev/ptr2d/extrapolation.hpp
-	/usr/include/opencv2/cudev/ptr2d/glob.hpp
-	/usr/include/opencv2/cudev/ptr2d/gpumat.hpp
-	/usr/include/opencv2/cudev/ptr2d/interpolation.hpp
-	/usr/include/opencv2/cudev/ptr2d/lut.hpp
-	/usr/include/opencv2/cudev/ptr2d/mask.hpp
-	/usr/include/opencv2/cudev/ptr2d/remap.hpp
-	/usr/include/opencv2/cudev/ptr2d/resize.hpp
-	/usr/include/opencv2/cudev/ptr2d/texture.hpp
-	/usr/include/opencv2/cudev/ptr2d/traits.hpp
-	/usr/include/opencv2/cudev/ptr2d/transform.hpp
-	/usr/include/opencv2/cudev/ptr2d/warping.hpp
-	/usr/include/opencv2/cudev/ptr2d/zip.hpp
-	/usr/include/opencv2/cudev/util/atomic.hpp
-	/usr/include/opencv2/cudev/util/detail/tuple.hpp
-	/usr/include/opencv2/cudev/util/detail/type_traits.hpp
-	/usr/include/opencv2/cudev/util/limits.hpp
-	/usr/include/opencv2/cudev/util/saturate_cast.hpp
-	/usr/include/opencv2/cudev/util/simd_functions.hpp
-	/usr/include/opencv2/cudev/util/tuple.hpp
-	/usr/include/opencv2/cudev/util/type_traits.hpp
-	/usr/include/opencv2/cudev/util/vec_math.hpp
-	/usr/include/opencv2/cudev/util/vec_traits.hpp
-	/usr/include/opencv2/cudev/warp/detail/reduce.hpp
-	/usr/include/opencv2/cudev/warp/detail/reduce_key_val.hpp
-	/usr/include/opencv2/cudev/warp/reduce.hpp
-	/usr/include/opencv2/cudev/warp/scan.hpp
-	/usr/include/opencv2/cudev/warp/shuffle.hpp
-	/usr/include/opencv2/cudev/warp/warp.hpp
-	# [opencv4]
-	/usr/include/opencv4/opencv2/core/cv_cpu_dispatch.h
-	/usr/include/opencv4/opencv2/core/cvdef.h
-	/usr/include/opencv4/opencv2/dnn.hpp
-	/usr/include/opencv4/opencv2/core/cuda/transform.hpp
-	/usr/include/opencv4/opencv2/core/opencl/runtime/opencl_core.hpp
-	/usr/include/opencv4/opencv2/cvconfig.h
-	/usr/include/opencv4/opencv2/core/utils/allocator_stats.impl.hpp
-	/usr/include/opencv4/opencv2/video/tracking.hpp
-	/usr/include/opencv4/opencv2/objdetect.hpp
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.0-gles.patch"
-	"${FILESDIR}/${PN}-3.4.0-disable-download.patch"
-	"${FILESDIR}/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch"
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	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 -e '/add_subdirectory(.*3rdparty.*)/ d' \
-		-i CMakeLists.txt cmake/*cmake || die
-
-	if use dnnsamples; then
-		mv  "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die
-	fi
-
-	if use contrib; then
-		cd  "${WORKDIR}/${PN}_contrib-${PV}" || die
-		if use contribxfeatures2d; then
-			mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
-		fi
-	fi
-
-	java-pkg-opt-2_src_prepare
-
-	# this really belongs in src_prepare() too
-	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
-}
-
-multilib_src_configure() {
-	# please dont sort here, order is the same as in CMakeLists.txt
-	GLOBALCMAKEARGS=(
-	# Optional 3rd party components
-	# ===================================================
-		-DENABLE_DOWNLOAD=$(usex download)
-		-DWITH_QUIRC=OFF # Do not have dependencies
-		-DWITH_1394=$(usex ieee1394)
-	#	-DWITH_AVFOUNDATION=OFF # IOS
-		-DWITH_VTK=$(multilib_native_usex vtk)
-		-DWITH_EIGEN=$(usex eigen)
-		-DWITH_VFW=OFF # Video windows support
-		-DWITH_FFMPEG=$(usex ffmpeg)
-		-DWITH_GSTREAMER=$(usex gstreamer)
-		-DWITH_GSTREAMER_0_10=OFF	# Don't want this
-		-DWITH_GTK=$(usex gtk)
-		-DWITH_GTK_2_X=$(usex gtk)
-		-DWITH_IPP=OFF
-		-DWITH_JASPER=OFF
-		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_WEBP=$(usex webp)
-		-DWITH_OPENEXR=$(usex openexr)
-		-DWITH_OPENGL=$(usex opengl)
-		-DWITH_OPENVX=OFF
-		-DWITH_OPENNI=OFF	# Not packaged
-		-DWITH_OPENNI2=OFF	# Not packaged
-		-DWITH_PNG=$(usex png)
-		-DWITH_GDCM=OFF
-		-DWITH_PVAPI=OFF
-		-DWITH_GIGEAPI=OFF
-		-DWITH_ARAVIS=OFF
-		-DWITH_QT=$(multilib_native_usex qt5 5 OFF)
-		-DWITH_WIN32UI=OFF		# Windows only
-	#	-DWITH_QUICKTIME=OFF
-	#	-DWITH_QTKIT=OFF
-		-DWITH_TBB=$(usex threads)
-		-DWITH_OPENMP=$(usex openmp)
-		-DWITH_CSTRIPES=OFF
-		-DWITH_PTHREADS_PF=ON
-		-DWITH_TIFF=$(usex tiff)
-		-DWITH_UNICAP=OFF		# Not packaged
-		-DWITH_V4L=$(usex v4l)
-		-DWITH_LIBV4L=$(usex v4l)
-		#-DWITH_DSHOW=ON			# direct show supp
-		-DWITH_MSMF=OFF
-		-DWITH_XIMEA=OFF	# Windows only
-		-DWITH_XINE=$(multilib_native_usex xine)
-		-DWITH_CLP=OFF
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_OPENCL_SVM=OFF
-		-DWITH_OPENCLAMDFFT=$(usex opencl)
-		-DWITH_OPENCLAMDBLAS=$(usex opencl)
-		-DWITH_DIRECTX=OFF
-		-DWITH_INTELPERC=OFF
-		-DWITH_IPP_A=OFF
-		-DWITH_MATLAB=OFF
-		-DWITH_VA=$(usex vaapi)
-		-DWITH_VA_INTEL=$(usex vaapi)
-		-DWITH_GDAL=$(multilib_native_usex gdal)
-		-DWITH_GPHOTO2=$(usex gphoto2)
-		-DWITH_LAPACK=$(multilib_native_usex lapack)
-		-DWITH_ITT=OFF # 3dparty libs itt_notify
-	# ===================================================
-	# CUDA build components: nvidia-cuda-toolkit takes care of GCC version
-	# ===================================================
-		-DWITH_CUDA=$(multilib_native_usex cuda)
-		-DWITH_CUBLAS=$(multilib_native_usex cuda)
-		-DWITH_CUFFT=$(multilib_native_usex cuda)
-		-DWITH_NVCUVID=OFF
-#		-DWITH_NVCUVID=$(usex cuda)
-		-DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
-	# ===================================================
-	# OpenCV build components
-	# ===================================================
-		-DBUILD_SHARED_LIBS=$(usex java OFF ON)
-		-DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
-		-DBUILD_ANDROID_EXAMPLES=OFF
-		-DBUILD_opencv_apps=$(usex opencvapps ON OFF)
-		-DBUILD_DOCS=OFF # Doesn't install anyways.
-		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
-		-DBUILD_PERF_TESTS=OFF
-		-DBUILD_TESTS=$(multilib_native_usex testprograms)
-		-DBUILD_WITH_DEBUG_INFO=$(usex debug)
-	#	-DBUILD_WITH_STATIC_CRT=OFF
-		-DBUILD_WITH_DYNAMIC_IPP=OFF
-		-DBUILD_FAT_JAVA_LIB=$(multilib_native_usex java)
-	#	-DBUILD_ANDROID_SERVICE=OFF
-		-DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
-		-DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
-	# ===================================================
-	# OpenCV installation options
-	# ===================================================
-		-DINSTALL_CREATE_DISTRIB=OFF
-		-DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
-		-DINSTALL_TESTS=$(multilib_native_usex testprograms)
-		-DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
-	#	-DINSTALL_ANDROID_EXAMPLES=OFF
-		-DINSTALL_TO_MANGLED_PATHS=OFF
-		-DOPENCV_GENERATE_PKGCONFIG=ON
-		# opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
-		# to set its destination libdir
-		-DLIB_SUFFIX=
-	# ===================================================
-	# OpenCV build options
-	# ===================================================
-		-DENABLE_CCACHE=OFF
-		-DENABLE_PRECOMPILED_HEADERS=$(usex pch)
-		-DENABLE_SOLUTION_FOLDERS=OFF
-		-DENABLE_PROFILING=OFF
-		-DENABLE_COVERAGE=OFF
-
-		-DHAVE_opencv_java=$(multilib_native_usex java YES NO)
-		-DENABLE_NOISY_WARNINGS=OFF
-		-DOPENCV_WARNINGS_ARE_ERRORS=OFF
-		-DENABLE_IMPL_COLLECTION=OFF
-		-DENABLE_INSTRUMENTATION=OFF
-		-DGENERATE_ABI_DESCRIPTOR=OFF
-		-DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
-	# ===================================================
-	# things we want to be hard off or not yet figured out
-	# ===================================================
-		-DBUILD_PACKAGE=OFF
-	# ===================================================
-	# Not building protobuf but update files bug #631418
-	# ===================================================
-		-DBUILD_PROTOBUF=OFF
-		-DPROTOBUF_UPDATE_FILES=ON
-	# ===================================================
-	# things we want to be hard enabled not worth useflag
-	# ===================================================
-		-DCMAKE_SKIP_RPATH=ON
-		-DOPENCV_DOC_INSTALL_PATH=
-	# ==================================================
-	# cpu flags, should solve 633900
-	#===================================================
-		-DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
-		-DCPU_BASELINE=$(printf "%s," "${cpu_flags[@]}")
-		-DCPU_DISPATCH=
-		-DBUILD_opencv_features2d=$(usex features2d ON OFF)
-	)
-
-	# ===================================================
-	# OpenCV Contrib Modules
-	# ===================================================
-	if use contrib; then
-		GLOBALCMAKEARGS+=(
-			-DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
-			-DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
-			-DBUILD_opencv_dnns_easily_fooled=OFF
-			-DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
-			-DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
-			-DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
-			-DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
-		)
-
-		if multilib_is_native_abi; then
-			GLOBALCMAKEARGS+=(
-				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
-			)
-		else
-			GLOBALCMAKEARGS+=(
-				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
-			)
-		fi
-	fi
-
-	# workaround for bug 413429
-	tc-export CC CXX
-
-	local mycmakeargs=( ${GLOBALCMAKEARGS[@]}
-		-DPYTHON_EXECUTABLE=OFF
-		-DINSTALL_PYTHON_EXAMPLES=OFF
-		-DBUILD_opencv_python2=OFF
-		-DBUILD_opencv_python3=OFF
-	)
-
-	cmake-utils_src_configure
-
-	# Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}
-	# TODO patch ocv_download to copy files into destination dirs
-	if use contribdnn; then
-		mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
-		cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
-	fi
-
-}
-
-python_module_compile() {
-	local BUILD_DIR=${orig_BUILD_DIR}
-	local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
-
-	# Set all python variables to load the correct Gentoo paths
-	mycmakeargs+=(
-		# python_setup alters PATH and sets this as wrapper
-		# to the correct interpreter we are building for
-		-DPYTHON_DEFAULT_EXECUTABLE=python
-		-DINSTALL_PYTHON_EXAMPLES=$(usex examples)
-	)
-
-	# Regenerate cache file. Can't use rebuild_cache as it won't
-	# have the Gentoo specific options.
-	rm -rf CMakeCache.txt || die "rm failed"
-	cmake-utils_src_configure
-	cmake-utils_src_compile
-	cmake-utils_src_install
-
-	# Remove compiled binary so new version compiles
-	# Avoid conflicts with new module builds as build system doesn't
-	# really support it.
-	rm -rf modules/python2 || die "rm failed"
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	# Build and install the python modules for all targets
-	if multilib_is_native_abi && use python; then
-		local orig_BUILD_DIR=${BUILD_DIR}
-		python_foreach_impl python_module_compile
-	fi
-}
diff --git a/media-libs/opencv/opencv-4.1.2-r3.ebuild b/media-libs/opencv/opencv-4.1.2-r3.ebuild
index 3fec493f57f6..0f86abb64113 100644
--- a/media-libs/opencv/opencv-4.1.2-r3.ebuild
+++ b/media-libs/opencv/opencv-4.1.2-r3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0/4.1.2" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux"
 IUSE="contrib contribcvv contribdnn contribhdf contribsfm contribxfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnnsamples -download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack opencl openexr opengl openmp opencvapps pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
 # OpenGL needs gtk or Qt installed to activate, otherwise build system
 # will silently disable it Wwithout the user knowing, which defeats the
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index d0241653336f..2a48109b19a1 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -8,5 +8,5 @@ AUX openexr-2.3.0-skip-bogus-tests.patch 1429 BLAKE2B fe9dcafb4ea5990cfcf36b16f3
 AUX openexr-2.3.0-tests-32bits-2.patch 586 BLAKE2B 83d36040f751e07f30c5cc3be10f8ac43d62d91b87b87bc2735ecc22426401b3b671d0b397e6a9a1fba351ae66e022c9bb488f95d29a9fbcca479d3d70501eac SHA512 5ffc8bda7e476ce71ee103b519c76e630371e5cc005b04f99d2c054580e387cc2b3b9598cbe4442415c5dfe85b0de8ceedf87079c3f738b7ebb737ea23ea7729
 AUX openexr-2.3.0-tests-32bits.patch 1537 BLAKE2B 96cc98ef34a6c18102e5b96f4373f41b77d25aaf04f9a20d0d406eeae17988cc6f3eecf805f6bac1e42805b283f3123455ca1b069d7c0dc04628835ded2d8dec SHA512 58ad1d8f5dc28be60cdc290c7829d8b50708d26f3a769530e054c629170457f6b7e2b526455f6f86d2ee24931d8afdb61345ada99ae49897d926c0d50fb579f6
 DIST openexr-2.3.0.tar.gz 18412067 BLAKE2B c73c4db4e414010ed8cc9f9631f3e8b17f47edf89b4ecb459aa00ff54a316b3bb1489e332bc029e0917ac4ffe7e152082244102029fd375f183da6741788dab7 SHA512 003f5bb3bd010be1ad9ff1798643ef711c683c8191625fe9b59070c9cb0c649c277cd506d890c6b239d9cbab80e83e16f1c1d1d74117c916ee3a80e061953123
-EBUILD openexr-2.3.0.ebuild 2190 BLAKE2B 4e6f5ab459d944446a549556e5eda5b1b521e5673787e4eeb11f0aac9427553b63aa095615e1fb1adc8a39529c653212563e16514a5e92ff5a59ec8bc77b9689 SHA512 34a09e52a17ccecca0b642b11bf776cf8e075f2b6605334f49b8d62af413c7fa7c5103d6495a42dfc5f219e754702fe5e5fd07a6a08c2baf3e86e6b201008a8f
+EBUILD openexr-2.3.0.ebuild 2195 BLAKE2B f62a5629023e2ede94da1516e76d377b3d15bea06eb5f2f048b471215fac740b6e69fca7384838673645ea8cbe21c8c541fa0300869624a8060fc33235fc58c2 SHA512 5723f5e6faad6b3fa802620bbf1e110625ec819ff709ad884518a00d97e917c109017971feee5b4f4338bfa5cabbacfc6ac2a732c8c0c46478f85b6cd6fd9ff4
 MISC metadata.xml 303 BLAKE2B 53fb5019bd6fe939d485f1eccb4a140ca9b7ce121b06744d8155842ccb6c5e1378ea39a9ae74c8d519be7b3926bd76040df4b8107137fcc2e25be97431e7a1be SHA512 0ab8d735dd7a8e0dc96b14cfde1ae06969d15cfbad956f4fda60b093660aee38fe98709376eedc9362a26858678d2f28eec795c1accb2560858fd804a11bb7ca
diff --git a/media-libs/openexr/openexr-2.3.0.ebuild b/media-libs/openexr/openexr-2.3.0.ebuild
index 1fee7ea7fa6b..5cb1f98b83bd 100644
--- a/media-libs/openexr/openexr-2.3.0.ebuild
+++ b/media-libs/openexr/openexr-2.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=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools flag-o-matic toolchain-funcs multilib-minimal
 
 DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="http://openexr.com/"
+HOMEPAGE="https://www.openexr.com/"
 SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/media-libs/qtav/Manifest b/media-libs/qtav/Manifest
index 29492732dd56..ae139ee9fdd5 100644
--- a/media-libs/qtav/Manifest
+++ b/media-libs/qtav/Manifest
@@ -2,7 +2,8 @@ AUX qtav-1.12.0-ffmpeg4-1.patch 1225 BLAKE2B 392c7290067aef2132e7024e268af250221
 AUX qtav-1.12.0-ffmpeg4-2.patch 5467 BLAKE2B b638548b1b66aeef0d10f381a2484528c93be1b14e6eb1099c36b77d9667ae4c20dd69279ba7e182da95be1e76048edac3e221f7a545563b2fe860d58814e0a0 SHA512 cc1c57444cae170498e2eff713c68106e3b829db3334f40a63530466a7a8c92532b41ee47a58e10676b8515929e6d3b5b1865c7842e3eaa676d7f89d820137c8
 AUX qtav-1.12.0-installpaths.patch 894 BLAKE2B d5e964a15566c5df08e35ad3dc6a666ce88a71bb260b0a0b56e2f6dfc1cc421a893e8104c740d911f805746ed4fd00f716453e58bd14ad80349a3b4c459f2006 SHA512 0eb3b37c86e29467db10263c94ea2efcd2fed014e49b1dc280c40c4ba0f63a7537260572aa786817df8e6bd503012b7e193ab0c9e66883f2eaf04c23976fa527
 AUX qtav-1.12.0-qt5.14.patch 443 BLAKE2B 80f2e2da6ef67cdd300257aba988dcdcb0a6a5215b806c862cf0a7d2fba7652aae27f5aa568f0bfbb1067b768be4c4d1a1458dab3e468cb7f55a1938e1c63b81 SHA512 1976e312bad83d0493be3af8652d537cca8905a1559d6dd021e4a3c234ac3e65e5743db6f2ac28bfd69ef8c2e0021b7d2144c8a4efea72dcc718bfc53e6d2370
+AUX qtav-1.12.0-qt5.15.patch 650 BLAKE2B cf5d5d5b4a30a1eb32ee38cd3f87c9df3a813eca19d342ba720521da8cc2c32eaabeb8a93bd56a25e456ef8fa9523bbbc4c832dbf22fd3831324bc96523a084e SHA512 156d6feb8bf0d9a3660f0341ceb3d2728d7b044ef4e3a9c7f81adbc262e3d30c4e8769a6059ef90601006d17f50f2259dcc533f223d0bcdc7467376b11f10899
 DIST qtav-1.12.0-capi.h-b43aa93.xz 6120 BLAKE2B b2aca6c4ae70e227728bf908a7b5b9ad9fcb4ba52a254362eaaefaa9480c6a1c551bf47f02f8a44273952bf2816d2dbc7dc92142264892547d4fe602184b5fba SHA512 f5e458b157a5f343bc5d4133cfe45ffefb5c6cbb902b41ae6b9d9349e31ca7ac5a2746addc4fef89fb74856f5db7691cf174d82e88b51cc0b7a356c4fdab5aa7
 DIST qtav-1.12.0.tar.gz 998117 BLAKE2B 85f8a470333e683353c305b06cec10f65b553c26b05fad4824d8f05f6aeb1fc2622ab8b60ba42a35260402a950bf41458e90342be6c53cbdb8400642c2d09741 SHA512 f273d10a4fe9126cd7d7b1293c087527bf898513e8add7958d905b6039b0c9c3891ea751c40e4c13ba683febff73912322953b151a131726ef8b44db199e0f32
-EBUILD qtav-1.12.0-r2.ebuild 1569 BLAKE2B f45ee920b1a1009d27b35b33280f1857cb627ab05cf24cfd5abd36f97b2818cee56afa992792df963ed0f352062144af6246221fe0d31274ba79d53171d99bf0 SHA512 de5551aa6d4f433cdb90243bafffc9010766a80a95c7d67e8cb3c4cc49460c7e956d8617bd21c7b532ff463862996ffd6100b57f9b3ed739c1e6cfc930a63a28
+EBUILD qtav-1.12.0-r2.ebuild 1602 BLAKE2B f852aea6ee28d9d86d3c76606a86422526d2643c1110c19412c3416389522f518924601f9f4772d9622f00dfe35059dea6d620dd97762353f26abd9f6ee37796 SHA512 d7dc9582dd2bcca5af83a1cc722c96181afbdab1c0ba14d5441ba3e051849088fcbe64495c95ee53faf6023e04f260b78f3feaae7c54a0a23e94d56dc7958d33
 MISC metadata.xml 389 BLAKE2B 6f4c10122acf9e5b30236f531b433ffc9cc46f9ddd6e6322bb5e17c70f60ba6ad0966eb93af1946a1df67e03cde1921ef24bad93fc115d5af84be848cbb04585 SHA512 145488dd0015ae2b014509610c33cf28e4e46e966bd37073d1199230297e66df520f3ac0afedd63c8eac20a7aa02ee492e5ad0658aa3b6fd660bd685b984161c
diff --git a/media-libs/qtav/files/qtav-1.12.0-qt5.15.patch b/media-libs/qtav/files/qtav-1.12.0-qt5.15.patch
new file mode 100644
index 000000000000..a992f59fac31
--- /dev/null
+++ b/media-libs/qtav/files/qtav-1.12.0-qt5.15.patch
@@ -0,0 +1,22 @@
+From 5263d9d9ee29303a919d33d52b15acda554226c5 Mon Sep 17 00:00:00 2001
+From: rezso <rezso@rezso.net>
+Date: Mon, 1 Jun 2020 13:30:21 +0200
+Subject: [PATCH] Fix build with Qt 5.15
+
+Solves https://github.com/wang-bin/QtAV/issues/1309
+---
+ src/QtAV/FilterContext.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/QtAV/FilterContext.h b/src/QtAV/FilterContext.h
+index 6d2f9a041..7cc2fc1c5 100644
+--- a/src/QtAV/FilterContext.h
++++ b/src/QtAV/FilterContext.h
+@@ -26,6 +26,7 @@
+ #include <QtCore/QByteArray>
+ #include <QtCore/QRect>
+ #include <QtGui/QPainter>
++#include <QtGui/QPainterPath>
+ /*
+  * QPainterFilterContext, D2DFilterContext, ...
+  */
diff --git a/media-libs/qtav/qtav-1.12.0-r2.ebuild b/media-libs/qtav/qtav-1.12.0-r2.ebuild
index 93df9f4f72ca..e9b3bbd54aeb 100644
--- a/media-libs/qtav/qtav-1.12.0-r2.ebuild
+++ b/media-libs/qtav/qtav-1.12.0-r2.ebuild
@@ -37,6 +37,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-installpaths.patch
 	"${FILESDIR}"/${P}-ffmpeg4-{1,2}.patch # bugs 660852, 670765
 	"${FILESDIR}"/${P}-qt5.14.patch
+	"${FILESDIR}"/${P}-qt5.15.patch
 )
 
 src_prepare() {
diff --git a/media-libs/woff2/Manifest b/media-libs/woff2/Manifest
index fd59dedeb104..8a3ae0677da6 100644
--- a/media-libs/woff2/Manifest
+++ b/media-libs/woff2/Manifest
@@ -1,4 +1,4 @@
 DIST woff2-1.0.2.tar.gz 38934 BLAKE2B b4a762cb2377b896147d9ebdae97f17e80bdb94fa8ec1b04e28e9df48c2f3456f83fc548b10a49bbc271bead349348f7582a85c5011f60a9feb4dda84920b6f3 SHA512 c788bba1530aec463e755e901f9342f4b599e3a07f54645fef1dc388ab5d5c30625535e5dd38e9e792e04a640574baa50eeefb6b7338ab403755f4a4e0c3044d
 EBUILD woff2-1.0.2-r1.ebuild 700 BLAKE2B 4dc0e4f28277c72609ed71dd30ed372fcd7727a2fb578b3547711a3f879b7c5248d559b906c72c0bd4fc08efdeacb0b16e95bc8b6501516c66a2cefb83b39576 SHA512 d4143c71529cbed6cb8cd21b08cc2d88767358dfed32223b832caaefbd0af6faba20c76a5d12865cda026d7830b2225c305ffbf18266acf28d47ea2dad87d190
-EBUILD woff2-1.0.2-r2.ebuild 879 BLAKE2B 7d785bb505f4eb5c4698c415f2a7b937b9d1599fd8ee69a8eab2930555a9040b381af7cc3b0cb7d3f049fcf1c6b076e3100c771128c991cc53019580b4f0db5a SHA512 e3d06a27755a0c0706045c9bddbf401224235b9484def783c5ea59beeb53914996318585a2f78454f2017f15ad950ab324d30c0661eed32b5482f7302ab88a10
+EBUILD woff2-1.0.2-r2.ebuild 875 BLAKE2B 1bdc804630d9fc181fc4f9d1b30b41a3df51a6a84f4c9104bbaa684cf87fba348ecda5fb0894c8501a94bed451ffb2a584f091b34197d3032b9f45229417630e SHA512 c2a0bfea9be54d30ba8c7bd571af8d7e4794441e0ad59e1f7d4764cf5e4e965e387fb421db5eb5f6820d0c07c253ec5410507171eb26f024525e256ae13f5024
 MISC metadata.xml 353 BLAKE2B 1cc153f5b5aaee1378bd1c42c3a85e0a156d853c63643e8b832b5517f8d7ff74c52552be3a11e3c0db7550daabfbb41d2618f89763baaf076ff4e327da03b7d0 SHA512 b3ceae6dd9b6556417a7633245e49463ee54759e8e8835583a15c8863c91e5669465a0fa1b22f066d99e0a1bfcd0df1537bddaba27cb6fb838ed356ca7f33a93
diff --git a/media-libs/woff2/woff2-1.0.2-r2.ebuild b/media-libs/woff2/woff2-1.0.2-r2.ebuild
index 9036f520f921..844fa73dc987 100644
--- a/media-libs/woff2/woff2-1.0.2-r2.ebuild
+++ b/media-libs/woff2/woff2-1.0.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="app-arch/brotli"
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 12001ef48205..6cd3fb531842 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/grilo-plugins/Manifest b/media-plugins/grilo-plugins/Manifest
index b64aa0d2d2ba..0b3a551791c5 100644
--- a/media-plugins/grilo-plugins/Manifest
+++ b/media-plugins/grilo-plugins/Manifest
@@ -1,6 +1,6 @@
 AUX 0.3.8-meson-goa.patch 2086 BLAKE2B 82bcd7de7d96caeed6f5448e36666acbb3870e4e8361c8890a73e031cb241261b98d8c97a3caf45187d2a7deebdf712a5447ccb29f96509a256eff8b5c257b6a SHA512 b5a6942092b32c91518e6142e7b0fbb46994eaa0f03eb83b0fbb561bf1ee27d435c1f0982cb036700fcff04bab27cf1080cb068bfdce44eeb6238f4f642c486d
 DIST grilo-plugins-0.3.11.tar.xz 1449408 BLAKE2B 8ed9bd49f779eadb486a13be3bbdee0df797ebffb7833eaf2632cbb6fac90b33e2f3c92223c7e6d268257aabd710e0b9fd6c8e9395bfae776990a64e7537b41a SHA512 eefeabf333568d06ce77ba865f2dc96592428ae41c459f51e2ea7f37914c2b3d52778e5548b7d49059f1e4b83c8c07e5a8798272c5ced0259de1900d9e3f6991
 DIST grilo-plugins-0.3.9.tar.xz 1418148 BLAKE2B 438aac490f2e099c40f5df15d8b3958dc29c4344e4846a3ff452561f60bf041fe2975b6c67b634f5f54721fd69e53f86c5008eadb3a402cbc8b479e805ab8221 SHA512 4700b08cab53afe0899edf7859a2e18608f6ed2016a9139694e8f1eb628c5b7318b04fe1633406fd1685a8dd54d1632b886352eac3192d52a1c1a1ac55896479
-EBUILD grilo-plugins-0.3.11.ebuild 2986 BLAKE2B 4412632902c9f668fa99257bdd9cfa45e9fb6ec831848517c9a6a06a157a7d540eb1f3f4c9fa15efc5ae772d6a9ee394fd4f0f406153d02d7528e3b98c01a653 SHA512 4296938c102066f6a5c4c031b10b06235eb7c513abe7c309471a3f40022eba01b0258d99b44bf84d32d4d4eb3511b92533b65e64e48ce6f982620f16d6e3c4ae
+EBUILD grilo-plugins-0.3.11.ebuild 2985 BLAKE2B fa0664fd49f8730d3f4405759c001f7db533ab23f87e5842a32b14829ece04252a6c01fcd63388a89ccedd7fe3b31b09cbd51398418c977f15813b15a38e7d2b SHA512 ad7d6890f37b1816a8608d226b7b34f610b9a8d9c81d9d454da1578611f12a5a1f4fc27faba5f2cf6ea4585de2d7493b58d9f90e3c4e2714f234254c6156e0ca
 EBUILD grilo-plugins-0.3.9.ebuild 3023 BLAKE2B fbeea375f6b4267966b6fd5eb8d181bf42b7487fbc8a025c2a87b10eda57bdeb35135a064e1993ed89c76c455b1dab43f7ff94581e9b0f30c1059e9752dad328 SHA512 9c1fa1f6a7d6fa47daf2c95829cac07ee0218fd45da547d4fc150a825a092e0141f2c201e575a458a9fc8bf3c6299f57303ed53f3a27cf9b51c826e41705a68c
 MISC metadata.xml 920 BLAKE2B c6119dc73ede7e500e3113f03677f81d65d4a2a524e84847f010e6c9215b96feed5fcaf400166471c25075742268cbe7639e23cd11447e0e795146b29dec797e SHA512 322b01e064c5656e9d9c7e2343d7feb76f35bd9ea6e5174ce3702747e5c4dd5de9ab60e9c91d72db171ad62a90f84eedcc03b3547ef7bc8e231090c7eaef9ac7
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.3.11.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.3.11.ebuild
index c47920d3ac60..d99a5ba77a65 100644
--- a/media-plugins/grilo-plugins/grilo-plugins-0.3.11.ebuild
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.3.11.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="daap chromaprint flickr freebox gnome-online-accounts lua test thetvdb tracker upnp-av +youtube"
 RESTRICT="!test? ( test )"
 
diff --git a/media-plugins/gst-plugins-a52dec/Manifest b/media-plugins/gst-plugins-a52dec/Manifest
index 1e223ea251d2..4c8e797dd230 100644
--- a/media-plugins/gst-plugins-a52dec/Manifest
+++ b/media-plugins/gst-plugins-a52dec/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2af33536719913ec10229eb6bc64f1f957bc7f6afe45e1c528ab4015c25dec61b8b9d2c517fee78a8a992c76bd41ff9e75d1 SHA512 0866bbcc3f1d0d668e77b5ef83fa7469dc80c957d2c6526126e761db46e83ff18d941c247833d27336106d8ba043e9ad50cafbddbff241f95bb16f9b1a0fbacc
 DIST gst-plugins-ugly-1.16.2.tar.xz 893964 BLAKE2B c607a7aa3459625a930021d247705f00e418e57557c57b8f9793bce74cb5c4d708b253250f0bbebd9698e9ff80d5636d578dded8c360ca2d34e3d43c9a722416 SHA512 9f393043f51b12b376607e68b3b86437af86e321e3a3566e59c7f3507ed26622211df87e30a23bcc927f37bc11f53ca3b29f1b12bf58e623ce18edc88a9cdee3
 EBUILD gst-plugins-a52dec-1.14.3.ebuild 443 BLAKE2B d0286a3b2f42fdafb69337c992ed8a231c0e5a8de9b7de572727474150e75c8fac8abf655eaef2576911f9b824b4655400293b354d7daa49fc83e37b16b669cd SHA512 81c5ddffca77dc295cfa49861508248aa23283f1dbc958ff11918efa6cfaddcc89843faa45c4618a01840ae361bd6379996d54e482f1c4f260564d8556b7ec97
-EBUILD gst-plugins-a52dec-1.16.2.ebuild 449 BLAKE2B 7271d4e838cf442a9cc518bac8fc5a660b44f935d2f4c050b3353dae37572309b6789bdc9c93db88063c51722d07c96aebd3b343aabba4a7d7359b60d2f6f63a SHA512 5c229fe03a44cdbf4b43383542f8e1bd61a6d44f6a0f0e7d5790127039437043cb3bdb1f119e0f4e5f2d93f4334dbcfa098d305efcdcbe520f3c63cab8f8fd32
+EBUILD gst-plugins-a52dec-1.16.2.ebuild 447 BLAKE2B 1929c33d456f100b6a72e11a7cf8cd5683fa262750c23d09c522637e26973b786d43cdae92bb0351fd37e2c2e56d990c419a4fbd938e9590dff26499a36ceb17 SHA512 11d6a292fa9878f8cc6f183b637f770f54e5e81f260c2397ed78c55a2ddd7ecfc1018e798bac7b77288e3fa6903d5b4fd52a58383bb3df3d4b5aeea4b1a0a242
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.16.2.ebuild b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.16.2.ebuild
index f1b7f0731f7d..ea99140ae620 100644
--- a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="ATSC A/52 audio decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-amr/Manifest b/media-plugins/gst-plugins-amr/Manifest
index 9ccffeef9d31..1f1cf59b0f9e 100644
--- a/media-plugins/gst-plugins-amr/Manifest
+++ b/media-plugins/gst-plugins-amr/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2af33536719913ec10229eb6bc64f1f957bc7f6afe45e1c528ab4015c25dec61b8b9d2c517fee78a8a992c76bd41ff9e75d1 SHA512 0866bbcc3f1d0d668e77b5ef83fa7469dc80c957d2c6526126e761db46e83ff18d941c247833d27336106d8ba043e9ad50cafbddbff241f95bb16f9b1a0fbacc
 DIST gst-plugins-ugly-1.16.2.tar.xz 893964 BLAKE2B c607a7aa3459625a930021d247705f00e418e57557c57b8f9793bce74cb5c4d708b253250f0bbebd9698e9ff80d5636d578dded8c360ca2d34e3d43c9a722416 SHA512 9f393043f51b12b376607e68b3b86437af86e321e3a3566e59c7f3507ed26622211df87e30a23bcc927f37bc11f53ca3b29f1b12bf58e623ce18edc88a9cdee3
 EBUILD gst-plugins-amr-1.14.3.ebuild 489 BLAKE2B 185373ff6163517e3d12103aafe64e69271118b29b8ed140e00f6698f1aba4092df85209e154f183044646de422678655c52d36eb899eaf6de69f1aa810ccb30 SHA512 b87ca1de4b2beecd0d104f748a7e826e99666d16980203804af49001f1424e2444d083e3de20b568726594371ca2d7c3ae28f990a754ecc965bb98acb97a0c16
-EBUILD gst-plugins-amr-1.16.2.ebuild 491 BLAKE2B da666ad6f411c2c13691bf819591859c106cde0f419b43fd9e6ae176e59d9affa16c5a55e86a775e031c7716ab7cc4077b34716e251c7a2d00e5c1c7467081de SHA512 0ebd3193612896a7bc168a726ac499b2ed844e4f9b3cb3a0ad54d29b72ad9e093e4038e1866ea3027e8995f52c2cc443505dadd441e846301529e84967bcb047
+EBUILD gst-plugins-amr-1.16.2.ebuild 490 BLAKE2B 4469947232361b4b78f2191636ea3cf4856a8b02f55a017946775949729e48fba71f906ef91145588e5a7c7daf26c42e22fcea1387551e3777985faa9348ee7c SHA512 5776b6ce54d6dc1e28c07fc7fc278f002d545d79a4c7b28057ffdacd527bfd62217acc3f5c0fa0550d5dce6fffcb7e6caa60d0fe8e232ec0bcd27cc4411b6ba2
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-amr/gst-plugins-amr-1.16.2.ebuild b/media-plugins/gst-plugins-amr/gst-plugins-amr-1.16.2.ebuild
index 17f5e5998072..9fa68c00dbd7 100644
--- a/media-plugins/gst-plugins-amr/gst-plugins-amr-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-amr/gst-plugins-amr-1.16.2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="AMRNB encoder/decoder and AMRWB decoder plugin for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-assrender/Manifest b/media-plugins/gst-plugins-assrender/Manifest
index 1f3099920fb4..f2419685da3f 100644
--- a/media-plugins/gst-plugins-assrender/Manifest
+++ b/media-plugins/gst-plugins-assrender/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-assrender-1.14.5.ebuild 398 BLAKE2B 26d6e39579c44a31c96892a409a39d464e1c6ebb99fcc1ddbea24e9f8612a09104c277276328518303d546ed38a6663911cdc4c427c3a89db4a79dd458d1adf3 SHA512 3f86d5cdd0d9dac391414cb6cb76512fc0b34635b928f84101322f00250e7b367fcaf9bb66e2ca2200b1ce913c2709b221c452a516953279aefabdfc0a566fab
-EBUILD gst-plugins-assrender-1.16.2.ebuild 404 BLAKE2B be851336ee858d0d95465517f4faabc513d218504fa26e3fd047f20d01b00896a416dbc4074286b65e061d47dbf40f3bcba2cad3cdd0240edb58be551ae406e6 SHA512 edbf85bde80f578ca8705b54bdd649196c92241ffb4b0a263b6d25f9e8114e856b81a3db9f23e1ba4286a2427c3fd6789ef9e2532fd0bb68be8471537804b074
+EBUILD gst-plugins-assrender-1.16.2.ebuild 402 BLAKE2B 7d18f925363c3be4062e87e59a2a361a98fb366e010af3ad11b221f1f123263bcc135091fce383f6939657e51cbe7bbf20688113e269a4791477dc8d20eaa88b SHA512 75b5783edff7273e48450f2114ee7aaed764b4b28b8076fd413e797ff62aa3462108e499b67d243a68570c05d555292dc68d4ade7db6e5dbe8dab506f3a05462
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.16.2.ebuild b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.16.2.ebuild
index 762c52ab6bca..007516ad48ca 100644
--- a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="ASS/SSA rendering with effects support plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-bluez/Manifest b/media-plugins/gst-plugins-bluez/Manifest
index 9ab6e92caac6..d9fef54d7c98 100644
--- a/media-plugins/gst-plugins-bluez/Manifest
+++ b/media-plugins/gst-plugins-bluez/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-bluez-1.14.5.ebuild 361 BLAKE2B 01dc807429ce2f5818ede7ad6f842ed8a2e18dd2b2edac4608e1b8f2841bea0bdea546082e0531ce02ab0b3f23ca1036a6fcebf06978e70fe3176a51335f7051 SHA512 e651a5ce9fe6b175f0bef8d38a2406c68ab4b4991d5a4e5aa8c1619ccb67c933a347328ed4de360fb73a259535dbb60a3921c4c5192c114ba00abf5c55a1a678
-EBUILD gst-plugins-bluez-1.16.2.ebuild 363 BLAKE2B 6a7e5c490fef16cc2c42a2728b8cbde27c305ccda3aad33abcb2adea78ca3915c51307267a6ea11ff4ea9db5a549bb02776e3cc81a4c89e0d7cda9fa83648e31 SHA512 2f334e02a1d405b8f202aadc936efb180de831146a4f79f743f4e67c01ddca03c6e481961e6533495367e363236eb65235de4492fe985d68b0e6eecfa58adcdf
+EBUILD gst-plugins-bluez-1.16.2.ebuild 362 BLAKE2B 974eac41423b99506eba41e98a0de9ce9022a1e9cfb8b37b8b074090836b9e063cfe1ed5c0096f7978c88dc8f1f3b0dfc8e1a25ccd4b192cabf3f6e2c2b18f72 SHA512 366f7f831b475f7494126d66fb3a656ead966af532496ea63b5b3ce36dfc3329fcbcece3d5291322b730b44a536c86fd88176c6c20dcca10f945ddf1dee4258f
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.16.2.ebuild b/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.16.2.ebuild
index af244952ef83..56af0f7bbf7b 100644
--- a/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="AVDTP source/sink and A2DP sink plugin for GStreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-bs2b/Manifest b/media-plugins/gst-plugins-bs2b/Manifest
index ee305e201377..64dc36f89616 100644
--- a/media-plugins/gst-plugins-bs2b/Manifest
+++ b/media-plugins/gst-plugins-bs2b/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-bs2b-1.14.5.ebuild 307 BLAKE2B 9ce161dc51a6581ebd198ec5595aa3fe36e706511166f33321370d51f4dc703d341ca859082f0d6f90a8d64fd44473db4986cce060166f487f14bc1546484c99 SHA512 0e2e4116b8e9c3906de2de4645765a7931fa0a323504f1871a40d14b5f9542ab9f35a7b2d92683ec40401597ea8c479b4dd9a0a79582f5be045bd660b77c569a
-EBUILD gst-plugins-bs2b-1.16.2.ebuild 309 BLAKE2B 35e2febf271451211b4cf9e8239510e510d4436f0d2829c7aa939bebb58be90203fc760c37467c6da4e3df85bd539e21a50aaff1d89d1e95d60e4dfef9db9ebd SHA512 d66ee9a8bb452f01610623a461dee414d5efb32d65408309f384c18093ad21c2a62c98ede028628878d903417cda8cbb7b853b6403031a731c907fb05b5855f0
+EBUILD gst-plugins-bs2b-1.16.2.ebuild 308 BLAKE2B 2505eae716f3b951122bc2376ae9a0120fa4bf20627780c3440b36d3af23c509236c6858808c53ef3b2d6799bca4335df6cf6cafc01407ac2d81565e664b6068 SHA512 a485df1ba05990de614064da46aadb03da8de5ae1617678ce70a803656fdb3ed7ea020d06b306b25729aec2ad22cf8119b2eadf4636b0a994e0953574764747a
 MISC metadata.xml 373 BLAKE2B 6e4682246da86a7f498c11bb63a8c8acd13d6b62c527db46a4030ae641d8f86d8e6fdfb67af1e53043fd3ea0c54086d67944c99a08f693a15e59d887fd99c977 SHA512 e0a9334a77c4ab15b765c27ace9033ea1aac985a2050e5048dccc4af340ed4fab99b79c6b40a2b668b2559d5bcdcd2076091f7376af3b973df8eb3236ce43956
diff --git a/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.16.2.ebuild b/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.16.2.ebuild
index 46b208d122e1..0082680156e7 100644
--- a/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="bs2b elements for Gstreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-cdio/Manifest b/media-plugins/gst-plugins-cdio/Manifest
index 1c909fa07265..acb1d74d394e 100644
--- a/media-plugins/gst-plugins-cdio/Manifest
+++ b/media-plugins/gst-plugins-cdio/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2af33536719913ec10229eb6bc64f1f957bc7f6afe45e1c528ab4015c25dec61b8b9d2c517fee78a8a992c76bd41ff9e75d1 SHA512 0866bbcc3f1d0d668e77b5ef83fa7469dc80c957d2c6526126e761db46e83ff18d941c247833d27336106d8ba043e9ad50cafbddbff241f95bb16f9b1a0fbacc
 DIST gst-plugins-ugly-1.16.2.tar.xz 893964 BLAKE2B c607a7aa3459625a930021d247705f00e418e57557c57b8f9793bce74cb5c4d708b253250f0bbebd9698e9ff80d5636d578dded8c360ca2d34e3d43c9a722416 SHA512 9f393043f51b12b376607e68b3b86437af86e321e3a3566e59c7f3507ed26622211df87e30a23bcc927f37bc11f53ca3b29f1b12bf58e623ce18edc88a9cdee3
 EBUILD gst-plugins-cdio-1.14.3.ebuild 372 BLAKE2B 5beab6b0533973ff69fcb4c6a9a0378750c11ccbc4126381a6bbee698100d19217ce22abc0513a6e7971d0fff669c082a3af758483ab16a7296db1e269d6e027 SHA512 6857a2451b78839f6bc94aa45c398983272f2d87da9cf6dab72af6b093d66fbfd9e01c1c6cc0d6ef3dc94c5ca12c7153f59fa0f4dd5b1361de355f1360f40b68
-EBUILD gst-plugins-cdio-1.16.2.ebuild 376 BLAKE2B 22f8fa49e3d118f6d8661fbcfa54c12013a22768f80b6d72441d2e81ec5a16182eb8590df4cebfc68500edcac7a772e5bb7e8b4fb090bc3e8781538f06def271 SHA512 c4f0cc2dc21b4bd99585354aa7d0bb4fc4746116ed67a61d0e7a6b920d3e5fd495be0c976576114c74f4eafa2c1601992006dca626a0255a165029dac6b47f38
+EBUILD gst-plugins-cdio-1.16.2.ebuild 375 BLAKE2B 888ae16d8c1fe4bad76d7db234588b61ae76dac81670005c5edfa9c48c8420bef760ee3f99757a6942354586d6d214ab649d144975532e0c22d4aa77009fdb3e SHA512 10e4debb870816ae138b1834a8be28ea198c5e28485f4d12cc3e674fa0f8e9dc8a59cde9e1592b9584a257ef2631a88254c5a8cb3f940c5ff68f364c5ec2bdae
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.16.2.ebuild b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.16.2.ebuild
index 0ee6944e3d67..6f1ac6f9c3fb 100644
--- a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="CD Audio Source (cdda) plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/libcdio-0.90-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-cdparanoia/Manifest b/media-plugins/gst-plugins-cdparanoia/Manifest
index 5e09871d7203..5d7b70388b63 100644
--- a/media-plugins/gst-plugins-cdparanoia/Manifest
+++ b/media-plugins/gst-plugins-cdparanoia/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-base-1.14.5.tar.xz 3717076 BLAKE2B 461e90df614c60d7efce6fabcf8ad7a5cb68b5fc01b05761fa441d838d3155b5a2e7f9b9420b7e48b2eec49e4bcfbd39009a662db03a923f42c6f45c782795cd SHA512 4e81c44a5ea3b910f96d3e9251ba38a79feacead4f96adb92eab5a650695ca8d5313e3ec1df78fec04376cf3152d2eefd4d39f6c11dadc98a11e55bbf8c8ccdc
 DIST gst-plugins-base-1.16.2.tar.xz 3939868 BLAKE2B 7313e50dc0842f02cde0113462c8d4b393dafe271da6e2a1af89dc997f2ec77a9f06bc467516c607c8b7b822e49efd1af829440a28a9af8356ef07e7fa899968 SHA512 f28e71bba8ba25d4f18ba3a196f057721151f1ebf1309d808bd6771a3f9a68facfa1970dc4353b6f2fd1e8945edf5272854d328ea11ef399544f8b330f754a42
 EBUILD gst-plugins-cdparanoia-1.14.5.ebuild 475 BLAKE2B 2734efd3661b6453e9625a08777c555cbb618ed14a11772dbc7398ffe55c3f0e982435fe4da9fcdf1233baa459e4b0b43610e5c1466adecf68068ba670f6dae9 SHA512 d7da322158b303b68f726b061415665ace907e1bbfd405736870e23099c7049663b1362cf4309b97bbc617d69d1b05ac75e446a7a2b022b4f0055097b7e36694
-EBUILD gst-plugins-cdparanoia-1.16.2.ebuild 481 BLAKE2B 89fdc7a3a025d9f0bbbced3aeada7ebe5dcacc89e24f665d623dafed49f55103d01d410e8e248999ba461bf323725aad8ceda05cf3be18acc0e6b45673b4e637 SHA512 0f6141eac7a91208ffefa6ecb774835b2bf875d951eae463275b62c57f5deb989e7ee7bf61e7903037c99698d2713fe6db627c91eda8413db07ff46c721bde6e
+EBUILD gst-plugins-cdparanoia-1.16.2.ebuild 479 BLAKE2B 2ebc967b5ecc3ab32de0689d95724cceda41219f6ec88d4312faa9dba01a3e0e678a12f1b307aacaefb19ea95221b534d110c1c18a752ba1ca723cb587d15153 SHA512 40c83b116f9fec36e911cfea530b730a33848133e0d85da86f47f5e28bb3c88bcd999c5d0e4691ad353c21bb9a74ac1e72a27f1c60768e6ead7e4faf2ab743bb
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.16.2.ebuild b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.16.2.ebuild
index 68489be52999..a926b1bf206f 100644
--- a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-base
 inherit gstreamer
 
 DESCRIPTION="CD Audio Source (cdda) plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-sound/cdparanoia-3.10.2-r6[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-dash/Manifest b/media-plugins/gst-plugins-dash/Manifest
index c262cefb10b0..92d4f0fb22fd 100644
--- a/media-plugins/gst-plugins-dash/Manifest
+++ b/media-plugins/gst-plugins-dash/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-dash-1.14.5.ebuild 1265 BLAKE2B e85c74465d9040f73bf987bc953b8780cc57841e09eb6f5c03939dd6c216450922b24268291ca7e911a0b822ff0b7a39f1b9d08b494674579638ae7f5685d511 SHA512 75606fb32c828c269d6f71fa33ef0236ff514cf74b4c26a990665a4ab655d1ca6c766c8dadbef93b6ffb093210abfcf610bd69490fcc4df01bc6349765b6bf8d
-EBUILD gst-plugins-dash-1.16.2.ebuild 1267 BLAKE2B d309a6ea11749612a99c0f0bf8f03c44531891ed5486c710d4639cd9458ad696277d1a12495fa014deca76b85fff676584030cb7eacf6a0d9445b5931469f015 SHA512 9ed5d80a5600aa031050ce5f481bce0c4dd9e9f9327a73108647a61b8ac8270d05b79704c424fda1982474c965cdd52eb90ce39b2854fee6ed7c83cf9f4f5ede
+EBUILD gst-plugins-dash-1.16.2.ebuild 1266 BLAKE2B e3fea30fa95ee87395ab2d7b5f7aed5f9c603c308f642db3a2387d6cc9708c042e3f51ae54e4fd1de014effa372494fd9e965cdcb19ae1c99907148baf416623 SHA512 a21edc1419484d0be1e30661f5a574229f8272872b95664207fe3dc26016bbcd87925d15dad2bfbed47797f433303a37a0e56cca5c1dadaf24fd6a440c8029dd
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.16.2.ebuild b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.16.2.ebuild
index 1c26b6819766..c13ca1ab3cf0 100644
--- a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="MPEG-DASH plugin for GStreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-dtls/Manifest b/media-plugins/gst-plugins-dtls/Manifest
index 5a588e2277b3..619fe8cf66fb 100644
--- a/media-plugins/gst-plugins-dtls/Manifest
+++ b/media-plugins/gst-plugins-dtls/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-dtls-1.14.5.ebuild 426 BLAKE2B 3978a7c398acbba159f5e2e0145b5c2c878ad47cb392f5e871acd953dc0d766c05228f052b70bc4a41f7eb5c1321ac2d884fb040e6cab1e5cb004f5715b5b7b8 SHA512 688e6aae0385bf212dde3102131678fb0638728d810da2e1f7127207ede3d38320ae805036cfa15c9e0b075c8a7980f78ddad7ab027e5643ab485c69ac487067
-EBUILD gst-plugins-dtls-1.16.2.ebuild 428 BLAKE2B 3ceb5e7c29309374d70e5b1d69c82a1c201974c8f2581d4028efedccc4f4d8b3ba47029ab45d5769a1f85ab8399625637408b76f91bd067b75b831939081feb1 SHA512 3f92eb547b30b600d98918c80f3909a7b337ac6cab06fde27cd9865579b7594422aa3b225593bd6356c22852a0dd19dafa820abdda6fe7cccffd77a97ec2083e
+EBUILD gst-plugins-dtls-1.16.2.ebuild 427 BLAKE2B de099bd7bec023d717aa9cf540fd5abce461c9944d43181fa85401f75019536909026e4fec5783c9997ca49ec6d5d8ee954911f1ec54efea7c478a684efccd2a SHA512 bdd0dfc5a83c5754134a5c3dc7384c6db2551be15e108feb4e51dbbdb03e78a6848d2d1016dcad731e93727dbce640b0d43b4c3c5e564639c1959abe9763461d
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.16.2.ebuild b/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.16.2.ebuild
index 5e660c04ac30..fb477389f863 100644
--- a/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="DTLS encoder/decoder with SRTP support plugin for GStreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="libressl"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-dts/Manifest b/media-plugins/gst-plugins-dts/Manifest
index 00b2aa021f8a..9c7e57ddca38 100644
--- a/media-plugins/gst-plugins-dts/Manifest
+++ b/media-plugins/gst-plugins-dts/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-dts-1.14.5.ebuild 415 BLAKE2B 8e4b8940dc0e2e6bea7ab0ab545f5e661f3f67bb08a6881d7ebe266da599a21e3f439142d1a137dc991734197d10a001c0eca2464d45756cebb3082a971e39e6 SHA512 bae39fca79465968c81b16049f270967acb8b37ca64964add6e7fe332df7f5feaa9f0c0b30edcdb75848fad05d6a388cad40aeccc5dfb365f0475d94461b909c
-EBUILD gst-plugins-dts-1.16.2.ebuild 417 BLAKE2B f632b3130c2070e6724c9a5f20d982b1f19d31f4819b0da2bd8f4d06ffc9c710143c13bda6d03323b09359710d7f8a4267f53dcd030a99ed93940fd57eb21e16 SHA512 0b879a62ef0b574f74e81438aff50261deb02a3e99fa608ba6657337dc759fe9dcf96390e6757789a3dbaa2a254b24d4cd978a23bac96d3e3304cd78e8afbebf
+EBUILD gst-plugins-dts-1.16.2.ebuild 416 BLAKE2B 3dccc9a34cdd09b185d12d30f9dc9576705d5c9f4e9e5c5b3f47aeece292628807c4ffe7381628417c118c332a596f1a2966913a89f47ea07eec9c4819da4790 SHA512 008fd35f3c6786d1537d1380511e112604ea1ebdfe1dfbc85b6a4e24fc2654d48fcce8d39a105eb3b0f27135b75bbd616bd1a2657c281a80b41357bfab2a1c2b
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-plugins/gst-plugins-dts/gst-plugins-dts-1.16.2.ebuild b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.16.2.ebuild
index 2b018173cf74..5fec54b56840 100644
--- a/media-plugins/gst-plugins-dts/gst-plugins-dts-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="DTS audio decoder plugin for Gstreamer"
-KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 x86"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-dv/Manifest b/media-plugins/gst-plugins-dv/Manifest
index 097bdb518381..12f2ea61e5f4 100644
--- a/media-plugins/gst-plugins-dv/Manifest
+++ b/media-plugins/gst-plugins-dv/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-dv-1.14.5.ebuild 406 BLAKE2B 1440459d4068f2b5025b8df7b6c4bc34ddb0702aa2f22656280fe4e48413243079c5e5c6eda5ec14ae4c400ed7655a38623fc36e07daf3c67b8af692cf3d603d SHA512 180e3b18a185d7d0a7350729df9e8ed86984cb32a657c5b0abb3a51b513f611411ed62d758dd5de2958fd98f439f02eba732f8c1e9ffef74f17d94c778136ece
-EBUILD gst-plugins-dv-1.16.2.ebuild 410 BLAKE2B 30df138e42002b3d56a20ef14b4b48593fccc9d600a00cbae0631ce194fcf0ca7703c09b8dfc9636b4bc73b8efc1c85a1d764657fedbd45097de11a5bf0b581b SHA512 02beb0bc872162401c151725ac7a341b96fd2a9702f7bb247cfc0719703a620f8761e17a5b687267e272d704688b52ee005acdf5e3f6f0783d5354d921b51a5d
+EBUILD gst-plugins-dv-1.16.2.ebuild 409 BLAKE2B 6bcb35116d8a0c09bc0a5806dcf520468bb736f2c727935695926c3547552188935e12824bd7ded9ab216549190ac16adfabce8bfbc323d101dcd0807b9edc40 SHA512 d0feb78c339d31fff9ef1356b5e6a3b3dc181fd1cc1bc871cb9e6a7aca088bba87a416b321e953fa0055aa71cb03460854a22c1b1f70f627de7832ba7544c509
 MISC metadata.xml 380 BLAKE2B e30d4f36d092c662f4b2caf33ae705dcee14cadb22174b125686c45a8724a880b291d4683fbf6b06a1e8003cf18be831a368d617d872904a58b1e3fe70ae7ca6 SHA512 bcbeccb0d35ae268383fd3cff3c5739301777233f6769556b5793b3b34a0c5c6e6bbcafcad392e22a8ee441698dc508d9638c1c53eaa17b692ecf5a40ee6f27c
diff --git a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.16.2.ebuild b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.16.2.ebuild
index 513bcd9c059a..47701a7b0087 100644
--- a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="DV demuxer and decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-dvb/Manifest b/media-plugins/gst-plugins-dvb/Manifest
index cc1b345e80e4..c4582a7bd5c7 100644
--- a/media-plugins/gst-plugins-dvb/Manifest
+++ b/media-plugins/gst-plugins-dvb/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-dvb-1.14.5.ebuild 411 BLAKE2B 932f952b5636c5004280c8bbe4c3c39bac9db41e381014b2abb4bb3c5d31ea54384c02e128bfdd42684c84dafe4ed153f6696b948a3a7ff615fef906d085b012 SHA512 bdcecd83108eaced2ec689bb6c08f1bcd0492f302e466ec8669fecbc7939c03df8acf5ad82927d041fff051c0943cde50904cc950906211527babc833231609f
-EBUILD gst-plugins-dvb-1.16.2.ebuild 416 BLAKE2B ea45d091fa5ff8446a76d8f48dd0c4516618f602683df4f2fa9822de9cf80616a0ad024eeb547a1b5cbb476a3fa2f8f78b0ffe819bcb2da0ae90ae39feb0e239 SHA512 c61b5233cc04c21223a1d9cc1cd9eba69ef9dba50da70999f292580ec2151c331ccd45347cf6d58cbc64c3af8aa25ae074c820343095ace53a16f495b3e23f77
+EBUILD gst-plugins-dvb-1.16.2.ebuild 415 BLAKE2B 41eae049ccf76b7b02f839be1e268329bc16adab7c13ad0e42ffca8c4130de55785f728e7c61be7cb23fef4ccd7c641f6bbcf1e9597d14c9f395df3597792ae6 SHA512 65a8c536b2e6f68527529afb25a2e103b4a18851c01ffa158c4f1038d418d6817e80b6f348072fe21544f1ba11bf984b2fb01919eaceb550020f1529f5eb16e7
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.16.2.ebuild b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.16.2.ebuild
index 5b52ddbd4abe..3d6e999cbf8f 100644
--- a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPION="DVB device capture plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-plugins/gst-plugins-dvdread/Manifest b/media-plugins/gst-plugins-dvdread/Manifest
index a0ab1e947dc0..21f2d9494402 100644
--- a/media-plugins/gst-plugins-dvdread/Manifest
+++ b/media-plugins/gst-plugins-dvdread/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2af33536719913ec10229eb6bc64f1f957bc7f6afe45e1c528ab4015c25dec61b8b9d2c517fee78a8a992c76bd41ff9e75d1 SHA512 0866bbcc3f1d0d668e77b5ef83fa7469dc80c957d2c6526126e761db46e83ff18d941c247833d27336106d8ba043e9ad50cafbddbff241f95bb16f9b1a0fbacc
 DIST gst-plugins-ugly-1.16.2.tar.xz 893964 BLAKE2B c607a7aa3459625a930021d247705f00e418e57557c57b8f9793bce74cb5c4d708b253250f0bbebd9698e9ff80d5636d578dded8c360ca2d34e3d43c9a722416 SHA512 9f393043f51b12b376607e68b3b86437af86e321e3a3566e59c7f3507ed26622211df87e30a23bcc927f37bc11f53ca3b29f1b12bf58e623ce18edc88a9cdee3
 EBUILD gst-plugins-dvdread-1.14.3.ebuild 376 BLAKE2B e8964a05efc0d4aa99e63c58ae9749a61a2bf91b85653a324e012ac9e567ba2fe72905b4b9dd5b93c529cb94be0a0f501590af0a4620a01a64b73677947bb733 SHA512 b28bdc8d097d909043bba8c8bbfd09e06486dedf2a0afd15e4364f75104b4300f31d51b8c99d92639a86f9d64f645273f1318d64acd8b58d0c1801c6f05c4df3
-EBUILD gst-plugins-dvdread-1.16.2.ebuild 381 BLAKE2B 5548c539c13fee80bd716dbb06f3e97476152b7000688a0b150e0adbf4d31f43912cfa51471f022a013a4dcb1037ee35aff57ea0f79c98d33d456ac08c58fe5a SHA512 49d2ac2aaa5aeb520e63a7ed272393314f50d5ca8386ffe88d8a2e8f9c037c54453656c14404161aa52717d9e3544ce7bea0e9bb79bb18b374a55af5b161a618
+EBUILD gst-plugins-dvdread-1.16.2.ebuild 380 BLAKE2B d3a2e186390f04a1fbe8779d96d11a3bc695d29e6caec4bc59a1b02b35fce5841de2d2a08beeaea3bfff165b6cc968e37f72e5233cfd9f32e3b6bb89b0d3f16b SHA512 7fe68d9c6489a6130acde6147ceb0f9ed6d9388596ee1802da5542f9be66f47a72728ba1866a334b3bf6c9774d0fa3cd3fbb6de18232f5aacf48d0265ed0670b
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.16.2.ebuild b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.16.2.ebuild
index 51dc2d982e7f..2ebd8dfa81fd 100644
--- a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="DVD read plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libdvdread-4.2.0-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-faac/Manifest b/media-plugins/gst-plugins-faac/Manifest
index 00af2cc754e3..367eb95ac70b 100644
--- a/media-plugins/gst-plugins-faac/Manifest
+++ b/media-plugins/gst-plugins-faac/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-faac-1.14.5.ebuild 357 BLAKE2B 09919d8b49e5b5c67b5affa996cd6aba8b5781f305084b75be93537c039a7769995a52a244980fba0467b13ec22a9f3d628be569f6172b8544e7372d09257b88 SHA512 f6723783faa0304ad998c763593e2b33abe0f1d28290ac692666a77f92281c13a4d69e0aa9a4a0ba0df4a5954444bbb98fa98182e9d173710007945fa00d18b3
-EBUILD gst-plugins-faac-1.16.2.ebuild 361 BLAKE2B fd4e78b5c426eb17ff75cb2751d546f3841d5026541f7426ef9f6413d62074828c07a5216e11702277345581e6e7eb4a2f2b8c59c16167879fa9f1fa0f2ccec9 SHA512 9b1ab42e9ec7c40955e006cbfdf4eb5db79895cce940db1d33d7d1c2808e65ce5c29ac92f33d94c5d7160d0eadb6ca147fb97957cd5eb1882521163923eea540
+EBUILD gst-plugins-faac-1.16.2.ebuild 360 BLAKE2B baae2af891cd5495f876a953112f2a39289e6cb464dc266bfcd5d855feaa115d5ea93f048fe89bb614f1ba510d2a50beb67e468265bd2acf5013847641744867 SHA512 a6d663770f3c2b64b86f8e14bfc2d09e1af66f6079c616a7ce25302087f6a8975d59c725fdd42fb6ccd5117f5562af993d952719684754c911698fe9162e9341
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.16.2.ebuild b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.16.2.ebuild
index 741a48fa2e5b..4b4dd7aa9f88 100644
--- a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="AAC audio encoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-faad/Manifest b/media-plugins/gst-plugins-faad/Manifest
index 1c49a9f30855..253c177bb9b9 100644
--- a/media-plugins/gst-plugins-faad/Manifest
+++ b/media-plugins/gst-plugins-faad/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-faad-1.14.5.ebuild 363 BLAKE2B 3b33834ebc2cd8623c321a63c58ad9dc5c647ba0027bfc18a0bd16760a7fe4d59dd4611a7c25771ba0e3ea3f7e8dafac473723b7dc8d27adf33f878ce9c442ff SHA512 e2868cecd9deb137c81af882be2b6168ad789545dc10ca8e6c7757856b87462bdf8724318911f8a0d652cadaca9886452f7922d4077d054673501528d8bc5d5b
-EBUILD gst-plugins-faad-1.16.2.ebuild 367 BLAKE2B f0ad21f308a5307df4c9902f28416d0b6abd9cc154ac3afddffa4664d71c2233d2cbf50fedc12dd380dccef4a1dd5b4c97e41d40d317c926136d293a37be161e SHA512 423efca00005b1d9f63e1938bd737f0b3bd0f3ae30347f279c4f497a7d195815db604439b967f1bd0440f07a652cd97c299c010fbaee299b8da263a012f413f9
+EBUILD gst-plugins-faad-1.16.2.ebuild 366 BLAKE2B 11143fe073f05c8374b33d95780024efa3eb395ec46523658eea574a584dc4ce0d316788190c925e8c6b5d593ea1e82ffe16360d10d07a947fcc251f5c1fcd82 SHA512 ecd4d51392860381b32f42e405ab9c1be72a9105d4556a896ca50e524de6288ae2d8e4ed75623cfb8abda0f988b5dacef8627769c2d5ba9727de260caa6f5209
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.16.2.ebuild b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.16.2.ebuild
index 9ed83aa72abd..8b6209f8be29 100644
--- a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="AAC audio decoder plugin."
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-flac/Manifest b/media-plugins/gst-plugins-flac/Manifest
index a55dbd782bf5..e2b64fcc0d1e 100644
--- a/media-plugins/gst-plugins-flac/Manifest
+++ b/media-plugins/gst-plugins-flac/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-flac-1.14.5.ebuild 386 BLAKE2B 038d67891ff5766f89bd884648a53efc518d84ccf9ccd24d6c0d00b5e5d3d50f63f481fb4009a20290584a0f24d15a9687b246a5183228ab1a947c0630390271 SHA512 37cdef1d004601e22b1b89b5a505aac0b3d42bab8e9b572349529a3e1d7224c05940929d23ca04d2f9ef42d4a6c43d1a86a57e2faf52726e104263112bece22e
-EBUILD gst-plugins-flac-1.16.2.ebuild 392 BLAKE2B 28e3a16bbce5f7be4b4614dd90850e9c5cd55c7e6f4867536ce41e9dff3a54785dba286f36190967530393cf1cdbabb7dca76f102847a73d3a472b3966a2d9a8 SHA512 3fac2b5796a74b631f7929db167e2c446928106b3cf15e8ac07b15875f3214f342d1e5b7da871faf6480f8f19d348e6d91e712f37195b7356b4a7b1a2208ad12
+EBUILD gst-plugins-flac-1.16.2.ebuild 390 BLAKE2B c52f26c730008c522c3f649e9984b99cf3c22cff4c17fff3fd28d603245e574bc9c4abc6ce638c528308e96190d98941fd125639c1b5bae78228800fbc406634 SHA512 c5fd6307376ac9e620df48467850ae9de7cc56faa9380f33163948305cceb55fe01b120d1366dfb9565e059d13fbd879935976dcbf249c86047bcdfa8718f9c5
 MISC metadata.xml 555 BLAKE2B 0a6c97712429505d543caaa732d716a95e4f6f5256aeb202da38bd2399ceb335e1fc6079279c96848d479d3fa3e2b8bb1c92b37ba284204b1936078d0175caf3 SHA512 2ffe5f5f8ef59e30a7da2efe1b5e88858c5f27776b7f48a7748f9cd72a18d5c97ddb239609c7bab808de874f0a51bf886ec24e395641fac995c8d3f041271e7d
diff --git a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.16.2.ebuild b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.16.2.ebuild
index 61544d4ead57..9d8a148f36ce 100644
--- a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="FLAC encoder/decoder/tagger plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-gdkpixbuf/Manifest b/media-plugins/gst-plugins-gdkpixbuf/Manifest
index d6b8adc2bcfb..a797e394a175 100644
--- a/media-plugins/gst-plugins-gdkpixbuf/Manifest
+++ b/media-plugins/gst-plugins-gdkpixbuf/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-gdkpixbuf-1.14.5.ebuild 461 BLAKE2B f050eeb612057848d0017a90e489951c17d96e595768532d47ab3f95213ca6dd5c3d1cfdd1d0d00693fce2b658628b57a4ef89d858126eee47f8d9a289e71369 SHA512 cf363c2742d987faeeb284cdca1cc950d89726679fd45614cdbad0604aaf924796451bde414e7aff4bd4e1f05f0f2ddfcb0e2e9393c0413313c45f68109169ed
-EBUILD gst-plugins-gdkpixbuf-1.16.2.ebuild 466 BLAKE2B 35076289971708e5f22d3aa23ae9c5b7df2f78f52604462e08874136358cd55e7c8aade46b88d65e7f04c6b1cfb378ab1ff2a8113385b43c81fae57df5102457 SHA512 a0156b3946a6c5646a33bcff89bf34d5193505e2161da1f462331b4ba86ad85c8467d6c908ab5ac64f73c0f9287b5a96c9cdaaf14a73c9b4da1da95bd6719849
+EBUILD gst-plugins-gdkpixbuf-1.16.2.ebuild 465 BLAKE2B ac22237d2484de54d1075c00110de80b12705abe3d34c2510cc17bdc7a3eec03f90fdd9fcd581a602e5774e54f7771e8aef8d70dd8c291b9f9066a77572e1988 SHA512 7287454a7316b9948f2bb4a2c65cabe3708ca04d34cb7c276c3ac837beecfbf05452fd5410c9b8a6c9fc5f1226e6afcd4fb4906714dd888445ceb3f4c25d07b5
 MISC metadata.xml 610 BLAKE2B e0597a0e835fd058d1d172bef6cb6616efbd83b3f97e9b9d644afa6a68956dc97b37385ba7b5996468911f9da16e54b2dec18d9657ad8b1b6a4dcd71cb229f7e SHA512 472dddb540087c89be5a85ab67733d345bf039a95fc1a7bd2ec6ce3b08b8556b2676af77b93ee903bc8ace178963935b21dfcfc6c1c0a6ecab5a7429d60e5cbd
diff --git a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.16.2.ebuild b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.16.2.ebuild
index eb3e466730c0..9fac1e982ded 100644
--- a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPION="Image decoder, overlay and sink plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/gdk-pixbuf-2.30.7:2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-gtk/Manifest b/media-plugins/gst-plugins-gtk/Manifest
index 6d6c9da6e6e6..cd24028e78c1 100644
--- a/media-plugins/gst-plugins-gtk/Manifest
+++ b/media-plugins/gst-plugins-gtk/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-gtk-1.14.5.ebuild 1178 BLAKE2B 291fe2e131bee9c2f07d9af09fbab28a182bbc1829d57484fad0b4e53f3521af3d0a33d559d5b5367ded88411322d6f729d83837bb1ae825b4b2fe2bd8fb85ad SHA512 99409d7214bbf4587c850bebe5a079f0983be00a6e86d6fd65ff57dda1431c97eada97557ab0a8c83b564eef8a45c72edfeee8e406668d2f4d9aaf6c4d439133
-EBUILD gst-plugins-gtk-1.16.2.ebuild 1185 BLAKE2B 210ebc7fcf7551da499b8a349a578d7c46ffc3f115bf1d330ae859db29852c614fc13b91a1ae27449a8432c53a07c503159ac4ed87dda5819c0346d627436d12 SHA512 389c7ae50a0a5771c6d8a9ba3a1ec09dc70af61022610dfd52b0e6070d0e012ce4515b5c474fa1daee17324895fb60d924a60183bb4cd6d2a8ea1ea7c46e266d
+EBUILD gst-plugins-gtk-1.16.2.ebuild 1183 BLAKE2B 159d1a6f19d377b1301f1c3fb983616645190965fd5eb2fe552275ba535263329ff7b796c0fb145ae049e052773c3d7eaa2a171c8183fcdec953279f704da649 SHA512 818ef5e1f4367d9ef223faed10edcb9cb887214f2d905524539d7f63263c92e5ded402fb48851f6ec03e6294511d89dc7656cdc5c4cf6955775bf9b8e6835ca2
 MISC metadata.xml 790 BLAKE2B 609210afdad563f5d63ea609ac6a65301907d447a137537aa9451ce6bf5774f9a15a8294a4e11b72697e123a4ffac44cefa5f6cf820a78bd998cd581e7ec720b SHA512 8ca80354a5c57ccbc941bc62cd7fc1b3bfbd2223901c24afac0ade01ab751e790cf9bafc4e0d4a3074606be99ac7aae10a45a9f7c65068342495f2995c956fa5
diff --git a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.16.2.ebuild b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.16.2.ebuild
index 1b37803b64ac..63827562ac34 100644
--- a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="Video sink plugin for GStreamer that renders to a GtkWidget"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+egl gles2 +opengl wayland +X" # Keep default IUSE mirrored with gst-plugins-base
 # egl, wayland and X only matters if gst-plugins-base is built with USE=opengl and/or USE=gles2
 # We mirror egl/gles2/opengl/wayland/X due to automagic detection from gstreamer-gl.pc variables;
diff --git a/media-plugins/gst-plugins-hls/Manifest b/media-plugins/gst-plugins-hls/Manifest
index 2e19cf28e270..e43d37701055 100644
--- a/media-plugins/gst-plugins-hls/Manifest
+++ b/media-plugins/gst-plugins-hls/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-hls-1.14.5.ebuild 1120 BLAKE2B 2441b6b9f7e2b8d9aa2c08eea70d1a6fcdc2217ffad71027662ab1303e9b441f243da35844935785d09142e43c67778cc8347e62ea49ad12d455d4b38073f74d SHA512 c2bb1322a221b6e78f03dc7597f321db63a05fbcbee864f1c0f5bc5f3ff26dc1efc046210af1b710eff1b4a89f46633055156f3bd79703e830d084a35e30f8e5
-EBUILD gst-plugins-hls-1.16.2.ebuild 1122 BLAKE2B b4ec9cba425ed9cb3ec461f1a649931a11cc0a40869ae1ce1aa4c087ca602587cf03f2accd2a471ddff7d94dd71471bb1da135681bab22531954bc38df0aa60a SHA512 66f228b39cad3a131f7a5096814d63fc8abf7276316c3378ed6ef99167201773afc973ec44c244f38909d32a21c085f2d1e6db6b0c59a05596a6e554eb861a4f
+EBUILD gst-plugins-hls-1.16.2.ebuild 1121 BLAKE2B 40d762ab1a5ad0ff4d2f7681552de365a8117c3896c54de33455f3f6a0d86d9461e8dabbd8dc2621393fdbd8c4c517c2b58bbd779e998009aa2cff56388c0e28 SHA512 2ecd446dbf1a9bd55c63dbb3282f2f6dcddfeed38b9294d60786438376acab7c440be0d85386867a08985e4dc5f393f8600c82e36b68fb6ac23fab13a8765fbb
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.16.2.ebuild b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.16.2.ebuild
index b96a60275c6c..e5fd79a0c908 100644
--- a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="HTTP live streaming plugin for GStreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-jack/Manifest b/media-plugins/gst-plugins-jack/Manifest
index 330745137576..8589c31dcdb1 100644
--- a/media-plugins/gst-plugins-jack/Manifest
+++ b/media-plugins/gst-plugins-jack/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-jack-1.14.5.ebuild 367 BLAKE2B 233a1456fc309d21cd9a606c2fc29e55983294b588442b54ec25c60d06a3d95d2b219555344fa881921395491e3e20e8ea23eb948e8d9d85477c4140c61cf71a SHA512 dcf8e090c5a54a63cb60050589071ab8657e8a63a1dc3628323ce05c76ffe31d4ccf58dae74111789694522ce494f3abe999581365984bd13c38d7568ec2400d
-EBUILD gst-plugins-jack-1.16.2.ebuild 373 BLAKE2B 6547d83526fc10ad6584d2db5f11a3c08d2c204290b67507e964bb9980a4de879254d40d4749bce614a8abd007839861357eb8bc71a3f5293a5fa39a57256f30 SHA512 60ed96e71fb3746184bd8af2719f8af61ee6c198859199acd576a44eb0d18ab6ce46af508143d083a07afda36b5ab22e61ee127cf343732f0a63269962206a20
+EBUILD gst-plugins-jack-1.16.2.ebuild 371 BLAKE2B 734cd48eb0697a73c093abf6c764f6588f78a078c6960d0ec052ad5b70bf63c72cc4d491e99a627f37bdd602bd503d440b50184e96a43b1b910942e2706478e3 SHA512 f9f7bfd40c091a7978b41b8a083aa51e8730b7a290f9d2c1fe34659ea09c4c8a67df811d6e96b8725d8269b3c0251a866dcd906342af627b993f4bdf591096c1
 MISC metadata.xml 487 BLAKE2B 182c55b79c188f12dcc000cecf9c507933183ab62a78c806b6f43918af528c1c7bf3adf435ad077f689a2b64706b7517b14393500dc4d1b7f2cc14b45dd6b764 SHA512 811374b3dabbff1084c5b1b6fb502197f58da02da195b922ce7556ca6e0f3668f266a14ba1a03ff352edb89a0cff9550e7d59f3f4e116ff63a22c6e8436ef6b8
diff --git a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.16.2.ebuild b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.16.2.ebuild
index ed584d8e3688..62abb09cebfa 100644
--- a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPION="JACK audio server source/sink plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="virtual/jack[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-jpeg/Manifest b/media-plugins/gst-plugins-jpeg/Manifest
index b01017f367b8..b8db72e0e20d 100644
--- a/media-plugins/gst-plugins-jpeg/Manifest
+++ b/media-plugins/gst-plugins-jpeg/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-jpeg-1.14.5.ebuild 374 BLAKE2B c1927a186414fa14e2ce4a049b41617a51ad4817375a3a9fe5d62e75eab37bb70618563fb0c5a7f094f692f83f0aa63ea7ddbbd903f0e996ae702ea0edfa9e78 SHA512 1c12f8b6d44e24d55059bea1a1d530591337b3a33befce92d3b5cdb89723e91046d03de94e8c955cc1c71e6e6cccb77544ea0c3a8d97012aa2d457858cca0786
-EBUILD gst-plugins-jpeg-1.16.2.ebuild 380 BLAKE2B ef1886e53ed4287b304d71d52db7c9f424096f27e6ec91f370723055e1d954bbb0ef168c9c5483c41041ef95d37cfc99c74d7971d04bfdcdba8370e0d331d5c9 SHA512 2095d0751d96dd3dd40f8f82d0d206b284e3e0d1b470e88fb6b1be506d6e96c1d7641cf3209da0cbff81b7cf4b68199cb8a7b79230dee59c2ea8b329dcb8722a
+EBUILD gst-plugins-jpeg-1.16.2.ebuild 378 BLAKE2B d510657ec9280b6b14debfba1258b63dc0aca0cfe86f1995f5ebe80768b8611668b999e2913a712e232a193181d1d723d730cc4bb22538a3f2cd351d1de1e097 SHA512 df8d68f1a1611735051930d941a4372d9889b7e83a06c9230356058e445a31b2b4c94253f7ed796fe560e8e338c80846f84f9918bd413b184fd984766b35ec10
 MISC metadata.xml 659 BLAKE2B 8da81502aaf3eecb4ef62469b494598b329cb7e134511df9bd4269807882564e052ec76ddb50640203d96c08fa80deb3cb96d2b2c3c8dfae21fe296b87351ff5 SHA512 c4d076bdd3a4cf70540a9cc56c91a8e805f0a809065b629970158ca002f3cc03f3b7b91615121813030f510eb2e9a912aa4ca79504a20e023cc36f1fa3acf329
diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.16.2.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.16.2.ebuild
index 5832db7c8567..a876b38f9ece 100644
--- a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="JPEG image encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-ladspa/Manifest b/media-plugins/gst-plugins-ladspa/Manifest
index 02904082d264..880ff7c53d2c 100644
--- a/media-plugins/gst-plugins-ladspa/Manifest
+++ b/media-plugins/gst-plugins-ladspa/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-ladspa-1.14.5.ebuild 319 BLAKE2B d8015bae153cabbb1fb5cb8d13f67143eed82669910a0305f5a020005d5025cd1431be16a2bd21bad3c15e5667d7f16918c75f96cf7aa92cd22491968453579a SHA512 e225f08586703a6f693149503c2b36340d7cbc6c195edb0c900e718406f5adb460f33bcf0a597b7836c4bb3ca74ff76b1b0868c8df9ae9cce69d7dad0fce6643
-EBUILD gst-plugins-ladspa-1.16.2.ebuild 321 BLAKE2B a11f513e9be03ae4cf4e6fd8b06812ca3f0f2e762ddae1508da80d17c33316c1255103d8d4566862ff4d19871edee6df7611d19bee9892f3d1e84240470fcf8e SHA512 01474c256c49bbfe626723a562a970ee1f1ac65624d9d8ce7f737cdde6ceb445f073283a378a5aab816a919e95fac079a90403e6570b4ff73b8bb32c0e8910c5
+EBUILD gst-plugins-ladspa-1.16.2.ebuild 320 BLAKE2B 5d4d62a9f95d6299600c86e7875d22c1243e06fad889c14072e0e2d7400f0c91d467db888162a048993452991659a3aa6a61db977ed6fc02e937bba787079b6b SHA512 757385f4e0528352a3a0809c9a2a7e7a3775ac50c8f84814cf92f890447ad0d75d24758371e537cc3b20c29276b8959c939260a972bab56976697d80499292a8
 MISC metadata.xml 373 BLAKE2B 6e4682246da86a7f498c11bb63a8c8acd13d6b62c527db46a4030ae641d8f86d8e6fdfb67af1e53043fd3ea0c54086d67944c99a08f693a15e59d887fd99c977 SHA512 e0a9334a77c4ab15b765c27ace9033ea1aac985a2050e5048dccc4af340ed4fab99b79c6b40a2b668b2559d5bcdcd2076091f7376af3b973df8eb3236ce43956
diff --git a/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.16.2.ebuild b/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.16.2.ebuild
index 24a2d135d8ca..ac2558ef9b38 100644
--- a/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="Ladspa elements for Gstreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-lame/Manifest b/media-plugins/gst-plugins-lame/Manifest
index 1172e6e7c290..3a8a50836a42 100644
--- a/media-plugins/gst-plugins-lame/Manifest
+++ b/media-plugins/gst-plugins-lame/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-lame-1.14.5.ebuild 374 BLAKE2B 3d4736d5a493a686efe709196ce6a8aa101d58e8ceef0be43a07b66e2d635bdbda442fc63995be9c29425897c980a29790e16ee503d913cc1b2a26561f97092c SHA512 d964f3c0a915df2ade2416da25fd7e16cb90bebcc71859cc81db354737e041a2785c8795b27f515bd5ad7c15df5ceab37e2634e6e4421ef1093e76d2703e2f41
-EBUILD gst-plugins-lame-1.16.2.ebuild 378 BLAKE2B dff139523510a98add55b0e3368f788a75a8de11d9340c6ca3280d16daa29c19e7f2886435e55a22c639f0ff7e7e71e7b669f72a4e32f6196c9f483c4ce6c584 SHA512 d6e54fe9b73e4612d2b922b3ad668f1ba268c76104cee05cbd9ae7aea8b077c7be27d96db20b5a1289bab80783189d5a744d14aee58bccb93bc9fb61798993ff
+EBUILD gst-plugins-lame-1.16.2.ebuild 377 BLAKE2B 26e1ee6231384630b40ba280f6c466542878939b2cc122382b76fe408efe08566f60241529b1aa71d0c0c6e6c5e974911f6e47e577ee10cf69662a98115bb454 SHA512 7d12280e4c399096769efff61c49c472c7fc056d7048c59f5189fc0ff00e1c0fdaf8f68b87cdd479e01dfce3071c8dc6f97846533dfd688bdd69affd3ce7302d
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.16.2.ebuild b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.16.2.ebuild
index 36f4e6e5737e..83b2debb3797 100644
--- a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="MP3 encoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index 77c25bc667db..4c08226a2cb5 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -6,5 +6,5 @@ DIST gst-libav-1.14.4-ffmpeg4-patchset.tar.xz 49428 BLAKE2B 74c3e0b25643bcfdf01d
 DIST gst-libav-1.14.4.tar.xz 9036732 BLAKE2B 1c2e257912f61dac71e1d890f4cb650e0cdbbf4472cbd8dc6b73e471d1914409b71699bd198c154069e15e68364530e91f76619afb52b91e373e58c9237ab7cb SHA512 4a0e9a91c23cba82e6a6b8eb65ff42b9d80389dd232b08c22b3431d3942fb93a6a7e64be97083d11cbceb2abe5d45dc5b37d230f7552e1a7fb193610d0530717
 DIST gst-libav-1.16.2.tar.xz 9466288 BLAKE2B c14f3921bf357541b6ae4b5095dbff963fec90aa9ae3ef59e7b52c1d1f68fce8f497de017a6654f293d7b489ff5a880896018f5de0412456668f60bae1b2a32a SHA512 10817dec823b8ca84372d16e36c4ee11ab7a96a9168418f4c0bd0909fbda0ff45426bd3f754d7d491d4b07a51ec7eaa8e065e7e5c1daa120828c35a68adb312d
 EBUILD gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild 3126 BLAKE2B 3d8267242e1af55656243bdc89f85d35714babe276a05bc3c1b15f47304dfcf15b13a49cf9206e5e50f19fc17fab91bbb0f49d0ac1cad490cc157749ee8d79c0 SHA512 d8a41201e8960baccdcdd727aab7a29448f2885eae2623ac4c2d186d965c10a32d96ef47afeb485bb06c980f15dadb7bc215ab39fa1b80f242d0bb9797406a05
-EBUILD gst-plugins-libav-1.16.2-r1.ebuild 1548 BLAKE2B 9029ec41b111f908bed85541f47d50fedb3293294d9fbb6c81215bb7a7ae5a9d2ce640313c49dff6f0b7985ac1fa647e7db83676276709907cf5917590434c12 SHA512 cf5b911aaac435f76a7478809170ca57dc8e8c5c2cf976845fa5d4104078c62510070f4fcedbbc6f1efc77af36f2dd4724b8c42391b1966938ca090a93f35419
+EBUILD gst-plugins-libav-1.16.2-r1.ebuild 1546 BLAKE2B da63bd5d72e57197536a735b190be0f707419725198c31f2506f69f8ae979da97c428c4796ca419ce08b6081982eed18e8fea8f2bd6e2a1d850e4108cc7d37e6 SHA512 87b59a20452e16399c065f819704be4f1457ace77fc7575c45f39ae644472fdeb356011e582d7210c5c4163f3e17091db8a2afedff439210c629ce8705ace4ac
 MISC metadata.xml 435 BLAKE2B 8ee96f01d191e918656c2a80e8cacee47237740f7639d34f0205417815a06ae8dd5b0a27bd7bffac668f3a74ce8fc377112e3cbc369ad4fb34089b2975f3c733 SHA512 5c65497b650587ba929108974a18116b9fdea3ae175fc637c470725a39375defbaf962323f7062ce4287655fc47e8fd28ce4a1d8608fe7ea243bc6999a1bf753
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.16.2-r1.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.16.2-r1.ebuild
index 6dc5aea5a1d0..dc2d2a67db92 100644
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.16.2-r1.ebuild
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.16.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-libde265/Manifest b/media-plugins/gst-plugins-libde265/Manifest
index e14d09ba9c2b..7bc93af1ed83 100644
--- a/media-plugins/gst-plugins-libde265/Manifest
+++ b/media-plugins/gst-plugins-libde265/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-libde265-1.14.5.ebuild 321 BLAKE2B 7ec911e89386954858c840e4f23d8eb50e1082a43c063b99e26b88621252433caa294498588d2d22f2dc37d9a707de3610ada82ab22992702582c20d4cf78d8b SHA512 7303f743823d9fdd4cda1391f7f119080e508bb2fd9165d7a3affd1d519fd4f70db5ef3e33bbe70a45487b35b0b022a12ca20f54132dd64aef55535753e46e81
-EBUILD gst-plugins-libde265-1.16.2.ebuild 323 BLAKE2B f79d386f7e2f47a04d2d105f207638caf221591ba21e2352636e71dbdb01d240f7f9f531fa6882d9ce75d22df88085fe16c8e373f3e7eb4be9192665d0458ae3 SHA512 a5801c2049cc34856e0f91c077d68644b34f39cd2343a0502c5add76716f8cfa8f9dc878a5f33e3238148998712efdf5256b9acf9a1aaa2812a238dbbc889747
+EBUILD gst-plugins-libde265-1.16.2.ebuild 322 BLAKE2B b1e945321f114dec3577461432606ee76153023cb431ce50db1d2999f46e119bb6fc1399781efdc26dc95ba260de7bb3dec03f153907ae2287230492f0b9f6a6 SHA512 7169e174922b5d02cb78c3f70ec696a7a3f9d7a70f9d781a997207128921d6042dcacc5f5dc5adf7ddbee485a7529bf0bc50dd949c075e5ee12539b7921b965d
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.16.2.ebuild b/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.16.2.ebuild
index 8625bb68483d..65ba3d0085ff 100644
--- a/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="H.265 decoder plugin for GStreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-libmms/Manifest b/media-plugins/gst-plugins-libmms/Manifest
index fbe7b7d2468c..bcf300710c48 100644
--- a/media-plugins/gst-plugins-libmms/Manifest
+++ b/media-plugins/gst-plugins-libmms/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-libmms-1.14.5.ebuild 397 BLAKE2B 8331d4d24ac3beda4887ed6a1068287bc30d19dbe60a466d126f406b18d6a051bc6c6a5e331b4360bd18b8de9f70eff4b0e45ebd6840345480ef734cf1505cc1 SHA512 30d771690d23743cb5744f2e468e0a13357ae4c8700ed0aa2d245b3cf532b82a1043f8faa66c71696d86a2b8a56bdc8280ce238075c866d1a76be2ae791c6c2c
-EBUILD gst-plugins-libmms-1.16.2.ebuild 401 BLAKE2B cebae8cbf31904d335b6debe76a8dcf2de9266a0069b9efca1abca0d1c4c9fc43385e3066d936b019ef0285f829a4cbaf339b0df1825f78f36c0e00fa4de712c SHA512 127ccb640b22bf4bafe460ef6a3923bfc2e0f8b7cb72a16806d9b044b5d1683b6014c91d382eb2ffa863bb799aafdf6685e823cfdc808fbc0a4e46c0addeb9b0
+EBUILD gst-plugins-libmms-1.16.2.ebuild 400 BLAKE2B 7e215e1c1d216bbb73bdcae86a5d47f27945830684bb194dbe7539968a69cc6eb024e2d2eb9e98701ecf7d026ed8c546a42cf9783873ce38cc300347749c3fc4 SHA512 4ed444738240766eed86fa801ccd5e1903f25542a4eba47eccee2703f4e2910c0817b05bb9d1620df5c9f459fae6c119230cddf92f873064a778b623e343bda1
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.16.2.ebuild b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.16.2.ebuild
index f2992843e95f..d46fa53b6617 100644
--- a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="Microsoft Multi Media Server source plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libmms-0.6.2-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-libpng/Manifest b/media-plugins/gst-plugins-libpng/Manifest
index 230f744dbf64..59d4d3a1c353 100644
--- a/media-plugins/gst-plugins-libpng/Manifest
+++ b/media-plugins/gst-plugins-libpng/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-libpng-1.14.5.ebuild 370 BLAKE2B e9b9f80c0b12973e114cfbc0fa384e54b6dfc7befef7247219eddec84ea5ce90295102067589fb1ff6ed2e9c6a8bb279972830bec1cc31f3bbe5b5c3160bbbb6 SHA512 cdad285e8a811b60ffbd6eac7e803eb02a62b5a7fb890336aa338d2d3f19b49893f401f2d9a0a69fe24194b5ba55bbee8648127aec1942397aa756fda5c0ecd1
-EBUILD gst-plugins-libpng-1.16.2.ebuild 375 BLAKE2B 44ca4b3e783621da31612a0f4f57d427a12fc747d3f128a39657e3b273b73138a13c314738ff8b41267e8e2b110c3aae261e5ce661441c909f953ec64cf27d74 SHA512 14756138ccf4d7ac0e4adfe5b526d76abbbb33bf3bb9357a0393863a226b042b96d99d8e95653af85b4e729d78cee4b4365d49a710febca04098833c63e9ea51
+EBUILD gst-plugins-libpng-1.16.2.ebuild 373 BLAKE2B 48df2acd7f8e0aaaa4d02986295d48205fa6e5612b10038d14750c6df621c52282e9e1d4869ce944a4b2c3156aa9add09e34493a7b6474d76384e6ff6ed7d062 SHA512 6bed82bab114903e45eee411efe72d41c9f53b60b890f42584b39915e170280050ffacb5a715fc7e0ac93bd7296c89745d9dcfa3fdc351187f903f549e12a409
 MISC metadata.xml 483 BLAKE2B 3c07bc4538ab8a6e0f2ca484f7b67a41d60f672714f17a1555eb2ebbcbbf14fe8e16f21360007789400352d3c1540c1644fd1402a12b639306a3068e5c9be822 SHA512 6d536bf8813f1f4d6b402487852ef1372172cb42c01d0a57af6b70166896deea5db36bed91f78ea18c1cdb8f809e5b5514f2b91a7668efeea170bee422d8a3a7
diff --git a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.16.2.ebuild b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.16.2.ebuild
index 945bf2a9452c..f311c9065a0e 100644
--- a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="PNG image encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-libvisual/Manifest b/media-plugins/gst-plugins-libvisual/Manifest
index 6442d49a57d1..debc91f4e405 100644
--- a/media-plugins/gst-plugins-libvisual/Manifest
+++ b/media-plugins/gst-plugins-libvisual/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-base-1.14.5.tar.xz 3717076 BLAKE2B 461e90df614c60d7efce6fabcf8ad7a5cb68b5fc01b05761fa441d838d3155b5a2e7f9b9420b7e48b2eec49e4bcfbd39009a662db03a923f42c6f45c782795cd SHA512 4e81c44a5ea3b910f96d3e9251ba38a79feacead4f96adb92eab5a650695ca8d5313e3ec1df78fec04376cf3152d2eefd4d39f6c11dadc98a11e55bbf8c8ccdc
 DIST gst-plugins-base-1.16.2.tar.xz 3939868 BLAKE2B 7313e50dc0842f02cde0113462c8d4b393dafe271da6e2a1af89dc997f2ec77a9f06bc467516c607c8b7b822e49efd1af829440a28a9af8356ef07e7fa899968 SHA512 f28e71bba8ba25d4f18ba3a196f057721151f1ebf1309d808bd6771a3f9a68facfa1970dc4353b6f2fd1e8945edf5272854d328ea11ef399544f8b330f754a42
 EBUILD gst-plugins-libvisual-1.14.5.ebuild 615 BLAKE2B 43fa0482c1888a2b0b6471d559b4dbd7ed749aa8e060e08e27f12c5a433e61c6188c2da76cbe9fd1ad982e06ff273db010ad32c019085ef42f01db5472877423 SHA512 3e3396343d87677832d8fede03289c27c6cb8b60f1bf9fa2e20eafedfd86dba81e506ab22a6ff66bba7b82d0807fe36adadea2ec834225f374dd3ac7fbcc0378
-EBUILD gst-plugins-libvisual-1.16.2.ebuild 619 BLAKE2B fc559d70192fe5a457842ad6b52542712b7caf4159dc16df4de787aec940279cda71f1efc25ae5ea25a0f82cbab8fb0f98cd2551522d15afe84ffc2d09a09d00 SHA512 7f3cfada76b5be1d0b563f78675987c736adeb5dd4b0fd6213f6e7b2af53d641a2b821747327de43e914114281fffb94fda3ccc28b967995c08472199d54af2f
+EBUILD gst-plugins-libvisual-1.16.2.ebuild 618 BLAKE2B 20213d4db26f2aa56b49b840f3d3eb416749c450c00826206fc312dcf63c3cc6c22be491a38fff210f3b2fef04e240834750efccb152cf7a2bc643197e057d5a SHA512 a0310a342160d040234e105bb677202bb860c762c7492135edf2cf9efe1e22154f61b9f805f715714bde5f13518efa8ab91690d9c74c023dc4422c6ed9311b4f
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.16.2.ebuild b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.16.2.ebuild
index 1ae89cc12f4a..1e79260fd310 100644
--- a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-base
 inherit gstreamer
 
 DESCRIPTION="Visualization elements for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-lv2/Manifest b/media-plugins/gst-plugins-lv2/Manifest
index 81e9c1bb5b3d..3c18d743469b 100644
--- a/media-plugins/gst-plugins-lv2/Manifest
+++ b/media-plugins/gst-plugins-lv2/Manifest
@@ -2,5 +2,5 @@ AUX patch-1.16.2-gcc10.patch 25387 BLAKE2B c8dfc47869907912af37258b63e790cb630ac
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-lv2-1.14.5.ebuild 363 BLAKE2B d01960509cb629f29b87e578b11b7bd1f6f23e89134f30494cfe4d900d10c4fd38ddf37d83e0ffc50e3691d3c1933a8fc109622da6912dc4970ca50d396ef749 SHA512 780c562eafdb72c3b32ced3f9f03834dd584f0a36d43a0d1287183596d7d721b51cfe7769371b063740dc3d34029a2ee75895ee15516c8acac2026b0677ecf4a
-EBUILD gst-plugins-lv2-1.16.2-r1.ebuild 418 BLAKE2B 9f4660e65c2aba2c6131608371dfd76d3d6753ed589a4dbd80ec1c78a009d71d7c84fa08a2f0092ea1b14139cd5be1dc1303728343074640390a4704475862ad SHA512 f5fc3f2f8960861738980db5f50bcc82a0a3cb7575bfd3809e2ee865af5cf88a5e2dbb0e7cf2109429caa9025afbcee3b4f8010773c7fd04b7343387899c4be7
+EBUILD gst-plugins-lv2-1.16.2-r1.ebuild 417 BLAKE2B 09a74d99c5a09228c138e51d3ec304abd6dd72eae8fbc4932f4fb88823ec07d36dbfe59ee139c87c85e20049911d596e6df13b5276841fce1bf454f488dd8a91 SHA512 88fc8f380fa8efda6722582d74bcd7c73e84f9357ea62d88f507138552df647aa738ef9d74dd1446d9d4c997b8370ff6afb5c7ce886959f387159e58f9d5ecd7
 MISC metadata.xml 373 BLAKE2B 6e4682246da86a7f498c11bb63a8c8acd13d6b62c527db46a4030ae641d8f86d8e6fdfb67af1e53043fd3ea0c54086d67944c99a08f693a15e59d887fd99c977 SHA512 e0a9334a77c4ab15b765c27ace9033ea1aac985a2050e5048dccc4af340ed4fab99b79c6b40a2b668b2559d5bcdcd2076091f7376af3b973df8eb3236ce43956
diff --git a/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.16.2-r1.ebuild b/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.16.2-r1.ebuild
index 1e32320eb484..b3cb05fd058e 100644
--- a/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.16.2-r1.ebuild
+++ b/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.16.2-r1.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="Lv2 elements for Gstreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-meta/Manifest b/media-plugins/gst-plugins-meta/Manifest
index 698a16377ca7..36b6b55eaabc 100644
--- a/media-plugins/gst-plugins-meta/Manifest
+++ b/media-plugins/gst-plugins-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD gst-plugins-meta-1.14.3.ebuild 3757 BLAKE2B 3370f8e71eb9860e1fb93315ab3a52a9890c1a12f88fc0cdf0b6d434ef806a66210215cb38285d60071254867bc04578c7c3e91ea4a75475cf87f71f458176a5 SHA512 42145f77d8566be12fe3c831fb46f6044db6dfccb625d7e533c4d0aceeb61397307a40131d0d7f998dedb147e896e0c66ff604dcaf85c6ff9bead7efd599cb67
-EBUILD gst-plugins-meta-1.16.2.ebuild 3762 BLAKE2B 62160abc778c8722e57eba36d83de852614ebdaf4995cdfac9e1a71528588c2bd2faf79b2256a634bf9a4652007d6ad244bff654a98126d4f21dc617d3f28527 SHA512 93bb1bbb9348413198d1411c69f8f243bacc37623b0e383db71abf0a1a99bafcc722acb03fda2c5f1cf5650d7b86255ad84d6d2b94afaf5cbdc6dee769fa6a8c
+EBUILD gst-plugins-meta-1.16.2.ebuild 3760 BLAKE2B cc9bee8b8abaf526a911a410f83123c795f850b14c77e3bab5b1c7375e90a01989bcea0c57ca3176e5f962a3692d731c8a1e28135858696b7da322c6dad990ed SHA512 3c556c5e327300bbbc71418fa1eb9dacde5e2ae41c06086e027e10ce435ebbeb9f1d73538b0e6d87ae1f3fa3f09bf06d2ffb2af554ad0116bf19555f3d220aa2
 MISC metadata.xml 996 BLAKE2B 1bc83f42a32de2aafdf03808fffb16d603986c19160d2802426ecea7f279e529ff7ad0e2c321671681f80c3575dceaea0064db559dba1212b0a30b826ae8e2a2 SHA512 4d905ac8fb0f07b2ba3c6791d7a84daef638ed552d2fac834a71febb274d1c667abe66735e7cfe77f5ed83c269c01ca7c2761b13d176164cd956e8fadf31fbd0
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.16.2.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.16.2.ebuild
index 426777bf6da5..1ec5e0d48c9f 100644
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.16.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="metapackage"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264"
 REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
 
diff --git a/media-plugins/gst-plugins-modplug/Manifest b/media-plugins/gst-plugins-modplug/Manifest
index 32f6b4b3b364..b947ed2726bb 100644
--- a/media-plugins/gst-plugins-modplug/Manifest
+++ b/media-plugins/gst-plugins-modplug/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-modplug-1.14.5.ebuild 366 BLAKE2B 347cbb40659f69dbb3df4ca316e91e1c7a6c5ee8521dcaae94df6e1d2cf8b61283ecd275c27acb3239758f58cee7d6812870818a678e3926a81417e5d26776bf SHA512 4f344b4963b0ee7f615079073722ba6c71eca2633924e457fe1c71b63763edc2c1739a920f89ce67b3a75895a44e55cc0d05ba4034115afd01f6ac34edc9a12e
-EBUILD gst-plugins-modplug-1.16.2.ebuild 371 BLAKE2B 0ecdfcc706d914fa73ef91d1733bba10f91f1eef019f1ca7c61d70a789b217c99624b4da3f1dfff5310bfb9479a67c44e9225d9f1250dcb4a4ae524d0ce8069b SHA512 af6a22a86346635c09d2cebdbe7a601f7d40e66efd00da7a4529f61854e2bb42971024c242f3b1ff86f8f2f3606f6422401c5ca087b8b273266f807a5df3d279
+EBUILD gst-plugins-modplug-1.16.2.ebuild 369 BLAKE2B d8d408f2374a1add7ac00ecbaff4836167347eacfaa9ff26181a191f1a8890f4eb5ccc1008a59dab11c3e3c576ff1f4cc49d1ee4121eff0ebc84610b75ee8d39 SHA512 3c5ec66a46ea1e9ed8bc76370f2de2bc490788cc14e2594e8fffc8814732f475eb3aa1b88514b953a87122c4722d4df1441d0da2ea18e7f83404cef92004fedb
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.16.2.ebuild b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.16.2.ebuild
index 4db2489197bc..8015f18fd884 100644
--- a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="MOD audio decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 arm64 ~hppa ~mips ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mpeg2dec/Manifest b/media-plugins/gst-plugins-mpeg2dec/Manifest
index f2d5d3ec6a2a..0264387abec4 100644
--- a/media-plugins/gst-plugins-mpeg2dec/Manifest
+++ b/media-plugins/gst-plugins-mpeg2dec/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2af33536719913ec10229eb6bc64f1f957bc7f6afe45e1c528ab4015c25dec61b8b9d2c517fee78a8a992c76bd41ff9e75d1 SHA512 0866bbcc3f1d0d668e77b5ef83fa7469dc80c957d2c6526126e761db46e83ff18d941c247833d27336106d8ba043e9ad50cafbddbff241f95bb16f9b1a0fbacc
 DIST gst-plugins-ugly-1.16.2.tar.xz 893964 BLAKE2B c607a7aa3459625a930021d247705f00e418e57557c57b8f9793bce74cb5c4d708b253250f0bbebd9698e9ff80d5636d578dded8c360ca2d34e3d43c9a722416 SHA512 9f393043f51b12b376607e68b3b86437af86e321e3a3566e59c7f3507ed26622211df87e30a23bcc927f37bc11f53ca3b29f1b12bf58e623ce18edc88a9cdee3
 EBUILD gst-plugins-mpeg2dec-1.14.3.ebuild 400 BLAKE2B 752307fea50171afef2ccd2c333c1f87e8cb0ed3b2154d4184d75e2fb4c061503d5d5ce93ba8823437cd632357be2da5d0a059e5509a62a1aed741fd0fb7a2fd SHA512 4f10015f7cf540f61b9325b49fa40564defabc5e3196ebab7e3b71f89696054aa82c86562b124c4d19adf656e754667eace71738e922fbf02a80e6f9167befbc
-EBUILD gst-plugins-mpeg2dec-1.16.2.ebuild 406 BLAKE2B 52151231b4338c8b31d5c6c6be74184360d0964db999434a027801baf2a1145b8bd21cb1a852c895298807eb78229bf68bb5bb5dcfc3540c59fc03661f1d0691 SHA512 5a3428dc080d38c283e6012228e871158aa46a4dec30d795a3437e6952f2fa2723e3d8f3464b965173f631e0126e5380cfd24c2bb7aafd473dca6d0d5b72e789
+EBUILD gst-plugins-mpeg2dec-1.16.2.ebuild 404 BLAKE2B 24d0036989d8e2b0821b69bf3a2fae4b016bf54b7abbc9b2d351fa852cb3fa64370eda51310c625a7772ef9c3603dd1b0f20d39072006e61e200ddeb287ae0a1 SHA512 0abfafad10c69f47a104a8d85786aa88fd470acd2a644906cc98620a506f22e0b1c41e7f17d95f9869f954b37307d8179fd8378d860fe6f6b7a3fb72456769f2
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.16.2.ebuild b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.16.2.ebuild
index 4d18bb2a7579..8d2840963c90 100644
--- a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="MPEG2 decoder plugin for GStreamer"
-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=""
 
 RDEPEND=">=media-libs/libmpeg2-0.5.1-r2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mpeg2enc/Manifest b/media-plugins/gst-plugins-mpeg2enc/Manifest
index 2f0c18ae081c..ec1cd4d7e20c 100644
--- a/media-plugins/gst-plugins-mpeg2enc/Manifest
+++ b/media-plugins/gst-plugins-mpeg2enc/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-mpeg2enc-1.14.5.ebuild 336 BLAKE2B 91af84a87c7b6e038b617ff47b5a89eeb7d38e6e6ed8071052ab1c5788809ffdeaed4761d0d28bb4b3dea81c364f646362473c9919a8e7eb4725f9223f317256 SHA512 41684e4cb9e05c6f7b207135e6e3abc900fcc5acc0d71f1f5b9d9d647d67d0100ecb1f2dfc98dcc449e8969d830b5fd83e96625e68d7743a54961d52a54cb39e
-EBUILD gst-plugins-mpeg2enc-1.16.2.ebuild 338 BLAKE2B 65fab626c9098584c8d541055f7178af98e48c12b57e31c20c9e9d27df07e7c9051e22715fd1ebe68972cc9437c17013518db931a31ec0b31c6aba3c96700c1d SHA512 5b0fe8481aecb457f0e8ab338657a5058d7762b5a4378b84c0ea698dfd31bdc1789bb27d1d9e2b645b795ac86ed983b319bfa20ee480491e5a5455c5c987b35e
+EBUILD gst-plugins-mpeg2enc-1.16.2.ebuild 337 BLAKE2B f90d08ea33240a2b5393adbb718bc4bc25b383afad4eb759649796e6116a90458f03d25af7500b76a9ef96932315166083bbee9801e4def430fe9567980c9909 SHA512 056112ee558418c1a8da56ce616b921ed3ef0ed5f2bed01fcaa09254f3bc0817912f56301924976dcdc0ea0c8faa517f1a2e6e1eac97416fd475b4f5bb90fdd3
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.16.2.ebuild b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.16.2.ebuild
index 329bc6408435..fa60a30b32e3 100644
--- a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="MPEG-1/2 video encoding plugin for GStreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND=">=media-video/mjpegtools-2.1.0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mpg123/Manifest b/media-plugins/gst-plugins-mpg123/Manifest
index 638b41cdc049..8a14305ccfa4 100644
--- a/media-plugins/gst-plugins-mpg123/Manifest
+++ b/media-plugins/gst-plugins-mpg123/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-mpg123-1.14.5.ebuild 372 BLAKE2B b57c63db53446aca6e5c8e4291bdc698bb8d23596dc32ffe1c8f4c7062d4a4b1b59299f69872535f6b04d6915677887f9a92ba19a6c60bdc552dd3f1a3d229b8 SHA512 c146745007dedaaebe8eea537b0a1b029d9c436084fd351aa003a11ea851de8721eb9ba743b7468d3383da767c9e56898720bad932b59e5052d036d77e1b82d4
-EBUILD gst-plugins-mpg123-1.16.2.ebuild 378 BLAKE2B 149816aad82d1c9fb35393c13de1601f2e33075d1d0e4bf8499d465b1bfdc7e9967ab730db2b73ffa05ff82bd1a844f672b431d9cd0ecc40c4ddb6363c27630d SHA512 fd3655c8bac3882f3ec02eb3910893bcf2868a07a13f085946e84204a77fcf9fb269e70037949a4ba4ca2d96d6dc74e650214f206bab9201848e7f301f9c39e0
+EBUILD gst-plugins-mpg123-1.16.2.ebuild 376 BLAKE2B 3bf79735b9404a0a410382919e8885eb67b1853c396349d1c33fdaccb08a4cc633f52bea9000589a99e775d58a024a291149e762b780db258c2eca9b0145fa8a SHA512 ef60d7442a62878ad972841e4ab6b2985e3479ffb495726cd40f1915180a61ef2374a3ee98aa30a6f9ba9b1a1ea747a2632983c9b7097d70d0385a33c59957c1
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.16.2.ebuild b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.16.2.ebuild
index 7637a69629de..5ab7a5777ec8 100644
--- a/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="MP3 decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-mplex/Manifest b/media-plugins/gst-plugins-mplex/Manifest
index 3cfbb9671d78..61cd4a2789e6 100644
--- a/media-plugins/gst-plugins-mplex/Manifest
+++ b/media-plugins/gst-plugins-mplex/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-mplex-1.14.5.ebuild 406 BLAKE2B ea321c6c7d05d6d9a037e844247547f184a407eb0563b003930c8b8303e247d0f6380bad22ddc60b35488f8ab3ca36f638310c4f7af3d87bd51e966e99390862 SHA512 c49579dd9a4fbe41f0469e99d298be11948b8e59dc3f8744b78f2baabd57da88905506e1430839f3e097bc06c92e67941fa1ac4e01db9e0a671c4a422a6c7d0b
-EBUILD gst-plugins-mplex-1.16.2.ebuild 408 BLAKE2B 26eaf61faaa1b832b839917290141f97c96640c40e0641cb910546c672c52c674444a18aa8d898e898ef1580357ec9c64482412cc20f9ab5c050e3c8337a7d4c SHA512 69edd12e06d583c9c9295e4df0c57628d7a4ece35fe675c8a84cca174fcee5c8fa836a1c103a02a2c8103ed6810da3a560dea31ff8269ef05efbb709396ba129
+EBUILD gst-plugins-mplex-1.16.2.ebuild 407 BLAKE2B 1cf175c39f01e983f35f3f688248e21476fe6aba5958e2878cadf51fcd24ba3d52a04ca4f28567239c94df41f0bcafbd1855c21e7586a9d1d92c8892b764df4d SHA512 140372b1f79e6ea36ef1f83779d08cedd87fb64e91503c87714c3fc52d796b25dd6240221c1b006aa4d4d2c6da185dc01ff2e3049b6786e873548dc3506e5c37
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.16.2.ebuild b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.16.2.ebuild
index f6c21f8e9d07..be905656d37d 100644
--- a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="MPEG/DVD/SVCD/VCD video/audio multiplexing plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-video/mjpegtools-2.1.0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-neon/Manifest b/media-plugins/gst-plugins-neon/Manifest
index c342ca009949..fbbb1bcbe4e6 100644
--- a/media-plugins/gst-plugins-neon/Manifest
+++ b/media-plugins/gst-plugins-neon/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-neon-1.14.5.ebuild 337 BLAKE2B 41aad7bce0de776aa46c22941aeacac63579d7b2a00948d39bba8ec05f77f031c030301b86547e39f66ef92c86929dbe2408a442b19f355e556364b771799517 SHA512 1218e70c01a75a5050872d59691bb38cc87df379481809d10ffe91b5aeee7b834fafbf822cb03c5c2def1efbb8483da5cd79415f3e3b94a5fc4f9993ef7a4129
-EBUILD gst-plugins-neon-1.16.2.ebuild 341 BLAKE2B 38a875809c9307af90cfcf61ff4bb71f48b14e7cf0cd3d77b4662fb64b38ac077bebd27c39ca2e3177a3a0fc0c26242d4b284526ab7b8af4d5268a8ec00874ec SHA512 c3ac8c927a071e4a48ff6d5a63c7b91880d04f005252f40e231c840fe74fb75b57b76b23229c5b01dc7457db13530e00d9d3e8ac6c7ab9b67f152e5081086e3b
+EBUILD gst-plugins-neon-1.16.2.ebuild 340 BLAKE2B fa647739d3e8733d73846aa692670d237b650ead8159ef6fe097c40d49565aad59551c96c45f73f2ea4a1afe4a68fe8b88d00611953e7a62b27ec56e78f145d9 SHA512 a8f4ba0846090cc78a02204c9b02a8ec6f263a8478e09e8ab9a96cfd9783e92b40dd9391f4df2ec4bb16c1cba9c48c03f5121edd28309acb47a8f4242e2d79e2
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.16.2.ebuild b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.16.2.ebuild
index c0343e401204..f4123658470b 100644
--- a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="HTTP client source plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=net-libs/neon-0.30.0[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-ofa/Manifest b/media-plugins/gst-plugins-ofa/Manifest
index 05c8f09fee28..80ff9c8de1c6 100644
--- a/media-plugins/gst-plugins-ofa/Manifest
+++ b/media-plugins/gst-plugins-ofa/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-ofa-1.14.5.ebuild 385 BLAKE2B b8830639822d7aebf1f15011e73f5264e46c33776bc1eba49481fc755fa2c2c555ff8f745f1f4e3820fc45f5dc6812814b34f9a0873b62c79202847481b3549b SHA512 c93f156cb16f5029391ff9ee81c4516340abf446bfb6be573102a8a9564c89a2f6681a7051be0d34d04e1c3efde2531ec735b18f91bdeda586073e2fce459f9e
-EBUILD gst-plugins-ofa-1.16.2.ebuild 387 BLAKE2B e58f2879592dd46e69b14a2cc7bc2bd5b568661675272f29412308b2b605624d240fbc4f1898a7fb4f894add56ec00a0b9f52a638a270cf5bc29ce12fb469ca3 SHA512 15e21de083f987500ba6e05d8ca8979ba654a4a2db6e54f4831ad8d239f09c0ab739374b26eabe2437ba0addbe3afb6164b7fb8e6715f3cd6a83152d082c84d1
+EBUILD gst-plugins-ofa-1.16.2.ebuild 386 BLAKE2B 5179ea66ff904586a449fc5ccde50cae935beb17e77fc870c5f57c3183270492b02a465452b80c3de9a5cab6d07209e808dffe2ff3866259146338bf4358af2e SHA512 15499301074f9478d639196e5511def28ccfc765fbba5f704a20dd5bd1edecb0382833bce03a5eca82bbca75c495eded9affa168540d132c86690ce5c549a18a
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.16.2.ebuild b/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.16.2.ebuild
index e7b976befdf4..1c535dd4ccde 100644
--- a/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="MusicIP audio fingerprinting plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=media-libs/libofa-0.9.3-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-openh264/Manifest b/media-plugins/gst-plugins-openh264/Manifest
index d87f9838e3f6..5a51827e9ba5 100644
--- a/media-plugins/gst-plugins-openh264/Manifest
+++ b/media-plugins/gst-plugins-openh264/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-openh264-1.14.5.ebuild 330 BLAKE2B ca7a30601574cc92a178ff2d2c42c08675a886ee253fb023b64432ec67b9d5974484ab4be01310b17179ce1da8a3ea9e755884ace8bd2e08f000dc4ee673d674 SHA512 6f5f785ff6191cc09ee7c38caab00e2fc4e3ff3b44554539bf32ac042dbb9f1a93a9663c710395a8fcc87d49315ef5969cb51b4ae59a94b0724a94b43b0e7269
-EBUILD gst-plugins-openh264-1.16.2.ebuild 332 BLAKE2B 1154f0637e8fed531e098944a8f747cae26d0e0a9d85ebe3f3285edea18e89d37f5ae002ffe19f09ac8d0111842493fefb6f2e0d54719ca4212cd4e7d953295a SHA512 cae7570ee45b90b5e8c0435a8a8713a00889e7c1fcab846513d5a85e8be7c683f1ac57118dccd4086b9fa5f671a1007fcd00b725f7514cf2e7220be13d085b29
+EBUILD gst-plugins-openh264-1.16.2.ebuild 331 BLAKE2B 90dca81fc12fc992512c6b5604b32cf0f6c3462e2ada7fc97334d685d7085f56f2a8b5ab9127d6488e1f70935d8d80422019121423af1359c8c7a96bb92f57a5 SHA512 c560ebbf9ce0d198a4570583f0f048dd01360327530197c94f4cb1de1dcd217615705e657676452f98a865bc5887e42676899811dcb5ecf9c4cd1544db7bf064
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.16.2.ebuild b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.16.2.ebuild
index d6a3bffefd7a..e8b879fe0a50 100644
--- a/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="H.264 encoder/decoder plugin for GStreamer."
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-opus/Manifest b/media-plugins/gst-plugins-opus/Manifest
index 333cd6315d0b..3f28a2b5444b 100644
--- a/media-plugins/gst-plugins-opus/Manifest
+++ b/media-plugins/gst-plugins-opus/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b4
 DIST gst-plugins-base-1.14.5.tar.xz 3717076 BLAKE2B 461e90df614c60d7efce6fabcf8ad7a5cb68b5fc01b05761fa441d838d3155b5a2e7f9b9420b7e48b2eec49e4bcfbd39009a662db03a923f42c6f45c782795cd SHA512 4e81c44a5ea3b910f96d3e9251ba38a79feacead4f96adb92eab5a650695ca8d5313e3ec1df78fec04376cf3152d2eefd4d39f6c11dadc98a11e55bbf8c8ccdc
 DIST gst-plugins-base-1.16.2.tar.xz 3939868 BLAKE2B 7313e50dc0842f02cde0113462c8d4b393dafe271da6e2a1af89dc997f2ec77a9f06bc467516c607c8b7b822e49efd1af829440a28a9af8356ef07e7fa899968 SHA512 f28e71bba8ba25d4f18ba3a196f057721151f1ebf1309d808bd6771a3f9a68facfa1970dc4353b6f2fd1e8945edf5272854d328ea11ef399544f8b330f754a42
 EBUILD gst-plugins-opus-1.14.5.ebuild 1238 BLAKE2B 2a49f4dba5a185cbc236b11220a769729adaa3f328391647459e556a7757c7c1c4e8d29c04ae9bcc4200be976df86d4a028d0328ee356587c25128748a916152 SHA512 8fc53f59d3ccc66a34eedeb15ab1a2ba32b39424ed3b5ee23f60caf53fe83ee5509a0936b642616b82f09083330d95989d2bb24c52a8633e737aae3116ce30c3
-EBUILD gst-plugins-opus-1.16.2.ebuild 1244 BLAKE2B 94f6c441c60207fad35bea81854c2f2fe6d4d5f7c41d8884e1d75143bf37ef69808ba76cddb3e4817c1d1e50178c16751213a400589a017ae6c5e294a6cb9987 SHA512 10d01f787b160b8b05a5efba071682e6f378ad7cfe370d0a0ca538d5449b6d6652a46dc80342ada7d529a338031d5901d7b33c0b828c8d4717116c09c22123a3
+EBUILD gst-plugins-opus-1.16.2.ebuild 1242 BLAKE2B 8b8a8ca80fa94ae427a64bb80231ff562d6e6edfe1af71e45ab538b4d8cb0551c878971d162af6dc193429339bc84407338a69001283c4c8f0c01fcd7d9a029d SHA512 d1c9dc828a7c093ece360b12f8a49104ca7c38572de91442bafda28a58b1a12b2cd69d703e38c7d7443ccf34b8f0a216861fe4c321fc39ea73de2ee0260456c8
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.16.2.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.16.2.ebuild
index dba0f8b64762..8dd9c53214d9 100644
--- a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-base
 inherit gstreamer
 
 DESCRIPTION="Opus audio parser plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 COMMON_DEPEND=">=media-libs/opus-1.1:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-oss/Manifest b/media-plugins/gst-plugins-oss/Manifest
index aee0fa89ad86..b654a16a9f31 100644
--- a/media-plugins/gst-plugins-oss/Manifest
+++ b/media-plugins/gst-plugins-oss/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-oss-1.14.5.ebuild 352 BLAKE2B 80573c5fa704718c2dad70ab726f32ca39146187b5ba6ddba62a3d68e44f95229a361c33ddfff2d3b6d06e55776a8a00da51055a9d06fb093732da976dc087b4 SHA512 262ec1e5f8d50677af6ace83760c76f252890555c27e8db4c13d57d9d795da96e77f6b3175c53eaac756ae4dc4333c9c5df0ca8f5b89999d5d907885ca23ecb0
-EBUILD gst-plugins-oss-1.16.2.ebuild 358 BLAKE2B 91ffc2561966d342a1ef78174e5cdfd6f34630d3aa2176331454bc9060c023eb7bc88f8b6370c8d4b0fc513e2888d0d7057b6494080dd248c53e6a70d2d5b9bd SHA512 79210acf727226f16465306a92673dc94c20d3a736fc8bd6b2ae247bda155029da28a26ad6043cbeb204b0e565292e6ece7098e149e780a7997e2671af8ca6a7
+EBUILD gst-plugins-oss-1.16.2.ebuild 356 BLAKE2B 8dc2b35dd920c5a35f4448dc33555f377ef8178cfe65254c65e3de84c9cd6a198f56e0d2f5e93321c72060acbe2d84f4363eeca194c88b80968f2902c16ce07b SHA512 4b31ad48aa15d090108cdcead9500ab7531cfd03bdfb0fbad05f47cae39d11087021a4c939452d3917844d181a397d2255fa909f5b18abcfc74bbedd8943c5df
 MISC metadata.xml 488 BLAKE2B 72817781f31070fbba548a5a0e724d3a3a419f55b2c1ba1155e88f66b0f779d34fc5705c39d60ecc5c40a9ba47ed568aa2458c0557de1795ddacadf54b39a436 SHA512 6ab36e28308e33d9b2e74a419ed558c913510f23bee1fd1a58ff87c6937dc2c3b4c8c683831e771460258424e89797a6b8c5ebed95cb87506ae7d67c11b2c243
diff --git a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.16.2.ebuild b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.16.2.ebuild
index 9238e88602ce..5e0a31289b3a 100644
--- a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="OSS (Open Sound System) support plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-plugins/gst-plugins-pulse/Manifest b/media-plugins/gst-plugins-pulse/Manifest
index b52ab5554f39..3bc52680d5d1 100644
--- a/media-plugins/gst-plugins-pulse/Manifest
+++ b/media-plugins/gst-plugins-pulse/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-pulse-1.14.5.ebuild 455 BLAKE2B 3d137f882a5402b29f6f30b92ffdd4960621cd8dd82f192f9b65a391bd462c96dff0038e3c9df38831e458adcad0b4b3f1f7cbccf29fd95895506ad4ecd3fb3c SHA512 e78f7ce36cba90003a339218449406a8d6803a5748d03f531547f4974abf7cfbcb6a46ea0eb64430ff17727cb927d8f8eb82461ff95aa9e996423f3aaa4726ef
-EBUILD gst-plugins-pulse-1.16.2.ebuild 461 BLAKE2B 15c1ce4067ce0a13214bdcf25271f4111ca8e43b68b5ec0f185f8e1d043120a111533a58d4a28b549d8657faff5c3e27bd1f01ccdc46acd4f5d0ee4610aec3dd SHA512 f5b0523ffe67000e7a352a72f6aa2593fff28afc6b98a817a8191d32624519e50e1a16237d4263184a9c3b05b187e52aa5a0a76297963b0daba4ac69a5ce8fbc
+EBUILD gst-plugins-pulse-1.16.2.ebuild 459 BLAKE2B f57320685ad49962a1155de9b6a8d0ee8cfd82eb8cb3c6efe6a9676cda09f8f38f89372431f2d1df2c38ce8bf75057a44818449c6e31d45e219c11302a2e4c75 SHA512 c0c8da8068e35d409909c6eb4fba0d066eacea09a6ab35d5c1316205a4c0ffee2fd11950b59c21abe056eb58990fa243aef6a49c3afaa599922bbb49474bd666
 MISC metadata.xml 610 BLAKE2B c8d30b8baa2a2dc5dc43b2a0f5badcb212567f7ce4873f58b1662b3454c8232a4916f10470bb98c3dae745f818f0e02d7266542d44d3fd4b9eb7edf99bf2a419 SHA512 0f0fa4496446fbaa649c3d76538c4960ca0d7918b40e305aa0da8516e79ef25c10136b0097fd687cb968c37de636b57ae667be1bc3197a571f557400a9c0c478
diff --git a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.16.2.ebuild b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.16.2.ebuild
index 1a88fbcf8b56..e72b4c0e847a 100644
--- a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="PulseAudio sound server plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-raw1394/Manifest b/media-plugins/gst-plugins-raw1394/Manifest
index 3fb5804005f5..7f6a3f02ce09 100644
--- a/media-plugins/gst-plugins-raw1394/Manifest
+++ b/media-plugins/gst-plugins-raw1394/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-raw1394-1.14.5.ebuild 514 BLAKE2B d499ca202c465c73bb7dd0713e6f73326cefa36d228db31ac47db5bb8e6b296fcabbb53895100902a24f0b26d3d73b2f224a43c6d4ea74268196e76dd3741f6a SHA512 77b2bbf8e74f73dfef7652c7b8085a80720fd0d44fe15bf8af80d8078b05e466614ddca19be0b542969f0b295cb170786fb1b4f3f83beef3afcfee660b10fc0d
-EBUILD gst-plugins-raw1394-1.16.2.ebuild 518 BLAKE2B 86f2663d8651cf4db2307ba35567b7e74b013a08348d781fd5eb4725e86e87301e3a8f5b85a00185aa0adb92b40411bfc30c82a1451ad5fbda598f99015c55b0 SHA512 41ef16da0fcdd7c00f5feb430061d60dec7fa2cfe0f54400e5cfce79a35b3704ed4e8f8f1e535dfd6b9bfe761bd4ac5ad28021747dd643dd943e57074bec54ad
+EBUILD gst-plugins-raw1394-1.16.2.ebuild 517 BLAKE2B cc3b7ff7d26e72a0545656b10d9ea0f43e7c59047dc2ddad8708923e932d4f7b213f50db04afafef01ca03bb9b26623300c9f40c3a062b49906754749877299d SHA512 e1d6274b059e7e742e6066e78190302fef655883dc6585ee8daec75fc85ecd1144809e6bff0a73a9e07cea6656c3fe77b770d3771a9e15fa004a3732eee6a406
 MISC metadata.xml 548 BLAKE2B affa90bfebf1a2616bfe7262f0850227bdb4aac3580924c58fda8c1c9c89fb288252c921c73404149d02c8f1d38f61840301bdfdea01608a3db14e5e8b0b08a6 SHA512 ad3c3f4e095d868f0df4f869fe521f3c51ada956f578b995bd9e7161ef679c5c395434a76f4ddcfe1242dc37790e8f1ffe0167c8a50c686d434747563c151031
diff --git a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.16.2.ebuild b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.16.2.ebuild
index fba0a177ba8f..d8cad6ac5efa 100644
--- a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="Fiwewire DV/HDV capture plugin for GStreamer"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-resindvd/Manifest b/media-plugins/gst-plugins-resindvd/Manifest
index f9214f4b9270..08f82470c022 100644
--- a/media-plugins/gst-plugins-resindvd/Manifest
+++ b/media-plugins/gst-plugins-resindvd/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-resindvd-1.14.5.ebuild 445 BLAKE2B af736ed1a5400432fae9d86bd40cef62c8953021df0354d342ea6cfa2e7556350942bb54e4d1eb5b510d8fa0faa12e4c94848dc8f8cda9a80a8f77956cbc21ce SHA512 cf0d49b5796796be420e7b5bd4e00de962a463daaf90ddce902cef0eb38542641f998b4c51b572efc79223b3608228a250fbf8c8c2a36c5766f51182f66acc6d
-EBUILD gst-plugins-resindvd-1.16.2.ebuild 450 BLAKE2B 1c21d3d1b8d6564ff78801fda7f64044e76578eee51f5fcbedbbe7da750c21ba56b139b1b9ac35f646bc369e581ef8e5f68ab1ac9ca861da76beaba26f4300bd SHA512 383b5a7ec5957791a33a43e66a6a0153f6beb015750bdefb825e77530c03ec27ab87c256dc90e4375af044761f364c30d4b1268206666d08667f0ac005cbb441
+EBUILD gst-plugins-resindvd-1.16.2.ebuild 449 BLAKE2B bc36ee7d5faffab617400ec1d9f95999846e17c5f8bcc9a13021f07fd8418f86a9b25e6da7a48abfe7feb85f12ad27400a624258b603831de3e2661a6a0a0226 SHA512 9403922f0ccdca1bfaf7f169d4b8c4e2ad62ae556038c822d240cddfe381870027d4ba8fcd742e06649ab5a223d084351499291332490eb22a66e6813b546b2f
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.16.2.ebuild b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.16.2.ebuild
index 8ab2fb442539..c96cb4d033ee 100644
--- a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="DVD playback support plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-rtmp/Manifest b/media-plugins/gst-plugins-rtmp/Manifest
index 6adbcd4b5ae5..56ec29b72615 100644
--- a/media-plugins/gst-plugins-rtmp/Manifest
+++ b/media-plugins/gst-plugins-rtmp/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-rtmp-1.14.5.ebuild 332 BLAKE2B a06f090240d6d552c0d8b8cfec19a0b3dd8c3018677036619f27d04ffea008b074afb61b158a404abdafa773c948020cfec3c6ef9e362ba8d7bdfd8767ddaa80 SHA512 c08539c5e593a9aa6c95e84e537657a203b2b3a6e9830f66a94e9b6789141892411036dae076c6fb00ce978dc3a85b27cf24017b62698c79c3d9d36eef89ef45
-EBUILD gst-plugins-rtmp-1.16.2.ebuild 334 BLAKE2B ffa81bf79f2c24737fa578d916777d027f50f0ddbc6f6ea48e96ce07e25ecb40c5d83c0236d86c26bec7b538762a3ae4d7298a9507dd777729f198414e29a7b9 SHA512 268f351664bea8498199ae10ce97ce569c8cfd4be9ce31a42634ff2ab14ab1461b4b4dca63cdbe3e8bfba2bfeed32aefd3234f22b52f8455adbe4f364a140ab9
+EBUILD gst-plugins-rtmp-1.16.2.ebuild 333 BLAKE2B 478252c6d7a8093bf1059937d8360f21b9ee09e9f2960638c4dc809678884abd6d7ae6c028c59b47fda14fd1f1423d2f12bdb4a89bc84eed0c93f9133d8c1b0b SHA512 be462906e92ff8fad6bcb7de9d142f510d026d404f430a58e37608ea683284b0ad73484aa747e4eed30484cd31149b7058073bfac661c6e5bcfa98036c56a466
 MISC metadata.xml 419 BLAKE2B 8e461a2732df916b2d78bf38497df7061a3617920e155157f6cd62e5658187ea94d4ad328533c950a9554bbd9f3c427a1b616a7a882bfc977b349746ced681fb SHA512 c157a5142e10bd93420db567edc321580c57872558473b0181fed12b688164dcd928cb19c983b61602583edcbf333ac685dec141be5cfc5a207f8b849f64046d
diff --git a/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.16.2.ebuild b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.16.2.ebuild
index 5653a722cdba..bf38e0705a27 100644
--- a/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="RTMP source/sink plugin for GStreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND=">=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-shout2/Manifest b/media-plugins/gst-plugins-shout2/Manifest
index 49497d15357b..83baf83a292a 100644
--- a/media-plugins/gst-plugins-shout2/Manifest
+++ b/media-plugins/gst-plugins-shout2/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-shout2-1.14.5.ebuild 347 BLAKE2B 5b3bce80aa762f70729fe2f5debb4022b22bee40fbf6288cbe71daf5facf148d9c51ca217188694e45e89e8e62589ee72cb96864a81f3ad6049c78c275c81cf2 SHA512 d22a20f4adb69aa571bd0f17f481febe62a882b8be9bd0f0142801ad41eb8336c0d06ed83a134de71622e25b91ade3cca5e6530f8a28adf4160dd959e33b0282
-EBUILD gst-plugins-shout2-1.16.2.ebuild 351 BLAKE2B ef47c14c630b1870a976b676d2c793b2b2c34058fd11afc6c413f99c2bf66c97417163d217694f3a3c30dea92990079416082ba68de402344d1bebb4895cb0e8 SHA512 faba6acd19437cdfb0a75f5eac73a24eec21c9e90f103a71aa264bdf2162d4abaeba0ce3d0707476d5c991657806bfbb4f7a5568a9fa810b2301342ef1c624d2
+EBUILD gst-plugins-shout2-1.16.2.ebuild 350 BLAKE2B e75d4ad21468a061f859e0eab28ddba832f1725fa614d2576be4860f1a29d9b774e1c580bfa2245df293bf14c1c51e09e46bdffe8879bf6026b85165979301c5 SHA512 38d2ca92972f953a542ecf1289ed2ee3c825cbb3c1b76323a7b6bc9eab9313bce4ce2a66645fba37c9d138856dd313929c300ba4ccdea6fd35d318360e0f986e
 MISC metadata.xml 478 BLAKE2B 4c7e5bbe6d79d01544434b93b998847f6c5e3fa7bf2b979c9ff0238d75c0f1ac5693cb4224073926b6cf098a661fc5064f9ba2db3dd2b121093ee78cf905b1ea SHA512 a24a36ebfdfc159df5e23891118ea4e21855a4db31c1ddee9a081c55597be4f34014adbf0a46712d202f1557f2a63e776382c86ce5193465f35868c91114cc52
diff --git a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.16.2.ebuild b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.16.2.ebuild
index 2f635472b1c0..dc7fb9a598b3 100644
--- a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="Icecast server sink plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libshout-2.3.1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-sidplay/Manifest b/media-plugins/gst-plugins-sidplay/Manifest
index d0724d8a73be..2fa09182417e 100644
--- a/media-plugins/gst-plugins-sidplay/Manifest
+++ b/media-plugins/gst-plugins-sidplay/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2af33536719913ec10229eb6bc64f1f957bc7f6afe45e1c528ab4015c25dec61b8b9d2c517fee78a8a992c76bd41ff9e75d1 SHA512 0866bbcc3f1d0d668e77b5ef83fa7469dc80c957d2c6526126e761db46e83ff18d941c247833d27336106d8ba043e9ad50cafbddbff241f95bb16f9b1a0fbacc
 DIST gst-plugins-ugly-1.16.2.tar.xz 893964 BLAKE2B c607a7aa3459625a930021d247705f00e418e57557c57b8f9793bce74cb5c4d708b253250f0bbebd9698e9ff80d5636d578dded8c360ca2d34e3d43c9a722416 SHA512 9f393043f51b12b376607e68b3b86437af86e321e3a3566e59c7f3507ed26622211df87e30a23bcc927f37bc11f53ca3b29f1b12bf58e623ce18edc88a9cdee3
 EBUILD gst-plugins-sidplay-1.14.3.ebuild 352 BLAKE2B 7308b9f82e32346124b81155fb27f079fb389c46fb7ec46a50e0d3cf1f1e978bbffbb6f3d06c6c6f95846c6db01b16b3e28370f3bc3789eeeb25409289d7f44c SHA512 fc0bfdf942b0096699ab9ce947833c7e837ac55e4c2f82bd3ea32bca320943bfdafb18a2c6ac4f47c99a018a730f839d6a95092eda9712589b455d9c3f778774
-EBUILD gst-plugins-sidplay-1.16.2.ebuild 356 BLAKE2B 860b2383532e576e561e39c63f2c70c2d273634d9f32bcafc6381e20005facff6e17796ea133407e6b1b73b8b3d7716f7c6dcf18234637b2e62464d5a42abacf SHA512 6005992c12bfa203f6091205aaa627f71e01ce341b84202222ac0b0604b291082d18d9620f13e94d42301af319b029f77e4a297fd96ef1e11aa9a2bc6789a15c
+EBUILD gst-plugins-sidplay-1.16.2.ebuild 355 BLAKE2B 873c78263eb531982fe2f1dda8e6018162622e4598e9b34e5e90f76c5a71c7ccae1542f3a669eef3af32cb9e046f82f426d311643b169061bc54c5c14dbbae80 SHA512 e350974774275d556cb447cce6631b4ac16f2d9626556ac224f5c6e98895093eed3dd641d66e3f30106dfa841b0eee7550a4157896e4b842a32c527138101306
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.16.2.ebuild b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.16.2.ebuild
index 0554036d3a90..2f66c2930fb9 100644
--- a/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="Sid decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libsidplay-1.36.59-r1:1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-smoothstreaming/Manifest b/media-plugins/gst-plugins-smoothstreaming/Manifest
index 5ab511ba3594..394280b73323 100644
--- a/media-plugins/gst-plugins-smoothstreaming/Manifest
+++ b/media-plugins/gst-plugins-smoothstreaming/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-smoothstreaming-1.14.5.ebuild 1356 BLAKE2B 13243bf1f53db280eb0f8076e84ade16e91341404cef5343883afe4fd49d432cc7bc5bae11e6a9ba8920a91a8bd8eac9a5d0b4a411000c8de01859099e572621 SHA512 d470e7f1c6f1b10b90bb703c03e00f8e90a52f296d9a52a4680bab34972397a5ba643cee922d4d871a7caa09df7d05980905ea1315490889d51a437cd6d4b8c2
-EBUILD gst-plugins-smoothstreaming-1.16.2.ebuild 1358 BLAKE2B bd933f3cfc9cc22d58c7dda7c47bc9185c936b905df8c6c202b8324c9f73a2f74d60d4d10ce031e9d9327bcdf0c00b8974c10b7d703b77e69ce059d5b2a87679 SHA512 85576b560995a495cef929a0e69956298410f7a367c6a688a5409217d468ff253d6b3179998749fc127ff786c83e79f728961ee1d2f1803508f07550e0fa096f
+EBUILD gst-plugins-smoothstreaming-1.16.2.ebuild 1357 BLAKE2B 31ed87671028d7dcdf09dbd844a4fa4f3a0b95b1e846ee9a34d8ae3ad59a777c9e6217d07e27098e7a77a257069e826ca6b4d1803d5fdbe376f5625922d57b2f SHA512 1d99abc98aa825531733974d164ebd46d7e4314d69a803e9eb89b1a28a8d74ba3b1de88df27ecc9c7cf5b6919e1755859d25811570795db9cd01cecf6fd3aa87
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.16.2.ebuild b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.16.2.ebuild
index eddd74c9f011..97fc449dc9c9 100644
--- a/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="Smooth Streaming plugin for GStreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-soundtouch/Manifest b/media-plugins/gst-plugins-soundtouch/Manifest
index a3765d69070f..098d21c02859 100644
--- a/media-plugins/gst-plugins-soundtouch/Manifest
+++ b/media-plugins/gst-plugins-soundtouch/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-soundtouch-1.14.5.ebuild 360 BLAKE2B 206ce13fa48219b2ff90a26e5981fae94b6a5735e999c88a634a515669934b217ef8f643a978e47bcde632179aacb14386b399ba66480c294ce44786be6a161f SHA512 c787f1aaf44156b972be8ba60ecb1424297c970c4662706cd40fc19d23a4fbe757ba2bc8d698ce56797d44d076bfc5c01b3ca2ea853498d00020fb64d42385e4
-EBUILD gst-plugins-soundtouch-1.16.2.ebuild 362 BLAKE2B 9b34f9199ead66bb86efe34240fb98c769b6cffe2a4b70c9ca377cd8309fa0c836e27f5ae79f37cc45127d7f429e712862300d6f2394511028f654248d88cd1b SHA512 34d88db0b915953826009b6f46ee5ddaab4c545be8d49e732dd88aec00e73f92d2c092fcc838a44eb1f545b8551ae2f99391b2704775d4b4e7ac43b28050cd84
+EBUILD gst-plugins-soundtouch-1.16.2.ebuild 361 BLAKE2B 06a660fa7f762d7f6ed56cd23ca92aad37050b746619916085a4fd997900e0af8be3ea88c635b4276f161fd3bb2bf8153c6f461bef144145dc9231830e4c6d4c SHA512 e10099035bd51d89eaa8ba8de209085017912128841784da56a437f4b62f3477c55f977a56845c218a09c802936c6caff8fed492cdc7ee6e764f0d79e3ab3f26
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.16.2.ebuild b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.16.2.ebuild
index c2a7185785e2..0919d0527241 100644
--- a/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="Beats-per-minute detection and pitch controlling plugin for GStreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libsoundtouch-1.7.1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-soup/Manifest b/media-plugins/gst-plugins-soup/Manifest
index 133d297ddb74..0dbafbe7cb81 100644
--- a/media-plugins/gst-plugins-soup/Manifest
+++ b/media-plugins/gst-plugins-soup/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-soup-1.14.5.ebuild 394 BLAKE2B 06e3142367300416a53e4fd10da7866b90131d90720e76a654fffa587b031ca220f6ec896a73c7efc96bb65cb12bc1d29c2dee77fc915e0d42d2a0941750f8ce SHA512 1a02a7be9e461ab6a1f06a72c21d8d4032b570a7270e96a5e1c238505db4e9f1a7351071a7186fde13cab631c1b5cebbe3d89c30d35299568ea57736cf44f732
-EBUILD gst-plugins-soup-1.16.2.ebuild 400 BLAKE2B b8c924d85872e7cecaa8112400e80705d3d5de95d2d802b75e15ce08406da239fad23b4205878378e498e2025b84050c5f226198d0e990504bfe5c4ba9445547 SHA512 2cd67374b8f5b60fc4fb64d4b023ffeafa29f3a9cd52fb1fbbdfac2bef66b031adc3838b934fcf4cfc6492a2d77f758fc4d6c5129d80e0ee5ce2f9e6084a712b
+EBUILD gst-plugins-soup-1.16.2.ebuild 398 BLAKE2B f5279c45d48ccc11f41ddd495b21189a220506982c9eae45c8e8a5a814943418453152258b3778e10a915b42320985f947ccbb407dceefe72eca98918b469681 SHA512 6476a3606594dfec2de7f53997829fc909c32b8cd8e0663f8f0840dc8bc625288959820e07d890aa1048242b55d7d725b6ab8aa5745599de1bc9137f6d5d9c19
 MISC metadata.xml 552 BLAKE2B d1dddafba0b921d7484d1c52567a8b9fbecc611b5234bc602cef79c7953a2a3a9bb423bc929055127ab894506409ddd8e8a71cb432169b1370e65b83b2e4341e SHA512 ce8b5a2a0d33e00ef141b82b3c6d192e31b681f016f431f1306d2066677d7fac66135129f57d25f9d13644c9d3976baf74fa6e6f65f5feebee045b82d04e2d8c
diff --git a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.16.2.ebuild b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.16.2.ebuild
index cd99559e29b7..df13a379b20d 100644
--- a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="HTTP client source/sink plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x64-macos"
 IUSE=""
 
 RDEPEND=">=net-libs/libsoup-2.48:2.4[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-speex/Manifest b/media-plugins/gst-plugins-speex/Manifest
index a2f8d98c8ec8..39a6de9631ff 100644
--- a/media-plugins/gst-plugins-speex/Manifest
+++ b/media-plugins/gst-plugins-speex/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-speex-1.14.5.ebuild 372 BLAKE2B 643b80b16180a09ba3363205ff0e5a045ace3a40ce6d8e38e29ece915a79d4ed98fba661804143a55c7b968884c6af94e434147e1a33d362769dfbc66e79ebb1 SHA512 4dc3d04f09636667280928ef165c98e3fd082f8bab95e8b1f8b59bad9b20ce051bf1d2818f4c5462dba321a8e30c015d8fc306cd0349b2fc2a582441994ffb95
-EBUILD gst-plugins-speex-1.16.2.ebuild 376 BLAKE2B af38aca9a739c8ef5ba9f8fb56bb8f4995b7d4e980b446f92a83ec5ccdd4ba802e604b5b5760c7cf6886e741e8dbd87e2ee9bc4a246aa23dbf5f14b3670064c6 SHA512 c9f7018717a9b6dde8c60e7d8cbda89389f01babd77ef2bef82b8d031d29c3cde42f5f129f8e1ed47ae59df6167678a8aa3d1b337c73fe8866e5a370b426795f
+EBUILD gst-plugins-speex-1.16.2.ebuild 375 BLAKE2B 891ab11ae1b822ed146336ba58f806898b7ffb71834d42f9b5b35f89bcf95567de6faa6764c9e5b38df7baa0c547853d17e08455f4002c0d27eebc0eb8b2dc63 SHA512 4d856f0ac4f869ebae225986f579cdd7aacabaf6da79ce0d97ef3a0893c4d262acd7b1cf74c1d4236cf6c449ab17b235360a47f650e703cf02f09d972f15f19f
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.16.2.ebuild b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.16.2.ebuild
index 408642a8c655..cbce8a20a35a 100644
--- a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="Speex encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-srtp/Manifest b/media-plugins/gst-plugins-srtp/Manifest
index 800a6cf91a66..f4e5ea38c98b 100644
--- a/media-plugins/gst-plugins-srtp/Manifest
+++ b/media-plugins/gst-plugins-srtp/Manifest
@@ -3,5 +3,5 @@ AUX gst-plugins-srtp-1.16.2-make43.patch 7494 BLAKE2B f3207f46b7bb4a56acb70ca5a3
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-srtp-1.14.5.ebuild 483 BLAKE2B c1d5a22be1404cf85137d041685c69637591d157fce0b7c0206d0ab28784b1068d393ba85de0adb4ce0b2f0eee8759359ac71c036e26e7775e49730a6b2d257a SHA512 d6c548ae9bc44fb9a2db9faa7398fd42be0122bb0714b7b21af6b689662c65a2486aea0240f4d61d8113952672549ea1ccfe7785b3f7cfca467f298ac2aba455
-EBUILD gst-plugins-srtp-1.16.2.ebuild 489 BLAKE2B 4150e4f1e7dc3edabe8dc7993ffec4df595495d3fdfdc6ca8bc239be36428f36028033cc0bd3d0cacb22b9605cbdcf9498478fa9b2cff13bfee3a682580b4bca SHA512 266069140d66ef5b6a8d6d5b7ada261e7cdc18d846758fbf95504bfaf908d48c5069706ce393230ca443dcec0f429713b8a64b8817bcebeb0353f3c2c3f870c2
+EBUILD gst-plugins-srtp-1.16.2.ebuild 487 BLAKE2B 51500a31b41b2a13d345e6b23cc1435acb139c6aa959a118b1bd1a0d9e5e100e483e2df15c7cb7781988d5d666efc52337d282e9bb6e4c1569f9f40f9f42c4ce SHA512 d8b9e199e6444663b0af46818fd0837e45c6a8e4dc94a755f72f702c10d443e242830ca6935be08f13446fdd478a6057f3fabe79043d290c79fc1afc7b6c14b4
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.16.2.ebuild b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.16.2.ebuild
index 9f9edeb1adf2..a957993fd1cf 100644
--- a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="SRTP encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-taglib/Manifest b/media-plugins/gst-plugins-taglib/Manifest
index 7dc35b815d27..9f41c0ff85d4 100644
--- a/media-plugins/gst-plugins-taglib/Manifest
+++ b/media-plugins/gst-plugins-taglib/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-taglib-1.14.5.ebuild 377 BLAKE2B da8e0b8b8e6e80101fcd0bcbe91e750e34b01cc6e3d953147dc102a16037edd7656d33333f7033bbf783cfe5ae7b97b88917f58aa4f1318d72e4c7bac846b4af SHA512 2ee864013cace861719983b1478fbb900786f80cb56bc6ce87723932b7e8f8fdb4c967334672b089777fdc7e69c92854249e7a0acc699d70d5fe993a1591bb86
-EBUILD gst-plugins-taglib-1.16.2.ebuild 382 BLAKE2B 24026306c2a8f836d88f3d57c07490da606d9c0b95228edc5d01ed7e98f960689e408393518ab9d642759ffdbf70dc3d005d58cc9acaad79e927b3d2597f61d2 SHA512 28ad8ddefde32b0c373c0a08d5ee276a0e4e182fc857958d3d0a3d2f71d6c9853eed07af6c66cbdecc3907f01af494352775317bdb06dc0195130ca29166e697
+EBUILD gst-plugins-taglib-1.16.2.ebuild 381 BLAKE2B 9759dace2a2ca7373fb24f9f20ad71bfded5a54e0b50b8942e25b76f16ea175a6ce114a4c475d6cbe58cf89fe5ffdbf8025b381708e742fc095790e2cdd90e21 SHA512 addc26cfcb244e93540049501f5e30a6dc1e3c52457f3be739a3ea735cf79efdc036646eee6fd2a0d41aff110d2e942b5608817ffe9d38d79c233bc765b86fd8
 MISC metadata.xml 472 BLAKE2B 2ddad354e550883322f2276a979d7cace56275d6b0ebe9301c40a6204043c0a05b0efae27cea079bdf1c0c04b8f588ab39e080d8b0e4f405c0d0287a00c4c746 SHA512 8ddf53f0cf2e92dbc2adc5f4910b2a6fab0b0ac68eb9c9c33fd94809714d0f10d0d9d546df012a70c5d9a13adce7cccc232be4fc107b63c4649ba3ff0ff32444
diff --git a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.16.2.ebuild b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.16.2.ebuild
index 8ba6b5631860..354c8fddcede 100644
--- a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="ID3v2/APEv2 tagger plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/taglib-1.9.1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-twolame/Manifest b/media-plugins/gst-plugins-twolame/Manifest
index 117ec6591d1d..3284bdac27bf 100644
--- a/media-plugins/gst-plugins-twolame/Manifest
+++ b/media-plugins/gst-plugins-twolame/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-twolame-1.14.5.ebuild 360 BLAKE2B 5965cfd1abac3dd2bed596741cc12cd0013a54d7528ac4e930fc02c1b6602238fbbd3907c4d4f071b6857d7d17cd002f30fc227f3a4a675e1bdb777682296447 SHA512 55e3d02a38d469f7f422db0470fbee624942ce3fc55497f323aa8351826d69f8cbf2aa9eab51c0145f3fe690079a60edada6d9b57f163d2340bbd470131c515a
-EBUILD gst-plugins-twolame-1.16.2.ebuild 364 BLAKE2B 400b90195e8798b02035fdd10f79048a636741742d271a057241ceb9672fa0c8dfedaeea7aac5ed6f5b1c8b8fcadf650a3b69a67fcdd10484daf3674548ef6b1 SHA512 c255651881ae4af62d547c1b46c086a7cc7553c56543ad8361bbf90a6be901e64bbe12e3d0d803385088ee511205f23a1e1ea246c8ff7d45d64d7fc0478c217d
+EBUILD gst-plugins-twolame-1.16.2.ebuild 363 BLAKE2B 89caf74298a8154dbf0280573afdd3b27d4f256fadf5d371ba32b7aa019893da9a10a82a7baeab7539d50b9e05ee359f7810354468640ec43e3fc3af1b61091f SHA512 c74373a78ee204563b87cae77b428cb9f0b14a0708c5f96227ad45d02328659e667a9749cd83ae2dac53e0ac67d029604653ae8d362ea88f250df16c5d33cbd9
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.16.2.ebuild b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.16.2.ebuild
index c7afcf1e565b..7a6baa76f84a 100644
--- a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="MPEG2 encoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-uvch264/Manifest b/media-plugins/gst-plugins-uvch264/Manifest
index 63da4582c545..4a1f48574d80 100644
--- a/media-plugins/gst-plugins-uvch264/Manifest
+++ b/media-plugins/gst-plugins-uvch264/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-uvch264-1.14.5.ebuild 802 BLAKE2B 9f5c16dcec50df8e32e4c8ae9f8fc9a33a01161c0943444499ef6f69d54cd4f9281472f5f4df8e2134f70b7e2d13bc1bdad3866819d7f307229ea893826be84b SHA512 595dc752bcc6dad57a824b8f52d2a958beaa060d4b1c9c77370bc5fc889ed5c8c33994c84ce03ee01d1034f6f2713faa710400f1f163ebaafb4c56581f9742b6
-EBUILD gst-plugins-uvch264-1.16.2.ebuild 804 BLAKE2B 417d30e724ea19213759269548ebd66d8cb04a471030773fd4a58b78bb4c4c32f480e40a6b3c2350138000df418c74be89bf3b0ed634fb6ee0663e3d50538f09 SHA512 cc6bb717ac29de4333b9adad4a2e38b65443d9e3b86744b2e56bf6162427187e25270aa1c7c8945b5170d2787a39e13b87117a474150f82efe71c226543e331a
+EBUILD gst-plugins-uvch264-1.16.2.ebuild 803 BLAKE2B 274e4e6a0cc1aec2db1f8d3f111d6c5c51bba9b1124143016e41391a6465ac0510c6222fda41d30847a35bedf6e0405cf0a4ba47042f64da6d9167cbde634b54 SHA512 ca970d4677fe1973873fef0dc30f7f32051fb7d679995c1dfb338c813834ee2aae70913df4b14d0690623ed9fa84ff094add2496b524a4ff8732ec970a8b64df
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.16.2.ebuild b/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.16.2.ebuild
index ea6e71ccacd0..ed4829174ed2 100644
--- a/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="UVC compliant H264 encoding cameras plugin for GStreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-v4l2/Manifest b/media-plugins/gst-plugins-v4l2/Manifest
index 61841e812b7d..9db67a3d6d2e 100644
--- a/media-plugins/gst-plugins-v4l2/Manifest
+++ b/media-plugins/gst-plugins-v4l2/Manifest
@@ -2,5 +2,5 @@ AUX 1.14.5-glibc-2.30-compat.patch 1315 BLAKE2B e02cdb5b6ae1b2a8c94d577a0378a3c7
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-v4l2-1.14.5.ebuild 729 BLAKE2B a2cc46df6a7ee806ff755f589d62fdff7288c4e0f723b39d71abb23d78bc63fe54fc7f8b7190c454186dbc3038fd9f4f78176562c5178557a5edb1b46273c56b SHA512 b8cf6427c18231eb6090c8eb8d941cfcef086a92a2580a9ba88ee446cec12bd7d7b6e2e2537f160517ebe5d9d48dcf7ff904d71eaee117213d96eb9acb7fa446
-EBUILD gst-plugins-v4l2-1.16.2.ebuild 669 BLAKE2B 58ff7e0589cf4252175c931544b8c4803a764e1f408d9bb4c0c8e19c91ba879a0f88f8323905a3d34acce334de5279709e4454e74a0fd146214c80bf186822f0 SHA512 d2c82b45c397b0e23157863151ff5a185f3a48248a79a31a0225b1feb7da8c8b3e31478ba0d177b039afc2d9815c3625d96e0534b1c6eb4604134745a16d940b
+EBUILD gst-plugins-v4l2-1.16.2.ebuild 667 BLAKE2B d3202314b4faec32bfbb8cb508a9dc14b533ef4b61f981eb48265983d4125f7de2fe5274cd6893edf948267d332ad3ad7c38f0e510fe042da046ed05cb017c79 SHA512 60adfcb97e61b1e491b16443757694d5b9dc05ce6b6d1bbb7c858a0c92467b348d94f244d516870b51941270e93a23252bbce5f1eb8a213cee7cbfc60f39d935
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.16.2.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.16.2.ebuild
index fef1557acd7a..706c6ebf03ab 100644
--- a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPION="V4L2 source/sink plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="udev"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-vaapi/Manifest b/media-plugins/gst-plugins-vaapi/Manifest
index eed72b741a11..5682817071d8 100644
--- a/media-plugins/gst-plugins-vaapi/Manifest
+++ b/media-plugins/gst-plugins-vaapi/Manifest
@@ -1,5 +1,5 @@
 DIST gstreamer-vaapi-1.14.5.tar.xz 1068344 BLAKE2B b98363981dc7f111fc8c15188d31dea394b7f6cf300050b95d564b75020931a0f8690d11410f2d3d18d6649ef2ee290c933c3731b4bc3ca43bffb57a4c1bf542 SHA512 287df56ad9bb3fd0754b9f307082eb180c8f0b622e2c9436c5dcf2272a5fb620cb18970726d231688837d52cb169a10e98e14160e51fd82198c34ea612c0d60b
 DIST gstreamer-vaapi-1.16.2.tar.xz 1095012 BLAKE2B 5bf3d34db429d180dfc09cfeccab32f57f7fdad9d05e27ac1aab2ea89e1b14442d4bdb4fd768408b9aee25a117232081adb28447b252c5d553da9d9e0f5b8676 SHA512 61554b5496dca595fa6e278a5634112e225784e9f0a7e731800fd04b395ba4e11dc467b8d074cb8cfed182fa9b9511c104192aecbba3ac755a4c32372061ac9f
 EBUILD gst-plugins-vaapi-1.14.5.ebuild 4299 BLAKE2B 807c0868d52f805c7fa04d832bfb724055feb1b78de584cd8baeefba34ef438d9d52c76f1d860b75f0300e96adaeb38afdf3e68644eeb2a77e34e03442a03dec SHA512 d9f0160ac075258348e363e15ccc63ec65780f2c5a001479a6ab235fa366fa5d722472e3e3884d78dda2fd2457206c9c0e0ee69d7b9dc32d52f03d8d4c4988ff
-EBUILD gst-plugins-vaapi-1.16.2.ebuild 4341 BLAKE2B d02e44245780b1e8ce74edaec3031aaae6715c966184b42efdf433ab24aae23bcb86ffd8504ac09e758290c24fd5d641161cc6aaafa8f7efc26637b6ea081bba SHA512 76e58f1b1bb91c66a75b8dff4de94b8aaf44a8d16ec64d9dc30f8be32ba5b027ea49fc6c13cb190c97de5fdf91c878bb21fe7250703ceb0c6b46b2c323551583
+EBUILD gst-plugins-vaapi-1.16.2.ebuild 4339 BLAKE2B 35a815ba2eb348b07b808d686194cfcbd740a499f75a10331a74b9c5a32da60c5d9df506da6a502091b9dd5727a17b81af300f2b7c1cec91b266861b056f0393 SHA512 09ec4ae0a55f5c4ba3bed463187f2f07f3bd86d6d0833cc97c376dd99164b91bc2614f018f99d59d24dd05646d07968a70b930ca9a9a4fd364d4ad83017af8a0
 MISC metadata.xml 433 BLAKE2B d46828441b89363cce84ff10747ad13f30329aea96cf2acd2fc7deb786c3f3ec0ec5a86011657d39ac905f9f33a3904b38860b16f53cfb150530cc4142f1beed SHA512 366bbe78a862a65a8b82ee43521508db5766cde3a72f4ad8e7f0b703dc23347589e07dcfdb3f3ec12e62ac91adb38b2a58cee5dff4732069ac2b8724524a405b
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.16.2.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.16.2.ebuild
index 18753a605de9..b469ec76ad9a 100644
--- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.16.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="1.0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 arm64 ~ppc64 x86"
 IUSE="+drm +egl gles2 +opengl wayland +X" # Keep default enabled IUSE in sync with gst-plugins-base and libva
 
 # gst-vaapi configure is based around GL platform mainly, unlike gst-plugins-bad that goes by GL API mainly; for less surprises,
diff --git a/media-plugins/gst-plugins-voaacenc/Manifest b/media-plugins/gst-plugins-voaacenc/Manifest
index 5bcfe8ee6cbf..f521038440de 100644
--- a/media-plugins/gst-plugins-voaacenc/Manifest
+++ b/media-plugins/gst-plugins-voaacenc/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-voaacenc-1.14.5.ebuild 319 BLAKE2B f88aacd8bfad7c6e95848c6f874784109629cfefe5564408d8d5a02cd65cb2a69a3a1b1df6f484ebcc31c62b78476aeaddc05af9fe08f6ee61667dce347d905d SHA512 8889792a4f5c405bf46f6af72ab1661923d30b56de4c03391325a3fd75c8f147b43c41623d7eb3afaad0a5a0af7db8f9b7bf21f4b71d212f47797c24da1d2f81
-EBUILD gst-plugins-voaacenc-1.16.2.ebuild 321 BLAKE2B a215683ce5c0e690f7bcd891aa1a49cadb9ff499834bc9fbff74f6e1845f6801618fbd798b28d6454fd2642e7d727ef76c44a3fde6e00ce0ab2f5d5f4340ea19 SHA512 1551c9681a3782bfe7a1f45e76b459a203d42117b858361edac82b9252a7d655fb72e76d5ced7a02d25ef52288173ff67d3b5b1bc75223e801a2e9b40015d77a
+EBUILD gst-plugins-voaacenc-1.16.2.ebuild 320 BLAKE2B 7ff709c7b1d143820821b56867eb10f71c3488d9969b8a6e3936a2a3157300f640e0288193aabf7d4e0f4ed5880ec811cd8daedc55bd146ff4089ac25fdf7d34 SHA512 c21076c9d100cc505ef9b27b460e1f6e3e386097cdac3801d2d79cb683e45d4decdf1e38e4a204de6c98454c9c12b36a082cf973247cff6b0d1cc8caceb9d945
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.16.2.ebuild b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.16.2.ebuild
index c65aaebe5339..1e11d3ec5570 100644
--- a/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="AAC encoder plugin for GStreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-voamrwbenc/Manifest b/media-plugins/gst-plugins-voamrwbenc/Manifest
index f11006a63f4c..37f4b2510fb1 100644
--- a/media-plugins/gst-plugins-voamrwbenc/Manifest
+++ b/media-plugins/gst-plugins-voamrwbenc/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-voamrwbenc-1.14.5.ebuild 333 BLAKE2B 849e58b02cb05640c9a4dda1bc2691334811b202c375c7ff574efa1fd67bfa347f483cc23c72fb4b7bb02c231dfb57ac7b5ed91a25945d0211856dc193eef753 SHA512 12d3776153e1dbdeeac37b8ca9b7cff50109c201fb6ac3f5b288f8c859d7f67ac43fd74db0e3535528c003ec2f7214fb93b7e0ef11cd3487361caf6eda5c9322
-EBUILD gst-plugins-voamrwbenc-1.16.2.ebuild 335 BLAKE2B aef1c15c0b54ff5388bc18da5681acec33704a5ba76b59f9f228d6a7c2effdf99ab6f2e6a16f92480acc09a1019c0dcb07d9552f162e1944ca78204496cba861 SHA512 c34c436956fd5199218b4da37820305c4cd6be888e8ffda680ca081f582a5cebe3e39cd5308f10a765cdee784e1a3f6ab5e3f2a7fb378c9d76ac6b24c71f0a3c
+EBUILD gst-plugins-voamrwbenc-1.16.2.ebuild 334 BLAKE2B 99b0f19b08b46561fbddaa9a1a4bda6de813f5538223655888dd5813055e16c5474497d7878dbc72f87f85c40c7c7f0b6ab1b29cc830c670b5b208f1d3b0a61c SHA512 3d6b122b9a55bd53192a026876cad5bb03ce2b824776b51d50ad8bbd71e7eca0fd83c1a441cee35d941292ed2de3c265e5d579ce40bef1d3eab861a1a01250a4
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.16.2.ebuild b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.16.2.ebuild
index d891b3c91ac4..2c3718a8f38f 100644
--- a/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="AMR-WB audio encoder plugin for GStreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-vpx/Manifest b/media-plugins/gst-plugins-vpx/Manifest
index c10299ea82bb..f393b4cdf2cb 100644
--- a/media-plugins/gst-plugins-vpx/Manifest
+++ b/media-plugins/gst-plugins-vpx/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-vpx-1.14.5.ebuild 387 BLAKE2B ffc214c464565ae91a0cd125df491646106a15aab467f1f5416a94132d12bd7040f7193462271d504eedfdfc13d6de83074f13d0f7ba4a41ba8694ab47425ac0 SHA512 5437d39c59c339b89d161aaf34d600a623a1e6a58057380d83ac64d3865b570ce1be68289a6e6590579c7b4ecaa3ad75f458c6d24b12b360f8bb0eb9a3374896
-EBUILD gst-plugins-vpx-1.16.2.ebuild 392 BLAKE2B 2be35a4f72a932571c49635031aef05af184a9fac1fa27dbd1055744b89fb448cbb8afc4a6430e111b692c8b93bf757a275ccb48497502c7d143fe2d4cd0c4a8 SHA512 7c08c3edf473905428c5b1bb59f8442a2b8153d5dd82edd1b2459cc458d49e4a5f16514cc15637f1aec1c348621654ceddec1951a3ddd5f7d444cbedc3da657a
+EBUILD gst-plugins-vpx-1.16.2.ebuild 391 BLAKE2B 34665062cca7207d6a3a51347fcc0458538d1f6537593ba37cef786bfa93b798e82ae8c34bd5c1f1cf8a4c936dfdd5631618d3fa0da11355121312a95d42557c SHA512 0fe01881e661a667e9edd84d43b5c81fa5b07a3e6e4f88d707394d6eb53876b2326db2a78d6d4d77a48ad4c35631ffdc2adac2a32582a61d4237eb0e378cb29f
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.16.2.ebuild b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.16.2.ebuild
index 7b556b11f50f..b13bafb72bd3 100644
--- a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit autotools gstreamer
 
 DESCRIPTION="VP8/VP9 video encoder/decoder plugin for GStreamer"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libvpx-1.3.0:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-wavpack/Manifest b/media-plugins/gst-plugins-wavpack/Manifest
index dbc5b0c6a390..063636c17fe4 100644
--- a/media-plugins/gst-plugins-wavpack/Manifest
+++ b/media-plugins/gst-plugins-wavpack/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-wavpack-1.14.5.ebuild 390 BLAKE2B 88bda5cf09ec8b7fcc9a5f6efb316b618270ce63f64a25a48a96d10a0e355cdace03f3251d5c24225de583cab76221f7efc84ed4dd6482cf87788602bf5a746e SHA512 574279c719fe30357ae872148b1191d3284e299c0fa33671302d3af229690c6bde33c7e4de4f2aaeb5cd665d90852193b1db0d14621e4ce0c6b5972d84e31ce0
-EBUILD gst-plugins-wavpack-1.16.2.ebuild 394 BLAKE2B 827b43caad07110abe3c8a7756f62965b86d7e65d8b9b8377247cc932c78b0db6684b9ed53e3293f2e45984757ef58618474fe511e59d71cea80f22026aa5756 SHA512 e1d414c08bbbb23459f8de29c49e1e5d227d64ca9d03bb57c7bd4c560202f429c6fe65f3f3ee4f7be88c184e91755bd23df11dd6e2aea20d9cadf8604f835b38
+EBUILD gst-plugins-wavpack-1.16.2.ebuild 393 BLAKE2B 5320938eaeda429bf321933f0c977d21a36c06e0a753548cfc2128afbed9e54732c2e8199da66160e2e0b6e3732fd51d98b5c2a5c1fa07f9b39b16d34d1d3ec3 SHA512 362c886af514a8f0d13f42ca7c3fac7fd98a339b3a9ef0652c8276eb6567b6f2e9c084796e8a2b735c10fbf6c5300e112ffef5edc7113aad899cd884ad0b3830
 MISC metadata.xml 529 BLAKE2B 137cd943fda3cba7c57ece2b4eff3c1beb0c694dd564f11a82249171fc2bf17448a18aabd2ebf4eb21dfefef07c9a0a8a749df48e79e7709b56634d4ad8a8250 SHA512 31c1c1b8f7e462a53d6bd6cc68c310f5236c6ba52f3fac37775a30dcc0448b2fba900c1b2ef16f31566f03a3b823aa6de02ccaf033f6ec587d64a175aa57ade4
diff --git a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.16.2.ebuild b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.16.2.ebuild
index 49c3bb3c9a01..47f56997a272 100644
--- a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="Wavpack audio encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-x264/Manifest b/media-plugins/gst-plugins-x264/Manifest
index b9f606f6a270..597974f4dd2e 100644
--- a/media-plugins/gst-plugins-x264/Manifest
+++ b/media-plugins/gst-plugins-x264/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2af33536719913ec10229eb6bc64f1f957bc7f6afe45e1c528ab4015c25dec61b8b9d2c517fee78a8a992c76bd41ff9e75d1 SHA512 0866bbcc3f1d0d668e77b5ef83fa7469dc80c957d2c6526126e761db46e83ff18d941c247833d27336106d8ba043e9ad50cafbddbff241f95bb16f9b1a0fbacc
 DIST gst-plugins-ugly-1.16.2.tar.xz 893964 BLAKE2B c607a7aa3459625a930021d247705f00e418e57557c57b8f9793bce74cb5c4d708b253250f0bbebd9698e9ff80d5636d578dded8c360ca2d34e3d43c9a722416 SHA512 9f393043f51b12b376607e68b3b86437af86e321e3a3566e59c7f3507ed26622211df87e30a23bcc927f37bc11f53ca3b29f1b12bf58e623ce18edc88a9cdee3
 EBUILD gst-plugins-x264-1.14.3.ebuild 412 BLAKE2B 5120035a98dfcf2e055f6694ccd74886e546300da0dc159e3c3f9d59415e06e0c097286f16cf9a43e2c288a609c81873ed80c45ab592bdf9816773d74fa419fa SHA512 f04743c5275651ba79875a7b0dd7eb6a6a67395f347d012e41f270f8db2af31ea7a2d38eba2977390fc5a2caf702f39f760a5100f777355f3ef0a3806cf1b177
-EBUILD gst-plugins-x264-1.16.2.ebuild 418 BLAKE2B b85993c76bbd9361171ac255b1576258c683b8d83bd6eac539cea89bb74610806da20ecbc7565292878d57d66d4d90c47a301e93593c499849eb9c6e89dee26a SHA512 a70d3376978fc27b33c070883d24636ed427531d5f7e1f53243dc1feb7d7875da7650df7fdbe809bc1346bef11485f2fa8fbe0861db414e1789d112d530b53b0
+EBUILD gst-plugins-x264-1.16.2.ebuild 416 BLAKE2B 9a69e976d9bb29a71a9a96932988f8c7b33fc53463f568ee9d3f9590986c524500b80b3dd9411fb8a5a1599225dbd0194bc133cbe6b9f3b60c4e0323f4983b73 SHA512 0a75c34f6c8612b357666f4d3b5fd3ed6a588cf5d51f182e10e3ab45effa986bd0237180eb71f30b4ecaee3156147cb7f4d30b38f907df8b5d74c8eb8dc46fa9
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.16.2.ebuild b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.16.2.ebuild
index 63d4975a14e1..791258164c5d 100644
--- a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="H.264 encoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 # 20111220 ensures us X264_BUILD >= 120
diff --git a/media-plugins/gst-plugins-x265/Manifest b/media-plugins/gst-plugins-x265/Manifest
index f17ed7635a5f..b60ad6850db7 100644
--- a/media-plugins/gst-plugins-x265/Manifest
+++ b/media-plugins/gst-plugins-x265/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-x265-1.14.5.ebuild 315 BLAKE2B 7cb878e6f3b8b087bf7c8d0ac47bdae273e1435772a3aab655a568046b2ff34f0625b2b11e94da0c970de3e0af00b68c3f448662f5b8b6bdb339f9db4581394c SHA512 16495d7f764218030a9500c07afc138c5eaec9c55a34970b1f37c8c9f37118888f96aba8d1093f402f64243b3665361dbf9550e148dfbc3d5bee997c62e8a3b1
-EBUILD gst-plugins-x265-1.16.2.ebuild 317 BLAKE2B 9b8f25e84dee1c5e0b2b481499d06195674bd243d9e8af02ec10008f2497e2b78dcf0558b4cab508893bd7003890b8ceb0cbbb024994e677933c8bdd79ffaad7 SHA512 55fe64f77911700514e75e8b734539e2e16f924730d26e9c23497b81eb06fdf9b2dc9de31d80b68d6931c2382918e236e17040f029edee75cfbdc373a32c4e0c
+EBUILD gst-plugins-x265-1.16.2.ebuild 316 BLAKE2B 11f5ff209a5cccfead194f77fe0ed995c5da65ce49bbb86d2de776265f23a33778255b4d9593a240ace03e606090e3ed5984534b8236ea24e3f3bc81add265a6 SHA512 008cad9c06aa4351018b2400905bc673e909f81231efbe2c1f5d6ef55f912a5b443737be8fd4bc81e6a8dac13fd47c2a98bc105ce1eb91726e5e1ac34e9e56d3
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-x265/gst-plugins-x265-1.16.2.ebuild b/media-plugins/gst-plugins-x265/gst-plugins-x265-1.16.2.ebuild
index 11c1fd1adbd9..e3b9207282b7 100644
--- a/media-plugins/gst-plugins-x265/gst-plugins-x265-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-x265/gst-plugins-x265-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE="gst-plugins-bad"
 inherit gstreamer
 
 DESCRIPTION="H.265 encoder plugin for GStreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-ximagesrc/Manifest b/media-plugins/gst-plugins-ximagesrc/Manifest
index bb20d192c697..b1a4a4fef9d9 100644
--- a/media-plugins/gst-plugins-ximagesrc/Manifest
+++ b/media-plugins/gst-plugins-ximagesrc/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-ximagesrc-1.14.5.ebuild 682 BLAKE2B 6acddf4e35c62bcb10de90e4c1658026dae67f41863a5a7c2f907963309d9140b93f846b37b84090865f212d33d76a65845ee1c20c72ce0ce3671d4b754204a0 SHA512 c719b4485e3237c2a4b428d39f5514bd82ee52417bec84bbbea39d59d8744d9cda454c8c833c7c04df6f37bb2029a422d66482b63d5e8811a1c3504557a2b8e7
-EBUILD gst-plugins-ximagesrc-1.16.2.ebuild 686 BLAKE2B 2aea221f8a20a1e9ef7926e7d7cb88700b330a48124d4d8e433d1723ee4dce27b6d7d34497fe1d68af49be7eb5b10aae9e5786ebc582a1a14ae5963634d1e38b SHA512 eae6679a833a58485c64a6fe9e4394eab3d038d5df524235da59af6088e9b321cd3f302da6f4492ae336b51ec7dc8c99b4605d28446dd7de02da19b9cc37229d
+EBUILD gst-plugins-ximagesrc-1.16.2.ebuild 685 BLAKE2B 64e4990dce6e07120743d4331f5e53cb5628f07525b8519a09548dff504c43542e16d3ef00986ee29f4c23c201cfbf992375a1517386b1bda0fee0a9a0b8c0e1 SHA512 7a1a7eb90aa91f6e706531cc8a9ed00d300af1b30864e111fb17e699408ceaa4e705bf0b94d1f48efb9e76f733e14f463e9efa3333fd98c5e03ab39fb05c3e36
 MISC metadata.xml 457 BLAKE2B 6af6de3816b28b279400abcc8e9fce070ce8ac5ce2f4ccbecff7d16ba0081bb277db520bd4efaeb07e48b220cf35baf09e0c68e7d99fab59eefc57c0881af49b SHA512 52d8e5e5f48b1e6a0f0e5742307348d66ec3302ffa32dc1dde2f98078621c242d431bf2354902f5ca17b277910cb733336219bc8c1598a1b4ea2c149fcbcf559
diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.16.2.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.16.2.ebuild
index 0359db28db53..d0e8fdd7372f 100644
--- a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="X11 video capture stream plugin for GStreamer"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/mythplugins/Manifest b/media-plugins/mythplugins/Manifest
index 7aa0efed5a12..6293da157f0b 100644
--- a/media-plugins/mythplugins/Manifest
+++ b/media-plugins/mythplugins/Manifest
@@ -1,5 +1,5 @@
 DIST mythplugins-30.0.tar.gz 101169041 BLAKE2B 0125c6234c168b9b24110b817e9e9a632187743c9ca44a46a8d464be6c330067f31da6fb252ed2a5fd770756229f2d95a746bd5d0e03be1e97fecc0de86603be SHA512 a29125ca33b1b100f51feb7a2ccff16d62928e474a393f11fc4b4fb77d0a85d9d4dd138acf757b527c0f936f3ff2e7d3eddcacef183d642429e36bc3e44ecbf4
 DIST mythplugins-31.0.tar.gz 102552136 BLAKE2B b09b41230eb2cae19d770c3cc59151863e0a56e95a86627473d52613e62f0acf3bd0c4bb37afb340ab874c222899f9d3c219ded470785d27960db9b39d784ceb SHA512 d53817231409934ef37d12739c38cf6936f04f816b0ba1c9738ce99b5b4ff387c70b683ccd84f649ff2f74992b2158829f5f1d1ffe06c8768da1922b90439f6e
 EBUILD mythplugins-30.0-r2.ebuild 4461 BLAKE2B 75ade4698ab445f25b1d5a53adbcf18f418363eee1119b12a35bf6a6cb61aa03f1d0ac6759e3d30d8f82f9a12e69f6c8c23cc864f49a37692453b02bd8f20ee1 SHA512 5e9435e4cfa7a6ac063cbcdc925e8b8bdca3d7827a45908149b54d5332ac1c6d11af9d70d4d464e2d7c28526796b0698f5ac4be29c1785e795e3fae282395404
-EBUILD mythplugins-31.0.ebuild 4124 BLAKE2B 9916234a4266fa9ec2a93b1be7bde11813ebc45068e8ed0e49546ce8ce0c92d1f3b74e8994ca99a99b9a853b4b86c00789970d451e5f5ce60e8ac28098f6183f SHA512 4ffff1aabe6d819e70a22439393594ea5520e822682ac6e9743ca539f568d134470c2bcc5550756c1255209ad738714c4b7fe785b74e426ac775f8a75e519468
+EBUILD mythplugins-31.0.ebuild 4144 BLAKE2B 66136cacf6e35ae8876ff85c2530a73061889d919253093dc1d39c9805227b2afed5215fbdd48decae39b0f62feb8fe21b2ff07b638ac082a8b1bcc486a16a5a SHA512 6720740e004787ace9a76564f69d5abc41ef958af4b2b16b62f9078f0e530b1f23e24d8fd16f173a3c00d883bb525f677c0f6f59b051d7ef68e56dd2ef8e1c1b
 MISC metadata.xml 1648 BLAKE2B c3bf88af62ef3c7dc370c085f99e555c890ffbdac07e3a9106ed1c277d4c6943a1be2702b3cb8d376665073d69e42d0e629186825fd09ccb03d5d5378ff2ce31 SHA512 43e6c090619bd621b07683e56aa2c90cb163072aa3c5093f6ec5eda147dd1b67ca01488934bb49f851b8fd667b3f47f2e106b98f7f53d97b600fa5ce77d5c7b0
diff --git a/media-plugins/mythplugins/mythplugins-31.0.ebuild b/media-plugins/mythplugins/mythplugins-31.0.ebuild
index ad77fcfcd4bc..c3ed4b175149 100644
--- a/media-plugins/mythplugins/mythplugins-31.0.ebuild
+++ b/media-plugins/mythplugins/mythplugins-31.0.ebuild
@@ -81,6 +81,7 @@ RDEPEND="
 		dev-perl/XML-Twig
 	)
 	mythmusic? (
+		dev-qt/qtwebkit:5
 		media-libs/flac
 		media-libs/libogg
 		media-libs/libvorbis
diff --git a/media-plugins/vdr-atscepg/Manifest b/media-plugins/vdr-atscepg/Manifest
index d487cd69bb01..16b39f8253e5 100644
--- a/media-plugins/vdr-atscepg/Manifest
+++ b/media-plugins/vdr-atscepg/Manifest
@@ -1,5 +1,5 @@
 AUX vdr-atscepg-0.3.0_gcc6.patch 509 BLAKE2B f3e7eac4f46e2055c1e008a204ffa8707df38c6bc881292a29fb2acfd80ecc84bdde511e2e3b20483cca45d13f8bbc540b58b4127f23e2a405ee0d3a83a2044f SHA512 78bd6c7ca21bbbab7a91f191778e0d0b5cc14c6659b0d153632c70e3363d4d8886e09f19e13bbbd7e2387dd77ec6d8cd716aa060344d737abf75508d28ce4f2a
 DIST atscepg-0.3.0_vdr-1.7.13.tbz 23415 BLAKE2B ea55648dc0356f8bf87c5bfa6021ffe7a5a2600655722f49f328cfa7bf1e18f12a60d2ea2915b6f5a5d48d6ba0ff4cd1359f5c8e58c38a8eba912e67c19af19a SHA512 ebb3b363f4bb1a6040a1d651b863c399890e583aa7a1e4021113c74414e966d5087a510490dc04a51baf325693a8e931970387bd4b7cfdffcdbea1d8ff366bce
 DIST vdr-atscepg-0.3.0.tgz 42456 BLAKE2B ec40394e2f66a6ae99c00fbd08f04144767553b8ee7945d5c7af10b37c1e75834e917abebfcb8bb36b3194e2508f786ec72b92f8a6628e904528398c9036a39d SHA512 63c23ea0d680f1be4d50cc5beea26e218f7a6bc1bc6d8e2ade04c46ce93fc5a497384f2ad40b94a8c6131df0ce8481137274db395286d5196afcac3f7d666c15
-EBUILD vdr-atscepg-0.3.0-r1.ebuild 882 BLAKE2B db90abd9163651d40c468f94171a82d47fc73ec11e1ff8ba879e14f276728d4b2292d2c60b29200914b82ee7539ee5346ea32243a1dfe59db34586ddadeddb18 SHA512 3e08ea340335103a9d0488c7e2958ea39427e7cfff17fe99b5db6be237d7d2be805ad3d73beb006905047e9e8f17e8d3a4a5330a42e670cc11299d4c6fe4d945
+EBUILD vdr-atscepg-0.3.0-r1.ebuild 884 BLAKE2B 1344bbc9c1890e6e587c203e7fddcdedaded3c95274f710be2ea32ac2dfe83f80e82f7ea1d39c8fe8c485b385a118f08fa7405df1fb1eb9d5260a0fc298bb137 SHA512 976d015dc958232571e174bd872b87d5591bc22d9a69ff09b14e181844597416970af6d42fb263a6cfdbcf7972144bde5f03a88fafda4b92efb4f6aa7fd4f850
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-atscepg/vdr-atscepg-0.3.0-r1.ebuild b/media-plugins/vdr-atscepg/vdr-atscepg-0.3.0-r1.ebuild
index fa3ada70b114..e7a5fa74fdfc 100644
--- a/media-plugins/vdr-atscepg/vdr-atscepg-0.3.0-r1.ebuild
+++ b/media-plugins/vdr-atscepg/vdr-atscepg-0.3.0-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit vdr-plugin-2
+inherit flag-o-matic vdr-plugin-2
 
 DESCRIPTION="VDR plugin: receive schedule and event information from ATSC broadcasts"
-HOMEPAGE="http://www.fepg.org/atscepg.html"
+HOMEPAGE="http://fepg.org/atscepg/"
 SRC_URI="http://www.fepg.org/files/${P}.tgz
 		mirror://gentoo/atscepg-${PV}_vdr-1.7.13.tbz
 		https://dev.gentoo.org/~hd_brummy/distfiles/atscepg-${PV}_vdr-1.7.13.tbz"
diff --git a/media-plugins/vdr-skinelchi/Manifest b/media-plugins/vdr-skinelchi/Manifest
index eb3e3c3cbd1f..41f4a1fb66cc 100644
--- a/media-plugins/vdr-skinelchi/Manifest
+++ b/media-plugins/vdr-skinelchi/Manifest
@@ -1,5 +1,5 @@
 AUX vdr-skinelchi-0.3.0_min_max_from_stl.patch 887 BLAKE2B 8f54521791e59a970fe61a0a66a4989ded5edb06893f685cf18060b04bc95f2ea7569e8389083d839fcff4a826598cba8e43154ac256bed0a13d614b67c6b643 SHA512 021f9a13d1898aafe436d877bce6b9eb3d0e3303012eba8ce244071f8529f4ad931c20af0a5db257dc817b0cad61916eb6934c81fa01a6a54a10efcc9abee6da
 DIST vdr-skinelchi-0.3.0.tar.bz2 78806 BLAKE2B b2f9e94484e6e8e9829fbc4a53485c8fa094563aab9a090b1dc0b1f55b769d416d21bba8fac81297740eb72cfed4110cbf545a2faf9e0542cf8b3e75f31e533d SHA512 28ffaf956435b8f5caf84b1562b1450214cfc96906dfce3455093627e1f1807a6c3bc37aaf1055148a719debd8b0a6a8c860a869a42850a61f0c6a1551294c8f
 EBUILD vdr-skinelchi-0.3.0-r1.ebuild 943 BLAKE2B 4318b6bdb0b159f6006730299ef659b11a60bf4ba47ad8ee9f098893df3e8d505871753b271bffda84bdf3585212b26255e89c950b7cb9bb9e4186ffb70d5303 SHA512 5b3c2cec0d1c3f9a7140977428fd89fe156cdc496a504ab58a227edd2d82f6a676b64ce9f0c36195a02f4b8159c61ab72b189b4933d7dd63d80ba4f294b47c31
-EBUILD vdr-skinelchi-0.3.0-r2.ebuild 991 BLAKE2B f3e099feb234328ce33ddb94933fc43b735446316acc3c784f38629dbc91f67a16bc285d24251e010d41ab1f9871a457d313c3a03d962fd68f91de99526fb3ac SHA512 60be2dd7e6d245d9dc6d57864daa7df84c51bb55975c0413f2ad8f3f437977e0bbf9fa83223027120e7ea3240e16e850f79b12215cfc2eed66c38074978e696c
+EBUILD vdr-skinelchi-0.3.0-r2.ebuild 1004 BLAKE2B cee0f51c820971ec0d21d97f10d07db12ea76ff925c7623d922f86680ad01923bfca18bfbb3cb1605ac0831a8bf53fa504c2812bad1ec99c3dd5e148a71033cf SHA512 9995027fa32b4f161c954f42dc8162fb97e9be108c7d0c97a1b526332cc6ec25f725d3af5d70f965baff068e1f7f09cb3efb8e0afc103301616b5c764bdd876c
 MISC metadata.xml 354 BLAKE2B ac25dae19d9da5ea0baaa63d9de21dc7ca866301178796fa2bedd68cc5ac39db87f8aa45b155b0526811fbc5a53e1816d641f8002c89ee7e98ffa161a7cf004f SHA512 bc067d5d74ea6b54e73ce9845943ab2bbbd2d44542b7c096f946871196782d57f3f569cdc9ce5731fa2468f91f0926857e2103e78a789e95bee70569f3cee8b5
diff --git a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild
index 2dbe08a9b7bc..923fb323d1d2 100644
--- a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild
+++ b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit vdr-plugin-2
+inherit flag-o-matic vdr-plugin-2
 
 DESCRIPTION="VDR Skin Plugin: skinelchi"
 HOMEPAGE="http://firefly.vdr-developer.org/skinelchi"
diff --git a/media-plugins/vdr-xineliboutput/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index 30cdffb27b2a..4fffe44a3118 100644
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -2,9 +2,9 @@ AUX confd-2.0.0 1476 BLAKE2B a1f852cb07940ff54125d88bae9467e5068e66e903b4dcdbde2
 AUX vdr-frontend 400 BLAKE2B 49713e916fbbf849517440d50343f4cedc6ffb7f65e44235df5706d4ef5881fbc92b657a0079f6c0ca9d93b3eb0fe582385b41c1d87b2dc835abd1783c723edb SHA512 e6ef3d51fa02290db8456c5b37f9a97f90557bb7943c1310ff2d8e77ee1beee3c98b1a6f012c9d97e048e3d7079b72cdeab9fa13e2a494bcb6dc58c2cd426e1f
 DIST vdr-xineliboutput-2.1.0.tgz 415333 BLAKE2B 8311271dda889cde5ab69d5bf1f643c8f6b1991ca615ce6322ea5585aac12b07b32f6fd933bf6c3797d45971597e61d429e4d9de356246109cab7c8f059b4d79 SHA512 226654dcd47864e9df8282ef401509d291677587b2850872c535abb7bee468a7c6d72c30953090890d002f0977aa1ee357a0fe6938ce3f3c1b6324e82b926537
 DIST vdr-xineliboutput-2.2.0.tgz 426058 BLAKE2B 8a5e325e0dd45dffdbcf1b9e49d4ae2486d3b3c7585dbca81855264a0a9057c48da7626acd5e9d7b2113b200eead178b19a0d9834ace5d25cd97157912d50bfa SHA512 d3b753fe496c6f73d491195cc1dac3333a46f2ef6350683fc15e3e8a423a90946574c3fdf0ed43727d61f007a8abdf3041e274317216bf06a8146dc9206f88d9
-EBUILD vdr-xineliboutput-2.1.0-r1.ebuild 3188 BLAKE2B 418f56485399f59bb76eb81bbb7e248c9f7442ac2b57573809f0c0a0313cbd1a636803d0bfe53aacf160a1de9ce56806272d298ebf5c3d124cdf9c5576359234 SHA512 4b46e11a54ca09c481bc587577aa32f5b81efdcbb01c1223164d4ec9fb05863c38cc3abf040d0e6a89e29bdd06f80e60b32234eb328f090becd31eeaab722279
-EBUILD vdr-xineliboutput-2.1.0-r2.ebuild 3305 BLAKE2B 71e9be805743f805bd054b8d5b0e6c20b90d1b7238f3e1ac9e6bc53cd6166bf5be58dcc42afbf88f82bbfc56d1dc48fad2e7005c732e7bd177e2b25ff7d4fb2d SHA512 596e3ada1130b726c7c28422399dbcab420f3db8b31462b6b27d49aa9b15137ff491a8e2668677ed91d2823d63f3e63b4a1e81976da5b96f072ba4d2dec3a712
-EBUILD vdr-xineliboutput-2.2.0-r1.ebuild 3164 BLAKE2B ef4f2508985dee1d6d3c63f72e73194291fb15ee823791ab65ec56483885feaed6d53e6d323c8f8bd18ab16ab830cb8031c78e1bfb42f14cc2629f66f7dc5081 SHA512 cdfeb5d8b6198f8adc2e698e3c52f9e39bca56819d5153c7a133d5746ed9a6446609a456c0c7eb17d52fecca8b119272f13061d66ff27703c3a8e46ba3462eac
-EBUILD vdr-xineliboutput-2.2.0-r2.ebuild 3280 BLAKE2B a71d3c7eb32020febac53465491b68eb9ed852a4a5d327b562cc63deb6a22c48a1ca02ba4d5388de37d165cea51c8cea9e08cd78b7283d21ff258c32d7edacac SHA512 91b52973a874b3a57c647f0f24ddeaa21c0308f7312c5e807a6f71a389eb71740c8993bd3afe6f41fa56d9a0885d3c2893063fa9be615f7aadadd320f2bd1ad0
-EBUILD vdr-xineliboutput-9999.ebuild 3339 BLAKE2B 98de50f9e2e1c39e8c6ebb7d7cb66a4e7886724083992cc09a23a66e0e1ab1452c9e11d73e4f152d2e1b1b412893424ee47a8109f833d352c24f2ab4c4dab518 SHA512 406ae53a9f2cc456c414d40712c110532928197fb42c02069a8c8bd04b57d08cc277b0a7aca06926de1602c48ef26561740d50aecffa4a91c76aeb87e47451ec
+EBUILD vdr-xineliboutput-2.1.0-r1.ebuild 3201 BLAKE2B 1d057379decee9e23aff0a443d655ff7793bec2cfd06d4e19f6c05505442f7baa3a1058017c21a0d5b1816f8e096c47db69ed30783faa328d49f0a4526002e08 SHA512 e0ebb6a9968b85fca262fa246e9a4d47c8ab2ceccb09b5acf288a3b7054b0fad8066de4f989311c5b2171175a0f4f15de587bf8e7dfd4e8f3d7719b9764c95e1
+EBUILD vdr-xineliboutput-2.1.0-r2.ebuild 3318 BLAKE2B f25c8ac3e048007869b5227400925715daae5ddf982c60ff219330647f2ecb55cde5995467a84b50acfa942e4e833243d0daaaff3c84993c299cb4ebf950b883 SHA512 9b5293041b576fa295584e64830aa2536c984f84331410ae0462503ddb94bb4325395a77aa45e4b6de3965417b9e346ba5ace208b0e5bfb7763dc1d6b8b61bc5
+EBUILD vdr-xineliboutput-2.2.0-r1.ebuild 3177 BLAKE2B 11e044f0c5012d8c88d73d033a2e20038135d0d325a117642e937031b93c26e039dc7bc6ced959d78bdcf142f275a9eb86cde4ea220a8e2478ac6b6fc06cf11a SHA512 49e2aee2f8004805b733d2ddb9da424ec991d13bba198eaf7c61675035ee62539a83963349a9cf87b88e7f250ee20715d1f6c1537bf8ef888de3b332478a4c92
+EBUILD vdr-xineliboutput-2.2.0-r2.ebuild 3293 BLAKE2B d42ae8f3753098b65dd9f06cfcbb00a8b758e4d0934154503ab866515c58b898a8e637ecb02c2a4fb43b0f4fb005b3689a1142337bc70dde9195800d95388487 SHA512 892b34de3311128690475d41bdd190b040031f0c1ef7415e1d0afa9e406abec54408aa9c7185913ded27377d7995af87c32ebe72cc5b9393798cff68798ca9a8
+EBUILD vdr-xineliboutput-9999.ebuild 3352 BLAKE2B a41dec91c3b93b71253984d17bc9bf4c959d25c112983d379f7e919fcd840f5cbc836a1ec1ad93ac2b129679e86d571594be8c1bd59e8e05065a93d4b98a40ca SHA512 6a9b0b7df8b77304b347b574840b69295d2916296e39298a74e7f0f90d84e4d19cba212b7eadad6cd2023b74126cc0db4dacd3983d654e999627db81e6927278
 MISC metadata.xml 830 BLAKE2B 04a0e0ba5a0afc1b2c3669a442bb5b62f44d25159c16c3a6539c541b43d22b4f30c8c6ea60b076f6326aed51ca4308af52971c3b3cc5bb5c93c3128ec22f6302 SHA512 4407810d8c94d896214a12e33698432024ffed5e788be0bf850aa706f2b3eefd9a5ecb58eaf37d6f3d28611ccaae9683b8feb97d2b1cc074386e67b6dc58e1e0
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r1.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r1.ebuild
index 8fed3989426d..26cc8d658f5c 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r1.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs vdr-plugin-2
+inherit flag-o-matic toolchain-funcs vdr-plugin-2
 
 GENTOO_VDR_CONDITIONAL=yes
 
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r2.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r2.ebuild
index 57b4c4f49d71..22b0356c3c50 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r2.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs vdr-plugin-2
+inherit flag-o-matic toolchain-funcs vdr-plugin-2
 
 GENTOO_VDR_CONDITIONAL=yes
 
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r1.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r1.ebuild
index e56e63363ca6..5f905220218f 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r1.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs vdr-plugin-2
+inherit flag-o-matic toolchain-funcs vdr-plugin-2
 
 GENTOO_VDR_CONDITIONAL=yes
 
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild
index 05f03857fb35..67a25eda7352 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs vdr-plugin-2
+inherit flag-o-matic toolchain-funcs vdr-plugin-2
 
 GENTOO_VDR_CONDITIONAL=yes
 
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
index 63a718c965dc..b81bf629a3f0 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 GENTOO_VDR_CONDITIONAL=yes
 
-inherit git-r3 toolchain-funcs vdr-plugin-2
+inherit flag-o-matic git-r3 toolchain-funcs vdr-plugin-2
 
 DESCRIPTION="VDR Plugin: Xinelib PlugIn"
 HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 6fc1fdacb9c2..759b03dbd1d5 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/cqrlog/Manifest b/media-radio/cqrlog/Manifest
index 406e1f296c49..cfbfe33676e4 100644
--- a/media-radio/cqrlog/Manifest
+++ b/media-radio/cqrlog/Manifest
@@ -6,4 +6,4 @@ DIST cqrlog-2.3.0.tar.gz 10407716 BLAKE2B d932bb47601b42c940461343df69e82d8e7b89
 EBUILD cqrlog-2.1.0-r2.ebuild 931 BLAKE2B 2761e013d14817aeb3079ef7afe6c7cef0d11188558256848d9506d999aa7ba127ec5401b81de88058db80f69a1d862328a6327f83c34533d82ad9ea6717dcb8 SHA512 4817a6c632709b903be464a2f07206bf1b27ee3fbdbf4f9e2f6e3ac7943578da49d8f0521b6eb358f3c2de9e08a35b29cda4b92fdc73ae96573e87d11a692a8d
 EBUILD cqrlog-2.3.0-r1.ebuild 888 BLAKE2B 620c1c07c29b9347f41a8a0266885fc5a1ac202322e1e1d3741e7eec448d7ccf1f8bde9388b1ce8e266db2ba39d88d1a26b965e101f90d9639504e6c6aceb888 SHA512 ee32b7466b65fd7e6c6160e52d947c1a2331604bc1c3eaf9ceb1c959261f187d62f662b5ba19a486cb1ce75a0e430b50bb74000638619304bfbb8394bd284919
 EBUILD cqrlog-2.3.0.ebuild 951 BLAKE2B 1bd1f5a05104c7d05ede2175c289a478d5bcb71369c8593476899c592d23057865b19a9063324f2b13c11640a45ead03a3133321536d8fcf06d10604aae9c84b SHA512 f21a6559f3ac0dd2ee9c16fde8f34e768171d35cdf19b9aa86053aa97577784cffc3f1cfe0be433d36c1a1c287c1f15a59b979396dd88aa3ff3f896a39c1f78c
-MISC metadata.xml 213 BLAKE2B 968a2200bc028093589608429f0d0696f40ab32aa15b97320ea16e0a3769843a69537c5be4c96d6d95f83d49f75a133ef1d1be1419e1e88b86780aa7be036f58 SHA512 82ed61dc8b730a64e8265a7f341fe601880959c39efbd20fb923e980ca88bb07e8e5ed57d8ef677dfd519417fc2b2f5a9a72f91b32eecae6ca15a1a44f0c101c
+MISC metadata.xml 174 BLAKE2B 1738b3b33ef242919964fb6a498f2215dbd528720bd193469bb20020fbedda0e9102ef85539fa9d2c3924bf2e6c0dd560671134200481054111467ba8e88fcb1 SHA512 281aa8b74dd6915f9856e5e70db000388f8b04bd5393871e67b57cec316374c6986124202dfdf4855ba57dd60f1e2cfc323a1f2cc4c6fbe0f634f67f8fb40b17
diff --git a/media-radio/cqrlog/metadata.xml b/media-radio/cqrlog/metadata.xml
index b9c6cabfa90c..942e57aad12a 100644
--- a/media-radio/cqrlog/metadata.xml
+++ b/media-radio/cqrlog/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>rich0@gentoo.org</email>
-</maintainer>
+        <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-radio/js8call/Manifest b/media-radio/js8call/Manifest
index b8440e77dcca..956a1c1df190 100644
--- a/media-radio/js8call/Manifest
+++ b/media-radio/js8call/Manifest
@@ -1,13 +1,16 @@
 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
+AUX js8call-2.2.0-hamlib-type.patch 463 BLAKE2B a34effb789b9113fcdee91f631dd8abec6e9fb1aea8317c1ef99dfb005e9ac266fe8b2c1be2cf83ba128f9f52a03206e4dc5c2458537ad2878c78f756b91a6a4 SHA512 426227025f7b7039890e2d22eeda218491de883150abbfe6066fd82f604da90c321a8ee6f7916ed08dcebee38c94d681280fc7824713b663bc2aaa09f538d8d4
 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
+DIST js8call-2.2.0.tar.bz2 16249923 BLAKE2B 9bd3124bee7253f48adb0bea031f3c83c3e9487aac7208ce3dfc94208f4c861645bacd581bd44cde19ad3b3e3ac5f7f60993bece2d1fad0164afdae7b3bd290a SHA512 3e66ba0b9bb88b834b0e025b37a395008a058b87fb70c09887936fa18c192c501d127eff6e9ccf792863ccc932aa76feacc4be903ebe7ab2915298aed3689672
 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
+EBUILD js8call-2.2.0.ebuild 893 BLAKE2B 2710733bae4cf9dbfd784ca790c20e0b4f93190cd4d6926e81342450bf292e4e4032f70fb70228d1b7a7ee2bf61fb39673404866e10a15725877d966a6d4fac5 SHA512 0e6e916ab655821813f2d047949fb25e8c596592a138c7c5939fb56e52dfda58c5eb91462e36c843f1d6b79bed1c3458146423d9eb04e41d24ef2bec236967b3
 MISC metadata.xml 312 BLAKE2B 77446444162f6d430b7cd8c95ea0ff34da775e0a78d355b1e71a5a5e3c64c6f633b0339cdcd2055d3ea1fd5befa5d6655d02d2cb0fd55fd60a408efb33c6cf0a SHA512 caf176b301b2a0385c9c24d8ee1b68077d9cf49b5379f6530c27658450efa8fef6551a4d1492529bdde38e95bb4f5df5f9825c38865874514803e12ad37bc461
diff --git a/media-radio/js8call/files/js8call-2.2.0-hamlib-type.patch b/media-radio/js8call/files/js8call-2.2.0-hamlib-type.patch
new file mode 100644
index 000000000000..54c5a8e0647f
--- /dev/null
+++ b/media-radio/js8call/files/js8call-2.2.0-hamlib-type.patch
@@ -0,0 +1,20 @@
+--- a/HamlibTransceiver.hpp	2020-06-27 19:35:04.514472802 -0400
++++ b/HamlibTransceiver.hpp	2020-06-27 19:35:34.361368141 -0400
+@@ -12,17 +12,9 @@
+ 
+ extern "C"
+ {
+-#ifdef JS8_USE_HAMLIB_THREE
+   typedef struct rig RIG;
+-#else
+-  typedef struct s_rig RIG;
+-#endif
+   struct rig_caps;
+-#ifdef JS8_USE_HAMLIB_THREE
+   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.2.0.ebuild b/media-radio/js8call/js8call-2.2.0.ebuild
new file mode 100644
index 000000000000..8c4fdb778104
--- /dev/null
+++ b/media-radio/js8call/js8call-2.2.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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
+}
diff --git a/media-radio/xwxapt/Manifest b/media-radio/xwxapt/Manifest
index 6892eb5c585c..69ad88362dba 100644
--- a/media-radio/xwxapt/Manifest
+++ b/media-radio/xwxapt/Manifest
@@ -1,4 +1,4 @@
 AUX xwxapt-3.4.2-fix-autotools.patch 1339 BLAKE2B 00db95e39bd581b5fb298f88fa1105bfe39e1778e5e308b34f3ba8364771ef4e59d6bd13426549c6a2eb9d08748fd0144e1d6e70f0f5c4a87be3e6e38a50cda0 SHA512 edad4b8db138db59587f35150261f15eeae3b1e02f06cb0f814f7c34fa3e1de1c6eb42768fee5fa90659e81f0288cad3f900f45f7038c59488e7cb78a03e5216
 DIST xwxapt-3.4.2.tar.bz2 262059 BLAKE2B 5e5642523e434dee6d2a35dc1be5bead3449afddb285e367cd99c7d2de14f2b1d7181bd6bc7d91a652faaa38aac3ce1b7d51d80ece665b230667674d9cb52779 SHA512 15969db9869699b09e2ddd1f800bff4956dcdedf91c5070d6747d3fa7ec22f78460adc8533917523821712b4da9f75350a8780df45bfe8741ad88d694dda6210
-EBUILD xwxapt-3.4.2.ebuild 1146 BLAKE2B 7d24849207990238a1dbfbd6626fda63cc6bd38dcea0ffe779d1a34873e5cd4b88338f00f01633bd794c647fb18a026f3c8fc8307877f55af1db9ad4df605206 SHA512 2a69ebe2d3017c734c03e5cb659647a6aa3469cdeeb8320d01b422bdd9a492b5f1edd243b36f67191bc12206f9109535cb036dfe5b819f83a9d647b67939c13b
+EBUILD xwxapt-3.4.2.ebuild 1148 BLAKE2B bb84773b7da60e38f910400048e92d4f9b0844398b386a3c68d7d1c83c0fa35eb77c7289fadcac3331c4474c0d7f6c416d50bd85ff6b47a249dc57172df7637e SHA512 b9f3e52855fb096f55bb8037b6a8e9130e0f05cfd28a7e4614894de1197db7cb9d171e152e7e6409aff732249db50070115cdd1580fe03ee8b389f7bae4c9ec7
 MISC metadata.xml 245 BLAKE2B 1d0fb3b909203735db219043a3b6ad6a2f3fafff1813f9c9caefdb9206262ff73c4ce6b93c0a8ec7d157148cea478b38d0c835ac9948a66d8ed81726f1b4d93f SHA512 9289d414ccbc30198596601b290cf42a583a093bbd7c5f8889c8ac0e81d8570bc4d42dfcbfe210456120edb910ea8572d6806400adec144f4eeb95fa36ae6ef3
diff --git a/media-radio/xwxapt/xwxapt-3.4.2.ebuild b/media-radio/xwxapt/xwxapt-3.4.2.ebuild
index 3b6927d2f973..97cad7f0863e 100644
--- a/media-radio/xwxapt/xwxapt-3.4.2.ebuild
+++ b/media-radio/xwxapt/xwxapt-3.4.2.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 inherit autotools
 
 DESCRIPTION="GTK+ linux weather satellite APT image decoder software"
-HOMEPAGE="http://www.qsl.net/5b4az/pages/apt.html"
-SRC_URI="http://www.qsl.net/5b4az/pkg/apt/${PN}/${P}.tar.bz2"
+HOMEPAGE="https://www.qsl.net/5b4az/pages/apt.html"
+SRC_URI="https://www.qsl.net/5b4az/pkg/apt/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 2f5b6427a222..f2ea83863a00 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/erec/Manifest b/media-sound/erec/Manifest
index e4d13137acc4..859a99568929 100644
--- a/media-sound/erec/Manifest
+++ b/media-sound/erec/Manifest
@@ -1,4 +1,5 @@
+AUX erec-2.2.0.1-fix-makefile.patch 2717 BLAKE2B d10a0f2918b4f32b8b0876464dadcbdee37df0a23ab5e7bad99053620d7046ec3dce6c40913c1ea7a895a6843074ebf1fa9b4c9a9f9b33eba6936841456aab28 SHA512 8e014628bb9840fa8b59a825563dc6131b7d99892a7a30f9d844ffcab2d0f5e76af7d90891749a18026b65ee0325a228060bde081824617a8a52387e76b19c53
 AUX erec-2.2.0.1-gcc43.patch 340 BLAKE2B d3fc0c0d4bb509e7ce3839b8e83732a12602036502a010d1752139c66da6fcc8993bfcc98d74fb226ee67a0af9d2f73c5da97586a2fa61932c6469310411f5d0 SHA512 12f94249223911709ce46b3c5b1985019232f2d2ea906cfdebc30f6fd9e314e38ec40b734ea235d063f499e651a76fb05bcbfdd3be190b41e03625180b154cb0
 DIST erec-2.2.0.1.tar.bz2 25966 BLAKE2B 22e93e2185fc5eafab93a2558b3dd1261bcd7a96613fcc9b321baba13ca4dfaf024399aa298d36a6df7857ff0dd03c0bb15d3b3c26549b1845dba22061a94f6e SHA512 24832483ebca011294931a40be192fa1f6a0fbf69d2b515529bd6d9cbdb5bbd904f266bd824f816d044ed7ba63bc8cc6886868a0d594a0071e757c3e9ebfef28
-EBUILD erec-2.2.0.1-r1.ebuild 998 BLAKE2B f260ce3b64e7b15cb49741500340bbc79da4e8bd4e1d79529d8c215be209e496d26e37f756c0220662b34526d8eed366e3532a231b7c3f5c3a019aedc3a2603a SHA512 6a8d6f7f3c8d29adb40c261578090bd14a6ecd8d89ba7edd73918d15103e9d3499e28babe57ae3cf7ef098e652c018afaf0f336fc7643a04d66782b4a846acb0
+EBUILD erec-2.2.0.1-r1.ebuild 684 BLAKE2B 7d0707f008c3c6f9f4f2c66f24d6388b5caf36552499945a7af1d6e0d67be3c7cd0d254b2aac11a22dba221b354b6ed8956a382d57a55813ad8bc3c4f957adcd SHA512 8b82ce4b5fddef11cf341fcf12f41ae70844ce7967b119d50cae7422656e1f24f294f149ba5d0476706cf94db201be26da1c8ffa780de54704b77331659d670b
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/erec/erec-2.2.0.1-r1.ebuild b/media-sound/erec/erec-2.2.0.1-r1.ebuild
index 764393565e5c..69ec64516124 100644
--- a/media-sound/erec/erec-2.2.0.1-r1.ebuild
+++ b/media-sound/erec/erec-2.2.0.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
@@ -9,35 +9,27 @@ DESCRIPTION="Shared audio recording server"
 HOMEPAGE="https://bisqwit.iki.fi/source/erec.html"
 SRC_URI="https://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
 
-KEYWORDS="amd64 ~ppc sparc x86"
 LICENSE="GPL-2+"
 SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
 
-PATCHES=( "${FILESDIR}/${P}-gcc43.patch" )
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-fix-makefile.patch
+)
 
 DOCS=( README )
 HTML_DOCS=( README.html )
 
 src_prepare() {
-	sed -i \
-		-e "s:BINDIR=/usr/local/bin:BINDIR=${D}/usr/bin:" \
-		-e "s:^\\(ARGHLINK.*-L.*\\):#\\1:" \
-		-e "s:^#\\(ARGHLINK=.*a\\)$:\\1:" \
-		-e "s:\$(CXX):\$(CXX) \$(CXXFLAGS) -I\"${S}\"/argh:g" \
-		Makefile || die
-
-	sed -i \
-		 -e "s:CPPFLAGS=:CPPFLAGS=-I\"${S}\"/argh :" \
-		Makefile.sets || die
-
-	echo "" > .depend || die
-	echo "" > argh/.depend || die
 	default
+
+	# prevent buildsystem from generating header dependencies
+	touch .depend argh/.depend || die
 }
 
-src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-		CXXFLAGS="${CXXFLAGS}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -j1
+src_configure() {
+	tc-export AR CC CXX
 }
 
 src_install() {
diff --git a/media-sound/erec/files/erec-2.2.0.1-fix-makefile.patch b/media-sound/erec/files/erec-2.2.0.1-fix-makefile.patch
new file mode 100644
index 000000000000..31c90354b7e7
--- /dev/null
+++ b/media-sound/erec/files/erec-2.2.0.1-fix-makefile.patch
@@ -0,0 +1,113 @@
+--- a/argh/Makefile
++++ b/argh/Makefile
+@@ -16,12 +16,12 @@
+ all: libargh.so libargh.a
+ 
+ libargh.so: argh.lo
+-	$(CXX) -g -shared -Wl,-soname=$@ -o $@ $^
++	$(CXX) -shared -Wl,-soname=$@ -o $@ $^
+ argh.lo: argh.cc
+ 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -fpic -o $@ -c $<
+ 
+ libargh.a: argh.o
+-	ar -rc $@ $^
++	$(AR) -rc $@ $^
+ 
+ include depfun.mak
+ 
+--- a/argh/Makefile.sets
++++ b/argh/Makefile.sets
+@@ -1,21 +1,18 @@
+-CC=gcc
+-CPP=g++
+ #CXX=g++-2.95
+-CXX=g++
+ #CXX=remotegcc -soktober -- g++
+ 
+ # Options for compiling, generally.
+-CPPFLAGS=-DVERSION=\"$(VERSION)\" -pipe -g
++CPPFLAGS+=-DVERSION=\"$(VERSION)\"
+ #         -fmessage-length=0
+ 
+ WARNINGS=-Wall -W -pedantic \
+-    -Wundef -Wcast-qual -Wpointer-arith -Wstrict-prototypes \
+-    -Wconversion -Wmissing-prototypes -Wwrite-strings \
++    -Wundef -Wcast-qual -Wpointer-arith \
++    -Wconversion -Wwrite-strings \
+     -Wsign-compare -Wredundant-decls
+ #   -Wtraditional -Wcast-align
+ 
+ # C specific warnings
+-CCOPTS=$(WARNINGS) -Waggregate-return -Wshadow -Winline
++CCOPTS=$(WARNINGS) -Wstrict-prototypes -Wmissing-prototypes -Waggregate-return -Wshadow -Winline
+ 
+ # C++ specific warnings
+ CXXOPTS=$(WARNINGS)
+@@ -25,9 +22,8 @@
+ #-march=pentiumpro
+ 
+ # Flags.
+-CFLAGS=$(OPTIM) $(CCOPTS)
+-CXXFLAGS=$(OPTIM) $(CXXOPTS) -fno-default-inline
++CFLAGS+=$(CCOPTS)
++CXXFLAGS+=$(CXXOPTS) -fno-default-inline
+ #-fno-rtti
+ 
+ #LDFLAGS=-pg -ax
+-LDFLAGS=-g
+--- a/Makefile
++++ b/Makefile
+@@ -19,9 +19,9 @@
+ SUBDIRS=argh
+ 
+ # For DYNAMIC argh-linking, use:
+-ARGHLINK=-Largh -largh
++#ARGHLINK=-Largh -largh
+ # For STATIC argh-linking, use:
+-#ARGHLINK=argh/libargh.a
++ARGHLINK=argh/libargh.a
+ 
+ all: subdirs ${PROG}
+ 
+@@ -29,8 +29,8 @@
+ $(SUBDIRS):
+ 	@$(MAKE) -C $@
+ 
+-${PROG}: $(OBJS)
+-	$(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS) $(ARGHLINK)
++${PROG}: $(OBJS) subdirs
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -Iargh -o $@ $< $(LDLIBS) $(ARGHLINK)
+ 
+ include depfun.mak
+ 
+--- a/Makefile.sets
++++ b/Makefile.sets
+@@ -1,22 +1,18 @@
+ INSTALL=install
+-CC=gcc
+-CXX=g++
+ 
+-CPP=$(CC)
+-LDFLAGS=-g
+ #LDLIBS=-lstdc++
+ 
+-CWARNINGS=-Wall -W -pipe -g \
++CWARNINGS=-Wall -W \
+     -Wundef \
+-    -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes \
+-    -Wmissing-prototypes -Winline
++    -Wcast-qual -Wcast-align -Wwrite-strings \
++    -Winline
+ #   -Wtraditional  -fmessage-length=128
+ 
+-CXXFLAGS=-pedantic -ffast-math $(CWARNINGS)
++CXXFLAGS+=-pedantic $(CWARNINGS)
+ #CFLAGS=-O3 -fomit-frame-pointer -ffast-math $(CWARNINGS)
+-CFLAGS=-O -g $(CWARNINGS)
++CFLAGS+=-Wmissing-prototypes -Wstrict-prototypes $(CWARNINGS)
+ 
+-CPPFLAGS=-DVERSION=\"$(VERSION)\" \
++CPPFLAGS+=-Iargh -DVERSION=\"$(VERSION)\" \
+          -DCONFIG=\"$(CFGDIR)/$(CFGFILE)\" \
+          -DBINDIR=\"$(BINDIR)\" $(DEFS)
+ 
diff --git a/media-sound/ezstream/Manifest b/media-sound/ezstream/Manifest
index a0dcca66be66..a239d147766f 100644
--- a/media-sound/ezstream/Manifest
+++ b/media-sound/ezstream/Manifest
@@ -1,5 +1,5 @@
 AUX ezstream.confd 60 BLAKE2B 2b2d8a1bbfd6fbd4a196dc8eecc07939b9c85b6a6ffa0f138a51e6cab1a29080aae7a91bcbf4b628c6786612ea87da20fac01f1c118e965ef672f845b19372b9 SHA512 09f178f665d8677e3c75055028f975b98310fb2017ac0d69ae40b6417134ecec40ac90493fb861e1c46a2473fdd87bc088955032e62ddfbb8e201b306066d9c3
 AUX ezstream.initd 633 BLAKE2B 32536c9fd48d9d1a77c8ba829b9aba135ca3339aed91f36f6bc90d2e89610a4d1eba0588d5dd90f7aa7b83f8f4737276178fc8cbae3b7db0cab4141e46106ea6 SHA512 684b56d3f828ce518d5fa1d5d9be64ef4b1d591fd0bed75d9842cc8d2ed79c8aab500d22465e02c60b8be5f1662462ff3a4b19a789ac807d290113cf29f6efd3
 DIST ezstream-0.6.0.tar.gz 250448 BLAKE2B 18449d90e51a6880c6acf3d99fd449f666de811dec5dc964102d87b7d1d08dab01e3d9d8d959f4a456ba695464693fec3d990115cc6b6513fcde02c937dab1c1 SHA512 d6b621db85a0d56dcc54a8b7a0136c25342ec507f04ab397a53f46a74e85e94806e17d0a0a59e66096b5c0d97b7f98eaba95a50c1ca6c8d82aed11b854d0d33d
-EBUILD ezstream-0.6.0-r1.ebuild 853 BLAKE2B 00216751b06da021b95d447b1dbb27928a9c600d59b6e3d11d799d0ecd80f268856a2610381a4241a68cef2fd63979063badb18e93455bd9511a86e737532c9c SHA512 e5017e8f55b565254ef131d44d3d1ae29c67036db7e907f7b3b46941a35cdbe37f0cede92543e70e1014a08938529e4449a816fe7bf9b0e9b7b790ec092c9eca
+EBUILD ezstream-0.6.0-r1.ebuild 854 BLAKE2B 583e4e5b249feeee0d0611b78faeaef4df717161d9e56d561562ffb8303099dc8bc76b6280cc6c942970d0f41e51e2d4f3c529528575acf9951ec37fef2e61cd SHA512 87aa6d4ef146d50e660066a463e4569c07ab000f5d830b2de16ca0da36ceac63f5e07e2c11bb7a564f1a89011e8aea3d678283aaa37f3ecddfab1b85db5286a1
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/ezstream/ezstream-0.6.0-r1.ebuild b/media-sound/ezstream/ezstream-0.6.0-r1.ebuild
index ddde77ac0d51..665c2a35883f 100644
--- a/media-sound/ezstream/ezstream-0.6.0-r1.ebuild
+++ b/media-sound/ezstream/ezstream-0.6.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="A command line source client for Icecast media streaming servers"
-HOMEPAGE="http://www.icecast.org/ezstream/"
+HOMEPAGE="https://www.icecast.org/ezstream/"
 SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-sound/flake/Manifest b/media-sound/flake/Manifest
index bb4f1e0bd9fb..8401fab9a67b 100644
--- a/media-sound/flake/Manifest
+++ b/media-sound/flake/Manifest
@@ -1,3 +1,3 @@
 DIST flake-0.11.tar.bz2 43319 BLAKE2B e24b1f80ce2e1048c46db8957fae51f493a39a245d7c667c0b47713f65d6d78074b2d2c56d0345d0be142bddcd64db8d750c3eceb797bf43661472c8d4ed23b1 SHA512 045cbe7f5af29dfdc5843df3dccfa6faf1ce816566b2f3ac928b98e14f5ee0ec15ee5024a092da4e33beb5d87c31f38c0780970811c5b96ae72683aeac332584
-EBUILD flake-0.11.ebuild 683 BLAKE2B 6a973329f533e8392fbe19d56f616a25b60973616a6ce9e8ba1cdfb06dc43d9b1933dfcb600a5c70de830fb69231bb24c562636950e946d108c237d4e73d0183 SHA512 3665f1c5a2fee5e23dd821e607b4917b3fe4b726998a5a209490976ac7ccf1724a5d53da2f80f4659309d0dfa700f8b21d868c153146b62feb9b8d38e2492ac1
+EBUILD flake-0.11.ebuild 738 BLAKE2B 835a36b88132340f6983bd3581b8be2e4a6e38664e52d8c591d751b588f8f672be9b2da01a3f6e85a00babcffbbc7179587b5dfd57594e684c1542c67eaa1a37 SHA512 ecb01a68cac3bfcdbde3f453ab2fb13f389d3d6ae0881876e065e8cd26e9c217b3e62ff664657c8f393d5429bb7b28392a688aa4a5d73a180b360945b0988a68
 MISC metadata.xml 332 BLAKE2B c1182dcd7f5de8f8a5687040c8d6a0411a73af3285d538fa8d1ee8732c801d5cb5769fc6c5dd0faafba299d0a8e18212329f2c0382cd49c80e7b6b26d162c8c3 SHA512 a4ccde79f373a6fc28fa699e0ab8dcea6b2a717405dc0da2f2c02ad552e6b0d61b3c19c070e186a1803c84ac7037f39bdfb6e6d5af6eb5aff3f5f6e3b7692e53
diff --git a/media-sound/flake/flake-0.11.ebuild b/media-sound/flake/flake-0.11.ebuild
index 24f2e7b6ee1b..caa19b932b0e 100644
--- a/media-sound/flake/flake-0.11.ebuild
+++ b/media-sound/flake/flake-0.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,8 +16,10 @@ KEYWORDS="amd64 x86"
 src_configure() {
 	# NIH configure script
 	./configure \
+		--ar="$(tc-getAR)" \
 		--cc="$(tc-getCC)" \
-		--prefix="${D}"/usr \
+		--ranlib="$(tc-getRANLIB)" \
+		--prefix="${ED}"/usr \
 		--disable-opts \
 		--disable-debug \
 		--disable-strip || die "configure failed"
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index c11ec8df2012..ea7fcd268b4e 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,5 +1,3 @@
-DIST fluidsynth-2.0.7.tar.gz 1315250 BLAKE2B 13186522b3eea6bdd9f4893fabe9d06e67061647c83cb9479630333b0bbc5878682d5d19d9050403875ac49f66f756947d48928e3367efef537408e86c4c4a00 SHA512 c939c77277767541b90ae8bc24687cd9cd11b375264e6b5017658f5fd9c5637a3ce09bc4ad837a349e4a63883fe5ecbe80e65dd91d2cbf71072bcbcfc068614e
 DIST fluidsynth-2.1.0.tar.gz 1356096 BLAKE2B f1dcf05a3d776d3e8be15330e2177e59c10da25063cba577b734aed2af98955c18b7184ee73866503c0cc9c5374c14a8a0030f630be98c9319680a34d8cab117 SHA512 d7af4047ebde49ef48098ae9dbab5d90422a4536acf28a2de32d8da67a50ebbbcf30e06833b630bd54e441040be0e432b377e3b63bf666e63106e69cd408ea0d
-EBUILD fluidsynth-2.0.7.ebuild 2518 BLAKE2B 2696f05bbb901fa99393a9ebcf5a9156e8e2203fcd145131b9c43f7e8595547c91ebf895c00484b6e1b8e3ab1a2b31b6017cedbfd389639103f09b2244d58e0d SHA512 86afe364b1aa048f1c9384f08ced83595757b45904eafc5069a538dca832fb8b20831eb43ccfef5cc006a9bae5e372eba4fe8d14b5208b8cfa820ce9efe7d2a3
 EBUILD fluidsynth-2.1.0.ebuild 3302 BLAKE2B fa194d9fdcd665e8cece17ed158039ff23be2214efd83e4812f7ad4db985e80c00028e993d62a3128520deac63877e4186953df9417ea2b46053331277cd2280 SHA512 e6a7e8af213573b351c3a2c388d00dcb23879990bf6c3773286f7311e10d2b67c96e9ea7e1343e19da24f62d4a4fe4a38ef209cdd061e064592b7c56520d3bf9
 MISC metadata.xml 430 BLAKE2B cef06a37f27e4ef3a555000188873f0f36a89dc90a3576dc15fb384a8f3c8f5bd38ccb79f56704ec7031823d3057eda17ac975a3ea1e265133e5ff81afc141d8 SHA512 c702d31a98e905d95f95f6cdfc16d8a71de5a5a55628e59e56d408a6599cdf6ab005642ee064217d88e0061c2856692e1446e340a3e80f2bc17ed1d3c2a14e9a
diff --git a/media-sound/fluidsynth/fluidsynth-2.0.7.ebuild b/media-sound/fluidsynth/fluidsynth-2.0.7.ebuild
deleted file mode 100644
index 494a305ed54f..000000000000
--- a/media-sound/fluidsynth/fluidsynth-2.0.7.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
-
-inherit cmake-multilib systemd
-
-DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
-HOMEPAGE="http://www.fluidsynth.org/"
-SRC_URI="https://github.com/FluidSynth/fluidsynth/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86"
-IUSE="alsa dbus debug examples ipv6 jack ladspa lash oss portaudio pulseaudio +readline +sndfile systemd"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	alsa? (
-		media-libs/alsa-lib[${MULTILIB_USEDEP}]
-		lash? ( media-sound/lash[${MULTILIB_USEDEP}] )
-	)
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	ladspa? (
-		media-libs/ladspa-cmt[${MULTILIB_USEDEP}]
-		media-libs/ladspa-sdk[${MULTILIB_USEDEP}]
-	)
-	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
-	sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS NEWS README.md THANKS TODO doc/{fluidsynth-v20-devdoc,xtrafluid}.txt )
-
-src_configure() {
-	local mycmakeargs=(
-		-Denable-alsa=$(usex alsa)
-		-Denable-dbus=$(usex dbus)
-		-Denable-debug=$(usex debug)
-		-Denable-ipv6=$(usex ipv6)
-		-Denable-jack=$(usex jack)
-		-Denable-ladspa=$(usex ladspa)
-		-Denable-oss=$(usex oss)
-		-Denable-libsndfile=$(usex sndfile)
-		-Denable-portaudio=$(usex portaudio)
-		-Denable-pulseaudio=$(usex pulseaudio)
-		-Denable-readline=$(usex readline)
-		-Denable-systemd=$(usex systemd)
-	)
-
-	if use alsa; then
-		mycmakeargs+=( -Denable-lash=$(usex lash) )
-	else
-		mycmakeargs+=( -Denable-lash=OFF )
-	fi
-
-	if use systemd; then
-		mycmakeargs+=( -DFLUID_DAEMON_ENV_FILE="/etc/fluidsynth.conf" )
-	fi
-
-	cmake-multilib_src_configure
-}
-
-install_systemd_files() {
-	if multilib_is_native_abi; then
-		systemd_dounit "${BUILD_DIR}/fluidsynth.service"
-		insinto /etc
-		doins "${BUILD_DIR}/fluidsynth.conf"
-	fi
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	docinto pdf
-	dodoc doc/*.pdf
-
-	if use examples; then
-		docinto examples
-		dodoc doc/*.c
-	fi
-
-	if use systemd; then
-		multilib_foreach_abi install_systemd_files
-
-		elog "When using fluidsynth as a systemd service, make sure"
-		elog "to configure your fluidsynth settings globally in "
-		elog "/etc/fluidsynth.conf or per-user in ~/.config/fluidsynth"
-	fi
-}
diff --git a/media-sound/fmdrv/Manifest b/media-sound/fmdrv/Manifest
index 0f00564c66bd..6766a9f544c0 100644
--- a/media-sound/fmdrv/Manifest
+++ b/media-sound/fmdrv/Manifest
@@ -1,4 +1,5 @@
+AUX fmdrv-1.0.7-fix-makefile.patch 1010 BLAKE2B cf0dc20d3a0a5092c053e66bc1a6ff140f1c66a49787b3889b8eee348d9ac85ce7c8cc23eded5c16e108d32db3170dbbb80b03de2b03befc8250d78b83290003 SHA512 fd08e27717674e97330c465f450dbc3e92ef6bb4c1a8485f64b7047023dd5e4f8869624f8b6538fbaaab015e11dca289cfb059cee0e27bd9f56543fc1c8df04c
 AUX fmdrv-1.0.7-ioperm.patch 434 BLAKE2B 355fa4db5dc48ff732aecdf6d9b79de934f4ff05647723d74953f0e6ca9e457bcd9973b7b71541c0a196ba136b471f0e4927801998cb0386b0c8abd0ca264177 SHA512 c092de86d3d2ec1dd403304b918b96196d4ceeb1856a1e2c21c1af5a5b71ab3cfa2a9e461de007296a74206cebc25c0f9633425b921f58d645a024bbbc2755b4
 DIST fmdrv-1.0.7.tar.bz2 61373 BLAKE2B d361bb974c48ebbcbfdcf3e65c03c67b5449579671eebe862b8df1220da5e738045a6ad61ea4603ff38bb801f8bdc5d7572a5eedec1765773b18f7c61ba9792d SHA512 d5533aee5c4c4e6a08dd2ede07c2f657edf93cf89bdb43d3453badd8dde68ec39a94820f91098192202490d59e2abda49af03737db39d2bfdd6b009a65824f1d
-EBUILD fmdrv-1.0.7.ebuild 829 BLAKE2B bfa070a39c7fe709502c6cd36c5141164e3c3452a05268ef9d4c88734cbe69e2d0722eb92575f2c15bb2c191897e0f287fa89c2a9b74220ae6d77908527e4aed SHA512 c380087eeaf15945596d210976a43fd585b411c9751c53b4c0d9522d491c253a4485262d8fbcbbe7c78988ef10d9328fe2eaffce48c99373fd2891b72e836f9d
+EBUILD fmdrv-1.0.7.ebuild 732 BLAKE2B cb28b4938cdcfa2f48511c7d871fdba422d20234a154d26f68d73a449d4f17a0d7348fda1c8eee585477b09944adfa09c850ae2e95287feaa1cd6901778e0570 SHA512 17a561470fc3581d848199526366ad9b9a4a9e22ba2ac82e015a2f1ef5abc343c853f1403e54737af86be45b6359e70f82b04a01032ce101992c26bafb01e8ca
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/fmdrv/files/fmdrv-1.0.7-fix-makefile.patch b/media-sound/fmdrv/files/fmdrv-1.0.7-fix-makefile.patch
new file mode 100644
index 000000000000..a222752716c7
--- /dev/null
+++ b/media-sound/fmdrv/files/fmdrv-1.0.7-fix-makefile.patch
@@ -0,0 +1,42 @@
+--- a/Makefile
++++ b/Makefile
+@@ -59,7 +59,7 @@
+ 	#ELF (works):
+ 	# $(CC) -Wl,-r -nostdlib -o $@ $^
+ 	#a.out (works):
+-	ar -rc $@ $^
++	$(AR) -rc $@ $^
+ 
+ install: installbin
+ 	chown root $(BINDIR)/fmdrv
+--- a/Makefile.sets
++++ b/Makefile.sets
+@@ -1,22 +1,18 @@
+ INSTALL=install
+-CC=gcc
+-CXX=g++
+ 
+-CPP=$(CC)
+-LDFLAGS=-g
+ #LDLIBS=-lstdc++
+ 
+-CWARNINGS=-Wall -W -pipe -g \
++CWARNINGS=-Wall -W \
+     -Wundef \
+-    -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes \
+-    -Wmissing-prototypes -Winline
++    -Wcast-qual -Wcast-align -Wwrite-strings \
++    -Winline
+ #   -Wtraditional  -fmessage-length=128
+ 
+-CXXFLAGS=-pedantic -ffast-math $(CWARNINGS)
++CXXFLAGS+=-pedantic $(CWARNINGS)
+ #CFLAGS=-O3 -fomit-frame-pointer -ffast-math $(CWARNINGS)
+-CFLAGS=-O -g $(CWARNINGS)
++CFLAGS+=$(CWARNINGS) -Wstrict-prototypes -Wmissing-prototypes
+ 
+-CPPFLAGS=-DVERSION=\"$(VERSION)\" \
++CPPFLAGS+=-DVERSION=\"$(VERSION)\" \
+          -DCONFIG=\"$(CFGDIR)/$(CFGFILE)\" \
+          -DBINDIR=\"$(BINDIR)\" $(DEFS)
+ 
diff --git a/media-sound/fmdrv/fmdrv-1.0.7.ebuild b/media-sound/fmdrv/fmdrv-1.0.7.ebuild
index e4701c3430f5..9cb17380f290 100644
--- a/media-sound/fmdrv/fmdrv-1.0.7.ebuild
+++ b/media-sound/fmdrv/fmdrv-1.0.7.ebuild
@@ -1,8 +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
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="Console mode MIDI player with builtin userland OPL2 driver"
 HOMEPAGE="https://bisqwit.iki.fi/source/fmdrv.html"
@@ -12,23 +13,21 @@ LICENSE="fmdrv GPL-2" # GPL-2 only
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ioperm.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-ioperm.patch
+	"${FILESDIR}"/${P}-fix-makefile.patch
+)
 
-src_configure() { :; } # it is a fake
+DOCS=( README )
+HTML_DOCS=( README.html )
 
-src_compile() {
-	emake fmdrv \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
+src_configure() {
+	tc-export AR CC CXX
 }
 
 src_install() {
 	dobin fmdrv
-	dodoc README
-	dohtml README.html
+	einstalldocs
 }
 
 pkg_postinst() {
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 503c769ccee1..fba13c00c17a 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-music-3.34.5.tar.xz 1415240 BLAKE2B 3545541171b023da116ebee5d28a2b69b6b45677cde26c833ea0992ba9bc41d4792375dbf3617105da53f0e98d21576e166980e896527a60d47c92690b343a27 SHA512 c4f3c8cd7e8a6d24d3766672acfe3abc340d0cd305ba0d3d0a87c02b5a5f9e8c47bee9d8284e76ad28c51eeebe56e3163f4e5c34c89e294801d0047b8476f80f
 DIST gnome-music-3.34.6.tar.xz 1415360 BLAKE2B 0b8f3a2b17242f41f3a77a9eeb60cf1f10cac57d983de6e7f44ba1a243526e0831ee2ad5baec17b726bbbe9df52e26b79dedc2b2abe4dba87c59cc4fcd4a083f SHA512 76561adf8c6ce4342825eb976de11c98c2aa66cb08075dbe46d8c7787daf7fc77763d55c2fe475dd9c75536adc98f8afbdd90bfb2b64791d05cdf11e3ed00b03
 EBUILD gnome-music-3.34.5.ebuild 2033 BLAKE2B f6c46beb2c44f23ce20f49d46ed9783ee8c2f157fc7e067947914e943bbeaa0c4e2233ee7f3f94f76e57b1193a09d8e74efc5987da26c87d1050c6dc07070006 SHA512 7f85851e01d6be1cf7c51893ad1135f8e0ce1760e56c6b7e5ac0a136f091723267110bb70f0dfb16f3618048b97ba6be08e85e5a11b8debfb6d4d8c4c31d7791
-EBUILD gnome-music-3.34.6.ebuild 2035 BLAKE2B c6fe49d24527a9fb61a3c3e166164a86ec5598a54247275e9e145c1da15c2679bd7ef2f0af6601fab44b793859e719df78536f326f40b725eea9a79a2bb38c58 SHA512 0c7e7a9a847e7c79aba6a50205b9fbf7df8d9d8bb0b7741303765c61684b66def80fdeaf379ce96592819a765ea3e3ba24c09aad1061706cc00fcd075a4b2de6
+EBUILD gnome-music-3.34.6.ebuild 2034 BLAKE2B bdb90eb19f9c485dd3a2d82454f84ee0f475a86ca345f9585064e11a4e46973e30764c035716f0dcc233e92eb299f00ce644bddd70f58186f973c3a81a2f80a1 SHA512 22ca2020819d13dc855c687907a668e8730a302e41af738291b6f0a161bb3ec9375d66a704744ffe20e8fb39d7df761103e639a76e1592cf6a08ee0f7117b7b0
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-music/gnome-music-3.34.6.ebuild b/media-sound/gnome-music/gnome-music-3.34.6.ebuild
index fde8cf288529..25d04e56418e 100644
--- a/media-sound/gnome-music/gnome-music-3.34.6.ebuild
+++ b/media-sound/gnome-music/gnome-music-3.34.6.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
 
 DEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.50:2
diff --git a/media-sound/gsm/Manifest b/media-sound/gsm/Manifest
index 520a28bea469..b3884faac2ba 100644
--- a/media-sound/gsm/Manifest
+++ b/media-sound/gsm/Manifest
@@ -1,6 +1,6 @@
 AUX gsm-1.0.12-64bit.patch 591 BLAKE2B f72688a27c9e52bd3e0b40018f2e035da4284c40e27cc0bb39b7ce0df361840304ee06d3d321ee39209e3dc7bb6424d64490b3174c5d24b3cd1cbe1ccde2787d SHA512 33b559da974d89487f41e24fe9fee4ac4df6383e27835f710f50deaca76c5077fc24b20fe4d306f1b8c2ca6f3e9cf99c5934796e3795354dee63061e305d4c72
 AUX gsm-1.0.12-memcpy.patch 301 BLAKE2B 887d9dd0c9220284f1ef69bad73e5e311994fb020bc06742cd931fead416937ae25d0e3364432be5c4cc408c57fad80bb524fddf7db75bf53e70158da4a8f089 SHA512 922999a35a5d8f646ebe61d7b7aacadbd75848a5446462a8173e040f7d4b0748c55196c1be0653752f076a01d7eb07e5bfce3fe23b81a38f1ee9f97d61cd6200
-AUX gsm-1.0.13-shared.patch 3723 BLAKE2B 4bd926e470d7c120560fe2378dd87496e47760efe293db5e9b1b61cf5075cb737425ca1e7c6b7a92068c95416603b3a5c46741e04f30a477c8d39b0b0c33e63f SHA512 0872ddb6c93ab6f7082f4a999a39439ceaa8337bf72c0a690ebbf1561a605d2664ceec14eba81a36ab244c3cfe3f3edafe3ee76869a68aeffe6fcc3f12026957
+AUX gsm-1.0.13-shared.patch 3750 BLAKE2B 62fda4c22ab90ab5c77211b9c6966eb8286e6c938f5c4b883b3b6efb6e787a0a84f2f5f9b5f124cf10d4ab3055c3c0e6f8ffb81998654720dd621353fe7b80c9 SHA512 b18273436158dc410e7c40a9a290d365f8bf89977663f35f38d783d46d858163cf0b6f73e88e57d928eafc5de7489643ac7194f72fc7a604ef7cba95e8bf6285
 DIST gsm-1.0.13.tar.gz 65318 BLAKE2B 22bb79e3afd9a2e99041693288342b55969207223486200d4aebc61908930040b6b766a9bf673ec6b484eeb95833684c79f34c95d32da17cfb4c36d025004858 SHA512 0d0cf9e1e81e64cd84f588c1e4f0cb74b849d45e41fdebf860f63588084c73c7c5198bfe73a6c976bda5735ee516661d3db00afbb5cc5886a7ee3a7b31d673aa
-EBUILD gsm-1.0.13-r1.ebuild 1553 BLAKE2B 6b343d4018055057fe85e0a617b7c01e224c2bda2b6879aad77f79578616ba50a6bf979c4b5bc24ebb25df7f9802a0fc1103bffe0d2db605a6d26b5d5ddd0efa SHA512 6dea985eb488d035971ca83f34c580f6f202740b8c46edec81f621e974fbad595c1b98bc3db170790c2d62f1083300e314d626b5a506958e9dd3db5bc678f2cd
+EBUILD gsm-1.0.13-r1.ebuild 1603 BLAKE2B c4c95c893e2273ca95b61446b7d0d71d6bd10b036bc26e807866c21c5e649a4bcc007de257fff245dc4f9175235717d701e545cc28cd76456bf1b86751051322 SHA512 572d3b59a980fd1bfb2994493876d11ec7ada6599d45750dba12f077e936790c8b5aa49d9bd362875b455e409c03c4f8e523018daadbd360ac036a0335fda77d
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/gsm/files/gsm-1.0.13-shared.patch b/media-sound/gsm/files/gsm-1.0.13-shared.patch
index fc99e2c30437..ba178092c2f0 100644
--- a/media-sound/gsm/files/gsm-1.0.13-shared.patch
+++ b/media-sound/gsm/files/gsm-1.0.13-shared.patch
@@ -1,16 +1,24 @@
-diff -ur gsm-1.0-pl13.orig/Makefile gsm-1.0-pl13/Makefile
---- gsm-1.0-pl13.orig/Makefile	2006-04-26 22:14:26.000000000 +0300
-+++ gsm-1.0-pl13/Makefile	2009-09-08 14:50:02.000000000 +0300
-@@ -96,7 +96,7 @@
+--- a/Makefile
++++ b/Makefile
+@@ -96,16 +96,14 @@
  #  Other tools
  
  SHELL		= /bin/sh
 -LN		= ln
 +LN		= ln -s
  BASENAME 	= basename
- AR		= ar
+-AR		= ar
  ARFLAGS		= cr
-@@ -140,6 +140,7 @@
+ RMFLAGS		=
+ FIND		= find
+ COMPRESS 	= compress
+ COMPRESSFLAGS 	= 
+ # RANLIB 	= true
+-RANLIB	 	= ranlib
+ 
+ #
+ #    You shouldn't have to configure below this line if you're porting.
+@@ -140,6 +138,7 @@
  # Targets
  
  LIBGSM	= $(LIB)/libgsm.a
@@ -18,7 +26,7 @@ diff -ur gsm-1.0-pl13.orig/Makefile gsm-1.0-pl13/Makefile
  
  TOAST	= $(BIN)/toast
  UNTOAST	= $(BIN)/untoast
-@@ -203,24 +204,43 @@
+@@ -203,24 +202,43 @@
  
  # Object files
  
@@ -80,7 +88,7 @@ diff -ur gsm-1.0-pl13.orig/Makefile gsm-1.0-pl13/Makefile
  
  TOAST_OBJECTS =	$(SRC)/toast.o 		\
  		$(SRC)/toast_lin.o	\
-@@ -228,7 +248,7 @@
+@@ -228,7 +246,7 @@
  		$(SRC)/toast_alaw.o	\
  		$(SRC)/toast_audio.o
  
@@ -89,7 +97,7 @@ diff -ur gsm-1.0-pl13.orig/Makefile gsm-1.0-pl13/Makefile
  
  # Manuals
  
-@@ -277,9 +297,12 @@
+@@ -277,9 +295,12 @@
  		$(CC) $(CFLAGS) $?
  		@-mv `$(BASENAME) $@` $@ > /dev/null 2>&1
  
@@ -103,7 +111,7 @@ diff -ur gsm-1.0-pl13.orig/Makefile gsm-1.0-pl13/Makefile
  		@-echo $(ROOT): Done.
  
  tst:		$(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
-@@ -299,24 +322,29 @@
+@@ -299,24 +320,29 @@
  
  # The basic API: libgsm
  
@@ -138,7 +146,7 @@ diff -ur gsm-1.0-pl13.orig/Makefile gsm-1.0-pl13/Makefile
  
  
  # The local bin and lib directories
-@@ -426,7 +454,9 @@
+@@ -426,7 +452,9 @@
  
  clean:	semi-clean
  		-rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add		\
diff --git a/media-sound/gsm/gsm-1.0.13-r1.ebuild b/media-sound/gsm/gsm-1.0.13-r1.ebuild
index 676c7daf803c..7f0c2275a725 100644
--- a/media-sound/gsm/gsm-1.0.13-r1.ebuild
+++ b/media-sound/gsm/gsm-1.0.13-r1.ebuild
@@ -38,14 +38,14 @@ src_configure() {
 
 multilib_src_compile() {
 	emake -j1 CCFLAGS="${CFLAGS} -c -DNeedFunctionPrototypes=1" \
-		LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)"
+		LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)"
 }
 
 multilib_src_install() {
 	dodir /usr/bin /usr/$(get_libdir) /usr/include/gsm /usr/share/man/man{1,3}
 
 	emake -j1 INSTALL_ROOT="${ED}"/usr \
-		LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)" \
+		LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)" \
 		GSM_INSTALL_LIB="${ED}"/usr/$(get_libdir) \
 		GSM_INSTALL_INC="${ED}"/usr/include/gsm \
 		GSM_INSTALL_MAN="${ED}"/usr/share/man/man3 \
diff --git a/media-sound/gtick/Manifest b/media-sound/gtick/Manifest
index 5e323e7cee19..655a5c368ded 100644
--- a/media-sound/gtick/Manifest
+++ b/media-sound/gtick/Manifest
@@ -1,6 +1,4 @@
-AUX gtick-0.5.4-desktop.patch 832 BLAKE2B 5eec851966ed2287b6d4d13629114b91d09b80ab52743a6537a1bd3b88c36fdd96b837a4f3725d85edac5957ffa546dcb56c3f00140e7dbfefbf01b020521bdc SHA512 4f26a64ea2ea327a9ceeba2b133c92bf8529f8dcdcf66eebf3110f976d147001990ffe29acafaee9e6cf38d36dbdd0e7484a9905a04f6f14b5cd389634100df1
-AUX gtick-0.5.4-fno-common.patch 624 BLAKE2B b3131096edc3262ad15ef27e57d1552ab80b933c64f191eacfe2275d3bff6e77c053a67f2d3678d98d5d1ee20b923b255fcb3913ddcfeb56a7b3fc1e5568647a SHA512 315f18be8f9467711da530afc98e63f4e416fc466a9fedbd2a5e84e3774a3f7ffd4b74d6bbbebaba2370109bb8b584f54823ba46faf70128aec97ec56cf16ee8
-DIST gtick-0.5.4.tar.gz 641902 BLAKE2B f1832f46b559908ae0c40bd0f6a08e145a0ba58a6cf2f8e7235b4f3f0b9141ea514cf52c51cef24d745ce360423daab855c42b5f6719664be65bf5f254650c1d SHA512 28ea6f38952c376f1f684e7b598d1032063f7fdf3454cdb86735cb835079312c0d1c30dfeade7272f5399296f2a2ede5b81524036a9ac0d91e0878865fab446e
-EBUILD gtick-0.5.4-r1.ebuild 1131 BLAKE2B cb9af368744efe8b59d5bf91751898189062d5999481c07e88dc4515023d895a6d94ef35fdc5e7064952afaceef4466a49a52a1e0c3442bf6464688c2b10856c SHA512 3cdefd4a5705ebda0cc2cffeaa0b8375796207df09a469564e8b22e55e6a55e74ec28922d23a780411a64eb3c26ae9bded3d33a6a27800374585af86590efff6
-EBUILD gtick-0.5.4.ebuild 816 BLAKE2B 57c114edb48af45d23246129c0ad0c78d21c637fa9e3a647eaeebb9676303f45ce894ed96d7a1afb0cedad38ece9c3651995a5131574c90cb84831da6881e086 SHA512 774b3518bfcf3f2e18fae37f2bb85b6785b035ed20bc3315a9ef52cdeb13f4716ee472f85b0ed46f05f29b47551ecdcdf227f292758b5cf411f077161520bbe6
+AUX gtick-0.5.5-desktop.patch 776 BLAKE2B 945b1eaff7d480e092d93b1cce83653aaa474e36172df20233f5e09cfc07ede22260cff87664ae767a39ab05e7c83b7bc401b8cf5a85539fdcd9338a78556ce4 SHA512 d61fc78e86e4bfd47e23987236108ca36bd19df90363c2bd625f4668e9a325ce082c423d90fdf0600900d391e6da21d719c620203c5052b54d9eb5f20c9d948b
+DIST gtick-0.5.5.tar.gz 659596 BLAKE2B 74e40cd20bf24ef8a9cb9f6abf49d885bb5e660a6b4faa40fa18a10153edad1e522ca555c802e9b5364abbc94f79989e4dfdfd2d19a038f4c6f63895a287dc12 SHA512 8f308c312f6cc59bb8b786af09b1498c76adc1b2692369886e85fa97524b417bf3a5e075ba20061f009b36cb4fe12cd455befe7e466d8215620640229ebbdb87
+EBUILD gtick-0.5.5.ebuild 1059 BLAKE2B bb414004dc67ae6fb55f93ff74ee7ddaebaa664fd41b728ae6c581195bd2691447199d8f628ec78e57af7d1ebdda667fdc554720b9ad1d2b19dc09a65f3b4a7c SHA512 0bffaf48f5fb97b45eaeffb06a62edff89a6cc5af8db6b3c444daff34cbc2a040c8d3786915927685c601cc5661b951b743cce89ef81843e22ba8228091e99fc
 MISC metadata.xml 478 BLAKE2B 5dda5dcbc5d1ca329e38762dc8d6d95a0f2710f97cce2fb4937ac01955c64031a1957900ff2cea5a61a0646436f900b735b3126df7acf9bcf7be48611e7fc0c0 SHA512 7e474d535527343cd3c97b3da68da7f8e98ce5db90e9f868004bfa5d0eb30d99432e56a3d789045e54f66d2932c47a56418896fc9be2771fa9b305be2be4b004
diff --git a/media-sound/gtick/files/gtick-0.5.4-desktop.patch b/media-sound/gtick/files/gtick-0.5.4-desktop.patch
deleted file mode 100644
index 7aa0995b0394..000000000000
--- a/media-sound/gtick/files/gtick-0.5.4-desktop.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Downstream patch. No upstream activity since 2014.
-
-From b07f665d712fdbebfd506ef6301fc9ac71660e96 Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Thu, 19 Mar 2020 21:17:22 +0300
-Subject: [PATCH 2/2] Fix desktop file
-
----
- gtick.desktop | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/gtick.desktop b/gtick.desktop
-index 05cf5ed..a31dee3 100644
---- a/gtick.desktop
-+++ b/gtick.desktop
-@@ -5,9 +5,10 @@ Name=GTick
- Comment=a GTK-based metronome
- Comment[pt]=Um metrônomo baseado em GTK
- Comment[pt-br]=Um metrônomo baseado em GTK
--Exec=/usr/bin/gtick
--Icon=/usr/share/icons/hicolor/64x64/apps/gtick.xpm
-+Exec=gtick
-+Icon=gtick
- Terminal=false
- Type=Application
- Categories=GTK;AudioVideo;Audio;
--GenericName[pt_BR]=
-+GenericName=Graphical Metronome
-+StartupNotify=true
--- 
-2.24.1
-
diff --git a/media-sound/gtick/files/gtick-0.5.4-fno-common.patch b/media-sound/gtick/files/gtick-0.5.4-fno-common.patch
deleted file mode 100644
index 37747cef1b88..000000000000
--- a/media-sound/gtick/files/gtick-0.5.4-fno-common.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Downstream patch. No upstream activity since 2014.
-
-From 23f5585ba3dcf276cd3f71c25f710e68823f97e9 Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Tue, 17 Mar 2020 17:14:50 +0300
-Subject: [PATCH 1/2] Fix building with -fno-common
-
----
- src/optionlexer.l | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/optionlexer.l b/src/optionlexer.l
-index df79dd5..97ed29d 100644
---- a/src/optionlexer.l
-+++ b/src/optionlexer.l
-@@ -40,7 +40,7 @@
- #include "optionlexer.h"
- 
- char* option_filename;
--YYLTYPE option_lloc;
-+#define YYLTYPE option_lloc;
- 
- void option_locate();
- %}
--- 
-2.24.1
-
diff --git a/media-sound/gtick/files/gtick-0.5.5-desktop.patch b/media-sound/gtick/files/gtick-0.5.5-desktop.patch
new file mode 100644
index 000000000000..d1492316dc58
--- /dev/null
+++ b/media-sound/gtick/files/gtick-0.5.5-desktop.patch
@@ -0,0 +1,30 @@
+From 17d3d5060160169706a9a0847aa15c068484fe5e Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Thu, 19 Mar 2020 21:17:22 +0300
+Subject: [PATCH] Fix desktop file
+
+---
+ gtick.desktop | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/gtick.desktop b/gtick.desktop
+index 05cf5ed..a31dee3 100644
+--- a/gtick.desktop
++++ b/gtick.desktop
+@@ -5,9 +5,10 @@ Name=GTick
+ Comment=a GTK-based metronome
+ Comment[pt]=Um metrônomo baseado em GTK
+ Comment[pt-br]=Um metrônomo baseado em GTK
+-Exec=/usr/bin/gtick
+-Icon=/usr/share/icons/hicolor/64x64/apps/gtick.xpm
++Exec=gtick
++Icon=gtick
+ Terminal=false
+ Type=Application
+ Categories=GTK;AudioVideo;Audio;
+-GenericName[pt_BR]=
++GenericName=Graphical Metronome
++StartupNotify=true
+-- 
+2.26.2
+
diff --git a/media-sound/gtick/gtick-0.5.4-r1.ebuild b/media-sound/gtick/gtick-0.5.4-r1.ebuild
deleted file mode 100644
index ca520476a379..000000000000
--- a/media-sound/gtick/gtick-0.5.4-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg-utils
-
-DESCRIPTION="Metronome application supporting different meters and speeds ranging"
-HOMEPAGE="https://www.antcom.de/gtick"
-SRC_URI="https://www.antcom.de/gtick/download/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="nls sndfile"
-
-RDEPEND="media-sound/pulseaudio
-	x11-libs/gtk+:2
-	sndfile? ( media-libs/libsndfile )"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fno-common.patch
-	"${FILESDIR}"/${P}-desktop.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i 's:^\(appdatadir = .*/\)appdata:\1metainfo:' \
-		Makefile.in || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable nls)
-		$(use_with sndfile)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	local res
-
-	default
-
-	for res in 32 48 64; do
-		newicon -s ${res} src/icon${res}x${res}.xpm gtick.xpm
-	done
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-sound/gtick/gtick-0.5.4.ebuild b/media-sound/gtick/gtick-0.5.4.ebuild
deleted file mode 100644
index f589cbb19346..000000000000
--- a/media-sound/gtick/gtick-0.5.4.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 desktop
-
-DESCRIPTION="Metronome application supporting different meters and speeds ranging"
-HOMEPAGE="https://www.antcom.de/gtick"
-SRC_URI="https://www.antcom.de/gtick/download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE="nls sndfile"
-
-RDEPEND="x11-libs/gtk+:2
-	media-sound/pulseaudio
-	sndfile? ( media-libs/libsndfile )"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i "/GenericName/d" ${PN}.desktop || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with sndfile)
-}
-
-src_install() {
-	default
-	newicon src/icon48x48.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "GTick"
-}
diff --git a/media-sound/gtick/gtick-0.5.5.ebuild b/media-sound/gtick/gtick-0.5.5.ebuild
new file mode 100644
index 000000000000..f3a3e28b5666
--- /dev/null
+++ b/media-sound/gtick/gtick-0.5.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg-utils
+
+DESCRIPTION="Metronome application supporting different meters and speeds ranging"
+HOMEPAGE="https://www.antcom.de/gtick"
+SRC_URI="https://www.antcom.de/gtick/download/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE="nls sndfile"
+
+RDEPEND="media-sound/pulseaudio
+	x11-libs/gtk+:2
+	sndfile? ( media-libs/libsndfile )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-desktop.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i 's:^\(appdatadir = .*/\)appdata:\1metainfo:' \
+		Makefile.in || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable nls)
+		$(use_with sndfile)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local res
+
+	default
+
+	for res in 32 48 64; do
+		newicon -s ${res} src/icon${res}x${res}.xpm gtick.xpm
+	done
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
index c2efd5071071..b0ca8d5a288c 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -1,4 +1,8 @@
+AUX guitarix-0.40.0-noexecstack.patch 972 BLAKE2B 7ecadff2c2882392b9eab28721135dcf8f70eb83397b1fed77c483b38be0d1ff74bcc2dab774e4a5449bb29049748b808683d5a2fe3406feb2c0f40c5a106eed SHA512 805172b4dbe22f9d45e25e8da5fb838bc635773d67b7db038105e6b1f61b3a3c05c5a473038127b6487e9bf339b272f77d73b30d266cd3ab65339a587fe747d5
+AUX guitarix-0.40.0-nostrip.patch 687 BLAKE2B 001f397a93b03578e6f214b517cf7af9e09a210adb0b5a5bf343ab74a9f3bc197b2d54c244bd55b6cd91ac0617299cd0937f2fed265b348253123c9873018212 SHA512 e0ee0431a19fe014b0008ff1ef94604f97aeba3bccef6571cf2fca425882081ec1eb255573a069effd9cca40427024f4ecb54836bb60e53b8c4198ae141ef240
 DIST guitarix2-0.39.0.tar.xz 80769472 BLAKE2B a699545b7e4a9992ed11a17ee9f82170c1891a95a0543c3b847ff2a02ab4e6597c28cbb4708f85022b1e94f0184b6dc712c271729bdda07373101ea9e8a1323f SHA512 5eb799498385ab9aa865e3f5a7e79d77f7f62c9bd7ad6875ec32bdec85829ed5b84bed3b0eab786ce74088fe2e1d53080f70afcb25ab1ef8d8f78a676b4947df
-EBUILD guitarix-0.39.0.ebuild 1724 BLAKE2B 301bebf30887e39b61a443ab11edd7ab25a37234b51c10dabbc9b9e085d2c7befbc5fda8087c9e3a2a74a6784bce58e20f5ab69493a19762f4143b3511ae9e9f SHA512 aa28471e55303d706a80b34db6a785bc98e7a922196311b89053b6827a0333fd96223bcad7cb60d511ac04060ba5251295d0f4d3b5c6c2516dc344a71b35e78b
-EBUILD guitarix-9999.ebuild 1760 BLAKE2B 0ee278c75d56864fb52a4b7841b04ca72c92382915b87c55dcb341a7065f34dc8b931b29bd394a87829d269032e1fac2fec04e1c5968a9f35275ae401a99b74c SHA512 09a4a0c05a8210a355113045c6ee06fc2d059a2e9d28428933a935a9b0739d3671c3e2d25d72b41db436854db0d51dcc48be733ca8efb15fb16d9266083f2da6
+DIST guitarix2-0.40.0.tar.xz 70880548 BLAKE2B 08d849d15fcfaa26e6eacb5480e8ea28a86e94f2c28969abc00c479c2f8c31ecb80cd4e02f0244f2ead26d687ff90dcdb9027a5c7ad448cf1241d69ab56d2521 SHA512 902e4d924cae68a477518cb87d7b63edb8716db93e11add921e733c315f2646652fb1b434d182e836e1e866035cabe22a41d8dc66df0b6156b5242cdd31d51e8
+EBUILD guitarix-0.39.0.ebuild 1726 BLAKE2B 2efb30118ea92aef65ed8e921378324ab38eb2632812803716ced8cde854b8ed710f9c668cc9d946eecbc7d6996577c2f819d8594b6f640a5a81e41a76fd814e SHA512 065c47eb37638e4c0c60cd0eba8e613c8502ce972f534aeee6fe9ffb3235a0ef9b3bb65a69aaffbbfe2f82580d3580dcc5b42d771bb682a94b219da9f4447d59
+EBUILD guitarix-0.40.0.ebuild 1801 BLAKE2B 8b171e16c2211e54bc6b536c94fa73846b244868bcbc1e757a2bf2d02fb5d273111dfa501640b3e334ff65e071ede7ed289757d93fc0e1d0c4089c44f9f610a1 SHA512 0c14080f5f7fa841cf0ad20ef1c64b399654bcbbf12bed9c33ecbe1daf9bf29fedb70fdc981cb5cb7a45e9e291db34d00361633209cf6cf67528e75f56ffc43b
+EBUILD guitarix-9999.ebuild 1734 BLAKE2B cf3c2302af3ea6f2870eb32303dabaa567d38c72987d131f0205e139a19cd23b0d6421db99218806217174e12a695604ce4cec158b4cb5848a92c665fa3d0e39 SHA512 7c9f8fd4dae7a0cdf4b75024c0edffcfaac200adc07eeaef3b5bdd7b1441350961728a0d2bbf8721ab13b201eed32b832e61b91ba0eaa6e313b0abff8c162b02
 MISC metadata.xml 595 BLAKE2B 22b392d194412eb045a3892e77a79f809215cdfc7e7afa42da59284f88975bd6d789a5a8e215c1137093266ba19e0be463d7b51b7b6506ff38f8591fd7b5cefb SHA512 5ccc8bcc15cf8fd7a5a4e18cb805765d6cc1b735c08b3194f3b4bc20d94e4d00d1db4fb9869bd58c82bcd39951d7421647811f61f7add2733e6719e6b5d78c3d
diff --git a/media-sound/guitarix/files/guitarix-0.40.0-noexecstack.patch b/media-sound/guitarix/files/guitarix-0.40.0-noexecstack.patch
new file mode 100644
index 000000000000..f64a21f26b51
--- /dev/null
+++ b/media-sound/guitarix/files/guitarix-0.40.0-noexecstack.patch
@@ -0,0 +1,26 @@
+From fc3e0b4754425bb262c8bcfd24cd345dd10e8d60 Mon Sep 17 00:00:00 2001
+From: brummer10 <brummer-@web.de>
+Date: Fri, 5 Jun 2020 06:41:30 +0200
+Subject: [PATCH] Fix issue #104 lv2 plugins contains executable stack, patch
+ by Alexander Tsoy
+
+---
+ trunk/src/LV2/xputty/resources/wscript | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/LV2/xputty/resources/wscript b/src/LV2/xputty/resources/wscript
+index a2f0402c..3c383393 100644
+--- a/src/LV2/xputty/resources/wscript
++++ b/src/LV2/xputty/resources/wscript
+@@ -41,7 +41,7 @@ def img2obj(task):
+     src = " ".join(["'%s'" % os.path.splitext(v.name)[0] for v in task.inputs[0:]])
+     cmd = ("cd src/LV2/xputty/resources/ \
+     && for f in %s; do\
+-     %s -r -b binary ${f}.png -o  ${f}.o; \
++     %s -r -b binary -z noexecstack ${f}.png -o  ${f}.o; \
+      done " % (src, env.LD[0]) )
+    # Logs.debug("runner: system command -> %s" % cmd)
+     ret = task.exec_command(cmd, shell=True)
+-- 
+2.26.2
+
diff --git a/media-sound/guitarix/files/guitarix-0.40.0-nostrip.patch b/media-sound/guitarix/files/guitarix-0.40.0-nostrip.patch
new file mode 100644
index 000000000000..2bc77f443b16
--- /dev/null
+++ b/media-sound/guitarix/files/guitarix-0.40.0-nostrip.patch
@@ -0,0 +1,24 @@
+From 3dd1e0a8ea7db95b76a7b38e27a9b54d6fe75c76 Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Fri, 5 Jun 2020 17:21:10 +0300
+Subject: [PATCH] Do not strip lv2 plugins
+
+---
+ trunk/wscript | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/wscript b/wscript
+index 2699325f..f2d8f86d 100644
+--- a/wscript
++++ b/wscript
+@@ -375,7 +375,6 @@ def configure(conf):
+     conf.env['DESKAPPS_DIR'] = os.path.normpath(os.path.join(conf.env['SHAREDIR'], 'applications'))
+     conf.env['BIN_NAME'] = APPNAME
+     if opt.lv2:
+-        conf.gxload('strip')
+         conf.gxload('lv2')
+     conf.env['LADSPA'] = opt.ladspa
+     conf.env['NEW_LADSPA'] = opt.new_ladspa
+-- 
+2.26.2
+
diff --git a/media-sound/guitarix/guitarix-0.39.0.ebuild b/media-sound/guitarix/guitarix-0.39.0.ebuild
index 9d500a3a0a3a..688596340430 100644
--- a/media-sound/guitarix/guitarix-0.39.0.ebuild
+++ b/media-sound/guitarix/guitarix-0.39.0.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE='threads(+)'
 
@@ -10,7 +11,7 @@ inherit python-any-r1 waf-utils xdg
 MY_P="${PN}2-${PV}"
 
 DESCRIPTION="Virtual guitar amplifier for Linux"
-HOMEPAGE="http://guitarix.org/"
+HOMEPAGE="https://guitarix.org/"
 SRC_URI="mirror://sourceforge/guitarix/guitarix/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
diff --git a/media-sound/guitarix/guitarix-0.40.0.ebuild b/media-sound/guitarix/guitarix-0.40.0.ebuild
new file mode 100644
index 000000000000..7a7c6a6d4525
--- /dev/null
+++ b/media-sound/guitarix/guitarix-0.40.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2019-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 python-any-r1 waf-utils xdg
+
+MY_P="${PN}2-${PV}"
+
+DESCRIPTION="Virtual guitar amplifier for Linux"
+HOMEPAGE="https://guitarix.org/"
+SRC_URI="mirror://sourceforge/guitarix/guitarix/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="bluetooth debug lv2 nls +standalone zeroconf"
+REQUIRED_USE="|| ( lv2 standalone )"
+
+COMMON_DEPEND="dev-cpp/eigen:3
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:3.0
+	dev-libs/glib:2
+	>=media-libs/libsndfile-1.0.17
+	>=media-libs/zita-convolver-3:=
+	media-libs/zita-resampler
+	>=net-misc/curl-7.26.0
+	>=sci-libs/fftw-3.1.2:3.0=
+	x11-libs/gtk+:3
+	lv2? ( media-libs/lv2 )
+	standalone? (
+		dev-libs/boost:=
+		media-libs/liblrdf
+		media-libs/lilv
+		virtual/jack
+		bluetooth? ( net-wireless/bluez )
+		zeroconf? ( net-dns/avahi )
+	)
+"
+# roboto fonts are required for correct ui rendering
+RDEPEND="${COMMON_DEPEND}
+	standalone? (
+		media-fonts/roboto
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	dev-lang/sassc
+	virtual/pkgconfig
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)
+"
+
+DOCS=( changelog README )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-noexecstack.patch
+	"${FILESDIR}"/${P}-nostrip.patch
+)
+
+src_configure() {
+	local myconf=(
+		--cxxflags-debug=""
+		--cxxflags-release="-DNDEBUG"
+		--ldflags="${LDFLAGS}"
+		--enable-lfs
+		--lib-dev
+		--no-desktop-update
+		--no-faust
+		--no-ldconfig
+		--shared-lib
+		$(use_enable nls)
+		$(usex bluetooth "" "--no-bluez")
+		$(usex debug "--debug" "")
+		$(usex lv2 "--lv2dir=${EPREFIX}/usr/$(get_libdir)/lv2" "--no-lv2 --no-lv2-gui")
+		$(usex standalone "" "--no-standalone")
+		$(usex zeroconf "" "--no-avahi")
+	)
+	waf-utils_src_configure "${myconf[@]}"
+}
diff --git a/media-sound/guitarix/guitarix-9999.ebuild b/media-sound/guitarix/guitarix-9999.ebuild
index a9962b2bb430..95daa28f6cff 100644
--- a/media-sound/guitarix/guitarix-9999.ebuild
+++ b/media-sound/guitarix/guitarix-9999.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE='threads(+)'
 
@@ -10,8 +11,9 @@ inherit python-any-r1 waf-utils xdg git-r3
 MY_P="${PN}2-${PV}"
 
 DESCRIPTION="Virtual guitar amplifier for Linux"
-HOMEPAGE="http://guitarix.org/"
+HOMEPAGE="https://guitarix.org/"
 EGIT_REPO_URI="https://git.code.sf.net/p/guitarix/git"
+S="${WORKDIR}/${P}/trunk"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -21,15 +23,14 @@ REQUIRED_USE="|| ( lv2 standalone )"
 
 COMMON_DEPEND="dev-cpp/eigen:3
 	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:2.4
-	dev-lang/sassc
+	dev-cpp/gtkmm:3.0
 	dev-libs/glib:2
 	>=media-libs/libsndfile-1.0.17
 	>=media-libs/zita-convolver-3:=
 	media-libs/zita-resampler
 	>=net-misc/curl-7.26.0
 	>=sci-libs/fftw-3.1.2:3.0=
-	x11-libs/gtk+:2
+	x11-libs/gtk+:3
 	lv2? ( media-libs/lv2 )
 	standalone? (
 		dev-libs/boost:=
@@ -40,21 +41,22 @@ COMMON_DEPEND="dev-cpp/eigen:3
 		zeroconf? ( net-dns/avahi )
 	)
 "
-# clearlooks gtk engine and roboto fonts are required for correct ui rendering
+# roboto fonts are required for correct ui rendering
 RDEPEND="${COMMON_DEPEND}
-	x11-themes/gtk-engines
 	standalone? (
 		media-fonts/roboto
 	)
 "
 DEPEND="${COMMON_DEPEND}
 	${PYTHON_DEPS}
+	dev-lang/sassc
 	virtual/pkgconfig
-	nls? ( dev-util/intltool )
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)
 "
 
-S="${WORKDIR}/${P}/trunk"
-
 DOCS=( changelog README )
 
 src_configure() {
diff --git a/media-sound/mp3asm/Manifest b/media-sound/mp3asm/Manifest
index 649adbfd8213..baa49190441a 100644
--- a/media-sound/mp3asm/Manifest
+++ b/media-sound/mp3asm/Manifest
@@ -1,3 +1,4 @@
+AUX mp3asm-0.1.3-fix-autotools.patch 179 BLAKE2B 423f263f1305f23189861ace8c44f8f4c10df05b7949d9d0b0b93f7f380eb8f546bd5653af1cd9d289dbf477db823a75bee8cb5058de8b842cf70d3f90c8c60e SHA512 052cfe837ef8736e974f1991b175c2a7d52992ffc80e11daa474d533a72f64ea333a9f2d0cb808f87f6d298c42fdd27706e6ecd863af28826fd525cbe386338a
 DIST mp3asm-0.1.3-1.tar.bz2 46530 BLAKE2B 031ce687662f107285e373ccb1702743cd340017dd8b49414576454f12338824d1e417625fa1f6228d5f1dff33879b91c88e88ce2c7ee8deb498d01d2d165b57 SHA512 c22fa3a041940fa7826d3f5ea18dd42807ca9c7d87a56c9ae10cd96606e53d17d8e6259be75a77d1101d6cda033e8b48e2dd2303e91fdca338af19ef3522fb83
-EBUILD mp3asm-0.1.3-r2.ebuild 587 BLAKE2B 554c318a3c70b8e2b80b1cc97edf7cc577fdc0f673b0a559226f09de0d9c9ee5eb0ccfc6dd06d78f4734929a6fe8b3447f1ba2ad735533670d75daa4090cf87d SHA512 bcd9130caf24e1b5d1159eddd8bc1da6ed750499ed2a931099845c69c28bbc3f3086994d53da24bb54e66c255058dbbb9cb4f6bcb0950929668696205f025d64
+EBUILD mp3asm-0.1.3-r2.ebuild 624 BLAKE2B 0f127a8a5774ca3824c17f0fa7cdac16c66de67626a16ed9f54ca69b52a6f7a8409343e709a7fb755a74962672ea482cc498375801fa06993a7a36a440960adf SHA512 3aa235b52897954da1b2b4ed03ebe0787585b5c5da9e919fd08e4897ad22132a2dc75b4f972a677bb2852d63a23c8891342dd548af90e33f9a0f8a68f4d220c3
 MISC metadata.xml 329 BLAKE2B e711686a35811a7bb61cd0fabe8d85630e6f1e86e44a3c497604850813e80f1a6658bd392a8018330e9c19458b80e976063ce94b9aae18ef6361198f4ef1bd9b SHA512 abbfd0fe24ced7e49baded7270f11e905e466e0a0c859001bf09f0b3a1e6501e463a2547577c398d1eeb6b47c1bc91ab73c3c89308963f753d8795a8f58490a7
diff --git a/media-sound/mp3asm/files/mp3asm-0.1.3-fix-autotools.patch b/media-sound/mp3asm/files/mp3asm-0.1.3-fix-autotools.patch
new file mode 100644
index 000000000000..334050d441a9
--- /dev/null
+++ b/media-sound/mp3asm/files/mp3asm-0.1.3-fix-autotools.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -7,8 +7,6 @@
+ dnl Checks for programs.
+ AC_PROG_LN_S
+ 
+-CFLAGS="-g -O -Wall"
+-
+ dnl Checks for libraries.
+ 
+ dnl Checks for header files.
diff --git a/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild b/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild
index 467241065e7c..a03af0ddc1db 100644
--- a/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild
+++ b/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit autotools
 
-MY_PV="${PV}-1"  # Patchlevel
+MY_PV="${PV}-1" # Patchlevel
 
 DESCRIPTION="A command line tool to clean and edit mp3 files"
 HOMEPAGE="https://sourceforge.net/projects/mp3asm/"
@@ -18,11 +18,15 @@ KEYWORDS="amd64 ppc sparc x86"
 # the author uses weird numbering...
 S="${WORKDIR}/${PN}-0.1"
 
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+PATCHES=( "${FILESDIR}"/${P}-fix-autotools.patch )
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
 }
 
 src_install() {
-	dobin src/mp3asm
-	dodoc Changelog README
+	default
+	dodoc Changelog
 }
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index e593fde86bf2..c5771fb32803 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,6 +1,4 @@
-DIST mumble-1.3.0.tar.gz 8788587 BLAKE2B cb870b043506eaa0fb15a21c95c125eb49082dde55b9c1a49e3ffff318477b27b45d75d18d3db83e247446efaddb2253ff520ec19da04b465a7e9a33b22064d1 SHA512 2a629fc97f3c7c587c9a3b40fc96cf15d668acada37282ec1c4a5b169ad37717d60af94d12c7bce45f2816c265f76a99ebad40a006adcf8ca38a117e7c0a4122
 DIST mumble-1.3.1.tar.gz 8587417 BLAKE2B e0ff9911727ce74035cef658ff8ce21bfab6dcfd94306abe4a206853a1b2e2e4ddc7215e757f89559c30be64df4329dffc81618a0509df2b281f5b5b59d7de2f SHA512 f622ae5e4f7cd00ef60d225ee6db3cc13fcae5fdc1b03252d17ad6a18156526517e7d019f796b5600219e90e8662d095102fc6d61033fb20fd109afdf427a6d7
-EBUILD mumble-1.3.0.ebuild 3786 BLAKE2B 73d5297dc30e4e7572259aaab5572b5e6286a0c470a5f7984079b11eb933b6b6d09eb02af75b8c4a04ec2f13c8499c6b9325934555457dd82b32036a76f15980 SHA512 ef72f808721781497a09bdfc332ff60bbc47ce9c4b05ae4e13ecb720d7c2f1fc3b6f00ad6b97263b636605722610aaa68c69ac11907109bcba5489f639099df4
-EBUILD mumble-1.3.1.ebuild 3785 BLAKE2B f513550966ec70ed598e87c34bf890e27103149b54bf40a990f0915a01cee3bb324094226b9eed3faf29a6e0ebd0593a9eff07b908eb549793a39ac574d240c6 SHA512 3a137cf5da5f699d5da56e86f0008725e3d0dfe66efd9f64259a73603ba7c5a7f66f431084ad0bf02fb6390b6cefc9a96795b3db84f663f9c06b1f49a3716577
-EBUILD mumble-9999.ebuild 3786 BLAKE2B 73d5297dc30e4e7572259aaab5572b5e6286a0c470a5f7984079b11eb933b6b6d09eb02af75b8c4a04ec2f13c8499c6b9325934555457dd82b32036a76f15980 SHA512 ef72f808721781497a09bdfc332ff60bbc47ce9c4b05ae4e13ecb720d7c2f1fc3b6f00ad6b97263b636605722610aaa68c69ac11907109bcba5489f639099df4
+EBUILD mumble-1.3.1-r1.ebuild 3812 BLAKE2B d17d1a107e33192f312fc6553ae1e1424e6956c2fd5b207250754877762dfd88522c2f1d8a5ce0d8766be8b3df485b619cc0916c31e47154cd1c209b816e746e SHA512 569d09b0cd7a4493f7a0b7b2e98abb39c67deaa3f24ef103d0fc1221d5a743e86c0ae9b3403ca8435e2ccce02ef5e225ff9887eaf48c4b3b669aacb0aefb91ba
+EBUILD mumble-9999.ebuild 3814 BLAKE2B 059e88f3d7a727ca707083d0dabdc05f80c673cdba9486803c4f0bbd0e54ddde3e9de4f4da5633cf8594768dbbfff6db4ccd402bcfa52c66d7e4273c5eea8e46 SHA512 e6d6282eeaea82c2f097bd89f37f8751ab7bdb9b1db03e12c7d72a79b534180db4c8d3b8b07e6b623bf466b239f997f3534808e632dccf0c2c4b8012709fdb92
 MISC metadata.xml 758 BLAKE2B 72c530c5bb4db48b3ab9cd915dbf68abec74f609d796acc12b70426b40065f09407a0e4daf9668ec140fc6a185ff17d3bb21ead13a2b5abe28ceb3d232b3f073 SHA512 ecff83ea1a0b3dda39884cced8fb657475ae98f9a15e07f9a1a8f01bcb411382024d47d9da70c1e066654757b6ce7262ab3f7b03780a13257bdfa895e6417ec9
diff --git a/media-sound/mumble/mumble-1.3.0.ebuild b/media-sound/mumble/mumble-1.3.0.ebuild
deleted file mode 100644
index 7f2856cbf127..000000000000
--- a/media-sound/mumble/mumble-1.3.0.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop multilib-build qmake-utils xdg
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
-HOMEPAGE="https://wiki.mumble.info"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
-	EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src )
-else
-	if [[ "${PV}" == *_pre* ]] ; then
-		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
-	else
-		MY_PV="${PV/_/-}"
-		MY_P="${PN}-${MY_PV}"
-		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz
-			https://dl.mumble.info/${MY_P}.tar.gz"
-		S="${WORKDIR}/${P/_*}"
-	fi
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	>=dev-libs/protobuf-2.2.0:=
-	>=media-libs/libsndfile-1.0.20[-minimal]
-	>=media-libs/speex-1.2.0
-	media-libs/speexdsp
-	sys-apps/lsb-release
-	x11-libs/libX11
-	x11-libs/libXi
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:5 )
-	g15? ( app-misc/g15daemon )
-	jack? ( virtual/jack )
-	!libressl? ( >=dev-libs/openssl-1.0.0b:0= )
-	libressl? ( dev-libs/libressl )
-	opus? ( >=media-libs/opus-1.0.1 )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	speech? ( >=app-accessibility/speech-dispatcher-0.8.0 )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.41.0
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-# NB: qmake does not support multilib but it's fine to configure
-# for the native ABI here
-src_configure() {
-	myuse() {
-		[[ -n "${1}" ]] || die "myuse: No use option given"
-		use ${1} || echo no-${1}
-	}
-
-	local conf_add=(
-		bundled-celt
-		no-bundled-opus
-		no-bundled-speex
-		no-embed-qt-translations
-		no-server
-		no-update
-		$(myuse alsa)
-		$(myuse dbus)
-		$(usex debug 'symbols debug' release)
-		$(myuse g15)
-		$(usex jack '' no-jackaudio)
-		$(myuse opus)
-		$(myuse oss)
-		$(myuse portaudio)
-		$(myuse pulseaudio)
-		$(myuse rnnoise)
-		$(usex speech '' no-speechd)
-		$(usex zeroconf '' no-bonjour)
-	)
-
-	use pch || conf_add+=( no-pch )
-
-	eqmake5 "${S}/main.pro" -recursive \
-		CONFIG+="${conf_add[*]}" \
-		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
-}
-
-multilib_src_compile() {
-	local emake_args=(
-		# place libmumble* in a subdirectory
-		DESTDIR_ADD="/${MULTILIB_ABI_FLAG}"
-		{C,L}FLAGS_ADD="$(get_abi_CFLAGS)"
-	)
-	# build only overlay library for other ABIs
-	multilib_is_native_abi || emake_args+=( -C overlay_gl )
-	emake "${emake_args[@]}"
-	emake clean
-}
-
-src_compile() {
-	multilib_foreach_abi multilib_src_compile
-}
-
-multilib_src_install() {
-	local dir=$(usex debug debug release)
-	dolib.so "${dir}/${MULTILIB_ABI_FLAG}"/libmumble.so*
-	if multilib_is_native_abi; then
-		dobin "${dir}"/mumble
-		dolib.so "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so*
-	fi
-}
-
-src_install() {
-	multilib_foreach_abi multilib_src_install
-
-	newdoc README.Linux README
-	dodoc CHANGES
-	dobin scripts/mumble-overlay
-
-	insinto /usr/share/services
-	doins scripts/mumble.protocol
-
-	domenu scripts/mumble.desktop
-
-	doicon -s scalable icons/mumble.svg
-
-	doman man/mumble-overlay.1
-	doman man/mumble.1
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	echo
-	elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions."
-	elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
-	echo
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/media-sound/mumble/mumble-1.3.1-r1.ebuild b/media-sound/mumble/mumble-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..c462111f1123
--- /dev/null
+++ b/media-sound/mumble/mumble-1.3.1-r1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop multilib-build qmake-utils xdg
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+HOMEPAGE="https://wiki.mumble.info"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
+	EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src )
+else
+	if [[ "${PV}" == *_pre* ]] ; then
+		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
+	else
+		MY_PV="${PV/_/-}"
+		MY_P="${PN}-${MY_PV}"
+		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz
+			https://dl.mumble.info/${MY_P}.tar.gz"
+		S="${WORKDIR}/${P/_*}"
+	fi
+	KEYWORDS="amd64 ~arm64 x86"
+fi
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	>=dev-libs/protobuf-2.2.0:=
+	>=media-libs/libsndfile-1.0.20[-minimal]
+	>=media-libs/speex-1.2.0
+	media-libs/speexdsp
+	sys-apps/lsb-release
+	x11-libs/libX11
+	x11-libs/libXi
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( dev-qt/qtdbus:5 )
+	g15? ( app-misc/g15daemon )
+	jack? ( virtual/jack )
+	!libressl? ( >=dev-libs/openssl-1.0.0b:0= )
+	libressl? ( dev-libs/libressl )
+	opus? ( >=media-libs/opus-1.0.1 )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	speech? ( >=app-accessibility/speech-dispatcher-0.8.0 )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.41.0
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+# NB: qmake does not support multilib but it's fine to configure
+# for the native ABI here
+src_configure() {
+	myuse() {
+		[[ -n "${1}" ]] || die "myuse: No use option given"
+		use ${1} || echo no-${1}
+	}
+
+	local conf_add=(
+		bundled-celt
+		no-bundled-opus
+		no-bundled-speex
+		no-embed-qt-translations
+		no-server
+		no-update
+		$(myuse alsa)
+		$(myuse dbus)
+		$(usex debug 'symbols debug' release)
+		$(myuse g15)
+		$(usex jack '' no-jackaudio)
+		$(myuse opus)
+		$(myuse oss)
+		$(myuse portaudio)
+		$(myuse pulseaudio)
+		$(myuse rnnoise)
+		$(usex speech '' no-speechd)
+		$(usex zeroconf '' no-bonjour)
+	)
+
+	use pch || conf_add+=( no-pch )
+
+	eqmake5 "${S}/main.pro" -recursive \
+		CONFIG+="${conf_add[*]}" \
+		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
+}
+
+multilib_src_compile() {
+	local emake_args=(
+		# place libmumble* in a subdirectory
+		DESTDIR_ADD="/${MULTILIB_ABI_FLAG}"
+		{C,L}FLAGS_ADD="$(get_abi_CFLAGS)"
+	)
+	# build only overlay library for other ABIs
+	multilib_is_native_abi || emake_args+=( -C overlay_gl )
+	emake "${emake_args[@]}"
+	emake clean
+}
+
+src_compile() {
+	multilib_foreach_abi multilib_src_compile
+}
+
+multilib_src_install() {
+	local dir=$(usex debug debug release)
+	insinto /usr/$(get_libdir)/${PN}
+	doins "${dir}/${MULTILIB_ABI_FLAG}"/libmumble.so*
+	if multilib_is_native_abi; then
+		dobin "${dir}"/mumble
+		doins "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so*
+	fi
+}
+
+src_install() {
+	multilib_foreach_abi multilib_src_install
+
+	newdoc README.Linux README
+	dodoc CHANGES
+	dobin scripts/mumble-overlay
+
+	insinto /usr/share/services
+	doins scripts/mumble.protocol
+
+	domenu scripts/mumble.desktop
+
+	doicon -s scalable icons/mumble.svg
+
+	doman man/mumble-overlay.1
+	doman man/mumble.1
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	echo
+	elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions."
+	elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
+	echo
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/media-sound/mumble/mumble-1.3.1.ebuild b/media-sound/mumble/mumble-1.3.1.ebuild
deleted file mode 100644
index 6e81c6c62616..000000000000
--- a/media-sound/mumble/mumble-1.3.1.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
-
-inherit desktop multilib-build qmake-utils xdg
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
-HOMEPAGE="https://wiki.mumble.info"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
-	EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src )
-else
-	if [[ "${PV}" == *_pre* ]] ; then
-		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
-	else
-		MY_PV="${PV/_/-}"
-		MY_P="${PN}-${MY_PV}"
-		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz
-			https://dl.mumble.info/${MY_P}.tar.gz"
-		S="${WORKDIR}/${P/_*}"
-	fi
-	KEYWORDS="~amd64 ~arm64 x86"
-fi
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	>=dev-libs/protobuf-2.2.0:=
-	>=media-libs/libsndfile-1.0.20[-minimal]
-	>=media-libs/speex-1.2.0
-	media-libs/speexdsp
-	sys-apps/lsb-release
-	x11-libs/libX11
-	x11-libs/libXi
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:5 )
-	g15? ( app-misc/g15daemon )
-	jack? ( virtual/jack )
-	!libressl? ( >=dev-libs/openssl-1.0.0b:0= )
-	libressl? ( dev-libs/libressl )
-	opus? ( >=media-libs/opus-1.0.1 )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	speech? ( >=app-accessibility/speech-dispatcher-0.8.0 )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.41.0
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-# NB: qmake does not support multilib but it's fine to configure
-# for the native ABI here
-src_configure() {
-	myuse() {
-		[[ -n "${1}" ]] || die "myuse: No use option given"
-		use ${1} || echo no-${1}
-	}
-
-	local conf_add=(
-		bundled-celt
-		no-bundled-opus
-		no-bundled-speex
-		no-embed-qt-translations
-		no-server
-		no-update
-		$(myuse alsa)
-		$(myuse dbus)
-		$(usex debug 'symbols debug' release)
-		$(myuse g15)
-		$(usex jack '' no-jackaudio)
-		$(myuse opus)
-		$(myuse oss)
-		$(myuse portaudio)
-		$(myuse pulseaudio)
-		$(myuse rnnoise)
-		$(usex speech '' no-speechd)
-		$(usex zeroconf '' no-bonjour)
-	)
-
-	use pch || conf_add+=( no-pch )
-
-	eqmake5 "${S}/main.pro" -recursive \
-		CONFIG+="${conf_add[*]}" \
-		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
-}
-
-multilib_src_compile() {
-	local emake_args=(
-		# place libmumble* in a subdirectory
-		DESTDIR_ADD="/${MULTILIB_ABI_FLAG}"
-		{C,L}FLAGS_ADD="$(get_abi_CFLAGS)"
-	)
-	# build only overlay library for other ABIs
-	multilib_is_native_abi || emake_args+=( -C overlay_gl )
-	emake "${emake_args[@]}"
-	emake clean
-}
-
-src_compile() {
-	multilib_foreach_abi multilib_src_compile
-}
-
-multilib_src_install() {
-	local dir=$(usex debug debug release)
-	dolib.so "${dir}/${MULTILIB_ABI_FLAG}"/libmumble.so*
-	if multilib_is_native_abi; then
-		dobin "${dir}"/mumble
-		dolib.so "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so*
-	fi
-}
-
-src_install() {
-	multilib_foreach_abi multilib_src_install
-
-	newdoc README.Linux README
-	dodoc CHANGES
-	dobin scripts/mumble-overlay
-
-	insinto /usr/share/services
-	doins scripts/mumble.protocol
-
-	domenu scripts/mumble.desktop
-
-	doicon -s scalable icons/mumble.svg
-
-	doman man/mumble-overlay.1
-	doman man/mumble.1
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	echo
-	elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions."
-	elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
-	echo
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild
index 7f2856cbf127..0d89e8057bf9 100644
--- a/media-sound/mumble/mumble-9999.ebuild
+++ b/media-sound/mumble/mumble-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
@@ -118,10 +118,11 @@ src_compile() {
 
 multilib_src_install() {
 	local dir=$(usex debug debug release)
-	dolib.so "${dir}/${MULTILIB_ABI_FLAG}"/libmumble.so*
+	insinto /usr/$(get_libdir)/${PN}
+	doins "${dir}/${MULTILIB_ABI_FLAG}"/libmumble.so*
 	if multilib_is_native_abi; then
 		dobin "${dir}"/mumble
-		dolib.so "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so*
+		doins "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so*
 	fi
 }
 
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index 178a939db0d3..6867f742d394 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -2,9 +2,7 @@ AUX murmur.confd 172 BLAKE2B 1f25ce417f1b9f504ea59d4e5216774f8eb2b00450577a1d137
 AUX murmur.initd-r1 506 BLAKE2B fd483f5f1c43f1778a909c725abee43b7299251e70e3f4e365804e7da94f674035dbb953167f2143c2d00dfbb4e23d5ed3d378c8aa2acbafbae8e7cf93fab263 SHA512 e1178a42c10f4a62f9b937e977b9e13059cae501851a377aea221ae2bd2bf031a1574e1f29f6df1b0ee08406a6a88fae8fbffd8acd0546f9ff6b27189ef55653
 AUX murmur.logrotate 175 BLAKE2B b13282fc194ed7a576e22ac241285053a7882f670580b6a3004e8ce22b3cc5f3854f46aa2a89629931a0e8cdc826e2d4e1096e837aed41148d8ef87afd485676 SHA512 09bbc2f364e038dc81e55adb86210f4cdc178bd2dba770e373f6c411b2c21d08218fd9784fff0ba133b7e18c84ddc3b2ac86d9d67a99a3169d3be42bd7fe2863
 AUX murmurd-dbus.tmpfiles 33 BLAKE2B 4040c58c142ae051e3086bfb179a1b28fc97f997d2b4ccf0392fb30d6212ac937f3d8ec120699210bee333b224af73dc1b72a40f3bda1cb4f4e8e683ac09b262 SHA512 9bc78c99dd5d830e6ea0fff82e1fdc3c323b7952e54f139754d8d0dd5e5e75c3374e26ea5a404029c96766cbf3a08afdffd53b99fdca5cd9c97dd8a28b8fc410
-DIST mumble-1.3.0.tar.gz 8788587 BLAKE2B cb870b043506eaa0fb15a21c95c125eb49082dde55b9c1a49e3ffff318477b27b45d75d18d3db83e247446efaddb2253ff520ec19da04b465a7e9a33b22064d1 SHA512 2a629fc97f3c7c587c9a3b40fc96cf15d668acada37282ec1c4a5b169ad37717d60af94d12c7bce45f2816c265f76a99ebad40a006adcf8ca38a117e7c0a4122
 DIST mumble-1.3.1.tar.gz 8587417 BLAKE2B e0ff9911727ce74035cef658ff8ce21bfab6dcfd94306abe4a206853a1b2e2e4ddc7215e757f89559c30be64df4329dffc81618a0509df2b281f5b5b59d7de2f SHA512 f622ae5e4f7cd00ef60d225ee6db3cc13fcae5fdc1b03252d17ad6a18156526517e7d019f796b5600219e90e8662d095102fc6d61033fb20fd109afdf427a6d7
-EBUILD murmur-1.3.0.ebuild 3554 BLAKE2B 2df9caa9ae5efbb02bc80eb2f9d109943597a1c6fe1cf532f9f6cb3d9c4c2ef3bfd3f9140f37f92a47983037bc88ac05833a6c64cfbcda89f1d9bebb3d559ff1 SHA512 35e5ced14798cdd79fdea77dd4065d19f6c221e5ceed262a26caca1acb83e3587a162750204eb0b1503063dd13277e871c2fb296e627f81154ff8e8db938ee95
-EBUILD murmur-1.3.1.ebuild 3689 BLAKE2B 26646b012d7c104a0dfec1f9829d1558c4a464b70bd6c906b7f32032a434a8e264a83c37ce6b63b581232acc9598d008e92915292de974ea7e9625e19c7eae19 SHA512 d8743685b61d4baa2bb72538dc3e05feb41c7bf7b01f76fa6a482eac5f5ca9906ba7aff4fd1fbed6d44117651f6f9eb72c5717d88e61065044ff78f93c9f7627
+EBUILD murmur-1.3.1.ebuild 3688 BLAKE2B 620347f0ed06e982ffa44509581b95706d0860f5b937e25c9afc51d4ae03f3272d2af323575e6234a582d6a4e0cf3a57fcebc5f80ad03392787b1e6b3b694206 SHA512 46bebc6ceadbdf18cb9ca26702da1d853436cd448e64c2dcfe0e51c88ab5314318259264b6f2c0d46c30d5cd1daebd94ad7af4b23145aa2d472cf67798e6fa57
 EBUILD murmur-9999.ebuild 3690 BLAKE2B 03dfc78a08930265518faaada25f6e857d39cd705e6ba3975ad7f12481efdba60b0f5b331e5ee785481ada733265f5caa0f681ba5aa0442d4cf45a1b96e742cd SHA512 9bab53e3b0282ac3adebb9055c1b57e2dbe0780a5f3e8cb2bbde227b22ebe057a85e3abf50a5106ce704ca07e2f56ede16ec03543676941d65269238488e6352
 MISC metadata.xml 597 BLAKE2B 6eece3d62949bfb7c01c6249764ee6e47ca0273972ed0aa2bae704ed7acb9267e7cef706d2c3eeafb5becd4695d8665c975f67e577ef3ce4def50e78ba1ce273 SHA512 d7ffb25e7b3919cb27417debe5b2f84f2f2c330e1a238583f154bb44b697a3b3c3749794baf896807874633b0659076e93c2845a56e49acb24047958d29d2beb
diff --git a/media-sound/murmur/murmur-1.3.0.ebuild b/media-sound/murmur/murmur-1.3.0.ebuild
deleted file mode 100644
index bd399783509e..000000000000
--- a/media-sound/murmur/murmur-1.3.0.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils systemd readme.gentoo-r1
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
-HOMEPAGE="https://wiki.mumble.info"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
-	EGIT_SUBMODULES=( '-*' )
-else
-	MY_PN="mumble"
-	if [[ "${PV}" == *_pre* ]] ; then
-		MY_P="${MY_PN}-${PV}"
-		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz"
-		S="${WORKDIR}/${MY_P}"
-	else
-		MY_PV="${PV/_/-}"
-		MY_P="${MY_PN}-${MY_PV}"
-		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz
-			https://dl.mumble.info/${MY_P}.tar.gz"
-		S="${WORKDIR}/${MY_PN}-${PV/_*}"
-	fi
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="+dbus debug +ice pch zeroconf"
-
-RDEPEND="
-	acct-group/murmur
-	acct-user/murmur
-	>=dev-libs/openssl-1.0.0b:0=
-	>=dev-libs/protobuf-2.2.0:=
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	|| (
-		dev-qt/qtsql:5[sqlite]
-		dev-qt/qtsql:5[mysql]
-	)
-	dev-qt/qtxml:5
-	sys-apps/lsb-release
-	>=sys-libs/libcap-2.15
-	dbus? ( dev-qt/qtdbus:5 )
-	ice? ( dev-libs/Ice:= )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.41.0
-"
-BDEPEND="
-	acct-group/murmur
-	acct-user/murmur
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS="
-	Useful scripts are located in /usr/share/doc/${PF}/scripts.\n
-	Please execute:\n
-	murmurd -ini /etc/murmur/murmur.ini -supw <pw>\n
-	chown murmur:murmur /var/lib/murmur/murmur.sqlite\n
-	to set the build-in 'SuperUser' password before starting murmur.
-	Please restart dbus before starting murmur, or else dbus
-	registration will fail.
-"
-
-src_prepare() {
-	default
-
-	if [[ "${PV}" == *9999 ]] ; then
-		pushd scripts &>/dev/null || die
-		./mkini.sh || die
-		popd &>/dev/null || die
-	fi
-
-	sed \
-		-e 's:mumble-server:murmur:g' \
-		-e 's:/var/run:/run:g' \
-		-i "${S}"/scripts/murmur.{conf,ini.system} || die
-
-	# Adjust systemd service file to our config location #689208
-	sed "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \
-		-i scripts/${PN}.service || die
-}
-
-src_configure() {
-	myuse() {
-		[[ -n "${1}" ]] || die "myconf: No use flag given."
-		use ${1} || echo "no-${1}"
-	}
-	local conf_add=(
-		no-client
-		$(myuse dbus)
-		$(usex debug 'symbols debug' release)
-		$(myuse ice)
-		$(myuse pch)
-		$(usex zeroconf '' no-bonjour)
-	)
-
-	eqmake5 main.pro -recursive \
-		CONFIG+="${conf_add[*]}"
-}
-
-src_install() {
-	dodoc README CHANGES
-
-	docinto scripts
-	dodoc -r scripts/server
-	docompress -x /usr/share/doc/${PF}/scripts
-
-	local dir="$(usex debug debug release)"
-	dobin "${dir}"/murmurd
-
-	local etcdir="/etc/murmur"
-	insinto ${etcdir}
-	newins scripts/${PN}.ini.system ${PN}.ini
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/murmur.logrotate murmur
-
-	insinto /etc/dbus-1/system.d/
-	doins scripts/murmur.conf
-
-	insinto /usr/share/murmur/
-	doins src/murmur/Murmur.ice
-
-	newinitd "${FILESDIR}"/murmur.initd-r1 murmur
-	newconfd "${FILESDIR}"/murmur.confd murmur
-
-	systemd_dounit scripts/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
-
-	keepdir /var/lib/murmur /var/log/murmur
-	fowners -R murmur /var/lib/murmur /var/log/murmur
-	fperms 750 /var/lib/murmur /var/log/murmur
-
-	# Fix permissions on config file as it might contain passwords.
-	# (bug #559362)
-	fowners root:murmur ${etcdir}/murmur.ini
-	fperms 640 ${etcdir}/murmur.ini
-
-	doman man/murmurd.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-sound/murmur/murmur-1.3.1.ebuild b/media-sound/murmur/murmur-1.3.1.ebuild
index 18faea156060..606e4379065a 100644
--- a/media-sound/murmur/murmur-1.3.1.ebuild
+++ b/media-sound/murmur/murmur-1.3.1.ebuild
@@ -24,7 +24,7 @@ else
 			https://dl.mumble.info/${MY_P}.tar.gz"
 		S="${WORKDIR}/${MY_PN}-${PV/_*}"
 	fi
-	KEYWORDS="~amd64 ~arm x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 LICENSE="BSD"
diff --git a/media-sound/muse/Manifest b/media-sound/muse/Manifest
index 3eb14df40463..9a39ec0a6946 100644
--- a/media-sound/muse/Manifest
+++ b/media-sound/muse/Manifest
@@ -1,4 +1,4 @@
-AUX muse-0.9.2_p20161002-fix-build-system.patch 2589 BLAKE2B 0deac04559921842826ff713ebae8c60fc5f6a3b0e5648e99f3490a569f5a7f7d9f6713026e77a4c43c4ef83bdd8556b0099fe77e0eb5ea2e9df5a13f20c2e20 SHA512 c0711f1e265721e7395605282d69d0c7d620c46a5fef05a9afdd2ca82c115ef67c442d8a92411902881ac4c632beb85dba9ed5f8dc16f87c7004dc3e378330c4
+AUX muse-0.9.2_p20161002-fix-build-system.patch 2757 BLAKE2B 70b040cb30d71f303313411980e02214c0979a9555e39260edc883945e9d36a6f4dec41287a7a1f5f5a308096bc98d2671886a69fd855ee1684b884a8d7c02b5 SHA512 e4df70777579eb42d93038bf9437c36ca3a0944050186316bb9ce94a00e34492c4fc502aed26aeb64f283a7b73e1d9448105a33838819a0f0086b90768ed37ff
 DIST muse-0.9.2_p20161002.tar.gz 996253 BLAKE2B 7f86698fa60719235e68ad3766d9dbb19e57e55e94cab8b4c97da5be5990d132e8aa7f63034c5945d74fe3bef4c4945435791648c064be6fe65bb0d25d39d04e SHA512 7d5b35c64b1ccae14330bb35ba0e32661f6f7445055e1854c7e5e530a7645405da03836e919b6151872f254c754d99d045b9c80938148454f521d3d117332208
-EBUILD muse-0.9.2_p20161002.ebuild 1082 BLAKE2B f6d7e40dcd20fadb38b0e5224cd7b40c2ced3905263550ad0ffb9c3891974e708e2a3394c75744ec88c0171a8d559ca9264cea44c0e1b382f46b004c20241588 SHA512 74cf464d463a617835b9c809de2194e6543395a245443f8971f9e6539497cd36520184504184371199ff4549d39b183feef56dde97afeef262904e85270c50d7
+EBUILD muse-0.9.2_p20161002.ebuild 1092 BLAKE2B 9c8b12c90034f20b84173d0ec468f026f024f150512e5f4b9d71bde00a1465f39ce75c7ef1af23590b6ade80fc4bffe1615c77ada17bf2030cfd1f503dfaa299 SHA512 73a6f7953ceadb0e6d5b5ad9e7071737a1b73d44fc683bbb94a19b4fd12e17aef407bff9a69e30d0502dae762010e996524b2c114643e4b3c5e8361ed39c1c96
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/muse/files/muse-0.9.2_p20161002-fix-build-system.patch b/media-sound/muse/files/muse-0.9.2_p20161002-fix-build-system.patch
index 7ca30e6da689..456dca9b9dee 100644
--- a/media-sound/muse/files/muse-0.9.2_p20161002-fix-build-system.patch
+++ b/media-sound/muse/files/muse-0.9.2_p20161002-fix-build-system.patch
@@ -20,7 +20,15 @@ Fix build system to properly install files and prevent underlinking.
  
  
  dnl ==============================================================
-@@ -178,19 +178,12 @@
+@@ -67,6 +67,7 @@
+ AC_PROG_CPP
+ AC_SEARCH_LIBS([strerror],[cposix])
+ AC_PROG_RANLIB
++AM_PROG_AR
+ 
+ 
+ dnl ==============================================================
+@@ -178,19 +179,12 @@
  # this is really libcdk's configuration, needs to be reviewed if correct
  # see src/ncursesgui/libcdk
  if test x$want_ncurses_gui = xyes; then
@@ -46,7 +54,7 @@ Fix build system to properly install files and prevent underlinking.
  
    if test x$have_ncurses_h = xyes; then
      AC_DEFINE([GUI_RUBIK], 1, [Have ncurses GUI])
-@@ -326,8 +319,13 @@
+@@ -326,8 +320,13 @@
  
  
  dnl documentation
@@ -62,7 +70,7 @@ Fix build system to properly install files and prevent underlinking.
  
  
  dnl ==============================================================
-@@ -402,6 +400,7 @@
+@@ -402,6 +401,7 @@
  
  AC_CONFIG_FILES([
  Makefile
diff --git a/media-sound/muse/muse-0.9.2_p20161002.ebuild b/media-sound/muse/muse-0.9.2_p20161002.ebuild
index 89771e227748..e296b01d6582 100644
--- a/media-sound/muse/muse-0.9.2_p20161002.ebuild
+++ b/media-sound/muse/muse-0.9.2_p20161002.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -14,24 +14,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="doc gtk jack ncurses portaudio"
 
-RDEPEND="media-sound/lame
+RDEPEND="
+	media-sound/lame
 	media-libs/libvorbis
-	media-libs/libsndfile
+	media-libs/libsndfile:=
 	media-libs/libogg
 	media-libs/libshout
 	media-libs/libsamplerate
 	gtk? ( x11-libs/gtk+:2 )
 	jack? ( media-sound/jack-audio-connection-kit )
 	ncurses? ( sys-libs/ncurses:0= )
-	portaudio? ( media-libs/portaudio )
-"
-DEPEND="${RDEPEND}
+	portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.2_p20161002-fix-build-system.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-0.9.2_p20161002-fix-build-system.patch )
 
 src_prepare() {
 	default
diff --git a/media-sound/music-file-organizer/Manifest b/media-sound/music-file-organizer/Manifest
index 22b061ef7076..93426dbe3af3 100644
--- a/media-sound/music-file-organizer/Manifest
+++ b/media-sound/music-file-organizer/Manifest
@@ -1,3 +1,3 @@
 DIST music-file-organizer-1.0.2.tar.xz 501840 BLAKE2B 7ec80a3d49ec2cd36882f9bb5d78f1f82aba9f9b8690380f1fcda3f9fab4ba5a4879e94f4457fb079ceb27d27b599cf500da595d9f37736df3fda709cf2ee016 SHA512 61546f595b801d4377bbfb7e52517a149cae90dee6dbb29c81a15ae6c055d535b4b095928e6918b4e0784e1d52136705a4822cb294e9b665a996afc68b4951f0
-EBUILD music-file-organizer-1.0.2.ebuild 858 BLAKE2B 2cfdd5b4c0bf2bd84f701c211452813ea25c0b81f63ca0489116f1d48fc89c425a7eb0666109343cf001c997a91b210b48126c23ca046b33ac7d318ed802fad7 SHA512 62be40216b61076d8e00c4900638f53a60a4a013ee5cc716c20f3d9dc86880ccbdfe2e2f2b155123d8e3aee627b00b370e77e766bea94e09ca1a5b531b4ac0c6
+EBUILD music-file-organizer-1.0.2.ebuild 883 BLAKE2B 7875d0bdc46ed83f10c21b33ff846329db268dc7a01748e07e79c0f35df83555290b6cd3c04bfc9d63fa9b38ac4b3569cfcdb5a90862fb9a3d18ff64a4e440ae SHA512 0870d8fc9655ad3ffa9360b2376d897789dfec70bb37c73e0432608909b5aa4b5c4746d27faf937cff636f305055f6b890152cf679f8b2b4b38f96aa128af4f7
 MISC metadata.xml 250 BLAKE2B 3c6a58190f2680dd7f7e4afd9e6abfedc7e36181b1a8d7fa9710e08c805ef85988e4a156221c61fc71c36f8e84113537b70a8f144e0764e7704f7dd074af8172 SHA512 d2115b154bf731eac11fd7b96a95baa2467cb660371f7a3dc7a7a77cf4a6cf992b97c5353f184010eac1d37cdfffa6c5d9ec35d82e171f0fad5086767d0173a5
diff --git a/media-sound/music-file-organizer/music-file-organizer-1.0.2.ebuild b/media-sound/music-file-organizer/music-file-organizer-1.0.2.ebuild
index 90beb71cf185..3906dd2747e7 100644
--- a/media-sound/music-file-organizer/music-file-organizer-1.0.2.ebuild
+++ b/media-sound/music-file-organizer/music-file-organizer-1.0.2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 DESCRIPTION="Organizes audio files into directories based on metadata tags,
 along with other metadata utilities."
-HOMEPAGE="http://blog.zx2c4.com/813"
-SRC_URI="http://git.zx2c4.com/music-file-organizer/snapshot/${P}.tar.xz"
+HOMEPAGE="https://git.zx2c4.com/music-file-organizer/about/"
+SRC_URI="https://git.zx2c4.com/music-file-organizer/snapshot/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/ogmtools/Manifest b/media-sound/ogmtools/Manifest
index 2ceb40339244..1d25b67a3246 100644
--- a/media-sound/ogmtools/Manifest
+++ b/media-sound/ogmtools/Manifest
@@ -1,7 +1,8 @@
 AUX ogmtools-1.5-comments.patch 977 BLAKE2B d12a056f8e6773737e612076bbda53b8c50912f99c7d1649d762c6d8c3c81a8f7fc9230b46e74724a03046a7367ad2331d755e1a2db19d665f2055d33d29d2df SHA512 345ca99a0685df2c9904e182c6046a367541d07f0eff8a7667650557d1729059dcd995320c7ffd40e5c52bdd7fa0ab648a53e85fb0f8a7628753dd5a2c4d027a
 AUX ogmtools-1.5-endian-fix.patch 333 BLAKE2B c1d544bc210eeb464467b7a324f048af234986e4d52573f6d9ed060fd8f6d2aaa96d7a6868a10caf2e1c895db38f6deadb4bd605a5d5920f0e052b4f781d5959 SHA512 a2de28d2063227c6f9d4e8ca2d5d10210f5bd72c1cf02087cd4d437fe211095ff8035320c75f23221cbfb11ade6bdfaa20e27fc09fbaeee26dcd2dc0d1239221
+AUX ogmtools-1.5-fix-autotools.patch 1169 BLAKE2B 4e5f2472fa1f17132452a0960f79aa8bc08d4cffb541d304f32cdeb15895545b0676045a0659cd5c443dfe2de912abefa1d8bfc37196ad983d2ce7f759f8e567 SHA512 bac193ecea6f76c0c4ac8303fabcf36329c5d090dbb4bb862762d62e12fd8398e715084f4cdfced3c48ca49e2cad93defca5974a5c0e948b65d37168bfbb909a
 AUX ogmtools-1.5-summary_length.patch 330 BLAKE2B b59fa0606b2a1bf60c355c4d2ecb2ee58c6f5419aee1471cd27bbbf365bad32d123f57c6f40deb02139a453efca50daa15f255ec56173e9e49803f434c56f063 SHA512 00212dd740d2de3702b717089949ae6961c0faeffe857bef61f1b3f019b8fc88c510302f5802d28d88d07e051d6859612a46b06f603cfbeb3a72afca565e5cae
 AUX ogmtools-1.5-vorbis_verbosity.patch 365 BLAKE2B 57b1ca8a076f8ccc5a09e77a869e784fd7dfc79240b9b14315918d95fab45cc91ce92f8a8914d5c7efdad9981389f4c1e4f41f61bb55ec4507b120159fcda549 SHA512 8d5fe06c22404198f3956c18bf91c986d212fda1987f33b8c247f6af8cd7f3ab690c105278d0f1ba188130bcfdf8dca3659a9da1c42fe19fac0692e7a853064e
 DIST ogmtools-1.5.tar.bz2 214934 BLAKE2B d9d3aa3afe0a64a6dd8201c030120a2ec9cc752037c48c1ff58b3334a5006bbd5974ff2eacb4c7e8a17c722f8fbc5ac033a64840edb179da9d66bda6743eb71d SHA512 1ed573531f9783c491a01e419667229b28540ad48c08b46131ae09ce3a4d771e3a54cde5dd09c585c0b85952e82abb3d1353864dc5223736f6eb6480158badee
-EBUILD ogmtools-1.5-r2.ebuild 812 BLAKE2B bb3700c249c13b3e3ef8a400f2f0e1d05ccb5c11eaa9507278dcf683d9cf08d3171699556562880257156bfdf7330851cb7490fd736a47f8e4c91aa86f03480b SHA512 83652a42d0ee41524421ab8071762020e20184be2ecb2be4f3915cd45d6bea49c6fac50d2405f62ff228c0c22387e116440f62236627a55f7b7d53c79d15ead5
+EBUILD ogmtools-1.5-r2.ebuild 939 BLAKE2B fd812192c34c58da038eb6ea8694ca4294b52990adb01899d117e4f5023f308ddf370a6bacd1a5694a8898176798fc7637b7be562a130b0565e417dc7819b72d SHA512 fdc04f81ae84216cc11ae60edf3c9596dc706caa289f937bf25ce8e5511b14f4c5aa8397331a75c6c5d2ecfd5f2d23d4514ee0c591b8f7b3942fe4d6331f2018
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/ogmtools/files/ogmtools-1.5-fix-autotools.patch b/media-sound/ogmtools/files/ogmtools-1.5-fix-autotools.patch
new file mode 100644
index 000000000000..74aba9463062
--- /dev/null
+++ b/media-sound/ogmtools/files/ogmtools-1.5-fix-autotools.patch
@@ -0,0 +1,44 @@
+--- a/avilib/Makefile.am
++++ b/avilib/Makefile.am
+@@ -7,7 +7,8 @@
+ 
+ INCLUDES = -I./
+ 
+-CFLAGS=-O3 -funroll-loops -ffast-math -DLINUX -Wall @CFLAGS@
++AM_CFLAGS=-Wall
++AM_CPPFLAGS=-DLINUX
+ libavi_a_SOURCES = avilib.c avidump.c avimisc.c xio.c
+ 
+ EXTRA_DIST = avilib.h README.avilib
+--- a/configure.in
++++ b/configure.in
+@@ -8,6 +8,7 @@
+ AC_PROG_GCC_TRADITIONAL
+ AC_PROG_CPP
+ AC_PROG_RANLIB
++AM_PROG_AR
+ 
+ XIPH_PATH_OGG()
+ XIPH_PATH_VORBIS()
+@@ -31,7 +32,7 @@
+ dnl Check for headers
+ AC_HEADER_STDC()
+ 
+-CFLAGS="-Wall -Wno-sign-compare @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AVILIB_CFLAGS@ @DEBUG_CFLAGS@ @PROFILING_CFLAGS@"
+-CXXFLAGS="-Wall -Wno-sign-compare @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AVILIB_CFLAGS@ @DEBUG_CFLAGS@ @PROFILING_CFLAGS@"
++CFLAGS+=" -Wall -Wno-sign-compare"
++CXXFLAGS+=" -Wall -Wno-sign-compare"
+ 
+ AC_OUTPUT(Makefile avilib/Makefile)
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,6 +2,9 @@
+ 
+ AUTOMAKE_OPTIONS = dist-zip foreign
+ 
++AM_CFLAGS=$(OGG_CFLAGS) $(VORBIS_CFLAGS) $(AVILIB_CFLAGS) $(DEBUG_CFLAGS) $(PROFILING_CFLAGS)
++AM_CXXFLAGS=$(OGG_CFLAGS) $(VORBIS_CFLAGS) $(AVILIB_CFLAGS) $(DEBUG_CFLAGS) $(PROFILING_CFLAGS)
++
+ SUBDIRS = avilib
+ 
+ if HAVE_LIBDVDREAD
diff --git a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
index 7e1a4b01a91a..28fb209d7f3c 100644
--- a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
+++ b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
@@ -1,7 +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
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="Information, extraction or creation for OGG media streams"
 HOMEPAGE="https://www.bunkus.org/videotools/ogmtools/"
@@ -12,20 +14,27 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="dvd"
 
-RDEPEND="dvd? ( media-libs/libdvdread )
-	media-sound/vorbis-tools"
+RDEPEND="
+	media-sound/vorbis-tools
+	dvd? ( media-libs/libdvdread )"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-comments.patch"
-	"${FILESDIR}/${P}-endian-fix.patch"
-	"${FILESDIR}/${P}-vorbis_verbosity.patch"
-	"${FILESDIR}/${P}-summary_length.patch"
+	"${FILESDIR}"/${P}-comments.patch
+	"${FILESDIR}"/${P}-endian-fix.patch
+	"${FILESDIR}"/${P}-vorbis_verbosity.patch
+	"${FILESDIR}"/${P}-summary_length.patch
+	"${FILESDIR}"/${P}-fix-autotools.patch
 )
 
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
 src_configure() {
-	econf \
-		$(use_with dvd dvdread)
+	econf $(use_with dvd dvdread)
 }
 
 src_install() {
diff --git a/media-sound/splay/Manifest b/media-sound/splay/Manifest
index ab1c94820287..2f8268854548 100644
--- a/media-sound/splay/Manifest
+++ b/media-sound/splay/Manifest
@@ -1,7 +1,7 @@
 AUX splay-0.9.5.2-external-id3lib.diff 583 BLAKE2B bea1a5079d03b0fd602fcbe86e1a731fe3492c9fb7bd29836cc04d32065a2d648cedf590f64817e78a040212312d859c4e7b8aae6dbcb33ed1f0c5898867a9ce SHA512 fe5db7a4a624c15dbcfff3c1b6087b33970ae09ecdc6f83348eb6da7cd3ead5df71fac6cbabe6f5b1d3389696676da390982216f53acf9450511bfd9dbfa097e
-AUX splay-0.9.5.2-fix-buildsystem.patch 6083 BLAKE2B f30ea37cbeff163df61d0b2a7930150812975ee981f0d7c310c6aaf4e09d91776188535a9b47dc7c7cfcc55a4b2a7b3b8f7f68705f0398bfc18203a35bd5c71a SHA512 135ff607f47322fc13d8d94277f24e4d844e04c9557e689e93d3bec80cb5806f631ebcb07f6b19be7724946592005359f558f0971fe62c5c3225f5c9cd274b95
+AUX splay-0.9.5.2-fix-buildsystem.patch 5907 BLAKE2B 5f352ac545968c53d27c5719de5ab431bbfddf213e5a8a75eb85a9d9893bb82e2a51ed996869fdfad33d3aa3f0070ede738b4ab1f02f2ccfbe61faa9a49fc692 SHA512 ad06d2368ad657717a5d54d69bdeaf8deb0f467b8f983fa46cfef265ffd05ca083888be5a606581532624c8a7ba69b1018dc98a6a434b33b16198e035c5c0fbf
 AUX splay-0.9.5.2-fix-c++14.patch 953 BLAKE2B 74f464a8a222bbdcc7d414046f998e490e3a81565ce4d0125fe2fb39bc90e4b33b51e8cfb1920f502ffc628f578d47c40621516988b3adfa566e523d9c8251e6 SHA512 150c4dbbb9f2f7dded871d245daffb25c4b3e67f6fe0db09a1f7c893dc2ef8a96eed70aefb32c4418aa83264b82d8a8504c29cb5561e0287fd448a0d398c360b
 AUX splay-0.9.5.2-gcc43-2.patch 1838 BLAKE2B bd43ad5a0733aae6a76e78f1c2a9ea752205e1767929505bcee8d831559e703888cc50e766387d90bdd3ed9a7516ffbbaf82afbb79392b830ec5cf9c1ea964f5 SHA512 41da577fd4fc7e28d99fd7dc4b340e5555cddef8965e05a2b166a776867a7ec610befe7e7231cd91fb695e438b6c9ba01b688e1030a0fe48d0636c72b6380cf2
 DIST splay-0.9.5.2.tar.gz 105510 BLAKE2B fd25a4acb842ecfead7200532e12185da2d1b60bfb099c6339234df7a0ca6cbc2083b12ac32bdd4878744b9de1972196ef19b201b9a7c171b09512ef54639987 SHA512 cab1fa2c753c0d7be58b29328db6c444872969b33b24191409efcf782201716d10b14109f23b2f2368909aa60a8a517ec894aeeb649ee0ac5811413a8ebeae09
-EBUILD splay-0.9.5.2-r2.ebuild 634 BLAKE2B b270e83b1e1c554d78f0cd7c47b175b0e26e17aa155e09d9cb3ffb89bd743866e1fec30f0f150d922c42e1756a99986313faaeb6f731110f48c9f40a37d4197d SHA512 6872f4e3c72b6af615a46b5888baf646749060811c85ad32ac6fadf2b4b305b7d77f77ef8f0d76720f08912eb79d2a82c2204ef64baf9d3d4b64c4931c3bf405
+EBUILD splay-0.9.5.2-r2.ebuild 623 BLAKE2B 3863475c6e86c525bfd209ce5a7984a1552df39b138904f1854e2d3b630914bbfff79004085fa7959939262e531e3e57b31f3420a7501d6ccf0f6cb08ef88bc1 SHA512 3d375ebc74b13ab734e014089180abded936a9996867dd354bb76e33b5a16b4d721b1d47f877b73a08749d699d4e3af6e4535dd5dc88464e04108cd699b7cd8f
 MISC metadata.xml 328 BLAKE2B d0e57e006d2048a4ebf4eb9a8912f6a46169db378a9c7ba6e91dddee6d22f768ffa246ce228a15460a08a71cbd1f43e27172dbf624c0aae45af123f19699d0c6 SHA512 90224a6fed46fe48538837e0c6252b1b15f33231b9f639f6ab62e1104ebee98a540a831980920820bb4f00cb0bb5db02fddbb28c51ba68bd83613adf5782243a
diff --git a/media-sound/splay/files/splay-0.9.5.2-fix-buildsystem.patch b/media-sound/splay/files/splay-0.9.5.2-fix-buildsystem.patch
index 52cea88b89ed..07d6f2d3751c 100644
--- a/media-sound/splay/files/splay-0.9.5.2-fix-buildsystem.patch
+++ b/media-sound/splay/files/splay-0.9.5.2-fix-buildsystem.patch
@@ -2,8 +2,19 @@
 * Fix ancient C++ includes using '.h' suffixes
 * Fix warnings caused by not using 'const char*'
 
---- splay-0.9.5.2/apps/Makefile.am
-+++ splay-0.9.5.2/apps/Makefile.am
+--- a/apps/common.cc
++++ b/apps/common.cc
+@@ -34,7 +34,7 @@
+ int splay_threadnum=50;
+ #endif
+ 
+-char *splay_Sounderrors[SOUND_ERROR_UNKNOWN]=
++const char *splay_Sounderrors[SOUND_ERROR_UNKNOWN]=
+ { "Failed to open sound device.",
+   "Sound device is busy.",
+   "Buffersize of sound device is wrong.",
+--- a/apps/Makefile.am
++++ b/apps/Makefile.am
 @@ -1,4 +1,4 @@
 -bin_PROGRAMS = splay @XSPLAY@
 +bin_PROGRAMS = splay
@@ -19,30 +30,8 @@
  EXTRA_DIST = $(man_MANS)
  
  
---- splay-0.9.5.2/configure.ac
-+++ splay-0.9.5.2/configure.ac
-@@ -15,7 +15,7 @@
- AC_CHECK_LIB(id3, ID3Tag_New)
- AC_CHECK_LIB(m, cos)
- AC_CHECK_LIB(pthread,main,INCLUDEPTHREAD=1)
--AC_CHECK_LIB(qt, main,XSPLAY=xsplay)
-+
- 
- if test "$INCLUDEPTHREAD" = 1; then
- 	LIBS="$LIBS -lpthread"
---- splay-0.9.5.2/apps/common.cc
-+++ splay-0.9.5.2/apps/common.cc
-@@ -34,7 +34,7 @@
- int splay_threadnum=50;
- #endif
- 
--char *splay_Sounderrors[SOUND_ERROR_UNKNOWN]=
-+const char *splay_Sounderrors[SOUND_ERROR_UNKNOWN]=
- { "Failed to open sound device.",
-   "Sound device is busy.",
-   "Buffersize of sound device is wrong.",
---- splay-0.9.5.2/apps/splay.cc
-+++ splay-0.9.5.2/apps/splay.cc
+--- a/apps/splay.cc
++++ b/apps/splay.cc
 @@ -16,20 +16,23 @@
  
  #include <sys/types.h>
@@ -70,8 +59,8 @@
  "\t-2 : playing with half frequency.\n"
  "\t-e : exit when playing is done. (only XSPLAY)\n"
  "\t-f : display frame and time info (played and remaining).\n"
---- splay-0.9.5.2/apps/splay.h
-+++ splay-0.9.5.2/apps/splay.h
+--- a/apps/splay.h
++++ b/apps/splay.h
 @@ -20,7 +20,7 @@
              splay_forcetomonoflag,
              splay_frameinfo;
@@ -81,8 +70,8 @@
  
  #ifdef PTHREADEDMPEG
  extern int  splay_threadnum;
---- splay-0.9.5.2/apps/xsplay.cc
-+++ splay-0.9.5.2/apps/xsplay.cc
+--- a/apps/xsplay.cc
++++ b/apps/xsplay.cc
 @@ -29,8 +29,8 @@
  #include <fcntl.h>
  #include <string.h>
@@ -94,8 +83,24 @@
  
  #include "mpegsound.h"
  #include "xsplay.h"
---- splay-0.9.5.2/libs/fileplayer.cc
-+++ splay-0.9.5.2/libs/fileplayer.cc
+--- a/configure.in
++++ b/configure.in
+@@ -10,12 +10,12 @@
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_RANLIB
++AM_PROG_AR
+ 
+ dnl Checks for libraries.
+ AC_CHECK_LIB(id3, ID3Tag_New)
+ AC_CHECK_LIB(m, cos)
+ AC_CHECK_LIB(pthread,main,INCLUDEPTHREAD=1)
+-AC_CHECK_LIB(qt, main,XSPLAY=xsplay)
+ 
+ if test "$INCLUDEPTHREAD" = 1; then
+ 	LIBS="$LIBS -lpthread"
+--- a/libs/fileplayer.cc
++++ b/libs/fileplayer.cc
 @@ -10,7 +10,7 @@
  #endif
  
@@ -134,8 +139,8 @@
  
    fprintf(stderr,"\tMPEG-%d Layer %d, %s,\n\t%dHz%s, %dkbit/s, ",
  	  server->getversion()+1,
---- splay-0.9.5.2/libs/mpegsound.h
-+++ splay-0.9.5.2/libs/mpegsound.h
+--- a/libs/mpegsound.h
++++ b/libs/mpegsound.h
 @@ -230,7 +230,7 @@
    Soundplayer() {__errorcode=SOUND_ERROR_OK;};
    virtual ~Soundplayer();
@@ -190,8 +195,8 @@
    void setforcetomono(bool flag);
    void setdownfrequency(int value);
    bool playing(int verbose, bool frameinfo, int startframe);
---- splay-0.9.5.2/libs/mpegtoraw.cc
-+++ splay-0.9.5.2/libs/mpegtoraw.cc
+--- a/libs/mpegtoraw.cc
++++ b/libs/mpegtoraw.cc
 @@ -552,7 +552,7 @@
  #endif
  
@@ -201,8 +206,8 @@
  // Convert mpeg to raw
  bool Mpegtoraw::run(int frames)
  {
---- splay-0.9.5.2/libs/rawplayer.cc
-+++ splay-0.9.5.2/libs/rawplayer.cc
+--- a/libs/rawplayer.cc
++++ b/libs/rawplayer.cc
 @@ -24,7 +24,7 @@
  #define IOCTL(a,b,c)		(c = ioctl(a,b,c) )
  #endif
@@ -230,8 +235,8 @@
  
    return true;
  }
---- splay-0.9.5.2/libs/rawtofile.cc
-+++ splay-0.9.5.2/libs/rawtofile.cc
+--- a/libs/rawtofile.cc
++++ b/libs/rawtofile.cc
 @@ -20,7 +20,7 @@
    close(filehandle);
  }
diff --git a/media-sound/splay/splay-0.9.5.2-r2.ebuild b/media-sound/splay/splay-0.9.5.2-r2.ebuild
index 2878aaf04bc3..b66657bceebf 100644
--- a/media-sound/splay/splay-0.9.5.2-r2.ebuild
+++ b/media-sound/splay/splay-0.9.5.2-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 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,20 +12,19 @@ SRC_URI="http://splay.sourceforge.net/tgz/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
 DEPEND="media-libs/id3lib"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-external-id3lib.diff"
-	"${FILESDIR}/${P}-gcc43-2.patch"
-	"${FILESDIR}/${P}-fix-buildsystem.patch"
-	"${FILESDIR}/${P}-fix-c++14.patch"
+	"${FILESDIR}"/${P}-external-id3lib.diff
+	"${FILESDIR}"/${P}-gcc43-2.patch
+	"${FILESDIR}"/${P}-fix-buildsystem.patch
+	"${FILESDIR}"/${P}-fix-c++14.patch
 )
 
 src_prepare() {
-	mv configure.{in,ac} || die
 	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index db0a3d63757b..d167410d0c20 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -3,5 +3,5 @@ DIST spotify-client_1.1.10.546.ge08ef575-19_amd64.deb 114975574 BLAKE2B 46da17c8
 DIST spotify-client_1.1.26.501.gbe11e53b-15_amd64.deb 120102446 BLAKE2B 481686c9e1f7e8d7b68059ec5aad5f71ae1e59af80fa91903941afc2e0a91e2f957860bf96ce3ce4b19884f2548426269a9a2043c2985b4bbc82c5f091f5f2b8 SHA512 af9f1beafe0e4d2313326d1a55675550e8c3fcd5cd2dc0954127094c563048b98f74f669d99a10f0ef6e3b3405856bb9d6a2561644a434ab6bade9c812296963
 EBUILD spotify-1.0.72-r1.ebuild 3217 BLAKE2B 83f0aac50e11c914b2e63f0dbfb6245019cccd1a4a3307bc71e7ca897d890c9119a4a0df1d1bd5fa28156cf86b4eb56f4aeefbfc07d03ddbb4c0626e8c201aee SHA512 329198467357064fc1a556437928f2d59ab0b6262c82c0435638338b8b94adac031f94a9dc4f7cad4b11345ca5f0a5e1caa13168dcdd2d1224883f6a3aa42422
 EBUILD spotify-1.1.10-r1.ebuild 3155 BLAKE2B d3bc28ef679c0307add8cb7b496cedf3a47dededc46c624b9a14b4b2e31fd40fffaafca87f084519db86b33312fa6f30c64bb222acdbac99dcffee8cc537191b SHA512 5f9fb840160b3b5a11af49836f10735aac5d3cacf21f429e554b63d6b3d924401eb3f3d73b1ef0abeef5c2a1d74fe3be24a740f8a2eb2069c8b29b9f50fb07db
-EBUILD spotify-1.1.26.ebuild 3155 BLAKE2B ad28d773c7ceae34dbd8c292ed9bbb56ad82115517e4eb625adc0a5cf4e15081ef97c2b85e5aeb55f1eaeaffef6cff354175b60c26b0fd7470e9038e16e516aa SHA512 6c356e2903ad8feb9d37e741653d7bac0a38c4ef1ae198ce306b1e35492220dd425478b32a78f106041af6cf803e447bfc7f6b2e76ba7ee5aac5ebf295979537
-MISC metadata.xml 459 BLAKE2B e06fc9b572f5d677194d78f04fc172cc13e7cd369bf5933f16e081a6bb05e3312b917d1de15fa6557777ba30f51907c43851d7a3c2bc4fb58de232634a4d4ed9 SHA512 e78bee1d25c70aeea5de11587a4017770b9a7df847f9371f612aead36cce440f070e91b37f802250ddf2aa1ec91fe87540cdbd85f6fd669ec4e1aaf01349c316
+EBUILD spotify-1.1.26-r1.ebuild 3193 BLAKE2B 35f3f47bdaeed4ce6b20b7d856f2b35b3c3930c4347edc807ab72fb9cc3b5a084729ec1223c10155f1cc2801210debd89785ebad819e9bcb265aea247f194520 SHA512 a5ca516fa5cbfcccfa7edd49a860487283e7a3feaf832f2f252291438468f2db3c8c1e855bc0d09d09ab36a995bb88298c3c321ce0ddafa66f23a64de2306553
+MISC metadata.xml 543 BLAKE2B 13703333c28b0f4a9898a30a9f3b8c2a56d360571ef7afed97b794c4fee154f9989c3f53309b71e1ed3135150d6a5aec8303e269117d0689dcca55d2557fd7d1 SHA512 229addc42faddeeb72208081749107adb25eda1cc8201dd629b474e3f733e78e77a4f2cbecd70c3d308e9946bdeb2d5b475a91180d2bde50447d01fdbf3428b6
diff --git a/media-sound/spotify/metadata.xml b/media-sound/spotify/metadata.xml
index 1e06c14d2fd1..ff06ccc103fe 100644
--- a/media-sound/spotify/metadata.xml
+++ b/media-sound/spotify/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
   <use>
     <flag name="pax_kernel">Triggers a paxmarking of the main Spotify binary</flag>
+    <flag name="pulseaudio">Constrols the dependency on pulseaudio or apulse</flag>
     <flag name="systray">Pulls in dependencies needed for systray support on some desktop environments</flag>
   </use>
 <maintainer type="person">
diff --git a/media-sound/spotify/spotify-1.1.26-r1.ebuild b/media-sound/spotify/spotify-1.1.26-r1.ebuild
new file mode 100644
index 000000000000..2310f6ff5afb
--- /dev/null
+++ b/media-sound/spotify/spotify-1.1.26-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop pax-utils unpacker xdg
+
+DESCRIPTION="Spotify is a social music platform"
+HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
+SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
+BUILD_ID_AMD64="501.gbe11e53b-15"
+SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
+LICENSE="Spotify"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libnotify libressl systray pax_kernel pulseaudio"
+RESTRICT="mirror strip"
+
+BDEPEND=">=dev-util/patchelf-0.10"
+RDEPEND="
+	dev-libs/nss
+	dev-python/dbus-python
+	dev-python/pygobject:3
+	libnotify? ( x11-libs/libnotify )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/harfbuzz
+	media-libs/mesa[X(+)]
+	net-misc/curl[ssl]
+	net-print/cups[ssl]
+	pulseaudio? ( media-sound/pulseaudio )
+	!pulseaudio? ( media-sound/apulse )
+	systray? ( gnome-extra/gnome-integration-spotify )
+	x11-libs/gtk+:2
+	app-accessibility/at-spi2-atk
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+"
+	#sys-libs/glibc
+
+S=${WORKDIR}/
+
+QA_PREBUILT="opt/spotify/spotify-client/spotify"
+
+src_prepare() {
+	# Fix desktop entry to launch spotify-dbus.py for systray integration
+	if use systray ; then
+		sed -i \
+			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
+			usr/share/spotify/spotify.desktop || die "sed failed"
+	fi
+	default
+
+	# Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo.
+	patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \
+		|| die "failed to patch libcurl library dependency"
+}
+
+src_install() {
+	gunzip usr/share/doc/spotify-client/changelog.gz || die
+	dodoc usr/share/doc/spotify-client/changelog
+
+	SPOTIFY_PKG_HOME=usr/share/spotify
+	insinto /usr/share/pixmaps
+	doins ${SPOTIFY_PKG_HOME}/icons/*.png
+
+	# install in /opt/spotify
+	SPOTIFY_HOME=/opt/spotify/spotify-client
+	insinto ${SPOTIFY_HOME}
+	doins -r ${SPOTIFY_PKG_HOME}/*
+	fperms +x ${SPOTIFY_HOME}/spotify
+
+	dodir /usr/bin
+	cat <<-EOF >"${D}"/usr/bin/spotify || die
+		#! /bin/sh
+		LD_LIBRARY_PATH="/usr/$(get_libdir)/apulse" \\
+		exec ${SPOTIFY_HOME}/spotify "\$@"
+	EOF
+	fperms +x /usr/bin/spotify
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 512; do
+		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
+			"spotify-client.png"
+	done
+	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
+	if use pax_kernel; then
+		#create the headers, reset them to default, then paxmark -m them
+		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
+		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "${PN} under a PaX enabled kernel.	To do so, we must modify"
+		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
+		eqawarn "you suspect that ${PN} is being broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
+	ewarn "To remove the cache:"
+	ewarn "rm -rf ~/.cache/spotify"
+}
diff --git a/media-sound/spotify/spotify-1.1.26.ebuild b/media-sound/spotify/spotify-1.1.26.ebuild
deleted file mode 100644
index 1d3b666674b0..000000000000
--- a/media-sound/spotify/spotify-1.1.26.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop pax-utils unpacker xdg
-
-DESCRIPTION="Spotify is a social music platform"
-HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
-SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
-BUILD_ID_AMD64="501.gbe11e53b-15"
-SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
-LICENSE="Spotify"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="libnotify libressl systray pax_kernel"
-RESTRICT="mirror strip"
-
-BDEPEND=">=dev-util/patchelf-0.10"
-RDEPEND="
-	dev-libs/nss
-	dev-python/dbus-python
-	dev-python/pygobject:3
-	libnotify? ( x11-libs/libnotify )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/harfbuzz
-	media-libs/mesa[X(+)]
-	net-misc/curl[ssl]
-	net-print/cups[ssl]
-	|| ( media-sound/pulseaudio media-sound/apulse )
-	systray? ( gnome-extra/gnome-integration-spotify )
-	x11-libs/gtk+:2
-	app-accessibility/at-spi2-atk
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-"
-	#sys-libs/glibc
-
-S=${WORKDIR}/
-
-QA_PREBUILT="opt/spotify/spotify-client/spotify"
-
-src_prepare() {
-	# Fix desktop entry to launch spotify-dbus.py for systray integration
-	if use systray ; then
-		sed -i \
-			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
-			usr/share/spotify/spotify.desktop || die "sed failed"
-	fi
-	default
-
-	# Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo.
-	patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \
-		|| die "failed to patch libcurl library dependency"
-}
-
-src_install() {
-	gunzip usr/share/doc/spotify-client/changelog.gz || die
-	dodoc usr/share/doc/spotify-client/changelog
-
-	SPOTIFY_PKG_HOME=usr/share/spotify
-	insinto /usr/share/pixmaps
-	doins ${SPOTIFY_PKG_HOME}/icons/*.png
-
-	# install in /opt/spotify
-	SPOTIFY_HOME=/opt/spotify/spotify-client
-	insinto ${SPOTIFY_HOME}
-	doins -r ${SPOTIFY_PKG_HOME}/*
-	fperms +x ${SPOTIFY_HOME}/spotify
-
-	dodir /usr/bin
-	cat <<-EOF >"${D}"/usr/bin/spotify || die
-		#! /bin/sh
-		LD_LIBRARY_PATH="/usr/$(get_libdir)/apulse" \\
-		exec ${SPOTIFY_HOME}/spotify "\$@"
-	EOF
-	fperms +x /usr/bin/spotify
-
-	local size
-	for size in 16 22 24 32 48 64 128 256 512; do
-		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
-			"spotify-client.png"
-	done
-	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
-	if use pax_kernel; then
-		#create the headers, reset them to default, then paxmark -m them
-		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
-		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
-		eqawarn "${PN} under a PaX enabled kernel.	To do so, we must modify"
-		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
-		eqawarn "you suspect that ${PN} is being broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
-	ewarn "To remove the cache:"
-	ewarn "rm -rf ~/.cache/spotify"
-}
diff --git a/media-sound/streamripper/Manifest b/media-sound/streamripper/Manifest
index 3844fafcdb93..5c4aa412c942 100644
--- a/media-sound/streamripper/Manifest
+++ b/media-sound/streamripper/Manifest
@@ -1,3 +1,4 @@
+AUX streamripper-1.64.6-fix-autotools.patch 260 BLAKE2B b216a7a62c3c1ec53e98b85f47c7e3b07746dbb3483de7de0b1f9face420395abc10f1205624e92eede1247e4c75785b3797a6ec373ada26f876d6a8cb45acbb SHA512 49714d3ea1db143771a2ebcfd3ddd08a60e6eb63fd1e2a0b676b2d0c359b25ebd9dd40510c0137e24ef7c44c718cc83843535fae00325a098f4f1542e18e6f67
 DIST streamripper-1.64.6.tar.gz 900205 BLAKE2B b316565c786b2005802b24cb441d6ee73c2548a4ac7515633fd92faba143a4708bc49c9de7c3eb9985de14a43ac1f86935ac2c353e3d14a7cbf28e334fa21338 SHA512 8477086d0099f6de861f1c47112476c427073b6e8127bbaaa2dd3e7930fe9a5c6d9b2c68d4a317f1bc0b20c625e665d5c245189049d35468aa83cf51828d4428
-EBUILD streamripper-1.64.6.ebuild 737 BLAKE2B 17c865c63ea4871373e6e9d8ef0413d7045633ab35514a43026cb75ff323537ce001e92e097ee0de63fef75036726d45585d1fc3a836ba1c47ed7af2a5b853f2 SHA512 d744a2ebe015cddc6f5065bedc3b429f25676370d429fe26b1fd501db92a932cbabc3fd4f0a22ed87941b0caa3694b2e7b65e1fcb4904bae3938bc6f4f3a8d3c
+EBUILD streamripper-1.64.6.ebuild 863 BLAKE2B 1e05f8a08fdd595d2c8245186e6ab74e7149039101d6d730eecd083405d96f22be920b063debf550c4715ce0d757ecee5d601201b920b3fe5f82cb6f33119367 SHA512 dc83ee9df6e5147f12a9b9a3509973fc8ec4ad6815bf5abbae523e8224d33e87cc3466cb370cd19ca8aabbfe9dc2c2df0f13bebe57f57c8ebe9181497f51f48b
 MISC metadata.xml 345 BLAKE2B caf6bf6724c60fd86ad8983db7d4a38472aae47ba7bcc0d50f2796d81ef2c1b38cda0a1cb048b7af88dcf82bbde900c289cc6c803dc121404a6f0c19cb97cfc1 SHA512 6830a4fe1eedf9577237eb166dd97594bfe9e19a5d95578992ba2f90de46ec62679dde5a60fb9abc5887e5e7374b0742676b63e25db0106ec4f84cdac85629f0
diff --git a/media-sound/streamripper/files/streamripper-1.64.6-fix-autotools.patch b/media-sound/streamripper/files/streamripper-1.64.6-fix-autotools.patch
new file mode 100644
index 000000000000..a0bb6151700a
--- /dev/null
+++ b/media-sound/streamripper/files/streamripper-1.64.6-fix-autotools.patch
@@ -0,0 +1,11 @@
+diff -ur ORIG/configure.ac MOD/configure.ac
+--- ORIG/configure.ac	2020-06-21 13:23:49.051525439 +0200
++++ MOD/configure.ac	2020-06-21 13:24:14.279437637 +0200
+@@ -24,6 +24,7 @@
+ 
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
++AM_PROG_AR
+ 
+ dnl test for inline
+ AC_C_INLINE
diff --git a/media-sound/streamripper/streamripper-1.64.6.ebuild b/media-sound/streamripper/streamripper-1.64.6.ebuild
index 4364a4d2493c..23969844b457 100644
--- a/media-sound/streamripper/streamripper-1.64.6.ebuild
+++ b/media-sound/streamripper/streamripper-1.64.6.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="Extracts and records individual MP3 file tracks from shoutcast streams"
 HOMEPAGE="http://streamripper.sourceforge.net"
@@ -12,14 +14,20 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="vorbis"
 
-RDEPEND="media-libs/libmad
+RDEPEND="
+	media-libs/libmad
 	media-libs/faad2
 	>=dev-libs/glib-2.16
 	vorbis? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-autotools.patch )
 
-DOCS=( CHANGES parse_rules.txt README THANKS )
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
 	econf \
@@ -27,3 +35,8 @@ src_configure() {
 		--without-included-argv \
 		$(use_with vorbis ogg)
 }
+
+src_install() {
+	default
+	dodoc parse_rules.txt
+}
diff --git a/media-sound/supercollider/Manifest b/media-sound/supercollider/Manifest
index c75a63ad07fc..f57612684910 100644
--- a/media-sound/supercollider/Manifest
+++ b/media-sound/supercollider/Manifest
@@ -1,7 +1,7 @@
-AUX supercollider-3.10.2-boost-1.67.patch 1521 BLAKE2B 0e63a18647b85cede59cf8dcda9f9834122f7cc6cd0ebc6722aa94e55ae0f8e1d1cf68ad7a5ac05c0a43d993e10decae034e8d17b09c14caa31314a131b3ff9e SHA512 6e57040b2ab9df0ee9c64d72b95ed5cee2d9f6c76231ff36d72ea8662df1cd49f96cfde68e6ba76b0f15ef2a1d9c78386fd886fcfc337630e47a9d35d036d7b1
-AUX supercollider-3.10.2-boost-1.70.patch 1882 BLAKE2B 48fdf58789d37a296a28f11045d3f224c29a3bdfd39d5377101d2a1bb501f8a648307b0546daadea3d46213d6847098a1128101b1bd990c6ffe203aac6bdd6fc SHA512 0a999fbd53de6c7c2fb81451c6a1f4ce909220a257eefccce1d2246238637d661757795dfc4be7dd69c0553bdf1a02db9311da6033fe7b17230800d06fd291b4
 AUX supercollider-3.10.2-no-ccache.patch 927 BLAKE2B 661610049aab5c077cbff57fa476d08ef7170440135362dafa96b4ab312d778154acdcccd93562822c7d6078d55c6c5eaf59eeadc85e61cc85f1e50a76c908e8 SHA512 5a1f6f074adcb77b9958ff47e855378f9ec180201e32cc417925320ee7fbeedd5b2a163b300286bf0344bb6bb47743598c59c95f28573f4a309696ca5e44af8d
-AUX supercollider-3.10.2-system-boost.patch 15055 BLAKE2B d6b3b2c9f13829ff5b2af037f4204fff519efe67bcb7b705090a2883d97738f0cc8b4a66fe39f88d5fe676081ed44fe3132d23e404c821353d1e9b31d1e0d764 SHA512 d9b2ef108673b11a27c63654ceacf3b7e51df11ce05fc6d9045abd219ea718c2552f5ea026a5182c272639e695a1073192013b14cae257e7e4b00dd3c303ecae
-DIST SuperCollider-3.10.2-Source-linux.tar.bz2 11366481 BLAKE2B d01324ed65f7e8977c138709471e7b9000b1d05ce4c1c0ff83c9ca0ae6e3948b4933320c382b64ecd2aebc65597c963c9348dda09a8c2ec7bc2ea5a14473fe44 SHA512 f7d136cb03e32dfd0b72e36047deaa24d5edfac0f7e9eeaac35f8e991cd52b00db0701478e0daefb24bfbbc55b5cf240e3f3429fd46caa8d76daa21c7aebaf46
-EBUILD supercollider-3.10.2.ebuild 3050 BLAKE2B 7ff85b0ed811d3dff6e264fe37581a18999ffe932ad2ba80b1f54e8cf44790a67505c0a5e8fe3d1a860178ff3f8e626958b431253f4fcecb552d9764049c74fe SHA512 3aba6aab63e0de30b25c0ea2cdb1cd773d4bad6dd05dce71ba1a06ee6c6441da40c1c0ab9aaae891705ad68f169c2b6eb36f35090a4a686c9c70906ea9ed4efb
-MISC metadata.xml 840 BLAKE2B 261014eccb171924a9a70a4972d9ea1cb9ad36f6ac2b7ecb40ebc2eee59d535871957109e239b90500d26073769cf58cd475cf221af0d2caf42033a2e0e56911 SHA512 a8ce15c95e8b04624301b814156ebe84195071b2ec80b223444c733e8b4de8137d4d70397f3a84d2894bdc635fff5d15ba66a9409749c02b3f3acb40d9479895
+AUX supercollider-3.11.0-boost-1.72.patch 1830 BLAKE2B b9a9f358199de97865fc0d8a2e55af2b3312797faa1cde25a2f7d110abf5dc7c14d755f4d2e21e99e1aba28cd0ebe96fa4bb15a190454745181c998ed6033b7f SHA512 cac02e7041dfd233a3624d1772a805bcb58a702195f0e4470f62e68834e494ca51b4719ba328c9de88669ae1b9dae5eb5bcc0bd162df12c6c5ea80829207bfb6
+AUX supercollider-3.11.0-fewer-qt-deps.patch 4412 BLAKE2B 433a51ca1e6b537811392891bec8f4de5aa289473c733c78567d4dddb3c5bc1b2b36c8a8f79222f2a70aa3eb6f0908b20d1cae5e87a9a57c1e56e3725b3787cf SHA512 742b4991c3402acb70ad731d4c535bea9671916360b9e0f17c6611359c1488c23599b613c4a0ff4846a74a55a7af7b5848865998bb4ebae4b0a4944f9caa892c
+AUX supercollider-3.11.0-qt-5.15.patch 2709 BLAKE2B ec9fd1241d6a5c244716434e0b1b44528f7c55a29dc9df09b47099685f5453e708edec6f106af9282ab31034bd1aa8f8e73c359e0228bbd9d63dc85ed41b4ddf SHA512 d26ae878b83f6cd5c7eca29893954bda1dd0adf70252e074f218851d931c97bd7b9aa6fd3ca9234ed7e7f0a52e26a28ad77ba3d5d08a7dee37bed2313d22a9b8
+DIST SuperCollider-3.11.0-Source.tar.bz2 18125654 BLAKE2B f73f2a75a132a4c3a3010ab093929a7aa6a1b534fe70115acd336a22ac8c6482ab6aef93c01f5d738bdd4504c75b1461dc555af9fdab8de8b16bd68a6854336f SHA512 64fef4d751436337baf40ced068a496d3e9221f751dcde7bfc2857a79c094764dff814d1c0cf519380053ddcfdb2c3f2b8eb787d3cff03e522c19fd95951b1da
+EBUILD supercollider-3.11.0.ebuild 3173 BLAKE2B acc717d7b2ed67113d1b088092af7e07382d0f2498d2328add2a3507aa8d71ee10b13d4650b9587f7da13590addd1934f7a23e53142048dcc66d855363f9820c SHA512 53ed68c6a543537de6d6fe5191496ba383f5f62d175652cb35a8e6fe5383efc741d8bf7d5ad4cacf27fedcc98375059a7b8e5e23cdc1fc86e752cf855974065f
+MISC metadata.xml 1118 BLAKE2B f73fdd5fe30a105f5e408c713ec865322da87a1961d91a22d7689b217a3867e98a327f4a1f6db39c527b103a11ef3b624067baf3e380794cd412f58908c519bf SHA512 31731d66bcabc0a2227b89d769159c1b0c936c9a512e082780e71d4531dd9eed9be3e0d05859b92e84d8a8281a129151aa7ead133181c298f121e7fb1a54671f
diff --git a/media-sound/supercollider/files/supercollider-3.10.2-boost-1.67.patch b/media-sound/supercollider/files/supercollider-3.10.2-boost-1.67.patch
deleted file mode 100644
index dd51d0b85d8d..000000000000
--- a/media-sound/supercollider/files/supercollider-3.10.2-boost-1.67.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From de567f9104af2b7b86d0de2f25eeb091a95e8579 Mon Sep 17 00:00:00 2001
-From: Tristan de Cacqueray <tristanC@wombatt.eu>
-Date: Sun, 9 Jun 2019 02:16:49 +0000
-Subject: [PATCH] Fix compilation with boost-1.67
-
-When using a system boost version >1.67, the compilation fails because of:
-server/supernova/./utilities/time_tag.hpp: In member function 'boost::posix_time::ptime nova::time_tag::to_ptime() const':
-supernova/./utilities/time_tag.hpp:232:102: error: no matching function for call to 'boost::date_time::subsecond_duration<boost::posix_time::time_duration, 1000000>::subsecond_duration(double)'
-  232 |         time_duration offset = seconds(get_secs() - ntp_offset) + microseconds(get_nanoseconds()/1000);
----
- server/supernova/utilities/time_tag.hpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/server/supernova/utilities/time_tag.hpp b/server/supernova/utilities/time_tag.hpp
-index 0f49955fd3..c1bb0e73cb 100644
---- a/server/supernova/utilities/time_tag.hpp
-+++ b/server/supernova/utilities/time_tag.hpp
-@@ -179,7 +179,8 @@ class time_tag {
- #ifdef BOOST_DATE_TIME_POSIX_TIME_STD_CONFIG
-         time_duration offset = seconds(get_secs() - ntp_offset) + nanoseconds(get_nanoseconds());
- #else
--        time_duration offset = seconds(get_secs() - ntp_offset) + microseconds(get_nanoseconds()/1000);
-+        time_duration offset =
-+            seconds(get_secs() - ntp_offset) + microseconds(static_cast<long>(get_nanoseconds() / 1000));
- #endif
-         return ptime(base, offset);
-     }
diff --git a/media-sound/supercollider/files/supercollider-3.10.2-boost-1.70.patch b/media-sound/supercollider/files/supercollider-3.10.2-boost-1.70.patch
deleted file mode 100644
index 74fc05ac45cd..000000000000
--- a/media-sound/supercollider/files/supercollider-3.10.2-boost-1.70.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From ea95d667907e1c9d4ee3ad8b33b452d60059e3c8 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 16 Jul 2019 17:30:38 +0200
-Subject: [PATCH] Fix build with boost-1.70 (get_io_service() removed)
-
-Fixes https://github.com/supercollider/supercollider/issues/4490
-
----
- server/supernova/sc/sc_osc_handler.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/server/supernova/sc/sc_osc_handler.cpp b/server/supernova/sc/sc_osc_handler.cpp
-index 5116a1be8..8c2418b09 100644
---- a/server/supernova/sc/sc_osc_handler.cpp
-+++ b/server/supernova/sc/sc_osc_handler.cpp
-@@ -728,7 +728,7 @@ void sc_osc_handler::tcp_connection::handle_message() {
- 
- void sc_osc_handler::start_tcp_accept(void)
- {
--    tcp_connection::pointer new_connection = tcp_connection::create(tcp_acceptor_.get_io_service());
-+    tcp_connection::pointer new_connection = tcp_connection::create((boost::asio::io_context&)tcp_acceptor_.get_executor().context());
- 
-     tcp_acceptor_.async_accept(
-         new_connection->socket(),
--- 
-2.22.0
-
-From 53909b1ff2983442dd8d2fdeff6b4331767237f1 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 16 Jul 2019 17:47:44 +0200
-Subject: [PATCH] Fix build with boost-1.70 (missing checked_delete.hpp
- include)
-
-See also: https://www.boost.org/doc/libs/1_70_0/libs/core/doc/html/core/checked_delete.html
----
- server/supernova/utilities/utils.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/server/supernova/utilities/utils.hpp b/server/supernova/utilities/utils.hpp
-index 35b8ab5ad..a7c191f2d 100644
---- a/server/supernova/utilities/utils.hpp
-+++ b/server/supernova/utilities/utils.hpp
-@@ -23,6 +23,7 @@
- 
- #include <type_traits>
- 
-+#include <boost/checked_delete.hpp>
- #include <boost/intrusive_ptr.hpp>
- #include <boost/noncopyable.hpp>
- #include <boost/detail/atomic_count.hpp>
--- 
-2.22.0
-
diff --git a/media-sound/supercollider/files/supercollider-3.10.2-system-boost.patch b/media-sound/supercollider/files/supercollider-3.10.2-system-boost.patch
deleted file mode 100644
index 93c8c4fc2ab5..000000000000
--- a/media-sound/supercollider/files/supercollider-3.10.2-system-boost.patch
+++ /dev/null
@@ -1,359 +0,0 @@
-diff --git c/CMakeLists.txt w/CMakeLists.txt
-index 063028774..a6b76f49b 100644
---- c/CMakeLists.txt
-+++ w/CMakeLists.txt
-@@ -253,20 +253,43 @@ if (NOT WIN32)
- endif()
- 
- if(SYSTEM_BOOST)
--  set(Boost_USE_MULTITHREADED      ON)
--  find_package( Boost 1.50.0 COMPONENTS  thread system filesystem program_options regex test_exec_monitor )
--endif()
--
--if (Boost_FOUND)
--	link_directories(${Boost_LIBRARY_DIRS})
-+    set(Boost_USE_MULTITHREADED ON)
-+    find_package( Boost 1.50.0 COMPONENTS  thread system filesystem program_options regex test_exec_monitor )
-+    if (Boost_FOUND)
-+        # we're specifically setting up the boost libraries here, so we can
-+        # name them
-+        add_library(boost_thread_lib SHARED IMPORTED)
-+        set_property(TARGET boost_thread_lib PROPERTY IMPORTED_LOCATION
-+          ${Boost_THREAD_LIBRARY})
-+        add_library(boost_system_lib SHARED IMPORTED)
-+        set_property(TARGET boost_system_lib PROPERTY IMPORTED_LOCATION
-+          ${Boost_SYSTEM_LIBRARY})
-+        add_library(boost_filesystem_lib SHARED IMPORTED)
-+        set_property(TARGET boost_filesystem_lib PROPERTY IMPORTED_LOCATION
-+          ${Boost_FILESYSTEM_LIBRARY})
-+        add_library(boost_program_options_lib SHARED IMPORTED)
-+        set_property(TARGET boost_program_options_lib PROPERTY
-+          IMPORTED_LOCATION ${Boost_PROGRAM_OPTIONS_LIBRARY})
-+        add_library(boost_regex_lib SHARED IMPORTED)
-+        set_property(TARGET boost_regex_lib PROPERTY IMPORTED_LOCATION
-+          ${Boost_REGEX_LIBRARY})
-+        add_library(boost_test_exec_monitor_lib SHARED IMPORTED)
-+        set_property(TARGET boost_test_exec_monitor_lib PROPERTY
-+          IMPORTED_LOCATION ${Boost_TEST_EXEC_MONITOR_LIBRARY})
-+        set(boost_include_dirs ${Boost_INCLUDE_DIRS})
-+    else()
-+        set(SYSTEM_BOOST OFF)
-+        set(boost_include_dirs ${CMAKE_SOURCE_DIR}/external_libraries/boost)
-+        message(WARNING "Not using system boost because none was found.")
-+    endif()
- else()
--	message(STATUS "building boost libraries manually")
-+    set(boost_include_dirs ${CMAKE_SOURCE_DIR}/external_libraries/boost)
- endif()
- 
- if(SYSTEM_YAMLCPP)
-   find_package(YamlCpp)
- else()
--  set(YAMLCPP_FOUND OFF)
-+  set(SYSTEM_YAMLCPP OFF)
- endif()
- 
- #############################################
-diff --git c/editors/sc-ide/CMakeLists.txt w/editors/sc-ide/CMakeLists.txt
-index 50059bc2f..8e48194fc 100644
---- c/editors/sc-ide/CMakeLists.txt
-+++ w/editors/sc-ide/CMakeLists.txt
-@@ -219,7 +219,6 @@ endif()
- include_directories(${CMAKE_SOURCE_DIR}/include/common)
- include_directories(${CMAKE_SOURCE_DIR}/common)
- include_directories(${CMAKE_SOURCE_DIR}/include/plugin_interface)
--include_directories(${CMAKE_SOURCE_DIR}/external_libraries/boost)
- include_directories(${YAMLCPP_INCLUDE_DIR})
- # For QtCollider headers:
- include_directories(${CMAKE_SOURCE_DIR})
-@@ -299,12 +298,8 @@ target_link_libraries( SuperCollider
-     oscpack
- )
- 
--if(Boost_FOUND)
--    target_link_libraries( SuperCollider ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} )
--else()
--    # in-house-built boost system
--    target_link_libraries( SuperCollider boost_system boost_filesystem )
--endif()
-+target_link_libraries( SuperCollider boost_system_lib boost_filesystem_lib)
-+include_directories(${boost_include_dirs})
- 
- if(APPLE)
-     target_link_libraries( ${ide_name} "-framework CoreServices -framework Foundation")
-diff --git c/external_libraries/CMakeLists.txt w/external_libraries/CMakeLists.txt
-index df33dc6f1..896ce6206 100644
---- c/external_libraries/CMakeLists.txt
-+++ w/external_libraries/CMakeLists.txt
-@@ -2,7 +2,8 @@ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/nova-simd/vec.hpp)
- 	message(FATAL_ERROR "nova-simd submodule is missing: please run `git submodule init && git submodule update' from the toplevel of your git working tree")
- endif()
- 
--if(NOT Boost_FOUND) # we compile boost ourselves
-+if(NOT SYSTEM_BOOST) # we compile boost ourselves
-+	message(STATUS "Using bundled boost")
- 	# boost thread
- 	aux_source_directory(boost/libs/thread/src/ boost_thread_src )
- 
-@@ -14,66 +15,65 @@ if(NOT Boost_FOUND) # we compile boost ourselves
- 		message(SEND_ERROR "we need to implement boost_thread")
- 	endif()
- 
--	aux_source_directory(boost/libs/system/src/ boost_system )
--	add_library(boost_system STATIC EXCLUDE_FROM_ALL ${boost_system})
--	target_include_directories(boost_system PUBLIC boost)
-+	aux_source_directory(boost/libs/system/src/ boost_system_src )
-+	add_library(boost_system_lib STATIC EXCLUDE_FROM_ALL ${boost_system_src})
-+	target_include_directories(boost_system_lib PUBLIC boost)
- 
--	aux_source_directory(boost/libs/program_options/src/ boost_program_options )
--	add_library(boost_program_options STATIC EXCLUDE_FROM_ALL ${boost_program_options})
--	target_include_directories(boost_program_options PUBLIC boost)
-+	aux_source_directory(boost/libs/program_options/src/ boost_program_options_src )
-+	add_library(boost_program_options_lib STATIC EXCLUDE_FROM_ALL ${boost_program_options_src})
-+	target_include_directories(boost_program_options_lib PUBLIC boost)
- 
- 	aux_source_directory(boost/libs/filesystem/src boost_filesystem_src)
--	add_library(boost_filesystem STATIC EXCLUDE_FROM_ALL ${boost_filesystem_src})
--	target_include_directories(boost_filesystem PUBLIC boost)
-+	add_library(boost_filesystem_lib STATIC EXCLUDE_FROM_ALL ${boost_filesystem_src})
-+	target_include_directories(boost_filesystem_lib PUBLIC boost)
- 
- 	aux_source_directory(boost/libs/regex/src boost_regex_src)
--	add_library(boost_regex STATIC EXCLUDE_FROM_ALL ${boost_regex_src})
--	target_include_directories(boost_regex PUBLIC boost)
-+	add_library(boost_regex_lib STATIC EXCLUDE_FROM_ALL ${boost_regex_src})
-+	target_include_directories(boost_regex_lib PUBLIC boost)
- 
- 	if(LTO)
--		set_property(TARGET boost_program_options boost_system boost_filesystem
-+		set_property(TARGET boost_program_options_lib boost_system_lib boost_filesystem_lib
- 					 APPEND PROPERTY COMPILE_FLAGS "-flto -flto-report")
- 
--		set_property(TARGET boost_program_options boost_system boost_filesystem
-+		set_property(TARGET boost_program_options_lib boost_system_lib boost_filesystem_lib
- 					 APPEND PROPERTY LINK_FLAGS "-flto -flto-report")
- 	endif()
- 
--	add_library(boost_thread STATIC EXCLUDE_FROM_ALL ${boost_thread_src} ${boost_thread_platform})
--	target_link_libraries(boost_thread boost_system)
-+	add_library(boost_thread_lib STATIC EXCLUDE_FROM_ALL ${boost_thread_src} ${boost_thread_platform})
-+	target_link_libraries(boost_thread_lib boost_system_lib)
- #	target_compile_definitions(boost_thread PUBLIC BOOST_THREAD_DONT_PROVIDE_INTERRUPTIONS)
--	target_include_directories(boost_thread PUBLIC boost)
--	target_compile_definitions(boost_thread PUBLIC BOOST_THREAD_USE_LIB) # for win32
-+	target_include_directories(boost_thread_lib PUBLIC boost)
-+	target_compile_definitions(boost_thread_lib PUBLIC BOOST_THREAD_USE_LIB) # for win32
- 
- 	if(PTHREADS_FOUND)
--		target_include_directories(boost_thread PUBLIC ${PTHREADS_INCLUDE_DIR})
-+		target_include_directories(boost_thread_lib PUBLIC ${PTHREADS_INCLUDE_DIR})
- 	endif()
- 	if(WIN32)
--		target_compile_definitions( boost_thread PRIVATE BOOST_THREAD_BUILD_LIB)
-+		target_compile_definitions( boost_thread_lib PRIVATE BOOST_THREAD_BUILD_LIB)
- 	endif()
- 
- 
- 	if(CMAKE_SYSTEM_NAME MATCHES "Linux")
--		target_compile_options(boost_thread PRIVATE -fPIC)
--		target_link_libraries(boost_thread rt)
-+		target_compile_options(boost_thread_lib PRIVATE -fPIC)
-+		target_link_libraries(boost_thread_lib rt)
- 	endif()
- 
- 	if(LTO)
--		set_property(TARGET boost_thread
-+    set_property(TARGET boost_thread_lib
- 			APPEND PROPERTY COMPILE_FLAGS "-flto -flto-report")
- 
--		set_property(TARGET boost_thread
-+		set_property(TARGET boost_thread_lib
- 			APPEND PROPERTY LINK_FLAGS "-flto -flto-report")
- 	endif()
- 
- 	set_property( TARGET
--        boost_regex
--        boost_thread
--        boost_program_options
--        boost_system
--        boost_filesystem
-+        boost_regex_lib
-+        boost_thread_lib
-+        boost_program_options_lib
-+        boost_system_lib
-+        boost_filesystem_lib
-         PROPERTY FOLDER 3rdparty
-     )
--
- endif()
- 
- # tlsf
-@@ -84,10 +84,9 @@ set_property(TARGET tlsf PROPERTY POSITION_INDEPENDENT_CODE TRUE)
- 
- #oscpack
- add_library(oscpack STATIC EXCLUDE_FROM_ALL "oscpack_build.cpp")
--target_include_directories(oscpack PRIVATE boost)
-+target_include_directories(oscpack PRIVATE ${boost_include_dirs})
- target_include_directories(oscpack INTERFACE oscpack_1_1_0 )
- 
--
- if(LTO)
- 	set_property(TARGET oscpack tlsf
- 				 APPEND PROPERTY COMPILE_FLAGS "-flto -flto-report")
-@@ -96,15 +95,15 @@ if(LTO)
- 				 APPEND PROPERTY LINK_FLAGS "-flto -flto-report")
- endif()
- 
--if(NOT YAMLCPP_FOUND)
--  message(STATUS "using bundled libyaml-cpp")
-+if(NOT SYSTEM_YAMLCPP)
-+  message(STATUS "Using bundled yaml-cpp")
- 
-   # yaml-cpp
-   aux_source_directory(${CMAKE_SOURCE_DIR}/external_libraries/yaml-cpp/src yaml_src)
-   CREATE_FINAL_FILE(${CMAKE_CURRENT_BINARY_DIR}/libyamlcpp.cpp ${yaml_src})
- 
-   add_library(yaml STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/libyamlcpp.cpp)
--  target_include_directories(yaml PUBLIC ${CMAKE_SOURCE_DIR}/external_libraries/yaml-cpp/include boost)
-+  target_include_directories(yaml PUBLIC ${CMAKE_SOURCE_DIR}/external_libraries/yaml-cpp/include ${boost_include_dirs})
-   set_property( TARGET yaml PROPERTY FOLDER 3rdparty )
-   set(YAMLCPP_LIBRARY yaml)
-   set(YAMLCPP_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/external_libraries/yaml-cpp/include)
-diff --git c/lang/CMakeLists.txt w/lang/CMakeLists.txt
-index c68b32fdc..593d91845 100644
---- c/lang/CMakeLists.txt
-+++ w/lang/CMakeLists.txt
-@@ -202,14 +202,8 @@ if(SC_HIDAPI)
-   endif()
- endif()
- 
--if (Boost_FOUND)
--	target_include_directories(libsclang PUBLIC ${Boost_INCLUDE_DIRS})
--	target_link_libraries(libsclang ${Boost_THREAD_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_REGEX_LIBRARY} ${Boost_FILESYSTEM_LIBRARY})
--else()
--	target_include_directories(libsclang PUBLIC ${CMAKE_SOURCE_DIR}/external_libraries/boost)
--	target_link_libraries(libsclang boost_regex boost_thread boost_system boost_filesystem)
--endif()
--
-+target_link_libraries(libsclang boost_thread_lib boost_system_lib boost_regex_lib boost_filesystem_lib)
-+target_include_directories(libsclang PUBLIC ${boost_include_dirs})
- 
- if (SCLANG_SERVER)
- 	target_link_libraries(libsclang libscsynth)
-diff --git c/server/CMakeLists.txt w/server/CMakeLists.txt
-index 2622b4e36..bf8dc863d 100644
---- c/server/CMakeLists.txt
-+++ w/server/CMakeLists.txt
-@@ -12,11 +12,7 @@ include_directories(${CMAKE_SOURCE_DIR}/external_libraries
- 					${CMAKE_SOURCE_DIR}/external_libraries/nova-tt
- 					)
- 
--if (Boost_FOUND)
--	include_directories(${Boost_INCLUDE_DIRS})
--else()
--	include_directories(${CMAKE_SOURCE_DIR}/external_libraries/boost)
--endif()
-+include_directories(${boost_include_dirs})
- 
- # here we choose who provides us with the FFT lib
- if (APPLE)
-diff --git c/server/plugins/CMakeLists.txt w/server/plugins/CMakeLists.txt
-index 8287f7be9..9a4db7be5 100644
---- c/server/plugins/CMakeLists.txt
-+++ w/server/plugins/CMakeLists.txt
-@@ -199,7 +199,7 @@ if (SUPERNOVA)
- 
- 		if(SNDFILE_FOUND)
- 			target_include_directories(DiskIO_UGens_supernova PUBLIC ${SNDFILE_INCLUDE_DIR})
--			target_link_libraries(DiskIO_UGens_supernova ${SNDFILE_LIBRARIES} ${PTHREADS_LIBRARY} ${MATH_LIBRARY} ${Boost_THREAD_LIBRARY})
-+      target_link_libraries(DiskIO_UGens_supernova ${SNDFILE_LIBRARIES} ${PTHREADS_LIBRARY} ${MATH_LIBRARY} boost_thread_lib)
- 			list(APPEND supernova_plugins DiskIO_UGens_supernova)
- 		else()
- 			message(SEND_ERROR "Cannot find libsndfile")
-@@ -217,7 +217,7 @@ endforeach()
- 
- if(NOT NO_X11)
- 	foreach(ugen ${uiugens})
--		target_link_libraries(${ugen} ${Boost_THREAD_LIBRARY})
-+    target_link_libraries(${ugen} boost_thread_lib)
- 	endforeach()
- endif()
- 
-diff --git c/server/scsynth/CMakeLists.txt w/server/scsynth/CMakeLists.txt
-index 17c09f262..3a7145841 100644
---- c/server/scsynth/CMakeLists.txt
-+++ w/server/scsynth/CMakeLists.txt
-@@ -176,11 +176,8 @@ elseif(AUDIOAPI STREQUAL coreaudio)
- 	target_link_libraries(libscsynth "-framework CoreAudio")
- endif()
- 
--if (Boost_FOUND)
--	target_link_libraries(libscsynth ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} )
--else()
--	target_link_libraries(libscsynth boost_system boost_filesystem)
--endif()
-+target_link_libraries(libscsynth boost_system_lib boost_filesystem_lib)
-+target_include_directories(libscsynth PUBLIC ${boost_include_dirs})
- 
- if (WIN32)
- 	target_link_libraries(libscsynth wsock32 ws2_32 winmm)
-diff --git c/server/supernova/CMakeLists.txt w/server/supernova/CMakeLists.txt
-index cfe128880..2b80cb545 100644
---- c/server/supernova/CMakeLists.txt
-+++ w/server/supernova/CMakeLists.txt
-@@ -70,7 +70,7 @@ if(NOT WIN32)
-                PROPERTY OUTPUT_NAME supernova)
- endif()
- 
--target_link_libraries(libsupernova oscpack tlsf ${PTHREADS_LIBRARIES} boost_thread)
-+target_link_libraries(libsupernova oscpack tlsf ${PTHREADS_LIBRARIES} boost_thread_lib)
- 
- target_compile_definitions(libsupernova PUBLIC SUPERNOVA)
- target_include_directories(libsupernova PUBLIC
-@@ -146,14 +146,8 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-     target_link_libraries(libsupernova rt)
- endif()
- 
--
--if(Boost_FOUND)
--    target_link_libraries(libsupernova ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY})
--    target_include_directories(libsupernova PUBLIC ${Boost_INCLUDE_DIRS})
--else()
--    target_include_directories(libsupernova PUBLIC ${CMAKE_SOURCE_DIR}/external_libraries/boost)
--    target_link_libraries(libsupernova boost_system boost_filesystem boost_program_options)
--endif()
-+target_link_libraries(libsupernova boost_system_lib boost_filesystem_lib boost_program_options_lib)
-+target_include_directories(libsupernova PUBLIC ${boost_include_dirs})
- 
- if(CMAKE_COMPILER_IS_GNUCXX)
-     if( ${_gcc_version} VERSION_GREATER 5 )
-diff --git c/testsuite/server/CMakeLists.txt w/testsuite/server/CMakeLists.txt
-index 38ce4b486..da19c2e5d 100644
---- c/testsuite/server/CMakeLists.txt
-+++ w/testsuite/server/CMakeLists.txt
-@@ -1,8 +1,8 @@
-+add_library(boost_test STATIC boost_test.cpp)
-+target_include_directories(boost_test PUBLIC ${boost_include_dirs})
-+
- add_subdirectory(scsynth)
--
- if (SUPERNOVA)
-   add_subdirectory(supernova)
- endif()
- 
--add_library(boost_test STATIC boost_test.cpp)
--target_include_directories(boost_test PUBLIC ${CMAKE_SOURCE_DIR}/external_libraries/boost)
-diff --git c/testsuite/server/supernova/CMakeLists.txt w/testsuite/server/supernova/CMakeLists.txt
-index e8a9ccf5f..4022da847 100644
---- c/testsuite/server/supernova/CMakeLists.txt
-+++ w/testsuite/server/supernova/CMakeLists.txt
-@@ -34,7 +34,7 @@ foreach(test ${simple_tests})
-   string(REPLACE .cpp "" test_name ${test} )
-   add_executable(${test_name} ${test})
- 
--  target_link_libraries(${test_name} libsupernova boost_test boost_thread)
-+  target_link_libraries(${test_name} libsupernova boost_test boost_thread_lib)
- 
-   add_test(${test_name}_run ${EXECUTABLE_OUTPUT_PATH}/${test_name})
- endforeach(test)
diff --git a/media-sound/supercollider/files/supercollider-3.11.0-boost-1.72.patch b/media-sound/supercollider/files/supercollider-3.11.0-boost-1.72.patch
new file mode 100644
index 000000000000..94329b867915
--- /dev/null
+++ b/media-sound/supercollider/files/supercollider-3.11.0-boost-1.72.patch
@@ -0,0 +1,45 @@
+From 43b2b27c14186a9a3eff917d7598751ed298ae20 Mon Sep 17 00:00:00 2001
+From: Hector Martin <marcan@marcan.st>
+Date: Sun, 31 May 2020 21:25:12 +0900
+Subject: [PATCH 2/2] Fix build with Boost 1.72.0
+
+---
+ .../include/boost/sync/detail/throw_exception.hpp           | 4 ----
+ external_libraries/oscpack_build.cpp                        | 6 +++---
+ 2 files changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/external_libraries/boost_sync/include/boost/sync/detail/throw_exception.hpp b/external_libraries/boost_sync/include/boost/sync/detail/throw_exception.hpp
+index b5fdfabf8..a7d7fa7b3 100755
+--- a/external_libraries/boost_sync/include/boost/sync/detail/throw_exception.hpp
++++ b/external_libraries/boost_sync/include/boost/sync/detail/throw_exception.hpp
+@@ -164,11 +164,7 @@ BOOST_NOINLINE BOOST_NORETURN void throw_exception(const char* func, const char*
+ 
+ #endif // !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+ 
+-#if !defined(BOOST_EXCEPTION_DISABLE)
+-#define BOOST_SYNC_DETAIL_HERE BOOST_THROW_EXCEPTION_CURRENT_FUNCTION, __FILE__, __LINE__
+-#else
+ #define BOOST_SYNC_DETAIL_HERE BOOST_CURRENT_FUNCTION, __FILE__, __LINE__
+-#endif
+ 
+ #define BOOST_SYNC_DETAIL_THROW_DEFAULT(ex)\
+     boost::sync::detail::throw_exception< ex >(BOOST_SYNC_DETAIL_HERE)
+diff --git a/external_libraries/oscpack_build.cpp b/external_libraries/oscpack_build.cpp
+index 3a658f3d3..1f6283d1c 100644
+--- a/external_libraries/oscpack_build.cpp
++++ b/external_libraries/oscpack_build.cpp
+@@ -1,8 +1,8 @@
+-#include <boost/detail/endian.hpp>
++#include <boost/predef.h>
+ 
+-#ifdef BOOST_LITTLE_ENDIAN
++#if BOOST_ENDIAN_LITTLE_BYTE
+ #define OSC_HOST_LITTLE_ENDIAN
+-#elif defined(BOOST_BIG_ENDIAN)
++#elif BOOST_ENDIAN_BIG_BYTE
+ #define OSC_HOST_BIG_ENDIAN
+ #else
+ #error please define endianness
+-- 
+2.26.2
+
diff --git a/media-sound/supercollider/files/supercollider-3.11.0-fewer-qt-deps.patch b/media-sound/supercollider/files/supercollider-3.11.0-fewer-qt-deps.patch
new file mode 100644
index 000000000000..8b1014d99919
--- /dev/null
+++ b/media-sound/supercollider/files/supercollider-3.11.0-fewer-qt-deps.patch
@@ -0,0 +1,126 @@
+From 5b655fbbf44ff5e67709667242a5feff707e1a51 Mon Sep 17 00:00:00 2001
+From: Hector Martin <marcan@marcan.st>
+Date: Mon, 1 Jun 2020 18:43:08 +0900
+Subject: [PATCH] Remove spurious Qt dependencies
+
+---
+ QtCollider/CMakeLists.txt     | 10 +++-------
+ QtCollider/widgets/QcCanvas.h |  2 --
+ README_LINUX.md               |  6 +++---
+ README_RASPBERRY_PI.md        |  2 +-
+ editors/sc-ide/CMakeLists.txt | 13 +++----------
+ 5 files changed, 10 insertions(+), 23 deletions(-)
+
+diff --git a/QtCollider/CMakeLists.txt b/QtCollider/CMakeLists.txt
+index de38afb908..6b9437b9c0 100644
+--- a/QtCollider/CMakeLists.txt
++++ b/QtCollider/CMakeLists.txt
+@@ -7,19 +7,15 @@ option(SC_USE_QTWEBENGINE "Build with Qt WebEngine." ON)
+ set(
+   QT_COMPONENTS
+   Core
+-  Widgets
++  Gui
+   Network
+   PrintSupport
+-  OpenGL
+-  Quick
+-  Qml
+-  Sql
+   Svg
++  Widgets
+ )
+ 
+ set (QT_COLLIDER_LIBS
+-  Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::PrintSupport
+-  Qt5::Quick Qt5::Qml Qt5::Sql Qt5::OpenGL Qt5::Svg
++  Qt5::Core Qt5::Gui Qt5::Network Qt5::PrintSupport Qt5::Svg Qt5::Widgets
+   ${MATH_LIBRARY})
+ 
+ if(SC_USE_QTWEBENGINE)
+diff --git a/QtCollider/widgets/QcCanvas.h b/QtCollider/widgets/QcCanvas.h
+index 3acb00fc23..ff230b8139 100644
+--- a/QtCollider/widgets/QcCanvas.h
++++ b/QtCollider/widgets/QcCanvas.h
+@@ -28,9 +28,7 @@
+ #include <QBasicTimer>
+ #include <QTime>
+ #include <QPalette>
+-#include <QGLWidget>
+ 
+-// using QcCanvasBase = QGLWidget;
+ using QcCanvasBase = QWidget;
+ 
+ class QcCanvas : public QcCanvasBase {
+diff --git a/README_LINUX.md b/README_LINUX.md
+index d5818e9106..532ad9cc5a 100644
+--- a/README_LINUX.md
++++ b/README_LINUX.md
+@@ -75,7 +75,7 @@ Depending on your Debian flavor and version, your distribution's PPA may be stuc
+ 
+ If this displays version 5.7 or later, installing Qt is easy:
+ 
+-    sudo apt-get install qt5-default qt5-qmake qttools5-dev qttools5-dev-tools qtdeclarative5-dev qtwebengine5-dev libqt5svg5-dev libqt5websockets5-dev
++    sudo apt-get install qt5-default qt5-qmake qttools5-dev qttools5-dev-tools qtwebengine5-dev libqt5svg5-dev libqt5websockets5-dev
+ 
+ If you are on Ubuntu 14.04 (Trusty) or 16.04 (Xenial), check the next section. Otherwise, you will have to use the official Qt installer. Sorry.
+ 
+@@ -87,13 +87,13 @@ On Xenial:
+ 
+     sudo apt-add-repository ppa:beineri/opt-qt-5.11.0-xenial
+     sudo apt-get update
+-    sudo apt-get install qt511base qt511location qt511declarative qt511tools qt511webchannel qt511xmlpatterns qt511svg qt511webengine qt511websockets
++    sudo apt-get install qt511base qt511location qt511tools qt511webchannel qt511xmlpatterns qt511svg qt511webengine qt511websockets
+ 
+ On Trusty, only Qt 5.10 and below are available:
+ 
+     sudo apt-add-repository ppa:beineri/opt-qt-5.10.1-trusty
+     sudo apt-get update
+-    sudo apt-get install qt510base qt510location qt510declarative qt510tools qt510webchannel qt510xmlpatterns qt510svg qt510webengine qt510websockets
++    sudo apt-get install qt510base qt510location qt510tools qt510webchannel qt510xmlpatterns qt510svg qt510webengine qt510websockets
+ 
+ [Stephan Binner's Launchpad PPAs]: https://launchpad.net/~beineri
+ 
+diff --git a/README_RASPBERRY_PI.md b/README_RASPBERRY_PI.md
+index 974ea1822c..aae8250388 100644
+--- a/README_RASPBERRY_PI.md
++++ b/README_RASPBERRY_PI.md
+@@ -42,7 +42,7 @@ Install required libraries:
+     # For GUI builds:
+     sudo apt-get install libjack-jackd2-dev libsndfile1-dev libasound2-dev libavahi-client-dev \
+         libreadline-dev libfftw3-dev libxt-dev libudev-dev cmake qttools5-dev qttools5-dev-tools \
+-        qtdeclarative5-dev libqt5svg5-dev qjackctl
++        qtbase5-dev libqt5svg5-dev qjackctl
+     # For GUI-less builds:
+     sudo apt-get install libsamplerate0-dev libsndfile1-dev libasound2-dev libavahi-client-dev \
+         libreadline-dev libfftw3-dev libudev-dev cmake git
+diff --git a/editors/sc-ide/CMakeLists.txt b/editors/sc-ide/CMakeLists.txt
+index 1ee9ae4f43..6248668594 100644
+--- a/editors/sc-ide/CMakeLists.txt
++++ b/editors/sc-ide/CMakeLists.txt
+@@ -6,22 +6,15 @@ set(QT_IDE_COMPONENTS
+     Concurrent
+     Core
+     LinguistTools
+-    # OpenGL
+-    PrintSupport
+-    Qml
+-    Quick
+-    Sql
++    Network
+     Widgets
+ )
+ 
+ set(QT_IDE_LIBRARIES
+     Qt5::Concurrent
+     Qt5::Core
+-    # Qt5::OpenGL
+-    Qt5::PrintSupport
+-    Qt5::Qml
+-    Qt5::Quick
+-    Qt5::Sql
++    Qt5::Network
++    Qt5::Widgets
+ )
+ 
+ if(SC_USE_QTWEBENGINE)
diff --git a/media-sound/supercollider/files/supercollider-3.11.0-qt-5.15.patch b/media-sound/supercollider/files/supercollider-3.11.0-qt-5.15.patch
new file mode 100644
index 000000000000..37f803312c28
--- /dev/null
+++ b/media-sound/supercollider/files/supercollider-3.11.0-qt-5.15.patch
@@ -0,0 +1,89 @@
+From 244e55632cef86ecd363eb8df3f2352569f804f4 Mon Sep 17 00:00:00 2001
+From: Hector Martin <marcan@marcan.st>
+Date: Sun, 31 May 2020 21:24:52 +0900
+Subject: [PATCH 1/2] Fix build with Qt 5.15
+
+---
+ QtCollider/primitives/prim_QPen.cpp       | 1 +
+ QtCollider/widgets/QcGraph.cpp            | 1 +
+ QtCollider/widgets/QcLevelIndicator.cpp   | 1 +
+ QtCollider/widgets/QcMultiSlider.cpp      | 1 +
+ QtCollider/widgets/QcScopeShm.cpp         | 1 +
+ QtCollider/widgets/soundfileview/view.cpp | 1 +
+ 6 files changed, 6 insertions(+)
+
+diff --git a/QtCollider/primitives/prim_QPen.cpp b/QtCollider/primitives/prim_QPen.cpp
+index 8d531214d..4ba24519d 100644
+--- a/QtCollider/primitives/prim_QPen.cpp
++++ b/QtCollider/primitives/prim_QPen.cpp
+@@ -27,6 +27,7 @@
+ #include "PyrKernel.h"
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QVector2D>
+ #include <QVector3D>
+ #include <cmath>
+diff --git a/QtCollider/widgets/QcGraph.cpp b/QtCollider/widgets/QcGraph.cpp
+index 70215ae94..79e71d1ad 100644
+--- a/QtCollider/widgets/QcGraph.cpp
++++ b/QtCollider/widgets/QcGraph.cpp
+@@ -24,6 +24,7 @@
+ #include "../style/routines.hpp"
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QMouseEvent>
+ #include <QApplication>
+ #include <QtCore/qmath.h>
+diff --git a/QtCollider/widgets/QcLevelIndicator.cpp b/QtCollider/widgets/QcLevelIndicator.cpp
+index 19c7d4874..8a60f354a 100644
+--- a/QtCollider/widgets/QcLevelIndicator.cpp
++++ b/QtCollider/widgets/QcLevelIndicator.cpp
+@@ -23,6 +23,7 @@
+ #include "../QcWidgetFactory.h"
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ QC_DECLARE_QWIDGET_FACTORY(QcLevelIndicator);
+ 
+diff --git a/QtCollider/widgets/QcMultiSlider.cpp b/QtCollider/widgets/QcMultiSlider.cpp
+index 046b18739..381ddd404 100644
+--- a/QtCollider/widgets/QcMultiSlider.cpp
++++ b/QtCollider/widgets/QcMultiSlider.cpp
+@@ -26,6 +26,7 @@
+ #include <QApplication>
+ #include <QMouseEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ #include <cmath>
+ 
+diff --git a/QtCollider/widgets/QcScopeShm.cpp b/QtCollider/widgets/QcScopeShm.cpp
+index bb44623f4..edd38ef57 100644
+--- a/QtCollider/widgets/QcScopeShm.cpp
++++ b/QtCollider/widgets/QcScopeShm.cpp
+@@ -25,6 +25,7 @@
+ #include "../debug.h"
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QTimer>
+ #include <QResizeEvent>
+ #include <QWindow>
+diff --git a/QtCollider/widgets/soundfileview/view.cpp b/QtCollider/widgets/soundfileview/view.cpp
+index a3eca811f..baba0b245 100644
+--- a/QtCollider/widgets/soundfileview/view.cpp
++++ b/QtCollider/widgets/soundfileview/view.cpp
+@@ -24,6 +24,7 @@
+ 
+ #include <QGridLayout>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QApplication>
+ #include <QPaintEvent>
+ #include <QCursor>
+-- 
+2.26.2
+
diff --git a/media-sound/supercollider/metadata.xml b/media-sound/supercollider/metadata.xml
index 8cd1323c9a04..4fbc15376707 100644
--- a/media-sound/supercollider/metadata.xml
+++ b/media-sound/supercollider/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>marcan@marcan.st</email>
+		<name>Hector Martin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		SuperCollider is a platform for audio synthesis and algorithmic
 		composition, used by musicians, artists, and researchers
@@ -17,5 +24,6 @@
 		<flag name="gedit">Enable the SCED user interface</flag>
 		<flag name="gpl3">Build GPL-3 licensed code (recommended)</flag>
 		<flag name="server">Build with internal server</flag>
+		<flag name="webengine">Enable the internal help system using QtWebengine</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/supercollider/supercollider-3.10.2.ebuild b/media-sound/supercollider/supercollider-3.10.2.ebuild
deleted file mode 100644
index 94a5cc549598..000000000000
--- a/media-sound/supercollider/supercollider-3.10.2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="An environment and a programming language for real time audio synthesis."
-HOMEPAGE="https://supercollider.github.io/"
-SRC_URI="https://github.com/supercollider/supercollider/releases/download/Version-${PV}/SuperCollider-${PV}-Source-linux.tar.bz2"
-
-LICENSE="GPL-2 gpl3? ( GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt5 server +sndfile static-libs vim X zeroconf"
-
-REQUIRED_USE="qt5? ( X )"
-
-BDEPEND="
-	virtual/pkgconfig
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
-	dev-cpp/yaml-cpp:=
-	>=dev-libs/boost-1.70.0:=
-	media-libs/alsa-lib
-	sys-libs/readline:0=
-	virtual/libudev:=
-	fftw? ( sci-libs/fftw:3.0= )
-	jack? ( virtual/jack )
-	!jack? ( media-libs/portaudio )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtopengl:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtsql:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwebchannel:5
-		dev-qt/qtwebengine:5[widgets]
-		dev-qt/qtwebsockets:5
-		dev-qt/qtwidgets:5
-	)
-	server? ( !app-admin/supernova )
-	sndfile? ( media-libs/libsndfile )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-	zeroconf? ( net-dns/avahi )
-"
-DEPEND="${RDEPEND}
-	dev-libs/icu
-	emacs? ( >=app-editors/emacs-23.1:* )
-	gedit? ( app-editors/gedit )
-	qt5? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtdeclarative:5
-	)
-	vim? ( app-editors/vim )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-ccache.patch
-	"${FILESDIR}"/${P}-system-boost.patch
-	"${FILESDIR}"/${P}-boost-1.67.patch
-	"${FILESDIR}"/${P}-boost-1.70.patch
-)
-
-S="${WORKDIR}/SuperCollider-Source"
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_HELP=ON
-		-DSYSTEM_BOOST=ON
-		-DSYSTEM_YAMLCPP=ON
-		-DSSE=$(usex cpu_flags_x86_sse)
-		-DSSE2=$(usex cpu_flags_x86_sse2)
-		-DSC_EL=$(usex emacs)
-		-DFFT_GREEN=$(usex !fftw)
-		-DSC_ED=$(usex gedit)
-		-DNO_GPL3=$(usex !gpl3)
-		-DAUDIOAPI=$(usex jack jack portaudio)
-		-DSC_IDE=$(usex qt5)
-		-DSC_QT=$(usex qt5)
-		-DSCLANG_SERVER=$(usex server)
-		-DSUPERNOVA=$(usex server)
-		-DNO_LIBSNDFILE=$(usex !sndfile)
-		-DLIBSCSYNTH=$(usex !static-libs)
-		-DSC_VIM=$(usex vim)
-		-DNO_X11=$(usex !X)
-		-DNO_AVAHI=$(usex !zeroconf)
-	)
-
-	use debug && mycmakeargs+=(
-		-DSC_MEMORY_DEBUGGING=ON
-		-DSN_MEMORY_DEBUGGING=ON
-		-DGC_SANITYCHECK=ON
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	use emacs && newdoc editors/scel/README.md README.emacs
-	use gedit && newdoc editors/sced/README.md README.gedit
-	use vim && newdoc editors/scvim/README.md README.vim
-}
-
-pkg_postinst() {
-	einfo "Notice: SuperCollider is not very intuitive to get up and running."
-	einfo "The best course of action to make sure that the installation was"
-	einfo "successful and get you started with using SuperCollider is to take"
-	einfo "a look through ${EROOT}/usr/share/doc/${PF}/README.md.bz2"
-
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/supercollider/supercollider-3.11.0.ebuild b/media-sound/supercollider/supercollider-3.11.0.ebuild
new file mode 100644
index 000000000000..3b3865ba3a00
--- /dev/null
+++ b/media-sound/supercollider/supercollider-3.11.0.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake readme.gentoo-r1 xdg-utils
+
+DESCRIPTION="An environment and a programming language for real time audio synthesis."
+HOMEPAGE="https://supercollider.github.io/"
+SRC_URI="https://github.com/supercollider/supercollider/releases/download/Version-${PV}/SuperCollider-${PV}-Source.tar.bz2"
+
+LICENSE="GPL-2 gpl3? ( GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt5 server +sndfile static-libs vim webengine X zeroconf"
+
+REQUIRED_USE="
+	qt5? ( X )
+	webengine? ( qt5 )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="
+	dev-cpp/yaml-cpp:=
+	>=dev-libs/boost-1.70.0:=
+	media-libs/alsa-lib
+	sys-libs/readline:0=
+	virtual/libudev:=
+	fftw? ( sci-libs/fftw:3.0= )
+	jack? ( virtual/jack )
+	!jack? ( media-libs/portaudio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+	)
+	server? ( !app-admin/supernova )
+	sndfile? ( media-libs/libsndfile )
+	webengine? (
+		dev-qt/qtwebchannel:5
+		dev-qt/qtwebengine:5[widgets]
+		dev-qt/qtwebsockets:5
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+	zeroconf? ( net-dns/avahi )
+"
+DEPEND="${RDEPEND}
+	dev-libs/icu
+	emacs? ( >=app-editors/emacs-23.1:* )
+	gedit? ( app-editors/gedit )
+	qt5? (
+		dev-qt/qtconcurrent:5
+	)
+	vim? ( app-editors/vim )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.10.2-no-ccache.patch
+	"${FILESDIR}"/${P}-boost-1.72.patch # Upstream PR 4990
+	"${FILESDIR}"/${P}-qt-5.15.patch # Upstream PR 4986
+	"${FILESDIR}"/${P}-fewer-qt-deps.patch # Upstream PR 4991
+)
+
+S="${WORKDIR}/SuperCollider-${PV}-Source"
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_HELP=ON
+		-DSYSTEM_BOOST=ON
+		-DSYSTEM_YAMLCPP=ON
+		-DSSE=$(usex cpu_flags_x86_sse)
+		-DSSE2=$(usex cpu_flags_x86_sse2)
+		-DSC_EL=$(usex emacs)
+		-DFFT_GREEN=$(usex !fftw)
+		-DSC_ED=$(usex gedit)
+		-DNO_GPL3=$(usex !gpl3)
+		-DAUDIOAPI=$(usex jack jack portaudio)
+		-DSC_IDE=$(usex qt5)
+		-DSC_QT=$(usex qt5)
+		-DSCLANG_SERVER=$(usex server)
+		-DSUPERNOVA=$(usex server)
+		-DNO_LIBSNDFILE=$(usex !sndfile)
+		-DLIBSCSYNTH=$(usex !static-libs)
+		-DSC_VIM=$(usex vim)
+		-DNO_X11=$(usex !X)
+		-DNO_AVAHI=$(usex !zeroconf)
+	)
+
+	use qt5 && mycmakeargs+=(
+		-DSC_USE_QTWEBENGINE=$(usex webengine)
+	)
+
+	use debug && mycmakeargs+=(
+		-DSC_MEMORY_DEBUGGING=ON
+		-DSN_MEMORY_DEBUGGING=ON
+		-DGC_SANITYCHECK=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	use emacs && newdoc editors/scel/README.md README.emacs
+	use gedit && newdoc editors/sced/README.md README.gedit
+	use vim && newdoc editors/scvim/README.md README.vim
+}
+
+pkg_postinst() {
+	einfo "Notice: SuperCollider is not very intuitive to get up and running."
+	einfo "The best course of action to make sure that the installation was"
+	einfo "successful and get you started with using SuperCollider is to take"
+	einfo "a look through ${EROOT}/usr/share/doc/${PF}/README.md.bz2"
+
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/twolame/Manifest b/media-sound/twolame/Manifest
index 56e5ad70ced3..02a9ca782b8f 100644
--- a/media-sound/twolame/Manifest
+++ b/media-sound/twolame/Manifest
@@ -1,6 +1,6 @@
 AUX 0.3.13-perl-tests.patch 779 BLAKE2B eba221a58a16dc22ec7e6a10388045db6a2b2535a9f0a55e47a01315aa0c0121c1473aa6ff9f53b7bcf4b70a849a0b19bfe3125213f558c17ecb1d4fd1349376 SHA512 1c483daf75991fa6d390360d9108803f65fa894745140d3955f73ce8e87eb813a068efa810988ac462ed22ae0bf3d0f95b63feb5c823ce3bfa3a0dc9b9a8f413
 DIST twolame-0.3.13.tar.gz 660415 BLAKE2B 741e91983546241b984ce95ef3b1c3b00ff2c1e84f496961749b13b932a1c3fdcd44a3fde3a24e44d9a3ff9e859e64780ad60949f827d986608c51c1afe44912 SHA512 241ae5faebf05cb919959bb0545cb89e9b71cfb07f92a7118d864499ea4f0065ddaa646ab1482ffbcbca427d52c2436764074bd67fd19a1eb9979987f23163f7
 DIST twolame-0.4.0.tar.gz 890908 BLAKE2B f61a49aed06dcd2a60744dd758b480670f14f0eece0586b62a0b21fe2d9ff8280f8f7324b7daf88e85675c6200a1c68815ddd6bafa308b503a52df4552031bb1 SHA512 cc594bc8d2322922280f915a3c0aa52540cca0350d6498bc96f3f60fd6e53f951e775ea015a44bdb29ec883b46b31a0e5483f6a5c188b02e30008289273c7d03
-EBUILD twolame-0.3.13-r2.ebuild 1245 BLAKE2B 38d3d36302caf690b239ee5552093556672e774ea88c7a50c528f24280f258c6773ac3a66f918b6c39fcb5195ef9766875efcc744ef3e5ebae7ea5194b63e33a SHA512 628e0ed153bcc07499e3174a689e72fa973e44a597bf063cf2f0a215a130d579650e40509e09e0249293b74052d832a64967b4fa99d168b2062d336fb1f72831
-EBUILD twolame-0.4.0.ebuild 1336 BLAKE2B 3899df2d91fcaae03cc9356e142cfd15203f5c7d99fb1bf44e3316081bfc8a9529a9ff57d73bab086ca3ffb72b09776a0ca2fb9032d06a2521b6bd6cf47773ce SHA512 337ad4449bfaf14f9efafb8a9b836b1c6131eb122b3cb828cc9f23515a9205f68afc0710cf035cd7e010abf464a2fd3596f832b8537ce88e4c17697a44e3a083
+EBUILD twolame-0.3.13-r2.ebuild 1246 BLAKE2B 16e43d7796cb506a1173f6ea691474227745f4f89b07068b093df9816b88b4f39cf04ec4ab07148c7425acfe155a70285bc3af2f2836eb70450556e4bbfeab3d SHA512 9b91fb852268aa8cfeeba8a38530a3f1d9b057c269a5d687ece955fa445c5cd5cc5dcd0a850f2341872290939d78324d826ee01ba0fde032136d97ef528b049f
+EBUILD twolame-0.4.0.ebuild 1337 BLAKE2B 4305b9e27367069ea41544970eae755d34a38eb4795ae7ee54e5bf3fbb5394e233e5bf71b1dc855f85c2f62a661ddd4e2d9dbac500b24567bf320ea292778c7b SHA512 8da6d2db35357ac2e0408b588243c73868e58164ec9a26007f6eb58c3d017365d4211b634f1a4c88f528032b274de78543467a9a13b1802a67a25c3ab6e901eb
 MISC metadata.xml 330 BLAKE2B 71d39da341e5e41047c01d3b77c1090a4d1304c7ae915832d6cebe103c52cee3d0d27dd0b09c66d775efb4ee3bec3696bd6f27ca5cb78acc2a563f3992a26fc2 SHA512 4ef98f0ddd18034ac0ea2e93a84560e62b02c3ee6186f980b20733d88f68e36f3724f2b2b8c138393f9c6da1b4b943f318fcc85b5f57817fbaac33d68e4b6ea8
diff --git a/media-sound/twolame/twolame-0.3.13-r2.ebuild b/media-sound/twolame/twolame-0.3.13-r2.ebuild
index eb00272fd67a..fa766464fb55 100644
--- a/media-sound/twolame/twolame-0.3.13-r2.ebuild
+++ b/media-sound/twolame/twolame-0.3.13-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit eutils ltprune multilib-minimal
 
 DESCRIPTION="An optimised MPEG Audio Layer 2 (MP2) encoder"
-HOMEPAGE="http://www.twolame.org"
+HOMEPAGE="https://www.twolame.org"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-sound/twolame/twolame-0.4.0.ebuild b/media-sound/twolame/twolame-0.4.0.ebuild
index 965e12fe4341..0018eda92a5c 100644
--- a/media-sound/twolame/twolame-0.4.0.ebuild
+++ b/media-sound/twolame/twolame-0.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
@@ -6,7 +6,7 @@ EAPI=7
 inherit multilib-minimal
 
 DESCRIPTION="An optimised MPEG Audio Layer 2 (MP2) encoder"
-HOMEPAGE="http://www.twolame.org"
+HOMEPAGE="https://www.twolame.org"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index f1853e32f65a..5165e448e0d4 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/dtv-scan-tables/Manifest b/media-tv/dtv-scan-tables/Manifest
index 9ed27633d672..2b830f871555 100644
--- a/media-tv/dtv-scan-tables/Manifest
+++ b/media-tv/dtv-scan-tables/Manifest
@@ -1,6 +1,6 @@
 DIST dtv-scan-tables-2017-10-03-c1986d5148d8.tar.bz2 168709 BLAKE2B fb4a7ad5b6892a7e7eed1d57ebb49b1f4493076f6f744953d2d5c51c0e1cf7fdaf864ad050c578c2697f5b11d72c245b96ee369522cb58d38a1a2cef035099a7 SHA512 e2b0cf8f52b536be6a532b4a2896421a8150fdc19613e92c92d0c8275fcfd306cb091db32fa26f97bbec0a51ef4ba61b5f98e8c974280a3f6dd36b67a3bf4aad
 DIST dtv-scan-tables-2019-09-22-f07bde777d4d.tar.bz2 270211 BLAKE2B 76d5250a8eb7e9ce5c83eb9486ea1b398f3565ed027863057f143ae15c196fa01489f17fa71082ac878f49dac653da8967673872cb3e298f99cd59376c82ee39 SHA512 806fadcfc767d09dc9b474af089c2fa68ccafd91e110b74dc47f3a2ea90ebb74f80633831a20a51578fce3fbd4556a23c6bca9f7139be7c3de8eff79d2ee321c
 EBUILD dtv-scan-tables-0_p20171003.ebuild 736 BLAKE2B e97f810aa9a13bf409de4b71a7be136a3ddae6afb724afc3d7b2e1d2041f648158619fa29ddf904288304886c5cec3470c23149f96707c1fc08d6c7af2a05dc5 SHA512 772d083bdb99c78fe8b72c9552919d333a3fd97753e5c4da07cb1c305664deb021c71a19d49ce13101bc8f768970adfe7b1f12b4ed6447100a3a69590735d286
-EBUILD dtv-scan-tables-0_p20190922.ebuild 741 BLAKE2B b930164b495b422178137fa20f0758e057e7bdb22aa8e812592a22f70bcb7ec30917dbfcacb833066c93baf38f7874974851dcdb4fb7580cf566865ac255e03e SHA512 c69be11fb400fb39a66e78802d8dd19ac8edd13a79efaea589d42af2c59900778ec35ddec2d8f5029f7c0a6559985018b9c290c57d150d37fb9a663720bb0548
+EBUILD dtv-scan-tables-0_p20190922.ebuild 748 BLAKE2B 09224bfa22b6642dabba0f65250a89b124f287523ffc9213527c068e9389eed1349bc99def7b4b468742d3a4e83f758209be4f6dcf7ff2e24b1b47c97e131287 SHA512 3a2df6d03e9f392eaf2f78128f1a6353a49ab80660fed160bda9365e4fbbcd7896adee3a4e2e88519c50b72abf8527631252f900481c1977425404439a0f235f
 EBUILD dtv-scan-tables-9999.ebuild 741 BLAKE2B b930164b495b422178137fa20f0758e057e7bdb22aa8e812592a22f70bcb7ec30917dbfcacb833066c93baf38f7874974851dcdb4fb7580cf566865ac255e03e SHA512 c69be11fb400fb39a66e78802d8dd19ac8edd13a79efaea589d42af2c59900778ec35ddec2d8f5029f7c0a6559985018b9c290c57d150d37fb9a663720bb0548
 MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20190922.ebuild b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20190922.ebuild
index 73d9b36229da..bf0211623cc2 100644
--- a/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20190922.ebuild
+++ b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20190922.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 @@ if [[ ${PV#9999} != ${PV} ]]; then
 else
 	COMMIT="f07bde777d4d"
 	SRC_URI="https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${PV:3:4}-${PV:7:2}-${PV:9:2}-${COMMIT}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 	S="${WORKDIR}/usr/share/dvb"
 fi
 
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 4928c41fbbef..b0fca16ab576 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,7 +1,8 @@
+AUX kodi-18-remove-useless-test.patch 1295 BLAKE2B 36c6408ee1ef404539f097822952fa4000b4913ed5b54526bb4f2b452a553335eb3935e5a6cbcec0b1e497eed86d5417784016404596d31a063d608ca1f44d51 SHA512 73c50bf728d04117ad1493505bea561ade6c49e2e58de24a453374946d0931e11e094b749bad9d90ea48197521808a12b87c42e496acb6091380f4953b959567
 AUX kodi-18.5-cassert.patch 1402 BLAKE2B 02f2b63856cf1fd75749d78a0f9cf37cac55b20fc22302846011781c56e8902312a10e71c3e1b21f44aaa362efba2acefb73c5ae68643b569c541508f44d97bd SHA512 fbaa126dd647559749944c09e5424a76dccdaa5d8dc6299a52cb6215f20af29f3cf8d0596280f335e8a9be1ffe556fa47b33c9d28b22c2b47f51d738219aeb8c
 DIST ffmpeg-kodi-4.0.3-Leia-18.2.tar.gz 12426917 BLAKE2B 83da9511d7b4ef6a8c813561a061c4fe86712e4424c30c9005500751c6c79f4232910caaf13cd34d2db1867f592b042dd291d6c32a77f80107ce87a3a7db1760 SHA512 b4d4bf16f05b953ba81769446c8fd90246e1919b9ef671fb212008151c83d8445e4123ad37c352aa6243074962832e817749d2de318eb721d5bb5d655fd77ab2
 DIST ffmpeg-kodi-4.0.4-Leia-18.4.tar.gz 12430413 BLAKE2B 6de6fde2c16264f851466b46f87c23c34e7d503203f69d47342d46034f153860190d196da51221f866315405c8a33325b2160283333256ee5d5e293336afae99 SHA512 c6dd75dbff7119adeeda246cfb640b5e8d3b4c242ef83e5ba070207b60f0c715c3fe3cb328d87687b70a133f122a03aba990f0e95f3aac7d5dbcee25bec59078
-DIST ffmpeg-kodi-4.2.2-Matrix-Alpha1.tar.gz 13066195 BLAKE2B 7db50ea93358bb90ac089851586156ce7cbd1be1474af2f087ba448a5168839ad61e84e313e638137156bccb44920a05783d2e6aa2b464c6cf692eccda392fe0 SHA512 19bd27687126ffb103a97709dfec7a4330a362410efbbe5ce3a68970d642c1b74c4bc0880600e232b3b34659d7fb0e40e233a8267a9b52921b0f810944a6297a
+DIST ffmpeg-kodi-4.3-Matrix-Alpha1.tar.gz 13478011 BLAKE2B 6219293fba86981c34c22b1a91c6dce0c298d523ecafe2e0ddce8b1ec4213d4f8f65610e4555a124a582d7fa8e858d0ad6921015fa4e639d64a02e955f7faf46 SHA512 23220650b550fe2008c38c955e10baf55e1ceaac780cf170db5349b156ac399ff3eda39509773f0c973c50083e75823b1da8e92b3751c04bb06a7f5687bef850
 DIST kodi-18.3.tar.gz 51013397 BLAKE2B cce29d481397dddd3c942f83a034bc6d73eafc1be2a50436e1e5611ccf04c27e6110c4b4f99f7f7d1cf8da3e2550209c8bee3db6e98136b8fa9738c4b1fc7e43 SHA512 4e898e28238dcbc67e106c5a0ef88bd6a82f8c0ad00e77e3ddbe2da6181b37d9ca1ba6bda57206223cfa119c5291edb4410d3e773d97b5ab67660e49929437ec
 DIST kodi-18.4.tar.gz 51027569 BLAKE2B 47e3377abb4a1e5a3c26b1519f45ab9347127467594841ac689b857a3f4163731951d4e1e4960bce5c2af4fa224acf4a3887f42bdc41a603bba4979d3bcbcda8 SHA512 ae08fc29d20387d9352dc1ae4a89da19962a279b89705ff8f7869377281589d44a685cebaa8509d3252ae79215dcdaadb72e9fa752e6d2bce59974bc23276aad
 DIST kodi-18.5.tar.gz 51025415 BLAKE2B c439790a85466d50875cd63ccdc6fee1b16c5ee67d9a3371b1a006292f642e59c6321cb63f698e1a43bc7be45209dbf993028b1184722f7b51dbe6fef6a292ba SHA512 6fe70d8ee5b6ffd3d43b89487554e41eed8dbf95bb017b82578b547ec248ae94f4dda298f0d85c5896019f7032eba4e1e2494c8140dde9c9b9cb21802acfd029
@@ -14,8 +15,8 @@ DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c
 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-18.6.ebuild 9593 BLAKE2B 4371b37d1e214c604015a4211f1ff01eeebebadd8d3bb8d704bb9955958f81558e7d26c98b8a8c15253010a9c083164d430acac9d714eb6913b3113db8165414 SHA512 718fa77d728519fbb9e6792f4ad3c986b52a77f384d9ffa68f20b899783c9af901108ae2e6f4033eca3755769e3e71a6f78c74f5a380d165cb435a857483e5e9
-EBUILD kodi-18.7.1.ebuild 9595 BLAKE2B 79dd949e95b95debdd5c7f75fefbc4430ad0b48dddae6baadadcc181ac8fae81cfd95d0f233b4b54f71bd674563def202c2dc1365b1c13e3e31097faa5f5e6bc SHA512 3e243dc3df53f0342e7f3e896bc77b6a7f2200b604646ce3fc1ef822a39b8e05d3434bba1c64d4827c50ae2c928d8739b971cf94960c7d0771a51c7476862aa0
-EBUILD kodi-18.7.ebuild 9595 BLAKE2B 79dd949e95b95debdd5c7f75fefbc4430ad0b48dddae6baadadcc181ac8fae81cfd95d0f233b4b54f71bd674563def202c2dc1365b1c13e3e31097faa5f5e6bc SHA512 3e243dc3df53f0342e7f3e896bc77b6a7f2200b604646ce3fc1ef822a39b8e05d3434bba1c64d4827c50ae2c928d8739b971cf94960c7d0771a51c7476862aa0
-EBUILD kodi-9999.ebuild 9262 BLAKE2B 4bda0a3da5bf0ce4488a9d4022d62d5a4a0f9704fe2c35619677e1893e3df3e3a4566f4ba24684cf7e7b7ac36193efbd251dad6b9d7a7506563c79043b216b5a SHA512 049605d099a3eefd2474fee4348cf83f361d6f88bc36ebaac1f3547d2d8ea641f4ab1150f4b0c1158a6a303ae56e3e86b5eed2d534d0cd25c94eed0065ad288e
+EBUILD kodi-18.6.ebuild 9643 BLAKE2B 3918f6e3c75285dc69e2af4340816edd602ac2aff9abe2ad56e54ebb2932f89af557942e7d762a98a6b2b7be0344d494152cc8fccac7d08aeefa9bdf4b563c4a SHA512 fc362753062944bd384aeded87fb1e06a47ca9d8bc9364b48c6ae4a4e20d75c1c0def79bdb0d8602e91587d47915d1ea2c082b28e8e6bc0acc382e62d02c7275
+EBUILD kodi-18.7.1.ebuild 9652 BLAKE2B a09cdbb72d0e03168b7128d4693437e02092a5f502300a68beda3bda1ba3b0efc2d1a214b44e5d74c82d962cf9fca23d74928ef6d2d438d07937fcd73b4d18de SHA512 9a92caac2c5c0cb3158db3d9a3d5146431760362ad39f272198fdd9c712ca1e3fe6f3d4ee2f6761b65b909a9121d01f118b879c02d2575c2245b8c128f6d72d0
+EBUILD kodi-18.7.ebuild 9643 BLAKE2B 3918f6e3c75285dc69e2af4340816edd602ac2aff9abe2ad56e54ebb2932f89af557942e7d762a98a6b2b7be0344d494152cc8fccac7d08aeefa9bdf4b563c4a SHA512 fc362753062944bd384aeded87fb1e06a47ca9d8bc9364b48c6ae4a4e20d75c1c0def79bdb0d8602e91587d47915d1ea2c082b28e8e6bc0acc382e62d02c7275
+EBUILD kodi-9999.ebuild 9260 BLAKE2B 7a9d8dbe0d9a74db432814850821f1e622d27c149e318d993ddf52b62d4c6f367956be621ca348e5e6ab378cd8bc11efc9ebb67cc433ce7a43bdd535ec6d25fb SHA512 bc49e379bb06b1b672fac3aedfbf0cff18b2b4d5ef83363c5ba58940655ca807f6afe6b6789a4e3534b6266b865a2b25f7f953cccabb37f58d9aad9002efd058
 MISC metadata.xml 1796 BLAKE2B da81fcbb0abedc4f78e82fa6f9453e4ffe824b1cedefcc9a1261dc09e0bd43482a7bd03e908f959d1a3033c284188d79644a1a9bca5064836eb3d0908b7d0d7f SHA512 d76d9f8d4683df4ab488dd30852437649810d0b093f0590db8f95404445f25aca7efdaa9d706d3222d67104cb2c4b02896154fcd7df1173b0bfe7e2557d73847
diff --git a/media-tv/kodi/files/kodi-18-remove-useless-test.patch b/media-tv/kodi/files/kodi-18-remove-useless-test.patch
new file mode 100644
index 000000000000..144626718b60
--- /dev/null
+++ b/media-tv/kodi/files/kodi-18-remove-useless-test.patch
@@ -0,0 +1,51 @@
+From 6cf1d4aaf9807a209f19e0aea97b44a7ae617f27 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Tue, 23 Jun 2020 14:30:29 -0400
+Subject: [PATCH] [test] TestCPUInfo: remove useless test as we cannot
+ guarantee that they exist
+
+---
+ xbmc/utils/test/TestCPUInfo.cpp | 30 ------------------------------
+ 1 file changed, 30 deletions(-)
+
+diff --git a/xbmc/utils/test/TestCPUInfo.cpp b/xbmc/utils/test/TestCPUInfo.cpp
+index fab473891356..df74ca3ee995 100644
+--- a/xbmc/utils/test/TestCPUInfo.cpp
++++ b/xbmc/utils/test/TestCPUInfo.cpp
+@@ -73,36 +73,6 @@ TEST(TestCPUInfo, getTemperature)
+ }
+ #endif
+ 
+-TEST(TestCPUInfo, getCPUModel)
+-{
+-  std::string s = g_cpuInfo.getCPUModel();
+-  EXPECT_STRNE("", s.c_str());
+-}
+-
+-TEST(TestCPUInfo, getCPUBogoMips)
+-{
+-  std::string s = g_cpuInfo.getCPUBogoMips();
+-  EXPECT_STRNE("", s.c_str());
+-}
+-
+-TEST(TestCPUInfo, getCPUHardware)
+-{
+-  std::string s = g_cpuInfo.getCPUHardware();
+-  EXPECT_STRNE("", s.c_str());
+-}
+-
+-TEST(TestCPUInfo, getCPURevision)
+-{
+-  std::string s = g_cpuInfo.getCPURevision();
+-  EXPECT_STRNE("", s.c_str());
+-}
+-
+-TEST(TestCPUInfo, getCPUSerial)
+-{
+-  std::string s = g_cpuInfo.getCPUSerial();
+-  EXPECT_STRNE("", s.c_str());
+-}
+-
+ TEST(TestCPUInfo, CoreInfo)
+ {
+   ASSERT_TRUE(g_cpuInfo.HasCoreId(0));
diff --git a/media-tv/kodi/kodi-18.6.ebuild b/media-tv/kodi/kodi-18.6.ebuild
index 0a97baf0c630..b73cbf49d2d8 100644
--- a/media-tv/kodi/kodi-18.6.ebuild
+++ b/media-tv/kodi/kodi-18.6.ebuild
@@ -16,6 +16,7 @@ SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_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"
+	"${FILESDIR}/${PN}-18-remove-useless-test.patch"
 )
 
 if [[ ${PV} == *9999 ]] ; then
diff --git a/media-tv/kodi/kodi-18.7.1.ebuild b/media-tv/kodi/kodi-18.7.1.ebuild
index 25f6abdbcdfa..7f289b5c8a23 100644
--- a/media-tv/kodi/kodi-18.7.1.ebuild
+++ b/media-tv/kodi/kodi-18.7.1.ebuild
@@ -16,6 +16,7 @@ SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_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"
+	"${FILESDIR}/${PN}-18-remove-useless-test.patch"
 )
 
 if [[ ${PV} == *9999 ]] ; then
@@ -30,7 +31,7 @@ else
 	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"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
 fi
 
diff --git a/media-tv/kodi/kodi-18.7.ebuild b/media-tv/kodi/kodi-18.7.ebuild
index 25f6abdbcdfa..b73cbf49d2d8 100644
--- a/media-tv/kodi/kodi-18.7.ebuild
+++ b/media-tv/kodi/kodi-18.7.ebuild
@@ -16,6 +16,7 @@ SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_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"
+	"${FILESDIR}/${PN}-18-remove-useless-test.patch"
 )
 
 if [[ ${PV} == *9999 ]] ; then
@@ -30,7 +31,7 @@ else
 	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"
+	KEYWORDS="amd64 x86"
 	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
 fi
 
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 4cbbacae878f..a01b08308cc0 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -7,7 +7,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.2.2"
+FFMPEG_VERSION="4.3"
 CODENAME="Matrix"
 FFMPEG_KODI_VERSION="Alpha1"
 PYTHON_COMPAT=( python3_{6,7,8} )
diff --git a/media-tv/linuxtv-dvb-apps/Manifest b/media-tv/linuxtv-dvb-apps/Manifest
index 840b8aefb4a8..ce4416e8ee4f 100644
--- a/media-tv/linuxtv-dvb-apps/Manifest
+++ b/media-tv/linuxtv-dvb-apps/Manifest
@@ -4,6 +4,6 @@ AUX linuxtv-dvb-apps-1.1.1.20100223-perl526.patch 519 BLAKE2B 1546d43af3d337062d
 AUX linuxtv-dvb-apps-glibc-2.31.patch 291 BLAKE2B b03833abf623175e9697a2745e9d99c7510b34e3823b42e4a394739d39a534cb4781a076879c85794fc4f9f703ded73778695b8334324186c4bafb3285d0dbb7 SHA512 efd1e8aa91cdcdff7f17856f13bb8689d3eb0288e2ff45c05bc55b44b32a137854c194cb3ee477a243b5377b44f221481e3323c9caa0065eb551cddf37a89c41
 AUX linuxtv-dvb-apps-no-ca_set_pid.patch 1004 BLAKE2B 36ab3817546d5a832473f4d69a2ce97642f3a6d7d8b17cb036d8976398274c4c9e040cb60a909e8f28f1ff25e6cfbb990dfe0b44b4c729b7e8abe30e645704bc SHA512 1cef92aee99ee03255115e1979b0342bbf9b45bd55c6f9ff6a8529edaf6f3a36c172a145c01706341486aae5d6e0a3fde52b535af97e020cb7009d23e0c9cf72
 DIST linuxtv-dvb-apps-1.1.1.20140321.tar.bz2 368759 BLAKE2B 5ef1bc4ee4f0ab167cda8d87a73c83566b40005e16fbaa79525af4fb0b117dec19a4883eedad8bcfedd269c2e295dd7f9e055f905dff5f39dffe1ff052e87547 SHA512 ceb057f760fa0b3902e6824e74b9392be9a7bd3318a1a83f206c99672da17904060ffdc35e84c89d3b8af60ac29d4427acad44e9ae16797baaeb5738e2ab1bf5
-EBUILD linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild 2190 BLAKE2B d475b6b40be06c6c2b57fbd4d491baf2916ac6dd6cf18fd8786dd16d5a703942a987e00527b693c6c266847a98d8fde4ab0b37d5b0df58b717e5210866d2baae SHA512 4f8abf55a67b655f0771fe14c0e51cfd2a83ef4848a248243dad3dce6ef4b66a4733eed59965a784d03846b1c43bc90bc9d58b650d5768bfda86ffbe7e6f43ff
+EBUILD linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild 2197 BLAKE2B cb1b0548cba008ff25916ad12fe7eea67019f44c30b155d24c26824487a661c26ea6657accb562501306dba83bb2cf8cdd5bd3303332ff2b3721a73582f7383b SHA512 82a944c5cef64499ba5fbede59d020f9499ba2d7f375ae9bd1efda0294becd7a8231f2501227277b8a2e7f2d3b110b5e979af46a0743e7bb70c26d256411675d
 EBUILD linuxtv-dvb-apps-1.1.1.20140321.ebuild 2152 BLAKE2B 0e1886a393669ffd430bfe4036f1ea9862a6ad24fc7930873426856ea27b4551a3f02efd628c72edef6533a750ee335f7381b411d5fd430585053fd559c74654 SHA512 6d7462b31af1d4db0b5380c2e2ca8d86574aced20ff2a2a6d6763025f4fbb10ff7946a0055c181e9b3ea5b5ce3371818e6c952e9732bac90a8236ee3ea971a5a
 MISC metadata.xml 230 BLAKE2B b1572b7d9c8d7cfb1ad670feba63226e05f2aa6d2de71ad3be92798dc2d1a21678aae2f8f9af6314e2a9fdc5fb1ac9fcac993d9b75a9afa457853888c94b0943 SHA512 1aaabf344edf8981ded68904e05257b579370a589c86b1ea8984378ad6a8ed3daf91c5e9069c07d207d47cf1f70a8039c644dbf6108557ed2053cba9769723ed
diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild
index 6df86b94a3ba..e0dddee3f36c 100644
--- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild
+++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.linuxtv.org/hg/dvb-apps/archive/3d43b280298c.tar.bz2 -> ${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86"
 IUSE="alevt usb"
 
 RDEPEND="
diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index 5f97d0ad21f8..cb3e54df5357 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -11,6 +11,6 @@ AUX tvheadend.confd 359 BLAKE2B 3b44e47b9216daaa2defa69254700693015619e8b0196060
 AUX tvheadend.initd 375 BLAKE2B 6fbf53a0a67957ee5756b56189d42b741adb7603b5590aa5fa0fd6b2a1d1ba930af05de8ebedba343302aa861f7fb42d3eb25b67acf6b43aa7c956d4965ab944 SHA512 6f17fa6bee502f586b4500c5f5541c9c6ce095deed7ddb3c1d1ad129a2e22fa66de0e72b712866659f7080753c73f67154d6dcdbf8539d6c8a942bea29bb1aa7
 AUX tvheadend.service 575 BLAKE2B cc332347736f9dccc34ece966311899307d03e3bf852fa8052dd86f4bfe02e0b927da7b3b8b9d78c6fcb85d77ca889ac22c8106636cac825b8550e7bd5e38176 SHA512 c9c0f52dda9f325189f99fd275cd806f6b818761ab1bc00a36ddb934418d5cff4b9dcf594aaa446ec47f3b0004ab8fc75b221a4fb76ac8730c365f751056c522
 DIST tvheadend-4.2.8.tar.gz 21875281 BLAKE2B fdd99ca6aff56f8daa073394f9c58e9cba4ea988a2884e24c2288fd4870dd0460624fb700838ba92867a57473cc4133fed5fbd56f0e40f02a0878ffcd0642c00 SHA512 e629ffe1802e76b5121d5c22d11be86640f17816a5e902ed4842b2fd21df506d00d9caebafd931d71995e9d9049cb675c032478c9bed4f1ce82fc3f255f6166f
-EBUILD tvheadend-4.2.8-r1.ebuild 3492 BLAKE2B c279bcc365e15d6cd2c8651993722cef1c0e2919dd90a13645fd19a5e775cbff92871447b217d25d9e938b1b6cd7f0d7bd06a0edb440344317f64ac7ddea0367 SHA512 1d268651f62c08d240db0eaf0fc8105d124ce33ba13a1a7f58e2f9b11d7978649ffa30f91e132844764c351baebce1f87de16acadc45776011a9599eebe815b4
+EBUILD tvheadend-4.2.8-r1.ebuild 3499 BLAKE2B 595a01eb5857c709f5ae72a85627b96d9bbb7da569a71f342b82e5e0ce45bc2e27b209fded20b1ee0cd9de44797024041817b31d9d72862cb3d58f1f10c69975 SHA512 a4b8b854649d13a8538379084e79f84e5203123fcf1922724a8ba0ca608337c9ace05f7bc2624bba08bc30eaebd8cd6fc6421aad929925a235534198986f24f0
 EBUILD tvheadend-9999.ebuild 4101 BLAKE2B 4f8bd479b030c990d37c88dcb2524f02e17e3d1cc561127b7df56fc9cc9b865c9e13144bd498753521155837265defe9a8803706d8a46e5fe8cfea1db6e89c2b SHA512 ce0daed28e6762b4c6eb255710936cd9338c4dac6171641dd5d12b5ab0dea6db30fddb4cadc50a0daae95ead329a106cb9bad62817f0618e47fe9ba3099fad02
 MISC metadata.xml 1445 BLAKE2B f71dc280d5fce7c0945939bcaf75d0d7f294aea6055c956b04e9e439199c2a6c107c800be6d18a0c58d154bdf7cdd0cd7d874e5cde5fc93f9b24160f536d21d8 SHA512 e26b94f14a619051e637b018d0f47ce86381821dd5207ba5b34429e0c0f83c55bfa9c37871e722af85719cf3e06322703d4709cbbd771b8f092efb8e85cb5b72
diff --git a/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild b/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
index 9c12a6de1a1d..17189591cf00 100644
--- a/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun +imagecache +inotify iptv libressl satip systemd +timeshift uriparser xmltv zeroconf zlib"
 
diff --git a/media-tv/xmltv/Manifest b/media-tv/xmltv/Manifest
index 1488aac947e8..c41ef87c958f 100644
--- a/media-tv/xmltv/Manifest
+++ b/media-tv/xmltv/Manifest
@@ -1,5 +1,5 @@
 DIST xmltv-0.5.70.tar.bz2 1274164 BLAKE2B 4a6cbf6bc2f8f113a91fc579afbfc69fc04aec020d386182f6fd78f9f8c18821d0dc09077cccb1ad30e6f0583f958210fbf717d356f1e47dcf785e5a85864dc4 SHA512 36dd497dc20d296ca984ad0a1ca19f471c97cac7bfe7c5d4baeaae7faea565c36103bea10e7a7ae813c1cfc35c7ac376299edd2bf01c4c5da981cb5cca13317c
 DIST xmltv-0.6.1.tar.gz 838051 BLAKE2B d4011ee31b56096ae275647e0cbd85b11c2edbc3d150208aa619900c9741ac3bed2a1255d778622883b3d24a32ce3b803f5719fdd2273549bafa31ebdcb1a887 SHA512 137dad875c6f7f77fb986b4662b411766424676df0a2422f3dc123c8cec4e1dff123ea68577add65c0e5bcf2d0bdf89d7fba0ed423502ec27e2aa82ec6b10bc2
 EBUILD xmltv-0.5.70.ebuild 5268 BLAKE2B 46bed06ca83a46fbd2833eadfc549411578b390258fbeb1a10438e6de47cc7a2475c996c23aa9ffea7a04ea48948067546024bc52a183bc91ad0e2383cde85b6 SHA512 c0a326722ffe4b180a5c81627556a80213fbf3c8da80083145089f464c10983fe8f22db0e6f2632f2284b1763e1a05dbdfec07acbe137b559ea7d593dd0a657e
-EBUILD xmltv-0.6.1.ebuild 5914 BLAKE2B 268088ad3b0a742cbc6b5d4780261cc77c8fb41c7065d4798a6e68eea921037ba25076cffa01820149327b77e61acc0f9c36f163f668ae32eb9babd0d648a08a SHA512 24a3c4a4a6572b6931945df82efc2a582c5cba6dab84019e94f9d7924452a6aea05f32253515f65e9ce9b08042abd5e4d73e3d091face583074a691d79a16d65
+EBUILD xmltv-0.6.1.ebuild 5921 BLAKE2B feb552d7bce00de7093e60ec99a4f68fdd2265a5a3320ff0113e7c3cf132f0f5cf34fbecfc53b373de4840abcf3e56af6a89268b1c4cdb4b9761a35c35d7da7b SHA512 516f28807ad6142ccdb9cbf16c5afe4881e6786140e226252fae74f290a5ad58d66e54ffd4e8cb091cc8d66d15cf780c8f6ab664ee8fb4f185af3735ba7c9e23
 MISC metadata.xml 2676 BLAKE2B d7e8c1166118a7622f365c05b7408c8ac8725c5f98b26d792bf89e430dcb6f671e397f6f6f92f7d55a2f4a0756f6ce2e62ea08a8e7f74182ac23b806788aaedf SHA512 52b5419e2c2737c94dd99cad4d412666db10c217dd68e65f9422532d57bcf5c836fa7e94938eb8876739add027477bde8b3a5f269dbc69493c930ae5aaf69a41
diff --git a/media-tv/xmltv/xmltv-0.6.1.ebuild b/media-tv/xmltv/xmltv-0.6.1.ebuild
index e7906a788a68..c89237ffcaa8 100644
--- a/media-tv/xmltv/xmltv-0.6.1.ebuild
+++ b/media-tv/xmltv/xmltv-0.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/XMLTV/xmltv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~x86-linux"
 
 IUSE="ar ch-search dk dtvla eu-dotmedia eu-epgdata eu-xmltvse fi fi-sv fr
 huro il is it na-dd na-dtv na-tvmedia pt-meo pt-vodafone se-swedb se-tvzon tr
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 6656c30569a8..b0fd858e7395 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index a5b1c688264c..999fca69c939 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,6 +1,7 @@
 AUX avidemux-2.7.3-desktop.patch 678 BLAKE2B f903203996fddbe798f990b3092f4a0c578407933df153e05da19aa0a6bbfaa1bbd96f25b61787514c4272f94a0525e5fc5c0171744c2f87b04effc1a2907974 SHA512 68e6a0d3272ecf00aec63f513f50d39b7702eb59ecd85190483a93b03e7461964e9533656f2279bc00312c95418f415d159e15646790a1b0b9eb2ebd7f520b4f
+AUX avidemux-2.7.4-qt-5.15.patch 523 BLAKE2B 3fdbf41edb47f2827a2bb25d553b6adc9cc872c032762754ce182d75496f705be2e33b210587f436b7d30e1ff3db88fd1596bb5b85b011924244b9fe806816d1 SHA512 c651d4bf4f60d85c068ed1c7733481ea57f9528656bea50193e80006d8102100cb881737553a93dd9d1bfcf8216abb08463f494bebef5fec3fb217099c1c91fb
 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-2.7.3.ebuild 3830 BLAKE2B afde6461c3fbc56adc755c281070cfea51c21a93670675da2fcc7e21901370d2cfb666a38b2e592bd8746514de882286cb5f76e3736942b62670c30dfaee67ee SHA512 87670a0162268554bbe029d772c0a2a546a6db5765c1cec98bc4c70e78e17bedb8c8e855ba15eb2e733e9fd45112d3b045749cfc35c025a748eda98050549f93
-EBUILD avidemux-2.7.4-r1.ebuild 3640 BLAKE2B 261db989383e3a46061c5ef0ac65bb7d9b9f26be4cd151c51650fc7680ffb4765cec1a4d2f6a9061159c4fe748d605fe57e895bec5cd93c549bceb2d33b242fb SHA512 432821297e1cfa49fe1542585eddf8359bdeb1f3a20152ec35705d07f70cdc64cb0806a19aa38ea419d0ba98190015dbcc282a02c4dd5cf053423c5eefe75a41
+EBUILD avidemux-2.7.4-r1.ebuild 3649 BLAKE2B 7fafaf9d9a09be73cc6ad399522be034e8b208d1036e8b1c8c4b673d9bfa0ccec64b119ed7bf0823c81861cbad5e415c9b23394d2800e75cdb4feb7b1d0f6880 SHA512 b01a8cde8608f3c94af74673d1b1c8fb9b7233b1e77afd7b7631701b5ae8145435aa116a01c69cbd6addb005c25e62bc5e8421b8bdb4b757c71e3d30f4b0ce85
 MISC metadata.xml 489 BLAKE2B 51c28e4d932facf14fe99d0d18e736f16c754961e8fde468505f03c989e8ec3cb9afab9c916752468a5f9f0a07ad8d25da01e64cb987cfed1db835f657512b1e SHA512 7a1b885e05a9bb6684583dcaefc5853903330bbcfc6b1e07b76cde7405894d94e0f095fcfe18bc33bc24c1bbf260814c9ebb8219397e0e861a2fb5977361bc4d
diff --git a/media-video/avidemux/avidemux-2.7.4-r1.ebuild b/media-video/avidemux/avidemux-2.7.4-r1.ebuild
index cc9638e1c582..ce223b81cf34 100644
--- a/media-video/avidemux/avidemux-2.7.4-r1.ebuild
+++ b/media-video/avidemux/avidemux-2.7.4-r1.ebuild
@@ -1,10 +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
 
 CMAKE_MAKEFILE_GENERATOR="emake"
-
 inherit cmake desktop qmake-utils xdg
 
 DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
@@ -17,7 +16,8 @@ SLOT="2.7"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug nls nvenc opengl qt5 sdl vaapi vdpau xv"
 
-COMMON_DEPEND="
+BDEPEND="qt5? ( dev-qt/linguist-tools:5 )"
+DEPEND="
 	~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?]
 	nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
 	opengl? ( virtual/opengl:0 )
@@ -30,10 +30,7 @@ COMMON_DEPEND="
 	)
 	vaapi? ( x11-libs/libva:0= )
 "
-DEPEND="${COMMON_DEPEND}
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	nls? ( virtual/libintl:0 )
 	!<media-video/avidemux-${PV}
 "
@@ -42,6 +39,8 @@ PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
 S="${WORKDIR}/avidemux2-${PV}"
 
 src_prepare() {
+	eapply "${FILESDIR}"/${P}-qt-5.15.patch
+
 	processes="buildCli:avidemux/cli"
 	use qt5 && processes+=" buildQt4:avidemux/qt4"
 
diff --git a/media-video/avidemux/files/avidemux-2.7.4-qt-5.15.patch b/media-video/avidemux/files/avidemux-2.7.4-qt-5.15.patch
new file mode 100644
index 000000000000..5c92a561fd7c
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.7.4-qt-5.15.patch
@@ -0,0 +1,11 @@
+diff -ur avidemux2-2.7.4.orig/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp avidemux2-2.7.4/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp
+--- a/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp	2019-08-14 19:11:18.000000000 +0200
++++ b/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp	2020-05-30 20:45:53.304702855 +0200
+@@ -8,6 +8,7 @@
+ ***************************************************************************///
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QRubberBand>
+ #include <QBoxLayout>
+ #include <QSizeGrip>
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index b0c62803a5cc..5cf67d50c7b1 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,14 +1,8 @@
-AUX handbrake-1.2.2-backport-hardware-configure.patch 6394 BLAKE2B 64009363b658bea4aaa588339e0f596790eaf584a377b0c76ad5fded84652fa4fc93ef626e5e221b1a742b1cbc34f8a97e2f92bc875fb8e018a34c93948ede3c SHA512 62d8c54ca0148fcac76f356dd4588b1cdfdbec7621fe9a8b426a39ee7b2dc1eb3085f17e8c1ebe23f5d45b69e59e52c7c8dd113308598b3f2378bad32dec6bd5
-AUX handbrake-1.2.2-fix-missing-x265-link-flag.patch 357 BLAKE2B 8d59306ef238520326223f18331feea230ae73d0f4a48f54b5c09d07a0a699a4e46ba60b59570347babb85ee30676e7ab083027bfe0fb024f24097823db06045 SHA512 9ca716b290f384db839609d176b6883c4dc1aaf31206b206cfd1f29c85bb134e29fbf72bda1a8589f76e1885019dbdee5a39d8299f7f0a20a6ef8a01868f4845
 AUX handbrake-1.3.0-dont-search-for-python.patch 691 BLAKE2B 623654494bf61cedb531df3f9b3e64aa17a2a3d03cf9d71577ba1961961d3d058dfa383ef3bb5215eba8a2c84231531b35f1a331850070ae0bcc5b5fa1586c67 SHA512 044b0cb7d9302f74e1ef92e37162135b8ac76d96bf7d647c269ef19b5cf2a8771ce0cc76cbc8817b2480cc3e40af6bafd717888a3982b3e679d831519aad4e64
-AUX handbrake-1.3.0-missing-linker-flags.patch 1283 BLAKE2B 83e20def829699eff6ad8473261cdcdb736e0fb395bebc941a75a4ba7384ad4509958f5e900ce57ed04713bd2ac4e10408dea4c93433edefe450fc8d8a710484 SHA512 810b1329ab47eac284fbb9cf9302cdbe453c2ddf2c8fa5665ae6a7b82ca612ef411fa63cb2aae74504b7ef9b513e42f7e8a4e7c058ffd02e2d9268ef3f837a4e
+AUX handbrake-1.3.2-x265-link.patch 585 BLAKE2B aa46591f144e787212194e937ea594f29b55cac79c7bb659010775c09a4c5e1d9b1345047b377a6bfc0db5ee17e57a41670ad72373f0d01d390cf21b1d2c10b4 SHA512 ea13eab2a080f1d0080247f5a25cb09e2d495077caddd2ad3ce473f79d7bc611795dd1e13847cd982b0a19eddfddc96dbdd3deae8928bb9597d1a6627f17396a
 AUX handbrake-9999-remove-dvdnav-dup.patch 809 BLAKE2B 16cde838dcf59753e5438df0d2c2b81f45667058bd0687a7368c528f61bd2a2fedc4462894daad58c3acb5c51bdd53df3b30e28adba93a0fb2838416e4226217 SHA512 e2005155adf29e8253f4313d209b2ccc642fb1d7f63256d3bdf675ddd0e6b0e15bc6bffd98e19aa7dab3907e161e29c5268dc5656590ce9254b12a91ac3ff6b0
 AUX handbrake-9999-remove-faac-dependency.patch 3697 BLAKE2B b0f7d0a1c4d464d3287ab233b756f5036d6ffa7e9e59a2f98a8ffb2ae59e46d25e56edb3e5bf9c04a16330f3dc50f4c2426f252b35834b7c9c9e6b4904244368 SHA512 9d070e50a9b7d4b8ac25b7d56bd341aca6dc979ba506c84f4b95109909f70020723915cd120bed24e84a8fc242ee3c3a5775f43a78b7995e53cd499444c9f6dc
-DIST handbrake-1.2.2.tar.bz2 18010777 BLAKE2B 75ace4565bef22a6ee8cd3291a393dd20d9a8fcc57b16bca15393f9a5f18949bf104ad69b536453013598ea3dc0ddbceddf85b96e234f09ef2c119810242f48e SHA512 434e6db1acbe01771aeefd2f257bdc58ad84e63ba441f4977f634b9ccb3c708176b928adf1dfa9e20d4948b65876ae9b4dfdc35f9c56f03f34858380090ab29c
-DIST handbrake-1.3.0.tar.bz2 16801695 BLAKE2B 2a71674f557562317ed643064f252f3f88815a0b2fbbf9478f79efdd18282304443a29120effdce8ed9b07d00896d0946be0a7f4a94ae65252f9935c97829fb4 SHA512 40801a5a3756feb33f374e68e7ed743841d33f7a6b22dd2361034f182b32cdcead3ff02a7a6e16f0ffbc7b693541747b048dc606deadf7a8e490aad193e07c4d
-DIST handbrake-1.3.2.tar.bz2 16813741 BLAKE2B b59186f60d12a5478b2a34f736c9450ce6bba98f0606fc42af11c64f55b2324177302d49089003a39d0a8c1d82776211573a7c4ef1b6b6fabdbc35aed2e5cde7 SHA512 857f358a8754b08e55acfddb1431d99cc1035cf52174ab1d5243524fffe60e6cbc7d2a5d5912d55e6dc6b8ec621d503ebd21614a9064706a95c920e72a760f6a
-EBUILD handbrake-1.2.2-r3.ebuild 4053 BLAKE2B cfd4cccdeeaccdb243d14dc2ef8ffb645d69604ddab11eca57ef9c3b59a73ba6ced001f1c3b345fd6baab060408b730377229b0b967a3d7b0e2b3a3c366e4111 SHA512 948b6247b83f802106a8fb17443702f4ccc1018e34179c7df08b9d75b13ea8ae2b7888c6b7035ec00305cd05b17ebb9dcf97c119381d9d8fb5a6ba4b7b160787
-EBUILD handbrake-1.3.0-r2.ebuild 4203 BLAKE2B 89736df13485b16b800b1d8f9a06e8554b7340a007fb95fd88f260a53a76510e21f3b2c63a37cde91bbcbf87999d195d38ef0035dc3bcf8de5da77659e7620fd SHA512 bcea747db43f8fe530771480dd77c84e0cf0e58db32880d908d563a6eb00d3829e31a800662271e6a26249540fbe5123926dce2a75250bedf3e41ef2c293ed21
-EBUILD handbrake-1.3.2.ebuild 4120 BLAKE2B a9467740cca2b941eafa5c0fb01a03ddf459d5af1cd1eba6be890b814e18006888b4bba704d974ab4706280fe22d5ab977cf6570bd6a9d46e8274112d3c0f251 SHA512 61e713ca6e82650cf39dc16154489ebb74118c2bf5e0ec5246a58c04b47a0b057b73dc764b9170729b57bf28485423c26275c2ab7211fd6ef0d605e05fcfcafc
+DIST handbrake-1.3.3.tar.bz2 16804119 BLAKE2B c081029e77911dc722764b0bef04e156694f8da0caaa6aedaae13d5c1045dccfc8292a466a8df323b471ca2a9de821b94740e9826fc9e7a2877b1d59653a728a SHA512 a4cca4e45d39eb3d43441abe832e2b8398694917981fa994075e475b68297cae28039e3c75d06442194262a881b9e416e5ebd73d10f86214b95f54c35fd3088c
+EBUILD handbrake-1.3.3.ebuild 4210 BLAKE2B ce314d9b36abaa3585ae77e29857dd00c6a2e1de5ef59a0a25fbff200d19ac6bb01f5b0e19839af3a9dac014493e38346a912acbfe1f660bde0a497a16eee35a SHA512 34e6de849f3536f2a432c54de9f97a1e36fa16a80edc37f2e2ed6d890747d070bad8dd06035cc8d6c1a62da6507eba865c8b5379c28abc2a44ed5d53802f14df
 EBUILD handbrake-9999.ebuild 4141 BLAKE2B 6da162374851a5a0283c9404587e17386913dca3e39c747831007eeb8a102e4d68d828de48e99876c90848679ae0451fb62f5b7c870f676c91de6ef3847a6cbb SHA512 df20db4d5da687c300af75302890028141b9a7acbe7e09dfded90d6454dec6b1579a6ff832e3c7a6ace6377ac88d12cf8902db8e56580162296d18227f48c081
 MISC metadata.xml 1019 BLAKE2B 041873a5db7246fc3a6c6b5544fc4c28b981e6e15996c68c53413fabc46ada335333936e4e6ab160f6fad2b9eafafdb9f37d6651cb692e0d69f814acb02557f5 SHA512 41bb1e4656da0cf4a99fd158da5dcf9ccef2b4355f2cdb8e0017a84d8a65cc21ab382734dd967eaeeaf2d55c11e617e6dabe28eeb0bdd40388e8325a8e4ae42a
diff --git a/media-video/handbrake/files/handbrake-1.2.2-backport-hardware-configure.patch b/media-video/handbrake/files/handbrake-1.2.2-backport-hardware-configure.patch
deleted file mode 100644
index 0618c9004e96..000000000000
--- a/media-video/handbrake/files/handbrake-1.2.2-backport-hardware-configure.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From c7119499f5a2da7e5be0afd50a6757778fed53e7 Mon Sep 17 00:00:00 2001
-From: Bradley Sepos <bradley@bradleysepos.com>
-Date: Sat, 23 Feb 2019 11:44:34 -0500
-Subject: [PATCH] configure: Enable hardware encoders by default on suitable
- platforms.
-
-Print special encoders status at end of configure output, minor cosmetics.
----
- make/configure.py | 46 +++++++++++++++++++++++++++++-----------------
- 1 file changed, 29 insertions(+), 17 deletions(-)
-
-diff --git a/make/configure.py b/make/configure.py
-index c8bc712fe5..e673c9c5a0 100644
---- a/make/configure.py
-+++ b/make/configure.py
-@@ -1298,36 +1298,37 @@ def createCLI():
-     grp.add_option( '--disable-gtk', default=False, action='store_true', help=h )
- 
-     h = IfHost( 'disable GTK GUI update checks', '*-*-linux*', '*-*-freebsd*', none=optparse.SUPPRESS_HELP ).value
--
-     grp.add_option( '--disable-gtk-update-checks', default=False, action='store_true', help=h )
- 
-     h = IfHost( 'enable GTK GUI (mingw)', '*-*-mingw*', none=optparse.SUPPRESS_HELP ).value
-     grp.add_option( '--enable-gtk-mingw', default=False, action='store_true', help=h )
- 
-     h = IfHost( 'disable GStreamer (live preview)', '*-*-linux*', '*-*-freebsd*', none=optparse.SUPPRESS_HELP ).value
--
-     grp.add_option( '--disable-gst', default=False, action='store_true', help=h )
- 
--    h = IfHost( 'enable Intel Quick Sync Video (QSV) hardware acceleration. (Windows and Linux only)', '*-*-linux*', '*-*-mingw*', none=optparse.SUPPRESS_HELP ).value
--    grp.add_option( '--enable-qsv', default=False, action='store_true', help=h )
-+    h = IfHost( 'Intel Quick Sync Video (QSV) hardware acceleration (Windows and Linux only)', '*-*-linux*', '*-*-mingw*', none=optparse.SUPPRESS_HELP ).value
-+    grp.add_option( '--enable-qsv', dest="enable_qsv", default=host.match( '*-*-mingw*' ), action='store_true', help=(( 'enable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
-+    grp.add_option( '--disable-qsv', dest="enable_qsv", action='store_false', help=(( 'disable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
- 
--    h = IfHost( 'enable AMD VCE hardware acceleration. (Windows only)', '*-*-mingw*', none=optparse.SUPPRESS_HELP ).value
--    grp.add_option( '--enable-vce', default=False, action='store_true', help=h )
-+    h = IfHost( 'AMD VCE hardware acceleration (Windows only)', '*-*-mingw*', none=optparse.SUPPRESS_HELP ).value
-+    grp.add_option( '--enable-vce', dest="enable_vce", default=host.match( '*-*-mingw*' ), action='store_true', help=(( 'enable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
-+    grp.add_option( '--disable-vce', dest="enable_vce", action='store_false', help=(( 'disable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
- 
--    h = IfHost( 'enable x265 video encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
--    grp.add_option( '--enable-x265', dest="enable_x265", default=True, action='store_true', help=h )
--    grp.add_option( '--disable-x265', dest="enable_x265", action='store_false' )
-+    h = IfHost( 'x265 video encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
-+    grp.add_option( '--enable-x265', dest="enable_x265", default=True, action='store_true', help=(( 'enable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
-+    grp.add_option( '--disable-x265', dest="enable_x265", action='store_false', help=(( 'disable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
- 
--    h = IfHost( 'enable FDK AAC audio encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
--    grp.add_option( '--enable-fdk-aac', dest="enable_fdk_aac", default=False, action='store_true', help=h )
--    grp.add_option( '--disable-fdk-aac', dest="enable_fdk_aac", action='store_false' )
-+    h = IfHost( 'FDK AAC audio encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
-+    grp.add_option( '--enable-fdk-aac', dest="enable_fdk_aac", default=False, action='store_true', help=(( 'enable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
-+    grp.add_option( '--disable-fdk-aac', dest="enable_fdk_aac", action='store_false', help=(( 'disable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
- 
--    h = IfHost( 'enable FFmpeg AAC audio encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
--    grp.add_option( '--enable-ffmpeg-aac', dest="enable_ffmpeg_aac", default=not host.match( '*-*-darwin*' ), action='store_true', help=h )
--    grp.add_option( '--disable-ffmpeg-aac', dest="enable_ffmpeg_aac", action='store_false' )
-+    h = IfHost( 'FFmpeg AAC audio encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
-+    grp.add_option( '--enable-ffmpeg-aac', dest="enable_ffmpeg_aac", default=not host.match( '*-*-darwin*' ), action='store_true', help=(( 'enable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
-+    grp.add_option( '--disable-ffmpeg-aac', dest="enable_ffmpeg_aac", action='store_false', help=(( 'disable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
- 
--    h = IfHost( 'enable Nvidia NVEnc video encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
--    grp.add_option( '--enable-nvenc', dest="enable_nvenc", default=not (host.match( '*-*-darwin*' ) or host.match( '*-*-freebsd*' )), action='store_true', help=h )
-+    h = IfHost( 'Nvidia NVEnc video encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
-+    grp.add_option( '--enable-nvenc', dest="enable_nvenc", default=not (host.match( '*-*-darwin*' ) or host.match( '*-*-freebsd*' )), action='store_true', help=(( 'enable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
-+    grp.add_option( '--disable-nvenc', dest="enable_nvenc", action='store_false', help=(( 'disable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
- 
- 
-     cli.add_option_group( grp )
-@@ -1982,6 +1983,17 @@ class Tools:
-     else:
-         nocd = False
- 
-+    stdout.write( '%s\n' % ('-' * 79) )
-+    stdout.write( 'Configured options:\n' )
-+    stdout.write( 'Enable FDK-AAC:    %s\n' % options.enable_fdk_aac )
-+    stdout.write( 'Enable FFmpeg AAC: %s\n' % options.enable_ffmpeg_aac )
-+
-+    if IfHost( True, '*-*-linux*', '*-*-mingw*', none=False ).value is True:
-+        stdout.write( 'Enable NVEnc:      %s\n' % options.enable_nvenc )
-+        stdout.write( 'Enable QSV:        %s\n' % options.enable_qsv )
-+    if IfHost( True, '*-*-mingw*', none=False ).value is True:
-+        stdout.write( 'Enable VCE:        %s\n' % options.enable_vce )
-+
-     stdout.write( '%s\n' % ('-' * 79) )
-     if options.launch:
-         stdout.write( 'Build is finished!\n' )
diff --git a/media-video/handbrake/files/handbrake-1.2.2-fix-missing-x265-link-flag.patch b/media-video/handbrake/files/handbrake-1.2.2-fix-missing-x265-link-flag.patch
deleted file mode 100644
index a999fc325646..000000000000
--- a/media-video/handbrake/files/handbrake-1.2.2-fix-missing-x265-link-flag.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Written by: Peter Foley <pefoley2@pefoley.com>
-Gentoo Bug: #552792
-
---- ./test/module.defs.bak	2015-06-21 13:19:40.626249439 -0400
-+++ ./test/module.defs	2015-06-21 13:19:54.919757726 -0400
-@@ -25,6 +25,7 @@
- 
- ifeq (1,$(FEATURE.x265))
-     TEST.GCC.D += USE_X265
-+    TEST.GCC.l += x265
- endif
- 
- TEST.GCC.l += $(foreach m,$(MODULES.NAMES),$($m.OSL.libs))
diff --git a/media-video/handbrake/files/handbrake-1.3.0-missing-linker-flags.patch b/media-video/handbrake/files/handbrake-1.3.0-missing-linker-flags.patch
deleted file mode 100644
index 598fc7c6efaa..000000000000
--- a/media-video/handbrake/files/handbrake-1.3.0-missing-linker-flags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/gtk/configure.ac b/gtk/configure.ac
-index 92aabcbe8..1f4a1df95 100644
---- a/gtk/configure.ac
-+++ b/gtk/configure.ac
-@@ -199,7 +199,7 @@ PKG_CHECK_MODULES(GHB, [$GHB_PACKAGES])
- 
- GHB_CFLAGS="$HBINC $GHB_CFLAGS"
- 
--HB_LIBS="-lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma"
-+HB_LIBS="-lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma -ldl"
- 
- if test "x$use_fdk_aac" = "xyes" ; then
-     HB_LIBS="$HB_LIBS -lfdk-aac"
-diff --git a/test/module.defs b/test/module.defs
-index ffc00a8b2..62b01ffd5 100644
---- a/test/module.defs
-+++ b/test/module.defs
-@@ -69,6 +69,9 @@ else ifeq ($(HOST.system),linux)
- ifeq (1, $(FEATURE.numa))
-     TEST.GCC.l += numa
- endif
-+ifeq (1, $(FEATURE.x265))
-+    TEST.GCC.l += x265
-+endif
- else ifeq ($(HOST.system),kfreebsd)
-     TEST.GCC.l += pthread dl m
- else ifeq ($(HOST.system),freebsd)
diff --git a/media-video/handbrake/files/handbrake-1.3.2-x265-link.patch b/media-video/handbrake/files/handbrake-1.3.2-x265-link.patch
new file mode 100644
index 000000000000..589a204cc195
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-1.3.2-x265-link.patch
@@ -0,0 +1,12 @@
+diff -Naru a/test/module.defs b/test/module.defs
+--- a/test/module.defs	2020-05-23 17:23:21.912103481 +0200
++++ b/test/module.defs	2020-05-23 17:23:36.106103799 +0200
+@@ -16,7 +16,7 @@
+ TEST.GCC.l = \
+         ass avformat avfilter avcodec avutil swresample postproc mp3lame dvdnav \
+         dvdread fribidi \
+-        swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 \
++        swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 x265 \
+         bluray freetype xml2 bz2 z jansson harfbuzz opus speex lzma dav1d
+ 
+ ifeq (,$(filter $(HOST.system),darwin cygwin mingw))
diff --git a/media-video/handbrake/handbrake-1.2.2-r3.ebuild b/media-video/handbrake/handbrake-1.2.2-r3.ebuild
deleted file mode 100644
index 723f649b7e26..000000000000
--- a/media-video/handbrake/handbrake-1.2.2-r3.ebuild
+++ /dev/null
@@ -1,168 +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 eutils gnome2-utils python-any-r1 xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	MY_P="HandBrake-${PV}"
-	SRC_URI="https://download2.handbrake.fr/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
-HOMEPAGE="http://handbrake.fr/"
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE="+fdk gstreamer gtk libav-aac nvenc x265"
-
-REQUIRED_USE="^^ ( fdk libav-aac )"
-
-RDEPEND="
-	app-arch/xz-utils
-	media-libs/speex
-	dev-libs/jansson
-	media-libs/a52dec
-	media-libs/libass:=
-	>=media-libs/libbluray-1.0
-	media-libs/libdvdnav
-	media-libs/libdvdread
-	media-libs/libsamplerate
-	media-libs/libtheora
-	media-libs/libvorbis
-	media-libs/libvpx
-	nvenc? ( media-libs/nv-codec-headers )
-	media-libs/opus
-	media-libs/x264:=
-	media-sound/lame
-	sys-libs/zlib
-	>=media-video/ffmpeg-4.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
-	)
-	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-2.9:0= )
-	"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/yasm
-	dev-util/intltool
-	sys-devel/automake"
-
-PATCHES=(
-	# Remove libdvdnav duplication and call it on the original instead.
-	# It may work this way; if not, we should try to mimic the duplication.
-	"${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
-
-	# Remove faac dependency; TODO: figure out if we need to do this at all.
-	"${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
-
-	# Fix missing x265 link flag
-	"${FILESDIR}/${P}-fix-missing-x265-link-flag.patch"
-
-	# Allow disabling nvenc etc
-	"${FILESDIR}/${P}-backport-hardware-configure.patch"
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Get rid of leftover bundled library build definitions,
-	sed -i 's:.*\(/contrib\|contrib/\).*::g' \
-		"${S}"/make/include/main.defs \
-		|| die "Contrib removal failed."
-
-	default
-
-	cd "${S}/gtk"
-	# Don't run autogen.sh.
-	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
-	eautoreconf
-}
-
-src_configure() {
-	# Libav was replaced in 1.2 with ffmpeg by default
-	# but I've elected to not make people change their use flags for AAC
-	# as its the same code anyway
-	./configure \
-		--force \
-		--verbose \
-		--prefix="${EPREFIX}/usr" \
-		--disable-gtk-update-checks \
-		$(use_enable libav-aac ffmpeg-aac) \
-		$(use_enable fdk fdk-aac) \
-		$(use_enable gtk) \
-		$(usex !gstreamer --disable-gst) \
-		$(use_enable nvenc) \
-		$(use_enable x265) || die "Configure failed."
-}
-
-src_compile() {
-	emake -C build
-
-	# TODO: Documentation building is currently broken, try to fix it.
-	#
-	# if use doc ; then
-	# 	emake -C build doc
-	# fi
-}
-
-src_install() {
-	emake -C build DESTDIR="${D}" install
-
-	dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown
-}
-
-pkg_postinst() {
-	einfo "Gentoo builds of HandBrake are NOT SUPPORTED by upstream as they"
-	einfo "do not use the bundled (and often patched) upstream libraries."
-	einfo ""
-	einfo "Please do not raise bugs with upstream because of these ebuilds,"
-	einfo "report bugs to Gentoo's bugzilla or Multimedia forum instead."
-
-	einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
-	if use gtk ; then
-		einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
-	fi
-
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-video/handbrake/handbrake-1.3.0-r2.ebuild b/media-video/handbrake/handbrake-1.3.0-r2.ebuild
deleted file mode 100644
index e7362b5877d8..000000000000
--- a/media-video/handbrake/handbrake-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,170 +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 eutils gnome2-utils python-any-r1 xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	MY_P="HandBrake-${PV}"
-	SRC_URI="https://download2.handbrake.fr/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
-HOMEPAGE="http://handbrake.fr/"
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
-
-REQUIRED_USE="^^ ( fdk libav-aac )"
-
-RDEPEND="
-	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
-	>=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?] )
-	"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/yasm
-	dev-util/intltool
-	sys-devel/automake"
-
-PATCHES=(
-	# Remove libdvdnav duplication and call it on the original instead.
-	# It may work this way; if not, we should try to mimic the duplication.
-	"${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
-
-	# Remove faac dependency; TODO: figure out if we need to do this at all.
-	"${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
-
-	# Fix missing flags
-	"${FILESDIR}/${P}-missing-linker-flags.patch"
-
-	# Use whichever python is set by portage
-	"${FILESDIR}/${P}-dont-search-for-python.patch"
-)
-
-src_prepare() {
-	# Get rid of leftover bundled library build definitions,
-	sed -i 's:.*\(/contrib\|contrib/\).*::g' \
-		"${S}"/make/include/main.defs \
-		|| die "Contrib removal failed."
-
-	default
-
-	cd "${S}/gtk"
-	# Don't run autogen.sh.
-	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
-	eautoreconf
-}
-
-src_configure() {
-	# Libav was replaced in 1.2 with ffmpeg by default
-	# but I've elected to not make people change their use flags for AAC
-	# as its the same code anyway
-	./configure \
-		--force \
-		--verbose \
-		--prefix="${EPREFIX}/usr" \
-		--disable-gtk-update-checks \
-		--disable-flatpak \
-		--disable-gtk4 \
-		$(use_enable libav-aac ffmpeg-aac) \
-		$(use_enable fdk fdk-aac) \
-		$(usex !gtk --disable-gtk) \
-		$(usex !gstreamer --disable-gst) \
-		$(use_enable numa) \
-		$(use_enable nvenc) \
-		$(use_enable x265) || die "Configure failed."
-}
-
-src_compile() {
-	emake -C build
-
-	# TODO: Documentation building is currently broken, try to fix it.
-	#
-	# if use doc ; then
-	# 	emake -C build doc
-	# fi
-}
-
-src_install() {
-	emake -C build DESTDIR="${D}" install
-
-	dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown
-}
-
-pkg_postinst() {
-	einfo "Gentoo builds of HandBrake are NOT SUPPORTED by upstream as they"
-	einfo "do not use the bundled (and often patched) upstream libraries."
-	einfo ""
-	einfo "Please do not raise bugs with upstream because of these ebuilds,"
-	einfo "report bugs to Gentoo's bugzilla or Multimedia forum instead."
-
-	einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
-	if use gtk ; then
-		einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
-	fi
-
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-video/handbrake/handbrake-1.3.2.ebuild b/media-video/handbrake/handbrake-1.3.2.ebuild
deleted file mode 100644
index e5a5b3021946..000000000000
--- a/media-video/handbrake/handbrake-1.3.2.ebuild
+++ /dev/null
@@ -1,163 +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 eutils gnome2-utils python-any-r1 xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	MY_P="HandBrake-${PV}"
-	SRC_URI="https://github.com/HandBrake/HandBrake/releases/download/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
-HOMEPAGE="http://handbrake.fr/"
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
-
-REQUIRED_USE="^^ ( fdk libav-aac )"
-
-RDEPEND="
-	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
-	>=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?] )
-	"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/yasm
-	dev-util/intltool
-	sys-devel/automake"
-
-PATCHES=(
-	# Remove libdvdnav duplication and call it on the original instead.
-	# It may work this way; if not, we should try to mimic the duplication.
-	"${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
-
-	# Remove faac dependency; TODO: figure out if we need to do this at all.
-	"${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
-
-	# Use whichever python is set by portage
-	"${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
-)
-
-src_prepare() {
-	# Get rid of leftover bundled library build definitions,
-	sed -i 's:.*\(/contrib\|contrib/\).*::g' \
-		"${S}"/make/include/main.defs \
-		|| die "Contrib removal failed."
-
-	default
-
-	cd "${S}/gtk"
-	# Don't run autogen.sh.
-	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
-	eautoreconf
-}
-
-src_configure() {
-	# Libav was replaced in 1.2 with ffmpeg by default
-	# but I've elected to not make people change their use flags for AAC
-	# as its the same code anyway
-	./configure \
-		--force \
-		--verbose \
-		--prefix="${EPREFIX}/usr" \
-		--disable-gtk-update-checks \
-		--disable-flatpak \
-		--disable-gtk4 \
-		$(use_enable libav-aac ffmpeg-aac) \
-		$(use_enable fdk fdk-aac) \
-		$(usex !gtk --disable-gtk) \
-		$(usex !gstreamer --disable-gst) \
-		$(use_enable numa) \
-		$(use_enable nvenc) \
-		$(use_enable x265) || die "Configure failed."
-}
-
-src_compile() {
-	emake -C build
-
-	# TODO: Documentation building is currently broken, try to fix it.
-	#
-	# if use doc ; then
-	# 	emake -C build doc
-	# fi
-}
-
-src_install() {
-	emake -C build DESTDIR="${D}" install
-
-	dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown
-}
-
-pkg_postinst() {
-	einfo "Gentoo builds of HandBrake are NOT SUPPORTED by upstream as they"
-	einfo "do not use the bundled (and often patched) upstream libraries."
-	einfo ""
-	einfo "Please do not raise bugs with upstream because of these ebuilds,"
-	einfo "report bugs to Gentoo's bugzilla or Multimedia forum instead."
-
-	einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
-	if use gtk ; then
-		einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
-	fi
-
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-video/handbrake/handbrake-1.3.3.ebuild b/media-video/handbrake/handbrake-1.3.3.ebuild
new file mode 100644
index 000000000000..f99cf9d397f4
--- /dev/null
+++ b/media-video/handbrake/handbrake-1.3.3.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,8} )
+
+inherit autotools eutils gnome2-utils python-any-r1 xdg-utils
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	MY_P="HandBrake-${PV}"
+	SRC_URI="https://github.com/HandBrake/HandBrake/releases/download/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/${MY_P}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
+HOMEPAGE="http://handbrake.fr/"
+LICENSE="GPL-2"
+
+SLOT="0"
+IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
+
+REQUIRED_USE="^^ ( fdk libav-aac )"
+
+RDEPEND="
+	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
+	>=media-video/ffmpeg-4.2.1:0=[postproc,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?] )
+	"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-lang/yasm
+	dev-util/intltool
+	sys-devel/automake"
+
+PATCHES=(
+	# Remove libdvdnav duplication and call it on the original instead.
+	# It may work this way; if not, we should try to mimic the duplication.
+	"${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
+
+	# Remove faac dependency; TODO: figure out if we need to do this at all.
+	"${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
+
+	# Use whichever python is set by portage
+	"${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
+
+	# Fix x265 linkage... again #724650
+	"${FILESDIR}/${PN}-1.3.2-x265-link.patch"
+)
+
+src_prepare() {
+	# Get rid of leftover bundled library build definitions,
+	sed -i 's:.*\(/contrib\|contrib/\).*::g' \
+		"${S}"/make/include/main.defs \
+		|| die "Contrib removal failed."
+
+	default
+
+	cd "${S}/gtk"
+	# Don't run autogen.sh.
+	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
+	eautoreconf
+}
+
+src_configure() {
+	# Libav was replaced in 1.2 with ffmpeg by default
+	# but I've elected to not make people change their use flags for AAC
+	# as its the same code anyway
+	./configure \
+		--force \
+		--verbose \
+		--prefix="${EPREFIX}/usr" \
+		--disable-gtk-update-checks \
+		--disable-flatpak \
+		--disable-gtk4 \
+		$(use_enable libav-aac ffmpeg-aac) \
+		$(use_enable fdk fdk-aac) \
+		$(usex !gtk --disable-gtk) \
+		$(usex !gstreamer --disable-gst) \
+		$(use_enable numa) \
+		$(use_enable nvenc) \
+		$(use_enable x265) || die "Configure failed."
+}
+
+src_compile() {
+	emake -C build
+
+	# TODO: Documentation building is currently broken, try to fix it.
+	#
+	# if use doc ; then
+	# 	emake -C build doc
+	# fi
+}
+
+src_install() {
+	emake -C build DESTDIR="${D}" install
+
+	dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown
+}
+
+pkg_postinst() {
+	einfo "Gentoo builds of HandBrake are NOT SUPPORTED by upstream as they"
+	einfo "do not use the bundled (and often patched) upstream libraries."
+	einfo ""
+	einfo "Please do not raise bugs with upstream because of these ebuilds,"
+	einfo "report bugs to Gentoo's bugzilla or Multimedia forum instead."
+
+	einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
+	if use gtk ; then
+		einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
+	fi
+
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 26452201675f..e56369ea10ec 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,3 +1,6 @@
+AUX pipewire-0.2.7-fno-common.patch 1235 BLAKE2B 59e5c9376a3097d3427c0f0623827e3163298bb23d1888d3791504928c50850cf59d41392e78d90b07d4f5a481af60d37661a96ca47c61f939a938c54a523839 SHA512 87a67a14289b5dde0ff174e90cb94c3884ea7b3189d00b7c8fc195445a5555fbba0ee8a641edd8e1b5322508082f8c2e52c14a18a392038a9ba9c27ff470bd2b
 DIST pipewire-0.2.7.tar.gz 421644 BLAKE2B d2ccb56a9ea5ea7782678deb6eae0b0a70da1fa69e807398062d388733901839f15a2f0f7db982fbebd2b2759f443709e6c1950b6367f3ed4801d6c2d6109e73 SHA512 10d3e20cc3d233fbcd1fc39702ae3043a656ebcd9cd3c39c77f0cc2bf42ff4956fc03e7933c7b397bca446c63f45ddacea948d5ec7e4a3300499fa2794f14334
-EBUILD pipewire-0.2.7.ebuild 1601 BLAKE2B 0da14c2d7297aed2394df2a5d01385954f4e211766bee36718e564f55c1833cb6db5f04defaf8250bf699e2c56ab37a9b3c9df43abb1898877ec298799288da8 SHA512 c970d4d4d9501878b8e66c6998ee2681d418ea3fc9a645c9a8b6b3ba9486fa01e7d3fdc3ae36d42f79cf67ec243f592e69a9249baa281a0543ca32451180125a
-MISC metadata.xml 449 BLAKE2B c580fa69fbecd1046123d51f0a556bf54e7dd76a7ced768ae31289969a3fcb0c03f301a214da222201bad2cd0bcf68674807e28efcdee27edd9fa6d913cdc146 SHA512 73c4b73b417e92d1bdf802ce38939afdff2ba42bc638e0c6ba42593894755ce6f197678e8676f763bd66bb0b2bb9175c1369c173be3ab64e7323795d3b00bf0c
+DIST pipewire-0.3.6.tar.gz 968858 BLAKE2B 342b935ce1f68282cb6a1684855c7efacf24759359ca2079aade27b7d7d2699135e07c1e52afefb8924d9c8274b4cdbda98cc6c19d8aa0bf14b7202c0e0923f4 SHA512 a8d67bb6135432705d6de026074325f0cae7f01e3fe0b65fa7dafb128e5984ce126f8b4635bfbd9746777514df6f0880a78149fd007c7c1432ac29f95655ddcc
+EBUILD pipewire-0.2.7.ebuild 1650 BLAKE2B 3e94b6c00adb56c37e01df3f0adafc7d0d2115b2a27a1da3622245731ee341550f8bc8421e7d85693ca41a0a2ba17c192c06017f59e62bcd758babaf4bedfa20 SHA512 f924725947d243452b8bec1f03f7d113de2d4668ef3db18b2922a4b1695c87d4ac9def44e2d79d38fac3013a09dadb84af11fe8dc9aec4fe0ba475340f17b295
+EBUILD pipewire-0.3.6.ebuild 3307 BLAKE2B 2f7ff2c07b2bfd27dd1bfe64048b60b650bb9515f5df62d929a37103360d6b991ada116a36a9b318a671a4825522e897c482f3a897bdf1c57c42f4e74e89dc2d SHA512 961dee1d057b318f5b1eecccaf7ec9fb0bf38ffb499b86396dc3ee8b34b80a019d1b8675934c82c9d61a58f3ef57e9ac6b50e263d16e016418570dace0bb283c
+MISC metadata.xml 840 BLAKE2B a023f04c07bc9665f1379e6152ab5a831ca1977038e36263b5ab873195f8f8dc13fe8b036637831833b76406dab484ae40df4ff227991c2ec5bfaa87ecbd5e6c SHA512 8d8d7a10d8024d988356859da0430a69fd11e17cc1a854211bf0128f8dc2ce279ae23954bef39345cd0e94248de00388d7c0db5e166d6f4e0553992d3325bce3
diff --git a/media-video/pipewire/files/pipewire-0.2.7-fno-common.patch b/media-video/pipewire/files/pipewire-0.2.7-fno-common.patch
new file mode 100644
index 000000000000..f4f82ba96c08
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.2.7-fno-common.patch
@@ -0,0 +1,47 @@
+Bug: https://bugs.gentoo.org/710796
+
+--- a/spa/plugins/bluez5/a2dp-codecs.h
++++ b/spa/plugins/bluez5/a2dp-codecs.h
+@@ -284,15 +284,15 @@
+         }
+ }
+ 
+-const a2dp_sbc_t bluez_a2dp_sbc;
++extern const a2dp_sbc_t bluez_a2dp_sbc;
+ #if ENABLE_MP3
+-const a2dp_mpeg_t bluez_a2dp_mpeg;
++extern const a2dp_mpeg_t bluez_a2dp_mpeg;
+ #endif
+ #if ENABLE_AAC
+-const a2dp_aac_t bluez_a2dp_aac;
++extern const a2dp_aac_t bluez_a2dp_aac;
+ #endif
+ #if ENABLE_APTX
+-const a2dp_aptx_t bluez_a2dp_aptx;
++extern const a2dp_aptx_t bluez_a2dp_aptx;
+ #endif
+ 
+ #endif
+--- a/spa/plugins/bluez5/bluez5-monitor.c
++++ b/spa/plugins/bluez5/bluez5-monitor.c
+@@ -75,7 +75,7 @@
+ 	struct spa_list transport_list;
+ };
+ 
+-struct spa_handle_factory spa_a2dp_sink_factory;
++extern struct spa_handle_factory spa_a2dp_sink_factory;
+ 
+ static void fill_item(struct spa_bt_monitor *this, struct spa_bt_transport *transport,
+ 		struct spa_pod **result, struct spa_pod_builder *builder)
+--- a/spa/plugins/bluez5/meson.build
++++ b/spa/plugins/bluez5/meson.build
+@@ -1,7 +1,8 @@
+ 
+ bluez5_sources = ['plugin.c',
+ 		  'a2dp-sink.c',
+-                  'bluez5-monitor.c']
++		  'a2dp-codecs.c',
++		  'bluez5-monitor.c']
+ 
+ bluez5lib = shared_library('spa-bluez5',
+ 	bluez5_sources,
diff --git a/media-video/pipewire/metadata.xml b/media-video/pipewire/metadata.xml
index a5d6bb1343ab..dafe4792ddc3 100644
--- a/media-video/pipewire/metadata.xml
+++ b/media-video/pipewire/metadata.xml
@@ -12,4 +12,10 @@
 	<upstream>
 		<remote-id type="github">PipeWire/pipewire</remote-id>
 	</upstream>
+	<use>
+		<flag name="alsa">Install PipeWire alsa device for playback and record</flag>
+		<flag name="jack">Enable SPA JACK plugin and emulation to be able to run JACK applications on top of PipeWire</flag>
+		<flag name="pulseaudio">Enable emulation to be able to run PulseAudio applications on top of PipeWire</flag>
+		<flag name="vulkan">Enable vulkan spa plugin integration</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-video/pipewire/pipewire-0.2.7.ebuild b/media-video/pipewire/pipewire-0.2.7.ebuild
index f8111e7a7281..92f7f268808c 100644
--- a/media-video/pipewire/pipewire-0.2.7.ebuild
+++ b/media-video/pipewire/pipewire-0.2.7.ebuild
@@ -44,6 +44,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-fno-common.patch" )
+
 src_prepare() {
 	spa_use() {
 		if ! use ${1}; then
diff --git a/media-video/pipewire/pipewire-0.3.6.ebuild b/media-video/pipewire/pipewire-0.3.6.ebuild
new file mode 100644
index 000000000000..c6920216b8d5
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.6.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/PipeWire/pipewire.git"
+	EGIT_BRANCH="work"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/0.3"
+IUSE="+alsa bluetooth debug doc ffmpeg gstreamer jack pulseaudio systemd test vulkan X"
+
+BDEPEND="
+	app-doc/xmltoman
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	media-libs/alsa-lib
+	media-libs/libsdl2
+	media-libs/libsndfile
+	sys-apps/dbus
+	virtual/libudev
+	bluetooth? (
+		media-libs/sbc
+		net-wireless/bluez:=
+	)
+	ffmpeg? ( media-video/ffmpeg:= )
+	gstreamer? (
+		dev-libs/glib:2
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jack? ( >=media-sound/jack2-1.9.10:2 )
+	pulseaudio? (
+		dev-libs/glib:2
+		media-sound/pulseaudio
+	)
+	systemd? ( sys-apps/systemd )
+	vulkan? ( media-libs/vulkan-loader )
+	X? ( x11-libs/libX11 )
+"
+DEPEND="${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )
+"
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	spa_use() {
+		if ! in_iuse ${1} || ! use ${1}; then
+			sed -e "/^add-spa-lib.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
+				-e "/^load-module.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
+				-i src/daemon/pipewire.conf.in || die
+		fi
+	}
+
+	default
+	spa_use libcamera
+	spa_use rtkit
+	spa_use bluetooth bluez5
+	spa_use jack
+	spa_use vulkan
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dexamples=true # contains required pipewire-media-session
+		-Dman=true
+		-Dspa=true
+		-Dspa-plugins=true
+		--buildtype=$(usex debug debugoptimized plain)
+		# alsa plugin and jack/pulseaudio emulation
+		$(meson_use alsa pipewire-alsa)
+		$(meson_use jack pipewire-jack)
+		$(meson_use pulseaudio pipewire-pulseaudio)
+		# spa-plugins
+		# we install alsa support unconditionally
+		$(meson_use bluetooth bluez5)
+		$(meson_use ffmpeg)
+		$(meson_use jack)
+		$(meson_use vulkan)
+		# libcamera is not packaged
+		# misc
+		$(meson_use doc docs)
+		$(meson_use gstreamer)
+		$(meson_use systemd)
+		$(meson_use test test)
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+
+	if use alsa; then
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
+	fi
+}
+
+pkg_postinst() {
+	elog "Package has optional sys-auth/rtkit RUNTIME support that may be disabled"
+	elog "by setting DISABLE_RTKIT env var."
+	elog "To enable rtkit, uncomment the load-module line in /etc/pipewire/pipewire.conf"
+	elog
+	if use jack; then
+		elog "Please note that even though the libraries for JACK emulation have"
+		elog "been installed, this ebuild is not yet wired up to replace a JACK server."
+		elog
+	fi
+	if use pulseaudio; then
+		elog "Please note that even though the libraries for PulseAudio emulation have"
+		elog "been installed, this ebuild is not yet wired up to replace PulseAudio."
+		elog
+	fi
+	elog "Read INSTALL.md for information about ALSA plugin or JACK/PulseAudio emulation."
+}
diff --git a/media-video/qmplay2/Manifest b/media-video/qmplay2/Manifest
index 2519740557f1..28fdc692e88e 100644
--- a/media-video/qmplay2/Manifest
+++ b/media-video/qmplay2/Manifest
@@ -1,6 +1,6 @@
 DIST QMPlay2-src-20.05.02.tar.xz 1553364 BLAKE2B f436a8e970278d47ef1ade86d07fd3460c2628d7f93c238093425779f896c44b3e0c7b4c6a40ffc8b79f1749563016cb62ac853c94b236859287066bfbdbe59f SHA512 b587d80128c334450552b2a6f0fa4c7426409b4d7a7bcca2065f83eab3e2f8b7ecc0df92f50fa276f42c84a201222cae2dd7f5c3f4bbdabf321895212db936b6
 DIST qmplay2-19.12.19.tar.gz 1285009 BLAKE2B e4f644513ac0e7d33574e4b1b157dfe775222df74ba5041099e9bcaa87f8b052880dfd2c19005380783d9ca7b2bdbf7aedb233e12e2af839d40af224981d593e SHA512 a03d70c5bd3b2644810b9ec5fd39bd0340ddcc460646228a2799053a27117a54ead09f046b58ff7e0ae2cd959a92980cf8336a12d49ef297e1de30dd32f604a0
 EBUILD qmplay2-19.12.19-r2.ebuild 3482 BLAKE2B 79cd37a3a6cf4298dccfe958f7a5d2dd39d28dbf07cf60dacaf90a3a750ca5d41261086ce28c5b3ca28acf733eee2bab18c22465c486b614c0791eefe4a5bd51 SHA512 5298d2fb7995031bb24657254dfc89fb3852e02458c9fee7fae621ee4d9852e5920bb4db5ef67d0a476b66f827ec51644c6c7bb23f84a380754b0d4597a63b71
-EBUILD qmplay2-20.05.02.ebuild 3568 BLAKE2B c0bc46703a4c2741f37a0e3bd876cc35e3b91b564ec444043685e38e9dbac280d507a0080558d9d8da7261ae06fef9cbb01363ce432d270d182824c23d977ce5 SHA512 8bf66ca740baa00bf00da12a089ce1b97f6dec21bc8978b47ae0727a9a65d1c6f157ddfd6a37db2932aa277d5287ae72ac2b0fc031ca952fe8230cd9f42309bc
-EBUILD qmplay2-9999.ebuild 3568 BLAKE2B c0bc46703a4c2741f37a0e3bd876cc35e3b91b564ec444043685e38e9dbac280d507a0080558d9d8da7261ae06fef9cbb01363ce432d270d182824c23d977ce5 SHA512 8bf66ca740baa00bf00da12a089ce1b97f6dec21bc8978b47ae0727a9a65d1c6f157ddfd6a37db2932aa277d5287ae72ac2b0fc031ca952fe8230cd9f42309bc
+EBUILD qmplay2-20.05.02.ebuild 3577 BLAKE2B 01d9a11780e3ef63e9c5e60cd65cd2649090f1e9cd8f4928b8f00296fa99c602458622dab63f282d3e5ab143d0f2e7b422be783d16bc75c37603e97c05633454 SHA512 3e60673d0c778b37ecb80390b2dc7d21b3e6997b7593cefd8730244b17220ba9b87d0ef03b050b2ec8c41968a97ed856f617791e677cedbedcfbddfd273b4c85
+EBUILD qmplay2-9999.ebuild 3577 BLAKE2B 01d9a11780e3ef63e9c5e60cd65cd2649090f1e9cd8f4928b8f00296fa99c602458622dab63f282d3e5ab143d0f2e7b422be783d16bc75c37603e97c05633454 SHA512 3e60673d0c778b37ecb80390b2dc7d21b3e6997b7593cefd8730244b17220ba9b87d0ef03b050b2ec8c41968a97ed856f617791e677cedbedcfbddfd273b4c85
 MISC metadata.xml 1822 BLAKE2B d6c18ae3653d2a809609ed350c20796a690ecb69e5f3b9b06d134524596379f8ebfb565b22c584a3fccff153b0771ede17d67c91d029f6e26668ba91e0ee5d79 SHA512 5ed1acf242b8e02dd3f31564000b13dc91c9c25f750ba6f93a296e5fa9c83b48a0a6c92f868a5b088187870af8b3c345ab0c79935e8afcea7f86125ceed80afc
diff --git a/media-video/qmplay2/qmplay2-20.05.02.ebuild b/media-video/qmplay2/qmplay2-20.05.02.ebuild
index 9556ffd4007a..264d28c79f26 100644
--- a/media-video/qmplay2/qmplay2-20.05.02.ebuild
+++ b/media-video/qmplay2/qmplay2-20.05.02.ebuild
@@ -52,7 +52,7 @@ RDEPEND="
 	portaudio? ( media-libs/portaudio )
 	pulseaudio? ( media-sound/pulseaudio )
 	sid? ( media-libs/libsidplayfp )
-	shaders? ( media-libs/shaderc )
+	shaders? ( >=media-libs/shaderc-2020.1 )
 	vaapi? (
 		>=media-video/ffmpeg-4.1.3[vaapi]
 		x11-libs/libva[drm,opengl]
diff --git a/media-video/qmplay2/qmplay2-9999.ebuild b/media-video/qmplay2/qmplay2-9999.ebuild
index 9556ffd4007a..264d28c79f26 100644
--- a/media-video/qmplay2/qmplay2-9999.ebuild
+++ b/media-video/qmplay2/qmplay2-9999.ebuild
@@ -52,7 +52,7 @@ RDEPEND="
 	portaudio? ( media-libs/portaudio )
 	pulseaudio? ( media-sound/pulseaudio )
 	sid? ( media-libs/libsidplayfp )
-	shaders? ( media-libs/shaderc )
+	shaders? ( >=media-libs/shaderc-2020.1 )
 	vaapi? (
 		>=media-video/ffmpeg-4.1.3[vaapi]
 		x11-libs/libva[drm,opengl]
diff --git a/media-video/rtmpdump/Manifest b/media-video/rtmpdump/Manifest
index b43148f0fce9..d170d8ddcc0f 100644
--- a/media-video/rtmpdump/Manifest
+++ b/media-video/rtmpdump/Manifest
@@ -2,6 +2,6 @@ AUX rtmpdump-openssl-1.1-v2.patch 8964 BLAKE2B 7ac621cafbbd159a9e143f0c0108c4b08
 AUX rtmpdump-swf_vertification_type_2.patch 545 BLAKE2B e6db03f060ead7122029f15c0cc259e04863c2d5d0d2509a21de69f7fc61c1d3fb0ac062759c52e22e60733acdfb495cb4e6892ba7acb8e1f36ce1fe42f3ccd9 SHA512 5b5b4582b488429f8192b1158903047986d8ebc117c2ed81f7ab18bf59bcf8b8f6bc9a38fae89aff04af2342ca1362288a39516660f2163b94781c838652ad06
 AUX rtmpdump-swf_vertification_type_2_part_2.patch 868 BLAKE2B a5014fdc8bcf2cecbe5120297d4563c7d396e54c34e5f6dddf420fcfdbea4797c865daa0750cb1fa65f7c959d36381ce257ec48b3f4f377ce9ead3b3fe4cf833 SHA512 a0c1c46561384961bbb45962d416664cbd7a4a8c2e16eda4370d9acf76be809541ade182e41320102f252ed4e69dd2d6a0de37ad4085b52a22dc6ff0135d8894
 DIST rtmpdump-2.4_p20161210.tar.gz 142837 BLAKE2B 412a7c3b21738db643042e51e03b11e115ae1d68214e644374e8c10f3b2ab3f659ce1af884135d0e89f2e0ba44ebdf41937bc0f02d875c463ca711d9ae95698c SHA512 76617f02c13d7e8e3a7cf2734c6174e56fb321a881c9e4869bf6393786b193e0c01a8c530ecbf0679cc888c523af5712f2dcb2031fbd09729b7ddeebc3a4b133
-EBUILD rtmpdump-2.4_p20161210-r3.ebuild 2778 BLAKE2B 9e992da54eaad0a8405b97a44f8a05d610030ff5762a587db6aae6a031ccbcb0bb6c8298ec8aad894d6e8c731c9b3ed15380927becbf6f47b4bdf3913853ec48 SHA512 845d378734781425df19b954bf2cf4c2c710661f0134cf7bfdc746fd488b1c51d9a8c63a729e1a4676489b13a0b4f775a5748085daa9bd426ddbbe4bdccfdd71
-EBUILD rtmpdump-9999.ebuild 2785 BLAKE2B 4ee052f08bb7464b2863e14139019d0182b6d0ce381bf9becac48929e9385747aaaea7866c1c848bbfa0807f4aee4fd193cbf6a7eaa624e0e4fc1a2511f32f85 SHA512 aa7f3333948d0503599ff72ac3aebb9ccf2bd0901f69c6f6c2b9d3fb9fefb66ad18c2960070dc9a621cb5f801b62f699c9dcf9fa84c3a61265213b1417432545
+EBUILD rtmpdump-2.4_p20161210-r3.ebuild 2795 BLAKE2B 1719b876e6fa430158036323f3a29e5c47080df2e94876419d7c2bfd67b5a54e86938d0d4b8e3a77486a01de154beb9f759e9a9c402fa4d34234dbe6f1f24de5 SHA512 b3dc94d290e431d443d6ef7b20c149fcf20315dbded2dd2e93e997613a3181a5ce0e2a5bfeb4edfcfca544fbdeb05b18fd66c0acb3de1186715cf9a4e466a658
+EBUILD rtmpdump-9999.ebuild 2802 BLAKE2B 1f5f3de61c20ae9e0431f4aac81185b395cc852ef62eb64993b8e2cd167b34d1990853b3c54047773bac5147adfc0b9ba7fd8f689a80cea63b426af0d23d0a27 SHA512 a4449a69bf67afcd7f03c087667e26c76fe6f17eece0f742e9942d761dee92a15d899781c2e05a10bdeac78c341c2a94a939c6a7baed5435cd8f00454d619b26
 MISC metadata.xml 444 BLAKE2B 97f64854abc028cf6eb902008992a94e434db6de7258b8065666b31af4b92118044e4c3427792782cf7ac7a2eb8bb0fbaee047027ca2f648178cc07f46c6ac88 SHA512 38b9987993f4a3ed479c50aeda81436a8cbec7ad48c1e509fc351a58557c3922fe0834a680cda9996a5c5ca1b0b48377772e3eef775281eb40962f95ac095e7c
diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
index 09a4ebf6598d..a3b8a59caac3 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
@@ -85,7 +85,7 @@ multilib_src_compile() {
 	if ! multilib_is_native_abi; then
 		cd librtmp || die
 	fi
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
 		OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" SYS=posix
 }
 
diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index df14880ddc1b..4e6b50ef0fc2 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -85,7 +85,7 @@ multilib_src_compile() {
 	if ! multilib_is_native_abi; then
 		cd librtmp || die
 	fi
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
 		OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" SYS=posix
 }
 
diff --git a/media-video/smtube/Manifest b/media-video/smtube/Manifest
index 9d661dc3f7ed..fcbdd22a26e2 100644
--- a/media-video/smtube/Manifest
+++ b/media-video/smtube/Manifest
@@ -1,5 +1,3 @@
-DIST smtube-19.6.0.tar.bz2 748844 BLAKE2B 55e662fc85ec44f067cba037c28b26fbfe08439bafea294dfcd1c4187e8df9f1f066780dd80c765dc4e584ba5b3917d8982a46253039b6327a30ff9d842b9e0b SHA512 f61e432b8f99e34ddbd9415064eecf30c9a3a6731d646073253d63690cf531321a7a5038117db981d036d1abfdbd3150df21bc22c9ae75e32c63ade3a859ecef
 DIST smtube-20.1.0.tar.bz2 749306 BLAKE2B 27d8b8c45264311f324d826768c44750373161521e8a3a9778b7b929d2ac437cfbfa9131b772c19d065d6a9e7646a381a2dd52c0e4fdf1d7a202ce982f22d9e2 SHA512 91a3b53c7bf23b567cc9e35f6c12cfc37e4286c0b60938d4ea9e275f1f459db6ff149f3b316b05a4810a62b0f224ee360ecf10f1e5c1d101178a949280eb8e2f
-EBUILD smtube-19.6.0.ebuild 1306 BLAKE2B 8fb0f5bccd487400fd3b26c66c97ab0f1582ff6cbb7ee163795f085d9db74c71da2c4e1b23832f2c0b73343f976bb755bc95ac469f381925f55ca85c8bbc481a SHA512 bd3b4bd7fcf47036a34e54d9a352930f6a1913f38b0af5ecfce420ccb6c8012ec089ea41f57457a7ace1ca79223cbdd709016c410b023dd7e1af0c3241a97b43
-EBUILD smtube-20.1.0.ebuild 1308 BLAKE2B 15e21bebefdb0c52dc0090d52b7246044cc6b84005e02adbce0e4f18b19ceb5c2a4940b4bd5001d27231368d5e0f85f179ea61e702272071f9fc327232984ba1 SHA512 fa5238315c00f9fcc9e4053a48391342916a04a91a0b482d9b3748fdad7105e779207af8807eb92e04ce11f8aefb9a1a6621317e0da4a5882a6fb0b7cc1a1fa1
+EBUILD smtube-20.1.0.ebuild 1306 BLAKE2B 3c8ad51442652631a17c260f16bc67bd52bd3a5ae54d1d7b7b411bff3882bc6011382b748ad3242bfb65f770bbc30c1d01948fe149c355705fb42cfe205a0222 SHA512 84b304fd20588584e7b1af62fbe68e436f7b7468a2d0bbf264a4c3967471b9534152e0bfb2d63c312b422913da87c515869b7c630a37dd11fb3911615182274c
 MISC metadata.xml 553 BLAKE2B 5818030e41958376eb0a4566f79a245d8bd1142dbcbf56aaeb21434e4194d2e8c7208bfd7b7e15b11f688f0e8ef47be2e1748740883a09cce1cda04836a70e24 SHA512 0e833e9f3075e066d059871c97bc951acb2d68152719388b9c1eb92776f50822585c88f662e8c5544ef15861f11bd76e469a34c593c98f3bc76ccf898eb202a6
diff --git a/media-video/smtube/smtube-19.6.0.ebuild b/media-video/smtube/smtube-19.6.0.ebuild
deleted file mode 100644
index 833814a95ebb..000000000000
--- a/media-video/smtube/smtube-19.6.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
-
-PLOCALES="bg cs da de en_GB en es eu fr gl he_IL hr hu it ja ko ms nn_NO pl pt_BR pt ru sq sr tr uk zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-inherit desktop l10n qmake-utils
-
-DESCRIPTION="YouTube Browser for SMPlayer"
-HOMEPAGE="http://smplayer.sourceforge.net/smtube"
-SRC_URI="mirror://sourceforge/smtube/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtscript:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}
-	|| (
-		media-video/smplayer
-		media-video/mpv
-		media-video/mplayer
-		media-video/vlc
-		media-video/totem
-	)
-"
-
-gen_translation() {
-	"$(qt5_get_bindir)"/lrelease ${PN}_${1}.ts
-	eend $? || die "failed to generate $1 translation"
-}
-
-src_compile() {
-	eqmake5 src/${PN}.pro
-	emake
-
-	cd src/translations || die
-	l10n_for_each_locale_do gen_translation
-}
-
-install_locale() {
-	insinto /usr/share/${PN}/translations
-	doins src/translations/${PN}_${1}.qm
-	eend $? || die "failed to install $1 translation"
-}
-
-src_install() {
-	dobin ${PN}
-	domenu ${PN}.desktop
-	newicon icons/${PN}_64.png ${PN}.png
-	dodoc Changelog
-
-	l10n_for_each_locale_do install_locale
-}
diff --git a/media-video/smtube/smtube-20.1.0.ebuild b/media-video/smtube/smtube-20.1.0.ebuild
index 6cb45ba9dad7..000bf6ac2613 100644
--- a/media-video/smtube/smtube-20.1.0.ebuild
+++ b/media-video/smtube/smtube-20.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/smtube/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
diff --git a/media-video/vdrtools-genindex/Manifest b/media-video/vdrtools-genindex/Manifest
index c2bd5bcd3273..35d109e9b22e 100644
--- a/media-video/vdrtools-genindex/Manifest
+++ b/media-video/vdrtools-genindex/Manifest
@@ -1,5 +1,5 @@
 AUX ldflags.diff 410 BLAKE2B 19216fbd738658dcf718697032c2635dc2f091ecfacfedabf82dafbce98abc7a561e508a9cdf0e1f61d4b8cf58c6ecfb8fea2542c6b4a0470300336e99761847 SHA512 dd5b68ce2c0712e84522c336ff15067dc0a95a93696d1349273b160e7013d478d92d78867c9a9bafdf4e1e77ee3ca2e4edf33ea6f960ae86131e104076dd27e6
 DIST genindex-0.1.3.tar.gz 20958 BLAKE2B a7b978e7cab3ee2bdd8ed38490ac9b8ea7c394a55e2209ad4a5bc0c0ba4fd8580f847c9f647e34923acfd65c3da806484c815e98282e3ec02310b15f89cbdffc SHA512 1fb95fa99128a9cc62c684cf44383fbb837918d6911a3a34a107cf62eb73c16275128100d8eedc05c044382910584b2dd1c2dd94ecd3a896363d900e9b185972
 EBUILD vdrtools-genindex-0.1.3-r1.ebuild 484 BLAKE2B b9b90ad613c693afaff4231a7c31292ec3fe702fa6540aa3c468ad6f21429095a1fb476d6061be93790e6d6206ed8674afe0362f42569c54e117ac8f55195394 SHA512 7912206db442a3b213714cff853aab8a108f1c83c6833af725727e915e512e257b1443baa48a7ce7ef485c6ab716fdea98f72be27ac8d5257eb54fdf59d18332
-EBUILD vdrtools-genindex-0.1.3-r2.ebuild 554 BLAKE2B 8c39a81b2675d1a76a4c114f03fcf557c0cfbdc16121c458c06ea887b838d5ec3bed0f464ca9acf79b499512a223a7facddbe94114172b8bed8bc9dd50504f4c SHA512 164c93c3c1c93b526b35bf276f1cc017f51a0ce20bca48420fab4fb38f64bfb0f05cecedec35bc4425b4364b06800221cfb745467aae56268731ebf61effc2fb
+EBUILD vdrtools-genindex-0.1.3-r2.ebuild 553 BLAKE2B bd5ab77374682841db2db7c9648d763c340770e6b5386ecb80f6dcfe134852b83347cf3d610a79e84e8a2b760aa79824023f2fdce77d4d32418229b3d2c163d8 SHA512 160902ba8368fcfead7f4711caa7999a0ffee1a88bf05e6ddde9fba356a496532ecf67a436153cb8705c452e0c9bb3e19e48cf0f0634e36e1bfeb5091d243709
 MISC metadata.xml 365 BLAKE2B 027b911072475ad8825d9fab304fe6f03aa786d5fbbfd5b2611d9f34f899ba60a61dcda5ff6a05c42e09b65be5ccbeace9a0fdc04968d115ba0cf2f180449d4c SHA512 6fab8091df4f66b5c3c09c45a17ed4872143d1763377cd5cd816210c051cb1176950f644b31fdba8988852958fb832c1efceac13a0bba8643a767275c17e0f5b
diff --git a/media-video/vdrtools-genindex/vdrtools-genindex-0.1.3-r2.ebuild b/media-video/vdrtools-genindex/vdrtools-genindex-0.1.3-r2.ebuild
index d3261210e222..3ec03fcdb001 100644
--- a/media-video/vdrtools-genindex/vdrtools-genindex-0.1.3-r2.ebuild
+++ b/media-video/vdrtools-genindex/vdrtools-genindex-0.1.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.muempf.de/down/${SCRIPT}-${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 S=${WORKDIR}/${SCRIPT}-${PV}
 
diff --git a/media-video/yle-dl/Manifest b/media-video/yle-dl/Manifest
index fa08a062448c..c25f0da57f1d 100644
--- a/media-video/yle-dl/Manifest
+++ b/media-video/yle-dl/Manifest
@@ -1,5 +1,5 @@
 DIST yle-dl-20200419.tar.gz 87267 BLAKE2B 2637620758c1a083502eb9468bbe5e7353855051c3379d448f6a4b9adcf8113293e4a7a8887138df68fcfd16938ab3846034a8f57cb9d366467a22c23b53ebaa SHA512 3d064e080e0c9172e15134eaa179ae96240ed9fc74a7a8a9a9aa18049397e0fea62465f5768db488928f23af1fa1195d78a8a4a6bbafcab4bcda6d05cda70ccf
-DIST yle-dl-20200618.tar.gz 84932 BLAKE2B 686849db71eccbf94787bb913c41a43e65bd57b8acdec090af675ffd10dec3929f4d742d040b0e248606e086d76b7699fa11179e449811d36c821c9646e92dbb SHA512 21ffeec2939a10f48a83265df06769337bd78bc121e58f25e05e1607c93c9d2c07cb592fe934496db0f647f9e551bf903a3401a13a2f6708db3e3cb48eaa3260
+DIST yle-dl-20200628.tar.gz 61748 BLAKE2B 1de2d426e8d871aef8d9ad1ee896b28cc79601bd13712a9e646a313ec52cdb2e2e979b74ea612fdab0c309a8fa37e3c1226bac29461410dbc85f976b1277e1ca SHA512 0f6880779392a1f47138a3757cbd08158d6832b35dff15193faa8937338ef791e03f4e5308f71fe0b6f4515092f681f9dad6a41a9ed32254757a44af34486070
 EBUILD yle-dl-20200419.ebuild 1991 BLAKE2B 45b62f2c5c0edc407c076bba5d0124b738d9cb6122c559ddaa9cefdfd5ef44cbd9522d609c9230ff0aa641896414f387a95287b6d1d469a31bdf166a26119fe7 SHA512 19c6ebad053e90841f3ab6132cc702da9d6685e421b6b2af59955e5c7a27c383811850c02c40ad58952788426d9e94c38572510b007e5fa5f41cca0f24380e17
-EBUILD yle-dl-20200618.ebuild 1655 BLAKE2B e2dc93cafd7f8d477f7bacebc9c52a0257862a4085a93a7b734d55d3cd64d0912f962d11c72d28dd0f3e239a832c5f6515fa6d1fdd3acc69cd60f5b6fe1a8fdc SHA512 78a7c2e4948e7d431280bd7c647796682136798a3e9e9132455b656482fd09392e541d2fc57a75a46bad73186fb442ab4da75c54b15047cd80cfc5cc512cf9c5
+EBUILD yle-dl-20200628.ebuild 1541 BLAKE2B 1a080b30a0888c89aeb9c4114ba6536f90f4b2be6028ce18b4de59f13a9cbb1381d38131415ef81b653882b2d141de7dda63c4cf45999e95d91345b55eef0a92 SHA512 f3cfdca67cf5749bff9edbb5fbb9573c64d069e733b17db8c2948bc81ed1163406932801fc90ab79d1e5fe6d241fb35cb122ed90ede1ea8b9da93422dbc579a6
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/media-video/yle-dl/yle-dl-20200618.ebuild b/media-video/yle-dl/yle-dl-20200618.ebuild
deleted file mode 100644
index bd1cb08e0904..000000000000
--- a/media-video/yle-dl/yle-dl-20200618.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..8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Download media files from Yle Areena"
-HOMEPAGE="https://aajanki.github.io/yle-dl/ https://github.com/aajanki/yle-dl"
-SRC_URI="https://github.com/aajanki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Requires an active internet connection during tests,
-# FEATURES="-network-sandbox" to test.
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-	media-video/ffmpeg
-	net-misc/wget
-	>=dev-python/attrs-18.1.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.13.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/mini-amf[${PYTHON_USEDEP}]
-	dev-python/progress[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="test? (
-		${RDEPEND}
-		media-video/ffmpeg[gnutls]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-BDEPEND="${PYTHON_DEPS}"
-
-distutils_enable_tests setup.py
-
-DOCS=( COPYING ChangeLog README.fi README.md yledl.conf.sample )
-
-src_install() {
-	docompress -x "/usr/share/doc/${PF}/yledl.conf.sample"
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	elog "Sample configuration file has been installed to "
-	elog " /usr/share/doc/yle-dl-${PV}/yledl.conf.sample"
-	elog ""
-	elog "Optional download engines: "
-	optfeature "php download engine using rtmpdump" "dev-lang/php:*[bcmath,cli,curl,simplexml] media-video/rtmpdump"
-	optfeature "youtube-dl download engine" net-misc/youtube-dl
-}
diff --git a/media-video/yle-dl/yle-dl-20200628.ebuild b/media-video/yle-dl/yle-dl-20200628.ebuild
new file mode 100644
index 000000000000..645801818b99
--- /dev/null
+++ b/media-video/yle-dl/yle-dl-20200628.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..8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Download media files from Yle Areena"
+HOMEPAGE="https://aajanki.github.io/yle-dl/ https://github.com/aajanki/yle-dl"
+SRC_URI="https://github.com/aajanki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Requires an active internet connection during tests,
+# FEATURES="-network-sandbox" to test.
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+	media-video/ffmpeg
+	net-misc/wget
+	>=dev-python/attrs-18.1.0[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.13.0[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/mini-amf[${PYTHON_USEDEP}]
+	dev-python/progress[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]"
+DEPEND="test? (
+		${RDEPEND}
+		media-video/ffmpeg[gnutls]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+BDEPEND="${PYTHON_DEPS}"
+
+distutils_enable_tests setup.py
+
+DOCS=( COPYING ChangeLog README.fi README.md yledl.conf.sample )
+
+src_install() {
+	docompress -x "/usr/share/doc/${PF}/yledl.conf.sample"
+	distutils-r1_src_install
+}
+
+pkg_postinst() {
+	elog "Sample configuration file has been installed to "
+	elog " /usr/share/doc/yle-dl-${PV}/yledl.conf.sample"
+	elog ""
+	elog "Optional download engines: "
+	optfeature "youtube-dl download engine" net-misc/youtube-dl
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 206fa16cb264..ea63bb20f0f7 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 03b6be48b1f2..3ac069bd3848 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 21 Jun 2020 11:38:26 +0000
+Mon, 29 Jun 2020 10:08:19 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 0ed418e0af93..05c6134ae77d 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 469221 BLAKE2B ceeb5e3ff11ecad175899479757b8424d4d844fbe59abeeee4a4b37448f6dfffdc8ded3f1362c29de1347def4ee57e7dcf15cbd83f40a9103e7b370e3a3097d7 SHA512 06b8c8870a2821eeebd3c9cbc9c92177635bbaa84ef8cdb537ff7ec57048cf77711fd0d737d476fd8724d0474477b8411e09d5263aca5af221eea2a2cd8fc8a3
-TIMESTAMP 2020-06-21T11:38:29Z
+MANIFEST Manifest.files.gz 469226 BLAKE2B 7802023c2e2f34c26e4ab80c5dc66d82df62eae23b930c29c3bebb5b4ded87a3a117438be8d0fe26990389a3a2947f4151a8aecdd768fcd1388a595c78cd7d73 SHA512 c8862da9c01fac7f061d6ed989c78046fca0143f6f6c82ce4d8c8662fe53725e542bc7eb68e3936d66230eedcea6132083a3412ca73bd3a83c42808079029d0e
+TIMESTAMP 2020-06-29T10:08:22Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl7vRrVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl75vZdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAh+hAAtNZ9jtU/9lytqA7E1WGywHwORbcCrRnFNij83LtAF/yPwAeOysFDwhuh
-i2gF3spsNR6wb+tz6TTFuRUWsiWn+XekW9buaHr/20GkjoIYtES7BswHwwinMxxB
-BxwpVY+x3EvmWX7ra8bqAsL1RulfERwAXosUbIMP0W7Med7EFpsYqmSAlxTiGMpa
-R0GP5RxBfhnF4+PKT0zxoTbGhqRJPLIcqJdojry2TNVs0vocKumBfCQZG8E/hatN
-dgRCz961+C4o/z/XAvQXK483tCPdlIk7URCwYwuaqd0HQMDTaBZQi2RVi8rcqPA1
-0aUUWMBXMb2/cFjuqzlpuxTLMPyICSKgcPZ5w/VHOxIpcafnbz5AUSqA6AysqFRH
-17D3sa8n4x/eMaE72ZO/mLmUPc5icBe36Fwi4fErzrY5jOoU3YIP2ng2xuc67IGe
-GxFKJIF8/7Jr8Y4a+2pFX3i4x38U3mo8USDQ9mHW+SbU5ex2sTOB0KIN3sB3OR1e
-qqZNduNIisZXq+OVt5qNchLHflp0apYt+vuPSbynBH6sOtH+0gS2nMRpUQ4nHT3T
-yM7EPqPAdEXwNIkbyDXC4B5+1/Mr4nY6Y9BzQK0O6CGTWuFaXSmiIQ6iy0NdRiEj
-JZOdPujjB2ZPiaGqGQtq43LzOXKyPatTkMo8ITy8V51u6i0XEqE=
-=DUAj
+klAJjg/+IkSExgArBN8JvMGptNveTfhyQMtWm0f/0JFTN4qpNEQFgqmOLizukbtP
+uOaUtIPd9hlksLD3G5+CWFDyQ8+21bdnvnqhjG5mUmdmDvJHKhBF9SobtfPJfANR
+uyCU84xpjg0XtCCFOMQxp2bPeA79jjgDFxHoQulLL4DYO/by4tIr9boXOlLwLTDx
+/rQODGNOh28/58FhiUTaiLW/t7CJqTIGbnJCgvPEBQ60scInPjZ4YnLSdeR2vNiD
+/sR7/N5Z2pAUgXnSffmVR/hSVTTsdMsxAmFCXOzrJs5Aw4fLW7Bm9IQ2EWg8qtq/
+44sOAMZ3c4k29CFTjQ6VcjveDCICzn3iGFDxQhZS47wPQ8+N2ywGIRe3Kd1oXy6b
+/lwONLK8lFBFReK1xR8BwDxECH0wQvmjtQ2WljGZYZ4cwfT8iSxrCHZOp6yCoEec
+Mby+IQau9XFw4yJdXWXRyio25jss3kQ9e1+0i37f4tLRLYw9dgVdabMpTeorrYPW
+bQW86RIypNk+UlaQ26an9gY9C2+VFF2CdXTUTYZn9gdTa0SkFvBxqOZe/+6Mp9Fy
+dmVYjPh8SXw4hQhs0r58apQb733lg4P/BqBlSXYV3ezX+xdGlDIADCoD24N4dRdl
+3zkvBk7SJQ+r3YzjwhWPOy9SRtUGz1S6BTluEm4Yjb0oserFn7o=
+=a4VR
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index 9077094066b3..48dd3882a070 100644
--- a/metadata/glsa/Manifest.files.gz
+++ b/metadata/glsa/Manifest.files.gz
diff --git a/metadata/glsa/glsa-202003-43.xml b/metadata/glsa/glsa-202003-43.xml
index 12f723cb9665..d07350f36504 100644
--- a/metadata/glsa/glsa-202003-43.xml
+++ b/metadata/glsa/glsa-202003-43.xml
@@ -7,16 +7,17 @@
   </synopsis>
   <product type="ebuild">tomcat</product>
   <announced>2020-03-19</announced>
-  <revised count="2">2020-03-20</revised>
+  <revised count="3">2020-06-26</revised>
   <bug>692402</bug>
   <bug>706208</bug>
   <bug>710656</bug>
   <access>remote</access>
   <affected>
     <package name="www-servers/tomcat" auto="yes" arch="*">
-      <unaffected range="rge">8.5.51</unaffected>
-      <unaffected range="rge">7.0.100</unaffected>
-      <vulnerable range="lt">8.5.51</vulnerable>
+      <unaffected range="ge" slot="8.5">8.5.51</unaffected>
+      <unaffected range="ge" slot="7">7.0.100</unaffected>
+      <vulnerable range="lt" slot="8.5">8.5.51</vulnerable>
+      <vulnerable range="lt" slot="7">7.0.100</vulnerable>
     </package>
   </affected>
   <background>
@@ -58,5 +59,5 @@
     <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-1938">CVE-2020-1938</uri>
   </references>
   <metadata tag="requester" timestamp="2020-03-19T17:09:01Z">whissi</metadata>
-  <metadata tag="submitter" timestamp="2020-03-20T21:02:49Z">whissi</metadata>
+  <metadata tag="submitter" timestamp="2020-06-26T19:38:55Z">whissi</metadata>
 </glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 03b6be48b1f2..3ac069bd3848 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 21 Jun 2020 11:38:26 +0000
+Mon, 29 Jun 2020 10:08:19 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index 4906fc32ac0a..5b35d35831c1 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-f51c88fbf8e00dbbe6f151e02b823400a85889ba 1592236707 2020-06-15T15:58:27+00:00
+09c33520f8549f6a3210280c21940e14768be95d 1593200484 2020-06-26T19:41:24+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 0b0e784e8b99..8f190614ac99 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 9009c2b4a671..382d18803d6c 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/cvmfs-0 b/metadata/md5-cache/acct-group/cvmfs-0
new file mode 100644
index 000000000000..69a3c5f4304a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/cvmfs-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=preinst pretend
+DESCRIPTION=Group for the CernVM-FS network file system
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~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	b2fc98881af84e4c35840090037852e1	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=bce6a558bee7690a1e94911659342e53
diff --git a/metadata/md5-cache/acct-group/sabnzbd-0 b/metadata/md5-cache/acct-group/sabnzbd-0
new file mode 100644
index 000000000000..4048428262a2
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sabnzbd-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=preinst pretend
+DESCRIPTION=SABnzbd program group
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~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	b2fc98881af84e4c35840090037852e1	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=d4ca27db09b666561e15572145fec31e
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index a64fc0a2c304..d73b5d97b8bc 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/cvmfs-0 b/metadata/md5-cache/acct-user/cvmfs-0
new file mode 100644
index 000000000000..beda9d48b8ca
--- /dev/null
+++ b/metadata/md5-cache/acct-user/cvmfs-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the CernVM-FS network file system
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~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/cvmfs
+SLOT=0
+_eclasses_=acct-user	4c04090a102bda57f50a5e6e4f8bd973	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=fe7a733faa9a9c32a75c5fc230bce8e7
diff --git a/metadata/md5-cache/acct-user/sabnzbd-0 b/metadata/md5-cache/acct-user/sabnzbd-0
new file mode 100644
index 000000000000..068eb7436a3f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sabnzbd-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=SABnzbd program user
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~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/sabnzbd
+SLOT=0
+_eclasses_=acct-user	4c04090a102bda57f50a5e6e4f8bd973	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=e342f7970b144b9cba099cff8e207542
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index 52d32a35b849..58657258902c 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/caribou-0.4.21-r1 b/metadata/md5-cache/app-accessibility/caribou-0.4.21-r1
index 619849ec1520..263aebdc52fd 100644
--- a/metadata/md5-cache/app-accessibility/caribou-0.4.21-r1
+++ b/metadata/md5-cache/app-accessibility/caribou-0.4.21-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Input assistive technology intended for switch and pointer users
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Caribou
 IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+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_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=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] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=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/glib[dbus] >=dev-python/pyatspi-2.1.90[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=gnome-base/gsettings-desktop-schemas-3 gnome-base/librsvg:2 sys-apps/dbus
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/caribou/0.4/caribou-0.4.21.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f68299dbefb3c66cf931059a32172733
+_md5_=180b8be13b0b6b3b1e92544c6cccb493
diff --git a/metadata/md5-cache/app-accessibility/espeakup-0.71-r1 b/metadata/md5-cache/app-accessibility/espeakup-0.71-r1
index 24ccbee186a6..49a3c00cc204 100644
--- a/metadata/md5-cache/app-accessibility/espeakup-0.71-r1
+++ b/metadata/md5-cache/app-accessibility/espeakup-0.71-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=|| ( app-accessibility/espeak[portaudio] app-accessibility/espeak[pulseaudio] )
 SLOT=0
 SRC_URI=mirror://gentoo/espeakup-0.71.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=26c2c79deae8213e4b10d61e86ded54d
diff --git a/metadata/md5-cache/app-accessibility/espeakup-0.80 b/metadata/md5-cache/app-accessibility/espeakup-0.80
index aea80f7140f5..ee67280ce58e 100644
--- a/metadata/md5-cache/app-accessibility/espeakup-0.80
+++ b/metadata/md5-cache/app-accessibility/espeakup-0.80
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=|| ( app-accessibility/espeak[portaudio] app-accessibility/espeak[pulseaudio] )
 SLOT=0
 SRC_URI=https://github.com/williamh/espeakup/archive/v0.80.tar.gz -> espeakup-0.80.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=60b78cdd982f72a42c1d740bdcbc6ff4
diff --git a/metadata/md5-cache/app-accessibility/espeakup-9999 b/metadata/md5-cache/app-accessibility/espeakup-9999
index 1ec86da20164..7dd1377266d3 100644
--- a/metadata/md5-cache/app-accessibility/espeakup-9999
+++ b/metadata/md5-cache/app-accessibility/espeakup-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=|| ( app-accessibility/espeak[portaudio] app-accessibility/espeak[pulseaudio] )
 SLOT=0
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=60b78cdd982f72a42c1d740bdcbc6ff4
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index d47d8e0441f3..07cc77b5c866 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/apache-tools-2.4.43 b/metadata/md5-cache/app-admin/apache-tools-2.4.43
index 14fe3d4acc20..4d0b6066750d 100644
--- a/metadata/md5-cache/app-admin/apache-tools-2.4.43
+++ b/metadata/md5-cache/app-admin/apache-tools-2.4.43
@@ -4,11 +4,11 @@ DESCRIPTION=Useful Apache tools - htdigest, htpasswd, ab, htdbm
 EAPI=7
 HOMEPAGE=https://httpd.apache.org/
 IUSE=libressl ssl
-KEYWORDS=~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/apr-1.5.0:1= dev-libs/apr-util:1= dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/httpd/httpd-2.4.43.tar.bz2
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=da2903a5c92a7818ef00f9cdb5f01807
+_md5_=1e1f81bf6cfd77c3f3c7f0247d5c754d
diff --git a/metadata/md5-cache/app-admin/bastille-3.0.9-r1 b/metadata/md5-cache/app-admin/bastille-3.0.9-r1
index 33441dead9ce..1b351f3f84a6 100644
--- a/metadata/md5-cache/app-admin/bastille-3.0.9-r1
+++ b/metadata/md5-cache/app-admin/bastille-3.0.9-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=app-admin/logrotate dev-perl/Curses net-firewall/iptables net-firewall/psad virtual/logger X? ( dev-perl/Tk ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/bastille-linux/Bastille-3.0.9.tar.bz2 mirror://gentoo/bastille-3.0.9-gentoo-0.2.patch.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=73585f879895ccd04595cbecf29efbac
diff --git a/metadata/md5-cache/app-admin/cdist-6.5.6 b/metadata/md5-cache/app-admin/cdist-6.5.6
new file mode 100644
index 000000000000..64936c247dab
--- /dev/null
+++ b/metadata/md5-cache/app-admin/cdist-6.5.6
@@ -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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A usable configuration management system
+EAPI=7
+HOMEPAGE=https://www.cdi.st/ https://code.ungleich.ch/ungleich-public/cdist
+IUSE=doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+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/c/cdist/cdist-6.5.6.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=840cc54282e0f55646e0dad2b0a25bc6
diff --git a/metadata/md5-cache/app-admin/clsync-0.4.4 b/metadata/md5-cache/app-admin/clsync-0.4.4
index 002204acc90d..b18d364322e7 100644
--- a/metadata/md5-cache/app-admin/clsync-0.4.4
+++ b/metadata/md5-cache/app-admin/clsync-0.4.4
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 caps? ( sys-libs/libcap ) cgroups? ( dev-libs/libcgroup
 REQUIRED_USE=|| ( gio inotify ) extra-debug? ( debug ) extra-hardened? ( hardened ) mhash? ( cluster ) seccomp? ( caps )
 SLOT=0
 SRC_URI=https://github.com/clsync/clsync/archive/v0.4.4.tar.gz -> clsync-0.4.4.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=15b24335a5ecfbc91c1d934ac8aabcf5
diff --git a/metadata/md5-cache/app-admin/clsync-9999 b/metadata/md5-cache/app-admin/clsync-9999
index 0b88a7e0cd70..227fe925a923 100644
--- a/metadata/md5-cache/app-admin/clsync-9999
+++ b/metadata/md5-cache/app-admin/clsync-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=caps? ( sys-libs/libcap ) cgroups? ( dev-libs/libcgroup ) clsync? ( dev-libs/glib:2 ) mhash? ( app-crypt/mhash ) !app-doc/clsync-docs !dev-libs/libclsync
 REQUIRED_USE=|| ( clsync socket-library ) || ( gio inotify ) mhash? ( cluster ) seccomp? ( caps )
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bab4b4d18a45e9bc41cc9318a1a0b72c
diff --git a/metadata/md5-cache/app-admin/conky-1.10.8-r9 b/metadata/md5-cache/app-admin/conky-1.10.8-r9
index 4fb2c9d330e5..8141bfb8eb58 100644
--- a/metadata/md5-cache/app-admin/conky-1.10.8-r9
+++ b/metadata/md5-cache/app-admin/conky-1.10.8-r9
@@ -10,5 +10,5 @@ LICENSE=GPL-3 BSD LGPL-2.1 MIT
 RDEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] ) lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXext xmms2? ( media-sound/xmms2 ) ) cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) irc? ( net-libs/libircclient ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) || ( dev-lang/lua:0 dev-lang/lua:5.1 ) apcupsd? ( sys-power/apcupsd ) hddtemp? ( app-admin/hddtemp ) moc? ( media-sound/moc ) nano-syntax? ( app-editors/nano ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.10.8.tar.gz -> conky-1.10.8.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=74a84972c93ed87fe642c455e093b047
diff --git a/metadata/md5-cache/app-admin/conky-1.11.5 b/metadata/md5-cache/app-admin/conky-1.11.5
index e646b5511aa3..4f669506316d 100644
--- a/metadata/md5-cache/app-admin/conky-1.11.5
+++ b/metadata/md5-cache/app-admin/conky-1.11.5
@@ -11,5 +11,5 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/l
 REQUIRED_USE=imlib? ( X ) nvidia? ( X ) truetype? ( X ) lua-cairo? ( X bundled-toluapp ) lua-imlib? ( X bundled-toluapp ) lua-rsvg? ( X bundled-toluapp )
 SLOT=0
 SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.11.5.tar.gz -> conky-1.11.5.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fd104967009384e8a8124de0ba84287c
diff --git a/metadata/md5-cache/app-admin/consul-1.7.2 b/metadata/md5-cache/app-admin/consul-1.7.2
index 67e1e001e587..a218a545d690 100644
--- a/metadata/md5-cache/app-admin/consul-1.7.2
+++ b/metadata/md5-cache/app-admin/consul-1.7.2
@@ -7,8 +7,8 @@ HOMEPAGE=https://www.consul.io
 KEYWORDS=amd64
 LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT
 RDEPEND=acct-group/consul acct-user/consul
-RESTRICT=strip
+RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/consul/archive/v1.7.2.tar.gz -> consul-1.7.2.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.0.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.7.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.7.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.15.3+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.15.3+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v10.15.3+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.15.3+incompatible.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.zip -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.mod -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.zip mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.zip -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.zip -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.zip mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.mod -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.zip -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.mod -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.zip -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.mod -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.zip -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.zip mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.1.1.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.1.1.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.zip -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.zip mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.mod -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.8.0.zip -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.8.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.0.14.zip -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.0.14.zip mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.0.14.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.0.14.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-check/check/@v/v0.0.0-20140225173054-eb6ee6f84d0a.mod -> github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20140225173054-eb6ee6f84d0a.mod mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.2+incompatible.zip -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.2+incompatible.zip mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.2+incompatible.mod -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.2+incompatible.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2-0.20181118220953-042da051cf31.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.1.0.zip -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/gogo/googleapis/@v/v1.1.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.zip mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.zip mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20170612174753-24818f796faf.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.zip mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20170612174753-24818f796faf.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.0.0-20180828235145-f29afc2cceca.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20180828235145-f29afc2cceca.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.0.0-20180828235145-f29afc2cceca.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20180828235145-f29afc2cceca.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20180825215210-0210a2f0f73c.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20180825215210-0210a2f0f73c.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20180825215210-0210a2f0f73c.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20180825215210-0210a2f0f73c.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.zip -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.zip mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.zip -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.mod -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.0.0-20171009173528-1545e56e46de.zip -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.0.0-20171009173528-1545e56e46de.zip mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.0.0-20171009173528-1545e56e46de.mod -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.0.0-20171009173528-1545e56e46de.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.2.0.zip -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.2.0.mod -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20191202160150-7ec2cfbda7a2.zip -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20191202160150-7ec2cfbda7a2.zip mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20191202160150-7ec2cfbda7a2.mod -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20191202160150-7ec2cfbda7a2.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.3.zip -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.3.mod -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.zip -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.mod -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.zip -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20160711231837-1e86c6b523c5.zip -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.zip mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20160711231837-1e86c6b523c5.mod -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.6.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.6.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.zip -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.zip mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.mod -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.1.zip -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2.zip -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.5.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.5.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.5.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.5.mod mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.4.zip -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.4.mod -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.13.zip -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.zip mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.13.mod -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.mod mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.zip -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.zip mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.mod -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/istio/gogo-genproto/@v/v0.0.0-20190124151557-6d926a6e6feb.mod -> github.com%2Fistio%2Fgogo-genproto%2F@v%2Fv0.0.0-20190124151557-6d926a6e6feb.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.zip -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.zip mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.zip mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.5.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.5.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.2.1+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.2.1+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.zip -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190309162924-0a377eecf7aa.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190309162924-0a377eecf7aa.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190418170008-ace88ad0983b.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190418170008-ace88ad0983b.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190501133040-e77ea8b19cdc.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190501133040-e77ea8b19cdc.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.20.16.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.20.16.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190409170913-40473a74d76d.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190409170913-40473a74d76d.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190419151922-c1f9f0b4f084.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190419151922-c1f9f0b4f084.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190502021454-d8787b4bfa0b.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190502021454-d8787b4bfa0b.mod mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.zip -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.mod -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.zip mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.zip -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.zip mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.mod -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.zip -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.1.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.4.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.2.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.4.2.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.zip -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.zip mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.mod -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.zip -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.zip mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.zip -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.zip mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.mod -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.zip -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20181107111621-48177ef5f880.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20181107111621-48177ef5f880.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20181107111621-48177ef5f880.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20181107111621-48177ef5f880.mod mirror://goproxy//github.com/shirou/w32/@v/v0.0.0-20160930032740-bb4de0191aa4.zip -> github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.zip mirror://goproxy//github.com/shirou/w32/@v/v0.0.0-20160930032740-bb4de0191aa4.mod -> github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180820201707-7c9eb446e3cf.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180820201707-7c9eb446e3cf.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180820201707-7c9eb446e3cf.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180820201707-7c9eb446e3cf.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20180222194500-ef6db91d284a.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20180222194500-ef6db91d284a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.mod mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.zip -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.zip mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.mod -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.2.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod mirror://goproxy//github.com/tent/http-link-go/@v/v0.0.0-20130702225549-ac974c61c2f9.zip -> github.com%2Ftent%2Fhttp-link-go%2F@v%2Fv0.0.0-20130702225549-ac974c61c2f9.zip mirror://goproxy//github.com/tent/http-link-go/@v/v0.0.0-20130702225549-ac974c61c2f9.mod -> github.com%2Ftent%2Fhttp-link-go%2F@v%2Fv0.0.0-20130702225549-ac974c61c2f9.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191106202628-ed6320f186d4.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191106202628-ed6320f186d4.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191106202628-ed6320f186d4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191106202628-ed6320f186d4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20170807180024-9a379c6b3e95.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20170807180024-9a379c6b3e95.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190129075346-302c3dd5f1cc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190508220229-2d0786266e9c.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190508220229-2d0786266e9c.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190508220229-2d0786266e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190508220229-2d0786266e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190523142557-0e01d883c5c5.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190523142557-0e01d883c5c5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20181227161524-e6919f6577db.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190907020128-2ca718005c18.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20180829000535-087779f1d2c9.zip -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180829000535-087779f1d2c9.zip mirror://goproxy//google.golang.org/api/@v/v0.0.0-20180829000535-087779f1d2c9.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180829000535-087779f1d2c9.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190404172233-64821d5d2107.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190404172233-64821d5d2107.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.19.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.zip -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.zip mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.zip -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.zip mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.mod -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.zip -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.zip mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.zip -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20180806132203-61b11ee65332.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20180806132203-61b11ee65332.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20190325185214-7544f9db76f6.zip -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190325185214-7544f9db76f6.zip mirror://goproxy//k8s.io/api/@v/v0.0.0-20190325185214-7544f9db76f6.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190325185214-7544f9db76f6.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20180821005732-488889b0007f.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20180821005732-488889b0007f.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190223001710-c182ff3b9841.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190223001710-c182ff3b9841.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190223001710-c182ff3b9841.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190223001710-c182ff3b9841.mod mirror://goproxy//k8s.io/client-go/@v/v8.0.0+incompatible.zip -> k8s.io%2Fclient-go%2F@v%2Fv8.0.0+incompatible.zip mirror://goproxy//k8s.io/client-go/@v/v8.0.0+incompatible.mod -> k8s.io%2Fclient-go%2F@v%2Fv8.0.0+incompatible.mod
 _eclasses_=go-module	45394825d9260b479aa1cf252ea58e01	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a5343670670b016f05b6c9627c5ef384
+_md5_=9a9b6b3e78a0003535d102e6d105fde6
diff --git a/metadata/md5-cache/app-admin/consul-1.7.3 b/metadata/md5-cache/app-admin/consul-1.7.3
index 5fafdaf289d4..045abbe0b1aa 100644
--- a/metadata/md5-cache/app-admin/consul-1.7.3
+++ b/metadata/md5-cache/app-admin/consul-1.7.3
@@ -7,8 +7,8 @@ HOMEPAGE=https://www.consul.io
 KEYWORDS=~amd64
 LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT
 RDEPEND=acct-group/consul acct-user/consul
-RESTRICT=strip
+RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/consul/archive/v1.7.3.tar.gz -> consul-1.7.3.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.0.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.7.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.7.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.15.3+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.15.3+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v10.15.3+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.15.3+incompatible.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.zip -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.mod -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.zip mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.zip -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.zip -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.zip mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.mod -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.zip -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.mod -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.zip -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.mod -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.zip -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.zip mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.1.1.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.1.1.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.zip -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.zip mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.mod -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.8.0.zip -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.8.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.0.14.zip -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.0.14.zip mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.0.14.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.0.14.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-check/check/@v/v0.0.0-20140225173054-eb6ee6f84d0a.mod -> github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20140225173054-eb6ee6f84d0a.mod mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.2+incompatible.zip -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.2+incompatible.zip mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.2+incompatible.mod -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.2+incompatible.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2-0.20181118220953-042da051cf31.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.1.0.zip -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/gogo/googleapis/@v/v1.1.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.zip mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.zip mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20170612174753-24818f796faf.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.zip mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20170612174753-24818f796faf.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.0.0-20180828235145-f29afc2cceca.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20180828235145-f29afc2cceca.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.0.0-20180828235145-f29afc2cceca.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20180828235145-f29afc2cceca.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20180825215210-0210a2f0f73c.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20180825215210-0210a2f0f73c.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20180825215210-0210a2f0f73c.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20180825215210-0210a2f0f73c.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.zip -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.zip mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.zip -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.mod -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.0.0-20171009173528-1545e56e46de.zip -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.0.0-20171009173528-1545e56e46de.zip mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.0.0-20171009173528-1545e56e46de.mod -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.0.0-20171009173528-1545e56e46de.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.2.0.zip -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.2.0.mod -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20191202160150-7ec2cfbda7a2.zip -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20191202160150-7ec2cfbda7a2.zip mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20191202160150-7ec2cfbda7a2.mod -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20191202160150-7ec2cfbda7a2.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.3.zip -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.3.mod -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.zip -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.mod -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20160711231837-1e86c6b523c5.zip -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.zip mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20160711231837-1e86c6b523c5.mod -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.zip -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.zip mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.mod -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2.zip -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.2.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.4.zip -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.4.mod -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.13.zip -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.zip mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.13.mod -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.mod mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.zip -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.zip mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.mod -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/istio/gogo-genproto/@v/v0.0.0-20190124151557-6d926a6e6feb.mod -> github.com%2Fistio%2Fgogo-genproto%2F@v%2Fv0.0.0-20190124151557-6d926a6e6feb.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.zip -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.zip mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.zip mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.5.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.5.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.2.1+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190309162924-0a377eecf7aa.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190309162924-0a377eecf7aa.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190418170008-ace88ad0983b.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190418170008-ace88ad0983b.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190501133040-e77ea8b19cdc.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190501133040-e77ea8b19cdc.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.20.16.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.20.16.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190409170913-40473a74d76d.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190409170913-40473a74d76d.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190419151922-c1f9f0b4f084.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190419151922-c1f9f0b4f084.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190502021454-d8787b4bfa0b.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190502021454-d8787b4bfa0b.mod mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.zip -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.mod -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.3.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.3.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.2.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.2.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.zip -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.zip mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.mod -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.2.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.4.2.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.zip -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.zip mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.mod -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.zip -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.3.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/posener/complete/@v/v1.2.3.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.zip mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.zip -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.mod -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.zip -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.zip mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.mod -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.zip -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20181107111621-48177ef5f880.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20181107111621-48177ef5f880.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20181107111621-48177ef5f880.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20181107111621-48177ef5f880.mod mirror://goproxy//github.com/shirou/w32/@v/v0.0.0-20160930032740-bb4de0191aa4.zip -> github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.zip mirror://goproxy//github.com/shirou/w32/@v/v0.0.0-20160930032740-bb4de0191aa4.mod -> github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180820201707-7c9eb446e3cf.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180820201707-7c9eb446e3cf.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20180222194500-ef6db91d284a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.mod mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.zip -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.zip mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.mod -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.2.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod mirror://goproxy//github.com/tent/http-link-go/@v/v0.0.0-20130702225549-ac974c61c2f9.mod -> github.com%2Ftent%2Fhttp-link-go%2F@v%2Fv0.0.0-20130702225549-ac974c61c2f9.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191106202628-ed6320f186d4.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191106202628-ed6320f186d4.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191106202628-ed6320f186d4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191106202628-ed6320f186d4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20170807180024-9a379c6b3e95.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20170807180024-9a379c6b3e95.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190129075346-302c3dd5f1cc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190508220229-2d0786266e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190508220229-2d0786266e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190523142557-0e01d883c5c5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20181227161524-e6919f6577db.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190907020128-2ca718005c18.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20180829000535-087779f1d2c9.zip -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180829000535-087779f1d2c9.zip mirror://goproxy//google.golang.org/api/@v/v0.0.0-20180829000535-087779f1d2c9.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180829000535-087779f1d2c9.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190404172233-64821d5d2107.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190404172233-64821d5d2107.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.zip -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.zip mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.mod -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.zip -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.zip mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.zip -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20180806132203-61b11ee65332.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20180806132203-61b11ee65332.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20190325185214-7544f9db76f6.zip -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190325185214-7544f9db76f6.zip mirror://goproxy//k8s.io/api/@v/v0.0.0-20190325185214-7544f9db76f6.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190325185214-7544f9db76f6.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20180821005732-488889b0007f.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20180821005732-488889b0007f.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190223001710-c182ff3b9841.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190223001710-c182ff3b9841.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190223001710-c182ff3b9841.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190223001710-c182ff3b9841.mod mirror://goproxy//k8s.io/client-go/@v/v8.0.0+incompatible.zip -> k8s.io%2Fclient-go%2F@v%2Fv8.0.0+incompatible.zip mirror://goproxy//k8s.io/client-go/@v/v8.0.0+incompatible.mod -> k8s.io%2Fclient-go%2F@v%2Fv8.0.0+incompatible.mod
 _eclasses_=go-module	45394825d9260b479aa1cf252ea58e01	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=69669ce3ecbf87140e71734858963bc0
+_md5_=bfb8cb46fb4d56e4ce6cba927cd6d1e4
diff --git a/metadata/md5-cache/app-admin/consul-1.7.4 b/metadata/md5-cache/app-admin/consul-1.7.4
index de06d53fb41f..788a96b808bf 100644
--- a/metadata/md5-cache/app-admin/consul-1.7.4
+++ b/metadata/md5-cache/app-admin/consul-1.7.4
@@ -4,11 +4,11 @@ DEPEND=acct-group/consul acct-user/consul
 DESCRIPTION=A tool for service discovery, monitoring and configuration
 EAPI=7
 HOMEPAGE=https://www.consul.io
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT
 RDEPEND=acct-group/consul acct-user/consul
-RESTRICT=strip
+RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/consul/archive/v1.7.4.tar.gz -> consul-1.7.4.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.0.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.7.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.7.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.15.3+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.15.3+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v10.15.3+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.15.3+incompatible.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.zip -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.mod -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.zip mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.zip -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.zip -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.zip mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.mod -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.zip -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.mod -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.zip -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.mod -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.zip -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.zip mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.1.1.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.1.1.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.zip -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.zip mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.mod -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.8.0.zip -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.8.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.0.14.zip -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.0.14.zip mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.0.14.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.0.14.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-check/check/@v/v0.0.0-20140225173054-eb6ee6f84d0a.mod -> github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20140225173054-eb6ee6f84d0a.mod mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.2+incompatible.zip -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.2+incompatible.zip mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.2+incompatible.mod -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.2+incompatible.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2-0.20181118220953-042da051cf31.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.1.0.zip -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/gogo/googleapis/@v/v1.1.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.zip mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.zip mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20170612174753-24818f796faf.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.zip mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20170612174753-24818f796faf.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.0.0-20180828235145-f29afc2cceca.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20180828235145-f29afc2cceca.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.0.0-20180828235145-f29afc2cceca.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20180828235145-f29afc2cceca.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20180825215210-0210a2f0f73c.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20180825215210-0210a2f0f73c.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20180825215210-0210a2f0f73c.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20180825215210-0210a2f0f73c.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.zip -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.zip mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.zip -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.mod -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.0.0-20171009173528-1545e56e46de.zip -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.0.0-20171009173528-1545e56e46de.zip mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.0.0-20171009173528-1545e56e46de.mod -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.0.0-20171009173528-1545e56e46de.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.2.0.zip -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.2.0.mod -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20191202160150-7ec2cfbda7a2.zip -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20191202160150-7ec2cfbda7a2.zip mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20191202160150-7ec2cfbda7a2.mod -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20191202160150-7ec2cfbda7a2.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.3.zip -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.3.mod -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.zip -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.mod -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20160711231837-1e86c6b523c5.zip -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.zip mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20160711231837-1e86c6b523c5.mod -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.zip -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.zip mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.mod -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2.zip -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.2.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.4.zip -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.4.mod -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.13.zip -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.zip mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.13.mod -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.mod mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.zip -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.zip mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.mod -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/istio/gogo-genproto/@v/v0.0.0-20190124151557-6d926a6e6feb.mod -> github.com%2Fistio%2Fgogo-genproto%2F@v%2Fv0.0.0-20190124151557-6d926a6e6feb.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.zip -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.zip mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.zip mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.5.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.5.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.2.1+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190309162924-0a377eecf7aa.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190309162924-0a377eecf7aa.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190418170008-ace88ad0983b.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190418170008-ace88ad0983b.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190501133040-e77ea8b19cdc.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190501133040-e77ea8b19cdc.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.20.16.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.20.16.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190409170913-40473a74d76d.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190409170913-40473a74d76d.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190419151922-c1f9f0b4f084.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190419151922-c1f9f0b4f084.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190502021454-d8787b4bfa0b.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190502021454-d8787b4bfa0b.mod mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.zip -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.mod -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.3.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.3.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.2.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.2.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.zip -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.zip mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.mod -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.2.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.4.2.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.zip -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.zip mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.mod -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.zip -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.3.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/posener/complete/@v/v1.2.3.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.zip mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.zip -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.mod -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.zip -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.zip mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.mod -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.zip -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20181107111621-48177ef5f880.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20181107111621-48177ef5f880.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20181107111621-48177ef5f880.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20181107111621-48177ef5f880.mod mirror://goproxy//github.com/shirou/w32/@v/v0.0.0-20160930032740-bb4de0191aa4.zip -> github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.zip mirror://goproxy//github.com/shirou/w32/@v/v0.0.0-20160930032740-bb4de0191aa4.mod -> github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180820201707-7c9eb446e3cf.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180820201707-7c9eb446e3cf.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20180222194500-ef6db91d284a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.mod mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.zip -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.zip mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.mod -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.2.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod mirror://goproxy//github.com/tent/http-link-go/@v/v0.0.0-20130702225549-ac974c61c2f9.mod -> github.com%2Ftent%2Fhttp-link-go%2F@v%2Fv0.0.0-20130702225549-ac974c61c2f9.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191106202628-ed6320f186d4.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191106202628-ed6320f186d4.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191106202628-ed6320f186d4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191106202628-ed6320f186d4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20170807180024-9a379c6b3e95.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20170807180024-9a379c6b3e95.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190129075346-302c3dd5f1cc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190508220229-2d0786266e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190508220229-2d0786266e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190523142557-0e01d883c5c5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20181227161524-e6919f6577db.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190907020128-2ca718005c18.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20180829000535-087779f1d2c9.zip -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180829000535-087779f1d2c9.zip mirror://goproxy//google.golang.org/api/@v/v0.0.0-20180829000535-087779f1d2c9.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180829000535-087779f1d2c9.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190404172233-64821d5d2107.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190404172233-64821d5d2107.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.zip -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.zip mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.mod -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.zip -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.zip mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.zip -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20180806132203-61b11ee65332.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20180806132203-61b11ee65332.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20190325185214-7544f9db76f6.zip -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190325185214-7544f9db76f6.zip mirror://goproxy//k8s.io/api/@v/v0.0.0-20190325185214-7544f9db76f6.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190325185214-7544f9db76f6.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20180821005732-488889b0007f.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20180821005732-488889b0007f.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190223001710-c182ff3b9841.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190223001710-c182ff3b9841.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190223001710-c182ff3b9841.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190223001710-c182ff3b9841.mod mirror://goproxy//k8s.io/client-go/@v/v8.0.0+incompatible.zip -> k8s.io%2Fclient-go%2F@v%2Fv8.0.0+incompatible.zip mirror://goproxy//k8s.io/client-go/@v/v8.0.0+incompatible.mod -> k8s.io%2Fclient-go%2F@v%2Fv8.0.0+incompatible.mod
 _eclasses_=go-module	45394825d9260b479aa1cf252ea58e01	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ef2a8b9b8ba0bb218e95a53bcb9897fc
+_md5_=f2dee0f5092cbd16b07366279645345c
diff --git a/metadata/md5-cache/app-admin/evtxtools-1.1.1-r1 b/metadata/md5-cache/app-admin/evtxtools-1.1.1-r1
index af7bd22de89e..b13fb8fae753 100644
--- a/metadata/md5-cache/app-admin/evtxtools-1.1.1-r1
+++ b/metadata/md5-cache/app-admin/evtxtools-1.1.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/unzip dev-perl/DateTime dev-perl/Digest-CRC dev-perl/DateTime dev-perl/Carp-Assert dev-perl/Data-Hexify dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://computer.forensikblog.de/files/evtx/Parse-Evtx-1.1.1.zip
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fab8d9c3f3917bd54e96c78d303e49d5
diff --git a/metadata/md5-cache/app-admin/fam-2.7.0-r7 b/metadata/md5-cache/app-admin/fam-2.7.0-r7
deleted file mode 100644
index e7b0ecd2c55c..000000000000
--- a/metadata/md5-cache/app-admin/fam-2.7.0-r7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-nds/rpcbind !app-admin/gamin >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=FAM, the File Alteration Monitor
-EAPI=5
-HOMEPAGE=http://oss.sgi.com/projects/fam/
-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 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=net-nds/rpcbind !app-admin/gamin
-SLOT=0
-SRC_URI=ftp://oss.sgi.com/projects/fam/download/stable/fam-2.7.0.tar.gz mirror://debian/pool/main/f/fam/fam_2.7.0-17.diff.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0dc66826a84bb9428fee67a27db1137e
diff --git a/metadata/md5-cache/app-admin/fam-2.7.0_p17_p3 b/metadata/md5-cache/app-admin/fam-2.7.0_p17_p3
new file mode 100644
index 000000000000..145c5ba0264b
--- /dev/null
+++ b/metadata/md5-cache/app-admin/fam-2.7.0_p17_p3
@@ -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 test unpack
+DEPEND=!app-admin/gamin net-libs/libtirpc net-nds/rpcbind
+DESCRIPTION=FAM, the File Alteration Monitor
+EAPI=7
+HOMEPAGE=http://oss.sgi.com/projects/fam/
+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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=!app-admin/gamin net-libs/libtirpc net-nds/rpcbind
+SLOT=0
+SRC_URI=mirror://debian/pool/main/f/fam/fam_2.7.0.orig.tar.gz mirror://debian/pool/main/f/fam/fam_2.7.0-17.3.diff.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=120a290626f6dc6a04478c0417220f4b
diff --git a/metadata/md5-cache/app-admin/filebeat-7.8.0 b/metadata/md5-cache/app-admin/filebeat-7.8.0
new file mode 100644
index 000000000000..fc99674f6d99
--- /dev/null
+++ b/metadata/md5-cache/app-admin/filebeat-7.8.0
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst prepare unpack
+DESCRIPTION=Lightweight log shipper for Logstash and Elasticsearch
+EAPI=7
+HOMEPAGE=https://www.elastic.co/products/beats
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 BSD-2 MIT
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/elastic/beats/archive/v7.8.0.tar.gz -> filebeat-7.8.0.tar.gz mirror://goproxy//4d63.com/embedfiles/@v/v0.0.0-20190311033909-995e0740726f.zip -> 4d63.com%2Fembedfiles%2F@v%2Fv0.0.0-20190311033909-995e0740726f.zip mirror://goproxy//4d63.com/embedfiles/@v/v0.0.0-20190311033909-995e0740726f.mod -> 4d63.com%2Fembedfiles%2F@v%2Fv0.0.0-20190311033909-995e0740726f.mod mirror://goproxy//4d63.com/tz/@v/v1.1.1-0.20191124060701-6d37baae851b.zip -> 4d63.com%2Ftz%2F@v%2Fv1.1.1-0.20191124060701-6d37baae851b.zip mirror://goproxy//4d63.com/tz/@v/v1.1.1-0.20191124060701-6d37baae851b.mod -> 4d63.com%2Ftz%2F@v%2Fv1.1.1-0.20191124060701-6d37baae851b.mod mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.51.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.51.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.zip -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.zip mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.zip -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.zip mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.zip -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.zip mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.zip mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//code.cloudfoundry.org/go-diodes/@v/v0.0.0-20190809170250-f77fb823c7ee.zip -> code.cloudfoundry.org%2Fgo-diodes%2F@v%2Fv0.0.0-20190809170250-f77fb823c7ee.zip mirror://goproxy//code.cloudfoundry.org/go-diodes/@v/v0.0.0-20190809170250-f77fb823c7ee.mod -> code.cloudfoundry.org%2Fgo-diodes%2F@v%2Fv0.0.0-20190809170250-f77fb823c7ee.mod mirror://goproxy//code.cloudfoundry.org/go-loggregator/@v/v7.4.0+incompatible.zip -> code.cloudfoundry.org%2Fgo-loggregator%2F@v%2Fv7.4.0+incompatible.zip mirror://goproxy//code.cloudfoundry.org/go-loggregator/@v/v7.4.0+incompatible.mod -> code.cloudfoundry.org%2Fgo-loggregator%2F@v%2Fv7.4.0+incompatible.mod mirror://goproxy//code.cloudfoundry.org/gofileutils/@v/v0.0.0-20170111115228-4d0c80011a0f.zip -> code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a0f.zip mirror://goproxy//code.cloudfoundry.org/gofileutils/@v/v0.0.0-20170111115228-4d0c80011a0f.mod -> code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a0f.mod mirror://goproxy//code.cloudfoundry.org/rfc5424/@v/v0.0.0-20180905210152-236a6d29298a.zip -> code.cloudfoundry.org%2Frfc5424%2F@v%2Fv0.0.0-20180905210152-236a6d29298a.zip mirror://goproxy//code.cloudfoundry.org/rfc5424/@v/v0.0.0-20180905210152-236a6d29298a.mod -> code.cloudfoundry.org%2Frfc5424%2F@v%2Fv0.0.0-20180905210152-236a6d29298a.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/azure-amqp-common-go/v3/@v/v3.0.0.zip -> github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//github.com/!azure/azure-amqp-common-go/v3/@v/v3.0.0.mod -> github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/!azure/azure-event-hubs-go/v3/@v/v3.1.2.zip -> github.com%2F!azure%2Fazure-event-hubs-go%2Fv3%2F@v%2Fv3.1.2.zip mirror://goproxy//github.com/!azure/azure-event-hubs-go/v3/@v/v3.1.2.mod -> github.com%2F!azure%2Fazure-event-hubs-go%2Fv3%2F@v%2Fv3.1.2.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.1.8.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.1.9.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.1.9.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.1.zip -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.1.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v37.1.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv37.1.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v37.1.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv37.1.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.6.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.8.0.zip -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.8.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-amqp/@v/v0.12.6.zip -> github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.6.zip mirror://goproxy//github.com/!azure/go-amqp/@v/v0.12.6.mod -> github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.6.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v12.2.0+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv12.2.0+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v12.2.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv12.2.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.4.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.4.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.4.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.4.2.zip -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/!masterminds/semver/@v/v1.4.2.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.zip -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.zip mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.mod -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20170221213301-9f32b5905fd6.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20170221213301-9f32b5905fd6.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20170221213301-9f32b5905fd6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20170221213301-9f32b5905fd6.mod mirror://goproxy//github.com/adriansr/fsnotify/@v/v0.0.0-20180417234312-c9bbe1f46f1d.zip -> github.com%2Fadriansr%2Ffsnotify%2F@v%2Fv0.0.0-20180417234312-c9bbe1f46f1d.zip mirror://goproxy//github.com/adriansr/fsnotify/@v/v0.0.0-20180417234312-c9bbe1f46f1d.mod -> github.com%2Fadriansr%2Ffsnotify%2F@v%2Fv0.0.0-20180417234312-c9bbe1f46f1d.mod mirror://goproxy//github.com/adriansr/gopacket/@v/v1.1.18-0.20200327165309-dd62abfa8a41.zip -> github.com%2Fadriansr%2Fgopacket%2F@v%2Fv1.1.18-0.20200327165309-dd62abfa8a41.zip mirror://goproxy//github.com/adriansr/gopacket/@v/v1.1.18-0.20200327165309-dd62abfa8a41.mod -> github.com%2Fadriansr%2Fgopacket%2F@v%2Fv1.1.18-0.20200327165309-dd62abfa8a41.mod mirror://goproxy//github.com/aerospike/aerospike-client-go/@v/v1.27.1-0.20170612174108-0f3b54da6bdc.zip -> github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv1.27.1-0.20170612174108-0f3b54da6bdc.zip mirror://goproxy//github.com/aerospike/aerospike-client-go/@v/v1.27.1-0.20170612174108-0f3b54da6bdc.mod -> github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv1.27.1-0.20170612174108-0f3b54da6bdc.mod mirror://goproxy//github.com/akavel/rsrc/@v/v0.8.0.zip -> github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/akavel/rsrc/@v/v0.8.0.mod -> github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/alcortesm/tgz/@v/v0.0.0-20161220082320-9c5fe88206d7.mod -> github.com%2Falcortesm%2Ftgz%2F@v%2Fv0.0.0-20161220082320-9c5fe88206d7.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/andrewkroh/goja/@v/v0.0.0-20190128172624-dd2ac4456e20.zip -> github.com%2Fandrewkroh%2Fgoja%2F@v%2Fv0.0.0-20190128172624-dd2ac4456e20.zip mirror://goproxy//github.com/andrewkroh/goja/@v/v0.0.0-20190128172624-dd2ac4456e20.mod -> github.com%2Fandrewkroh%2Fgoja%2F@v%2Fv0.0.0-20190128172624-dd2ac4456e20.mod mirror://goproxy//github.com/andrewkroh/sys/@v/v0.0.0-20151128191922-287798fe3e43.zip -> github.com%2Fandrewkroh%2Fsys%2F@v%2Fv0.0.0-20151128191922-287798fe3e43.zip mirror://goproxy//github.com/andrewkroh/sys/@v/v0.0.0-20151128191922-287798fe3e43.mod -> github.com%2Fandrewkroh%2Fsys%2F@v%2Fv0.0.0-20151128191922-287798fe3e43.mod mirror://goproxy//github.com/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.mod -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod mirror://goproxy//github.com/antihax/optional/@v/v0.0.0-20180407024304-ca021399b1a6.mod -> github.com%2Fantihax%2Foptional%2F@v%2Fv0.0.0-20180407024304-ca021399b1a6.mod mirror://goproxy//github.com/antlr/antlr4/@v/v0.0.0-20200326173327-a4c66dc863bb.zip -> github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200326173327-a4c66dc863bb.zip mirror://goproxy//github.com/antlr/antlr4/@v/v0.0.0-20200326173327-a4c66dc863bb.mod -> github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200326173327-a4c66dc863bb.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.zip -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.zip mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.mod -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.mod mirror://goproxy//github.com/aws/aws-lambda-go/@v/v1.6.0.zip -> github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/aws/aws-lambda-go/@v/v1.6.0.mod -> github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v0.9.0.zip -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v0.9.0.mod -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/awslabs/goformation/v3/@v/v3.1.0.mod -> github.com%2Fawslabs%2Fgoformation%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/awslabs/goformation/v4/@v/v4.1.0.zip -> github.com%2Fawslabs%2Fgoformation%2Fv4%2F@v%2Fv4.1.0.zip mirror://goproxy//github.com/awslabs/goformation/v4/@v/v4.1.0.mod -> github.com%2Fawslabs%2Fgoformation%2Fv4%2F@v%2Fv4.1.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20150311145944-8bd4349a67f2.zip -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20150311145944-8bd4349a67f2.zip mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20150311145944-8bd4349a67f2.mod -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20150311145944-8bd4349a67f2.mod mirror://goproxy//github.com/blang/semver/@v/v3.1.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.1.0+incompatible.mod mirror://goproxy//github.com/bradleyfalzon/ghinstallation/@v/v1.1.0.zip -> github.com%2Fbradleyfalzon%2Fghinstallation%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/bradleyfalzon/ghinstallation/@v/v1.1.0.mod -> github.com%2Fbradleyfalzon%2Fghinstallation%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/bsm/sarama-cluster/@v/v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.zip -> github.com%2Fbsm%2Fsarama-cluster%2F@v%2Fv2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.zip mirror://goproxy//github.com/bsm/sarama-cluster/@v/v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.mod -> github.com%2Fbsm%2Fsarama-cluster%2F@v%2Fv2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.mod mirror://goproxy//github.com/cavaliercoder/badio/@v/v0.0.0-20160213150051-ce5280129e9e.zip -> github.com%2Fcavaliercoder%2Fbadio%2F@v%2Fv0.0.0-20160213150051-ce5280129e9e.zip mirror://goproxy//github.com/cavaliercoder/badio/@v/v0.0.0-20160213150051-ce5280129e9e.mod -> github.com%2Fcavaliercoder%2Fbadio%2F@v%2Fv0.0.0-20160213150051-ce5280129e9e.mod mirror://goproxy//github.com/cavaliercoder/go-rpm/@v/v0.0.0-20190131055624-7a9c54e3d83e.zip -> github.com%2Fcavaliercoder%2Fgo-rpm%2F@v%2Fv0.0.0-20190131055624-7a9c54e3d83e.zip mirror://goproxy//github.com/cavaliercoder/go-rpm/@v/v0.0.0-20190131055624-7a9c54e3d83e.mod -> github.com%2Fcavaliercoder%2Fgo-rpm%2F@v%2Fv0.0.0-20190131055624-7a9c54e3d83e.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cloudfoundry-community/go-cfclient/@v/v0.0.0-20190808214049-35bcce23fc5f.zip -> github.com%2Fcloudfoundry-community%2Fgo-cfclient%2F@v%2Fv0.0.0-20190808214049-35bcce23fc5f.zip mirror://goproxy//github.com/cloudfoundry-community/go-cfclient/@v/v0.0.0-20190808214049-35bcce23fc5f.mod -> github.com%2Fcloudfoundry-community%2Fgo-cfclient%2F@v%2Fv0.0.0-20190808214049-35bcce23fc5f.mod mirror://goproxy//github.com/cloudfoundry/sonde-go/@v/v0.0.0-20171206171820-b33733203bb4.zip -> github.com%2Fcloudfoundry%2Fsonde-go%2F@v%2Fv0.0.0-20171206171820-b33733203bb4.zip mirror://goproxy//github.com/cloudfoundry/sonde-go/@v/v0.0.0-20171206171820-b33733203bb4.mod -> github.com%2Fcloudfoundry%2Fsonde-go%2F@v%2Fv0.0.0-20171206171820-b33733203bb4.mod mirror://goproxy//github.com/codegangsta/inject/@v/v0.0.0-20150114235600-33e0aa1cb7c0.zip -> github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.zip mirror://goproxy//github.com/codegangsta/inject/@v/v0.0.0-20150114235600-33e0aa1cb7c0.mod -> github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190919134610-bf292b21730f.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190919134610-bf292b21730f.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20180822173158-c12b1e7919c1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.3.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.3.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190426062206-aaeac12a7ffc.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200107194136-26c1120b8d41.zip -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200107194136-26c1120b8d41.zip mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200107194136-26c1120b8d41.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200107194136-26c1120b8d41.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190226154929-a9fb20d87448.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190226154929-a9fb20d87448.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190816180239-bda0ff6ed73c.zip -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190816180239-bda0ff6ed73c.zip mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190816180239-bda0ff6ed73c.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190816180239-bda0ff6ed73c.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20180907222934-5a6d9f37cfa3.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828154514-0e0f228740de.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20180627222232-a93fcdb778cd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.1-coreos.6.0.20180318001526-af9db2027c98.zip -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.1-coreos.6.0.20180318001526-af9db2027c98.zip mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.1-coreos.6.0.20180318001526-af9db2027c98.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.1-coreos.6.0.20180318001526-af9db2027c98.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180108230652-97fdf19511ea.zip -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.zip mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180108230652-97fdf19511ea.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/cucumber/godog/@v/v0.8.1.zip -> github.com%2Fcucumber%2Fgodog%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/cucumber/godog/@v/v0.8.1.mod -> github.com%2Fcucumber%2Fgodog%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/davecgh/go-xdr/@v/v0.0.0-20161123171359-e6a2ba005892.zip -> github.com%2Fdavecgh%2Fgo-xdr%2F@v%2Fv0.0.0-20161123171359-e6a2ba005892.zip mirror://goproxy//github.com/davecgh/go-xdr/@v/v0.0.0-20161123171359-e6a2ba005892.mod -> github.com%2Fdavecgh%2Fgo-xdr%2F@v%2Fv0.0.0-20161123171359-e6a2ba005892.mod mirror://goproxy//github.com/denisenkom/go-mssqldb/@v/v0.0.0-20200206145737-bbfc9a55622e.zip -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200206145737-bbfc9a55622e.zip mirror://goproxy//github.com/denisenkom/go-mssqldb/@v/v0.0.0-20200206145737-bbfc9a55622e.mod -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200206145737-bbfc9a55622e.mod mirror://goproxy//github.com/devigned/tab/@v/v0.1.1.mod -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/devigned/tab/@v/v0.1.2-0.20190607222403-0c15cf42f9a2.zip -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.2-0.20190607222403-0c15cf42f9a2.zip mirror://goproxy//github.com/devigned/tab/@v/v0.1.2-0.20190607222403-0c15cf42f9a2.mod -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.2-0.20190607222403-0c15cf42f9a2.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v0.0.0-20160705203006-01aeca54ebda.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv0.0.0-20160705203006-01aeca54ebda.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.mod mirror://goproxy//github.com/digitalocean/go-libvirt/@v/v0.0.0-20180301200012-6075ea3c39a1.zip -> github.com%2Fdigitalocean%2Fgo-libvirt%2F@v%2Fv0.0.0-20180301200012-6075ea3c39a1.zip mirror://goproxy//github.com/digitalocean/go-libvirt/@v/v0.0.0-20180301200012-6075ea3c39a1.mod -> github.com%2Fdigitalocean%2Fgo-libvirt%2F@v%2Fv0.0.0-20180301200012-6075ea3c39a1.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.7-0.20171009020623-7632a260cbaf.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.7-0.20171009020623-7632a260cbaf.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.7-0.20171009020623-7632a260cbaf.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.7-0.20171009020623-7632a260cbaf.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/engine/@v/v0.0.0-20191113042239-ea84732a7725.zip -> github.com%2Fdocker%2Fengine%2F@v%2Fv0.0.0-20191113042239-ea84732a7725.zip mirror://goproxy//github.com/docker/engine/@v/v0.0.0-20191113042239-ea84732a7725.mod -> github.com%2Fdocker%2Fengine%2F@v%2Fv0.0.0-20191113042239-ea84732a7725.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.zip -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.zip -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.zip mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dop251/goja_nodejs/@v/v0.0.0-20171011081505-adff31b136e6.zip -> github.com%2Fdop251%2Fgoja_nodejs%2F@v%2Fv0.0.0-20171011081505-adff31b136e6.zip mirror://goproxy//github.com/dop251/goja_nodejs/@v/v0.0.0-20171011081505-adff31b136e6.mod -> github.com%2Fdop251%2Fgoja_nodejs%2F@v%2Fv0.0.0-20171011081505-adff31b136e6.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.2.0.zip -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.2.0.mod -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.zip -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.zip mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.mod -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.zip -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.mod -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.1-0.20200121105743-0d940dd29fd2.zip -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.1-0.20200121105743-0d940dd29fd2.zip mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.1-0.20200121105743-0d940dd29fd2.mod -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.1-0.20200121105743-0d940dd29fd2.mod mirror://goproxy//github.com/elastic/dhcp/@v/v0.0.0-20200227161230-57ec251c7eb3.zip -> github.com%2Felastic%2Fdhcp%2F@v%2Fv0.0.0-20200227161230-57ec251c7eb3.zip mirror://goproxy//github.com/elastic/dhcp/@v/v0.0.0-20200227161230-57ec251c7eb3.mod -> github.com%2Felastic%2Fdhcp%2F@v%2Fv0.0.0-20200227161230-57ec251c7eb3.mod mirror://goproxy//github.com/elastic/ecs/@v/v1.5.0.zip -> github.com%2Felastic%2Fecs%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/elastic/ecs/@v/v1.5.0.mod -> github.com%2Felastic%2Fecs%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/elastic/fsevents/@v/v0.0.0-20181029231046-e1d381a4d270.zip -> github.com%2Felastic%2Ffsevents%2F@v%2Fv0.0.0-20181029231046-e1d381a4d270.zip mirror://goproxy//github.com/elastic/fsevents/@v/v0.0.0-20181029231046-e1d381a4d270.mod -> github.com%2Felastic%2Ffsevents%2F@v%2Fv0.0.0-20181029231046-e1d381a4d270.mod mirror://goproxy//github.com/elastic/go-libaudit/@v/v0.4.0.zip -> github.com%2Felastic%2Fgo-libaudit%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/elastic/go-libaudit/@v/v0.4.0.mod -> github.com%2Felastic%2Fgo-libaudit%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/elastic/go-licenser/@v/v0.2.1.zip -> github.com%2Felastic%2Fgo-licenser%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/elastic/go-licenser/@v/v0.2.1.mod -> github.com%2Felastic%2Fgo-licenser%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/elastic/go-lookslike/@v/v0.3.0.zip -> github.com%2Felastic%2Fgo-lookslike%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/elastic/go-lookslike/@v/v0.3.0.mod -> github.com%2Felastic%2Fgo-lookslike%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/elastic/go-lumber/@v/v0.1.0.zip -> github.com%2Felastic%2Fgo-lumber%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/elastic/go-lumber/@v/v0.1.0.mod -> github.com%2Felastic%2Fgo-lumber%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/elastic/go-perf/@v/v0.0.0-20191212140718-9c656876f595.zip -> github.com%2Felastic%2Fgo-perf%2F@v%2Fv0.0.0-20191212140718-9c656876f595.zip mirror://goproxy//github.com/elastic/go-perf/@v/v0.0.0-20191212140718-9c656876f595.mod -> github.com%2Felastic%2Fgo-perf%2F@v%2Fv0.0.0-20191212140718-9c656876f595.mod mirror://goproxy//github.com/elastic/go-plugins-helpers/@v/v0.0.0-20200207104224-bdf17607b79f.zip -> github.com%2Felastic%2Fgo-plugins-helpers%2F@v%2Fv0.0.0-20200207104224-bdf17607b79f.zip mirror://goproxy//github.com/elastic/go-plugins-helpers/@v/v0.0.0-20200207104224-bdf17607b79f.mod -> github.com%2Felastic%2Fgo-plugins-helpers%2F@v%2Fv0.0.0-20200207104224-bdf17607b79f.mod mirror://goproxy//github.com/elastic/go-seccomp-bpf/@v/v1.1.0.zip -> github.com%2Felastic%2Fgo-seccomp-bpf%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/elastic/go-seccomp-bpf/@v/v1.1.0.mod -> github.com%2Felastic%2Fgo-seccomp-bpf%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/elastic/go-structform/@v/v0.0.6.zip -> github.com%2Felastic%2Fgo-structform%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/elastic/go-structform/@v/v0.0.6.mod -> github.com%2Felastic%2Fgo-structform%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/elastic/go-sysinfo/@v/v1.1.1.mod -> github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/elastic/go-sysinfo/@v/v1.3.0.zip -> github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/elastic/go-sysinfo/@v/v1.3.0.mod -> github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/elastic/go-txfile/@v/v0.0.7.zip -> github.com%2Felastic%2Fgo-txfile%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/elastic/go-txfile/@v/v0.0.7.mod -> github.com%2Felastic%2Fgo-txfile%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/elastic/go-ucfg/@v/v0.7.0.mod -> github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/elastic/go-ucfg/@v/v0.8.3.zip -> github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.8.3.zip mirror://goproxy//github.com/elastic/go-ucfg/@v/v0.8.3.mod -> github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.8.3.mod mirror://goproxy//github.com/elastic/go-windows/@v/v1.0.0.mod -> github.com%2Felastic%2Fgo-windows%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elastic/go-windows/@v/v1.0.1.zip -> github.com%2Felastic%2Fgo-windows%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/elastic/go-windows/@v/v1.0.1.mod -> github.com%2Felastic%2Fgo-windows%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/elastic/gosigar/@v/v0.10.5.zip -> github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.5.zip mirror://goproxy//github.com/elastic/gosigar/@v/v0.10.5.mod -> github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.5.mod mirror://goproxy//github.com/elastic/sarama/@v/v1.24.1-elastic.0.20200519143807-cbc80333a91e.zip -> github.com%2Felastic%2Fsarama%2F@v%2Fv1.24.1-elastic.0.20200519143807-cbc80333a91e.zip mirror://goproxy//github.com/elastic/sarama/@v/v1.24.1-elastic.0.20200519143807-cbc80333a91e.mod -> github.com%2Felastic%2Fsarama%2F@v%2Fv1.24.1-elastic.0.20200519143807-cbc80333a91e.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.zip -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.zip mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/emirpasic/gods/@v/v1.12.0.mod -> github.com%2Femirpasic%2Fgods%2F@v%2Fv1.12.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v0.0.0-20190203023257-5858425f7550.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv0.0.0-20190203023257-5858425f7550.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.5.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.5.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.3.0.zip -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.3.0.mod -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.7.2.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.7.2.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/garyburd/redigo/@v/v1.0.1-0.20160525165706-b8dc90050f24.zip -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv1.0.1-0.20160525165706-b8dc90050f24.zip mirror://goproxy//github.com/garyburd/redigo/@v/v1.0.1-0.20160525165706-b8dc90050f24.mod -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv1.0.1-0.20160525165706-b8dc90050f24.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.2.2.mod -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.zip -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.zip -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-martini/martini/@v/v0.0.0-20170121215854-22fa46961aab.zip -> github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.zip mirror://goproxy//github.com/go-martini/martini/@v/v0.0.0-20170121215854-22fa46961aab.mod -> github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.5-0.20190920104607-14974a1cf647.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.5-0.20190920104607-14974a1cf647.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.5-0.20190920104607-14974a1cf647.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.5-0.20190920104607-14974a1cf647.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-sourcemap/sourcemap/@v/v2.1.2+incompatible.zip -> github.com%2Fgo-sourcemap%2Fsourcemap%2F@v%2Fv2.1.2+incompatible.zip mirror://goproxy//github.com/go-sourcemap/sourcemap/@v/v2.1.2+incompatible.mod -> github.com%2Fgo-sourcemap%2Fsourcemap%2F@v%2Fv2.1.2+incompatible.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gocarina/gocsv/@v/v0.0.0-20170324095351-ffef3ffc77be.zip -> github.com%2Fgocarina%2Fgocsv%2F@v%2Fv0.0.0-20170324095351-ffef3ffc77be.zip mirror://goproxy//github.com/gocarina/gocsv/@v/v0.0.0-20170324095351-ffef3ffc77be.mod -> github.com%2Fgocarina%2Fgocsv%2F@v%2Fv0.0.0-20170324095351-ffef3ffc77be.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.zip -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.zip mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/godror/godror/@v/v0.10.4.zip -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.10.4.zip mirror://goproxy//github.com/godror/godror/@v/v0.10.4.mod -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.10.4.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.7.1.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.7.2-0.20190320160742-5135e617513b.zip -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.2-0.20190320160742-5135e617513b.zip mirror://goproxy//github.com/gofrs/flock/@v/v0.7.2-0.20190320160742-5135e617513b.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.2-0.20190320160742-5135e617513b.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.zip -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/gogo/protobuf/@v/v0.0.0-20171007142547-342cbe0a0415.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv0.0.0-20171007142547-342cbe0a0415.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.0.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang-sql/civil/@v/v0.0.0-20190719163853-cb61b32ac6fe.zip -> github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.zip mirror://goproxy//github.com/golang-sql/civil/@v/v0.0.0-20190719163853-cb61b32ac6fe.mod -> github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20160524151835-7d79101e329e.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20160524151835-7d79101e329e.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/flatbuffers/@v/v1.7.2-0.20170925184458-7a6b2bf521e9.zip -> github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.7.2-0.20170925184458-7a6b2bf521e9.zip mirror://goproxy//github.com/google/flatbuffers/@v/v1.7.2-0.20170925184458-7a6b2bf521e9.mod -> github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.7.2-0.20170925184458-7a6b2bf521e9.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-github/v28/@v/v28.1.1.zip -> github.com%2Fgoogle%2Fgo-github%2Fv28%2F@v%2Fv28.1.1.zip mirror://goproxy//github.com/google/go-github/v28/@v/v28.1.1.mod -> github.com%2Fgoogle%2Fgo-github%2Fv28%2F@v%2Fv28.1.1.mod mirror://goproxy//github.com/google/go-github/v29/@v/v29.0.2.zip -> github.com%2Fgoogle%2Fgo-github%2Fv29%2F@v%2Fv29.0.2.zip mirror://goproxy//github.com/google/go-github/v29/@v/v29.0.2.mod -> github.com%2Fgoogle%2Fgo-github%2Fv29%2F@v%2Fv29.0.2.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20170612174753-24818f796faf.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/subcommands/@v/v1.0.1.mod -> github.com%2Fgoogle%2Fsubcommands%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2-0.20190416172445-c2e93f3ae59f.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2-0.20190416172445-c2e93f3ae59f.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.2-0.20190416172445-c2e93f3ae59f.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2-0.20190416172445-c2e93f3ae59f.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170426233943-68f4ded48ba9.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170426233943-68f4ded48ba9.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.1-0.20190624222214-25d8b0b66985.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.1-0.20190624222214-25d8b0b66985.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.1-0.20190624222214-25d8b0b66985.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.1-0.20190624222214-25d8b0b66985.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.0.0-20190126172459-c818fa66e4c8.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20190126172459-c818fa66e4c8.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorhill/cronexpr/@v/v0.0.0-20161205141322-d520615e531a.zip -> github.com%2Fgorhill%2Fcronexpr%2F@v%2Fv0.0.0-20161205141322-d520615e531a.zip mirror://goproxy//github.com/gorhill/cronexpr/@v/v0.0.0-20161205141322-d520615e531a.mod -> github.com%2Fgorhill%2Fcronexpr%2F@v%2Fv0.0.0-20161205141322-d520615e531a.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20170728041850-787624de3eb7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20170728041850-787624de3eb7.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.13.0.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.13.0.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.13.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/h2non/filetype/@v/v1.0.12.zip -> github.com%2Fh2non%2Ffiletype%2F@v%2Fv1.0.12.zip mirror://goproxy//github.com/h2non/filetype/@v/v1.0.12.mod -> github.com%2Fh2non%2Ffiletype%2F@v%2Fv1.0.12.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v0.0.0-20141028054710-7554cd9344ce.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v0.0.0-20141028054710-7554cd9344ce.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v0.0.0-20161216184304-ed905158d874.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v0.0.0-20161216184304-ed905158d874.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.2-0.20190520140433-59383c442f7d.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.2-0.20190520140433-59383c442f7d.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.2-0.20190520140433-59383c442f7d.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.2-0.20190520140433-59383c442f7d.mod mirror://goproxy//github.com/haya14busa/go-actions-toolkit/@v/v0.0.0-20200105081403-ca0307860f01.zip -> github.com%2Fhaya14busa%2Fgo-actions-toolkit%2F@v%2Fv0.0.0-20200105081403-ca0307860f01.zip mirror://goproxy//github.com/haya14busa/go-actions-toolkit/@v/v0.0.0-20200105081403-ca0307860f01.mod -> github.com%2Fhaya14busa%2Fgo-actions-toolkit%2F@v%2Fv0.0.0-20200105081403-ca0307860f01.mod mirror://goproxy//github.com/haya14busa/go-checkstyle/@v/v0.0.0-20170303121022-5e9d09f51fa1.mod -> github.com%2Fhaya14busa%2Fgo-checkstyle%2F@v%2Fv0.0.0-20170303121022-5e9d09f51fa1.mod mirror://goproxy//github.com/haya14busa/secretbox/@v/v0.0.0-20180525171038-07c7ecf409f5.mod -> github.com%2Fhaya14busa%2Fsecretbox%2F@v%2Fv0.0.0-20180525171038-07c7ecf409f5.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jbenet/go-context/@v/v0.0.0-20150711004518-d14ea06fba99.mod -> github.com%2Fjbenet%2Fgo-context%2F@v%2Fv0.0.0-20150711004518-d14ea06fba99.mod mirror://goproxy//github.com/jcmturner/gofork/@v/v1.0.0.zip -> github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jcmturner/gofork/@v/v1.0.0.mod -> github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jessevdk/go-flags/@v/v1.4.0.mod -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmoiron/sqlx/@v/v1.2.1-0.20190826204134-d7d95172beb5.zip -> github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.1-0.20190826204134-d7d95172beb5.zip mirror://goproxy//github.com/jmoiron/sqlx/@v/v1.2.1-0.20190826204134-d7d95172beb5.mod -> github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.1-0.20190826204134-d7d95172beb5.mod mirror://goproxy//github.com/joeshaw/multierror/@v/v0.0.0-20140124173710-69b34d4ec901.zip -> github.com%2Fjoeshaw%2Fmultierror%2F@v%2Fv0.0.0-20140124173710-69b34d4ec901.zip mirror://goproxy//github.com/joeshaw/multierror/@v/v0.0.0-20140124173710-69b34d4ec901.mod -> github.com%2Fjoeshaw%2Fmultierror%2F@v%2Fv0.0.0-20140124173710-69b34d4ec901.mod mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.zip -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/josephspurrier/goversioninfo/@v/v0.0.0-20200309025242-14b0ab84c6ca.zip -> github.com%2Fjosephspurrier%2Fgoversioninfo%2F@v%2Fv0.0.0-20200309025242-14b0ab84c6ca.zip mirror://goproxy//github.com/josephspurrier/goversioninfo/@v/v0.0.0-20200309025242-14b0ab84c6ca.mod -> github.com%2Fjosephspurrier%2Fgoversioninfo%2F@v%2Fv0.0.0-20200309025242-14b0ab84c6ca.mod mirror://goproxy//github.com/jpillora/backoff/@v/v0.0.0-20180909062703-3050d21c67d7.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv0.0.0-20180909062703-3050d21c67d7.mod mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.zip -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180701071628-ab8a2e0c74be.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180701071628-ab8a2e0c74be.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.zip -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/justinas/nosurf/@v/v1.1.0.mod -> github.com%2Fjustinas%2Fnosurf%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kevinburke/ssh_config/@v/v0.0.0-20190725054713-01f96b0aa0cd.mod -> github.com%2Fkevinburke%2Fssh_config%2F@v%2Fv0.0.0-20190725054713-01f96b0aa0cd.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.9.8.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.8.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.9.8.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.8.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.zip -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.zip mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.8.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.zip -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.0.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.2-0.20190507191818-2ff3cb3adc01.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.2-0.20190507191818-2ff3cb3adc01.zip mirror://goproxy//github.com/lib/pq/@v/v1.1.2-0.20190507191818-2ff3cb3adc01.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.2-0.20190507191818-2ff3cb3adc01.mod mirror://goproxy//github.com/magefile/mage/@v/v1.9.0.zip -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/magefile/mage/@v/v1.9.0.mod -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.1.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.1.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/martini-contrib/render/@v/v0.0.0-20150707142108-ec18f8345a11.zip -> github.com%2Fmartini-contrib%2Frender%2F@v%2Fv0.0.0-20150707142108-ec18f8345a11.zip mirror://goproxy//github.com/martini-contrib/render/@v/v0.0.0-20150707142108-ec18f8345a11.mod -> github.com%2Fmartini-contrib%2Frender%2F@v%2Fv0.0.0-20150707142108-ec18f8345a11.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.8.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20190610004146-91bb50d98149.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190610004146-91bb50d98149.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20191113090002-7c0f6868bffe.zip -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20191113090002-7c0f6868bffe.zip mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20191113090002-7c0f6868bffe.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20191113090002-7c0f6868bffe.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.2.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.7.zip -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.7.zip mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.7.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.7.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.9.0.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.9.0.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.15.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.15.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170116052023-ab25296c0f51.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170116052023-ab25296c0f51.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170116052023-ab25296c0f51.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170116052023-ab25296c0f51.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.zip -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.5.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20190113212917-5533ce8a0da3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20190113212917-5533ce8a0da3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.2.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.0.20190228220655-ac19fd6e7483.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.0.20190228220655-ac19fd6e7483.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.0.20190228220655-ac19fd6e7483.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.0.20190228220655-ac19fd6e7483.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.2-0.20190823105129-775207bd45b6.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.2-0.20190823105129-775207bd45b6.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.2-0.20190823105129-775207bd45b6.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.2-0.20190823105129-775207bd45b6.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.0.0-20190115041553-12f6a991201f.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.0.0-20190115041553-12f6a991201f.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v0.1.2-0.20190507144316-5b71a03e2700.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv0.1.2-0.20190507144316-5b71a03e2700.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runtime-tools/@v/v0.0.0-20181011054405-1d69bd0f9c39.mod -> github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod mirror://goproxy//github.com/oxtoacart/bpool/@v/v0.0.0-20150712133111-4e1c5567d7c2.zip -> github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.zip mirror://goproxy//github.com/oxtoacart/bpool/@v/v0.0.0-20150712133111-4e1c5567d7c2.mod -> github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.mod mirror://goproxy//github.com/pelletier/go-buffruneio/@v/v0.2.0.mod -> github.com%2Fpelletier%2Fgo-buffruneio%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.4.1+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.4.1+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.4.1+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.4.1+incompatible.mod mirror://goproxy//github.com/pierrre/gotestcover/@v/v0.0.0-20160113212533-7b94f124d338.zip -> github.com%2Fpierrre%2Fgotestcover%2F@v%2Fv0.0.0-20160113212533-7b94f124d338.zip mirror://goproxy//github.com/pierrre/gotestcover/@v/v0.0.0-20160113212533-7b94f124d338.mod -> github.com%2Fpierrre%2Fgotestcover%2F@v%2Fv0.0.0-20160113212533-7b94f124d338.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1-0.20171018195549-f15c970de5b7.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20171018195549-f15c970de5b7.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.1-0.20190913103102-20428fa0bffc.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.1-0.20190913103102-20428fa0bffc.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.1-0.20190913103102-20428fa0bffc.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.1-0.20190913103102-20428fa0bffc.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190425082905-87a4384529e0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190425082905-87a4384529e0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.5.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.11.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.11.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.11.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/prometheus/prometheus/@v/v2.5.0+incompatible.zip -> github.com%2Fprometheus%2Fprometheus%2F@v%2Fv2.5.0+incompatible.zip mirror://goproxy//github.com/prometheus/prometheus/@v/v2.5.0+incompatible.mod -> github.com%2Fprometheus%2Fprometheus%2F@v%2Fv2.5.0+incompatible.mod mirror://goproxy//github.com/rakyll/statik/@v/v0.1.6.mod -> github.com%2Frakyll%2Fstatik%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20190826022208-cac0b30c2563.zip -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20190826022208-cac0b30c2563.zip mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20190826022208-cac0b30c2563.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20190826022208-cac0b30c2563.mod mirror://goproxy//github.com/reviewdog/errorformat/@v/v0.0.0-20200109134752-8983be9bc7dd.zip -> github.com%2Freviewdog%2Ferrorformat%2F@v%2Fv0.0.0-20200109134752-8983be9bc7dd.zip mirror://goproxy//github.com/reviewdog/errorformat/@v/v0.0.0-20200109134752-8983be9bc7dd.mod -> github.com%2Freviewdog%2Ferrorformat%2F@v%2Fv0.0.0-20200109134752-8983be9bc7dd.mod mirror://goproxy//github.com/reviewdog/reviewdog/@v/v0.9.17.zip -> github.com%2Freviewdog%2Freviewdog%2F@v%2Fv0.9.17.zip mirror://goproxy//github.com/reviewdog/reviewdog/@v/v0.9.17.mod -> github.com%2Freviewdog%2Freviewdog%2F@v%2Fv0.9.17.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v1.2.0.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/samuel/go-parser/@v/v0.0.0-20130731160455-ca8abbf65d0e.zip -> github.com%2Fsamuel%2Fgo-parser%2F@v%2Fv0.0.0-20130731160455-ca8abbf65d0e.zip mirror://goproxy//github.com/samuel/go-parser/@v/v0.0.0-20130731160455-ca8abbf65d0e.mod -> github.com%2Fsamuel%2Fgo-parser%2F@v%2Fv0.0.0-20130731160455-ca8abbf65d0e.mod mirror://goproxy//github.com/samuel/go-thrift/@v/v0.0.0-20140522043831-2187045faa54.zip -> github.com%2Fsamuel%2Fgo-thrift%2F@v%2Fv0.0.0-20140522043831-2187045faa54.zip mirror://goproxy//github.com/samuel/go-thrift/@v/v0.0.0-20140522043831-2187045faa54.mod -> github.com%2Fsamuel%2Fgo-thrift%2F@v%2Fv0.0.0-20140522043831-2187045faa54.mod mirror://goproxy//github.com/sanathkr/go-yaml/@v/v0.0.0-20170819195128-ed9d249f429b.zip -> github.com%2Fsanathkr%2Fgo-yaml%2F@v%2Fv0.0.0-20170819195128-ed9d249f429b.zip mirror://goproxy//github.com/sanathkr/go-yaml/@v/v0.0.0-20170819195128-ed9d249f429b.mod -> github.com%2Fsanathkr%2Fgo-yaml%2F@v%2Fv0.0.0-20170819195128-ed9d249f429b.mod mirror://goproxy//github.com/sanathkr/yaml/@v/v0.0.0-20170819201035-0056894fa522.mod -> github.com%2Fsanathkr%2Fyaml%2F@v%2Fv0.0.0-20170819201035-0056894fa522.mod mirror://goproxy//github.com/sanathkr/yaml/@v/v1.0.1-0.20170819201035-0056894fa522.zip -> github.com%2Fsanathkr%2Fyaml%2F@v%2Fv1.0.1-0.20170819201035-0056894fa522.zip mirror://goproxy//github.com/sanathkr/yaml/@v/v1.0.1-0.20170819201035-0056894fa522.mod -> github.com%2Fsanathkr%2Fyaml%2F@v%2Fv1.0.1-0.20170819201035-0056894fa522.mod mirror://goproxy//github.com/santhosh-tekuri/jsonschema/@v/v1.2.4.zip -> github.com%2Fsanthosh-tekuri%2Fjsonschema%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/santhosh-tekuri/jsonschema/@v/v1.2.4.mod -> github.com%2Fsanthosh-tekuri%2Fjsonschema%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v2.19.11+incompatible.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.19.11+incompatible.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v2.19.11+incompatible.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.19.11+incompatible.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.4-0.20170822132746-89742aefa4b2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.4-0.20170822132746-89742aefa4b2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/src-d/gcfg/@v/v1.4.0.mod -> github.com%2Fsrc-d%2Fgcfg%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20170704070218-db04d3cc01c8.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.mod mirror://goproxy//github.com/tsg/go-daemon/@v/v0.0.0-20200207173439-e704b93fd89b.zip -> github.com%2Ftsg%2Fgo-daemon%2F@v%2Fv0.0.0-20200207173439-e704b93fd89b.zip mirror://goproxy//github.com/tsg/go-daemon/@v/v0.0.0-20200207173439-e704b93fd89b.mod -> github.com%2Ftsg%2Fgo-daemon%2F@v%2Fv0.0.0-20200207173439-e704b93fd89b.mod mirror://goproxy//github.com/tsg/gopacket/@v/v0.0.0-20190320122513-dd3d0e41124a.zip -> github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20190320122513-dd3d0e41124a.zip mirror://goproxy//github.com/tsg/gopacket/@v/v0.0.0-20190320122513-dd3d0e41124a.mod -> github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20190320122513-dd3d0e41124a.mod mirror://goproxy//github.com/urfave/cli/@v/v0.0.0-20171014202726-7bc6a0acffa5.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.mod mirror://goproxy//github.com/urso/diag/@v/v0.0.0-20200125202105-ffdc32ff5518.mod -> github.com%2Furso%2Fdiag%2F@v%2Fv0.0.0-20200125202105-ffdc32ff5518.mod mirror://goproxy//github.com/urso/diag/@v/v0.0.0-20200210123136-21b3cc8eb797.zip -> github.com%2Furso%2Fdiag%2F@v%2Fv0.0.0-20200210123136-21b3cc8eb797.zip mirror://goproxy//github.com/urso/diag/@v/v0.0.0-20200210123136-21b3cc8eb797.mod -> github.com%2Furso%2Fdiag%2F@v%2Fv0.0.0-20200210123136-21b3cc8eb797.mod mirror://goproxy//github.com/urso/diag-ecs/@v/v0.0.0-20200210114345-ab085841dcb9.zip -> github.com%2Furso%2Fdiag-ecs%2F@v%2Fv0.0.0-20200210114345-ab085841dcb9.zip mirror://goproxy//github.com/urso/diag-ecs/@v/v0.0.0-20200210114345-ab085841dcb9.mod -> github.com%2Furso%2Fdiag-ecs%2F@v%2Fv0.0.0-20200210114345-ab085841dcb9.mod mirror://goproxy//github.com/urso/ecslog/@v/v0.0.1.zip -> github.com%2Furso%2Fecslog%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/urso/ecslog/@v/v0.0.1.mod -> github.com%2Furso%2Fecslog%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/urso/go-bin/@v/v0.0.0-20180220135811-781c575c9f0e.zip -> github.com%2Furso%2Fgo-bin%2F@v%2Fv0.0.0-20180220135811-781c575c9f0e.zip mirror://goproxy//github.com/urso/go-bin/@v/v0.0.0-20180220135811-781c575c9f0e.mod -> github.com%2Furso%2Fgo-bin%2F@v%2Fv0.0.0-20180220135811-781c575c9f0e.mod mirror://goproxy//github.com/urso/magetools/@v/v0.0.0-20190919040553-290c89e0c230.mod -> github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20190919040553-290c89e0c230.mod mirror://goproxy//github.com/urso/magetools/@v/v0.0.0-20200125210132-c2e338f92f3a.zip -> github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20200125210132-c2e338f92f3a.zip mirror://goproxy//github.com/urso/magetools/@v/v0.0.0-20200125210132-c2e338f92f3a.mod -> github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20200125210132-c2e338f92f3a.mod mirror://goproxy//github.com/urso/qcgen/@v/v0.0.0-20180131103024-0b059e7db4f4.zip -> github.com%2Furso%2Fqcgen%2F@v%2Fv0.0.0-20180131103024-0b059e7db4f4.zip mirror://goproxy//github.com/urso/qcgen/@v/v0.0.0-20180131103024-0b059e7db4f4.mod -> github.com%2Furso%2Fqcgen%2F@v%2Fv0.0.0-20180131103024-0b059e7db4f4.mod mirror://goproxy//github.com/urso/sderr/@v/v0.0.0-20200210124243-c2a16f3d43ec.zip -> github.com%2Furso%2Fsderr%2F@v%2Fv0.0.0-20200210124243-c2a16f3d43ec.zip mirror://goproxy//github.com/urso/sderr/@v/v0.0.0-20200210124243-c2a16f3d43ec.mod -> github.com%2Furso%2Fsderr%2F@v%2Fv0.0.0-20200210124243-c2a16f3d43ec.mod mirror://goproxy//github.com/vbatts/tar-split/@v/v0.11.1.mod -> github.com%2Fvbatts%2Ftar-split%2F@v%2Fv0.11.1.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.0.0-20170802214208-2cad15190b41.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.0.0-20170802214208-2cad15190b41.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.0.0-20170802214208-2cad15190b41.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.0.0-20170802214208-2cad15190b41.mod mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.22.3.zip -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.22.3.zip mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.22.3.mod -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.22.3.mod mirror://goproxy//github.com/xanzy/ssh-agent/@v/v0.2.1.mod -> github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.zip -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.zip mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.mod -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.mod mirror://goproxy//github.com/xdg/stringprep/@v/v1.0.0.zip -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/xdg/stringprep/@v/v1.0.0.mod -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20190905194746-02993c407bfb.zip -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20190905194746-02993c407bfb.zip mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20190905194746-02993c407bfb.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20190905194746-02993c407bfb.mod mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.zip -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.zip mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.mod -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20180618132009-1d523034197f.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20181112162635-ac52e6811b56.zip -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20181112162635-ac52e6811b56.zip mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20181112162635-ac52e6811b56.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20181112162635-ac52e6811b56.mod mirror://goproxy//github.com/yuin/gopher-lua/@v/v0.0.0-20170403160031-b402f3114ec7.zip -> github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20170403160031-b402f3114ec7.zip mirror://goproxy//github.com/yuin/gopher-lua/@v/v0.0.0-20170403160031-b402f3114ec7.mod -> github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20170403160031-b402f3114ec7.mod mirror://goproxy//go.elastic.co/apm/@v/v1.7.2.zip -> go.elastic.co%2Fapm%2F@v%2Fv1.7.2.zip mirror://goproxy//go.elastic.co/apm/@v/v1.7.2.mod -> go.elastic.co%2Fapm%2F@v%2Fv1.7.2.mod mirror://goproxy//go.elastic.co/apm/module/apmelasticsearch/@v/v1.7.2.zip -> go.elastic.co%2Fapm%2Fmodule%2Fapmelasticsearch%2F@v%2Fv1.7.2.zip mirror://goproxy//go.elastic.co/apm/module/apmelasticsearch/@v/v1.7.2.mod -> go.elastic.co%2Fapm%2Fmodule%2Fapmelasticsearch%2F@v%2Fv1.7.2.mod mirror://goproxy//go.elastic.co/apm/module/apmhttp/@v/v1.7.2.zip -> go.elastic.co%2Fapm%2Fmodule%2Fapmhttp%2F@v%2Fv1.7.2.zip mirror://goproxy//go.elastic.co/apm/module/apmhttp/@v/v1.7.2.mod -> go.elastic.co%2Fapm%2Fmodule%2Fapmhttp%2F@v%2Fv1.7.2.mod mirror://goproxy//go.elastic.co/ecszap/@v/v0.1.1-0.20200424093508-cdd95a104193.zip -> go.elastic.co%2Fecszap%2F@v%2Fv0.1.1-0.20200424093508-cdd95a104193.zip mirror://goproxy//go.elastic.co/ecszap/@v/v0.1.1-0.20200424093508-cdd95a104193.mod -> go.elastic.co%2Fecszap%2F@v%2Fv0.1.1-0.20200424093508-cdd95a104193.mod mirror://goproxy//go.elastic.co/fastjson/@v/v1.0.0.zip -> go.elastic.co%2Ffastjson%2F@v%2Fv1.0.0.zip mirror://goproxy//go.elastic.co/fastjson/@v/v1.0.0.mod -> go.elastic.co%2Ffastjson%2F@v%2Fv1.0.0.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.zip -> go.opencensus.io%2F@v%2Fv0.22.2.zip mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.3.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.3.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.zip -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.zip mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.14.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.14.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.14.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.14.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20171113213409-9f005a07e0d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20171113213409-9f005a07e0d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181025213731-e84da0312774.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181025213731-e84da0312774.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190219172222-a4c6cb3142f2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190219172222-a4c6cb3142f2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190325154230-a5d413f7728c.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190701094942-4def268fd1a4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200204104054-c9f3fb736b72.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200204104054-c9f3fb736b72.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200510223506-06a226fb4e37.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200510223506-06a226fb4e37.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.zip -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.zip mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181108082009-03003ca0c849.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181108082009-03003ca0c849.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190206173232-65e2d4e15006.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190206173232-65e2d4e15006.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191002035440-2ec189313ef0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191002035440-2ec189313ef0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191021144547-ec77196f6094.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191021144547-ec77196f6094.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191112182307-2180aed22343.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191112182307-2180aed22343.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181106182150-f42d05182288.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181106182150-f42d05182288.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190130055435-99b60b757ec1.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190130055435-99b60b757ec1.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190221075227-b4e8571b14e0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190221075227-b4e8571b14e0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190405154228-4b34438f7a67.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190405154228-4b34438f7a67.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190514135907-3a4b5fb9f71f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190514135907-3a4b5fb9f71f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190616124812-15dcb6c0061f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190801041406-cbf593c0f2f3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191025021431-6c3a3bfe00ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191025021431-6c3a3bfe00ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191112214154-59a1497f0cea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191112214154-59a1497f0cea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200102141924-c96a22e43c9c.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200102141924-c96a22e43c9c.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200102141924-c96a22e43c9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200102141924-c96a22e43c9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20181227161524-e6919f6577db.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20161028155119-f51c12702a4d.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20161028155119-f51c12702a4d.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190729092621-ff9f1409240a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190729092621-ff9f1409240a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029041327-9cc4af7d6b2c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029190741-b9c20aec41a5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.zip mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.2.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.3.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.3.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190927181202-20e1ac93f88c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190927181202-20e1ac93f88c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.24.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.0.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.0.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.0.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.0.mod mirror://goproxy//gopkg.in/jcmturner/aescts.v1/@v/v1.0.1.zip -> gopkg.in%2Fjcmturner%2Faescts.v1%2F@v%2Fv1.0.1.zip mirror://goproxy//gopkg.in/jcmturner/aescts.v1/@v/v1.0.1.mod -> gopkg.in%2Fjcmturner%2Faescts.v1%2F@v%2Fv1.0.1.mod mirror://goproxy//gopkg.in/jcmturner/dnsutils.v1/@v/v1.0.1.zip -> gopkg.in%2Fjcmturner%2Fdnsutils.v1%2F@v%2Fv1.0.1.zip mirror://goproxy//gopkg.in/jcmturner/dnsutils.v1/@v/v1.0.1.mod -> gopkg.in%2Fjcmturner%2Fdnsutils.v1%2F@v%2Fv1.0.1.mod mirror://goproxy//gopkg.in/jcmturner/goidentity.v3/@v/v3.0.0.zip -> gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.zip mirror://goproxy//gopkg.in/jcmturner/goidentity.v3/@v/v3.0.0.mod -> gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.mod mirror://goproxy//gopkg.in/jcmturner/gokrb5.v7/@v/v7.5.0.zip -> gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.5.0.zip mirror://goproxy//gopkg.in/jcmturner/gokrb5.v7/@v/v7.5.0.mod -> gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.5.0.mod mirror://goproxy//gopkg.in/jcmturner/rpc.v1/@v/v1.1.0.zip -> gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.zip mirror://goproxy//gopkg.in/jcmturner/rpc.v1/@v/v1.1.0.mod -> gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.mod mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20160818020120-3f83fa500528.zip -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20160818020120-3f83fa500528.zip mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20160818020120-3f83fa500528.mod -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20160818020120-3f83fa500528.mod mirror://goproxy//gopkg.in/src-d/go-billy.v4/@v/v4.3.2.mod -> gopkg.in%2Fsrc-d%2Fgo-billy.v4%2F@v%2Fv4.3.2.mod mirror://goproxy//gopkg.in/src-d/go-git-fixtures.v3/@v/v3.5.0.mod -> gopkg.in%2Fsrc-d%2Fgo-git-fixtures.v3%2F@v%2Fv3.5.0.mod mirror://goproxy//gopkg.in/src-d/go-git.v4/@v/v4.13.1.mod -> gopkg.in%2Fsrc-d%2Fgo-git.v4%2F@v%2Fv4.13.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.2.mod -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.3.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//howett.net/plist/@v/v0.0.0-20181124034731-591f970eefbb.zip -> howett.net%2Fplist%2F@v%2Fv0.0.0-20181124034731-591f970eefbb.zip mirror://goproxy//howett.net/plist/@v/v0.0.0-20181124034731-591f970eefbb.mod -> howett.net%2Fplist%2F@v%2Fv0.0.0-20181124034731-591f970eefbb.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20190620084959-7cf5895f2711.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190620084959-7cf5895f2711.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20190722141453-b90922c02518.zip -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190722141453-b90922c02518.zip mirror://goproxy//k8s.io/api/@v/v0.0.0-20190722141453-b90922c02518.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190722141453-b90922c02518.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190612205821-1799e75a0719.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190612205821-1799e75a0719.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190719140911-bfcf53abc9f8.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190719140911-bfcf53abc9f8.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190719140911-bfcf53abc9f8.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190719140911-bfcf53abc9f8.mod mirror://goproxy//k8s.io/client-go/@v/v0.0.0-20190620085101-78d2af792bab.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.0.0-20190620085101-78d2af792bab.zip mirror://goproxy//k8s.io/client-go/@v/v0.0.0-20190620085101-78d2af792bab.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.0.0-20190620085101-78d2af792bab.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v0.3.1.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.1.mod mirror://goproxy//k8s.io/klog/@v/v0.3.4-0.20190719014911-6a023d6d0e09.zip -> k8s.io%2Fklog%2F@v%2Fv0.3.4-0.20190719014911-6a023d6d0e09.zip mirror://goproxy//k8s.io/klog/@v/v0.3.4-0.20190719014911-6a023d6d0e09.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.4-0.20190719014911-6a023d6d0e09.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190228160746-b3a7cee44a30.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190228160746-b3a7cee44a30.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190709113604-33be087ad058.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190709113604-33be087ad058.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190709113604-33be087ad058.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190709113604-33be087ad058.mod mirror://goproxy//k8s.io/kubernetes/@v/v1.13.0.mod -> k8s.io%2Fkubernetes%2F@v%2Fv1.13.0.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190221042446-c2654d5206da.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190221042446-c2654d5206da.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190712204705-3dccf664f023.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190712204705-3dccf664f023.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190712204705-3dccf664f023.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190712204705-3dccf664f023.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.1-0.20190704183835-4cd0c284b15f.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.1-0.20190704183835-4cd0c284b15f.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.1-0.20190704183835-4cd0c284b15f.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.1-0.20190704183835-4cd0c284b15f.mod
+_eclasses_=go-module	45394825d9260b479aa1cf252ea58e01
+_md5_=758da1e210c98dbe637c6e91d8fb7eff
diff --git a/metadata/md5-cache/app-admin/keepass-2.45 b/metadata/md5-cache/app-admin/keepass-2.45
index 12bc6f243a4c..0af52c91ed9e 100644
--- a/metadata/md5-cache/app-admin/keepass-2.45
+++ b/metadata/md5-cache/app-admin/keepass-2.45
@@ -4,10 +4,10 @@ DESCRIPTION=A free, open source, light-weight and easy-to-use password manager
 EAPI=7
 HOMEPAGE=https://keepass.info/
 IUSE=aot
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/mono dev-dotnet/libgdiplus[cairo]
 SLOT=0
 SRC_URI=mirror://sourceforge/keepass/KeePass-2.45-Source.zip
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a25f2919a45b5e6ed0bf8c652598695a
+_md5_=18dc82f6e3cf71230d4b10303856af75
diff --git a/metadata/md5-cache/app-admin/keepassxc-2.5.4 b/metadata/md5-cache/app-admin/keepassxc-2.5.4
index 9ef69cc59911..a7e0053be424 100644
--- a/metadata/md5-cache/app-admin/keepassxc-2.5.4
+++ b/metadata/md5-cache/app-admin/keepassxc-2.5.4
@@ -5,7 +5,7 @@ DESCRIPTION=KeePassXC - KeePass Cross-platform Community Edition
 EAPI=7
 HOMEPAGE=https://keepassxc.org
 IUSE=autotype browser ccache debug keeshare +network test yubikey
-KEYWORDS=~amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-2.1 GPL-2 GPL-3
 PDEPEND=x11-misc/xsel
 RDEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= >=dev-libs/libsodium-1.0.12:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/readline:0= sys-libs/zlib:= autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) keeshare? ( dev-libs/quazip ) yubikey? ( sys-auth/ykpers )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/keepassxreboot/keepassxc/releases/download/2.5.4/keepassxc-2.5.4-src.tar.xz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=23f2c1dd261bc7dd17ddc0a58db8793f
+_md5_=122406c1312d9f38dc65a8a2225add02
diff --git a/metadata/md5-cache/app-admin/logstash-bin-7.8.0 b/metadata/md5-cache/app-admin/logstash-bin-7.8.0
new file mode 100644
index 000000000000..9e5245dfb662
--- /dev/null
+++ b/metadata/md5-cache/app-admin/logstash-bin-7.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst preinst prepare setup
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Tool for managing events and logs
+EAPI=7
+HOMEPAGE=https://www.elastic.co/products/logstash
+IUSE=x-pack elibc_FreeBSD
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 MIT x-pack? ( Elastic )
+RDEPEND=acct-group/logstash acct-user/logstash virtual/jre >=dev-java/java-config-2.2.0-r3
+RESTRICT=strip
+SLOT=0
+SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-7.8.0.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-oss-7.8.0.tar.gz )
+_eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb
+_md5_=6b77ac7e3fee24fce90f8767827f44ee
diff --git a/metadata/md5-cache/app-admin/longrun-0.9-r4 b/metadata/md5-cache/app-admin/longrun-0.9-r4
index 2c586a98dafa..5e0ec093c4d9 100644
--- a/metadata/md5-cache/app-admin/longrun-0.9-r4
+++ b/metadata/md5-cache/app-admin/longrun-0.9-r4
@@ -8,5 +8,5 @@ KEYWORDS=-ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/cpu/crusoe/longrun-0.9.tar.bz2 mirror://debian/pool/main/l/longrun/longrun_0.9-19.diff.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a5901b5e9d7f8dcb2c77a890cb1fade1
diff --git a/metadata/md5-cache/app-admin/mcelog-168 b/metadata/md5-cache/app-admin/mcelog-168
index f1e7634ee5f3..546c8167acbd 100644
--- a/metadata/md5-cache/app-admin/mcelog-168
+++ b/metadata/md5-cache/app-admin/mcelog-168
@@ -10,5 +10,5 @@ RDEPEND=selinux? ( sec-policy/selinux-mcelog )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/andikleen/mcelog/archive/v168.tar.gz -> mcelog-168.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=99191409782c80239ccdec849b67b65d
diff --git a/metadata/md5-cache/app-admin/mcelog-169 b/metadata/md5-cache/app-admin/mcelog-169
index ef780b1a8e7a..01845f1b7b91 100644
--- a/metadata/md5-cache/app-admin/mcelog-169
+++ b/metadata/md5-cache/app-admin/mcelog-169
@@ -10,5 +10,5 @@ RDEPEND=selinux? ( sec-policy/selinux-mcelog )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/andikleen/mcelog/archive/v169.tar.gz -> mcelog-169.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=99191409782c80239ccdec849b67b65d
diff --git a/metadata/md5-cache/app-admin/mcelog-170 b/metadata/md5-cache/app-admin/mcelog-170
index 86ac0ef575b6..5604920d94fd 100644
--- a/metadata/md5-cache/app-admin/mcelog-170
+++ b/metadata/md5-cache/app-admin/mcelog-170
@@ -10,5 +10,5 @@ RDEPEND=selinux? ( sec-policy/selinux-mcelog )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/andikleen/mcelog/archive/v170.tar.gz -> mcelog-170.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ea1cf860712de4f6ce3cff399f36be08
diff --git a/metadata/md5-cache/app-admin/mei-amt-check-0_p20170515 b/metadata/md5-cache/app-admin/mei-amt-check-0_p20170515
index ab81b6c56ea0..a3982a9d54de 100644
--- a/metadata/md5-cache/app-admin/mei-amt-check-0_p20170515
+++ b/metadata/md5-cache/app-admin/mei-amt-check-0_p20170515
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/mjg59/mei-amt-check/archive/d07672120ce7a0c79e949e537f3d19efecec1700.tar.gz -> mei-amt-check-0_p20170515.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=84a83d459cb2c0fefb1aa1a67ec433ff
diff --git a/metadata/md5-cache/app-admin/mongo-tools-4.0.19 b/metadata/md5-cache/app-admin/mongo-tools-4.0.19
new file mode 100644
index 000000000000..d01103531a8e
--- /dev/null
+++ b/metadata/md5-cache/app-admin/mongo-tools-4.0.19
@@ -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.19.tar.gz -> mongo-tools-4.0.19.tar.gz
+_md5_=fc0a5c3ebe356bd914a35b642e543d17
diff --git a/metadata/md5-cache/app-admin/mongo-tools-4.2.8 b/metadata/md5-cache/app-admin/mongo-tools-4.2.8
new file mode 100644
index 000000000000..79f9487de6b0
--- /dev/null
+++ b/metadata/md5-cache/app-admin/mongo-tools-4.2.8
@@ -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 ~arm64
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/mongodb/mongo-tools/archive/r4.2.8.tar.gz -> mongo-tools-4.2.8.tar.gz
+_md5_=015044a4b1b37107f8b5825712bc0f85
diff --git a/metadata/md5-cache/app-admin/procinfo-ng-2.0.304-r1 b/metadata/md5-cache/app-admin/procinfo-ng-2.0.304-r1
index ed3b8bf21d9b..b20b462ee62c 100644
--- a/metadata/md5-cache/app-admin/procinfo-ng-2.0.304-r1
+++ b/metadata/md5-cache/app-admin/procinfo-ng-2.0.304-r1
@@ -1,13 +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=prepare
-DEPEND=sys-libs/ncurses:0= !app-admin/procinfo
+DEPEND=sys-libs/ncurses:0=
 DESCRIPTION=Completely rewrite of the old system monitoring app procinfo
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/procinfo-ng/
 KEYWORDS=amd64 hppa x86
 LICENSE=|| ( GPL-2 LGPL-2.1 )
-RDEPEND=sys-libs/ncurses:0= !app-admin/procinfo
+RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/procinfo-ng/procinfo-ng-2.0.304.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fafda5c12128d954af93b79a6074f982
+_md5_=e26096fb7dbc3ff3ca2565bf634cac47
diff --git a/metadata/md5-cache/app-admin/psmon-1.39-r1 b/metadata/md5-cache/app-admin/psmon-1.39-r1
index 2b572f07148a..a0f44cf4db36 100644
--- a/metadata/md5-cache/app-admin/psmon-1.39-r1
+++ b/metadata/md5-cache/app-admin/psmon-1.39-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl[-build(-)]
 SLOT=0
 SRC_URI=http://www.psmon.com/psmon-1.39.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=638281d7f812ac993c8e8dc03cc218b8
diff --git a/metadata/md5-cache/app-admin/puppet-agent-6.15.0 b/metadata/md5-cache/app-admin/puppet-agent-6.15.0
index 28e7d19c6fb4..120ce434f0e1 100644
--- a/metadata/md5-cache/app-admin/puppet-agent-6.15.0
+++ b/metadata/md5-cache/app-admin/puppet-agent-6.15.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.15.0-1stretch_amd64.deb ) x86? ( http://apt.puppetlabs.com/pool/stretch/puppet/p/puppet-agent/puppet-agent_6.15.0-1stretch_i386.deb )
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=0f8a4e7bbef2a39a6f64cbe7dbab22ff
diff --git a/metadata/md5-cache/app-admin/puppet-agent-6.16.0-r1 b/metadata/md5-cache/app-admin/puppet-agent-6.16.0-r1
index a4e5e7551210..895796583e90 100644
--- a/metadata/md5-cache/app-admin/puppet-agent-6.16.0-r1
+++ b/metadata/md5-cache/app-admin/puppet-agent-6.16.0-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.16.0-1stretch_amd64.deb ) x86? ( http://apt.puppetlabs.com/pool/stretch/puppet/p/puppet-agent/puppet-agent_6.16.0-1stretch_i386.deb )
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=922d8a0aa430ad524d8522106168eb28
diff --git a/metadata/md5-cache/app-admin/puppet-agent-6.16.0-r2 b/metadata/md5-cache/app-admin/puppet-agent-6.16.0-r2
index 76e3ffac608d..c2b9f2e6b0e0 100644
--- a/metadata/md5-cache/app-admin/puppet-agent-6.16.0-r2
+++ b/metadata/md5-cache/app-admin/puppet-agent-6.16.0-r2
@@ -11,5 +11,5 @@ RDEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-w
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://apt.puppetlabs.com/pool/focal/puppet/p/puppet-agent/puppet-agent_6.16.0-1focal_amd64.deb
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=7df233b1c941c2bc05d2b0b08d6843bb
diff --git a/metadata/md5-cache/app-admin/rasdaemon-0.6.1-r1 b/metadata/md5-cache/app-admin/rasdaemon-0.6.1-r1
index ff77e1aa68db..ea7944c539c4 100644
--- a/metadata/md5-cache/app-admin/rasdaemon-0.6.1-r1
+++ b/metadata/md5-cache/app-admin/rasdaemon-0.6.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-devel/gettext dev-db/sqlite sys-apps/dmidecode dev-perl/DBD-SQLite
 SLOT=0
 SRC_URI=http://www.infradead.org/~mchehab/rasdaemon/rasdaemon-0.6.1.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=489fdeb54636b3e25b20331db0f6ae75
diff --git a/metadata/md5-cache/app-admin/rasdaemon-0.6.2-r1 b/metadata/md5-cache/app-admin/rasdaemon-0.6.2-r1
index bc542e3a6bdd..4f290c48c7a5 100644
--- a/metadata/md5-cache/app-admin/rasdaemon-0.6.2-r1
+++ b/metadata/md5-cache/app-admin/rasdaemon-0.6.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-devel/gettext dev-db/sqlite sys-apps/dmidecode dev-perl/DBD-SQLite
 SLOT=0
 SRC_URI=http://www.infradead.org/~mchehab/rasdaemon/rasdaemon-0.6.2.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=06716f3222bd86918227523f2da5be57
diff --git a/metadata/md5-cache/app-admin/rasdaemon-0.6.2-r3 b/metadata/md5-cache/app-admin/rasdaemon-0.6.2-r3
index 8c6ab2588ab7..c6601e31ddcb 100644
--- a/metadata/md5-cache/app-admin/rasdaemon-0.6.2-r3
+++ b/metadata/md5-cache/app-admin/rasdaemon-0.6.2-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-devel/gettext dev-db/sqlite sys-apps/dmidecode dev-perl/DBD-SQLite
 SLOT=0
 SRC_URI=http://www.infradead.org/~mchehab/rasdaemon/rasdaemon-0.6.2.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c6171db4c5dccaabf5cda453a166ea73
diff --git a/metadata/md5-cache/app-admin/rasdaemon-0.6.2-r4 b/metadata/md5-cache/app-admin/rasdaemon-0.6.2-r4
index f17b8fe35ae1..a63c259bdb20 100644
--- a/metadata/md5-cache/app-admin/rasdaemon-0.6.2-r4
+++ b/metadata/md5-cache/app-admin/rasdaemon-0.6.2-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-devel/gettext sys-apps/dmidecode sqlite? ( dev-db/sqlite dev-perl/DBD-SQLite )
 SLOT=0
 SRC_URI=http://www.infradead.org/~mchehab/rasdaemon/rasdaemon-0.6.2.tar.bz2
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=44563c39190f060edc82ef0728055e0a
diff --git a/metadata/md5-cache/app-admin/rasdaemon-0.6.5 b/metadata/md5-cache/app-admin/rasdaemon-0.6.5
index e98c85089b07..542f944fef85 100644
--- a/metadata/md5-cache/app-admin/rasdaemon-0.6.5
+++ b/metadata/md5-cache/app-admin/rasdaemon-0.6.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-devel/gettext sys-apps/dmidecode sqlite? ( dev-db/sqlite dev-perl/DBD-SQLite )
 SLOT=0
 SRC_URI=http://www.infradead.org/~mchehab/rasdaemon/rasdaemon-0.6.5.tar.bz2
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dadc6e829d34200597850ec3ca930110
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 7080eb4df78c..0b9f1e203f69 100644
--- a/metadata/md5-cache/app-admin/rsyslog-8.1911.0-r1
+++ b/metadata/md5-cache/app-admin/rsyslog-8.1911.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.1911.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.1911.0.tar.gz )
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=249dca3a078e9943ff2edbcdc7005d8b
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2004.0 b/metadata/md5-cache/app-admin/rsyslog-8.2004.0
index cfcc61775b8a..16ea2990956b 100644
--- a/metadata/md5-cache/app-admin/rsyslog-8.2004.0
+++ b/metadata/md5-cache/app-admin/rsyslog-8.2004.0
@@ -11,5 +11,5 @@ REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2004.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2004.0.tar.gz )
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=22b1bddf1f53cd3143f0835173438787
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2006.0 b/metadata/md5-cache/app-admin/rsyslog-8.2006.0
new file mode 100644
index 000000000000..d8551c4f07e3
--- /dev/null
+++ b/metadata/md5-cache/app-admin/rsyslog-8.2006.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) 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-4:=[drafts] ) >=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/
+IUSE=curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
+LICENSE=GPL-3 LGPL-3 Apache-2.0
+RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) 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-4:=[drafts] )
+REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2006.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2006.0.tar.gz )
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=01fea1a4ec3c5332716a39ffc2dfeb0b
diff --git a/metadata/md5-cache/app-admin/swatchdog-3.2.4-r1 b/metadata/md5-cache/app-admin/swatchdog-3.2.4-r1
index fbe9ac622e30..65355a1385ee 100644
--- a/metadata/md5-cache/app-admin/swatchdog-3.2.4-r1
+++ b/metadata/md5-cache/app-admin/swatchdog-3.2.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/Date-Manip dev-perl/Date-Calc dev-perl/File-Tail dev-perl/TimeDate >=virtual/perl-Time-HiRes-1.12 !app-admin/swatch dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/swatch/swatchdog-3.2.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=afe296f9c4283c547da5473261a1a22a
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.26.1-r1 b/metadata/md5-cache/app-admin/syslog-ng-3.26.1-r1
index 98c44f3e5284..6479436d07d2 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.26.1-r1
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.26.1-r1
@@ -5,7 +5,7 @@ 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_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 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 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 ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.26.1/syslog-ng-3.26.1.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=498a8d82e37e9a04608331d06cd552bf
+_md5_=d3380a39c1fea3ad9e0da97b7ec317f9
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.28.1-r2 b/metadata/md5-cache/app-admin/syslog-ng-3.28.1-r2
new file mode 100644
index 000000000000..32bdae9934c1
--- /dev/null
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.28.1-r2
@@ -0,0 +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_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_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) 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= ) test? ( dev-libs/criterion )
+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_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~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_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_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) 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_7 python_single_target_python3_8 python_single_target_python3_9 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.28.1/syslog-ng-3.28.1.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8ef2ccfcd71c1caf72d00b063d5bdc64
diff --git a/metadata/md5-cache/app-admin/syslog-summary-1.14-r4 b/metadata/md5-cache/app-admin/syslog-summary-1.14-r4
new file mode 100644
index 000000000000..8382e3eda26c
--- /dev/null
+++ b/metadata/md5-cache/app-admin/syslog-summary-1.14-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare setup
+DESCRIPTION=Summarizes the contents of a syslog log file
+EAPI=7
+HOMEPAGE=https://github.com/dpaleino/syslog-summary
+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 )
+SLOT=0
+SRC_URI=https://github.com/downloads/dpaleino/syslog-summary/syslog-summary-1.14.tar.gz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1eccc5db8323673ae5ac261646dc5740
diff --git a/metadata/md5-cache/app-admin/terraform-0.12.28 b/metadata/md5-cache/app-admin/terraform-0.12.28
new file mode 100644
index 000000000000..3b6fa9da7d5d
--- /dev/null
+++ b/metadata/md5-cache/app-admin/terraform-0.12.28
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=A tool for building, changing, and combining infrastructure safely
+EAPI=7
+HOMEPAGE=https://www.terraform.io/
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/terraform/archive/v0.12.28.tar.gz -> terraform-0.12.28.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.zip mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v35.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv35.0.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v36.2.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv36.2.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v36.2.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv36.2.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1-0.20191028180845-3492b2aff503.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1-0.20191028180845-3492b2aff503.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1-0.20191028180845-3492b2aff503.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1-0.20191028180845-3492b2aff503.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20180810175552-4a21cbd618b4.zip -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20180810175552-4a21cbd618b4.zip mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20180810175552-4a21cbd618b4.mod -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20180810175552-4a21cbd618b4.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!chris!trenkamp/goxpath/@v/v0.0.0-20170922090931-c385f95c6022.zip -> github.com%2F!chris!trenkamp%2Fgoxpath%2F@v%2Fv0.0.0-20170922090931-c385f95c6022.zip mirror://goproxy//github.com/!chris!trenkamp/goxpath/@v/v0.0.0-20170922090931-c385f95c6022.mod -> github.com%2F!chris!trenkamp%2Fgoxpath%2F@v%2Fv0.0.0-20170922090931-c385f95c6022.mod mirror://goproxy//github.com/!qcloud!api/qcloud_sign_golang/@v/v0.0.0-20141224014652-e4130a326409.mod -> github.com%2F!qcloud!api%2Fqcloud_sign_golang%2F@v%2Fv0.0.0-20141224014652-e4130a326409.mod mirror://goproxy//github.com/!unknwon/com/@v/v0.0.0-20151008135407-28b053d5a292.zip -> github.com%2F!unknwon%2Fcom%2F@v%2Fv0.0.0-20151008135407-28b053d5a292.zip mirror://goproxy//github.com/!unknwon/com/@v/v0.0.0-20151008135407-28b053d5a292.mod -> github.com%2F!unknwon%2Fcom%2F@v%2Fv0.0.0-20151008135407-28b053d5a292.mod mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.zip -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.mod -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod mirror://goproxy//github.com/agext/levenshtein/@v/v1.2.1.mod -> github.com%2Fagext%2Flevenshtein%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/agext/levenshtein/@v/v1.2.2.zip -> github.com%2Fagext%2Flevenshtein%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/agext/levenshtein/@v/v1.2.2.mod -> github.com%2Fagext%2Flevenshtein%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/agl/ed25519/@v/v0.0.0-20150830182803-278e1ec8e8a6.zip -> github.com%2Fagl%2Fed25519%2F@v%2Fv0.0.0-20150830182803-278e1ec8e8a6.zip mirror://goproxy//github.com/agl/ed25519/@v/v0.0.0-20150830182803-278e1ec8e8a6.mod -> github.com%2Fagl%2Fed25519%2F@v%2Fv0.0.0-20150830182803-278e1ec8e8a6.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/aliyun/alibaba-cloud-sdk-go/@v/v0.0.0-20190329064014-6e358769c32a.zip -> github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190329064014-6e358769c32a.zip mirror://goproxy//github.com/aliyun/alibaba-cloud-sdk-go/@v/v0.0.0-20190329064014-6e358769c32a.mod -> github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190329064014-6e358769c32a.mod mirror://goproxy//github.com/aliyun/aliyun-oss-go-sdk/@v/v0.0.0-20190103054945-8205d1f41e70.zip -> github.com%2Faliyun%2Faliyun-oss-go-sdk%2F@v%2Fv0.0.0-20190103054945-8205d1f41e70.zip mirror://goproxy//github.com/aliyun/aliyun-oss-go-sdk/@v/v0.0.0-20190103054945-8205d1f41e70.mod -> github.com%2Faliyun%2Faliyun-oss-go-sdk%2F@v%2Fv0.0.0-20190103054945-8205d1f41e70.mod mirror://goproxy//github.com/aliyun/aliyun-tablestore-go-sdk/@v/v4.1.2+incompatible.zip -> github.com%2Faliyun%2Faliyun-tablestore-go-sdk%2F@v%2Fv4.1.2+incompatible.zip mirror://goproxy//github.com/aliyun/aliyun-tablestore-go-sdk/@v/v4.1.2+incompatible.mod -> github.com%2Faliyun%2Faliyun-tablestore-go-sdk%2F@v%2Fv4.1.2+incompatible.mod mirror://goproxy//github.com/antchfx/xpath/@v/v0.0.0-20190129040759-c8489ed3251e.zip -> github.com%2Fantchfx%2Fxpath%2F@v%2Fv0.0.0-20190129040759-c8489ed3251e.zip mirror://goproxy//github.com/antchfx/xpath/@v/v0.0.0-20190129040759-c8489ed3251e.mod -> github.com%2Fantchfx%2Fxpath%2F@v%2Fv0.0.0-20190129040759-c8489ed3251e.mod mirror://goproxy//github.com/antchfx/xquery/@v/v0.0.0-20180515051857-ad5b8c7a47b0.zip -> github.com%2Fantchfx%2Fxquery%2F@v%2Fv0.0.0-20180515051857-ad5b8c7a47b0.zip mirror://goproxy//github.com/antchfx/xquery/@v/v0.0.0-20180515051857-ad5b8c7a47b0.mod -> github.com%2Fantchfx%2Fxquery%2F@v%2Fv0.0.0-20180515051857-ad5b8c7a47b0.mod mirror://goproxy//github.com/apparentlymart/go-cidr/@v/v1.0.1.zip -> github.com%2Fapparentlymart%2Fgo-cidr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/apparentlymart/go-cidr/@v/v1.0.1.mod -> github.com%2Fapparentlymart%2Fgo-cidr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/apparentlymart/go-dump/@v/v0.0.0-20180507223929-23540a00eaa3.mod -> github.com%2Fapparentlymart%2Fgo-dump%2F@v%2Fv0.0.0-20180507223929-23540a00eaa3.mod mirror://goproxy//github.com/apparentlymart/go-dump/@v/v0.0.0-20190214190832-042adf3cf4a0.zip -> github.com%2Fapparentlymart%2Fgo-dump%2F@v%2Fv0.0.0-20190214190832-042adf3cf4a0.zip mirror://goproxy//github.com/apparentlymart/go-dump/@v/v0.0.0-20190214190832-042adf3cf4a0.mod -> github.com%2Fapparentlymart%2Fgo-dump%2F@v%2Fv0.0.0-20190214190832-042adf3cf4a0.mod mirror://goproxy//github.com/apparentlymart/go-textseg/@v/v1.0.0.zip -> github.com%2Fapparentlymart%2Fgo-textseg%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/apparentlymart/go-textseg/@v/v1.0.0.mod -> github.com%2Fapparentlymart%2Fgo-textseg%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/apparentlymart/go-versions/@v/v0.0.2-0.20180815153302-64b99f7cb171.zip -> github.com%2Fapparentlymart%2Fgo-versions%2F@v%2Fv0.0.2-0.20180815153302-64b99f7cb171.zip mirror://goproxy//github.com/apparentlymart/go-versions/@v/v0.0.2-0.20180815153302-64b99f7cb171.mod -> github.com%2Fapparentlymart%2Fgo-versions%2F@v%2Fv0.0.2-0.20180815153302-64b99f7cb171.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20190214190532-5111143e8da2.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20190214190532-5111143e8da2.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20190214190532-5111143e8da2.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20190214190532-5111143e8da2.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.78.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.78.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.3.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.3.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.3.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.3.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.30.12.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.30.12.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.30.12.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.30.12.mod mirror://goproxy//github.com/baiyubin/aliyun-sts-go-sdk/@v/v0.0.0-20180326062324-cfa1a18b161f.zip -> github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.zip mirror://goproxy//github.com/baiyubin/aliyun-sts-go-sdk/@v/v0.0.0-20180326062324-cfa1a18b161f.mod -> github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/bgentry/go-netrc/@v/v0.0.0-20140422174119-9fd32a8b3d3d.zip -> github.com%2Fbgentry%2Fgo-netrc%2F@v%2Fv0.0.0-20140422174119-9fd32a8b3d3d.zip mirror://goproxy//github.com/bgentry/go-netrc/@v/v0.0.0-20140422174119-9fd32a8b3d3d.mod -> github.com%2Fbgentry%2Fgo-netrc%2F@v%2Fv0.0.0-20140422174119-9fd32a8b3d3d.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/blang/semver/@v/v3.5.1+incompatible.zip -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.zip mirror://goproxy//github.com/blang/semver/@v/v3.5.1+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.mod mirror://goproxy//github.com/bmatcuk/doublestar/@v/v1.1.5.zip -> github.com%2Fbmatcuk%2Fdoublestar%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/bmatcuk/doublestar/@v/v1.1.5.mod -> github.com%2Fbmatcuk%2Fdoublestar%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.zip -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cheggaaa/pb/@v/v1.0.27.mod -> github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.27.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.zip -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.zip -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.zip mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.zip -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.zip mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.0.zip -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.0.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.zip -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.zip mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20181012123002-c6f51f82210d.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20181012123002-c6f51f82210d.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.zip -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.zip mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v0.0.0-20180920040454-5637cf3d8a31.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv0.0.0-20180920040454-5637cf3d8a31.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v0.0.0-20180920040454-5637cf3d8a31.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv0.0.0-20180920040454-5637cf3d8a31.mod mirror://goproxy//github.com/dylanmei/iso8601/@v/v0.1.0.zip -> github.com%2Fdylanmei%2Fiso8601%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/dylanmei/iso8601/@v/v0.1.0.mod -> github.com%2Fdylanmei%2Fiso8601%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/dylanmei/winrmtest/@v/v0.0.0-20190225150635-99b7fe2fddf1.zip -> github.com%2Fdylanmei%2Fwinrmtest%2F@v%2Fv0.0.0-20190225150635-99b7fe2fddf1.zip mirror://goproxy//github.com/dylanmei/winrmtest/@v/v0.0.0-20190225150635-99b7fe2fddf1.mod -> github.com%2Fdylanmei%2Fwinrmtest%2F@v%2Fv0.0.0-20190225150635-99b7fe2fddf1.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.1.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.3.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.3.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.0.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20180513044358-24b0969c4cb7.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20180513044358-24b0969c4cb7.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20180513044358-24b0969c4cb7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20180513044358-24b0969c4cb7.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.1.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.0-20180518054509-2e65f85255db.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.0-20180518054509-2e65f85255db.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.0.0-20190208042652-bc37892e1968.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20190208042652-bc37892e1968.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.0.0-20190208042652-bc37892e1968.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20190208042652-bc37892e1968.mod mirror://goproxy//github.com/gophercloud/utils/@v/v0.0.0-20190128072930-fbb6ab446f01.zip -> github.com%2Fgophercloud%2Futils%2F@v%2Fv0.0.0-20190128072930-fbb6ab446f01.zip mirror://goproxy//github.com/gophercloud/utils/@v/v0.0.0-20190128072930-fbb6ab446f01.mod -> github.com%2Fgophercloud%2Futils%2F@v%2Fv0.0.0-20190128072930-fbb6ab446f01.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.8.5.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.8.5.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.8.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.8.5.mod mirror://goproxy//github.com/hashicorp/aws-sdk-go-base/@v/v0.4.0.zip -> github.com%2Fhashicorp%2Faws-sdk-go-base%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/hashicorp/aws-sdk-go-base/@v/v0.4.0.mod -> github.com%2Fhashicorp%2Faws-sdk-go-base%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/hashicorp/consul/@v/v0.0.0-20171026175957-610f3c86a089.zip -> github.com%2Fhashicorp%2Fconsul%2F@v%2Fv0.0.0-20171026175957-610f3c86a089.zip mirror://goproxy//github.com/hashicorp/consul/@v/v0.0.0-20171026175957-610f3c86a089.mod -> github.com%2Fhashicorp%2Fconsul%2F@v%2Fv0.0.0-20171026175957-610f3c86a089.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-azure-helpers/@v/v0.10.0.zip -> github.com%2Fhashicorp%2Fgo-azure-helpers%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/hashicorp/go-azure-helpers/@v/v0.10.0.mod -> github.com%2Fhashicorp%2Fgo-azure-helpers%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-getter/@v/v1.4.2-0.20200106182914-9813cbd4eb02.zip -> github.com%2Fhashicorp%2Fgo-getter%2F@v%2Fv1.4.2-0.20200106182914-9813cbd4eb02.zip mirror://goproxy//github.com/hashicorp/go-getter/@v/v1.4.2-0.20200106182914-9813cbd4eb02.mod -> github.com%2Fhashicorp%2Fgo-getter%2F@v%2Fv1.4.2-0.20200106182914-9813cbd4eb02.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20181001195459-61d530d6c27f.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20181001195459-61d530d6c27f.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20181001195459-61d530d6c27f.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20181001195459-61d530d6c27f.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v0.0.0-20180129170900-7f3cd4390caa.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv0.0.0-20180129170900-7f3cd4390caa.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v0.0.0-20180129170900-7f3cd4390caa.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv0.0.0-20180129170900-7f3cd4390caa.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.3.0.zip -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.2.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.2.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-safetemp/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-safetemp%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-safetemp/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-safetemp%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-slug/@v/v0.4.1.zip -> github.com%2Fhashicorp%2Fgo-slug%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/hashicorp/go-slug/@v/v0.4.1.mod -> github.com%2Fhashicorp%2Fgo-slug%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v0.0.0-20180320115054-6d291a969b86.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv0.0.0-20180320115054-6d291a969b86.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v0.0.0-20180320115054-6d291a969b86.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv0.0.0-20180320115054-6d291a969b86.mod mirror://goproxy//github.com/hashicorp/go-tfe/@v/v0.8.1.zip -> github.com%2Fhashicorp%2Fgo-tfe%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/hashicorp/go-tfe/@v/v0.8.1.mod -> github.com%2Fhashicorp%2Fgo-tfe%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v0.0.0-20170504190234-a4b07c25de5f.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv0.0.0-20170504190234-a4b07c25de5f.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v0.0.0-20170504190234-a4b07c25de5f.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv0.0.0-20170504190234-a4b07c25de5f.mod mirror://goproxy//github.com/hashicorp/hcl/v2/@v/v2.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/hashicorp/hcl/v2/@v/v2.3.0.zip -> github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.3.0.zip mirror://goproxy//github.com/hashicorp/hcl/v2/@v/v2.3.0.mod -> github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.3.0.mod mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20190212112733-ab17b08d6590.zip -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20190212112733-ab17b08d6590.zip mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20190212112733-ab17b08d6590.mod -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20190212112733-ab17b08d6590.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.0.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.0.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.0.0-20160124182025-e4ec8cc423bb.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.0.0-20160124182025-e4ec8cc423bb.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.0.0-20160124182025-e4ec8cc423bb.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.0.0-20160124182025-e4ec8cc423bb.mod mirror://goproxy//github.com/hashicorp/terraform-config-inspect/@v/v0.0.0-20191212124732-c6ae6269b9d7.zip -> github.com%2Fhashicorp%2Fterraform-config-inspect%2F@v%2Fv0.0.0-20191212124732-c6ae6269b9d7.zip mirror://goproxy//github.com/hashicorp/terraform-config-inspect/@v/v0.0.0-20191212124732-c6ae6269b9d7.mod -> github.com%2Fhashicorp%2Fterraform-config-inspect%2F@v%2Fv0.0.0-20191212124732-c6ae6269b9d7.mod mirror://goproxy//github.com/hashicorp/terraform-svchost/@v/v0.0.0-20191011084731-65d371908596.zip -> github.com%2Fhashicorp%2Fterraform-svchost%2F@v%2Fv0.0.0-20191011084731-65d371908596.zip mirror://goproxy//github.com/hashicorp/terraform-svchost/@v/v0.0.0-20191011084731-65d371908596.mod -> github.com%2Fhashicorp%2Fterraform-svchost%2F@v%2Fv0.0.0-20191011084731-65d371908596.mod mirror://goproxy//github.com/hashicorp/vault/@v/v0.10.4.zip -> github.com%2Fhashicorp%2Fvault%2F@v%2Fv0.10.4.zip mirror://goproxy//github.com/hashicorp/vault/@v/v0.10.4.mod -> github.com%2Fhashicorp%2Fvault%2F@v%2Fv0.10.4.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/jhump/protoreflect/@v/v1.6.0.zip -> github.com%2Fjhump%2Fprotoreflect%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/jhump/protoreflect/@v/v1.6.0.mod -> github.com%2Fjhump%2Fprotoreflect%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160202185014-0b12d6b521d8.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.3.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.3.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.zip -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180313100802-d8f9c0314926.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180313100802-d8f9c0314926.zip mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180313100802-d8f9c0314926.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180313100802-d8f9c0314926.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.5.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.5.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.2.1+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.2.1+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kardianos/osext/@v/v0.0.0-20190222173326-2bc1f35cddc0.zip -> github.com%2Fkardianos%2Fosext%2F@v%2Fv0.0.0-20190222173326-2bc1f35cddc0.zip mirror://goproxy//github.com/kardianos/osext/@v/v0.0.0-20190222173326-2bc1f35cddc0.mod -> github.com%2Fkardianos%2Fosext%2F@v%2Fv0.0.0-20190222173326-2bc1f35cddc0.mod mirror://goproxy//github.com/keybase/go-crypto/@v/v0.0.0-20161004153544-93f5b35093ba.zip -> github.com%2Fkeybase%2Fgo-crypto%2F@v%2Fv0.0.0-20161004153544-93f5b35093ba.zip mirror://goproxy//github.com/keybase/go-crypto/@v/v0.0.0-20161004153544-93f5b35093ba.mod -> github.com%2Fkeybase%2Fgo-crypto%2F@v%2Fv0.0.0-20161004153544-93f5b35093ba.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v0.0.0-20170820004349-d65d576e9348.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20170820004349-d65d576e9348.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.zip -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.0.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.0.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190309162924-0a377eecf7aa.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190309162924-0a377eecf7aa.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190418170008-ace88ad0983b.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190418170008-ace88ad0983b.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190501133040-e77ea8b19cdc.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190501133040-e77ea8b19cdc.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.20.15.zip -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.20.15.zip mirror://goproxy//github.com/likexian/gokit/@v/v0.20.15.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.20.15.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190409170913-40473a74d76d.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190409170913-40473a74d76d.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190419151922-c1f9f0b4f084.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190419151922-c1f9f0b4f084.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190502021454-d8787b4bfa0b.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190502021454-d8787b4bfa0b.mod mirror://goproxy//github.com/lusis/go-artifactory/@v/v0.0.0-20160115162124-7e4ce345df82.zip -> github.com%2Flusis%2Fgo-artifactory%2F@v%2Fv0.0.0-20160115162124-7e4ce345df82.zip mirror://goproxy//github.com/lusis/go-artifactory/@v/v0.0.0-20160115162124-7e4ce345df82.mod -> github.com%2Flusis%2Fgo-artifactory%2F@v%2Fv0.0.0-20160115162124-7e4ce345df82.mod mirror://goproxy//github.com/masterzen/simplexml/@v/v0.0.0-20160608183007-4572e39b1ab9.zip -> github.com%2Fmasterzen%2Fsimplexml%2F@v%2Fv0.0.0-20160608183007-4572e39b1ab9.zip mirror://goproxy//github.com/masterzen/simplexml/@v/v0.0.0-20160608183007-4572e39b1ab9.mod -> github.com%2Fmasterzen%2Fsimplexml%2F@v%2Fv0.0.0-20160608183007-4572e39b1ab9.mod mirror://goproxy//github.com/masterzen/winrm/@v/v0.0.0-20190223112901-5e5c9a7fe54b.zip -> github.com%2Fmasterzen%2Fwinrm%2F@v%2Fv0.0.0-20190223112901-5e5c9a7fe54b.zip mirror://goproxy//github.com/masterzen/winrm/@v/v0.0.0-20190223112901-5e5c9a7fe54b.mod -> github.com%2Fmasterzen%2Fwinrm%2F@v%2Fv0.0.0-20190223112901-5e5c9a7fe54b.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.1.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.1.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.5.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.5.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.4.zip -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.4.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.8.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.8.zip mirror://goproxy//github.com/miekg/dns/@v/v1.0.8.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.8.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/colorstring/@v/v0.0.0-20190213212951-d06e56a500db.zip -> github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.zip mirror://goproxy//github.com/mitchellh/colorstring/@v/v0.0.0-20190213212951-d06e56a500db.mod -> github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-linereader/@v/v0.0.0-20190213213312-1b945b3263eb.zip -> github.com%2Fmitchellh%2Fgo-linereader%2F@v%2Fv0.0.0-20190213213312-1b945b3263eb.zip mirror://goproxy//github.com/mitchellh/go-linereader/@v/v0.0.0-20190213213312-1b945b3263eb.mod -> github.com%2Fmitchellh%2Fgo-linereader%2F@v%2Fv0.0.0-20190213213312-1b945b3263eb.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v0.0.0-20150314170334-ad45545899c7.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv0.0.0-20150314170334-ad45545899c7.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/panicwrap/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fpanicwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/panicwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fpanicwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/prefixedio/@v/v0.0.0-20190213213902-5733675afd51.zip -> github.com%2Fmitchellh%2Fprefixedio%2F@v%2Fv0.0.0-20190213213902-5733675afd51.zip mirror://goproxy//github.com/mitchellh/prefixedio/@v/v0.0.0-20190213213902-5733675afd51.mod -> github.com%2Fmitchellh%2Fprefixedio%2F@v%2Fv0.0.0-20190213213902-5733675afd51.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mozillazg/go-httpheader/@v/v0.2.1.zip -> github.com%2Fmozillazg%2Fgo-httpheader%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/mozillazg/go-httpheader/@v/v0.2.1.mod -> github.com%2Fmozillazg%2Fgo-httpheader%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/nu7hatch/gouuid/@v/v0.0.0-20131221200532-179d4d0c4d8d.zip -> github.com%2Fnu7hatch%2Fgouuid%2F@v%2Fv0.0.0-20131221200532-179d4d0c4d8d.zip mirror://goproxy//github.com/nu7hatch/gouuid/@v/v0.0.0-20131221200532-179d4d0c4d8d.mod -> github.com%2Fnu7hatch%2Fgouuid%2F@v%2Fv0.0.0-20131221200532-179d4d0c4d8d.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.zip -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/packer-community/winrmcp/@v/v0.0.0-20180102160824-81144009af58.zip -> github.com%2Fpacker-community%2Fwinrmcp%2F@v%2Fv0.0.0-20180102160824-81144009af58.zip mirror://goproxy//github.com/packer-community/winrmcp/@v/v0.0.0-20180102160824-81144009af58.mod -> github.com%2Fpacker-community%2Fwinrmcp%2F@v%2Fv0.0.0-20180102160824-81144009af58.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20180916011732-0a3d74bf9ce4.zip -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20180916011732-0a3d74bf9ce4.zip mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20180916011732-0a3d74bf9ce4.mod -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20180916011732-0a3d74bf9ce4.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.1.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/posener/complete/@v/v1.2.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3-0.20190127221311-3c4408c8b829.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3-0.20190127221311-3c4408c8b829.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190115171406-56726106282f.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190115171406-56726106282f.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/common/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190117184657-bf6a532e95b1.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190117184657-bf6a532e95b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.zip -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20180222194500-ef6db91d284a.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20180222194500-ef6db91d284a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.zip -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.1.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/spf13/afero/@v/v1.2.1.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.2.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/svanharmelen/jsonapi/@v/v0.0.0-20180618144545-0c0828c3f16d.zip -> github.com%2Fsvanharmelen%2Fjsonapi%2F@v%2Fv0.0.0-20180618144545-0c0828c3f16d.zip mirror://goproxy//github.com/svanharmelen/jsonapi/@v/v0.0.0-20180618144545-0c0828c3f16d.mod -> github.com%2Fsvanharmelen%2Fjsonapi%2F@v%2Fv0.0.0-20180618144545-0c0828c3f16d.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.82+incompatible.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.82+incompatible.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.82+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.82+incompatible.mod mirror://goproxy//github.com/tencentyun/cos-go-sdk-v5/@v/v0.0.0-20190808065407-f07404cefc8c.zip -> github.com%2Ftencentyun%2Fcos-go-sdk-v5%2F@v%2Fv0.0.0-20190808065407-f07404cefc8c.zip mirror://goproxy//github.com/tencentyun/cos-go-sdk-v5/@v/v0.0.0-20190808065407-f07404cefc8c.mod -> github.com%2Ftencentyun%2Fcos-go-sdk-v5%2F@v%2Fv0.0.0-20190808065407-f07404cefc8c.mod mirror://goproxy//github.com/terraform-providers/terraform-provider-openstack/@v/v1.15.0.zip -> github.com%2Fterraform-providers%2Fterraform-provider-openstack%2F@v%2Fv1.15.0.zip mirror://goproxy//github.com/terraform-providers/terraform-provider-openstack/@v/v1.15.0.mod -> github.com%2Fterraform-providers%2Fterraform-provider-openstack%2F@v%2Fv1.15.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20171017195756-830351dc03c6.zip -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20171017195756-830351dc03c6.zip mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20171017195756-830351dc03c6.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20171017195756-830351dc03c6.mod mirror://goproxy//github.com/ugorji/go/@v/v0.0.0-20180813092308-00b869d2f4a5.zip -> github.com%2Fugorji%2Fgo%2F@v%2Fv0.0.0-20180813092308-00b869d2f4a5.zip mirror://goproxy//github.com/ugorji/go/@v/v0.0.0-20180813092308-00b869d2f4a5.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv0.0.0-20180813092308-00b869d2f4a5.mod mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.5.zip -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.5.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/vmihailenco/msgpack/@v/v3.3.3+incompatible.mod -> github.com%2Fvmihailenco%2Fmsgpack%2F@v%2Fv3.3.3+incompatible.mod mirror://goproxy//github.com/vmihailenco/msgpack/@v/v4.0.1+incompatible.zip -> github.com%2Fvmihailenco%2Fmsgpack%2F@v%2Fv4.0.1+incompatible.zip mirror://goproxy//github.com/vmihailenco/msgpack/@v/v4.0.1+incompatible.mod -> github.com%2Fvmihailenco%2Fmsgpack%2F@v%2Fv4.0.1+incompatible.mod mirror://goproxy//github.com/xanzy/ssh-agent/@v/v0.2.1.zip -> github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/xanzy/ssh-agent/@v/v0.2.1.mod -> github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20160813154853-07dd2e8dfe18.zip -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20160813154853-07dd2e8dfe18.zip mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20160813154853-07dd2e8dfe18.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20160813154853-07dd2e8dfe18.mod mirror://goproxy//github.com/xlab/treeprint/@v/v0.0.0-20161029104018-1d6e34225557.zip -> github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20161029104018-1d6e34225557.zip mirror://goproxy//github.com/xlab/treeprint/@v/v0.0.0-20161029104018-1d6e34225557.mod -> github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20161029104018-1d6e34225557.mod mirror://goproxy//github.com/zclconf/go-cty/@v/v1.0.0.mod -> github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/zclconf/go-cty/@v/v1.1.0.zip -> github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/zclconf/go-cty/@v/v1.1.0.mod -> github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/zclconf/go-cty/@v/v1.2.0.zip -> github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/zclconf/go-cty/@v/v1.2.0.mod -> github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/zclconf/go-cty/@v/v1.2.1.zip -> github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/zclconf/go-cty/@v/v1.2.1.mod -> github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/zclconf/go-cty-yaml/@v/v1.0.1.zip -> github.com%2Fzclconf%2Fgo-cty-yaml%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/zclconf/go-cty-yaml/@v/v1.0.1.mod -> github.com%2Fzclconf%2Fgo-cty-yaml%2F@v%2Fv1.0.1.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.zip -> go.opencensus.io%2F@v%2Fv0.22.0.zip mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.zip mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.9.1.zip -> go.uber.org%2Fzap%2F@v%2Fv1.9.1.zip mirror://goproxy//go.uber.org/zap/@v/v1.9.1.mod -> go.uber.org%2Fzap%2F@v%2Fv1.9.1.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190219172222-a4c6cb3142f2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190219172222-a4c6cb3142f2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190222235706-ffb98f73852f.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190222235706-ffb98f73852f.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190426145343-a29dc8fdc734.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190426145343-a29dc8fdc734.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200510223506-06a226fb4e37.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200510223506-06a226fb4e37.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180530234432-1e491301e022.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180530234432-1e491301e022.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180811021610-c39426892332.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180811021610-c39426892332.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190125091013-d26f9f9a57f3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190125091013-d26f9f9a57f3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191009170851-d66e71096ffb.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191009170851-d66e71096ffb.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191009170851-d66e71096ffb.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191009170851-d66e71096ffb.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190221075227-b4e8571b14e0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190221075227-b4e8571b14e0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502175342-a43fa875dd82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502175342-a43fa875dd82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190804053845-51ab0e2deafa.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190804053845-51ab0e2deafa.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190804053845-51ab0e2deafa.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190804053845-51ab0e2deafa.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.zip mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20170818010345-ee236bd376b0.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20170818010345-ee236bd376b0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/grpc/@v/v1.8.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.8.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.27.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.27.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.42.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.42.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod
+_eclasses_=go-module	45394825d9260b479aa1cf252ea58e01
+_md5_=e59a33d55364f17bf6b01c3d4886e16b
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 abac7d992cd5..3622f4324400 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	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	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 cc2211b072de..3eeb032c683f 100644
--- a/metadata/md5-cache/app-admin/usbview-2.0
+++ b/metadata/md5-cache/app-admin/usbview-2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3
 SLOT=0
 SRC_URI=http://www.kroah.com/linux-usb/usbview-2.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6101b91dfcd107c88c26c08b4d89ecf4
diff --git a/metadata/md5-cache/app-admin/vault-1.4.0 b/metadata/md5-cache/app-admin/vault-1.4.0
deleted file mode 100644
index 0370ed1346f0..000000000000
--- a/metadata/md5-cache/app-admin/vault-1.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-go/gox filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=acct-group/vault acct-user/vault
-DESCRIPTION=A tool for managing secrets
-EAPI=7
-HOMEPAGE=https://vaultproject.io/
-IUSE=+webui +filecaps
-KEYWORDS=amd64
-LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT
-RDEPEND=acct-group/vault acct-user/vault filecaps? ( sys-libs/libcap )
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/hashicorp/vault/archive/v1.4.0.tar.gz -> vault-1.4.0.tar.gz webui? ( https://dev.gentoo.org/~williamh/dist/vault-1.4.0-webui.tar.xz )
-_eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	go-module	45394825d9260b479aa1cf252ea58e01	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=552937441f3fb8f4e8863f19a29716f6
diff --git a/metadata/md5-cache/app-admin/vault-1.4.2 b/metadata/md5-cache/app-admin/vault-1.4.2
deleted file mode 100644
index 65d483c2181a..000000000000
--- a/metadata/md5-cache/app-admin/vault-1.4.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-go/gox filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=acct-group/vault acct-user/vault
-DESCRIPTION=A tool for managing secrets
-EAPI=7
-HOMEPAGE=https://vaultproject.io/
-IUSE=+webui +filecaps
-KEYWORDS=~amd64
-LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT
-RDEPEND=acct-group/vault acct-user/vault filecaps? ( sys-libs/libcap )
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/hashicorp/vault/archive/v1.4.2.tar.gz -> vault-1.4.2.tar.gz webui? ( https://dev.gentoo.org/~zmedico/dist/vault-1.4.2-webui.tar.xz )
-_eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	go-module	45394825d9260b479aa1cf252ea58e01	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f69d8eec540be6dac43a386afc302c97
diff --git a/metadata/md5-cache/app-admin/vault-1.4.2-r1 b/metadata/md5-cache/app-admin/vault-1.4.2-r1
new file mode 100644
index 000000000000..4d300d291ff8
--- /dev/null
+++ b/metadata/md5-cache/app-admin/vault-1.4.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-go/gox filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=acct-group/vault acct-user/vault
+DESCRIPTION=A tool for managing secrets
+EAPI=7
+HOMEPAGE=https://vaultproject.io/
+IUSE=+webui +filecaps
+KEYWORDS=amd64
+LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT
+RDEPEND=acct-group/vault acct-user/vault filecaps? ( sys-libs/libcap )
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/vault/archive/v1.4.2.tar.gz -> vault-1.4.2.tar.gz webui? ( https://dev.gentoo.org/~zmedico/dist/vault-1.4.2-webui.tar.xz )
+_eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	go-module	45394825d9260b479aa1cf252ea58e01	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a3463ad518e43c62c5e4caea85e6f2a2
diff --git a/metadata/md5-cache/app-antivirus/Manifest.gz b/metadata/md5-cache/app-antivirus/Manifest.gz
index 365303214c71..d9a6480f8a0f 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.102.3-r1 b/metadata/md5-cache/app-antivirus/clamav-0.102.3-r1
new file mode 100644
index 000000000000..7a6b42b18a38
--- /dev/null
+++ b/metadata/md5-cache/app-antivirus/clamav-0.102.3-r1
@@ -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 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=acct-group/clamav acct-user/clamav dev-libs/libltdl dev-libs/libmspack || ( dev-libs/libpcre2 >dev-libs/libpcre-6 ) dev-libs/tomsfastmath >=sys-libs/zlib-1.2.2:= bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) clamsubmit? ( net-misc/curl dev-libs/json-c:= ) elibc_musl? ( sys-libs/fts-standalone ) iconv? ( virtual/libiconv ) !libclamav-only? ( net-misc/curl ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) xml? ( dev-libs/libxml2 ) metadata-analysis-api? ( dev-libs/json-c:* ) test? ( dev-libs/check )
+DESCRIPTION=Clam Anti-Virus Scanner
+EAPI=7
+HOMEPAGE=https://www.clamav.net/
+IUSE=bzip2 doc clamdtop clamsubmit iconv ipv6 libclamav-only libressl milter metadata-analysis-api selinux 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 dev-libs/libltdl dev-libs/libmspack || ( dev-libs/libpcre2 >dev-libs/libpcre-6 ) dev-libs/tomsfastmath >=sys-libs/zlib-1.2.2:= bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) clamsubmit? ( net-misc/curl dev-libs/json-c:= ) elibc_musl? ( sys-libs/fts-standalone ) iconv? ( virtual/libiconv ) !libclamav-only? ( net-misc/curl ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) xml? ( dev-libs/libxml2 ) selinux? ( sec-policy/selinux-clamav )
+REQUIRED_USE=libclamav-only? ( !clamdtop !clamsubmit !milter !metadata-analysis-api )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.clamav.net/downloads/production/clamav-0.102.3.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0ad4949949bc9e9e5a10b073035972c8
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index c5e3eb05efb6..2bda7fad3020 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/alien-8.95 b/metadata/md5-cache/app-arch/alien-8.95
index fb9033697208..bb2891b36270 100644
--- a/metadata/md5-cache/app-arch/alien-8.95
+++ b/metadata/md5-cache/app-arch/alien-8.95
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-arch/rpm app-arch/dpkg dev-util/debhelper >=app-arch/tar-1.14.91 bzip2? ( app-arch/bzip2 ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://debian/pool/main/a/alien/alien_8.95.tar.xz -> alien-8.95.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e0582ba690e8ec75c2ba57806564a565
diff --git a/metadata/md5-cache/app-arch/dpkg-1.20.0 b/metadata/md5-cache/app-arch/dpkg-1.20.0
index f21b8a699fa1..d288fdb9e8b8 100644
--- a/metadata/md5-cache/app-arch/dpkg-1.20.0
+++ b/metadata/md5-cache/app-arch/dpkg-1.20.0
@@ -4,11 +4,11 @@ DESCRIPTION=Package maintenance system for Debian
 EAPI=6
 HOMEPAGE=https://packages.qa.debian.org/dpkg
 IUSE=+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-lang/perl-5.14.2:= bzip2? ( app-arch/bzip2 ) libmd? ( app-crypt/libmd ) lzma? ( app-arch/xz-utils ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.20.0.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b43c2c7ab81a38b302353fe3af2254ef
+_md5_=637e2519daf26b5066df77191aea6260
diff --git a/metadata/md5-cache/app-arch/dpkg-1.20.2 b/metadata/md5-cache/app-arch/dpkg-1.20.2
new file mode 100644
index 000000000000..458189a73756
--- /dev/null
+++ b/metadata/md5-cache/app-arch/dpkg-1.20.2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/flex nls? ( app-text/po4a >=sys-devel/gettext-0.18.2 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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-lang/perl-5.14.2:= bzip2? ( app-arch/bzip2 ) libmd? ( app-crypt/libmd ) lzma? ( app-arch/xz-utils ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 ) app-arch/xz-utils virtual/pkgconfig test? ( dev-perl/IO-String dev-perl/Test-Pod virtual/perl-Test-Harness )
+DESCRIPTION=Package maintenance system for Debian
+EAPI=7
+HOMEPAGE=https://packages.qa.debian.org/dpkg
+IUSE=+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=>=dev-lang/perl-5.14.2:= bzip2? ( app-arch/bzip2 ) libmd? ( app-crypt/libmd ) lzma? ( app-arch/xz-utils ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.20.2.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ddd9b426b5f1543f260cf829fab56d3b
diff --git a/metadata/md5-cache/app-arch/lha-114i_p20201004 b/metadata/md5-cache/app-arch/lha-114i_p20201004
index ccd55217d32f..9bb251768ffa 100644
--- a/metadata/md5-cache/app-arch/lha-114i_p20201004
+++ b/metadata/md5-cache/app-arch/lha-114i_p20201004
@@ -3,9 +3,9 @@ DEFINED_PHASES=configure install prepare
 DESCRIPTION=Utility for creating and opening lzh archives
 EAPI=7
 HOMEPAGE=https://github.com/jca02266/lha https://lha.osdn.jp
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint
 LICENSE=lha
 SLOT=0
 SRC_URI=https://github.com/jca02266/lha/archive/7c3cd95fdf0d2f9198bb779561724cd314bc39a6.tar.gz -> lha-114i_p20201004.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=08417c557754a98b074bf01c69ec56ee
+_md5_=40d6d3653e9e6f147e586dd6b6f027f9
diff --git a/metadata/md5-cache/app-arch/makeself-2.2.0-r2 b/metadata/md5-cache/app-arch/makeself-2.2.0-r2
index 5f9f416c9191..ad0ff59ba6b6 100644
--- a/metadata/md5-cache/app-arch/makeself-2.2.0-r2
+++ b/metadata/md5-cache/app-arch/makeself-2.2.0-r2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://github.com/megastep/makeself/archive/release-2.2.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=588602b5a4e68bcd8f766613b6088d9d
diff --git a/metadata/md5-cache/app-arch/pax-20161104 b/metadata/md5-cache/app-arch/pax-20161104
index c6b71fa46176..aa3861d4ee97 100644
--- a/metadata/md5-cache/app-arch/pax-20161104
+++ b/metadata/md5-cache/app-arch/pax-20161104
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libbsd elibc_musl? ( sys-libs/fts-standalone )
 SLOT=0
 SRC_URI=https://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-20161104.cpio.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b04bd098ddad95d6604a0ce01c418d50
diff --git a/metadata/md5-cache/app-arch/pet2tgz-0.3 b/metadata/md5-cache/app-arch/pet2tgz-0.3
deleted file mode 100644
index 71dc3bce2afd..000000000000
--- a/metadata/md5-cache/app-arch/pet2tgz-0.3
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Puppy Linux .pet to .tar.gz converter
-EAPI=4
-HOMEPAGE=https://sourceforge.net/projects/pet2tgz/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://sourceforge/pet2tgz/pet2tgz-0.3.tar.gz
-_md5_=5c18991667135df17e321b0c5063e830
diff --git a/metadata/md5-cache/app-arch/pet2tgz-0.3-r1 b/metadata/md5-cache/app-arch/pet2tgz-0.3-r1
new file mode 100644
index 000000000000..23d9ce697bed
--- /dev/null
+++ b/metadata/md5-cache/app-arch/pet2tgz-0.3-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Puppy Linux .pet to .tar.gz converter
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/pet2tgz/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=mirror://sourceforge/pet2tgz/pet2tgz-0.3.tar.gz
+_md5_=546d858ca8913be76831d6eb0b916972
diff --git a/metadata/md5-cache/app-arch/vimball-0.5.1 b/metadata/md5-cache/app-arch/vimball-0.5.1
index e370bf0f360e..2f3b6c1bd12d 100644
--- a/metadata/md5-cache/app-arch/vimball-0.5.1
+++ b/metadata/md5-cache/app-arch/vimball-0.5.1
@@ -5,7 +5,7 @@ DESCRIPTION=a command-line vimball archive extractor
 EAPI=7
 HOMEPAGE=https://github.com/radhermit/vimball
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+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(-)] >=dev-python/setuptools-42.0.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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/vimball/vimball-0.5.1.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d34bf13e54534830d8eecd522c1ecee7
+_md5_=5ee013e9320cc217469919de2e5e6273
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 45312bd5aae9..b199c3cba052 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 109998ab5503..0c78430eda12 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	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=498c097f6ef59f994923ec392ab7bcb5
diff --git a/metadata/md5-cache/app-backup/btrbk-0.29.1 b/metadata/md5-cache/app-backup/btrbk-0.29.1
index d27ec86f1c0b..15022d766c8e 100644
--- a/metadata/md5-cache/app-backup/btrbk-0.29.1
+++ b/metadata/md5-cache/app-backup/btrbk-0.29.1
@@ -5,10 +5,10 @@ DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
 EAPI=7
 HOMEPAGE=https://digint.ch/btrbk/
 IUSE=+mbuffer +doc
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 arm ~arm64 ~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	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=111215d7573695620416371a13f46355
+_md5_=fefe95f43a5ac39437738d878c2de6ee
diff --git a/metadata/md5-cache/app-backup/luckybackup-0.5.0 b/metadata/md5-cache/app-backup/luckybackup-0.5.0
new file mode 100644
index 000000000000..ba5f0018207f
--- /dev/null
+++ b/metadata/md5-cache/app-backup/luckybackup-0.5.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
+DESCRIPTION=Powerful and flexible backup (and syncing) tool, using RSync and Qt
+EAPI=7
+HOMEPAGE=http://luckybackup.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 net-misc/rsync sys-auth/polkit
+SLOT=0
+SRC_URI=mirror://sourceforge/luckybackup/luckybackup-0.5.0.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d972f17e03bd2edd673743ef667bab75
diff --git a/metadata/md5-cache/app-backup/rsnapshot-1.3.1-r2 b/metadata/md5-cache/app-backup/rsnapshot-1.3.1-r2
deleted file mode 100644
index 9248491a6ef1..000000000000
--- a/metadata/md5-cache/app-backup/rsnapshot-1.3.1-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=>=dev-lang/perl-5.8.2 dev-perl/Lchown >=sys-apps/util-linux-2.12-r4 >=sys-apps/coreutils-5.0.91-r4 >=net-misc/openssh-3.7.1_p2-r1 >=net-misc/rsync-2.6.0
-DESCRIPTION=A filesystem backup utility based on rsync
-EAPI=5
-HOMEPAGE=http://www.rsnapshot.org
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.8.2 dev-perl/Lchown >=sys-apps/util-linux-2.12-r4 >=sys-apps/coreutils-5.0.91-r4 >=net-misc/openssh-3.7.1_p2-r1 >=net-misc/rsync-2.6.0
-SLOT=0
-SRC_URI=http://www.rsnapshot.org/downloads/rsnapshot-1.3.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=93c30be772cad01fb8155babd93d7e86
diff --git a/metadata/md5-cache/app-backup/rsnapshot-1.4.1 b/metadata/md5-cache/app-backup/rsnapshot-1.4.1
deleted file mode 100644
index 3e21c595e739..000000000000
--- a/metadata/md5-cache/app-backup/rsnapshot-1.4.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=>=dev-lang/perl-5.8.2 dev-perl/Lchown >=sys-apps/util-linux-2.12-r4 >=sys-apps/coreutils-5.0.91-r4 >=net-misc/openssh-3.7.1_p2-r1 >=net-misc/rsync-2.6.0
-DESCRIPTION=A filesystem backup utility based on rsync
-EAPI=5
-HOMEPAGE=http://www.rsnapshot.org
-KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.8.2 dev-perl/Lchown >=sys-apps/util-linux-2.12-r4 >=sys-apps/coreutils-5.0.91-r4 >=net-misc/openssh-3.7.1_p2-r1 >=net-misc/rsync-2.6.0
-SLOT=0
-SRC_URI=http://www.rsnapshot.org/downloads/rsnapshot-1.4.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2f5935e89457a657c247584305084efc
diff --git a/metadata/md5-cache/app-backup/rsnapshot-1.4.3 b/metadata/md5-cache/app-backup/rsnapshot-1.4.3
new file mode 100644
index 000000000000..6627e222ad8a
--- /dev/null
+++ b/metadata/md5-cache/app-backup/rsnapshot-1.4.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst prepare
+DEPEND=>=dev-lang/perl-5.8.2 dev-perl/Lchown >=sys-apps/util-linux-2.12-r4 >=sys-apps/coreutils-5.0.91-r4 >=net-misc/openssh-3.7.1_p2-r1 >=net-misc/rsync-2.6.0
+DESCRIPTION=A filesystem backup utility based on rsync
+EAPI=7
+HOMEPAGE=https://www.rsnapshot.org
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.8.2 dev-perl/Lchown >=sys-apps/util-linux-2.12-r4 >=sys-apps/coreutils-5.0.91-r4 >=net-misc/openssh-3.7.1_p2-r1 >=net-misc/rsync-2.6.0
+SLOT=0
+SRC_URI=https://www.rsnapshot.org/downloads/rsnapshot-1.4.3.tar.gz
+_md5_=24e1d5da24a908101b8b090018b2b46b
diff --git a/metadata/md5-cache/app-backup/spideroak-bin-7.5.0-r1 b/metadata/md5-cache/app-backup/spideroak-bin-7.5.0-r1
index 9c36337f3e61..2838810e2fa0 100644
--- a/metadata/md5-cache/app-backup/spideroak-bin-7.5.0-r1
+++ b/metadata/md5-cache/app-backup/spideroak-bin-7.5.0-r1
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/mit-krb5[keyutils] media-libs/libpng-compat:1.2 dbus? ( sys-ap
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=x86? ( https://spideroak.com/release/spideroak/deb_x86 -> spideroak-bin-7.5.0_x86.deb ) amd64? ( https://spideroak.com/release/spideroak/deb_x64 -> spideroak-bin-7.5.0_amd64.deb )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8f8e5d233b8c29f2c409b247892a4970
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index 87c0f66a212f..2fc3c8241c8a 100644
--- a/metadata/md5-cache/app-benchmarks/Manifest.gz
+++ b/metadata/md5-cache/app-benchmarks/Manifest.gz
diff --git a/metadata/md5-cache/app-benchmarks/bootchart2-0.14.8-r1 b/metadata/md5-cache/app-benchmarks/bootchart2-0.14.8-r1
index f713afe3f2e1..b0d9644f074b 100644
--- a/metadata/md5-cache/app-benchmarks/bootchart2-0.14.8-r1
+++ b/metadata/md5-cache/app-benchmarks/bootchart2-0.14.8-r1
@@ -10,5 +10,5 @@ RDEPEND=!app-benchmarks/bootchart sys-apps/lsb-release
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mmeeks/bootchart/archive/0.14.8.tar.gz -> bootchart2-0.14.8.tar.gz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b701d8412b8ce30b2402000839ddacbc
diff --git a/metadata/md5-cache/app-benchmarks/geekbench-5.2.0 b/metadata/md5-cache/app-benchmarks/geekbench-5.2.0
deleted file mode 100644
index 2b3dcdd07df4..000000000000
--- a/metadata/md5-cache/app-benchmarks/geekbench-5.2.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install nofetch postinst
-DESCRIPTION=A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows
-EAPI=7
-HOMEPAGE=https://www.geekbench.com/
-KEYWORDS=-* ~amd64
-LICENSE=geekbench
-RESTRICT=bindist mirror
-SLOT=5
-SRC_URI=https://cdn.geekbench.com/Geekbench-5.2.0-Linux.tar.gz
-_md5_=9023cd43554c9ec192eb5cebc3907fe1
diff --git a/metadata/md5-cache/app-benchmarks/geekbench-5.2.1 b/metadata/md5-cache/app-benchmarks/geekbench-5.2.1
new file mode 100644
index 000000000000..5834591c24e1
--- /dev/null
+++ b/metadata/md5-cache/app-benchmarks/geekbench-5.2.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install nofetch postinst
+DESCRIPTION=A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows
+EAPI=7
+HOMEPAGE=https://www.geekbench.com/
+KEYWORDS=-* ~amd64
+LICENSE=geekbench
+RESTRICT=bindist mirror
+SLOT=5
+SRC_URI=https://cdn.geekbench.com/Geekbench-5.2.1-Linux.tar.gz
+_md5_=9023cd43554c9ec192eb5cebc3907fe1
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index 01aef9a190c8..dbad4c344eb2 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/cdw-0.8.1-r1 b/metadata/md5-cache/app-cdr/cdw-0.8.1-r1
index d6022d45abce..ccf21657a1cf 100644
--- a/metadata/md5-cache/app-cdr/cdw-0.8.1-r1
+++ b/metadata/md5-cache/app-cdr/cdw-0.8.1-r1
@@ -1,5 +1,5 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure
+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=app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio:=[-minimal] sys-libs/ncurses:0=[unicode] virtual/cdrtools
 DESCRIPTION=An ncurses based console frontend for cdrtools and dvd+rw-tools
 EAPI=7
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio:=[-minimal] sys-libs/ncurses:0=[unicode] virtual/cdrtools
 SLOT=0
 SRC_URI=mirror://sourceforge/cdw/cdw-0.8.1.tar.gz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=465a97b818413633c1fa5c490b87933d
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ea7a3725bf565167fd2b8a14ac754f2e
diff --git a/metadata/md5-cache/app-cdr/cdw-9999 b/metadata/md5-cache/app-cdr/cdw-9999
index 55ef8457dc84..404c96b0e79f 100644
--- a/metadata/md5-cache/app-cdr/cdw-9999
+++ b/metadata/md5-cache/app-cdr/cdw-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio:=[-minimal] sys-libs/ncurses:0=[unicode] virtual/cdrtools
 SLOT=0
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	cvs	6625b4ea3655a11531b433946cebd6b3	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8933f1ae479eab8f99878a3bc9a7ece4
+_md5_=1f1d2d03bc17e383003f1288b73db7da
diff --git a/metadata/md5-cache/app-cdr/iat-0.1.7-r1 b/metadata/md5-cache/app-cdr/iat-0.1.7-r1
index 04fdcf110578..961e77ea18b9 100644
--- a/metadata/md5-cache/app-cdr/iat-0.1.7-r1
+++ b/metadata/md5-cache/app-cdr/iat-0.1.7-r1
@@ -1,9 +1,9 @@
 DEFINED_PHASES=configure
 DESCRIPTION=BIN, MDF, PDI, CDI, NRG, and B5I converters
 EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+HOMEPAGE=https://www.berlios.de/software/iso9660-analyzer-tool
 KEYWORDS=amd64 arm x86
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=mirror://gentoo/iat-0.1.7.tar.bz2
-_md5_=a05f66532c4161793034bfa02d1d8cfd
+SRC_URI=https://download.sourceforge.net/iat.berlios/iat-0.1.7.tar.bz2
+_md5_=3044fa804e3544b166016be267aaa502
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 2d89236fbde8..ff3d2bea171b 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/debian-archive-keyring-2018.1 b/metadata/md5-cache/app-crypt/debian-archive-keyring-2018.1
index 46d7275b917f..098e95eff19a 100644
--- a/metadata/md5-cache/app-crypt/debian-archive-keyring-2018.1
+++ b/metadata/md5-cache/app-crypt/debian-archive-keyring-2018.1
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/debian-archive-keyring/debian-archive-keyring_2018.1_all.deb
-_eclasses_=unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=d82f4f8942ddaa5c91284ddb599cc5e5
diff --git a/metadata/md5-cache/app-crypt/debian-archive-keyring-2019.1 b/metadata/md5-cache/app-crypt/debian-archive-keyring-2019.1
index df21ce1c635a..67e0801bfd61 100644
--- a/metadata/md5-cache/app-crypt/debian-archive-keyring-2019.1
+++ b/metadata/md5-cache/app-crypt/debian-archive-keyring-2019.1
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/debian-archive-keyring/debian-archive-keyring_2019.1_all.deb
-_eclasses_=unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=58dd817cc06301c302bc95e8296693f6
diff --git a/metadata/md5-cache/app-crypt/debian-archive-keyring-2019.1-r1 b/metadata/md5-cache/app-crypt/debian-archive-keyring-2019.1-r1
new file mode 100644
index 000000000000..b6264c3e2422
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/debian-archive-keyring-2019.1-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=GnuPG archive keys of the Debian archive
+EAPI=7
+HOMEPAGE=https://packages.debian.org/sid/debian-archive-keyring
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/debian-archive-keyring/debian-archive-keyring_2019.1_all.deb
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_md5_=539c5b462329635e1792047a55afe2bf
diff --git a/metadata/md5-cache/app-crypt/ekeyd-1.1.5-r1 b/metadata/md5-cache/app-crypt/ekeyd-1.1.5-r1
index 48a5850c04ce..7e9245bb2c99 100644
--- a/metadata/md5-cache/app-crypt/ekeyd-1.1.5-r1
+++ b/metadata/md5-cache/app-crypt/ekeyd-1.1.5-r1
@@ -10,5 +10,5 @@ RDEPEND=!minimal? ( dev-lang/lua dev-lua/luasocket kernel_linux? ( virtual/udev
 REQUIRED_USE=minimal? ( !munin )
 SLOT=0
 SRC_URI=mirror://ubuntu/pool/universe/e/ekeyd/ekeyd_1.1.5.orig.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4e670dee01d285003419792f9dbda837
diff --git a/metadata/md5-cache/app-crypt/jitterentropy-rngd-1.1.0 b/metadata/md5-cache/app-crypt/jitterentropy-rngd-1.1.0
index b415e863b460..8d9c7c3dd8ff 100644
--- a/metadata/md5-cache/app-crypt/jitterentropy-rngd-1.1.0
+++ b/metadata/md5-cache/app-crypt/jitterentropy-rngd-1.1.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~mips ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/smuellerDD/jitterentropy-rngd/archive/v1.1.0.tar.gz -> jitterentropy-rngd-1.1.0.tar.gz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=68fe4fd1caecb00c3c09449b907b9ff2
diff --git a/metadata/md5-cache/app-crypt/libmd-1.0.1 b/metadata/md5-cache/app-crypt/libmd-1.0.1
index 338f7f04244f..934ea5223b17 100644
--- a/metadata/md5-cache/app-crypt/libmd-1.0.1
+++ b/metadata/md5-cache/app-crypt/libmd-1.0.1
@@ -3,9 +3,9 @@ DESCRIPTION=Message Digest functions from BSD systems
 EAPI=6
 HOMEPAGE=https://www.hadrons.org/software/libmd/
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( BSD BSD-2 ISC BEER-WARE public-domain )
 SLOT=0
 SRC_URI=https://archive.hadrons.org/software/libmd/libmd-1.0.1.tar.xz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=077024045387cf2cf5fdbe06bf5ac8b0
+_md5_=4750dab14d16a9479cc50ca61dabf82e
diff --git a/metadata/md5-cache/app-crypt/libsecret-0.20.3 b/metadata/md5-cache/app-crypt/libsecret-0.20.3
index 876ba8c92442..9efbeec94950 100644
--- a/metadata/md5-cache/app-crypt/libsecret-0.20.3
+++ b/metadata/md5-cache/app-crypt/libsecret-0.20.3
@@ -4,7 +4,7 @@ DESCRIPTION=GObject library for accessing the freedesktop.org Secret Service API
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Libsecret
 IUSE=+crypt +introspection 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 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1+ Apache-2.0
 PDEPEND=>=gnome-base/gnome-keyring-3
 RDEPEND=>=dev-libs/glib-2.44: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(-)?] crypt? ( >=dev-libs/libgcrypt-1.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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.29:= )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libsecret/0.20/libsecret-0.20.3.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=593843ed2e5f6e23b1c9b6538ed892d5
+_md5_=52b1a808cfc74f9c9cc7834487c68336
diff --git a/metadata/md5-cache/app-crypt/libu2f-host-1.1.10 b/metadata/md5-cache/app-crypt/libu2f-host-1.1.10
index 8721632af975..a7eaad262e9d 100644
--- a/metadata/md5-cache/app-crypt/libu2f-host-1.1.10
+++ b/metadata/md5-cache/app-crypt/libu2f-host-1.1.10
@@ -10,5 +10,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-libs/hidapi dev-libs/json-c:= !systemd? ( acct-group/plugdev ) systemd? ( sys-apps/systemd[acl] )
 SLOT=0
 SRC_URI=https://developers.yubico.com/libu2f-host/Releases/libu2f-host-1.1.10.tar.xz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=bdfb2be01ca190617cb02e0502b08d0d
diff --git a/metadata/md5-cache/app-crypt/rotix-0.83-r1 b/metadata/md5-cache/app-crypt/rotix-0.83-r1
index d7c8938f084c..834be331c73f 100644
--- a/metadata/md5-cache/app-crypt/rotix-0.83-r1
+++ b/metadata/md5-cache/app-crypt/rotix-0.83-r1
@@ -3,10 +3,10 @@ DEPEND=sys-devel/gettext
 DESCRIPTION=Rotix allows you to generate rotational obfuscations
 EAPI=7
 HOMEPAGE=https://github.com/shemminga/rotix
-KEYWORDS=~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+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=https://github.com/shemminga/rotix/releases/download/0.83/rotix_0.83.tar.gz -> rotix-0.83.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f6dc33db408c3a041928cb113771041b
+_md5_=81c8f398fe33495db274210f2047f42d
diff --git a/metadata/md5-cache/app-crypt/seahorse-3.34.1 b/metadata/md5-cache/app-crypt/seahorse-3.34.1
index 1d0d3c020cb2..bd9b0c2910bc 100644
--- a/metadata/md5-cache/app-crypt/seahorse-3.34.1
+++ b/metadata/md5-cache/app-crypt/seahorse-3.34.1
@@ -4,10 +4,10 @@ DESCRIPTION=Manage your passwords and encryption keys
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Seahorse
 IUSE=ldap zeroconf
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.44:2 >=app-crypt/gcr-3.11.91:= >=app-crypt/gpgme-1.7.0 >=x11-libs/gtk+-3.22.0:3 >=app-crypt/gnupg-2.0.12 >=app-crypt/libsecret-0.16 dev-libs/libpwquality net-misc/openssh ldap? ( net-nds/openldap:= ) >=net-libs/libsoup-2.33.92:2.4 zeroconf? ( >=net-dns/avahi-0.6:=[dbus] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/seahorse/3.34/seahorse-3.34.1.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fdec69d22e7053c90391f1bd4c10c61e
+_md5_=79889f34cd9b5bfcdd884f909e0025c6
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 4f55a74c5615..11ce4cbb95be 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	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=47a2448d9672ceca2ff10af54a9e705d
diff --git a/metadata/md5-cache/app-crypt/tpm2-tools-4.2 b/metadata/md5-cache/app-crypt/tpm2-tools-4.2
deleted file mode 100644
index 54b5a7bfa652..000000000000
--- a/metadata/md5-cache/app-crypt/tpm2-tools-4.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure
-DEPEND=net-misc/curl:= fapi? ( >=app-crypt/tpm2-tss-2.4.0:=[fapi?] ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=Tools for the TPM 2.0 TSS
-EAPI=7
-HOMEPAGE=https://github.com/tpm2-software/tpm2-tools
-IUSE=+fapi libressl
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=net-misc/curl:= fapi? ( >=app-crypt/tpm2-tss-2.4.0:=[fapi?] ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/tpm2-software/tpm2-tools/releases/download/4.2/tpm2-tools-4.2.tar.gz
-_md5_=60b3834b1971518a1b92e9c7997aa724
diff --git a/metadata/md5-cache/app-crypt/tpm2-tools-4.2.1 b/metadata/md5-cache/app-crypt/tpm2-tools-4.2.1
new file mode 100644
index 000000000000..653c1a10ac36
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/tpm2-tools-4.2.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure
+DEPEND=net-misc/curl:= fapi? ( >=app-crypt/tpm2-tss-2.4.0:=[fapi?] ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+DESCRIPTION=Tools for the TPM 2.0 TSS
+EAPI=7
+HOMEPAGE=https://github.com/tpm2-software/tpm2-tools
+IUSE=+fapi libressl
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=net-misc/curl:= fapi? ( >=app-crypt/tpm2-tss-2.4.0:=[fapi?] ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/tpm2-software/tpm2-tools/releases/download/4.2.1/tpm2-tools-4.2.1.tar.gz
+_md5_=60b3834b1971518a1b92e9c7997aa724
diff --git a/metadata/md5-cache/app-crypt/tpm2-totp-0.2.1-r1 b/metadata/md5-cache/app-crypt/tpm2-totp-0.2.1-r1
index 2ee4244550be..e26d48838194 100644
--- a/metadata/md5-cache/app-crypt/tpm2-totp-0.2.1-r1
+++ b/metadata/md5-cache/app-crypt/tpm2-totp-0.2.1-r1
@@ -10,4 +10,4 @@ RDEPEND=>=app-crypt/tpm2-tss-2.0 media-gfx/qrencode:=
 SLOT=0
 SRC_URI=https://github.com/tpm2-software/tpm2-totp/releases/download/v0.2.1/tpm2-totp-0.2.1.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cbdd3005170385497aa9fe8280859ef8
+_md5_=fa4ad6a2ff2b3a2dcca5f78d9f73a1db
diff --git a/metadata/md5-cache/app-crypt/tpm2-tss-2.4.1 b/metadata/md5-cache/app-crypt/tpm2-tss-2.4.1
index c5b925dc81dd..8735ce5c6ec2 100644
--- a/metadata/md5-cache/app-crypt/tpm2-tss-2.4.1
+++ b/metadata/md5-cache/app-crypt/tpm2-tss-2.4.1
@@ -5,12 +5,12 @@ DESCRIPTION=TCG Trusted Platform Module 2.0 Software Stack
 EAPI=7
 HOMEPAGE=https://github.com/tpm2-software/tpm2-tss
 IUSE=doc +fapi gcrypt +openssl static-libs test kernel_linux
-KEYWORDS=~amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD-2
 RDEPEND=acct-group/tss acct-user/tss fapi? ( dev-libs/json-c net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) openssl? ( dev-libs/openssl:0= ) virtual/tmpfiles
 REQUIRED_USE=^^ ( gcrypt openssl ) fapi? ( openssl !gcrypt )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tpm2-software/tpm2-tss/releases/download/2.4.1/tpm2-tss-2.4.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=0b2f6e4627d0f2ed980f003d60c3060f
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=868cb103ffd7539eade81901512e0bbb
diff --git a/metadata/md5-cache/app-crypt/trousers-0.3.14-r1 b/metadata/md5-cache/app-crypt/trousers-0.3.14-r1
deleted file mode 100644
index 6a24a80ee150..000000000000
--- a/metadata/md5-cache/app-crypt/trousers-0.3.14-r1
+++ /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 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=configure install prepare setup
-DEPEND=>=dev-libs/glib-2 !libressl? ( >=dev-libs/openssl-0.9.7:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=An open-source TCG Software Stack (TSS) v1.1 implementation
-EAPI=7
-HOMEPAGE=http://trousers.sf.net
-IUSE=doc libressl selinux kernel_linux
-KEYWORDS=amd64 arm arm64 ~m68k ~ppc ppc64 ~s390 x86
-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	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=4ed553af69a07c251b5235a1c4bf9803
diff --git a/metadata/md5-cache/app-crypt/trousers-0.3.14-r2 b/metadata/md5-cache/app-crypt/trousers-0.3.14-r2
index f8b7961a876a..f6f0f85d87fc 100644
--- a/metadata/md5-cache/app-crypt/trousers-0.3.14-r2
+++ b/metadata/md5-cache/app-crypt/trousers-0.3.14-r2
@@ -10,5 +10,5 @@ LICENSE=CPL-1.0 GPL-2
 RDEPEND=acct-group/tss acct-user/tss >=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	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=5661d1892452298ff656dda19034fdc2
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=de90eb1a08e13957400ea0654c043ef5
diff --git a/metadata/md5-cache/app-crypt/veracrypt-1.24_p2 b/metadata/md5-cache/app-crypt/veracrypt-1.24_p2
index 12a3ca619933..d7d4fd8cf9e7 100644
--- a/metadata/md5-cache/app-crypt/veracrypt-1.24_p2
+++ b/metadata/md5-cache/app-crypt/veracrypt-1.24_p2
@@ -10,5 +10,5 @@ RDEPEND=sys-fs/lvm2 sys-fs/fuse:0 x11-libs/wxGTK:3.0-gtk3[X?] app-admin/sudo dev
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://github.com/veracrypt/VeraCrypt/archive/VeraCrypt_1.24-Update2.tar.gz -> veracrypt-1.24_p2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
 _md5_=2f2b6f2e10c16b7e57d9324fb7698d0f
diff --git a/metadata/md5-cache/app-crypt/veracrypt-1.24_p4 b/metadata/md5-cache/app-crypt/veracrypt-1.24_p4
index ce4e0d665b21..1dba8d2ff640 100644
--- a/metadata/md5-cache/app-crypt/veracrypt-1.24_p4
+++ b/metadata/md5-cache/app-crypt/veracrypt-1.24_p4
@@ -10,5 +10,5 @@ RDEPEND=sys-fs/lvm2 sys-fs/fuse:0 x11-libs/wxGTK:3.0-gtk3[X?] app-admin/sudo dev
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://github.com/veracrypt/VeraCrypt/archive/VeraCrypt_1.24-Update4.tar.gz -> veracrypt-1.24_p4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
 _md5_=33df725e3b26cd869fc53efe1f3d653f
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 60a8433893db..63d73f3947c4 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/dictd-wn-3.0_p33 b/metadata/md5-cache/app-dicts/dictd-wn-3.0_p33
index 5eba24672e52..d392735937e4 100644
--- a/metadata/md5-cache/app-dicts/dictd-wn-3.0_p33
+++ b/metadata/md5-cache/app-dicts/dictd-wn-3.0_p33
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=Princeton
 SLOT=0
 SRC_URI=mirror://debian/pool/main/w/wordnet/dict-wn_3.0-33_all.deb
-_eclasses_=unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=247b7e277af3b96a1f943cde15d42e5f
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index d82b05291337..12901c9e290f 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/NaturalDocs-1.52-r1 b/metadata/md5-cache/app-doc/NaturalDocs-1.52-r1
index ca3ba6ea625f..07621bd4269e 100644
--- a/metadata/md5-cache/app-doc/NaturalDocs-1.52-r1
+++ b/metadata/md5-cache/app-doc/NaturalDocs-1.52-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/naturaldocs/NaturalDocs-1.52.zip
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dff8050f040a0c3ff4661d1f3922439e
diff --git a/metadata/md5-cache/app-doc/pms-5_p20120920 b/metadata/md5-cache/app-doc/pms-5_p20120920
index 85fbf5474c07..a40f61a4ac87 100644
--- a/metadata/md5-cache/app-doc/pms-5_p20120920
+++ b/metadata/md5-cache/app-doc/pms-5_p20120920
@@ -1,4 +1,4 @@
-BDEPEND=dev-tex/leaflet dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathscience html? ( app-text/recode >=dev-tex/tex4ht-20090115_p0029 )
+BDEPEND=|| ( >=dev-texlive/texlive-latexextra-2020-r1 dev-tex/leaflet ) dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathscience html? ( app-text/recode >=dev-tex/tex4ht-20090115_p0029 )
 DEFINED_PHASES=compile install
 DESCRIPTION=Gentoo Package Manager Specification
 EAPI=7
@@ -9,4 +9,4 @@ LICENSE=CC-BY-SA-3.0
 RDEPEND=!app-doc/pms-bin
 SLOT=20120920
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/pms-5.tar.xz
-_md5_=e04b928e69cef2ebbd78df4a25c97514
+_md5_=518d46a4ad750b82d5f2ae594da0367b
diff --git a/metadata/md5-cache/app-doc/pms-7_p20180430-r1 b/metadata/md5-cache/app-doc/pms-7_p20180430-r1
index ac264647aad8..e84fa664b158 100644
--- a/metadata/md5-cache/app-doc/pms-7_p20180430-r1
+++ b/metadata/md5-cache/app-doc/pms-7_p20180430-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-tex/leaflet dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathscience html? ( app-text/recode >=dev-tex/tex4ht-20090611_p1038-r5 )
+BDEPEND=|| ( >=dev-texlive/texlive-latexextra-2020-r1 dev-tex/leaflet ) dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathscience html? ( app-text/recode >=dev-tex/tex4ht-20090611_p1038-r5 )
 DEFINED_PHASES=compile install
 DESCRIPTION=Gentoo Package Manager Specification
 EAPI=7
@@ -9,4 +9,4 @@ LICENSE=CC-BY-SA-3.0
 RDEPEND=!app-doc/pms-bin
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/pms-7_p20180430.tar.xz
-_md5_=875ec58ed9def2886ebd1aa7f192f25d
+_md5_=13bff63661a43350eb6f6d46dd6b37c8
diff --git a/metadata/md5-cache/app-doc/pms-9999 b/metadata/md5-cache/app-doc/pms-9999
index 23736e38acf9..86f0b97632c0 100644
--- a/metadata/md5-cache/app-doc/pms-9999
+++ b/metadata/md5-cache/app-doc/pms-9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-tex/leaflet dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathscience html? ( >=dev-tex/tex4ht-20090611_p1038-r5 ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( >=dev-texlive/texlive-latexextra-2020-r1 dev-tex/leaflet ) dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathscience html? ( >=dev-tex/tex4ht-20090611_p1038-r5 ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install unpack
 DESCRIPTION=Gentoo Package Manager Specification (draft)
 EAPI=7
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=!app-doc/pms-bin
 SLOT=live
 _eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422
-_md5_=d683c0977ab5ab695c203aea0febd713
+_md5_=0f7a77bf748b344a29e099a0afc25e06
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index d964f60d453a..3a49c05f1639 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/e3-2.8.2 b/metadata/md5-cache/app-editors/e3-2.8.2
index bbf39c481145..6f8fdfbaf0cc 100644
--- a/metadata/md5-cache/app-editors/e3-2.8.2
+++ b/metadata/md5-cache/app-editors/e3-2.8.2
@@ -5,8 +5,7 @@ EAPI=7
 HOMEPAGE=https://sites.google.com/site/e3editor/
 KEYWORDS=-* amd64 x86
 LICENSE=GPL-2+
-RESTRICT=strip
 SLOT=0
 SRC_URI=https://sites.google.com/site/e3editor/Home/e3-2.82.tgz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cdac69afc4898c458b30c4a23af7315c
+_md5_=9a74d95605773e171c214d4eb0f576de
diff --git a/metadata/md5-cache/app-editors/elvis-2.2.0-r8 b/metadata/md5-cache/app-editors/elvis-2.2.0-r8
index 1ea1bb54c7fc..2b62634d299d 100644
--- a/metadata/md5-cache/app-editors/elvis-2.2.0-r8
+++ b/metadata/md5-cache/app-editors/elvis-2.2.0-r8
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/ncurses:0= app-eselect/eselect-vi X? ( >=x11-libs/libX11-1.0.0
 SLOT=0
 SRC_URI=ftp://ftp.cs.pdx.edu/pub/elvis/elvis-2.2_0.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6a157ffe0528b870888be8317df68cbe
+_md5_=4d2a66fa45e097a2586df2cf3ee55a83
diff --git a/metadata/md5-cache/app-editors/hteditor-2.1.0-r1 b/metadata/md5-cache/app-editors/hteditor-2.1.0-r1
index 9642f4ce2457..73f5dbbb11c1 100644
--- a/metadata/md5-cache/app-editors/hteditor-2.1.0-r1
+++ b/metadata/md5-cache/app-editors/hteditor-2.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 ) >=dev-libs/lzo-2
 SLOT=0
 SRC_URI=mirror://sourceforge/hte/ht-2.1.0.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ca0a07dcba1aba3794bf009d7e6c237a
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=cbec879720c716e8d15261482d49bc57
diff --git a/metadata/md5-cache/app-editors/jasspa-microemacs-20091011-r3 b/metadata/md5-cache/app-editors/jasspa-microemacs-20091011-r3
index a762b7999860..82e87af7b3e9 100644
--- a/metadata/md5-cache/app-editors/jasspa-microemacs-20091011-r3
+++ b/metadata/md5-cache/app-editors/jasspa-microemacs-20091011-r3
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 xpm? ( x11-libs/libXpm ) ) nano
 SLOT=0
 SRC_URI=http://www.jasspa.com/release_20090909/jasspa-mesrc-20091011.tar.gz !nanoemacs? ( http://www.jasspa.com/release_20090909/jasspa-memacros-20091017.tar.gz http://www.jasspa.com/release_20090909/jasspa-mehtml-20091011.tar.gz http://www.jasspa.com/release_20060909/meicons-extra.tar.gz )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4724408915858dbf1b9729787af9bce1
+_md5_=59bf47db99593f9ef264e0e7c9655cc5
diff --git a/metadata/md5-cache/app-editors/moe-1.10 b/metadata/md5-cache/app-editors/moe-1.10
index e8e4ca8df6da..d54d7f7f72f4 100644
--- a/metadata/md5-cache/app-editors/moe-1.10
+++ b/metadata/md5-cache/app-editors/moe-1.10
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://gnu/moe/moe-1.10.tar.lz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=dc29d46c2c60c29238cf7319fad92bbc
diff --git a/metadata/md5-cache/app-editors/moe-1.9 b/metadata/md5-cache/app-editors/moe-1.9
index 155d979fd806..0dde26a09866 100644
--- a/metadata/md5-cache/app-editors/moe-1.9
+++ b/metadata/md5-cache/app-editors/moe-1.9
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://gnu/moe/moe-1.9.tar.lz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=661cef3a72d6b1aa18608f54ad40360a
diff --git a/metadata/md5-cache/app-editors/teco-36_p19940820 b/metadata/md5-cache/app-editors/teco-36_p19940820
index 9eb78d4eca77..c7029669dd3f 100644
--- a/metadata/md5-cache/app-editors/teco-36_p19940820
+++ b/metadata/md5-cache/app-editors/teco-36_p19940820
@@ -11,4 +11,4 @@ RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=http://www.ibiblio.org/pub/linux/apps/editors/tty/teco.tar.gz -> teco-36_p19940820.tar.gz doc? ( https://dev.gentoo.org/~ulm/distfiles/tecodoc.tar.gz )
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d0db216e0328421c9a9bf2ed3ee13b63
+_md5_=7c46c1a5edfd02111367de44a5f4d930
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 60ae8a30d359..5d50b646b174 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/org-mode-9.3 b/metadata/md5-cache/app-emacs/org-mode-9.3
deleted file mode 100644
index ee0552c949c8..000000000000
--- a/metadata/md5-cache/app-emacs/org-mode-9.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=doc? ( virtual/texi2dvi ) >=app-editors/emacs-24:*
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DESCRIPTION=An Emacs mode for notes and project planning
-EAPI=7
-HOMEPAGE=https://www.orgmode.org/
-IUSE=contrib doc odt-schema
-KEYWORDS=amd64 ppc x86 ~x86-macos
-LICENSE=GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )
-RDEPEND=>=app-editors/emacs-24:*
-RESTRICT=test
-SLOT=0
-SRC_URI=http://orgmode.org/org-9.3.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	504a3383c45504fde86b00426619a709	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=b709b7f6baf98e5df175ade44a21205a
diff --git a/metadata/md5-cache/app-emacs/org-mode-9.3.6 b/metadata/md5-cache/app-emacs/org-mode-9.3.6
index 21b8b307cc76..10372f7d2e3f 100644
--- a/metadata/md5-cache/app-emacs/org-mode-9.3.6
+++ b/metadata/md5-cache/app-emacs/org-mode-9.3.6
@@ -4,11 +4,11 @@ DESCRIPTION=An Emacs mode for notes and project planning
 EAPI=7
 HOMEPAGE=https://www.orgmode.org/
 IUSE=contrib doc odt-schema
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-macos
+KEYWORDS=amd64 ppc x86 ~x86-macos
 LICENSE=GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )
 RDEPEND=>=app-editors/emacs-24:*
 RESTRICT=test
 SLOT=0
 SRC_URI=http://orgmode.org/org-9.3.6.tar.gz
 _eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	504a3383c45504fde86b00426619a709	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=59e68a95c79118b1ca45a525b6715c03
+_md5_=b709b7f6baf98e5df175ade44a21205a
diff --git a/metadata/md5-cache/app-emacs/php-mode-1.23.0 b/metadata/md5-cache/app-emacs/php-mode-1.23.0
index d0159d057608..2f391cc81763 100644
--- a/metadata/md5-cache/app-emacs/php-mode-1.23.0
+++ b/metadata/md5-cache/app-emacs/php-mode-1.23.0
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=GNU Emacs major mode for editing PHP code
 EAPI=7
 HOMEPAGE=https://github.com/ejmr/php-mode
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/ejmr/php-mode/archive/v1.23.0.tar.gz -> php-mode-1.23.0.tar.gz
 _eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	504a3383c45504fde86b00426619a709
-_md5_=4e10537108381788cbb71acac3facfa2
+_md5_=9e663bb65fffba949e3d92d7b090cba4
diff --git a/metadata/md5-cache/app-emacs/xrdb-mode-3.0 b/metadata/md5-cache/app-emacs/xrdb-mode-3.0
deleted file mode 100644
index 73d0125139b2..000000000000
--- a/metadata/md5-cache/app-emacs/xrdb-mode-3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=app-editors/emacs-23.1:*
-DESCRIPTION=An Emacs major mode for editing X resource database files
-EAPI=5
-HOMEPAGE=https://launchpad.net/xrdb-mode https://www.emacswiki.org/emacs/ResourceFiles
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2+
-RDEPEND=>=app-editors/emacs-23.1:*
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/xrdb-mode-3.0.el.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	504a3383c45504fde86b00426619a709	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
-_md5_=541145a3b5eb70361e5e41b30fe467c7
diff --git a/metadata/md5-cache/app-emacs/xrdb-mode-3.0-r1 b/metadata/md5-cache/app-emacs/xrdb-mode-3.0-r1
index b157290e8fd3..05013491605c 100644
--- a/metadata/md5-cache/app-emacs/xrdb-mode-3.0-r1
+++ b/metadata/md5-cache/app-emacs/xrdb-mode-3.0-r1
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=An Emacs major mode for editing X resource database files
 EAPI=7
 HOMEPAGE=https://launchpad.net/xrdb-mode https://www.emacswiki.org/emacs/ResourceFiles
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/xrdb-mode-3.0.el.xz
 _eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	504a3383c45504fde86b00426619a709
-_md5_=60764659bdf3c31bfdcc9245aca08f9c
+_md5_=17f5122b6437dc01a28e212b9b84265f
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 49b39c36d0a9..21f266799bfe 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/crossover-bin-12.5.0-r2 b/metadata/md5-cache/app-emulation/crossover-bin-12.5.0-r2
index e6c97614c9df..b7319cf71839 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
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist fetch test
 SLOT=0
 SRC_URI=install-crossover-12.5.0.bin
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	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 3002e0d4810d..433efee938a4 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
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist fetch test
 SLOT=0
 SRC_URI=install-crossover-12.5.1.bin
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	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 f18275aa26a2..77306ce18a8f 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
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist fetch test
 SLOT=0
 SRC_URI=install-crossover-13.0.0.bin
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	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 d015cd2ea7cf..0e550a8f38e8 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
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist fetch test
 SLOT=0
 SRC_URI=install-crossover-13.0.1.bin
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	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 1ff3ece303e4..9b45d817818b 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
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist fetch test
 SLOT=0
 SRC_URI=install-crossover-13.1.0.bin
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	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 16c8679118c8..9f338fa9aa27 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
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist fetch test
 SLOT=0
 SRC_URI=install-crossover-13.1.2.bin
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	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 f99850631c78..65989db8c5a4 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
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist fetch test
 SLOT=0
 SRC_URI=install-crossover-13.1.3.bin
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	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 31573f057131..6680998878b0 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
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist fetch test
 SLOT=0
 SRC_URI=install-crossover-13.2.0.bin
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	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 26e452890e2c..f2c21782b122 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
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist fetch test
 SLOT=0
 SRC_URI=install-crossover-14.0.3.bin
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	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 d79d80a9b5e8..7155fd13645e 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
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist fetch test
 SLOT=0
 SRC_URI=install-crossover-14.1.4.bin
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	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 ebf43071668c..1d9454de3d98 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-15.0.0
+++ b/metadata/md5-cache/app-emulation/crossover-bin-15.0.0
@@ -11,5 +11,5 @@ 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	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 a8274875aed9..b1af35644c69 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-15.0.1
+++ b/metadata/md5-cache/app-emulation/crossover-bin-15.0.1
@@ -11,5 +11,5 @@ 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	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 d57eca139a4b..bca5486489a9 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-15.1.0
+++ b/metadata/md5-cache/app-emulation/crossover-bin-15.1.0
@@ -11,5 +11,5 @@ 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	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 99e7b65755d4..2826293712ab 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-15.2.0
+++ b/metadata/md5-cache/app-emulation/crossover-bin-15.2.0
@@ -11,5 +11,5 @@ 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	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 a1abe3a593bb..f708358cdd5f 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-15.3.0
+++ b/metadata/md5-cache/app-emulation/crossover-bin-15.3.0
@@ -11,5 +11,5 @@ 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	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 daa16a3c2b77..66ab4b4e0279 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-15.3.1
+++ b/metadata/md5-cache/app-emulation/crossover-bin-15.3.1
@@ -11,5 +11,5 @@ 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	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 bbbe9ac06cbe..e522dc57c074 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-16.0.0
+++ b/metadata/md5-cache/app-emulation/crossover-bin-16.0.0
@@ -11,5 +11,5 @@ 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	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 06f613a92729..9f39bb99cbbd 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-16.2.5
+++ b/metadata/md5-cache/app-emulation/crossover-bin-16.2.5
@@ -11,5 +11,5 @@ 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	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 4cc76c8d0488..922ed1fd5f6f 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-17.5.0
+++ b/metadata/md5-cache/app-emulation/crossover-bin-17.5.0
@@ -11,5 +11,5 @@ 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	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 de2c571862f3..f136a63c47e0 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
@@ -11,5 +11,5 @@ 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	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 75f057e35efb..7b72c294511a 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-17.5.1
+++ b/metadata/md5-cache/app-emulation/crossover-bin-17.5.1
@@ -11,5 +11,5 @@ 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	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 6716837f82ab..9fd1b3ee6110 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-18.0.0
+++ b/metadata/md5-cache/app-emulation/crossover-bin-18.0.0
@@ -11,5 +11,5 @@ 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	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _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 78188b7cef57..63c0f528bbb2 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-18.1.0
+++ b/metadata/md5-cache/app-emulation/crossover-bin-18.1.0
@@ -11,5 +11,5 @@ 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	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=dedccc389a81f68b7398c7c19aa08189
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
index 7eed903bf9c2..522eb98d7850 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-18.5.0-r1
+++ b/metadata/md5-cache/app-emulation/crossover-bin-18.5.0-r1
@@ -11,5 +11,5 @@ 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	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=51e3dbc331d74e0dddb0f53ba9cbda8b
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-19.0.1-r1 b/metadata/md5-cache/app-emulation/crossover-bin-19.0.1-r1
index 0a803709237f..52ebfe9543cc 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-19.0.1-r1
+++ b/metadata/md5-cache/app-emulation/crossover-bin-19.0.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=bindist test
 SLOT=0
 SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-19.0.1.bin
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=673d7f2e7c14276b69b1fbd0e2cf0e72
diff --git a/metadata/md5-cache/app-emulation/docker-19.03.8 b/metadata/md5-cache/app-emulation/docker-19.03.8
index 94ce79aaec71..bae2a5af58f8 100644
--- a/metadata/md5-cache/app-emulation/docker-19.03.8
+++ b/metadata/md5-cache/app-emulation/docker-19.03.8
@@ -11,5 +11,5 @@ RDEPEND=acct-group/docker >=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2
 RESTRICT=installsources strip
 SLOT=0
 SRC_URI=https://github.com/docker/docker-ce/archive/v19.03.8.tar.gz -> docker-19.03.8.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=f4ab87b50b1b6db1b11075db86a5a7c3
diff --git a/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5 b/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5
index 4df0b2bea568..7548e79c86cd 100644
--- a/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5
+++ b/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5
@@ -1,5 +1,5 @@
 BDEPEND=app-arch/unzip X? ( x11-apps/bdftopcf >=x11-apps/mkfontscale-1.2.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
-DEFINED_PHASES=compile configure install prepare
+DEFINED_PHASES=compile configure install prepare pretend
 DEPEND=media-libs/libsdl >=sys-libs/slang-1.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm ) alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluid-soundfont media-sound/fluidsynth ) gpm? ( sys-libs/gpm ) svga? ( media-libs/svgalib ) X? ( x11-base/xorg-proto )
 DESCRIPTION=DOS Emulator
 EAPI=7
@@ -11,4 +11,4 @@ RDEPEND=media-libs/libsdl >=sys-libs/slang-1.4 X? ( x11-libs/libX11 x11-libs/lib
 SLOT=0
 SRC_URI=mirror://sourceforge/dosemu/dosemu-freedos-1.0-bin.tgz https://dev.gentoo.org/~slyfox/distfiles/dosemu-1.4.1_pre20130107.zip
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c0379a2458025a2ee11405a088c6cbdc
+_md5_=834e9c07f5d52c7f851f3ef79e724742
diff --git a/metadata/md5-cache/app-emulation/firecracker-0.21.1-r1 b/metadata/md5-cache/app-emulation/firecracker-0.21.1-r1
index 4f9dbe698da9..cdd426df3ec4 100644
--- a/metadata/md5-cache/app-emulation/firecracker-0.21.1-r1
+++ b/metadata/md5-cache/app-emulation/firecracker-0.21.1-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Apache-2.0 MIT Apache-2.0-with-LLVM-exceptions ) MPL-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/firecracker-microvm/firecracker/archive/v0.21.1.tar.gz -> firecracker-0.21.1.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.8/download -> aho-corasick-0.7.8.crate https://crates.io/api/v1/crates/backtrace/0.3.44/download -> backtrace-0.3.44.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.32/download -> backtrace-sys-0.1.32.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/cc/1.0.50/download -> cc-1.0.50.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cpuid/0.1.0/download -> cpuid-0.1.0.crate https://crates.io/api/v1/crates/device_tree/1.1.0/download -> device_tree-1.1.0.crate https://crates.io/api/v1/crates/epoll/4.1.0/download -> epoll-4.1.0.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/kernel/0.1.0/download -> kernel-0.1.0.crate https://crates.io/api/v1/crates/kvm-bindings/0.2.0/download -> kvm-bindings-0.2.0.crate https://crates.io/api/v1/crates/kvm-ioctls/0.5.0/download -> kvm-ioctls-0.5.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.66/download -> libc-0.2.66.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/logger/0.1.0/download -> logger-0.1.0.crate https://crates.io/api/v1/crates/memchr/2.3.2/download -> memchr-2.3.2.crate https://crates.io/api/v1/crates/proc-macro2/1.0.8/download -> proc-macro2-1.0.8.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.2.crate https://crates.io/api/v1/crates/regex/1.3.4/download -> regex-1.3.4.crate https://crates.io/api/v1/crates/regex-syntax/0.6.14/download -> regex-syntax-0.6.14.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.16/download -> rustc-demangle-0.1.16.crate https://crates.io/api/v1/crates/ryu/1.0.2/download -> ryu-1.0.2.crate https://crates.io/api/v1/crates/seccomp/0.1.0/download -> seccomp-0.1.0.crate https://crates.io/api/v1/crates/serde/1.0.104/download -> serde-1.0.104.crate https://crates.io/api/v1/crates/serde_derive/1.0.104/download -> serde_derive-1.0.104.crate https://crates.io/api/v1/crates/serde_json/1.0.48/download -> serde_json-1.0.48.crate https://crates.io/api/v1/crates/syn/1.0.14/download -> syn-1.0.14.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/timerfd/1.1.1/download -> timerfd-1.1.1.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/vm-memory/0.1.0/download -> vm-memory-0.1.0.crate https://crates.io/api/v1/crates/vmm-sys-util/0.4.0/download -> vmm-sys-util-0.4.0.crate
-_eclasses_=cargo	59ecae2c29d723be70671fd182038195	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=cargo	59ecae2c29d723be70671fd182038195	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8624147121cad555fdaae5fab06ea235
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.36.13 b/metadata/md5-cache/app-emulation/libguestfs-1.36.13
index 40441985dee0..6462261526d8 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.36.13
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.36.13
@@ -11,5 +11,5 @@ 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	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=260ef5afa3165a4ec14afe2c1f98b162
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.36.15 b/metadata/md5-cache/app-emulation/libguestfs-1.36.15
index 41e3bbd67ab0..0ab84eb329ac 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.36.15
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.36.15
@@ -11,5 +11,5 @@ 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	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a863324c2f9092503a687be0ea74d7c1
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.38.6 b/metadata/md5-cache/app-emulation/libguestfs-1.38.6
index a5b0c1ee74b9..d390fe98b794 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.38.6
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.38.6
@@ -11,5 +11,5 @@ 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	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1a883f609805ce27bbe70bea7976089b
diff --git a/metadata/md5-cache/app-emulation/libpod-2.0.1 b/metadata/md5-cache/app-emulation/libpod-2.0.1
new file mode 100644
index 000000000000..1597ad7d9401
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/libpod-2.0.1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+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:= >=net-misc/cni-plugins-0.8.6 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 +fuse +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:= >=net-misc/cni-plugins-0.8.6 sys-fs/lvm2 sys-libs/libseccomp:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) rootless? ( app-emulation/slirp4netns ) selinux? ( sys-libs/libselinux:= ) fuse? ( sys-fs/fuse-overlayfs )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/containers/libpod/archive/v2.0.1.tar.gz -> libpod-2.0.1.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	go-module	45394825d9260b479aa1cf252ea58e01	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0b5405fac80f24e8afb901c3e40cc781
diff --git a/metadata/md5-cache/app-emulation/libvirt-6.0.0-r3 b/metadata/md5-cache/app-emulation/libvirt-6.0.0-r3
index a53ad7847c9f..7ee041a61c28 100644
--- a/metadata/md5-cache/app-emulation/libvirt-6.0.0-r3
+++ b/metadata/md5-cache/app-emulation/libvirt-6.0.0-r3
@@ -11,5 +11,5 @@ RDEPEND=acct-user/qemu policykit? ( acct-group/libvirt ) app-misc/scrub >=dev-li
 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	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fd8023ae394970e7484c825891f92ea8
diff --git a/metadata/md5-cache/app-emulation/libvirt-6.1.0-r1 b/metadata/md5-cache/app-emulation/libvirt-6.1.0-r1
index e4a7af3fea7d..4003c5f4d886 100644
--- a/metadata/md5-cache/app-emulation/libvirt-6.1.0-r1
+++ b/metadata/md5-cache/app-emulation/libvirt-6.1.0-r1
@@ -11,5 +11,5 @@ RDEPEND=acct-user/qemu policykit? ( acct-group/libvirt ) app-misc/scrub >=dev-li
 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.1.0
 SRC_URI=https://libvirt.org/sources/libvirt-6.1.0.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9b36a78d21a80a93c2611761c8785daa
diff --git a/metadata/md5-cache/app-emulation/libvirt-6.2.0-r2 b/metadata/md5-cache/app-emulation/libvirt-6.2.0-r2
index c1504622918f..8bb696a212ba 100644
--- a/metadata/md5-cache/app-emulation/libvirt-6.2.0-r2
+++ b/metadata/md5-cache/app-emulation/libvirt-6.2.0-r2
@@ -11,5 +11,5 @@ RDEPEND=acct-user/qemu policykit? ( acct-group/libvirt ) app-misc/scrub >=dev-li
 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.2.0
 SRC_URI=https://libvirt.org/sources/libvirt-6.2.0.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fc12422c8453533c89978822c1a7ae29
diff --git a/metadata/md5-cache/app-emulation/libvirt-9999 b/metadata/md5-cache/app-emulation/libvirt-9999
index 5f992b8c19ef..a2e2f42a03d9 100644
--- a/metadata/md5-cache/app-emulation/libvirt-9999
+++ b/metadata/md5-cache/app-emulation/libvirt-9999
@@ -10,5 +10,5 @@ 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:0= ) 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(-)] ) 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	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d3f970bd068899216127e9c08e00c1e9
diff --git a/metadata/md5-cache/app-emulation/lxc-3.0.3 b/metadata/md5-cache/app-emulation/lxc-3.0.3
deleted file mode 100644
index 4641b35c72fd..000000000000
--- a/metadata/md5-cache/app-emulation/lxc-3.0.3
+++ /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=net-libs/gnutls sys-libs/libcap pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) >=app-text/docbook-sgml-utils-0.6.14-r2 >=sys-kernel/linux-headers-3.2
-DESCRIPTION=LinuX Containers userspace utilities
-EAPI=7
-HOMEPAGE=https://linuxcontainers.org/
-IUSE=apparmor examples pam python seccomp selinux +templates kernel_linux
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
-LICENSE=LGPL-3
-PDEPEND=templates? ( app-emulation/lxc-templates ) python? ( dev-python/python3-lxc )
-RDEPEND=net-libs/gnutls sys-libs/libcap pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) sys-apps/util-linux app-misc/pax-utils virtual/awk
-SLOT=0
-SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-3.0.3.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6c61c4334a8fbe44c8adf1a5aa570b8f
diff --git a/metadata/md5-cache/app-emulation/lxc-4.0.2-r2 b/metadata/md5-cache/app-emulation/lxc-4.0.2-r2
index 6c3604202258..452f6b6de3fc 100644
--- a/metadata/md5-cache/app-emulation/lxc-4.0.2-r2
+++ b/metadata/md5-cache/app-emulation/lxc-4.0.2-r2
@@ -5,11 +5,11 @@ DESCRIPTION=LinuX Containers userspace utilities
 EAPI=7
 HOMEPAGE=https://linuxcontainers.org/ https://github.com/lxc/lxc
 IUSE=apparmor +caps doc examples libressl pam seccomp selinux +ssl +templates +tools kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-3
 PDEPEND=templates? ( app-emulation/lxc-templates )
 RDEPEND=app-misc/pax-utils sys-apps/util-linux sys-libs/libcap virtual/awk caps? ( sys-libs/libcap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-4.0.2.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6d6a2f6d953f468e8f8e8ce8ed66be88
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c46242c5ca61a29ae06c7dccdce0548e
diff --git a/metadata/md5-cache/app-emulation/lxc-4.0.3 b/metadata/md5-cache/app-emulation/lxc-4.0.3
new file mode 100644
index 000000000000..60bdf7dd9b09
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/lxc-4.0.3
@@ -0,0 +1,15 @@
+BDEPEND=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
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=app-misc/pax-utils sys-apps/util-linux sys-libs/libcap virtual/awk caps? ( sys-libs/libcap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=app-text/docbook-sgml-utils-0.6.14-r2 >=sys-kernel/linux-headers-3.2 apparmor? ( sys-apps/apparmor )
+DESCRIPTION=LinuX Containers userspace utilities
+EAPI=7
+HOMEPAGE=https://linuxcontainers.org/ https://github.com/lxc/lxc
+IUSE=apparmor +caps doc examples libressl pam seccomp selinux +ssl +templates +tools kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-3
+PDEPEND=templates? ( app-emulation/lxc-templates )
+RDEPEND=app-misc/pax-utils sys-apps/util-linux sys-libs/libcap virtual/awk caps? ( sys-libs/libcap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+SLOT=0
+SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-4.0.3.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6d6a2f6d953f468e8f8e8ce8ed66be88
diff --git a/metadata/md5-cache/app-emulation/lxc-templates-3.0.3 b/metadata/md5-cache/app-emulation/lxc-templates-3.0.3
deleted file mode 100644
index 882a68160cf5..000000000000
--- a/metadata/md5-cache/app-emulation/lxc-templates-3.0.3
+++ /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=prepare
-DEPEND=>=app-emulation/lxc-3.0
-DESCRIPTION=Old style template scripts for LXC
-EAPI=7
-HOMEPAGE=https://linuxcontainers.org/
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
-LICENSE=LGPL-3
-RDEPEND=>=app-emulation/lxc-3.0
-SLOT=0
-SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-templates-3.0.3.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=68d1601bcd4c3a6149331409f871cbb5
diff --git a/metadata/md5-cache/app-emulation/lxc-templates-3.0.4 b/metadata/md5-cache/app-emulation/lxc-templates-3.0.4
index 3cc1c11ab22f..a2e52e5fddd9 100644
--- a/metadata/md5-cache/app-emulation/lxc-templates-3.0.4
+++ b/metadata/md5-cache/app-emulation/lxc-templates-3.0.4
@@ -4,10 +4,10 @@ DEPEND=>=app-emulation/lxc-3.0
 DESCRIPTION=Old style template scripts for LXC
 EAPI=7
 HOMEPAGE=https://linuxcontainers.org/ https://github.com/lxc/lxc-templates
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-3
 RDEPEND=>=app-emulation/lxc-3.0
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-templates-3.0.4.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e2da1e348cf41562abde14c27ed408e5
+_md5_=52b387840530688f1adf2fa387350401
diff --git a/metadata/md5-cache/app-emulation/lxd-3.14 b/metadata/md5-cache/app-emulation/lxd-3.14
deleted file mode 100644
index a850ce614f32..000000000000
--- a/metadata/md5-cache/app-emulation/lxd-3.14
+++ /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 prepare setup test
-DEPEND=dev-lang/tcl >=dev-lang/go-1.9.4 dev-libs/libuv dev-libs/protobuf nls? ( sys-devel/gettext ) test? ( app-misc/jq net-misc/curl sys-devel/gettext )
-DESCRIPTION=Fast, dense and secure container management
-EAPI=7
-HOMEPAGE=https://linuxcontainers.org/lxd/introduction/
-IUSE=+daemon +ipv6 +dnsmasq nls test tools kernel_linux
-KEYWORDS=amd64
-LICENSE=Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0
-RDEPEND=daemon? ( app-arch/xz-utils >=app-emulation/lxc-2.0.7[seccomp] dev-libs/libuv dev-libs/lzo dev-util/xdelta:3 dnsmasq? ( net-dns/dnsmasq[dhcp,ipv6?] ) net-firewall/ebtables net-firewall/iptables[ipv6?] net-libs/libnfnetlink net-libs/libnsl:0= net-misc/rsync[xattr] sys-apps/iproute2[ipv6?] sys-fs/fuse sys-fs/lxcfs sys-fs/squashfs-tools virtual/acl )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://linuxcontainers.org/downloads/lxd/lxd-3.14.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=f58e44f69caeee015c3d088c86282165
diff --git a/metadata/md5-cache/app-emulation/lxd-4.0.1 b/metadata/md5-cache/app-emulation/lxd-4.0.1
index e0c7bc2be363..cd68cd0c055b 100644
--- a/metadata/md5-cache/app-emulation/lxd-4.0.1
+++ b/metadata/md5-cache/app-emulation/lxd-4.0.1
@@ -5,11 +5,11 @@ DESCRIPTION=Fast, dense and secure container management
 EAPI=7
 HOMEPAGE=https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd
 IUSE=+ipv6 nls kernel_linux
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0
 RDEPEND=app-arch/xz-utils >=app-emulation/lxc-3.0.0[seccomp] dev-lang/tcl dev-libs/libuv dev-libs/lzo net-dns/dnsmasq[dhcp,ipv6?] acct-group/lxd net-firewall/ebtables net-firewall/iptables[ipv6?] sys-apps/iproute2[ipv6?] sys-fs/fuse:0= sys-fs/lxcfs sys-fs/squashfs-tools virtual/acl
 RESTRICT=test
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxd/lxd-4.0.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=167006d9b6fa845b26c7bc7cf977521e
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=85ae02666d6f2bd98bb395d81cfef728
diff --git a/metadata/md5-cache/app-emulation/lxd-4.0.2 b/metadata/md5-cache/app-emulation/lxd-4.0.2
new file mode 100644
index 000000000000..88e2330d5cfa
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/lxd-4.0.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/go 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 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=app-arch/xz-utils >=app-emulation/lxc-3.0.0[seccomp] dev-lang/tcl dev-libs/libuv dev-libs/lzo net-dns/dnsmasq[dhcp,ipv6?]
+DESCRIPTION=Fast, dense and secure container management
+EAPI=7
+HOMEPAGE=https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd
+IUSE=+ipv6 nls kernel_linux
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0
+RDEPEND=app-arch/xz-utils >=app-emulation/lxc-3.0.0[seccomp] dev-lang/tcl dev-libs/libuv dev-libs/lzo net-dns/dnsmasq[dhcp,ipv6?] acct-group/lxd net-firewall/ebtables net-firewall/iptables[ipv6?] sys-apps/iproute2[ipv6?] sys-fs/fuse:0= sys-fs/lxcfs sys-fs/squashfs-tools virtual/acl
+RESTRICT=test
+SLOT=0
+SRC_URI=https://linuxcontainers.org/downloads/lxd/lxd-4.0.2.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6a906ff8360e69f6d560bd480c027bd4
diff --git a/metadata/md5-cache/app-emulation/nemu-2.2.1 b/metadata/md5-cache/app-emulation/nemu-2.2.1
index 6b913a7a4eac..d258e8f3c1ac 100644
--- a/metadata/md5-cache/app-emulation/nemu-2.2.1
+++ b/metadata/md5-cache/app-emulation/nemu-2.2.1
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=app-emulation/qemu[vnc,virtfs,spice?] dev-db/sqlite:3= sys-libs/ncurses:0=[unicode] virtual/libusb:1 virtual/libudev:= network-map? ( media-gfx/graphviz ) ovf? ( dev-libs/libxml2:2 app-arch/libarchive ) vnc-client? ( net-misc/tigervnc )
 SLOT=0
 SRC_URI=https://lib.void.so/src/nemu-2.2.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=83f9b4345078c47ac7de9ef061a7e658
diff --git a/metadata/md5-cache/app-emulation/nemu-9999 b/metadata/md5-cache/app-emulation/nemu-9999
index 6199f9261b52..da9c15d93411 100644
--- a/metadata/md5-cache/app-emulation/nemu-9999
+++ b/metadata/md5-cache/app-emulation/nemu-9999
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 PROPERTIES=live
 RDEPEND=sys-libs/ncurses:0=[unicode] dev-db/sqlite:3= virtual/libusb:1 || ( sys-fs/eudev sys-fs/udev sys-apps/systemd ) >=app-emulation/qemu-2.12.0[vnc,virtfs,spice?] ovf? ( dev-libs/libxml2 app-arch/libarchive ) svg? ( media-gfx/graphviz[svg] )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ee380907e92c23b39b31976a36fa0871
diff --git a/metadata/md5-cache/app-emulation/open-vm-tools-11.0.1-r1 b/metadata/md5-cache/app-emulation/open-vm-tools-11.0.1-r1
index d51a22744103..c1cade8d4611 100644
--- a/metadata/md5-cache/app-emulation/open-vm-tools-11.0.1-r1
+++ b/metadata/md5-cache/app-emulation/open-vm-tools-11.0.1-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib net-libs/libtirpc deploypkg? ( dev-libs/libmspack ) fuse?
 REQUIRED_USE=multimon? ( X ) vgauth? ( ssl )
 SLOT=0
 SRC_URI=https://github.com/vmware/open-vm-tools/releases/download/stable-11.0.1/open-vm-tools-11.0.1-14773994.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=40f531ec7f35b879c57a69e725f6ef46
diff --git a/metadata/md5-cache/app-emulation/open-vm-tools-11.1.0 b/metadata/md5-cache/app-emulation/open-vm-tools-11.1.0
index 1a9c135a85d1..cc4cd62d6ebf 100644
--- a/metadata/md5-cache/app-emulation/open-vm-tools-11.1.0
+++ b/metadata/md5-cache/app-emulation/open-vm-tools-11.1.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib net-libs/libtirpc deploypkg? ( dev-libs/libmspack ) fuse?
 REQUIRED_USE=multimon? ( X ) vgauth? ( ssl )
 SLOT=0
 SRC_URI=https://github.com/vmware/open-vm-tools/releases/download/stable-11.1.0/open-vm-tools-11.1.0-16036546.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4f1be2239b30b012b0093ea5c11dc634
diff --git a/metadata/md5-cache/app-emulation/qemu-4.2.0-r6 b/metadata/md5-cache/app-emulation/qemu-4.2.0-r6
index b843a13ffba5..2d20bb0d26da 100644
--- a/metadata/md5-cache/app-emulation/qemu-4.2.0-r6
+++ b/metadata/md5-cache/app-emulation/qemu-4.2.0-r6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.qemu.org/qemu-4.2.0.tar.xz https://dev.gentoo.org/~tamiko/distfiles/qemu-4.2.0-patches-r2.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	da689a8e04bbbb3518888ff668fee45b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	da689a8e04bbbb3518888ff668fee45b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=967a1691b1f9b2d8ba41a821fa0028bc
diff --git a/metadata/md5-cache/app-emulation/qemu-5.0.0 b/metadata/md5-cache/app-emulation/qemu-5.0.0
index f6b8667789e9..32be5305dbe8 100644
--- a/metadata/md5-cache/app-emulation/qemu-5.0.0
+++ b/metadata/md5-cache/app-emulation/qemu-5.0.0
@@ -5,12 +5,12 @@ DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
 EAPI=7
 HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
 IUSE=accessibility +aio alsa bzip2 capstone +caps +curl debug doc +fdt glusterfs gnutls gtk infiniband iscsi io-uring jemalloc +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +oss +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen xfs +xkb zstd qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_rx qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx kernel_linux python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 +filecaps
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2 LGPL-2 BSD-2
 RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) >=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(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 xkb? ( x11-libs/libxkbcommon ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary] ~sys-firmware/seabios-1.12.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary] ~sys-firmware/seabios-1.12.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.12.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) acct-group/kvm selinux? ( sec-policy/selinux-qemu ) filecaps? ( sys-libs/libcap )
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) static? ( static-user !alsa !gtk !opengl !pulseaudio !plugins !rbd !snappy ) static-user? ( !plugins ) virtfs? ( xattr ) vte? ( gtk ) plugins? ( !static !static-user )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.qemu.org/qemu-5.0.0.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	da689a8e04bbbb3518888ff668fee45b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6c54ae955e721e76e15b94939eda2909
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	da689a8e04bbbb3518888ff668fee45b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=249fca5554d6e8e87675a4c2b313c318
diff --git a/metadata/md5-cache/app-emulation/qemu-9999 b/metadata/md5-cache/app-emulation/qemu-9999
index 27ee97276f89..3bb08d14e2ba 100644
--- a/metadata/md5-cache/app-emulation/qemu-9999
+++ b/metadata/md5-cache/app-emulation/qemu-9999
@@ -11,5 +11,5 @@ RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) static? ( static-user !alsa !gtk !opengl !pulseaudio !plugins !rbd !snappy ) static-user? ( !plugins ) virtfs? ( xattr ) vte? ( gtk ) plugins? ( !static !static-user )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	da689a8e04bbbb3518888ff668fee45b	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	da689a8e04bbbb3518888ff668fee45b	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6c54ae955e721e76e15b94939eda2909
diff --git a/metadata/md5-cache/app-emulation/runc-1.0.0_rc10 b/metadata/md5-cache/app-emulation/runc-1.0.0_rc10
index 62cfc3edcc77..b160df79b0be 100644
--- a/metadata/md5-cache/app-emulation/runc-1.0.0_rc10
+++ b/metadata/md5-cache/app-emulation/runc-1.0.0_rc10
@@ -10,5 +10,5 @@ RDEPEND=apparmor? ( sys-libs/libapparmor ) seccomp? ( sys-libs/libseccomp ) !app
 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	f9ec87e93172b25ce65a85303dc06964	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=91df14aa93043dcdaafc0e5bcb802a80
diff --git a/metadata/md5-cache/app-emulation/simplevirt-0.0_p20181012-r1 b/metadata/md5-cache/app-emulation/simplevirt-0.0_p20181012-r1
index ba0fbbd7b942..4b619c7c1142 100644
--- a/metadata/md5-cache/app-emulation/simplevirt-0.0_p20181012-r1
+++ b/metadata/md5-cache/app-emulation/simplevirt-0.0_p20181012-r1
@@ -9,5 +9,5 @@ RDEPEND=acct-group/simplevirt 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	f9ec87e93172b25ce65a85303dc06964	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a89a4cccd8e0a48965afbdf7523328aa
diff --git a/metadata/md5-cache/app-emulation/spice-vdagent-0.19.0-r1 b/metadata/md5-cache/app-emulation/spice-vdagent-0.19.0-r1
index b873e68f81ae..b8ab97d92b89 100644
--- a/metadata/md5-cache/app-emulation/spice-vdagent-0.19.0-r1
+++ b/metadata/md5-cache/app-emulation/spice-vdagent-0.19.0-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 >=app-emulation/spice-protocol-0.14.0 media-libs/alsa-lib >=x11-libs/libpciaccess-0.10 x11-libs/libdrm x11-libs/libXfixes x11-libs/libXrandr x11-libs/libX11 x11-libs/libXinerama consolekit? ( sys-auth/consolekit sys-apps/dbus ) gtk? ( x11-libs/gtk+:3 ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-vdagent )
 SLOT=0
 SRC_URI=https://www.spice-space.org/download/releases/spice-vdagent-0.19.0.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a5cefff1528b680e676692455f911b81
diff --git a/metadata/md5-cache/app-emulation/spice-vdagent-0.20.0 b/metadata/md5-cache/app-emulation/spice-vdagent-0.20.0
index aa50fe2c40d2..a980f3dc9054 100644
--- a/metadata/md5-cache/app-emulation/spice-vdagent-0.20.0
+++ b/metadata/md5-cache/app-emulation/spice-vdagent-0.20.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 >=app-emulation/spice-protocol-0.14.0 media-libs/alsa-lib >=x11-libs/libpciaccess-0.10 x11-libs/libdrm x11-libs/libXfixes x11-libs/libXrandr x11-libs/libX11 x11-libs/libXinerama consolekit? ( sys-auth/consolekit sys-apps/dbus ) gtk? ( x11-libs/gtk+:3 ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-vdagent )
 SLOT=0
 SRC_URI=https://www.spice-space.org/download/releases/spice-vdagent-0.20.0.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a7c762070f570499a1bcfba1feeb7637
diff --git a/metadata/md5-cache/app-emulation/virtio-win-0.1.185.1 b/metadata/md5-cache/app-emulation/virtio-win-0.1.185.1
new file mode 100644
index 000000000000..448b1773f122
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtio-win-0.1.185.1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=VirtIO drivers for Windows virtual machines running on KVM
+EAPI=7
+HOMEPAGE=https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html
+KEYWORDS=~amd64
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.185-1/virtio-win-0.1.185.iso
+_md5_=736d931c9d8422a80eb6eb60239a7100
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.2.40 b/metadata/md5-cache/app-emulation/virtualbox-5.2.40
index d74d6fa7653d..71d8956dbc96 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-5.2.40
+++ b/metadata/md5-cache/app-emulation/virtualbox-5.2.40
@@ -10,5 +10,5 @@ RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.40 d
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( 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.40/VirtualBox-5.2.40.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.36-patches-01.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=efd7b3a6d2be2ccf3ac18d17b0b15e95
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.2.42 b/metadata/md5-cache/app-emulation/virtualbox-5.2.42
index f7eeb0d33a68..e8d0b064cc1a 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-5.2.42
+++ b/metadata/md5-cache/app-emulation/virtualbox-5.2.42
@@ -10,5 +10,5 @@ RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.42 d
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( 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.42/VirtualBox-5.2.42.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.36-patches-01.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bda49b01c279b6ba1ae7980fdc8a4beb
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.0.20 b/metadata/md5-cache/app-emulation/virtualbox-6.0.20
index 131dc2c9995f..4574fd26187c 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.0.20
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.0.20
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( 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.20/VirtualBox-6.0.20.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.0.20-patches-01.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=58bc3aec037da63a26467f9a0d437f60
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.0.22 b/metadata/md5-cache/app-emulation/virtualbox-6.0.22
index 5c01a35b0481..18332bffb7ff 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.0.22
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.0.22
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( 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.22/VirtualBox-6.0.22.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.0.22-patches-01.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bdf87d1c9df2552784a6fa1857f8b63f
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.10-r1 b/metadata/md5-cache/app-emulation/virtualbox-6.1.10-r1
index 35c297923419..447608fd999d 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.1.10-r1
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.10-r1
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( 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.10/VirtualBox-6.1.10.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.10-patches-01.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=48211fccd3db1b9744d4933fcff222e9
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fc205b1dbd478d80066221a1372b146a
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.6 b/metadata/md5-cache/app-emulation/virtualbox-6.1.6
index 33927f921dad..c52a556a6b83 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.1.6
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.6
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( 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.6/VirtualBox-6.1.6.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.4-patches-01.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8f1ab1501ba3616e5a51d0cfb3143d10
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.40.137108 b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.40.137108
index 48d3e5bc0aa6..0e78c2f28535 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.40.137108
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.40.137108
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/5.2.40/VirtualBox-5.2.40-137108-Linux_amd64.run ) x86? ( https://download.virtualbox.org/virtualbox/5.2.40/VirtualBox-5.2.40-137108-Linux_x86.run ) https://download.virtualbox.org/virtualbox/5.2.40/Oracle_VM_VirtualBox_Extension_Pack-5.2.40-137108.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.2.40-137108.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/5.2.40/VirtualBoxSDK-5.2.40-137108.zip )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4818edeb726dcf3d7a9d77f811843193
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.42.137960 b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.42.137960
index 218419de4d6d..aa181e262a91 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.42.137960
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.42.137960
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/5.2.42/VirtualBox-5.2.42-137960-Linux_amd64.run ) x86? ( https://download.virtualbox.org/virtualbox/5.2.42/VirtualBox-5.2.42-137960-Linux_x86.run ) https://download.virtualbox.org/virtualbox/5.2.42/Oracle_VM_VirtualBox_Extension_Pack-5.2.42-137960.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.2.42-137960.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/5.2.42/VirtualBoxSDK-5.2.42-137960.zip )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=76da32dfce7fb279554782e46d19bc89
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.20.137117 b/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.20.137117
index 2743ae9ed6bb..b96dad701329 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.20.137117
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.20.137117
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/6.0.20/VirtualBox-6.0.20-137117-Linux_amd64.run ) https://download.virtualbox.org/virtualbox/6.0.20/Oracle_VM_VirtualBox_Extension_Pack-6.0.20-137117.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.0.20-137117.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/6.0.20/VirtualBoxSDK-6.0.20-137117.zip )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0a4783c906755f8e2c3f80fad93c1265
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.22.137980 b/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.22.137980
index 19da93443098..5f703412da96 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.22.137980
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.22.137980
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/6.0.22/VirtualBox-6.0.22-137980-Linux_amd64.run ) https://download.virtualbox.org/virtualbox/6.0.22/Oracle_VM_VirtualBox_Extension_Pack-6.0.22-137980.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.0.22-137980.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/6.0.22/VirtualBoxSDK-6.0.22-137980.zip )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0a4783c906755f8e2c3f80fad93c1265
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-6.1.10.138449 b/metadata/md5-cache/app-emulation/virtualbox-bin-6.1.10.138449
index 39a883725a11..deec8b1af133 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-6.1.10.138449
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-6.1.10.138449
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/6.1.10/VirtualBox-6.1.10-138449-Linux_amd64.run ) https://download.virtualbox.org/virtualbox/6.1.10/Oracle_VM_VirtualBox_Extension_Pack-6.1.10-138449.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.1.10-138449.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/6.1.10/VirtualBoxSDK-6.1.10-138449.zip )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dd9bd45e58b5a5af2d5ed58287b74e93
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-6.1.6.137129 b/metadata/md5-cache/app-emulation/virtualbox-bin-6.1.6.137129
index f67c953819c6..2f3a70d1bce2 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-6.1.6.137129
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-6.1.6.137129
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/6.1.6/VirtualBox-6.1.6-137129-Linux_amd64.run ) https://download.virtualbox.org/virtualbox/6.1.6/Oracle_VM_VirtualBox_Extension_Pack-6.1.6-137129.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.1.6-137129.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/6.1.6/VirtualBoxSDK-6.1.6-137129.zip )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dd9bd45e58b5a5af2d5ed58287b74e93
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.40 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.40
index 1e8b5de3ef07..69215e239def 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.40
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.40
@@ -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.40/VirtualBox-5.2.40.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.36-patches-01.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=5d168d5e46612717671318dad4abb4ce
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.42 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.42
index 74d3c34b0b2c..052d1c0f8927 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.42
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.42
@@ -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.42/VirtualBox-5.2.42.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.36-patches-01.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=d606d02cdc39d477c32395cb9dcfb465
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.20 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.20
index c21fb5b94f50..6d674baf526f 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.20
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.20
@@ -11,5 +11,5 @@ PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
 RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest 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.20/VirtualBox-6.0.20.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.0.20-patches-01.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1908861691a1a2ee1d093d2c7603a930
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.22 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.22
index b8b71a627898..cc268789e869 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.22
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.22
@@ -11,5 +11,5 @@ PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
 RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest 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.22/VirtualBox-6.0.22.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.0.22-patches-01.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0ff2908152c9430b37970216f74b2954
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.10 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.10
index 55d805994e06..6c5a69849010 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.10
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.10
@@ -11,5 +11,5 @@ PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
 RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest 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.10/VirtualBox-6.1.10.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.10-patches-01.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3a5aa94cf5ea188911e1bc79b4010cbc
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.6 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.6
index 1ecc60a1332f..e83c6d9b441b 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.6
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.6
@@ -11,5 +11,5 @@ PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
 RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest 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.6/VirtualBox-6.1.6.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.0_rc1-patches-01.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=14601232c27d5c5b49c8f38307f8efcc
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.40 b/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.40
index 02b93f10225d..637a5c0d80f1 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.40
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.40
@@ -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.40.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=45d0bbf31e31a501122156d16eefe77e
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.42 b/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.42
index 77080c7d590d..d8557df1ffc5 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.42
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.42
@@ -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.42.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=28cb61a991247408ffad4dae5e6de146
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.0.20 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.0.20
index 1b447f63b885..a3a66e82fdee 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-6.0.20
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.0.20
@@ -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.20.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0146a46d0d0c2aa2f1397910dfd2039a
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.0.22 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.0.22
index 8c357ab53680..ecfb7750864b 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-6.0.22
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.0.22
@@ -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.22.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0146a46d0d0c2aa2f1397910dfd2039a
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.10 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.10
index 9fe2b05b2551..fd94ee595f99 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.10
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.10
@@ -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.10.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e126f8852456082b546554b39e18f34a
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.6 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.6
index 0e5e8563714e..d18f999f2e59 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.6
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.6
@@ -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.6.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e126f8852456082b546554b39e18f34a
diff --git a/metadata/md5-cache/app-emulation/x48-0.6.4-r2 b/metadata/md5-cache/app-emulation/x48-0.6.4-r2
index 5100f19c60e6..8282c07e7c24 100644
--- a/metadata/md5-cache/app-emulation/x48-0.6.4-r2
+++ b/metadata/md5-cache/app-emulation/x48-0.6.4-r2
@@ -1,5 +1,5 @@
 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 unpack
+DEFINED_PHASES=configure install postinst prepare
 DEPEND=x11-libs/libX11 x11-libs/libXext readline? ( sys-libs/readline:0= ) virtual/pkgconfig x11-libs/libXt
 DESCRIPTION=HP48 Calculator Emulator
 EAPI=7
@@ -11,4 +11,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext readline? ( sys-libs/readline:0= )
 SLOT=0
 SRC_URI=mirror://sourceforge/x48.berlios/x48-0.6.4.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d062b823838cb0416b5b7f943695e1d1
+_md5_=682d8ed95d6aa3999321930607b11ce0
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 9d838e4ba516..71918b5868a2 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	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	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 dba33141f2f1..f4498d449812 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	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	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 15567b819f92..e0884fc9daac 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	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=61158e01a8f3e256b1f3fc30744443e8
diff --git a/metadata/md5-cache/app-emulation/xen-4.14.0_rc1 b/metadata/md5-cache/app-emulation/xen-4.14.0_rc1
deleted file mode 100644
index 773b9f108061..000000000000
--- a/metadata/md5-cache/app-emulation/xen-4.14.0_rc1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 )
-DESCRIPTION=The Xen virtual machine monitor
-EAPI=7
-HOMEPAGE=https://www.xenproject.org
-IUSE=debug efi flask
-LICENSE=GPL-2
-PDEPEND=~app-emulation/xen-tools-4.14.0_rc1
-REQUIRED_USE=arm? ( debug )
-RESTRICT=test splitdebug strip
-SLOT=0
-SRC_URI=https://downloads.xenproject.org/release/xen/4.14.0-rc1/xen-4.14.0-rc1.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a657d95677e642c39fe984a456ac4019
diff --git a/metadata/md5-cache/app-emulation/xen-4.14.0_rc3 b/metadata/md5-cache/app-emulation/xen-4.14.0_rc3
new file mode 100644
index 000000000000..d5cd0b9d25ac
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-4.14.0_rc3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
+DEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 )
+DESCRIPTION=The Xen virtual machine monitor
+EAPI=7
+HOMEPAGE=https://www.xenproject.org
+IUSE=debug efi flask
+LICENSE=GPL-2
+PDEPEND=~app-emulation/xen-tools-4.14.0_rc3
+REQUIRED_USE=arm? ( debug )
+RESTRICT=test splitdebug strip
+SLOT=0
+SRC_URI=https://downloads.xenproject.org/release/xen/4.14.0-rc3/xen-4.14.0-rc3.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a657d95677e642c39fe984a456ac4019
diff --git a/metadata/md5-cache/app-emulation/xen-pvgrub-4.14.0_rc1 b/metadata/md5-cache/app-emulation/xen-pvgrub-4.14.0_rc1
deleted file mode 100644
index 60c8acae8de6..000000000000
--- a/metadata/md5-cache/app-emulation/xen-pvgrub-4.14.0_rc1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=sys-devel/gettext sys-devel/bin86 sys-apps/texinfo x11-libs/pixman
-DESCRIPTION=allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem
-EAPI=7
-HOMEPAGE=https://www.xenproject.org
-IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-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] ) 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_8? ( dev-lang/python:3.8[xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=app-emulation/xen-tools-4.14.0_rc1
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://downloads.xenproject.org/release/xen/4.14.0-rc1/xen-4.14.0-rc1.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	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bb16121f998f6de07bc6fbbb8a8eb578
diff --git a/metadata/md5-cache/app-emulation/xen-pvgrub-4.14.0_rc3 b/metadata/md5-cache/app-emulation/xen-pvgrub-4.14.0_rc3
new file mode 100644
index 000000000000..f09d13361302
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-pvgrub-4.14.0_rc3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=sys-devel/gettext sys-devel/bin86 sys-apps/texinfo x11-libs/pixman
+DESCRIPTION=allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem
+EAPI=7
+HOMEPAGE=https://www.xenproject.org
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+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] ) 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_8? ( dev-lang/python:3.8[xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=app-emulation/xen-tools-4.14.0_rc3
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://downloads.xenproject.org/release/xen/4.14.0-rc3/xen-4.14.0-rc3.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	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=bb16121f998f6de07bc6fbbb8a8eb578
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.14.0_rc1 b/metadata/md5-cache/app-emulation/xen-tools-4.14.0_rc1
deleted file mode 100644
index e09274d4ad95..000000000000
--- a/metadata/md5-cache/app-emulation/xen-tools-4.14.0_rc1
+++ /dev/null
@@ -1,14 +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_python3_6? ( dev-lang/python:3.6[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=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(-)] ) ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] pam? ( dev-python/pypam[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] pam? ( dev-python/pypam[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] pam? ( dev-python/pypam[python_targets_python3_9(-)] ) ) 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] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] ) python_single_target_python3_9? ( dev-lang/python:3.9[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(-)] ) python_single_target_python3_7? ( dev-python/markdown[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/markdown[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/markdown[python_targets_python3_9(-)] ) dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= x11-libs/pixman sdl? ( media-libs/libsdl[X] media-libs/libsdl2[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 ) python? ( >=dev-lang/swig-4.0.0 )
-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_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-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] ) python_single_target_python3_7? ( dev-lang/python:3.7[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) 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_7 python_single_target_python3_8 python_single_target_python3_9 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
-RESTRICT=test
-SLOT=0/4.14
-SRC_URI=https://downloads.xenproject.org/release/xen/4.14.0-rc1/xen-4.14.0-rc1.tar.gz https://github.com/qemu/seabios/archive/rel-1.13.0.tar.gz -> seabios-1.13.0.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-22.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-22.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9e6b1acf4ca1441fa5aa581472ebca47
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.14.0_rc3 b/metadata/md5-cache/app-emulation/xen-tools-4.14.0_rc3
new file mode 100644
index 000000000000..1d16cf8c6115
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.14.0_rc3
@@ -0,0 +1,14 @@
+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] ) python_single_target_python3_7? ( dev-lang/python:3.7[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=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(-)] ) ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] pam? ( dev-python/pypam[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] pam? ( dev-python/pypam[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] pam? ( dev-python/pypam[python_targets_python3_9(-)] ) ) 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] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] ) python_single_target_python3_9? ( dev-lang/python:3.9[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(-)] ) python_single_target_python3_7? ( dev-python/markdown[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/markdown[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/markdown[python_targets_python3_9(-)] ) dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= x11-libs/pixman sdl? ( media-libs/libsdl[X] media-libs/libsdl2[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 ) python? ( >=dev-lang/swig-4.0.0 )
+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_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+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] ) python_single_target_python3_7? ( dev-lang/python:3.7[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) 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_7 python_single_target_python3_8 python_single_target_python3_9 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
+RESTRICT=test
+SLOT=0/4.14
+SRC_URI=https://downloads.xenproject.org/release/xen/4.14.0-rc3/xen-4.14.0-rc3.tar.gz https://github.com/qemu/seabios/archive/rel-1.13.0.tar.gz -> seabios-1.13.0.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-22.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-22.tar.xz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9e6b1acf4ca1441fa5aa581472ebca47
diff --git a/metadata/md5-cache/app-emulation/xtrs-4.9d-r5 b/metadata/md5-cache/app-emulation/xtrs-4.9d-r5
index 998c95733c53..8e728789257a 100644
--- a/metadata/md5-cache/app-emulation/xtrs-4.9d-r5
+++ b/metadata/md5-cache/app-emulation/xtrs-4.9d-r5
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile install postinst prepare
 DEPEND=sys-libs/ncurses:0= sys-libs/readline:0= x11-libs/libX11 ls-dos? ( app-arch/unzip dev-util/xdelta:3 )
 DESCRIPTION=Radio Shack TRS-80 emulator
 EAPI=6
-HOMEPAGE=http://www.tim-mann.org/xtrs.html
+HOMEPAGE=https://www.tim-mann.org/xtrs.html
 IUSE=ls-dos
 KEYWORDS=amd64 ppc x86
 LICENSE=xtrs ls-dos? ( freedist )
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= x11-libs/libX11
 RESTRICT=ls-dos? ( bindist )
 SLOT=0
-SRC_URI=http://www.tim-mann.org/trs80/xtrs-4.9d.tar.gz ls-dos? ( http://www.tim-mann.org/trs80/ld4-631.zip https://dev.gentoo.org/~ulm/distfiles/ld4-631l.xd3 )
+SRC_URI=https://www.tim-mann.org/trs80/xtrs-4.9d.tar.gz ls-dos? ( https://www.tim-mann.org/trs80/ld4-631.zip https://dev.gentoo.org/~ulm/distfiles/ld4-631l.xd3 )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2939d3711918f04e1aa89a0d14093bbe
+_md5_=5aae273bd87be0a3130aeb498a19fd3a
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index 881c28becffd..c919e491a7e6 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/honggfuzz-2.2-r1 b/metadata/md5-cache/app-forensics/honggfuzz-2.2-r1
index 004fe03e3fb7..e49b4aafc8be 100644
--- a/metadata/md5-cache/app-forensics/honggfuzz-2.2-r1
+++ b/metadata/md5-cache/app-forensics/honggfuzz-2.2-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=install prepare pretend
 DEPEND=>=sys-libs/binutils-libs-2.29:= sys-libs/libunwind:= app-arch/xz-utils
 DESCRIPTION=A general purpose fuzzer with feedback support
 EAPI=7
@@ -9,4 +9,4 @@ RDEPEND=>=sys-libs/binutils-libs-2.29:= sys-libs/libunwind:= app-arch/xz-utils
 SLOT=0
 SRC_URI=https://github.com/google/honggfuzz/archive/2.2.tar.gz -> honggfuzz-2.2.tar.gz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=eaea2db6b5323734c7a90ca47a1aae4a
+_md5_=190c70062ff828702b9bacea4c5c982b
diff --git a/metadata/md5-cache/app-laptop/Manifest.gz b/metadata/md5-cache/app-laptop/Manifest.gz
index 137c56c2c587..2f9be0f9fe00 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/hdapsd-20141203 b/metadata/md5-cache/app-laptop/hdapsd-20141203
index 179b5abe127f..e270d4eac8a4 100644
--- a/metadata/md5-cache/app-laptop/hdapsd-20141203
+++ b/metadata/md5-cache/app-laptop/hdapsd-20141203
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=libconfig? ( dev-libs/libconfig )
 SLOT=0
 SRC_URI=https://github.com/evgeni/hdapsd/releases/download/20141203/hdapsd-20141203.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	273fa5d1a8ed000a29d79323e2ed0dc1	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	273fa5d1a8ed000a29d79323e2ed0dc1	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=97f9ef334615da393c4545df61f29afb
diff --git a/metadata/md5-cache/app-laptop/mbpfan-2.1.1 b/metadata/md5-cache/app-laptop/mbpfan-2.1.1
index 03706d40c735..bf2f294a79f9 100644
--- a/metadata/md5-cache/app-laptop/mbpfan-2.1.1
+++ b/metadata/md5-cache/app-laptop/mbpfan-2.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/dgraziotin/mbpfan/archive/v2.1.1.tar.gz -> mbpfan-2.1.1.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c24d109455b51e878477d7a3122cdaa9
diff --git a/metadata/md5-cache/app-laptop/mbpfan-2.2.1 b/metadata/md5-cache/app-laptop/mbpfan-2.2.1
index 182a9a2a5aaf..39afa520ee1f 100644
--- a/metadata/md5-cache/app-laptop/mbpfan-2.2.1
+++ b/metadata/md5-cache/app-laptop/mbpfan-2.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/dgraziotin/mbpfan/archive/v2.2.1.tar.gz -> mbpfan-2.2.1.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=94a5e552befa0f68f74dfd732178feab
diff --git a/metadata/md5-cache/app-laptop/mbpfan-9999 b/metadata/md5-cache/app-laptop/mbpfan-9999
index 9486d131b53b..e502fb991c09 100644
--- a/metadata/md5-cache/app-laptop/mbpfan-9999
+++ b/metadata/md5-cache/app-laptop/mbpfan-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 PROPERTIES=live
 RESTRICT=test
 SLOT=0
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=94a5e552befa0f68f74dfd732178feab
diff --git a/metadata/md5-cache/app-laptop/pommed-1.39-r1 b/metadata/md5-cache/app-laptop/pommed-1.39-r1
index d54c6f8fe823..162be4ced867 100644
--- a/metadata/md5-cache/app-laptop/pommed-1.39-r1
+++ b/metadata/md5-cache/app-laptop/pommed-1.39-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib x86? ( sys-apps/pciutils ) amd64? ( sys-apps/pciutils ) dev-libs/confuse >=sys-apps/dbus-1.1 dev-libs/dbus-glib sys-libs/zlib media-libs/audiofile gtk? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXpm ) media-sound/alsa-utils virtual/eject
 SLOT=0
 SRC_URI=http://alioth.debian.org/frs/download.php/3583/pommed-1.39.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7c86d6b6b5767a0ee23f071bfdbf1ac4
diff --git a/metadata/md5-cache/app-laptop/tp_smapi-0.43 b/metadata/md5-cache/app-laptop/tp_smapi-0.43
index c4a578ddcfa5..c6c88114f782 100644
--- a/metadata/md5-cache/app-laptop/tp_smapi-0.43
+++ b/metadata/md5-cache/app-laptop/tp_smapi-0.43
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/dmidecode kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/evgeni/tp_smapi/releases/download/tp-smapi/0.43/tp_smapi-0.43.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ea4b1ffcb1311290f86958e87b4a087b
diff --git a/metadata/md5-cache/app-laptop/tpb-0.6.4-r1 b/metadata/md5-cache/app-laptop/tpb-0.6.4-r1
index 5a903e638cad..10a9c83904b3 100644
--- a/metadata/md5-cache/app-laptop/tpb-0.6.4-r1
+++ b/metadata/md5-cache/app-laptop/tpb-0.6.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXt x11-libs/libXext xosd? ( >=x11-libs/xosd-2.2.0 )
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/tpb/tpb-0.6.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a3f76a90131031f7f3a7c408ba96bb43
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index 05ab2b70be1a..a6eca6fb1cda 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.21.0 b/metadata/md5-cache/app-metrics/alertmanager-0.21.0
new file mode 100644
index 000000000000..37d3dcd78e52
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/alertmanager-0.21.0
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/promu >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst prepare setup unpack
+DESCRIPTION=Alertmanager for alerts sent by client applications such as Prometheus
+EAPI=7
+HOMEPAGE=https://github.com/prometheus/alertmanager
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 MIT MPL-2.0
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/prometheus/alertmanager/archive/v0.21.0.tar.gz -> alertmanager-0.21.0.tar.gz
+_eclasses_=go-module	45394825d9260b479aa1cf252ea58e01	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=7f583542e7faa0c27a62fce1fafbba37
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
deleted file mode 100644
index 450927924d61..000000000000
--- a/metadata/md5-cache/app-metrics/buildbot-prometheus-17.7.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/prometheus_client[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-util/buildbot-0.9.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-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=A Prometheus metrics exporter for Buildbot
-EAPI=6
-HOMEPAGE=https://github.com/claws/buildbot-prometheus
-IUSE=python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-python/prometheus_client[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-util/buildbot-0.9.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/claws/buildbot-prometheus/archive/17.7.2.tar.gz -> buildbot-prometheus-17.7.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=da3e069e3c70273f2da4b425f286b17f
diff --git a/metadata/md5-cache/app-metrics/collectd-5.10.0 b/metadata/md5-cache/app-metrics/collectd-5.10.0
index 9a567377e17d..7c0714f7e661 100644
--- a/metadata/md5-cache/app-metrics/collectd-5.10.0
+++ b/metadata/md5-cache/app-metrics/collectd-5.10.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libgcrypt:= dev-libs/libltdl:0= perl? ( dev-lang/perl:=[ithread
 REQUIRED_USE=collectd_plugins_python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) 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	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=e8b4ee0e198b9a6d14971fb80700a602
diff --git a/metadata/md5-cache/app-metrics/collectd-5.11.0-r2 b/metadata/md5-cache/app-metrics/collectd-5.11.0-r2
index c38e9c484702..6c519f59a325 100644
--- a/metadata/md5-cache/app-metrics/collectd-5.11.0-r2
+++ b/metadata/md5-cache/app-metrics/collectd-5.11.0-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libgcrypt:= dev-libs/libltdl:0= sys-libs/libcap perl? ( dev-lan
 REQUIRED_USE=collectd_plugins_python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) collectd_plugins_smart? ( udev ) contrib? ( perl )
 SLOT=0
 SRC_URI=https://github.com/collectd/collectd/releases/download/collectd-5.11.0/collectd-5.11.0.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=d494e1ec68bf52287fea6d99fe5e961d
diff --git a/metadata/md5-cache/app-metrics/prometheus-2.19.1 b/metadata/md5-cache/app-metrics/prometheus-2.19.1
new file mode 100644
index 000000000000..4abf12a282a0
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/prometheus-2.19.1
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-util/promu-0.3.0 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst prepare setup unpack
+DEPEND=!app-metrics/prometheus-bin
+DESCRIPTION=Prometheus monitoring system and time series database
+EAPI=7
+HOMEPAGE=https://github.com/prometheus/prometheus
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/prometheus/prometheus/archive/v2.19.1.tar.gz -> prometheus-2.19.1.tar.gz https://dev.gentoo.org/~williamh/dist/prometheus-2.19.1-assets.tar.gz
+_eclasses_=go-module	45394825d9260b479aa1cf252ea58e01	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=fe901c8a53904bc4cfce8b3e978040cf
diff --git a/metadata/md5-cache/app-metrics/prometheus-bin-2.15.2 b/metadata/md5-cache/app-metrics/prometheus-bin-2.15.2
index 3e9d05733240..d652f8feb68a 100644
--- a/metadata/md5-cache/app-metrics/prometheus-bin-2.15.2
+++ b/metadata/md5-cache/app-metrics/prometheus-bin-2.15.2
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst
 DEPEND=acct-group/prometheus acct-user/prometheus !app-metrics/prometheus
 DESCRIPTION=prometheus monitoring system and time series database
 EAPI=7
-HOMEPAGE=http://prometheus.io
+HOMEPAGE=https://prometheus.io
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/prometheus acct-user/prometheus !app-metrics/prometheus
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/prometheus/prometheus/releases/download/v2.15.2/prometheus-2.15.2.linux-amd64.tar.gz
-_md5_=917ac160f2e65d771e4fe8913bba5dfb
+_md5_=4659bc7ec0f5804c1263513be982f7c0
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 3603f66f2066..63ee000b87c3 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/actkbd-0.2.8-r2 b/metadata/md5-cache/app-misc/actkbd-0.2.8-r2
index 542652cd9ae1..0104cb430322 100644
--- a/metadata/md5-cache/app-misc/actkbd-0.2.8-r2
+++ b/metadata/md5-cache/app-misc/actkbd-0.2.8-r2
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/files/actkbd-0.2.8.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=479d3fb46f1b83f33d7b60050bdc34cb
diff --git a/metadata/md5-cache/app-misc/beancounter-0.8.10-r1 b/metadata/md5-cache/app-misc/beancounter-0.8.10-r1
index 787b7f41762b..f73806d6947a 100644
--- a/metadata/md5-cache/app-misc/beancounter-0.8.10-r1
+++ b/metadata/md5-cache/app-misc/beancounter-0.8.10-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/Date-Manip dev-perl/Statistics-Descriptive dev-perl/Finance-YahooQuote dev-perl/libwww-perl mysql? ( dev-perl/DBD-mysql ) sqlite? ( dev-perl/DBD-SQLite ) postgres? ( dev-perl/DBD-Pg ) dev-perl/DBI dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://eddelbuettel.com/dirk/code/beancounter/beancounter_0.8.10.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=93e01a44c03ac03769c4e3acd30f8eb0
diff --git a/metadata/md5-cache/app-misc/beep-1.3-r3 b/metadata/md5-cache/app-misc/beep-1.3-r3
deleted file mode 100644
index d090824d50ee..000000000000
--- a/metadata/md5-cache/app-misc/beep-1.3-r3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install setup
-DESCRIPTION=The advanced PC speaker beeper
-EAPI=6
-HOMEPAGE=http://www.johnath.com/beep
-IUSE=suid
-KEYWORDS=~alpha amd64 arm ppc ppc64 sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.johnath.com/beep/beep-1.3.tar.gz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=46104f81624be47b2ce13cf2181c713a
diff --git a/metadata/md5-cache/app-misc/beep-1.4.9 b/metadata/md5-cache/app-misc/beep-1.4.9
index 173499255e3d..245de1745dc3 100644
--- a/metadata/md5-cache/app-misc/beep-1.4.9
+++ b/metadata/md5-cache/app-misc/beep-1.4.9
@@ -3,10 +3,10 @@ DESCRIPTION=Advanced PC speaker beeper
 EAPI=7
 HOMEPAGE=https://github.com/spkr-beep
 IUSE=suid
-KEYWORDS=~alpha amd64 arm ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm ppc ppc64 sparc x86
 LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/spkr-beep/beep/archive/v1.4.9.tar.gz -> beep-1.4.9.tar.gz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bcb06bff3628b65d5ce8cb040f98aa40
+_md5_=a49873b8acdf89b4c8e60d32f8c1d380
diff --git a/metadata/md5-cache/app-misc/blink1-1.98 b/metadata/md5-cache/app-misc/blink1-1.98
index 88e6d5e8c89c..453ece422307 100644
--- a/metadata/md5-cache/app-misc/blink1-1.98
+++ b/metadata/md5-cache/app-misc/blink1-1.98
@@ -9,5 +9,5 @@ LICENSE=CC-BY-SA-3.0
 RDEPEND=dev-libs/hidapi virtual/libusb:1 virtual/libudev sys-apps/attr sys-libs/libcap
 SLOT=0
 SRC_URI=https://github.com/todbot/blink1/archive/v1.98.tar.gz -> blink1-1.98.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3b5de472af9ee2d49c6c8277304ee5db
diff --git a/metadata/md5-cache/app-misc/byobu-5.123-r1 b/metadata/md5-cache/app-misc/byobu-5.123-r1
deleted file mode 100644
index 2c3802e56647..000000000000
--- a/metadata/md5-cache/app-misc/byobu-5.123-r1
+++ /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_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	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a0ac22644f7c9ef5350bd185c9632cc1
diff --git a/metadata/md5-cache/app-misc/byobu-5.124 b/metadata/md5-cache/app-misc/byobu-5.124
deleted file mode 100644
index a602cb808a79..000000000000
--- a/metadata/md5-cache/app-misc/byobu-5.124
+++ /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_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.124/+download/byobu_5.124.orig.tar.gz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4c28572ebcc116a49c400b8537801ffc
diff --git a/metadata/md5-cache/app-misc/byobu-5.125 b/metadata/md5-cache/app-misc/byobu-5.125
deleted file mode 100644
index acbd19ae5540..000000000000
--- a/metadata/md5-cache/app-misc/byobu-5.125
+++ /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_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.125/+download/byobu_5.125.orig.tar.gz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4c28572ebcc116a49c400b8537801ffc
diff --git a/metadata/md5-cache/app-misc/byobu-5.129 b/metadata/md5-cache/app-misc/byobu-5.129
deleted file mode 100644
index 4c3159374311..000000000000
--- a/metadata/md5-cache/app-misc/byobu-5.129
+++ /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_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-libs/newt[python_targets_python3_6(-)] ) screen? ( app-misc/screen ) !screen? ( app-misc/tmux )
-REQUIRED_USE=^^ ( 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	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=79120ecf6e851a22653783396bc041ce
diff --git a/metadata/md5-cache/app-misc/byobu-5.130-r1 b/metadata/md5-cache/app-misc/byobu-5.130-r1
index 8770aa749e7a..fe0a9b585d6a 100644
--- a/metadata/md5-cache/app-misc/byobu-5.130-r1
+++ b/metadata/md5-cache/app-misc/byobu-5.130-r1
@@ -3,11 +3,11 @@ DESCRIPTION=A set of profiles for the GNU Screen console window manager (app-mis
 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 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 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	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=100db5a02d296b2b86e339662934f3e6
+_md5_=7949b9257fcd1d76d1b8ca10b19b0d3b
diff --git a/metadata/md5-cache/app-misc/conmux-0.15.1-r3 b/metadata/md5-cache/app-misc/conmux-0.15.1-r3
index 7b1a27f83d0e..1fa8cd8815d5 100644
--- a/metadata/md5-cache/app-misc/conmux-0.15.1-r3
+++ b/metadata/md5-cache/app-misc/conmux-0.15.1-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/IO-Multiplex dev-perl/URI dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~hwoarang/distfiles/conmux-0.15.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8280378113f25868b549af4eec4dc06a
diff --git a/metadata/md5-cache/app-misc/ddcutil-0.9.1 b/metadata/md5-cache/app-misc/ddcutil-0.9.1
index 05e052644626..bd752c7af050 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	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	user	7b7fc6ec5eb1c1eee55b0609f01e7362	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 e61873928aad..80acae37d2a9 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	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c481ae3577ddd178570bb02569a8738d
diff --git a/metadata/md5-cache/app-misc/elasticsearch-7.8.0 b/metadata/md5-cache/app-misc/elasticsearch-7.8.0
new file mode 100644
index 000000000000..99d527ae3a8a
--- /dev/null
+++ b/metadata/md5-cache/app-misc/elasticsearch-7.8.0
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst prepare
+DESCRIPTION=Open Source, Distributed, RESTful, Search Engine
+EAPI=7
+HOMEPAGE=https://www.elastic.co/products/elasticsearch
+IUSE=x-pack
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )
+RDEPEND=acct-group/elasticsearch acct-user/elasticsearch virtual/jre
+SLOT=0
+SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.8.0-no-jdk-linux-x86_64.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-7.8.0-no-jdk-linux-x86_64.tar.gz )
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ac0a2be0cb4bdda546bc229d14ec2e7b
diff --git a/metadata/md5-cache/app-misc/flirc-3.22.4 b/metadata/md5-cache/app-misc/flirc-3.22.4
index a872eaf7bd33..d9fd5e6d29d0 100644
--- a/metadata/md5-cache/app-misc/flirc-3.22.4
+++ b/metadata/md5-cache/app-misc/flirc-3.22.4
@@ -10,5 +10,5 @@ RDEPEND=virtual/libusb:1 dev-libs/hidapi qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 d
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=amd64? ( https://apt.fury.io/flirc/flirc-3.22.4-amd64 -> flirc-3.22.4_amd64.deb ) arm? ( https://apt.fury.io/flirc/flirc-3.22.4-armhf -> flirc-3.22.4_arm.deb ) x86? ( https://apt.fury.io/flirc/flirc-3.22.4-i386 -> flirc-3.22.4_x86.deb )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=afb9a76ecd44a8d387d55d390d214b15
diff --git a/metadata/md5-cache/app-misc/flirc-3.24.0 b/metadata/md5-cache/app-misc/flirc-3.24.0
index 47234af2a97b..855bc29c2d77 100644
--- a/metadata/md5-cache/app-misc/flirc-3.24.0
+++ b/metadata/md5-cache/app-misc/flirc-3.24.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/libusb:1 dev-libs/hidapi qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 d
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=amd64? ( https://apt.fury.io/flirc/flirc-3.24.0-amd64 -> flirc-3.24.0_amd64.deb ) arm? ( https://apt.fury.io/flirc/flirc-3.24.0-armhf -> flirc-3.24.0_arm.deb ) x86? ( https://apt.fury.io/flirc/flirc-3.24.0-i386 -> flirc-3.24.0_x86.deb )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=b79d4e41373be6763fac26614bc31e5c
diff --git a/metadata/md5-cache/app-misc/flirc-3.25.2 b/metadata/md5-cache/app-misc/flirc-3.25.2
index 7d19cf5efb2d..d73ec8636237 100644
--- a/metadata/md5-cache/app-misc/flirc-3.25.2
+++ b/metadata/md5-cache/app-misc/flirc-3.25.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/libusb:1 dev-libs/hidapi qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 d
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=amd64? ( https://apt.fury.io/flirc/flirc-3.25.2-amd64 -> flirc-3.25.2_amd64.deb ) arm? ( https://apt.fury.io/flirc/flirc-3.25.2-armhf -> flirc-3.25.2_arm.deb ) x86? ( https://apt.fury.io/flirc/flirc-3.25.2-i386 -> flirc-3.25.2_x86.deb )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=b79d4e41373be6763fac26614bc31e5c
diff --git a/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r13 b/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r13
index ea5179d915d9..a77e823713b3 100644
--- a/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r13
+++ b/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r13
@@ -10,5 +10,5 @@ RDEPEND=virtual/libusb:0 >=dev-libs/libg15-1.2.4 >=dev-libs/libg15render-1.2 per
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/g15daemon/g15daemon-1.9.5.3.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3d525e5f7e352abed194a778c8749e38
diff --git a/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r21 b/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r21
index 63e40d6b4d1e..d87e46e8e480 100644
--- a/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r21
+++ b/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r21
@@ -9,5 +9,5 @@ RDEPEND=virtual/libusb:0 >=dev-libs/libg15-9999 >=dev-libs/libg15render-1.2 perl
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/g15daemon/g15daemon-1.9.5.3.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c704f6638b909432d5f6e7e39b369675
diff --git a/metadata/md5-cache/app-misc/g15daemon-9999 b/metadata/md5-cache/app-misc/g15daemon-9999
index 702223fa1900..fdb60a6e1b73 100644
--- a/metadata/md5-cache/app-misc/g15daemon-9999
+++ b/metadata/md5-cache/app-misc/g15daemon-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=virtual/libusb:0 >=dev-libs/libg15-9999 >=dev-libs/libg15render-9999 perl? ( dev-lang/perl dev-perl/GDGraph >=dev-perl/Inline-0.4 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	subversion	ed3498da4fb92dcfb0d6089c85d1465f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	subversion	ed3498da4fb92dcfb0d6089c85d1465f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f86fcc3e254caa6926c0ed7729ed022c
diff --git a/metadata/md5-cache/app-misc/gnote-3.36.1 b/metadata/md5-cache/app-misc/gnote-3.36.1
index 92ea5bb88697..46d637f39a00 100644
--- a/metadata/md5-cache/app-misc/gnote-3.36.1
+++ b/metadata/md5-cache/app-misc/gnote-3.36.1
@@ -4,10 +4,10 @@ DESCRIPTION=Desktop note-taking application
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Gnote
 IUSE=debug
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-3+ FDL-1.1
 RDEPEND=>=app-crypt/libsecret-0.8 >=app-text/gspell-1.6.0:= >=dev-cpp/glibmm-2.62.0:2 >=dev-cpp/gtkmm-3.18:3.0 >=dev-libs/glib-2.32:2[dbus] >=dev-libs/libxml2-2:2 dev-libs/libxslt >=sys-apps/util-linux-2.16:= >=x11-libs/gtk+-3.20:3 gnome-base/gsettings-desktop-schemas
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnote/3.36/gnote-3.36.1.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cfd3f52d89c1ff3fcb5ff3fec2e4c63a
+_md5_=05037f139027b4be7f856095a52d24a0
diff --git a/metadata/md5-cache/app-misc/golly-3.3-r1 b/metadata/md5-cache/app-misc/golly-3.3-r1
index b1ab7aac7eb8..6a8011ef508a 100644
--- a/metadata/md5-cache/app-misc/golly-3.3-r1
+++ b/metadata/md5-cache/app-misc/golly-3.3-r1
@@ -3,11 +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
+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?]
+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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/golly/golly-3.3-src.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=50475c103d293584b2c84f4d959dfa33
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=330392f60262f4cf41df1bad56d9683f
diff --git a/metadata/md5-cache/app-misc/golly-3.3-r2 b/metadata/md5-cache/app-misc/golly-3.3-r2
new file mode 100644
index 000000000000..7b821532250b
--- /dev/null
+++ b/metadata/md5-cache/app-misc/golly-3.3-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 postrm prepare setup
+DEPEND=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] ) 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_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+DESCRIPTION=simulator for Conway's Game of Life and other cellular automata
+EAPI=7
+HOMEPAGE=http://golly.sourceforge.net/
+IUSE=tiff python_single_target_python2_7 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+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] ) 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_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=mirror://sourceforge/golly/golly-3.3-src.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a70052490b2aa8d74b898ac8bc57c6c3
diff --git a/metadata/md5-cache/app-misc/lfm-2.3-r1 b/metadata/md5-cache/app-misc/lfm-2.3-r1
deleted file mode 100644
index 7218cd0452c1..000000000000
--- a/metadata/md5-cache/app-misc/lfm-2.3-r1
+++ /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[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Last File Manager is a powerful file manager for the console
-EAPI=5
-HOMEPAGE=https://inigo.katxi.org/devel/lfm/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=python_targets_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(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://inigo.katxi.org/devel/lfm/lfm-2.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6adeb9c9cd5c235a7acbc0da8bd1d0ac
diff --git a/metadata/md5-cache/app-misc/lirc-0.10.1-r3 b/metadata/md5-cache/app-misc/lirc-0.10.1-r3
index 3ad0a55932fd..81df065213cc 100644
--- a/metadata/md5-cache/app-misc/lirc-0.10.1-r3
+++ b/metadata/md5-cache/app-misc/lirc-0.10.1-r3
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 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	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4fbd3a6de295c3f8697dd179b6a4c93c
diff --git a/metadata/md5-cache/app-misc/lirc-0.10.1-r4 b/metadata/md5-cache/app-misc/lirc-0.10.1-r4
index 0a5bce5f8e14..fd7cae432b2a 100644
--- a/metadata/md5-cache/app-misc/lirc-0.10.1-r4
+++ b/metadata/md5-cache/app-misc/lirc-0.10.1-r4
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 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	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d62ddaa52a3618c03bb656b6842bbbea
diff --git a/metadata/md5-cache/app-misc/note-1.3.3-r1 b/metadata/md5-cache/app-misc/note-1.3.3-r1
index 034cb79d6c65..4c97f1dc6a6e 100644
--- a/metadata/md5-cache/app-misc/note-1.3.3-r1
+++ b/metadata/md5-cache/app-misc/note-1.3.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://www.daemon.de/files/mirror/ftp.daemon.de/scip/Apps/note/note-1.3.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e5c176a29e116c418090423f9e0ae9fa
diff --git a/metadata/md5-cache/app-misc/oneko-1.2_p6_p14 b/metadata/md5-cache/app-misc/oneko-1.2_p6_p14
deleted file mode 100644
index 8d1da21e5658..000000000000
--- a/metadata/md5-cache/app-misc/oneko-1.2_p6_p14
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext app-text/rman x11-base/xorg-proto x11-misc/gccmakedep x11-misc/imake
-DESCRIPTION=A cat, dog and others which chase the mouse or windows around the screen
-EAPI=7
-HOMEPAGE=http://www.daidouji.com/oneko/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=public-domain
-RDEPEND=x11-libs/libX11 x11-libs/libXext
-SLOT=0
-SRC_URI=mirror://debian/pool/main/o/oneko/oneko_1.2.sakura.6-14.debian.tar.xz mirror://debian/pool/main/o/oneko/oneko_1.2.sakura.6.orig.tar.gz mirror://gentoo/oneko-1.2-cat.png mirror://gentoo/oneko-1.2-dog.png
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ea6025fa68a4c64222d354d28f9af0a3
diff --git a/metadata/md5-cache/app-misc/oneko-1.2_p6_p14-r1 b/metadata/md5-cache/app-misc/oneko-1.2_p6_p14-r1
new file mode 100644
index 000000000000..7b341725c1bb
--- /dev/null
+++ b/metadata/md5-cache/app-misc/oneko-1.2_p6_p14-r1
@@ -0,0 +1,13 @@
+BDEPEND=app-text/rman x11-misc/gccmakedep x11-misc/imake
+DEFINED_PHASES=compile configure install prepare
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-base/xorg-proto
+DESCRIPTION=A cat, dog and others which chase the mouse or windows around the screen
+EAPI=7
+HOMEPAGE=http://www.daidouji.com/oneko/
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=public-domain
+RDEPEND=x11-libs/libX11 x11-libs/libXext
+SLOT=0
+SRC_URI=mirror://debian/pool/main/o/oneko/oneko_1.2.sakura.6-14.debian.tar.xz mirror://debian/pool/main/o/oneko/oneko_1.2.sakura.6.orig.tar.gz mirror://gentoo/oneko-1.2-cat.png mirror://gentoo/oneko-1.2-dog.png
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1102f4357bb60429bdb6793bd361415b
diff --git a/metadata/md5-cache/app-misc/pax-utils-1.2.6 b/metadata/md5-cache/app-misc/pax-utils-1.2.6
index 12ec2a3aca3f..7dbe971dcc35 100644
--- a/metadata/md5-cache/app-misc/pax-utils-1.2.6
+++ b/metadata/md5-cache/app-misc/pax-utils-1.2.6
@@ -10,5 +10,5 @@ RDEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python3_
 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.6.tar.xz https://dev.gentoo.org/~slyfox/distfiles/pax-utils-1.2.6.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=6b480f1441f54294dbfe572e40404481
diff --git a/metadata/md5-cache/app-misc/prog-express-3.8.5 b/metadata/md5-cache/app-misc/prog-express-3.8.5
index 1ba9f8a2d5be..f135d91fe4b8 100644
--- a/metadata/md5-cache/app-misc/prog-express-3.8.5
+++ b/metadata/md5-cache/app-misc/prog-express-3.8.5
@@ -8,5 +8,5 @@ LICENSE=prog-express
 RDEPEND=dev-db/sqlite:3 dev-dotnet/gtk-sharp:2 dev-dotnet/libgdiplus dev-lang/mono dev-lang/mono-basic virtual/libusb:1 virtual/udev
 SLOT=0
 SRC_URI=amd64? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/prog-express-3.8.5-1.amd64.deb ) x86? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/prog-express-3.8.5-1.i386.deb )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=048c8a6199474747fb02aeb4082015e2
diff --git a/metadata/md5-cache/app-misc/prog-express-3.8.8 b/metadata/md5-cache/app-misc/prog-express-3.8.8
index 69bab2c817c1..8063405047f7 100644
--- a/metadata/md5-cache/app-misc/prog-express-3.8.8
+++ b/metadata/md5-cache/app-misc/prog-express-3.8.8
@@ -8,5 +8,5 @@ LICENSE=prog-express
 RDEPEND=dev-db/sqlite:3 dev-dotnet/gtk-sharp:2 dev-dotnet/libgdiplus dev-lang/mono dev-lang/mono-basic virtual/libusb:1 virtual/udev
 SLOT=0
 SRC_URI=amd64? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/prog-express-3.8.8-1.amd64.deb ) x86? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/prog-express-3.8.8-1.i386.deb )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=277210187c01e7798fed609c830ef260
diff --git a/metadata/md5-cache/app-misc/realpath-1.18 b/metadata/md5-cache/app-misc/realpath-1.18
index 45bde6dea161..0d8a7031ad9b 100644
--- a/metadata/md5-cache/app-misc/realpath-1.18
+++ b/metadata/md5-cache/app-misc/realpath-1.18
@@ -4,10 +4,10 @@ DESCRIPTION=Return the canonicalized absolute pathname
 EAPI=5
 HOMEPAGE=http://packages.debian.org/unstable/utils/realpath
 IUSE=nls
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~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=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/r/realpath/realpath_1.18.tar.gz nls? ( mirror://debian/pool/main/r/realpath/realpath_1.18_i386.deb )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=39cc9639f4d00d4e257b562e71efdd2f
+_md5_=e47ebe9e42fb79a426627dc117bf27d8
diff --git a/metadata/md5-cache/app-misc/recoll-1.25.19 b/metadata/md5-cache/app-misc/recoll-1.25.19
index eae3828b579e..a6efa0be54a3 100644
--- a/metadata/md5-cache/app-misc/recoll-1.25.19
+++ b/metadata/md5-cache/app-misc/recoll-1.25.19
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/xapian:= sys-libs/zlib:= virtual/libiconv chm? ( dev-libs/chmli
 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	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9590dad31e8845e92ff5a6d6d16fb062
diff --git a/metadata/md5-cache/app-misc/smtm-1.6.10-r1 b/metadata/md5-cache/app-misc/smtm-1.6.10-r1
index 918d7ed834fc..f37d88a3e398 100644
--- a/metadata/md5-cache/app-misc/smtm-1.6.10-r1
+++ b/metadata/md5-cache/app-misc/smtm-1.6.10-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://eddelbuettel.com/dirk/code/smtm/smtm_1.6.10.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b712cd565f594542b15252943bfc602a
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 57460b61d14e..2e937b1f097e 100644
--- a/metadata/md5-cache/app-misc/solaar-1.0.1-r1
+++ b/metadata/md5-cache/app-misc/solaar-1.0.1-r1
@@ -11,5 +11,5 @@ RDEPEND=acct-group/plugdev dev-python/pygobject:3[python_targets_python3_6(-)?,p
 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	44725b3eb803b8abcd6978759c231210	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9cc782daa75b48d1906b54926870795d
diff --git a/metadata/md5-cache/app-misc/solaar-1.0.2 b/metadata/md5-cache/app-misc/solaar-1.0.2
index 037e7e4b63e6..f5fd2d999e9d 100644
--- a/metadata/md5-cache/app-misc/solaar-1.0.2
+++ b/metadata/md5-cache/app-misc/solaar-1.0.2
@@ -11,5 +11,5 @@ RDEPEND=acct-group/plugdev dev-python/pygobject:3[python_targets_python3_6(-)?,p
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/pwr-Solaar/Solaar/archive/1.0.2.tar.gz -> solaar-1.0.2.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=08c37e1c1915277c3f7df328520713a7
diff --git a/metadata/md5-cache/app-misc/solaar-9999 b/metadata/md5-cache/app-misc/solaar-9999
index 8d14d2205a07..b87d88efc561 100644
--- a/metadata/md5-cache/app-misc/solaar-9999
+++ b/metadata/md5-cache/app-misc/solaar-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 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
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5301400c8434e60ee82adaee2528b890
diff --git a/metadata/md5-cache/app-misc/spacenavd-0.7.1 b/metadata/md5-cache/app-misc/spacenavd-0.7.1
index 8170eb5f426d..a15f17dd688a 100644
--- a/metadata/md5-cache/app-misc/spacenavd-0.7.1
+++ b/metadata/md5-cache/app-misc/spacenavd-0.7.1
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=X? ( x11-apps/xdpyinfo x11-base/xorg-proto x11-libs/libX11 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	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=f7149e40a8f63db43e101161b76cf701
diff --git a/metadata/md5-cache/app-misc/tracker-2.3.4 b/metadata/md5-cache/app-misc/tracker-2.3.4
index 176a3de7e7d6..82fd43edcd70 100644
--- a/metadata/md5-cache/app-misc/tracker-2.3.4
+++ b/metadata/md5-cache/app-misc/tracker-2.3.4
@@ -11,5 +11,5 @@ PDEPEND=miners? ( >=app-misc/tracker-miners-2.3 )
 RDEPEND=>=dev-libs/glib-2.46:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspection-1.54:= >=dev-libs/icu-4.8.1.2:= >=dev-libs/json-glib-1.0 >=net-libs/libsoup-2.40.1:2.4 >=dev-libs/libxml2-2.7 >=dev-db/sqlite-3.20.0 networkmanager? ( >=net-misc/networkmanager-0.8 ) stemmer? ( dev-libs/snowball-stemmer ) sys-apps/util-linux
 SLOT=0/2.0
 SRC_URI=mirror://gnome/sources/tracker/2.3/tracker-2.3.4.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0768850ba8756ed65dcc8e6557a46ed1
diff --git a/metadata/md5-cache/app-misc/transfolio-1.0.1-r1 b/metadata/md5-cache/app-misc/transfolio-1.0.1-r1
index ad92b999907f..b01d9de8e5e4 100644
--- a/metadata/md5-cache/app-misc/transfolio-1.0.1-r1
+++ b/metadata/md5-cache/app-misc/transfolio-1.0.1-r1
@@ -3,9 +3,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Enables data transfer between the PC and the Atari Portfolio
 EAPI=7
 HOMEPAGE=http://leute.server.de/peichl/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=http://leute.server.de/peichl/transfolio.zip -> transfolio-1.0.1.zip
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9146bf8e2c937e875858818bfcc19d1e
+_md5_=eae2dbc7c035e03c6de755851c16dfab
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 fe036f5e83f7..fa3de099ee62 100644
--- a/metadata/md5-cache/app-misc/vlock-2.2.3-r1
+++ b/metadata/md5-cache/app-misc/vlock-2.2.3-r1
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/WorMzy/vlock/archive/f2afd55704bfe0a2d66e6b270d247e9b8a7b1664.tar.gz -> vlock-2.2.3.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5f0c79a57b7ac8e9cc0f8da4865206a3
+_md5_=d41152742df1f50e9a9062f9a632f976
diff --git a/metadata/md5-cache/app-mobilephone/Manifest.gz b/metadata/md5-cache/app-mobilephone/Manifest.gz
index 4528043bdeb9..fb8131e78a04 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/gnokii-0.6.31-r1 b/metadata/md5-cache/app-mobilephone/gnokii-0.6.31-r1
index a0b5fc20d6f9..3fa11b87b070 100644
--- a/metadata/md5-cache/app-mobilephone/gnokii-0.6.31-r1
+++ b/metadata/md5-cache/app-mobilephone/gnokii-0.6.31-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!app-mobilephone/smstools bluetooth? ( kernel_linux? ( net-wireless/bluez ) ) ical? ( dev-libs/libical:= ) pcsc-lite? ( sys-apps/pcsc-lite ) sms? ( dev-libs/glib:2 postgres? ( dev-db/postgresql:* ) mysql? ( virtual/mysql:= ) ) usb? ( virtual/libusb:0 ) X? ( x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=https://www.gnokii.org/download/gnokii/gnokii-0.6.31.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7f6ff000834c43be618a3d7d6cc710c0
diff --git a/metadata/md5-cache/app-mobilephone/gnokii-0.6.31-r2 b/metadata/md5-cache/app-mobilephone/gnokii-0.6.31-r2
index a76bc555a09e..d9632a87955c 100644
--- a/metadata/md5-cache/app-mobilephone/gnokii-0.6.31-r2
+++ b/metadata/md5-cache/app-mobilephone/gnokii-0.6.31-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!app-mobilephone/smstools bluetooth? ( kernel_linux? ( net-wireless/bluez ) ) ical? ( dev-libs/libical:= ) pcsc-lite? ( sys-apps/pcsc-lite ) sms? ( dev-libs/glib:2 postgres? ( dev-db/postgresql:* ) mysql? ( dev-db/mysql-connector-c:= ) ) usb? ( virtual/libusb:0 ) X? ( x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=https://www.gnokii.org/download/gnokii/gnokii-0.6.31.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6e76bf1f2ed25e0d6e4c6691a30bbd99
diff --git a/metadata/md5-cache/app-mobilephone/gnokii-0.6.31-r3 b/metadata/md5-cache/app-mobilephone/gnokii-0.6.31-r3
index f81e57ab739c..adc627f82b65 100644
--- a/metadata/md5-cache/app-mobilephone/gnokii-0.6.31-r3
+++ b/metadata/md5-cache/app-mobilephone/gnokii-0.6.31-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!app-mobilephone/smstools dev-libs/glib:2 bluetooth? ( kernel_linux? ( net-wireless/bluez ) ) ical? ( dev-libs/libical:= ) pcsc-lite? ( sys-apps/pcsc-lite ) sms? ( postgres? ( dev-db/postgresql:* ) mysql? ( dev-db/mysql-connector-c:= ) ) usb? ( virtual/libusb:0 ) X? ( x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=https://www.gnokii.org/download/gnokii/gnokii-0.6.31.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ec22458716b6c493836e10c56375e196
diff --git a/metadata/md5-cache/app-mobilephone/gnokii-9999 b/metadata/md5-cache/app-mobilephone/gnokii-9999
index fabc0629ec45..8eabfdb60081 100644
--- a/metadata/md5-cache/app-mobilephone/gnokii-9999
+++ b/metadata/md5-cache/app-mobilephone/gnokii-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=!app-mobilephone/smstools bluetooth? ( kernel_linux? ( net-wireless/bluez ) ) ical? ( dev-libs/libical:= ) pcsc-lite? ( sys-apps/pcsc-lite ) sms? ( dev-libs/glib:2 postgres? ( dev-db/postgresql:* ) mysql? ( dev-db/mysql-connector-c:= ) ) usb? ( virtual/libusb:0 ) X? ( x11-libs/gtk+:2 )
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=df0165e28d404c8fe62528e125b8e4bb
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 6e4f1ed58913..5a73e1f74c78 100644
--- a/metadata/md5-cache/app-mobilephone/smstools-3.1.21-r1
+++ b/metadata/md5-cache/app-mobilephone/smstools-3.1.21-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Send and receive short messages through GSM modems
 EAPI=6
 HOMEPAGE=http://smstools3.kekekasvi.com/
 IUSE=stats
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cca6247bad516b99e0ee76e35a4be809
+_md5_=c27305dec933ab94ca0c7ecca237e310
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 88d365242b27..88f4d9b7cd64 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/calligra-3.2.1 b/metadata/md5-cache/app-office/calligra-3.2.1
new file mode 100644
index 000000000000..4657578a7311
--- /dev/null
+++ b/metadata/md5-cache/app-office/calligra-3.2.1
@@ -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 pretend setup test unpack
+DEPEND=dev-lang/perl >=dev-qt/designer-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/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 >=kde-frameworks/karchive-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/kdelibs4support-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/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/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-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/kwallet-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 sys-libs/zlib virtual/libiconv activities? ( >=kde-frameworks/kactivities-5.60.0:5 ) charts? ( dev-libs/kdiagram:5 ) crypt? ( app-crypt/qca:2[qt5(+)] ) fontconfig? ( media-libs/fontconfig ) gemini? ( >=dev-qt/qtdeclarative-5.12.3:5[widgets] ) gsl? ( sci-libs/gsl ) import-filter? ( app-text/libetonyek app-text/libodfgen app-text/libwpd:* app-text/libwpg:* >=app-text/libwps-0.4 dev-libs/librevenge >=kde-frameworks/khtml-5.60.0:5 media-libs/libvisio ) lcms? ( media-libs/ilmbase:= media-libs/lcms:2 ) okular? ( kde-apps/okular:5 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler:=[qt5] ) phonon? ( media-libs/phonon[qt5(+)] ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) calligra_features_sheets? ( dev-cpp/eigen:3 ) calligra_features_words? ( dev-libs/libxslt ) dev-libs/boost test? ( >=kde-frameworks/threadweaver-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 Office Suite
+EAPI=7
+HOMEPAGE=https://calligra.org/
+IUSE=activities +charts +crypt +fontconfig gemini gsl +import-filter +lcms okular openexr +pdf phonon spacenav +truetype X calligra_features_karbon calligra_features_sheets calligra_features_stage calligra_features_words debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl >=dev-qt/designer-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/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 >=kde-frameworks/karchive-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/kdelibs4support-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/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/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-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/kwallet-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 sys-libs/zlib virtual/libiconv activities? ( >=kde-frameworks/kactivities-5.60.0:5 ) charts? ( dev-libs/kdiagram:5 ) crypt? ( app-crypt/qca:2[qt5(+)] ) fontconfig? ( media-libs/fontconfig ) gemini? ( >=dev-qt/qtdeclarative-5.12.3:5[widgets] ) gsl? ( sci-libs/gsl ) import-filter? ( app-text/libetonyek app-text/libodfgen app-text/libwpd:* app-text/libwpg:* >=app-text/libwps-0.4 dev-libs/librevenge >=kde-frameworks/khtml-5.60.0:5 media-libs/libvisio ) lcms? ( media-libs/ilmbase:= media-libs/lcms:2 ) okular? ( kde-apps/okular:5 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler:=[qt5] ) phonon? ( media-libs/phonon[qt5(+)] ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) calligra_features_sheets? ( dev-cpp/eigen:3 ) calligra_features_words? ( dev-libs/libxslt ) calligra_features_karbon? ( media-gfx/pstoedit[plotutils] ) gemini? ( >=dev-qt/qtquickcontrols2-5.12.3:5 >=kde-frameworks/kirigami-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
+SLOT=5
+SRC_URI=mirror://kde/stable/calligra/3.2.1/calligra-3.2.1.tar.xz
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=10d8e50d023efd2c23dd367f54b76f27
diff --git a/metadata/md5-cache/app-office/gnumeric-1.12.46 b/metadata/md5-cache/app-office/gnumeric-1.12.46
deleted file mode 100644
index 2d0ec3a27b33..000000000000
--- a/metadata/md5-cache/app-office/gnumeric-1.12.46
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.5 app-text/yelp-tools dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 virtual/pkgconfig app-arch/xz-utils >=app-portage/elt-patches-20170815
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=app-arch/bzip2 sys-libs/zlib >=dev-libs/glib-2.40.0:2 >=gnome-extra/libgsf-1.14.33:= >=x11-libs/goffice-0.10.46: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? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_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/gobject-introspection-1:= ) perl? ( dev-lang/perl:= ) libgda? ( gnome-extra/libgda:5[gtk] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The GNOME Spreadsheet
-EAPI=7
-HOMEPAGE=http://www.gnumeric.org/
-IUSE=+introspection libgda perl python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=app-arch/bzip2 sys-libs/zlib >=dev-libs/glib-2.40.0:2 >=gnome-extra/libgsf-1.14.33:= >=x11-libs/goffice-0.10.46: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? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_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/gobject-introspection-1:= ) perl? ( dev-lang/perl:= ) libgda? ( gnome-extra/libgda:5[gtk] )
-REQUIRED_USE=introspection? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnumeric/1.12/gnumeric-1.12.46.tar.xz
-_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ff9d3851e4b4cc44e403327be706ee63
diff --git a/metadata/md5-cache/app-office/gnumeric-1.12.47 b/metadata/md5-cache/app-office/gnumeric-1.12.47
index ff90c2efc3ba..b38bcd3c1eb2 100644
--- a/metadata/md5-cache/app-office/gnumeric-1.12.47
+++ b/metadata/md5-cache/app-office/gnumeric-1.12.47
@@ -5,7 +5,7 @@ DESCRIPTION=The GNOME Spreadsheet
 EAPI=7
 HOMEPAGE=http://www.gnumeric.org/
 IUSE=+introspection libgda perl python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 sys-libs/zlib >=dev-libs/glib-2.40.0:2 >=gnome-extra/libgsf-1.14.33:= >=x11-libs/goffice-0.10.46: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? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-libs/gobject-introspection-1:= ) perl? ( dev-lang/perl:= ) libgda? ( gnome-extra/libgda:5[gtk] )
 REQUIRED_USE=introspection? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnumeric/1.12/gnumeric-1.12.47.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0767d02e5c12191108e49a95ccb57b38
+_md5_=01f12cc27736f3055b37daa9a3c5d06a
diff --git a/metadata/md5-cache/app-office/homebank-5.2.8 b/metadata/md5-cache/app-office/homebank-5.2.8
index 9a39ffb89f02..c960423bb4cf 100644
--- a/metadata/md5-cache/app-office/homebank-5.2.8
+++ b/metadata/md5-cache/app-office/homebank-5.2.8
@@ -4,10 +4,10 @@ DESCRIPTION=Free, easy, personal accounting for everyone
 EAPI=6
 HOMEPAGE=http://homebank.free.fr/index.php
 IUSE=+ofx
-KEYWORDS=~amd64 ppc ~ppc64 x86
+KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.39 >=net-libs/libsoup-2.26 x11-libs/cairo x11-libs/gdk-pixbuf >=x11-libs/gtk+-3.22:3 x11-libs/pango ofx? ( >=dev-libs/libofx-0.8.3 )
 SLOT=0
 SRC_URI=http://homebank.free.fr/public/homebank-5.2.8.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=70cda77ebd6d578a734d6f0675a30ef3
+_md5_=b0720f4802c3305a1dcc2777a67c3b10
diff --git a/metadata/md5-cache/app-office/kmymoney-5.1.0 b/metadata/md5-cache/app-office/kmymoney-5.1.0
new file mode 100644
index 000000000000..8f867e17fece
--- /dev/null
+++ b/metadata/md5-cache/app-office/kmymoney-5.1.0
@@ -0,0 +1,15 @@
+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-db/sqlcipher dev-libs/gmp:0=[cxx] dev-libs/kdiagram:5 dev-libs/libgpg-error dev-libs/libofx:= >=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-apps/akonadi:5 kde-apps/kidentitymanagement:5 >=kde-frameworks/kcontacts-5.60.0: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 ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 >=kde-frameworks/kdewebkit-5.60.0:5 ) !webkit? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) 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 quotes webkit test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-crypt/gpgme-1.7.1-r1[cxx] >=app-office/libalkimia-7.0.0:= dev-db/sqlcipher dev-libs/gmp:0=[cxx] dev-libs/kdiagram:5 dev-libs/libgpg-error dev-libs/libofx:= >=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-apps/akonadi:5 kde-apps/kidentitymanagement:5 >=kde-frameworks/kcontacts-5.60.0: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 ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 >=kde-frameworks/kdewebkit-5.60.0:5 ) !webkit? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) !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
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/kmymoney/5.1.0/src/kmymoney-5.1.0.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a633051785c1e5371c9c3ec74d571fde
diff --git a/metadata/md5-cache/app-office/libreoffice-6.4.5.2 b/metadata/md5-cache/app-office/libreoffice-6.4.5.2
new file mode 100644
index 000000000000..32fcff0bd066
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-6.4.5.2
@@ -0,0 +1,16 @@
+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-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.15.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[X] ) 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/1.5 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 base 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-6.4*
+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-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.15.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[X] ) 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 ) base? ( firebird java ) bluetooth? ( dbus ) gtk? ( 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.4.5.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.4.5.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.4.5//libreoffice-6.4.5.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.4.5//libreoffice-help-6.4.5.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.4.5.2/src/libreoffice-6.4.5.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.4.5.2/src/libreoffice-help-6.4.5.2.tar.xz https://dev-www.libreoffice.org/src//QR-Code-generator-1.4.0.tar.gz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) 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	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0eda837d686854b045e868fbfed19c87
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-6.4.5.2 b/metadata/md5-cache/app-office/libreoffice-l10n-6.4.5.2
new file mode 100644
index 000000000000..c58eb61024d5
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-l10n-6.4.5.2
@@ -0,0 +1,13 @@
+BDEPEND=>=app-arch/rpm2targz-9.0.0.3g
+DEFINED_PHASES=compile configure install prepare unpack
+DESCRIPTION=Translations for the Libreoffice suite
+EAPI=7
+HOMEPAGE=https://www.libreoffice.org
+IUSE=offlinehelp l10n_am l10n_ast l10n_bg l10n_bn-IN l10n_bn l10n_bo l10n_bs l10n_ca-valencia l10n_ca l10n_cs l10n_da l10n_de l10n_dz l10n_el l10n_en-GB l10n_en l10n_en-ZA l10n_eo l10n_es l10n_et l10n_eu l10n_fi l10n_fr l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_km l10n_ko l10n_mk l10n_nb l10n_ne l10n_nl l10n_nn l10n_om l10n_pl l10n_pt-BR l10n_pt l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sv l10n_tg l10n_tr l10n_ug l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW l10n_af l10n_ar l10n_as l10n_be l10n_br l10n_brx l10n_cy l10n_dgo l10n_fa l10n_ga l10n_gd l10n_gug l10n_kk l10n_kmr-Latn l10n_kn l10n_kok l10n_ks l10n_lb l10n_lo l10n_lt l10n_lv l10n_mai l10n_ml l10n_mn l10n_mni l10n_mr l10n_my l10n_nr l10n_nso l10n_oc l10n_or l10n_pa l10n_ro l10n_rw l10n_sa l10n_sat l10n_sd l10n_sid l10n_sr-Latn l10n_sr l10n_ss l10n_st l10n_sw-TZ l10n_ta l10n_te l10n_th l10n_tn l10n_ts l10n_tt l10n_uz l10n_ve l10n_xh l10n_zu
+LICENSE=|| ( LGPL-3 MPL-1.1 )
+RDEPEND=app-text/hunspell
+RESTRICT=strip
+SLOT=0
+SRC_URI=l10n_am? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_am.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_am.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_am.tar.gz ) ) l10n_ast? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_ast.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ast.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ast.tar.gz ) ) l10n_bg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_bg.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bg.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bg.tar.gz ) ) l10n_bn-IN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_bn-IN.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz ) ) l10n_bn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_bn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bn.tar.gz ) ) l10n_bo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_bo.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bo.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bo.tar.gz ) ) l10n_bs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_bs.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bs.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_bs.tar.gz ) ) l10n_ca-valencia? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz ) ) l10n_ca? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_ca.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ca.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ca.tar.gz ) ) l10n_cs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_cs.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_cs.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_cs.tar.gz ) ) l10n_da? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_da.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_da.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_da.tar.gz ) ) l10n_de? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_de.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_de.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_de.tar.gz ) ) l10n_dz? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_dz.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_dz.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_dz.tar.gz ) ) l10n_el? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_el.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_el.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_el.tar.gz ) ) l10n_en-GB? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_en-GB.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz ) ) l10n_en? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_en-US.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_en-US.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_en-US.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_en-US.tar.gz ) ) l10n_en-ZA? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_en-ZA.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz ) ) l10n_eo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_eo.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_eo.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_eo.tar.gz ) ) l10n_es? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_es.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_es.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_es.tar.gz ) ) l10n_et? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_et.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_et.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_et.tar.gz ) ) l10n_eu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_eu.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_eu.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_eu.tar.gz ) ) l10n_fi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_fi.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_fi.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_fi.tar.gz ) ) l10n_fr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_fr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_fr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_fr.tar.gz ) ) l10n_gl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_gl.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_gl.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_gl.tar.gz ) ) l10n_gu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_gu.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_gu.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_gu.tar.gz ) ) l10n_he? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_he.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_he.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_he.tar.gz ) ) l10n_hi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_hi.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_hi.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_hi.tar.gz ) ) l10n_hr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_hr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_hr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_hr.tar.gz ) ) l10n_hu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_hu.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_hu.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_hu.tar.gz ) ) l10n_id? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_id.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_id.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_id.tar.gz ) ) l10n_is? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_is.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_is.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_is.tar.gz ) ) l10n_it? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_it.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_it.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_it.tar.gz ) ) l10n_ja? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_ja.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ja.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ja.tar.gz ) ) l10n_ka? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_ka.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ka.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ka.tar.gz ) ) l10n_km? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_km.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_km.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_km.tar.gz ) ) l10n_ko? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_ko.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ko.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ko.tar.gz ) ) l10n_mk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_mk.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_mk.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_mk.tar.gz ) ) l10n_nb? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_nb.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_nb.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_nb.tar.gz ) ) l10n_ne? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_ne.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ne.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ne.tar.gz ) ) l10n_nl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_nl.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_nl.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_nl.tar.gz ) ) l10n_nn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_nn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_nn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_nn.tar.gz ) ) l10n_om? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_om.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_om.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_om.tar.gz ) ) l10n_pl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_pl.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_pl.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_pl.tar.gz ) ) l10n_pt-BR? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_pt-BR.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz ) ) l10n_pt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_pt.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_pt.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_pt.tar.gz ) ) l10n_ru? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_ru.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ru.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ru.tar.gz ) ) l10n_si? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_si.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_si.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_si.tar.gz ) ) l10n_sk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_sk.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_sk.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_sk.tar.gz ) ) l10n_sl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_sl.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_sl.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_sl.tar.gz ) ) l10n_sq? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_sq.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_sq.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_sq.tar.gz ) ) l10n_sv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_sv.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_sv.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_sv.tar.gz ) ) l10n_tg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_tg.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_tg.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_tg.tar.gz ) ) l10n_tr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_tr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_tr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_tr.tar.gz ) ) l10n_ug? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_ug.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ug.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_ug.tar.gz ) ) l10n_uk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_uk.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_uk.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_uk.tar.gz ) ) l10n_vi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_vi.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_vi.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_vi.tar.gz ) ) l10n_zh-CN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_zh-CN.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz ) ) l10n_zh-TW? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_helppack_zh-TW.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz ) ) l10n_am? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_am.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_am.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_am.tar.gz ) l10n_ast? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ast.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ast.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ast.tar.gz ) l10n_bg? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_bg.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bg.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bg.tar.gz ) l10n_bn-IN? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_bn-IN.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz ) l10n_bn? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_bn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bn.tar.gz ) l10n_bo? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_bo.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bo.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bo.tar.gz ) l10n_bs? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_bs.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bs.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_bs.tar.gz ) l10n_ca-valencia? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz ) l10n_ca? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ca.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ca.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ca.tar.gz ) l10n_cs? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_cs.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_cs.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_cs.tar.gz ) l10n_da? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_da.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_da.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_da.tar.gz ) l10n_de? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_de.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_de.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_de.tar.gz ) l10n_dz? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_dz.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_dz.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_dz.tar.gz ) l10n_el? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_el.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_el.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_el.tar.gz ) l10n_en-GB? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_en-GB.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz ) l10n_en-ZA? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_en-ZA.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz ) l10n_eo? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_eo.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_eo.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_eo.tar.gz ) l10n_es? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_es.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_es.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_es.tar.gz ) l10n_et? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_et.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_et.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_et.tar.gz ) l10n_eu? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_eu.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_eu.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_eu.tar.gz ) l10n_fi? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_fi.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_fi.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_fi.tar.gz ) l10n_fr? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_fr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_fr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_fr.tar.gz ) l10n_gl? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_gl.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_gl.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_gl.tar.gz ) l10n_gu? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_gu.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_gu.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_gu.tar.gz ) l10n_he? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_he.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_he.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_he.tar.gz ) l10n_hi? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_hi.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_hi.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_hi.tar.gz ) l10n_hr? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_hr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_hr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_hr.tar.gz ) l10n_hu? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_hu.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_hu.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_hu.tar.gz ) l10n_id? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_id.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_id.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_id.tar.gz ) l10n_is? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_is.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_is.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_is.tar.gz ) l10n_it? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_it.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_it.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_it.tar.gz ) l10n_ja? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ja.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ja.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ja.tar.gz ) l10n_ka? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ka.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ka.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ka.tar.gz ) l10n_km? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_km.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_km.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_km.tar.gz ) l10n_ko? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ko.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ko.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ko.tar.gz ) l10n_mk? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_mk.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mk.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mk.tar.gz ) l10n_nb? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_nb.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nb.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nb.tar.gz ) l10n_ne? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ne.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ne.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ne.tar.gz ) l10n_nl? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_nl.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nl.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nl.tar.gz ) l10n_nn? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_nn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nn.tar.gz ) l10n_om? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_om.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_om.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_om.tar.gz ) l10n_pl? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_pl.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_pl.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_pl.tar.gz ) l10n_pt-BR? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_pt-BR.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz ) l10n_pt? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_pt.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_pt.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_pt.tar.gz ) l10n_ru? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ru.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ru.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ru.tar.gz ) l10n_si? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_si.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_si.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_si.tar.gz ) l10n_sk? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_sk.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sk.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sk.tar.gz ) l10n_sl? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_sl.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sl.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sl.tar.gz ) l10n_sq? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_sq.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sq.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sq.tar.gz ) l10n_sv? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_sv.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sv.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sv.tar.gz ) l10n_tg? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_tg.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_tg.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_tg.tar.gz ) l10n_tr? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_tr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_tr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_tr.tar.gz ) l10n_ug? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ug.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ug.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ug.tar.gz ) l10n_uk? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_uk.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_uk.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_uk.tar.gz ) l10n_vi? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_vi.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_vi.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_vi.tar.gz ) l10n_zh-CN? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_zh-CN.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz ) l10n_zh-TW? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_zh-TW.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz ) l10n_af? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_af.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_af.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_af.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_af.tar.gz ) l10n_ar? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ar.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ar.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ar.tar.gz ) l10n_as? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_as.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_as.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_as.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_as.tar.gz ) l10n_be? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_be.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_be.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_be.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_be.tar.gz ) l10n_br? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_br.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_br.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_br.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_br.tar.gz ) l10n_brx? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_brx.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_brx.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_brx.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_brx.tar.gz ) l10n_cy? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_cy.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_cy.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_cy.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_cy.tar.gz ) l10n_dgo? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_dgo.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_dgo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_dgo.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_dgo.tar.gz ) l10n_fa? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_fa.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_fa.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_fa.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_fa.tar.gz ) l10n_ga? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ga.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ga.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ga.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ga.tar.gz ) l10n_gd? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_gd.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_gd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_gd.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_gd.tar.gz ) l10n_gug? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_gug.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_gug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_gug.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_gug.tar.gz ) l10n_kk? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_kk.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_kk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_kk.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_kk.tar.gz ) l10n_kmr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz ) l10n_kn? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_kn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_kn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_kn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_kn.tar.gz ) l10n_kok? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_kok.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_kok.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_kok.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_kok.tar.gz ) l10n_ks? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ks.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ks.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ks.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ks.tar.gz ) l10n_lb? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_lb.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_lb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_lb.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_lb.tar.gz ) l10n_lo? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_lo.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_lo.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_lo.tar.gz ) l10n_lt? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_lt.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_lt.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_lt.tar.gz ) l10n_lv? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_lv.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_lv.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_lv.tar.gz ) l10n_mai? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_mai.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mai.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mai.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mai.tar.gz ) l10n_ml? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ml.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ml.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ml.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ml.tar.gz ) l10n_mn? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_mn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mn.tar.gz ) l10n_mni? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_mni.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mni.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mni.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mni.tar.gz ) l10n_mr? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_mr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_mr.tar.gz ) l10n_my? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_my.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_my.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_my.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_my.tar.gz ) l10n_nr? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_nr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nr.tar.gz ) l10n_nso? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_nso.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nso.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nso.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_nso.tar.gz ) l10n_oc? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_oc.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_oc.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_oc.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_oc.tar.gz ) l10n_or? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_or.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_or.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_or.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_or.tar.gz ) l10n_pa? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_pa-IN.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz ) l10n_ro? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ro.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ro.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ro.tar.gz ) l10n_rw? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_rw.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_rw.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_rw.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_rw.tar.gz ) l10n_sa? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_sa-IN.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz ) l10n_sat? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_sat.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sat.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sat.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sat.tar.gz ) l10n_sd? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_sd.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sd.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sd.tar.gz ) l10n_sid? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_sid.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sid.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sid.tar.gz ) l10n_sr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz ) l10n_sr? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_sr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sr.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sr.tar.gz ) l10n_ss? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ss.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ss.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ss.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ss.tar.gz ) l10n_st? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_st.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_st.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_st.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_st.tar.gz ) l10n_sw-TZ? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz ) l10n_ta? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ta.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ta.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ta.tar.gz ) l10n_te? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_te.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_te.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_te.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_te.tar.gz ) l10n_th? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_th.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_th.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_th.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_th.tar.gz ) l10n_tn? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_tn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_tn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_tn.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_tn.tar.gz ) l10n_ts? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ts.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ts.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ts.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ts.tar.gz ) l10n_tt? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_tt.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_tt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_tt.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_tt.tar.gz ) l10n_uz? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_uz.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_uz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_uz.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_uz.tar.gz ) l10n_ve? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_ve.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ve.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ve.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_ve.tar.gz ) l10n_xh? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_xh.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_xh.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_xh.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_xh.tar.gz ) l10n_zu? ( https://download.documentfoundation.org/libreoffice/stable/6.4.5/rpm/x86_64/LibreOffice_6.4.5_Linux_x86-64_rpm_langpack_zu.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_zu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.5/rpm/x86_64/LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_zu.tar.gz -> LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_zu.tar.gz )
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	rpm	760ff223c2c4299b68ea901e24c4cabd
+_md5_=bfbf10a4278280e20ffbed5c22a9305f
diff --git a/metadata/md5-cache/app-office/worklog-assistant-bin-2.1.3580 b/metadata/md5-cache/app-office/worklog-assistant-bin-2.1.3580
index cf6c2b4b954b..043cefcd5b7e 100644
--- a/metadata/md5-cache/app-office/worklog-assistant-bin-2.1.3580
+++ b/metadata/md5-cache/app-office/worklog-assistant-bin-2.1.3580
@@ -7,5 +7,5 @@ LICENSE=worklog-assistant
 RESTRICT=fetch bindist strip
 SLOT=0
 SRC_URI=https://worklogassistant.com/downloads/worklog-assistant-v2_2.1.3580_amd64.deb
-_eclasses_=unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=ddef9d08d29a671e81a22fd0b6301d14
diff --git a/metadata/md5-cache/app-office/wps-office-11.1.0.9126 b/metadata/md5-cache/app-office/wps-office-11.1.0.9126
index 64c5fe7f8b43..5bc65d54bb3a 100644
--- a/metadata/md5-cache/app-office/wps-office-11.1.0.9126
+++ b/metadata/md5-cache/app-office/wps-office-11.1.0.9126
@@ -9,5 +9,5 @@ RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/9126/wps-office_11.1.0.9126.XA_amd64.deb
-_eclasses_=unpacker	b5891c9326ad2e7905c011d44c927c34	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2cd11d7440cbf83bfb886acc255c154a
diff --git a/metadata/md5-cache/app-office/wps-office-11.1.0.9505 b/metadata/md5-cache/app-office/wps-office-11.1.0.9505
index c5fc56feb0e6..6854ad0be9f4 100644
--- a/metadata/md5-cache/app-office/wps-office-11.1.0.9505
+++ b/metadata/md5-cache/app-office/wps-office-11.1.0.9505
@@ -9,5 +9,5 @@ RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/9505/wps-office_11.1.0.9505.XA_amd64.deb
-_eclasses_=unpacker	b5891c9326ad2e7905c011d44c927c34	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2cd11d7440cbf83bfb886acc255c154a
diff --git a/metadata/md5-cache/app-pda/Manifest.gz b/metadata/md5-cache/app-pda/Manifest.gz
index 6f84f422013c..965cf6ec2fcd 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/gnupod-0.99.8-r2 b/metadata/md5-cache/app-pda/gnupod-0.99.8-r2
index 7b76cf34d2dc..8a95d510db8b 100644
--- a/metadata/md5-cache/app-pda/gnupod-0.99.8-r2
+++ b/metadata/md5-cache/app-pda/gnupod-0.99.8-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-perl/TimeDate dev-perl/XML-Parser >=dev-perl/MP3-Info-1.01 dev-perl/Unicode-String dev-perl/Digest-SHA1 dev-perl/libwww-perl ffmpeg? ( media-video/ffmpeg ) flac? ( dev-perl/Audio-FLAC-Header media-libs/flac aac? ( >=media-libs/faac-1.24 ) mp3? ( media-sound/lame ) !aac? ( media-sound/lame ) ) ogg? ( dev-perl/Ogg-Vorbis-Header-PurePerl media-sound/vorbis-tools aac? ( >=media-libs/faac-1.24 ) mp3? ( media-sound/lame ) !aac? ( media-sound/lame ) ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://blinkenlights.ch/gnupod-dist/stable/gnupod-0.99.8.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=54d95adaa297ab978f0d76c978ebd9db
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index babd612f1b8c..d396e5d6c11b 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/fquery-0.2.2 b/metadata/md5-cache/app-portage/fquery-0.2.2
deleted file mode 100644
index e81bc5710346..000000000000
--- a/metadata/md5-cache/app-portage/fquery-0.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/hashtables:= dev-haskell/parsec:= dev-haskell/regex-compat:= >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6
-DESCRIPTION=Installed package query tool for Gentoo Linux
-EAPI=5
-HOMEPAGE=http://hackage.haskell.org/package/fquery
-KEYWORDS=~amd64 ~x86
-LICENSE=ZLIB
-RDEPEND=dev-haskell/hashtables:= dev-haskell/parsec:= dev-haskell/regex-compat:= >=dev-lang/ghc-7.4.1:=
-SLOT=0
-SRC_URI=https://hackage.haskell.org/package/fquery-0.2.2/fquery-0.2.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=67b1ef261bd0a1a9e8c22f42da4901b7
diff --git a/metadata/md5-cache/app-portage/grs-0.7 b/metadata/md5-cache/app-portage/grs-0.7
index 01bd61803c65..5ec9ffa393b1 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_7 python_targets_python3_8 )
 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	44725b3eb803b8abcd6978759c231210	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d1e88f9d001f4cb9503ebeb02a0536ed
diff --git a/metadata/md5-cache/app-portage/grs-9999 b/metadata/md5-cache/app-portage/grs-9999
index f4ac7175be87..dec033d7e9a3 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_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/grs/ISO-1.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b33fd69682d931e2a691d368dc001ab8
diff --git a/metadata/md5-cache/app-portage/hackport-0.5.6 b/metadata/md5-cache/app-portage/hackport-0.5.6
deleted file mode 100644
index b14ad66a99ac..000000000000
--- a/metadata/md5-cache/app-portage/hackport-0.5.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=app-portage/repoman dev-haskell/async:= dev-haskell/base16-bytestring:= dev-haskell/base64-bytestring:= dev-haskell/cryptohash:= dev-haskell/ed25519:= dev-haskell/extensible-exceptions:= dev-haskell/hashable:= >=dev-haskell/http-4000.0.3:= dev-haskell/missingh:= dev-haskell/mtl:= >=dev-haskell/network-2.6:= >=dev-haskell/network-uri-2.6:= dev-haskell/old-locale:= dev-haskell/old-time:= dev-haskell/parsec:= dev-haskell/random:= dev-haskell/regex-compat:= dev-haskell/split:= dev-haskell/stm:= >=dev-haskell/tar-0.5:= >=dev-haskell/xml-1.3.7:= dev-haskell/zlib:= >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hunit )
-DESCRIPTION=Hackage and Portage integration tool
-EAPI=6
-HOMEPAGE=http://hackage.haskell.org/package/hackport
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-portage/repoman dev-haskell/async:= dev-haskell/base16-bytestring:= dev-haskell/base64-bytestring:= dev-haskell/cryptohash:= dev-haskell/ed25519:= dev-haskell/extensible-exceptions:= dev-haskell/hashable:= >=dev-haskell/http-4000.0.3:= dev-haskell/missingh:= dev-haskell/mtl:= >=dev-haskell/network-2.6:= >=dev-haskell/network-uri-2.6:= dev-haskell/old-locale:= dev-haskell/old-time:= dev-haskell/parsec:= dev-haskell/random:= dev-haskell/regex-compat:= dev-haskell/split:= dev-haskell/stm:= >=dev-haskell/tar-0.5:= >=dev-haskell/xml-1.3.7:= dev-haskell/zlib:= >=dev-lang/ghc-7.8.2:=
-RESTRICT=test
-SLOT=0
-SRC_URI=https://hackage.haskell.org/package/hackport-0.5.6/hackport-0.5.6.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ca4a4aef84196a4564d4d37f6bf26b96
diff --git a/metadata/md5-cache/app-portage/hackport-0.6.2 b/metadata/md5-cache/app-portage/hackport-0.6.2
deleted file mode 100644
index 14d35add6710..000000000000
--- a/metadata/md5-cache/app-portage/hackport-0.6.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=app-portage/repoman dev-haskell/async:= dev-haskell/base16-bytestring:= dev-haskell/base64-bytestring:= dev-haskell/cryptohash:= dev-haskell/ed25519:= dev-haskell/extensible-exceptions:= dev-haskell/hashable:= >=dev-haskell/http-4000.0.3:= dev-haskell/missingh:= dev-haskell/mtl:= >=dev-haskell/network-2.6:= >=dev-haskell/network-uri-2.6:= dev-haskell/old-locale:= dev-haskell/old-time:= dev-haskell/parsec:= dev-haskell/random:= dev-haskell/regex-compat:= dev-haskell/split:= dev-haskell/stm:= >=dev-haskell/tar-0.5:= >=dev-haskell/xml-1.3.7:= dev-haskell/zlib:= >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hunit )
-DESCRIPTION=Hackage and Portage integration tool
-EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/hackport
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-portage/repoman dev-haskell/async:= dev-haskell/base16-bytestring:= dev-haskell/base64-bytestring:= dev-haskell/cryptohash:= dev-haskell/ed25519:= dev-haskell/extensible-exceptions:= dev-haskell/hashable:= >=dev-haskell/http-4000.0.3:= dev-haskell/missingh:= dev-haskell/mtl:= >=dev-haskell/network-2.6:= >=dev-haskell/network-uri-2.6:= dev-haskell/old-locale:= dev-haskell/old-time:= dev-haskell/parsec:= dev-haskell/random:= dev-haskell/regex-compat:= dev-haskell/split:= dev-haskell/stm:= >=dev-haskell/tar-0.5:= >=dev-haskell/xml-1.3.7:= dev-haskell/zlib:= >=dev-lang/ghc-7.8.2:=
-RESTRICT=test
-SLOT=0
-SRC_URI=https://hackage.haskell.org/package/hackport-0.6.2/hackport-0.6.2.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5441df79831074dd2d6f348f61de2d37
diff --git a/metadata/md5-cache/app-portage/layman-2.4.3 b/metadata/md5-cache/app-portage/layman-2.4.3
index fa74e6dddc1a..2ce915ab7f84 100644
--- a/metadata/md5-cache/app-portage/layman-2.4.3
+++ b/metadata/md5-cache/app-portage/layman-2.4.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://sourceforge/layman/layman-2.4.3.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1d949930b02a4c2df7df3f9ee3b1b552
diff --git a/metadata/md5-cache/app-portage/layman-9999 b/metadata/md5-cache/app-portage/layman-9999
index 673beb26a4ef..f24de81118b9 100644
--- a/metadata/md5-cache/app-portage/layman-9999
+++ b/metadata/md5-cache/app-portage/layman-9999
@@ -11,5 +11,5 @@ RDEPEND=cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) git? ( dev-vcs/git ) mercu
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ed9af17e44bb0e4a27074f14b1331c9d
diff --git a/metadata/md5-cache/app-portage/porticron-0.7.1 b/metadata/md5-cache/app-portage/porticron-0.7.1
index 6dc24dac6e6c..6eabcd4a8984 100644
--- a/metadata/md5-cache/app-portage/porticron-0.7.1
+++ b/metadata/md5-cache/app-portage/porticron-0.7.1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=cron script to sync portage and send update mails to root
 EAPI=6
 HOMEPAGE=https://github.com/gentoo/porticron
-KEYWORDS=amd64 ~arm ~arm64 hppa ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 hppa ppc ~ppc64 x86
 LICENSE=BSD
 RDEPEND=app-portage/gentoolkit net-dns/bind-tools
 SLOT=0
 SRC_URI=https://github.com/gentoo/porticron/archive/v0.7.1.tar.gz -> porticron-0.7.1.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=ac7539dede466d1e615680c3c90c135e
+_md5_=77ef44609e85d29833107d9024b6c0ff
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.16 b/metadata/md5-cache/app-portage/repoman-2.3.16
deleted file mode 100644
index 5b401f1d4962..000000000000
--- a/metadata/md5-cache/app-portage/repoman-2.3.16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-apps/portage-2.3.43[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/lxml-3.6.0[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[bzip2(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+)] ) >=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-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Repoman is a Quality Assurance tool for Gentoo ebuilds
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/portage-2.3.43[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/lxml-3.6.0[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[bzip2(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+)] ) >=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.gentoo.org/~zmedico/portage/archives/repoman-2.3.16.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3c3c4fd875cdff3b5e228879b8caed20
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.20 b/metadata/md5-cache/app-portage/repoman-2.3.20
deleted file mode 100644
index 5bed1ee446d3..000000000000
--- a/metadata/md5-cache/app-portage/repoman-2.3.20
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-apps/portage-2.3.80[python_targets_python3_6(-)?,python_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-3.6.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/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(-)] python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+)] ) >=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=Repoman is a Quality Assurance tool for Gentoo ebuilds
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-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 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/portage-2.3.80[python_targets_python3_6(-)?,python_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-3.6.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/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(-)] python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+)] ) >=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://dev.gentoo.org/~zmedico/portage/archives/repoman-2.3.20.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d64975285530b0198da39c41bd9dbf2c
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.21 b/metadata/md5-cache/app-portage/repoman-2.3.21
deleted file mode 100644
index 65cb1d874047..000000000000
--- a/metadata/md5-cache/app-portage/repoman-2.3.21
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-apps/portage-2.3.80[python_targets_python3_6(-)?,python_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-3.6.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/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(-)] python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+)] ) >=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=Repoman is a Quality Assurance tool for Gentoo ebuilds
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-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 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/portage-2.3.80[python_targets_python3_6(-)?,python_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-3.6.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/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(-)] python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+)] ) >=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://dev.gentoo.org/~zmedico/portage/archives/repoman-2.3.21.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4dd1944903b1b96f58b3e4409f48a079
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.23 b/metadata/md5-cache/app-portage/repoman-2.3.23
new file mode 100644
index 000000000000..83d002c5b3c4
--- /dev/null
+++ b/metadata/md5-cache/app-portage/repoman-2.3.23
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=sys-apps/portage-2.3.80[python_targets_python3_6(-)?,python_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-3.6.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/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(-)] python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+)] ) >=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=Repoman is a Quality Assurance tool for Gentoo ebuilds
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
+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 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/portage-2.3.80[python_targets_python3_6(-)?,python_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-3.6.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/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(-)] python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+)] ) >=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://dev.gentoo.org/~zmedico/portage/archives/repoman-2.3.23.tar.bz2
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d64975285530b0198da39c41bd9dbf2c
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index e485a82be0c8..760dbacf21e4 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/hstr-2.1 b/metadata/md5-cache/app-shells/hstr-2.1
index d1f3b7614995..bdfcaf36c697 100644
--- a/metadata/md5-cache/app-shells/hstr-2.1
+++ b/metadata/md5-cache/app-shells/hstr-2.1
@@ -9,4 +9,4 @@ RDEPEND=sys-libs/ncurses:0=[unicode]
 SLOT=0
 SRC_URI=https://github.com/dvorka/hstr/archive/2.1.tar.gz -> hstr-2.1.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9f65a3ebd8ddf889038165b692094581
+_md5_=3654c6afebc3ad92f7dd8dbcf6d315bd
diff --git a/metadata/md5-cache/app-shells/rrs-1.70-r2 b/metadata/md5-cache/app-shells/rrs-1.70-r2
index f3241dba11c2..da84a8df6aea 100644
--- a/metadata/md5-cache/app-shells/rrs-1.70-r2
+++ b/metadata/md5-cache/app-shells/rrs-1.70-r2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install prepare
 DEPEND=ssl? ( dev-libs/openssl:0= )
 DESCRIPTION=Reverse Remote Shell
 EAPI=7
-HOMEPAGE=http://freecode.com/projects/rrs
+HOMEPAGE=http://freshmeat.sourceforge.net/projects/rrs
 IUSE=ssl
 KEYWORDS=amd64 ppc x86
 LICENSE=MIT
@@ -10,4 +10,4 @@ RDEPEND=ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=http://www.cycom.se/uploads/36/19/rrs-1.70.tar.gz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bac0e36366fb50599178ed9249d937f7
+_md5_=8fe4966098b11b46425ccfdf53b91b0e
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index ba4fe157f048..3ff372e19212 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.16 b/metadata/md5-cache/app-text/ansifilter-2.16
index b111e70d54c6..59bc6ee55c64 100644
--- a/metadata/md5-cache/app-text/ansifilter-2.16
+++ b/metadata/md5-cache/app-text/ansifilter-2.16
@@ -4,10 +4,10 @@ DESCRIPTION=Handles text files containing ANSI terminal escape codes
 EAPI=7
 HOMEPAGE=http://www.andre-simon.de/
 IUSE=qt5
-KEYWORDS=amd64 ~ppc64 x86
+KEYWORDS=amd64 ~arm ~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	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5a221fe1c26f8e82caeb194095c23845
+_md5_=bab48228315c9a31fd5b39944380a09e
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
index c015c9c35e68..47794c374601 100644
--- a/metadata/md5-cache/app-text/asciidoc-8.6.10_p20181016-r1
+++ b/metadata/md5-cache/app-text/asciidoc-8.6.10_p20181016-r1
@@ -3,7 +3,7 @@ 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-7.3.0: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/
+HOMEPAGE=https://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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
@@ -13,4 +13,4 @@ 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	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=de3765c7bfdef8329cbd741ab21575f3
+_md5_=3ca982e2f006139e4f1efaf80916db61
diff --git a/metadata/md5-cache/app-text/asciidoc-9.0.0_rc2 b/metadata/md5-cache/app-text/asciidoc-9.0.0_rc2
index 563d81c12d24..b0605cb8cd1e 100644
--- a/metadata/md5-cache/app-text/asciidoc-9.0.0_rc2
+++ b/metadata/md5-cache/app-text/asciidoc-9.0.0_rc2
@@ -3,7 +3,7 @@ DEFINED_PHASES=configure install postinst prepare setup test
 DEPEND=test? ( python_single_target_pypy3? ( >=dev-python/pypy3-7.3.0: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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-text/dvipng app-text/dvisvgm dev-texlive/texlive-latex dev-util/source-highlight media-gfx/graphviz media-gfx/imagemagick media-sound/lilypond )
 DESCRIPTION=A plain text human readable/writable document format
 EAPI=7
-HOMEPAGE=http://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/
+HOMEPAGE=https://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/
 IUSE=examples test python_single_target_pypy3 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciidoc/asciidoc-py3/archive/9.0.0rc2.tar.gz -> asciidoc-9.0.0_rc2.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=662fd20d43cc541921886bef93f64059
+_md5_=30e6d097e47af41b0fa93778e01769fb
diff --git a/metadata/md5-cache/app-text/chasen-2.4.4-r3 b/metadata/md5-cache/app-text/chasen-2.4.4-r3
index 0d2d275570ea..e07b7c838be9 100644
--- a/metadata/md5-cache/app-text/chasen-2.4.4-r3
+++ b/metadata/md5-cache/app-text/chasen-2.4.4-r3
@@ -10,5 +10,5 @@ PDEPEND=>=app-dicts/ipadic-2.7.0
 RDEPEND=>=dev-libs/darts-0.32 perl? ( !dev-perl/Text-ChaSen ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/chasen-legacy/32224/chasen-2.4.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d8be9bab283cacad5ea1f6195e0ab458
diff --git a/metadata/md5-cache/app-text/cherrytree-0.37.0-r1 b/metadata/md5-cache/app-text/cherrytree-0.37.0-r1
deleted file mode 100644
index 2a39b11db86a..000000000000
--- a/metadata/md5-cache/app-text/cherrytree-0.37.0-r1
+++ /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] ) python_single_target_python2_7? ( >=dev-python/setuptools-42.0.2[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(-)] )
-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(-)] ) 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	44725b3eb803b8abcd6978759c231210	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=259090bc6838a656ff34903474788e3b
diff --git a/metadata/md5-cache/app-text/cherrytree-0.38.9-r1 b/metadata/md5-cache/app-text/cherrytree-0.38.9-r1
deleted file mode 100644
index e2d5c61d5f41..000000000000
--- a/metadata/md5-cache/app-text/cherrytree-0.38.9-r1
+++ /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] ) python_single_target_python2_7? ( >=dev-python/setuptools-42.0.2[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	44725b3eb803b8abcd6978759c231210	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d2ddf424773d4b05f1b8b574255166e6
diff --git a/metadata/md5-cache/app-text/convmv-2.05-r1 b/metadata/md5-cache/app-text/convmv-2.05-r1
new file mode 100644
index 000000000000..463e8da09a81
--- /dev/null
+++ b/metadata/md5-cache/app-text/convmv-2.05-r1
@@ -0,0 +1,12 @@
+BDEPEND=dev-lang/perl
+DEFINED_PHASES=install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=convert filenames to utf8 or any other charset
+EAPI=7
+HOMEPAGE=https://www.j3e.de/linux/convmv/
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl
+SLOT=0
+SRC_URI=https://www.j3e.de/linux/convmv/convmv-2.05.tar.gz
+_md5_=d90868758f9f3e6f6c708263b7dfdc6d
diff --git a/metadata/md5-cache/app-text/discount-2.2.6 b/metadata/md5-cache/app-text/discount-2.2.6
index 1736af5d0c74..792895108d7c 100644
--- a/metadata/md5-cache/app-text/discount-2.2.6
+++ b/metadata/md5-cache/app-text/discount-2.2.6
@@ -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	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e3eaacf3fcdc263678503ebfd6b69874
+_md5_=156745c63002fd6f6673caac4d21b709
diff --git a/metadata/md5-cache/app-text/djview-4.10.6-r1 b/metadata/md5-cache/app-text/djview-4.10.6-r1
deleted file mode 100644
index f1652a817b4a..000000000000
--- a/metadata/md5-cache/app-text/djview-4.10.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 >=sys-devel/autoconf-2.67 virtual/pkgconfig nsplugin? ( dev-libs/glib:2 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/unzip
-DESCRIPTION=Portable DjVu viewer using Qt
-EAPI=6
-HOMEPAGE=http://djvu.sourceforge.net/djview4.html
-IUSE=debug nsplugin
-KEYWORDS=amd64 ~hppa ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=mirror://sourceforge/djvu/djview-4.10.6.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozextension	798d8c84c9e7a8105e56c9eb6626e643	multilib	2477ebe553d3e4d2c606191fe6c33602	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=261f2957af54754589f6fd5da29a3ef1
diff --git a/metadata/md5-cache/app-text/djview-4.10.6-r2 b/metadata/md5-cache/app-text/djview-4.10.6-r2
new file mode 100644
index 000000000000..046cfdbbe380
--- /dev/null
+++ b/metadata/md5-cache/app-text/djview-4.10.6-r2
@@ -0,0 +1,14 @@
+BDEPEND=dev-qt/linguist-tools:5 >=sys-devel/autoconf-2.67 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=compile configure install postinst postrm prepare
+DEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
+DESCRIPTION=Portable DjVu viewer using Qt
+EAPI=7
+HOMEPAGE=http://djvu.sourceforge.net/djview4.html
+IUSE=debug
+KEYWORDS=amd64 ~hppa ppc ppc64 x86
+LICENSE=GPL-2
+RDEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=mirror://sourceforge/djvu/djview-4.10.6.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c4b7f77778ce08d5e5a69e3a7f61912f
diff --git a/metadata/md5-cache/app-text/djvu-3.5.27-r1 b/metadata/md5-cache/app-text/djvu-3.5.27-r1
deleted file mode 100644
index 910a1f4843d5..000000000000
--- a/metadata/md5-cache/app-text/djvu-3.5.27-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0= ) || ( gnome-base/librsvg media-gfx/inkscape )
-DESCRIPTION=DjVu viewers, encoders and utilities
-EAPI=7
-HOMEPAGE=http://djvu.sourceforge.net/
-IUSE=debug doc jpeg tiff xml
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0= )
-SLOT=0
-SRC_URI=http://downloads.sourceforge.net/djvu/djvulibre-3.5.27.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5d3bd2df6e3fc392b4919384267d11c8
diff --git a/metadata/md5-cache/app-text/djvu-3.5.27-r2 b/metadata/md5-cache/app-text/djvu-3.5.27-r2
index 6cbac878ebc1..900b29c22532 100644
--- a/metadata/md5-cache/app-text/djvu-3.5.27-r2
+++ b/metadata/md5-cache/app-text/djvu-3.5.27-r2
@@ -5,10 +5,10 @@ DESCRIPTION=DjVu viewers, encoders and utilities
 EAPI=7
 HOMEPAGE=http://djvu.sourceforge.net/
 IUSE=debug doc jpeg tiff xml
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0= )
 SLOT=0
-SRC_URI=https://sourceforge.net/code-snapshots/git/d/dj/djvu/djvulibre-git.git/djvu-djvulibre-git-a00b7618c22fb35b030582147a4479c4cf41c349.zip -> djvu-3.5.27.zip
+SRC_URI=https://ajakk.github.io/djvu-3.5.27-a00b7618c22fb35b030582147a4479c4cf41c349.zip -> djvu-3.5.27.zip
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9e82cd6bb3953086b92c7e34b44f63db
+_md5_=f126a1f081bac1fc34e287cc95a1f58f
diff --git a/metadata/md5-cache/app-text/dvipsk-2020.1_p20200406 b/metadata/md5-cache/app-text/dvipsk-2020.1_p20200406
index f4eaab72c98a..4a068cae15bd 100644
--- a/metadata/md5-cache/app-text/dvipsk-2020.1_p20200406
+++ b/metadata/md5-cache/app-text/dvipsk-2020.1_p20200406
@@ -9,5 +9,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-20200406-source.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvips-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvips.doc-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408
 _md5_=f13c845adb893615e2185be10ddbbd53
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 ebb9f86b6d6a..b91257f51754 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	7fd20552ce4cc97e8acb132a499a7dd8	texlive-common	3438add11e8232d1fa32884e5e278bfe
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	texlive-common	0eca2ea110130453e0124f83ce50c408
 _md5_=65d752f38dd89716010c180747454634
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 a4752da0efcb..07fa050b392a 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	7fd20552ce4cc97e8acb132a499a7dd8	texlive-common	3438add11e8232d1fa32884e5e278bfe
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	texlive-common	0eca2ea110130453e0124f83ce50c408
 _md5_=7467cf79a18935e28a4e3a6072f2d6c2
diff --git a/metadata/md5-cache/app-text/flpsed-0.7.3 b/metadata/md5-cache/app-text/flpsed-0.7.3
index 139909087973..c75e887d1fd8 100644
--- a/metadata/md5-cache/app-text/flpsed-0.7.3
+++ b/metadata/md5-cache/app-text/flpsed-0.7.3
@@ -2,11 +2,11 @@ DEFINED_PHASES=install
 DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft >=x11-libs/fltk-1.3.0:1 app-text/ghostscript-gpl[X]
 DESCRIPTION=Pseudo PostScript editor
 EAPI=7
-HOMEPAGE=http://flpsed.org/flpsed.html
+HOMEPAGE=https://flpsed.org/flpsed.html
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft >=x11-libs/fltk-1.3.0:1 app-text/ghostscript-gpl[X]
 SLOT=0
-SRC_URI=http://flpsed.org/flpsed-0.7.3.tar.gz
+SRC_URI=https://flpsed.org/flpsed-0.7.3.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8
-_md5_=708382b03550fa3df0fd418478560731
+_md5_=4a95e669373a9442e3976ff9db92e8f4
diff --git a/metadata/md5-cache/app-text/grip-4.2.0 b/metadata/md5-cache/app-text/grip-4.2.0
deleted file mode 100644
index e938fd3a0f22..000000000000
--- a/metadata/md5-cache/app-text/grip-4.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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-42.0.2[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_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-7.3.0: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	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2a1af4c9a7fc9f8e86f66f1b61747900
diff --git a/metadata/md5-cache/app-text/grutatxt-2.0.16-r1 b/metadata/md5-cache/app-text/grutatxt-2.0.16-r1
index 6a0b98f277cd..4b005c0f7d3c 100644
--- a/metadata/md5-cache/app-text/grutatxt-2.0.16-r1
+++ b/metadata/md5-cache/app-text/grutatxt-2.0.16-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://www.triptico.com/download/Grutatxt-2.0.16.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1cc592c4e3fd40f366c5e617a93d2150
diff --git a/metadata/md5-cache/app-text/highlight-3.42-r1 b/metadata/md5-cache/app-text/highlight-3.42-r1
deleted file mode 100644
index ca8a94f655b6..000000000000
--- a/metadata/md5-cache/app-text/highlight-3.42-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-lang/lua:0= qt5? ( dev-libs/double-conversion:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) dev-libs/boost virtual/pkgconfig qt5? ( dev-qt/linguist-tools:5 )
-DESCRIPTION=Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight
-EAPI=6
-HOMEPAGE=http://www.andre-simon.de/
-IUSE=examples qt5
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-3
-RDEPEND=dev-lang/lua:0= qt5? ( dev-libs/double-conversion:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-SLOT=0
-SRC_URI=http://www.andre-simon.de/zip/highlight-3.42.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8fc4fe733d00f0e7e721ea895a3cf2b8
diff --git a/metadata/md5-cache/app-text/highlight-3.57 b/metadata/md5-cache/app-text/highlight-3.57
index 9c44f47fc427..8a23bbb678b7 100644
--- a/metadata/md5-cache/app-text/highlight-3.57
+++ b/metadata/md5-cache/app-text/highlight-3.57
@@ -5,10 +5,10 @@ DESCRIPTION=Converts source code to formatted text (HTML, LaTeX, etc.) with synt
 EAPI=7
 HOMEPAGE=http://www.andre-simon.de/
 IUSE=examples qt5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3
 RDEPEND=dev-lang/lua:0= qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 SLOT=0
 SRC_URI=http://www.andre-simon.de/zip/highlight-3.57.tar.bz2
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3b6cdbcdcc69473a68746afb56979d00
+_md5_=b8cca19f5e5919c459562e4ed116c18a
diff --git a/metadata/md5-cache/app-text/htag-0.0.24-r1 b/metadata/md5-cache/app-text/htag-0.0.24-r1
index 799ea99a5b96..b35b093ea0b3 100644
--- a/metadata/md5-cache/app-text/htag-0.0.24-r1
+++ b/metadata/md5-cache/app-text/htag-0.0.24-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://www.earth.li/projectpurple/files/htag-0.0.24.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7ce376dbdb9966fdafe4638e04ff97e6
diff --git a/metadata/md5-cache/app-text/htmlmin-0.1.12 b/metadata/md5-cache/app-text/htmlmin-0.1.12
index 2d87174fe659..1c2ee3a73000 100644
--- a/metadata/md5-cache/app-text/htmlmin-0.1.12
+++ b/metadata/md5-cache/app-text/htmlmin-0.1.12
@@ -1,14 +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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 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-python/setuptools-42.0.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 configurable HTML Minifier with safety features
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/mankyd/htmlmin
-IUSE=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 python_targets_python3_9
 KEYWORDS=amd64 x86
 LICENSE=BSD
-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 )
+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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-SRC_URI=mirror://pypi/h/htmlmin/htmlmin-0.1.12.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=630d4ab3d1cc6a9495162785956bf42f
+SRC_URI=https://github.com/mankyd/htmlmin/archive/220b1d16442eb4b6fafed338ee3b61f698a01e63.tar.gz -> htmlmin-0.1.12.gh.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a3d9e9abc3ffcf72c98d036aa63dae46
diff --git a/metadata/md5-cache/app-text/hunspell-1.7.0-r2 b/metadata/md5-cache/app-text/hunspell-1.7.0-r2
new file mode 100644
index 000000000000..24e9659066b4
--- /dev/null
+++ b/metadata/md5-cache/app-text/hunspell-1.7.0-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 prepare
+DEPEND=ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:= ) sys-devel/gettext
+DESCRIPTION=Hunspell spell checker - an improved replacement for myspell in OOo
+EAPI=7
+HOMEPAGE=https://github.com/hunspell
+IUSE=ncurses nls readline static-libs l10n_af l10n_bg l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_de-1901 l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_fo l10n_fr l10n_ga l10n_gl l10n_he l10n_hr l10n_hu l10n_ia l10n_id l10n_is l10n_it l10n_kk l10n_km l10n_ku l10n_lt l10n_lv l10n_mi l10n_mk l10n_ms l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sv l10n_sw l10n_tn l10n_uk l10n_zu
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MPL-1.1 GPL-2 LGPL-2.1
+PDEPEND=l10n_af? ( app-dicts/myspell-af ) l10n_bg? ( app-dicts/myspell-bg ) l10n_ca? ( app-dicts/myspell-ca ) l10n_cs? ( app-dicts/myspell-cs ) l10n_cy? ( app-dicts/myspell-cy ) l10n_da? ( app-dicts/myspell-da ) l10n_de? ( app-dicts/myspell-de ) l10n_de-1901? ( app-dicts/myspell-de_1901 ) l10n_el? ( app-dicts/myspell-el ) l10n_en? ( app-dicts/myspell-en ) l10n_eo? ( app-dicts/myspell-eo ) l10n_es? ( app-dicts/myspell-es ) l10n_et? ( app-dicts/myspell-et ) l10n_fo? ( app-dicts/myspell-fo ) l10n_fr? ( app-dicts/myspell-fr ) l10n_ga? ( app-dicts/myspell-ga ) l10n_gl? ( app-dicts/myspell-gl ) l10n_he? ( app-dicts/myspell-he ) l10n_hr? ( app-dicts/myspell-hr ) l10n_hu? ( app-dicts/myspell-hu ) l10n_ia? ( app-dicts/myspell-ia ) l10n_id? ( app-dicts/myspell-id ) l10n_is? ( app-dicts/myspell-is ) l10n_it? ( app-dicts/myspell-it ) l10n_kk? ( app-dicts/myspell-kk ) l10n_km? ( app-dicts/myspell-km ) l10n_ku? ( app-dicts/myspell-ku ) l10n_lt? ( app-dicts/myspell-lt ) l10n_lv? ( app-dicts/myspell-lv ) l10n_mi? ( app-dicts/myspell-mi ) l10n_mk? ( app-dicts/myspell-mk ) l10n_ms? ( app-dicts/myspell-ms ) l10n_nb? ( app-dicts/myspell-nb ) l10n_nl? ( app-dicts/myspell-nl ) l10n_nn? ( app-dicts/myspell-nn ) l10n_pl? ( app-dicts/myspell-pl ) l10n_pt? ( app-dicts/myspell-pt ) l10n_pt-BR? ( app-dicts/myspell-pt-br ) l10n_ro? ( app-dicts/myspell-ro ) l10n_ru? ( app-dicts/myspell-ru ) l10n_sk? ( app-dicts/myspell-sk ) l10n_sl? ( app-dicts/myspell-sl ) l10n_sq? ( app-dicts/myspell-sq ) l10n_sv? ( app-dicts/myspell-sv ) l10n_sw? ( app-dicts/myspell-sw ) l10n_tn? ( app-dicts/myspell-tn ) l10n_uk? ( app-dicts/myspell-uk ) l10n_zu? ( app-dicts/myspell-zu )
+RDEPEND=ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:= )
+SLOT=0/1.7
+SRC_URI=https://github.com/hunspell/hunspell/archive/v1.7.0.tar.gz -> hunspell-1.7.0.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8041133e8093df1518aeeb9442fb76cf
diff --git a/metadata/md5-cache/app-text/jadetex-3.13-r9 b/metadata/md5-cache/app-text/jadetex-3.13-r9
index 2c45e8150014..eda062eaa3c3 100644
--- a/metadata/md5-cache/app-text/jadetex-3.13-r9
+++ b/metadata/md5-cache/app-text/jadetex-3.13-r9
@@ -9,5 +9,5 @@ RDEPEND=virtual/latex-base
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/jadetex/jadetex-3.13.tar.gz
-_eclasses_=latex-package	e5f296c98696dd02059bc6a5a03282e2	texlive-common	3438add11e8232d1fa32884e5e278bfe
+_eclasses_=latex-package	e5f296c98696dd02059bc6a5a03282e2	texlive-common	0eca2ea110130453e0124f83ce50c408
 _md5_=171ff4b1d93fdf5b8b3a1cd5e511bd87
diff --git a/metadata/md5-cache/app-text/libspectre-0.2.8 b/metadata/md5-cache/app-text/libspectre-0.2.8
deleted file mode 100644
index 3422f4c8144c..000000000000
--- a/metadata/md5-cache/app-text/libspectre-0.2.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=app-text/ghostscript-gpl-8.62 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
-DESCRIPTION=A library for rendering Postscript documents
-EAPI=6
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/libspectre
-IUSE=debug doc static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-text/ghostscript-gpl-8.62
-RESTRICT=test
-SLOT=0
-SRC_URI=https://libspectre.freedesktop.org/releases/libspectre-0.2.8.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1d3b64178d9fe30760b60e3eaa7dee9a
diff --git a/metadata/md5-cache/app-text/libspectre-0.2.9 b/metadata/md5-cache/app-text/libspectre-0.2.9
index fb771f93de15..2f6149eba277 100644
--- a/metadata/md5-cache/app-text/libspectre-0.2.9
+++ b/metadata/md5-cache/app-text/libspectre-0.2.9
@@ -1,15 +1,15 @@
 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=compile configure install prepare
-DEPEND=>=app-text/ghostscript-gpl-9.24
+DEPEND=>=app-text/ghostscript-gpl-9.24:=
 DESCRIPTION=Library for rendering Postscript documents
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libspectre
 IUSE=debug doc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=GPL-2
-RDEPEND=>=app-text/ghostscript-gpl-9.24
+RDEPEND=>=app-text/ghostscript-gpl-9.24:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://libspectre.freedesktop.org/releases/libspectre-0.2.9.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4ef40d03e94e13845d294245200a677a
+_md5_=369ac6d67f725bcbb9cd26872b5d16a3
diff --git a/metadata/md5-cache/app-text/ocrad-0.26 b/metadata/md5-cache/app-text/ocrad-0.26
index 3995c7e3ea16..9ff14bf25fd5 100644
--- a/metadata/md5-cache/app-text/ocrad-0.26
+++ b/metadata/md5-cache/app-text/ocrad-0.26
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://nongnu/ocrad/ocrad-0.26.tar.lz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=1c8c3738d05bd63acdb864a28441e795
diff --git a/metadata/md5-cache/app-text/ocrad-0.27 b/metadata/md5-cache/app-text/ocrad-0.27
index 6842e4876dfb..082ae195c9a3 100644
--- a/metadata/md5-cache/app-text/ocrad-0.27
+++ b/metadata/md5-cache/app-text/ocrad-0.27
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://nongnu/ocrad/ocrad-0.27.tar.lz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=9fb54145bc902f4b341957e667ea8503
diff --git a/metadata/md5-cache/app-text/podofo-0.9.6_p20190928 b/metadata/md5-cache/app-text/podofo-0.9.6_p20190928
new file mode 100644
index 000000000000..601eaf23e39d
--- /dev/null
+++ b/metadata/md5-cache/app-text/podofo-0.9.6_p20190928
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/lua:= idn? ( net-dns/libidn:= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) media-libs/fontconfig:= media-libs/freetype:2= virtual/jpeg:0= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:= virtual/pkgconfig boost? ( dev-util/boost-build ) test? ( dev-util/cppunit )
+DESCRIPTION=PoDoFo is a C++ library to work with the PDF file format
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/podofo/
+IUSE=+boost idn libressl debug test +tools
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=dev-lang/lua:= idn? ( net-dns/libidn:= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) media-libs/fontconfig:= media-libs/freetype:2= virtual/jpeg:0= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:=
+REQUIRED_USE=test? ( tools )
+RESTRICT=!test? ( test )
+SLOT=0/0.9.6
+SRC_URI=https://dev.gentoo.org/~zmedico/dist/podofo-0.9.6_p20190928.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=59e8d4672483cc8934fe6c310a60d3ef
diff --git a/metadata/md5-cache/app-text/podofo-0.9.6_p20200526 b/metadata/md5-cache/app-text/podofo-0.9.6_p20200526
deleted file mode 100644
index b8f6183e2c70..000000000000
--- a/metadata/md5-cache/app-text/podofo-0.9.6_p20200526
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/lua:= idn? ( net-dns/libidn:= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) media-libs/fontconfig:= media-libs/freetype:2= virtual/jpeg:0= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:= virtual/pkgconfig boost? ( dev-util/boost-build ) test? ( dev-util/cppunit )
-DESCRIPTION=PoDoFo is a C++ library to work with the PDF file format
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/podofo/
-IUSE=+boost idn libressl debug test +tools
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=dev-lang/lua:= idn? ( net-dns/libidn:= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) media-libs/fontconfig:= media-libs/freetype:2= virtual/jpeg:0= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:=
-REQUIRED_USE=test? ( tools )
-RESTRICT=test
-SLOT=0/0.9.6
-SRC_URI=https://dev.gentoo.org/~zmedico/dist/podofo-0.9.6_p20200526.tar.xz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=027121905dea70887124ebf671cca247
diff --git a/metadata/md5-cache/app-text/q-text-as-data-1.5.0 b/metadata/md5-cache/app-text/q-text-as-data-1.5.0
deleted file mode 100644
index 8c8a1a77a617..000000000000
--- a/metadata/md5-cache/app-text/q-text-as-data-1.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=A CLI tool that allows direct execution of SQL-like queries on text
-EAPI=5
-HOMEPAGE=http://harelba.github.io/q/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/harelba/q/archive/1.5.0.tar.gz -> q-1.5.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=80b836c63cd682eaa68a27470e3a25a6
diff --git a/metadata/md5-cache/app-text/q-text-as-data-2.0.10 b/metadata/md5-cache/app-text/q-text-as-data-2.0.10
new file mode 100644
index 000000000000..f97f397d804e
--- /dev/null
+++ b/metadata/md5-cache/app-text/q-text-as-data-2.0.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst
+DEPEND=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] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] || ( ( dev-lang/python:3.9[sqlite] dev-python/six[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/flake8[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8[sqlite] dev-python/six[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/flake8[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[sqlite] dev-python/six[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/flake8[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[sqlite] dev-python/six[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/flake8[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] dev-python/six[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/flake8[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
+DESCRIPTION=A CLI tool that allows direct execution of SQL-like queries on text
+EAPI=7
+HOMEPAGE=http://harelba.github.io/q/
+IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=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] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] || ( ( dev-lang/python:3.9[sqlite] dev-python/six[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/flake8[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8[sqlite] dev-python/six[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/flake8[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[sqlite] dev-python/six[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/flake8[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[sqlite] dev-python/six[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/flake8[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] dev-python/six[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/flake8[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/harelba/q/archive/2.0.10.tar.gz -> q-2.0.10.tar.gz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4728534a04a792911e84c3dce6a6d20c
diff --git a/metadata/md5-cache/app-text/recode-3.6_p20-r1 b/metadata/md5-cache/app-text/recode-3.6_p20-r1
index ba48916a2e8f..bee7d7e46588 100644
--- a/metadata/md5-cache/app-text/recode-3.6_p20-r1
+++ b/metadata/md5-cache/app-text/recode-3.6_p20-r1
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/recode/recode-3.6.tar.gz mirror://debian/pool/main/r/recode/recode_3.6-20.debian.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1c9ee270d1f5b445735ee30ba6927740
+_md5_=b4cc24b855c493a431a0a7a4be8d639b
diff --git a/metadata/md5-cache/app-text/rnv-1.7.11-r1 b/metadata/md5-cache/app-text/rnv-1.7.11-r1
index ca26cd35580b..3c14c5e97e76 100644
--- a/metadata/md5-cache/app-text/rnv-1.7.11-r1
+++ b/metadata/md5-cache/app-text/rnv-1.7.11-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/expat dev-scheme/scm[libscm]
 SLOT=0
 SRC_URI=mirror://sourceforge/rnv/rnv-1.7.11.tar.xz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=7300efb2c06eb0abeecce9f659cad466
diff --git a/metadata/md5-cache/app-text/scdoc-1.11.0 b/metadata/md5-cache/app-text/scdoc-1.11.0
new file mode 100644
index 000000000000..994f0ea99cf6
--- /dev/null
+++ b/metadata/md5-cache/app-text/scdoc-1.11.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Standalone tool for generating man pages with a simple syntax
+EAPI=7
+HOMEPAGE=https://git.sr.ht/~sircmpwn/scdoc
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://git.sr.ht/~sircmpwn/scdoc/archive/1.11.0.tar.gz -> scdoc-1.11.0.tar.gz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1c00dfaffd0bc0acd5e32a7248ea62ab
diff --git a/metadata/md5-cache/app-text/texlive-2020-r1 b/metadata/md5-cache/app-text/texlive-2020-r1
deleted file mode 100644
index 313e697f08c4..000000000000
--- a/metadata/md5-cache/app-text/texlive-2020-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=app-text/texlive-core-2020
-DESCRIPTION=A complete TeX distribution
-EAPI=7
-HOMEPAGE=http://tug.org/texlive/
-IUSE=cjk context detex dvi2tty extra epspdf games graphics humanities jadetex luatex metapost music pdfannotextractor png pstricks publishers science tex4ht texi2html truetype xetex xml X l10n_af l10n_ar l10n_as l10n_bg l10n_bn l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_ga l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_kn l10n_la l10n_lo l10n_lt l10n_lv l10n_ml l10n_mn l10n_mr l10n_nb l10n_nl l10n_nn l10n_no l10n_or l10n_pa l10n_pl l10n_pt l10n_rm l10n_ro l10n_ru l10n_sa l10n_sco l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tk l10n_tr l10n_uk l10n_vi l10n_zh
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=metapackage
-RDEPEND=>=app-text/texlive-core-2020 app-text/psutils >=dev-texlive/texlive-fontutils-2020 media-gfx/sam2p texi2html? ( app-text/texi2html ) sys-apps/texinfo app-text/t1utils >=app-text/lcdf-typetools-2.92[kpathsea] truetype? ( >=app-text/ttf2pk2-2.0_p20150521 ) detex? ( dev-tex/detex ) app-text/ps2eps dvi2tty? ( dev-tex/dvi2tty ) png? ( app-text/dvipng ) X? ( >=app-text/xdvik-22.87 ) >=dev-texlive/texlive-basic-2020 >=dev-texlive/texlive-fontsrecommended-2020 >=dev-texlive/texlive-latex-2020 luatex? ( >=dev-texlive/texlive-luatex-2020 ) >=dev-texlive/texlive-latexrecommended-2020 >=dev-tex/latex-beamer-3.36 metapost? ( >=dev-texlive/texlive-metapost-2020-r1 ) >=dev-texlive/texlive-plaingeneric-2020 pdfannotextractor? ( dev-tex/pdfannotextractor ) extra? ( dev-tex/chktex app-text/dvisvgm dev-tex/latexdiff >=dev-tex/latexmk-418 >=app-text/pdfjam-2.02 >=dev-texlive/texlive-bibtexextra-2020 >=dev-texlive/texlive-fontsextra-2020 >=dev-texlive/texlive-formatsextra-2020 >=dev-texlive/texlive-latexextra-2020 >=dev-tex/glossaries-2.07 >=dev-tex/leaflet-20041222 >=dev-tex/currvita-0.9i-r1 >=dev-tex/g-brief-4.0.2 >=dev-tex/envlab-1.2-r1 >=dev-tex/europecv-20060424-r1 >=dev-tex/svninfo-0.7.3-r1 ) xetex? ( >=dev-texlive/texlive-xetex-2020 ) graphics? ( >=dev-texlive/texlive-pictures-2020 dev-tex/dot2texi ) epspdf? ( app-text/epspdf ) science? ( >=dev-texlive/texlive-mathscience-2020 ) publishers? ( >=dev-texlive/texlive-publishers-2020 ) music? ( >=dev-texlive/texlive-music-2020 ) pstricks? ( >=dev-texlive/texlive-pstricks-2020 ) context? ( >=dev-texlive/texlive-context-2020 ) games? ( >=dev-texlive/texlive-games-2020 ) humanities? ( >=dev-texlive/texlive-humanities-2020 ) tex4ht? ( >=dev-tex/tex4ht-20090611_p1038-r3 ) xml? ( >=dev-tex/xmltex-1.9-r2 app-text/passivetex ) jadetex? ( >=app-text/jadetex-3.13-r2 ) l10n_af? ( >=dev-texlive/texlive-langother-2020 ) l10n_ar? ( >=dev-texlive/texlive-langarabic-2020 ) l10n_fa? ( >=dev-texlive/texlive-langarabic-2020 ) l10n_hy? ( >=dev-texlive/texlive-langeuropean-2020 ) cjk? ( >=dev-texlive/texlive-langcjk-2020 >=dev-tex/cjk-latex-4.8.4 ) l10n_hr? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_bg? ( >=dev-texlive/texlive-langcyrillic-2020 ) l10n_br? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_ru? ( >=dev-texlive/texlive-langcyrillic-2020 ) l10n_uk? ( >=dev-texlive/texlive-langcyrillic-2020 ) l10n_cs? ( >=dev-texlive/texlive-langczechslovak-2020 >=app-text/vlna-1.3 ) l10n_sk? ( >=dev-texlive/texlive-langczechslovak-2020 ) l10n_da? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_nl? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_en? ( >=dev-texlive/texlive-langenglish-2020 ) l10n_fi? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_eu? ( >=dev-texlive/texlive-langfrench-2020 ) l10n_fr? ( >=dev-texlive/texlive-langfrench-2020 ) l10n_de? ( >=dev-texlive/texlive-langgerman-2020 ) l10n_el? ( >=dev-texlive/texlive-langgreek-2020 ) l10n_he? ( >=dev-texlive/texlive-langother-2020 ) l10n_hu? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_as? ( >=dev-texlive/texlive-langother-2020 ) l10n_bn? ( >=dev-texlive/texlive-langother-2020 ) l10n_gu? ( >=dev-texlive/texlive-langother-2020 ) l10n_hi? ( >=dev-texlive/texlive-langother-2020 ) l10n_kn? ( >=dev-texlive/texlive-langother-2020 ) l10n_ml? ( >=dev-texlive/texlive-langother-2020 ) l10n_mr? ( >=dev-texlive/texlive-langother-2020 ) l10n_or? ( >=dev-texlive/texlive-langother-2020 ) l10n_pa? ( >=dev-texlive/texlive-langother-2020 ) l10n_sa? ( >=dev-texlive/texlive-langother-2020 ) l10n_ta? ( >=dev-texlive/texlive-langother-2020 ) l10n_te? ( >=dev-texlive/texlive-langother-2020 ) l10n_it? ( >=dev-texlive/texlive-langitalian-2020 ) l10n_ja? ( >=dev-texlive/texlive-langjapanese-2020 ) l10n_ko? ( >=dev-texlive/texlive-langkorean-2020 ) l10n_la? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_lt? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_lv? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_mn? ( >=dev-texlive/texlive-langcyrillic-2020 ) l10n_nb? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_nn? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_no? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_cy? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_eo? ( >=dev-texlive/texlive-langother-2020 ) l10n_et? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_ga? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_rm? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_hsb? ( >=dev-texlive/texlive-langother-2020 ) l10n_ia? ( >=dev-texlive/texlive-langother-2020 ) l10n_id? ( >=dev-texlive/texlive-langother-2020 ) l10n_is? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_lo? ( >=dev-texlive/texlive-langother-2020 ) l10n_ro? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_sq? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_sr? ( >=dev-texlive/texlive-langeuropean-2020 >=dev-texlive/texlive-langcyrillic-2020 ) l10n_sl? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_tr? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_pl? ( >=dev-texlive/texlive-langpolish-2020 ) l10n_pt? ( >=dev-texlive/texlive-langportuguese-2020 ) l10n_ca? ( >=dev-texlive/texlive-langspanish-2020 ) l10n_gl? ( >=dev-texlive/texlive-langspanish-2020 ) l10n_es? ( >=dev-texlive/texlive-langspanish-2020 ) l10n_sco? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_sv? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_tk? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_vi? ( >=dev-texlive/texlive-langother-2020 ) l10n_zh? ( >=dev-texlive/texlive-langchinese-2020 )
-SLOT=0
-_md5_=b508d1d6b510fd6483536945fcaaf2a5
diff --git a/metadata/md5-cache/app-text/texlive-2020-r3 b/metadata/md5-cache/app-text/texlive-2020-r3
new file mode 100644
index 000000000000..5869ef076345
--- /dev/null
+++ b/metadata/md5-cache/app-text/texlive-2020-r3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=>=app-text/texlive-core-2020
+DESCRIPTION=A complete TeX distribution
+EAPI=7
+HOMEPAGE=http://tug.org/texlive/
+IUSE=cjk context detex dvi2tty extra epspdf games graphics humanities jadetex luatex metapost music pdfannotextractor png pstricks publishers science tex4ht texi2html truetype xetex xml X l10n_af l10n_ar l10n_as l10n_bg l10n_bn l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_ga l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_kn l10n_la l10n_lo l10n_lt l10n_lv l10n_ml l10n_mn l10n_mr l10n_nb l10n_nl l10n_nn l10n_no l10n_or l10n_pa l10n_pl l10n_pt l10n_rm l10n_ro l10n_ru l10n_sa l10n_sco l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tk l10n_tr l10n_uk l10n_vi l10n_zh
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=metapackage
+RDEPEND=>=app-text/texlive-core-2020 app-text/psutils >=dev-texlive/texlive-fontutils-2020 media-gfx/sam2p texi2html? ( app-text/texi2html ) sys-apps/texinfo app-text/t1utils >=app-text/lcdf-typetools-2.92[kpathsea] truetype? ( >=app-text/ttf2pk2-2.0_p20150521 ) detex? ( dev-tex/detex ) app-text/ps2eps dvi2tty? ( dev-tex/dvi2tty ) png? ( app-text/dvipng ) X? ( >=app-text/xdvik-22.87 ) >=dev-texlive/texlive-basic-2020 >=dev-texlive/texlive-fontsrecommended-2020 >=dev-texlive/texlive-latex-2020 luatex? ( >=dev-texlive/texlive-luatex-2020 ) >=dev-texlive/texlive-latexrecommended-2020 >=dev-tex/latex-beamer-3.36 metapost? ( >=dev-texlive/texlive-metapost-2020-r1 ) >=dev-texlive/texlive-plaingeneric-2020 pdfannotextractor? ( dev-tex/pdfannotextractor ) extra? ( dev-tex/chktex app-text/dvisvgm dev-tex/latexdiff >=dev-tex/latexmk-418 >=app-text/pdfjam-2.02 >=dev-texlive/texlive-bibtexextra-2020 >=dev-texlive/texlive-fontsextra-2020 >=dev-texlive/texlive-formatsextra-2020 >=dev-texlive/texlive-latexextra-2020-r2 >=dev-tex/glossaries-2.07 ) xetex? ( >=dev-texlive/texlive-xetex-2020 ) graphics? ( >=dev-texlive/texlive-pictures-2020-r2 ) epspdf? ( app-text/epspdf ) science? ( >=dev-texlive/texlive-mathscience-2020 ) publishers? ( >=dev-texlive/texlive-publishers-2020 ) music? ( >=dev-texlive/texlive-music-2020 ) pstricks? ( >=dev-texlive/texlive-pstricks-2020 ) context? ( >=dev-texlive/texlive-context-2020 ) games? ( >=dev-texlive/texlive-games-2020 ) humanities? ( >=dev-texlive/texlive-humanities-2020 ) tex4ht? ( >=dev-tex/tex4ht-20090611_p1038-r3 ) xml? ( >=dev-tex/xmltex-1.9-r2 app-text/passivetex ) jadetex? ( >=app-text/jadetex-3.13-r2 ) l10n_af? ( >=dev-texlive/texlive-langother-2020 ) l10n_ar? ( >=dev-texlive/texlive-langarabic-2020 ) l10n_fa? ( >=dev-texlive/texlive-langarabic-2020 ) l10n_hy? ( >=dev-texlive/texlive-langeuropean-2020 ) cjk? ( >=dev-texlive/texlive-langcjk-2020 >=dev-tex/cjk-latex-4.8.4 ) l10n_hr? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_bg? ( >=dev-texlive/texlive-langcyrillic-2020 ) l10n_br? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_ru? ( >=dev-texlive/texlive-langcyrillic-2020 ) l10n_uk? ( >=dev-texlive/texlive-langcyrillic-2020 ) l10n_cs? ( >=dev-texlive/texlive-langczechslovak-2020 >=app-text/vlna-1.3 ) l10n_sk? ( >=dev-texlive/texlive-langczechslovak-2020 ) l10n_da? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_nl? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_en? ( >=dev-texlive/texlive-langenglish-2020 ) l10n_fi? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_eu? ( >=dev-texlive/texlive-langfrench-2020 ) l10n_fr? ( >=dev-texlive/texlive-langfrench-2020 ) l10n_de? ( >=dev-texlive/texlive-langgerman-2020 ) l10n_el? ( >=dev-texlive/texlive-langgreek-2020 ) l10n_he? ( >=dev-texlive/texlive-langother-2020 ) l10n_hu? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_as? ( >=dev-texlive/texlive-langother-2020 ) l10n_bn? ( >=dev-texlive/texlive-langother-2020 ) l10n_gu? ( >=dev-texlive/texlive-langother-2020 ) l10n_hi? ( >=dev-texlive/texlive-langother-2020 ) l10n_kn? ( >=dev-texlive/texlive-langother-2020 ) l10n_ml? ( >=dev-texlive/texlive-langother-2020 ) l10n_mr? ( >=dev-texlive/texlive-langother-2020 ) l10n_or? ( >=dev-texlive/texlive-langother-2020 ) l10n_pa? ( >=dev-texlive/texlive-langother-2020 ) l10n_sa? ( >=dev-texlive/texlive-langother-2020 ) l10n_ta? ( >=dev-texlive/texlive-langother-2020 ) l10n_te? ( >=dev-texlive/texlive-langother-2020 ) l10n_it? ( >=dev-texlive/texlive-langitalian-2020 ) l10n_ja? ( >=dev-texlive/texlive-langjapanese-2020 ) l10n_ko? ( >=dev-texlive/texlive-langkorean-2020 ) l10n_la? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_lt? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_lv? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_mn? ( >=dev-texlive/texlive-langcyrillic-2020 ) l10n_nb? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_nn? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_no? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_cy? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_eo? ( >=dev-texlive/texlive-langother-2020 ) l10n_et? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_ga? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_rm? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_hsb? ( >=dev-texlive/texlive-langother-2020 ) l10n_ia? ( >=dev-texlive/texlive-langother-2020 ) l10n_id? ( >=dev-texlive/texlive-langother-2020 ) l10n_is? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_lo? ( >=dev-texlive/texlive-langother-2020 ) l10n_ro? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_sq? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_sr? ( >=dev-texlive/texlive-langeuropean-2020 >=dev-texlive/texlive-langcyrillic-2020 ) l10n_sl? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_tr? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_pl? ( >=dev-texlive/texlive-langpolish-2020 ) l10n_pt? ( >=dev-texlive/texlive-langportuguese-2020 ) l10n_ca? ( >=dev-texlive/texlive-langspanish-2020 ) l10n_gl? ( >=dev-texlive/texlive-langspanish-2020 ) l10n_es? ( >=dev-texlive/texlive-langspanish-2020 ) l10n_sco? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_sv? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_tk? ( >=dev-texlive/texlive-langeuropean-2020 ) l10n_vi? ( >=dev-texlive/texlive-langother-2020 ) l10n_zh? ( >=dev-texlive/texlive-langchinese-2020 )
+SLOT=0
+_md5_=5115bf7c64b714069c63a3be93db2f39
diff --git a/metadata/md5-cache/app-text/texlive-core-2020-r5 b/metadata/md5-cache/app-text/texlive-core-2020-r5
index 6037b25769c0..c5f066e485db 100644
--- a/metadata/md5-cache/app-text/texlive-core-2020-r5
+++ b/metadata/md5-cache/app-text/texlive-core-2020-r5
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LPPL-1.3c TeX
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libXmu ) !app-text/xindy !~dev-texlive/texlive-basic-2019 !~dev-texlive/texlive-fontutils-2019 sys-libs/zlib >=media-libs/harfbuzz-1.4.5[icu,graphite] >=media-libs/libpng-1.2.43-r2:0= media-libs/gd[png] media-gfx/graphite2 >=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? ( >=app-text/teckit-2.5.3 media-libs/fontconfig ) xindy? ( dev-lisp/clisp:= ) media-libs/freetype:2 >=dev-libs/icu-50:= >=dev-libs/kpathsea-6.3.2 cjk? ( >=dev-libs/ptexenc-1.3.8 ) >=app-text/poppler-0.87.0:= >=app-text/ps2pkm-1.8_p20170524 >=app-text/dvipsk-5.997 >=dev-tex/bibtexu-3.71_p20170524 virtual/perl-Getopt-Long dev-perl/File-HomeDir dev-perl/Log-Dispatch dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny tk? ( dev-perl/Tk )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-20200406-source.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-tlpdb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-core-patches-2020-4.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-base-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gsftopk-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive.infra-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-scripts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-a2ping-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adhocfilelist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arara-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asymptote-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bundledoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-checklistings-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chklref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctan_chk-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clojure-pamphlet-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cluttex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctanify-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctan-o-mat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctanbib-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctanupload-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctie-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cweb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-de-macro-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxgen-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvi2tty-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviasm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvicopy-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvidvi-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviinfox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviout-util-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviljk-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvipos-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-findhyph-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fragmaster-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hook-pre-commit-pkg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-installfont-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ketcindy-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lacheck-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-git-log-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-papersize-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2man-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2nemeth-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexfileversion-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexpand-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexindent-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxfileinfo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltximg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listings-ext-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-make4ht-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-match_parens-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mflua-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mkjobtexmf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patgen-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfbook2-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcrop-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdflatexpicscale-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftex-quiet-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfxup-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftosrc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pfarrei-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pkfix-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pkfix-helper-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-purifyeps-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seetexk-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srcredact-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sty2dtx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-synctex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex4ebook-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texcount-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdef-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdiff-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdirflatten-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texfot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texliveonfly-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-scripts-extra-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texloganalyser-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texosquery-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texplate-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texware-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tie-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tpic2pdftex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typeoutfileinfo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-web-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xindy-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xindex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpdfopen-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-binextra-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gsftopk.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive.infra.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-scripts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-a2ping.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adhocfilelist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arara.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asymptote.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bundledoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-checklistings.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chklref.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctan_chk.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clojure-pamphlet.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cluttex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctanify.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctan-o-mat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctanbib.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctanupload.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctie.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cweb.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-de-macro.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxgen.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvi2tty.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviasm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvicopy.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvidvi.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviinfox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviljk.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvipos.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviout-util.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-findhyph.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fragmaster.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hook-pre-commit-pkg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-installfont.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ketcindy.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lacheck.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-git-log.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-papersize.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2man.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2nemeth.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexfileversion.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexpand.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexindent.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxfileinfo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltximg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listings-ext.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-make4ht.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-match_parens.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mkjobtexmf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patgen.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfbook2.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcrop.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdflatexpicscale.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftex-quiet.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfxup.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftosrc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pfarrei.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pkfix.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pkfix-helper.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-purifyeps.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pythontex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seetexk.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srcredact.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sty2dtx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-synctex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex4ebook.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texcount.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdef.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdiff.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdirflatten.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texfot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texliveonfly.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-scripts-extra.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texloganalyser.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texosquery.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texware.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tie.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tpic2pdftex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typeoutfileinfo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texplate.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-web.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xindy.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xindex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpdfopen.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adhocfilelist.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arara.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-checklistings.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clojure-pamphlet.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listings-ext.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mkjobtexmf.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pfarrei.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pythontex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdef.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texosquery.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texplate.source-2020.tar.xz )
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	texlive-common	3438add11e8232d1fa32884e5e278bfe	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	texlive-common	0eca2ea110130453e0124f83ce50c408	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=594850dfffdfbf888115b39b34c8db23
diff --git a/metadata/md5-cache/app-text/txt2man-1.7.1 b/metadata/md5-cache/app-text/txt2man-1.7.1
new file mode 100644
index 000000000000..7ff5c5c3994f
--- /dev/null
+++ b/metadata/md5-cache/app-text/txt2man-1.7.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Scripts to convert regular ASCII text to man pages
+EAPI=7
+HOMEPAGE=https://github.com/mvertes/txt2man
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+LICENSE=GPL-2
+RDEPEND=app-shells/bash sys-apps/gawk
+SLOT=0
+SRC_URI=https://github.com/mvertes/txt2man/archive/txt2man-1.7.1.tar.gz
+_md5_=ccaccf0fd036674c0f279e980d71cfb7
diff --git a/metadata/md5-cache/app-text/vgrep-2.3.1 b/metadata/md5-cache/app-text/vgrep-2.3.1
new file mode 100644
index 000000000000..07839cf7aba7
--- /dev/null
+++ b/metadata/md5-cache/app-text/vgrep-2.3.1
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=A pager for grep, git-grep and similar grep implementations
+EAPI=7
+HOMEPAGE=https://github.com/vrothberg/vgrep
+KEYWORDS=~amd64
+LICENSE=BSD GPL-3+ MIT MIT-with-advertising
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/vrothberg/vgrep/archive/v2.3.1.tar.gz -> vgrep-2.3.1.tar.gz
+_eclasses_=go-module	45394825d9260b479aa1cf252ea58e01
+_md5_=ef198f4434d5fcaddf2a769249c93b85
diff --git a/metadata/md5-cache/app-text/xapers-0.8.2-r1 b/metadata/md5-cache/app-text/xapers-0.8.2-r1
new file mode 100644
index 000000000000..4b22852f1880
--- /dev/null
+++ b/metadata/md5-cache/app-text/xapers-0.8.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( app-text/poppler[utils] dev-libs/xapian-bindings[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/pybtex[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pycurl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/urwid[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] x11-misc/xclip x11-misc/xdg-utils ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_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-42.0.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=Personal document indexing system
+EAPI=7
+HOMEPAGE=https://finestructure.net/xapers/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=app-text/poppler[utils] dev-libs/xapian-bindings[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/pybtex[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pycurl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/urwid[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] x11-misc/xclip x11-misc/xdg-utils python_targets_python3_6? ( dev-lang/python:3.6 ) python_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-42.0.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://finestructure.net/xapers/releases/xapers-0.8.2.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6f58959941b6a13212752e01f2d14b5e
diff --git a/metadata/md5-cache/app-text/xiphos-4.0.6a-r2 b/metadata/md5-cache/app-text/xiphos-4.0.6a-r2
index 59852386eb03..2ee6cc24bee4 100644
--- a/metadata/md5-cache/app-text/xiphos-4.0.6a-r2
+++ b/metadata/md5-cache/app-text/xiphos-4.0.6a-r2
@@ -2,7 +2,7 @@ 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 app-text/gnome-doc-utils dev-libs/libxslt
 DESCRIPTION=A bible study frontend for Sword (formerly known as GnomeSword)
 EAPI=6
-HOMEPAGE=http://xiphos.org/
+HOMEPAGE=https://xiphos.org/
 IUSE=dbus debug +python_single_target_python2_7
 KEYWORDS=amd64
 LICENSE=GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1
@@ -11,4 +11,4 @@ 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f543db588feffca042cde76df9b24c76
+_md5_=adb583c3ba2dbee712dcc3bea06fb175
diff --git a/metadata/md5-cache/app-text/xiphos-4.1.0-r2 b/metadata/md5-cache/app-text/xiphos-4.1.0-r2
index f2c5346225ca..26e4e27b3650 100644
--- a/metadata/md5-cache/app-text/xiphos-4.1.0-r2
+++ b/metadata/md5-cache/app-text/xiphos-4.1.0-r2
@@ -2,7 +2,7 @@ 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 app-text/gnome-doc-utils dev-libs/libxslt
 DESCRIPTION=A bible study frontend for Sword (formerly known as GnomeSword)
 EAPI=6
-HOMEPAGE=http://xiphos.org/
+HOMEPAGE=https://xiphos.org/
 IUSE=dbus debug +python_single_target_python2_7
 KEYWORDS=~amd64
 LICENSE=GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1
@@ -11,4 +11,4 @@ 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ad95fe05abed6ca1a52d9016f8d7f045
+_md5_=2210d3ac0b9f4f43ffebc2b79c10e139
diff --git a/metadata/md5-cache/app-text/zathura-0.4.3 b/metadata/md5-cache/app-text/zathura-0.4.3
index 1faf9c215ed4..0b8746a3b903 100644
--- a/metadata/md5-cache/app-text/zathura-0.4.3
+++ b/metadata/md5-cache/app-text/zathura-0.4.3
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install test
 DEPEND=>=dev-libs/girara-0.3.2 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8 x11-libs/cairo[X] >=x11-libs/gtk+-3.22:3 magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core )
 DESCRIPTION=A highly customizable and functional document viewer
 EAPI=7
-HOMEPAGE=http://pwmt.org/projects/zathura/
+HOMEPAGE=https://pwmt.org/projects/zathura/
 IUSE=doc +magic seccomp sqlite synctex test test
 KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux
 LICENSE=ZLIB
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pwmt.org/projects/zathura/download/zathura-0.4.3.tar.xz
 _eclasses_=meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=e580603c7b894a6f339c72335b0898da
+_md5_=e2bd346aea818ed46f91a92b27c8e36f
diff --git a/metadata/md5-cache/app-text/zathura-0.4.4 b/metadata/md5-cache/app-text/zathura-0.4.4
index 82215cb5af0d..3d77bf8c2abc 100644
--- a/metadata/md5-cache/app-text/zathura-0.4.4
+++ b/metadata/md5-cache/app-text/zathura-0.4.4
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install test
 DEPEND=>=dev-libs/girara-0.3.3 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8 x11-libs/cairo[X] >=x11-libs/gtk+-3.22:3 magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core )
 DESCRIPTION=A highly customizable and functional document viewer
 EAPI=7
-HOMEPAGE=http://pwmt.org/projects/zathura/
+HOMEPAGE=https://pwmt.org/projects/zathura/
 IUSE=doc +magic seccomp sqlite synctex test test
 KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux
 LICENSE=ZLIB
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pwmt/zathura/archive/0.4.4.tar.gz -> zathura-0.4.4.tar.gz
 _eclasses_=meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=8dfec523b2d78e2aa74068f237f98c93
+_md5_=bbff2bfed586972baac0f6a8710e9eab
diff --git a/metadata/md5-cache/app-text/zathura-0.4.5 b/metadata/md5-cache/app-text/zathura-0.4.5
index 4a4c2312b88e..be26faf76691 100644
--- a/metadata/md5-cache/app-text/zathura-0.4.5
+++ b/metadata/md5-cache/app-text/zathura-0.4.5
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install test
 DEPEND=>=dev-libs/girara-0.3.3 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8 x11-libs/cairo[X] >=x11-libs/gtk+-3.22:3 magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core )
 DESCRIPTION=A highly customizable and functional document viewer
 EAPI=7
-HOMEPAGE=http://pwmt.org/projects/zathura/
+HOMEPAGE=https://pwmt.org/projects/zathura/
 IUSE=doc +magic seccomp sqlite synctex test test
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=ZLIB
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pwmt/zathura/archive/0.4.5.tar.gz -> zathura-0.4.5.tar.gz
 _eclasses_=meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=5b6c670f780183d8244108db17781b1d
+_md5_=df0e6acc43a32e57d82cfa1740a7bcc3
diff --git a/metadata/md5-cache/app-text/zathura-9999 b/metadata/md5-cache/app-text/zathura-9999
index 0c95d2bba58f..dcbef727b811 100644
--- a/metadata/md5-cache/app-text/zathura-9999
+++ b/metadata/md5-cache/app-text/zathura-9999
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install test unpack
 DEPEND=>=dev-libs/girara-0.3.3 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8 x11-libs/cairo[X] >=x11-libs/gtk+-3.22:3 magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core )
 DESCRIPTION=A highly customizable and functional document viewer
 EAPI=7
-HOMEPAGE=http://pwmt.org/projects/zathura/
+HOMEPAGE=https://pwmt.org/projects/zathura/
 IUSE=doc +magic seccomp sqlite synctex test test
 LICENSE=ZLIB
 PROPERTIES=live
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/girara-0.3.3 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=85992c70d257639a522132ffd319245b
+_md5_=df0e6acc43a32e57d82cfa1740a7bcc3
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index a9ac546a510e..8c8b5f6f0c1c 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/easytags-3.11-r1 b/metadata/md5-cache/app-vim/easytags-3.11-r1
new file mode 100644
index 000000000000..3a659d5f5cbe
--- /dev/null
+++ b/metadata/md5-cache/app-vim/easytags-3.11-r1
@@ -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: automated tag file generation and syntax highlighting
+EAPI=7
+HOMEPAGE=http://peterodding.com/code/vim/easytags/
+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-vim/vim-misc dev-util/ctags || ( >=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/xolox/vim-easytags/archive/3.11.tar.gz -> easytags-3.11.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=63349117b0f1ee20c50981ae71e8552a
diff --git a/metadata/md5-cache/app-vim/exheres-syntax-20090310 b/metadata/md5-cache/app-vim/exheres-syntax-20090310
index af962c9575d9..f4e62cd93e9e 100644
--- a/metadata/md5-cache/app-vim/exheres-syntax-20090310
+++ b/metadata/md5-cache/app-vim/exheres-syntax-20090310
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: exheres format highlighting
 EAPI=6
-HOMEPAGE=http://www.exherbo.org/
+HOMEPAGE=https://www.exherbo.org/
 KEYWORDS=~amd64 ~x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-SRC_URI=http://dev.exherbo.org/~ahf/pub/software/releases/exheres-syntax/exheres-syntax-20090310.tar.bz2
+SRC_URI=https://dev.exherbo.org/~ahf/pub/software/releases/exheres-syntax/exheres-syntax-20090310.tar.bz2
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=265d66dc37cf157794768e4217a1a6f8
+_md5_=f77857d5b56964ead1fd59063f6eb9ab
diff --git a/metadata/md5-cache/app-vim/exheres-syntax-99999999 b/metadata/md5-cache/app-vim/exheres-syntax-99999999
index 41a9dbc71f8c..37d3583415a3 100644
--- a/metadata/md5-cache/app-vim/exheres-syntax-99999999
+++ b/metadata/md5-cache/app-vim/exheres-syntax-99999999
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm prepare unpack
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=vim plugin: exheres format highlighting
 EAPI=6
-HOMEPAGE=http://www.exherbo.org/
+HOMEPAGE=https://www.exherbo.org/
 LICENSE=vim
 PROPERTIES=live
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=3c325aebcc92c0af88dd128fa8aae813
+_md5_=d76a0ee6966dfda974d3acd75f3dea14
diff --git a/metadata/md5-cache/app-vim/gitgutter-99999999 b/metadata/md5-cache/app-vim/gitgutter-99999999
index 245343acf9a3..4ea3f087d466 100644
--- a/metadata/md5-cache/app-vim/gitgutter-99999999
+++ b/metadata/md5-cache/app-vim/gitgutter-99999999
@@ -8,4 +8,4 @@ PROPERTIES=live
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=890112afbdebdf52965ff8fedd6601a4
+_md5_=a5b8a776d864460c8b0bd46c98929fcc
diff --git a/metadata/md5-cache/app-vim/notes-0.33.4 b/metadata/md5-cache/app-vim/notes-0.33.4
deleted file mode 100644
index 8cd503fc7b73..000000000000
--- a/metadata/md5-cache/app-vim/notes-0.33.4
+++ /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: easy note taking in vim
-EAPI=5
-HOMEPAGE=http://peterodding.com/code/vim/notes/
-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 )
-SLOT=0
-SRC_URI=https://github.com/xolox/vim-notes/archive/0.33.4.tar.gz -> notes-0.33.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=8029c0059bda23ccf3f7d1d39d13b5ab
diff --git a/metadata/md5-cache/app-vim/notes-0.33.4-r1 b/metadata/md5-cache/app-vim/notes-0.33.4-r1
new file mode 100644
index 000000000000..4330eb225e03
--- /dev/null
+++ b/metadata/md5-cache/app-vim/notes-0.33.4-r1
@@ -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: easy note taking in vim
+EAPI=7
+HOMEPAGE=http://peterodding.com/code/vim/notes/
+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[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] ) app-vim/vim-misc || ( >=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/xolox/vim-notes/archive/0.33.4.tar.gz -> notes-0.33.4.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=a8a50dc3c5a58b36672690ec127df7a0
diff --git a/metadata/md5-cache/app-vim/pyclewn-2.1-r1 b/metadata/md5-cache/app-vim/pyclewn-2.1-r1
deleted file mode 100644
index 0f82053f5b30..000000000000
--- a/metadata/md5-cache/app-vim/pyclewn-2.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[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_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-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	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bc6563f7246a7965045216bbcd3b84f0
diff --git a/metadata/md5-cache/app-vim/pyclewn-2.1-r2 b/metadata/md5-cache/app-vim/pyclewn-2.1-r2
new file mode 100644
index 000000000000..2c73fe8752a0
--- /dev/null
+++ b/metadata/md5-cache/app-vim/pyclewn-2.1-r2
@@ -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-42.0.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 postinst postrm prepare test
+DEPEND=|| ( app-editors/vim app-editors/gvim[netbeans] ) app-arch/vimball || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=Pyclewn allows using vim as a front end to a debugger (pdb or gdb)
+EAPI=7
+HOMEPAGE=http://pyclewn.sourceforge.net/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=|| ( app-editors/vim app-editors/gvim[netbeans] ) app-arch/vimball || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_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 ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pyclewn/pyclewn-2.1.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	estack	686eaab303305a908fd57b2fd7617800	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=87729232ce153c7eac3394ff797678ba
diff --git a/metadata/md5-cache/app-vim/vim-latex-1.10.0-r2 b/metadata/md5-cache/app-vim/vim-latex-1.10.0-r2
new file mode 100644
index 000000000000..779ddb72c1f0
--- /dev/null
+++ b/metadata/md5-cache/app-vim/vim-latex-1.10.0-r2
@@ -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=7
+HOMEPAGE=http://vim-latex.sourceforge.net/
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+LICENSE=vim
+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(-)?] ) virtual/latex-base !app-vim/vimtex || ( >=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=mirror://sourceforge/vim-latex/vim-latex-1.10.0.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=21c90546673e1619da8c4d552cb6072c
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
index 3dc5c7912703..ec9fd9571bcb 100644
--- a/metadata/md5-cache/app-vim/vimoutliner-0.4.0_p20180301-r2
+++ b/metadata/md5-cache/app-vim/vimoutliner-0.4.0_p20180301-r2
@@ -1,14 +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 )
+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/autopep8[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/autopep8[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/autopep8[python_targets_python3_8(-)] ) || ( >=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
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64 ~ia64 ~ppc ~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] ) 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 )
+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/autopep8[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/autopep8[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/autopep8[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://github.com/vimoutliner/vimoutliner/archive/4f12628247940d98eedd594961695dc504261058.tar.gz -> vimoutliner-0.4.0_p20180301.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=a9d43245cd7753c72e94c187f2bf796c
+_md5_=3513e4ad9e0278343b1fc808819e5f7b
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index bb12be0681b4..28e02f1aa7bb 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/gnatcoll-bindings-2020 b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2020
index e0eee8e6c198..23ba174245ee 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2020
+++ b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2020
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) ) ^^ ( ada_target_g
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/3c54db553121bf88877e2f56ac4fca36765186eb?filename=gnatcoll-bindings-20.0-20191009-1B2EA-src.tar.gz -> gnatcoll-bindings-20.0-20191009-1B2EA-src.tar.gz
 _eclasses_=ada	9205d12ceb057a9282bea2a773e7c681	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=92e3efd7a017a702c3844443b9ac4b6c
+_md5_=5c08e2527e62d8af90029bf29a31c61d
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index dc081425cffc..518413373c6c 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/catch-1.12.2 b/metadata/md5-cache/dev-cpp/catch-1.12.2
index cb229eae594e..2ad1bcba88a8 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 ~ppc64 x86
+KEYWORDS=amd64 ~arm ~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	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=00086a79cd26692511b109fb840fc8ab
+_md5_=ed90045ef683b255c566dcbe3cfccb0a
diff --git a/metadata/md5-cache/dev-cpp/catch-2.9.1 b/metadata/md5-cache/dev-cpp/catch-2.9.1
index ad10a2805db8..ef5d50716f3d 100644
--- a/metadata/md5-cache/dev-cpp/catch-2.9.1
+++ b/metadata/md5-cache/dev-cpp/catch-2.9.1
@@ -4,10 +4,10 @@ DESCRIPTION=Modern C++ header-only framework for unit-tests
 EAPI=7
 HOMEPAGE=https://github.com/catchorg/Catch2
 IUSE=test
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
 LICENSE=Boost-1.0
 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	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=56ee55fd45be2f084b2d21cb3d758079
+_md5_=5252b969dafff042a5a99a7d33c6a45c
diff --git a/metadata/md5-cache/dev-cpp/mm-common-1.0.0 b/metadata/md5-cache/dev-cpp/mm-common-1.0.0
index f39cb4dac6e6..9c07205b9f30 100644
--- a/metadata/md5-cache/dev-cpp/mm-common-1.0.0
+++ b/metadata/md5-cache/dev-cpp/mm-common-1.0.0
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Build infrastructure and utilities for GNOME C++ bindings
 EAPI=7
 HOMEPAGE=https://www.gtkmm.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnome/sources/mm-common/1.0/mm-common-1.0.0.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=110231ac942e441b10c201eaea946e81
+_md5_=631c53f8ea0309e961f47441118c45e4
diff --git a/metadata/md5-cache/dev-cpp/waylandpp-0.2.7 b/metadata/md5-cache/dev-cpp/waylandpp-0.2.7
index e5513d7543d9..354f5072d657 100644
--- a/metadata/md5-cache/dev-cpp/waylandpp-0.2.7
+++ b/metadata/md5-cache/dev-cpp/waylandpp-0.2.7
@@ -5,10 +5,10 @@ DESCRIPTION=Wayland C++ bindings
 EAPI=7
 HOMEPAGE=https://github.com/NilsBrause/waylandpp
 IUSE=doc
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/wayland-1.11.0 media-libs/mesa[wayland] >=dev-libs/pugixml-1.9-r1
 SLOT=0/0.2
 SRC_URI=https://github.com/NilsBrause/waylandpp/archive/0.2.7.tar.gz -> waylandpp-0.2.7.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=35de2b3f75525978287298d91587c8f3
+_md5_=45d01a4335a48654ab2cb9718bde94d7
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index e742f06b19e6..5e0aefcf3e9b 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/bucardo-5.4.1 b/metadata/md5-cache/dev-db/bucardo-5.4.1
index d428bfe85541..c32210c9f57d 100644
--- a/metadata/md5-cache/dev-db/bucardo-5.4.1
+++ b/metadata/md5-cache/dev-db/bucardo-5.4.1
@@ -9,5 +9,5 @@ RDEPEND=dev-perl/DBIx-Safe dev-lang/perl:=[-build(-)]
 RESTRICT=test
 SLOT=0
 SRC_URI=http://bucardo.org/downloads/Bucardo-5.4.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b73bab92ca8470a8b0dd6fd2aed6a446
diff --git a/metadata/md5-cache/dev-db/clickhouse-18.10.3-r1 b/metadata/md5-cache/dev-db/clickhouse-18.10.3-r1
deleted file mode 100644
index 663ba35685ac..000000000000
--- a/metadata/md5-cache/dev-db/clickhouse-18.10.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend test unpack
-DEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:0 sys-libs/zlib || ( dev-db/unixODBC dev-libs/poco[odbc] ) dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= dev-libs/zookeeper-c kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre doc? ( >=dev-python/mkdocs-1.0.1 ) static? ( >=app-arch/lz4-1.8.0[static-libs] >=app-arch/zstd-1.3.4[static-libs] client? ( sys-libs/ncurses:0=[static-libs] sys-libs/readline:0=[static-libs] ) dev-libs/capnproto[static-libs] dev-libs/libltdl[static-libs] sys-libs/libunwind:0[static-libs] sys-libs/zlib[static-libs] || ( dev-db/unixODBC[static-libs] dev-libs/poco[odbc] ) dev-libs/icu[static-libs] dev-libs/glib[static-libs] >=dev-libs/boost-1.65.0[static-libs] dev-libs/openssl[static-libs] dev-libs/zookeeper-c[static-libs] dev-db/mysql-connector-c[static-libs] kafka? ( dev-libs/librdkafka[static-libs] ) ) sys-libs/libtermcap-compat dev-util/patchelf >=sys-devel/lld-6.0.0 || ( >=sys-devel/gcc-7.0 >=sys-devel/clang-6.0 ) dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=An OSS column-oriented database management system for real-time data analysis
-EAPI=6
-HOMEPAGE=https://clickhouse.yandex
-IUSE=+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools zookeeper
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:0 sys-libs/zlib || ( dev-db/unixODBC dev-libs/poco[odbc] ) dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= dev-libs/zookeeper-c kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre
-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	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7d429f78c951e3a0316852ad5469f791
diff --git a/metadata/md5-cache/dev-db/clickhouse-18.12.17-r1 b/metadata/md5-cache/dev-db/clickhouse-18.12.17-r1
deleted file mode 100644
index f5b5d7b030b3..000000000000
--- a/metadata/md5-cache/dev-db/clickhouse-18.12.17-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend test unpack
-DEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:0 sys-libs/zlib || ( dev-db/unixODBC dev-libs/poco[odbc] ) dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre doc? ( >=dev-python/mkdocs-1.0.1 ) static? ( >=app-arch/lz4-1.8.0[static-libs] >=app-arch/zstd-1.3.4[static-libs] client? ( sys-libs/ncurses:0=[static-libs] sys-libs/readline:0=[static-libs] ) dev-libs/capnproto[static-libs] dev-libs/libltdl[static-libs] sys-libs/libunwind:0[static-libs] sys-libs/zlib[static-libs] || ( dev-db/unixODBC[static-libs] dev-libs/poco[odbc] ) dev-libs/icu[static-libs] dev-libs/glib[static-libs] >=dev-libs/boost-1.65.0[static-libs] dev-libs/openssl[static-libs] dev-db/mysql-connector-c[static-libs] kafka? ( dev-libs/librdkafka[static-libs] ) ) sys-libs/libtermcap-compat dev-util/patchelf >=sys-devel/lld-6.0.0 || ( >=sys-devel/gcc-7.0 >=sys-devel/clang-6.0 ) dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=An OSS column-oriented database management system for real-time data analysis
-EAPI=6
-HOMEPAGE=https://clickhouse.yandex
-IUSE=+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:0 sys-libs/zlib || ( dev-db/unixODBC dev-libs/poco[odbc] ) dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre
-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	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0dbf159de023507eb8735018d9011ec6
diff --git a/metadata/md5-cache/dev-db/clickhouse-18.6.0-r1 b/metadata/md5-cache/dev-db/clickhouse-18.6.0-r1
deleted file mode 100644
index b374128031a0..000000000000
--- a/metadata/md5-cache/dev-db/clickhouse-18.6.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend test unpack
-DEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:0 sys-libs/zlib || ( dev-db/unixODBC dev-libs/poco[odbc] ) dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= dev-libs/zookeeper-c kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre doc? ( >=dev-python/mkdocs-0.17.3 ) static? ( >=app-arch/lz4-1.8.0[static-libs] >=app-arch/zstd-1.3.4[static-libs] client? ( sys-libs/ncurses:0=[static-libs] sys-libs/readline:0=[static-libs] ) dev-libs/capnproto[static-libs] dev-libs/libltdl[static-libs] sys-libs/libunwind:0[static-libs] sys-libs/zlib[static-libs] || ( dev-db/unixODBC[static-libs] dev-libs/poco[odbc] ) dev-libs/icu[static-libs] dev-libs/glib[static-libs] >=dev-libs/boost-1.65.0[static-libs] dev-libs/openssl[static-libs] dev-libs/zookeeper-c[static-libs] dev-db/mysql-connector-c[static-libs] kafka? ( dev-libs/librdkafka[static-libs] ) ) sys-libs/libtermcap-compat dev-util/patchelf >=sys-devel/lld-6.0.0 || ( >=sys-devel/gcc-7.0 >=sys-devel/clang-6.0 ) dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=An OSS column-oriented database management system for real-time data analysis
-EAPI=6
-HOMEPAGE=https://clickhouse.yandex
-IUSE=+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools zookeeper
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:0 sys-libs/zlib || ( dev-db/unixODBC dev-libs/poco[odbc] ) dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= dev-libs/zookeeper-c kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre
-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	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=08b57d7c4f0f932832dbe6985c30c179
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
deleted file mode 100644
index 85735d38ea2c..000000000000
--- a/metadata/md5-cache/dev-db/clickhouse-19.13.1.11-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend test unpack
-DEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:0 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre dev-libs/jemalloc dev-libs/protobuf doc? ( >=dev-python/mkdocs-1.0.1 ) static? ( >=app-arch/lz4-1.8.0[static-libs] >=app-arch/zstd-1.3.4[static-libs] client? ( sys-libs/ncurses:0=[static-libs] sys-libs/readline:0=[static-libs] ) dev-libs/capnproto[static-libs] dev-libs/libltdl[static-libs] sys-libs/libunwind:0[static-libs] sys-libs/zlib[static-libs] || ( dev-db/unixODBC[static-libs] dev-libs/poco[odbc] ) dev-libs/icu[static-libs] dev-libs/glib[static-libs] >=dev-libs/boost-1.65.0[static-libs] dev-libs/openssl[static-libs] dev-db/mysql-connector-c[static-libs] kafka? ( dev-libs/librdkafka[static-libs] ) ) sys-libs/libtermcap-compat dev-util/patchelf >=sys-devel/lld-6.0.0 >=sys-devel/gcc-7.0 >=sys-devel/clang-6.0 dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=An OSS column-oriented database management system for real-time data analysis
-EAPI=6
-HOMEPAGE=https://clickhouse.yandex
-IUSE=+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:0 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre dev-libs/jemalloc dev-libs/protobuf
-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	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=19a2fcf7f0aeee6acd606668ce672c29
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
deleted file mode 100644
index 25a51555c4ac..000000000000
--- a/metadata/md5-cache/dev-db/clickhouse-19.13.1.11-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend test unpack
-DEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:0 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre dev-libs/jemalloc dev-libs/protobuf doc? ( >=dev-python/mkdocs-1.0.1 ) static? ( >=app-arch/lz4-1.8.0[static-libs] >=app-arch/zstd-1.3.4[static-libs] client? ( sys-libs/ncurses:0=[static-libs] sys-libs/readline:0=[static-libs] ) dev-libs/capnproto[static-libs] dev-libs/libltdl[static-libs] sys-libs/libunwind:0[static-libs] sys-libs/zlib[static-libs] || ( dev-db/unixODBC[static-libs] dev-libs/poco[odbc] ) dev-libs/icu[static-libs] dev-libs/glib[static-libs] >=dev-libs/boost-1.65.0[static-libs] dev-libs/openssl[static-libs] dev-db/mysql-connector-c[static-libs] kafka? ( dev-libs/librdkafka[static-libs] ) ) =dev-cpp/gtest-1.8* sys-libs/libtermcap-compat dev-util/patchelf >=sys-devel/lld-6.0.0 >=sys-devel/gcc-7.0 >=sys-devel/clang-6.0 dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=An OSS column-oriented database management system for real-time data analysis
-EAPI=6
-HOMEPAGE=https://clickhouse.yandex
-IUSE=+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:0 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre dev-libs/jemalloc dev-libs/protobuf
-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	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ac4e07fbf0a497afab8ce5e3cc03a4cb
diff --git a/metadata/md5-cache/dev-db/clickhouse-19.15.2.2 b/metadata/md5-cache/dev-db/clickhouse-19.15.2.2
deleted file mode 100644
index 17d056054844..000000000000
--- a/metadata/md5-cache/dev-db/clickhouse-19.15.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend test unpack
-DEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:0 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre dev-libs/jemalloc dev-libs/protobuf dev-cpp/sparsehash doc? ( >=dev-python/mkdocs-1.0.1 ) static? ( >=app-arch/lz4-1.8.0[static-libs] >=app-arch/zstd-1.3.4[static-libs] client? ( sys-libs/ncurses:0=[static-libs] sys-libs/readline:0=[static-libs] ) dev-libs/capnproto[static-libs] dev-libs/libltdl[static-libs] sys-libs/libunwind:0[static-libs] sys-libs/zlib[static-libs] || ( dev-db/unixODBC[static-libs] dev-libs/poco[odbc] ) dev-libs/icu[static-libs] dev-libs/glib[static-libs] >=dev-libs/boost-1.65.0[static-libs] dev-libs/openssl[static-libs] dev-db/mysql-connector-c[static-libs] kafka? ( dev-libs/librdkafka[static-libs] ) ) =dev-cpp/gtest-1.8* sys-libs/libtermcap-compat dev-util/patchelf >=sys-devel/lld-6.0.0 >=sys-devel/gcc-7.0 >=sys-devel/clang-6.0 dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=An OSS column-oriented database management system for real-time data analysis
-EAPI=6
-HOMEPAGE=https://clickhouse.yandex
-IUSE=+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:0 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre dev-libs/jemalloc dev-libs/protobuf dev-cpp/sparsehash
-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	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b48dccbdd21581c2066e0ef8ae9e5e58
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
deleted file mode 100644
index 6bf2a0e082c3..000000000000
--- a/metadata/md5-cache/dev-db/clickhouse-19.5.3.8-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend test unpack
-DEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:0 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre dev-libs/jemalloc doc? ( >=dev-python/mkdocs-1.0.1 ) static? ( >=app-arch/lz4-1.8.0[static-libs] >=app-arch/zstd-1.3.4[static-libs] client? ( sys-libs/ncurses:0=[static-libs] sys-libs/readline:0=[static-libs] ) dev-libs/capnproto[static-libs] dev-libs/libltdl[static-libs] sys-libs/libunwind:0[static-libs] sys-libs/zlib[static-libs] || ( dev-db/unixODBC[static-libs] dev-libs/poco[odbc] ) dev-libs/icu[static-libs] dev-libs/glib[static-libs] >=dev-libs/boost-1.65.0[static-libs] dev-libs/openssl[static-libs] dev-db/mysql-connector-c[static-libs] kafka? ( dev-libs/librdkafka[static-libs] ) ) sys-libs/libtermcap-compat dev-util/patchelf >=sys-devel/lld-6.0.0 >=sys-devel/gcc-7.0 >=sys-devel/clang-6.0 dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=An OSS column-oriented database management system for real-time data analysis
-EAPI=6
-HOMEPAGE=https://clickhouse.yandex
-IUSE=+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:0 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre dev-libs/jemalloc
-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	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=90428c55b68730cfff2982e118a4bc4b
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
deleted file mode 100644
index b0fa6bf3b7b9..000000000000
--- a/metadata/md5-cache/dev-db/clickhouse-19.9.5.36-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend test unpack
-DEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:0 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre dev-libs/jemalloc doc? ( >=dev-python/mkdocs-1.0.1 ) static? ( >=app-arch/lz4-1.8.0[static-libs] >=app-arch/zstd-1.3.4[static-libs] client? ( sys-libs/ncurses:0=[static-libs] sys-libs/readline:0=[static-libs] ) dev-libs/capnproto[static-libs] dev-libs/libltdl[static-libs] sys-libs/libunwind:0[static-libs] sys-libs/zlib[static-libs] || ( dev-db/unixODBC[static-libs] dev-libs/poco[odbc] ) dev-libs/icu[static-libs] dev-libs/glib[static-libs] >=dev-libs/boost-1.65.0[static-libs] dev-libs/openssl[static-libs] dev-db/mysql-connector-c[static-libs] kafka? ( dev-libs/librdkafka[static-libs] ) ) sys-libs/libtermcap-compat dev-util/patchelf >=sys-devel/lld-6.0.0 >=sys-devel/gcc-7.0 >=sys-devel/clang-6.0 dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=An OSS column-oriented database management system for real-time data analysis
-EAPI=6
-HOMEPAGE=https://clickhouse.yandex
-IUSE=+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:0 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre dev-libs/jemalloc
-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	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=90428c55b68730cfff2982e118a4bc4b
diff --git a/metadata/md5-cache/dev-db/mariadb-connector-c-3.1.9 b/metadata/md5-cache/dev-db/mariadb-connector-c-3.1.9
new file mode 100644
index 000000000000..fdabd1ea949e
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mariadb-connector-c-3.1.9
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( || ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ssl? ( gnutls? ( >=net-libs/gnutls-3.3.24:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnutls? ( libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) )
+DESCRIPTION=C client library for MariaDB/MySQL
+EAPI=7
+HOMEPAGE=https://mariadb.org/
+IUSE=+curl gnutls kerberos libressl +ssl 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 ~ppc ppc64 s390 sparc x86
+LICENSE=LGPL-2.1
+RDEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( || ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ssl? ( gnutls? ( >=net-libs/gnutls-3.3.24:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnutls? ( libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) )
+RESTRICT=!test? ( test )
+SLOT=0/3
+SRC_URI=https://downloads.mariadb.org/f/connector-c-3.1.9/mariadb-connector-c-3.1.9-src.tar.gz?serve -> mariadb-connector-c-3.1.9-src.tar.gz
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=16f66cb6115a7988e25825161bc1f881
diff --git a/metadata/md5-cache/dev-db/mongodb-4.0.19 b/metadata/md5-cache/dev-db/mongodb-4.0.19
new file mode 100644
index 000000000000..c0a46735ec20
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mongodb-4.0.19
@@ -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 test? ( dev-python/pymongo[python_targets_python2_7(-),python_single_target_python2_7(+)] ) >=dev-util/scons-2.5.0[python_targets_python2_7(-),python_single_target_python2_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(+)] dev-python/typing[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) sys-libs/ncurses:0= sys-libs/readline:0= debug? ( dev-util/valgrind )
+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.19 )
+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.19.tar.gz
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c19a1f7d741472dfa48ac36100315ce3
diff --git a/metadata/md5-cache/dev-db/mongodb-4.2.8 b/metadata/md5-cache/dev-db/mongodb-4.2.8
new file mode 100644
index 000000000000..acea71762413
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mongodb-4.2.8
@@ -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 test? ( dev-python/pymongo[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/requests[python_targets_python3_7(-),python_single_target_python3_7(+)] ) >=dev-util/scons-2.5.0[python_targets_python3_7(-),python_single_target_python3_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(+)] ) ( dev-lang/python:3.6 test? ( dev-python/pymongo[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/requests[python_targets_python3_6(-),python_single_target_python3_6(+)] ) >=dev-util/scons-2.5.0[python_targets_python3_6(-),python_single_target_python3_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(+)] ) ) sys-libs/ncurses:0= sys-libs/readline:0= debug? ( dev-util/valgrind )
+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 ~arm64
+LICENSE=Apache-2.0 SSPL-1
+PDEPEND=tools? ( >=app-admin/mongo-tools-4.2.8 )
+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.8.tar.gz
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d71e02fc082ca7fe729b9c03b18abfe5
diff --git a/metadata/md5-cache/dev-db/mtop-0.6.6-r3 b/metadata/md5-cache/dev-db/mtop-0.6.6-r3
index ea94ded99535..99ec845949c2 100644
--- a/metadata/md5-cache/dev-db/mtop-0.6.6-r3
+++ b/metadata/md5-cache/dev-db/mtop-0.6.6-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/Curses dev-perl/DBI dev-perl/DBD-mysql virtual/perl-libnet dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/mtop/mtop-0.6.6.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=541b72bf1ad1eefceba3ac44369a4c62
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 d3fb25eff0bf..81810e6bd8b0 100644
--- a/metadata/md5-cache/dev-db/mysql-5.7.27-r1
+++ b/metadata/md5-cache/dev-db/mysql-5.7.27-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.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	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=45348d3632cf58f7f5360aae3486326d
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.29 b/metadata/md5-cache/dev-db/mysql-5.7.29
index 74ef23978ff1..92d58a7ba355 100644
--- a/metadata/md5-cache/dev-db/mysql-5.7.29
+++ b/metadata/md5-cache/dev-db/mysql-5.7.29
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc )
 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	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6738fccd590afc56e52638db2ff420af
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.30 b/metadata/md5-cache/dev-db/mysql-5.7.30
index 413d2e4646b0..68d650ed724e 100644
--- a/metadata/md5-cache/dev-db/mysql-5.7.30
+++ b/metadata/md5-cache/dev-db/mysql-5.7.30
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc )
 RESTRICT=!test? ( test ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.30.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.30.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.30.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-5.7.30-patches-01.tar.xz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a2091af7b4fa58a542917f16aef37243
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 d4fb35ec9e2b..186395faf354 100644
--- a/metadata/md5-cache/dev-db/mysql-8.0.19-r1
+++ b/metadata/md5-cache/dev-db/mysql-8.0.19-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa?
 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-20200317-0103Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20200317-0103Z.tar.bz2
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c6c4e63a2c2c221b545f5ed115b658d8
diff --git a/metadata/md5-cache/dev-db/mysql-8.0.20 b/metadata/md5-cache/dev-db/mysql-8.0.20
index 9b9798622b4e..1ca3fb5d9ea0 100644
--- a/metadata/md5-cache/dev-db/mysql-8.0.20
+++ b/metadata/md5-cache/dev-db/mysql-8.0.20
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa?
 RESTRICT=!test? ( test ) libressl? ( test )
 SLOT=0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.20.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.20.tar.gz http://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.20.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-8.0.20-patches-01.tar.xz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e19a26f747589108c05c5cdb32b01fb7
diff --git a/metadata/md5-cache/dev-db/mytop-1.6-r4 b/metadata/md5-cache/dev-db/mytop-1.6-r4
index 5e71cbf28c75..3d17655281f1 100644
--- a/metadata/md5-cache/dev-db/mytop-1.6-r4
+++ b/metadata/md5-cache/dev-db/mytop-1.6-r4
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=dev-perl/DBD-mysql virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://jeremy.zawodny.com/mysql/mytop/mytop-1.6.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0082015e24b2b8fe692281d59fa24da7
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 8b6eca811824..7cf14c777e32 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
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
 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	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1db2d06fce48771a88fd8e7294da293b
diff --git a/metadata/md5-cache/dev-db/percona-server-8.0.19.10 b/metadata/md5-cache/dev-db/percona-server-8.0.19.10
index 6ad574def25e..d66193098e7e 100644
--- a/metadata/md5-cache/dev-db/percona-server-8.0.19.10
+++ b/metadata/md5-cache/dev-db/percona-server-8.0.19.10
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa?
 RESTRICT=!test? ( test ) libressl? ( test )
 SLOT=0
 SRC_URI=https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-8.0.19-10/source/tarball/percona-server-8.0.19-10.tar.gz https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 https://dev.gentoo.org/~whissi/dist/percona-server/percona-server-8.0.19.10-patches-01.tar.xz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c471bd5d375f232f5bef0c518997098f
diff --git a/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.20 b/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.20
new file mode 100644
index 000000000000..38a8e91633a2
--- /dev/null
+++ b/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.20
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/make dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/lz4:0= app-editors/vim-core dev-libs/libaio dev-libs/libedit dev-libs/libev dev-libs/libevent:0= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-python/sphinx net-misc/curl sys-libs/zlib:=
+DESCRIPTION=Hot backup utility for MySQL based servers
+EAPI=7
+HOMEPAGE=https://www.percona.com/software/mysql-database/percona-xtrabackup
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/lz4:0= app-editors/vim-core dev-libs/libaio dev-libs/libedit dev-libs/libev dev-libs/libevent:0= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-python/sphinx net-misc/curl sys-libs/zlib:= !dev-db/percona-xtrabackup-bin dev-perl/DBD-mysql
+SLOT=0
+SRC_URI=https://www.percona.com/downloads/Percona-XtraBackup-2.4/Percona-XtraBackup-2.4.20/source/tarball/percona-xtrabackup-2.4.20.tar.gz mirror://sourceforge/boost/boost_1_59_0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=82767cb2f368769028bdd589d19cbab8
diff --git a/metadata/md5-cache/dev-db/percona-xtrabackup-8.0.13 b/metadata/md5-cache/dev-db/percona-xtrabackup-8.0.13
new file mode 100644
index 000000000000..c19492dc3cd0
--- /dev/null
+++ b/metadata/md5-cache/dev-db/percona-xtrabackup-8.0.13
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/make dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/lz4:0= app-editors/vim-core dev-libs/icu:= dev-libs/libaio dev-libs/libedit dev-libs/libev dev-libs/libevent:0= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-libs/openssl:0= dev-libs/protobuf:= dev-libs/rapidjson dev-libs/re2:= dev-python/sphinx net-misc/curl sys-libs/zlib:=
+DESCRIPTION=Hot backup utility for MySQL based servers
+EAPI=7
+HOMEPAGE=https://www.percona.com/software/mysql-database/percona-xtrabackup
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/lz4:0= app-editors/vim-core dev-libs/icu:= dev-libs/libaio dev-libs/libedit dev-libs/libev dev-libs/libevent:0= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-libs/openssl:0= dev-libs/protobuf:= dev-libs/rapidjson dev-libs/re2:= dev-python/sphinx net-misc/curl sys-libs/zlib:= !dev-db/percona-xtrabackup-bin dev-perl/DBD-mysql
+SLOT=0
+SRC_URI=https://www.percona.com/downloads/Percona-XtraBackup-LATEST/Percona-XtraBackup-8.0-13/source/tarball/percona-xtrabackup-8.0.13.tar.gz mirror://sourceforge/boost/boost_1_70_0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6e7e1a14e4c555822bd6aaf3d63060af
diff --git a/metadata/md5-cache/dev-db/percona-xtrabackup-8.0.7 b/metadata/md5-cache/dev-db/percona-xtrabackup-8.0.7
deleted file mode 100644
index f7dd5c3d7e19..000000000000
--- a/metadata/md5-cache/dev-db/percona-xtrabackup-8.0.7
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/make dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/lz4:0= app-editors/vim-core dev-libs/icu:= dev-libs/libaio dev-libs/libedit dev-libs/libev dev-libs/libevent:0= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-libs/openssl:0= dev-libs/protobuf:= dev-libs/rapidjson dev-libs/re2:= dev-python/sphinx net-misc/curl sys-libs/zlib:=
-DESCRIPTION=Hot backup utility for MySQL based servers
-EAPI=7
-HOMEPAGE=https://www.percona.com/software/mysql-database/percona-xtrabackup
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-arch/lz4:0= app-editors/vim-core dev-libs/icu:= dev-libs/libaio dev-libs/libedit dev-libs/libev dev-libs/libevent:0= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-libs/openssl:0= dev-libs/protobuf:= dev-libs/rapidjson dev-libs/re2:= dev-python/sphinx net-misc/curl sys-libs/zlib:= !dev-db/percona-xtrabackup-bin dev-perl/DBD-mysql
-SLOT=0
-SRC_URI=https://www.percona.com/downloads/Percona-XtraBackup-LATEST/Percona-XtraBackup-8.0-7/source/tarball/percona-xtrabackup-8.0.7.tar.gz mirror://sourceforge/boost/boost_1_69_0.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3db4ba6f4c2c1b32f11a9997ddc9a712
diff --git a/metadata/md5-cache/dev-db/pgmodeler-0.9.1 b/metadata/md5-cache/dev-db/pgmodeler-0.9.1
deleted file mode 100644
index 8681f55f286b..000000000000
--- a/metadata/md5-cache/dev-db/pgmodeler-0.9.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install setup test
-DEPEND=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
-DESCRIPTION=PostgreSQL Database Modeler
-EAPI=6
-HOMEPAGE=https://pgmodeler.io
-IUSE=postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4
-KEYWORDS=~amd64
-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	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	postgres	9613fb90112e2a521b6a8315187c2966	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=014c1df6b0cb8ae5c13631df1a2afdfa
diff --git a/metadata/md5-cache/dev-db/pgxnclient-1.3-r1 b/metadata/md5-cache/dev-db/pgxnclient-1.3-r1
deleted file mode 100644
index f1f0b313b83e..000000000000
--- a/metadata/md5-cache/dev-db/pgxnclient-1.3-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.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-42.0.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=dev-db/postgresql:*[server] 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(-)] test? ( 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/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=PostgreSQL Extension Network Client
-EAPI=7
-HOMEPAGE=http://pgxnclient.projects.postgresql.org/ https://pypi.org/project/pgxnclient
-IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-db/postgresql:*[server] 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-42.0.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? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pgxnclient/pgxnclient-1.3.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1d00d587cf51e817029d6c58350e63e3
diff --git a/metadata/md5-cache/dev-db/pgxnclient-1.3-r2 b/metadata/md5-cache/dev-db/pgxnclient-1.3-r2
new file mode 100644
index 000000000000..e26d3c0aeb01
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pgxnclient-1.3-r2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-db/postgresql:*[server] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=PostgreSQL Extension Network Client
+EAPI=7
+HOMEPAGE=http://pgxnclient.projects.postgresql.org/ https://pypi.org/project/pgxnclient
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-db/postgresql:*[server] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pgxnclient/pgxnclient-1.3.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=364323f5b4a48d137b3f8c1638ba1d66
diff --git a/metadata/md5-cache/dev-db/postgresql-10.12 b/metadata/md5-cache/dev-db/postgresql-10.12
index 2271ea7d569f..86c1ae270c86 100644
--- a/metadata/md5-cache/dev-db/postgresql-10.12
+++ b/metadata/md5-cache/dev-db/postgresql-10.12
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu?
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=10
 SRC_URI=https://ftp.postgresql.org/pub/source/v10.12/postgresql-10.12.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=25743411599c260495070b0a0d4667d5
diff --git a/metadata/md5-cache/dev-db/postgresql-10.13 b/metadata/md5-cache/dev-db/postgresql-10.13
index f5a3c427ae7c..dd9b092d80d7 100644
--- a/metadata/md5-cache/dev-db/postgresql-10.13
+++ b/metadata/md5-cache/dev-db/postgresql-10.13
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postg
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=10
 SRC_URI=https://ftp.postgresql.org/pub/source/v10.13/postgresql-10.13.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=12303a0e359a73f2e031af6d885d7998
diff --git a/metadata/md5-cache/dev-db/postgresql-11.7 b/metadata/md5-cache/dev-db/postgresql-11.7
index 5bd34d47cb91..e0ad22ed51c6 100644
--- a/metadata/md5-cache/dev-db/postgresql-11.7
+++ b/metadata/md5-cache/dev-db/postgresql-11.7
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu?
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=11
 SRC_URI=https://ftp.postgresql.org/pub/source/v11.7/postgresql-11.7.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=e9cbebca8c611a567a42ae1846c0183f
diff --git a/metadata/md5-cache/dev-db/postgresql-11.8 b/metadata/md5-cache/dev-db/postgresql-11.8
index 7e2129ce3847..789a446e6a53 100644
--- a/metadata/md5-cache/dev-db/postgresql-11.8
+++ b/metadata/md5-cache/dev-db/postgresql-11.8
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postg
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=11
 SRC_URI=https://ftp.postgresql.org/pub/source/v11.8/postgresql-11.8.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ce3f522c075bd2c5ce6280a150884b03
diff --git a/metadata/md5-cache/dev-db/postgresql-12.2 b/metadata/md5-cache/dev-db/postgresql-12.2
index 3adeb26f60df..dc736a703a1e 100644
--- a/metadata/md5-cache/dev-db/postgresql-12.2
+++ b/metadata/md5-cache/dev-db/postgresql-12.2
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu?
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=12
 SRC_URI=https://ftp.postgresql.org/pub/source/v12.2/postgresql-12.2.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=2d9950499ceb6ec55fb1adb440a5d898
diff --git a/metadata/md5-cache/dev-db/postgresql-12.3 b/metadata/md5-cache/dev-db/postgresql-12.3
index b9448d419e36..e13ec68b55a4 100644
--- a/metadata/md5-cache/dev-db/postgresql-12.3
+++ b/metadata/md5-cache/dev-db/postgresql-12.3
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postg
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=12
 SRC_URI=https://ftp.postgresql.org/pub/source/v12.3/postgresql-12.3.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3fcb46eae0a52d4cd6e3b94e9dd4d0aa
diff --git a/metadata/md5-cache/dev-db/postgresql-13_beta1 b/metadata/md5-cache/dev-db/postgresql-13_beta1
index 1de83818b8fb..64da4d897441 100644
--- a/metadata/md5-cache/dev-db/postgresql-13_beta1
+++ b/metadata/md5-cache/dev-db/postgresql-13_beta1
@@ -10,5 +10,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postg
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=13
 SRC_URI=https://ftp.postgresql.org/pub/source/v13beta1/postgresql-13beta1.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=481517407dbda5057cdc5ae34bef9643
diff --git a/metadata/md5-cache/dev-db/postgresql-9.4.26 b/metadata/md5-cache/dev-db/postgresql-9.4.26
index 1042c30503a6..548fb6ce5bfd 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.4.26
+++ b/metadata/md5-cache/dev-db/postgresql-9.4.26
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerbe
 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.26/postgresql-9.4.26.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=a0faa3e517cbcd37c44c169704345f73
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.21 b/metadata/md5-cache/dev-db/postgresql-9.5.21
index ca5ff025b11f..541be019e9b6 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.5.21
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.21
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerbe
 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.21/postgresql-9.5.21.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=884e1a1f1abd81c682c74c8582f32ce1
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.22 b/metadata/md5-cache/dev-db/postgresql-9.5.22
index 147d70c05dcc..24cccdae8a6a 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.5.22
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.22
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postg
 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.22/postgresql-9.5.22.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9e4ce41b15a4c1a9d9cbd0c8df88e637
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.17 b/metadata/md5-cache/dev-db/postgresql-9.6.17
index 809b3ba7a600..b8912a4e3485 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.6.17
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.17
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerbe
 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.17/postgresql-9.6.17.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=d081e125b5e81c965e88005edf06e1b8
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.18 b/metadata/md5-cache/dev-db/postgresql-9.6.18
index f1eb4c6d3d22..e8c5d608edac 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.6.18
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.18
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postg
 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.18/postgresql-9.6.18.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dc5fdbcdd371c66f45a2cf6ea7badd64
diff --git a/metadata/md5-cache/dev-db/postgresql-9999 b/metadata/md5-cache/dev-db/postgresql-9999
index e016a7fa4117..57c1f1d35742 100644
--- a/metadata/md5-cache/dev-db/postgresql-9999
+++ b/metadata/md5-cache/dev-db/postgresql-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres 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 ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=9999
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9702e8a9515aed6e1d107f3b05765caa
diff --git a/metadata/md5-cache/dev-db/pspg-3.1.2 b/metadata/md5-cache/dev-db/pspg-3.1.2
new file mode 100644
index 000000000000..036ed576aeac
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pspg-3.1.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=sys-libs/ncurses:* dev-db/postgresql:= sys-libs/readline:=
+DESCRIPTION=A better pager for psql and mysql
+EAPI=7
+HOMEPAGE=https://github.com/okbob/pspg
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=sys-libs/ncurses:* dev-db/postgresql:= sys-libs/readline:=
+SLOT=0
+SRC_URI=https://github.com/okbob/pspg/archive/3.1.2.tar.gz -> pspg-3.1.2.tar.gz
+_md5_=ad7b55cb55e5565c8a13848188e9f9fc
diff --git a/metadata/md5-cache/dev-db/redis-5.0.8 b/metadata/md5-cache/dev-db/redis-5.0.8
index 632c6cccf5af..28da5eec230d 100644
--- a/metadata/md5-cache/dev-db/redis-5.0.8
+++ b/metadata/md5-cache/dev-db/redis-5.0.8
@@ -5,7 +5,7 @@ DESCRIPTION=A persistent caching system, key-value and data structures database
 EAPI=7
 HOMEPAGE=https://redis.io
 IUSE=+jemalloc tcmalloc luajit test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+KEYWORDS=amd64 arm arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-5.1:= ) acct-group/redis acct-user/redis
 REQUIRED_USE=?? ( tcmalloc jemalloc )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.redis.io/releases/redis-5.0.8.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c51303c889aeb061ec32aade5e91795a
+_md5_=6709c31ced6c574b4cec02a760cf4e3b
diff --git a/metadata/md5-cache/dev-db/rqlite-5.2.0 b/metadata/md5-cache/dev-db/rqlite-5.2.0
index 71c05ab260e1..7b1e29f6a96e 100644
--- a/metadata/md5-cache/dev-db/rqlite-5.2.0
+++ b/metadata/md5-cache/dev-db/rqlite-5.2.0
@@ -2,11 +2,11 @@ BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
 DEFINED_PHASES=compile install postinst test unpack
 DESCRIPTION=Replicated SQLite using the Raft consensus protocol
 EAPI=7
-HOMEPAGE=https://github.com/rqlite/rqlite http://www.philipotoole.com/tag/rqlite/
+HOMEPAGE=https://github.com/rqlite/rqlite https://www.philipotoole.com/tag/rqlite/
 KEYWORDS=~amd64
 LICENSE=MIT BSD MPL-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/rqlite/rqlite/archive/v5.2.0.tar.gz -> rqlite-5.2.0.tar.gz mirror://goproxy//github.com/!bowery/prompt/@v/v0.0.0-20190916142128-fa8279994f75.zip -> github.com%2F!bowery%2Fprompt%2F@v%2Fv0.0.0-20190916142128-fa8279994f75.zip mirror://goproxy//github.com/!bowery/prompt/@v/v0.0.0-20190916142128-fa8279994f75.mod -> github.com%2F!bowery%2Fprompt%2F@v%2Fv0.0.0-20190916142128-fa8279994f75.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.zip -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.mod -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.mod -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.1.zip -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20191021154308-4207f1bf0617.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20191021154308-4207f1bf0617.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20191021154308-4207f1bf0617.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20191021154308-4207f1bf0617.mod mirror://goproxy//github.com/labstack/gommon/@v/v0.3.0.zip -> github.com%2Flabstack%2Fgommon%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/labstack/gommon/@v/v0.3.0.mod -> github.com%2Flabstack%2Fgommon%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v2.0.2+incompatible.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv2.0.2+incompatible.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v2.0.2+incompatible.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv2.0.2+incompatible.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mkideal/cli/@v/v0.0.3.zip -> github.com%2Fmkideal%2Fcli%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/mkideal/cli/@v/v0.0.3.mod -> github.com%2Fmkideal%2Fcli%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mkideal/pkg/@v/v0.0.0-20170503154153-3e188c9e7ecc.zip -> github.com%2Fmkideal%2Fpkg%2F@v%2Fv0.0.0-20170503154153-3e188c9e7ecc.zip mirror://goproxy//github.com/mkideal/pkg/@v/v0.0.0-20170503154153-3e188c9e7ecc.mod -> github.com%2Fmkideal%2Fpkg%2F@v%2Fv0.0.0-20170503154153-3e188c9e7ecc.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod mirror://goproxy//github.com/valyala/bytebufferpool/@v/v1.0.0.mod -> github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/valyala/fasttemplate/@v/v1.0.1.mod -> github.com%2Fvalyala%2Ffasttemplate%2F@v%2Fv1.0.1.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191219195013-becbf705a915.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191219195013-becbf705a915.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191219195013-becbf705a915.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191219195013-becbf705a915.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190523142557-0e01d883c5c5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190602015325-4c4f7f33c9ed.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190602015325-4c4f7f33c9ed.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190602015325-4c4f7f33c9ed.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190602015325-4c4f7f33c9ed.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod
 _eclasses_=go-module	45394825d9260b479aa1cf252ea58e01
-_md5_=74ae35cc22304b70eb073924e9476427
+_md5_=492bc4bcbcfafc08823bf8d82f777294
diff --git a/metadata/md5-cache/dev-db/sqlitestudio-3.2.1-r1 b/metadata/md5-cache/dev-db/sqlitestudio-3.2.1-r1
index 23faa91af3b3..c5df62335a14 100644
--- a/metadata/md5-cache/dev-db/sqlitestudio-3.2.1-r1
+++ b/metadata/md5-cache/dev-db/sqlitestudio-3.2.1-r1
@@ -1,7 +1,8 @@
+BDEPEND=dev-qt/linguist-tools:5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
 DEPEND=dev-db/sqlite:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 cli? ( sys-libs/readline:0= ) cups? ( dev-qt/qtprintsupport:5 ) tcl? ( dev-lang/tcl:0= ) dev-qt/designer:5 dev-qt/qtconcurrent:5 test? ( dev-qt/qttest:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Powerful cross-platform SQLite database manager
-EAPI=6
+EAPI=7
 HOMEPAGE=https://sqlitestudio.pl
 IUSE=cli cups tcl test
 KEYWORDS=~amd64 ~x86
@@ -12,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://sqlitestudio.pl/files/sqlitestudio3/complete/tar/sqlitestudio-3.2.1.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a19ce65f1252479723a61913be271d9c
+_md5_=15f65e79012aab83c4d9df58cd463e0a
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index 18f23b00c872..aeb379b7223a 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/zmac-1.3-r1 b/metadata/md5-cache/dev-embedded/zmac-1.3-r1
index f5bc91bd6e2d..f5c4049e2c8b 100644
--- a/metadata/md5-cache/dev-embedded/zmac-1.3-r1
+++ b/metadata/md5-cache/dev-embedded/zmac-1.3-r1
@@ -2,10 +2,10 @@ BDEPEND=app-arch/unzip
 DEFINED_PHASES=compile install
 DESCRIPTION=Z80 macro cross-assembler
 EAPI=7
-HOMEPAGE=http://www.tim-mann.org/trs80resources.html
+HOMEPAGE=https://www.tim-mann.org/trs80resources.html
 KEYWORDS=amd64 x86
 LICENSE=public-domain
 SLOT=0
-SRC_URI=http://www.tim-mann.org/trs80/zmac13.zip
+SRC_URI=https://www.tim-mann.org/trs80/zmac13.zip
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f8d2be30b84c0d868b13a3c0567e1562
+_md5_=14ef42bd4e387d7e7cb6dc6a5a0e69fc
diff --git a/metadata/md5-cache/dev-erlang/Manifest.gz b/metadata/md5-cache/dev-erlang/Manifest.gz
index b141c7809c2c..ff4ab1129ec8 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/eimp-1.0.15 b/metadata/md5-cache/dev-erlang/eimp-1.0.15
new file mode 100644
index 000000000000..dfa0292e36f2
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/eimp-1.0.15
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/p1_utils-1.0.19 media-libs/gd[png,jpeg,webp] dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=Erlang Image Manipulation Process
+EAPI=6
+HOMEPAGE=https://github.com/processone/eimp
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/p1_utils-1.0.19 media-libs/gd[png,jpeg,webp] dev-lang/erlang:=
+SLOT=0
+SRC_URI=https://github.com/processone/eimp/archive/1.0.15.tar.gz -> eimp-1.0.15.tar.gz
+_eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa
+_md5_=ceebac17be5bd9eba8eaa8fd7844e0cd
diff --git a/metadata/md5-cache/dev-erlang/jose-1.10.1 b/metadata/md5-cache/dev-erlang/jose-1.10.1
new file mode 100644
index 000000000000..bd58ae72ad57
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/jose-1.10.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/erlang-19.0 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=JSON Object Signing and Encryption (JOSE) for Erlang and Elixir
+EAPI=6
+HOMEPAGE=https://github.com/potatosalad/erlang-jose
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/erlang-19.0 dev-lang/erlang:=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/potatosalad/erlang-jose/archive/1.10.1.tar.gz -> erlang-jose-1.10.1.tar.gz
+_eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa
+_md5_=d1a4ab2cd8d06a5b6f6bf25490132c0d
diff --git a/metadata/md5-cache/dev-erlang/p1_utils-1.0.19 b/metadata/md5-cache/dev-erlang/p1_utils-1.0.19
new file mode 100644
index 000000000000..ca45a9047a17
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/p1_utils-1.0.19
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/erlang-17.1:= dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=Erlang utility modules from ProcessOne
+EAPI=6
+HOMEPAGE=https://github.com/processone/p1_utils
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-lang/erlang-17.1:= dev-lang/erlang:=
+SLOT=0
+SRC_URI=https://github.com/processone/p1_utils/archive/1.0.19.tar.gz -> p1_utils-1.0.19.tar.gz
+_eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa
+_md5_=ad25377b91c6e5410cd1177abfd94b48
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 5282988fdbea..f311c5688632 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/quake4-sdk-1.4.2 b/metadata/md5-cache/dev-games/quake4-sdk-1.4.2
index 0e7fac5882dc..decce06b7a6d 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=98dc43073c2dc5815dc8ec70839cb33c
diff --git a/metadata/md5-cache/dev-games/quake4-sdk-1.4.2-r1 b/metadata/md5-cache/dev-games/quake4-sdk-1.4.2-r1
index 4155e8aeebd0..4ca9cc9f48e1 100644
--- a/metadata/md5-cache/dev-games/quake4-sdk-1.4.2-r1
+++ b/metadata/md5-cache/dev-games/quake4-sdk-1.4.2-r1
@@ -7,5 +7,5 @@ LICENSE=QUAKE4
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=mirror://idsoftware/quake4/source/linux/quake4-linux-1.4.2-sdk.x86.run
-_eclasses_=unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=7fd8522f27dd4318b7e77c6307b71c21
diff --git a/metadata/md5-cache/dev-games/tiled-1.4.0 b/metadata/md5-cache/dev-games/tiled-1.4.0
new file mode 100644
index 000000000000..de1bd284e1c0
--- /dev/null
+++ b/metadata/md5-cache/dev-games/tiled-1.4.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5
+DEFINED_PHASES=configure install postinst postrm setup
+DEPEND=>=dev-qt/qtcore-5.14:5 >=dev-qt/qtdeclarative-5.14:5 >=dev-qt/qtgui-5.14:5 >=dev-qt/qtnetwork-5.14:5 >=dev-qt/qtwidgets-5.14:5 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] ) )
+DESCRIPTION=A general purpose tile map editor
+EAPI=7
+HOMEPAGE=https://www.mapeditor.org/
+IUSE=examples python python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64
+LICENSE=BSD BSD-2 GPL-2+
+RDEPEND=>=dev-qt/qtcore-5.14:5 >=dev-qt/qtdeclarative-5.14:5 >=dev-qt/qtgui-5.14:5 >=dev-qt/qtnetwork-5.14:5 >=dev-qt/qtwidgets-5.14:5 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] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
+SLOT=0
+SRC_URI=https://github.com/bjorn/tiled/archive/v1.4.0/tiled-1.4.0.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=decd0a24fe2b61486404d39eaf4a92d9
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index dff933ce96b5..63dada80a3fa 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/lhs2tex-1.18.1-r1 b/metadata/md5-cache/dev-haskell/lhs2tex-1.18.1-r1
index 982c013e2f1c..f55358685c45 100644
--- a/metadata/md5-cache/dev-haskell/lhs2tex-1.18.1-r1
+++ b/metadata/md5-cache/dev-haskell/lhs2tex-1.18.1-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=dev-tex/polytable-0.8.2 dev-texlive/texlive-mathscience >=dev-haskell/cabal-1.10 dev-haskell/mtl dev-haskell/regex-compat >=dev-lang/ghc-6.12.1
+DEPEND=dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience >=dev-haskell/cabal-1.10 dev-haskell/mtl dev-haskell/regex-compat >=dev-lang/ghc-6.12.1
 DESCRIPTION=Preprocessor for typesetting Haskell sources with LaTeX
 EAPI=5
 HOMEPAGE=http://www.andres-loeh.de/lhs2tex/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-tex/polytable-0.8.2 dev-texlive/texlive-mathscience
+RDEPEND=dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/lhs2tex-1.18.1/lhs2tex-1.18.1.tar.gz
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=79c796696d5758a3b61fb77816a65829
+_md5_=deab6258625ee822c0ebecdc2b163991
diff --git a/metadata/md5-cache/dev-haskell/lhs2tex-1.19-r1 b/metadata/md5-cache/dev-haskell/lhs2tex-1.19-r1
index 9d33ce1f28a2..ece54986622c 100644
--- a/metadata/md5-cache/dev-haskell/lhs2tex-1.19-r1
+++ b/metadata/md5-cache/dev-haskell/lhs2tex-1.19-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=dev-tex/polytable-0.8.2 dev-texlive/texlive-mathscience >=dev-haskell/cabal-1.10 dev-haskell/mtl dev-haskell/regex-compat >=dev-lang/ghc-6.12.1
+DEPEND=dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience >=dev-haskell/cabal-1.10 dev-haskell/mtl dev-haskell/regex-compat >=dev-lang/ghc-6.12.1
 DESCRIPTION=Preprocessor for typesetting Haskell sources with LaTeX
 EAPI=5
 HOMEPAGE=http://www.andres-loeh.de/lhs2tex/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-tex/polytable-0.8.2 dev-texlive/texlive-mathscience
+RDEPEND=dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/lhs2tex-1.19/lhs2tex-1.19.tar.gz
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=79c796696d5758a3b61fb77816a65829
+_md5_=deab6258625ee822c0ebecdc2b163991
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 0f671d140279..3ca608e70cd9 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/java-config-2.3 b/metadata/md5-cache/dev-java/java-config-2.3
deleted file mode 100644
index 2cfeb9d4ec12..000000000000
--- a/metadata/md5-cache/dev-java/java-config-2.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( sys-apps/portage[python_targets_python3_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(-)]
-DESCRIPTION=Java environment configuration query tool
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!dev-java/java-config-wrapper sys-apps/baselayout-java sys-apps/portage[python_targets_python3_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=2
-SRC_URI=https://gitweb.gentoo.org/proj/java-config.git/snapshot/java-config-2.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8809dffd40b8209127003dc4af45e504
diff --git a/metadata/md5-cache/dev-java/java-config-2.3.1 b/metadata/md5-cache/dev-java/java-config-2.3.1
new file mode 100644
index 000000000000..d77b7767d560
--- /dev/null
+++ b/metadata/md5-cache/dev-java/java-config-2.3.1
@@ -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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( sys-apps/portage[python_targets_python3_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=Java environment configuration query tool
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!dev-java/java-config-wrapper sys-apps/baselayout-java sys-apps/portage[python_targets_python3_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=2
+SRC_URI=https://gitweb.gentoo.org/proj/java-config.git/snapshot/java-config-2.3.1.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9d42288ab2da2bb8dc1b594b4790e07b
diff --git a/metadata/md5-cache/dev-java/javolution-6.0.0 b/metadata/md5-cache/dev-java/javolution-6.0.0
index e79b4609e42c..bad75419fe78 100644
--- a/metadata/md5-cache/dev-java/javolution-6.0.0
+++ b/metadata/md5-cache/dev-java/javolution-6.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 dev-java/osgi-core-api:0 dev-java/osgi-compendium:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=6
 SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/javolution-6.0.0.tar.xz https://dev.gentoo.org/~tomwij/files/dist/javolution-6.0.0-build.xml.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=968a2a8c9811c7e2096307d8bd05290c
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.55 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.55
deleted file mode 100644
index 792088e2b342..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.55
+++ /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 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.55/src/apache-tomcat-8.5.55-src.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=97a0b466e0c5cde95bfe07d29730922d
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.56 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.56
index 3bf428294e71..8f4fbdc406bc 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.56
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.56
@@ -4,10 +4,10 @@ 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
+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.56/src/apache-tomcat-8.5.56-src.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ddbacae0e101eae5dbe81c3b764a0100
+_md5_=fc977e4b484904475dbbb72cfd0d416c
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.36 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.36
index c054ad8bcfaa..68363b9776d3 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.36
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.36
@@ -4,10 +4,10 @@ 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
+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.36/src/apache-tomcat-9.0.36-src.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=016c0fca135aa60fbcecf7096105aea4
+_md5_=786ffb9481259c86d0142ae7e03b3581
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index b85c285017be..1318478ef0fb 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-4.0.0 b/metadata/md5-cache/dev-lang/R-4.0.0
deleted file mode 100644
index 6548d6904e4e..000000000000
--- a/metadata/md5-cache/dev-lang/R-4.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-fontsrecommended ) test? ( virtual/latex-base ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst prepare pretend setup
-DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= app-text/ghostscript-gpl dev-libs/libpcre:3= net-libs/libtirpc net-misc/curl virtual/blas:0 || ( sys-apps/coreutils app-misc/realpath ) cairo? ( x11-libs/cairo:0=[X=] x11-libs/pango:0= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack:0 ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) readline? ( sys-libs/readline:0= ) tiff? ( media-libs/tiff:0= ) tk? ( dev-lang/tk:0= ) X? ( x11-libs/libXmu:0= x11-misc/xdg-utils ) virtual/fortran
-DESCRIPTION=Language and environment for statistical computing and graphics
-EAPI=7
-HOMEPAGE=http://www.r-project.org/
-IUSE=cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs test tiff tk X
-KEYWORDS=~amd64 ~arm64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=|| ( GPL-2 GPL-3 ) LGPL-2.1
-RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= app-text/ghostscript-gpl dev-libs/libpcre:3= net-libs/libtirpc net-misc/curl virtual/blas:0 || ( sys-apps/coreutils app-misc/realpath ) cairo? ( x11-libs/cairo:0=[X=] x11-libs/pango:0= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack:0 ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) readline? ( sys-libs/readline:0= ) tiff? ( media-libs/tiff:0= ) tk? ( dev-lang/tk:0= ) X? ( x11-libs/libXmu:0= x11-misc/xdg-utils ) sys-libs/zlib:0[minizip] java? ( >=virtual/jre-1.5 ) virtual/fortran
-REQUIRED_USE=png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )
-RESTRICT=minimal? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://cran/src/base/R-4/R-4.0.0.tar.gz https://raw.githubusercontent.com/deepayan/rcompletion/78d6830e28ea90a046da79a9b4f70c39594bb6d6/bash_completion/R -> R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e7e8c3e0bd91defe355c21c6a90a465c
diff --git a/metadata/md5-cache/dev-lang/R-4.0.2 b/metadata/md5-cache/dev-lang/R-4.0.2
new file mode 100644
index 000000000000..653b4a832bb5
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/R-4.0.2
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-fontsrecommended ) test? ( virtual/latex-base ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= app-text/ghostscript-gpl dev-libs/libpcre2:= net-libs/libtirpc net-misc/curl virtual/blas:0 || ( sys-apps/coreutils app-misc/realpath ) cairo? ( x11-libs/cairo:0=[X=] x11-libs/pango:0= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack:0 ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) readline? ( sys-libs/readline:0= ) tiff? ( media-libs/tiff:0= ) tk? ( dev-lang/tk:0= ) X? ( x11-libs/libXmu:0= x11-misc/xdg-utils ) virtual/fortran
+DESCRIPTION=Language and environment for statistical computing and graphics
+EAPI=7
+HOMEPAGE=http://www.r-project.org/
+IUSE=cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs test tiff tk X
+KEYWORDS=~amd64 ~arm64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=|| ( GPL-2 GPL-3 ) LGPL-2.1
+RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= app-text/ghostscript-gpl dev-libs/libpcre2:= net-libs/libtirpc net-misc/curl virtual/blas:0 || ( sys-apps/coreutils app-misc/realpath ) cairo? ( x11-libs/cairo:0=[X=] x11-libs/pango:0= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack:0 ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) readline? ( sys-libs/readline:0= ) tiff? ( media-libs/tiff:0= ) tk? ( dev-lang/tk:0= ) X? ( x11-libs/libXmu:0= x11-misc/xdg-utils ) sys-libs/zlib:0[minizip] java? ( >=virtual/jre-1.5 ) virtual/fortran
+REQUIRED_USE=png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) ) test? ( profile )
+RESTRICT=minimal? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://cran/src/base/R-4/R-4.0.2.tar.gz https://raw.githubusercontent.com/deepayan/rcompletion/78d6830e28ea90a046da79a9b4f70c39594bb6d6/bash_completion/R -> R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=53856c1a8a0e0db3749047081b6dd084
diff --git a/metadata/md5-cache/dev-lang/duktape-2.2.1 b/metadata/md5-cache/dev-lang/duktape-2.2.1
deleted file mode 100644
index 037b8655921c..000000000000
--- a/metadata/md5-cache/dev-lang/duktape-2.2.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Embeddable Javascript engine
-EAPI=6
-HOMEPAGE=https://duktape.org
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://duktape.org/duktape-2.2.1.tar.xz
-_md5_=6f91e2d726c3031312e576e4e4e3e925
diff --git a/metadata/md5-cache/dev-lang/duktape-2.5.0-r1 b/metadata/md5-cache/dev-lang/duktape-2.5.0-r1
new file mode 100644
index 000000000000..ef4146b9dde7
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/duktape-2.5.0-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Embeddable Javascript engine
+EAPI=7
+HOMEPAGE=https://duktape.org
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://duktape.org/duktape-2.5.0.tar.xz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=40e37b3aad7fbbbd1133fce816bffa00
diff --git a/metadata/md5-cache/dev-lang/erlang-23.0 b/metadata/md5-cache/dev-lang/erlang-23.0
deleted file mode 100644
index c03f783563e8..000000000000
--- a/metadata/md5-cache/dev-lang/erlang-23.0
+++ /dev/null
@@ -1,14 +0,0 @@
-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/23.0
-SRC_URI=https://github.com/erlang/otp/archive/OTP-23.0.tar.gz -> erlang-23.0.tar.gz http://erlang.org/download/otp_doc_man_23.0.tar.gz -> erlang_doc_man_23.0.tar.gz doc? ( http://erlang.org/download/otp_doc_html_23.0.tar.gz -> erlang_doc_html_23.0.tar.gz )
-_eclasses_=elisp-common	504a3383c45504fde86b00426619a709	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=f75a9ae54f12da404d8f8f234c936723
diff --git a/metadata/md5-cache/dev-lang/erlang-23.0.1 b/metadata/md5-cache/dev-lang/erlang-23.0.1
index 7bff27f16c05..8e22eb940a7d 100644
--- a/metadata/md5-cache/dev-lang/erlang-23.0.1
+++ b/metadata/md5-cache/dev-lang/erlang-23.0.1
@@ -5,10 +5,10 @@ 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
+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/23.0.1
 SRC_URI=https://github.com/erlang/otp/archive/OTP-23.0.1.tar.gz -> erlang-23.0.1.tar.gz http://erlang.org/download/otp_doc_man_23.0.tar.gz -> erlang_doc_man_23.0.tar.gz doc? ( http://erlang.org/download/otp_doc_html_23.0.tar.gz -> erlang_doc_html_23.0.tar.gz )
 _eclasses_=elisp-common	504a3383c45504fde86b00426619a709	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=60bdbfa5cb5d101c72344bad8f71e815
+_md5_=f75a9ae54f12da404d8f8f234c936723
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2017-r1 b/metadata/md5-cache/dev-lang/gnat-gpl-2017-r1
index 3ad5bd91d9c4..39437dfc4388 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2017-r1
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2017-r1
@@ -12,4 +12,4 @@ 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	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	3c5c1f58d3da32714ebe931369218569	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2100f920fa3478c15db3e673bfdd382c
+_md5_=dd8678d553374954e85eebd8b67ea874
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2018-r3 b/metadata/md5-cache/dev-lang/gnat-gpl-2018-r3
index 9fdb56ca17ca..33ef9ecd6b1f 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2018-r3
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2018-r3
@@ -12,4 +12,4 @@ 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	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	3c5c1f58d3da32714ebe931369218569	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=56d11f9a4c15b95b6134248e9bf6e191
+_md5_=13d2fb63cd8e6365bd1e5e2f11ff6488
diff --git a/metadata/md5-cache/dev-lang/ispc-1.13.0 b/metadata/md5-cache/dev-lang/ispc-1.13.0
new file mode 100644
index 000000000000..7b659ff2288e
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/ispc-1.13.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=sys-devel/clang-3.0:* >=sys-devel/llvm-3.0:* || ( >=dev-lang/python-2.7.5-r2:2.7 ) sys-devel/bison sys-devel/flex
+DESCRIPTION=Intel SPMD Program Compiler
+EAPI=7
+HOMEPAGE=https://ispc.github.com/
+IUSE=examples
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD BSD-2 UoI-NCSA
+RDEPEND=>=sys-devel/clang-3.0:* >=sys-devel/llvm-3.0:*
+SLOT=0
+SRC_URI=https://github.com/ispc/ispc/archive/v1.13.0.tar.gz -> ispc-1.13.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9fa583b1c1fb3edfa455886b44bd7344
diff --git a/metadata/md5-cache/dev-lang/ispc-9999 b/metadata/md5-cache/dev-lang/ispc-9999
index e99c742d0735..b2d7f4ce7b1f 100644
--- a/metadata/md5-cache/dev-lang/ispc-9999
+++ b/metadata/md5-cache/dev-lang/ispc-9999
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile install setup unpack
-DEPEND=>=sys-devel/clang-3.0:* >=sys-devel/llvm-3.0:* || ( >=dev-lang/python-2.7.5-r2:2.7 ) sys-devel/bison sys-devel/flex >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=sys-devel/clang-3.0:* >=sys-devel/llvm-3.0:* || ( >=dev-lang/python-2.7.5-r2:2.7 ) sys-devel/bison sys-devel/flex
 DESCRIPTION=Intel SPMD Program Compiler
-EAPI=6
+EAPI=7
 HOMEPAGE=https://ispc.github.com/
 IUSE=examples
 LICENSE=BSD BSD-2 UoI-NCSA
 PROPERTIES=live
 RDEPEND=>=sys-devel/clang-3.0:* >=sys-devel/llvm-3.0:*
 SLOT=0
-_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1b7acdf976bfec937113ed25dfb40482
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9fa583b1c1fb3edfa455886b44bd7344
diff --git a/metadata/md5-cache/dev-lang/janet-1.7.0 b/metadata/md5-cache/dev-lang/janet-1.7.0
deleted file mode 100644
index 64a700559046..000000000000
--- a/metadata/md5-cache/dev-lang/janet-1.7.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install
-DESCRIPTION=A dynamic Lisp dialect and bytecode vm
-EAPI=7
-HOMEPAGE=https://janet-lang.org https://github.com/janet-lang/janet/
-IUSE=static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/janet-lang/janet/archive/v1.7.0.tar.gz -> janet-1.7.0.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e69f1cb12d2db69b9235a238ead54d4c
diff --git a/metadata/md5-cache/dev-lang/janet-1.9.1 b/metadata/md5-cache/dev-lang/janet-1.9.1
new file mode 100644
index 000000000000..1527f597a9dd
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/janet-1.9.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install
+DESCRIPTION=A dynamic Lisp dialect and bytecode vm
+EAPI=7
+HOMEPAGE=https://janet-lang.org https://github.com/janet-lang/janet/
+IUSE=static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/janet-lang/janet/archive/v1.9.1.tar.gz -> janet-1.9.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6e080b5478e7a3e8cd75c9608a6eabe9
diff --git a/metadata/md5-cache/dev-lang/julia-1.4.0-r2 b/metadata/md5-cache/dev-lang/julia-1.4.0-r2
new file mode 100644
index 000000000000..bc4d22b79eed
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/julia-1.4.0-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=system-llvm? ( sys-devel/llvm:9=[llvm_targets_NVPTX(-)] ) dev-libs/double-conversion:0= dev-libs/gmp:0= >=dev-libs/libpcre2-10.23:0=[jit,unicode] dev-libs/mpfr:0= dev-libs/openspecfun >=net-libs/mbedtls-2.2 sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= >=sci-visualization/gr-0.50.0-r1 >=sys-libs/libunwind-1.1:0= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack dev-util/patchelf virtual/pkgconfig !!sys-devel/llvm:0
+DESCRIPTION=High-performance programming language for technical computing
+EAPI=7
+HOMEPAGE=https://julialang.org/
+IUSE=system-llvm
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=system-llvm? ( sys-devel/llvm:9=[llvm_targets_NVPTX(-)] ) dev-libs/double-conversion:0= dev-libs/gmp:0= >=dev-libs/libpcre2-10.23:0=[jit,unicode] dev-libs/mpfr:0= dev-libs/openspecfun >=net-libs/mbedtls-2.2 sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= >=sci-visualization/gr-0.50.0-r1 >=sys-libs/libunwind-1.1:0= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack
+RESTRICT=splitdebug
+SLOT=0
+SRC_URI=https://github.com/JuliaLang/julia/releases/download/v1.4.0/julia-1.4.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/libgit2/libgit2/tarball/b3e1a56ebb2b9291e82dc027ba9cbcfc3ead54d3 -> julia-libgit2-b3e1a56ebb2b9291e82dc027ba9cbcfc3ead54d3.tar.gz https://api.github.com/repos/vtjnash/libwhich/tarball/81e9723c0273d78493dc8c8ed570f68d9ce7e89e -> julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz https://curl.haxx.se/ca/cacert-2020-01-01.pem -> julia-cacert-2020-01-01.pem 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 https://dev.gentoo.org/~tamiko/distfiles/Pkg-49908bffe83790bc7cf3c5d46faf3667f8902ad4.tar.gz -> julia-Pkg-49908bffe83790bc7cf3c5d46faf3667f8902ad4.tar.gz !system-llvm? ( http://releases.llvm.org/8.0.1/llvm-8.0.1.src.tar.xz )
+_eclasses_=llvm	78f8b6f29bd3b0263a4c9a3785e5af71	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0056bbcb4643ea7b4347b57cef7679d5
diff --git a/metadata/md5-cache/dev-lang/logtalk-3.36.0 b/metadata/md5-cache/dev-lang/logtalk-3.36.0
index ad5248bdd376..06531eb0840e 100644
--- a/metadata/md5-cache/dev-lang/logtalk-3.36.0
+++ b/metadata/md5-cache/dev-lang/logtalk-3.36.0
@@ -3,10 +3,10 @@ DESCRIPTION=Open source object-oriented logic programming language
 EAPI=6
 HOMEPAGE=https://logtalk.org
 IUSE=fop xslt
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=Apache-2.0
 RDEPEND=xslt? ( dev-libs/libxslt ) fop? ( dev-java/fop )
 SLOT=0
 SRC_URI=https://logtalk.org/files/logtalk-3.36.0.tar.bz2
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2f7906cafb035efbfd36197bf0f8d2f1
+_md5_=a68fc50779f3c6c4cbfd6a71be2156d4
diff --git a/metadata/md5-cache/dev-lang/mono-6.6.0.161 b/metadata/md5-cache/dev-lang/mono-6.6.0.161
index e988d6a723a0..c85a8d5dcacf 100644
--- a/metadata/md5-cache/dev-lang/mono-6.6.0.161
+++ b/metadata/md5-cache/dev-lang/mono-6.6.0.161
@@ -9,5 +9,5 @@ LICENSE=MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL
 RDEPEND=!minimal? ( >=dev-dotnet/libgdiplus-6.0.2 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=http://download.mono-project.com/sources/mono/mono-6.6.0.161.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c35be353b1b74d478b694146db2c2240
diff --git a/metadata/md5-cache/dev-lang/mozart-2.0.1 b/metadata/md5-cache/dev-lang/mozart-2.0.1
new file mode 100644
index 000000000000..79f0012a6826
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/mozart-2.0.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-libs/boost:= dev-libs/gmp:0 dev-lang/tcl:0 dev-lang/tk:0 emacs? ( >=app-editors/emacs-23.1:* ) dev-java/ant-core >=virtual/jdk-1.8:= dev-lang/scala:2.12 test? ( dev-cpp/gtest:= ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Advanced development platform for intelligent, distributed applications
+EAPI=7
+HOMEPAGE=http://mozart2.org/
+IUSE=emacs test elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=dev-libs/boost:= dev-libs/gmp:0 dev-lang/tcl:0 dev-lang/tk:0 emacs? ( >=app-editors/emacs-23.1:* ) >=dev-java/java-config-2.2.0-r3
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mozart/mozart2/archive/v2.0.1.tar.gz -> mozart-2.0.1.tar.gz https://dev.gentoo.org/~keri/distfiles/mozart/mozart-2.0.1-gentoo-patchset-1.tar.gz
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d6067b367064146ab575614f5c1160d6
diff --git a/metadata/md5-cache/dev-lang/mozart-stdlib-2.0.1 b/metadata/md5-cache/dev-lang/mozart-stdlib-2.0.1
new file mode 100644
index 000000000000..35be7d581d82
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/mozart-stdlib-2.0.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-lang/mozart-2.0.1
+DESCRIPTION=The Mozart Standard Library
+EAPI=7
+HOMEPAGE=http://mozart2.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=Mozart
+RDEPEND=>=dev-lang/mozart-2.0.1
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~keri/distfiles/mozart-stdlib/mozart2-stdlib-2.0.1.tar.gz https://dev.gentoo.org/~keri/distfiles/mozart-stdlib/mozart-stdlib-2.0.1-gentoo-patchset-0.tar.gz
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5066ada7bd1e731195d17ef541b8be26
diff --git a/metadata/md5-cache/dev-lang/mujs-1.0.5 b/metadata/md5-cache/dev-lang/mujs-1.0.5
deleted file mode 100644
index b7325632c46c..000000000000
--- a/metadata/md5-cache/dev-lang/mujs-1.0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/readline:0=
-DESCRIPTION=An embeddable Javascript interpreter in C.
-EAPI=7
-HOMEPAGE=https://mujs.com/ https://github.com/ccxvii/mujs/
-IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=AGPL-3
-RDEPEND=sys-libs/readline:0=
-SLOT=0
-SRC_URI=https://github.com/ccxvii/mujs/archive/1.0.5.tar.gz -> mujs-1.0.5.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=109c02528e5e60042af74416178ea11b
diff --git a/metadata/md5-cache/dev-lang/mujs-1.0.6 b/metadata/md5-cache/dev-lang/mujs-1.0.6
index 5e372009fc0d..788532de5d63 100644
--- a/metadata/md5-cache/dev-lang/mujs-1.0.6
+++ b/metadata/md5-cache/dev-lang/mujs-1.0.6
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=https://mujs.com/ https://github.com/ccxvii/mujs/
 IUSE=static-libs
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=AGPL-3
+LICENSE=ISC
 RDEPEND=sys-libs/readline:0=
 SLOT=0/1.0.6
 SRC_URI=https://github.com/ccxvii/mujs/archive/1.0.6.tar.gz -> mujs-1.0.6.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3dfd9353f4bfe19ab7052d2f4cb207b6
+_md5_=d96765df6eebb376b35f4fbc7c09f8ad
diff --git a/metadata/md5-cache/dev-lang/mujs-1.0.7 b/metadata/md5-cache/dev-lang/mujs-1.0.7
new file mode 100644
index 000000000000..bdafc5bbe504
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/mujs-1.0.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-libs/readline:0=
+DESCRIPTION=An embeddable Javascript interpreter in C.
+EAPI=7
+HOMEPAGE=https://mujs.com/ https://github.com/ccxvii/mujs/
+IUSE=static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=ISC
+RDEPEND=sys-libs/readline:0=
+SLOT=0/1.0.7
+SRC_URI=https://mujs.com/downloads/mujs-1.0.7.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=43472c4ebec7516bcc1fd1cbd971c8b6
diff --git a/metadata/md5-cache/dev-lang/nasm-2.15 b/metadata/md5-cache/dev-lang/nasm-2.15
new file mode 100644
index 000000000000..78b4cbd5a060
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/nasm-2.15
@@ -0,0 +1,12 @@
+BDEPEND=dev-lang/perl doc? ( app-text/ghostscript-gpl dev-perl/Font-TTF dev-perl/Sort-Versions media-fonts/source-pro virtual/perl-File-Spec )
+DEFINED_PHASES=compile install
+DESCRIPTION=groovy little assembler
+EAPI=7
+HOMEPAGE=https://www.nasm.us/
+IUSE=doc
+KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc64 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD-2
+SLOT=0
+SRC_URI=https://www.nasm.us/pub/nasm/releasebuilds/2.15/nasm-2.15.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0e44dd5ee274cb95faa50c0efd120638
diff --git a/metadata/md5-cache/dev-lang/nasm-2.15.01 b/metadata/md5-cache/dev-lang/nasm-2.15.01
new file mode 100644
index 000000000000..d404e929aa99
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/nasm-2.15.01
@@ -0,0 +1,12 @@
+BDEPEND=dev-lang/perl doc? ( app-text/ghostscript-gpl dev-perl/Font-TTF dev-perl/Sort-Versions media-fonts/source-pro virtual/perl-File-Spec )
+DEFINED_PHASES=compile install
+DESCRIPTION=groovy little assembler
+EAPI=7
+HOMEPAGE=https://www.nasm.us/
+IUSE=doc
+KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc64 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD-2
+SLOT=0
+SRC_URI=https://www.nasm.us/pub/nasm/releasebuilds/2.15.01/nasm-2.15.01.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0e44dd5ee274cb95faa50c0efd120638
diff --git a/metadata/md5-cache/dev-lang/nim-1.2.2 b/metadata/md5-cache/dev-lang/nim-1.2.2
deleted file mode 100644
index f08da3dd30f3..000000000000
--- a/metadata/md5-cache/dev-lang/nim-1.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=test? ( net-libs/nodejs )
-DESCRIPTION=compiled, garbage-collected systems programming language
-EAPI=7
-HOMEPAGE=https://nim-lang.org/
-IUSE=doc +readline test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=readline? ( sys-libs/readline:0= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nim-lang.org/download/nim-1.2.2.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4e08ee9588127859fba175003763ac49
diff --git a/metadata/md5-cache/dev-lang/nim-1.2.4 b/metadata/md5-cache/dev-lang/nim-1.2.4
new file mode 100644
index 000000000000..e4f7be24e990
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/nim-1.2.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=test? ( net-libs/nodejs )
+DESCRIPTION=compiled, garbage-collected systems programming language
+EAPI=7
+HOMEPAGE=https://nim-lang.org/
+IUSE=doc +readline test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=readline? ( sys-libs/readline:0= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://nim-lang.org/download/nim-1.2.4.tar.xz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4e08ee9588127859fba175003763ac49
diff --git a/metadata/md5-cache/dev-lang/orc-0.4.31 b/metadata/md5-cache/dev-lang/orc-0.4.31
index 4352c0701643..438614b73c18 100644
--- a/metadata/md5-cache/dev-lang/orc-0.4.31
+++ b/metadata/md5-cache/dev-lang/orc-0.4.31
@@ -4,10 +4,10 @@ DESCRIPTION=The Oil Runtime Compiler, a just-in-time compiler for array operatio
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=gtk-doc 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=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD BSD-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gstreamer.freedesktop.org/src/orc/orc-0.4.31.tar.xz
 _eclasses_=meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=315a8c4e916f5e98dc0273c401b22641
+_md5_=7ac32ba68c98eb9376976da15511c12e
diff --git a/metadata/md5-cache/dev-lang/qu-prolog-10.5 b/metadata/md5-cache/dev-lang/qu-prolog-10.5
new file mode 100644
index 000000000000..8007b2bb2335
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/qu-prolog-10.5
@@ -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=!dev-util/mpatch !dev-util/rej qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) pedro? ( net-misc/pedro ) readline? ( app-misc/rlwrap ) dev-lang/perl
+DESCRIPTION=Extended Prolog supporting quantifiers, object-variables and substitutions
+EAPI=7
+HOMEPAGE=http://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html
+IUSE=debug doc examples pedro qt5 readline threads
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Apache-2.0 GPL-2+
+RDEPEND=!dev-util/mpatch !dev-util/rej qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) pedro? ( net-misc/pedro ) readline? ( app-misc/rlwrap )
+SLOT=0
+SRC_URI=http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/qp10.5.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=590187d20660af6a92858b318ba3d606
diff --git a/metadata/md5-cache/dev-lang/vala-0.40.23 b/metadata/md5-cache/dev-lang/vala-0.40.23
index 349217f943a0..e0046375cd64 100644
--- a/metadata/md5-cache/dev-lang/vala-0.40.23
+++ b/metadata/md5-cache/dev-lang/vala-0.40.23
@@ -4,11 +4,11 @@ DESCRIPTION=Compiler for the GObject type system
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
 IUSE=test valadoc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.40.23 valadoc? ( >=media-gfx/graphviz-2.16 )
 RESTRICT=!test? ( test )
 SLOT=0.40
 SRC_URI=mirror://gnome/sources/vala/0.40/vala-0.40.23.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c82cf5e5afc6a150ddb04b18e663471b
+_md5_=31adf9ab65e22d2ea79c223a4a485ff4
diff --git a/metadata/md5-cache/dev-lang/vala-0.46.10 b/metadata/md5-cache/dev-lang/vala-0.46.10
index 0e63730adaab..0615ef52cc4c 100644
--- a/metadata/md5-cache/dev-lang/vala-0.46.10
+++ b/metadata/md5-cache/dev-lang/vala-0.46.10
@@ -4,11 +4,11 @@ DESCRIPTION=Compiler for the GObject type system
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
 IUSE=test valadoc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.46.10 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala]
 RESTRICT=!test? ( test )
 SLOT=0.46
 SRC_URI=mirror://gnome/sources/vala/0.46/vala-0.46.10.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=71f2c920ebb631e67f3561e12bd1f7bc
+_md5_=955f078b6a9e2e35cfd188f8290ec75a
diff --git a/metadata/md5-cache/dev-lang/vala-0.48.6 b/metadata/md5-cache/dev-lang/vala-0.48.6
index f217cda06cee..44d65ec83c70 100644
--- a/metadata/md5-cache/dev-lang/vala-0.48.6
+++ b/metadata/md5-cache/dev-lang/vala-0.48.6
@@ -4,11 +4,11 @@ DESCRIPTION=Compiler for the GObject type system
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
 IUSE=test valadoc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.48.6 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala]
 RESTRICT=!test? ( test )
 SLOT=0.48
 SRC_URI=mirror://gnome/sources/vala/0.48/vala-0.48.6.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1dd48cd961ee51164de3dcd3e5395232
+_md5_=802206f4c897e9bbe9d72a6592922a6c
diff --git a/metadata/md5-cache/dev-lang/whitespace-0.3 b/metadata/md5-cache/dev-lang/whitespace-0.3
deleted file mode 100644
index ab71c8b90fe3..000000000000
--- a/metadata/md5-cache/dev-lang/whitespace-0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-lang/ghc
-DESCRIPTION=Whitespace language interpreter in haskell
-EAPI=5
-HOMEPAGE=http://compsoc.dur.ac.uk/whitespace/
-IUSE=examples
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://compsoc.dur.ac.uk/whitespace/downloads/wspace-0.3.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6944766c5e3890b296e98cdfd876e759
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index b6bb5a937333..2c09bb10d6c5 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/OpenSRF-2.1.1 b/metadata/md5-cache/dev-libs/OpenSRF-2.1.1
index 353288281caf..eec38970c9fc 100644
--- a/metadata/md5-cache/dev-libs/OpenSRF-2.1.1
+++ b/metadata/md5-cache/dev-libs/OpenSRF-2.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=www-servers/apache-2.2.9 >=dev-db/libdbi-drivers-0.8.2 >=dev-db/libdbi-0.8.2 net-im/ejabberd dev-libs/libmemcached dev-perl/Cache-Memcached dev-perl/Class-DBI-AbstractSearch sqlite? ( dev-perl/DBD-SQLite ) postgres? ( dev-perl/DBD-Pg ) virtual/perl-Digest-MD5 dev-perl/JSON-XS dev-perl/Net-Server dev-perl/UNIVERSAL-require dev-perl/Unix-Syslog dev-perl/XML-LibXML =www-servers/apache-2.2* dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://open-ils.org/downloads/opensrf-2.1.1.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	7d999b62b8749fad43fff00620cedf47	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	7d999b62b8749fad43fff00620cedf47	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f29c715f169d764192478edad4970351
diff --git a/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-18.20.684755 b/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-18.20.684755
index feb95681653d..fcab3a1028a9 100644
--- a/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-18.20.684755
+++ b/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-18.20.684755
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 RESTRICT=bindist mirror fetch strip
 SLOT=0
 SRC_URI=amdgpu-pro-18.20-684755-ubuntu-16.04.tar.xz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=d382ff64c51fe892751a129e33de67ff
diff --git a/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-19.30.838629 b/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-19.30.838629
index d71486dc1efd..ebb8d121943b 100644
--- a/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-19.30.838629
+++ b/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-19.30.838629
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 RESTRICT=bindist mirror fetch strip
 SLOT=0
 SRC_URI=amdgpu-pro-19.30-838629-ubuntu-18.04.tar.xz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=080f165d144782d60d9ff1fa61fb8fdb
diff --git a/metadata/md5-cache/dev-libs/appstream-glib-0.7.17 b/metadata/md5-cache/dev-libs/appstream-glib-0.7.17
index c71ac33423b9..64e12c6a21dd 100644
--- a/metadata/md5-cache/dev-libs/appstream-glib-0.7.17
+++ b/metadata/md5-cache/dev-libs/appstream-glib-0.7.17
@@ -4,10 +4,10 @@ DESCRIPTION=Provides GObjects and helper methods to read and write AppStream met
 EAPI=6
 HOMEPAGE=https://people.freedesktop.org/~hughsient/appstream-glib/
 IUSE=gtk-doc fonts +introspection stemmer
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 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-libs/glib-2.58.0:2 sys-apps/util-linux app-arch/libarchive >=net-libs/libsoup-2.51.92:2.4 >=dev-libs/json-glib-1.1.2 >=x11-libs/gdk-pixbuf-2.31.5:2[introspection?] fonts? ( x11-libs/gtk+:3 >=media-libs/freetype-2.4:2 ) >=media-libs/fontconfig-2.11:1.0 dev-libs/libyaml stemmer? ( dev-libs/snowball-stemmer ) x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.54:= ) !<dev-util/appdata-tools-0.1.8-r1
 SLOT=0/8
 SRC_URI=https://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-0.7.17.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dd01acc6ca858b45f4dc696526f7dab9
+_md5_=f5355043fd472312f80d057d8e9fe9b6
diff --git a/metadata/md5-cache/dev-libs/boost-1.73.0 b/metadata/md5-cache/dev-libs/boost-1.73.0
index 571346887c5c..3fbb72edc693 100644
--- a/metadata/md5-cache/dev-libs/boost-1.73.0
+++ b/metadata/md5-cache/dev-libs/boost-1.73.0
@@ -1,16 +1,16 @@
 BDEPEND==dev-util/boost-build-1.73*
 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 ) 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(-)] numpy? ( 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(-)] ) ) ) 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(-)?] )
+DEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy !<dev-libs/leatherman-1.12.0-r1 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 ) 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(-)] numpy? ( 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(-)] ) ) ) 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 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
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~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 ) 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(-)] numpy? ( 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(-)] ) ) ) 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(-)?] )
+RDEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy !<dev-libs/leatherman-1.12.0-r1 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 ) 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(-)] numpy? ( 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(-)] ) ) ) 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 python_targets_python3_8 ) )
 RESTRICT=test
 SLOT=0/1.73.0
 SRC_URI=https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=03ae746a27b33c764d8c224d420ccf0c
+_md5_=f2beba54e085a889100a5ef167b4bbb2
diff --git a/metadata/md5-cache/dev-libs/boxfort-0.0.1_pre20200110 b/metadata/md5-cache/dev-libs/boxfort-0.0.1_pre20200110
index cbc9ecbaacec..55cd6f83f6dc 100644
--- a/metadata/md5-cache/dev-libs/boxfort-0.0.1_pre20200110
+++ b/metadata/md5-cache/dev-libs/boxfort-0.0.1_pre20200110
@@ -5,10 +5,10 @@ DESCRIPTION=Convenient & cross-platform sandboxing C library
 EAPI=7
 HOMEPAGE=https://github.com/Snaipe/BoxFort
 IUSE=test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Snaipe/BoxFort/archive/1456d9a3a3bcb506cdcd1b5d4b852e967deb5e57.tar.gz -> boxfort-1456d9a3a3bcb506cdcd1b5d4b852e967deb5e57.tar.gz
 _eclasses_=meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=18a39bac2d1dc5865f9daba05413316b
+_md5_=6583276e445d502dd2ee5ce5978cc80c
diff --git a/metadata/md5-cache/dev-libs/cereal-1.2.1 b/metadata/md5-cache/dev-libs/cereal-1.2.1
deleted file mode 100644
index a8fad974a9e6..000000000000
--- a/metadata/md5-cache/dev-libs/cereal-1.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-libs/boost ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=header-only C++11 serialization library
-EAPI=6
-HOMEPAGE=http://uscilab.github.io/cereal/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/USCiLab/cereal/archive/v1.2.1.tar.gz -> cereal-1.2.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=69895f003d7bc83e64edb849d8b09cbf
diff --git a/metadata/md5-cache/dev-libs/cereal-1.2.2 b/metadata/md5-cache/dev-libs/cereal-1.2.2
deleted file mode 100644
index 22169f386b84..000000000000
--- a/metadata/md5-cache/dev-libs/cereal-1.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-libs/boost ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=header-only C++11 serialization library
-EAPI=6
-HOMEPAGE=http://uscilab.github.io/cereal/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/USCiLab/cereal/archive/v1.2.2.tar.gz -> cereal-1.2.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=38241641c3a5b721f24f365a7cc0735a
diff --git a/metadata/md5-cache/dev-libs/cereal-1.3.0 b/metadata/md5-cache/dev-libs/cereal-1.3.0
new file mode 100644
index 000000000000..b5c92eee6da3
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/cereal-1.3.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-libs/boost )
+DESCRIPTION=Header-only C++11 serialization library
+EAPI=7
+HOMEPAGE=https://uscilab.github.io/cereal/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/USCiLab/cereal/archive/v1.3.0.tar.gz -> cereal-1.3.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=67dca8f28095805811c4269f770dc23a
diff --git a/metadata/md5-cache/dev-libs/check-0.15.0 b/metadata/md5-cache/dev-libs/check-0.15.0
new file mode 100644
index 000000000000..7953e21d4cd8
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/check-0.15.0
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=subunit? ( dev-python/subunit[abi_x86_32(-)?,abi_x86_64(-)?,abi_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/texinfo
+DESCRIPTION=A unit test framework for C
+EAPI=7
+HOMEPAGE=https://libcheck.github.io/check/
+IUSE=doc subunit 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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2.1+
+RDEPEND=subunit? ( dev-python/subunit[abi_x86_32(-)?,abi_x86_64(-)?,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
+SRC_URI=https://github.com/libcheck/check/archive/0.15.0.tar.gz -> check-0.15.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c78b7768ecd7ab25b7e1f1b128091970
diff --git a/metadata/md5-cache/dev-libs/chmlib-0.40-r1 b/metadata/md5-cache/dev-libs/chmlib-0.40-r1
index 6f54da692cac..3f64f82527ca 100644
--- a/metadata/md5-cache/dev-libs/chmlib-0.40-r1
+++ b/metadata/md5-cache/dev-libs/chmlib-0.40-r1
@@ -1,11 +1,12 @@
-DEFINED_PHASES=compile configure install test
+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 test
 DESCRIPTION=Library for MS CHM (compressed html) file format
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.jedrea.com/chmlib/
 IUSE=+examples static-libs
 KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.jedrea.com/chmlib/chmlib-0.40.tar.bz2
-_eclasses_=out-of-source	15edba2977da53bbf4d1e5a60abc0e34
-_md5_=8c5a48f5e985d48ba450c500d12bca82
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=331cdae1513a6f1839a1fbca401d33d2
diff --git a/metadata/md5-cache/dev-libs/criterion-2.4_pre20200110 b/metadata/md5-cache/dev-libs/criterion-2.4_pre20200110
index 3760a6c06bd0..f5f563f90be3 100644
--- a/metadata/md5-cache/dev-libs/criterion-2.4_pre20200110
+++ b/metadata/md5-cache/dev-libs/criterion-2.4_pre20200110
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/nanomsg:= dev-libs/libgit2:= virtual/libffi:= dev-libs/boxfort test? ( || ( ( dev-lang/python:3.7 dev-util/cram[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-util/cram[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) )
+DEPEND=dev-libs/nanomsg:= dev-libs/libgit2:= virtual/libffi:= dev-libs/boxfort test? ( || ( ( dev-lang/python:3.8 dev-util/cram[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-util/cram[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-util/cram[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) )
 DESCRIPTION=Cross platform unit testing framework for C and C++
 EAPI=7
 HOMEPAGE=https://github.com/Snaipe/Criterion
 IUSE=test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=BSD-2 MIT ZLIB
 RDEPEND=dev-libs/nanomsg:= dev-libs/libgit2:= virtual/libffi:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Snaipe/Criterion/archive/4b5174ebda04ab76fe65eec25b5b6ea0809055e7.tar.gz -> criterion-4b5174ebda04ab76fe65eec25b5b6ea0809055e7.tar.gz https://github.com/scottt/debugbreak/archive/6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz -> debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz https://github.com/attractivechaos/klib/archive/cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz -> klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz https://github.com/nanopb/nanopb/archive/6a6903be6084bb3f5a98a3341acef2aa05c61df9.tar.gz -> nanopb-6a6903be6084bb3f5a98a3341acef2aa05c61df9.tar.gz
 _eclasses_=meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9f7021eaef63ab3c8099b1a5fc2c14ff
+_md5_=46d1af958f1dcfaea4245b1b1691d635
diff --git a/metadata/md5-cache/dev-libs/crossguid-0_pre20150817 b/metadata/md5-cache/dev-libs/crossguid-0_pre20150817
index 9c14de1249bd..a01e5da74abc 100644
--- a/metadata/md5-cache/dev-libs/crossguid-0_pre20150817
+++ b/metadata/md5-cache/dev-libs/crossguid-0_pre20150817
@@ -3,11 +3,11 @@ DEPEND=sys-apps/util-linux
 DESCRIPTION=Lightweight cross platform C++ GUID/UUID library
 EAPI=5
 HOMEPAGE=https://github.com/graeme-hill/crossguid
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MIT
 RDEPEND=sys-apps/util-linux
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/graeme-hill/crossguid/archive/8f399e8bd4252be9952f3dfa8199924cc8487ca4.tar.gz -> crossguid-0_pre20150817.tar.gz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=46a09457f1311a9abe5b564ccf1142a3
+_md5_=cdc384c31c9b59904e4c7f5b04136d48
diff --git a/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p13 b/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p13
deleted file mode 100644
index 8d493f075291..000000000000
--- a/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p13
+++ /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 virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=sys-apps/pcsc-lite usb? ( virtual/libusb:1 ) udev? ( virtual/udev ) xml? ( dev-libs/libxml2:2= )
-DESCRIPTION=REINER SCT cyberJack USB chipcard reader user space driver
-EAPI=7
-HOMEPAGE=https://www.reiner-sct.de/
-IUSE=static-libs threads tools +udev +usb xml kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=sys-apps/pcsc-lite usb? ( virtual/libusb:1 ) udev? ( virtual/udev ) xml? ( dev-libs/libxml2:2= )
-SLOT=0
-SRC_URI=https://support.reiner-sct.de/downloads/LINUX/V3.99.5_SP13/pcsc-cyberjack_3.99.5final.SP13.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=1917ff3c708a102f0da86298b10eb7e7
diff --git a/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p14 b/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p14
index 031b76890213..7af75d20b0ae 100644
--- a/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p14
+++ b/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p14
@@ -5,10 +5,10 @@ DESCRIPTION=REINER SCT cyberJack USB chipcard reader user space driver
 EAPI=7
 HOMEPAGE=https://www.reiner-sct.de/
 IUSE=static-libs threads tools +udev +usb xml kernel_linux
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=sys-apps/pcsc-lite usb? ( virtual/libusb:1 ) udev? ( virtual/udev ) xml? ( dev-libs/libxml2:2= )
 SLOT=0
 SRC_URI=http://kernelport.com/reiner-sct/SP14/pcsc-cyberjack-3.99.5final.SP14.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=3c77be427c0edb3685d620ee44169778
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=5ef65135e238c1ffcf6bbb3d5345472c
diff --git a/metadata/md5-cache/dev-libs/ell-0.31 b/metadata/md5-cache/dev-libs/ell-0.31
index 8c535aac03cd..e096446d9de5 100644
--- a/metadata/md5-cache/dev-libs/ell-0.31
+++ b/metadata/md5-cache/dev-libs/ell-0.31
@@ -10,5 +10,5 @@ RDEPEND=glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.31.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a62387b9d00fe9aa390de37987721cae
diff --git a/metadata/md5-cache/dev-libs/ell-0.32 b/metadata/md5-cache/dev-libs/ell-0.32
index 484b9cbf6e20..b3e6b769f4db 100644
--- a/metadata/md5-cache/dev-libs/ell-0.32
+++ b/metadata/md5-cache/dev-libs/ell-0.32
@@ -10,5 +10,5 @@ RDEPEND=glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.32.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c3d84c3d3663f0511afdde830b10595f
diff --git a/metadata/md5-cache/dev-libs/ell-9999 b/metadata/md5-cache/dev-libs/ell-9999
index 0ac98e028c5f..91fe1fa4f75f 100644
--- a/metadata/md5-cache/dev-libs/ell-9999
+++ b/metadata/md5-cache/dev-libs/ell-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 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(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c3d84c3d3663f0511afdde830b10595f
diff --git a/metadata/md5-cache/dev-libs/gjs-1.58.8 b/metadata/md5-cache/dev-libs/gjs-1.58.8
index 995f43ba3fc9..efb1c6fdbe4a 100644
--- a/metadata/md5-cache/dev-libs/gjs-1.58.8
+++ b/metadata/md5-cache/dev-libs/gjs-1.58.8
@@ -4,11 +4,11 @@ DESCRIPTION=Javascript bindings for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Gjs
 IUSE=+cairo examples gtk readline +sysprof test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
 RDEPEND=>=dev-libs/glib-2.58.0 >=dev-libs/gobject-introspection-1.61.2:= readline? ( sys-libs/readline:0= ) dev-lang/spidermonkey:60 dev-libs/libffi:= cairo? ( x11-libs/cairo[X] )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gjs/1.58/gjs-1.58.8.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2cb44a3a9b87294d983cb0ee34883cd2
+_md5_=0ed8ec64c2c227ebea8ba537f7ea808f
diff --git a/metadata/md5-cache/dev-libs/glib-2.62.6 b/metadata/md5-cache/dev-libs/glib-2.62.6
index cd82ccce359a..41a4f0afe361 100644
--- a/metadata/md5-cache/dev-libs/glib-2.62.6
+++ b/metadata/md5-cache/dev-libs/glib-2.62.6
@@ -12,5 +12,5 @@ RDEPEND=!<dev-util/gdbus-codegen-2.62.6 >=virtual/libiconv-0-r1[abi_x86_32(-)?,a
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.62/glib-2.62.6.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=82e9fb91f3b03e9ce09ebe740722224d
diff --git a/metadata/md5-cache/dev-libs/glib-2.64.3 b/metadata/md5-cache/dev-libs/glib-2.64.3
index 5fa5961ba990..347da56e864c 100644
--- a/metadata/md5-cache/dev-libs/glib-2.64.3
+++ b/metadata/md5-cache/dev-libs/glib-2.64.3
@@ -12,5 +12,5 @@ RDEPEND=!<dev-util/gdbus-codegen-2.64.3 >=virtual/libiconv-0-r1[abi_x86_32(-)?,a
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.64/glib-2.64.3.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=48b7a2da9b742b69a8acdbf77e93ebff
diff --git a/metadata/md5-cache/dev-libs/hsa-ext-rocr-1.1.30500.0 b/metadata/md5-cache/dev-libs/hsa-ext-rocr-1.1.30500.0
index 71e84c0f9b2b..017b2bf72671 100644
--- a/metadata/md5-cache/dev-libs/hsa-ext-rocr-1.1.30500.0
+++ b/metadata/md5-cache/dev-libs/hsa-ext-rocr-1.1.30500.0
@@ -8,5 +8,5 @@ LICENSE=AMD-GPU-PRO-EULA
 RESTRICT=bindist strip
 SLOT=0
 SRC_URI=https://repo.radeon.com/rocm/apt/debian/pool/main/h/hsa-ext-rocr-dev/hsa-ext-rocr-dev_1.1.30500.0-rocm-rel-3.5-30-def83d8_amd64.deb
-_eclasses_=unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=11819db2ea23d168c153cc2693bf4967
diff --git a/metadata/md5-cache/dev-libs/iniparser-3.1-r2 b/metadata/md5-cache/dev-libs/iniparser-3.1-r2
index bf9c93419f76..9b48b882f92d 100644
--- a/metadata/md5-cache/dev-libs/iniparser-3.1-r2
+++ b/metadata/md5-cache/dev-libs/iniparser-3.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A free stand-alone ini file parsing library
 EAPI=4
 HOMEPAGE=http://ndevilla.free.fr/iniparser/
 IUSE=doc examples 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 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~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=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ndevilla.free.fr/iniparser/iniparser-3.1.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-multilib	dd33c3299bb81aa8dcb97f66f24a29bc	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ffbda1377ed5fa632fb36ad4906fb627
+_md5_=7743a311c319b461e72fc037d2e7caf4
diff --git a/metadata/md5-cache/dev-libs/intel-neo-20.03.15346 b/metadata/md5-cache/dev-libs/intel-neo-20.03.15346
deleted file mode 100644
index 6ad898692962..000000000000
--- a/metadata/md5-cache/dev-libs/intel-neo-20.03.15346
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/opencl-3 >=dev-util/intel-graphics-compiler-1.0.3151 >=media-libs/gmmlib-19.4.1 vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva ) media-libs/mesa
-DESCRIPTION=Intel Graphics Compute Runtime for OpenCL, for Gen8 (Broadwell) and beyond
-EAPI=7
-HOMEPAGE=https://github.com/intel/compute-runtime
-IUSE=vaapi
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=virtual/opencl-3 >=dev-util/intel-graphics-compiler-1.0.3151 >=media-libs/gmmlib-19.4.1 vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva )
-SLOT=0
-SRC_URI=https://github.com/intel/compute-runtime/archive/20.03.15346.tar.gz -> intel-neo-20.03.15346.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=922ea9a68c640248123e8f78704b1a9a
diff --git a/metadata/md5-cache/dev-libs/intel-neo-20.10.16087 b/metadata/md5-cache/dev-libs/intel-neo-20.10.16087
deleted file mode 100644
index 503770569330..000000000000
--- a/metadata/md5-cache/dev-libs/intel-neo-20.10.16087
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/opencl-3 >=dev-util/intel-graphics-compiler-1.0.3445 >=media-libs/gmmlib-19.4.1 vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva ) media-libs/mesa
-DESCRIPTION=Intel Graphics Compute Runtime for OpenCL, for Gen8 (Broadwell) and beyond
-EAPI=7
-HOMEPAGE=https://github.com/intel/compute-runtime
-IUSE=vaapi
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=virtual/opencl-3 >=dev-util/intel-graphics-compiler-1.0.3445 >=media-libs/gmmlib-19.4.1 vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva )
-SLOT=0
-SRC_URI=https://github.com/intel/compute-runtime/archive/20.10.16087.tar.gz -> intel-neo-20.10.16087.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3e06da5d034bbba224f07d226ea8b869
diff --git a/metadata/md5-cache/dev-libs/intel-neo-20.16.16582 b/metadata/md5-cache/dev-libs/intel-neo-20.16.16582
index fd32ecb9d80a..f25bf91196a9 100644
--- a/metadata/md5-cache/dev-libs/intel-neo-20.16.16582
+++ b/metadata/md5-cache/dev-libs/intel-neo-20.16.16582
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/opencl-3 >=dev-util/intel-graphics-compiler-1.0.3826 >=media-libs/gmmlib-20.1.1 l0? ( >=dev-libs/level-zero-0.91.10 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva ) dev-util/opencl-headers media-libs/mesa
+DEPEND=>=virtual/opencl-3 >=dev-util/intel-graphics-compiler-1.0.3826 >=media-libs/gmmlib-20.1.1 l0? ( >=dev-libs/level-zero-0.91.10 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva ) media-libs/mesa
 DESCRIPTION=Intel Graphics Compute Runtime for L0 and OpenCL, for Broadwell and beyond
 EAPI=7
 HOMEPAGE=https://github.com/intel/compute-runtime
@@ -11,4 +11,4 @@ RDEPEND=>=virtual/opencl-3 >=dev-util/intel-graphics-compiler-1.0.3826 >=media-l
 SLOT=0
 SRC_URI=https://github.com/intel/compute-runtime/archive/20.16.16582.tar.gz -> intel-neo-20.16.16582.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6f9bfd5b2e237d437c58e22203752da5
+_md5_=474fc3158a4293725179e39a9359836e
diff --git a/metadata/md5-cache/dev-libs/keystone-0.9.1 b/metadata/md5-cache/dev-libs/keystone-0.9.1
index 4f7abed63c31..f3cc578475cc 100644
--- a/metadata/md5-cache/dev-libs/keystone-0.9.1
+++ b/metadata/md5-cache/dev-libs/keystone-0.9.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install 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(-)] sys-devel/make >=dev-util/cmake-3.8.7 !!sys-devel/llvm:0
 DESCRIPTION=assembly/assembler framework + bindings
 EAPI=6
-HOMEPAGE=http://www.keystone-engine.org/
+HOMEPAGE=https://www.keystone-engine.org/
 IUSE=python 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_python3_6
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_6 ) || ( llvm_targets_AArch64 llvm_targ
 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	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4606ef04806cddfa7ba3d7aa0a88b469
+_md5_=b1f0f62d8ced17411fa2f20d43e87c5a
diff --git a/metadata/md5-cache/dev-libs/keystone-0.9.1-r1 b/metadata/md5-cache/dev-libs/keystone-0.9.1-r1
index ecd325a5394e..4495859c1044 100644
--- a/metadata/md5-cache/dev-libs/keystone-0.9.1-r1
+++ b/metadata/md5-cache/dev-libs/keystone-0.9.1-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=<sys-devel/llvm-11:= || ( sys-devel/llvm:8[llvm_targets_AArch64?,llvm_targets_ARM?,llvm_targets_Hexagon?,llvm_targets_Mips?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?] sys-devel/llvm:9[llvm_targets_AArch64?,llvm_targets_ARM?,llvm_targets_Hexagon?,llvm_targets_Mips?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?] sys-devel/llvm:10[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? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_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(-)] ) !!sys-devel/llvm:0
 DESCRIPTION=assembly/assembler framework + bindings
 EAPI=7
-HOMEPAGE=http://www.keystone-engine.org/
+HOMEPAGE=https://www.keystone-engine.org/
 IUSE=python 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_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86
 LICENSE=GPL-2
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_ARM llvm_targets_Hexagon llv
 SLOT=0
 SRC_URI=https://github.com/keystone-engine/keystone/archive/0.9.1.tar.gz -> keystone-0.9.1.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=49d4743f518d55055b427e2967e6ba60
+_md5_=84fbad9a0728d07ec6c1bbfcf7c5bc53
diff --git a/metadata/md5-cache/dev-libs/keystone-9999 b/metadata/md5-cache/dev-libs/keystone-9999
index 3c2a6a61f958..953bc4a73501 100644
--- a/metadata/md5-cache/dev-libs/keystone-9999
+++ b/metadata/md5-cache/dev-libs/keystone-9999
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=<sys-devel/llvm-11:= || ( sys-devel/llvm:8[llvm_targets_AArch64?,llvm_targets_ARM?,llvm_targets_Hexagon?,llvm_targets_Mips?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?] sys-devel/llvm:9[llvm_targets_AArch64?,llvm_targets_ARM?,llvm_targets_Hexagon?,llvm_targets_Mips?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?] sys-devel/llvm:10[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? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_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(-)] ) !!sys-devel/llvm:0
 DESCRIPTION=assembly/assembler framework + bindings
 EAPI=7
-HOMEPAGE=http://www.keystone-engine.org/
+HOMEPAGE=https://www.keystone-engine.org/
 IUSE=python 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_python3_6 python_targets_python3_7 python_targets_python3_8
 LICENSE=GPL-2
 PROPERTIES=live
@@ -11,4 +11,4 @@ RDEPEND=<sys-devel/llvm-11:= || ( sys-devel/llvm:8[llvm_targets_AArch64?,llvm_ta
 REQUIRED_USE=|| ( 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? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=49d4743f518d55055b427e2967e6ba60
+_md5_=84fbad9a0728d07ec6c1bbfcf7c5bc53
diff --git a/metadata/md5-cache/dev-libs/kpathsea-6.3.2_p20200406 b/metadata/md5-cache/dev-libs/kpathsea-6.3.2_p20200406
index a6f92c70c670..b52f104e28b6 100644
--- a/metadata/md5-cache/dev-libs/kpathsea-6.3.2_p20200406
+++ b/metadata/md5-cache/dev-libs/kpathsea-6.3.2_p20200406
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64
 LICENSE=GPL-2
 SLOT=0/6.3.2
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-20200406-source.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/kpathsea-texmf.d-10.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kpathsea-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kpathsea.doc-2020.tar.xz )
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	texlive-common	3438add11e8232d1fa32884e5e278bfe	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	texlive-common	0eca2ea110130453e0124f83ce50c408	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=841ff52fdc7f3c7d5eb7ae614dfeec70
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 f9b2dcb02c1d..cb13abdbdb61 100644
--- a/metadata/md5-cache/dev-libs/libcec-4.0.2-r2
+++ b/metadata/md5-cache/dev-libs/libcec-4.0.2-r2
@@ -10,5 +10,5 @@ RDEPEND=virtual/udev >=dev-libs/libplatform-2.0.0 sys-libs/ncurses:= raspberry-p
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/Pulse-Eight/libcec/archive/libcec-4.0.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	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 d0c25253ce41..9a7fbe7c462b 100644
--- a/metadata/md5-cache/dev-libs/libcec-4.0.4-r1
+++ b/metadata/md5-cache/dev-libs/libcec-4.0.4-r1
@@ -5,11 +5,11 @@ 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_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~arm64 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_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_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 ) )
 SLOT=0
 SRC_URI=https://github.com/Pulse-Eight/libcec/archive/libcec-4.0.4.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=018c8760b6d8439870dfd130297960b5
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6ca041458b517211c42fd97c719a6068
diff --git a/metadata/md5-cache/dev-libs/libcgroup-0.41-r5 b/metadata/md5-cache/dev-libs/libcgroup-0.41-r5
index eb39317eb967..ad675ab8be78 100644
--- a/metadata/md5-cache/dev-libs/libcgroup-0.41-r5
+++ b/metadata/md5-cache/dev-libs/libcgroup-0.41-r5
@@ -11,5 +11,5 @@ REQUIRED_USE=daemon? ( tools )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/libcg/libcgroup/v0.41/libcgroup-0.41.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4257ec64bdb19667c60f5a1230d3ce25
diff --git a/metadata/md5-cache/dev-libs/libcgroup-0.41-r6 b/metadata/md5-cache/dev-libs/libcgroup-0.41-r6
index f9f810cb56cc..e790f13a6175 100644
--- a/metadata/md5-cache/dev-libs/libcgroup-0.41-r6
+++ b/metadata/md5-cache/dev-libs/libcgroup-0.41-r6
@@ -12,5 +12,5 @@ REQUIRED_USE=daemon? ( tools )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/project/libcg/libcgroup/v0.41/libcgroup-0.41.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a6faec3175623f6cc6d197d50588aaff
diff --git a/metadata/md5-cache/dev-libs/libclangformat-ide-10.0.0 b/metadata/md5-cache/dev-libs/libclangformat-ide-10.0.0
new file mode 100644
index 000000000000..d47db9d547ac
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libclangformat-ide-10.0.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=~sys-devel/llvm-10.0.0:10=[debug=] !!sys-devel/llvm:0
+DESCRIPTION=A static clangformat library patched for IDE use
+EAPI=7
+HOMEPAGE=https://www.qt.io/blog/2019/04/17/clangformat-plugin-qt-creator-4-9
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
+SLOT=10
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ce74c5307bfe422894fe175359b0331c
diff --git a/metadata/md5-cache/dev-libs/libclangformat-ide-9.0.1 b/metadata/md5-cache/dev-libs/libclangformat-ide-9.0.1
new file mode 100644
index 000000000000..cf1f6eaab256
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libclangformat-ide-9.0.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=~sys-devel/llvm-9.0.1:9=[debug=] !!sys-devel/llvm:0
+DESCRIPTION=A static clangformat library patched for IDE use
+EAPI=7
+HOMEPAGE=https://www.qt.io/blog/2019/04/17/clangformat-plugin-qt-creator-4-9
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
+SLOT=9
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-9.0.1.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ce74c5307bfe422894fe175359b0331c
diff --git a/metadata/md5-cache/dev-libs/libfido2-1.3.1 b/metadata/md5-cache/dev-libs/libfido2-1.3.1
index 97261fb6887d..51595559ab62 100644
--- a/metadata/md5-cache/dev-libs/libfido2-1.3.1
+++ b/metadata/md5-cache/dev-libs/libfido2-1.3.1
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=dev-libs/libcbor:= virtual/libudev:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 SLOT=0/1
 SRC_URI=https://github.com/Yubico/libfido2/archive/1.3.1.tar.gz -> libfido2-1.3.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=66043687bc82e8de558cb6ef24b83f24
diff --git a/metadata/md5-cache/dev-libs/libfido2-1.4.0 b/metadata/md5-cache/dev-libs/libfido2-1.4.0
index 842630b8fdea..37d65a13b242 100644
--- a/metadata/md5-cache/dev-libs/libfido2-1.4.0
+++ b/metadata/md5-cache/dev-libs/libfido2-1.4.0
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=dev-libs/libcbor:= virtual/libudev:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 SLOT=0/1
 SRC_URI=https://github.com/Yubico/libfido2/archive/1.4.0.tar.gz -> libfido2-1.4.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b060e3a5810ff9aa72211d8d1f313923
diff --git a/metadata/md5-cache/dev-libs/libfmt-6.2.1 b/metadata/md5-cache/dev-libs/libfmt-6.2.1
index ddd9106de24a..9b34272f1503 100644
--- a/metadata/md5-cache/dev-libs/libfmt-6.2.1
+++ b/metadata/md5-cache/dev-libs/libfmt-6.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=Small, safe and fast formatting library
 EAPI=7
 HOMEPAGE=https://github.com/fmtlib/fmt
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://github.com/fmtlib/fmt/archive/6.2.1.tar.gz -> libfmt-6.2.1.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=149909be840290d177a701430b3eb6a1
+_md5_=8f36d02cbdc974338c90523c5a07f02a
diff --git a/metadata/md5-cache/dev-libs/libfstrcmp-0.7-r1 b/metadata/md5-cache/dev-libs/libfstrcmp-0.7-r1
index 0de5523c21e3..5c8bf50b5ad7 100644
--- a/metadata/md5-cache/dev-libs/libfstrcmp-0.7-r1
+++ b/metadata/md5-cache/dev-libs/libfstrcmp-0.7-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Make fuzzy comparisons of strings and byte arrays
 EAPI=7
 HOMEPAGE=http://fstrcmp.sourceforge.net/
 IUSE=doc static-libs test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-3+
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://fstrcmp.sourceforge.net/fstrcmp-0.7.D001.tar.gz -> libfstrcmp-0.7.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a68cf1173cdcc6b67dcd330385e64c16
+_md5_=e7886eff564b947232b3581a8e8e74a7
diff --git a/metadata/md5-cache/dev-libs/libgusb-0.3.4 b/metadata/md5-cache/dev-libs/libgusb-0.3.4
index c093fa6dad5e..3aa4c873a562 100644
--- a/metadata/md5-cache/dev-libs/libgusb-0.3.4
+++ b/metadata/md5-cache/dev-libs/libgusb-0.3.4
@@ -5,7 +5,7 @@ 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
+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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://people.freedesktop.org/~hughsient/releases/libgusb-0.3.4.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6
-_md5_=aa0d546f273d5040e420029a524844b2
+_md5_=d945ea3b72765868aab441154c5c85a6
diff --git a/metadata/md5-cache/dev-libs/libinput-1.15.4 b/metadata/md5-cache/dev-libs/libinput-1.15.4
deleted file mode 100644
index 884e17031d61..000000000000
--- a/metadata/md5-cache/dev-libs/libinput-1.15.4
+++ /dev/null
@@ -1,15 +0,0 @@
-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 test? ( >=dev-libs/check-0.9.10 )
-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 test
-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? ( test )
-SLOT=0/10
-SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.15.4.tar.xz
-_eclasses_=meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=86dca6f59debc47c3de97d0ebb23f288
diff --git a/metadata/md5-cache/dev-libs/libinput-1.15.5 b/metadata/md5-cache/dev-libs/libinput-1.15.5
index 18e93ecb83f5..a51558acec8f 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.15.5
+++ b/metadata/md5-cache/dev-libs/libinput-1.15.5
@@ -5,11 +5,11 @@ 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 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=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? ( test )
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.15.5.tar.xz
 _eclasses_=meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=d7577eb97ff30e22484eb44f87af631d
+_md5_=86dca6f59debc47c3de97d0ebb23f288
diff --git a/metadata/md5-cache/dev-libs/libjcat-0.1.3 b/metadata/md5-cache/dev-libs/libjcat-0.1.3
index 4b3515063378..a8283c1e0546 100644
--- a/metadata/md5-cache/dev-libs/libjcat-0.1.3
+++ b/metadata/md5-cache/dev-libs/libjcat-0.1.3
@@ -5,11 +5,11 @@ DESCRIPTION=Library and tool for reading and writing Jcat files
 EAPI=7
 HOMEPAGE=https://github.com/hughsie/libjcat
 IUSE=gpg gtk-doc +introspection +man pkcs7 test
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2 dev-libs/json-glib:= gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) introspection? ( dev-libs/gobject-introspection:= ) pkcs7? ( net-libs/gnutls ) dev-lang/vala:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hughsie/libjcat/archive/0.1.3.tar.gz -> libjcat-0.1.3.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5e938e4a426c83bf43f7def971fdc039
+_md5_=410ce45837c631d5b5bc2b9a726cd0d7
diff --git a/metadata/md5-cache/dev-libs/libmanette-0.2.4 b/metadata/md5-cache/dev-libs/libmanette-0.2.4
index 2089401d5048..9dbba4095d23 100644
--- a/metadata/md5-cache/dev-libs/libmanette-0.2.4
+++ b/metadata/md5-cache/dev-libs/libmanette-0.2.4
@@ -5,11 +5,11 @@ DESCRIPTION=Simple GObject game controller library
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/aplazas/libmanette
 IUSE=+introspection +udev +vala
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.50:2 udev? ( dev-libs/libgudev[introspection?] ) dev-libs/libevdev introspection? ( >=dev-libs/gobject-introspection-1.56:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libmanette/0.2/libmanette-0.2.4.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6ffa18317d0ee9d17c5aae2c7788f15e
+_md5_=7aa9b396850d6b645083150c9d9cb175
diff --git a/metadata/md5-cache/dev-libs/libmaxminddb-1.4.2 b/metadata/md5-cache/dev-libs/libmaxminddb-1.4.2
index 779b3cc72316..437c0c42bdf3 100644
--- a/metadata/md5-cache/dev-libs/libmaxminddb-1.4.2
+++ b/metadata/md5-cache/dev-libs/libmaxminddb-1.4.2
@@ -3,8 +3,8 @@ DESCRIPTION=C library for the MaxMind DB file format
 EAPI=7
 HOMEPAGE=https://github.com/maxmind/libmaxminddb
 IUSE=static-libs
-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=Apache-2.0
 SLOT=0/0.0.7
 SRC_URI=https://github.com/maxmind/libmaxminddb/releases/download/1.4.2/libmaxminddb-1.4.2.tar.gz
-_md5_=9d15be369b5cf286cd23d33470c597e4
+_md5_=e84d3352c10af52087f2d24453d56b99
diff --git a/metadata/md5-cache/dev-libs/libnl-3.5.0 b/metadata/md5-cache/dev-libs/libnl-3.5.0
index be9fca663d8e..14cf8add0f44 100644
--- a/metadata/md5-cache/dev-libs/libnl-3.5.0
+++ b/metadata/md5-cache/dev-libs/libnl-3.5.0
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815
+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(-)] ) python? ( dev-lang/swig ) sys-devel/bison sys-devel/flex >=app-portage/elt-patches-20170815
 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(-)] ) python? ( dev-lang/swig ) sys-devel/bison sys-devel/flex
+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=Libraries providing APIs to netlink protocol based Linux kernel interfaces
 EAPI=7
 HOMEPAGE=http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 py
 SLOT=3
 SRC_URI=https://github.com/thom311/libnl/releases/download/libnl3_5_0/libnl-3.5.0.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cac70276e0b7a04120a0624084b43d25
+_md5_=258c63001acd8994a1049e28c93387e3
diff --git a/metadata/md5-cache/dev-libs/libnl-99999999 b/metadata/md5-cache/dev-libs/libnl-99999999
index ff30029e1c49..b59e93dfa076 100644
--- a/metadata/md5-cache/dev-libs/libnl-99999999
+++ b/metadata/md5-cache/dev-libs/libnl-99999999
@@ -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]
+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(-)] ) python? ( dev-lang/swig ) sys-devel/bison sys-devel/flex >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 test unpack
-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(-)] ) python? ( dev-lang/swig ) sys-devel/bison sys-devel/flex
+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=Libraries providing APIs to netlink protocol based Linux kernel interfaces
 EAPI=7
 HOMEPAGE=http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl
@@ -11,4 +11,4 @@ RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targe
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=3
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	44725b3eb803b8abcd6978759c231210	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=50a9d82eb0d77832ac58882722ed6eb2
+_md5_=6d424ad7e73d0760af26bc4db7b94f12
diff --git a/metadata/md5-cache/dev-libs/libparserutils-0.2.3 b/metadata/md5-cache/dev-libs/libparserutils-0.2.3
deleted file mode 100644
index e3daf14c1810..000000000000
--- a/metadata/md5-cache/dev-libs/libparserutils-0.2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-lang/perl ) virtual/pkgconfig
-DESCRIPTION=library for building efficient parsers, written in C
-EAPI=5
-HOMEPAGE=http://www.netsurf-browser.org/projects/libparserutils/
-IUSE=iconv test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 debug static-libs
-KEYWORDS=amd64 arm ~ppc x86 ~m68k-mint
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0/0.2.3
-SRC_URI=http://download.netsurf-browser.org/libs/releases/libparserutils-0.2.3-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.5.tar.gz -> netsurf-buildsystem-1.5.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	45009f983cea2d915d6977508b125099	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b65ba4326da6bc768497f2ed50be8e23
diff --git a/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r1 b/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r1
index c11f38eedbb1..a78754cacacc 100644
--- a/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r1
+++ b/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=library for building efficient parsers, written in C
 EAPI=7
 HOMEPAGE=http://www.netsurf-browser.org/projects/libparserutils/
 IUSE=iconv test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~m68k-mint
+KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 x86 ~m68k-mint
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/0.2.4
 SRC_URI=https://download.netsurf-browser.org/libs/releases/libparserutils-0.2.4-src.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=40855bd10e5b2379dc1a83268631c69e
+_md5_=8ab448978c004bebf5064f1de2c20e7e
diff --git a/metadata/md5-cache/dev-libs/libplatform-2.1.0.1-r1 b/metadata/md5-cache/dev-libs/libplatform-2.1.0.1-r1
index 9110f771dc4d..fc3c67f13690 100644
--- a/metadata/md5-cache/dev-libs/libplatform-2.1.0.1-r1
+++ b/metadata/md5-cache/dev-libs/libplatform-2.1.0.1-r1
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Platform support library used by libCEC and binary add-ons for Kodi
 EAPI=7
 HOMEPAGE=https://github.com/Pulse-Eight/platform
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/Pulse-Eight/platform/archive/p8-platform-2.1.0.1.tar.gz -> libplatform-2.1.0.1.tar.gz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=71be9b103e3d71be93e4b9909a7f4fe3
+_md5_=170f1fcf9beb1ef4510acf727b40a991
diff --git a/metadata/md5-cache/dev-libs/librdkafka-1.4.2-r1 b/metadata/md5-cache/dev-libs/librdkafka-1.4.2-r1
index 25aa32b6c87f..14a4cf07ccf9 100644
--- a/metadata/md5-cache/dev-libs/librdkafka-1.4.2-r1
+++ b/metadata/md5-cache/dev-libs/librdkafka-1.4.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Apache Kafka C/C++ client library
 EAPI=7
 HOMEPAGE=https://github.com/edenhill/librdkafka
 IUSE=lz4 sasl ssl static-libs zstd
-KEYWORDS=~amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD-2
 RDEPEND=!static-libs? ( lz4? ( app-arch/lz4:= ) sasl? ( dev-libs/cyrus-sasl:= ) ssl? ( dev-libs/openssl:0= ) zstd? ( app-arch/zstd:= ) sys-libs/zlib:= )
 SLOT=0/1
 SRC_URI=https://github.com/edenhill/librdkafka/archive/v1.4.2.tar.gz -> librdkafka-1.4.2.tar.gz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8e72b3caaffc58045aa0e1597c1d9177
+_md5_=04ac48dfd6a6d38ed8cfa829fec69997
diff --git a/metadata/md5-cache/dev-libs/librdkafka-1.4.4 b/metadata/md5-cache/dev-libs/librdkafka-1.4.4
new file mode 100644
index 000000000000..7e83dc73562b
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/librdkafka-1.4.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=!static-libs? ( lz4? ( app-arch/lz4:= ) sasl? ( dev-libs/cyrus-sasl:= ) ssl? ( dev-libs/openssl:0= ) zstd? ( app-arch/zstd:= ) sys-libs/zlib:= ) virtual/pkgconfig static-libs? ( lz4? ( app-arch/lz4:=[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl:=[static-libs(+)] ) ssl? ( dev-libs/openssl:0=[static-libs(+)] ) zstd? ( app-arch/zstd:=[static-libs(+)] ) sys-libs/zlib:=[static-libs(+)] )
+DESCRIPTION=Apache Kafka C/C++ client library
+EAPI=7
+HOMEPAGE=https://github.com/edenhill/librdkafka
+IUSE=lz4 sasl ssl static-libs zstd
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD-2
+RDEPEND=!static-libs? ( lz4? ( app-arch/lz4:= ) sasl? ( dev-libs/cyrus-sasl:= ) ssl? ( dev-libs/openssl:0= ) zstd? ( app-arch/zstd:= ) sys-libs/zlib:= )
+SLOT=0/1
+SRC_URI=https://github.com/edenhill/librdkafka/archive/v1.4.4.tar.gz -> librdkafka-1.4.4.tar.gz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=158c04fb53efe330cf1b1ca786239ed8
diff --git a/metadata/md5-cache/dev-libs/libressl-3.1.2 b/metadata/md5-cache/dev-libs/libressl-3.1.2
index d40b1df10ac6..4e0537eb4734 100644
--- a/metadata/md5-cache/dev-libs/libressl-3.1.2
+++ b/metadata/md5-cache/dev-libs/libressl-3.1.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/48
 SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.1.2.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=88c742d303a630e74ec0100af8250a13
+_md5_=87420a8e985d9389b93df897ae203f49
diff --git a/metadata/md5-cache/dev-libs/libressl-3.1.3 b/metadata/md5-cache/dev-libs/libressl-3.1.3
index fe93922d4640..5d10e72b1cb3 100644
--- a/metadata/md5-cache/dev-libs/libressl-3.1.3
+++ b/metadata/md5-cache/dev-libs/libressl-3.1.3
@@ -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/48
 SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.1.3.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=88c742d303a630e74ec0100af8250a13
+_md5_=87420a8e985d9389b93df897ae203f49
diff --git a/metadata/md5-cache/dev-libs/libsigc++-2.10.3 b/metadata/md5-cache/dev-libs/libsigc++-2.10.3
index c082a08230c8..1d5e89a3ce77 100644
--- a/metadata/md5-cache/dev-libs/libsigc++-2.10.3
+++ b/metadata/md5-cache/dev-libs/libsigc++-2.10.3
@@ -4,10 +4,10 @@ DESCRIPTION=Typesafe callback system for standard C++
 EAPI=6
 HOMEPAGE=http://libsigc.sourceforge.net/
 IUSE=doc 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/libsigc++/2.10/libsigc++-2.10.3.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=29d39bb2116d172f873ffde4badb9925
+_md5_=e7cbe3b332adeaa6b188365d52b1c5e2
diff --git a/metadata/md5-cache/dev-libs/libtecla-1.6.3 b/metadata/md5-cache/dev-libs/libtecla-1.6.3
index e08d8f111002..26804847b5a1 100644
--- a/metadata/md5-cache/dev-libs/libtecla-1.6.3
+++ b/metadata/md5-cache/dev-libs/libtecla-1.6.3
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure 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
 DESCRIPTION=Tecla command-line editing library
 EAPI=6
-HOMEPAGE=http://www.astro.caltech.edu/~mcs/tecla/
+HOMEPAGE=https://www.astro.caltech.edu/~mcs/tecla/
 IUSE=static-libs
 KEYWORDS=amd64 ~arm ppc x86 ~amd64-linux ~x86-linux
 LICENSE=icu
 RDEPEND=sys-libs/ncurses:=
 SLOT=0
-SRC_URI=http://www.astro.caltech.edu/~mcs/tecla/libtecla-1.6.3.tar.gz
+SRC_URI=https://www.astro.caltech.edu/~mcs/tecla/libtecla-1.6.3.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7d06e74eb11d879063031c1d1915b6d6
+_md5_=1a857d752bf84d6caa1f3ae4473315e1
diff --git a/metadata/md5-cache/dev-libs/libtpms-0.7.0-r1 b/metadata/md5-cache/dev-libs/libtpms-0.7.0-r1
deleted file mode 100644
index 84c3eacdc881..000000000000
--- a/metadata/md5-cache/dev-libs/libtpms-0.7.0-r1
+++ /dev/null
@@ -1,14 +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=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=Library providing software emultion of a TPM
-EAPI=7
-HOMEPAGE=https://github.com/stefanberger/libtpms
-IUSE=libressl
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-SLOT=0
-SRC_URI=https://github.com/stefanberger/libtpms/archive/v0.7.0.tar.gz -> libtpms-0.7.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d8c6a6ed35938d05d6b13b26ed870f78
diff --git a/metadata/md5-cache/dev-libs/libtpms-0.7.2 b/metadata/md5-cache/dev-libs/libtpms-0.7.2
new file mode 100644
index 000000000000..976efb4c0ca8
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libtpms-0.7.2
@@ -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=configure install prepare
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+DESCRIPTION=Library providing software emultion of a TPM
+EAPI=7
+HOMEPAGE=https://github.com/stefanberger/libtpms
+IUSE=libressl
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+SLOT=0
+SRC_URI=https://github.com/stefanberger/libtpms/archive/v0.7.2.tar.gz -> libtpms-0.7.2.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=497c06abd819572008c08a1da4f2fed4
diff --git a/metadata/md5-cache/dev-libs/libugpio-0.0.6 b/metadata/md5-cache/dev-libs/libugpio-0.0.6
index 1386c09853f3..8dc3397579c8 100644
--- a/metadata/md5-cache/dev-libs/libugpio-0.0.6
+++ b/metadata/md5-cache/dev-libs/libugpio-0.0.6
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-3+ LGPL-2.1+
 SLOT=0
 SRC_URI=https://github.com/mhei/libugpio/releases/download/v0.0.6/libugpio-0.0.6.tar.bz2
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b2a28c5282623f95995aa8ecf2acbf0c
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 1727d63c87c7..dd2318a059af 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 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=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	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=523cfd9caf5b58cf7e72c4baf161f7d2
+_md5_=498353312f9970a5c15ba2917efa2488
diff --git a/metadata/md5-cache/dev-libs/libxmlb-0.1.15 b/metadata/md5-cache/dev-libs/libxmlb-0.1.15
index 792a3995ad8e..cd33378ad443 100644
--- a/metadata/md5-cache/dev-libs/libxmlb-0.1.15
+++ b/metadata/md5-cache/dev-libs/libxmlb-0.1.15
@@ -5,11 +5,11 @@ DESCRIPTION=Library to help create and query binary XML blobs
 EAPI=7
 HOMEPAGE=https://github.com/hughsie/libxmlb
 IUSE=doc introspection stemmer test
-KEYWORDS=~amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2 sys-apps/util-linux stemmer? ( dev-libs/snowball-stemmer )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hughsie/libxmlb/archive/0.1.15.tar.gz -> libxmlb-0.1.15.tar.gz
 _eclasses_=meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=97216492020d49e84b2939e2758cd2c6
+_md5_=36a966216b9b10f8169f31ecce11153e
diff --git a/metadata/md5-cache/dev-libs/libzip-1.7.0 b/metadata/md5-cache/dev-libs/libzip-1.7.0
deleted file mode 100644
index aec8d874c99d..000000000000
--- a/metadata/md5-cache/dev-libs/libzip-1.7.0
+++ /dev/null
@@ -1,16 +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/xz-utils ) 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 gnutls libressl lzma mbedtls ssl static-libs test tools
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~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/xz-utils ) 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= ) ) ) )
-REQUIRED_USE=test? ( tools )
-RESTRICT=!test? ( test )
-SLOT=0/5
-SRC_URI=https://www.nih.at/libzip/libzip-1.7.0.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=993247ce03d9a8310312b63d801f6dd2
diff --git a/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r3 b/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r3
index fe4d7653435e..7816f244a205 100644
--- a/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r3
+++ b/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r3
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://debian/pool/main/l/lockdev/lockdev_1.0.3.orig.tar.gz mirror://debian/pool/main/l/lockdev/lockdev_1.0.3-1.2.diff.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=22fd95a9a7d2907030c9cc10e4acae93
diff --git a/metadata/md5-cache/dev-libs/log4cxx-0.10.0-r1 b/metadata/md5-cache/dev-libs/log4cxx-0.10.0-r1
index 47ca26638735..1963202f1587 100644
--- a/metadata/md5-cache/dev-libs/log4cxx-0.10.0-r1
+++ b/metadata/md5-cache/dev-libs/log4cxx-0.10.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Library of C++ classes for logging to files, syslog and other destin
 EAPI=6
 HOMEPAGE=https://logging.apache.org/log4cxx/
 IUSE=iodbc unicode odbc smtp
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1 dev-libs/apr-util:1 odbc? ( iodbc? ( >=dev-db/libiodbc-3.52.4 ) !iodbc? ( dev-db/unixODBC ) ) smtp? ( net-libs/libesmtp )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/logging/log4cxx/0.10.0/apache-log4cxx-0.10.0.tar.gz
-_md5_=f21681c6e3cce2527c0297e2552ffb93
+_md5_=b425e6d977cb51b0bab74b6be3655822
diff --git a/metadata/md5-cache/dev-libs/newt-0.52.20 b/metadata/md5-cache/dev-libs/newt-0.52.20
deleted file mode 100644
index 272d891c00c5..000000000000
--- a/metadata/md5-cache/dev-libs/newt-0.52.20
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-libs/popt-1.6 =sys-libs/slang-2* elibc_uclibc? ( sys-libs/ncurses:0= ) gpm? ( sys-libs/gpm ) tcl? ( >=dev-lang/tcl-8.5: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=Redhat's Newt windowing toolkit development files
-EAPI=6
-HOMEPAGE=https://pagure.io/newt
-IUSE=gpm nls tcl python_targets_python2_7 python_targets_python3_6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~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 ) >=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/popt-1.6 =sys-libs/slang-2* elibc_uclibc? ( sys-libs/ncurses:0= ) gpm? ( sys-libs/gpm ) tcl? ( >=dev-lang/tcl-8.5:0 )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://releases.pagure.org/newt/newt-0.52.20.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b8460d7ea94114bd2e61725269a9fec6
diff --git a/metadata/md5-cache/dev-libs/newt-0.52.21 b/metadata/md5-cache/dev-libs/newt-0.52.21
deleted file mode 100644
index efb2ee241a49..000000000000
--- a/metadata/md5-cache/dev-libs/newt-0.52.21
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-libs/popt-1.6 =sys-libs/slang-2* elibc_uclibc? ( sys-libs/ncurses:0= ) gpm? ( sys-libs/gpm ) tcl? ( >=dev-lang/tcl-8.5: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=Redhat's Newt windowing toolkit development files
-EAPI=6
-HOMEPAGE=https://pagure.io/newt
-IUSE=gpm nls tcl python_targets_python2_7 python_targets_python3_6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~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 ) >=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/popt-1.6 =sys-libs/slang-2* elibc_uclibc? ( sys-libs/ncurses:0= ) gpm? ( sys-libs/gpm ) tcl? ( >=dev-lang/tcl-8.5:0 )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://releases.pagure.org/newt/newt-0.52.21.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=15f9388b6905de7fb59631dffc14a77e
diff --git a/metadata/md5-cache/dev-libs/nspr-4.26 b/metadata/md5-cache/dev-libs/nspr-4.26
new file mode 100644
index 000000000000..c0e148e5d1d5
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/nspr-4.26
@@ -0,0 +1,12 @@
+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 test
+DESCRIPTION=Netscape Portable Runtime
+EAPI=7
+HOMEPAGE=http://www.mozilla.org/projects/nspr/
+IUSE=debug elibc_musl abi_x86_32 abi_x86_64 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 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
+SLOT=0
+SRC_URI=https://archive.mozilla.org/pub/nspr/releases/v4.26/src/nspr-4.26.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=cc2f99f8ea483833ccc3453b910879c4
diff --git a/metadata/md5-cache/dev-libs/nss-3.51.1-r1 b/metadata/md5-cache/dev-libs/nss-3.51.1-r1
deleted file mode 100644
index 1a1ef031b447..000000000000
--- a/metadata/md5-cache/dev-libs/nss-3.51.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-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(-)?] virtual/pkgconfig
-DESCRIPTION=Mozilla's Network Security Services library that implements PKI support
-EAPI=7
-HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/
-IUSE=cacert 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 ~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(-)?] virtual/pkgconfig
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_51_1_RTM/src/nss-3.51.1.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cf5deb3b0a903d0653677e530519fd82
diff --git a/metadata/md5-cache/dev-libs/nss-3.52 b/metadata/md5-cache/dev-libs/nss-3.52
deleted file mode 100644
index a2d535ef4868..000000000000
--- a/metadata/md5-cache/dev-libs/nss-3.52
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-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(-)?] virtual/pkgconfig
-DESCRIPTION=Mozilla's Network Security Services library that implements PKI support
-EAPI=7
-HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/
-IUSE=cacert 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 ~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(-)?] virtual/pkgconfig
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_52_RTM/src/nss-3.52.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cf5deb3b0a903d0653677e530519fd82
diff --git a/metadata/md5-cache/dev-libs/nss-3.52.1-r1 b/metadata/md5-cache/dev-libs/nss-3.52.1-r1
index 16897cb4937e..62dcb53f1e99 100644
--- a/metadata/md5-cache/dev-libs/nss-3.52.1-r1
+++ b/metadata/md5-cache/dev-libs/nss-3.52.1-r1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_52_1_RTM/src/nss-3.52.1.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9c7fd69045de0ddd7cef5a004c91e33e
+_md5_=b43ce2e3c81f070196bc814ce1226e4d
diff --git a/metadata/md5-cache/dev-libs/nss-3.53.1 b/metadata/md5-cache/dev-libs/nss-3.53.1
index dfbd98e905de..7a646e58bf48 100644
--- a/metadata/md5-cache/dev-libs/nss-3.53.1
+++ b/metadata/md5-cache/dev-libs/nss-3.53.1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_53_1_RTM/src/nss-3.53.1.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5d9f85ad5e1bb82698b041ab93a4533b
+_md5_=995515cf9c613045e937f4eea6f1d1bd
diff --git a/metadata/md5-cache/dev-libs/nss-3.54 b/metadata/md5-cache/dev-libs/nss-3.54
new file mode 100644
index 000000000000..0900115844d5
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/nss-3.54
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+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(-)?] virtual/pkgconfig
+DESCRIPTION=Mozilla's Network Security Services library that implements PKI support
+EAPI=7
+HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/
+IUSE=cacert 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 ~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(-)?] virtual/pkgconfig
+RESTRICT=test
+SLOT=0
+SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_54_RTM/src/nss-3.54.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=995515cf9c613045e937f4eea6f1d1bd
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.1 b/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.1
index 3382c5366022..204975b3af3c 100644
--- a/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.1
+++ b/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.1
@@ -1,4 +1,4 @@
-BDEPEND=dev-vcs/git dev-util/ninja dev-util/cmake
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=sys-devel/clang:10=[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(-)?] dev-util/spirv-llvm-translator: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(-)?] !!sys-devel/llvm:0
 DESCRIPTION=OpenCL-oriented thin wrapper library around clang
@@ -11,4 +11,4 @@ RDEPEND=sys-devel/clang:10=[static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,abi_x8
 SLOT=10
 SRC_URI=https://github.com/intel/opencl-clang/archive/v10.0.0-1.tar.gz -> opencl-clang-10.0.0.1.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ddd286925559ab880aaaa7147049a2b9
+_md5_=21c3144040829ac198637ba822873618
diff --git a/metadata/md5-cache/dev-libs/popt-1.18 b/metadata/md5-cache/dev-libs/popt-1.18
new file mode 100644
index 000000000000..ca7571924f11
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/popt-1.18
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Parse Options - Command line parser
+EAPI=7
+HOMEPAGE=https://github.com/rpm-software-management/popt
+IUSE=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 ~sparc ~x86 ~x86-linux
+LICENSE=MIT
+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=http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=472c347597894a85a0d9a75b3e9e65e3
diff --git a/metadata/md5-cache/dev-libs/pugixml-1.10 b/metadata/md5-cache/dev-libs/pugixml-1.10
index 0b93aed7a1e9..fcd085307c5c 100644
--- a/metadata/md5-cache/dev-libs/pugixml-1.10
+++ b/metadata/md5-cache/dev-libs/pugixml-1.10
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Light-weight, simple, and fast XML parser for C++ with XPath support
 EAPI=7
 HOMEPAGE=https://pugixml.org/ https://github.com/zeux/pugixml/
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/zeux/pugixml/releases/download/v1.10/pugixml-1.10.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2e22e9533b722a000034e2d66a1b8f03
+_md5_=2aa12b32accf74839077af7f56ec3880
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-3.5.1 b/metadata/md5-cache/dev-libs/rocm-device-libs-3.5.1
new file mode 100644
index 000000000000..eaf788e86fac
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-3.5.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/rocr-runtime-3.5 >=sys-devel/llvm-roc-3.5.1:=
+DESCRIPTION=Radeon Open Compute Device Libraries
+EAPI=7
+HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-Device-Libs
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-libs/rocr-runtime-3.5 >=sys-devel/llvm-roc-3.5.1:=
+SLOT=0/3.5
+SRC_URI=https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-3.5.1.tar.gz -> rocm-device-libs-3.5.1.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=04548fc10e8bd5590d5a9c573e87c5e3
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-3.0.0 b/metadata/md5-cache/dev-libs/roct-thunk-interface-3.0.0
index a2cae804defe..e80db9bf7514 100644
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-3.0.0
+++ b/metadata/md5-cache/dev-libs/roct-thunk-interface-3.0.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=sys-process/numactl sys-apps/pciutils
 SLOT=0/3.0
 SRC_URI=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/roc-3.0.0.tar.gz -> roct-thunk-interface-3.0.0.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6f6e6bbc681b7e327156235a96bb2a64
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-3.1.0 b/metadata/md5-cache/dev-libs/roct-thunk-interface-3.1.0
index d0cd4ac75ea0..9dfac37a17c2 100644
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-3.1.0
+++ b/metadata/md5-cache/dev-libs/roct-thunk-interface-3.1.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=sys-process/numactl sys-apps/pciutils
 SLOT=0/3.1
 SRC_URI=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/roc-3.1.0.tar.gz -> roct-thunk-interface-3.1.0.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6f6e6bbc681b7e327156235a96bb2a64
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-3.3.0 b/metadata/md5-cache/dev-libs/roct-thunk-interface-3.3.0
index 470013543216..108fe4bfdafb 100644
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-3.3.0
+++ b/metadata/md5-cache/dev-libs/roct-thunk-interface-3.3.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=sys-process/numactl sys-apps/pciutils
 SLOT=0/3.3
 SRC_URI=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/roc-3.3.0.tar.gz -> roct-thunk-interface-3.3.0.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6f6e6bbc681b7e327156235a96bb2a64
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-3.5.0 b/metadata/md5-cache/dev-libs/roct-thunk-interface-3.5.0
index 25a69056ab64..2c518bbd4a98 100644
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-3.5.0
+++ b/metadata/md5-cache/dev-libs/roct-thunk-interface-3.5.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=sys-process/numactl sys-apps/pciutils
 SLOT=0/3.5
 SRC_URI=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-3.5.0.tar.gz -> roct-thunk-interface-3.5.0.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b9cf68bd62f2ad5c593b28cd8c0b9dda
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-9999 b/metadata/md5-cache/dev-libs/roct-thunk-interface-9999
index 9d2b0a4a13f2..663244df9234 100644
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-9999
+++ b/metadata/md5-cache/dev-libs/roct-thunk-interface-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=sys-process/numactl sys-apps/pciutils
 SLOT=0/9999
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b9cf68bd62f2ad5c593b28cd8c0b9dda
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.6.0 b/metadata/md5-cache/dev-libs/spdlog-1.6.0
deleted file mode 100644
index 531b8e517ec6..000000000000
--- a/metadata/md5-cache/dev-libs/spdlog-1.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libfmt-5.3.0:=
-DESCRIPTION=Very fast, header only, C++ logging library
-EAPI=7
-HOMEPAGE=https://github.com/gabime/spdlog
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-libs/libfmt-5.3.0:=
-RESTRICT=!test? ( test )
-SLOT=0/1
-SRC_URI=https://github.com/gabime/spdlog/archive/v1.6.0.tar.gz -> spdlog-1.6.0.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e8a27801ad823694e8ca38a7a9a07def
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.6.1 b/metadata/md5-cache/dev-libs/spdlog-1.6.1
new file mode 100644
index 000000000000..3d35e5eeae21
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/spdlog-1.6.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libfmt-5.3.0:=
+DESCRIPTION=Very fast, header only, C++ logging library
+EAPI=7
+HOMEPAGE=https://github.com/gabime/spdlog
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-libs/libfmt-5.3.0:=
+RESTRICT=!test? ( test )
+SLOT=0/1
+SRC_URI=https://github.com/gabime/spdlog/archive/v1.6.1.tar.gz -> spdlog-1.6.1.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e8a27801ad823694e8ca38a7a9a07def
diff --git a/metadata/md5-cache/dev-libs/stfl-0.24 b/metadata/md5-cache/dev-libs/stfl-0.24
index 63e0bc6a90a8..6ca91693dedf 100644
--- a/metadata/md5-cache/dev-libs/stfl-0.24
+++ b/metadata/md5-cache/dev-libs/stfl-0.24
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=LGPL-3
 RDEPEND=sys-libs/ncurses:0=[unicode] perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* ) 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
 SLOT=0
 SRC_URI=http://www.clifford.at/stfl/stfl-0.24.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3e5475e4dccd627830ea01e929650210
+_md5_=1b66b00af4a31bb7e47e7affeb0e07e5
diff --git a/metadata/md5-cache/dev-libs/stfl-0.24-r2 b/metadata/md5-cache/dev-libs/stfl-0.24-r2
index 4c90f8642fc6..4f8c540508cb 100644
--- a/metadata/md5-cache/dev-libs/stfl-0.24-r2
+++ b/metadata/md5-cache/dev-libs/stfl-0.24-r2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=LGPL-3
 RDEPEND=sys-libs/ncurses:0=[unicode] perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* ) 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
 SLOT=0
 SRC_URI=http://www.clifford.at/stfl/stfl-0.24.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9e885eee4b60e6eae751f02e4e5e4e48
+_md5_=49a1aab8acab1376319e7c437a77c560
diff --git a/metadata/md5-cache/dev-libs/tomsfastmath-0.13.1 b/metadata/md5-cache/dev-libs/tomsfastmath-0.13.1
index b1d59737ac75..91c5d362c590 100644
--- a/metadata/md5-cache/dev-libs/tomsfastmath-0.13.1
+++ b/metadata/md5-cache/dev-libs/tomsfastmath-0.13.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install test
 DESCRIPTION=Fast public domain large integer arithmetic library
 EAPI=7
 HOMEPAGE=https://www.libtom.net/TomsFastMath/ https://github.com/libtom/tomsfastmath
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=Unlicense
 SLOT=0/1
 SRC_URI=https://github.com/libtom/tomsfastmath/releases/download/v0.13.1/tfm-0.13.1.tar.xz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=25abf5d476144d0a90c3f4be3cc35c9c
+_md5_=5346d97159566acafe9a875b157c3986
diff --git a/metadata/md5-cache/dev-libs/tre-0.8.0-r2 b/metadata/md5-cache/dev-libs/tre-0.8.0-r2
index d58a31924e7b..396166ca0f9c 100644
--- a/metadata/md5-cache/dev-libs/tre-0.8.0-r2
+++ b/metadata/md5-cache/dev-libs/tre-0.8.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Lightweight, robust, and efficient POSIX compliant regexp matching l
 EAPI=6
 HOMEPAGE=https://laurikari.net/tre/ https://github.com/laurikari/tre/
 IUSE=nls static-libs
-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=BSD-2
 RDEPEND=!app-text/agrep !dev-ruby/amatch !app-misc/glimpse
 SLOT=0
 SRC_URI=https://laurikari.net/tre/tre-0.8.0.tar.bz2
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bce2571f0ffcd98c537da487ce047911
+_md5_=ce6273789a7bc1a5037542f5c269e2a0
diff --git a/metadata/md5-cache/dev-libs/uriparser-0.9.4 b/metadata/md5-cache/dev-libs/uriparser-0.9.4
index 3198fbfc8929..a1099338d992 100644
--- a/metadata/md5-cache/dev-libs/uriparser-0.9.4
+++ b/metadata/md5-cache/dev-libs/uriparser-0.9.4
@@ -5,11 +5,11 @@ DESCRIPTION=Uriparser is a strictly RFC 3986 compliant URI parsing library in C
 EAPI=7
 HOMEPAGE=https://uriparser.github.io/
 IUSE=doc qt5 test unicode
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD
 REQUIRED_USE=test? ( unicode )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/uriparser/uriparser/releases/download/uriparser-0.9.4/uriparser-0.9.4.tar.bz2
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3a88f0fa42463b1958c29275f7ba32df
+_md5_=325d413a6cd7c3ef9560a5c0e78168d7
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.48.6 b/metadata/md5-cache/dev-libs/vala-common-0.48.6
index d8477a7caf64..5a59b6300053 100644
--- a/metadata/md5-cache/dev-libs/vala-common-0.48.6
+++ b/metadata/md5-cache/dev-libs/vala-common-0.48.6
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install
 DESCRIPTION=Build infrastructure for packages that use Vala
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=mirror://gnome/sources/vala/0.48/vala-0.48.6.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a
-_md5_=a88da6d0887f1c58b41cf0533978aa3d
+_md5_=a0ca68487df9530c27dc1c48ec17bd5a
diff --git a/metadata/md5-cache/dev-libs/voikko-fi-2.3 b/metadata/md5-cache/dev-libs/voikko-fi-2.3
index 69dbb6802aaa..9b3db73c459a 100644
--- a/metadata/md5-cache/dev-libs/voikko-fi-2.3
+++ b/metadata/md5-cache/dev-libs/voikko-fi-2.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-libs/libvoikko
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-libs/libvoikko
 DEFINED_PHASES=compile install setup
 DEPEND=dev-libs/foma dev-libs/libvoikko
 DESCRIPTION=Finnish dictionary for libvoikko based spell checkers (vvfst format)
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/foma dev-libs/libvoikko
 SLOT=0
 SRC_URI=https://www.puimula.org/voikko-sources/voikko-fi/voikko-fi-2.3.tar.gz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d008098d9773a839f1dc37ae26696d0c
+_md5_=acbe4090ffe3d78bfae7d9c6d869160f
diff --git a/metadata/md5-cache/dev-libs/xxhash-0.7.3 b/metadata/md5-cache/dev-libs/xxhash-0.7.3
index d1ebf1c1da3e..5697c1628d68 100644
--- a/metadata/md5-cache/dev-libs/xxhash-0.7.3
+++ b/metadata/md5-cache/dev-libs/xxhash-0.7.3
@@ -3,9 +3,9 @@ DESCRIPTION=Extremely fast non-cryptographic hash algorithm
 EAPI=7
 HOMEPAGE=http://www.xxhash.net
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=BSD-2 GPL-2+
 SLOT=0
 SRC_URI=https://github.com/Cyan4973/xxHash/archive/v0.7.3.tar.gz -> xxhash-0.7.3.tar.gz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=aef08d314082ddaaa8dabf6ab7c7f07e
+_md5_=7ea3b2f133c39e223cd30337fca9e24c
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index 024d3d753823..c290aabe40b3 100644
--- a/metadata/md5-cache/dev-lisp/Manifest.gz
+++ b/metadata/md5-cache/dev-lisp/Manifest.gz
diff --git a/metadata/md5-cache/dev-lisp/c2ffi-10.0.0.20200527 b/metadata/md5-cache/dev-lisp/c2ffi-10.0.0.20200527
new file mode 100644
index 000000000000..0c91a9b113e4
--- /dev/null
+++ b/metadata/md5-cache/dev-lisp/c2ffi-10.0.0.20200527
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-devel/clang:10= sys-devel/llvm:10= !!sys-devel/llvm:0
+DESCRIPTION=Clang-based FFI wrapper generator for Common Lisp
+EAPI=7
+HOMEPAGE=https://github.com/rpav/c2ffi
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1
+RDEPEND=sys-devel/clang:10= sys-devel/llvm:10=
+SLOT=0
+SRC_URI=https://github.com/rpav/c2ffi/archive/a2d1f667b707fb413fc8ab2413446f15cb23de51.tar.gz -> c2ffi-10.0.0.20200527.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=246e37a27209d92624e68be12b76e36e
diff --git a/metadata/md5-cache/dev-lisp/c2ffi-10.0.0.9999 b/metadata/md5-cache/dev-lisp/c2ffi-10.0.0.9999
new file mode 100644
index 000000000000..59372c3bb6ac
--- /dev/null
+++ b/metadata/md5-cache/dev-lisp/c2ffi-10.0.0.9999
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=sys-devel/clang:10= sys-devel/llvm:10= !!sys-devel/llvm:0
+DESCRIPTION=Clang-based FFI wrapper generator for Common Lisp
+EAPI=7
+HOMEPAGE=https://github.com/rpav/c2ffi
+LICENSE=LGPL-2.1
+PROPERTIES=live
+RDEPEND=sys-devel/clang:10= sys-devel/llvm:10=
+SLOT=0
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=df5948020874693a61e1ed55c0a75106
diff --git a/metadata/md5-cache/dev-lisp/c2ffi-9.0.0.20191017 b/metadata/md5-cache/dev-lisp/c2ffi-9.0.0.20191017
deleted file mode 100644
index 6431c8fe271a..000000000000
--- a/metadata/md5-cache/dev-lisp/c2ffi-9.0.0.20191017
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-devel/clang:9= sys-devel/llvm:9= !!sys-devel/llvm:0
-DESCRIPTION=Clang-based FFI wrapper generator for Common Lisp
-EAPI=7
-HOMEPAGE=https://github.com/rpav/c2ffi
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1
-RDEPEND=sys-devel/clang:9= sys-devel/llvm:9=
-SLOT=0
-SRC_URI=https://github.com/rpav/c2ffi/archive/15fda06de0bad97bf91f5590f7f24623eab2f580.tar.gz -> c2ffi-9.0.0.20191017.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=794fdbe7962251bec3c158466d90c9c5
diff --git a/metadata/md5-cache/dev-lisp/c2ffi-9.0.0.9999 b/metadata/md5-cache/dev-lisp/c2ffi-9.0.0.9999
deleted file mode 100644
index 2a77e54b3a36..000000000000
--- a/metadata/md5-cache/dev-lisp/c2ffi-9.0.0.9999
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-devel/clang:9= sys-devel/llvm:9= !!sys-devel/llvm:0
-DESCRIPTION=Clang-based FFI wrapper generator for Common Lisp
-EAPI=7
-HOMEPAGE=https://github.com/rpav/c2ffi
-LICENSE=LGPL-2.1
-PROPERTIES=live
-RDEPEND=sys-devel/clang:9= sys-devel/llvm:9=
-SLOT=0
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d85799994a07deadc776c59f2f1b74a8
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index 2317fb8b6fbd..a494f103c8d4 100644
--- a/metadata/md5-cache/dev-lua/Manifest.gz
+++ b/metadata/md5-cache/dev-lua/Manifest.gz
diff --git a/metadata/md5-cache/dev-lua/luv-1.32.0.0 b/metadata/md5-cache/dev-lua/luv-1.32.0.0
index f9740b79fb5e..4faef42bf2d5 100644
--- a/metadata/md5-cache/dev-lua/luv-1.32.0.0
+++ b/metadata/md5-cache/dev-lua/luv-1.32.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libuv-1.32.0:= luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-l
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/luvit/luv/archive/1.32.0-0.tar.gz -> luv-1.32.0.0.tar.gz https://github.com/keplerproject/lua-compat-5.3/archive/v0.7.tar.gz -> luv-lua-compat-0.7.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0d2079fb1ff5099ed702fc9e1da0cffc
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 43f0d86d2049..bf4d3def5ade 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/lablgtk-2.18.10 b/metadata/md5-cache/dev-ml/lablgtk-2.18.10
index f08c40bee5af..6c81dbfb6139 100644
--- a/metadata/md5-cache/dev-ml/lablgtk-2.18.10
+++ b/metadata/md5-cache/dev-ml/lablgtk-2.18.10
@@ -5,9 +5,9 @@ DESCRIPTION=Objective CAML interface for Gtk+2
 EAPI=7
 HOMEPAGE=http://lablgtk.forge.ocamlcore.org
 IUSE=debug examples glade gnomecanvas +ocamlopt sourceview spell svg
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1-with-linking-exception examples? ( lablgtk-examples )
 RDEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt?] dev-ml/camlp4:= x11-libs/gtk+:2 glade? ( gnome-base/libglade ) gnomecanvas? ( gnome-base/libgnomecanvas ) sourceview? ( x11-libs/gtksourceview:2.0 ) spell? ( app-text/gtkspell:2 ) svg? ( gnome-base/librsvg:2 )
 SLOT=2/2.18.10
 SRC_URI=https://github.com/garrigue/lablgtk/archive/2.18.10.tar.gz -> lablgtk-2.18.10.tar.gz
-_md5_=5eb498d5132eafd152a1683c0d519746
+_md5_=b4d9960684efc41c2b6e4ba528f45767
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.0 b/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.0
index 2bc8c3cefe75..29d6fede81d4 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.0
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/10.0.0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=56216dd79fa5182bfbdbbf85bc94d473
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.1.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.1.9999
index f886ce7f295b..bb76d263592e 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.1.9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.1.9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-10.0.1.
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_AVR llvm_targets_VE )
 RESTRICT=!test? ( test )
 SLOT=0/10.0.1.9999
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=96278a0347b6755fe22786448fdb15b6
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f6bf39670b3050110d1e72bb3c266a93
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.1_rc1 b/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.1_rc1
index 0eaee8b26479..1f29328836b4 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.1_rc1
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.1_rc1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/10.0.1_rc1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1-rc1.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=458a9517fec6c0d814d8e29a168dce68
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=70d3a611ae69b305a54c0c8fd2bc014c
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 ec12de4d929b..6ad0f9b6cfa4 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
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-11.0.0.
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR 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_VE )
 RESTRICT=!test? ( test )
 SLOT=0/11.0.0.9999
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=34a64205ea2c8464922b34a440c16b4f
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b0ea68250b49d76b30b8993aac9903fc
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 fc4951647450..447334eb6dd9 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-9.0.1
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-9.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 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	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=575f28e6f2c3d39d5288c6fa47f29e39
diff --git a/metadata/md5-cache/dev-ml/ocaml-fileutils-0.5.1 b/metadata/md5-cache/dev-ml/ocaml-fileutils-0.5.1
index 1e1ecae8bf3f..ec7fa161d25f 100644
--- a/metadata/md5-cache/dev-ml/ocaml-fileutils-0.5.1
+++ b/metadata/md5-cache/dev-ml/ocaml-fileutils-0.5.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/ounit-2.0.0 >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
+DEPEND=<dev-lang/ocaml-4.09:=[ocamlopt?] >=dev-ml/ounit-2.0.0 >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
 DESCRIPTION=Pure OCaml functions to manipulate real file (POSIX like) and filename
 EAPI=5
 HOMEPAGE=http://forge.ocamlcore.org/projects/ocaml-fileutils
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.5.1
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1651/ocaml-fileutils-0.5.1.tar.gz
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9b2fefa65fee2cd3125f18ca6ec20ceb
+_md5_=9b898c5e3b0e8ea0c83259cc0f46ea6d
diff --git a/metadata/md5-cache/dev-ml/ocaml-fileutils-0.5.2 b/metadata/md5-cache/dev-ml/ocaml-fileutils-0.5.2
index 8ab6c7464e41..3f3bc58529a5 100644
--- a/metadata/md5-cache/dev-ml/ocaml-fileutils-0.5.2
+++ b/metadata/md5-cache/dev-ml/ocaml-fileutils-0.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/ounit-2.0.0 >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
+DEPEND=<dev-lang/ocaml-4.09:=[ocamlopt?] >=dev-ml/ounit-2.0.0 >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
 DESCRIPTION=Pure OCaml functions to manipulate real file (POSIX like) and filename
 EAPI=5
 HOMEPAGE=http://forge.ocamlcore.org/projects/ocaml-fileutils
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.5.2
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1695/ocaml-fileutils-0.5.2.tar.gz
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f52a6a98edabfa271fe3897bc8d592a9
+_md5_=4fa950af6203a24b43d7c6a3af3cff4f
diff --git a/metadata/md5-cache/dev-ml/ocaml-fileutils-0.6.2 b/metadata/md5-cache/dev-ml/ocaml-fileutils-0.6.2
new file mode 100644
index 000000000000..b360c439e167
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ocaml-fileutils-0.6.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-ml/ounit-2.0.0 >=dev-ml/stdlib-shims-0.2.0 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune
+DESCRIPTION=Pure OCaml functions to manipulate real file (POSIX like) and filename
+EAPI=7
+HOMEPAGE=https://github.com/gildor478/ocaml-fileutils
+IUSE=ocamlopt
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0
+SRC_URI=https://github.com/gildor478/ocaml-fileutils/releases/download/v0.6.2/fileutils-v0.6.2.tbz -> ocaml-fileutils-0.6.2.tar.bz2
+_eclasses_=dune	48ca398457cfa7b91da98c276b97db03
+_md5_=2e4c663a2e3f92c4d18d6a1774dd65f5
diff --git a/metadata/md5-cache/dev-ml/stdlib-shims-0.2.0 b/metadata/md5-cache/dev-ml/stdlib-shims-0.2.0
new file mode 100644
index 000000000000..94f95976e0f7
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/stdlib-shims-0.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune
+DESCRIPTION=Pure OCaml library that allows replacing Pervasives with Stdlib before 4.08
+EAPI=7
+HOMEPAGE=https://github.com/ocaml/stdlib-shims
+IUSE=ocamlopt
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0
+SRC_URI=https://github.com/ocaml/stdlib-shims/releases/download/0.2.0/stdlib-shims-0.2.0.tbz
+_eclasses_=dune	48ca398457cfa7b91da98c276b97db03
+_md5_=67bcf920e12b0fa7b37a9fa455baf4a7
diff --git a/metadata/md5-cache/dev-perl/Algorithm-Annotate-0.100.0-r1 b/metadata/md5-cache/dev-perl/Algorithm-Annotate-0.100.0-r1
index 453abbb0363a..6b6295976d05 100644
--- a/metadata/md5-cache/dev-perl/Algorithm-Annotate-0.100.0-r1
+++ b/metadata/md5-cache/dev-perl/Algorithm-Annotate-0.100.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Algorithm-Diff-1.150.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CL/CLKAO/Algorithm-Annotate-0.10.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6cc6d836670f19fcc3d0f6e32f8c75e7
diff --git a/metadata/md5-cache/dev-perl/Algorithm-Dependency-1.110.0-r2 b/metadata/md5-cache/dev-perl/Algorithm-Dependency-1.110.0-r2
index f3748a1e61a3..1e9d7bd75d45 100644
--- a/metadata/md5-cache/dev-perl/Algorithm-Dependency-1.110.0-r2
+++ b/metadata/md5-cache/dev-perl/Algorithm-Dependency-1.110.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/Params-Util-0.31 >=virtual/perl-File-Spec-0.82 dev-lang/perl:
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Algorithm-Dependency-1.110.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c4d0abc7f719032b6cc0e6af9454c971
diff --git a/metadata/md5-cache/dev-perl/Algorithm-Diff-1.190.300 b/metadata/md5-cache/dev-perl/Algorithm-Diff-1.190.300
index 3093d41d1ccd..0363f262d8d2 100644
--- a/metadata/md5-cache/dev-perl/Algorithm-Diff-1.190.300
+++ b/metadata/md5-cache/dev-perl/Algorithm-Diff-1.190.300
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TY/TYEMQ/Algorithm-Diff-1.1903.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0f509bb7cd3fa77956d520041c0a1e56
diff --git a/metadata/md5-cache/dev-perl/Algorithm-Munkres-0.80.0-r1 b/metadata/md5-cache/dev-perl/Algorithm-Munkres-0.80.0-r1
index 5d000e55e048..8ed9e3839fc4 100644
--- a/metadata/md5-cache/dev-perl/Algorithm-Munkres-0.80.0-r1
+++ b/metadata/md5-cache/dev-perl/Algorithm-Munkres-0.80.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TP/TPEDERSE/Algorithm-Munkres-0.08.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8e3d128bb8d90dccc860b8aac07183f6
diff --git a/metadata/md5-cache/dev-perl/Alien-SDL-1.446.0 b/metadata/md5-cache/dev-perl/Alien-SDL-1.446.0
index e562c7bf914f..ac60d82039ee 100644
--- a/metadata/md5-cache/dev-perl/Alien-SDL-1.446.0
+++ b/metadata/md5-cache/dev-perl/Alien-SDL-1.446.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Archive-Extract dev-perl/Archive-Zip dev-perl/Capture-Tiny dev-perl/File-ShareDir dev-perl/File-Which dev-perl/Text-Patch media-libs/libsdl virtual/perl-Archive-Tar virtual/perl-Digest-SHA virtual/perl-ExtUtils-CBuilder virtual/perl-ExtUtils-MakeMaker dev-perl/Module-Build virtual/perl-File-Spec virtual/perl-File-Temp dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FR/FROGGS/Alien-SDL-1.446.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=95c1927baad02a5b57ad6c4f597a30d0
diff --git a/metadata/md5-cache/dev-perl/Any-Moose-0.270.0 b/metadata/md5-cache/dev-perl/Any-Moose-0.270.0
index 48b9e0ccd56a..3e67f84545b6 100644
--- a/metadata/md5-cache/dev-perl/Any-Moose-0.270.0
+++ b/metadata/md5-cache/dev-perl/Any-Moose-0.270.0
@@ -4,11 +4,11 @@ DESCRIPTION=Use Moose or Mouse modules (DEPRECATED)
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Any-Moose
 IUSE=test
-KEYWORDS=amd64 hppa ppc x86
+KEYWORDS=amd64 ~arm hppa ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Moose virtual/perl-version dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Any-Moose-0.27.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=7e3ff9114cccd2ac455c2eac4e3b6c19
+_md5_=79b7d32eb99bd72d423cff743258c495
diff --git a/metadata/md5-cache/dev-perl/Apache-Session-1.930.0 b/metadata/md5-cache/dev-perl/Apache-Session-1.930.0
index f4b5c419f26b..bd8979e73f67 100644
--- a/metadata/md5-cache/dev-perl/Apache-Session-1.930.0
+++ b/metadata/md5-cache/dev-perl/Apache-Session-1.930.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Digest-MD5 virtual/perl-File-Temp virtual/perl-IO virtual/p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Apache-Session-1.93.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d33f8efbd7b1d10f961ee0b566e09f09
diff --git a/metadata/md5-cache/dev-perl/Apache-SizeLimit-0.970.0-r1 b/metadata/md5-cache/dev-perl/Apache-SizeLimit-0.970.0-r1
index 83fa4487ad09..2f43140ea1fe 100644
--- a/metadata/md5-cache/dev-perl/Apache-SizeLimit-0.970.0-r1
+++ b/metadata/md5-cache/dev-perl/Apache-SizeLimit-0.970.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Linux-Pid !<www-apache/mod_perl-2.0.5 >=www-apache/mod_perl-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/Apache-SizeLimit-0.97.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b11348c6ea8d65f4090404c2a29b5666
diff --git a/metadata/md5-cache/dev-perl/AppConfig-1.710.0 b/metadata/md5-cache/dev-perl/AppConfig-1.710.0
index ba0013432a20..8cc6493b05a6 100644
--- a/metadata/md5-cache/dev-perl/AppConfig-1.710.0
+++ b/metadata/md5-cache/dev-perl/AppConfig-1.710.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/File-HomeDir-0.57 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/AppConfig-1.71.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b2e4fada8f2e9ffc7531c6af2ff3c894
diff --git a/metadata/md5-cache/dev-perl/Array-RefElem-1.0.0-r1 b/metadata/md5-cache/dev-perl/Array-RefElem-1.0.0-r1
index 1c85f95fc184..6f9770d72934 100644
--- a/metadata/md5-cache/dev-perl/Array-RefElem-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Array-RefElem-1.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Array-RefElem-1.00.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bedc4fc0d78792b0270f2c53a6beefbe
diff --git a/metadata/md5-cache/dev-perl/Array-Window-1.20.0-r1 b/metadata/md5-cache/dev-perl/Array-Window-1.20.0-r1
index 1d267255af25..8d81c8fa2e6b 100644
--- a/metadata/md5-cache/dev-perl/Array-Window-1.20.0-r1
+++ b/metadata/md5-cache/dev-perl/Array-Window-1.20.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Params-Util dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Array-Window-1.02.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6a771e180c820c3dd1fdb3a547cee9a7
diff --git a/metadata/md5-cache/dev-perl/Astro-FITS-Header-3.70.0 b/metadata/md5-cache/dev-perl/Astro-FITS-Header-3.70.0
index 4e43e2874c30..41c25bafa0b7 100644
--- a/metadata/md5-cache/dev-perl/Astro-FITS-Header-3.70.0
+++ b/metadata/md5-cache/dev-perl/Astro-FITS-Header-3.70.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TJ/TJENNESS/Astro-FITS-Header-3.07.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d866ab9ddceb4b3a1dcd81256acbba78
diff --git a/metadata/md5-cache/dev-perl/Audio-FLAC-Header-2.400.0-r1 b/metadata/md5-cache/dev-perl/Audio-FLAC-Header-2.400.0-r1
index 96eefdfebb5f..06ad16aaa3d3 100644
--- a/metadata/md5-cache/dev-perl/Audio-FLAC-Header-2.400.0-r1
+++ b/metadata/md5-cache/dev-perl/Audio-FLAC-Header-2.400.0-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/flac dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANIEL/Audio-FLAC-Header-2.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2d552bead3f1cacda04c8b96a434d59e
diff --git a/metadata/md5-cache/dev-perl/Audio-Wav-0.140.0-r1 b/metadata/md5-cache/dev-perl/Audio-Wav-0.140.0-r1
index 0bf03715d89e..78d18e771f28 100644
--- a/metadata/md5-cache/dev-perl/Audio-Wav-0.140.0-r1
+++ b/metadata/md5-cache/dev-perl/Audio-Wav-0.140.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Inline-0.790.0 dev-perl/Inline-C dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BR/BRIANSKI/Audio-Wav-0.14.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7bbfbe5b94477c69cb47b285c0384a12
diff --git a/metadata/md5-cache/dev-perl/Authen-DigestMD5-0.40.0-r1 b/metadata/md5-cache/dev-perl/Authen-DigestMD5-0.40.0-r1
index 750e5d06e876..06bf2a166a26 100644
--- a/metadata/md5-cache/dev-perl/Authen-DigestMD5-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Authen-DigestMD5-0.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Authen-DigestMD5-0.04.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=065c023644c754823742d42ee9c31300
diff --git a/metadata/md5-cache/dev-perl/Authen-Htpasswd-0.171.0-r1 b/metadata/md5-cache/dev-perl/Authen-Htpasswd-0.171.0-r1
index aa4630123da7..bbf46416774e 100644
--- a/metadata/md5-cache/dev-perl/Authen-Htpasswd-0.171.0-r1
+++ b/metadata/md5-cache/dev-perl/Authen-Htpasswd-0.171.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Accessor dev-perl/IO-LockedFile dev-perl/Crypt-PasswdMD5 dev-perl/Digest-SHA1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSTROUT/Authen-Htpasswd-0.171.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=24ecbe498a8352121db91b51cd1d2a31
diff --git a/metadata/md5-cache/dev-perl/Authen-NTLM-1.90.0-r1 b/metadata/md5-cache/dev-perl/Authen-NTLM-1.90.0-r1
index 3d0314f419f8..b3ff0a1c66e3 100644
--- a/metadata/md5-cache/dev-perl/Authen-NTLM-1.90.0-r1
+++ b/metadata/md5-cache/dev-perl/Authen-NTLM-1.90.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/perl-MIME-Base64-3.00 dev-perl/Digest-HMAC dev-lang/perl:=[-bu
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NB/NBEBOUT/NTLM-1.09.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9492dacee2a3478426374aee738efefb
diff --git a/metadata/md5-cache/dev-perl/Authen-SASL-2.160.0-r1 b/metadata/md5-cache/dev-perl/Authen-SASL-2.160.0-r1
index 02fb03e50775..b54c89353c75 100644
--- a/metadata/md5-cache/dev-perl/Authen-SASL-2.160.0-r1
+++ b/metadata/md5-cache/dev-perl/Authen-SASL-2.160.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Digest-HMAC kerberos? ( dev-perl/GSSAPI ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GB/GBARR/Authen-SASL-2.16.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d746ad01834a9ef5f99f9ab72e06e8af
diff --git a/metadata/md5-cache/dev-perl/AutoXS-Header-1.20.0-r1 b/metadata/md5-cache/dev-perl/AutoXS-Header-1.20.0-r1
index 8d6c8fa7b64d..93f99c021f31 100644
--- a/metadata/md5-cache/dev-perl/AutoXS-Header-1.20.0-r1
+++ b/metadata/md5-cache/dev-perl/AutoXS-Header-1.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/AutoXS-Header-1.02.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=50871f9a01ac2822f36ce157d6c231d2
diff --git a/metadata/md5-cache/dev-perl/B-Utils-0.270.0 b/metadata/md5-cache/dev-perl/B-Utils-0.270.0
index 8245c30e67a7..bda187ea4555 100644
--- a/metadata/md5-cache/dev-perl/B-Utils-0.270.0
+++ b/metadata/md5-cache/dev-perl/B-Utils-0.270.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Exporter virtual/perl-Scalar-List-Utils dev-perl/Task-Weake
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/B-Utils-0.27.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dba447b5194ce56776333521cf343d92
diff --git a/metadata/md5-cache/dev-perl/BerkeleyDB-0.550.0 b/metadata/md5-cache/dev-perl/BerkeleyDB-0.550.0
index 3cb62e80a054..b335f91d9cd1 100644
--- a/metadata/md5-cache/dev-perl/BerkeleyDB-0.550.0
+++ b/metadata/md5-cache/dev-perl/BerkeleyDB-0.550.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=sys-libs/db-2.0:* dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PM/PMQS/BerkeleyDB-0.55.tar.gz
-_eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cf05c2867801bdee8b846d2033d4a915
diff --git a/metadata/md5-cache/dev-perl/Bio-Graphics-2.390.0 b/metadata/md5-cache/dev-perl/Bio-Graphics-2.390.0
index 2430945f1571..b4cc86bcd28d 100644
--- a/metadata/md5-cache/dev-perl/Bio-Graphics-2.390.0
+++ b/metadata/md5-cache/dev-perl/Bio-Graphics-2.390.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/GD-2.300.0 >=dev-perl/Statistics-Descriptive-2.600.0 >=sci-biology/bioperl-1.5.9.1 dev-perl/CGI dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/Bio-Graphics-2.39.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=17b81b1bf1cf8fec2ed34c3e53e84689
diff --git a/metadata/md5-cache/dev-perl/Bit-Vector-7.400.0 b/metadata/md5-cache/dev-perl/Bit-Vector-7.400.0
index 7b11526caefb..50cb772b63b7 100644
--- a/metadata/md5-cache/dev-perl/Bit-Vector-7.400.0
+++ b/metadata/md5-cache/dev-perl/Bit-Vector-7.400.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Carp-Clan-5.300.0 >=virtual/perl-Storable-2.210.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/ST/STBEY/Bit-Vector-7.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ba114888c7e6d24bde22e689a3fc43bb
diff --git a/metadata/md5-cache/dev-perl/Bit-Vector-Minimal-1.300.0-r1 b/metadata/md5-cache/dev-perl/Bit-Vector-Minimal-1.300.0-r1
index 6fc3ea880ff7..6a0211ee8ac4 100644
--- a/metadata/md5-cache/dev-perl/Bit-Vector-Minimal-1.300.0-r1
+++ b/metadata/md5-cache/dev-perl/Bit-Vector-Minimal-1.300.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/Bit-Vector-Minimal-1.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f0462f6f5a0e914f9ad46ee486a610bf
diff --git a/metadata/md5-cache/dev-perl/Boulder-1.300.0-r1 b/metadata/md5-cache/dev-perl/Boulder-1.300.0-r1
index ff6caad4fc78..3e2e23cac032 100644
--- a/metadata/md5-cache/dev-perl/Boulder-1.300.0-r1
+++ b/metadata/md5-cache/dev-perl/Boulder-1.300.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/XML-Parser dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/Boulder-1.30.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9c315946ff4c45913012aab5242d1dea
diff --git a/metadata/md5-cache/dev-perl/Business-FedEx-DirectConnect-1.10.0-r1 b/metadata/md5-cache/dev-perl/Business-FedEx-DirectConnect-1.10.0-r1
index 82211f85596e..0dab54de1235 100644
--- a/metadata/md5-cache/dev-perl/Business-FedEx-DirectConnect-1.10.0-r1
+++ b/metadata/md5-cache/dev-perl/Business-FedEx-DirectConnect-1.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl dev-perl/Tie-StrictHash dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JP/JPOWERS/Business-FedEx-DirectConnect-1.01.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bda0900dd352390a51febde68c86b113
diff --git a/metadata/md5-cache/dev-perl/Business-UPS-2.10.0-r1 b/metadata/md5-cache/dev-perl/Business-UPS-2.10.0-r1
index 4a0d00f1f791..cec47ff34928 100644
--- a/metadata/md5-cache/dev-perl/Business-UPS-2.10.0-r1
+++ b/metadata/md5-cache/dev-perl/Business-UPS-2.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/Business-UPS-2.01.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dac60cba84f2cd205f57d6d1e929a66e
diff --git a/metadata/md5-cache/dev-perl/CDDB-File-1.50.0-r1 b/metadata/md5-cache/dev-perl/CDDB-File-1.50.0-r1
index 70f810e2458b..8783ffbcc5d3 100644
--- a/metadata/md5-cache/dev-perl/CDDB-File-1.50.0-r1
+++ b/metadata/md5-cache/dev-perl/CDDB-File-1.50.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-3 GPL-2 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/CDDB-File-1.05.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dd98d6edba57b46ec815c02a73b53053
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 f5052572fbcb..d5c7ce218e76 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
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=535b516b15cf02a168b8ac786178d815
diff --git a/metadata/md5-cache/dev-perl/CGI-4.220.0 b/metadata/md5-cache/dev-perl/CGI-4.220.0
index 8ee913d99659..29c226b84334 100644
--- a/metadata/md5-cache/dev-perl/CGI-4.220.0
+++ b/metadata/md5-cache/dev-perl/CGI-4.220.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp virtual/perl-Encode virtual/perl-Exporter >=virtual/pe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.22.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=de6e5175c188c7ad34392bae48fcc857
diff --git a/metadata/md5-cache/dev-perl/CGI-4.500.0 b/metadata/md5-cache/dev-perl/CGI-4.500.0
new file mode 100644
index 000000000000..88f67b63fff2
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/CGI-4.500.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp virtual/perl-Encode virtual/perl-Exporter >=virtual/perl-File-Spec-0.820.0 >=virtual/perl-File-Temp-0.170.0 >=dev-perl/HTML-Parser-3.690.0 virtual/perl-if >=virtual/perl-parent-0.225.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-IO >=dev-perl/Test-Deep-0.110.0 dev-perl/Test-NoWarnings >=virtual/perl-Test-Simple-0.980.0 >=dev-perl/Test-Warn-0.300.0 ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Simple Common Gateway Interface Class
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/CGI
+IUSE=test examples
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Artistic-2
+RDEPEND=virtual/perl-Carp virtual/perl-Encode virtual/perl-Exporter >=virtual/perl-File-Spec-0.820.0 >=virtual/perl-File-Temp-0.170.0 >=dev-perl/HTML-Parser-3.690.0 virtual/perl-if >=virtual/perl-parent-0.225.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.50.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=2d9d4aa0b37db80e96b2ac3a05aae5fd
diff --git a/metadata/md5-cache/dev-perl/CGI-Ajax-0.707.0 b/metadata/md5-cache/dev-perl/CGI-Ajax-0.707.0
index 4f90c6536b92..825b4ad8b605 100644
--- a/metadata/md5-cache/dev-perl/CGI-Ajax-0.707.0
+++ b/metadata/md5-cache/dev-perl/CGI-Ajax-0.707.0
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/CGI dev-perl/Class-Accessor dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BP/BPEDERSE/CGI-Ajax-0.707.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a8b59317077cc44209ba800f28d8da16
diff --git a/metadata/md5-cache/dev-perl/CGI-PSGI-0.150.0-r1 b/metadata/md5-cache/dev-perl/CGI-PSGI-0.150.0-r1
index 5bb9a5e9a116..a2412e39e27f 100644
--- a/metadata/md5-cache/dev-perl/CGI-PSGI-0.150.0-r1
+++ b/metadata/md5-cache/dev-perl/CGI-PSGI-0.150.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/CGI-3.330.0 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/CGI-PSGI-0.15.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=18265994ee2800a15eb77a7fbed4797b
diff --git a/metadata/md5-cache/dev-perl/CGI-Simple-1.115.0 b/metadata/md5-cache/dev-perl/CGI-Simple-1.115.0
index 77e654da3ea4..c2cdf1163ef0 100644
--- a/metadata/md5-cache/dev-perl/CGI-Simple-1.115.0
+++ b/metadata/md5-cache/dev-perl/CGI-Simple-1.115.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SZ/SZABGAB/CGI-Simple-1.115.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=26950f5db8a8442cf67ef42207816bc8
diff --git a/metadata/md5-cache/dev-perl/CHI-0.600.0 b/metadata/md5-cache/dev-perl/CHI-0.600.0
index 1a49688eca86..02f21ccedd8d 100644
--- a/metadata/md5-cache/dev-perl/CHI-0.600.0
+++ b/metadata/md5-cache/dev-perl/CHI-0.600.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/Carp-Assert-0.200.0 dev-perl/Class-Load dev-perl/Data-UUID de
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JS/JSWARTZ/CHI-0.60.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4ac6483aa309bed88b70239d9e0df7ef
diff --git a/metadata/md5-cache/dev-perl/CPAN-Changes-0.400.2 b/metadata/md5-cache/dev-perl/CPAN-Changes-0.400.2
index a59a5eb6167a..a47a10dc28aa 100644
--- a/metadata/md5-cache/dev-perl/CPAN-Changes-0.400.2
+++ b/metadata/md5-cache/dev-perl/CPAN-Changes-0.400.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/perl-Text-Tabs+Wrap-0.3.0 >=virtual/perl-version-0.990.600 dev
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/CPAN-Changes-0.400002.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=59d0f981557611abc0106de0d6dd3a10
diff --git a/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-5.202.6.200 b/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-5.202.6.200
new file mode 100644
index 000000000000..feb46779b2c3
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-5.202.6.200
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec virtual/perl-IO >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Mapping Perl releases on CPAN to the location of the tarballs
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/CPAN-Perl-Releases
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-5.20200620.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=7ec76954906432fd5775057818cc4407
diff --git a/metadata/md5-cache/dev-perl/CPAN-Uploader-0.103.14 b/metadata/md5-cache/dev-perl/CPAN-Uploader-0.103.14
new file mode 100644
index 000000000000..1de06343fa06
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/CPAN-Uploader-0.103.14
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Digest-MD5 dev-perl/File-HomeDir virtual/perl-File-Spec >=dev-perl/Getopt-Long-Descriptive-0.84.0 dev-perl/HTTP-Message >=dev-perl/LWP-Protocol-https-1.0.0 dev-perl/libwww-perl dev-perl/TermReadKey virtual/perl-ExtUtils-MakeMaker test? ( !minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 ) >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=upload things to the CPAN
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/CPAN-Uploader
+IUSE=test minimal
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Digest-MD5 dev-perl/File-HomeDir virtual/perl-File-Spec >=dev-perl/Getopt-Long-Descriptive-0.84.0 dev-perl/HTTP-Message >=dev-perl/LWP-Protocol-https-1.0.0 dev-perl/libwww-perl dev-perl/TermReadKey dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Uploader-0.103014.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=64377c528e66cbfdd2e660e5b5d99760
diff --git a/metadata/md5-cache/dev-perl/CQL-Parser-1.130.0 b/metadata/md5-cache/dev-perl/CQL-Parser-1.130.0
index bbc05572c90a..13213502dc27 100644
--- a/metadata/md5-cache/dev-perl/CQL-Parser-1.130.0
+++ b/metadata/md5-cache/dev-perl/CQL-Parser-1.130.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/Class-Accessor-0.100.0 >=dev-perl/Clone-0.150.0 >=dev-perl/St
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BR/BRICAS/CQL-Parser-1.13.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=be5e56256fba26f558761d401c1c89d9
diff --git a/metadata/md5-cache/dev-perl/CSS-Minifier-0.10.0-r1 b/metadata/md5-cache/dev-perl/CSS-Minifier-0.10.0-r1
index e7879e37c5ae..b30d88829bc2 100644
--- a/metadata/md5-cache/dev-perl/CSS-Minifier-0.10.0-r1
+++ b/metadata/md5-cache/dev-perl/CSS-Minifier-0.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PM/PMICHAUX/CSS-Minifier-0.01.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c6ad2651ef5ee0444ba9a9d228926175
diff --git a/metadata/md5-cache/dev-perl/CSS-Squish-0.100.0-r1 b/metadata/md5-cache/dev-perl/CSS-Squish-0.100.0-r1
index c57d039eb2c1..c1e148ea3d26 100644
--- a/metadata/md5-cache/dev-perl/CSS-Squish-0.100.0-r1
+++ b/metadata/md5-cache/dev-perl/CSS-Squish-0.100.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/URI virtual/perl-File-Spec dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TS/TSIBLEY/CSS-Squish-0.10.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c470bd7c47af44bc848f5298068d4b92
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 1efd0dedef4f..82753104a8ed 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
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4c34216e5a58d8ee7286aff912e98f7c
diff --git a/metadata/md5-cache/dev-perl/Cache-Simple-TimedExpiry-0.270.0-r1 b/metadata/md5-cache/dev-perl/Cache-Simple-TimedExpiry-0.270.0-r1
index f60f38b7aee5..1adb147e00f9 100644
--- a/metadata/md5-cache/dev-perl/Cache-Simple-TimedExpiry-0.270.0-r1
+++ b/metadata/md5-cache/dev-perl/Cache-Simple-TimedExpiry-0.270.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JE/JESSE/Cache-Simple-TimedExpiry-0.27.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d8671a03a3bdf2531da4291c5b13a6b6
diff --git a/metadata/md5-cache/dev-perl/Cairo-1.106.0 b/metadata/md5-cache/dev-perl/Cairo-1.106.0
index fc9261db08b9..9ebaebd7e72d 100644
--- a/metadata/md5-cache/dev-perl/Cairo-1.106.0
+++ b/metadata/md5-cache/dev-perl/Cairo-1.106.0
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/cairo-1.0.0 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Cairo-1.106.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=80350f3ae2f79738f35d3b790e2ba9de
diff --git a/metadata/md5-cache/dev-perl/Calendar-Simple-2.0.0 b/metadata/md5-cache/dev-perl/Calendar-Simple-2.0.0
new file mode 100644
index 000000000000..6ce680c264a6
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Calendar-Simple-2.0.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp virtual/perl-Time-Local !minimal? ( dev-perl/DateTime ) >=dev-perl/Module-Build-0.28 test? ( virtual/perl-Test-Simple ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/Module-Build dev-lang/perl
+DESCRIPTION=Perl extension to create simple calendars
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Calendar-Simple
+IUSE=minimal test
+KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~ppc-aix
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-Time-Local !minimal? ( dev-perl/DateTime ) dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DA/DAVECROSS/Calendar-Simple-v2.0.0.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=f8e62ec256ac0d6ac53e08bb9ddfbf43
diff --git a/metadata/md5-cache/dev-perl/Carp-Assert-0.210.0 b/metadata/md5-cache/dev-perl/Carp-Assert-0.210.0
index 41bb77a908a8..b4b8a737ad7e 100644
--- a/metadata/md5-cache/dev-perl/Carp-Assert-0.210.0
+++ b/metadata/md5-cache/dev-perl/Carp-Assert-0.210.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Carp-Assert-0.21.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4b6af927818ad161f7e1b2590f9c2b6e
diff --git a/metadata/md5-cache/dev-perl/Chart-Math-Axis-1.60.0-r2 b/metadata/md5-cache/dev-perl/Chart-Math-Axis-1.60.0-r2
index 40f66120a9dd..b9103add19db 100644
--- a/metadata/md5-cache/dev-perl/Chart-Math-Axis-1.60.0-r2
+++ b/metadata/md5-cache/dev-perl/Chart-Math-Axis-1.60.0-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Math-BigInt-1.70 >=virtual/perl-Storable-2.12 >=dev-perl/Params-Util-0.15 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Chart-Math-Axis-1.06.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=91944c17ace947e2ecd03b16d7408532
diff --git a/metadata/md5-cache/dev-perl/Class-Accessor-0.340.0-r1 b/metadata/md5-cache/dev-perl/Class-Accessor-0.340.0-r1
index 6540bd6bc0b9..fc4d15501498 100644
--- a/metadata/md5-cache/dev-perl/Class-Accessor-0.340.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-Accessor-0.340.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Sub-Name dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KASEI/Class-Accessor-0.34.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7eb8bfb698a1b85f4c50d47f31c67143
diff --git a/metadata/md5-cache/dev-perl/Class-Accessor-Chained-0.10.0-r1 b/metadata/md5-cache/dev-perl/Class-Accessor-Chained-0.10.0-r1
index 8d2e33575cd7..c9f1c0a5857b 100644
--- a/metadata/md5-cache/dev-perl/Class-Accessor-Chained-0.10.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-Accessor-Chained-0.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Accessor dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Class-Accessor-Chained-0.01.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=86930852aaa7deac9b164b50c35f4177
diff --git a/metadata/md5-cache/dev-perl/Class-Accessor-Grouped-0.100.120 b/metadata/md5-cache/dev-perl/Class-Accessor-Grouped-0.100.120
index 331653fbb8b2..c5c344a1f058 100644
--- a/metadata/md5-cache/dev-perl/Class-Accessor-Grouped-0.100.120
+++ b/metadata/md5-cache/dev-perl/Class-Accessor-Grouped-0.100.120
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp >=dev-perl/Module-Runtime-0.12.0 >=dev-perl/Class-XSAc
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RI/RIBASUSHI/Class-Accessor-Grouped-0.10012.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7299b5010a2e596e60f5ec202fc536cb
diff --git a/metadata/md5-cache/dev-perl/Class-Adapter-1.80.0-r1 b/metadata/md5-cache/dev-perl/Class-Adapter-1.80.0-r1
index a83e6bc3df62..2537474b31d2 100644
--- a/metadata/md5-cache/dev-perl/Class-Adapter-1.80.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-Adapter-1.80.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/perl-Scalar-List-Utils-1.10 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Class-Adapter-1.08.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0988e5347c155fc9a988a85bc5065a58
diff --git a/metadata/md5-cache/dev-perl/Class-Autouse-2.10.0-r2 b/metadata/md5-cache/dev-perl/Class-Autouse-2.10.0-r2
index 012357a80c0e..6726af7f51c7 100644
--- a/metadata/md5-cache/dev-perl/Class-Autouse-2.10.0-r2
+++ b/metadata/md5-cache/dev-perl/Class-Autouse-2.10.0-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Scalar-List-Utils-1.18 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Class-Autouse-2.01.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c7453eb7a123cf5c3c966620c2cae9f4
diff --git a/metadata/md5-cache/dev-perl/Class-C3-Componentised-1.1.0-r1 b/metadata/md5-cache/dev-perl/Class-C3-Componentised-1.1.0-r1
index 7c3ee11aca58..bd236bb70bcc 100644
--- a/metadata/md5-cache/dev-perl/Class-C3-Componentised-1.1.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-C3-Componentised-1.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/MRO-Compat dev-perl/Class-Inspector >=dev-perl/Class-C3-0.20 de
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FR/FREW/Class-C3-Componentised-1.001000.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e42421fe3c7718b09d38047eacd0b0c0
diff --git a/metadata/md5-cache/dev-perl/Class-DBI-Plugin-0.30.0 b/metadata/md5-cache/dev-perl/Class-DBI-Plugin-0.30.0
index 8a00e689ba54..bcc5be9e84fb 100644
--- a/metadata/md5-cache/dev-perl/Class-DBI-Plugin-0.30.0
+++ b/metadata/md5-cache/dev-perl/Class-DBI-Plugin-0.30.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-DBI dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JC/JCZEUS/Class-DBI-Plugin-0.03.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a9f47f5fc7d18cd5c5b10d3071ac4ff7
diff --git a/metadata/md5-cache/dev-perl/Class-DBI-Plugin-DeepAbstractSearch-0.80.0 b/metadata/md5-cache/dev-perl/Class-DBI-Plugin-DeepAbstractSearch-0.80.0
index 9519287cdfdd..51e0f6d08dcb 100644
--- a/metadata/md5-cache/dev-perl/Class-DBI-Plugin-DeepAbstractSearch-0.80.0
+++ b/metadata/md5-cache/dev-perl/Class-DBI-Plugin-DeepAbstractSearch-0.80.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-DBI-Plugin-0.03 >=dev-perl/SQL-Abstract-1.60 dev-perl/Class-DBI dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SR/SRIHA/Class-DBI-Plugin-DeepAbstractSearch-0.08.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=37cdc7cdd8ddc85962e27ae1f77d52c5
diff --git a/metadata/md5-cache/dev-perl/Class-Default-1.510.0-r1 b/metadata/md5-cache/dev-perl/Class-Default-1.510.0-r1
index 1710d88ccbfb..d21a2c35c863 100644
--- a/metadata/md5-cache/dev-perl/Class-Default-1.510.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-Default-1.510.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Class-Default-1.51.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=570a69149c2108440248df179c387196
diff --git a/metadata/md5-cache/dev-perl/Class-Loader-2.30.0-r1 b/metadata/md5-cache/dev-perl/Class-Loader-2.30.0-r1
index 8bde9cce1d8e..ce8b4eea1476 100644
--- a/metadata/md5-cache/dev-perl/Class-Loader-2.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-Loader-2.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VI/VIPUL/Class-Loader-2.03.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0655718d442610a7c66954e9d02abc49
diff --git a/metadata/md5-cache/dev-perl/Class-MakeMethods-1.10.0-r1 b/metadata/md5-cache/dev-perl/Class-MakeMethods-1.10.0-r1
index 70383fcbaff8..132a755c22c9 100644
--- a/metadata/md5-cache/dev-perl/Class-MakeMethods-1.10.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-MakeMethods-1.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EV/EVO/Class-MakeMethods-1.01.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a375694e18f354421f0bd0aa0f05d098
diff --git a/metadata/md5-cache/dev-perl/Class-Member-1.600.0-r1 b/metadata/md5-cache/dev-perl/Class-Member-1.600.0-r1
index 0f0097e58133..1c8d15ff83f8 100644
--- a/metadata/md5-cache/dev-perl/Class-Member-1.600.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-Member-1.600.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OP/OPI/Class-Member-1.6.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b67fc8d054c56885c7469982f7d729a9
diff --git a/metadata/md5-cache/dev-perl/Class-MethodMaker-2.240.0 b/metadata/md5-cache/dev-perl/Class-MethodMaker-2.240.0
index 8dd6cb90a34a..14856f1e5ccd 100644
--- a/metadata/md5-cache/dev-perl/Class-MethodMaker-2.240.0
+++ b/metadata/md5-cache/dev-perl/Class-MethodMaker-2.240.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SC/SCHWIGON/class-methodmaker/Class-MethodMaker-2.24.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=249b20f2352f999e2cfe45c22fbc44c6
diff --git a/metadata/md5-cache/dev-perl/Class-MethodMaker-2.240.0-r1 b/metadata/md5-cache/dev-perl/Class-MethodMaker-2.240.0-r1
index 2c18469d8519..af05bb7b6ac7 100644
--- a/metadata/md5-cache/dev-perl/Class-MethodMaker-2.240.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-MethodMaker-2.240.0-r1
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Create generic methods for OO Perl
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Class-MethodMaker
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SC/SCHWIGON/class-methodmaker/Class-MethodMaker-2.24.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=da647198e90caa2d813e0f3ab1f23749
+_md5_=31ad707ac4ab43eb3c8724aafd88d487
diff --git a/metadata/md5-cache/dev-perl/Class-ReturnValue-0.550.0-r1 b/metadata/md5-cache/dev-perl/Class-ReturnValue-0.550.0-r1
index c9d9c9150d8e..0cc172352b0e 100644
--- a/metadata/md5-cache/dev-perl/Class-ReturnValue-0.550.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-ReturnValue-0.550.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Devel-StackTrace dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JE/JESSE/Class-ReturnValue-0.55.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2a8681c60185540c271ce8b34290f1c6
diff --git a/metadata/md5-cache/dev-perl/Class-Singleton-1.500.0 b/metadata/md5-cache/dev-perl/Class-Singleton-1.500.0
index d02c4db08f39..95c939dd085e 100644
--- a/metadata/md5-cache/dev-perl/Class-Singleton-1.500.0
+++ b/metadata/md5-cache/dev-perl/Class-Singleton-1.500.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHAY/Class-Singleton-1.5.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7d4ee37d1ccc3dd1d44927401412fa20
diff --git a/metadata/md5-cache/dev-perl/Class-Spiffy-0.150.0-r1 b/metadata/md5-cache/dev-perl/Class-Spiffy-0.150.0-r1
index 4d49bddca430..d2506ea7949f 100644
--- a/metadata/md5-cache/dev-perl/Class-Spiffy-0.150.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-Spiffy-0.150.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/Class-Spiffy-0.15.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d0aa9a0f7e33d03fb97ed6dbd5693c9c
diff --git a/metadata/md5-cache/dev-perl/Class-Std-Fast-0.0.8-r1 b/metadata/md5-cache/dev-perl/Class-Std-Fast-0.0.8-r1
index 7970fce1ed48..740bdc3ceda5 100644
--- a/metadata/md5-cache/dev-perl/Class-Std-Fast-0.0.8-r1
+++ b/metadata/md5-cache/dev-perl/Class-Std-Fast-0.0.8-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/Class-Std-0.11.0 virtual/perl-version virtual/perl-Data-Dumpe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AC/ACID/Class-Std-Fast-v0.0.8.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a0ac5790d2fcce3557c1fd7f3c13b8cf
diff --git a/metadata/md5-cache/dev-perl/Class-Trigger-0.140.0-r1 b/metadata/md5-cache/dev-perl/Class-Trigger-0.140.0-r1
index 47a2ef18dcb9..7a3ef5ef7f08 100644
--- a/metadata/md5-cache/dev-perl/Class-Trigger-0.140.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-Trigger-0.140.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/IO-stringy dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/Class-Trigger-0.14.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e765435a2b94ec74e7f2e9e57b2d314f
diff --git a/metadata/md5-cache/dev-perl/Class-WhiteHole-0.40.0-r1 b/metadata/md5-cache/dev-perl/Class-WhiteHole-0.40.0-r1
index 934cb78395ed..ec35ded6c728 100644
--- a/metadata/md5-cache/dev-perl/Class-WhiteHole-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-WhiteHole-0.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHWERN/Class-WhiteHole-0.04.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f99d180981b1bf2f8d98170922a8e1c7
diff --git a/metadata/md5-cache/dev-perl/Class-XPath-1.400.0-r1 b/metadata/md5-cache/dev-perl/Class-XPath-1.400.0-r1
index f3f58fa37718..6a126a4e2a9c 100644
--- a/metadata/md5-cache/dev-perl/Class-XPath-1.400.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-XPath-1.400.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SAMTREGAR/Class-XPath-1.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1f61d8cec5b53969360b4bcd6627e713
diff --git a/metadata/md5-cache/dev-perl/Class-XSAccessor-1.190.0 b/metadata/md5-cache/dev-perl/Class-XSAccessor-1.190.0
index a685536e1592..f2cc089048c1 100644
--- a/metadata/md5-cache/dev-perl/Class-XSAccessor-1.190.0
+++ b/metadata/md5-cache/dev-perl/Class-XSAccessor-1.190.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/AutoXS-Header-1.01 !dev-perl/Class-XSAccessor-Array dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/Class-XSAccessor-1.19.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d83d9f162edb3feecd9f9f9dd653aaac
diff --git a/metadata/md5-cache/dev-perl/Clone-0.450.0 b/metadata/md5-cache/dev-perl/Clone-0.450.0
new file mode 100644
index 000000000000..dc0f221541bd
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Clone-0.450.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-ExtUtils-MakeMaker test? ( >=dev-perl/B-COW-0.4.0 virtual/perl-Test-Simple ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Recursively copy Perl datatypes
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Clone
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AT/ATOOMIC/Clone-0.45.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=b013dfdce794cbd60669dd080a563421
diff --git a/metadata/md5-cache/dev-perl/Color-Library-0.21.0-r1 b/metadata/md5-cache/dev-perl/Color-Library-0.21.0-r1
index c14831c68f30..726783b3466e 100644
--- a/metadata/md5-cache/dev-perl/Color-Library-0.21.0-r1
+++ b/metadata/md5-cache/dev-perl/Color-Library-0.21.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Module-Pluggable dev-perl/Class-Accessor dev-perl/Class-Data-In
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RO/ROKR/Color-Library-0.021.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d2e125633b1bb42eb2ad4e0c756f274d
diff --git a/metadata/md5-cache/dev-perl/Color-Library-0.21.0-r2 b/metadata/md5-cache/dev-perl/Color-Library-0.21.0-r2
new file mode 100644
index 000000000000..42085754ec8f
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Color-Library-0.21.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Module-Pluggable dev-perl/Class-Accessor dev-perl/Class-Data-Inheritable >=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( dev-perl/Test-Most ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=An easy-to-use and comprehensive named-color library
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Color-Library
+IUSE=test
+KEYWORDS=~amd64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Module-Pluggable dev-perl/Class-Accessor dev-perl/Class-Data-Inheritable dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RO/ROKR/Color-Library-0.021.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=268a7ac0ccb229507d0ec344d7335732
diff --git a/metadata/md5-cache/dev-perl/Compress-Bzip2-2.270.0 b/metadata/md5-cache/dev-perl/Compress-Bzip2-2.270.0
new file mode 100644
index 000000000000..6197cb62b151
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Compress-Bzip2-2.270.0
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/bzip2 virtual/perl-Carp virtual/perl-File-Spec virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Interface to Bzip2 compression library
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Compress-Bzip2
+IUSE=test
+KEYWORDS=~amd64 ~ia64 ~mips ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ ) BZIP2
+RDEPEND=app-arch/bzip2 virtual/perl-Carp virtual/perl-File-Spec dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Compress-Bzip2-2.27.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=2afdd3c566049516aff8afe8e7ad2a1b
diff --git a/metadata/md5-cache/dev-perl/Compress-LZF-3.800.0-r1 b/metadata/md5-cache/dev-perl/Compress-LZF-3.800.0-r1
new file mode 100644
index 000000000000..7c131380edef
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Compress-LZF-3.800.0-r1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=extremely light-weight Lempel-Ziv-Free compression
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Compress-LZF
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ ) || ( BSD-2 GPL-2+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/Compress-LZF-3.8.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=bbbdab8477e94469f997f0f875900a70
diff --git a/metadata/md5-cache/dev-perl/Config-ApacheFormat-1.200.0-r1 b/metadata/md5-cache/dev-perl/Config-ApacheFormat-1.200.0-r1
index 9f6fc7fcf7e4..0782924012f3 100644
--- a/metadata/md5-cache/dev-perl/Config-ApacheFormat-1.200.0-r1
+++ b/metadata/md5-cache/dev-perl/Config-ApacheFormat-1.200.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-MethodMaker virtual/perl-Text-Balanced virtual/perl-File-Spec dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SAMTREGAR/Config-ApacheFormat-1.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3e72e76c225011e357a5c3a66ce64668
diff --git a/metadata/md5-cache/dev-perl/Config-ApacheFormat-1.200.0-r2 b/metadata/md5-cache/dev-perl/Config-ApacheFormat-1.200.0-r2
new file mode 100644
index 000000000000..2b2090e556dd
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Config-ApacheFormat-1.200.0-r2
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-perl/Class-MethodMaker-1.80.0 >=virtual/perl-File-Spec-0.820.0 virtual/perl-Scalar-List-Utils >=virtual/perl-Text-Balanced-1.890.0 virtual/perl-ExtUtils-MakeMaker dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=use Apache format config files
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Config-ApacheFormat
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Class-MethodMaker-1.80.0 >=virtual/perl-File-Spec-0.820.0 virtual/perl-Scalar-List-Utils >=virtual/perl-Text-Balanced-1.890.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SA/SAMTREGAR/Config-ApacheFormat-1.2.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=9b3634b25f47eadb59b3426a9d0b257c
diff --git a/metadata/md5-cache/dev-perl/Config-Auto-0.440.0 b/metadata/md5-cache/dev-perl/Config-Auto-0.440.0
index 1ee5b47fbb35..92296c421ba9 100644
--- a/metadata/md5-cache/dev-perl/Config-Auto-0.440.0
+++ b/metadata/md5-cache/dev-perl/Config-Auto-0.440.0
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Config-IniFiles dev-perl/IO-String virtual/perl-Text-ParseWords
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Config-Auto-0.44.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8a189373b4fd8c4f098841afd05634fd
diff --git a/metadata/md5-cache/dev-perl/Config-Auto-0.440.0-r1 b/metadata/md5-cache/dev-perl/Config-Auto-0.440.0-r1
new file mode 100644
index 000000000000..34d637543587
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Config-Auto-0.440.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Config-IniFiles virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/IO-String virtual/perl-Text-ParseWords >=dev-perl/YAML-0.670.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Magical config file parser
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Config-Auto
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Config-IniFiles virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/IO-String virtual/perl-Text-ParseWords >=dev-perl/YAML-0.670.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Config-Auto-0.44.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=cbd560ebc1d216ad291a362cb7c8a3ea
diff --git a/metadata/md5-cache/dev-perl/Config-AutoConf-0.318.0 b/metadata/md5-cache/dev-perl/Config-AutoConf-0.318.0
new file mode 100644
index 000000000000..9c2c9a1e7763
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Config-AutoConf-0.318.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Capture-Tiny virtual/perl-Carp virtual/perl-Exporter >=virtual/perl-ExtUtils-CBuilder-0.280.220 dev-perl/File-Slurper virtual/perl-File-Spec virtual/perl-File-Temp >=virtual/perl-Scalar-List-Utils-1.180.0 virtual/perl-Text-ParseWords virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.900.0 ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=A module to implement some of AutoConf macros in pure perl
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Config-AutoConf
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Capture-Tiny virtual/perl-Carp virtual/perl-Exporter >=virtual/perl-ExtUtils-CBuilder-0.280.220 dev-perl/File-Slurper virtual/perl-File-Spec virtual/perl-File-Temp >=virtual/perl-Scalar-List-Utils-1.180.0 virtual/perl-Text-ParseWords dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/Config-AutoConf-0.318.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=eefd53ff03cc723d1912e63c2220f159
diff --git a/metadata/md5-cache/dev-perl/Config-Grammar-1.130.0 b/metadata/md5-cache/dev-perl/Config-Grammar-1.130.0
new file mode 100644
index 000000000000..5521e03e57a9
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Config-Grammar-1.130.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test virtual/perl-Test-Simple ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=A grammar-based, user-friendly config parser
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Config-Grammar
+IUSE=test
+KEYWORDS=~amd64 ~hppa ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DS/DSCHWEI/Config-Grammar-1.13.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=a534096c955d4c28826e0aa17e3feb84
diff --git a/metadata/md5-cache/dev-perl/Config-IniFiles-3.0.3 b/metadata/md5-cache/dev-perl/Config-IniFiles-3.0.3
new file mode 100644
index 000000000000..5950dd1c1d96
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Config-IniFiles-3.0.3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp virtual/perl-File-Temp dev-perl/IO-stringy >=virtual/perl-Scalar-List-Utils-1.330.0 >=dev-perl/Module-Build-0.280.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-IO >=virtual/perl-Test-Simple-0.880.0 virtual/perl-parent ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/Module-Build dev-lang/perl
+DESCRIPTION=A module for reading .ini-style configuration files
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Config-IniFiles
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-File-Temp dev-perl/IO-stringy >=virtual/perl-Scalar-List-Utils-1.330.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Config-IniFiles-3.000003.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=0ee0d5b97f5bce62ae6725a9a5b07c03
diff --git a/metadata/md5-cache/dev-perl/Config-JSON-1.520.200 b/metadata/md5-cache/dev-perl/Config-JSON-1.520.200
index 61425c11355f..ba85eb03fa7c 100644
--- a/metadata/md5-cache/dev-perl/Config-JSON-1.520.200
+++ b/metadata/md5-cache/dev-perl/Config-JSON-1.520.200
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/perl-File-Temp-0.180.0 >=dev-perl/JSON-2.160.0 >=virtual/perl-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RI/RIZEN/Config-JSON-1.5202.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8d17082e46b23dfe07616cf77b20d790
diff --git a/metadata/md5-cache/dev-perl/Config-JSON-1.520.200-r1 b/metadata/md5-cache/dev-perl/Config-JSON-1.520.200-r1
new file mode 100644
index 000000000000..b408c32203ba
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Config-JSON-1.520.200-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-File-Temp-0.180.0 >=dev-perl/JSON-2.160.0 dev-perl/Moo >=virtual/perl-Scalar-List-Utils-1.190.0 >=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( >=virtual/perl-Test-Simple-0.700.0 >=dev-perl/Test-Deep-0.95.0 ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=A JSON based config file system
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Config-JSON
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-File-Temp-0.180.0 >=dev-perl/JSON-2.160.0 dev-perl/Moo >=virtual/perl-Scalar-List-Utils-1.190.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RI/RIZEN/Config-JSON-1.5202.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=67cfc118b4d1949ee2331cc91940ed86
diff --git a/metadata/md5-cache/dev-perl/Config-MVP-2.200.11 b/metadata/md5-cache/dev-perl/Config-MVP-2.200.11
new file mode 100644
index 000000000000..43cfab6007c5
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Config-MVP-2.200.11
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Class-Load-0.170.0 virtual/perl-File-Spec dev-perl/Module-Pluggable >=dev-perl/Moose-0.910.0 dev-perl/MooseX-OneArgNew dev-perl/Params-Util dev-perl/Role-HasMessage dev-perl/Role-Identifiable dev-perl/Throwable dev-perl/Tie-IxHash dev-perl/Try-Tiny virtual/perl-ExtUtils-MakeMaker test? ( !minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 ) dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=multivalue-property package-oriented configuration
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Config-MVP
+IUSE=test minimal
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Class-Load-0.170.0 virtual/perl-File-Spec dev-perl/Module-Pluggable >=dev-perl/Moose-0.910.0 dev-perl/MooseX-OneArgNew dev-perl/Params-Util dev-perl/Role-HasMessage dev-perl/Role-Identifiable dev-perl/Throwable dev-perl/Tie-IxHash dev-perl/Try-Tiny dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-2.200011.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=5c6dc2c5e23d7e5e476ee48f2ec3c3a4
diff --git a/metadata/md5-cache/dev-perl/Config-Properties-1.800.0 b/metadata/md5-cache/dev-perl/Config-Properties-1.800.0
index 235056a22477..5e985c134c1a 100644
--- a/metadata/md5-cache/dev-perl/Config-Properties-1.800.0
+++ b/metadata/md5-cache/dev-perl/Config-Properties-1.800.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-File-Temp >=virtual/perl-Text-Tabs+Wrap-2001.92.900 dev-lan
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Config-Properties-1.80.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1be0f96697734f8bb19cb5db5c74670b
diff --git a/metadata/md5-cache/dev-perl/Config-Simple-4.590.0-r1 b/metadata/md5-cache/dev-perl/Config-Simple-4.590.0-r1
index 37428935d195..8d481d012d54 100644
--- a/metadata/md5-cache/dev-perl/Config-Simple-4.590.0-r1
+++ b/metadata/md5-cache/dev-perl/Config-Simple-4.590.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHERZODR/Config-Simple-4.59.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=29ad0cb1215e9a0e8f5e25168fb5a662
diff --git a/metadata/md5-cache/dev-perl/Config-Simple-4.590.0-r2 b/metadata/md5-cache/dev-perl/Config-Simple-4.590.0-r2
new file mode 100644
index 000000000000..46d1ff95a1ed
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Config-Simple-4.590.0-r2
@@ -0,0 +1,13 @@
+BDEPEND=dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Simple configuration file class
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Config-Simple
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SH/SHERZODR/Config-Simple-4.59.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=63043a5b955a8b8f7e424a89948358a0
diff --git a/metadata/md5-cache/dev-perl/Config-Tiny-2.230.0 b/metadata/md5-cache/dev-perl/Config-Tiny-2.230.0
index 84a0d423344a..45c1f3ef7426 100644
--- a/metadata/md5-cache/dev-perl/Config-Tiny-2.230.0
+++ b/metadata/md5-cache/dev-perl/Config-Tiny-2.230.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/perl-File-Spec-3.300.0 >=virtual/perl-File-Temp-0.220.0 dev-la
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RS/RSAVAGE/Config-Tiny-2.23.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ae38b756072afcee49bddf9ef8f2db22
diff --git a/metadata/md5-cache/dev-perl/Config-Tiny-2.240.0 b/metadata/md5-cache/dev-perl/Config-Tiny-2.240.0
new file mode 100644
index 000000000000..28daab8ee394
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Config-Tiny-2.240.0
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-File-Spec-3.300.0 >=virtual/perl-File-Temp-0.220.0 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Read/Write .ini style files with as little code as possible
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Config-Tiny
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-File-Spec-3.300.0 >=virtual/perl-File-Temp-0.220.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RS/RSAVAGE/Config-Tiny-2.24.tgz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=a0e5c8e639052a8ba41262a7c88fb086
diff --git a/metadata/md5-cache/dev-perl/Const-Fast-0.14.0-r1 b/metadata/md5-cache/dev-perl/Const-Fast-0.14.0-r1
index 491090076f14..54dbb0907d73 100644
--- a/metadata/md5-cache/dev-perl/Const-Fast-0.14.0-r1
+++ b/metadata/md5-cache/dev-perl/Const-Fast-0.14.0-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Scalar-List-Utils virtual/perl-Storable >=dev-perl/Sub-Expo
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Const-Fast-0.014.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=daf8bbe438c8e67ea5b7a8090d1ad4df
diff --git a/metadata/md5-cache/dev-perl/Const-Fast-0.14.0-r2 b/metadata/md5-cache/dev-perl/Const-Fast-0.14.0-r2
new file mode 100644
index 000000000000..0882774d6990
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Const-Fast-0.14.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Scalar-List-Utils virtual/perl-Storable >=dev-perl/Sub-Exporter-Progressive-0.1.7 >=dev-perl/Module-Build-Tiny-0.21.0 test? ( virtual/perl-Data-Dumper virtual/perl-File-Temp dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/Module-Build-Tiny dev-lang/perl
+DESCRIPTION=Facility for creating read-only scalars, arrays, and hashes
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Const-Fast
+IUSE=test
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Scalar-List-Utils virtual/perl-Storable >=dev-perl/Sub-Exporter-Progressive-0.1.7 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Const-Fast-0.014.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=7500283ba3d0d4b0379f8e45aa05fc41
diff --git a/metadata/md5-cache/dev-perl/Context-Preserve-0.30.0 b/metadata/md5-cache/dev-perl/Context-Preserve-0.30.0
new file mode 100644
index 000000000000..9a795c129db7
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Context-Preserve-0.30.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-CPAN-Meta-2.120.900 virtual/perl-File-Spec dev-perl/Test-Exception virtual/perl-Test-Simple ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Return chained, modified values from subs, without losing context
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Context-Preserve
+IUSE=test
+KEYWORDS=~amd64 ~x86 ~ppc-aix ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Context-Preserve-0.03.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=3636798a5de8b3aef11cc6a2a4b806c6
diff --git a/metadata/md5-cache/dev-perl/Convert-ASCII-Armour-1.400.0-r1 b/metadata/md5-cache/dev-perl/Convert-ASCII-Armour-1.400.0-r1
index 17d64722fd96..aa0f34758817 100644
--- a/metadata/md5-cache/dev-perl/Convert-ASCII-Armour-1.400.0-r1
+++ b/metadata/md5-cache/dev-perl/Convert-ASCII-Armour-1.400.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-IO-Compress virtual/perl-Digest-MD5 virtual/perl-MIME-Base64 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VI/VIPUL/Convert-ASCII-Armour-1.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2796da602e58070beda5f3bcd4a70e59
diff --git a/metadata/md5-cache/dev-perl/Convert-ASCII-Armour-1.400.0-r2 b/metadata/md5-cache/dev-perl/Convert-ASCII-Armour-1.400.0-r2
new file mode 100644
index 000000000000..11df199d5d04
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Convert-ASCII-Armour-1.400.0-r2
@@ -0,0 +1,13 @@
+BDEPEND=virtual/perl-IO-Compress virtual/perl-Digest-MD5 virtual/perl-MIME-Base64 dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Convert binary octets into ASCII armoured messages
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Convert-ASCII-Armour
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-IO-Compress virtual/perl-Digest-MD5 virtual/perl-MIME-Base64 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/V/VI/VIPUL/Convert-ASCII-Armour-1.4.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=be3eed2765631b4fe10c5f3733bc9624
diff --git a/metadata/md5-cache/dev-perl/Convert-ASN1-0.270.0 b/metadata/md5-cache/dev-perl/Convert-ASN1-0.270.0
index 9f83c024416d..47d1147e13f4 100644
--- a/metadata/md5-cache/dev-perl/Convert-ASN1-0.270.0
+++ b/metadata/md5-cache/dev-perl/Convert-ASN1-0.270.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GB/GBARR/Convert-ASN1-0.27.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2e229e4c25a55d33d80b79ac87b7651d
diff --git a/metadata/md5-cache/dev-perl/Convert-ASN1-0.270.0-r1 b/metadata/md5-cache/dev-perl/Convert-ASN1-0.270.0-r1
new file mode 100644
index 000000000000..bd04fdd55cc1
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Convert-ASN1-0.270.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( >=virtual/perl-Math-BigInt-1.997.0 >=virtual/perl-Test-Simple-0.900.0 ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Standard en/decode of ASN.1 structures
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Convert-ASN1
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/G/GB/GBARR/Convert-ASN1-0.27.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=d2c944a8a81d2f2a5aa28dd3409449f5
diff --git a/metadata/md5-cache/dev-perl/Convert-BER-1.320.0-r1 b/metadata/md5-cache/dev-perl/Convert-BER-1.320.0-r1
index 45a547011943..5f677f503dda 100644
--- a/metadata/md5-cache/dev-perl/Convert-BER-1.320.0-r1
+++ b/metadata/md5-cache/dev-perl/Convert-BER-1.320.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GB/GBARR/Convert-BER-1.32.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9d317aed2b94b4dcf8de68eea3eb1a74
diff --git a/metadata/md5-cache/dev-perl/Convert-BER-1.320.0-r2 b/metadata/md5-cache/dev-perl/Convert-BER-1.320.0-r2
new file mode 100644
index 000000000000..1bb349e79692
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Convert-BER-1.320.0-r2
@@ -0,0 +1,13 @@
+BDEPEND=dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Class for encoding/decoding BER messages
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Convert-BER
+KEYWORDS=~alpha ~amd64 ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/G/GB/GBARR/Convert-BER-1.32.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=87efdeb116c988a88192dba700c8b1eb
diff --git a/metadata/md5-cache/dev-perl/Convert-Binary-C-0.790.0 b/metadata/md5-cache/dev-perl/Convert-Binary-C-0.790.0
new file mode 100644
index 000000000000..cc829541ff07
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Convert-Binary-C-0.790.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Binary Data Conversion using C Types
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Convert-Binary-C
+IUSE=examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MH/MHX/Convert-Binary-C-0.79.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=1a5c247b1e1bb8e6aa9cf0267ef7189b
diff --git a/metadata/md5-cache/dev-perl/Convert-PEM-0.80.0-r1 b/metadata/md5-cache/dev-perl/Convert-PEM-0.80.0-r1
index 8909a4e35b14..edb0c4ae199b 100644
--- a/metadata/md5-cache/dev-perl/Convert-PEM-0.80.0-r1
+++ b/metadata/md5-cache/dev-perl/Convert-PEM-0.80.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-ErrorHandler dev-perl/Convert-ASN1 dev-perl/Crypt-DES_EDE3 virtual/perl-Digest-MD5 virtual/perl-MIME-Base64 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BT/BTROTT/Convert-PEM-0.08.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=49ea16c0674d964fd149af427aa96ef5
diff --git a/metadata/md5-cache/dev-perl/Convert-PEM-0.80.0-r2 b/metadata/md5-cache/dev-perl/Convert-PEM-0.80.0-r2
new file mode 100644
index 000000000000..14f36f3ec161
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Convert-PEM-0.80.0-r2
@@ -0,0 +1,13 @@
+BDEPEND=dev-perl/Class-ErrorHandler >=dev-perl/Convert-ASN1-0.100.0 dev-perl/Crypt-DES_EDE3 virtual/perl-Digest-MD5 virtual/perl-MIME-Base64 >=virtual/perl-ExtUtils-MakeMaker-6.420.0 dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Read/write encrypted ASN.1 PEM files
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Convert-PEM
+KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Class-ErrorHandler >=dev-perl/Convert-ASN1-0.100.0 dev-perl/Crypt-DES_EDE3 virtual/perl-Digest-MD5 virtual/perl-MIME-Base64 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BT/BTROTT/Convert-PEM-0.08.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=3187253a175d7f7cc4aa2e1109498498
diff --git a/metadata/md5-cache/dev-perl/Convert-TNEF-0.180.0-r2 b/metadata/md5-cache/dev-perl/Convert-TNEF-0.180.0-r2
index 89fe371721fd..464fb3abb591 100644
--- a/metadata/md5-cache/dev-perl/Convert-TNEF-0.180.0-r2
+++ b/metadata/md5-cache/dev-perl/Convert-TNEF-0.180.0-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/MIME-tools dev-perl/IO-stringy dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOUGW/Convert-TNEF-0.18.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=db1bcd6cc96689d967aa0e8e85f0310f
diff --git a/metadata/md5-cache/dev-perl/Convert-TNEF-0.180.0-r3 b/metadata/md5-cache/dev-perl/Convert-TNEF-0.180.0-r3
new file mode 100644
index 000000000000..63bd6009ac25
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Convert-TNEF-0.180.0-r3
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-perl/MIME-tools-4.109.0 dev-perl/IO-stringy virtual/perl-ExtUtils-MakeMaker dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=A Perl module for reading TNEF files
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Convert-TNEF
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/MIME-tools-4.109.0 dev-perl/IO-stringy dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DO/DOUGW/Convert-TNEF-0.18.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=6dc5d885c7ca6dfd7c5f3a8582d7b59e
diff --git a/metadata/md5-cache/dev-perl/Crypt-Blowfish-2.140.0-r1 b/metadata/md5-cache/dev-perl/Crypt-Blowfish-2.140.0-r1
index 314a12e9ba2d..cb96cfd59548 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Blowfish-2.140.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-Blowfish-2.140.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DP/DPARIS/Crypt-Blowfish-2.14.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8aaf81284a18d07965772ee9ca60269c
diff --git a/metadata/md5-cache/dev-perl/Crypt-CAST5_PP-1.40.0-r1 b/metadata/md5-cache/dev-perl/Crypt-CAST5_PP-1.40.0-r1
index 69728bb2b165..ab441b0082ab 100644
--- a/metadata/md5-cache/dev-perl/Crypt-CAST5_PP-1.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-CAST5_PP-1.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BO/BOBMATH/Crypt-CAST5_PP-1.04.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2a26b72eec92a9fb398b286875c83159
diff --git a/metadata/md5-cache/dev-perl/Crypt-CBC-2.330.0-r1 b/metadata/md5-cache/dev-perl/Crypt-CBC-2.330.0-r1
index 55bc00019c27..ab6833f9ff48 100644
--- a/metadata/md5-cache/dev-perl/Crypt-CBC-2.330.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-CBC-2.330.0-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Digest-MD5 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/Crypt-CBC-2.33.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7a002836f9905acc1f278d85e4574f95
diff --git a/metadata/md5-cache/dev-perl/Crypt-Cracklib-1.700.0-r1 b/metadata/md5-cache/dev-perl/Crypt-Cracklib-1.700.0-r1
index 1eee5703e7d9..f61b5e914e0f 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Cracklib-1.700.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-Cracklib-1.700.0-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/cracklib dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANIEL/Crypt-Cracklib-1.7.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c14543128a5b1c8fd865be131efd9350
diff --git a/metadata/md5-cache/dev-perl/Crypt-DES_EDE3-0.10.0-r1 b/metadata/md5-cache/dev-perl/Crypt-DES_EDE3-0.10.0-r1
index 2453b8cd98c8..214c511aaed8 100644
--- a/metadata/md5-cache/dev-perl/Crypt-DES_EDE3-0.10.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-DES_EDE3-0.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Crypt-DES dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BT/BTROTT/Crypt-DES_EDE3-0.01.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=24bb3e4286f043d407f94d5a14799830
diff --git a/metadata/md5-cache/dev-perl/Crypt-DSA-1.170.0 b/metadata/md5-cache/dev-perl/Crypt-DSA-1.170.0
index 324fe80c36d4..7a360d37a0e5 100644
--- a/metadata/md5-cache/dev-perl/Crypt-DSA-1.170.0
+++ b/metadata/md5-cache/dev-perl/Crypt-DSA-1.170.0
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Data-Buffer dev-perl/Digest-SHA1 virtual/perl-File-Spec dev-per
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Crypt-DSA-1.17.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b0c44848a295f5c11defbed839381da6
diff --git a/metadata/md5-cache/dev-perl/Crypt-Eksblowfish-0.9.0-r2 b/metadata/md5-cache/dev-perl/Crypt-Eksblowfish-0.9.0-r2
index 7652936b1e05..31e0e36c4d72 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Eksblowfish-0.9.0-r2
+++ b/metadata/md5-cache/dev-perl/Crypt-Eksblowfish-0.9.0-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Mix-0.1.0 >=virtual/perl-MIME-Base64-2.21 virtual/perl-XSLoader virtual/perl-parent dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Crypt-Eksblowfish-0.009.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f3d9e14a5147b62b0c2dd431d0b656d3
diff --git a/metadata/md5-cache/dev-perl/Crypt-IDEA-1.100.0 b/metadata/md5-cache/dev-perl/Crypt-IDEA-1.100.0
index ad2e5638c623..b85fa81a87d0 100644
--- a/metadata/md5-cache/dev-perl/Crypt-IDEA-1.100.0
+++ b/metadata/md5-cache/dev-perl/Crypt-IDEA-1.100.0
@@ -8,5 +8,5 @@ LICENSE=Crypt-IDEA
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DP/DPARIS/Crypt-IDEA-1.10.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9559b3149c8716b17eb57ce1ba96e808
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.280.0-r3 b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.280.0-r3
index 25bb27a1762d..1a7c888f2c6c 100644
--- a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.280.0-r3
+++ b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.280.0-r3
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Crypt-OpenSSL-Bignum dev-perl/Crypt-OpenSSL-Random !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PERLER/Crypt-OpenSSL-RSA-0.28.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0aabfcb763e174ed3cfdd8811b682355
diff --git a/metadata/md5-cache/dev-perl/Crypt-PasswdMD5-1.400.0 b/metadata/md5-cache/dev-perl/Crypt-PasswdMD5-1.400.0
index 67ffa5968f08..cb9835433ec8 100644
--- a/metadata/md5-cache/dev-perl/Crypt-PasswdMD5-1.400.0
+++ b/metadata/md5-cache/dev-perl/Crypt-PasswdMD5-1.400.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RS/RSAVAGE/Crypt-PasswdMD5-1.40.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e52bea540579828d58bc844c44b92b3e
diff --git a/metadata/md5-cache/dev-perl/Crypt-Primes-0.500.0-r1 b/metadata/md5-cache/dev-perl/Crypt-Primes-0.500.0-r1
index 448edd3b5831..387e4b57f80e 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Primes-0.500.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-Primes-0.500.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Math-Pari dev-perl/Crypt-Random dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VI/VIPUL/Crypt-Primes-0.50.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a6cb1442d1e0b1db9349e86eca28eeca
diff --git a/metadata/md5-cache/dev-perl/Crypt-RC4-2.020.0-r1 b/metadata/md5-cache/dev-perl/Crypt-RC4-2.020.0-r1
index a30e11479a21..988e877b9782 100644
--- a/metadata/md5-cache/dev-perl/Crypt-RC4-2.020.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-RC4-2.020.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SI/SIFUKURT/Crypt-RC4-2.02.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6b2fbc21e1505e4bac34142aa5a73a8e
diff --git a/metadata/md5-cache/dev-perl/Crypt-RSA-1.990.0-r1 b/metadata/md5-cache/dev-perl/Crypt-RSA-1.990.0-r1
index d4fccc3b3a8e..e09703b1c2f3 100644
--- a/metadata/md5-cache/dev-perl/Crypt-RSA-1.990.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-RSA-1.990.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Loader dev-perl/Crypt-Blowfish dev-perl/Convert-ASCII-Armour dev-perl/Crypt-CBC dev-perl/Crypt-Primes dev-perl/Crypt-Random dev-perl/Data-Buffer dev-perl/Digest-MD2 virtual/perl-Digest-MD5 dev-perl/Digest-SHA1 >=dev-perl/Math-Pari-2.010603 dev-perl/Sort-Versions dev-perl/Tie-EncryptedHash dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VI/VIPUL/Crypt-RSA-1.99.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7f235695a90280152915e35549439155
diff --git a/metadata/md5-cache/dev-perl/Crypt-Random-1.250.0-r1 b/metadata/md5-cache/dev-perl/Crypt-Random-1.250.0-r1
index b5d00ac32227..77c777cfe3ba 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Random-1.250.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-Random-1.250.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Math-Pari-2.010603 dev-perl/Class-Loader dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VI/VIPUL/Crypt-Random-1.25.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c99e766e8e1ba15ac476fe8f41c82ba8
diff --git a/metadata/md5-cache/dev-perl/Crypt-Rijndael-1.130.0 b/metadata/md5-cache/dev-perl/Crypt-Rijndael-1.130.0
index 9128c0258ce1..d5dedb914350 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Rijndael-1.130.0
+++ b/metadata/md5-cache/dev-perl/Crypt-Rijndael-1.130.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Crypt-Rijndael-1.13.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a022281455385e8dd2a7290f4556ebad
diff --git a/metadata/md5-cache/dev-perl/Crypt-SSLeay-0.720.0-r1 b/metadata/md5-cache/dev-perl/Crypt-SSLeay-0.720.0-r1
index 611499e40654..c0481f4dae5e 100644
--- a/metadata/md5-cache/dev-perl/Crypt-SSLeay-0.720.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-SSLeay-0.720.0-r1
@@ -11,5 +11,5 @@ RDEPEND=!libressl? ( >=dev-libs/openssl-0.9.7c:0 ) libressl? ( dev-libs/libressl
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NA/NANIS/Crypt-SSLeay-0.72.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2ba26b8145035a220bef0558202a9070
diff --git a/metadata/md5-cache/dev-perl/Crypt-SSLeay-0.720.0-r2 b/metadata/md5-cache/dev-perl/Crypt-SSLeay-0.720.0-r2
index c66f45c975e3..fb6c135933b0 100644
--- a/metadata/md5-cache/dev-perl/Crypt-SSLeay-0.720.0-r2
+++ b/metadata/md5-cache/dev-perl/Crypt-SSLeay-0.720.0-r2
@@ -4,7 +4,7 @@ DESCRIPTION=OpenSSL support for LWP
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Crypt-SSLeay
 IUSE=libressl test
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~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 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2
 PDEPEND=dev-perl/libwww-perl >=dev-perl/LWP-Protocol-https-6.20.0
 RDEPEND=!libressl? ( >=dev-libs/openssl-0.9.7c:0= ) libressl? ( dev-libs/libressl:0= ) virtual/perl-MIME-Base64 dev-lang/perl:=
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NA/NANIS/Crypt-SSLeay-0.72.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6413b6817426839f84fc1de808cb3f48
+_md5_=e73f0f0470699d9760ac2b09417e7fc8
diff --git a/metadata/md5-cache/dev-perl/Crypt-Simple-0.60.0-r1 b/metadata/md5-cache/dev-perl/Crypt-Simple-0.60.0-r1
index 4ed2aa1a3471..e7bdc8821f13 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Simple-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-Simple-0.60.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/FreezeThaw virtual/perl-IO-Compress dev-perl/Crypt-Blowfish vir
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KASEI/Crypt-Simple-0.06.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=56146e72802d3904df68012cb1d537c7
diff --git a/metadata/md5-cache/dev-perl/Crypt-Twofish-2.170.0-r1 b/metadata/md5-cache/dev-perl/Crypt-Twofish-2.170.0-r1
index 038ba6a2c8ce..0f98f577aaa1 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Twofish-2.170.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-Twofish-2.170.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AM/AMS/Crypt-Twofish-2.17.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f496a131242e09413e1c26210b3bba68
diff --git a/metadata/md5-cache/dev-perl/Crypt-X509-0.510.0 b/metadata/md5-cache/dev-perl/Crypt-X509-0.510.0
index 451f0e8f1b3d..30f14b0b08d8 100644
--- a/metadata/md5-cache/dev-perl/Crypt-X509-0.510.0
+++ b/metadata/md5-cache/dev-perl/Crypt-X509-0.510.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AJ/AJUNG/Crypt-X509-0.51.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=98efe3daf2506cc330b4c871e92ced90
diff --git a/metadata/md5-cache/dev-perl/Cwd-Guard-0.50.0 b/metadata/md5-cache/dev-perl/Cwd-Guard-0.50.0
index 4d0d79af0197..8c2bd9870028 100644
--- a/metadata/md5-cache/dev-perl/Cwd-Guard-0.50.0
+++ b/metadata/md5-cache/dev-perl/Cwd-Guard-0.50.0
@@ -4,11 +4,11 @@ DESCRIPTION=Temporary changing working directory (chdir)
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Cwd-Guard
 IUSE=test minimal
-KEYWORDS=amd64 hppa ~ppc x86
+KEYWORDS=amd64 ~arm hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-Exporter virtual/perl-if virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KAZEBURO/Cwd-Guard-0.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=37f817aecd90a9e793dd3430bfc1df43
+_md5_=bb3ee5b59b5eed1cf4b32526d0c122de
diff --git a/metadata/md5-cache/dev-perl/DBIx-Class-DynamicDefault-0.40.0 b/metadata/md5-cache/dev-perl/DBIx-Class-DynamicDefault-0.40.0
index 11348e066720..02083c417b61 100644
--- a/metadata/md5-cache/dev-perl/DBIx-Class-DynamicDefault-0.40.0
+++ b/metadata/md5-cache/dev-perl/DBIx-Class-DynamicDefault-0.40.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/DBIx-Class-0.81.270 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSTROUT/DBIx-Class-DynamicDefault-0.04.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3f719f9737024cce82ea09518b308101
diff --git a/metadata/md5-cache/dev-perl/DBIx-ContextualFetch-1.30.0-r1 b/metadata/md5-cache/dev-perl/DBIx-ContextualFetch-1.30.0-r1
index f56cd75825ff..640c4149bdb1 100644
--- a/metadata/md5-cache/dev-perl/DBIx-ContextualFetch-1.30.0-r1
+++ b/metadata/md5-cache/dev-perl/DBIx-ContextualFetch-1.30.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/DBI-1.37 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/DBIx-ContextualFetch-1.03.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a058ab7e299f0900e893dfe172fbce31
diff --git a/metadata/md5-cache/dev-perl/DBIx-DBSchema-0.450.0 b/metadata/md5-cache/dev-perl/DBIx-DBSchema-0.450.0
index b6d51ae873fa..842ab44022fa 100644
--- a/metadata/md5-cache/dev-perl/DBIx-DBSchema-0.450.0
+++ b/metadata/md5-cache/dev-perl/DBIx-DBSchema-0.450.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DBI virtual/perl-Storable dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IV/IVAN/DBIx-DBSchema-0.45.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=50afea3aafd62703a5c3bd2e4eae46d4
diff --git a/metadata/md5-cache/dev-perl/DBIx-Migration-0.70.0 b/metadata/md5-cache/dev-perl/DBIx-Migration-0.70.0
index 9e85010baeb3..0278b66c3be2 100644
--- a/metadata/md5-cache/dev-perl/DBIx-Migration-0.70.0
+++ b/metadata/md5-cache/dev-perl/DBIx-Migration-0.70.0
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/File-Slurp virtual/perl-File-Spec dev-perl/DBI dev-perl/Class-A
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANIEL/DBIx-Migration-0.07.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8443ec138eba1c5be37cd0c6bdcdef42
diff --git a/metadata/md5-cache/dev-perl/DB_File-Lock-0.50.0-r1 b/metadata/md5-cache/dev-perl/DB_File-Lock-0.50.0-r1
index 19985e7f1cac..591da6051e0c 100644
--- a/metadata/md5-cache/dev-perl/DB_File-Lock-0.50.0-r1
+++ b/metadata/md5-cache/dev-perl/DB_File-Lock-0.50.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-DB_File dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DH/DHARRIS/DB_File-Lock-0.05.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e2434993a590110839a5739889c4cfa7
diff --git a/metadata/md5-cache/dev-perl/Danga-Socket-1.610.0-r1 b/metadata/md5-cache/dev-perl/Danga-Socket-1.610.0-r1
index bd1dd1811574..2e60fb75e974 100644
--- a/metadata/md5-cache/dev-perl/Danga-Socket-1.610.0-r1
+++ b/metadata/md5-cache/dev-perl/Danga-Socket-1.610.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Sys-Syscall dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BR/BRADFITZ/Danga-Socket-1.61.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7a19bfbbf01f828509036c2fd9118b95
diff --git a/metadata/md5-cache/dev-perl/Data-AMF-0.90.0-r1 b/metadata/md5-cache/dev-perl/Data-AMF-0.90.0-r1
index 199bb0aa40a7..1a35ef2c7edc 100644
--- a/metadata/md5-cache/dev-perl/Data-AMF-0.90.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-AMF-0.90.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/DateTime dev-perl/Any-Moose dev-perl/UNIVERSAL-require dev-perl
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TY/TYPESTER/Data-AMF-0.09.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=617a3eead21a22a3bd84ca62f8c22f9a
diff --git a/metadata/md5-cache/dev-perl/Data-Buffer-0.40.0-r1 b/metadata/md5-cache/dev-perl/Data-Buffer-0.40.0-r1
index 421f08068131..3b3f8ce1766e 100644
--- a/metadata/md5-cache/dev-perl/Data-Buffer-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-Buffer-0.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BT/BTROTT/Data-Buffer-0.04.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0fd586693b6722f3f6431004228e4fd9
diff --git a/metadata/md5-cache/dev-perl/Data-Compare-1.250.0 b/metadata/md5-cache/dev-perl/Data-Compare-1.250.0
index 665868e800eb..d174b549203f 100644
--- a/metadata/md5-cache/dev-perl/Data-Compare-1.250.0
+++ b/metadata/md5-cache/dev-perl/Data-Compare-1.250.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/File-Find-Rule-0.100.0 virtual/perl-Scalar-List-Utils dev-lan
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DC/DCANTRELL/Data-Compare-1.25.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7b39925c0432f5e0f8505f6426a43613
diff --git a/metadata/md5-cache/dev-perl/Data-Diver-1.010.1 b/metadata/md5-cache/dev-perl/Data-Diver-1.010.1
index b4eec91dadf5..c72d3d8eba34 100644
--- a/metadata/md5-cache/dev-perl/Data-Diver-1.010.1
+++ b/metadata/md5-cache/dev-perl/Data-Diver-1.010.1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TY/TYEMQ/Data-Diver-1.0101.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4d0ac2b5a0975f15ec2af2acf87a5886
diff --git a/metadata/md5-cache/dev-perl/Data-Dump-1.230.0 b/metadata/md5-cache/dev-perl/Data-Dump-1.230.0
index f1177e23b574..2f308533c932 100644
--- a/metadata/md5-cache/dev-perl/Data-Dump-1.230.0
+++ b/metadata/md5-cache/dev-perl/Data-Dump-1.230.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Data-Dump-1.23.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b4cbbde6712312d78be0c2189d72af1d
diff --git a/metadata/md5-cache/dev-perl/Data-DumpXML-1.60.0-r1 b/metadata/md5-cache/dev-perl/Data-DumpXML-1.60.0-r1
index 76d827608025..57d4bffb7d39 100644
--- a/metadata/md5-cache/dev-perl/Data-DumpXML-1.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-DumpXML-1.60.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-MIME-Base64-2 >=dev-perl/XML-Parser-2 >=dev-perl/Array-RefElem-0.01 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Data-DumpXML-1.06.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4624325d8e7164ab6c056baa5901f26e
diff --git a/metadata/md5-cache/dev-perl/Data-Hexify-1.0.0-r1 b/metadata/md5-cache/dev-perl/Data-Hexify-1.0.0-r1
index 607e78fad559..924bfbbeb62c 100644
--- a/metadata/md5-cache/dev-perl/Data-Hexify-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-Hexify-1.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JV/JV/Data-Hexify-1.00.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bbfef289ef2399ff19f006a1480de70c
diff --git a/metadata/md5-cache/dev-perl/Data-Hierarchy-0.340.0-r1 b/metadata/md5-cache/dev-perl/Data-Hierarchy-0.340.0-r1
index 4dafc7daf033..b7e64202e2c8 100644
--- a/metadata/md5-cache/dev-perl/Data-Hierarchy-0.340.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-Hierarchy-0.340.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CL/CLKAO/Data-Hierarchy-0.34.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=31097a3eb6d414284052ef663104708e
diff --git a/metadata/md5-cache/dev-perl/Data-ICal-0.220.0 b/metadata/md5-cache/dev-perl/Data-ICal-0.220.0
index d4efd279d5b2..f9612b5d5836 100644
--- a/metadata/md5-cache/dev-perl/Data-ICal-0.220.0
+++ b/metadata/md5-cache/dev-perl/Data-ICal-0.220.0
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Class-Accessor dev-perl/Class-ReturnValue dev-perl/Text-vFile-a
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/Data-ICal-0.22.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f47a613e01722d1a934fcdde74d92e28
diff --git a/metadata/md5-cache/dev-perl/Data-Page-2.20.0-r1 b/metadata/md5-cache/dev-perl/Data-Page-2.20.0-r1
index 1a90e3376535..ab7cc549bbd7 100644
--- a/metadata/md5-cache/dev-perl/Data-Page-2.20.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-Page-2.20.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Class-Accessor-Chained dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LB/LBROCARD/Data-Page-2.02.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=27cc28f7e95ee8643a3f412292fd5156
diff --git a/metadata/md5-cache/dev-perl/Data-ShowTable-4.600.0 b/metadata/md5-cache/dev-perl/Data-ShowTable-4.600.0
index 9bc9d28e0e38..e9bde51130f0 100644
--- a/metadata/md5-cache/dev-perl/Data-ShowTable-4.600.0
+++ b/metadata/md5-cache/dev-perl/Data-ShowTable-4.600.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AK/AKSTE/Data-ShowTable-4.6.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=95824ef5b7afa6fd9230d822778520f6
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 f7d356f93a5b..bebf3f646852 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
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2c9e11c18e5c2068faae59c6d552ee95
diff --git a/metadata/md5-cache/dev-perl/Data-Stream-Bulk-0.110.0-r1 b/metadata/md5-cache/dev-perl/Data-Stream-Bulk-0.110.0-r1
index cd235b62080d..d4ba47d08262 100644
--- a/metadata/md5-cache/dev-perl/Data-Stream-Bulk-0.110.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-Stream-Bulk-0.110.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Moose dev-perl/Sub-Exporter dev-perl/Path-Class dev-perl/namesp
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOY/Data-Stream-Bulk-0.11.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=47b1137c892c00fe6761353d415d0cfc
diff --git a/metadata/md5-cache/dev-perl/Data-Types-0.90.0 b/metadata/md5-cache/dev-perl/Data-Types-0.90.0
index 58f3bf09aead..8ee88778f0ee 100644
--- a/metadata/md5-cache/dev-perl/Data-Types-0.90.0
+++ b/metadata/md5-cache/dev-perl/Data-Types-0.90.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DW/DWHEELER/Data-Types-0.09.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=69940e8a07f1c13befe33e487c77ed5b
diff --git a/metadata/md5-cache/dev-perl/Data-URIEncode-0.110.0-r1 b/metadata/md5-cache/dev-perl/Data-URIEncode-0.110.0-r1
index 89914c732c66..d5020c9fa568 100644
--- a/metadata/md5-cache/dev-perl/Data-URIEncode-0.110.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-URIEncode-0.110.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RH/RHANDOM/Data-URIEncode-0.11.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=11a84521a6f105b294ed03bf3590f65f
diff --git a/metadata/md5-cache/dev-perl/Data-UUID-1.221.0 b/metadata/md5-cache/dev-perl/Data-UUID-1.221.0
index b63cf6441f1a..404cbf916290 100644
--- a/metadata/md5-cache/dev-perl/Data-UUID-1.221.0
+++ b/metadata/md5-cache/dev-perl/Data-UUID-1.221.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=virtual/perl-Digest-MD5 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Data-UUID-1.221.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4b40b5ec28ef47c6aa42799014fb2f39
diff --git a/metadata/md5-cache/dev-perl/Data-Uniqid-0.120.0-r1 b/metadata/md5-cache/dev-perl/Data-Uniqid-0.120.0-r1
index 0cc44cab8bc3..9c5e0e7a86ee 100644
--- a/metadata/md5-cache/dev-perl/Data-Uniqid-0.120.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-Uniqid-0.120.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Math-BigInt virtual/perl-Time-HiRes dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MW/MWX/Data-Uniqid-0.12.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=51a49778ecf42833ec22ad3841032ace
diff --git a/metadata/md5-cache/dev-perl/Data-Utilities-0.40.0-r1 b/metadata/md5-cache/dev-perl/Data-Utilities-0.40.0-r1
index fea8dff017bf..782ab00d9428 100644
--- a/metadata/md5-cache/dev-perl/Data-Utilities-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-Utilities-0.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Clone dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CO/CORNELIS/Data-Utilities-0.04.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=132c42c82e3b0f512bef2a71c1dcedad
diff --git a/metadata/md5-cache/dev-perl/Data-Visitor-0.300.0-r1 b/metadata/md5-cache/dev-perl/Data-Visitor-0.300.0-r1
index eca1442a929d..c2fd9dccff33 100644
--- a/metadata/md5-cache/dev-perl/Data-Visitor-0.300.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-Visitor-0.300.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/Class-Load-0.60.0 >=dev-perl/Moose-0.890.0 >=dev-perl/namespa
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOY/Data-Visitor-0.30.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f414b3d96e60efa2a6447638878fae73
diff --git a/metadata/md5-cache/dev-perl/Date-Calc-6.400.0 b/metadata/md5-cache/dev-perl/Date-Calc-6.400.0
index 5cd4da62388b..5ef74c903a07 100644
--- a/metadata/md5-cache/dev-perl/Date-Calc-6.400.0
+++ b/metadata/md5-cache/dev-perl/Date-Calc-6.400.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ ) LGPL-2
 RDEPEND=>=dev-perl/Bit-Vector-7.400.0 >=dev-perl/Carp-Clan-6.40.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/ST/STBEY/Date-Calc-6.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0a06bb78017d33dab75a15f4d81dd3e7
diff --git a/metadata/md5-cache/dev-perl/Date-ICal-2.678.0-r1 b/metadata/md5-cache/dev-perl/Date-ICal-2.678.0-r1
index 791fa9a0284a..316a9b142833 100644
--- a/metadata/md5-cache/dev-perl/Date-ICal-2.678.0-r1
+++ b/metadata/md5-cache/dev-perl/Date-ICal-2.678.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Date-Leapyear virtual/perl-Time-Local virtual/perl-Time-HiRes virtual/perl-Storable dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RB/RBOW/Date-ICal-2.678.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2cb1fa045db80ab6829b4a48937b9c6d
diff --git a/metadata/md5-cache/dev-perl/Date-Leapyear-1.720.0-r1 b/metadata/md5-cache/dev-perl/Date-Leapyear-1.720.0-r1
index 5d369d35c0a3..6f4fe76091e9 100644
--- a/metadata/md5-cache/dev-perl/Date-Leapyear-1.720.0-r1
+++ b/metadata/md5-cache/dev-perl/Date-Leapyear-1.720.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RB/RBOW/Date-Leapyear-1.72.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=55ff876fbcb43efb29a393c61c995b6a
diff --git a/metadata/md5-cache/dev-perl/Date-Pcalc-6.100.0-r1 b/metadata/md5-cache/dev-perl/Date-Pcalc-6.100.0-r1
index b43df4776170..bcfb5dc41c85 100644
--- a/metadata/md5-cache/dev-perl/Date-Pcalc-6.100.0-r1
+++ b/metadata/md5-cache/dev-perl/Date-Pcalc-6.100.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Bit-Vector-7 >=dev-perl/Carp-Clan-5.3 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/ST/STBEY/Date-Pcalc-6.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2425ef14d6c5a6ef7998374d2941fc6c
diff --git a/metadata/md5-cache/dev-perl/Date-Simple-3.30.0-r1 b/metadata/md5-cache/dev-perl/Date-Simple-3.30.0-r1
index 93c543411186..a6ed1e0fe2a0 100644
--- a/metadata/md5-cache/dev-perl/Date-Simple-3.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Date-Simple-3.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IZ/IZUT/Date-Simple-3.03.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3cd9d20a811c526dc7c2e89d0d61f95e
diff --git a/metadata/md5-cache/dev-perl/DateTime-1.200.0 b/metadata/md5-cache/dev-perl/DateTime-1.200.0
index da484f69a3b4..5215ee7df4ee 100644
--- a/metadata/md5-cache/dev-perl/DateTime-1.200.0
+++ b/metadata/md5-cache/dev-perl/DateTime-1.200.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp >=dev-perl/DateTime-Locale-0.410.0 >=dev-perl/DateTime
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.20.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=206679df61c4452da140aa07e0fdb31e
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Builder-0.810.0-r1 b/metadata/md5-cache/dev-perl/DateTime-Format-Builder-0.810.0-r1
index 19053bb90d5e..3c7a6e84541c 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-Builder-0.810.0-r1
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-Builder-0.810.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DateTime dev-perl/Class-Factory-Util >=dev-perl/Params-Validate-0.91 >=dev-perl/DateTime-Format-Strptime-1.0800 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Builder-0.81.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=68b2f7f72694ef7589177dd63a4bc9d2
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-DateParse-0.50.0-r1 b/metadata/md5-cache/dev-perl/DateTime-Format-DateParse-0.50.0-r1
index 1a1d4a55ad30..29b866798cb0 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-DateParse-0.50.0-r1
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-DateParse-0.50.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DateTime-0.29 dev-perl/DateTime-TimeZone dev-perl/TimeDate dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JH/JHOBLITT/DateTime-Format-DateParse-0.05.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9ac69542e7766c94777ac8399465438d
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-HTTP-0.420.0 b/metadata/md5-cache/dev-perl/DateTime-Format-HTTP-0.420.0
index 6d9930171bc0..eb69a0ecf353 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-HTTP-0.420.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-HTTP-0.420.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/DateTime-0.170.0 >=dev-perl/HTTP-Date-1.440.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CK/CKRAS/DateTime-Format-HTTP-0.42.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f62e09cc2f0d84ea7f725deed353c078
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-ICal-0.90.0 b/metadata/md5-cache/dev-perl/DateTime-Format-ICal-0.90.0
index 82f65a6a3117..ac1c164ebe4c 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-ICal-0.90.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-ICal-0.90.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DateTime >=dev-perl/DateTime-Event-ICal-0.03 >=dev-perl/DateTime-Set-0.1 >=dev-perl/DateTime-TimeZone-0.22 >=dev-perl/Params-Validate-0.59 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-ICal-0.09.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b52d8b2b306839e21c2d04825c8c68ce
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.80.0-r1 b/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.80.0-r1
index 3169e6de14da..0b99656cadc9 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.80.0-r1
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.80.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/DateTime dev-perl/DateTime-Format-Builder dev-lang/perl:=[-buil
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JH/JHOBLITT/DateTime-Format-ISO8601-0.08.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=99cc4340ceac6d076efbd8840a23019e
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-SQLite-0.110.0 b/metadata/md5-cache/dev-perl/DateTime-Format-SQLite-0.110.0
index f8b67170ac06..dc0ddf0ea528 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-SQLite-0.110.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-SQLite-0.110.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/DateTime-0.51 >=dev-perl/DateTime-Format-Builder-0.79.01 dev-l
 DESCRIPTION=Parse and format SQLite dates and times
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/DateTime-Format-SQLite
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DateTime-0.51 >=dev-perl/DateTime-Format-Builder-0.79.01 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CF/CFAERBER/DateTime-Format-SQLite-0.11.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=56f1ef67a3e9faa53497465cf6f21bc1
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=940c81c695a6854545aca7a84e02ce33
diff --git a/metadata/md5-cache/dev-perl/DateTime-Locale-0.460.0 b/metadata/md5-cache/dev-perl/DateTime-Locale-0.460.0
index f4c4a0f464eb..78beafc36b3a 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Locale-0.460.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Locale-0.460.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp >=dev-perl/Dist-CheckConflicts-0.20.0 dev-perl/List-Mo
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Locale-0.46.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=913cc0c25f5d7c9020c70789635adc31
diff --git a/metadata/md5-cache/dev-perl/DateTime-TimeZone-1.930.0 b/metadata/md5-cache/dev-perl/DateTime-TimeZone-1.930.0
index 1309c3a46691..8294b20b25c6 100644
--- a/metadata/md5-cache/dev-perl/DateTime-TimeZone-1.930.0
+++ b/metadata/md5-cache/dev-perl/DateTime-TimeZone-1.930.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/Class-Singleton-1.30.0 virtual/perl-File-Spec dev-perl/List-A
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-1.93.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=614c601bdf93cc7ab0a43feca3035810
diff --git a/metadata/md5-cache/dev-perl/DateTimeX-Easy-0.89.0 b/metadata/md5-cache/dev-perl/DateTimeX-Easy-0.89.0
index 5ce678c86aad..30ba9bfb682c 100644
--- a/metadata/md5-cache/dev-perl/DateTimeX-Easy-0.89.0
+++ b/metadata/md5-cache/dev-perl/DateTimeX-Easy-0.89.0
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/DateTime dev-perl/TimeDate dev-perl/DateTime-Format-Flexible de
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RO/ROKR/DateTimeX-Easy-0.089.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=716484d4dc2efe2c879d3142a6398ed0
diff --git a/metadata/md5-cache/dev-perl/DelimMatch-1.06-r1 b/metadata/md5-cache/dev-perl/DelimMatch-1.06-r1
index cef330a2ad0a..62886323bb06 100644
--- a/metadata/md5-cache/dev-perl/DelimMatch-1.06-r1
+++ b/metadata/md5-cache/dev-perl/DelimMatch-1.06-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NW/NWALSH/DelimMatch-1.06a.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=27cf15cedbbab84d6411c45bc316918c
diff --git a/metadata/md5-cache/dev-perl/Devel-ArgNames-0.30.0-r1 b/metadata/md5-cache/dev-perl/Devel-ArgNames-0.30.0-r1
index 5c0b54206044..a2473bac8bb4 100644
--- a/metadata/md5-cache/dev-perl/Devel-ArgNames-0.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Devel-ArgNames-0.30.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/PadWalker dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NU/NUFFIN/Devel-ArgNames-0.03.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2862b9b75d80214cb37990e4b7bfc57b
diff --git a/metadata/md5-cache/dev-perl/Devel-Caller-2.60.0 b/metadata/md5-cache/dev-perl/Devel-Caller-2.60.0
index e77f4b3f3cc3..28457eee50ff 100644
--- a/metadata/md5-cache/dev-perl/Devel-Caller-2.60.0
+++ b/metadata/md5-cache/dev-perl/Devel-Caller-2.60.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/PadWalker dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Devel-Caller-2.06.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8b336afc8ffda5d6729dee267bf924f2
diff --git a/metadata/md5-cache/dev-perl/Devel-CheckCompiler-0.70.0 b/metadata/md5-cache/dev-perl/Devel-CheckCompiler-0.70.0
index 9ba99a46b9d0..3579f25f2a2c 100644
--- a/metadata/md5-cache/dev-perl/Devel-CheckCompiler-0.70.0
+++ b/metadata/md5-cache/dev-perl/Devel-CheckCompiler-0.70.0
@@ -4,11 +4,11 @@ DESCRIPTION=Check the compiler's availability
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Devel-CheckCompiler
 IUSE=test
-KEYWORDS=amd64 hppa ~ppc x86
+KEYWORDS=amd64 ~arm hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter virtual/perl-ExtUtils-CBuilder virtual/perl-File-Temp virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SY/SYOHEX/Devel-CheckCompiler-0.07.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9b7fc483c8379037e619c918d7676f3f
+_md5_=13bdb4a718919de3aa4dd1bd8f6f71bb
diff --git a/metadata/md5-cache/dev-perl/Devel-Cycle-1.120.0 b/metadata/md5-cache/dev-perl/Devel-Cycle-1.120.0
index e0ad4d33b05e..6c9ff5071408 100644
--- a/metadata/md5-cache/dev-perl/Devel-Cycle-1.120.0
+++ b/metadata/md5-cache/dev-perl/Devel-Cycle-1.120.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/Devel-Cycle-1.12.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c26dd2d2cdeaf0ef8293e61c8d4c6b49
diff --git a/metadata/md5-cache/dev-perl/Devel-Dumpvar-1.60.0-r1 b/metadata/md5-cache/dev-perl/Devel-Dumpvar-1.60.0-r1
index 090daeee10e3..8f4b5f8674ac 100644
--- a/metadata/md5-cache/dev-perl/Devel-Dumpvar-1.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Devel-Dumpvar-1.60.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Scalar-List-Utils-1.18 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Devel-Dumpvar-1.06.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=104f2d594779b3f2c57318637bba9f3f
diff --git a/metadata/md5-cache/dev-perl/Devel-Hide-0.0.900 b/metadata/md5-cache/dev-perl/Devel-Hide-0.0.900
index 2b1d1560034e..32842ab96afb 100644
--- a/metadata/md5-cache/dev-perl/Devel-Hide-0.0.900
+++ b/metadata/md5-cache/dev-perl/Devel-Hide-0.0.900
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FE/FERREIRA/Devel-Hide-0.0009.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8571c8bc1e2297d370a50adeb14e1059
diff --git a/metadata/md5-cache/dev-perl/Devel-LexAlias-0.50.0 b/metadata/md5-cache/dev-perl/Devel-LexAlias-0.50.0
index 9d66ceaff6d1..30fee449b613 100644
--- a/metadata/md5-cache/dev-perl/Devel-LexAlias-0.50.0
+++ b/metadata/md5-cache/dev-perl/Devel-LexAlias-0.50.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Devel-Caller-2.03 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Devel-LexAlias-0.05.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=134617e4bbbc8f0071a2e372e7b0ce22
diff --git a/metadata/md5-cache/dev-perl/Devel-Refactor-0.50.0-r1 b/metadata/md5-cache/dev-perl/Devel-Refactor-0.50.0-r1
index aea6abaf8edc..c1e35d0ed520 100644
--- a/metadata/md5-cache/dev-perl/Devel-Refactor-0.50.0-r1
+++ b/metadata/md5-cache/dev-perl/Devel-Refactor-0.50.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SS/SSOTKA/Devel-Refactor-0.05.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bf9ac702dc83bd471f41f52e72ceaea1
diff --git a/metadata/md5-cache/dev-perl/Devel-Size-0.820.0 b/metadata/md5-cache/dev-perl/Devel-Size-0.820.0
index 03ef3df7c37c..1b9a74a73a8e 100644
--- a/metadata/md5-cache/dev-perl/Devel-Size-0.820.0
+++ b/metadata/md5-cache/dev-perl/Devel-Size-0.820.0
@@ -4,11 +4,11 @@ DESCRIPTION=Perl extension for finding the memory usage of Perl variables
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Devel-Size
 IUSE=test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NW/NWCLARK/Devel-Size-0.82.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=04cec058b07422a9c79e09e42fdde9d5
+_md5_=01c5593e7a170545e02665b7d348c7cc
diff --git a/metadata/md5-cache/dev-perl/Digest-BubbleBabble-0.20.0-r1 b/metadata/md5-cache/dev-perl/Digest-BubbleBabble-0.20.0-r1
index cfacb154e402..c4366241bfd2 100644
--- a/metadata/md5-cache/dev-perl/Digest-BubbleBabble-0.20.0-r1
+++ b/metadata/md5-cache/dev-perl/Digest-BubbleBabble-0.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BT/BTROTT/Digest-BubbleBabble-0.02.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1a5acb4e74f6805ec21b65cc8c396f22
diff --git a/metadata/md5-cache/dev-perl/Digest-CRC-0.210.0 b/metadata/md5-cache/dev-perl/Digest-CRC-0.210.0
index 73f473e18c47..56ddb1fd0362 100644
--- a/metadata/md5-cache/dev-perl/Digest-CRC-0.210.0
+++ b/metadata/md5-cache/dev-perl/Digest-CRC-0.210.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OL/OLIMAUL/Digest-CRC-0.21.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=285bdd3acdd61eb817acb2cd48e610f8
diff --git a/metadata/md5-cache/dev-perl/Digest-HMAC-1.30.0-r1 b/metadata/md5-cache/dev-perl/Digest-HMAC-1.30.0-r1
index bd496b94c681..5d7365e81293 100644
--- a/metadata/md5-cache/dev-perl/Digest-HMAC-1.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Digest-HMAC-1.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest-MD5 virtual/perl-Digest-SHA dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Digest-HMAC-1.03.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=615dbbf5d73b97a2a7b47e9948aee8cd
diff --git a/metadata/md5-cache/dev-perl/Digest-MD4-1.900.0-r1 b/metadata/md5-cache/dev-perl/Digest-MD4-1.900.0-r1
index dd480c197106..6a38e92c898a 100644
--- a/metadata/md5-cache/dev-perl/Digest-MD4-1.900.0-r1
+++ b/metadata/md5-cache/dev-perl/Digest-MD4-1.900.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKEM/DigestMD4/Digest-MD4-1.9.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=df89009cc213d4c8836deed20af958d3
diff --git a/metadata/md5-cache/dev-perl/Digest-MD5-File-0.80.0-r1 b/metadata/md5-cache/dev-perl/Digest-MD5-File-0.80.0-r1
index 080512f44332..47dd63490bb3 100644
--- a/metadata/md5-cache/dev-perl/Digest-MD5-File-0.80.0-r1
+++ b/metadata/md5-cache/dev-perl/Digest-MD5-File-0.80.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DM/DMUEY/Digest-MD5-File-0.08.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=17045a32d46f45e11cdb8347ca106223
diff --git a/metadata/md5-cache/dev-perl/Digest-Perl-MD5-1.900.0 b/metadata/md5-cache/dev-perl/Digest-Perl-MD5-1.900.0
index 1f506d34f7c1..ba07feda20cc 100644
--- a/metadata/md5-cache/dev-perl/Digest-Perl-MD5-1.900.0
+++ b/metadata/md5-cache/dev-perl/Digest-Perl-MD5-1.900.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DE/DELTA/Digest-Perl-MD5-1.9.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=efc1569d19c5903170231611a1864de7
diff --git a/metadata/md5-cache/dev-perl/Digest-SHA1-2.130.0-r1 b/metadata/md5-cache/dev-perl/Digest-SHA1-2.130.0-r1
index bdb7197bf8c3..132da4339514 100644
--- a/metadata/md5-cache/dev-perl/Digest-SHA1-2.130.0-r1
+++ b/metadata/md5-cache/dev-perl/Digest-SHA1-2.130.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Digest-SHA1-2.13.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=65dbca5e1d7c7df2a9d0495529a2a72f
diff --git a/metadata/md5-cache/dev-perl/Email-Date-1.104.0-r1 b/metadata/md5-cache/dev-perl/Email-Date-1.104.0-r1
index 75252ad4d148..664fe2d62130 100644
--- a/metadata/md5-cache/dev-perl/Email-Date-1.104.0-r1
+++ b/metadata/md5-cache/dev-perl/Email-Date-1.104.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/TimeDate-1.16 >=dev-perl/Email-Abstract-2.13.1 dev-perl/Email-Date-Format virtual/perl-Time-Local virtual/perl-Time-Piece dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Date-1.104.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4c56c3ca9213120be46ccbc64ad75127
diff --git a/metadata/md5-cache/dev-perl/Email-Find-0.100.0-r1 b/metadata/md5-cache/dev-perl/Email-Find-0.100.0-r1
index f6acdd31001d..dd55b9d18c08 100644
--- a/metadata/md5-cache/dev-perl/Email-Find-0.100.0-r1
+++ b/metadata/md5-cache/dev-perl/Email-Find-0.100.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-perl/MailTools dev-perl/Email-Valid virtual/perl-Test-Simple dev-lang
 DESCRIPTION=Find RFC 822 email addresses in plain text
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Email-Find
-KEYWORDS=amd64 ~arm hppa ~mips ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 hppa ~mips ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/MailTools dev-perl/Email-Valid virtual/perl-Test-Simple dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/Email-Find-0.10.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ad0e2ad0406829e81a405b94d4c79fc9
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=95f9577b077dc603d6c9d164a86c31c2
diff --git a/metadata/md5-cache/dev-perl/Email-MIME-Attachment-Stripper-1.317.0-r1 b/metadata/md5-cache/dev-perl/Email-MIME-Attachment-Stripper-1.317.0-r1
index b2b2ece17c43..c442d518f358 100644
--- a/metadata/md5-cache/dev-perl/Email-MIME-Attachment-Stripper-1.317.0-r1
+++ b/metadata/md5-cache/dev-perl/Email-MIME-Attachment-Stripper-1.317.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/Email-MIME-1.900 >=dev-perl/Email-MIME-ContentType-1.012 dev-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-Attachment-Stripper-1.317.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7bfbe38d54bd76fa239219cef37b89df
diff --git a/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r1 b/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r1
index 2004b99bde49..89a7e2c61c5c 100644
--- a/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r1
+++ b/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/perl-MIME-Base64-3.07 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-Encodings-1.315.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e243402d3735e15a5883d1201676e4eb
diff --git a/metadata/md5-cache/dev-perl/Email-Send-2.201.0 b/metadata/md5-cache/dev-perl/Email-Send-2.201.0
index 1f51e6572017..2d8febff9fcd 100644
--- a/metadata/md5-cache/dev-perl/Email-Send-2.201.0
+++ b/metadata/md5-cache/dev-perl/Email-Send-2.201.0
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Email-Abstract >=dev-perl/Email-Address-1.800.0 >=dev-perl/Emai
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Send-2.201.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4651d654e7572a12c09cb5def94a8280
diff --git a/metadata/md5-cache/dev-perl/Email-Send-Gmail-0.330.0 b/metadata/md5-cache/dev-perl/Email-Send-Gmail-0.330.0
index fc14b536e775..ceaad8d3add8 100644
--- a/metadata/md5-cache/dev-perl/Email-Send-Gmail-0.330.0
+++ b/metadata/md5-cache/dev-perl/Email-Send-Gmail-0.330.0
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Authen-SASL dev-perl/Email-Address dev-perl/Email-Send dev-perl
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LB/LBROCARD/Email-Send-Gmail-0.33.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1458ba206baf01eaa834303589e71bea
diff --git a/metadata/md5-cache/dev-perl/Email-Sender-1.300.16 b/metadata/md5-cache/dev-perl/Email-Sender-1.300.16
index b99393372b66..4ab7a04d032a 100644
--- a/metadata/md5-cache/dev-perl/Email-Sender-1.300.16
+++ b/metadata/md5-cache/dev-perl/Email-Sender-1.300.16
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp >=dev-perl/Email-Abstract-3.6.0 dev-perl/Email-Address
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Sender-1.300016.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=00f598ebbdafecf4c306fe9f77eb7d05
diff --git a/metadata/md5-cache/dev-perl/Email-Valid-1.202.0 b/metadata/md5-cache/dev-perl/Email-Valid-1.202.0
index 0dd996b59ee6..ed726061d3f7 100644
--- a/metadata/md5-cache/dev-perl/Email-Valid-1.202.0
+++ b/metadata/md5-cache/dev-perl/Email-Valid-1.202.0
@@ -4,11 +4,11 @@ DESCRIPTION=Check validity of Internet email addresses
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Email-Valid
 IUSE=test
-KEYWORDS=amd64 ~arm hppa ~mips ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 hppa ~mips ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-File-Spec dev-perl/IO-CaptureOutput virtual/perl-IO dev-perl/MailTools dev-perl/Net-DNS >=dev-perl/Net-Domain-TLD-1.650.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Valid-1.202.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1d2e2cb47223c3e2eab7429a05380deb
+_md5_=01d712d67afd7fd1c65c765fcf206b3d
diff --git a/metadata/md5-cache/dev-perl/Encode-Detect-1.10.0-r1 b/metadata/md5-cache/dev-perl/Encode-Detect-1.10.0-r1
index 04b96aa37a5c..186af587244f 100644
--- a/metadata/md5-cache/dev-perl/Encode-Detect-1.10.0-r1
+++ b/metadata/md5-cache/dev-perl/Encode-Detect-1.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=MPL-1.1
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JG/JGMYERS/Encode-Detect-1.01.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a319973785cb2165139d07aa40fe42ec
diff --git a/metadata/md5-cache/dev-perl/Encode-IMAPUTF7-1.50.0-r1 b/metadata/md5-cache/dev-perl/Encode-IMAPUTF7-1.50.0-r1
index 8c00eedf8f34..f5d7b682db12 100644
--- a/metadata/md5-cache/dev-perl/Encode-IMAPUTF7-1.50.0-r1
+++ b/metadata/md5-cache/dev-perl/Encode-IMAPUTF7-1.50.0-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Encode dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PM/PMAKHOLM/Encode-IMAPUTF7-1.05.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e8fa369a7c23a741d6cec10ea057a7b8
diff --git a/metadata/md5-cache/dev-perl/Encode-JIS2K-0.30.0 b/metadata/md5-cache/dev-perl/Encode-JIS2K-0.30.0
index d299040c3016..ddb39dac44bc 100644
--- a/metadata/md5-cache/dev-perl/Encode-JIS2K-0.30.0
+++ b/metadata/md5-cache/dev-perl/Encode-JIS2K-0.30.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Encode dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-JIS2K-0.03.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cd74133d78e2b5af4ac4286f40cf186a
diff --git a/metadata/md5-cache/dev-perl/Eval-LineNumbers-0.340.0 b/metadata/md5-cache/dev-perl/Eval-LineNumbers-0.340.0
index ad94c5068caf..2578b7ac3bf6 100644
--- a/metadata/md5-cache/dev-perl/Eval-LineNumbers-0.340.0
+++ b/metadata/md5-cache/dev-perl/Eval-LineNumbers-0.340.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MU/MUIR/modules/Eval-LineNumbers-0.34.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5682776c3cecc3398fb5f5e7526925ae
diff --git a/metadata/md5-cache/dev-perl/Event-ExecFlow-0.640.0-r1 b/metadata/md5-cache/dev-perl/Event-ExecFlow-0.640.0-r1
index 108bdd8cb1c8..e64fbce2cd0b 100644
--- a/metadata/md5-cache/dev-perl/Event-ExecFlow-0.640.0-r1
+++ b/metadata/md5-cache/dev-perl/Event-ExecFlow-0.640.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/AnyEvent dev-perl/libintl-perl dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JR/JRED/Event-ExecFlow-0.64.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2350613b0a14b38b4dfb7be2e0a08d0b
diff --git a/metadata/md5-cache/dev-perl/Exception-System-0.110.0-r1 b/metadata/md5-cache/dev-perl/Exception-System-0.110.0-r1
index 466f0d3bc4b2..df7ecf60d66e 100644
--- a/metadata/md5-cache/dev-perl/Exception-System-0.110.0-r1
+++ b/metadata/md5-cache/dev-perl/Exception-System-0.110.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/Exception-Base-0.22.01 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DE/DEXTER/Exception-System-0.11.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c4d90a69bac687c3fcc78193fbd967ac
diff --git a/metadata/md5-cache/dev-perl/Exception-Warning-0.40.100-r1 b/metadata/md5-cache/dev-perl/Exception-Warning-0.40.100-r1
index 9517fe7e146b..2da09c316fcd 100644
--- a/metadata/md5-cache/dev-perl/Exception-Warning-0.40.100-r1
+++ b/metadata/md5-cache/dev-perl/Exception-Warning-0.40.100-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/Exception-Base-0.22.01 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DE/DEXTER/Exception-Warning-0.0401.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a712d2bca90949b75090f82cd3fc3aca
diff --git a/metadata/md5-cache/dev-perl/Exporter-Cluster-0.310.0-r1 b/metadata/md5-cache/dev-perl/Exporter-Cluster-0.310.0-r1
index e88f5aa1151c..12985a47dc9a 100644
--- a/metadata/md5-cache/dev-perl/Exporter-Cluster-0.310.0-r1
+++ b/metadata/md5-cache/dev-perl/Exporter-Cluster-0.310.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DH/DHAGEMAN/Exporter-Cluster-0.31.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d8e248274f577a45bca128d66597b31c
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-XSBuilder-0.280.0-r1 b/metadata/md5-cache/dev-perl/ExtUtils-XSBuilder-0.280.0-r1
index 8e267f42afa1..8d906603c266 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-XSBuilder-0.280.0-r1
+++ b/metadata/md5-cache/dev-perl/ExtUtils-XSBuilder-0.280.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Parse-RecDescent dev-perl/Tie-IxHash dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GR/GRICHTER/ExtUtils-XSBuilder-0.28.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e028501657a56becc50094667b4af854
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-XSpp-0.180.0 b/metadata/md5-cache/dev-perl/ExtUtils-XSpp-0.180.0
index c2fdf92d669a..ef109eb9518f 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-XSpp-0.180.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-XSpp-0.180.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/perl-Digest-MD5-2.0.0 >=virtual/perl-ExtUtils-ParseXS-3.70.0 d
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-XSpp-0.18.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=731d7e09870ea5e6a7a4521660b8afb8
diff --git a/metadata/md5-cache/dev-perl/FLV-AudioExtractor-0.010.0 b/metadata/md5-cache/dev-perl/FLV-AudioExtractor-0.010.0
index 5cf3cfed4147..6086de77f9fa 100644
--- a/metadata/md5-cache/dev-perl/FLV-AudioExtractor-0.010.0
+++ b/metadata/md5-cache/dev-perl/FLV-AudioExtractor-0.010.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Moose dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FV/FVOX/FLV-AudioExtractor-0.01.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=de614ebcd16010e0283f19699526d669
diff --git a/metadata/md5-cache/dev-perl/File-BaseDir-0.30.0-r1 b/metadata/md5-cache/dev-perl/File-BaseDir-0.30.0-r1
index 7e5e110937ec..3670999f2f62 100644
--- a/metadata/md5-cache/dev-perl/File-BaseDir-0.30.0-r1
+++ b/metadata/md5-cache/dev-perl/File-BaseDir-0.30.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PA/PARDUS/File-BaseDir-0.03.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3ac1d072945a49d71f709793cae093c8
diff --git a/metadata/md5-cache/dev-perl/File-Copy-Link-0.140.0 b/metadata/md5-cache/dev-perl/File-Copy-Link-0.140.0
index 5d12b422dda9..7f4d02fc68ea 100644
--- a/metadata/md5-cache/dev-perl/File-Copy-Link-0.140.0
+++ b/metadata/md5-cache/dev-perl/File-Copy-Link-0.140.0
@@ -4,11 +4,11 @@ DESCRIPTION=Perl extension for replacing a link by a copy of the linked file
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/File-Copy-Link
 IUSE=test
-KEYWORDS=amd64 hppa ~ppc x86
+KEYWORDS=amd64 ~arm hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RM/RMBARKER/File-Copy-Link-0.140.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e2146d2f7b623c9d44077c67984e37ca
+_md5_=e9e5e5044828e0bd183f4355cd0c490a
diff --git a/metadata/md5-cache/dev-perl/File-Copy-Recursive-0.380.0-r1 b/metadata/md5-cache/dev-perl/File-Copy-Recursive-0.380.0-r1
index a8957006ff9e..39c4f7d06b98 100644
--- a/metadata/md5-cache/dev-perl/File-Copy-Recursive-0.380.0-r1
+++ b/metadata/md5-cache/dev-perl/File-Copy-Recursive-0.380.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DM/DMUEY/File-Copy-Recursive-0.38.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=342c3dde8b1efd24c5dc570df99b275a
diff --git a/metadata/md5-cache/dev-perl/File-Flock-2014.10.0 b/metadata/md5-cache/dev-perl/File-Flock-2014.10.0
index ec81199bb04b..68cfef07538c 100644
--- a/metadata/md5-cache/dev-perl/File-Flock-2014.10.0
+++ b/metadata/md5-cache/dev-perl/File-Flock-2014.10.0
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Data-Structure-Util >=dev-perl/IO-Event-0.812.0 dev-perl/AnyEve
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MU/MUIR/modules/File-Flock-2014.01.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a6124b960b19401585562f78257e8a6d
diff --git a/metadata/md5-cache/dev-perl/File-Listing-6.40.0-r1 b/metadata/md5-cache/dev-perl/File-Listing-6.40.0-r1
index 2f9ee8ed6613..19c5b038e37e 100644
--- a/metadata/md5-cache/dev-perl/File-Listing-6.40.0-r1
+++ b/metadata/md5-cache/dev-perl/File-Listing-6.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/libwww-perl-6 >=dev-perl/HTTP-Date-6.0.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/File-Listing-6.04.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=404ab4f364c89d7138c47d9c034a4333
diff --git a/metadata/md5-cache/dev-perl/File-MMagic-1.300.0-r1 b/metadata/md5-cache/dev-perl/File-MMagic-1.300.0-r1
index b7410e092c49..b08c9ebdf125 100644
--- a/metadata/md5-cache/dev-perl/File-MMagic-1.300.0-r1
+++ b/metadata/md5-cache/dev-perl/File-MMagic-1.300.0-r1
@@ -8,5 +8,5 @@ LICENSE=File-MMagic
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KN/KNOK/File-MMagic-1.30.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=26a41aa654721f8b544128ce07759345
diff --git a/metadata/md5-cache/dev-perl/File-Map-0.640.0 b/metadata/md5-cache/dev-perl/File-Map-0.640.0
index 5894934bb4e9..4e01ba5995bb 100644
--- a/metadata/md5-cache/dev-perl/File-Map-0.640.0
+++ b/metadata/md5-cache/dev-perl/File-Map-0.640.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp dev-perl/PerlIO-Layers >=dev-perl/Sub-Exporter-Progres
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/File-Map-0.64.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=acf19d44be0b6c5383d3bb13aa34de2d
diff --git a/metadata/md5-cache/dev-perl/File-NFSLock-1.270.0 b/metadata/md5-cache/dev-perl/File-NFSLock-1.270.0
index ffe166e4c56d..8ec1e9d8cd01 100644
--- a/metadata/md5-cache/dev-perl/File-NFSLock-1.270.0
+++ b/metadata/md5-cache/dev-perl/File-NFSLock-1.270.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BB/BBB/File-NFSLock-1.27.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=acbe4691fada049b635a65ebb7f78e72
diff --git a/metadata/md5-cache/dev-perl/File-Path-Expand-1.20.0-r1 b/metadata/md5-cache/dev-perl/File-Path-Expand-1.20.0-r1
index 38c8bf061398..4bef55530b51 100644
--- a/metadata/md5-cache/dev-perl/File-Path-Expand-1.20.0-r1
+++ b/metadata/md5-cache/dev-perl/File-Path-Expand-1.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/File-Path-Expand-1.02.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c9524cbf2ad873ee8fbb03eaca722ff8
diff --git a/metadata/md5-cache/dev-perl/File-ReadBackwards-1.50.0-r1 b/metadata/md5-cache/dev-perl/File-ReadBackwards-1.50.0-r1
index 50a1ee32676c..d21a98a8d9ff 100644
--- a/metadata/md5-cache/dev-perl/File-ReadBackwards-1.50.0-r1
+++ b/metadata/md5-cache/dev-perl/File-ReadBackwards-1.50.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/U/UR/URI/File-ReadBackwards-1.05.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dcbb2cfc5079dcfc51356e3025005b51
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 bbef3b0341e0..a0d54d502e1c 100644
--- a/metadata/md5-cache/dev-perl/File-RsyncP-0.740.0
+++ b/metadata/md5-cache/dev-perl/File-RsyncP-0.740.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=09f3890f0eddfc1a4cef4e2ae413e13c
diff --git a/metadata/md5-cache/dev-perl/File-Slurp-Tiny-0.4.0 b/metadata/md5-cache/dev-perl/File-Slurp-Tiny-0.4.0
index 047001986d09..905937e3ad2a 100644
--- a/metadata/md5-cache/dev-perl/File-Slurp-Tiny-0.4.0
+++ b/metadata/md5-cache/dev-perl/File-Slurp-Tiny-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=[-build
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/File-Slurp-Tiny-0.004.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b58bc82a18c74b54f4b2950a01051ca4
diff --git a/metadata/md5-cache/dev-perl/File-Sort-1.10.0-r1 b/metadata/md5-cache/dev-perl/File-Sort-1.10.0-r1
index 20c1ffbf1487..b172af4f2a38 100644
--- a/metadata/md5-cache/dev-perl/File-Sort-1.10.0-r1
+++ b/metadata/md5-cache/dev-perl/File-Sort-1.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CN/CNANDOR/File-Sort-1.01.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=46a27c16a496d6b0fc808d79b010796a
diff --git a/metadata/md5-cache/dev-perl/File-Stat-Bits-1.10.0-r1 b/metadata/md5-cache/dev-perl/File-Stat-Bits-1.10.0-r1
index 628ba89e5240..f456da4ffb03 100644
--- a/metadata/md5-cache/dev-perl/File-Stat-Bits-1.10.0-r1
+++ b/metadata/md5-cache/dev-perl/File-Stat-Bits-1.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FE/FEDOROV/File-Stat-Bits-1.01.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=80a753b9af868309d03d17015d33b75c
diff --git a/metadata/md5-cache/dev-perl/File-Sync-0.110.0 b/metadata/md5-cache/dev-perl/File-Sync-0.110.0
index c6feea35278b..39b5619c1493 100644
--- a/metadata/md5-cache/dev-perl/File-Sync-0.110.0
+++ b/metadata/md5-cache/dev-perl/File-Sync-0.110.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BR/BRIANSKI/File-Sync-0.11.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5399bbbdb341618154714c627e5a6af8
diff --git a/metadata/md5-cache/dev-perl/File-Tempdir-0.20.0-r1 b/metadata/md5-cache/dev-perl/File-Tempdir-0.20.0-r1
index e7dcd1d0d571..66943e710070 100644
--- a/metadata/md5-cache/dev-perl/File-Tempdir-0.20.0-r1
+++ b/metadata/md5-cache/dev-perl/File-Tempdir-0.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NA/NANARDON/File-Tempdir-0.02.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4bcf4ad0d5a8e076ff441e9e0387d185
diff --git a/metadata/md5-cache/dev-perl/File-Type-0.220.0-r1 b/metadata/md5-cache/dev-perl/File-Type-0.220.0-r1
index e8fec9c7d07d..2002a908bfc9 100644
--- a/metadata/md5-cache/dev-perl/File-Type-0.220.0-r1
+++ b/metadata/md5-cache/dev-perl/File-Type-0.220.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PM/PMISON/File-Type-0.22.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f749607e8c02fb62f302a59728b9bcf4
diff --git a/metadata/md5-cache/dev-perl/File-chmod-0.420.0 b/metadata/md5-cache/dev-perl/File-chmod-0.420.0
index e5b0e4b4d324..e1e751171631 100644
--- a/metadata/md5-cache/dev-perl/File-chmod-0.420.0
+++ b/metadata/md5-cache/dev-perl/File-chmod-0.420.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XE/XENO/File-chmod-0.42.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=24f1bcc9baa2222bb40561700dc00d93
diff --git a/metadata/md5-cache/dev-perl/FileHandle-Unget-0.162.800 b/metadata/md5-cache/dev-perl/FileHandle-Unget-0.162.800
index 99b5baebdfad..1c3e71d22841 100644
--- a/metadata/md5-cache/dev-perl/FileHandle-Unget-0.162.800
+++ b/metadata/md5-cache/dev-perl/FileHandle-Unget-0.162.800
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/perl-Scalar-List-Utils-1.140.0 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DC/DCOPPIT/FileHandle-Unget-0.1628.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0137a5256255aa2bb9d20ef2d82a8557
diff --git a/metadata/md5-cache/dev-perl/Filesys-Notify-Simple-0.120.0 b/metadata/md5-cache/dev-perl/Filesys-Notify-Simple-0.120.0
index 623e2d8c5e74..ee5990ae808c 100644
--- a/metadata/md5-cache/dev-perl/Filesys-Notify-Simple-0.120.0
+++ b/metadata/md5-cache/dev-perl/Filesys-Notify-Simple-0.120.0
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Filter dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/Filesys-Notify-Simple-0.12.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b74c87c174e891d4afce9118d3fb55dc
diff --git a/metadata/md5-cache/dev-perl/Font-AFM-1.200.0-r1 b/metadata/md5-cache/dev-perl/Font-AFM-1.200.0-r1
index 5d1947e87451..bbf808f18c03 100644
--- a/metadata/md5-cache/dev-perl/Font-AFM-1.200.0-r1
+++ b/metadata/md5-cache/dev-perl/Font-AFM-1.200.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Font-AFM-1.20.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f741d12ad46fcae1dc8d10a2fc48f134
diff --git a/metadata/md5-cache/dev-perl/Format-Human-Bytes-0.60.0-r1 b/metadata/md5-cache/dev-perl/Format-Human-Bytes-0.60.0-r1
index 4ba2d279412a..bdf5c4d60f4e 100644
--- a/metadata/md5-cache/dev-perl/Format-Human-Bytes-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Format-Human-Bytes-0.60.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SE/SEWI/Format-Human-Bytes-0.06.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0317648d25fd1fc5e3b0269b43380fc5
diff --git a/metadata/md5-cache/dev-perl/FreezeThaw-0.500.100-r1 b/metadata/md5-cache/dev-perl/FreezeThaw-0.500.100-r1
index 2562669e4947..de13f2dd4b34 100644
--- a/metadata/md5-cache/dev-perl/FreezeThaw-0.500.100-r1
+++ b/metadata/md5-cache/dev-perl/FreezeThaw-0.500.100-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IL/ILYAZ/modules/FreezeThaw-0.5001.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fa0507fd48fad9e9d3f13cf2d731ba12
diff --git a/metadata/md5-cache/dev-perl/Fuse-0.16.1 b/metadata/md5-cache/dev-perl/Fuse-0.16.1
index 08c295a83da8..bbde7747125b 100644
--- a/metadata/md5-cache/dev-perl/Fuse-0.16.1
+++ b/metadata/md5-cache/dev-perl/Fuse-0.16.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/fuse dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DP/DPATES/Fuse-0.16.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=645ff51dde34399a29c60b1c6c9d187d
diff --git a/metadata/md5-cache/dev-perl/GD-Barcode-1.150.0-r1 b/metadata/md5-cache/dev-perl/GD-Barcode-1.150.0-r1
index e08ca0e54310..4ee14666d25f 100644
--- a/metadata/md5-cache/dev-perl/GD-Barcode-1.150.0-r1
+++ b/metadata/md5-cache/dev-perl/GD-Barcode-1.150.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/GD dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KW/KWITKNR/GD-Barcode-1.15.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cd15679ac388157b59c05de5510dd600
diff --git a/metadata/md5-cache/dev-perl/GD-Graph3d-0.630.0-r1 b/metadata/md5-cache/dev-perl/GD-Graph3d-0.630.0-r1
index 5e710dc3ffab..8b5566a73888 100644
--- a/metadata/md5-cache/dev-perl/GD-Graph3d-0.630.0-r1
+++ b/metadata/md5-cache/dev-perl/GD-Graph3d-0.630.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/GD-1.18 >=dev-perl/GDGraph-1.30 dev-perl/GDTextUtil dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/W/WA/WADG/GD-Graph3d-0.63.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5db3d84aa418c496486ca32fb267b834
diff --git a/metadata/md5-cache/dev-perl/GD-SVG-0.330.0-r1 b/metadata/md5-cache/dev-perl/GD-SVG-0.330.0-r1
index 5e5ff01f8737..2bf13bf3a69d 100644
--- a/metadata/md5-cache/dev-perl/GD-SVG-0.330.0-r1
+++ b/metadata/md5-cache/dev-perl/GD-SVG-0.330.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/GD dev-perl/SVG dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TW/TWH/GD-SVG-0.33.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a403ce7e3db1c2d76d4572234223f023
diff --git a/metadata/md5-cache/dev-perl/GDGraph-1.490.0 b/metadata/md5-cache/dev-perl/GDGraph-1.490.0
index fad1c65aecfb..ae53e6ca046f 100644
--- a/metadata/md5-cache/dev-perl/GDGraph-1.490.0
+++ b/metadata/md5-cache/dev-perl/GDGraph-1.490.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/GDTextUtil dev-perl/GD media-libs/gd dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RUZ/GDGraph-1.49.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1bad28e21d063d10722441332df63291
diff --git a/metadata/md5-cache/dev-perl/GDTextUtil-0.860.0-r1 b/metadata/md5-cache/dev-perl/GDTextUtil-0.860.0-r1
index 430023bd89eb..a3618a0eb172 100644
--- a/metadata/md5-cache/dev-perl/GDTextUtil-0.860.0-r1
+++ b/metadata/md5-cache/dev-perl/GDTextUtil-0.860.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/GD dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MV/MVERB/GDTextUtil-0.86.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d70621d1dd260850713e68559c4d3263
diff --git a/metadata/md5-cache/dev-perl/GSSAPI-0.280.0-r1 b/metadata/md5-cache/dev-perl/GSSAPI-0.280.0-r1
index b78475564cf8..57b232f6d6ee 100644
--- a/metadata/md5-cache/dev-perl/GSSAPI-0.280.0-r1
+++ b/metadata/md5-cache/dev-perl/GSSAPI-0.280.0-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/krb5 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AG/AGROLMS/GSSAPI-0.28.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=713fc1557e8d1f3eb7aec8abaa4d89be
diff --git a/metadata/md5-cache/dev-perl/Geo-IP-1.510.0 b/metadata/md5-cache/dev-perl/Geo-IP-1.510.0
index ec753d40b8d1..d607f43f565c 100644
--- a/metadata/md5-cache/dev-perl/Geo-IP-1.510.0
+++ b/metadata/md5-cache/dev-perl/Geo-IP-1.510.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-libs/geoip dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MAXMIND/Geo-IP-1.51.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cb504dd4ee04f26e7239245cc8d9861a
diff --git a/metadata/md5-cache/dev-perl/Geography-Countries-2009041301.0.0-r1 b/metadata/md5-cache/dev-perl/Geography-Countries-2009041301.0.0-r1
index c15bbfc14dbe..7c27728e6c98 100644
--- a/metadata/md5-cache/dev-perl/Geography-Countries-2009041301.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Geography-Countries-2009041301.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AB/ABIGAIL/Geography-Countries-2009041301.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8103fa1b1b969ad0950f80511bd8b57c
diff --git a/metadata/md5-cache/dev-perl/Getopt-ArgvFile-1.110.0-r1 b/metadata/md5-cache/dev-perl/Getopt-ArgvFile-1.110.0-r1
index e588816528a9..c9f565bbc413 100644
--- a/metadata/md5-cache/dev-perl/Getopt-ArgvFile-1.110.0-r1
+++ b/metadata/md5-cache/dev-perl/Getopt-ArgvFile-1.110.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic Artistic-2 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JS/JSTENZEL/Getopt-ArgvFile-1.11.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8215bd51608b4b81314824871ccd8d1b
diff --git a/metadata/md5-cache/dev-perl/Getopt-Mixed-1.120.0 b/metadata/md5-cache/dev-perl/Getopt-Mixed-1.120.0
index 4cbf6c71c7f4..75e39270c519 100644
--- a/metadata/md5-cache/dev-perl/Getopt-Mixed-1.120.0
+++ b/metadata/md5-cache/dev-perl/Getopt-Mixed-1.120.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJM/Getopt-Mixed-1.12.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2d766155788598c3a15d1562b7f76c24
diff --git a/metadata/md5-cache/dev-perl/Graphics-ColorNames-2.110.0-r1 b/metadata/md5-cache/dev-perl/Graphics-ColorNames-2.110.0-r1
index 17395290b5d9..c8a1bb6f8421 100644
--- a/metadata/md5-cache/dev-perl/Graphics-ColorNames-2.110.0-r1
+++ b/metadata/md5-cache/dev-perl/Graphics-ColorNames-2.110.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-IO >=virtual/perl-Module-Load-0.10 virtual/perl-Module-Loaded recommended? ( >=dev-perl/Color-Library-0.02 dev-perl/Tie-Sub >=dev-perl/Pod-Readme-0.09 ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RR/RRWO/Graphics-ColorNames-2.11.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=eace82e928d87c275869350cf72a3752
diff --git a/metadata/md5-cache/dev-perl/Graphics-ColorNames-WWW-1.130.0 b/metadata/md5-cache/dev-perl/Graphics-ColorNames-WWW-1.130.0
index 22b66b343379..408502b175cc 100644
--- a/metadata/md5-cache/dev-perl/Graphics-ColorNames-WWW-1.130.0
+++ b/metadata/md5-cache/dev-perl/Graphics-ColorNames-WWW-1.130.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/Graphics-ColorNames-0.320.0 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CF/CFAERBER/Graphics-ColorNames-WWW-1.13.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7f17fdeac88558d6153c6258a6a1d07b
diff --git a/metadata/md5-cache/dev-perl/Graphics-ColorObject-0.5.0-r1 b/metadata/md5-cache/dev-perl/Graphics-ColorObject-0.5.0-r1
index 4e0fd59f6b74..e7d65ed88221 100644
--- a/metadata/md5-cache/dev-perl/Graphics-ColorObject-0.5.0-r1
+++ b/metadata/md5-cache/dev-perl/Graphics-ColorObject-0.5.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=>=dev-perl/Graphics-ColorNames-0.32 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AI/AIZVORSKI/Graphics-ColorObject-0.5.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=98ffd3685d828647fcd884f65b93edbe
diff --git a/metadata/md5-cache/dev-perl/Guard-1.23.0 b/metadata/md5-cache/dev-perl/Guard-1.23.0
index 23af411bb8e2..0b8f91c358d1 100644
--- a/metadata/md5-cache/dev-perl/Guard-1.23.0
+++ b/metadata/md5-cache/dev-perl/Guard-1.23.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/Guard-1.023.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8ba386e1ebf42d7956e4c528ba84d657
diff --git a/metadata/md5-cache/dev-perl/HTML-Element-Extended-1.180.0-r1 b/metadata/md5-cache/dev-perl/HTML-Element-Extended-1.180.0-r1
index 1e4c957e5abf..fb9ffc518fd9 100644
--- a/metadata/md5-cache/dev-perl/HTML-Element-Extended-1.180.0-r1
+++ b/metadata/md5-cache/dev-perl/HTML-Element-Extended-1.180.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/HTML-Tree-3.01 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSISK/HTML-Element-Extended-1.18.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fcc371dc40a9d054064e837fb9309902
diff --git a/metadata/md5-cache/dev-perl/HTML-FillInForm-2.210.0 b/metadata/md5-cache/dev-perl/HTML-FillInForm-2.210.0
index 7c0b496ca8c5..947c2ac470e1 100644
--- a/metadata/md5-cache/dev-perl/HTML-FillInForm-2.210.0
+++ b/metadata/md5-cache/dev-perl/HTML-FillInForm-2.210.0
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/HTML-Parser virtual/perl-Carp dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKSTOS/HTML-FillInForm-2.21.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4883d35d11441d5d5b6dc61d0f96a48f
diff --git a/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.150.0-r1 b/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.150.0-r1
index 7b863c93f3fe..d67bc4557558 100644
--- a/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.150.0-r1
+++ b/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.150.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/HTML-Formatter-2 dev-perl/HTML-Tree dev-perl/URI dev-lang/per
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/ST/STRUAN/HTML-FormatText-WithLinks-0.15.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=36fa03a3d49746ccd7c97117c1358de7
diff --git a/metadata/md5-cache/dev-perl/HTML-FromText-2.70.0 b/metadata/md5-cache/dev-perl/HTML-FromText-2.70.0
index f1e6b0ed1a30..9980fd14ed3c 100644
--- a/metadata/md5-cache/dev-perl/HTML-FromText-2.70.0
+++ b/metadata/md5-cache/dev-perl/HTML-FromText-2.70.0
@@ -4,11 +4,11 @@ DESCRIPTION=Convert plain text to HTML
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/HTML-FromText
 IUSE=test
-KEYWORDS=amd64 ~arm hppa ~mips ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 hppa ~mips ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Email-Find-0.90.0 >=virtual/perl-Exporter-5.58 >=dev-perl/HTML-Parser-1.260.0 >=virtual/perl-Scalar-List-Utils-1.120.0 >=virtual/perl-Text-Tabs+Wrap-98.112.800 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/HTML-FromText-2.07.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=73238938c213eae821104c0252bfa005
+_md5_=e042438877b2bb7af81d97ed82b1a42a
diff --git a/metadata/md5-cache/dev-perl/HTML-HTMLDoc-0.100.0-r1 b/metadata/md5-cache/dev-perl/HTML-HTMLDoc-0.100.0-r1
index 9814029a1b57..9a25a45bbe36 100644
--- a/metadata/md5-cache/dev-perl/HTML-HTMLDoc-0.100.0-r1
+++ b/metadata/md5-cache/dev-perl/HTML-HTMLDoc-0.100.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=app-text/htmldoc dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MF/MFRANKL/HTML-HTMLDoc-0.10.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5da2f6c998af7555e50cb8b863e3ccaf
diff --git a/metadata/md5-cache/dev-perl/HTML-Highlight-0.200.0 b/metadata/md5-cache/dev-perl/HTML-Highlight-0.200.0
index 5be3d2e9433d..3b942ec7596b 100644
--- a/metadata/md5-cache/dev-perl/HTML-Highlight-0.200.0
+++ b/metadata/md5-cache/dev-perl/HTML-Highlight-0.200.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TR/TRIPIE/HTML-Highlight-0.20.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f5065d2fe9361755f56dec21e05f6c1d
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 adccda174f76..b84fa0b4c7e4 100644
--- a/metadata/md5-cache/dev-perl/HTML-Mason-1.560.0
+++ b/metadata/md5-cache/dev-perl/HTML-Mason-1.560.0
@@ -10,5 +10,5 @@ RDEPEND=!modperl? ( >=dev-perl/CGI-2.460.0 ) modperl? ( www-apache/libapreq2 >=w
 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a696a1d0d7b8e524bf7a7830208232a4
diff --git a/metadata/md5-cache/dev-perl/HTML-Mason-PSGIHandler-0.530.0 b/metadata/md5-cache/dev-perl/HTML-Mason-PSGIHandler-0.530.0
index 69c719c5ff78..45f861b1fc77 100644
--- a/metadata/md5-cache/dev-perl/HTML-Mason-PSGIHandler-0.530.0
+++ b/metadata/md5-cache/dev-perl/HTML-Mason-PSGIHandler-0.530.0
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/CGI-PSGI dev-perl/HTML-Mason dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RUZ/HTML-Mason-PSGIHandler-0.53.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=48d2cc6d181fe55b8e2d1fe678446620
diff --git a/metadata/md5-cache/dev-perl/HTML-Object-2.29-r2 b/metadata/md5-cache/dev-perl/HTML-Object-2.29-r2
index 075ffda0bca1..1e9292b9081d 100644
--- a/metadata/md5-cache/dev-perl/HTML-Object-2.29-r2
+++ b/metadata/md5-cache/dev-perl/HTML-Object-2.29-r2
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Data-FormValidator dev-perl/Date-Manip dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/htmlobject/libhtmlobject-perl-2.29.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9b0591a573b7524448f5403204f152d9
diff --git a/metadata/md5-cache/dev-perl/HTML-Table-2.08a-r1 b/metadata/md5-cache/dev-perl/HTML-Table-2.08a-r1
index 83400eedf528..a246e65640da 100644
--- a/metadata/md5-cache/dev-perl/HTML-Table-2.08a-r1
+++ b/metadata/md5-cache/dev-perl/HTML-Table-2.08a-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AJ/AJPEACOCK/HTML-Table-2.08a.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=15f2fed659c2712ea9532bf95c47aee9
diff --git a/metadata/md5-cache/dev-perl/HTML-TableContentParser-0.130.0 b/metadata/md5-cache/dev-perl/HTML-TableContentParser-0.130.0
index 52e1a3ec2ebe..a01375979102 100644
--- a/metadata/md5-cache/dev-perl/HTML-TableContentParser-0.130.0
+++ b/metadata/md5-cache/dev-perl/HTML-TableContentParser-0.130.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/HTML-Parser dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SD/SDRABBLE/HTML-TableContentParser-0.13.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=adf8e25d0d495e713ba64c4f0072b608
diff --git a/metadata/md5-cache/dev-perl/HTML-TagFilter-1.30.0 b/metadata/md5-cache/dev-perl/HTML-TagFilter-1.30.0
index b893035dc009..c0f6e16c31d3 100644
--- a/metadata/md5-cache/dev-perl/HTML-TagFilter-1.30.0
+++ b/metadata/md5-cache/dev-perl/HTML-TagFilter-1.30.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/HTML-Parser dev-perl/URI dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/W/WR/WROSS/HTML-TagFilter-1.03.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d85b76274de24909423648400fef868d
diff --git a/metadata/md5-cache/dev-perl/HTML-Tagset-3.200.0-r1 b/metadata/md5-cache/dev-perl/HTML-Tagset-3.200.0-r1
index 7743106cd4c7..568f8214ab9b 100644
--- a/metadata/md5-cache/dev-perl/HTML-Tagset-3.200.0-r1
+++ b/metadata/md5-cache/dev-perl/HTML-Tagset-3.200.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/HTML-Tagset-3.20.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bd9447dd6834e5f49859b1408dbf34ea
diff --git a/metadata/md5-cache/dev-perl/HTML-Template-Expr-0.70.0-r1 b/metadata/md5-cache/dev-perl/HTML-Template-Expr-0.70.0-r1
index b4c26b268106..50cadff62c1f 100644
--- a/metadata/md5-cache/dev-perl/HTML-Template-Expr-0.70.0-r1
+++ b/metadata/md5-cache/dev-perl/HTML-Template-Expr-0.70.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/HTML-Template-2.8 dev-perl/Parse-RecDescent dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SAMTREGAR/HTML-Template-Expr-0.07.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a9eb3baf0a80f61dee8b3fc3358604fa
diff --git a/metadata/md5-cache/dev-perl/HTML-Template-Pro-0.951.0 b/metadata/md5-cache/dev-perl/HTML-Template-Pro-0.951.0
index 3f2ab7e19711..1e884faaf3e1 100644
--- a/metadata/md5-cache/dev-perl/HTML-Template-Pro-0.951.0
+++ b/metadata/md5-cache/dev-perl/HTML-Template-Pro-0.951.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/perl-File-Path-2.0.0 virtual/perl-File-Spec >=dev-perl/JSON-2.
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VI/VIY/HTML-Template-Pro-0.9510.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2248bce1dc6f09a1abb23fe12b6247fd
diff --git a/metadata/md5-cache/dev-perl/HTML-TokeParser-Simple-3.160.0-r1 b/metadata/md5-cache/dev-perl/HTML-TokeParser-Simple-3.160.0-r1
index 03bf1b7dce46..b2118de285c1 100644
--- a/metadata/md5-cache/dev-perl/HTML-TokeParser-Simple-3.160.0-r1
+++ b/metadata/md5-cache/dev-perl/HTML-TokeParser-Simple-3.160.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/HTML-Parser-3.25 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OV/OVID/HTML-TokeParser-Simple-3.16.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5a353bf45976a73f1f339040afa0bc39
diff --git a/metadata/md5-cache/dev-perl/HTTP-Body-1.220.0 b/metadata/md5-cache/dev-perl/HTTP-Body-1.220.0
index 2424af62db3f..4f56cf9798b8 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Body-1.220.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Body-1.220.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp virtual/perl-Digest-MD5 >=virtual/perl-File-Temp-0.140
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GE/GETTY/HTTP-Body-1.22.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3a80743309f8e87b4decba2f80cb7eae
diff --git a/metadata/md5-cache/dev-perl/HTTP-Cache-Transparent-1.400.0 b/metadata/md5-cache/dev-perl/HTTP-Cache-Transparent-1.400.0
index c32b698d8e02..69f2c026924c 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Cache-Transparent-1.400.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Cache-Transparent-1.400.0
@@ -4,11 +4,11 @@ DESCRIPTION=Cache the result of http get-requests persistently
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/HTTP-Cache-Transparent
 IUSE=test examples
-KEYWORDS=amd64 ~arm ~ia64 ppc sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl virtual/perl-Digest-MD5 virtual/perl-Storable dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MATTIASH/HTTP-Cache-Transparent-1.4.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c730a6a9eee62692124168e0631bdd28
+_md5_=ea1e9bc0c21de79217caa2a20a59ceb5
diff --git a/metadata/md5-cache/dev-perl/HTTP-DAV-0.480.0 b/metadata/md5-cache/dev-perl/HTTP-DAV-0.480.0
index d8ec236687e2..e6f3abd3026b 100644
--- a/metadata/md5-cache/dev-perl/HTTP-DAV-0.480.0
+++ b/metadata/md5-cache/dev-perl/HTTP-DAV-0.480.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl dev-perl/URI dev-perl/XML-DOM dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CO/COSIMO/HTTP-DAV-0.48.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fdbaf278a4bc7f1aae06297587831a87
diff --git a/metadata/md5-cache/dev-perl/HTTP-Date-6.20.0-r1 b/metadata/md5-cache/dev-perl/HTTP-Date-6.20.0-r1
index bdc3ff39e45f..e1a4a42cdbf8 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Date-6.20.0-r1
+++ b/metadata/md5-cache/dev-perl/HTTP-Date-6.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/libwww-perl-6 virtual/perl-Time-Local dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/HTTP-Date-6.02.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d7cf4f776b84ce1378102f5a2bf1111c
diff --git a/metadata/md5-cache/dev-perl/HTTP-Response-Encoding-0.60.0-r1 b/metadata/md5-cache/dev-perl/HTTP-Response-Encoding-0.60.0-r1
index d7bf715e4097..2e6c3168a802 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Response-Encoding-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/HTTP-Response-Encoding-0.60.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/libwww-perl dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANKOGAI/HTTP-Response-Encoding-0.06.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=275aad9ec6364f1559e76597329c874b
diff --git a/metadata/md5-cache/dev-perl/HTTPD-User-Manage-1.660.0-r1 b/metadata/md5-cache/dev-perl/HTTPD-User-Manage-1.660.0-r1
index e8bc2042fcbe..ac69ddaff4b0 100644
--- a/metadata/md5-cache/dev-perl/HTTPD-User-Manage-1.660.0-r1
+++ b/metadata/md5-cache/dev-perl/HTTPD-User-Manage-1.660.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/HTTPD-User-Manage-1.66.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f331c34a58c32b08f8414d6755520976
diff --git a/metadata/md5-cache/dev-perl/Hash-Merge-0.200.0 b/metadata/md5-cache/dev-perl/Hash-Merge-0.200.0
index 9ac7349fd865..ae35e4325cb0 100644
--- a/metadata/md5-cache/dev-perl/Hash-Merge-0.200.0
+++ b/metadata/md5-cache/dev-perl/Hash-Merge-0.200.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Clone dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/Hash-Merge-0.200.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=08f83b96a327a97ab6fb8e8a8b992ff6
diff --git a/metadata/md5-cache/dev-perl/Hash-MultiValue-0.160.0 b/metadata/md5-cache/dev-perl/Hash-MultiValue-0.160.0
index 58f042e0ef6b..66868591fb2c 100644
--- a/metadata/md5-cache/dev-perl/Hash-MultiValue-0.160.0
+++ b/metadata/md5-cache/dev-perl/Hash-MultiValue-0.160.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AR/ARISTOTLE/Hash-MultiValue-0.16.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bc3b9e4ca258bb8764608a2356d44cab
diff --git a/metadata/md5-cache/dev-perl/IO-Digest-0.110.0-r2 b/metadata/md5-cache/dev-perl/IO-Digest-0.110.0-r2
index 8e2e3aafc40f..9925747766e4 100644
--- a/metadata/md5-cache/dev-perl/IO-Digest-0.110.0-r2
+++ b/metadata/md5-cache/dev-perl/IO-Digest-0.110.0-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/PerlIO-via-dynamic-0.10 virtual/perl-Digest dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CL/CLKAO/IO-Digest-0.11.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bd7c4dcce3eee44b60b37337f85b1724
diff --git a/metadata/md5-cache/dev-perl/IO-HTML-1.1.0 b/metadata/md5-cache/dev-perl/IO-HTML-1.1.0
index 8acb8684feeb..75909c731de7 100644
--- a/metadata/md5-cache/dev-perl/IO-HTML-1.1.0
+++ b/metadata/md5-cache/dev-perl/IO-HTML-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp >=virtual/perl-Encode-2.100.0 >=virtual/perl-Exporter-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJM/IO-HTML-1.001.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0c5d2be4753887643aabf7b03ec574d2
diff --git a/metadata/md5-cache/dev-perl/IO-LockedFile-0.230.0-r1 b/metadata/md5-cache/dev-perl/IO-LockedFile-0.230.0-r1
index ccde7f264304..f3f199913cf0 100644
--- a/metadata/md5-cache/dev-perl/IO-LockedFile-0.230.0-r1
+++ b/metadata/md5-cache/dev-perl/IO-LockedFile-0.230.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RA/RANI/IO-LockedFile-0.23.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a698eabca2bf59e3b3c8cb347a48a744
diff --git a/metadata/md5-cache/dev-perl/IO-SessionData-1.30.0-r1 b/metadata/md5-cache/dev-perl/IO-SessionData-1.30.0-r1
index 810e1cc2258d..c18cb0476195 100644
--- a/metadata/md5-cache/dev-perl/IO-SessionData-1.30.0-r1
+++ b/metadata/md5-cache/dev-perl/IO-SessionData-1.30.0-r1
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl
 DESCRIPTION=Session data support module for SOAP::Lite
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/IO-SessionData
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/IO-SessionData-1.03.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=287745548ae82bb98d694dd863a02fd4
+_md5_=ceb11b95387f650f99cead65a1711fc5
diff --git a/metadata/md5-cache/dev-perl/IO-String-1.80.0-r1 b/metadata/md5-cache/dev-perl/IO-String-1.80.0-r1
index 2455b2d24dd5..fa8cf7795456 100644
--- a/metadata/md5-cache/dev-perl/IO-String-1.80.0-r1
+++ b/metadata/md5-cache/dev-perl/IO-String-1.80.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/IO-String-1.08.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1ff56db3057bec95cc7a5920646ba975
diff --git a/metadata/md5-cache/dev-perl/IO-Stty-0.30.0 b/metadata/md5-cache/dev-perl/IO-Stty-0.30.0
index 4bd157b06ba6..6774b53460d5 100644
--- a/metadata/md5-cache/dev-perl/IO-Stty-0.30.0
+++ b/metadata/md5-cache/dev-perl/IO-Stty-0.30.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/IO-Stty-0.03.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9c04b4a268283a2484dff6e2f43bcff9
diff --git a/metadata/md5-cache/dev-perl/IO-Tty-1.120.0 b/metadata/md5-cache/dev-perl/IO-Tty-1.120.0
index 804459aa64ce..8d3ee236208f 100644
--- a/metadata/md5-cache/dev-perl/IO-Tty-1.120.0
+++ b/metadata/md5-cache/dev-perl/IO-Tty-1.120.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/IO-Tty-1.12.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=91d8281e08e4a4ccbf3536d59e5cf67c
diff --git a/metadata/md5-cache/dev-perl/IO-stringy-2.111.0 b/metadata/md5-cache/dev-perl/IO-stringy-2.111.0
index 86720789c117..756db552cfbe 100644
--- a/metadata/md5-cache/dev-perl/IO-stringy-2.111.0
+++ b/metadata/md5-cache/dev-perl/IO-stringy-2.111.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DS/DSKOLL/IO-stringy-2.111.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=767ce363fe34ddeae54b84a8a32a2961
diff --git a/metadata/md5-cache/dev-perl/IP-Anonymous-0.40.0-r1 b/metadata/md5-cache/dev-perl/IP-Anonymous-0.40.0-r1
index 8362816cd7b4..47c6d7582ccc 100644
--- a/metadata/md5-cache/dev-perl/IP-Anonymous-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/IP-Anonymous-0.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Crypt-Rijndael dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JT/JTK/IP-Anonymous-0.04.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=526f91d865bfc3f3493751b76f467fa8
diff --git a/metadata/md5-cache/dev-perl/IPC-ShareLite-0.170.0-r1 b/metadata/md5-cache/dev-perl/IPC-ShareLite-0.170.0-r1
index c9b67f4b8b11..d01200214da2 100644
--- a/metadata/md5-cache/dev-perl/IPC-ShareLite-0.170.0-r1
+++ b/metadata/md5-cache/dev-perl/IPC-ShareLite-0.170.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AN/ANDYA/IPC-ShareLite-0.17.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=42b8eaac288f8552dffc84a2a26b65a3
diff --git a/metadata/md5-cache/dev-perl/IPC-Shareable-0.610.0-r1 b/metadata/md5-cache/dev-perl/IPC-Shareable-0.610.0-r1
index fa8957b2a487..2e23f2448cef 100644
--- a/metadata/md5-cache/dev-perl/IPC-Shareable-0.610.0-r1
+++ b/metadata/md5-cache/dev-perl/IPC-Shareable-0.610.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSOUTH/IPC-Shareable-0.61.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2d5f95019651f83012364cd0e72662a8
diff --git a/metadata/md5-cache/dev-perl/IPC-System-Simple-1.250.0 b/metadata/md5-cache/dev-perl/IPC-System-Simple-1.250.0
index 053c919db881..cb91c5f5b059 100644
--- a/metadata/md5-cache/dev-perl/IPC-System-Simple-1.250.0
+++ b/metadata/md5-cache/dev-perl/IPC-System-Simple-1.250.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-Scalar-List-Utils d
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PJ/PJF/IPC-System-Simple-1.25.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d358aa5bb91ccb2d1e7615b5dafdd705
diff --git a/metadata/md5-cache/dev-perl/Ima-DBI-0.350.0-r1 b/metadata/md5-cache/dev-perl/Ima-DBI-0.350.0-r1
index 2367f2af09a1..9571913be1e7 100644
--- a/metadata/md5-cache/dev-perl/Ima-DBI-0.350.0-r1
+++ b/metadata/md5-cache/dev-perl/Ima-DBI-0.350.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DBI dev-perl/Class-WhiteHole dev-perl/DBIx-ContextualFetch virtual/perl-Test-Simple >=dev-perl/Class-Data-Inheritable-0.02 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PERRIN/Ima-DBI-0.35.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f6c7efe9c3e330caa7635ba57af5f6e2
diff --git a/metadata/md5-cache/dev-perl/Image-Imlib2-2.30.0-r1 b/metadata/md5-cache/dev-perl/Image-Imlib2-2.30.0-r1
index 68eb13d2dfb7..0996b57bbf54 100644
--- a/metadata/md5-cache/dev-perl/Image-Imlib2-2.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Image-Imlib2-2.30.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/imlib2-1 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LB/LBROCARD/Image-Imlib2-2.03.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d7d6da44b17ce82a2904fff472108431
diff --git a/metadata/md5-cache/dev-perl/Image-Size-3.300.0 b/metadata/md5-cache/dev-perl/Image-Size-3.300.0
index 49ba2701364d..b063799b049c 100644
--- a/metadata/md5-cache/dev-perl/Image-Size-3.300.0
+++ b/metadata/md5-cache/dev-perl/Image-Size-3.300.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-IO-Compress >=virtual/perl-File-Spec-0.800.0 dev-lang/perl:
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJRAY/Image-Size-3.300.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=88c656bd2c7cb83e75dd3884c918528f
diff --git a/metadata/md5-cache/dev-perl/Inline-0.800.0 b/metadata/md5-cache/dev-perl/Inline-0.800.0
index 62971ce23a80..6bf20e2f83c8 100644
--- a/metadata/md5-cache/dev-perl/Inline-0.800.0
+++ b/metadata/md5-cache/dev-perl/Inline-0.800.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Digest-MD5 virtual/perl-File-Spec dev-lang/perl:=[-build(-)
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/Inline-0.80.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6e5d152eec3c728bf2cebb4554aaf0e8
diff --git a/metadata/md5-cache/dev-perl/Inline-Files-0.690.0 b/metadata/md5-cache/dev-perl/Inline-Files-0.690.0
index dd18a9627b24..1200c9201b35 100644
--- a/metadata/md5-cache/dev-perl/Inline-Files-0.690.0
+++ b/metadata/md5-cache/dev-perl/Inline-Files-0.690.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AM/AMBS/Inline-Files-0.69.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1feac6d33f1ee76e85b503fa5ff24901
diff --git a/metadata/md5-cache/dev-perl/JSON-Any-1.390.0 b/metadata/md5-cache/dev-perl/JSON-Any-1.390.0
index 689b54401b12..a18887a39a7f 100644
--- a/metadata/md5-cache/dev-perl/JSON-Any-1.390.0
+++ b/metadata/md5-cache/dev-perl/JSON-Any-1.390.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp || ( >=dev-perl/JSON-XS-2.3 virtual/perl-JSON-PP dev-p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/JSON-Any-1.39.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9b0a7f793a62badc0208d54c73430c33
diff --git a/metadata/md5-cache/dev-perl/JSON-XS-VersionOneAndTwo-0.310.0-r1 b/metadata/md5-cache/dev-perl/JSON-XS-VersionOneAndTwo-0.310.0-r1
index 1f4df85d2575..ee39c5e242fa 100644
--- a/metadata/md5-cache/dev-perl/JSON-XS-VersionOneAndTwo-0.310.0-r1
+++ b/metadata/md5-cache/dev-perl/JSON-XS-VersionOneAndTwo-0.310.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/JSON-XS dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LB/LBROCARD/JSON-XS-VersionOneAndTwo-0.31.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dfcf3ca30bb392e09fbe58f5c4ff36fc
diff --git a/metadata/md5-cache/dev-perl/JavaScript-SpiderMonkey-0.210.0-r1 b/metadata/md5-cache/dev-perl/JavaScript-SpiderMonkey-0.210.0-r1
index e78fc887e66f..9c0140655fbf 100644
--- a/metadata/md5-cache/dev-perl/JavaScript-SpiderMonkey-0.210.0-r1
+++ b/metadata/md5-cache/dev-perl/JavaScript-SpiderMonkey-0.210.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Log-Log4perl >=dev-lang/spidermonkey-1.5:0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TB/TBUSCH/JavaScript-SpiderMonkey-0.21.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7c10deea82576d53ea2c7e09b90fd8a8
diff --git a/metadata/md5-cache/dev-perl/Jcode-2.70.0-r1 b/metadata/md5-cache/dev-perl/Jcode-2.70.0-r1
index 09b8e967e996..602a6568eb4e 100644
--- a/metadata/md5-cache/dev-perl/Jcode-2.70.0-r1
+++ b/metadata/md5-cache/dev-perl/Jcode-2.70.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-MIME-Base64-2.1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANKOGAI/Jcode-2.07.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1ac09d6f7aaff97221fccc535987ba3a
diff --git a/metadata/md5-cache/dev-perl/LWP-MediaTypes-6.20.0-r1 b/metadata/md5-cache/dev-perl/LWP-MediaTypes-6.20.0-r1
index e7c8cd123713..e14b023760aa 100644
--- a/metadata/md5-cache/dev-perl/LWP-MediaTypes-6.20.0-r1
+++ b/metadata/md5-cache/dev-perl/LWP-MediaTypes-6.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/libwww-perl-6 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/LWP-MediaTypes-6.02.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6fd12e9837ddb5cdff99c8a698dd101e
diff --git a/metadata/md5-cache/dev-perl/LWP-Online-1.80.0-r2 b/metadata/md5-cache/dev-perl/LWP-Online-1.80.0-r2
index d3275dbb9909..4877a4fe262e 100644
--- a/metadata/md5-cache/dev-perl/LWP-Online-1.80.0-r2
+++ b/metadata/md5-cache/dev-perl/LWP-Online-1.80.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Does your process have access to the web
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/LWP-Online
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/libwww-perl-5.805.0 >=dev-perl/URI-1.350.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/LWP-Online-1.08.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=15df16c521c7c8cc42a9815f9ff04dfd
+_md5_=96684f93738d28f79be5d001f2570905
diff --git a/metadata/md5-cache/dev-perl/LWP-UserAgent-Determined-1.70.0 b/metadata/md5-cache/dev-perl/LWP-UserAgent-Determined-1.70.0
index b25864e059af..5a3cbcee51f8 100644
--- a/metadata/md5-cache/dev-perl/LWP-UserAgent-Determined-1.70.0
+++ b/metadata/md5-cache/dev-perl/LWP-UserAgent-Determined-1.70.0
@@ -3,10 +3,10 @@ DEPEND=dev-perl/libwww-perl virtual/perl-ExtUtils-MakeMaker dev-lang/perl
 DESCRIPTION=A virtual browser that retries errors
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/LWP-UserAgent-Determined
-KEYWORDS=~amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/LWP-UserAgent-Determined-1.07.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=959ca21b218a667cb7526c5f90412d17
+_md5_=4c5a7f70661e1ed480acdd4c64caeeaf
diff --git a/metadata/md5-cache/dev-perl/Lingua-Preferred-0.2.4-r1 b/metadata/md5-cache/dev-perl/Lingua-Preferred-0.2.4-r1
index ea53225cd574..4c54efc86789 100644
--- a/metadata/md5-cache/dev-perl/Lingua-Preferred-0.2.4-r1
+++ b/metadata/md5-cache/dev-perl/Lingua-Preferred-0.2.4-r1
@@ -3,10 +3,10 @@ DEPEND=dev-perl/Log-TraceMessages dev-lang/perl:=[-build(-)]
 DESCRIPTION=Pick a language based on user's preferences
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Lingua-Preferred
-KEYWORDS=amd64 ~arm ppc x86
+KEYWORDS=amd64 ~arm ~arm64 ppc x86
 LICENSE=|| ( Artistic GPL-2+ )
 RDEPEND=dev-perl/Log-TraceMessages dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ED/EDAVIS/Lingua-Preferred-0.2.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1c71c5103f879f42549844d6bfc246ae
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f79d6ade77e44a4a4140e6d588aa57fb
diff --git a/metadata/md5-cache/dev-perl/Lingua-Stem-0.840.0-r1 b/metadata/md5-cache/dev-perl/Lingua-Stem-0.840.0-r1
index 1c1740ebdf4a..780978af8693 100644
--- a/metadata/md5-cache/dev-perl/Lingua-Stem-0.840.0-r1
+++ b/metadata/md5-cache/dev-perl/Lingua-Stem-0.840.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Snowball-Norwegian dev-perl/Snowball-Swedish dev-perl/Lingua-Stem-Snowball-Da dev-perl/Lingua-Stem-Fr dev-perl/Lingua-Stem-It dev-perl/Lingua-Stem-Ru dev-perl/Lingua-PT-Stemmer dev-perl/Text-German dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SN/SNOWHARE/Lingua-Stem-0.84.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3c3d1c42b9173829008a4a9acdc680e9
diff --git a/metadata/md5-cache/dev-perl/Lingua-Stem-Fr-0.20.0-r1 b/metadata/md5-cache/dev-perl/Lingua-Stem-Fr-0.20.0-r1
index 2d7145f18045..99e12ee51eae 100644
--- a/metadata/md5-cache/dev-perl/Lingua-Stem-Fr-0.20.0-r1
+++ b/metadata/md5-cache/dev-perl/Lingua-Stem-Fr-0.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SD/SDP/Lingua-Stem-Fr-0.02.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1ef4b7e32e4e7cc9797deed816b54e77
diff --git a/metadata/md5-cache/dev-perl/Lingua-Stem-It-0.20.0-r1 b/metadata/md5-cache/dev-perl/Lingua-Stem-It-0.20.0-r1
index 60716cb85479..3349e837af80 100644
--- a/metadata/md5-cache/dev-perl/Lingua-Stem-It-0.20.0-r1
+++ b/metadata/md5-cache/dev-perl/Lingua-Stem-It-0.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AC/ACALPINI/Lingua-Stem-It-0.02.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=105e09b45b28b634a861461f0711018d
diff --git a/metadata/md5-cache/dev-perl/Lingua-Stem-Snowball-Da-1.10.0-r1 b/metadata/md5-cache/dev-perl/Lingua-Stem-Snowball-Da-1.10.0-r1
index 3de32dd84673..662bad217cd2 100644
--- a/metadata/md5-cache/dev-perl/Lingua-Stem-Snowball-Da-1.10.0-r1
+++ b/metadata/md5-cache/dev-perl/Lingua-Stem-Snowball-Da-1.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CI/CINE/Lingua-Stem-Snowball-Da-1.01.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0d6ce5b1852dcb461486f9276766f08e
diff --git a/metadata/md5-cache/dev-perl/Linux-Inotify2-1.220.0-r1 b/metadata/md5-cache/dev-perl/Linux-Inotify2-1.220.0-r1
index 7ca057cd4b23..0a750515ce59 100644
--- a/metadata/md5-cache/dev-perl/Linux-Inotify2-1.220.0-r1
+++ b/metadata/md5-cache/dev-perl/Linux-Inotify2-1.220.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/common-sense dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/Linux-Inotify2-1.22.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7229211cbc249070665a4d58ab72bf6b
diff --git a/metadata/md5-cache/dev-perl/Linux-Pid-0.40.0-r1 b/metadata/md5-cache/dev-perl/Linux-Pid-0.40.0-r1
index 0ba6839ab7f3..0f43447e1114 100644
--- a/metadata/md5-cache/dev-perl/Linux-Pid-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Linux-Pid-0.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RG/RGARCIA/Linux-Pid-0.04.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8d0f3b489158ac7700d8b8379e6e74b6
diff --git a/metadata/md5-cache/dev-perl/Linux-Smaps-0.130.0 b/metadata/md5-cache/dev-perl/Linux-Smaps-0.130.0
index 284b3bc9e867..11ac0fae48fb 100644
--- a/metadata/md5-cache/dev-perl/Linux-Smaps-0.130.0
+++ b/metadata/md5-cache/dev-perl/Linux-Smaps-0.130.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OP/OPI/Linux-Smaps-0.13.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3309229be486a8c8af31c055dcfba27f
diff --git a/metadata/md5-cache/dev-perl/Lirc-Client-2.20.0 b/metadata/md5-cache/dev-perl/Lirc-Client-2.20.0
index cd82c160822b..da27ae5e96b6 100644
--- a/metadata/md5-cache/dev-perl/Lirc-Client-2.20.0
+++ b/metadata/md5-cache/dev-perl/Lirc-Client-2.20.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp dev-perl/File-Path-Expand >=dev-perl/Moo-1.0.0 dev-lan
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MG/MGRIMES/Lirc-Client-2.02.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=452ec5b383734c15dee2a4a83b881e79
diff --git a/metadata/md5-cache/dev-perl/List-AllUtils-0.90.0 b/metadata/md5-cache/dev-perl/List-AllUtils-0.90.0
index fa00a3c2e884..ee46ba5ce779 100644
--- a/metadata/md5-cache/dev-perl/List-AllUtils-0.90.0
+++ b/metadata/md5-cache/dev-perl/List-AllUtils-0.90.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/List-MoreUtils-0.280.0 >=virtual/perl-Scalar-List-Utils-1.310
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.08.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d5b773316fa5fa44413c9f0835f6f111
diff --git a/metadata/md5-cache/dev-perl/List-UtilsBy-0.100.0 b/metadata/md5-cache/dev-perl/List-UtilsBy-0.100.0
index b9dd2c2867c1..9d46d064b624 100644
--- a/metadata/md5-cache/dev-perl/List-UtilsBy-0.100.0
+++ b/metadata/md5-cache/dev-perl/List-UtilsBy-0.100.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PEVANS/List-UtilsBy-0.10.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b74e5ef3f57fc24d9039008b7890cd0e
diff --git a/metadata/md5-cache/dev-perl/Locale-Maketext-Lexicon-1.0.0 b/metadata/md5-cache/dev-perl/Locale-Maketext-Lexicon-1.0.0
index 83de5e450653..86c79e317250 100644
--- a/metadata/md5-cache/dev-perl/Locale-Maketext-Lexicon-1.0.0
+++ b/metadata/md5-cache/dev-perl/Locale-Maketext-Lexicon-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/perl-Locale-Maketext-1.170.0 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DRTECH/Locale-Maketext-Lexicon-1.00.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c279431e59886890bc47642a4ec561f0
diff --git a/metadata/md5-cache/dev-perl/Locale-PO-0.270.0 b/metadata/md5-cache/dev-perl/Locale-PO-0.270.0
index 56a2b11980e8..53cd79dc05ab 100644
--- a/metadata/md5-cache/dev-perl/Locale-PO-0.270.0
+++ b/metadata/md5-cache/dev-perl/Locale-PO-0.270.0
@@ -10,5 +10,5 @@ RDEPEND=sys-devel/gettext dev-perl/File-Slurp dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CO/COSIMO/Locale-PO-0.27.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c1fdff661addcb494296a63d87890d58
diff --git a/metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0-r1 b/metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0-r1
index 308a6b7690da..aeae48cf7514 100644
--- a/metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0-r1
+++ b/metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0-r1
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/HTML-FromText-1.004 dev-lang/perl:=[-build(-)]
 DESCRIPTION=Logging/debugging aid
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Log-TraceMessages
-KEYWORDS=amd64 ~arm ppc x86 ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ppc x86 ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/HTML-FromText-1.004 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ED/EDAVIS/Log-TraceMessages-1.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=009959c84487a5b533c4725b9367b386
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7c00d376e431c3896a4801d5595cdeeb
diff --git a/metadata/md5-cache/dev-perl/MARC-Charset-1.350.0-r1 b/metadata/md5-cache/dev-perl/MARC-Charset-1.350.0-r1
index 77443996b0f0..b1d2ca3724fd 100644
--- a/metadata/md5-cache/dev-perl/MARC-Charset-1.350.0-r1
+++ b/metadata/md5-cache/dev-perl/MARC-Charset-1.350.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl[gdbm] dev-perl/XML-SAX dev-perl/Class-Accessor dev-lang/pe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GM/GMCHARLT/MARC-Charset-1.35.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d6eae545c44178d27075dca860f5bba0
diff --git a/metadata/md5-cache/dev-perl/MD5-2.30.0-r1 b/metadata/md5-cache/dev-perl/MD5-2.30.0-r1
index f9b58465d052..948b660007e1 100644
--- a/metadata/md5-cache/dev-perl/MD5-2.30.0-r1
+++ b/metadata/md5-cache/dev-perl/MD5-2.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest-MD5 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/MD5-2.03.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c3cb2c927939275122d8dae1d950b365
diff --git a/metadata/md5-cache/dev-perl/MLDBM-Sync-0.300.0-r1 b/metadata/md5-cache/dev-perl/MLDBM-Sync-0.300.0-r1
index 746bde621bb6..216830677920 100644
--- a/metadata/md5-cache/dev-perl/MLDBM-Sync-0.300.0-r1
+++ b/metadata/md5-cache/dev-perl/MLDBM-Sync-0.300.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/MLDBM dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHAMAS/MLDBM-Sync-0.30.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6a4bfe757bd88aac07f8ec4181939639
diff --git a/metadata/md5-cache/dev-perl/MP4-Info-1.130.0 b/metadata/md5-cache/dev-perl/MP4-Info-1.130.0
index 7ea9fc7530a8..233ab0a10673 100644
--- a/metadata/md5-cache/dev-perl/MP4-Info-1.130.0
+++ b/metadata/md5-cache/dev-perl/MP4-Info-1.130.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Encode dev-perl/IO-String dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JH/JHAR/MP4-Info-1.13.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=43d9d284afa26b6afad87e2f286047f2
diff --git a/metadata/md5-cache/dev-perl/Mac-Pasteboard-0.3.0 b/metadata/md5-cache/dev-perl/Mac-Pasteboard-0.3.0
index 2597e6fea468..eeaedb3b2615 100644
--- a/metadata/md5-cache/dev-perl/Mac-Pasteboard-0.3.0
+++ b/metadata/md5-cache/dev-perl/Mac-Pasteboard-0.3.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/W/WY/WYANT/Mac-Pasteboard-0.003.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=98cb86771ee5f9fa004abc759626337b
diff --git a/metadata/md5-cache/dev-perl/Mail-Builder-Simple-0.160.0-r1 b/metadata/md5-cache/dev-perl/Mail-Builder-Simple-0.160.0-r1
index a8d79b2e888c..a81a13ba484a 100644
--- a/metadata/md5-cache/dev-perl/Mail-Builder-Simple-0.160.0-r1
+++ b/metadata/md5-cache/dev-perl/Mail-Builder-Simple-0.160.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/Mail-Builder-1.12 dev-perl/Email-Sender dev-perl/Email-Valid
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TE/TEDDY/Mail-Builder-Simple-0.16.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=71e47387713bccc733721068225c5da8
diff --git a/metadata/md5-cache/dev-perl/Mail-DomainKeys-1.0.0-r1 b/metadata/md5-cache/dev-perl/Mail-DomainKeys-1.0.0-r1
index c6cd5276b0cf..3924f8f383d4 100644
--- a/metadata/md5-cache/dev-perl/Mail-DomainKeys-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Mail-DomainKeys-1.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/Net-DNS-0.34 dev-perl/MailTools dev-perl/Crypt-OpenSSL-RSA de
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AN/ANTHONYU/Mail-DomainKeys-1.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=94bd1ce724c0268444a65a75fe47b922
diff --git a/metadata/md5-cache/dev-perl/Mail-ListDetector-1.40.0-r1 b/metadata/md5-cache/dev-perl/Mail-ListDetector-1.40.0-r1
index 578081afb4ef..3bbc765ef22a 100644
--- a/metadata/md5-cache/dev-perl/Mail-ListDetector-1.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Mail-ListDetector-1.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/URI dev-perl/Email-Valid dev-perl/Email-Abstract dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSTEVENS/Mail-ListDetector-1.04.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=596f9f46f766af871b57bd8be65c1845
diff --git a/metadata/md5-cache/dev-perl/Mail-POP3Client-2.190.0 b/metadata/md5-cache/dev-perl/Mail-POP3Client-2.190.0
index 0b6bf69f6c0e..6c8529eab065 100644
--- a/metadata/md5-cache/dev-perl/Mail-POP3Client-2.190.0
+++ b/metadata/md5-cache/dev-perl/Mail-POP3Client-2.190.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SD/SDOWD/Mail-POP3Client-2.19.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e639d1df16c70506fcc168bb05999c53
diff --git a/metadata/md5-cache/dev-perl/Mail-Procmail-1.80.0-r1 b/metadata/md5-cache/dev-perl/Mail-Procmail-1.80.0-r1
index 8beb4c47ac8a..c94dc1e95ec8 100644
--- a/metadata/md5-cache/dev-perl/Mail-Procmail-1.80.0-r1
+++ b/metadata/md5-cache/dev-perl/Mail-Procmail-1.80.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Getopt-Long >=dev-perl/MailTools-1.15 >=dev-perl/LockFile-Simple-0.2.5 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JV/JV/Mail-Procmail-1.08.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4d8a92198970f5cdf04fa064af868686
diff --git a/metadata/md5-cache/dev-perl/Mail-SRS-0.310.0-r2 b/metadata/md5-cache/dev-perl/Mail-SRS-0.310.0-r2
index d73813e2619b..a67c26b955a0 100644
--- a/metadata/md5-cache/dev-perl/Mail-SRS-0.310.0-r2
+++ b/metadata/md5-cache/dev-perl/Mail-SRS-0.310.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/Digest-HMAC-1.01-r1 >=dev-perl/MLDBM-2.01 >=virtual/perl-DB_F
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHEVEK/Mail-SRS-0.31.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=87396aa8dda72cb3ddf73512a6f1b24d
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index aec287170cbf..b60bf3e038b9 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/Math-Base36-0.140.0 b/metadata/md5-cache/dev-perl/Math-Base36-0.140.0
index 09c3a55f7a1b..aade68c9739a 100644
--- a/metadata/md5-cache/dev-perl/Math-Base36-0.140.0
+++ b/metadata/md5-cache/dev-perl/Math-Base36-0.140.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BR/BRICAS/Math-Base36-0.14.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=68098a1cd9b9fa55fc7dcda5512e865a
diff --git a/metadata/md5-cache/dev-perl/Math-Bezier-0.10.0-r1 b/metadata/md5-cache/dev-perl/Math-Bezier-0.10.0-r1
index 729e83c2ee80..f2eaecc08aa7 100644
--- a/metadata/md5-cache/dev-perl/Math-Bezier-0.10.0-r1
+++ b/metadata/md5-cache/dev-perl/Math-Bezier-0.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AB/ABW/Math-Bezier-0.01.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6d976ebc4efc5fbcffd00f93fe9e342a
diff --git a/metadata/md5-cache/dev-perl/Math-Calc-Units-1.70.0-r1 b/metadata/md5-cache/dev-perl/Math-Calc-Units-1.70.0-r1
index c7007c2f24b2..7fb6578a4f9c 100644
--- a/metadata/md5-cache/dev-perl/Math-Calc-Units-1.70.0-r1
+++ b/metadata/md5-cache/dev-perl/Math-Calc-Units-1.70.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Time-Local dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SF/SFINK/Math-Calc-Units-1.07.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=faddf8696672bb787c2d1d1af2cf5445
diff --git a/metadata/md5-cache/dev-perl/Math-Random-0.720.0 b/metadata/md5-cache/dev-perl/Math-Random-0.720.0
index 128ae13c9df5..18993904c22a 100644
--- a/metadata/md5-cache/dev-perl/Math-Random-0.720.0
+++ b/metadata/md5-cache/dev-perl/Math-Random-0.720.0
@@ -8,5 +8,5 @@ LICENSE=( || ( Artistic GPL-2 ) ) public-domain
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GR/GROMMEL/Math-Random-0.72.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d7782a4d347910bc14cd286f4d5e8412
diff --git a/metadata/md5-cache/dev-perl/Math-Random-ISAAC-1.4.0-r1 b/metadata/md5-cache/dev-perl/Math-Random-ISAAC-1.4.0-r1
index 7513346ed07d..b218a5d0f44c 100644
--- a/metadata/md5-cache/dev-perl/Math-Random-ISAAC-1.4.0-r1
+++ b/metadata/md5-cache/dev-perl/Math-Random-ISAAC-1.4.0-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JA/JAWNSY/Math-Random-ISAAC-1.004.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=05e236a7182c393b351aeef2100a992a
diff --git a/metadata/md5-cache/dev-perl/Math-Random-ISAAC-XS-1.4.0-r1 b/metadata/md5-cache/dev-perl/Math-Random-ISAAC-XS-1.4.0-r1
index 797ecda91cb8..a530134ea9ed 100644
--- a/metadata/md5-cache/dev-perl/Math-Random-ISAAC-XS-1.4.0-r1
+++ b/metadata/md5-cache/dev-perl/Math-Random-ISAAC-XS-1.4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Math-Random-ISAAC dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JA/JAWNSY/Math-Random-ISAAC-XS-1.004.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=00bda596c8e0d5fad68a05827de94d30
diff --git a/metadata/md5-cache/dev-perl/Math-Random-MT-1.170.0 b/metadata/md5-cache/dev-perl/Math-Random-MT-1.170.0
index 2553829f9011..7ac051a54467 100644
--- a/metadata/md5-cache/dev-perl/Math-Random-MT-1.170.0
+++ b/metadata/md5-cache/dev-perl/Math-Random-MT-1.170.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FA/FANGLY/Math-Random-MT-1.17.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1ec55c3e8af939d124a8c451e88a5cb1
diff --git a/metadata/md5-cache/dev-perl/Math-Vec-1.10.0-r1 b/metadata/md5-cache/dev-perl/Math-Vec-1.10.0-r1
index 0c347e1e5401..330ae879f1b2 100644
--- a/metadata/md5-cache/dev-perl/Math-Vec-1.10.0-r1
+++ b/metadata/md5-cache/dev-perl/Math-Vec-1.10.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EW/EWILHELM/Math-Vec-1.01.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5b5abbb183d9f035a3c50a1c71f600d5
diff --git a/metadata/md5-cache/dev-perl/Math-VecStat-0.80.0-r1 b/metadata/md5-cache/dev-perl/Math-VecStat-0.80.0-r1
index 8387c55b9513..fb6151fa8428 100644
--- a/metadata/md5-cache/dev-perl/Math-VecStat-0.80.0-r1
+++ b/metadata/md5-cache/dev-perl/Math-VecStat-0.80.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AS/ASPINELLI/Math-VecStat-0.08.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4a49b25cda5b31d3a31757d9f763fe44
diff --git a/metadata/md5-cache/dev-perl/Mo-0.400.0 b/metadata/md5-cache/dev-perl/Mo-0.400.0
index caa0cee32d5a..58b2faecc0c4 100644
--- a/metadata/md5-cache/dev-perl/Mo-0.400.0
+++ b/metadata/md5-cache/dev-perl/Mo-0.400.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TI/TINITA/Mo-0.40.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b8e6d91c37bc538cc2d3e534a9740c31
diff --git a/metadata/md5-cache/dev-perl/Module-Build-Tiny-0.39.0 b/metadata/md5-cache/dev-perl/Module-Build-Tiny-0.39.0
index 991a1c92a942..25a617ca9ebe 100644
--- a/metadata/md5-cache/dev-perl/Module-Build-Tiny-0.39.0
+++ b/metadata/md5-cache/dev-perl/Module-Build-Tiny-0.39.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-CPAN-Meta >=virtual/perl-Exporter-5.570.0 virtual/perl-ExtU
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Module-Build-Tiny-0.039.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7e2ec0bdc2388ae80e44f645b2fcaadd
diff --git a/metadata/md5-cache/dev-perl/Module-Build-XSUtil-0.180.0 b/metadata/md5-cache/dev-perl/Module-Build-XSUtil-0.180.0
index 1d4b4e870437..19c788a6f444 100644
--- a/metadata/md5-cache/dev-perl/Module-Build-XSUtil-0.180.0
+++ b/metadata/md5-cache/dev-perl/Module-Build-XSUtil-0.180.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Module::Build class for building XS modules
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Module-Build-XSUtil
 IUSE=test examples
-KEYWORDS=amd64 hppa ~ppc x86
+KEYWORDS=amd64 ~arm hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Devel-CheckCompiler virtual/perl-Devel-PPPort virtual/perl-Exporter virtual/perl-ExtUtils-CBuilder virtual/perl-File-Path virtual/perl-XSLoader virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HI/HIDEAKIO/Module-Build-XSUtil-0.18.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2d62ebd7844db72f2aee498d6bdf4442
+_md5_=c5fe2a287d29c612fcda88e5dc2c9b79
diff --git a/metadata/md5-cache/dev-perl/Module-Find-0.130.0 b/metadata/md5-cache/dev-perl/Module-Find-0.130.0
index d2bce2cf4904..b9d2426d0713 100644
--- a/metadata/md5-cache/dev-perl/Module-Find-0.130.0
+++ b/metadata/md5-cache/dev-perl/Module-Find-0.130.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CR/CRENZ/Module-Find-0.13.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=15dd92096b58237e2634e5302de0f13a
diff --git a/metadata/md5-cache/dev-perl/Module-Locate-1.800.0 b/metadata/md5-cache/dev-perl/Module-Locate-1.800.0
index e98d911a208a..cf4903235f70 100644
--- a/metadata/md5-cache/dev-perl/Module-Locate-1.800.0
+++ b/metadata/md5-cache/dev-perl/Module-Locate-1.800.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp virtual/perl-File-Spec virtual/perl-IO dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Module-Locate-1.80.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=207aa9bb736b8284631535cc3d6fb13f
diff --git a/metadata/md5-cache/dev-perl/Module-Pluggable-5.200.0 b/metadata/md5-cache/dev-perl/Module-Pluggable-5.200.0
index 6ff6dda90ced..452e9e596c9b 100644
--- a/metadata/md5-cache/dev-perl/Module-Pluggable-5.200.0
+++ b/metadata/md5-cache/dev-perl/Module-Pluggable-5.200.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/perl-File-Spec-3 virtual/perl-if dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SI/SIMONW/Module-Pluggable-5.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cf1b0e5c0210ef8785c7b828dcdffa54
diff --git a/metadata/md5-cache/dev-perl/Module-Refresh-0.170.0-r1 b/metadata/md5-cache/dev-perl/Module-Refresh-0.170.0-r1
index b0002cda128e..7edf28695205 100644
--- a/metadata/md5-cache/dev-perl/Module-Refresh-0.170.0-r1
+++ b/metadata/md5-cache/dev-perl/Module-Refresh-0.170.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/Module-Refresh-0.17.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6c2a0bb6c1000c004df94c6d5fe76efd
diff --git a/metadata/md5-cache/dev-perl/Module-Util-1.90.0 b/metadata/md5-cache/dev-perl/Module-Util-1.90.0
index 9554d78697d0..589b4cc9c273 100644
--- a/metadata/md5-cache/dev-perl/Module-Util-1.90.0
+++ b/metadata/md5-cache/dev-perl/Module-Util-1.90.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MATTLAW/Module-Util-1.09.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=eae6b7091ace663fff132689d47d52c4
diff --git a/metadata/md5-cache/dev-perl/Module-Versions-Report-1.60.0-r1 b/metadata/md5-cache/dev-perl/Module-Versions-Report-1.60.0-r1
index f635900fc7dc..1e9899de314e 100644
--- a/metadata/md5-cache/dev-perl/Module-Versions-Report-1.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Module-Versions-Report-1.60.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JE/JESSE/Module-Versions-Report-1.06.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=23ade618047f986d39c3c132d292d1e8
diff --git a/metadata/md5-cache/dev-perl/MooseX-Aliases-0.110.0-r1 b/metadata/md5-cache/dev-perl/MooseX-Aliases-0.110.0-r1
index b9768cc10252..a96ec7d3581a 100644
--- a/metadata/md5-cache/dev-perl/MooseX-Aliases-0.110.0-r1
+++ b/metadata/md5-cache/dev-perl/MooseX-Aliases-0.110.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/Moose-1.90.0 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOY/MooseX-Aliases-0.11.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d7e922d24a5c3baa86b539a36db3bc3f
diff --git a/metadata/md5-cache/dev-perl/MooseX-GlobRef-0.70.100 b/metadata/md5-cache/dev-perl/MooseX-GlobRef-0.70.100
index cecb1ebebd1c..fb52bab88f9b 100644
--- a/metadata/md5-cache/dev-perl/MooseX-GlobRef-0.70.100
+++ b/metadata/md5-cache/dev-perl/MooseX-GlobRef-0.70.100
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/Moose-0.96 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DE/DEXTER/MooseX-GlobRef-0.0701.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a1f40fefb836dc4d5a97f26d10b47204
diff --git a/metadata/md5-cache/dev-perl/MooseX-MultiInitArg-0.20.0 b/metadata/md5-cache/dev-perl/MooseX-MultiInitArg-0.20.0
index 13fc3da4a837..6cd7f23fa89d 100644
--- a/metadata/md5-cache/dev-perl/MooseX-MultiInitArg-0.20.0
+++ b/metadata/md5-cache/dev-perl/MooseX-MultiInitArg-0.20.0
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Moose dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FR/FRODWITH/MooseX-MultiInitArg-0.02.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7a2d9188d430add35ae754e71399f122
diff --git a/metadata/md5-cache/dev-perl/MooseX-Types-0.500.0 b/metadata/md5-cache/dev-perl/MooseX-Types-0.500.0
index eb352ebc43be..4692ac9f181a 100644
--- a/metadata/md5-cache/dev-perl/MooseX-Types-0.500.0
+++ b/metadata/md5-cache/dev-perl/MooseX-Types-0.500.0
@@ -4,11 +4,11 @@ DESCRIPTION=Organise your Moose types in libraries
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/MooseX-Types
 IUSE=test examples
-KEYWORDS=amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Carp-Clan-6 virtual/perl-Exporter dev-perl/Module-Runtime >=dev-perl/Moose-1.60.0 >=virtual/perl-Scalar-List-Utils-1.190.0 dev-perl/Sub-Exporter >=dev-perl/Sub-Exporter-ForMethods-0.100.52 dev-perl/Sub-Install dev-perl/Sub-Name >=dev-perl/namespace-autoclean-0.160.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-0.50.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9d5a2f5be432d84b7b90c5b1cf086bec
+_md5_=dc5cf5f85fd76420fc6066d6758667ce
diff --git a/metadata/md5-cache/dev-perl/Mouse-2.4.10 b/metadata/md5-cache/dev-perl/Mouse-2.4.10
index 7ce71e17fa63..89ab835f1413 100644
--- a/metadata/md5-cache/dev-perl/Mouse-2.4.10
+++ b/metadata/md5-cache/dev-perl/Mouse-2.4.10
@@ -4,11 +4,11 @@ DESCRIPTION=Moose minus the antlers
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Mouse
 IUSE=test examples
-KEYWORDS=amd64 hppa ~ppc x86
+KEYWORDS=amd64 ~arm hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Scalar-List-Utils-1.140.0 >=virtual/perl-XSLoader-0.20.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GF/GFUJI/Mouse-v2.4.10.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=95236aab66f47a656035c992be8e1f41
+_md5_=2d5dfe440e8d5d9e9a94949a501b64c0
diff --git a/metadata/md5-cache/dev-perl/MouseX-NativeTraits-1.90.0-r2 b/metadata/md5-cache/dev-perl/MouseX-NativeTraits-1.90.0-r2
index d50a312b70a1..20e2536cfea5 100644
--- a/metadata/md5-cache/dev-perl/MouseX-NativeTraits-1.90.0-r2
+++ b/metadata/md5-cache/dev-perl/MouseX-NativeTraits-1.90.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Extend your attribute interfaces for Mouse
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/MouseX-NativeTraits
 IUSE=test examples
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Mouse-0.820.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GF/GFUJI/MouseX-NativeTraits-1.09.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=594cc5bf48238300c23ec51035e076a2
+_md5_=e7f8131d66842c4b49ff6f75612d3e0c
diff --git a/metadata/md5-cache/dev-perl/Net-Amazon-0.620.0 b/metadata/md5-cache/dev-perl/Net-Amazon-0.620.0
index 0b8ca701cc3b..b980ebc423a1 100644
--- a/metadata/md5-cache/dev-perl/Net-Amazon-0.620.0
+++ b/metadata/md5-cache/dev-perl/Net-Amazon-0.620.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl dev-perl/HTTP-Message >=dev-perl/XML-Simple-2.80.0 >=virtual/perl-Time-HiRes-1.0.0 >=dev-perl/Log-Log4perl-0.300.0 virtual/perl-Digest-SHA dev-perl/URI dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BO/BOUMENOT/Net-Amazon-0.62.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=75a4ac10f3c2fa0f1e560eb4a58bf0e1
diff --git a/metadata/md5-cache/dev-perl/Net-DNS-Async-1.70.0-r1 b/metadata/md5-cache/dev-perl/Net-DNS-Async-1.70.0-r1
index 2c18b4a7bec2..8c2a8d9bdf0c 100644
--- a/metadata/md5-cache/dev-perl/Net-DNS-Async-1.70.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-DNS-Async-1.70.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Net-DNS dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHEVEK/Net-DNS-Async-1.07.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c02bb00ddffa224de7b7945265463a04
diff --git a/metadata/md5-cache/dev-perl/Net-Domain-TLD-1.750.0 b/metadata/md5-cache/dev-perl/Net-Domain-TLD-1.750.0
index bdc3e3b55cd9..97812068a42c 100644
--- a/metadata/md5-cache/dev-perl/Net-Domain-TLD-1.750.0
+++ b/metadata/md5-cache/dev-perl/Net-Domain-TLD-1.750.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-Carp virtual/perl-Storable virtual/perl-ExtUtils-MakeMaker d
 DESCRIPTION=Current top level domain names including new ICANN additions and ccTLDs
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Net-Domain-TLD
-KEYWORDS=amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Storable dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALEXP/Net-Domain-TLD-1.75.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=8ecd0faad49d681cd7f98730bdb07719
+_md5_=041b32c7398b5d0917cc63e0032e72f3
diff --git a/metadata/md5-cache/dev-perl/Net-IMAP-Simple-SSL-1.300.0-r1 b/metadata/md5-cache/dev-perl/Net-IMAP-Simple-SSL-1.300.0-r1
index 7fbcb1eedb06..6f1d27b94496 100644
--- a/metadata/md5-cache/dev-perl/Net-IMAP-Simple-SSL-1.300.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-IMAP-Simple-SSL-1.300.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/IO-Socket-SSL dev-perl/Net-IMAP-Simple dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CW/CWEST/Net-IMAP-Simple-SSL-1.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a1c01d68695984c5c447d69afa2ff986
diff --git a/metadata/md5-cache/dev-perl/Net-IP-1.260.0-r1 b/metadata/md5-cache/dev-perl/Net-IP-1.260.0-r1
index b05c80b9ce5e..c464bd3f0cdc 100644
--- a/metadata/md5-cache/dev-perl/Net-IP-1.260.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-IP-1.260.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MANU/Net-IP-1.26.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=220cfb5fbb38dd77971b51784c703a03
diff --git a/metadata/md5-cache/dev-perl/Net-IP-Minimal-0.60.0 b/metadata/md5-cache/dev-perl/Net-IP-Minimal-0.60.0
index 8d063b458507..289c225b1c3c 100644
--- a/metadata/md5-cache/dev-perl/Net-IP-Minimal-0.60.0
+++ b/metadata/md5-cache/dev-perl/Net-IP-Minimal-0.60.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Net-IP-Minimal-0.06.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3ee068f7756a85741892a7954589129f
diff --git a/metadata/md5-cache/dev-perl/Net-IPv4Addr-0.100.0 b/metadata/md5-cache/dev-perl/Net-IPv4Addr-0.100.0
index 0a2346c87005..acff62007754 100644
--- a/metadata/md5-cache/dev-perl/Net-IPv4Addr-0.100.0
+++ b/metadata/md5-cache/dev-perl/Net-IPv4Addr-0.100.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FR/FRAJULAC/Net-IPv4Addr-0.10.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6a6e82f076c8705f2aa1085ff15174d2
diff --git a/metadata/md5-cache/dev-perl/Net-IRC-0.790.0-r1 b/metadata/md5-cache/dev-perl/Net-IRC-0.790.0-r1
index b1f9ad1ccdc6..87ee12d4988e 100644
--- a/metadata/md5-cache/dev-perl/Net-IRC-0.790.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-IRC-0.790.0-r1
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AP/APEIRON/Net-IRC-0.79.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cc8d51550d1e9f5585b7009c1c700907
diff --git a/metadata/md5-cache/dev-perl/Net-Jabber-2.0.0-r1 b/metadata/md5-cache/dev-perl/Net-Jabber-2.0.0-r1
index 749d81bdf1d8..c1d82c23ac40 100644
--- a/metadata/md5-cache/dev-perl/Net-Jabber-2.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-Jabber-2.0.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-perl/XML-Stream dev-perl/Net-XMPP dev-perl/Digest-SHA1 dev-lang/perl:
 DESCRIPTION=Jabber Perl library
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Net-Jabber
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/XML-Stream dev-perl/Net-XMPP dev-perl/Digest-SHA1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REATMON/Net-Jabber-2.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=20ed34649b25a1e259f9106d4ee0e9a5
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=dd8951dd4c5345d2a614944d0566f662
diff --git a/metadata/md5-cache/dev-perl/Net-Kismet-0.04-r1 b/metadata/md5-cache/dev-perl/Net-Kismet-0.04-r1
index 09df45aed8c2..f998b8a97215 100644
--- a/metadata/md5-cache/dev-perl/Net-Kismet-0.04-r1
+++ b/metadata/md5-cache/dev-perl/Net-Kismet-0.04-r1
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://www.kismetwireless.net/code/Net-Kismet-0.04.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9613a993691898fb67e08f0e780da4e0
diff --git a/metadata/md5-cache/dev-perl/Net-Netmask-1.902.200 b/metadata/md5-cache/dev-perl/Net-Netmask-1.902.200
index b8cd1e4f1764..2fd4c9f8753e 100644
--- a/metadata/md5-cache/dev-perl/Net-Netmask-1.902.200
+++ b/metadata/md5-cache/dev-perl/Net-Netmask-1.902.200
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MU/MUIR/modules/Net-Netmask-1.9022.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cd99696043af28153c8b76b90e4ddeba
diff --git a/metadata/md5-cache/dev-perl/Net-OAuth-0.280.0-r1 b/metadata/md5-cache/dev-perl/Net-OAuth-0.280.0-r1
index 263cd51b7b9a..0c85347ae963 100644
--- a/metadata/md5-cache/dev-perl/Net-OAuth-0.280.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-OAuth-0.280.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/Class-Accessor-0.31 >=dev-perl/Class-Data-Inheritable-0.06 de
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KG/KGRENNAN/Net-OAuth-0.28.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=779bac956e6fac4456c58be859a3e8b1
diff --git a/metadata/md5-cache/dev-perl/Net-SMTP-TLS-0.120.0-r2 b/metadata/md5-cache/dev-perl/Net-SMTP-TLS-0.120.0-r2
index 9b8b7467deca..6ec56049b65e 100644
--- a/metadata/md5-cache/dev-perl/Net-SMTP-TLS-0.120.0-r2
+++ b/metadata/md5-cache/dev-perl/Net-SMTP-TLS-0.120.0-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Net-SSLeay dev-perl/IO-Socket-SSL virtual/perl-MIME-Base64 dev-perl/Digest-HMAC dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AW/AWESTHOLM/Net-SMTP-TLS-0.12.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a0269ac76a3a084f9b01c1e2d46aa8e3
diff --git a/metadata/md5-cache/dev-perl/Net-SMTP-TLS-ButMaintained-0.240.0-r1 b/metadata/md5-cache/dev-perl/Net-SMTP-TLS-ButMaintained-0.240.0-r1
index 934489a04fcd..9edf06404c0f 100644
--- a/metadata/md5-cache/dev-perl/Net-SMTP-TLS-ButMaintained-0.240.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-SMTP-TLS-ButMaintained-0.240.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-IO virtual/perl-libnet >=dev-perl/IO-Socket-SSL-1.760.0 dev-perl/Net-SSLeay virtual/perl-MIME-Base64 dev-perl/Digest-HMAC dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FA/FAYLAND/Net-SMTP-TLS-ButMaintained-0.24.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e28c7adbe11220eb36b3e57ef2dfb2f3
diff --git a/metadata/md5-cache/dev-perl/Net-XMPP-1.50.0 b/metadata/md5-cache/dev-perl/Net-XMPP-1.50.0
index fc9cc368f554..e2a56e6fa2bd 100644
--- a/metadata/md5-cache/dev-perl/Net-XMPP-1.50.0
+++ b/metadata/md5-cache/dev-perl/Net-XMPP-1.50.0
@@ -4,11 +4,11 @@ DESCRIPTION=XMPP Perl Library
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Net-XMPP
 IUSE=test examples
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-perl/Authen-SASL-2.120.0 virtual/perl-Digest-SHA virtual/perl-Scalar-List-Utils >=dev-perl/XML-Stream-1.240.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAPATRICK/Net-XMPP-1.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=433db2633fa1bec5d8705c3abbaa2f03
+_md5_=38866a938e1d53faed1de01ba098804e
diff --git a/metadata/md5-cache/dev-perl/NetAddr-IP-4.78.0 b/metadata/md5-cache/dev-perl/NetAddr-IP-4.78.0
index 484b4816dfdc..af876d87e3fe 100644
--- a/metadata/md5-cache/dev-perl/NetAddr-IP-4.78.0
+++ b/metadata/md5-cache/dev-perl/NetAddr-IP-4.78.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=ipv6? ( dev-perl/Socket6 ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKER/NetAddr-IP-4.078.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=22524eccf63d09450d7d1ce994c2c5ac
diff --git a/metadata/md5-cache/dev-perl/NetPacket-1.6.0 b/metadata/md5-cache/dev-perl/NetPacket-1.6.0
index 1c80369b1cad..12d3931eb3ce 100644
--- a/metadata/md5-cache/dev-perl/NetPacket-1.6.0
+++ b/metadata/md5-cache/dev-perl/NetPacket-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Y/YA/YANICK/NetPacket-1.6.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=686d80a4528868a092d032bc66aff111
diff --git a/metadata/md5-cache/dev-perl/Number-Compare-0.30.0-r1 b/metadata/md5-cache/dev-perl/Number-Compare-0.30.0-r1
index d05ab2b78229..00a2ebacb828 100644
--- a/metadata/md5-cache/dev-perl/Number-Compare-0.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Number-Compare-0.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Number-Compare-0.03.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b2739f133f1341eada58a1fb79177782
diff --git a/metadata/md5-cache/dev-perl/Number-Format-1.750.0 b/metadata/md5-cache/dev-perl/Number-Format-1.750.0
index 78d4f5ebac79..2f500c7cfc25 100644
--- a/metadata/md5-cache/dev-perl/Number-Format-1.750.0
+++ b/metadata/md5-cache/dev-perl/Number-Format-1.750.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/W/WR/WRW/Number-Format-1.75.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a7d640b258f9e74c5e0f0db6809fb502
diff --git a/metadata/md5-cache/dev-perl/OLE-StorageLite-0.190.0-r1 b/metadata/md5-cache/dev-perl/OLE-StorageLite-0.190.0-r1
index a6e42671a3cc..974ae15643de 100644
--- a/metadata/md5-cache/dev-perl/OLE-StorageLite-0.190.0-r1
+++ b/metadata/md5-cache/dev-perl/OLE-StorageLite-0.190.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JM/JMCNAMARA/OLE-Storage_Lite-0.19.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f70053bdca1e58a3124c383d3d428c64
diff --git a/metadata/md5-cache/dev-perl/Object-MultiType-0.50.0 b/metadata/md5-cache/dev-perl/Object-MultiType-0.50.0
index 0760e175e7ae..23db4339262e 100644
--- a/metadata/md5-cache/dev-perl/Object-MultiType-0.50.0
+++ b/metadata/md5-cache/dev-perl/Object-MultiType-0.50.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GM/GMPASSOS/Object-MultiType-0.05.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fe9f69c2394ac20eb1df32e3c598c2cd
diff --git a/metadata/md5-cache/dev-perl/Object-Realize-Later-0.190.0 b/metadata/md5-cache/dev-perl/Object-Realize-Later-0.190.0
index 63a04012bf2c..9e8b55fcc1b0 100644
--- a/metadata/md5-cache/dev-perl/Object-Realize-Later-0.190.0
+++ b/metadata/md5-cache/dev-perl/Object-Realize-Later-0.190.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Object-Realize-Later-0.19.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5045850599eb71bbb14b3db47ff920bf
diff --git a/metadata/md5-cache/dev-perl/PAR-Dist-0.490.0-r1 b/metadata/md5-cache/dev-perl/PAR-Dist-0.490.0-r1
index 259a877bc31d..8ea46bf27206 100644
--- a/metadata/md5-cache/dev-perl/PAR-Dist-0.490.0-r1
+++ b/metadata/md5-cache/dev-perl/PAR-Dist-0.490.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-File-Temp || ( dev-perl/YAML-Syck dev-perl/YAML ) dev-perl/Archive-Zip dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RS/RSCHUPP/PAR-Dist-0.49.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=852820c0b602b4daae4ee06c500d8134
diff --git a/metadata/md5-cache/dev-perl/PHP-Serialization-0.340.0-r1 b/metadata/md5-cache/dev-perl/PHP-Serialization-0.340.0-r1
index 2e6e60e18122..4bd45e07b585 100644
--- a/metadata/md5-cache/dev-perl/PHP-Serialization-0.340.0-r1
+++ b/metadata/md5-cache/dev-perl/PHP-Serialization-0.340.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BO/BOBTFISH/PHP-Serialization-0.34.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b3d9d4681873c68883cd8433abbca100
diff --git a/metadata/md5-cache/dev-perl/POE-1.367 b/metadata/md5-cache/dev-perl/POE-1.367
index 784d10415139..da6357a9a7c1 100644
--- a/metadata/md5-cache/dev-perl/POE-1.367
+++ b/metadata/md5-cache/dev-perl/POE-1.367
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/YAML dev-perl/Filter dev-perl/IO-Pipely dev-perl/FreezeThaw >=d
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCAPUTO/POE-1.367.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=95c2311ca88fbc51fc3524ee6ed3f466
diff --git a/metadata/md5-cache/dev-perl/POE-API-Peek-2.200.0-r1 b/metadata/md5-cache/dev-perl/POE-API-Peek-2.200.0-r1
index 2bfa834f5fc2..6ffa244cdf49 100644
--- a/metadata/md5-cache/dev-perl/POE-API-Peek-2.200.0-r1
+++ b/metadata/md5-cache/dev-perl/POE-API-Peek-2.200.0-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-perl/Devel-Size >=dev-perl/POE-1.311.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/POE-API-Peek-2.20.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=07107d5880ddffd1bbb0ee2f1a24a614
diff --git a/metadata/md5-cache/dev-perl/POE-Component-Client-Keepalive-0.272.0 b/metadata/md5-cache/dev-perl/POE-Component-Client-Keepalive-0.272.0
index 4accc187fb53..1588dc12d2ff 100644
--- a/metadata/md5-cache/dev-perl/POE-Component-Client-Keepalive-0.272.0
+++ b/metadata/md5-cache/dev-perl/POE-Component-Client-Keepalive-0.272.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Net-IP-Minimal-0.20.0 >=dev-perl/POE-1.311.0 >=dev-perl/POE-Component-Resolver-0.917.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCAPUTO/POE-Component-Client-Keepalive-0.272.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6a75a75b03d406a7f232ef56bfa4fd31
diff --git a/metadata/md5-cache/dev-perl/POE-Component-Resolver-0.921.0 b/metadata/md5-cache/dev-perl/POE-Component-Resolver-0.921.0
index dda9bdb8fd32..3c98c7b2f7a6 100644
--- a/metadata/md5-cache/dev-perl/POE-Component-Resolver-0.921.0
+++ b/metadata/md5-cache/dev-perl/POE-Component-Resolver-0.921.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/POE-1.311.0 >=virtual/perl-Scalar-List-Utils-1.230.0 >=virtual/perl-Socket-2.1.0 >=virtual/perl-Storable-2.180.0 >=virtual/perl-Test-Simple-0.96 >=virtual/perl-Time-HiRes-1.971.100 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCAPUTO/POE-Component-Resolver-0.921.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2d579710e023b99216780d6eedcffb9f
diff --git a/metadata/md5-cache/dev-perl/POE-Test-Loops-1.360.0 b/metadata/md5-cache/dev-perl/POE-Test-Loops-1.360.0
index cfbbb28c60a0..1737815bac7d 100644
--- a/metadata/md5-cache/dev-perl/POE-Test-Loops-1.360.0
+++ b/metadata/md5-cache/dev-perl/POE-Test-Loops-1.360.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCAPUTO/POE-Test-Loops-1.360.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5a41aaf749741fa8ff6ed581c281d1d5
diff --git a/metadata/md5-cache/dev-perl/POE-XS-Loop-EPoll-1.3.0 b/metadata/md5-cache/dev-perl/POE-XS-Loop-EPoll-1.3.0
index 6ac735a4c16d..0e391668ce82 100644
--- a/metadata/md5-cache/dev-perl/POE-XS-Loop-EPoll-1.3.0
+++ b/metadata/md5-cache/dev-perl/POE-XS-Loop-EPoll-1.3.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/POE-1.287 >=dev-perl/POE-Test-Loops-1.033 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TONYC/POE-XS-Loop-EPoll-1.003.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=608165a9343a051c0ac0d2233a7d0d8f
diff --git a/metadata/md5-cache/dev-perl/POE-XS-Loop-Poll-1.0.0-r1 b/metadata/md5-cache/dev-perl/POE-XS-Loop-Poll-1.0.0-r1
index 509744880c78..b4461b75bca2 100644
--- a/metadata/md5-cache/dev-perl/POE-XS-Loop-Poll-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/POE-XS-Loop-Poll-1.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/POE-1.287 >=dev-perl/POE-Test-Loops-1.033 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TONYC/POE-XS-Loop-Poll-1.000.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bd4864fdc9193df11c9fccc91221240b
diff --git a/metadata/md5-cache/dev-perl/POE-XS-Queue-Array-0.6.0-r1 b/metadata/md5-cache/dev-perl/POE-XS-Queue-Array-0.6.0-r1
index a1f225077f70..54665936ec0c 100644
--- a/metadata/md5-cache/dev-perl/POE-XS-Queue-Array-0.6.0-r1
+++ b/metadata/md5-cache/dev-perl/POE-XS-Queue-Array-0.6.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/POE dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TONYC/POE-XS-Queue-Array-0.006.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=58b6fb101a2b61256e8cdcdfa36687db
diff --git a/metadata/md5-cache/dev-perl/PPIx-Utilities-1.1.0-r1 b/metadata/md5-cache/dev-perl/PPIx-Utilities-1.1.0-r1
index deda56ed8322..b4df700c9be8 100644
--- a/metadata/md5-cache/dev-perl/PPIx-Utilities-1.1.0-r1
+++ b/metadata/md5-cache/dev-perl/PPIx-Utilities-1.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/PPI-1.208 dev-perl/Exception-Class dev-perl/Readonly virtual/
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EL/ELLIOTJS/PPIx-Utilities-1.001000.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bd7f3561fc9a0a693656887010a622fd
diff --git a/metadata/md5-cache/dev-perl/Package-Constants-0.60.0 b/metadata/md5-cache/dev-perl/Package-Constants-0.60.0
index f1274c2523cb..614d1763103a 100644
--- a/metadata/md5-cache/dev-perl/Package-Constants-0.60.0
+++ b/metadata/md5-cache/dev-perl/Package-Constants-0.60.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Package-Constants-0.06.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8722550d105641b158dc64a52da97a61
diff --git a/metadata/md5-cache/dev-perl/Package-Stash-XS-0.280.0 b/metadata/md5-cache/dev-perl/Package-Stash-XS-0.280.0
index 8b94fd915c6d..1721437681c9 100644
--- a/metadata/md5-cache/dev-perl/Package-Stash-XS-0.280.0
+++ b/metadata/md5-cache/dev-perl/Package-Stash-XS-0.280.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOY/Package-Stash-XS-0.28.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2e5f3b733c569ce607ca178e904fe324
diff --git a/metadata/md5-cache/dev-perl/Parse-ExuberantCTags-1.20.0-r1 b/metadata/md5-cache/dev-perl/Parse-ExuberantCTags-1.20.0-r1
index d28d83465943..7e7eb2d38800 100644
--- a/metadata/md5-cache/dev-perl/Parse-ExuberantCTags-1.20.0-r1
+++ b/metadata/md5-cache/dev-perl/Parse-ExuberantCTags-1.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ ) public-domain
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/Parse-ExuberantCTags-1.02.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e8b02673871e14b3790f3235fe02bb56
diff --git a/metadata/md5-cache/dev-perl/Parse-Syslog-1.100.0-r1 b/metadata/md5-cache/dev-perl/Parse-Syslog-1.100.0-r1
index 9dc4a2054c59..1791a48355cb 100644
--- a/metadata/md5-cache/dev-perl/Parse-Syslog-1.100.0-r1
+++ b/metadata/md5-cache/dev-perl/Parse-Syslog-1.100.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Time-Local dev-perl/File-Tail dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DS/DSCHWEI/Parse-Syslog-1.10.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=44117d62ee820079d82d15e66ac7dbe4
diff --git a/metadata/md5-cache/dev-perl/PatchReader-0.9.6-r1 b/metadata/md5-cache/dev-perl/PatchReader-0.9.6-r1
index da5b5bd8340d..a44ecb64ad2b 100644
--- a/metadata/md5-cache/dev-perl/PatchReader-0.9.6-r1
+++ b/metadata/md5-cache/dev-perl/PatchReader-0.9.6-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=virtual/perl-File-Temp dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMANNERM/PatchReader-0.9.6.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c99c75ebb36726018221a6c698a00fd9
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-Nits-1.0.0-r1 b/metadata/md5-cache/dev-perl/Perl-Critic-Nits-1.0.0-r1
index 0380547c1984..bd78aba26fa1 100644
--- a/metadata/md5-cache/dev-perl/Perl-Critic-Nits-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Perl-Critic-Nits-1.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Perl-Critic dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KC/KCOWGILL/Perl-Critic-Nits-v1.0.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3ecb307a1b3f805f382f0007d99d84d7
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0-r1 b/metadata/md5-cache/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0-r1
index 4cc7ffbf7226..8a2b3e4a73a7 100644
--- a/metadata/md5-cache/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/indirect-0.250.0 dev-perl/Perl-Critic-Dynamic dev-perl/Perl-C
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VP/VPIT/Perl-Critic-Policy-Dynamic-NoIndirect-0.06.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b7ae41024a1aa4faa50d227a54f800db
diff --git a/metadata/md5-cache/dev-perl/Perl6-Junction-1.600.0 b/metadata/md5-cache/dev-perl/Perl6-Junction-1.600.0
index 65326a87e118..494f404ebb07 100644
--- a/metadata/md5-cache/dev-perl/Perl6-Junction-1.600.0
+++ b/metadata/md5-cache/dev-perl/Perl6-Junction-1.600.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CF/CFRANKS/Perl6-Junction-1.60000.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b16dd03557f491f3a12192e1102357bc
diff --git a/metadata/md5-cache/dev-perl/PerlIO-Layers-0.11.0 b/metadata/md5-cache/dev-perl/PerlIO-Layers-0.11.0
index b2e38ece4a4f..bd50da6f035a 100644
--- a/metadata/md5-cache/dev-perl/PerlIO-Layers-0.11.0
+++ b/metadata/md5-cache/dev-perl/PerlIO-Layers-0.11.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 virtual/perl-Scalar-Li
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/PerlIO-Layers-0.011.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=69be0b365da0ab40a0d28a0d2c60c1ab
diff --git a/metadata/md5-cache/dev-perl/Perlbal-XS-HTTPHeaders-0.200.0-r1 b/metadata/md5-cache/dev-perl/Perlbal-XS-HTTPHeaders-0.200.0-r1
index 4e14eb385b77..eb21f8e96fd7 100644
--- a/metadata/md5-cache/dev-perl/Perlbal-XS-HTTPHeaders-0.200.0-r1
+++ b/metadata/md5-cache/dev-perl/Perlbal-XS-HTTPHeaders-0.200.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Perlbal dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DORMANDO/Perlbal-XS-HTTPHeaders-0.20.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b937f3d731855aea137b9a39fd125874
diff --git a/metadata/md5-cache/dev-perl/Plucene-1.250.0-r2 b/metadata/md5-cache/dev-perl/Plucene-1.250.0-r2
index 731ce3f2c352..4acd76e5c24b 100644
--- a/metadata/md5-cache/dev-perl/Plucene-1.250.0-r2
+++ b/metadata/md5-cache/dev-perl/Plucene-1.250.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/Bit-Vector-Minimal-1.0.0 virtual/perl-Carp >=dev-perl/Class-A
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/Plucene-1.25.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=720fe1c3bb923e34a7068bf0cee7b39c
diff --git a/metadata/md5-cache/dev-perl/Pod-Abstract-0.200.0-r1 b/metadata/md5-cache/dev-perl/Pod-Abstract-0.200.0-r1
index 8d7c24f9f345..87ec597e34ee 100644
--- a/metadata/md5-cache/dev-perl/Pod-Abstract-0.200.0-r1
+++ b/metadata/md5-cache/dev-perl/Pod-Abstract-0.200.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/IO-String virtual/perl-Scalar-List-Utils virtual/perl-File-Temp
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BL/BLILBURNE/Pod-Abstract-0.20.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d3ac5b696b107eb7e6c9d29876a01521
diff --git a/metadata/md5-cache/dev-perl/Pod-Coverage-0.230.0-r1 b/metadata/md5-cache/dev-perl/Pod-Coverage-0.230.0-r1
index 8288e1c522bc..de75f1e68cee 100644
--- a/metadata/md5-cache/dev-perl/Pod-Coverage-0.230.0-r1
+++ b/metadata/md5-cache/dev-perl/Pod-Coverage-0.230.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/perl-Pod-Parser-1.13 >=dev-perl/Devel-Symdump-2.01 dev-lang/pe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Pod-Coverage-0.23.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ae994d468a96028eb8a03b843292ff99
diff --git a/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0 b/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0
index fa765dabfec5..97f63762eb26 100644
--- a/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0
+++ b/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-1+ Artistic )
 RDEPEND=virtual/perl-Pod-Parser virtual/perl-if dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TJ/TJENNESS/Pod-LaTeX-0.61.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7d5c9e5dd2c6db851097ba365225238a
diff --git a/metadata/md5-cache/dev-perl/Pod-POM-2.10.0 b/metadata/md5-cache/dev-perl/Pod-POM-2.10.0
index 609f36bb3a2d..8850d48c07ce 100644
--- a/metadata/md5-cache/dev-perl/Pod-POM-2.10.0
+++ b/metadata/md5-cache/dev-perl/Pod-POM-2.10.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-parent dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Pod-POM-2.01.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5367c2c15560b52605108a3a6e56dbbe
diff --git a/metadata/md5-cache/dev-perl/PortageXS-0.02.10-r4 b/metadata/md5-cache/dev-perl/PortageXS-0.02.10-r4
index 7e72f28e4d2a..30ee50bbc0a4 100644
--- a/metadata/md5-cache/dev-perl/PortageXS-0.02.10-r4
+++ b/metadata/md5-cache/dev-perl/PortageXS-0.02.10-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://download.mpsna.de/opensource/PortageXS/PortageXS-0.02.10.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5bf221764a8e8b68cd1017fb48ee3826
diff --git a/metadata/md5-cache/dev-perl/PortageXS-0.2.10-r5 b/metadata/md5-cache/dev-perl/PortageXS-0.2.10-r5
index bf65b2458d58..215ebd8c970a 100644
--- a/metadata/md5-cache/dev-perl/PortageXS-0.2.10-r5
+++ b/metadata/md5-cache/dev-perl/PortageXS-0.2.10-r5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/perl-Term-ANSIColor dev-perl/Shell-EnvImporter !minimal? ( dev-perl/IO-Socket-SSL virtual/perl-Sys-Syslog ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://download.mpsna.de/opensource/PortageXS/PortageXS-0.02.10.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9043401e0609fdda4816bfb5933f83e2
diff --git a/metadata/md5-cache/dev-perl/PortageXS-0.2.12-r1 b/metadata/md5-cache/dev-perl/PortageXS-0.2.12-r1
index 69b384556df9..362a4361ac98 100644
--- a/metadata/md5-cache/dev-perl/PortageXS-0.2.12-r1
+++ b/metadata/md5-cache/dev-perl/PortageXS-0.2.12-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KE/KENTNL/PortageXS-0.2.12.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4ecc3ac0a89afc8f2dd96f0610a6a0d9
diff --git a/metadata/md5-cache/dev-perl/PostScript-0.60.0-r1 b/metadata/md5-cache/dev-perl/PostScript-0.60.0-r1
index 17106a66e310..3072539b6a56 100644
--- a/metadata/md5-cache/dev-perl/PostScript-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/PostScript-0.60.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHAWNPW/PostScript-0.06.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0849b8e6f23071b8405068bcc57530c0
diff --git a/metadata/md5-cache/dev-perl/Proc-Background-1.100.0-r1 b/metadata/md5-cache/dev-perl/Proc-Background-1.100.0-r1
index 13e34dbb61eb..15a4d58d8cf1 100644
--- a/metadata/md5-cache/dev-perl/Proc-Background-1.100.0-r1
+++ b/metadata/md5-cache/dev-perl/Proc-Background-1.100.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BZ/BZAJAC/Proc-Background-1.10.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2571eb80c782b76d3f304237d708c9fd
diff --git a/metadata/md5-cache/dev-perl/Proc-WaitStat-1.0.0-r1 b/metadata/md5-cache/dev-perl/Proc-WaitStat-1.0.0-r1
index ed97bbc1c6cf..686ae16d2b7a 100644
--- a/metadata/md5-cache/dev-perl/Proc-WaitStat-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Proc-WaitStat-1.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/IPC-Signal dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RO/ROSCH/Proc-WaitStat-1.00.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a52a0dac822a3d5affaae6f2ffe0dc43
diff --git a/metadata/md5-cache/dev-perl/RPC-XML-0.790.0 b/metadata/md5-cache/dev-perl/RPC-XML-0.790.0
index 8da10ceea5ad..4073552d1860 100644
--- a/metadata/md5-cache/dev-perl/RPC-XML-0.790.0
+++ b/metadata/md5-cache/dev-perl/RPC-XML-0.790.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/perl-File-Spec-0.800.0 >=dev-perl/libwww-perl-5.834.0 >=virtua
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJRAY/RPC-XML-0.79.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5df066c6d10c9ae4969604441fb3cbf3
diff --git a/metadata/md5-cache/dev-perl/RTF-Writer-1.110.0-r2 b/metadata/md5-cache/dev-perl/RTF-Writer-1.110.0-r2
index bec656fe966d..606bc4b203d3 100644
--- a/metadata/md5-cache/dev-perl/RTF-Writer-1.110.0-r2
+++ b/metadata/md5-cache/dev-perl/RTF-Writer-1.110.0-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Image-Size dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SB/SBURKE/RTF-Writer-1.11.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9b532c0103d5af689ea85df04e9b03be
diff --git a/metadata/md5-cache/dev-perl/Readonly-XS-1.50.0-r1 b/metadata/md5-cache/dev-perl/Readonly-XS-1.50.0-r1
index fdefa7487b84..af5efd03ecd6 100644
--- a/metadata/md5-cache/dev-perl/Readonly-XS-1.50.0-r1
+++ b/metadata/md5-cache/dev-perl/Readonly-XS-1.50.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Readonly dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RO/ROODE/Readonly-XS-1.05.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=92ffef4aad1ea31f1e48e27981632f41
diff --git a/metadata/md5-cache/dev-perl/Regexp-IPv6-0.30.0-r1 b/metadata/md5-cache/dev-perl/Regexp-IPv6-0.30.0-r1
index 4d55455b31a7..edd6f539a784 100644
--- a/metadata/md5-cache/dev-perl/Regexp-IPv6-0.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Regexp-IPv6-0.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Regexp-IPv6-0.03.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b182e07692f6de7fb5523a032eefa6dd
diff --git a/metadata/md5-cache/dev-perl/Regexp-Shellish-0.930.0-r1 b/metadata/md5-cache/dev-perl/Regexp-Shellish-0.930.0-r1
index 8c16ed9589f9..fae048677316 100644
--- a/metadata/md5-cache/dev-perl/Regexp-Shellish-0.930.0-r1
+++ b/metadata/md5-cache/dev-perl/Regexp-Shellish-0.930.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RB/RBS/Regexp-Shellish-0.93.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cd6647566a8eb84fdb6b6fb56e3f6b53
diff --git a/metadata/md5-cache/dev-perl/Role-Basic-0.130.0 b/metadata/md5-cache/dev-perl/Role-Basic-0.130.0
index 3ede0bc26755..cc2efab6ad06 100644
--- a/metadata/md5-cache/dev-perl/Role-Basic-0.130.0
+++ b/metadata/md5-cache/dev-perl/Role-Basic-0.130.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OV/OVID/Role-Basic-0.13.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=264a295d3b6cd6284045128fef97cc14
diff --git a/metadata/md5-cache/dev-perl/Roman-1.240.0 b/metadata/md5-cache/dev-perl/Roman-1.240.0
index 7efbd8db629d..7d6de5cd028d 100644
--- a/metadata/md5-cache/dev-perl/Roman-1.240.0
+++ b/metadata/md5-cache/dev-perl/Roman-1.240.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Roman-1.24.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=86a69732f03f88976f71e320942b97fa
diff --git a/metadata/md5-cache/dev-perl/SDL-2.546 b/metadata/md5-cache/dev-perl/SDL-2.546
index 371b6d19a9a8..03d3adc98dc2 100644
--- a/metadata/md5-cache/dev-perl/SDL-2.546
+++ b/metadata/md5-cache/dev-perl/SDL-2.546
@@ -8,5 +8,5 @@ LICENSE=GPL-2 OFL-1.1
 RDEPEND=>=dev-perl/Alien-SDL-1.434 dev-perl/Capture-Tiny dev-perl/File-ShareDir dev-perl/Test-Most dev-perl/Tie-Simple media-libs/libpng:0 media-libs/libsdl media-libs/sdl-gfx media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-pango media-libs/sdl-ttf media-libs/smpeg media-libs/tiff:0 virtual/glu virtual/jpeg:0 virtual/opengl virtual/perl-ExtUtils-CBuilder >=dev-perl/Module-Build-0.400.0 virtual/perl-Scalar-List-Utils virtual/perl-Test-Simple dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FR/FROGGS/SDL-2.546.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9aa91cd31a6dd8272243d5f994bf0fc5
diff --git a/metadata/md5-cache/dev-perl/SNMP_Session-1.13-r2 b/metadata/md5-cache/dev-perl/SNMP_Session-1.13-r2
index 910452e13ca8..0f0e38a6aa49 100644
--- a/metadata/md5-cache/dev-perl/SNMP_Session-1.13-r2
+++ b/metadata/md5-cache/dev-perl/SNMP_Session-1.13-r2
@@ -8,5 +8,5 @@ LICENSE=Artistic-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/SNMP_Session-1.13.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0fad1f355dd5be8216e0a6a311fafd83
diff --git a/metadata/md5-cache/dev-perl/SOAP-Lite-1.260.0 b/metadata/md5-cache/dev-perl/SOAP-Lite-1.260.0
index 2d94c20bc140..84edaf77be91 100644
--- a/metadata/md5-cache/dev-perl/SOAP-Lite-1.260.0
+++ b/metadata/md5-cache/dev-perl/SOAP-Lite-1.260.0
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight interface to the SOAP protocol both on client and server
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/SOAP-Lite
 IUSE=ssl test xmpp examples
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Inspector >=dev-perl/IO-SessionData-1.30.0 dev-perl/libwww-perl virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils dev-perl/Task-Weaken dev-perl/URI >=dev-perl/XML-Parser-2.230.0 dev-perl/MIME-tools ssl? ( dev-perl/IO-Socket-SSL dev-perl/LWP-Protocol-https dev-perl/Crypt-SSLeay ) xmpp? ( dev-perl/Net-Jabber ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/SOAP-Lite-1.26.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=28d816a790105290cd95904ce44fe8b5
+_md5_=57d1400b37ea99122c8a2a7c38052001
diff --git a/metadata/md5-cache/dev-perl/SQL-Abstract-Limit-0.141.0-r1 b/metadata/md5-cache/dev-perl/SQL-Abstract-Limit-0.141.0-r1
index 261c998bead3..a8d464355969 100644
--- a/metadata/md5-cache/dev-perl/SQL-Abstract-Limit-0.141.0-r1
+++ b/metadata/md5-cache/dev-perl/SQL-Abstract-Limit-0.141.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/SQL-Abstract dev-perl/DBI dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAVEBAIRD/SQL-Abstract-Limit-0.141.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=47a4c40fe79b66388e52159c338915c2
diff --git a/metadata/md5-cache/dev-perl/SRU-1.10.0 b/metadata/md5-cache/dev-perl/SRU-1.10.0
index ff01b69500d5..11aebf3a1128 100644
--- a/metadata/md5-cache/dev-perl/SRU-1.10.0
+++ b/metadata/md5-cache/dev-perl/SRU-1.10.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/CQL-Parser-1.120.0 virtual/perl-Carp dev-perl/Class-Accessor
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BR/BRICAS/SRU-1.01.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=47721e19acd018161436cdc0acc3d9dd
diff --git a/metadata/md5-cache/dev-perl/SVG-Graph-0.20.0-r1 b/metadata/md5-cache/dev-perl/SVG-Graph-0.20.0-r1
index ecd069063d17..96e7717380c8 100644
--- a/metadata/md5-cache/dev-perl/SVG-Graph-0.20.0-r1
+++ b/metadata/md5-cache/dev-perl/SVG-Graph-0.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=Artistic-2
 RDEPEND=dev-perl/Math-Derivative dev-perl/Math-Spline >=dev-perl/Statistics-Descriptive-2.6 dev-perl/SVG >=dev-perl/Tree-DAG_Node-1.04 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALLENDAY/SVG-Graph-0.02.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4b542c07769752ce9f65794cb4583171
diff --git a/metadata/md5-cache/dev-perl/Safe-Hole-0.130.0-r1 b/metadata/md5-cache/dev-perl/Safe-Hole-0.130.0-r1
index 86cf94575434..67c80637607b 100644
--- a/metadata/md5-cache/dev-perl/Safe-Hole-0.130.0-r1
+++ b/metadata/md5-cache/dev-perl/Safe-Hole-0.130.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/Safe-Hole-0.13.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1006e2af83c6a38b3a3cf8896c7f6e74
diff --git a/metadata/md5-cache/dev-perl/Sane-0.50.0-r1 b/metadata/md5-cache/dev-perl/Sane-0.50.0-r1
index d40f2020d1e3..f14d699324f1 100644
--- a/metadata/md5-cache/dev-perl/Sane-0.50.0-r1
+++ b/metadata/md5-cache/dev-perl/Sane-0.50.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-gfx/sane-backends-1.0.19 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RA/RATCLIFFE/Sane-0.05.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=64e6438b2d27324eb80949c0b06891b6
diff --git a/metadata/md5-cache/dev-perl/Scalar-Properties-1.100.860-r1 b/metadata/md5-cache/dev-perl/Scalar-Properties-1.100.860-r1
index 57cd8f76ba60..945c115959e2 100644
--- a/metadata/md5-cache/dev-perl/Scalar-Properties-1.100.860-r1
+++ b/metadata/md5-cache/dev-perl/Scalar-Properties-1.100.860-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARCEL/Scalar-Properties-1.100860.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2f222cde6b866828793aba36a5ec1c25
diff --git a/metadata/md5-cache/dev-perl/Set-Crontab-1.30.0 b/metadata/md5-cache/dev-perl/Set-Crontab-1.30.0
index 7cad5e6e4e47..c9d64460f2d3 100644
--- a/metadata/md5-cache/dev-perl/Set-Crontab-1.30.0
+++ b/metadata/md5-cache/dev-perl/Set-Crontab-1.30.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AM/AMS/Set-Crontab-1.03.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0aca8d4d52d157e4ec487779d7dcb34b
diff --git a/metadata/md5-cache/dev-perl/Set-Infinite-0.650.0-r1 b/metadata/md5-cache/dev-perl/Set-Infinite-0.650.0-r1
index 09d3bc264092..603c65ad08e2 100644
--- a/metadata/md5-cache/dev-perl/Set-Infinite-0.650.0-r1
+++ b/metadata/md5-cache/dev-perl/Set-Infinite-0.650.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FG/FGLOCK/Set-Infinite-0.65.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ffca66ecee97aeb81105898b0efb0a34
diff --git a/metadata/md5-cache/dev-perl/Set-IntSpan-1.190.0-r1 b/metadata/md5-cache/dev-perl/Set-IntSpan-1.190.0-r1
index 03074bf71e27..d82ecd801ceb 100644
--- a/metadata/md5-cache/dev-perl/Set-IntSpan-1.190.0-r1
+++ b/metadata/md5-cache/dev-perl/Set-IntSpan-1.190.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SW/SWMCD/Set-IntSpan-1.19.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0560321fca62ed0a0293123166b7db63
diff --git a/metadata/md5-cache/dev-perl/Set-Scalar-1.290.0 b/metadata/md5-cache/dev-perl/Set-Scalar-1.290.0
index b57079b21eb0..4f1b0607aa2d 100644
--- a/metadata/md5-cache/dev-perl/Set-Scalar-1.290.0
+++ b/metadata/md5-cache/dev-perl/Set-Scalar-1.290.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAVIDO/Set-Scalar-1.29.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8cefe1ad3c81cfd91f8677856a1d3fb2
diff --git a/metadata/md5-cache/dev-perl/Shell-EnvImporter-1.70.0-r2 b/metadata/md5-cache/dev-perl/Shell-EnvImporter-1.70.0-r2
index 42a871d83ae7..00d2f9fb06fc 100644
--- a/metadata/md5-cache/dev-perl/Shell-EnvImporter-1.70.0-r2
+++ b/metadata/md5-cache/dev-perl/Shell-EnvImporter-1.70.0-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-MethodMaker-2 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DF/DFARALDO/Shell-EnvImporter-1.07.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a60c0b23b5eb18fe9a5b9aa14127579d
diff --git a/metadata/md5-cache/dev-perl/Snowball-Norwegian-1.200.0-r1 b/metadata/md5-cache/dev-perl/Snowball-Norwegian-1.200.0-r1
index 801c52988b69..196212730183 100644
--- a/metadata/md5-cache/dev-perl/Snowball-Norwegian-1.200.0-r1
+++ b/metadata/md5-cache/dev-perl/Snowball-Norwegian-1.200.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AS/ASKSH/Snowball-Norwegian-1.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=46a3105cedfc252c043e94e10f3b65d2
diff --git a/metadata/md5-cache/dev-perl/Snowball-Swedish-1.200.0-r1 b/metadata/md5-cache/dev-perl/Snowball-Swedish-1.200.0-r1
index 792724a6d5cc..5ff486d81277 100644
--- a/metadata/md5-cache/dev-perl/Snowball-Swedish-1.200.0-r1
+++ b/metadata/md5-cache/dev-perl/Snowball-Swedish-1.200.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AS/ASKSH/Snowball-Swedish-1.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3fe5f4b520cd1ab5168f216b85f98e35
diff --git a/metadata/md5-cache/dev-perl/Socket-GetAddrInfo-0.220.0 b/metadata/md5-cache/dev-perl/Socket-GetAddrInfo-0.220.0
index 6479a3b8254e..1c334cc52f2e 100644
--- a/metadata/md5-cache/dev-perl/Socket-GetAddrInfo-0.220.0
+++ b/metadata/md5-cache/dev-perl/Socket-GetAddrInfo-0.220.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Exporter virtual/perl-Socket dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PEVANS/Socket-GetAddrInfo-0.22.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2b9c98c3edbbeead8ecc05c92def4bcf
diff --git a/metadata/md5-cache/dev-perl/Socket6-0.270.0 b/metadata/md5-cache/dev-perl/Socket6-0.270.0
index 2b45ef23bf4a..f63351e95257 100644
--- a/metadata/md5-cache/dev-perl/Socket6-0.270.0
+++ b/metadata/md5-cache/dev-perl/Socket6-0.270.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/U/UM/UMEMOTO/Socket6-0.27.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=03e226e82d8d9af2c183658d2772f8d9
diff --git a/metadata/md5-cache/dev-perl/Sort-Naturally-1.30.0-r1 b/metadata/md5-cache/dev-perl/Sort-Naturally-1.30.0-r1
index 70f1d048a639..f89495c5702a 100644
--- a/metadata/md5-cache/dev-perl/Sort-Naturally-1.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Sort-Naturally-1.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Sort-Naturally-1.03.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c967ed5448282d460a3e9b1d76be03da
diff --git a/metadata/md5-cache/dev-perl/Sort-Tree-1.90.0-r1 b/metadata/md5-cache/dev-perl/Sort-Tree-1.90.0-r1
index c32dc3eb2dc8..ce2f11dd8e6e 100644
--- a/metadata/md5-cache/dev-perl/Sort-Tree-1.90.0-r1
+++ b/metadata/md5-cache/dev-perl/Sort-Tree-1.90.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BR/BRYCE/Sort-Tree-1.09.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c2a8e4e173aa4f36438f081f6ea5e1c4
diff --git a/metadata/md5-cache/dev-perl/Speech-Recognizer-SPX-0.80.100-r1 b/metadata/md5-cache/dev-perl/Speech-Recognizer-SPX-0.80.100-r1
index cb32ae6c9e5f..a2fa45085b17 100644
--- a/metadata/md5-cache/dev-perl/Speech-Recognizer-SPX-0.80.100-r1
+++ b/metadata/md5-cache/dev-perl/Speech-Recognizer-SPX-0.80.100-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=app-accessibility/sphinx2 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DJ/DJHD/Speech-Recognizer-SPX-0.0801.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cf4131158a5ddf1dcb8e590a528c379a
diff --git a/metadata/md5-cache/dev-perl/Spiffy-0.460.0 b/metadata/md5-cache/dev-perl/Spiffy-0.460.0
index 352ba7ee1818..330545d65a33 100644
--- a/metadata/md5-cache/dev-perl/Spiffy-0.460.0
+++ b/metadata/md5-cache/dev-perl/Spiffy-0.460.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/Spiffy-0.46.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=77c9601e4830f808733066ced89cbe22
diff --git a/metadata/md5-cache/dev-perl/Spreadsheet-ParseExcel-0.650.0 b/metadata/md5-cache/dev-perl/Spreadsheet-ParseExcel-0.650.0
index 8a3b18b23291..62507f16d5b7 100644
--- a/metadata/md5-cache/dev-perl/Spreadsheet-ParseExcel-0.650.0
+++ b/metadata/md5-cache/dev-perl/Spreadsheet-ParseExcel-0.650.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/OLE-StorageLite-0.19 dev-perl/IO-stringy dev-perl/Text-CSV_XS
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOUGW/Spreadsheet-ParseExcel-0.65.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bdcbe69dee77a0882f91588b3a7ccd4a
diff --git a/metadata/md5-cache/dev-perl/Spreadsheet-WriteExcel-2.400.0 b/metadata/md5-cache/dev-perl/Spreadsheet-WriteExcel-2.400.0
index ac501384b44e..1b383a392a42 100644
--- a/metadata/md5-cache/dev-perl/Spreadsheet-WriteExcel-2.400.0
+++ b/metadata/md5-cache/dev-perl/Spreadsheet-WriteExcel-2.400.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Temp dev-perl/Parse-RecDescent >=dev-perl/OLE-StorageLite-0.19 dev-perl/IO-stringy dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JM/JMCNAMARA/Spreadsheet-WriteExcel-2.40.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bdbdea0a85151974081e57b6c3e22b92
diff --git a/metadata/md5-cache/dev-perl/Stat-lsMode-0.500.0-r1 b/metadata/md5-cache/dev-perl/Stat-lsMode-0.500.0-r1
index ec165d1920be..43a7b00b72a7 100644
--- a/metadata/md5-cache/dev-perl/Stat-lsMode-0.500.0-r1
+++ b/metadata/md5-cache/dev-perl/Stat-lsMode-0.500.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MJ/MJD/Stat-lsMode-0.50.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e97ca636a1ea8cb0176d6b646fa8f2bc
diff --git a/metadata/md5-cache/dev-perl/Statistics-Descriptive-Discrete-0.70.0-r1 b/metadata/md5-cache/dev-perl/Statistics-Descriptive-Discrete-0.70.0-r1
index d62c3577230d..3ba4833f3c82 100644
--- a/metadata/md5-cache/dev-perl/Statistics-Descriptive-Discrete-0.70.0-r1
+++ b/metadata/md5-cache/dev-perl/Statistics-Descriptive-Discrete-0.70.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RH/RHETTBULL/Statistics-Descriptive-Discrete-0.07.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8e2d6ab3aeb30b5e8582d6ea94e9712d
diff --git a/metadata/md5-cache/dev-perl/String-Ediff-0.90.0-r1 b/metadata/md5-cache/dev-perl/String-Ediff-0.90.0-r1
index c41256043966..f95c6934dfca 100644
--- a/metadata/md5-cache/dev-perl/String-Ediff-0.90.0-r1
+++ b/metadata/md5-cache/dev-perl/String-Ediff-0.90.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BO/BOXZOU/String-Ediff-0.09.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=30c3f1ad35cae44669342d4892907ae3
diff --git a/metadata/md5-cache/dev-perl/String-Format-1.170.0-r1 b/metadata/md5-cache/dev-perl/String-Format-1.170.0-r1
index 2b3c11a73686..8d36e63babcb 100644
--- a/metadata/md5-cache/dev-perl/String-Format-1.170.0-r1
+++ b/metadata/md5-cache/dev-perl/String-Format-1.170.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DARREN/String-Format-1.17.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f74d44af0fa2ecc86fe1752c074e0551
diff --git a/metadata/md5-cache/dev-perl/String-ShellQuote-1.40.0-r1 b/metadata/md5-cache/dev-perl/String-ShellQuote-1.40.0-r1
index c58e52d49635..e40b579275c4 100644
--- a/metadata/md5-cache/dev-perl/String-ShellQuote-1.40.0-r1
+++ b/metadata/md5-cache/dev-perl/String-ShellQuote-1.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RO/ROSCH/String-ShellQuote-1.04.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=054343885e8187256fc8030f454f4edc
diff --git a/metadata/md5-cache/dev-perl/Sub-Exporter-0.987.0 b/metadata/md5-cache/dev-perl/Sub-Exporter-0.987.0
index 8c633ed59288..0bf7a3661335 100644
--- a/metadata/md5-cache/dev-perl/Sub-Exporter-0.987.0
+++ b/metadata/md5-cache/dev-perl/Sub-Exporter-0.987.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Sub-Install-0.920.0 >=dev-perl/Data-OptList-0.100.0 >=dev-perl/Params-Util-0.140.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-0.987.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b7717c2a349a7fbf48359f170f5fb63c
diff --git a/metadata/md5-cache/dev-perl/Sub-Exporter-ForMethods-0.100.52 b/metadata/md5-cache/dev-perl/Sub-Exporter-ForMethods-0.100.52
index bce4e8220091..881e1e45780c 100644
--- a/metadata/md5-cache/dev-perl/Sub-Exporter-ForMethods-0.100.52
+++ b/metadata/md5-cache/dev-perl/Sub-Exporter-ForMethods-0.100.52
@@ -4,11 +4,11 @@ DESCRIPTION=Helper routines for using Sub::Exporter to build methods
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Sub-Exporter-ForMethods
 IUSE=test
-KEYWORDS=amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils >=dev-perl/Sub-Exporter-0.978.0 dev-perl/Sub-Name dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-ForMethods-0.100052.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=aafea21c96f178be5788cb7739fd06f0
+_md5_=be3e55a67a7fa0aeb63faaf5a9292e08
diff --git a/metadata/md5-cache/dev-perl/Sub-Install-0.928.0 b/metadata/md5-cache/dev-perl/Sub-Install-0.928.0
index 473f010f64a5..0c5f96c9db64 100644
--- a/metadata/md5-cache/dev-perl/Sub-Install-0.928.0
+++ b/metadata/md5-cache/dev-perl/Sub-Install-0.928.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Sub-Install-0.928.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8f0c3c7f8445b43ab8242101f5c67714
diff --git a/metadata/md5-cache/dev-perl/Sub-Override-0.90.0 b/metadata/md5-cache/dev-perl/Sub-Override-0.90.0
index 87065c8b8b97..02689ff9a58d 100644
--- a/metadata/md5-cache/dev-perl/Sub-Override-0.90.0
+++ b/metadata/md5-cache/dev-perl/Sub-Override-0.90.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OV/OVID/Sub-Override-0.09.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=90dadadf12fa3dd02c71f23a4f1a4665
diff --git a/metadata/md5-cache/dev-perl/Switch-2.170.0 b/metadata/md5-cache/dev-perl/Switch-2.170.0
index bddc31a921d9..8b409e36aa7c 100644
--- a/metadata/md5-cache/dev-perl/Switch-2.170.0
+++ b/metadata/md5-cache/dev-perl/Switch-2.170.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Switch-2.17.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=325cfdaafd5d28607afc85b51d33a738
diff --git a/metadata/md5-cache/dev-perl/Symbol-Util-0.20.300-r1 b/metadata/md5-cache/dev-perl/Symbol-Util-0.20.300-r1
index c7fc3e649352..43956ee544ed 100644
--- a/metadata/md5-cache/dev-perl/Symbol-Util-0.20.300-r1
+++ b/metadata/md5-cache/dev-perl/Symbol-Util-0.20.300-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DE/DEXTER/Symbol-Util-0.0203.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8b63d7d1df1fbf8039b25a13dc04b828
diff --git a/metadata/md5-cache/dev-perl/Sys-CPU-0.610.0 b/metadata/md5-cache/dev-perl/Sys-CPU-0.610.0
index 2a82c139c134..9f3b193da8c5 100644
--- a/metadata/md5-cache/dev-perl/Sys-CPU-0.610.0
+++ b/metadata/md5-cache/dev-perl/Sys-CPU-0.610.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MZ/MZSANFORD/Sys-CPU-0.61.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7b2cccfdbfc1ad0b0246ddb8b0110072
diff --git a/metadata/md5-cache/dev-perl/Sys-Statistics-Linux-0.660.0-r1 b/metadata/md5-cache/dev-perl/Sys-Statistics-Linux-0.660.0-r1
index 9298a9b7de1b..4ac55d988d69 100644
--- a/metadata/md5-cache/dev-perl/Sys-Statistics-Linux-0.660.0-r1
+++ b/metadata/md5-cache/dev-perl/Sys-Statistics-Linux-0.660.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/YAML-Syck dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BL/BLOONIX/Sys-Statistics-Linux-0.66.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cba0663f282955e145616da091d06174
diff --git a/metadata/md5-cache/dev-perl/Sys-Syscall-0.250.0-r2 b/metadata/md5-cache/dev-perl/Sys-Syscall-0.250.0-r2
index a51f2f902d01..60ecf23f4a9c 100644
--- a/metadata/md5-cache/dev-perl/Sys-Syscall-0.250.0-r2
+++ b/metadata/md5-cache/dev-perl/Sys-Syscall-0.250.0-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BR/BRADFITZ/Sys-Syscall-0.25.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8cfdd8af77b39c82dd0661dfde49cb99
diff --git a/metadata/md5-cache/dev-perl/Sys-Virt-1.1.2 b/metadata/md5-cache/dev-perl/Sys-Virt-1.1.2
index a68b1b0cd647..3d9d4f25242b 100644
--- a/metadata/md5-cache/dev-perl/Sys-Virt-1.1.2
+++ b/metadata/md5-cache/dev-perl/Sys-Virt-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=app-emulation/libvirt-1.1.2 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANBERR/Sys-Virt-1.1.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9ff20091845ed3a5da7f5d967d321cee
diff --git a/metadata/md5-cache/dev-perl/Sys-Virt-1.2.9 b/metadata/md5-cache/dev-perl/Sys-Virt-1.2.9
index 6c1727e92633..b48a74d05cba 100644
--- a/metadata/md5-cache/dev-perl/Sys-Virt-1.2.9
+++ b/metadata/md5-cache/dev-perl/Sys-Virt-1.2.9
@@ -10,5 +10,5 @@ RDEPEND=>=app-emulation/libvirt-1.2.9 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANBERR/Sys-Virt-1.2.9.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0913f95ddf3698fb7a7eac84d25ccc79
diff --git a/metadata/md5-cache/dev-perl/Taint-Runtime-0.30.0-r1 b/metadata/md5-cache/dev-perl/Taint-Runtime-0.30.0-r1
index 167281599e32..03b7bef26b5c 100644
--- a/metadata/md5-cache/dev-perl/Taint-Runtime-0.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Taint-Runtime-0.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RH/RHANDOM/Taint-Runtime-0.03.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=71b3b9a22f3a66e7f485413aa675243f
diff --git a/metadata/md5-cache/dev-perl/Template-GD-2.660.0-r1 b/metadata/md5-cache/dev-perl/Template-GD-2.660.0-r1
index 69fbe36371ff..196683b8def9 100644
--- a/metadata/md5-cache/dev-perl/Template-GD-2.660.0-r1
+++ b/metadata/md5-cache/dev-perl/Template-GD-2.660.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/GD dev-perl/GDTextUtil dev-perl/GDGraph dev-perl/GD-Graph3d >=d
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AB/ABW/Template-GD-2.66.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=81dbb88d6f95cf25754b80ca558dc9c8
diff --git a/metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.60.0 b/metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.60.0
index 029d6a2c1a74..c6beefedae37 100644
--- a/metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.60.0
+++ b/metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.60.0
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/LaTeX-Driver dev-perl/LaTeX-Encode dev-perl/LaTeX-Table >=dev-p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EI/EINHVERFR/Template-Plugin-Latex-3.06.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9f5ead0f2641f0f23b6ac7f914ba9a54
diff --git a/metadata/md5-cache/dev-perl/Template-Tiny-1.120.0-r1 b/metadata/md5-cache/dev-perl/Template-Tiny-1.120.0-r1
index b65938c3350e..94d34e0cdad1 100644
--- a/metadata/md5-cache/dev-perl/Template-Tiny-1.120.0-r1
+++ b/metadata/md5-cache/dev-perl/Template-Tiny-1.120.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Template-Tiny-1.12.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=16501cd40f46b85526e284f726148e18
diff --git a/metadata/md5-cache/dev-perl/Template-XML-2.170.0-r1 b/metadata/md5-cache/dev-perl/Template-XML-2.170.0-r1
index 8e316439a182..99aa92528e87 100644
--- a/metadata/md5-cache/dev-perl/Template-XML-2.170.0-r1
+++ b/metadata/md5-cache/dev-perl/Template-XML-2.170.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Template-Toolkit-2.15-r1 dev-perl/XML-DOM dev-perl/XML-Parser dev-perl/XML-RSS dev-perl/XML-Simple dev-perl/XML-XPath dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AB/ABW/Template-XML-2.17.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6a0e3a83a65d100b03ab9fc0c2d84cea
diff --git a/metadata/md5-cache/dev-perl/Term-ANSIScreen-1.500.0-r1 b/metadata/md5-cache/dev-perl/Term-ANSIScreen-1.500.0-r1
index 8f2541416a78..c4a3ceff9dc0 100644
--- a/metadata/md5-cache/dev-perl/Term-ANSIScreen-1.500.0-r1
+++ b/metadata/md5-cache/dev-perl/Term-ANSIScreen-1.500.0-r1
@@ -8,5 +8,5 @@ LICENSE=CC0-1.0
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AU/AUDREYT/Term-ANSIScreen-1.50.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=398dc9d77d2d9453cd46f5b2ce23eed2
diff --git a/metadata/md5-cache/dev-perl/Term-ProgressBar-2.210.0 b/metadata/md5-cache/dev-perl/Term-ProgressBar-2.210.0
index b34b2b17f3fb..09678a4f70f9 100644
--- a/metadata/md5-cache/dev-perl/Term-ProgressBar-2.210.0
+++ b/metadata/md5-cache/dev-perl/Term-ProgressBar-2.210.0
@@ -4,11 +4,11 @@ DESCRIPTION=Provide a progress meter on a standard terminal
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Term-ProgressBar
 IUSE=test examples
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Class-MethodMaker-1.20.0 >=dev-perl/TermReadKey-2.140.0 virtual/perl-autodie dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MANWAR/Term-ProgressBar-2.21.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=3df612dacfcc5e5f08df5c7839a48b20
+_md5_=5701f6b5c3f2a3ed5e4e6c3c7b95f625
diff --git a/metadata/md5-cache/dev-perl/Term-ScreenColor-1.200.0-r1 b/metadata/md5-cache/dev-perl/Term-ScreenColor-1.200.0-r1
index a014f8072fbf..abe64949b7e6 100644
--- a/metadata/md5-cache/dev-perl/Term-ScreenColor-1.200.0-r1
+++ b/metadata/md5-cache/dev-perl/Term-ScreenColor-1.200.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=>=dev-perl/Term-Screen-1.30.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RUITTENB/Term-ScreenColor-1.20.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=01b0c4cd9d6953f55f49670ab00024a9
diff --git a/metadata/md5-cache/dev-perl/Term-ShellUI-0.920.0-r1 b/metadata/md5-cache/dev-perl/Term-ShellUI-0.920.0-r1
index 640c5b343506..80fd21b3cb30 100644
--- a/metadata/md5-cache/dev-perl/Term-ShellUI-0.920.0-r1
+++ b/metadata/md5-cache/dev-perl/Term-ShellUI-0.920.0-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-perl/Term-ReadLine-Gnu dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BR/BRONSON/Term-ShellUI-0.92.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=33f5807c0797333388c6ac761341806b
diff --git a/metadata/md5-cache/dev-perl/Test-Assert-0.50.400-r1 b/metadata/md5-cache/dev-perl/Test-Assert-0.50.400-r1
index 8fa0e8866999..8178dd620f59 100644
--- a/metadata/md5-cache/dev-perl/Test-Assert-0.50.400-r1
+++ b/metadata/md5-cache/dev-perl/Test-Assert-0.50.400-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/constant-boolean >=dev-perl/Exception-Base-0.22.01 dev-perl/Symbol-Util dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DE/DEXTER/Test-Assert-0.0504.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ebcefce6da3de73f0f556aa9d11be0ac
diff --git a/metadata/md5-cache/dev-perl/Test-Base-0.880.0 b/metadata/md5-cache/dev-perl/Test-Base-0.880.0
index 6f94ab69af51..02f3f8034247 100644
--- a/metadata/md5-cache/dev-perl/Test-Base-0.880.0
+++ b/metadata/md5-cache/dev-perl/Test-Base-0.880.0
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Filter >=dev-perl/Spiffy-0.400.0 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/Test-Base-0.88.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b364d9f6a8ca68e6c048394793b558fb
diff --git a/metadata/md5-cache/dev-perl/Test-CPAN-Meta-0.250.0 b/metadata/md5-cache/dev-perl/Test-CPAN-Meta-0.250.0
index 825ab1f11bd0..86fade0f2504 100644
--- a/metadata/md5-cache/dev-perl/Test-CPAN-Meta-0.250.0
+++ b/metadata/md5-cache/dev-perl/Test-CPAN-Meta-0.250.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BA/BARBIE/Test-CPAN-Meta-0.25.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e89fe3afe994a520f846ba85129ebece
diff --git a/metadata/md5-cache/dev-perl/Test-CheckDeps-0.10.0 b/metadata/md5-cache/dev-perl/Test-CheckDeps-0.10.0
index b5f22d978228..af8d17092d80 100644
--- a/metadata/md5-cache/dev-perl/Test-CheckDeps-0.10.0
+++ b/metadata/md5-cache/dev-perl/Test-CheckDeps-0.10.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/perl-CPAN-Meta-2.120.920 >=dev-perl/CPAN-Meta-Check-0.7.0 >=vi
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Test-CheckDeps-0.010.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d2bdf211c577283f0df68a20455e6568
diff --git a/metadata/md5-cache/dev-perl/Test-Class-0.500.0 b/metadata/md5-cache/dev-perl/Test-Class-0.500.0
index 97ffb1866fd5..235a5c922ec9 100644
--- a/metadata/md5-cache/dev-perl/Test-Class-0.500.0
+++ b/metadata/md5-cache/dev-perl/Test-Class-0.500.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/perl-Attribute-Handlers-0.770.0 virtual/perl-Carp virtual/perl
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Test-Class-0.50.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ac6f5c5229f9d8d7cfac4c30bc8bdbe7
diff --git a/metadata/md5-cache/dev-perl/Test-Command-Simple-0.50.0 b/metadata/md5-cache/dev-perl/Test-Command-Simple-0.50.0
index 9b59ed3dbf96..aa552694396d 100644
--- a/metadata/md5-cache/dev-perl/Test-Command-Simple-0.50.0
+++ b/metadata/md5-cache/dev-perl/Test-Command-Simple-0.50.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DM/DMCBRIDE/Test-Command-Simple-0.05.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=381594a089b4d03f056f500ff70aa8b0
diff --git a/metadata/md5-cache/dev-perl/Test-DistManifest-1.14.0 b/metadata/md5-cache/dev-perl/Test-DistManifest-1.14.0
index 5df47ec0d33a..c5c43227077d 100644
--- a/metadata/md5-cache/dev-perl/Test-DistManifest-1.14.0
+++ b/metadata/md5-cache/dev-perl/Test-DistManifest-1.14.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-ExtUtils-Manifest virtual/perl-File-Spec >=dev-perl/Module-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Test-DistManifest-1.014.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2b50ab0ff7894b8994017291d03b26fe
diff --git a/metadata/md5-cache/dev-perl/Test-Distribution-2.0.0-r1 b/metadata/md5-cache/dev-perl/Test-Distribution-2.0.0-r1
index b5190f4ce992..cb2bda28e501 100644
--- a/metadata/md5-cache/dev-perl/Test-Distribution-2.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Test-Distribution-2.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Pod-Coverage-0.20 >=dev-perl/File-Find-Rule-0.30 dev-perl/Test-Pod-Coverage >=virtual/perl-Module-CoreList-2.17 >=dev-perl/Test-Pod-1.26 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SR/SRSHAH/Test-Distribution-2.00.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a0c59a3bd21df4f77753a00914482edf
diff --git a/metadata/md5-cache/dev-perl/Test-LongString-0.170.0 b/metadata/md5-cache/dev-perl/Test-LongString-0.170.0
index 9b4d80dd8cf1..d06ab27db0f0 100644
--- a/metadata/md5-cache/dev-perl/Test-LongString-0.170.0
+++ b/metadata/md5-cache/dev-perl/Test-LongString-0.170.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Test-Simple dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RG/RGARCIA/Test-LongString-0.17.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bce8490f7b345beeabd04e080013a4c8
diff --git a/metadata/md5-cache/dev-perl/Test-Manifest-2.20.0 b/metadata/md5-cache/dev-perl/Test-Manifest-2.20.0
index 29a126f0ea74..4ebcb02b0ce5 100644
--- a/metadata/md5-cache/dev-perl/Test-Manifest-2.20.0
+++ b/metadata/md5-cache/dev-perl/Test-Manifest-2.20.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/perl-Test-Simple-0.950.0 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Test-Manifest-2.02.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=776eb884cf6b78ec1aaf68c750e3bd8c
diff --git a/metadata/md5-cache/dev-perl/Test-Most-0.340.0 b/metadata/md5-cache/dev-perl/Test-Most-0.340.0
index 8a4b210947ab..fbbba8704616 100644
--- a/metadata/md5-cache/dev-perl/Test-Most-0.340.0
+++ b/metadata/md5-cache/dev-perl/Test-Most-0.340.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Exception-Class-1.140.0 >=dev-perl/Test-Warn-0.230.0 >=dev-perl/Test-Deep-0.106 >=dev-perl/Test-Differences-0.610.0 >=dev-perl/Test-Exception-0.310.0 >=virtual/perl-Test-Harness-3.210.0 >=virtual/perl-Test-Simple-0.88 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OV/OVID/Test-Most-0.34.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=30af2652a9991375db83a0f3157d5b7e
diff --git a/metadata/md5-cache/dev-perl/Test-NoWarnings-1.40.0-r3 b/metadata/md5-cache/dev-perl/Test-NoWarnings-1.40.0-r3
index 70a4f4f127e4..73789bce56e5 100644
--- a/metadata/md5-cache/dev-perl/Test-NoWarnings-1.40.0-r3
+++ b/metadata/md5-cache/dev-perl/Test-NoWarnings-1.40.0-r3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/perl-Test-Simple dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Test-NoWarnings-1.04.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cbed1bbe6340d5c591a713ea3253fc84
diff --git a/metadata/md5-cache/dev-perl/Test-Pod-1.510.0 b/metadata/md5-cache/dev-perl/Test-Pod-1.510.0
index 9853e93c03d1..cfc80c772fc7 100644
--- a/metadata/md5-cache/dev-perl/Test-Pod-1.510.0
+++ b/metadata/md5-cache/dev-perl/Test-Pod-1.510.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/perl-Pod-Simple-3.50.0 >=virtual/perl-Test-Simple-0.620.0 dev-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Test-Pod-1.51.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cd93518b924f89a8e01cfea11315e260
diff --git a/metadata/md5-cache/dev-perl/Test-Taint-1.60.0-r1 b/metadata/md5-cache/dev-perl/Test-Taint-1.60.0-r1
index efc3d721828b..a9374af911d7 100644
--- a/metadata/md5-cache/dev-perl/Test-Taint-1.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Test-Taint-1.60.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/Test-Taint-1.06.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=abfa5a5ed5f5c1e836afed50866e6afc
diff --git a/metadata/md5-cache/dev-perl/Test-Unit-Lite-0.120.200-r1 b/metadata/md5-cache/dev-perl/Test-Unit-Lite-0.120.200-r1
index c1f1cfc47236..b6e8c2683a02 100644
--- a/metadata/md5-cache/dev-perl/Test-Unit-Lite-0.120.200-r1
+++ b/metadata/md5-cache/dev-perl/Test-Unit-Lite-0.120.200-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DE/DEXTER/Test-Unit-Lite-0.1202.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b3841a9527b0ff80ca5b4077cbd6ed4c
diff --git a/metadata/md5-cache/dev-perl/Text-CSV-Simple-1.0.0-r1 b/metadata/md5-cache/dev-perl/Text-CSV-Simple-1.0.0-r1
index e60f6987f7a8..3e7503b550a0 100644
--- a/metadata/md5-cache/dev-perl/Text-CSV-Simple-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-CSV-Simple-1.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Text-CSV_XS dev-perl/Class-Trigger dev-perl/File-Slurp dev-lang
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/Text-CSV-Simple-1.00.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ad533bd7bcd26c2cc6b2eee70d671128
diff --git a/metadata/md5-cache/dev-perl/Text-CharWidth-0.40.0-r1 b/metadata/md5-cache/dev-perl/Text-CharWidth-0.40.0-r1
index b361f108e624..d58a10fd6299 100644
--- a/metadata/md5-cache/dev-perl/Text-CharWidth-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-CharWidth-0.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KU/KUBOTA/Text-CharWidth-0.04.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f6848f83f24c34464c3ad60d5763cfb1
diff --git a/metadata/md5-cache/dev-perl/Text-German-0.60.0-r1 b/metadata/md5-cache/dev-perl/Text-German-0.60.0-r1
index d4534585b364..e13f106749bc 100644
--- a/metadata/md5-cache/dev-perl/Text-German-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-German-0.60.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/U/UL/ULPFR/Text-German-0.06.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=31fbc53e90b619d146bb0141ebc581e8
diff --git a/metadata/md5-cache/dev-perl/Text-Glob-0.90.0-r1 b/metadata/md5-cache/dev-perl/Text-Glob-0.90.0-r1
index 51fb37ce4d04..2f461bd1b43b 100644
--- a/metadata/md5-cache/dev-perl/Text-Glob-0.90.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-Glob-0.90.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Text-Glob-0.09.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2e55330568ee61f6f7c9c776a92d60c4
diff --git a/metadata/md5-cache/dev-perl/Text-LevenshteinXS-0.30.0-r1 b/metadata/md5-cache/dev-perl/Text-LevenshteinXS-0.30.0-r1
index f7799925ba0d..4e15de245c27 100644
--- a/metadata/md5-cache/dev-perl/Text-LevenshteinXS-0.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-LevenshteinXS-0.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JG/JGOLDBERG/Text-LevenshteinXS-0.03.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fe36102e9a822a74031bd9786a5cd332
diff --git a/metadata/md5-cache/dev-perl/Text-Markdown-1.0.31-r1 b/metadata/md5-cache/dev-perl/Text-Markdown-1.0.31-r1
index 6dff06cb0e60..1e4ec10dd815 100644
--- a/metadata/md5-cache/dev-perl/Text-Markdown-1.0.31-r1
+++ b/metadata/md5-cache/dev-perl/Text-Markdown-1.0.31-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Convert MultiMarkdown syntax to (X)HTML
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Text-Markdown
 IUSE=test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-Text-Balanced dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BO/BOBTFISH/Text-Markdown-1.000031.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1155ccbb5bcb4d5e29028a9010462690
+_md5_=ace850d66e3b19c84ef8374fbd2d558e
diff --git a/metadata/md5-cache/dev-perl/Text-Netstring-0.70.0-r1 b/metadata/md5-cache/dev-perl/Text-Netstring-0.70.0-r1
index 3a803f9b63af..54291588fad6 100644
--- a/metadata/md5-cache/dev-perl/Text-Netstring-0.70.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-Netstring-0.70.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JR/JRAFTERY/Text-Netstring-0.07.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0b215dfe5ef8e3565d63ad2280c146f5
diff --git a/metadata/md5-cache/dev-perl/Text-Password-Pronounceable-0.300.0-r1 b/metadata/md5-cache/dev-perl/Text-Password-Pronounceable-0.300.0-r1
index bf9a96125f98..92e679336348 100644
--- a/metadata/md5-cache/dev-perl/Text-Password-Pronounceable-0.300.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-Password-Pronounceable-0.300.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TS/TSIBLEY/Text-Password-Pronounceable-0.30.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=560b24f9cd224701f001c775cc7c0594
diff --git a/metadata/md5-cache/dev-perl/Text-Patch-1.800.0-r1 b/metadata/md5-cache/dev-perl/Text-Patch-1.800.0-r1
index fb73fe565db1..b358816e2d71 100644
--- a/metadata/md5-cache/dev-perl/Text-Patch-1.800.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-Patch-1.800.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/Text-Diff dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CA/CADE/Text-Patch-1.8.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9627a96092b868b4225bd2ccb85312dd
diff --git a/metadata/md5-cache/dev-perl/Text-Reform-1.200.0-r1 b/metadata/md5-cache/dev-perl/Text-Reform-1.200.0-r1
index ec3b977d3496..5934a080a72a 100644
--- a/metadata/md5-cache/dev-perl/Text-Reform-1.200.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-Reform-1.200.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Text-Reform-1.20.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5e49dc0090e4974c8d3b2d7efa385133
diff --git a/metadata/md5-cache/dev-perl/Text-Roman-3.500.0 b/metadata/md5-cache/dev-perl/Text-Roman-3.500.0
index 71e7b35dfadd..1936d4801631 100644
--- a/metadata/md5-cache/dev-perl/Text-Roman-3.500.0
+++ b/metadata/md5-cache/dev-perl/Text-Roman-3.500.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SY/SYP/Text-Roman-3.5.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=82975ee2ef8660dd07d8aca1c1226af2
diff --git a/metadata/md5-cache/dev-perl/Text-Shellwords-1.80.0-r1 b/metadata/md5-cache/dev-perl/Text-Shellwords-1.80.0-r1
index aac7d3a24628..9819be605a6b 100644
--- a/metadata/md5-cache/dev-perl/Text-Shellwords-1.80.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-Shellwords-1.80.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/Text-Shellwords-1.08.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=df7143f8ed0731e41c2c8361c86203cc
diff --git a/metadata/md5-cache/dev-perl/Text-Unaccent-1.80.0-r1 b/metadata/md5-cache/dev-perl/Text-Unaccent-1.80.0-r1
index 3b0d191f5a59..fce524d31e97 100644
--- a/metadata/md5-cache/dev-perl/Text-Unaccent-1.80.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-Unaccent-1.80.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDACHARY/Text-Unaccent-1.08.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=716ffdeb093f8f0e6932631d0f2aca4e
diff --git a/metadata/md5-cache/dev-perl/Text-WikiFormat-0.810.0 b/metadata/md5-cache/dev-perl/Text-WikiFormat-0.810.0
index 30619425346d..8cc9abd0ed02 100644
--- a/metadata/md5-cache/dev-perl/Text-WikiFormat-0.810.0
+++ b/metadata/md5-cache/dev-perl/Text-WikiFormat-0.810.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/URI virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CY/CYCLES/Text-WikiFormat-0.81.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=450718cc359f0847fe1d8146a6f5834b
diff --git a/metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r1 b/metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r1
index 6d4d253e2732..5832914b1685 100644
--- a/metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Text-CharWidth dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KU/KUBOTA/Text-WrapI18N-0.06.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fc0037b6ae76714b9ed2214587d4bf8c
diff --git a/metadata/md5-cache/dev-perl/Text-vFile-asData-0.80.0 b/metadata/md5-cache/dev-perl/Text-vFile-asData-0.80.0
index da5d5ee738dc..631fa852e9ff 100644
--- a/metadata/md5-cache/dev-perl/Text-vFile-asData-0.80.0
+++ b/metadata/md5-cache/dev-perl/Text-vFile-asData-0.80.0
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Class-Accessor-Chained dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Text-vFile-asData-0.08.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7dc6db2c2d95e85f3cc57765c83e5d5c
diff --git a/metadata/md5-cache/dev-perl/Tie-Array-Sorted-1.410.0-r1 b/metadata/md5-cache/dev-perl/Tie-Array-Sorted-1.410.0-r1
index 145273e6fc33..0852116802cb 100644
--- a/metadata/md5-cache/dev-perl/Tie-Array-Sorted-1.410.0-r1
+++ b/metadata/md5-cache/dev-perl/Tie-Array-Sorted-1.410.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/Tie-Array-Sorted-1.41.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0991a15b13842f238393c3f98b95513d
diff --git a/metadata/md5-cache/dev-perl/Tie-CPHash-2.0.0 b/metadata/md5-cache/dev-perl/Tie-CPHash-2.0.0
index 6f9f42552a3e..2fd82f06efab 100644
--- a/metadata/md5-cache/dev-perl/Tie-CPHash-2.0.0
+++ b/metadata/md5-cache/dev-perl/Tie-CPHash-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJM/Tie-CPHash-2.000.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2bc27b74a264ab515be5ffb6e8d230d5
diff --git a/metadata/md5-cache/dev-perl/Tie-Cache-LRU-20150301.0.0 b/metadata/md5-cache/dev-perl/Tie-Cache-LRU-20150301.0.0
index 35538633ece3..e5c174eaa1f2 100644
--- a/metadata/md5-cache/dev-perl/Tie-Cache-LRU-20150301.0.0
+++ b/metadata/md5-cache/dev-perl/Tie-Cache-LRU-20150301.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/enum dev-perl/Carp-Assert dev-perl/Class-Virtual dev-perl/Class
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHWERN/Tie-Cache-LRU-20150301.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7613cab61d45583ac61ad9863e1bacce
diff --git a/metadata/md5-cache/dev-perl/Tie-Cache-LRU-Expires-0.550.0-r1 b/metadata/md5-cache/dev-perl/Tie-Cache-LRU-Expires-0.550.0-r1
index b470b1b1b8a8..fbef322deffe 100644
--- a/metadata/md5-cache/dev-perl/Tie-Cache-LRU-Expires-0.550.0-r1
+++ b/metadata/md5-cache/dev-perl/Tie-Cache-LRU-Expires-0.550.0-r1
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=dev-perl/Tie-Cache-LRU dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OE/OESTERHOL/Tie-Cache-LRU-Expires-0.55.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e728243602768548412d544ba4d2048a
diff --git a/metadata/md5-cache/dev-perl/Tie-EncryptedHash-1.240.0-r1 b/metadata/md5-cache/dev-perl/Tie-EncryptedHash-1.240.0-r1
index b9df78d590bc..d7bc5e9011cc 100644
--- a/metadata/md5-cache/dev-perl/Tie-EncryptedHash-1.240.0-r1
+++ b/metadata/md5-cache/dev-perl/Tie-EncryptedHash-1.240.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Crypt-Blowfish dev-perl/Crypt-DES dev-perl/Crypt-CBC dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VI/VIPUL/Tie-EncryptedHash-1.24.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=81bebfc4e7ee2b40a3097297e6ca4cd7
diff --git a/metadata/md5-cache/dev-perl/Tie-Hash-Method-0.20.0 b/metadata/md5-cache/dev-perl/Tie-Hash-Method-0.20.0
index 2af99f774e98..af9f2f2d1447 100644
--- a/metadata/md5-cache/dev-perl/Tie-Hash-Method-0.20.0
+++ b/metadata/md5-cache/dev-perl/Tie-Hash-Method-0.20.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Y/YV/YVES/Tie-Hash-Method-0.02.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1cd9780395d65b7ff1f68537ade7705a
diff --git a/metadata/md5-cache/dev-perl/Tie-IxHash-1.230.0 b/metadata/md5-cache/dev-perl/Tie-IxHash-1.230.0
index 23f7fa9b834d..a393be2697d1 100644
--- a/metadata/md5-cache/dev-perl/Tie-IxHash-1.230.0
+++ b/metadata/md5-cache/dev-perl/Tie-IxHash-1.230.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Tie-IxHash-1.23.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6a524678e9372c24654f71e3fa318154
diff --git a/metadata/md5-cache/dev-perl/Tie-ShadowHash-1.0.0-r1 b/metadata/md5-cache/dev-perl/Tie-ShadowHash-1.0.0-r1
index f5b71384c0ff..2b973e9c8820 100644
--- a/metadata/md5-cache/dev-perl/Tie-ShadowHash-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Tie-ShadowHash-1.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RR/RRA/Tie-ShadowHash-1.00.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=14d81b664a83df40e45b05aa16991592
diff --git a/metadata/md5-cache/dev-perl/Tie-StrictHash-1.0.0-r1 b/metadata/md5-cache/dev-perl/Tie-StrictHash-1.0.0-r1
index 30b0f8b42b14..19498897496f 100644
--- a/metadata/md5-cache/dev-perl/Tie-StrictHash-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Tie-StrictHash-1.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KV/KVAIL/Tie-StrictHash-1.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7cd8e15928f794a71061c6e1b8f3f64b
diff --git a/metadata/md5-cache/dev-perl/Tie-Sub-1.1.0-r1 b/metadata/md5-cache/dev-perl/Tie-Sub-1.1.0-r1
index 3ce2be0144dd..7240941a4748 100644
--- a/metadata/md5-cache/dev-perl/Tie-Sub-1.1.0-r1
+++ b/metadata/md5-cache/dev-perl/Tie-Sub-1.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Params-Validate dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/ST/STEFFENW/Tie-Sub-1.001.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b41c1d018eefca992e5c48a6450c65c1
diff --git a/metadata/md5-cache/dev-perl/Tie-ToObject-0.30.0-r1 b/metadata/md5-cache/dev-perl/Tie-ToObject-0.30.0-r1
index 17104b92aedb..b0180574087b 100644
--- a/metadata/md5-cache/dev-perl/Tie-ToObject-0.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Tie-ToObject-0.30.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NU/NUFFIN/Tie-ToObject-0.03.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bd9154c9841596788d5acabee1ae96da
diff --git a/metadata/md5-cache/dev-perl/Time-Period-1.250.0 b/metadata/md5-cache/dev-perl/Time-Period-1.250.0
index ba84df379fcb..e1c0c7d14797 100644
--- a/metadata/md5-cache/dev-perl/Time-Period-1.250.0
+++ b/metadata/md5-cache/dev-perl/Time-Period-1.250.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PB/PBOYD/Time-Period-1.25.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=123d0c468bd4c3bc4bf0e1c36492c840
diff --git a/metadata/md5-cache/dev-perl/Time-Piece-MySQL-0.60.0-r1 b/metadata/md5-cache/dev-perl/Time-Piece-MySQL-0.60.0-r1
index 1fc79db62bcb..1166a5acf794 100644
--- a/metadata/md5-cache/dev-perl/Time-Piece-MySQL-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Time-Piece-MySQL-0.60.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Time-Piece-1.15 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KASEI/Time-Piece-MySQL-0.06.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ae2581723ece021f75efd98cbd083043
diff --git a/metadata/md5-cache/dev-perl/Time-Stopwatch-1.0.0 b/metadata/md5-cache/dev-perl/Time-Stopwatch-1.0.0
index edfd1dc03a84..3b5eea2a7851 100644
--- a/metadata/md5-cache/dev-perl/Time-Stopwatch-1.0.0
+++ b/metadata/md5-cache/dev-perl/Time-Stopwatch-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IL/ILTZU/Time-Stopwatch-1.00.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=17d808bcffd0197e235eab38adeef1e1
diff --git a/metadata/md5-cache/dev-perl/TimeDate-2.300.0 b/metadata/md5-cache/dev-perl/TimeDate-2.300.0
index d5bd3986eec9..36ffffe341b9 100644
--- a/metadata/md5-cache/dev-perl/TimeDate-2.300.0
+++ b/metadata/md5-cache/dev-perl/TimeDate-2.300.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GB/GBARR/TimeDate-2.30.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bf2fc1b84c2902d6acedd1dd72db64c4
diff --git a/metadata/md5-cache/dev-perl/Tk-804.33.0 b/metadata/md5-cache/dev-perl/Tk-804.33.0
index 61306a07327d..0b33f744ca04 100644
--- a/metadata/md5-cache/dev-perl/Tk-804.33.0
+++ b/metadata/md5-cache/dev-perl/Tk-804.33.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ ) tcltk BSD
 RDEPEND=media-libs/freetype >=media-libs/libpng-1.4:0 virtual/jpeg x11-libs/libX11 x11-libs/libXft dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SR/SREZIC/Tk-804.033.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fc9a83344b12185fbe9380e3de62d6bb
diff --git a/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r1 b/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r1
index 6789244fd8e6..96b96b6970d1 100644
--- a/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r1
+++ b/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Tk dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DU/DUNNIGANJ/Tk-CursorControl-0.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e4c34b29836f7aa3a2eead0b9e468430
diff --git a/metadata/md5-cache/dev-perl/Tk-JPEG-Lite-2.14.30-r1 b/metadata/md5-cache/dev-perl/Tk-JPEG-Lite-2.14.30-r1
index 477817e87c11..f7717ce338e5 100644
--- a/metadata/md5-cache/dev-perl/Tk-JPEG-Lite-2.14.30-r1
+++ b/metadata/md5-cache/dev-perl/Tk-JPEG-Lite-2.14.30-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/jpeg dev-perl/Tk dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SR/SREZIC/Tk-JPEG-Lite-2.01403.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=39de7a9d0c6b527e259de79c8d154e31
diff --git a/metadata/md5-cache/dev-perl/Tk-TableMatrix-1.230.0-r1 b/metadata/md5-cache/dev-perl/Tk-TableMatrix-1.230.0-r1
index 6db567dc0cc5..2d5887a4ba0f 100644
--- a/metadata/md5-cache/dev-perl/Tk-TableMatrix-1.230.0-r1
+++ b/metadata/md5-cache/dev-perl/Tk-TableMatrix-1.230.0-r1
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=dev-perl/Tk dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CE/CERNEY/Tk-TableMatrix-1.23.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=57b1f131027381de380ca835a555f1a5
diff --git a/metadata/md5-cache/dev-perl/Tk-TableMatrix-1.230.0-r2 b/metadata/md5-cache/dev-perl/Tk-TableMatrix-1.230.0-r2
index 996c559faf0b..b0d04997ad65 100644
--- a/metadata/md5-cache/dev-perl/Tk-TableMatrix-1.230.0-r2
+++ b/metadata/md5-cache/dev-perl/Tk-TableMatrix-1.230.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Create and manipulate tables in Perl + Tk
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Tk-TableMatrix
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86
 LICENSE=Artistic
 RDEPEND=dev-perl/Tk dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CE/CERNEY/Tk-TableMatrix-1.23.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=0192aae0c9caf9c54a0eb66c1fb9a7bf
+_md5_=3c24500880a1f4117b13f8b5a05de26d
diff --git a/metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.403.280 b/metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.403.280
index 775a0086c0cc..a9efa1174dd0 100644
--- a/metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.403.280
+++ b/metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.403.280
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHROMATIC/UNIVERSAL-can-1.20140328.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0eb13dcebd68f8055a8027fb5dc47055
diff --git a/metadata/md5-cache/dev-perl/UNIVERSAL-moniker-0.80.0-r1 b/metadata/md5-cache/dev-perl/UNIVERSAL-moniker-0.80.0-r1
index 4010fb6874fd..0c673f413e5f 100644
--- a/metadata/md5-cache/dev-perl/UNIVERSAL-moniker-0.80.0-r1
+++ b/metadata/md5-cache/dev-perl/UNIVERSAL-moniker-0.80.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KASEI/UNIVERSAL-moniker-0.08.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1ba3382f066a65255e5002eed925e5e3
diff --git a/metadata/md5-cache/dev-perl/UNIVERSAL-require-0.180.0 b/metadata/md5-cache/dev-perl/UNIVERSAL-require-0.180.0
index 86e3d6b2bccd..2d1669f6cc43 100644
--- a/metadata/md5-cache/dev-perl/UNIVERSAL-require-0.180.0
+++ b/metadata/md5-cache/dev-perl/UNIVERSAL-require-0.180.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/UNIVERSAL-require-0.18.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=45c0d1c071a5a7c03a795f10f1aa1a25
diff --git a/metadata/md5-cache/dev-perl/UUID-Tiny-1.40.0 b/metadata/md5-cache/dev-perl/UUID-Tiny-1.40.0
index 5e5149680bf6..e4b58b0ea51e 100644
--- a/metadata/md5-cache/dev-perl/UUID-Tiny-1.40.0
+++ b/metadata/md5-cache/dev-perl/UUID-Tiny-1.40.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CA/CAUGUSTIN/UUID-Tiny-1.04.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0926fb018eb022902b19f4125f3fa1ee
diff --git a/metadata/md5-cache/dev-perl/Unicode-EastAsianWidth-1.330.0-r1 b/metadata/md5-cache/dev-perl/Unicode-EastAsianWidth-1.330.0-r1
index 03fdec372ec2..943c935b529a 100644
--- a/metadata/md5-cache/dev-perl/Unicode-EastAsianWidth-1.330.0-r1
+++ b/metadata/md5-cache/dev-perl/Unicode-EastAsianWidth-1.330.0-r1
@@ -8,5 +8,5 @@ LICENSE=CC0-1.0
 RDEPEND=virtual/perl-File-Spec dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AU/AUDREYT/Unicode-EastAsianWidth-1.33.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=794f45a3bfe52da684cd8e3d28b6e322
diff --git a/metadata/md5-cache/dev-perl/Unicode-Map-0.112.0-r1 b/metadata/md5-cache/dev-perl/Unicode-Map-0.112.0-r1
index 65f4cfbf427a..6c89f59bdd6b 100644
--- a/metadata/md5-cache/dev-perl/Unicode-Map-0.112.0-r1
+++ b/metadata/md5-cache/dev-perl/Unicode-Map-0.112.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHWARTZ/Unicode-Map-0.112.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2ebee7c532b35fe002cbd46f21c41c36
diff --git a/metadata/md5-cache/dev-perl/Unicode-Map8-0.130.0 b/metadata/md5-cache/dev-perl/Unicode-Map8-0.130.0
index 822f2c139e1d..3cc501104314 100644
--- a/metadata/md5-cache/dev-perl/Unicode-Map8-0.130.0
+++ b/metadata/md5-cache/dev-perl/Unicode-Map8-0.130.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Unicode-String-2.06 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Unicode-Map8-0.13.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0048d86b134e3ffda437626ae080b937
diff --git a/metadata/md5-cache/dev-perl/Unicode-String-2.100.0 b/metadata/md5-cache/dev-perl/Unicode-String-2.100.0
index 5d490926b28e..a713b97417a5 100644
--- a/metadata/md5-cache/dev-perl/Unicode-String-2.100.0
+++ b/metadata/md5-cache/dev-perl/Unicode-String-2.100.0
@@ -3,10 +3,10 @@ DEPEND=>=virtual/perl-MIME-Base64-2.11 dev-lang/perl
 DESCRIPTION=String manipulation for Unicode strings
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Unicode-String
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-MIME-Base64-2.11 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/GAAS/Unicode-String-2.10.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=10c6f79c39668558ff2bca41f4688135
+_md5_=069f95c99e65096255906cab124da1a5
diff --git a/metadata/md5-cache/dev-perl/Unicode-UTF8simple-1.60.0 b/metadata/md5-cache/dev-perl/Unicode-UTF8simple-1.60.0
index 4fd12841f9b4..d9ca73c28c24 100644
--- a/metadata/md5-cache/dev-perl/Unicode-UTF8simple-1.60.0
+++ b/metadata/md5-cache/dev-perl/Unicode-UTF8simple-1.60.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GU/GUS/Unicode-UTF8simple-1.06.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5059ae0cf4b519840db5a2e905ee4a45
diff --git a/metadata/md5-cache/dev-perl/WWW-Curl-4.170.0 b/metadata/md5-cache/dev-perl/WWW-Curl-4.170.0
index d7a403474645..8372f3558388 100644
--- a/metadata/md5-cache/dev-perl/WWW-Curl-4.170.0
+++ b/metadata/md5-cache/dev-perl/WWW-Curl-4.170.0
@@ -8,5 +8,5 @@ LICENSE=|| ( MPL-1.0 MPL-1.1 MIT )
 RDEPEND=net-misc/curl dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SZ/SZBALINT/WWW-Curl-4.17.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=68b6cdaf5648c4439260fb1ea9f7f230
diff --git a/metadata/md5-cache/dev-perl/WattsUp-Daemon-0.4-r1 b/metadata/md5-cache/dev-perl/WattsUp-Daemon-0.4-r1
index 6e77045ee9c5..0d2440597755 100644
--- a/metadata/md5-cache/dev-perl/WattsUp-Daemon-0.4-r1
+++ b/metadata/md5-cache/dev-perl/WattsUp-Daemon-0.4-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=dev-perl/Device-SerialPort dev-perl/Time-TAI64 virtual/perl-Time-HiRes dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/wattsup-daemon/WattsUp-Daemon-0.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=87f360364eb391ffc1d036516c802cbb
diff --git a/metadata/md5-cache/dev-perl/WeakRef-0.10.0-r1 b/metadata/md5-cache/dev-perl/WeakRef-0.10.0-r1
index df00c38219c3..c7da671d1dc8 100644
--- a/metadata/md5-cache/dev-perl/WeakRef-0.10.0-r1
+++ b/metadata/md5-cache/dev-perl/WeakRef-0.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LU/LUKKA/WeakRef-0.01.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a0124175b6ec59ca547e53dd35f90236
diff --git a/metadata/md5-cache/dev-perl/WebService-Linode-0.28.0 b/metadata/md5-cache/dev-perl/WebService-Linode-0.28.0
index 571f7f7a7755..0de8011a5786 100644
--- a/metadata/md5-cache/dev-perl/WebService-Linode-0.28.0
+++ b/metadata/md5-cache/dev-perl/WebService-Linode-0.28.0
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/JSON dev-perl/libwww-perl dev-perl/LWP-Protocol-https dev-lang/
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKEGRB/WebService-Linode-0.28.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3271ccb797b503ca3945d42d047c87c0
diff --git a/metadata/md5-cache/dev-perl/X11-FreeDesktop-DesktopEntry-0.40.0-r1 b/metadata/md5-cache/dev-perl/X11-FreeDesktop-DesktopEntry-0.40.0-r1
index d07d4f9acf7f..7601b10cd653 100644
--- a/metadata/md5-cache/dev-perl/X11-FreeDesktop-DesktopEntry-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/X11-FreeDesktop-DesktopEntry-0.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GB/GBROWN/X11-FreeDesktop-DesktopEntry-0.04.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e4dbce2ecf5c9a3ebf772ca79f3a136a
diff --git a/metadata/md5-cache/dev-perl/X11-Protocol-0.560.0-r1 b/metadata/md5-cache/dev-perl/X11-Protocol-0.560.0-r1
index cecb097ddd43..81a1eaee89f0 100644
--- a/metadata/md5-cache/dev-perl/X11-Protocol-0.560.0-r1
+++ b/metadata/md5-cache/dev-perl/X11-Protocol-0.560.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ ) MIT
 RDEPEND=x11-libs/libXrender x11-libs/libXext dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SM/SMCCAM/X11-Protocol-0.56.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=70e198c2a512223f7e0802cb0e290f3d
diff --git a/metadata/md5-cache/dev-perl/X11-XCB-0.170.0-r1 b/metadata/md5-cache/dev-perl/X11-XCB-0.170.0-r1
index 03536c293864..51af87c5e19e 100644
--- a/metadata/md5-cache/dev-perl/X11-XCB-0.170.0-r1
+++ b/metadata/md5-cache/dev-perl/X11-XCB-0.170.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Perl bindings for libxcb
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/X11-XCB
 IUSE=test test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Data-Dump dev-perl/Mouse dev-perl/MouseX-NativeTraits dev-perl/Try-Tiny dev-perl/XML-Descent dev-perl/XML-Simple >=virtual/perl-XSLoader-0.20.0 >=x11-libs/libxcb-1.2 x11-libs/xcb-util x11-libs/xcb-util-wm dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSTPLBG/X11-XCB-0.17.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=524b623dbf0fed9b0171e14555c42027
+_md5_=06932106228d99af18d9adaf2b687a1f
diff --git a/metadata/md5-cache/dev-perl/X500-DN-0.290.0-r1 b/metadata/md5-cache/dev-perl/X500-DN-0.290.0-r1
index 6ef963123695..d05cfba1ad61 100644
--- a/metadata/md5-cache/dev-perl/X500-DN-0.290.0-r1
+++ b/metadata/md5-cache/dev-perl/X500-DN-0.290.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Parse-RecDescent dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJOOP/X500-DN-0.29.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=da74f30a64272ff26f71a94b1cc92e8e
diff --git a/metadata/md5-cache/dev-perl/XML-DTDParser-2.10.0-r1 b/metadata/md5-cache/dev-perl/XML-DTDParser-2.10.0-r1
index 85039c75e7c1..a98778efae28 100644
--- a/metadata/md5-cache/dev-perl/XML-DTDParser-2.10.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-DTDParser-2.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JE/JENDA/XML-DTDParser-2.01.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=55833b041a3d1b6912fc9143f012da7a
diff --git a/metadata/md5-cache/dev-perl/XML-Descent-1.40.0 b/metadata/md5-cache/dev-perl/XML-Descent-1.40.0
index 96ab02d3440e..b20c2d018886 100644
--- a/metadata/md5-cache/dev-perl/XML-Descent-1.40.0
+++ b/metadata/md5-cache/dev-perl/XML-Descent-1.40.0
@@ -4,11 +4,11 @@ DESCRIPTION=Recursive decent XML parsing
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/XML-Descent
 IUSE=test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/XML-TokeParser dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AN/ANDYA/XML-Descent-1.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=82bf69c3ca56162e8f3062add4b1c1df
+_md5_=cb48d7494deb38a0f80bf45c67f1e041
diff --git a/metadata/md5-cache/dev-perl/XML-Dumper-0.810.0-r1 b/metadata/md5-cache/dev-perl/XML-Dumper-0.810.0-r1
index ea0d843ec2f8..d9e46f8cd147 100644
--- a/metadata/md5-cache/dev-perl/XML-Dumper-0.810.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-Dumper-0.810.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.16 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKEWONG/XML-Dumper-0.81.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=370752bc1cbff9c46b882f7a6b9440c0
diff --git a/metadata/md5-cache/dev-perl/XML-Elemental-2.110.0-r1 b/metadata/md5-cache/dev-perl/XML-Elemental-2.110.0-r1
index c1725e97517f..997748a7db0d 100644
--- a/metadata/md5-cache/dev-perl/XML-Elemental-2.110.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-Elemental-2.110.0-r1
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/Class-Accessor dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TI/TIMA/XML-Elemental-2.11.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8e3b1712c8614fdbe9eab6f213ccb5a3
diff --git a/metadata/md5-cache/dev-perl/XML-Filter-BufferText-1.10.0-r1 b/metadata/md5-cache/dev-perl/XML-Filter-BufferText-1.10.0-r1
index d794c1f66d3b..bb4ea1db8fa8 100644
--- a/metadata/md5-cache/dev-perl/XML-Filter-BufferText-1.10.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-Filter-BufferText-1.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-SAX-0.12 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RB/RBERJON/XML-Filter-BufferText-1.01.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c906cfc453a399be4ff3d8d35212fbab
diff --git a/metadata/md5-cache/dev-perl/XML-Generator-1.40.0-r1 b/metadata/md5-cache/dev-perl/XML-Generator-1.40.0-r1
index 80ac447acda8..cf6310f47e4d 100644
--- a/metadata/md5-cache/dev-perl/XML-Generator-1.40.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-Generator-1.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-libs/expat dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BH/BHOLZMAN/XML-Generator-1.04.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=565f2d38cd9c1128aa61c14f3630e45b
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 ea632a6c2990..aa79f2e8bfa0 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
@@ -8,5 +8,5 @@ LICENSE=Artistic
 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=85dd00537be3c6f88222bf54ea6f820c
diff --git a/metadata/md5-cache/dev-perl/XML-LibXML-Iterator-1.40.0-r1 b/metadata/md5-cache/dev-perl/XML-LibXML-Iterator-1.40.0-r1
index e2de942a9caa..213141359086 100644
--- a/metadata/md5-cache/dev-perl/XML-LibXML-Iterator-1.40.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-LibXML-Iterator-1.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/XML-LibXML dev-perl/XML-NodeFilter dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHISH/XML-LibXML-Iterator-1.04.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a31a6f8d1b7e3d4bc7814644c6332593
diff --git a/metadata/md5-cache/dev-perl/XML-Mini-1.380.0-r1 b/metadata/md5-cache/dev-perl/XML-Mini-1.380.0-r1
index 3d0d48c05cc0..473733c2a30a 100644
--- a/metadata/md5-cache/dev-perl/XML-Mini-1.380.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-Mini-1.380.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PD/PDEEGAN/XML-Mini-1.38.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dccd873b833e909b1164a89bf0652d4c
diff --git a/metadata/md5-cache/dev-perl/XML-NodeFilter-0.10.0-r1 b/metadata/md5-cache/dev-perl/XML-NodeFilter-0.10.0-r1
index cddf6e1152b1..1174b29ce74e 100644
--- a/metadata/md5-cache/dev-perl/XML-NodeFilter-0.10.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-NodeFilter-0.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHISH/XML-NodeFilter-0.01.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5cec48c1ede22360ee82091c99601d89
diff --git a/metadata/md5-cache/dev-perl/XML-Parser-2.440.0 b/metadata/md5-cache/dev-perl/XML-Parser-2.440.0
index 6d8cab8e9de5..44f6b45a70e8 100644
--- a/metadata/md5-cache/dev-perl/XML-Parser-2.440.0
+++ b/metadata/md5-cache/dev-perl/XML-Parser-2.440.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-libs/expat-1.95.1-r1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.44.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8a8fff9e6453a209d1c81b2b6067898e
diff --git a/metadata/md5-cache/dev-perl/XML-Parser-Lite-0.721.0 b/metadata/md5-cache/dev-perl/XML-Parser-Lite-0.721.0
index 78bbb927c0f3..d791b866621d 100644
--- a/metadata/md5-cache/dev-perl/XML-Parser-Lite-0.721.0
+++ b/metadata/md5-cache/dev-perl/XML-Parser-Lite-0.721.0
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight regexp-based XML parser
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/XML-Parser-Lite
 IUSE=test minimal
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/XML-Parser-Lite-0.721.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f4a6e3fad851d1d8224dffcf10f906d9
+_md5_=eccd366de999741bb2a592be0b8802ed
diff --git a/metadata/md5-cache/dev-perl/XML-RAI-1.303.100-r1 b/metadata/md5-cache/dev-perl/XML-RAI-1.303.100-r1
index e64036bc019b..c8024d9eaf73 100644
--- a/metadata/md5-cache/dev-perl/XML-RAI-1.303.100-r1
+++ b/metadata/md5-cache/dev-perl/XML-RAI-1.303.100-r1
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=>=dev-perl/TimeDate-1.16 dev-perl/XML-Elemental >=dev-perl/XML-RSS-Parser-4 dev-perl/Class-XPath dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TI/TIMA/XML-RAI-1.3031.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e8275c4e5d29423e73d3b8577159075d
diff --git a/metadata/md5-cache/dev-perl/XML-RSS-Feed-2.400.0-r1 b/metadata/md5-cache/dev-perl/XML-RSS-Feed-2.400.0-r1
index bf7fde4ca827..f042f4e4b166 100644
--- a/metadata/md5-cache/dev-perl/XML-RSS-Feed-2.400.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-RSS-Feed-2.400.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/HTML-Parser dev-perl/XML-RSS dev-perl/Clone virtual/perl-Time-H
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JB/JBISBEE/XML-RSS-Feed-2.4.tar.gz https://dev.gentoo.org/~tove/distfiles/dev-perl/XML-RSS-Feed/XML-RSS-Feed-2.320.0-patch.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=636e9dac33c461f1e60d69c13d26c039
diff --git a/metadata/md5-cache/dev-perl/XML-RSS-Parser-4.0.0-r1 b/metadata/md5-cache/dev-perl/XML-RSS-Parser-4.0.0-r1
index 1877fddf0ca1..d1461687b82a 100644
--- a/metadata/md5-cache/dev-perl/XML-RSS-Parser-4.0.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-RSS-Parser-4.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=dev-perl/Class-ErrorHandler >=dev-perl/Class-XPath-1.4 >=dev-perl/XML-Elemental-2.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TI/TIMA/XML-RSS-Parser-4.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=666cfe8a8dd35bd2a4a916a8217b3846
diff --git a/metadata/md5-cache/dev-perl/XML-RegExp-0.40.0-r1 b/metadata/md5-cache/dev-perl/XML-RegExp-0.40.0-r1
index cfb3c22ccf18..67eab5a106b3 100644
--- a/metadata/md5-cache/dev-perl/XML-RegExp-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-RegExp-0.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.29 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TJ/TJMATHER/XML-RegExp-0.04.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8a914daab8777ee54b65054259689af4
diff --git a/metadata/md5-cache/dev-perl/XML-SAX-0.990.0-r1 b/metadata/md5-cache/dev-perl/XML-SAX-0.990.0-r1
index c70349630924..8b6c3ab9b85f 100644
--- a/metadata/md5-cache/dev-perl/XML-SAX-0.990.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-SAX-0.990.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/XML-SAX-Base >=dev-perl/XML-NamespaceSupport-1.40.0 >=dev-libs/libxml2-2.4.1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-0.99.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8c40f4204de5f0594f336924987f28b8
diff --git a/metadata/md5-cache/dev-perl/XML-SAX-Expat-0.510.0 b/metadata/md5-cache/dev-perl/XML-SAX-Expat-0.510.0
index 35b709db7197..e90c2138c8e3 100644
--- a/metadata/md5-cache/dev-perl/XML-SAX-Expat-0.510.0
+++ b/metadata/md5-cache/dev-perl/XML-SAX-Expat-0.510.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/XML-SAX-0.15-r1 >=dev-perl/XML-NamespaceSupport-1.09 dev-perl
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BJ/BJOERN/XML-SAX-Expat-0.51.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=80a711e5ba8df9b60591b7ab44dcb236
diff --git a/metadata/md5-cache/dev-perl/XML-Simple-DTDReader-0.40.0-r1 b/metadata/md5-cache/dev-perl/XML-Simple-DTDReader-0.40.0-r1
index 357bb114e9b3..601ab210822f 100644
--- a/metadata/md5-cache/dev-perl/XML-Simple-DTDReader-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-Simple-DTDReader-0.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.34 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/XML-Simple-DTDReader-0.04.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d0e39a1dd2350512e08876f4f92c7967
diff --git a/metadata/md5-cache/dev-perl/XML-SimpleObject-0.530.0-r1 b/metadata/md5-cache/dev-perl/XML-SimpleObject-0.530.0-r1
index 11c564a75c53..f385753bf258 100644
--- a/metadata/md5-cache/dev-perl/XML-SimpleObject-0.530.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-SimpleObject-0.530.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.30 >=dev-perl/XML-LibXML-1.54 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DB/DBRIAN/XML-SimpleObject-0.53.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=93fef0f74f8fddb66396d692379831d8
diff --git a/metadata/md5-cache/dev-perl/XML-Smart-1.790.0 b/metadata/md5-cache/dev-perl/XML-Smart-1.790.0
index bfa512e5f533..5c31a0c53c36 100644
--- a/metadata/md5-cache/dev-perl/XML-Smart-1.790.0
+++ b/metadata/md5-cache/dev-perl/XML-Smart-1.790.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/Object-MultiType-0.30.0 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMHARISH/XML-Smart-1.79.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7fe0c04d5ec2f2f268da2526a4a2ae57
diff --git a/metadata/md5-cache/dev-perl/XML-Stream-1.240.0-r1 b/metadata/md5-cache/dev-perl/XML-Stream-1.240.0-r1
index 4a7ef03b5107..077ef4a1bbf3 100644
--- a/metadata/md5-cache/dev-perl/XML-Stream-1.240.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-Stream-1.240.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Creates and XML Stream connection and parses return data
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/XML-Stream
 IUSE=ssl
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=dev-perl/Authen-SASL dev-perl/Net-DNS ssl? ( dev-perl/IO-Socket-SSL ) virtual/perl-MIME-Base64 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAPATRICK/XML-Stream-1.24.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a77eae610657e70fbbf27034f079347a
+_md5_=b8f8d7d1b6cae375c5be5bb7c8a04ec7
diff --git a/metadata/md5-cache/dev-perl/XML-TokeParser-0.50.0 b/metadata/md5-cache/dev-perl/XML-TokeParser-0.50.0
index cefaf110f8fe..54c7a04cd1de 100644
--- a/metadata/md5-cache/dev-perl/XML-TokeParser-0.50.0
+++ b/metadata/md5-cache/dev-perl/XML-TokeParser-0.50.0
@@ -4,11 +4,11 @@ DESCRIPTION=Simplified interface to XML::Parser
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/XML-TokeParser
 IUSE=test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.0.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PO/PODMASTER/XML-TokeParser-0.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d76bb5a91c128c4c14bc845bd5c7b45b
+_md5_=69731afcdc8a1e2a8fdfe0d240ab0034
diff --git a/metadata/md5-cache/dev-perl/XML-TreePP-0.430.0-r1 b/metadata/md5-cache/dev-perl/XML-TreePP-0.430.0-r1
index 16e0b88cff10..a372977e2c06 100644
--- a/metadata/md5-cache/dev-perl/XML-TreePP-0.430.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-TreePP-0.430.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-perl/libwww-perl virtual/perl-ExtUtils-MakeMaker dev-lang/perl
 DESCRIPTION=Pure Perl implementation for parsing/writing XML documents
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/XML-TreePP
-KEYWORDS=amd64 ~arm ppc x86
+KEYWORDS=amd64 ~arm ~arm64 ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KAWASAKI/XML-TreePP-0.43.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d6468f018fa0ad57117c64c6f39d0ab7
+_md5_=23cd00c23b6a728a03a767bf538edfc9
diff --git a/metadata/md5-cache/dev-perl/XML-Validator-Schema-1.100.0 b/metadata/md5-cache/dev-perl/XML-Validator-Schema-1.100.0
index dd0e99fdcaa2..04de03e74b6f 100644
--- a/metadata/md5-cache/dev-perl/XML-Validator-Schema-1.100.0
+++ b/metadata/md5-cache/dev-perl/XML-Validator-Schema-1.100.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/XML-SAX dev-perl/Tree-DAG_Node dev-perl/XML-Filter-BufferText dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SAMTREGAR/XML-Validator-Schema-1.10.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a8df9e8afbd9da94ad3f2bfb1b83e2ad
diff --git a/metadata/md5-cache/dev-perl/XML-Writer-0.625.0 b/metadata/md5-cache/dev-perl/XML-Writer-0.625.0
index cb63042ffff5..3023a12a7785 100644
--- a/metadata/md5-cache/dev-perl/XML-Writer-0.625.0
+++ b/metadata/md5-cache/dev-perl/XML-Writer-0.625.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JO/JOSEPHW/XML-Writer-0.625.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cc7b587550b1027209e118b669237aca
diff --git a/metadata/md5-cache/dev-perl/XML-XPathEngine-0.140.0-r1 b/metadata/md5-cache/dev-perl/XML-XPathEngine-0.140.0-r1
index bdb371ba5849..ed182caf0f47 100644
--- a/metadata/md5-cache/dev-perl/XML-XPathEngine-0.140.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-XPathEngine-0.140.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIROD/XML-XPathEngine-0.14.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1d3066f35ec3c48e2f32ef4dd3b4953e
diff --git a/metadata/md5-cache/dev-perl/XML-XQL-0.680.0-r1 b/metadata/md5-cache/dev-perl/XML-XQL-0.680.0-r1
index a2245a25db82..69c2f9cc140d 100644
--- a/metadata/md5-cache/dev-perl/XML-XQL-0.680.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-XQL-0.680.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/libxml-perl-0.07-r1 >=dev-perl/XML-DOM-1.39-r1 >=dev-perl/Parse-Yapp-1.05 dev-perl/libwww-perl >=dev-perl/Date-Manip-5.40-r1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TJ/TJMATHER/XML-XQL-0.68.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=874a1be7e75e4f1a85ff5bd292b2863d
diff --git a/metadata/md5-cache/dev-perl/XML-XSLT-0.480.0-r1 b/metadata/md5-cache/dev-perl/XML-XSLT-0.480.0-r1
index 892c8801a2a6..e0cc2eecb8b3 100644
--- a/metadata/md5-cache/dev-perl/XML-XSLT-0.480.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-XSLT-0.480.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.29 >=dev-perl/XML-DOM-1.25 >=dev-perl/libwww-perl-5.48 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JS/JSTOWE/XML-XSLT-0.48.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=94691269ccac0a49fcdc8ea0d8cc9eb5
diff --git a/metadata/md5-cache/dev-perl/XML-XUpdate-LibXML-0.6.0-r1 b/metadata/md5-cache/dev-perl/XML-XUpdate-LibXML-0.6.0-r1
index a85db349c8cf..3700c11ee0cb 100644
--- a/metadata/md5-cache/dev-perl/XML-XUpdate-LibXML-0.6.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-XUpdate-LibXML-0.6.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PA/PAJAS/XML-XUpdate-LibXML-0.6.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c2ce1aa756049a86773e8d76cc73f1e7
diff --git a/metadata/md5-cache/dev-perl/XMLRPC-Lite-0.717.0 b/metadata/md5-cache/dev-perl/XMLRPC-Lite-0.717.0
index 728c404e7074..daed5ed852ad 100644
--- a/metadata/md5-cache/dev-perl/XMLRPC-Lite-0.717.0
+++ b/metadata/md5-cache/dev-perl/XMLRPC-Lite-0.717.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/SOAP-Lite dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/XMLRPC-Lite-0.717.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4c68a04b8e2563b04cc9b470e174bf49
diff --git a/metadata/md5-cache/dev-perl/XS-Object-Magic-0.40.0-r3 b/metadata/md5-cache/dev-perl/XS-Object-Magic-0.40.0-r3
index ff49b540aee2..77afb0a9eef0 100644
--- a/metadata/md5-cache/dev-perl/XS-Object-Magic-0.40.0-r3
+++ b/metadata/md5-cache/dev-perl/XS-Object-Magic-0.40.0-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Opaque, extensible XS pointer backed objects using sv_magic
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/XS-Object-Magic
 IUSE=test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FL/FLORA/XS-Object-Magic-0.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4cbaf99567d71de855d7e1526486e8fb
+_md5_=a34b13a7daa1dbf0b94a64377b7f7152
diff --git a/metadata/md5-cache/dev-perl/YAML-1.150.0 b/metadata/md5-cache/dev-perl/YAML-1.150.0
index cec5a6739fec..9f194a372d96 100644
--- a/metadata/md5-cache/dev-perl/YAML-1.150.0
+++ b/metadata/md5-cache/dev-perl/YAML-1.150.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/YAML-1.15.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7715284f77be545cd63c4b5ecbbb5fde
diff --git a/metadata/md5-cache/dev-perl/YAML-Syck-1.300.0 b/metadata/md5-cache/dev-perl/YAML-Syck-1.300.0
index a481f16326f3..ba6a174c8095 100644
--- a/metadata/md5-cache/dev-perl/YAML-Syck-1.300.0
+++ b/metadata/md5-cache/dev-perl/YAML-Syck-1.300.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.30.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7091bdd1239e030f477981222e639d71
diff --git a/metadata/md5-cache/dev-perl/YAML-Tiny-1.690.0 b/metadata/md5-cache/dev-perl/YAML-Tiny-1.690.0
index bc968c438ad7..6c6ad6eee2d9 100644
--- a/metadata/md5-cache/dev-perl/YAML-Tiny-1.690.0
+++ b/metadata/md5-cache/dev-perl/YAML-Tiny-1.690.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-Scalar-List-Utils d
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/YAML-Tiny-1.69.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=eb1ae0eaf386b16a05efef5731ef9a5f
diff --git a/metadata/md5-cache/dev-perl/capitalization-0.30.0-r1 b/metadata/md5-cache/dev-perl/capitalization-0.30.0-r1
index 2abd6892fd3c..a1a76d8bd142 100644
--- a/metadata/md5-cache/dev-perl/capitalization-0.30.0-r1
+++ b/metadata/md5-cache/dev-perl/capitalization-0.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Devel-Symdump dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/capitalization-0.03.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=52088f03a37fbc6e6922d69afb807ead
diff --git a/metadata/md5-cache/dev-perl/constant-boolean-0.20.0-r1 b/metadata/md5-cache/dev-perl/constant-boolean-0.20.0-r1
index 4079504f791f..c3eacadca9b9 100644
--- a/metadata/md5-cache/dev-perl/constant-boolean-0.20.0-r1
+++ b/metadata/md5-cache/dev-perl/constant-boolean-0.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Symbol-Util dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DE/DEXTER/constant-boolean-0.02.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4b836ef5aa93c2c9c1a8e90b3566392d
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 526f207491a9..c82a5bd3e2d3 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
@@ -8,5 +8,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=013e85dfabd9412088f6ca78a109a3d3
diff --git a/metadata/md5-cache/dev-perl/local-lib-2.0.24 b/metadata/md5-cache/dev-perl/local-lib-2.0.24
index 925876438456..915297e229a1 100644
--- a/metadata/md5-cache/dev-perl/local-lib-2.0.24
+++ b/metadata/md5-cache/dev-perl/local-lib-2.0.24
@@ -4,11 +4,11 @@ DESCRIPTION=create and use a local lib/ for perl modules with PERL5LIB
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/local-lib
 IUSE=test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-CPAN-1.820.0 >=virtual/perl-ExtUtils-Install-1.430.0 >=virtual/perl-ExtUtils-MakeMaker-7.0.0 >=dev-perl/Module-Build-0.360.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/local-lib-2.000024.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e2e7f602773a2ec4e5b8bb023eb8b8c8
+_md5_=6fe10c84d4cdac660582d7900dd733d5
diff --git a/metadata/md5-cache/dev-perl/maybe-0.20.200-r1 b/metadata/md5-cache/dev-perl/maybe-0.20.200-r1
index c79542ec703d..f5df5986a766 100644
--- a/metadata/md5-cache/dev-perl/maybe-0.20.200-r1
+++ b/metadata/md5-cache/dev-perl/maybe-0.20.200-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DE/DEXTER/maybe-0.0202.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1245ee32fec6fd1cc8ef0d9564e081c9
diff --git a/metadata/md5-cache/dev-perl/prefork-1.40.0-r2 b/metadata/md5-cache/dev-perl/prefork-1.40.0-r2
index 08351082b668..8b508921fb0d 100644
--- a/metadata/md5-cache/dev-perl/prefork-1.40.0-r2
+++ b/metadata/md5-cache/dev-perl/prefork-1.40.0-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-File-Spec-0.80 >=virtual/perl-Scalar-List-Utils-1.10 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/prefork-1.04.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b4987272d150a3895571239064807973
diff --git a/metadata/md5-cache/dev-perl/rename-1.900.0 b/metadata/md5-cache/dev-perl/rename-1.900.0
index 8036e75b33f7..ca82f6dbdfa6 100644
--- a/metadata/md5-cache/dev-perl/rename-1.900.0
+++ b/metadata/md5-cache/dev-perl/rename-1.900.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PEDERST/rename-1.9.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d79feb78dc8fd5265f68583d3fddb1ba
diff --git a/metadata/md5-cache/dev-perl/txt2html-2.520.100 b/metadata/md5-cache/dev-perl/txt2html-2.520.100
index 598b87ce5825..b3c28e005b34 100644
--- a/metadata/md5-cache/dev-perl/txt2html-2.520.100
+++ b/metadata/md5-cache/dev-perl/txt2html-2.520.100
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!dev-perl/TextToHTML virtual/perl-Getopt-Long dev-perl/YAML-Syck dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RUBYKAT/txt2html-2.5201.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=982cf1d3328dda8b073a66951053ac84
diff --git a/metadata/md5-cache/dev-perl/txt2html-2.53 b/metadata/md5-cache/dev-perl/txt2html-2.53
new file mode 100644
index 000000000000..708c7e2dc217
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/txt2html-2.53
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!dev-perl/TextToHTML dev-perl/YAML-Syck virtual/perl-Getopt-Long dev-perl/Module-Build dev-lang/perl
+DESCRIPTION=Convert a plain text file to HTML
+EAPI=6
+HOMEPAGE=https://github.com/resurrecting-open-source-projects/txt2html
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=!dev-perl/TextToHTML dev-perl/YAML-Syck virtual/perl-Getopt-Long dev-lang/perl:=
+SLOT=0
+SRC_URI=https://github.com/resurrecting-open-source-projects/txt2html/archive/v2.53.tar.gz -> txt2html-2.53.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=153cf8ff202d8f2b13a54acc9569fa28
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 7ca479903dd1..ddfb54626b73 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-Mail_Mime-1.10.8 b/metadata/md5-cache/dev-php/PEAR-Mail_Mime-1.10.8
new file mode 100644
index 000000000000..2997f3122b16
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-Mail_Mime-1.10.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm test
+DEPEND=test? ( dev-php/PEAR-PEAR )
+DESCRIPTION=Create and manipulate mime messages with PHP
+EAPI=7
+HOMEPAGE=https://pear.php.net/package/Mail_Mime
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://pear.php.net/get/Mail_Mime-1.10.8.tgz
+_eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
+_md5_=fa09fd9c9db9dbe9fdef3366d2191fb7
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_SMTP-1.9.1 b/metadata/md5-cache/dev-php/PEAR-Net_SMTP-1.9.1
new file mode 100644
index 000000000000..4c73f6f0ca4e
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-Net_SMTP-1.9.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DESCRIPTION=A PHP implementation of the SMTP protocol
+EAPI=7
+HOMEPAGE=https://pear.php.net/package/Net_SMTP
+IUSE=examples sasl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=BSD-2
+RDEPEND=dev-lang/php:* dev-php/PEAR-Net_Socket dev-php/PEAR-PEAR sasl? ( dev-php/PEAR-Auth_SASL ) >=dev-php/pear-1.8.1
+SLOT=0
+SRC_URI=https://pear.php.net/get/Net_SMTP-1.9.1.tgz
+_eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
+_md5_=f8dfbab7498e64efee05d10158cd08f5
diff --git a/metadata/md5-cache/dev-php/phing-2.16.3 b/metadata/md5-cache/dev-php/phing-2.16.3
new file mode 100644
index 000000000000..cee94775ebf0
--- /dev/null
+++ b/metadata/md5-cache/dev-php/phing-2.16.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=PHP project build system based on Apache Ant
+EAPI=7
+HOMEPAGE=https://www.phing.info/
+IUSE=doc examples minimal zip
+KEYWORDS=~amd64 ~x86
+LICENSE=FDL-1.3 LGPL-2.1
+RDEPEND=dev-lang/php:*[cli,xml,xslt,zip?] dev-php/symfony-yaml !minimal? ( dev-php/PEAR-HTTP_Request2 dev-php/PEAR-PEAR_PackageFileManager dev-php/PEAR-VersionControl_SVN dev-php/PHP_CodeCoverage dev-php/phpDocumentor dev-php/phpmd dev-php/phpunit dev-php/simpletest dev-php/xdebug )
+SLOT=0
+SRC_URI=https://www.phing.info/get/phing-2.16.3.tgz
+_md5_=cabb1345088c669a8d54f4f2f0d69b62
diff --git a/metadata/md5-cache/dev-php/phpmd-2.8.2 b/metadata/md5-cache/dev-php/phpmd-2.8.2
new file mode 100644
index 000000000000..ae7a60d843e6
--- /dev/null
+++ b/metadata/md5-cache/dev-php/phpmd-2.8.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=PHP mess detector
+EAPI=7
+HOMEPAGE=http://www.phpmd.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-lang/php[xml] dev-php/phpdepend
+SLOT=0
+SRC_URI=https://github.com/phpmd/phpmd/archive/2.8.2.tar.gz -> phpmd-2.8.2.tar.gz
+_md5_=f5bb905d0feb67812f62a997e7378d7b
diff --git a/metadata/md5-cache/dev-php/phpspec-prophecy-1.10.3 b/metadata/md5-cache/dev-php/phpspec-prophecy-1.10.3
new file mode 100644
index 000000000000..9f3ff2c8fd41
--- /dev/null
+++ b/metadata/md5-cache/dev-php/phpspec-prophecy-1.10.3
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Highly opinionated mocking framework
+EAPI=7
+HOMEPAGE=https://github.com/phpspec/prophecy
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-php/fedora-autoloader <dev-php/doctrine-instantiator-2 <dev-php/phpdocumentor-reflection-docblock-6 <dev-php/sebastian-comparator-4 <dev-php/sebastian-recursion-context-4 >=dev-lang/php-5.6:*
+SLOT=0
+SRC_URI=https://github.com/phpspec/prophecy/archive/v1.10.3.tar.gz -> phpspec-prophecy-1.10.3.tar.gz
+_md5_=8256ba8f1861881afa5a0368a83a503e
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index a74cf59acd22..586c055ad04d 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/argcomplete-1.11.1-r1 b/metadata/md5-cache/dev-python/argcomplete-1.11.1-r1
index 409f3aa8995c..1f5be49b1f58 100644
--- a/metadata/md5-cache/dev-python/argcomplete-1.11.1-r1
+++ b/metadata/md5-cache/dev-python/argcomplete-1.11.1-r1
@@ -4,7 +4,7 @@ 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 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc 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-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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_targets_python3_9(-)?,-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_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/argcomplete/argcomplete-1.11.1.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0d30e6224d5e20f4025d1350c0ff2797
+_md5_=678a00e6ad16186a6528aa5a6bc7cd00
diff --git a/metadata/md5-cache/dev-python/argon2-cffi-20.1.0 b/metadata/md5-cache/dev-python/argon2-cffi-20.1.0
new file mode 100644
index 000000000000..13dae64c892c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/argon2-cffi-20.1.0
@@ -0,0 +1,16 @@
+BDEPEND=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(-)] ) 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-7.3.0: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(-)] >=dev-python/pytest-4.5.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-7.3.0: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-42.0.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
+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(-)]
+DESCRIPTION=CFFI bindings to the Argon2 password hashing library
+EAPI=7
+HOMEPAGE=https://github.com/hynek/argon2-cffi
+IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=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(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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/argon2-cffi/argon2-cffi-20.1.0.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=69053064b6fe2ae2c801dc148caa8f44
diff --git a/metadata/md5-cache/dev-python/argon2_cffi-19.1.0 b/metadata/md5-cache/dev-python/argon2_cffi-19.1.0
deleted file mode 100644
index 5bd50a5270b4..000000000000
--- a/metadata/md5-cache/dev-python/argon2_cffi-19.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-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-7.3.0: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(-)] >=dev-python/pytest-4.5.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-7.3.0: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-42.0.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
-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(-)] 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
-EAPI=7
-HOMEPAGE=https://github.com/hynek/argon2-cffi
-IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=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(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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/argon2_cffi/argon2_cffi-19.1.0.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6f86689aab4923eaa1ac0011ecbe7d64
diff --git a/metadata/md5-cache/dev-python/betamax-0.8.1 b/metadata/md5-cache/dev-python/betamax-0.8.1
index 815956105789..98d6586cd877 100644
--- a/metadata/md5-cache/dev-python/betamax-0.8.1
+++ b/metadata/md5-cache/dev-python/betamax-0.8.1
@@ -5,7 +5,7 @@ DESCRIPTION=python-requests HTTP exchanges recorder
 EAPI=7
 HOMEPAGE=https://github.com/betamaxpy/betamax
 IUSE=test test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/requests[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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_targets_python3_9(-)?,-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_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/betamax/betamax-0.8.1.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c6998403e003a2282f3ef17e3a79b606
+_md5_=737bab7d89abf77b5f56fe54e1cee54f
diff --git a/metadata/md5-cache/dev-python/boto3-1.12.48 b/metadata/md5-cache/dev-python/boto3-1.12.48
index a846e88896c6..81ab9d1e387f 100644
--- a/metadata/md5-cache/dev-python/boto3-1.12.48
+++ b/metadata/md5-cache/dev-python/boto3-1.12.48
@@ -4,7 +4,7 @@ DESCRIPTION=The AWS SDK for Python
 EAPI=7
 HOMEPAGE=https://github.com/boto/boto3
 IUSE=test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/botocore-1.15.48[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/boto/boto3/archive/1.12.48.tar.gz -> boto3-1.12.48.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8bd01b8fc9f426c43fef5451734b870d
+_md5_=ef4008fec607b654499a34cdfb3c063c
diff --git a/metadata/md5-cache/dev-python/boto3-1.14.11 b/metadata/md5-cache/dev-python/boto3-1.14.11
new file mode 100644
index 000000000000..a4df8d02c98f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.14.11
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/guzzle_sphinx_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/guzzle_sphinx_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/guzzle_sphinx_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( >=dev-python/botocore-1.17.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=7
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.17.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.14.11.tar.gz -> boto3-1.14.11.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a4b3259d14e7e6b2e893dd0dd44d5e4e
diff --git a/metadata/md5-cache/dev-python/boto3-1.14.8 b/metadata/md5-cache/dev-python/boto3-1.14.8
new file mode 100644
index 000000000000..9cf7635668cd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.14.8
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/guzzle_sphinx_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/guzzle_sphinx_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/guzzle_sphinx_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( >=dev-python/botocore-1.17.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=7
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.17.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.14.8.tar.gz -> boto3-1.14.8.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a4b3259d14e7e6b2e893dd0dd44d5e4e
diff --git a/metadata/md5-cache/dev-python/botocore-1.15.48 b/metadata/md5-cache/dev-python/botocore-1.15.48
index 274c122af2ea..8fc1e174447b 100644
--- a/metadata/md5-cache/dev-python/botocore-1.15.48
+++ b/metadata/md5-cache/dev-python/botocore-1.15.48
@@ -5,7 +5,7 @@ DESCRIPTION=Low-level, data-driven core of boto 3.
 EAPI=7
 HOMEPAGE=https://github.com/boto/botocore
 IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=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/jmespath[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-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_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/urllib3[python_targets_python3_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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/botocore/botocore-1.15.48.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=39219ac30b1dfb4c0d391926feb00ee2
+_md5_=64a4b5f5f60ca689acd99b1848e1132d
diff --git a/metadata/md5-cache/dev-python/botocore-1.17.11 b/metadata/md5-cache/dev-python/botocore-1.17.11
new file mode 100644
index 000000000000..ee871bd6fc12
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.17.11
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonschema[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/guzzle_sphinx_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/guzzle_sphinx_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/guzzle_sphinx_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/docutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=7
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/docutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.17.11.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b40c2b5a600f63dfb1df906290dc1d65
diff --git a/metadata/md5-cache/dev-python/botocore-1.17.8 b/metadata/md5-cache/dev-python/botocore-1.17.8
new file mode 100644
index 000000000000..7661cca9052c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.17.8
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonschema[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/guzzle_sphinx_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/guzzle_sphinx_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/guzzle_sphinx_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/docutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=7
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/docutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.17.8.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b40c2b5a600f63dfb1df906290dc1d65
diff --git a/metadata/md5-cache/dev-python/brython-3.7.2 b/metadata/md5-cache/dev-python/brython-3.7.2
deleted file mode 100644
index 8831211215c4..000000000000
--- a/metadata/md5-cache/dev-python/brython-3.7.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=A Python 3 implementation for client-side web programming
-EAPI=6
-HOMEPAGE=http://www.brython.info
-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 )
-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	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=15705cab37b434762d9c62abef3fbec6
diff --git a/metadata/md5-cache/dev-python/brython-3.7.3 b/metadata/md5-cache/dev-python/brython-3.7.3
index 5ab5a9c8579b..b9a5792a46d1 100644
--- a/metadata/md5-cache/dev-python/brython-3.7.3
+++ b/metadata/md5-cache/dev-python/brython-3.7.3
@@ -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_single_target_python3_6
+IUSE=vhosts python_single_target_python3_7 python_single_target_python3_8
 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 )
+RDEPEND=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/webapp-config-1.50.15
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=3.7.3
 SRC_URI=https://github.com/brython-dev/brython/archive/3.7.3.tar.gz -> brython-3.7.3.tar.gz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=201ea93a10ac034f9c5ecbf11011a5c7
+_md5_=e0fd127b99389b7d809e0f44e3d3dea3
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 f4f6bbf514e3..69cf267a8a5c 100644
--- a/metadata/md5-cache/dev-python/cairocffi-0.8.0-r1
+++ b/metadata/md5-cache/dev-python/cairocffi-0.8.0-r1
@@ -1,9 +1,9 @@
 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? ( python_targets_python2_7? ( >=dev-python/cffi-1.1.0:=[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/cffi-1.1.0:=[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/cffi-1.1.0:=[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/xcffib-0.3.2[python_targets_python2_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/cairo:0=[X,xcb(+)] x11-libs/gdk-pixbuf[jpeg] 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-42.0.2[python_targets_python2_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? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+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/cffi-1.1.0:=[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/cffi-1.1.0:=[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/cffi-1.1.0:=[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/xcffib-0.3.2[python_targets_python2_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/cairo:0=[X,xcb(+)] x11-libs/gdk-pixbuf[jpeg] 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(-)] ) 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(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[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(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_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? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=CFFI-based drop-in replacement for Pycairo
 EAPI=6
 HOMEPAGE=https://github.com/Kozea/cairocffi
-IUSE=doc test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 test
+IUSE=doc test doc python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 test
 KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-python/cffi-1.1.0:=[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/cffi-1.1.0:=[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/cffi-1.1.0:=[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/xcffib-0.3.2[python_targets_python2_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/cairo:0=[X,xcb(+)] x11-libs/gdk-pixbuf[jpeg] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cairocffi/cairocffi-0.8.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=41505618d11edfec23cb15c88994aa58
+_md5_=8012a2a00ec3f4bcbc661fa611402e55
diff --git a/metadata/md5-cache/dev-python/chameleon-3.8.0 b/metadata/md5-cache/dev-python/chameleon-3.8.0
new file mode 100644
index 000000000000..ed986135ad50
--- /dev/null
+++ b/metadata/md5-cache/dev-python/chameleon-3.8.0
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Fast HTML/XML template compiler for Python
+EAPI=7
+HOMEPAGE=https://github.com/malthe/chameleon https://pypi.org/project/Chameleon/
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=repoze
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/malthe/chameleon/archive/3.8.0.tar.gz -> chameleon-3.8.0.gh.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=59c968311fb030fd870ff8f00ca98499
diff --git a/metadata/md5-cache/dev-python/cheroot-8.3.0 b/metadata/md5-cache/dev-python/cheroot-8.3.0
index a9685801e226..74381c710243 100644
--- a/metadata/md5-cache/dev-python/cheroot-8.3.0
+++ b/metadata/md5-cache/dev-python/cheroot-8.3.0
@@ -4,7 +4,7 @@ DESCRIPTION=Cheroot is the high-performance, pure-Python HTTP server used by Che
 EAPI=7
 HOMEPAGE=https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/six-1.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/more-itertools-2.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-functools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/C/Cheroot/cheroot-8.3.0.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a45d0fdfb06854e7ca8b9af041f88e84
+_md5_=5be7f5821dd352df48ba0c324da395f3
diff --git a/metadata/md5-cache/dev-python/cheroot-8.3.0-r1 b/metadata/md5-cache/dev-python/cheroot-8.3.0-r1
index 9b869d71dce6..1bcd1f5fc96f 100644
--- a/metadata/md5-cache/dev-python/cheroot-8.3.0-r1
+++ b/metadata/md5-cache/dev-python/cheroot-8.3.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Cheroot is the high-performance, pure-Python HTTP server used by Che
 EAPI=7
 HOMEPAGE=https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/six-1.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/more-itertools-2.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-functools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/C/Cheroot/cheroot-8.3.0.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3a6a35143f705f4d4bcb387c509eebd7
+_md5_=18006da68281fff94ac889a3874e9ffc
diff --git a/metadata/md5-cache/dev-python/cherrypy-18.5.0 b/metadata/md5-cache/dev-python/cherrypy-18.5.0
index 1fdb2daa848f..799473ead865 100644
--- a/metadata/md5-cache/dev-python/cherrypy-18.5.0
+++ b/metadata/md5-cache/dev-python/cherrypy-18.5.0
@@ -1,15 +1,15 @@
-BDEPEND=>=dev-python/cheroot-8.2.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/portend-2.1.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/more-itertools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zc-lockfile[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jaraco-collections[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ssl? ( 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/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/routes[python_targets_python3_6(-)?,python_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(-)] dev-python/objgraph[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/backports-unittest-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/path-py[python_targets_python3_6(-)?,python_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[python_targets_python3_6(-)?,python_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-services[python_targets_python3_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/cheroot-8.2.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/portend-2.1.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/more-itertools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zc-lockfile[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jaraco-collections[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ssl? ( 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/pytest-4.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-42.0.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(-)]
+BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools_scm[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/cheroot-8.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/portend-2.1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/more-itertools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zc-lockfile[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-collections[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ssl? ( dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/routes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/simplejson[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/objgraph[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/path-py[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests-toolbelt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-5.3.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-services[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/cheroot-8.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/portend-2.1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/more-itertools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zc-lockfile[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-collections[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ssl? ( dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=CherryPy is a pythonic, object-oriented HTTP framework
 EAPI=7
 HOMEPAGE=https://www.cherrypy.org https://pypi.org/project/CherryPy/
-IUSE=ssl test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+IUSE=ssl test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-python/cheroot-8.2.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/portend-2.1.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/more-itertools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zc-lockfile[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jaraco-collections[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ssl? ( 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(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_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-42.0.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 )
+RDEPEND=>=dev-python/cheroot-8.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/portend-2.1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/more-itertools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zc-lockfile[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-collections[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ssl? ( dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/C/CherryPy/CherryPy-18.5.0.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0ba4a70c9aaa28e0d8702c3fc3e6da64
+_md5_=94c921d9e7f4038d15c1813c70197808
diff --git a/metadata/md5-cache/dev-python/cherrypy-18.6.0 b/metadata/md5-cache/dev-python/cherrypy-18.6.0
new file mode 100644
index 000000000000..41e730efaedb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cherrypy-18.6.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools_scm[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/cheroot-8.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/portend-2.1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/more-itertools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zc-lockfile[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-collections[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ssl? ( dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/routes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/simplejson[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/objgraph[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/path-py[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests-toolbelt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-5.3.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-services[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/cheroot-8.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/portend-2.1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/more-itertools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zc-lockfile[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-collections[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ssl? ( dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=CherryPy is a pythonic, object-oriented HTTP framework
+EAPI=7
+HOMEPAGE=https://www.cherrypy.org https://pypi.org/project/CherryPy/
+IUSE=ssl test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/cheroot-8.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/portend-2.1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/more-itertools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zc-lockfile[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-collections[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ssl? ( dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/C/CherryPy/CherryPy-18.6.0.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6ecc3b6ec4122a4576e76dffe4432e33
diff --git a/metadata/md5-cache/dev-python/clang-python-10.0.0 b/metadata/md5-cache/dev-python/clang-python-10.0.0
index ed8ac77da2f0..982b7f241417 100644
--- a/metadata/md5-cache/dev-python/clang-python-10.0.0
+++ b/metadata/md5-cache/dev-python/clang-python-10.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/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
-_eclasses_=llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7b631fda4eaea64232e2dca79d833575
diff --git a/metadata/md5-cache/dev-python/clang-python-10.0.1.9999 b/metadata/md5-cache/dev-python/clang-python-10.0.1.9999
index 29ce9e3e2351..286cc7c127e6 100644
--- a/metadata/md5-cache/dev-python/clang-python-10.0.1.9999
+++ b/metadata/md5-cache/dev-python/clang-python-10.0.1.9999
@@ -11,5 +11,5 @@ RDEPEND=>=sys-devel/clang-10.0.1.9999:* !sys-devel/llvm:0[clang(-),python(-)] !s
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ca8089c466747641888c2b50dd3305e5
+_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c4b76662cc5a9e0f4d6feffcbb2eade4
diff --git a/metadata/md5-cache/dev-python/clang-python-10.0.1_rc1 b/metadata/md5-cache/dev-python/clang-python-10.0.1_rc1
index c3d97ecc8ae3..f348761ee5d9 100644
--- a/metadata/md5-cache/dev-python/clang-python-10.0.1_rc1
+++ b/metadata/md5-cache/dev-python/clang-python-10.0.1_rc1
@@ -10,5 +10,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1-rc1.tar.gz
-_eclasses_=llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ca8089c466747641888c2b50dd3305e5
+_eclasses_=llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c4b76662cc5a9e0f4d6feffcbb2eade4
diff --git a/metadata/md5-cache/dev-python/clang-python-11.0.0.9999 b/metadata/md5-cache/dev-python/clang-python-11.0.0.9999
index e6ec85430fa0..2f234f391e7c 100644
--- a/metadata/md5-cache/dev-python/clang-python-11.0.0.9999
+++ b/metadata/md5-cache/dev-python/clang-python-11.0.0.9999
@@ -11,5 +11,5 @@ RDEPEND=>=sys-devel/clang-11.0.0.9999:* !sys-devel/llvm:0[clang(-),python(-)] !s
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ca8089c466747641888c2b50dd3305e5
+_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c4b76662cc5a9e0f4d6feffcbb2eade4
diff --git a/metadata/md5-cache/dev-python/clang-python-9.0.1 b/metadata/md5-cache/dev-python/clang-python-9.0.1
index e2a302c801a6..b810b3f0bcf7 100644
--- a/metadata/md5-cache/dev-python/clang-python-9.0.1
+++ b/metadata/md5-cache/dev-python/clang-python-9.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/llvm/llvm-project/archive/llvmorg-9.0.1.tar.gz
-_eclasses_=llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8dd5230415f714a0a51e15a668988d8a
diff --git a/metadata/md5-cache/dev-python/django-2.2.11 b/metadata/md5-cache/dev-python/django-2.2.11
index 0e2ab2a83af7..d2636b1aa23c 100644
--- a/metadata/md5-cache/dev-python/django-2.2.11
+++ b/metadata/md5-cache/dev-python/django-2.2.11
@@ -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(-)] 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? ( 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/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/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/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(-)] dev-python/pillow[webp,python_targets_python3_6(-)?,python_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(-)] dev-python/tblib[python_targets_python3_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[sqlite?,threads(+)] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[sqlite?,threads(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[sqlite?,threads(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,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-42.0.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(-)]
+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(-)] 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? ( 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/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/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/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(-)] dev-python/pillow[webp,python_targets_python3_6(-)?,python_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(-)] dev-python/selenium[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/tblib[python_targets_python3_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[sqlite?,threads(+)] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[sqlite?,threads(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[sqlite?,threads(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,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-42.0.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 postinst prepare test
 DESCRIPTION=High-level Python web framework
 EAPI=7
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/2.2/Django-2.2.11.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7a2bfc77c8ad21190fe36bbfade30df3
+_md5_=ed9299d51f75ba5bf2fcdf6cd6d37e98
diff --git a/metadata/md5-cache/dev-python/django-2.2.12 b/metadata/md5-cache/dev-python/django-2.2.12
index 8fbe90597e38..5c3eef971dd3 100644
--- a/metadata/md5-cache/dev-python/django-2.2.12
+++ b/metadata/md5-cache/dev-python/django-2.2.12
@@ -1,10 +1,10 @@
-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(-)] 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? ( 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/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/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/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(-)] dev-python/pillow[webp,python_targets_python3_6(-)?,python_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(-)] dev-python/tblib[python_targets_python3_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? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,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-42.0.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(-)]
+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(-)] 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? ( 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/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/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/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(-)] dev-python/pillow[webp,python_targets_python3_6(-)?,python_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(-)] dev-python/selenium[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/tblib[python_targets_python3_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? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,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-42.0.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 postinst prepare test
 DESCRIPTION=High-level Python web framework
 EAPI=7
 HOMEPAGE=https://www.djangoproject.com/ https://pypi.org/project/Django/
 IUSE=doc sqlite test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD Apache-2.0 MIT
 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(-)] dev-python/sqlparse[python_targets_python3_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[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,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-42.0.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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/2.2/Django-2.2.12.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fc6678a98463e4cbedefea72774dfd5c
+_md5_=5a57f9b22928130746c6ff7e15823637
diff --git a/metadata/md5-cache/dev-python/django-2.2.13 b/metadata/md5-cache/dev-python/django-2.2.13
index 73ca594829b6..536225b2ed8a 100644
--- a/metadata/md5-cache/dev-python/django-2.2.13
+++ b/metadata/md5-cache/dev-python/django-2.2.13
@@ -1,10 +1,10 @@
-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(-)] 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? ( 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/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/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/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(-)] dev-python/pillow[webp,python_targets_python3_6(-)?,python_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(-)] dev-python/tblib[python_targets_python3_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? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,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-42.0.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(-)]
+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(-)] 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? ( 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/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/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/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(-)] dev-python/pillow[webp,python_targets_python3_6(-)?,python_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(-)] dev-python/selenium[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/tblib[python_targets_python3_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? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,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-42.0.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 postinst prepare test
 DESCRIPTION=High-level Python web framework
 EAPI=7
 HOMEPAGE=https://www.djangoproject.com/ https://pypi.org/project/Django/
 IUSE=doc sqlite test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD Apache-2.0 MIT
 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(-)] dev-python/sqlparse[python_targets_python3_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[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,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-42.0.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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/2.2/Django-2.2.13.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fc6678a98463e4cbedefea72774dfd5c
+_md5_=549a91af3d79382a8c2e17eea74459ab
diff --git a/metadata/md5-cache/dev-python/django-otp-0.9.3 b/metadata/md5-cache/dev-python/django-otp-0.9.3
new file mode 100644
index 000000000000..68fd34cffae3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-otp-0.9.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( 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] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) dev-python/qrcode[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/django-1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Django framework adding two-factor authentication using one-time passwords
+EAPI=7
+HOMEPAGE=https://github.com/django-otp/django-otp/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/django-1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/django-otp/django-otp/archive/v0.9.3.tar.gz -> django-otp-0.9.3.gh.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a04956704f804ca582a6364ddfe03c39
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 9dbd128de67b..b7aa384643e2 100644
--- a/metadata/md5-cache/dev-python/dogpile-cache-0.7.1
+++ b/metadata/md5-cache/dev-python/dogpile-cache-0.7.1
@@ -5,7 +5,7 @@ DESCRIPTION=A locking API for expiring values while a single thread generates a
 EAPI=7
 HOMEPAGE=https://bitbucket.org/zzzeek/dogpile.cache
 IUSE=test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=Apache-2.0
 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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dogpile.cache/dogpile.cache-0.7.1.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c700210f61e4bd9e4188b2cb90c1afc5
+_md5_=7bcbc0a9a26a1b3ccf00ed048bb22c19
diff --git a/metadata/md5-cache/dev-python/elasticsearch-py-7.7.0 b/metadata/md5-cache/dev-python/elasticsearch-py-7.7.0
index dff22ab3bdc9..3cab4f853ccd 100644
--- a/metadata/md5-cache/dev-python/elasticsearch-py-7.7.0
+++ b/metadata/md5-cache/dev-python/elasticsearch-py-7.7.0
@@ -5,7 +5,7 @@ DESCRIPTION=Official Python low-level client for Elasticsearch
 EAPI=7
 HOMEPAGE=https://github.com/elastic/elasticsearch-py
 IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/certifi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/urllib3-1.21.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(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_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 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/elasticsearch/elasticsearch-py/archive/7.7.0.tar.gz -> elasticsearch-py-7.7.0.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-7.7.0-no-jdk-linux-x86_64.tar.gz )
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a478cf7edc3c9f8ae5a01dc8f45feb9b
+_md5_=9d9a27dcbb6f24d978a37cedf6d670dd
diff --git a/metadata/md5-cache/dev-python/elementpath-1.4.5 b/metadata/md5-cache/dev-python/elementpath-1.4.5
index 6c3937d4464f..b66aba4886e7 100644
--- a/metadata/md5-cache/dev-python/elementpath-1.4.5
+++ b/metadata/md5-cache/dev-python/elementpath-1.4.5
@@ -4,7 +4,7 @@ DESCRIPTION=XPath 1.0/2.0 parsers and selectors for ElementTree and lxml
 EAPI=7
 HOMEPAGE=https://github.com/sissaschool/elementpath https://pypi.org/project/elementpath/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/elementpath/elementpath-1.4.5.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=19491db7dbc40f53819a66ab13c69593
+_md5_=46c13284347ba9a69bb4cca402e57b42
diff --git a/metadata/md5-cache/dev-python/falcon-1.3.0 b/metadata/md5-cache/dev-python/falcon-1.3.0
deleted file mode 100644
index 777353f00837..000000000000
--- a/metadata/md5-cache/dev-python/falcon-1.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python-mimeparse[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] cython? ( dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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(-)] 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-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=A supersonic micro-framework for building cloud APIs
-EAPI=5
-HOMEPAGE=http://falconframework.org/ https://pypi.org/project/falcon/
-IUSE=+cython test python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python-mimeparse[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] cython? ( 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(-)]
-REQUIRED_USE=|| ( 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	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d4746271ddea53f4101e958dd1d9bfca
diff --git a/metadata/md5-cache/dev-python/flask-babel-1.0.0 b/metadata/md5-cache/dev-python/flask-babel-1.0.0
index 3c52c3ed29de..bc4ef0a748db 100644
--- a/metadata/md5-cache/dev-python/flask-babel-1.0.0
+++ b/metadata/md5-cache/dev-python/flask-babel-1.0.0
@@ -1,15 +1,15 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/flask-sphinx-themes[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/flask-sphinx-themes[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/flask-sphinx-themes[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/flask-sphinx-themes[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( dev-python/Babel[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_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/flask[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_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/jinja-2.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_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/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-7.3.0: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-42.0.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=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/flask-sphinx-themes[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/flask-sphinx-themes[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/flask-sphinx-themes[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/flask-sphinx-themes[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/flask-sphinx-themes[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( dev-python/Babel[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jinja-2.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/werkzeug[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 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/ https://pypi.org/project/Flask-Babel/ https://github.com/python-babel/flask-babel/
-IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/Babel[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_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/flask[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_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/jinja-2.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_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/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-7.3.0: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 )
+RDEPEND=dev-python/Babel[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jinja-2.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/werkzeug[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Babel/Flask-Babel-1.0.0.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=40db3f784c0a420dab2204b7622ddefa
+_md5_=0905910dc9fdb3faf30fe0909ca1099a
diff --git a/metadata/md5-cache/dev-python/flask-babelex-0.9.4 b/metadata/md5-cache/dev-python/flask-babelex-0.9.4
index f8484b1934fb..fe867c8002f0 100644
--- a/metadata/md5-cache/dev-python/flask-babelex-0.9.4
+++ b/metadata/md5-cache/dev-python/flask-babelex-0.9.4
@@ -1,15 +1,15 @@
-BDEPEND=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/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(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/flask-sphinx-themes[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/flask-sphinx-themes[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/flask-sphinx-themes[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-42.0.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(-)]
+BDEPEND=test? ( dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/Babel-1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/speaklater-1.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jinja-2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/flask-sphinx-themes[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/flask-sphinx-themes[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/flask-sphinx-themes[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/flask-sphinx-themes[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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Adds i18n/l10n support to Flask applications
 EAPI=7
 HOMEPAGE=https://github.com/mrjoes/flask-babelex https://pypi.org/project/Flask-BabelEx/
-IUSE=test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-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 )
+RDEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/Babel-1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/speaklater-1.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jinja-2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-BabelEx/Flask-BabelEx-0.9.4.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=611c11250ebf21724067eb4e9db557ec
+_md5_=052fa29892c4b8faa64d7c7a3d15a7dc
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 61421665f5a1..3a88db0512f9 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,15 @@
 DEFINED_PHASES=compile configure install prepare test
-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-42.0.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(-)]
+DEPEND=test? ( dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 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 python_targets_python3_8
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 x86
 LICENSE=BSD
-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 )
+RDEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Gravatar/Flask-Gravatar-0.5.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=71a136c00a370a8a0f8c744c1d7de208
+_md5_=2dc4926c5f80fc8504957da78486b693
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 64ba3da89e9b..d05d09aba4cf 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,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-42.0.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=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 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 ) 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(-)]
+RDEPEND=app-text/htmlmin[python_targets_python3_6(-)?,python_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(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_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	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=399d586faf19cc84441a5280f435223c
+_md5_=fc23333e00d970ec63bd43b7d2e6bb41
diff --git a/metadata/md5-cache/dev-python/flask-htmlmin-2.0.2 b/metadata/md5-cache/dev-python/flask-htmlmin-2.0.2
new file mode 100644
index 000000000000..7a9c045316d7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-htmlmin-2.0.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( app-text/htmlmin[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Minimize your flask rendered html
+EAPI=7
+HOMEPAGE=https://github.com/hamidfzm/Flask-HTMLmin
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=app-text/htmlmin[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hamidfzm/Flask-HTMLmin/archive/v2.0.2.tar.gz -> Flask-HTMLmin-2.0.2.gh.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d7b6a2d2d38ee20c78886a0c66a2faae
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
index c87e0d6c731e..d3a821db832c 100644
--- a/metadata/md5-cache/dev-python/flask-login-0.4.1-r1
+++ b/metadata/md5-cache/dev-python/flask-login-0.4.1-r1
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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-42.0.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=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 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(-)] )
+DEPEND=doc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/flask-0.10[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/werkzeug[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/blinker[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/semantic_version[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 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
+IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm ~arm64 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-7.3.0: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 )
+RDEPEND=>=dev-python/flask-0.10[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/werkzeug[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 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	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3355af94617616167821e76a7437ef03
+_md5_=51da9d8afd99a14f6f822313a3b9aa86
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 762f0755572c..03ad836240e6 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 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/speaklater[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( 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/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/blinker[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 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/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/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/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-42.0.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=Flask extension for sending email
-EAPI=6
+EAPI=7
 HOMEPAGE=https://pythonhosted.org/Flask-Mail/ https://pypi.org/project/Flask-Mail/
-IUSE=doc test 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 python_targets_python3_9
 KEYWORDS=amd64 x86
 LICENSE=BSD
-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 )
+RDEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/blinker[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Mail/Flask-Mail-0.9.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=353082a4e041b528bd695d8a844c075c
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6f2de9e001dab9a0b483dbbfc1a4d9ce
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 dbf528d76726..f3364bf6f3a0 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_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-42.0.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(-)]
+DEPEND=test? ( dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/blinker[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 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 python_targets_python3_8
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MIT
-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 )
+RDEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/blinker[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 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	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9d87832bd1a7a7022922d53abf9e38b5
+_md5_=d2b1f3abc9cdf46a206389d29b98781c
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 8e4dc337f22e..e5224863cbe8 100644
--- a/metadata/md5-cache/dev-python/flask-security-3.0.0
+++ b/metadata/md5-cache/dev-python/flask-security-3.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-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-42.0.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(-)]
+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(-)] 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-42.0.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=Simple security for Flask apps
 EAPI=6
 HOMEPAGE=https://pythonhosted.org/Flask-Security/ https://pypi.org/project/Flask-Security/
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Security/Flask-Security-3.0.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b420cbe9bb78b2852b53e56079c727e5
+_md5_=1c07498837549941a11da2034b7db0f2
diff --git a/metadata/md5-cache/dev-python/flask-wtf-0.14.3 b/metadata/md5-cache/dev-python/flask-wtf-0.14.3
index 96e753129c54..7cee7b83788c 100644
--- a/metadata/md5-cache/dev-python/flask-wtf-0.14.3
+++ b/metadata/md5-cache/dev-python/flask-wtf-0.14.3
@@ -1,15 +1,15 @@
-BDEPEND=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(-)] 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/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/pytest-4.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-42.0.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(-)]
+BDEPEND=dev-python/Babel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask-babel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/itsdangerous[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/wtforms-1.0.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( 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/Babel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask-babel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/itsdangerous[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/wtforms-1.0.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Simple integration of Flask and WTForms
 EAPI=7
 HOMEPAGE=https://pythonhosted.org/Flask-WTF/ https://pypi.org/project/Flask-WTF/
-IUSE=doc test doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=doc test doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-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 )
+RDEPEND=dev-python/Babel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask-babel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/itsdangerous[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/wtforms-1.0.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-WTF/Flask-WTF-0.14.3.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=51deea0e13193d643e142eef353d4b5f
+_md5_=a66ee7789b73cf27299b608b8300df3e
diff --git a/metadata/md5-cache/dev-python/flexmock-0.10.4 b/metadata/md5-cache/dev-python/flexmock-0.10.4
index 410e141a4c18..5b8ef49bc04f 100644
--- a/metadata/md5-cache/dev-python/flexmock-0.10.4
+++ b/metadata/md5-cache/dev-python/flexmock-0.10.4
@@ -5,7 +5,7 @@ DESCRIPTION=Testing library to create mocks, stubs and fakes
 EAPI=7
 HOMEPAGE=https://flexmock.readthedocs.org/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flexmock/flexmock-0.10.4.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=06bc9061ab0fe7c11e3c19d60b8a9550
+_md5_=4af948e1bf71e78c6e5387d14cc3fddb
diff --git a/metadata/md5-cache/dev-python/gconf-python-2.28.1-r1 b/metadata/md5-cache/dev-python/gconf-python-2.28.1-r1
deleted file mode 100644
index 468b4eb362e7..000000000000
--- a/metadata/md5-cache/dev-python/gconf-python-2.28.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=gnome-base/gconf-2.11.1 !<dev-python/gnome-python-2.22.1 >=app-portage/elt-patches-20170815 dev-util/desktop-file-utils x11-misc/shared-mime-info ~dev-python/gnome-python-base-2.28.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(-)] virtual/pkgconfig
-DESCRIPTION=Python bindings for the GConf library
-EAPI=5
-HOMEPAGE=http://pygtk.org/
-IUSE=examples python_targets_python2_7
-KEYWORDS=~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=gnome-base/gconf-2.11.1 !<dev-python/gnome-python-2.22.1 ~dev-python/gnome-python-base-2.28.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 )
-RESTRICT=test
-SLOT=2
-SRC_URI=mirror://gnome/sources/gnome-python/2.28/gnome-python-2.28.1.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome-python-common-r1	d3d54bc896f354519b228dde9710b24c	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=11ae298947a577d33870683ffd0b0ab1
diff --git a/metadata/md5-cache/dev-python/gnome-python-base-2.28.1-r1 b/metadata/md5-cache/dev-python/gnome-python-base-2.28.1-r1
deleted file mode 100644
index 08b3f3f5d3d3..000000000000
--- a/metadata/md5-cache/dev-python/gnome-python-base-2.28.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=x11-libs/gtk+-2.6: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.14.0:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygobject-2.17:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !<dev-python/gnome-python-2.22.1 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Provides the base files for the gnome-python bindings
-EAPI=5
-HOMEPAGE=http://pygtk.org/
-IUSE=python_targets_python2_7
-KEYWORDS=~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=x11-libs/gtk+-2.6: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.14.0:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygobject-2.17:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !<dev-python/gnome-python-2.22.1
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=2
-SRC_URI=mirror://gnome/sources/gnome-python/2.28/gnome-python-2.28.1.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9b6f264dfa4c32bfc8c940d76275927b
diff --git a/metadata/md5-cache/dev-python/gst-python-1.16.2 b/metadata/md5-cache/dev-python/gst-python-1.16.2
index 5b63479d9a28..07efa0498b59 100644
--- a/metadata/md5-cache/dev-python/gst-python-1.16.2
+++ b/metadata/md5-cache/dev-python/gst-python-1.16.2
@@ -5,11 +5,11 @@ DESCRIPTION=A Python Interface to GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_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(-)] >=media-libs/gstreamer-1.16.2:1.0[introspection] >=media-libs/gst-plugins-base-1.16.2:1.0[introspection] >=dev-python/pygobject-3.8: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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.16.2.tar.xz
 _eclasses_=meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ab7fa6f4f343099e471b3db9a3e6ef86
+_md5_=4470901b632982b9fc5c92c8f9238a68
diff --git a/metadata/md5-cache/dev-python/html5lib-1.1 b/metadata/md5-cache/dev-python/html5lib-1.1
new file mode 100644
index 000000000000..50baa47981ee
--- /dev/null
+++ b/metadata/md5-cache/dev-python/html5lib-1.1
@@ -0,0 +1,15 @@
+BDEPEND=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_targets_python3_9(-)?,-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_9(-)] dev-python/webencodings[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] dev-python/pytest-expect[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] ) 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_targets_python3_9(-)?,-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_9(-)] dev-python/webencodings[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[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_targets_python3_9(-)?,-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_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=HTML parser based on the HTML5 specification
+EAPI=7
+HOMEPAGE=https://github.com/html5lib/html5lib-python/ https://html5lib.readthedocs.org
+IUSE=test test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=>=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_targets_python3_9(-)?,-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_9(-)] dev-python/webencodings[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[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_targets_python3_9(-)?,-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_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/h/html5lib/html5lib-1.1.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8cb81b04922c47be939454b9598debbc
diff --git a/metadata/md5-cache/dev-python/humanize-2.4.1 b/metadata/md5-cache/dev-python/humanize-2.4.1
new file mode 100644
index 000000000000..6f728cba3586
--- /dev/null
+++ b/metadata/md5-cache/dev-python/humanize-2.4.1
@@ -0,0 +1,15 @@
+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/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(-)] test? ( 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(-)] 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-7.3.0: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=Common humanization utilities
+EAPI=7
+HOMEPAGE=https://github.com/jmoiron/humanize/
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=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-7.3.0: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/h/humanize/humanize-2.4.1.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e0fd98ac9dce50b81e0621ecf2dc76d6
diff --git a/metadata/md5-cache/dev-python/hypothesis-5.16.3 b/metadata/md5-cache/dev-python/hypothesis-5.16.3
new file mode 100644
index 000000000000..4ee6e4d81aec
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-5.16.3
@@ -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_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-5.3.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !!<dev-python/typing-3.7.4.1 ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+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 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~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_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-5.16.3.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d3a77c193ba2817b6a68d8c55195da54
diff --git a/metadata/md5-cache/dev-python/hypothesis-5.18.0 b/metadata/md5-cache/dev-python/hypothesis-5.18.0
new file mode 100644
index 000000000000..f8300812428f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-5.18.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_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-5.3.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !!<dev-python/typing-3.7.4.1 ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+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 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~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_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-5.18.0.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d3a77c193ba2817b6a68d8c55195da54
diff --git a/metadata/md5-cache/dev-python/hypothesis-5.18.1 b/metadata/md5-cache/dev-python/hypothesis-5.18.1
new file mode 100644
index 000000000000..feb82cff5670
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-5.18.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_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-5.3.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !!<dev-python/typing-3.7.4.1 ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+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 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~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_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-5.18.1.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d3a77c193ba2817b6a68d8c55195da54
diff --git a/metadata/md5-cache/dev-python/hypothesis-5.18.3 b/metadata/md5-cache/dev-python/hypothesis-5.18.3
new file mode 100644
index 000000000000..45f44fe6a7aa
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-5.18.3
@@ -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_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-5.3.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !!<dev-python/typing-3.7.4.1 ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+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 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~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_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-5.18.3.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d3a77c193ba2817b6a68d8c55195da54
diff --git a/metadata/md5-cache/dev-python/idna-2.10 b/metadata/md5-cache/dev-python/idna-2.10
new file mode 100644
index 000000000000..f3ee4667a147
--- /dev/null
+++ b/metadata/md5-cache/dev-python/idna-2.10
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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_targets_python3_9(-)?,-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_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Internationalized Domain Names in Applications (IDNA)
+EAPI=7
+HOMEPAGE=https://github.com/kjd/idna https://pypi.org/project/idna/
+IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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_targets_python3_9(-)?,-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_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/i/idna/idna-2.10.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6a0f75fd0bb88db14cf15d48bf80d950
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-1.6.1 b/metadata/md5-cache/dev-python/importlib_metadata-1.6.1
index 7c3e7e3a7d47..e90310271d98 100644
--- a/metadata/md5-cache/dev-python/importlib_metadata-1.6.1
+++ b/metadata/md5-cache/dev-python/importlib_metadata-1.6.1
@@ -4,7 +4,7 @@ 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=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~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-7.3.0: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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/importlib_metadata/importlib_metadata-1.6.1.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e67456e105fbe88e4ecb4491d0c13bb3
+_md5_=b02cc3b0d9443be48839e67ce7c29dca
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-1.7.0 b/metadata/md5-cache/dev-python/importlib_metadata-1.7.0
new file mode 100644
index 000000000000..44fb413bd880
--- /dev/null
+++ b/metadata/md5-cache/dev-python/importlib_metadata-1.7.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( 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/importlib_resources-1.3.0[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_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python2_7? ( >=dev-python/importlib_resources-1.3.0[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_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_6? ( >=dev-python/importlib_resources-1.3.0[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_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( >=dev-python/importlib_resources-1.3.0[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_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( >=dev-python/importlib_resources-1.3.0[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_8(-)?,-python_single_target_python3_8(-)] ) 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/pyfakefs[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-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/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/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/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/rst-linker-1.9[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] >=dev-python/rst-linker-1.9[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( 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-7.3.0: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-42.0.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
+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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~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-7.3.0: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.7.0.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b02cc3b0d9443be48839e67ce7c29dca
diff --git a/metadata/md5-cache/dev-python/ipython-7.16.1 b/metadata/md5-cache/dev-python/ipython-7.16.1
new file mode 100644
index 000000000000..95c1bd78ea30
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ipython-7.16.1
@@ -0,0 +1,17 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[readline,sqlite,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[readline,sqlite,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/backcall[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/decorator[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jedi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pickleshare[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/prompt_toolkit-2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/prompt_toolkit-3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/traitlets[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] matplotlib? ( dev-python/matplotlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nbformat[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.14[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/testpath[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/matplotlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sphinx-2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DESCRIPTION=Advanced interactive shell for Python
+EAPI=7
+HOMEPAGE=https://ipython.org/ https://github.com/ipython/ipython/
+IUSE=doc examples matplotlib notebook nbconvert qt5 +smp test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+PDEPEND=notebook? ( dev-python/notebook[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipywidgets[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/widgetsnbextension[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) qt5? ( dev-python/qtconsole[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) smp? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/ipyparallel-6.2.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+RDEPEND=dev-python/backcall[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/decorator[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jedi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pickleshare[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/prompt_toolkit-2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/prompt_toolkit-3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/traitlets[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] matplotlib? ( dev-python/matplotlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) nbconvert? ( dev-python/nbconvert[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[readline,sqlite,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[readline,sqlite,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/ipython/ipython-7.16.1.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
+_md5_=4ab7bf921480b1d656538a06508a3241
diff --git a/metadata/md5-cache/dev-python/isort-4.3.21_p2-r1 b/metadata/md5-cache/dev-python/isort-4.3.21_p2-r1
index 2c507745b4e5..05476918658f 100644
--- a/metadata/md5-cache/dev-python/isort-4.3.21_p2-r1
+++ b/metadata/md5-cache/dev-python/isort-4.3.21_p2-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A python utility/library to sort imports
 EAPI=7
 HOMEPAGE=https://pypi.org/project/isort/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 arm arm64 ~ia64 ~ppc ~ppc64 sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~ia64 ppc ppc64 sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/pipfile[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_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-7.3.0: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-42.0.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 )
@@ -12,4 +12,4 @@ 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	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8bd6658777842d928a4751cbee90e268
+_md5_=e694af64c9368d4a609158155900b5cd
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 e92da01c479e..d382cfe4c9a3 100644
--- a/metadata/md5-cache/dev-python/jaraco-classes-3.1.0
+++ b/metadata/md5-cache/dev-python/jaraco-classes-3.1.0
@@ -5,7 +5,7 @@ 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_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/namespace-jaraco-2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.classes/jaraco.classes-3.1.0.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ab30dc2f2ef950d3b8194592654f768d
+_md5_=ef54ea7159311fcf0d5c73317ad95a0b
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 0151d271b3b1..7307e82c8e22 100644
--- a/metadata/md5-cache/dev-python/jaraco-collections-3.0.0
+++ b/metadata/md5-cache/dev-python/jaraco-collections-3.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Models and classes to supplement the stdlib collections module
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/jaraco.collections
 IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm 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_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-classes[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-text[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.7.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.collections/jaraco.collections-3.0.0.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0b09379e472c5d3a41aad0ef6f804567
+_md5_=ae3590cbc3259e8b20d3d9c03e46c319
diff --git a/metadata/md5-cache/dev-python/jaraco-functools-3.0.1 b/metadata/md5-cache/dev-python/jaraco-functools-3.0.1
index f08e4cd65a20..2d993cabc921 100644
--- a/metadata/md5-cache/dev-python/jaraco-functools-3.0.1
+++ b/metadata/md5-cache/dev-python/jaraco-functools-3.0.1
@@ -4,7 +4,7 @@ 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_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/namespace-jaraco-2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.functools/jaraco.functools-3.0.1.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=476fcf0bcbd54385efa352add53e9745
+_md5_=49f7ebbc6bf9f0e92f3b82a1e6099a26
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 3acda4c281b6..9ee5d1eeac33 100644
--- a/metadata/md5-cache/dev-python/jaraco-text-3.2.0
+++ b/metadata/md5-cache/dev-python/jaraco-text-3.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=Text utilities used by other projects by developer jaraco
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/jaraco.text
 IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/jaraco-functools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/namespace-jaraco-2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-python/importlib_resources[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.text/jaraco.text-3.2.0.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e4ca2baddae1d2c47cac04da90354ca5
+_md5_=9401eed5887d298c2e2bce4ca6ccb183
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 182eff3091b3..f1cb5b05c1de 100644
--- a/metadata/md5-cache/dev-python/jmespath-0.9.3-r1
+++ b/metadata/md5-cache/dev-python/jmespath-0.9.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=JSON Matching Expressions
 EAPI=7
 HOMEPAGE=https://github.com/jmespath/jmespath.py https://pypi.org/project/jmespath/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jmespath/jmespath-0.9.3.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=17a42c6c076f15e372b1a7c35314194d
+_md5_=ba2aa259373eea347d9d06a68d136593
diff --git a/metadata/md5-cache/dev-python/joblib-0.15.1-r1 b/metadata/md5-cache/dev-python/joblib-0.15.1-r1
index 9675507e9a2f..2a11602978b3 100644
--- a/metadata/md5-cache/dev-python/joblib-0.15.1-r1
+++ b/metadata/md5-cache/dev-python/joblib-0.15.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Tools to provide lightweight pipelining in Python
 EAPI=7
 HOMEPAGE=https://joblib.readthedocs.io/en/latest/ https://github.com/joblib/joblib
 IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/cloudpickle[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/loky[python_targets_python3_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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/joblib/joblib/archive/0.15.1.tar.gz -> joblib-0.15.1.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2b49b286989590832566cdc73d4b2a0b
+_md5_=65a1193f4e946adce464eed37c67451a
diff --git a/metadata/md5-cache/dev-python/jsonpatch-1.25 b/metadata/md5-cache/dev-python/jsonpatch-1.25
index 5a15014acb40..e0ffcac6be4a 100644
--- a/metadata/md5-cache/dev-python/jsonpatch-1.25
+++ b/metadata/md5-cache/dev-python/jsonpatch-1.25
@@ -4,7 +4,7 @@ DESCRIPTION=Apply JSON-Patches like http://tools.ietf.org/html/draft-pbryan-json
 EAPI=7
 HOMEPAGE=https://github.com/stefankoegl/python-json-patch
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/jsonpointer-1.9[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/stefankoegl/python-json-patch/archive/v1.25.tar.gz -> jsonpatch-1.25.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=03fe4e3441bfdf76c2549034d78256c4
+_md5_=da84bf9a29e4ae5764806c15beb6444c
diff --git a/metadata/md5-cache/dev-python/jsonpatch-1.26 b/metadata/md5-cache/dev-python/jsonpatch-1.26
new file mode 100644
index 000000000000..faac9da0ca55
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jsonpatch-1.26
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/jsonpointer-1.9[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Apply JSON-Patches like http://tools.ietf.org/html/draft-pbryan-json-patch-04
+EAPI=7
+HOMEPAGE=https://github.com/stefankoegl/python-json-patch
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-python/jsonpointer-1.9[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/stefankoegl/python-json-patch/archive/v1.26.tar.gz -> jsonpatch-1.26.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a692ae6548a470023aade84912ecf0d7
diff --git a/metadata/md5-cache/dev-python/latexcodec-2.0.0 b/metadata/md5-cache/dev-python/latexcodec-2.0.0
new file mode 100644
index 000000000000..144912606b2d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/latexcodec-2.0.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-4.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-42.0.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=Lexer and codec to work with LaTeX code in Python
+EAPI=7
+HOMEPAGE=https://github.com/mcmtroffaes/latexcodec/ https://pypi.org/project/pybtex/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+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(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/l/latexcodec/latexcodec-2.0.0.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=fbfe2b61408eaf0e35a228f941944009
diff --git a/metadata/md5-cache/dev-python/lit-10.0.0 b/metadata/md5-cache/dev-python/lit-10.0.0
index 1f773fe244b3..113c1589f1af 100644
--- a/metadata/md5-cache/dev-python/lit-10.0.0
+++ b/metadata/md5-cache/dev-python/lit-10.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/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=82227748b5116f2c614059c228df94e9
diff --git a/metadata/md5-cache/dev-python/lit-10.0.1.9999 b/metadata/md5-cache/dev-python/lit-10.0.1.9999
index a97c3a8c5f0c..ce10c50ebc18 100644
--- a/metadata/md5-cache/dev-python/lit-10.0.1.9999
+++ b/metadata/md5-cache/dev-python/lit-10.0.1.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 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=71691a2303769e9c4b6416e13337593f
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a493a878f42df6ce57284b750caa3713
diff --git a/metadata/md5-cache/dev-python/lit-10.0.1_rc1 b/metadata/md5-cache/dev-python/lit-10.0.1_rc1
index ce46d17db2aa..a9b33f77d4bc 100644
--- a/metadata/md5-cache/dev-python/lit-10.0.1_rc1
+++ b/metadata/md5-cache/dev-python/lit-10.0.1_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.1-rc1.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=71691a2303769e9c4b6416e13337593f
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a493a878f42df6ce57284b750caa3713
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 a97c3a8c5f0c..ce10c50ebc18 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 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=71691a2303769e9c4b6416e13337593f
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a493a878f42df6ce57284b750caa3713
diff --git a/metadata/md5-cache/dev-python/lit-9.0.1 b/metadata/md5-cache/dev-python/lit-9.0.1
index b882fec7769d..b3365df96201 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	44725b3eb803b8abcd6978759c231210	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0b4627bda23b5a144ae9fcb38ecda3f2
diff --git a/metadata/md5-cache/dev-python/loky-2.8.0 b/metadata/md5-cache/dev-python/loky-2.8.0
index 6b9b7cac4573..b8263910c840 100644
--- a/metadata/md5-cache/dev-python/loky-2.8.0
+++ b/metadata/md5-cache/dev-python/loky-2.8.0
@@ -4,7 +4,7 @@ DESCRIPTION=Robust and reusable Executor for joblib
 EAPI=7
 HOMEPAGE=https://github.com/joblib/loky
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/cloudpickle[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] 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(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/joblib/loky/archive/2.8.0.tar.gz -> loky-2.8.0.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bca04d61da3d6834fb26c4a73c6ed14a
+_md5_=598fc22f5c9e84145617edc467e8c7a5
diff --git a/metadata/md5-cache/dev-python/moto-1.3.14-r1 b/metadata/md5-cache/dev-python/moto-1.3.14-r1
index 39954f1888f3..1c6456e2235f 100644
--- a/metadata/md5-cache/dev-python/moto-1.3.14-r1
+++ b/metadata/md5-cache/dev-python/moto-1.3.14-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Mock library for boto
 EAPI=7
 HOMEPAGE=https://github.com/spulec/moto
 IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-python/backports-tempfile[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/backports-tempfile[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/cfn-python-lint[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-2.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cookies[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/dicttoxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/docker-py-2.5.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsondiff-1.1.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/boto-2.36.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/boto3-1.9.201[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/botocore-1.12.201[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pretty-yaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyyaml-5.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-dateutil-2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-jose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-sshpubkeys[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/responses-0.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/xmltodict[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/moto/moto-1.3.14.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=676c73646defc2085506764b9b256e75
+_md5_=a41af44de67498ece19e06bf290a7f38
diff --git a/metadata/md5-cache/dev-python/munch-2.5.0-r1 b/metadata/md5-cache/dev-python/munch-2.5.0-r1
index 0f06efb5b0e6..0a6b8eb8356b 100644
--- a/metadata/md5-cache/dev-python/munch-2.5.0-r1
+++ b/metadata/md5-cache/dev-python/munch-2.5.0-r1
@@ -4,7 +4,7 @@ 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 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/munch/munch-2.5.0.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9153a914847de545ee615f30ed0ebe87
+_md5_=52949e075aa259fd52a8ac98f7b46b37
diff --git a/metadata/md5-cache/dev-python/mypy-0.781 b/metadata/md5-cache/dev-python/mypy-0.781
new file mode 100644
index 000000000000..636132b7742b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mypy-0.781
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+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/flake8[python_targets_python3_6(-)?,python_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-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/pytest-xdist-1.18[python_targets_python3_6(-)?,python_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-cov-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(-)] >=dev-python/psutil-5.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(-)] >=dev-python/lxml-4.1.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/py-1.5.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/virtualenv-16.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(-)] ) 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(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_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-42.0.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=Optional static typing for Python
+EAPI=6
+HOMEPAGE=http://www.mypy-lang.org/
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=!dev-util/stubgen >=dev-python/psutil-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/typed-ast-1.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(-)] <dev-python/typed-ast-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/typing-extensions-3.7.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/mypy_extensions-0.4.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/mypy_extensions-0.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(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/python/mypy/archive/v0.781.tar.gz -> mypy-0.781.tar.gz https://api.github.com/repos/python/typeshed/tarball/e199c2e -> mypy-typeshed-0.781-e199c2e.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4b6f0a4ef8ab9a9dcade6625e5d8d3be
diff --git a/metadata/md5-cache/dev-python/namespace-repoze-1 b/metadata/md5-cache/dev-python/namespace-repoze-1
index ec0036907c76..d6f46bd52ecc 100644
--- a/metadata/md5-cache/dev-python/namespace-repoze-1
+++ b/metadata/md5-cache/dev-python/namespace-repoze-1
@@ -4,10 +4,10 @@ DESCRIPTION=Namespace package declaration for repoze
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages
 IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=public-domain
 RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=94b7910dc0ca33d8344269bd669b1d37
+_md5_=f9250e998ead2c7fe439fee6be4a532b
diff --git a/metadata/md5-cache/dev-python/netifaces-0.10.9 b/metadata/md5-cache/dev-python/netifaces-0.10.9
index 940bca027cf2..a32c679a3ca8 100644
--- a/metadata/md5-cache/dev-python/netifaces-0.10.9
+++ b/metadata/md5-cache/dev-python/netifaces-0.10.9
@@ -5,11 +5,11 @@ DESCRIPTION=Portable network interface information
 EAPI=7
 HOMEPAGE=https://pypi.org/project/netifaces/ https://alastairs-place.net/projects/netifaces/ https://github.com/al45tair/netifaces
 IUSE=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 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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/n/netifaces/netifaces-0.10.9.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c603e4c5d0f55028e66e9857004b8c0d
+_md5_=157484856b149f8adbe55f398a2483ec
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 0943975318c9..f65a033bc5ba 100644
--- a/metadata/md5-cache/dev-python/notify2-0.3.1-r1
+++ b/metadata/md5-cache/dev-python/notify2-0.3.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Python interface to DBus notifications.
 EAPI=6
 HOMEPAGE=https://bitbucket.org/takluyver/pynotify2
 IUSE=examples python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 test
-KEYWORDS=amd64 arm ppc ppc64 x86
+KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/notify2/notify2-0.3.1.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f44a0aa9d36eeb03e8e717469e4f1c4b
+_md5_=6b405ef38082070b58116f8751d3ccf5
diff --git a/metadata/md5-cache/dev-python/nuitka-0.6.6 b/metadata/md5-cache/dev-python/nuitka-0.6.6
deleted file mode 100644
index 4561a1526ff3..000000000000
--- a/metadata/md5-cache/dev-python/nuitka-0.6.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/scons[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-42.0.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 prepare test
-DESCRIPTION=Python to native compiler
-EAPI=7
-HOMEPAGE=https://www.nuitka.net
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-util/scons[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/appdirs[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-42.0.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://nuitka.net/releases/Nuitka-0.6.6.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d852a04014acf179eef244647633b12d
diff --git a/metadata/md5-cache/dev-python/nuitka-0.6.8 b/metadata/md5-cache/dev-python/nuitka-0.6.8
new file mode 100644
index 000000000000..ca60318e6fbb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nuitka-0.6.8
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/scons[python_targets_python3_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-42.0.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 postinst prepare test
+DESCRIPTION=Python to native compiler
+EAPI=7
+HOMEPAGE=https://www.nuitka.net
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-util/scons[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/appdirs[python_targets_python3_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-42.0.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://nuitka.net/releases/Nuitka-0.6.8.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2ccf322398ffeb74fc4930310bcdf81f
diff --git a/metadata/md5-cache/dev-python/objgraph-3.4.1 b/metadata/md5-cache/dev-python/objgraph-3.4.1
index 0aa52dfd7d84..f56c3f318c25 100644
--- a/metadata/md5-cache/dev-python/objgraph-3.4.1
+++ b/metadata/md5-cache/dev-python/objgraph-3.4.1
@@ -1,16 +1,15 @@
-BDEPEND=test? ( media-gfx/graphviz ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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-42.0.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=test? ( media-gfx/xdot ) test? ( media-gfx/graphviz ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools test? ( media-gfx/xdot )
 DESCRIPTION=Draws Python object reference graphs with graphviz
 EAPI=7
 HOMEPAGE=https://mg.pov.lt/objgraph/
-IUSE=doc test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=media-gfx/graphviz python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) !test? ( test )
+RDEPEND=media-gfx/graphviz python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/objgraph/objgraph-3.4.1.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=07b48cf513061e011efdffd5ec4f6b94
+_md5_=f2e4c318a6fcf5d611176a414583d24f
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 b87aee2bd1d4..988d5a9a16fa 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
@@ -5,11 +5,11 @@ DESCRIPTION=A library to handle official service types for OpenStack and it's al
 EAPI=7
 HOMEPAGE=https://github.com/openstack/os-service-types
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-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_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pbr-2.1.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(-)]
 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	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=39af084f2d9bbc982eb4cf885cd17159
+_md5_=1bed0cec51c6b20302292e2b41dde1be
diff --git a/metadata/md5-cache/dev-python/oslo-config-8.0.2 b/metadata/md5-cache/dev-python/oslo-config-8.0.2
deleted file mode 100644
index a9c88b471cd3..000000000000
--- a/metadata/md5-cache/dev-python/oslo-config-8.0.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-42.0.2[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(-)]
-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
-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/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(-)] >=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-8.0.2.tar.gz -> oslo-config-8.0.2.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d7084871c97995971f98ee641d5de709
diff --git a/metadata/md5-cache/dev-python/oslo-config-8.0.3 b/metadata/md5-cache/dev-python/oslo-config-8.0.3
new file mode 100644
index 000000000000..0e7910af855b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-config-8.0.3
@@ -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-42.0.2[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(-)]
+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
+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/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(-)] >=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-8.0.3.tar.gz -> oslo-config-8.0.3.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d7084871c97995971f98ee641d5de709
diff --git a/metadata/md5-cache/dev-python/oslo-messaging-12.1.1 b/metadata/md5-cache/dev-python/oslo-messaging-12.1.1
new file mode 100644
index 000000000000..acc87667dba5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-messaging-12.1.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_7(-)?,-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_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/futurist-1.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.37.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.24.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/oslo-service-1.28.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/monotonic-0.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/cachetools-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/py-amqp-2.5.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/kombu-4.6.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[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
+SRC_URI=mirror://pypi/o/oslo.messaging/oslo.messaging-12.1.1.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a79361e3a1e10f26448f7f41e522bffb
diff --git a/metadata/md5-cache/dev-python/ovs-2.10.0-r1 b/metadata/md5-cache/dev-python/ovs-2.10.0-r1
deleted file mode 100644
index fb9c7bc9e372..000000000000
--- a/metadata/md5-cache/dev-python/ovs-2.10.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/sortedcontainers[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-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=OVS bindings for python.
-EAPI=6
-HOMEPAGE=https://github.com/openvswitch/ovs/
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-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 )
-SLOT=0
-SRC_URI=mirror://pypi/o/ovs/ovs-2.10.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c9270657e9676c4faa8254b1ab31a2f0
diff --git a/metadata/md5-cache/dev-python/ovs-2.13.0 b/metadata/md5-cache/dev-python/ovs-2.13.0
index 08835af8b7cb..5ddb4e6f3aec 100644
--- a/metadata/md5-cache/dev-python/ovs-2.13.0
+++ b/metadata/md5-cache/dev-python/ovs-2.13.0
@@ -5,11 +5,11 @@ DESCRIPTION=OVS bindings for python.
 EAPI=7
 HOMEPAGE=https://github.com/openvswitch/ovs/
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=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(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/ovs/ovs-2.13.0.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=70fbe961406337e07fd8a0841c77fffd
+_md5_=b03465fe5d5fedef604c3033ab215dec
diff --git a/metadata/md5-cache/dev-python/pipfile-0.0.2 b/metadata/md5-cache/dev-python/pipfile-0.0.2
index d487478c45ea..872d3c55acc1 100644
--- a/metadata/md5-cache/dev-python/pipfile-0.0.2
+++ b/metadata/md5-cache/dev-python/pipfile-0.0.2
@@ -4,7 +4,7 @@ DESCRIPTION=Replacement for the existing standard pip's requirements.txt file
 EAPI=7
 HOMEPAGE=https://github.com/pypa/pipfile
 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 ~ppc ~ppc64 sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~ia64 ppc ppc64 sparc ~x86
 LICENSE=Apache-2.0 BSD-2
 RDEPEND=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-7.3.0: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 )
@@ -12,4 +12,4 @@ 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	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=682ff94b6d4d18f5108c1f235253aec0
+_md5_=c00531af7b1fea095d9b7cf69d512bdb
diff --git a/metadata/md5-cache/dev-python/portend-2.6 b/metadata/md5-cache/dev-python/portend-2.6
index 050de30f9877..076b2d7ef180 100644
--- a/metadata/md5-cache/dev-python/portend-2.6
+++ b/metadata/md5-cache/dev-python/portend-2.6
@@ -4,7 +4,7 @@ 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_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/tempora-1.8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/portend/portend-2.6.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e12b550c0db673b5a5075d8248a34af7
+_md5_=4054c4f6cb18f308f69bc76ba9e0b88a
diff --git a/metadata/md5-cache/dev-python/pudb-2019.2 b/metadata/md5-cache/dev-python/pudb-2019.2
new file mode 100644
index 000000000000..31ddec44221f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pudb-2019.2
@@ -0,0 +1,15 @@
+BDEPEND=python_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_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/urwid[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygments[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=A full-screen, console-based Python debugger
+EAPI=7
+HOMEPAGE=https://pypi.org/project/pudb/
+IUSE=python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-python/urwid[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygments[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_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_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pudb/pudb-2019.2.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=91f1d0842dcadb1d821db156bcfde97c
diff --git a/metadata/md5-cache/dev-python/pybtex-0.22.2 b/metadata/md5-cache/dev-python/pybtex-0.22.2
new file mode 100644
index 000000000000..a95faa78478f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pybtex-0.22.2
@@ -0,0 +1,15 @@
+BDEPEND=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(-)] ) test? ( dev-python/latexcodec[python_targets_python3_6(-)?,python_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(-)] 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-4.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-42.0.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=BibTeX-compatible bibliography processor
+EAPI=7
+HOMEPAGE=https://pybtex.org https://pypi.org/project/pybtex/
+IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/latexcodec[python_targets_python3_6(-)?,python_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(-)] 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-42.0.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=https://files.pythonhosted.org/packages/source/p/pybtex/pybtex-0.22.2.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2993ac9323ce611084963ec3ca533725
diff --git a/metadata/md5-cache/dev-python/pycryptodome-3.9.7 b/metadata/md5-cache/dev-python/pycryptodome-3.9.7
index 91f8c255eedf..00b42f60a013 100644
--- a/metadata/md5-cache/dev-python/pycryptodome-3.9.7
+++ b/metadata/md5-cache/dev-python/pycryptodome-3.9.7
@@ -4,7 +4,7 @@ DESCRIPTION=A self-contained cryptographic library for Python
 EAPI=7
 HOMEPAGE=https://www.pycryptodome.org https://github.com/Legrandin/pycryptodome https://pypi.org/project/pycryptodome/
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2 Unlicense
 RDEPEND=dev-libs/gmp:0 virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] !dev-python/pycrypto python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[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_targets_python3_9(-)?,-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_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycryptodome/pycryptodome-3.9.7.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1a232961c79f7a365c640b0d4e57c1c4
+_md5_=c4d427e2702a4a8330fab39d897da7c8
diff --git a/metadata/md5-cache/dev-python/pycryptodome-3.9.8 b/metadata/md5-cache/dev-python/pycryptodome-3.9.8
new file mode 100644
index 000000000000..631d36ee701d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pycryptodome-3.9.8
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/gmp:0 virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] !dev-python/pycrypto test? ( dev-libs/gmp:0 virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] !dev-python/pycrypto ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[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_targets_python3_9(-)?,-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_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A self-contained cryptographic library for Python
+EAPI=7
+HOMEPAGE=https://www.pycryptodome.org https://github.com/Legrandin/pycryptodome https://pypi.org/project/pycryptodome/
+IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD-2 Unlicense
+RDEPEND=dev-libs/gmp:0 virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] !dev-python/pycrypto python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[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_targets_python3_9(-)?,-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_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pycryptodome/pycryptodome-3.9.8.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1a232961c79f7a365c640b0d4e57c1c4
diff --git a/metadata/md5-cache/dev-python/pyfakefs-3.7.2 b/metadata/md5-cache/dev-python/pyfakefs-3.7.2
index 5ac760d79ce1..5cdc5ff4dc28 100644
--- a/metadata/md5-cache/dev-python/pyfakefs-3.7.2
+++ b/metadata/md5-cache/dev-python/pyfakefs-3.7.2
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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-42.0.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=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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_targets_python3_9(-)?,-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_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)]
 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/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=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] )
 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
+IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~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-7.3.0: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-42.0.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[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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_targets_python3_9(-)?,-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_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jmcgeheeiv/pyfakefs/archive/v3.7.2.tar.gz -> pyfakefs-3.7.2.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5f82c0ee17bd5a460b000c59d9cd2d32
+_md5_=14842e3b9c12c243aa8bb17f68b88fbd
diff --git a/metadata/md5-cache/dev-python/pyfakefs-4.0.2 b/metadata/md5-cache/dev-python/pyfakefs-4.0.2
index 49859d60345d..15524a313e86 100644
--- a/metadata/md5-cache/dev-python/pyfakefs-4.0.2
+++ b/metadata/md5-cache/dev-python/pyfakefs-4.0.2
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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-42.0.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=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 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/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(-)] )
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 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_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=Apache-2.0
-RDEPEND=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-7.3.0: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-42.0.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 )
+RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jmcgeheeiv/pyfakefs/archive/v4.0.2.tar.gz -> pyfakefs-4.0.2.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1887de19fdfce16bfe7f3ffb54f0ebfc
+_md5_=6a520f4db2811612c78e87d3a9bf19c4
diff --git a/metadata/md5-cache/dev-python/pygtksourceview-2.10.1-r1 b/metadata/md5-cache/dev-python/pygtksourceview-2.10.1-r1
deleted file mode 100644
index 766193d8bbf2..000000000000
--- a/metadata/md5-cache/dev-python/pygtksourceview-2.10.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygobject-2.15.2:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygtk-2.8:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=x11-libs/gtksourceview-2.9.7:2.0 >=dev-util/gtk-doc-am-1.10 virtual/pkgconfig doc? ( dev-libs/libxslt ~app-text/docbook-xml-dtd-4.1.2 >=app-text/docbook-xsl-stylesheets-1.70.1 ) >=app-portage/elt-patches-20170815 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GTK+2 bindings for Python
-EAPI=5
-HOMEPAGE=http://www.pygtk.org/
-IUSE=doc python_targets_python2_7
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~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-python/pygobject-2.15.2:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygtk-2.8:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=x11-libs/gtksourceview-2.9.7:2.0
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=2
-SRC_URI=mirror://gnome/sources/pygtksourceview/2.10/pygtksourceview-2.10.1.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e4b0702b57f0490da7706fdee0565f56
diff --git a/metadata/md5-cache/dev-python/pykerberos-1.3.0 b/metadata/md5-cache/dev-python/pykerberos-1.3.0
new file mode 100644
index 000000000000..2411c1272cee
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pykerberos-1.3.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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-crypt/mit-krb5
+DESCRIPTION=A high-level Python wrapper for Kerberos/GSSAPI operations
+EAPI=7
+HOMEPAGE=https://trac.calendarserver.org/wiki/PyKerberos https://github.com/apple/ccs-pykerberos/ https://pypi.org/project/kerberos/
+IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=app-crypt/mit-krb5 python_targets_python2_7? ( >=dev-lang/python-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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/apple/ccs-pykerberos/archive/PyKerberos-1.3.0.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4582cb2676ef3b31ba53769bf33b7612
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 3c6d6b14467e..0f7296dea6f4 100644
--- a/metadata/md5-cache/dev-python/pylibmc-1.6.1-r1
+++ b/metadata/md5-cache/dev-python/pylibmc-1.6.1-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Libmemcached wrapper written as a Python extension
 EAPI=7
 HOMEPAGE=https://sendapatch.se/projects/pylibmc/ https://pypi.org/project/pylibmc/ https://github.com/lericson/pylibmc/
 IUSE=test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=BSD
 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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ 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	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e48edc4ef49e0340f5b18de504001d5f
+_md5_=e6278f779093db83f60518eafe8606a1
diff --git a/metadata/md5-cache/dev-python/pymongo-3.10.1 b/metadata/md5-cache/dev-python/pymongo-3.10.1
index ab2a0767ec20..07e6dceb2617 100644
--- a/metadata/md5-cache/dev-python/pymongo-3.10.1
+++ b/metadata/md5-cache/dev-python/pymongo-3.10.1
@@ -1,16 +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-42.0.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=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_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( 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(+)] ) ) ) python_targets_python2_7? ( >=dev-lang/python-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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 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
+IUSE=doc kerberos test doc python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 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 )
+RDEPEND=kerberos? ( dev-python/pykerberos[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python2_7? ( >=dev-lang/python-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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pymongo/pymongo-3.10.1.tar.gz
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=df2ef4ade01b0c3d5f77e946f36a1013
+_md5_=1409734a7ceac20c6057e9abb1ef1271
diff --git a/metadata/md5-cache/dev-python/pyopencl-2019.1.2 b/metadata/md5-cache/dev-python/pyopencl-2019.1.2
index 27d563d73684..a091734b79d3 100644
--- a/metadata/md5-cache/dev-python/pyopencl-2019.1.2
+++ b/metadata/md5-cache/dev-python/pyopencl-2019.1.2
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/appdirs-1.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(-)] >=dev-python/decorator-3.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/mako[python_targets_python3_6(-)?,python_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(-)] >=dev-python/pytools-2017.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/pybind11[python_targets_python3_6(-)?,python_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(-)] >=virtual/opencl-2 >=dev-python/pytest-4.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-42.0.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(-)]
+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-42.0.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=>=dev-python/appdirs-1.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(-)] >=dev-python/decorator-3.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/mako[python_targets_python3_6(-)?,python_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(-)] >=dev-python/pytools-2017.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/pybind11[python_targets_python3_6(-)?,python_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(-)] >=virtual/opencl-2
 DESCRIPTION=Python wrapper for OpenCL
 EAPI=7
 HOMEPAGE=https://mathema.tician.de/software/pyopencl https://pypi.org/project/pyopencl/
-IUSE=examples opengl test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64
+IUSE=examples opengl python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=>=dev-python/appdirs-1.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(-)] >=dev-python/decorator-3.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/mako[python_targets_python3_6(-)?,python_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(-)] >=dev-python/pytools-2017.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/pybind11[python_targets_python3_6(-)?,python_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(-)] >=virtual/opencl-2 python_targets_python3_6? ( dev-lang/python:3.6 ) python_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 )
+RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pyopencl/pyopencl-2019.1.2.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1cb2a4e3311e58fd445ea61ce65fa7c0
+_md5_=a74e75d38157df42f154b29c3b2949c4
diff --git a/metadata/md5-cache/dev-python/pyopencl-2020.2 b/metadata/md5-cache/dev-python/pyopencl-2020.2
new file mode 100644
index 000000000000..ed00c5e3ddc5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyopencl-2020.2
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pybind11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=Python wrapper for OpenCL
+EAPI=7
+HOMEPAGE=https://mathema.tician.de/software/pyopencl https://pypi.org/project/pyopencl/
+IUSE=examples opengl python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/appdirs-1.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/decorator-3.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mako[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytools-2017.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=virtual/opencl-2 python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/p/pyopencl/pyopencl-2020.2.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7324729b4f2c6d748562fba3ecb74097
diff --git a/metadata/md5-cache/dev-python/pytest-4.6.11 b/metadata/md5-cache/dev-python/pytest-4.6.11
index 1f9381ae539c..b0c8b776dbd6 100644
--- a/metadata/md5-cache/dev-python/pytest-4.6.11
+++ b/metadata/md5-cache/dev-python/pytest-4.6.11
@@ -5,7 +5,7 @@ DESCRIPTION=Simple powerful testing with Python
 EAPI=7
 HOMEPAGE=http://pytest.org/
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/atomicwrites-1.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] >=dev-python/attrs-17.4.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] >=dev-python/more-itertools-4.0.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] 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_python2_7? ( dev-python/pathlib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/funcsigs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] <dev-python/pluggy-1 >=dev-python/py-1.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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_targets_python3_9(-)?,-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_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-4.6.11.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4e4174504c540ea430fa62f20b0ba6b2
+_md5_=a8a1a9f7fe4a7a85a145cf1dce506c87
diff --git a/metadata/md5-cache/dev-python/pytest-5.4.2 b/metadata/md5-cache/dev-python/pytest-5.4.2
index 340a6b5b2080..153f6511f571 100644
--- a/metadata/md5-cache/dev-python/pytest-5.4.2
+++ b/metadata/md5-cache/dev-python/pytest-5.4.2
@@ -5,7 +5,7 @@ DESCRIPTION=Simple powerful testing with Python
 EAPI=7
 HOMEPAGE=https://pytest.org/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/attrs-17.4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] 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/more-itertools-4.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pluggy-1 >=dev-python/py-1.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-5.4.2.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5eedff954f9e00a79f7d294e4edefb6a
+_md5_=66991b250f1af54b0c553ef48e54b509
diff --git a/metadata/md5-cache/dev-python/pytest-asyncio-0.14.0 b/metadata/md5-cache/dev-python/pytest-asyncio-0.14.0
new file mode 100644
index 000000000000..f7aad9c752c8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-asyncio-0.14.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/async_generator[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/hypothesis-3.64[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-5.4.0 >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Library for testing asyncio code with pytest
+EAPI=7
+HOMEPAGE=https://github.com/pytest-dev/pytest-asyncio https://pypi.org/project/pytest-asyncio/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pytest-5.4.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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pytest-dev/pytest-asyncio/archive/v0.14.0.tar.gz -> pytest-asyncio-0.14.0.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=18b858337e7a19119fc5324d9d408bce
diff --git a/metadata/md5-cache/dev-python/pytest-forked-1.2.0 b/metadata/md5-cache/dev-python/pytest-forked-1.2.0
new file mode 100644
index 000000000000..d47445a30520
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-forked-1.2.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] test? ( >=dev-python/pytest-3.1.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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_targets_python3_9(-)?,-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_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=run tests in isolated forked subprocesses
+EAPI=7
+HOMEPAGE=https://pypi.org/project/pytest-forked/ https://github.com/pytest-dev/pytest-forked
+IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/pytest-3.1.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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_targets_python3_9(-)?,-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_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytest-forked/pytest-forked-1.2.0.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9ede3235d83103021915526a8934847f
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 53bb0f60377b..fbf3895df4d4 100644
--- a/metadata/md5-cache/dev-python/pytest-services-2.0.1
+++ b/metadata/md5-cache/dev-python/pytest-services-2.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=Collection of fixtures and utility functions to run service processe
 EAPI=7
 HOMEPAGE=https://github.com/pytest-dev/pytest-services
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zc-lockfile[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ 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	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=eaf36b6a65ee2d7ac4190cd2330f437a
+_md5_=827fce11cf5c9145a69f8f55068ec90c
diff --git a/metadata/md5-cache/dev-python/python-distutils-extra-2.45 b/metadata/md5-cache/dev-python/python-distutils-extra-2.45
new file mode 100644
index 000000000000..feacf5255c87
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-distutils-extra-2.45
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-libs/gobject-introspection dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygobject[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-util/intltool ) python_targets_python2_7? ( >=dev-lang/python-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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Gettext support, themed icons and scrollkeeper-based documentation in distutils
+EAPI=7
+HOMEPAGE=https://salsa.debian.org/python-team/modules/python-distutils-extra https://launchpad.net/python-distutils-extra
+IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://salsa.debian.org/python-team/modules/python-distutils-extra/-/archive/2.45/python-distutils-extra-2.45.tar.bz2
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=baed19ff7ae55b18118ade4841aba0ac
diff --git a/metadata/md5-cache/dev-python/python-email-validator-1.1.1 b/metadata/md5-cache/dev-python/python-email-validator-1.1.1
index aa6ab76a9f12..d8c6717fe15f 100644
--- a/metadata/md5-cache/dev-python/python-email-validator-1.1.1
+++ b/metadata/md5-cache/dev-python/python-email-validator-1.1.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=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/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(-)] >=dev-python/pytest-4.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-42.0.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(-)]
+BDEPEND=test? ( >=dev-python/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/dnspython-1.15.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A robust email syntax and deliverability validation library
 EAPI=7
 HOMEPAGE=https://github.com/JoshData/python-email-validator
-IUSE=test 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 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=CC0-1.0
-RDEPEND=>=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/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(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_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-42.0.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 )
+RDEPEND=>=dev-python/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/dnspython-1.15.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/JoshData/python-email-validator/archive/v1.1.1.tar.gz -> python-email-validator-1.1.1.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=41cd802b995c84b6a537cb78abab55d8
+_md5_=0c3f34bc32a2126d7c427fa02624b183
diff --git a/metadata/md5-cache/dev-python/python-nbxmpp-1.0.0 b/metadata/md5-cache/dev-python/python-nbxmpp-1.0.0
new file mode 100644
index 000000000000..ed064600823b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-nbxmpp-1.0.0
@@ -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-42.0.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 unpack
+DESCRIPTION=Python library to use Jabber/XMPP networks in a non-blocking way
+EAPI=7
+HOMEPAGE=https://dev.gajim.org/gajim/python-nbxmpp/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+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://dev.gajim.org/gajim/python-nbxmpp/-/archive/nbxmpp-1.0.0/python-nbxmpp-nbxmpp-1.0.0.tar.bz2 -> python-nbxmpp-1.0.0.tar.bz2
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_md5_=110ff1ee66e499d49df7756dc0963789
diff --git a/metadata/md5-cache/dev-python/python-sshpubkeys-3.1.0 b/metadata/md5-cache/dev-python/python-sshpubkeys-3.1.0
index 86e066e8b732..9694b9bba678 100644
--- a/metadata/md5-cache/dev-python/python-sshpubkeys-3.1.0
+++ b/metadata/md5-cache/dev-python/python-sshpubkeys-3.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=OpenSSH public key parser for Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/sshpubkeys/ https://github.com/ojarva/python-sshpubkeys
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ecdsa[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ojarva/python-sshpubkeys/archive/v3.1.0.tar.gz -> python-sshpubkeys-3.1.0.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b64396b2ac090dcdefa87559a68f281a
+_md5_=ed06ac2a639662b0a9bb0eddf99c1014
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 04b601f61bcd..a957e310e31f 100644
--- a/metadata/md5-cache/dev-python/python3-lxc-3.0.2
+++ b/metadata/md5-cache/dev-python/python3-lxc-3.0.2
@@ -5,11 +5,11 @@ DESCRIPTION=Python bindings for LXC
 EAPI=7
 HOMEPAGE=https://linuxcontainers.org/lxc/
 IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-3
 RDEPEND=>=app-emulation/lxc-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
 SRC_URI=https://linuxcontainers.org/downloads/lxc/python3-lxc-3.0.2.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=745f9a1b122ce80257db2c00239497ec
+_md5_=5d930da248331f0df292d4dec4a92290
diff --git a/metadata/md5-cache/dev-python/pytools-2017.4-r1 b/metadata/md5-cache/dev-python/pytools-2017.4-r1
deleted file mode 100644
index 3340a9f91a4d..000000000000
--- a/metadata/md5-cache/dev-python/pytools-2017.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/setuptools-0.7.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( >=dev-python/appdirs-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/decorator-3.2.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/numpy-1.6.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/six-1.8.0[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[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Collection of tools missing from the Python standard library
-EAPI=6
-HOMEPAGE=https://mathema.tician.de/software/pytools/
-IUSE=test python_targets_python3_6
-KEYWORDS=amd64 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=dev-python/appdirs-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/decorator-3.2.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/numpy-1.6.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/six-1.8.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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/pytools/pytools-2017.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e9641883bd245e28c677c05eb192cdb6
diff --git a/metadata/md5-cache/dev-python/pytools-2020.3.1 b/metadata/md5-cache/dev-python/pytools-2020.3.1
new file mode 100644
index 000000000000..fb759db4cac7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytools-2020.3.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/appdirs-1.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/decorator-3.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Collection of tools missing from the Python standard library
+EAPI=7
+HOMEPAGE=https://mathema.tician.de/software/pytools/
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/appdirs-1.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/decorator-3.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytools/pytools-2020.3.1.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5916ee26a168aeff2f16e93098106647
diff --git a/metadata/md5-cache/dev-python/qtconsole-4.7.5 b/metadata/md5-cache/dev-python/qtconsole-4.7.5
new file mode 100644
index 000000000000..ed9454a1376e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/qtconsole-4.7.5
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/QtPy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),svg,testlib] ) doc? ( || ( ( dev-lang/python:3.9[threads(+)] dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( 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/ipykernel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipython_genutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jupyter_core[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jupyter_client-4.1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/traitlets[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/QtPy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),svg] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) 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(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Qt-based console for Jupyter with support for rich media output
+EAPI=7
+HOMEPAGE=https://jupyter.org
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+PDEPEND=dev-python/ipython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+RDEPEND=dev-python/ipykernel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipython_genutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jupyter_core[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jupyter_client-4.1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/traitlets[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/QtPy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),svg] 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(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/q/qtconsole/qtconsole-4.7.5.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d245e52157e0b4e882eda2e3a153c9dd
diff --git a/metadata/md5-cache/dev-python/rarfile-3.1 b/metadata/md5-cache/dev-python/rarfile-3.1
new file mode 100644
index 000000000000..177cb0655533
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rarfile-3.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( compressed? ( || ( app-arch/unrar app-arch/rar ) ) >=dev-python/pytest-4.5.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-7.3.0: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-42.0.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=Module for RAR archive reading
+EAPI=7
+HOMEPAGE=https://github.com/markokr/rarfile
+IUSE=+compressed test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=compressed? ( || ( app-arch/unrar app-arch/rar ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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/rarfile/rarfile-3.1.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5834bc0ed992a92993c17fbbd97bcb19
diff --git a/metadata/md5-cache/dev-python/repoze-lru-0.7-r1 b/metadata/md5-cache/dev-python/repoze-lru-0.7-r1
index 43f799ad1165..5e7697127c3b 100644
--- a/metadata/md5-cache/dev-python/repoze-lru-0.7-r1
+++ b/metadata/md5-cache/dev-python/repoze-lru-0.7-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A tiny LRU cache implementation and decorator
 EAPI=7
 HOMEPAGE=http://www.repoze.org
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=repoze
 RDEPEND=dev-python/namespace-repoze[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/repoze/repoze.lru/archive/0.7.tar.gz -> repoze-lru-0.7-r1.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c7d8de87c60628b7b5535e632fb7fe3b
+_md5_=f329f11c61e26b62c6b4a998502c3510
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 68a55e1f36a1..544bc83dae26 100644
--- a/metadata/md5-cache/dev-python/requests-toolbelt-0.9.1
+++ b/metadata/md5-cache/dev-python/requests-toolbelt-0.9.1
@@ -5,7 +5,7 @@ DESCRIPTION=A utility belt for advanced users of python-requests
 EAPI=7
 HOMEPAGE=https://toolbelt.readthedocs.org/
 IUSE=test test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=<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_targets_python3_9(-)?,-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_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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_targets_python3_9(-)?,-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_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-toolbelt/requests-toolbelt-0.9.1.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b0312694a3d00a7f698f827a69ad8eec
+_md5_=7ea6a1aeef247db71fa959bb7b1a0062
diff --git a/metadata/md5-cache/dev-python/requests-unixsocket-0.2.0 b/metadata/md5-cache/dev-python/requests-unixsocket-0.2.0
index 68363a8661fd..c952ad162359 100644
--- a/metadata/md5-cache/dev-python/requests-unixsocket-0.2.0
+++ b/metadata/md5-cache/dev-python/requests-unixsocket-0.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=Use requests to talk HTTP via a UNIX domain socket
 EAPI=7
 HOMEPAGE=https://github.com/msabramo/requests-unixsocket
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-unixsocket/requests-unixsocket-0.2.0.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=92acb9ee5134ce4e861cd4502ab8a184
+_md5_=29b4863086a5dcb971d2b970af43288f
diff --git a/metadata/md5-cache/dev-python/requestsexceptions-1.4.0 b/metadata/md5-cache/dev-python/requestsexceptions-1.4.0
index 1868f5a07f95..f145e0149b8b 100644
--- a/metadata/md5-cache/dev-python/requestsexceptions-1.4.0
+++ b/metadata/md5-cache/dev-python/requestsexceptions-1.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=Finds the correct path to exceptions in the requests library.
 EAPI=6
 HOMEPAGE=https://github.com/openstack-infra/requestsexceptions
 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(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.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	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=56754c87f741b34cbd4922f43f63a8cb
+_md5_=237ca9fe52b844c09a532e1e51a3718d
diff --git a/metadata/md5-cache/dev-python/rfc3986-1.3.2 b/metadata/md5-cache/dev-python/rfc3986-1.3.2
index 585649c9afe4..22c1324294ff 100644
--- a/metadata/md5-cache/dev-python/rfc3986-1.3.2
+++ b/metadata/md5-cache/dev-python/rfc3986-1.3.2
@@ -1,15 +1,15 @@
-BDEPEND=test? ( 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(-)] ) test? ( idna? ( 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(-)] ) >=dev-python/pytest-4.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(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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-42.0.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? ( dev-python/idna[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] ) test? ( idna? ( dev-python/idna[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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_targets_python3_9(-)?,-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_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Validating URI References per RFC 3986
 EAPI=7
 HOMEPAGE=https://tools.ietf.org/html/rfc3986 https://github.com/python-hyper/rfc3986 https://rfc3986.rtfd.org
-IUSE=idna test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=idna test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=Apache-2.0
-RDEPEND=idna? ( 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_pypy3? ( >=dev-python/pypy3-7.3.0: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=idna? ( dev-python/idna[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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_targets_python3_9(-)?,-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_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3986/rfc3986-1.3.2.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3fc6c7248f14d44986e33ff3573573dd
+_md5_=972671d50193bae76adbf511750be805
diff --git a/metadata/md5-cache/dev-python/rfc3986-1.4.0 b/metadata/md5-cache/dev-python/rfc3986-1.4.0
new file mode 100644
index 000000000000..eb81f96d4a74
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rfc3986-1.4.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/idna[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] ) test? ( idna? ( dev-python/idna[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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_targets_python3_9(-)?,-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_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Validating URI References per RFC 3986
+EAPI=7
+HOMEPAGE=https://tools.ietf.org/html/rfc3986 https://github.com/python-hyper/rfc3986 https://rfc3986.rtfd.org
+IUSE=idna test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=idna? ( dev-python/idna[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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_targets_python3_9(-)?,-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_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/rfc3986/rfc3986-1.4.0.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=972671d50193bae76adbf511750be805
diff --git a/metadata/md5-cache/dev-python/routes-2.4.1-r1 b/metadata/md5-cache/dev-python/routes-2.4.1-r1
index 054542a1486f..20d2c62121e0 100644
--- a/metadata/md5-cache/dev-python/routes-2.4.1-r1
+++ b/metadata/md5-cache/dev-python/routes-2.4.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A re-implementation of Rails routes system, mapping URLs to Controll
 EAPI=7
 HOMEPAGE=https://routes.readthedocs.io/en/latest/ https://pypi.org/project/Routes/
 IUSE=doc test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/repoze-lru-0.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/R/Routes/Routes-2.4.1.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4c8cdb6e4bea6881c5f198d551689bbe
+_md5_=d26040168d64996662e7ca487a06bb4e
diff --git a/metadata/md5-cache/dev-python/s3transfer-0.3.1 b/metadata/md5-cache/dev-python/s3transfer-0.3.1
index d132ad11fb65..c72b162c1f39 100644
--- a/metadata/md5-cache/dev-python/s3transfer-0.3.1
+++ b/metadata/md5-cache/dev-python/s3transfer-0.3.1
@@ -5,7 +5,7 @@ DESCRIPTION=An Amazon S3 Transfer Manager
 EAPI=7
 HOMEPAGE=https://github.com/boto/s3transfer
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/botocore[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/s3transfer/s3transfer-0.3.1.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e40367a588a1cf5f3b68980d753cf9d3
+_md5_=7d79bcba91764db7687f413b6430f774
diff --git a/metadata/md5-cache/dev-python/semantic_version-2.8.4 b/metadata/md5-cache/dev-python/semantic_version-2.8.4
index b5abba6ab8f0..52a7245e250c 100644
--- a/metadata/md5-cache/dev-python/semantic_version-2.8.4
+++ b/metadata/md5-cache/dev-python/semantic_version-2.8.4
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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-42.0.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=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 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(-)] )
+DEPEND=doc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 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
+IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/semantic_version/semantic_version-2.8.4.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cc2c07554f8909931f054f33275521d0
+_md5_=3303e15ff9aff162a501bc6439d7f24b
diff --git a/metadata/md5-cache/dev-python/semantic_version-2.8.5 b/metadata/md5-cache/dev-python/semantic_version-2.8.5
new file mode 100644
index 000000000000..cecf830fea85
--- /dev/null
+++ b/metadata/md5-cache/dev-python/semantic_version-2.8.5
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( 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(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+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 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/semantic_version/semantic_version-2.8.5.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4c55b21dc824a3dfbd2108b96f54094d
diff --git a/metadata/md5-cache/dev-python/speaklater-1.3-r1 b/metadata/md5-cache/dev-python/speaklater-1.3-r1
index 9b0d89655084..f2036e7df453 100644
--- a/metadata/md5-cache/dev-python/speaklater-1.3-r1
+++ b/metadata/md5-cache/dev-python/speaklater-1.3-r1
@@ -1,15 +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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 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-42.0.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=Lazy strings for Python
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/mitsuhiko/speaklater
-IUSE=test 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 python_targets_python3_9
 KEYWORDS=amd64 x86
 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 )
+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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/s/speaklater/speaklater-1.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dd3a020685fd55e6e1c0d872b9252211
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=05e05027257e07839a5e223efd95a5f2
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-spelling-5.1.2 b/metadata/md5-cache/dev-python/sphinxcontrib-spelling-5.1.2
new file mode 100644
index 000000000000..74329a179dfe
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-spelling-5.1.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( app-dicts/myspell-en >=dev-python/fixtures-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/testtools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( dev-python/sphinx ) test? ( dev-python/pbr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyenchant[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Sphinx spelling extension
+EAPI=7
+HOMEPAGE=https://github.com/sphinx-contrib/spelling
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-2
+RDEPEND=dev-python/pbr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyenchant[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/namespace-sphinxcontrib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/sphinxcontrib-spelling/sphinxcontrib-spelling-5.1.2.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5059bd4a4d63dcdb71636171264dc288
diff --git a/metadata/md5-cache/dev-python/stevedore-1.32.0 b/metadata/md5-cache/dev-python/stevedore-1.32.0
deleted file mode 100644
index 3da5659cedf4..000000000000
--- a/metadata/md5-cache/dev-python/stevedore-1.32.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/mock-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] >=dev-python/openstackdocstheme-1.18.1[python_targets_python3_9(-),python_single_target_python3_9(+)] >=dev-python/reno-2.5.0[python_targets_python3_9(-),python_single_target_python3_9(+)] >=dev-python/sphinx-2.0.0[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/openstackdocstheme-1.18.1[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/reno-2.5.0[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/sphinx-2.0.0[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/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 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Manage dynamic plugins for Python applications
-EAPI=7
-HOMEPAGE=https://github.com/openstack/stevedore https://pypi.org/project/stevedore/
-IUSE=test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/stevedore/stevedore-1.32.0.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=01c57eda7e7680702976518666cb415a
diff --git a/metadata/md5-cache/dev-python/stevedore-2.0.0 b/metadata/md5-cache/dev-python/stevedore-2.0.0
deleted file mode 100644
index a58ceb8321b7..000000000000
--- a/metadata/md5-cache/dev-python/stevedore-2.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/mock-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] >=dev-python/openstackdocstheme-1.18.1[python_targets_python3_9(-),python_single_target_python3_9(+)] >=dev-python/reno-2.5.0[python_targets_python3_9(-),python_single_target_python3_9(+)] >=dev-python/sphinx-2.0.0[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/openstackdocstheme-1.18.1[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/reno-2.5.0[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/sphinx-2.0.0[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/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 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Manage dynamic plugins for Python applications
-EAPI=7
-HOMEPAGE=https://github.com/openstack/stevedore https://pypi.org/project/stevedore/
-IUSE=test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/stevedore/stevedore-2.0.0.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=01c57eda7e7680702976518666cb415a
diff --git a/metadata/md5-cache/dev-python/stevedore-2.0.1 b/metadata/md5-cache/dev-python/stevedore-2.0.1
new file mode 100644
index 000000000000..4d1014cd0073
--- /dev/null
+++ b/metadata/md5-cache/dev-python/stevedore-2.0.1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/testtools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] >=dev-python/openstackdocstheme-1.18.1[python_targets_python3_9(-),python_single_target_python3_9(+)] >=dev-python/reno-2.5.0[python_targets_python3_9(-),python_single_target_python3_9(+)] >=dev-python/sphinx-2.0.0[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/openstackdocstheme-1.18.1[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/reno-2.5.0[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/sphinx-2.0.0[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/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 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Manage dynamic plugins for Python applications
+EAPI=7
+HOMEPAGE=https://github.com/openstack/stevedore https://pypi.org/project/stevedore/
+IUSE=test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha amd64 arm64 hppa ~ia64 ~ppc64 sparc x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/stevedore/stevedore-2.0.1.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=da746c5bc8dc5b9b133175f72ce05528
diff --git a/metadata/md5-cache/dev-python/tempora-3.0.0 b/metadata/md5-cache/dev-python/tempora-3.0.0
index 5a8ca29c97f8..78a664290ff1 100644
--- a/metadata/md5-cache/dev-python/tempora-3.0.0
+++ b/metadata/md5-cache/dev-python/tempora-3.0.0
@@ -4,7 +4,7 @@ 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_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/jaraco-functools-1.20[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tempora/tempora-3.0.0.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7702c09ee711af07aa5674f425ad473f
+_md5_=0cddddb6725d1afffe056fff3fb57429
diff --git a/metadata/md5-cache/dev-python/terminado-0.8.3 b/metadata/md5-cache/dev-python/terminado-0.8.3
index bbd04e682a07..c4312312ca3f 100644
--- a/metadata/md5-cache/dev-python/terminado-0.8.3
+++ b/metadata/md5-cache/dev-python/terminado-0.8.3
@@ -4,7 +4,7 @@ DESCRIPTION=Terminals served to term.js using Tornado websockets
 EAPI=7
 HOMEPAGE=https://pypi.org/project/terminado/ https://github.com/jupyter/terminado
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=dev-python/ptyprocess[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] www-servers/tornado[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/terminado/terminado-0.8.3.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4df9f8fe0ee1143629fc8d4d0fd4b94c
+_md5_=ffdedca564e5029c88f79faf06f141f2
diff --git a/metadata/md5-cache/dev-python/threadpoolctl-2.0.0 b/metadata/md5-cache/dev-python/threadpoolctl-2.0.0
index 167a397f08bf..724ff21aab00 100644
--- a/metadata/md5-cache/dev-python/threadpoolctl-2.0.0
+++ b/metadata/md5-cache/dev-python/threadpoolctl-2.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Limit the number of threads used in native libs that have their own
 EAPI=7
 HOMEPAGE=https://github.com/joblib/threadpoolctl
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/joblib/threadpoolctl/archive/2.0.0.tar.gz -> threadpoolctl-2.0.0.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ba21505db60865f5ae9eba9d8e07d534
+_md5_=ee12c56dbf8405e997226121b5c654b3
diff --git a/metadata/md5-cache/dev-python/tox-3.15.0 b/metadata/md5-cache/dev-python/tox-3.15.0
index 1b7f87b0dd2d..94aa9cd2d259 100644
--- a/metadata/md5-cache/dev-python/tox-3.15.0
+++ b/metadata/md5-cache/dev-python/tox-3.15.0
@@ -4,7 +4,7 @@ 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=~alpha ~amd64 arm arm64 ~ia64 ppc ppc64 sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~ia64 ppc 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-1.14[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_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-7.3.0: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-42.0.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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tox-dev/tox/archive/3.15.0.tar.gz -> tox-3.15.0.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=156a22e71e0a3d6e1884a868e9ef7e21
+_md5_=5eebb9fcceb1f856422b9ca4d90b24d6
diff --git a/metadata/md5-cache/dev-python/tox-3.16.0 b/metadata/md5-cache/dev-python/tox-3.16.0
new file mode 100644
index 000000000000..1f73a0d5b1a7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tox-3.16.0
@@ -0,0 +1,15 @@
+BDEPEND=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(-)] test? ( 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-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-1.14[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_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(-)] >=dev-python/flaky-3.4.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/freezegun-0.3.11[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_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/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-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(-)] dev-python/pytest-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/tox-3.16.0-r0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_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-7.3.0: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-42.0.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=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=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~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-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-1.14[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_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-7.3.0: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-42.0.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/tox-dev/tox/archive/3.16.0.tar.gz -> tox-3.16.0.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=93b612b08cead505859117273a2f8776
diff --git a/metadata/md5-cache/dev-python/tqdm-4.46.1 b/metadata/md5-cache/dev-python/tqdm-4.46.1
index a2e19510e023..86054abebd21 100644
--- a/metadata/md5-cache/dev-python/tqdm-4.46.1
+++ b/metadata/md5-cache/dev-python/tqdm-4.46.1
@@ -4,7 +4,7 @@ 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 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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_targets_python3_9(-)?,-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_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tqdm/tqdm-4.46.1.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0073c95b949fea1a095a942723c69378
+_md5_=bbbc135a0f1a2663cac848cc6f761e76
diff --git a/metadata/md5-cache/dev-python/tqdm-4.47.0 b/metadata/md5-cache/dev-python/tqdm-4.47.0
new file mode 100644
index 000000000000..1a47e512d981
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tqdm-4.47.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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_targets_python3_9(-)?,-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_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)]
+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 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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_targets_python3_9(-)?,-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_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/t/tqdm/tqdm-4.47.0.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=bbbc135a0f1a2663cac848cc6f761e76
diff --git a/metadata/md5-cache/dev-python/traceback2-1.4.0 b/metadata/md5-cache/dev-python/traceback2-1.4.0
index d2764a656dbc..72b52608a204 100644
--- a/metadata/md5-cache/dev-python/traceback2-1.4.0
+++ b/metadata/md5-cache/dev-python/traceback2-1.4.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/pbr[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] test? ( dev-python/unittest2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] ) test? ( dev-python/linecache2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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_targets_python3_9(-)?,-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_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)]
+BDEPEND=dev-python/pbr[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] test? ( dev-python/contextlib2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] dev-python/unittest2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] ) test? ( dev-python/linecache2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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_targets_python3_9(-)?,-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_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Backports of the traceback module
 EAPI=7
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/traceback2/traceback2-1.4.0.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cc4eda80d18756d6b10bd494fc5191df
+_md5_=b832e355ecfbd62f52e9709b4fa48d08
diff --git a/metadata/md5-cache/dev-python/twine-3.2.0 b/metadata/md5-cache/dev-python/twine-3.2.0
new file mode 100644
index 000000000000..b974b51eb9de
--- /dev/null
+++ b/metadata/md5-cache/dev-python/twine-3.2.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/jaraco-envs[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-functools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/munch[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/portend[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pretend[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pypiserver[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Collection of utilities for publishing packages on PyPI
+EAPI=7
+HOMEPAGE=https://twine.readthedocs.io/ https://github.com/pypa/twine https://pypi.org/project/twine/
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/tqdm-4.14[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pkginfo-1.4.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/readme_renderer-21.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.20.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-toolbelt-0.8.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] 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/keyring-15.1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rfc3986-1.4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/colorama-0.4.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pypa/twine/archive/3.2.0.tar.gz -> twine-3.2.0.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a6af090114a5da2229c3c60ad13804a5
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.0.23 b/metadata/md5-cache/dev-python/virtualenv-20.0.23
index bd377e85a8f6..70f6341e93ae 100644
--- a/metadata/md5-cache/dev-python/virtualenv-20.0.23
+++ b/metadata/md5-cache/dev-python/virtualenv-20.0.23
@@ -1,15 +1,15 @@
-BDEPEND=>=dev-python/appdirs-1.4.3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] >=dev-python/distlib-0.3.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] python_targets_python2_7? ( >=dev-python/contextlib2-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pathlib2-2.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( >=dev-python/importlib_metadata-0.12[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-0.12[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-0.12[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-0.12[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/importlib_resources-1.0[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_python2_7? ( >=dev-python/importlib_resources-1.0[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_6? ( >=dev-python/importlib_resources-1.0[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(-)] ) dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] test? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] >=dev-python/pip-20.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] >=dev-python/pytest-mock-2.0.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] >=dev-python/pytest-timeout-1.3.4[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] python_targets_pypy3? ( >=dev-python/packaging-20.0[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_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_6? ( >=dev-python/packaging-20.0[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_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( >=dev-python/packaging-20.0[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_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( >=dev-python/packaging-20.0[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_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( >=dev-python/packaging-20.0[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_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/towncrier[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( 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/towncrier[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/towncrier[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/towncrier[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/sphinx_rtd_theme[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/towncrier[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/towncrier[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( >=dev-python/appdirs-1.4.3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] >=dev-python/distlib-0.3.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] python_targets_python2_7? ( >=dev-python/contextlib2-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pathlib2-2.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( >=dev-python/importlib_metadata-0.12[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-0.12[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-0.12[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-0.12[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/importlib_resources-1.0[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_python2_7? ( >=dev-python/importlib_resources-1.0[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_6? ( >=dev-python/importlib_resources-1.0[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(-)] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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_targets_python3_9(-)?,-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_9(-)]
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] test? ( >=dev-python/appdirs-1.4.3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] >=dev-python/distlib-0.3.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] python_targets_python2_7? ( >=dev-python/contextlib2-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pathlib2-2.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( >=dev-python/importlib_metadata-0.12[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-0.12[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-0.12[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-0.12[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/importlib_resources-1.0[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_python2_7? ( >=dev-python/importlib_resources-1.0[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_6? ( >=dev-python/importlib_resources-1.0[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_6? ( dev-python/coverage[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_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pip-20.0.2[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_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-5[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_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-mock-2.0.0[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_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-timeout-1.3.4[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_9(-)?,-python_single_target_python3_9(-)] dev-python/wheel[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_9(-)?,-python_single_target_python3_9(-)] >=dev-python/packaging-20.0[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_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/coverage[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_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pip-20.0.2[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_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-5[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_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-mock-2.0.0[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_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-timeout-1.3.4[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_9(-)?,-python_single_target_python3_9(-)] dev-python/wheel[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_9(-)?,-python_single_target_python3_9(-)] >=dev-python/packaging-20.0[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_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/coverage[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_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pip-20.0.2[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_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-5[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_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-mock-2.0.0[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_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-timeout-1.3.4[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_9(-)?,-python_single_target_python3_9(-)] dev-python/wheel[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_9(-)?,-python_single_target_python3_9(-)] >=dev-python/packaging-20.0[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_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/coverage[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_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pip-20.0.2[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_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-5[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_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-mock-2.0.0[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_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-timeout-1.3.4[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_9(-)?,-python_single_target_python3_9(-)] dev-python/wheel[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_9(-)?,-python_single_target_python3_9(-)] >=dev-python/packaging-20.0[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_9(-)?,-python_single_target_python3_9(-)] ) ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/towncrier[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( 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/towncrier[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/towncrier[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/towncrier[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/sphinx_rtd_theme[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/towncrier[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/towncrier[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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_targets_python3_9(-)?,-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_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Virtual Python Environment builder
 EAPI=7
 HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.org/project/virtualenv/ https://github.com/pypa/virtualenv/
-IUSE=test doc test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=test doc python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/appdirs-1.4.3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] >=dev-python/distlib-0.3.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] python_targets_python2_7? ( >=dev-python/contextlib2-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pathlib2-2.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( >=dev-python/importlib_metadata-0.12[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-0.12[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-0.12[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-0.12[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/importlib_resources-1.0[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_python2_7? ( >=dev-python/importlib_resources-1.0[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_6? ( >=dev-python/importlib_resources-1.0[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_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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_targets_python3_9(-)?,-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_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/virtualenv/archive/20.0.23.tar.gz -> virtualenv-20.0.23.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=25e3ba56a6df314a7eeb74ed36d1749a
+_md5_=daac07b21f8ca93547bcbc23c950dc61
diff --git a/metadata/md5-cache/dev-python/watchdog-0.10.3 b/metadata/md5-cache/dev-python/watchdog-0.10.3
new file mode 100644
index 000000000000..da0e3752681e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/watchdog-0.10.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/argh[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathtools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/pytest-timeout-0.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DESCRIPTION=Python API and shell utilities to monitor file system events
+EAPI=7
+HOMEPAGE=https://github.com/gorakhargosh/watchdog
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/argh[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathtools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/gorakhargosh/watchdog/archive/v0.10.3.tar.gz -> watchdog-0.10.3.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=78dad5f1667103ac90e3d8ec67963b5f
diff --git a/metadata/md5-cache/dev-python/wcwidth-0.2.5 b/metadata/md5-cache/dev-python/wcwidth-0.2.5
new file mode 100644
index 000000000000..e86e3b9a8f99
--- /dev/null
+++ b/metadata/md5-cache/dev-python/wcwidth-0.2.5
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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_targets_python3_9(-)?,-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_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Measures number of Terminal column cells of wide-character codes
+EAPI=7
+HOMEPAGE=https://pypi.org/project/wcwidth/ https://github.com/jquast/wcwidth
+IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=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-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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_targets_python3_9(-)?,-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_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jquast/wcwidth/archive/0.2.5.tar.gz -> wcwidth-0.2.5.gh.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=355d109e7598e73b9fe3868ffaa5f014
diff --git a/metadata/md5-cache/dev-python/wtforms-2.2.1 b/metadata/md5-cache/dev-python/wtforms-2.2.1
index 1657d2a0020b..54517388d0b2 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_targets_python3_8(-)?,-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-7.3.0: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-42.0.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? ( dev-python/Babel[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] dev-python/sqlalchemy[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] dev-python/webob[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( 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-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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_targets_python3_9(-)?,-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_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)]
 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 python_targets_python3_8
+IUSE=doc test doc python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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_targets_python3_9(-)?,-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_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WTForms/WTForms-2.2.1.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ec31e01d67ec5558e9d8d37a10eaeefc
+_md5_=9dad24165d970520e21f940aa915efbe
diff --git a/metadata/md5-cache/dev-python/wtforms-2.3.1 b/metadata/md5-cache/dev-python/wtforms-2.3.1
new file mode 100644
index 000000000000..f52550d18db7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/wtforms-2.3.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/Babel[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-email-validator[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sqlalchemy[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/webob[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+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=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/W/WTForms/WTForms-2.3.1.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=979e18c7eeabfff08a7538a1debff715
diff --git a/metadata/md5-cache/dev-python/xmlschema-1.1.3 b/metadata/md5-cache/dev-python/xmlschema-1.1.3
index ccf18084c776..5b934194c9fe 100644
--- a/metadata/md5-cache/dev-python/xmlschema-1.1.3
+++ b/metadata/md5-cache/dev-python/xmlschema-1.1.3
@@ -4,7 +4,7 @@ DESCRIPTION=An XML Schema validator and decoder
 EAPI=7
 HOMEPAGE=https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 sparc x86
 LICENSE=MIT
 RDEPEND==dev-python/elementpath-1.4*[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xmlschema/xmlschema-1.1.3.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8f78ac144857bcfe24dea9daaa47fcd4
+_md5_=0a689aef104c1fab7dea42c268267e73
diff --git a/metadata/md5-cache/dev-python/yapf-0.30.0 b/metadata/md5-cache/dev-python/yapf-0.30.0
index 1b7d7e426a42..c7a7e3165776 100644
--- a/metadata/md5-cache/dev-python/yapf-0.30.0
+++ b/metadata/md5-cache/dev-python/yapf-0.30.0
@@ -4,11 +4,11 @@ DESCRIPTION=A formatter for Python files
 EAPI=7
 HOMEPAGE=https://github.com/google/yapf
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/google/yapf/archive/v0.30.0.tar.gz -> yapf-0.30.0.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=50b208fcd82529039af36a01b9471068
+_md5_=3005750191f54afbed963192616e0ed1
diff --git a/metadata/md5-cache/dev-python/zc-lockfile-2.0 b/metadata/md5-cache/dev-python/zc-lockfile-2.0
index 844f74669e41..423f1b7ca64d 100644
--- a/metadata/md5-cache/dev-python/zc-lockfile-2.0
+++ b/metadata/md5-cache/dev-python/zc-lockfile-2.0
@@ -5,7 +5,7 @@ DESCRIPTION=Basic inter-process locks
 EAPI=7
 HOMEPAGE=https://pypi.org/project/zc.lockfile/
 IUSE=test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=ZPL
 RDEPEND=>=dev-python/setuptools-3.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zc.lockfile/zc.lockfile-2.0.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=59854014eb36f81e2edaab9b027dfc50
+_md5_=5bec402989b343fd46dac27f84d6c90f
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 a5a9c0279473..2ffa6039812f 100644
--- a/metadata/md5-cache/dev-python/zope-testing-4.7-r1
+++ b/metadata/md5-cache/dev-python/zope-testing-4.7-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Zope testing helpers
 EAPI=6
 HOMEPAGE=https://pypi.org/project/zope.testing/ https://github.com/zopefoundation/zope.testing
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ZPL
 RDEPEND=dev-python/namespace-zope[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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_targets_python3_9(-)?,-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_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.testing/zope.testing-4.7.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f5da8774eef050b4a519c4c551ffd01d
+_md5_=1d1d8eea3c7a27e42278c4f764b9435b
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 9d14527b51fc..8939af5c1aca 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/qt-creator-4.12.0 b/metadata/md5-cache/dev-qt/qt-creator-4.12.0
deleted file mode 100644
index fa1be4d8c810..000000000000
--- a/metadata/md5-cache/dev-qt/qt-creator-4.12.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-cpp/yaml-cpp-0.6.2 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtcore-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[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=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 clang? ( >=sys-devel/clang-9.0.1:= ) designer? ( >=dev-qt/designer-5.12.3:5 ) help? ( >=dev-qt/qthelp-5.12.3:5 webengine? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) ) perfprofiler? ( dev-libs/elfutils ) qbs? ( >=dev-util/qbs-1.13.1 ) serialterminal? ( >=dev-qt/qtserialport-5.12.3:5 ) systemd? ( sys-apps/systemd:= ) >=dev-qt/linguist-tools-5.12.3:5 virtual/pkgconfig doc? ( >=dev-qt/qdoc-5.12.3:5 ) test? ( >=dev-qt/qtdeclarative-5.12.3:5[localstorage] >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5[qml] ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Lightweight IDE for C++/QML development centering around Qt
-EAPI=7
-HOMEPAGE=https://doc.qt.io/qtcreator/
-IUSE=doc systemd test +webengine android +autotest baremetal beautifier boot2qt +clang clearcase cmake cppcheck ctfvisualizer cvs +designer git glsl +help ios +lsp mercurial modeling nim perforce perfprofiler python qbs +qmldesigner qmlprofiler qnx remotelinux scxml serialterminal silversearcher subversion valgrind winrt l10n_cs l10n_da l10n_de l10n_fr l10n_ja l10n_pl l10n_ru l10n_sl l10n_uk l10n_zh-CN l10n_zh-TW test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-cpp/yaml-cpp-0.6.2 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtcore-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[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=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 clang? ( >=sys-devel/clang-9.0.1:= ) designer? ( >=dev-qt/designer-5.12.3:5 ) help? ( >=dev-qt/qthelp-5.12.3:5 webengine? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) ) perfprofiler? ( dev-libs/elfutils ) qbs? ( >=dev-util/qbs-1.13.1 ) serialterminal? ( >=dev-qt/qtserialport-5.12.3:5 ) systemd? ( sys-apps/systemd:= ) sys-devel/gdb[client,python] cmake? ( dev-util/cmake ) cppcheck? ( dev-util/cppcheck ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) silversearcher? ( sys-apps/the_silver_searcher ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind ) l10n_cs? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_da? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_de? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_fr? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_ja? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_pl? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_ru? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_sl? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_uk? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_zh-CN? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_zh-TW? ( >=dev-qt/qttranslations-5.12.3:5 )
-REQUIRED_USE=clang? ( test? ( qbs ) ) qnx? ( remotelinux ) boot2qt? ( remotelinux ) python? ( lsp )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.qt.io/official_releases/qtcreator/4.12/4.12.0/qt-creator-opensource-src-4.12.0.tar.xz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=175c27fc75745a19fbdf76395fb35bb5
diff --git a/metadata/md5-cache/dev-qt/qt-creator-4.12.3 b/metadata/md5-cache/dev-qt/qt-creator-4.12.3
new file mode 100644
index 000000000000..e9a96bf6b515
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qt-creator-4.12.3
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-qt/linguist-tools-5.12.3:5 virtual/pkgconfig doc? ( >=dev-qt/qdoc-5.12.3:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-cpp/yaml-cpp-0.6.2:= >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtcore-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[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=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/syntax-highlighting:5 clang? ( || ( ( sys-devel/clang:10 dev-libs/libclangformat-ide:10 ) ( sys-devel/clang:9 dev-libs/libclangformat-ide:9 ) ) <sys-devel/clang-11:= ) designer? ( >=dev-qt/designer-5.12.3:5 ) help? ( >=dev-qt/qthelp-5.12.3:5 webengine? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) ) perfprofiler? ( dev-libs/elfutils ) qbs? ( >=dev-util/qbs-1.13.1 ) serialterminal? ( >=dev-qt/qtserialport-5.12.3:5 ) systemd? ( sys-apps/systemd:= ) test? ( >=dev-qt/qtdeclarative-5.12.3:5[localstorage] >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5[qml] ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Lightweight IDE for C++/QML development centering around Qt
+EAPI=7
+HOMEPAGE=https://doc.qt.io/qtcreator/
+IUSE=doc systemd test +webengine android +autotest baremetal beautifier boot2qt +clang clearcase cmake cppcheck ctfvisualizer cvs +designer git glsl +help ios lsp mcu mercurial modeling nim perforce perfprofiler python qbs +qmldesigner qmlprofiler qnx remotelinux scxml serialterminal silversearcher subversion valgrind webassembly winrt l10n_cs l10n_da l10n_de l10n_fr l10n_ja l10n_pl l10n_ru l10n_sl l10n_uk l10n_zh-CN l10n_zh-TW test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-cpp/yaml-cpp-0.6.2:= >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtcore-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[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=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/syntax-highlighting:5 clang? ( || ( ( sys-devel/clang:10 dev-libs/libclangformat-ide:10 ) ( sys-devel/clang:9 dev-libs/libclangformat-ide:9 ) ) <sys-devel/clang-11:= ) designer? ( >=dev-qt/designer-5.12.3:5 ) help? ( >=dev-qt/qthelp-5.12.3:5 webengine? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) ) perfprofiler? ( dev-libs/elfutils ) qbs? ( >=dev-util/qbs-1.13.1 ) serialterminal? ( >=dev-qt/qtserialport-5.12.3:5 ) systemd? ( sys-apps/systemd:= ) sys-devel/gdb[client,python] cmake? ( dev-util/cmake ) cppcheck? ( dev-util/cppcheck ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) qmldesigner? ( >=dev-qt/qtquicktimeline-5.12.3:5 ) silversearcher? ( sys-apps/the_silver_searcher ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind ) l10n_cs? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_da? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_de? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_fr? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_ja? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_pl? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_ru? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_sl? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_uk? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_zh-CN? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_zh-TW? ( >=dev-qt/qttranslations-5.12.3:5 )
+REQUIRED_USE=boot2qt? ( remotelinux ) clang? ( test? ( qbs ) ) mcu? ( cmake ) python? ( lsp ) qnx? ( remotelinux )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.qt.io/official_releases/qtcreator/4.12/4.12.3/qt-creator-opensource-src-4.12.3.tar.xz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=629bd68f5b2047f86febbc1f2f46feff
diff --git a/metadata/md5-cache/dev-qt/qt-creator-9999 b/metadata/md5-cache/dev-qt/qt-creator-9999
index caee0b4e4a55..662e1963553f 100644
--- a/metadata/md5-cache/dev-qt/qt-creator-9999
+++ b/metadata/md5-cache/dev-qt/qt-creator-9999
@@ -1,15 +1,15 @@
-BDEPEND=test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-qt/linguist-tools-5.12.3:5 virtual/pkgconfig doc? ( >=dev-qt/qdoc-5.12.3:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtcore-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[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=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 clang? ( sys-devel/clang:8= ) designer? ( >=dev-qt/designer-5.12.3:5 ) help? ( >=dev-qt/qthelp-5.12.3:5 webengine? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) ) perfprofiler? ( dev-libs/elfutils ) qbs? ( >=dev-util/qbs-1.13.1 ) serialterminal? ( >=dev-qt/qtserialport-5.12.3:5 ) systemd? ( sys-apps/systemd:= ) >=dev-qt/linguist-tools-5.12.3:5 virtual/pkgconfig doc? ( >=dev-qt/qdoc-5.12.3:5 ) test? ( >=dev-qt/qtdeclarative-5.12.3:5[localstorage] >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5[qml] ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-cpp/yaml-cpp-0.6.2:= >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtcore-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[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=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/syntax-highlighting:5 clang? ( || ( ( sys-devel/clang:10 dev-libs/libclangformat-ide:10 ) ( sys-devel/clang:9 dev-libs/libclangformat-ide:9 ) ) <sys-devel/clang-11:= ) designer? ( >=dev-qt/designer-5.12.3:5 ) help? ( >=dev-qt/qthelp-5.12.3:5 webengine? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) ) perfprofiler? ( dev-libs/elfutils ) qbs? ( >=dev-util/qbs-1.13.1 ) serialterminal? ( >=dev-qt/qtserialport-5.12.3:5 ) systemd? ( sys-apps/systemd:= ) test? ( >=dev-qt/qtdeclarative-5.12.3:5[localstorage] >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5[qml] ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Lightweight IDE for C++/QML development centering around Qt
 EAPI=7
 HOMEPAGE=https://doc.qt.io/qtcreator/
 IUSE=doc systemd test +webengine android +autotest baremetal beautifier boot2qt +clang clearcase cmake cppcheck ctfvisualizer cvs +designer git glsl +help ios lsp mcu mercurial modeling nim perforce perfprofiler python qbs +qmldesigner qmlprofiler qnx remotelinux scxml serialterminal silversearcher subversion valgrind webassembly winrt l10n_cs l10n_da l10n_de l10n_fr l10n_ja l10n_pl l10n_ru l10n_sl l10n_uk l10n_zh-CN l10n_zh-TW test
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtcore-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[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=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 clang? ( sys-devel/clang:8= ) designer? ( >=dev-qt/designer-5.12.3:5 ) help? ( >=dev-qt/qthelp-5.12.3:5 webengine? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) ) perfprofiler? ( dev-libs/elfutils ) qbs? ( >=dev-util/qbs-1.13.1 ) serialterminal? ( >=dev-qt/qtserialport-5.12.3:5 ) systemd? ( sys-apps/systemd:= ) sys-devel/gdb[client,python] cmake? ( dev-util/cmake ) cppcheck? ( dev-util/cppcheck ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) silversearcher? ( sys-apps/the_silver_searcher ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind ) l10n_cs? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_da? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_de? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_fr? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_ja? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_pl? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_ru? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_sl? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_uk? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_zh-CN? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_zh-TW? ( >=dev-qt/qttranslations-5.12.3:5 )
+RDEPEND=>=dev-cpp/yaml-cpp-0.6.2:= >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtcore-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[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=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/syntax-highlighting:5 clang? ( || ( ( sys-devel/clang:10 dev-libs/libclangformat-ide:10 ) ( sys-devel/clang:9 dev-libs/libclangformat-ide:9 ) ) <sys-devel/clang-11:= ) designer? ( >=dev-qt/designer-5.12.3:5 ) help? ( >=dev-qt/qthelp-5.12.3:5 webengine? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) ) perfprofiler? ( dev-libs/elfutils ) qbs? ( >=dev-util/qbs-1.13.1 ) serialterminal? ( >=dev-qt/qtserialport-5.12.3:5 ) systemd? ( sys-apps/systemd:= ) sys-devel/gdb[client,python] cmake? ( dev-util/cmake ) cppcheck? ( dev-util/cppcheck ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) qmldesigner? ( >=dev-qt/qtquicktimeline-5.12.3:5 ) silversearcher? ( sys-apps/the_silver_searcher ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind ) l10n_cs? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_da? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_de? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_fr? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_ja? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_pl? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_ru? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_sl? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_uk? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_zh-CN? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_zh-TW? ( >=dev-qt/qttranslations-5.12.3:5 )
 REQUIRED_USE=boot2qt? ( remotelinux ) clang? ( test? ( qbs ) ) mcu? ( cmake ) python? ( lsp ) qnx? ( remotelinux )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=68c1779bb84e87db6a0d0950a90d051d
+_md5_=629bd68f5b2047f86febbc1f2f46feff
diff --git a/metadata/md5-cache/dev-qt/qt-docs-5.14.2_p202003291239-r1 b/metadata/md5-cache/dev-qt/qt-docs-5.14.2_p202003291239-r1
new file mode 100644
index 000000000000..7a35533afc50
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qt-docs-5.14.2_p202003291239-r1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/p7zip media-libs/libpng:0
+DEFINED_PHASES=install prepare
+DESCRIPTION=Qt5 documentation, for use with Qt Creator and other tools
+EAPI=7
+HOMEPAGE=https://doc.qt.io/
+IUSE=charts datavis +html networkauth +qch script timeline virtualkeyboard webengine +sql +x11extras +declarative +svg +linguist +printsupport +imageformats +gui +webview +dbus +assistant +help +network +bluetooth +3d +xml +core +quickcontrols +qdoc +location +scxml +speech +webchannel +quickcontrols2 +graphicaleffects +concurrent +sensors +multimedia +websockets +serialport +xmlpatterns +wayland +serialbus +test +opengl +gamepad +positioning +designer +widgets
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=FDL-1.3
+REQUIRED_USE=|| ( html qch )
+SLOT=5
+SRC_URI=charts? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc.qtcharts/5.14.2-0-202003291239qtcharts-documentation.7z ) datavis? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc.qtdatavis3d/5.14.2-0-202003291239qtdatavisualization-documentation.7z ) networkauth? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc.qtnetworkauth/5.14.2-0-202003291239qtnetworkauth-documentation.7z ) script? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc.qtscript/5.14.2-0-202003291239qtscript-documentation.7z https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc.qtscript/5.14.2-0-202003291239qtscripttools-documentation.7z ) timeline? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc.qtquicktimeline/5.14.2-0-202003291239qtquicktimeline-documentation.7z ) virtualkeyboard? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc.qtvirtualkeyboard/5.14.2-0-202003291239qtvirtualkeyboard-documentation.7z ) webengine? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc.qtwebengine/5.14.2-0-202003291239qtwebengine-documentation.7z ) sql? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtsql-documentation.7z ) x11extras? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtx11extras-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtqml-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtqmltest-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtquick-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtquickdialogs-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtquickextras-documentation.7z ) svg? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtsvg-documentation.7z ) linguist? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtlinguist-documentation.7z ) printsupport? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtprintsupport-documentation.7z ) imageformats? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtimageformats-documentation.7z ) gui? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtgui-documentation.7z ) gui? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtplatformheaders-documentation.7z ) webview? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtwebview-documentation.7z ) dbus? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtdbus-documentation.7z ) assistant? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtassistant-documentation.7z ) help? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qthelp-documentation.7z ) network? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtnetwork-documentation.7z ) bluetooth? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtbluetooth-documentation.7z ) 3d? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qt3d-documentation.7z ) xml? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtxml-documentation.7z ) core? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtcore-documentation.7z ) core? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qmake-documentation.7z ) core? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtdoc-documentation.7z ) quickcontrols? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtquickcontrols1-documentation.7z ) qdoc? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qdoc-documentation.7z ) location? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtlocation-documentation.7z ) scxml? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtscxml-documentation.7z ) speech? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtspeech-documentation.7z ) webchannel? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtwebchannel-documentation.7z ) quickcontrols2? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtquickcontrols-documentation.7z ) graphicaleffects? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtgraphicaleffects-documentation.7z ) concurrent? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtconcurrent-documentation.7z ) sensors? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtsensors-documentation.7z ) multimedia? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtmultimedia-documentation.7z ) websockets? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtwebsockets-documentation.7z ) serialport? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtserialport-documentation.7z ) xmlpatterns? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtxmlpatterns-documentation.7z ) wayland? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtwaylandcompositor-documentation.7z ) serialbus? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtserialbus-documentation.7z ) test? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qttestlib-documentation.7z ) opengl? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtopengl-documentation.7z ) gamepad? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtgamepad-documentation.7z ) positioning? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtpositioning-documentation.7z ) designer? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtdesigner-documentation.7z ) designer? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtuitools-documentation.7z ) widgets? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtwidgets-documentation.7z )
+_md5_=11ec886844732c7194987de7f3c0c4f6
diff --git a/metadata/md5-cache/dev-qt/qt-docs-5.15.0_p202005140838 b/metadata/md5-cache/dev-qt/qt-docs-5.15.0_p202005140838
index 81a8781a4cc7..49b47bf4c9cb 100644
--- a/metadata/md5-cache/dev-qt/qt-docs-5.15.0_p202005140838
+++ b/metadata/md5-cache/dev-qt/qt-docs-5.15.0_p202005140838
@@ -3,10 +3,10 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Qt5 documentation, for use with Qt Creator and other tools
 EAPI=7
 HOMEPAGE=https://doc.qt.io/
-IUSE=charts datavis +html networkauth +qch script virtualkeyboard webengine +sql +x11extras +declarative +svg +linguist +printsupport +imageformats +gui +webview +dbus +assistant +help +network +bluetooth +3d +xml +core +quickcontrols +qdoc +location +scxml +speech +webchannel +quickcontrols2 +graphicaleffects +concurrent +sensors +multimedia +websockets +serialport +xmlpatterns +wayland +serialbus +test +opengl +gamepad +positioning +designer +widgets
+IUSE=charts datavis +html networkauth +qch script timeline virtualkeyboard webengine +sql +x11extras +declarative +svg +linguist +printsupport +imageformats +gui +webview +dbus +assistant +help +network +bluetooth +3d +xml +core +quickcontrols +qdoc +location +scxml +speech +webchannel +quickcontrols2 +graphicaleffects +concurrent +sensors +multimedia +websockets +serialport +xmlpatterns +wayland +serialbus +test +opengl +gamepad +positioning +designer +widgets
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=FDL-1.3
 REQUIRED_USE=|| ( html qch )
 SLOT=5
-SRC_URI=charts? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtcharts/5.15.0-0-202005140838qtcharts-documentation.7z ) datavis? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtdatavis3d/5.15.0-0-202005140838qtdatavisualization-documentation.7z ) networkauth? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtnetworkauth/5.15.0-0-202005140838qtnetworkauth-documentation.7z ) script? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtscript/5.15.0-0-202005140838qtscript-documentation.7z https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtscript/5.15.0-0-202005140838qtscripttools-documentation.7z ) virtualkeyboard? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtvirtualkeyboard/5.15.0-0-202005140838qtvirtualkeyboard-documentation.7z ) webengine? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtwebengine/5.15.0-0-202005140838qtwebengine-documentation.7z ) sql? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtsql-documentation.7z ) x11extras? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtx11extras-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtqml-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtqmltest-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtquick-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtquickdialogs-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtquickextras-documentation.7z ) svg? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtsvg-documentation.7z ) linguist? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtlinguist-documentation.7z ) printsupport? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtprintsupport-documentation.7z ) imageformats? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtimageformats-documentation.7z ) gui? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtgui-documentation.7z ) gui? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtplatformheaders-documentation.7z ) webview? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtwebview-documentation.7z ) dbus? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtdbus-documentation.7z ) assistant? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtassistant-documentation.7z ) help? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qthelp-documentation.7z ) network? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtnetwork-documentation.7z ) bluetooth? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtbluetooth-documentation.7z ) 3d? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qt3d-documentation.7z ) xml? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtxml-documentation.7z ) core? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtcore-documentation.7z ) core? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qmake-documentation.7z ) core? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtdoc-documentation.7z ) quickcontrols? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtquickcontrols1-documentation.7z ) qdoc? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qdoc-documentation.7z ) location? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtlocation-documentation.7z ) scxml? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtscxml-documentation.7z ) speech? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtspeech-documentation.7z ) webchannel? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtwebchannel-documentation.7z ) quickcontrols2? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtquickcontrols-documentation.7z ) graphicaleffects? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtgraphicaleffects-documentation.7z ) concurrent? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtconcurrent-documentation.7z ) sensors? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtsensors-documentation.7z ) multimedia? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtmultimedia-documentation.7z ) websockets? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtwebsockets-documentation.7z ) serialport? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtserialport-documentation.7z ) xmlpatterns? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtxmlpatterns-documentation.7z ) wayland? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtwaylandcompositor-documentation.7z ) serialbus? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtserialbus-documentation.7z ) test? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qttestlib-documentation.7z ) opengl? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtopengl-documentation.7z ) gamepad? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtgamepad-documentation.7z ) positioning? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtpositioning-documentation.7z ) designer? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtdesigner-documentation.7z ) designer? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtuitools-documentation.7z ) widgets? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtwidgets-documentation.7z )
-_md5_=92af700aed84f015220b80722b417234
+SRC_URI=charts? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtcharts/5.15.0-0-202005140838qtcharts-documentation.7z ) datavis? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtdatavis3d/5.15.0-0-202005140838qtdatavisualization-documentation.7z ) networkauth? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtnetworkauth/5.15.0-0-202005140838qtnetworkauth-documentation.7z ) script? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtscript/5.15.0-0-202005140838qtscript-documentation.7z https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtscript/5.15.0-0-202005140838qtscripttools-documentation.7z ) timeline? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtquicktimeline/5.15.0-0-202005140838qtquicktimeline-documentation.7z ) virtualkeyboard? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtvirtualkeyboard/5.15.0-0-202005140838qtvirtualkeyboard-documentation.7z ) webengine? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtwebengine/5.15.0-0-202005140838qtwebengine-documentation.7z ) sql? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtsql-documentation.7z ) x11extras? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtx11extras-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtqml-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtqmltest-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtquick-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtquickdialogs-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtquickextras-documentation.7z ) svg? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtsvg-documentation.7z ) linguist? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtlinguist-documentation.7z ) printsupport? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtprintsupport-documentation.7z ) imageformats? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtimageformats-documentation.7z ) gui? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtgui-documentation.7z ) gui? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtplatformheaders-documentation.7z ) webview? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtwebview-documentation.7z ) dbus? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtdbus-documentation.7z ) assistant? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtassistant-documentation.7z ) help? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qthelp-documentation.7z ) network? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtnetwork-documentation.7z ) bluetooth? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtbluetooth-documentation.7z ) 3d? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qt3d-documentation.7z ) xml? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtxml-documentation.7z ) core? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtcore-documentation.7z ) core? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qmake-documentation.7z ) core? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtdoc-documentation.7z ) quickcontrols? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtquickcontrols1-documentation.7z ) qdoc? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qdoc-documentation.7z ) location? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtlocation-documentation.7z ) scxml? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtscxml-documentation.7z ) speech? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtspeech-documentation.7z ) webchannel? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtwebchannel-documentation.7z ) quickcontrols2? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtquickcontrols-documentation.7z ) graphicaleffects? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtgraphicaleffects-documentation.7z ) concurrent? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtconcurrent-documentation.7z ) sensors? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtsensors-documentation.7z ) multimedia? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtmultimedia-documentation.7z ) websockets? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtwebsockets-documentation.7z ) serialport? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtserialport-documentation.7z ) xmlpatterns? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtxmlpatterns-documentation.7z ) wayland? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtwaylandcompositor-documentation.7z ) serialbus? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtserialbus-documentation.7z ) test? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qttestlib-documentation.7z ) opengl? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtopengl-documentation.7z ) gamepad? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtgamepad-documentation.7z ) positioning? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtpositioning-documentation.7z ) designer? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtdesigner-documentation.7z ) designer? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtuitools-documentation.7z ) widgets? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtwidgets-documentation.7z )
+_md5_=11ec886844732c7194987de7f3c0c4f6
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.14.2 b/metadata/md5-cache/dev-qt/qtcore-5.14.2
index 2d5df38c4e3d..178010fcd6b1 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.14.2
+++ b/metadata/md5-cache/dev-qt/qtcore-5.14.2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,un
 RESTRICT=test
 SLOT=5/5.14.2
 SRC_URI=https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtbase-everywhere-src-5.14.2.tar.xz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=26f6ea770342b1ca51197f6c78b0e4da
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.15.0 b/metadata/md5-cache/dev-qt/qtcore-5.15.0
index f894ba73ce38..12622d96db5a 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.15.0
+++ b/metadata/md5-cache/dev-qt/qtcore-5.15.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,un
 RESTRICT=test
 SLOT=5/5.15.0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtbase-everywhere-src-5.15.0.tar.xz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=cd1f43c122811b3c77f9b08c4f2ce136
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.14.2-r2 b/metadata/md5-cache/dev-qt/qtdeclarative-5.14.2-r2
deleted file mode 100644
index ed5445b05aa6..000000000000
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.14.2-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.8 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.14.2 ~dev-qt/qtgui-5.14.2[gles2-only=,vulkan=] ~dev-qt/qtnetwork-5.14.2 ~dev-qt/qttest-5.14.2 localstorage? ( ~dev-qt/qtsql-5.14.2 ) widgets? ( ~dev-qt/qtwidgets-5.14.2[gles2-only=] ) test? ( ~dev-qt/qttest-5.14.2 )
-DESCRIPTION=The QML and Quick modules for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2-only +jit localstorage vulkan +widgets debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.14.2 ~dev-qt/qtgui-5.14.2[gles2-only=,vulkan=] ~dev-qt/qtnetwork-5.14.2 ~dev-qt/qttest-5.14.2 localstorage? ( ~dev-qt/qtsql-5.14.2 ) widgets? ( ~dev-qt/qtwidgets-5.14.2[gles2-only=] ) !<dev-qt/qtquickcontrols-5.7:5 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.14
-SRC_URI=https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtdeclarative-everywhere-src-5.14.2.tar.xz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=931f4c39e70189c280b686975719b699
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.14.2-r3 b/metadata/md5-cache/dev-qt/qtdeclarative-5.14.2-r3
index af818cabd15d..f43d20fdcb82 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.14.2-r3
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.14.2-r3
@@ -5,11 +5,11 @@ DESCRIPTION=The QML and Quick modules for the Qt5 framework
 EAPI=7
 HOMEPAGE=https://www.qt.io/
 IUSE=gles2-only +jit localstorage vulkan +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.14.2 ~dev-qt/qtgui-5.14.2[gles2-only=,vulkan=] ~dev-qt/qtnetwork-5.14.2 ~dev-qt/qttest-5.14.2 localstorage? ( ~dev-qt/qtsql-5.14.2 ) widgets? ( ~dev-qt/qtwidgets-5.14.2[gles2-only=] ) !<dev-qt/qtquickcontrols-5.7:5 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.14
 SRC_URI=https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtdeclarative-everywhere-src-5.14.2.tar.xz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=1c3bdb6c5e112f8cc5c7df9b145dab35
+_md5_=f8bb2e7e9eea5a10a9a5e621f1304ee3
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.14.2 b/metadata/md5-cache/dev-qt/qtmultimedia-5.14.2
deleted file mode 100644
index 9a70a316eec4..000000000000
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.14.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.14.2 ~dev-qt/qtgui-5.14.2[gles2-only=] ~dev-qt/qtnetwork-5.14.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.14.2 gles2-only? ( ~dev-qt/qtgui-5.14.2[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-5.14.2 ~dev-qt/qtwidgets-5.14.2[gles2-only=] ) gstreamer? ( x11-base/xorg-proto ) test? ( ~dev-qt/qttest-5.14.2 )
-DESCRIPTION=Multimedia (audio, video, radio, camera) library for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=alsa gles2-only gstreamer openal pulseaudio qml widgets debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.14.2 ~dev-qt/qtgui-5.14.2[gles2-only=] ~dev-qt/qtnetwork-5.14.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.14.2 gles2-only? ( ~dev-qt/qtgui-5.14.2[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-5.14.2 ~dev-qt/qtwidgets-5.14.2[gles2-only=] ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.14
-SRC_URI=https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtmultimedia-everywhere-src-5.14.2.tar.xz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=edabe86db52ef73a09db77f099b5f058
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.14.2-r1 b/metadata/md5-cache/dev-qt/qtmultimedia-5.14.2-r1
index a89fc670f62f..8ed74ea2855b 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.14.2-r1
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.14.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-only 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.14.2 ~dev-qt/qtgui-5.14.2[gles2-only=] ~dev-qt/qtnetwork-5.14.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.14.2 gles2-only? ( ~dev-qt/qtgui-5.14.2[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-5.14.2 ~dev-qt/qtwidgets-5.14.2[gles2-only=] ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.14
 SRC_URI=https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtmultimedia-everywhere-src-5.14.2.tar.xz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=f0a891b0317e4be35697a8d55c31ce27
+_md5_=dbc29ee78c5568b7dd808bbfed89776f
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.14.2 b/metadata/md5-cache/dev-qt/qtnetwork-5.14.2
deleted file mode 100644
index 6a9b4e930615..000000000000
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.14.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~dev-qt/qtcore-5.14.2:5= sys-libs/zlib:= connman? ( ~dev-qt/qtdbus-5.14.2 ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.14.2 ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) ssl? ( dev-libs/openssl:0=[bindist=] ) test? ( ~dev-qt/qttest-5.14.2 )
-DESCRIPTION=Network abstraction library for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=bindist connman gssapi libproxy networkmanager sctp +ssl debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.14.2:5= sys-libs/zlib:= connman? ( ~dev-qt/qtdbus-5.14.2 ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.14.2 ) 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.14
-SRC_URI=https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtbase-everywhere-src-5.14.2.tar.xz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=28b55c4e656c7fb63d5f397742c07bf4
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.14.2-r1 b/metadata/md5-cache/dev-qt/qtnetwork-5.14.2-r1
index 55b33d89cf44..333bd5951deb 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.14.2-r1
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.14.2-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Network abstraction library for the Qt5 framework
 EAPI=7
 HOMEPAGE=https://www.qt.io/
 IUSE=bindist connman gssapi libproxy networkmanager sctp +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.14.2:5= sys-libs/zlib:= connman? ( ~dev-qt/qtdbus-5.14.2 ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.14.2 ) 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.14
 SRC_URI=https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtbase-everywhere-src-5.14.2.tar.xz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=f045b4f65f6cb71dc8369c57030764b2
+_md5_=f974f88b3233cab6a89e1d194f1f4d52
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.14.2 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.14.2
deleted file mode 100644
index 59024ccffc85..000000000000
--- a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.14.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.14.2 ~dev-qt/qtdeclarative-5.14.2 ~dev-qt/qtgui-5.14.2 widgets? ( ~dev-qt/qtwidgets-5.14.2 ) test? ( ~dev-qt/qttest-5.14.2 )
-DESCRIPTION=Set of next generation Qt Quick controls for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=widgets debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.14.2 ~dev-qt/qtdeclarative-5.14.2 ~dev-qt/qtgui-5.14.2 widgets? ( ~dev-qt/qtwidgets-5.14.2 ) ~dev-qt/qtgraphicaleffects-5.14.2 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.14
-SRC_URI=https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtquickcontrols2-everywhere-src-5.14.2.tar.xz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=26832d4830fa4c5b2d3ce517d6abec53
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.14.2-r1 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.14.2-r1
index feed4eba10ba..eb91b394fbd0 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.14.2-r1
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.14.2-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Set of next generation Qt Quick controls for the Qt5 framework
 EAPI=7
 HOMEPAGE=https://www.qt.io/
 IUSE=widgets debug test
-KEYWORDS=~amd64 ~arm arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.14.2 ~dev-qt/qtdeclarative-5.14.2 ~dev-qt/qtgui-5.14.2 widgets? ( ~dev-qt/qtwidgets-5.14.2 ) ~dev-qt/qtgraphicaleffects-5.14.2 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.14
 SRC_URI=https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtquickcontrols2-everywhere-src-5.14.2.tar.xz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=02cf4723c1670dff7ba70050488ef5bb
+_md5_=3fe626d03fb5034608a2f26c1432593e
diff --git a/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.0 b/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.0
new file mode 100644
index 000000000000..3e1cf705ca28
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtdeclarative-5.15.0 ~dev-qt/qtgui-5.15.0 test? ( ~dev-qt/qttest-5.15.0 )
+DESCRIPTION=Qt module for keyframe-based timeline construction
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtdeclarative-5.15.0 ~dev-qt/qtgui-5.15.0 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.15
+SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtquicktimeline-everywhere-src-5.15.0.tar.xz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
+_md5_=86b3c9cbe370f58e6550c79e8f62ac4d
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index a44fe462b6d1..e984486427a4 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/asciidoctor-2.0.10 b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.10
index b266109a852e..b8d921d6ecc1 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-2.0.10
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.10
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( test? ( dev-util/cucumber[ruby_targets_ruby24(-)] dev-ruby/rspec-expectations:*[ruby_targets_ruby24(-)] dev-ruby/asciimath[ruby_targets_ruby24(-)] dev-ruby/coderay[ruby_targets_ruby24(-)] dev-ruby/erubis[ruby_targets_ruby24(-)] dev-ruby/haml[ruby_targets_ruby24(-)] dev-ruby/nokogiri[ruby_targets_ruby24(-)] dev-ruby/rouge[ruby_targets_ruby24(-)] dev-ruby/slim[ruby_targets_ruby24(-)] dev-ruby/thread_safe[ruby_targets_ruby24(-)] dev-ruby/tilt[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-util/cucumber[ruby_targets_ruby25(-)] dev-ruby/rspec-expectations:*[ruby_targets_ruby25(-)] dev-ruby/asciimath[ruby_targets_ruby25(-)] dev-ruby/coderay[ruby_targets_ruby25(-)] dev-ruby/erubis[ruby_targets_ruby25(-)] dev-ruby/haml[ruby_targets_ruby25(-)] dev-ruby/nokogiri[ruby_targets_ruby25(-)] dev-ruby/rouge[ruby_targets_ruby25(-)] dev-ruby/slim[ruby_targets_ruby25(-)] dev-ruby/thread_safe[ruby_targets_ruby25(-)] dev-ruby/tilt[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-util/cucumber[ruby_targets_ruby26(-)] dev-ruby/rspec-expectations:*[ruby_targets_ruby26(-)] dev-ruby/asciimath[ruby_targets_ruby26(-)] dev-ruby/coderay[ruby_targets_ruby26(-)] dev-ruby/erubis[ruby_targets_ruby26(-)] dev-ruby/haml[ruby_targets_ruby26(-)] dev-ruby/nokogiri[ruby_targets_ruby26(-)] dev-ruby/rouge[ruby_targets_ruby26(-)] dev-ruby/slim[ruby_targets_ruby26(-)] dev-ruby/thread_safe[ruby_targets_ruby26(-)] dev-ruby/tilt[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? ( dev-util/cucumber[ruby_targets_ruby24(-)] dev-ruby/rspec-expectations:*[ruby_targets_ruby24(-)] dev-ruby/asciimath[ruby_targets_ruby24(-)] dev-ruby/coderay[ruby_targets_ruby24(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby24(-)] dev-ruby/erubis[ruby_targets_ruby24(-)] dev-ruby/haml[ruby_targets_ruby24(-)] dev-ruby/nokogiri[ruby_targets_ruby24(-)] dev-ruby/rouge[ruby_targets_ruby24(-)] dev-ruby/slim[ruby_targets_ruby24(-)] dev-ruby/tilt[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-util/cucumber[ruby_targets_ruby25(-)] dev-ruby/rspec-expectations:*[ruby_targets_ruby25(-)] dev-ruby/asciimath[ruby_targets_ruby25(-)] dev-ruby/coderay[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] dev-ruby/erubis[ruby_targets_ruby25(-)] dev-ruby/haml[ruby_targets_ruby25(-)] dev-ruby/nokogiri[ruby_targets_ruby25(-)] dev-ruby/rouge[ruby_targets_ruby25(-)] dev-ruby/slim[ruby_targets_ruby25(-)] dev-ruby/tilt[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-util/cucumber[ruby_targets_ruby26(-)] dev-ruby/rspec-expectations:*[ruby_targets_ruby26(-)] dev-ruby/asciimath[ruby_targets_ruby26(-)] dev-ruby/coderay[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] dev-ruby/erubis[ruby_targets_ruby26(-)] dev-ruby/haml[ruby_targets_ruby26(-)] dev-ruby/nokogiri[ruby_targets_ruby26(-)] dev-ruby/rouge[ruby_targets_ruby26(-)] dev-ruby/slim[ruby_targets_ruby26(-)] dev-ruby/tilt[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(-)] ) )
 DESCRIPTION=Processor for converting AsciiDoc into HTML 5, DocBook 4.5 and other formats
 EAPI=6
 HOMEPAGE=https://github.com/asciidoctor/asciidoctor
 IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm ~arm64 ~hppa 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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciidoctor/asciidoctor/archive/v2.0.10.tar.gz -> asciidoctor-2.0.10.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1e9bb20f354b0a0e0622453dd0767f25
+_md5_=2203e0e06abd11256d5004ffe7c14cd5
diff --git a/metadata/md5-cache/dev-ruby/asciimath-1.0.9 b/metadata/md5-cache/dev-ruby/asciimath-1.0.9
index a40ed543cb30..3ced95669621 100644
--- a/metadata/md5-cache/dev-ruby/asciimath-1.0.9
+++ b/metadata/md5-cache/dev-ruby/asciimath-1.0.9
@@ -5,7 +5,7 @@ DESCRIPTION=A pure Ruby AsciiMath parsing and conversion library
 EAPI=7
 HOMEPAGE=https://github.com/pepijnve/asciimath
 IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 ~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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/asciimath-1.0.9.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fb66b592fa3db8156ded6ca565b47ce7
+_md5_=7a2addc0410a1a78d917b7740ac4622b
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.7.3 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.7.3
deleted file mode 100644
index 1a6ff5a6402a..000000000000
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.7.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/execjs:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/execjs:*[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rails-5.0.0[ruby_targets_ruby24(-)] dev-ruby/rake[ruby_targets_ruby24(-)] dev-ruby/rspec-rails[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rails-5.0.0[ruby_targets_ruby25(-)] dev-ruby/rake[ruby_targets_ruby25(-)] dev-ruby/rspec-rails[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rails-5.0.0[ruby_targets_ruby26(-)] dev-ruby/rake[ruby_targets_ruby26(-)] dev-ruby/rspec-rails[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=Add vendor prefixes to CSS rules using values from the Can I Use website
-EAPI=7
-HOMEPAGE=https://github.com/ai/autoprefixer-rails
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/execjs:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/execjs:*[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=9
-SRC_URI=https://rubygems.org/gems/autoprefixer-rails-9.7.3.gem
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=81694747fd26fb2869f6c1aca5b83872
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.7.4 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.7.4
deleted file mode 100644
index 54ec177eadc0..000000000000
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.7.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/execjs:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/execjs:*[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rails-5.0.0[ruby_targets_ruby24(-)] dev-ruby/rake[ruby_targets_ruby24(-)] dev-ruby/rspec-rails[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rails-5.0.0[ruby_targets_ruby25(-)] dev-ruby/rake[ruby_targets_ruby25(-)] dev-ruby/rspec-rails[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rails-5.0.0[ruby_targets_ruby26(-)] dev-ruby/rake[ruby_targets_ruby26(-)] dev-ruby/rspec-rails[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=Add vendor prefixes to CSS rules using values from the Can I Use website
-EAPI=7
-HOMEPAGE=https://github.com/ai/autoprefixer-rails
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/execjs:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/execjs:*[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=9
-SRC_URI=https://rubygems.org/gems/autoprefixer-rails-9.7.4.gem
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d82989d830eb2bb3a593cfe5f65ff594
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.8.2 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.8.2
new file mode 100644
index 000000000000..e020bc1a99ac
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.8.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/execjs:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/execjs:*[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rails-5.0.0[ruby_targets_ruby25(-)] dev-ruby/rake[ruby_targets_ruby25(-)] dev-ruby/rspec-rails[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rails-5.0.0[ruby_targets_ruby26(-)] dev-ruby/rake[ruby_targets_ruby26(-)] dev-ruby/rspec-rails[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/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[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=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=Add vendor prefixes to CSS rules using values from the Can I Use website
+EAPI=7
+HOMEPAGE=https://github.com/ai/autoprefixer-rails
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( dev-ruby/execjs:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/execjs:*[ruby_targets_ruby26(-)] ) 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=9
+SRC_URI=https://rubygems.org/gems/autoprefixer-rails-9.8.2.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=54b810e92cd99ac4ed3a8f516297a5b9
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.8.4 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.8.4
new file mode 100644
index 000000000000..c55d9fc76c44
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.8.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/execjs:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/execjs:*[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rails-5.0.0[ruby_targets_ruby25(-)] dev-ruby/rake[ruby_targets_ruby25(-)] dev-ruby/rspec-rails[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rails-5.0.0[ruby_targets_ruby26(-)] dev-ruby/rake[ruby_targets_ruby26(-)] dev-ruby/rspec-rails[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/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[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=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=Add vendor prefixes to CSS rules using values from the Can I Use website
+EAPI=7
+HOMEPAGE=https://github.com/ai/autoprefixer-rails
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( dev-ruby/execjs:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/execjs:*[ruby_targets_ruby26(-)] ) 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=9
+SRC_URI=https://rubygems.org/gems/autoprefixer-rails-9.8.4.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=54b810e92cd99ac4ed3a8f516297a5b9
diff --git a/metadata/md5-cache/dev-ruby/backports-3.16.0 b/metadata/md5-cache/dev-ruby/backports-3.16.0
deleted file mode 100644
index befcdde00573..000000000000
--- a/metadata/md5-cache/dev-ruby/backports-3.16.0
+++ /dev/null
@@ -1,16 +0,0 @@
-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=~amd64 ~arm ~arm64 ~hppa ~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	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cbc66353d6dd2a5eba10ff739fef1486
diff --git a/metadata/md5-cache/dev-ruby/backports-3.17.0 b/metadata/md5-cache/dev-ruby/backports-3.17.0
deleted file mode 100644
index 8b842409b0db..000000000000
--- a/metadata/md5-cache/dev-ruby/backports-3.17.0
+++ /dev/null
@@ -1,16 +0,0 @@
-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=~amd64 ~arm ~arm64 ~hppa ~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://github.com/marcandre/backports/archive/v3.17.0.tar.gz -> backports-3.17.0{P}.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=69b89489a9a484f352a346ae1bcba8df
diff --git a/metadata/md5-cache/dev-ruby/backports-3.17.1 b/metadata/md5-cache/dev-ruby/backports-3.17.1
deleted file mode 100644
index 43da432b84f1..000000000000
--- a/metadata/md5-cache/dev-ruby/backports-3.17.1
+++ /dev/null
@@ -1,16 +0,0 @@
-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=~amd64 ~arm ~arm64 ~hppa ~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://github.com/marcandre/backports/archive/v3.17.1.tar.gz -> backports-3.17.1{P}.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=69b89489a9a484f352a346ae1bcba8df
diff --git a/metadata/md5-cache/dev-ruby/backports-3.18.1 b/metadata/md5-cache/dev-ruby/backports-3.18.1
new file mode 100644
index 000000000000..26afa4153472
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/backports-3.18.1
@@ -0,0 +1,16 @@
+BDEPEND=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=Backports of Ruby features for older Ruby
+EAPI=7
+HOMEPAGE=https://github.com/marcandre/backports
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+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=0
+SRC_URI=https://github.com/marcandre/backports/archive/v3.18.1.tar.gz -> backports-3.18.1{P}.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e9417b965023c3f4e84f3fb8b364c319
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.30.0 b/metadata/md5-cache/dev-ruby/capybara-3.30.0
deleted file mode 100644
index cc4e9cff27c7..000000000000
--- a/metadata/md5-cache/dev-ruby/capybara-3.30.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24(-)] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby24(-)] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby24(-)] dev-ruby/sinatra:2[ruby_targets_ruby24(-)] www-servers/puma[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby25(-)] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby25(-)] dev-ruby/sinatra:2[ruby_targets_ruby25(-)] www-servers/puma[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby26(-)] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby26(-)] dev-ruby/sinatra:2[ruby_targets_ruby26(-)] www-servers/puma[ruby_targets_ruby26(-)] ) ) test? ( ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24(-)] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24(-)] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby24(-)] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby24(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby24(-)] >=dev-ruby/regexp_parser-1.5:1[ruby_targets_ruby24(-)] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/addressable[ruby_targets_ruby25(-)] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby25(-)] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby25(-)] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby25(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25(-)] >=dev-ruby/regexp_parser-1.5:1[ruby_targets_ruby25(-)] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/addressable[ruby_targets_ruby26(-)] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby26(-)] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby26(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26(-)] >=dev-ruby/regexp_parser-1.5:1[ruby_targets_ruby26(-)] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby26(-)] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( || ( www-client/firefox www-client/firefox-bin ) ) 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=Capybara aims to simplify the process of integration testing Rack applications
-EAPI=7
-HOMEPAGE=https://github.com/jnicklas/capybara
-IUSE=test test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24(-)] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24(-)] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby24(-)] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby24(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby24(-)] >=dev-ruby/regexp_parser-1.5:1[ruby_targets_ruby24(-)] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/addressable[ruby_targets_ruby25(-)] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby25(-)] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby25(-)] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby25(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25(-)] >=dev-ruby/regexp_parser-1.5:1[ruby_targets_ruby25(-)] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/addressable[ruby_targets_ruby26(-)] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby26(-)] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby26(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26(-)] >=dev-ruby/regexp_parser-1.5:1[ruby_targets_ruby26(-)] >=dev-ruby/xpath-3.2: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? ( 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=3
-SRC_URI=https://rubygems.org/gems/capybara-3.30.0.gem
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=3f1f20a6db174c5d3ae5110360e157a1
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.33.0 b/metadata/md5-cache/dev-ruby/capybara-3.33.0
new file mode 100644
index 000000000000..4a2443da1a6a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/capybara-3.33.0
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby25(-)] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby25(-)] dev-ruby/sinatra:2[ruby_targets_ruby25(-)] www-servers/puma[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby26(-)] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby26(-)] dev-ruby/sinatra:2[ruby_targets_ruby26(-)] www-servers/puma[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby27(-)] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby27(-)] dev-ruby/sinatra:2[ruby_targets_ruby27(-)] www-servers/puma[ruby_targets_ruby27(-)] ) ) test? ( ruby_targets_ruby25? ( dev-ruby/addressable[ruby_targets_ruby25(-)] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby25(-)] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby25(-)] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby25(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25(-)] >=dev-ruby/regexp_parser-1.5:1[ruby_targets_ruby25(-)] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/addressable[ruby_targets_ruby26(-)] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby26(-)] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby26(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26(-)] >=dev-ruby/regexp_parser-1.5:1[ruby_targets_ruby26(-)] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/addressable[ruby_targets_ruby27(-)] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby27(-)] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/regexp_parser-1.5:1[ruby_targets_ruby27(-)] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby27(-)] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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? ( 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=test? ( || ( www-client/firefox www-client/firefox-bin ) ) 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=Capybara aims to simplify the process of integration testing Rack applications
+EAPI=7
+HOMEPAGE=https://github.com/jnicklas/capybara
+IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( dev-ruby/addressable[ruby_targets_ruby25(-)] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby25(-)] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby25(-)] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby25(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25(-)] >=dev-ruby/regexp_parser-1.5:1[ruby_targets_ruby25(-)] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/addressable[ruby_targets_ruby26(-)] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby26(-)] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby26(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26(-)] >=dev-ruby/regexp_parser-1.5:1[ruby_targets_ruby26(-)] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/addressable[ruby_targets_ruby27(-)] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby27(-)] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/regexp_parser-1.5:1[ruby_targets_ruby27(-)] >=dev-ruby/xpath-3.2:3[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 )
+SLOT=3
+SRC_URI=https://rubygems.org/gems/capybara-3.33.0.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
+_md5_=613694b7b7cd4ebe766562b73f2728d9
diff --git a/metadata/md5-cache/dev-ruby/childprocess-4.0.0 b/metadata/md5-cache/dev-ruby/childprocess-4.0.0
index f826fa986ecb..095dfd6bcffc 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-4.0.0
+++ b/metadata/md5-cache/dev-ruby/childprocess-4.0.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/childprocess-4.0.0.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1c50a9bfbbcce1b86f95664a4a453251
+_md5_=74bbda098474715923a79f442c610c8e
diff --git a/metadata/md5-cache/dev-ruby/diff-lcs-1.4 b/metadata/md5-cache/dev-ruby/diff-lcs-1.4
new file mode 100644
index 000000000000..028fe8b79158
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/diff-lcs-1.4
@@ -0,0 +1,16 @@
+BDEPEND=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/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_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=Use the McIlroy-Hunt LCS algorithm to compute differences
+EAPI=7
+HOMEPAGE=https://github.com/halostatue/diff-lcs
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( MIT Ruby 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=0
+SRC_URI=https://rubygems.org/gems/diff-lcs-1.4.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=233f3cf60a349be7cee0b65033e05f03
diff --git a/metadata/md5-cache/dev-ruby/diff-lcs-1.4.1 b/metadata/md5-cache/dev-ruby/diff-lcs-1.4.1
new file mode 100644
index 000000000000..10e1524b4ec4
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/diff-lcs-1.4.1
@@ -0,0 +1,16 @@
+BDEPEND=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/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_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=Use the McIlroy-Hunt LCS algorithm to compute differences
+EAPI=7
+HOMEPAGE=https://github.com/halostatue/diff-lcs
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( MIT Ruby 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=0
+SRC_URI=https://rubygems.org/gems/diff-lcs-1.4.1.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=233f3cf60a349be7cee0b65033e05f03
diff --git a/metadata/md5-cache/dev-ruby/faker-2.13.0 b/metadata/md5-cache/dev-ruby/faker-2.13.0
new file mode 100644
index 000000000000..ba2a69c61ca7
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/faker-2.13.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/i18n-1.6:1[ruby_targets_ruby25(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/i18n-1.6:1[ruby_targets_ruby26(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/i18n-1.6:1[ruby_targets_ruby27(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/timecop[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/timecop[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/timecop[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? ( 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=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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/i18n-1.6:1[ruby_targets_ruby25(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/i18n-1.6:1[ruby_targets_ruby26(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/i18n-1.6:1[ruby_targets_ruby27(-)] !!<dev-ruby/faker-1.9.6-r1[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 )
+SLOT=2
+SRC_URI=https://github.com/stympy/faker/archive/v2.13.0.tar.gz -> faker-2.13.0.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=563237782cb36522cc8d9ab4fd5e8de8
diff --git a/metadata/md5-cache/dev-ruby/gh-0.18.0 b/metadata/md5-cache/dev-ruby/gh-0.18.0
new file mode 100644
index 000000000000..565f672930d2
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/gh-0.18.0
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby24? ( dev-ruby/webmock[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/webmock[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/webmock[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( dev-ruby/activesupport:5.2[ruby_targets_ruby24(-)] >=dev-ruby/addressable-2.4.0:0[ruby_targets_ruby24(-)] dev-ruby/faraday:1[ruby_targets_ruby24(-)] dev-ruby/faraday_middleware:1[ruby_targets_ruby24(-)] >dev-ruby/multi_json-1.0[ruby_targets_ruby24(-)] dev-ruby/net-http-pipeline[ruby_targets_ruby24(-)] >=dev-ruby/net-http-persistent-2.9:*[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/activesupport:5.2[ruby_targets_ruby25(-)] >=dev-ruby/addressable-2.4.0:0[ruby_targets_ruby25(-)] dev-ruby/faraday:1[ruby_targets_ruby25(-)] dev-ruby/faraday_middleware:1[ruby_targets_ruby25(-)] >dev-ruby/multi_json-1.0[ruby_targets_ruby25(-)] dev-ruby/net-http-pipeline[ruby_targets_ruby25(-)] >=dev-ruby/net-http-persistent-2.9:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/activesupport:5.2[ruby_targets_ruby26(-)] >=dev-ruby/addressable-2.4.0:0[ruby_targets_ruby26(-)] dev-ruby/faraday:1[ruby_targets_ruby26(-)] dev-ruby/faraday_middleware:1[ruby_targets_ruby26(-)] >dev-ruby/multi_json-1.0[ruby_targets_ruby26(-)] dev-ruby/net-http-pipeline[ruby_targets_ruby26(-)] >=dev-ruby/net-http-persistent-2.9:*[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=multi-layer client for the github api v3
+EAPI=7
+HOMEPAGE=https://github.com/travis-ci/gh
+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.2[ruby_targets_ruby24(-)] >=dev-ruby/addressable-2.4.0:0[ruby_targets_ruby24(-)] dev-ruby/faraday:1[ruby_targets_ruby24(-)] dev-ruby/faraday_middleware:1[ruby_targets_ruby24(-)] >dev-ruby/multi_json-1.0[ruby_targets_ruby24(-)] dev-ruby/net-http-pipeline[ruby_targets_ruby24(-)] >=dev-ruby/net-http-persistent-2.9:*[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/activesupport:5.2[ruby_targets_ruby25(-)] >=dev-ruby/addressable-2.4.0:0[ruby_targets_ruby25(-)] dev-ruby/faraday:1[ruby_targets_ruby25(-)] dev-ruby/faraday_middleware:1[ruby_targets_ruby25(-)] >dev-ruby/multi_json-1.0[ruby_targets_ruby25(-)] dev-ruby/net-http-pipeline[ruby_targets_ruby25(-)] >=dev-ruby/net-http-persistent-2.9:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/activesupport:5.2[ruby_targets_ruby26(-)] >=dev-ruby/addressable-2.4.0:0[ruby_targets_ruby26(-)] dev-ruby/faraday:1[ruby_targets_ruby26(-)] dev-ruby/faraday_middleware:1[ruby_targets_ruby26(-)] >dev-ruby/multi_json-1.0[ruby_targets_ruby26(-)] dev-ruby/net-http-pipeline[ruby_targets_ruby26(-)] >=dev-ruby/net-http-persistent-2.9:*[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/travis-ci/gh/archive/v0.18.0.tar.gz -> gh-0.18.0.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7fef9882a67d8a80c93dea0456621775
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.21.0 b/metadata/md5-cache/dev-ruby/hoe-3.21.0
index 118ffe768a28..32d25dd44ecf 100644
--- a/metadata/md5-cache/dev-ruby/hoe-3.21.0
+++ b/metadata/md5-cache/dev-ruby/hoe-3.21.0
@@ -5,7 +5,7 @@ DESCRIPTION=Hoe extends rake to provide full project automation
 EAPI=7
 HOMEPAGE=https://www.zenspider.com/projects/hoe.html
 IUSE=doc test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~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 ~mips ppc ppc64 ~s390 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/rake-0.8.7[ruby_targets_ruby24(-)] <dev-ruby/rake-15.0[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby25(-)] <dev-ruby/rake-15.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby26(-)] <dev-ruby/rake-15.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] <dev-ruby/rake-15.0[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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hoe-3.21.0.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d40b04a94107c2411d3b90da1bf386c8
+_md5_=a451102d59358e39108410e9a96a4c05
diff --git a/metadata/md5-cache/dev-ruby/lumberjack-1.2.6 b/metadata/md5-cache/dev-ruby/lumberjack-1.2.6
new file mode 100644
index 000000000000..a996bed6c1ee
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/lumberjack-1.2.6
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( test? ( >=dev-ruby/timecop-0.8[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/timecop-0.8[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/timecop-0.8[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/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_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=A simple, powerful, and very fast logging utility
+EAPI=7
+HOMEPAGE=https://github.com/bdurand/lumberjack
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+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=0
+SRC_URI=https://github.com/bdurand/lumberjack/archive/v1.2.6.tar.gz -> lumberjack-1.2.6.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=129d96678de518eacad1d3697f371a3f
diff --git a/metadata/md5-cache/dev-ruby/maildir-2.2.3 b/metadata/md5-cache/dev-ruby/maildir-2.2.3
new file mode 100644
index 000000000000..c36ba2a9e826
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/maildir-2.2.3
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( test? ( >=dev-ruby/fakefs-0.3.2[ruby_targets_ruby25(-)] dev-ruby/mail[ruby_targets_ruby25(-)] dev-ruby/shoulda-context[ruby_targets_ruby25(-)] dev-ruby/test-unit:2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/fakefs-0.3.2[ruby_targets_ruby26(-)] dev-ruby/mail[ruby_targets_ruby26(-)] dev-ruby/shoulda-context[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/fakefs-0.3.2[ruby_targets_ruby27(-)] dev-ruby/mail[ruby_targets_ruby27(-)] dev-ruby/shoulda-context[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[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=A library for reading and writing arbitrary messages in DJB's maildir format
+EAPI=7
+HOMEPAGE=https://github.com/ktheory/maildir
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+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=2
+SRC_URI=https://rubygems.org/gems/maildir-2.2.3.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5edb6d767dff67eab0dc0d281ed8ba29
diff --git a/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.1 b/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.1
index 31a372d4378d..7b51c6c7d3b4 100644
--- a/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.1
+++ b/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.1
@@ -5,7 +5,7 @@ DESCRIPTION=Power Assert for Minitest
 EAPI=7
 HOMEPAGE=https://github.com/hsbt/minitest-power_assert
 IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm ~arm64 ppc ppc64 ~x86
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby24? ( dev-ruby/minitest:*[ruby_targets_ruby24(-)] >=dev-ruby/power_assert-1.1[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/minitest:*[ruby_targets_ruby25(-)] >=dev-ruby/power_assert-1.1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/minitest:*[ruby_targets_ruby26(-)] >=dev-ruby/power_assert-1.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/minitest:*[ruby_targets_ruby27(-)] >=dev-ruby/power_assert-1.1[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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/minitest-power_assert-0.3.1.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=589ff1ac725470308f4c3dc52e28a41e
+_md5_=e131c5a078b490d21de20f73718e105c
diff --git a/metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r1 b/metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r1
index 9be7f64b0882..d92ad11bb2dd 100644
--- a/metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r1
+++ b/metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sferik/multi_xml/archive/v0.6.0.tar.gz -> multi_xml-0.6.0.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f563ff09206e1c926177be86c6da0642
+_md5_=8ac9ac39ee4b6900e2ac52472728a134
diff --git a/metadata/md5-cache/dev-ruby/mustache-1.1.1 b/metadata/md5-cache/dev-ruby/mustache-1.1.1
index 2daa346b913f..49a6a0b75827 100644
--- a/metadata/md5-cache/dev-ruby/mustache-1.1.1
+++ b/metadata/md5-cache/dev-ruby/mustache-1.1.1
@@ -5,7 +5,7 @@ DESCRIPTION=Mustache is a framework-agnostic way to render logic-free views
 EAPI=7
 HOMEPAGE=https://mustache.github.com/
 IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mustache-1.1.1.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5e87bf2b3516abf5713fcef8bc1faae4
+_md5_=872801396f96e99dbb0cdb05905e8f9f
diff --git a/metadata/md5-cache/dev-ruby/net-sftp-2.1.2-r2 b/metadata/md5-cache/dev-ruby/net-sftp-2.1.2-r2
deleted file mode 100644
index f03712595fa8..000000000000
--- a/metadata/md5-cache/dev-ruby/net-sftp-2.1.2-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/net-ssh:4[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/net-ssh:4[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/mocha-0.13[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/mocha-0.13[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) )
-DESCRIPTION=SFTP in pure Ruby
-EAPI=5
-HOMEPAGE=https://github.com/net-ssh/net-sftp
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/net-ssh:4[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/net-ssh:4[ruby_targets_ruby25(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://rubygems.org/gems/net-sftp-2.1.2.gem
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=271d70d2e99e7fe2e252e152fbf70c64
diff --git a/metadata/md5-cache/dev-ruby/net-sftp-3.0.0 b/metadata/md5-cache/dev-ruby/net-sftp-3.0.0
index 6dd9151e92f0..9bc40c9ade74 100644
--- a/metadata/md5-cache/dev-ruby/net-sftp-3.0.0
+++ b/metadata/md5-cache/dev-ruby/net-sftp-3.0.0
@@ -5,7 +5,7 @@ DESCRIPTION=SFTP in pure Ruby
 EAPI=7
 HOMEPAGE=https://github.com/net-ssh/net-sftp
 IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby24? ( || ( dev-ruby/net-ssh:6[ruby_targets_ruby24(-)] dev-ruby/net-ssh:5[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( || ( dev-ruby/net-ssh:6[ruby_targets_ruby25(-)] dev-ruby/net-ssh:5[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( || ( dev-ruby/net-ssh:6[ruby_targets_ruby26(-)] dev-ruby/net-ssh:5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( || ( dev-ruby/net-ssh:6[ruby_targets_ruby27(-)] dev-ruby/net-ssh:5[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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/net-ssh/net-sftp/archive/v3.0.0.tar.gz -> net-sftp-3.0.0.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=84ca836c9aaab657d7d10340d5f2e2ab
+_md5_=1b619e00f680f104950f46aa701b05bd
diff --git a/metadata/md5-cache/dev-ruby/octokit-4.18.0-r1 b/metadata/md5-cache/dev-ruby/octokit-4.18.0-r1
index 11165930531b..4d75137fda69 100644
--- a/metadata/md5-cache/dev-ruby/octokit-4.18.0-r1
+++ b/metadata/md5-cache/dev-ruby/octokit-4.18.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/faraday-0.9[ruby_targets_ruby24(-)] =dev-ruby/sawyer-0.8*[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/faraday-0.9[ruby_targets_ruby25(-)] =dev-ruby/sawyer-0.8*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/faraday-0.9[ruby_targets_ruby26(-)] =dev-ruby/sawyer-0.8*[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/jwt[ruby_targets_ruby24(-)] 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/jwt[ruby_targets_ruby25(-)] 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/jwt[ruby_targets_ruby26(-)] 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(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/faraday-0.9[ruby_targets_ruby24(-)] =dev-ruby/sawyer-0.8*[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/faraday-0.9[ruby_targets_ruby25(-)] =dev-ruby/sawyer-0.8*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/faraday-0.9[ruby_targets_ruby26(-)] =dev-ruby/sawyer-0.8*[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/jwt[ruby_targets_ruby24(-)] dev-ruby/mime-types[ruby_targets_ruby24(-)] >=dev-ruby/netrc-0.7.7[ruby_targets_ruby24(-)] dev-ruby/vcr:3[ruby_targets_ruby24(-),json] dev-ruby/webmock:3[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/jwt[ruby_targets_ruby25(-)] dev-ruby/mime-types[ruby_targets_ruby25(-)] >=dev-ruby/netrc-0.7.7[ruby_targets_ruby25(-)] dev-ruby/vcr:3[ruby_targets_ruby25(-),json] dev-ruby/webmock:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/jwt[ruby_targets_ruby26(-)] dev-ruby/mime-types[ruby_targets_ruby26(-)] >=dev-ruby/netrc-0.7.7[ruby_targets_ruby26(-)] dev-ruby/vcr:3[ruby_targets_ruby26(-),json] 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
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/octokit/octokit.rb/archive/v4.18.0.tar.gz -> octokit-4.18.0.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ad94c1afcaf31f776127b45c1c0238a4
+_md5_=1ce75cb736ae8ad5a3b20b9a57ca6a88
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.4.1 b/metadata/md5-cache/dev-ruby/pkg-config-1.4.1
index 92ff017de0ec..5d551448ea03 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.4.1
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.4.1
@@ -5,7 +5,7 @@ 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 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa 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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pkg-config-1.4.1.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a090c903f68e4888595915ae2f4cefed
+_md5_=83f371dd954334d69114a6f049e6d83a
diff --git a/metadata/md5-cache/dev-ruby/puppetdb-termini-6.10.0 b/metadata/md5-cache/dev-ruby/puppetdb-termini-6.10.0
index df75ebe99437..2e45a2dcb4e0 100644
--- a/metadata/md5-cache/dev-ruby/puppetdb-termini-6.10.0
+++ b/metadata/md5-cache/dev-ruby/puppetdb-termini-6.10.0
@@ -6,5 +6,5 @@ KEYWORDS=amd64 ~ppc x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=http://apt.puppetlabs.com/pool/stretch/puppet/p/puppetdb-termini/puppetdb-termini_6.10.0-1stretch_all.deb
-_eclasses_=unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=8487378a920cb95d503eceec907aca8e
diff --git a/metadata/md5-cache/dev-ruby/rake-compiler-1.1.0 b/metadata/md5-cache/dev-ruby/rake-compiler-1.1.0
index b337040133ff..8f47ec7c5042 100644
--- a/metadata/md5-cache/dev-ruby/rake-compiler-1.1.0
+++ b/metadata/md5-cache/dev-ruby/rake-compiler-1.1.0
@@ -5,7 +5,7 @@ DESCRIPTION=Provide a standard and simplified way to build and package Ruby exte
 EAPI=7
 HOMEPAGE=https://github.com/luislavena/rake-compiler
 IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 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/rake[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/rake[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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/luislavena/rake-compiler/archive/v1.1.0.tar.gz -> rake-compiler-1.1.0.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=11a2038ccd7ca59ce04ee9822849bb11
+_md5_=e7423fcb6831cf58f0b14947787a51ad
diff --git a/metadata/md5-cache/dev-ruby/rouge-3.19.0 b/metadata/md5-cache/dev-ruby/rouge-3.19.0
index 64bca7b740ac..8be144a66820 100644
--- a/metadata/md5-cache/dev-ruby/rouge-3.19.0
+++ b/metadata/md5-cache/dev-ruby/rouge-3.19.0
@@ -5,7 +5,7 @@ DESCRIPTION=Yet-another-markdown-parser using a strict syntax definition in pure
 EAPI=7
 HOMEPAGE=https://github.com/jneen/rouge
 IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm ~arm64 ppc ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby24? ( dev-ruby/redcarpet[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/redcarpet[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/redcarpet[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/redcarpet[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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jneen/rouge/archive/v3.19.0.tar.gz -> rouge-3.19.0.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=032a8c2f9e31624e5a340f6671f57c8d
+_md5_=fc497d013ef7d52f25d21f25c2f84914
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.1-r1 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.1-r1
index d75c1689ed3e..cb0240f9c129 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.1-r1
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.1-r1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.1.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8beccf864699cd0204c971e4b0b20294
+_md5_=e2e392e5391c68ca4cd6a8962a78711a
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.2 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.2
index ae4bf33e16be..9cdcecfbee69 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.2
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.2
@@ -4,7 +4,7 @@ DESCRIPTION=Ruby bindings for rrdtool
 EAPI=6
 HOMEPAGE=https://oss.oetiker.ch/rrdtool/
 IUSE=graph test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=~net-analyzer/rrdtool-1.7.2[graph=] 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 )
 REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.2.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=45746dbad4630be655c45e17c3bc1c94
+_md5_=e2e5f65c3f6f0efcc538aa4118f13eaf
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.9.2 b/metadata/md5-cache/dev-ruby/rspec-support-3.9.2
index 73557f815d0e..796f388dafc7 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.9.2
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.9.2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.9.2.tar.gz -> rspec-support-3.9.2-git.tgz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=26adb9b64a9ec86c931d1d898174de81
+_md5_=5cff49821052701c1ac54c2c6172151e
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-1.3.0 b/metadata/md5-cache/dev-ruby/rubyzip-1.3.0
index 7ed1d6149378..d56fe39a6cb1 100644
--- a/metadata/md5-cache/dev-ruby/rubyzip-1.3.0
+++ b/metadata/md5-cache/dev-ruby/rubyzip-1.3.0
@@ -5,7 +5,7 @@ DESCRIPTION=A ruby library for reading and writing zip files
 EAPI=7
 HOMEPAGE=https://github.com/rubyzip/rubyzip
 IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86
+KEYWORDS=amd64 arm ~arm64 hppa ppc ppc64 sparc x86
 LICENSE=Ruby
 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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/rubyzip/rubyzip/archive/v1.3.0.tar.gz -> rubyzip-1.3.0-git.tgz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6c484889ac79a04f707565f1a2adfe53
+_md5_=f07f8a60f18a002924873a3c9202e7a4
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-2.3.0 b/metadata/md5-cache/dev-ruby/rubyzip-2.3.0
index 07da95ec91bb..eb423a284c6d 100644
--- a/metadata/md5-cache/dev-ruby/rubyzip-2.3.0
+++ b/metadata/md5-cache/dev-ruby/rubyzip-2.3.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rubyzip/rubyzip/archive/v2.3.0.tar.gz -> rubyzip-2.3.0-git.tgz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8c19c6f5cc49919ca9c2ef652ea1a34c
+_md5_=eebe95fcdae9542c6819ef0cc92739ca
diff --git a/metadata/md5-cache/dev-ruby/tdiff-0.3.3-r1 b/metadata/md5-cache/dev-ruby/tdiff-0.3.3-r1
deleted file mode 100644
index 60f0aeb18561..000000000000
--- a/metadata/md5-cache/dev-ruby/tdiff-0.3.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) )
-DESCRIPTION=Calculates the differences between two tree-like structures
-EAPI=5
-HOMEPAGE=https://github.com/postmodern/tdiff
-IUSE=ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/tdiff-0.3.3.gem
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b67d3363f32b757f3bc42f90e0275a96
diff --git a/metadata/md5-cache/dev-ruby/tdiff-0.3.4 b/metadata/md5-cache/dev-ruby/tdiff-0.3.4
index 3b578045b3e8..643b8a57dbc5 100644
--- a/metadata/md5-cache/dev-ruby/tdiff-0.3.4
+++ b/metadata/md5-cache/dev-ruby/tdiff-0.3.4
@@ -4,7 +4,7 @@ DESCRIPTION=Calculates the differences between two tree-like structures
 EAPI=6
 HOMEPAGE=https://github.com/postmodern/tdiff
 IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tdiff-0.3.4.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7da6aafccaff328d00945aa11011c179
+_md5_=0a985e8704cb62f864ed0273caaf89d4
diff --git a/metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0 b/metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0
index 6113a85d01c5..2f0942873e3d 100644
--- a/metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0
+++ b/metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0
@@ -2,7 +2,7 @@ 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(-)] ) 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 Tokyo Cabinet
 EAPI=5
-HOMEPAGE=http://fallabs.com/tokyocabinet/
+HOMEPAGE=https://fallabs.com/tokyocabinet/
 IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tokyocabinet-1.32.0.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0fcc7dde613a72bbf118ccd9e3ff6b3a
+_md5_=39ade17f45b3095f8e82ee85449989db
diff --git a/metadata/md5-cache/dev-ruby/vcr-4.0.0 b/metadata/md5-cache/dev-ruby/vcr-4.0.0
index 6c4cb0932ab2..0af00a422861 100644
--- a/metadata/md5-cache/dev-ruby/vcr-4.0.0
+++ b/metadata/md5-cache/dev-ruby/vcr-4.0.0
@@ -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? ( 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? ( json? ( dev-ruby/multi_json[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( json? ( dev-ruby/multi_json[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( json? ( dev-ruby/multi_json[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=Records your test suite's HTTP interactions and replay them during test runs
 EAPI=6
 HOMEPAGE=https://github.com/vcr/vcr/
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
+IUSE=json test test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 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(-)] )
+RDEPEND=ruby_targets_ruby24? ( json? ( dev-ruby/multi_json[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( json? ( dev-ruby/multi_json[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( json? ( dev-ruby/multi_json[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
+RESTRICT=test !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/vcr/vcr/archive/v4.0.0.tar.gz -> vcr-4.0.0.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3188914c9e553d8cd73e1ed45224477e
+_md5_=822d918fe8fde0be88acb76dea0a81fe
diff --git a/metadata/md5-cache/dev-ruby/vcr-5.0.0 b/metadata/md5-cache/dev-ruby/vcr-5.0.0
deleted file mode 100644
index dcb68ab3c2ae..000000000000
--- a/metadata/md5-cache/dev-ruby/vcr-5.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-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? ( 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=Records your test suite's HTTP interactions and replay them during test runs
-EAPI=6
-HOMEPAGE=https://github.com/vcr/vcr/
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 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 )
-RESTRICT=test
-SLOT=5
-SRC_URI=https://github.com/vcr/vcr/archive/v5.0.0.tar.gz -> vcr-5.0.0.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d1375a940ab19445658122f86a6ac3ec
diff --git a/metadata/md5-cache/dev-ruby/vcr-5.1.0 b/metadata/md5-cache/dev-ruby/vcr-5.1.0
index 8664f650bbba..7fc094650517 100644
--- a/metadata/md5-cache/dev-ruby/vcr-5.1.0
+++ b/metadata/md5-cache/dev-ruby/vcr-5.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_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(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby24? ( json? ( dev-ruby/multi_json[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( json? ( dev-ruby/multi_json[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( json? ( dev-ruby/multi_json[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( json? ( dev-ruby/multi_json[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_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=Records your test suite's HTTP interactions and replay them during test runs
 EAPI=7
 HOMEPAGE=https://github.com/vcr/vcr/
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+IUSE=json test test 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_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(-)] )
+RDEPEND=ruby_targets_ruby24? ( json? ( dev-ruby/multi_json[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( json? ( dev-ruby/multi_json[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( json? ( dev-ruby/multi_json[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( json? ( dev-ruby/multi_json[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
+RESTRICT=test !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/vcr/vcr/archive/v5.1.0.tar.gz -> vcr-5.1.0.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9c5cd4b8bbe06c832fb2cd9b93b9d1ba
+_md5_=f1b8b928e4532f65d831ae7aef7b846d
diff --git a/metadata/md5-cache/dev-ruby/vcr-6.0.0 b/metadata/md5-cache/dev-ruby/vcr-6.0.0
index 4be9dca0769f..a3169ce5e9da 100644
--- a/metadata/md5-cache/dev-ruby/vcr-6.0.0
+++ b/metadata/md5-cache/dev-ruby/vcr-6.0.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_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(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby24? ( json? ( dev-ruby/json[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( json? ( dev-ruby/json[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( json? ( dev-ruby/json[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( json? ( dev-ruby/json[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_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=Records your test suite's HTTP interactions and replay them during test runs
 EAPI=7
 HOMEPAGE=https://github.com/vcr/vcr/
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+IUSE=json test test 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_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(-)] )
+RDEPEND=ruby_targets_ruby24? ( json? ( dev-ruby/json[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( json? ( dev-ruby/json[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( json? ( dev-ruby/json[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( json? ( dev-ruby/json[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
+RESTRICT=test !test? ( test )
 SLOT=6
 SRC_URI=https://github.com/vcr/vcr/archive/v6.0.0.tar.gz -> vcr-6.0.0.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9c5cd4b8bbe06c832fb2cd9b93b9d1ba
+_md5_=c3b7edd497a52a1f44011f4913fd1d5f
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index 32f811b3af96..2d945f324572 100644
--- a/metadata/md5-cache/dev-scheme/Manifest.gz
+++ b/metadata/md5-cache/dev-scheme/Manifest.gz
diff --git a/metadata/md5-cache/dev-scheme/guile-json-4.0.1 b/metadata/md5-cache/dev-scheme/guile-json-4.0.1
deleted file mode 100644
index b46f36a10f76..000000000000
--- a/metadata/md5-cache/dev-scheme/guile-json-4.0.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=dev-scheme/guile-2.0.0
-DESCRIPTION=JSON module for Guile
-EAPI=7
-HOMEPAGE=https://savannah.nongnu.org/projects/guile-json/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-scheme/guile-2.0.0
-SLOT=0
-SRC_URI=http://download.savannah.nongnu.org/releases/guile-json/guile-json-4.0.1.tar.gz
-_md5_=a8fac702acd1476182e486c0bbd2f2e1
diff --git a/metadata/md5-cache/dev-scheme/guile-json-4.1.0 b/metadata/md5-cache/dev-scheme/guile-json-4.1.0
new file mode 100644
index 000000000000..432008c5ac0f
--- /dev/null
+++ b/metadata/md5-cache/dev-scheme/guile-json-4.1.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=prepare
+DEPEND=>=dev-scheme/guile-2.0.0
+DESCRIPTION=JSON module for Guile
+EAPI=7
+HOMEPAGE=https://savannah.nongnu.org/projects/guile-json/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-scheme/guile-2.0.0
+SLOT=0
+SRC_URI=http://download.savannah.nongnu.org/releases/guile-json/guile-json-4.1.0.tar.gz
+_md5_=a8fac702acd1476182e486c0bbd2f2e1
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index 277538ead893..784fd724469c 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/circuit_macros-8.4 b/metadata/md5-cache/dev-tex/circuit_macros-8.4
index 3f39d7463a49..efa519b3218e 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	3438add11e8232d1fa32884e5e278bfe
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408
 _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 47874e47a949..df57171335fa 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	3438add11e8232d1fa32884e5e278bfe
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408
 _md5_=41583f7ccf446c53abe6314fc55c9bb3
diff --git a/metadata/md5-cache/dev-tex/glossaries-4.46 b/metadata/md5-cache/dev-tex/glossaries-4.46
new file mode 100644
index 000000000000..e7dd68245f2c
--- /dev/null
+++ b/metadata/md5-cache/dev-tex/glossaries-4.46
@@ -0,0 +1,14 @@
+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/
+IUSE=doc examples
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+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.46.zip
+_eclasses_=latex-package	e5f296c98696dd02059bc6a5a03282e2
+_md5_=edf55e701bd6f87d4b8d87b5d69a375a
diff --git a/metadata/md5-cache/dev-tex/html2latex-1.1-r1 b/metadata/md5-cache/dev-tex/html2latex-1.1-r1
index 13f1051410d8..8a094f8ac6da 100644
--- a/metadata/md5-cache/dev-tex/html2latex-1.1-r1
+++ b/metadata/md5-cache/dev-tex/html2latex-1.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/html2latex/html2latex-1.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=86bc6105526dd923e9daefc9da88b324
diff --git a/metadata/md5-cache/dev-tex/latex2html-2015 b/metadata/md5-cache/dev-tex/latex2html-2015
index b6d2bf8ac5bc..1b27bf6079f2 100644
--- a/metadata/md5-cache/dev-tex/latex2html-2015
+++ b/metadata/md5-cache/dev-tex/latex2html-2015
@@ -2,11 +2,11 @@ DEFINED_PHASES=configure install postinst postrm prepare
 DEPEND=app-text/ghostscript-gpl virtual/latex-base media-libs/netpbm dev-lang/perl gif? ( media-libs/giflib ) png? ( media-libs/libpng:0 )
 DESCRIPTION=Convertor written in Perl that converts LATEX documents to HTML
 EAPI=6
-HOMEPAGE=http://www.latex2html.org/
+HOMEPAGE=https://www.latex2html.org/
 IUSE=gif png
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-text/ghostscript-gpl virtual/latex-base media-libs/netpbm dev-lang/perl gif? ( media-libs/giflib ) png? ( media-libs/libpng:0 )
 SLOT=0
 SRC_URI=http://mirrors.ctan.org/support/latex2html/latex2html-2015.tar.gz
-_md5_=dc9b0ddcba6e5f868296223b5f951812
+_md5_=cb44165ca40a66d2c343a3f187e43b91
diff --git a/metadata/md5-cache/dev-tex/latex2html-2017.2-r2 b/metadata/md5-cache/dev-tex/latex2html-2017.2-r2
index 6cd3d509e902..afb11b998f07 100644
--- a/metadata/md5-cache/dev-tex/latex2html-2017.2-r2
+++ b/metadata/md5-cache/dev-tex/latex2html-2017.2-r2
@@ -2,11 +2,11 @@ DEFINED_PHASES=configure install postinst postrm prepare
 DEPEND=app-text/ghostscript-gpl virtual/latex-base media-libs/netpbm dev-lang/perl gif? ( media-libs/giflib ) png? ( media-libs/libpng:0 )
 DESCRIPTION=Convertor written in Perl that converts LATEX documents to HTML
 EAPI=6
-HOMEPAGE=http://www.latex2html.org/
+HOMEPAGE=https://www.latex2html.org/
 IUSE=gif png
 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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-text/ghostscript-gpl virtual/latex-base media-libs/netpbm dev-lang/perl gif? ( media-libs/giflib ) png? ( media-libs/libpng:0 )
 SLOT=0
 SRC_URI=http://mirrors.ctan.org/support/latex2html/latex2html-2017.2.tar.gz
-_md5_=a3e11b3e5069c94f4682e3b22065cb4f
+_md5_=d22460082ccdb9cc3d3c851bcdafc492
diff --git a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r10 b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r10
new file mode 100644
index 000000000000..97d4b8085373
--- /dev/null
+++ b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r10
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig java? ( >=virtual/jdk-1.5 )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+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
+IUSE=java elibc_FreeBSD java
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+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 https://dev.gentoo.org/~ulm/distfiles/tex4ht-texlive-2020-06-24.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	latex-package	e5f296c98696dd02059bc6a5a03282e2	multilib	2477ebe553d3e4d2c606191fe6c33602	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=eee0e55edc0c4a90a2a28b21ea33c96a
diff --git a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r9 b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r9
deleted file mode 100644
index 20128ec964f6..000000000000
--- a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r9
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig java? ( >=virtual/jdk-1.5 )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-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
-IUSE=java elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
-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 https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex4ht-2020.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	latex-package	e5f296c98696dd02059bc6a5a03282e2	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3cca318457f026e3d3c96d4b4fe48dc8
diff --git a/metadata/md5-cache/dev-tex/xmltex-1.9-r3 b/metadata/md5-cache/dev-tex/xmltex-1.9-r3
index 43bd4654c332..fd126c30b384 100644
--- a/metadata/md5-cache/dev-tex/xmltex-1.9-r3
+++ b/metadata/md5-cache/dev-tex/xmltex-1.9-r3
@@ -8,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	e5f296c98696dd02059bc6a5a03282e2	texlive-common	3438add11e8232d1fa32884e5e278bfe
+_eclasses_=latex-package	e5f296c98696dd02059bc6a5a03282e2	texlive-common	0eca2ea110130453e0124f83ce50c408
 _md5_=78f505f5a9a3400490cdc65ce3030b86
diff --git a/metadata/md5-cache/dev-texlive/Manifest.gz b/metadata/md5-cache/dev-texlive/Manifest.gz
index 5b9d64ca6017..619277e55296 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-2020-r1 b/metadata/md5-cache/dev-texlive/texlive-basic-2020-r1
index 4f2ad1c87b45..62747302634f 100644
--- a/metadata/md5-cache/dev-texlive/texlive-basic-2020-r1
+++ b/metadata/md5-cache/dev-texlive/texlive-basic-2020-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-2020[luajittex?] !~dev-texlive/texlive-fontsrecommended-2019 !~dev-texlive/texlive-plaingeneric-2019 !~dev-texlive/texlive-latexextra-2019 >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsfonts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsfonts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibtex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorprofiles-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorprofiles-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ec-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ec-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enctex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enctex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etex-pkg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etex-pkg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphics-def-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphics-def-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyph-utf8-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyph-utf8-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphenex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphenex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifplatform-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifplatform-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iftex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iftex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knuth-lib-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knuth-lib-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knuth-local-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knuth-local-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-alt-getopt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-alt-getopt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luahbtex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luahbtex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makeindex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makeindex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metafont-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metafont-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mflogo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mflogo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfware-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfware-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdftex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plain-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plain-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-ini-files-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-ini-files-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-common-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-common-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-docindex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-docindex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-en-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-en-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-msg-translations-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-msg-translations-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tlshell-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tlshell-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unicode-data-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unicode-data-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-updmap-map-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-updmap-map-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-basic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-basic-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsfonts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsfonts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibtex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorprofiles.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorprofiles.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ec.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ec.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enctex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enctex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etex-pkg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etex-pkg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphics-def.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphics-def.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyph-utf8.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyph-utf8.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifplatform.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifplatform.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iftex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iftex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-alt-getopt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-alt-getopt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luahbtex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luahbtex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makeindex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makeindex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metafont.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metafont.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mflogo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mflogo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfware.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfware.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdftex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-ini-files.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-ini-files.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-common.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-common.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-docindex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-docindex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-en.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-en.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tlshell.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tlshell.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unicode-data.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unicode-data.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsfonts.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsfonts.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyph-utf8.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyph-utf8.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphenex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphenex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifplatform.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifplatform.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mflogo.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mflogo.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=f0190478d320cc957f89bf66b4ebafc0
diff --git a/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2020 b/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2020
index a282e75d68bb..8ad20133772c 100644
--- a/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2020
@@ -10,5 +10,5 @@ LICENSE=Artistic-2 GPL-2 BSD-4
 RDEPEND=>=dev-texlive/texlive-latex-2020 >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aaai-named-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aaai-named-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aichej-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aichej-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ajl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ajl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsrefs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsrefs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-annotate-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-annotate-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apacite-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apacite-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apalike2-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apalike2-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-archaeologie-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-archaeologie-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-authordate-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-authordate-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beebe-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beebe-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-besjournals-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-besjournals-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bestpapers-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bestpapers-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bib2gls-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bib2gls-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibarts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibarts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biber-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biber-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibexport-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibexport-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibhtml-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibhtml-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-abnt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-abnt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-ajc2020unofficial-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-ajc2020unofficial-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-anonymous-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-anonymous-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-apa-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-apa-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-apa6-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-apa6-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-archaeology-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-archaeology-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-arthistory-bonn-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-arthistory-bonn-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-bath-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-bath-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-bookinarticle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-bookinarticle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-bookinother-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-bookinother-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-bwl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-bwl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-caspervector-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-caspervector-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-chem-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-chem-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-chicago-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-chicago-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-claves-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-claves-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-dw-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-dw-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-enc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-enc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-ext-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-ext-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-fiwi-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-fiwi-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-gb7714-2015-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-gb7714-2015-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-german-legal-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-german-legal-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-gost-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-gost-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-historian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-historian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-ieee-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-ieee-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-ijsra-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-ijsra-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-iso690-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-iso690-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-jura2-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-jura2-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-juradiss-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-juradiss-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-lni-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-lni-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-luh-ipw-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-luh-ipw-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-manuscripts-philology-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-manuscripts-philology-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-mla-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-mla-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-morenames-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-morenames-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-multiple-dm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-multiple-dm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-musuos-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-musuos-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-nature-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-nature-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-nejm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-nejm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-nottsclassic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-nottsclassic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-opcit-booktitle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-opcit-booktitle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-oxref-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-oxref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-philosophy-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-philosophy-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-phys-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-phys-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-publist-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-publist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-realauthor-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-realauthor-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-sbl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-sbl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-science-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-science-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-shortfields-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-shortfields-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-socialscienceshuberlin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-socialscienceshuberlin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-source-division-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-source-division-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-subseries-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-subseries-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-swiss-legal-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-swiss-legal-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-trad-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-trad-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-true-citepages-omit-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-true-citepages-omit-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex2bibitem-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex2bibitem-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblist-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtexperllibs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibtexperllibs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtopic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibtopic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtopicprefix-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibtopicprefix-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibunits-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibunits-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biolett-bst-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biolett-bst-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookdb-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookdb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-breakcites-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-breakcites-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cell-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cell-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chbibref-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chbibref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chicago-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chicago-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chicagoa-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chicagoa-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chicago-annote-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chicago-annote-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chembst-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chembst-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chscite-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chscite-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-citeall-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-citeall-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-citeref-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-citeref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collref-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-compactbib-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-compactbib-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossrefware-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossrefware-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-custom-bib-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-custom-bib-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-din1505-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-din1505-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dk-bib-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dk-bib-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doipubmed-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doipubmed-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecobiblatex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecobiblatex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-econ-bst-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-econ-bst-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-economic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-economic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fbs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fbs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-figbib-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-figbib-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footbib-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footbib-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-francais-bst-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-francais-bst-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gbt7714-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gbt7714-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-geschichtsfrkl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-geschichtsfrkl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harvard-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harvard-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harvmac-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harvmac-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-historische-zeitschrift-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-historische-zeitschrift-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-icite-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-icite-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ietfbibs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ietfbibs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ijqc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ijqc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inlinebib-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inlinebib-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iopart-num-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iopart-num-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-is-bst-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-is-bst-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jbact-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jbact-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jmb-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jmb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jneurosci-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jneurosci-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jurabib-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jurabib-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ksfh_nat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ksfh_nat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltb2bib-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltb2bib-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listbib-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listbib-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logreq-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logreq-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luabibentry-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luabibentry-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-margbib-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-margbib-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multibib-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multibib-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multibibliography-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multibibliography-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-munich-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-munich-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nmbib-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nmbib-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notes2bib-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notes2bib-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notex-bst-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notex-bst-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oscola-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oscola-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-perception-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-perception-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plainyr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plainyr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pnas2009-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pnas2009-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rsc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rsc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showtags-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showtags-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sort-by-letters-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sort-by-letters-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-splitbib-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-splitbib-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turabian-formatting-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turabian-formatting-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uni-wtal-ger-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uni-wtal-ger-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uni-wtal-lin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uni-wtal-lin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-urlbst-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-urlbst-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-usebib-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-usebib-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vak-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vak-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-windycity-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-windycity-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcite-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcite-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zootaxa-bst-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zootaxa-bst-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-bibtexextra-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-bibtexextra-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsrefs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsrefs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apacite.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apacite.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-archaeologie.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-archaeologie.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-authordate.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-authordate.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-besjournals.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-besjournals.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bestpapers.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bestpapers.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bib2gls.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bib2gls.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibarts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibarts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biber.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biber.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibexport.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibexport.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibhtml.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibhtml.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-abnt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-abnt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-ajc2020unofficial.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-ajc2020unofficial.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-anonymous.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-anonymous.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-apa.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-apa.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-apa6.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-apa6.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-archaeology.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-archaeology.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-arthistory-bonn.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-arthistory-bonn.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-bath.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-bath.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-bookinarticle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-bookinarticle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-bookinother.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-bookinother.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-bwl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-bwl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-caspervector.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-caspervector.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-chem.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-chem.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-chicago.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-chicago.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-claves.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-claves.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-dw.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-dw.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-enc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-enc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-ext.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-ext.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-fiwi.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-fiwi.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-gb7714-2015.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-gb7714-2015.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-german-legal.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-german-legal.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-gost.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-gost.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-historian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-historian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-ieee.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-ieee.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-ijsra.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-ijsra.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-iso690.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-iso690.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-jura2.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-jura2.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-juradiss.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-juradiss.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-lni.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-lni.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-luh-ipw.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-luh-ipw.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-manuscripts-philology.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-manuscripts-philology.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-mla.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-mla.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-morenames.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-morenames.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-multiple-dm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-multiple-dm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-musuos.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-musuos.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-nature.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-nature.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-nejm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-nejm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-nottsclassic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-nottsclassic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-opcit-booktitle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-opcit-booktitle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-oxref.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-oxref.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-philosophy.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-philosophy.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-phys.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-phys.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-publist.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-publist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-realauthor.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-realauthor.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-sbl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-sbl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-science.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-science.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-shortfields.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-shortfields.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-socialscienceshuberlin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-socialscienceshuberlin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-source-division.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-source-division.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-subseries.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-subseries.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-swiss-legal.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-swiss-legal.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-trad.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-trad.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-true-citepages-omit.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-true-citepages-omit.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex2bibitem.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex2bibitem.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblist.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtexperllibs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibtexperllibs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtopic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibtopic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtopicprefix.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibtopicprefix.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibunits.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibunits.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biolett-bst.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biolett-bst.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookdb.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookdb.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-breakcites.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-breakcites.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cell.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cell.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chbibref.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chbibref.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chicago-annote.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chicago-annote.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chembst.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chembst.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chscite.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chscite.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-citeall.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-citeall.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-citeref.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-citeref.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collref.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collref.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossrefware.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossrefware.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-custom-bib.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-custom-bib.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-din1505.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-din1505.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dk-bib.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dk-bib.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doipubmed.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doipubmed.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecobiblatex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecobiblatex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-econ-bst.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-econ-bst.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-economic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-economic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-figbib.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-figbib.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footbib.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footbib.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-francais-bst.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-francais-bst.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gbt7714.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gbt7714.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-geschichtsfrkl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-geschichtsfrkl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harvard.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harvard.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harvmac.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harvmac.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-historische-zeitschrift.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-historische-zeitschrift.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-icite.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-icite.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ietfbibs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ietfbibs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ijqc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ijqc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inlinebib.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inlinebib.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iopart-num.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iopart-num.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-is-bst.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-is-bst.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jneurosci.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jneurosci.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jurabib.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jurabib.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltb2bib.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltb2bib.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listbib.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listbib.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logreq.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logreq.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luabibentry.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luabibentry.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-margbib.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-margbib.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multibib.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multibib.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multibibliography.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multibibliography.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-munich.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-munich.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nmbib.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nmbib.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notes2bib.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notes2bib.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oscola.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oscola.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-perception.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-perception.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rsc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rsc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showtags.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showtags.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sort-by-letters.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sort-by-letters.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-splitbib.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-splitbib.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turabian-formatting.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turabian-formatting.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uni-wtal-ger.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uni-wtal-ger.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uni-wtal-lin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uni-wtal-lin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-urlbst.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-urlbst.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-usebib.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-usebib.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vak.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vak.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-windycity.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-windycity.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcite.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcite.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zootaxa-bst.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zootaxa-bst.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsrefs.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsrefs.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apacite.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apacite.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-archaeologie.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-archaeologie.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bib2gls.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bib2gls.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibarts.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibarts.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biber.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biber.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibexport.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibexport.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-archaeology.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-archaeology.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-bath.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-bath.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-nejm.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-nejm.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-oxref.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-oxref.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-philosophy.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-philosophy.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtexperllibs.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibtexperllibs.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtopic.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibtopic.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtopicprefix.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibtopicprefix.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibunits.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibunits.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chembst.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chembst.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chscite.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chscite.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collref.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collref.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-custom-bib.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-custom-bib.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dk-bib.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dk-bib.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doipubmed.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doipubmed.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footbib.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footbib.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gbt7714.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gbt7714.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-geschichtsfrkl.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-geschichtsfrkl.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harvard.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harvard.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-icite.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-icite.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jurabib.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jurabib.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltb2bib.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltb2bib.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listbib.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listbib.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luabibentry.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luabibentry.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-margbib.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-margbib.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multibib.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multibib.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multibibliography.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multibibliography.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nmbib.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nmbib.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notes2bib.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notes2bib.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rsc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rsc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-splitbib.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-splitbib.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-urlbst.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-urlbst.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-usebib.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-usebib.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcite.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcite.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=7e90c6b25fac0b195da4c653056667bf
diff --git a/metadata/md5-cache/dev-texlive/texlive-context-2020 b/metadata/md5-cache/dev-texlive/texlive-context-2020
index 698d4c648e92..400cfd4bd48e 100644
--- a/metadata/md5-cache/dev-texlive/texlive-context-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-context-2020
@@ -10,5 +10,5 @@ LICENSE=BSD BSD-2 GPL-1 GPL-2 GPL-3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2020 >=dev-texlive/texlive-latex-2010 >=app-text/texlive-core-2010[xetex] >=dev-texlive/texlive-metapost-2010 dev-lang/ruby >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jmn-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jmn-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-notes-zh-cn-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-notes-zh-cn-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-npp-for-context-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-npp-for-context-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-account-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-account-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-algorithmic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-algorithmic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-animation-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-animation-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-annotation-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-annotation-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-bnf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-bnf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-chromato-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-chromato-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-cmscbf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-cmscbf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-cmttbf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-cmttbf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-construction-plan-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-construction-plan-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-cyrillicnumbers-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-cyrillicnumbers-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-degrade-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-degrade-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-fancybreak-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-fancybreak-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-filter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-filter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-french-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-french-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-fullpage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-fullpage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-gantt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-gantt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-gnuplot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-gnuplot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-handlecsv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-handlecsv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-inifile-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-inifile-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-layout-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-layout-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-letter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-letter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-lettrine-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-lettrine-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-mathsets-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-mathsets-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-rst-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-rst-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-ruby-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-ruby-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-simplefonts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-simplefonts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-simpleslides-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-simpleslides-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-title-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-title-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-transliterator-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-transliterator-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-typearea-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-typearea-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-typescripts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-typescripts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-vim-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-vim-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-visualcounter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-visualcounter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-context-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-context-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-notes-zh-cn.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-notes-zh-cn.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-npp-for-context.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-npp-for-context.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-account.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-account.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-algorithmic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-algorithmic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-animation.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-animation.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-annotation.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-annotation.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-bnf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-bnf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-chromato.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-chromato.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-cmscbf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-cmscbf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-cmttbf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-cmttbf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-construction-plan.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-construction-plan.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-cyrillicnumbers.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-cyrillicnumbers.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-degrade.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-degrade.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-fancybreak.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-fancybreak.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-filter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-filter.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-french.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-french.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-fullpage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-fullpage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-gantt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-gantt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-gnuplot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-gnuplot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-handlecsv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-handlecsv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-inifile.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-inifile.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-layout.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-layout.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-letter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-letter.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-lettrine.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-lettrine.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-mathsets.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-mathsets.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-rst.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-rst.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-ruby.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-ruby.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-simplefonts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-simplefonts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-simpleslides.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-simpleslides.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-title.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-title.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-transliterator.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-transliterator.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-typearea.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-typearea.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-typescripts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-typescripts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-vim.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-vim.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-visualcounter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-visualcounter.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-visualcounter.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-visualcounter.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=8cb13df008e169e430abf79887541e66
diff --git a/metadata/md5-cache/dev-texlive/texlive-fontsextra-2020 b/metadata/md5-cache/dev-texlive/texlive-fontsextra-2020
index 14c4bfe3a1d3..23267143563e 100644
--- a/metadata/md5-cache/dev-texlive/texlive-fontsextra-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-fontsextra-2020
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 GPL-2 LPPL-1.3
 RDEPEND=>=dev-texlive/texlive-basic-2020 >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-Asana-Math-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-Asana-Math-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-academicons-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-academicons-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accanthis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accanthis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adforn-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adforn-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adfsymbols-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adfsymbols-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alegreya-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alegreya-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algolrevived-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algolrevived-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-allrunes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-allrunes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-almendra-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-almendra-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-almfixed-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-almfixed-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anonymouspro-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anonymouspro-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-antiqua-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-antiqua-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-antt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-antt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-archaic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-archaic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arev-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arev-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arimo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arimo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asapsym-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asapsym-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ascii-font-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ascii-font-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aspectratio-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aspectratio-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-astro-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-astro-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-augie-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-augie-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auncial-new-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auncial-new-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aurical-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aurical-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-b1encoding-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-b1encoding-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-barcodes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-barcodes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-baskervald-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-baskervald-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-baskervaldx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-baskervaldx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-baskervillef-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-baskervillef-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbding-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbding-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbm-macros-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbm-macros-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbold-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbold-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbold-type1-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbold-type1-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-belleek-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-belleek-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bera-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bera-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-berenisadf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-berenisadf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beuron-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beuron-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bguq-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bguq-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bitter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bitter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blacklettert1-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blacklettert1-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boisik-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boisik-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookhands-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookhands-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boondox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boondox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-braille-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-braille-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-brushscr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-brushscr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cabin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cabin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-caladea-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-caladea-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calligra-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calligra-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calligra-type1-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calligra-type1-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cantarell-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cantarell-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-carlito-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-carlito-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-carolmin-ps-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-carolmin-ps-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ccicons-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ccicons-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cfr-initials-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cfr-initials-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cfr-lm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cfr-lm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cherokee-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cherokee-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chivo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chivo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cinzel-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cinzel-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clara-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clara-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clearsans-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clearsans-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cm-lgc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cm-lgc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cm-mf-extra-bold-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cm-mf-extra-bold-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cm-unicode-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cm-unicode-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmbright-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmbright-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmexb-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmexb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmll-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmll-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmpica-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmpica-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmsrb-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmsrb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmtiup-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmtiup-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmupint-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmupint-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cochineal-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cochineal-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coelacanth-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coelacanth-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comfortaa-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comfortaa-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comicneue-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comicneue-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-concmath-fonts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-concmath-fonts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cookingsymbols-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cookingsymbols-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cormorantgaramond-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cormorantgaramond-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-countriesofeurope-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-countriesofeurope-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-courier-scaled-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-courier-scaled-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crimson-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crimson-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crimsonpro-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crimsonpro-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cryst-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cryst-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cuprum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cuprum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyklop-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyklop-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dancers-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dancers-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dantelogo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dantelogo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dejavu-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dejavu-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dejavu-otf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dejavu-otf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dice-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dice-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dictsym-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dictsym-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dingbat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dingbat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-domitian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-domitian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doublestroke-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doublestroke-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dozenal-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dozenal-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-droid-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-droid-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dsserif-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dsserif-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-duerer-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-duerer-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-duerer-latex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-duerer-latex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dutchcal-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dutchcal-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ean-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ean-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebgaramond-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebgaramond-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebgaramond-maths-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebgaramond-maths-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eco-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eco-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eiad-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eiad-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eiad-ltx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eiad-ltx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-electrum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-electrum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elvish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elvish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epigrafica-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epigrafica-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epsdice-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epsdice-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erewhon-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erewhon-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erewhon-math-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erewhon-math-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esrelation-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esrelation-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esstix-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esstix-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esvect-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esvect-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etbb-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etbb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eulervm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eulervm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euxm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euxm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fbb-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fbb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fdsymbol-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fdsymbol-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fetamont-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fetamont-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feyn-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feyn-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fge-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fge-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fira-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fira-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-firamath-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-firamath-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-firamath-otf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-firamath-otf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-foekfont-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-foekfont-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonetika-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonetika-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontawesome-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontawesome-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontawesome5-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontawesome5-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontmfizz-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontmfizz-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonts-churchslavonic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonts-churchslavonic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fourier-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fourier-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fouriernc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fouriernc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frcursive-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frcursive-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frederika2016-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frederika2016-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-garamond-libre-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-garamond-libre-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-garamond-math-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-garamond-math-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-genealogy-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-genealogy-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gentium-tug-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gentium-tug-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsartemisia-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsartemisia-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsbodoni-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsbodoni-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfscomplutum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfscomplutum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsdidot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsdidot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsdidotclassic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsdidotclassic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsneohellenic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsneohellenic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsneohellenicmath-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsneohellenicmath-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfssolomos-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfssolomos-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gillcm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gillcm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gillius-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gillius-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gnu-freefont-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gnu-freefont-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gofonts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gofonts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gothic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gothic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greenpoint-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greenpoint-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grotesq-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grotesq-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hacm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hacm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hands-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hands-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-heuristica-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-heuristica-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hfbright-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hfbright-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hfoldsty-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hfoldsty-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifsym-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifsym-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imfellenglish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imfellenglish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inconsolata-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inconsolata-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-initials-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-initials-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inriafonts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inriafonts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ipaex-type1-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ipaex-type1-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iwona-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iwona-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jablantile-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jablantile-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jamtimes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jamtimes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-junicode-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-junicode-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kixfont-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kixfont-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kpfonts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kpfonts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kurier-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kurier-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lato-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lato-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lexend-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lexend-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lfb-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lfb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertine-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertine-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinegc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinegc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinus-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinus-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinus-fonts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinus-fonts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinus-otf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinus-otf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinus-type1-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinus-type1-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinust1math-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinust1math-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-librebaskerville-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-librebaskerville-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-librebodoni-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-librebodoni-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-librecaslon-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-librecaslon-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-librefranklin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-librefranklin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libris-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libris-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linearA-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linearA-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linguisticspro-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linguisticspro-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lobster2-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lobster2-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logix-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logix-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lxfonts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lxfonts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ly1-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ly1-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marcellus-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marcellus-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathabx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathabx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathabx-type1-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathabx-type1-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathdesign-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathdesign-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdputu-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdputu-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdsymbol-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdsymbol-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-merriweather-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-merriweather-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-miama-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-miama-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mintspirit-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mintspirit-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-missaali-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-missaali-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mnsymbol-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mnsymbol-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-montserrat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-montserrat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpfonts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpfonts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mweights-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mweights-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newcomputermodern-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newcomputermodern-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newpx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newpx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newtx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newtx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newtxsf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newtxsf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newtxtt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newtxtt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-niceframe-type1-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-niceframe-type1-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nimbus15-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nimbus15-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nkarta-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nkarta-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noto-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noto-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noto-emoji-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noto-emoji-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-obnov-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-obnov-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocherokee-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocherokee-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocr-b-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocr-b-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocr-b-outline-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocr-b-outline-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ogham-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ogham-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oinuit-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oinuit-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-old-arrows-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-old-arrows-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oldlatin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oldlatin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oldstandard-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oldstandard-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-opensans-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-opensans-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-orkhun-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-orkhun-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-overlock-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-overlock-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pacioli-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pacioli-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paratype-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paratype-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phaistos-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phaistos-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phonetic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phonetic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pigpen-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pigpen-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-playfair-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-playfair-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plex-otf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plex-otf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poiretone-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poiretone-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poltawski-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poltawski-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prodint-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prodint-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-punk-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-punk-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-punk-latex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-punk-latex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-punknova-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-punknova-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxtxalfa-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxtxalfa-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qualitype-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qualitype-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quattrocento-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quattrocento-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-raleway-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-raleway-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recycle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recycle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-roboto-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-roboto-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romande-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romande-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rosario-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rosario-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rsfso-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rsfso-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sansmathaccent-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sansmathaccent-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sansmathfonts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sansmathfonts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sauter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sauter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sauterfonts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sauterfonts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scholax-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scholax-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schulschriften-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schulschriften-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semaphor-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semaphor-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shobhika-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shobhika-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skull-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skull-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sourcecodepro-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sourcecodepro-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sourcesanspro-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sourcesanspro-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sourceserifpro-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sourceserifpro-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-starfont-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-starfont-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-staves-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-staves-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-step-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-step-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stickstoo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stickstoo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stix-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stix-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stix2-otf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stix2-otf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stix2-type1-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stix2-type1-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-superiors-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-superiors-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svrsymbols-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svrsymbols-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tapir-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tapir-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tempora-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tempora-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tengwarscript-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tengwarscript-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tfrupee-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tfrupee-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-theanodidot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-theanodidot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-theanomodern-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-theanomodern-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-theanooldstyle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-theanooldstyle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tinos-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tinos-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tpslifonts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tpslifonts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trajan-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trajan-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-twemoji-colr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-twemoji-colr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-txfontsb-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-txfontsb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-txuprcal-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-txuprcal-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typicons-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typicons-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umtypewriter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umtypewriter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-universa-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-universa-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-universalis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-universalis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uppunctlm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uppunctlm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-urwchancal-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-urwchancal-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-venturisadf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-venturisadf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wsuipa-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wsuipa-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcharter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcharter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xits-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xits-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yfonts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yfonts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yfonts-t1-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yfonts-t1-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yinit-otf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yinit-otf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zlmtt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zlmtt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-fontsextra-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-fontsextra-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-Asana-Math.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-Asana-Math.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-academicons.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-academicons.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accanthis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accanthis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adforn.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adforn.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adfsymbols.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adfsymbols.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alegreya.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alegreya.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algolrevived.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algolrevived.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-allrunes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-allrunes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-almendra.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-almendra.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-almfixed.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-almfixed.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anonymouspro.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anonymouspro.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-antiqua.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-antiqua.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-antt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-antt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-archaic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-archaic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arev.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arev.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arimo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arimo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asapsym.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asapsym.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ascii-font.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ascii-font.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aspectratio.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aspectratio.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-astro.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-astro.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-augie.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-augie.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auncial-new.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auncial-new.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aurical.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aurical.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-b1encoding.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-b1encoding.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-barcodes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-barcodes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-baskervald.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-baskervald.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-baskervaldx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-baskervaldx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-baskervillef.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-baskervillef.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbding.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbding.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbm-macros.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbm-macros.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbold.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbold.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbold-type1.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbold-type1.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-belleek.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-belleek.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bera.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bera.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-berenisadf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-berenisadf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beuron.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beuron.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bguq.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bguq.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bitter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bitter.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blacklettert1.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blacklettert1.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boisik.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boisik.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookhands.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookhands.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boondox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boondox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-braille.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-braille.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-brushscr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-brushscr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cabin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cabin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-caladea.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-caladea.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calligra.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calligra.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calligra-type1.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calligra-type1.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cantarell.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cantarell.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-carlito.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-carlito.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-carolmin-ps.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-carolmin-ps.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ccicons.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ccicons.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cfr-initials.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cfr-initials.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cfr-lm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cfr-lm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cherokee.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cherokee.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chivo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chivo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cinzel.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cinzel.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clara.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clara.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clearsans.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clearsans.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cm-lgc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cm-lgc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cm-unicode.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cm-unicode.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmbright.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmbright.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmexb.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmexb.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmll.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmll.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmpica.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmpica.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmsrb.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmsrb.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmtiup.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmtiup.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmupint.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmupint.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cochineal.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cochineal.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coelacanth.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coelacanth.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comfortaa.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comfortaa.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comicneue.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comicneue.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-concmath-fonts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-concmath-fonts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cookingsymbols.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cookingsymbols.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cormorantgaramond.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cormorantgaramond.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-countriesofeurope.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-countriesofeurope.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-courier-scaled.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-courier-scaled.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crimson.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crimson.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crimsonpro.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crimsonpro.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cryst.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cryst.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cuprum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cuprum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyklop.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyklop.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dantelogo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dantelogo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dejavu.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dejavu.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dejavu-otf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dejavu-otf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dice.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dice.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dictsym.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dictsym.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dingbat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dingbat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-domitian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-domitian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doublestroke.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doublestroke.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dozenal.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dozenal.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-droid.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-droid.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dsserif.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dsserif.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-duerer.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-duerer.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-duerer-latex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-duerer-latex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dutchcal.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dutchcal.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ean.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ean.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebgaramond.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebgaramond.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebgaramond-maths.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebgaramond-maths.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eco.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eco.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eiad.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eiad.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eiad-ltx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eiad-ltx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-electrum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-electrum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elvish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elvish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epigrafica.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epigrafica.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epsdice.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epsdice.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erewhon.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erewhon.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erewhon-math.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erewhon-math.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esrelation.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esrelation.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esstix.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esstix.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esvect.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esvect.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etbb.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etbb.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eulervm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eulervm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fbb.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fbb.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fdsymbol.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fdsymbol.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fetamont.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fetamont.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feyn.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feyn.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fge.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fge.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fira.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fira.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-firamath.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-firamath.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-firamath-otf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-firamath-otf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-foekfont.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-foekfont.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonetika.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonetika.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontawesome.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontawesome.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontawesome5.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontawesome5.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontmfizz.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontmfizz.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonts-churchslavonic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonts-churchslavonic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fourier.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fourier.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fouriernc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fouriernc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frcursive.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frcursive.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frederika2016.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frederika2016.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-garamond-libre.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-garamond-libre.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-garamond-math.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-garamond-math.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-genealogy.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-genealogy.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gentium-tug.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gentium-tug.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsartemisia.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsartemisia.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsbodoni.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsbodoni.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfscomplutum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfscomplutum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsdidot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsdidot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsdidotclassic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsdidotclassic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsneohellenic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsneohellenic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsneohellenicmath.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsneohellenicmath.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfssolomos.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfssolomos.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gillcm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gillcm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gillius.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gillius.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gnu-freefont.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gnu-freefont.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gofonts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gofonts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gothic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gothic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greenpoint.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greenpoint.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grotesq.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grotesq.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hacm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hacm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-heuristica.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-heuristica.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hfbright.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hfbright.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hfoldsty.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hfoldsty.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifsym.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifsym.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imfellenglish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imfellenglish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inconsolata.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inconsolata.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-initials.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-initials.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inriafonts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inriafonts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ipaex-type1.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ipaex-type1.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iwona.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iwona.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jablantile.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jablantile.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jamtimes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jamtimes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-junicode.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-junicode.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kixfont.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kixfont.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kpfonts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kpfonts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kurier.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kurier.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lato.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lato.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lexend.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lexend.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lfb.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lfb.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertine.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertine.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinegc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinegc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinus.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinus.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinus-fonts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinus-fonts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinus-otf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinus-otf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinus-type1.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinus-type1.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinust1math.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinust1math.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-librebaskerville.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-librebaskerville.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-librebodoni.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-librebodoni.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-librecaslon.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-librecaslon.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-librefranklin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-librefranklin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libris.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libris.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linearA.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linearA.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linguisticspro.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linguisticspro.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lobster2.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lobster2.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logix.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logix.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lxfonts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lxfonts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ly1.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ly1.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marcellus.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marcellus.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathabx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathabx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathabx-type1.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathabx-type1.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathdesign.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathdesign.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdputu.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdputu.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdsymbol.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdsymbol.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-merriweather.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-merriweather.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-miama.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-miama.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mintspirit.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mintspirit.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-missaali.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-missaali.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mnsymbol.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mnsymbol.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-montserrat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-montserrat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpfonts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpfonts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mweights.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mweights.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newcomputermodern.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newcomputermodern.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newpx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newpx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newtx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newtx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newtxsf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newtxsf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newtxtt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newtxtt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-niceframe-type1.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-niceframe-type1.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nimbus15.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nimbus15.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nkarta.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nkarta.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noto.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noto.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noto-emoji.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noto-emoji.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-obnov.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-obnov.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocherokee.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocherokee.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocr-b.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocr-b.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocr-b-outline.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocr-b-outline.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ogham.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ogham.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oinuit.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oinuit.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-old-arrows.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-old-arrows.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oldlatin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oldlatin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oldstandard.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oldstandard.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-opensans.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-opensans.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-orkhun.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-orkhun.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-overlock.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-overlock.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pacioli.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pacioli.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paratype.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paratype.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phaistos.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phaistos.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phonetic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phonetic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pigpen.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pigpen.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-playfair.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-playfair.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plex-otf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plex-otf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poiretone.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poiretone.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poltawski.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poltawski.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prodint.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prodint.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-punk.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-punk.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-punk-latex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-punk-latex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-punknova.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-punknova.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxtxalfa.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxtxalfa.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qualitype.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qualitype.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quattrocento.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quattrocento.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-raleway.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-raleway.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recycle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recycle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-roboto.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-roboto.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romande.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romande.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rosario.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rosario.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rsfso.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rsfso.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sansmathaccent.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sansmathaccent.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sansmathfonts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sansmathfonts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sauterfonts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sauterfonts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scholax.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scholax.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schulschriften.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schulschriften.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semaphor.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semaphor.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shobhika.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shobhika.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sourcecodepro.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sourcecodepro.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sourcesanspro.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sourcesanspro.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sourceserifpro.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sourceserifpro.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-starfont.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-starfont.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-staves.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-staves.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-step.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-step.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stickstoo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stickstoo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stix.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stix.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stix2-otf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stix2-otf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stix2-type1.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stix2-type1.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-superiors.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-superiors.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svrsymbols.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svrsymbols.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tapir.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tapir.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tempora.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tempora.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tengwarscript.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tengwarscript.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tfrupee.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tfrupee.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-theanodidot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-theanodidot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-theanomodern.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-theanomodern.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-theanooldstyle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-theanooldstyle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tinos.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tinos.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tpslifonts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tpslifonts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trajan.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trajan.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-twemoji-colr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-twemoji-colr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-txfontsb.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-txfontsb.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-txuprcal.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-txuprcal.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typicons.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typicons.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-universa.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-universa.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-universalis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-universalis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uppunctlm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uppunctlm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-urwchancal.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-urwchancal.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-venturisadf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-venturisadf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wsuipa.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wsuipa.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcharter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcharter.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xits.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xits.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yfonts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yfonts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yfonts-t1.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yfonts-t1.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yinit-otf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yinit-otf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zlmtt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zlmtt.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-allrunes.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-allrunes.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anonymouspro.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anonymouspro.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-archaic.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-archaic.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arev.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arev.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asapsym.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asapsym.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ascii-font.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ascii-font.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auncial-new.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auncial-new.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-b1encoding.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-b1encoding.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-barcodes.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-barcodes.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-baskervald.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-baskervald.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbding.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbding.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbm-macros.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbm-macros.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbold.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbold.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-belleek.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-belleek.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bguq.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bguq.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blacklettert1.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blacklettert1.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookhands.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookhands.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ccicons.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ccicons.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cfr-lm.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cfr-lm.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chivo.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chivo.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmbright.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmbright.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmll.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmll.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cookingsymbols.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cookingsymbols.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dingbat.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dingbat.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dozenal.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dozenal.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drm.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drm.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dsserif.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dsserif.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eco.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eco.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eiad-ltx.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eiad-ltx.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-electrum.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-electrum.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epsdice.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epsdice.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esrelation.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esrelation.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esvect.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esvect.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eulervm.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eulervm.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fdsymbol.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fdsymbol.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fetamont.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fetamont.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feyn.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feyn.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fge.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fge.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gentium-tug.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gentium-tug.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gnu-freefont.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gnu-freefont.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gothic.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gothic.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hfoldsty.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hfoldsty.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kpfonts.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kpfonts.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libris.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libris.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linearA.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linearA.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lxfonts.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lxfonts.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdsymbol.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdsymbol.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-miama.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-miama.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mnsymbol.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mnsymbol.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nkarta.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nkarta.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocr-b-outline.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocr-b-outline.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oinuit.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oinuit.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pacioli.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pacioli.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phaistos.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phaistos.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romande.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romande.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rosario.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rosario.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sauterfonts.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sauterfonts.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skull.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skull.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-staves.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-staves.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stix.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stix.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stix2-type1.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stix2-type1.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svrsymbols.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svrsymbols.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tengwarscript.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tengwarscript.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tfrupee.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tfrupee.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tpslifonts.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tpslifonts.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trajan.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trajan.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-txfontsb.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-txfontsb.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-universa.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-universa.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-venturisadf.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-venturisadf.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yfonts.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yfonts.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=a28c1271a6c9b534bfd24e414c5e0b67
diff --git a/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2020 b/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2020
index 2281e06f9c17..a0cbff61cc5f 100644
--- a/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2020
@@ -10,5 +10,5 @@ LICENSE=BSD GPL-1 GPL-2 LPPL-1.3
 RDEPEND=>=dev-texlive/texlive-basic-2020 >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-avantgar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-avantgar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookman-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookman-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-charter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-charter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cm-super-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cm-super-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmextra-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmextra-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-courier-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-courier-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euro-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euro-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euro-ce-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euro-ce-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eurosym-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eurosym-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fpl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fpl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-helvetic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-helvetic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lm-math-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lm-math-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marvosym-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marvosym-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathpazo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathpazo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-manfnt-font-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-manfnt-font-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mflogo-font-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mflogo-font-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ncntrsbk-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ncntrsbk-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-palatino-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-palatino-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxfonts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxfonts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rsfs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rsfs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-symbol-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-symbol-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-gyre-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-gyre-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-gyre-math-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-gyre-math-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-times-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-times-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tipa-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tipa-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-txfonts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-txfonts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-utopia-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-utopia-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wasy-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wasy-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wasy-type1-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wasy-type1-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wasysym-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wasysym-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zapfchan-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zapfchan-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zapfding-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zapfding-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-fontsrecommended-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-fontsrecommended-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-charter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-charter.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cm-super.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cm-super.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euro.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euro.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euro-ce.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euro-ce.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eurosym.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eurosym.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fpl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fpl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lm-math.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lm-math.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marvosym.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marvosym.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathpazo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathpazo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mflogo-font.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mflogo-font.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxfonts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxfonts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rsfs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rsfs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-gyre.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-gyre.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-gyre-math.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-gyre-math.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tipa.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tipa.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-txfonts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-txfonts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-utopia.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-utopia.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wasy.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wasy.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wasy-type1.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wasy-type1.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wasysym.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wasysym.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euro.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euro.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fpl.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fpl.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lm.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lm.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marvosym.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marvosym.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathpazo.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathpazo.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-gyre.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-gyre.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-gyre-math.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-gyre-math.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wasysym.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wasysym.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=8676db206a2d16b513dd295535f6c185
diff --git a/metadata/md5-cache/dev-texlive/texlive-fontutils-2020 b/metadata/md5-cache/dev-texlive/texlive-fontutils-2020
index bfc36defa145..87fe74f04c65 100644
--- a/metadata/md5-cache/dev-texlive/texlive-fontutils-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-fontutils-2020
@@ -10,5 +10,5 @@ LICENSE=Artistic GPL-1 GPL-2 LPPL-1.3 public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2020 >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accfonts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accfonts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-afm2pl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-afm2pl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dosepsbin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dosepsbin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epstopdf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epstopdf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontware-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontware-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcdftypetools-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcdftypetools-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metatype1-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metatype1-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ps2pk-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ps2pk-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ps2eps-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ps2eps-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psutils-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psutils-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvipsconfig-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dvipsconfig-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontinst-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontinst-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontools-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontools-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mf2pt1-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mf2pt1-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-t1utils-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-t1utils-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-fontutils-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-fontutils-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accfonts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accfonts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-afm2pl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-afm2pl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dosepsbin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dosepsbin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epstopdf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epstopdf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontware.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontware.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcdftypetools.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcdftypetools.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ps2pk.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ps2pk.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ps2eps.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ps2eps.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psutils.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psutils.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontinst.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontinst.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontools.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontools.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mf2pt1.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mf2pt1.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-t1utils.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-t1utils.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dosepsbin.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dosepsbin.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metatype1.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metatype1.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontinst.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontinst.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=64b531ee24f919c8e83b5a6ee506d1f3
diff --git a/metadata/md5-cache/dev-texlive/texlive-formatsextra-2020 b/metadata/md5-cache/dev-texlive/texlive-formatsextra-2020
index f918a6c4dac6..3777ade1de5a 100644
--- a/metadata/md5-cache/dev-texlive/texlive-formatsextra-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-formatsextra-2020
@@ -10,5 +10,5 @@ LICENSE=GPL-1 GPL-2 GPL-3 LPPL-1.3 public-domain TeX
 RDEPEND=>=dev-texlive/texlive-basic-2020 >=dev-texlive/texlive-latex-2020 dev-texlive/texlive-xetex >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-edmac-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-edmac-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eplain-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eplain-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lollipop-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lollipop-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mltex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mltex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psizzl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psizzl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-startex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-startex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texsis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texsis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xmltexconfig-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xmltexconfig-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aleph-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aleph-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-antomega-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-antomega-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lambda-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lambda-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mxedruli-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mxedruli-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-omega-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-omega-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-omegaware-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-omegaware-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-otibet-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-otibet-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-formatsextra-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-formatsextra-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-edmac.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-edmac.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eplain.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eplain.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lollipop.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lollipop.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mltex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mltex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psizzl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psizzl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-startex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-startex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texsis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texsis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aleph.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aleph.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-antomega.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-antomega.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mxedruli.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mxedruli.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-omega.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-omega.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-omegaware.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-omegaware.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-otibet.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-otibet.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-edmac.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-edmac.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eplain.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eplain.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psizzl.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psizzl.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-startex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-startex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-antomega.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-antomega.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-otibet.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-otibet.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=20261c4797bdb2b85c6afd7910fc7122
diff --git a/metadata/md5-cache/dev-texlive/texlive-games-2020 b/metadata/md5-cache/dev-texlive/texlive-games-2020
index f871f0ac84aa..c36d546fbd47 100644
--- a/metadata/md5-cache/dev-texlive/texlive-games-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-games-2020
@@ -10,5 +10,5 @@ LICENSE=GPL-2 CC-BY-SA-4.0
 RDEPEND=>=dev-texlive/texlive-latex-2020 >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bartel-chess-fonts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bartel-chess-fonts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chess-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chess-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chess-problem-diagrams-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chess-problem-diagrams-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chessboard-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chessboard-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chessfss-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chessfss-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossword-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossword-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crosswrd-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crosswrd-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-egameps-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-egameps-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gamebook-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gamebook-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-go-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-go-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hanoi-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hanoi-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-havannah-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-havannah-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hexgame-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hexgame-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hmtrump-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hmtrump-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-horoscop-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-horoscop-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jigsaw-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jigsaw-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labyrinth-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labyrinth-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logicpuzzle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logicpuzzle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musikui-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musikui-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-onedown-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-onedown-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-othello-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-othello-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-othelloboard-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-othelloboard-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pas-crosswords-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pas-crosswords-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psgo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psgo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reverxii-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reverxii-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rubik-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rubik-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schwalbe-chess-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schwalbe-chess-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sgame-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sgame-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skak-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skak-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skaknew-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skaknew-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soup-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soup-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sudoku-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sudoku-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sudokubundle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sudokubundle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xq-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xq-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xskak-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xskak-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-games-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-games-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bartel-chess-fonts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bartel-chess-fonts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chess.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chess.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chess-problem-diagrams.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chess-problem-diagrams.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chessboard.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chessboard.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chessfss.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chessfss.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossword.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossword.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crosswrd.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crosswrd.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-egameps.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-egameps.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gamebook.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gamebook.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-go.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-go.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-havannah.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-havannah.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hexgame.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hexgame.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hmtrump.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hmtrump.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-horoscop.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-horoscop.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jigsaw.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jigsaw.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labyrinth.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labyrinth.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logicpuzzle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logicpuzzle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musikui.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musikui.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-onedown.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-onedown.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-othello.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-othello.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-othelloboard.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-othelloboard.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pas-crosswords.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pas-crosswords.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psgo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psgo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reverxii.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reverxii.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rubik.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rubik.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schwalbe-chess.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schwalbe-chess.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sgame.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sgame.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skak.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skak.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skaknew.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skaknew.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soup.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soup.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sudoku.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sudoku.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sudokubundle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sudokubundle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xq.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xq.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xskak.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xskak.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chess-problem-diagrams.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chess-problem-diagrams.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chessboard.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chessboard.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chessfss.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chessfss.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossword.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossword.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crosswrd.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crosswrd.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gamebook.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gamebook.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-go.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-go.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-havannah.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-havannah.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-horoscop.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-horoscop.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-onedown.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-onedown.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rubik.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rubik.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schwalbe-chess.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schwalbe-chess.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soup.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soup.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sudoku.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sudoku.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sudokubundle.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sudokubundle.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xskak.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xskak.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=97b9e277df53cd03bb14db8a98a2ce0d
diff --git a/metadata/md5-cache/dev-texlive/texlive-humanities-2020 b/metadata/md5-cache/dev-texlive/texlive-humanities-2020
index 61aea96e3369..5692bc19ca93 100644
--- a/metadata/md5-cache/dev-texlive/texlive-humanities-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-humanities-2020
@@ -10,5 +10,5 @@ LICENSE=GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c
 RDEPEND=>=dev-texlive/texlive-latex-2020 >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adtrees-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adtrees-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-lds-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-lds-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-mouth-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-mouth-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-parse-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-parse-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-covington-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-covington-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diadia-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diadia-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dramatist-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dramatist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvgloss-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dvgloss-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecltree-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecltree-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-edfnotes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-edfnotes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ednotes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ednotes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eledform-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eledform-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eledmac-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eledmac-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gb4e-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gb4e-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmverse-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmverse-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jura-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jura-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-juraabbrev-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-juraabbrev-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-juramisc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-juramisc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jurarsp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jurarsp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ledmac-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ledmac-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lexikon-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lexikon-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lexref-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lexref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ling-macros-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ling-macros-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linguex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linguex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-liturg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-liturg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metrix-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metrix-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parallel-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parallel-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parrun-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parrun-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phonrule-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phonrule-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plari-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plari-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-play-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-play-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poemscol-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poemscol-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poetry-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poetry-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poetrytex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poetrytex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qobitree-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qobitree-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qtree-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qtree-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reledmac-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reledmac-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rrgtrees-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rrgtrees-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rtklage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rtklage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-screenplay-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-screenplay-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-screenplay-pkg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-screenplay-pkg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sides-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sides-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textglos-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textglos-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-theatre-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-theatre-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thalie-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thalie-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tree-dvips-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tree-dvips-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verse-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verse-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xyling-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xyling-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-humanities-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-humanities-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adtrees.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adtrees.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-lds.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-lds.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-mouth.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-mouth.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-parse.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-parse.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-covington.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-covington.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diadia.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diadia.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dramatist.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dramatist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvgloss.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dvgloss.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecltree.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecltree.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-edfnotes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-edfnotes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ednotes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ednotes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eledform.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eledform.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eledmac.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eledmac.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gb4e.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gb4e.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmverse.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmverse.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jura.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jura.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-juraabbrev.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-juraabbrev.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-juramisc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-juramisc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jurarsp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jurarsp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ledmac.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ledmac.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lexikon.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lexikon.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lexref.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lexref.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ling-macros.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ling-macros.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linguex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linguex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-liturg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-liturg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metrix.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metrix.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parallel.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parallel.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parrun.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parrun.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phonrule.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phonrule.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plari.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plari.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-play.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-play.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poemscol.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poemscol.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poetry.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poetry.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poetrytex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poetrytex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qobitree.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qobitree.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qtree.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qtree.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reledmac.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reledmac.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rrgtrees.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rrgtrees.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rtklage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rtklage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-screenplay.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-screenplay.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-screenplay-pkg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-screenplay-pkg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sides.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sides.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textglos.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textglos.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-theatre.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-theatre.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thalie.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thalie.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tree-dvips.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tree-dvips.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verse.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verse.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xyling.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xyling.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-lds.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-lds.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-mouth.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-mouth.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dramatist.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dramatist.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvgloss.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dvgloss.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-edfnotes.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-edfnotes.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eledform.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eledform.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eledmac.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eledmac.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jura.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jura.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-juraabbrev.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-juraabbrev.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jurarsp.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jurarsp.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ledmac.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ledmac.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-liturg.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-liturg.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metrix.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metrix.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parallel.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parallel.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parrun.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parrun.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plari.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plari.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-play.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-play.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poemscol.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poemscol.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poetry.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poetry.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poetrytex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poetrytex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reledmac.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reledmac.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rrgtrees.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rrgtrees.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-screenplay.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-screenplay.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stage.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stage.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textglos.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textglos.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thalie.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thalie.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verse.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verse.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=98ecea25324345a7bc848cce60e93402
diff --git a/metadata/md5-cache/dev-texlive/texlive-langarabic-2020 b/metadata/md5-cache/dev-texlive/texlive-langarabic-2020
index a1a223fcb465..f1c553c1b603 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langarabic-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-langarabic-2020
@@ -10,5 +10,5 @@ LICENSE=CC-BY-SA-4.0 GPL-2 GPL-3+ LPPL-1.3 LPPL-1.3c MIT
 RDEPEND=>=dev-texlive/texlive-basic-2020 >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alkalami-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alkalami-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alpha-persian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alpha-persian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amiri-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amiri-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabi-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabi-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabi-add-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabi-add-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabluatex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabluatex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabtex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabtex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidi-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidi-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidihl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidihl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dad-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dad-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ghab-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ghab-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-arabic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-arabic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-farsi-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-farsi-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imsproc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imsproc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kurdishlipsum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kurdishlipsum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-persian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-persian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luabidi-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luabidi-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-na-box-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-na-box-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-persian-bib-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-persian-bib-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sexam-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sexam-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simurgh-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simurgh-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tram-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tram-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xepersian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xepersian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xepersian-hm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xepersian-hm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langarabic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langarabic-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alkalami.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alkalami.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alpha-persian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alpha-persian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amiri.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amiri.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabi.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabi.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabi-add.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabi-add.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabluatex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabluatex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabtex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabtex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidi.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidi.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidihl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidihl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dad.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dad.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ghab.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ghab.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imsproc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imsproc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kurdishlipsum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kurdishlipsum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-persian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-persian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luabidi.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luabidi.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-na-box.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-na-box.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-persian-bib.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-persian-bib.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sexam.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sexam.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simurgh.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simurgh.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tram.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tram.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xepersian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xepersian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xepersian-hm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xepersian-hm.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabluatex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabluatex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidi.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidi.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xepersian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xepersian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xepersian-hm.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xepersian-hm.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=03bc820664339bed6f3169f17a36e2d5
diff --git a/metadata/md5-cache/dev-texlive/texlive-langchinese-2020 b/metadata/md5-cache/dev-texlive/texlive-langchinese-2020
index b6a9890d5c1a..b7440c14db15 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langchinese-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-langchinese-2020
@@ -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-2020 >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arphic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arphic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arphic-ttf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arphic-ttf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asymptote-by-example-zh-cn-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asymptote-by-example-zh-cn-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asymptote-faq-zh-cn-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asymptote-faq-zh-cn-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asymptote-manual-zh-cn-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asymptote-manual-zh-cn-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cns-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cns-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctex-faq-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctex-faq-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fandol-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fandol-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fduthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fduthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-chinese-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-chinese-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-impatient-cn-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-impatient-cn-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-notes-zh-cn-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-notes-zh-cn-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-chinese-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-chinese-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nanicolle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nanicolle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-njurepo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-njurepo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfornament-han-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfornament-han-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-zh-cn-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-zh-cn-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texproposal-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texproposal-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xtuthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xtuthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-upzhkinsoku-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-upzhkinsoku-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpinyin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpinyin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhlineskip-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhlineskip-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhlipsum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhlipsum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhmetrics-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhmetrics-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhmetrics-uptex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhmetrics-uptex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhnumber-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhnumber-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhspacing-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhspacing-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langchinese-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langchinese-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arphic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arphic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arphic-ttf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arphic-ttf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asymptote-by-example-zh-cn.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asymptote-by-example-zh-cn.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asymptote-faq-zh-cn.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asymptote-faq-zh-cn.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asymptote-manual-zh-cn.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asymptote-manual-zh-cn.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cns.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cns.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctex-faq.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctex-faq.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fandol.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fandol.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fduthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fduthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-impatient-cn.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-impatient-cn.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-notes-zh-cn.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-notes-zh-cn.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-chinese.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-chinese.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nanicolle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nanicolle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-njurepo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-njurepo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfornament-han.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfornament-han.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-zh-cn.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-zh-cn.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texproposal.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texproposal.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xtuthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xtuthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-upzhkinsoku.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-upzhkinsoku.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpinyin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpinyin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhlineskip.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhlineskip.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhlipsum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhlipsum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhmetrics.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhmetrics.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhmetrics-uptex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhmetrics-uptex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhnumber.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhnumber.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhspacing.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhspacing.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fduthesis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fduthesis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-njurepo.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-njurepo.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpinyin.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpinyin.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhlipsum.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhlipsum.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhmetrics.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhmetrics.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhnumber.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhnumber.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=00698d1063174c876b951bcd1cf98a48
diff --git a/metadata/md5-cache/dev-texlive/texlive-langcjk-2020 b/metadata/md5-cache/dev-texlive/texlive-langcjk-2020
index aa2bcbc702c6..5fe83dce0eaf 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langcjk-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-langcjk-2020
@@ -10,5 +10,5 @@ LICENSE=BSD GPL-2 GPL-3 LPPL-1.3 LPPL-1.3c MIT TeX
 RDEPEND=>=dev-texlive/texlive-basic-2020 >=app-text/texlive-core-2010[cjk] >=dev-texlive/texlive-latex-2011 >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adobemapping-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adobemapping-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-c90-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-c90-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjk-gs-integrate-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjk-gs-integrate-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjkpunct-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjkpunct-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dnp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dnp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-garuda-c90-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-garuda-c90-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixjfm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixjfm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jfmutil-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jfmutil-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-norasi-c90-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-norasi-c90-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxtatescale-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxtatescale-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcjk2uni-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcjk2uni-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zxjafont-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zxjafont-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langcjk-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langcjk-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-c90.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-c90.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjk-gs-integrate.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjk-gs-integrate.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjkpunct.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjkpunct.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixjfm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixjfm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jfmutil.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jfmutil.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxtatescale.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxtatescale.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcjk2uni.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcjk2uni.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zxjafont.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zxjafont.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-c90.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-c90.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjk-gs-integrate.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjk-gs-integrate.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjkpunct.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjkpunct.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-garuda-c90.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-garuda-c90.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-norasi-c90.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-norasi-c90.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcjk2uni.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcjk2uni.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=39d087ae8be6e6adf086aca69ee89abe
diff --git a/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2020 b/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2020
index 4c1b792b05a1..a745c24cd102 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2020
@@ -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-2020 >=dev-texlive/texlive-latex-2020 >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-belarusian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-belarusian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-bulgarian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-bulgarian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-russian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-russian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-serbian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-serbian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-serbianc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-serbianc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-ukrainian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-ukrainian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-churchslavonic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-churchslavonic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmcyr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmcyr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyrillic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyrillic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyrillic-bin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyrillic-bin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyrplain-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyrplain-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-disser-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-disser-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eskd-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eskd-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eskdx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eskdx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gost-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gost-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-belarusian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-belarusian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-bulgarian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-bulgarian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-churchslavonic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-churchslavonic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-mongolian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-mongolian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-russian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-russian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-serbian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-serbian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-ukrainian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-ukrainian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcyw-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcyw-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lh-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lh-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lhcyr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lhcyr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-bulgarian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-bulgarian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-mongol-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-mongol-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-russian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-russian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-ukr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-ukr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mongolian-babel-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mongolian-babel-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-montex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-montex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpman-ru-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpman-ru-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numnameru-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numnameru-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-eucl-translation-bg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-eucl-translation-bg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ruhyphen-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ruhyphen-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-russ-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-russ-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-serbian-apostrophe-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-serbian-apostrophe-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-serbian-date-lat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-serbian-date-lat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-serbian-def-cyr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-serbian-def-cyr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-serbian-lig-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-serbian-lig-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-t2-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-t2-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-ru-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-ru-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-sr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-sr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ukrhyph-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ukrhyph-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xecyrmongolian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xecyrmongolian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langcyrillic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langcyrillic-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-belarusian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-belarusian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-bulgarian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-bulgarian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-russian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-russian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-serbian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-serbian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-serbianc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-serbianc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-ukrainian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-ukrainian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-churchslavonic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-churchslavonic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmcyr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmcyr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyrillic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyrillic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyrillic-bin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyrillic-bin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-disser.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-disser.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eskd.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eskd.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eskdx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eskdx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gost.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gost.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcyw.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcyw.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lh.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lh.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-bulgarian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-bulgarian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-mongol.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-mongol.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-russian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-russian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-ukr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-ukr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mongolian-babel.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mongolian-babel.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-montex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-montex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpman-ru.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpman-ru.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numnameru.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numnameru.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-eucl-translation-bg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-eucl-translation-bg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-russ.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-russ.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-serbian-apostrophe.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-serbian-apostrophe.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-serbian-date-lat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-serbian-date-lat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-serbian-def-cyr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-serbian-def-cyr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-serbian-lig.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-serbian-lig.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-t2.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-t2.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-ru.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-ru.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-sr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-sr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ukrhyph.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ukrhyph.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xecyrmongolian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xecyrmongolian.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-belarusian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-belarusian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-bulgarian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-bulgarian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-russian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-russian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-serbian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-serbian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-serbianc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-serbianc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-ukrainian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-ukrainian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyrillic.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyrillic.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-disser.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-disser.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eskd.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eskd.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gost.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gost.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcyw.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcyw.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lh.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lh.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lhcyr.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lhcyr.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mongolian-babel.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mongolian-babel.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ruhyphen.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ruhyphen.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xecyrmongolian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xecyrmongolian.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=b1b594172b837720d643a22de82b55f9
diff --git a/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2020 b/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2020
index 141bc9a1c55c..1d74ab53d67e 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2020
@@ -10,5 +10,5 @@ LICENSE=GPL-1 GPL-2 LPPL-1.3 TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2020 >=dev-texlive/texlive-latex-2020 >=dev-texlive/texlive-basic-2019 >=dev-texlive/texlive-latex-2019 >=app-text/texlive-core-2014[xetex] >=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-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-czech-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-czech-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-slovak-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-slovak-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cnbwp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cnbwp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csbulletin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csbulletin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cslatex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cslatex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csplain-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csplain-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cstex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cstex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-czech-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-czech-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-slovak-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-slovak-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-czech-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-czech-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-slovak-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-slovak-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-cz-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-cz-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langczechslovak-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langczechslovak-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-czech.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-czech.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-slovak.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-slovak.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cnbwp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cnbwp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csbulletin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csbulletin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cslatex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cslatex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cstex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cstex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-czech.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-czech.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-slovak.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-slovak.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-cz.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-cz.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-czech.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-czech.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-slovak.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-slovak.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cslatex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cslatex.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=0293a5769ef06f52f995cb6d3290f9c8
diff --git a/metadata/md5-cache/dev-texlive/texlive-langenglish-2020 b/metadata/md5-cache/dev-texlive/texlive-langenglish-2020
index a339f9671997..6361a509ddb5 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langenglish-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-langenglish-2020
@@ -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-2020 >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-english-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-english-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-MemoirChapStyles-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-MemoirChapStyles-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-Type1fonts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-Type1fonts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amscls-doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amscls-doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amslatex-primer-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amslatex-primer-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-around-the-bend-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-around-the-bend-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ascii-chart-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ascii-chart-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-cheatsheet-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-cheatsheet-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-components-of-TeX-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-components-of-TeX-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comprehensive-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comprehensive-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dickimaw-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dickimaw-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docsurvey-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docsurvey-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxtut-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtxtut-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-first-latex-doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-first-latex-doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forest-quickstart-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forest-quickstart-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gentle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gentle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guide-to-latex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guide-to-latex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-happy4th-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-happy4th-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-impatient-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-impatient-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-intro-scientific-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-intro-scientific-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knuth-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knuth-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2tabu-english-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2tabu-english-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-brochure-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-brochure-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-course-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-course-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-doc-ptr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-doc-ptr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-graphics-companion-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-graphics-companion-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-refsheet-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-refsheet-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-veryshortguide-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-veryshortguide-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-web-companion-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-web-companion-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2e-help-texinfo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex2e-help-texinfo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex4wp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex4wp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcheat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcheat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcourse-rug-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcourse-rug-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexfileinfo-pkgs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexfileinfo-pkgs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-english-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-english-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-macros2e-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-macros2e-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-math-e-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-math-e-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-math-into-latex-4-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-math-into-latex-4-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-maths-symbols-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-maths-symbols-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memdesign-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memdesign-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metafont-beginners-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metafont-beginners-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metapost-examples-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metapost-examples-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patgen2-tutorial-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-patgen2-tutorial-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pictexsum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pictexsum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plain-doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plain-doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-presentations-en-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-presentations-en-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-short-math-guide-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-short-math-guide-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplified-latex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplified-latex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svg-inkscape-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svg-inkscape-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabulars-e-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabulars-e-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tamethebeast-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tamethebeast-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tds-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tds-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-font-errors-cheatsheet-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-font-errors-cheatsheet-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-overview-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-overview-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-refs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-refs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texbytopic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texbytopic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texonly-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texonly-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlepages-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlepages-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tlc2-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tlc2-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-undergradmath-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-undergradmath-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-visualfaq-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-visualfaq-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-webguide-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-webguide-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetexref-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetexref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langenglish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langenglish-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-MemoirChapStyles.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-MemoirChapStyles.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-Type1fonts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-Type1fonts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amscls-doc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amscls-doc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amslatex-primer.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amslatex-primer.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-around-the-bend.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-around-the-bend.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ascii-chart.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ascii-chart.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-cheatsheet.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-cheatsheet.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-components-of-TeX.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-components-of-TeX.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comprehensive.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comprehensive.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dickimaw.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dickimaw.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docsurvey.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docsurvey.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxtut.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtxtut.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-first-latex-doc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-first-latex-doc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forest-quickstart.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forest-quickstart.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gentle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gentle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guide-to-latex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guide-to-latex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-happy4th.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-happy4th.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-impatient.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-impatient.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-intro-scientific.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-intro-scientific.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knuth.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knuth.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2tabu-english.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2tabu-english.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-brochure.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-brochure.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-course.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-course.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-doc-ptr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-doc-ptr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-graphics-companion.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-graphics-companion.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-refsheet.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-refsheet.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-veryshortguide.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-veryshortguide.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-web-companion.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-web-companion.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2e-help-texinfo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex2e-help-texinfo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex4wp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex4wp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcheat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcheat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcourse-rug.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcourse-rug.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexfileinfo-pkgs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexfileinfo-pkgs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-english.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-english.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-macros2e.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-macros2e.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-math-e.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-math-e.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-math-into-latex-4.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-math-into-latex-4.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-maths-symbols.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-maths-symbols.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memdesign.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memdesign.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metafont-beginners.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metafont-beginners.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metapost-examples.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metapost-examples.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patgen2-tutorial.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-patgen2-tutorial.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pictexsum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pictexsum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plain-doc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plain-doc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-presentations-en.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-presentations-en.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-short-math-guide.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-short-math-guide.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplified-latex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplified-latex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svg-inkscape.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svg-inkscape.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabulars-e.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabulars-e.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tamethebeast.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tamethebeast.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tds.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tds.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-font-errors-cheatsheet.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-font-errors-cheatsheet.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-overview.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-overview.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-refs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-refs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texbytopic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texbytopic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texonly.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texonly.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlepages.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlepages.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tlc2.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tlc2.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-undergradmath.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-undergradmath.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-visualfaq.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-visualfaq.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-webguide.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-webguide.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetexref.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetexref.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knuth.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knuth.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexfileinfo-pkgs.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexfileinfo-pkgs.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=b3fd8d2008b3d1ca5a6a6992b50a29ba
diff --git a/metadata/md5-cache/dev-texlive/texlive-langeuropean-2020 b/metadata/md5-cache/dev-texlive/texlive-langeuropean-2020
index 87d121567240..caa1f94c1a28 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langeuropean-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-langeuropean-2020
@@ -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-2020 >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-armtex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-armtex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-albanian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-albanian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-bosnian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-bosnian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-breton-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-breton-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-croatian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-croatian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-danish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-danish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-dutch-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-dutch-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-estonian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-estonian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-finnish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-finnish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-friulan-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-friulan-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-hungarian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-hungarian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-icelandic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-icelandic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-irish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-irish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-kurmanji-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-kurmanji-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-latin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-latin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-latvian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-latvian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-macedonian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-macedonian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-norsk-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-norsk-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-occitan-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-occitan-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-piedmontese-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-piedmontese-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-romanian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-romanian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-romansh-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-romansh-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-samin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-samin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-scottish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-scottish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-slovenian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-slovenian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-swedish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-swedish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-turkish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-turkish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-welsh-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-welsh-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-finbib-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-finbib-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gloss-occitan-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gloss-occitan-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hrlatex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hrlatex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hulipsum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hulipsum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-croatian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-croatian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-danish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-danish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-dutch-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-dutch-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-estonian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-estonian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-finnish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-finnish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-friulan-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-friulan-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-hungarian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-hungarian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-icelandic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-icelandic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-irish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-irish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-kurmanji-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-kurmanji-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-latin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-latin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-latvian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-latvian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-lithuanian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-lithuanian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-macedonian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-macedonian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-norwegian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-norwegian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-occitan-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-occitan-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-piedmontese-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-piedmontese-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-romanian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-romanian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-romansh-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-romansh-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-slovenian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-slovenian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-swedish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-swedish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-turkish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-turkish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-uppersorbian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-uppersorbian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-welsh-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-welsh-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lithuanian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lithuanian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-dutch-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-dutch-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-estonian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-estonian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-finnish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-finnish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-slovenian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-slovenian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-turkish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-turkish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nevelok-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nevelok-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-swebib-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-swebib-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turkmen-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turkmen-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langeuropean-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langeuropean-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-armtex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-armtex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-albanian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-albanian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-bosnian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-bosnian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-breton.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-breton.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-croatian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-croatian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-danish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-danish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-dutch.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-dutch.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-estonian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-estonian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-finnish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-finnish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-friulan.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-friulan.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-hungarian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-hungarian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-icelandic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-icelandic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-irish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-irish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-kurmanji.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-kurmanji.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-latin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-latin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-latvian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-latvian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-macedonian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-macedonian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-norsk.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-norsk.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-occitan.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-occitan.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-piedmontese.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-piedmontese.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-romanian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-romanian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-romansh.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-romansh.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-samin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-samin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-scottish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-scottish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-slovenian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-slovenian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-swedish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-swedish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-turkish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-turkish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-welsh.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-welsh.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gloss-occitan.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gloss-occitan.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hrlatex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hrlatex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hulipsum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hulipsum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-hungarian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-hungarian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lithuanian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lithuanian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-dutch.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-dutch.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-estonian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-estonian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-finnish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-finnish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-slovenian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-slovenian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-turkish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-turkish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nevelok.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nevelok.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-swebib.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-swebib.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turkmen.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turkmen.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-albanian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-albanian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-bosnian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-bosnian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-breton.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-breton.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-croatian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-croatian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-danish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-danish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-dutch.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-dutch.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-estonian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-estonian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-finnish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-finnish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-friulan.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-friulan.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-icelandic.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-icelandic.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-irish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-irish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-kurmanji.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-kurmanji.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-latin.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-latin.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-latvian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-latvian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-macedonian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-macedonian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-norsk.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-norsk.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-occitan.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-occitan.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-piedmontese.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-piedmontese.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-romanian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-romanian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-romansh.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-romansh.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-samin.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-samin.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-scottish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-scottish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-slovenian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-slovenian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-swedish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-swedish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-turkish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-turkish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-welsh.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-welsh.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gloss-occitan.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gloss-occitan.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hrlatex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hrlatex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hulipsum.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hulipsum.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-turkish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-turkish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nevelok.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nevelok.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turkmen.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turkmen.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=4cb89ff90f8b3c0061647d44b62acd15
diff --git a/metadata/md5-cache/dev-texlive/texlive-langfrench-2020 b/metadata/md5-cache/dev-texlive/texlive-langfrench-2020
index 41d9b9b6833e..aa60c3cc3048 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langfrench-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-langfrench-2020
@@ -10,5 +10,5 @@ LICENSE=GPL-2 CC-BY-SA-4.0
 RDEPEND=>=dev-texlive/texlive-basic-2020 >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aeguill-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aeguill-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apprendre-a-programmer-en-tex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apprendre-a-programmer-en-tex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apprends-latex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apprends-latex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-basque-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-basque-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-french-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-french-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-basque-book-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-basque-book-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-basque-date-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-basque-date-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bib-fr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bib-fr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-french-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-french-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-booktabs-fr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-booktabs-fr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-droit-fr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-droit-fr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-e-french-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-e-french-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epslatex-fr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epslatex-fr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expose-expl3-dunkerque-2019-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expose-expl3-dunkerque-2019-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-facture-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-facture-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-formation-latex-ul-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-formation-latex-ul-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frenchmath-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frenchmath-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frletter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frletter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-basque-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-basque-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-french-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-french-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-impatient-fr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-impatient-fr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-impnattypo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-impnattypo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2tabu-french-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2tabu-french-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2e-help-texinfo-fr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex2e-help-texinfo-fr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-french-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-french-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mafr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mafr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabvar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabvar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tdsfrmath-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tdsfrmath-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-fr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-fr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-array-fr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-array-fr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-dcolumn-fr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-dcolumn-fr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-natbib-fr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-natbib-fr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-tabbing-fr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-tabbing-fr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-variations-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-variations-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-visualtikz-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-visualtikz-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langfrench-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langfrench-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aeguill.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aeguill.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apprendre-a-programmer-en-tex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apprendre-a-programmer-en-tex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apprends-latex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apprends-latex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-basque.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-basque.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-french.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-french.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-basque-book.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-basque-book.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-basque-date.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-basque-date.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bib-fr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bib-fr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-french.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-french.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-booktabs-fr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-booktabs-fr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-droit-fr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-droit-fr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-e-french.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-e-french.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epslatex-fr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epslatex-fr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expose-expl3-dunkerque-2019.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expose-expl3-dunkerque-2019.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-facture.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-facture.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-formation-latex-ul.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-formation-latex-ul.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frenchmath.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frenchmath.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frletter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frletter.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-impatient-fr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-impatient-fr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-impnattypo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-impnattypo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2tabu-french.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2tabu-french.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2e-help-texinfo-fr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex2e-help-texinfo-fr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-french.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-french.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mafr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mafr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabvar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabvar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tdsfrmath.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tdsfrmath.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-fr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-fr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-array-fr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-array-fr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-dcolumn-fr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-dcolumn-fr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-natbib-fr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-natbib-fr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-tabbing-fr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-tabbing-fr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-variations.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-variations.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-visualtikz.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-visualtikz.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-basque.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-basque.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-french.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-french.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-basque-book.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-basque-book.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-basque-date.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-basque-date.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-french.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-french.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-facture.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-facture.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-formation-latex-ul.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-formation-latex-ul.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frenchmath.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frenchmath.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-basque.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-basque.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-impnattypo.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-impnattypo.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabvar.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabvar.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tdsfrmath.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tdsfrmath.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=26a367fe96305c8e6fdeb32ad397730b
diff --git a/metadata/md5-cache/dev-texlive/texlive-langgerman-2020 b/metadata/md5-cache/dev-texlive/texlive-langgerman-2020
index ea29c6493d0c..9b4f6795a1f8 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langgerman-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-langgerman-2020
@@ -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-2020 >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apalike-german-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apalike-german-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-german-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-german-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-german-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-german-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-booktabs-de-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-booktabs-de-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csquotes-de-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csquotes-de-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dehyph-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dehyph-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dehyph-exptl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dehyph-exptl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dhua-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dhua-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-einfuehrung-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-einfuehrung-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-einfuehrung2-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-einfuehrung2-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etdipa-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etdipa-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etoolbox-de-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etoolbox-de-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fifinddo-info-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fifinddo-info-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-german-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-german-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-germbib-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-germbib-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-germkorr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-germkorr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hausarbeit-jura-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hausarbeit-jura-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-german-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-german-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-koma-script-examples-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-koma-script-examples-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2picfaq-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2picfaq-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2tabu-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2tabu-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-bib-ex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-bib-ex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-bib2-ex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-bib2-ex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-referenz-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-referenz-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-tabellen-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-tabellen-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcheat-de-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcheat-de-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-german-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-german-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-doc-de-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-doc-de-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-microtype-de-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-microtype-de-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-milog-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-milog-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-presentations-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-presentations-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-r_und_s-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-r_und_s-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schulmathematik-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schulmathematik-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-templates-fenn-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-templates-fenn-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-templates-sommer-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-templates-sommer-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termcal-de-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termcal-de-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-de-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-de-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tipa-de-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tipa-de-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-arsclassica-de-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-arsclassica-de-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-biblatex-de-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-biblatex-de-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-chemsym-de-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-chemsym-de-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-ecv-de-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-ecv-de-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-enumitem-de-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-enumitem-de-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-europecv-de-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-europecv-de-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-filecontents-de-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-filecontents-de-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-moreverb-de-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-moreverb-de-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-udesoftec-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-udesoftec-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uhrzeit-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uhrzeit-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umlaute-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umlaute-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-voss-mathcol-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-voss-mathcol-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langgerman-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langgerman-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apalike-german.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apalike-german.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-german.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-german.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-german.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-german.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-booktabs-de.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-booktabs-de.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csquotes-de.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csquotes-de.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dehyph-exptl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dehyph-exptl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dhua.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dhua.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-einfuehrung.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-einfuehrung.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-einfuehrung2.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-einfuehrung2.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etdipa.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etdipa.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etoolbox-de.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etoolbox-de.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fifinddo-info.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fifinddo-info.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-german.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-german.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-germbib.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-germbib.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-germkorr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-germkorr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hausarbeit-jura.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hausarbeit-jura.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-koma-script-examples.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-koma-script-examples.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2picfaq.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2picfaq.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2tabu.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2tabu.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-bib-ex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-bib-ex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-bib2-ex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-bib2-ex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-referenz.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-referenz.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-tabellen.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-tabellen.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcheat-de.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcheat-de.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-german.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-german.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-doc-de.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-doc-de.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-microtype-de.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-microtype-de.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-milog.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-milog.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-presentations.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-presentations.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-r_und_s.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-r_und_s.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schulmathematik.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schulmathematik.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-templates-fenn.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-templates-fenn.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-templates-sommer.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-templates-sommer.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termcal-de.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termcal-de.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-de.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-de.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tipa-de.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tipa-de.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-arsclassica-de.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-arsclassica-de.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-biblatex-de.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-biblatex-de.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-chemsym-de.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-chemsym-de.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-ecv-de.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-ecv-de.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-enumitem-de.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-enumitem-de.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-europecv-de.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-europecv-de.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-filecontents-de.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-filecontents-de.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-moreverb-de.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-moreverb-de.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-udesoftec.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-udesoftec.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uhrzeit.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uhrzeit.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umlaute.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umlaute.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-voss-mathcol.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-voss-mathcol.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-german.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-german.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dhua.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dhua.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fifinddo-info.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fifinddo-info.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-german.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-german.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hausarbeit-jura.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hausarbeit-jura.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termcal-de.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termcal-de.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-udesoftec.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-udesoftec.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umlaute.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umlaute.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=0e43527d8a46558660d52d3aa0ab08d2
diff --git a/metadata/md5-cache/dev-texlive/texlive-langgreek-2020 b/metadata/md5-cache/dev-texlive/texlive-langgreek-2020
index 4eb5b189c7eb..75fcad1d6125 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langgreek-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-langgreek-2020
@@ -10,5 +10,5 @@ LICENSE=GPL-1 GPL-2 LGPL-3 LPPL-1.3 LPPL-1.3c public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2020 >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-greek-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-greek-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-begingreek-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-begingreek-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-betababel-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-betababel-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cbfonts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cbfonts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cbfonts-fd-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cbfonts-fd-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsbaskerville-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsbaskerville-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsporson-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsporson-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greek-fontenc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greek-fontenc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greek-inputenc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greek-inputenc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greekdates-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greekdates-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greektex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greektex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greektonoi-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greektonoi-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-greek-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-greek-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-ancientgreek-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-ancientgreek-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ibycus-babel-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ibycus-babel-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ibygrk-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ibygrk-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kerkis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kerkis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-levy-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-levy-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lgreek-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lgreek-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mkgrkindex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mkgrkindex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-teubner-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-teubner-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xgreek-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xgreek-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yannisgr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yannisgr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langgreek-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langgreek-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-greek.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-greek.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-begingreek.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-begingreek.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-betababel.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-betababel.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cbfonts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cbfonts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cbfonts-fd.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cbfonts-fd.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsbaskerville.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsbaskerville.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsporson.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsporson.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greek-fontenc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greek-fontenc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greek-inputenc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greek-inputenc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greekdates.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greekdates.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greektex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greektex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greektonoi.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greektonoi.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-greek.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-greek.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ibycus-babel.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ibycus-babel.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ibygrk.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ibygrk.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kerkis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kerkis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-levy.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-levy.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lgreek.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lgreek.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mkgrkindex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mkgrkindex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-teubner.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-teubner.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xgreek.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xgreek.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yannisgr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yannisgr.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-greek.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-greek.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-begingreek.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-begingreek.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cbfonts-fd.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cbfonts-fd.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greek-fontenc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greek-fontenc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greekdates.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greekdates.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ibycus-babel.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ibycus-babel.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-teubner.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-teubner.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xgreek.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xgreek.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=90cdfb29156a5bc34dfa0a1d47e84b4a
diff --git a/metadata/md5-cache/dev-texlive/texlive-langitalian-2020 b/metadata/md5-cache/dev-texlive/texlive-langitalian-2020
index 2f40030378f5..ceeeff505f55 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langitalian-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-langitalian-2020
@@ -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-2020 >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsldoc-it-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsldoc-it-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsmath-it-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsmath-it-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsthdoc-it-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsthdoc-it-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-italian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-italian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codicefiscaleitaliano-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codicefiscaleitaliano-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyhdr-it-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyhdr-it-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixltxhyph-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixltxhyph-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frontespizio-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frontespizio-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-italian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-italian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-itnumpar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-itnumpar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2tabu-italian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2tabu-italian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex4wp-it-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex4wp-it-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-layaureo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-layaureo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-italian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-italian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psfrag-italian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psfrag-italian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-it-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-it-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verifica-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verifica-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langitalian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langitalian-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsldoc-it.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsldoc-it.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsmath-it.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsmath-it.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsthdoc-it.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsthdoc-it.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-italian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-italian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codicefiscaleitaliano.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codicefiscaleitaliano.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyhdr-it.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyhdr-it.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixltxhyph.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixltxhyph.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frontespizio.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frontespizio.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-itnumpar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-itnumpar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2tabu-italian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2tabu-italian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex4wp-it.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex4wp-it.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-layaureo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-layaureo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-italian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-italian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psfrag-italian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psfrag-italian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-it.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-it.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verifica.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verifica.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-italian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-italian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codicefiscaleitaliano.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codicefiscaleitaliano.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixltxhyph.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixltxhyph.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frontespizio.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frontespizio.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-itnumpar.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-itnumpar.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-layaureo.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-layaureo.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verifica.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verifica.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=9ff57edfc1f88c95cc1f54ed2f5a76ef
diff --git a/metadata/md5-cache/dev-texlive/texlive-langjapanese-2020 b/metadata/md5-cache/dev-texlive/texlive-langjapanese-2020
index 29593cca6dff..213dee18769a 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langjapanese-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-langjapanese-2020
@@ -10,5 +10,5 @@ LICENSE=BSD BSD-2 GPL-1 GPL-2 GPL-3 LPPL-1.3 MIT OFL public-domain TeX TeX-other
 RDEPEND=>=dev-texlive/texlive-langcjk-2020 dev-lang/ruby >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ascmac-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ascmac-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-japanese-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-japanese-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxbase-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxbase-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxcjkjatype-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxcjkjatype-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxghost-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxghost-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjaholiday-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjaholiday-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjalipsum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjalipsum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjaprnind-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjaprnind-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjatoucs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjatoucs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjscls-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjscls-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxorigcapt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxorigcapt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxwareki-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxwareki-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-convbkmk-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-convbkmk-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endnotesj-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endnotesj-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gentombow-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gentombow-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-haranoaji-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-haranoaji-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-haranoaji-extra-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-haranoaji-extra-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifptex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifptex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifxptex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifxptex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ipaex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ipaex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-japanese-otf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-japanese-otf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-japanese-otf-uptex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-japanese-otf-uptex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jlreq-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jlreq-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jsclasses-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jsclasses-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-japanese-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-japanese-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexja-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexja-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mendex-doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mendex-doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morisawa-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morisawa-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbibtex-base-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbibtex-base-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-platex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-platex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-platex-tools-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-platex-tools-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-platexcheat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-platexcheat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plautopatch-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plautopatch-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex-base-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex-base-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex-fontmaps-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex-fontmaps-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex-fonts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex-fonts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex-manual-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex-manual-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex2pdf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex2pdf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxbase-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxbase-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxchfon-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxchfon-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxcjkcat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxcjkcat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxjahyper-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxjahyper-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxjodel-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxjodel-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxrubrica-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxrubrica-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxufont-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxufont-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-ja-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-ja-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uplatex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uplatex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uptex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uptex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uptex-base-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uptex-base-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uptex-fonts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uptex-fonts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wadalab-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wadalab-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zxjafbfont-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zxjafbfont-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zxjatype-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zxjatype-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langjapanese-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langjapanese-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ascmac.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ascmac.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-japanese.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-japanese.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxbase.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxbase.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxcjkjatype.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxcjkjatype.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxghost.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxghost.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjaholiday.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjaholiday.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjalipsum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjalipsum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjaprnind.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjaprnind.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjatoucs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjatoucs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjscls.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjscls.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxorigcapt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxorigcapt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxwareki.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxwareki.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-convbkmk.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-convbkmk.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endnotesj.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endnotesj.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gentombow.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gentombow.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-haranoaji.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-haranoaji.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-haranoaji-extra.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-haranoaji-extra.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifptex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifptex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifxptex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifxptex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ipaex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ipaex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-japanese-otf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-japanese-otf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-japanese-otf-uptex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-japanese-otf-uptex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jlreq.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jlreq.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jsclasses.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jsclasses.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-japanese.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-japanese.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexja.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexja.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mendex-doc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mendex-doc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morisawa.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morisawa.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbibtex-base.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbibtex-base.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-platex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-platex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-platex-tools.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-platex-tools.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-platexcheat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-platexcheat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plautopatch.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plautopatch.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex-base.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex-base.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex-fontmaps.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex-fontmaps.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex-fonts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex-fonts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex-manual.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex-manual.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex2pdf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex2pdf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxbase.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxbase.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxchfon.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxchfon.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxcjkcat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxcjkcat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxjahyper.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxjahyper.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxjodel.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxjodel.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxrubrica.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxrubrica.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxufont.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxufont.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-ja.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-ja.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uplatex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uplatex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uptex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uptex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uptex-base.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uptex-base.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uptex-fonts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uptex-fonts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wadalab.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wadalab.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zxjafbfont.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zxjafbfont.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zxjatype.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zxjatype.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ascmac.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ascmac.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-japanese.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-japanese.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjscls.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjscls.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gentombow.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gentombow.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-japanese-otf.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-japanese-otf.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-japanese-otf-uptex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-japanese-otf-uptex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jlreq.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jlreq.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jsclasses.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jsclasses.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexja.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexja.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mendex-doc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mendex-doc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morisawa.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morisawa.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-platex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-platex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex-fontmaps.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex-fontmaps.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxrubrica.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxrubrica.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uplatex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uplatex.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=8dd68ed6c379879d9e162b77f3aba353
diff --git a/metadata/md5-cache/dev-texlive/texlive-langkorean-2020 b/metadata/md5-cache/dev-texlive/texlive-langkorean-2020
index 25b37c46dbfe..e5942a54737a 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langkorean-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-langkorean-2020
@@ -10,5 +10,5 @@ LICENSE=FDL-1.1 GPL-2 LPPL-1.3 OFL TeX-other-free
 RDEPEND=>=dev-texlive/texlive-langcjk-2020 >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-baekmuk-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-baekmuk-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjk-ko-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjk-ko-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kotex-oblivoir-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kotex-oblivoir-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kotex-plain-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kotex-plain-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kotex-utf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kotex-utf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kotex-utils-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kotex-utils-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-korean-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-korean-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nanumtype1-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nanumtype1-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmhanguljamo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmhanguljamo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uhc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uhc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unfonts-core-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unfonts-core-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unfonts-extra-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unfonts-extra-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langkorean-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langkorean-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-baekmuk.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-baekmuk.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjk-ko.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjk-ko.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kotex-oblivoir.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kotex-oblivoir.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kotex-plain.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kotex-plain.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kotex-utf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kotex-utf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kotex-utils.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kotex-utils.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-korean.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-korean.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nanumtype1.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nanumtype1.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmhanguljamo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmhanguljamo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uhc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uhc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unfonts-core.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unfonts-core.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unfonts-extra.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unfonts-extra.doc-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=5fef6969faced04c5e99849e7e6dfced
diff --git a/metadata/md5-cache/dev-texlive/texlive-langother-2020 b/metadata/md5-cache/dev-texlive/texlive-langother-2020
index 0ce1c89d6b03..670c15609f3b 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langother-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-langother-2020
@@ -10,5 +10,5 @@ LICENSE=CC-BY-SA-4.0 GPL-1 GPL-2 LPPL-1.3
 RDEPEND=>=dev-texlive/texlive-basic-2020 >=dev-texlive/texlive-basic-2019 !<dev-texlive/texlive-langcjk-2013 !<dev-texlive/texlive-basic-2016 !<dev-texlive/texlive-langafrican-2017 !<dev-texlive/texlive-langindic-2017 !<dev-texlive/texlive-langeuropean-2017 >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsldoc-vn-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsldoc-vn-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aramaic-serto-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aramaic-serto-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-armenian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-armenian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-azerbaijani-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-azerbaijani-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-esperanto-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-esperanto-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-georgian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-georgian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-hebrew-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-hebrew-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-indonesian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-indonesian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-interlingua-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-interlingua-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-malay-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-malay-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-sorbian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-sorbian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-thai-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-thai-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-vietnamese-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-vietnamese-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bangtex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bangtex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bengali-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bengali-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-burmese-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-burmese-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjhebrew-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjhebrew-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctib-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctib-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebong-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebong-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ethiop-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ethiop-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ethiop-t1-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ethiop-t1-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonts-tlwg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonts-tlwg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-afrikaans-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-afrikaans-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-coptic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-coptic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-esperanto-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-esperanto-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-ethiopic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-ethiopic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-georgian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-georgian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-indic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-indic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-indonesian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-indonesian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-interlingua-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-interlingua-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-sanskrit-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-sanskrit-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-thai-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-thai-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-turkmen-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-turkmen-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-mr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-mr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexbangla-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexbangla-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latino-sine-flexione-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latino-sine-flexione-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-thai-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-thai-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-vietnamese-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-vietnamese-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ntheorem-vn-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ntheorem-vn-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-padauk-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-padauk-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quran-ur-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quran-ur-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sanskrit-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sanskrit-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sanskrit-t1-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sanskrit-t1-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thaienum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thaienum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thaispec-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thaispec-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unicode-alphabets-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unicode-alphabets-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-velthuis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-velthuis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vntex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vntex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wnri-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wnri-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wnri-latex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wnri-latex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetex-devanagari-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetex-devanagari-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langother-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langother-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsldoc-vn.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsldoc-vn.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aramaic-serto.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aramaic-serto.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-azerbaijani.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-azerbaijani.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-esperanto.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-esperanto.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-georgian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-georgian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-hebrew.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-hebrew.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-indonesian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-indonesian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-interlingua.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-interlingua.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-malay.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-malay.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-sorbian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-sorbian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-thai.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-thai.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-vietnamese.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-vietnamese.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bangtex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bangtex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bengali.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bengali.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-burmese.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-burmese.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjhebrew.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjhebrew.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctib.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctib.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebong.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebong.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ethiop.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ethiop.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ethiop-t1.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ethiop-t1.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonts-tlwg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonts-tlwg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-sanskrit.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-sanskrit.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-mr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-mr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexbangla.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexbangla.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latino-sine-flexione.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latino-sine-flexione.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-thai.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-thai.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-vietnamese.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-vietnamese.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ntheorem-vn.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ntheorem-vn.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-padauk.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-padauk.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quran-ur.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quran-ur.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sanskrit.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sanskrit.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sanskrit-t1.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sanskrit-t1.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thaienum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thaienum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thaispec.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thaispec.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unicode-alphabets.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unicode-alphabets.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-velthuis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-velthuis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vntex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vntex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wnri.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wnri.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wnri-latex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wnri-latex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetex-devanagari.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetex-devanagari.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-armenian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-armenian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-azerbaijani.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-azerbaijani.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-esperanto.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-esperanto.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-hebrew.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-hebrew.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-indonesian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-indonesian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-interlingua.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-interlingua.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-malay.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-malay.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-sorbian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-sorbian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-thai.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-thai.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-vietnamese.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-vietnamese.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bengali.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bengali.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-burmese.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-burmese.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctib.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctib.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ethiop.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ethiop.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonts-tlwg.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonts-tlwg.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-ethiopic.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-ethiopic.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-turkmen.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-turkmen.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sanskrit.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sanskrit.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thaispec.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thaispec.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vntex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vntex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wnri-latex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wnri-latex.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=65c899d691af08449649003df3bffc01
diff --git a/metadata/md5-cache/dev-texlive/texlive-langpolish-2020 b/metadata/md5-cache/dev-texlive/texlive-langpolish-2020
index 8faa53eb02f7..6514c672dda0 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langpolish-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-langpolish-2020
@@ -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-2020 >=dev-texlive/texlive-basic-2020 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-polish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-polish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bredzenie-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bredzenie-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cc-pl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cc-pl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gustlib-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gustlib-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gustprog-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gustprog-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-polish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-polish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-polish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-polish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mwcls-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mwcls-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polski-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polski-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-przechlewski-book-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-przechlewski-book-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qpxqtx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qpxqtx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-virtual-academy-pl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-virtual-academy-pl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-pl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-pl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-utf8mex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-utf8mex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langpolish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langpolish-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-polish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-polish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bredzenie.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bredzenie.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cc-pl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cc-pl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gustlib.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gustlib.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gustprog.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gustprog.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-polish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-polish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mwcls.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mwcls.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polski.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polski.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-przechlewski-book.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-przechlewski-book.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qpxqtx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qpxqtx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-virtual-academy-pl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-virtual-academy-pl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-pl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-pl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-utf8mex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-utf8mex.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-polish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-polish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mwcls.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mwcls.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polski.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polski.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=90577aaff9c52621ef32a65544ae7663
diff --git a/metadata/md5-cache/dev-texlive/texlive-langportuguese-2020 b/metadata/md5-cache/dev-texlive/texlive-langportuguese-2020
index 5f8dd346fd62..8d30d87743f5 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langportuguese-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-langportuguese-2020
@@ -10,5 +10,5 @@ LICENSE=GPL-1 GPL-2 GPL-2+
 RDEPEND=>=dev-texlive/texlive-basic-2020 >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-portuges-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-portuges-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer-tut-pt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer-tut-pt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cursolatex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cursolatex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feupphdteses-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feupphdteses-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-portuguese-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-portuguese-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-via-exemplos-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-via-exemplos-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcheat-ptbr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcheat-ptbr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-portuguese-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-portuguese-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numberpt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numberpt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ordinalpt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ordinalpt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xypic-tut-pt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xypic-tut-pt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langportuguese-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langportuguese-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-portuges.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-portuges.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer-tut-pt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer-tut-pt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cursolatex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cursolatex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feupphdteses.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feupphdteses.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-via-exemplos.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-via-exemplos.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcheat-ptbr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcheat-ptbr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-portuguese.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-portuguese.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numberpt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numberpt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ordinalpt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ordinalpt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xypic-tut-pt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xypic-tut-pt.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-portuges.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-portuges.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numberpt.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numberpt.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ordinalpt.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ordinalpt.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=ef6b832c8eb12d104bb4fe7bc9e9ca79
diff --git a/metadata/md5-cache/dev-texlive/texlive-langspanish-2020 b/metadata/md5-cache/dev-texlive/texlive-langspanish-2020
index 14a96ef2e33d..8da5bf7e7043 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langspanish-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-langspanish-2020
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2020 >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-catalan-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-catalan-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-galician-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-galician-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-spanish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-spanish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-es-tex-faq-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-es-tex-faq-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-catalan-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-catalan-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-galician-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-galician-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-spanish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-spanish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2tabu-spanish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2tabu-spanish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2e-help-texinfo-spanish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex2e-help-texinfo-spanish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcheat-esmx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcheat-esmx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-spanish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-spanish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-es-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-es-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langspanish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langspanish-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-catalan.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-catalan.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-galician.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-galician.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-spanish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-spanish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-es-tex-faq.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-es-tex-faq.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-spanish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-spanish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2tabu-spanish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2tabu-spanish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2e-help-texinfo-spanish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex2e-help-texinfo-spanish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcheat-esmx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcheat-esmx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-spanish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-spanish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-es.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-es.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-catalan.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-catalan.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-galician.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-galician.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-spanish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-spanish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-galician.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-galician.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-spanish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-spanish.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=ceea717529eaaec165d1851b5c4560c7
diff --git a/metadata/md5-cache/dev-texlive/texlive-latex-2020 b/metadata/md5-cache/dev-texlive/texlive-latex-2020
index 147c8dc4e613..3479b0b00dbc 100644
--- a/metadata/md5-cache/dev-texlive/texlive-latex-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-latex-2020
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LPPL-1.3 LPPL-1.3c public-domain
 RDEPEND=>=dev-texlive/texlive-basic-2020 !~dev-texlive/texlive-latexrecommended-2019 >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ae-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ae-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amscls-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amscls-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsmath-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsmath-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-atbegshi-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-atbegshi-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-atveryend-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-atveryend-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auxhook-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auxhook-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-english-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-english-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babelbib-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babelbib-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bigintcalc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bigintcalc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bitset-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bitset-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookmark-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookmark-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-carlisle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-carlisle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colortbl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colortbl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epstopdf-pkg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epstopdf-pkg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etexcmds-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etexcmds-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyhdr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyhdr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fix2col-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fix2col-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-geometry-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-geometry-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gettitlestring-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gettitlestring-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphics-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphics-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphics-cfg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphics-cfg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grfext-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grfext-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hycolor-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hycolor-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyperref-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyperref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-intcalc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-intcalc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kvdefinekeys-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kvdefinekeys-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kvoptions-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kvoptions-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kvsetkeys-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kvsetkeys-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3backend-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3backend-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3kernel-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3kernel-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-bin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-bin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-fonts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-fonts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexconfig-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexconfig-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-letltxmacro-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-letltxmacro-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxcmds-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxcmds-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxmisc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxmisc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfnfss-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfnfss-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mptopdf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mptopdf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-natbib-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-natbib-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oberdiek-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oberdiek-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfescape-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfescape-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pslatex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pslatex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psnfss-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psnfss-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pspicture-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pspicture-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refcount-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refcount-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rerunfilecheck-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rerunfilecheck-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stringenc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stringenc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tools-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tools-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uniquecounter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uniquecounter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-url-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-url-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-latex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-latex-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ae.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ae.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amscls.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amscls.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsmath.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsmath.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-atbegshi.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-atbegshi.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-atveryend.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-atveryend.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auxhook.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auxhook.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-english.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-english.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babelbib.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babelbib.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bigintcalc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bigintcalc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bitset.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bitset.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookmark.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookmark.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-carlisle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-carlisle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colortbl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colortbl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epstopdf-pkg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epstopdf-pkg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etexcmds.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etexcmds.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyhdr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyhdr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fix2col.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fix2col.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-geometry.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-geometry.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gettitlestring.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gettitlestring.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphics.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphics.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphics-cfg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphics-cfg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grfext.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grfext.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hycolor.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hycolor.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyperref.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyperref.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-intcalc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-intcalc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kvdefinekeys.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kvdefinekeys.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kvoptions.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kvoptions.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kvsetkeys.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kvsetkeys.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3backend.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3backend.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3kernel.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3kernel.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-bin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-bin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-fonts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-fonts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-letltxmacro.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-letltxmacro.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxcmds.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxcmds.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfnfss.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfnfss.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mptopdf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mptopdf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-natbib.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-natbib.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oberdiek.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oberdiek.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfescape.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfescape.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psnfss.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psnfss.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pspicture.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pspicture.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refcount.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refcount.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rerunfilecheck.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rerunfilecheck.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stringenc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stringenc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tools.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tools.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uniquecounter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uniquecounter.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-url.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-url.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ae.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ae.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amscls.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amscls.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsmath.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsmath.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-atbegshi.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-atbegshi.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-atveryend.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-atveryend.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auxhook.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auxhook.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-english.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-english.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bigintcalc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bigintcalc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bitset.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bitset.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookmark.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookmark.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-carlisle.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-carlisle.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colortbl.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colortbl.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epstopdf-pkg.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epstopdf-pkg.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etexcmds.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etexcmds.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyhdr.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyhdr.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fix2col.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fix2col.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-geometry.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-geometry.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gettitlestring.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gettitlestring.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphics.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphics.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grfext.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grfext.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hycolor.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hycolor.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyperref.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyperref.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-intcalc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-intcalc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kvdefinekeys.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kvdefinekeys.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kvoptions.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kvoptions.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kvsetkeys.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kvsetkeys.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3backend.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3backend.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3kernel.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3kernel.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-letltxmacro.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-letltxmacro.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxcmds.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxcmds.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfnfss.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfnfss.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-natbib.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-natbib.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oberdiek.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oberdiek.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfescape.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfescape.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pslatex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pslatex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psnfss.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psnfss.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pspicture.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pspicture.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refcount.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refcount.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rerunfilecheck.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rerunfilecheck.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stringenc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stringenc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tools.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tools.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uniquecounter.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uniquecounter.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=8c6e27f08589230a9f58299c9d84f1a1
diff --git a/metadata/md5-cache/dev-texlive/texlive-latexextra-2020 b/metadata/md5-cache/dev-texlive/texlive-latexextra-2020
deleted file mode 100644
index 922d244ecee1..000000000000
--- a/metadata/md5-cache/dev-texlive/texlive-latexextra-2020
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-text/texlive-core-2020 app-arch/xz-utils
-DEFINED_PHASES=compile install postinst postrm unpack
-DEPEND=>=dev-texlive/texlive-latexrecommended-2020 >=dev-texlive/texlive-pictures-2020 dev-perl/Spreadsheet-ParseExcel
-DESCRIPTION=TeXLive LaTeX additional packages
-EAPI=7
-HOMEPAGE=http://www.tug.org/texlive/
-IUSE=source doc
-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 ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0 Artistic BSD CC-BY-SA-4.0 GPL-1 GPL-2 GPL-3 GPL-3+ LPPL-1.3
-RDEPEND=>=dev-texlive/texlive-latexrecommended-2020 >=dev-texlive/texlive-pictures-2020 dev-perl/Spreadsheet-ParseExcel >=app-text/texlive-core-2020
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-2up-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-2up-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ESIEEcv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ESIEEcv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-GS1-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-GS1-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-HA-prosper-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-HA-prosper-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-Tabbing-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-Tabbing-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-a0poster-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-a0poster-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-a4wide-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-a4wide-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-a5comb-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-a5comb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abraces-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abraces-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abstract-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abstract-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accessibility-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accessibility-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accsupp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accsupp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-achemso-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-achemso-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acro-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acro-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acronym-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acronym-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acroterm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acroterm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-actuarialangle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-actuarialangle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-actuarialsymbol-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-actuarialsymbol-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-addfont-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-addfont-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-addlines-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-addlines-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adjmulticol-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adjmulticol-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adjustbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adjustbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adrconv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adrconv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-advdate-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-advdate-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-akktex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-akktex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-akletter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-akletter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alertmessage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alertmessage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alnumsec-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alnumsec-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alphalph-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alphalph-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-altfont-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-altfont-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsaddr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsaddr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-animate-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-animate-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anonchap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anonchap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-answers-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-answers-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anyfontsize-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anyfontsize-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-appendix-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-appendix-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-appendixnumberbeamer-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-appendixnumberbeamer-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apptools-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apptools-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabicfront-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabicfront-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arcs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arcs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arraycols-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arraycols-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arrayjobx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arrayjobx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arraysort-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arraysort-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arydshln-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arydshln-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asciilist-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asciilist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-askinclude-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-askinclude-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-assignment-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-assignment-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-assoccnt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-assoccnt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-atenddvi-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-atenddvi-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-attachfile-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-attachfile-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aurl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aurl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-authoraftertitle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-authoraftertitle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-authorarchive-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-authorarchive-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-authorindex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-authorindex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autofancyhdr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autofancyhdr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autonum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autonum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autopdf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autopdf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-avremu-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-avremu-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-axessibility-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-axessibility-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-background-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-background-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bankstatement-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bankstatement-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bashful-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bashful-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-basicarith-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-basicarith-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bchart-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bchart-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer2thesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer2thesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer-rl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer-rl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beameraudience-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beameraudience-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerauxtheme-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerauxtheme-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamercolorthemeowl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamercolorthemeowl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerdarkthemes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerdarkthemes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerposter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerposter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamersubframe-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamersubframe-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-cuerna-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-cuerna-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-detlevcm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-detlevcm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-epyt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-epyt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-focus-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-focus-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-light-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-light-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-metropolis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-metropolis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-npbt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-npbt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-phnompenh-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-phnompenh-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-saintpetersburg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-saintpetersburg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-upenn-bc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-upenn-bc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerthemejltree-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerthemejltree-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerthemenirma-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerthemenirma-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bearwear-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bearwear-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beton-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beton-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bewerbung-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bewerbung-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bez123-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bez123-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bhcexam-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bhcexam-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibletext-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibletext-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bigfoot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bigfoot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bigints-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bigints-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biochemistry-colors-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biochemistry-colors-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bizcard-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bizcard-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blindtext-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blindtext-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blkarray-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blkarray-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-block-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-block-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blowup-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blowup-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bnumexpr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bnumexpr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boites-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boites-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bold-extra-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bold-extra-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookcover-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookcover-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookest-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookest-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-booklet-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-booklet-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boolexpr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boolexpr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bophook-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bophook-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boxedminipage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boxedminipage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boxedminipage2e-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boxedminipage2e-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boxhandler-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boxhandler-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bracketkey-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bracketkey-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-braket-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-braket-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-breakurl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-breakurl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bullcntr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bullcntr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxcalc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxcalc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxdpx-beamer-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxdpx-beamer-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxdvidriver-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxdvidriver-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxenclose-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxenclose-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxnewfont-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxnewfont-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxpapersize-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxpapersize-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxpdfver-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxpdfver-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxtexlogo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxtexlogo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calcage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calcage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calctab-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calctab-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calculator-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calculator-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calrsfs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calrsfs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cals-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cals-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calxxxx-yyyy-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calxxxx-yyyy-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cancel-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cancel-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-canoniclayout-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-canoniclayout-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-capt-of-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-capt-of-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-captcont-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-captcont-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-captdef-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-captdef-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-carbohydrates-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-carbohydrates-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cases-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cases-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-casyl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-casyl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catchfile-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catchfile-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catchfilebetweentags-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catchfilebetweentags-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catechis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catechis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catoptions-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catoptions-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cbcoptic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cbcoptic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ccaption-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ccaption-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cclicenses-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cclicenses-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cd-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cd-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cd-cover-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cd-cover-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cdpbundl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cdpbundl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cellprops-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cellprops-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cellspace-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cellspace-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-censor-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-censor-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-centeredline-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-centeredline-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changebar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changebar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changelayout-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changelayout-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changelog-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changelog-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changepage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changepage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chappg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chappg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chapterfolder-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chapterfolder-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cheatsheet-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cheatsheet-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-checkend-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-checkend-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chet-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chet-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chextras-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chextras-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-childdoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-childdoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chkfloat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chkfloat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chletter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chletter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chngcntr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chngcntr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chronology-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chronology-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circ-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circ-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circledsteps-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circledsteps-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-classics-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-classics-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-classpack-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-classpack-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clefval-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clefval-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cleveref-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cleveref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clipboard-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clipboard-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clock-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clock-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cloze-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cloze-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clrdblpg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clrdblpg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clrstrip-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clrstrip-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmdstring-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmdstring-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmdtrack-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmdtrack-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmsd-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmsd-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cnltx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cnltx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cntformats-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cntformats-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cntperchap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cntperchap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codedoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codedoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codepage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codepage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codesection-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codesection-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collcell-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collcell-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collectbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collectbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colophon-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colophon-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colordoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colordoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorinfo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorinfo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coloring-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coloring-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorspace-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorspace-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colortab-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colortab-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorwav-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorwav-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorweb-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorweb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colourchange-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colourchange-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combelow-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combelow-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combine-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combine-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comma-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comma-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-commado-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-commado-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-commedit-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-commedit-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comment-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comment-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-competences-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-competences-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-concepts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-concepts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-concprog-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-concprog-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-constants-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-constants-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-continue-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-continue-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-contour-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-contour-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-contracard-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-contracard-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-conv-xkv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-conv-xkv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooking-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooking-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooking-units-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooking-units-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cool-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cool-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coollist-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coollist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coolstr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coolstr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coolthms-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coolthms-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooltooltips-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooltooltips-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coordsys-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coordsys-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-copyedit-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-copyedit-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-copyrightbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-copyrightbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coseoul-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coseoul-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-counttexruns-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-counttexruns-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-courseoutline-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-courseoutline-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coursepaper-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coursepaper-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coverpage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coverpage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cprotect-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cprotect-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossreference-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossreference-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossreftools-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossreftools-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csquotes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csquotes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-css-colors-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-css-colors-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csvmerge-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csvmerge-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csvsimple-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csvsimple-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cuisine-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cuisine-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currency-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currency-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currfile-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currfile-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cutwin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cutwin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cv4tw-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cv4tw-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cweb-latex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cweb-latex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyber-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyber-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cybercic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cybercic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashrule-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashrule-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashundergaps-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashundergaps-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dataref-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dataref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datatool-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datatool-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dateiliste-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dateiliste-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datenumber-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datenumber-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-bahasai-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-bahasai-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-basque-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-basque-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-breton-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-breton-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-bulgarian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-bulgarian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-catalan-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-catalan-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-croatian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-croatian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-czech-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-czech-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-danish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-danish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-dutch-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-dutch-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-en-fulltext-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-en-fulltext-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-english-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-english-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-esperanto-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-esperanto-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-estonian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-estonian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-finnish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-finnish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-french-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-french-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-galician-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-galician-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-german-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-german-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-greek-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-greek-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-hebrew-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-hebrew-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-icelandic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-icelandic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-irish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-irish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-italian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-italian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-it-fulltext-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-it-fulltext-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-latin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-latin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-lsorbian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-lsorbian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-magyar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-magyar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-norsk-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-norsk-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-polish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-polish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-portuges-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-portuges-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-romanian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-romanian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-russian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-russian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-samin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-samin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-scottish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-scottish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-serbian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-serbian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-slovak-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-slovak-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-slovene-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-slovene-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-spanish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-spanish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-swedish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-swedish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-turkish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-turkish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-ukrainian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-ukrainian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-usorbian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-usorbian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-welsh-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-welsh-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dblfloatfix-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dblfloatfix-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-decimal-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-decimal-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-decorule-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-decorule-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-delimtxt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-delimtxt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-denisbdoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-denisbdoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diagbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diagbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diagnose-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diagnose-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dialogl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dialogl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dichokey-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dichokey-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dinbrief-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dinbrief-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-directory-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-directory-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dirtytalk-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dirtytalk-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dlfltxb-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dlfltxb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dnaseq-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dnaseq-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doclicense-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doclicense-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docmfp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docmfp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docmute-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docmute-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doctools-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doctools-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-documentation-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-documentation-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doi-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doi-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dotarrow-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dotarrow-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dotlessi-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dotlessi-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dotseqn-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dotseqn-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-download-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-download-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dpfloat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dpfloat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dprogress-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dprogress-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drac-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drac-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-draftcopy-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-draftcopy-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-draftfigure-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-draftfigure-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-draftwatermark-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-draftwatermark-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtk-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtk-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxdescribe-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtxdescribe-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxgallery-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtxgallery-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-duckuments-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-duckuments-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ducksay-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ducksay-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvdcoll-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dvdcoll-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dynamicnumber-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dynamicnumber-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dynblocks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dynblocks-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ean13isbn-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ean13isbn-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easy-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easy-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easy-todo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easy-todo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyfig-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyfig-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyformat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyformat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easylist-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easylist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyreview-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyreview-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebezier-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebezier-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecclesiastic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecclesiastic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ed-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ed-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-edmargin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-edmargin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eemeir-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eemeir-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-efbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-efbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-egplot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-egplot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ehhline-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ehhline-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elegantbook-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elegantbook-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elegantnote-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elegantnote-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elegantpaper-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elegantpaper-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elements-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elements-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ellipsis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ellipsis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elmath-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elmath-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elocalloc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elocalloc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elpres-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elpres-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elzcards-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elzcards-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emarks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emarks-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-embedall-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-embedall-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-embedfile-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-embedfile-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-embrac-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-embrac-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emptypage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emptypage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emulateapj-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emulateapj-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endfloat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endfloat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endheads-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endheads-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endnotes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endnotes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-engpron-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-engpron-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-engrec-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-engrec-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enotez-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enotez-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enumitem-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enumitem-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enumitem-zref-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enumitem-zref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-envbig-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-envbig-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-environ-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-environ-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epigraph-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epigraph-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epiolmec-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epiolmec-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqell-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqell-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqlist-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqlist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqnalign-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqnalign-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqname-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqname-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqparbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqparbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-errata-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-errata-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erw-l3-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erw-l3-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esami-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esami-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esdiff-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esdiff-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esindex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esindex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esint-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esint-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esint-type1-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esint-type1-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etaremune-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etaremune-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etextools-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etextools-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eukdate-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eukdate-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eulerpx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eulerpx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-europasscv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-europasscv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-everyhook-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-everyhook-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-everypage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-everypage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exam-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exam-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exam-n-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exam-n-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exam-randomizechoices-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exam-randomizechoices-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-examdesign-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-examdesign-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exframe-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exframe-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-example-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-example-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-examplep-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-examplep-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exceltex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exceltex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-excludeonly-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-excludeonly-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercise-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercise-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercisebank-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercisebank-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercisepoints-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercisepoints-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercises-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercises-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exp-testopt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exp-testopt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expdlist-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expdlist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-export-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-export-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exsheets-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exsheets-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exsol-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exsol-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-extract-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-extract-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-facsimile-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-facsimile-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-factura-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-factura-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyhandout-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyhandout-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancylabel-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancylabel-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancynum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancynum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancypar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancypar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyslides-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyslides-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancytabs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancytabs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancytooltips-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancytooltips-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fcolumn-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fcolumn-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fetchcls-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fetchcls-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fewerfloatpages-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fewerfloatpages-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ffslides-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ffslides-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fgruler-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fgruler-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fibeamer-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fibeamer-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fifo-stack-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fifo-stack-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-figsize-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-figsize-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filecontents-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filecontents-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filecontentsdef-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filecontentsdef-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filedate-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filedate-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fileinfo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fileinfo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filemod-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filemod-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fink-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fink-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-finstrut-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-finstrut-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fithesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fithesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixcmex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixcmex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixfoot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixfoot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixme-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixme-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixmetodonotes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixmetodonotes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fjodor-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fjodor-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flabels-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flabels-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flacards-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flacards-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flagderiv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flagderiv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flashcards-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flashcards-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flashmovie-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flashmovie-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flipbook-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flipbook-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flippdf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flippdf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-floatflt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-floatflt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-floatrow-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-floatrow-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flowfram-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flowfram-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fmp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fmp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fmtcount-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fmtcount-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fn2end-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fn2end-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnbreak-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnbreak-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fncychap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fncychap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fncylab-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fncylab-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnpara-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnpara-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnpct-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnpct-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnumprint-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnumprint-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-foilhtml-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-foilhtml-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontaxes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontaxes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontsetup-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontsetup-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontsize-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontsize-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonttable-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonttable-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footmisc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footmisc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footmisx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footmisx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnotebackref-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnotebackref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnoterange-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnoterange-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnpag-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnpag-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forarray-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forarray-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-foreign-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-foreign-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forloop-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forloop-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-formlett-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-formlett-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forms16be-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forms16be-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-formular-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-formular-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fragments-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fragments-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frame-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frame-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-framed-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-framed-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frankenstein-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frankenstein-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frege-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frege-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ftcap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ftcap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ftnxtra-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ftnxtra-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fullblck-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fullblck-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fullminipage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fullminipage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fullwidth-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fullwidth-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fundus-calligra-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fundus-calligra-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fundus-cyr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fundus-cyr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fundus-sueterlin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fundus-sueterlin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fvextra-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fvextra-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fwlw-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fwlw-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gatherenum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gatherenum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gauss-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gauss-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gcard-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gcard-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gcite-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gcite-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gender-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gender-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-genmpage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-genmpage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-getfiledate-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-getfiledate-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-getitems-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-getitems-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gindex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gindex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ginpenc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ginpenc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitfile-info-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitfile-info-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitinfo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitinfo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitinfo2-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitinfo2-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitlog-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitlog-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitver-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitver-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-globalvals-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-globalvals-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gloss-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gloss-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-danish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-danish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-dutch-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-dutch-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-english-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-english-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-estonian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-estonian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-extra-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-extra-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-finnish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-finnish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-french-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-french-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-german-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-german-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-irish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-irish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-italian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-italian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-magyar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-magyar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-polish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-polish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-portuges-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-portuges-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-serbian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-serbian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-slovene-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-slovene-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-spanish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-spanish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmdoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmdoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmdoc-enhance-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmdoc-enhance-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmiflink-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmiflink-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmutils-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmutils-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmverb-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmverb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grabbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grabbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphicx-psmin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphicx-psmin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphicxbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphicxbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grayhints-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grayhints-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grfpaste-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grfpaste-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grid-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grid-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grid-system-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grid-system-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gridset-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gridset-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gridslides-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gridslides-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitlogo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitlogo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-halloweenmath-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-halloweenmath-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hackthefootline-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hackthefootline-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-handin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-handin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-handout-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-handout-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hang-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hang-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hanging-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hanging-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hardwrap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hardwrap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harnon-cv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harnon-cv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harpoon-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harpoon-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-he-she-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-he-she-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hhtensor-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hhtensor-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-histogr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-histogr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hitec-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hitec-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hletter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hletter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hobsub-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hobsub-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hpsdiss-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hpsdiss-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hrefhide-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hrefhide-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hvindex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hvindex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hvqrurl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hvqrurl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hypdvips-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hypdvips-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyper-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyper-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyperbar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyperbar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hypernat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hypernat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyperxmp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyperxmp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphenat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphenat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-identkey-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-identkey-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-idxcmds-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-idxcmds-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-idxlayout-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-idxlayout-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iffont-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iffont-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifmslide-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifmslide-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifmtarg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifmtarg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifnextok-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifnextok-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifoddpage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifoddpage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifthenx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifthenx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iitem-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iitem-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-image-gallery-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-image-gallery-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imakeidx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imakeidx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-import-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-import-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-incgraph-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-incgraph-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-indextools-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-indextools-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inline-images-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inline-images-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inlinedef-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inlinedef-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inputenx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inputenx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inputtrc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inputtrc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interactiveworkbook-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interactiveworkbook-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interfaces-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interfaces-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-intopdf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-intopdf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inversepath-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inversepath-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-invoice-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-invoice-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-invoice-class-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-invoice-class-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-invoice2-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-invoice2-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iso-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iso-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iso10303-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iso10303-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isodate-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isodate-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isodoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isodoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isonums-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isonums-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isopt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isopt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isorot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isorot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isotope-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isotope-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-issuulinks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-issuulinks-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iwhdp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iwhdp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jlabels-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jlabels-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jslectureplanner-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jslectureplanner-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jumplines-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jumplines-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jvlisting-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jvlisting-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kalendarium-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kalendarium-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kantlipsum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kantlipsum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kerntest-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kerntest-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keycommand-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keycommand-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyfloat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyfloat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyreader-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyreader-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyindex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyindex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keystroke-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keystroke-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyval2e-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyval2e-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyvaltable-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyvaltable-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kix-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kix-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knowledge-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knowledge-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-koma-moderncvclassic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-koma-moderncvclassic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-koma-script-sfs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-koma-script-sfs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-komacv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-komacv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-komacv-rg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-komacv-rg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ktv-texdata-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ktv-texdata-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3build-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3build-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labbook-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labbook-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labels-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labels-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labels4easylist-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labels4easylist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labelschanged-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labelschanged-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lastpackage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lastpackage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lastpage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lastpage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-amsmath-dev-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-amsmath-dev-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-base-dev-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-base-dev-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-bin-dev-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-bin-dev-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-graphics-dev-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-graphics-dev-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-tds-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-tds-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-tools-dev-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-tools-dev-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-uni8-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-uni8-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcolors-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcolors-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexdemo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexdemo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexgit-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexgit-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-layouts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-layouts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lazylist-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lazylist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lccaps-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lccaps-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcd-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcd-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leading-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leading-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lectures-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lectures-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leftidx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leftidx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leipzig-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leipzig-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lengthconvert-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lengthconvert-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lettre-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lettre-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lettrine-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lettrine-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lewis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lewis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lhelp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lhelp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libgreek-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libgreek-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-limap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-limap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linegoal-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linegoal-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linop-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linop-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lipsum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lipsum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lisp-on-tex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lisp-on-tex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listing-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listing-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listingsutf8-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listingsutf8-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listlbls-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listlbls-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listliketab-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listliketab-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listofsymbols-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listofsymbols-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lkproof-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lkproof-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lmake-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lmake-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-locality-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-locality-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-localloc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-localloc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logical-markup-utils-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logical-markup-utils-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logpap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logpap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longfbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longfbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longfigure-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longfigure-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longnamefilelist-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longnamefilelist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-loops-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-loops-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lsc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lsc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lstaddons-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lstaddons-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lstfiracode-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lstfiracode-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lt3graph-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lt3graph-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltablex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltablex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltabptch-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltabptch-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxdockit-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxdockit-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxguidex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxguidex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxkeys-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxkeys-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxnew-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxnew-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxtools-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxtools-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-check-hyphen-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-check-hyphen-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatodonotes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatodonotes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-macroswap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-macroswap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-magaz-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-magaz-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-magicnum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-magicnum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecookbook-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecookbook-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makerobust-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makerobust-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mailing-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mailing-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mailmerge-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mailmerge-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makebarcode-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makebarcode-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makebase-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makebase-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makebox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makebox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecell-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecell-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecirc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecirc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecmds-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecmds-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makedtx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makedtx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makeglos-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makeglos-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mandi-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mandi-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-manfnt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-manfnt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-manuscript-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-manuscript-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-manyind-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-manyind-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginfit-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginfit-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginfix-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginfix-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginnote-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginnote-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-markdown-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-markdown-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathalpha-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathalpha-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathastext-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathastext-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathexam-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathexam-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathfam256-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathfam256-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathfont-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathfont-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-maybemath-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-maybemath-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcaption-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcaption-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mceinleger-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mceinleger-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcexam-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcexam-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcite-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcite-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mciteplus-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mciteplus-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdframed-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdframed-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-media9-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-media9-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-medstarbeamer-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-medstarbeamer-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-meetingmins-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-meetingmins-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memexsupp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memexsupp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memory-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memory-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mensa-tex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mensa-tex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-menu-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-menu-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-menukeys-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-menukeys-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metalogox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metalogox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metastr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metastr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-method-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-method-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metre-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metre-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfirstuc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfirstuc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mftinc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mftinc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mi-solns-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mi-solns-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-midpage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-midpage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minibox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minibox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minidocument-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minidocument-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minifp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minifp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minipage-marginpar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minipage-marginpar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minitoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minitoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minorrevision-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minorrevision-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minted-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minted-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minutes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minutes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mla-paper-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mla-paper-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mleftright-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mleftright-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mlist-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mlist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mmap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mmap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mnotes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mnotes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moderncv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moderncv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modernposter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modernposter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moderntimeline-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moderntimeline-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modref-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modroman-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modroman-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modular-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modular-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-monofill-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-monofill-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moodle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moodle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moreenum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moreenum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morefloats-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morefloats-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morehype-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morehype-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moresize-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moresize-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moreverb-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moreverb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morewrites-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morewrites-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-movie15-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-movie15-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mparhack-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mparhack-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpostinl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpostinl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-msc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-msc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-msg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-msg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mslapa-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mslapa-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mtgreek-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mtgreek-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multenum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multenum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multiaudience-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multiaudience-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multibbl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multibbl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multicap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multicap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multicolrule-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multicolrule-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multidef-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multidef-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multienv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multienv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multiexpand-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multiexpand-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multilang-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multilang-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multirow-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multirow-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mversion-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mversion-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mwe-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mwe-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mycv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mycv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mylatexformat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mylatexformat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nag-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nag-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nameauth-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nameauth-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-namespc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-namespc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ncclatex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ncclatex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ncctools-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ncctools-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-needspace-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-needspace-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nestquot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nestquot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newcommand-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newcommand-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newenviron-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newenviron-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newfile-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newfile-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newlfm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newlfm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newspaper-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newspaper-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newunicodechar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newunicodechar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newvbtm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newvbtm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newverbs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newverbs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nextpage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nextpage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nfssext-cfr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nfssext-cfr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nicefilelist-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nicefilelist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-niceframe-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-niceframe-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nicetext-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nicetext-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nidanfloat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nidanfloat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nlctdoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nlctdoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noconflict-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noconflict-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noindentafter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noindentafter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noitcrul-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noitcrul-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nolbreaks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nolbreaks-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nomencl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nomencl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nomentbl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nomentbl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nonfloat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nonfloat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nonumonpart-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nonumonpart-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nopageno-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nopageno-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-normalcolor-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-normalcolor-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notespages-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notespages-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notestex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notestex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notoccite-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notoccite-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nowidow-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nowidow-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ntheorem-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ntheorem-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numberedblock-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numberedblock-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numname-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numname-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numprint-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numprint-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numspell-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numspell-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocg-p-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocg-p-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocgx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocgx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocgx2-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocgx2-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocr-latex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocr-latex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-octavo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-octavo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oldstyle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oldstyle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-onlyamsmath-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-onlyamsmath-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-opcit-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-opcit-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-optidef-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-optidef-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-optional-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-optional-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-options-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-options-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outline-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outline-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outliner-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outliner-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outlines-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outlines-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outlining-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outlining-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-overlays-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-overlays-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-overpic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-overpic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-padcount-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-padcount-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagecolor-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagecolor-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagecont-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagecont-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagenote-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagenote-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagerange-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagerange-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pageslts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pageslts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paper-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paper-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papercdcase-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papercdcase-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papermas-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papermas-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papertex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papertex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paracol-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paracol-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parades-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parades-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paralist-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paralist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paresse-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paresse-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parnotes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parnotes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parsa-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parsa-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parselines-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parselines-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pas-cours-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pas-cours-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pas-cv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pas-cv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pas-tableur-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pas-tableur-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patch-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-patch-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patchcmd-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-patchcmd-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pauldoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pauldoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pawpict-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pawpict-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbsheet-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbsheet-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdf14-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdf14-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcolmk-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfcolmk-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcomment-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfcomment-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcprot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfcprot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfmarginpar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfmarginpar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfoverlay-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfoverlay-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpagediff-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpagediff-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpc-movie-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpc-movie-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfprivacy-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfprivacy-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfreview-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfreview-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfscreen-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfscreen-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfslide-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfslide-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfsync-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfsync-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfwin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfwin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pecha-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pecha-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-perltex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-perltex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-permute-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-permute-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-petiteannonce-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-petiteannonce-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phffullpagefigure-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phffullpagefigure-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfnote-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfnote-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfparen-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfparen-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfqit-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfqit-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfquotetext-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfquotetext-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfsvnwatermark-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfsvnwatermark-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfthm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfthm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-philex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-philex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phonenumbers-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phonenumbers-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-photo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-photo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-picture-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-picture-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-piff-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-piff-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pkgloader-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pkgloader-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-placeins-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-placeins-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plantslabels-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plantslabels-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plates-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plates-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plweb-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plweb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmboxdraw-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmboxdraw-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polynom-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polynom-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polynomial-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polynomial-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polytable-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polytable-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-postcards-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-postcards-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poster-mac-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poster-mac-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-powerdot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-powerdot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ppr-prv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ppr-prv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-practicalreports-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-practicalreports-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-preprint-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-preprint-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pressrelease-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pressrelease-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prettyref-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prettyref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-preview-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-preview-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-printlen-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-printlen-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-probsoln-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-probsoln-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-program-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-program-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-progress-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-progress-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-progressbar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-progressbar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proofread-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proofread-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-properties-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-properties-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prosper-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prosper-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-protex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-protex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-protocol-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-protocol-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psfragx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psfragx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pstool-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pstool-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pstring-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pstring-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxgreeks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxgreeks-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pygmentex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pygmentex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-python-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-python-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qcm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qcm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qstest-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qstest-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qsymbols-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qsymbols-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quicktype-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quicktype-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quiz2socrative-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quiz2socrative-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quotchap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quotchap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quoting-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quoting-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quotmark-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quotmark-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ran_toks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ran_toks-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randtext-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randtext-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rccol-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rccol-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rcs-multi-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rcs-multi-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rcsinfo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rcsinfo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-readarray-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-readarray-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realboxes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realboxes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recipe-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recipe-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recipebook-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recipebook-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recipecard-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recipecard-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rectopma-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rectopma-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refcheck-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refcheck-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refenums-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refenums-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reflectgraphics-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reflectgraphics-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refman-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refman-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refstyle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refstyle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regcount-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regcount-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regexpatch-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regexpatch-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-register-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-register-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regstats-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regstats-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-relenc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-relenc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-relsize-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-relsize-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-repeatindex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-repeatindex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-repltext-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-repltext-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-returntogrid-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-returntogrid-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rgltxdoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rgltxdoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rjlparshap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rjlparshap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rlepsf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rlepsf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rmpage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rmpage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-robustcommand-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-robustcommand-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-robustindex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-robustindex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romanbar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romanbar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romanbarpagenumber-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romanbarpagenumber-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romanneg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romanneg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romannum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romannum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rotfloat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rotfloat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rotpages-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rotpages-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-roundbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-roundbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rterface-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rterface-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rtkinenc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rtkinenc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rulerbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rulerbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rulercompass-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rulercompass-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rvwrite-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rvwrite-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sanitize-umlaut-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sanitize-umlaut-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sauerj-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sauerj-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-savefnmark-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-savefnmark-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-savesym-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-savesym-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-savetrees-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-savetrees-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scale-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scale-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scalebar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scalebar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scalerel-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scalerel-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scanpages-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scanpages-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schedule-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schedule-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scontents-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scontents-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scrlttr2copy-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scrlttr2copy-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sdaps-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sdaps-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sdrt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sdrt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-secdot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-secdot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-secnum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-secnum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sectionbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sectionbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sectionbreak-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sectionbreak-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sectsty-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sectsty-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seealso-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seealso-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-selectp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-selectp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-selinput-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-selinput-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semantic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semantic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semantic-markup-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semantic-markup-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semioneside-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semioneside-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semproc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semproc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sepfootnotes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sepfootnotes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seqsplit-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seqsplit-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sesstime-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sesstime-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sf298-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sf298-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sffms-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sffms-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sfmath-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sfmath-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shadethm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shadethm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shadow-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shadow-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shadowtext-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shadowtext-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shapepar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shapepar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shdoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shdoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shipunov-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shipunov-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shorttoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shorttoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-show2e-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-show2e-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showcharinbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showcharinbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showdim-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showdim-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showexpl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showexpl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showhyphens-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showhyphens-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showlabels-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showlabels-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sidecap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sidecap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sidenotes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sidenotes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-silence-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-silence-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplecd-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplecd-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplecv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplecv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simpleinvoice-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simpleinvoice-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sitem-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sitem-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skb-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skdoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skdoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skeycommand-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skeycommand-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skeyval-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skeyval-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skrapport-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skrapport-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-slantsc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-slantsc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smalltableof-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smalltableof-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smartunits-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smartunits-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smartref-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smartref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-snapshot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-snapshot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-snotez-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-snotez-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soul-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soul-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soulpos-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soulpos-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soulutf8-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soulutf8-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spacingtricks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spacingtricks-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spark-otf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spark-otf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sparklines-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sparklines-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sphack-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sphack-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-splitindex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-splitindex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spotcolor-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spotcolor-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spreadtab-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spreadtab-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spverbatim-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spverbatim-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srbook-mem-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-srbook-mem-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srcltx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-srcltx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sseq-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sseq-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sslides-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sslides-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stack-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stack-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stackengine-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stackengine-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-standalone-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-standalone-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stdclsdv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stdclsdv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stealcaps-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stealcaps-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stdpage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stdpage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-storebox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-storebox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-storecmd-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-storecmd-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stringstrings-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stringstrings-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sttools-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sttools-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stubs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stubs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-studenthandouts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-studenthandouts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subdepth-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subdepth-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subdocs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subdocs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subeqn-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subeqn-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subeqnarray-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subeqnarray-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfigmat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfigmat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfigure-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfigure-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfiles-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfiles-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfloat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfloat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-substitutefont-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-substitutefont-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-substr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-substr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-supertabular-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-supertabular-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svgcolor-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svgcolor-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn-multi-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn-multi-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn-prov-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn-prov-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-syntax-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-syntax-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-syntrace-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-syntrace-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-synttree-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-synttree-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabfigures-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabfigures-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tableaux-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tableaux-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablefootnote-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablefootnote-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tableof-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tableof-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablestyles-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablestyles-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablists-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablists-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabls-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabls-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablvar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablvar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabstackengine-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabstackengine-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabto-ltx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabto-ltx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabu-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabu-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabularborder-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabularborder-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabularcalc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabularcalc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabularew-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabularew-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabulary-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabulary-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tagging-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tagging-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tagpair-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tagpair-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tagpdf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tagpdf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-talk-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-talk-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tamefloats-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tamefloats-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tasks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tasks-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tcldoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tcldoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tcolorbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tcolorbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tdclock-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tdclock-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-technics-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-technics-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ted-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ted-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-templatetools-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-templatetools-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termcal-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termcal-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termlist-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termlist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-testhyphens-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-testhyphens-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-testidx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-testidx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-label-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-label-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-locale-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-locale-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlogos-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlogos-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texmate-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texmate-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texments-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texments-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texpower-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texpower-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texshade-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texshade-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texvc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texvc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textfit-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textfit-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textmerg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textmerg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textpos-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textpos-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textualicomma-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textualicomma-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-theoremref-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-theoremref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thinsp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thinsp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thmtools-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thmtools-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threadcol-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threadcol-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threeparttable-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threeparttable-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threeparttablex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threeparttablex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumb-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumbs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumbs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumby-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumby-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ticket-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ticket-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlecaps-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlecaps-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlefoot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlefoot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlepic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlepic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titleref-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titleref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlesec-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlesec-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titling-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titling-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocbibind-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocbibind-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocdata-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocdata-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocloft-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocloft-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocvsec2-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocvsec2-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-todo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-todo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-todonotes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-todonotes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tokcycle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tokcycle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tokenizer-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tokenizer-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-toolbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-toolbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-topfloat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-topfloat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-topiclongtable-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-topiclongtable-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-totcount-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-totcount-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-totpages-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-totpages-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translations-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translations-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-transparent-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-transparent-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trfsigns-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trfsigns-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trimspaces-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trimspaces-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trivfloat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trivfloat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trsym-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trsym-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-truncate-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-truncate-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tucv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tucv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turnthepage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turnthepage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-twoinone-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-twoinone-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-twoup-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-twoup-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-txgreeks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-txgreeks-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-type1cm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-type1cm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typed-checklist-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typed-checklist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typeface-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typeface-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typoaid-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typoaid-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typogrid-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typogrid-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uassign-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uassign-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uebungsblatt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uebungsblatt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umoline-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umoline-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-underlin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-underlin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-underoverlap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-underoverlap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-undolabl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-undolabl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-units-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-units-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unravel-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unravel-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-upmethodology-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-upmethodology-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-upquote-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-upquote-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uri-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uri-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ushort-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ushort-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uspace-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uspace-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uwmslide-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uwmslide-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-variablelm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-variablelm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-varindex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-varindex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-varsfromjobname-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-varsfromjobname-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-varwidth-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-varwidth-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vdmlisting-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vdmlisting-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbasef-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbasef-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbatimbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbatimbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbatimcopy-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbatimcopy-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbdef-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbdef-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbments-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbments-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-version-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-version-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-versions-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-versions-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-versonotes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-versonotes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vertbars-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vertbars-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vgrid-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vgrid-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vhistory-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vhistory-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vmargin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vmargin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-volumes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-volumes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vpe-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vpe-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vruler-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vruler-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vtable-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vtable-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vwcol-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vwcol-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wallcalendar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wallcalendar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wallpaper-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wallpaper-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-warning-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-warning-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-warpcol-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-warpcol-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-was-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-was-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-webquiz-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-webquiz-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-widetable-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-widetable-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-widows-and-orphans-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-widows-and-orphans-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-williams-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-williams-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-withargs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-withargs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wordcount-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wordcount-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wordlike-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wordlike-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-worksheet-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-worksheet-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wrapfig-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wrapfig-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wtref-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wtref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xargs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xargs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xassoccnt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xassoccnt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xbmks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xbmks-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcntperchap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcntperchap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcolor-material-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcolor-material-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcolor-solarized-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcolor-solarized-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcomment-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcomment-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcookybooky-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcookybooky-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcpdftips-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcpdftips-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xdoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xdoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xellipsis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xellipsis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xfakebold-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xfakebold-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xfor-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xfor-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xhfill-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xhfill-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xifthen-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xifthen-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xint-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xint-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xkcdcolors-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xkcdcolors-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xltabular-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xltabular-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xmpincl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xmpincl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xnewcommand-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xnewcommand-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xoptarg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xoptarg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpatch-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpatch-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpeek-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpeek-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xprintlen-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xprintlen-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpunctuate-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpunctuate-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xsavebox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xsavebox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xsim-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xsim-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xstring-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xstring-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xtab-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xtab-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xurl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xurl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xwatermark-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xwatermark-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xytree-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xytree-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yafoot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yafoot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yaletter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yaletter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yagusylo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yagusylo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ycbook-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ycbook-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ydoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ydoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yplan-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yplan-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zebra-goodies-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zebra-goodies-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zed-csp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zed-csp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ziffer-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ziffer-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zref-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zwgetfdate-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zwgetfdate-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zwpagelayout-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zwpagelayout-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-latexextra-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-latexextra-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-2up.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-2up.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ESIEEcv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ESIEEcv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-GS1.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-GS1.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-HA-prosper.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-HA-prosper.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-Tabbing.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-Tabbing.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-a0poster.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-a0poster.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-a4wide.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-a4wide.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-a5comb.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-a5comb.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abraces.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abraces.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abstract.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abstract.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accessibility.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accessibility.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accsupp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accsupp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-achemso.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-achemso.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acro.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acro.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acronym.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acronym.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acroterm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acroterm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-actuarialangle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-actuarialangle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-actuarialsymbol.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-actuarialsymbol.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-addfont.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-addfont.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-addlines.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-addlines.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adjmulticol.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adjmulticol.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adjustbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adjustbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adrconv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adrconv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-advdate.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-advdate.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-akktex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-akktex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-akletter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-akletter.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alertmessage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alertmessage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alnumsec.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alnumsec.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alphalph.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alphalph.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-altfont.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-altfont.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsaddr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsaddr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-animate.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-animate.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anonchap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anonchap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-answers.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-answers.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anyfontsize.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anyfontsize.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-appendix.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-appendix.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-appendixnumberbeamer.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-appendixnumberbeamer.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apptools.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apptools.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabicfront.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabicfront.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arcs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arcs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arraycols.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arraycols.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arrayjobx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arrayjobx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arraysort.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arraysort.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arydshln.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arydshln.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asciilist.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asciilist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-askinclude.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-askinclude.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-assignment.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-assignment.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-assoccnt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-assoccnt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-atenddvi.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-atenddvi.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-attachfile.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-attachfile.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aurl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aurl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-authoraftertitle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-authoraftertitle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-authorarchive.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-authorarchive.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-authorindex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-authorindex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autofancyhdr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autofancyhdr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autonum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autonum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autopdf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autopdf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-avremu.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-avremu.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-axessibility.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-axessibility.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-background.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-background.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bankstatement.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bankstatement.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bashful.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bashful.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-basicarith.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-basicarith.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bchart.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bchart.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer2thesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer2thesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer-rl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer-rl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beameraudience.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beameraudience.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerauxtheme.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerauxtheme.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamercolorthemeowl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamercolorthemeowl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerdarkthemes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerdarkthemes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerposter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerposter.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamersubframe.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamersubframe.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-cuerna.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-cuerna.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-detlevcm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-detlevcm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-epyt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-epyt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-focus.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-focus.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-light.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-light.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-metropolis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-metropolis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-npbt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-npbt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-phnompenh.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-phnompenh.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-saintpetersburg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-saintpetersburg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-upenn-bc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-upenn-bc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerthemenirma.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerthemenirma.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bearwear.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bearwear.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beton.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beton.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bewerbung.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bewerbung.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bez123.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bez123.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bhcexam.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bhcexam.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibletext.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibletext.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bigfoot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bigfoot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bigints.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bigints.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biochemistry-colors.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biochemistry-colors.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bizcard.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bizcard.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blindtext.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blindtext.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blkarray.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blkarray.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-block.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-block.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blowup.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blowup.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bnumexpr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bnumexpr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boites.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boites.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bold-extra.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bold-extra.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookcover.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookcover.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookest.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookest.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-booklet.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-booklet.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boolexpr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boolexpr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bophook.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bophook.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boxedminipage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boxedminipage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boxedminipage2e.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boxedminipage2e.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boxhandler.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boxhandler.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bracketkey.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bracketkey.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-braket.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-braket.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-breakurl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-breakurl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bullcntr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bullcntr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxcalc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxcalc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxdpx-beamer.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxdpx-beamer.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxdvidriver.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxdvidriver.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxenclose.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxenclose.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxnewfont.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxnewfont.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxpapersize.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxpapersize.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxpdfver.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxpdfver.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxtexlogo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxtexlogo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calcage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calcage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calctab.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calctab.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calculator.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calculator.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calrsfs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calrsfs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cals.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cals.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calxxxx-yyyy.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calxxxx-yyyy.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cancel.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cancel.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-canoniclayout.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-canoniclayout.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-capt-of.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-capt-of.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-captcont.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-captcont.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-captdef.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-captdef.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-carbohydrates.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-carbohydrates.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cases.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cases.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-casyl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-casyl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catchfile.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catchfile.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catchfilebetweentags.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catchfilebetweentags.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catechis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catechis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catoptions.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catoptions.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cbcoptic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cbcoptic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ccaption.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ccaption.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cclicenses.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cclicenses.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cd.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cd.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cd-cover.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cd-cover.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cdpbundl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cdpbundl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cellprops.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cellprops.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cellspace.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cellspace.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-censor.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-censor.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-centeredline.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-centeredline.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changebar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changebar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changelayout.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changelayout.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changelog.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changelog.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changepage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changepage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chappg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chappg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chapterfolder.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chapterfolder.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cheatsheet.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cheatsheet.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-checkend.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-checkend.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chet.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chet.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chextras.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chextras.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-childdoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-childdoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chkfloat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chkfloat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chletter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chletter.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chngcntr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chngcntr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chronology.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chronology.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circ.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circ.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circledsteps.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circledsteps.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-classics.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-classics.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-classpack.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-classpack.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clefval.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clefval.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cleveref.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cleveref.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clipboard.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clipboard.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clock.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clock.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cloze.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cloze.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clrdblpg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clrdblpg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clrstrip.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clrstrip.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmdstring.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmdstring.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmdtrack.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmdtrack.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmsd.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmsd.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cnltx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cnltx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cntformats.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cntformats.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cntperchap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cntperchap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codedoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codedoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codepage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codepage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codesection.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codesection.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collcell.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collcell.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collectbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collectbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colophon.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colophon.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colordoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colordoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorinfo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorinfo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coloring.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coloring.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorspace.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorspace.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colortab.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colortab.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorwav.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorwav.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorweb.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorweb.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colourchange.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colourchange.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combelow.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combelow.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combine.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combine.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comma.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comma.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-commado.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-commado.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-commedit.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-commedit.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comment.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comment.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-competences.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-competences.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-concepts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-concepts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-concprog.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-concprog.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-constants.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-constants.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-continue.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-continue.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-contour.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-contour.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-contracard.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-contracard.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-conv-xkv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-conv-xkv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooking.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooking.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooking-units.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooking-units.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cool.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cool.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coollist.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coollist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coolstr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coolstr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coolthms.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coolthms.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooltooltips.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooltooltips.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coordsys.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coordsys.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-copyedit.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-copyedit.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-copyrightbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-copyrightbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coseoul.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coseoul.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-counttexruns.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-counttexruns.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-courseoutline.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-courseoutline.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coursepaper.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coursepaper.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coverpage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coverpage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cprotect.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cprotect.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossreference.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossreference.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossreftools.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossreftools.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csquotes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csquotes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-css-colors.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-css-colors.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csvmerge.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csvmerge.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csvsimple.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csvsimple.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cuisine.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cuisine.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currency.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currency.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currfile.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currfile.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cutwin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cutwin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cv4tw.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cv4tw.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cweb-latex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cweb-latex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyber.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyber.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cybercic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cybercic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashrule.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashrule.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashundergaps.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashundergaps.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dataref.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dataref.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datatool.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datatool.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dateiliste.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dateiliste.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datenumber.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datenumber.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-bahasai.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-bahasai.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-basque.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-basque.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-breton.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-breton.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-bulgarian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-bulgarian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-catalan.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-catalan.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-croatian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-croatian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-czech.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-czech.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-danish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-danish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-dutch.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-dutch.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-en-fulltext.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-en-fulltext.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-english.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-english.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-esperanto.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-esperanto.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-estonian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-estonian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-finnish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-finnish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-french.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-french.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-galician.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-galician.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-german.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-german.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-greek.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-greek.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-hebrew.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-hebrew.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-icelandic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-icelandic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-irish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-irish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-italian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-italian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-it-fulltext.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-it-fulltext.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-latin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-latin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-lsorbian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-lsorbian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-magyar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-magyar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-norsk.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-norsk.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-polish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-polish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-portuges.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-portuges.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-romanian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-romanian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-russian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-russian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-samin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-samin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-scottish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-scottish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-serbian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-serbian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-slovak.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-slovak.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-slovene.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-slovene.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-spanish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-spanish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-swedish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-swedish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-turkish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-turkish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-ukrainian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-ukrainian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-usorbian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-usorbian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-welsh.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-welsh.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dblfloatfix.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dblfloatfix.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-decimal.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-decimal.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-decorule.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-decorule.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-delimtxt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-delimtxt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-denisbdoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-denisbdoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diagbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diagbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diagnose.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diagnose.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dialogl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dialogl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dichokey.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dichokey.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dinbrief.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dinbrief.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-directory.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-directory.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dirtytalk.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dirtytalk.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dlfltxb.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dlfltxb.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dnaseq.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dnaseq.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doclicense.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doclicense.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docmfp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docmfp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docmute.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docmute.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doctools.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doctools.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-documentation.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-documentation.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doi.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doi.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dotarrow.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dotarrow.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dotlessi.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dotlessi.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dotseqn.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dotseqn.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-download.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-download.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dpfloat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dpfloat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dprogress.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dprogress.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drac.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drac.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-draftcopy.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-draftcopy.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-draftfigure.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-draftfigure.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-draftwatermark.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-draftwatermark.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtk.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtk.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxdescribe.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtxdescribe.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxgallery.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtxgallery.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-duckuments.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-duckuments.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ducksay.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ducksay.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvdcoll.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dvdcoll.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dynamicnumber.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dynamicnumber.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dynblocks.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dynblocks.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ean13isbn.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ean13isbn.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easy.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easy.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easy-todo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easy-todo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyfig.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyfig.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyformat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyformat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easylist.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easylist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyreview.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyreview.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebezier.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebezier.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecclesiastic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecclesiastic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ed.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ed.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-edmargin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-edmargin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eemeir.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eemeir.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-efbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-efbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-egplot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-egplot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ehhline.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ehhline.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elegantbook.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elegantbook.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elegantnote.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elegantnote.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elegantpaper.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elegantpaper.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elements.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elements.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ellipsis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ellipsis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elmath.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elmath.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elocalloc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elocalloc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elpres.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elpres.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elzcards.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elzcards.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emarks.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emarks.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-embedall.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-embedall.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-embedfile.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-embedfile.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-embrac.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-embrac.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emptypage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emptypage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emulateapj.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emulateapj.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endfloat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endfloat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endheads.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endheads.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endnotes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endnotes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-engpron.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-engpron.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-engrec.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-engrec.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enotez.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enotez.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enumitem.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enumitem.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enumitem-zref.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enumitem-zref.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-envbig.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-envbig.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-environ.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-environ.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epigraph.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epigraph.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epiolmec.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epiolmec.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqell.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqell.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqlist.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqlist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqnalign.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqnalign.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqparbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqparbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-errata.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-errata.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erw-l3.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erw-l3.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esami.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esami.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esdiff.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esdiff.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esindex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esindex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esint.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esint.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esint-type1.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esint-type1.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etaremune.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etaremune.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etextools.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etextools.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eukdate.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eukdate.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eulerpx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eulerpx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-europasscv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-europasscv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-everyhook.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-everyhook.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-everypage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-everypage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exam.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exam.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exam-n.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exam-n.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exam-randomizechoices.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exam-randomizechoices.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-examdesign.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-examdesign.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exframe.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exframe.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-examplep.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-examplep.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exceltex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exceltex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-excludeonly.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-excludeonly.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercise.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercise.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercisebank.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercisebank.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercisepoints.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercisepoints.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercises.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercises.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exp-testopt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exp-testopt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expdlist.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expdlist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-export.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-export.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exsheets.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exsheets.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exsol.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exsol.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-extract.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-extract.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-facsimile.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-facsimile.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-factura.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-factura.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyhandout.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyhandout.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancylabel.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancylabel.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancynum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancynum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancypar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancypar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyslides.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyslides.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancytabs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancytabs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancytooltips.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancytooltips.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fcolumn.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fcolumn.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fetchcls.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fetchcls.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fewerfloatpages.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fewerfloatpages.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ffslides.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ffslides.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fgruler.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fgruler.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fibeamer.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fibeamer.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fifo-stack.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fifo-stack.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-figsize.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-figsize.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filecontents.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filecontents.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filecontentsdef.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filecontentsdef.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filedate.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filedate.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fileinfo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fileinfo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filemod.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filemod.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fink.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fink.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-finstrut.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-finstrut.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fithesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fithesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixcmex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixcmex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixfoot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixfoot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixme.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixme.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixmetodonotes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixmetodonotes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fjodor.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fjodor.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flabels.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flabels.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flacards.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flacards.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flagderiv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flagderiv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flashcards.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flashcards.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flashmovie.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flashmovie.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flipbook.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flipbook.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flippdf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flippdf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-floatflt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-floatflt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-floatrow.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-floatrow.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flowfram.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flowfram.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fmp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fmp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fmtcount.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fmtcount.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fn2end.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fn2end.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnbreak.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnbreak.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fncychap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fncychap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fncylab.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fncylab.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnpara.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnpara.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnpct.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnpct.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnumprint.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnumprint.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-foilhtml.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-foilhtml.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontaxes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontaxes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontsetup.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontsetup.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontsize.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontsize.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonttable.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonttable.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footmisc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footmisc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footmisx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footmisx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnotebackref.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnotebackref.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnoterange.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnoterange.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnpag.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnpag.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forarray.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forarray.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-foreign.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-foreign.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forloop.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forloop.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-formlett.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-formlett.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forms16be.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forms16be.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-formular.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-formular.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fragments.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fragments.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frame.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frame.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-framed.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-framed.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frankenstein.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frankenstein.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frege.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frege.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ftcap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ftcap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ftnxtra.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ftnxtra.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fullblck.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fullblck.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fullminipage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fullminipage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fullwidth.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fullwidth.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fundus-calligra.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fundus-calligra.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fundus-sueterlin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fundus-sueterlin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fvextra.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fvextra.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fwlw.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fwlw.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gatherenum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gatherenum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gauss.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gauss.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gcard.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gcard.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gcite.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gcite.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gender.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gender.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-genmpage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-genmpage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-getfiledate.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-getfiledate.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-getitems.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-getitems.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gindex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gindex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ginpenc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ginpenc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitfile-info.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitfile-info.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitinfo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitinfo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitinfo2.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitinfo2.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitlog.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitlog.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitver.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitver.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-globalvals.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-globalvals.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gloss.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gloss.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-danish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-danish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-dutch.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-dutch.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-english.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-english.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-estonian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-estonian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-extra.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-extra.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-finnish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-finnish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-french.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-french.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-german.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-german.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-irish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-irish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-italian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-italian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-magyar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-magyar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-polish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-polish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-portuges.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-portuges.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-serbian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-serbian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-slovene.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-slovene.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-spanish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-spanish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmdoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmdoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmdoc-enhance.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmdoc-enhance.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmiflink.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmiflink.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmutils.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmutils.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmverb.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmverb.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grabbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grabbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphicx-psmin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphicx-psmin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphicxbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphicxbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grayhints.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grayhints.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grfpaste.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grfpaste.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grid.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grid.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grid-system.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grid-system.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gridset.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gridset.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gridslides.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gridslides.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitlogo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitlogo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-halloweenmath.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-halloweenmath.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hackthefootline.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hackthefootline.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-handin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-handin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-handout.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-handout.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hang.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hang.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hanging.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hanging.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hardwrap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hardwrap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harnon-cv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harnon-cv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harpoon.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harpoon.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-he-she.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-he-she.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hhtensor.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hhtensor.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-histogr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-histogr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hitec.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hitec.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hletter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hletter.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hobsub.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hobsub.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hpsdiss.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hpsdiss.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hrefhide.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hrefhide.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hvindex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hvindex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hvqrurl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hvqrurl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hypdvips.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hypdvips.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyper.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyper.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyperbar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyperbar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hypernat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hypernat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyperxmp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyperxmp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphenat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphenat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-identkey.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-identkey.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-idxcmds.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-idxcmds.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-idxlayout.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-idxlayout.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iffont.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iffont.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifmslide.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifmslide.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifmtarg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifmtarg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifnextok.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifnextok.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifoddpage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifoddpage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifthenx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifthenx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iitem.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iitem.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-image-gallery.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-image-gallery.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imakeidx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imakeidx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-import.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-import.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-incgraph.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-incgraph.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-indextools.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-indextools.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inline-images.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inline-images.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inlinedef.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inlinedef.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inputenx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inputenx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inputtrc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inputtrc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interactiveworkbook.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interactiveworkbook.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interfaces.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interfaces.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-intopdf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-intopdf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inversepath.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inversepath.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-invoice.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-invoice.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-invoice-class.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-invoice-class.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-invoice2.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-invoice2.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iso.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iso.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iso10303.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iso10303.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isodate.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isodate.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isodoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isodoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isonums.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isonums.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isopt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isopt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isorot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isorot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isotope.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isotope.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-issuulinks.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-issuulinks.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iwhdp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iwhdp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jlabels.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jlabels.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jslectureplanner.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jslectureplanner.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jumplines.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jumplines.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jvlisting.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jvlisting.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kalendarium.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kalendarium.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kantlipsum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kantlipsum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kerntest.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kerntest.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keycommand.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keycommand.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyfloat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyfloat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyreader.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyreader.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyindex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyindex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keystroke.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keystroke.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyval2e.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyval2e.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyvaltable.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyvaltable.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kix.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kix.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knowledge.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knowledge.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-koma-moderncvclassic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-koma-moderncvclassic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-koma-script-sfs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-koma-script-sfs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-komacv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-komacv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-komacv-rg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-komacv-rg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ktv-texdata.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ktv-texdata.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3build.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3build.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labbook.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labbook.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labels.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labels.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labels4easylist.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labels4easylist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labelschanged.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labelschanged.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lastpackage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lastpackage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lastpage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lastpage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-amsmath-dev.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-amsmath-dev.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-base-dev.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-base-dev.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-bin-dev.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-bin-dev.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-graphics-dev.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-graphics-dev.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-tds.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-tds.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-tools-dev.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-tools-dev.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-uni8.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-uni8.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcolors.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcolors.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexdemo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexdemo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexgit.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexgit.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-layouts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-layouts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lazylist.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lazylist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lccaps.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lccaps.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcd.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcd.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leading.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leading.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lectures.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lectures.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leftidx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leftidx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leipzig.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leipzig.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lengthconvert.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lengthconvert.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lettre.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lettre.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lettrine.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lettrine.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lewis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lewis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lhelp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lhelp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libgreek.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libgreek.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-limap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-limap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linegoal.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linegoal.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linop.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linop.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lipsum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lipsum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lisp-on-tex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lisp-on-tex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listing.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listing.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listingsutf8.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listingsutf8.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listlbls.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listlbls.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listliketab.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listliketab.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listofsymbols.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listofsymbols.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lkproof.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lkproof.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lmake.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lmake.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-locality.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-locality.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-localloc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-localloc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logical-markup-utils.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logical-markup-utils.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logpap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logpap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longfbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longfbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longfigure.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longfigure.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longnamefilelist.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longnamefilelist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-loops.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-loops.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lsc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lsc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lstaddons.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lstaddons.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lstfiracode.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lstfiracode.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lt3graph.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lt3graph.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltablex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltablex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltabptch.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltabptch.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxdockit.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxdockit.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxguidex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxguidex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxkeys.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxkeys.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxnew.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxnew.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxtools.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxtools.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-check-hyphen.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-check-hyphen.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatodonotes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatodonotes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-macroswap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-macroswap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-magaz.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-magaz.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-magicnum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-magicnum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecookbook.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecookbook.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makerobust.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makerobust.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mailing.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mailing.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mailmerge.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mailmerge.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makebarcode.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makebarcode.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makebase.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makebase.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makebox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makebox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecell.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecell.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecirc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecirc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecmds.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecmds.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makedtx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makedtx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makeglos.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makeglos.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mandi.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mandi.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-manuscript.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-manuscript.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-manyind.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-manyind.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginfit.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginfit.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginfix.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginfix.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginnote.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginnote.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-markdown.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-markdown.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathalpha.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathalpha.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathastext.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathastext.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathexam.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathexam.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathfam256.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathfam256.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathfont.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathfont.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-maybemath.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-maybemath.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcaption.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcaption.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mceinleger.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mceinleger.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcexam.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcexam.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcite.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcite.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mciteplus.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mciteplus.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdframed.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdframed.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-media9.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-media9.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-medstarbeamer.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-medstarbeamer.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-meetingmins.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-meetingmins.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memexsupp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memexsupp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memory.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memory.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mensa-tex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mensa-tex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-menu.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-menu.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-menukeys.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-menukeys.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metalogox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metalogox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metastr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metastr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-method.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-method.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metre.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metre.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfirstuc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfirstuc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mftinc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mftinc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mi-solns.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mi-solns.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-midpage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-midpage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minibox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minibox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minidocument.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minidocument.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minifp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minifp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minipage-marginpar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minipage-marginpar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minitoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minitoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minorrevision.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minorrevision.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minted.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minted.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minutes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minutes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mla-paper.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mla-paper.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mleftright.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mleftright.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mlist.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mlist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mmap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mmap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mnotes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mnotes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moderncv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moderncv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modernposter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modernposter.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moderntimeline.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moderntimeline.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modref.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modref.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modroman.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modroman.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modular.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modular.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-monofill.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-monofill.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moodle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moodle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moreenum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moreenum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morefloats.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morefloats.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morehype.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morehype.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moresize.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moresize.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moreverb.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moreverb.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morewrites.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morewrites.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-movie15.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-movie15.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mparhack.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mparhack.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpostinl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpostinl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-msc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-msc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-msg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-msg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mslapa.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mslapa.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mtgreek.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mtgreek.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multenum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multenum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multiaudience.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multiaudience.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multibbl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multibbl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multicap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multicap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multicolrule.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multicolrule.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multidef.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multidef.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multienv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multienv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multiexpand.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multiexpand.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multilang.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multilang.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multirow.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multirow.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mversion.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mversion.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mwe.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mwe.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mycv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mycv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mylatexformat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mylatexformat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nag.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nag.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nameauth.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nameauth.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-namespc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-namespc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ncclatex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ncclatex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ncctools.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ncctools.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-needspace.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-needspace.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newcommand.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newcommand.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newenviron.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newenviron.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newfile.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newfile.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newlfm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newlfm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newspaper.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newspaper.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newunicodechar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newunicodechar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newvbtm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newvbtm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newverbs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newverbs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nfssext-cfr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nfssext-cfr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nicefilelist.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nicefilelist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-niceframe.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-niceframe.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nicetext.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nicetext.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nidanfloat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nidanfloat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nlctdoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nlctdoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noconflict.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noconflict.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noindentafter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noindentafter.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noitcrul.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noitcrul.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nolbreaks.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nolbreaks.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nomencl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nomencl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nomentbl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nomentbl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nonfloat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nonfloat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nonumonpart.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nonumonpart.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nopageno.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nopageno.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-normalcolor.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-normalcolor.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notespages.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notespages.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notestex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notestex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notoccite.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notoccite.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nowidow.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nowidow.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ntheorem.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ntheorem.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numberedblock.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numberedblock.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numname.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numname.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numprint.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numprint.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numspell.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numspell.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocg-p.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocg-p.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocgx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocgx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocgx2.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocgx2.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocr-latex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocr-latex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-octavo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-octavo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oldstyle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oldstyle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-onlyamsmath.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-onlyamsmath.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-opcit.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-opcit.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-optidef.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-optidef.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-optional.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-optional.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-options.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-options.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outline.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outline.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outliner.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outliner.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outlines.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outlines.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outlining.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outlining.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-overlays.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-overlays.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-overpic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-overpic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-padcount.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-padcount.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagecolor.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagecolor.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagecont.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagecont.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagenote.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagenote.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagerange.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagerange.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pageslts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pageslts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paper.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paper.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papercdcase.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papercdcase.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papermas.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papermas.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papertex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papertex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paracol.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paracol.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parades.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parades.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paralist.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paralist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paresse.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paresse.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parnotes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parnotes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parsa.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parsa.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parselines.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parselines.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pas-cours.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pas-cours.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pas-cv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pas-cv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pas-tableur.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pas-tableur.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patchcmd.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-patchcmd.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pauldoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pauldoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pawpict.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pawpict.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbsheet.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbsheet.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdf14.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdf14.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcolmk.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfcolmk.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcomment.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfcomment.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcprot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfcprot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfmarginpar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfmarginpar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfoverlay.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfoverlay.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpagediff.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpagediff.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpc-movie.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpc-movie.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfprivacy.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfprivacy.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfreview.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfreview.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfscreen.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfscreen.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfslide.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfslide.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfsync.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfsync.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfwin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfwin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pecha.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pecha.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-perltex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-perltex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-permute.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-permute.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-petiteannonce.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-petiteannonce.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phffullpagefigure.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phffullpagefigure.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfnote.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfnote.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfparen.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfparen.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfqit.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfqit.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfquotetext.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfquotetext.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfsvnwatermark.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfsvnwatermark.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfthm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfthm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-philex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-philex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phonenumbers.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phonenumbers.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-photo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-photo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-picture.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-picture.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-piff.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-piff.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pkgloader.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pkgloader.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-placeins.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-placeins.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plantslabels.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plantslabels.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plates.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plates.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plweb.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plweb.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmboxdraw.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmboxdraw.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polynom.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polynom.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polynomial.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polynomial.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polytable.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polytable.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-postcards.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-postcards.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poster-mac.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poster-mac.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-powerdot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-powerdot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ppr-prv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ppr-prv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-practicalreports.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-practicalreports.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-preprint.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-preprint.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pressrelease.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pressrelease.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prettyref.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prettyref.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-preview.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-preview.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-printlen.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-printlen.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-probsoln.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-probsoln.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-program.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-program.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-progress.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-progress.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-progressbar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-progressbar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proofread.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proofread.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-properties.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-properties.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prosper.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prosper.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-protex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-protex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-protocol.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-protocol.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psfragx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psfragx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pstool.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pstool.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pstring.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pstring.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxgreeks.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxgreeks.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pygmentex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pygmentex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-python.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-python.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qcm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qcm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qstest.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qstest.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qsymbols.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qsymbols.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quicktype.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quicktype.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quiz2socrative.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quiz2socrative.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quotchap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quotchap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quoting.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quoting.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quotmark.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quotmark.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ran_toks.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ran_toks.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randtext.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randtext.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rccol.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rccol.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rcs-multi.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rcs-multi.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rcsinfo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rcsinfo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-readarray.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-readarray.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realboxes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realboxes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recipe.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recipe.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recipebook.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recipebook.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recipecard.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recipecard.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rectopma.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rectopma.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refcheck.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refcheck.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refenums.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refenums.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reflectgraphics.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reflectgraphics.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refman.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refman.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refstyle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refstyle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regcount.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regcount.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regexpatch.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regexpatch.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-register.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-register.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regstats.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regstats.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-relenc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-relenc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-relsize.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-relsize.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-repeatindex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-repeatindex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-repltext.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-repltext.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-returntogrid.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-returntogrid.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rgltxdoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rgltxdoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rjlparshap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rjlparshap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rlepsf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rlepsf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rmpage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rmpage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-robustcommand.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-robustcommand.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-robustindex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-robustindex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romanbar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romanbar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romanbarpagenumber.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romanbarpagenumber.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romanneg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romanneg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romannum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romannum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rotfloat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rotfloat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rotpages.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rotpages.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-roundbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-roundbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rterface.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rterface.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rtkinenc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rtkinenc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rulerbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rulerbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rulercompass.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rulercompass.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rvwrite.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rvwrite.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sanitize-umlaut.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sanitize-umlaut.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sauerj.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sauerj.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-savefnmark.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-savefnmark.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-savetrees.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-savetrees.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scale.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scale.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scalebar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scalebar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scalerel.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scalerel.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scanpages.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scanpages.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schedule.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schedule.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scontents.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scontents.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scrlttr2copy.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scrlttr2copy.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sdaps.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sdaps.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sdrt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sdrt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-secdot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-secdot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-secnum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-secnum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sectionbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sectionbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sectionbreak.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sectionbreak.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sectsty.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sectsty.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seealso.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seealso.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-selectp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-selectp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-selinput.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-selinput.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semantic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semantic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semantic-markup.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semantic-markup.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semioneside.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semioneside.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semproc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semproc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sepfootnotes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sepfootnotes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seqsplit.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seqsplit.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sesstime.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sesstime.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sf298.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sf298.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sffms.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sffms.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shadethm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shadethm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shadow.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shadow.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shadowtext.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shadowtext.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shapepar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shapepar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shdoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shdoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shipunov.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shipunov.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shorttoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shorttoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-show2e.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-show2e.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showcharinbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showcharinbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showdim.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showdim.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showexpl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showexpl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showhyphens.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showhyphens.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showlabels.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showlabels.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sidecap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sidecap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sidenotes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sidenotes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-silence.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-silence.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplecd.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplecd.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplecv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplecv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simpleinvoice.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simpleinvoice.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sitem.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sitem.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skb.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skb.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skdoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skdoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skeycommand.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skeycommand.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skeyval.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skeyval.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skrapport.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skrapport.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-slantsc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-slantsc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smalltableof.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smalltableof.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smartunits.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smartunits.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smartref.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smartref.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-snapshot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-snapshot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-snotez.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-snotez.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soul.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soul.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soulpos.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soulpos.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soulutf8.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soulutf8.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spacingtricks.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spacingtricks.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spark-otf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spark-otf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sparklines.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sparklines.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sphack.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sphack.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-splitindex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-splitindex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spotcolor.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spotcolor.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spreadtab.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spreadtab.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spverbatim.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spverbatim.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srbook-mem.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-srbook-mem.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srcltx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-srcltx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sseq.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sseq.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sslides.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sslides.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stackengine.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stackengine.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-standalone.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-standalone.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stdclsdv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stdclsdv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stealcaps.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stealcaps.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stdpage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stdpage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-storebox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-storebox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-storecmd.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-storecmd.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stringstrings.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stringstrings.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sttools.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sttools.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stubs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stubs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-studenthandouts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-studenthandouts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subdepth.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subdepth.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subdocs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subdocs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subeqn.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subeqn.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subeqnarray.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subeqnarray.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfigmat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfigmat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfigure.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfigure.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfiles.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfiles.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfloat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfloat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-substitutefont.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-substitutefont.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-substr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-substr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-supertabular.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-supertabular.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svgcolor.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svgcolor.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn-multi.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn-multi.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn-prov.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn-prov.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-syntax.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-syntax.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-syntrace.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-syntrace.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-synttree.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-synttree.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabfigures.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabfigures.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tableaux.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tableaux.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablefootnote.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablefootnote.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tableof.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tableof.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablestyles.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablestyles.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablists.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablists.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabls.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabls.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablvar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablvar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabstackengine.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabstackengine.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabto-ltx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabto-ltx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabu.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabu.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabularborder.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabularborder.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabularcalc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabularcalc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabularew.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabularew.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabulary.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabulary.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tagging.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tagging.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tagpair.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tagpair.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tagpdf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tagpdf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-talk.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-talk.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tamefloats.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tamefloats.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tasks.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tasks.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tcldoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tcldoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tcolorbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tcolorbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tdclock.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tdclock.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-technics.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-technics.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ted.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ted.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-templatetools.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-templatetools.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termcal.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termcal.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termlist.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termlist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-testhyphens.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-testhyphens.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-testidx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-testidx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-label.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-label.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-locale.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-locale.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texmate.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texmate.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texments.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texments.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texpower.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texpower.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texshade.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texshade.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texvc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texvc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textfit.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textfit.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textmerg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textmerg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textpos.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textpos.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textualicomma.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textualicomma.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-theoremref.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-theoremref.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thinsp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thinsp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thmtools.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thmtools.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threadcol.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threadcol.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threeparttable.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threeparttable.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threeparttablex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threeparttablex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumb.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumb.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumbs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumbs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumby.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumby.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ticket.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ticket.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlecaps.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlecaps.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlepic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlepic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titleref.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titleref.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlesec.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlesec.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titling.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titling.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocbibind.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocbibind.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocdata.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocdata.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocloft.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocloft.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocvsec2.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocvsec2.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-todo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-todo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-todonotes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-todonotes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tokcycle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tokcycle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tokenizer.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tokenizer.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-toolbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-toolbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-topfloat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-topfloat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-topiclongtable.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-topiclongtable.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-totcount.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-totcount.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-totpages.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-totpages.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translations.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translations.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-transparent.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-transparent.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trfsigns.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trfsigns.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trimspaces.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trimspaces.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trivfloat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trivfloat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trsym.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trsym.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-truncate.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-truncate.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tucv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tucv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turnthepage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turnthepage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-twoinone.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-twoinone.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-twoup.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-twoup.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-txgreeks.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-txgreeks.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-type1cm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-type1cm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typed-checklist.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typed-checklist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typeface.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typeface.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typoaid.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typoaid.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typogrid.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typogrid.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uassign.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uassign.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uebungsblatt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uebungsblatt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umoline.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umoline.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-underlin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-underlin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-underoverlap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-underoverlap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-undolabl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-undolabl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-units.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-units.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unravel.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unravel.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-upmethodology.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-upmethodology.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-upquote.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-upquote.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uri.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uri.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ushort.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ushort.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uspace.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uspace.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uwmslide.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uwmslide.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-variablelm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-variablelm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-varindex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-varindex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-varsfromjobname.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-varsfromjobname.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-varwidth.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-varwidth.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vdmlisting.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vdmlisting.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbasef.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbasef.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbatimbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbatimbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbatimcopy.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbatimcopy.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbdef.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbdef.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbments.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbments.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-version.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-version.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-versions.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-versions.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-versonotes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-versonotes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vertbars.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vertbars.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vgrid.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vgrid.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vhistory.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vhistory.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vmargin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vmargin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-volumes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-volumes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vpe.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vpe.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vruler.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vruler.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vtable.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vtable.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vwcol.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vwcol.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wallcalendar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wallcalendar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wallpaper.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wallpaper.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-warning.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-warning.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-warpcol.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-warpcol.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-was.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-was.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-webquiz.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-webquiz.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-widetable.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-widetable.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-widows-and-orphans.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-widows-and-orphans.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-williams.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-williams.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-withargs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-withargs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wordcount.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wordcount.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wordlike.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wordlike.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-worksheet.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-worksheet.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wrapfig.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wrapfig.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wtref.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wtref.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xargs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xargs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xassoccnt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xassoccnt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xbmks.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xbmks.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcntperchap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcntperchap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcolor-material.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcolor-material.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcolor-solarized.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcolor-solarized.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcomment.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcomment.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcookybooky.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcookybooky.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcpdftips.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcpdftips.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xdoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xdoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xellipsis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xellipsis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xfakebold.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xfakebold.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xfor.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xfor.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xhfill.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xhfill.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xifthen.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xifthen.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xint.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xint.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xkcdcolors.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xkcdcolors.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xltabular.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xltabular.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xmpincl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xmpincl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xnewcommand.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xnewcommand.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xoptarg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xoptarg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpatch.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpatch.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpeek.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpeek.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xprintlen.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xprintlen.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpunctuate.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpunctuate.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xsavebox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xsavebox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xsim.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xsim.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xstring.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xstring.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xtab.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xtab.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xurl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xurl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xwatermark.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xwatermark.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xytree.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xytree.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yafoot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yafoot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yaletter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yaletter.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yagusylo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yagusylo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ycbook.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ycbook.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ydoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ydoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yplan.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yplan.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zebra-goodies.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zebra-goodies.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zed-csp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zed-csp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ziffer.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ziffer.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zref.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zref.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zwgetfdate.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zwgetfdate.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zwpagelayout.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zwpagelayout.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ESIEEcv.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ESIEEcv.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-GS1.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-GS1.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-HA-prosper.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-HA-prosper.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-Tabbing.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-Tabbing.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abstract.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abstract.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accessibility.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accessibility.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accsupp.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accsupp.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-achemso.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-achemso.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acronym.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acronym.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acroterm.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acroterm.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-actuarialangle.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-actuarialangle.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-actuarialsymbol.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-actuarialsymbol.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-addlines.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-addlines.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adjmulticol.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adjmulticol.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adjustbox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adjustbox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adrconv.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adrconv.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alertmessage.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alertmessage.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alnumsec.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alnumsec.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alphalph.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alphalph.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-altfont.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-altfont.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsaddr.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsaddr.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-animate.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-animate.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-answers.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-answers.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-appendix.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-appendix.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apptools.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apptools.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arcs.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arcs.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arraycols.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arraycols.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arraysort.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arraysort.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arydshln.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arydshln.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asciilist.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asciilist.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-askinclude.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-askinclude.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-atenddvi.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-atenddvi.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-attachfile.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-attachfile.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autonum.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autonum.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autopdf.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autopdf.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-avremu.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-avremu.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-axessibility.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-axessibility.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-background.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-background.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-basicarith.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-basicarith.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamercolorthemeowl.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamercolorthemeowl.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamersubframe.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamersubframe.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-cuerna.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-cuerna.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-metropolis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-metropolis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-saintpetersburg.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-saintpetersburg.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bearwear.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bearwear.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beton.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beton.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bewerbung.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bewerbung.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bez123.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bez123.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bhcexam.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bhcexam.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bigfoot.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bigfoot.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bizcard.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bizcard.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blindtext.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blindtext.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blowup.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blowup.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bnumexpr.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bnumexpr.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boites.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boites.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookcover.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookcover.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-booklet.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-booklet.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boolexpr.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boolexpr.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bophook.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bophook.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boxedminipage2e.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boxedminipage2e.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boxhandler.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boxhandler.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-breakurl.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-breakurl.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bullcntr.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bullcntr.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calcage.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calcage.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calculator.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calculator.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cals.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cals.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-canoniclayout.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-canoniclayout.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-capt-of.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-capt-of.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-captcont.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-captcont.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catchfile.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catchfile.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catchfilebetweentags.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catchfilebetweentags.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catechis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catechis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ccaption.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ccaption.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cclicenses.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cclicenses.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cd.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cd.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cd-cover.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cd-cover.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cdpbundl.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cdpbundl.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cellprops.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cellprops.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changebar.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changebar.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changepage.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changepage.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changes.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changes.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chappg.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chappg.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chapterfolder.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chapterfolder.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cheatsheet.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cheatsheet.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chextras.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chextras.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-childdoc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-childdoc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chletter.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chletter.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circ.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circ.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-classpack.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-classpack.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clefval.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clefval.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cleveref.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cleveref.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cloze.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cloze.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clrdblpg.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clrdblpg.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clrstrip.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clrstrip.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmdtrack.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmdtrack.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codepage.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codepage.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codesection.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codesection.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collcell.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collcell.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collectbox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collectbox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colophon.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colophon.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colordoc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colordoc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorwav.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorwav.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorweb.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorweb.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combine.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combine.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-commado.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-commado.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-commedit.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-commedit.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-competences.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-competences.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-constants.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-constants.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-continue.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-continue.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-contour.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-contour.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-contracard.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-contracard.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-conv-xkv.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-conv-xkv.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooking.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooking.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooking-units.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooking-units.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cool.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cool.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coollist.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coollist.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coolstr.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coolstr.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coolthms.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coolthms.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooltooltips.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooltooltips.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coordsys.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coordsys.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-copyedit.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-copyedit.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-counttexruns.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-counttexruns.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coverpage.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coverpage.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cprotect.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cprotect.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossreference.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossreference.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csvmerge.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csvmerge.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cuisine.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cuisine.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currency.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currency.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currfile.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currfile.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cutwin.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cutwin.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyber.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyber.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cybercic.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cybercic.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashbox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashbox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashrule.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashrule.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashundergaps.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashundergaps.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datatool.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datatool.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dateiliste.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dateiliste.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datenumber.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datenumber.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-bahasai.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-bahasai.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-basque.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-basque.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-breton.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-breton.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-bulgarian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-bulgarian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-catalan.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-catalan.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-croatian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-croatian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-czech.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-czech.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-danish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-danish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-dutch.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-dutch.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-en-fulltext.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-en-fulltext.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-english.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-english.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-esperanto.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-esperanto.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-estonian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-estonian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-finnish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-finnish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-french.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-french.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-galician.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-galician.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-german.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-german.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-greek.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-greek.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-hebrew.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-hebrew.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-icelandic.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-icelandic.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-irish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-irish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-italian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-italian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-it-fulltext.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-it-fulltext.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-latin.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-latin.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-lsorbian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-lsorbian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-magyar.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-magyar.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-norsk.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-norsk.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-polish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-polish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-portuges.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-portuges.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-romanian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-romanian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-russian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-russian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-samin.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-samin.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-scottish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-scottish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-serbian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-serbian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-slovak.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-slovak.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-slovene.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-slovene.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-spanish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-spanish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-swedish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-swedish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-turkish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-turkish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-ukrainian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-ukrainian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-usorbian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-usorbian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-welsh.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-welsh.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-decimal.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-decimal.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-decorule.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-decorule.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-delimtxt.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-delimtxt.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-denisbdoc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-denisbdoc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diagbox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diagbox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dialogl.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dialogl.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dinbrief.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dinbrief.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dirtytalk.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dirtytalk.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dnaseq.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dnaseq.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doclicense.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doclicense.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docmfp.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docmfp.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docmute.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docmute.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doctools.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doctools.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-documentation.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-documentation.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dotarrow.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dotarrow.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dotseqn.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dotseqn.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-download.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-download.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dprogress.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dprogress.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drac.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drac.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-draftcopy.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-draftcopy.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-draftwatermark.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-draftwatermark.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxdescribe.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtxdescribe.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-duckuments.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-duckuments.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ducksay.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ducksay.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dynamicnumber.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dynamicnumber.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyfig.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyfig.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyreview.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyreview.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebezier.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebezier.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecclesiastic.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecclesiastic.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecv.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecv.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ed.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ed.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-edmargin.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-edmargin.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eemeir.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eemeir.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-efbox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-efbox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-egplot.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-egplot.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ellipsis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ellipsis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elmath.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elmath.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elocalloc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elocalloc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elzcards.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elzcards.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emarks.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emarks.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-embedall.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-embedall.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-embedfile.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-embedfile.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emptypage.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emptypage.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endfloat.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endfloat.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endheads.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endheads.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-engpron.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-engpron.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-engrec.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-engrec.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enumitem-zref.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enumitem-zref.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-environ.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-environ.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epigraph.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epigraph.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epiolmec.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epiolmec.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqlist.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqlist.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqnalign.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqnalign.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqparbox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqparbox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-errata.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-errata.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erw-l3.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erw-l3.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esdiff.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esdiff.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esint.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esint.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etaremune.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etaremune.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etextools.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etextools.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etoc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etoc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eukdate.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eukdate.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-everyhook.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-everyhook.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-everypage.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-everypage.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exam-n.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exam-n.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-examdesign.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-examdesign.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exframe.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exframe.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercise.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercise.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercises.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercises.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exp-testopt.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exp-testopt.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expdlist.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expdlist.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-export.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-export.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exsol.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exsol.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-extract.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-extract.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-facsimile.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-facsimile.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-factura.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-factura.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancylabel.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancylabel.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancynum.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancynum.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancypar.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancypar.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancytabs.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancytabs.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancytooltips.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancytooltips.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fcolumn.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fcolumn.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fetchcls.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fetchcls.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fewerfloatpages.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fewerfloatpages.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fgruler.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fgruler.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fibeamer.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fibeamer.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fifo-stack.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fifo-stack.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filecontents.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filecontents.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filecontentsdef.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filecontentsdef.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filedate.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filedate.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fileinfo.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fileinfo.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fink.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fink.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-finstrut.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-finstrut.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fithesis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fithesis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixcmex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixcmex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixme.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixme.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixmetodonotes.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixmetodonotes.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flabels.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flabels.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flagderiv.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flagderiv.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flashcards.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flashcards.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flippdf.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flippdf.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-floatflt.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-floatflt.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-floatrow.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-floatrow.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flowfram.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flowfram.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fmp.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fmp.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fmtcount.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fmtcount.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnbreak.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnbreak.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnumprint.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnumprint.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-foilhtml.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-foilhtml.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontaxes.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontaxes.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontsize.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontsize.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonttable.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonttable.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footmisc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footmisc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footmisx.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footmisx.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnoterange.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnoterange.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnpag.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnpag.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forarray.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forarray.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-foreign.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-foreign.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forloop.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forloop.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forms16be.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forms16be.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-formular.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-formular.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frankenstein.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frankenstein.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ftnxtra.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ftnxtra.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fullblck.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fullblck.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fullminipage.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fullminipage.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fundus-calligra.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fundus-calligra.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fundus-sueterlin.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fundus-sueterlin.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fvextra.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fvextra.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gatherenum.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gatherenum.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gcite.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gcite.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gender.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gender.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-genmpage.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-genmpage.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-getitems.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-getitems.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ginpenc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ginpenc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitfile-info.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitfile-info.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-danish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-danish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-dutch.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-dutch.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-english.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-english.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-estonian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-estonian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-extra.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-extra.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-finnish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-finnish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-french.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-french.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-german.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-german.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-irish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-irish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-italian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-italian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-magyar.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-magyar.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-polish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-polish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-portuges.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-portuges.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-serbian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-serbian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-slovene.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-slovene.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-spanish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-spanish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmdoc-enhance.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmdoc-enhance.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grabbox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grabbox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphbox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphbox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphicx-psmin.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphicx-psmin.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphicxbox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphicxbox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grayhints.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grayhints.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grid.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grid.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gridset.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gridset.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitlogo.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitlogo.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-halloweenmath.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-halloweenmath.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hanging.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hanging.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hardwrap.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hardwrap.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hhtensor.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hhtensor.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-histogr.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-histogr.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hpsdiss.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hpsdiss.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hrefhide.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hrefhide.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyper.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyper.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyperbar.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyperbar.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyperxmp.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyperxmp.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphenat.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphenat.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-idxlayout.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-idxlayout.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iffont.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iffont.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifmtarg.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifmtarg.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifnextok.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifnextok.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifoddpage.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifoddpage.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iitem.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iitem.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imakeidx.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imakeidx.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-indextools.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-indextools.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inlinedef.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inlinedef.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inputenx.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inputenx.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inputtrc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inputtrc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interfaces.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interfaces.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-intopdf.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-intopdf.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inversepath.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inversepath.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-invoice2.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-invoice2.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iso.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iso.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iso10303.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iso10303.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isodate.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isodate.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isodoc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isodoc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isorot.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isorot.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isotope.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isotope.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-issuulinks.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-issuulinks.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jvlisting.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jvlisting.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kalendarium.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kalendarium.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kantlipsum.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kantlipsum.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kerntest.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kerntest.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keycommand.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keycommand.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyfloat.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyfloat.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyindex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyindex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyvaltable.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyvaltable.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knowledge.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knowledge.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-komacv.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-komacv.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-komacv-rg.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-komacv-rg.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ktv-texdata.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ktv-texdata.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3build.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3build.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labbook.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labbook.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labels.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labels.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labelschanged.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labelschanged.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lastpackage.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lastpackage.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lastpage.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lastpage.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-amsmath-dev.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-amsmath-dev.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-base-dev.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-base-dev.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-graphics-dev.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-graphics-dev.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-tds.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-tds.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-tools-dev.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-tools-dev.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcolors.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcolors.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexdemo.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexdemo.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexgit.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexgit.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-layouts.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-layouts.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lccaps.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lccaps.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcd.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcd.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcg.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcg.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leading.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leading.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leftidx.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leftidx.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leipzig.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leipzig.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lengthconvert.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lengthconvert.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lettrine.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lettrine.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lhelp.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lhelp.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libgreek.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libgreek.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-limap.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-limap.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linegoal.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linegoal.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lipsum.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lipsum.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listingsutf8.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listingsutf8.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listlbls.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listlbls.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listliketab.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listliketab.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listofsymbols.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listofsymbols.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lmake.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lmake.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-locality.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-locality.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-localloc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-localloc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logbox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logbox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logpap.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logpap.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longfigure.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longfigure.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longnamefilelist.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longnamefilelist.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lstaddons.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lstaddons.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxnew.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxnew.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatodonotes.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatodonotes.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-macroswap.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-macroswap.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-magicnum.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-magicnum.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mailing.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mailing.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mailmerge.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mailmerge.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makebase.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makebase.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makebox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makebox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecell.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecell.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecmds.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecmds.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makedtx.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makedtx.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mandi.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mandi.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-manfnt.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-manfnt.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-manuscript.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-manuscript.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginfit.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginfit.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginfix.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginfix.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginnote.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginnote.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-markdown.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-markdown.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathastext.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathastext.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathexam.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathexam.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathfont.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathfont.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcaption.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcaption.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcite.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcite.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdframed.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdframed.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-media9.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-media9.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-meetingmins.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-meetingmins.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memory.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memory.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-menu.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-menu.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-menukeys.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-menukeys.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metalogox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metalogox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metastr.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metastr.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-method.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-method.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metre.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metre.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfirstuc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfirstuc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mftinc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mftinc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mi-solns.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mi-solns.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minibox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minibox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minidocument.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minidocument.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minifp.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minifp.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minipage-marginpar.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minipage-marginpar.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minted.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minted.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minutes.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minutes.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mleftright.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mleftright.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mlist.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mlist.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mnotes.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mnotes.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moderntimeline.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moderntimeline.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modref.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modref.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modroman.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modroman.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-monofill.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-monofill.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moodle.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moodle.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morefloats.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morefloats.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morehype.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morehype.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moresize.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moresize.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moreverb.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moreverb.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morewrites.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morewrites.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mparhack.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mparhack.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpostinl.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpostinl.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-msg.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-msg.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mtgreek.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mtgreek.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multiaudience.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multiaudience.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multibbl.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multibbl.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multicap.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multicap.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multicolrule.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multicolrule.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multidef.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multidef.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multienv.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multienv.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multiexpand.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multiexpand.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multilang.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multilang.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multirow.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multirow.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mversion.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mversion.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mwe.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mwe.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mycv.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mycv.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mylatexformat.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mylatexformat.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nag.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nag.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nameauth.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nameauth.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-namespc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-namespc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ncctools.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ncctools.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-needspace.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-needspace.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newfile.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newfile.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newlfm.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newlfm.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newspaper.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newspaper.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newunicodechar.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newunicodechar.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newvbtm.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newvbtm.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newverbs.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newverbs.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nicefilelist.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nicefilelist.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-niceframe.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-niceframe.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nicetext.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nicetext.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nidanfloat.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nidanfloat.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noitcrul.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noitcrul.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nomencl.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nomencl.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nomentbl.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nomentbl.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nonfloat.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nonfloat.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nonumonpart.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nonumonpart.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-normalcolor.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-normalcolor.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notes.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notes.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notespages.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notespages.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nowidow.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nowidow.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ntheorem.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ntheorem.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numprint.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numprint.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocgx.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocgx.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-octavo.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-octavo.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oldstyle.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oldstyle.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-onlyamsmath.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-onlyamsmath.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-opcit.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-opcit.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outlining.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outlining.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-overpic.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-overpic.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-padcount.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-padcount.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagecolor.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagecolor.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagecont.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagecont.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagenote.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagenote.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pageslts.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pageslts.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paper.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paper.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papercdcase.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papercdcase.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papermas.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papermas.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papertex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papertex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paracol.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paracol.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paralist.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paralist.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paresse.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paresse.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parselines.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parselines.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patch.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-patch.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patchcmd.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-patchcmd.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pauldoc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pauldoc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pawpict.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pawpict.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbsheet.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbsheet.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdf14.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdf14.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcprot.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfcprot.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfoverlay.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfoverlay.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpc-movie.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpc-movie.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfprivacy.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfprivacy.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfx.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfx.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-perltex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-perltex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-permute.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-permute.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phffullpagefigure.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phffullpagefigure.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfnote.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfnote.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfparen.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfparen.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfqit.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfqit.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfquotetext.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfquotetext.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfsvnwatermark.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfsvnwatermark.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfthm.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfthm.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-photo.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-photo.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-picture.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-picture.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plweb.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plweb.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmboxdraw.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmboxdraw.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polynom.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polynom.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polynomial.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polynomial.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polytable.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polytable.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-powerdot.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-powerdot.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ppr-prv.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ppr-prv.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-preprint.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-preprint.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pressrelease.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pressrelease.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prettyref.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prettyref.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-preview.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-preview.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-probsoln.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-probsoln.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proofread.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proofread.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-protocol.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-protocol.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psfragx.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psfragx.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxgreeks.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxgreeks.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qcm.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qcm.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qstest.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qstest.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qsymbols.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qsymbols.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quotchap.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quotchap.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quoting.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quoting.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quotmark.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quotmark.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ran_toks.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ran_toks.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rccol.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rccol.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rcs-multi.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rcs-multi.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rcsinfo.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rcsinfo.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realboxes.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realboxes.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recipecard.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recipecard.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reflectgraphics.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reflectgraphics.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refman.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refman.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refstyle.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refstyle.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regcount.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regcount.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regexpatch.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regexpatch.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-register.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-register.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regstats.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regstats.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-relenc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-relenc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-repltext.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-repltext.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rgltxdoc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rgltxdoc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rjlparshap.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rjlparshap.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-robustcommand.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-robustcommand.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romanbar.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romanbar.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romanbarpagenumber.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romanbarpagenumber.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romannum.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romannum.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rotfloat.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rotfloat.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rtkinenc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rtkinenc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rulercompass.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rulercompass.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sauerj.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sauerj.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-savefnmark.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-savefnmark.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-savetrees.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-savetrees.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scale.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scale.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scalebar.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scalebar.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schedule.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schedule.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scontents.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scontents.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sdaps.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sdaps.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-secnum.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-secnum.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sectsty.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sectsty.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seealso.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seealso.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-selinput.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-selinput.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semantic.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semantic.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semioneside.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semioneside.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semproc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semproc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seqsplit.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seqsplit.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sesstime.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sesstime.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sf298.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sf298.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sffms.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sffms.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shdoc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shdoc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shorttoc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shorttoc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-show2e.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-show2e.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showcharinbox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showcharinbox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showexpl.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showexpl.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showlabels.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showlabels.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sidecap.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sidecap.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sidenotes.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sidenotes.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-silence.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-silence.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplecd.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplecd.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplecv.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplecv.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sitem.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sitem.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skb.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skb.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skdoc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skdoc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skrapport.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skrapport.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-slantsc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-slantsc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-snapshot.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-snapshot.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soul.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soul.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soulutf8.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soulutf8.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spacingtricks.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spacingtricks.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-splitindex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-splitindex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spot.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spot.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spverbatim.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spverbatim.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srcltx.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-srcltx.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sseq.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sseq.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stack.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stack.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-standalone.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-standalone.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stdclsdv.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stdclsdv.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stealcaps.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stealcaps.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stdpage.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stdpage.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-storebox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-storebox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stringstrings.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stringstrings.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sttools.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sttools.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subdepth.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subdepth.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subeqn.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subeqn.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subeqnarray.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subeqnarray.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfigure.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfigure.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfiles.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfiles.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfloat.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfloat.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-supertabular.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-supertabular.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svg.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svg.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn-multi.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn-multi.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn-prov.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn-prov.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-syntrace.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-syntrace.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-synttree.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-synttree.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabfigures.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabfigures.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablefootnote.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablefootnote.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tableof.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tableof.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablestyles.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablestyles.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablists.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablists.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablvar.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablvar.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabu.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabu.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabularborder.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabularborder.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabularew.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabularew.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabulary.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabulary.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-talk.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-talk.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tcldoc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tcldoc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ted.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ted.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-templatetools.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-templatetools.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termcal.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termcal.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termlist.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termlist.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-testhyphens.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-testhyphens.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-testidx.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-testidx.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-label.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-label.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-locale.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-locale.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texmate.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texmate.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texments.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texments.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texpower.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texpower.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texshade.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texshade.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texvc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texvc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textfit.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textfit.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textmerg.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textmerg.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textpos.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textpos.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textualicomma.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textualicomma.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thmtools.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thmtools.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threadcol.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threadcol.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumb.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumb.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumbs.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumbs.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titling.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titling.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocbibind.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocbibind.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocdata.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocdata.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocloft.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocloft.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocvsec2.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocvsec2.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-todo.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-todo.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-todonotes.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-todonotes.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-toolbox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-toolbox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-totcount.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-totcount.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-totpages.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-totpages.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-transparent.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-transparent.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trfsigns.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trfsigns.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trimspaces.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trimspaces.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trivfloat.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trivfloat.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trsym.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trsym.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tucv.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tucv.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-twoup.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-twoup.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-txgreeks.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-txgreeks.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-type1cm.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-type1cm.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typed-checklist.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typed-checklist.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typeface.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typeface.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typogrid.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typogrid.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umoline.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umoline.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-underlin.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-underlin.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-undolabl.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-undolabl.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-units.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-units.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unravel.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unravel.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-upquote.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-upquote.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uri.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uri.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ushort.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ushort.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-varindex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-varindex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-versonotes.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-versonotes.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vgrid.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vgrid.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vmargin.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vmargin.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-volumes.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-volumes.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vwcol.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vwcol.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-warpcol.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-warpcol.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-was.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-was.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-widetable.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-widetable.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-widows-and-orphans.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-widows-and-orphans.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wordlike.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wordlike.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xargs.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xargs.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xbmks.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xbmks.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcolor-material.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcolor-material.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcolor-solarized.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcolor-solarized.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcookybooky.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcookybooky.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcpdftips.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcpdftips.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xdoc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xdoc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xellipsis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xellipsis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xfor.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xfor.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xint.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xint.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xmpincl.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xmpincl.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpatch.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpatch.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpeek.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpeek.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpunctuate.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpunctuate.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xsavebox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xsavebox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xtab.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xtab.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yafoot.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yafoot.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yaletter.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yaletter.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yagusylo.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yagusylo.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ydoc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ydoc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zebra-goodies.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zebra-goodies.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zref.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zref.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
-_md5_=5043fd545626099ebee52bcd3968528f
diff --git a/metadata/md5-cache/dev-texlive/texlive-latexextra-2020-r2 b/metadata/md5-cache/dev-texlive/texlive-latexextra-2020-r2
new file mode 100644
index 000000000000..8a9863f914fe
--- /dev/null
+++ b/metadata/md5-cache/dev-texlive/texlive-latexextra-2020-r2
@@ -0,0 +1,14 @@
+BDEPEND=>=app-text/texlive-core-2020 app-arch/xz-utils
+DEFINED_PHASES=compile install postinst postrm unpack
+DEPEND=>=dev-texlive/texlive-latexrecommended-2020 >=dev-texlive/texlive-pictures-2020 dev-perl/Spreadsheet-ParseExcel
+DESCRIPTION=TeXLive LaTeX additional packages
+EAPI=7
+HOMEPAGE=http://www.tug.org/texlive/
+IUSE=source doc
+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 ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0 Artistic BSD CC-BY-SA-4.0 GPL-1 GPL-2 GPL-3 GPL-3+ LPPL-1.3
+RDEPEND=>=dev-texlive/texlive-latexrecommended-2020 >=dev-texlive/texlive-pictures-2020 dev-perl/Spreadsheet-ParseExcel >=app-text/texlive-core-2020
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-2up-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-2up-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ESIEEcv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ESIEEcv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-GS1-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-GS1-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-HA-prosper-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-HA-prosper-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-Tabbing-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-Tabbing-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-a0poster-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-a0poster-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-a4wide-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-a4wide-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-a5comb-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-a5comb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abraces-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abraces-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abstract-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abstract-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accessibility-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accessibility-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accsupp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accsupp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-achemso-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-achemso-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acro-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acro-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acronym-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acronym-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acroterm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acroterm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-actuarialangle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-actuarialangle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-actuarialsymbol-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-actuarialsymbol-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-addfont-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-addfont-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-addlines-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-addlines-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adjmulticol-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adjmulticol-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adjustbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adjustbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adrconv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adrconv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-advdate-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-advdate-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-akktex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-akktex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-akletter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-akletter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alertmessage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alertmessage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alnumsec-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alnumsec-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alphalph-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alphalph-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-altfont-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-altfont-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsaddr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsaddr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-animate-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-animate-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anonchap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anonchap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-answers-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-answers-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anyfontsize-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anyfontsize-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-appendix-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-appendix-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-appendixnumberbeamer-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-appendixnumberbeamer-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apptools-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apptools-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabicfront-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabicfront-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arcs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arcs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arraycols-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arraycols-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arrayjobx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arrayjobx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arraysort-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arraysort-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arydshln-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arydshln-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asciilist-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asciilist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-askinclude-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-askinclude-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-assignment-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-assignment-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-assoccnt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-assoccnt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-atenddvi-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-atenddvi-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-attachfile-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-attachfile-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aurl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aurl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-authoraftertitle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-authoraftertitle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-authorarchive-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-authorarchive-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-authorindex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-authorindex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autofancyhdr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autofancyhdr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autonum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autonum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autopdf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autopdf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-avremu-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-avremu-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-axessibility-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-axessibility-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-background-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-background-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bankstatement-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bankstatement-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bashful-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bashful-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-basicarith-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-basicarith-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bchart-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bchart-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer2thesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer2thesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer-rl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer-rl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beameraudience-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beameraudience-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerauxtheme-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerauxtheme-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamercolorthemeowl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamercolorthemeowl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerdarkthemes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerdarkthemes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerposter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerposter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamersubframe-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamersubframe-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-cuerna-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-cuerna-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-detlevcm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-detlevcm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-epyt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-epyt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-focus-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-focus-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-light-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-light-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-metropolis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-metropolis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-npbt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-npbt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-phnompenh-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-phnompenh-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-saintpetersburg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-saintpetersburg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-upenn-bc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-upenn-bc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerthemejltree-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerthemejltree-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerthemenirma-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerthemenirma-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bearwear-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bearwear-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beton-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beton-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bewerbung-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bewerbung-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bez123-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bez123-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bhcexam-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bhcexam-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibletext-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibletext-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bigfoot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bigfoot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bigints-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bigints-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biochemistry-colors-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biochemistry-colors-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bizcard-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bizcard-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blindtext-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blindtext-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blkarray-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blkarray-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-block-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-block-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blowup-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blowup-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bnumexpr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bnumexpr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boites-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boites-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bold-extra-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bold-extra-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookcover-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookcover-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookest-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookest-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-booklet-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-booklet-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boolexpr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boolexpr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bophook-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bophook-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boxedminipage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boxedminipage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boxedminipage2e-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boxedminipage2e-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boxhandler-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boxhandler-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bracketkey-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bracketkey-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-braket-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-braket-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-breakurl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-breakurl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bullcntr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bullcntr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxcalc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxcalc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxdpx-beamer-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxdpx-beamer-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxdvidriver-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxdvidriver-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxenclose-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxenclose-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxnewfont-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxnewfont-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxpapersize-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxpapersize-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxpdfver-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxpdfver-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxtexlogo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxtexlogo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calcage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calcage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calctab-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calctab-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calculator-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calculator-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calrsfs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calrsfs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cals-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cals-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calxxxx-yyyy-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calxxxx-yyyy-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cancel-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cancel-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-canoniclayout-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-canoniclayout-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-capt-of-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-capt-of-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-captcont-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-captcont-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-captdef-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-captdef-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-carbohydrates-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-carbohydrates-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cases-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cases-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-casyl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-casyl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catchfile-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catchfile-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catchfilebetweentags-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catchfilebetweentags-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catechis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catechis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catoptions-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catoptions-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cbcoptic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cbcoptic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ccaption-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ccaption-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cclicenses-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cclicenses-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cd-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cd-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cd-cover-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cd-cover-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cdpbundl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cdpbundl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cellprops-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cellprops-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cellspace-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cellspace-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-censor-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-censor-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-centeredline-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-centeredline-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changebar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changebar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changelayout-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changelayout-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changelog-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changelog-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changepage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changepage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chappg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chappg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chapterfolder-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chapterfolder-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cheatsheet-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cheatsheet-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-checkend-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-checkend-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chet-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chet-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chextras-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chextras-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-childdoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-childdoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chkfloat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chkfloat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chletter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chletter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chngcntr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chngcntr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chronology-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chronology-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circ-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circ-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circledsteps-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circledsteps-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-classics-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-classics-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-classpack-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-classpack-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clefval-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clefval-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cleveref-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cleveref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clipboard-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clipboard-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clock-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clock-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cloze-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cloze-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clrdblpg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clrdblpg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clrstrip-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clrstrip-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmdstring-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmdstring-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmdtrack-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmdtrack-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmsd-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmsd-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cnltx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cnltx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cntformats-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cntformats-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cntperchap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cntperchap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codedoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codedoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codepage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codepage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codesection-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codesection-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collcell-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collcell-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collectbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collectbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colophon-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colophon-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colordoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colordoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorinfo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorinfo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coloring-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coloring-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorspace-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorspace-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colortab-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colortab-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorwav-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorwav-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorweb-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorweb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colourchange-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colourchange-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combelow-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combelow-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combine-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combine-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comma-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comma-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-commado-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-commado-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-commedit-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-commedit-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comment-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comment-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-competences-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-competences-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-concepts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-concepts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-concprog-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-concprog-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-constants-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-constants-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-continue-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-continue-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-contour-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-contour-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-contracard-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-contracard-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-conv-xkv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-conv-xkv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooking-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooking-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooking-units-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooking-units-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cool-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cool-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coollist-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coollist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coolstr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coolstr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coolthms-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coolthms-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooltooltips-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooltooltips-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coordsys-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coordsys-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-copyedit-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-copyedit-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-copyrightbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-copyrightbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coseoul-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coseoul-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-counttexruns-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-counttexruns-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-courseoutline-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-courseoutline-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coursepaper-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coursepaper-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coverpage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coverpage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cprotect-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cprotect-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossreference-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossreference-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossreftools-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossreftools-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csquotes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csquotes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-css-colors-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-css-colors-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csvmerge-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csvmerge-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csvsimple-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csvsimple-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cuisine-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cuisine-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currency-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currency-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currfile-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currfile-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currvita-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currvita-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cutwin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cutwin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cv4tw-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cv4tw-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cweb-latex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cweb-latex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyber-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyber-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cybercic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cybercic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashrule-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashrule-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashundergaps-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashundergaps-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dataref-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dataref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datatool-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datatool-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dateiliste-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dateiliste-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datenumber-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datenumber-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-bahasai-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-bahasai-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-basque-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-basque-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-breton-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-breton-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-bulgarian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-bulgarian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-catalan-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-catalan-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-croatian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-croatian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-czech-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-czech-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-danish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-danish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-dutch-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-dutch-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-en-fulltext-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-en-fulltext-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-english-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-english-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-esperanto-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-esperanto-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-estonian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-estonian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-finnish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-finnish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-french-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-french-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-galician-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-galician-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-german-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-german-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-greek-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-greek-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-hebrew-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-hebrew-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-icelandic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-icelandic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-irish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-irish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-italian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-italian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-it-fulltext-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-it-fulltext-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-latin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-latin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-lsorbian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-lsorbian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-magyar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-magyar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-norsk-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-norsk-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-polish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-polish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-portuges-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-portuges-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-romanian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-romanian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-russian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-russian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-samin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-samin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-scottish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-scottish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-serbian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-serbian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-slovak-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-slovak-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-slovene-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-slovene-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-spanish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-spanish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-swedish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-swedish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-turkish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-turkish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-ukrainian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-ukrainian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-usorbian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-usorbian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-welsh-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-welsh-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dblfloatfix-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dblfloatfix-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-decimal-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-decimal-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-decorule-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-decorule-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-delimtxt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-delimtxt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-denisbdoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-denisbdoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diagbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diagbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diagnose-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diagnose-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dialogl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dialogl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dichokey-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dichokey-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dinbrief-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dinbrief-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-directory-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-directory-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dirtytalk-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dirtytalk-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dlfltxb-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dlfltxb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dnaseq-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dnaseq-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doclicense-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doclicense-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docmfp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docmfp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docmute-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docmute-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doctools-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doctools-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-documentation-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-documentation-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doi-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doi-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dotarrow-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dotarrow-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dotlessi-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dotlessi-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dotseqn-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dotseqn-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-download-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-download-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dpfloat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dpfloat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dprogress-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dprogress-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drac-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drac-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-draftcopy-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-draftcopy-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-draftfigure-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-draftfigure-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-draftwatermark-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-draftwatermark-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtk-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtk-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxdescribe-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtxdescribe-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxgallery-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtxgallery-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-duckuments-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-duckuments-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ducksay-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ducksay-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvdcoll-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dvdcoll-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dynamicnumber-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dynamicnumber-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dynblocks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dynblocks-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ean13isbn-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ean13isbn-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easy-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easy-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easy-todo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easy-todo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyfig-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyfig-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyformat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyformat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easylist-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easylist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyreview-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyreview-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebezier-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebezier-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecclesiastic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecclesiastic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ed-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ed-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-edmargin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-edmargin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eemeir-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eemeir-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-efbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-efbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-egplot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-egplot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ehhline-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ehhline-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elegantbook-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elegantbook-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elegantnote-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elegantnote-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elegantpaper-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elegantpaper-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elements-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elements-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ellipsis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ellipsis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elmath-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elmath-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elocalloc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elocalloc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elpres-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elpres-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elzcards-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elzcards-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emarks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emarks-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-embedall-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-embedall-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-embedfile-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-embedfile-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-embrac-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-embrac-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emptypage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emptypage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emulateapj-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emulateapj-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endfloat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endfloat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endheads-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endheads-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endnotes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endnotes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-engpron-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-engpron-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-engrec-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-engrec-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enotez-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enotez-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enumitem-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enumitem-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enumitem-zref-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enumitem-zref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-envbig-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-envbig-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-environ-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-environ-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-envlab-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-envlab-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epigraph-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epigraph-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epiolmec-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epiolmec-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqell-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqell-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqlist-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqlist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqnalign-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqnalign-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqname-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqname-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqparbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqparbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-errata-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-errata-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erw-l3-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erw-l3-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esami-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esami-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esdiff-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esdiff-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esindex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esindex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esint-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esint-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esint-type1-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esint-type1-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etaremune-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etaremune-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etextools-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etextools-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eukdate-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eukdate-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eulerpx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eulerpx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-europasscv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-europasscv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-europecv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-europecv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-everyhook-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-everyhook-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-everypage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-everypage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exam-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exam-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exam-n-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exam-n-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exam-randomizechoices-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exam-randomizechoices-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-examdesign-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-examdesign-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exframe-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exframe-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-example-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-example-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-examplep-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-examplep-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exceltex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exceltex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-excludeonly-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-excludeonly-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercise-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercise-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercisebank-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercisebank-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercisepoints-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercisepoints-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercises-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercises-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exp-testopt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exp-testopt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expdlist-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expdlist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-export-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-export-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exsheets-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exsheets-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exsol-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exsol-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-extract-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-extract-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-facsimile-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-facsimile-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-factura-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-factura-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyhandout-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyhandout-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancylabel-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancylabel-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancynum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancynum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancypar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancypar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyslides-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyslides-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancytabs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancytabs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancytooltips-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancytooltips-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fcolumn-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fcolumn-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fetchcls-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fetchcls-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fewerfloatpages-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fewerfloatpages-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ffslides-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ffslides-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fgruler-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fgruler-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fibeamer-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fibeamer-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fifo-stack-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fifo-stack-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-figsize-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-figsize-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filecontents-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filecontents-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filecontentsdef-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filecontentsdef-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filedate-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filedate-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fileinfo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fileinfo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filemod-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filemod-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fink-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fink-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-finstrut-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-finstrut-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fithesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fithesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixcmex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixcmex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixfoot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixfoot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixme-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixme-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixmetodonotes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixmetodonotes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fjodor-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fjodor-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flabels-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flabels-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flacards-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flacards-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flagderiv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flagderiv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flashcards-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flashcards-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flashmovie-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flashmovie-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flipbook-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flipbook-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flippdf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flippdf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-floatflt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-floatflt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-floatrow-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-floatrow-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flowfram-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flowfram-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fmp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fmp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fmtcount-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fmtcount-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fn2end-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fn2end-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnbreak-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnbreak-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fncychap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fncychap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fncylab-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fncylab-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnpara-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnpara-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnpct-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnpct-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnumprint-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnumprint-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-foilhtml-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-foilhtml-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontaxes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontaxes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontsetup-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontsetup-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontsize-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontsize-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonttable-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonttable-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footmisc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footmisc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footmisx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footmisx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnotebackref-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnotebackref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnoterange-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnoterange-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnpag-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnpag-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forarray-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forarray-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-foreign-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-foreign-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forloop-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forloop-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-formlett-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-formlett-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forms16be-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forms16be-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-formular-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-formular-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fragments-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fragments-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frame-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frame-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-framed-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-framed-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frankenstein-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frankenstein-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frege-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frege-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ftcap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ftcap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ftnxtra-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ftnxtra-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fullblck-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fullblck-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fullminipage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fullminipage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fullwidth-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fullwidth-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fundus-calligra-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fundus-calligra-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fundus-cyr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fundus-cyr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fundus-sueterlin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fundus-sueterlin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fvextra-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fvextra-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fwlw-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fwlw-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-g-brief-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-g-brief-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gatherenum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gatherenum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gauss-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gauss-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gcard-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gcard-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gcite-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gcite-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gender-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gender-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-genmpage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-genmpage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-getfiledate-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-getfiledate-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-getitems-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-getitems-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gindex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gindex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ginpenc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ginpenc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitfile-info-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitfile-info-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitinfo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitinfo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitinfo2-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitinfo2-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitlog-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitlog-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitver-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitver-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-globalvals-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-globalvals-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gloss-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gloss-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-danish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-danish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-dutch-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-dutch-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-english-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-english-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-estonian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-estonian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-extra-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-extra-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-finnish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-finnish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-french-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-french-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-german-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-german-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-irish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-irish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-italian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-italian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-magyar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-magyar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-polish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-polish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-portuges-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-portuges-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-serbian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-serbian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-slovene-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-slovene-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-spanish-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-spanish-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmdoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmdoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmdoc-enhance-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmdoc-enhance-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmiflink-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmiflink-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmutils-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmutils-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmverb-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmverb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grabbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grabbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphicx-psmin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphicx-psmin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphicxbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphicxbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grayhints-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grayhints-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grfpaste-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grfpaste-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grid-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grid-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grid-system-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grid-system-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gridset-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gridset-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gridslides-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gridslides-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitlogo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitlogo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-halloweenmath-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-halloweenmath-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hackthefootline-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hackthefootline-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-handin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-handin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-handout-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-handout-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hang-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hang-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hanging-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hanging-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hardwrap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hardwrap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harnon-cv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harnon-cv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harpoon-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harpoon-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-he-she-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-he-she-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hhtensor-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hhtensor-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-histogr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-histogr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hitec-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hitec-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hletter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hletter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hobsub-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hobsub-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hpsdiss-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hpsdiss-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hrefhide-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hrefhide-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hvindex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hvindex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hvqrurl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hvqrurl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hypdvips-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hypdvips-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyper-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyper-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyperbar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyperbar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hypernat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hypernat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyperxmp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyperxmp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphenat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphenat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-identkey-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-identkey-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-idxcmds-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-idxcmds-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-idxlayout-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-idxlayout-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iffont-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iffont-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifmslide-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifmslide-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifmtarg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifmtarg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifnextok-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifnextok-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifoddpage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifoddpage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifthenx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifthenx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iitem-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iitem-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-image-gallery-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-image-gallery-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imakeidx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imakeidx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-import-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-import-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-incgraph-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-incgraph-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-indextools-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-indextools-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inline-images-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inline-images-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inlinedef-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inlinedef-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inputenx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inputenx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inputtrc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inputtrc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interactiveworkbook-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interactiveworkbook-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interfaces-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interfaces-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-intopdf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-intopdf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inversepath-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inversepath-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-invoice-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-invoice-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-invoice-class-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-invoice-class-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-invoice2-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-invoice2-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iso-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iso-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iso10303-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iso10303-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isodate-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isodate-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isodoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isodoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isonums-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isonums-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isopt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isopt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isorot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isorot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isotope-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isotope-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-issuulinks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-issuulinks-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iwhdp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iwhdp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jlabels-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jlabels-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jslectureplanner-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jslectureplanner-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jumplines-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jumplines-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jvlisting-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jvlisting-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kalendarium-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kalendarium-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kantlipsum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kantlipsum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kerntest-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kerntest-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keycommand-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keycommand-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyfloat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyfloat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyreader-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyreader-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyindex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyindex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keystroke-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keystroke-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyval2e-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyval2e-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyvaltable-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyvaltable-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kix-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kix-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knowledge-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knowledge-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-koma-moderncvclassic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-koma-moderncvclassic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-koma-script-sfs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-koma-script-sfs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-komacv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-komacv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-komacv-rg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-komacv-rg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ktv-texdata-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ktv-texdata-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3build-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3build-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labbook-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labbook-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labels-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labels-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labels4easylist-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labels4easylist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labelschanged-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labelschanged-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lastpackage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lastpackage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lastpage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lastpage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-amsmath-dev-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-amsmath-dev-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-base-dev-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-base-dev-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-bin-dev-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-bin-dev-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-graphics-dev-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-graphics-dev-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-tds-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-tds-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-tools-dev-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-tools-dev-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-uni8-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-uni8-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcolors-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcolors-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexdemo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexdemo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexgit-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexgit-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-layouts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-layouts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lazylist-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lazylist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lccaps-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lccaps-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcd-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcd-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leading-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leading-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leaflet-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leaflet-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lectures-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lectures-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leftidx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leftidx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leipzig-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leipzig-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lengthconvert-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lengthconvert-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lettre-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lettre-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lettrine-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lettrine-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lewis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lewis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lhelp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lhelp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libgreek-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libgreek-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-limap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-limap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linegoal-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linegoal-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linop-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linop-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lipsum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lipsum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lisp-on-tex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lisp-on-tex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listing-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listing-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listingsutf8-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listingsutf8-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listlbls-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listlbls-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listliketab-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listliketab-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listofsymbols-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listofsymbols-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lkproof-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lkproof-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lmake-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lmake-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-locality-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-locality-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-localloc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-localloc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logical-markup-utils-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logical-markup-utils-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logpap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logpap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longfbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longfbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longfigure-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longfigure-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longnamefilelist-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longnamefilelist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-loops-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-loops-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lsc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lsc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lstaddons-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lstaddons-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lstfiracode-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lstfiracode-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lt3graph-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lt3graph-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltablex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltablex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltabptch-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltabptch-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxdockit-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxdockit-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxguidex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxguidex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxkeys-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxkeys-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxnew-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxnew-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxtools-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxtools-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-check-hyphen-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-check-hyphen-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatodonotes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatodonotes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-macroswap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-macroswap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-magaz-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-magaz-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-magicnum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-magicnum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecookbook-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecookbook-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makerobust-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makerobust-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mailing-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mailing-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mailmerge-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mailmerge-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makebarcode-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makebarcode-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makebase-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makebase-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makebox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makebox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecell-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecell-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecirc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecirc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecmds-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecmds-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makedtx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makedtx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makeglos-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makeglos-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mandi-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mandi-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-manfnt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-manfnt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-manuscript-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-manuscript-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-manyind-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-manyind-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginfit-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginfit-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginfix-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginfix-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginnote-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginnote-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-markdown-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-markdown-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathalpha-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathalpha-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathastext-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathastext-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathexam-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathexam-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathfam256-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathfam256-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathfont-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathfont-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-maybemath-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-maybemath-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcaption-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcaption-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mceinleger-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mceinleger-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcexam-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcexam-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcite-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcite-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mciteplus-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mciteplus-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdframed-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdframed-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-media9-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-media9-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-medstarbeamer-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-medstarbeamer-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-meetingmins-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-meetingmins-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memexsupp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memexsupp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memory-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memory-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mensa-tex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mensa-tex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-menu-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-menu-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-menukeys-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-menukeys-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metalogox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metalogox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metastr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metastr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-method-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-method-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metre-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metre-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfirstuc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfirstuc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mftinc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mftinc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mi-solns-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mi-solns-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-midpage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-midpage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minibox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minibox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minidocument-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minidocument-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minifp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minifp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minipage-marginpar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minipage-marginpar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minitoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minitoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minorrevision-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minorrevision-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minted-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minted-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minutes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minutes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mla-paper-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mla-paper-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mleftright-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mleftright-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mlist-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mlist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mmap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mmap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mnotes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mnotes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moderncv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moderncv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modernposter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modernposter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moderntimeline-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moderntimeline-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modref-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modroman-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modroman-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modular-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modular-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-monofill-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-monofill-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moodle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moodle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moreenum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moreenum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morefloats-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morefloats-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morehype-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morehype-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moresize-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moresize-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moreverb-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moreverb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morewrites-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morewrites-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-movie15-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-movie15-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mparhack-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mparhack-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpostinl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpostinl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-msc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-msc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-msg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-msg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mslapa-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mslapa-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mtgreek-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mtgreek-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multenum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multenum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multiaudience-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multiaudience-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multibbl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multibbl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multicap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multicap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multicolrule-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multicolrule-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multidef-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multidef-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multienv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multienv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multiexpand-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multiexpand-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multilang-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multilang-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multirow-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multirow-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mversion-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mversion-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mwe-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mwe-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mycv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mycv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mylatexformat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mylatexformat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nag-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nag-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nameauth-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nameauth-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-namespc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-namespc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ncclatex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ncclatex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ncctools-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ncctools-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-needspace-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-needspace-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nestquot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nestquot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newcommand-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newcommand-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newenviron-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newenviron-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newfile-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newfile-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newlfm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newlfm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newspaper-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newspaper-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newunicodechar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newunicodechar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newvbtm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newvbtm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newverbs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newverbs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nextpage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nextpage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nfssext-cfr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nfssext-cfr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nicefilelist-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nicefilelist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-niceframe-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-niceframe-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nicetext-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nicetext-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nidanfloat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nidanfloat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nlctdoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nlctdoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noconflict-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noconflict-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noindentafter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noindentafter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noitcrul-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noitcrul-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nolbreaks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nolbreaks-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nomencl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nomencl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nomentbl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nomentbl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nonfloat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nonfloat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nonumonpart-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nonumonpart-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nopageno-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nopageno-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-normalcolor-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-normalcolor-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notespages-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notespages-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notestex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notestex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notoccite-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notoccite-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nowidow-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nowidow-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ntheorem-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ntheorem-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numberedblock-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numberedblock-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numname-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numname-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numprint-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numprint-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numspell-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numspell-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocg-p-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocg-p-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocgx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocgx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocgx2-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocgx2-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocr-latex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocr-latex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-octavo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-octavo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oldstyle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oldstyle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-onlyamsmath-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-onlyamsmath-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-opcit-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-opcit-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-optidef-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-optidef-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-optional-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-optional-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-options-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-options-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outline-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outline-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outliner-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outliner-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outlines-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outlines-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outlining-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outlining-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-overlays-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-overlays-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-overpic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-overpic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-padcount-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-padcount-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagecolor-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagecolor-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagecont-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagecont-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagenote-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagenote-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagerange-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagerange-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pageslts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pageslts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paper-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paper-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papercdcase-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papercdcase-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papermas-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papermas-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papertex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papertex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paracol-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paracol-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parades-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parades-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paralist-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paralist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paresse-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paresse-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parnotes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parnotes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parsa-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parsa-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parselines-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parselines-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pas-cours-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pas-cours-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pas-cv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pas-cv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pas-tableur-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pas-tableur-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patch-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-patch-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patchcmd-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-patchcmd-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pauldoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pauldoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pawpict-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pawpict-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbsheet-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbsheet-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdf14-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdf14-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcolmk-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfcolmk-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcomment-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfcomment-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcprot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfcprot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfmarginpar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfmarginpar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfoverlay-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfoverlay-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpagediff-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpagediff-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpc-movie-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpc-movie-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfprivacy-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfprivacy-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfreview-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfreview-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfscreen-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfscreen-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfslide-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfslide-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfsync-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfsync-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfwin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfwin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pecha-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pecha-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-perltex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-perltex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-permute-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-permute-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-petiteannonce-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-petiteannonce-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phffullpagefigure-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phffullpagefigure-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfnote-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfnote-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfparen-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfparen-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfqit-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfqit-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfquotetext-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfquotetext-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfsvnwatermark-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfsvnwatermark-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfthm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfthm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-philex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-philex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phonenumbers-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phonenumbers-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-photo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-photo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-picture-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-picture-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-piff-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-piff-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pkgloader-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pkgloader-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-placeins-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-placeins-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plantslabels-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plantslabels-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plates-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plates-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plweb-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plweb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmboxdraw-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmboxdraw-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polynom-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polynom-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polynomial-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polynomial-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polytable-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polytable-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-postcards-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-postcards-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poster-mac-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poster-mac-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-powerdot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-powerdot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ppr-prv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ppr-prv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-practicalreports-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-practicalreports-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-preprint-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-preprint-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pressrelease-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pressrelease-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prettyref-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prettyref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-preview-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-preview-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-printlen-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-printlen-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-probsoln-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-probsoln-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-program-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-program-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-progress-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-progress-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-progressbar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-progressbar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proofread-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proofread-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-properties-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-properties-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prosper-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prosper-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-protex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-protex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-protocol-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-protocol-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psfragx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psfragx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pstool-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pstool-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pstring-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pstring-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxgreeks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxgreeks-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pygmentex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pygmentex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-python-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-python-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qcm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qcm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qstest-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qstest-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qsymbols-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qsymbols-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quicktype-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quicktype-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quiz2socrative-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quiz2socrative-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quotchap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quotchap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quoting-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quoting-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quotmark-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quotmark-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ran_toks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ran_toks-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randtext-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randtext-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rccol-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rccol-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rcs-multi-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rcs-multi-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rcsinfo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rcsinfo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-readarray-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-readarray-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realboxes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realboxes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recipe-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recipe-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recipebook-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recipebook-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recipecard-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recipecard-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rectopma-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rectopma-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refcheck-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refcheck-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refenums-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refenums-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reflectgraphics-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reflectgraphics-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refman-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refman-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refstyle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refstyle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regcount-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regcount-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regexpatch-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regexpatch-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-register-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-register-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regstats-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regstats-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-relenc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-relenc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-relsize-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-relsize-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-repeatindex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-repeatindex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-repltext-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-repltext-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-returntogrid-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-returntogrid-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rgltxdoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rgltxdoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rjlparshap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rjlparshap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rlepsf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rlepsf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rmpage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rmpage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-robustcommand-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-robustcommand-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-robustindex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-robustindex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romanbar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romanbar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romanbarpagenumber-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romanbarpagenumber-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romanneg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romanneg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romannum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romannum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rotfloat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rotfloat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rotpages-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rotpages-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-roundbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-roundbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rterface-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rterface-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rtkinenc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rtkinenc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rulerbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rulerbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rulercompass-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rulercompass-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rvwrite-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rvwrite-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sanitize-umlaut-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sanitize-umlaut-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sauerj-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sauerj-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-savefnmark-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-savefnmark-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-savesym-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-savesym-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-savetrees-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-savetrees-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scale-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scale-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scalebar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scalebar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scalerel-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scalerel-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scanpages-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scanpages-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schedule-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schedule-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scontents-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scontents-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scrlttr2copy-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scrlttr2copy-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sdaps-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sdaps-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sdrt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sdrt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-secdot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-secdot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-secnum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-secnum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sectionbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sectionbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sectionbreak-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sectionbreak-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sectsty-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sectsty-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seealso-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seealso-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-selectp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-selectp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-selinput-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-selinput-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semantic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semantic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semantic-markup-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semantic-markup-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semioneside-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semioneside-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semproc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semproc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sepfootnotes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sepfootnotes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seqsplit-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seqsplit-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sesstime-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sesstime-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sf298-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sf298-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sffms-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sffms-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sfmath-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sfmath-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shadethm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shadethm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shadow-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shadow-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shadowtext-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shadowtext-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shapepar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shapepar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shdoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shdoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shipunov-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shipunov-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shorttoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shorttoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-show2e-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-show2e-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showcharinbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showcharinbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showdim-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showdim-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showexpl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showexpl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showhyphens-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showhyphens-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showlabels-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showlabels-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sidecap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sidecap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sidenotes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sidenotes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-silence-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-silence-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplecd-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplecd-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplecv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplecv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simpleinvoice-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simpleinvoice-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sitem-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sitem-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skb-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skdoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skdoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skeycommand-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skeycommand-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skeyval-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skeyval-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skrapport-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skrapport-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-slantsc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-slantsc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smalltableof-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smalltableof-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smartunits-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smartunits-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smartref-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smartref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-snapshot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-snapshot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-snotez-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-snotez-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soul-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soul-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soulpos-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soulpos-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soulutf8-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soulutf8-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spacingtricks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spacingtricks-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spark-otf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spark-otf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sparklines-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sparklines-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sphack-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sphack-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-splitindex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-splitindex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spotcolor-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spotcolor-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spreadtab-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spreadtab-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spverbatim-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spverbatim-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srbook-mem-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-srbook-mem-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srcltx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-srcltx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sseq-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sseq-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sslides-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sslides-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stack-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stack-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stackengine-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stackengine-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-standalone-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-standalone-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stdclsdv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stdclsdv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stealcaps-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stealcaps-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stdpage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stdpage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-storebox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-storebox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-storecmd-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-storecmd-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stringstrings-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stringstrings-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sttools-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sttools-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stubs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stubs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-studenthandouts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-studenthandouts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subdepth-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subdepth-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subdocs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subdocs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subeqn-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subeqn-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subeqnarray-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subeqnarray-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfigmat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfigmat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfigure-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfigure-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfiles-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfiles-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfloat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfloat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-substitutefont-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-substitutefont-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-substr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-substr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-supertabular-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-supertabular-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svgcolor-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svgcolor-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn-multi-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn-multi-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn-prov-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn-prov-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svninfo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svninfo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-syntax-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-syntax-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-syntrace-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-syntrace-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-synttree-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-synttree-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabfigures-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabfigures-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tableaux-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tableaux-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablefootnote-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablefootnote-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tableof-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tableof-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablestyles-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablestyles-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablists-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablists-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabls-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabls-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablvar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablvar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabstackengine-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabstackengine-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabto-ltx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabto-ltx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabu-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabu-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabularborder-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabularborder-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabularcalc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabularcalc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabularew-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabularew-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabulary-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabulary-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tagging-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tagging-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tagpair-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tagpair-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tagpdf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tagpdf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-talk-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-talk-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tamefloats-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tamefloats-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tasks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tasks-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tcldoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tcldoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tcolorbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tcolorbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tdclock-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tdclock-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-technics-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-technics-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ted-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ted-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-templatetools-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-templatetools-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termcal-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termcal-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termlist-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termlist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-testhyphens-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-testhyphens-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-testidx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-testidx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-label-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-label-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-locale-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-locale-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlogos-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlogos-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texmate-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texmate-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texments-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texments-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texpower-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texpower-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texshade-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texshade-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texvc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texvc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textfit-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textfit-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textmerg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textmerg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textpos-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textpos-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textualicomma-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textualicomma-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-theoremref-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-theoremref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thinsp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thinsp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thmtools-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thmtools-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threadcol-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threadcol-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threeparttable-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threeparttable-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threeparttablex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threeparttablex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumb-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumbs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumbs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumby-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumby-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ticket-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ticket-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlecaps-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlecaps-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlefoot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlefoot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlepic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlepic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titleref-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titleref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlesec-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlesec-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titling-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titling-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocbibind-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocbibind-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocdata-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocdata-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocloft-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocloft-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocvsec2-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocvsec2-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-todo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-todo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-todonotes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-todonotes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tokcycle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tokcycle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tokenizer-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tokenizer-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-toolbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-toolbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-topfloat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-topfloat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-topiclongtable-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-topiclongtable-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-totcount-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-totcount-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-totpages-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-totpages-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translations-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translations-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-transparent-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-transparent-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trfsigns-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trfsigns-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trimspaces-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trimspaces-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trivfloat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trivfloat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trsym-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trsym-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-truncate-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-truncate-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tucv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tucv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turnthepage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turnthepage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-twoinone-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-twoinone-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-twoup-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-twoup-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-txgreeks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-txgreeks-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-type1cm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-type1cm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typed-checklist-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typed-checklist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typeface-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typeface-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typoaid-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typoaid-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typogrid-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typogrid-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uassign-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uassign-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uebungsblatt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uebungsblatt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umoline-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umoline-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-underlin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-underlin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-underoverlap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-underoverlap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-undolabl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-undolabl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-units-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-units-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unravel-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unravel-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-upmethodology-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-upmethodology-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-upquote-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-upquote-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uri-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uri-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ushort-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ushort-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uspace-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uspace-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uwmslide-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uwmslide-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-variablelm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-variablelm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-varindex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-varindex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-varsfromjobname-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-varsfromjobname-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-varwidth-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-varwidth-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vdmlisting-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vdmlisting-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbasef-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbasef-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbatimbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbatimbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbatimcopy-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbatimcopy-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbdef-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbdef-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbments-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbments-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-version-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-version-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-versions-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-versions-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-versonotes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-versonotes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vertbars-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vertbars-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vgrid-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vgrid-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vhistory-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vhistory-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vmargin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vmargin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-volumes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-volumes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vpe-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vpe-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vruler-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vruler-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vtable-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vtable-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vwcol-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vwcol-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wallcalendar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wallcalendar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wallpaper-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wallpaper-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-warning-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-warning-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-warpcol-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-warpcol-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-was-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-was-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-webquiz-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-webquiz-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-widetable-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-widetable-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-widows-and-orphans-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-widows-and-orphans-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-williams-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-williams-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-withargs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-withargs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wordcount-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wordcount-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wordlike-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wordlike-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-worksheet-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-worksheet-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wrapfig-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wrapfig-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wtref-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wtref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xargs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xargs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xassoccnt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xassoccnt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xbmks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xbmks-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcntperchap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcntperchap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcolor-material-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcolor-material-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcolor-solarized-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcolor-solarized-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcomment-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcomment-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcookybooky-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcookybooky-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcpdftips-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcpdftips-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xdoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xdoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xellipsis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xellipsis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xfakebold-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xfakebold-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xfor-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xfor-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xhfill-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xhfill-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xifthen-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xifthen-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xint-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xint-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xkcdcolors-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xkcdcolors-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xltabular-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xltabular-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xmpincl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xmpincl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xnewcommand-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xnewcommand-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xoptarg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xoptarg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpatch-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpatch-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpeek-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpeek-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xprintlen-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xprintlen-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpunctuate-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpunctuate-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xsavebox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xsavebox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xsim-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xsim-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xstring-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xstring-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xtab-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xtab-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xurl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xurl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xwatermark-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xwatermark-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xytree-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xytree-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yafoot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yafoot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yaletter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yaletter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yagusylo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yagusylo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ycbook-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ycbook-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ydoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ydoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yplan-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yplan-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zebra-goodies-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zebra-goodies-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zed-csp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zed-csp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ziffer-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ziffer-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zref-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zwgetfdate-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zwgetfdate-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zwpagelayout-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zwpagelayout-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-latexextra-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-latexextra-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-2up.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-2up.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ESIEEcv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ESIEEcv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-GS1.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-GS1.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-HA-prosper.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-HA-prosper.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-Tabbing.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-Tabbing.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-a0poster.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-a0poster.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-a4wide.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-a4wide.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-a5comb.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-a5comb.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abraces.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abraces.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abstract.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abstract.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accessibility.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accessibility.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accsupp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accsupp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-achemso.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-achemso.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acro.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acro.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acronym.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acronym.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acroterm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acroterm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-actuarialangle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-actuarialangle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-actuarialsymbol.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-actuarialsymbol.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-addfont.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-addfont.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-addlines.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-addlines.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adjmulticol.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adjmulticol.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adjustbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adjustbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adrconv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adrconv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-advdate.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-advdate.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-akktex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-akktex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-akletter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-akletter.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alertmessage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alertmessage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alnumsec.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alnumsec.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alphalph.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alphalph.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-altfont.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-altfont.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsaddr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsaddr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-animate.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-animate.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anonchap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anonchap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-answers.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-answers.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anyfontsize.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anyfontsize.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-appendix.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-appendix.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-appendixnumberbeamer.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-appendixnumberbeamer.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apptools.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apptools.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabicfront.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabicfront.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arcs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arcs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arraycols.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arraycols.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arrayjobx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arrayjobx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arraysort.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arraysort.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arydshln.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arydshln.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asciilist.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asciilist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-askinclude.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-askinclude.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-assignment.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-assignment.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-assoccnt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-assoccnt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-atenddvi.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-atenddvi.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-attachfile.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-attachfile.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aurl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aurl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-authoraftertitle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-authoraftertitle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-authorarchive.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-authorarchive.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-authorindex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-authorindex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autofancyhdr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autofancyhdr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autonum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autonum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autopdf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autopdf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-avremu.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-avremu.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-axessibility.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-axessibility.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-background.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-background.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bankstatement.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bankstatement.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bashful.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bashful.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-basicarith.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-basicarith.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bchart.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bchart.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer2thesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer2thesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer-rl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer-rl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beameraudience.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beameraudience.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerauxtheme.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerauxtheme.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamercolorthemeowl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamercolorthemeowl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerdarkthemes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerdarkthemes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerposter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerposter.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamersubframe.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamersubframe.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-cuerna.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-cuerna.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-detlevcm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-detlevcm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-epyt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-epyt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-focus.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-focus.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-light.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-light.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-metropolis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-metropolis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-npbt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-npbt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-phnompenh.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-phnompenh.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-saintpetersburg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-saintpetersburg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-upenn-bc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-upenn-bc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerthemenirma.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerthemenirma.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bearwear.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bearwear.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beton.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beton.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bewerbung.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bewerbung.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bez123.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bez123.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bhcexam.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bhcexam.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibletext.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibletext.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bigfoot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bigfoot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bigints.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bigints.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biochemistry-colors.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biochemistry-colors.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bizcard.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bizcard.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blindtext.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blindtext.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blkarray.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blkarray.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-block.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-block.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blowup.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blowup.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bnumexpr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bnumexpr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boites.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boites.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bold-extra.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bold-extra.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookcover.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookcover.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookest.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookest.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-booklet.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-booklet.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boolexpr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boolexpr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bophook.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bophook.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boxedminipage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boxedminipage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boxedminipage2e.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boxedminipage2e.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boxhandler.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boxhandler.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bracketkey.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bracketkey.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-braket.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-braket.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-breakurl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-breakurl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bullcntr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bullcntr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxcalc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxcalc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxdpx-beamer.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxdpx-beamer.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxdvidriver.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxdvidriver.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxenclose.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxenclose.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxnewfont.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxnewfont.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxpapersize.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxpapersize.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxpdfver.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxpdfver.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxtexlogo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxtexlogo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calcage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calcage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calctab.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calctab.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calculator.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calculator.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calrsfs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calrsfs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cals.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cals.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calxxxx-yyyy.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calxxxx-yyyy.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cancel.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cancel.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-canoniclayout.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-canoniclayout.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-capt-of.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-capt-of.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-captcont.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-captcont.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-captdef.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-captdef.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-carbohydrates.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-carbohydrates.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cases.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cases.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-casyl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-casyl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catchfile.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catchfile.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catchfilebetweentags.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catchfilebetweentags.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catechis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catechis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catoptions.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catoptions.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cbcoptic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cbcoptic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ccaption.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ccaption.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cclicenses.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cclicenses.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cd.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cd.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cd-cover.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cd-cover.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cdpbundl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cdpbundl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cellprops.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cellprops.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cellspace.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cellspace.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-censor.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-censor.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-centeredline.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-centeredline.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changebar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changebar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changelayout.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changelayout.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changelog.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changelog.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changepage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changepage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chappg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chappg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chapterfolder.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chapterfolder.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cheatsheet.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cheatsheet.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-checkend.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-checkend.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chet.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chet.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chextras.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chextras.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-childdoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-childdoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chkfloat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chkfloat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chletter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chletter.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chngcntr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chngcntr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chronology.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chronology.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circ.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circ.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circledsteps.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circledsteps.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-classics.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-classics.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-classpack.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-classpack.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clefval.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clefval.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cleveref.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cleveref.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clipboard.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clipboard.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clock.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clock.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cloze.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cloze.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clrdblpg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clrdblpg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clrstrip.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clrstrip.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmdstring.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmdstring.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmdtrack.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmdtrack.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmsd.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmsd.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cnltx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cnltx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cntformats.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cntformats.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cntperchap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cntperchap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codedoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codedoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codepage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codepage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codesection.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codesection.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collcell.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collcell.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collectbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collectbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colophon.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colophon.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colordoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colordoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorinfo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorinfo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coloring.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coloring.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorspace.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorspace.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colortab.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colortab.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorwav.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorwav.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorweb.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorweb.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colourchange.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colourchange.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combelow.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combelow.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combine.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combine.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comma.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comma.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-commado.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-commado.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-commedit.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-commedit.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comment.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comment.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-competences.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-competences.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-concepts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-concepts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-concprog.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-concprog.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-constants.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-constants.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-continue.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-continue.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-contour.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-contour.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-contracard.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-contracard.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-conv-xkv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-conv-xkv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooking.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooking.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooking-units.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooking-units.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cool.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cool.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coollist.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coollist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coolstr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coolstr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coolthms.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coolthms.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooltooltips.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooltooltips.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coordsys.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coordsys.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-copyedit.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-copyedit.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-copyrightbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-copyrightbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coseoul.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coseoul.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-counttexruns.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-counttexruns.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-courseoutline.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-courseoutline.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coursepaper.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coursepaper.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coverpage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coverpage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cprotect.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cprotect.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossreference.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossreference.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossreftools.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossreftools.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csquotes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csquotes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-css-colors.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-css-colors.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csvmerge.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csvmerge.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csvsimple.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csvsimple.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cuisine.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cuisine.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currency.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currency.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currfile.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currfile.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currvita.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currvita.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cutwin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cutwin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cv4tw.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cv4tw.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cweb-latex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cweb-latex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyber.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyber.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cybercic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cybercic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashrule.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashrule.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashundergaps.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashundergaps.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dataref.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dataref.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datatool.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datatool.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dateiliste.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dateiliste.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datenumber.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datenumber.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-bahasai.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-bahasai.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-basque.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-basque.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-breton.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-breton.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-bulgarian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-bulgarian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-catalan.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-catalan.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-croatian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-croatian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-czech.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-czech.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-danish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-danish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-dutch.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-dutch.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-en-fulltext.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-en-fulltext.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-english.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-english.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-esperanto.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-esperanto.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-estonian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-estonian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-finnish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-finnish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-french.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-french.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-galician.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-galician.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-german.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-german.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-greek.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-greek.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-hebrew.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-hebrew.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-icelandic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-icelandic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-irish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-irish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-italian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-italian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-it-fulltext.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-it-fulltext.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-latin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-latin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-lsorbian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-lsorbian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-magyar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-magyar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-norsk.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-norsk.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-polish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-polish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-portuges.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-portuges.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-romanian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-romanian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-russian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-russian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-samin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-samin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-scottish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-scottish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-serbian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-serbian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-slovak.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-slovak.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-slovene.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-slovene.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-spanish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-spanish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-swedish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-swedish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-turkish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-turkish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-ukrainian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-ukrainian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-usorbian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-usorbian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-welsh.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-welsh.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dblfloatfix.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dblfloatfix.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-decimal.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-decimal.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-decorule.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-decorule.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-delimtxt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-delimtxt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-denisbdoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-denisbdoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diagbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diagbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diagnose.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diagnose.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dialogl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dialogl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dichokey.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dichokey.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dinbrief.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dinbrief.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-directory.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-directory.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dirtytalk.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dirtytalk.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dlfltxb.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dlfltxb.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dnaseq.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dnaseq.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doclicense.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doclicense.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docmfp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docmfp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docmute.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docmute.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doctools.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doctools.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-documentation.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-documentation.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doi.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doi.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dotarrow.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dotarrow.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dotlessi.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dotlessi.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dotseqn.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dotseqn.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-download.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-download.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dpfloat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dpfloat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dprogress.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dprogress.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drac.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drac.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-draftcopy.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-draftcopy.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-draftfigure.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-draftfigure.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-draftwatermark.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-draftwatermark.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtk.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtk.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxdescribe.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtxdescribe.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxgallery.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtxgallery.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-duckuments.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-duckuments.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ducksay.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ducksay.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvdcoll.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dvdcoll.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dynamicnumber.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dynamicnumber.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dynblocks.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dynblocks.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ean13isbn.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ean13isbn.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easy.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easy.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easy-todo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easy-todo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyfig.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyfig.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyformat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyformat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easylist.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easylist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyreview.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyreview.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebezier.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebezier.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecclesiastic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecclesiastic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ed.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ed.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-edmargin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-edmargin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eemeir.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eemeir.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-efbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-efbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-egplot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-egplot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ehhline.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ehhline.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elegantbook.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elegantbook.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elegantnote.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elegantnote.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elegantpaper.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elegantpaper.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elements.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elements.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ellipsis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ellipsis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elmath.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elmath.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elocalloc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elocalloc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elpres.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elpres.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elzcards.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elzcards.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emarks.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emarks.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-embedall.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-embedall.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-embedfile.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-embedfile.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-embrac.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-embrac.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emptypage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emptypage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emulateapj.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emulateapj.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endfloat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endfloat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endheads.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endheads.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endnotes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endnotes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-engpron.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-engpron.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-engrec.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-engrec.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enotez.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enotez.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enumitem.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enumitem.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enumitem-zref.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enumitem-zref.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-envbig.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-envbig.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-environ.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-environ.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-envlab.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-envlab.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epigraph.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epigraph.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epiolmec.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epiolmec.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqell.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqell.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqlist.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqlist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqnalign.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqnalign.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqparbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqparbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-errata.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-errata.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erw-l3.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erw-l3.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esami.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esami.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esdiff.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esdiff.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esindex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esindex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esint.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esint.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esint-type1.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esint-type1.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etaremune.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etaremune.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etextools.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etextools.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eukdate.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eukdate.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eulerpx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eulerpx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-europasscv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-europasscv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-europecv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-europecv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-everyhook.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-everyhook.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-everypage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-everypage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exam.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exam.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exam-n.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exam-n.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exam-randomizechoices.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exam-randomizechoices.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-examdesign.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-examdesign.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exframe.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exframe.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-examplep.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-examplep.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exceltex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exceltex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-excludeonly.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-excludeonly.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercise.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercise.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercisebank.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercisebank.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercisepoints.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercisepoints.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercises.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercises.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exp-testopt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exp-testopt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expdlist.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expdlist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-export.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-export.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exsheets.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exsheets.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exsol.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exsol.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-extract.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-extract.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-facsimile.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-facsimile.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-factura.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-factura.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyhandout.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyhandout.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancylabel.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancylabel.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancynum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancynum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancypar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancypar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyslides.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyslides.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancytabs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancytabs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancytooltips.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancytooltips.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fcolumn.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fcolumn.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fetchcls.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fetchcls.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fewerfloatpages.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fewerfloatpages.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ffslides.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ffslides.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fgruler.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fgruler.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fibeamer.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fibeamer.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fifo-stack.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fifo-stack.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-figsize.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-figsize.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filecontents.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filecontents.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filecontentsdef.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filecontentsdef.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filedate.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filedate.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fileinfo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fileinfo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filemod.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filemod.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fink.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fink.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-finstrut.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-finstrut.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fithesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fithesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixcmex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixcmex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixfoot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixfoot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixme.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixme.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixmetodonotes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixmetodonotes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fjodor.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fjodor.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flabels.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flabels.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flacards.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flacards.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flagderiv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flagderiv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flashcards.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flashcards.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flashmovie.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flashmovie.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flipbook.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flipbook.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flippdf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flippdf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-floatflt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-floatflt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-floatrow.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-floatrow.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flowfram.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flowfram.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fmp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fmp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fmtcount.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fmtcount.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fn2end.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fn2end.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnbreak.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnbreak.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fncychap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fncychap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fncylab.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fncylab.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnpara.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnpara.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnpct.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnpct.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnumprint.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnumprint.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-foilhtml.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-foilhtml.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontaxes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontaxes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontsetup.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontsetup.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontsize.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontsize.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonttable.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonttable.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footmisc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footmisc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footmisx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footmisx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnotebackref.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnotebackref.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnoterange.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnoterange.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnpag.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnpag.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forarray.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forarray.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-foreign.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-foreign.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forloop.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forloop.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-formlett.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-formlett.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forms16be.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forms16be.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-formular.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-formular.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fragments.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fragments.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frame.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frame.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-framed.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-framed.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frankenstein.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frankenstein.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frege.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frege.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ftcap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ftcap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ftnxtra.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ftnxtra.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fullblck.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fullblck.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fullminipage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fullminipage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fullwidth.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fullwidth.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fundus-calligra.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fundus-calligra.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fundus-sueterlin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fundus-sueterlin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fvextra.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fvextra.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fwlw.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fwlw.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-g-brief.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-g-brief.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gatherenum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gatherenum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gauss.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gauss.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gcard.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gcard.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gcite.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gcite.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gender.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gender.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-genmpage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-genmpage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-getfiledate.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-getfiledate.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-getitems.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-getitems.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gindex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gindex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ginpenc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ginpenc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitfile-info.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitfile-info.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitinfo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitinfo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitinfo2.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitinfo2.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitlog.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitlog.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitver.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitver.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-globalvals.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-globalvals.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gloss.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gloss.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-danish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-danish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-dutch.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-dutch.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-english.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-english.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-estonian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-estonian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-extra.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-extra.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-finnish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-finnish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-french.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-french.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-german.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-german.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-irish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-irish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-italian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-italian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-magyar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-magyar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-polish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-polish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-portuges.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-portuges.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-serbian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-serbian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-slovene.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-slovene.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-spanish.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-spanish.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmdoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmdoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmdoc-enhance.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmdoc-enhance.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmiflink.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmiflink.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmutils.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmutils.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmverb.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmverb.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grabbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grabbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphicx-psmin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphicx-psmin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphicxbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphicxbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grayhints.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grayhints.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grfpaste.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grfpaste.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grid.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grid.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grid-system.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grid-system.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gridset.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gridset.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gridslides.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gridslides.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitlogo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitlogo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-halloweenmath.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-halloweenmath.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hackthefootline.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hackthefootline.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-handin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-handin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-handout.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-handout.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hang.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hang.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hanging.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hanging.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hardwrap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hardwrap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harnon-cv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harnon-cv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harpoon.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harpoon.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-he-she.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-he-she.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hhtensor.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hhtensor.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-histogr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-histogr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hitec.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hitec.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hletter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hletter.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hobsub.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hobsub.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hpsdiss.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hpsdiss.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hrefhide.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hrefhide.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hvindex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hvindex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hvqrurl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hvqrurl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hypdvips.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hypdvips.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyper.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyper.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyperbar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyperbar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hypernat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hypernat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyperxmp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyperxmp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphenat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphenat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-identkey.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-identkey.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-idxcmds.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-idxcmds.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-idxlayout.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-idxlayout.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iffont.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iffont.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifmslide.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifmslide.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifmtarg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifmtarg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifnextok.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifnextok.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifoddpage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifoddpage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifthenx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifthenx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iitem.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iitem.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-image-gallery.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-image-gallery.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imakeidx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imakeidx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-import.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-import.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-incgraph.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-incgraph.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-indextools.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-indextools.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inline-images.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inline-images.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inlinedef.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inlinedef.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inputenx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inputenx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inputtrc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inputtrc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interactiveworkbook.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interactiveworkbook.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interfaces.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interfaces.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-intopdf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-intopdf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inversepath.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inversepath.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-invoice.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-invoice.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-invoice-class.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-invoice-class.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-invoice2.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-invoice2.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iso.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iso.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iso10303.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iso10303.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isodate.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isodate.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isodoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isodoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isonums.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isonums.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isopt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isopt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isorot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isorot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isotope.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isotope.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-issuulinks.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-issuulinks.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iwhdp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iwhdp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jlabels.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jlabels.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jslectureplanner.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jslectureplanner.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jumplines.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jumplines.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jvlisting.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jvlisting.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kalendarium.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kalendarium.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kantlipsum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kantlipsum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kerntest.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kerntest.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keycommand.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keycommand.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyfloat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyfloat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyreader.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyreader.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyindex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyindex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keystroke.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keystroke.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyval2e.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyval2e.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyvaltable.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyvaltable.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kix.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kix.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knowledge.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knowledge.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-koma-moderncvclassic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-koma-moderncvclassic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-koma-script-sfs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-koma-script-sfs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-komacv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-komacv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-komacv-rg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-komacv-rg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ktv-texdata.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ktv-texdata.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3build.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3build.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labbook.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labbook.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labels.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labels.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labels4easylist.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labels4easylist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labelschanged.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labelschanged.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lastpackage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lastpackage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lastpage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lastpage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-amsmath-dev.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-amsmath-dev.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-base-dev.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-base-dev.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-bin-dev.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-bin-dev.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-graphics-dev.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-graphics-dev.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-tds.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-tds.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-tools-dev.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-tools-dev.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-uni8.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-uni8.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcolors.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcolors.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexdemo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexdemo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexgit.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexgit.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-layouts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-layouts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lazylist.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lazylist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lccaps.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lccaps.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcd.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcd.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leading.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leading.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leaflet.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leaflet.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lectures.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lectures.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leftidx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leftidx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leipzig.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leipzig.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lengthconvert.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lengthconvert.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lettre.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lettre.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lettrine.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lettrine.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lewis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lewis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lhelp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lhelp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libgreek.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libgreek.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-limap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-limap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linegoal.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linegoal.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linop.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linop.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lipsum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lipsum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lisp-on-tex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lisp-on-tex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listing.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listing.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listingsutf8.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listingsutf8.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listlbls.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listlbls.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listliketab.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listliketab.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listofsymbols.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listofsymbols.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lkproof.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lkproof.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lmake.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lmake.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-locality.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-locality.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-localloc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-localloc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logical-markup-utils.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logical-markup-utils.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logpap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logpap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longfbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longfbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longfigure.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longfigure.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longnamefilelist.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longnamefilelist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-loops.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-loops.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lsc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lsc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lstaddons.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lstaddons.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lstfiracode.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lstfiracode.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lt3graph.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lt3graph.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltablex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltablex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltabptch.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltabptch.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxdockit.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxdockit.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxguidex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxguidex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxkeys.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxkeys.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxnew.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxnew.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxtools.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxtools.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-check-hyphen.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-check-hyphen.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatodonotes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatodonotes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-macroswap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-macroswap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-magaz.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-magaz.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-magicnum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-magicnum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecookbook.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecookbook.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makerobust.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makerobust.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mailing.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mailing.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mailmerge.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mailmerge.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makebarcode.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makebarcode.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makebase.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makebase.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makebox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makebox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecell.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecell.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecirc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecirc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecmds.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecmds.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makedtx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makedtx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makeglos.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makeglos.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mandi.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mandi.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-manuscript.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-manuscript.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-manyind.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-manyind.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginfit.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginfit.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginfix.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginfix.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginnote.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginnote.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-markdown.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-markdown.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathalpha.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathalpha.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathastext.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathastext.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathexam.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathexam.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathfam256.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathfam256.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathfont.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathfont.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-maybemath.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-maybemath.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcaption.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcaption.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mceinleger.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mceinleger.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcexam.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcexam.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcite.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcite.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mciteplus.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mciteplus.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdframed.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdframed.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-media9.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-media9.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-medstarbeamer.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-medstarbeamer.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-meetingmins.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-meetingmins.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memexsupp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memexsupp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memory.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memory.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mensa-tex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mensa-tex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-menu.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-menu.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-menukeys.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-menukeys.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metalogox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metalogox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metastr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metastr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-method.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-method.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metre.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metre.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfirstuc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfirstuc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mftinc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mftinc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mi-solns.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mi-solns.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-midpage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-midpage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minibox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minibox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minidocument.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minidocument.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minifp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minifp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minipage-marginpar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minipage-marginpar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minitoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minitoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minorrevision.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minorrevision.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minted.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minted.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minutes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minutes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mla-paper.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mla-paper.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mleftright.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mleftright.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mlist.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mlist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mmap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mmap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mnotes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mnotes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moderncv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moderncv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modernposter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modernposter.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moderntimeline.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moderntimeline.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modref.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modref.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modroman.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modroman.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modular.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modular.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-monofill.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-monofill.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moodle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moodle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moreenum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moreenum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morefloats.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morefloats.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morehype.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morehype.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moresize.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moresize.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moreverb.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moreverb.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morewrites.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morewrites.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-movie15.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-movie15.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mparhack.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mparhack.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpostinl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpostinl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-msc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-msc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-msg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-msg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mslapa.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mslapa.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mtgreek.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mtgreek.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multenum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multenum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multiaudience.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multiaudience.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multibbl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multibbl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multicap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multicap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multicolrule.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multicolrule.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multidef.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multidef.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multienv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multienv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multiexpand.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multiexpand.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multilang.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multilang.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multirow.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multirow.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mversion.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mversion.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mwe.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mwe.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mycv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mycv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mylatexformat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mylatexformat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nag.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nag.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nameauth.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nameauth.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-namespc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-namespc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ncclatex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ncclatex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ncctools.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ncctools.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-needspace.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-needspace.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newcommand.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newcommand.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newenviron.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newenviron.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newfile.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newfile.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newlfm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newlfm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newspaper.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newspaper.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newunicodechar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newunicodechar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newvbtm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newvbtm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newverbs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newverbs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nfssext-cfr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nfssext-cfr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nicefilelist.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nicefilelist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-niceframe.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-niceframe.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nicetext.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nicetext.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nidanfloat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nidanfloat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nlctdoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nlctdoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noconflict.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noconflict.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noindentafter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noindentafter.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noitcrul.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noitcrul.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nolbreaks.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nolbreaks.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nomencl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nomencl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nomentbl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nomentbl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nonfloat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nonfloat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nonumonpart.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nonumonpart.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nopageno.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nopageno.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-normalcolor.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-normalcolor.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notespages.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notespages.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notestex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notestex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notoccite.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notoccite.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nowidow.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nowidow.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ntheorem.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ntheorem.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numberedblock.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numberedblock.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numname.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numname.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numprint.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numprint.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numspell.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numspell.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocg-p.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocg-p.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocgx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocgx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocgx2.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocgx2.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocr-latex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocr-latex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-octavo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-octavo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oldstyle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oldstyle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-onlyamsmath.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-onlyamsmath.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-opcit.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-opcit.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-optidef.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-optidef.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-optional.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-optional.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-options.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-options.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outline.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outline.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outliner.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outliner.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outlines.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outlines.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outlining.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outlining.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-overlays.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-overlays.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-overpic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-overpic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-padcount.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-padcount.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagecolor.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagecolor.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagecont.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagecont.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagenote.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagenote.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagerange.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagerange.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pageslts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pageslts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paper.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paper.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papercdcase.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papercdcase.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papermas.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papermas.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papertex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papertex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paracol.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paracol.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parades.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parades.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paralist.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paralist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paresse.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paresse.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parnotes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parnotes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parsa.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parsa.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parselines.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parselines.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pas-cours.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pas-cours.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pas-cv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pas-cv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pas-tableur.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pas-tableur.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patchcmd.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-patchcmd.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pauldoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pauldoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pawpict.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pawpict.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbsheet.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbsheet.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdf14.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdf14.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcolmk.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfcolmk.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcomment.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfcomment.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcprot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfcprot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfmarginpar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfmarginpar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfoverlay.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfoverlay.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpagediff.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpagediff.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpc-movie.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpc-movie.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfprivacy.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfprivacy.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfreview.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfreview.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfscreen.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfscreen.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfslide.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfslide.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfsync.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfsync.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfwin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfwin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pecha.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pecha.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-perltex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-perltex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-permute.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-permute.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-petiteannonce.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-petiteannonce.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phffullpagefigure.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phffullpagefigure.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfnote.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfnote.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfparen.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfparen.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfqit.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfqit.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfquotetext.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfquotetext.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfsvnwatermark.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfsvnwatermark.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfthm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfthm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-philex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-philex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phonenumbers.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phonenumbers.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-photo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-photo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-picture.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-picture.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-piff.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-piff.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pkgloader.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pkgloader.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-placeins.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-placeins.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plantslabels.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plantslabels.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plates.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plates.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plweb.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plweb.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmboxdraw.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmboxdraw.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polynom.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polynom.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polynomial.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polynomial.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polytable.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polytable.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-postcards.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-postcards.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poster-mac.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poster-mac.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-powerdot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-powerdot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ppr-prv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ppr-prv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-practicalreports.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-practicalreports.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-preprint.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-preprint.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pressrelease.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pressrelease.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prettyref.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prettyref.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-preview.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-preview.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-printlen.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-printlen.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-probsoln.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-probsoln.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-program.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-program.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-progress.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-progress.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-progressbar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-progressbar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proofread.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proofread.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-properties.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-properties.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prosper.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prosper.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-protex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-protex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-protocol.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-protocol.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psfragx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psfragx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pstool.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pstool.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pstring.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pstring.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxgreeks.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxgreeks.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pygmentex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pygmentex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-python.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-python.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qcm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qcm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qstest.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qstest.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qsymbols.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qsymbols.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quicktype.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quicktype.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quiz2socrative.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quiz2socrative.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quotchap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quotchap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quoting.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quoting.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quotmark.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quotmark.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ran_toks.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ran_toks.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randtext.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randtext.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rccol.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rccol.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rcs-multi.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rcs-multi.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rcsinfo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rcsinfo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-readarray.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-readarray.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realboxes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realboxes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recipe.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recipe.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recipebook.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recipebook.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recipecard.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recipecard.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rectopma.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rectopma.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refcheck.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refcheck.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refenums.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refenums.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reflectgraphics.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reflectgraphics.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refman.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refman.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refstyle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refstyle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regcount.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regcount.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regexpatch.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regexpatch.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-register.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-register.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regstats.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regstats.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-relenc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-relenc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-relsize.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-relsize.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-repeatindex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-repeatindex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-repltext.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-repltext.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-returntogrid.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-returntogrid.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rgltxdoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rgltxdoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rjlparshap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rjlparshap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rlepsf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rlepsf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rmpage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rmpage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-robustcommand.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-robustcommand.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-robustindex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-robustindex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romanbar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romanbar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romanbarpagenumber.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romanbarpagenumber.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romanneg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romanneg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romannum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romannum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rotfloat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rotfloat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rotpages.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rotpages.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-roundbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-roundbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rterface.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rterface.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rtkinenc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rtkinenc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rulerbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rulerbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rulercompass.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rulercompass.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rvwrite.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rvwrite.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sanitize-umlaut.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sanitize-umlaut.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sauerj.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sauerj.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-savefnmark.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-savefnmark.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-savetrees.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-savetrees.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scale.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scale.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scalebar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scalebar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scalerel.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scalerel.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scanpages.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scanpages.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schedule.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schedule.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scontents.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scontents.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scrlttr2copy.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scrlttr2copy.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sdaps.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sdaps.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sdrt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sdrt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-secdot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-secdot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-secnum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-secnum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sectionbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sectionbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sectionbreak.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sectionbreak.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sectsty.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sectsty.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seealso.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seealso.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-selectp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-selectp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-selinput.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-selinput.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semantic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semantic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semantic-markup.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semantic-markup.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semioneside.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semioneside.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semproc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semproc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sepfootnotes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sepfootnotes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seqsplit.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seqsplit.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sesstime.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sesstime.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sf298.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sf298.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sffms.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sffms.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shadethm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shadethm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shadow.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shadow.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shadowtext.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shadowtext.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shapepar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shapepar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shdoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shdoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shipunov.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shipunov.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shorttoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shorttoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-show2e.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-show2e.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showcharinbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showcharinbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showdim.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showdim.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showexpl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showexpl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showhyphens.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showhyphens.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showlabels.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showlabels.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sidecap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sidecap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sidenotes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sidenotes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-silence.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-silence.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplecd.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplecd.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplecv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplecv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simpleinvoice.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simpleinvoice.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sitem.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sitem.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skb.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skb.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skdoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skdoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skeycommand.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skeycommand.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skeyval.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skeyval.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skrapport.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skrapport.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-slantsc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-slantsc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smalltableof.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smalltableof.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smartunits.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smartunits.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smartref.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smartref.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-snapshot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-snapshot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-snotez.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-snotez.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soul.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soul.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soulpos.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soulpos.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soulutf8.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soulutf8.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spacingtricks.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spacingtricks.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spark-otf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spark-otf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sparklines.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sparklines.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sphack.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sphack.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-splitindex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-splitindex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spotcolor.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spotcolor.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spreadtab.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spreadtab.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spverbatim.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spverbatim.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srbook-mem.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-srbook-mem.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srcltx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-srcltx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sseq.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sseq.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sslides.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sslides.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stackengine.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stackengine.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-standalone.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-standalone.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stdclsdv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stdclsdv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stealcaps.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stealcaps.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stdpage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stdpage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-storebox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-storebox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-storecmd.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-storecmd.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stringstrings.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stringstrings.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sttools.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sttools.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stubs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stubs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-studenthandouts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-studenthandouts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subdepth.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subdepth.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subdocs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subdocs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subeqn.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subeqn.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subeqnarray.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subeqnarray.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfigmat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfigmat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfigure.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfigure.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfiles.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfiles.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfloat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfloat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-substitutefont.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-substitutefont.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-substr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-substr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-supertabular.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-supertabular.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svgcolor.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svgcolor.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn-multi.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn-multi.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn-prov.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn-prov.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svninfo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svninfo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-syntax.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-syntax.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-syntrace.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-syntrace.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-synttree.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-synttree.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabfigures.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabfigures.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tableaux.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tableaux.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablefootnote.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablefootnote.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tableof.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tableof.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablestyles.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablestyles.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablists.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablists.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabls.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabls.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablvar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablvar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabstackengine.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabstackengine.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabto-ltx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabto-ltx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabu.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabu.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabularborder.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabularborder.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabularcalc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabularcalc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabularew.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabularew.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabulary.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabulary.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tagging.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tagging.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tagpair.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tagpair.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tagpdf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tagpdf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-talk.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-talk.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tamefloats.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tamefloats.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tasks.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tasks.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tcldoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tcldoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tcolorbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tcolorbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tdclock.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tdclock.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-technics.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-technics.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ted.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ted.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-templatetools.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-templatetools.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termcal.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termcal.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termlist.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termlist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-testhyphens.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-testhyphens.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-testidx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-testidx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-label.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-label.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-locale.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-locale.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texmate.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texmate.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texments.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texments.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texpower.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texpower.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texshade.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texshade.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texvc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texvc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textfit.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textfit.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textmerg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textmerg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textpos.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textpos.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textualicomma.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textualicomma.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-theoremref.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-theoremref.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thinsp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thinsp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thmtools.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thmtools.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threadcol.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threadcol.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threeparttable.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threeparttable.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threeparttablex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threeparttablex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumb.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumb.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumbs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumbs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumby.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumby.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ticket.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ticket.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlecaps.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlecaps.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlepic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlepic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titleref.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titleref.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlesec.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlesec.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titling.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titling.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocbibind.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocbibind.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocdata.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocdata.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocloft.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocloft.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocvsec2.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocvsec2.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-todo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-todo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-todonotes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-todonotes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tokcycle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tokcycle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tokenizer.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tokenizer.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-toolbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-toolbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-topfloat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-topfloat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-topiclongtable.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-topiclongtable.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-totcount.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-totcount.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-totpages.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-totpages.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translations.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translations.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-transparent.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-transparent.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trfsigns.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trfsigns.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trimspaces.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trimspaces.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trivfloat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trivfloat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trsym.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trsym.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-truncate.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-truncate.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tucv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tucv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turnthepage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turnthepage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-twoinone.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-twoinone.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-twoup.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-twoup.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-txgreeks.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-txgreeks.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-type1cm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-type1cm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typed-checklist.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typed-checklist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typeface.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typeface.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typoaid.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typoaid.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typogrid.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typogrid.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uassign.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uassign.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uebungsblatt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uebungsblatt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umoline.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umoline.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-underlin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-underlin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-underoverlap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-underoverlap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-undolabl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-undolabl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-units.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-units.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unravel.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unravel.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-upmethodology.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-upmethodology.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-upquote.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-upquote.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uri.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uri.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ushort.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ushort.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uspace.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uspace.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uwmslide.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uwmslide.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-variablelm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-variablelm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-varindex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-varindex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-varsfromjobname.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-varsfromjobname.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-varwidth.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-varwidth.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vdmlisting.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vdmlisting.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbasef.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbasef.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbatimbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbatimbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbatimcopy.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbatimcopy.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbdef.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbdef.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbments.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbments.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-version.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-version.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-versions.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-versions.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-versonotes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-versonotes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vertbars.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vertbars.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vgrid.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vgrid.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vhistory.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vhistory.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vmargin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vmargin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-volumes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-volumes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vpe.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vpe.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vruler.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vruler.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vtable.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vtable.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vwcol.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vwcol.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wallcalendar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wallcalendar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wallpaper.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wallpaper.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-warning.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-warning.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-warpcol.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-warpcol.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-was.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-was.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-webquiz.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-webquiz.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-widetable.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-widetable.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-widows-and-orphans.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-widows-and-orphans.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-williams.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-williams.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-withargs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-withargs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wordcount.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wordcount.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wordlike.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wordlike.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-worksheet.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-worksheet.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wrapfig.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wrapfig.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wtref.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wtref.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xargs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xargs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xassoccnt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xassoccnt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xbmks.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xbmks.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcntperchap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcntperchap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcolor-material.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcolor-material.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcolor-solarized.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcolor-solarized.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcomment.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcomment.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcookybooky.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcookybooky.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcpdftips.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcpdftips.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xdoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xdoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xellipsis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xellipsis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xfakebold.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xfakebold.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xfor.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xfor.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xhfill.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xhfill.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xifthen.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xifthen.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xint.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xint.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xkcdcolors.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xkcdcolors.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xltabular.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xltabular.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xmpincl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xmpincl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xnewcommand.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xnewcommand.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xoptarg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xoptarg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpatch.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpatch.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpeek.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpeek.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xprintlen.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xprintlen.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpunctuate.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpunctuate.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xsavebox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xsavebox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xsim.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xsim.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xstring.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xstring.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xtab.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xtab.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xurl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xurl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xwatermark.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xwatermark.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xytree.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xytree.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yafoot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yafoot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yaletter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yaletter.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yagusylo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yagusylo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ycbook.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ycbook.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ydoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ydoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yplan.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yplan.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zebra-goodies.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zebra-goodies.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zed-csp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zed-csp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ziffer.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ziffer.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zref.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zref.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zwgetfdate.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zwgetfdate.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zwpagelayout.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zwpagelayout.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ESIEEcv.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ESIEEcv.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-GS1.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-GS1.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-HA-prosper.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-HA-prosper.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-Tabbing.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-Tabbing.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abstract.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abstract.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accessibility.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accessibility.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accsupp.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accsupp.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-achemso.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-achemso.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acronym.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acronym.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acroterm.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acroterm.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-actuarialangle.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-actuarialangle.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-actuarialsymbol.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-actuarialsymbol.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-addlines.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-addlines.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adjmulticol.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adjmulticol.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adjustbox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adjustbox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adrconv.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adrconv.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alertmessage.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alertmessage.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alnumsec.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alnumsec.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alphalph.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alphalph.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-altfont.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-altfont.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsaddr.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsaddr.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-animate.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-animate.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-answers.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-answers.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-appendix.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-appendix.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apptools.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apptools.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arcs.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arcs.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arraycols.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arraycols.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arraysort.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arraysort.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arydshln.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arydshln.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asciilist.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asciilist.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-askinclude.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-askinclude.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-atenddvi.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-atenddvi.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-attachfile.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-attachfile.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autonum.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autonum.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autopdf.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autopdf.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-avremu.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-avremu.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-axessibility.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-axessibility.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-background.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-background.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-basicarith.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-basicarith.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamercolorthemeowl.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamercolorthemeowl.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamersubframe.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamersubframe.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-cuerna.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-cuerna.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-metropolis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-metropolis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-saintpetersburg.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-saintpetersburg.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bearwear.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bearwear.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beton.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beton.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bewerbung.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bewerbung.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bez123.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bez123.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bhcexam.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bhcexam.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bigfoot.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bigfoot.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bizcard.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bizcard.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blindtext.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blindtext.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blowup.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blowup.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bnumexpr.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bnumexpr.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boites.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boites.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookcover.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookcover.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-booklet.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-booklet.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boolexpr.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boolexpr.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bophook.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bophook.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boxedminipage2e.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boxedminipage2e.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boxhandler.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boxhandler.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-breakurl.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-breakurl.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bullcntr.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bullcntr.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calcage.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calcage.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calculator.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calculator.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cals.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cals.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-canoniclayout.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-canoniclayout.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-capt-of.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-capt-of.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-captcont.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-captcont.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catchfile.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catchfile.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catchfilebetweentags.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catchfilebetweentags.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catechis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catechis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ccaption.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ccaption.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cclicenses.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cclicenses.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cd.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cd.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cd-cover.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cd-cover.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cdpbundl.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cdpbundl.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cellprops.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cellprops.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changebar.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changebar.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changepage.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changepage.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changes.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changes.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chappg.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chappg.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chapterfolder.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chapterfolder.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cheatsheet.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cheatsheet.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chextras.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chextras.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-childdoc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-childdoc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chletter.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chletter.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circ.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circ.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-classpack.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-classpack.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clefval.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clefval.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cleveref.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cleveref.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cloze.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cloze.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clrdblpg.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clrdblpg.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clrstrip.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clrstrip.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmdtrack.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmdtrack.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codepage.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codepage.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codesection.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codesection.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collcell.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collcell.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collectbox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collectbox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colophon.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colophon.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colordoc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colordoc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorwav.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorwav.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorweb.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorweb.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combine.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combine.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-commado.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-commado.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-commedit.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-commedit.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-competences.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-competences.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-constants.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-constants.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-continue.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-continue.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-contour.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-contour.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-contracard.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-contracard.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-conv-xkv.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-conv-xkv.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooking.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooking.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooking-units.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooking-units.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cool.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cool.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coollist.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coollist.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coolstr.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coolstr.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coolthms.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coolthms.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooltooltips.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooltooltips.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coordsys.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coordsys.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-copyedit.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-copyedit.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-counttexruns.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-counttexruns.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coverpage.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coverpage.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cprotect.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cprotect.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossreference.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossreference.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csvmerge.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csvmerge.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cuisine.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cuisine.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currency.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currency.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currfile.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currfile.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currvita.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currvita.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cutwin.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cutwin.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyber.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyber.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cybercic.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cybercic.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashbox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashbox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashrule.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashrule.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashundergaps.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashundergaps.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datatool.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datatool.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dateiliste.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dateiliste.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datenumber.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datenumber.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-bahasai.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-bahasai.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-basque.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-basque.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-breton.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-breton.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-bulgarian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-bulgarian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-catalan.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-catalan.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-croatian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-croatian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-czech.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-czech.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-danish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-danish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-dutch.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-dutch.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-en-fulltext.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-en-fulltext.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-english.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-english.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-esperanto.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-esperanto.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-estonian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-estonian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-finnish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-finnish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-french.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-french.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-galician.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-galician.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-german.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-german.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-greek.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-greek.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-hebrew.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-hebrew.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-icelandic.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-icelandic.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-irish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-irish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-italian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-italian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-it-fulltext.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-it-fulltext.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-latin.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-latin.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-lsorbian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-lsorbian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-magyar.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-magyar.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-norsk.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-norsk.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-polish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-polish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-portuges.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-portuges.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-romanian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-romanian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-russian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-russian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-samin.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-samin.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-scottish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-scottish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-serbian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-serbian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-slovak.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-slovak.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-slovene.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-slovene.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-spanish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-spanish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-swedish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-swedish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-turkish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-turkish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-ukrainian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-ukrainian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-usorbian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-usorbian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-welsh.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-welsh.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-decimal.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-decimal.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-decorule.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-decorule.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-delimtxt.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-delimtxt.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-denisbdoc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-denisbdoc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diagbox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diagbox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dialogl.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dialogl.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dinbrief.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dinbrief.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dirtytalk.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dirtytalk.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dnaseq.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dnaseq.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doclicense.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doclicense.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docmfp.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docmfp.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docmute.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docmute.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doctools.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doctools.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-documentation.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-documentation.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dotarrow.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dotarrow.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dotseqn.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dotseqn.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-download.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-download.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dprogress.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dprogress.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drac.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drac.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-draftcopy.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-draftcopy.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-draftwatermark.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-draftwatermark.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxdescribe.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtxdescribe.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-duckuments.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-duckuments.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ducksay.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ducksay.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dynamicnumber.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dynamicnumber.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyfig.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyfig.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyreview.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyreview.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebezier.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebezier.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecclesiastic.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecclesiastic.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecv.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecv.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ed.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ed.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-edmargin.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-edmargin.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eemeir.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eemeir.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-efbox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-efbox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-egplot.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-egplot.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ellipsis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ellipsis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elmath.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elmath.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elocalloc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elocalloc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elzcards.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elzcards.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emarks.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emarks.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-embedall.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-embedall.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-embedfile.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-embedfile.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emptypage.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emptypage.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endfloat.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endfloat.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endheads.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endheads.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-engpron.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-engpron.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-engrec.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-engrec.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enumitem-zref.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enumitem-zref.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-environ.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-environ.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-envlab.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-envlab.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epigraph.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epigraph.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epiolmec.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epiolmec.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqlist.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqlist.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqnalign.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqnalign.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqparbox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqparbox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-errata.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-errata.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erw-l3.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erw-l3.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esdiff.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esdiff.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esint.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esint.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etaremune.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etaremune.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etextools.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etextools.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etoc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etoc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eukdate.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eukdate.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-everyhook.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-everyhook.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-everypage.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-everypage.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exam-n.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exam-n.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-examdesign.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-examdesign.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exframe.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exframe.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercise.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercise.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercises.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercises.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exp-testopt.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exp-testopt.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expdlist.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expdlist.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-export.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-export.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exsol.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exsol.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-extract.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-extract.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-facsimile.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-facsimile.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-factura.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-factura.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancylabel.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancylabel.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancynum.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancynum.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancypar.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancypar.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancytabs.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancytabs.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancytooltips.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancytooltips.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fcolumn.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fcolumn.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fetchcls.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fetchcls.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fewerfloatpages.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fewerfloatpages.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fgruler.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fgruler.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fibeamer.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fibeamer.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fifo-stack.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fifo-stack.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filecontents.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filecontents.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filecontentsdef.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filecontentsdef.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filedate.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filedate.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fileinfo.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fileinfo.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fink.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fink.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-finstrut.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-finstrut.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fithesis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fithesis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixcmex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixcmex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixme.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixme.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixmetodonotes.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixmetodonotes.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flabels.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flabels.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flagderiv.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flagderiv.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flashcards.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flashcards.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flippdf.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flippdf.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-floatflt.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-floatflt.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-floatrow.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-floatrow.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flowfram.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flowfram.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fmp.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fmp.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fmtcount.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fmtcount.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnbreak.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnbreak.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnumprint.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnumprint.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-foilhtml.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-foilhtml.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontaxes.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontaxes.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontsize.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontsize.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonttable.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonttable.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footmisc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footmisc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footmisx.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footmisx.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnoterange.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnoterange.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnpag.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnpag.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forarray.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forarray.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-foreign.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-foreign.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forloop.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forloop.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forms16be.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forms16be.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-formular.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-formular.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frankenstein.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frankenstein.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ftnxtra.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ftnxtra.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fullblck.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fullblck.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fullminipage.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fullminipage.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fundus-calligra.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fundus-calligra.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fundus-sueterlin.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fundus-sueterlin.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fvextra.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fvextra.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-g-brief.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-g-brief.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gatherenum.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gatherenum.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gcite.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gcite.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gender.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gender.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-genmpage.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-genmpage.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-getitems.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-getitems.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ginpenc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ginpenc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitfile-info.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitfile-info.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-danish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-danish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-dutch.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-dutch.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-english.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-english.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-estonian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-estonian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-extra.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-extra.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-finnish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-finnish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-french.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-french.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-german.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-german.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-irish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-irish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-italian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-italian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-magyar.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-magyar.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-polish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-polish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-portuges.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-portuges.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-serbian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-serbian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-slovene.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-slovene.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-spanish.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-spanish.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmdoc-enhance.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmdoc-enhance.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grabbox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grabbox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphbox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphbox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphicx-psmin.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphicx-psmin.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphicxbox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphicxbox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grayhints.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grayhints.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grid.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grid.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gridset.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gridset.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitlogo.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitlogo.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-halloweenmath.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-halloweenmath.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hanging.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hanging.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hardwrap.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hardwrap.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hhtensor.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hhtensor.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-histogr.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-histogr.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hpsdiss.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hpsdiss.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hrefhide.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hrefhide.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyper.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyper.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyperbar.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyperbar.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyperxmp.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyperxmp.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphenat.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphenat.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-idxlayout.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-idxlayout.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iffont.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iffont.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifmtarg.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifmtarg.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifnextok.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifnextok.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifoddpage.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifoddpage.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iitem.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iitem.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imakeidx.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imakeidx.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-indextools.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-indextools.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inlinedef.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inlinedef.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inputenx.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inputenx.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inputtrc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inputtrc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interfaces.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interfaces.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-intopdf.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-intopdf.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inversepath.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inversepath.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-invoice2.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-invoice2.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iso.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iso.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iso10303.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iso10303.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isodate.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isodate.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isodoc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isodoc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isorot.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isorot.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isotope.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isotope.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-issuulinks.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-issuulinks.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jvlisting.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jvlisting.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kalendarium.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kalendarium.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kantlipsum.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kantlipsum.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kerntest.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kerntest.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keycommand.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keycommand.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyfloat.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyfloat.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyindex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyindex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyvaltable.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyvaltable.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knowledge.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knowledge.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-komacv.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-komacv.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-komacv-rg.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-komacv-rg.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ktv-texdata.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ktv-texdata.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3build.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3build.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labbook.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labbook.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labels.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labels.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labelschanged.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labelschanged.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lastpackage.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lastpackage.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lastpage.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lastpage.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-amsmath-dev.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-amsmath-dev.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-base-dev.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-base-dev.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-graphics-dev.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-graphics-dev.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-tds.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-tds.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-tools-dev.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-tools-dev.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcolors.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcolors.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexdemo.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexdemo.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexgit.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexgit.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-layouts.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-layouts.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lccaps.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lccaps.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcd.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcd.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcg.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcg.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leading.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leading.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leaflet.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leaflet.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leftidx.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leftidx.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leipzig.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leipzig.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lengthconvert.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lengthconvert.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lettrine.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lettrine.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lhelp.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lhelp.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libgreek.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libgreek.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-limap.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-limap.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linegoal.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linegoal.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lipsum.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lipsum.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listingsutf8.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listingsutf8.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listlbls.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listlbls.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listliketab.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listliketab.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listofsymbols.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listofsymbols.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lmake.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lmake.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-locality.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-locality.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-localloc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-localloc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logbox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logbox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logpap.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logpap.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longfigure.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longfigure.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longnamefilelist.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longnamefilelist.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lstaddons.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lstaddons.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxnew.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxnew.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatodonotes.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatodonotes.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-macroswap.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-macroswap.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-magicnum.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-magicnum.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mailing.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mailing.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mailmerge.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mailmerge.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makebase.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makebase.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makebox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makebox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecell.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecell.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecmds.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecmds.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makedtx.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makedtx.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mandi.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mandi.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-manfnt.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-manfnt.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-manuscript.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-manuscript.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginfit.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginfit.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginfix.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginfix.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginnote.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginnote.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-markdown.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-markdown.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathastext.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathastext.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathexam.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathexam.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathfont.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathfont.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcaption.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcaption.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcite.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcite.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdframed.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdframed.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-media9.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-media9.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-meetingmins.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-meetingmins.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memory.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memory.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-menu.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-menu.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-menukeys.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-menukeys.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metalogox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metalogox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metastr.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metastr.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-method.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-method.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metre.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metre.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfirstuc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfirstuc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mftinc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mftinc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mi-solns.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mi-solns.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minibox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minibox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minidocument.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minidocument.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minifp.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minifp.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minipage-marginpar.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minipage-marginpar.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minted.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minted.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minutes.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minutes.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mleftright.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mleftright.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mlist.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mlist.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mnotes.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mnotes.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moderntimeline.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moderntimeline.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modref.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modref.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modroman.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modroman.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-monofill.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-monofill.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moodle.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moodle.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morefloats.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morefloats.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morehype.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morehype.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moresize.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moresize.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moreverb.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moreverb.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morewrites.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morewrites.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mparhack.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mparhack.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpostinl.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpostinl.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-msg.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-msg.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mtgreek.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mtgreek.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multiaudience.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multiaudience.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multibbl.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multibbl.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multicap.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multicap.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multicolrule.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multicolrule.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multidef.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multidef.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multienv.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multienv.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multiexpand.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multiexpand.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multilang.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multilang.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multirow.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multirow.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mversion.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mversion.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mwe.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mwe.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mycv.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mycv.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mylatexformat.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mylatexformat.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nag.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nag.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nameauth.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nameauth.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-namespc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-namespc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ncctools.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ncctools.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-needspace.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-needspace.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newfile.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newfile.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newlfm.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newlfm.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newspaper.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newspaper.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newunicodechar.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newunicodechar.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newvbtm.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newvbtm.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newverbs.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newverbs.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nicefilelist.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nicefilelist.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-niceframe.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-niceframe.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nicetext.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nicetext.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nidanfloat.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nidanfloat.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noitcrul.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noitcrul.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nomencl.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nomencl.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nomentbl.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nomentbl.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nonfloat.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nonfloat.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nonumonpart.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nonumonpart.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-normalcolor.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-normalcolor.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notes.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notes.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notespages.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notespages.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nowidow.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nowidow.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ntheorem.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ntheorem.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numprint.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numprint.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocgx.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocgx.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-octavo.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-octavo.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oldstyle.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oldstyle.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-onlyamsmath.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-onlyamsmath.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-opcit.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-opcit.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outlining.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outlining.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-overpic.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-overpic.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-padcount.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-padcount.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagecolor.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagecolor.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagecont.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagecont.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagenote.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagenote.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pageslts.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pageslts.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paper.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paper.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papercdcase.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papercdcase.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papermas.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papermas.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papertex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papertex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paracol.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paracol.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paralist.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paralist.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paresse.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paresse.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parselines.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parselines.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patch.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-patch.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patchcmd.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-patchcmd.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pauldoc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pauldoc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pawpict.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pawpict.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbsheet.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbsheet.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdf14.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdf14.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcprot.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfcprot.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfoverlay.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfoverlay.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpc-movie.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpc-movie.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfprivacy.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfprivacy.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfx.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfx.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-perltex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-perltex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-permute.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-permute.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phffullpagefigure.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phffullpagefigure.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfnote.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfnote.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfparen.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfparen.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfqit.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfqit.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfquotetext.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfquotetext.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfsvnwatermark.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfsvnwatermark.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfthm.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfthm.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-photo.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-photo.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-picture.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-picture.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plweb.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plweb.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmboxdraw.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmboxdraw.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polynom.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polynom.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polynomial.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polynomial.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polytable.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polytable.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-powerdot.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-powerdot.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ppr-prv.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ppr-prv.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-preprint.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-preprint.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pressrelease.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pressrelease.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prettyref.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prettyref.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-preview.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-preview.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-probsoln.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-probsoln.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proofread.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proofread.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-protocol.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-protocol.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psfragx.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psfragx.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxgreeks.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxgreeks.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qcm.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qcm.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qstest.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qstest.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qsymbols.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qsymbols.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quotchap.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quotchap.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quoting.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quoting.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quotmark.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quotmark.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ran_toks.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ran_toks.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rccol.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rccol.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rcs-multi.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rcs-multi.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rcsinfo.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rcsinfo.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realboxes.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realboxes.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recipecard.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recipecard.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reflectgraphics.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reflectgraphics.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refman.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refman.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refstyle.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refstyle.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regcount.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regcount.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regexpatch.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regexpatch.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-register.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-register.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regstats.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regstats.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-relenc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-relenc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-repltext.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-repltext.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rgltxdoc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rgltxdoc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rjlparshap.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rjlparshap.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-robustcommand.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-robustcommand.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romanbar.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romanbar.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romanbarpagenumber.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romanbarpagenumber.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romannum.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romannum.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rotfloat.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rotfloat.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rtkinenc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rtkinenc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rulercompass.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rulercompass.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sauerj.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sauerj.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-savefnmark.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-savefnmark.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-savetrees.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-savetrees.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scale.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scale.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scalebar.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scalebar.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schedule.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schedule.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scontents.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scontents.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sdaps.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sdaps.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-secnum.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-secnum.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sectsty.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sectsty.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seealso.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seealso.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-selinput.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-selinput.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semantic.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semantic.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semioneside.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semioneside.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semproc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semproc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seqsplit.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seqsplit.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sesstime.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sesstime.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sf298.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sf298.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sffms.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sffms.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shdoc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shdoc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shorttoc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shorttoc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-show2e.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-show2e.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showcharinbox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showcharinbox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showexpl.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showexpl.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showlabels.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showlabels.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sidecap.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sidecap.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sidenotes.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sidenotes.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-silence.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-silence.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplecd.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplecd.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplecv.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplecv.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sitem.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sitem.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skb.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skb.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skdoc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skdoc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skrapport.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skrapport.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-slantsc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-slantsc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-snapshot.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-snapshot.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soul.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soul.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soulutf8.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soulutf8.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spacingtricks.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spacingtricks.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-splitindex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-splitindex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spot.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spot.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spverbatim.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spverbatim.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srcltx.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-srcltx.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sseq.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sseq.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stack.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stack.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-standalone.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-standalone.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stdclsdv.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stdclsdv.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stealcaps.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stealcaps.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stdpage.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stdpage.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-storebox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-storebox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stringstrings.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stringstrings.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sttools.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sttools.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subdepth.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subdepth.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subeqn.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subeqn.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subeqnarray.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subeqnarray.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfigure.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfigure.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfiles.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfiles.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfloat.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfloat.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-supertabular.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-supertabular.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svg.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svg.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn-multi.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn-multi.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn-prov.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn-prov.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svninfo.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svninfo.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-syntrace.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-syntrace.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-synttree.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-synttree.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabfigures.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabfigures.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablefootnote.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablefootnote.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tableof.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tableof.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablestyles.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablestyles.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablists.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablists.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablvar.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablvar.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabu.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabu.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabularborder.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabularborder.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabularew.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabularew.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabulary.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabulary.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-talk.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-talk.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tcldoc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tcldoc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ted.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ted.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-templatetools.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-templatetools.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termcal.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termcal.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termlist.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termlist.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-testhyphens.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-testhyphens.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-testidx.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-testidx.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-label.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-label.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-locale.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-locale.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texmate.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texmate.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texments.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texments.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texpower.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texpower.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texshade.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texshade.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texvc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texvc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textfit.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textfit.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textmerg.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textmerg.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textpos.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textpos.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textualicomma.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textualicomma.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thmtools.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thmtools.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threadcol.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threadcol.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumb.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumb.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumbs.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumbs.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titling.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titling.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocbibind.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocbibind.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocdata.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocdata.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocloft.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocloft.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocvsec2.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocvsec2.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-todo.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-todo.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-todonotes.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-todonotes.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-toolbox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-toolbox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-totcount.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-totcount.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-totpages.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-totpages.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-transparent.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-transparent.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trfsigns.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trfsigns.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trimspaces.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trimspaces.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trivfloat.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trivfloat.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trsym.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trsym.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tucv.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tucv.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-twoup.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-twoup.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-txgreeks.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-txgreeks.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-type1cm.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-type1cm.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typed-checklist.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typed-checklist.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typeface.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typeface.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typogrid.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typogrid.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umoline.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umoline.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-underlin.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-underlin.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-undolabl.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-undolabl.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-units.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-units.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unravel.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unravel.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-upquote.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-upquote.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uri.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uri.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ushort.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ushort.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-varindex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-varindex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-versonotes.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-versonotes.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vgrid.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vgrid.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vmargin.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vmargin.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-volumes.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-volumes.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vwcol.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vwcol.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-warpcol.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-warpcol.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-was.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-was.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-widetable.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-widetable.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-widows-and-orphans.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-widows-and-orphans.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wordlike.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wordlike.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xargs.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xargs.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xbmks.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xbmks.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcolor-material.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcolor-material.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcolor-solarized.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcolor-solarized.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcookybooky.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcookybooky.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcpdftips.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcpdftips.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xdoc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xdoc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xellipsis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xellipsis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xfor.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xfor.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xint.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xint.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xmpincl.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xmpincl.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpatch.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpatch.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpeek.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpeek.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpunctuate.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpunctuate.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xsavebox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xsavebox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xtab.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xtab.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yafoot.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yafoot.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yaletter.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yaletter.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yagusylo.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yagusylo.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ydoc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ydoc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zebra-goodies.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zebra-goodies.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zref.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zref.source-2020.tar.xz )
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
+_md5_=7c1f34e1abd80f1b7574567c5d30849f
diff --git a/metadata/md5-cache/dev-texlive/texlive-latexrecommended-2020 b/metadata/md5-cache/dev-texlive/texlive-latexrecommended-2020
index c93033ebb85e..1ba349e96c05 100644
--- a/metadata/md5-cache/dev-texlive/texlive-latexrecommended-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-latexrecommended-2020
@@ -10,5 +10,5 @@ LICENSE=GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT
 RDEPEND=>=dev-texlive/texlive-latex-2020 >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anysize-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anysize-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-attachfile2-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-attachfile2-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-booktabs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-booktabs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-breqn-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-breqn-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-caption-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-caption-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cite-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cite-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crop-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crop-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctable-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctable-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eso-pic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eso-pic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euenc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euenc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euler-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euler-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etoolbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etoolbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-extsizes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-extsizes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancybox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancybox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyref-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyvrb-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyvrb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filehook-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filehook-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-float-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-float-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontspec-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontspec-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnotehyper-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnotehyper-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grffile-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grffile-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hologo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hologo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-index-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-index-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-infwarerr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-infwarerr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jknapltx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jknapltx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-koma-script-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-koma-script-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexbug-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexbug-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3experimental-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3experimental-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3packages-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3packages-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lineno-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lineno-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listings-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listings-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lwarp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lwarp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathspec-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathspec-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathtools-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathtools-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdwtools-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdwtools-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memoir-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memoir-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metalogo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metalogo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-microtype-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-microtype-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ms-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ms-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newfloat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newfloat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ntgclass-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ntgclass-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parskip-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parskip-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdflscape-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdflscape-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpages-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpages-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftexcmds-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdftexcmds-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polyglossia-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polyglossia-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psfrag-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psfrag-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ragged2e-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ragged2e-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rcs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rcs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sansmath-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sansmath-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-section-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-section-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seminar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seminar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sepnum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sepnum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-setspace-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-setspace-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfig-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfig-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textcase-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textcase-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumbpdf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumbpdf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translator-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translator-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typehtml-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typehtml-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucharcat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucharcat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-underscore-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-underscore-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unicode-math-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unicode-math-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcolor-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcolor-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xkeyval-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xkeyval-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xltxtra-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xltxtra-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xunicode-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xunicode-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-latexrecommended-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-latexrecommended-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anysize.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anysize.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-attachfile2.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-attachfile2.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-booktabs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-booktabs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-breqn.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-breqn.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-caption.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-caption.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cite.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cite.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crop.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crop.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctable.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctable.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eso-pic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eso-pic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euenc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euenc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euler.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euler.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etoolbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etoolbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-extsizes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-extsizes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancybox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancybox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyref.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyref.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyvrb.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyvrb.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filehook.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filehook.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-float.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-float.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontspec.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontspec.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnotehyper.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnotehyper.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grffile.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grffile.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hologo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hologo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-index.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-index.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-infwarerr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-infwarerr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jknapltx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jknapltx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexbug.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexbug.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3experimental.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3experimental.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3packages.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3packages.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lineno.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lineno.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listings.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listings.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lwarp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lwarp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathspec.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathspec.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathtools.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathtools.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdwtools.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdwtools.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memoir.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memoir.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metalogo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metalogo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-microtype.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-microtype.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ms.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ms.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newfloat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newfloat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ntgclass.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ntgclass.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parskip.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parskip.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdflscape.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdflscape.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpages.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpages.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftexcmds.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdftexcmds.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polyglossia.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polyglossia.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psfrag.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psfrag.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ragged2e.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ragged2e.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rcs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rcs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sansmath.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sansmath.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-section.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-section.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seminar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seminar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sepnum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sepnum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-setspace.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-setspace.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfig.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfig.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textcase.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textcase.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumbpdf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumbpdf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translator.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translator.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typehtml.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typehtml.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucharcat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucharcat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-underscore.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-underscore.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unicode-math.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unicode-math.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcolor.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcolor.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xkeyval.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xkeyval.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xltxtra.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xltxtra.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xunicode.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xunicode.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-attachfile2.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-attachfile2.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-booktabs.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-booktabs.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-breqn.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-breqn.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-caption.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-caption.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crop.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crop.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctable.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctable.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eso-pic.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eso-pic.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euenc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euenc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euler.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euler.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyref.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyref.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filehook.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filehook.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-float.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-float.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontspec.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontspec.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnotehyper.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnotehyper.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grffile.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grffile.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hologo.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hologo.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-index.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-index.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-infwarerr.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-infwarerr.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexbug.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexbug.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3experimental.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3experimental.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3packages.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3packages.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lineno.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lineno.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listings.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listings.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lwarp.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lwarp.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathtools.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathtools.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdwtools.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdwtools.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memoir.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memoir.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metalogo.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metalogo.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-microtype.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-microtype.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ms.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ms.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newfloat.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newfloat.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ntgclass.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ntgclass.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parskip.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parskip.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdflscape.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdflscape.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpages.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpages.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftexcmds.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdftexcmds.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polyglossia.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polyglossia.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psfrag.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psfrag.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ragged2e.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ragged2e.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rcs.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rcs.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfig.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfig.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textcase.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textcase.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typehtml.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typehtml.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucharcat.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucharcat.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unicode-math.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unicode-math.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcolor.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcolor.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xkeyval.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xkeyval.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xltxtra.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xltxtra.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=72cf7b6ec2a60057c425bdd14db789b6
diff --git a/metadata/md5-cache/dev-texlive/texlive-luatex-2020 b/metadata/md5-cache/dev-texlive/texlive-luatex-2020
deleted file mode 100644
index c51933f2c685..000000000000
--- a/metadata/md5-cache/dev-texlive/texlive-luatex-2020
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-text/texlive-core-2020 app-arch/xz-utils
-DEFINED_PHASES=compile install postinst postrm unpack
-DEPEND=>=dev-texlive/texlive-basic-2020
-DESCRIPTION=TeXLive LuaTeX packages
-EAPI=7
-HOMEPAGE=http://www.tug.org/texlive/
-IUSE=source doc
-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 ~x64-solaris ~x86-solaris
-LICENSE=BSD FDL-1.1 GPL-2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free
-RDEPEND=>=dev-texlive/texlive-basic-2020 dev-texlive/texlive-latexrecommended >=app-text/texlive-core-2020
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-addliga-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-addliga-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auto-pst-pdf-lua-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auto-pst-pdf-lua-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-barracuda-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-barracuda-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bezierplot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bezierplot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-checkcites-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-checkcites-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chickenize-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chickenize-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combofont-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combofont-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cstypo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cstypo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctablestack-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctablestack-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emoji-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emoji-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enigma-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enigma-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interpreter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interpreter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kanaparser-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kanaparser-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-uca-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-uca-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-ul-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-ul-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-visual-debug-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-visual-debug-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacode-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacode-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacolor-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacolor-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luahyphenrules-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luahyphenrules-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaimageembed-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaimageembed-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaindex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaindex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luainputenc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luainputenc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaintro-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaintro-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-math-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-math-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-truncate-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-truncate-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualibs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualibs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luamplib-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luamplib-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaotfload-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaotfload-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luapackageloader-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luapackageloader-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luarandom-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luarandom-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatex85-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatex85-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexbase-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexbase-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexko-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexko-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatextra-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatextra-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luavlna-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luavlna-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaxml-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaxml-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nodetree-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nodetree-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-odsfile-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-odsfile-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-optex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-optex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfarticle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfarticle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-placeat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-placeat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plantuml-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plantuml-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-selnolig-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-selnolig-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spelling-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spelling-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typewriter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typewriter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-luatex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-luatex-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-addliga.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-addliga.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auto-pst-pdf-lua.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auto-pst-pdf-lua.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-barracuda.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-barracuda.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bezierplot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bezierplot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-checkcites.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-checkcites.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chickenize.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chickenize.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combofont.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combofont.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cstypo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cstypo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctablestack.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctablestack.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emoji.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emoji.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enigma.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enigma.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interpreter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interpreter.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kanaparser.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kanaparser.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-uca.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-uca.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-ul.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-ul.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-visual-debug.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-visual-debug.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacode.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacode.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacolor.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacolor.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luahyphenrules.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luahyphenrules.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaimageembed.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaimageembed.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaindex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaindex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luainputenc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luainputenc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaintro.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaintro.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-doc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-doc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-math.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-math.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-truncate.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-truncate.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualibs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualibs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luamplib.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luamplib.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaotfload.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaotfload.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luapackageloader.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luapackageloader.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luarandom.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luarandom.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatex85.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatex85.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexbase.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexbase.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexko.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexko.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatextra.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatextra.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luavlna.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luavlna.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaxml.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaxml.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nodetree.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nodetree.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-odsfile.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-odsfile.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-optex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-optex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfarticle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfarticle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-placeat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-placeat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plantuml.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plantuml.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-selnolig.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-selnolig.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spelling.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spelling.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typewriter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typewriter.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chickenize.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chickenize.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctablestack.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctablestack.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-uca.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-uca.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-ul.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-ul.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacode.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacode.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacolor.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacolor.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaindex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaindex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luainputenc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luainputenc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-doc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-doc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-math.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-math.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-truncate.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-truncate.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualibs.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualibs.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luamplib.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luamplib.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaotfload.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaotfload.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatex85.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatex85.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexbase.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexbase.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatextra.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatextra.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nodetree.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nodetree.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-placeat.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-placeat.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
-_md5_=791d7c4cc774c7d7ceab0c5b68de682e
diff --git a/metadata/md5-cache/dev-texlive/texlive-luatex-2020-r2 b/metadata/md5-cache/dev-texlive/texlive-luatex-2020-r2
new file mode 100644
index 000000000000..0cf6fd60a745
--- /dev/null
+++ b/metadata/md5-cache/dev-texlive/texlive-luatex-2020-r2
@@ -0,0 +1,14 @@
+BDEPEND=>=app-text/texlive-core-2020 app-arch/xz-utils
+DEFINED_PHASES=compile install postinst postrm unpack
+DEPEND=>=dev-texlive/texlive-basic-2020 >=dev-texlive/texlive-fontsrecommended-2020
+DESCRIPTION=TeXLive LuaTeX packages
+EAPI=7
+HOMEPAGE=http://www.tug.org/texlive/
+IUSE=source doc
+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 ~x64-solaris ~x86-solaris
+LICENSE=BSD FDL-1.1 GPL-2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free
+RDEPEND=>=dev-texlive/texlive-basic-2020 >=dev-texlive/texlive-fontsrecommended-2020 dev-texlive/texlive-latexrecommended >=app-text/texlive-core-2020
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-addliga-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-addliga-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auto-pst-pdf-lua-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auto-pst-pdf-lua-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-barracuda-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-barracuda-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bezierplot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bezierplot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-checkcites-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-checkcites-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chickenize-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chickenize-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combofont-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combofont-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cstypo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cstypo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctablestack-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctablestack-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emoji-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emoji-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enigma-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enigma-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interpreter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interpreter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kanaparser-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kanaparser-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-uca-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-uca-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-ul-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-ul-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-visual-debug-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-visual-debug-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacode-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacode-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacolor-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacolor-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luahyphenrules-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luahyphenrules-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaimageembed-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaimageembed-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaindex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaindex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luainputenc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luainputenc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaintro-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaintro-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-math-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-math-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-truncate-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-truncate-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualibs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualibs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luamplib-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luamplib-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaotfload-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaotfload-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luapackageloader-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luapackageloader-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luarandom-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luarandom-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatex85-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatex85-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexbase-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexbase-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexko-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexko-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatextra-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatextra-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luavlna-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luavlna-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaxml-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaxml-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nodetree-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nodetree-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-odsfile-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-odsfile-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-optex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-optex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfarticle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfarticle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-placeat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-placeat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plantuml-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plantuml-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-selnolig-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-selnolig-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spelling-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spelling-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typewriter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typewriter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-luatex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-luatex-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-addliga.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-addliga.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auto-pst-pdf-lua.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auto-pst-pdf-lua.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-barracuda.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-barracuda.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bezierplot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bezierplot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-checkcites.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-checkcites.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chickenize.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chickenize.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combofont.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combofont.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cstypo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cstypo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctablestack.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctablestack.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emoji.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emoji.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enigma.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enigma.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interpreter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interpreter.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kanaparser.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kanaparser.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-uca.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-uca.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-ul.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-ul.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-visual-debug.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-visual-debug.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacode.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacode.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacolor.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacolor.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luahyphenrules.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luahyphenrules.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaimageembed.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaimageembed.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaindex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaindex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luainputenc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luainputenc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaintro.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaintro.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-doc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-doc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-math.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-math.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-truncate.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-truncate.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualibs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualibs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luamplib.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luamplib.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaotfload.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaotfload.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luapackageloader.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luapackageloader.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luarandom.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luarandom.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatex85.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatex85.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexbase.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexbase.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexko.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexko.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatextra.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatextra.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luavlna.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luavlna.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaxml.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaxml.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nodetree.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nodetree.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-odsfile.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-odsfile.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-optex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-optex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfarticle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfarticle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-placeat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-placeat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plantuml.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plantuml.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-selnolig.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-selnolig.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spelling.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spelling.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typewriter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typewriter.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chickenize.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chickenize.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctablestack.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctablestack.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-uca.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-uca.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-ul.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-ul.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacode.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacode.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacolor.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacolor.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaindex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaindex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luainputenc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luainputenc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-doc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-doc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-math.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-math.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-truncate.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-truncate.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualibs.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualibs.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luamplib.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luamplib.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaotfload.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaotfload.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatex85.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatex85.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexbase.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexbase.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatextra.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatextra.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nodetree.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nodetree.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-placeat.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-placeat.source-2020.tar.xz )
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
+_md5_=f787f2ab9eaa93ec8fafb4556b8cc7a1
diff --git a/metadata/md5-cache/dev-texlive/texlive-mathscience-2020 b/metadata/md5-cache/dev-texlive/texlive-mathscience-2020
index 89b452fb8aa6..58394af634df 100644
--- a/metadata/md5-cache/dev-texlive/texlive-mathscience-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-mathscience-2020
@@ -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-2020 >=dev-texlive/texlive-latex-2020 dev-texlive/texlive-pstricks >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-12many-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-12many-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-SIstyle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-SIstyle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-SIunits-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-SIunits-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accents-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accents-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algobox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algobox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algorithm2e-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algorithm2e-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algorithmicx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algorithmicx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algorithms-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algorithms-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algxpar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algxpar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aligned-overset-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aligned-overset-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amscdx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amscdx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amstex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amstex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apxproof-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apxproof-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autobreak-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autobreak-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-axodraw2-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-axodraw2-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-backnaur-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-backnaur-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-begriff-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-begriff-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-binomexp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-binomexp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biocon-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biocon-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bitpattern-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bitpattern-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bohr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bohr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boldtensors-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boldtensors-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bosisio-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bosisio-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bpchem-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bpchem-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bropd-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bropd-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bussproofs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bussproofs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bussproofs-extra-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bussproofs-extra-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bytefield-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bytefield-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calculation-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calculation-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cascade-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cascade-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ccfonts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ccfonts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemarrow-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemarrow-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemcompounds-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemcompounds-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemcono-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemcono-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemexec-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemexec-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemformula-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemformula-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemgreek-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemgreek-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemmacros-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemmacros-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemnum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemnum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemplants-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemplants-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemschemex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemschemex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemsec-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemsec-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemstyle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemstyle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clrscode-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clrscode-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clrscode3e-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clrscode3e-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codeanatomy-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codeanatomy-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-commath-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-commath-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-complexity-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-complexity-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-computational-complexity-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-computational-complexity-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-concmath-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-concmath-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-concrete-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-concrete-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-conteq-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-conteq-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-correctmathalign-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-correctmathalign-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cryptocode-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cryptocode-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-delim-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-delim-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-delimseasy-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-delimseasy-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-delimset-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-delimset-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-derivative-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-derivative-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diffcoeff-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diffcoeff-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-digiconfigs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-digiconfigs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dijkstra-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dijkstra-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drawmatrix-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drawmatrix-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drawstack-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drawstack-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dyntree-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dyntree-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebproof-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebproof-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-econometrics-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-econometrics-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eltex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eltex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endiagram-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endiagram-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-engtlc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-engtlc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqexpl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqexpl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqnarray-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqnarray-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqnnumwarn-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqnnumwarn-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euclideangeometry-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euclideangeometry-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-extarrows-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-extarrows-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-extpfeil-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-extpfeil-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-faktor-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-faktor-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fascicules-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fascicules-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnspe-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnspe-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fouridx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fouridx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-functan-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-functan-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-galois-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-galois-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gastex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gastex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gene-logic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gene-logic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ghsystem-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ghsystem-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glosmathtools-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glosmathtools-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gotoh-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gotoh-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grundgesetze-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grundgesetze-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gu-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gu-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hep-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hep-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hepnames-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hepnames-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hepparticles-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hepparticles-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hepthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hepthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hepunits-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hepunits-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-includernw-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-includernw-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interval-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interval-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ionumbers-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ionumbers-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isomath-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isomath-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jkmath-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jkmath-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-karnaugh-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-karnaugh-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-karnaugh-map-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-karnaugh-map-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-karnaughmap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-karnaughmap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kvmap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kvmap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-letterswitharrows-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-letterswitharrows-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lie-hasse-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lie-hasse-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logicproof-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logicproof-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longdivision-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longdivision-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lpform-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lpform-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lplfitch-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lplfitch-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lstbayes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lstbayes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathcommand-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathcommand-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathcomp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathcomp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathfixs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathfixs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathlig-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathlig-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathpartir-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathpartir-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathpunctspace-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathpunctspace-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-matrix-skeleton-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-matrix-skeleton-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-matlab-prettifier-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-matlab-prettifier-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mattens-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mattens-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memorygraphs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memorygraphs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mgltex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mgltex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mhchem-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mhchem-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mhequ-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mhequ-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-miller-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-miller-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mismath-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mismath-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multiobjective-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multiobjective-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-natded-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-natded-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nath-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nath-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nicematrix-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nicematrix-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nuc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nuc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nucleardata-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nucleardata-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-objectz-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-objectz-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oplotsymbl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oplotsymbl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oops-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oops-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ot-tableau-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ot-tableau-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oubraces-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oubraces-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-perfectcut-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-perfectcut-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-physconst-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-physconst-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-physics-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-physics-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-physunits-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-physunits-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pinoutikz-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pinoutikz-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pm-isomath-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pm-isomath-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polexpr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polexpr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prftree-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prftree-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proba-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proba-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proof-at-the-end-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proof-at-the-end-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prooftrees-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prooftrees-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pseudo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pseudo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pseudocode-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pseudocode-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pythonhighlight-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pythonhighlight-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qsharp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qsharp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rank-2-roots-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rank-2-roots-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rec-thy-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rec-thy-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rest-api-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rest-api-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-revquantum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-revquantum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ribbonproofs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ribbonproofs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rmathbr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rmathbr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sasnrdisplay-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sasnrdisplay-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sciposter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sciposter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sclang-prettifier-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sclang-prettifier-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scratchx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scratchx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sesamanuel-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sesamanuel-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sfg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sfg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shuffle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shuffle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplebnf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplebnf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simpler-wick-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simpler-wick-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplewick-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplewick-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-siunitx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-siunitx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skmath-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skmath-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spalign-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spalign-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stanli-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stanli-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-statex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-statex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-statex2-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-statex2-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-statistics-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-statistics-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-statistik-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-statistik-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-statmath-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-statmath-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-steinmetz-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-steinmetz-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stmaryrd-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stmaryrd-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-structmech-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-structmech-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-struktex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-struktex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-substances-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-substances-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subsupscripts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subsupscripts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subtext-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subtext-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-susy-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-susy-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-syllogism-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-syllogism-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sympytexpackage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sympytexpackage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-synproof-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-synproof-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-t-angles-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-t-angles-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablor-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablor-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tensind-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tensind-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tensor-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tensor-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-ewd-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-ewd-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textgreek-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textgreek-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textopo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textopo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thmbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thmbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turnstile-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turnstile-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ulqda-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ulqda-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unitsdef-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unitsdef-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-venn-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-venn-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-witharrows-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-witharrows-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xymtex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xymtex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yhmath-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yhmath-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-youngtab-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-youngtab-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yquant-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yquant-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ytableau-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ytableau-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-mathscience-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-mathscience-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-12many.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-12many.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-SIstyle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-SIstyle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-SIunits.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-SIunits.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accents.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accents.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algobox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algobox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algorithm2e.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algorithm2e.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algorithmicx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algorithmicx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algorithms.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algorithms.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algxpar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algxpar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aligned-overset.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aligned-overset.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amscdx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amscdx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amstex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amstex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apxproof.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apxproof.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autobreak.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autobreak.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-axodraw2.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-axodraw2.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-backnaur.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-backnaur.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-begriff.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-begriff.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-binomexp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-binomexp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biocon.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biocon.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bitpattern.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bitpattern.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bohr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bohr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boldtensors.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boldtensors.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bosisio.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bosisio.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bpchem.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bpchem.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bropd.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bropd.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bussproofs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bussproofs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bussproofs-extra.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bussproofs-extra.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bytefield.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bytefield.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calculation.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calculation.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cascade.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cascade.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ccfonts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ccfonts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemarrow.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemarrow.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemcompounds.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemcompounds.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemcono.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemcono.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemexec.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemexec.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemformula.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemformula.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemgreek.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemgreek.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemmacros.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemmacros.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemnum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemnum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemplants.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemplants.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemschemex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemschemex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemsec.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemsec.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemstyle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemstyle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clrscode.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clrscode.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clrscode3e.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clrscode3e.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codeanatomy.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codeanatomy.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-commath.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-commath.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-complexity.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-complexity.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-computational-complexity.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-computational-complexity.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-concmath.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-concmath.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-concrete.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-concrete.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-conteq.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-conteq.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-correctmathalign.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-correctmathalign.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cryptocode.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cryptocode.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-delim.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-delim.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-delimseasy.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-delimseasy.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-delimset.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-delimset.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-derivative.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-derivative.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diffcoeff.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diffcoeff.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-digiconfigs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-digiconfigs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dijkstra.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dijkstra.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drawmatrix.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drawmatrix.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drawstack.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drawstack.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dyntree.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dyntree.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebproof.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebproof.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-econometrics.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-econometrics.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eltex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eltex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endiagram.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endiagram.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-engtlc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-engtlc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqexpl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqexpl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqnarray.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqnarray.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqnnumwarn.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqnnumwarn.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euclideangeometry.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euclideangeometry.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-extarrows.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-extarrows.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-extpfeil.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-extpfeil.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-faktor.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-faktor.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fascicules.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fascicules.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnspe.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnspe.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fouridx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fouridx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-functan.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-functan.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-galois.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-galois.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gastex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gastex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gene-logic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gene-logic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ghsystem.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ghsystem.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glosmathtools.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glosmathtools.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gotoh.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gotoh.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grundgesetze.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grundgesetze.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gu.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gu.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hep.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hep.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hepnames.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hepnames.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hepparticles.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hepparticles.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hepthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hepthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hepunits.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hepunits.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-includernw.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-includernw.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interval.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interval.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ionumbers.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ionumbers.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isomath.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isomath.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jkmath.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jkmath.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-karnaugh.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-karnaugh.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-karnaugh-map.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-karnaugh-map.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-karnaughmap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-karnaughmap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kvmap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kvmap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-letterswitharrows.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-letterswitharrows.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lie-hasse.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lie-hasse.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logicproof.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logicproof.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longdivision.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longdivision.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lpform.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lpform.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lplfitch.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lplfitch.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lstbayes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lstbayes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathcommand.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathcommand.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathcomp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathcomp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathfixs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathfixs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathpartir.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathpartir.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathpunctspace.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathpunctspace.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-matrix-skeleton.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-matrix-skeleton.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-matlab-prettifier.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-matlab-prettifier.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mattens.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mattens.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memorygraphs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memorygraphs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mgltex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mgltex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mhchem.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mhchem.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mhequ.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mhequ.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-miller.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-miller.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mismath.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mismath.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multiobjective.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multiobjective.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-natded.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-natded.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nath.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nath.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nicematrix.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nicematrix.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nuc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nuc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nucleardata.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nucleardata.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-objectz.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-objectz.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oplotsymbl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oplotsymbl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oops.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oops.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ot-tableau.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ot-tableau.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oubraces.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oubraces.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-perfectcut.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-perfectcut.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-physconst.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-physconst.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-physics.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-physics.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-physunits.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-physunits.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pinoutikz.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pinoutikz.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pm-isomath.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pm-isomath.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polexpr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polexpr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prftree.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prftree.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proba.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proba.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proof-at-the-end.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proof-at-the-end.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prooftrees.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prooftrees.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pseudo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pseudo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pseudocode.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pseudocode.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pythonhighlight.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pythonhighlight.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qsharp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qsharp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rank-2-roots.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rank-2-roots.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rec-thy.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rec-thy.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rest-api.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rest-api.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-revquantum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-revquantum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ribbonproofs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ribbonproofs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rmathbr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rmathbr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sasnrdisplay.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sasnrdisplay.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sciposter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sciposter.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sclang-prettifier.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sclang-prettifier.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scratchx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scratchx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sesamanuel.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sesamanuel.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sfg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sfg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shuffle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shuffle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplebnf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplebnf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simpler-wick.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simpler-wick.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplewick.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplewick.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-siunitx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-siunitx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skmath.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skmath.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spalign.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spalign.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stanli.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stanli.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-statex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-statex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-statex2.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-statex2.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-statistics.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-statistics.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-statistik.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-statistik.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-statmath.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-statmath.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-steinmetz.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-steinmetz.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stmaryrd.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stmaryrd.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-structmech.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-structmech.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-struktex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-struktex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-substances.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-substances.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subsupscripts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subsupscripts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subtext.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subtext.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-susy.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-susy.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-syllogism.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-syllogism.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sympytexpackage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sympytexpackage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-synproof.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-synproof.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-t-angles.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-t-angles.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablor.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablor.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tensind.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tensind.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tensor.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tensor.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-ewd.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-ewd.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textgreek.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textgreek.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textopo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textopo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thmbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thmbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turnstile.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turnstile.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ulqda.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ulqda.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unitsdef.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unitsdef.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-venn.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-venn.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-witharrows.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-witharrows.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xymtex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xymtex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yhmath.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yhmath.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-youngtab.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-youngtab.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yquant.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yquant.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ytableau.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ytableau.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-12many.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-12many.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-SIstyle.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-SIstyle.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-SIunits.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-SIunits.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alg.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alg.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algobox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algobox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algorithms.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algorithms.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algxpar.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algxpar.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aligned-overset.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aligned-overset.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amscdx.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amscdx.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apxproof.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apxproof.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autobreak.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autobreak.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-axodraw2.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-axodraw2.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-backnaur.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-backnaur.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-binomexp.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-binomexp.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bitpattern.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bitpattern.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bosisio.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bosisio.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bpchem.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bpchem.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bropd.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bropd.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bussproofs-extra.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bussproofs-extra.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bytefield.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bytefield.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calculation.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calculation.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cascade.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cascade.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ccfonts.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ccfonts.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemarrow.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemarrow.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemcompounds.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemcompounds.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemschemex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemschemex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemsec.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemsec.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemstyle.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemstyle.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codeanatomy.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codeanatomy.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-computational-complexity.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-computational-complexity.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-concmath.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-concmath.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-conteq.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-conteq.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-delim.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-delim.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-delimset.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-delimset.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drawmatrix.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drawmatrix.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dyntree.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dyntree.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqnarray.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqnarray.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euclideangeometry.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euclideangeometry.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-extpfeil.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-extpfeil.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-faktor.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-faktor.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fascicules.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fascicules.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fouridx.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fouridx.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-functan.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-functan.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-galois.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-galois.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gotoh.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gotoh.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grundgesetze.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grundgesetze.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ionumbers.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ionumbers.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-karnaugh-map.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-karnaugh-map.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-karnaughmap.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-karnaughmap.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kvmap.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kvmap.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-letterswitharrows.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-letterswitharrows.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logicproof.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logicproof.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lplfitch.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lplfitch.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lstbayes.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lstbayes.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathcommand.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathcommand.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathcomp.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathcomp.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathfixs.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathfixs.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathpartir.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathpartir.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-matlab-prettifier.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-matlab-prettifier.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mattens.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mattens.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mgltex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mgltex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-miller.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-miller.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mismath.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mismath.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multiobjective.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multiobjective.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nicematrix.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nicematrix.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nucleardata.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nucleardata.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-objectz.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-objectz.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oops.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oops.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-physconst.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-physconst.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-physunits.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-physunits.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pm-isomath.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pm-isomath.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proba.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proba.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proof-at-the-end.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proof-at-the-end.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qsharp.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qsharp.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rest-api.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rest-api.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-revquantum.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-revquantum.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rmathbr.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rmathbr.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sclang-prettifier.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sclang-prettifier.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sesamanuel.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sesamanuel.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shuffle.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shuffle.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplewick.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplewick.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-siunitx.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-siunitx.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skmath.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skmath.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spalign.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spalign.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-statistics.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-statistics.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-statistik.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-statistik.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-statmath.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-statmath.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-steinmetz.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-steinmetz.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stmaryrd.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stmaryrd.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-struktex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-struktex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sympytexpackage.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sympytexpackage.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tensor.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tensor.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textgreek.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textgreek.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textopo.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textopo.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thmbox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thmbox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turnstile.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turnstile.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ulqda.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ulqda.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unitsdef.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unitsdef.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-witharrows.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-witharrows.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xymtex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xymtex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yhmath.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yhmath.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-youngtab.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-youngtab.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ytableau.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ytableau.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=7c571a4dbf7ddf2cac639976589e310e
diff --git a/metadata/md5-cache/dev-texlive/texlive-metapost-2020-r1 b/metadata/md5-cache/dev-texlive/texlive-metapost-2020-r1
index 73324adafa62..6cc6485517d6 100644
--- a/metadata/md5-cache/dev-texlive/texlive-metapost-2020-r1
+++ b/metadata/md5-cache/dev-texlive/texlive-metapost-2020-r1
@@ -10,5 +10,5 @@ LICENSE=CC-BY-SA-4.0 GPL-1 GPL-2 GPL-2+ GPL-3+ LGPL-2 LPPL-1.3 MIT public-domain
 RDEPEND=>=dev-texlive/texlive-basic-2020 >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-automata-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-automata-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbcard-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbcard-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blockdraw_mp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blockdraw_mp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bpolynomial-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bpolynomial-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmarrows-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmarrows-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviincl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dviincl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epsincl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epsincl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expressg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expressg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exteps-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exteps-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-featpost-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-featpost-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feynmf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feynmf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feynmp-auto-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feynmp-auto-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fiziko-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fiziko-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-garrigues-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-garrigues-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hatching-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hatching-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexmp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexmp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcf2graph-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcf2graph-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metago-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metago-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metaobj-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metaobj-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metaplot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metaplot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metapost-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metapost-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metapost-colorbrewer-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metapost-colorbrewer-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metauml-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metauml-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfpic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfpic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfpic4ode-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfpic4ode-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mp3d-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mp3d-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mparrows-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mparrows-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpattern-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpattern-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpcolornames-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpcolornames-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpgraphics-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpgraphics-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mptrees-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mptrees-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-piechartmp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-piechartmp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-repere-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-repere-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-roex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-roex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-roundrect-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-roundrect-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shapes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shapes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-slideshow-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-slideshow-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-splines-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-splines-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-suanpan-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-suanpan-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textpath-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textpath-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threeddice-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threeddice-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-metapost-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-metapost-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-automata.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-automata.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbcard.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbcard.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blockdraw_mp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blockdraw_mp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bpolynomial.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bpolynomial.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmarrows.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmarrows.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviincl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dviincl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epsincl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epsincl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expressg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expressg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exteps.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exteps.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-featpost.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-featpost.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feynmf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feynmf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feynmp-auto.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feynmp-auto.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fiziko.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fiziko.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-garrigues.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-garrigues.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hatching.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hatching.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexmp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexmp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcf2graph.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcf2graph.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metago.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metago.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metaobj.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metaobj.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metaplot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metaplot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metapost.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metapost.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metapost-colorbrewer.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metapost-colorbrewer.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metauml.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metauml.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfpic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfpic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfpic4ode.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfpic4ode.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mp3d.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mp3d.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mparrows.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mparrows.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpattern.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpattern.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpcolornames.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpcolornames.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpgraphics.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpgraphics.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mptrees.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mptrees.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-piechartmp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-piechartmp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-repere.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-repere.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-roundrect.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-roundrect.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shapes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shapes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-slideshow.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-slideshow.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-splines.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-splines.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-suanpan.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-suanpan.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textpath.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textpath.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threeddice.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threeddice.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emp.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emp.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expressg.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expressg.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feynmf.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feynmf.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feynmp-auto.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feynmp-auto.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmp.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmp.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfpic.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfpic.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfpic4ode.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfpic4ode.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpcolornames.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpcolornames.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpgraphics.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpgraphics.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-roex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-roex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-roundrect.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-roundrect.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shapes.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shapes.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-splines.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-splines.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=ccca0dd0caef28c5d27c085edc8b345d
diff --git a/metadata/md5-cache/dev-texlive/texlive-music-2020 b/metadata/md5-cache/dev-texlive/texlive-music-2020
index 372bec54b71c..f0828b00366f 100644
--- a/metadata/md5-cache/dev-texlive/texlive-music-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-music-2020
@@ -10,5 +10,5 @@ LICENSE=FDL-1.1 GPL-1 GPL-2 GPL-2+
 RDEPEND=>=dev-texlive/texlive-latex-2020 >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autosp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autosp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bagpipe-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bagpipe-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chordbars-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chordbars-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chordbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chordbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ddphonism-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ddphonism-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-figbas-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-figbas-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gchords-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gchords-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gregoriotex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gregoriotex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gtrcrd-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gtrcrd-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitarchordschemes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitarchordschemes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitartabs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitartabs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harmony-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harmony-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leadsheets-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leadsheets-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex4musicians-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex4musicians-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lilyglyphs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lilyglyphs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lyluatex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lyluatex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-m-tx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-m-tx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musicography-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musicography-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musixguit-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musixguit-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musixtex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musixtex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musixtex-fonts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musixtex-fonts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musixtnt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musixtnt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-octave-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-octave-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-piano-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-piano-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmxchords-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmxchords-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-songbook-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-songbook-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-songs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-songs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpiano-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpiano-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-music-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-music-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autosp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autosp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bagpipe.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bagpipe.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chordbars.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chordbars.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chordbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chordbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ddphonism.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ddphonism.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-figbas.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-figbas.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gchords.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gchords.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gregoriotex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gregoriotex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gtrcrd.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gtrcrd.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitarchordschemes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitarchordschemes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitartabs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitartabs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harmony.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harmony.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leadsheets.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leadsheets.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex4musicians.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex4musicians.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lilyglyphs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lilyglyphs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lyluatex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lyluatex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-m-tx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-m-tx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musicography.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musicography.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musixguit.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musixguit.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musixtex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musixtex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musixtex-fonts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musixtex-fonts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musixtnt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musixtnt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-octave.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-octave.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-piano.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-piano.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmxchords.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmxchords.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-songbook.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-songbook.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-songs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-songs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpiano.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpiano.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitar.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitar.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lilyglyphs.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lilyglyphs.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musixtex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musixtex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-songbook.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-songbook.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-songs.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-songs.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpiano.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpiano.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=8b992a48ab4b9582aa70d5001b7e3787
diff --git a/metadata/md5-cache/dev-texlive/texlive-pictures-2020-r1 b/metadata/md5-cache/dev-texlive/texlive-pictures-2020-r1
deleted file mode 100644
index f9c2f12bda86..000000000000
--- a/metadata/md5-cache/dev-texlive/texlive-pictures-2020-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-text/texlive-core-2020 app-arch/xz-utils
-DEFINED_PHASES=compile install postinst postrm unpack
-DEPEND=>=dev-texlive/texlive-basic-2020 >=dev-tex/pgf-3.0.1
-DESCRIPTION=TeXLive Graphics, pictures, diagrams
-EAPI=7
-HOMEPAGE=http://www.tug.org/texlive/
-IUSE=source doc
-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 ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0 BSD-2 GPL-2 CC-BY-SA-4.0
-RDEPEND=>=dev-texlive/texlive-basic-2020 >=dev-tex/pgf-3.0.1 >=app-text/texlive-core-2020
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adigraph-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adigraph-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aobs-tikz-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aobs-tikz-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-askmaps-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-askmaps-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asyfig-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asyfig-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asypictureb-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asypictureb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autoarea-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autoarea-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bardiag-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bardiag-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerswitch-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerswitch-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-binarytree-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-binarytree-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blochsphere-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blochsphere-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bloques-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bloques-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bodegraph-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bodegraph-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bondgraph-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bondgraph-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bondgraphs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bondgraphs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-braids-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-braids-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxeepic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxeepic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cachepic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cachepic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-callouts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-callouts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-celtic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-celtic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemfig-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemfig-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combinedgraphics-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combinedgraphics-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circuit-macros-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circuit-macros-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circuitikz-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circuitikz-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curve-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curve-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curve2e-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curve2e-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curves-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curves-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dcpic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dcpic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diagmac2-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diagmac2-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ditaa-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ditaa-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doc-pictex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doc-pictex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dottex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dottex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dratex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dratex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-duotenzor-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-duotenzor-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dynkin-diagrams-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dynkin-diagrams-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecgdraw-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecgdraw-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eepic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eepic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ellipse-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ellipse-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endofproofwd-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endofproofwd-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epspdfconversion-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epspdfconversion-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esk-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esk-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euflag-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euflag-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fast-diagram-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fast-diagram-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fig4latex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fig4latex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fitbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fitbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flowchart-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flowchart-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forest-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forest-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-genealogytree-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-genealogytree-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-getmap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-getmap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gincltex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gincltex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gnuplottex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gnuplottex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gradientframe-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gradientframe-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grafcet-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grafcet-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graph35-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graph35-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphicxpsd-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphicxpsd-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphviz-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphviz-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gtrlib-largetrees-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gtrlib-largetrees-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harveyballs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harveyballs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-here-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-here-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hf-tikz-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hf-tikz-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hobby-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hobby-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hvfloat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hvfloat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-istgame-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-istgame-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kblocks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kblocks-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knitting-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knitting-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knittingpattern-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knittingpattern-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ladder-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ladder-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lapdf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lapdf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-make-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-make-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lpic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lpic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lroundrect-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lroundrect-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luamesh-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luamesh-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luasseq-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luasseq-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-maker-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-maker-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makeshape-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makeshape-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathspic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathspic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-milsymb-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-milsymb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-miniplot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-miniplot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mkpic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mkpic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modiagram-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modiagram-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-neuralnetwork-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-neuralnetwork-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numericplots-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numericplots-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pb-diagram-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pb-diagram-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-penrose-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-penrose-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-petri-nets-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-petri-nets-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-blur-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-blur-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-cmykshadings-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-cmykshadings-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-soroban-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-soroban-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-spectra-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-spectra-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-umlcd-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-umlcd-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-umlsd-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-umlsd-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfgantt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfgantt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfkeyx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfkeyx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfmolbio-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfmolbio-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfmorepages-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfmorepages-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfopts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfopts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfplots-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfplots-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-picinpar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-picinpar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pict2e-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pict2e-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pictex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pictex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pictex2-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pictex2-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pinlabel-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pinlabel-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pixelart-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pixelart-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmgraph-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmgraph-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-postage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-postage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prerex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prerex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-productbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-productbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptolemaicastronomy-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptolemaicastronomy-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxpgfmark-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxpgfmark-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qcircuit-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qcircuit-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quantikz-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quantikz-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qrcode-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qrcode-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randbild-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randbild-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randomwalk-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randomwalk-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realhats-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realhats-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reotex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reotex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rviewport-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rviewport-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sa-tikz-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sa-tikz-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schemabloc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schemabloc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scsnowman-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scsnowman-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scratch-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scratch-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scratch3-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scratch3-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-setdeck-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-setdeck-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simpleoptics-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simpleoptics-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-signchart-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-signchart-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smartdiagram-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smartdiagram-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spath3-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spath3-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spectralsequences-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spectralsequences-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-swimgraf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-swimgraf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-table-fct-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-table-fct-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdraw-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texdraw-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ticollege-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ticollege-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tipfr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tipfr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-3dplot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-3dplot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-bayesnet-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-bayesnet-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-cd-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-cd-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-dependency-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-dependency-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-dimline-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-dimline-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-feynhand-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-feynhand-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-feynman-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-feynman-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-imagelabels-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-imagelabels-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-inet-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-inet-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-kalender-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-kalender-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-karnaugh-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-karnaugh-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-ladder-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-ladder-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-layers-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-layers-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-nef-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-nef-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-network-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-network-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-opm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-opm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-optics-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-optics-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-page-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-page-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-palattice-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-palattice-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-qtree-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-qtree-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-relay-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-relay-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-sfc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-sfc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-timing-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-timing-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-trackschematic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-trackschematic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-truchet-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-truchet-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzcodeblocks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzcodeblocks-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzducks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzducks-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzinclude-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzinclude-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzlings-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzlings-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzmark-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzmark-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzmarmots-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzmarmots-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzorbital-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzorbital-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpagenodes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpagenodes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpfeile-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpfeile-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpeople-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpeople-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzposter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzposter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzscale-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzscale-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzsymbols-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzsymbols-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-timing-diagrams-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-timing-diagrams-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tqft-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tqft-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-base-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-base-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-euclide-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-euclide-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-orm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-orm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-tab-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-tab-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tsemlines-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tsemlines-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tufte-latex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tufte-latex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-venndiagram-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-venndiagram-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-visualpstricks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-visualpstricks-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpicture-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpicture-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xypic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xypic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-pictures-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-pictures-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adigraph.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adigraph.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aobs-tikz.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aobs-tikz.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-askmaps.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-askmaps.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asyfig.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asyfig.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asypictureb.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asypictureb.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autoarea.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autoarea.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bardiag.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bardiag.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerswitch.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerswitch.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-binarytree.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-binarytree.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blochsphere.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blochsphere.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bloques.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bloques.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bodegraph.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bodegraph.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bondgraph.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bondgraph.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bondgraphs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bondgraphs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-braids.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-braids.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxeepic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxeepic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cachepic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cachepic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-callouts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-callouts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-celtic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-celtic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemfig.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemfig.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combinedgraphics.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combinedgraphics.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circuit-macros.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circuit-macros.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circuitikz.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circuitikz.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curve.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curve.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curve2e.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curve2e.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curves.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curves.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dcpic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dcpic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diagmac2.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diagmac2.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ditaa.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ditaa.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doc-pictex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doc-pictex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dottex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dottex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dratex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dratex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-duotenzor.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-duotenzor.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dynkin-diagrams.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dynkin-diagrams.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecgdraw.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecgdraw.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eepic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eepic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ellipse.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ellipse.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endofproofwd.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endofproofwd.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epspdfconversion.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epspdfconversion.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esk.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esk.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euflag.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euflag.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fast-diagram.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fast-diagram.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fig4latex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fig4latex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fitbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fitbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flowchart.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flowchart.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forest.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forest.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-genealogytree.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-genealogytree.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-getmap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-getmap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gincltex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gincltex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gnuplottex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gnuplottex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gradientframe.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gradientframe.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grafcet.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grafcet.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graph35.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graph35.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphicxpsd.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphicxpsd.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphviz.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphviz.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gtrlib-largetrees.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gtrlib-largetrees.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harveyballs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harveyballs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-here.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-here.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hf-tikz.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hf-tikz.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hobby.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hobby.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hvfloat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hvfloat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-istgame.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-istgame.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kblocks.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kblocks.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knitting.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knitting.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knittingpattern.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knittingpattern.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ladder.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ladder.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lapdf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lapdf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-make.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-make.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lpic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lpic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lroundrect.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lroundrect.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luamesh.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luamesh.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luasseq.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luasseq.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-maker.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-maker.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makeshape.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makeshape.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathspic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathspic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-milsymb.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-milsymb.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-miniplot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-miniplot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mkpic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mkpic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modiagram.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modiagram.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-neuralnetwork.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-neuralnetwork.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numericplots.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numericplots.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pb-diagram.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pb-diagram.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-penrose.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-penrose.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-petri-nets.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-petri-nets.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-blur.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-blur.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-cmykshadings.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-cmykshadings.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-soroban.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-soroban.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-spectra.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-spectra.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-umlcd.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-umlcd.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-umlsd.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-umlsd.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfgantt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfgantt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfkeyx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfkeyx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfmolbio.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfmolbio.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfmorepages.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfmorepages.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfopts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfopts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfplots.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfplots.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-picinpar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-picinpar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pict2e.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pict2e.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pictex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pictex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pinlabel.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pinlabel.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pixelart.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pixelart.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmgraph.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmgraph.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-postage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-postage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prerex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prerex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-productbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-productbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptolemaicastronomy.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptolemaicastronomy.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxpgfmark.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxpgfmark.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qcircuit.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qcircuit.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quantikz.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quantikz.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qrcode.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qrcode.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randbild.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randbild.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randomwalk.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randomwalk.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realhats.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realhats.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reotex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reotex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rviewport.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rviewport.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sa-tikz.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sa-tikz.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schemabloc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schemabloc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scsnowman.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scsnowman.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scratch.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scratch.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scratch3.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scratch3.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-setdeck.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-setdeck.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simpleoptics.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simpleoptics.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-signchart.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-signchart.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smartdiagram.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smartdiagram.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spath3.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spath3.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spectralsequences.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spectralsequences.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-swimgraf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-swimgraf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-table-fct.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-table-fct.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdraw.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texdraw.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ticollege.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ticollege.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tipfr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tipfr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-3dplot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-3dplot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-bayesnet.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-bayesnet.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-cd.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-cd.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-dependency.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-dependency.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-dimline.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-dimline.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-feynhand.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-feynhand.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-feynman.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-feynman.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-imagelabels.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-imagelabels.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-inet.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-inet.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-kalender.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-kalender.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-karnaugh.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-karnaugh.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-ladder.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-ladder.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-layers.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-layers.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-nef.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-nef.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-network.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-network.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-opm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-opm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-optics.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-optics.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-page.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-page.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-palattice.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-palattice.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-qtree.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-qtree.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-relay.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-relay.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-sfc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-sfc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-timing.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-timing.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-trackschematic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-trackschematic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-truchet.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-truchet.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzcodeblocks.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzcodeblocks.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzducks.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzducks.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzinclude.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzinclude.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzlings.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzlings.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzmark.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzmark.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzmarmots.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzmarmots.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzorbital.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzorbital.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpagenodes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpagenodes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpfeile.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpfeile.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpeople.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpeople.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzposter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzposter.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzscale.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzscale.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzsymbols.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzsymbols.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-timing-diagrams.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-timing-diagrams.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tqft.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tqft.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-base.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-base.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-doc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-doc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-euclide.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-euclide.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-orm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-orm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-tab.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-tab.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tufte-latex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tufte-latex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-venndiagram.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-venndiagram.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-visualpstricks.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-visualpstricks.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpicture.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpicture.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xypic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xypic.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aobs-tikz.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aobs-tikz.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asyfig.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asyfig.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asypictureb.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asypictureb.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerswitch.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerswitch.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-binarytree.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-binarytree.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blochsphere.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blochsphere.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bondgraphs.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bondgraphs.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-braids.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-braids.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-celtic.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-celtic.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combinedgraphics.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combinedgraphics.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curve.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curve.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curve2e.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curve2e.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curves.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curves.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dottex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dottex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecgdraw.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecgdraw.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ellipse.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ellipse.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esk.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esk.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euflag.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euflag.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fitbox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fitbox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flowchart.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flowchart.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forest.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forest.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gincltex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gincltex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gnuplottex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gnuplottex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gradientframe.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gradientframe.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graph35.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graph35.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphviz.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphviz.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gtrlib-largetrees.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gtrlib-largetrees.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hf-tikz.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hf-tikz.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hobby.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hobby.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-make.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-make.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lroundrect.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lroundrect.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luasseq.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luasseq.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makeshape.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makeshape.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-penrose.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-penrose.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-blur.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-blur.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-cmykshadings.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-cmykshadings.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfgantt.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfgantt.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfmolbio.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfmolbio.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfopts.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfopts.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfplots.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfplots.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pict2e.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pict2e.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pixelart.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pixelart.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-postage.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-postage.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-productbox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-productbox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptolemaicastronomy.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptolemaicastronomy.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qrcode.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qrcode.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randbild.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randbild.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randomwalk.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randomwalk.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realhats.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realhats.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rviewport.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rviewport.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-signchart.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-signchart.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smartdiagram.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smartdiagram.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spath3.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spath3.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-imagelabels.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-imagelabels.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-page.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-page.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-timing.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-timing.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-truchet.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-truchet.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzinclude.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzinclude.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzmark.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzmark.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpagenodes.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpagenodes.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpfeile.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpfeile.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzposter.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzposter.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzscale.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzscale.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzsymbols.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzsymbols.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tqft.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tqft.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-venndiagram.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-venndiagram.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpicture.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpicture.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
-_md5_=5fe348ec03703dd4eedf8ab19ffbb93e
diff --git a/metadata/md5-cache/dev-texlive/texlive-pictures-2020-r2 b/metadata/md5-cache/dev-texlive/texlive-pictures-2020-r2
new file mode 100644
index 000000000000..4581ddbf8667
--- /dev/null
+++ b/metadata/md5-cache/dev-texlive/texlive-pictures-2020-r2
@@ -0,0 +1,14 @@
+BDEPEND=>=app-text/texlive-core-2020 app-arch/xz-utils
+DEFINED_PHASES=compile install postinst postrm unpack
+DEPEND=>=dev-texlive/texlive-basic-2020 >=dev-tex/pgf-3.0.1
+DESCRIPTION=TeXLive Graphics, pictures, diagrams
+EAPI=7
+HOMEPAGE=http://www.tug.org/texlive/
+IUSE=source doc
+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 ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0 BSD-2 GPL-2 GPL-2+ CC-BY-SA-4.0
+RDEPEND=>=dev-texlive/texlive-basic-2020 >=dev-tex/pgf-3.0.1 >=app-text/texlive-core-2020
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adigraph-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adigraph-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aobs-tikz-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aobs-tikz-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-askmaps-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-askmaps-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asyfig-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asyfig-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asypictureb-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asypictureb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autoarea-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autoarea-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bardiag-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bardiag-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerswitch-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerswitch-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-binarytree-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-binarytree-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blochsphere-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blochsphere-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bloques-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bloques-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bodegraph-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bodegraph-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bondgraph-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bondgraph-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bondgraphs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bondgraphs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-braids-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-braids-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxeepic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxeepic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cachepic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cachepic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-callouts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-callouts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-celtic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-celtic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemfig-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemfig-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combinedgraphics-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combinedgraphics-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circuit-macros-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circuit-macros-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circuitikz-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circuitikz-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curve-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curve-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curve2e-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curve2e-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curves-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curves-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dcpic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dcpic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diagmac2-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diagmac2-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ditaa-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ditaa-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doc-pictex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doc-pictex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dot2texi-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dot2texi-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dottex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dottex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dratex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dratex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-duotenzor-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-duotenzor-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dynkin-diagrams-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dynkin-diagrams-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecgdraw-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecgdraw-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eepic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eepic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ellipse-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ellipse-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endofproofwd-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endofproofwd-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epspdfconversion-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epspdfconversion-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esk-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esk-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euflag-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euflag-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fast-diagram-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fast-diagram-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fig4latex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fig4latex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fitbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fitbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flowchart-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flowchart-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forest-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forest-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-genealogytree-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-genealogytree-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-getmap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-getmap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gincltex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gincltex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gnuplottex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gnuplottex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gradientframe-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gradientframe-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grafcet-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grafcet-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graph35-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graph35-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphicxpsd-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphicxpsd-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphviz-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphviz-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gtrlib-largetrees-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gtrlib-largetrees-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harveyballs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harveyballs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-here-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-here-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hf-tikz-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hf-tikz-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hobby-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hobby-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hvfloat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hvfloat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-istgame-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-istgame-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kblocks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kblocks-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knitting-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knitting-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knittingpattern-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knittingpattern-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ladder-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ladder-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lapdf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lapdf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-make-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-make-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lpic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lpic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lroundrect-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lroundrect-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luamesh-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luamesh-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luasseq-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luasseq-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-maker-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-maker-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makeshape-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makeshape-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathspic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathspic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-milsymb-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-milsymb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-miniplot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-miniplot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mkpic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mkpic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modiagram-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modiagram-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-neuralnetwork-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-neuralnetwork-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numericplots-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numericplots-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pb-diagram-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pb-diagram-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-penrose-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-penrose-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-petri-nets-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-petri-nets-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-blur-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-blur-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-cmykshadings-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-cmykshadings-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-soroban-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-soroban-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-spectra-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-spectra-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-umlcd-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-umlcd-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-umlsd-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-umlsd-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfgantt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfgantt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfkeyx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfkeyx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfmolbio-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfmolbio-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfmorepages-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfmorepages-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfopts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfopts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfplots-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfplots-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-picinpar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-picinpar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pict2e-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pict2e-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pictex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pictex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pictex2-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pictex2-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pinlabel-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pinlabel-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pixelart-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pixelart-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmgraph-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmgraph-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-postage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-postage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prerex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prerex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-productbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-productbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptolemaicastronomy-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptolemaicastronomy-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxpgfmark-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxpgfmark-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qcircuit-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qcircuit-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quantikz-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quantikz-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qrcode-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qrcode-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randbild-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randbild-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randomwalk-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randomwalk-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realhats-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realhats-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reotex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reotex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rviewport-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rviewport-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sa-tikz-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sa-tikz-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schemabloc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schemabloc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scsnowman-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scsnowman-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scratch-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scratch-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scratch3-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scratch3-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-setdeck-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-setdeck-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simpleoptics-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simpleoptics-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-signchart-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-signchart-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smartdiagram-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smartdiagram-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spath3-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spath3-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spectralsequences-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spectralsequences-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-swimgraf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-swimgraf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-table-fct-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-table-fct-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdraw-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texdraw-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ticollege-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ticollege-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tipfr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tipfr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-3dplot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-3dplot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-bayesnet-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-bayesnet-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-cd-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-cd-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-dependency-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-dependency-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-dimline-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-dimline-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-feynhand-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-feynhand-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-feynman-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-feynman-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-imagelabels-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-imagelabels-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-inet-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-inet-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-kalender-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-kalender-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-karnaugh-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-karnaugh-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-ladder-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-ladder-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-layers-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-layers-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-nef-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-nef-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-network-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-network-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-opm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-opm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-optics-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-optics-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-page-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-page-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-palattice-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-palattice-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-qtree-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-qtree-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-relay-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-relay-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-sfc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-sfc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-timing-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-timing-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-trackschematic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-trackschematic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-truchet-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-truchet-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzcodeblocks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzcodeblocks-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzducks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzducks-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzinclude-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzinclude-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzlings-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzlings-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzmark-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzmark-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzmarmots-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzmarmots-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzorbital-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzorbital-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpagenodes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpagenodes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpfeile-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpfeile-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpeople-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpeople-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzposter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzposter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzscale-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzscale-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzsymbols-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzsymbols-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-timing-diagrams-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-timing-diagrams-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tqft-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tqft-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-base-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-base-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-euclide-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-euclide-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-orm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-orm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-tab-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-tab-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tsemlines-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tsemlines-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tufte-latex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tufte-latex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-venndiagram-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-venndiagram-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-visualpstricks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-visualpstricks-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpicture-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpicture-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xypic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xypic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-pictures-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-pictures-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adigraph.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adigraph.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aobs-tikz.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aobs-tikz.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-askmaps.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-askmaps.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asyfig.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asyfig.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asypictureb.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asypictureb.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autoarea.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autoarea.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bardiag.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bardiag.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerswitch.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerswitch.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-binarytree.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-binarytree.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blochsphere.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blochsphere.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bloques.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bloques.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bodegraph.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bodegraph.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bondgraph.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bondgraph.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bondgraphs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bondgraphs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-braids.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-braids.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxeepic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxeepic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cachepic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cachepic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-callouts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-callouts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-celtic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-celtic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemfig.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemfig.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combinedgraphics.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combinedgraphics.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circuit-macros.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circuit-macros.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circuitikz.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circuitikz.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curve.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curve.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curve2e.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curve2e.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curves.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curves.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dcpic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dcpic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diagmac2.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diagmac2.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ditaa.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ditaa.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doc-pictex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doc-pictex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dot2texi.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dot2texi.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dottex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dottex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dratex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dratex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-duotenzor.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-duotenzor.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dynkin-diagrams.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dynkin-diagrams.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecgdraw.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecgdraw.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eepic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eepic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ellipse.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ellipse.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endofproofwd.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endofproofwd.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epspdfconversion.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epspdfconversion.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esk.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esk.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euflag.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euflag.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fast-diagram.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fast-diagram.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fig4latex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fig4latex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fitbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fitbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flowchart.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flowchart.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forest.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forest.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-genealogytree.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-genealogytree.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-getmap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-getmap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gincltex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gincltex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gnuplottex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gnuplottex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gradientframe.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gradientframe.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grafcet.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grafcet.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graph35.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graph35.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphicxpsd.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphicxpsd.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphviz.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphviz.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gtrlib-largetrees.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gtrlib-largetrees.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harveyballs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harveyballs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-here.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-here.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hf-tikz.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hf-tikz.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hobby.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hobby.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hvfloat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hvfloat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-istgame.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-istgame.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kblocks.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kblocks.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knitting.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knitting.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knittingpattern.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knittingpattern.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ladder.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ladder.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lapdf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lapdf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-make.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-make.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lpic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lpic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lroundrect.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lroundrect.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luamesh.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luamesh.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luasseq.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luasseq.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-maker.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-maker.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makeshape.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makeshape.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathspic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathspic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-milsymb.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-milsymb.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-miniplot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-miniplot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mkpic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mkpic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modiagram.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modiagram.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-neuralnetwork.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-neuralnetwork.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numericplots.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numericplots.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pb-diagram.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pb-diagram.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-penrose.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-penrose.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-petri-nets.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-petri-nets.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-blur.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-blur.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-cmykshadings.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-cmykshadings.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-soroban.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-soroban.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-spectra.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-spectra.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-umlcd.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-umlcd.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-umlsd.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-umlsd.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfgantt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfgantt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfkeyx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfkeyx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfmolbio.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfmolbio.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfmorepages.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfmorepages.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfopts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfopts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfplots.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfplots.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-picinpar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-picinpar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pict2e.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pict2e.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pictex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pictex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pinlabel.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pinlabel.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pixelart.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pixelart.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmgraph.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmgraph.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-postage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-postage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prerex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prerex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-productbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-productbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptolemaicastronomy.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptolemaicastronomy.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxpgfmark.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxpgfmark.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qcircuit.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qcircuit.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quantikz.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quantikz.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qrcode.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qrcode.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randbild.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randbild.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randomwalk.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randomwalk.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realhats.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realhats.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reotex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reotex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rviewport.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rviewport.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sa-tikz.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sa-tikz.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schemabloc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schemabloc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scsnowman.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scsnowman.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scratch.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scratch.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scratch3.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scratch3.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-setdeck.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-setdeck.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simpleoptics.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simpleoptics.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-signchart.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-signchart.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smartdiagram.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smartdiagram.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spath3.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spath3.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spectralsequences.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spectralsequences.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-swimgraf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-swimgraf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-table-fct.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-table-fct.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdraw.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texdraw.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ticollege.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ticollege.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tipfr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tipfr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-3dplot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-3dplot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-bayesnet.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-bayesnet.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-cd.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-cd.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-dependency.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-dependency.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-dimline.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-dimline.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-feynhand.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-feynhand.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-feynman.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-feynman.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-imagelabels.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-imagelabels.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-inet.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-inet.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-kalender.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-kalender.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-karnaugh.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-karnaugh.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-ladder.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-ladder.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-layers.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-layers.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-nef.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-nef.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-network.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-network.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-opm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-opm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-optics.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-optics.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-page.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-page.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-palattice.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-palattice.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-qtree.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-qtree.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-relay.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-relay.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-sfc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-sfc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-timing.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-timing.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-trackschematic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-trackschematic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-truchet.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-truchet.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzcodeblocks.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzcodeblocks.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzducks.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzducks.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzinclude.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzinclude.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzlings.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzlings.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzmark.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzmark.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzmarmots.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzmarmots.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzorbital.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzorbital.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpagenodes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpagenodes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpfeile.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpfeile.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpeople.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpeople.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzposter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzposter.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzscale.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzscale.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzsymbols.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzsymbols.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-timing-diagrams.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-timing-diagrams.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tqft.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tqft.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-base.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-base.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-doc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-doc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-euclide.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-euclide.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-orm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-orm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-tab.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-tab.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tufte-latex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tufte-latex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-venndiagram.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-venndiagram.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-visualpstricks.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-visualpstricks.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpicture.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpicture.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xypic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xypic.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aobs-tikz.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aobs-tikz.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asyfig.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asyfig.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asypictureb.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asypictureb.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerswitch.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerswitch.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-binarytree.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-binarytree.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blochsphere.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blochsphere.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bondgraphs.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bondgraphs.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-braids.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-braids.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-celtic.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-celtic.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combinedgraphics.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combinedgraphics.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curve.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curve.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curve2e.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curve2e.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curves.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curves.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dottex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dottex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecgdraw.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecgdraw.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ellipse.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ellipse.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esk.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esk.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euflag.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euflag.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fitbox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fitbox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flowchart.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flowchart.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forest.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forest.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gincltex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gincltex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gnuplottex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gnuplottex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gradientframe.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gradientframe.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graph35.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graph35.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphviz.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphviz.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gtrlib-largetrees.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gtrlib-largetrees.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hf-tikz.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hf-tikz.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hobby.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hobby.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-make.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-make.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lroundrect.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lroundrect.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luasseq.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luasseq.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makeshape.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makeshape.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-penrose.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-penrose.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-blur.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-blur.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-cmykshadings.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-cmykshadings.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfgantt.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfgantt.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfmolbio.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfmolbio.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfopts.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfopts.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfplots.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfplots.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pict2e.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pict2e.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pixelart.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pixelart.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-postage.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-postage.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-productbox.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-productbox.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptolemaicastronomy.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptolemaicastronomy.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qrcode.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qrcode.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randbild.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randbild.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randomwalk.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randomwalk.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realhats.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realhats.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rviewport.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rviewport.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-signchart.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-signchart.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smartdiagram.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smartdiagram.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spath3.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spath3.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-imagelabels.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-imagelabels.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-page.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-page.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-timing.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-timing.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-truchet.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-truchet.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzinclude.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzinclude.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzmark.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzmark.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpagenodes.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpagenodes.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpfeile.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpfeile.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzposter.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzposter.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzscale.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzscale.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzsymbols.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzsymbols.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tqft.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tqft.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-venndiagram.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-venndiagram.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpicture.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpicture.source-2020.tar.xz )
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
+_md5_=43d3eaf9d1d582691b318912a31a2a8e
diff --git a/metadata/md5-cache/dev-texlive/texlive-plaingeneric-2020 b/metadata/md5-cache/dev-texlive/texlive-plaingeneric-2020
index e0586389717b..1d337657c979 100644
--- a/metadata/md5-cache/dev-texlive/texlive-plaingeneric-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-plaingeneric-2020
@@ -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-2020 >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abbr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abbr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abstyles-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abstyles-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apnum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apnum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autoaligne-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autoaligne-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-barr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-barr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bitelist-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bitelist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-borceux-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-borceux-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-c-pascal-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-c-pascal-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catcodes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catcodes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chronosys-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chronosys-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorsep-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorsep-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-compare-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-compare-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cweb-old-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cweb-old-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dinat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dinat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dirtree-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dirtree-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docbytex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docbytex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dowith-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dowith-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eijkhout-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eijkhout-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-encxvlna-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-encxvlna-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epigram-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epigram-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epsf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epsf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epsf-dvipdfmx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epsf-dvipdfmx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expkv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expkv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expkv-def-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expkv-def-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fenixpar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fenixpar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-figflow-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-figflow-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixpdfmag-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixpdfmag-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fltpoint-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fltpoint-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fntproof-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fntproof-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-font-change-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-font-change-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontch-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontch-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontname-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontname-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gates-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gates-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-getoptk-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-getoptk-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfnotation-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfnotation-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gobble-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gobble-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphics-pln-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphics-pln-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gtl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gtl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hlist-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hlist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyplain-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyplain-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-insbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-insbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-js-misc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-js-misc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kastrup-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kastrup-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lambda-lists-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lambda-lists-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-langcode-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-langcode-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lecturer-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lecturer-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-letterspacing-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-letterspacing-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-librarian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-librarian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listofitems-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listofitems-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathdots-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathdots-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metatex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metatex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-midnight-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-midnight-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mkpattern-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mkpattern-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modulus-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modulus-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multido-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multido-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-navigator-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-navigator-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newsletr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newsletr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nth-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nth-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ofs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ofs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-olsak-misc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-olsak-misc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outerhbox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outerhbox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-path-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-path-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdf-trans-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdf-trans-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pitex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pitex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-placeins-plain-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-placeins-plain-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plainpkg-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plainpkg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plipsum-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plipsum-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plnfss-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plnfss-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plstmary-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plstmary-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poormanlog-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poormanlog-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-present-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-present-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randomlist-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randomlist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-resumemac-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-resumemac-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ruler-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ruler-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schemata-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schemata-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shade-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shade-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplekv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplekv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-swrule-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-swrule-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-systeme-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-systeme-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabto-generic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabto-generic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termmenu-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termmenu-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-ps-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-ps-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex4ht-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex4ht-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texapi-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texapi-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdate-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texdate-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texinfo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texinfo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-timetable-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-timetable-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tracklang-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tracklang-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-treetex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-treetex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trigonometry-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trigonometry-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ulem-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ulem-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-upca-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-upca-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-varisize-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-varisize-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xii-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xii-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xii-lat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xii-lat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xlop-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xlop-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yax-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yax-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-plaingeneric-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-plaingeneric-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abbr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abbr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abstyles.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abstyles.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apnum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apnum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autoaligne.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autoaligne.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-barr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-barr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bitelist.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bitelist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-borceux.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-borceux.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-c-pascal.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-c-pascal.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catcodes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catcodes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chronosys.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chronosys.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dinat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dinat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dirtree.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dirtree.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docbytex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docbytex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dowith.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dowith.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-encxvlna.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-encxvlna.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epsf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epsf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epsf-dvipdfmx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epsf-dvipdfmx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expkv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expkv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expkv-def.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expkv-def.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fenixpar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fenixpar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-figflow.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-figflow.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fltpoint.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fltpoint.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fntproof.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fntproof.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-font-change.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-font-change.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontch.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontch.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontname.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontname.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gates.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gates.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-getoptk.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-getoptk.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfnotation.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfnotation.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gobble.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gobble.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphics-pln.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphics-pln.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gtl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gtl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hlist.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hlist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyplain.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyplain.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-insbox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-insbox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-js-misc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-js-misc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kastrup.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kastrup.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lambda-lists.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lambda-lists.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-langcode.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-langcode.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lecturer.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lecturer.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-librarian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-librarian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listofitems.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listofitems.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathdots.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathdots.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metatex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metatex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-midnight.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-midnight.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mkpattern.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mkpattern.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modulus.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modulus.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multido.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multido.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-navigator.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-navigator.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newsletr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newsletr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ofs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ofs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-olsak-misc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-olsak-misc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-path.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-path.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdf-trans.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdf-trans.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pitex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pitex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plainpkg.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plainpkg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plipsum.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plipsum.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plnfss.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plnfss.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plstmary.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plstmary.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poormanlog.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poormanlog.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-present.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-present.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randomlist.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randomlist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-resumemac.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-resumemac.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schemata.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schemata.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shade.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shade.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplekv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplekv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-systeme.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-systeme.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termmenu.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termmenu.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-ps.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-ps.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex4ht.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex4ht.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texapi.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texapi.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdate.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texdate.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tracklang.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tracklang.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-treetex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-treetex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trigonometry.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trigonometry.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ulem.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ulem.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-upca.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-upca.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-varisize.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-varisize.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xii.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xii.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xii-lat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xii-lat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xlop.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xlop.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yax.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yax.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bitelist.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bitelist.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catcodes.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catcodes.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dirtree.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dirtree.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dowith.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dowith.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expkv.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expkv.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expkv-def.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expkv-def.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fltpoint.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fltpoint.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gobble.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gobble.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gtl.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gtl.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kastrup.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kastrup.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-langcode.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-langcode.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathdots.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathdots.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modulus.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modulus.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multido.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multido.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plainpkg.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plainpkg.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randomlist.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randomlist.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schemata.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schemata.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termmenu.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termmenu.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdate.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texdate.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tracklang.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tracklang.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xlop.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xlop.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=57ecd289bfe118402cc4718d1c1e068b
diff --git a/metadata/md5-cache/dev-texlive/texlive-pstricks-2020 b/metadata/md5-cache/dev-texlive/texlive-pstricks-2020
index d3f67d6aa9f1..1e2be6b6d8cf 100644
--- a/metadata/md5-cache/dev-texlive/texlive-pstricks-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-pstricks-2020
@@ -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-2020 >=dev-texlive/texlive-plaingeneric-2020 dev-tex/pgf >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auto-pst-pdf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auto-pst-pdf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bclogo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bclogo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dsptricks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dsptricks-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makeplot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makeplot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftricks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdftricks-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftricks2-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdftricks2-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pedigree-perl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pedigree-perl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psbao-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psbao-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-2dplot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-2dplot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-3d-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-3d-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-3dplot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-3dplot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-abspos-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-abspos-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-arrow-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-arrow-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-am-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-am-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-antiprism-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-antiprism-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-asr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-asr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-bar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-bar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-barcode-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-barcode-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-bezier-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-bezier-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-blur-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-blur-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-bspline-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-bspline-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-calculate-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-calculate-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-calendar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-calendar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-cie-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-cie-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-circ-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-circ-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-coil-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-coil-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-contourplot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-contourplot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-cox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-cox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-dart-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-dart-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-dbicons-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-dbicons-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-diffraction-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-diffraction-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-electricfield-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-electricfield-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-eps-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-eps-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-eucl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-eucl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-exa-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-exa-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-feyn-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-feyn-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-fill-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-fill-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-fit-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-fit-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-fr3d-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-fr3d-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-fractal-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-fractal-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-fun-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-fun-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-func-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-func-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-gantt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-gantt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-geo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-geo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-geometrictools-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-geometrictools-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-ghsb-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-ghsb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-gr3d-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-gr3d-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-grad-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-grad-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-graphicx-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-graphicx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-infixplot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-infixplot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-intersect-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-intersect-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-jtree-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-jtree-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-knot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-knot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-labo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-labo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-layout-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-layout-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-lens-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-lens-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-light3d-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-light3d-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-lsystem-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-lsystem-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-magneticfield-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-magneticfield-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-marble-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-marble-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-math-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-math-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-mirror-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-mirror-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-moire-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-moire-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-node-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-node-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-ob3d-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-ob3d-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-ode-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-ode-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-optexp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-optexp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-optic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-optic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-osci-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-osci-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-ovl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-ovl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-pad-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-pad-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-pdgr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-pdgr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-pdf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-pdf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-perspective-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-perspective-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-platon-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-platon-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-plot-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-plot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-poker-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-poker-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-poly-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-poly-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-pulley-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-pulley-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-qtree-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-qtree-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-rputover-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-rputover-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-rubans-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-rubans-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-shell-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-shell-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-sigsys-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-sigsys-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-slpe-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-slpe-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-solarsystem-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-solarsystem-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-solides3d-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-solides3d-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-soroban-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-soroban-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-spectra-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-spectra-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-spinner-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-spinner-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-stru-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-stru-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-support-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-support-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-text-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-text-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-thick-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-thick-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-tools-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-tools-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-tree-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-tree-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-turtle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-turtle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-tvz-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-tvz-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-uml-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-uml-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-vectorian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-vectorian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-vehicle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-vehicle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-venn-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-venn-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-vowel-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-vowel-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst2pdf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst2pdf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pstricks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pstricks-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pstricks-add-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pstricks-add-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pstricks_calcnotes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pstricks_calcnotes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uml-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uml-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vaucanson-g-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vaucanson-g-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vocaltract-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vocaltract-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-pstricks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-pstricks-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auto-pst-pdf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auto-pst-pdf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bclogo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bclogo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dsptricks.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dsptricks.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makeplot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makeplot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftricks.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdftricks.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftricks2.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdftricks2.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pedigree-perl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pedigree-perl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psbao.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psbao.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-2dplot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-2dplot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-3d.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-3d.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-3dplot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-3dplot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-abspos.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-abspos.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-arrow.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-arrow.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-am.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-am.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-antiprism.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-antiprism.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-asr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-asr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-bar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-bar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-barcode.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-barcode.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-bezier.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-bezier.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-blur.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-blur.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-bspline.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-bspline.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-calculate.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-calculate.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-calendar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-calendar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-cie.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-cie.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-circ.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-circ.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-coil.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-coil.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-contourplot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-contourplot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-cox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-cox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-dart.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-dart.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-dbicons.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-dbicons.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-diffraction.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-diffraction.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-electricfield.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-electricfield.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-eps.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-eps.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-eucl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-eucl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-exa.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-exa.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-feyn.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-feyn.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-fill.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-fill.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-fit.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-fit.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-fr3d.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-fr3d.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-fractal.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-fractal.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-fun.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-fun.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-func.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-func.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-gantt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-gantt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-geo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-geo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-geometrictools.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-geometrictools.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-ghsb.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-ghsb.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-gr3d.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-gr3d.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-grad.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-grad.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-graphicx.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-graphicx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-infixplot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-infixplot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-intersect.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-intersect.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-jtree.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-jtree.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-knot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-knot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-labo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-labo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-layout.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-layout.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-lens.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-lens.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-light3d.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-light3d.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-lsystem.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-lsystem.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-magneticfield.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-magneticfield.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-marble.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-marble.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-math.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-math.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-mirror.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-mirror.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-moire.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-moire.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-node.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-node.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-ob3d.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-ob3d.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-ode.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-ode.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-optexp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-optexp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-optic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-optic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-osci.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-osci.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-ovl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-ovl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-pad.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-pad.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-pdgr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-pdgr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-pdf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-pdf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-perspective.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-perspective.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-platon.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-platon.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-plot.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-plot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-poker.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-poker.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-poly.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-poly.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-pulley.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-pulley.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-qtree.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-qtree.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-rputover.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-rputover.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-rubans.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-rubans.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-shell.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-shell.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-sigsys.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-sigsys.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-slpe.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-slpe.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-solarsystem.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-solarsystem.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-solides3d.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-solides3d.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-soroban.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-soroban.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-spectra.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-spectra.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-spinner.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-spinner.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-stru.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-stru.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-support.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-support.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-text.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-text.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-thick.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-thick.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-tools.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-tools.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-tree.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-tree.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-turtle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-turtle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-tvz.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-tvz.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-uml.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-uml.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-vectorian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-vectorian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-vehicle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-vehicle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-venn.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-venn.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-vowel.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-vowel.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst2pdf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst2pdf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pstricks.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pstricks.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pstricks-add.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pstricks-add.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pstricks_calcnotes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pstricks_calcnotes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uml.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uml.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vaucanson-g.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vaucanson-g.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vocaltract.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vocaltract.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auto-pst-pdf.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auto-pst-pdf.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makeplot.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makeplot.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-3d.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-3d.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-abspos.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-abspos.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-am.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-am.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-bar.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-bar.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-blur.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-blur.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-dbicons.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-dbicons.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-diffraction.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-diffraction.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-electricfield.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-electricfield.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-eps.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-eps.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-fill.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-fill.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-fr3d.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-fr3d.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-fun.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-fun.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-gr3d.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-gr3d.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-intersect.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-intersect.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-lens.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-lens.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-light3d.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-light3d.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-ob3d.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-ob3d.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-optexp.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-optexp.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-pad.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-pad.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-pdgr.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-pdgr.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-pdf.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-pdf.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-platon.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-platon.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-rubans.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-rubans.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-shell.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-shell.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-slpe.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-slpe.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-soroban.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-soroban.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-thick.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-thick.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-tvz.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-tvz.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-uml.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-uml.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uml.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uml.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=c3f3b55aedaf734b3ee3dc441de49a7a
diff --git a/metadata/md5-cache/dev-texlive/texlive-publishers-2020 b/metadata/md5-cache/dev-texlive/texlive-publishers-2020
index 9f46f5a5e594..65e16fabed6d 100644
--- a/metadata/md5-cache/dev-texlive/texlive-publishers-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-publishers-2020
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 BSD GPL-2 CC0-1.0
 RDEPEND=>=dev-texlive/texlive-latex-2020 >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-IEEEconf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-IEEEconf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-IEEEtran-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-IEEEtran-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aastex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aastex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abnt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abnt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abntex2-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abntex2-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acmart-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acmart-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acmconf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acmconf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-active-conf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-active-conf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adfathesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adfathesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-afparticle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-afparticle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-afthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-afthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aguplus-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aguplus-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aiaa-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aiaa-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ametsoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ametsoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anufinalexam-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anufinalexam-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aomart-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aomart-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa6-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa6-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa6e-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa6e-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa7-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa7-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arsclassica-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arsclassica-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-articleingud-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-articleingud-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asaetr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asaetr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ascelike-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ascelike-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asmeconf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asmeconf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asmejour-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asmejour-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aucklandthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aucklandthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bangorcsthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bangorcsthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bangorexam-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bangorexam-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bath-bst-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bath-bst-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer-FUBerlin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer-FUBerlin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer-verona-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer-verona-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beilstein-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beilstein-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bgteubner-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bgteubner-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-br-lex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-br-lex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-brandeis-dissertation-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-brandeis-dissertation-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-brandeis-problemset-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-brandeis-problemset-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-brandeis-thesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-brandeis-thesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cascadilla-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cascadilla-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cesenaexam-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cesenaexam-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chem-journal-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chem-journal-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chs-physics-report-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chs-physics-report-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cje-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cje-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-classicthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-classicthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cleanthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cleanthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmpj-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmpj-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-confproc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-confproc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cquthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cquthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dccpaper-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dccpaper-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dithesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dithesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebook-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebook-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebsthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebsthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecothesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecothesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ejpecp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ejpecp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ekaia-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ekaia-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elbioimp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elbioimp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-els-cas-templates-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-els-cas-templates-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elsarticle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elsarticle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elteikthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elteikthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emisa-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emisa-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erdc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erdc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-estcpmm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-estcpmm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etsvthor-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etsvthor-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-facture-belge-simple-sans-tva-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-facture-belge-simple-sans-tva-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fbithesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fbithesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fcavtex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fcavtex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fcltxdoc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fcltxdoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fei-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fei-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ftc-notebook-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ftc-notebook-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gaceta-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gaceta-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gammas-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gammas-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gatech-thesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gatech-thesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gradstudentresume-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gradstudentresume-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grant-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grant-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gsemthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gsemthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gzt-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gzt-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-h2020proposal-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-h2020proposal-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hagenberg-thesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hagenberg-thesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-har2nat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-har2nat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hecthese-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hecthese-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hep-paper-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hep-paper-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hithesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hithesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hitszthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hitszthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hitszbeamer-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hitszbeamer-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hobete-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hobete-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hu-berlin-bundle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hu-berlin-bundle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hustthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hustthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-icsv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-icsv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ieeepes-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ieeepes-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ijmart-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ijmart-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ijsra-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ijsra-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imac-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imac-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imtekda-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imtekda-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inkpaper-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inkpaper-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iodhbwm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iodhbwm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iscram-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iscram-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jacow-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jacow-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jmlr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jmlr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jnuexam-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jnuexam-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jpsj-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jpsj-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kdgdocs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kdgdocs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kluwer-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kluwer-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ksp-thesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ksp-thesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ku-template-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ku-template-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-langsci-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-langsci-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-langsci-avm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-langsci-avm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-limecv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-limecv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lion-msc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lion-msc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-llncsconf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-llncsconf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lni-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lni-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lps-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lps-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-matc3-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-matc3-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-matc3mem-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-matc3mem-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcmthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcmthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mentis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mentis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mlacls-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mlacls-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mnras-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mnras-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modeles-factures-belges-assocs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modeles-factures-belges-assocs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-msu-thesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-msu-thesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mucproc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mucproc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mugsthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mugsthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musuos-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musuos-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-muthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-muthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mynsfc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mynsfc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nature-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nature-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-navydocs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-navydocs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nddiss-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nddiss-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ndsu-thesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ndsu-thesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-novel-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-novel-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nwejm-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nwejm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nih-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nih-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nihbiosketch-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nihbiosketch-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nostarch-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nostarch-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nrc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nrc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-onrannual-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-onrannual-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-opteng-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-opteng-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-philosophersimprint-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-philosophersimprint-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pittetd-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pittetd-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pkuthss-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pkuthss-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-powerdot-fuberlin-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-powerdot-fuberlin-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-powerdot-tuliplab-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-powerdot-tuliplab-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pracjourn-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pracjourn-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-procIAGssymp-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-procIAGssymp-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proposal-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proposal-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prtec-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prtec-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptptex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptptex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quantumarticle-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quantumarticle-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-resphilosophica-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-resphilosophica-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-resumecls-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-resumecls-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-revtex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-revtex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-revtex4-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-revtex4-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rutitlepage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rutitlepage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ryersonsgsthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ryersonsgsthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ryethesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ryethesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sageep-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sageep-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sapthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sapthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schule-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schule-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scrjrnl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scrjrnl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scientific-thesis-cover-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scientific-thesis-cover-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sduthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sduthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seuthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seuthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seuthesix-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seuthesix-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shortmathj-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shortmathj-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soton-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soton-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sphdthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sphdthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spie-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spie-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sr-vorl-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sr-vorl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srdp-mathematik-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-srdp-mathematik-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stellenbosch-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stellenbosch-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-suftesi-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-suftesi-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sugconf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sugconf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabriz-thesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabriz-thesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-technion-thesis-template-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-technion-thesis-template-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texilikechaps-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texilikechaps-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texilikecover-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texilikecover-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thesis-ekf-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thesis-ekf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thesis-gwu-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thesis-gwu-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thesis-qom-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thesis-qom-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thesis-titlepage-fhac-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thesis-titlepage-fhac-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thuaslogos-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thuaslogos-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thucoursework-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thucoursework-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thuthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thuthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-timbreicmc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-timbreicmc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tlc-article-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tlc-article-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-topletter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-topletter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-toptesi-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-toptesi-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tuda-ci-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tuda-ci-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tudscr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tudscr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tugboat-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tugboat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tugboat-plain-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tugboat-plain-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turabian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turabian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tui-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tui-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uaclasses-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uaclasses-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uafthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uafthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uantwerpendocs-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uantwerpendocs-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucalgmthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucalgmthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucbthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucbthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucdavisthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucdavisthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucsmonograph-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucsmonograph-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uestcthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uestcthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uhhassignment-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uhhassignment-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uiucredborder-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uiucredborder-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uiucthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uiucthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ulthese-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ulthese-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umbclegislation-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umbclegislation-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umich-thesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umich-thesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unam-thesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unam-thesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unamth-template-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unamth-template-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unamthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unamthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unifith-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unifith-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unitn-bimrep-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unitn-bimrep-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-univie-ling-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-univie-ling-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unizgklasa-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unizgklasa-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unswcover-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unswcover-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uothesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uothesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-urcls-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-urcls-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uowthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uowthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uowthesistitlepage-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uowthesistitlepage-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uspatent-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uspatent-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ut-thesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ut-thesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-utexasthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-utexasthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uwthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uwthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vancouver-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vancouver-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xduthesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xduthesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wsemclassic-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wsemclassic-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yathesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yathesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yazd-thesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yazd-thesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-york-thesis-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-york-thesis-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-publishers-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-publishers-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-IEEEconf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-IEEEconf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-IEEEtran.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-IEEEtran.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aastex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aastex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abnt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abnt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abntex2.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abntex2.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acmart.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acmart.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acmconf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acmconf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-active-conf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-active-conf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adfathesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adfathesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-afparticle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-afparticle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-afthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-afthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aguplus.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aguplus.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aiaa.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aiaa.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ametsoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ametsoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anufinalexam.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anufinalexam.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aomart.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aomart.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa6.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa6.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa6e.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa6e.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa7.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa7.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arsclassica.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arsclassica.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-articleingud.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-articleingud.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asaetr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asaetr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ascelike.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ascelike.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asmeconf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asmeconf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asmejour.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asmejour.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aucklandthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aucklandthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bangorcsthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bangorcsthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bangorexam.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bangorexam.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bath-bst.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bath-bst.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer-FUBerlin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer-FUBerlin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer-verona.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer-verona.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beilstein.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beilstein.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bgteubner.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bgteubner.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-br-lex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-br-lex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-brandeis-dissertation.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-brandeis-dissertation.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-brandeis-problemset.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-brandeis-problemset.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-brandeis-thesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-brandeis-thesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cascadilla.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cascadilla.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cesenaexam.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cesenaexam.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chs-physics-report.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chs-physics-report.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cje.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cje.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-classicthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-classicthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cleanthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cleanthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmpj.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmpj.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-confproc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-confproc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cquthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cquthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dccpaper.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dccpaper.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dithesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dithesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebook.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebook.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebsthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebsthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecothesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecothesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ejpecp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ejpecp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ekaia.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ekaia.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elbioimp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elbioimp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-els-cas-templates.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-els-cas-templates.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elsarticle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elsarticle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elteikthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elteikthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emisa.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emisa.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erdc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erdc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-estcpmm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-estcpmm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etsvthor.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etsvthor.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-facture-belge-simple-sans-tva.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-facture-belge-simple-sans-tva.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fbithesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fbithesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fcavtex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fcavtex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fcltxdoc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fcltxdoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fei.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fei.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ftc-notebook.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ftc-notebook.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gaceta.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gaceta.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gammas.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gammas.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gatech-thesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gatech-thesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gradstudentresume.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gradstudentresume.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grant.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grant.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gsemthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gsemthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gzt.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gzt.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-h2020proposal.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-h2020proposal.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hagenberg-thesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hagenberg-thesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-har2nat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-har2nat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hecthese.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hecthese.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hep-paper.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hep-paper.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hithesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hithesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hitszthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hitszthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hitszbeamer.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hitszbeamer.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hobete.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hobete.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hu-berlin-bundle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hu-berlin-bundle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hustthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hustthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-icsv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-icsv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ieeepes.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ieeepes.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ijmart.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ijmart.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ijsra.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ijsra.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imac.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imac.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imtekda.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imtekda.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inkpaper.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inkpaper.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iodhbwm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iodhbwm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iscram.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iscram.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jacow.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jacow.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jmlr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jmlr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jnuexam.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jnuexam.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jpsj.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jpsj.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kdgdocs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kdgdocs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kluwer.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kluwer.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ksp-thesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ksp-thesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ku-template.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ku-template.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-langsci.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-langsci.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-langsci-avm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-langsci-avm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-limecv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-limecv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lion-msc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lion-msc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-llncsconf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-llncsconf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lni.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lni.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lps.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lps.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-matc3.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-matc3.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-matc3mem.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-matc3mem.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcmthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcmthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mentis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mentis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mlacls.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mlacls.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mnras.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mnras.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modeles-factures-belges-assocs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modeles-factures-belges-assocs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-msu-thesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-msu-thesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mucproc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mucproc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mugsthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mugsthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musuos.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musuos.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-muthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-muthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mynsfc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mynsfc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nature.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nature.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-navydocs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-navydocs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nddiss.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nddiss.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ndsu-thesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ndsu-thesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-novel.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-novel.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nwejm.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nwejm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nih.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nih.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nihbiosketch.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nihbiosketch.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nostarch.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nostarch.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nrc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nrc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-onrannual.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-onrannual.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-opteng.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-opteng.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-philosophersimprint.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-philosophersimprint.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pittetd.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pittetd.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pkuthss.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pkuthss.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-powerdot-fuberlin.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-powerdot-fuberlin.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-powerdot-tuliplab.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-powerdot-tuliplab.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pracjourn.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pracjourn.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-procIAGssymp.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-procIAGssymp.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proposal.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proposal.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prtec.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prtec.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptptex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptptex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quantumarticle.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quantumarticle.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-resphilosophica.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-resphilosophica.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-resumecls.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-resumecls.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-revtex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-revtex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-revtex4.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-revtex4.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rutitlepage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rutitlepage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ryersonsgsthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ryersonsgsthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ryethesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ryethesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sageep.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sageep.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sapthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sapthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schule.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schule.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scrjrnl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scrjrnl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scientific-thesis-cover.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scientific-thesis-cover.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sduthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sduthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seuthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seuthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seuthesix.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seuthesix.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shortmathj.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shortmathj.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soton.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soton.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sphdthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sphdthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spie.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spie.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sr-vorl.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sr-vorl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srdp-mathematik.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-srdp-mathematik.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stellenbosch.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stellenbosch.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-suftesi.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-suftesi.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sugconf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sugconf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabriz-thesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabriz-thesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-technion-thesis-template.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-technion-thesis-template.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thesis-ekf.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thesis-ekf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thesis-gwu.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thesis-gwu.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thesis-qom.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thesis-qom.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thesis-titlepage-fhac.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thesis-titlepage-fhac.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thuaslogos.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thuaslogos.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thucoursework.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thucoursework.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thuthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thuthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-timbreicmc.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-timbreicmc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tlc-article.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tlc-article.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-topletter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-topletter.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-toptesi.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-toptesi.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tuda-ci.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tuda-ci.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tudscr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tudscr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tugboat.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tugboat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tugboat-plain.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tugboat-plain.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turabian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turabian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tui.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tui.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uaclasses.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uaclasses.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uafthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uafthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uantwerpendocs.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uantwerpendocs.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucalgmthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucalgmthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucbthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucbthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucdavisthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucdavisthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucsmonograph.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucsmonograph.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uestcthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uestcthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uhhassignment.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uhhassignment.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uiucredborder.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uiucredborder.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uiucthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uiucthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ulthese.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ulthese.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umbclegislation.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umbclegislation.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umich-thesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umich-thesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unam-thesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unam-thesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unamth-template.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unamth-template.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unamthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unamthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unifith.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unifith.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unitn-bimrep.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unitn-bimrep.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-univie-ling.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-univie-ling.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unizgklasa.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unizgklasa.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unswcover.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unswcover.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uothesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uothesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-urcls.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-urcls.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uowthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uowthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uowthesistitlepage.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uowthesistitlepage.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uspatent.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uspatent.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ut-thesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ut-thesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-utexasthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-utexasthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uwthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uwthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vancouver.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vancouver.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xduthesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xduthesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wsemclassic.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wsemclassic.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yathesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yathesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yazd-thesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yazd-thesis.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-york-thesis.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-york-thesis.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-IEEEconf.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-IEEEconf.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acmart.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acmart.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acmconf.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acmconf.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-active-conf.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-active-conf.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adfathesis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adfathesis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-afparticle.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-afparticle.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aiaa.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aiaa.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aomart.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aomart.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa6.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa6.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa6e.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa6e.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa7.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa7.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-articleingud.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-articleingud.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bangorcsthesis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bangorcsthesis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bangorexam.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bangorexam.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bath-bst.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bath-bst.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beilstein.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beilstein.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bgteubner.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bgteubner.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-brandeis-dissertation.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-brandeis-dissertation.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-brandeis-thesis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-brandeis-thesis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cesenaexam.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cesenaexam.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-confproc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-confproc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cquthesis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cquthesis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dccpaper.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dccpaper.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebsthesis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebsthesis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ejpecp.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ejpecp.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ekaia.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ekaia.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elbioimp.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elbioimp.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elsarticle.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elsarticle.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emisa.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emisa.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erdc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erdc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-estcpmm.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-estcpmm.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fbithesis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fbithesis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fcltxdoc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fcltxdoc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fei.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fei.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grant.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grant.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gsemthesis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gsemthesis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gzt.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gzt.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hecthese.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hecthese.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hep-paper.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hep-paper.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hithesis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hithesis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hitszthesis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hitszthesis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hitszbeamer.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hitszbeamer.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hu-berlin-bundle.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hu-berlin-bundle.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hustthesis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hustthesis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-icsv.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-icsv.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ijmart.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ijmart.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imtekda.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imtekda.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jmlr.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jmlr.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kdgdocs.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kdgdocs.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kluwer.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kluwer.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-langsci-avm.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-langsci-avm.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-limecv.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-limecv.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lni.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lni.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lps.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lps.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-matc3.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-matc3.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-matc3mem.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-matc3mem.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcmthesis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcmthesis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mentis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mentis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mlacls.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mlacls.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mucproc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mucproc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mugsthesis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mugsthesis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musuos.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musuos.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mynsfc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mynsfc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-navydocs.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-navydocs.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nddiss.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nddiss.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nwejm.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nwejm.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nostarch.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nostarch.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nrc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nrc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-philosophersimprint.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-philosophersimprint.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pittetd.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pittetd.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pracjourn.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pracjourn.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proposal.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proposal.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-resphilosophica.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-resphilosophica.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-resumecls.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-resumecls.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-revtex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-revtex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-revtex4.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-revtex4.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rutitlepage.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rutitlepage.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ryethesis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ryethesis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sageep.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sageep.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scrjrnl.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scrjrnl.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scientific-thesis-cover.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scientific-thesis-cover.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sduthesis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sduthesis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seuthesis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seuthesis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seuthesix.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seuthesix.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sr-vorl.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sr-vorl.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stellenbosch.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stellenbosch.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-suftesi.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-suftesi.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thesis-ekf.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thesis-ekf.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thesis-titlepage-fhac.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thesis-titlepage-fhac.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thucoursework.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thucoursework.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thuthesis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thuthesis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-timbreicmc.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-timbreicmc.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-topletter.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-topletter.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-toptesi.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-toptesi.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tudscr.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tudscr.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tugboat.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tugboat.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uaclasses.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uaclasses.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uantwerpendocs.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uantwerpendocs.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucdavisthesis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucdavisthesis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucsmonograph.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucsmonograph.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uhhassignment.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uhhassignment.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uiucredborder.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uiucredborder.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uiucthesis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uiucthesis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ulthese.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ulthese.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uothesis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uothesis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xduthesis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xduthesis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wsemclassic.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wsemclassic.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yathesis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yathesis.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-york-thesis.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-york-thesis.source-2020.tar.xz )
-_eclasses_=texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=85d2876cc5f9ebae5d70f22992bf4dac
diff --git a/metadata/md5-cache/dev-texlive/texlive-xetex-2020 b/metadata/md5-cache/dev-texlive/texlive-xetex-2020
index a8782a04f62f..ac885dc4d932 100644
--- a/metadata/md5-cache/dev-texlive/texlive-xetex-2020
+++ b/metadata/md5-cache/dev-texlive/texlive-xetex-2020
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 GPL-1 GPL-2 LGPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT CC-BY-4.0
 RDEPEND=>=dev-texlive/texlive-basic-2020 >=dev-texlive/texlive-latexextra-2010 >=app-text/texlive-core-2010[xetex] dev-texlive/texlive-mathscience dev-texlive/texlive-luatex >=app-text/texlive-core-2020
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabxetex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabxetex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-awesomebox-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-awesomebox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidi-atbegshi-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidi-atbegshi-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidicontour-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidicontour-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidipagegrid-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidipagegrid-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidishadowtext-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidishadowtext-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidipresentation-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidipresentation-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-businesscard-qrcode-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-businesscard-qrcode-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cqubeamer-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cqubeamer-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixlatvian-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixlatvian-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-font-change-xetex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-font-change-xetex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontbook-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontbook-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontwrap-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontwrap-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interchar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interchar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-na-position-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-na-position-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-philokalia-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-philokalia-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptext-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptext-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quran-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quran-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quran-de-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quran-de-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realscripts-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realscripts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simple-resume-cv-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simple-resume-cv-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simple-thesis-dissertation-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simple-thesis-dissertation-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tetragonos-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tetragonos-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucharclasses-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucharclasses-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unicode-bidi-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unicode-bidi-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unisugar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unisugar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xebaposter-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xebaposter-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xechangebar-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xechangebar-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xecjk-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xecjk-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xecolor-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xecolor-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xecyr-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xecyr-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xeindex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xeindex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xelatex-dev-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xelatex-dev-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xesearch-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xesearch-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xespotcolor-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xespotcolor-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetex-itrans-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetex-itrans-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetex-pstricks-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetex-pstricks-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetex-tibetan-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetex-tibetan-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetexconfig-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetexconfig-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetexfontinfo-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetexfontinfo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetexko-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetexko-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xevlna-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xevlna-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-xetex-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-xetex-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabxetex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabxetex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-awesomebox.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-awesomebox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidi-atbegshi.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidi-atbegshi.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidicontour.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidicontour.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidipagegrid.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidipagegrid.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidishadowtext.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidishadowtext.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidipresentation.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidipresentation.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-businesscard-qrcode.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-businesscard-qrcode.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cqubeamer.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cqubeamer.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixlatvian.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixlatvian.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-font-change-xetex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-font-change-xetex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontbook.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontbook.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontwrap.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontwrap.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interchar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interchar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-na-position.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-na-position.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-philokalia.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-philokalia.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptext.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptext.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quran.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quran.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quran-de.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quran-de.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realscripts.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realscripts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simple-resume-cv.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simple-resume-cv.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simple-thesis-dissertation.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simple-thesis-dissertation.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tetragonos.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tetragonos.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucharclasses.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucharclasses.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unicode-bidi.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unicode-bidi.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unisugar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unisugar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xebaposter.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xebaposter.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xechangebar.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xechangebar.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xecjk.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xecjk.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xecolor.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xecolor.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xecyr.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xecyr.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xeindex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xeindex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xesearch.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xesearch.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xespotcolor.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xespotcolor.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetex.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetex-itrans.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetex-itrans.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetex-pstricks.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetex-pstricks.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetex-tibetan.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetex-tibetan.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetexfontinfo.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetexfontinfo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetexko.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetexko.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xevlna.doc-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xevlna.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabxetex.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabxetex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixlatvian.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixlatvian.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontbook.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontbook.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-philokalia.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-philokalia.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realscripts.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realscripts.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xecjk.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xecjk.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xespotcolor.source-2020.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xespotcolor.source-2020.tar.xz )
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	texlive-common	3438add11e8232d1fa32884e5e278bfe	texlive-module	0cf67932ebf938c5e76a6b24582187c9
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	texlive-common	0eca2ea110130453e0124f83ce50c408	texlive-module	cb41959db18d645e5a68125a5f6d5c7d
 _md5_=91e6799152898c22432c99853d66dc2f
diff --git a/metadata/md5-cache/dev-util/App-SVN-Bisect-1.1-r1 b/metadata/md5-cache/dev-util/App-SVN-Bisect-1.1-r1
index a1d88184b6b2..2b2b56c48661 100644
--- a/metadata/md5-cache/dev-util/App-SVN-Bisect-1.1-r1
+++ b/metadata/md5-cache/dev-util/App-SVN-Bisect-1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl dev-perl/YAML-Syck dev-perl/IO-All dev-vcs/subversion dev-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INFINOID/App-SVN-Bisect-1.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c18357180c9cccaf6c95bcfb51f6b847
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 362e1af3e2b3..8cd47fec250b 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/anjuta-3.34.0 b/metadata/md5-cache/dev-util/anjuta-3.34.0
index f179fae5bca8..c705a529ae57 100644
--- a/metadata/md5-cache/dev-util/anjuta-3.34.0
+++ b/metadata/md5-cache/dev-util/anjuta-3.34.0
@@ -4,7 +4,7 @@ DESCRIPTION=A versatile IDE for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Anjuta
 IUSE=debug devhelp glade +introspection subversion terminal test vala +python_single_target_python2_7
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+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.46 ) ) introspection? ( python_single_target_python2_7? ( >=dev-python/pygobject-3.2:3[python_targets_python2_7(-)] ) ) gnome-base/gsettings-desktop-schemas
 REQUIRED_USE=^^ ( python_single_target_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/anjuta/3.34/anjuta-3.34.0.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aa156af2e5def73517a574f270419f21
+_md5_=b95bff55290662314f080afadd173905
diff --git a/metadata/md5-cache/dev-util/bcc-0.11.0 b/metadata/md5-cache/dev-util/bcc-0.11.0
index 9ea1dc8574c2..cb4ee575b940 100644
--- a/metadata/md5-cache/dev-util/bcc-0.11.0
+++ b/metadata/md5-cache/dev-util/bcc-0.11.0
@@ -12,5 +12,5 @@ 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	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	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 93ffd1754e94..4d288cfd152b 100644
--- a/metadata/md5-cache/dev-util/bcc-0.12.0-r1
+++ b/metadata/md5-cache/dev-util/bcc-0.12.0-r1
@@ -12,5 +12,5 @@ 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	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5acf188ca779bb0547972e7aeaf1b42f
diff --git a/metadata/md5-cache/dev-util/bcc-0.13.0 b/metadata/md5-cache/dev-util/bcc-0.13.0
index 555f797e813a..51f213c8270d 100644
--- a/metadata/md5-cache/dev-util/bcc-0.13.0
+++ b/metadata/md5-cache/dev-util/bcc-0.13.0
@@ -12,5 +12,5 @@ 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.13.0.tar.gz -> bcc-0.13.0.tar.gz https://github.com/libbpf/libbpf/archive/v0.0.7.tar.gz -> libbpf-0.0.7.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7bf16cd551a3d4d52f362c0fb91e360d
diff --git a/metadata/md5-cache/dev-util/bcc-0.14.0 b/metadata/md5-cache/dev-util/bcc-0.14.0
index 3261d65e66d0..63e2ae947a61 100644
--- a/metadata/md5-cache/dev-util/bcc-0.14.0
+++ b/metadata/md5-cache/dev-util/bcc-0.14.0
@@ -12,5 +12,5 @@ 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.14.0.tar.gz -> bcc-0.14.0.tar.gz https://github.com/libbpf/libbpf/archive/v0.0.8.tar.gz -> libbpf-0.0.8.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6cfe35f91974a0ea15d7781c37dc4c17
diff --git a/metadata/md5-cache/dev-util/bcc-0.15.0 b/metadata/md5-cache/dev-util/bcc-0.15.0
index 6d8a404ff513..5f94c82d853f 100644
--- a/metadata/md5-cache/dev-util/bcc-0.15.0
+++ b/metadata/md5-cache/dev-util/bcc-0.15.0
@@ -12,5 +12,5 @@ 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.15.0.tar.gz -> bcc-0.15.0.tar.gz https://github.com/libbpf/libbpf/archive/v0.0.9.tar.gz -> libbpf-0.0.9.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f8977897556e633de052f534bafffb6e
diff --git a/metadata/md5-cache/dev-util/bnfc-2.8 b/metadata/md5-cache/dev-util/bnfc-2.8
deleted file mode 100644
index 2b676e94a93d..000000000000
--- a/metadata/md5-cache/dev-util/bnfc-2.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:= dev-haskell/alex >=dev-haskell/cabal-1.8 dev-haskell/happy test? ( >=dev-haskell/doctest-0.8 dev-haskell/hspec dev-haskell/hunit >=dev-haskell/quickcheck-2.5 dev-haskell/temporary ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A compiler front-end generator
-EAPI=5
-HOMEPAGE=http://bnfc.digitalgrammars.com/
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:=
-RESTRICT=test
-SLOT=0/2.8
-SRC_URI=https://hackage.haskell.org/package/BNFC-2.8/BNFC-2.8.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3ad7b6305fa2be5573f539ddd63465bb
diff --git a/metadata/md5-cache/dev-util/bpftrace-0.10.0-r1 b/metadata/md5-cache/dev-util/bpftrace-0.10.0-r1
index cd28fb39743b..43a90eec99d1 100644
--- a/metadata/md5-cache/dev-util/bpftrace-0.10.0-r1
+++ b/metadata/md5-cache/dev-util/bpftrace-0.10.0-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-util/systemtap sys-devel/clang:= dev-libs/libbpf:= >=sys-devel/llvm-
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bpftrace/archive/v0.10.0.tar.gz -> bpftrace-0.10.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=51c275e8ac6d5f5d9da6acb6685567b3
diff --git a/metadata/md5-cache/dev-util/bpftrace-0.9.2 b/metadata/md5-cache/dev-util/bpftrace-0.9.2
index 86e0c9f714fb..eff56a55a370 100644
--- a/metadata/md5-cache/dev-util/bpftrace-0.9.2
+++ b/metadata/md5-cache/dev-util/bpftrace-0.9.2
@@ -11,5 +11,5 @@ RDEPEND=dev-util/systemtap sys-devel/clang:= dev-libs/libbpf:= >=sys-devel/llvm-
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bpftrace/archive/v0.9.2.tar.gz -> bpftrace-0.9.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=366e81372f628ddbfd666a5996f3a6ab
diff --git a/metadata/md5-cache/dev-util/bpftrace-0.9.3 b/metadata/md5-cache/dev-util/bpftrace-0.9.3
index ade8757e7ef9..610599196fc9 100644
--- a/metadata/md5-cache/dev-util/bpftrace-0.9.3
+++ b/metadata/md5-cache/dev-util/bpftrace-0.9.3
@@ -11,5 +11,5 @@ RDEPEND=dev-util/systemtap sys-devel/clang:= dev-libs/libbpf:= >=sys-devel/llvm-
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bpftrace/archive/v0.9.3.tar.gz -> bpftrace-0.9.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=54183472534273f1e1b8c563d4c7c7d4
diff --git a/metadata/md5-cache/dev-util/bpftrace-0.9.4 b/metadata/md5-cache/dev-util/bpftrace-0.9.4
index 12b1652b0f08..f726eafa35e1 100644
--- a/metadata/md5-cache/dev-util/bpftrace-0.9.4
+++ b/metadata/md5-cache/dev-util/bpftrace-0.9.4
@@ -11,5 +11,5 @@ RDEPEND=dev-util/systemtap sys-devel/clang:= dev-libs/libbpf:= >=sys-devel/llvm-
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bpftrace/archive/v0.9.4.tar.gz -> bpftrace-0.9.4.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=edb411405e254fa9aa0a01c3c7747531
diff --git a/metadata/md5-cache/dev-util/bpftrace-9999 b/metadata/md5-cache/dev-util/bpftrace-9999
index 5d80ef093394..d4a8ec4f9fdf 100644
--- a/metadata/md5-cache/dev-util/bpftrace-9999
+++ b/metadata/md5-cache/dev-util/bpftrace-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-util/systemtap sys-devel/clang:= dev-libs/libbpf:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] >=dev-util/bcc-0.10.0:= virtual/libelf
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=79f8113c2a158310badec6080b8ea806
diff --git a/metadata/md5-cache/dev-util/buildbot-2.8.2 b/metadata/md5-cache/dev-util/buildbot-2.8.2
new file mode 100644
index 000000000000..1a10fdac5958
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-2.8.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( acct-user/buildbot >=dev-python/jinja-2.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/twisted-17.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/autobahn-0.16.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/sqlalchemy-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/sqlalchemy-migrate-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/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(-)] >=dev-python/python-dateutil-1.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/txaio-2.2.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/pyjwt[python_targets_python3_6(-)?,python_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(-)] >=dev-python/zope-interface-4.1.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-util/buildbot-worker-2.8.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(-)] crypt? ( >=dev-python/twisted-17.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(-),crypt] >=dev-python/pyopenssl-16.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/idna-2.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/service_identity[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) irc? ( dev-python/txrequests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) docker? ( >=dev-python/docker-py-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/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(-)] ) ) virtual/pkgconfig 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-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-42.0.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 config configure install postinst prepare setup test
+DEPEND=acct-user/buildbot >=dev-python/jinja-2.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/twisted-17.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/autobahn-0.16.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/sqlalchemy-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/sqlalchemy-migrate-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/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(-)] >=dev-python/python-dateutil-1.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/txaio-2.2.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/pyjwt[python_targets_python3_6(-)?,python_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(-)] >=dev-python/zope-interface-4.1.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-util/buildbot-worker-2.8.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(-)] crypt? ( >=dev-python/twisted-17.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(-),crypt] >=dev-python/pyopenssl-16.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/idna-2.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/service_identity[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) irc? ( dev-python/txrequests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) docker? ( >=dev-python/docker-py-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/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(-)] ) doc? ( >=dev-python/sphinx-1.4.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/sphinx-2.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/sphinxcontrib-blockdiag[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_6(-)?,python_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/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/sphinx-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/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/mock-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/moto[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/boto3-1.12.48[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/parameterized[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pypugjs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/txrequests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/lz4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/treq[python_targets_python3_6(-)?,python_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_trial[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ~dev-util/buildbot-pkg-2.8.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-util/buildbot-worker-2.8.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-util/buildbot-www-2.8.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(-)] crypt? ( >=dev-python/twisted-17.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(-),crypt] >=dev-python/pyopenssl-16.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/idna-2.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/service_identity[python_targets_python3_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=BuildBot build automation system
+EAPI=7
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/
+IUSE=crypt doc docker examples irc test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=acct-user/buildbot >=dev-python/jinja-2.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/twisted-17.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/autobahn-0.16.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/sqlalchemy-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/sqlalchemy-migrate-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/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(-)] >=dev-python/python-dateutil-1.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/txaio-2.2.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/pyjwt[python_targets_python3_6(-)?,python_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(-)] >=dev-python/zope-interface-4.1.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-util/buildbot-worker-2.8.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(-)] crypt? ( >=dev-python/twisted-17.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(-),crypt] >=dev-python/pyopenssl-16.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/idna-2.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/service_identity[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) irc? ( dev-python/txrequests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) docker? ( >=dev-python/docker-py-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/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(-)] ) 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-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-42.0.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/b/buildbot/buildbot-2.8.2.tar.gz https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=88c3ea090c3774bc203befd3feb123b3
diff --git a/metadata/md5-cache/dev-util/buildbot-badges-2.8.2 b/metadata/md5-cache/dev-util/buildbot-badges-2.8.2
new file mode 100644
index 000000000000..6846108b72fa
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-badges-2.8.2
@@ -0,0 +1,15 @@
+BDEPEND=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-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-42.0.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=~dev-util/buildbot-2.8.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-util/buildbot-www-2.8.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-util/buildbot-pkg-2.8.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/cairocffi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] media-gfx/cairosvg[python_targets_python3_6(-)?,python_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.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/klein[python_targets_python3_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=Buildbot badges plugin produces an image in SVG or PNG format...
+EAPI=7
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=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-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-42.0.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/b/buildbot-badges/buildbot-badges-2.8.2.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b21310954d34116dfeddc027aa0d8881
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-2.8.2 b/metadata/md5-cache/dev-util/buildbot-console-view-2.8.2
new file mode 100644
index 000000000000..64ed76477ebd
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-console-view-2.8.2
@@ -0,0 +1,15 @@
+BDEPEND=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-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-42.0.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=~dev-util/buildbot-2.8.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-util/buildbot-www-2.8.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=Buildbot console-view plugin
+EAPI=7
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=~dev-util/buildbot-2.8.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-util/buildbot-www-2.8.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(-)] 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-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-42.0.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/b/buildbot-console-view/buildbot-console-view-2.8.2.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=35fe3f395baa97f44309dd147aa52441
diff --git a/metadata/md5-cache/dev-util/buildbot-grid-view-2.8.2 b/metadata/md5-cache/dev-util/buildbot-grid-view-2.8.2
new file mode 100644
index 000000000000..f9f0ce39aa9b
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-grid-view-2.8.2
@@ -0,0 +1,15 @@
+BDEPEND=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-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-42.0.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=~dev-util/buildbot-2.8.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-util/buildbot-www-2.8.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=BuildBot grid view web interface
+EAPI=7
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=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-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-42.0.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/b/buildbot-grid-view/buildbot-grid-view-2.8.2.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=842251df93ca7efd0bb76e850c6e23da
diff --git a/metadata/md5-cache/dev-util/buildbot-pkg-2.8.2 b/metadata/md5-cache/dev-util/buildbot-pkg-2.8.2
new file mode 100644
index 000000000000..102a8b6f1be9
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-pkg-2.8.2
@@ -0,0 +1,14 @@
+BDEPEND=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-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-42.0.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=BuildBot common www build tools for packaging releases
+EAPI=7
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=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-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-42.0.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/b/buildbot-pkg/buildbot-pkg-2.8.2.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=836fab1f28e1ef35429d8d88ce4c5c53
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.8.2 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.8.2
new file mode 100644
index 000000000000..5ef2c5dc98a0
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.8.2
@@ -0,0 +1,15 @@
+BDEPEND=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-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-42.0.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=~dev-util/buildbot-2.8.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/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-util/buildbot-www-2.8.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=Buildbot waterfall-view plugin
+EAPI=7
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=~dev-util/buildbot-2.8.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/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-util/buildbot-www-2.8.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(-)] 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-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-42.0.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/b/buildbot-waterfall-view/buildbot-waterfall-view-2.8.2.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6432c553a3bc681fb9891ffa1a531eb2
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-2.8.2 b/metadata/md5-cache/dev-util/buildbot-worker-2.8.2
new file mode 100644
index 000000000000..71f10a0721fa
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-worker-2.8.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( acct-user/buildbot >=dev-python/twisted-17.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/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(-)] !<dev-util/buildbot-1.0.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-42.0.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 config configure install postinst prepare setup test
+DEPEND=acct-user/buildbot >=dev-python/twisted-17.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/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(-)] !<dev-util/buildbot-1.0.0 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/setuptools_trial[python_targets_python3_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=BuildBot Worker (slave) Daemon
+EAPI=7
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/
+IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=acct-user/buildbot >=dev-python/twisted-17.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/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(-)] !<dev-util/buildbot-1.0.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-42.0.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/b/buildbot-worker/buildbot-worker-2.8.2.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=bd8e27fb22d341376b7060ace3925e8e
diff --git a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.2 b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.2
new file mode 100644
index 000000000000..5e0587a5dde3
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.2
@@ -0,0 +1,15 @@
+BDEPEND=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-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-42.0.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=>=dev-python/setuptools-21.2.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-util/buildbot-2.8.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-util/buildbot-www-2.8.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=Buildbot plugin to integrate flask or bottle dashboards to buildbot UI
+EAPI=7
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=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-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-42.0.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/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.2.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e87af2212874a69cd36ab925966c7457
diff --git a/metadata/md5-cache/dev-util/buildbot-www-2.8.2 b/metadata/md5-cache/dev-util/buildbot-www-2.8.2
new file mode 100644
index 000000000000..0eeb85b9984c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-www-2.8.2
@@ -0,0 +1,15 @@
+BDEPEND=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-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-42.0.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=~dev-util/buildbot-pkg-2.8.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=BuildBot base web interface, use with buildbot-{console-view,waterfall-view}...
+EAPI=7
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=~dev-util/buildbot-pkg-2.8.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(-)] 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-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-42.0.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/b/buildbot-www/buildbot-www-2.8.2.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b97203eb2be2f9065d8f3a6a842afcfc
diff --git a/metadata/md5-cache/dev-util/bustle-0.4.2-r1 b/metadata/md5-cache/dev-util/bustle-0.4.2-r1
deleted file mode 100644
index 5e93d7169bf0..000000000000
--- a/metadata/md5-cache/dev-util/bustle-0.4.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/glib:2 net-libs/libpcap sys-apps/dbus x11-libs/cairo x11-libs/pango gnome-base/libglade:2.0 test? ( dev-haskell/hunit dev-haskell/quickcheck dev-haskell/test-framework dev-haskell/test-framework-hunit ) >=dev-haskell/cabal-1.8 dev-haskell/cairo:0 >=dev-haskell/dbus-0.10 dev-haskell/glib:0 >=dev-haskell/gtk-0.12.3:2 dev-haskell/mtl dev-haskell/pango:0 dev-haskell/parsec dev-haskell/pcap dev-haskell/text >=dev-lang/ghc-6.10.4
-DESCRIPTION=Draw pretty sequence diagrams of D-Bus traffic
-EAPI=5
-HOMEPAGE=http://willthompson.co.uk/bustle/
-IUSE=test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2 GPL-2
-RDEPEND=dev-libs/glib:2 net-libs/libpcap sys-apps/dbus x11-libs/cairo x11-libs/pango gnome-base/libglade:2.0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://willthompson.co.uk/bustle/releases/0.4.2/bustle-0.4.2.tar.gz https://dev.gentoo.org/~slyfox/bustle-0.4.0-tests.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=711b0c98bed7b376f749a4cfa1980bb8
diff --git a/metadata/md5-cache/dev-util/bustle-0.4.7-r1 b/metadata/md5-cache/dev-util/bustle-0.4.7-r1
deleted file mode 100644
index d5be02cfee96..000000000000
--- a/metadata/md5-cache/dev-util/bustle-0.4.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/glib:2 net-libs/libpcap sys-apps/dbus x11-libs/cairo x11-libs/pango gnome-base/libglade:2.0 >=dev-haskell/cabal-1.8.0.2 dev-haskell/cairo >=dev-haskell/dbus-0.10 dev-haskell/glib >=dev-haskell/gtk-0.13 >=dev-haskell/hgettext-0.1.5 dev-haskell/mtl >=dev-haskell/pango-0.13 dev-haskell/parsec dev-haskell/pcap dev-haskell/setlocale dev-haskell/text >=dev-lang/ghc-6.12.1 virtual/pkgconfig test? ( dev-haskell/hunit dev-haskell/quickcheck dev-haskell/test-framework dev-haskell/test-framework-hunit )
-DESCRIPTION=Draw pretty sequence diagrams of D-Bus traffic
-EAPI=5
-HOMEPAGE=http://hackage.haskell.org/package/bustle
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2 GPL-2 GPL-3
-RDEPEND=dev-libs/glib:2 net-libs/libpcap sys-apps/dbus x11-libs/cairo x11-libs/pango gnome-base/libglade:2.0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://hackage.haskell.org/package/bustle-0.4.7/bustle-0.4.7.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bf7fc4bfb02bc339d92dd2a7c2cfca43
diff --git a/metadata/md5-cache/dev-util/cbindgen-0.14.3 b/metadata/md5-cache/dev-util/cbindgen-0.14.3
new file mode 100644
index 000000000000..b4932255265b
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cbindgen-0.14.3
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/rust-1.37.0
+DEFINED_PHASES=compile install test unpack
+DESCRIPTION=A tool for generating C bindings to Rust code
+EAPI=7
+HOMEPAGE=https://github.com/eqrion/cbindgen/
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=MIT MPL-2.0
+SLOT=0
+SRC_URI=https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.13/download -> atty-0.2.13.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/c2-chacha/0.2.3/download -> c2-chacha-0.2.3.crate https://crates.io/api/v1/crates/cbindgen/0.14.3/download -> cbindgen-0.14.3.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/getrandom/0.1.13/download -> getrandom-0.1.13.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/libc/0.2.66/download -> libc-0.2.66.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.6/download -> ppv-lite86-0.2.6.crate https://crates.io/api/v1/crates/proc-macro2/1.0.6/download -> proc-macro2-1.0.6.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.2.crate https://crates.io/api/v1/crates/rand/0.7.2/download -> rand-0.7.2.crate https://crates.io/api/v1/crates/rand_chacha/0.2.1/download -> rand_chacha-0.2.1.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.2/download -> remove_dir_all-0.5.2.crate https://crates.io/api/v1/crates/ryu/1.0.2/download -> ryu-1.0.2.crate https://crates.io/api/v1/crates/serde/1.0.104/download -> serde-1.0.104.crate https://crates.io/api/v1/crates/serde_derive/1.0.104/download -> serde_derive-1.0.104.crate https://crates.io/api/v1/crates/serde_json/1.0.44/download -> serde_json-1.0.44.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.11/download -> syn-1.0.11.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/toml/0.5.5/download -> toml-0.5.5.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/wasi/0.7.0/download -> wasi-0.7.0.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
+_eclasses_=cargo	59ecae2c29d723be70671fd182038195	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=632d8cdf66d1ec9de219cf0922e984d3
diff --git a/metadata/md5-cache/dev-util/ccache-3.7.10 b/metadata/md5-cache/dev-util/ccache-3.7.10
new file mode 100644
index 000000000000..537c63bc2e87
--- /dev/null
+++ b/metadata/md5-cache/dev-util/ccache-3.7.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm test
+DEPEND=app-arch/xz-utils sys-libs/zlib test? ( dev-libs/elfutils )
+DESCRIPTION=fast compiler cache
+EAPI=7
+HOMEPAGE=https://ccache.dev/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=app-arch/xz-utils sys-libs/zlib dev-util/shadowman sys-apps/gentoo-functions
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ccache/ccache/releases/download/v3.7.10/ccache-3.7.10.tar.xz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=cd68809c611ae42d5b0dcf36ec6603e7
diff --git a/metadata/md5-cache/dev-util/chroot-wrapper-0.9.1 b/metadata/md5-cache/dev-util/chroot-wrapper-0.9.1
new file mode 100644
index 000000000000..53fc01910870
--- /dev/null
+++ b/metadata/md5-cache/dev-util/chroot-wrapper-0.9.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install setup
+DESCRIPTION=Wrapper for chroot to set up some bind mounts, namespaces, and control groups
+EAPI=7
+HOMEPAGE=https://github.com/chutz/chroot-wrapper
+IUSE=kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-shells/bash-5.0 sys-apps/util-linux sys-apps/coreutils
+SLOT=0
+SRC_URI=https://github.com/chutz/chroot-wrapper/archive/0.9.1.tar.gz -> chroot-wrapper-0.9.1.tar.gz
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a5d617be461ee9191c6c3f1c9dfc3cf7
diff --git a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-10.2.1 b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-10.2.1
new file mode 100644
index 000000000000..ad029baec01c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-10.2.1
@@ -0,0 +1,16 @@
+BDEPEND=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/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_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=a simpler alternative to Regular Expressions
+EAPI=7
+HOMEPAGE=https://github.com/cucumber/cucumber-expressions-ruby#readme
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+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=10
+SRC_URI=https://rubygems.org/gems/cucumber-cucumber-expressions-10.2.1.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1eee106df6d300c6474fa877888623cb
diff --git a/metadata/md5-cache/dev-util/cucumber-rails-2.1.0 b/metadata/md5-cache/dev-util/cucumber-rails-2.1.0
new file mode 100644
index 000000000000..2c627590ed64
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-rails-2.1.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-util/cucumber-3.0.2[ruby_targets_ruby25(-)] <dev-util/cucumber-5[ruby_targets_ruby25(-)] >=dev-ruby/nokogiri-1.8[ruby_targets_ruby25(-)] >=dev-ruby/capybara-2.12:*[ruby_targets_ruby25(-)] <dev-ruby/capybara-4:*[ruby_targets_ruby25(-)] >=dev-ruby/rails-4.2:*[ruby_targets_ruby25(-)] <dev-ruby/rails-7:*[ruby_targets_ruby25(-)] >=dev-ruby/mime-types-2.0:*[ruby_targets_ruby25(-)] <dev-ruby/mime-types-4:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-util/cucumber-3.0.2[ruby_targets_ruby26(-)] <dev-util/cucumber-5[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.8[ruby_targets_ruby26(-)] >=dev-ruby/capybara-2.12:*[ruby_targets_ruby26(-)] <dev-ruby/capybara-4:*[ruby_targets_ruby26(-)] >=dev-ruby/rails-4.2:*[ruby_targets_ruby26(-)] <dev-ruby/rails-7:*[ruby_targets_ruby26(-)] >=dev-ruby/mime-types-2.0:*[ruby_targets_ruby26(-)] <dev-ruby/mime-types-4:*[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/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[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=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=Executable feature scenarios for Rails
+EAPI=7
+HOMEPAGE=https://github.com/cucumber/cucumber/wikis
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby25? ( >=dev-util/cucumber-3.0.2[ruby_targets_ruby25(-)] <dev-util/cucumber-5[ruby_targets_ruby25(-)] >=dev-ruby/nokogiri-1.8[ruby_targets_ruby25(-)] >=dev-ruby/capybara-2.12:*[ruby_targets_ruby25(-)] <dev-ruby/capybara-4:*[ruby_targets_ruby25(-)] >=dev-ruby/rails-4.2:*[ruby_targets_ruby25(-)] <dev-ruby/rails-7:*[ruby_targets_ruby25(-)] >=dev-ruby/mime-types-2.0:*[ruby_targets_ruby25(-)] <dev-ruby/mime-types-4:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-util/cucumber-3.0.2[ruby_targets_ruby26(-)] <dev-util/cucumber-5[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.8[ruby_targets_ruby26(-)] >=dev-ruby/capybara-2.12:*[ruby_targets_ruby26(-)] <dev-ruby/capybara-4:*[ruby_targets_ruby26(-)] >=dev-ruby/rails-4.2:*[ruby_targets_ruby26(-)] <dev-ruby/rails-7:*[ruby_targets_ruby26(-)] >=dev-ruby/mime-types-2.0:*[ruby_targets_ruby26(-)] <dev-ruby/mime-types-4:*[ruby_targets_ruby26(-)] ) 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 )
+SLOT=2
+SRC_URI=https://rubygems.org/gems/cucumber-rails-2.1.0.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=22ddc2be9434fceab47614540f16d6b8
diff --git a/metadata/md5-cache/dev-util/debootstrap-1.0.123 b/metadata/md5-cache/dev-util/debootstrap-1.0.123
index 5ef172a3408d..3b3aec95a920 100644
--- a/metadata/md5-cache/dev-util/debootstrap-1.0.123
+++ b/metadata/md5-cache/dev-util/debootstrap-1.0.123
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=Debian/Ubuntu bootstrap scripts
 EAPI=7
 HOMEPAGE=https://packages.qa.debian.org/d/debootstrap.html
-KEYWORDS=~alpha ~amd64 ~arm ~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=MIT
 RDEPEND=app-arch/dpkg net-misc/wget sys-devel/binutils
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.123.tar.gz mirror://gentoo/devices.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5
-_md5_=019785b885fd30319037a9da7b8b8107
+_md5_=054475d0f073684efab67629f9c5454b
diff --git a/metadata/md5-cache/dev-util/dejagnu-1.6.2 b/metadata/md5-cache/dev-util/dejagnu-1.6.2
index d9ec116c8ecc..3923aa4290ca 100644
--- a/metadata/md5-cache/dev-util/dejagnu-1.6.2
+++ b/metadata/md5-cache/dev-util/dejagnu-1.6.2
@@ -3,9 +3,9 @@ DEPEND=dev-lang/tcl dev-tcltk/expect
 DESCRIPTION=Framework for testing other programs
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/dejagnu/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=dev-lang/tcl dev-tcltk/expect
 SLOT=0
 SRC_URI=mirror://gnu/dejagnu/dejagnu-1.6.2.tar.gz
-_md5_=c98adf73dd044b65fff3ed6cd184fb30
+_md5_=9a61ed72668b9587fcac481a1d813eeb
diff --git a/metadata/md5-cache/dev-util/desktop-file-utils-0.26 b/metadata/md5-cache/dev-util/desktop-file-utils-0.26
new file mode 100644
index 000000000000..d7ab7917a681
--- /dev/null
+++ b/metadata/md5-cache/dev-util/desktop-file-utils-0.26
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/xz-utils virtual/pkgconfig >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install postinst postrm test
+DEPEND=>=dev-libs/glib-2.12:2 emacs? ( >=app-editors/emacs-23.1:* )
+DESCRIPTION=Command line utilities to work with desktop menu entries
+EAPI=7
+HOMEPAGE=https://freedesktop.org/wiki/Software/desktop-file-utils
+IUSE=emacs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.12:2 emacs? ( >=app-editors/emacs-23.1:* )
+SLOT=0
+SRC_URI=https://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.26.tar.xz
+_eclasses_=elisp-common	504a3383c45504fde86b00426619a709	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=73e85f22f127d69c88157ad0fd6ef553
diff --git a/metadata/md5-cache/dev-util/devhelp-3.34.0 b/metadata/md5-cache/dev-util/devhelp-3.34.0
index 5e78a2e98cd5..bab44a741e28 100644
--- a/metadata/md5-cache/dev-util/devhelp-3.34.0
+++ b/metadata/md5-cache/dev-util/devhelp-3.34.0
@@ -5,11 +5,11 @@ DESCRIPTION=An API documentation browser for GNOME
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Devhelp
 IUSE=gedit gtk-doc +introspection python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( app-editors/gedit[introspection,python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] 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(-)?,python_single_target_python3_8(-)?] dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( app-editors/gedit[introspection,python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-python/pygobject:3[python_targets_python3_8(-)] ) )
 REQUIRED_USE=gedit? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0/3-6
 SRC_URI=mirror://gnome/sources/devhelp/3.34/devhelp-3.34.0.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c6fd77ca35af0f0241afab443b1ebc35
+_md5_=029fb1ad119e0cf5cdbd91ff9e28efdc
diff --git a/metadata/md5-cache/dev-util/diffoscope-148 b/metadata/md5-cache/dev-util/diffoscope-148
deleted file mode 100644
index c0d1260678e1..000000000000
--- a/metadata/md5-cache/dev-util/diffoscope-148
+++ /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-42.0.2[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=Will try to get to the bottom of what makes files or directories different
-EAPI=7
-HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
-IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg gzip haskell hdf5 hex imagemagick iso java llvm mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar tcpdump xz zip zstd python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-python/python-magic[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/libarchive-c[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/distro[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) gzip? ( app-arch/gzip ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( virtual/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) xz? ( app-arch/xz-utils ) zip? ( app-arch/unzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.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-42.0.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/d/diffoscope/diffoscope-148.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1fa7d96843c400b8aec7bd9270d3f83a
diff --git a/metadata/md5-cache/dev-util/diffoscope-149 b/metadata/md5-cache/dev-util/diffoscope-149
new file mode 100644
index 000000000000..5804b6c17d8a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/diffoscope-149
@@ -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-42.0.2[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=Will try to get to the bottom of what makes files or directories different
+EAPI=7
+HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
+IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg gzip haskell hdf5 hex imagemagick iso java llvm mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar tcpdump xz zip zstd python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-python/python-magic[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/libarchive-c[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/distro[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) gzip? ( app-arch/gzip ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( virtual/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) xz? ( app-arch/xz-utils ) zip? ( app-arch/unzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.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-42.0.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/d/diffoscope/diffoscope-149.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1fa7d96843c400b8aec7bd9270d3f83a
diff --git a/metadata/md5-cache/dev-util/dropwatch-1.4-r1 b/metadata/md5-cache/dev-util/dropwatch-1.4-r1
index a9ebcb160449..17c5c178c46c 100644
--- a/metadata/md5-cache/dev-util/dropwatch-1.4-r1
+++ b/metadata/md5-cache/dev-util/dropwatch-1.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libnl:3 sys-libs/binutils-libs sys-libs/readline:=
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/d/r/dropwatch/dropwatch-1.4.tbz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7710b057f84563a344fb1e3528a999ac
diff --git a/metadata/md5-cache/dev-util/dropwatch-1.4_p20150706 b/metadata/md5-cache/dev-util/dropwatch-1.4_p20150706
index 5b710ce757cd..0ce73bd6435e 100644
--- a/metadata/md5-cache/dev-util/dropwatch-1.4_p20150706
+++ b/metadata/md5-cache/dev-util/dropwatch-1.4_p20150706
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libnl:3 sys-libs/binutils-libs:= sys-libs/readline:=
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~bircoph/distfiles/dropwatch-1.4_p20150706.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=214846a1889f7a7012fc43bd47accbdd
diff --git a/metadata/md5-cache/dev-util/egypt-1.10 b/metadata/md5-cache/dev-util/egypt-1.10
index eb578458ccb7..526a93b9050e 100644
--- a/metadata/md5-cache/dev-util/egypt-1.10
+++ b/metadata/md5-cache/dev-util/egypt-1.10
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://www.gson.org/egypt/download/egypt-1.10.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3af27e2197b3947c438cb8ff7ce0ea01
diff --git a/metadata/md5-cache/dev-util/gnome-builder-3.36.1 b/metadata/md5-cache/dev-util/gnome-builder-3.36.1
new file mode 100644
index 000000000000..b78de22b82b1
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gnome-builder-3.36.1
@@ -0,0 +1,16 @@
+BDEPEND=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(-)] ) python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) 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.33.90[introspection] >=dev-libs/glib-2.61.2: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 >=x11-libs/pango-1.38.0 >=dev-libs/libpeas-1.22.0[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-libs/template-glib-3.28.0[introspection] >=x11-libs/vte-0.40.2:2.91[introspection] >=net-libs/webkit-gtk-2.12.0:4=[introspection] >=dev-libs/libxml2-2.9.0 git? ( dev-libs/libgit2[ssh,threads] >=dev-libs/libgit2-glib-0.28.0.1[ssh] ) dev-libs/libpcre:3 dev-libs/libpcre2 >=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_8? ( >=dev-python/pygobject-3.22.0:3[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] ) 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 ) >=dev-util/sysprof-capture-3.33.1:3 sysprof? ( >=dev-util/sysprof-3.33.4:0/3[gtk] ) !!sys-devel/llvm:0 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 +git +glade gtk-doc spell sysprof test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 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.33.90[introspection] >=dev-libs/glib-2.61.2: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 >=x11-libs/pango-1.38.0 >=dev-libs/libpeas-1.22.0[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-libs/template-glib-3.28.0[introspection] >=x11-libs/vte-0.40.2:2.91[introspection] >=net-libs/webkit-gtk-2.12.0:4=[introspection] >=dev-libs/libxml2-2.9.0 git? ( dev-libs/libgit2[ssh,threads] >=dev-libs/libgit2-glib-0.28.0.1[ssh] ) dev-libs/libpcre:3 dev-libs/libpcre2 >=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_8? ( >=dev-python/pygobject-3.22.0:3[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] ) 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 ) >=dev-util/sysprof-capture-3.33.1:3 sysprof? ( >=dev-util/sysprof-3.33.4:0/3[gtk] )
+REQUIRED_USE=^^ ( 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/gnome-builder/3.36/gnome-builder-3.36.1.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d1c62586feff8e0debbac4dcb19cdec5
diff --git a/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.20 b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.20
index 1effac3bcb4b..7aa8cda7a0fb 100644
--- a/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.20
+++ b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.20
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.53.4:2 >=x11-libs/gdk-pixbuf-2.30:2 !<x11-libs/gtk+-2.2
 DESCRIPTION=GTK update icon cache
 EAPI=6
 HOMEPAGE=https://www.gtk.org/ https://gitlab.gnome.org/Community/gentoo/gtk-update-icon-cache
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.53.4:2 >=x11-libs/gdk-pixbuf-2.30:2 !<x11-libs/gtk+-2.24.28-r1:2 !<x11-libs/gtk+-3.22.2:3
 SLOT=0
 SRC_URI=https://gitlab.gnome.org/Community/gentoo/gtk-update-icon-cache/-/archive/3.24.20/gtk-update-icon-cache-3.24.20.tar.bz2
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=978ff802623107007e5e821ada470109
+_md5_=8d9b9fabdafdead9f156155fec3b1e5e
diff --git a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.3826 b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.3826
deleted file mode 100644
index b09241b3635e..000000000000
--- a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.3826
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=<=sys-devel/llvm-9.9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_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/opencl-clang-9.9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_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:0
-DESCRIPTION=LLVM-based OpenCL compiler targetting Intel Gen graphics hardware
-EAPI=7
-HOMEPAGE=https://github.com/intel/intel-graphics-compiler
-IUSE=debug abi_x86_32 abi_x86_64 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
-LICENSE=MIT
-RDEPEND=<=sys-devel/llvm-9.9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_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/opencl-clang-9.9999:=[abi_x86_32(-)?,abi_x86_64(-)?,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/intel/intel-graphics-compiler/archive/igc-1.0.3826.tar.gz -> intel-graphics-compiler-1.0.3826.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6e58a3d491ac92d02a3d2263697f1824
diff --git a/metadata/md5-cache/dev-util/intel-ocl-sdk-4.4.0.117-r2 b/metadata/md5-cache/dev-util/intel-ocl-sdk-4.4.0.117-r2
index 50d7a435bdbe..002978d9c303 100644
--- a/metadata/md5-cache/dev-util/intel-ocl-sdk-4.4.0.117-r2
+++ b/metadata/md5-cache/dev-util/intel-ocl-sdk-4.4.0.117-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Intel's implementation of the OpenCL standard
 EAPI=5
 HOMEPAGE=https://software.intel.com/en-us/articles/opencl-sdk/
 IUSE=android +system-tbb system-clang +system-boost
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=Intel-SDP
 RDEPEND=>=virtual/opencl-3 sys-process/numactl system-tbb? ( >=dev-cpp/tbb-4.2.20131118 ) system-clang? ( =sys-devel/clang-3.4* ) system-boost? ( >=dev-libs/boost-1.52.0:= )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://registrationcenter.intel.com/irc_nas/4181/intel_sdk_for_ocl_applications_2014_ubuntu_4.4.0.117_x64.tgz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1722db29735195d4a264eb02033b2423
+_md5_=2bd3fc8355e4b84520ad26d693d1f2f9
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.222.4 b/metadata/md5-cache/dev-util/jenkins-bin-2.222.4
deleted file mode 100644
index e38633c48cc6..000000000000
--- a/metadata/md5-cache/dev-util/jenkins-bin-2.222.4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install setup
-DESCRIPTION=Extensible continuous integration server
-EAPI=7
-HOMEPAGE=https://jenkins.io/
-KEYWORDS=~amd64 ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:0 >=virtual/jre-1.8.0
-RESTRICT=mirror
-SLOT=lts
-SRC_URI=http://mirrors.jenkins-ci.org/war-stable/2.222.4/jenkins.war -> jenkins-bin-2.222.4.war
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=0935a84615a963df9606323f353012d9
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.228 b/metadata/md5-cache/dev-util/jenkins-bin-2.228
deleted file mode 100644
index d1e8c4b22965..000000000000
--- a/metadata/md5-cache/dev-util/jenkins-bin-2.228
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install setup
-DESCRIPTION=Extensible continuous integration server
-EAPI=7
-HOMEPAGE=https://jenkins.io/
-KEYWORDS=~amd64 ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:lts >=virtual/jre-1.8.0
-RESTRICT=mirror
-SLOT=0
-SRC_URI=http://mirrors.jenkins-ci.org/war/2.228/jenkins.war -> jenkins-bin-2.228.war
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=9c350e4ed166eee45fa5b1064c361f57
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.242 b/metadata/md5-cache/dev-util/jenkins-bin-2.242
new file mode 100644
index 000000000000..0c93f36c9f8a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.242
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install setup
+DESCRIPTION=Extensible continuous integration server
+EAPI=7
+HOMEPAGE=https://jenkins.io/
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:lts >=virtual/jre-1.8.0
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://mirrors.jenkins-ci.org/war/2.242/jenkins.war -> jenkins-bin-2.242.war
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=9c350e4ed166eee45fa5b1064c361f57
diff --git a/metadata/md5-cache/dev-util/kdevelop-5.4.6 b/metadata/md5-cache/dev-util/kdevelop-5.4.6
deleted file mode 100644
index 187b8077a560..000000000000
--- a/metadata/md5-cache/dev-util/kdevelop-5.4.6
+++ /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.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=>=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] ) dev-libs/boost >=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=Integrated Development Environment, supporting KF5/Qt, C/C++ and much more
-EAPI=7
-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 || ( 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	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3c120e3abb12102304342df97ad3a921
diff --git a/metadata/md5-cache/dev-util/kdevelop-5.5.2 b/metadata/md5-cache/dev-util/kdevelop-5.5.2
index 1ced6fbf4979..f35888b44a44 100644
--- a/metadata/md5-cache/dev-util/kdevelop-5.5.2
+++ b/metadata/md5-cache/dev-util/kdevelop-5.5.2
@@ -5,11 +5,11 @@ DESCRIPTION=Integrated Development Environment, supporting KF5/Qt, C/C++ and muc
 EAPI=7
 HOMEPAGE=https://www.kdevelop.org/
 IUSE=+gdbui hex +plasma +qmake reviewboard subversion webkit test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=dev-libs/grantlee: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-util/astyle-3.1:= kde-apps/libkomparediff2:5 >=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 >=sys-devel/clang-6.0:= gdbui? ( kde-plasma/libksysguard: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] ) >=dev-qt/qdbus-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 dev-util/ninja kde-apps/kapptemplate:5 kde-apps/kio-extras:5 >=sys-devel/gdb-7.0[python] reviewboard? ( kde-apps/ktp-accounts-kcm: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.2/src/kdevelop-5.5.2.tar.xz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cb007b0e3d8393247134b016cc7c8a6e
+_md5_=a1870d72358098ed86896edc8aac53ac
diff --git a/metadata/md5-cache/dev-util/kdevelop-php-5.4.6 b/metadata/md5-cache/dev-util/kdevelop-php-5.4.6
deleted file mode 100644
index d4539c88751d..000000000000
--- a/metadata/md5-cache/dev-util/kdevelop-php-5.4.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-util/kdevelop:5[test] ) 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=>=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/ki18n-5.60.0:5 >=kde-frameworks/kio-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-pg-qt: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=PHP plugin for KDevelop
-EAPI=7
-HOMEPAGE=https://www.kdevelop.org/
-IUSE=test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=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/ki18n-5.60.0:5 >=kde-frameworks/kio-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-pg-qt:5 dev-util/kdevelop: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/kdevelop/5.4.6/src/kdev-php-5.4.6.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4b22b1d6d9f19dd7d43a51aec5ac11fa
diff --git a/metadata/md5-cache/dev-util/kdevelop-php-5.5.2 b/metadata/md5-cache/dev-util/kdevelop-php-5.5.2
index 0fa35d6771aa..fc1f9623d76e 100644
--- a/metadata/md5-cache/dev-util/kdevelop-php-5.5.2
+++ b/metadata/md5-cache/dev-util/kdevelop-php-5.5.2
@@ -5,11 +5,11 @@ DESCRIPTION=PHP plugin for KDevelop
 EAPI=7
 HOMEPAGE=https://www.kdevelop.org/
 IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/kdevelop-pg-qt:5 dev-util/kdevelop: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/ki18n-5.60.0:5 >=kde-frameworks/kio-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 || ( 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/kdevelop/5.5.2/src/kdev-php-5.5.2.tar.xz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8dd2c6bffb87d06614c042300649228a
+_md5_=5a2129da279a6b8cd6fe6a4b46713f8b
diff --git a/metadata/md5-cache/dev-util/kdevelop-python-5.4.6 b/metadata/md5-cache/dev-util/kdevelop-python-5.4.6
deleted file mode 100644
index 3bd8051e71d3..000000000000
--- a/metadata/md5-cache/dev-util/kdevelop-python-5.4.6
+++ /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_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.6/src/kdev-python-5.4.6.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8abcb558fd5561e5ed079aa6aae79c9a
diff --git a/metadata/md5-cache/dev-util/kdevelop-python-5.5.2 b/metadata/md5-cache/dev-util/kdevelop-python-5.5.2
index 49fcb7d8bd41..d06d509b721e 100644
--- a/metadata/md5-cache/dev-util/kdevelop-python-5.5.2
+++ b/metadata/md5-cache/dev-util/kdevelop-python-5.5.2
@@ -5,7 +5,7 @@ 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
+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-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/kdevelop:5= >=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 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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.5.2/src/kdev-python-5.5.2.tar.xz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5a5e9a3c174650bce9953795e1f81dd2
+_md5_=5ca83d18fdfdafaf02f22083817cb755
diff --git a/metadata/md5-cache/dev-util/lldb-10.0.0 b/metadata/md5-cache/dev-util/lldb-10.0.0
index 6918b6204ffd..9923e7da2383 100644
--- a/metadata/md5-cache/dev-util/lldb-10.0.0
+++ b/metadata/md5-cache/dev-util/lldb-10.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( 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.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=06c6db461d083e10ebec567d27e7dd4c
diff --git a/metadata/md5-cache/dev-util/lldb-10.0.1.9999 b/metadata/md5-cache/dev-util/lldb-10.0.1.9999
index 06ed319e910c..ff836ecbc38e 100644
--- a/metadata/md5-cache/dev-util/lldb-10.0.1.9999
+++ b/metadata/md5-cache/dev-util/lldb-10.0.1.9999
@@ -11,5 +11,5 @@ RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses?
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5cd9e31b464c3c1d783900458a413917
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=edd526020dedeba660ff1047dfe241c5
diff --git a/metadata/md5-cache/dev-util/lldb-10.0.1_rc1 b/metadata/md5-cache/dev-util/lldb-10.0.1_rc1
index 2368b8ab26d8..bd2f130f7a1e 100644
--- a/metadata/md5-cache/dev-util/lldb-10.0.1_rc1
+++ b/metadata/md5-cache/dev-util/lldb-10.0.1_rc1
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( 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.1-rc1.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5cd9e31b464c3c1d783900458a413917
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=edd526020dedeba660ff1047dfe241c5
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 1d794ecf5c0d..d7c4fa69748c 100644
--- a/metadata/md5-cache/dev-util/lldb-11.0.0.9999
+++ b/metadata/md5-cache/dev-util/lldb-11.0.0.9999
@@ -11,5 +11,5 @@ RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses?
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5cd9e31b464c3c1d783900458a413917
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=edd526020dedeba660ff1047dfe241c5
diff --git a/metadata/md5-cache/dev-util/lldb-9.0.1-r1 b/metadata/md5-cache/dev-util/lldb-9.0.1-r1
index 05131db3fdc4..347c4355119e 100644
--- a/metadata/md5-cache/dev-util/lldb-9.0.1-r1
+++ b/metadata/md5-cache/dev-util/lldb-9.0.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( 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	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f0520d6ee8bd35b4f12ed67f97107138
diff --git a/metadata/md5-cache/dev-util/ltrace-0.7.3_p4-r1 b/metadata/md5-cache/dev-util/ltrace-0.7.3_p4-r1
index 8df1c7587c96..6058e1f00ddf 100644
--- a/metadata/md5-cache/dev-util/ltrace-0.7.3_p4-r1
+++ b/metadata/md5-cache/dev-util/ltrace-0.7.3_p4-r1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) elibc_musl? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/l/ltrace/ltrace_0.7.3.orig.tar.bz2 mirror://debian/pool/main/l/ltrace/ltrace_0.7.3-4.debian.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3fe7066d38c58d83d7d1cb8a0ace5ab4
+_md5_=921d83553e748c0c1c8f08473baf8a00
diff --git a/metadata/md5-cache/dev-util/lttng-modules-2.10.12 b/metadata/md5-cache/dev-util/lttng-modules-2.10.12
index 350173678e4d..57a27ae66dc5 100644
--- a/metadata/md5-cache/dev-util/lttng-modules-2.10.12
+++ b/metadata/md5-cache/dev-util/lttng-modules-2.10.12
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0/2.10
 SRC_URI=https://lttng.org/files/lttng-modules/lttng-modules-2.10.12.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=61d6957e67c17e6643143404e100ce61
diff --git a/metadata/md5-cache/dev-util/lttng-modules-2.11.0 b/metadata/md5-cache/dev-util/lttng-modules-2.11.0
index 274c2bb6ef9a..f7d21d3c909f 100644
--- a/metadata/md5-cache/dev-util/lttng-modules-2.11.0
+++ b/metadata/md5-cache/dev-util/lttng-modules-2.11.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0/2.11
 SRC_URI=https://lttng.org/files/lttng-modules/lttng-modules-2.11.0.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=61d6957e67c17e6643143404e100ce61
diff --git a/metadata/md5-cache/dev-util/lttng-modules-2.7.1 b/metadata/md5-cache/dev-util/lttng-modules-2.7.1
index ac4d029f0530..a4c4f762ee85 100644
--- a/metadata/md5-cache/dev-util/lttng-modules-2.7.1
+++ b/metadata/md5-cache/dev-util/lttng-modules-2.7.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0/2.7
 SRC_URI=https://lttng.org/files/lttng-modules/lttng-modules-2.7.1.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=142006e0e3165b1d581a9ffe08354ba7
diff --git a/metadata/md5-cache/dev-util/lttng-tools-2.10.9 b/metadata/md5-cache/dev-util/lttng-tools-2.10.9
index ce1574710138..645348cc221c 100644
--- a/metadata/md5-cache/dev-util/lttng-tools-2.10.9
+++ b/metadata/md5-cache/dev-util/lttng-tools-2.10.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/userspace-rcu:= dev-libs/popt dev-libs/libxml2 ust? ( dev-util/lttng-ust:= )
 SLOT=0/2.10
 SRC_URI=https://lttng.org/files/lttng-tools/lttng-tools-2.10.9.tar.bz2
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=16e64d57044b0c708fd01811fe5abe2a
diff --git a/metadata/md5-cache/dev-util/lttng-tools-2.11.0 b/metadata/md5-cache/dev-util/lttng-tools-2.11.0
index 4a39614aae75..57adcf16a681 100644
--- a/metadata/md5-cache/dev-util/lttng-tools-2.11.0
+++ b/metadata/md5-cache/dev-util/lttng-tools-2.11.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/userspace-rcu:= dev-libs/popt dev-libs/libxml2 ust? ( dev-util/lttng-ust:= )
 SLOT=0/2.11
 SRC_URI=https://lttng.org/files/lttng-tools/lttng-tools-2.11.0.tar.bz2
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=16e64d57044b0c708fd01811fe5abe2a
diff --git a/metadata/md5-cache/dev-util/lttng-tools-2.7.1 b/metadata/md5-cache/dev-util/lttng-tools-2.7.1
index 6e6691d1af57..283d39421f58 100644
--- a/metadata/md5-cache/dev-util/lttng-tools-2.7.1
+++ b/metadata/md5-cache/dev-util/lttng-tools-2.7.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/userspace-rcu:= dev-libs/popt dev-libs/libxml2 ust? ( dev-util/lttng-ust:= )
 SLOT=0/2.7
 SRC_URI=https://lttng.org/files/lttng-tools/lttng-tools-2.7.1.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=947061150b44153c4aac846e4fb8b818
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-10.1.243 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-10.1.243
index 14c827b6be93..4fbba2111c58 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-10.1.243
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-10.1.243
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/nvidia-cuda-toolkit-10.1.243 media-libs/freeglut examples? ( m
 RESTRICT=test
 SLOT=0/10.1.243
 SRC_URI=https://developer.download.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.243_418.87.00_linux.run -> cuda_10.1.243_418.87.00_linux.run
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=34d6fa051f0ffad67cd887d3d3809629
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-10.2.89 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-10.2.89
index 6f1a3fa56dd2..f3464c2bbef2 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-10.2.89
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-10.2.89
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/nvidia-cuda-toolkit-10.2.89 media-libs/freeglut examples? ( me
 RESTRICT=test
 SLOT=0/10.2.89
 SRC_URI=https://developer.download.nvidia.com/compute/cuda/10.2/Prod/local_installers/cuda_10.2.89_440.33.01_linux.run
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=6c7f1c85f8b244db12119e10a212614f
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-6.5.19 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-6.5.19
index 768ca5d06f8f..167f4fcd15e0 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-6.5.19
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-6.5.19
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/nvidia-cuda-toolkit-6.5.19 media-libs/freeglut examples? ( med
 RESTRICT=test
 SLOT=0
 SRC_URI=amd64? ( http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_64.run ) x86? ( http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_32.run )
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=fc7295952ea8ba925d85ff40cb406931
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-7.5.18 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-7.5.18
index 42c82b0642c8..481040f545a1 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-7.5.18
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-7.5.18
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/nvidia-cuda-toolkit-7.5.18 media-libs/freeglut examples? ( med
 RESTRICT=test
 SLOT=0
 SRC_URI=http://developer.download.nvidia.com/compute/cuda/7.5/Prod/local_installers/cuda_7.5.18_linux.run
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=233b873990951382de1ad4c91f676b5a
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.44-r1 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.44-r1
index 4a5b3438688c..6a2a89d29be7 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.44-r1
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.44-r1
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/nvidia-cuda-toolkit-8.0.44 media-libs/freeglut examples? ( med
 RESTRICT=test
 SLOT=0
 SRC_URI=https://developer.nvidia.com/compute/cuda/8.0/prod/local_installers/cuda_8.0.44_linux-run -> cuda_8.0.44_linux.run
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=dd5ff1d1a3f46ecf7d2500f4957064ea
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.61 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.61
index fb69b5a6eb66..9111be174d37 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.61
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.61
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/nvidia-cuda-toolkit-8.0.61 media-libs/freeglut examples? ( med
 RESTRICT=test
 SLOT=0
 SRC_URI=https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run -> cuda_8.0.61_375.26_linux.run
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=83ec1bd3dd5c1985da3918ce52fc0dc2
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.0.176 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.0.176
index f0da189db71e..17e0d5d83972 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.0.176
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.0.176
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/nvidia-cuda-toolkit-9.0.176 media-libs/freeglut examples? ( me
 RESTRICT=test
 SLOT=0
 SRC_URI=https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run -> cuda_9.0.176_384.81_linux.run
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=cc9764c2a8eb75964c44f059cfa00ec2
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.1.85 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.1.85
index f55b1099c90e..75a169a8f8ff 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.1.85
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.1.85
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/nvidia-cuda-toolkit-9.1.85 media-libs/freeglut examples? ( med
 RESTRICT=test
 SLOT=0
 SRC_URI=https://developer.nvidia.com/compute/cuda/9.1/Prod2/local_installers/cuda_9.1.85_387.26_linux -> cuda_9.1.85_387.26_linux.run
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=f36aad04c20ab126f5f630e8801499b9
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.2.88 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.2.88
index 8c9a0f481ea8..1aed7b1d0680 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.2.88
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.2.88
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/nvidia-cuda-toolkit-9.2.88 media-libs/freeglut examples? ( med
 RESTRICT=test
 SLOT=0
 SRC_URI=https://developer.nvidia.com/compute/cuda/9.2/Prod/local_installers/cuda_9.2.88_396.26_linux -> cuda_9.2.88_396.26_linux.run
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6ebf1ad155c983ccabb011b7cd850295
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.0.130 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.0.130
index 0058bf43984f..e2815e81e6f4 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.0.130
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.0.130
@@ -9,5 +9,5 @@ RDEPEND=<sys-devel/gcc-8[cxx] >=x11-drivers/nvidia-drivers-396.24[X,uvm] debugge
 RESTRICT=bindist mirror
 SLOT=0/10.0.130
 SRC_URI=https://developer.nvidia.com/compute/cuda/10.0/Prod/local_installers/cuda_10.0.130_410.48_linux -> cuda_10.0.130_410.48_linux.run
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ad7562a6c13b595d2efb15ca3e383c75
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=42b134436f05cd04acdcb6bd3bf9877e
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.105-r2 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.105-r2
deleted file mode 100644
index c1ba1d750d01..000000000000
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.105-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare pretend setup unpack
-DESCRIPTION=NVIDIA CUDA Toolkit (compiler and friends)
-EAPI=7
-HOMEPAGE=https://developer.nvidia.com/cuda-zone
-IUSE=debugger doc eclipse profiler
-KEYWORDS=-* ~amd64 ~amd64-linux
-LICENSE=NVIDIA-CUDA
-RDEPEND=<sys-devel/gcc-9[cxx] >=x11-drivers/nvidia-drivers-396.24[X,uvm] debugger? ( sys-libs/libtermcap-compat sys-libs/ncurses-compat:5[tinfo] ) eclipse? ( >=virtual/jre-1.6 ) profiler? ( >=virtual/jre-1.6 )
-RESTRICT=bindist mirror
-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
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34
-_md5_=8adc372f5dd7c38812405576d7bb71cf
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.105-r3 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.105-r3
new file mode 100644
index 000000000000..054c8d40f3a1
--- /dev/null
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.105-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare pretend setup unpack
+DESCRIPTION=NVIDIA CUDA Toolkit (compiler and friends)
+EAPI=7
+HOMEPAGE=https://developer.nvidia.com/cuda-zone
+IUSE=debugger doc eclipse profiler
+KEYWORDS=-* ~amd64 ~amd64-linux
+LICENSE=NVIDIA-CUDA
+RDEPEND=<sys-devel/gcc-9[cxx] >=x11-drivers/nvidia-drivers-396.24[X,uvm] debugger? ( sys-libs/libtermcap-compat sys-libs/ncurses-compat:5[tinfo] ) eclipse? ( >=virtual/jre-1.6 ) profiler? ( >=virtual/jre-1.6 )
+RESTRICT=bindist mirror
+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
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_md5_=9d7d1b29b83afa941d7389762c7a4f0f
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.168-r1 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.168-r1
deleted file mode 100644
index bd904bcc7cf0..000000000000
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.168-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare pretend setup unpack
-DESCRIPTION=NVIDIA CUDA Toolkit (compiler and friends)
-EAPI=7
-HOMEPAGE=https://developer.nvidia.com/cuda-zone
-IUSE=debugger doc eclipse profiler
-KEYWORDS=-* ~amd64 ~amd64-linux
-LICENSE=NVIDIA-CUDA
-RDEPEND=<sys-devel/gcc-9[cxx] >=x11-drivers/nvidia-drivers-396.24[X,uvm] debugger? ( sys-libs/libtermcap-compat sys-libs/ncurses-compat:5[tinfo] ) eclipse? ( >=virtual/jre-1.6 ) profiler? ( >=virtual/jre-1.6 )
-RESTRICT=bindist mirror
-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
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34
-_md5_=5bfbb6abac3e0d864a4ea860c9d04bf3
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.168-r2 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.168-r2
new file mode 100644
index 000000000000..b3245804eb5a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.168-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare pretend setup unpack
+DESCRIPTION=NVIDIA CUDA Toolkit (compiler and friends)
+EAPI=7
+HOMEPAGE=https://developer.nvidia.com/cuda-zone
+IUSE=debugger doc eclipse profiler
+KEYWORDS=-* ~amd64 ~amd64-linux
+LICENSE=NVIDIA-CUDA
+RDEPEND=<sys-devel/gcc-9[cxx] >=x11-drivers/nvidia-drivers-396.24[X,uvm] debugger? ( sys-libs/libtermcap-compat sys-libs/ncurses-compat:5[tinfo] ) eclipse? ( >=virtual/jre-1.6 ) profiler? ( >=virtual/jre-1.6 )
+RESTRICT=bindist mirror
+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
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_md5_=3b1781369a86a21d56c9e080844c1ad9
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.243-r2 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.243-r2
deleted file mode 100644
index f976d026df9b..000000000000
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.243-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare pretend setup unpack
-DESCRIPTION=NVIDIA CUDA Toolkit (compiler and friends)
-EAPI=7
-HOMEPAGE=https://developer.nvidia.com/cuda-zone
-IUSE=debugger doc eclipse profiler
-KEYWORDS=-* ~amd64 ~amd64-linux
-LICENSE=NVIDIA-CUDA
-RDEPEND=<sys-devel/gcc-9[cxx] !prefix? ( >=x11-drivers/nvidia-drivers-418.87.00[X,uvm] ) debugger? ( dev-libs/openssl-compat:1.0.0 sys-libs/libtermcap-compat sys-libs/ncurses-compat:5[tinfo] ) eclipse? ( dev-libs/openssl-compat:1.0.0 >=virtual/jre-1.6 ) profiler? ( dev-libs/openssl-compat:1.0.0 >=virtual/jre-1.6 )
-RESTRICT=bindist mirror
-SLOT=0/10.1.243
-SRC_URI=https://developer.download.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.243_418.87.00_linux.run
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34
-_md5_=5caff197de87c58c26181dfe1543e376
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.243-r3 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.243-r3
new file mode 100644
index 000000000000..9889cce7fb18
--- /dev/null
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.243-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare pretend setup unpack
+DESCRIPTION=NVIDIA CUDA Toolkit (compiler and friends)
+EAPI=7
+HOMEPAGE=https://developer.nvidia.com/cuda-zone
+IUSE=debugger doc eclipse profiler
+KEYWORDS=-* ~amd64 ~amd64-linux
+LICENSE=NVIDIA-CUDA
+RDEPEND=<sys-devel/gcc-9[cxx] !prefix? ( >=x11-drivers/nvidia-drivers-418.87.00[X,uvm] ) debugger? ( dev-libs/openssl-compat:1.0.0 sys-libs/libtermcap-compat sys-libs/ncurses-compat:5[tinfo] ) eclipse? ( dev-libs/openssl-compat:1.0.0 >=virtual/jre-1.6 ) profiler? ( dev-libs/openssl-compat:1.0.0 >=virtual/jre-1.6 )
+RESTRICT=bindist mirror
+SLOT=0/10.1.243
+SRC_URI=https://developer.download.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.243_418.87.00_linux.run
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_md5_=6bfbbe6e43c5cdf6ea3b3bb36b6b8b5c
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.2.89-r1 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.2.89-r1
deleted file mode 100644
index 530c8ec6d71e..000000000000
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.2.89-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare pretend setup unpack
-DESCRIPTION=NVIDIA CUDA Toolkit (compiler and friends)
-EAPI=7
-HOMEPAGE=https://developer.nvidia.com/cuda-zone
-IUSE=debugger doc eclipse profiler
-KEYWORDS=-* ~amd64 ~amd64-linux
-LICENSE=NVIDIA-CUDA
-RDEPEND=<sys-devel/gcc-9[cxx] >=x11-drivers/nvidia-drivers-440.33.01[X,uvm] debugger? ( dev-libs/openssl-compat:1.0.0 sys-libs/libtermcap-compat sys-libs/ncurses-compat:5[tinfo] ) eclipse? ( dev-libs/openssl-compat:1.0.0 >=virtual/jre-1.6 ) profiler? ( dev-libs/openssl-compat:1.0.0 >=virtual/jre-1.6 )
-RESTRICT=bindist mirror
-SLOT=0/10.2.89
-SRC_URI=https://developer.download.nvidia.com/compute/cuda/10.2/Prod/local_installers/cuda_10.2.89_440.33.01_linux.run
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34
-_md5_=9c429bc04e76b9efdce5ffbaff5042ee
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.2.89-r2 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.2.89-r2
new file mode 100644
index 000000000000..5526880b1530
--- /dev/null
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.2.89-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare pretend setup unpack
+DESCRIPTION=NVIDIA CUDA Toolkit (compiler and friends)
+EAPI=7
+HOMEPAGE=https://developer.nvidia.com/cuda-zone
+IUSE=debugger doc eclipse profiler
+KEYWORDS=-* ~amd64 ~amd64-linux
+LICENSE=NVIDIA-CUDA
+RDEPEND=<sys-devel/gcc-9[cxx] >=x11-drivers/nvidia-drivers-440.33.01[X,uvm] debugger? ( dev-libs/openssl-compat:1.0.0 sys-libs/libtermcap-compat sys-libs/ncurses-compat:5[tinfo] ) eclipse? ( dev-libs/openssl-compat:1.0.0 >=virtual/jre-1.6 ) profiler? ( dev-libs/openssl-compat:1.0.0 >=virtual/jre-1.6 )
+RESTRICT=bindist mirror
+SLOT=0/10.2.89
+SRC_URI=https://developer.download.nvidia.com/compute/cuda/10.2/Prod/local_installers/cuda_10.2.89_440.33.01_linux.run
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_md5_=2bf772f6794775f7e1264a3be9ea46c5
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.14 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.14
index bce0d0cd5e1d..6386bee2a17f 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.14
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.14
@@ -9,5 +9,5 @@ RDEPEND=<sys-devel/gcc-4.9[cxx] debugger? ( sys-libs/libtermcap-compat sys-libs/
 RESTRICT=bindist mirror
 SLOT=0/6.5.14
 SRC_URI=amd64? ( http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.14_linux_64.run ) x86? ( http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.14_linux_32.run )
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c28fce9dfadeba84e9642e11f23865a6
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=e7dfad5180ccabedca16b4a134c4fae0
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.19-r1 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.19-r1
index 057c64006cbf..fdf726858af8 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.19-r1
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.19-r1
@@ -9,5 +9,5 @@ RDEPEND=<sys-devel/gcc-4.9[cxx] debugger? ( sys-libs/libtermcap-compat sys-libs/
 RESTRICT=bindist mirror
 SLOT=0/6.5.19
 SRC_URI=amd64? ( http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_64.run ) x86? ( http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_32.run )
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6f9ba28df3bddac5148bbf011a5d809b
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=40f654b1154d63be6cb4645aa204e621
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-7.5.18-r2 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-7.5.18-r2
index 1364fe64841c..5a119f36a884 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-7.5.18-r2
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-7.5.18-r2
@@ -9,5 +9,5 @@ RDEPEND=>=sys-devel/gcc-4.7[cxx] <sys-devel/gcc-5[cxx] >=x11-drivers/nvidia-driv
 RESTRICT=bindist mirror
 SLOT=0/7.5.18
 SRC_URI=http://developer.download.nvidia.com/compute/cuda/7.5/Prod/local_installers/cuda_7.5.18_linux.run
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=da7a399dbc5c6a80a66ed4cfc6fd491c
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=cc4e4252747a1724825848ae4c7b0c2b
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-8.0.44 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-8.0.44
index 57377f4382a0..d25f4a6706b5 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-8.0.44
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-8.0.44
@@ -9,5 +9,5 @@ RDEPEND=>=sys-devel/gcc-4.7[cxx] <sys-devel/gcc-6[cxx] >=x11-drivers/nvidia-driv
 RESTRICT=bindist mirror
 SLOT=0/8.0.44
 SRC_URI=https://developer.nvidia.com/compute/cuda/8.0/prod/local_installers/cuda_8.0.44_linux-run -> cuda_8.0.44_linux.run
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b6bd841a2c087f4a6e54bdd7911ee0c1
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=30728caafd0f84b23f24b7234df21715
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-8.0.61 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-8.0.61
index 9c0cde0b436f..be4d911a272f 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-8.0.61
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-8.0.61
@@ -9,5 +9,5 @@ RDEPEND=>=sys-devel/gcc-4.7[cxx] <sys-devel/gcc-6[cxx] >=x11-drivers/nvidia-driv
 RESTRICT=bindist mirror
 SLOT=0/8.0.61
 SRC_URI=https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run -> cuda_8.0.61_375.26_linux.run
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=00a9f37ff1802d1d6854b5e244e22856
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=97f404e14e40c9e16b7c24e0b73b92ae
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.0.176 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.0.176
index 6791989cf15c..54d0d3f9afb9 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.0.176
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.0.176
@@ -9,5 +9,5 @@ RDEPEND=>=sys-devel/gcc-4.7[cxx] <sys-devel/gcc-7[cxx] >=x11-drivers/nvidia-driv
 RESTRICT=bindist mirror
 SLOT=0/9.0.176
 SRC_URI=https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run -> cuda_9.0.176_384.81_linux.run
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=d84eaf90fa6b83e980784280f1b1026c
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=70195d0099a5bc2521b2d6c11a9e813f
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.1.85 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.1.85
index 11538dc26aad..edfac6fcd0bb 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.1.85
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.1.85
@@ -9,5 +9,5 @@ RDEPEND=<sys-devel/gcc-7[cxx] >=x11-drivers/nvidia-drivers-387.26[X,uvm] debugge
 RESTRICT=bindist mirror
 SLOT=0/9.1.85
 SRC_URI=https://developer.nvidia.com/compute/cuda/9.1/Prod/local_installers/cuda_9.1.85_387.26_linux -> cuda_9.1.85_387.26_linux.run
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f15e09d8933ab4c703f480c9c7b3f83b
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=9161726697fe84622fa1e4de966a89c2
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.2.88 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.2.88
index 562c31a44f7d..005afae241cc 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.2.88
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.2.88
@@ -9,5 +9,5 @@ RDEPEND=<sys-devel/gcc-8[cxx] >=x11-drivers/nvidia-drivers-396.24[X,uvm] debugge
 RESTRICT=bindist mirror
 SLOT=0/9.2.88
 SRC_URI=https://developer.nvidia.com/compute/cuda/9.2/Prod/local_installers/cuda_9.2.88_396.26_linux -> cuda_9.2.88_396.26_linux.run
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=cdf54bbe75a9bada3f35ab5ac104f1f5
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=e309cf23f78f657b23dc55ad1085fe9c
diff --git a/metadata/md5-cache/dev-util/objconv-2.51 b/metadata/md5-cache/dev-util/objconv-2.51
index e55ad3e2a2d2..215f9111aefb 100644
--- a/metadata/md5-cache/dev-util/objconv-2.51
+++ b/metadata/md5-cache/dev-util/objconv-2.51
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/objconv-2.51.zip
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=c5ee6f6bb8ad18ec12853b62635d8f79
diff --git a/metadata/md5-cache/dev-util/oprofile-1.3.0 b/metadata/md5-cache/dev-util/oprofile-1.3.0
index 15d6fa96c282..e76614001529 100644
--- a/metadata/md5-cache/dev-util/oprofile-1.3.0
+++ b/metadata/md5-cache/dev-util/oprofile-1.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=>=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 ) >=sys-kernel/linux-headers-2.6.31 java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=>=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 ) >=sys-kernel/linux-headers-2.6.31 >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 )
 DESCRIPTION=A transparent low-overhead system-wide profiler
 EAPI=6
 HOMEPAGE=http://oprofile.sourceforge.net
@@ -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	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b3f43fc349902755c226f76501953945
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=78e7e524f790fb254d8af65149a749c3
diff --git a/metadata/md5-cache/dev-util/ostree-2018.9 b/metadata/md5-cache/dev-util/ostree-2018.9
index e444e6b6e1b9..d9600877b0fa 100644
--- a/metadata/md5-cache/dev-util/ostree-2018.9
+++ b/metadata/md5-cache/dev-util/ostree-2018.9
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure prepare
-DEPEND=app-arch/xz-utils:= app-crypt/gpgme:= dev-libs/glib:2= dev-libs/libassuan:= dev-libs/libgpg-error:= dev-libs/openssl:0= sys-apps/util-linux:= sys-fs/fuse:= sys-libs/zlib:= archive? ( app-arch/libarchive:= ) grub? ( sys-boot/grub:* ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) libmount? ( sys-apps/util-linux:= ) selinux? ( sys-libs/libselinux:= ) soup? ( net-libs/libsoup:= ) systemd? ( sys-apps/systemd:= ) zeroconf? ( net-dns/avahi:* ) app-text/docbook-xsl-stylesheets sys-devel/bison dev-libs/libxslt || ( dev-util/glib-utils dev-libs/glib:2 ) sys-devel/bison sys-devel/flex virtual/pkgconfig curl? ( net-misc/curl:= ) introspection? ( dev-libs/gobject-introspection ) doc? ( dev-util/gtk-doc )
+DEPEND=app-arch/xz-utils:= app-crypt/gpgme:= dev-libs/glib:2= dev-libs/libassuan:= dev-libs/libgpg-error:= dev-libs/openssl:0= sys-apps/util-linux:= sys-fs/fuse:0= sys-libs/zlib:= archive? ( app-arch/libarchive:= ) grub? ( sys-boot/grub:* ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) libmount? ( sys-apps/util-linux:= ) selinux? ( sys-libs/libselinux:= ) soup? ( net-libs/libsoup:= ) systemd? ( sys-apps/systemd:= ) zeroconf? ( net-dns/avahi:* ) app-text/docbook-xsl-stylesheets sys-devel/bison dev-libs/libxslt || ( dev-util/glib-utils dev-libs/glib:2 ) sys-devel/bison sys-devel/flex virtual/pkgconfig curl? ( net-misc/curl:= ) introspection? ( dev-libs/gobject-introspection ) doc? ( dev-util/gtk-doc )
 DESCRIPTION=Operating system and container binary deployment and upgrades
 EAPI=6
 HOMEPAGE=https://ostree.readthedocs.io/en/latest/
 IUSE=archive curl doc gnutls grub introspection libmount selinux ssl soup systemd zeroconf
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=app-arch/xz-utils:= app-crypt/gpgme:= dev-libs/glib:2= dev-libs/libassuan:= dev-libs/libgpg-error:= dev-libs/openssl:0= sys-apps/util-linux:= sys-fs/fuse:= sys-libs/zlib:= archive? ( app-arch/libarchive:= ) grub? ( sys-boot/grub:* ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) libmount? ( sys-apps/util-linux:= ) selinux? ( sys-libs/libselinux:= ) soup? ( net-libs/libsoup:= ) systemd? ( sys-apps/systemd:= ) zeroconf? ( net-dns/avahi:* )
+RDEPEND=app-arch/xz-utils:= app-crypt/gpgme:= dev-libs/glib:2= dev-libs/libassuan:= dev-libs/libgpg-error:= dev-libs/openssl:0= sys-apps/util-linux:= sys-fs/fuse:0= sys-libs/zlib:= archive? ( app-arch/libarchive:= ) grub? ( sys-boot/grub:* ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) libmount? ( sys-apps/util-linux:= ) selinux? ( sys-libs/libselinux:= ) soup? ( net-libs/libsoup:= ) systemd? ( sys-apps/systemd:= ) zeroconf? ( net-dns/avahi:* )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ostreedev/ostree/releases/download/v2018.9/libostree-2018.9.tar.xz -> ostree-2018.9.tar.xz
-_md5_=8d5e9b6d699108548528bdded669c608
+_md5_=a53ee93833e45f02e0c1d6ebc73797a9
diff --git a/metadata/md5-cache/dev-util/ostree-2019.5 b/metadata/md5-cache/dev-util/ostree-2019.5
index 23685c6c31ec..6e6e2f4e22f0 100644
--- a/metadata/md5-cache/dev-util/ostree-2019.5
+++ b/metadata/md5-cache/dev-util/ostree-2019.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/glib-utils sys-devel/flex sys-devel/bison 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 prepare
-DEPEND=archive? ( app-arch/libarchive ) app-crypt/gpgme app-arch/xz-utils curl? ( net-misc/curl ) soup? ( net-libs/libsoup ) dev-libs/libassuan dev-libs/libgpg-error dev-libs/glib:2 dracut? ( sys-kernel/dracut ) grub? ( sys-boot/grub:2= ) introspection? ( dev-libs/gobject-introspection ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) ) >=sys-fs/fuse-2.9.2:* sys-libs/zlib libmount? ( sys-apps/util-linux ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt doc? ( dev-util/gtk-doc )
+DEPEND=archive? ( app-arch/libarchive ) app-crypt/gpgme app-arch/xz-utils curl? ( net-misc/curl ) soup? ( net-libs/libsoup ) dev-libs/libassuan dev-libs/libgpg-error dev-libs/glib:2 dracut? ( sys-kernel/dracut ) grub? ( sys-boot/grub:2= ) introspection? ( dev-libs/gobject-introspection ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) ) >=sys-fs/fuse-2.9.2:0 sys-libs/zlib libmount? ( sys-apps/util-linux ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt doc? ( dev-util/gtk-doc )
 DESCRIPTION=Operating system and container binary deployment and upgrades
 EAPI=7
 HOMEPAGE=https://ostree.readthedocs.io/en/latest/
 IUSE=archive curl doc dracut gnutls grub http2 httpd introspection libmount selinux ssl soup systemd zeroconf
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=archive? ( app-arch/libarchive ) app-crypt/gpgme app-arch/xz-utils curl? ( net-misc/curl ) soup? ( net-libs/libsoup ) dev-libs/libassuan dev-libs/libgpg-error dev-libs/glib:2 dracut? ( sys-kernel/dracut ) grub? ( sys-boot/grub:2= ) introspection? ( dev-libs/gobject-introspection ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) ) >=sys-fs/fuse-2.9.2:* sys-libs/zlib libmount? ( sys-apps/util-linux ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] )
+RDEPEND=archive? ( app-arch/libarchive ) app-crypt/gpgme app-arch/xz-utils curl? ( net-misc/curl ) soup? ( net-libs/libsoup ) dev-libs/libassuan dev-libs/libgpg-error dev-libs/glib:2 dracut? ( sys-kernel/dracut ) grub? ( sys-boot/grub:2= ) introspection? ( dev-libs/gobject-introspection ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) ) >=sys-fs/fuse-2.9.2:0 sys-libs/zlib libmount? ( sys-apps/util-linux ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] )
 REQUIRED_USE=httpd? ( || ( curl soup ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ostreedev/ostree/releases/download/v2019.5/libostree-2019.5.tar.xz -> ostree-2019.5.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=00d78ee1f335eb967f6bc81f4a23e18d
+_md5_=803a595b7bbd681f735e595b1182f943
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 f8eb7a5704d4..83bf19ad84b2 100644
--- a/metadata/md5-cache/dev-util/perf-4.14.33-r1
+++ b/metadata/md5-cache/dev-util/perf-4.14.33-r1
@@ -10,5 +10,5 @@ RDEPEND=audit? ( sys-process/audit ) demangle? ( sys-libs/binutils-libs:= ) gtk?
 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	e5f9c3faab3ab3d1e7e007daa8c736ef	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f8c623a1b326115489a21f22139f1059
diff --git a/metadata/md5-cache/dev-util/perf-4.20.3 b/metadata/md5-cache/dev-util/perf-4.20.3
index 4cc33b272643..43fae9b45577 100644
--- a/metadata/md5-cache/dev-util/perf-4.20.3
+++ b/metadata/md5-cache/dev-util/perf-4.20.3
@@ -10,5 +10,5 @@ RDEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( sys
 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	e5f9c3faab3ab3d1e7e007daa8c736ef	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=64a7cec99bcadeae842e157a748982f2
diff --git a/metadata/md5-cache/dev-util/perf-5.4.20 b/metadata/md5-cache/dev-util/perf-5.4.20
index 960e89be6bd1..2d0db9aa4849 100644
--- a/metadata/md5-cache/dev-util/perf-5.4.20
+++ b/metadata/md5-cache/dev-util/perf-5.4.20
@@ -10,5 +10,5 @@ RDEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( sys
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.20.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=587204e32393869dfb1a7d332b0eefbc
diff --git a/metadata/md5-cache/dev-util/perf-5.6.14 b/metadata/md5-cache/dev-util/perf-5.6.14
index ad81ea92b31e..794db4d7794e 100644
--- a/metadata/md5-cache/dev-util/perf-5.6.14
+++ b/metadata/md5-cache/dev-util/perf-5.6.14
@@ -10,5 +10,5 @@ RDEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( <sy
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.6.14.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f23782fe7ab15a1fa3ffb910c5d89b14
diff --git a/metadata/md5-cache/dev-util/perf-5.7 b/metadata/md5-cache/dev-util/perf-5.7
index 0d2604dcb42d..344ccd4d8f0d 100644
--- a/metadata/md5-cache/dev-util/perf-5.7
+++ b/metadata/md5-cache/dev-util/perf-5.7
@@ -10,5 +10,5 @@ RDEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( <sy
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f23782fe7ab15a1fa3ffb910c5d89b14
diff --git a/metadata/md5-cache/dev-util/perf-5.7-r1 b/metadata/md5-cache/dev-util/perf-5.7-r1
index 1c54edfc1938..8c88d20339ff 100644
--- a/metadata/md5-cache/dev-util/perf-5.7-r1
+++ b/metadata/md5-cache/dev-util/perf-5.7-r1
@@ -10,5 +10,5 @@ RDEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( <sy
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0ea938a46fdb8647785dc8dd7f3eefeb
diff --git a/metadata/md5-cache/dev-util/ply-2.1.1 b/metadata/md5-cache/dev-util/ply-2.1.1
index 7d07cf7fa969..fc8fe4c4b865 100644
--- a/metadata/md5-cache/dev-util/ply-2.1.1
+++ b/metadata/md5-cache/dev-util/ply-2.1.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/iovisor/ply/archive/2.1.1.tar.gz -> ply-2.1.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=90df5b0632218c9e24e3eb56072970e2
diff --git a/metadata/md5-cache/dev-util/rebar-2.6.4-r1 b/metadata/md5-cache/dev-util/rebar-2.6.4-r1
index a4f6a286cd56..981ffe55ab68 100644
--- a/metadata/md5-cache/dev-util/rebar-2.6.4-r1
+++ b/metadata/md5-cache/dev-util/rebar-2.6.4-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/erlang:=
 DESCRIPTION=A sophisticated build-tool for Erlang projects that follows OTP principles
 EAPI=7
 HOMEPAGE=https://github.com/rebar/rebar
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-lang/erlang:=
 SLOT=0
 SRC_URI=https://github.com/rebar/rebar/archive/2.6.4.tar.gz -> rebar-2.6.4.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=00d4b39a5abdd8f1881916a5e4f9f655
+_md5_=c7f3975dce8a7548f3073542be1180b9
diff --git a/metadata/md5-cache/dev-util/rr-5.3.0-r1 b/metadata/md5-cache/dev-util/rr-5.3.0-r1
index 8b30c7944c43..8edf9a2ad01f 100644
--- a/metadata/md5-cache/dev-util/rr-5.3.0-r1
+++ b/metadata/md5-cache/dev-util/rr-5.3.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 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	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=faa16ec433c6b19ed9a4cc32dfdf6511
diff --git a/metadata/md5-cache/dev-util/rt-tests-1.8 b/metadata/md5-cache/dev-util/rt-tests-1.8
index cc03182070e7..8936e35e9cc7 100644
--- a/metadata/md5-cache/dev-util/rt-tests-1.8
+++ b/metadata/md5-cache/dev-util/rt-tests-1.8
@@ -1,4 +1,4 @@
-DEFINED_PHASES=install prepare setup
+DEFINED_PHASES=compile 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] ) sys-process/numactl
 DESCRIPTION=A collection of latency testing tools for the linux(-rt) kernel
 EAPI=7
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 SLOT=0
 SRC_URI=https://kernel.org/pub/linux/utils/rt-tests/rt-tests-1.8.tar.xz https://kernel.org/pub/linux/utils/rt-tests/older/rt-tests-1.8.tar.xz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bdd5035813311f5aeaf7557a191ff66b
+_md5_=1ab9d4caf6a1cb681f148e61805081e0
diff --git a/metadata/md5-cache/dev-util/shellcheck-0.7.0 b/metadata/md5-cache/dev-util/shellcheck-0.7.0
deleted file mode 100644
index a3af7956133a..000000000000
--- a/metadata/md5-cache/dev-util/shellcheck-0.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/diff-0.2.0:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] >=dev-haskell/parsec-3.0:=[profile?] >=dev-haskell/quickcheck-2.7.4:2=[template-haskell,profile?] dev-haskell/regex-tdfa:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 <dev-haskell/cabal-2.5 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Shell script analysis tool
-EAPI=7
-HOMEPAGE=https://www.shellcheck.net/
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/diff-0.2.0:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] >=dev-haskell/parsec-3.0:=[profile?] >=dev-haskell/quickcheck-2.7.4:2=[template-haskell,profile?] dev-haskell/regex-tdfa:=[profile?] >=dev-lang/ghc-8.0.1:=
-RESTRICT=!test? ( test )
-SLOT=0/0.7.0
-SRC_URI=https://hackage.haskell.org/package/ShellCheck-0.7.0/ShellCheck-0.7.0.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c26a21e617641c9a0c3b2128bb527712
diff --git a/metadata/md5-cache/dev-util/shelltestrunner-1.3.5-r1 b/metadata/md5-cache/dev-util/shelltestrunner-1.3.5-r1
deleted file mode 100644
index 1437db94e49e..000000000000
--- a/metadata/md5-cache/dev-util/shelltestrunner-1.3.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/cmdargs-0.7:= <dev-haskell/cmdargs-0.11:= >=dev-haskell/diff-0.2.0:= <dev-haskell/diff-0.4:= >=dev-haskell/filemanip-0.3:= <dev-haskell/filemanip-0.4:= dev-haskell/hunit:= <dev-haskell/parsec-3.2:= >=dev-haskell/pretty-show-1.6.5:= >=dev-haskell/regex-tdfa-1.1:= <dev-haskell/regex-tdfa-1.3:= dev-haskell/safe:= >=dev-haskell/test-framework-0.3.2:= <dev-haskell/test-framework-0.9:= >=dev-haskell/test-framework-hunit-0.2:= <dev-haskell/test-framework-hunit-0.4:= >=dev-haskell/utf8-string-0.3.5:= <dev-haskell/utf8-string-1.1:= >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6
-DESCRIPTION=A tool for testing command-line programs
-EAPI=5
-HOMEPAGE=http://joyful.com/shelltestrunner
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-haskell/cmdargs-0.7:= <dev-haskell/cmdargs-0.11:= >=dev-haskell/diff-0.2.0:= <dev-haskell/diff-0.4:= >=dev-haskell/filemanip-0.3:= <dev-haskell/filemanip-0.4:= dev-haskell/hunit:= <dev-haskell/parsec-3.2:= >=dev-haskell/pretty-show-1.6.5:= >=dev-haskell/regex-tdfa-1.1:= <dev-haskell/regex-tdfa-1.3:= dev-haskell/safe:= >=dev-haskell/test-framework-0.3.2:= <dev-haskell/test-framework-0.9:= >=dev-haskell/test-framework-hunit-0.2:= <dev-haskell/test-framework-hunit-0.4:= >=dev-haskell/utf8-string-0.3.5:= <dev-haskell/utf8-string-1.1:= >=dev-lang/ghc-7.4.1:=
-SLOT=0
-SRC_URI=https://hackage.haskell.org/package/shelltestrunner-1.3.5/shelltestrunner-1.3.5.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=28e45603d2eb0673ba411f08a752426a
diff --git a/metadata/md5-cache/dev-util/source-highlight-3.1.9 b/metadata/md5-cache/dev-util/source-highlight-3.1.9
index 27510ed0cf75..e125dda7da0f 100644
--- a/metadata/md5-cache/dev-util/source-highlight-3.1.9
+++ b/metadata/md5-cache/dev-util/source-highlight-3.1.9
@@ -4,10 +4,10 @@ DESCRIPTION=Generate highlighted source code as an (x)html document
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/src-highlite/source-highlight.html
 IUSE=doc static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/boost-1.62.0:=[threads] dev-util/ctags
 SLOT=0
 SRC_URI=mirror://gnu/src-highlite/source-highlight-3.1.9.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c735607403d40c6a526f8ed2b898a0d0
+_md5_=29765fd8d1d9e96ccbc7f192bbd95b91
diff --git a/metadata/md5-cache/dev-util/sysdig-kmod-0.26.6 b/metadata/md5-cache/dev-util/sysdig-kmod-0.26.6
index 25d59c491470..23987197b482 100644
--- a/metadata/md5-cache/dev-util/sysdig-kmod-0.26.6
+++ b/metadata/md5-cache/dev-util/sysdig-kmod-0.26.6
@@ -10,5 +10,5 @@ LICENSE=|| ( MIT GPL-2 )
 RDEPEND=!<=dev-util/sysdig-0.26.4[modules] kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/draios/sysdig/archive/0.26.6.tar.gz -> sysdig-0.26.6.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=61741cb5f2da07566fea735d3cd01476
diff --git a/metadata/md5-cache/dev-util/sysdig-kmod-0.26.7 b/metadata/md5-cache/dev-util/sysdig-kmod-0.26.7
index d42f1a3145fd..814d9870dfe2 100644
--- a/metadata/md5-cache/dev-util/sysdig-kmod-0.26.7
+++ b/metadata/md5-cache/dev-util/sysdig-kmod-0.26.7
@@ -10,5 +10,5 @@ LICENSE=|| ( MIT GPL-2 )
 RDEPEND=!<=dev-util/sysdig-0.26.4[modules] kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/draios/sysdig/archive/0.26.7.tar.gz -> sysdig-0.26.7.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=61741cb5f2da07566fea735d3cd01476
diff --git a/metadata/md5-cache/dev-util/systemtap-2.4-r1 b/metadata/md5-cache/dev-util/systemtap-2.4-r1
index 95ad79e459c0..1693b155d1d8 100644
--- a/metadata/md5-cache/dev-util/systemtap-2.4-r1
+++ b/metadata/md5-cache/dev-util/systemtap-2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/elfutils-0.142 sys-libs/libcap python_single_target_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	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=403638150d5a312650cd25b049eb7c2a
diff --git a/metadata/md5-cache/dev-util/systemtap-3.1-r1 b/metadata/md5-cache/dev-util/systemtap-3.1-r1
index 9829423cda38..5ce838913a0c 100644
--- a/metadata/md5-cache/dev-util/systemtap-3.1-r1
+++ b/metadata/md5-cache/dev-util/systemtap-3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/elfutils-0.142 dev-libs/json-c:= dev-libs/nspr dev-libs/nss s
 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	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0edec3d1368b21417cff6f2c5dc2cfe4
diff --git a/metadata/md5-cache/dev-util/systemtap-4.0-r1 b/metadata/md5-cache/dev-util/systemtap-4.0-r1
index 0deee07db850..b85679f41bcd 100644
--- a/metadata/md5-cache/dev-util/systemtap-4.0-r1
+++ b/metadata/md5-cache/dev-util/systemtap-4.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/elfutils-0.142 dev-libs/json-c:= sys-libs/ncurses:0= sys-libs
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://www.sourceware.org/systemtap/ftp/releases/systemtap-4.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=d84394a6cba4211c07b0c3dad96cebb8
diff --git a/metadata/md5-cache/dev-util/trace-cmd-2.8.3 b/metadata/md5-cache/dev-util/trace-cmd-2.8.3
index 3fa20a9c463c..14f9626780ea 100644
--- a/metadata/md5-cache/dev-util/trace-cmd-2.8.3
+++ b/metadata/md5-cache/dev-util/trace-cmd-2.8.3
@@ -10,5 +10,5 @@ RDEPEND=audit? ( sys-process/audit ) python? ( python_targets_python3_6? ( dev-l
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0/2.8.3
 SRC_URI=https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v2.8.3.tar.gz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e67bda9e287c7b86ad963a07e2d44cca
diff --git a/metadata/md5-cache/dev-util/trace-cmd-9999 b/metadata/md5-cache/dev-util/trace-cmd-9999
index 546d9589f241..5d1d115912ba 100644
--- a/metadata/md5-cache/dev-util/trace-cmd-9999
+++ b/metadata/md5-cache/dev-util/trace-cmd-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=audit? ( sys-process/audit ) 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(-)] ) udis86? ( dev-libs/udis86 )
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0/9999
-_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=24bfbca9aef0214b67c6c31216a7912e
diff --git a/metadata/md5-cache/dev-util/tup-0.7.8 b/metadata/md5-cache/dev-util/tup-0.7.8
index 4dfa846567c6..1063048c99ed 100644
--- a/metadata/md5-cache/dev-util/tup-0.7.8
+++ b/metadata/md5-cache/dev-util/tup-0.7.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2 MIT public-domain BSD BSD-2
 RDEPEND=dev-db/sqlite:= dev-libs/libpcre:= sys-fs/fuse:=
 SLOT=0
 SRC_URI=https://github.com/gittup/tup/archive/v0.7.8.tar.gz -> tup-0.7.8.tar.gz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0b06a520620e39a95966f318fffe5f13
diff --git a/metadata/md5-cache/dev-util/tup-9999 b/metadata/md5-cache/dev-util/tup-9999
index 18219a3a6bb4..0390c58dcd90 100644
--- a/metadata/md5-cache/dev-util/tup-9999
+++ b/metadata/md5-cache/dev-util/tup-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2 MIT public-domain BSD BSD-2
 PROPERTIES=live
 RDEPEND=dev-db/sqlite:= dev-libs/libpcre:= sys-fs/fuse:=
 SLOT=0
-_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=612056ff9358bdb4c37c34a7d3120b74
diff --git a/metadata/md5-cache/dev-util/umockdev-0.12.1 b/metadata/md5-cache/dev-util/umockdev-0.12.1
index 72f3aff58efd..55e14d03faa8 100644
--- a/metadata/md5-cache/dev-util/umockdev-0.12.1
+++ b/metadata/md5-cache/dev-util/umockdev-0.12.1
@@ -4,11 +4,11 @@ DESCRIPTION=Mock hardware devices for creating unit tests
 EAPI=6
 HOMEPAGE=https://github.com/martinpitt/umockdev/
 IUSE=+introspection 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=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=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:= )
 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	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=17d3a6ba04d64f5413d517e35ea353df
+_md5_=49cc11e332643df30c0d0973750c5ecb
diff --git a/metadata/md5-cache/dev-util/valgrind-3.16.1 b/metadata/md5-cache/dev-util/valgrind-3.16.1
new file mode 100644
index 000000000000..30b0e2ff99a3
--- /dev/null
+++ b/metadata/md5-cache/dev-util/valgrind-3.16.1
@@ -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=configure install postinst prepare
+DEPEND=mpi? ( virtual/mpi )
+DESCRIPTION=An open-source memory debugger for GNU/Linux
+EAPI=7
+HOMEPAGE=http://www.valgrind.org
+IUSE=mpi
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=mpi? ( virtual/mpi )
+SLOT=0
+SRC_URI=ftp://sourceware.org/pub/valgrind/valgrind-3.16.1.tar.bz2
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=96474c160c7abf4587e6c3539ec6098a
diff --git a/metadata/md5-cache/dev-util/xdelta-1.1.4-r2 b/metadata/md5-cache/dev-util/xdelta-1.1.4-r2
deleted file mode 100644
index d5dd3fe0b807..000000000000
--- a/metadata/md5-cache/dev-util/xdelta-1.1.4-r2
+++ /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=configure prepare
-DEPEND=>=dev-libs/glib-2 >=sys-libs/zlib-1.1.4:= virtual/pkgconfig
-DESCRIPTION=Computes changes between binary or text files and creates deltas
-EAPI=7
-HOMEPAGE=https://xdelta.googlecode.com/
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2 >=sys-libs/zlib-1.1.4:=
-SLOT=0
-SRC_URI=https://xdelta.googlecode.com/files/xdelta-1.1.4.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d169a878c9c87e5779a5af0e7b548fcb
diff --git a/metadata/md5-cache/dev-util/xdelta-1.1.4-r3 b/metadata/md5-cache/dev-util/xdelta-1.1.4-r3
new file mode 100644
index 000000000000..ea224e3d094a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/xdelta-1.1.4-r3
@@ -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=configure install prepare
+DEPEND=>=dev-libs/glib-2 >=sys-libs/zlib-1.1.4:=
+DESCRIPTION=Computes changes between binary or text files and creates deltas
+EAPI=7
+HOMEPAGE=https://xdelta.googlecode.com/
+KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2 >=sys-libs/zlib-1.1.4:=
+SLOT=0
+SRC_URI=https://xdelta.googlecode.com/files/xdelta-1.1.4.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=83c91c26d0b765d4a10254f7a49c07ec
diff --git a/metadata/md5-cache/dev-util/xfce4-dev-tools-4.15.0 b/metadata/md5-cache/dev-util/xfce4-dev-tools-4.15.0
new file mode 100644
index 000000000000..e712d8b28806
--- /dev/null
+++ b/metadata/md5-cache/dev-util/xfce4-dev-tools-4.15.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=>=dev-libs/glib-2.42 virtual/pkgconfig
+DESCRIPTION=A set of scripts and m4/autoconf macros that ease build system maintenance
+EAPI=7
+HOMEPAGE=https://www.xfce.org/ http://users.xfce.org/~benny/projects/xfce4-dev-tools/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.42
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfce4-dev-tools/4.15/xfce4-dev-tools-4.15.0.tar.bz2
+_md5_=355720e05fea94543d7630fca2936b2e
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 6a55ad65f480..54a89518e108 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/git-annex-6.20170818 b/metadata/md5-cache/dev-vcs/git-annex-6.20170818
deleted file mode 100644
index 1ea26a07907e..000000000000
--- a/metadata/md5-cache/dev-vcs/git-annex-6.20170818
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/aeson:= dev-haskell/async:= dev-haskell/bloomfilter:= dev-haskell/byteable:= dev-haskell/case-insensitive:= dev-haskell/crypto-api:= dev-haskell/cryptonite:= dev-haskell/data-default:= dev-haskell/disk-free-space:= dev-haskell/dlist:= dev-haskell/edit-distance:= dev-haskell/esqueleto:= >=dev-haskell/exceptions-0.6:= >=dev-haskell/feed-0.3.9:= dev-haskell/free:= dev-haskell/hslogger:= dev-haskell/http-client:= >=dev-haskell/http-conduit-2.0:= >=dev-haskell/http-types-0.7:= dev-haskell/ifelse:= dev-haskell/memory:= dev-haskell/monad-control:= dev-haskell/monad-logger:= >=dev-haskell/mtl-2:= dev-haskell/old-locale:= >=dev-haskell/optparse-applicative-0.11.0:= dev-haskell/persistent:= dev-haskell/persistent-sqlite:= dev-haskell/persistent-template:= >=dev-haskell/quickcheck-2.1:2= dev-haskell/random:= dev-haskell/regex-tdfa:= dev-haskell/resourcet:= dev-haskell/safesemaphore:= dev-haskell/sandi:= dev-haskell/securemem:= dev-haskell/socks:= dev-haskell/split:= >=dev-haskell/stm-2.3:= dev-haskell/stm-chans:= dev-haskell/text:= dev-haskell/unix-compat:= dev-haskell/unordered-containers:= dev-haskell/utf8-string:= >=dev-haskell/uuid-1.2.6:= >=dev-lang/ghc-7.8.2:= assistant? ( >=dev-haskell/dns-1.0.0:= dev-haskell/hinotify:= dev-haskell/mountpoints:= sys-process/lsof ) benchmark? ( dev-haskell/criterion:= ) concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= ) dbus? ( >=dev-haskell/dbus-0.10.7:= >=dev-haskell/fdo-notify-0.3:= ) magicmime? ( dev-haskell/magic:= ) network-uri? ( >=dev-haskell/network-2.6:= >=dev-haskell/network-uri-2.6:= ) !network-uri? ( >=dev-haskell/network-2.4:= <dev-haskell/network-2.6:= ) pairing? ( dev-haskell/network-info:= dev-haskell/network-multicast:= ) s3? ( >=dev-haskell/aws-0.9.2:= dev-haskell/conduit:= dev-haskell/conduit-extra:= ) torrentparser? ( >=dev-haskell/torrent-10000.0.0:= ) webapp? ( dev-haskell/blaze-builder:= dev-haskell/clientsession:= >=dev-haskell/path-pieces-0.1.4:= >=dev-haskell/shakespeare-2.0.0:= dev-haskell/wai:= dev-haskell/wai-extra:= >=dev-haskell/warp-3.0.0.5:= >=dev-haskell/warp-tls-1.4:= >=dev-haskell/yesod-1.2.6:= >=dev-haskell/yesod-core-1.2.19:= >=dev-haskell/yesod-default-1.2.0:= >=dev-haskell/yesod-form-1.3.15:= >=dev-haskell/yesod-static-1.2.4:= ) webdav? ( >=dev-haskell/dav-1.0:= ) dev-vcs/git >=dev-haskell/cabal-1.18.1.3 dev-lang/perl doc? ( www-apps/ikiwiki net-misc/rsync )
-DESCRIPTION=manage files with git, without checking their contents into git
-EAPI=6
-HOMEPAGE=http://git-annex.branchable.com/
-IUSE=+assistant benchmark +concurrentoutput +dbus doc +magicmime +network-uri +pairing s3 +torrentparser +webapp +webdav
-KEYWORDS=~amd64 ~x86 ~amd64-linux
-LICENSE=GPL-3
-RDEPEND=dev-haskell/aeson:= dev-haskell/async:= dev-haskell/bloomfilter:= dev-haskell/byteable:= dev-haskell/case-insensitive:= dev-haskell/crypto-api:= dev-haskell/cryptonite:= dev-haskell/data-default:= dev-haskell/disk-free-space:= dev-haskell/dlist:= dev-haskell/edit-distance:= dev-haskell/esqueleto:= >=dev-haskell/exceptions-0.6:= >=dev-haskell/feed-0.3.9:= dev-haskell/free:= dev-haskell/hslogger:= dev-haskell/http-client:= >=dev-haskell/http-conduit-2.0:= >=dev-haskell/http-types-0.7:= dev-haskell/ifelse:= dev-haskell/memory:= dev-haskell/monad-control:= dev-haskell/monad-logger:= >=dev-haskell/mtl-2:= dev-haskell/old-locale:= >=dev-haskell/optparse-applicative-0.11.0:= dev-haskell/persistent:= dev-haskell/persistent-sqlite:= dev-haskell/persistent-template:= >=dev-haskell/quickcheck-2.1:2= dev-haskell/random:= dev-haskell/regex-tdfa:= dev-haskell/resourcet:= dev-haskell/safesemaphore:= dev-haskell/sandi:= dev-haskell/securemem:= dev-haskell/socks:= dev-haskell/split:= >=dev-haskell/stm-2.3:= dev-haskell/stm-chans:= dev-haskell/text:= dev-haskell/unix-compat:= dev-haskell/unordered-containers:= dev-haskell/utf8-string:= >=dev-haskell/uuid-1.2.6:= >=dev-lang/ghc-7.8.2:= assistant? ( >=dev-haskell/dns-1.0.0:= dev-haskell/hinotify:= dev-haskell/mountpoints:= sys-process/lsof ) benchmark? ( dev-haskell/criterion:= ) concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= ) dbus? ( >=dev-haskell/dbus-0.10.7:= >=dev-haskell/fdo-notify-0.3:= ) magicmime? ( dev-haskell/magic:= ) network-uri? ( >=dev-haskell/network-2.6:= >=dev-haskell/network-uri-2.6:= ) !network-uri? ( >=dev-haskell/network-2.4:= <dev-haskell/network-2.6:= ) pairing? ( dev-haskell/network-info:= dev-haskell/network-multicast:= ) s3? ( >=dev-haskell/aws-0.9.2:= dev-haskell/conduit:= dev-haskell/conduit-extra:= ) torrentparser? ( >=dev-haskell/torrent-10000.0.0:= ) webapp? ( dev-haskell/blaze-builder:= dev-haskell/clientsession:= >=dev-haskell/path-pieces-0.1.4:= >=dev-haskell/shakespeare-2.0.0:= dev-haskell/wai:= dev-haskell/wai-extra:= >=dev-haskell/warp-3.0.0.5:= >=dev-haskell/warp-tls-1.4:= >=dev-haskell/yesod-1.2.6:= >=dev-haskell/yesod-core-1.2.19:= >=dev-haskell/yesod-default-1.2.0:= >=dev-haskell/yesod-form-1.3.15:= >=dev-haskell/yesod-static-1.2.4:= ) webdav? ( >=dev-haskell/dav-1.0:= ) dev-vcs/git
-RESTRICT=test
-SLOT=0
-SRC_URI=https://hackage.haskell.org/package/git-annex-6.20170818/git-annex-6.20170818.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=78908287dca4a860bee06d028baabc92
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 123e0bcbba5b..c8c7841c78d6 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a26731990e7bfe74f203d1f42fa16efc
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 619195b278b4..511d3a757cfb 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	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 e501eb0fcc26..b14d4b879e80 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	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 60611c39820f..f7896280855c 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	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 6842d3d8e304..7b6a6325a094 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	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 286f6a322638..d64d31a887fc 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	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 e44f10f2054e..59aa75870c09 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	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 77d96b6ebe2c..51209f0bece7 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	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 7ed7212eae92..2ab03afed74b 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	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 5d7b7bfee80d..812931f639c8 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	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 66af1f5b7ec1..04029514f537 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	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 47045f005274..c18c7a63d9c4 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	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 978ec4f70636..482cfbf28f91 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	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 c9990ba006f4..1eca446e6613 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	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 f78a82998c87..eba365bd686b 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	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 b0eab50abcf5..f557c30a7ebe 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	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 68b622485c5b..f4e4586d81d9 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	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 bb3b6b3000b2..b5dae2091094 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=5db7324a31716239a8d2db5fdff0ddfc
diff --git a/metadata/md5-cache/dev-vcs/mercurial-5.4 b/metadata/md5-cache/dev-vcs/mercurial-5.4
deleted file mode 100644
index 5c195a091779..000000000000
--- a/metadata/md5-cache/dev-vcs/mercurial-5.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=!~dev-python/python-3.5.0 !~dev-python/python-3.5.1 !~dev-python/python-3.5.2 !~dev-python/python-3.6.0 !~dev-python/python-3.6.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(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=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-42.0.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(-)]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=emacs? ( >=app-editors/emacs-23.1:* ) test? ( app-arch/unzip dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,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=Scalable distributed SCM
-EAPI=7
-HOMEPAGE=https://www.mercurial-scm.org/
-IUSE=+chg emacs gpg test tk zsh-completion 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 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=!~dev-python/python-3.5.0 !~dev-python/python-3.5.1 !~dev-python/python-3.5.2 !~dev-python/python-3.6.0 !~dev-python/python-3.6.1 app-misc/ca-certificates dev-python/zstandard[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) zsh-completion? ( app-shells/zsh ) 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_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,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
-SLOT=0
-SRC_URI=https://www.mercurial-scm.org/release/mercurial-5.4.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	44725b3eb803b8abcd6978759c231210	elisp-common	504a3383c45504fde86b00426619a709	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f348057728de956bf12a9f71f3de3eee
diff --git a/metadata/md5-cache/dev-vcs/mercurial-5.4.1 b/metadata/md5-cache/dev-vcs/mercurial-5.4.1
new file mode 100644
index 000000000000..3fffdf122f5e
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/mercurial-5.4.1
@@ -0,0 +1,16 @@
+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(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=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-42.0.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(-)]
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=emacs? ( >=app-editors/emacs-23.1:* ) test? ( app-arch/unzip dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,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=Scalable distributed SCM
+EAPI=7
+HOMEPAGE=https://www.mercurial-scm.org/
+IUSE=+chg emacs gpg test tk zsh-completion 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 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=app-misc/ca-certificates dev-python/zstandard[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) zsh-completion? ( app-shells/zsh ) 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_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,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
+SLOT=0
+SRC_URI=https://www.mercurial-scm.org/release/mercurial-5.4.1.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	44725b3eb803b8abcd6978759c231210	elisp-common	504a3383c45504fde86b00426619a709	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e7021b36dd374f8eb5fc89c09b4ef1db
diff --git a/metadata/md5-cache/dev-vcs/mercurial-9999 b/metadata/md5-cache/dev-vcs/mercurial-9999
index 9f0d3c3452c9..b3a5741f7c81 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-9999
+++ b/metadata/md5-cache/dev-vcs/mercurial-9999
@@ -1,4 +1,4 @@
-BDEPEND=!~dev-python/python-3.5.0 !~dev-python/python-3.5.1 !~dev-python/python-3.5.2 !~dev-python/python-3.6.0 !~dev-python/python-3.6.1 dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,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[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_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,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-42.0.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=dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,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[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_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,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-42.0.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(-)]
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
 DEPEND=emacs? ( >=app-editors/emacs-23.1:* ) test? ( app-arch/unzip dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,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/mercurial
 DESCRIPTION=Scalable distributed SCM
@@ -7,9 +7,9 @@ HOMEPAGE=https://www.mercurial-scm.org/
 IUSE=+chg emacs gpg test tk zsh-completion python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=!~dev-python/python-3.5.0 !~dev-python/python-3.5.1 !~dev-python/python-3.5.2 !~dev-python/python-3.6.0 !~dev-python/python-3.6.1 app-misc/ca-certificates dev-python/zstandard[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) zsh-completion? ( app-shells/zsh ) 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_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+RDEPEND=app-misc/ca-certificates dev-python/zstandard[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) zsh-completion? ( app-shells/zsh ) 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_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,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
 SLOT=0
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	44725b3eb803b8abcd6978759c231210	elisp-common	504a3383c45504fde86b00426619a709	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	mercurial	d22fe98ea362174612a57c233239102f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=723150ad39a646760ff13e2dc2157f20
+_md5_=a11c41fae1f01da7b132cc61c87f69d5
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.12.2 b/metadata/md5-cache/dev-vcs/subversion-1.12.2
deleted file mode 100644
index c8acc6da225a..000000000000
--- a/metadata/md5-cache/dev-vcs/subversion-1.12.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test
-DEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat dev-libs/libutf8proc:= sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.6 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) !!<sys-apps/sandbox-1.6 ctypes-python? ( dev-python/ctypesgen ) doc? ( app-doc/doxygen ) gnome-keyring? ( virtual/pkgconfig ) http? ( virtual/pkgconfig ) java? ( >=virtual/jdk-1.8 ) kwallet? ( kde-frameworks/kdelibs4support:5 virtual/pkgconfig ) nls? ( sys-devel/gettext ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) apache2? ( =www-servers/apache-2* ) >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Advanced version control system
-EAPI=6
-HOMEPAGE=https://subversion.apache.org/
-IUSE=apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax apache2 python_targets_python2_7 elibc_FreeBSD java
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=Subversion GPL-2
-RDEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat dev-libs/libutf8proc:= sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.6 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.8 ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso )
-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	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	db-use	501a5d0963e0d17f30260023f292ae8e	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7478fdd69ab4ab9b08d1dfe83f4e08d7
diff --git a/metadata/md5-cache/dev-vcs/svn2git-1.0.11-r1 b/metadata/md5-cache/dev-vcs/svn2git-1.0.11-r1
deleted file mode 100644
index 0140d35190b4..000000000000
--- a/metadata/md5-cache/dev-vcs/svn2git-1.0.11-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-qt/qtcore:5 dev-vcs/subversion
-DESCRIPTION=Tool for one-time conversion from svn to git
-EAPI=6
-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.11.tar.gz -> svn2git-1.0.11.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d2592a24b133c5a8160d53544e8765df
diff --git a/metadata/md5-cache/dev-vcs/svn2git-1.0.12 b/metadata/md5-cache/dev-vcs/svn2git-1.0.12
deleted file mode 100644
index 0607ef01a663..000000000000
--- a/metadata/md5-cache/dev-vcs/svn2git-1.0.12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-qt/qtcore:5 dev-vcs/subversion
-DESCRIPTION=Tool for one-time conversion from svn to git
-EAPI=6
-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.12.tar.gz -> svn2git-1.0.12.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ee56a414e2f578faee7a6b97d54b3c7a
diff --git a/metadata/md5-cache/dev-vcs/svn2git-1.0.13 b/metadata/md5-cache/dev-vcs/svn2git-1.0.13
deleted file mode 100644
index 3b901bdaf584..000000000000
--- a/metadata/md5-cache/dev-vcs/svn2git-1.0.13
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-qt/qtcore:5 dev-vcs/subversion
-DESCRIPTION=Tool for one-time conversion from svn to git
-EAPI=6
-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.13.tar.gz -> svn2git-1.0.13.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ee56a414e2f578faee7a6b97d54b3c7a
diff --git a/metadata/md5-cache/dev-vcs/svn2git-1.0.13-r1 b/metadata/md5-cache/dev-vcs/svn2git-1.0.13-r1
deleted file mode 100644
index b4f86f96457e..000000000000
--- a/metadata/md5-cache/dev-vcs/svn2git-1.0.13-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-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.13.tar.gz -> svn2git-1.0.13.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0062e39c0f576a57368982073b4bb27a
diff --git a/metadata/md5-cache/games-action/0verkill-0.16-r4 b/metadata/md5-cache/games-action/0verkill-0.16-r4
index 23684fc0fbaf..cb742539ac2b 100644
--- a/metadata/md5-cache/games-action/0verkill-0.16-r4
+++ b/metadata/md5-cache/games-action/0verkill-0.16-r4
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install prepare
 DEPEND=X? ( x11-libs/libXpm ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 bloody 2D action deathmatch-like game in ASCII-ART
 EAPI=6
-HOMEPAGE=http://freecode.com/projects/0verkill
+HOMEPAGE=http://freshmeat.sourceforge.net/projects/0verkill
 IUSE=X
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=X? ( x11-libs/libXpm )
 SLOT=0
 SRC_URI=http://artax.karlin.mff.cuni.cz/~brain/0verkill/release/0verkill-0.16.tgz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=286ebc293958343191d8c265d7f7baff
+_md5_=3961ac1b4e9532f1f8c6336166cf01c8
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index 7f522d1473fa..1be0019640fa 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/apotheon-1.26v b/metadata/md5-cache/games-action/apotheon-1.26v
index 06d3a92e4c2c..d4d992ba7448 100644
--- a/metadata/md5-cache/games-action/apotheon-1.26v
+++ b/metadata/md5-cache/games-action/apotheon-1.26v
@@ -8,5 +8,5 @@ RDEPEND=dev-lang/mono media-libs/libsdl2[joystick,opengl,threads,video] media-li
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=apotheon-12302015-bin
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f7e716b73ba01a1b8cbe92a63422431a
diff --git a/metadata/md5-cache/games-action/beathazardultra-20130308-r2 b/metadata/md5-cache/games-action/beathazardultra-20130308-r2
index dad28e26b5a2..b28429915e0e 100644
--- a/metadata/md5-cache/games-action/beathazardultra-20130308-r2
+++ b/metadata/md5-cache/games-action/beathazardultra-20130308-r2
@@ -10,5 +10,5 @@ RDEPEND=virtual/opengl amd64? ( !bundled-libs? ( >=media-libs/libpng-compat-1.2.
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=beathazard-installer_03-08-13
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=da58e3761f7f5f0cf19c1abad29ee7b3
diff --git a/metadata/md5-cache/games-action/brutal-legend-20130615-r2 b/metadata/md5-cache/games-action/brutal-legend-20130615-r2
index 9535a2eb95db..e48c792782ad 100644
--- a/metadata/md5-cache/games-action/brutal-legend-20130615-r2
+++ b/metadata/md5-cache/games-action/brutal-legend-20130615-r2
@@ -9,5 +9,5 @@ RDEPEND=amd64? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=virtual/glu-9.0-r1[ab
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=BrutalLegend-Linux-2013-06-15-setup.bin
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6f66cd8c0b5e0873f5522e473af871f1
diff --git a/metadata/md5-cache/games-action/descent1-demodata-1.4-r1 b/metadata/md5-cache/games-action/descent1-demodata-1.4-r1
index 5ff4f1a6c25c..889a47a7c5a6 100644
--- a/metadata/md5-cache/games-action/descent1-demodata-1.4-r1
+++ b/metadata/md5-cache/games-action/descent1-demodata-1.4-r1
@@ -8,5 +8,5 @@ LICENSE=free-noncomm
 RDEPEND=!games-action/descent1-data
 SLOT=0
 SRC_URI=http://icculus.org/d2x/data/desc14sw.exe ftp://ftp.funet.fi/pub/msdos/games/interplay/desc14sw.exe
-_eclasses_=unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=eccd090b8ffa2f31c6dfd19a3a50b6bf
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 dc377e1d3709..323208d72b00 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1a3f882e02e0c3d4a31f0345c1c2bd61
diff --git a/metadata/md5-cache/games-action/descent3-demo-1.4.0a-r1 b/metadata/md5-cache/games-action/descent3-demo-1.4.0a-r1
index d0a101f1715c..ee758d059200 100644
--- a/metadata/md5-cache/games-action/descent3-demo-1.4.0a-r1
+++ b/metadata/md5-cache/games-action/descent3-demo-1.4.0a-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=?? ( alsa pulseaudio )
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=mirror://lokigames/loki_demos/descent3-demo.run
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=58131cf0997822fa065e4972f63a49f4
diff --git a/metadata/md5-cache/games-action/guacamelee-20140222 b/metadata/md5-cache/games-action/guacamelee-20140222
index 2af171ebfc49..283a124ff049 100644
--- a/metadata/md5-cache/games-action/guacamelee-20140222
+++ b/metadata/md5-cache/games-action/guacamelee-20140222
@@ -8,5 +8,5 @@ RDEPEND=media-libs/libsdl2[abi_x86_32,joystick,opengl,sound,threads,video] virtu
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=Guacamelee_linux_1393037377.sh
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a9aa7c1257c7c14a1073935eeb35dfcc
diff --git a/metadata/md5-cache/games-action/heretic2-1.06c-r1 b/metadata/md5-cache/games-action/heretic2-1.06c-r1
index d7a38b1ca179..7beaf90f2028 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	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 4a89eff2bb38..e7380ef37d25 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a81997323ddb2da815f17ddba67c93b1
diff --git a/metadata/md5-cache/games-action/luola-1.3.2-r1 b/metadata/md5-cache/games-action/luola-1.3.2-r1
index 6bb44161a62b..df49e1f5171e 100644
--- a/metadata/md5-cache/games-action/luola-1.3.2-r1
+++ b/metadata/md5-cache/games-action/luola-1.3.2-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=configure install postinst postrm preinst prepare
 DEPEND=media-libs/libsdl[X,sound,joystick,video] media-libs/sdl-gfx media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer media-libs/sdl-ttf >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 2D multiplayer arcade game resembling V-Wing
 EAPI=6
-HOMEPAGE=https://freecode.com/projects/luola
+HOMEPAGE=http://freshmeat.sourceforge.net/projects/luola
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[X,sound,joystick,video] media-libs/sdl-gfx media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer media-libs/sdl-ttf
 SLOT=0
 SRC_URI=mirror://gentoo/luola-1.3.2.tar.gz mirror://gentoo/stdlevels-6.0.tar.gz mirror://gentoo/nostalgia-1.2.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2034e90837952701f836a7bd53fbc740
+_md5_=4d79112a39746721b4303e8e3af832a3
diff --git a/metadata/md5-cache/games-action/minetest-5.2.0 b/metadata/md5-cache/games-action/minetest-5.2.0
index 6e9d563a05a0..7e99bb454b01 100644
--- a/metadata/md5-cache/games-action/minetest-5.2.0
+++ b/metadata/md5-cache/games-action/minetest-5.2.0
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( client server )
 SLOT=0
 SRC_URI=https://github.com/minetest/minetest/archive/5.2.0.tar.gz -> minetest-5.2.0.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=24c5ab10501a65780573138f9b186be3
+_md5_=940e9f2a8cf43bf89ed1c7ec909d7987
diff --git a/metadata/md5-cache/games-action/rive-1.15 b/metadata/md5-cache/games-action/rive-1.15
index 4cbd071736fa..e0f0128220e2 100644
--- a/metadata/md5-cache/games-action/rive-1.15
+++ b/metadata/md5-cache/games-action/rive-1.15
@@ -9,5 +9,5 @@ RDEPEND=media-libs/libsdl2[opengl,video] media-libs/openal
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=RIVE-Linux-2017-02-28.sh
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5d00b49e4a46251970207cf6340eb808
diff --git a/metadata/md5-cache/games-action/shadowgrounds-bin-0_p1 b/metadata/md5-cache/games-action/shadowgrounds-bin-0_p1
index dc419a5e635f..546e3175471e 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	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 833434a91d1f..20bcd7d7b68f 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=301ea84d794019a8b67ddf2d7842ac12
diff --git a/metadata/md5-cache/games-action/super-hexagon-20160217 b/metadata/md5-cache/games-action/super-hexagon-20160217
index 804519d27feb..be0f777f93e9 100644
--- a/metadata/md5-cache/games-action/super-hexagon-20160217
+++ b/metadata/md5-cache/games-action/super-hexagon-20160217
@@ -9,5 +9,5 @@ RDEPEND=media-libs/glew:1.6 media-libs/libsdl2[opengl,sound,video] media-libs/li
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=superhexagon-02172016-bin
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2d840f70659ed17da18ff73178fc9b9d
diff --git a/metadata/md5-cache/games-action/trine-1.08-r3 b/metadata/md5-cache/games-action/trine-1.08-r3
index cda05c327250..a66c29b2ab8d 100644
--- a/metadata/md5-cache/games-action/trine-1.08-r3
+++ b/metadata/md5-cache/games-action/trine-1.08-r3
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/nvidia-cg-toolkit >=media-libs/libsdl-1.2[opengl,video] >=medi
 RESTRICT=bindist fetch strip
 SLOT=0
 SRC_URI=TrineUpdate4.64.run
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5f9e04e0f615f5ae156d2f44510e2a69
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index 340b4fcdda28..3086bfe6e279 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 c29d0d477a1e..dbe8b214823e 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cb5af0371671120fe9957f6929ca1b7d
diff --git a/metadata/md5-cache/games-arcade/berusky-1.7.1-r1 b/metadata/md5-cache/games-arcade/berusky-1.7.1-r1
index cc0df9272ca0..33eedc236a30 100644
--- a/metadata/md5-cache/games-arcade/berusky-1.7.1-r1
+++ b/metadata/md5-cache/games-arcade/berusky-1.7.1-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare
 DEPEND=media-libs/libsdl[X,video] media-libs/sdl-image[png] x11-libs/gtk+:2 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Free logic game based on an ancient puzzle named Sokoban
 EAPI=6
-HOMEPAGE=http://anakreon.cz/?q=node/1
+HOMEPAGE=https://anakreon.cz/?q=node/1
 KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
+LICENSE=GPL-2+
 RDEPEND=media-libs/libsdl[X,video] media-libs/sdl-image[png] x11-libs/gtk+:2
 SLOT=0
-SRC_URI=http://www.anakreon.cz/download/berusky-1.7.1.tar.gz http://www.anakreon.cz/download/berusky-data-1.7.tar.gz https://dev.gentoo.org/~hasufell/distfiles/berusky.png
+SRC_URI=https://www.anakreon.cz/download/berusky-1.7.1.tar.gz https://www.anakreon.cz/download/berusky-data-1.7.tar.gz https://dev.gentoo.org/~hasufell/distfiles/berusky.png
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b90a41e4c8c5fbf303a525c89588673e
+_md5_=124c0ebf4509834d3a9ff0dc857b9d40
diff --git a/metadata/md5-cache/games-arcade/blobwars-2.00-r1 b/metadata/md5-cache/games-arcade/blobwars-2.00-r1
new file mode 100644
index 000000000000..e33044fe40e8
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/blobwars-2.00-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEPEND=media-libs/libsdl2 media-libs/sdl2-mixer media-libs/sdl2-ttf media-libs/sdl2-image media-libs/sdl2-net sys-libs/zlib virtual/libintl sys-devel/gettext dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Platform game about a blob and his quest to rescue MIAs from an alien invader
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/blobwars/ https://www.parallelrealities.co.uk/games/metalBlobSolid/ https://github.com/perpendicular-dimensions/blobwars
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD CC-BY-SA-3.0 CC-BY-3.0 GPL-2 LGPL-2.1 fairuse public-domain
+RDEPEND=media-libs/libsdl2 media-libs/sdl2-mixer media-libs/sdl2-ttf media-libs/sdl2-image media-libs/sdl2-net sys-libs/zlib virtual/libintl
+SLOT=0
+SRC_URI=mirror://sourceforge/blobwars/blobwars-2.00.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8d6aff7abcda881941e38903bbfcf57c
diff --git a/metadata/md5-cache/games-arcade/gunocide2ex-1.0 b/metadata/md5-cache/games-arcade/gunocide2ex-1.0
index 90096554198a..ee8ef7a15bb0 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d9ae98fc4f3d1bc6b68583ff84931772
diff --git a/metadata/md5-cache/games-arcade/shovel-knight-3.3 b/metadata/md5-cache/games-arcade/shovel-knight-3.3
index 0dd51fd7161e..1356b1623ecc 100644
--- a/metadata/md5-cache/games-arcade/shovel-knight-3.3
+++ b/metadata/md5-cache/games-arcade/shovel-knight-3.3
@@ -8,5 +8,5 @@ RDEPEND=media-libs/glew:1.10 media-libs/libsdl2[opengl,sound,video] virtual/open
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=shovel_knight_treasure_trove_en_3_3_15418.sh
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=19178f1f7f459eaf31f2aed1068c25a8
diff --git a/metadata/md5-cache/games-arcade/thinktanks-demo-1.1-r3 b/metadata/md5-cache/games-arcade/thinktanks-demo-1.1-r3
index 787f456c7b68..795e9471b816 100644
--- a/metadata/md5-cache/games-arcade/thinktanks-demo-1.1-r3
+++ b/metadata/md5-cache/games-arcade/thinktanks-demo-1.1-r3
@@ -8,5 +8,5 @@ RDEPEND=media-libs/libsdl[video,joystick,abi_x86_32(-)] media-libs/libogg[abi_x8
 RESTRICT=strip
 SLOT=0
 SRC_URI=ftp://ggdev-1.homelan.com/thinktanks/ThinkTanksDemo_v1.1.sh.bin
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=72494249f263f835f73c50334e10ecf7
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index 82e106a51ece..d2c9e5dfe666 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/cockatrice-20190304-r1 b/metadata/md5-cache/games-board/cockatrice-20190304-r1
index 78bbcdaacc2a..194741787ce5 100644
--- a/metadata/md5-cache/games-board/cockatrice-20190304-r1
+++ b/metadata/md5-cache/games-board/cockatrice-20190304-r1
@@ -1,14 +1,14 @@
 BDEPEND=dev-qt/linguist-tools:5 client? ( dev-libs/protobuf ) server? ( dev-libs/protobuf ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtprintsupport:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 client? ( dev-libs/protobuf:= dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 ) oracle? ( sys-libs/zlib ) server? ( dev-libs/protobuf:= dev-qt/qtsql:5 dev-qt/qtwebsockets:5 )
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 client? ( dev-libs/protobuf:= dev-qt/qtmultimedia:5 dev-qt/qtsvg:5 ) oracle? ( sys-libs/zlib ) server? ( dev-libs/protobuf:= dev-qt/qtsql:5 )
 DESCRIPTION=An open-source multiplatform software for playing card games over a network
 EAPI=7
 HOMEPAGE=https://github.com/Cockatrice/Cockatrice
 IUSE=+client +oracle server
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtprintsupport:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 client? ( dev-libs/protobuf:= dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 ) oracle? ( sys-libs/zlib ) server? ( dev-libs/protobuf:= dev-qt/qtsql:5 dev-qt/qtwebsockets:5 )
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 client? ( dev-libs/protobuf:= dev-qt/qtmultimedia:5 dev-qt/qtsvg:5 ) oracle? ( sys-libs/zlib ) server? ( dev-libs/protobuf:= dev-qt/qtsql:5 )
 SLOT=0
 SRC_URI=https://github.com/Cockatrice/Cockatrice/archive/2019-03-04-Release-2.7.0.tar.gz -> cockatrice-20190304.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=71f65efc3e9137a15c170bfa67f3bd5f
+_md5_=4c7d8faa476ebb443c696668a1bfd352
diff --git a/metadata/md5-cache/games-board/gnuchess-6.2.4 b/metadata/md5-cache/games-board/gnuchess-6.2.4
deleted file mode 100644
index 75db1c9d0ef6..000000000000
--- a/metadata/md5-cache/games-board/gnuchess-6.2.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=Console based chess interface
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/chess/chess.html
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://gnu/chess/gnuchess-6.2.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5364b8f28abb5f31c7f0cd0d4c8effe1
diff --git a/metadata/md5-cache/games-board/gnuchess-6.2.5 b/metadata/md5-cache/games-board/gnuchess-6.2.5
deleted file mode 100644
index 2b6e7a96b3f7..000000000000
--- a/metadata/md5-cache/games-board/gnuchess-6.2.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=Console based chess interface
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/chess/chess.html
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://gnu/chess/gnuchess-6.2.5.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=037e7465b8f34a6c91a86688807f8064
diff --git a/metadata/md5-cache/games-board/gnuchess-6.2.7 b/metadata/md5-cache/games-board/gnuchess-6.2.7
index 3f698fc7c158..030ddf3a0d19 100644
--- a/metadata/md5-cache/games-board/gnuchess-6.2.7
+++ b/metadata/md5-cache/games-board/gnuchess-6.2.7
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure
 DESCRIPTION=Console based chess interface
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/chess/chess.html
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/chess/gnuchess-6.2.7.tar.gz
-_md5_=abaea9225e0172d3c2ab793048018d69
+_md5_=af9cd15543f2d2756c0b87ccf4c54996
diff --git a/metadata/md5-cache/games-board/gnugo-3.9.1-r1 b/metadata/md5-cache/games-board/gnugo-3.9.1-r1
deleted file mode 100644
index 2e2e0d36d048..000000000000
--- a/metadata/md5-cache/games-board/gnugo-3.9.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=readline? ( sys-libs/readline:0= ) >=sys-libs/ncurses-5.2-r3:0=
-DESCRIPTION=A Go-playing program
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/gnugo/devel.html
-IUSE=readline
-KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a3536715666102f081b551cdf59fccfb
diff --git a/metadata/md5-cache/games-board/gnugo-3.9.1-r2 b/metadata/md5-cache/games-board/gnugo-3.9.1-r2
index b3a93b6ff8fc..12f2c08a442a 100644
--- a/metadata/md5-cache/games-board/gnugo-3.9.1-r2
+++ b/metadata/md5-cache/games-board/gnugo-3.9.1-r2
@@ -1,7 +1,8 @@
-DEFINED_PHASES=configure
+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=readline? ( sys-libs/readline:0= ) >=sys-libs/ncurses-5.2-r3:0=
 DESCRIPTION=A Go-playing program
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gnugo/devel.html
 IUSE=readline
 KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
@@ -9,4 +10,5 @@ LICENSE=GPL-3
 RDEPEND=readline? ( sys-libs/readline:0= ) >=sys-libs/ncurses-5.2-r3:0=
 SLOT=0
 SRC_URI=mirror://gentoo/gnugo-3.9.1.tar.gz
-_md5_=813245559d5e84f2564a70e7487a5b19
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1bd1c38e7bfaf4bb1017b26376be71b3
diff --git a/metadata/md5-cache/games-board/scid-4.6.2-r1 b/metadata/md5-cache/games-board/scid-4.6.2-r1
index c1f5d6d5dfd4..0e0912fbead7 100644
--- a/metadata/md5-cache/games-board/scid-4.6.2-r1
+++ b/metadata/md5-cache/games-board/scid-4.6.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-lang/tk:0 dev-tcltk/tkimg >=sys-libs/zlib-1.1.3 || ( >=dev-lang/python-2.7.5-r2:2.7 ) app-arch/unzip
+DEPEND=dev-lang/tk:0 dev-tcltk/tkimg >=sys-libs/zlib-1.1.3 || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) app-arch/unzip
 DESCRIPTION=a free chess database application
 EAPI=6
 HOMEPAGE=http://scid.sourceforge.net/
@@ -9,4 +9,4 @@ RDEPEND=dev-lang/tk:0 dev-tcltk/tkimg >=sys-libs/zlib-1.1.3 !games-board/chessdb
 SLOT=0
 SRC_URI=mirror://sourceforge/scid/scid-4.6.2.zip mirror://sourceforge/scid/spelling.zip mirror://sourceforge/scid/ratings.zip mirror://sourceforge/scid/photos.zip mirror://sourceforge/scid/scidlet40k.zip
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=31f14e88b4ad3b95695a043c545a87ff
+_md5_=0c4b5657a142b5a905b54defc96767f4
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 36d623bcf62b..80681ffacbbe 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/dolphin-9999 b/metadata/md5-cache/games-emulation/dolphin-9999
index 8335da1b5fa9..6437d2ea543d 100644
--- a/metadata/md5-cache/games-emulation/dolphin-9999
+++ b/metadata/md5-cache/games-emulation/dolphin-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/hidapi:0= dev-libs/libfmt:0= dev-libs/lzo:2= dev-libs/pugixml:0= media-libs/libpng:0= media-libs/libsfml media-libs/mesa[egl] net-libs/enet:1.3 net-libs/mbedtls:0= net-misc/curl:0= sys-libs/readline:0= sys-libs/zlib:0= x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( media-video/ffmpeg:= ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc ) app-arch/zip dev-util/vulkan-headers media-libs/freetype sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-libs/hidapi:0= dev-libs/libfmt:0= dev-libs/lzo:2= dev-libs/pugixml:0= media-libs/libpng:0= media-libs/libsfml media-libs/mesa[egl] net-libs/enet:1.3 net-libs/mbedtls:0= net-misc/curl:0= sys-libs/readline:0= sys-libs/zlib:0= x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( media-video/ffmpeg:= ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc ) app-arch/zip media-libs/freetype sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Gamecube and Wii game emulator
 EAPI=6
 HOMEPAGE=https://www.dolphin-emu.org/
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=dev-libs/hidapi:0= dev-libs/libfmt:0= dev-libs/lzo:2= dev-libs/pugixml:0= media-libs/libpng:0= media-libs/libsfml media-libs/mesa[egl] net-libs/enet:1.3 net-libs/mbedtls:0= net-misc/curl:0= sys-libs/readline:0= sys-libs/zlib:0= x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( media-video/ffmpeg:= ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc ) media-libs/vulkan-loader
 SLOT=0
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1feef4858e0ce088e66b741e1e40943d
+_md5_=5fdca6962c0fa34a8886e67152287aca
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index fac1a403a570..c0cd817646ee 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/darkplaces-20140513-r1 b/metadata/md5-cache/games-fps/darkplaces-20140513-r1
index 04bbf6eefc76..1d02b49eff1d 100644
--- a/metadata/md5-cache/games-fps/darkplaces-20140513-r1
+++ b/metadata/md5-cache/games-fps/darkplaces-20140513-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-misc/curl cdinstall? ( games-fps/quake1-data ) demo? ( games-fps/quake1-demodata ) textures? ( >=games-fps/quake1-textures-20050820 ) opengl? ( virtual/jpeg:0 media-libs/libogg media-libs/libvorbis virtual/opengl alsa? ( media-libs/alsa-lib ) sdl? ( media-libs/libsdl ) x11-libs/libX11 x11-libs/libXpm x11-libs/libXxf86dga x11-libs/libXxf86vm ) !opengl? ( sdl? ( virtual/jpeg:0 media-libs/libogg media-libs/libvorbis virtual/opengl alsa? ( media-libs/alsa-lib ) sdl? ( media-libs/libsdl ) x11-libs/libX11 x11-libs/libXpm x11-libs/libXxf86dga x11-libs/libXxf86vm ) ) !opengl? ( !sdl? ( !dedicated? ( virtual/jpeg:0 media-libs/libogg media-libs/libvorbis virtual/opengl alsa? ( media-libs/alsa-lib ) sdl? ( media-libs/libsdl ) x11-libs/libX11 x11-libs/libXpm x11-libs/libXxf86dga x11-libs/libXxf86vm ) ) )
 SLOT=0
 SRC_URI=http://icculus.org/twilight/darkplaces/files/darkplacesengine20140513.zip lights? ( http://www.fuhquake.net/files/extras/fuhquake-lits.rar http://www.kgbsyndicate.com/romi/id1.pk3 )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4abef158208be99ef6fe60c6411e1b6a
diff --git a/metadata/md5-cache/games-fps/duke3d-data-1.0-r4 b/metadata/md5-cache/games-fps/duke3d-data-1.0-r4
index 9f5abb2967eb..b5d7697c3276 100644
--- a/metadata/md5-cache/games-fps/duke3d-data-1.0-r4
+++ b/metadata/md5-cache/games-fps/duke3d-data-1.0-r4
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( cdinstall gog )
 RESTRICT=mirror bindist gog? ( fetch )
 SLOT=0
 SRC_URI=gog? ( gog_duke_nukem_3d_atomic_edition_2.0.0.9.sh )
-_eclasses_=cdrom	6ffe90ac67bc6ac95249cae335323907	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=cdrom	6ffe90ac67bc6ac95249cae335323907	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ddb77af59b2d259e9101a2231a7e3913
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 b74f411169b0..42eb80a2a6f2 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=fcf0e051b9e00b4ca8053eb7f8a2ccfa
diff --git a/metadata/md5-cache/games-fps/legends-0.4.1.43-r2 b/metadata/md5-cache/games-fps/legends-0.4.1.43-r2
index 5473386f8a43..cb9758f05c1b 100644
--- a/metadata/md5-cache/games-fps/legends-0.4.1.43-r2
+++ b/metadata/md5-cache/games-fps/legends-0.4.1.43-r2
@@ -9,5 +9,5 @@ RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) media-fonts/font-adob
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://legendsthegame.net/files/legends_linux-0.4.1.43.run mirror://gentoo/legends.png
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a318570afbbb73e07389dc050ef59aa5
diff --git a/metadata/md5-cache/games-fps/quake2-data-3.20 b/metadata/md5-cache/games-fps/quake2-data-3.20
index 7055ad279c99..115427068b19 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=53b9e5586f5a64a9a83ee6a9eead30f3
diff --git a/metadata/md5-cache/games-fps/quake2-demodata-3.14 b/metadata/md5-cache/games-fps/quake2-demodata-3.14
index 01020a1734ea..0ef0d65dc46a 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=bdd64c6ec20dbd537a8a6d13208a6059
diff --git a/metadata/md5-cache/games-fps/serious-sam-tse-1_beta1-r1 b/metadata/md5-cache/games-fps/serious-sam-tse-1_beta1-r1
index 0ff8265fd17d..67ca6afc873b 100644
--- a/metadata/md5-cache/games-fps/serious-sam-tse-1_beta1-r1
+++ b/metadata/md5-cache/games-fps/serious-sam-tse-1_beta1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=media-libs/libogg-1.3.1[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r5[X
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=http://icculus.org/betas/ssam/ssamtse-beta1.sh.bin
-_eclasses_=cdrom	6ffe90ac67bc6ac95249cae335323907	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=cdrom	6ffe90ac67bc6ac95249cae335323907	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6303c8de4a77930da1fd46a62db89487
diff --git a/metadata/md5-cache/games-fps/soldieroffortune-1.06a-r1 b/metadata/md5-cache/games-fps/soldieroffortune-1.06a-r1
index c9c2c3827e3f..444f4dc02470 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	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	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 c9e190dd2f85..e342cc9daa5e 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b4355aac59e82c87bb1895b4c16a4ede
diff --git a/metadata/md5-cache/games-fps/ut2003-bonuspack-cm-1 b/metadata/md5-cache/games-fps/ut2003-bonuspack-cm-1
index 872086dafc74..3df0fccf4d60 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d6cb24473e3f257048f9e906b2ef7202
diff --git a/metadata/md5-cache/games-fps/ut2003-data-2107 b/metadata/md5-cache/games-fps/ut2003-data-2107
index 049a45b51df8..215184c45425 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=80ffcdc13e81c10ba0a1a88a167fcb7f
diff --git a/metadata/md5-cache/games-fps/ut2003-demo-2206-r4 b/metadata/md5-cache/games-fps/ut2003-demo-2206-r4
index cfdd1e3c6672..340b4c192e25 100644
--- a/metadata/md5-cache/games-fps/ut2003-demo-2206-r4
+++ b/metadata/md5-cache/games-fps/ut2003-demo-2206-r4
@@ -9,5 +9,5 @@ RDEPEND=sys-devel/bc sys-libs/libstdc++-v3:5 virtual/opengl[abi_x86_32(-)] x11-l
 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2fc3dffe4a9511aa488c532cee43f050
diff --git a/metadata/md5-cache/games-fps/ut2004-data-3186-r5 b/metadata/md5-cache/games-fps/ut2004-data-3186-r5
index 92238de808ba..0e92e177e402 100644
--- a/metadata/md5-cache/games-fps/ut2004-data-3186-r5
+++ b/metadata/md5-cache/games-fps/ut2004-data-3186-r5
@@ -9,5 +9,5 @@ PDEPEND=>=games-fps/ut2004-3369.3-r2
 PROPERTIES=interactive
 RDEPEND=!games-fps/ut2004-ded
 SLOT=0
-_eclasses_=cdrom	6ffe90ac67bc6ac95249cae335323907	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	portability	e8f7ef3a41965b21a734550f8a94c1c6	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cdrom	6ffe90ac67bc6ac95249cae335323907	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cc48eee771dd34ddfb985e00ac12cfdb
diff --git a/metadata/md5-cache/games-fps/ut2004-demo-3334-r1 b/metadata/md5-cache/games-fps/ut2004-demo-3334-r1
index 02a35ed35efa..05920f35bf63 100644
--- a/metadata/md5-cache/games-fps/ut2004-demo-3334-r1
+++ b/metadata/md5-cache/games-fps/ut2004-demo-3334-r1
@@ -8,5 +8,5 @@ RDEPEND=sys-libs/libstdc++-v3:5 x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://gentoo/ut2004-lnx-demo3334.run
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2810f7beb3da30489b6d55275eb22c6a
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index fa3ce4662288..c4917b293120 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/fortune-mod-mormon-1.1.0 b/metadata/md5-cache/games-misc/fortune-mod-mormon-1.1.0
index 83ecf831fd59..1e9dd491aa4e 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-mormon-1.1.0
+++ b/metadata/md5-cache/games-misc/fortune-mod-mormon-1.1.0
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Fortune modules from the LDS scriptures (KJV Bible, Book of Mormon, D&C, PGP)
 EAPI=5
-HOMEPAGE=http://scriptures.nephi.org/
+HOMEPAGE=https://scriptures.nephi.org/
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=public-domain
 RDEPEND=games-misc/fortune-mod games-misc/fortune-mod-scriptures
 SLOT=0
 SRC_URI=mirror://sourceforge/mormon/fortune-mod-mormon-1.1.0.tar.bz2
-_md5_=2ff80487d15bf329cf9ddc44540c6253
+_md5_=ab6cd838d719b17d04713d36e28049ee
diff --git a/metadata/md5-cache/games-misc/fortune-mod-scriptures-1.1.0 b/metadata/md5-cache/games-misc/fortune-mod-scriptures-1.1.0
index b6ff2c9a4d0a..3b06447c4e0b 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-scriptures-1.1.0
+++ b/metadata/md5-cache/games-misc/fortune-mod-scriptures-1.1.0
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Fortune modules from the King James Bible scriptures
 EAPI=5
-HOMEPAGE=http://scriptures.nephi.org/
+HOMEPAGE=https://scriptures.nephi.org/
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=public-domain
 RDEPEND=games-misc/fortune-mod
 SLOT=0
 SRC_URI=mirror://sourceforge/mormon/fortune-mod-scriptures-1.1.0.tar.bz2
-_md5_=8291321b098a35bc0b5d21d6c4cd00db
+_md5_=13795c82417ffc49bf6f5f62ede9abf4
diff --git a/metadata/md5-cache/games-misc/little-inferno-20130509 b/metadata/md5-cache/games-misc/little-inferno-20130509
index 03a50506b4b9..beccff2026ef 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a8c20f1ad3f3b1e373e303234fe70229
diff --git a/metadata/md5-cache/games-misc/usolitaire-0.2.1 b/metadata/md5-cache/games-misc/usolitaire-0.2.1
new file mode 100644
index 000000000000..e984f58e6641
--- /dev/null
+++ b/metadata/md5-cache/games-misc/usolitaire-0.2.1
@@ -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-42.0.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=dev-python/urwid[python_targets_python3_6(-)?,python_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=solitaire in your terminal
+EAPI=7
+HOMEPAGE=https://github.com/eliasdorneles/usolitaire
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/urwid[python_targets_python3_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/eliasdorneles/usolitaire/archive/v0.2.1.tar.gz -> usolitaire-0.2.1.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=935a2971885ad2f56edd5cc36c87911a
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 7d7d724cd9ad..dc0bb57dd12b 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/anagramarama-0.2-r1 b/metadata/md5-cache/games-puzzle/anagramarama-0.2-r1
index 093646f0ffdc..3d21efbc9c2c 100644
--- a/metadata/md5-cache/games-puzzle/anagramarama-0.2-r1
+++ b/metadata/md5-cache/games-puzzle/anagramarama-0.2-r1
@@ -1,12 +1,13 @@
-DEFINED_PHASES=install prepare
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
 DEPEND=>=media-libs/libsdl-1.2 >=media-libs/sdl-mixer-1.2 >=media-libs/sdl-image-1.2
 DESCRIPTION=Create as many words as you can before the time runs out
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.coralquest.com/anagramarama/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libsdl-1.2 >=media-libs/sdl-mixer-1.2 >=media-libs/sdl-image-1.2 sys-apps/miscfiles
 SLOT=0
 SRC_URI=http://www.omega.clara.net/anagramarama/dist/anagramarama-0.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1b9a4977cc7752821cb6985c79003ad0
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=443a5310580513752c42a951fcdee196
diff --git a/metadata/md5-cache/games-puzzle/mures-0.5-r1 b/metadata/md5-cache/games-puzzle/mures-0.5-r1
index 25ecab5d097c..8c0bcd814453 100644
--- a/metadata/md5-cache/games-puzzle/mures-0.5-r1
+++ b/metadata/md5-cache/games-puzzle/mures-0.5-r1
@@ -1,7 +1,8 @@
+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=media-libs/libsdl media-libs/sdl-image media-libs/sdl-net media-libs/sdl-ttf opengl? ( virtual/opengl ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=media-libs/libsdl media-libs/sdl-image media-libs/sdl-net media-libs/sdl-ttf opengl? ( virtual/opengl )
 DESCRIPTION=A clone of Sega's Chu Chu Rocket
-EAPI=6
+EAPI=7
 HOMEPAGE=http://mures.sourceforge.net/
 IUSE=opengl
 KEYWORDS=~amd64 ~x86
@@ -10,4 +11,4 @@ RDEPEND=media-libs/libsdl media-libs/sdl-image media-libs/sdl-net media-libs/sdl
 SLOT=0
 SRC_URI=mirror://sourceforge/mures/mures-0.5.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ddd0ab80ab34d043bff861d4b385cae5
+_md5_=a245161e37c9edff6e0e9b4cf4c4c806
diff --git a/metadata/md5-cache/games-puzzle/world-of-goo-gog-1.51.29337 b/metadata/md5-cache/games-puzzle/world-of-goo-gog-1.51.29337
index 437ee56638bd..50a7f083bfe1 100644
--- a/metadata/md5-cache/games-puzzle/world-of-goo-gog-1.51.29337
+++ b/metadata/md5-cache/games-puzzle/world-of-goo-gog-1.51.29337
@@ -11,5 +11,5 @@ RDEPEND=!bundled-libs? ( media-libs/libsdl2[opengl,sound,video] media-libs/sdl2-
 RESTRICT=bindist fetch strip bundled-libs? ( splitdebug )
 SLOT=0
 SRC_URI=world_of_goo_1_51_29337.sh
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3a4065a0a6d54500f18fc43389c1c42a
diff --git a/metadata/md5-cache/games-puzzle/world-of-goo-hb-1.53 b/metadata/md5-cache/games-puzzle/world-of-goo-hb-1.53
index 465f7b376acd..0df29de1686e 100644
--- a/metadata/md5-cache/games-puzzle/world-of-goo-hb-1.53
+++ b/metadata/md5-cache/games-puzzle/world-of-goo-hb-1.53
@@ -11,5 +11,5 @@ RDEPEND=!bundled-libs? ( media-libs/libsdl2[opengl,sound,video] media-libs/sdl2-
 RESTRICT=bindist fetch strip bundled-libs? ( splitdebug )
 SLOT=0
 SRC_URI=WorldOfGoo.Linux.1.53.sh
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=310a5868b74d3bda3beb0f7bd1055998
diff --git a/metadata/md5-cache/games-roguelike/FTL-gog-1.6.9.25330 b/metadata/md5-cache/games-roguelike/FTL-gog-1.6.9.25330
index 30ae7845a0e0..dad74ecdf092 100644
--- a/metadata/md5-cache/games-roguelike/FTL-gog-1.6.9.25330
+++ b/metadata/md5-cache/games-roguelike/FTL-gog-1.6.9.25330
@@ -9,5 +9,5 @@ RDEPEND=media-libs/freetype media-libs/libsdl[X,sound,opengl,video] media-libs/l
 RESTRICT=bindist fetch mirror strip test
 SLOT=0
 SRC_URI=ftl_advanced_edition_1_6_9_25330.sh
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=288e7affa6daea9bca95e7e6b3dbf1d3
diff --git a/metadata/md5-cache/games-roguelike/Manifest.gz b/metadata/md5-cache/games-roguelike/Manifest.gz
index 225d28c533b4..8c18e81a38af 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/dwarf-fortress-0.44.12 b/metadata/md5-cache/games-roguelike/dwarf-fortress-0.44.12
index e95940a57355..55cc77355ce7 100644
--- a/metadata/md5-cache/games-roguelike/dwarf-fortress-0.44.12
+++ b/metadata/md5-cache/games-roguelike/dwarf-fortress-0.44.12
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install postinst prepare
 DEPEND=media-libs/glew:0 media-libs/libsdl[joystick,video] media-libs/sdl-image[png] media-libs/sdl-ttf sys-libs/zlib virtual/glu x11-libs/gtk+:2 media-libs/libsndfile media-libs/openal sys-libs/ncurses-compat:5[unicode] virtual/pkgconfig
 DESCRIPTION=A single-player fantasy game
 EAPI=6
-HOMEPAGE=http://www.bay12games.com/dwarves
+HOMEPAGE=https://www.bay12games.com/dwarves
 IUSE=debug
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=free-noncomm BSD BitstreamVera
 RDEPEND=media-libs/glew:0 media-libs/libsdl[joystick,video] media-libs/sdl-image[png] media-libs/sdl-ttf sys-libs/zlib virtual/glu x11-libs/gtk+:2
 RESTRICT=strip
 SLOT=0
-SRC_URI=amd64? ( http://www.bay12games.com/dwarves/df_44_12_linux.tar.bz2 ) x86? ( http://www.bay12games.com/dwarves/df_44_12_linux32.tar.bz2 )
+SRC_URI=amd64? ( https://www.bay12games.com/dwarves/df_44_12_linux.tar.bz2 ) x86? ( https://www.bay12games.com/dwarves/df_44_12_linux32.tar.bz2 )
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=99a447026987f5eccfbb136f37e601e2
+_md5_=0f89f58d077012be4a92662873b6bb56
diff --git a/metadata/md5-cache/games-roguelike/wrogue-0.8.0b-r1 b/metadata/md5-cache/games-roguelike/wrogue-0.8.0b-r1
index 4600da4b0f02..5cce838aee38 100644
--- a/metadata/md5-cache/games-roguelike/wrogue-0.8.0b-r1
+++ b/metadata/md5-cache/games-roguelike/wrogue-0.8.0b-r1
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=media-libs/libsdl[video] app-arch/unzip
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile configure install
+DEPEND=media-libs/libsdl[video]
 DESCRIPTION=Gothic science fantasy roguelike game
-EAPI=6
-HOMEPAGE=https://freecode.com/projects/wrogue
+EAPI=7
+HOMEPAGE=http://freshmeat.sourceforge.net/projects/wrogue
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=media-libs/libsdl[video]
 SLOT=0
 SRC_URI=mirror://gentoo/wrogue-0.8.0b.zip
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dd9c2693c2d91e8c95d1a6777f4bf25f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=863c81021b6bc4a4e8d14b89c5848d89
diff --git a/metadata/md5-cache/games-rpg/Manifest.gz b/metadata/md5-cache/games-rpg/Manifest.gz
index a2103d54231b..33147dd4a6b8 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/avadon-1.0.4_p1331768904 b/metadata/md5-cache/games-rpg/avadon-1.0.4_p1331768904
index e13fef1d73c6..38e5d50f9f7d 100644
--- a/metadata/md5-cache/games-rpg/avadon-1.0.4_p1331768904
+++ b/metadata/md5-cache/games-rpg/avadon-1.0.4_p1331768904
@@ -9,5 +9,5 @@ RDEPEND=media-libs/libsdl[opengl,video] media-libs/openal
 RESTRICT=fetch bindist
 SLOT=0
 SRC_URI=avadon-linux-1331768904-bin.txt
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=44169fc12698c64934c3591e9094a3a3
diff --git a/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.3.67.3-r1 b/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.3.67.3-r1
index 2b84c140ac39..ea1df3077551 100644
--- a/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.3.67.3-r1
+++ b/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.3.67.3-r1
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/expat[abi_x86_32(-)] dev-libs/json-c[abi_x86_32(-)] dev-libs/op
 RESTRICT=bindist fetch
 SLOT=0
 SRC_URI=gog_baldur_s_gate_enhanced_edition_2.5.0.9.sh
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=65500b856f2345f63f8f4cd12ae4ec10
diff --git a/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.5.23121 b/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.5.23121
index 40653db055d7..470e06afdb3c 100644
--- a/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.5.23121
+++ b/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.5.23121
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/expat dev-libs/openssl:0 media-libs/openal virtual/opengl x11-l
 RESTRICT=bindist fetch
 SLOT=0
 SRC_URI=baldur_s_gate_enhanced_edition_en_2_5_23121.sh
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=598afa2d1f029fe5e055724027221692
diff --git a/metadata/md5-cache/games-rpg/bastion-20120620-r1 b/metadata/md5-cache/games-rpg/bastion-20120620-r1
index 6c858cf30f33..039e33add69b 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	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fc50abe73edec72ec06215d7f908e2e7
diff --git a/metadata/md5-cache/games-rpg/costume-quest-2.0.0.3 b/metadata/md5-cache/games-rpg/costume-quest-2.0.0.3
index 43d603b0b269..60a408a96c72 100644
--- a/metadata/md5-cache/games-rpg/costume-quest-2.0.0.3
+++ b/metadata/md5-cache/games-rpg/costume-quest-2.0.0.3
@@ -8,5 +8,5 @@ RDEPEND=media-libs/glu[abi_x86_32] media-libs/libsdl2[abi_x86_32,joystick,opengl
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=gog_costume_quest_2.0.0.3.sh
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=535ae2482ba31f769cad27e1993b700b
diff --git a/metadata/md5-cache/games-rpg/dear-esther-20130608 b/metadata/md5-cache/games-rpg/dear-esther-20130608
index ee65361dab27..dbe197d9095e 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	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 fcb94091a1be..e82e8a960530 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	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c8ddf39a8fdfb58565bd40972d0faba6
diff --git a/metadata/md5-cache/games-rpg/grimrock-20150707 b/metadata/md5-cache/games-rpg/grimrock-20150707
index c6d6282f32b3..3c59f6015922 100644
--- a/metadata/md5-cache/games-rpg/grimrock-20150707
+++ b/metadata/md5-cache/games-rpg/grimrock-20150707
@@ -9,5 +9,5 @@ RDEPEND=media-libs/freeimage media-libs/freetype:2 media-libs/openal media-libs/
 RESTRICT=fetch bindist splitdebug
 SLOT=0
 SRC_URI=Grimrock-Linux-2015-07-07.sh
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=12024eb42c3c4c92346ceaba63e6ee04
diff --git a/metadata/md5-cache/games-rpg/to-the-moon-0 b/metadata/md5-cache/games-rpg/to-the-moon-0
index 096e5c5c4bf8..e9851c277766 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d796de3135b68c4476d2dd1126a87fa2
diff --git a/metadata/md5-cache/games-rpg/vendetta-online-bin-1.8.296-r1 b/metadata/md5-cache/games-rpg/vendetta-online-bin-1.8.296-r1
index 1fb819402b95..9c2d231451bf 100644
--- a/metadata/md5-cache/games-rpg/vendetta-online-bin-1.8.296-r1
+++ b/metadata/md5-cache/games-rpg/vendetta-online-bin-1.8.296-r1
@@ -9,5 +9,5 @@ RDEPEND=virtual/opengl x11-libs/gtk+:2
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=amd64? ( http://mirror.cle.vendetta-online.com/vendetta-linux-amd64-installer.sh -> vendetta-online-bin-1.8.296-amd64.sh ) x86? ( http://mirror.cle.vendetta-online.com/vendetta-linux-ia32-installer.sh -> vendetta-online-bin-1.8.296-x86.sh )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e8043f171156caeec0effede580b63e5
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index 00f7964e15a5..c9420690a711 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/bcs-demo-1.3-r1 b/metadata/md5-cache/games-simulation/bcs-demo-1.3-r1
index c0dcbc3aaaad..3fab09b93242 100644
--- a/metadata/md5-cache/games-simulation/bcs-demo-1.3-r1
+++ b/metadata/md5-cache/games-simulation/bcs-demo-1.3-r1
@@ -8,5 +8,5 @@ RDEPEND=media-libs/libsdl[abi_x86_32(-)] sys-libs/glibc x11-libs/libX11[abi_x86_
 RESTRICT=strip
 SLOT=0
 SRC_URI=ftp://ggdev-1.homelan.com/bcs/bcsdemo_v1_3.sh.bin http://www.highprogrammer.com/alan/pfx2/openal-alan-hack-0.0.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=54f632376d84748ea2f2658d1fe3fa73
diff --git a/metadata/md5-cache/games-simulation/slime-rancher-1.4.1c_p34605 b/metadata/md5-cache/games-simulation/slime-rancher-1.4.1c_p34605
index b6ee8292aaa8..0b4edac84574 100644
--- a/metadata/md5-cache/games-simulation/slime-rancher-1.4.1c_p34605
+++ b/metadata/md5-cache/games-simulation/slime-rancher-1.4.1c_p34605
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/glibc virtual/opengl
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=slime_rancher_1_4_1c_34605.sh
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bbba890681391a101eaede1b8ff09645
diff --git a/metadata/md5-cache/games-simulation/train-valley-1.3.31403 b/metadata/md5-cache/games-simulation/train-valley-1.3.31403
index 072035259d9d..36ca56e76d1b 100644
--- a/metadata/md5-cache/games-simulation/train-valley-1.3.31403
+++ b/metadata/md5-cache/games-simulation/train-valley-1.3.31403
@@ -9,5 +9,5 @@ RDEPEND=virtual/opengl x11-libs/libX11 x11-libs/libXrandr gui? ( dev-libs/glib:2
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=train_valley_1_3_31403.sh
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=99cc096340db6d2b530d94241a6e8c78
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 1e9d4d27d249..4b0f45e819a4 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/darwinia-1.4.0_beta9-r1 b/metadata/md5-cache/games-strategy/darwinia-1.4.0_beta9-r1
index 9a156ace430c..a18bcd488c18 100644
--- a/metadata/md5-cache/games-strategy/darwinia-1.4.0_beta9-r1
+++ b/metadata/md5-cache/games-strategy/darwinia-1.4.0_beta9-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/libstdc++-v3:5 media-libs/libsdl[abi_x86_32(-)] media-libs/libv
 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3f3ae6cb35ed23c641ac662128867280
diff --git a/metadata/md5-cache/games-strategy/darwinia-demo-1.3.0-r2 b/metadata/md5-cache/games-strategy/darwinia-demo-1.3.0-r2
index 97f562e499a1..f98d54104cc5 100644
--- a/metadata/md5-cache/games-strategy/darwinia-demo-1.3.0-r2
+++ b/metadata/md5-cache/games-strategy/darwinia-demo-1.3.0-r2
@@ -8,5 +8,5 @@ RDEPEND=media-libs/libsdl[abi_x86_32(-)] media-libs/libvorbis[abi_x86_32(-)] vir
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=http://www.introversion.co.uk/darwinia/downloads/darwinia-demo2-1.3.0.sh
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9b03f41a61430eb03655c77826e82557
diff --git a/metadata/md5-cache/games-strategy/knights-demo-1.32-r2 b/metadata/md5-cache/games-strategy/knights-demo-1.32-r2
index f2f5a45e25e0..d72181d60113 100644
--- a/metadata/md5-cache/games-strategy/knights-demo-1.32-r2
+++ b/metadata/md5-cache/games-strategy/knights-demo-1.32-r2
@@ -8,5 +8,5 @@ RDEPEND=sys-libs/glibc >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXau-
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://gentoo/knights-demo-1.32.run
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e865f9a5641587ca9e9f71ba3bfdcd37
diff --git a/metadata/md5-cache/games-strategy/lgeneral-1.4.3 b/metadata/md5-cache/games-strategy/lgeneral-1.4.3
index 81f2301429fe..68cfec7713ea 100644
--- a/metadata/md5-cache/games-strategy/lgeneral-1.4.3
+++ b/metadata/md5-cache/games-strategy/lgeneral-1.4.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/lgeneral/lgeneral-1.4.3.tar.gz mirror://sourceforge/lgeneral/pg-data.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=65947bde709eb52df735a8d52d1c72f0
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=efb0c830d0fdb44d85ef4bd208a3dbf6
diff --git a/metadata/md5-cache/games-strategy/majesty-demo-1.0.0-r1 b/metadata/md5-cache/games-strategy/majesty-demo-1.0.0-r1
index 99274bea2a9c..e4b6634b2cea 100644
--- a/metadata/md5-cache/games-strategy/majesty-demo-1.0.0-r1
+++ b/metadata/md5-cache/games-strategy/majesty-demo-1.0.0-r1
@@ -8,5 +8,5 @@ RDEPEND=sys-libs/glibc x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_3
 RESTRICT=bindist strip
 SLOT=0
 SRC_URI=http://ftp2.za.freebsd.org/pub/FreeBSD/ports/distfiles/majesty_demo.run
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9faf9b13b7e6d10bce1ac585f7b9b116
diff --git a/metadata/md5-cache/games-strategy/spaz-1.605-r1 b/metadata/md5-cache/games-strategy/spaz-1.605-r1
index 00d78c96c4c2..ceee2e669d12 100644
--- a/metadata/md5-cache/games-strategy/spaz-1.605-r1
+++ b/metadata/md5-cache/games-strategy/spaz-1.605-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/openal-1.15.1[alsa?,pulseaudio?,abi_x86_32(-)] >=media-libs
 RESTRICT=bindist fetch strip
 SLOT=0
 SRC_URI=spaz-linux-humblebundle-09182012-bin
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=5cc1765ec04feb713d931e41b45b2313
diff --git a/metadata/md5-cache/games-strategy/warzone2100-3.2.3 b/metadata/md5-cache/games-strategy/warzone2100-3.2.3
index 7e2a7f4af689..e17252b85c1f 100644
--- a/metadata/md5-cache/games-strategy/warzone2100-3.2.3
+++ b/metadata/md5-cache/games-strategy/warzone2100-3.2.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare
 DEPEND=>=dev-games/physfs-2[zip] dev-libs/openssl:0= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 media-libs/freetype:2 media-libs/glew:= media-libs/harfbuzz media-libs/libogg media-libs/libpng:0 media-libs/libtheora media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXrandr nls? ( virtual/libintl ) !sdl? ( dev-qt/qtopengl:5 dev-qt/qtx11extras:5 ) sdl? ( media-libs/libsdl2[opengl,video,X] ) app-arch/zip dev-libs/fribidi media-libs/fontconfig 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=3D real-time strategy game
 EAPI=6
-HOMEPAGE=http://wz2100.net/
+HOMEPAGE=https://wz2100.net/
 IUSE=debug nls sdl videos
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ CC-BY-SA-3.0 public-domain
@@ -10,4 +10,4 @@ RDEPEND=>=dev-games/physfs-2[zip] dev-libs/openssl:0= dev-qt/qtcore:5 dev-qt/qtg
 SLOT=0
 SRC_URI=mirror://sourceforge/warzone2100/warzone2100-3.2.3.tar.xz videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/2.2/high-quality-en/sequences.wz -> warzone2100-videos-2.2.wz ) https://github.com/Warzone2100/warzone2100/commit/ef37bca38289f4f79c6533acd93ed326858a3f68.patch -> warzone2100-3.2.3-qt_compile_fix.patch
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3b0c81c91bf4e90fb10d2ed2b52dd8a7
+_md5_=a38fc0b58ba9bf91e10faa05f860b696
diff --git a/metadata/md5-cache/games-strategy/warzone2100-3.3.0 b/metadata/md5-cache/games-strategy/warzone2100-3.3.0
index f9b066959d2c..be4c415a7053 100644
--- a/metadata/md5-cache/games-strategy/warzone2100-3.3.0
+++ b/metadata/md5-cache/games-strategy/warzone2100-3.3.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare
 DEPEND=>=dev-games/physfs-2[zip] dev-libs/openssl:0= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/freetype:2 media-libs/glew:= media-libs/harfbuzz media-libs/libogg media-libs/libpng:0 media-libs/libsdl2[opengl,video,X] media-libs/libtheora media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXrandr nls? ( virtual/libintl ) app-text/asciidoc dev-libs/fribidi media-libs/fontconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=3D real-time strategy game
 EAPI=7
-HOMEPAGE=http://wz2100.net/
+HOMEPAGE=https://wz2100.net/
 IUSE=debug nls videos
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ CC-BY-SA-3.0 public-domain
@@ -11,4 +11,4 @@ RDEPEND=>=dev-games/physfs-2[zip] dev-libs/openssl:0= dev-qt/qtcore:5 dev-qt/qtg
 SLOT=0
 SRC_URI=mirror://sourceforge/warzone2100/warzone2100-3.3.0_src.tar.xz videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/2.2/high-quality-en/sequences.wz -> warzone2100-videos-2.2.wz )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cea1f958a419a835ccabe82e39c423fa
+_md5_=d2293da6344e801db069f58b22760a25
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index 368f4d381804..54ed7d7631eb 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/acc-1.57 b/metadata/md5-cache/games-util/acc-1.57
new file mode 100644
index 000000000000..d2d40bc25838
--- /dev/null
+++ b/metadata/md5-cache/games-util/acc-1.57
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=ACS script compiler for use with ZDoom and Hexen
+EAPI=7
+HOMEPAGE=https://zdoom.org/wiki/ACC
+KEYWORDS=~amd64
+LICENSE=Activision
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://github.com/rheit/acc/archive/1.57.tar.gz -> acc-1.57.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=de2beb7aa963e52e39a93a805688d46d
diff --git a/metadata/md5-cache/games-util/loki_patch-20091105 b/metadata/md5-cache/games-util/loki_patch-20091105
index 68709de8365c..c03eb3415837 100644
--- a/metadata/md5-cache/games-util/loki_patch-20091105
+++ b/metadata/md5-cache/games-util/loki_patch-20091105
@@ -1,12 +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=compile configure install prepare
-DEPEND=dev-util/xdelta:0 dev-libs/libxml2 dev-libs/glib: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
+DEPEND=dev-util/xdelta:0 dev-libs/libxml2 dev-libs/glib:2
 DESCRIPTION=Loki Software binary patch tool
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.icculus.org/loki_setup/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-util/xdelta:0 dev-libs/libxml2 dev-libs/glib:2
 SLOT=0
 SRC_URI=mirror://gentoo/loki_patch-20091105.tar.bz2 mirror://gentoo/loki_setupdb-20091105.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1d4db28fc08d1336e9c864d1efa57c4a
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b0862a7768918aa863033a98eb8c94be
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 dfd40ad1705b..b04620ec5437 100644
--- a/metadata/md5-cache/games-util/xboxdrv-0.8.8_p20190118
+++ b/metadata/md5-cache/games-util/xboxdrv-0.8.8_p20190118
@@ -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	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=5276ca6e4e6fe1c2b1414bcad75067ba
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 483496d3c1af..ac020e3f29a3 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/gnome-desktop-3.34.7 b/metadata/md5-cache/gnome-base/gnome-desktop-3.34.7
index 5ab9563c1474..12a2524dbddd 100644
--- a/metadata/md5-cache/gnome-base/gnome-desktop-3.34.7
+++ b/metadata/md5-cache/gnome-base/gnome-desktop-3.34.7
@@ -5,11 +5,11 @@ DESCRIPTION=Library with common API for various GNOME modules
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-desktop/
 IUSE=debug gtk-doc +introspection seccomp systemd udev test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+ FDL-1.1+
 RDEPEND=>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] >=dev-libs/glib-2.53.0:2 >=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?] x11-misc/xkeyboard-config app-text/iso-codes x11-libs/libX11 systemd? ( sys-apps/systemd:= ) udev? ( sys-apps/hwids virtual/libudev:= ) seccomp? ( sys-libs/libseccomp ) x11-libs/cairo:=[X] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) seccomp? ( sys-apps/bubblewrap )
 RESTRICT=!test? ( test )
 SLOT=3/18
 SRC_URI=mirror://gnome/sources/gnome-desktop/3.34/gnome-desktop-3.34.7.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e3df17dd1b97179921784a51c5239f16
+_md5_=10cfbbbe78f5ef30728d7868166a66fa
diff --git a/metadata/md5-cache/gnome-base/nautilus-3.34.3 b/metadata/md5-cache/gnome-base/nautilus-3.34.3
index 3be1fec0adc6..86e4712e0fff 100644
--- a/metadata/md5-cache/gnome-base/nautilus-3.34.3
+++ b/metadata/md5-cache/gnome-base/nautilus-3.34.3
@@ -5,7 +5,7 @@ DESCRIPTION=Default file manager for the GNOME desktop
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Nautilus
 IUSE=gnome +gstreamer gtk-doc +introspection +previewer selinux sendto test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+ LGPL-2.1+
 PDEPEND=gnome? ( x11-themes/adwaita-icon-theme ) previewer? ( >=gnome-extra/sushi-0.1.9 ) sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) >=gnome-base/gvfs-1.14[gtk(+)]
 RDEPEND=>=dev-libs/glib-2.58.1:2 >=media-libs/gexiv2-0.10.0 gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) >=app-arch/gnome-autoar-0.2.1 >=gnome-base/gnome-desktop-3.0.0:3= >=x11-libs/gtk+-3.22.27:3[X,introspection?] >=x11-libs/pango-1.28.3 selinux? ( >=sys-libs/libselinux-2.0 ) >=app-misc/tracker-2.0:= x11-libs/libX11 >=dev-libs/libxml2-2.7.8:2 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 ) gstreamer? ( !<media-video/totem-3.31.91[nautilus] ) >=app-misc/tracker-miners-2.0:=
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/nautilus/3.34/nautilus-3.34.3.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=02803cd29d7e958b411e0c10d23a3978
+_md5_=f501647aeaa72889874bd6bfd604f001
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index b4ddbd16c47a..5d59f17200ab 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/evolution-data-server-3.36.3 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.36.3
index 08f98fe87bcf..a485100b842a 100644
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-3.36.3
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.36.3
@@ -4,7 +4,7 @@ DESCRIPTION=Evolution groupware backend
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
 IUSE=berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=|| ( LGPL-2 LGPL-3 ) BSD Sleepycat
 RDEPEND=>=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.8:=[glib,introspection?] >=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= )
 REQUIRED_USE=vala? ( introspection )
@@ -12,4 +12,4 @@ RESTRICT=test !test? ( test )
 SLOT=0/62-24-20
 SRC_URI=mirror://gnome/sources/evolution-data-server/3.36/evolution-data-server-3.36.3.tar.xz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=295f6f784acdfc13a20da9df03048172
+_md5_=438530324aba159349a300ce420c1a33
diff --git a/metadata/md5-cache/gnome-extra/evolution-ews-3.36.3 b/metadata/md5-cache/gnome-extra/evolution-ews-3.36.3
index 975a1733adbd..d61e8596e397 100644
--- a/metadata/md5-cache/gnome-extra/evolution-ews-3.36.3
+++ b/metadata/md5-cache/gnome-extra/evolution-ews-3.36.3
@@ -4,11 +4,11 @@ DESCRIPTION=Evolution module for connecting to Microsoft Exchange Web Services
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.46:2 >=dev-libs/libical-3.0.5:0=[introspection(-)] >=dev-libs/libmspack-0.4 dev-libs/libxml2:2 >=gnome-extra/evolution-data-server-3.36.3:0= >=mail-client/evolution-3.36.3:2.0 >=net-libs/libsoup-2.58:2.4 >=x11-libs/gtk+-3.10:3
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/evolution-ews/3.36/evolution-ews-3.36.3.tar.xz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6806187c0f62b2bcd0418d10469c7640
+_md5_=e389908b8018d533b72a6d98274369bf
diff --git a/metadata/md5-cache/gnome-extra/filemanager-actions-3.2.4 b/metadata/md5-cache/gnome-extra/filemanager-actions-3.2.4
new file mode 100644
index 000000000000..3706930d15d9
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/filemanager-actions-3.2.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/glib-2.30:2 >=dev-libs/libxml2-2.6:2 dev-libs/libunique:3 >=gnome-base/libgtop-2.23.1:2 >=gnome-base/nautilus-3 sys-apps/util-linux x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libICE >=x11-libs/libSM-1 !gnome-extra/nautilus-actions:2 dev-util/gdbus-codegen >=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=Configures programs to be launched when files are selected in Nautilus
+EAPI=5
+HOMEPAGE=http://www.nautilus-actions.org/ https://git.gnome.org/browse/nautilus-actions/
+KEYWORDS=amd64 x86
+LICENSE=GPL-2 FDL-1.3
+RDEPEND=>=dev-libs/glib-2.30:2 >=dev-libs/libxml2-2.6:2 dev-libs/libunique:3 >=gnome-base/libgtop-2.23.1:2 >=gnome-base/nautilus-3 sys-apps/util-linux x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libICE >=x11-libs/libSM-1 !gnome-extra/nautilus-actions:2
+SLOT=3
+SRC_URI=mirror://gnome/sources/nautilus-actions/3.2/nautilus-actions-3.2.4.tar.xz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0129603645f000babe73c347cda22c5f
diff --git a/metadata/md5-cache/gnome-extra/filemanager-actions-3.4 b/metadata/md5-cache/gnome-extra/filemanager-actions-3.4
new file mode 100644
index 000000000000..4c95a9120176
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/filemanager-actions-3.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=x11-libs/gtk+-3.4.1:3 >=dev-libs/glib-2.32.1:2 >=gnome-base/libgtop-2.28.4:2 >=dev-libs/libxml2-2.7.8:2 sys-apps/util-linux nautilus? ( >=gnome-base/nautilus-3.4.1 ) nemo? ( >=gnome-extra/nemo-1.8 ) caja? ( >=mate-base/caja-1.16.0 ) x11-libs/gdk-pixbuf:2 dev-util/gdbus-codegen >=dev-util/intltool-0.50.2 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=File manager extension which offers user configurable context menu actions
+EAPI=6
+HOMEPAGE=https://gitlab.gnome.org/GNOME/filemanager-actions
+IUSE=caja +nautilus nemo
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ FDL-1.3
+RDEPEND=>=x11-libs/gtk+-3.4.1:3 >=dev-libs/glib-2.32.1:2 >=gnome-base/libgtop-2.28.4:2 >=dev-libs/libxml2-2.7.8:2 sys-apps/util-linux nautilus? ( >=gnome-base/nautilus-3.4.1 ) nemo? ( >=gnome-extra/nemo-1.8 ) caja? ( >=mate-base/caja-1.16.0 ) x11-libs/gdk-pixbuf:2
+REQUIRED_USE=|| ( caja nautilus nemo )
+SLOT=3
+SRC_URI=mirror://gnome/sources/filemanager-actions/3.4/filemanager-actions-3.4.tar.xz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=59dabdfa486441fe7c1da976bc324c59
diff --git a/metadata/md5-cache/gnome-extra/gnome-boxes-3.34.4 b/metadata/md5-cache/gnome-extra/gnome-boxes-3.34.4
index 11b717607410..f09344994753 100644
--- a/metadata/md5-cache/gnome-extra/gnome-boxes-3.34.4
+++ b/metadata/md5-cache/gnome-extra/gnome-boxes-3.34.4
@@ -10,5 +10,5 @@ LICENSE=LGPL-2+ CC-BY-2.0
 RDEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.22.20:3 >=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)] >=sys-libs/libosinfo-1.4.0 app-crypt/libsecret >=net-libs/libsoup-2.44:2.4 virtual/libusb:1 >=app-emulation/libvirt-glib-2.0.0 >=dev-libs/libxml2-2.7.8:2 >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir] app-misc/tracker:0/2.0 >=x11-libs/vte-0.40.2:2.91 net-libs/webkit-gtk:4 >=dev-libs/gobject-introspection-1.56:= >=dev-libs/libgudev-165:= rdp? ( net-misc/freerdp:= ) >=app-misc/tracker-miners-2[iso] app-emulation/spice[smartcard] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/qemu-1.3.1[spice,smartcard,usbredir] sys-fs/mtools virtual/cdrtools sys-auth/polkit
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-boxes/3.34/gnome-boxes-3.34.4.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=95036959a155a45eae21249217755aa8
diff --git a/metadata/md5-cache/gnome-extra/gnome-characters-3.34.0 b/metadata/md5-cache/gnome-extra/gnome-characters-3.34.0
index 764ec929b3a1..e8e29b5b5c6c 100644
--- a/metadata/md5-cache/gnome-extra/gnome-characters-3.34.0
+++ b/metadata/md5-cache/gnome-extra/gnome-characters-3.34.0
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/gjs-1.50 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspecti
 DESCRIPTION=Unicode character map viewer and library
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Design/Apps/CharacterMap
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 x86
 LICENSE=GPL-2+ BSD
 RDEPEND=>=dev-libs/gjs-1.50 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libunistring-0.9.5 >=x11-libs/gtk+-3.20:3[introspection] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.36[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-characters/3.34/gnome-characters-3.34.0.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=610728f57cc77a503072da22aa0bd5e7
+_md5_=4829494b400b58fd6726c8e2a943509e
diff --git a/metadata/md5-cache/gnome-extra/gnome-commander-1.10.3 b/metadata/md5-cache/gnome-extra/gnome-commander-1.10.3
index d1ef2539bf68..9a9e8d64907d 100644
--- a/metadata/md5-cache/gnome-extra/gnome-commander-1.10.3
+++ b/metadata/md5-cache/gnome-extra/gnome-commander-1.10.3
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-commander/1.10/gnome-commander-1.10.3.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=74adff5474eb1c764adc4ea03d9822b7
+_md5_=85952cf10f525511e5979423648ba316
diff --git a/metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.34.2 b/metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.34.2
index 5c43ca8fe5e9..ff9f2193c7b8 100644
--- a/metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.34.2
+++ b/metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.34.2
@@ -3,11 +3,11 @@ DEPEND=dev-util/itstool >=app-portage/elt-patches-20170815 app-arch/xz-utils dev
 DESCRIPTION=Help a new user get started in GNOME
 EAPI=6
 HOMEPAGE=https://help.gnome.org/
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm x86
 LICENSE=CC-BY-SA-3.0
 RDEPEND=gnome-extra/gnome-user-docs
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-getting-started-docs/3.34/gnome-getting-started-docs-3.34.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2379d44d6bcff7aae1d651ca1a617fa2
+_md5_=79aeec7953b4f3f5bb11c09134be3370
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-topicons-plus-27 b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-topicons-plus-27
index 5205d2f34401..0ac5fe8049b7 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-topicons-plus-27
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-topicons-plus-27
@@ -3,9 +3,9 @@ DEPEND=dev-libs/glib:2
 DESCRIPTION=Moves legacy tray icons to top panel
 EAPI=7
 HOMEPAGE=https://extensions.gnome.org/extension/1031/topicons/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.34
 SLOT=0
 SRC_URI=https://github.com/phocean/TopIcons-plus/archive/27.tar.gz -> gnome-shell-extensions-topicons-plus-27.tar.gz
-_md5_=88e4c32b9444a8a4352c234df47d523f
+_md5_=ea6673a659d0e55dc5216920132ca00f
diff --git a/metadata/md5-cache/gnome-extra/gnome-user-docs-3.34.2 b/metadata/md5-cache/gnome-extra/gnome-user-docs-3.34.2
index 6ba4b4d5b722..4ca6029e7aaf 100644
--- a/metadata/md5-cache/gnome-extra/gnome-user-docs-3.34.2
+++ b/metadata/md5-cache/gnome-extra/gnome-user-docs-3.34.2
@@ -4,10 +4,10 @@ DESCRIPTION=GNOME end user documentation
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gnome-user-docs
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=CC-BY-3.0
 RESTRICT=binchecks strip !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-user-docs/3.34/gnome-user-docs-3.34.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=076fcaaf3f2813e0e0d8946b96abc7db
+_md5_=5cd80ff9d25e048b82433ddc7d6cba6f
diff --git a/metadata/md5-cache/gnome-extra/nautilus-actions-3.2.4 b/metadata/md5-cache/gnome-extra/nautilus-actions-3.2.4
deleted file mode 100644
index 7fe3428f0839..000000000000
--- a/metadata/md5-cache/gnome-extra/nautilus-actions-3.2.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.30:2 >=dev-libs/libxml2-2.6:2 dev-libs/libunique:3 >=gnome-base/libgtop-2.23.1:2 >=gnome-base/nautilus-3 sys-apps/util-linux x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libICE >=x11-libs/libSM-1 !gnome-extra/nautilus-actions:2 dev-util/gdbus-codegen >=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=Configures programs to be launched when files are selected in Nautilus
-EAPI=5
-HOMEPAGE=http://www.nautilus-actions.org/ https://git.gnome.org/browse/nautilus-actions/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 FDL-1.3
-RDEPEND=>=dev-libs/glib-2.30:2 >=dev-libs/libxml2-2.6:2 dev-libs/libunique:3 >=gnome-base/libgtop-2.23.1:2 >=gnome-base/nautilus-3 sys-apps/util-linux x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libICE >=x11-libs/libSM-1 !gnome-extra/nautilus-actions:2
-SLOT=3
-SRC_URI=mirror://gnome/sources/nautilus-actions/3.2/nautilus-actions-3.2.4.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=38d6672623cba7bff0004028c5b3586f
diff --git a/metadata/md5-cache/gnome-extra/nm-applet-1.18.0 b/metadata/md5-cache/gnome-extra/nm-applet-1.18.0
new file mode 100644
index 000000000000..07aef744feca
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/nm-applet-1.18.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-libs/libxml2 >=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 test
+DEPEND=>=dev-libs/glib-2.38:2 >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.8.27 >=x11-libs/gtk+-3.10:3 >=dev-libs/libgudev-147:= >=x11-libs/libnotify-0.7.0 >=net-misc/networkmanager-1.16:=[modemmanager?,teamd?] appindicator? ( dev-libs/libappindicator:3 >=dev-libs/libdbusmenu-16.04.0 ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7 ) virtual/freedesktop-icon-theme dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=NetworkManager connection editor and applet
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=appindicator modemmanager selinux teamd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.38:2 >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.8.27 >=x11-libs/gtk+-3.10:3 >=dev-libs/libgudev-147:= >=x11-libs/libnotify-0.7.0 >=net-misc/networkmanager-1.16:=[modemmanager?,teamd?] appindicator? ( dev-libs/libappindicator:3 >=dev-libs/libdbusmenu-16.04.0 ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7 ) virtual/freedesktop-icon-theme
+SLOT=0
+SRC_URI=mirror://gnome/sources/network-manager-applet/1.18/network-manager-applet-1.18.0.tar.xz
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7ffc6bc75ec8d28beedcc34d716f5298
diff --git a/metadata/md5-cache/gnustep-apps/Manifest.gz b/metadata/md5-cache/gnustep-apps/Manifest.gz
index 8325b27187a1..b65f8c71f9c6 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/aclock-0.4.0-r1 b/metadata/md5-cache/gnustep-apps/aclock-0.4.0-r1
new file mode 100644
index 000000000000..63ca50214ad6
--- /dev/null
+++ b/metadata/md5-cache/gnustep-apps/aclock-0.4.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Analog dockapp clock for GNUstep
+EAPI=7
+HOMEPAGE=http://gap.nongnu.org/aclock/
+IUSE=debug doc
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/AClock-0.4.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnustep-2	ee5949e86bfb23d662a64e952ecbb07a	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=aff336445b0455485b088329a8ab729c
diff --git a/metadata/md5-cache/gnustep-apps/addresses-0.4.8-r1 b/metadata/md5-cache/gnustep-apps/addresses-0.4.8-r1
new file mode 100644
index 000000000000..0bb89d48d8e0
--- /dev/null
+++ b/metadata/md5-cache/gnustep-apps/addresses-0.4.8-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Apple Addressbook work alike (standalone and for GNUMail)
+EAPI=7
+HOMEPAGE=http://gap.nongnu.org/addresses/
+IUSE=debug doc
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/Addresses-0.4.8.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnustep-2	ee5949e86bfb23d662a64e952ecbb07a	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b0c45e37b341d298c67fa4c4447e8cbf
diff --git a/metadata/md5-cache/gnustep-apps/gmines-0.2-r1 b/metadata/md5-cache/gnustep-apps/gmines-0.2-r1
new file mode 100644
index 000000000000..b245e1d8d952
--- /dev/null
+++ b/metadata/md5-cache/gnustep-apps/gmines-0.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=The well-known minesweeper game
+EAPI=7
+HOMEPAGE=http://gap.nongnu.org/gmines/index.html
+IUSE=debug doc
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/GMines-0.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnustep-2	ee5949e86bfb23d662a64e952ecbb07a	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=42dca871088e20d0da31c1476d7c9ef1
diff --git a/metadata/md5-cache/gnustep-apps/gspdf-0.5 b/metadata/md5-cache/gnustep-apps/gspdf-0.5
index 7a2807beb305..965c2ed8c322 100644
--- a/metadata/md5-cache/gnustep-apps/gspdf-0.5
+++ b/metadata/md5-cache/gnustep-apps/gspdf-0.5
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
 DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 DESCRIPTION=Postscript and Pdf Viewer using GhostScript
-EAPI=4
+EAPI=7
 HOMEPAGE=http://gap.nongnu.org/gspdf/index.html
 IUSE=debug doc
 KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
+LICENSE=GPL-2+
 RDEPEND=app-text/ghostscript-gpl >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/gap/GSPdf-0.5.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnustep-2	ee5949e86bfb23d662a64e952ecbb07a	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=746179c6241cd084aa4154ed2c4e78ba
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnustep-2	ee5949e86bfb23d662a64e952ecbb07a	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1eb853e67017db4b524993cfba8a1d76
diff --git a/metadata/md5-cache/gnustep-apps/lapispuzzle-1.2 b/metadata/md5-cache/gnustep-apps/lapispuzzle-1.2
index acd7ff057727..36a06b2cf196 100644
--- a/metadata/md5-cache/gnustep-apps/lapispuzzle-1.2
+++ b/metadata/md5-cache/gnustep-apps/lapispuzzle-1.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
 DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 DESCRIPTION=a Tetris-like game where each player is effected by the others game play
-EAPI=4
+EAPI=7
 HOMEPAGE=http://gap.nongnu.org/lapispuzzle/
 IUSE=debug doc
 KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
+LICENSE=GPL-2+
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/gap/LapisPuzzle-1.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnustep-2	ee5949e86bfb23d662a64e952ecbb07a	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1991d2f8451ffb820a6dda7db52c3180
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnustep-2	ee5949e86bfb23d662a64e952ecbb07a	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=cd6eba968bda445c85c3e1737e127fb8
diff --git a/metadata/md5-cache/gnustep-apps/laternamagica-0.4 b/metadata/md5-cache/gnustep-apps/laternamagica-0.4
deleted file mode 100644
index 502494cbe293..000000000000
--- a/metadata/md5-cache/gnustep-apps/laternamagica-0.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
-DESCRIPTION=an image viewer and slideshow application
-EAPI=4
-HOMEPAGE=http://gap.nongnu.org/laternamagica/index.html
-IUSE=debug doc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
-SLOT=0
-SRC_URI=https://savannah.nongnu.org/download/gap/LaternaMagica-0.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnustep-2	ee5949e86bfb23d662a64e952ecbb07a	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=659b06e4d7922f8c59539f68a677ba91
diff --git a/metadata/md5-cache/gnustep-apps/laternamagica-0.5 b/metadata/md5-cache/gnustep-apps/laternamagica-0.5
index c982cf609ca1..fabc176471e4 100644
--- a/metadata/md5-cache/gnustep-apps/laternamagica-0.5
+++ b/metadata/md5-cache/gnustep-apps/laternamagica-0.5
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
 DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 DESCRIPTION=an image viewer and slideshow application
-EAPI=6
+EAPI=7
 HOMEPAGE=http://gap.nongnu.org/laternamagica/index.html
 IUSE=debug doc
 KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
+LICENSE=GPL-2+
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/gap/LaternaMagica-0.5.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnustep-2	ee5949e86bfb23d662a64e952ecbb07a	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7385cad54ddcb0b8043dad9e1ae4efc7
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnustep-2	ee5949e86bfb23d662a64e952ecbb07a	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0d05741c6b1cd614302128703660a23d
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index c292ec391234..f7d6da34b576 100644
--- a/metadata/md5-cache/gui-libs/Manifest.gz
+++ b/metadata/md5-cache/gui-libs/Manifest.gz
diff --git a/metadata/md5-cache/gui-libs/wf-config-0.4.0-r1 b/metadata/md5-cache/gui-libs/wf-config-0.4.0-r1
deleted file mode 100644
index 976f751e6ef2..000000000000
--- a/metadata/md5-cache/gui-libs/wf-config-0.4.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-libs/libevdev dev-libs/libxml2 ~gui-libs/wlroots-0.10.1 media-libs/glm dev-libs/wayland-protocols virtual/pkgconfig >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/libevdev dev-libs/libxml2 ~gui-libs/wlroots-0.10.1 media-libs/glm
-DESCRIPTION=library for managing wayfire configuration files
-EAPI=7
-HOMEPAGE=https://github.com/WayfireWM/wf-config
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/libevdev dev-libs/libxml2 ~gui-libs/wlroots-0.10.1 media-libs/glm
-SLOT=0
-SRC_URI=https://github.com/WayfireWM/wf-config/releases/download/0.4.0/wf-config-0.4.0.tar.xz
-_eclasses_=meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f327b4bd3b6e74a6efe5df1e46143119
diff --git a/metadata/md5-cache/gui-libs/wf-config-0.4.1 b/metadata/md5-cache/gui-libs/wf-config-0.4.1
new file mode 100644
index 000000000000..f37981afff6c
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/wf-config-0.4.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-libs/libevdev dev-libs/libxml2 ~gui-libs/wlroots-0.10.1 media-libs/glm dev-libs/wayland-protocols virtual/pkgconfig >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install test
+DEPEND=dev-libs/libevdev dev-libs/libxml2 ~gui-libs/wlroots-0.10.1 media-libs/glm
+DESCRIPTION=library for managing wayfire configuration files
+EAPI=7
+HOMEPAGE=https://github.com/WayfireWM/wf-config
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/libevdev dev-libs/libxml2 ~gui-libs/wlroots-0.10.1 media-libs/glm
+SLOT=0
+SRC_URI=https://github.com/WayfireWM/wf-config/releases/download/0.4.1/wf-config-0.4.1.tar.xz
+_eclasses_=meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f327b4bd3b6e74a6efe5df1e46143119
diff --git a/metadata/md5-cache/gui-wm/Manifest.gz b/metadata/md5-cache/gui-wm/Manifest.gz
index feb1d1c6e2c1..d8c39846b0b7 100644
--- a/metadata/md5-cache/gui-wm/Manifest.gz
+++ b/metadata/md5-cache/gui-wm/Manifest.gz
diff --git a/metadata/md5-cache/gui-wm/hikari-2.0.1-r1 b/metadata/md5-cache/gui-wm/hikari-2.0.1-r1
deleted file mode 100644
index 63fbfe1f90c5..000000000000
--- a/metadata/md5-cache/gui-wm/hikari-2.0.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-libs/glib dev-libs/libinput:= dev-libs/libucl gui-libs/wlroots media-libs/libglvnd x11-libs/cairo:=[X,svg] x11-libs/pango:=[X] x11-libs/pixman x11-libs/libxkbcommon:=[X] sys-libs/pam virtual/pkgconfig dev-libs/wayland-protocols man? ( app-text/pandoc )
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/glib dev-libs/libinput:= dev-libs/libucl gui-libs/wlroots media-libs/libglvnd x11-libs/cairo:=[X,svg] x11-libs/pango:=[X] x11-libs/pixman x11-libs/libxkbcommon:=[X] sys-libs/pam
-DESCRIPTION=wayland compositor inspired by CWM
-EAPI=7
-HOMEPAGE=https://hikari.acmelabs.space/
-IUSE=gamma layershell +man screencopy +X
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/glib dev-libs/libinput:= dev-libs/libucl gui-libs/wlroots media-libs/libglvnd x11-libs/cairo:=[X,svg] x11-libs/pango:=[X] x11-libs/pixman x11-libs/libxkbcommon:=[X] sys-libs/pam x11-misc/xkeyboard-config
-SLOT=0
-SRC_URI=https://hikari.acmelabs.space/releases/hikari-2.0.1.tar.gz
-_md5_=70bee341fb86d7f991e57bbbb0547659
diff --git a/metadata/md5-cache/gui-wm/hikari-2.0.2 b/metadata/md5-cache/gui-wm/hikari-2.0.2
new file mode 100644
index 000000000000..28c9fd161bc1
--- /dev/null
+++ b/metadata/md5-cache/gui-wm/hikari-2.0.2
@@ -0,0 +1,13 @@
+BDEPEND=dev-libs/glib dev-libs/libinput:= dev-libs/libucl gui-libs/wlroots media-libs/libglvnd x11-libs/cairo:=[X,svg] x11-libs/pango:=[X] x11-libs/pixman x11-libs/libxkbcommon:=[X] sys-libs/pam virtual/pkgconfig dev-libs/wayland-protocols man? ( app-text/pandoc )
+DEFINED_PHASES=compile install
+DEPEND=dev-libs/glib dev-libs/libinput:= dev-libs/libucl gui-libs/wlroots media-libs/libglvnd x11-libs/cairo:=[X,svg] x11-libs/pango:=[X] x11-libs/pixman x11-libs/libxkbcommon:=[X] sys-libs/pam
+DESCRIPTION=wayland compositor inspired by CWM
+EAPI=7
+HOMEPAGE=https://hikari.acmelabs.space/
+IUSE=gamma layershell +man screencopy +X
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/glib dev-libs/libinput:= dev-libs/libucl gui-libs/wlroots media-libs/libglvnd x11-libs/cairo:=[X,svg] x11-libs/pango:=[X] x11-libs/pixman x11-libs/libxkbcommon:=[X] sys-libs/pam x11-misc/xkeyboard-config
+SLOT=0
+SRC_URI=https://hikari.acmelabs.space/releases/hikari-2.0.2.tar.gz
+_md5_=017684026a26754d0bdec006732fc65d
diff --git a/metadata/md5-cache/gui-wm/sway-1.5_rc1 b/metadata/md5-cache/gui-wm/sway-1.5_rc1
new file mode 100644
index 000000000000..382a5b2a552a
--- /dev/null
+++ b/metadata/md5-cache/gui-wm/sway-1.5_rc1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-libs/wayland-protocols-1.14 virtual/pkgconfig man? ( >=app-text/scdoc-1.9.3 ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=>=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd] elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239 ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) ~gui-libs/wlroots-9999:=[elogind=,systemd=,X=]
+DESCRIPTION=i3-compatible Wayland window manager
+EAPI=7
+HOMEPAGE=https://swaywm.org
+IUSE=elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd tray wallpapers X zsh-completion
+LICENSE=MIT
+RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd] elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239 ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) ~gui-libs/wlroots-9999:=[elogind=,systemd=,X=]
+REQUIRED_USE=?? ( elogind systemd ) tray? ( || ( elogind systemd ) )
+SLOT=0
+SRC_URI=https://github.com/swaywm/sway/archive/1.5-rc1.tar.gz -> sway-1.5_rc1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8d82c68f69d80711f379628e77899809
diff --git a/metadata/md5-cache/gui-wm/sway-9999 b/metadata/md5-cache/gui-wm/sway-9999
index 47729d4af167..d23efcd0f54e 100644
--- a/metadata/md5-cache/gui-wm/sway-9999
+++ b/metadata/md5-cache/gui-wm/sway-9999
@@ -1,14 +1,14 @@
 BDEPEND=>=dev-libs/wayland-protocols-1.14 virtual/pkgconfig man? ( ~app-text/scdoc-9999 ) >=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 postinst preinst prepare test unpack
-DEPEND=>=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2] elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239 ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) ~gui-libs/wlroots-9999:=[elogind=,systemd=,X=]
+DEPEND=>=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd] elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239 ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) ~gui-libs/wlroots-9999:=[elogind=,systemd=,X=]
 DESCRIPTION=i3-compatible Wayland window manager
 EAPI=7
 HOMEPAGE=https://swaywm.org
 IUSE=elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd tray wallpapers X zsh-completion
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2] elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239 ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) ~gui-libs/wlroots-9999:=[elogind=,systemd=,X=]
+RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd] elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239 ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) ~gui-libs/wlroots-9999:=[elogind=,systemd=,X=]
 REQUIRED_USE=?? ( elogind systemd ) tray? ( || ( elogind systemd ) )
 SLOT=0
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9da9d36cb4951a30dd14ab60ae4d7d73
+_md5_=2b8e82102efff61875b552ac2787f008
diff --git a/metadata/md5-cache/gui-wm/wayfire-0.4.0-r1 b/metadata/md5-cache/gui-wm/wayfire-0.4.0-r1
deleted file mode 100644
index 879295431c87..000000000000
--- a/metadata/md5-cache/gui-wm/wayfire-0.4.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/libevdev dev-libs/libinput gui-libs/gtk-layer-shell media-libs/glm media-libs/mesa:=[gles2,wayland,X] media-libs/libjpeg-turbo media-libs/libpng media-libs/freetype:=[X] x11-libs/libdrm x11-libs/gtk+:3=[wayland,X] x11-libs/cairo:=[X,svg] x11-libs/libxkbcommon:=[X] x11-libs/pixman gles? ( media-libs/libglvnd[X] ) system-wfconfig? ( ~gui-libs/wf-config-0.4.0 ) !system-wfconfig? ( !gui-libs/wf-config ) system-wlroots? ( ~gui-libs/wlroots-0.10.1[elogind=,systemd=,X] ) !system-wlroots? ( !gui-libs/wlroots ) virtual/pkgconfig >=dev-libs/wayland-protocols-1.18 >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
-DEFINED_PHASES=compile configure install postinst test
-DEPEND=dev-libs/libevdev dev-libs/libinput gui-libs/gtk-layer-shell media-libs/glm media-libs/mesa:=[gles2,wayland,X] media-libs/libjpeg-turbo media-libs/libpng media-libs/freetype:=[X] x11-libs/libdrm x11-libs/gtk+:3=[wayland,X] x11-libs/cairo:=[X,svg] x11-libs/libxkbcommon:=[X] x11-libs/pixman gles? ( media-libs/libglvnd[X] ) system-wfconfig? ( ~gui-libs/wf-config-0.4.0 ) !system-wfconfig? ( !gui-libs/wf-config ) system-wlroots? ( ~gui-libs/wlroots-0.10.1[elogind=,systemd=,X] ) !system-wlroots? ( !gui-libs/wlroots )
-DESCRIPTION=compiz like 3D wayland compositor
-EAPI=7
-HOMEPAGE=https://github.com/WayfireWM/wayfire
-IUSE=+gles +system-wfconfig +system-wlroots elogind systemd
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/libevdev dev-libs/libinput gui-libs/gtk-layer-shell media-libs/glm media-libs/mesa:=[gles2,wayland,X] media-libs/libjpeg-turbo media-libs/libpng media-libs/freetype:=[X] x11-libs/libdrm x11-libs/gtk+:3=[wayland,X] x11-libs/cairo:=[X,svg] x11-libs/libxkbcommon:=[X] x11-libs/pixman gles? ( media-libs/libglvnd[X] ) system-wfconfig? ( ~gui-libs/wf-config-0.4.0 ) !system-wfconfig? ( !gui-libs/wf-config ) system-wlroots? ( ~gui-libs/wlroots-0.10.1[elogind=,systemd=,X] ) !system-wlroots? ( !gui-libs/wlroots ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) x11-misc/xkeyboard-config
-REQUIRED_USE=?? ( elogind systemd )
-SLOT=0
-SRC_URI=https://github.com/WayfireWM/wayfire/releases/download/0.4.0/wayfire-0.4.0.tar.xz
-_eclasses_=meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=458e478abeeb23fa024ebe64d88c58de
diff --git a/metadata/md5-cache/gui-wm/wayfire-0.4.0-r2 b/metadata/md5-cache/gui-wm/wayfire-0.4.0-r2
new file mode 100644
index 000000000000..4fa6d97cb406
--- /dev/null
+++ b/metadata/md5-cache/gui-wm/wayfire-0.4.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libevdev dev-libs/libinput gui-libs/gtk-layer-shell media-libs/glm media-libs/mesa:=[gles2,wayland,X] media-libs/libjpeg-turbo media-libs/libpng media-libs/freetype:=[X] x11-libs/libdrm x11-libs/gtk+:3=[wayland,X] x11-libs/cairo:=[X,svg] x11-libs/libxkbcommon:=[X] x11-libs/pixman gles? ( media-libs/libglvnd[X] ) system-wfconfig? ( >=gui-libs/wf-config-0.4.0 ) !system-wfconfig? ( !gui-libs/wf-config ) system-wlroots? ( ~gui-libs/wlroots-0.10.1[elogind=,systemd=,X] ) !system-wlroots? ( !gui-libs/wlroots ) virtual/pkgconfig >=dev-libs/wayland-protocols-1.18 >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install postinst test
+DEPEND=dev-libs/libevdev dev-libs/libinput gui-libs/gtk-layer-shell media-libs/glm media-libs/mesa:=[gles2,wayland,X] media-libs/libjpeg-turbo media-libs/libpng media-libs/freetype:=[X] x11-libs/libdrm x11-libs/gtk+:3=[wayland,X] x11-libs/cairo:=[X,svg] x11-libs/libxkbcommon:=[X] x11-libs/pixman gles? ( media-libs/libglvnd[X] ) system-wfconfig? ( >=gui-libs/wf-config-0.4.0 ) !system-wfconfig? ( !gui-libs/wf-config ) system-wlroots? ( ~gui-libs/wlroots-0.10.1[elogind=,systemd=,X] ) !system-wlroots? ( !gui-libs/wlroots )
+DESCRIPTION=compiz like 3D wayland compositor
+EAPI=7
+HOMEPAGE=https://github.com/WayfireWM/wayfire
+IUSE=+gles +system-wfconfig +system-wlroots elogind systemd
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/libevdev dev-libs/libinput gui-libs/gtk-layer-shell media-libs/glm media-libs/mesa:=[gles2,wayland,X] media-libs/libjpeg-turbo media-libs/libpng media-libs/freetype:=[X] x11-libs/libdrm x11-libs/gtk+:3=[wayland,X] x11-libs/cairo:=[X,svg] x11-libs/libxkbcommon:=[X] x11-libs/pixman gles? ( media-libs/libglvnd[X] ) system-wfconfig? ( >=gui-libs/wf-config-0.4.0 ) !system-wfconfig? ( !gui-libs/wf-config ) system-wlroots? ( ~gui-libs/wlroots-0.10.1[elogind=,systemd=,X] ) !system-wlroots? ( !gui-libs/wlroots ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) x11-misc/xkeyboard-config
+REQUIRED_USE=?? ( elogind systemd )
+SLOT=0
+SRC_URI=https://github.com/WayfireWM/wayfire/releases/download/0.4.0/wayfire-0.4.0.tar.xz
+_eclasses_=meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=be38607bef51d440f7362a9f6735532c
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index 8a31edd0e6cd..efb45596df86 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/krfb-19.12.3 b/metadata/md5-cache/kde-apps/krfb-19.12.3
deleted file mode 100644
index 3e399107bb64..000000000000
--- a/metadata/md5-cache/kde-apps/krfb-19.12.3
+++ /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.3/src/krfb-19.12.3.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0a284d3f7d10160f3d308a4f067138a5
diff --git a/metadata/md5-cache/kde-apps/krfb-19.12.3-r1 b/metadata/md5-cache/kde-apps/krfb-19.12.3-r1
new file mode 100644
index 000000000000..0828602d1187
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/krfb-19.12.3-r1
@@ -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:0/0.2 ) 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:0/0.2 ) 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.3/src/krfb-19.12.3.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0eea88bf0f931e3bfb44b621171a56e1
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index b25eb6c325f7..5f03565b23e5 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/plasma-5.71.0 b/metadata/md5-cache/kde-frameworks/plasma-5.71.0
deleted file mode 100644
index cac81b70cd36..000000000000
--- a/metadata/md5-cache/kde-frameworks/plasma-5.71.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=kde-frameworks/kdoctools-5.71:5 dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.71:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.14.1:5 >=dev-qt/qtdeclarative-5.14.1:5 >=dev-qt/qtgui-5.14.1:5[gles2-only=] >=dev-qt/qtquickcontrols-5.14.1:5 >=dev-qt/qtsql-5.14.1:5 >=dev-qt/qtsvg-5.14.1:5 >=dev-qt/qtwidgets-5.14.1:5 =kde-frameworks/kactivities-5.71*:5 =kde-frameworks/karchive-5.71*:5 =kde-frameworks/kconfig-5.71*:5 =kde-frameworks/kconfigwidgets-5.71*:5 =kde-frameworks/kcoreaddons-5.71*:5 =kde-frameworks/kdeclarative-5.71*:5 =kde-frameworks/kglobalaccel-5.71*:5 =kde-frameworks/kguiaddons-5.71*:5 =kde-frameworks/ki18n-5.71*:5 =kde-frameworks/kiconthemes-5.71*:5 =kde-frameworks/kio-5.71*:5 =kde-frameworks/kirigami-5.71*:5 =kde-frameworks/knotifications-5.71*:5 =kde-frameworks/kpackage-5.71*:5 =kde-frameworks/kservice-5.71*:5 =kde-frameworks/kwidgetsaddons-5.71*:5 =kde-frameworks/kwindowsystem-5.71*:5 =kde-frameworks/kxmlgui-5.71*:5 !gles2-only? ( virtual/opengl ) wayland? ( =kde-frameworks/kwayland-5.71*:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.14.1: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-only wayland X test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.14.1:5 >=dev-qt/qtdeclarative-5.14.1:5 >=dev-qt/qtgui-5.14.1:5[gles2-only=] >=dev-qt/qtquickcontrols-5.14.1:5 >=dev-qt/qtsql-5.14.1:5 >=dev-qt/qtsvg-5.14.1:5 >=dev-qt/qtwidgets-5.14.1:5 =kde-frameworks/kactivities-5.71*:5 =kde-frameworks/karchive-5.71*:5 =kde-frameworks/kconfig-5.71*:5 =kde-frameworks/kconfigwidgets-5.71*:5 =kde-frameworks/kcoreaddons-5.71*:5 =kde-frameworks/kdeclarative-5.71*:5 =kde-frameworks/kglobalaccel-5.71*:5 =kde-frameworks/kguiaddons-5.71*:5 =kde-frameworks/ki18n-5.71*:5 =kde-frameworks/kiconthemes-5.71*:5 =kde-frameworks/kio-5.71*:5 =kde-frameworks/kirigami-5.71*:5 =kde-frameworks/knotifications-5.71*:5 =kde-frameworks/kpackage-5.71*:5 =kde-frameworks/kservice-5.71*:5 =kde-frameworks/kwidgetsaddons-5.71*:5 =kde-frameworks/kwindowsystem-5.71*:5 =kde-frameworks/kxmlgui-5.71*:5 !gles2-only? ( virtual/opengl ) wayland? ( =kde-frameworks/kwayland-5.71*:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.14.1: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.71
-SRC_URI=mirror://kde/stable/frameworks/5.71/plasma-framework-5.71.0.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9ef10d0abe654084fb1635e6c3b7735b
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.71.0-r1 b/metadata/md5-cache/kde-frameworks/plasma-5.71.0-r1
new file mode 100644
index 000000000000..3deb7d57fa89
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.71.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=kde-frameworks/kdoctools-5.71:5 dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.71:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.14.1:5 >=dev-qt/qtdeclarative-5.14.1:5 >=dev-qt/qtgui-5.14.1:5[gles2-only=] >=dev-qt/qtquickcontrols-5.14.1:5 >=dev-qt/qtsql-5.14.1:5 >=dev-qt/qtsvg-5.14.1:5 >=dev-qt/qtwidgets-5.14.1:5 =kde-frameworks/kactivities-5.71*:5 =kde-frameworks/karchive-5.71*:5 =kde-frameworks/kconfig-5.71*:5 =kde-frameworks/kconfigwidgets-5.71*:5 =kde-frameworks/kcoreaddons-5.71*:5 =kde-frameworks/kdeclarative-5.71*:5 =kde-frameworks/kglobalaccel-5.71*:5 =kde-frameworks/kguiaddons-5.71*:5 =kde-frameworks/ki18n-5.71*:5 =kde-frameworks/kiconthemes-5.71*:5 =kde-frameworks/kio-5.71*:5 =kde-frameworks/kirigami-5.71*:5 =kde-frameworks/knotifications-5.71*:5 =kde-frameworks/kpackage-5.71*:5 =kde-frameworks/kservice-5.71*:5 =kde-frameworks/kwidgetsaddons-5.71*:5 =kde-frameworks/kwindowsystem-5.71*:5 =kde-frameworks/kxmlgui-5.71*:5 !gles2-only? ( virtual/opengl ) wayland? ( =kde-frameworks/kwayland-5.71*:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.14.1: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-only wayland X test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.14.1:5 >=dev-qt/qtdeclarative-5.14.1:5 >=dev-qt/qtgui-5.14.1:5[gles2-only=] >=dev-qt/qtquickcontrols-5.14.1:5 >=dev-qt/qtsql-5.14.1:5 >=dev-qt/qtsvg-5.14.1:5 >=dev-qt/qtwidgets-5.14.1:5 =kde-frameworks/kactivities-5.71*:5 =kde-frameworks/karchive-5.71*:5 =kde-frameworks/kconfig-5.71*:5 =kde-frameworks/kconfigwidgets-5.71*:5 =kde-frameworks/kcoreaddons-5.71*:5 =kde-frameworks/kdeclarative-5.71*:5 =kde-frameworks/kglobalaccel-5.71*:5 =kde-frameworks/kguiaddons-5.71*:5 =kde-frameworks/ki18n-5.71*:5 =kde-frameworks/kiconthemes-5.71*:5 =kde-frameworks/kio-5.71*:5 =kde-frameworks/kirigami-5.71*:5 =kde-frameworks/knotifications-5.71*:5 =kde-frameworks/kpackage-5.71*:5 =kde-frameworks/kservice-5.71*:5 =kde-frameworks/kwidgetsaddons-5.71*:5 =kde-frameworks/kwindowsystem-5.71*:5 =kde-frameworks/kxmlgui-5.71*:5 !gles2-only? ( virtual/opengl ) wayland? ( =kde-frameworks/kwayland-5.71*:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.14.1: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.71
+SRC_URI=mirror://kde/stable/frameworks/5.71/plasma-framework-5.71.0.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9e81c74d593e1d9f03acbaadeb6a63ce
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.70.0 b/metadata/md5-cache/kde-frameworks/solid-5.70.0
index 105e66319ae2..685415acce21 100644
--- a/metadata/md5-cache/kde-frameworks/solid-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/solid-5.70.0
@@ -1,4 +1,4 @@
-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? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.70:5
+BDEPEND=sys-devel/bison sys-devel/flex 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? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.70: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
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/solid-5.70.0.tar.xz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2dcf837285e9e49739e6b223698ec0a0
+_md5_=ab7f3209203077d1c6c5a9dce176d647
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.71.0 b/metadata/md5-cache/kde-frameworks/solid-5.71.0
index 2724986c7acd..65d48c9284ca 100644
--- a/metadata/md5-cache/kde-frameworks/solid-5.71.0
+++ b/metadata/md5-cache/kde-frameworks/solid-5.71.0
@@ -1,4 +1,4 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.14.1:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.71:5
+BDEPEND=sys-devel/bison sys-devel/flex nls? ( >=dev-qt/linguist-tools-5.14.1:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.71:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/qtdbus-5.14.1:5 >=dev-qt/qtgui-5.14.1:5 >=dev-qt/qtdeclarative-5.14.1:5 >=dev-qt/qtxml-5.14.1:5 sys-fs/udisks:2 virtual/libudev:= test? ( >=dev-qt/qtconcurrent-5.14.1: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
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.71
 SRC_URI=mirror://kde/stable/frameworks/5.71/solid-5.71.0.tar.xz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=09b44eda38e7fea0ed658ad8b8511e34
+_md5_=1b41b857e115975baa4d3ab0f5a959b7
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index 67d8806d8bd4..a83a6fe7b20b 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/kdiff3-1.8.3 b/metadata/md5-cache/kde-misc/kdiff3-1.8.3
new file mode 100644
index 000000000000..a0f29f6f7a74
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/kdiff3-1.8.3
@@ -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/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-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/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/kparts-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 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Frontend to diff3 based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/applications/development/org.kde.kdiff3 https://userbase.kde.org/KDiff3
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-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/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/kparts-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 sys-apps/diffutils || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/kdiff3/kdiff3-1.8.3.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ba7e31776463688a83b6808f7dadd604
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index 66507f0761a9..0aaf0be2874a 100644
--- a/metadata/md5-cache/kde-plasma/Manifest.gz
+++ b/metadata/md5-cache/kde-plasma/Manifest.gz
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.19.1 b/metadata/md5-cache/kde-plasma/bluedevil-5.19.1
deleted file mode 100644
index 305f41254b6b..000000000000
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.19.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/bluez-qt-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kded-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/plasma-5.70.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Bluetooth stack for KDE Plasma
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/bluedevil
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/bluez-qt-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kded-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/plasma-5.70.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-plasma/kde-cli-tools-5.19.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/plasma/5.19.1/bluedevil-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ac510883c17aff941c8aaccbf1d766b4
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.19.2 b/metadata/md5-cache/kde-plasma/bluedevil-5.19.2
new file mode 100644
index 000000000000..f60962ec5c79
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.19.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/bluez-qt-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kded-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Bluetooth stack for KDE Plasma
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/bluedevil
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/bluez-qt-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kded-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-plasma/kde-cli-tools-5.19.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/plasma/5.19.2/bluedevil-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1f2ef4a0a9d376c6d9397731f14a1a31
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.19.1 b/metadata/md5-cache/kde-plasma/breeze-5.19.1
deleted file mode 100644
index d3633fb01ebd..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-5.19.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/frameworkintegration-5.70.0:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kguiaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-plasma/kdecoration-5.19.1:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 sci-libs/fftw:3.0= wayland? ( >=kde-frameworks/kwayland-5.70.0:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libxcb ) >=kde-frameworks/kpackage-5.70.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Breeze visual style for the Plasma desktop
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/breeze
-IUSE=wayland X debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=kde-frameworks/breeze-icons-5.70.0:5 >=kde-plasma/kde-cli-tools-5.19.1:5
-RDEPEND=>=kde-frameworks/frameworkintegration-5.70.0:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kguiaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-plasma/kdecoration-5.19.1:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 sci-libs/fftw:3.0= wayland? ( >=kde-frameworks/kwayland-5.70.0:5 ) X? ( >=dev-qt/qtx11extras-5.14.2: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/plasma/5.19.1/breeze-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f9e4ae12454395a21bfe728bfba26c25
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.19.2 b/metadata/md5-cache/kde-plasma/breeze-5.19.2
new file mode 100644
index 000000000000..de3cea2a09a7
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-5.19.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/frameworkintegration-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kguiaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-plasma/kdecoration-5.19.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 sci-libs/fftw:3.0= wayland? ( >=kde-frameworks/kwayland-5.71.0:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libxcb ) >=kde-frameworks/kpackage-5.71.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Breeze visual style for the Plasma desktop
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/breeze
+IUSE=wayland X debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-frameworks/breeze-icons-5.71.0:5 >=kde-plasma/kde-cli-tools-5.19.2:5
+RDEPEND=>=kde-frameworks/frameworkintegration-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kguiaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-plasma/kdecoration-5.19.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 sci-libs/fftw:3.0= wayland? ( >=kde-frameworks/kwayland-5.71.0:5 ) X? ( >=dev-qt/qtx11extras-5.14.2: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/plasma/5.19.2/breeze-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c9e270356cb840cd8d9537f78d99005c
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.19.1 b/metadata/md5-cache/kde-plasma/breeze-grub-5.19.1
deleted file mode 100644
index 0d959407b449..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.19.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch prepare unpack
-DESCRIPTION=Breeze theme for GRUB
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-3+
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.19.1/breeze-grub-5.19.1.tar.xz
-_eclasses_=kde.org	805aef05bd5352355744e28a6ab5ae3c
-_md5_=05177ccd20afabf20b1279c156cde665
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.19.2 b/metadata/md5-cache/kde-plasma/breeze-grub-5.19.2
new file mode 100644
index 000000000000..3a8bb3ccebbb
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.19.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install nofetch prepare unpack
+DESCRIPTION=Breeze theme for GRUB
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3+
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.19.2/breeze-grub-5.19.2.tar.xz
+_eclasses_=kde.org	805aef05bd5352355744e28a6ab5ae3c
+_md5_=05177ccd20afabf20b1279c156cde665
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.19.1 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.19.1
deleted file mode 100644
index a61bed7cf3c0..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.19.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) dev-lang/sassc || ( ( dev-lang/python:3.9 dev-python/pycairo[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/pycairo[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/pycairo[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ) >=kde-plasma/breeze-5.19.1:5 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-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Official GTK+ port of Plasma's Breeze widget style
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/breeze-gtk
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=|| ( 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.19.1/breeze-gtk-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9c16c4e2cf6e791205f830b5d4af780c
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.19.2 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.19.2
new file mode 100644
index 000000000000..c3a7e79054ae
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.19.2
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) dev-lang/sassc || ( ( dev-lang/python:3.9 dev-python/pycairo[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/pycairo[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/pycairo[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ) >=kde-plasma/breeze-5.19.2:5 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-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Official GTK+ port of Plasma's Breeze widget style
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/breeze-gtk
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=|| ( 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.19.2/breeze-gtk-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9c16c4e2cf6e791205f830b5d4af780c
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.19.1 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.19.1
deleted file mode 100644
index 440bba65ed03..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.19.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=kde-frameworks/extra-cmake-modules-5.70.0:5 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch prepare test unpack
-DEPEND=sys-boot/plymouth
-DESCRIPTION=Breeze theme for Plymouth
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ GPL-3+
-RDEPEND=sys-boot/plymouth
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.19.1/breeze-plymouth-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e2d2a2ea3a9ce925947ccdf0e1200781
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.19.2 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.19.2
new file mode 100644
index 000000000000..30e60fb0dd11
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.19.2
@@ -0,0 +1,13 @@
+BDEPEND=>=kde-frameworks/extra-cmake-modules-5.71.0:5 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install nofetch prepare test unpack
+DEPEND=sys-boot/plymouth
+DESCRIPTION=Breeze theme for Plymouth
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+ GPL-3+
+RDEPEND=sys-boot/plymouth
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.19.2/breeze-plymouth-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7ef3f42b07adbd9d4f20ea3ac9fe6dcc
diff --git a/metadata/md5-cache/kde-plasma/discover-5.19.1 b/metadata/md5-cache/kde-plasma/discover-5.19.1
deleted file mode 100644
index 932a7761a197..000000000000
--- a/metadata/md5-cache/kde-plasma/discover-5.19.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.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/attica-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kirigami-5.70.0:5 >=kde-frameworks/kitemmodels-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 firmware? ( sys-apps/fwupd ) telemetry? ( dev-libs/kuserfeedback:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma resources management GUI
-EAPI=7
-HOMEPAGE=https://userbase.kde.org/Discover
-IUSE=+firmware telemetry test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/attica-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kirigami-5.70.0:5 >=kde-frameworks/kitemmodels-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 firmware? ( sys-apps/fwupd ) telemetry? ( dev-libs/kuserfeedback:5 ) >=kde-frameworks/kirigami-5.70.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/plasma/5.19.1/discover-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=93b79aebdd7028d14a209dcca7b6b520
diff --git a/metadata/md5-cache/kde-plasma/discover-5.19.2 b/metadata/md5-cache/kde-plasma/discover-5.19.2
new file mode 100644
index 000000000000..c5b9ce85cac0
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/discover-5.19.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.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/attica-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kirigami-5.71.0:5 >=kde-frameworks/kitemmodels-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 firmware? ( sys-apps/fwupd ) telemetry? ( dev-libs/kuserfeedback:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma resources management GUI
+EAPI=7
+HOMEPAGE=https://userbase.kde.org/Discover
+IUSE=+firmware telemetry test debug test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/attica-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kirigami-5.71.0:5 >=kde-frameworks/kitemmodels-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 firmware? ( sys-apps/fwupd ) telemetry? ( dev-libs/kuserfeedback:5 ) >=kde-frameworks/kirigami-5.71.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/plasma/5.19.2/discover-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d6e91a1a9a142dc1891dfa846a6015e1
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.19.1 b/metadata/md5-cache/kde-plasma/drkonqi-5.19.1
deleted file mode 100644
index 84835ea86102..000000000000
--- a/metadata/md5-cache/kde-plasma/drkonqi-5.19.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kidletime-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kjobwidgets-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/syntax-highlighting-5.70.0:5 >=kde-frameworks/kwallet-5.70.0:5 >=kde-frameworks/kwayland-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 X? ( >=dev-qt/qtx11extras-5.14.2:5 ) >=dev-qt/qtconcurrent-5.14.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Plasma crash handler, gives the user feedback if a program crashed
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=X debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kidletime-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kjobwidgets-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/syntax-highlighting-5.70.0:5 >=kde-frameworks/kwallet-5.70.0:5 >=kde-frameworks/kwayland-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 X? ( >=dev-qt/qtx11extras-5.14.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/plasma/5.19.1/drkonqi-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f98f0f4958d01b3d241739144c5fa545
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.19.2 b/metadata/md5-cache/kde-plasma/drkonqi-5.19.2
new file mode 100644
index 000000000000..aed6d61b0c53
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/drkonqi-5.19.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kidletime-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kjobwidgets-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/syntax-highlighting-5.71.0:5 >=kde-frameworks/kwallet-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 X? ( >=dev-qt/qtx11extras-5.14.2:5 ) >=dev-qt/qtconcurrent-5.14.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Plasma crash handler, gives the user feedback if a program crashed
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=X debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kidletime-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kjobwidgets-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/syntax-highlighting-5.71.0:5 >=kde-frameworks/kwallet-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 X? ( >=dev-qt/qtx11extras-5.14.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/plasma/5.19.2/drkonqi-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=703b4ebd6c308e31f3630b88853eb787
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.19.1 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.19.1
deleted file mode 100644
index 89aaed98631e..000000000000
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.19.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsql-5.14.2:5[sqlite] >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kglobalaccel-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=System service to manage user's activities, track the usage patterns etc.
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsql-5.14.2:5[sqlite] >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kglobalaccel-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.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/plasma/5.19.1/kactivitymanagerd-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c30c333532f84d3cc0bc8045446f1502
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.19.2 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.19.2
new file mode 100644
index 000000000000..a9b01c4312da
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.19.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsql-5.14.2:5[sqlite] >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=System service to manage user's activities, track the usage patterns etc.
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 )
+RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsql-5.14.2:5[sqlite] >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.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/plasma/5.19.2/kactivitymanagerd-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e6818ba3763da9e5e8aa15736a28afb5
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.19.1 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.19.1
deleted file mode 100644
index a8527a871df4..000000000000
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.19.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.70.0:5 ) >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kactivities-5.70.0:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-plasma/libkworkspace-5.19.1:5 kdesu? ( >=kde-frameworks/kdesu-5.70.0:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/kde-cli-tools
-IUSE=kdesu X test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kactivities-5.70.0:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-plasma/libkworkspace-5.19.1:5 kdesu? ( >=kde-frameworks/kdesu-5.70.0:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 ) kdesu? ( sys-apps/dbus[X] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=kdesu? ( X )
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.19.1/kde-cli-tools-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3fd184ac8bf590deac1a2a739adf4a11
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.19.2 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.19.2
new file mode 100644
index 000000000000..209d99dfdcb9
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.19.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.71.0:5 ) >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kactivities-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-plasma/libkworkspace-5.19.2:5 kdesu? ( >=kde-frameworks/kdesu-5.71.0:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/kde-cli-tools
+IUSE=kdesu X test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kactivities-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-plasma/libkworkspace-5.19.2:5 kdesu? ( >=kde-frameworks/kdesu-5.71.0:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 ) kdesu? ( sys-apps/dbus[X] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=kdesu? ( X )
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.19.2/kde-cli-tools-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=afe4faa2ce3dec63f9a51155a2f01db2
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.19.1 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.19.1
deleted file mode 100644
index 7e43bea49998..000000000000
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.19.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.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kguiaddons-5.70.0:5 x11-libs/gtk+:2 x11-libs/gtk+:3 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=GTK2 and GTK3 configurator for KDE Plasma
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/kde-gtk-config
-IUSE=test debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kguiaddons-5.70.0:5 x11-libs/gtk+:2 x11-libs/gtk+:3 >=kde-plasma/kde-cli-tools-5.19.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/plasma/5.19.1/kde-gtk-config-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ebc7279e7739b9155773473963774300
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.19.2 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.19.2
new file mode 100644
index 000000000000..de16fa8ac1fd
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.19.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.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kguiaddons-5.71.0:5 x11-libs/gtk+:2 x11-libs/gtk+:3 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=GTK2 and GTK3 configurator for KDE Plasma
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/kde-gtk-config
+IUSE=test debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kguiaddons-5.71.0:5 x11-libs/gtk+:2 x11-libs/gtk+:3 >=kde-plasma/kde-cli-tools-5.19.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/plasma/5.19.2/kde-gtk-config-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9d80019c18789686104d2c5eedba4f2c
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.19.1 b/metadata/md5-cache/kde-plasma/kdecoration-5.19.1
deleted file mode 100644
index 391a96d11dd7..000000000000
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.19.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.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.70.0:5 >=dev-qt/qtgui-5.14.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plugin based library to create window decorations
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=kde-frameworks/ki18n-5.70.0:5 >=dev-qt/qtgui-5.14.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/plasma/5.19.1/kdecoration-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d09434974474e3cc5e73bcc108ff095c
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.19.2 b/metadata/md5-cache/kde-plasma/kdecoration-5.19.2
new file mode 100644
index 000000000000..1387a9296aef
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.19.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.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.71.0:5 >=dev-qt/qtgui-5.14.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plugin based library to create window decorations
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=kde-frameworks/ki18n-5.71.0:5 >=dev-qt/qtgui-5.14.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/plasma/5.19.2/kdecoration-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6b248a8a2d198553be866546073ea4c3
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.19.1 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.19.1
deleted file mode 100644
index c1c85084766b..000000000000
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.19.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.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/kholidays-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kpackage-5.70.0:5 >=kde-frameworks/kross-5.70.0:5 >=kde-frameworks/krunner-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kunitconversion-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-frameworks/plasma-5.70.0:5 >=kde-frameworks/sonnet-5.70.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 share? ( >=kde-frameworks/purpose-5.70.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.14.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Extra Plasma applets and engines
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=share webengine test debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=kde-frameworks/karchive-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/kholidays-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kpackage-5.70.0:5 >=kde-frameworks/kross-5.70.0:5 >=kde-frameworks/krunner-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kunitconversion-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-frameworks/plasma-5.70.0:5 >=kde-frameworks/sonnet-5.70.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 share? ( >=kde-frameworks/purpose-5.70.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.14.2:5 ) >=kde-plasma/plasma-workspace-5.19.1:5 >=dev-qt/qtquickcontrols-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.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/plasma/5.19.1/kdeplasma-addons-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ed68151c49a961e28073c1abd4110e93
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.19.2 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.19.2
new file mode 100644
index 000000000000..50ae32a0d00f
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.19.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.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kholidays-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kpackage-5.71.0:5 >=kde-frameworks/kross-5.71.0:5 >=kde-frameworks/krunner-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kunitconversion-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=kde-frameworks/sonnet-5.71.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 share? ( >=kde-frameworks/purpose-5.71.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.14.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Extra Plasma applets and engines
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=share webengine test debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=kde-frameworks/karchive-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kholidays-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kpackage-5.71.0:5 >=kde-frameworks/kross-5.71.0:5 >=kde-frameworks/krunner-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kunitconversion-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=kde-frameworks/sonnet-5.71.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 share? ( >=kde-frameworks/purpose-5.71.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.14.2:5 ) >=kde-plasma/plasma-workspace-5.19.2:5 >=dev-qt/qtquickcontrols-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.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/plasma/5.19.2/kdeplasma-addons-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f03abdfec6148b45b833cabc5ef35ae7
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.19.1 b/metadata/md5-cache/kde-plasma/kgamma-5.19.1
deleted file mode 100644
index 539750f02373..000000000000
--- a/metadata/md5-cache/kde-plasma/kgamma-5.19.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.70.0:5 ) >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 x11-libs/libX11 x11-libs/libXxf86vm x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Screen gamma values kcontrol module
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 x11-libs/libX11 x11-libs/libXxf86vm || ( 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.19.1/kgamma5-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7588d528cb5547f8968645848edde6b5
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.19.2 b/metadata/md5-cache/kde-plasma/kgamma-5.19.2
new file mode 100644
index 000000000000..d993722e616b
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.19.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.71.0:5 ) >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 x11-libs/libX11 x11-libs/libXxf86vm x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Screen gamma values kcontrol module
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 x11-libs/libX11 x11-libs/libXxf86vm || ( 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.19.2/kgamma5-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c7978114cdb61283b418a8664cf1ed51
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.19.1 b/metadata/md5-cache/kde-plasma/khotkeys-5.19.1
deleted file mode 100644
index 2252a2fce24f..000000000000
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.19.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.70.0:5 ) >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kdelibs4support-5.70.0:5[X] >=kde-frameworks/kglobalaccel-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-plasma/libkworkspace-5.19.1:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libxcb x11-libs/libXtst dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma workspace hotkey module
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kdelibs4support-5.70.0:5[X] >=kde-frameworks/kglobalaccel-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-plasma/libkworkspace-5.19.1:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.70.0:5 >=kde-plasma/kde-cli-tools-5.19.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/plasma/5.19.1/khotkeys-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b6c436e4ca8bff577de5e08f5bb6fa5a
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.19.2 b/metadata/md5-cache/kde-plasma/khotkeys-5.19.2
new file mode 100644
index 000000000000..4ddf7fdaf8a3
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.19.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.71.0:5 ) >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdelibs4support-5.71.0:5[X] >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/ktextwidgets-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-plasma/libkworkspace-5.19.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libxcb x11-libs/libXtst dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma workspace hotkey module
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdelibs4support-5.71.0:5[X] >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/ktextwidgets-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-plasma/libkworkspace-5.19.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.71.0:5 >=kde-plasma/kde-cli-tools-5.19.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/plasma/5.19.2/khotkeys-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=18774bfee809c27c5574c8068c1d3e79
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.19.1 b/metadata/md5-cache/kde-plasma/kinfocenter-5.19.1
deleted file mode 100644
index 438e7b839a84..000000000000
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.19.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.14.3 dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.70.0:5 ) >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5[gles2-only=] >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kpackage-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-frameworks/solid-5.70.0:5 x11-libs/libX11 gles2-only? ( media-libs/mesa[gles2] ) ieee1394? ( sys-libs/libraw1394 ) opengl? ( media-libs/mesa[X(+)] !gles2-only? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.70.0:5 media-libs/mesa[egl] ) >=kde-frameworks/plasma-5.70.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Utility providing information about the computer hardware
-EAPI=7
-HOMEPAGE=https://userbase.kde.org/KInfoCenter
-IUSE=gles2-only ieee1394 +opengl +pci wayland debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5[gles2-only=] >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kpackage-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-frameworks/solid-5.70.0:5 x11-libs/libX11 gles2-only? ( media-libs/mesa[gles2] ) ieee1394? ( sys-libs/libraw1394 ) opengl? ( media-libs/mesa[X(+)] !gles2-only? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.70.0:5 media-libs/mesa[egl] ) >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-frameworks/kirigami-5.70.0:5 >=kde-plasma/kde-cli-tools-5.19.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=wayland? ( || ( opengl gles2-only ) )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.19.1/kinfocenter-5.19.1.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4fce17e8f0afd15c96ea545484fb4f6b
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.19.2 b/metadata/md5-cache/kde-plasma/kinfocenter-5.19.2
new file mode 100644
index 000000000000..dc991f499e73
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.19.2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/cmake-3.14.3 dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.71.0:5 ) >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5[gles2-only=] >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kpackage-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/solid-5.71.0:5 x11-libs/libX11 gles2-only? ( media-libs/mesa[gles2] ) ieee1394? ( sys-libs/libraw1394 ) opengl? ( media-libs/mesa[X(+)] !gles2-only? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.71.0:5 media-libs/mesa[egl] ) >=kde-frameworks/plasma-5.71.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Utility providing information about the computer hardware
+EAPI=7
+HOMEPAGE=https://userbase.kde.org/KInfoCenter
+IUSE=gles2-only ieee1394 +opengl +pci wayland debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5[gles2-only=] >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kpackage-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/solid-5.71.0:5 x11-libs/libX11 gles2-only? ( media-libs/mesa[gles2] ) ieee1394? ( sys-libs/libraw1394 ) opengl? ( media-libs/mesa[X(+)] !gles2-only? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.71.0:5 media-libs/mesa[egl] ) >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-frameworks/kirigami-5.71.0:5 >=kde-plasma/kde-cli-tools-5.19.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=wayland? ( || ( opengl gles2-only ) )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.19.2/kinfocenter-5.19.2.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b7b8431135bb56a712f83a96d2094c32
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.19.1 b/metadata/md5-cache/kde-plasma/kmenuedit-5.19.1
deleted file mode 100644
index 8bb63e17982e..000000000000
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.19.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.70.0:5 ) >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kglobalaccel-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kitemviews-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-frameworks/sonnet-5.70.0:5 >=kde-frameworks/kinit-5.70.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma menu editor
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/kmenuedit
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kglobalaccel-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kitemviews-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-frameworks/sonnet-5.70.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/plasma/5.19.1/kmenuedit-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d8c47e8d5a3619bd25bad5c907c0de77
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.19.2 b/metadata/md5-cache/kde-plasma/kmenuedit-5.19.2
new file mode 100644
index 000000000000..1739889bb245
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.19.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.71.0:5 ) >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kitemviews-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/sonnet-5.71.0:5 >=kde-frameworks/kinit-5.71.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma menu editor
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/kmenuedit
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kitemviews-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/sonnet-5.71.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/plasma/5.19.2/kmenuedit-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f122ccc6aff2ec65331a937fecec77c9
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.19.1 b/metadata/md5-cache/kde-plasma/kscreen-5.19.1
deleted file mode 100644
index 1b61906ba0e7..000000000000
--- a/metadata/md5-cache/kde-plasma/kscreen-5.19.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kglobalaccel-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-frameworks/plasma-5.70.0:5 >=kde-plasma/libkscreen-5.19.1:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsensors-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma screen management
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/kscreen
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kglobalaccel-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-frameworks/plasma-5.70.0:5 >=kde-plasma/libkscreen-5.19.1:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsensors-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-plasma/kde-cli-tools-5.19.1:5 >=dev-qt/qtgraphicaleffects-5.14.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/plasma/5.19.1/kscreen-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=db74e9eb321046a600d7d8ad8c269e2e
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.19.2 b/metadata/md5-cache/kde-plasma/kscreen-5.19.2
new file mode 100644
index 000000000000..58ddab3c8a42
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.19.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=kde-plasma/libkscreen-5.19.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsensors-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma screen management
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/kscreen
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=kde-plasma/libkscreen-5.19.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsensors-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-plasma/kde-cli-tools-5.19.2:5 >=dev-qt/qtgraphicaleffects-5.14.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/plasma/5.19.2/kscreen-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f4c9af86a49ab3891db2e25e17d0fc5e
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.19.1 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.19.1
deleted file mode 100644
index 36088e82b881..000000000000
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.19.1
+++ /dev/null
@@ -1,17 +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.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/kglobalaccel-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kidletime-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kpackage-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwayland-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-frameworks/solid-5.70.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms consolekit? ( sys-auth/consolekit ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library and components for secure lock screen architecture
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=consolekit +pam seccomp test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.19.1:5
-RDEPEND=>=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/kglobalaccel-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kidletime-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kpackage-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwayland-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-frameworks/solid-5.70.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms consolekit? ( sys-auth/consolekit ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=seccomp? ( pam )
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.19.1/kscreenlocker-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0a1d349bdbc3975d175f00355df48e46
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.19.2 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.19.2
new file mode 100644
index 000000000000..9c39869b9f5d
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.19.2
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kidletime-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kpackage-5.71.0:5 >=kde-frameworks/ktextwidgets-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/solid-5.71.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms consolekit? ( sys-auth/consolekit ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library and components for secure lock screen architecture
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=consolekit +pam seccomp test debug test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-plasma/kde-cli-tools-5.19.2:5
+RDEPEND=>=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kidletime-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kpackage-5.71.0:5 >=kde-frameworks/ktextwidgets-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/solid-5.71.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms consolekit? ( sys-auth/consolekit ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=seccomp? ( pam )
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.19.2/kscreenlocker-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=917a2986e38742766b4fe91186dc829c
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.19.1 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.19.1
deleted file mode 100644
index c99805726d20..000000000000
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.19.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kwallet-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE implementation of ssh-askpass with Kwallet integration
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/ksshaskpass
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kwallet-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.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/plasma/5.19.1/ksshaskpass-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=20b911c5d7fe48e492640ee5b62b6f52
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.19.2 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.19.2
new file mode 100644
index 000000000000..3a3c0f2a9d2c
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.19.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kwallet-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE implementation of ssh-askpass with Kwallet integration
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/ksshaskpass
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kwallet-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.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/plasma/5.19.2/ksshaskpass-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f2597cd8d0750ff159c6ec7abb0ddfee
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.19.1 b/metadata/md5-cache/kde-plasma/ksysguard-5.19.1
deleted file mode 100644
index 15f51e71becb..000000000000
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.19.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.70.0:5 ) >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kinit-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kitemviews-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-plasma/libksysguard-5.19.1:5[-minimal(-)] >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2: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=lm-sensors pcap debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kinit-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kitemviews-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-plasma/libksysguard-5.19.1:5[-minimal(-)] >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2: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.19.1/ksysguard-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=857ecd6b3bfed20525e1a79496f4a5b7
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.19.2 b/metadata/md5-cache/kde-plasma/ksysguard-5.19.2
new file mode 100644
index 000000000000..6a5069962ae8
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.19.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.71.0:5 ) >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kinit-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kitemviews-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-plasma/libksysguard-5.19.2:5[-minimal(-)] >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2: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=lm-sensors pcap debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kinit-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kitemviews-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-plasma/libksysguard-5.19.2:5[-minimal(-)] >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2: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.19.2/ksysguard-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b6acc45082ee07a53b3ed701427c1861
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.19.1 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.19.1
deleted file mode 100644
index 8a69ada74869..000000000000
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.19.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kwallet-5.70.0:5 dev-libs/libgcrypt:0= sys-libs/pam dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=PAM module to not enter KWallet password again after login
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kwallet-5.70.0:5 dev-libs/libgcrypt:0= sys-libs/pam net-misc/socat || ( 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.19.1/kwallet-pam-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d8e092a5640c98d97947bf11db84ea78
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.19.2 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.19.2
new file mode 100644
index 000000000000..cc725d6beadc
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.19.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kwallet-5.71.0:5 dev-libs/libgcrypt:0= sys-libs/pam dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=PAM module to not enter KWallet password again after login
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kwallet-5.71.0:5 dev-libs/libgcrypt:0= sys-libs/pam net-misc/socat || ( 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.19.2/kwallet-pam-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ec5f8f1c0f2956d871d58b8e36eb8274
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.19.1 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.19.1
deleted file mode 100644
index eb441bbcfde0..000000000000
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.19.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kguiaddons-5.70.0:5 >=kde-frameworks/kidletime-5.70.0:5 >=kde-frameworks/kwayland-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Provides integration plugins for various KDE frameworks for Wayland
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/kwayland-integration
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kguiaddons-5.70.0:5 >=kde-frameworks/kidletime-5.70.0:5 >=kde-frameworks/kwayland-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.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/plasma/5.19.1/kwayland-integration-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9fd37e52c4c0b8972162c24fd45689dc
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.19.2 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.19.2
new file mode 100644
index 000000000000..56e9e49ad3e8
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.19.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kguiaddons-5.71.0:5 >=kde-frameworks/kidletime-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Provides integration plugins for various KDE frameworks for Wayland
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/kwayland-integration
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kguiaddons-5.71.0:5 >=kde-frameworks/kidletime-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.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/plasma/5.19.2/kwayland-integration-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b1581935a778d0c0de56a7bb72b37df9
diff --git a/metadata/md5-cache/kde-plasma/kwayland-server-5.19.1 b/metadata/md5-cache/kde-plasma/kwayland-server-5.19.1
deleted file mode 100644
index 288b6aa1d572..000000000000
--- a/metadata/md5-cache/kde-plasma/kwayland-server-5.19.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/wayland-1.15.0 >=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtgui-5.14.2:5[egl] >=dev-qt/qtwayland-5.14.2:5 >=kde-frameworks/kwayland-5.70.0:5 media-libs/mesa[egl] dev-libs/plasma-wayland-protocols >=dev-libs/wayland-protocols-1.15 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Wayland Server Components built on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/kwayland-server
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/wayland-1.15.0 >=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtgui-5.14.2:5[egl] >=dev-qt/qtwayland-5.14.2:5 >=kde-frameworks/kwayland-5.70.0:5 media-libs/mesa[egl] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.19.1/kwayland-server-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9aed3fb9f0c56e1a717ec487246f3b0b
diff --git a/metadata/md5-cache/kde-plasma/kwayland-server-5.19.2 b/metadata/md5-cache/kde-plasma/kwayland-server-5.19.2
new file mode 100644
index 000000000000..a3126ac34fdf
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwayland-server-5.19.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/wayland-1.15.0 >=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtgui-5.14.2:5[egl] >=dev-qt/qtwayland-5.14.2:5 >=kde-frameworks/kwayland-5.71.0:5 media-libs/mesa[egl] dev-libs/plasma-wayland-protocols >=dev-libs/wayland-protocols-1.15 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Wayland Server Components built on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/kwayland-server
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/wayland-1.15.0 >=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtgui-5.14.2:5[egl] >=dev-qt/qtwayland-5.14.2:5 >=kde-frameworks/kwayland-5.71.0:5 media-libs/mesa[egl] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.19.2/kwayland-server-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8594c6eb6efecc3753288337f1c129da
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.19.1 b/metadata/md5-cache/kde-plasma/kwin-5.19.1
deleted file mode 100644
index 5bb84e02c8c2..000000000000
--- a/metadata/md5-cache/kde-plasma/kwin-5.19.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.70.0:5 ) >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5=[gles2-only=] >=dev-qt/qtscript-5.14.2:5 >=dev-qt/qtsensors-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kactivities-5.70.0:5 >=kde-frameworks/kauth-5.70.0:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/kglobalaccel-5.70.0:5= >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kidletime-5.70.0:5= >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kpackage-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwayland-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5[X] >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-frameworks/plasma-5.70.0:5 >=kde-plasma/breeze-5.19.1:5 >=kde-plasma/kdecoration-5.19.1:5 >=kde-plasma/kscreenlocker-5.19.1:5 >=kde-plasma/kwayland-server-5.19.1:5 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,wayland,X(+)] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) >=dev-qt/designer-5.14.2:5 >=dev-qt/qtconcurrent-5.14.2: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=Flexible, composited Window Manager for windowing systems on Linux
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=caps gles2-only multimedia test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-PDEPEND=>=kde-plasma/kde-cli-tools-5.19.1:5
-RDEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5=[gles2-only=] >=dev-qt/qtscript-5.14.2:5 >=dev-qt/qtsensors-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kactivities-5.70.0:5 >=kde-frameworks/kauth-5.70.0:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/kglobalaccel-5.70.0:5= >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kidletime-5.70.0:5= >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kpackage-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwayland-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5[X] >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-frameworks/plasma-5.70.0:5 >=kde-plasma/breeze-5.19.1:5 >=kde-plasma/kdecoration-5.19.1:5 >=kde-plasma/kscreenlocker-5.19.1:5 >=kde-plasma/kwayland-server-5.19.1:5 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,wayland,X(+)] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) >=dev-qt/qtquickcontrols-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=dev-qt/qtvirtualkeyboard-5.14.2:5 >=kde-frameworks/kirigami-5.70.0:5 >=kde-frameworks/kitemmodels-5.70.0:5[qml] multimedia? ( >=dev-qt/qtmultimedia-5.14.2:5[gstreamer,qml] ) || ( 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/plasma/5.19.1/kwin-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=daabd12f4e1ec52cad8b198e0a2bcbbc
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.19.2 b/metadata/md5-cache/kde-plasma/kwin-5.19.2
new file mode 100644
index 000000000000..0f0cdca27aa2
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwin-5.19.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.71.0:5 ) >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5=[gles2-only=] >=dev-qt/qtscript-5.14.2:5 >=dev-qt/qtsensors-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kactivities-5.71.0:5 >=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5= >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kidletime-5.71.0:5= >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kpackage-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/ktextwidgets-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5[X] >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=kde-plasma/breeze-5.19.2:5 >=kde-plasma/kdecoration-5.19.2:5 >=kde-plasma/kscreenlocker-5.19.2:5 >=kde-plasma/kwayland-server-5.19.2:5 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,wayland,X(+)] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) >=dev-qt/designer-5.14.2:5 >=dev-qt/qtconcurrent-5.14.2: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=Flexible, composited Window Manager for windowing systems on Linux
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=caps gles2-only multimedia test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+PDEPEND=>=kde-plasma/kde-cli-tools-5.19.2:5
+RDEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5=[gles2-only=] >=dev-qt/qtscript-5.14.2:5 >=dev-qt/qtsensors-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kactivities-5.71.0:5 >=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5= >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kidletime-5.71.0:5= >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kpackage-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/ktextwidgets-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5[X] >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=kde-plasma/breeze-5.19.2:5 >=kde-plasma/kdecoration-5.19.2:5 >=kde-plasma/kscreenlocker-5.19.2:5 >=kde-plasma/kwayland-server-5.19.2:5 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,wayland,X(+)] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) >=dev-qt/qtquickcontrols-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=dev-qt/qtvirtualkeyboard-5.14.2:5 >=kde-frameworks/kirigami-5.71.0:5 >=kde-frameworks/kitemmodels-5.71.0:5[qml] multimedia? ( >=dev-qt/qtmultimedia-5.14.2:5[gstreamer,qml] ) || ( 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/plasma/5.19.2/kwin-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e00cbdb0f70574e1b7d691df4c875806
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.19.1 b/metadata/md5-cache/kde-plasma/kwrited-5.19.1
deleted file mode 100644
index e3a0a8b74071..000000000000
--- a/metadata/md5-cache/kde-plasma/kwrited-5.19.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kpty-5.70.0:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma daemon listening for wall and write messages
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kpty-5.70.0:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.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/plasma/5.19.1/kwrited-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=29bbfb100c429fff0f48a749e97e0137
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.19.2 b/metadata/md5-cache/kde-plasma/kwrited-5.19.2
new file mode 100644
index 000000000000..814e7ad055f8
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.19.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kpty-5.71.0:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma daemon listening for wall and write messages
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kpty-5.71.0:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.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/plasma/5.19.2/kwrited-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=071afa52267ac19addc009b1d63875da
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.19.1 b/metadata/md5-cache/kde-plasma/libkscreen-5.19.1
deleted file mode 100644
index 45d528166c33..000000000000
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.19.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kwayland-5.70.0:5 x11-libs/libxcb dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plasma screen management library
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kwayland-5.70.0:5 x11-libs/libxcb || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/7
-SRC_URI=mirror://kde/stable/plasma/5.19.1/libkscreen-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=45981d64ce75cb63623570f3be951cd6
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.19.2 b/metadata/md5-cache/kde-plasma/libkscreen-5.19.2
new file mode 100644
index 000000000000..f0b7e5f30392
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.19.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 x11-libs/libxcb dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plasma screen management library
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 x11-libs/libxcb || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/7
+SRC_URI=mirror://kde/stable/plasma/5.19.2/libkscreen-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c3a433e7ef9c878930d30249e357da88
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.19.1 b/metadata/md5-cache/kde-plasma/libksysguard-5.19.1
deleted file mode 100644
index 665cae204bd4..000000000000
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.19.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.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kauth-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kjobwidgets-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 sys-libs/zlib webengine? ( >=dev-qt/qtwebchannel-5.14.2:5 >=dev-qt/qtwebengine-5.14.2:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 x11-libs/libXres ) !<kde-plasma/plasma-workspace-5.18.80:5 >=kde-frameworks/kiconthemes-5.70.0:5 X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Task management and system monitoring library
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=minimal webengine X test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kauth-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kjobwidgets-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 sys-libs/zlib webengine? ( >=dev-qt/qtwebchannel-5.14.2:5 >=dev-qt/qtwebengine-5.14.2:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 x11-libs/libXres ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/9
-SRC_URI=mirror://kde/stable/plasma/5.19.1/libksysguard-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6c110b20a2c6fc7957ee5e3b849af164
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.19.2-r1 b/metadata/md5-cache/kde-plasma/libksysguard-5.19.2-r1
new file mode 100644
index 000000000000..eaafff871b86
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.19.2-r1
@@ -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.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kjobwidgets-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/kpackage-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 sys-libs/zlib webengine? ( >=dev-qt/qtwebchannel-5.14.2:5 >=dev-qt/qtwebengine-5.14.2:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 x11-libs/libXres ) !<kde-plasma/plasma-workspace-5.18.80:5 >=kde-frameworks/kiconthemes-5.71.0:5 X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Task management and system monitoring library
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=webengine X test debug test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kjobwidgets-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/kpackage-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 sys-libs/zlib webengine? ( >=dev-qt/qtwebchannel-5.14.2:5 >=dev-qt/qtwebengine-5.14.2:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 x11-libs/libXres ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/9
+SRC_URI=mirror://kde/stable/plasma/5.19.2/libksysguard-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0f0b96eff2f680102b565281d4b552c1
diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-5.19.1 b/metadata/md5-cache/kde-plasma/libkworkspace-5.19.1
deleted file mode 100644
index 3ceb5cf9a975..000000000000
--- a/metadata/md5-cache/kde-plasma/libkworkspace-5.19.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kinit-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/plasma-5.70.0:5 >=kde-plasma/kscreenlocker-5.19.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau >=kde-plasma/kwin-5.19.1:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Workspace library to interact with the Plasma session manager
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kinit-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/plasma-5.70.0:5 >=kde-plasma/kscreenlocker-5.19.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau !<kde-plasma/plasma-workspace-5.14.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/plasma/5.19.1/plasma-workspace-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6020853a848d2eb871ad069ad41bd6ce
diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-5.19.2 b/metadata/md5-cache/kde-plasma/libkworkspace-5.19.2
new file mode 100644
index 000000000000..aa78d3c6c6cc
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libkworkspace-5.19.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kinit-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=kde-plasma/kscreenlocker-5.19.2:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau >=kde-plasma/kwin-5.19.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Workspace library to interact with the Plasma session manager
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kinit-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=kde-plasma/kscreenlocker-5.19.2:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau !<kde-plasma/plasma-workspace-5.14.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/plasma/5.19.2/plasma-workspace-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f9ce82caeada5ae4df9ccba990c4612d
diff --git a/metadata/md5-cache/kde-plasma/milou-5.19.1 b/metadata/md5-cache/kde-plasma/milou-5.19.1
deleted file mode 100644
index f4a075f17528..000000000000
--- a/metadata/md5-cache/kde-plasma/milou-5.19.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kitemmodels-5.70.0:5 >=kde-frameworks/krunner-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/plasma-5.70.0:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Dedicated search application built on top of Baloo
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/milou
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kitemmodels-5.70.0:5 >=kde-frameworks/krunner-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/plasma-5.70.0:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.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/plasma/5.19.1/milou-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6df4ecdb9357631d5917532fa8b971d4
diff --git a/metadata/md5-cache/kde-plasma/milou-5.19.2 b/metadata/md5-cache/kde-plasma/milou-5.19.2
new file mode 100644
index 000000000000..0cc2af70f192
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/milou-5.19.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kitemmodels-5.71.0:5 >=kde-frameworks/krunner-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Dedicated search application built on top of Baloo
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/milou
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kitemmodels-5.71.0:5 >=kde-frameworks/krunner-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.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/plasma/5.19.2/milou-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1030f178d6199bdc35d7cadc2284869d
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.19.1 b/metadata/md5-cache/kde-plasma/oxygen-5.19.1
deleted file mode 100644
index 17b9d517ddb4..000000000000
--- a/metadata/md5-cache/kde-plasma/oxygen-5.19.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/frameworkintegration-5.70.0:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kguiaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-plasma/kdecoration-5.19.1:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.70.0:5 ) >=kde-frameworks/kservice-5.70.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Oxygen visual style for the Plasma desktop
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/oxygen
-IUSE=wayland debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.19.1:5
-RDEPEND=>=kde-frameworks/frameworkintegration-5.70.0:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kguiaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-plasma/kdecoration-5.19.1:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.70.0:5 ) !<kde-plasma/plasma-desktop-5.16.80 || ( 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.19.1/oxygen-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a1893ba201069bcfdb3f1d62f0a29ffd
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.19.2 b/metadata/md5-cache/kde-plasma/oxygen-5.19.2
new file mode 100644
index 000000000000..7d2936040a8e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.19.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/frameworkintegration-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kguiaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-plasma/kdecoration-5.19.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.71.0:5 ) >=kde-frameworks/kservice-5.71.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Oxygen visual style for the Plasma desktop
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/oxygen
+IUSE=wayland debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-plasma/kde-cli-tools-5.19.2:5
+RDEPEND=>=kde-frameworks/frameworkintegration-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kguiaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-plasma/kdecoration-5.19.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.71.0:5 ) !<kde-plasma/plasma-desktop-5.16.80 || ( 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.19.2/oxygen-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a0f2faaac45245ee2992b9e1e989cceb
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.19.1 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.19.1
deleted file mode 100644
index e3f811dc1f0e..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.19.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kfilemetadata-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/krunner-5.70.0:5 >=kde-frameworks/purpose-5.70.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Integrate Chrome/Firefox better into Plasma through browser extensions
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=kde-frameworks/kactivities-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kfilemetadata-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/krunner-5.70.0:5 >=kde-frameworks/purpose-5.70.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.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/plasma/5.19.1/plasma-browser-integration-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=017e0873d03e57856f7cfe9405cee804
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.19.2 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.19.2
new file mode 100644
index 000000000000..1ea1cc6ee5b2
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.19.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kfilemetadata-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/krunner-5.71.0:5 >=kde-frameworks/purpose-5.71.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Integrate Chrome/Firefox better into Plasma through browser extensions
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=kde-frameworks/kactivities-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kfilemetadata-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/krunner-5.71.0:5 >=kde-frameworks/purpose-5.71.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.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/plasma/5.19.2/plasma-browser-integration-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=191c9e7b738d5585aa84d5139b38fbeb
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.19.1 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.19.1
deleted file mode 100644
index ec4468d3d512..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.19.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.70.0:5 ) >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.14.1:5 >=dev-qt/qtdbus-5.14.1:5 >=dev-qt/qtdeclarative-5.14.1:5 >=dev-qt/qtgui-5.14.1:5 >=dev-qt/qtnetwork-5.14.1:5 >=dev-qt/qtprintsupport-5.14.1:5 >=dev-qt/qtsql-5.14.1:5 >=dev-qt/qtsvg-5.14.1:5 >=dev-qt/qtwidgets-5.14.1:5 >=dev-qt/qtx11extras-5.14.1:5 >=dev-qt/qtxml-5.14.1:5 >=kde-frameworks/attica-5.70.0:5 >=kde-frameworks/kactivities-5.70.0:5 >=kde-frameworks/kactivities-stats-5.70.0:5 >=kde-frameworks/karchive-5.70.0:5 >=kde-frameworks/kauth-5.70.0:5 >=kde-frameworks/kbookmarks-5.70.0:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kcodecs-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/kded-5.70.0:5 >=kde-frameworks/kdelibs4support-5.70.0:5 >=kde-frameworks/kemoticons-5.70.0:5 >=kde-frameworks/kglobalaccel-5.70.0:5 >=kde-frameworks/kguiaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kitemmodels-5.70.0:5 >=kde-frameworks/kitemviews-5.70.0:5 >=kde-frameworks/kjobwidgets-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/knotifyconfig-5.70.0:5 >=kde-frameworks/kparts-5.70.0:5 >=kde-frameworks/krunner-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kwallet-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-frameworks/plasma-5.70.0:5 >=kde-frameworks/solid-5.70.0:5 >=kde-frameworks/sonnet-5.70.0:5 >=kde-plasma/kwin-5.19.1:5 >=kde-plasma/libksysguard-5.19.1:5 >=kde-plasma/plasma-workspace-5.19.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.14.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.70.0:5 ) dev-libs/boost x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma desktop
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=+fontconfig ibus scim +semantic-desktop test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtconcurrent-5.14.1:5 >=dev-qt/qtdbus-5.14.1:5 >=dev-qt/qtdeclarative-5.14.1:5 >=dev-qt/qtgui-5.14.1:5 >=dev-qt/qtnetwork-5.14.1:5 >=dev-qt/qtprintsupport-5.14.1:5 >=dev-qt/qtsql-5.14.1:5 >=dev-qt/qtsvg-5.14.1:5 >=dev-qt/qtwidgets-5.14.1:5 >=dev-qt/qtx11extras-5.14.1:5 >=dev-qt/qtxml-5.14.1:5 >=kde-frameworks/attica-5.70.0:5 >=kde-frameworks/kactivities-5.70.0:5 >=kde-frameworks/kactivities-stats-5.70.0:5 >=kde-frameworks/karchive-5.70.0:5 >=kde-frameworks/kauth-5.70.0:5 >=kde-frameworks/kbookmarks-5.70.0:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kcodecs-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/kded-5.70.0:5 >=kde-frameworks/kdelibs4support-5.70.0:5 >=kde-frameworks/kemoticons-5.70.0:5 >=kde-frameworks/kglobalaccel-5.70.0:5 >=kde-frameworks/kguiaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kitemmodels-5.70.0:5 >=kde-frameworks/kitemviews-5.70.0:5 >=kde-frameworks/kjobwidgets-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/knotifyconfig-5.70.0:5 >=kde-frameworks/kparts-5.70.0:5 >=kde-frameworks/krunner-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kwallet-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-frameworks/plasma-5.70.0:5 >=kde-frameworks/solid-5.70.0:5 >=kde-frameworks/sonnet-5.70.0:5 >=kde-plasma/kwin-5.19.1:5 >=kde-plasma/libksysguard-5.19.1:5 >=kde-plasma/plasma-workspace-5.19.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.14.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.70.0:5 ) >=dev-qt/qtgraphicaleffects-5.14.1:5 >=dev-qt/qtquickcontrols2-5.14.1:5 >=kde-frameworks/kirigami-5.70.0:5 >=kde-frameworks/qqc2-desktop-style-5.70.0:5 >=kde-plasma/breeze-5.19.1:5 >=kde-plasma/kde-cli-tools-5.19.1:5 >=kde-plasma/oxygen-5.19.1:5 sys-apps/util-linux x11-apps/setxkbmap !<kde-plasma/kdeplasma-addons-5.15.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/plasma/5.19.1/plasma-desktop-5.19.1.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-0.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=afdaf0256ee18c5c09c80706e50402a5
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.19.2 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.19.2
new file mode 100644
index 000000000000..5ac922fa053f
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.19.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.71.0:5 ) >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/attica-5.71.0:5 >=kde-frameworks/kactivities-5.71.0:5 >=kde-frameworks/kactivities-stats-5.71.0:5 >=kde-frameworks/karchive-5.71.0:5 >=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kbookmarks-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kcodecs-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kded-5.71.0:5 >=kde-frameworks/kdelibs4support-5.71.0:5 >=kde-frameworks/kemoticons-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/kguiaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kitemmodels-5.71.0:5 >=kde-frameworks/kitemviews-5.71.0:5 >=kde-frameworks/kjobwidgets-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/knotifyconfig-5.71.0:5 >=kde-frameworks/kparts-5.71.0:5 >=kde-frameworks/krunner-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwallet-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=kde-frameworks/solid-5.71.0:5 >=kde-frameworks/sonnet-5.71.0:5 >=kde-plasma/kwin-5.19.2:5 >=kde-plasma/libksysguard-5.19.2:5 >=kde-plasma/plasma-workspace-5.19.2:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.71.0:5 ) dev-libs/boost x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma desktop
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=+fontconfig ibus scim +semantic-desktop test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/attica-5.71.0:5 >=kde-frameworks/kactivities-5.71.0:5 >=kde-frameworks/kactivities-stats-5.71.0:5 >=kde-frameworks/karchive-5.71.0:5 >=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kbookmarks-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kcodecs-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kded-5.71.0:5 >=kde-frameworks/kdelibs4support-5.71.0:5 >=kde-frameworks/kemoticons-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/kguiaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kitemmodels-5.71.0:5 >=kde-frameworks/kitemviews-5.71.0:5 >=kde-frameworks/kjobwidgets-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/knotifyconfig-5.71.0:5 >=kde-frameworks/kparts-5.71.0:5 >=kde-frameworks/krunner-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwallet-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=kde-frameworks/solid-5.71.0:5 >=kde-frameworks/sonnet-5.71.0:5 >=kde-plasma/kwin-5.19.2:5 >=kde-plasma/libksysguard-5.19.2:5 >=kde-plasma/plasma-workspace-5.19.2:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.71.0:5 ) >=dev-qt/qtgraphicaleffects-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-frameworks/kirigami-5.71.0:5 >=kde-frameworks/qqc2-desktop-style-5.71.0:5 >=kde-plasma/breeze-5.19.2:5 >=kde-plasma/kde-cli-tools-5.19.2:5 >=kde-plasma/oxygen-5.19.2:5 sys-apps/util-linux x11-apps/setxkbmap !<kde-plasma/kdeplasma-addons-5.15.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/plasma/5.19.2/plasma-desktop-5.19.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-0.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ecdeca5249fe9dd7066f0bb4b809cfa7
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.19.1 b/metadata/md5-cache/kde-plasma/plasma-integration-5.19.1
deleted file mode 100644
index 99f7bb9b9fbd..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.19.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.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kjobwidgets-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kwayland-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-plasma/breeze-5.19.1:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5=[dbus] >=dev-qt/qtquickcontrols2-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libXcursor x11-libs/libxcb dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=test debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kjobwidgets-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kwayland-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-plasma/breeze-5.19.1:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5=[dbus] >=dev-qt/qtquickcontrols2-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto || ( 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/plasma/5.19.1/plasma-integration-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6ac6c47e56b94a390318f7b4cd97c4f8
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.19.2 b/metadata/md5-cache/kde-plasma/plasma-integration-5.19.2
new file mode 100644
index 000000000000..42292b96044d
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.19.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.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kjobwidgets-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-plasma/breeze-5.19.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5=[dbus] >=dev-qt/qtquickcontrols2-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libXcursor x11-libs/libxcb dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=test debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kjobwidgets-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-plasma/breeze-5.19.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5=[dbus] >=dev-qt/qtquickcontrols2-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto || ( 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/plasma/5.19.2/plasma-integration-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7b078d4866ee13f6edd1448a38331e46
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.19.1 b/metadata/md5-cache/kde-plasma/plasma-meta-5.19.1
deleted file mode 100644
index 6969293377a1..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.19.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Merge this to pull in all Plasma 5 packages
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=bluetooth +browser-integration crypt +desktop-portal discover +display-manager elogind grub gtk +handbook +kwallet +legacy-systray +networkmanager plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-plasma/breeze-5.19.1:5 >=kde-plasma/drkonqi-5.19.1:5 >=kde-plasma/kactivitymanagerd-5.19.1:5 >=kde-plasma/kde-cli-tools-5.19.1:5 >=kde-plasma/kdecoration-5.19.1:5 >=kde-plasma/kdeplasma-addons-5.19.1:5 >=kde-plasma/kgamma-5.19.1:5 >=kde-plasma/khotkeys-5.19.1:5 >=kde-plasma/kinfocenter-5.19.1:5 >=kde-plasma/kmenuedit-5.19.1:5 >=kde-plasma/kscreen-5.19.1:5 >=kde-plasma/kscreenlocker-5.19.1:5 >=kde-plasma/ksshaskpass-5.19.1:5 >=kde-plasma/ksysguard-5.19.1:5 >=kde-plasma/kwayland-integration-5.19.1:5 >=kde-plasma/kwayland-server-5.19.1:5 >=kde-plasma/kwin-5.19.1:5 >=kde-plasma/kwrited-5.19.1:5 >=kde-plasma/libkscreen-5.19.1:5 >=kde-plasma/libksysguard-5.19.1:5 >=kde-plasma/milou-5.19.1:5 >=kde-plasma/oxygen-5.19.1:5 >=kde-plasma/plasma-desktop-5.19.1:5 >=kde-plasma/plasma-integration-5.19.1:5 >=kde-plasma/plasma-workspace-5.19.1:5 >=kde-plasma/polkit-kde-agent-5.19.1:5 >=kde-plasma/powerdevil-5.19.1:5 >=kde-plasma/systemsettings-5.19.1:5 >=kde-plasma/user-manager-5.19.1:5 sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[elogind?,systemd?] sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-5.19.1:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.19.1:5 ) crypt? ( >=kde-plasma/plasma-vault-5.19.1:5 ) desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-5.19.1:5 ) discover? ( >=kde-plasma/discover-5.19.1:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.19.1:5 x11-misc/sddm[elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.19.1:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.19.1:5 >=kde-plasma/kde-gtk-config-5.19.1:5 ) handbook? ( kde-apps/khelpcenter:5 ) kwallet? ( >=kde-plasma/kwallet-pam-5.19.1:5 ) legacy-systray? ( >=kde-plasma/xembed-sni-proxy-5.19.1:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.19.1:5 net-misc/networkmanager[elogind?,systemd?] qrcode? ( kde-frameworks/prison[qml] ) ) plymouth? ( >=kde-plasma/breeze-plymouth-5.19.1:5 >=kde-plasma/plymouth-kcm-5.19.1:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.19.1:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.19.1:5 ) thunderbolt? ( >=kde-plasma/plasma-thunderbolt-5.19.1:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.19.1:5 )
-REQUIRED_USE=?? ( elogind systemd )
-SLOT=5
-_md5_=ac6b41312124fedf78a9c16ad0f2ce06
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.19.2 b/metadata/md5-cache/kde-plasma/plasma-meta-5.19.2
new file mode 100644
index 000000000000..818184b476a5
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.19.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=postinst
+DESCRIPTION=Merge this to pull in all Plasma 5 packages
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=bluetooth +browser-integration crypt +desktop-portal discover +display-manager elogind grub gtk +handbook +kwallet +legacy-systray +networkmanager plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-plasma/breeze-5.19.2:5 >=kde-plasma/drkonqi-5.19.2:5 >=kde-plasma/kactivitymanagerd-5.19.2:5 >=kde-plasma/kde-cli-tools-5.19.2:5 >=kde-plasma/kdecoration-5.19.2:5 >=kde-plasma/kdeplasma-addons-5.19.2:5 >=kde-plasma/kgamma-5.19.2:5 >=kde-plasma/khotkeys-5.19.2:5 >=kde-plasma/kinfocenter-5.19.2:5 >=kde-plasma/kmenuedit-5.19.2:5 >=kde-plasma/kscreen-5.19.2:5 >=kde-plasma/kscreenlocker-5.19.2:5 >=kde-plasma/ksshaskpass-5.19.2:5 >=kde-plasma/ksysguard-5.19.2:5 >=kde-plasma/kwayland-integration-5.19.2:5 >=kde-plasma/kwayland-server-5.19.2:5 >=kde-plasma/kwin-5.19.2:5 >=kde-plasma/kwrited-5.19.2:5 >=kde-plasma/libkscreen-5.19.2:5 >=kde-plasma/libksysguard-5.19.2:5 >=kde-plasma/milou-5.19.2:5 >=kde-plasma/oxygen-5.19.2:5 >=kde-plasma/plasma-desktop-5.19.2:5 >=kde-plasma/plasma-integration-5.19.2:5 >=kde-plasma/plasma-workspace-5.19.2:5 >=kde-plasma/polkit-kde-agent-5.19.2:5 >=kde-plasma/powerdevil-5.19.2:5 >=kde-plasma/systemsettings-5.19.2:5 >=kde-plasma/user-manager-5.19.2:5 sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[elogind?,systemd?] sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-5.19.2:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.19.2:5 ) crypt? ( >=kde-plasma/plasma-vault-5.19.2:5 ) desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-5.19.2:5 ) discover? ( >=kde-plasma/discover-5.19.2:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.19.2:5 x11-misc/sddm[elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.19.2:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.19.2:5 >=kde-plasma/kde-gtk-config-5.19.2:5 ) handbook? ( kde-apps/khelpcenter:5 ) kwallet? ( >=kde-plasma/kwallet-pam-5.19.2:5 ) legacy-systray? ( >=kde-plasma/xembed-sni-proxy-5.19.2:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.19.2:5 net-misc/networkmanager[elogind?,systemd?] qrcode? ( kde-frameworks/prison[qml] ) ) plymouth? ( >=kde-plasma/breeze-plymouth-5.19.2:5 >=kde-plasma/plymouth-kcm-5.19.2:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.19.2:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.19.2:5 ) thunderbolt? ( >=kde-plasma/plasma-thunderbolt-5.19.2:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.19.2:5 )
+REQUIRED_USE=?? ( elogind systemd )
+SLOT=5
+_md5_=ac6b41312124fedf78a9c16ad0f2ce06
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.19.1 b/metadata/md5-cache/kde-plasma/plasma-nm-5.19.1
deleted file mode 100644
index f85dd7fa20ea..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.19.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/qca-2.1.1:2[qt5(+)] >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kitemviews-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kwallet-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-frameworks/networkmanager-qt-5.70.0:5[teamd=] >=kde-frameworks/plasma-5.70.0:5 >=kde-frameworks/solid-5.70.0:5 net-misc/networkmanager[teamd=] modemmanager? ( >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/modemmanager-qt-5.70.0:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.14.2:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma applet for NetworkManager
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=modemmanager openconnect teamd debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=app-crypt/qca-2.1.1:2[qt5(+)] >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kitemviews-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kwallet-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-frameworks/networkmanager-qt-5.70.0:5[teamd=] >=kde-frameworks/plasma-5.70.0:5 >=kde-frameworks/solid-5.70.0:5 net-misc/networkmanager[teamd=] modemmanager? ( >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/modemmanager-qt-5.70.0:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.14.2:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) >=dev-qt/qtquickcontrols-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-frameworks/kirigami-5.70.0:5 >=kde-plasma/kde-cli-tools-5.19.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/plasma/5.19.1/plasma-nm-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ccb5a3a7a8817901b68714848bf9a4e1
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.19.2 b/metadata/md5-cache/kde-plasma/plasma-nm-5.19.2
new file mode 100644
index 000000000000..ffbeda173a80
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.19.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=app-crypt/qca-2.1.1:2[qt5(+)] >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kitemviews-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwallet-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/networkmanager-qt-5.71.0:5[teamd=] >=kde-frameworks/plasma-5.71.0:5 >=kde-frameworks/solid-5.71.0:5 net-misc/networkmanager[teamd=] modemmanager? ( >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/modemmanager-qt-5.71.0:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.14.2:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma applet for NetworkManager
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=modemmanager openconnect teamd debug test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=app-crypt/qca-2.1.1:2[qt5(+)] >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kitemviews-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwallet-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/networkmanager-qt-5.71.0:5[teamd=] >=kde-frameworks/plasma-5.71.0:5 >=kde-frameworks/solid-5.71.0:5 net-misc/networkmanager[teamd=] modemmanager? ( >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/modemmanager-qt-5.71.0:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.14.2:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) >=dev-qt/qtquickcontrols-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-frameworks/kirigami-5.71.0:5 >=kde-plasma/kde-cli-tools-5.19.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/plasma/5.19.2/plasma-nm-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f7e46f57d1b5aa397649c997458f5946
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.19.1 b/metadata/md5-cache/kde-plasma/plasma-pa-5.19.1
deleted file mode 100644
index 1aebb0246358..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.19.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.70.0:5 ) >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/kglobalaccel-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/plasma-5.70.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Plasma applet for audio volume management using PulseAudio
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/kglobalaccel-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/plasma-5.70.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio >=kde-frameworks/kirigami-5.70.0:5 >=dev-qt/qtquickcontrols2-5.14.2:5 media-libs/libcanberra x11-themes/sound-theme-freedesktop || ( 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.19.1/plasma-pa-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9949e39a0e6b36d80ff91ffee47f9dba
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.19.2 b/metadata/md5-cache/kde-plasma/plasma-pa-5.19.2
new file mode 100644
index 000000000000..d4aec409d043
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.19.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.71.0:5 ) >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Plasma applet for audio volume management using PulseAudio
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio >=kde-frameworks/kirigami-5.71.0:5 >=dev-qt/qtquickcontrols2-5.14.2:5 media-libs/libcanberra x11-themes/sound-theme-freedesktop || ( 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.19.2/plasma-pa-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fb89bc6d5fe30ac7d40ac232907f9f0e
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.19.1 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.19.1
deleted file mode 100644
index 91729630317e..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.19.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.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/karchive-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kpackage-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/ktexteditor-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/plasma-5.70.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Useful applications for Plasma development
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/karchive-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kpackage-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/ktexteditor-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/plasma-5.70.0:5 >=dev-qt/qtquickcontrols-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-frameworks/kirigami-5.70.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/plasma/5.19.1/plasma-sdk-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2149b9b8db601e73cb1745e9a4abe645
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.19.2 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.19.2
new file mode 100644
index 000000000000..bad3991c7707
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.19.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.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/karchive-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kpackage-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/ktexteditor-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Useful applications for Plasma development
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/karchive-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kpackage-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/ktexteditor-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=dev-qt/qtquickcontrols-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-frameworks/kirigami-5.71.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/plasma/5.19.2/plasma-sdk-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=219fa409d2935401a46c80314836f1fc
diff --git a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.19.1 b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.19.1
deleted file mode 100644
index 5434e3ba365c..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.19.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plasma integration for controlling Thunderbolt devices
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/plasma-thunderbolt
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3+ )
-RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 sys-apps/bolt || ( 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/plasma/5.19.1/plasma-thunderbolt-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=64af82ee116d7839bbc555c1dde425c5
diff --git a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.19.2 b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.19.2
new file mode 100644
index 000000000000..692bad1c64fb
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.19.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plasma integration for controlling Thunderbolt devices
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/plasma-thunderbolt
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3+ )
+RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 sys-apps/bolt || ( 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/plasma/5.19.2/plasma-thunderbolt-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4a86077ba5893b0c43b9ac8b14788026
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.19.1 b/metadata/md5-cache/kde-plasma/plasma-vault-5.19.1
deleted file mode 100644
index dccf213b6f1b..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-vault-5.19.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.70.0:5 >=kde-frameworks/kcodecs-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/plasma-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-plasma/libksysguard-5.19.1:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.70.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Plasma applet and services for creating encrypted vaults
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop https://cukic.co/2017/02/03/vaults-encryption-in-plasma/
-IUSE=networkmanager debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-3
-RDEPEND=>=kde-frameworks/kactivities-5.70.0:5 >=kde-frameworks/kcodecs-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/plasma-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-plasma/libksysguard-5.19.1:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.70.0:5 ) || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) || ( 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.19.1/plasma-vault-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f523435b3a533e0180b77bf5baae475a
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.19.2 b/metadata/md5-cache/kde-plasma/plasma-vault-5.19.2
new file mode 100644
index 000000000000..f8e79e19caf7
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-vault-5.19.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.71.0:5 >=kde-frameworks/kcodecs-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-plasma/libksysguard-5.19.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.71.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Plasma applet and services for creating encrypted vaults
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop https://cukic.co/2017/02/03/vaults-encryption-in-plasma/
+IUSE=networkmanager debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-3
+RDEPEND=>=kde-frameworks/kactivities-5.71.0:5 >=kde-frameworks/kcodecs-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-plasma/libksysguard-5.19.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.71.0:5 ) || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) || ( 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.19.2/plasma-vault-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9932453ba4616fdac82c169c511bc7cb
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.19.1 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.19.1
deleted file mode 100644
index e6c6cbca9dc9..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.19.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.70.0:5 ) >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5[jpeg] >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kactivities-5.70.0:5 >=kde-frameworks/kactivities-stats-5.70.0:5 >=kde-frameworks/kauth-5.70.0:5 >=kde-frameworks/kbookmarks-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/kded-5.70.0:5 >=kde-frameworks/kdelibs4support-5.70.0:5 >=kde-frameworks/kglobalaccel-5.70.0:5 >=kde-frameworks/kguiaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kidletime-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kitemmodels-5.70.0:5 >=kde-frameworks/kitemviews-5.70.0:5 >=kde-frameworks/kjobwidgets-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/knotifyconfig-5.70.0:5 >=kde-frameworks/kpackage-5.70.0:5 >=kde-frameworks/kpeople-5.70.0:5 >=kde-frameworks/krunner-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/ktexteditor-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwallet-5.70.0:5 >=kde-frameworks/kwayland-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-frameworks/plasma-5.70.0:5 >=kde-frameworks/solid-5.70.0:5 >=kde-plasma/kscreenlocker-5.19.1:5 >=kde-plasma/kwin-5.19.1:5 >=kde-plasma/libkscreen-5.19.1:5 >=kde-plasma/libksysguard-5.19.1:5 >=kde-plasma/libkworkspace-5.19.1:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.70.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.70.0:5 ) gps? ( sci-geosciences/gpsd ) qalculate? ( sci-libs/libqalculate:= ) qrcode? ( >=kde-frameworks/prison-5.70.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.70.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) >=dev-qt/qtconcurrent-5.14.2: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=KDE Plasma workspace
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd telemetry test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.19.1:5
-RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5[jpeg] >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kactivities-5.70.0:5 >=kde-frameworks/kactivities-stats-5.70.0:5 >=kde-frameworks/kauth-5.70.0:5 >=kde-frameworks/kbookmarks-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/kded-5.70.0:5 >=kde-frameworks/kdelibs4support-5.70.0:5 >=kde-frameworks/kglobalaccel-5.70.0:5 >=kde-frameworks/kguiaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kidletime-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kitemmodels-5.70.0:5 >=kde-frameworks/kitemviews-5.70.0:5 >=kde-frameworks/kjobwidgets-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/knotifyconfig-5.70.0:5 >=kde-frameworks/kpackage-5.70.0:5 >=kde-frameworks/kpeople-5.70.0:5 >=kde-frameworks/krunner-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/ktexteditor-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwallet-5.70.0:5 >=kde-frameworks/kwayland-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-frameworks/plasma-5.70.0:5 >=kde-frameworks/solid-5.70.0:5 >=kde-plasma/kscreenlocker-5.19.1:5 >=kde-plasma/kwin-5.19.1:5 >=kde-plasma/libkscreen-5.19.1:5 >=kde-plasma/libksysguard-5.19.1:5 >=kde-plasma/libkworkspace-5.19.1:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.70.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.70.0:5 ) gps? ( sci-geosciences/gpsd ) qalculate? ( sci-libs/libqalculate:= ) qrcode? ( >=kde-frameworks/prison-5.70.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.70.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) app-text/iso-codes >=dev-qt/qdbus-5.14.2:5 >=dev-qt/qtgraphicaleffects-5.14.2:5 >=dev-qt/qtpaths-5.14.2:5 >=dev-qt/qtquickcontrols-5.14.2:5[widgets] >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-apps/kio-extras-19.04.3:5 >=kde-frameworks/kquickcharts-5.70.0:5 >=kde-frameworks/kdesu-5.70.0:5 >=kde-frameworks/kirigami-5.70.0:5 >=kde-plasma/ksysguard-5.19.1:5 >=kde-plasma/milou-5.19.1:5 >=kde-plasma/plasma-integration-5.19.1:5 x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !<kde-plasma/plasma-desktop-5.16.80:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=gps? ( geolocation )
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.19.1/plasma-workspace-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=93121f68b8f837f9b232536d50c8c034
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.19.2 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.19.2
new file mode 100644
index 000000000000..df0b5207f80f
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.19.2
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.71.0:5 ) >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5[jpeg] >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kactivities-5.71.0:5 >=kde-frameworks/kactivities-stats-5.71.0:5 >=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kbookmarks-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kded-5.71.0:5 >=kde-frameworks/kdelibs4support-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/kguiaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kidletime-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kitemmodels-5.71.0:5 >=kde-frameworks/kitemviews-5.71.0:5 >=kde-frameworks/kjobwidgets-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/knotifyconfig-5.71.0:5 >=kde-frameworks/kpackage-5.71.0:5 >=kde-frameworks/kpeople-5.71.0:5 >=kde-frameworks/krunner-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/ktexteditor-5.71.0:5 >=kde-frameworks/ktextwidgets-5.71.0:5 >=kde-frameworks/kwallet-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=kde-frameworks/solid-5.71.0:5 >=kde-plasma/kscreenlocker-5.19.2:5 >=kde-plasma/kwin-5.19.2:5 >=kde-plasma/libkscreen-5.19.2:5 >=kde-plasma/libksysguard-5.19.2:5 >=kde-plasma/libkworkspace-5.19.2:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.71.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.71.0:5 ) gps? ( sci-geosciences/gpsd ) qalculate? ( sci-libs/libqalculate:= ) qrcode? ( >=kde-frameworks/prison-5.71.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.71.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) >=dev-qt/qtconcurrent-5.14.2: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=KDE Plasma workspace
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd telemetry test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-plasma/kde-cli-tools-5.19.2:5
+RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5[jpeg] >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kactivities-5.71.0:5 >=kde-frameworks/kactivities-stats-5.71.0:5 >=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kbookmarks-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kded-5.71.0:5 >=kde-frameworks/kdelibs4support-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/kguiaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kidletime-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kitemmodels-5.71.0:5 >=kde-frameworks/kitemviews-5.71.0:5 >=kde-frameworks/kjobwidgets-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/knotifyconfig-5.71.0:5 >=kde-frameworks/kpackage-5.71.0:5 >=kde-frameworks/kpeople-5.71.0:5 >=kde-frameworks/krunner-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/ktexteditor-5.71.0:5 >=kde-frameworks/ktextwidgets-5.71.0:5 >=kde-frameworks/kwallet-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=kde-frameworks/solid-5.71.0:5 >=kde-plasma/kscreenlocker-5.19.2:5 >=kde-plasma/kwin-5.19.2:5 >=kde-plasma/libkscreen-5.19.2:5 >=kde-plasma/libksysguard-5.19.2:5 >=kde-plasma/libkworkspace-5.19.2:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.71.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.71.0:5 ) gps? ( sci-geosciences/gpsd ) qalculate? ( sci-libs/libqalculate:= ) qrcode? ( >=kde-frameworks/prison-5.71.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.71.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) app-text/iso-codes >=dev-qt/qdbus-5.14.2:5 >=dev-qt/qtgraphicaleffects-5.14.2:5 >=dev-qt/qtpaths-5.14.2:5 >=dev-qt/qtquickcontrols-5.14.2:5[widgets] >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-apps/kio-extras-19.04.3:5 >=kde-frameworks/kquickcharts-5.71.0:5 >=kde-frameworks/kdesu-5.71.0:5 >=kde-frameworks/kirigami-5.71.0:5 >=kde-plasma/ksysguard-5.19.2:5 >=kde-plasma/milou-5.19.2:5 >=kde-plasma/plasma-integration-5.19.2:5 x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !<kde-plasma/plasma-desktop-5.16.80:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=gps? ( geolocation )
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.19.2/plasma-workspace-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b1f742a1b2004bbe7f2afb7e51b250b5
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.19.1 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.19.1
deleted file mode 100644
index 1b0e9c03c8a1..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.19.1
+++ /dev/null
@@ -1,11 +0,0 @@
-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=Wallpapers for the Plasma workspace
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.19.1/plasma-workspace-wallpapers-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=504083c1a10f700ae4fd8e231b1b0700
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.19.2 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.19.2
new file mode 100644
index 000000000000..410fed10660f
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.19.2
@@ -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=Wallpapers for the Plasma workspace
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.19.2/plasma-workspace-wallpapers-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=504083c1a10f700ae4fd8e231b1b0700
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.19.1 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.19.1
deleted file mode 100644
index d16c5569a661..000000000000
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.19.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.70.0:5 >=kde-frameworks/kauth-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtquickcontrols-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 sys-boot/plymouth dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma control module for Plymouth
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/plymouth-kcm
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.70.0:5 >=kde-frameworks/kauth-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtquickcontrols-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.19.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/plasma/5.19.1/plymouth-kcm-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=90e6631828e94131417eb25f20910873
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.19.2 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.19.2
new file mode 100644
index 000000000000..2fc1a33d87c7
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.19.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.71.0:5 >=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtquickcontrols-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 sys-boot/plymouth dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma control module for Plymouth
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/plymouth-kcm
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.71.0:5 >=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtquickcontrols-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.19.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/plasma/5.19.2/plymouth-kcm-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3ea6a2982e44baf0590260aa2962b942
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.19.1 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.19.1
deleted file mode 100644
index 7301359b121e..000000000000
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.19.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=PolKit agent module for KDE Plasma
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=sys-auth/polkit-qt-0.112.0[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/plasma/5.19.1/polkit-kde-agent-1-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e91f1cfb721f3717d7959e66aa3d6477
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.19.2 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.19.2
new file mode 100644
index 000000000000..0366b53c363e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.19.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=PolKit agent module for KDE Plasma
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=sys-auth/polkit-qt-0.112.0[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/plasma/5.19.2/polkit-kde-agent-1-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0754e716fe8a8fdf6330201963f38e23
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.18.5-r1 b/metadata/md5-cache/kde-plasma/powerdevil-5.18.5-r1
new file mode 100644
index 000000000000..4e265f69aeaa
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.18.5-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.66.0:5 ) >=kde-frameworks/extra-cmake-modules-5.66.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.66.0:5 >=kde-frameworks/kauth-5.66.0:5[policykit] >=kde-frameworks/kcompletion-5.66.0:5 >=kde-frameworks/kconfig-5.66.0:5 >=kde-frameworks/kconfigwidgets-5.66.0:5 >=kde-frameworks/kcoreaddons-5.66.0:5 >=kde-frameworks/kcrash-5.66.0:5 >=kde-frameworks/kdbusaddons-5.66.0:5 >=kde-frameworks/kglobalaccel-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/kidletime-5.66.0:5 >=kde-frameworks/kio-5.66.0:5 >=kde-frameworks/knotifications-5.66.0:5 >=kde-frameworks/knotifyconfig-5.66.0:5 >=kde-frameworks/kservice-5.66.0:5 >=kde-frameworks/kwayland-5.66.0:5 >=kde-frameworks/kwidgetsaddons-5.66.0:5 >=kde-frameworks/kxmlgui-5.66.0:5 >=kde-frameworks/solid-5.66.0:5 >=kde-plasma/libkscreen-5.18.5:5 >=kde-plasma/libkworkspace-5.18.5:5 >=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 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.66.0:5 >=kde-frameworks/networkmanager-qt-5.66.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Power management for KDE Plasma Shell
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/powerdevil
+IUSE=brightness-control +wireless debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.66.0:5 >=kde-frameworks/kauth-5.66.0:5[policykit] >=kde-frameworks/kcompletion-5.66.0:5 >=kde-frameworks/kconfig-5.66.0:5 >=kde-frameworks/kconfigwidgets-5.66.0:5 >=kde-frameworks/kcoreaddons-5.66.0:5 >=kde-frameworks/kcrash-5.66.0:5 >=kde-frameworks/kdbusaddons-5.66.0:5 >=kde-frameworks/kglobalaccel-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/kidletime-5.66.0:5 >=kde-frameworks/kio-5.66.0:5 >=kde-frameworks/knotifications-5.66.0:5 >=kde-frameworks/knotifyconfig-5.66.0:5 >=kde-frameworks/kservice-5.66.0:5 >=kde-frameworks/kwayland-5.66.0:5 >=kde-frameworks/kwidgetsaddons-5.66.0:5 >=kde-frameworks/kxmlgui-5.66.0:5 >=kde-frameworks/solid-5.66.0:5 >=kde-plasma/libkscreen-5.18.5:5 >=kde-plasma/libkworkspace-5.18.5:5 >=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 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.66.0:5 >=kde-frameworks/networkmanager-qt-5.66.0:5 ) >=kde-plasma/kde-cli-tools-5.18.5:5 >=sys-power/upower-0.9.23 || ( 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.18.5/powerdevil-5.18.5.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5d26a5263e870929bf111749c627b95b
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.19.1 b/metadata/md5-cache/kde-plasma/powerdevil-5.19.1
deleted file mode 100644
index 838b9eadd4cc..000000000000
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.19.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.70.0:5 ) >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.70.0:5 >=kde-frameworks/kauth-5.70.0:5[policykit] >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kglobalaccel-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kidletime-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/knotifyconfig-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kwayland-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-frameworks/solid-5.70.0:5 >=kde-plasma/libkscreen-5.19.1:5 >=kde-plasma/libkworkspace-5.19.1:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.70.0:5 >=kde-frameworks/networkmanager-qt-5.70.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Power management for KDE Plasma Shell
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/powerdevil
-IUSE=brightness-control +wireless debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.70.0:5 >=kde-frameworks/kauth-5.70.0:5[policykit] >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kglobalaccel-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kidletime-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/knotifyconfig-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kwayland-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-frameworks/solid-5.70.0:5 >=kde-plasma/libkscreen-5.19.1:5 >=kde-plasma/libkworkspace-5.19.1:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.70.0:5 >=kde-frameworks/networkmanager-qt-5.70.0:5 ) >=kde-plasma/kde-cli-tools-5.19.1:5 >=sys-power/upower-0.9.23 || ( 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.19.1/powerdevil-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1da8c5d9508d2a785f04b7ae7e50b56e
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.19.2.1 b/metadata/md5-cache/kde-plasma/powerdevil-5.19.2.1
new file mode 100644
index 000000000000..d213ebc1349d
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.19.2.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.71.0:5 ) >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kactivities-5.71.0:5 >=kde-frameworks/kauth-5.71.0:5[policykit] >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kidletime-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/knotifyconfig-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/solid-5.71.0:5 >=kde-plasma/libkscreen-5.19.2:5 >=kde-plasma/libkworkspace-5.19.2:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.71.0:5 >=kde-frameworks/networkmanager-qt-5.71.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Power management for KDE Plasma Shell
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/powerdevil
+IUSE=brightness-control +wireless debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kactivities-5.71.0:5 >=kde-frameworks/kauth-5.71.0:5[policykit] >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kidletime-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/knotifyconfig-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/solid-5.71.0:5 >=kde-plasma/libkscreen-5.19.2:5 >=kde-plasma/libkworkspace-5.19.2:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.71.0:5 >=kde-frameworks/networkmanager-qt-5.71.0:5 ) >=kde-plasma/kde-cli-tools-5.19.2:5 >=sys-power/upower-0.9.23 || ( 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.19.2/powerdevil-5.19.2.1.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=23b5e3c5a0ebe17ebd5da3641286450c
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.19.1 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.19.1
deleted file mode 100644
index 422c2051f496..000000000000
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.19.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.70.0:5 >=kde-frameworks/kauth-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma control module for SDDM
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/sddm-kcm
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.70.0:5 >=kde-frameworks/kauth-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-plasma/kde-cli-tools-5.19.1:5 x11-misc/sddm || ( 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.19.1/sddm-kcm-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=49f3964517703e5f87786343545df7c4
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.19.2 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.19.2
new file mode 100644
index 000000000000..0cac3f8f8a6f
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.19.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.71.0:5 >=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma control module for SDDM
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/sddm-kcm
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.71.0:5 >=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-plasma/kde-cli-tools-5.19.2:5 x11-misc/sddm || ( 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.19.2/sddm-kcm-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=158fb8fb3ed867f84ccc91cbc95cf909
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.19.1 b/metadata/md5-cache/kde-plasma/systemsettings-5.19.1
deleted file mode 100644
index 545585b07a80..000000000000
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.19.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.70.0:5 ) >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kactivities-5.70.0:5 >=kde-frameworks/kactivities-stats-5.70.0:5 >=kde-frameworks/kauth-5.70.0:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/kguiaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kitemmodels-5.70.0:5 >=kde-frameworks/kitemviews-5.70.0:5 >=kde-frameworks/kpackage-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-plasma/libkworkspace-5.19.1:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Control Center to configure KDE Plasma desktop
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kactivities-5.70.0:5 >=kde-frameworks/kactivities-stats-5.70.0:5 >=kde-frameworks/kauth-5.70.0:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/kguiaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kitemmodels-5.70.0:5 >=kde-frameworks/kitemviews-5.70.0:5 >=kde-frameworks/kpackage-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-plasma/libkworkspace-5.19.1:5 !kde-misc/systemd-kcm >=kde-frameworks/kirigami-5.70.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/plasma/5.19.1/systemsettings-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=de4e97d6cc2a5973b5dedb2e69977131
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.19.2 b/metadata/md5-cache/kde-plasma/systemsettings-5.19.2
new file mode 100644
index 000000000000..533de354d872
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.19.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.71.0:5 ) >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kactivities-5.71.0:5 >=kde-frameworks/kactivities-stats-5.71.0:5 >=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kguiaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kitemmodels-5.71.0:5 >=kde-frameworks/kitemviews-5.71.0:5 >=kde-frameworks/kpackage-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-plasma/libkworkspace-5.19.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Control Center to configure KDE Plasma desktop
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kactivities-5.71.0:5 >=kde-frameworks/kactivities-stats-5.71.0:5 >=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kguiaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kitemmodels-5.71.0:5 >=kde-frameworks/kitemviews-5.71.0:5 >=kde-frameworks/kpackage-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-plasma/libkworkspace-5.19.2:5 !kde-misc/systemd-kcm >=kde-frameworks/kirigami-5.71.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/plasma/5.19.2/systemsettings-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b829211837100534b788203f8834d058
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.19.1 b/metadata/md5-cache/kde-plasma/user-manager-5.19.1
deleted file mode 100644
index c24cf2c5672b..000000000000
--- a/metadata/md5-cache/kde-plasma/user-manager-5.19.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.70.0:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-libs/libpwquality-1.3.0 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Simple system settings module to manage the users of your system
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kauth-5.70.0:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-libs/libpwquality-1.3.0 sys-apps/accountsservice || ( 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.19.1/user-manager-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2b9a99a9f8924fb04fbf99338abbdadd
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.19.2 b/metadata/md5-cache/kde-plasma/user-manager-5.19.2
new file mode 100644
index 000000000000..a2cb3bf94a5e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/user-manager-5.19.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-libs/libpwquality-1.3.0 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Simple system settings module to manage the users of your system
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-libs/libpwquality-1.3.0 sys-apps/accountsservice || ( 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.19.2/user-manager-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a9367e4fc3a1c99dfdaff8c3694a4d4d
diff --git a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.19.1 b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.19.1
deleted file mode 100644
index aad922aed449..000000000000
--- a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.19.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.70.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5[cups] >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kirigami-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/plasma-5.70.0:5 screencast? ( media-libs/libepoxy media-libs/mesa[gbm] media-video/pipewire:= ) >=dev-qt/qtconcurrent-5.14.2:5 >=kde-frameworks/kwayland-5.70.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=screencast debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5[cups] >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kirigami-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/plasma-5.70.0:5 screencast? ( media-libs/libepoxy media-libs/mesa[gbm] media-video/pipewire:= ) 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/plasma/5.19.1/xdg-desktop-portal-kde-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4824b4f786a1b7d59fc3d101d5d26c11
diff --git a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.19.2 b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.19.2
new file mode 100644
index 000000000000..5b424aa69660
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.19.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5[cups] >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kirigami-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 screencast? ( media-libs/libepoxy media-libs/mesa[gbm] media-video/pipewire:= ) >=dev-qt/qtconcurrent-5.14.2:5 >=kde-frameworks/kwayland-5.71.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=screencast debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5[cups] >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kirigami-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 screencast? ( media-libs/libepoxy media-libs/mesa[gbm] media-video/pipewire:= ) 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/plasma/5.19.2/xdg-desktop-portal-kde-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cac4517580cdb17729bf585e6b3fb2d0
diff --git a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.19.1 b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.19.1
deleted file mode 100644
index f27960df93ea..000000000000
--- a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.19.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/extra-cmake-modules-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image
-DESCRIPTION=Legacy xembed tray icons support for SNI-only system trays
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtcore-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/extra-cmake-modules-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image !<kde-plasma/plasma-workspace-5.14.2:5 !kde-plasma/xembed-sni-proxy:0
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.19.1/plasma-workspace-5.19.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4f9d513ef7c1daebd14bf34204b0933e
diff --git a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.19.2 b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.19.2
new file mode 100644
index 000000000000..ae5ecbbc5686
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.19.2
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install nofetch prepare test unpack
+DEPEND=>=dev-qt/qtcore-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/extra-cmake-modules-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image
+DESCRIPTION=Legacy xembed tray icons support for SNI-only system trays
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtcore-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/extra-cmake-modules-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image !<kde-plasma/plasma-workspace-5.14.2:5 !kde-plasma/xembed-sni-proxy:0
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.19.2/plasma-workspace-5.19.2.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1af06cecb29badacd4109cb9ec47f8fa
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index e33a8910a24c..6809b824ec4f 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/alpine-2.23 b/metadata/md5-cache/mail-client/alpine-2.23
index 8344bba17f80..08451146e52f 100644
--- a/metadata/md5-cache/mail-client/alpine-2.23
+++ b/metadata/md5-cache/mail-client/alpine-2.23
@@ -5,10 +5,10 @@ DESCRIPTION=An easy to use text-based based mail and news client
 EAPI=7
 HOMEPAGE=http://alpine.x10host.com/alpine/ https://repo.or.cz/alpine.git/
 IUSE=+chappa doc ipv6 kerberos ldap libressl nls onlyalpine passfile smime spell ssl threads
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=sys-libs/ncurses-5.1:0= kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap ) spell? ( app-text/aspell ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) app-misc/mime-types
 SLOT=0
 SRC_URI=http://alpine.x10host.com/alpine/release/src/alpine-2.23.tar.xz chappa? ( http://alpine.x10host.com/alpine/patches/alpine-2.23/all.patch.gz -> alpine-2.23-chappa.patch.gz )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6b410e54cbc64d6b1ac752d362a58944
+_md5_=21c8f5b814f7d17b5cb3570ea9dc0ade
diff --git a/metadata/md5-cache/mail-client/evolution-3.36.3 b/metadata/md5-cache/mail-client/evolution-3.36.3
index 31c293973ce3..ddcdf64ab503 100644
--- a/metadata/md5-cache/mail-client/evolution-3.36.3
+++ b/metadata/md5-cache/mail-client/evolution-3.36.3
@@ -4,10 +4,10 @@ DESCRIPTION=Integrated mail, addressbook and calendaring functionality
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
 IUSE=archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP
 RDEPEND=>=app-crypt/gcr-3.4:=[gtk] >=app-text/enchant-2.2.0:2 >=dev-libs/glib-2.46:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.36.3:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-2.42:2.4 >=net-libs/webkit-gtk-2.24.0:4 >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/libnotify-0.7:= >=x11-misc/shared-mime-info-0.22 >=app-text/iso-codes-0.49 dev-libs/atk gnome-base/dconf x11-libs/libSM x11-libs/libICE archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) bogofilter? ( mail-filter/bogofilter ) geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0 x11-libs/mx:1.0 ) ldap? ( >=net-nds/openldap-2:= ) spamassassin? ( mail-filter/spamassassin ) spell? ( >=app-text/gspell-1.8:= ) ssl? ( >=dev-libs/nspr-4.6.1:= >=dev-libs/nss-3.11:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) ytnef? ( net-mail/ytnef ) highlight? ( app-text/highlight ) !gnome-extra/evolution-exchange
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/evolution/3.36/evolution-3.36.3.tar.xz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f5e88f1e4cdc5687f3abded020222843
+_md5_=0aabfeac256b6f0637b4526f8621cc35
diff --git a/metadata/md5-cache/mail-client/mutt-1.13.5 b/metadata/md5-cache/mail-client/mutt-1.13.5
deleted file mode 100644
index 1bd4ea8ba8c5..000000000000
--- a/metadata/md5-cache/mail-client/mutt-1.13.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=app-misc/mime-types virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn2 ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A small but very powerful text-based mail client
-EAPI=6
-HOMEPAGE=http://www.mutt.org/
-IUSE=berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix
-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=GPL-2
-RDEPEND=app-misc/mime-types virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn2 ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) selinux? ( sec-policy/selinux-mutt ) smime-classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) pgp-classic? ( app-crypt/gnupg )
-REQUIRED_USE=hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) imap? ( ssl ) pop? ( ssl ) smime-classic? ( ssl !gnutls ) smtp? ( ssl sasl ) sasl? ( || ( imap pop smtp ) ) kerberos? ( || ( imap pop smtp ) )
-SLOT=0
-SRC_URI=ftp://ftp.mutt.org/pub/mutt/mutt-1.13.5.tar.gz https://bitbucket.org/mutt/mutt/downloads/mutt-1.13.5.tar.gz https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-1.13.5-patches-r0.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=55ceae7e8f4cdc20b1890f088bcbd97d
diff --git a/metadata/md5-cache/mail-client/mutt-1.14.3 b/metadata/md5-cache/mail-client/mutt-1.14.3
deleted file mode 100644
index 94149352c21f..000000000000
--- a/metadata/md5-cache/mail-client/mutt-1.14.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=app-misc/mime-types virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn2 ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) autocrypt? ( >=dev-db/sqlite-3 ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A small but very powerful text-based mail client
-EAPI=6
-HOMEPAGE=http://www.mutt.org/
-IUSE=autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix
-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=GPL-2
-RDEPEND=app-misc/mime-types virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn2 ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) autocrypt? ( >=dev-db/sqlite-3 ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) selinux? ( sec-policy/selinux-mutt ) smime-classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) pgp-classic? ( app-crypt/gnupg )
-REQUIRED_USE=hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) imap? ( ssl ) pop? ( ssl ) smime-classic? ( ssl !gnutls ) smtp? ( ssl sasl ) sasl? ( || ( imap pop smtp ) ) kerberos? ( || ( imap pop smtp ) ) autocrypt? ( gpgme )
-SLOT=0
-SRC_URI=ftp://ftp.mutt.org/pub/mutt/mutt-1.14.3.tar.gz https://bitbucket.org/mutt/mutt/downloads/mutt-1.14.3.tar.gz https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-1.14.3-patches-r0.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f542cdb173cba7b50be7757a1be769cc
diff --git a/metadata/md5-cache/mail-client/mutt-1.14.4-r1 b/metadata/md5-cache/mail-client/mutt-1.14.4-r1
index d5c0e37dfd0f..2c05e5940afd 100644
--- a/metadata/md5-cache/mail-client/mutt-1.14.4-r1
+++ b/metadata/md5-cache/mail-client/mutt-1.14.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A small but very powerful text-based mail client
 EAPI=6
 HOMEPAGE=http://www.mutt.org/
 IUSE=autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix
-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=GPL-2
 RDEPEND=app-misc/mime-types virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn2 ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) autocrypt? ( >=dev-db/sqlite-3 ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) selinux? ( sec-policy/selinux-mutt ) smime-classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) pgp-classic? ( app-crypt/gnupg )
 REQUIRED_USE=hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) imap? ( ssl ) pop? ( ssl ) smime-classic? ( ssl !gnutls ) smtp? ( ssl sasl ) sasl? ( || ( imap pop smtp ) ) kerberos? ( || ( imap pop smtp ) ) autocrypt? ( gpgme )
 SLOT=0
 SRC_URI=ftp://ftp.mutt.org/pub/mutt/mutt-1.14.4.tar.gz https://bitbucket.org/mutt/mutt/downloads/mutt-1.14.4.tar.gz https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-1.14.4-patches-r0.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8b4ea53895085abfdddd7722dcc39edf
+_md5_=464177033fefc2fa1674fc9376e40ca1
diff --git a/metadata/md5-cache/mail-client/mutt-1.14.5 b/metadata/md5-cache/mail-client/mutt-1.14.5
new file mode 100644
index 000000000000..b29ca72c9231
--- /dev/null
+++ b/metadata/md5-cache/mail-client/mutt-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=app-misc/mime-types virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn2 ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) autocrypt? ( >=dev-db/sqlite-3 ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A small but very powerful text-based mail client
+EAPI=6
+HOMEPAGE=http://www.mutt.org/
+IUSE=autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix
+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=GPL-2
+RDEPEND=app-misc/mime-types virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn2 ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) autocrypt? ( >=dev-db/sqlite-3 ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) selinux? ( sec-policy/selinux-mutt ) smime-classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) pgp-classic? ( app-crypt/gnupg )
+REQUIRED_USE=hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) imap? ( ssl ) pop? ( ssl ) smime-classic? ( ssl !gnutls ) smtp? ( ssl sasl ) sasl? ( || ( imap pop smtp ) ) kerberos? ( || ( imap pop smtp ) ) autocrypt? ( gpgme )
+SLOT=0
+SRC_URI=ftp://ftp.mutt.org/pub/mutt/mutt-1.14.5.tar.gz https://bitbucket.org/mutt/mutt/downloads/mutt-1.14.5.tar.gz https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-1.14.5-patches-r0.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1b22f770a74d063c67286dbf35d6bbe9
diff --git a/metadata/md5-cache/mail-client/roundcube-1.3.11 b/metadata/md5-cache/mail-client/roundcube-1.3.11
index e6816edd0372..01f2b88e6d0c 100644
--- a/metadata/md5-cache/mail-client/roundcube-1.3.11
+++ b/metadata/md5-cache/mail-client/roundcube-1.3.11
@@ -4,11 +4,11 @@ DESCRIPTION=A browser-based multilingual IMAP client with an application-like us
 EAPI=7
 HOMEPAGE=https://roundcube.net
 IUSE=change-password enigma ldap managesieve mysql postgres sqlite ssl spell vhosts
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 sparc x86
+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] >=dev-php/PEAR-Auth_SASL-1.1.0 >=dev-php/PEAR-Mail_Mime-1.10.0 >=dev-php/PEAR-Mail_mimeDecode-1.5.5 >=dev-php/PEAR-Net_IDNA2-0.2.0 >=dev-php/PEAR-Net_SMTP-1.7.1 virtual/httpd-php change-password? ( >=dev-php/PEAR-Net_Socket-1.2.1 dev-lang/php[sockets] ) enigma? ( >=dev-php/PEAR-Crypt_GPG-1.6.0 app-crypt/gnupg ) ldap? ( >=dev-php/PEAR-Net_LDAP2-2.2.0 dev-php/PEAR-Net_LDAP3 ) managesieve? ( >=dev-php/PEAR-Net_Sieve-1.4.0 ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) spell? ( dev-lang/php[curl,spell] ) >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysql postgres sqlite )
 SLOT=1.3.11
 SRC_URI=https://github.com/roundcube/roundcubemail/releases/download/1.3.11/roundcubemail-1.3.11-complete.tar.gz
 _eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=9b016da2b408c2aa65af695fb83a2f30
+_md5_=fc40f7bd320d0d87ac3616a75bc4dd35
diff --git a/metadata/md5-cache/mail-client/trojita-0.7-r4 b/metadata/md5-cache/mail-client/trojita-0.7-r4
new file mode 100644
index 000000000000..43b4a87cb70e
--- /dev/null
+++ b/metadata/md5-cache/mail-client/trojita-0.7-r4
@@ -0,0 +1,16 @@
+BDEPEND=dev-qt/linguist-tools:5 zlib? ( virtual/pkgconfig ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 crypt? ( >=app-crypt/gpgme-1.8.0[cxx,qt5] dev-libs/mimetic ) dbus? ( dev-qt/qtdbus:5 ) password? ( dev-libs/qtkeychain[qt5(+)] ) zlib? ( sys-libs/zlib ) test? ( dev-qt/qttest:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A Qt IMAP e-mail client
+EAPI=7
+HOMEPAGE=http://trojita.flaska.net/
+IUSE=+crypt +dbus debug +password test +zlib test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 crypt? ( >=app-crypt/gpgme-1.8.0[cxx,qt5] dev-libs/mimetic ) dbus? ( dev-qt/qtdbus:5 ) password? ( dev-libs/qtkeychain[qt5(+)] ) zlib? ( sys-libs/zlib )
+REQUIRED_USE=password? ( dbus )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://sourceforge/trojita/trojita-0.7.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5838175cb7cffcaa9073cb45c43b8916
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index ac99456bef84..46ecf4c71ad5 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/libmilter-1.0.2_p1 b/metadata/md5-cache/mail-filter/libmilter-1.0.2_p1
index 9756c19a22bc..50af082862f0 100644
--- a/metadata/md5-cache/mail-filter/libmilter-1.0.2_p1
+++ b/metadata/md5-cache/mail-filter/libmilter-1.0.2_p1
@@ -10,4 +10,4 @@ RDEPEND=!mail-mta/sendmail
 SLOT=0
 SRC_URI=ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.15.2.tar.gz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3dd8d35826f9c386b9c506678348eb9e
+_md5_=cb7408c759af8d0a651b028789d34983
diff --git a/metadata/md5-cache/mail-filter/spamassassin-botnet-0.8-r1 b/metadata/md5-cache/mail-filter/spamassassin-botnet-0.8-r1
index 01179da93f82..8c933b39e17f 100644
--- a/metadata/md5-cache/mail-filter/spamassassin-botnet-0.8-r1
+++ b/metadata/md5-cache/mail-filter/spamassassin-botnet-0.8-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=mail-filter/spamassassin-3.0.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://people.ucsc.edu/~jrudd/spamassassin/Botnet-0.8.tar
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6f7c8adc0a717c8e20d6eb28c1bed875
diff --git a/metadata/md5-cache/mail-filter/sqlgrey-1.8.0 b/metadata/md5-cache/mail-filter/sqlgrey-1.8.0
index a97c7ef2a7e0..1d21092ff3b9 100644
--- a/metadata/md5-cache/mail-filter/sqlgrey-1.8.0
+++ b/metadata/md5-cache/mail-filter/sqlgrey-1.8.0
@@ -5,11 +5,11 @@ DESCRIPTION=A postfix policy service implementing a grey-listing policy
 EAPI=7
 HOMEPAGE=http://sqlgrey.sourceforge.net/
 IUSE=mysql postgres +sqlite
-KEYWORDS=~amd64 ~arm ~sparc ~x86
+KEYWORDS=amd64 ~arm sparc x86
 LICENSE=GPL-2
 RDEPEND=acct-user/sqlgrey dev-lang/perl dev-perl/DBI dev-perl/Date-Calc dev-perl/Net-Server virtual/mailx mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
 REQUIRED_USE=|| ( mysql postgres sqlite )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/sqlgrey/sqlgrey-1.8%20%28stable%29/sqlgrey-1.8.0.tar.gz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1860a71cf5d399f5f0c089d11ca92c9b
+_md5_=4e8d09e1b235c41298cc035a49997fec
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index ec820ae3de0e..11c75a23600b 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/netqmail-1.06-r13 b/metadata/md5-cache/mail-mta/netqmail-1.06-r13
index 103b4a85648b..2688529e8943 100644
--- a/metadata/md5-cache/mail-mta/netqmail-1.06-r13
+++ b/metadata/md5-cache/mail-mta/netqmail-1.06-r13
@@ -11,5 +11,5 @@ REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://qmail/netqmail-1.06.tar.gz https://github.com/DerDakon/genqmail/releases/download/genqmail-20191010/genqmail-20191010.tar.bz2 https://www.ckdhr.com/ckd/qmail-103.patch !vanilla? ( highvolume? ( mirror://qmail/big-todo.103.patch ) qmail-spp? ( mirror://sourceforge/qmail-spp/qmail-spp-0.42.tar.gz ) ssl? ( https://mirror.alexh.name/qmail/netqmail/netqmail-1.05-tls-smtpauth-20190114.patch http://inoa.net/qmail-tls/vu555316.patch https://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch ) )
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	qmail	83a4685f5044b0b067cb7e6f0e9c909c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	qmail	d71e87f6dc80bb9af62fd46856dc0a92	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4c64fa3450bf20ccdf15f066154644b0
diff --git a/metadata/md5-cache/mail-mta/notqmail-1.08 b/metadata/md5-cache/mail-mta/notqmail-1.08
deleted file mode 100644
index 13bbed619714..000000000000
--- a/metadata/md5-cache/mail-mta/notqmail-1.08
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile config install postinst preinst prepare test unpack
-DEPEND=net-dns/libidn2 net-mail/queue-repair sys-apps/gentoo-functions ssl? ( !libressl? ( >=dev-libs/openssl-1.1:0= ) libressl? ( dev-libs/libressl:= ) ) test? ( dev-libs/check )
-DESCRIPTION=qmail -- a secure, reliable, efficient, simple message transfer agent
-EAPI=7
-HOMEPAGE=https://notqmail.org https://cr.yp.to/qmail.html http://qmail.org
-IUSE=authcram gencertdaily highvolume libressl -pop3 qmail-spp ssl test vanilla
-KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=public-domain
-RDEPEND=net-dns/libidn2 net-mail/queue-repair sys-apps/gentoo-functions ssl? ( !libressl? ( >=dev-libs/openssl-1.1:0= ) libressl? ( dev-libs/libressl:= ) ) test? ( dev-libs/check ) acct-group/nofiles acct-group/qmail acct-user/alias acct-user/qmaild acct-user/qmaill acct-user/qmailp acct-user/qmailq acct-user/qmailr acct-user/qmails sys-apps/ucspi-tcp virtual/checkpassword virtual/daemontools authcram? ( >=net-mail/cmd5checkpw-0.30 ) ssl? ( pop3? ( sys-apps/ucspi-ssl ) ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp[mta] !mail-mta/nullmailer !mail-mta/opensmtpd !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/netqmail !mail-mta/sendmail !mail-mta/ssmtp[mta]
-REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/notqmail/notqmail/releases/download/notqmail-1.08/notqmail-1.08.tar.xz https://github.com/DerDakon/genqmail/releases/download/genqmail-20191010/genqmail-20191010.tar.bz2 https://www.ckdhr.com/ckd/qmail-103.patch !vanilla? ( highvolume? ( https://github.com/notqmail/notqmail/commit/3a22b45974ddd1230da0dfa21f886c3401bee020.patch -> notqmail-1.08-big-todo.patch ) qmail-spp? ( mirror://sourceforge/qmail-spp/qmail-spp-0.42.tar.gz ) https://github.com/notqmail/notqmail/commit/b224a3ceb63ff8ebc57648bf304e079d0bf55023.patch -> notqmail-1.08-auth.patch ssl? ( https://github.com/notqmail/notqmail/commit/ed58c2eff21612037bbcc633f4b3a8e708f522a0.patch -> notqmail-1.08-tls-20200107.patch ) )
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	qmail	83a4685f5044b0b067cb7e6f0e9c909c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=069a37b038de01eb42ad9c6adcfa6457
diff --git a/metadata/md5-cache/mail-mta/notqmail-1.08-r1 b/metadata/md5-cache/mail-mta/notqmail-1.08-r1
new file mode 100644
index 000000000000..97822c69ce77
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/notqmail-1.08-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config install postinst preinst prepare test unpack
+DEPEND=net-dns/libidn2 net-mail/queue-repair sys-apps/gentoo-functions ssl? ( !libressl? ( >=dev-libs/openssl-1.1:0= ) libressl? ( dev-libs/libressl:= ) ) test? ( dev-libs/check )
+DESCRIPTION=qmail -- a secure, reliable, efficient, simple message transfer agent
+EAPI=7
+HOMEPAGE=https://notqmail.org https://cr.yp.to/qmail.html http://qmail.org
+IUSE=authcram gencertdaily highvolume libressl -pop3 qmail-spp ssl test vanilla
+KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=public-domain
+RDEPEND=net-dns/libidn2 net-mail/queue-repair sys-apps/gentoo-functions ssl? ( !libressl? ( >=dev-libs/openssl-1.1:0= ) libressl? ( dev-libs/libressl:= ) ) test? ( dev-libs/check ) acct-group/nofiles acct-group/qmail acct-user/alias acct-user/qmaild acct-user/qmaill acct-user/qmailp acct-user/qmailq acct-user/qmailr acct-user/qmails sys-apps/ucspi-tcp virtual/checkpassword virtual/daemontools authcram? ( >=net-mail/cmd5checkpw-0.30 ) ssl? ( pop3? ( sys-apps/ucspi-ssl ) ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp[mta] !mail-mta/nullmailer !mail-mta/opensmtpd !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/netqmail !mail-mta/sendmail !mail-mta/ssmtp[mta]
+REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/notqmail/notqmail/releases/download/notqmail-1.08/notqmail-1.08.tar.xz https://github.com/DerDakon/genqmail/releases/download/genqmail-20191010/genqmail-20191010.tar.bz2 https://www.ckdhr.com/ckd/qmail-103.patch !vanilla? ( highvolume? ( https://github.com/notqmail/notqmail/commit/3a22b45974ddd1230da0dfa21f886c3401bee020.patch -> notqmail-1.08-big-todo.patch ) qmail-spp? ( mirror://sourceforge/qmail-spp/qmail-spp-0.42.tar.gz ) https://github.com/notqmail/notqmail/commit/b224a3ceb63ff8ebc57648bf304e079d0bf55023.patch -> notqmail-1.08-auth.patch ssl? ( https://github.com/notqmail/notqmail/commit/ed58c2eff21612037bbcc633f4b3a8e708f522a0.patch -> notqmail-1.08-tls-20200107.patch ) )
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	qmail	d71e87f6dc80bb9af62fd46856dc0a92	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ec287c606f76b2fd5d12956355fdab4b
diff --git a/metadata/md5-cache/mail-mta/notqmail-9999 b/metadata/md5-cache/mail-mta/notqmail-9999
index 7f6884408f51..9652e13b2faa 100644
--- a/metadata/md5-cache/mail-mta/notqmail-9999
+++ b/metadata/md5-cache/mail-mta/notqmail-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile config install postinst preinst prepare test unpack
 DEPEND=net-dns/libidn2 net-mail/queue-repair sys-apps/gentoo-functions ssl? ( !libressl? ( >=dev-libs/openssl-1.1:0= ) libressl? ( dev-libs/libressl:= ) ) test? ( dev-libs/check )
 DESCRIPTION=qmail -- a secure, reliable, efficient, simple message transfer agent
@@ -12,5 +12,5 @@ REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/DerDakon/genqmail/releases/download/genqmail-20191010/genqmail-20191010.tar.bz2 https://www.ckdhr.com/ckd/qmail-103.patch !vanilla? ( highvolume? ( https://github.com/notqmail/notqmail/commit/3a22b45974ddd1230da0dfa21f886c3401bee020.patch -> notqmail-1.08-big-todo.patch ) qmail-spp? ( mirror://sourceforge/qmail-spp/qmail-spp-0.42.tar.gz ) https://github.com/notqmail/notqmail/commit/b224a3ceb63ff8ebc57648bf304e079d0bf55023.patch -> notqmail-1.08-auth.patch ssl? ( https://github.com/notqmail/notqmail/commit/ed58c2eff21612037bbcc633f4b3a8e708f522a0.patch -> notqmail-1.08-tls-20200107.patch ) )
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	2477ebe553d3e4d2c606191fe6c33602	qmail	83a4685f5044b0b067cb7e6f0e9c909c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1c2a89f9caebc8e2c874676accf8f6bb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	2477ebe553d3e4d2c606191fe6c33602	qmail	d71e87f6dc80bb9af62fd46856dc0a92	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ec287c606f76b2fd5d12956355fdab4b
diff --git a/metadata/md5-cache/mail-mta/postfix-3.6_pre20200610 b/metadata/md5-cache/mail-mta/postfix-3.6_pre20200610
deleted file mode 100644
index 947755cefecd..000000000000
--- a/metadata/md5-cache/mail-mta/postfix-3.6_pre20200610
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( >=dev-libs/libressl-2.9.1:0= ) )
-DESCRIPTION=A fast and secure drop-in replacement for sendmail
-EAPI=7
-HOMEPAGE=http://www.postfix.org/
-IUSE=+berkdb cdb dovecot-sasl +eai ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=|| ( IBM EPL-2.0 )
-RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( >=dev-libs/libressl-2.9.1:0= ) ) acct-group/postfix acct-group/postdrop acct-user/postfix memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
-REQUIRED_USE=ldap-bind? ( ldap sasl )
-SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.6-20200610.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4b75a70c173ba8be311dcb621a4bb270
diff --git a/metadata/md5-cache/mail-mta/postfix-3.6_pre20200620 b/metadata/md5-cache/mail-mta/postfix-3.6_pre20200620
new file mode 100644
index 000000000000..44d3473279ab
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/postfix-3.6_pre20200620
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( >=dev-libs/libressl-2.9.1:0= ) )
+DESCRIPTION=A fast and secure drop-in replacement for sendmail
+EAPI=7
+HOMEPAGE=http://www.postfix.org/
+IUSE=+berkdb cdb dovecot-sasl +eai ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=|| ( IBM EPL-2.0 )
+RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( >=dev-libs/libressl-2.9.1:0= ) ) acct-group/postfix acct-group/postdrop acct-user/postfix memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
+REQUIRED_USE=ldap-bind? ( ldap sasl )
+SLOT=0
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.6-20200620.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4b75a70c173ba8be311dcb621a4bb270
diff --git a/metadata/md5-cache/mail-mta/qpsmtpd-0.84-r2 b/metadata/md5-cache/mail-mta/qpsmtpd-0.84-r2
index 5099c3a11b3b..e616f860309c 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	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 962f61c9b42d..7f1d78840779 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	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 edf18386d743..2d35d1965f93 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=eeabca5b63ade4cfffa14292f4c6fc2a
diff --git a/metadata/md5-cache/mate-extra/Manifest.gz b/metadata/md5-cache/mate-extra/Manifest.gz
index 850e696f7fac..6c35232e71d1 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-r1 b/metadata/md5-cache/mate-extra/caja-dropbox-1.22.1-r1
index 3812b8fd6bad..7c0eff0a7f3d 100644
--- a/metadata/md5-cache/mate-extra/caja-dropbox-1.22.1-r1
+++ b/metadata/md5-cache/mate-extra/caja-dropbox-1.22.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 python_single_target_python3_6? ( de
 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	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	mate	1d1847564eac8e0da804d51adea0a01d	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	mate	1d1847564eac8e0da804d51adea0a01d	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=929ba32f1af6d0a95ec0e633e9d595d2
diff --git a/metadata/md5-cache/mate-extra/caja-dropbox-1.24.0 b/metadata/md5-cache/mate-extra/caja-dropbox-1.24.0
index 733b692908ba..471e8f40e253 100644
--- a/metadata/md5-cache/mate-extra/caja-dropbox-1.24.0
+++ b/metadata/md5-cache/mate-extra/caja-dropbox-1.24.0
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/caja-dropbox-1.24.0.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	mate	1d1847564eac8e0da804d51adea0a01d	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	mate	1d1847564eac8e0da804d51adea0a01d	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1587860d3ea35910c9fd1eb34b70eea1
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index a17fed7777c1..0886b1d36bc4 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/darktable-3.0.2-r1 b/metadata/md5-cache/media-gfx/darktable-3.0.2-r1
index a0d7531cc9e7..1082350339ff 100644
--- a/metadata/md5-cache/media-gfx/darktable-3.0.2-r1
+++ b/metadata/md5-cache/media-gfx/darktable-3.0.2-r1
@@ -5,10 +5,10 @@ DESCRIPTION=A virtual lighttable and darkroom for photographers
 EAPI=7
 HOMEPAGE=https://www.darktable.org/
 IUSE=colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet lto nls opencl openmp openexr tools webp l10n_ca l10n_cs l10n_da l10n_de l10n_es l10n_fr l10n_he l10n_hu l10n_it l10n_ja l10n_nb l10n_nl l10n_pl l10n_ru l10n_sl
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-3 CC-BY-3.0
 RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 >=dev-libs/pugixml-1.8:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl sys-libs/zlib:= virtual/jpeg:0 x11-libs/cairo >=x11-libs/gtk+-3.22:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:2= ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
 SLOT=0
 SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-3.0.2/darktable-3.0.2.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-3.0.0/darktable-usermanual.pdf -> darktable-usermanual-3.0.0.pdf )
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9d982c6f741f5292773c54c961cb60cd
+_md5_=d565528d5a30c094e64a167084993faf
diff --git a/metadata/md5-cache/media-gfx/gimp-9999 b/metadata/md5-cache/media-gfx/gimp-9999
index f025826fbb79..944ccd205490 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] ) 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 )
+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.2: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.78[introspection,lcms,vala] >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.24:0.4[cairo,introspection,lcms,vala] >=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 ) || ( dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[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 >=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 aqua debug doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec 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] ) 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 )
+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.2: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.78[introspection,lcms,vala] >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.24:0.4[cairo,introspection,lcms,vala] >=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	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1c9f63711ba29cb169fbae7fb95b2e49
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=563d7cdedbfc684b41cc14d1b56ebedf
diff --git a/metadata/md5-cache/media-gfx/graphicsmagick-1.3.35-r1 b/metadata/md5-cache/media-gfx/graphicsmagick-1.3.35-r1
index d40334941289..7be40404287d 100644
--- a/metadata/md5-cache/media-gfx/graphicsmagick-1.3.35-r1
+++ b/metadata/md5-cache/media-gfx/graphicsmagick-1.3.35-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Collection of tools and libraries for many image formats
 EAPI=7
 HOMEPAGE=http://www.graphicsmagick.org/
 IUSE=bzip2 +cxx debug fpx imagemagick jbig jpeg lcms lzma modules openmp perl png postscript q16 q32 static-libs svg threads tiff truetype webp wmf X zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
 RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) fpx? ( media-libs/libfpx ) imagemagick? ( !media-gfx/imagemagick ) jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) svg? ( dev-libs/libxml2 ) tiff? ( media-libs/tiff:0 ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libSM x11-libs/libXext ) zlib? ( sys-libs/zlib )
 SLOT=0/1.3
 SRC_URI=mirror://sourceforge/graphicsmagick/GraphicsMagick-1.3.35.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1edf9cd39713bf6aa04fc3484c0f174f
+_md5_=563a6ca1501816299fa3c6b0428060cb
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.11.16 b/metadata/md5-cache/media-gfx/imagemagick-6.9.11.16
deleted file mode 100644
index f471682c2322..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.11.16
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=6
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
-RESTRICT=perl? ( userpriv ) !test? ( test )
-SLOT=0/6.9.11
-SRC_URI=mirror://imagemagick/ImageMagick-6.9.11-16.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=032d990205dc20cb5d0a14eef10a5a6a
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.11.19 b/metadata/md5-cache/media-gfx/imagemagick-6.9.11.19
index f0fa3e747d26..3b80d68007c1 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.11.19
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.11.19
@@ -4,7 +4,7 @@ DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=6
 HOMEPAGE=https://www.imagemagick.org/
 IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
 RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
@@ -12,4 +12,4 @@ RESTRICT=perl? ( userpriv ) !test? ( test )
 SLOT=0/6.9.11
 SRC_URI=mirror://imagemagick/ImageMagick-6.9.11-19.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=032d990205dc20cb5d0a14eef10a5a6a
+_md5_=3996e7f063ede8587d8c086e39cc91e1
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.11.22 b/metadata/md5-cache/media-gfx/imagemagick-6.9.11.22
new file mode 100644
index 000000000000..738a67a983ec
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.11.22
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815
+DESCRIPTION=A collection of tools and libraries for many image formats
+EAPI=6
+HOMEPAGE=https://www.imagemagick.org/
+IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=imagemagick
+RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
+RESTRICT=perl? ( userpriv ) !test? ( test )
+SLOT=0/6.9.11
+SRC_URI=mirror://imagemagick/ImageMagick-6.9.11-22.tar.xz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=032d990205dc20cb5d0a14eef10a5a6a
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.11.9 b/metadata/md5-cache/media-gfx/imagemagick-6.9.11.9
deleted file mode 100644
index 64e49e1710d6..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.11.9
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=6
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
-RESTRICT=perl? ( userpriv ) !test? ( test )
-SLOT=0/6.9.11
-SRC_URI=mirror://imagemagick/ImageMagick-6.9.11-9.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3996e7f063ede8587d8c086e39cc91e1
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.10.16 b/metadata/md5-cache/media-gfx/imagemagick-7.0.10.16
deleted file mode 100644
index 7b3d40cc985b..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-7.0.10.16
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] X? ( x11-base/xorg-proto )
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=7
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
-RESTRICT=!test? ( test )
-SLOT=0/7.0.10
-SRC_URI=mirror://imagemagick/ImageMagick-7.0.10-16.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a3938d9325d00930f04e54db5078f307
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.10.16-r2 b/metadata/md5-cache/media-gfx/imagemagick-7.0.10.16-r2
deleted file mode 100644
index 086a30a37e3d..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-7.0.10.16-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] X? ( x11-base/xorg-proto )
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=7
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
-RESTRICT=!test? ( test )
-SLOT=0/7.0.10
-SRC_URI=mirror://imagemagick/ImageMagick-7.0.10-16.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1c53b1bc70e8a197fcd2bd35ac30feaf
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.10.19 b/metadata/md5-cache/media-gfx/imagemagick-7.0.10.19
index f884cf193444..8ded8c67491f 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-7.0.10.19
+++ b/metadata/md5-cache/media-gfx/imagemagick-7.0.10.19
@@ -5,7 +5,7 @@ DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=7
 HOMEPAGE=https://www.imagemagick.org/
 IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
 RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/7.0.10
 SRC_URI=mirror://imagemagick/ImageMagick-7.0.10-19.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1c53b1bc70e8a197fcd2bd35ac30feaf
+_md5_=2c10972a5256c6835fd50e09ef469aad
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.10.22 b/metadata/md5-cache/media-gfx/imagemagick-7.0.10.22
new file mode 100644
index 000000000000..b6eb67c022e4
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imagemagick-7.0.10.22
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] X? ( x11-base/xorg-proto )
+DESCRIPTION=A collection of tools and libraries for many image formats
+EAPI=7
+HOMEPAGE=https://www.imagemagick.org/
+IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=imagemagick
+RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
+RESTRICT=!test? ( test )
+SLOT=0/7.0.10
+SRC_URI=mirror://imagemagick/ImageMagick-7.0.10-22.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=089122d5086e3360290d740c237d1af2
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.10.9 b/metadata/md5-cache/media-gfx/imagemagick-7.0.10.9
deleted file mode 100644
index 52c7518662ef..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-7.0.10.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] X? ( x11-base/xorg-proto )
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=7
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
-RESTRICT=!test? ( test )
-SLOT=0/7.0.10
-SRC_URI=mirror://imagemagick/ImageMagick-7.0.10-9.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ffd9a7c7f5af99fe1eb48b3264a4fa73
diff --git a/metadata/md5-cache/media-gfx/iscan-plugin-network-nt-1.1.3 b/metadata/md5-cache/media-gfx/iscan-plugin-network-nt-1.1.3
index a5a88a3160d1..4963224dd541 100644
--- a/metadata/md5-cache/media-gfx/iscan-plugin-network-nt-1.1.3
+++ b/metadata/md5-cache/media-gfx/iscan-plugin-network-nt-1.1.3
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/iscan
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://download2.ebz.epson.net/imagescanv3/centos/latest1/rpm/x64/imagescan-bundle-centos-8-3.62.0.x64.rpm.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0677ea4b3fb933c13d11c48a2e040f5e
diff --git a/metadata/md5-cache/media-gfx/llgal-0.13.17-r2 b/metadata/md5-cache/media-gfx/llgal-0.13.17-r2
index 47631e04d221..dd7a8b69b89f 100644
--- a/metadata/md5-cache/media-gfx/llgal-0.13.17-r2
+++ b/metadata/md5-cache/media-gfx/llgal-0.13.17-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-gfx/imagemagick dev-perl/Image-Size dev-perl/URI dev-perl/Locale-gettext exif? ( media-libs/exiftool ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://download.gna.org/llgal/llgal-0.13.17.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=823f121b825c6e8f5740d042c0c53d57
diff --git a/metadata/md5-cache/media-gfx/llgal-0.13.18 b/metadata/md5-cache/media-gfx/llgal-0.13.18
index 2323d07858b3..fbb3a2d76a4f 100644
--- a/metadata/md5-cache/media-gfx/llgal-0.13.18
+++ b/metadata/md5-cache/media-gfx/llgal-0.13.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-gfx/imagemagick dev-perl/Image-Size dev-perl/URI dev-perl/Locale-gettext exif? ( media-libs/exiftool ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://download.gna.org/llgal/llgal-0.13.18.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=295383c077acce296a2ee2d26802ecca
diff --git a/metadata/md5-cache/media-gfx/meshlab-2016.12-r4 b/metadata/md5-cache/media-gfx/meshlab-2016.12-r4
index 185fc9d5ae4d..9adf1d3d0dbb 100644
--- a/metadata/md5-cache/media-gfx/meshlab-2016.12-r4
+++ b/metadata/md5-cache/media-gfx/meshlab-2016.12-r4
@@ -1,7 +1,7 @@
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-cpp/eigen:3 dev-cpp/muParser dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-qt/qtscript:5 dev-qt/qtxmlpatterns:5 >=media-gfx/jhead-3.00-r2 media-libs/glew:0 media-libs/qhull =media-libs/lib3ds-1* media-libs/openctm sci-libs/levmar sci-libs/mpir
-DESCRIPTION=the open source system for processing and editing 3D triangular meshes
-EAPI=6
+DESCRIPTION=The open source system for processing and editing 3D triangular meshes
+EAPI=7
 HOMEPAGE=http://www.meshlab.net
 IUSE=-minimal
 KEYWORDS=~amd64 ~x86
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/eigen:3 dev-cpp/muParser dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-qt/qtscript:5 dev-qt/qtxmlpatterns:5 >=media-gfx/jhead-3.00-r2 media-libs/glew:0 media-libs/qhull =media-libs/lib3ds-1* media-libs/openctm sci-libs/levmar sci-libs/mpir
 SLOT=0
 SRC_URI=https://github.com/cnr-isti-vclab/meshlab/archive/v2016.12.tar.gz -> meshlab-2016.12.tar.gz https://github.com/cnr-isti-vclab/vcglib/archive/v1.0.1.tar.gz -> vcglib-1.0.1.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=22ce530a642d76f8ecacc859aea2a427
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e6a8b87d3060359629f37cb36e4b376a
diff --git a/metadata/md5-cache/media-gfx/monica-3.7 b/metadata/md5-cache/media-gfx/monica-3.7
index f8eac5117def..462701448b63 100644
--- a/metadata/md5-cache/media-gfx/monica-3.7
+++ b/metadata/md5-cache/media-gfx/monica-3.7
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install
 DEPEND=>=x11-libs/fltk-1.1:1
 DESCRIPTION=Monica is a Monitor Calibration Tool
 EAPI=6
-HOMEPAGE=http://freecode.com/projects/monica
+HOMEPAGE=http://freshmeat.sourceforge.net/projects/monica
 KEYWORDS=amd64 ppc x86
 LICENSE=BSD
 RDEPEND=>=x11-libs/fltk-1.1:1 x11-apps/xgamma
 SLOT=0
 SRC_URI=mirror://gentoo/monica-3.7.tar.bz2
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=08706ff3515f0d40b93156d44e1b816a
+_md5_=8e7300cc5be727bd4d707f9146c82185
diff --git a/metadata/md5-cache/media-gfx/mypaint-brushes-1.3.0-r1 b/metadata/md5-cache/media-gfx/mypaint-brushes-1.3.0-r1
index ef65022ee702..b2dbf580c509 100644
--- a/metadata/md5-cache/media-gfx/mypaint-brushes-1.3.0-r1
+++ b/metadata/md5-cache/media-gfx/mypaint-brushes-1.3.0-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=prepare
 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=Default MyPaint brushes
 EAPI=6
-HOMEPAGE=https://github.com/Jehan/mypaint-brushes
+HOMEPAGE=https://github.com/mypaint/mypaint-brushes
 KEYWORDS=~alpha amd64 arm64 ~hppa ~ia64 ppc64 x86
 LICENSE=CC0-1.0
 SLOT=1.0
-SRC_URI=https://github.com/Jehan/mypaint-brushes/archive/v1.3.0.tar.gz -> mypaint-brushes-1.3.0.tar.gz
+SRC_URI=https://github.com/mypaint/mypaint-brushes/archive/v1.3.0.tar.gz -> mypaint-brushes-1.3.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2e260fc9029c76956fe24bed1c008552
+_md5_=bf3289e6a35d85082309602fe4977195
diff --git a/metadata/md5-cache/media-gfx/netpaint-1.1.2 b/metadata/md5-cache/media-gfx/netpaint-1.1.2
new file mode 100644
index 000000000000..e401eaf0546a
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/netpaint-1.1.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-42.0.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=dev-python/urwid[python_targets_python3_6(-)?,python_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(-)] 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=curses-based drawing tool
+EAPI=7
+HOMEPAGE=https://github.com/SyntheticDreams/NetPaint
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/urwid[python_targets_python3_6(-)?,python_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 )
+SLOT=0
+SRC_URI=https://github.com/SyntheticDreams/netpaint/archive/v1.1.2.tar.gz -> netpaint-1.1.2.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=213a9093071e2a8714bf3be4c9f738f7
diff --git a/metadata/md5-cache/media-gfx/pngquant-2.12.6 b/metadata/md5-cache/media-gfx/pngquant-2.12.6
index cc4c83132c6e..492a665e3951 100644
--- a/metadata/md5-cache/media-gfx/pngquant-2.12.6
+++ b/metadata/md5-cache/media-gfx/pngquant-2.12.6
@@ -4,7 +4,7 @@ DESCRIPTION=Command-line utility and library for lossy compression of PNG images
 EAPI=7
 HOMEPAGE=https://pngquant.org/ https://github.com/kornelski/pngquant
 IUSE=cpu_flags_x86_sse2 debug lcms openmp test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=GPL-3 HPND rwpng
 RDEPEND=media-libs/libpng:0= media-gfx/libimagequant:= sys-libs/zlib:= lcms? ( media-libs/lcms:2 )
 REQUIRED_USE=test? ( lcms )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kornelski/pngquant/archive/2.12.6.tar.gz -> pngquant-2.12.6.tar.gz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=692b8e7b0292fc3c5753d41c5ce5a7c5
+_md5_=5db68314d4dfaad646fe5788feaa02f3
diff --git a/metadata/md5-cache/media-gfx/pqiv-2.11 b/metadata/md5-cache/media-gfx/pqiv-2.11
index 7d764bcaeedc..a419d0ab7724 100644
--- a/metadata/md5-cache/media-gfx/pqiv-2.11
+++ b/metadata/md5-cache/media-gfx/pqiv-2.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/cairo-1.6 x11-libs/gtk+:3 archive? ( app-arch/libarchive:0= ) ffmpeg? ( media-video/ffmpeg:0= ) imagemagick? ( media-gfx/imagemagick:0= ) pdf? ( app-text/poppler:0= ) postscript? ( app-text/libspectre:0= ) webp? ( media-libs/libwebp:0= )
 SLOT=0
 SRC_URI=https://github.com/phillipberndt/pqiv/archive/2.11.tar.gz -> pqiv-2.11.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=36f0fc3e0139cf134c83361bf9162369
diff --git a/metadata/md5-cache/media-gfx/pqiv-9999 b/metadata/md5-cache/media-gfx/pqiv-9999
index bf20de6d9374..9c0826c4ebd9 100644
--- a/metadata/md5-cache/media-gfx/pqiv-9999
+++ b/metadata/md5-cache/media-gfx/pqiv-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/cairo-1.6 x11-libs/gtk+:3 archive? ( app-arch/libarchive:0= ) ffmpeg? ( media-video/ffmpeg:0= ) imagemagick? ( media-gfx/imagemagick:0= ) pdf? ( app-text/poppler:0= ) postscript? ( app-text/libspectre:0= ) webp? ( media-libs/libwebp:0= )
 SLOT=0
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d34cdd4ff6f237f963b0a5d174d3585f
diff --git a/metadata/md5-cache/media-gfx/sane-backends-1.0.30-r2 b/metadata/md5-cache/media-gfx/sane-backends-1.0.30-r2
new file mode 100644
index 000000000000..2501d3a7fe4f
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/sane-backends-1.0.30-r2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/autoconf-archive 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 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=gphoto2? ( >=media-libs/libgphoto2-2.5.3.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dell1600n_net? ( >=media-libs/tiff-3.9.7-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_escl? ( net-dns/avahi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_pixma? ( >=virtual/jpeg-0-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(-)?] ) snmp? ( net-analyzer/net-snmp:0= ) systemd? ( sys-apps/systemd:0= ) usb? ( >=virtual/libusb-1-r1:1=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) dev-libs/libxml2 v4l? ( sys-kernel/linux-headers )
+DESCRIPTION=Scanner Access Now Easy - Backends
+EAPI=7
+HOMEPAGE=http://www.sane-project.org/
+IUSE=gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf +sane_backends_abaton +sane_backends_agfafocus +sane_backends_apple +sane_backends_artec +sane_backends_artec_eplus48u +sane_backends_as6e +sane_backends_avision +sane_backends_bh +sane_backends_canon +sane_backends_canon630u +sane_backends_canon_dr sane_backends_canon_pp +sane_backends_cardscan +sane_backends_coolscan +sane_backends_coolscan2 +sane_backends_coolscan3 +sane_backends_dc210 +sane_backends_dc240 +sane_backends_dc25 +sane_backends_dell1600n_net +sane_backends_dmc +sane_backends_epjitsu +sane_backends_epson +sane_backends_epson2 +sane_backends_escl +sane_backends_fujitsu +sane_backends_genesys +sane_backends_gt68xx +sane_backends_hp +sane_backends_hp3500 +sane_backends_hp3900 +sane_backends_hp4200 +sane_backends_hp5400 +sane_backends_hp5590 +sane_backends_hpljm1005 sane_backends_hpsj5s +sane_backends_hs2p +sane_backends_ibm +sane_backends_kodak +sane_backends_kodakaio +sane_backends_kvs1025 +sane_backends_kvs20xx sane_backends_kvs40xx +sane_backends_leo +sane_backends_lexmark +sane_backends_ma1509 +sane_backends_magicolor +sane_backends_matsushita +sane_backends_microtek +sane_backends_microtek2 +sane_backends_mustek sane_backends_mustek_pp +sane_backends_mustek_usb sane_backends_mustek_usb2 +sane_backends_nec +sane_backends_net +sane_backends_niash +sane_backends_p5 +sane_backends_pie +sane_backends_pixma +sane_backends_plustek +sane_backends_plustek_pp sane_backends_pnm +sane_backends_qcam +sane_backends_ricoh +sane_backends_ricoh2 +sane_backends_rts8891 +sane_backends_s9036 +sane_backends_sceptre +sane_backends_sharp +sane_backends_sm3600 +sane_backends_sm3840 +sane_backends_snapscan +sane_backends_sp15c +sane_backends_st400 +sane_backends_stv680 +sane_backends_tamarack +sane_backends_teco1 +sane_backends_teco2 +sane_backends_teco3 +sane_backends_test +sane_backends_u12 +sane_backends_umax +sane_backends_umax1220u +sane_backends_umax_pp +sane_backends_xerox_mfp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2 public-domain
+RDEPEND=gphoto2? ( >=media-libs/libgphoto2-2.5.3.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dell1600n_net? ( >=media-libs/tiff-3.9.7-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_escl? ( net-dns/avahi[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_pixma? ( >=virtual/jpeg-0-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(-)?] ) snmp? ( net-analyzer/net-snmp:0= ) systemd? ( sys-apps/systemd:0= ) usb? ( >=virtual/libusb-1-r1:1=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] )
+REQUIRED_USE=sane_backends_escl? ( zeroconf ) sane_backends_kvs40xx? ( threads ) sane_backends_mustek_usb2? ( threads )
+SLOT=0
+SRC_URI=https://gitlab.com/sane-project/backends/-/archive/1.0.30/backends-1.0.30.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=69a1ca4a248e1dcb36f80ee9d7ae79a9
diff --git a/metadata/md5-cache/media-gfx/scrot-9999 b/metadata/md5-cache/media-gfx/scrot-9999
index 444aa66a334b..84c49d566ce3 100644
--- a/metadata/md5-cache/media-gfx/scrot-9999
+++ b/metadata/md5-cache/media-gfx/scrot-9999
@@ -1,12 +1,12 @@
 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 prepare unpack
-DEPEND=>=media-libs/giblib-1.2.3 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes || ( media-libs/imlib2[gif] media-libs/imlib2[jpeg] media-libs/imlib2[png] media-libs/imlib2[tiff] ) x11-base/xorg-proto
+DEPEND=>=media-libs/giblib-1.2.3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes || ( media-libs/imlib2[gif] media-libs/imlib2[jpeg] media-libs/imlib2[png] media-libs/imlib2[tiff] ) x11-base/xorg-proto
 DESCRIPTION=Screen capture utility using imlib2 library
 EAPI=7
 HOMEPAGE=https://github.com/resurrecting-open-source-projects/scrot
 LICENSE=feh LGPL-2+
 PROPERTIES=live
-RDEPEND=>=media-libs/giblib-1.2.3 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes || ( media-libs/imlib2[gif] media-libs/imlib2[jpeg] media-libs/imlib2[png] media-libs/imlib2[tiff] )
+RDEPEND=>=media-libs/giblib-1.2.3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes || ( media-libs/imlib2[gif] media-libs/imlib2[jpeg] media-libs/imlib2[png] media-libs/imlib2[tiff] )
 SLOT=0
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=511553a518953e97870d356da50ee929
+_md5_=fc6d568f66f293946e6ec5e40963d9fd
diff --git a/metadata/md5-cache/media-gfx/shotwell-0.30.9 b/metadata/md5-cache/media-gfx/shotwell-0.30.9
index 451da39daa5e..cadd93fee142 100644
--- a/metadata/md5-cache/media-gfx/shotwell-0.30.9
+++ b/metadata/md5-cache/media-gfx/shotwell-0.30.9
@@ -5,10 +5,10 @@ DESCRIPTION=Open source photo manager for GNOME
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Shotwell
 IUSE=opencv udev
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=x11-libs/gtk+-3.22.0:3 >=dev-libs/glib-2.40.0:2 >=dev-libs/libgee-0.8.5:0.8 >=net-libs/webkit-gtk-2.4:4 >=dev-libs/json-glib-0.7.6 >=dev-libs/libxml2-2.6.32:2 x11-libs/gdk-pixbuf:2 >=dev-db/sqlite-3.5.9:3 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libgphoto2-2.5:= udev? ( >=dev-libs/libgudev-145:= ) >=media-libs/gexiv2-0.10.4 >=media-libs/libraw-0.13.2:= >=media-libs/libexif-0.6.16:= dev-libs/libgdata >=app-crypt/gcr-3:=[gtk] x11-libs/cairo opencv? ( >=media-libs/opencv-2.3.0:= ) media-plugins/gst-plugins-gdkpixbuf:1.0 media-plugins/gst-plugins-meta:1.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/shotwell/0.30/shotwell-0.30.9.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6c904a7ed48152444211aaf50afdea5b
+_md5_=022c71e61936dfb2d8f9598fc68df1ea
diff --git a/metadata/md5-cache/media-gfx/simple-scan-3.34.6 b/metadata/md5-cache/media-gfx/simple-scan-3.34.6
index e47242c5fd0c..fe94b48cee3b 100644
--- a/metadata/md5-cache/media-gfx/simple-scan-3.34.6
+++ b/metadata/md5-cache/media-gfx/simple-scan-3.34.6
@@ -5,10 +5,10 @@ DESCRIPTION=Simple document scanning utility
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/simple-scan
 IUSE=colord webp
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.22:3 >=sys-libs/zlib-1.2.3.1:= x11-libs/cairo:= x11-libs/gdk-pixbuf:2 >=dev-libs/libgusb-0.2.7 colord? ( >=x11-misc/colord-0.1.24:=[udev] ) webp? ( media-libs/libwebp ) >=media-gfx/sane-backends-1.0.20:= virtual/jpeg:0= x11-misc/xdg-utils
 SLOT=0
 SRC_URI=mirror://gnome/sources/simple-scan/3.34/simple-scan-3.34.6.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=30d8eb53cb1f79d7877636a3768562eb
+_md5_=240ed8b048c2f9c5f47456a978ed702b
diff --git a/metadata/md5-cache/media-gfx/xdot-1.1 b/metadata/md5-cache/media-gfx/xdot-1.1
index 9faa4f1440c8..0fe15254979b 100644
--- a/metadata/md5-cache/media-gfx/xdot-1.1
+++ b/metadata/md5-cache/media-gfx/xdot-1.1
@@ -5,11 +5,11 @@ DESCRIPTION=Interactive viewer for Graphviz dot files
 EAPI=7
 HOMEPAGE=https://github.com/jrfonseca/xdot.py
 IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=LGPL-2+
 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
 SRC_URI=https://github.com/jrfonseca/xdot.py/archive/1.1.tar.gz -> xdot-1.1.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c969ee0d794fcfdc2e9365299d2a893a
+_md5_=6ab0c8592fe58a4a9cb4da4efb8f9235
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 16329a2eec63..ed3aa91bd492 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/aubio-0.4.9 b/metadata/md5-cache/media-libs/aubio-0.4.9
index decff56f728a..4fc9ec4a66e4 100644
--- a/metadata/md5-cache/media-libs/aubio-0.4.9
+++ b/metadata/md5-cache/media-libs/aubio-0.4.9
@@ -4,12 +4,12 @@ DESCRIPTION=Library for audio labelling
 EAPI=6
 HOMEPAGE=https://aubio.org/
 IUSE=doc double-precision examples ffmpeg fftw jack libsamplerate sndfile python test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~ppc ppc64 sparc x86
 LICENSE=GPL-3
 RDEPEND=ffmpeg? ( >=media-video/ffmpeg-2.6:0= ) fftw? ( sci-libs/fftw:3.0= ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) python? ( 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/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) sndfile? ( media-libs/libsndfile )
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 ) ?? ( double-precision libsamplerate )
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 ) ?? ( double-precision libsamplerate ) doc? ( python )
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://aubio.org/pub/aubio-0.4.9.tar.bz2
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	cf9742c01975dc707eb982114a9d70fa	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4c90508bdb96c123a157785d61c74f4e
+_md5_=6400aaeb77ea68b1cfbaead9b0f48fae
diff --git a/metadata/md5-cache/media-libs/babl-0.1.66-r1 b/metadata/md5-cache/media-libs/babl-0.1.66-r1
new file mode 100644
index 000000000000..016c843c55c0
--- /dev/null
+++ b/metadata/md5-cache/media-libs/babl-0.1.66-r1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=lcms? ( >=media-libs/lcms-2.8:2 )
+DESCRIPTION=A dynamic, any to any, pixel format conversion library
+EAPI=7
+HOMEPAGE=http://www.gegl.org/babl/
+IUSE=altivec lcms cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c
+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=LGPL-3
+RDEPEND=lcms? ( >=media-libs/lcms-2.8:2 )
+SLOT=0
+SRC_URI=http://ftp.gimp.org/pub/babl/0.1/babl-0.1.66.tar.bz2
+_md5_=f0823b3502b4a060e6bbca80e5def347
diff --git a/metadata/md5-cache/media-libs/babl-0.1.74-r1 b/metadata/md5-cache/media-libs/babl-0.1.74-r1
new file mode 100644
index 000000000000..f3a662c7d600
--- /dev/null
+++ b/metadata/md5-cache/media-libs/babl-0.1.74-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install test
+DEPEND=introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 )
+DESCRIPTION=A dynamic, any to any, pixel format conversion library
+EAPI=7
+HOMEPAGE=http://www.gegl.org/babl/
+IUSE=introspection lcms cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1
+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=LGPL-3
+RDEPEND=introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 )
+SLOT=0
+SRC_URI=http://ftp.gimp.org/pub/babl/0.1/babl-0.1.74.tar.xz
+_eclasses_=meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=48bf4ddb2e461ee4dbf738f6f964ba79
diff --git a/metadata/md5-cache/media-libs/babl-9999 b/metadata/md5-cache/media-libs/babl-9999
index 20bf5580f0d5..ebed4d778ce6 100644
--- a/metadata/md5-cache/media-libs/babl-9999
+++ b/metadata/md5-cache/media-libs/babl-9999
@@ -1,13 +1,14 @@
-BDEPEND=virtual/pkgconfig >=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 test unpack
-DEPEND=lcms? ( media-libs/lcms:2 )
+BDEPEND=virtual/pkgconfig vala? ( || ( dev-lang/vala:0.48[vapigen(+)] 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 test unpack
+DEPEND=introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 )
 DESCRIPTION=A dynamic, any to any, pixel format conversion library
 EAPI=7
 HOMEPAGE=http://www.gegl.org/babl/
-IUSE=introspection lcms cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1
+IUSE=introspection lcms vala cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1
 LICENSE=LGPL-3
 PROPERTIES=live
-RDEPEND=lcms? ( media-libs/lcms:2 )
+RDEPEND=introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 )
+REQUIRED_USE=vala? ( introspection )
 SLOT=0
-_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6e925d7a566289846dcb29dcc4f1b1e2
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6383f60359fd3c748909f84ed9dfe2d6
diff --git a/metadata/md5-cache/media-libs/flickcurl-1.26 b/metadata/md5-cache/media-libs/flickcurl-1.26
index e600800d5088..4893c6fff394 100644
--- a/metadata/md5-cache/media-libs/flickcurl-1.26
+++ b/metadata/md5-cache/media-libs/flickcurl-1.26
@@ -4,10 +4,10 @@ DESCRIPTION=C library for the Flickr API
 EAPI=5
 HOMEPAGE=http://librdf.org/flickcurl/
 IUSE=doc raptor static-libs
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=|| ( LGPL-2.1 GPL-2 Apache-2.0 )
 RDEPEND=>=net-misc/curl-7.10.0 >=dev-libs/libxml2-2.6.8:2 raptor? ( media-libs/raptor:2 )
 SLOT=0
 SRC_URI=http://download.dajobe.org/flickcurl/flickcurl-1.26.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3d658396e4f88667d9abef139a72b818
+_md5_=249a6e03d886de0540739b73a4862885
diff --git a/metadata/md5-cache/media-libs/gd-2.2.5-r2 b/metadata/md5-cache/media-libs/gd-2.2.5-r2
deleted file mode 100644
index f8654e0cba6d..000000000000
--- a/metadata/md5-cache/media-libs/gd-2.2.5-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 test unpack
-DEPEND=fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xpm? ( >=x11-libs/libXpm-3.5.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] ) 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(-)?] ) virtual/pkgconfig
-DESCRIPTION=Graphics library for fast image creation
-EAPI=7
-HOMEPAGE=https://libgd.org/ https://www.boutell.com/gd/
-IUSE=cpu_flags_x86_sse fontconfig jpeg png static-libs test tiff truetype webp xpm 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 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=gd IJG HPND BSD
-RDEPEND=fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xpm? ( >=x11-libs/libXpm-3.5.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] ) 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(-)?] )
-REQUIRED_USE=prefix? ( fontconfig )
-RESTRICT=!test? ( test )
-SLOT=2/3
-SRC_URI=https://github.com/libgd/libgd/releases/download/gd-2.2.5/libgd-2.2.5.tar.xz test? ( https://github.com/libgd/libgd/raw/e0cb1b76c305db68b251fe782faa12da5d357593/tests/gif/ossfuzz5700.gif -> libgd-2.2.5-ossfuzz5700.dat https://github.com/libgd/libgd/raw/e0cb1b76c305db68b251fe782faa12da5d357593/tests/gif/php_bug_75571.gif -> libgd-2.2.5-php_bug_75571.dat )
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=df7b8c6a74fa65192e598e8581e88721
diff --git a/metadata/md5-cache/media-libs/gegl-0.3.34-r1 b/metadata/md5-cache/media-libs/gegl-0.3.34-r1
new file mode 100644
index 000000000000..d99e546e0bca
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gegl-0.3.34-r1
@@ -0,0 +1,16 @@
+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-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.48[vapigen(+)] 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
+DEFINED_PHASES=configure install prepare setup
+DEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.66[introspection(-)?,lcms(-)?] sys-libs/zlib >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( >=media-video/ffmpeg-2.8:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) virtual/jpeg:0= lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) >=media-libs/libpng-1.6.0:0= raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= )
+DESCRIPTION=A graph based image processing framework
+EAPI=7
+HOMEPAGE=http://www.gegl.org/
+IUSE=cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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.44:2 dev-libs/json-glib >=media-libs/babl-0.1.66[introspection(-)?,lcms(-)?] sys-libs/zlib >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( >=media-video/ffmpeg-2.8:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) virtual/jpeg:0= lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) >=media-libs/libpng-1.6.0:0= raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= )
+REQUIRED_USE=svg? ( cairo ) test? ( introspection ) vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=0.3
+SRC_URI=http://download.gimp.org/pub/gegl/0.3/gegl-0.3.34.tar.bz2
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b74f825d771e1c6aaaec5af9de92e943
diff --git a/metadata/md5-cache/media-libs/gegl-0.4.16-r1 b/metadata/md5-cache/media-libs/gegl-0.4.16-r1
new file mode 100644
index 000000000000..91282a40afb5
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gegl-0.4.16-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 >=sys-devel/libtool-2.2 virtual/pkgconfig test? ( ffmpeg? ( media-libs/gexiv2 ) || ( ( >=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.48[vapigen(+)] 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
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.66[introspection(-)?,lcms(-)?] >=media-libs/libpng-1.6.0:0= virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( 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-2.2.0:= ) 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:= ) zlib? ( >=sys-libs/zlib-1.2.0 )
+DESCRIPTION=A graph based image processing framework
+EAPI=7
+HOMEPAGE=http://www.gegl.org/
+IUSE=cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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.44:2 dev-libs/json-glib >=media-libs/babl-0.1.66[introspection(-)?,lcms(-)?] >=media-libs/libpng-1.6.0:0= virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( 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-2.2.0:= ) 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:= ) zlib? ( >=sys-libs/zlib-1.2.0 )
+REQUIRED_USE=svg? ( cairo ) test? ( introspection ) vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=0.4
+SRC_URI=http://download.gimp.org/pub/gegl/0.4/gegl-0.4.16.tar.bz2
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=557efeb653011bb39893b68860d56fd6
diff --git a/metadata/md5-cache/media-libs/gegl-0.4.18-r1 b/metadata/md5-cache/media-libs/gegl-0.4.18-r1
new file mode 100644
index 000000000000..f1277b10d422
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gegl-0.4.18-r1
@@ -0,0 +1,16 @@
+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.48[vapigen(+)] 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?,lcms?] 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? ( 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
+EAPI=7
+HOMEPAGE=http://www.gegl.org/
+IUSE=cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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.44:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.72[introspection?,lcms?] 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? ( 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:= )
+REQUIRED_USE=svg? ( cairo ) test? ( introspection ) vala? ( introspection )
+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	893e828f0f25f070f0b38d20c83c7670	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c81acddd16f6187eb7eeab5b663a4bf9
diff --git a/metadata/md5-cache/media-libs/gegl-0.4.22-r1 b/metadata/md5-cache/media-libs/gegl-0.4.22-r1
new file mode 100644
index 000000000000..b621e63f39da
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gegl-0.4.22-r1
@@ -0,0 +1,16 @@
+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.48[vapigen(+)] 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?,lcms?] 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? ( 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
+EAPI=7
+HOMEPAGE=http://www.gegl.org/
+IUSE=cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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.44:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.74[introspection?,lcms?] 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? ( 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:= )
+REQUIRED_USE=svg? ( cairo ) test? ( introspection ) vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=0.4
+SRC_URI=http://download.gimp.org/pub/gegl/0.4/gegl-0.4.22.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=986db7a3f81b2f2ffba832fd8061d81e
diff --git a/metadata/md5-cache/media-libs/gegl-9999 b/metadata/md5-cache/media-libs/gegl-9999
index bf119a3be8bb..e56c59ec506e 100644
--- a/metadata/md5-cache/media-libs/gegl-9999
+++ b/metadata/md5-cache/media-libs/gegl-9999
@@ -1,15 +1,15 @@
 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.48[vapigen(+)] 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? ( 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:= )
+DEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.78[introspection?,lcms?,vala?] 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? ( 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
 EAPI=7
 HOMEPAGE=http://www.gegl.org/
 IUSE=cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp
 LICENSE=|| ( GPL-3+ LGPL-3 )
 PROPERTIES=live
-RDEPEND=>=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? ( 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:= )
+RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.78[introspection?,lcms?,vala?] 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? ( 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:= )
 REQUIRED_USE=svg? ( cairo ) test? ( introspection ) vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0.4
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6d0949b1105ec6c6d63519cdea0c33c7
+_md5_=7adffac7d33447b55b5e30b8310d7227
diff --git a/metadata/md5-cache/media-libs/giblib-1.2.4-r1 b/metadata/md5-cache/media-libs/giblib-1.2.4-r1
index e5c569d76d68..328ddfae6414 100644
--- a/metadata/md5-cache/media-libs/giblib-1.2.4-r1
+++ b/metadata/md5-cache/media-libs/giblib-1.2.4-r1
@@ -3,11 +3,11 @@ DEFINED_PHASES=configure install prepare
 DEPEND=media-libs/freetype media-libs/imlib2:=[X] x11-libs/libX11 x11-libs/libXext
 DESCRIPTION=a graphics library built on top of imlib2
 EAPI=7
-HOMEPAGE=http://freecode.com/projects/giblib http://www.linuxbrit.co.uk/giblib/
+HOMEPAGE=http://freshmeat.sourceforge.net/projects/giblib http://www.linuxbrit.co.uk/giblib/
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86
 LICENSE=feh
 RDEPEND=media-libs/freetype media-libs/imlib2:=[X] x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=http://www.linuxbrit.co.uk/downloads/giblib-1.2.4.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8099a2c9b0b35b78290cc99652bc20f0
+_md5_=85b044e72c80bce2df56933b23defb06
diff --git a/metadata/md5-cache/media-libs/graphene-1.10.0 b/metadata/md5-cache/media-libs/graphene-1.10.0
index eb05a9bba9c7..7b933a9e3921 100644
--- a/metadata/md5-cache/media-libs/graphene-1.10.0
+++ b/metadata/md5-cache/media-libs/graphene-1.10.0
@@ -5,11 +5,11 @@ DESCRIPTION=A thin layer of types for graphic libraries
 EAPI=7
 HOMEPAGE=https://ebassi.github.io/graphene/
 IUSE=cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/glib-2.30.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( dev-libs/gobject-introspection:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ebassi/graphene/releases/download/1.10.0/graphene-1.10.0.tar.xz
 _eclasses_=meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=51639425c2d734206d2f7c2e3e4fc37f
+_md5_=57575a2b2b3922d0b2a69a7ed989ac49
diff --git a/metadata/md5-cache/media-libs/graphene-1.10.2 b/metadata/md5-cache/media-libs/graphene-1.10.2
new file mode 100644
index 000000000000..26148c040e9a
--- /dev/null
+++ b/metadata/md5-cache/media-libs/graphene-1.10.2
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) virtual/pkgconfig >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install setup test
+DEPEND=>=dev-libs/glib-2.30.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( dev-libs/gobject-introspection:= )
+DESCRIPTION=A thin layer of types for graphic libraries
+EAPI=7
+HOMEPAGE=https://ebassi.github.io/graphene/
+IUSE=cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-libs/glib-2.30.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( dev-libs/gobject-introspection:= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ebassi/graphene/releases/download/1.10.2/graphene-1.10.2.tar.xz
+_eclasses_=meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=51639425c2d734206d2f7c2e3e4fc37f
diff --git a/metadata/md5-cache/media-libs/grilo-0.3.12 b/metadata/md5-cache/media-libs/grilo-0.3.12
index c5d4162cc946..040152494e97 100644
--- a/metadata/md5-cache/media-libs/grilo-0.3.12
+++ b/metadata/md5-cache/media-libs/grilo-0.3.12
@@ -5,7 +5,7 @@ DESCRIPTION=A framework for easy media discovery and browsing
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Grilo
 IUSE=gtk gtk-doc +introspection +network +playlist test vala
-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=>=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 )
 REQUIRED_USE=vala? ( introspection )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0.3/0
 SRC_URI=mirror://gnome/sources/grilo/0.3/grilo-0.3.12.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4f1ca37e52f72c01e27d8f46b6d9414e
+_md5_=4476cc24def4cbbbf34cf70947052317
diff --git a/metadata/md5-cache/media-libs/gst-plugins-bad-1.16.2 b/metadata/md5-cache/media-libs/gst-plugins-bad-1.16.2
index 8d65af260c9d..a316203adf3e 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-bad-1.16.2
+++ b/metadata/md5-cache/media-libs/gst-plugins-bad-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Less plugins for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=X bzip2 +introspection +orc vnc 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 nls test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.16.2: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(-)?,introspection?] >=media-libs/gst-plugins-base-1.16.2: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(-)?,introspection?] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vnc? ( 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(-)?] ) ) wayland? ( >=dev-libs/wayland-1.11.0[abi_x86_32(-)?,abi_x86_64(-)?,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.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_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.15 ) orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=03d735df0edbebbba83d118ae5f8aefe
+_md5_=7aead323f7595abc26f45969a801f206
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-1.16.2 b/metadata/md5-cache/media-libs/gst-plugins-base-1.16.2
index b66adf9c91fc..a986853e26b7 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-base-1.16.2
+++ b/metadata/md5-cache/media-libs/gst-plugins-base-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Basepack of plugins for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 nls
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.16.2:1.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(-)?] >=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(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) ivorbis? ( >=media-libs/tremor-0_pre20130223[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pango? ( >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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/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/libXv-1.0.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(-)?] ) gles2? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/graphene-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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/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(-)?] ) opengl? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/graphene-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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/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(-)?] ) !<media-libs/gst-plugins-bad-1.15.0:1.0 >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 REQUIRED_USE=ivorbis? ( ogg ) theora? ( ogg ) vorbis? ( ogg ) opengl? ( || ( egl X ) || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) ) gles2? ( egl || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6305a728dfa920836e1d6ff7fe6a948c
+_md5_=a9dacfb623ba0ce19d4ba8ca9f3b5acc
diff --git a/metadata/md5-cache/media-libs/gst-plugins-good-1.16.2 b/metadata/md5-cache/media-libs/gst-plugins-good-1.16.2
index 6e79fef0cab4..cff8f559dc0f 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-good-1.16.2
+++ b/metadata/md5-cache/media-libs/gst-plugins-good-1.16.2
@@ -4,10 +4,10 @@ DESCRIPTION=Basepack of plugins for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=+orc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 nls
-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=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.16.2: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/gstreamer-1.16.2: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(-)?] >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=77b72ca7cc189b4dcc327e54493bf97e
+_md5_=7e1fa084f93b56683fae6e6f9fdefa6e
diff --git a/metadata/md5-cache/media-libs/gst-plugins-ugly-1.16.2 b/metadata/md5-cache/media-libs/gst-plugins-ugly-1.16.2
index eb1bdab4919a..8203a01b86e1 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-ugly-1.16.2
+++ b/metadata/md5-cache/media-libs/gst-plugins-ugly-1.16.2
@@ -4,10 +4,10 @@ DESCRIPTION=Basepack of plugins for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 nls
-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=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.16.2: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.16.2: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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0ad227350a992a6d84b7d540bf87ed61
+_md5_=3ed77d1420a7da8962ba97190b5aca49
diff --git a/metadata/md5-cache/media-libs/gstreamer-1.16.2 b/metadata/md5-cache/media-libs/gstreamer-1.16.2
index f9c5bc05da24..0e18fcd24794 100644
--- a/metadata/md5-cache/media-libs/gstreamer-1.16.2
+++ b/metadata/md5-cache/media-libs/gstreamer-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Open source multimedia framework
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=+caps +introspection nls +orc test unwind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 ~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.40.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(-)?] caps? ( sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,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.31.1:= ) unwind? ( >=sys-libs/libunwind-1.2_rc1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/elfutils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0
 RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.16.2.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=48e7955f5654f171e3a3f0a77a1ea3ee
+_md5_=febf3ab1a3398791c02c1ae8e03f3ce9
diff --git a/metadata/md5-cache/media-libs/harfbuzz-2.6.7 b/metadata/md5-cache/media-libs/harfbuzz-2.6.7
index e7f32d2997f0..376eb5981f75 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-2.6.7
+++ b/metadata/md5-cache/media-libs/harfbuzz-2.6.7
@@ -5,7 +5,7 @@ DESCRIPTION=An OpenType text shaping engine
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
 IUSE=+cairo debug +glib +graphite icu +introspection static-libs test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Old-MIT ISC icu
 RDEPEND=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(-)?] )
 REQUIRED_USE=introspection? ( glib )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.9.18
 SRC_URI=https://github.com/harfbuzz/harfbuzz/releases/download/2.6.7/harfbuzz-2.6.7.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1af36e669d6ce59569af748b7d6d7c3a
+_md5_=0e50b41d6a88e11d1f4b6b19d6fb76fd
diff --git a/metadata/md5-cache/media-libs/harfbuzz-2.6.8 b/metadata/md5-cache/media-libs/harfbuzz-2.6.8
new file mode 100644
index 000000000000..b3e55d05b909
--- /dev/null
+++ b/metadata/md5-cache/media-libs/harfbuzz-2.6.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/gtk-doc-am 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=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 ) )
+DESCRIPTION=An OpenType text shaping engine
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
+IUSE=+cairo debug +glib +graphite icu +introspection static-libs test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Old-MIT ISC icu
+RDEPEND=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(-)?] )
+REQUIRED_USE=introspection? ( glib )
+RESTRICT=!test? ( test )
+SLOT=0/0.9.18
+SRC_URI=https://github.com/harfbuzz/harfbuzz/releases/download/2.6.8/harfbuzz-2.6.8.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1af36e669d6ce59569af748b7d6d7c3a
diff --git a/metadata/md5-cache/media-libs/icclib-2.14 b/metadata/md5-cache/media-libs/icclib-2.14
index c214468f86a2..57e56e928f95 100644
--- a/metadata/md5-cache/media-libs/icclib-2.14
+++ b/metadata/md5-cache/media-libs/icclib-2.14
@@ -2,10 +2,10 @@ BDEPEND=app-arch/unzip
 DEFINED_PHASES=compile install
 DESCRIPTION=Library for reading and writing ICC color profile files
 EAPI=7
-HOMEPAGE=http://freecode.com/projects/icclib
+HOMEPAGE=http://freshmeat.sourceforge.net/projects/icclib
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.argyllcms.com/icclib_V2.14.zip
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5590212cab790d78d8e169907b9a4bf5
+_md5_=33861dd7e85aa22679e0624bda3d5ce5
diff --git a/metadata/md5-cache/media-libs/libcddb-1.3.2-r1 b/metadata/md5-cache/media-libs/libcddb-1.3.2-r1
index 172122125a37..5158e13964e2 100644
--- a/metadata/md5-cache/media-libs/libcddb-1.3.2-r1
+++ b/metadata/md5-cache/media-libs/libcddb-1.3.2-r1
@@ -1,14 +1,13 @@
+BDEPEND=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 test
-DEPEND=doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815
 DESCRIPTION=A library for accessing a CDDB server
-EAPI=5
+EAPI=7
 HOMEPAGE=http://libcddb.sourceforge.net/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2
-RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/libcddb/libcddb-1.3.2.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-multilib	dd33c3299bb81aa8dcb97f66f24a29bc	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1699d01508a5f1fc9493a1677b4a678e
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4b42e14a695fe3787265cbbf6f0ffbca
diff --git a/metadata/md5-cache/media-libs/libdvbcsa-1.1.0 b/metadata/md5-cache/media-libs/libdvbcsa-1.1.0
index 5e5b41f3177e..9a584521b52c 100644
--- a/metadata/md5-cache/media-libs/libdvbcsa-1.1.0
+++ b/metadata/md5-cache/media-libs/libdvbcsa-1.1.0
@@ -3,8 +3,8 @@ DESCRIPTION=Free implementation of the DVB Common Scrambling Algorithm - DVB/CSA
 EAPI=6
 HOMEPAGE=https://www.videolan.org/developers/libdvbcsa.html
 IUSE=debug cpu_flags_x86_mmx cpu_flags_x86_sse2 static-libs
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://download.videolan.org/pub/videolan/libdvbcsa/1.1.0/libdvbcsa-1.1.0.tar.gz
-_md5_=aa94181a6b0b99f027c23e44dc3d8d82
+_md5_=f1114f0e24f220aeb60fbffe4ca5174c
diff --git a/metadata/md5-cache/media-libs/libemf-1.0.13 b/metadata/md5-cache/media-libs/libemf-1.0.13
index f8f5216dc3d0..9c859397cdbf 100644
--- a/metadata/md5-cache/media-libs/libemf-1.0.13
+++ b/metadata/md5-cache/media-libs/libemf-1.0.13
@@ -3,8 +3,8 @@ DESCRIPTION=Library implementation of ECMA-234 API for the generation of enhance
 EAPI=7
 HOMEPAGE=http://libemf.sourceforge.net/
 IUSE=doc static-libs
-KEYWORDS=~amd64 -arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 -arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1 GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/libemf/libemf-1.0.13.tar.gz
-_md5_=002b9a049f4a0dd1a18009cbc0003e1f
+_md5_=bb1fa8d0794c255c959dfdad42bace38
diff --git a/metadata/md5-cache/media-libs/libexif-0.6.22 b/metadata/md5-cache/media-libs/libexif-0.6.22
index 91384dd477c4..9a349c533550 100644
--- a/metadata/md5-cache/media-libs/libexif-0.6.22
+++ b/metadata/md5-cache/media-libs/libexif-0.6.22
@@ -5,10 +5,10 @@ DESCRIPTION=Library for parsing, editing, and saving EXIF data
 EAPI=7
 HOMEPAGE=https://libexif.github.io/ https://github.com/libexif/libexif
 IUSE=doc 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 ~mips ~ppc ~ppc64 ~s390 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=https://github.com/libexif/libexif/releases/download/libexif-0_6_22-release/libexif-0.6.22.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=738e05e401d0ee41042ebc4d2a8008bf
+_md5_=1b2fe030d9c84df622b292178aadf497
diff --git a/metadata/md5-cache/media-libs/libglvnd-1.3.1 b/metadata/md5-cache/media-libs/libglvnd-1.3.1
index 706892567b9e..b06eb1f86310 100644
--- a/metadata/md5-cache/media-libs/libglvnd-1.3.1
+++ b/metadata/md5-cache/media-libs/libglvnd-1.3.1
@@ -1,5 +1,5 @@
 BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
-DEFINED_PHASES=compile configure install setup test
+DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=!media-libs/mesa[-libglvnd(-)] !<media-libs/mesa-19.2.2 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(-)?] ) X? ( x11-base/xorg-proto )
 DESCRIPTION=The GL Vendor-Neutral Dispatch library
 EAPI=7
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/glvnd/libglvnd/-/archive/v1.3.1/libglvnd-v1.3.1.tar.bz2 -> libglvnd-1.3.1.tar.bz2
 _eclasses_=meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=cad5e39290547af944be78b4c3bf1c76
+_md5_=9a4be39d0ec66ded0b1f5c6f5743e47d
diff --git a/metadata/md5-cache/media-libs/libglvnd-1.3.2 b/metadata/md5-cache/media-libs/libglvnd-1.3.2
new file mode 100644
index 000000000000..b9209a44d5a6
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libglvnd-1.3.2
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!media-libs/mesa[-libglvnd(-)] !<media-libs/mesa-19.2.2 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(-)?] ) X? ( x11-base/xorg-proto )
+DESCRIPTION=The GL Vendor-Neutral Dispatch library
+EAPI=7
+HOMEPAGE=https://gitlab.freedesktop.org/glvnd/libglvnd
+IUSE=test 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=!media-libs/mesa[-libglvnd(-)] !<media-libs/mesa-19.2.2 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(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://gitlab.freedesktop.org/glvnd/libglvnd/-/archive/v1.3.2/libglvnd-v1.3.2.tar.bz2 -> libglvnd-1.3.2.tar.bz2
+_eclasses_=meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
+_md5_=7f3e956d3a058f3e5682315d0cf76ad3
diff --git a/metadata/md5-cache/media-libs/libglvnd-9999 b/metadata/md5-cache/media-libs/libglvnd-9999
index bc7765f534cf..c224b8d353ca 100644
--- a/metadata/md5-cache/media-libs/libglvnd-9999
+++ b/metadata/md5-cache/media-libs/libglvnd-9999
@@ -1,5 +1,5 @@
 BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) >=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
+DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=!media-libs/mesa[-libglvnd(-)] !<media-libs/mesa-19.2.2 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(-)?] ) X? ( x11-base/xorg-proto )
 DESCRIPTION=The GL Vendor-Neutral Dispatch library
 EAPI=7
@@ -11,4 +11,4 @@ RDEPEND=!media-libs/mesa[-libglvnd(-)] !<media-libs/mesa-19.2.2 X? ( x11-libs/li
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=d4fdc189e7a266f912e3e01c1c1460f0
+_md5_=7f3e956d3a058f3e5682315d0cf76ad3
diff --git a/metadata/md5-cache/media-libs/libhdhomerun-20190621 b/metadata/md5-cache/media-libs/libhdhomerun-20190621
index f7aa4997bfaa..5dfb7ba6ae90 100644
--- a/metadata/md5-cache/media-libs/libhdhomerun-20190621
+++ b/metadata/md5-cache/media-libs/libhdhomerun-20190621
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=SiliconDust HDHomeRun Utilties
 EAPI=7
 HOMEPAGE=https://www.silicondust.com/support/linux/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=https://download.silicondust.com/hdhomerun/libhdhomerun_20190621.tgz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0ee43aa2c7b80bd2b4dc76c4ae9b9a9f
+_md5_=675199d5f3e267592f72b3eb378dc252
diff --git a/metadata/md5-cache/media-libs/libhdhomerun-20200521 b/metadata/md5-cache/media-libs/libhdhomerun-20200521
new file mode 100644
index 000000000000..aa2465e5f6c8
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libhdhomerun-20200521
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=SiliconDust HDHomeRun Utilties
+EAPI=7
+HOMEPAGE=https://www.silicondust.com/support/linux/
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1+
+SLOT=0
+SRC_URI=https://download.silicondust.com/hdhomerun/libhdhomerun_20200521.tgz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f71e7f2642d455d5ac8c1deef45f1cb5
diff --git a/metadata/md5-cache/media-libs/libiec61883-1.2.0-r1 b/metadata/md5-cache/media-libs/libiec61883-1.2.0-r1
index 1a7b6a9bdf7a..6d849e03c666 100644
--- a/metadata/md5-cache/media-libs/libiec61883-1.2.0-r1
+++ b/metadata/md5-cache/media-libs/libiec61883-1.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-2 )
 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=https://www.kernel.org/pub/linux/libs/ieee1394/libiec61883-1.2.0.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-multilib	dd33c3299bb81aa8dcb97f66f24a29bc	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-multilib	dd33c3299bb81aa8dcb97f66f24a29bc	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=56503dc1a0ff9ce3118bf27147657c41
diff --git a/metadata/md5-cache/media-libs/libplacebo-2.43.0 b/metadata/md5-cache/media-libs/libplacebo-2.43.0
index 03fd9ea1b54d..def0162baa7c 100644
--- a/metadata/md5-cache/media-libs/libplacebo-2.43.0
+++ b/metadata/md5-cache/media-libs/libplacebo-2.43.0
@@ -5,7 +5,7 @@ DESCRIPTION=Reusable library for GPU-accelerated image processing primitives
 EAPI=7
 HOMEPAGE=https://code.videolan.org/videolan/libplacebo
 IUSE=glslang lcms +opengl +shaderc test +vulkan abi_x86_32 abi_x86_64 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 ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=glslang? ( dev-util/glslang[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( media-libs/libepoxy[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) shaderc? ( >=media-libs/shaderc-2017.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(-)?] ) vulkan? ( dev-util/vulkan-headers media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,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=vulkan? ( || ( glslang shaderc ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/43
 SRC_URI=https://code.videolan.org/videolan/libplacebo/-/archive/v2.43.0/libplacebo-v2.43.0.tar.gz
 _eclasses_=meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9202ce1e07bd4f581783ff2ea45ec5d0
+_md5_=4f1934a457ca9417da6e35ca5c066dfa
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 e635bce118fe..65f84812736f 100644
--- a/metadata/md5-cache/media-libs/libshout-2.4.1-r2
+++ b/metadata/md5-cache/media-libs/libshout-2.4.1-r2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-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(-)?] ) virtual/pkgconfig
 DESCRIPTION=library for connecting and sending data to icecast servers
 EAPI=7
-HOMEPAGE=http://www.icecast.org/
+HOMEPAGE=https://www.icecast.org/
 IUSE=libressl speex static-libs theora abi_x86_32 abi_x86_64 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 sparc x86
 LICENSE=LGPL-2
@@ -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	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bf2c7a7187172729bdb66bd28d5483ac
+_md5_=bfb82a00bf951c261edf761d08ce77cf
diff --git a/metadata/md5-cache/media-libs/libshout-2.4.2 b/metadata/md5-cache/media-libs/libshout-2.4.2
index 14039599a002..4cd84b6a9cd9 100644
--- a/metadata/md5-cache/media-libs/libshout-2.4.2
+++ b/metadata/md5-cache/media-libs/libshout-2.4.2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-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(-)?] ) virtual/pkgconfig
 DESCRIPTION=library for connecting and sending data to icecast servers
 EAPI=7
-HOMEPAGE=http://www.icecast.org/
+HOMEPAGE=https://www.icecast.org/
 IUSE=libressl speex static-libs theora abi_x86_32 abi_x86_64 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 ~sparc ~x86
 LICENSE=LGPL-2
@@ -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.2.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=22d7b35dd549fb90dad6ca272a838987
+_md5_=bf9864b36b1697a46a2c7f4dd98ffe98
diff --git a/metadata/md5-cache/media-libs/libshout-2.4.3 b/metadata/md5-cache/media-libs/libshout-2.4.3
index 300c632531dc..34c98ed38b97 100644
--- a/metadata/md5-cache/media-libs/libshout-2.4.3
+++ b/metadata/md5-cache/media-libs/libshout-2.4.3
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-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(-)?] ) virtual/pkgconfig
 DESCRIPTION=library for connecting and sending data to icecast servers
 EAPI=7
-HOMEPAGE=http://www.icecast.org/
+HOMEPAGE=https://www.icecast.org/
 IUSE=libressl speex static-libs theora abi_x86_32 abi_x86_64 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 ~sparc ~x86
 LICENSE=LGPL-2
@@ -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.3.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b803c60beb89fd5075431826c49f191c
+_md5_=08563118f04fa95eb9506095c869ede5
diff --git a/metadata/md5-cache/media-libs/libv4l-1.10.1 b/metadata/md5-cache/media-libs/libv4l-1.10.1
index 6377331ab59a..aee4f3988923 100644
--- a/metadata/md5-cache/media-libs/libv4l-1.10.1
+++ b/metadata/md5-cache/media-libs/libv4l-1.10.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2
 SLOT=0/0
 SRC_URI=https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.10.1.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4f63605917af4065386b4bd7ae350e64
diff --git a/metadata/md5-cache/media-libs/libv4l-1.16.3 b/metadata/md5-cache/media-libs/libv4l-1.16.3
index 3bd5ac74d0c9..e9479363865d 100644
--- a/metadata/md5-cache/media-libs/libv4l-1.16.3
+++ b/metadata/md5-cache/media-libs/libv4l-1.16.3
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2
 SLOT=0/0
 SRC_URI=https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.16.3.tar.bz2
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=16417a3c8b6e887afa612eb32803cb57
diff --git a/metadata/md5-cache/media-libs/libv4l-1.16.6 b/metadata/md5-cache/media-libs/libv4l-1.16.6
index 5d0bac53a70f..4064c1853ee5 100644
--- a/metadata/md5-cache/media-libs/libv4l-1.16.6
+++ b/metadata/md5-cache/media-libs/libv4l-1.16.6
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !elibc_glibc? ( sys-libs/argp-standalone ) 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(-)?] !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2
 SLOT=0/0
 SRC_URI=https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.16.6.tar.bz2
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=31bc107e83b5c89365bf33fdb4886f67
diff --git a/metadata/md5-cache/media-libs/libv4l-1.18.0 b/metadata/md5-cache/media-libs/libv4l-1.18.0
index 7ddcbfa08064..e26818ec735a 100644
--- a/metadata/md5-cache/media-libs/libv4l-1.18.0
+++ b/metadata/md5-cache/media-libs/libv4l-1.18.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !elibc_glibc? ( sys-libs/argp-standalone ) 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(-)?] !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2
 SLOT=0/0
 SRC_URI=https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.18.0.tar.bz2
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b088ebc7b3e95d32b3b18bd3a69db61d
diff --git a/metadata/md5-cache/media-libs/libv4l-1.18.1 b/metadata/md5-cache/media-libs/libv4l-1.18.1
index 24a5b945a418..7eb99e0b78b2 100644
--- a/metadata/md5-cache/media-libs/libv4l-1.18.1
+++ b/metadata/md5-cache/media-libs/libv4l-1.18.1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !elibc_glibc? ( sys-libs/argp-standalone ) 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(-)?] !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2
 SLOT=0/0
 SRC_URI=https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.18.1.tar.bz2
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=24335c8adbfee1ac70ea39a3a007dc80
diff --git a/metadata/md5-cache/media-libs/libv4l-1.6.2 b/metadata/md5-cache/media-libs/libv4l-1.6.2
index de13706d4ded..7a18b5d839a9 100644
--- a/metadata/md5-cache/media-libs/libv4l-1.6.2
+++ b/metadata/md5-cache/media-libs/libv4l-1.6.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2
 SLOT=0
 SRC_URI=http://linuxtv.org/downloads/v4l-utils/v4l-utils-1.6.2.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fe1975d78d0926f4cdc7eb1129bbbc23
diff --git a/metadata/md5-cache/media-libs/mesa-19.3.5 b/metadata/md5-cache/media-libs/mesa-19.3.5
deleted file mode 100644
index dce235897d23..000000000000
--- a/metadata/md5-cache/media-libs/mesa-19.3.5
+++ /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[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(-)?] !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 ) !!sys-devel/llvm:0
-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 pax_kernel 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 kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 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[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(-)?] !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-19.3.5.tar.xz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=95d5d3c115348c8c3b5061c2ca30d331
diff --git a/metadata/md5-cache/media-libs/mesa-20.0.4-r1 b/metadata/md5-cache/media-libs/mesa-20.0.4-r1
deleted file mode 100644
index 976e3780cfb5..000000000000
--- a/metadata/md5-cache/media-libs/mesa-20.0.4-r1
+++ /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[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(-)?] !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? ( >=virtual/opencl-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-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(-)?] ) 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(-)?] ) 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-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(-)?,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-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(-)?,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-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(-)?,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-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(-)?] ) ) ) ) !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-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(-)?,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-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(-)?,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-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(-)?,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-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(-)?] ) ) ) ) ) ) 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 ) !!sys-devel/llvm:0
-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 +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 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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[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(-)?] !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? ( >=virtual/opencl-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-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(-)?] ) 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(-)?] ) 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-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(-)?,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-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(-)?,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-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(-)?,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-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(-)?] ) ) ) ) !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-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(-)?,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-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(-)?,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-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(-)?,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-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(-)?] ) ) ) ) ) )
-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.4.tar.xz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=543243f77c6b514fbbfb235bc91745cb
diff --git a/metadata/md5-cache/media-libs/mesa-20.0.7 b/metadata/md5-cache/media-libs/mesa-20.0.7
deleted file mode 100644
index eaa5121cb23d..000000000000
--- a/metadata/md5-cache/media-libs/mesa-20.0.7
+++ /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[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(-)?] !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? ( >=virtual/opencl-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-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(-)?] ) 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(-)?] ) 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: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang: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(-)?] 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-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(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm: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(-)?] 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-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(-)?] ) ) ) ) ) ) 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 ) !!sys-devel/llvm:0
-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 +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 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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[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(-)?] !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? ( >=virtual/opencl-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-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(-)?] ) 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(-)?] ) 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: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang: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(-)?] 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-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(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm: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(-)?] 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-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(-)?] ) ) ) ) ) )
-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_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.7.tar.xz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8a2c427d62973e47a659a28c63550132
diff --git a/metadata/md5-cache/media-libs/mesa-20.0.8 b/metadata/md5-cache/media-libs/mesa-20.0.8
index bcd0b8b38b25..f67ffd1568b9 100644
--- a/metadata/md5-cache/media-libs/mesa-20.0.8
+++ b/metadata/md5-cache/media-libs/mesa-20.0.8
@@ -5,12 +5,12 @@ 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 +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 kernel_linux
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 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[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(-)?] !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? ( >=virtual/opencl-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-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(-)?] ) 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(-)?] ) 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: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang: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(-)?] 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-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(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm: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(-)?] 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-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(-)?] ) ) ) ) ) )
 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_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.8.tar.xz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c6c81255cdb8daf795125d7136ca68fd
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b7f414fab8930fe21a1f59d54b26ff03
diff --git a/metadata/md5-cache/media-libs/mesa-20.1.0 b/metadata/md5-cache/media-libs/mesa-20.1.0
deleted file mode 100644
index cda22b60e3d2..000000000000
--- a/metadata/md5-cache/media-libs/mesa-20.1.0
+++ /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[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(-)?] !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? ( >=virtual/opencl-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-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(-)?] ) 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(-)?] ) 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: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang: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(-)?] 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-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(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm: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(-)?] 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-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(-)?] ) ) ) ) ) ) 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 ) !!sys-devel/llvm:0
-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 +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 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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[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(-)?] !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? ( >=virtual/opencl-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-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(-)?] ) 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(-)?] ) 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: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang: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(-)?] 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-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(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm: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(-)?] 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-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(-)?] ) ) ) ) ) )
-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_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.1.0.tar.xz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=45a294fcaa3847e72d21a9b30a547064
diff --git a/metadata/md5-cache/media-libs/mesa-20.1.0_rc4 b/metadata/md5-cache/media-libs/mesa-20.1.0_rc4
deleted file mode 100644
index 914d1e5b3da4..000000000000
--- a/metadata/md5-cache/media-libs/mesa-20.1.0_rc4
+++ /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[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(-)?] !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? ( >=virtual/opencl-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-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(-)?] ) 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(-)?] ) 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: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang: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(-)?] 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-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(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm: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(-)?] 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-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(-)?] ) ) ) ) ) ) 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 ) !!sys-devel/llvm:0
-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 +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 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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[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(-)?] !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? ( >=virtual/opencl-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-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(-)?] ) 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(-)?] ) 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: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang: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(-)?] 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-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(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm: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(-)?] 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-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(-)?] ) ) ) ) ) )
-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_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.1.0-rc4.tar.xz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8a2c427d62973e47a659a28c63550132
diff --git a/metadata/md5-cache/media-libs/mesa-20.1.1 b/metadata/md5-cache/media-libs/mesa-20.1.1
index 1b5794312df4..927bda747785 100644
--- a/metadata/md5-cache/media-libs/mesa-20.1.1
+++ b/metadata/md5-cache/media-libs/mesa-20.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r60
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-20.1.1.tar.xz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=45a294fcaa3847e72d21a9b30a547064
diff --git a/metadata/md5-cache/media-libs/mesa-9999 b/metadata/md5-cache/media-libs/mesa-9999
index 40ba640462f6..51df78150353 100644
--- a/metadata/md5-cache/media-libs/mesa-9999
+++ b/metadata/md5-cache/media-libs/mesa-9999
@@ -1,4 +1,4 @@
-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 >=dev-vcs/git-1.8.2.1[curl]
+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 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 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst pretend setup test unpack
 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[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(-)?] !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? ( >=virtual/opencl-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-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(-)?] ) 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(-)?] ) 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: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang: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(-)?] 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-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(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] 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-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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm: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(-)?] 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-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(-)?] ) ) ) ) ) ) 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 ) !!sys-devel/llvm:0
 DESCRIPTION=OpenGL-like graphic library for Linux
@@ -11,5 +11,5 @@ RDEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi
 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_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
-_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=45a294fcaa3847e72d21a9b30a547064
+_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=be26f937e9c81b3d6aedda69e76e12ad
diff --git a/metadata/md5-cache/media-libs/opencv-2.4.13-r4 b/metadata/md5-cache/media-libs/opencv-2.4.13-r4
deleted file mode 100644
index 676b782ce0c7..000000000000
--- a/metadata/md5-cache/media-libs/opencv-2.4.13-r4
+++ /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? ( 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 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? ( 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	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=385ea4e718cb443af6eff993f2f0c934
diff --git a/metadata/md5-cache/media-libs/opencv-3.4.1-r7 b/metadata/md5-cache/media-libs/opencv-3.4.1-r7
deleted file mode 100644
index c2229118305e..000000000000
--- a/metadata/md5-cache/media-libs/opencv-3.4.1-r7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=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(-)?] dev-libs/protobuf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_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(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contribhdf? ( sci-libs/hdf5 ) ffmpeg? ( media-video/ffmpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/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(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] ) 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(-)?] opengl? ( x11-libs/gtkglext[abi_x86_32(-)?,abi_x86_64(-)?,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/libdc1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_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(-)?] ) java? ( >=virtual/jre-1.6:* ) 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(-)?] ) lapack? ( virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] 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(-)?] ) png? ( 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(-)?] ) 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/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) tesseract? ( app-text/tesseract[opencl=] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) v4l? ( >=media-libs/libv4l-0.8.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(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) virtual/pkgconfig eigen? ( dev-cpp/eigen:3 ) java? ( >=virtual/jdk-1.6 ) vaapi? ( x11-libs/libva ) 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=7
-HOMEPAGE=https://opencv.org
-IUSE=contrib contribcvv contribdnn contribhdf contribsfm contribxfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnnsamples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg lapack opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine elibc_FreeBSD java elibc_FreeBSD 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=amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux
-LICENSE=BSD
-RDEPEND=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(-)?] dev-libs/protobuf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_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(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contribhdf? ( sci-libs/hdf5 ) ffmpeg? ( media-video/ffmpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/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(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] ) 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(-)?] opengl? ( x11-libs/gtkglext[abi_x86_32(-)?,abi_x86_64(-)?,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/libdc1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_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(-)?] ) java? ( >=virtual/jre-1.6:* ) 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(-)?] ) lapack? ( virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] 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(-)?] ) png? ( 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(-)?] ) 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/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) tesseract? ( app-text/tesseract[opencl=] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) v4l? ( >=media-libs/libv4l-0.8.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(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=cuda? ( tesseract? ( opencl ) ) dnnsamples? ( examples ) gflags? ( contrib ) glog? ( contrib ) contribcvv? ( contrib qt5 ) contribdnn? ( contrib ) contribhdf? ( contrib ) contribsfm? ( contrib eigen gflags glog ) contribxfeatures2d? ( contrib cuda ) java? ( python ) opengl? ( || ( gtk qt5 ) ) python? ( || ( python_targets_python3_6 python_targets_python3_7 ) ) tesseract? ( contrib )
-SLOT=0/3.4.1
-SRC_URI=https://github.com/opencv/opencv/archive/3.4.1.tar.gz -> opencv-3.4.1.tar.gz dnnsamples? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-res10_300x300-caffeemodel.tar.gz ) contrib? ( https://github.com/opencv/opencv_contrib/archive/3.4.1.tar.gz -> opencv-3.4.1_contrib.tar.gz contribdnn? ( https://github.com/tiny-dnn/tiny-dnn/archive/v1.0.0a3.tar.gz -> tiny-dnn-1.0.0a3.tar.gz https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-face_landmark_model.tar.gz ) contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e5f7de329620a137ffa0e7818e50bd11
diff --git a/metadata/md5-cache/media-libs/opencv-4.1.2-r1 b/metadata/md5-cache/media-libs/opencv-4.1.2-r1
deleted file mode 100644
index 33a07764ee31..000000000000
--- a/metadata/md5-cache/media-libs/opencv-4.1.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=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(-)?] dev-libs/protobuf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_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(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contribhdf? ( sci-libs/hdf5:= ) ffmpeg? ( media-video/ffmpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/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(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] ) 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(-)?] opengl? ( x11-libs/gtkglext[abi_x86_32(-)?,abi_x86_64(-)?,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/libdc1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_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(-)?] ) java? ( >=virtual/jre-1.6:* ) 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(-)?] ) lapack? ( virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] 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(-)?] ) png? ( 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(-)?] ) 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/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) tesseract? ( app-text/tesseract[opencl=] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) v4l? ( >=media-libs/libv4l-0.8.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(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) virtual/pkgconfig eigen? ( dev-cpp/eigen:3 ) java? ( >=virtual/jdk-1.6 ) vaapi? ( x11-libs/libva ) 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=7
-HOMEPAGE=https://opencv.org
-IUSE=contrib contribcvv contribdnn contribhdf contribsfm contribxfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnnsamples -download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack opencl openexr opengl openmp opencvapps pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine elibc_FreeBSD java elibc_FreeBSD 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=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
-LICENSE=BSD
-RDEPEND=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(-)?] dev-libs/protobuf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_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(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contribhdf? ( sci-libs/hdf5:= ) ffmpeg? ( media-video/ffmpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/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(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] ) 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(-)?] opengl? ( x11-libs/gtkglext[abi_x86_32(-)?,abi_x86_64(-)?,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/libdc1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_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(-)?] ) java? ( >=virtual/jre-1.6:* ) 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(-)?] ) lapack? ( virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] 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(-)?] ) png? ( 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(-)?] ) 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/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) tesseract? ( app-text/tesseract[opencl=] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) v4l? ( >=media-libs/libv4l-0.8.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(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=cuda? ( tesseract? ( opencl ) ) dnnsamples? ( examples ) gflags? ( contrib ) glog? ( contrib ) contribcvv? ( contrib qt5 ) contribdnn? ( contrib ) contribhdf? ( contrib ) contribsfm? ( contrib eigen gflags glog ) contribxfeatures2d? ( contrib download ) java? ( python ) opengl? ( || ( gtk qt5 ) ) python? ( || ( python_targets_python3_6 python_targets_python3_7 ) ) tesseract? ( contrib )
-SLOT=0/4.1.2
-SRC_URI=https://github.com/opencv/opencv/archive/4.1.2.tar.gz -> opencv-4.1.2.tar.gz dnnsamples? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-res10_300x300-caffeemodel.tar.gz ) contrib? ( https://github.com/opencv/opencv_contrib/archive/4.1.2.tar.gz -> opencv-4.1.2_contrib.tar.gz contribdnn? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-face_landmark_model.tar.gz ) contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=874e1cf7ebcd0d40cc774b522b8ba444
diff --git a/metadata/md5-cache/media-libs/opencv-4.1.2-r3 b/metadata/md5-cache/media-libs/opencv-4.1.2-r3
index a18c0e760ba1..05f197de3bc5 100644
--- a/metadata/md5-cache/media-libs/opencv-4.1.2-r3
+++ b/metadata/md5-cache/media-libs/opencv-4.1.2-r3
@@ -5,11 +5,11 @@ DESCRIPTION=A collection of algorithms and sample code for various computer visi
 EAPI=7
 HOMEPAGE=https://opencv.org
 IUSE=contrib contribcvv contribdnn contribhdf contribsfm contribxfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnnsamples -download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack opencl openexr opengl openmp opencvapps pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine elibc_FreeBSD java elibc_FreeBSD 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=~amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=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(-)?] dev-libs/protobuf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_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(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contribhdf? ( sci-libs/hdf5:= ) ffmpeg? ( media-video/ffmpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/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(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] ) gtk3? ( 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(-)?] ) ieee1394? ( media-libs/libdc1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_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(-)?] ) java? ( >=virtual/jre-1.6:* ) 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(-)?] ) lapack? ( virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] 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(-)?] ) png? ( 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(-)?] ) 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/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) tesseract? ( app-text/tesseract[opencl=] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) v4l? ( >=media-libs/libv4l-0.8.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(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=cuda? ( tesseract? ( opencl ) ) dnnsamples? ( examples ) gflags? ( contrib ) glog? ( contrib ) contribcvv? ( contrib qt5 ) contribdnn? ( contrib ) contribhdf? ( contrib ) contribsfm? ( contrib eigen gflags glog ) contribxfeatures2d? ( contrib download ) java? ( python ) opengl? ( qt5 ) python? ( || ( python_targets_python3_6 python_targets_python3_7 ) ) tesseract? ( contrib ) ?? ( gtk3 qt5 )
 SLOT=0/4.1.2
 SRC_URI=https://github.com/opencv/opencv/archive/4.1.2.tar.gz -> opencv-4.1.2.tar.gz dnnsamples? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-res10_300x300-caffeemodel.tar.gz ) contrib? ( https://github.com/opencv/opencv_contrib/archive/4.1.2.tar.gz -> opencv-4.1.2_contrib.tar.gz contribdnn? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-face_landmark_model.tar.gz ) contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=55bab3ec719077429540d569ba717777
+_md5_=32f0cc3924655738d26538458454f5ab
diff --git a/metadata/md5-cache/media-libs/openexr-2.3.0 b/metadata/md5-cache/media-libs/openexr-2.3.0
index b2fe0b7ca2ca..ae7cc11ec595 100644
--- a/metadata/md5-cache/media-libs/openexr-2.3.0
+++ b/metadata/md5-cache/media-libs/openexr-2.3.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=media-libs/ilmbase-2.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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-devel/autoconf-archive-2016.09.16 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=ILM's OpenEXR high dynamic-range image file format libraries
 EAPI=6
-HOMEPAGE=http://openexr.com/
+HOMEPAGE=https://www.openexr.com/
 IUSE=cpu_flags_x86_avx examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 -arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0/24
 SRC_URI=https://github.com/openexr/openexr/releases/download/v2.3.0/openexr-2.3.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=68be759ee4840e147e37ec6eb53c1fb2
+_md5_=04563c3c590754b39bebb030fa27873b
diff --git a/metadata/md5-cache/media-libs/qtav-1.12.0-r2 b/metadata/md5-cache/media-libs/qtav-1.12.0-r2
index 82a784f9636c..711f58d7eec9 100644
--- a/metadata/md5-cache/media-libs/qtav-1.12.0-r2
+++ b/metadata/md5-cache/media-libs/qtav-1.12.0-r2
@@ -12,4 +12,4 @@ REQUIRED_USE=gui? ( opengl )
 SLOT=0/1
 SRC_URI=https://github.com/wang-bin/QtAV/archive/v1.12.0.tar.gz -> qtav-1.12.0.tar.gz https://dev.gentoo.org/~johu/distfiles/qtav-1.12.0-capi.h-b43aa93.xz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=79065b62d15625bf917b6ac4fa84fe94
+_md5_=3aa0630abd4cea324d92fe7cc6c6179c
diff --git a/metadata/md5-cache/media-libs/svgalib-1.9.25-r5 b/metadata/md5-cache/media-libs/svgalib-1.9.25-r5
index 9f53dd0f3861..2dd27ad793b2 100644
--- a/metadata/md5-cache/media-libs/svgalib-1.9.25-r5
+++ b/metadata/md5-cache/media-libs/svgalib-1.9.25-r5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://www.arava.co.il/matan/svgalib/svgalib-1.9.25.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=941ea0cf14b9fb24a8930174c73546c5
diff --git a/metadata/md5-cache/media-libs/svgalib-1.9.25-r6 b/metadata/md5-cache/media-libs/svgalib-1.9.25-r6
index 283e983990a4..6a7ad991ed4a 100644
--- a/metadata/md5-cache/media-libs/svgalib-1.9.25-r6
+++ b/metadata/md5-cache/media-libs/svgalib-1.9.25-r6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://www.arava.co.il/matan/svgalib/svgalib-1.9.25.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7b8c9348a243b47e50bcb39127aea1ad
diff --git a/metadata/md5-cache/media-libs/woff2-1.0.2-r2 b/metadata/md5-cache/media-libs/woff2-1.0.2-r2
index 45d6680b9426..4a4b3094ae50 100644
--- a/metadata/md5-cache/media-libs/woff2-1.0.2-r2
+++ b/metadata/md5-cache/media-libs/woff2-1.0.2-r2
@@ -4,10 +4,10 @@ DEPEND=app-arch/brotli
 DESCRIPTION=Encode/decode WOFF2 font format
 EAPI=7
 HOMEPAGE=https://github.com/google/woff2
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=app-arch/brotli
 SLOT=0
 SRC_URI=https://github.com/google/woff2/archive/v1.0.2.tar.gz -> woff2-1.0.2.tar.gz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=063619cde7e1b22c58f23094c848d4da
+_md5_=49b394b386d60d7ea2baa97fe718d380
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index c3b39697feae..d2a07cb57f5c 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/grilo-plugins-0.3.11 b/metadata/md5-cache/media-plugins/grilo-plugins-0.3.11
index 5f7086ca9523..9bb9bac919ea 100644
--- a/metadata/md5-cache/media-plugins/grilo-plugins-0.3.11
+++ b/metadata/md5-cache/media-plugins/grilo-plugins-0.3.11
@@ -5,11 +5,11 @@ DESCRIPTION=A collection of plugins for the Grilo framework
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Grilo
 IUSE=daap chromaprint flickr freebox gnome-online-accounts lua test thetvdb tracker upnp-av +youtube
-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=>=dev-libs/glib-2.44:2 >=media-libs/grilo-0.3.8:0.3=[network,playlist] freebox? ( net-dns/avahi[dbus] ) >=dev-libs/gom-0.3.2-r1 chromaprint? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-chromaprint:1.0 ) dev-libs/json-glib daap? ( >=net-libs/libdmapsharing-2.9.12:3.0 ) media-libs/libmediaart:2.0 net-libs/libsoup:2.4 dev-libs/libxml2:2 flickr? ( net-libs/liboauth ) dev-db/sqlite:3 >=dev-libs/totem-pl-parser-3.4.1 tracker? ( >=app-misc/tracker-2.3.0:= ) upnp-av? ( net-libs/dleyna-connector-dbus net-misc/dleyna-server ) lua? ( >=dev-lang/lua-5.3 app-arch/libarchive dev-libs/libxml2:2 ) thetvdb? ( app-arch/libarchive ) youtube? ( >=dev-libs/libgdata-0.9.1:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.91:= )
 RESTRICT=!test? ( test )
 SLOT=0.3
 SRC_URI=mirror://gnome/sources/grilo-plugins/0.3/grilo-plugins-0.3.11.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c33cc43f3e4962270400bc1101ed9ab3
+_md5_=98c9bb7fbd1efb4f14a847dfb4c90eb8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.16.2
index 8987db069916..f3117eb782f4 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=ATSC A/52 audio decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=+orc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_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=GPL-2
 RDEPEND=>=media-libs/a52dec-0.7.4-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=58e7fef94e4025de33e38b027d051b1b
+_md5_=fd51ab1c17131b8ec2627e0a2fd3831b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-amr-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-amr-1.16.2
index 22f23204744b..469b1d6f19a0 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-amr-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-amr-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=AMRNB encoder/decoder and AMRWB decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fa20fe546b75e3962368322db41260d9
+_md5_=b2b0ff7286954784c3c094b996677d73
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.16.2
index 5cf93d3cec33..5e6b87a5b9b7 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=ASS/SSA rendering with effects support plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_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=GPL-2
 RDEPEND=>=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8f09acf8bb474fdbe30e52ea96a7af72
+_md5_=bcc7e95a6e70c0e2184a2d981b550744
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.16.2
index 3fa2208a1e23..fd96008ad450 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=AVDTP source/sink and A2DP sink plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-wireless/bluez-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.38.2-r1: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/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e2eedf155f4a3749e005f473bee1e4c6
+_md5_=914ea75f69dff937184b1a0c6cc67046
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.16.2
index 90ff0dbf48c1..8e02f572f237 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=bs2b elements for Gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libbs2b[abi_x86_32(-)?,abi_x86_64(-)?,abi_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.38.2-r1: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/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e016b0c2758f4d807595ce9375a544e3
+_md5_=b544f5795fed23a6bda213d474bee4d7
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.16.2
index 020578a382cc..7bd3f8a788cc 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=CD Audio Source (cdda) plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libcdio-0.90-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/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=afb07cbd28d65dd6610bd5f5de4613aa
+_md5_=48085b77d63b2861f3ac320117888b80
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.16.2
index 70c7cfd80921..017e482403f3 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=CD Audio Source (cdda) plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_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=GPL-2
 RDEPEND=>=media-sound/cdparanoia-3.10.2-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c382a8ac94a9a4ad05d4c95181fe8605
+_md5_=0462938afef1aad3f7417f5777e8ffcf
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dash-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-dash-1.16.2
index 8bc0fcb667db..2db01d99b16a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dash-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dash-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=MPEG-DASH plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4dbfad4d31b9164cdda9cd2e3d165090
+_md5_=7968480a67e83f8484266fbf56a494bc
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.16.2
index fec29b7a6967..28ad2a666189 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=DTLS encoder/decoder with SRTP support plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=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(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.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(-)?] ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4a03939a0ca5599ed78d076521c3cb44
+_md5_=e3151c8e2f786de2c42a9f8dd9407780
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dts-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-dts-1.16.2
index 0c056a68cd25..9c19a5750837 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dts-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dts-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=DTS audio decoder plugin for Gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=+orc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libdca-0.0.5-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(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3d3f928ed3d2957bb3cc633f6aa87458
+_md5_=3696eb7d4348693e903183ca93931818
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dv-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-dv-1.16.2
index ecf4996f3f44..7ad1654c3dde 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dv-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dv-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=DV demuxer and decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libdv-1.0.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a772eb88ba3315e3f82e76060a5ba4ce
+_md5_=354ea17e91436321da152407f0bbb596
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.16.2
index 16273a4459ea..2c08795b2711 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=08e478df49ad7e38e81624c419b92002
+_md5_=8653a022cde9096e55a911af67e978ab
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.16.2
index 0931200fcb4d..272ec286b967 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=DVD read plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_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=GPL-2
 RDEPEND=>=media-libs/libdvdread-4.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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9d1f4fda24a16fda6c85d878779c31b9
+_md5_=f1c91b443e5ad21af1b8000a0cee22ab
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faac-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-faac-1.16.2
index 9398ea525fb3..28592110425f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faac-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faac-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=AAC audio encoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5a647e61b4e6e6ab8b8c964a0b4bdc9c
+_md5_=6198e9dd1d06e3afc343f95a73922a1f
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faad-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-faad-1.16.2
index b4367e5c0e23..3d0677d783ab 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faad-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faad-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=AAC audio decoder plugin.
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_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=GPL-2
 RDEPEND=>=media-libs/faad2-2.7-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9884e37a533ac94711a401d4c9c30136
+_md5_=fcbee0be5438e54218ba86b130dcbf76
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-flac-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.16.2
index 14808fbf0f55..ade9b3be999c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-flac-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=FLAC encoder/decoder/tagger plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_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=GPL-2
 RDEPEND=>=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7706855d0baabb58155ef5e8232871d4
+_md5_=81176fe6d9ae3012ac9dd21af995b7f3
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.16.2
index 8c171ca6dec0..da92c2de4911 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_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=GPL-2
 RDEPEND=>=x11-libs/gdk-pixbuf-2.30.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0dc84c1c8cfe98d7903f89a08aa5b220
+_md5_=9d29134adc00fbbb334475c03399a23e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.16.2
index 05834913d366..f36689cbaf62 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Video sink plugin for GStreamer that renders to a GtkWidget
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=+egl gles2 +opengl wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=media-libs/gst-plugins-base-1.16.2: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(-)?,egl=,gles2=,opengl=,wayland=,X=] >=x11-libs/gtk+-3.15:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gles2? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0 >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0458425744e4a271ce2c176df92911e4
+_md5_=8c45da6703fd8f5623bc349032bdb652
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-hls-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-hls-1.16.2
index 0b68b3e31156..27f6fb0fe651 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-hls-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-hls-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP live streaming plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_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.38.2-r1: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/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0fd5b79dfff9e62a408fca46dca55d5f
+_md5_=2cc1dc115b160209af933813aabdfc4c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.16.2
index 9464de23e4d8..6530f8cec8cf 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_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.38.2-r1: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/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=88ea0e415e20c493526bb0ecd4b2eae1
+_md5_=88a3db500d8534e7618b69a7188d06fe
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.16.2
index 4d21e814159d..ea1f3fc9c435 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=JPEG image encoder/decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=36a869150c00d42c1b3e89a9ab8ea9af
+_md5_=27da8473ac90f55589cb9128e207328d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.16.2
index 0da9ae85db23..120b429144b0 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Ladspa elements for Gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eafa8d4a756e4885d1f785d3028e56ce
+_md5_=12ff8d0314259174c26f52d2a3ceb460
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-lame-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-lame-1.16.2
index 0725ae804988..c51fab8b6600 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-lame-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-lame-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=MP3 encoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_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=GPL-2
 RDEPEND=>=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7c2232ae27b1183567e3e76f00561f4d
+_md5_=a8014cd34851e544ccca18267c4d811c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.16.2-r1 b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.16.2-r1
index 9e37ae84ac04..0d92edce6146 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.16.2-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.16.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=FFmpeg based gstreamer plugin
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/modules/gst-libav.html
 IUSE=+orc abi_x86_32 abi_x86_64 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 ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.16.2: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.16.2: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-video/ffmpeg-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(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.16.2.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=42e80538b4540bd60ac9a4a728cf8416
+_md5_=1f1903ec25da8922a19dedd4051a4796
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.16.2
index d9afd6bcfbe9..60055e8e64e1 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=H.265 decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libde265-0.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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6091b4fe805870cb11d7ce76e5ed720e
+_md5_=ef36f20461a74a2ce99d740beee8d6b1
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.16.2
index 8b1993171897..ebabb8ab1fff 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Microsoft Multi Media Server source plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_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=GPL-2
 RDEPEND=>=media-libs/libmms-0.6.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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ca9953d3ccfed08b65daa9622f442a19
+_md5_=6e30e153a3cb03caab0b8ea336003c5f
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.16.2
index 0ff33fe8986e..482961cc8497 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=PNG image encoder/decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c5f1e1aea62f7450840973ad9620633e
+_md5_=4e58d3d496c35406f001399c75920a3b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.16.2
index 353a62a09e7d..58a6a81fc333 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Visualization elements for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libvisual-0.4.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/libvisual-plugins-0.4.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eb51c4a1d7d8013715118ca4fd0ac971
+_md5_=9f3ea3d154143a1411cfd7db04968b8e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.16.2-r1 b/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.16.2-r1
index 03aca9015ef7..bc1c87fb576d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.16.2-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.16.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Lv2 elements for Gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/lv2-1.14.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lilv-0.24.2-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/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5719bdcaa2417729fce12f4d139f3cb1
+_md5_=2066874172a68e83a8956a7359eb254e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-meta-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-meta-1.16.2
index 9fdadfe32132..ead384482115 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-meta-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-meta-1.16.2
@@ -3,10 +3,10 @@ DESCRIPTION=Meta ebuild to pull in gst plugins for apps
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_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=metapackage
 RDEPEND=>=media-libs/gstreamer-1.16.2: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.16.2:1.0[alsa?,ogg?,theora?,vorbis?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2: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(-)?] a52? ( >=media-plugins/gst-plugins-a52dec-1.16.2: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(-)?] ) aac? ( >=media-plugins/gst-plugins-faad-1.16.2: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(-)?] ) cdda? ( || ( >=media-plugins/gst-plugins-cdparanoia-1.16.2: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-plugins/gst-plugins-cdio-1.16.2: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(-)?] ) ) dts? ( >=media-plugins/gst-plugins-dts-1.16.2: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(-)?] ) dv? ( >=media-plugins/gst-plugins-dv-1.16.2: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(-)?] ) dvb? ( >=media-plugins/gst-plugins-dvb-1.16.2: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-bad-1.16.2: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(-)?] ) dvd? ( >=media-libs/gst-plugins-ugly-1.16.2: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-plugins/gst-plugins-a52dec-1.16.2: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-plugins/gst-plugins-dvdread-1.16.2: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-plugins/gst-plugins-mpeg2dec-1.16.2: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-plugins/gst-plugins-resindvd-1.16.2: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(-)?] ) ffmpeg? ( >=media-plugins/gst-plugins-libav-1.16.2: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(-)?] ) flac? ( >=media-plugins/gst-plugins-flac-1.16.2: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(-)?] ) http? ( >=media-plugins/gst-plugins-soup-1.16.2: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(-)?] ) jack? ( >=media-plugins/gst-plugins-jack-1.16.2: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(-)?] ) lame? ( >=media-plugins/gst-plugins-lame-1.16.2: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(-)?] ) libass? ( >=media-plugins/gst-plugins-assrender-1.16.2: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(-)?] ) libvisual? ( >=media-plugins/gst-plugins-libvisual-1.16.2: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(-)?] ) mms? ( >=media-plugins/gst-plugins-libmms-1.16.2: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(-)?] ) modplug? ( >=media-plugins/gst-plugins-modplug-1.16.2: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(-)?] ) mp3? ( >=media-libs/gst-plugins-ugly-1.16.2: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-plugins/gst-plugins-mpg123-1.16.2: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(-)?] ) mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-1.16.2: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(-)?] ) opus? ( >=media-plugins/gst-plugins-opus-1.16.2: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(-)?] ) oss? ( >=media-plugins/gst-plugins-oss-1.16.2: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(-)?] ) pulseaudio? ( >=media-plugins/gst-plugins-pulse-1.16.2: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(-)?] ) taglib? ( >=media-plugins/gst-plugins-taglib-1.16.2: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(-)?] ) v4l? ( >=media-plugins/gst-plugins-v4l2-1.16.2: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(-)?] ) vaapi? ( >=media-plugins/gst-plugins-vaapi-1.16.2: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(-)?] ) vcd? ( >=media-plugins/gst-plugins-mplex-1.16.2: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-plugins/gst-plugins-mpeg2dec-1.16.2: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(-)?] ) vpx? ( >=media-plugins/gst-plugins-vpx-1.16.2: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(-)?] ) wavpack? ( >=media-plugins/gst-plugins-wavpack-1.16.2: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(-)?] ) x264? ( >=media-plugins/gst-plugins-x264-1.16.2: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(-)?] )
 REQUIRED_USE=opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )
 SLOT=1.0
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8b831f4fb70d2be6932d16709469f422
+_md5_=3ff1015e2bfde97cbeb4fa08839b6277
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.16.2
index 9e09369a1d14..e74b3c44ea2e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=MOD audio decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 arm64 ~hppa ~mips ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5bd4eb04821a930921f2cbe75448717a
+_md5_=4246c089066820958e2d8f7c5824b658
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.16.2
index f1239a63218a..a5d798e79391 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=MPEG2 decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libmpeg2-0.5.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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f86f2c248b0b9cf3cf5f7c4691583c3c
+_md5_=25489dd9b65450847f6aff3ddf188287
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.16.2
index c7ad2ac4b4db..b15d708f1313 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=MPEG-1/2 video encoding plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-video/mjpegtools-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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5831758d24c530394ab075fc3ff96b54
+_md5_=2d5a86ea927bfb41daed61e77f9d43e3
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.16.2
index 02d29db60102..cf2872071d1d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=MP3 decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_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=GPL-2
 RDEPEND=>=media-sound/mpg123-1.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f6585959c20c83418f2b999b2ecdecf8
+_md5_=343b83fe5e5ce5fb3d98f3c4c84b8ac6
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.16.2
index 854b1f7b7737..e44d076de0ae 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=MPEG/DVD/SVCD/VCD video/audio multiplexing plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-video/mjpegtools-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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3fd4556a258eb6299ce2bdf18a58db9f
+_md5_=546d6c8893595a791ca00b61d272abff
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-neon-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-neon-1.16.2
index b94d89d5d46c..191b1e5eec1a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-neon-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-neon-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP client source plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/neon-0.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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f7c0325a065932a4e7113a23b7c92ba5
+_md5_=63ad27f33d934e4f34d3603d1495c6c9
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.16.2
index e929669fb4d8..4960613030f6 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=MusicIP audio fingerprinting plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libofa-0.9.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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=684cbfb54f4ab71834b58696b4810f72
+_md5_=99f626a2a8acac88c349bfcdc547e977
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.16.2
index dbedfd0df748..4afb9b1da0fc 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=H.264 encoder/decoder plugin for GStreamer.
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/openh264-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-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b3982c6a3446f847318eabaabad434b4
+_md5_=5513ba5842d0cea0a1d36bbd292360d9
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.16.2
index 3a937b2b652d..3c0772811839 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Opus audio parser plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_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=GPL-2
 RDEPEND=>=media-libs/opus-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.16.2: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(-)?,ogg] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.16.2.tar.xz https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f733b2c3080825e951f3b4120ace9adc
+_md5_=ce594d0ea46fef7b4e93de961d65b0fc
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-oss-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.16.2
index 9e0d839aa5fb..f2ae12f02936 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-oss-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=OSS (Open Sound System) support plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_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=GPL-2
 RDEPEND=>=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=80d702936478404c5f9d443eb9279909
+_md5_=3434837037ad74ea42e8495d5ea897bd
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.16.2
index 310b135ff899..24d7493a23ba 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=PulseAudio sound server plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_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=GPL-2
 RDEPEND=>=media-libs/gst-plugins-base-1.16.2: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-sound/pulseaudio-2.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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ccada1f847e73c17ed74e1417e72206
+_md5_=050a9132b8b6cba0fe74a57d907c53ea
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.16.2
index 826b612bd4d2..eff0547cb501 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Fiwewire DV/HDV capture plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cb6d45133fd187996b035c5c94397db8
+_md5_=4a2a35f2c731881b5e053548b516189b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.16.2
index e5e3c0fafae5..9aa5a762381f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=DVD playback support plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_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=GPL-2
 RDEPEND=>=media-libs/libdvdnav-4.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(-)?] >=media-libs/libdvdread-4.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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4b3f04a6d70ff1c888bb2c79fdeec785
+_md5_=1e6e7061f08d6b4879c65032394fcbab
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.16.2
index 98c00f43951c..2bc0003c87ca 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=RTMP source/sink plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4d1642d201d2c2215f9ec2446b40223a
+_md5_=76732a1388114f4ea1bbd29c0280ff8a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.16.2
index 96305710d007..098fb9239573 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Icecast server sink plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libshout-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cbf6baf198ea3c29d098fe3f2db7c03e
+_md5_=d832c1095340f06bd404aeada7711c80
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.16.2
index af05181d33b5..2956052ecdc2 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Sid decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libsidplay-1.36.59-r1: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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3bbc3e64498ac38d0312f6561a07d8e1
+_md5_=3d502c371399556713a68d2b4ae63216
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.16.2
index e677d45b01fb..8a3e9792b865 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Smooth Streaming plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8db5f47446ddad5d5dca0fbe16475976
+_md5_=0e47d7494d543b471623cf96ab76cbbb
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.16.2
index e32427723bfd..f70ec2a851f3 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Beats-per-minute detection and pitch controlling plugin for GStreame
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libsoundtouch-1.7.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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=468bd605964f4c96f9482fad5c5266e2
+_md5_=28d90d82e248266369088258db8b548b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soup-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.16.2
index e3ad7e4d895b..40944f0df523 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-soup-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP client source/sink plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x64-macos
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libsoup-2.48:2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=71a56d609577e2e7dd5ddc7803dafa84
+_md5_=a15a12f60b189cf7db55348a53610f60
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-speex-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-speex-1.16.2
index 09b8512b8c03..805a52f8550f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-speex-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-speex-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Speex encoder/decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/speex-1.2_rc1-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/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=25981f04e1434d870d387e02b33ca60e
+_md5_=0d4afcf88231e4350a504f554049b166
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.16.2
index 48b5c27a957c..e4ce687fcb60 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=SRTP encoder/decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libsrtp-2.1.0:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5ee919c8eef5613a352aab4365bd9251
+_md5_=99fe1106c511195242cda13ad4a26494
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.16.2
index c7193dbd90f8..18b82bea78cd 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=ID3v2/APEv2 tagger plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_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=GPL-2
 RDEPEND=>=media-libs/taglib-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1c07fc39d0d2a6b3f73127a504592d82
+_md5_=b93752f0110fc98d83f7194eaa7820cf
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.16.2
index f827dc6e2572..88f8bc06751c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=MPEG2 encoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7b3b4d4b6779b496d18853ce5c7d534d
+_md5_=3cf836c404ebad5b44780ae62dc66bf6
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.16.2
index c956c659bb2f..2bbb48d682a2 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=UVC compliant H264 encoding cameras plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=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(-)?] 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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3b92b1510e030480c8655ee2b8774ef4
+_md5_=9715f1391b2586c150dd8dd1b80f892e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.16.2
index 956bafe88475..1d109ff85052 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_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=GPL-2
 RDEPEND=>=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.16.2: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(-)?] udev? ( >=dev-libs/libgudev-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(-)?] ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=05296121e7c16c9f425d9ac02b80bf93
+_md5_=e2a6e5d530a73c58a3c6fd44a6165a95
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.16.2
index 811125ce38dc..5e14aa7316f8 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Hardware accelerated video decoding through VA-API plugin for GStrea
 EAPI=6
 HOMEPAGE=https://cgit.freedesktop.org/gstreamer/gstreamer-vaapi
 IUSE=+drm +egl gles2 +opengl 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 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=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(-)?] >=media-libs/gstreamer-1.16.2: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.16.2: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-bad-1.16.2: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(-)?] >=x11-libs/libva-1.4.0:=[drm?,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(-)?] drm? ( >=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(-)?] >=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/gst-plugins-base-1.16.2:1.0[egl?,gles2?,opengl?,wayland?,X?] media-libs/mesa[gles2?,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(-)?] ) opengl? ( >=media-libs/gst-plugins-base-1.16.2:1.0[egl?,gles2?,opengl?,wayland?,X?] media-libs/mesa[gles2?,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(-)?] ) wayland? ( >=dev-libs/wayland-1.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_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.15 ) 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/libXrandr-1.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(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?,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=|| ( drm gles2 opengl wayland X ) gles2? ( egl ) opengl? ( || ( egl X ) )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.16.2.tar.xz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4ed969f2e51ead534645dd4853d66960
+_md5_=a8061527a4373664a53d584c0cbc2b9b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.16.2
index 97c2d74ab743..16626fefb98c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=AAC encoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=150ff334534f3a108e8f4c4b69710896
+_md5_=695249040951ea466b07296591923354
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.16.2
index 4bfd5764ffad..ed3879c48325 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=AMR-WB audio encoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3d990c10490cddc749dd204501b38227
+_md5_=9f2ce82105c447019aa3cdc2fcc14213
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.16.2
index fbae2ceb23c2..27d1df51aa5f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=VP8/VP9 video encoder/decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libvpx-1.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5bdd492ad7816bc0e891d1a7fc276d7c
+_md5_=db5db4be3a977380e392aa528472c644
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.16.2
index 22731bd0cadc..328e33b1f20a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Wavpack audio encoder/decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=acc993ad7257058b75dfc03dc96bbe7b
+_md5_=5e3763c1d2a0135a5ea777930ac0e256
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x264-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-x264-1.16.2
index d83c065eeec9..b61793b1abc7 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-x264-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-x264-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=H.264 encoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=850c53c9758e8dd7e59645989c80539c
+_md5_=1c26d2b6bcd34cd2016390548bda7516
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x265-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-x265-1.16.2
index bbda10cce891..eae987ee1690 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-x265-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-x265-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=H.265 encoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=media-libs/x265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_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.38.2-r1: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/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e9178499b5ca15a873aca88d67a858e6
+_md5_=439102280dd4d4386a478a61979c2361
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.16.2
index 8a7b7c2cdd23..3295b676e0df 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=X11 video capture stream plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/gst-plugins-base-1.16.2: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(-)?] >=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/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/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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=031a14f7f1026e180026e78ce70bc576
+_md5_=ba7e2db6b26d42253ba99a8740713c9f
diff --git a/metadata/md5-cache/media-plugins/mythplugins-31.0 b/metadata/md5-cache/media-plugins/mythplugins-31.0
index 0a5942d9764e..3ac129bdf788 100644
--- a/metadata/md5-cache/media-plugins/mythplugins-31.0
+++ b/metadata/md5-cache/media-plugins/mythplugins-31.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst setup
-DEPEND=dev-libs/glib:2 dev-libs/openssl:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 media-libs/freetype:2 media-libs/libpng:= 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 ) hls? ( media-libs/faac media-libs/libvpx:= media-libs/x264:= media-sound/lame ) ieee1394? ( media-libs/libiec61883 sys-libs/libavc1394 sys-libs/libraw1394 ) libass? ( media-libs/libass:= ) =media-tv/mythtv-31*[alsa?,cdda?,cdr?,exif?,fftw?,ieee1394?,libass?,opengl?,raw?,xml?,xvid] mytharchive? ( 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] ) app-cdr/dvd+rw-tools dev-python/pillow dev-python/mysqlclient =media-tv/mythtv-31*[python] media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythbrowser? ( dev-qt/qtwebkit:5 ) mythgame? ( sys-libs/zlib[minizip] dev-perl/XML-Twig ) mythmusic? ( media-libs/flac media-libs/libogg media-libs/libvorbis media-libs/taglib media-sound/lame fftw? ( sci-libs/fftw:3.0= ) opengl? ( virtual/opengl ) cdda? ( media-sound/cdparanoia dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) ) mythnetvision? ( 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] ) dev-python/lxml dev-python/oauth dev-python/pycurl dev-python/urllib3 =media-tv/mythtv-31*[python] ) 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 =media-tv/mythtv-31*[perl] ) mythzmserver? ( dev-db/mysql-connector-c:= ) theora? ( media-libs/libtheora ) xml? ( dev-libs/libxml2:= ) xvid? ( media-libs/xvid )
+DEPEND=dev-libs/glib:2 dev-libs/openssl:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 media-libs/freetype:2 media-libs/libpng:= 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 ) hls? ( media-libs/faac media-libs/libvpx:= media-libs/x264:= media-sound/lame ) ieee1394? ( media-libs/libiec61883 sys-libs/libavc1394 sys-libs/libraw1394 ) libass? ( media-libs/libass:= ) =media-tv/mythtv-31*[alsa?,cdda?,cdr?,exif?,fftw?,ieee1394?,libass?,opengl?,raw?,xml?,xvid] mytharchive? ( 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] ) app-cdr/dvd+rw-tools dev-python/pillow dev-python/mysqlclient =media-tv/mythtv-31*[python] media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythbrowser? ( dev-qt/qtwebkit:5 ) mythgame? ( sys-libs/zlib[minizip] dev-perl/XML-Twig ) mythmusic? ( dev-qt/qtwebkit:5 media-libs/flac media-libs/libogg media-libs/libvorbis media-libs/taglib media-sound/lame fftw? ( sci-libs/fftw:3.0= ) opengl? ( virtual/opengl ) cdda? ( media-sound/cdparanoia dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) ) mythnetvision? ( 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] ) dev-python/lxml dev-python/oauth dev-python/pycurl dev-python/urllib3 =media-tv/mythtv-31*[python] ) 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 =media-tv/mythtv-31*[perl] ) mythzmserver? ( dev-db/mysql-connector-c:= ) theora? ( media-libs/libtheora ) xml? ( dev-libs/libxml2:= ) xvid? ( media-libs/xvid )
 DESCRIPTION=Official MythTV plugins
 EAPI=7
 HOMEPAGE=https://www.mythtv.org https://github.com/MythTV/mythtv
 IUSE=mytharchive +mythbrowser 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 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=dev-libs/glib:2 dev-libs/openssl:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 media-libs/freetype:2 media-libs/libpng:= 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 ) hls? ( media-libs/faac media-libs/libvpx:= media-libs/x264:= media-sound/lame ) ieee1394? ( media-libs/libiec61883 sys-libs/libavc1394 sys-libs/libraw1394 ) libass? ( media-libs/libass:= ) =media-tv/mythtv-31*[alsa?,cdda?,cdr?,exif?,fftw?,ieee1394?,libass?,opengl?,raw?,xml?,xvid] mytharchive? ( 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] ) app-cdr/dvd+rw-tools dev-python/pillow dev-python/mysqlclient =media-tv/mythtv-31*[python] media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythbrowser? ( dev-qt/qtwebkit:5 ) mythgame? ( sys-libs/zlib[minizip] dev-perl/XML-Twig ) mythmusic? ( media-libs/flac media-libs/libogg media-libs/libvorbis media-libs/taglib media-sound/lame fftw? ( sci-libs/fftw:3.0= ) opengl? ( virtual/opengl ) cdda? ( media-sound/cdparanoia dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) ) mythnetvision? ( 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] ) dev-python/lxml dev-python/oauth dev-python/pycurl dev-python/urllib3 =media-tv/mythtv-31*[python] ) 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 =media-tv/mythtv-31*[perl] ) mythzmserver? ( dev-db/mysql-connector-c:= ) theora? ( media-libs/libtheora ) xml? ( dev-libs/libxml2:= ) xvid? ( media-libs/xvid )
+RDEPEND=dev-libs/glib:2 dev-libs/openssl:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 media-libs/freetype:2 media-libs/libpng:= 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 ) hls? ( media-libs/faac media-libs/libvpx:= media-libs/x264:= media-sound/lame ) ieee1394? ( media-libs/libiec61883 sys-libs/libavc1394 sys-libs/libraw1394 ) libass? ( media-libs/libass:= ) =media-tv/mythtv-31*[alsa?,cdda?,cdr?,exif?,fftw?,ieee1394?,libass?,opengl?,raw?,xml?,xvid] mytharchive? ( 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] ) app-cdr/dvd+rw-tools dev-python/pillow dev-python/mysqlclient =media-tv/mythtv-31*[python] media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythbrowser? ( dev-qt/qtwebkit:5 ) mythgame? ( sys-libs/zlib[minizip] dev-perl/XML-Twig ) mythmusic? ( dev-qt/qtwebkit:5 media-libs/flac media-libs/libogg media-libs/libvorbis media-libs/taglib media-sound/lame fftw? ( sci-libs/fftw:3.0= ) opengl? ( virtual/opengl ) cdda? ( media-sound/cdparanoia dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) ) mythnetvision? ( 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] ) dev-python/lxml dev-python/oauth dev-python/pycurl dev-python/urllib3 =media-tv/mythtv-31*[python] ) 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 =media-tv/mythtv-31*[perl] ) mythzmserver? ( dev-db/mysql-connector-c:= ) theora? ( media-libs/libtheora ) xml? ( dev-libs/libxml2:= ) xvid? ( media-libs/xvid )
 REQUIRED_USE=!mythnetvision mytharchive? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) ) mythnetvision? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) ) mythmusic? ( vorbis ) mythnews? ( mythbrowser )
 SLOT=0
 SRC_URI=https://github.com/MythTV/mythtv/archive/v31.0.tar.gz -> mythplugins-31.0.tar.gz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a56696ca0a4ce20b37c985d48c503b3f
+_md5_=5cdfcfd117a311ea5222a6ef72a3988a
diff --git a/metadata/md5-cache/media-plugins/vdr-actuator-1.2.1 b/metadata/md5-cache/media-plugins/vdr-actuator-1.2.1
index 5ddd54bf0cee..4796510297da 100644
--- a/metadata/md5-cache/media-plugins/vdr-actuator-1.2.1
+++ b/metadata/md5-cache/media-plugins/vdr-actuator-1.2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://ventoso.org/luca/vdr/vdr-actuator-1.2.1.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=a52498708a6f023c62f06526f56c871c
diff --git a/metadata/md5-cache/media-plugins/vdr-actuator-2.4.1_pre20181025 b/metadata/md5-cache/media-plugins/vdr-actuator-2.4.1_pre20181025
index d7f9ecfa02ac..f90b1f3e43af 100644
--- a/metadata/md5-cache/media-plugins/vdr-actuator-2.4.1_pre20181025
+++ b/metadata/md5-cache/media-plugins/vdr-actuator-2.4.1_pre20181025
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/olivluca/vdr-actuator-plugin/archive/c810abffbf6dc6f1f354b0c545abe65311203fd8.tar.gz -> vdr-actuator-2.4.1_pre20181025.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=b47a23c63d4d857f6535ac465ac147fd
diff --git a/metadata/md5-cache/media-plugins/vdr-atscepg-0.3.0-r1 b/metadata/md5-cache/media-plugins/vdr-atscepg-0.3.0-r1
index 7396f22bcef0..8d16c7b36b1f 100644
--- a/metadata/md5-cache/media-plugins/vdr-atscepg-0.3.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-atscepg-0.3.0-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile config configure install postinst postrm prepare setup un
 DEPEND=>=media-video/vdr-2 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: receive schedule and event information from ATSC broadcasts
 EAPI=7
-HOMEPAGE=http://www.fepg.org/atscepg.html
+HOMEPAGE=http://fepg.org/atscepg/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.fepg.org/files/vdr-atscepg-0.3.0.tgz mirror://gentoo/atscepg-0.3.0_vdr-1.7.13.tbz https://dev.gentoo.org/~hd_brummy/distfiles/atscepg-0.3.0_vdr-1.7.13.tbz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
-_md5_=f44b37a6f843aec0e8ae429bdd63964a
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_md5_=a837bf996a60b49e06c5c3a5734fd260
diff --git a/metadata/md5-cache/media-plugins/vdr-avards-0.2.4 b/metadata/md5-cache/media-plugins/vdr-avards-0.2.4
index d4c1dd3e6032..51517ffec09b 100644
--- a/metadata/md5-cache/media-plugins/vdr-avards-0.2.4
+++ b/metadata/md5-cache/media-plugins/vdr-avards-0.2.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/avards/vdr-avards-0.2.4.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=3918630bcee92ecdb62bb02ffd0dcd5e
diff --git a/metadata/md5-cache/media-plugins/vdr-avards-0.2.6 b/metadata/md5-cache/media-plugins/vdr-avards-0.2.6
index 2dfc4348bd08..97f01e194617 100644
--- a/metadata/md5-cache/media-plugins/vdr-avards-0.2.6
+++ b/metadata/md5-cache/media-plugins/vdr-avards-0.2.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/avards/vdr-avards-0.2.6.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=b575825a5676cb3e01b32e4b9952dde8
diff --git a/metadata/md5-cache/media-plugins/vdr-beep-0.1.2 b/metadata/md5-cache/media-plugins/vdr-beep-0.1.2
index 71c1e7abe670..1be547c33261 100644
--- a/metadata/md5-cache/media-plugins/vdr-beep-0.1.2
+++ b/metadata/md5-cache/media-plugins/vdr-beep-0.1.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-beep/vdr-beep-0.1.2.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=c467feb10e2a2e79f1c51b0f445917a1
diff --git a/metadata/md5-cache/media-plugins/vdr-bgprocess-0.1.0 b/metadata/md5-cache/media-plugins/vdr-bgprocess-0.1.0
index 262db91dc415..bee62b53644a 100644
--- a/metadata/md5-cache/media-plugins/vdr-bgprocess-0.1.0
+++ b/metadata/md5-cache/media-plugins/vdr-bgprocess-0.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.reelbox.org/software/vdr/vdr-bgprocess-0.1.0.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=9aa190c21d15b5c583de58559bfb8c6d
diff --git a/metadata/md5-cache/media-plugins/vdr-burn-0.2.2-r1 b/metadata/md5-cache/media-plugins/vdr-burn-0.2.2-r1
index 7184e8612b6f..d5f78aad6ca6 100644
--- a/metadata/md5-cache/media-plugins/vdr-burn-0.2.2-r1
+++ b/metadata/md5-cache/media-plugins/vdr-burn-0.2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=media-video/vdr media-libs/gd[png,truetype,jpeg] >=dev-libs/libcdio-0.71
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1252/vdr-burn-0.2.2.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=bb18dfc646aa066c1ce797bce9b0bf62
diff --git a/metadata/md5-cache/media-plugins/vdr-burn-0.3.0 b/metadata/md5-cache/media-plugins/vdr-burn-0.3.0
index b8eba368ead2..42001698b77c 100644
--- a/metadata/md5-cache/media-plugins/vdr-burn-0.3.0
+++ b/metadata/md5-cache/media-plugins/vdr-burn-0.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/gd[png,truetype,jpeg] media-video/vdr app-cdr/dvd+rw-tools dev-libs/libcdio media-fonts/corefonts media-video/dvdauthor media-video/mjpegtools[png] media-video/projectx media-video/transcode virtual/eject >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/2028/vdr-burn-0.3.0.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=582b71c354c8fc566c33e5b7f349002d
diff --git a/metadata/md5-cache/media-plugins/vdr-calc-0.0.1_rc5 b/metadata/md5-cache/media-plugins/vdr-calc-0.0.1_rc5
index 42d75a97dc8e..3e2d4fed323d 100644
--- a/metadata/md5-cache/media-plugins/vdr-calc-0.0.1_rc5
+++ b/metadata/md5-cache/media-plugins/vdr-calc-0.0.1_rc5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-calc/vdr-calc-0[1].0.1-rc5.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=5e349da83a3e807360ff13f652bce0c6
diff --git a/metadata/md5-cache/media-plugins/vdr-cdplayer-1.2.2 b/metadata/md5-cache/media-plugins/vdr-cdplayer-1.2.2
index 38639a711327..9ca58f4393b8 100644
--- a/metadata/md5-cache/media-plugins/vdr-cdplayer-1.2.2
+++ b/metadata/md5-cache/media-plugins/vdr-cdplayer-1.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2 >=dev-libs/libcdio-0.8.0 >=media-libs/libcddb-1.3.0 cdparanoia? ( >=dev-libs/libcdio-paranoia-0.90 ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://www.uli-eckhardt.de/vdr/download/vdr-cdplayer-1.2.2.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=f4d776e9daba5a695c1f4268ea00bf70
diff --git a/metadata/md5-cache/media-plugins/vdr-cinebars-0.0.5 b/metadata/md5-cache/media-plugins/vdr-cinebars-0.0.5
index 3b6a8bd1f54f..dfbf714396d1 100644
--- a/metadata/md5-cache/media-plugins/vdr-cinebars-0.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-cinebars-0.0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.egal-vdr.de/plugins/vdr-cinebars-0.0.5.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=572a26682e3fe2cb7afaebefd9dd2952
diff --git a/metadata/md5-cache/media-plugins/vdr-clock-1.0.0-r2 b/metadata/md5-cache/media-plugins/vdr-clock-1.0.0-r2
index 91d6d6f32f25..7b6c063cb680 100644
--- a/metadata/md5-cache/media-plugins/vdr-clock-1.0.0-r2
+++ b/metadata/md5-cache/media-plugins/vdr-clock-1.0.0-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.9 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/madmartin/vdr-clock/archive/v1.0.0.tar.gz -> vdr-clock-1.0.0.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=f3cf0ce18bf07a3cd0fe5f87c9ad028c
diff --git a/metadata/md5-cache/media-plugins/vdr-cpumon-0.0.6_p1 b/metadata/md5-cache/media-plugins/vdr-cpumon-0.0.6_p1
index 5da0e2d00c1f..4ded35a44a60 100644
--- a/metadata/md5-cache/media-plugins/vdr-cpumon-0.0.6_p1
+++ b/metadata/md5-cache/media-plugins/vdr-cpumon-0.0.6_p1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.44 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.christianglass.de/cpumon//vdr-cpumon-0.0.6a.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=989465271ff8ec8911b3f10c4b84e760
diff --git a/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.4 b/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.4
index 413a24c26516..f8c9ffaae634 100644
--- a/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.4
+++ b/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.1.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/jasmin-j/vdr-plugin-ddci2/archive/1.0.4.tar.gz -> vdr-ddci2-1.0.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=65e12300bc2f89b1dc2e5326e408d9d4
diff --git a/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.5 b/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.5
index c48eeb71b631..919c3ad4863d 100644
--- a/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.1.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/jasmin-j/vdr-plugin-ddci2/archive/1.0.5.tar.gz -> vdr-ddci2-1.0.5.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=65e12300bc2f89b1dc2e5326e408d9d4
diff --git a/metadata/md5-cache/media-plugins/vdr-ddci2-9999 b/metadata/md5-cache/media-plugins/vdr-ddci2-9999
index 527cf99c2e03..774c61f24004 100644
--- a/metadata/md5-cache/media-plugins/vdr-ddci2-9999
+++ b/metadata/md5-cache/media-plugins/vdr-ddci2-9999
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=media-video/vdr-2.1.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=65e12300bc2f89b1dc2e5326e408d9d4
diff --git a/metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1 b/metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1
index cd0519837894..66731be979c9 100644
--- a/metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1
+++ b/metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.u32.de/download/vdr-devstatus-0.4.1.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=7960515ffabcbe506c6dc5b3f9c53c45
diff --git a/metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1-r1 b/metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1-r1
index 6af56a3f13c8..6698b89174d1 100644
--- a/metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.u32.de/download/vdr-devstatus-0.4.1.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=5712a1e55763c84abb378a7555798834
diff --git a/metadata/md5-cache/media-plugins/vdr-dummydevice-2.0.0 b/metadata/md5-cache/media-plugins/vdr-dummydevice-2.0.0
index 64db952683f9..2c7c4147b215 100644
--- a/metadata/md5-cache/media-plugins/vdr-dummydevice-2.0.0
+++ b/metadata/md5-cache/media-plugins/vdr-dummydevice-2.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://phivdr.dyndns.org/vdr/vdr-dummydevice/vdr-dummydevice-2.0.0.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=b81bbfe0ffc0059cf0922dd983d94380
diff --git a/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5 b/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5
index 33614c9d8fb6..11c21b6e5a3f 100644
--- a/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.tolleri.net/vdr/plugins/vdr-duplicates-0.0.5.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=5ae02aa4c2678a5b5cfdd52c1dba48a5
diff --git a/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5-r1 b/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5-r1
index 6d69a531bb08..485a41b8592a 100644
--- a/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5-r1
+++ b/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.tolleri.net/vdr/plugins/vdr-duplicates-0.0.5.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=d623b9858fe94f0c46c969990cb51799
diff --git a/metadata/md5-cache/media-plugins/vdr-duplicates-0.1.0 b/metadata/md5-cache/media-plugins/vdr-duplicates-0.1.0
index 5e0f62957da2..537221fa9b7b 100644
--- a/metadata/md5-cache/media-plugins/vdr-duplicates-0.1.0
+++ b/metadata/md5-cache/media-plugins/vdr-duplicates-0.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.tolleri.net/vdr/plugins/vdr-duplicates-0.1.0.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=336c949700287f44f0c51d4cc30ed0e3
diff --git a/metadata/md5-cache/media-plugins/vdr-duplicates-1.0.1 b/metadata/md5-cache/media-plugins/vdr-duplicates-1.0.1
index ae0abcf0e08c..558a5f4ff360 100644
--- a/metadata/md5-cache/media-plugins/vdr-duplicates-1.0.1
+++ b/metadata/md5-cache/media-plugins/vdr-duplicates-1.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-duplicates.git/snapshot/vdr-plugin-duplicates-68739fd72beb9745b3e47b9e466311ef23a8ca97.tar.gz -> vdr-duplicates-1.0.1.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=14ee08282f564159af75536b7ba7d73b
diff --git a/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.4 b/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.4
index 70365cc053c9..4f697fe79dd4 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.4
+++ b/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-video/vdr-2.1.4 dvbcsa? ( media-libs/libdvbcsa ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/manio/vdr-plugin-dvbapi/archive/v2.2.4.tar.gz -> vdr-plugin-dvbapi-2.2.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=baac8fd160e0447918c663d187c70628
diff --git a/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.5 b/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.5
index aede2c707315..621e2d0eaa50 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.5
+++ b/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-video/vdr-2.4.1 dvbcsa? ( media-libs/libdvbcsa ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/manio/vdr-plugin-dvbapi/archive/v2.2.5.tar.gz -> vdr-plugin-dvbapi-2.2.5.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=e2f3b6c5802d823554bf6d21b5cad28a
diff --git a/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.3_p20140115 b/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.3_p20140115
index c359f85b2482..f2034aa25e72 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.3_p20140115
+++ b/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.3_p20140115
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.39 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://bitbucket.org/powARman/dvbhddevice/get/60c58ae453d0.tar.gz -> dvbhddevice-2.1.3_p20140115.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=c9d4e09c84b87bf99157cf9c875ece78
diff --git a/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.2.0_p20180420 b/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.2.0_p20180420
index 083deebbf40a..c6cbaafefb47 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.2.0_p20180420
+++ b/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.2.0_p20180420
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://bitbucket.org/powARman/dvbhddevice/get/2ea854ae8c7a.tar.gz -> vdr-dvbhddevice-2.2.0_p20180420.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=61cfaeedf453856023e7cfb9ee80cb79
diff --git a/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.0.0 b/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.0.0
index aaacb80a7f2b..fc67f7dd0973 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.0.0
+++ b/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.36 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~hd_brummy/distfiles/vdr-dvbsddevice-2.0.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=833408bc4505e0deb1637dcdc16a02be
diff --git a/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.2.0 b/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.2.0
index 75cc184e65a8..75363246d60f 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-dvbsddevice-2.2.0.tar.gz https://dev.gentoo.org/~hd_brummy/distfiles/vdr-dvbsddevice-2.2.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=6877c33328340ad4b6dd05b3a2e9ac19
diff --git a/metadata/md5-cache/media-plugins/vdr-dvd-0.3.7_pre20090106-r1 b/metadata/md5-cache/media-plugins/vdr-dvd-0.3.7_pre20090106-r1
index e9c3543717be..2d2802e84c07 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvd-0.3.7_pre20090106-r1
+++ b/metadata/md5-cache/media-plugins/vdr-dvd-0.3.7_pre20090106-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-libs/libdvdnav-4.2.0 >=media-libs/a52dec-0.7.4 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-dvd-cvs-20090106.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=478da0e8a903f7fc165d7d85541e3d29
diff --git a/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.2 b/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.2
index c879eadabc39..9edbc744ca23 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.2
+++ b/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-plugins/vdr-dvd >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1323/vdr-dvdswitch-0.2.2.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=2b4723259b88f85c33dfffa4675a3851
diff --git a/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.3 b/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.3
index 2ce9748a308e..6441675d6ce7 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.3
+++ b/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-plugins/vdr-dvd >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/2084/vdr-dvdswitch-0.2.3.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=3bcc9b199d4dd096ee6c67126b1892d1
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsearch-1.0.1_p20141227-r1 b/metadata/md5-cache/media-plugins/vdr-epgsearch-1.0.1_p20141227-r1
index 76fc5d9d06f2..df737538c0b6 100644
--- a/metadata/md5-cache/media-plugins/vdr-epgsearch-1.0.1_p20141227-r1
+++ b/metadata/md5-cache/media-plugins/vdr-epgsearch-1.0.1_p20141227-r1
@@ -10,5 +10,5 @@ RDEPEND=media-video/vdr pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) >=media
 REQUIRED_USE=?? ( pcre tre )
 SLOT=0
 SRC_URI=http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-a908daa4c5c6edd6c560ed96939358b4352e9b42.tar.gz -> vdr-epgsearch-1.0.1_p20141227.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=9b9b7f46f6d6aef5ee753b9b76a60293
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsearch-2.2.0 b/metadata/md5-cache/media-plugins/vdr-epgsearch-2.2.0
index 72f140eebe35..d30ba3579afc 100644
--- a/metadata/md5-cache/media-plugins/vdr-epgsearch-2.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-epgsearch-2.2.0
@@ -10,5 +10,5 @@ RDEPEND==media-video/vdr-2.2* pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) >
 REQUIRED_USE=?? ( pcre tre )
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-2.2.0.tar.gz -> vdr-epgsearch-2.2.0.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=bb7e0fe1286ad5f96ff7f3c6fbb46bfc
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.0 b/metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.0
index 120e48b9b192..1fde714572ae 100644
--- a/metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.0
+++ b/metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/vdr-2.4 pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) >
 REQUIRED_USE=?? ( pcre tre )
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-2.4.0.tar.gz -> vdr-epgsearch-2.4.0.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=3b589aa1837085365d4ac202bdfb49df
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.0_p20191202 b/metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.0_p20191202
index 26ee324c98d4..92db06e1987f 100644
--- a/metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.0_p20191202
+++ b/metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.0_p20191202
@@ -11,5 +11,5 @@ RDEPEND=>=media-video/vdr-2.4 pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) >
 REQUIRED_USE=?? ( pcre tre )
 SLOT=0
 SRC_URI=http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-602d66c55964998ce25c6c57b302949a9517f149.tar.gz -> vdr-epgsearch-2.4.0_p20191202.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=e1e44311a531957b994470858ef6c564
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1 b/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1
index c39c40670eeb..c956a91681f6 100644
--- a/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1
+++ b/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/epgsync/vdr-epgsync-1.0.1.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=5649f1e552057b9150247450f26d0711
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1-r1 b/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1-r1
index a513db3a58aa..0436eda67483 100644
--- a/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/epgsync/vdr-epgsync-1.0.1.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=41a5b89b4b3eca78cc28549ec0d3644a
diff --git a/metadata/md5-cache/media-plugins/vdr-exec-0.0.3 b/metadata/md5-cache/media-plugins/vdr-exec-0.0.3
index 0bedb1ba788c..f3a4d4718abd 100644
--- a/metadata/md5-cache/media-plugins/vdr-exec-0.0.3
+++ b/metadata/md5-cache/media-plugins/vdr-exec-0.0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-exec/vdr-exec-0.0.3.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=e7be1624275e12c5e7f5348e96491781
diff --git a/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4 b/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4
index 685f50f4cdf1..fe3ac199645a 100644
--- a/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4
+++ b/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1783/vdr-extrecmenu-1.2.4.tgz mirror://gentoo/dvdarchive-2.3-beta.sh.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=80fad907d5c2cfcd14b468e4ab6dc3c6
diff --git a/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4-r1 b/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4-r1
index 794fa4f514e4..2e4aa4c88d39 100644
--- a/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-extrecmenu.git/snapshot/vdr-plugin-extrecmenu-77d10faec3c7b0abe25ba3b161dc3b4e2cad042b.tar.gz -> vdr-extrecmenu-1.2.4-r1.tar.gz mirror://gentoo/dvdarchive-2.3-beta.sh.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=249d09504beab30186b7345f30dc7279
diff --git a/metadata/md5-cache/media-plugins/vdr-femon-2.0.4 b/metadata/md5-cache/media-plugins/vdr-femon-2.0.4
index 3e694b9af56a..692ba80e6b67 100644
--- a/metadata/md5-cache/media-plugins/vdr-femon-2.0.4
+++ b/metadata/md5-cache/media-plugins/vdr-femon-2.0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/vdr-femon-2.0.4.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=0391a4a7a3d5f401a95086212dc4d51d
diff --git a/metadata/md5-cache/media-plugins/vdr-femon-2.1.1 b/metadata/md5-cache/media-plugins/vdr-femon-2.1.1
index f7b07ef39738..104013c168b7 100644
--- a/metadata/md5-cache/media-plugins/vdr-femon-2.1.1
+++ b/metadata/md5-cache/media-plugins/vdr-femon-2.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.1.6 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/vdr-femon-2.1.1.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=fe9e057731e22bbb7cd8d28ee6355fa4
diff --git a/metadata/md5-cache/media-plugins/vdr-femon-2.2.0 b/metadata/md5-cache/media-plugins/vdr-femon-2.2.0
index 2a5bd6438c15..e8828d7e95c3 100644
--- a/metadata/md5-cache/media-plugins/vdr-femon-2.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-femon-2.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/vdr-femon-2.2.0.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=209e7a92984367c9c8f20a683126a26e
diff --git a/metadata/md5-cache/media-plugins/vdr-femon-2.2.1 b/metadata/md5-cache/media-plugins/vdr-femon-2.2.1
index 5f2088f91d6a..fc2a85ac8767 100644
--- a/metadata/md5-cache/media-plugins/vdr-femon-2.2.1
+++ b/metadata/md5-cache/media-plugins/vdr-femon-2.2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/vdr-femon-2.2.1.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=0dd40595b762c197d59d709f129f3f89
diff --git a/metadata/md5-cache/media-plugins/vdr-femon-2.4.0 b/metadata/md5-cache/media-plugins/vdr-femon-2.4.0
index af02012f1584..c924f8bd49b8 100644
--- a/metadata/md5-cache/media-plugins/vdr-femon-2.4.0
+++ b/metadata/md5-cache/media-plugins/vdr-femon-2.4.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-video/vdr-2.4.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/vdr-femon-2.4.0.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=ef5c2e583df63feca95f3ad6d133ca89
diff --git a/metadata/md5-cache/media-plugins/vdr-ffnetdev-0.1.2 b/metadata/md5-cache/media-plugins/vdr-ffnetdev-0.1.2
index c777a1f3f99d..64d8aec8e5fb 100644
--- a/metadata/md5-cache/media-plugins/vdr-ffnetdev-0.1.2
+++ b/metadata/md5-cache/media-plugins/vdr-ffnetdev-0.1.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/837/vdr-ffnetdev-0.1.2.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=bbd0fc3f9138f4edaa0a339f9affaccc
diff --git a/metadata/md5-cache/media-plugins/vdr-filebrowser-0.2.1 b/metadata/md5-cache/media-plugins/vdr-filebrowser-0.2.1
index 4c42925cc56e..7981ebc9c7b8 100644
--- a/metadata/md5-cache/media-plugins/vdr-filebrowser-0.2.1
+++ b/metadata/md5-cache/media-plugins/vdr-filebrowser-0.2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.nasenbaeren.net/filebrowser/vdr-filebrowser-0.2.1.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=101b27b142877aa1cbd8cbca314169fd
diff --git a/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r3 b/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r3
index 0b8b98e3adc9..fb2dc90512b0 100644
--- a/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r3
+++ b/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-freecell/vdr-freecell-0.0.2.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=61940d4f16a8247bb2fa83517c2a2b76
diff --git a/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r4 b/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r4
index 8dde08733d0c..2b39dc1775ab 100644
--- a/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r4
+++ b/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-freecell/vdr-freecell-0.0.2.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=85914c956c84c74f6ca46be8fa29421a
diff --git a/metadata/md5-cache/media-plugins/vdr-fritzbox-1.5.3-r1 b/metadata/md5-cache/media-plugins/vdr-fritzbox-1.5.3-r1
index 98d5366e3324..f78c283143d8 100644
--- a/metadata/md5-cache/media-plugins/vdr-fritzbox-1.5.3-r1
+++ b/metadata/md5-cache/media-plugins/vdr-fritzbox-1.5.3-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libgcrypt:0 dev-libs/boost[threads] >=media-video/vdr-1.7.34 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/jowi24/vdr-fritz/releases/download/1.5.3/vdr-fritzbox-1.5.3.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=4cdd3e068dffa5e0ef8b3735cd3874af
diff --git a/metadata/md5-cache/media-plugins/vdr-graphlcd-1.0.1 b/metadata/md5-cache/media-plugins/vdr-graphlcd-1.0.1
index f013e219784b..2210acaf4fae 100644
--- a/metadata/md5-cache/media-plugins/vdr-graphlcd-1.0.1
+++ b/metadata/md5-cache/media-plugins/vdr-graphlcd-1.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-misc/graphlcd-base-1.0.1 media-fonts/corefonts media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-graphlcd.git/snapshot/vdr-plugin-graphlcd-1.0.1.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=c43b909c80a9786eb8f87f62d44ab9a3
diff --git a/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2 b/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2
index fce307573833..1f17dfb896cd 100644
--- a/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/freetype >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/2086/vdr-imonlcd-1.0.2.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=127b5d71196a3568494b7aa973f6b154
diff --git a/metadata/md5-cache/media-plugins/vdr-iptv-2.2.1-r1 b/metadata/md5-cache/media-plugins/vdr-iptv-2.2.1-r1
index bf5a66c89c1c..ab6609c57c74 100644
--- a/metadata/md5-cache/media-plugins/vdr-iptv-2.2.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-iptv-2.2.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.1.6 net-misc/curl >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/iptv/files/vdr-iptv-2.2.1.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=20224ed271d8566781ce4fddb83e068e
diff --git a/metadata/md5-cache/media-plugins/vdr-iptv-2.4.0 b/metadata/md5-cache/media-plugins/vdr-iptv-2.4.0
index 687e03609bd9..90e2f18c28f5 100644
--- a/metadata/md5-cache/media-plugins/vdr-iptv-2.4.0
+++ b/metadata/md5-cache/media-plugins/vdr-iptv-2.4.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-video/vdr-2.4.0 net-misc/curl >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/iptv/files/vdr-iptv-2.4.0.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=51616d8ad7fac7fcfb770f4944ecadd2
diff --git a/metadata/md5-cache/media-plugins/vdr-joystick-0.0.3 b/metadata/md5-cache/media-plugins/vdr-joystick-0.0.3
index 7e597d191bda..d368293e16d9 100644
--- a/metadata/md5-cache/media-plugins/vdr-joystick-0.0.3
+++ b/metadata/md5-cache/media-plugins/vdr-joystick-0.0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-joystick/vdr-joystick-0.0.3.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=5a785b4793ccfd4e8e989b4618b53a60
diff --git a/metadata/md5-cache/media-plugins/vdr-launcher-0.0.4 b/metadata/md5-cache/media-plugins/vdr-launcher-0.0.4
index 7d73bb680079..45a20e30f6f8 100644
--- a/metadata/md5-cache/media-plugins/vdr-launcher-0.0.4
+++ b/metadata/md5-cache/media-plugins/vdr-launcher-0.0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://winni.vdr-developer.org/launcher/downloads/vdr-launcher-0.0.4.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=5101afef103b2497293d0b292015d901
diff --git a/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9 b/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9
index a6ca77dd5aeb..4e0eca804b48 100644
--- a/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9
+++ b/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6 >=app-misc/lcdproc-0.4.3 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/932/vdr-lcdproc-0.0.10-jw9.tgz -> vdr-lcdproc-0.0.10.9.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=84b08e03f15c4aef814090b4807bc583
diff --git a/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9-r1 b/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9-r1
index 2e52ff2f9e65..3a4694106530 100644
--- a/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9-r1
+++ b/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/932/vdr-lcdproc-0.0.10-jw9.tgz -> vdr-lcdproc-0.0.10.9.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=1dc0729a56f74523f679e8fe554f660d
diff --git a/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r1 b/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r1
index 2fc6a5372caf..f7fdfea536ab 100644
--- a/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r1
+++ b/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 RSA
 RDEPEND=media-video/vdr >=dev-libs/tntnet-2.2.1[ssl=] >=dev-libs/cxxtools-2.2.1 pcre? ( >=dev-libs/libpcre-8.12[cxx] ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-live-0.3.0_p20130504.tar.bz2 https://dev.gentoo.org/~hd_brummy/distfiles/vdr-live-0.3.0_p20130504.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=8f8b6c4a6b3b9af93d23ee5c6113eba4
diff --git a/metadata/md5-cache/media-plugins/vdr-live-2.3.1 b/metadata/md5-cache/media-plugins/vdr-live-2.3.1
index a82210ab5f7f..f28ab914c65f 100644
--- a/metadata/md5-cache/media-plugins/vdr-live-2.3.1
+++ b/metadata/md5-cache/media-plugins/vdr-live-2.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 RSA
 RDEPEND=media-video/vdr >=dev-libs/tntnet-2.2.1[ssl=] >=dev-libs/cxxtools-2.2.1 pcre? ( >=dev-libs/libpcre-8.12[cxx] ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-live.git/snapshot/release_2-3-1.tar.bz2 -> vdr-live-2.3.1.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=b9406dfc13a6bc4eb940c362043477c6
diff --git a/metadata/md5-cache/media-plugins/vdr-loadepg-0.2.7 b/metadata/md5-cache/media-plugins/vdr-loadepg-0.2.7
index 50a3ff486d4f..fe3d4df9612f 100644
--- a/metadata/md5-cache/media-plugins/vdr-loadepg-0.2.7
+++ b/metadata/md5-cache/media-plugins/vdr-loadepg-0.2.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://lukkinosat.altervista.org/vdr-loadepg-0.2.7.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=e137549efc924879edd9d85bd91874b5
diff --git a/metadata/md5-cache/media-plugins/vdr-menuorg-0.5.1 b/metadata/md5-cache/media-plugins/vdr-menuorg-0.5.1
index 0f7e8a00d349..46d3b76995df 100644
--- a/metadata/md5-cache/media-plugins/vdr-menuorg-0.5.1
+++ b/metadata/md5-cache/media-plugins/vdr-menuorg-0.5.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0[menuorg] dev-cpp/libxmlpp:2.6 dev-cpp/glibmm >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1312/vdr-menuorg-0.5.1.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=cce9c2cf7095c8f421d889fdb97996ed
diff --git a/metadata/md5-cache/media-plugins/vdr-mlist-1.0.2 b/metadata/md5-cache/media-plugins/vdr-mlist-1.0.2
index d60c2b2739d8..55c214a6929d 100644
--- a/metadata/md5-cache/media-plugins/vdr-mlist-1.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-mlist-1.0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/jowi24/vdr-mlist/archive/1.0.2.tar.gz -> vdr-mlist-1.0.2.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=10f13e3882336f65f9da2b59123e52b2
diff --git a/metadata/md5-cache/media-plugins/vdr-mount-0.0.2 b/metadata/md5-cache/media-plugins/vdr-mount-0.0.2
index aad57d48f0b6..c9fd8a338e81 100644
--- a/metadata/md5-cache/media-plugins/vdr-mount-0.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-mount-0.0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-mount/vdr-mount-0.0.2.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=2cb269f7517ed63746e795a9cf1efaa0
diff --git a/metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre5-r2 b/metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre5-r2
index 89e8707beef8..78349167ae96 100644
--- a/metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre5-r2
+++ b/metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre5-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-mp3ng/vdr-mp3ng-0.9.13-MKIV-pre3.tar.gz mirror://gentoo/vdr-mp3ng-pictures-0.0.1.tar.gz mirror://gentoo/vdr-mp3ng-0.0.1_pre4-span-0.0.3.diff.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=c71103a1ce4d70263641e0707d2ecaba
diff --git a/metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre5-r3 b/metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre5-r3
index 50355cac5f3c..de35084932b1 100644
--- a/metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre5-r3
+++ b/metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre5-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-mp3ng/vdr-mp3ng-0.9.13-MKIV-pre3.tar.gz mirror://gentoo/vdr-mp3ng-pictures-0.0.1.tar.gz mirror://gentoo/vdr-mp3ng-0.0.1_pre4-span-0.0.3.diff.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=2df6e36567bff2351bf35edcb4ac0bcd
diff --git a/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.2 b/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.2
index 3ae3e0cfb464..fe8038850011 100644
--- a/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.2
+++ b/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.2 || ( media-video/mplay-sh >=media-video/mplayer-sh-0.8.6-r1 ) virtual/eject >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.muempf.de/down/vdr-mp3-0.10.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=d7e0f9e0648ea510ed9974d373e71184
diff --git a/metadata/md5-cache/media-plugins/vdr-newsticker-0.0.4 b/metadata/md5-cache/media-plugins/vdr-newsticker-0.0.4
index 208084f3aa79..6d36d1d74118 100644
--- a/metadata/md5-cache/media-plugins/vdr-newsticker-0.0.4
+++ b/metadata/md5-cache/media-plugins/vdr-newsticker-0.0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-newsticker/vdr-newsticker-0.0.4.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=24ce89394cbf3fe9bdb2206104dd0cf6
diff --git a/metadata/md5-cache/media-plugins/vdr-noepg-0.0.4 b/metadata/md5-cache/media-plugins/vdr-noepg-0.0.4
index f3fb4796fe4c..fff85a3cbebc 100644
--- a/metadata/md5-cache/media-plugins/vdr-noepg-0.0.4
+++ b/metadata/md5-cache/media-plugins/vdr-noepg-0.0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/flensrocker/vdr-plugin-noepg/archive/v0.0.4.tar.gz -> vdr-noepg-0.0.4.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=54e9303daec358a8d0ad12fc5ad9e5f4
diff --git a/metadata/md5-cache/media-plugins/vdr-noepg-0.0.5 b/metadata/md5-cache/media-plugins/vdr-noepg-0.0.5
index 4df7fcdf2594..9c6ec2ca98d7 100644
--- a/metadata/md5-cache/media-plugins/vdr-noepg-0.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-noepg-0.0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/flensrocker/vdr-plugin-noepg/archive/v0.0.5.tar.gz -> vdr-noepg-0.0.5.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=c7e6090a00034475769d8879da32bf37
diff --git a/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.2 b/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.2
index 86f657a52dc8..ed27abdc778b 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.2
+++ b/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.udo-richter.de/vdr/files/vdr-osdserver-0.1.2.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=1a00ffc8ca56ebc1a5ae96498f7bcba4
diff --git a/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.3 b/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.3
index 3456a4b93171..89a25fc5cd16 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.3
+++ b/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.udo-richter.de/vdr/files/vdr-osdserver-0.1.3.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=a36e171feaa0efd3ba49d599d3e98897
diff --git a/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.4-r1 b/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.4-r1
index c4b750f35f7a..445f36598a9a 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.4-r1
+++ b/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.39 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1282/vdr-osdteletext-0.9.4.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=06197b2cb509a1b22dd1d1d6d07eca3e
diff --git a/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.5 b/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.5
index af2734a3330f..2ffa1be41f5e 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.5
+++ b/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.39 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1881/vdr-osdteletext-0.9.5.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=c895b1964f6e48a15596a21a6df6195f
diff --git a/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.7 b/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.7
index 1ed383a409f9..22fd983151e9 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.7
+++ b/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ public-domain
 RDEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/attachments/download/2161/vdr-osdteletext-0.9.7.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=1b3d375d0be71ef5b460068255ba50b7
diff --git a/metadata/md5-cache/media-plugins/vdr-peer-0.0.1 b/metadata/md5-cache/media-plugins/vdr-peer-0.0.1
index cdb390aca56b..4377aa45a32c 100644
--- a/metadata/md5-cache/media-plugins/vdr-peer-0.0.1
+++ b/metadata/md5-cache/media-plugins/vdr-peer-0.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/peer/vdr-peer-0.0.1.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=981a325c664bb04527f2a4ef38eb604b
diff --git a/metadata/md5-cache/media-plugins/vdr-permashift-1.0.1-r1 b/metadata/md5-cache/media-plugins/vdr-permashift-1.0.1-r1
index bffe4843fb88..6c84a232d02a 100644
--- a/metadata/md5-cache/media-plugins/vdr-permashift-1.0.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-permashift-1.0.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=~media-video/vdr-2.2.0[permashift] >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://ein-eike.de/wordpress/wp-content/uploads/2014/11/vdr-permashift-1.0.1.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=1a5477e6ea526768d7f6c402a9483191
diff --git a/metadata/md5-cache/media-plugins/vdr-permashift-1.0.4_pre20200301 b/metadata/md5-cache/media-plugins/vdr-permashift-1.0.4_pre20200301
index 7f78c8aba1f2..e984823d2e2a 100644
--- a/metadata/md5-cache/media-plugins/vdr-permashift-1.0.4_pre20200301
+++ b/metadata/md5-cache/media-plugins/vdr-permashift-1.0.4_pre20200301
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=|| ( ~media-video/vdr-2.2.0[permashift] >=media-video/vdr-2.4.1-r3[permashift] ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/eikesauer/Permashift/archive/f3541d7c0e3e201daf06a49304db0a0d7d5f8dd1.tar.gz -> vdr-permashift-1.0.4_pre20200301.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=f5081546453d0db7f454ef2bb20cdabf
diff --git a/metadata/md5-cache/media-plugins/vdr-pilot-0.0.9-r1 b/metadata/md5-cache/media-plugins/vdr-pilot-0.0.9-r1
index e67337bbd742..202929739fe9 100644
--- a/metadata/md5-cache/media-plugins/vdr-pilot-0.0.9-r1
+++ b/metadata/md5-cache/media-plugins/vdr-pilot-0.0.9-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://famillejacques.free.fr/vdr/pilot/vdr-pilot-0.0.9.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=7040d7ce352480fc094ab8c5c17bb52b
diff --git a/metadata/md5-cache/media-plugins/vdr-pin-0.1.14 b/metadata/md5-cache/media-plugins/vdr-pin-0.1.14
index b8df7ca2dff9..286198dd858e 100644
--- a/metadata/md5-cache/media-plugins/vdr-pin-0.1.14
+++ b/metadata/md5-cache/media-plugins/vdr-pin-0.1.14
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.2-r1[pinplugin] >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1379/vdr-pin-0.1.14.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=825ac4fa81444d69991f628fe108f1fe
diff --git a/metadata/md5-cache/media-plugins/vdr-powermate-0.0.5 b/metadata/md5-cache/media-plugins/vdr-powermate-0.0.5
index 055965f4da6c..96d1de2ad28e 100644
--- a/metadata/md5-cache/media-plugins/vdr-powermate-0.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-powermate-0.0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-powermate/vdr-powermate-0.0.5.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=c8747200383bbccf81dd8e4b2d4ec787
diff --git a/metadata/md5-cache/media-plugins/vdr-proxy-0.1.4-r1 b/metadata/md5-cache/media-plugins/vdr-proxy-0.1.4-r1
index 269aa3162a09..c993e7404f81 100644
--- a/metadata/md5-cache/media-plugins/vdr-proxy-0.1.4-r1
+++ b/metadata/md5-cache/media-plugins/vdr-proxy-0.1.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-proxy/vdr-proxy-0.1.4.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=e39e5b0c1ad1369af50e4b602cd13ab9
diff --git a/metadata/md5-cache/media-plugins/vdr-pvr350-1.7.5 b/metadata/md5-cache/media-plugins/vdr-pvr350-1.7.5
index 1a7bacc168ec..26fef61dd435 100644
--- a/metadata/md5-cache/media-plugins/vdr-pvr350-1.7.5
+++ b/metadata/md5-cache/media-plugins/vdr-pvr350-1.7.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2 media-sound/mpg123 media-sound/twolame media-libs/a52dec >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1657/vdr-pvr350-1.7.5.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=34b7dd2c8af4e90909a4f3e7633ec5a5
diff --git a/metadata/md5-cache/media-plugins/vdr-quicktimer-0.1.1 b/metadata/md5-cache/media-plugins/vdr-quicktimer-0.1.1
index 6d3da6795a2b..600a04dad1f5 100644
--- a/metadata/md5-cache/media-plugins/vdr-quicktimer-0.1.1
+++ b/metadata/md5-cache/media-plugins/vdr-quicktimer-0.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-quicktimer-0.1.1.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=dbf567be745e30d49835701c49572ee2
diff --git a/metadata/md5-cache/media-plugins/vdr-radio-0.9.1 b/metadata/md5-cache/media-plugins/vdr-radio-0.9.1
index 716ee3a2c43c..e6be8d52bc78 100644
--- a/metadata/md5-cache/media-plugins/vdr-radio-0.9.1
+++ b/metadata/md5-cache/media-plugins/vdr-radio-0.9.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.egal-vdr.de/plugins/vdr-radio-0.9.1.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=970102551be020ec37bc5076d99a172f
diff --git a/metadata/md5-cache/media-plugins/vdr-radio-1.1.0 b/metadata/md5-cache/media-plugins/vdr-radio-1.1.0
index bfd8d2fe26b1..8bee448d209e 100644
--- a/metadata/md5-cache/media-plugins/vdr-radio-1.1.0
+++ b/metadata/md5-cache/media-plugins/vdr-radio-1.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-radio.git/snapshot/vdr-plugin-radio-1.1.0.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=30b8ab5e53be5b7c3a6fb0aaec180159
diff --git a/metadata/md5-cache/media-plugins/vdr-radiolist-0.0.2 b/metadata/md5-cache/media-plugins/vdr-radiolist-0.0.2
index 28eaa1875ff0..16c70b4af27a 100644
--- a/metadata/md5-cache/media-plugins/vdr-radiolist-0.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-radiolist-0.0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-radiolist/vdr-radiolist-0.0.2.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=7b7dd0d1b1d2d259230c25cef696b5c8
diff --git a/metadata/md5-cache/media-plugins/vdr-rcu-2.2.0 b/metadata/md5-cache/media-plugins/vdr-rcu-2.2.0
index ae3f6cda6a84..3e60ca4c8482 100644
--- a/metadata/md5-cache/media-plugins/vdr-rcu-2.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-rcu-2.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-rcu-2.2.0.tar.gz https://dev.gentoo.org/~hd_brummy/distfiles/vdr-rcu-2.2.0.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=7b579ecc7b0a56a02ea744e6f199082e
diff --git a/metadata/md5-cache/media-plugins/vdr-recsearch-0.3.7 b/metadata/md5-cache/media-plugins/vdr-recsearch-0.3.7
index 76c56ab700ba..03d287bcaf53 100644
--- a/metadata/md5-cache/media-plugins/vdr-recsearch-0.3.7
+++ b/metadata/md5-cache/media-plugins/vdr-recsearch-0.3.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/flensrocker/vdr-plugin-recsearch/releases/download/v0.3.7/vdr-recsearch-0.3.7.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=46d96959df6abdd5f0cc3d73431af11e
diff --git a/metadata/md5-cache/media-plugins/vdr-remote-0.6.0-r1 b/metadata/md5-cache/media-plugins/vdr-remote-0.6.0-r1
index 701109ef7faa..e60cd00f7d04 100644
--- a/metadata/md5-cache/media-plugins/vdr-remote-0.6.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-remote-0.6.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.escape-edv.de/endriss/vdr/vdr-remote-0.6.0.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=1f4bebc960c01c9cb13ffd9e04646392
diff --git a/metadata/md5-cache/media-plugins/vdr-remote-0.7.0 b/metadata/md5-cache/media-plugins/vdr-remote-0.7.0
index b5b510056045..b727b8371098 100644
--- a/metadata/md5-cache/media-plugins/vdr-remote-0.7.0
+++ b/metadata/md5-cache/media-plugins/vdr-remote-0.7.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.escape-edv.de/endriss/vdr/vdr-remote-0.7.0.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=a1e01b47e15b102ea443f31719931fa1
diff --git a/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0 b/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0
index c8dec02b8d4a..318975de5c4c 100644
--- a/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0
+++ b/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/remoteosd/vdr-remoteosd-1.0.0.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=6ecb843ebab4af603a7b4b53fbd2ab12
diff --git a/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0-r1 b/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0-r1
index 88155b9d4abc..de387a55c191 100644
--- a/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/remoteosd/vdr-remoteosd-1.0.0.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=685403cc1f9d801f1b2bd6c465bc2de1
diff --git a/metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2 b/metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2
index 7addfd4004fb..084aa4573b62 100644
--- a/metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/remotetimers/vdr-remotetimers-1.0.2.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=a1742d4a653abdfa4a67188a662272fa
diff --git a/metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2-r1 b/metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2-r1
index a9e8b9d012e6..790211c6706d 100644
--- a/metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2-r1
+++ b/metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/remotetimers/vdr-remotetimers-1.0.2.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=0b98c1c6a2e6628e3559c65ab4fed0dd
diff --git a/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.3 b/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.3
index 64a0b053bbd6..456b4bdef634 100644
--- a/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.3
+++ b/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/2045/vdr-rpihddevice-1.0.3.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=46756c65adeb548199a6eb861597d639
diff --git a/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.5 b/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.5
index 751376137814..e626c3887e67 100644
--- a/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/2193/vdr-rpihddevice-1.0.5.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=b613abedfc81cf7316c95be5b8e712f0
diff --git a/metadata/md5-cache/media-plugins/vdr-rssreader-2.0.0 b/metadata/md5-cache/media-plugins/vdr-rssreader-2.0.0
index 8f04122981c1..5590a6893eba 100644
--- a/metadata/md5-cache/media-plugins/vdr-rssreader-2.0.0
+++ b/metadata/md5-cache/media-plugins/vdr-rssreader-2.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/files/vdr-rssreader-2.0.0.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=b089105b16b23d274e0f949cbacc0184
diff --git a/metadata/md5-cache/media-plugins/vdr-rssreader-2.0.1 b/metadata/md5-cache/media-plugins/vdr-rssreader-2.0.1
index 9bd52b0a3c91..9013d587e098 100644
--- a/metadata/md5-cache/media-plugins/vdr-rssreader-2.0.1
+++ b/metadata/md5-cache/media-plugins/vdr-rssreader-2.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/files/vdr-rssreader-2.0.1.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=8caa2808970f823b9d88d60754ee9cd1
diff --git a/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.0 b/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.0
index 5e14b326dfa8..81f9aec3e0dc 100644
--- a/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.2.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/files/vdr-rssreader-2.2.0.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=5c072f5eef43ebf28e3892aab4fa97bd
diff --git a/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1 b/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1
index c5482a1d3aca..2b0d67561957 100644
--- a/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1
+++ b/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.2.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/files/vdr-rssreader-2.2.1.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=5c072f5eef43ebf28e3892aab4fa97bd
diff --git a/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1-r1 b/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1-r1
index be0356321143..3cd99eeeb856 100644
--- a/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.2.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/files/vdr-rssreader-2.2.1.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=a0c81d93b7f3eb659fb687aa8c353fcf
diff --git a/metadata/md5-cache/media-plugins/vdr-satip-2.2.3-r2 b/metadata/md5-cache/media-plugins/vdr-satip-2.2.3-r2
index cf44809f3714..01274caa110b 100644
--- a/metadata/md5-cache/media-plugins/vdr-satip-2.2.3-r2
+++ b/metadata/md5-cache/media-plugins/vdr-satip-2.2.3-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.2.0 >=net-misc/curl-7.36 || ( dev-libs/tinyxml dev-libs/pugixml ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/satip/files/vdr-satip-2.2.3.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=17fa586ddd75f265fb01bc8d1232731d
diff --git a/metadata/md5-cache/media-plugins/vdr-satip-2.2.5 b/metadata/md5-cache/media-plugins/vdr-satip-2.2.5
index 0f06849888fb..14328d91a89a 100644
--- a/metadata/md5-cache/media-plugins/vdr-satip-2.2.5
+++ b/metadata/md5-cache/media-plugins/vdr-satip-2.2.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.2.0 >=net-misc/curl-7.36 || ( dev-libs/tinyxml dev-libs/pugixml ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/satip/files/vdr-satip-2.2.5.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=86dd2445e1e9d66d7b19176d97ba4907
diff --git a/metadata/md5-cache/media-plugins/vdr-satip-2.4.0_p20191027 b/metadata/md5-cache/media-plugins/vdr-satip-2.4.0_p20191027
index c51abf1d2fdf..189401189a9d 100644
--- a/metadata/md5-cache/media-plugins/vdr-satip-2.4.0_p20191027
+++ b/metadata/md5-cache/media-plugins/vdr-satip-2.4.0_p20191027
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.4.0 >=net-misc/curl-7.36 || ( dev-libs/pugixml dev-libs/tinyxml ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/rofafor/vdr-plugin-satip/archive/19e3057f34d9c097c8c6bad30188b14d80b7a242.tar.gz -> vdr-satip-2.4.0_p20191027.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=6e1e27408ff3fe765391963bd787a113
diff --git a/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.3 b/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.3
index 613e53125588..80fec0ce5985 100644
--- a/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.3
+++ b/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://winni.vdr-developer.org/scheduler/downloads/vdr-scheduler-0.1.3.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=550e7c47a800e0aca1a28ff157368f57
diff --git a/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.6 b/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.6
index 0705be609d6f..dbc660242410 100644
--- a/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.6
+++ b/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://winni.vdr-developer.org/scheduler/downloads/vdr-scheduler-0.1.6.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=95cd000862b37b6c2fa0c48a49f759b4
diff --git a/metadata/md5-cache/media-plugins/vdr-screenshot-0.0.15 b/metadata/md5-cache/media-plugins/vdr-screenshot-0.0.15
index f31d9f547a22..0366614940ae 100644
--- a/metadata/md5-cache/media-plugins/vdr-screenshot-0.0.15
+++ b/metadata/md5-cache/media-plugins/vdr-screenshot-0.0.15
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/jowi24/vdr-screenshot/archive/0.0.15.tar.gz -> vdr-screenshot-0.0.15.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=fc2b01283de4950c3d15214c46119126
diff --git a/metadata/md5-cache/media-plugins/vdr-serial-0.0.6a-r1 b/metadata/md5-cache/media-plugins/vdr-serial-0.0.6a-r1
index 03667fc9b538..0dad446f9621 100644
--- a/metadata/md5-cache/media-plugins/vdr-serial-0.0.6a-r1
+++ b/metadata/md5-cache/media-plugins/vdr-serial-0.0.6a-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.lf-klueber.de/vdr-serial-0.0.6a.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=d599ef5d713936af752b472819e5f035
diff --git a/metadata/md5-cache/media-plugins/vdr-skincurses-2.2.0 b/metadata/md5-cache/media-plugins/vdr-skincurses-2.2.0
index 932488415702..1a6cabb976f9 100644
--- a/metadata/md5-cache/media-plugins/vdr-skincurses-2.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-skincurses-2.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-skincurses-2.2.0.tar.gz https://dev.gentoo.org/~hd_brummy/distfiles/vdr-skincurses-2.2.0.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=5619cb19cb2eb9df3b02bb91067c05cc
diff --git a/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r1 b/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r1
index 479ac4bca35a..be8a94634412 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/skinelchi/vdr-skinelchi-0.3.0.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=934f9d106676d70dd913da91ffb1a3d9
diff --git a/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r2 b/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r2
index ef1b3347e0f5..243eedee6527 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r2
+++ b/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/skinelchi/vdr-skinelchi-0.3.0.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
-_md5_=9b6412c90388fdbcc0bcb1419e70c22d
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_md5_=874e907af68b311802ba93e5c0d7b5a0
diff --git a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.0 b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.0
index 29ff3f4c90fd..0220217a3b76 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.0
+++ b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 x11-themes/vdr-channel-logos >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/files/vdr-skinsoppalusikka-2.0.0.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=4d5899362162c490c3f983524adafd9f
diff --git a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.3 b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.3
index dc413a5af266..1131d2d6b80b 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.3
+++ b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 x11-themes/vdr-channel-logos >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/files/vdr-skinsoppalusikka-2.0.3.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=489da1878f4418af51880565902f6609
diff --git a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.2.0 b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.2.0
index db8e66b2ac32..3365eeadd769 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.2.0 x11-themes/vdr-channel-logos >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/files/vdr-skinsoppalusikka-2.2.0.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=165d8cc21c444501cac9d1a9c3b1e97c
diff --git a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.2.1 b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.2.1
index 9fcd764b9400..ae0140a3ad11 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.2.1
+++ b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.2.0 x11-themes/vdr-channel-logos >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/files/vdr-skinsoppalusikka-2.2.1.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=165d8cc21c444501cac9d1a9c3b1e97c
diff --git a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.4.0 b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.4.0
index 53fee102dcf5..b135d93453e4 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.4.0
+++ b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.4.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-video/vdr-2.4.0 x11-themes/vdr-channel-logos >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/files/vdr-skinsoppalusikka-2.4.0.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=1d4a0ad513dbb4de7209b9a9a456c358
diff --git a/metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6 b/metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6
index 7b079788a5c8..e3afd6ea3b1a 100644
--- a/metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6
+++ b/metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://linvdr.org/download/vdr-sleeptimer/sleeptimer-0.6.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=993d2e65d97fcaa636bf783482528fff
diff --git a/metadata/md5-cache/media-plugins/vdr-sndctl-0.1.5.1 b/metadata/md5-cache/media-plugins/vdr-sndctl-0.1.5.1
index 55a2bc4c70d0..ccb77bea0768 100644
--- a/metadata/md5-cache/media-plugins/vdr-sndctl-0.1.5.1
+++ b/metadata/md5-cache/media-plugins/vdr-sndctl-0.1.5.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.1 media-libs/alsa-lib >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-sndctl/vdr-sndctl-0.1.5.1.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=55c3ac7c4ee9265f5cbba150953967df
diff --git a/metadata/md5-cache/media-plugins/vdr-solitaire-0.0.3 b/metadata/md5-cache/media-plugins/vdr-solitaire-0.0.3
index 14093137f1c3..ca30c17d7468 100644
--- a/metadata/md5-cache/media-plugins/vdr-solitaire-0.0.3
+++ b/metadata/md5-cache/media-plugins/vdr-solitaire-0.0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://web.archive.org/web/20150928211126/http://www.djdagobert.com/vdr/solitaire/vdr-solitaire-0.0.3.tbz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=dc07ffbd9d945180def7427aa33dda8e
diff --git a/metadata/md5-cache/media-plugins/vdr-span-0.0.7 b/metadata/md5-cache/media-plugins/vdr-span-0.0.7
index 60a7597279b0..659d6e2d8633 100644
--- a/metadata/md5-cache/media-plugins/vdr-span-0.0.7
+++ b/metadata/md5-cache/media-plugins/vdr-span-0.0.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.7 >=sci-libs/fftw-3.0.1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://lcr.vdr-developer.org/downloads/vdr-span-0.0.7.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=c384c44b1a6671a0a6c8c920be18f49c
diff --git a/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1 b/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1
index 1d42a55b8b33..3fbcf39093d6 100644
--- a/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1
+++ b/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/vdr-1.7.25 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-esele
 REQUIRED_USE=|| ( client server )
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1580/vdr-streamdev-0.6.1.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=c660bc195bc4fcabe86923b44240396b
diff --git a/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20160320 b/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20160320
index e047c4a9823b..2a50c3e989e8 100644
--- a/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20160320
+++ b/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20160320
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/vdr-1.7.25 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-esele
 REQUIRED_USE=|| ( client server )
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git/snapshot/vdr-plugin-streamdev-674bb5b331240de3ba2a8beb63a1276003e64e3e.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=000f2f826ed51c439aedee8ca7b4ff1e
diff --git a/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20170930 b/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20170930
index e598f32a8878..a00f1f6c5c62 100644
--- a/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20170930
+++ b/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20170930
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/vdr-2.3 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/
 REQUIRED_USE=|| ( client server )
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git/snapshot/vdr-plugin-streamdev-e2a9b979d3fb92967c7a6a8221e674eb7e55c813.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=b2f4e6a7829ea0c2b01e066e075b3758
diff --git a/metadata/md5-cache/media-plugins/vdr-suspendoutput-2.0.1 b/metadata/md5-cache/media-plugins/vdr-suspendoutput-2.0.1
index ea6bbf821b4a..392d12627e31 100644
--- a/metadata/md5-cache/media-plugins/vdr-suspendoutput-2.0.1
+++ b/metadata/md5-cache/media-plugins/vdr-suspendoutput-2.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://phivdr.dyndns.org/vdr/vdr-suspendoutput/vdr-suspendoutput-2.0.1.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=d0a76258d68d6e92759d6ab23c921c6a
diff --git a/metadata/md5-cache/media-plugins/vdr-svdrposd-1.0.0 b/metadata/md5-cache/media-plugins/vdr-svdrposd-1.0.0
index 25275d52e46a..4da958eaec0b 100644
--- a/metadata/md5-cache/media-plugins/vdr-svdrposd-1.0.0
+++ b/metadata/md5-cache/media-plugins/vdr-svdrposd-1.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/svdrpext/vdr-svdrposd-1.0.0.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=de14083fe23eb7fa879f850a0fb815af
diff --git a/metadata/md5-cache/media-plugins/vdr-svdrpservice-1.0.0 b/metadata/md5-cache/media-plugins/vdr-svdrpservice-1.0.0
index 6ce0fd10b6ec..70137a4d00e8 100644
--- a/metadata/md5-cache/media-plugins/vdr-svdrpservice-1.0.0
+++ b/metadata/md5-cache/media-plugins/vdr-svdrpservice-1.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/svdrpservice/vdr-svdrpservice-1.0.0.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=470c1b7e02b8fb15189d447035842db3
diff --git a/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.1 b/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.1
index b353a4ea3618..dac40f91c351 100644
--- a/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.1
+++ b/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/lm-sensors app-admin/hddtemp >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/systeminfo/vdr-systeminfo-0.1.1.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=e8c8b49fccfdfe0fad20db3c6e160d1f
diff --git a/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.3 b/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.3
index 748bd594ae5c..8d28e6c0a9b5 100644
--- a/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.3
+++ b/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/lm-sensors app-admin/hddtemp >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/systeminfo/vdr-systeminfo-0.1.3.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=34e6f37109139b7a910a2aa24f2ec180
diff --git a/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.4 b/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.4
index 343d22c51842..8d8831ed5875 100644
--- a/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.4
+++ b/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/lm-sensors app-admin/hddtemp >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/systeminfo/vdr-systeminfo-0.1.4.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=8e703c7eaf59a5005ae19e42939ce8f7
diff --git a/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0 b/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0
index a4dc66f59d9e..4ce9f2996ecf 100644
--- a/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0
+++ b/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-video/vdr-1.7.38[ttxtsubs] >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1281/vdr-ttxtsubs-0.3.0.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=130af98d96a141f59eb87782afffb20c
diff --git a/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0-r2 b/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0-r2
index 6d66d95bcb96..b87cdaacb8f0 100644
--- a/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0-r2
+++ b/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=media-video/vdr[ttxtsubs] >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1281/vdr-ttxtsubs-0.3.0.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=225ca271e18f6f3e7fe63708b9c3aa9a
diff --git a/metadata/md5-cache/media-plugins/vdr-undelete-0.0.7 b/metadata/md5-cache/media-plugins/vdr-undelete-0.0.7
index f31779ee717f..52b0b83b14ca 100644
--- a/metadata/md5-cache/media-plugins/vdr-undelete-0.0.7
+++ b/metadata/md5-cache/media-plugins/vdr-undelete-0.0.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1060/vdr-undelete-0.0.7.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=ea2479542b1bbce9bd1d4c582f80e665
diff --git a/metadata/md5-cache/media-plugins/vdr-undelete-0.0.7-r1 b/metadata/md5-cache/media-plugins/vdr-undelete-0.0.7-r1
index 125d06fdf5fc..6a8104c850ea 100644
--- a/metadata/md5-cache/media-plugins/vdr-undelete-0.0.7-r1
+++ b/metadata/md5-cache/media-plugins/vdr-undelete-0.0.7-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1060/vdr-undelete-0.0.7.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=861f7aec85e45d052e2d42af388bbdd1
diff --git a/metadata/md5-cache/media-plugins/vdr-undelete-2.3.0_pre1 b/metadata/md5-cache/media-plugins/vdr-undelete-2.3.0_pre1
index c50c404cee9c..bc4fbd1502ce 100644
--- a/metadata/md5-cache/media-plugins/vdr-undelete-2.3.0_pre1
+++ b/metadata/md5-cache/media-plugins/vdr-undelete-2.3.0_pre1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://phivdr.dyndns.org/vdr/vdr-undelete/vdr-undelete-2.3.1-pre1.tgz -> vdr-undelete-2.3.0_pre1.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=8ecc6d1a6f113c4ff2f85218b9b03eae
diff --git a/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r3 b/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r3
index 43726f5528d1..e84f962afa58 100644
--- a/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r3
+++ b/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.9 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-vcd/vdr-vcd-0.9.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=b8aa6c7a7a03008104bf10adc7591760
diff --git a/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r4 b/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r4
index 5b79aa09e3d5..79e93a75ecba 100644
--- a/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r4
+++ b/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.9 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-vcd/vdr-vcd-0.9.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=3b44aba257c3df277951221da5c8dc2b
diff --git a/metadata/md5-cache/media-plugins/vdr-vdrmanager-0.14 b/metadata/md5-cache/media-plugins/vdr-vdrmanager-0.14
index f209218bf104..04443a0abac1 100644
--- a/metadata/md5-cache/media-plugins/vdr-vdrmanager-0.14
+++ b/metadata/md5-cache/media-plugins/vdr-vdrmanager-0.14
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=stream? ( media-plugins/vdr-streamdev[server] ) zlib? ( sys-libs/zlib ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1971/vdr-vdrmanager-0.14.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=13570a47f3bec4db5f03df2ef6dc870e
diff --git a/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1 b/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1
index da44fbdc634b..952c4bb398a1 100644
--- a/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1
+++ b/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.36-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.loggytronic.com/dl/vdr-vompserver-0.4.1.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=25feac9640e4e9f7ac12714d18246ca6
diff --git a/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1-r1 b/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1-r1
index 481de2c2d9ba..2ca62bbe830f 100644
--- a/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.36-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.loggytronic.com/dl/vdr-vompserver-0.4.1.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=f5c1c82cb2f04ab25955b2a6de3b6a61
diff --git a/metadata/md5-cache/media-plugins/vdr-vompserver-0.5.1 b/metadata/md5-cache/media-plugins/vdr-vompserver-0.5.1
index 6fb1abf93f0b..e42af2478443 100644
--- a/metadata/md5-cache/media-plugins/vdr-vompserver-0.5.1
+++ b/metadata/md5-cache/media-plugins/vdr-vompserver-0.5.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.loggytronic.com/dl/vdr-vompserver-0.5.1.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=7d3f1f67b154a163d09539315db506ea
diff --git a/metadata/md5-cache/media-plugins/vdr-weatherng-0.0.8_pre3-r1 b/metadata/md5-cache/media-plugins/vdr-weatherng-0.0.8_pre3-r1
index c3b41cecec38..0dc7d7d5d3d4 100644
--- a/metadata/md5-cache/media-plugins/vdr-weatherng-0.0.8_pre3-r1
+++ b/metadata/md5-cache/media-plugins/vdr-weatherng-0.0.8_pre3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 stardock-images
 RDEPEND=media-libs/imlib2[jpeg,gif] >=media-video/vdr-1.3.34 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-weatherng/vdr-weatherng-0.0.8-pre3.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=dfcaec1b0b2e3bd9ff5a9d4e8872417c
diff --git a/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.7-r1 b/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.7-r1
index bd2dada9553c..757af1f8e58f 100644
--- a/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.7-r1
+++ b/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.7-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://wirbel.htpc-forum.de/wirbelscan/vdr-wirbelscan-0.0.7.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=0f1728497d2689b70cb66651897b64c2
diff --git a/metadata/md5-cache/media-plugins/vdr-wirbelscan-2018.11.04-r1 b/metadata/md5-cache/media-plugins/vdr-wirbelscan-2018.11.04-r1
index 4827943807ca..98b1751e77ed 100644
--- a/metadata/md5-cache/media-plugins/vdr-wirbelscan-2018.11.04-r1
+++ b/metadata/md5-cache/media-plugins/vdr-wirbelscan-2018.11.04-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/CvH/vdr-plugin-wirbelscan/archive/e1377b95312a138a41f93d7b06b3adb4ed4e7324.tar.gz -> vdr-wirbelscan-2018.11.04.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=d115850927fa4b47d92b91d816ca1bc4
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.1.0-r1 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.1.0-r1
index bbedf00e3659..2af27b497277 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.1.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=vdr? ( media-video/vdr libextractor? ( >=media-libs/libextractor-0.5.20
 REQUIRED_USE=|| ( vdr xine )
 SLOT=0
 SRC_URI=mirror://sourceforge/xineliboutput/vdr-xineliboutput-2.1.0.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
-_md5_=cf84c25ee0a542c1d6a9a75ac5edbe10
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_md5_=cdb73fc0d25b98990c4e635b2c8eafbc
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.1.0-r2 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.1.0-r2
index 3b2638b1404e..5c88aafdb0e3 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.1.0-r2
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=vdr? ( media-video/vdr libextractor? ( >=media-libs/libextractor-0.5.20
 REQUIRED_USE=|| ( vdr xine )
 SLOT=0
 SRC_URI=mirror://sourceforge/xineliboutput/vdr-xineliboutput-2.1.0.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
-_md5_=34fc7a1481d83edc1a081116ca27c17c
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_md5_=c9ea5f488f141c368a44abc9c01ca62f
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r1 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r1
index a8338c09f62b..c0b40e043a82 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=vdr? ( media-video/vdr libextractor? ( >=media-libs/libextractor-0.5.20
 REQUIRED_USE=|| ( vdr xine )
 SLOT=0
 SRC_URI=mirror://sourceforge/xineliboutput/vdr-xineliboutput-2.2.0.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
-_md5_=3d8fb39c384f4aa653e0874be36d3ed1
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_md5_=1cc47cf7dcc70063a1fac4cb7aedc922
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r2 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r2
index 03e803bf700a..0d447bc64a76 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r2
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r2
@@ -10,5 +10,5 @@ RDEPEND=vdr? ( media-video/vdr libextractor? ( >=media-libs/libextractor-0.5.20
 REQUIRED_USE=|| ( vdr xine )
 SLOT=0
 SRC_URI=mirror://sourceforge/xineliboutput/vdr-xineliboutput-2.2.0.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
-_md5_=6ec37061b70da53448ba412122dbe0fc
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_md5_=0719b31306648c3a577289101d66d939
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-9999 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-9999
index aff3640fc8e0..52a57f55f747 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-9999
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=vdr? ( >=media-video/vdr-1.6.0 libextractor? ( >=media-libs/libextractor-0.5.20 ) caps? ( sys-libs/libcap ) ) xine? ( ( >=media-libs/xine-lib-1.2 media-video/ffmpeg ) fbcon? ( jpeg? ( virtual/jpeg:* ) ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) dbus? ( dev-libs/dbus-glib dev-libs/glib:2 ) vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2 ) jpeg? ( virtual/jpeg:* ) bluray? ( media-libs/libbluray ) opengl? ( virtual/opengl ) ) ) cec? ( dev-libs/libcec ) vdr? ( >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2 )
 SLOT=0
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
-_md5_=2314465267625f72bda78100510b0602
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_md5_=a61962f6e46dfaa84a7189ce339d0ce3
diff --git a/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5 b/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5
index 5ad037351f55..2371ee7986db 100644
--- a/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.34 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1318/vdr-zappilot-0.0.5.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=3e7fb425f1507659c92adc9f87d0c4c2
diff --git a/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r1 b/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r1
index 49bd6411b313..486ddd195718 100644
--- a/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r1
+++ b/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.34 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1318/vdr-zappilot-0.0.5.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
 _md5_=0699e36abfc518a52e16428ffa160c66
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index 2086eb52d353..125015f98465 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/js8call-2.2.0 b/metadata/md5-cache/media-radio/js8call-2.2.0
new file mode 100644
index 000000000000..9990973415ee
--- /dev/null
+++ b/metadata/md5-cache/media-radio/js8call-2.2.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+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 )
+DESCRIPTION=Weak signal ham radio communication
+EAPI=7
+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.2.0-ga.tar.bz2 -> js8call-2.2.0.tar.bz2
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=faed15189f2b34d262927ba9aa504f51
diff --git a/metadata/md5-cache/media-radio/xwxapt-3.4.2 b/metadata/md5-cache/media-radio/xwxapt-3.4.2
index e787aa1257ba..0ccd698f2e83 100644
--- a/metadata/md5-cache/media-radio/xwxapt-3.4.2
+++ b/metadata/md5-cache/media-radio/xwxapt-3.4.2
@@ -3,11 +3,11 @@ DEFINED_PHASES=install postinst prepare
 DEPEND=dev-libs/glib:2 media-libs/alsa-lib net-wireless/rtl-sdr x11-libs/gtk+:3
 DESCRIPTION=GTK+ linux weather satellite APT image decoder software
 EAPI=7
-HOMEPAGE=http://www.qsl.net/5b4az/pages/apt.html
+HOMEPAGE=https://www.qsl.net/5b4az/pages/apt.html
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 media-libs/alsa-lib net-wireless/rtl-sdr x11-libs/gtk+:3
 SLOT=0
-SRC_URI=http://www.qsl.net/5b4az/pkg/apt/xwxapt/xwxapt-3.4.2.tar.bz2
+SRC_URI=https://www.qsl.net/5b4az/pkg/apt/xwxapt/xwxapt-3.4.2.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3b5fdda0febb2dca94dc18d64bbddbb7
+_md5_=ffe56947eecced7e1f9611f63c85da29
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 976e75e2c169..10cc63feb845 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/erec-2.2.0.1-r1 b/metadata/md5-cache/media-sound/erec-2.2.0.1-r1
index 2db68cd3eab9..66081b881a90 100644
--- a/metadata/md5-cache/media-sound/erec-2.2.0.1-r1
+++ b/metadata/md5-cache/media-sound/erec-2.2.0.1-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install prepare
+DEFINED_PHASES=configure install prepare
 DESCRIPTION=Shared audio recording server
 EAPI=7
 HOMEPAGE=https://bisqwit.iki.fi/source/erec.html
@@ -7,4 +7,4 @@ LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://bisqwit.iki.fi/src/arch/erec-2.2.0.1.tar.bz2
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=484f0d57513e6eaa825c351a9c4e82d6
+_md5_=f0079d1224d947eb3f56596ab8ff8a42
diff --git a/metadata/md5-cache/media-sound/ezstream-0.6.0-r1 b/metadata/md5-cache/media-sound/ezstream-0.6.0-r1
index 774623640c94..3e58c6c3b378 100644
--- a/metadata/md5-cache/media-sound/ezstream-0.6.0-r1
+++ b/metadata/md5-cache/media-sound/ezstream-0.6.0-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=configure install
 DEPEND=dev-libs/libxml2 >=media-libs/libshout-2.2 !taglib? ( media-libs/libvorbis ) taglib? ( media-libs/taglib ) virtual/pkgconfig
 DESCRIPTION=A command line source client for Icecast media streaming servers
 EAPI=6
-HOMEPAGE=http://www.icecast.org/ezstream/
+HOMEPAGE=https://www.icecast.org/ezstream/
 IUSE=taglib
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 >=media-libs/libshout-2.2 !taglib? ( media-libs/libvorbis ) taglib? ( media-libs/taglib ) net-misc/icecast
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/ezstream/ezstream-0.6.0.tar.gz
-_md5_=2e69945fe2f82dbc3419005c94f1c85f
+_md5_=78544b74d7a17b0e4d2de27a364a1d05
diff --git a/metadata/md5-cache/media-sound/flake-0.11 b/metadata/md5-cache/media-sound/flake-0.11
index 9311de72b362..2808183d93b4 100644
--- a/metadata/md5-cache/media-sound/flake-0.11
+++ b/metadata/md5-cache/media-sound/flake-0.11
@@ -7,4 +7,4 @@ LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/flake-enc/flake-0.11.tar.bz2
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bca6e0d0633d5a9e85dabcf7e8b6800b
+_md5_=b7880466143c445dd9fd965e1c0c164c
diff --git a/metadata/md5-cache/media-sound/fluidsynth-2.0.7 b/metadata/md5-cache/media-sound/fluidsynth-2.0.7
deleted file mode 100644
index 4eeacb43ab0b..000000000000
--- a/metadata/md5-cache/media-sound/fluidsynth-2.0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lash? ( media-sound/lash[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ladspa? ( media-libs/ladspa-cmt[abi_x86_32(-)?,abi_x86_64(-)?,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/ladspa-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( media-libs/portaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndfile? ( media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,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=Software real-time synthesizer based on the Soundfont 2 specifications
-EAPI=7
-HOMEPAGE=http://www.fluidsynth.org/
-IUSE=alsa dbus debug examples ipv6 jack ladspa lash oss portaudio pulseaudio +readline +sndfile 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
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lash? ( media-sound/lash[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ladspa? ( media-libs/ladspa-cmt[abi_x86_32(-)?,abi_x86_64(-)?,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/ladspa-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( media-libs/portaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndfile? ( media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,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/2
-SRC_URI=https://github.com/FluidSynth/fluidsynth/archive/v2.0.7.tar.gz -> fluidsynth-2.0.7.tar.gz
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1441fcfe86c21ab15bf8ae5a832fdd36
diff --git a/metadata/md5-cache/media-sound/fmdrv-1.0.7 b/metadata/md5-cache/media-sound/fmdrv-1.0.7
index 0c3e1ac356dc..017edd19340c 100644
--- a/metadata/md5-cache/media-sound/fmdrv-1.0.7
+++ b/metadata/md5-cache/media-sound/fmdrv-1.0.7
@@ -1,10 +1,10 @@
-DEFINED_PHASES=compile configure install postinst prepare
+DEFINED_PHASES=configure install postinst
 DESCRIPTION=Console mode MIDI player with builtin userland OPL2 driver
-EAPI=5
+EAPI=7
 HOMEPAGE=https://bisqwit.iki.fi/source/fmdrv.html
 KEYWORDS=amd64 x86
 LICENSE=fmdrv GPL-2
 SLOT=0
 SRC_URI=https://bisqwit.iki.fi/src/arch/fmdrv-1.0.7.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=39a23ac2ee3531487ee1b8948c9a22ba
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0a49489b66a4fa52e3d92a4b892a1f14
diff --git a/metadata/md5-cache/media-sound/gnome-music-3.34.6 b/metadata/md5-cache/media-sound/gnome-music-3.34.6
index 8986e5b4f3c9..21024a37e5f1 100644
--- a/metadata/md5-cache/media-sound/gnome-music-3.34.6
+++ b/metadata/md5-cache/media-sound/gnome-music-3.34.6
@@ -5,7 +5,7 @@ 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 python_single_target_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+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] ) >=dev-libs/glib-2.50:2 net-libs/gnome-online-accounts[introspection] >=dev-libs/gobject-introspection-1.54:= >=x11-libs/gtk+-3.24.7: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-2.2.0:=[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(-)] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.29.1:3[cairo,python_targets_python3_8(-)] >=dev-python/pycairo-1.14.0[python_targets_python3_8(-)] ) >=media-libs/grilo-0.3.9:0.3[introspection] >=media-plugins/grilo-plugins-0.3.9:0.3 || ( >=app-misc/tracker-miners-2.2.0[gstreamer] >=app-misc/tracker-miners-2.2.0[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_8 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-music/3.34/gnome-music-3.34.6.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f7afef8a096fc7fb0a6cf6cc830954f7
+_md5_=b129d0179e55fc8d29d2d51be84a54b5
diff --git a/metadata/md5-cache/media-sound/gnump3d-3.0-r2 b/metadata/md5-cache/media-sound/gnump3d-3.0-r2
index fe55bc8c4e66..f7c5aec72ab3 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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5c543af272709e53096867e41f042a78
diff --git a/metadata/md5-cache/media-sound/gsm-1.0.13-r1 b/metadata/md5-cache/media-sound/gsm-1.0.13-r1
index 46665bdf214e..e3ad9472b9da 100644
--- a/metadata/md5-cache/media-sound/gsm-1.0.13-r1
+++ b/metadata/md5-cache/media-sound/gsm-1.0.13-r1
@@ -8,4 +8,4 @@ LICENSE=gsm
 SLOT=0
 SRC_URI=mirror://gentoo/gsm-1.0.13.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e0ed27f778b7b71c976c953bac24e48f
+_md5_=3c9e794c01482bffdbab2fab5356413c
diff --git a/metadata/md5-cache/media-sound/gtick-0.5.4 b/metadata/md5-cache/media-sound/gtick-0.5.4
deleted file mode 100644
index ec51b4e6dc60..000000000000
--- a/metadata/md5-cache/media-sound/gtick-0.5.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/gtk+:2 media-sound/pulseaudio sndfile? ( media-libs/libsndfile )
-DESCRIPTION=Metronome application supporting different meters and speeds ranging
-EAPI=7
-HOMEPAGE=https://www.antcom.de/gtick
-IUSE=nls sndfile
-KEYWORDS=amd64 ~ppc ~sparc x86
-LICENSE=GPL-3
-RDEPEND=x11-libs/gtk+:2 media-sound/pulseaudio sndfile? ( media-libs/libsndfile )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.antcom.de/gtick/download/gtick-0.5.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8
-_md5_=fb43fba02938cc0a9a2d1e6e5e20116c
diff --git a/metadata/md5-cache/media-sound/gtick-0.5.4-r1 b/metadata/md5-cache/media-sound/gtick-0.5.4-r1
deleted file mode 100644
index 54c2fccf6cf6..000000000000
--- a/metadata/md5-cache/media-sound/gtick-0.5.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig nls? ( sys-devel/gettext )
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=media-sound/pulseaudio x11-libs/gtk+:2 sndfile? ( media-libs/libsndfile )
-DESCRIPTION=Metronome application supporting different meters and speeds ranging
-EAPI=7
-HOMEPAGE=https://www.antcom.de/gtick
-IUSE=nls sndfile
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-3+
-RDEPEND=media-sound/pulseaudio x11-libs/gtk+:2 sndfile? ( media-libs/libsndfile )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.antcom.de/gtick/download/gtick-0.5.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bcd5ea5498a51bba7381478f9b846460
diff --git a/metadata/md5-cache/media-sound/gtick-0.5.5 b/metadata/md5-cache/media-sound/gtick-0.5.5
new file mode 100644
index 000000000000..0b7555a5fabd
--- /dev/null
+++ b/metadata/md5-cache/media-sound/gtick-0.5.5
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=media-sound/pulseaudio x11-libs/gtk+:2 sndfile? ( media-libs/libsndfile )
+DESCRIPTION=Metronome application supporting different meters and speeds ranging
+EAPI=7
+HOMEPAGE=https://www.antcom.de/gtick
+IUSE=nls sndfile
+KEYWORDS=amd64 ~ppc ~sparc x86
+LICENSE=GPL-3+
+RDEPEND=media-sound/pulseaudio x11-libs/gtk+:2 sndfile? ( media-libs/libsndfile )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.antcom.de/gtick/download/gtick-0.5.5.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7ccbce3181c94a4da9c7e7518a9fa4c0
diff --git a/metadata/md5-cache/media-sound/guitarix-0.39.0 b/metadata/md5-cache/media-sound/guitarix-0.39.0
index 7ede5ee564f6..58b1be3c8c98 100644
--- a/metadata/md5-cache/media-sound/guitarix-0.39.0
+++ b/metadata/md5-cache/media-sound/guitarix-0.39.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
 DEPEND=dev-cpp/eigen:3 dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/glib:2 >=media-libs/libsndfile-1.0.17 >=media-libs/zita-convolver-3:= media-libs/zita-resampler >=net-misc/curl-7.26.0 >=sci-libs/fftw-3.1.2:3.0= x11-libs/gtk+:2 lv2? ( media-libs/lv2 ) standalone? ( dev-libs/boost:= media-libs/liblrdf media-libs/lilv virtual/jack bluetooth? ( net-wireless/bluez ) zeroconf? ( net-dns/avahi ) ) || ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) virtual/pkgconfig nls? ( dev-util/intltool ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Virtual guitar amplifier for Linux
 EAPI=6
-HOMEPAGE=http://guitarix.org/
+HOMEPAGE=https://guitarix.org/
 IUSE=bluetooth debug lv2 nls +standalone zeroconf
 KEYWORDS=amd64
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( lv2 standalone )
 SLOT=0
 SRC_URI=mirror://sourceforge/guitarix/guitarix/guitarix2-0.39.0.tar.xz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	waf-utils	cf9742c01975dc707eb982114a9d70fa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0e36c72c94a0982c98f08951ff581dbc
+_md5_=9f2d4ecf9e1d6502ae1493522156bf24
diff --git a/metadata/md5-cache/media-sound/guitarix-0.40.0 b/metadata/md5-cache/media-sound/guitarix-0.40.0
new file mode 100644
index 000000000000..5fd85f34d165
--- /dev/null
+++ b/metadata/md5-cache/media-sound/guitarix-0.40.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=dev-cpp/eigen:3 dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0 dev-libs/glib:2 >=media-libs/libsndfile-1.0.17 >=media-libs/zita-convolver-3:= media-libs/zita-resampler >=net-misc/curl-7.26.0 >=sci-libs/fftw-3.1.2:3.0= x11-libs/gtk+:3 lv2? ( media-libs/lv2 ) standalone? ( dev-libs/boost:= media-libs/liblrdf media-libs/lilv virtual/jack bluetooth? ( net-wireless/bluez ) zeroconf? ( net-dns/avahi ) ) || ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) dev-lang/sassc virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Virtual guitar amplifier for Linux
+EAPI=6
+HOMEPAGE=https://guitarix.org/
+IUSE=bluetooth debug lv2 nls +standalone zeroconf
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-cpp/eigen:3 dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0 dev-libs/glib:2 >=media-libs/libsndfile-1.0.17 >=media-libs/zita-convolver-3:= media-libs/zita-resampler >=net-misc/curl-7.26.0 >=sci-libs/fftw-3.1.2:3.0= x11-libs/gtk+:3 lv2? ( media-libs/lv2 ) standalone? ( dev-libs/boost:= media-libs/liblrdf media-libs/lilv virtual/jack bluetooth? ( net-wireless/bluez ) zeroconf? ( net-dns/avahi ) ) standalone? ( media-fonts/roboto )
+REQUIRED_USE=|| ( lv2 standalone )
+SLOT=0
+SRC_URI=mirror://sourceforge/guitarix/guitarix/guitarix2-0.40.0.tar.xz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	waf-utils	cf9742c01975dc707eb982114a9d70fa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3cec8e1be43a45367671686b9b7e63f2
diff --git a/metadata/md5-cache/media-sound/guitarix-9999 b/metadata/md5-cache/media-sound/guitarix-9999
index 9fd347c17c10..e6159b771ecc 100644
--- a/metadata/md5-cache/media-sound/guitarix-9999
+++ b/metadata/md5-cache/media-sound/guitarix-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-cpp/eigen:3 dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-lang/sassc dev-libs/glib:2 >=media-libs/libsndfile-1.0.17 >=media-libs/zita-convolver-3:= media-libs/zita-resampler >=net-misc/curl-7.26.0 >=sci-libs/fftw-3.1.2:3.0= x11-libs/gtk+:2 lv2? ( media-libs/lv2 ) standalone? ( dev-libs/boost:= media-libs/liblrdf media-libs/lilv virtual/jack bluetooth? ( net-wireless/bluez ) zeroconf? ( net-dns/avahi ) ) || ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) virtual/pkgconfig nls? ( dev-util/intltool ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-cpp/eigen:3 dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0 dev-libs/glib:2 >=media-libs/libsndfile-1.0.17 >=media-libs/zita-convolver-3:= media-libs/zita-resampler >=net-misc/curl-7.26.0 >=sci-libs/fftw-3.1.2:3.0= x11-libs/gtk+:3 lv2? ( media-libs/lv2 ) standalone? ( dev-libs/boost:= media-libs/liblrdf media-libs/lilv virtual/jack bluetooth? ( net-wireless/bluez ) zeroconf? ( net-dns/avahi ) ) || ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) dev-lang/sassc virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Virtual guitar amplifier for Linux
 EAPI=6
-HOMEPAGE=http://guitarix.org/
+HOMEPAGE=https://guitarix.org/
 IUSE=bluetooth debug lv2 nls +standalone zeroconf
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-cpp/eigen:3 dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-lang/sassc dev-libs/glib:2 >=media-libs/libsndfile-1.0.17 >=media-libs/zita-convolver-3:= media-libs/zita-resampler >=net-misc/curl-7.26.0 >=sci-libs/fftw-3.1.2:3.0= x11-libs/gtk+:2 lv2? ( media-libs/lv2 ) standalone? ( dev-libs/boost:= media-libs/liblrdf media-libs/lilv virtual/jack bluetooth? ( net-wireless/bluez ) zeroconf? ( net-dns/avahi ) ) x11-themes/gtk-engines standalone? ( media-fonts/roboto )
+RDEPEND=dev-cpp/eigen:3 dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0 dev-libs/glib:2 >=media-libs/libsndfile-1.0.17 >=media-libs/zita-convolver-3:= media-libs/zita-resampler >=net-misc/curl-7.26.0 >=sci-libs/fftw-3.1.2:3.0= x11-libs/gtk+:3 lv2? ( media-libs/lv2 ) standalone? ( dev-libs/boost:= media-libs/liblrdf media-libs/lilv virtual/jack bluetooth? ( net-wireless/bluez ) zeroconf? ( net-dns/avahi ) ) standalone? ( media-fonts/roboto )
 REQUIRED_USE=|| ( lv2 standalone )
 SLOT=0
 _eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	waf-utils	cf9742c01975dc707eb982114a9d70fa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7342316d082282fa4965017bb5c6c901
+_md5_=844115c2b108b1b5dae2f22d0a373f19
diff --git a/metadata/md5-cache/media-sound/lltag-0.14.4-r1 b/metadata/md5-cache/media-sound/lltag-0.14.4-r1
index 3ad823a79e23..5131e3b73452 100644
--- a/metadata/md5-cache/media-sound/lltag-0.14.4-r1
+++ b/metadata/md5-cache/media-sound/lltag-0.14.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/libwww-perl mp3? ( media-sound/mp3info dev-perl/MP3-Tag ) ogg? ( media-sound/vorbis-tools ) flac? ( media-libs/flac ) readline? ( dev-perl/Term-ReadLine-Perl ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://download.gna.org/lltag/lltag-0.14.4.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a3f55c55d9f00942e522a17189e4e203
diff --git a/metadata/md5-cache/media-sound/lltag-0.14.5 b/metadata/md5-cache/media-sound/lltag-0.14.5
index f87dd3e7b3d2..eaa7f17f19b0 100644
--- a/metadata/md5-cache/media-sound/lltag-0.14.5
+++ b/metadata/md5-cache/media-sound/lltag-0.14.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/libwww-perl mp3? ( media-sound/mp3info dev-perl/MP3-Tag ) ogg? ( media-sound/vorbis-tools ) flac? ( media-libs/flac ) readline? ( dev-perl/Term-ReadLine-Perl ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://download.gna.org/lltag/lltag-0.14.5.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5b8f01a4f188e073b0523644c11c10d8
diff --git a/metadata/md5-cache/media-sound/mp3asm-0.1.3-r2 b/metadata/md5-cache/media-sound/mp3asm-0.1.3-r2
index 99b6533564b5..d377c5423a81 100644
--- a/metadata/md5-cache/media-sound/mp3asm-0.1.3-r2
+++ b/metadata/md5-cache/media-sound/mp3asm-0.1.3-r2
@@ -1,4 +1,5 @@
-DEFINED_PHASES=compile install
+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
 DESCRIPTION=A command line tool to clean and edit mp3 files
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/mp3asm/
@@ -6,5 +7,5 @@ KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/mp3asm/mp3asm-0.1.3-1.tar.bz2
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a7415759172177802559b515b5685466
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=aaebdb2f34563cabfe41b1bcc5bd1b6c
diff --git a/metadata/md5-cache/media-sound/mpd-0.21.22 b/metadata/md5-cache/media-sound/mpd-0.21.22
index 2adf1c9b8fc4..6e1591bfb217 100644
--- a/metadata/md5-cache/media-sound/mpd-0.21.22
+++ b/metadata/md5-cache/media-sound/mpd-0.21.22
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpd/0.21/mpd-0.21.22.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d3c7c2baa5a2e6c4aeff5404ea47f03f
diff --git a/metadata/md5-cache/media-sound/mpd-0.21.24 b/metadata/md5-cache/media-sound/mpd-0.21.24
index 279c3bf70a01..d45fbb73d4f7 100644
--- a/metadata/md5-cache/media-sound/mpd-0.21.24
+++ b/metadata/md5-cache/media-sound/mpd-0.21.24
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpd/0.21/mpd-0.21.24.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c6d6d6d54e6ce3745b86ce5960409783
diff --git a/metadata/md5-cache/media-sound/mumble-1.3.0 b/metadata/md5-cache/media-sound/mumble-1.3.0
deleted file mode 100644
index f8fa21152547..000000000000
--- a/metadata/md5-cache/media-sound/mumble-1.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=dev-libs/protobuf-2.2.0:= >=media-libs/libsndfile-1.0.20[-minimal] >=media-libs/speex-1.2.0 media-libs/speexdsp sys-apps/lsb-release x11-libs/libX11 x11-libs/libXi alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:5 ) g15? ( app-misc/g15daemon ) jack? ( virtual/jack ) !libressl? ( >=dev-libs/openssl-1.0.0b:0= ) libressl? ( dev-libs/libressl ) opus? ( >=media-libs/opus-1.0.1 ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) speech? ( >=app-accessibility/speech-dispatcher-0.8.0 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) >=dev-libs/boost-1.41.0 x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Mumble is an open source, low-latency, high quality voice chat software
-EAPI=7
-HOMEPAGE=https://wiki.mumble.info
-IUSE=+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf abi_x86_32 abi_x86_64 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 ~arm64 ~x86
-LICENSE=BSD MIT
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=dev-libs/protobuf-2.2.0:= >=media-libs/libsndfile-1.0.20[-minimal] >=media-libs/speex-1.2.0 media-libs/speexdsp sys-apps/lsb-release x11-libs/libX11 x11-libs/libXi alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:5 ) g15? ( app-misc/g15daemon ) jack? ( virtual/jack ) !libressl? ( >=dev-libs/openssl-1.0.0b:0= ) libressl? ( dev-libs/libressl ) opus? ( >=media-libs/opus-1.0.1 ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) speech? ( >=app-accessibility/speech-dispatcher-0.8.0 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-SLOT=0
-SRC_URI=https://github.com/mumble-voip/mumble/releases/download/1.3.0/mumble-1.3.0.tar.gz https://dl.mumble.info/mumble-1.3.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a442c42bbd05d9ff62e53dee3e01d6a8
diff --git a/metadata/md5-cache/media-sound/mumble-1.3.1 b/metadata/md5-cache/media-sound/mumble-1.3.1
deleted file mode 100644
index bd2639c5ce79..000000000000
--- a/metadata/md5-cache/media-sound/mumble-1.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=dev-libs/protobuf-2.2.0:= >=media-libs/libsndfile-1.0.20[-minimal] >=media-libs/speex-1.2.0 media-libs/speexdsp sys-apps/lsb-release x11-libs/libX11 x11-libs/libXi alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:5 ) g15? ( app-misc/g15daemon ) jack? ( virtual/jack ) !libressl? ( >=dev-libs/openssl-1.0.0b:0= ) libressl? ( dev-libs/libressl ) opus? ( >=media-libs/opus-1.0.1 ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) speech? ( >=app-accessibility/speech-dispatcher-0.8.0 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) >=dev-libs/boost-1.41.0 x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Mumble is an open source, low-latency, high quality voice chat software
-EAPI=7
-HOMEPAGE=https://wiki.mumble.info
-IUSE=+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf abi_x86_32 abi_x86_64 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 ~arm64 x86
-LICENSE=BSD MIT
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=dev-libs/protobuf-2.2.0:= >=media-libs/libsndfile-1.0.20[-minimal] >=media-libs/speex-1.2.0 media-libs/speexdsp sys-apps/lsb-release x11-libs/libX11 x11-libs/libXi alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:5 ) g15? ( app-misc/g15daemon ) jack? ( virtual/jack ) !libressl? ( >=dev-libs/openssl-1.0.0b:0= ) libressl? ( dev-libs/libressl ) opus? ( >=media-libs/opus-1.0.1 ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) speech? ( >=app-accessibility/speech-dispatcher-0.8.0 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-SLOT=0
-SRC_URI=https://github.com/mumble-voip/mumble/releases/download/1.3.1/mumble-1.3.1.tar.gz https://dl.mumble.info/mumble-1.3.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=41cd99b233941bf19e2bf1c7a2aa380f
diff --git a/metadata/md5-cache/media-sound/mumble-1.3.1-r1 b/metadata/md5-cache/media-sound/mumble-1.3.1-r1
new file mode 100644
index 000000000000..3c48c00e6c4f
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mumble-1.3.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=dev-libs/protobuf-2.2.0:= >=media-libs/libsndfile-1.0.20[-minimal] >=media-libs/speex-1.2.0 media-libs/speexdsp sys-apps/lsb-release x11-libs/libX11 x11-libs/libXi alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:5 ) g15? ( app-misc/g15daemon ) jack? ( virtual/jack ) !libressl? ( >=dev-libs/openssl-1.0.0b:0= ) libressl? ( dev-libs/libressl ) opus? ( >=media-libs/opus-1.0.1 ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) speech? ( >=app-accessibility/speech-dispatcher-0.8.0 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) >=dev-libs/boost-1.41.0 x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Mumble is an open source, low-latency, high quality voice chat software
+EAPI=7
+HOMEPAGE=https://wiki.mumble.info
+IUSE=+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf abi_x86_32 abi_x86_64 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 ~arm64 x86
+LICENSE=BSD MIT
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=dev-libs/protobuf-2.2.0:= >=media-libs/libsndfile-1.0.20[-minimal] >=media-libs/speex-1.2.0 media-libs/speexdsp sys-apps/lsb-release x11-libs/libX11 x11-libs/libXi alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:5 ) g15? ( app-misc/g15daemon ) jack? ( virtual/jack ) !libressl? ( >=dev-libs/openssl-1.0.0b:0= ) libressl? ( dev-libs/libressl ) opus? ( >=media-libs/opus-1.0.1 ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) speech? ( >=app-accessibility/speech-dispatcher-0.8.0 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+SLOT=0
+SRC_URI=https://github.com/mumble-voip/mumble/releases/download/1.3.1/mumble-1.3.1.tar.gz https://dl.mumble.info/mumble-1.3.1.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cf6044e9dfb51581b0f1db32f3f682d2
diff --git a/metadata/md5-cache/media-sound/mumble-9999 b/metadata/md5-cache/media-sound/mumble-9999
index 5bbbf90c0eec..cf479638f559 100644
--- a/metadata/md5-cache/media-sound/mumble-9999
+++ b/metadata/md5-cache/media-sound/mumble-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=dev-libs/protobuf-2.2.0:= >=media-libs/libsndfile-1.0.20[-minimal] >=media-libs/speex-1.2.0 media-libs/speexdsp sys-apps/lsb-release x11-libs/libX11 x11-libs/libXi alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:5 ) g15? ( app-misc/g15daemon ) jack? ( virtual/jack ) !libressl? ( >=dev-libs/openssl-1.0.0b:0= ) libressl? ( dev-libs/libressl ) opus? ( >=media-libs/opus-1.0.1 ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) speech? ( >=app-accessibility/speech-dispatcher-0.8.0 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
 SLOT=0
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a442c42bbd05d9ff62e53dee3e01d6a8
+_md5_=aba82956bc45eaa58b441c444afe0489
diff --git a/metadata/md5-cache/media-sound/murmur-1.3.0 b/metadata/md5-cache/media-sound/murmur-1.3.0
deleted file mode 100644
index da9c4b899df7..000000000000
--- a/metadata/md5-cache/media-sound/murmur-1.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=acct-group/murmur acct-user/murmur virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/murmur acct-user/murmur >=dev-libs/openssl-1.0.0b:0= >=dev-libs/protobuf-2.2.0:= dev-qt/qtcore:5 dev-qt/qtnetwork:5 || ( dev-qt/qtsql:5[sqlite] dev-qt/qtsql:5[mysql] ) dev-qt/qtxml:5 sys-apps/lsb-release >=sys-libs/libcap-2.15 dbus? ( dev-qt/qtdbus:5 ) ice? ( dev-libs/Ice:= ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) >=dev-libs/boost-1.41.0
-DESCRIPTION=Mumble is an open source, low-latency, high quality voice chat software
-EAPI=7
-HOMEPAGE=https://wiki.mumble.info
-IUSE=+dbus debug +ice pch zeroconf
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=acct-group/murmur acct-user/murmur >=dev-libs/openssl-1.0.0b:0= >=dev-libs/protobuf-2.2.0:= dev-qt/qtcore:5 dev-qt/qtnetwork:5 || ( dev-qt/qtsql:5[sqlite] dev-qt/qtsql:5[mysql] ) dev-qt/qtxml:5 sys-apps/lsb-release >=sys-libs/libcap-2.15 dbus? ( dev-qt/qtdbus:5 ) ice? ( dev-libs/Ice:= ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-SLOT=0
-SRC_URI=https://github.com/mumble-voip/mumble/releases/download/1.3.0/mumble-1.3.0.tar.gz https://dl.mumble.info/mumble-1.3.0.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b04793b74cd21ece196cfb4f91e4b0bb
diff --git a/metadata/md5-cache/media-sound/murmur-1.3.1 b/metadata/md5-cache/media-sound/murmur-1.3.1
index 736164da3d2c..fc0bebca2614 100644
--- a/metadata/md5-cache/media-sound/murmur-1.3.1
+++ b/metadata/md5-cache/media-sound/murmur-1.3.1
@@ -5,10 +5,10 @@ DESCRIPTION=Mumble is an open source, low-latency, high quality voice chat softw
 EAPI=7
 HOMEPAGE=https://wiki.mumble.info
 IUSE=+dbus debug +ice pch zeroconf
-KEYWORDS=~amd64 ~arm x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=BSD
 RDEPEND=acct-group/murmur acct-user/murmur >=dev-libs/openssl-1.0.0b:0= >=dev-libs/protobuf-2.2.0:= dev-qt/qtcore:5 dev-qt/qtnetwork:5 || ( dev-qt/qtsql:5[sqlite] dev-qt/qtsql:5[mysql] ) dev-qt/qtxml:5 sys-apps/lsb-release >=sys-libs/libcap-2.15 dbus? ( dev-qt/qtdbus:5 ) ice? ( dev-libs/Ice:= ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
 SLOT=0
 SRC_URI=https://github.com/mumble-voip/mumble/releases/download/1.3.1/mumble-1.3.1.tar.gz https://dl.mumble.info/mumble-1.3.1.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=71a18b0bd349bbf39285124b5655b025
+_md5_=ff6ad876ac7fe6b20e43497c5f875e9e
diff --git a/metadata/md5-cache/media-sound/muse-0.9.2_p20161002 b/metadata/md5-cache/media-sound/muse-0.9.2_p20161002
index 99912633fb73..94ff8f53a6e8 100644
--- a/metadata/md5-cache/media-sound/muse-0.9.2_p20161002
+++ b/metadata/md5-cache/media-sound/muse-0.9.2_p20161002
@@ -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 prepare
-DEPEND=media-sound/lame media-libs/libvorbis media-libs/libsndfile media-libs/libogg media-libs/libshout media-libs/libsamplerate gtk? ( x11-libs/gtk+:2 ) jack? ( media-sound/jack-audio-connection-kit ) ncurses? ( sys-libs/ncurses:0= ) portaudio? ( media-libs/portaudio ) 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
+DEPEND=media-sound/lame media-libs/libvorbis media-libs/libsndfile:= media-libs/libogg media-libs/libshout media-libs/libsamplerate gtk? ( x11-libs/gtk+:2 ) jack? ( media-sound/jack-audio-connection-kit ) ncurses? ( sys-libs/ncurses:0= ) portaudio? ( media-libs/portaudio )
 DESCRIPTION=Multiple Streaming Engine, an icecast source streamer
-EAPI=6
+EAPI=7
 HOMEPAGE=http://muse.dyne.org
 IUSE=doc gtk jack ncurses portaudio
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=media-sound/lame media-libs/libvorbis media-libs/libsndfile media-libs/libogg media-libs/libshout media-libs/libsamplerate gtk? ( x11-libs/gtk+:2 ) jack? ( media-sound/jack-audio-connection-kit ) ncurses? ( sys-libs/ncurses:0= ) portaudio? ( media-libs/portaudio )
+RDEPEND=media-sound/lame media-libs/libvorbis media-libs/libsndfile:= media-libs/libogg media-libs/libshout media-libs/libsamplerate gtk? ( x11-libs/gtk+:2 ) jack? ( media-sound/jack-audio-connection-kit ) ncurses? ( sys-libs/ncurses:0= ) portaudio? ( media-libs/portaudio )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~soap/distfiles/muse-0.9.2_p20161002.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9993438d546b793e3a8666627cec1f68
+_md5_=e1f71c3dbf73bb5d2d18dd99bfb91cfc
diff --git a/metadata/md5-cache/media-sound/music-file-organizer-1.0.2 b/metadata/md5-cache/media-sound/music-file-organizer-1.0.2
index 815050ba8934..61707515492d 100644
--- a/metadata/md5-cache/media-sound/music-file-organizer-1.0.2
+++ b/metadata/md5-cache/media-sound/music-file-organizer-1.0.2
@@ -2,10 +2,10 @@ DEFINED_PHASES=postinst
 DEPEND=media-libs/taglib dev-libs/icu:= virtual/pkgconfig
 DESCRIPTION=Organizes audio files into directories based on metadata tags, along with other metadata utilities.
 EAPI=5
-HOMEPAGE=http://blog.zx2c4.com/813
+HOMEPAGE=https://git.zx2c4.com/music-file-organizer/about/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/taglib dev-libs/icu:=
 SLOT=0
-SRC_URI=http://git.zx2c4.com/music-file-organizer/snapshot/music-file-organizer-1.0.2.tar.xz
-_md5_=5af11bfdbd5fa82f65bab780ee9fff14
+SRC_URI=https://git.zx2c4.com/music-file-organizer/snapshot/music-file-organizer-1.0.2.tar.xz
+_md5_=06acbfb6091dcef4d423f34d0a3c74e8
diff --git a/metadata/md5-cache/media-sound/ogmtools-1.5-r2 b/metadata/md5-cache/media-sound/ogmtools-1.5-r2
index 484cd084a3ec..ad0c387b2005 100644
--- a/metadata/md5-cache/media-sound/ogmtools-1.5-r2
+++ b/metadata/md5-cache/media-sound/ogmtools-1.5-r2
@@ -1,12 +1,14 @@
-DEFINED_PHASES=configure install
-DEPEND=dvd? ( media-libs/libdvdread ) media-sound/vorbis-tools
+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=media-sound/vorbis-tools dvd? ( media-libs/libdvdread )
 DESCRIPTION=Information, extraction or creation for OGG media streams
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.bunkus.org/videotools/ogmtools/
 IUSE=dvd
 KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
-RDEPEND=dvd? ( media-libs/libdvdread ) media-sound/vorbis-tools
+RDEPEND=media-sound/vorbis-tools dvd? ( media-libs/libdvdread )
 SLOT=0
 SRC_URI=https://www.bunkus.org/videotools/ogmtools/ogmtools-1.5.tar.bz2
-_md5_=da317c326a460d2f933db2e47c5b5073
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=08c35496086db084f7d8905273f9cfb4
diff --git a/metadata/md5-cache/media-sound/pulseaudio-13.0 b/metadata/md5-cache/media-sound/pulseaudio-13.0
index efcce55f4517..71684a981e5e 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	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d49c9ac79f3bc94f643299191b1ed811
diff --git a/metadata/md5-cache/media-sound/splay-0.9.5.2-r2 b/metadata/md5-cache/media-sound/splay-0.9.5.2-r2
index 77a966f2fc35..7727dd54e1ae 100644
--- a/metadata/md5-cache/media-sound/splay-0.9.5.2-r2
+++ b/metadata/md5-cache/media-sound/splay-0.9.5.2-r2
@@ -1,7 +1,8 @@
+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=prepare
-DEPEND=media-libs/id3lib >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=media-libs/id3lib
 DESCRIPTION=An audio player, primarily for the console
-EAPI=6
+EAPI=7
 HOMEPAGE=http://splay.sourceforge.net/
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
@@ -9,4 +10,4 @@ RDEPEND=media-libs/id3lib
 SLOT=0
 SRC_URI=http://splay.sourceforge.net/tgz/splay-0.9.5.2.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=361a3d317997f8cb0bb5ecbba66edf35
+_md5_=ea9ebfe2d00c7d96c485d09bca63deb5
diff --git a/metadata/md5-cache/media-sound/spotify-1.0.72-r1 b/metadata/md5-cache/media-sound/spotify-1.0.72-r1
index 44815e7668c5..5cba3995eef5 100644
--- a/metadata/md5-cache/media-sound/spotify-1.0.72-r1
+++ b/metadata/md5-cache/media-sound/spotify-1.0.72-r1
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/nss gnome-base/gconf gnome-extra/zenity media-libs/alsa-lib med
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d2263b15a6d32c35796b52b67449e2c1
diff --git a/metadata/md5-cache/media-sound/spotify-1.1.10-r1 b/metadata/md5-cache/media-sound/spotify-1.1.10-r1
index c056a31ff10a..06f2e5afe2ee 100644
--- a/metadata/md5-cache/media-sound/spotify-1.1.10-r1
+++ b/metadata/md5-cache/media-sound/spotify-1.1.10-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/nss dev-python/dbus-python dev-python/pygobject:3 libnotify? (
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.1.10.546.ge08ef575-19_amd64.deb
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8f1592ccde15615000bdc9d081e5b7a8
diff --git a/metadata/md5-cache/media-sound/spotify-1.1.26 b/metadata/md5-cache/media-sound/spotify-1.1.26
deleted file mode 100644
index 659c659145e1..000000000000
--- a/metadata/md5-cache/media-sound/spotify-1.1.26
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/patchelf-0.10
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Spotify is a social music platform
-EAPI=7
-HOMEPAGE=https://www.spotify.com/ch-de/download/previews/
-IUSE=libnotify libressl systray pax_kernel
-KEYWORDS=~amd64
-LICENSE=Spotify
-RDEPEND=dev-libs/nss dev-python/dbus-python dev-python/pygobject:3 libnotify? ( x11-libs/libnotify ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) media-libs/alsa-lib media-libs/fontconfig media-libs/harfbuzz media-libs/mesa[X(+)] net-misc/curl[ssl] net-print/cups[ssl] || ( media-sound/pulseaudio media-sound/apulse ) systray? ( gnome-extra/gnome-integration-spotify ) x11-libs/gtk+:2 app-accessibility/at-spi2-atk x11-libs/libXScrnSaver x11-libs/libXtst
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.1.26.501.gbe11e53b-15_amd64.deb
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1f46d0b0effe18acf4829e6a009cbc61
diff --git a/metadata/md5-cache/media-sound/spotify-1.1.26-r1 b/metadata/md5-cache/media-sound/spotify-1.1.26-r1
new file mode 100644
index 000000000000..ddf6667a142d
--- /dev/null
+++ b/metadata/md5-cache/media-sound/spotify-1.1.26-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/patchelf-0.10
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Spotify is a social music platform
+EAPI=7
+HOMEPAGE=https://www.spotify.com/ch-de/download/previews/
+IUSE=libnotify libressl systray pax_kernel pulseaudio
+KEYWORDS=~amd64
+LICENSE=Spotify
+RDEPEND=dev-libs/nss dev-python/dbus-python dev-python/pygobject:3 libnotify? ( x11-libs/libnotify ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) media-libs/alsa-lib media-libs/fontconfig media-libs/harfbuzz media-libs/mesa[X(+)] net-misc/curl[ssl] net-print/cups[ssl] pulseaudio? ( media-sound/pulseaudio ) !pulseaudio? ( media-sound/apulse ) systray? ( gnome-extra/gnome-integration-spotify ) x11-libs/gtk+:2 app-accessibility/at-spi2-atk x11-libs/libXScrnSaver x11-libs/libXtst
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.1.26.501.gbe11e53b-15_amd64.deb
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6911dd4524940b9922fdd548675c13a0
diff --git a/metadata/md5-cache/media-sound/streamripper-1.64.6 b/metadata/md5-cache/media-sound/streamripper-1.64.6
index 56cf85ceb7cd..e3f00965fd8b 100644
--- a/metadata/md5-cache/media-sound/streamripper-1.64.6
+++ b/metadata/md5-cache/media-sound/streamripper-1.64.6
@@ -1,7 +1,8 @@
-DEFINED_PHASES=configure
-DEPEND=media-libs/libmad media-libs/faad2 >=dev-libs/glib-2.16 vorbis? ( media-libs/libvorbis ) virtual/pkgconfig
+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=media-libs/libmad media-libs/faad2 >=dev-libs/glib-2.16 vorbis? ( media-libs/libvorbis )
 DESCRIPTION=Extracts and records individual MP3 file tracks from shoutcast streams
-EAPI=6
+EAPI=7
 HOMEPAGE=http://streamripper.sourceforge.net
 IUSE=vorbis
 KEYWORDS=~alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
@@ -9,4 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libmad media-libs/faad2 >=dev-libs/glib-2.16 vorbis? ( media-libs/libvorbis )
 SLOT=0
 SRC_URI=mirror://sourceforge/streamripper/streamripper-1.64.6.tar.gz
-_md5_=f06c9fb080dac4bdf8d3d6046921690b
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5899c69b94390384a584c9e914b31147
diff --git a/metadata/md5-cache/media-sound/supercollider-3.10.2 b/metadata/md5-cache/media-sound/supercollider-3.10.2
deleted file mode 100644
index e4144e083b2e..000000000000
--- a/metadata/md5-cache/media-sound/supercollider-3.10.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig qt5? ( dev-qt/linguist-tools:5 ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-cpp/yaml-cpp:= >=dev-libs/boost-1.70.0:= media-libs/alsa-lib sys-libs/readline:0= virtual/libudev:= fftw? ( sci-libs/fftw:3.0= ) jack? ( virtual/jack ) !jack? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 ) server? ( !app-admin/supernova ) sndfile? ( media-libs/libsndfile ) X? ( x11-libs/libX11 x11-libs/libXt ) zeroconf? ( net-dns/avahi ) dev-libs/icu emacs? ( >=app-editors/emacs-23.1:* ) gedit? ( app-editors/gedit ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtdeclarative:5 ) vim? ( app-editors/vim )
-DESCRIPTION=An environment and a programming language for real time audio synthesis.
-EAPI=7
-HOMEPAGE=https://supercollider.github.io/
-IUSE=cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt5 server +sndfile static-libs vim X zeroconf
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 gpl3? ( GPL-3 )
-RDEPEND=dev-cpp/yaml-cpp:= >=dev-libs/boost-1.70.0:= media-libs/alsa-lib sys-libs/readline:0= virtual/libudev:= fftw? ( sci-libs/fftw:3.0= ) jack? ( virtual/jack ) !jack? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 ) server? ( !app-admin/supernova ) sndfile? ( media-libs/libsndfile ) X? ( x11-libs/libX11 x11-libs/libXt ) zeroconf? ( net-dns/avahi )
-REQUIRED_USE=qt5? ( X )
-SLOT=0
-SRC_URI=https://github.com/supercollider/supercollider/releases/download/Version-3.10.2/SuperCollider-3.10.2-Source-linux.tar.bz2
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c75bef2686de71bb606e86f13377a308
diff --git a/metadata/md5-cache/media-sound/supercollider-3.11.0 b/metadata/md5-cache/media-sound/supercollider-3.11.0
new file mode 100644
index 000000000000..9d10ae68fb03
--- /dev/null
+++ b/metadata/md5-cache/media-sound/supercollider-3.11.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig qt5? ( dev-qt/linguist-tools:5 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-cpp/yaml-cpp:= >=dev-libs/boost-1.70.0:= media-libs/alsa-lib sys-libs/readline:0= virtual/libudev:= fftw? ( sci-libs/fftw:3.0= ) jack? ( virtual/jack ) !jack? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) server? ( !app-admin/supernova ) sndfile? ( media-libs/libsndfile ) webengine? ( dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwebsockets:5 ) X? ( x11-libs/libX11 x11-libs/libXt ) zeroconf? ( net-dns/avahi ) dev-libs/icu emacs? ( >=app-editors/emacs-23.1:* ) gedit? ( app-editors/gedit ) qt5? ( dev-qt/qtconcurrent:5 ) vim? ( app-editors/vim )
+DESCRIPTION=An environment and a programming language for real time audio synthesis.
+EAPI=7
+HOMEPAGE=https://supercollider.github.io/
+IUSE=cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt5 server +sndfile static-libs vim webengine X zeroconf
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 gpl3? ( GPL-3 )
+RDEPEND=dev-cpp/yaml-cpp:= >=dev-libs/boost-1.70.0:= media-libs/alsa-lib sys-libs/readline:0= virtual/libudev:= fftw? ( sci-libs/fftw:3.0= ) jack? ( virtual/jack ) !jack? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) server? ( !app-admin/supernova ) sndfile? ( media-libs/libsndfile ) webengine? ( dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwebsockets:5 ) X? ( x11-libs/libX11 x11-libs/libXt ) zeroconf? ( net-dns/avahi )
+REQUIRED_USE=qt5? ( X ) webengine? ( qt5 )
+SLOT=0
+SRC_URI=https://github.com/supercollider/supercollider/releases/download/Version-3.11.0/SuperCollider-3.11.0-Source.tar.bz2
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a64fa8ab9357bc06cf9972b02ba6b4f0
diff --git a/metadata/md5-cache/media-sound/teamspeak-client-3.3.2-r1 b/metadata/md5-cache/media-sound/teamspeak-client-3.3.2-r1
index cb1b60cbab72..5730980eb351 100644
--- a/metadata/md5-cache/media-sound/teamspeak-client-3.3.2-r1
+++ b/metadata/md5-cache/media-sound/teamspeak-client-3.3.2-r1
@@ -10,5 +10,5 @@ REQUIRED_USE=|| ( alsa pulseaudio )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://files.teamspeak-services.com/releases/client/3.3.2/TeamSpeak3-Client-linux_amd64-3.3.2.run ) x86? ( https://files.teamspeak-services.com/releases/client/3.3.2/TeamSpeak3-Client-linux_x86-3.3.2.run )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fdacc8c26e2db68bc3c3a540329c2642
diff --git a/metadata/md5-cache/media-sound/teamspeak-client-3.5.3 b/metadata/md5-cache/media-sound/teamspeak-client-3.5.3
index 1d7fffd64ffc..d7572aed1848 100644
--- a/metadata/md5-cache/media-sound/teamspeak-client-3.5.3
+++ b/metadata/md5-cache/media-sound/teamspeak-client-3.5.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( alsa pulseaudio )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://files.teamspeak-services.com/releases/client/3.5.3/TeamSpeak3-Client-linux_amd64-3.5.3.run ) x86? ( https://files.teamspeak-services.com/releases/client/3.5.3/TeamSpeak3-Client-linux_x86-3.5.3.run )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a33f7e76addcc27d479867b976392794
diff --git a/metadata/md5-cache/media-sound/twolame-0.3.13-r2 b/metadata/md5-cache/media-sound/twolame-0.3.13-r2
index 7b4d5c6dfd7b..57a4c42d5407 100644
--- a/metadata/md5-cache/media-sound/twolame-0.3.13-r2
+++ b/metadata/md5-cache/media-sound/twolame-0.3.13-r2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=media-libs/libsndfile-1.0.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
 DESCRIPTION=An optimised MPEG Audio Layer 2 (MP2) encoder
 EAPI=6
-HOMEPAGE=http://www.twolame.org
+HOMEPAGE=https://www.twolame.org
 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=>=media-libs/libsndfile-1.0.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 SLOT=0
 SRC_URI=mirror://sourceforge/twolame/twolame-0.3.13.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b174fdb99c86a75c2073e874378ef3ae
+_md5_=1b9f31e3cff66a78017cbe7f679b9202
diff --git a/metadata/md5-cache/media-sound/twolame-0.4.0 b/metadata/md5-cache/media-sound/twolame-0.4.0
index ed7333e79f64..b0007cf9ea08 100644
--- a/metadata/md5-cache/media-sound/twolame-0.4.0
+++ b/metadata/md5-cache/media-sound/twolame-0.4.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=sndfile? ( >=media-libs/libsndfile-1.0.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=An optimised MPEG Audio Layer 2 (MP2) encoder
 EAPI=7
-HOMEPAGE=http://www.twolame.org
+HOMEPAGE=https://www.twolame.org
 IUSE=+sndfile 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/twolame/twolame-0.4.0.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=77cebef251d2a3514cfea235471582b4
+_md5_=5cc0e294913395c79c5e19c30d2d7c37
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 99cac5e04c3c..ddfc238211f5 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/dtv-scan-tables-0_p20190922 b/metadata/md5-cache/media-tv/dtv-scan-tables-0_p20190922
index c65d8c177149..d0ef8035232b 100644
--- a/metadata/md5-cache/media-tv/dtv-scan-tables-0_p20190922
+++ b/metadata/md5-cache/media-tv/dtv-scan-tables-0_p20190922
@@ -3,8 +3,8 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Digital TV scan tables in v3 and v5 format
 EAPI=7
 HOMEPAGE=https://linuxtv.org/
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-2019-09-22-f07bde777d4d.tar.bz2
-_md5_=61f59654a751f32019c0f02695b87f7f
+_md5_=741f2e5f2c07958e83ba0506ff0aa40b
diff --git a/metadata/md5-cache/media-tv/kodi-18.3-r1 b/metadata/md5-cache/media-tv/kodi-18.3-r1
index ad63af0664ff..dee97fc245f7 100644
--- a/metadata/md5-cache/media-tv/kodi-18.3-r1
+++ b/metadata/md5-cache/media-tv/kodi-18.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 ) || ( gles opengl ) ^^ ( gbm r
 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	7d999b62b8749fad43fff00620cedf47	cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0614193d3f336f4d5a37303bbf208235
diff --git a/metadata/md5-cache/media-tv/kodi-18.4-r1 b/metadata/md5-cache/media-tv/kodi-18.4-r1
index f8f5560b8542..7c9b05f660cd 100644
--- a/metadata/md5-cache/media-tv/kodi-18.4-r1
+++ b/metadata/md5-cache/media-tv/kodi-18.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 ) || ( gles opengl ) ^^ ( gbm r
 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	7d999b62b8749fad43fff00620cedf47	cmake	19b0421555865baefd505831dd4303e3	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	cmake	19b0421555865baefd505831dd4303e3	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=19755e8d47239b098326cff47c642c66
diff --git a/metadata/md5-cache/media-tv/kodi-18.5-r2 b/metadata/md5-cache/media-tv/kodi-18.5-r2
index 55538f613ed2..65cc45d5e2ad 100644
--- a/metadata/md5-cache/media-tv/kodi-18.5-r2
+++ b/metadata/md5-cache/media-tv/kodi-18.5-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 ) || ( gles opengl ) ^^ ( gbm r
 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	7d999b62b8749fad43fff00620cedf47	cmake	19b0421555865baefd505831dd4303e3	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	cmake	19b0421555865baefd505831dd4303e3	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1913068f17a9aa4a6508f9d79df38e87
diff --git a/metadata/md5-cache/media-tv/kodi-18.6 b/metadata/md5-cache/media-tv/kodi-18.6
index a64d2d63bd5c..2edcb5fbdb3f 100644
--- a/metadata/md5-cache/media-tv/kodi-18.6
+++ b/metadata/md5-cache/media-tv/kodi-18.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 ) || ( gles opengl ) ^^ ( gbm r
 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.6-Leia.tar.gz -> kodi-18.6.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	cmake	19b0421555865baefd505831dd4303e3	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0b4f10b5da62fcdacc49f80e089af06c
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	cmake	19b0421555865baefd505831dd4303e3	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=00864b28ddbe61c99c9df691531c975a
diff --git a/metadata/md5-cache/media-tv/kodi-18.7 b/metadata/md5-cache/media-tv/kodi-18.7
index 9d8fdb370d6d..abe14a34db10 100644
--- a/metadata/md5-cache/media-tv/kodi-18.7
+++ b/metadata/md5-cache/media-tv/kodi-18.7
@@ -5,12 +5,12 @@ 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
+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.7-Leia.tar.gz -> kodi-18.7.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	cmake	19b0421555865baefd505831dd4303e3	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ac516e11227e1dd66a2df85d4240f2ec
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	cmake	19b0421555865baefd505831dd4303e3	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=00864b28ddbe61c99c9df691531c975a
diff --git a/metadata/md5-cache/media-tv/kodi-18.7.1 b/metadata/md5-cache/media-tv/kodi-18.7.1
index 20444ca9e60a..ad02fd5b6f6e 100644
--- a/metadata/md5-cache/media-tv/kodi-18.7.1
+++ b/metadata/md5-cache/media-tv/kodi-18.7.1
@@ -5,12 +5,12 @@ 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
+KEYWORDS=~amd64 ~arm64 ~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.7.1-Leia.tar.gz -> kodi-18.7.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	cmake	19b0421555865baefd505831dd4303e3	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ac516e11227e1dd66a2df85d4240f2ec
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	cmake	19b0421555865baefd505831dd4303e3	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a6e05beb995b9b27f601c867ffff3b0a
diff --git a/metadata/md5-cache/media-tv/kodi-9999 b/metadata/md5-cache/media-tv/kodi-9999
index 9fa6281b8c89..0d63e3fa556e 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/spdlog-1.5.0:= 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-2.1.0 >=dev-libs/libfmt-6.1.2 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/dav1d >=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.2.2:=[dav1d,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.68.0[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 udf? ( >=dev-libs/libudfread-1.0.0 ) 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-2.0.4:= >=media-libs/libpng-1.6.26:0= test? ( >=dev-cpp/gtest-1.10.0 ) 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/spdlog-1.5.0:= 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-2.1.0 >=dev-libs/libfmt-6.1.2 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/dav1d >=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.3:=[dav1d,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.68.0[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 udf? ( >=dev-libs/libudfread-1.0.0 ) 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-2.0.4:= >=media-libs/libpng-1.6.26:0= test? ( >=dev-cpp/gtest-1.10.0 ) 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 udf 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/spdlog-1.5.0:= 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-2.1.0 >=dev-libs/libfmt-6.1.2 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/dav1d >=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.2.2:=[dav1d,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.68.0[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 udf? ( >=dev-libs/libudfread-1.0.0 ) 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 ) udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
+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/spdlog-1.5.0:= 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-2.1.0 >=dev-libs/libfmt-6.1.2 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/dav1d >=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.3:=[dav1d,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.68.0[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 udf? ( >=dev-libs/libudfread-1.0.0 ) 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 ) 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 ) bluray? ( udf ) 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.2.2-Matrix-Alpha1.tar.gz -> ffmpeg-kodi-4.2.2-Matrix-Alpha1.tar.gz )
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	cmake	19b0421555865baefd505831dd4303e3	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a636ecb58febb62fe0a57d37d56fc85b
+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.3-Matrix-Alpha1.tar.gz -> ffmpeg-kodi-4.3-Matrix-Alpha1.tar.gz )
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	cmake	19b0421555865baefd505831dd4303e3	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=291452c242a3f5144709f905c08e89b5
diff --git a/metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20140321-r1 b/metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20140321-r1
index b26cef31d4aa..be5c3c6d7c45 100644
--- a/metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20140321-r1
+++ b/metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20140321-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Small utils for DVB to scan, zap, view signal strength
 EAPI=7
 HOMEPAGE=https://www.linuxtv.org/
 IUSE=alevt usb
-KEYWORDS=amd64 ~arm ppc x86
+KEYWORDS=amd64 ~arm ~arm64 ppc x86
 LICENSE=GPL-2
 RDEPEND=alevt? ( !media-video/alevt media-libs/libpng:0= media-libs/zvbi[v4l] sys-libs/zlib x11-libs/libX11 ) usb? ( virtual/libusb:0 ) media-tv/dtv-scan-tables
 SLOT=0
 SRC_URI=https://www.linuxtv.org/hg/dvb-apps/archive/3d43b280298c.tar.bz2 -> linuxtv-dvb-apps-1.1.1.20140321.tar.bz2
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=3b6819674c5c078594b5113f4f9bb001
+_md5_=50d89c8e48114d4860a6390b34d751aa
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 6dbebad5a040..c9b226e63b0f 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
@@ -12,5 +12,5 @@ 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	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=0f829bfdf778212b99f687d62a114284
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
index bc66153c691d..df65beabf215 100644
--- 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
@@ -12,5 +12,5 @@ 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	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=ed7ff73f6c3d8ad90adcea289efc6f62
diff --git a/metadata/md5-cache/media-tv/plex-media-server-1.19.1 b/metadata/md5-cache/media-tv/plex-media-server-1.19.1
index 959fb019520d..14991ef18c03 100644
--- a/metadata/md5-cache/media-tv/plex-media-server-1.19.1
+++ b/metadata/md5-cache/media-tv/plex-media-server-1.19.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist strip
 SLOT=0
 SRC_URI=amd64? ( https://downloads.plex.tv/plex-media-server-new/1.19.1.2645-ccb6eb67e/debian/plexmediaserver_1.19.1.2645-ccb6eb67e_amd64.deb ) x86? ( https://downloads.plex.tv/plex-media-server-new/1.19.1.2645-ccb6eb67e/debian/plexmediaserver_1.19.1.2645-ccb6eb67e_i386.deb )
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=1dac5b6ba82211f558e061df17a588cc
diff --git a/metadata/md5-cache/media-tv/plex-media-server-1.19.2 b/metadata/md5-cache/media-tv/plex-media-server-1.19.2
index ea2a1121968e..648bc207c51b 100644
--- a/metadata/md5-cache/media-tv/plex-media-server-1.19.2
+++ b/metadata/md5-cache/media-tv/plex-media-server-1.19.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist strip
 SLOT=0
 SRC_URI=amd64? ( https://downloads.plex.tv/plex-media-server-new/1.19.2.2737-b69929dab/debian/plexmediaserver_1.19.2.2737-b69929dab_amd64.deb ) x86? ( https://downloads.plex.tv/plex-media-server-new/1.19.2.2737-b69929dab/debian/plexmediaserver_1.19.2.2737-b69929dab_i386.deb )
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=a3cd9933960a62f7140c854485878fd4
diff --git a/metadata/md5-cache/media-tv/tvheadend-4.2.8-r1 b/metadata/md5-cache/media-tv/tvheadend-4.2.8-r1
index 157564205a8e..2993d917c30c 100644
--- a/metadata/md5-cache/media-tv/tvheadend-4.2.8-r1
+++ b/metadata/md5-cache/media-tv/tvheadend-4.2.8-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Tvheadend is a TV streaming server and digital video recorder
 EAPI=7
 HOMEPAGE=https://tvheadend.org/
 IUSE=+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun +imagecache +inotify iptv libressl satip systemd +timeshift uriparser xmltv zeroconf zlib kernel_linux
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-3
 RDEPEND=acct-user/tvheadend virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( media-libs/libdvbcsa ) dvben50221? ( media-tv/linuxtv-dvb-apps ) ffmpeg? ( media-video/ffmpeg:0= ) 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=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	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c419c456da9bddc5a2391bae8a4d7688
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a0c963bf032537ba4ca9359f623382f2
diff --git a/metadata/md5-cache/media-tv/tvheadend-9999 b/metadata/md5-cache/media-tv/tvheadend-9999
index 16bb6581a6dc..9a9bbea20558 100644
--- a/metadata/md5-cache/media-tv/tvheadend-9999
+++ b/metadata/md5-cache/media-tv/tvheadend-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=acct-user/tvheadend 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	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fbd6ce3e0ec9001765fc639b68b4b491
diff --git a/metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225 b/metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225
index 74696e39d06b..395888bb6195 100644
--- a/metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225
+++ b/metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=firmware? ( sys-firmware/tt-s2-6400-firmware ) kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://bitbucket.org/powARman/v4l-dvb-saa716x/get/3b9fce66666a.tar.gz -> v4l-dvb-saa716x-0.0.1_p20160322.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=915f45d7b9c652fc08ef845850d126a1
diff --git a/metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225-r2 b/metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225-r2
index 3776e2230724..86f89c900e7a 100644
--- a/metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225-r2
+++ b/metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=firmware? ( sys-firmware/tt-s2-6400-firmware ) kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://bitbucket.org/powARman/v4l-dvb-saa716x/get/3b9fce66666a.tar.gz -> v4l-dvb-saa716x-0.0.1_p20160322.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7173c670095ea3c41c3e215ce0d85c34
diff --git a/metadata/md5-cache/media-tv/xmltv-0.6.1 b/metadata/md5-cache/media-tv/xmltv-0.6.1
index 4b851ae18ba9..4da3a36ce5c7 100644
--- a/metadata/md5-cache/media-tv/xmltv-0.6.1
+++ b/metadata/md5-cache/media-tv/xmltv-0.6.1
@@ -5,10 +5,10 @@ DESCRIPTION=Set of utilities to manage TV listings stored in the XMLTV format
 EAPI=7
 HOMEPAGE=http://wiki.xmltv.org/index.php/XMLTVProject https://github.com/XMLTV/xmltv
 IUSE=ar ch-search dk dtvla eu-dotmedia eu-epgdata eu-xmltvse fi fi-sv fr huro il is it na-dd na-dtv na-tvmedia pt-meo pt-vodafone se-swedb se-tvzon tr tv-check tv-combiner tv-pick-cgi uk-bleb uk-tvguide zz-sdjson zz-sdjson-sqlite
-KEYWORDS=~amd64 ~x86 ~x86-linux
+KEYWORDS=~amd64 ~arm64 ~x86 ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-perl/Date-Manip dev-perl/File-Slurp dev-perl/JSON dev-perl/libwww-perl dev-perl/Lingua-Preferred dev-perl/PerlIO-gzip dev-perl/Term-ProgressBar dev-perl/TermReadKey dev-perl/XML-Parser dev-perl/XML-TreePP dev-perl/XML-Twig dev-perl/XML-Writer dev-perl/Unicode-String virtual/perl-Memoize virtual/perl-Storable virtual/perl-IO-Compress ar? ( dev-perl/DateTime dev-perl/HTML-Parser dev-perl/HTML-Tree dev-perl/HTTP-Cookies ) ch-search? ( dev-perl/HTML-Tree dev-perl/HTML-Parser dev-perl/HTTP-Cookies dev-perl/URI ) dk? ( dev-perl/DateTime dev-perl/IO-stringy ) dtvla? ( dev-perl/DateTime dev-perl/HTML-Parser dev-perl/HTML-Tree dev-perl/HTTP-Cookies ) eu-dotmedia? ( dev-perl/HTTP-Cache-Transparent dev-perl/IO-stringy ) eu-epgdata? ( dev-perl/Archive-Zip dev-perl/DateTime dev-perl/DateTime-Format-Strptime dev-perl/HTML-Parser dev-perl/HTTP-Message ) eu-xmltvse? ( dev-perl/HTTP-Cache-Transparent dev-perl/IO-stringy ) fi? ( dev-perl/HTML-Tree dev-perl/LWP-Protocol-https dev-perl/URI ) fi-sv? ( dev-perl/DateTime dev-perl/HTML-Tree dev-perl/IO-stringy ) fr? ( dev-perl/DateTime dev-perl/DateTime-TimeZone dev-perl/HTML-Parser dev-perl/HTML-Tree ) huro? ( dev-perl/HTML-Parser dev-perl/HTML-Tree ) il? ( dev-perl/DateTime ) is? ( dev-perl/HTML-Parser dev-perl/HTML-Tree dev-perl/URI dev-perl/XML-DOM dev-perl/XML-LibXSLT ) it? ( dev-perl/HTML-Parser dev-perl/HTML-Tree dev-perl/URI ) na-dd? ( dev-perl/SOAP-Lite ) na-dtv? ( dev-perl/DateTime dev-perl/HTTP-Cookies dev-perl/URI ) na-tvmedia? ( dev-perl/XML-LibXML ) pt-meo? ( dev-perl/DateTime dev-perl/XML-LibXML ) pt-vodafone? ( dev-perl/DateTime dev-perl/URI dev-perl/XML-LibXML ) se-swedb? ( dev-perl/HTTP-Cache-Transparent dev-perl/IO-stringy dev-perl/XML-LibXML ) se-tvzon? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent ) tr? ( dev-perl/DateTime dev-perl/HTTP-Cache-Transparent dev-perl/HTTP-Cookies dev-perl/URI ) uk-bleb? ( dev-perl/Archive-Zip dev-perl/IO-stringy ) uk-tvguide? ( dev-perl/DateTime dev-perl/HTML-Tree dev-perl/HTTP-Cache-Transparent dev-perl/HTTP-Cookies dev-perl/URI ) zz-sdjson? ( dev-lang/perl dev-perl/DateTime virtual/perl-Digest-SHA dev-perl/HTTP-Message dev-perl/LWP-Protocol-https dev-perl/Try-Tiny ) zz-sdjson-sqlite? ( dev-lang/perl dev-perl/DateTime dev-perl/DateTime-Format-ISO8601 dev-perl/DateTime-Format-SQLite dev-perl/DateTime-TimeZone dev-perl/DBD-SQLite dev-perl/DBI virtual/perl-Digest-SHA dev-perl/File-HomeDir dev-perl/File-Which dev-perl/List-MoreUtils dev-perl/LWP-UserAgent-Determined ) tv-check? ( dev-perl/Tk dev-perl/Tk-TableMatrix ) tv-combiner? ( dev-perl/XML-LibXML ) tv-pick-cgi? ( dev-perl/CGI ) dev-lang/perl:=
 SLOT=0
 SRC_URI=https://github.com/XMLTV/xmltv/archive/v0.6.1.tar.gz -> xmltv-0.6.1.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=0caa308d968c4e3e2009eac606a4e0c7
+_md5_=396bc11241ffa080298978cd53c27e30
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 223e7e1d4cda..94f548e29d9a 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/acidrip-0.14-r4 b/metadata/md5-cache/media-video/acidrip-0.14-r4
index 75339314c5da..5626666472c2 100644
--- a/metadata/md5-cache/media-video/acidrip-0.14-r4
+++ b/metadata/md5-cache/media-video/acidrip-0.14-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/Gtk2 media-video/lsdvd media-video/mplayer[encode] encode? ( >=media-sound/lame-3.92 ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://sourceforge.net/projects/acidrip/files/acidrip/0.14%20-%20Your%20two-wheeled%20knife/acidrip-0.14.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=99ca20cedca67baaa8c275e19daa3940
diff --git a/metadata/md5-cache/media-video/avidemux-2.7.4-r1 b/metadata/md5-cache/media-video/avidemux-2.7.4-r1
index d6847d5362e7..3858ad49da65 100644
--- a/metadata/md5-cache/media-video/avidemux-2.7.4-r1
+++ b/metadata/md5-cache/media-video/avidemux-2.7.4-r1
@@ -1,6 +1,6 @@
-BDEPEND=sys-devel/make dev-util/cmake
+BDEPEND=qt5? ( dev-qt/linguist-tools:5 ) sys-devel/make dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=~media-libs/avidemux-core-2.7.4:2.7[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?] nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) ) opengl? ( virtual/opengl:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) vaapi? ( x11-libs/libva:0= ) qt5? ( dev-qt/linguist-tools:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=~media-libs/avidemux-core-2.7.4:2.7[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?] nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) ) opengl? ( virtual/opengl:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) vaapi? ( x11-libs/libva:0= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Video editor designed for simple cutting, filtering and encoding tasks
 EAPI=7
 HOMEPAGE=http://fixounet.free.fr/avidemux
@@ -12,4 +12,4 @@ RDEPEND=~media-libs/avidemux-core-2.7.4:2.7[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?]
 SLOT=2.7
 SRC_URI=https://github.com/mean00/avidemux2/archive/2.7.4.tar.gz -> avidemux-2.7.4.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3d7977979c3ede31855b871f4ab58325
+_md5_=2f5c2a9cf9245579269c0b965878f976
diff --git a/metadata/md5-cache/media-video/clive-2.3.0.1 b/metadata/md5-cache/media-video/clive-2.3.0.1
index 3b0656ca2636..3f3886867d7a 100644
--- a/metadata/md5-cache/media-video/clive-2.3.0.1
+++ b/metadata/md5-cache/media-video/clive-2.3.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/BerkeleyDB-0.34 >=dev-perl/Config-Tiny-2.12 >=virtual/perl-Di
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/clive/2.3/clive-2.3.0.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8aeee870341f23058d24e292645f078d
diff --git a/metadata/md5-cache/media-video/dvdrip-0.98.11-r4 b/metadata/md5-cache/media-video/dvdrip-0.98.11-r4
index 668dfc572a7d..f65ec69db99b 100644
--- a/metadata/md5-cache/media-video/dvdrip-0.98.11-r4
+++ b/metadata/md5-cache/media-video/dvdrip-0.98.11-r4
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Event-ExecFlow-0.64 >=dev-perl/Event-RPC-0.89 dev-perl/Gtk2 >=dev-perl/gtk2-ex-formfactory-0.65 >=dev-perl/libintl-perl-1.16 >=media-video/transcode-1.1.0[dvd,jpeg,mp3,ogg,vorbis] virtual/imagemagick-tools >=virtual/perl-podlators-2.5.3 x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2 ffmpeg? ( media-video/ffmpeg:0 ) fping? ( >=net-analyzer/fping-2.2 ) mplayer? ( media-video/mplayer ) ogg? ( media-sound/ogmtools ) subtitles? ( media-video/subtitleripper ) vcd? ( media-video/transcode[mjpeg] >=media-video/mjpegtools-1.6.0 ) vorbis? ( media-sound/vorbis-tools ) xine? ( media-video/xine-ui ) xvid? ( media-video/xvid4conf ) >=media-video/lsdvd-0.15 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://www.exit1.org/dvdrip/dist/dvdrip-0.98.11.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=07698aa07c5f754948afa62bea918e56
diff --git a/metadata/md5-cache/media-video/handbrake-1.2.2-r3 b/metadata/md5-cache/media-video/handbrake-1.2.2-r3
deleted file mode 100644
index 00d8a50baf2b..000000000000
--- a/metadata/md5-cache/media-video/handbrake-1.2.2-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=app-arch/xz-utils media-libs/speex dev-libs/jansson media-libs/a52dec media-libs/libass:= >=media-libs/libbluray-1.0 media-libs/libdvdnav media-libs/libdvdread media-libs/libsamplerate media-libs/libtheora media-libs/libvorbis media-libs/libvpx nvenc? ( media-libs/nv-codec-headers ) media-libs/opus media-libs/x264:= media-sound/lame sys-libs/zlib >=media-video/ffmpeg-4.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 ) 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-2.9:0= ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/yasm dev-util/intltool sys-devel/automake >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Open-source, GPL-licensed, multiplatform, multithreaded video transcoder
-EAPI=6
-HOMEPAGE=http://handbrake.fr/
-IUSE=+fdk gstreamer gtk libav-aac nvenc x265
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-arch/xz-utils media-libs/speex dev-libs/jansson media-libs/a52dec media-libs/libass:= >=media-libs/libbluray-1.0 media-libs/libdvdnav media-libs/libdvdread media-libs/libsamplerate media-libs/libtheora media-libs/libvorbis media-libs/libvpx nvenc? ( media-libs/nv-codec-headers ) media-libs/opus media-libs/x264:= media-sound/lame sys-libs/zlib >=media-video/ffmpeg-4.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 ) 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-2.9:0= )
-REQUIRED_USE=^^ ( fdk libav-aac )
-SLOT=0
-SRC_URI=https://download2.handbrake.fr/1.2.2/HandBrake-1.2.2-source.tar.bz2 -> handbrake-1.2.2.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=74dd8d5888063b26a10b8944fea2288d
diff --git a/metadata/md5-cache/media-video/handbrake-1.3.0-r2 b/metadata/md5-cache/media-video/handbrake-1.3.0-r2
deleted file mode 100644
index ba689d656da3..000000000000
--- a/metadata/md5-cache/media-video/handbrake-1.3.0-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=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 >=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.8 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/
-IUSE=+fdk gstreamer gtk libav-aac numa nvenc x265
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=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 >=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?] )
-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	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9afb8f8ae6848f93848ce83be33430e7
diff --git a/metadata/md5-cache/media-video/handbrake-1.3.2 b/metadata/md5-cache/media-video/handbrake-1.3.2
deleted file mode 100644
index eafb5fac9df7..000000000000
--- a/metadata/md5-cache/media-video/handbrake-1.3.2
+++ /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 postinst postrm 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 >=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.8 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/
-IUSE=+fdk gstreamer gtk libav-aac numa nvenc x265
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=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 >=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?] )
-REQUIRED_USE=^^ ( fdk libav-aac )
-SLOT=0
-SRC_URI=https://github.com/HandBrake/HandBrake/releases/download/1.3.2/HandBrake-1.3.2-source.tar.bz2 -> handbrake-1.3.2.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ea7ea6aaa3f4e65568ffbcb66da6cb49
diff --git a/metadata/md5-cache/media-video/handbrake-1.3.3 b/metadata/md5-cache/media-video/handbrake-1.3.3
new file mode 100644
index 000000000000..131ae2bcf451
--- /dev/null
+++ b/metadata/md5-cache/media-video/handbrake-1.3.3
@@ -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 postinst postrm 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 >=media-video/ffmpeg-4.2.1:0=[postproc,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.8 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/
+IUSE=+fdk gstreamer gtk libav-aac numa nvenc x265
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=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 >=media-video/ffmpeg-4.2.1:0=[postproc,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?] )
+REQUIRED_USE=^^ ( fdk libav-aac )
+SLOT=0
+SRC_URI=https://github.com/HandBrake/HandBrake/releases/download/1.3.3/HandBrake-1.3.3-source.tar.bz2 -> handbrake-1.3.3.tar.bz2
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=38c084d8e8d8e5f337c110a79dcd9d18
diff --git a/metadata/md5-cache/media-video/makemkv-1.15.1 b/metadata/md5-cache/media-video/makemkv-1.15.1
index 59881d41e93e..c8eecbe77e3b 100644
--- a/metadata/md5-cache/media-video/makemkv-1.15.1
+++ b/metadata/md5-cache/media-video/makemkv-1.15.1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/glibc dev-libs/expat sys-libs/zlib gui? ( dev-qt/qtcore:5 dev-q
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=http://www.makemkv.com/download/makemkv-oss-1.15.1.tar.gz http://www.makemkv.com/download/makemkv-bin-1.15.1.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ffc9d7d4d3e83ca3460a1c97c348820d
diff --git a/metadata/md5-cache/media-video/pipewire-0.2.7 b/metadata/md5-cache/media-video/pipewire-0.2.7
index 3ca9e3c5b2aa..a537033cb51b 100644
--- a/metadata/md5-cache/media-video/pipewire-0.2.7
+++ b/metadata/md5-cache/media-video/pipewire-0.2.7
@@ -11,4 +11,4 @@ RDEPEND=media-libs/alsa-lib sys-apps/dbus virtual/libudev bluetooth? ( media-lib
 SLOT=0/0.2
 SRC_URI=https://github.com/PipeWire/pipewire/archive/0.2.7.tar.gz -> pipewire-0.2.7.tar.gz
 _eclasses_=meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a17c9a5af7408e3a5fb0c29628d5e54f
+_md5_=aaa9f5c047bf16a22518b8e817439d03
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.6 b/metadata/md5-cache/media-video/pipewire-0.3.6
new file mode 100644
index 000000000000..7bcffd88dcf7
--- /dev/null
+++ b/metadata/md5-cache/media-video/pipewire-0.3.6
@@ -0,0 +1,15 @@
+BDEPEND=app-doc/xmltoman doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=media-libs/alsa-lib media-libs/libsdl2 media-libs/libsndfile sys-apps/dbus virtual/libudev bluetooth? ( media-libs/sbc net-wireless/bluez:= ) ffmpeg? ( media-video/ffmpeg:= ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jack? ( >=media-sound/jack2-1.9.10:2 ) pulseaudio? ( dev-libs/glib:2 media-sound/pulseaudio ) systemd? ( sys-apps/systemd ) vulkan? ( media-libs/vulkan-loader ) X? ( x11-libs/libX11 ) vulkan? ( dev-util/vulkan-headers )
+DESCRIPTION=Multimedia processing graphs
+EAPI=7
+HOMEPAGE=https://pipewire.org/
+IUSE=+alsa bluetooth debug doc ffmpeg gstreamer jack pulseaudio systemd test vulkan X
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=media-libs/alsa-lib media-libs/libsdl2 media-libs/libsndfile sys-apps/dbus virtual/libudev bluetooth? ( media-libs/sbc net-wireless/bluez:= ) ffmpeg? ( media-video/ffmpeg:= ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jack? ( >=media-sound/jack2-1.9.10:2 ) pulseaudio? ( dev-libs/glib:2 media-sound/pulseaudio ) systemd? ( sys-apps/systemd ) vulkan? ( media-libs/vulkan-loader ) X? ( x11-libs/libX11 )
+RESTRICT=!test? ( test )
+SLOT=0/0.3
+SRC_URI=https://github.com/PipeWire/pipewire/archive/0.3.6.tar.gz -> pipewire-0.3.6.tar.gz
+_eclasses_=meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c2d0ffe13bf8f1130ea42d2d02ec33d9
diff --git a/metadata/md5-cache/media-video/qmplay2-20.05.02 b/metadata/md5-cache/media-video/qmplay2-20.05.02
index 88979b34c026..6c37a6dd6774 100644
--- a/metadata/md5-cache/media-video/qmplay2-20.05.02
+++ b/metadata/md5-cache/media-video/qmplay2-20.05.02
@@ -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 test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) dbus? ( dev-qt/qtdbus:5 ) extensions? ( dev-qt/qtdeclarative:5 media-libs/taglib ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplayfp ) shaders? ( media-libs/shaderc ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] x11-libs/libva[drm,opengl] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
+DEPEND=dev-qt/qtcore:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) dbus? ( dev-qt/qtdbus:5 ) extensions? ( dev-qt/qtdeclarative:5 media-libs/taglib ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] x11-libs/libva[drm,opengl] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
 DESCRIPTION=A Qt-based video player, which can play most formats and codecs
 EAPI=7
 HOMEPAGE=https://github.com/zaps166/QMPlay2
 IUSE=avdevice +audiofilters +alsa cdio cuvid dbus extensions gme inputs libass modplug notifications opengl portaudio pulseaudio sid shaders vaapi vdpau +videofilters visualizations vulkan xv
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) dbus? ( dev-qt/qtdbus:5 ) extensions? ( dev-qt/qtdeclarative:5 media-libs/taglib ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplayfp ) shaders? ( media-libs/shaderc ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] x11-libs/libva[drm,opengl] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) dbus? ( dev-qt/qtdbus:5 ) extensions? ( dev-qt/qtdeclarative:5 media-libs/taglib ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] x11-libs/libva[drm,opengl] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
 REQUIRED_USE=audiofilters? ( || ( alsa portaudio pulseaudio ) ) extensions? ( dbus ) shaders? ( vulkan )
 SLOT=0
 SRC_URI=https://github.com/zaps166/QMPlay2/releases/download/20.05.02/QMPlay2-src-20.05.02.tar.xz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=71a616499c116bc61f3b5777c61dbb73
+_md5_=2ec19770039584e0595d0c24248a6428
diff --git a/metadata/md5-cache/media-video/qmplay2-9999 b/metadata/md5-cache/media-video/qmplay2-9999
index b72f50f4ee54..66e08365a29f 100644
--- a/metadata/md5-cache/media-video/qmplay2-9999
+++ b/metadata/md5-cache/media-video/qmplay2-9999
@@ -1,14 +1,14 @@
 BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) dbus? ( dev-qt/qtdbus:5 ) extensions? ( dev-qt/qtdeclarative:5 media-libs/taglib ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplayfp ) shaders? ( media-libs/shaderc ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] x11-libs/libva[drm,opengl] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
+DEPEND=dev-qt/qtcore:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) dbus? ( dev-qt/qtdbus:5 ) extensions? ( dev-qt/qtdeclarative:5 media-libs/taglib ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] x11-libs/libva[drm,opengl] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
 DESCRIPTION=A Qt-based video player, which can play most formats and codecs
 EAPI=7
 HOMEPAGE=https://github.com/zaps166/QMPlay2
 IUSE=avdevice +audiofilters +alsa cdio cuvid dbus extensions gme inputs libass modplug notifications opengl portaudio pulseaudio sid shaders vaapi vdpau +videofilters visualizations vulkan xv
 LICENSE=LGPL-3
 PROPERTIES=live
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) dbus? ( dev-qt/qtdbus:5 ) extensions? ( dev-qt/qtdeclarative:5 media-libs/taglib ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplayfp ) shaders? ( media-libs/shaderc ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] x11-libs/libva[drm,opengl] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) dbus? ( dev-qt/qtdbus:5 ) extensions? ( dev-qt/qtdeclarative:5 media-libs/taglib ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] x11-libs/libva[drm,opengl] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
 REQUIRED_USE=audiofilters? ( || ( alsa portaudio pulseaudio ) ) extensions? ( dbus ) shaders? ( vulkan )
 SLOT=0
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=71a616499c116bc61f3b5777c61dbb73
+_md5_=2ec19770039584e0595d0c24248a6428
diff --git a/metadata/md5-cache/media-video/rtmpdump-2.4_p20161210-r3 b/metadata/md5-cache/media-video/rtmpdump-2.4_p20161210-r3
index 32e276e5536f..fe74dcca7c78 100644
--- a/metadata/md5-cache/media-video/rtmpdump-2.4_p20161210-r3
+++ b/metadata/md5-cache/media-video/rtmpdump-2.4_p20161210-r3
@@ -10,4 +10,4 @@ RDEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~hwoarang/distfiles/rtmpdump-2.4_p20161210.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4a7add938740bc3046ec89c446f18ae9
+_md5_=0d4ed684844e219bcdb06cb2693f5c3f
diff --git a/metadata/md5-cache/media-video/rtmpdump-9999 b/metadata/md5-cache/media-video/rtmpdump-9999
index ca76ed344ee8..2c4d407ec6fc 100644
--- a/metadata/md5-cache/media-video/rtmpdump-9999
+++ b/metadata/md5-cache/media-video/rtmpdump-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,nettle(+)] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnutls? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] )
 SLOT=0
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=85a0c72e84b4b3bb1101eaa6b8b5dba9
+_md5_=c2684e6cea2f5fdf5d006e979eb6ccd0
diff --git a/metadata/md5-cache/media-video/smtube-19.6.0 b/metadata/md5-cache/media-video/smtube-19.6.0
deleted file mode 100644
index d39a7ab04e87..000000000000
--- a/metadata/md5-cache/media-video/smtube-19.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5
-DEFINED_PHASES=compile install
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtscript:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5
-DESCRIPTION=YouTube Browser for SMPlayer
-EAPI=7
-HOMEPAGE=http://smplayer.sourceforge.net/smtube
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtscript:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 || ( media-video/smplayer media-video/mpv media-video/mplayer media-video/vlc media-video/totem )
-SLOT=0
-SRC_URI=mirror://sourceforge/smtube/smtube-19.6.0.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b75a8c3db173b5df10b63c7d526b64a2
diff --git a/metadata/md5-cache/media-video/smtube-20.1.0 b/metadata/md5-cache/media-video/smtube-20.1.0
index e68fcabe378c..695abfe3808a 100644
--- a/metadata/md5-cache/media-video/smtube-20.1.0
+++ b/metadata/md5-cache/media-video/smtube-20.1.0
@@ -4,10 +4,10 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtscript:5
 DESCRIPTION=YouTube Browser for SMPlayer
 EAPI=7
 HOMEPAGE=http://smplayer.sourceforge.net/smtube
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtscript:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 || ( media-video/smplayer media-video/mpv media-video/mplayer media-video/vlc media-video/totem )
 SLOT=0
 SRC_URI=mirror://sourceforge/smtube/smtube-20.1.0.tar.bz2
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d067a1aac81b2143c4be80c029a332dd
+_md5_=1adb38d742f305c9fcb5448858a3a2f3
diff --git a/metadata/md5-cache/media-video/sonic-snap-1.7-r1 b/metadata/md5-cache/media-video/sonic-snap-1.7-r1
index 666b77cf3e9a..170f2dbddd7e 100644
--- a/metadata/md5-cache/media-video/sonic-snap-1.7-r1
+++ b/metadata/md5-cache/media-video/sonic-snap-1.7-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-1
 RDEPEND=x11-libs/fltk:1 mpeg? ( >=media-libs/libfame-0.9.1 ) sys-libs/zlib x11-libs/libXdmcp x11-libs/libXau x11-libs/libXrender x11-libs/libX11 x11-libs/libXext x11-libs/libXft
 SLOT=0
 SRC_URI=http://www.stolk.org/sonic-snap/downloads/sonic-snap-1.7.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8657c1e2323e7b6b1c656801d04c5868
diff --git a/metadata/md5-cache/media-video/v4l2loopback-0.12.0 b/metadata/md5-cache/media-video/v4l2loopback-0.12.0
index 12d37b6c7e47..2adb970fa6ec 100644
--- a/metadata/md5-cache/media-video/v4l2loopback-0.12.0
+++ b/metadata/md5-cache/media-video/v4l2loopback-0.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/umlaeute/v4l2loopback/tarball/v0.12.0 -> v4l2loopback-0.12.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=53ba7d0f25a2986f2ef77bc8ffc3e8b9
diff --git a/metadata/md5-cache/media-video/v4l2loopback-0.12.1.1_pre b/metadata/md5-cache/media-video/v4l2loopback-0.12.1.1_pre
index d8baab98c486..eb3f7e5f8f46 100644
--- a/metadata/md5-cache/media-video/v4l2loopback-0.12.1.1_pre
+++ b/metadata/md5-cache/media-video/v4l2loopback-0.12.1.1_pre
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/umlaeute/v4l2loopback/archive/0b8feb80fdef9a415d8250bca1790b3ff23e8391.tar.gz -> v4l2loopback-0.12.1.1_pre.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=f97643d02f050fcf9dcfd0307c0780f4
diff --git a/metadata/md5-cache/media-video/v4l2loopback-0.12.5 b/metadata/md5-cache/media-video/v4l2loopback-0.12.5
index f54f5e76834e..cdca724daa85 100644
--- a/metadata/md5-cache/media-video/v4l2loopback-0.12.5
+++ b/metadata/md5-cache/media-video/v4l2loopback-0.12.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/umlaeute/v4l2loopback/tarball/v0.12.5 -> v4l2loopback-0.12.5.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=f81cfe4031d19815800f7cfa31e6eebf
diff --git a/metadata/md5-cache/media-video/v4l2loopback-9999 b/metadata/md5-cache/media-video/v4l2loopback-9999
index 5d3f6fd37914..4d70f3c4f48a 100644
--- a/metadata/md5-cache/media-video/v4l2loopback-9999
+++ b/metadata/md5-cache/media-video/v4l2loopback-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f81cfe4031d19815800f7cfa31e6eebf
diff --git a/metadata/md5-cache/media-video/vdrtools-genindex-0.1.3-r2 b/metadata/md5-cache/media-video/vdrtools-genindex-0.1.3-r2
index 9ce97f4923f5..3f9d6aa5a215 100644
--- a/metadata/md5-cache/media-video/vdrtools-genindex-0.1.3-r2
+++ b/metadata/md5-cache/media-video/vdrtools-genindex-0.1.3-r2
@@ -2,8 +2,8 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=VDR: genindex Script
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=http://www.muempf.de/down/genindex-0.1.3.tar.gz
-_md5_=6cdab9d1b11662436d2a0e6211a6bbf0
+_md5_=47ad2cca78d8ba8d448dbf1c57abdca8
diff --git a/metadata/md5-cache/media-video/yle-dl-20200618 b/metadata/md5-cache/media-video/yle-dl-20200618
deleted file mode 100644
index 724629e20ceb..000000000000
--- a/metadata/md5-cache/media-video/yle-dl-20200618
+++ /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 ) 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(-)] 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(-)] media-video/ffmpeg net-misc/wget >=dev-python/attrs-18.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/configargparse-0.13.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/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(-)] 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/mini-amf[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/progress[python_targets_python3_6(-)?,python_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[python_targets_python3_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-42.0.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 postinst prepare test
-DEPEND=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(-)] media-video/ffmpeg net-misc/wget >=dev-python/attrs-18.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/configargparse-0.13.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/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(-)] 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/mini-amf[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/progress[python_targets_python3_6(-)?,python_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[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] media-video/ffmpeg[gnutls] 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=Download media files from Yle Areena
-EAPI=7
-HOMEPAGE=https://aajanki.github.io/yle-dl/ https://github.com/aajanki/yle-dl
-IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-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(-)] media-video/ffmpeg net-misc/wget >=dev-python/attrs-18.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/configargparse-0.13.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/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(-)] 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/mini-amf[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/progress[python_targets_python3_6(-)?,python_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[python_targets_python3_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-42.0.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 ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aajanki/yle-dl/archive/20200618.tar.gz -> yle-dl-20200618.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=560adb1978944f889b75ef5d13116508
diff --git a/metadata/md5-cache/media-video/yle-dl-20200628 b/metadata/md5-cache/media-video/yle-dl-20200628
new file mode 100644
index 000000000000..6035c72845eb
--- /dev/null
+++ b/metadata/md5-cache/media-video/yle-dl-20200628
@@ -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(-)] 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(-)] media-video/ffmpeg net-misc/wget >=dev-python/attrs-18.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/configargparse-0.13.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/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(-)] 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/mini-amf[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/progress[python_targets_python3_6(-)?,python_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[python_targets_python3_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-42.0.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 postinst prepare test
+DEPEND=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(-)] media-video/ffmpeg net-misc/wget >=dev-python/attrs-18.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/configargparse-0.13.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/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(-)] 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/mini-amf[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/progress[python_targets_python3_6(-)?,python_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[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] media-video/ffmpeg[gnutls] 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=Download media files from Yle Areena
+EAPI=7
+HOMEPAGE=https://aajanki.github.io/yle-dl/ https://github.com/aajanki/yle-dl
+IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+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(-)] media-video/ffmpeg net-misc/wget >=dev-python/attrs-18.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/configargparse-0.13.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/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(-)] 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/mini-amf[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/progress[python_targets_python3_6(-)?,python_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[python_targets_python3_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-42.0.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 ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aajanki/yle-dl/archive/20200628.tar.gz -> yle-dl-20200628.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=efd10e6c9293a627eebea941a03af0ba
diff --git a/metadata/md5-cache/net-analyzer/2ping-4.2 b/metadata/md5-cache/net-analyzer/2ping-4.2
deleted file mode 100644
index fde9196ae259..000000000000
--- a/metadata/md5-cache/net-analyzer/2ping-4.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare 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-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=A bi-directional ping utility
-EAPI=6
-HOMEPAGE=https://www.finnie.org/software/2ping/
-IUSE=server python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
-LICENSE=GPL-2+
-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://www.finnie.org/software/2ping/2ping-4.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	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
deleted file mode 100644
index 994ec5208e95..000000000000
--- a/metadata/md5-cache/net-analyzer/2ping-4.3
+++ /dev/null
@@ -1,14 +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-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A bi-directional ping utility
-EAPI=7
-HOMEPAGE=https://www.finnie.org/software/2ping/
-IUSE=server python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
-LICENSE=GPL-2+
-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://www.finnie.org/software/2ping/2ping-4.3.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1fab3a06bac8188cba296d7b8fdba90f
diff --git a/metadata/md5-cache/net-analyzer/2ping-4.5 b/metadata/md5-cache/net-analyzer/2ping-4.5
new file mode 100644
index 000000000000..485633cf6191
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/2ping-4.5
@@ -0,0 +1,14 @@
+BDEPEND=python_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_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A bi-directional ping utility
+EAPI=7
+HOMEPAGE=https://www.finnie.org/software/2ping/
+IUSE=server python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_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_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://www.finnie.org/software/2ping/2ping-4.5.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c3118f260815de86a4ad96fe2c20c348
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 203d721157c1..f3ff15c2c075 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/arpwatch-2.1.15-r11 b/metadata/md5-cache/net-analyzer/arpwatch-2.1.15-r11
index 667bd697e473..805b5f240dd6 100644
--- a/metadata/md5-cache/net-analyzer/arpwatch-2.1.15-r11
+++ b/metadata/md5-cache/net-analyzer/arpwatch-2.1.15-r11
@@ -8,6 +8,6 @@ KEYWORDS=amd64 hppa ppc sparc x86
 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
+SRC_URI=https://ee.lbl.gov/downloads/arpwatch/arpwatch-2.1a15.tar.gz https://dev.gentoo.org/~jer/arpwatch-patchset-0.8.tar.xz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=43355ea774e2a83b34689f4e15ce1cc9
+_md5_=839c53d7c0515a093a18e0797bb53709
diff --git a/metadata/md5-cache/net-analyzer/arpwatch-3.1 b/metadata/md5-cache/net-analyzer/arpwatch-3.1
new file mode 100644
index 000000000000..4aad3e8ff9d3
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/arpwatch-3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst setup
+DEPEND=net-libs/libpcap sys-libs/ncurses:*
+DESCRIPTION=An ethernet monitor program that keeps track of ethernet/IP address pairings
+EAPI=7
+HOMEPAGE=https://ee.lbl.gov/
+IUSE=selinux
+KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86
+LICENSE=BSD GPL-2
+RDEPEND=net-libs/libpcap sys-libs/ncurses:* selinux? ( sec-policy/selinux-arpwatch ) virtual/mta
+SLOT=0
+SRC_URI=https://ee.lbl.gov/downloads/arpwatch/arpwatch-3.1.tar.gz https://dev.gentoo.org/~jer/ethercodes.dat-20200628.xz
+_eclasses_=user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=86823fdf557beb9e2fb40fa5caa0a85c
diff --git a/metadata/md5-cache/net-analyzer/bmon-4.0 b/metadata/md5-cache/net-analyzer/bmon-4.0
index bb39296ca03c..21b8e0371e4d 100644
--- a/metadata/md5-cache/net-analyzer/bmon-4.0
+++ b/metadata/md5-cache/net-analyzer/bmon-4.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2 MIT
 RDEPEND=>=sys-libs/ncurses-5.3-r2:0= dev-libs/confuse:= dev-libs/libnl:3
 SLOT=0
 SRC_URI=https://codeload.github.com/tgraf/bmon/tar.gz/v4.0 -> bmon-4.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=24b7e79160794d43fd80c1d60372ba80
diff --git a/metadata/md5-cache/net-analyzer/bmon-999 b/metadata/md5-cache/net-analyzer/bmon-999
index 55b1797a352a..8244f8b4e104 100644
--- a/metadata/md5-cache/net-analyzer/bmon-999
+++ b/metadata/md5-cache/net-analyzer/bmon-999
@@ -9,5 +9,5 @@ LICENSE=BSD-2 MIT
 PROPERTIES=live
 RDEPEND=>=sys-libs/ncurses-5.3-r2:0= dev-libs/confuse:= dev-libs/libnl:3
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fd8f1b853623f600722d17e6078cbbed
diff --git a/metadata/md5-cache/net-analyzer/etherape-0.9.19 b/metadata/md5-cache/net-analyzer/etherape-0.9.19
index b4c764f7f7aa..b6a564c010d0 100644
--- a/metadata/md5-cache/net-analyzer/etherape-0.9.19
+++ b/metadata/md5-cache/net-analyzer/etherape-0.9.19
@@ -3,9 +3,9 @@ DEPEND=dev-libs/glib:2 dev-libs/popt net-libs/libpcap x11-libs/goocanvas:2.0 >=s
 DESCRIPTION=A graphical network monitor for Unix modeled after etherman
 EAPI=7
 HOMEPAGE=https://etherape.sourceforge.io/
-KEYWORDS=~amd64 ~ppc ~ppc64 sparc ~x86
+KEYWORDS=amd64 ppc ppc64 sparc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/popt net-libs/libpcap x11-libs/goocanvas:2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/etherape/etherape-0.9.19.tar.gz
-_md5_=4f3d8623e5b0f1ebf2b373d85dd89873
+_md5_=c115db4c1c8a70e5307e68c80b5da673
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.59 b/metadata/md5-cache/net-analyzer/munin-2.0.59
index 65db29277e22..cd26fb2e4d05 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.0.59
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.59
@@ -5,7 +5,7 @@ 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 ~arm64 ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ppc ~ppc64 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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/munin-monitoring/munin/archive/2.0.59.tar.gz -> munin-2.0.59.tar.gz https://dev.gentoo.org/~graaff/munin/munin-2.0.59-gentoo-1.tar.xz
 _eclasses_=java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c4a28c5f59439117a6e62443f0692c4a
+_md5_=0842ad3ecb5c089210cd99942eb02e59
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.21.1-r1 b/metadata/md5-cache/net-analyzer/netdata-1.21.1-r1
index a8d7e2b3fe16..bc325cdb27c3 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.21.1-r1
+++ b/metadata/md5-cache/net-analyzer/netdata-1.21.1-r1
@@ -11,5 +11,5 @@ RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 |
 REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) tor? ( python )
 SLOT=0
 SRC_URI=https://github.com/netdata/netdata/archive/v1.21.1.tar.gz -> netdata-1.21.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	fcaps	da689a8e04bbbb3518888ff668fee45b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	fcaps	da689a8e04bbbb3518888ff668fee45b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ccd96a5bc8519fc9572b1d389490639b
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.22.0-r1 b/metadata/md5-cache/net-analyzer/netdata-1.22.0-r1
index 01d5ce954368..a1e737535621 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.22.0-r1
+++ b/metadata/md5-cache/net-analyzer/netdata-1.22.0-r1
@@ -11,5 +11,5 @@ RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 |
 REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) tor? ( python )
 SLOT=0
 SRC_URI=https://github.com/netdata/netdata/archive/v1.22.0.tar.gz -> netdata-1.22.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	fcaps	da689a8e04bbbb3518888ff668fee45b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	fcaps	da689a8e04bbbb3518888ff668fee45b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=070261960b3840458460e4d2cd23c73c
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.22.1-r1 b/metadata/md5-cache/net-analyzer/netdata-1.22.1-r1
index 815d831191e6..6b976c896f97 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.22.1-r1
+++ b/metadata/md5-cache/net-analyzer/netdata-1.22.1-r1
@@ -11,5 +11,5 @@ RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 |
 REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) tor? ( python )
 SLOT=0
 SRC_URI=https://github.com/netdata/netdata/archive/v1.22.1.tar.gz -> netdata-1.22.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	fcaps	da689a8e04bbbb3518888ff668fee45b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	fcaps	da689a8e04bbbb3518888ff668fee45b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=87d2dca0438a500f229045bb6ff05f52
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.23.0 b/metadata/md5-cache/net-analyzer/netdata-1.23.0
new file mode 100644
index 000000000000..31d008bf8c78
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/netdata-1.23.0
@@ -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 filecaps? ( sys-libs/libcap ) virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) 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/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(-)] ) mysql? ( || ( python_single_target_python3_6? ( dev-python/mysqlclient[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mysqlclient[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-python/mysql-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mysql-python[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mysql-python[python_targets_python3_8(-)] ) ) ) postgres? ( python_single_target_python3_6? ( dev-python/psycopg:2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/psycopg:2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) ) tor? ( python_single_target_python3_6? ( net-libs/stem[python_targets_python3_6(-)] ) python_single_target_python3_7? ( net-libs/stem[python_targets_python3_7(-)] ) python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
+DESCRIPTION=Linux real time system monitoring, done right!
+EAPI=7
+HOMEPAGE=https://github.com/netdata/netdata https://my-netdata.io/
+IUSE=caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ MIT BSD
+RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) 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/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(-)] ) mysql? ( || ( python_single_target_python3_6? ( dev-python/mysqlclient[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mysqlclient[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-python/mysql-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mysql-python[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mysql-python[python_targets_python3_8(-)] ) ) ) postgres? ( python_single_target_python3_6? ( dev-python/psycopg:2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/psycopg:2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) ) tor? ( python_single_target_python3_6? ( net-libs/stem[python_targets_python3_6(-)] ) python_single_target_python3_7? ( net-libs/stem[python_targets_python3_7(-)] ) python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) filecaps? ( sys-libs/libcap )
+REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) tor? ( python )
+SLOT=0
+SRC_URI=https://github.com/netdata/netdata/archive/v1.23.0.tar.gz -> netdata-1.23.0.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	fcaps	da689a8e04bbbb3518888ff668fee45b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=87d2dca0438a500f229045bb6ff05f52
diff --git a/metadata/md5-cache/net-analyzer/netdata-9999 b/metadata/md5-cache/net-analyzer/netdata-9999
index ab9926562dd4..2130aaab29cd 100644
--- a/metadata/md5-cache/net-analyzer/netdata-9999
+++ b/metadata/md5-cache/net-analyzer/netdata-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) 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/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(-)] ) mysql? ( || ( python_single_target_python3_6? ( dev-python/mysqlclient[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mysqlclient[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-python/mysql-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mysql-python[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mysql-python[python_targets_python3_8(-)] ) ) ) postgres? ( python_single_target_python3_6? ( dev-python/psycopg:2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/psycopg:2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) ) tor? ( python_single_target_python3_6? ( net-libs/stem[python_targets_python3_6(-)] ) python_single_target_python3_7? ( net-libs/stem[python_targets_python3_7(-)] ) python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) filecaps? ( sys-libs/libcap )
 REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) tor? ( python )
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	fcaps	da689a8e04bbbb3518888ff668fee45b	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	fcaps	da689a8e04bbbb3518888ff668fee45b	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=87d2dca0438a500f229045bb6ff05f52
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 cdf8546664b5..c807ee40475d 100644
--- a/metadata/md5-cache/net-analyzer/nsca-2.7.2-r103
+++ b/metadata/md5-cache/net-analyzer/nsca-2.7.2-r103
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst setup
 DEPEND=crypt? ( >=dev-libs/libmcrypt-2.5.1-r4 ) !minimal? ( tcpd? ( sys-apps/tcp-wrappers ) )
 DESCRIPTION=Nagios Service Check Acceptor
 EAPI=4
-HOMEPAGE=http://www.nagios.org/
+HOMEPAGE=https://www.nagios.org/
 IUSE=tcpd +crypt minimal
 KEYWORDS=~alpha amd64 ~arm ppc ppc64 sparc x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=crypt? ( >=dev-libs/libmcrypt-2.5.1-r4 ) !minimal? ( tcpd? ( sys-apps/tc
 SLOT=0
 SRC_URI=mirror://sourceforge/nagios/nsca-2.7.2.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=88af9fb723bbc4fee8271db8ef3a5514
+_md5_=f15f918a15bf91141c13f00b24468b61
diff --git a/metadata/md5-cache/net-analyzer/pbnj-2.04 b/metadata/md5-cache/net-analyzer/pbnj-2.04
index 24aa45c2c80c..75bf3073062f 100644
--- a/metadata/md5-cache/net-analyzer/pbnj-2.04
+++ b/metadata/md5-cache/net-analyzer/pbnj-2.04
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/DBD-SQLite dev-perl/DBI dev-perl/File-HomeDir dev-perl/File-Which dev-perl/Nmap-Parser dev-perl/Text-CSV_XS dev-perl/XML-Twig dev-perl/YAML net-analyzer/nmap dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/pbnj/pbnj-2.04.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6c58b929788343994f011dffaf03f75b
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 de4d959f721b..f297ab0257fc 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.6.0-r1
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.6.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[sta
 REQUIRED_USE=python? ( ^^ ( python_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	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2d96fd486dc2d975d964de890adb272a
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2 b/metadata/md5-cache/net-analyzer/rrdtool-1.7.2
index 599ef99b8726..911a876acfc6 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.7.2
@@ -4,7 +4,7 @@ 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_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 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_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] ) ) rados? ( sys-cluster/ceph ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers )
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_
 SLOT=0/8.0.0
 SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.2.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d6b0850bdb0d431519403822fe72a8ae
+_md5_=76f7451557bf068fa7780625e5d62adc
diff --git a/metadata/md5-cache/net-analyzer/suricata-5.0.3 b/metadata/md5-cache/net-analyzer/suricata-5.0.3
index aa47a01b7316..8d63ec8ca505 100644
--- a/metadata/md5-cache/net-analyzer/suricata-5.0.3
+++ b/metadata/md5-cache/net-analyzer/suricata-5.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.openinfosecfoundation.org/download/suricata-5.0.3.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b572c2c6b2c6b63108356e6dcd442f6f
diff --git a/metadata/md5-cache/net-analyzer/symon-2.87 b/metadata/md5-cache/net-analyzer/symon-2.87
index 26e82eee518f..e8cd8b23bb70 100644
--- a/metadata/md5-cache/net-analyzer/symon-2.87
+++ b/metadata/md5-cache/net-analyzer/symon-2.87
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=perl? ( dev-lang/perl ) symux? ( net-analyzer/rrdtool ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://wpd.home.xs4all.nl/symon/philes/symon-2.87.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dae5e1a7fad52e807d9dbe088f4f5407
diff --git a/metadata/md5-cache/net-analyzer/testssl-3.0.2 b/metadata/md5-cache/net-analyzer/testssl-3.0.2
index 6a7954bd1f0b..6d33f8625bbe 100644
--- a/metadata/md5-cache/net-analyzer/testssl-3.0.2
+++ b/metadata/md5-cache/net-analyzer/testssl-3.0.2
@@ -3,9 +3,9 @@ DESCRIPTION=Tool to check TLS/SSL cipher support
 EAPI=7
 HOMEPAGE=https://testssl.sh/
 IUSE=bundled-openssl kerberos
-KEYWORDS=~amd64 ~x86
+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.2.tar.gz -> testssl-3.0.2.tar.gz
-_md5_=8ed68ba95a2b5ed895d5dd27e5c7cf9f
+_md5_=0cc68a64270919d6784525a0148d2e56
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.2.1 b/metadata/md5-cache/net-analyzer/wireshark-3.2.1
deleted file mode 100644
index ef888e851dac..000000000000
--- a/metadata/md5-cache/net-analyzer/wireshark-3.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) filecaps? ( sys-libs/libcap ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=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 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 )
-DESCRIPTION=A network protocol analyzer formerly known as ethereal
-EAPI=7
-HOMEPAGE=https://www.wireshark.org/
-IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark +udpdump zlib +filecaps
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 x86
-LICENSE=GPL-2
-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 ) filecaps? ( sys-libs/libcap )
-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	19b0421555865baefd505831dd4303e3	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a2a75ecb26e09b9f50709a256c45d359
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.2.3 b/metadata/md5-cache/net-analyzer/wireshark-3.2.3
deleted file mode 100644
index 459091e90ec7..000000000000
--- a/metadata/md5-cache/net-analyzer/wireshark-3.2.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) test? ( dev-python/pytest dev-python/pytest-xdist ) filecaps? ( sys-libs/libcap ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=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 ) zstd? ( app-arch/zstd ) || ( dev-lang/python:3.7 dev-lang/python:3.6 )
-DESCRIPTION=A network protocol analyzer formerly known as ethereal
-EAPI=7
-HOMEPAGE=https://www.wireshark.org/
-IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd +filecaps
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 x86
-LICENSE=GPL-2
-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 ) zstd? ( app-arch/zstd ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark ) filecaps? ( sys-libs/libcap )
-REQUIRED_USE=plugin-ifdemo? ( plugins )
-SLOT=0/3.2.3
-SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.2.3.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=47c2fa547a0fae2850c1008ef814bef1
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.2.4 b/metadata/md5-cache/net-analyzer/wireshark-3.2.4
index 311a19fe74db..c804f515c044 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-3.2.4
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.2.4
@@ -5,7 +5,7 @@ DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=7
 HOMEPAGE=https://www.wireshark.org/
 IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd +filecaps
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 x86
 LICENSE=GPL-2
 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 ) zstd? ( app-arch/zstd ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark ) filecaps? ( sys-libs/libcap )
 REQUIRED_USE=plugin-ifdemo? ( plugins )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/3.2.4
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.2.4.tar.xz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=db364ba68ab5b65dc66220e6018481cb
+_md5_=1accf1ef40d31c7a5ce1aeede089e5cf
diff --git a/metadata/md5-cache/net-analyzer/wireshark-99999999 b/metadata/md5-cache/net-analyzer/wireshark-99999999
index a6aad0c28215..6234c382aa99 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-99999999
+++ b/metadata/md5-cache/net-analyzer/wireshark-99999999
@@ -11,4 +11,4 @@ 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/99999999
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=79bd3282fe1fd2c267e92333b6005344
+_md5_=c946099763b8227f69ab3be06fe7d5a0
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.0 b/metadata/md5-cache/net-analyzer/zabbix-5.0.0
index fd4a10c8f1ff..41308b8c4042 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-5.0.0
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=ZABBIX is software for monitoring of your applications, network and
 EAPI=7
 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
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* 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] ) ) 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://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.0.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=8bdfe178f739026dcd5249240e7849bd
+_md5_=f366b1da9545bb34489489844b157c00
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 5e898a16d574..128c157d71a5 100644
--- a/metadata/md5-cache/net-dialup/Manifest.gz
+++ b/metadata/md5-cache/net-dialup/Manifest.gz
diff --git a/metadata/md5-cache/net-dialup/accel-ppp-1.12.0 b/metadata/md5-cache/net-dialup/accel-ppp-1.12.0
index d95364510d9d..c977663a22c1 100644
--- a/metadata/md5-cache/net-dialup/accel-ppp-1.12.0
+++ b/metadata/md5-cache/net-dialup/accel-ppp-1.12.0
@@ -12,5 +12,5 @@ RDEPEND=lua? ( dev-lang/lua:0 ) postgres? ( dev-db/postgresql:* ) snmp? ( net-an
 REQUIRED_USE=valgrind? ( debug )
 SLOT=0
 SRC_URI=https://download.sourceforge.net/accel-ppp/accel-ppp-1.12.0.tar.bz2 -> accel-ppp-1.12.0.tar
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=edecccdef9ece7062b3cc0de4062f7d2
diff --git a/metadata/md5-cache/net-dialup/accel-ppp-9999 b/metadata/md5-cache/net-dialup/accel-ppp-9999
index 68c9b36f497a..a0064c6a4ec0 100644
--- a/metadata/md5-cache/net-dialup/accel-ppp-9999
+++ b/metadata/md5-cache/net-dialup/accel-ppp-9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=lua? ( dev-lang/lua:0 ) postgres? ( dev-db/postgresql:* ) snmp? ( net-analyzer/net-snmp ) dev-libs/libpcre dev-libs/openssl:0= kernel_linux? ( virtual/modutils )
 REQUIRED_USE=valgrind? ( debug )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9f49f1478186d39fac0ffa31cb7a10f9
diff --git a/metadata/md5-cache/net-dialup/linux-atm-2.5.2 b/metadata/md5-cache/net-dialup/linux-atm-2.5.2
index ff35b6f1b245..a54d477483de 100644
--- a/metadata/md5-cache/net-dialup/linux-atm-2.5.2
+++ b/metadata/md5-cache/net-dialup/linux-atm-2.5.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-atm/linux-atm-2.5.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b4edbfad6363c22f6ba03d88af9e34b8
diff --git a/metadata/md5-cache/net-dialup/openl2tp-1.8-r1 b/metadata/md5-cache/net-dialup/openl2tp-1.8-r1
index dec0528ba50b..88aee8888900 100644
--- a/metadata/md5-cache/net-dialup/openl2tp-1.8-r1
+++ b/metadata/md5-cache/net-dialup/openl2tp-1.8-r1
@@ -11,5 +11,5 @@ RDEPEND=>=net-dialup/ppp-2.4.5 >=net-libs/libtirpc-1.0.3 sys-libs/readline:= dma
 REQUIRED_USE=|| ( client server )
 SLOT=0
 SRC_URI=mirror://sourceforge/openl2tp/openl2tp-1.8.tar.gz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ade8a3c65ab389a69e75266a39fba456
diff --git a/metadata/md5-cache/net-dialup/ppp-2.4.8 b/metadata/md5-cache/net-dialup/ppp-2.4.8
index 08887e2e2682..d89999accb84 100644
--- a/metadata/md5-cache/net-dialup/ppp-2.4.8
+++ b/metadata/md5-cache/net-dialup/ppp-2.4.8
@@ -10,5 +10,5 @@ PDEPEND=net-dialup/ppp-scripts
 RDEPEND=activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) pam? ( sys-libs/pam ) gtk? ( x11-libs/gtk+:2 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) !<net-misc/netifrc-0.7.1
 SLOT=0/2.4.8
 SRC_URI=https://github.com/paulusmack/ppp/archive/ppp-2.4.8.tar.gz https://dev.gentoo.org/~polynomial-c/ppp-2.4.8-patches-02.tar.xz http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=83b083bd57deda4152a4c80da6609abe
diff --git a/metadata/md5-cache/net-dialup/speedtouch-usb-3.0.1.2-r3 b/metadata/md5-cache/net-dialup/speedtouch-usb-3.0.1.2-r3
index bdc62815f38b..c16fed784bf2 100644
--- a/metadata/md5-cache/net-dialup/speedtouch-usb-3.0.1.2-r3
+++ b/metadata/md5-cache/net-dialup/speedtouch-usb-3.0.1.2-r3
@@ -9,5 +9,5 @@ LICENSE=SpeedTouch-USB-Firmware
 RDEPEND=net-dialup/ppp
 SLOT=0
 SRC_URI=http://www.speedtouch.com/download/drivers/USB/SpeedTouch330_firmware_3012.zip
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=736bb8b3e82e008522a5c8bea5133d9f
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 467e7fa683f7..f9d952870e54 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/fpdns-0.10.0_pre20130404-r1 b/metadata/md5-cache/net-dns/fpdns-0.10.0_pre20130404-r1
index 3e40338bec3b..2231d13bd7f3 100644
--- a/metadata/md5-cache/net-dns/fpdns-0.10.0_pre20130404-r1
+++ b/metadata/md5-cache/net-dns/fpdns-0.10.0_pre20130404-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-perl/Net-DNS-0.74 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://github.com/kirei/fpdns/archive/20130404.tar.gz -> fpdns-0.10.0_pre20130404.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c6ca7dbadc32c65ad49d8baddf6be294
diff --git a/metadata/md5-cache/net-dns/pdns-recursor-4.3.1-r1 b/metadata/md5-cache/net-dns/pdns-recursor-4.3.1-r1
new file mode 100644
index 000000000000..43f63172bb0e
--- /dev/null
+++ b/metadata/md5-cache/net-dns/pdns-recursor-4.3.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst setup
+DEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:= ) protobuf? ( dev-libs/protobuf >=dev-libs/boost-1.42:= ) dnstap? ( dev-libs/fstrm ) systemd? ( sys-apps/systemd:0= ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:=
+DESCRIPTION=The PowerDNS Recursor
+EAPI=7
+HOMEPAGE=https://www.powerdns.com/
+IUSE=debug dnstap libressl luajit protobuf snmp sodium systemd
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:= ) protobuf? ( dev-libs/protobuf >=dev-libs/boost-1.42:= ) dnstap? ( dev-libs/fstrm ) systemd? ( sys-apps/systemd:0= ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= !<net-dns/pdns-2.9.20-r1 acct-user/pdns acct-group/pdns
+REQUIRED_USE=dnstap? ( protobuf )
+SLOT=0
+SRC_URI=https://downloads.powerdns.com/releases/pdns-recursor-4.3.1.tar.bz2
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8d8b9acef22376d4e2782e9f21d28b79
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index de0f40d21b1c..1bf5af7c5a25 100644
--- a/metadata/md5-cache/net-firewall/Manifest.gz
+++ b/metadata/md5-cache/net-firewall/Manifest.gz
diff --git a/metadata/md5-cache/net-firewall/conntrack-tools-1.4.5 b/metadata/md5-cache/net-firewall/conntrack-tools-1.4.5
index 8aef90738f60..8d634e4fd768 100644
--- a/metadata/md5-cache/net-firewall/conntrack-tools-1.4.5
+++ b/metadata/md5-cache/net-firewall/conntrack-tools-1.4.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnetfilter_conntrack-1.0.7 cthelper? ( >=net-libs/libnetfilter_cthelper-1.0.0 ) cttimeout? ( >=net-libs/libnetfilter_cttimeout-1.0.0 ) >=net-libs/libnetfilter_queue-1.0.2 >=net-libs/libnfnetlink-1.0.1 !libtirpc? ( sys-libs/glibc[rpc(-)] ) libtirpc? ( net-libs/libtirpc )
 SLOT=0
 SRC_URI=http://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-1.4.5.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1ecc2d8caaf5d9bbf1c84b47c16c300c
diff --git a/metadata/md5-cache/net-firewall/conntrack-tools-1.4.6 b/metadata/md5-cache/net-firewall/conntrack-tools-1.4.6
index afd1ede03302..34c57d23d84b 100644
--- a/metadata/md5-cache/net-firewall/conntrack-tools-1.4.6
+++ b/metadata/md5-cache/net-firewall/conntrack-tools-1.4.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnetfilter_conntrack-1.0.8 >=net-libs/libnetfilter_queue-1.0.2 >=net-libs/libnfnetlink-1.0.1 net-libs/libtirpc cthelper? ( >=net-libs/libnetfilter_cthelper-1.0.0 ) cttimeout? ( >=net-libs/libnetfilter_cttimeout-1.0.0 ) systemd? ( >=sys-apps/systemd-227 )
 SLOT=0
 SRC_URI=http://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-1.4.6.tar.bz2
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bf9bf1547cdc72d6c6720057a3c75de7
diff --git a/metadata/md5-cache/net-firewall/firehol-3.1.6 b/metadata/md5-cache/net-firewall/firehol-3.1.6
index 65297b35d9ee..3b241b33d786 100644
--- a/metadata/md5-cache/net-firewall/firehol-3.1.6
+++ b/metadata/md5-cache/net-firewall/firehol-3.1.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-firewall/iptables sys-apps/iproute2[-minimal,ipv6?] net-misc/iputils[ipv6?] net-misc/iprange net-analyzer/traceroute virtual/modutils app-arch/gzip ipset? ( net-firewall/ipset )
 SLOT=0
 SRC_URI=https://github.com/firehol/firehol/releases/download/v3.1.6/firehol-3.1.6.tar.xz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=71bc446b3fe8603ddf9d2c650ed99c69
diff --git a/metadata/md5-cache/net-firewall/firewalld-0.7.1-r3 b/metadata/md5-cache/net-firewall/firewalld-0.7.1-r3
index f226049047b2..4be6794c694f 100644
--- a/metadata/md5-cache/net-firewall/firewalld-0.7.1-r3
+++ b/metadata/md5-cache/net-firewall/firewalld-0.7.1-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6
 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	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fdadf6c9df81ccbad550d51f72b6bd97
diff --git a/metadata/md5-cache/net-firewall/firewalld-0.7.3-r1 b/metadata/md5-cache/net-firewall/firewalld-0.7.3-r1
index add2b900fbea..d52fb4766584 100644
--- a/metadata/md5-cache/net-firewall/firewalld-0.7.3-r1
+++ b/metadata/md5-cache/net-firewall/firewalld-0.7.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/firewalld/firewalld/archive/v0.7.3.tar.gz -> firewalld-0.7.3.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=24351fb1899ecf88cc51862cf8d7c015
diff --git a/metadata/md5-cache/net-firewall/fwknop-2.6.10-r1 b/metadata/md5-cache/net-firewall/fwknop-2.6.10-r1
index 5639cce45616..264ebebc04f4 100644
--- a/metadata/md5-cache/net-firewall/fwknop-2.6.10-r1
+++ b/metadata/md5-cache/net-firewall/fwknop-2.6.10-r1
@@ -11,5 +11,5 @@ RDEPEND=client? ( net-misc/wget[ssl] ) firewalld? ( net-firewall/firewalld[pytho
 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	7d999b62b8749fad43fff00620cedf47	distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=712fcf72e51ea0421e56a1cc2d13870b
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 6b8ff4702c57..0e2c1e27d01f 100644
--- a/metadata/md5-cache/net-firewall/fwknop-2.6.9-r1
+++ b/metadata/md5-cache/net-firewall/fwknop-2.6.9-r1
@@ -10,5 +10,5 @@ RDEPEND=client? ( net-misc/wget[ssl] ) firewalld? ( net-firewall/firewalld[pytho
 REQUIRED_USE=nfqueue? ( server ) python? ( ^^ ( python_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	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6ca82c26719f8170ab981546f72271a4
diff --git a/metadata/md5-cache/net-firewall/ipset-6.29 b/metadata/md5-cache/net-firewall/ipset-6.29
index 53509e0f20e5..e7995fb1d93d 100644
--- a/metadata/md5-cache/net-firewall/ipset-6.29
+++ b/metadata/md5-cache/net-firewall/ipset-6.29
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl modules? ( kernel_linux? ( virtual/modutils ) )
 SLOT=0
 SRC_URI=http://ipset.netfilter.org/ipset-6.29.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e204b3df16e89902de5ed16b0ea8fc34
diff --git a/metadata/md5-cache/net-firewall/ipset-6.38 b/metadata/md5-cache/net-firewall/ipset-6.38
index 99fc66330f42..dd16e56d1dcd 100644
--- a/metadata/md5-cache/net-firewall/ipset-6.38
+++ b/metadata/md5-cache/net-firewall/ipset-6.38
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl modules? ( kernel_linux? ( virtual/modutils ) )
 SLOT=0
 SRC_URI=http://ipset.netfilter.org/ipset-6.38.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=debe4bba3e868a8c9c4fd61614cad23b
diff --git a/metadata/md5-cache/net-firewall/ipset-7.5 b/metadata/md5-cache/net-firewall/ipset-7.5
index af69c96384ad..f995dc23a97c 100644
--- a/metadata/md5-cache/net-firewall/ipset-7.5
+++ b/metadata/md5-cache/net-firewall/ipset-7.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl modules? ( kernel_linux? ( virtual/modutils ) )
 SLOT=0
 SRC_URI=http://ipset.netfilter.org/ipset-7.5.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c33abef0ed91c04df4e92fa61d5a34d2
diff --git a/metadata/md5-cache/net-firewall/ipset-7.6 b/metadata/md5-cache/net-firewall/ipset-7.6
index 5214f57fd84e..d37dad07849d 100644
--- a/metadata/md5-cache/net-firewall/ipset-7.6
+++ b/metadata/md5-cache/net-firewall/ipset-7.6
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl modules? ( kernel_linux? ( virtual/modutils ) )
 SLOT=0
 SRC_URI=http://ipset.netfilter.org/ipset-7.6.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c33abef0ed91c04df4e92fa61d5a34d2
diff --git a/metadata/md5-cache/net-firewall/ipt_netflow-2.4 b/metadata/md5-cache/net-firewall/ipt_netflow-2.4
index 7b97eebd832a..d18a237ba7b6 100644
--- a/metadata/md5-cache/net-firewall/ipt_netflow-2.4
+++ b/metadata/md5-cache/net-firewall/ipt_netflow-2.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-firewall/iptables:0= snmp? ( net-analyzer/net-snmp ) kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/aabc/ipt-netflow/archive/v2.4.tar.gz -> ipt_netflow-2.4.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a5b3282b791e16c7411b26bf41cc8e51
diff --git a/metadata/md5-cache/net-firewall/ipt_netflow-2.5 b/metadata/md5-cache/net-firewall/ipt_netflow-2.5
index 702d6dac67fd..5cbedcf336b2 100644
--- a/metadata/md5-cache/net-firewall/ipt_netflow-2.5
+++ b/metadata/md5-cache/net-firewall/ipt_netflow-2.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-firewall/iptables:0= snmp? ( net-analyzer/net-snmp ) kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/aabc/ipt-netflow/archive/v2.5.tar.gz -> ipt_netflow-2.5.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f8811fe592d85f2a40269528da2880f7
diff --git a/metadata/md5-cache/net-firewall/ipt_netflow-9999 b/metadata/md5-cache/net-firewall/ipt_netflow-9999
index 39be0763d18e..e9ad9ae5e753 100644
--- a/metadata/md5-cache/net-firewall/ipt_netflow-9999
+++ b/metadata/md5-cache/net-firewall/ipt_netflow-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=net-firewall/iptables:0= snmp? ( net-analyzer/net-snmp ) kernel_linux? ( virtual/modutils )
 SLOT=0
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bcc7eb7885736d073225f18adbeb156c
diff --git a/metadata/md5-cache/net-firewall/nfacct-1.0.1 b/metadata/md5-cache/net-firewall/nfacct-1.0.1
index 5e9d52a946dc..42b4d4e7964a 100644
--- a/metadata/md5-cache/net-firewall/nfacct-1.0.1
+++ b/metadata/md5-cache/net-firewall/nfacct-1.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libmnl >=net-libs/libnetfilter_acct-1.0.2
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/nfacct/files/nfacct-1.0.1.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1ae0a751025c3b692fa2e8b3c6e2f3a8
diff --git a/metadata/md5-cache/net-firewall/nfacct-1.0.2 b/metadata/md5-cache/net-firewall/nfacct-1.0.2
index 5efa90da77a8..1848e5d2a25e 100644
--- a/metadata/md5-cache/net-firewall/nfacct-1.0.2
+++ b/metadata/md5-cache/net-firewall/nfacct-1.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libmnl >=net-libs/libnetfilter_acct-1.0.3
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/nfacct/files/nfacct-1.0.2.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=596781c712e0780471290136c58945bb
diff --git a/metadata/md5-cache/net-firewall/nftables-0.9.3-r1 b/metadata/md5-cache/net-firewall/nftables-0.9.3-r1
index c5178ebc67e0..bc4fd5abba79 100644
--- a/metadata/md5-cache/net-firewall/nftables-0.9.3-r1
+++ b/metadata/md5-cache/net-firewall/nftables-0.9.3-r1
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/libmnl-1.0.3:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jan
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://netfilter.org/projects/nftables/files/nftables-0.9.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0a7e0503b47164ee1ab38e653ec3d8bc
diff --git a/metadata/md5-cache/net-firewall/nftables-0.9.4-r1 b/metadata/md5-cache/net-firewall/nftables-0.9.4-r1
index 5b93c94a9a9e..3f8d06ffe99a 100644
--- a/metadata/md5-cache/net-firewall/nftables-0.9.4-r1
+++ b/metadata/md5-cache/net-firewall/nftables-0.9.4-r1
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/libmnl-1.0.3:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jan
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://netfilter.org/projects/nftables/files/nftables-0.9.4.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=24faf7d5904fb248461539a2dc872119
diff --git a/metadata/md5-cache/net-firewall/nftables-0.9.4-r2 b/metadata/md5-cache/net-firewall/nftables-0.9.4-r2
index 61d37ed293da..aa9b42fec7ff 100644
--- a/metadata/md5-cache/net-firewall/nftables-0.9.4-r2
+++ b/metadata/md5-cache/net-firewall/nftables-0.9.4-r2
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/libmnl-1.0.3:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jan
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://netfilter.org/projects/nftables/files/nftables-0.9.4.tar.bz2 !doc? ( https://dev.gentoo.org/~chutzpah/dist/nftables/nftables-0.9.4-manpages.tar.xz )
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9714da0d098f1af2ebeee2e517e9215d
diff --git a/metadata/md5-cache/net-firewall/nftables-0.9.6 b/metadata/md5-cache/net-firewall/nftables-0.9.6
index 50c48b63902d..f868d28108bd 100644
--- a/metadata/md5-cache/net-firewall/nftables-0.9.6
+++ b/metadata/md5-cache/net-firewall/nftables-0.9.6
@@ -1,15 +1,15 @@
 BDEPEND=doc? ( app-text/asciidoc >=app-text/docbook2X-0.8.8-r4 ) 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
-DEPEND=>=net-libs/libmnl-1.0.4:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson ) 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(-)] ) readline? ( sys-libs/readline:0= ) >=net-libs/libnftnl-1.1.7:0= xtables? ( >=net-firewall/iptables-1.6.1 )
+DEPEND=>=net-libs/libmnl-1.0.4:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson ) 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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) readline? ( sys-libs/readline:0= ) >=net-libs/libnftnl-1.1.7:0= xtables? ( >=net-firewall/iptables-1.6.1 )
 DESCRIPTION=Linux kernel (3.13+) firewall, NAT and packet mangling tools
 EAPI=7
 HOMEPAGE=https://netfilter.org/projects/nftables/
-IUSE=debug doc +gmp json +modern-kernel python +readline static-libs xtables kernel_linux python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=debug doc +gmp json +modern-kernel python +readline static-libs xtables kernel_linux python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=net-libs/libmnl-1.0.4:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson ) 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(-)] ) readline? ( sys-libs/readline:0= ) >=net-libs/libnftnl-1.1.7:0= xtables? ( >=net-firewall/iptables-1.6.1 )
-REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
+RDEPEND=>=net-libs/libmnl-1.0.4:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson ) 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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) readline? ( sys-libs/readline:0= ) >=net-libs/libnftnl-1.1.7:0= xtables? ( >=net-firewall/iptables-1.6.1 )
+REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://netfilter.org/projects/nftables/files/nftables-0.9.6.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=eb0b5058b95542dadd22763c3bda7b3d
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d7db0f53ff5ed1c9a8238b0a09ef6a96
diff --git a/metadata/md5-cache/net-firewall/nftables-9999 b/metadata/md5-cache/net-firewall/nftables-9999
new file mode 100644
index 000000000000..9e3d37d779d2
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/nftables-9999
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/bison sys-devel/flex doc? ( app-text/asciidoc >=app-text/docbook2X-0.8.8-r4 ) 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 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst prepare setup unpack
+DEPEND=>=net-libs/libmnl-1.0.4:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson ) 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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) readline? ( sys-libs/readline:0= ) >=net-libs/libnftnl-1.1.7:0= xtables? ( >=net-firewall/iptables-1.6.1 )
+DESCRIPTION=Linux kernel (3.13+) firewall, NAT and packet mangling tools
+EAPI=7
+HOMEPAGE=https://netfilter.org/projects/nftables/
+IUSE=debug doc +gmp json +modern-kernel python +readline static-libs xtables kernel_linux python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+LICENSE=GPL-2
+PROPERTIES=live
+RDEPEND=>=net-libs/libmnl-1.0.4:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson ) 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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) readline? ( sys-libs/readline:0= ) >=net-libs/libnftnl-1.1.7:0= xtables? ( >=net-firewall/iptables-1.6.1 )
+REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
+SLOT=0
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=145329d454856c095268b4432273c012
diff --git a/metadata/md5-cache/net-firewall/nftlb-0.6 b/metadata/md5-cache/net-firewall/nftlb-0.6
index cc08a0138859..96870a3b4ddf 100644
--- a/metadata/md5-cache/net-firewall/nftlb-0.6
+++ b/metadata/md5-cache/net-firewall/nftlb-0.6
@@ -11,5 +11,5 @@ RDEPEND=net-firewall/nftables:=[modern-kernel] dev-libs/jansson:= dev-libs/libev
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zevenet/nftlb/archive/v0.6.tar.gz -> nftlb-0.6.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ac400f553096573b5598cf6747051b93
diff --git a/metadata/md5-cache/net-firewall/pglinux-2.3.1_p20171006 b/metadata/md5-cache/net-firewall/pglinux-2.3.1_p20171006
index f3169eb8239d..3c759437f3a1 100644
--- a/metadata/md5-cache/net-firewall/pglinux-2.3.1_p20171006
+++ b/metadata/md5-cache/net-firewall/pglinux-2.3.1_p20171006
@@ -10,5 +10,5 @@ RDEPEND=net-libs/libnetfilter_queue net-libs/libnfnetlink dbus? ( sys-apps/dbus
 REQUIRED_USE=qt5? ( dbus )
 SLOT=0
 SRC_URI=https://sourceforge.net/code-snapshots/git/p/pe/peerguardian/code.git/peerguardian-code-9d91ab6a8e6bc2b41e985aa698eb5c1eb364fea8.zip -> pglinux-2.3.1_p20171006.zip
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5344ec6dad38b7ead14a01e8daddba3b
diff --git a/metadata/md5-cache/net-firewall/psad-2.2.5 b/metadata/md5-cache/net-firewall/psad-2.2.5
index e3114e4eb1f8..4b46cc27f361 100644
--- a/metadata/md5-cache/net-firewall/psad-2.2.5
+++ b/metadata/md5-cache/net-firewall/psad-2.2.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/Bit-Vector dev-perl/Date-Calc dev-perl/NetAddr-IP dev-perl/Unix-Syslog net-firewall/iptables net-misc/whois virtual/logger virtual/mailx virtual/perl-Storable dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://www.cipherdyne.org/psad/download/psad-2.2.5.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=011d257d938536293c61b4350240d366
diff --git a/metadata/md5-cache/net-firewall/rtsp-conntrack-3.7-r1 b/metadata/md5-cache/net-firewall/rtsp-conntrack-3.7-r1
index 5f4dd69b3793..7009b5c166e5 100644
--- a/metadata/md5-cache/net-firewall/rtsp-conntrack-3.7-r1
+++ b/metadata/md5-cache/net-firewall/rtsp-conntrack-3.7-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://mike.it-loops.com/rtsp/rtsp-module-3.7.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=186ced34a99a1202968d3c7701ab38ec
diff --git a/metadata/md5-cache/net-firewall/rtsp-conntrack-4.18 b/metadata/md5-cache/net-firewall/rtsp-conntrack-4.18
index a89ab1f46a62..699e38569a6a 100644
--- a/metadata/md5-cache/net-firewall/rtsp-conntrack-4.18
+++ b/metadata/md5-cache/net-firewall/rtsp-conntrack-4.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/maru-sama/rtsp-linux/archive/4.18.tar.gz -> rtsp-conntrack-4.18.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cb46e4a7a78288db7b0346ad74c6038a
diff --git a/metadata/md5-cache/net-firewall/sanewall-1.1.6-r2 b/metadata/md5-cache/net-firewall/sanewall-1.1.6-r2
index 28e9795095a7..8330ad6756e1 100644
--- a/metadata/md5-cache/net-firewall/sanewall-1.1.6-r2
+++ b/metadata/md5-cache/net-firewall/sanewall-1.1.6-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=net-firewall/iptables[ipv6] sys-apps/iproute2[-minimal] sys-apps/net-tools virtual/modutils || ( net-misc/wget net-misc/curl )
 SLOT=0
 SRC_URI=https://download.sanewall.org/releases/1.1.6/sanewall-1.1.6.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a5c1b5431209e08d505e3ae3fb5368a9
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.2.4.4 b/metadata/md5-cache/net-firewall/shorewall-5.2.4.4
deleted file mode 100644
index c31230f5c6dd..000000000000
--- a/metadata/md5-cache/net-firewall/shorewall-5.2.4.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare pretend setup
-DESCRIPTION=A high-level tool for configuring Netfilter
-EAPI=7
-HOMEPAGE=https://shorewall.org/
-IUSE=doc +init +ipv4 ipv6 lite4 lite6 selinux kernel_linux
-KEYWORDS=~alpha amd64 hppa ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214
-REQUIRED_USE=ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 )
-SLOT=0
-SRC_URI=https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.4/shorewall-core-5.2.4.4.tar.bz2 ipv4? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.4/shorewall-5.2.4.4.tar.bz2 ) ipv6? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.4/shorewall6-5.2.4.4.tar.bz2 ) lite4? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.4/shorewall-lite-5.2.4.4.tar.bz2 ) lite6? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.4/shorewall6-lite-5.2.4.4.tar.bz2 ) init? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.4/shorewall-init-5.2.4.4.tar.bz2 ) doc? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.4/shorewall-docs-html-5.2.4.4.tar.bz2 )
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=af4710824c375e3dbce2ad7a31c89af3
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.2.4.5 b/metadata/md5-cache/net-firewall/shorewall-5.2.4.5
deleted file mode 100644
index 43435d78ea60..000000000000
--- a/metadata/md5-cache/net-firewall/shorewall-5.2.4.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare pretend setup
-DESCRIPTION=A high-level tool for configuring Netfilter
-EAPI=7
-HOMEPAGE=https://shorewall.org/
-IUSE=doc +init +ipv4 ipv6 lite4 lite6 selinux kernel_linux
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214
-REQUIRED_USE=ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 )
-SLOT=0
-SRC_URI=https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.4/shorewall-core-5.2.4.5.tar.bz2 ipv4? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.4/shorewall-5.2.4.5.tar.bz2 ) ipv6? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.4/shorewall6-5.2.4.5.tar.bz2 ) lite4? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.4/shorewall-lite-5.2.4.5.tar.bz2 ) lite6? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.4/shorewall6-lite-5.2.4.5.tar.bz2 ) init? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.4/shorewall-init-5.2.4.5.tar.bz2 ) doc? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.4/shorewall-docs-html-5.2.4.5.tar.bz2 )
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1e4c8c77c1edf6f4a7be7f6da92c8930
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.2.5 b/metadata/md5-cache/net-firewall/shorewall-5.2.5
index b517691d9deb..f5da3bb0a1de 100644
--- a/metadata/md5-cache/net-firewall/shorewall-5.2.5
+++ b/metadata/md5-cache/net-firewall/shorewall-5.2.5
@@ -4,11 +4,11 @@ DESCRIPTION=A high-level tool for configuring Netfilter
 EAPI=7
 HOMEPAGE=https://shorewall.org/
 IUSE=doc +init +ipv4 ipv6 lite4 lite6 selinux kernel_linux
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 hppa ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214
 REQUIRED_USE=ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 )
 SLOT=0
 SRC_URI=https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall-core-5.2.5.tar.bz2 ipv4? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall-5.2.5.tar.bz2 ) ipv6? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall6-5.2.5.tar.bz2 ) lite4? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall-lite-5.2.5.tar.bz2 ) lite6? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall6-lite-5.2.5.tar.bz2 ) init? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall-init-5.2.5.tar.bz2 ) doc? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall-docs-html-5.2.5.tar.bz2 )
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1e4c8c77c1edf6f4a7be7f6da92c8930
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=af4710824c375e3dbce2ad7a31c89af3
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.2.5.1 b/metadata/md5-cache/net-firewall/shorewall-5.2.5.1
new file mode 100644
index 000000000000..7eac0c536ffc
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/shorewall-5.2.5.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DESCRIPTION=A high-level tool for configuring Netfilter
+EAPI=7
+HOMEPAGE=https://shorewall.org/
+IUSE=doc +init +ipv4 ipv6 lite4 lite6 selinux kernel_linux
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214
+REQUIRED_USE=ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 )
+SLOT=0
+SRC_URI=https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall-core-5.2.5.1.tar.bz2 ipv4? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall-5.2.5.1.tar.bz2 ) ipv6? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall6-5.2.5.1.tar.bz2 ) lite4? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall-lite-5.2.5.1.tar.bz2 ) lite6? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall6-lite-5.2.5.1.tar.bz2 ) init? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall-init-5.2.5.1.tar.bz2 ) doc? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.5/shorewall-docs-html-5.2.5.1.tar.bz2 )
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1e4c8c77c1edf6f4a7be7f6da92c8930
diff --git a/metadata/md5-cache/net-firewall/ufw-0.36 b/metadata/md5-cache/net-firewall/ufw-0.36
index b4fefcd63adf..8250ca7b2c01 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	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dacf8d1e441596431859dc7893a2c97a
diff --git a/metadata/md5-cache/net-firewall/xtables-addons-2.13 b/metadata/md5-cache/net-firewall/xtables-addons-2.13
index d94f4c455435..dc3f1a241f09 100644
--- a/metadata/md5-cache/net-firewall/xtables-addons-2.13
+++ b/metadata/md5-cache/net-firewall/xtables-addons-2.13
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.4.5 xtables_addons_geoip? ( app-arch/unzip dev-perl/Text-CSV_XS virtual/perl-Getopt-Long ) modules? ( kernel_linux? ( virtual/modutils ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/xtables-addons/xtables-addons-2.13.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=81487aced71fb5df7c976323db1f963b
diff --git a/metadata/md5-cache/net-firewall/xtables-addons-3.7 b/metadata/md5-cache/net-firewall/xtables-addons-3.7
index 610529a079b1..42d350fed2ef 100644
--- a/metadata/md5-cache/net-firewall/xtables-addons-3.7
+++ b/metadata/md5-cache/net-firewall/xtables-addons-3.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.6.0 xtables_addons_geoip? ( app-arch/unzip dev-perl/Net-CIDR-Lite dev-perl/Text-CSV_XS virtual/perl-Getopt-Long ) modules? ( kernel_linux? ( virtual/modutils ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/xtables-addons/xtables-addons-3.7.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8ca4587ec5403c9b3f696a3d510143c6
diff --git a/metadata/md5-cache/net-firewall/xtables-addons-3.8 b/metadata/md5-cache/net-firewall/xtables-addons-3.8
index 35ab7ce5ff41..eee12084d65c 100644
--- a/metadata/md5-cache/net-firewall/xtables-addons-3.8
+++ b/metadata/md5-cache/net-firewall/xtables-addons-3.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.6.0 xtables_addons_geoip? ( app-arch/unzip dev-perl/Net-CIDR-Lite dev-perl/Text-CSV_XS virtual/perl-Getopt-Long ) modules? ( kernel_linux? ( virtual/modutils ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/xtables-addons/xtables-addons-3.8.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8ca4587ec5403c9b3f696a3d510143c6
diff --git a/metadata/md5-cache/net-firewall/xtables-addons-3.9 b/metadata/md5-cache/net-firewall/xtables-addons-3.9
index 20af9178cdb7..94080eb178d6 100644
--- a/metadata/md5-cache/net-firewall/xtables-addons-3.9
+++ b/metadata/md5-cache/net-firewall/xtables-addons-3.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.6.0 xtables_addons_geoip? ( app-arch/unzip dev-perl/Net-CIDR-Lite dev-perl/Text-CSV_XS virtual/perl-Getopt-Long ) modules? ( kernel_linux? ( virtual/modutils ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/xtables-addons/xtables-addons-3.9.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8ca4587ec5403c9b3f696a3d510143c6
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 70c603954ccc..0717c2bd2582 100644
--- a/metadata/md5-cache/net-fs/Manifest.gz
+++ b/metadata/md5-cache/net-fs/Manifest.gz
diff --git a/metadata/md5-cache/net-fs/autofs-5.1.6 b/metadata/md5-cache/net-fs/autofs-5.1.6
index 989768cf9400..a7dd94ab21c7 100644
--- a/metadata/md5-cache/net-fs/autofs-5.1.6
+++ b/metadata/md5-cache/net-fs/autofs-5.1.6
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/util-linux-2.20 dmalloc? ( dev-libs/dmalloc[threads] ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) systemd? ( sys-apps/systemd ) libtirpc? ( net-libs/libtirpc ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/daemons/autofs/v5/autofs-5.1.6.tar.xz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=81177b1ff6959b5616e328cf44c09828
diff --git a/metadata/md5-cache/net-fs/autofs-5.1.6-r1 b/metadata/md5-cache/net-fs/autofs-5.1.6-r1
index 4970c4a0df7d..297d261bfed7 100644
--- a/metadata/md5-cache/net-fs/autofs-5.1.6-r1
+++ b/metadata/md5-cache/net-fs/autofs-5.1.6-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/util-linux-2.20 dmalloc? ( dev-libs/dmalloc[threads] ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) systemd? ( sys-apps/systemd ) libtirpc? ( net-libs/libtirpc ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/daemons/autofs/v5/autofs-5.1.6.tar.xz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d5dbd018b5be271beeea4773f109c442
diff --git a/metadata/md5-cache/net-fs/cifs-utils-6.10-r1 b/metadata/md5-cache/net-fs/cifs-utils-6.10-r1
index 004159f19e1f..6bac5375b76e 100644
--- a/metadata/md5-cache/net-fs/cifs-utils-6.10-r1
+++ b/metadata/md5-cache/net-fs/cifs-utils-6.10-r1
@@ -12,5 +12,5 @@ RDEPEND=!net-fs/mount-cifs !<net-fs/samba-3.6_rc1 sys-apps/keyutils:= ads? ( sys
 REQUIRED_USE=acl? ( ads )
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-6.10.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8ed0934c8f6ec2fb518df91745e87426
diff --git a/metadata/md5-cache/net-fs/cifs-utils-6.9-r1 b/metadata/md5-cache/net-fs/cifs-utils-6.9-r1
index f5f552511025..3ed90468907f 100644
--- a/metadata/md5-cache/net-fs/cifs-utils-6.9-r1
+++ b/metadata/md5-cache/net-fs/cifs-utils-6.9-r1
@@ -12,5 +12,5 @@ RDEPEND=!net-fs/mount-cifs !<net-fs/samba-3.6_rc1 sys-apps/keyutils:= ads? ( sys
 REQUIRED_USE=acl? ( ads )
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-6.9.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=85c783847483619ebf2ac81078544d59
diff --git a/metadata/md5-cache/net-fs/cvmfs-2.7.2 b/metadata/md5-cache/net-fs/cvmfs-2.7.2
deleted file mode 100644
index ec6d6fb38c04..000000000000
--- a/metadata/md5-cache/net-fs/cvmfs-2.7.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile config configure install prepare setup test
-DEPEND=app-arch/libarchive dev-cpp/sparsehash dev-db/sqlite:3= dev-libs/leveldb:0= dev-libs/openssl:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/pacparser:0= net-misc/curl:0[adns] sys-apps/attr sys-fs/fuse:0= sys-fs/fuse:3= sys-libs/libcap:0= sys-libs/zlib:0= virtual/pkgconfig doc? ( app-doc/doxygen[dot] )
-DESCRIPTION=HTTP read-only file system for distributing software
-EAPI=7
-HOMEPAGE=http://cernvm.cern.ch/portal/filesystem
-IUSE=bash-completion doc server kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/libarchive dev-cpp/sparsehash dev-db/sqlite:3= dev-libs/leveldb:0= dev-libs/openssl:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/pacparser:0= net-misc/curl:0[adns] sys-apps/attr sys-fs/fuse:0= sys-fs/fuse:3= sys-libs/libcap:0= sys-libs/zlib:0= app-admin/sudo net-fs/autofs
-SLOT=0
-SRC_URI=https://ecsft.cern.ch/dist/cvmfs/cvmfs-2.7.2/source.tar.gz -> cvmfs-2.7.2.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=63f1b09adfb8005fab55ba6309bf479f
diff --git a/metadata/md5-cache/net-fs/cvmfs-2.7.2-r1 b/metadata/md5-cache/net-fs/cvmfs-2.7.2-r1
new file mode 100644
index 000000000000..b5ccaf7820ce
--- /dev/null
+++ b/metadata/md5-cache/net-fs/cvmfs-2.7.2-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile config configure install prepare setup test
+DEPEND=acct-group/cvmfs acct-user/cvmfs app-arch/libarchive dev-cpp/gtest dev-cpp/sparsehash dev-db/sqlite:3= dev-libs/leveldb:0= dev-libs/openssl:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/pacparser:0= net-misc/curl:0[adns] sys-apps/attr sys-fs/fuse:0= sys-fs/fuse:3= sys-libs/libcap:0= sys-libs/zlib:0= virtual/pkgconfig doc? ( app-doc/doxygen[dot] )
+DESCRIPTION=HTTP read-only file system for distributing software
+EAPI=7
+HOMEPAGE=http://cernvm.cern.ch/portal/filesystem
+IUSE=bash-completion doc server kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=acct-group/cvmfs acct-user/cvmfs app-arch/libarchive dev-cpp/gtest dev-cpp/sparsehash dev-db/sqlite:3= dev-libs/leveldb:0= dev-libs/openssl:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/pacparser:0= net-misc/curl:0[adns] sys-apps/attr sys-fs/fuse:0= sys-fs/fuse:3= sys-libs/libcap:0= sys-libs/zlib:0= app-admin/sudo net-fs/autofs
+SLOT=0
+SRC_URI=https://ecsft.cern.ch/dist/cvmfs/cvmfs-2.7.2/source.tar.gz -> cvmfs-2.7.2.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bea9c23ecc50536414dcdabf5e5d8d81
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
deleted file mode 100644
index e2cfcc61e028..000000000000
--- a/metadata/md5-cache/net-fs/minio-2019.09.11.19.53.16
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.10
-DEFINED_PHASES=compile install prepare setup test unpack
-DESCRIPTION=An Amazon S3 compatible object storage server
-EAPI=7
-HOMEPAGE=https://github.com/minio/minio
-KEYWORDS=~amd64 ~amd64-linux
-LICENSE=Apache-2.0 BSD BSD-2 MIT MPL-2.0
-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	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=63248d6f7c52e27a28844ea0be55e1ba
diff --git a/metadata/md5-cache/net-fs/minio-2020.06.22.03.12.50 b/metadata/md5-cache/net-fs/minio-2020.06.22.03.12.50
new file mode 100644
index 000000000000..d16a0193c886
--- /dev/null
+++ b/metadata/md5-cache/net-fs/minio-2020.06.22.03.12.50
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst prepare setup unpack
+DESCRIPTION=An Amazon S3 compatible object storage server
+EAPI=7
+HOMEPAGE=https://github.com/minio/minio
+KEYWORDS=~amd64 ~amd64-linux
+LICENSE=Apache-2.0 BSD BSD-2 MIT MPL-2.0
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/minio/minio/archive/RELEASE.2020-06-22T03-12-50Z.tar.gz -> minio-2020.06.22.03.12.50.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.39.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.39.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.39.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.39.0.mod mirror://goproxy//contrib.go.opencensus.io/exporter/ocagent/@v/v0.5.0.zip -> contrib.go.opencensus.io%2Fexporter%2Focagent%2F@v%2Fv0.5.0.zip mirror://goproxy//contrib.go.opencensus.io/exporter/ocagent/@v/v0.5.0.mod -> contrib.go.opencensus.io%2Fexporter%2Focagent%2F@v%2Fv0.5.0.mod mirror://goproxy//git.apache.org/thrift.git/@v/v0.13.0.zip -> git.apache.org%2Fthrift.git%2F@v%2Fv0.13.0.zip mirror://goproxy//git.apache.org/thrift.git/@v/v0.13.0.mod -> git.apache.org%2Fthrift.git%2F@v%2Fv0.13.0.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.1.zip -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.1.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.8.0.zip -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.8.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v11.7.1+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv11.7.1+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v11.7.1+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv11.7.1+incompatible.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!shopify/sarama/@v/v1.24.1.zip -> github.com%2F!shopify%2Fsarama%2F@v%2Fv1.24.1.zip mirror://goproxy//github.com/!shopify/sarama/@v/v1.24.1.mod -> github.com%2F!shopify%2Fsarama%2F@v%2Fv1.24.1.mod mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.zip -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.zip mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.mod -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod mirror://goproxy//github.com/alecthomas/participle/@v/v0.2.1.zip -> github.com%2Falecthomas%2Fparticiple%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/alecthomas/participle/@v/v0.2.1.mod -> github.com%2Falecthomas%2Fparticiple%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.20.21.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.20.21.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.20.21.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.20.21.mod mirror://goproxy//github.com/bcicen/jstream/@v/v0.0.0-20190220045926-16c1f8af81c2.zip -> github.com%2Fbcicen%2Fjstream%2F@v%2Fv0.0.0-20190220045926-16c1f8af81c2.zip mirror://goproxy//github.com/bcicen/jstream/@v/v0.0.0-20190220045926-16c1f8af81c2.mod -> github.com%2Fbcicen%2Fjstream%2F@v%2Fv0.0.0-20190220045926-16c1f8af81c2.mod mirror://goproxy//github.com/beevik/ntp/@v/v0.2.0.zip -> github.com%2Fbeevik%2Fntp%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/beevik/ntp/@v/v0.2.0.mod -> github.com%2Fbeevik%2Fntp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.0.zip -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.0.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/cheggaaa/pb/@v/v1.0.28.zip -> github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.28.zip mirror://goproxy//github.com/cheggaaa/pb/@v/v1.0.28.mod -> github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.28.mod mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.mod -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.mod -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/colinmarc/hdfs/v2/@v/v2.1.1.zip -> github.com%2Fcolinmarc%2Fhdfs%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/colinmarc/hdfs/v2/@v/v2.1.1.mod -> github.com%2Fcolinmarc%2Fhdfs%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/coredns/coredns/@v/v1.4.0.zip -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/coredns/coredns/@v/v1.4.0.mod -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.3.zip -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.3.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.12+incompatible.zip -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.12+incompatible.zip mirror://goproxy//github.com/coreos/etcd/@v/v3.3.12+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.12+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.zip -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.zip mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/djherbis/atime/@v/v1.0.0.zip -> github.com%2Fdjherbis%2Fatime%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/djherbis/atime/@v/v1.0.0.mod -> github.com%2Fdjherbis%2Fatime%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.1.0.mod -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.2.0.zip -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.2.0.mod -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.zip -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.zip mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.mod -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.zip -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.mod -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.0.zip -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.0.mod -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v1.0.0.zip -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v1.0.0.mod -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.zip -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.2.0.mod -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.3.0.zip -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.3.0.mod -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.4.1.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.7.2.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.7.2.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.1-0.20190212211648-25d852aebe32.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.1-0.20190212211648-25d852aebe32.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.1-0.20190212211648-25d852aebe32.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.1-0.20190212211648-25d852aebe32.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.2+incompatible.mod -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.2+incompatible.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2-0.20181118220953-042da051cf31.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.1.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/gomodule/redigo/@v/v2.0.0+incompatible.zip -> github.com%2Fgomodule%2Fredigo%2F@v%2Fv2.0.0+incompatible.zip mirror://goproxy//github.com/gomodule/redigo/@v/v2.0.0+incompatible.mod -> github.com%2Fgomodule%2Fredigo%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.zip mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20190328170749-bb2674552d8f.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20190328170749-bb2674552d8f.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20190328170749-bb2674552d8f.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20190328170749-bb2674552d8f.mod mirror://goproxy//github.com/gorilla/handlers/@v/v1.4.0.zip -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/gorilla/handlers/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.0.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.7.0.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/gorilla/rpc/@v/v1.2.0.zip -> github.com%2Fgorilla%2Frpc%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/gorilla/rpc/@v/v1.2.0.mod -> github.com%2Fgorilla%2Frpc%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.8.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.8.5.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v0.0.0-20180228145832-27454136f036.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv0.0.0-20180228145832-27454136f036.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.1-0.20190703171940-f639636d18e0.zip -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1-0.20190703171940-f639636d18e0.zip mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.1-0.20190703171940-f639636d18e0.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1-0.20190703171940-f639636d18e0.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.4.zip -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.4.mod -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.13.zip -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.zip mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.13.mod -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod mirror://goproxy//github.com/inconshreveable/go-update/@v/v0.0.0-20160112193335-8152e7eb6ccf.zip -> github.com%2Finconshreveable%2Fgo-update%2F@v%2Fv0.0.0-20160112193335-8152e7eb6ccf.zip mirror://goproxy//github.com/inconshreveable/go-update/@v/v0.0.0-20160112193335-8152e7eb6ccf.mod -> github.com%2Finconshreveable%2Fgo-update%2F@v%2Fv0.0.0-20160112193335-8152e7eb6ccf.mod mirror://goproxy//github.com/jcmturner/gofork/@v/v0.0.0-20180107083740-2aebee971930.mod -> github.com%2Fjcmturner%2Fgofork%2F@v%2Fv0.0.0-20180107083740-2aebee971930.mod mirror://goproxy//github.com/jcmturner/gofork/@v/v0.0.0-20190328161633-dc7c13fece03.zip -> github.com%2Fjcmturner%2Fgofork%2F@v%2Fv0.0.0-20190328161633-dc7c13fece03.zip mirror://goproxy//github.com/jcmturner/gofork/@v/v0.0.0-20190328161633-dc7c13fece03.mod -> github.com%2Fjcmturner%2Fgofork%2F@v%2Fv0.0.0-20190328161633-dc7c13fece03.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.zip -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.8.2.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.8.2.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.9.4.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.4.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.10.1.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.10.3.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.3.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.10.3.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.2.zip -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.2.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.3.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.4.zip -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.4.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.3.0.zip -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/klauspost/cpuid/@v/v1.3.0.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/klauspost/pgzip/@v/v1.2.1.zip -> github.com%2Fklauspost%2Fpgzip%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/klauspost/pgzip/@v/v1.2.1.mod -> github.com%2Fklauspost%2Fpgzip%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/klauspost/readahead/@v/v1.3.1.zip -> github.com%2Fklauspost%2Freadahead%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/klauspost/readahead/@v/v1.3.1.mod -> github.com%2Fklauspost%2Freadahead%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/klauspost/reedsolomon/@v/v1.9.9.zip -> github.com%2Fklauspost%2Freedsolomon%2F@v%2Fv1.9.9.zip mirror://goproxy//github.com/klauspost/reedsolomon/@v/v1.9.9.mod -> github.com%2Fklauspost%2Freedsolomon%2F@v%2Fv1.9.9.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.1.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/lib/pq/@v/v1.1.1.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20180730094502-03f2033d19d5.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180730094502-03f2033d19d5.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20180730094502-03f2033d19d5.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180730094502-03f2033d19d5.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20190610004146-91bb50d98149.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190610004146-91bb50d98149.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20190805055040-f9202b1cfdeb.zip -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190805055040-f9202b1cfdeb.zip mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20190805055040-f9202b1cfdeb.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190805055040-f9202b1cfdeb.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.8.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.8.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.8.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/minio/cli/@v/v1.22.0.zip -> github.com%2Fminio%2Fcli%2F@v%2Fv1.22.0.zip mirror://goproxy//github.com/minio/cli/@v/v1.22.0.mod -> github.com%2Fminio%2Fcli%2F@v%2Fv1.22.0.mod mirror://goproxy//github.com/minio/highwayhash/@v/v1.0.0.zip -> github.com%2Fminio%2Fhighwayhash%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/minio/highwayhash/@v/v1.0.0.mod -> github.com%2Fminio%2Fhighwayhash%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/minio/md5-simd/@v/v1.1.0.zip -> github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/minio/md5-simd/@v/v1.1.0.mod -> github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/minio/minio-go/v6/@v/v6.0.53.mod -> github.com%2Fminio%2Fminio-go%2Fv6%2F@v%2Fv6.0.53.mod mirror://goproxy//github.com/minio/minio-go/v6/@v/v6.0.58-0.20200612001654-a57fec8037ec.zip -> github.com%2Fminio%2Fminio-go%2Fv6%2F@v%2Fv6.0.58-0.20200612001654-a57fec8037ec.zip mirror://goproxy//github.com/minio/minio-go/v6/@v/v6.0.58-0.20200612001654-a57fec8037ec.mod -> github.com%2Fminio%2Fminio-go%2Fv6%2F@v%2Fv6.0.58-0.20200612001654-a57fec8037ec.mod mirror://goproxy//github.com/minio/parquet-go/@v/v0.0.0-20200414234858-838cfa8aae61.zip -> github.com%2Fminio%2Fparquet-go%2F@v%2Fv0.0.0-20200414234858-838cfa8aae61.zip mirror://goproxy//github.com/minio/parquet-go/@v/v0.0.0-20200414234858-838cfa8aae61.mod -> github.com%2Fminio%2Fparquet-go%2F@v%2Fv0.0.0-20200414234858-838cfa8aae61.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.zip -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/minio/simdjson-go/@v/v0.1.5-0.20200303142138-b17fe061ea37.zip -> github.com%2Fminio%2Fsimdjson-go%2F@v%2Fv0.1.5-0.20200303142138-b17fe061ea37.zip mirror://goproxy//github.com/minio/simdjson-go/@v/v0.1.5-0.20200303142138-b17fe061ea37.mod -> github.com%2Fminio%2Fsimdjson-go%2F@v%2Fv0.1.5-0.20200303142138-b17fe061ea37.mod mirror://goproxy//github.com/minio/sio/@v/v0.2.0.zip -> github.com%2Fminio%2Fsio%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/minio/sio/@v/v0.2.0.mod -> github.com%2Fminio%2Fsio%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mmcloughlin/avo/@v/v0.0.0-20200303042253-6df701fe672f.zip -> github.com%2Fmmcloughlin%2Favo%2F@v%2Fv0.0.0-20200303042253-6df701fe672f.zip mirror://goproxy//github.com/mmcloughlin/avo/@v/v0.0.0-20200303042253-6df701fe672f.mod -> github.com%2Fmmcloughlin%2Favo%2F@v%2Fv0.0.0-20200303042253-6df701fe672f.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/montanaflynn/stats/@v/v0.5.0.zip -> github.com%2Fmontanaflynn%2Fstats%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/montanaflynn/stats/@v/v0.5.0.mod -> github.com%2Fmontanaflynn%2Fstats%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/nats-io/gnatsd/@v/v1.4.1.zip -> github.com%2Fnats-io%2Fgnatsd%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/nats-io/gnatsd/@v/v1.4.1.mod -> github.com%2Fnats-io%2Fgnatsd%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/nats-io/go-nats/@v/v1.7.2.zip -> github.com%2Fnats-io%2Fgo-nats%2F@v%2Fv1.7.2.zip mirror://goproxy//github.com/nats-io/go-nats/@v/v1.7.2.mod -> github.com%2Fnats-io%2Fgo-nats%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/nats-io/go-nats-streaming/@v/v0.4.4.zip -> github.com%2Fnats-io%2Fgo-nats-streaming%2F@v%2Fv0.4.4.zip mirror://goproxy//github.com/nats-io/go-nats-streaming/@v/v0.4.4.mod -> github.com%2Fnats-io%2Fgo-nats-streaming%2F@v%2Fv0.4.4.mod mirror://goproxy//github.com/nats-io/jwt/@v/v0.3.0.mod -> github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/nats-io/jwt/@v/v0.3.2.zip -> github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.2.zip mirror://goproxy//github.com/nats-io/jwt/@v/v0.3.2.mod -> github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/nats-io/nats-server/@v/v1.4.1.zip -> github.com%2Fnats-io%2Fnats-server%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/nats-io/nats-server/@v/v1.4.1.mod -> github.com%2Fnats-io%2Fnats-server%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/nats-io/nats-server/v2/@v/v2.1.2.zip -> github.com%2Fnats-io%2Fnats-server%2Fv2%2F@v%2Fv2.1.2.zip mirror://goproxy//github.com/nats-io/nats-server/v2/@v/v2.1.2.mod -> github.com%2Fnats-io%2Fnats-server%2Fv2%2F@v%2Fv2.1.2.mod mirror://goproxy//github.com/nats-io/nats-streaming-server/@v/v0.14.2.zip -> github.com%2Fnats-io%2Fnats-streaming-server%2F@v%2Fv0.14.2.zip mirror://goproxy//github.com/nats-io/nats-streaming-server/@v/v0.14.2.mod -> github.com%2Fnats-io%2Fnats-streaming-server%2F@v%2Fv0.14.2.mod mirror://goproxy//github.com/nats-io/nats.go/@v/v1.9.1.zip -> github.com%2Fnats-io%2Fnats.go%2F@v%2Fv1.9.1.zip mirror://goproxy//github.com/nats-io/nats.go/@v/v1.9.1.mod -> github.com%2Fnats-io%2Fnats.go%2F@v%2Fv1.9.1.mod mirror://goproxy//github.com/nats-io/nkeys/@v/v0.1.0.mod -> github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/nats-io/nkeys/@v/v0.1.3.zip -> github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/nats-io/nkeys/@v/v0.1.3.mod -> github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/nats-io/nuid/@v/v1.0.1.zip -> github.com%2Fnats-io%2Fnuid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/nats-io/nuid/@v/v1.0.1.mod -> github.com%2Fnats-io%2Fnuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/nats-io/stan.go/@v/v0.4.5.zip -> github.com%2Fnats-io%2Fstan.go%2F@v%2Fv0.4.5.zip mirror://goproxy//github.com/nats-io/stan.go/@v/v0.4.5.mod -> github.com%2Fnats-io%2Fstan.go%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/ncw/directio/@v/v1.0.5.zip -> github.com%2Fncw%2Fdirectio%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/ncw/directio/@v/v1.0.5.mod -> github.com%2Fncw%2Fdirectio%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/nsqio/go-nsq/@v/v1.0.7.zip -> github.com%2Fnsqio%2Fgo-nsq%2F@v%2Fv1.0.7.zip mirror://goproxy//github.com/nsqio/go-nsq/@v/v1.0.7.mod -> github.com%2Fnsqio%2Fgo-nsq%2F@v%2Fv1.0.7.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/pborman/getopt/@v/v0.0.0-20180729010549-6fdd0a2c7117.mod -> github.com%2Fpborman%2Fgetopt%2F@v%2Fv0.0.0-20180729010549-6fdd0a2c7117.mod mirror://goproxy//github.com/philhofer/fwd/@v/v1.0.0.zip -> github.com%2Fphilhofer%2Ffwd%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/philhofer/fwd/@v/v1.0.0.mod -> github.com%2Fphilhofer%2Ffwd%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.2.6+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.2.6+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.4.0+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.4.0+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.4.0+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.4.0+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20181016184325-3113b8401b8a.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20190704165056-9c2d0518ed81.zip -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20190704165056-9c2d0518ed81.zip mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20190704165056-9c2d0518ed81.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20190704165056-9c2d0518ed81.mod mirror://goproxy//github.com/rjeczalik/notify/@v/v0.9.2.zip -> github.com%2Frjeczalik%2Fnotify%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/rjeczalik/notify/@v/v0.9.2.mod -> github.com%2Frjeczalik%2Fnotify%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rs/cors/@v/v1.7.0.zip -> github.com%2Frs%2Fcors%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/rs/cors/@v/v1.7.0.mod -> github.com%2Frs%2Fcors%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.zip -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/secure-io/sio-go/@v/v0.3.0.zip -> github.com%2Fsecure-io%2Fsio-go%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/secure-io/sio-go/@v/v0.3.0.mod -> github.com%2Fsecure-io%2Fsio-go%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v2.20.3-0.20200314133625-53cec6b37e6a+incompatible.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.3-0.20200314133625-53cec6b37e6a+incompatible.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v2.20.3-0.20200314133625-53cec6b37e6a+incompatible.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.3-0.20200314133625-53cec6b37e6a+incompatible.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.5.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.5.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20190401211740-f487f9de1cd3.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20190401211740-f487f9de1cd3.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20190401211740-f487f9de1cd3.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20190401211740-f487f9de1cd3.mod mirror://goproxy//github.com/smartystreets/go-aws-auth/@v/v0.0.0-20180515143844-0c1422d1fdb9.mod -> github.com%2Fsmartystreets%2Fgo-aws-auth%2F@v%2Fv0.0.0-20180515143844-0c1422d1fdb9.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.zip -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.zip -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190404075320-75d898a42a94.zip -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190404075320-75d898a42a94.zip mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190404075320-75d898a42a94.mod -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190404075320-75d898a42a94.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/tidwall/gjson/@v/v1.3.5.zip -> github.com%2Ftidwall%2Fgjson%2F@v%2Fv1.3.5.zip mirror://goproxy//github.com/tidwall/gjson/@v/v1.3.5.mod -> github.com%2Ftidwall%2Fgjson%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/tidwall/match/@v/v1.0.1.zip -> github.com%2Ftidwall%2Fmatch%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/tidwall/match/@v/v1.0.1.mod -> github.com%2Ftidwall%2Fmatch%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.0.zip -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.0.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/tidwall/sjson/@v/v1.0.4.zip -> github.com%2Ftidwall%2Fsjson%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/tidwall/sjson/@v/v1.0.4.mod -> github.com%2Ftidwall%2Fsjson%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/tinylib/msgp/@v/v1.1.1.zip -> github.com%2Ftinylib%2Fmsgp%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/tinylib/msgp/@v/v1.1.1.mod -> github.com%2Ftinylib%2Fmsgp%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.zip -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.zip mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.5-pre.zip -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.5-pre.zip mirror://goproxy//github.com/ugorji/go/@v/v1.1.5-pre.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.5-pre.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v1.1.5-pre.zip -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv1.1.5-pre.zip mirror://goproxy//github.com/ugorji/go/codec/@v/v1.1.5-pre.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv1.1.5-pre.mod mirror://goproxy//github.com/valyala/tcplisten/@v/v0.0.0-20161114210144-ceec8f93295a.zip -> github.com%2Fvalyala%2Ftcplisten%2F@v%2Fv0.0.0-20161114210144-ceec8f93295a.zip mirror://goproxy//github.com/valyala/tcplisten/@v/v0.0.0-20161114210144-ceec8f93295a.mod -> github.com%2Fvalyala%2Ftcplisten%2F@v%2Fv0.0.0-20161114210144-ceec8f93295a.mod mirror://goproxy//github.com/willf/bitset/@v/v1.1.10.zip -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/willf/bitset/@v/v1.1.10.mod -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/willf/bloom/@v/v2.0.3+incompatible.zip -> github.com%2Fwillf%2Fbloom%2F@v%2Fv2.0.3+incompatible.zip mirror://goproxy//github.com/willf/bloom/@v/v2.0.3+incompatible.mod -> github.com%2Fwillf%2Fbloom%2F@v%2Fv2.0.3+incompatible.mod mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.zip -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.zip mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.mod -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.mod mirror://goproxy//github.com/xdg/stringprep/@v/v1.0.0.zip -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/xdg/stringprep/@v/v1.0.0.mod -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.zip -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.zip mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.zip -> go.opencensus.io%2F@v%2Fv0.21.0.zip mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.zip -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.zip mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.15.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.15.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.15.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.15.0.mod mirror://goproxy//golang.org/x/arch/@v/v0.0.0-20190909030613-46d78d1859ac.mod -> golang.org%2Fx%2Farch%2F@v%2Fv0.0.0-20190909030613-46d78d1859ac.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180723164146-c126467f60eb.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180723164146-c126467f60eb.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181106171534-e4dc69e5b2fd.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181106171534-e4dc69e5b2fd.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190404164418-38d8ce5564a5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190404164418-38d8ce5564a5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190513172903-22d7a77e9e5f.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190513172903-22d7a77e9e5f.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190701094942-4def268fd1a4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200604202706-70a84ac30bf9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200604202706-70a84ac30bf9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200604202706-70a84ac30bf9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200604202706-70a84ac30bf9.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180926160741-c2ed4eda69e7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180926160741-c2ed4eda69e7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190129075346-302c3dd5f1cc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190130150945-aca44879d564.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190130150945-aca44879d564.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190523142557-0e01d883c5c5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200610111108-226ff32320da.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200610111108-226ff32320da.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200610111108-226ff32320da.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200610111108-226ff32320da.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20181227161524-e6919f6577db.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190914235951-31e00f45c22e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190914235951-31e00f45c22e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029041327-9cc4af7d6b2c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029190741-b9c20aec41a5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200502202811-ed308ab3e770.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200502202811-ed308ab3e770.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200502202811-ed308ab3e770.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200502202811-ed308ab3e770.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.5.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.5.0.zip mirror://goproxy//google.golang.org/api/@v/v0.5.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190404172233-64821d5d2107.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190508193815-b515fa19cec8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190508193815-b515fa19cec8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190513181449-d00d292a067c.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190513181449-d00d292a067c.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190513181449-d00d292a067c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190513181449-d00d292a067c.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.22.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.zip -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.zip mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.mod -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.28.zip -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.28.zip mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.28.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.28.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.42.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.57.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.57.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.mod mirror://goproxy//gopkg.in/jcmturner/aescts.v1/@v/v1.0.1.zip -> gopkg.in%2Fjcmturner%2Faescts.v1%2F@v%2Fv1.0.1.zip mirror://goproxy//gopkg.in/jcmturner/aescts.v1/@v/v1.0.1.mod -> gopkg.in%2Fjcmturner%2Faescts.v1%2F@v%2Fv1.0.1.mod mirror://goproxy//gopkg.in/jcmturner/dnsutils.v1/@v/v1.0.1.zip -> gopkg.in%2Fjcmturner%2Fdnsutils.v1%2F@v%2Fv1.0.1.zip mirror://goproxy//gopkg.in/jcmturner/dnsutils.v1/@v/v1.0.1.mod -> gopkg.in%2Fjcmturner%2Fdnsutils.v1%2F@v%2Fv1.0.1.mod mirror://goproxy//gopkg.in/jcmturner/goidentity.v3/@v/v3.0.0.zip -> gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.zip mirror://goproxy//gopkg.in/jcmturner/goidentity.v3/@v/v3.0.0.mod -> gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.mod mirror://goproxy//gopkg.in/jcmturner/gokrb5.v7/@v/v7.2.3.zip -> gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.2.3.zip mirror://goproxy//gopkg.in/jcmturner/gokrb5.v7/@v/v7.2.3.mod -> gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.2.3.mod mirror://goproxy//gopkg.in/jcmturner/gokrb5.v7/@v/v7.3.0.zip -> gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.3.0.zip mirror://goproxy//gopkg.in/jcmturner/gokrb5.v7/@v/v7.3.0.mod -> gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.3.0.mod mirror://goproxy//gopkg.in/jcmturner/rpc.v1/@v/v1.1.0.zip -> gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.zip mirror://goproxy//gopkg.in/jcmturner/rpc.v1/@v/v1.1.0.mod -> gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.mod mirror://goproxy//gopkg.in/ldap.v3/@v/v3.0.3.zip -> gopkg.in%2Fldap.v3%2F@v%2Fv3.0.3.zip mirror://goproxy//gopkg.in/ldap.v3/@v/v3.0.3.mod -> gopkg.in%2Fldap.v3%2F@v%2Fv3.0.3.mod mirror://goproxy//gopkg.in/olivere/elastic.v5/@v/v5.0.80.zip -> gopkg.in%2Folivere%2Felastic.v5%2F@v%2Fv5.0.80.zip mirror://goproxy//gopkg.in/olivere/elastic.v5/@v/v5.0.80.mod -> gopkg.in%2Folivere%2Felastic.v5%2F@v%2Fv5.0.80.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod mirror://goproxy//gopkg.in/urfave/cli.v1/@v/v1.20.0.mod -> gopkg.in%2Furfave%2Fcli.v1%2F@v%2Fv1.20.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//rsc.io/pdf/@v/v0.1.1.mod -> rsc.io%2Fpdf%2F@v%2Fv0.1.1.mod
+_eclasses_=go-module	45394825d9260b479aa1cf252ea58e01	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=7b78ab4051ccb4b7c54a372149df1d11
diff --git a/metadata/md5-cache/net-fs/ncpfs-2.2.6-r3 b/metadata/md5-cache/net-fs/ncpfs-2.2.6-r3
deleted file mode 100644
index 6ba9093fef09..000000000000
--- a/metadata/md5-cache/net-fs/ncpfs-2.2.6-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=nls? ( sys-devel/gettext ) pam? ( sys-libs/pam ) php? ( || ( dev-lang/php virtual/httpd-php ) )
-DESCRIPTION=Provides Access to Netware services using the NCP protocol
-EAPI=5
-HOMEPAGE=ftp://platan.vc.cvut.cz/pub/linux/ncpfs/
-IUSE=nls pam php
-KEYWORDS=amd64 ~mips ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=nls? ( sys-devel/gettext ) pam? ( sys-libs/pam ) php? ( || ( dev-lang/php virtual/httpd-php ) )
-SLOT=0
-SRC_URI=ftp://platan.vc.cvut.cz/pub/linux/ncpfs/ncpfs-2.2.6.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c4c92b865ca0d05045de08beff2d79bc
diff --git a/metadata/md5-cache/net-fs/ncpfs-2.2.6-r4 b/metadata/md5-cache/net-fs/ncpfs-2.2.6-r4
deleted file mode 100644
index 16c198361e75..000000000000
--- a/metadata/md5-cache/net-fs/ncpfs-2.2.6-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=nls? ( sys-devel/gettext ) pam? ( sys-libs/pam ) php? ( || ( dev-lang/php:* virtual/httpd-php:* ) )
-DESCRIPTION=Provides access to Netware services using the NCP protocol
-EAPI=6
-HOMEPAGE=ftp://platan.vc.cvut.cz/pub/linux/ncpfs/
-IUSE=nls pam php
-KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=nls? ( sys-devel/gettext ) pam? ( sys-libs/pam ) php? ( || ( dev-lang/php:* virtual/httpd-php:* ) )
-SLOT=0
-SRC_URI=ftp://platan.vc.cvut.cz/pub/linux/ncpfs/ncpfs-2.2.6.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8671f2e14e14efa87f2ea9ae2bd0ad97
diff --git a/metadata/md5-cache/net-fs/ncpfs-2.2.6-r5 b/metadata/md5-cache/net-fs/ncpfs-2.2.6-r5
deleted file mode 100644
index c534c337d82e..000000000000
--- a/metadata/md5-cache/net-fs/ncpfs-2.2.6-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=nls? ( sys-devel/gettext ) pam? ( sys-libs/pam )
-DESCRIPTION=Provides access to Netware services using the NCP protocol
-EAPI=6
-HOMEPAGE=ftp://platan.vc.cvut.cz/pub/linux/ncpfs/
-IUSE=nls pam
-KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=nls? ( sys-devel/gettext ) pam? ( sys-libs/pam )
-SLOT=0
-SRC_URI=ftp://platan.vc.cvut.cz/pub/linux/ncpfs/ncpfs-2.2.6.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8c936a5d47d24f59bee05045c7516213
diff --git a/metadata/md5-cache/net-fs/nfs-utils-2.3.4 b/metadata/md5-cache/net-fs/nfs-utils-2.3.4
deleted file mode 100644
index 176b54007376..000000000000
--- a/metadata/md5-cache/net-fs/nfs-utils-2.3.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=net-libs/rpcsvc-proto 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
-DEPEND=>=dev-db/sqlite-3.3 dev-libs/libxml2 net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-libs/e2fsprogs-libs caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap ) libmount? ( sys-apps/util-linux ) nfsv4? ( dev-libs/libevent:= >=sys-apps/keyutils-1.5.9 kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux )
-DESCRIPTION=NFS client and server daemons
-EAPI=7
-HOMEPAGE=http://linux-nfs.org/
-IUSE=caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-db/sqlite-3.3 dev-libs/libxml2 net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-libs/e2fsprogs-libs caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap ) libmount? ( sys-apps/util-linux ) nfsv4? ( dev-libs/libevent:= >=sys-apps/keyutils-1.5.9 kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux ) !net-libs/libnfsidmap !net-nds/portmap !<sys-apps/openrc-0.13.9 selinux? ( sec-policy/selinux-rpc sec-policy/selinux-rpcbind )
-REQUIRED_USE=kerberos? ( nfsv4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/nfs/nfs-utils-2.3.4.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=315af0f06914a55c8c7615d2b4c902ca
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 ab11ea33e05f..958a1717a380 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
@@ -12,5 +12,5 @@ REQUIRED_USE=kerberos? ( nfsv4 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nfs/nfs-utils-2.4.1.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=61bc2122aac6555f22ad4f133fdaefb4
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
deleted file mode 100644
index 54deb61a08e3..000000000000
--- a/metadata/md5-cache/net-fs/nfs-utils-2.4.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=net-libs/rpcsvc-proto 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
-DEPEND=>=dev-db/sqlite-3.3 dev-libs/libxml2 net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-libs/e2fsprogs-libs caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap ) libmount? ( sys-apps/util-linux ) nfsv4? ( dev-libs/libevent:= >=sys-apps/keyutils-1.5.9:= kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux )
-DESCRIPTION=NFS client and server daemons
-EAPI=7
-HOMEPAGE=http://linux-nfs.org/
-IUSE=caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-db/sqlite-3.3 dev-libs/libxml2 net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-libs/e2fsprogs-libs caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap ) libmount? ( sys-apps/util-linux ) nfsv4? ( dev-libs/libevent:= >=sys-apps/keyutils-1.5.9:= kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux ) !net-libs/libnfsidmap !net-nds/portmap !<sys-apps/openrc-0.13.9 selinux? ( sec-policy/selinux-rpc sec-policy/selinux-rpcbind )
-REQUIRED_USE=kerberos? ( nfsv4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/nfs/nfs-utils-2.4.2.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e92ea3169fbb2be94769a9bfbd3fb3df
diff --git a/metadata/md5-cache/net-fs/nfs-utils-2.4.3 b/metadata/md5-cache/net-fs/nfs-utils-2.4.3
index 673f3ac25f38..826ca71a4909 100644
--- a/metadata/md5-cache/net-fs/nfs-utils-2.4.3
+++ b/metadata/md5-cache/net-fs/nfs-utils-2.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=kerberos? ( nfsv4 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nfs/nfs-utils-2.4.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2f252db7c0fd40d2ce3e7c2dd34ca12b
diff --git a/metadata/md5-cache/net-fs/nfs-utils-2.5.1 b/metadata/md5-cache/net-fs/nfs-utils-2.5.1
new file mode 100644
index 000000000000..d0e51662d530
--- /dev/null
+++ b/metadata/md5-cache/net-fs/nfs-utils-2.5.1
@@ -0,0 +1,16 @@
+BDEPEND=net-libs/rpcsvc-proto 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
+DEPEND=>=dev-db/sqlite-3.3 dev-libs/libxml2 net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-libs/e2fsprogs-libs caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap ) libmount? ( sys-apps/util-linux ) nfsv4? ( dev-libs/libevent:= >=sys-apps/keyutils-1.5.9:= kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux )
+DESCRIPTION=NFS client and server daemons
+EAPI=7
+HOMEPAGE=http://linux-nfs.org/
+IUSE=caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-db/sqlite-3.3 dev-libs/libxml2 net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-libs/e2fsprogs-libs caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap ) libmount? ( sys-apps/util-linux ) nfsv4? ( dev-libs/libevent:= >=sys-apps/keyutils-1.5.9:= kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux ) !net-libs/libnfsidmap !net-nds/portmap !<sys-apps/openrc-0.13.9 selinux? ( sec-policy/selinux-rpc sec-policy/selinux-rpcbind )
+REQUIRED_USE=kerberos? ( nfsv4 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/nfs/nfs-utils-2.5.1.tar.bz2
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2f252db7c0fd40d2ce3e7c2dd34ca12b
diff --git a/metadata/md5-cache/net-fs/openafs-1.8.2-r1 b/metadata/md5-cache/net-fs/openafs-1.8.2-r1
index 9d7a0b80f162..524dc382f558 100644
--- a/metadata/md5-cache/net-fs/openafs-1.8.2-r1
+++ b/metadata/md5-cache/net-fs/openafs-1.8.2-r1
@@ -10,5 +10,5 @@ LICENSE=IBM BSD openafs-krb5-a APSL-2
 RDEPEND=!net-fs/openafs-kernel virtual/libintl amd64? ( tsm? ( app-backup/tsm ) ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.3 ) fuse? ( sys-fs/fuse:0= ) kauth? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) ncurses? ( sys-libs/ncurses:0= ) kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://openafs.org/dl/openafs/1.8.2/openafs-1.8.2-src.tar.bz2 https://openafs.org/dl/openafs/1.8.2/openafs-1.8.2-doc.tar.bz2 https://dev.gentoo.org/~bircoph/afs/openafs-patches-20190106.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=53cb4e40d190d3be19454c52f9e85e86
diff --git a/metadata/md5-cache/net-fs/openafs-kernel-1.6.22.1 b/metadata/md5-cache/net-fs/openafs-kernel-1.6.22.1
index 6fb327f64fd3..5b38b3aaae16 100644
--- a/metadata/md5-cache/net-fs/openafs-kernel-1.6.22.1
+++ b/metadata/md5-cache/net-fs/openafs-kernel-1.6.22.1
@@ -9,5 +9,5 @@ LICENSE=IBM BSD openafs-krb5-a APSL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://openafs.org/dl/openafs/1.6.22.1/openafs-1.6.22.1-src.tar.bz2 https://dev.gentoo.org/~bircoph/afs/openafs-patches-20170822.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=dbf9ba9d02153fdfb4b293436ba53102
diff --git a/metadata/md5-cache/net-fs/openafs-kernel-1.6.22.2 b/metadata/md5-cache/net-fs/openafs-kernel-1.6.22.2
index 327d058c5d96..da3e6a86a2c8 100644
--- a/metadata/md5-cache/net-fs/openafs-kernel-1.6.22.2
+++ b/metadata/md5-cache/net-fs/openafs-kernel-1.6.22.2
@@ -9,5 +9,5 @@ LICENSE=IBM BSD openafs-krb5-a APSL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://openafs.org/dl/openafs/1.6.22.2/openafs-1.6.22.2-src.tar.bz2 https://dev.gentoo.org/~bircoph/afs/openafs-patches-20170822.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=7f1a1d1e625435a647848fb817b16c6b
diff --git a/metadata/md5-cache/net-fs/samba-4.11.6-r2 b/metadata/md5-cache/net-fs/samba-4.11.6-r2
deleted file mode 100644
index cb65b8841842..000000000000
--- a/metadata/md5-cache/net-fs/samba-4.11.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/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.1.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.1.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	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	cf9742c01975dc707eb982114a9d70fa
-_md5_=625349e0c79b54921728c016bb54891c
diff --git a/metadata/md5-cache/net-fs/samba-4.11.8 b/metadata/md5-cache/net-fs/samba-4.11.8
index 7b6b712a5df0..c7252d002707 100644
--- a/metadata/md5-cache/net-fs/samba-4.11.8
+++ b/metadata/md5-cache/net-fs/samba-4.11.8
@@ -4,12 +4,12 @@ DESCRIPTION=Samba Suite Version 4
 EAPI=6
 HOMEPAGE=https://www.samba.org/
 IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam 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
+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/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/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_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(-)?] >=net-libs/gnutls-3.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(-)?] 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/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(-)?] sys-libs/e2fsprogs-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/ldb-2.0.10[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.1.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= 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.8.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	cf9742c01975dc707eb982114a9d70fa
-_md5_=08776c2cd440bad131912beb2b880b96
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	cf9742c01975dc707eb982114a9d70fa
+_md5_=2e25691eb5c9d1d6b63f735ad376b415
diff --git a/metadata/md5-cache/net-fs/samba-4.11.9 b/metadata/md5-cache/net-fs/samba-4.11.9
deleted file mode 100644
index f38c2edfaf46..000000000000
--- a/metadata/md5-cache/net-fs/samba-4.11.9
+++ /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/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/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_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(-)?] >=net-libs/gnutls-3.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(-)?] 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/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(-)?] sys-libs/e2fsprogs-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/ldb-2.0.10[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.1.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= 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 >=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/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/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/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_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(-)?] >=net-libs/gnutls-3.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(-)?] 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/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(-)?] sys-libs/e2fsprogs-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/ldb-2.0.10[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.1.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= 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.9.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	cf9742c01975dc707eb982114a9d70fa
-_md5_=10950749272e88ca4a024a58ce1df8f2
diff --git a/metadata/md5-cache/net-fs/samba-4.11.9-r1 b/metadata/md5-cache/net-fs/samba-4.11.9-r1
index 74e90fc86d4b..552539a987d1 100644
--- a/metadata/md5-cache/net-fs/samba-4.11.9-r1
+++ b/metadata/md5-cache/net-fs/samba-4.11.9-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap win
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.11.9.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	cf9742c01975dc707eb982114a9d70fa
-_md5_=71007f29be270da37c7d134d753b7ac3
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	cf9742c01975dc707eb982114a9d70fa
+_md5_=3500e06bfd993ea8147e28f5d421e2eb
diff --git a/metadata/md5-cache/net-fs/samba-4.12.2 b/metadata/md5-cache/net-fs/samba-4.12.2
deleted file mode 100644
index 2333293ae6f6..000000000000
--- a/metadata/md5-cache/net-fs/samba-4.12.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/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(-)?] 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/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_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-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,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/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(-)?] sys-libs/e2fsprogs-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/ldb-2.1.2[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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_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:0= >=sys-libs/talloc-2.3.1[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.3[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.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/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 >=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(-)?] 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 ~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/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(-)?] 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/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_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-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,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/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(-)?] sys-libs/e2fsprogs-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/ldb-2.1.2[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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_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:0= >=sys-libs/talloc-2.3.1[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.3[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.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/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 )
-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.12.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	cf9742c01975dc707eb982114a9d70fa
-_md5_=007bd92b83aff7016a6e520445cc0b5d
diff --git a/metadata/md5-cache/net-fs/samba-4.12.3 b/metadata/md5-cache/net-fs/samba-4.12.3
deleted file mode 100644
index 4366be8b8d66..000000000000
--- a/metadata/md5-cache/net-fs/samba-4.12.3
+++ /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/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(-)?] 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/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_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-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,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/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(-)?] sys-libs/e2fsprogs-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/ldb-2.1.3[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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_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:0= >=sys-libs/talloc-2.3.1[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.3[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.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/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 >=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(-)?] 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 ~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/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(-)?] 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/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_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-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,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/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(-)?] sys-libs/e2fsprogs-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/ldb-2.1.3[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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_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:0= >=sys-libs/talloc-2.3.1[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.3[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.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/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 )
-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.12.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	cf9742c01975dc707eb982114a9d70fa
-_md5_=26feb71a620e7fbc1cdca8265a7cd543
diff --git a/metadata/md5-cache/net-fs/samba-4.12.3-r1 b/metadata/md5-cache/net-fs/samba-4.12.3-r1
index 55c3de5d114b..c0c3be0f8ad4 100644
--- a/metadata/md5-cache/net-fs/samba-4.12.3-r1
+++ b/metadata/md5-cache/net-fs/samba-4.12.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap win
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.12.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	cf9742c01975dc707eb982114a9d70fa
-_md5_=2430de65f2deab80c48d3255a6e5f75c
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	cf9742c01975dc707eb982114a9d70fa
+_md5_=3a68171f3e3b1a555b615dd8c0b39ac7
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index 0beed59919d9..e351b0b5c317 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/profxp-3_pre2-r2 b/metadata/md5-cache/net-ftp/profxp-3_pre2-r2
index ed1dd743a81a..cf40ba4f12aa 100644
--- a/metadata/md5-cache/net-ftp/profxp-3_pre2-r2
+++ b/metadata/md5-cache/net-ftp/profxp-3_pre2-r2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://duncanthrax.net/profxp/profxp-v3-pre2-src.tar.gz http://search.cpan.org/src/CLINTDW/SOCKS-0.03/lib/Net/SOCKS.pm
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d76ae7a5af190c8e82dd2da6151c30e1
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 38d759b34003..7fef932767f2 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/coturn-4.5.1.1 b/metadata/md5-cache/net-im/coturn-4.5.1.1
deleted file mode 100644
index 4fdcee803626..000000000000
--- a/metadata/md5-cache/net-im/coturn-4.5.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst
-DEPEND=acct-group/turnserver acct-user/turnserver || ( dev-libs/libevent[-ssl,libressl] dev-libs/libevent[ssl,-libressl] >dev-libs/libevent-2.1.8[ssl,libressl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:* ) redis? ( dev-libs/hiredis ) sqlite? ( dev-db/sqlite )
-DESCRIPTION=coturn TURN server project
-EAPI=7
-HOMEPAGE=https://github.com/coturn/coturn
-IUSE=mongodb mysql postgres redis sqlite
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=acct-group/turnserver acct-user/turnserver || ( dev-libs/libevent[-ssl,libressl] dev-libs/libevent[ssl,-libressl] >dev-libs/libevent-2.1.8[ssl,libressl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:* ) redis? ( dev-libs/hiredis ) sqlite? ( dev-db/sqlite ) virtual/tmpfiles
-SLOT=0
-SRC_URI=https://github.com/coturn/coturn/archive/4.5.1.1.tar.gz -> coturn-4.5.1.1.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=698214bb5054876e1138464cf41706a2
diff --git a/metadata/md5-cache/net-im/coturn-4.5.1.2 b/metadata/md5-cache/net-im/coturn-4.5.1.2
new file mode 100644
index 000000000000..ea8e04c7e33a
--- /dev/null
+++ b/metadata/md5-cache/net-im/coturn-4.5.1.2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst
+DEPEND=acct-group/turnserver acct-user/turnserver || ( dev-libs/libevent[-ssl,libressl] dev-libs/libevent[ssl,-libressl] >dev-libs/libevent-2.1.8[ssl,libressl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:* ) redis? ( dev-libs/hiredis ) sqlite? ( dev-db/sqlite )
+DESCRIPTION=coturn TURN server project
+EAPI=7
+HOMEPAGE=https://github.com/coturn/coturn
+IUSE=mongodb mysql postgres redis sqlite
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=acct-group/turnserver acct-user/turnserver || ( dev-libs/libevent[-ssl,libressl] dev-libs/libevent[ssl,-libressl] >dev-libs/libevent-2.1.8[ssl,libressl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:* ) redis? ( dev-libs/hiredis ) sqlite? ( dev-db/sqlite ) virtual/tmpfiles
+SLOT=0
+SRC_URI=https://github.com/coturn/coturn/archive/4.5.1.2.tar.gz -> coturn-4.5.1.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9385c7ddacd5f3e61d5439ed6f8a4f6d
diff --git a/metadata/md5-cache/net-im/coturn-9999 b/metadata/md5-cache/net-im/coturn-9999
index a0736ec2a71b..df54dbc3e73b 100644
--- a/metadata/md5-cache/net-im/coturn-9999
+++ b/metadata/md5-cache/net-im/coturn-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=acct-group/turnserver acct-user/turnserver || ( dev-libs/libevent[-ssl,libressl] dev-libs/libevent[ssl,-libressl] >dev-libs/libevent-2.1.8[ssl,libressl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:* ) redis? ( dev-libs/hiredis ) sqlite? ( dev-db/sqlite ) virtual/tmpfiles
 SLOT=0
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=698214bb5054876e1138464cf41706a2
+_md5_=9385c7ddacd5f3e61d5439ed6f8a4f6d
diff --git a/metadata/md5-cache/net-im/discord-bin-0.0.10 b/metadata/md5-cache/net-im/discord-bin-0.0.10
index d43a275cca69..1e9ff2f2170e 100644
--- a/metadata/md5-cache/net-im/discord-bin-0.0.10
+++ b/metadata/md5-cache/net-im/discord-bin-0.0.10
@@ -8,5 +8,5 @@ RDEPEND=dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss m
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://dl.discordapp.net/apps/linux/0.0.10/discord-0.0.10.deb
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2f796aae409262ae30d546ed9e0be976
diff --git a/metadata/md5-cache/net-im/gajim-1.2.0 b/metadata/md5-cache/net-im/gajim-1.2.0
new file mode 100644
index 000000000000..eaacc6d18f2c
--- /dev/null
+++ b/metadata/md5-cache/net-im/gajim-1.2.0
@@ -0,0 +1,15 @@
+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_8? ( dev-lang/python:3.8[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] )
+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://gajim.org/
+IUSE=+crypt geolocation jingle remote rst +spell upnp +webp python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+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-1.0.0[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/css-parser[python_targets_python3_6(-)] dev-python/packaging[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 ) 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-1.0.0[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/css-parser[python_targets_python3_7(-)] dev-python/packaging[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 ) 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_8? ( dev-python/idna[python_targets_python3_8(-)] dev-python/precis-i18n[python_targets_python3_8(-)] dev-python/pyasn1[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pycurl[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] >=dev-python/pyopenssl-0.14[python_targets_python3_8(-)] >=dev-python/python-nbxmpp-1.0.0[python_targets_python3_8(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_8(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_8(-)] dev-python/css-parser[python_targets_python3_8(-)] dev-python/packaging[python_targets_python3_8(-)] crypt? ( dev-python/pycryptodome[python_targets_python3_8(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_8(-)] ) 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 ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_8(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_8(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_8(-)] ) ) 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_8? ( dev-lang/python:3.8[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.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://gajim.org/downloads/1.2/gajim-1.2.0.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=38fd5898349c0766946c6269a2147edf
diff --git a/metadata/md5-cache/net-im/gitter-bin-3.1.0 b/metadata/md5-cache/net-im/gitter-bin-3.1.0
index 2f7567c6a397..0a7f18432f83 100644
--- a/metadata/md5-cache/net-im/gitter-bin-3.1.0
+++ b/metadata/md5-cache/net-im/gitter-bin-3.1.0
@@ -8,5 +8,5 @@ RDEPEND=dev-libs/expat:0 dev-libs/glib:2 dev-libs/nspr:0 dev-libs/nss:0 gnome-ba
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://update.gitter.im/linux64/gitter_3.1.0_amd64.deb ) x86? ( https://update.gitter.im/linux32/gitter_3.1.0_i386.deb )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=301b73723c403db303261cf05003b4c8
diff --git a/metadata/md5-cache/net-im/gitter-bin-4.1.0 b/metadata/md5-cache/net-im/gitter-bin-4.1.0
index 8129554af3d9..d02b01addd40 100644
--- a/metadata/md5-cache/net-im/gitter-bin-4.1.0
+++ b/metadata/md5-cache/net-im/gitter-bin-4.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://update.gitter.im/linux64/gitter_4.1.0_amd64.deb ) x86? ( https://update.gitter.im/linux32/gitter_4.1.0_i386.deb )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4e09d0ec46f61899e5a33340f317f5a3
diff --git a/metadata/md5-cache/net-im/sendxmpp-1.24 b/metadata/md5-cache/net-im/sendxmpp-1.24
index c3e348a61f5d..c7d135013d9a 100644
--- a/metadata/md5-cache/net-im/sendxmpp-1.24
+++ b/metadata/md5-cache/net-im/sendxmpp-1.24
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/Net-XMPP dev-perl/Authen-SASL virtual/perl-Getopt-Long dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://github.com/lhost/sendxmpp/archive/v1.24.tar.gz -> sendxmpp-1.24.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=48cf605642bfffc919334688800cd652
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-1.34.1 b/metadata/md5-cache/net-im/signal-desktop-bin-1.34.1
deleted file mode 100644
index 7fa761402bf9..000000000000
--- a/metadata/md5-cache/net-im/signal-desktop-bin-1.34.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-admin/chrpath
-DEFINED_PHASES=install postinst postrm prepare unpack
-DESCRIPTION=Allows you to send and receive messages of Signal Messenger on your computer
-EAPI=7
-HOMEPAGE=https://signal.org/ https://github.com/signalapp/Signal-Desktop
-KEYWORDS=-* ~amd64
-LICENSE=GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
-RDEPEND=dev-libs/nss media-libs/mesa[X(+)] net-print/cups x11-libs/gtk+:3[X] x11-libs/libXScrnSaver x11-libs/libXtst
-RESTRICT=splitdebug
-SLOT=0
-SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_1.34.1_amd64.deb
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=25d90ad8cc83925b3faceb282c1a24e7
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-1.34.3 b/metadata/md5-cache/net-im/signal-desktop-bin-1.34.3
new file mode 100644
index 000000000000..9997b57fc56d
--- /dev/null
+++ b/metadata/md5-cache/net-im/signal-desktop-bin-1.34.3
@@ -0,0 +1,13 @@
+BDEPEND=app-admin/chrpath
+DEFINED_PHASES=install postinst postrm prepare unpack
+DESCRIPTION=Allows you to send and receive messages of Signal Messenger on your computer
+EAPI=7
+HOMEPAGE=https://signal.org/ https://github.com/signalapp/Signal-Desktop
+KEYWORDS=-* ~amd64
+LICENSE=GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
+RDEPEND=dev-libs/nss media-libs/mesa[X(+)] net-print/cups x11-libs/gtk+:3[X] x11-libs/libXScrnSaver x11-libs/libXtst
+RESTRICT=splitdebug
+SLOT=0
+SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_1.34.3_amd64.deb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fb55abafcfb0fe0ab7b0f1d901ca4c00
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.59.0.77 b/metadata/md5-cache/net-im/skypeforlinux-8.59.0.77
index e19f4824c177..2509278463b9 100644
--- a/metadata/md5-cache/net-im/skypeforlinux-8.59.0.77
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.59.0.77
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.59.0.77-1.x86_64.rpm
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1a8f802f06f1c6ed7df1bf48f2d3302f
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.60.0.76 b/metadata/md5-cache/net-im/skypeforlinux-8.60.0.76
index c9363f8eb6c3..a889368d0fb7 100644
--- a/metadata/md5-cache/net-im/skypeforlinux-8.60.0.76
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.60.0.76
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.60.0.76-1.x86_64.rpm
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1a8f802f06f1c6ed7df1bf48f2d3302f
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.61.0.77 b/metadata/md5-cache/net-im/skypeforlinux-8.61.0.77
index b377fd3cca83..b2401b5471f7 100644
--- a/metadata/md5-cache/net-im/skypeforlinux-8.61.0.77
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.61.0.77
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.61.0.77-1.x86_64.rpm
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1a8f802f06f1c6ed7df1bf48f2d3302f
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.61.0.95 b/metadata/md5-cache/net-im/skypeforlinux-8.61.0.95
index 1ee1b6f4e84d..bb91d3958583 100644
--- a/metadata/md5-cache/net-im/skypeforlinux-8.61.0.95
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.61.0.95
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.61.0.95-1.x86_64.rpm
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1a8f802f06f1c6ed7df1bf48f2d3302f
diff --git a/metadata/md5-cache/net-im/slack-4.3.2-r2 b/metadata/md5-cache/net-im/slack-4.3.2-r2
index 6a2e240073a7..e37b517ee1ef 100644
--- a/metadata/md5-cache/net-im/slack-4.3.2-r2
+++ b/metadata/md5-cache/net-im/slack-4.3.2-r2
@@ -10,5 +10,5 @@ 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	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fe41cf280443a86e3d1dda8eaa201292
diff --git a/metadata/md5-cache/net-im/slack-4.4.2 b/metadata/md5-cache/net-im/slack-4.4.2
index 03fc695f6188..6a2be7014a47 100644
--- a/metadata/md5-cache/net-im/slack-4.4.2
+++ b/metadata/md5-cache/net-im/slack-4.4.2
@@ -10,5 +10,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-4.4.2-amd64.deb
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=21851968c6b6c3a18858146cca3cff01
diff --git a/metadata/md5-cache/net-im/slack-4.4.3 b/metadata/md5-cache/net-im/slack-4.4.3
index 116cbe8d4c46..a3cb27487113 100644
--- a/metadata/md5-cache/net-im/slack-4.4.3
+++ b/metadata/md5-cache/net-im/slack-4.4.3
@@ -10,5 +10,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-4.4.3-amd64.deb
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0d2b4ef612f5e2bef6f353b7cc797318
diff --git a/metadata/md5-cache/net-im/spectrum2-2.0.12-r2 b/metadata/md5-cache/net-im/spectrum2-2.0.12-r2
index 0e939d11057e..df3a6c8d88c0 100644
--- a/metadata/md5-cache/net-im/spectrum2-2.0.12-r2
+++ b/metadata/md5-cache/net-im/spectrum2-2.0.12-r2
@@ -5,7 +5,7 @@ DESCRIPTION=An open source instant messaging transport
 EAPI=7
 HOMEPAGE=https://www.spectrum.im
 IUSE=doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2+
 RDEPEND=acct-group/spectrum acct-user/spectrum dev-libs/boost:=[nls] dev-libs/expat dev-libs/libev:= dev-libs/log4cxx dev-libs/jsoncpp:= dev-libs/openssl:0= dev-libs/popt dev-libs/protobuf:= net-dns/libidn:0= net-im/swift:= net-misc/curl sys-libs/zlib:= frotz? ( !games-engines/frotz ) irc? ( net-im/libcommuni ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) postgres? ( >=dev-libs/libpqxx-6.4.5:= ) purple? ( dev-libs/glib net-im/pidgin:= ) sms? ( app-mobilephone/smstools ) sqlite? ( dev-db/sqlite:3 ) twitter? ( net-misc/curl ) whatsapp? ( net-im/transwhat )
 REQUIRED_USE=|| ( mysql postgres sqlite )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/SpectrumIM/spectrum2/archive/2.0.12.tar.gz -> spectrum2-2.0.12.tar.gz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d63ad812e10c7438fb0e4a6d7c6b4df4
+_md5_=55b081274e76106d3ce77859d4557b4e
diff --git a/metadata/md5-cache/net-im/teams-1.3.00.5153 b/metadata/md5-cache/net-im/teams-1.3.00.5153
index af94c3dfafd6..9c9bcd757fdd 100644
--- a/metadata/md5-cache/net-im/teams-1.3.00.5153
+++ b/metadata/md5-cache/net-im/teams-1.3.00.5153
@@ -8,5 +8,5 @@ RDEPEND=app-accessibility/at-spi2-atk app-crypt/libsecret dev-libs/atk dev-libs/
 RESTRICT=bindist mirror splitdebug test
 SLOT=0
 SRC_URI=https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_1.3.00.5153_amd64.deb
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b7410f0c2a3cec27c0b8cebe558bcc0c
diff --git a/metadata/md5-cache/net-im/telegram-desktop-2.1.13 b/metadata/md5-cache/net-im/telegram-desktop-2.1.13
new file mode 100644
index 000000000000..b64e03cfd402
--- /dev/null
+++ b/metadata/md5-cache/net-im/telegram-desktop-2.1.13
@@ -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 pretend setup test
+DEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) !net-im/telegram-desktop-bin app-arch/lz4:= app-arch/xz-utils !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-libs/xxhash dev-qt/qtcore:5 dev-qt/qtgui:5[jpeg,png,wayland?,X(-)?] dev-qt/qtimageformats:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5[png,X(-)?] media-fonts/open-sans media-libs/fontconfig:= >=media-libs/libtgvoip-2.4.4_p20200525[alsa?,pulseaudio?] media-libs/openal[alsa?,pulseaudio?] media-libs/opus:= media-video/ffmpeg:=[alsa?,opus,pulseaudio?] sys-libs/zlib[minizip] virtual/libiconv x11-libs/gtk+:3 dbus? ( dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) hunspell? ( >=app-text/hunspell-1.7:= ) pulseaudio? ( media-sound/pulseaudio ) dev-cpp/range-v3 =dev-cpp/ms-gsl-3*
+DESCRIPTION=Official desktop client for Telegram
+EAPI=7
+HOMEPAGE=https://desktop.telegram.org
+IUSE=+alsa +dbus enchant +hunspell libressl pulseaudio +spell wayland +X
+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-libs/xxhash dev-qt/qtcore:5 dev-qt/qtgui:5[jpeg,png,wayland?,X(-)?] dev-qt/qtimageformats:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5[png,X(-)?] media-fonts/open-sans media-libs/fontconfig:= >=media-libs/libtgvoip-2.4.4_p20200525[alsa?,pulseaudio?] media-libs/openal[alsa?,pulseaudio?] media-libs/opus:= media-video/ffmpeg:=[alsa?,opus,pulseaudio?] sys-libs/zlib[minizip] virtual/libiconv x11-libs/gtk+:3 dbus? ( dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) hunspell? ( >=app-text/hunspell-1.7:= ) pulseaudio? ( media-sound/pulseaudio )
+REQUIRED_USE=|| ( alsa pulseaudio ) || ( X wayland ) spell? ( ^^ ( enchant hunspell ) )
+SLOT=0
+SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v2.1.13/tdesktop-2.1.13-full.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6931797331fcf6c608d8e42c6bce96a1
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 65aca6da79ba..d8b4a8186c31 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/irccloud-desktop-bin-0.15.0 b/metadata/md5-cache/net-irc/irccloud-desktop-bin-0.15.0
new file mode 100644
index 000000000000..b1e2ddad45bb
--- /dev/null
+++ b/metadata/md5-cache/net-irc/irccloud-desktop-bin-0.15.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=>=x11-libs/gtk+-3.0 x11-libs/libnotify >=dev-libs/nss-3 x11-libs/libXScrnSaver x11-libs/libXtst x11-misc/xdg-utils net-print/cups >=app-accessibility/at-spi2-core-2.0.0 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=IRCCloud Desktop Client
+EAPI=7
+HOMEPAGE=https://github.com/irccloud/irccloud-desktop https://www.irccloud.com/
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=x11-libs/gtk+-3.0 x11-libs/libnotify >=dev-libs/nss-3 x11-libs/libXScrnSaver x11-libs/libXtst x11-misc/xdg-utils net-print/cups >=app-accessibility/at-spi2-core-2.0.0
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=https://github.com/irccloud/irccloud-desktop/releases/download/v0.15.0/irccloud-desktop_0.15.0_linux_amd64.deb
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ff1d8a26400a95a39732306394cf545f
diff --git a/metadata/md5-cache/net-irc/pisg-0.73-r1 b/metadata/md5-cache/net-irc/pisg-0.73-r1
index b4e8f53c6971..8ae59e969de6 100644
--- a/metadata/md5-cache/net-irc/pisg-0.73-r1
+++ b/metadata/md5-cache/net-irc/pisg-0.73-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/Text-Iconv dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/pisg/pisg-0.73.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3a3a8759ade36e7bc24235391741bcfd
diff --git a/metadata/md5-cache/net-irc/polari-3.34.1 b/metadata/md5-cache/net-irc/polari-3.34.1
index 51af480eafec..45419cae2c71 100644
--- a/metadata/md5-cache/net-irc/polari-3.34.1
+++ b/metadata/md5-cache/net-irc/polari-3.34.1
@@ -5,11 +5,11 @@ DESCRIPTION=An IRC client for Gnome
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Polari
 IUSE=test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.43.4:2 >=x11-libs/gtk+-3.21.6:3[introspection] net-libs/telepathy-glib[introspection] >=dev-libs/gobject-introspection-1.50:= >=dev-libs/gjs-1.57.3 x11-libs/gdk-pixbuf:2[introspection] >=app-text/gspell-1.4.0[introspection] x11-libs/pango[introspection] app-crypt/libsecret[introspection] net-libs/libsoup:2.4[introspection] net-im/telepathy-logger[introspection] >=net-irc/telepathy-idle-0.2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/polari/3.34/polari-3.34.1.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=43ba03e9aa3442005c82070aeaac6324
+_md5_=65f443839fcbbff2ae10843268278acf
diff --git a/metadata/md5-cache/net-irc/quassel-0.13.1-r2 b/metadata/md5-cache/net-irc/quassel-0.13.1-r2
index 097bf6f7a1a7..7274f3578211 100644
--- a/metadata/md5-cache/net-irc/quassel-0.13.1-r2
+++ b/metadata/md5-cache/net-irc/quassel-0.13.1-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity
 EAPI=7
 HOMEPAGE=https://quassel-irc.org/
 IUSE=bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify +ssl syslog urlpreview X
-KEYWORDS=amd64 ~arm ~ppc64 x86 ~amd64-linux ~sparc-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~sparc-solaris
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl?] sys-libs/zlib monolithic? ( acct-group/quassel acct-user/quassel dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[ssl] ) ldap? ( net-nds/openldap ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:5 oxygen? ( kde-frameworks/oxygen-icons:5 ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) !monolithic? ( server? ( acct-group/quassel acct-user/quassel dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[ssl] ) ldap? ( net-nds/openldap ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) ) X? ( dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:5 oxygen? ( kde-frameworks/oxygen-icons:5 ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) )
 REQUIRED_USE=|| ( X server monolithic ) crypt? ( || ( server monolithic ) ) kde? ( || ( X monolithic ) dbus ) ldap? ( || ( server monolithic ) ) postgres? ( || ( server monolithic ) ) snorenotify? ( || ( X monolithic ) ) syslog? ( || ( server monolithic ) )
 SLOT=0
 SRC_URI=https://quassel-irc.org/pub/quassel-0.13.1.tar.bz2
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=174eb89505a5ca5514aaeaaf639e916a
+_md5_=9597328acdd594a45cd6f8d0b365da21
diff --git a/metadata/md5-cache/net-irc/unrealircd-5.0.3.1 b/metadata/md5-cache/net-irc/unrealircd-5.0.3.1
deleted file mode 100644
index ee4e663ce084..000000000000
--- a/metadata/md5-cache/net-irc/unrealircd-5.0.3.1
+++ /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.3.1.tar.gz
-_eclasses_=ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350
-_md5_=68bb8e2d091874656832a700f191b36c
diff --git a/metadata/md5-cache/net-irc/unrealircd-5.0.4 b/metadata/md5-cache/net-irc/unrealircd-5.0.4
deleted file mode 100644
index f02ded23cafe..000000000000
--- a/metadata/md5-cache/net-irc/unrealircd-5.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig || ( dev-libs/openssl:0 dev-libs/libressl:0 ) virtual/pkgconfig
-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.4.tar.gz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=dc62ddbf4932e654dc3a2323a45bb3a6
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 429d5a00f56f..dc700bd4d243 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/cppzmq-4.6.0 b/metadata/md5-cache/net-libs/cppzmq-4.6.0
index 2da7988e99aa..354edc13270f 100644
--- a/metadata/md5-cache/net-libs/cppzmq-4.6.0
+++ b/metadata/md5-cache/net-libs/cppzmq-4.6.0
@@ -5,11 +5,11 @@ DESCRIPTION=High-level CPP Binding for ZeroMQ
 EAPI=7
 HOMEPAGE=https://github.com/zeromq/cppzmq
 IUSE=test
-KEYWORDS=~amd64 ~x86 ~x86-linux
+KEYWORDS=~amd64 ~arm ~x86 ~x86-linux
 LICENSE=MIT
 RDEPEND=>=net-libs/zeromq-4.3.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zeromq/cppzmq/archive/v4.6.0.tar.gz -> cppzmq-4.6.0.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=668cf42536e6f91e3e15a4a89d799423
+_md5_=1f85d28fb5632fbf1c545b3073bdab9f
diff --git a/metadata/md5-cache/net-libs/gssdp-1.2.3 b/metadata/md5-cache/net-libs/gssdp-1.2.3
new file mode 100644
index 000000000000..e2a5ace5f4d0
--- /dev/null
+++ b/metadata/md5-cache/net-libs/gssdp-1.2.3
@@ -0,0 +1,15 @@
+BDEPEND=gtk-doc? ( >=dev-util/gtk-doc-1.14 app-text/docbook-xml-dtd:4.1.2 ) virtual/pkgconfig vala? ( || ( dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) net-libs/libsoup:2.4[vala] ) 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.54: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.26.1: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?] gtk? ( >=x11-libs/gtk+-3.12:3 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GObject-based API for handling resource discovery and announcement over SSDP
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP
+IUSE=gtk-doc +introspection gtk 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 ~ppc ppc64 ~sparc x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.54: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.26.1: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?] gtk? ( >=x11-libs/gtk+-3.12:3 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+REQUIRED_USE=vala? ( introspection )
+SLOT=0/1.2-0
+SRC_URI=mirror://gnome/sources/gssdp/1.2/gssdp-1.2.3.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7f92e36212c10d32dabe879b26520676
diff --git a/metadata/md5-cache/net-libs/gtk-vnc-1.0.0 b/metadata/md5-cache/net-libs/gtk-vnc-1.0.0
index 9b472dbe3139..54c29f1879a9 100644
--- a/metadata/md5-cache/net-libs/gtk-vnc-1.0.0
+++ b/metadata/md5-cache/net-libs/gtk-vnc-1.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=VNC viewer widget for GTK
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/gtk-vnc
 IUSE=+introspection pulseaudio sasl +vala
-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=>=dev-libs/glib-2.42.0:2 >=x11-libs/gdk-pixbuf-2.12.0:2 >=dev-libs/libgcrypt-1.5.0:0= >=net-libs/gnutls-3.1.18:0= >=sys-libs/zlib-1.2.5 sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) >=x11-libs/gtk+-3.0.0:3[introspection?] >=x11-libs/cairo-1.2.0 >=x11-libs/libX11-1.6.5 pulseaudio? ( >=media-sound/pulseaudio-10.0 ) introspection? ( >=dev-libs/gobject-introspection-1.56.0:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-vnc/1.0/gtk-vnc-1.0.0.tar.xz https://dev.gentoo.org/~leio/distfiles/gtk-vnc-1.0.0-patchset.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0550327f9ba688688ac68249791bf293
+_md5_=39280961a7d70c8bc7c22f31a677cd57
diff --git a/metadata/md5-cache/net-libs/gupnp-1.2.3 b/metadata/md5-cache/net-libs/gupnp-1.2.3
new file mode 100644
index 000000000000..3ef17883fe24
--- /dev/null
+++ b/metadata/md5-cache/net-libs/gupnp-1.2.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.14 app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 ) dev-libs/libxslt app-text/docbook-xsl-stylesheets virtual/pkgconfig !connman? ( !networkmanager? ( kernel_linux? ( sys-kernel/linux-headers ) ) ) vala? ( || ( dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) >=net-libs/gssdp-1.2.3:0[vala] net-libs/libsoup:2.4[vala] ) 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[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/glib-2.58: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/gssdp-1.2.3: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/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.54:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=An object-oriented framework for creating UPnP devs and control points
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP
+IUSE=connman gtk-doc +introspection kernel_linux networkmanager 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 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
+LICENSE=LGPL-2+ 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] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-libs/glib-2.58: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/gssdp-1.2.3: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/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.54:= )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ?? ( connman networkmanager )
+SLOT=0/1.2-0
+SRC_URI=mirror://gnome/sources/gupnp/1.2/gupnp-1.2.3.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=510d29e27627e718efc9fa3d8db289a1
diff --git a/metadata/md5-cache/net-libs/libhubbub-0.3.6-r1 b/metadata/md5-cache/net-libs/libhubbub-0.3.6-r1
index d5de3805c1bd..295e5b36d425 100644
--- a/metadata/md5-cache/net-libs/libhubbub-0.3.6-r1
+++ b/metadata/md5-cache/net-libs/libhubbub-0.3.6-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/netsurf-buildsystem virtual/pkgconfig test? ( dev-lang/perl )
+BDEPEND=dev-util/netsurf-buildsystem virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-lang/perl )
 DEFINED_PHASES=compile install prepare test
 DEPEND=dev-libs/libparserutils:= test? ( dev-libs/json-c )
 DESCRIPTION=HTML5 compliant parsing library, written in C
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.3.6
 SRC_URI=https://download.netsurf-browser.org/libs/releases/libhubbub-0.3.6-src.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=17a71d376139ec2e337bb9724bfea1bb
+_md5_=d83c94b1782013079776b5f05f6fe15b
diff --git a/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.2 b/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.2
index def40c85f8d6..ce2bad135996 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.2
+++ b/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=net-libs/libmnl
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_acct/files/libnetfilter_acct-1.0.2.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8af38f63540a4a0cae22c77ba2b96aa3
diff --git a/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.3 b/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.3
index bf9403e3a4a2..c98d15a98e3f 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.3
+++ b/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=net-libs/libmnl
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_acct/files/libnetfilter_acct-1.0.3.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e296a8c41af4218065d48eb088f37380
diff --git a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.6 b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.6
index d967765a84cf..1c01aa8e752e 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.6
+++ b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-1.0.0
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.6.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0dca5172d6180a245198dac9ab0f359c
diff --git a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.7 b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.7
index a2587774bff9..98759cd551a5 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.7
+++ b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-1.0.0
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.7.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=510932d575626e460fec59ea65da6178
diff --git a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.8 b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.8
index d40a59c2e4c4..7982f9706cc9 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.8
+++ b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-1.0.0
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.8.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=55ff4359bd96cc5e3aaf4ef6baf68048
diff --git a/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0 b/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0
index ae336944b912..f5684a113757 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0
+++ b/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libmnl
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_cthelper/files/libnetfilter_cthelper-1.0.0.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e87d333172ae96dc5cafd4263ed55d60
diff --git a/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0-r1 b/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0-r1
index 42790e4506a4..66171e3a73ae 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0-r1
+++ b/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libmnl:=
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_cthelper/files/libnetfilter_cthelper-1.0.0.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=33556df2686e86bd01b971a9269124d9
diff --git a/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0 b/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0
index 84f31c1350c4..8a594cd2866b 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0
+++ b/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libmnl
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_cttimeout/files/libnetfilter_cttimeout-1.0.0.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6e685698085f33735f26b9e91ec2a430
diff --git a/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0-r1 b/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0-r1
index c56e2dad7633..9bd1ed1af4ca 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0-r1
+++ b/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libmnl:=
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_cttimeout/files/libnetfilter_cttimeout-1.0.0.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=43dad9137daf5b7455aee11894defeca
diff --git a/metadata/md5-cache/net-libs/libnetfilter_log-1.0.1 b/metadata/md5-cache/net-libs/libnetfilter_log-1.0.1
index 87fd76eab391..03e1a9099ac3 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_log-1.0.1
+++ b/metadata/md5-cache/net-libs/libnetfilter_log-1.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libnfnetlink-1.0.0
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_log/files/libnetfilter_log-1.0.1.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1fc63d6b56d5d477b7bac8ce2e3abdbf
diff --git a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.3 b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.3
index ada242e0444b..b31c2fab09f2 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.3
+++ b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-0.0.41
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-1.0.3.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e01a914000848c803f79c3398c342075
diff --git a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.4 b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.4
index 1c51b5eaaa31..81ad1a831bda 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.4
+++ b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.4
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-0.0.41
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-1.0.4.tar.bz2
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=56b88c6c001dc6dd89cc919c55e95a09
diff --git a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.5 b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.5
index 8bbcb1855b6d..5a7abada325a 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.5
+++ b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-0.0.41
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-1.0.5.tar.bz2
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a5a60161ebcb416c9a39405dd735822a
diff --git a/metadata/md5-cache/net-libs/libnfnetlink-1.0.1 b/metadata/md5-cache/net-libs/libnfnetlink-1.0.1
index cccdb4d0e189..7e4e42ac3454 100644
--- a/metadata/md5-cache/net-libs/libnfnetlink-1.0.1
+++ b/metadata/md5-cache/net-libs/libnfnetlink-1.0.1
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 spa
 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_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2016b8d6ddfcd635a8fb813d3d6884f3
diff --git a/metadata/md5-cache/net-libs/libnftnl-1.1.3 b/metadata/md5-cache/net-libs/libnftnl-1.1.3
index f065aedc09d1..f318897afac4 100644
--- a/metadata/md5-cache/net-libs/libnftnl-1.1.3
+++ b/metadata/md5-cache/net-libs/libnftnl-1.1.3
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/libmnl-1.0.3
 RESTRICT=!test? ( test )
 SLOT=0/11
 SRC_URI=https://netfilter.org/projects/libnftnl/files/libnftnl-1.1.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
 _md5_=c04cf7c99e6a3037863f40bb1cd5654d
diff --git a/metadata/md5-cache/net-libs/libnftnl-1.1.4 b/metadata/md5-cache/net-libs/libnftnl-1.1.4
index f411804724fd..ce71fbeb0492 100644
--- a/metadata/md5-cache/net-libs/libnftnl-1.1.4
+++ b/metadata/md5-cache/net-libs/libnftnl-1.1.4
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/libmnl-1.0.3
 RESTRICT=!test? ( test )
 SLOT=0/11
 SRC_URI=https://netfilter.org/projects/libnftnl/files/libnftnl-1.1.4.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
 _md5_=b229a4faddde09b09d053a1ec96395da
diff --git a/metadata/md5-cache/net-libs/libnftnl-1.1.5 b/metadata/md5-cache/net-libs/libnftnl-1.1.5
index d898c0a82fd4..01d19ea19620 100644
--- a/metadata/md5-cache/net-libs/libnftnl-1.1.5
+++ b/metadata/md5-cache/net-libs/libnftnl-1.1.5
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/libmnl-1.0.3
 RESTRICT=!test? ( test )
 SLOT=0/11
 SRC_URI=https://netfilter.org/projects/libnftnl/files/libnftnl-1.1.5.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
 _md5_=6fe49d50c852c81197f8b060252c81df
diff --git a/metadata/md5-cache/net-libs/libnftnl-1.1.6 b/metadata/md5-cache/net-libs/libnftnl-1.1.6
index 5d3fe18a3707..77509bc679b7 100644
--- a/metadata/md5-cache/net-libs/libnftnl-1.1.6
+++ b/metadata/md5-cache/net-libs/libnftnl-1.1.6
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/libmnl-1.0.3
 RESTRICT=!test? ( test )
 SLOT=0/11
 SRC_URI=https://netfilter.org/projects/libnftnl/files/libnftnl-1.1.6.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
 _md5_=d884187bd5ccfbd3c25999f47774a82a
diff --git a/metadata/md5-cache/net-libs/libnftnl-1.1.7 b/metadata/md5-cache/net-libs/libnftnl-1.1.7
index b0ec4f8a8666..ed164d2bcb4c 100644
--- a/metadata/md5-cache/net-libs/libnftnl-1.1.7
+++ b/metadata/md5-cache/net-libs/libnftnl-1.1.7
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/libmnl-1.0.4
 RESTRICT=!test? ( test )
 SLOT=0/11
 SRC_URI=https://netfilter.org/projects/libnftnl/files/libnftnl-1.1.7.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
 _md5_=199b972ffddc2b7002960b99bebaa253
diff --git a/metadata/md5-cache/net-libs/libnma-1.8.30 b/metadata/md5-cache/net-libs/libnma-1.8.30
new file mode 100644
index 000000000000..ef1421cb8c07
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libnma-1.8.30
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxml2 >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) vala? ( || ( dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) net-misc/networkmanager[vala] ) 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=app-text/iso-codes net-misc/mobile-broadband-provider-info >=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.10:3[introspection?] >=net-misc/networkmanager-1.7[introspection?] pkcs11? ( >=app-crypt/gcr-3.14:= ) introspection? ( >=dev-libs/gobject-introspection-1.56:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=NetworkManager GUI library
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=gtk-doc +introspection +pkcs11 vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-text/iso-codes net-misc/mobile-broadband-provider-info >=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.10:3[introspection?] >=net-misc/networkmanager-1.7[introspection?] pkcs11? ( >=app-crypt/gcr-3.14:= ) introspection? ( >=dev-libs/gobject-introspection-1.56:= ) !<gnome-extra/nm-applet-1.16.0
+REQUIRED_USE=vala? ( introspection )
+SLOT=0
+SRC_URI=mirror://gnome/sources/libnma/1.8/libnma-1.8.30.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ec62e1cf0020c6947b8a709ccba0e0e4
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 2e550ae0117f..a58e8b5c46db 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=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~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	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b2657cc8fa900fba20c7d7987a46e259
+_md5_=6f65593cfd06cb4cee0b8bcb4d333194
diff --git a/metadata/md5-cache/net-libs/libvncserver-0.9.13 b/metadata/md5-cache/net-libs/libvncserver-0.9.13
index dd3c93431952..94490a33d20f 100644
--- a/metadata/md5-cache/net-libs/libvncserver-0.9.13
+++ b/metadata/md5-cache/net-libs/libvncserver-0.9.13
@@ -5,11 +5,11 @@ DESCRIPTION=library for creating vnc servers
 EAPI=7
 HOMEPAGE=https://libvnc.github.io/
 IUSE=+24bpp +filetransfer gcrypt gnutls ipv6 +jpeg libressl lzo +png sasl ssl systemd +threads +zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 GPL-2+ LGPL-2.1+ BSD MIT
 RDEPEND=gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0= ) ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( >=dev-libs/libressl-2.7.0:0= ) ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:0= ) ) jpeg? ( >=virtual/jpeg-0-r2:0 ) lzo? ( dev-libs/lzo ) png? ( >=media-libs/libpng-1.6.10:0= ) sasl? ( dev-libs/cyrus-sasl ) systemd? ( sys-apps/systemd:= ) zlib? ( >=sys-libs/zlib-1.2.8-r1:0= )
 REQUIRED_USE=filetransfer? ( threads ) jpeg? ( zlib ) png? ( zlib ) ssl? ( !gnutls? ( threads ) )
 SLOT=0
 SRC_URI=https://github.com/LibVNC/libvncserver/archive/LibVNCServer-0.9.13.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=94aa73b8abd88e01f9121d1a9c007208
+_md5_=a63f1392deaa7f808e9cdad232e9d7fe
diff --git a/metadata/md5-cache/net-libs/nodejs-10.21.0 b/metadata/md5-cache/net-libs/nodejs-10.21.0
new file mode 100644
index 000000000000..761c98a662da
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-10.21.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=dev-libs/libuv-1.34.2:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.9.3:= >=net-libs/nghttp2-1.41.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) system-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 +system-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.2:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.9.3:= >=net-libs/nghttp2-1.41.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-ssl? ( ssl )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://nodejs.org/dist/v10.21.0/node-v10.21.0.tar.xz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9bf9a28d45acd00f626fbb8361e8dfba
diff --git a/metadata/md5-cache/net-libs/rpcsvc-proto-1.4.1 b/metadata/md5-cache/net-libs/rpcsvc-proto-1.4.1
deleted file mode 100644
index 9270885fa837..000000000000
--- a/metadata/md5-cache/net-libs/rpcsvc-proto-1.4.1
+++ /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=sys-devel/gettext
-DESCRIPTION=rpcsvc protocol definitions from glibc
-EAPI=7
-HOMEPAGE=https://github.com/thkukuk/rpcsvc-proto
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
-LICENSE=LGPL-2.1+ BSD
-RDEPEND=!<sys-libs/glibc-2.26 virtual/libintl
-SLOT=0
-SRC_URI=https://github.com/thkukuk/rpcsvc-proto/archive/v1.4.1.tar.gz -> rpcsvc-proto-1.4.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=60e1ca9e728ae06a1b705aafb621223f
diff --git a/metadata/md5-cache/net-libs/shairplay-0_pre20180824-r1 b/metadata/md5-cache/net-libs/shairplay-0_pre20180824-r1
index 2b3b04bfaf5c..d593ba4a75c0 100644
--- a/metadata/md5-cache/net-libs/shairplay-0_pre20180824-r1
+++ b/metadata/md5-cache/net-libs/shairplay-0_pre20180824-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Apple airplay and raop protocol server
 EAPI=7
 HOMEPAGE=https://github.com/juhovh/shairplay
 IUSE=+playfair static-libs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD LGPL-2.1 MIT playfair? ( GPL-3+ )
 RDEPEND=net-dns/avahi[mdnsresponder-compat] media-libs/libao
 SLOT=0
 SRC_URI=https://github.com/juhovh/shairplay/archive/096b61ad14c90169f438e690d096e3fcf87e504e.tar.gz -> shairplay-0_pre20180824.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3ae31b89a7ffe6f0ba406cb0caa253c7
+_md5_=7f00607ea71095de00a29a506f3b566e
diff --git a/metadata/md5-cache/net-libs/signond-8.60-r2 b/metadata/md5-cache/net-libs/signond-8.60-r2
index f58865761093..edde7296a0c2 100644
--- a/metadata/md5-cache/net-libs/signond-8.60-r2
+++ b/metadata/md5-cache/net-libs/signond-8.60-r2
@@ -8,8 +8,8 @@ IUSE=doc test
 KEYWORDS=~amd64 ~arm arm64 ~ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 net-libs/libproxy
-RESTRICT=!test? ( test )
+RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/accounts-sso/signond/-/archive/VERSION_8.60/signond-VERSION_8.60.tar.gz -> signond-8.60.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bb262dd3719376bcb0a9400ee7f516c9
+_md5_=c56945a3e707de07120fa6aa3d72e6db
diff --git a/metadata/md5-cache/net-libs/xrootd-4.11.1 b/metadata/md5-cache/net-libs/xrootd-4.11.1
deleted file mode 100644
index c6fd020bc13c..000000000000
--- a/metadata/md5-cache/net-libs/xrootd-4.11.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen[dot] python? ( dev-python/sphinx ) ) test? ( dev-util/cppunit ) dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=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= )
-DESCRIPTION=Extended ROOT remote file server
-EAPI=7
-HOMEPAGE=http://xrootd.org/
-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 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://xrootd.org/download/v4.11.1/xrootd-4.11.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0a552101984d3cad248df287e4fd67b6
diff --git a/metadata/md5-cache/net-libs/xrootd-4.12.0 b/metadata/md5-cache/net-libs/xrootd-4.12.0
index f346d4b04bcd..f668c28b425b 100644
--- a/metadata/md5-cache/net-libs/xrootd-4.12.0
+++ b/metadata/md5-cache/net-libs/xrootd-4.12.0
@@ -5,7 +5,7 @@ DESCRIPTION=Extended ROOT remote file server
 EAPI=7
 HOMEPAGE=http://xrootd.org/
 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
+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 ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://xrootd.org/download/v4.12.0/xrootd-4.12.0.tar.gz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6a8363af506b9c92b34543c36775b5f7
+_md5_=2d234934a517f9b23ce987dcbc0a1091
diff --git a/metadata/md5-cache/net-libs/xrootd-4.12.1 b/metadata/md5-cache/net-libs/xrootd-4.12.1
deleted file mode 100644
index 8842ad02e5fa..000000000000
--- a/metadata/md5-cache/net-libs/xrootd-4.12.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen[dot] python? ( dev-python/sphinx ) ) test? ( dev-util/cppunit ) dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=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= )
-DESCRIPTION=Extended ROOT remote file server
-EAPI=7
-HOMEPAGE=http://xrootd.org/
-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 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://xrootd.org/download/v4.12.1/xrootd-4.12.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6a8363af506b9c92b34543c36775b5f7
diff --git a/metadata/md5-cache/net-libs/xrootd-4.12.3 b/metadata/md5-cache/net-libs/xrootd-4.12.3
index 7c46f67a853c..5c5da3cb7b83 100644
--- a/metadata/md5-cache/net-libs/xrootd-4.12.3
+++ b/metadata/md5-cache/net-libs/xrootd-4.12.3
@@ -1,16 +1,16 @@
 BDEPEND=doc? ( app-doc/doxygen[dot] python? ( dev-python/sphinx ) ) test? ( dev-util/cppunit ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=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= )
+DEPEND=acct-group/xrootd acct-user/xrootd sys-libs/zlib fuse? ( sys-fs/fuse:= ) kerberos? ( virtual/krb5 ) 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] ) ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= )
 DESCRIPTION=Extended ROOT remote file server
 EAPI=7
 HOMEPAGE=http://xrootd.org/
-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
+IUSE=doc examples fuse http kerberos python readline ssl test 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 ) )
+RDEPEND=acct-group/xrootd acct-user/xrootd sys-libs/zlib fuse? ( sys-fs/fuse:= ) kerberos? ( virtual/krb5 ) 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] ) ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= ) dev-lang/perl
+REQUIRED_USE=http? ( kerberos ssl ) python? ( ^^ ( 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.12.3/xrootd-4.12.3.tar.gz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6a8363af506b9c92b34543c36775b5f7
+_md5_=adb004052d6cbbae0b18cfadd7b80696
diff --git a/metadata/md5-cache/net-libs/xrootd-4.8.3 b/metadata/md5-cache/net-libs/xrootd-4.8.3
deleted file mode 100644
index 716d2271d138..000000000000
--- a/metadata/md5-cache/net-libs/xrootd-4.8.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!<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= ) doc? ( app-doc/doxygen[dot] python? ( dev-python/sphinx ) ) test? ( dev-util/cppunit ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Extended ROOT remote file server
-EAPI=6
-HOMEPAGE=http://xrootd.org/
-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 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://xrootd.org/download/v4.8.3/xrootd-4.8.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b2d9566e6e5f0041d028d6e622df860d
diff --git a/metadata/md5-cache/net-libs/xrootd-ceph-4.12.0 b/metadata/md5-cache/net-libs/xrootd-ceph-4.12.0
index c91c39dbc76b..971fbeba94b8 100644
--- a/metadata/md5-cache/net-libs/xrootd-ceph-4.12.0
+++ b/metadata/md5-cache/net-libs/xrootd-ceph-4.12.0
@@ -4,10 +4,10 @@ DEPEND=net-libs/xrootd !<net-libs/xrootd-4.10.0[rbd] sys-cluster/ceph
 DESCRIPTION=xrootd OSS plug-in for interfacing with Ceph storage platform
 EAPI=7
 HOMEPAGE=https://xrootd.slac.stanford.edu/
-KEYWORDS=~amd64 ~amd64-linux
+KEYWORDS=amd64 ~amd64-linux
 LICENSE=LGPL-3+
 RDEPEND=net-libs/xrootd !<net-libs/xrootd-4.10.0[rbd] sys-cluster/ceph
 SLOT=0
 SRC_URI=https://github.com/xrootd/xrootd-ceph/archive/v4.12.0.tar.gz -> xrootd-ceph-4.12.0.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=912d799131f71002b0258bffd2ccb8e8
+_md5_=5e9c5d8c5780173f395f047db4ff92b4
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 39f8323ae2ac..2689f10dd538 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/dot-forward-0.71-r4 b/metadata/md5-cache/net-mail/dot-forward-0.71-r4
index 6e151d485902..ccc89e41f6f1 100644
--- a/metadata/md5-cache/net-mail/dot-forward-0.71-r4
+++ b/metadata/md5-cache/net-mail/dot-forward-0.71-r4
@@ -9,5 +9,5 @@ RDEPEND=acct-group/nofiles acct-group/qmail
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cr.yp.to/software/dot-forward-0.71.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	qmail	83a4685f5044b0b067cb7e6f0e9c909c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	qmail	d71e87f6dc80bb9af62fd46856dc0a92	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=71fca9f5f7c6cdfb8b4a59a49fa6bb1e
diff --git a/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r3 b/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r3
index 3884371184ac..ed3028c6e657 100644
--- a/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r3
+++ b/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r3
@@ -10,5 +10,5 @@ RDEPEND=mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql ) v
 REQUIRED_USE=?? ( mysql postgres )
 SLOT=0
 SRC_URI=http://www.ezmlm.org/archive/7.0.0/ezmlm-idx-7.0.0.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	qmail	83a4685f5044b0b067cb7e6f0e9c909c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	qmail	d71e87f6dc80bb9af62fd46856dc0a92	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a84365fd3701bf63c84813857a289c30
diff --git a/metadata/md5-cache/net-mail/fetchmail-6.4.1 b/metadata/md5-cache/net-mail/fetchmail-6.4.1
index 172ab59f6060..2fefa3e40fe8 100644
--- a/metadata/md5-cache/net-mail/fetchmail-6.4.1
+++ b/metadata/md5-cache/net-mail/fetchmail-6.4.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare setup
 DEPEND=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] ) ) app-arch/xz-utils sys-devel/flex nls? ( sys-devel/gettext )
 DESCRIPTION=the legendary remote-mail retrieval and forwarding utility
 EAPI=7
-HOMEPAGE=http://www.fetchmail.info/
+HOMEPAGE=https://www.fetchmail.info/
 IUSE=ssl nls kerberos tk socks libressl +python_single_target_python2_7
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 public-domain
@@ -12,4 +12,4 @@ REQUIRED_USE=tk? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/fetchmail/fetchmail-6.4.1.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=b0a5117992947a31d7ed7b1dd10ef760
+_md5_=7ee755e3e9ad4facb1c8f7ec516649f4
diff --git a/metadata/md5-cache/net-mail/fetchmail-6.4.6 b/metadata/md5-cache/net-mail/fetchmail-6.4.6
index fceb4bfb9c97..f6f1b41ed0c4 100644
--- a/metadata/md5-cache/net-mail/fetchmail-6.4.6
+++ b/metadata/md5-cache/net-mail/fetchmail-6.4.6
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare setup
 DEPEND=acct-user/fetchmail ssl? ( !libressl? ( >=dev-libs/openssl-1.1.1:= ) 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_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] ) python_single_target_python3_6? ( dev-python/future[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/future[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) ) app-arch/xz-utils sys-devel/flex nls? ( sys-devel/gettext )
 DESCRIPTION=the legendary remote-mail retrieval and forwarding utility
 EAPI=7
-HOMEPAGE=http://www.fetchmail.info/
+HOMEPAGE=https://www.fetchmail.info/
 IUSE=ssl nls kerberos tk socks libressl python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 public-domain
@@ -12,4 +12,4 @@ REQUIRED_USE=tk? ( ^^ ( python_single_target_python3_6 python_single_target_pyth
 SLOT=0
 SRC_URI=mirror://sourceforge/fetchmail/fetchmail-6.4.6.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a09d34313aede5607144651465fc9fe5
+_md5_=070295773a5633b3d70b2e0a437983a5
diff --git a/metadata/md5-cache/net-mail/fetchmail-6.4.8 b/metadata/md5-cache/net-mail/fetchmail-6.4.8
index a52e1fcf1c22..57b7dd1f31f7 100644
--- a/metadata/md5-cache/net-mail/fetchmail-6.4.8
+++ b/metadata/md5-cache/net-mail/fetchmail-6.4.8
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare setup
 DEPEND=acct-user/fetchmail ssl? ( !libressl? ( >=dev-libs/openssl-1.1.1:= ) 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_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] ) python_single_target_python3_6? ( dev-python/future[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/future[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) ) app-arch/xz-utils sys-devel/flex nls? ( sys-devel/gettext )
 DESCRIPTION=the legendary remote-mail retrieval and forwarding utility
 EAPI=7
-HOMEPAGE=http://www.fetchmail.info/
+HOMEPAGE=https://www.fetchmail.info/
 IUSE=ssl nls kerberos tk socks libressl python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 public-domain
@@ -12,4 +12,4 @@ REQUIRED_USE=tk? ( ^^ ( python_single_target_python3_6 python_single_target_pyth
 SLOT=0
 SRC_URI=mirror://sourceforge/fetchmail/fetchmail-6.4.8.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a09d34313aede5607144651465fc9fe5
+_md5_=070295773a5633b3d70b2e0a437983a5
diff --git a/metadata/md5-cache/net-mail/list-remote-forwards-0.0.1-r1 b/metadata/md5-cache/net-mail/list-remote-forwards-0.0.1-r1
deleted file mode 100644
index cf56e34c54fd..000000000000
--- a/metadata/md5-cache/net-mail/list-remote-forwards-0.0.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/cabal-1.16.0 >=dev-haskell/cmdargs-0.10 >=dev-haskell/configurator-0.2 >=dev-haskell/dns-1.4 >=dev-haskell/hdbc-2.4 >=dev-haskell/hdbc-postgresql-2.3 >=dev-haskell/hdbc-sqlite3-2.3 >=dev-haskell/missingh-1.2 >=dev-haskell/tasty-0.8 >=dev-haskell/tasty-hunit-0.8 >=dev-haskell/tasty-quickcheck-0.8 >=dev-lang/ghc-7.6.1 test? ( >=dev-haskell/doctest-0.9 >=dev-haskell/filemanip-0.3.6 )
-DESCRIPTION=List all remote forwards for mail accounts stored in a database
-EAPI=6
-HOMEPAGE=http://hackage.haskell.org/package/list-remote-forwards
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://hackage.haskell.org/package/list-remote-forwards-0.0.1/list-remote-forwards-0.0.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=43a2f809b1a77229c3554aee16561327
diff --git a/metadata/md5-cache/net-mail/mailman-2.1.33 b/metadata/md5-cache/net-mail/mailman-2.1.33
new file mode 100644
index 000000000000..db48fd93f38d
--- /dev/null
+++ b/metadata/md5-cache/net-mail/mailman-2.1.33
@@ -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.33.tgz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d4a71873d0d605f45500a5b00330b32f
diff --git a/metadata/md5-cache/net-mail/mhonarc-2.6.18-r2 b/metadata/md5-cache/net-mail/mhonarc-2.6.18-r2
index aa5b3a4f752e..4fec43790939 100644
--- a/metadata/md5-cache/net-mail/mhonarc-2.6.18-r2
+++ b/metadata/md5-cache/net-mail/mhonarc-2.6.18-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://www.mhonarc.org/release/MHonArc/tar/MHonArc-2.6.18.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=43c4cf657517958738efaa318c6d29e7
diff --git a/metadata/md5-cache/net-mail/mswatch-1.2.0-r1 b/metadata/md5-cache/net-mail/mswatch-1.2.0-r1
index 78c3ed4e0760..29d9057a1dcc 100644
--- a/metadata/md5-cache/net-mail/mswatch-1.2.0-r1
+++ b/metadata/md5-cache/net-mail/mswatch-1.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.6:2
 SLOT=0
 SRC_URI=mirror://sourceforge/mswatch/mswatch-1.2.0.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c2839b7fa153f24e839641fffb56e6b8
diff --git a/metadata/md5-cache/net-mail/mu-1.4.10 b/metadata/md5-cache/net-mail/mu-1.4.10
new file mode 100644
index 000000000000..6a4da8d8e267
--- /dev/null
+++ b/metadata/md5-cache/net-mail/mu-1.4.10
@@ -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 postinst postrm preinst prepare test
+DEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4 emacs? ( >=app-editors/emacs-24.4:* ) guile? ( >=dev-scheme/guile-2.2 ) mug? ( net-libs/webkit-gtk:4 x11-libs/gtk+:3 )
+DESCRIPTION=Set of tools to deal with Maildirs, in particular, searching and indexing
+EAPI=7
+HOMEPAGE=https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu
+IUSE=emacs guile mug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4 emacs? ( >=app-editors/emacs-24.4:* ) guile? ( >=dev-scheme/guile-2.2 ) mug? ( net-libs/webkit-gtk:4 x11-libs/gtk+:3 )
+SLOT=0
+SRC_URI=https://github.com/djcb/mu/archive/1.4.10.tar.gz -> mu-1.4.10.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	504a3383c45504fde86b00426619a709	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3e80a56929362a61f5329bdee858fe61
diff --git a/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r1 b/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r1
index 566bb60f8526..cf21d5f0cc2e 100644
--- a/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r1
+++ b/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r1
@@ -11,5 +11,5 @@ RDEPEND=virtual/qmail >=net-mail/vpopmail-5.4.33 net-mail/autorespond maildrop?
 RESTRICT=userpriv
 SLOT=0
 SRC_URI=mirror://sourceforge/qmailadmin/qmailadmin-1.2.15.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	qmail	83a4685f5044b0b067cb7e6f0e9c909c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	webapp	16783e418aca3ffa461d68310bf7ab12
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	qmail	d71e87f6dc80bb9af62fd46856dc0a92	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	webapp	16783e418aca3ffa461d68310bf7ab12
 _md5_=ddabd0ab0ef927ccfe64695b91fb81f5
diff --git a/metadata/md5-cache/net-mail/qmailadmin-1.2.16 b/metadata/md5-cache/net-mail/qmailadmin-1.2.16
index 0d802f9ad317..3ce18f3f3b5a 100644
--- a/metadata/md5-cache/net-mail/qmailadmin-1.2.16
+++ b/metadata/md5-cache/net-mail/qmailadmin-1.2.16
@@ -11,5 +11,5 @@ RDEPEND=virtual/qmail >=net-mail/vpopmail-5.4.33 net-mail/autorespond maildrop?
 RESTRICT=userpriv
 SLOT=0
 SRC_URI=mirror://sourceforge/qmailadmin/qmailadmin-1.2.16.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	qmail	83a4685f5044b0b067cb7e6f0e9c909c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	webapp	16783e418aca3ffa461d68310bf7ab12
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	qmail	d71e87f6dc80bb9af62fd46856dc0a92	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	webapp	16783e418aca3ffa461d68310bf7ab12
 _md5_=261420825cc15d47eb148bfc2ab8eaec
diff --git a/metadata/md5-cache/net-mail/vchkuser-0.4 b/metadata/md5-cache/net-mail/vchkuser-0.4
index 22f4f31148b2..e609737ef02e 100644
--- a/metadata/md5-cache/net-mail/vchkuser-0.4
+++ b/metadata/md5-cache/net-mail/vchkuser-0.4
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/hollow/vchkuser/tarball/v0.4 -> vchkuser-0.4.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	83a4685f5044b0b067cb7e6f0e9c909c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	d71e87f6dc80bb9af62fd46856dc0a92	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=755014e3a95090323c2d540ce2e773d2
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r6 b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r6
index bce70d99d42a..f37f16e8ead7 100644
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r6
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r6
@@ -11,5 +11,5 @@ RDEPEND=acct-group/vpopmail acct-user/vpopmail virtual/qmail maildrop? ( mail-fi
 REQUIRED_USE=mysql? ( !postgres )
 SLOT=0
 SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.33.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	qmail	83a4685f5044b0b067cb7e6f0e9c909c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	qmail	d71e87f6dc80bb9af62fd46856dc0a92	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a209eac77d6a3cdd3fe40ad2ee26b1f2
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r7 b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r7
index f101894328c0..ad1e6af3fe46 100644
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r7
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r7
@@ -11,5 +11,5 @@ RDEPEND=acct-group/vpopmail acct-user/vpopmail virtual/qmail maildrop? ( mail-fi
 REQUIRED_USE=mysql? ( !postgres )
 SLOT=0
 SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.33.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	qmail	83a4685f5044b0b067cb7e6f0e9c909c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	qmail	d71e87f6dc80bb9af62fd46856dc0a92	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=60a1a4afeaa7cfaae41263259aa06f0b
diff --git a/metadata/md5-cache/net-mail/vqadmin-2.3.7 b/metadata/md5-cache/net-mail/vqadmin-2.3.7
index ed022d976481..cf4bd07fdda1 100644
--- a/metadata/md5-cache/net-mail/vqadmin-2.3.7
+++ b/metadata/md5-cache/net-mail/vqadmin-2.3.7
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/qmail >=net-mail/vpopmail-5.3 net-mail/qmailadmin >=app-admin/webapp-config-1.50.15
 SLOT=0
 SRC_URI=http://www.inter7.com/vqadmin/vqadmin-2.3.7.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	qmail	83a4685f5044b0b067cb7e6f0e9c909c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	webapp	16783e418aca3ffa461d68310bf7ab12
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	qmail	d71e87f6dc80bb9af62fd46856dc0a92	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	webapp	16783e418aca3ffa461d68310bf7ab12
 _md5_=ed2f0816bf4df9b4ee5d277a2642a685
diff --git a/metadata/md5-cache/net-misc/AQtion-2.2.7 b/metadata/md5-cache/net-misc/AQtion-2.2.7
index 2e8ba3020499..083549d99013 100644
--- a/metadata/md5-cache/net-misc/AQtion-2.2.7
+++ b/metadata/md5-cache/net-misc/AQtion-2.2.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/Aquantia/AQtion/archive/e024a859ea828ced78db310328db90dbedea837a.tar.gz -> AQtion-2.2.7.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a04bb7cb2157599070e6a4ef9d8366a2
diff --git a/metadata/md5-cache/net-misc/AQtion-2.3.1 b/metadata/md5-cache/net-misc/AQtion-2.3.1
index a16e9bb19078..6b7a408cb42a 100644
--- a/metadata/md5-cache/net-misc/AQtion-2.3.1
+++ b/metadata/md5-cache/net-misc/AQtion-2.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/Aquantia/AQtion/archive/3c2a2a3abe3df6cb0c985a49cea9a359a83e3f75.tar.gz -> AQtion-2.3.1.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f13c552309b9868d20b5a8b4d9acd30e
diff --git a/metadata/md5-cache/net-misc/AQtion-2.3.4 b/metadata/md5-cache/net-misc/AQtion-2.3.4
index ec2e73245ed5..cfa00003e45b 100644
--- a/metadata/md5-cache/net-misc/AQtion-2.3.4
+++ b/metadata/md5-cache/net-misc/AQtion-2.3.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/Aquantia/AQtion/archive/3b96f1b5f29d844151bc2dc38443de7a9a2f0cf3.tar.gz -> AQtion-2.3.4.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0ce0697dce2e19b7d6f6d33e7eef3874
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index a33b9a82d278..eff6cdcf2dc5 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/arpsponge-3.12.2 b/metadata/md5-cache/net-misc/arpsponge-3.12.2
index 072280a696fa..24b1c9beb490 100644
--- a/metadata/md5-cache/net-misc/arpsponge-3.12.2
+++ b/metadata/md5-cache/net-misc/arpsponge-3.12.2
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-1+ Artistic )
 RDEPEND=dev-lang/perl dev-perl/IO-String dev-perl/NetAddr-IP dev-perl/NetPacket dev-perl/Net-ARP dev-perl/Net-Pcap dev-perl/Readonly dev-perl/TermReadKey dev-perl/Term-ReadLine-Gnu virtual/perl-Data-Dumper virtual/perl-File-Path virtual/perl-Getopt-Long virtual/perl-Sys-Syslog virtual/perl-Time-HiRes dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://www.ams-ix.net/downloads/arpsponge/3.12.2/arpsponge-3.12.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=55e88946cc98e9bc1f6566fed8dc608f
diff --git a/metadata/md5-cache/net-misc/asterisk-11.25.3 b/metadata/md5-cache/net-misc/asterisk-11.25.3
index bf8c4a9db194..684aaa49ae99 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	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2d2ccc6f74ebd6c4e8fead8c785cbe4b
diff --git a/metadata/md5-cache/net-misc/asterisk-13.33.0 b/metadata/md5-cache/net-misc/asterisk-13.33.0
index 54087a0214ed..0e9786d4a44e 100644
--- a/metadata/md5-cache/net-misc/asterisk-13.33.0
+++ b/metadata/md5-cache/net-misc/asterisk-13.33.0
@@ -11,5 +11,5 @@ RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt dev
 REQUIRED_USE=gtalk? ( xmpp ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
 SLOT=0
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.33.0.tar.gz https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=253f4c93e40bf9c77520a444bc2c1753
diff --git a/metadata/md5-cache/net-misc/asterisk-13.34.0 b/metadata/md5-cache/net-misc/asterisk-13.34.0
index 8307c926f614..e68af7563ddb 100644
--- a/metadata/md5-cache/net-misc/asterisk-13.34.0
+++ b/metadata/md5-cache/net-misc/asterisk-13.34.0
@@ -11,5 +11,5 @@ RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt dev
 REQUIRED_USE=gtalk? ( xmpp ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
 SLOT=0
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.34.0.tar.gz https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cbf09702e3ca0974174afe797f38e9f4
diff --git a/metadata/md5-cache/net-misc/asterisk-16.10.0 b/metadata/md5-cache/net-misc/asterisk-16.10.0
index 861d5f5e2758..8f3d6c605856 100644
--- a/metadata/md5-cache/net-misc/asterisk-16.10.0
+++ b/metadata/md5-cache/net-misc/asterisk-16.10.0
@@ -11,5 +11,5 @@ RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=d
 REQUIRED_USE=gtalk? ( xmpp ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
 SLOT=0
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-16.10.0.tar.gz https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=49063332e08c37cdef5ffe3a9999ba5a
diff --git a/metadata/md5-cache/net-misc/asterisk-16.11.1 b/metadata/md5-cache/net-misc/asterisk-16.11.1
index 3c73023d0ce5..c10ecce0c2bb 100644
--- a/metadata/md5-cache/net-misc/asterisk-16.11.1
+++ b/metadata/md5-cache/net-misc/asterisk-16.11.1
@@ -11,5 +11,5 @@ RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=d
 REQUIRED_USE=gtalk? ( xmpp ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
 SLOT=0
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-16.11.1.tar.gz https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=49063332e08c37cdef5ffe3a9999ba5a
diff --git a/metadata/md5-cache/net-misc/batctl-2017.4 b/metadata/md5-cache/net-misc/batctl-2017.4
index ba31330f314c..dcc3f0dfd0c8 100644
--- a/metadata/md5-cache/net-misc/batctl-2017.4
+++ b/metadata/md5-cache/net-misc/batctl-2017.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libnl:3
 SLOT=0
 SRC_URI=https://downloads.open-mesh.org/batman/releases/batman-adv-2017.4/batctl-2017.4.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=379c42fb1d7b22458cdc15686d7458a7
diff --git a/metadata/md5-cache/net-misc/bridge-utils-1.5 b/metadata/md5-cache/net-misc/bridge-utils-1.5
index d99ee35a589b..54aa953a0005 100644
--- a/metadata/md5-cache/net-misc/bridge-utils-1.5
+++ b/metadata/md5-cache/net-misc/bridge-utils-1.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-brctl )
 SLOT=0
 SRC_URI=mirror://sourceforge/bridge/bridge-utils-1.5.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=06f7ae0c9fc8a362e3142e6b082f0d4c
diff --git a/metadata/md5-cache/net-misc/bridge-utils-1.6 b/metadata/md5-cache/net-misc/bridge-utils-1.6
index 8a92f2f95d88..e35a6c042bbc 100644
--- a/metadata/md5-cache/net-misc/bridge-utils-1.6
+++ b/metadata/md5-cache/net-misc/bridge-utils-1.6
@@ -4,10 +4,10 @@ DESCRIPTION=Tools for configuring the Linux kernel 802.1d Ethernet Bridge
 EAPI=6
 HOMEPAGE=http://bridge.sourceforge.net/
 IUSE=selinux kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-brctl )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/net/bridge-utils/bridge-utils-1.6.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8a782cbbcabe4658b273067792db9c2e
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2f5f08e8224a3a0229e28f5804251b31
diff --git a/metadata/md5-cache/net-misc/bwwhois-5.5.2-r2 b/metadata/md5-cache/net-misc/bwwhois-5.5.2-r2
index b579b77add26..61842a6052c0 100644
--- a/metadata/md5-cache/net-misc/bwwhois-5.5.2-r2
+++ b/metadata/md5-cache/net-misc/bwwhois-5.5.2-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=virtual/perl-Getopt-Long dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://whois.bw.org/dist/whois-5.5.2.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=66bf8264cc9a03fdb60d3614b6e71e04
diff --git a/metadata/md5-cache/net-misc/charm-1.9.2-r2 b/metadata/md5-cache/net-misc/charm-1.9.2-r2
deleted file mode 100644
index b3331cc053a7..000000000000
--- a/metadata/md5-cache/net-misc/charm-1.9.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-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-42.0.2[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	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=42ce5966e3ce304182a1317dc7a796cf
diff --git a/metadata/md5-cache/net-misc/clockspeed-0.62-r7 b/metadata/md5-cache/net-misc/clockspeed-0.62-r7
new file mode 100644
index 000000000000..58bd393a66d4
--- /dev/null
+++ b/metadata/md5-cache/net-misc/clockspeed-0.62-r7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install
+DEPEND=sys-apps/groff
+DESCRIPTION=Simple Network Time Protocol (NTP) client
+EAPI=7
+HOMEPAGE=https://cr.yp.to/clockspeed.html
+IUSE=static selinux
+KEYWORDS=~amd64 ~mips ~x86
+LICENSE=all-rights-reserved
+RDEPEND=selinux? ( sec-policy/selinux-clockspeed ) net-dns/djbdns
+RESTRICT=mirror bindist test
+SLOT=0
+SRC_URI=https://cr.yp.to/clockspeed/clockspeed-0.62.tar.gz https://dev.gentoo.org/~pacho/maintainer-needed/leapsecs.dat.20081114
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7e00366b948fc8b80ee281b9de2a4b08
diff --git a/metadata/md5-cache/net-misc/clusterssh-4.03.03 b/metadata/md5-cache/net-misc/clusterssh-4.03.03
index eea13e186e4f..b900c20cbd5e 100644
--- a/metadata/md5-cache/net-misc/clusterssh-4.03.03
+++ b/metadata/md5-cache/net-misc/clusterssh-4.03.03
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Exception-Class dev-perl/Readonly dev-perl/Test-Pod dev-perl/Te
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DU/DUNCS/App-ClusterSSH-4.01_05.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=87d6e1e9b0e68258ecaa302c8da55906
diff --git a/metadata/md5-cache/net-misc/clusterssh-4.30.600 b/metadata/md5-cache/net-misc/clusterssh-4.30.600
index c72603ad47dd..28055037f094 100644
--- a/metadata/md5-cache/net-misc/clusterssh-4.30.600
+++ b/metadata/md5-cache/net-misc/clusterssh-4.30.600
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Config-Simple dev-perl/Exception-Class dev-perl/Tk dev-perl/Rea
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DU/DUNCS/App-ClusterSSH-4.03_06.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ecec2ec5d220c26856d100fc90f12ca0
diff --git a/metadata/md5-cache/net-misc/clusterssh-9999 b/metadata/md5-cache/net-misc/clusterssh-9999
index da6a76edd498..32a9b6768585 100644
--- a/metadata/md5-cache/net-misc/clusterssh-9999
+++ b/metadata/md5-cache/net-misc/clusterssh-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-perl/Exception-Class dev-perl/Readonly dev-perl/Test-Pod dev-perl/Test-Pod-Coverage dev-perl/Test-Trap dev-perl/Test-DistManifest dev-perl/Try-Tiny dev-perl/Tk dev-perl/Config-Simple dev-perl/X11-Protocol dev-perl/XML-Simple x11-apps/xlsfonts x11-terms/xterm dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f565b188ba09f5d746def31a2e2cca70
diff --git a/metadata/md5-cache/net-misc/cni-plugins-0.8.2 b/metadata/md5-cache/net-misc/cni-plugins-0.8.2
index 33272b8517a4..39067695954f 100644
--- a/metadata/md5-cache/net-misc/cni-plugins-0.8.2
+++ b/metadata/md5-cache/net-misc/cni-plugins-0.8.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/containernetworking/plugins/archive/v0.8.2.tar.gz -> cni-plugins-0.8.2.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ebd8985fd36305b05add03b7abcc1cee
diff --git a/metadata/md5-cache/net-misc/cni-plugins-0.8.3 b/metadata/md5-cache/net-misc/cni-plugins-0.8.3
index 68cc7f03d0dc..429b4883368f 100644
--- a/metadata/md5-cache/net-misc/cni-plugins-0.8.3
+++ b/metadata/md5-cache/net-misc/cni-plugins-0.8.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/containernetworking/plugins/archive/v0.8.3.tar.gz -> cni-plugins-0.8.3.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e433226e2f613886f7514394d213632c
diff --git a/metadata/md5-cache/net-misc/cni-plugins-0.8.4 b/metadata/md5-cache/net-misc/cni-plugins-0.8.4
index 81eb04ef919e..144999a687c3 100644
--- a/metadata/md5-cache/net-misc/cni-plugins-0.8.4
+++ b/metadata/md5-cache/net-misc/cni-plugins-0.8.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/containernetworking/plugins/archive/v0.8.4.tar.gz -> cni-plugins-0.8.4.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7bb62900bf183c866caec27ab30cc28e
diff --git a/metadata/md5-cache/net-misc/cni-plugins-0.8.5 b/metadata/md5-cache/net-misc/cni-plugins-0.8.5
index bd89ebaa6811..650d5341e31f 100644
--- a/metadata/md5-cache/net-misc/cni-plugins-0.8.5
+++ b/metadata/md5-cache/net-misc/cni-plugins-0.8.5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/containernetworking/plugins/archive/v0.8.5.tar.gz -> cni-plugins-0.8.5.tar.gz
-_eclasses_=go-module	45394825d9260b479aa1cf252ea58e01	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=go-module	45394825d9260b479aa1cf252ea58e01	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=560a83ff33268801be6d25180f7b99fa
diff --git a/metadata/md5-cache/net-misc/cni-plugins-0.8.6 b/metadata/md5-cache/net-misc/cni-plugins-0.8.6
index 761ca6713f79..587dfd46378d 100644
--- a/metadata/md5-cache/net-misc/cni-plugins-0.8.6
+++ b/metadata/md5-cache/net-misc/cni-plugins-0.8.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/containernetworking/plugins/archive/v0.8.6.tar.gz -> cni-plugins-0.8.6.tar.gz
-_eclasses_=go-module	45394825d9260b479aa1cf252ea58e01	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=go-module	45394825d9260b479aa1cf252ea58e01	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=560a83ff33268801be6d25180f7b99fa
diff --git a/metadata/md5-cache/net-misc/curl-7.71.0 b/metadata/md5-cache/net-misc/curl-7.71.0
new file mode 100644
index 000000000000..82a525cdf5e5
--- /dev/null
+++ b/metadata/md5-cache/net-misc/curl-7.71.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig test? ( sys-apps/diffutils 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
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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(-)?] ) brotli? ( 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(-)?] ) ssl? ( curl_ssl_gnutls? ( net-libs/gnutls: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(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl: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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl: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(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,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/ngtcp2[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(-)?] ) quiche? ( >=net-libs/quiche-0.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(-)?] ) idn? ( net-dns/libidn2: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(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.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(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_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(-)?]
+DESCRIPTION=A Client that groks URLs
+EAPI=7
+HOMEPAGE=https://curl.haxx.se/
+IUSE=adns alt-svc brotli +ftp gopher http2 idn +imap ipv6 kerberos ldap metalink +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl nghttp3 quiche elibc_Winnt abi_x86_32 abi_x86_64 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 ~sparc ~x86 ~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=curl
+RDEPEND=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(-)?] ) brotli? ( 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(-)?] ) ssl? ( curl_ssl_gnutls? ( net-libs/gnutls: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(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl: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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl: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(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,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/ngtcp2[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(-)?] ) quiche? ( >=net-libs/quiche-0.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(-)?] ) idn? ( net-dns/libidn2: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(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.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(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_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(-)?]
+REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://curl.haxx.se/download/curl-7.71.0.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1e813d0fd60fa89cc6d9a784dbd93068
diff --git a/metadata/md5-cache/net-misc/dahdi-3.1.0-r1 b/metadata/md5-cache/net-misc/dahdi-3.1.0-r1
index 7f167d3ad635..053da139c256 100644
--- a/metadata/md5-cache/net-misc/dahdi-3.1.0-r1
+++ b/metadata/md5-cache/net-misc/dahdi-3.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-3.1.0.tar.gz https://www.junghanns.net/downloads/jnet-dahdi-drivers-1.0.14.tar.gz https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patchset-3.1.0-r1-v2.tar.bz2 https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f24d4e7c4134d76ce21d205897a00417
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=93eef5b6d861d86b2a168831e6a8a273
diff --git a/metadata/md5-cache/net-misc/dropbox-100.4.409 b/metadata/md5-cache/net-misc/dropbox-100.4.409
new file mode 100644
index 000000000000..5fde38823a5e
--- /dev/null
+++ b/metadata/md5-cache/net-misc/dropbox-100.4.409
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/patchelf virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=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 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-100.4.409.tar.gz ) x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-100.4.409.tar.gz )
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2af051a87d6d9d6d2a797b4fab1582ae
diff --git a/metadata/md5-cache/net-misc/ena-driver-2.0.3 b/metadata/md5-cache/net-misc/ena-driver-2.0.3
index 47c35dbe2068..2b03ea500b46 100644
--- a/metadata/md5-cache/net-misc/ena-driver-2.0.3
+++ b/metadata/md5-cache/net-misc/ena-driver-2.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/amzn/amzn-drivers/archive/ena_linux_2.0.3.zip -> ena-driver-2.0.3-linux.zip
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=240e4ff7e267ef23a570c9ba52020e5e
diff --git a/metadata/md5-cache/net-misc/ena-driver-2.2.3 b/metadata/md5-cache/net-misc/ena-driver-2.2.3
index 19ebbe89c224..42e457b752a2 100644
--- a/metadata/md5-cache/net-misc/ena-driver-2.2.3
+++ b/metadata/md5-cache/net-misc/ena-driver-2.2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/amzn/amzn-drivers/archive/ena_linux_2.2.3.tar.gz -> ena-driver-2.2.3-linux.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c90154a8e2c7fffadb674a2ab00588b0
diff --git a/metadata/md5-cache/net-misc/endlessh-1.0 b/metadata/md5-cache/net-misc/endlessh-1.0
deleted file mode 100644
index 6727756af93b..000000000000
--- a/metadata/md5-cache/net-misc/endlessh-1.0
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst prepare
-DESCRIPTION=SSH tarpit that slowly sends and endless banner
-EAPI=7
-HOMEPAGE=https://github.com/skeeto/endlessh
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=Unlicense
-SLOT=0
-SRC_URI=https://github.com/skeeto/endlessh/archive/1.0.tar.gz -> endlessh-1.0.tar.gz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6b5e404dadb392732e59d86022dcd991
diff --git a/metadata/md5-cache/net-misc/endlessh-1.1 b/metadata/md5-cache/net-misc/endlessh-1.1
deleted file mode 100644
index ffc5e6282d8f..000000000000
--- a/metadata/md5-cache/net-misc/endlessh-1.1
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst prepare
-DESCRIPTION=SSH tarpit that slowly sends and endless banner
-EAPI=7
-HOMEPAGE=https://github.com/skeeto/endlessh
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
-LICENSE=Unlicense
-SLOT=0
-SRC_URI=https://github.com/skeeto/endlessh/archive/1.1.tar.gz -> endlessh-1.1.tar.gz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=316789fe63e7d3fc698629d1cfdac2d6
diff --git a/metadata/md5-cache/net-misc/endlessh-1.1-r1 b/metadata/md5-cache/net-misc/endlessh-1.1-r1
new file mode 100644
index 000000000000..eb65a6509f06
--- /dev/null
+++ b/metadata/md5-cache/net-misc/endlessh-1.1-r1
@@ -0,0 +1,11 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst prepare
+DESCRIPTION=SSH tarpit that slowly sends and endless banner
+EAPI=7
+HOMEPAGE=https://github.com/skeeto/endlessh
+KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
+LICENSE=Unlicense
+SLOT=0
+SRC_URI=https://github.com/skeeto/endlessh/archive/1.1.tar.gz -> endlessh-1.1.tar.gz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a3d1fb1302b959a2fddd0480a67474b4
diff --git a/metadata/md5-cache/net-misc/endlessh-9999 b/metadata/md5-cache/net-misc/endlessh-9999
index 4943112695ff..22bd7eeff370 100644
--- a/metadata/md5-cache/net-misc/endlessh-9999
+++ b/metadata/md5-cache/net-misc/endlessh-9999
@@ -7,4 +7,4 @@ LICENSE=Unlicense
 PROPERTIES=live
 SLOT=0
 _eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6b5e404dadb392732e59d86022dcd991
+_md5_=48d313f6c415bd335f10f50e169466d1
diff --git a/metadata/md5-cache/net-misc/etherdfs-20180203-r1 b/metadata/md5-cache/net-misc/etherdfs-20180203-r1
index e14d40913db3..2680405faf43 100644
--- a/metadata/md5-cache/net-misc/etherdfs-20180203-r1
+++ b/metadata/md5-cache/net-misc/etherdfs-20180203-r1
@@ -4,9 +4,9 @@ DESCRIPTION=An ethernet-based file system for DOS
 EAPI=7
 HOMEPAGE=http://etherdfs.sourceforge.net/
 IUSE=tsr
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=mirror://sourceforge/etherdfs/ethersrv-linux-20180203.tar.xz tsr? ( mirror://sourceforge/etherdfs/v0.8.2/etherdfs.zip -> etherdfs-20180203.zip )
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=df4402dc17a7dbfa468b2375ba312479
+_md5_=09432deb9073b522d753b24118b3dd05
diff --git a/metadata/md5-cache/net-misc/eventd-0.27.0-r1 b/metadata/md5-cache/net-misc/eventd-0.27.0-r1
index 43401b88b1ad..f30cb5554e70 100644
--- a/metadata/md5-cache/net-misc/eventd-0.27.0-r1
+++ b/metadata/md5-cache/net-misc/eventd-0.27.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=X? ( notification ) fbcon? ( notification ) notification? ( || ( X
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.eventd.org/download/eventd/eventd-0.27.0.tar.xz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fe2dc8bb9bad2c8f8eebb601214b3f54
diff --git a/metadata/md5-cache/net-misc/fatrat-1.2.0_beta2_p20161204 b/metadata/md5-cache/net-misc/fatrat-1.2.0_beta2_p20161204
index 5b1ccb683ac2..6ba963528026 100644
--- a/metadata/md5-cache/net-misc/fatrat-1.2.0_beta2_p20161204
+++ b/metadata/md5-cache/net-misc/fatrat-1.2.0_beta2_p20161204
@@ -1,7 +1,8 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 bittorrent? ( dev-qt/qtwebengine:5[widgets] >=net-libs/libtorrent-rasterbar-1.1.1 ) curl? ( >=net-misc/curl-7.18.2 ) doc? ( dev-qt/qthelp:5 ) xmpp? ( net-libs/gloox ) dev-libs/boost dev-qt/linguist-tools:5 virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig nls? ( sys-devel/gettext ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 bittorrent? ( dev-qt/qtwebengine:5[widgets] >=net-libs/libtorrent-rasterbar-1.1.1 ) curl? ( >=net-misc/curl-7.18.2 ) doc? ( dev-qt/qthelp:5 ) xmpp? ( net-libs/gloox ) dev-libs/boost
 DESCRIPTION=Qt5-based download/upload manager
-EAPI=6
+EAPI=7
 HOMEPAGE=http://fatrat.dolezel.info/
 IUSE=bittorrent +curl doc nls xmpp
 KEYWORDS=~amd64 ~x86
@@ -9,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 bittorrent? ( dev-qt/qtwebengine:5[widgets] >=net-libs/libtorrent-rasterbar-1.1.1 ) curl? ( >=net-misc/curl-7.18.2 ) doc? ( dev-qt/qthelp:5 ) xmpp? ( net-libs/gloox )
 SLOT=0
 SRC_URI=https://github.com/LubosD/fatrat/tarball/14a1a146df76d70c44dcc38363848a5b41a364d5 -> fatrat-1.2.0_beta2_p20161204.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=408bad2969d388d6a00baf912e62df07
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9810cf687a8b0945b6d3d014ca01257c
diff --git a/metadata/md5-cache/net-misc/freerdp-2.1.2 b/metadata/md5-cache/net-misc/freerdp-2.1.2
new file mode 100644
index 000000000000..40405a38cfd9
--- /dev/null
+++ b/metadata/md5-cache/net-misc/freerdp-2.1.2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig X? ( doc? ( app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) usb? ( virtual/libudev:0= sys-apps/util-linux:0= dev-libs/dbus-glib:0= virtual/libusb:1= ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ffmpeg? ( media-video/ffmpeg:0= ) !ffmpeg? ( x11-libs/cairo:0= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) jpeg? ( virtual/jpeg:0 ) openh264? ( media-libs/openh264 ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) X? ( x11-libs/libX11 x11-libs/libxkbfile )
+DESCRIPTION=Free implementation of the Remote Desktop Protocol
+EAPI=7
+HOMEPAGE=http://www.freerdp.com/
+IUSE=alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) usb? ( virtual/libudev:0= sys-apps/util-linux:0= dev-libs/dbus-glib:0= virtual/libusb:1= ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ffmpeg? ( media-video/ffmpeg:0= ) !ffmpeg? ( x11-libs/cairo:0= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) jpeg? ( virtual/jpeg:0 ) openh264? ( media-libs/openh264 ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) X? ( x11-libs/libX11 x11-libs/libxkbfile )
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://pub.freerdp.com/releases/freerdp-2.1.2.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ed37468ea3da2b0442367053251d3938
diff --git a/metadata/md5-cache/net-misc/gcap-0.1.1-r1 b/metadata/md5-cache/net-misc/gcap-0.1.1-r1
index e2056ba8c1d3..10b7102fb79e 100644
--- a/metadata/md5-cache/net-misc/gcap-0.1.1-r1
+++ b/metadata/md5-cache/net-misc/gcap-0.1.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-perl/Getopt-ArgvFile dev-perl/XML-DOM virtual/perl-Getopt-Long dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://debian/pool/main/g/gcap/gcap_0.1.1.orig.tar.gz -> gcap-0.1.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a22e22b0c654a34570ec94e8e3384006
diff --git a/metadata/md5-cache/net-misc/geoipupdate-4.3.0 b/metadata/md5-cache/net-misc/geoipupdate-4.3.0
index c7b531e8f1f6..64e82392c978 100644
--- a/metadata/md5-cache/net-misc/geoipupdate-4.3.0
+++ b/metadata/md5-cache/net-misc/geoipupdate-4.3.0
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=performs automatic updates of GeoIP2 and GeoIP Legacy binary databases
 EAPI=7
 HOMEPAGE=https://github.com/maxmind/geoipupdate
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=ISC BSD BSD-2 MIT Apache-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/maxmind/geoipupdate/archive/v4.3.0.tar.gz -> geoipupdate-4.3.0.tar.gz mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.7.1.zip -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/gofrs/flock/@v/v0.7.1.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/maxmind/geoipupdate/@v/v4.0.2+incompatible.zip -> github.com%2Fmaxmind%2Fgeoipupdate%2F@v%2Fv4.0.2+incompatible.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.0.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	go-module	45394825d9260b479aa1cf252ea58e01
-_md5_=2c973163c1fc40feffca457ed67b4f12
+_md5_=e88c665faae9a2f5050a20abab0ab4a4
diff --git a/metadata/md5-cache/net-misc/gerbera-1.4.0-r1 b/metadata/md5-cache/net-misc/gerbera-1.4.0-r1
index fe03ae19a8de..04365dd72a68 100644
--- a/metadata/md5-cache/net-misc/gerbera-1.4.0-r1
+++ b/metadata/md5-cache/net-misc/gerbera-1.4.0-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=acct-user/gerbera =net-libs/libupnp-1.8*:=[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/expat mysql? ( dev-db/mysql-connector-c ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( >=media-video/ffmpeg-2.2:0= ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl net-misc/youtube-dl ) magic? ( sys-apps/file ) matroska? ( media-libs/libmatroska ) sys-apps/util-linux sys-libs/zlib virtual/libiconv virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/gerbera/gerbera/archive/v1.4.0.tar.gz -> gerbera-1.4.0.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d4ee02a54dc97572624da5bb060555e5
diff --git a/metadata/md5-cache/net-misc/gerbera-1.5.0-r1 b/metadata/md5-cache/net-misc/gerbera-1.5.0-r1
index 7418719f048f..df66248d1866 100644
--- a/metadata/md5-cache/net-misc/gerbera-1.5.0-r1
+++ b/metadata/md5-cache/net-misc/gerbera-1.5.0-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=acct-user/gerbera >=net-libs/libupnp-1.12.1:=[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/spdlog:= dev-libs/pugixml dev-libs/libfmt:0/6 mysql? ( dev-db/mysql-connector-c ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( >=media-video/ffmpeg-2.2:0= ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl ) magic? ( sys-apps/file ) matroska? ( media-libs/libmatroska ) sys-apps/util-linux sys-libs/zlib virtual/libiconv virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/gerbera/gerbera/archive/v1.5.0.tar.gz -> gerbera-1.5.0.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0aa85bc9b4ad5098b82e7f0513b4e64a
diff --git a/metadata/md5-cache/net-misc/gerbera-9999 b/metadata/md5-cache/net-misc/gerbera-9999
index 8dcebde3c3d2..23f64bc16b3b 100644
--- a/metadata/md5-cache/net-misc/gerbera-9999
+++ b/metadata/md5-cache/net-misc/gerbera-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=acct-user/gerbera >=net-libs/libupnp-1.12.1:=[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/spdlog:= dev-libs/pugixml dev-libs/libfmt:0/6 mysql? ( dev-db/mysql-connector-c ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( >=media-video/ffmpeg-2.2:0= ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl ) magic? ( sys-apps/file ) matroska? ( media-libs/libmatroska ) sys-apps/util-linux sys-libs/zlib virtual/libiconv virtual/tmpfiles
 SLOT=0
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=14b86280452e125fe2fc62a0c69d7a96
diff --git a/metadata/md5-cache/net-misc/gvrpcd-1.3 b/metadata/md5-cache/net-misc/gvrpcd-1.3
index a59e6d71e725..756f37726a6b 100644
--- a/metadata/md5-cache/net-misc/gvrpcd-1.3
+++ b/metadata/md5-cache/net-misc/gvrpcd-1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libnet:1.1
 SLOT=0
 SRC_URI=http://sokrates.mimuw.edu.pl/~sebek/gvrpcd/gvrpcd-1.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5796278468f1520930dc03211b8c7778
diff --git a/metadata/md5-cache/net-misc/htbinit-0.8.5-r7 b/metadata/md5-cache/net-misc/htbinit-0.8.5-r7
index 5bd3a0d3bcf8..eb7c04807b93 100644
--- a/metadata/md5-cache/net-misc/htbinit-0.8.5-r7
+++ b/metadata/md5-cache/net-misc/htbinit-0.8.5-r7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/iproute2
 SLOT=0
 SRC_URI=mirror://sourceforge/htbinit/htb.init-v0.8.5
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8ab7a25202011054447abb750311b008
diff --git a/metadata/md5-cache/net-misc/htpdate-1.0.7 b/metadata/md5-cache/net-misc/htpdate-1.0.7
index 3b577f829110..4f8aa1183651 100644
--- a/metadata/md5-cache/net-misc/htpdate-1.0.7
+++ b/metadata/md5-cache/net-misc/htpdate-1.0.7
@@ -6,5 +6,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~mips ppc ~ppc64 s390 x86 ~amd64-linux ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.vervest.org/htp/archive/c/htpdate-1.0.7.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	273fa5d1a8ed000a29d79323e2ed0dc1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	273fa5d1a8ed000a29d79323e2ed0dc1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7cd5b842ca0c69161112c013576e2cb3
diff --git a/metadata/md5-cache/net-misc/ifenslave-1.1.0-r6 b/metadata/md5-cache/net-misc/ifenslave-1.1.0-r6
index f649a7602ca5..299aaf5dbdae 100644
--- a/metadata/md5-cache/net-misc/ifenslave-1.1.0-r6
+++ b/metadata/md5-cache/net-misc/ifenslave-1.1.0-r6
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 ~arm ~mips ppc sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/i/ifenslave-2.6/ifenslave-2.6_1.1.0.orig.tar.gz mirror://debian/pool/main/i/ifenslave-2.6/ifenslave-2.6_1.1.0-17.debian.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9874d00bf1dfab5bb2939bf9f7dd3b30
diff --git a/metadata/md5-cache/net-misc/igmpproxy-0.2.1-r2 b/metadata/md5-cache/net-misc/igmpproxy-0.2.1-r2
index fafe486564d6..2415f7877790 100644
--- a/metadata/md5-cache/net-misc/igmpproxy-0.2.1-r2
+++ b/metadata/md5-cache/net-misc/igmpproxy-0.2.1-r2
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/pali/igmpproxy/releases/download/0.2.1/igmpproxy-0.2.1.tar.gz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=43bc7a9af978d78e206d6afa393d2965
diff --git a/metadata/md5-cache/net-misc/igmpproxy-0.2.1_p20200508 b/metadata/md5-cache/net-misc/igmpproxy-0.2.1_p20200508
index c8bd6ce0cd67..e903422b35e0 100644
--- a/metadata/md5-cache/net-misc/igmpproxy-0.2.1_p20200508
+++ b/metadata/md5-cache/net-misc/igmpproxy-0.2.1_p20200508
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/pali/igmpproxy/archive/c3e813a077c26134aa7574b4b271a5ee3d781471.tar.gz -> igmpproxy-0.2.1_p20200508.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8b462682f79cc3893706e143bd4aa027
diff --git a/metadata/md5-cache/net-misc/ipx-utils-1.1-r4 b/metadata/md5-cache/net-misc/ipx-utils-1.1-r4
deleted file mode 100644
index 5af28814cea0..000000000000
--- a/metadata/md5-cache/net-misc/ipx-utils-1.1-r4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=The IPX Utilities
-EAPI=6
-HOMEPAGE=ftp://sunsite.unc.edu/pub/Linux/system/filesystems/ncpfs/
-KEYWORDS=amd64 ppc64 x86
-LICENSE=ipx-utils GPL-2
-RDEPEND=!!net-fs/ncpfs
-SLOT=0
-SRC_URI=ftp://sunsite.unc.edu/pub/Linux/system/filesystems/ncpfs/ipx-1.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f810ac3b2d61946a993a2e30fd497baf
diff --git a/metadata/md5-cache/net-misc/knock-0.7 b/metadata/md5-cache/net-misc/knock-0.7
deleted file mode 100644
index 3dfb4f434633..000000000000
--- a/metadata/md5-cache/net-misc/knock-0.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=server? ( net-libs/libpcap )
-DESCRIPTION=A simple port-knocking daemon
-EAPI=4
-HOMEPAGE=http://www.zeroflux.org/projects/knock
-IUSE=+server
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=server? ( net-libs/libpcap )
-SLOT=0
-SRC_URI=http://www.zeroflux.org/proj/knock/files/knock-0.7.tar.gz
-_md5_=67ca7a0103bca8f4b134246d72c9b3c5
diff --git a/metadata/md5-cache/net-misc/knock-0.7-r1 b/metadata/md5-cache/net-misc/knock-0.7-r1
new file mode 100644
index 000000000000..edee9f06e6f4
--- /dev/null
+++ b/metadata/md5-cache/net-misc/knock-0.7-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=server? ( net-libs/libpcap )
+DESCRIPTION=Simple port-knocking daemon
+EAPI=7
+HOMEPAGE=https://www.zeroflux.org/projects/knock https://github.com/jvinet/knock
+IUSE=+server
+KEYWORDS=amd64 ppc sparc x86
+LICENSE=GPL-2+
+RDEPEND=server? ( net-libs/libpcap )
+SLOT=0
+SRC_URI=https://www.zeroflux.org/proj/knock/files/knock-0.7.tar.gz
+_md5_=0ac4c20556d4fa4d74244f0e586830a3
diff --git a/metadata/md5-cache/net-misc/libteam-1.22 b/metadata/md5-cache/net-misc/libteam-1.22
index 1744f109195f..9fc284c6523f 100644
--- a/metadata/md5-cache/net-misc/libteam-1.22
+++ b/metadata/md5-cache/net-misc/libteam-1.22
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/jansson-2.4 dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) zmq? ( >=net-libs/zeromq-3.2.0 ) syslog? ( virtual/logger )
 SLOT=0
 SRC_URI=http://libteam.org/files/libteam-1.22.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f046286176f94b259a0af1f10406ab73
diff --git a/metadata/md5-cache/net-misc/libteam-1.29 b/metadata/md5-cache/net-misc/libteam-1.29
index 7d503eeb7b50..3a51a877a185 100644
--- a/metadata/md5-cache/net-misc/libteam-1.29
+++ b/metadata/md5-cache/net-misc/libteam-1.29
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/jansson-2.4 dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) zmq? ( >=net-libs/zeromq-3.2.0 ) syslog? ( virtual/logger )
 SLOT=0
 SRC_URI=https://github.com/jpirko/libteam/archive/v1.29.tar.gz -> libteam-1.29.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b806f44bc8968d160a0023b6ccd4c05e
diff --git a/metadata/md5-cache/net-misc/libteam-1.30 b/metadata/md5-cache/net-misc/libteam-1.30
index 498677c46b60..44ac17aa9734 100644
--- a/metadata/md5-cache/net-misc/libteam-1.30
+++ b/metadata/md5-cache/net-misc/libteam-1.30
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/jansson-2.4 dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) zmq? ( >=net-libs/zeromq-3.2.0 ) syslog? ( virtual/logger )
 SLOT=0
 SRC_URI=https://github.com/jpirko/libteam/archive/v1.30.tar.gz -> libteam-1.30.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b806f44bc8968d160a0023b6ccd4c05e
diff --git a/metadata/md5-cache/net-misc/libteam-9999 b/metadata/md5-cache/net-misc/libteam-9999
index 877b2ff95430..050cd028d801 100644
--- a/metadata/md5-cache/net-misc/libteam-9999
+++ b/metadata/md5-cache/net-misc/libteam-9999
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 PROPERTIES=live
 RDEPEND=>=dev-libs/jansson-2.4 dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) zmq? ( >=net-libs/zeromq-3.2.0 ) syslog? ( virtual/logger )
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f7e1d570b5477f5d55d5f870adc701e9
diff --git a/metadata/md5-cache/net-misc/linuxptp-2.0 b/metadata/md5-cache/net-misc/linuxptp-2.0
index 69eb8028953f..503a3de03911 100644
--- a/metadata/md5-cache/net-misc/linuxptp-2.0
+++ b/metadata/md5-cache/net-misc/linuxptp-2.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxptp/v2.0/linuxptp-2.0.tgz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=27ed98aece525bc03860024d99780591
diff --git a/metadata/md5-cache/net-misc/lksctp-tools-1.0.17 b/metadata/md5-cache/net-misc/lksctp-tools-1.0.17
index 51cf0c0e4051..e01bb08d3d89 100644
--- a/metadata/md5-cache/net-misc/lksctp-tools-1.0.17
+++ b/metadata/md5-cache/net-misc/lksctp-tools-1.0.17
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2+ LGPL-2.1 )
 REQUIRED_USE=kernel_linux
 SLOT=0
 SRC_URI=mirror://sourceforge/lksctp/lksctp-tools-1.0.17.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7b76810f3cb75a1283e1ab19c4f804b1
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 de586f6f3ca4..0bfa268ad71f 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
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2+ LGPL-2.1 )
 REQUIRED_USE=kernel_linux
 SLOT=0
 SRC_URI=https://github.com/sctp/lksctp-tools/archive/v1.0.18.tar.gz -> lksctp-tools-1.0.18.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c0e8eeaccb1c81679e6f41d0490b9a12
diff --git a/metadata/md5-cache/net-misc/mcproxy-1.1.1-r1 b/metadata/md5-cache/net-misc/mcproxy-1.1.1-r1
index b88c100e1b43..d74414ca5089 100644
--- a/metadata/md5-cache/net-misc/mcproxy-1.1.1-r1
+++ b/metadata/md5-cache/net-misc/mcproxy-1.1.1-r1
@@ -9,5 +9,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/mcproxy/mcproxy/archive/v1.1.1.tar.gz -> mcproxy-1.1.1.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dc1b0138e481c6fefa2a4c17aff83b5c
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 09cff2a3834f..13eb12e49307 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:= media-video/ffmpeg:0= virtual/jpeg: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	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fd8640c759abf086997e1c7e08d58ffd
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 889d13f66441..3800fc0abd43 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.18.4-r3
+++ b/metadata/md5-cache/net-misc/networkmanager-1.18.4-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=bluetooth? ( modemmanager ) iwd? ( wifi ) vala? ( introspection ) w
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.18/NetworkManager-1.18.4.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=25900bacdeb61f753f0ced85c6cd7f55
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.18.6 b/metadata/md5-cache/net-misc/networkmanager-1.18.6
index 1dab9b94f9b8..742aa04e9883 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.18.6
+++ b/metadata/md5-cache/net-misc/networkmanager-1.18.6
@@ -11,5 +11,5 @@ REQUIRED_USE=bluetooth? ( modemmanager ) iwd? ( wifi ) vala? ( introspection ) w
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.18/NetworkManager-1.18.6.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a25b04e2dbbe1c8f3aa8f8d88f46222d
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.20.12 b/metadata/md5-cache/net-misc/networkmanager-1.20.12
index 2f6a1269e223..0e0d2e869011 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.20.12
+++ b/metadata/md5-cache/net-misc/networkmanager-1.20.12
@@ -11,5 +11,5 @@ REQUIRED_USE=bluetooth? ( modemmanager ) iwd? ( wifi ) vala? ( introspection ) w
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.20/NetworkManager-1.20.12.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=75c6134b63e02500569a9f17cdd86977
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.22.10-r11 b/metadata/md5-cache/net-misc/networkmanager-1.22.10-r11
index a2f8710b51e5..882f47ffa942 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.22.10-r11
+++ b/metadata/md5-cache/net-misc/networkmanager-1.22.10-r11
@@ -12,5 +12,5 @@ REQUIRED_USE=gtk-doc? ( introspection ) iwd? ( wifi ) vala? ( introspection ) ^^
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/archive/1.22.10/NetworkManager-1.22.10.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vala	5b72a65a36d681d65aef5f7b4b8b2cb6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vala	5b72a65a36d681d65aef5f7b4b8b2cb6
 _md5_=5f794cf9c84acbad0f8214946b9cb61d
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.22.14 b/metadata/md5-cache/net-misc/networkmanager-1.22.14
index 3c82e28a7ca1..4d4ebdd3d903 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.22.14
+++ b/metadata/md5-cache/net-misc/networkmanager-1.22.14
@@ -11,5 +11,5 @@ REQUIRED_USE=bluetooth? ( modemmanager ) iwd? ( wifi ) vala? ( introspection ) w
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.22/NetworkManager-1.22.14.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=62b4f5bcc506b7fba072487d9978e215
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.24.2 b/metadata/md5-cache/net-misc/networkmanager-1.24.2
index 74ac7d3e976a..5d774f29d6e7 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.24.2
+++ b/metadata/md5-cache/net-misc/networkmanager-1.24.2
@@ -11,5 +11,5 @@ REQUIRED_USE=bluetooth? ( modemmanager ) iwd? ( wifi ) vala? ( introspection ) w
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.24/NetworkManager-1.24.2.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=14b34c8b87cc145902773f58f0b0d61e
diff --git a/metadata/md5-cache/net-misc/nextcloud-client-2.6.4 b/metadata/md5-cache/net-misc/nextcloud-client-2.6.4
index afd0d79e716e..bab3d2eba978 100644
--- a/metadata/md5-cache/net-misc/nextcloud-client-2.6.4
+++ b/metadata/md5-cache/net-misc/nextcloud-client-2.6.4
@@ -5,11 +5,11 @@ DESCRIPTION=Desktop Syncing Client for Nextcloud
 EAPI=7
 HOMEPAGE=https://github.com/nextcloud/desktop
 IUSE=doc dolphin nautilus shibboleth test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=CC-BY-3.0 GPL-2
 RDEPEND=>=dev-db/sqlite-3.4:3 >=dev-libs/openssl-1.1.0:0= dev-libs/qtkeychain[qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-fs/inotify-tools dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) shibboleth? ( dev-qt/qtwebkit:5 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nextcloud/desktop/archive/v2.6.4.tar.gz -> nextcloud-client-2.6.4.tar.gz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3ea07d254f3f673cd7474f2d04bb16e8
+_md5_=7985f3f4943a58c1d33895c6ca7b8c34
diff --git a/metadata/md5-cache/net-misc/ntp-4.2.8_p13 b/metadata/md5-cache/net-misc/ntp-4.2.8_p13
deleted file mode 100644
index ecb1cadf520b..000000000000
--- a/metadata/md5-cache/net-misc/ntp-4.2.8_p13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=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 ) 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=Network Time Protocol suite/programs
-EAPI=6
-HOMEPAGE=http://www.ntp.org/
-IUSE=caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint
-LICENSE=HPND BSD ISC
-PDEPEND=openntpd? ( net-misc/openntpd )
-RDEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1db1435bee1991e42ac13ba164580249
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
deleted file mode 100644
index e0e68bd2e04d..000000000000
--- a/metadata/md5-cache/net-misc/ntp-4.2.8_p13-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig acct-group/ntp acct-user/ntp >=app-portage/elt-patches-20170815 || ( >=sys-devel/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
-DEPEND=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 )
-DESCRIPTION=Network Time Protocol suite/programs
-EAPI=7
-HOMEPAGE=http://www.ntp.org/
-IUSE=caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint
-LICENSE=HPND BSD ISC
-PDEPEND=openntpd? ( net-misc/openntpd )
-RDEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) parse-clocks? ( net-misc/pps-tools ) acct-group/ntp acct-user/ntp 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	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3debe3b86bef29461e923a615d429ae2
diff --git a/metadata/md5-cache/net-misc/ntp-4.2.8_p15 b/metadata/md5-cache/net-misc/ntp-4.2.8_p15
new file mode 100644
index 000000000000..288c021e3f80
--- /dev/null
+++ b/metadata/md5-cache/net-misc/ntp-4.2.8_p15
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig acct-group/ntp acct-user/ntp >=app-portage/elt-patches-20170815 || ( >=sys-devel/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
+DEPEND=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 )
+DESCRIPTION=Network Time Protocol suite/programs
+EAPI=7
+HOMEPAGE=http://www.ntp.org/
+IUSE=caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint
+LICENSE=HPND BSD ISC
+PDEPEND=openntpd? ( net-misc/openntpd )
+RDEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) parse-clocks? ( net-misc/pps-tools ) acct-group/ntp acct-user/ntp 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.8p15.tar.gz https://dev.gentoo.org/~polynomial-c/ntp-4.2.8p15-manpages.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c756664437eafac150266131ec96a012
diff --git a/metadata/md5-cache/net-misc/ntpsec-1.1.9 b/metadata/md5-cache/net-misc/ntpsec-1.1.9
new file mode 100644
index 000000000000..74c24e311055
--- /dev/null
+++ b/metadata/md5-cache/net-misc/ntpsec-1.1.9
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=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(-)] sys-libs/libcap 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(-)] libbsd? ( dev-libs/libbsd:0= ) dev-libs/openssl:0= seccomp? ( sys-libs/libseccomp ) app-text/asciidoc dev-libs/libxslt app-text/docbook-xsl-stylesheets sys-devel/bison rclock_oncore? ( net-misc/pps-tools ) rclock_pps? ( net-misc/pps-tools ) virtual/pkgconfig
+DESCRIPTION=The NTP reference implementation, refactored
+EAPI=6
+HOMEPAGE=https://www.ntpsec.org/
+IUSE=rclock_oncore rclock_trimble rclock_truetime rclock_gpsd rclock_jjy rclock_generic rclock_spectracom rclock_shm rclock_pps rclock_hpgps rclock_zyfer rclock_arbiter rclock_nmea rclock_neoclock rclock_modem rclock_local debug doc early gdb heat libbsd nist ntpviz samba seccomp smear tests python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=HPND MIT BSD-2 BSD CC-BY-SA-4.0
+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(-)] sys-libs/libcap 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(-)] libbsd? ( dev-libs/libbsd:0= ) dev-libs/openssl:0= seccomp? ( sys-libs/libseccomp ) ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) !net-misc/ntp !net-misc/openntpd acct-group/ntp acct-user/ntp
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) nist? ( rclock_local )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.1.9.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	cf9742c01975dc707eb982114a9d70fa
+_md5_=08cf37ed3ca7eba74cbe90b931cfc82f
diff --git a/metadata/md5-cache/net-misc/ntpsec-9999 b/metadata/md5-cache/net-misc/ntpsec-9999
index 3e9922d2feb3..d12c380753aa 100644
--- a/metadata/md5-cache/net-misc/ntpsec-9999
+++ b/metadata/md5-cache/net-misc/ntpsec-9999
@@ -10,4 +10,4 @@ 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 ) nist? ( rclock_local )
 SLOT=0
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	cf9742c01975dc707eb982114a9d70fa
-_md5_=105f3e2827094644c5d7e0666baecb55
+_md5_=08cf37ed3ca7eba74cbe90b931cfc82f
diff --git a/metadata/md5-cache/net-misc/oidc-agent-3.3.1 b/metadata/md5-cache/net-misc/oidc-agent-3.3.1
index 3f4b701457de..45dfc3404086 100644
--- a/metadata/md5-cache/net-misc/oidc-agent-3.3.1
+++ b/metadata/md5-cache/net-misc/oidc-agent-3.3.1
@@ -1,15 +1,15 @@
 BDEPEND=test? ( dev-libs/check )
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=app-crypt/libsecret dev-libs/libsodium net-libs/libmicrohttpd
+DEPEND=app-crypt/libsecret dev-libs/libsodium net-libs/libmicrohttpd sys-libs/libseccomp
 DESCRIPTION=oidc-agent for managing OpenID Connect tokens on the command line
 EAPI=7
 HOMEPAGE=https://github.com/indigo-dc/oidc-agent
 IUSE=test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=app-crypt/libsecret dev-libs/libsodium net-libs/libmicrohttpd
+RDEPEND=app-crypt/libsecret dev-libs/libsodium net-libs/libmicrohttpd sys-libs/libseccomp
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/indigo-dc/oidc-agent/archive/v3.3.1.tar.gz -> oidc-agent-3.3.1.tar.gz
-_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=505c87b0dc4a1826473bfdba0e01d2c9
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=36b19b964f8fb545450f3c9a259cc7e3
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.10.2 b/metadata/md5-cache/net-misc/openvswitch-2.10.2
deleted file mode 100644
index eb238707debf..000000000000
--- a/metadata/md5-cache/net-misc/openvswitch-2.10.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup
-DEPEND=ssl? ( dev-libs/openssl:0= ) 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/ovs-2.10.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/twisted[conch,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] debug? ( dev-lang/perl ) sys-apps/util-linux[caps] 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 kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) virtual/pkgconfig
-DESCRIPTION=Production quality, multilayer virtual switch
-EAPI=6
-HOMEPAGE=https://www.openvswitch.org
-IUSE=debug modules monitor +ssl kernel_linux kernel_linux kernel_linux python_targets_python3_6
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0 GPL-2
-RDEPEND=ssl? ( dev-libs/openssl:0= ) 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/ovs-2.10.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/twisted[conch,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] debug? ( dev-lang/perl ) kernel_linux? ( virtual/modutils )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://www.openvswitch.org/releases/openvswitch-2.10.2.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5a9cc95f3e311c53ea3a4af60f5c1562
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.11.1-r1 b/metadata/md5-cache/net-misc/openvswitch-2.11.1-r1
deleted file mode 100644
index f4532cfc2908..000000000000
--- a/metadata/md5-cache/net-misc/openvswitch-2.11.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup
-DEPEND=ssl? ( dev-libs/openssl:0= ) 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/ovs-2.10.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/twisted[conch,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] debug? ( dev-lang/perl ) sys-apps/util-linux[caps] 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 kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) virtual/pkgconfig
-DESCRIPTION=Production quality, multilayer virtual switch
-EAPI=6
-HOMEPAGE=https://www.openvswitch.org
-IUSE=debug modules monitor +ssl kernel_linux kernel_linux kernel_linux python_targets_python3_6
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0 GPL-2
-RDEPEND=ssl? ( dev-libs/openssl:0= ) 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/ovs-2.10.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/twisted[conch,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] debug? ( dev-lang/perl ) kernel_linux? ( virtual/modutils )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://www.openvswitch.org/releases/openvswitch-2.11.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b8379638e767cd259a5bc5c6534a6f85
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.13.0 b/metadata/md5-cache/net-misc/openvswitch-2.13.0
index f6063eb3eccd..56962ef1bba2 100644
--- a/metadata/md5-cache/net-misc/openvswitch-2.13.0
+++ b/metadata/md5-cache/net-misc/openvswitch-2.13.0
@@ -5,11 +5,11 @@ DESCRIPTION=Production quality, multilayer virtual switch
 EAPI=7
 HOMEPAGE=https://www.openvswitch.org
 IUSE=debug modules monitor +ssl kernel_linux kernel_linux kernel_linux python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0 GPL-2
 RDEPEND=ssl? ( dev-libs/openssl: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(-)] ~dev-python/ovs-2.13.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/twisted[conch,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(-)] debug? ( dev-lang/perl ) kernel_linux? ( virtual/modutils )
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://www.openvswitch.org/releases/openvswitch-2.13.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=23aef4d63891deab87dfd1dcc712c238
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7a498f2a5d048987359cb51a0efe9f1e
diff --git a/metadata/md5-cache/net-misc/putty-0.74 b/metadata/md5-cache/net-misc/putty-0.74
new file mode 100644
index 000000000000..14c919a26175
--- /dev/null
+++ b/metadata/md5-cache/net-misc/putty-0.74
@@ -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 postinst postrm prepare
+DEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/pango gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3[X] ) ) gssapi? ( virtual/krb5 ) dev-lang/perl virtual/pkgconfig
+DESCRIPTION=A Free Telnet/SSH Client
+EAPI=7
+HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/putty/
+IUSE=doc +gtk gtk2 ipv6 gssapi
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/pango gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3[X] ) ) gssapi? ( virtual/krb5 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~jer/putty-icons.tar.bz2 https://the.earth.li/~sgtatham/putty/0.74/putty-0.74.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d0963a3228ed0f1b91b01b3e4bbcee9c
diff --git a/metadata/md5-cache/net-misc/r8168-8.048.00 b/metadata/md5-cache/net-misc/r8168-8.048.00
index 9f3e2aad4236..d40d647be5c7 100644
--- a/metadata/md5-cache/net-misc/r8168-8.048.00
+++ b/metadata/md5-cache/net-misc/r8168-8.048.00
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pacho/r8168/r8168-8.048.00.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0d8b6fff1676a61758e498507c0a4f64
diff --git a/metadata/md5-cache/net-misc/r8168-8.048.02 b/metadata/md5-cache/net-misc/r8168-8.048.02
index 8e0e3b347457..225e671222c8 100644
--- a/metadata/md5-cache/net-misc/r8168-8.048.02
+++ b/metadata/md5-cache/net-misc/r8168-8.048.02
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pacho/r8168/r8168-8.048.02.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cdfca41fa5da2c7cf640a0b96224d6dd
diff --git a/metadata/md5-cache/net-misc/r8168-8.048.03 b/metadata/md5-cache/net-misc/r8168-8.048.03
index 9a02bfaca5db..b836965b151a 100644
--- a/metadata/md5-cache/net-misc/r8168-8.048.03
+++ b/metadata/md5-cache/net-misc/r8168-8.048.03
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pacho/r8168/r8168-8.048.03.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f33b58ff065d5bf5a7ba8cda2a30f789
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.8.4 b/metadata/md5-cache/net-misc/rabbitmq-server-3.8.4
index 0f3fbb7b705c..644494c44918 100644
--- a/metadata/md5-cache/net-misc/rabbitmq-server-3.8.4
+++ b/metadata/md5-cache/net-misc/rabbitmq-server-3.8.4
@@ -4,11 +4,11 @@ DEPEND=>=dev-lang/erlang-21.3[ssl] <dev-lang/erlang-23.0[ssl] app-arch/zip app-a
 DESCRIPTION=RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang
 EAPI=7
 HOMEPAGE=https://www.rabbitmq.com/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2 MPL-1.1
 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.4/rabbitmq-server-3.8.4.tar.xz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=5de1f71219e22f66a44d74112967e0a1
+_md5_=8ee9706ebdd5ed615cdc2a717ebd2447
diff --git a/metadata/md5-cache/net-misc/rclone-1.50.0 b/metadata/md5-cache/net-misc/rclone-1.50.0
deleted file mode 100644
index 781afce525b7..000000000000
--- a/metadata/md5-cache/net-misc/rclone-1.50.0
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-lang/go-1.10
-DEFINED_PHASES=compile install test unpack
-DESCRIPTION=A program to sync files to and from various cloud storage providers
-EAPI=7
-HOMEPAGE=https://rclone.org/
-KEYWORDS=amd64 ~arm x86
-LICENSE=MIT
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/rclone/rclone/archive/v1.50.0.tar.gz -> rclone-1.50.0.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d795e4ec850f6b7739cb60682101fc92
diff --git a/metadata/md5-cache/net-misc/rclone-1.52.1 b/metadata/md5-cache/net-misc/rclone-1.52.1
index 168c5e1e8baa..8700fb2bf431 100644
--- a/metadata/md5-cache/net-misc/rclone-1.52.1
+++ b/metadata/md5-cache/net-misc/rclone-1.52.1
@@ -1,5 +1,5 @@
-BDEPEND=>=dev-lang/go-1.10
-DEFINED_PHASES=compile install test unpack
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=A program to sync files to and from various cloud storage providers
 EAPI=7
 HOMEPAGE=https://rclone.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/rclone/rclone/archive/v1.52.1.tar.gz -> rclone-1.52.1.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=27e96f5fa670e64a43a88dad6b5fcac7
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	go-module	45394825d9260b479aa1cf252ea58e01	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=71d7794785653bcb329b85edd953e72d
diff --git a/metadata/md5-cache/net-misc/rdate-1.10 b/metadata/md5-cache/net-misc/rdate-1.10
new file mode 100644
index 000000000000..bfe82832a504
--- /dev/null
+++ b/metadata/md5-cache/net-misc/rdate-1.10
@@ -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=dev-libs/libbsd
+DESCRIPTION=Use TCP or UDP to retrieve the current time of another machine
+EAPI=7
+HOMEPAGE=https://github.com/resurrecting-open-source-projects/openrdate
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD-4
+RDEPEND=dev-libs/libbsd
+SLOT=0
+SRC_URI=https://github.com/resurrecting-open-source-projects/openrdate/archive/1.10.tar.gz -> rdate-1.10.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7e2a5055d58f0533caedc6c39f6d6113
diff --git a/metadata/md5-cache/net-misc/remmina-1.4.5 b/metadata/md5-cache/net-misc/remmina-1.4.5
index f352248ce680..0103ee6260d0 100644
--- a/metadata/md5-cache/net-misc/remmina-1.4.5
+++ b/metadata/md5-cache/net-misc/remmina-1.4.5
@@ -5,10 +5,10 @@ DESCRIPTION=A GTK+ RDP, SPICE, VNC, XDMCP and SSH client
 EAPI=7
 HOMEPAGE=https://remmina.org/
 IUSE=appindicator crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telepathy vnc webkit zeroconf
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+-with-openssl-exception
 RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libsodium:= net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129 <net-misc/freerdp-3 cups? ( net-print/cups:= ) ) gnome-keyring? ( app-crypt/libsecret ) kwallet? ( kde-frameworks/kwallet ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( || ( >=net-dns/avahi-0.8-r2[dbus,gtk] <net-dns/avahi-0.8-r2[dbus,gtk3] ) ) virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=https://gitlab.com/Remmina/Remmina/-/archive/v1.4.5/Remmina-v1.4.5.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a93d1f5d613cdeb08ad7df78ea5a8f87
+_md5_=dcafa6a528d2418da32b8426363f0ab0
diff --git a/metadata/md5-cache/net-misc/remmina-1.4.6 b/metadata/md5-cache/net-misc/remmina-1.4.6
deleted file mode 100644
index e3eef658a855..000000000000
--- a/metadata/md5-cache/net-misc/remmina-1.4.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libsodium:= net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129 <net-misc/freerdp-3 cups? ( net-print/cups:= ) ) gnome-keyring? ( app-crypt/libsecret ) kwallet? ( kde-frameworks/kwallet ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( || ( >=net-dns/avahi-0.8-r2[dbus,gtk] <net-dns/avahi-0.8-r2[dbus,gtk3] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A GTK+ RDP, SPICE, VNC, XDMCP and SSH client
-EAPI=7
-HOMEPAGE=https://remmina.org/
-IUSE=appindicator crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telemetry telepathy vnc webkit zeroconf
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+-with-openssl-exception
-RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libsodium:= net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129 <net-misc/freerdp-3 cups? ( net-print/cups:= ) ) gnome-keyring? ( app-crypt/libsecret ) kwallet? ( kde-frameworks/kwallet ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( || ( >=net-dns/avahi-0.8-r2[dbus,gtk] <net-dns/avahi-0.8-r2[dbus,gtk3] ) ) virtual/freedesktop-icon-theme
-SLOT=0
-SRC_URI=https://gitlab.com/Remmina/Remmina/-/archive/v1.4.6/Remmina-v1.4.6.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5f7517a02a4550ed30b700cf50104463
diff --git a/metadata/md5-cache/net-misc/remmina-1.4.7 b/metadata/md5-cache/net-misc/remmina-1.4.7
new file mode 100644
index 000000000000..f9d3bdb0b2f1
--- /dev/null
+++ b/metadata/md5-cache/net-misc/remmina-1.4.7
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libsodium:= net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129 <net-misc/freerdp-3 cups? ( net-print/cups:= ) ) gnome-keyring? ( app-crypt/libsecret ) kwallet? ( kde-frameworks/kwallet ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( || ( >=net-dns/avahi-0.8-r2[dbus,gtk] <net-dns/avahi-0.8-r2[dbus,gtk3] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A GTK+ RDP, SPICE, VNC, XDMCP and SSH client
+EAPI=7
+HOMEPAGE=https://remmina.org/
+IUSE=appindicator crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telemetry telepathy vnc webkit zeroconf
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+-with-openssl-exception
+RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libsodium:= net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129 <net-misc/freerdp-3 cups? ( net-print/cups:= ) ) gnome-keyring? ( app-crypt/libsecret ) kwallet? ( kde-frameworks/kwallet ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( || ( >=net-dns/avahi-0.8-r2[dbus,gtk] <net-dns/avahi-0.8-r2[dbus,gtk3] ) ) virtual/freedesktop-icon-theme
+SLOT=0
+SRC_URI=https://gitlab.com/Remmina/Remmina/-/archive/v1.4.7/Remmina-v1.4.7.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=883e873be61a69a2151726f65b973ea5
diff --git a/metadata/md5-cache/net-misc/rsync-3.1.3 b/metadata/md5-cache/net-misc/rsync-3.1.3
deleted file mode 100644
index c3f60df05439..000000000000
--- a/metadata/md5-cache/net-misc/rsync-3.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=!static? ( acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv ) static? ( acl? ( virtual/acl[static-libs(+)] ) xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) ) >=dev-libs/popt-1.5[static-libs(+)] ) virtual/pkgconfig
-DESCRIPTION=File transfer program to keep remote files into sync
-EAPI=6
-HOMEPAGE=https://rsync.samba.org/
-IUSE=acl examples iconv ipv6 static stunnel xattr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~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=!static? ( acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv )
-SLOT=0
-SRC_URI=https://rsync.samba.org/ftp/rsync/src/rsync-3.1.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e00e644c9b20857220ab8025ce13ef5d
diff --git a/metadata/md5-cache/net-misc/rsync-3.2.0-r1 b/metadata/md5-cache/net-misc/rsync-3.2.0-r1
index 830ac4ab484e..d52aa78ea861 100644
--- a/metadata/md5-cache/net-misc/rsync-3.2.0-r1
+++ b/metadata/md5-cache/net-misc/rsync-3.2.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=File transfer program to keep remote files into sync
 EAPI=7
 HOMEPAGE=https://rsync.samba.org/
 IUSE=acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd cpu_flags_x86_sse2
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~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=!static? ( acl? ( virtual/acl ) lz4? ( app-arch/lz4 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( dev-libs/xxhash ) zstd? ( app-arch/zstd ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv )
 SLOT=0
 SRC_URI=https://rsync.samba.org/ftp/rsync/src/rsync-3.2.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=62de82d5beaa644c1d5bb11610b68109
+_md5_=e5d59ef0fbd8eb0ec9a1853c21b0e23c
diff --git a/metadata/md5-cache/net-misc/rsync-3.2.1 b/metadata/md5-cache/net-misc/rsync-3.2.1
new file mode 100644
index 000000000000..753537759e7e
--- /dev/null
+++ b/metadata/md5-cache/net-misc/rsync-3.2.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=!static? ( acl? ( virtual/acl ) lz4? ( app-arch/lz4 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( dev-libs/xxhash ) zstd? ( app-arch/zstd ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv ) static? ( acl? ( virtual/acl[static-libs(+)] ) lz4? ( app-arch/lz4[static-libs(+)] ) ssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) system-zlib? ( sys-libs/zlib[static-libs(+)] ) xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) ) xxhash? ( dev-libs/xxhash[static-libs(+)] ) zstd? ( app-arch/zstd[static-libs(+)] ) >=dev-libs/popt-1.5[static-libs(+)] )
+DESCRIPTION=File transfer program to keep remote files into sync
+EAPI=7
+HOMEPAGE=https://rsync.samba.org/
+IUSE=acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd cpu_flags_x86_sse2
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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=!static? ( acl? ( virtual/acl ) lz4? ( app-arch/lz4 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( dev-libs/xxhash ) zstd? ( app-arch/zstd ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv )
+SLOT=0
+SRC_URI=https://rsync.samba.org/ftp/rsync/src/rsync-3.2.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6bc22331739a51ac68e663d3881ce0df
diff --git a/metadata/md5-cache/net-misc/rsync-3.2.2_pre2 b/metadata/md5-cache/net-misc/rsync-3.2.2_pre2
new file mode 100644
index 000000000000..ba81b492038d
--- /dev/null
+++ b/metadata/md5-cache/net-misc/rsync-3.2.2_pre2
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=!static? ( acl? ( virtual/acl ) lz4? ( app-arch/lz4 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( dev-libs/xxhash ) zstd? ( app-arch/zstd ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv ) static? ( acl? ( virtual/acl[static-libs(+)] ) lz4? ( app-arch/lz4[static-libs(+)] ) ssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) system-zlib? ( sys-libs/zlib[static-libs(+)] ) xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) ) xxhash? ( dev-libs/xxhash[static-libs(+)] ) zstd? ( app-arch/zstd[static-libs(+)] ) >=dev-libs/popt-1.5[static-libs(+)] )
+DESCRIPTION=File transfer program to keep remote files into sync
+EAPI=7
+HOMEPAGE=https://rsync.samba.org/
+IUSE=acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd cpu_flags_x86_sse2
+LICENSE=GPL-3
+RDEPEND=!static? ( acl? ( virtual/acl ) lz4? ( app-arch/lz4 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( dev-libs/xxhash ) zstd? ( app-arch/zstd ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv )
+SLOT=0
+SRC_URI=https://rsync.samba.org/ftp/rsync/src-previews/rsync-3.2.2pre2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6bc22331739a51ac68e663d3881ce0df
diff --git a/metadata/md5-cache/net-misc/rsync-9999 b/metadata/md5-cache/net-misc/rsync-9999
index d6993c49da22..1fa00d151bae 100644
--- a/metadata/md5-cache/net-misc/rsync-9999
+++ b/metadata/md5-cache/net-misc/rsync-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=!static? ( acl? ( virtual/acl ) lz4? ( app-arch/lz4 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( dev-libs/xxhash ) zstd? ( app-arch/zstd ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv )
 SLOT=0
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=aefbd1cb24970b86375ba81a50e1b0f8
+_md5_=f25eeb810c85248491869f1a594789da
diff --git a/metadata/md5-cache/net-misc/smb4k-3.0.4 b/metadata/md5-cache/net-misc/smb4k-3.0.4
deleted file mode 100644
index 5e02f8e40af9..000000000000
--- a/metadata/md5-cache/net-misc/smb4k-3.0.4
+++ /dev/null
@@ -1,14 +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=>=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/qttest-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kauth-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/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/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwallet-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 net-fs/samba[cups] dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Advanced network neighborhood browser
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.smb4k https://sourceforge.net/p/smb4k/home/Home/
-IUSE=plasma debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-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/qtprintsupport-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kauth-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/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/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwallet-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 net-fs/samba[cups] plasma? ( >=dev-qt/qtquickcontrols2-5.12.3:5 >=kde-frameworks/plasma-5.60.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://sourceforge/smb4k/smb4k-3.0.4.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8a8111f7774e4f7af586bfbf73bab476
diff --git a/metadata/md5-cache/net-misc/smb4k-3.0.5 b/metadata/md5-cache/net-misc/smb4k-3.0.5
deleted file mode 100644
index 836ba461528c..000000000000
--- a/metadata/md5-cache/net-misc/smb4k-3.0.5
+++ /dev/null
@@ -1,14 +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=>=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/qttest-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kauth-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/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/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwallet-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 net-fs/samba[cups] dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Advanced network neighborhood browser
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.smb4k https://sourceforge.net/p/smb4k/home/Home/
-IUSE=plasma debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-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/qtprintsupport-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kauth-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/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/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwallet-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 net-fs/samba[cups] plasma? ( >=dev-qt/qtquickcontrols2-5.12.3:5 >=kde-frameworks/plasma-5.60.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://sourceforge/smb4k/smb4k-3.0.5.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bbc69eb4371e1d417d8f210850cb689e
diff --git a/metadata/md5-cache/net-misc/smb4k-3.0.6 b/metadata/md5-cache/net-misc/smb4k-3.0.6
index 874256e63b41..54b174eaea03 100644
--- a/metadata/md5-cache/net-misc/smb4k-3.0.6
+++ b/metadata/md5-cache/net-misc/smb4k-3.0.6
@@ -5,10 +5,10 @@ DESCRIPTION=Advanced network neighborhood browser
 EAPI=7
 HOMEPAGE=https://kde.org/applications/utilities/org.kde.smb4k https://sourceforge.net/p/smb4k/home/Home/
 IUSE=plasma debug +handbook
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-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/qtprintsupport-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kauth-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/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/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwallet-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 net-fs/samba[cups] plasma? ( >=dev-qt/qtquickcontrols2-5.12.3:5 >=kde-frameworks/plasma-5.60.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://sourceforge/smb4k/smb4k-3.0.6.tar.xz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bbc69eb4371e1d417d8f210850cb689e
+_md5_=c5fe1b7c8c4e0530228561039dba5b29
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 29b26437a1e0..607c93a3c331 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	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	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 2b801f8c5f2a..7a0e2c38d103 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	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	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 9b0d90d585b7..b0e79e3a5407 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	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=0befc2476f5550432a1a624b35f39ca2
diff --git a/metadata/md5-cache/net-misc/vinagre-3.22.0-r3 b/metadata/md5-cache/net-misc/vinagre-3.22.0-r3
index 812d8865a87c..86548525a72a 100644
--- a/metadata/md5-cache/net-misc/vinagre-3.22.0-r3
+++ b/metadata/md5-cache/net-misc/vinagre-3.22.0-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.32.0:2 >=x11-libs/gtk+-3.9.6:3 app-crypt/libsecret >=dev-libs/libxml2-2.6.31:2 >=net-libs/gtk-vnc-0.4.3[gtk3(+)] x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-themes/hicolor-icon-theme rdp? ( >=net-misc/freerdp-1.1:= ) ssh? ( >=x11-libs/vte-0.20:2.91 ) spice? ( app-emulation/spice-protocol >=net-misc/spice-gtk-0.5[gtk3(+)] ) telepathy? ( dev-libs/dbus-glib >=net-libs/telepathy-glib-0.11.6 ) zeroconf? ( || ( >=net-dns/avahi-0.8-r2[dbus,gtk] <net-dns/avahi-0.8-r2[dbus,gtk3] ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/vinagre/3.22/vinagre-3.22.0.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b7697d99f64c8213386e85820f210498
diff --git a/metadata/md5-cache/net-misc/wakeonlan-0.41-r2 b/metadata/md5-cache/net-misc/wakeonlan-0.41-r2
index 8eb990e6354f..d06db6d919b2 100644
--- a/metadata/md5-cache/net-misc/wakeonlan-0.41-r2
+++ b/metadata/md5-cache/net-misc/wakeonlan-0.41-r2
@@ -8,5 +8,5 @@ LICENSE=Artistic GPL-2
 RDEPEND=dev-lang/perl[-build(-)]
 SLOT=0
 SRC_URI=http://gsd.di.uminho.pt/jpo/software/wakeonlan/downloads/wakeonlan-0.41.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=573c18a46ddff4d99aa6825fb19411fa
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index 79a33c839c81..d86f9d981aa2 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.39 b/metadata/md5-cache/net-nds/nsscache-0.39
new file mode 100644
index 000000000000..322c498fcfa1
--- /dev/null
+++ b/metadata/md5-cache/net-nds/nsscache-0.39
@@ -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-42.0.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_targets_python3_6? ( dev-lang/python:3.6 ) python_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/ldap3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pycurl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/bsddb3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] s3? ( dev-python/boto3[python_targets_python3_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=commandline tool to sync directory services to local cache
+EAPI=7
+HOMEPAGE=https://github.com/google/nsscache
+IUSE=nsscache s3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~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(-)] dev-python/ldap3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pycurl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/bsddb3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] s3? ( dev-python/boto3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) nsscache? ( >=sys-auth/libnss-cache-0.10 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_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 ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/google/nsscache/archive/version/0.39.tar.gz -> nsscache-0.39.tar.gz https://dev.gentoo.org/~robbat2/nsscache-0.30-r3-gentoo-authorized-keys-command.py
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=afa578cd8b5df7aa5b9c932d1f10632d
diff --git a/metadata/md5-cache/net-nntp/Manifest.gz b/metadata/md5-cache/net-nntp/Manifest.gz
index ded58aeba33d..8dcb0c56404e 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/sabnzbd-3.0.0_rc1 b/metadata/md5-cache/net-nntp/sabnzbd-3.0.0_rc1
new file mode 100644
index 000000000000..76d8fe89ba27
--- /dev/null
+++ b/metadata/md5-cache/net-nntp/sabnzbd-3.0.0_rc1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst setup
+DEPEND=acct-user/sabnzbd acct-group/sabnzbd 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/chardet[python_targets_python3_6(-)] dev-python/cheetah3[python_targets_python3_6(-)] dev-python/cherrypy[python_targets_python3_6(-)] dev-python/configobj[python_targets_python3_6(-)] dev-python/cryptography[python_targets_python3_6(-)] dev-python/feedparser[python_targets_python3_6(-)] dev-python/notify2[python_targets_python3_6(-)] dev-python/portend[python_targets_python3_6(-)] >=dev-python/sabyenc-3.3.1[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/cheetah3[python_targets_python3_7(-)] dev-python/cherrypy[python_targets_python3_7(-)] dev-python/configobj[python_targets_python3_7(-)] dev-python/cryptography[python_targets_python3_7(-)] dev-python/feedparser[python_targets_python3_7(-)] dev-python/notify2[python_targets_python3_7(-)] dev-python/portend[python_targets_python3_7(-)] >=dev-python/sabyenc-3.3.1[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cheetah3[python_targets_python3_8(-)] dev-python/cherrypy[python_targets_python3_8(-)] dev-python/configobj[python_targets_python3_8(-)] dev-python/cryptography[python_targets_python3_8(-)] dev-python/feedparser[python_targets_python3_8(-)] dev-python/notify2[python_targets_python3_8(-)] dev-python/portend[python_targets_python3_8(-)] >=dev-python/sabyenc-3.3.1[python_targets_python3_8(-)] )
+DESCRIPTION=Binary newsgrabber with web-interface
+EAPI=7
+HOMEPAGE=https://sabnzbd.org/
+IUSE=+7za +rar unzip python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64
+LICENSE=GPL-2 BSD LGPL-2 MIT BSD-1
+RDEPEND=acct-user/sabnzbd acct-group/sabnzbd 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/chardet[python_targets_python3_6(-)] dev-python/cheetah3[python_targets_python3_6(-)] dev-python/cherrypy[python_targets_python3_6(-)] dev-python/configobj[python_targets_python3_6(-)] dev-python/cryptography[python_targets_python3_6(-)] dev-python/feedparser[python_targets_python3_6(-)] dev-python/notify2[python_targets_python3_6(-)] dev-python/portend[python_targets_python3_6(-)] >=dev-python/sabyenc-3.3.1[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/cheetah3[python_targets_python3_7(-)] dev-python/cherrypy[python_targets_python3_7(-)] dev-python/configobj[python_targets_python3_7(-)] dev-python/cryptography[python_targets_python3_7(-)] dev-python/feedparser[python_targets_python3_7(-)] dev-python/notify2[python_targets_python3_7(-)] dev-python/portend[python_targets_python3_7(-)] >=dev-python/sabyenc-3.3.1[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cheetah3[python_targets_python3_8(-)] dev-python/cherrypy[python_targets_python3_8(-)] dev-python/configobj[python_targets_python3_8(-)] dev-python/cryptography[python_targets_python3_8(-)] dev-python/feedparser[python_targets_python3_8(-)] dev-python/notify2[python_targets_python3_8(-)] dev-python/portend[python_targets_python3_8(-)] >=dev-python/sabyenc-3.3.1[python_targets_python3_8(-)] ) >=app-arch/par2cmdline-0.4 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_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/sabnzbd/sabnzbd/releases/download/3.0.0RC1/SABnzbd-3.0.0RC1-src.tar.gz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d3272d3ef4699a6c771f9ef3443c023b
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 9c71687676ba..402b3630046c 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/resilio-sync-2.6.1 b/metadata/md5-cache/net-p2p/resilio-sync-2.6.1
index 5be4762813d3..c1f96ffd0249 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	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	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 de03adb27c3b..aaa83e6e2a7e 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	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=26a92518853c70500f7a8b4f650beae9
diff --git a/metadata/md5-cache/net-p2p/retroshare-0.6.5 b/metadata/md5-cache/net-p2p/retroshare-0.6.5
index 482d8b9dbcad..9626bc68cfb5 100644
--- a/metadata/md5-cache/net-p2p/retroshare-0.6.5
+++ b/metadata/md5-cache/net-p2p/retroshare-0.6.5
@@ -1,5 +1,5 @@
 BDEPEND=dev-util/cmake virtual/pkgconfig jsonapi? ( || ( >=app-doc/doxygen-1.8.17 <app-doc/doxygen-1.8.16 ) )
-DEFINED_PHASES=compile configure install postinst postrm preinst pretend unpack
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend
 DEPEND=app-arch/bzip2 dev-libs/openssl:0= >=dev-libs/rapidjson-1.1.0 <net-libs/libupnp-1.8.0 sys-libs/zlib control-socket? ( dev-qt/qtnetwork:5 ) gnome-keyring? ( app-crypt/libsecret ) gui? ( dev-qt/qtcore:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtxml:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXScrnSaver ) service? ( dev-qt/qtcore:5 ) sqlcipher? ( dev-db/sqlcipher ) !sqlcipher? ( dev-db/sqlite:3 ) webui? ( net-libs/libmicrohttpd ) xapian? ( dev-libs/xapian ) dev-qt/qtcore:5 gui? ( dev-qt/designer:5 )
 DESCRIPTION=P2P private sharing application
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2 dev-libs/openssl:0= >=dev-libs/rapidjson-1.1.0 <net-libs/
 REQUIRED_USE=|| ( cli gui service ) service? ( jsonapi )
 SLOT=0
 SRC_URI=https://github.com/RetroShare/RetroShare/releases/download/v0.6.5/RetroShare-v0.6.5-source-with-submodules.tar.gz -> retroshare-0.6.5.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8702a9cbdd9a86272c27c046cd7a60e9
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=11c5bdd14bc0c0dabd4e9a1b8a866acb
diff --git a/metadata/md5-cache/net-p2p/rtorrent-0.9.7 b/metadata/md5-cache/net-p2p/rtorrent-0.9.7
index e23d5fc4b835..594598bcde7d 100644
--- a/metadata/md5-cache/net-p2p/rtorrent-0.9.7
+++ b/metadata/md5-cache/net-p2p/rtorrent-0.9.7
@@ -10,5 +10,5 @@ RDEPEND=~net-libs/libtorrent-0.13.7 >=dev-libs/libsigc++-2.2.2:2 >=net-misc/curl
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://rtorrent.net/downloads/rtorrent-0.9.7.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=621f5b0a55185649db03e2e87a66aad6
diff --git a/metadata/md5-cache/net-p2p/rtorrent-0.9.7-r1 b/metadata/md5-cache/net-p2p/rtorrent-0.9.7-r1
index 8fb233c8541b..4f1b4e134d26 100644
--- a/metadata/md5-cache/net-p2p/rtorrent-0.9.7-r1
+++ b/metadata/md5-cache/net-p2p/rtorrent-0.9.7-r1
@@ -10,5 +10,5 @@ RDEPEND=~net-libs/libtorrent-0.13.7 >=dev-libs/libsigc++-2.2.2:2 >=net-misc/curl
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://rtorrent.net/downloads/rtorrent-0.9.7.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f6da35336cf29c29a5546ec8a4f755cc
diff --git a/metadata/md5-cache/net-p2p/rtorrent-0.9.8 b/metadata/md5-cache/net-p2p/rtorrent-0.9.8
index b231be0751b8..e660adc84374 100644
--- a/metadata/md5-cache/net-p2p/rtorrent-0.9.8
+++ b/metadata/md5-cache/net-p2p/rtorrent-0.9.8
@@ -10,5 +10,5 @@ RDEPEND=~net-libs/libtorrent-0.13.8 >=net-misc/curl-7.19.1 sys-libs/ncurses:0= x
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://rtorrent.net/downloads/rtorrent-0.9.8.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=256049f957329e02b0da6ba900893aad
diff --git a/metadata/md5-cache/net-p2p/tremc-0.9.1 b/metadata/md5-cache/net-p2p/tremc-0.9.1
deleted file mode 100644
index 81f0b675db5d..000000000000
--- a/metadata/md5-cache/net-p2p/tremc-0.9.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup
-DESCRIPTION=Ncurses interface for the Transmission BitTorrent client
-EAPI=7
-HOMEPAGE=https://github.com/tremc/tremc
-IUSE=geoip 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[ncurses] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[ncurses] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[ncurses] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( geoip? ( dev-python/geoip-python[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( geoip? ( dev-python/geoip-python[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( geoip? ( dev-python/geoip-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=https://github.com/tremc/tremc/archive/0.9.1.tar.gz -> tremc-0.9.1.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=13c9bb6f5a4930c38603ffb41bce7669
diff --git a/metadata/md5-cache/net-p2p/tremc-0.9.2 b/metadata/md5-cache/net-p2p/tremc-0.9.2
new file mode 100644
index 000000000000..1d1040fdf60f
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/tremc-0.9.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst setup
+DESCRIPTION=Ncurses interface for the Transmission BitTorrent client
+EAPI=7
+HOMEPAGE=https://github.com/tremc/tremc
+IUSE=python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[ncurses] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[ncurses] >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/tremc/tremc/archive/0.9.2.tar.gz -> tremc-0.9.2.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ff1746299633a982f49b72d8f3500310
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 6ce79f455582..1a25aa0190fe 100644
--- a/metadata/md5-cache/net-print/Manifest.gz
+++ b/metadata/md5-cache/net-print/Manifest.gz
diff --git a/metadata/md5-cache/net-print/brlaser-6 b/metadata/md5-cache/net-print/brlaser-6
index 0d1e6aaec095..266dfac3bf65 100644
--- a/metadata/md5-cache/net-print/brlaser-6
+++ b/metadata/md5-cache/net-print/brlaser-6
@@ -4,10 +4,10 @@ DEPEND=net-print/cups
 DESCRIPTION=Brother laser printer driver
 EAPI=7
 HOMEPAGE=https://github.com/pdewacht/brlaser
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=net-print/cups app-text/ghostscript-gpl
 SLOT=0
 SRC_URI=https://github.com/pdewacht/brlaser/archive/v6.tar.gz -> brlaser-6.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=15fadccb229ecd31647a894f081e6258
+_md5_=5c628bdb9fdae0ccc31a93c90268feb8
diff --git a/metadata/md5-cache/net-print/cnijfilter2-5.50 b/metadata/md5-cache/net-print/cnijfilter2-5.50
index 0bb0852105dd..6102d558c0d9 100644
--- a/metadata/md5-cache/net-print/cnijfilter2-5.50
+++ b/metadata/md5-cache/net-print/cnijfilter2-5.50
@@ -1,7 +1,8 @@
+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=virtual/libusb:1 dev-libs/libxml2 net-print/cups >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=virtual/libusb:1 dev-libs/libxml2 net-print/cups
 DESCRIPTION=IJ Printer Driver
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.canon.it/
 KEYWORDS=amd64 x86
 LICENSE=Canon-IJ
@@ -9,4 +10,4 @@ RDEPEND=virtual/libusb:1 dev-libs/libxml2 net-print/cups
 SLOT=0
 SRC_URI=http://gdlp01.c-wss.com/gds/0/0100009110/01/cnijfilter2-source-5.50-1.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6e6ee6902b47ea4691648ed297f334f7
+_md5_=6987cd26cf1b08e5380edf89b2b8c4ee
diff --git a/metadata/md5-cache/net-print/cups-2.3.3-r1 b/metadata/md5-cache/net-print/cups-2.3.3-r1
index e52b1166d447..ea54eff72785 100644
--- a/metadata/md5-cache/net-print/cups-2.3.3-r1
+++ b/metadata/md5-cache/net-print/cups-2.3.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=usb? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/apple/cups/releases/download/v2.3.3/cups-2.3.3-source.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8121ea226d5e60bb65d184eb290008bf
diff --git a/metadata/md5-cache/net-print/cups-9999 b/metadata/md5-cache/net-print/cups-9999
index 83f14911eed3..b03ddd1266a9 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	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dd7a364cb735b8da4967e521b1c82023
diff --git a/metadata/md5-cache/net-print/cups-filters-9999 b/metadata/md5-cache/net-print/cups-filters-9999
index 832422d95d1e..b2212aaad720 100644
--- a/metadata/md5-cache/net-print/cups-filters-9999
+++ b/metadata/md5-cache/net-print/cups-filters-9999
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/gdbus-codegen >=sys-devel/gettext-0.18.3 virtual/pkgconfig test? ( media-fonts/dejavu ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 prepare test unpack
-DEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.3.0:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
+DEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.3.0:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
 DESCRIPTION=Cups filters
 EAPI=7
 HOMEPAGE=https://wiki.linuxfoundation.org/openprinting/cups-filters
 IUSE=dbus +foomatic jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf
 LICENSE=MIT GPL-2
 PROPERTIES=live
-RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.3.0:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
+RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.3.0:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2e6ce67bb67f962d6be0cc2fe8e2c94c
+_md5_=c3483b824810cf2fde388613e02edf46
diff --git a/metadata/md5-cache/net-print/foomatic-db-engine-4.0.12 b/metadata/md5-cache/net-print/foomatic-db-engine-4.0.12
index e7c38307f97e..016b62c15bf5 100644
--- a/metadata/md5-cache/net-print/foomatic-db-engine-4.0.12
+++ b/metadata/md5-cache/net-print/foomatic-db-engine-4.0.12
@@ -9,5 +9,5 @@ PDEPEND=net-print/foomatic-db
 RDEPEND=dev-libs/libxml2 >=net-print/cups-filters-1.0.43-r1[foomatic] dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/foomatic/foomatic-db-engine-4.0.12.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=3739330a3a8a1d3d0ae60bbdbb355e3d
diff --git a/metadata/md5-cache/net-print/hplip-3.19.12-r1 b/metadata/md5-cache/net-print/hplip-3.19.12-r1
index 4f9b0a4c069c..9442d42b1af0 100644
--- a/metadata/md5-cache/net-print/hplip-3.19.12-r1
+++ b/metadata/md5-cache/net-print/hplip-3.19.12-r1
@@ -11,5 +11,5 @@ RDEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic]
 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	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=4adea2724492271e2f61493560e8f02d
diff --git a/metadata/md5-cache/net-print/hplip-3.20.3 b/metadata/md5-cache/net-print/hplip-3.20.3
index 062f78eaa081..9b58d9d8b32a 100644
--- a/metadata/md5-cache/net-print/hplip-3.20.3
+++ b/metadata/md5-cache/net-print/hplip-3.20.3
@@ -11,5 +11,5 @@ RDEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic]
 REQUIRED_USE=!minimal? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/hplip/hplip-3.20.3.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.18.12-patches-1.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=8eecde90a1b766ce15c165e41dcacb84
diff --git a/metadata/md5-cache/net-print/hplip-3.20.5 b/metadata/md5-cache/net-print/hplip-3.20.5
deleted file mode 100644
index deb5c7e52fb3..000000000000
--- a/metadata/md5-cache/net-print/hplip-3.20.5
+++ /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_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] ) 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 python_single_target_python3_8
-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] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) 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(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) kernel_linux? ( virtual/udev ) python_single_target_python3_6? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_6(-)] dev-python/distro[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(-)] dev-python/distro[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 ) ) ) ) python_single_target_python3_8? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] fax? ( dev-python/reportlab[python_targets_python3_8(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_8(-)] libnotify? ( dev-python/notify2[python_targets_python3_8(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_8(-)] >=dev-python/pillow-3.1.1[python_targets_python3_8(-)] 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 python_single_target_python3_8 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/hplip/hplip-3.20.5.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.20.5-patches-1.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=208201817173fab0054537f6f12575ae
diff --git a/metadata/md5-cache/net-print/hplip-3.20.6-r1 b/metadata/md5-cache/net-print/hplip-3.20.6-r1
index 763df2782fff..df4fa0a96559 100644
--- a/metadata/md5-cache/net-print/hplip-3.20.6-r1
+++ b/metadata/md5-cache/net-print/hplip-3.20.6-r1
@@ -5,11 +5,11 @@ DESCRIPTION=HP Linux Imaging and Printing - Print, scan, fax drivers and service
 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 python_single_target_python3_8
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~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] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) 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(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) kernel_linux? ( virtual/udev ) python_single_target_python3_6? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_6(-)] dev-python/distro[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(-)] dev-python/distro[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 ) ) ) ) python_single_target_python3_8? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] fax? ( dev-python/reportlab[python_targets_python3_8(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_8(-)] libnotify? ( dev-python/notify2[python_targets_python3_8(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_8(-)] >=dev-python/pillow-3.1.1[python_targets_python3_8(-)] 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 python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/hplip/hplip-3.20.6.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.20.5-patches-1.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=6923edb98905546d973ddf82fb406c44
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=24f6eabad0b0f80edff5063e4cbed351
diff --git a/metadata/md5-cache/net-print/hplip-plugin-3.19.12 b/metadata/md5-cache/net-print/hplip-plugin-3.19.12
index f42b2ddc0f7d..08f5813befd1 100644
--- a/metadata/md5-cache/net-print/hplip-plugin-3.19.12
+++ b/metadata/md5-cache/net-print/hplip-plugin-3.19.12
@@ -8,5 +8,5 @@ RDEPEND=~net-print/hplip-3.19.12 virtual/libusb:0 virtual/udev
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://developers.hp.com/sites/default/files/hplip-3.19.12-plugin.run
-_eclasses_=unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=13adfff7823a9cbbfb91a271b4af5292
diff --git a/metadata/md5-cache/net-print/hplip-plugin-3.20.3 b/metadata/md5-cache/net-print/hplip-plugin-3.20.3
index e139a0fae709..e2d677a3f905 100644
--- a/metadata/md5-cache/net-print/hplip-plugin-3.20.3
+++ b/metadata/md5-cache/net-print/hplip-plugin-3.20.3
@@ -8,5 +8,5 @@ RDEPEND=~net-print/hplip-3.20.3 virtual/libusb:0 virtual/udev
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://developers.hp.com/sites/default/files/hplip-3.20.3-plugin.run
-_eclasses_=unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=13adfff7823a9cbbfb91a271b4af5292
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 0cd82576fcae..a5f4de0bafb6 100644
--- a/metadata/md5-cache/net-proxy/Manifest.gz
+++ b/metadata/md5-cache/net-proxy/Manifest.gz
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.8.25-r1 b/metadata/md5-cache/net-proxy/haproxy-1.8.25-r1
index 23382416b11c..64954ca89d2a 100644
--- a/metadata/md5-cache/net-proxy/haproxy-1.8.25-r1
+++ b/metadata/md5-cache/net-proxy/haproxy-1.8.25-r1
@@ -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.8/src/haproxy-1.8.25.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=58bb53c0574e1b279282c95d8dc06f94
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.9.15-r1 b/metadata/md5-cache/net-proxy/haproxy-1.9.15-r1
index 9c654a44ded1..894f25d596f2 100644
--- a/metadata/md5-cache/net-proxy/haproxy-1.9.15-r1
+++ b/metadata/md5-cache/net-proxy/haproxy-1.9.15-r1
@@ -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.15.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f99266b6382c0645024241356de40d44
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.9.9999 b/metadata/md5-cache/net-proxy/haproxy-1.9.9999
index 57b980638746..f2bdd067fc75 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 ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f99266b6382c0645024241356de40d44
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.0.14 b/metadata/md5-cache/net-proxy/haproxy-2.0.14
index d73c0af7f5a1..df3ec9a5ec6f 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.0.14
+++ b/metadata/md5-cache/net-proxy/haproxy-2.0.14
@@ -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.14.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=341aab2d612b7fac1209fe318eb4c22e
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.0.14-r1 b/metadata/md5-cache/net-proxy/haproxy-2.0.14-r1
index 8aa0eb87ff37..d7bd3cecb1d1 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.0.14-r1
+++ b/metadata/md5-cache/net-proxy/haproxy-2.0.14-r1
@@ -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.14.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4463518d3e82362f4d07648dcd602f0a
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.0.9999 b/metadata/md5-cache/net-proxy/haproxy-2.0.9999
index 4b7cb60eef9c..a9f4b5b28973 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 ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=89ca85e3796c2b483ba40cc436183d3a
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.1.4 b/metadata/md5-cache/net-proxy/haproxy-2.1.4
index d24b358de5cb..8a47cd2b9cc8 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.1.4
+++ b/metadata/md5-cache/net-proxy/haproxy-2.1.4
@@ -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.4.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=341aab2d612b7fac1209fe318eb4c22e
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.1.4-r1 b/metadata/md5-cache/net-proxy/haproxy-2.1.4-r1
index 771345018c84..535ccf95c652 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.1.4-r1
+++ b/metadata/md5-cache/net-proxy/haproxy-2.1.4-r1
@@ -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.4.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4463518d3e82362f4d07648dcd602f0a
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.1.7 b/metadata/md5-cache/net-proxy/haproxy-2.1.7
index c065da5f3359..f4824d267ae1 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.1.7
+++ b/metadata/md5-cache/net-proxy/haproxy-2.1.7
@@ -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.7.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d6427deae489f8833c8d5a3379a374f8
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.1.9999 b/metadata/md5-cache/net-proxy/haproxy-2.1.9999
index 4b7cb60eef9c..a9f4b5b28973 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 ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=89ca85e3796c2b483ba40cc436183d3a
diff --git a/metadata/md5-cache/net-proxy/squid-4.11 b/metadata/md5-cache/net-proxy/squid-4.11
index 75ae3c712cef..b5e532a90b12 100644
--- a/metadata/md5-cache/net-proxy/squid-4.11
+++ b/metadata/md5-cache/net-proxy/squid-4.11
@@ -12,5 +12,5 @@ REQUIRED_USE=tproxy? ( caps ) qos? ( caps )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v4/squid-4.11.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=01a8427b4ebc0f0b43c64270e738d9e4
diff --git a/metadata/md5-cache/net-proxy/squid-4.12 b/metadata/md5-cache/net-proxy/squid-4.12
index dba48f967f62..75535588f41a 100644
--- a/metadata/md5-cache/net-proxy/squid-4.12
+++ b/metadata/md5-cache/net-proxy/squid-4.12
@@ -5,12 +5,12 @@ DESCRIPTION=A full-featured web proxy cache
 EAPI=7
 HOMEPAGE=http://www.squid-cache.org/
 IUSE=caps gnutls ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap esi ssl-crtd mysql postgres sqlite perl qos tproxy +htcp +wccp +wccpv2 pf-transparent ipf-transparent kqueue elibc_uclibc kernel_linux kernel_linux
-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=acct-group/squid acct-user/squid caps? ( >=sys-libs/libcap-2.16 ) pam? ( sys-libs/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( !gnutls? ( dev-libs/openssl:0 ) dev-libs/nettle:= ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) gnutls? ( >=net-libs/gnutls-3.1.5 ) logrotate? ( app-admin/logrotate ) >=sys-libs/db-4:* dev-libs/libltdl:0 samba? ( net-fs/samba ) perl? ( dev-lang/perl ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) selinux? ( sec-policy/selinux-squid ) sqlite? ( dev-perl/DBD-SQLite )
 REQUIRED_USE=tproxy? ( caps ) qos? ( caps )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v4/squid-4.12.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=10480bb92efe0e876680310a4289ea23
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0883ccd53eb8d67bae3105d9609f5d49
diff --git a/metadata/md5-cache/net-proxy/sshuttle-0.78.5 b/metadata/md5-cache/net-proxy/sshuttle-0.78.5
index 40df828aded4..dd29132e9001 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_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sshuttle/sshuttle-0.78.5.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fe3bfc253f1b87324eec7973b830a3c1
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 6bfde18f4a14..439872bfd08f 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/iodine-0.7.0-r2 b/metadata/md5-cache/net-vpn/iodine-0.7.0-r2
index 4bc1b6d9f523..0305b9e35e3f 100644
--- a/metadata/md5-cache/net-vpn/iodine-0.7.0-r2
+++ b/metadata/md5-cache/net-vpn/iodine-0.7.0-r2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://code.kryo.se/iodine/iodine-0.7.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b17972ef72702bb75ca4f08b40fd8d3b
diff --git a/metadata/md5-cache/net-vpn/ipsec-tools-0.8.2-r5 b/metadata/md5-cache/net-vpn/ipsec-tools-0.8.2-r5
deleted file mode 100644
index 0587e7d4ff80..000000000000
--- a/metadata/md5-cache/net-vpn/ipsec-tools-0.8.2-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline:0= ) selinux? ( sys-libs/libselinux ) >=sys-kernel/linux-headers-2.6.30 >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation
-EAPI=6
-HOMEPAGE=http://ipsec-tools.sourceforge.net/
-IUSE=hybrid idea ipv6 kerberos ldap libressl nat pam rc5 readline selinux stats kernel_linux
-KEYWORDS=amd64 arm ~ia64 ~mips ppc ppc64 x86
-LICENSE=BSD GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline:0= ) selinux? ( sys-libs/libselinux ) selinux? ( sec-policy/selinux-ipsec )
-SLOT=0
-SRC_URI=mirror://sourceforge/ipsec-tools/ipsec-tools-0.8.2.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=28b1a96151874400007ccbba9f35f29c
diff --git a/metadata/md5-cache/net-vpn/ipsec-tools-0.8.2-r6 b/metadata/md5-cache/net-vpn/ipsec-tools-0.8.2-r6
index e1b7705b6ebe..4cc75ec0d8e2 100644
--- a/metadata/md5-cache/net-vpn/ipsec-tools-0.8.2-r6
+++ b/metadata/md5-cache/net-vpn/ipsec-tools-0.8.2-r6
@@ -4,10 +4,10 @@ DESCRIPTION=A port of KAME's IPsec utilities to the Linux-2.6 IPsec implementati
 EAPI=6
 HOMEPAGE=http://ipsec-tools.sourceforge.net/
 IUSE=hybrid idea ipv6 kerberos ldap libressl nat pam rc5 readline selinux stats kernel_linux
-KEYWORDS=~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm ~ia64 ~mips ppc ppc64 x86
 LICENSE=BSD GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline:0= ) selinux? ( sys-libs/libselinux ) selinux? ( sec-policy/selinux-ipsec )
 SLOT=0
 SRC_URI=mirror://sourceforge/ipsec-tools/ipsec-tools-0.8.2.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f08818543e8db81a4cf7b327fdcf89e6
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e4ee2689eb7320997bd91cbd80146771
diff --git a/metadata/md5-cache/net-vpn/isatapd-0.9.7-r2 b/metadata/md5-cache/net-vpn/isatapd-0.9.7-r2
index 9334211a4b2c..57f323e64be1 100644
--- a/metadata/md5-cache/net-vpn/isatapd-0.9.7-r2
+++ b/metadata/md5-cache/net-vpn/isatapd-0.9.7-r2
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.saschahlusiak.de/linux/isatapd-0.9.7.tar.gz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d6830d0a8204610df2c1be4cc466957d
diff --git a/metadata/md5-cache/net-vpn/libreswan-3.32-r1 b/metadata/md5-cache/net-vpn/libreswan-3.32-r1
new file mode 100644
index 000000000000..cfc62a9bbf85
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/libreswan-3.32-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( dev-python/setproctitle ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= )
+DESCRIPTION=IPsec implementation for Linux, fork of Openswan
+EAPI=7
+HOMEPAGE=https://libreswan.org/
+IUSE=caps curl dnssec ldap pam seccomp selinux systemd test
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2 BSD-4 RSA DES
+RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.libreswan.org/libreswan-3.32.tar.gz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=330b08cb89a2f8172dfc16cb8cdf5fc2
diff --git a/metadata/md5-cache/net-vpn/logmein-hamachi-2.1.0.174 b/metadata/md5-cache/net-vpn/logmein-hamachi-2.1.0.174
index 10d52f3b025d..be3b10085167 100644
--- a/metadata/md5-cache/net-vpn/logmein-hamachi-2.1.0.174
+++ b/metadata/md5-cache/net-vpn/logmein-hamachi-2.1.0.174
@@ -10,5 +10,5 @@ RDEPEND=!net-misc/hamachi
 RESTRICT=mirror
 SLOT=0
 SRC_URI=x86? ( https://www.vpn.net/installers/logmein-hamachi-2.1.0.174-x86.tgz ) amd64? ( https://www.vpn.net/installers/logmein-hamachi-2.1.0.174-x64.tgz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=093e7870b29c6a6912b221cc97aa88d7
diff --git a/metadata/md5-cache/net-vpn/logmein-hamachi-2.1.0.198 b/metadata/md5-cache/net-vpn/logmein-hamachi-2.1.0.198
index 791af23278df..36a980d7f94c 100644
--- a/metadata/md5-cache/net-vpn/logmein-hamachi-2.1.0.198
+++ b/metadata/md5-cache/net-vpn/logmein-hamachi-2.1.0.198
@@ -10,5 +10,5 @@ RDEPEND=!net-misc/hamachi
 RESTRICT=mirror
 SLOT=0
 SRC_URI=x86? ( https://www.vpn.net/installers/logmein-hamachi-2.1.0.198-x86.tgz ) amd64? ( https://www.vpn.net/installers/logmein-hamachi-2.1.0.198-x64.tgz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=81339f1cb7ab9aba1e10fae2bbdc2a40
diff --git a/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.12 b/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.12
index 6a555c4c93f3..b8325395e278 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.12
+++ b/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.12
@@ -4,11 +4,11 @@ DESCRIPTION=NetworkManager OpenVPN plugin
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=gtk test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.32:2 >=net-misc/networkmanager-1.7.0:= >=net-vpn/openvpn-2.1 gtk? ( >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.7.0 >=x11-libs/gtk+-3.4:3 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.12.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8b00f618310b3949aef81bff7e715989
+_md5_=03772d67d467981c409f0e8d52b3717b
diff --git a/metadata/md5-cache/net-vpn/networkmanager-wireguard-0_pre20191128-r5 b/metadata/md5-cache/net-vpn/networkmanager-wireguard-0_pre20191128-r5
index 13f2398632bb..0c68b568e625 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-wireguard-0_pre20191128-r5
+++ b/metadata/md5-cache/net-vpn/networkmanager-wireguard-0_pre20191128-r5
@@ -5,10 +5,10 @@ DESCRIPTION=NetworkManager WireGuard plugin
 EAPI=7
 HOMEPAGE=https://github.com/max-moser/network-manager-wireguard
 IUSE=+gtk +nls
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=net-misc/networkmanager-1.7.0 net-vpn/wireguard-tools[wg-quick] >=dev-libs/glib-2.32:2 gtk? ( >=x11-libs/gtk+-3.4:3 >=net-libs/libnma-1.7.0 >=app-crypt/libsecret-0.18 )
 SLOT=0
 SRC_URI=https://github.com/max-moser/network-manager-wireguard/archive/0e1124df9e97129c5e0d9996a2c3876ae18f01c4.tar.gz -> networkmanager-wireguard-0_pre20191128.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=df0b35c9e0985ac59eb6b93de2339b3f
+_md5_=3b78231c29dbeb8b2f3b823d7c53b8b1
diff --git a/metadata/md5-cache/net-vpn/nstx-1.1_beta6-r3 b/metadata/md5-cache/net-vpn/nstx-1.1_beta6-r3
index 51912417b326..545ca0366617 100644
--- a/metadata/md5-cache/net-vpn/nstx-1.1_beta6-r3
+++ b/metadata/md5-cache/net-vpn/nstx-1.1_beta6-r3
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=http://dereference.de/nstx/nstx-1.1-beta6.tgz mirror://debian/pool/main/n/nstx/nstx_1.1-beta6-5.diff.gz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bf3f260ef0ebee04f2c995a349d77754
diff --git a/metadata/md5-cache/net-vpn/openconnect-8.09-r1 b/metadata/md5-cache/net-vpn/openconnect-8.09-r1
index 46d27bd38903..5ccfaa70f14b 100644
--- a/metadata/md5-cache/net-vpn/openconnect-8.09-r1
+++ b/metadata/md5-cache/net-vpn/openconnect-8.09-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0=[s
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-8.09.tar.gz ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20200226.tar.gz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7026f0d1bc56b8c2331848d643f44d2d
diff --git a/metadata/md5-cache/net-vpn/openconnect-9999 b/metadata/md5-cache/net-vpn/openconnect-9999
index 7767637a1ce6..b9cee785e8d7 100644
--- a/metadata/md5-cache/net-vpn/openconnect-9999
+++ b/metadata/md5-cache/net-vpn/openconnect-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0=[s
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20200226.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2188aaa93e68eb61d7cf71e3d487bdc7
diff --git a/metadata/md5-cache/net-vpn/openfortivpn-1.13.2 b/metadata/md5-cache/net-vpn/openfortivpn-1.13.2
index 9bf5a7e6de6d..c72fcd9e6be9 100644
--- a/metadata/md5-cache/net-vpn/openfortivpn-1.13.2
+++ b/metadata/md5-cache/net-vpn/openfortivpn-1.13.2
@@ -10,5 +10,5 @@ LICENSE=GPL-3-with-openssl-exception openssl
 RDEPEND=net-dialup/ppp !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 SLOT=0
 SRC_URI=https://github.com/adrienverge/openfortivpn/archive/v1.13.2.tar.gz -> openfortivpn-1.13.2.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=da53b0ca3d37a3e9c1a8b0fa31548a0c
diff --git a/metadata/md5-cache/net-vpn/openfortivpn-1.13.3 b/metadata/md5-cache/net-vpn/openfortivpn-1.13.3
index f9d45d5fa65b..80171c9f9295 100644
--- a/metadata/md5-cache/net-vpn/openfortivpn-1.13.3
+++ b/metadata/md5-cache/net-vpn/openfortivpn-1.13.3
@@ -10,5 +10,5 @@ LICENSE=GPL-3-with-openssl-exception openssl
 RDEPEND=net-dialup/ppp !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 SLOT=0
 SRC_URI=https://github.com/adrienverge/openfortivpn/archive/v1.13.3.tar.gz -> openfortivpn-1.13.3.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=99878fa4ec24dc6d80891d61f7f62963
diff --git a/metadata/md5-cache/net-vpn/openvpn-2.4.9 b/metadata/md5-cache/net-vpn/openvpn-2.4.9
index 72ad8d6f2f5a..159802cf11e7 100644
--- a/metadata/md5-cache/net-vpn/openvpn-2.4.9
+++ b/metadata/md5-cache/net-vpn/openvpn-2.4.9
@@ -12,5 +12,5 @@ REQUIRED_USE=pkcs11? ( ssl ) !plugins? ( !pam !down-root ) inotify? ( plugins )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenVPN/openvpn/archive/v2.4.9.tar.gz -> openvpn-2.4.9.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=85e2656a3ab969c832520974c76b07f1
diff --git a/metadata/md5-cache/net-vpn/openvpn-9999 b/metadata/md5-cache/net-vpn/openvpn-9999
index 38ed124a4db5..9788d64e9b3e 100644
--- a/metadata/md5-cache/net-vpn/openvpn-9999
+++ b/metadata/md5-cache/net-vpn/openvpn-9999
@@ -11,5 +11,5 @@ RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( >
 REQUIRED_USE=pkcs11? ( ssl ) !plugins? ( !pam !down-root ) inotify? ( plugins )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=78e862394d2d05e67d37b26e3d36749f
diff --git a/metadata/md5-cache/net-vpn/strongswan-5.8.1 b/metadata/md5-cache/net-vpn/strongswan-5.8.1
index 2a3ab2457e99..967d6cd7c9c6 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	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	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 d2092be5b2f8..2935478831ed 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	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=17f8a44fcb6709f73213716957d8df5b
diff --git a/metadata/md5-cache/net-vpn/strongswan-5.8.4 b/metadata/md5-cache/net-vpn/strongswan-5.8.4
index e0d2b22e698b..6c972d858c4f 100644
--- a/metadata/md5-cache/net-vpn/strongswan-5.8.4
+++ b/metadata/md5-cache/net-vpn/strongswan-5.8.4
@@ -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.4.tar.bz2
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=10c833068a52fd64c3fee89387a8e9c6
diff --git a/metadata/md5-cache/net-vpn/vpnc-0.5.3_p550-r1 b/metadata/md5-cache/net-vpn/vpnc-0.5.3_p550-r1
index 639150cfa51b..cb113e854e7b 100644
--- a/metadata/md5-cache/net-vpn/vpnc-0.5.3_p550-r1
+++ b/metadata/md5-cache/net-vpn/vpnc-0.5.3_p550-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/perl dev-libs/libgcrypt:0= >=sys-apps/iproute2-2.6.19.20061214[
 RESTRICT=!gnutls? ( bindist )
 SLOT=0
 SRC_URI=https://github.com/streambinder/vpnc/archive/fa0689c.tar.gz -> vpnc-0.5.3_p550-r1.tar.gz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=1089aa1c7ba50a0316083ff42676b131
diff --git a/metadata/md5-cache/net-vpn/vtun-3.0.3 b/metadata/md5-cache/net-vpn/vtun-3.0.3
index e1f0812057fb..75061e7285e9 100644
--- a/metadata/md5-cache/net-vpn/vtun-3.0.3
+++ b/metadata/md5-cache/net-vpn/vtun-3.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=ssl? ( dev-libs/openssl:0 ) lzo? ( dev-libs/lzo:2 ) zlib? ( sys-libs/zlib ) socks5? ( net-proxy/dante )
 SLOT=0
 SRC_URI=mirror://sourceforge/vtun/vtun-3.0.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7aeb9ef7bfd0eba0532a7b92332ea6ca
diff --git a/metadata/md5-cache/net-vpn/vtun-3.0.3-r1 b/metadata/md5-cache/net-vpn/vtun-3.0.3-r1
index 5ad16b8d96df..1f50bd5d0997 100644
--- a/metadata/md5-cache/net-vpn/vtun-3.0.3-r1
+++ b/metadata/md5-cache/net-vpn/vtun-3.0.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=ssl? ( dev-libs/openssl:0 ) lzo? ( dev-libs/lzo:2 ) zlib? ( sys-libs/zlib ) socks5? ( net-proxy/dante )
 SLOT=0
 SRC_URI=mirror://sourceforge/vtun/vtun-3.0.3.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2295929bdeb23fe69e039e9df6e62c23
diff --git a/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20200611 b/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20200611
deleted file mode 100644
index 51b989cb7bad..000000000000
--- a/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20200611
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup
-DEPEND=module? ( kernel_linux? ( virtual/modutils ) ) module? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
-DESCRIPTION=Simple yet fast and modern VPN that utilizes state-of-the-art cryptography.
-EAPI=7
-HOMEPAGE=https://www.wireguard.com/
-IUSE=debug +module module-src kernel_linux kernel_linux module
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!<virtual/wireguard-1 module? ( kernel_linux? ( virtual/modutils ) )
-SLOT=0
-SRC_URI=https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-1.0.20200611.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8391cea5b78183e4ac3f15ff571923ba
diff --git a/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20200623 b/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20200623
new file mode 100644
index 000000000000..fe9cb00102a2
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20200623
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup
+DEPEND=module? ( kernel_linux? ( virtual/modutils ) ) module? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
+DESCRIPTION=Simple yet fast and modern VPN that utilizes state-of-the-art cryptography.
+EAPI=7
+HOMEPAGE=https://www.wireguard.com/
+IUSE=debug +module module-src kernel_linux kernel_linux module
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!<virtual/wireguard-1 module? ( kernel_linux? ( virtual/modutils ) )
+SLOT=0
+SRC_URI=https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-1.0.20200623.tar.xz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8391cea5b78183e4ac3f15ff571923ba
diff --git a/metadata/md5-cache/net-vpn/wireguard-modules-9999 b/metadata/md5-cache/net-vpn/wireguard-modules-9999
index 8e647a27df1f..54cb199bd1e5 100644
--- a/metadata/md5-cache/net-vpn/wireguard-modules-9999
+++ b/metadata/md5-cache/net-vpn/wireguard-modules-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=!<virtual/wireguard-1 module? ( kernel_linux? ( virtual/modutils ) )
 SLOT=0
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8391cea5b78183e4ac3f15ff571923ba
diff --git a/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200319 b/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200319
index fd92a1461e72..6cb4babf7ad5 100644
--- a/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200319
+++ b/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200319
@@ -9,5 +9,5 @@ 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.20200319.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6fcfe3a426bc26522e66b30ac8e679f6
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0c5c97b2cdd3a996ec40b5f1d2f67afa
diff --git a/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200513 b/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200513
index b077edc08c5b..4f1ab7893dfb 100644
--- a/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200513
+++ b/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200513
@@ -4,10 +4,10 @@ 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 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 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.20200513.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=aa9f1f91ac78d697f19de24f1857e31d
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0c5c97b2cdd3a996ec40b5f1d2f67afa
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index c3aebe777f3c..e6aeb09f6d1a 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/blueman-2.1.2 b/metadata/md5-cache/net-wireless/blueman-2.1.2
index 7bd1667836cf..8ef0f63caa50 100644
--- a/metadata/md5-cache/net-wireless/blueman-2.1.2
+++ b/metadata/md5-cache/net-wireless/blueman-2.1.2
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_
 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	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9f98850d5f89ca3af784f45f901d5f85
diff --git a/metadata/md5-cache/net-wireless/blueman-2.1.3 b/metadata/md5-cache/net-wireless/blueman-2.1.3
index c1287c614e79..10f24881b9bb 100644
--- a/metadata/md5-cache/net-wireless/blueman-2.1.3
+++ b/metadata/md5-cache/net-wireless/blueman-2.1.3
@@ -5,11 +5,11 @@ 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_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~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 ) )
 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.3/blueman-2.1.3.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9f98850d5f89ca3af784f45f901d5f85
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=eeb4b9f266372d57db4ee5614da27662
diff --git a/metadata/md5-cache/net-wireless/blueman-9999 b/metadata/md5-cache/net-wireless/blueman-9999
index 72afe617ccd6..f5f59ea7672c 100644
--- a/metadata/md5-cache/net-wireless/blueman-9999
+++ b/metadata/md5-cache/net-wireless/blueman-9999
@@ -10,5 +10,5 @@ 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 ) )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9f98850d5f89ca3af784f45f901d5f85
diff --git a/metadata/md5-cache/net-wireless/bluez-5.54 b/metadata/md5-cache/net-wireless/bluez-5.54
index 9e1ab5c6a9ba..6310f94c8253 100644
--- a/metadata/md5-cache/net-wireless/bluez-5.54
+++ b/metadata/md5-cache/net-wireless/bluez-5.54
@@ -12,5 +12,5 @@ REQUIRED_USE=extra-tools? ( deprecated readline ) test? ( ^^ ( python_single_tar
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://www.kernel.org/pub/linux/bluetooth/bluez-5.54.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=8fc1c93052d9c2249027b945e31ea6e2
diff --git a/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r5 b/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r5
index 190352c03971..0a3504313747 100644
--- a/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r5
+++ b/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r5
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( virtual/modutils )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=x86? ( https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz ) amd64? ( https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz ) https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/README_6.30.223.271.txt -> README-broadcom-sta-6.30.223.271.txt
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f88cdf002830c3657a69c1d77996f91c
diff --git a/metadata/md5-cache/net-wireless/inspectrum-0.2.2 b/metadata/md5-cache/net-wireless/inspectrum-0.2.2
index 4af400290d14..474fab3bd4ee 100644
--- a/metadata/md5-cache/net-wireless/inspectrum-0.2.2
+++ b/metadata/md5-cache/net-wireless/inspectrum-0.2.2
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig dev-qt/qtconcurrent:5 sci-libs/fftw:3.0= dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5 net-libs/liquid-dsp sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=a tool for analysing captured signals from software-defined radio receivers
-EAPI=6
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 net-libs/liquid-dsp sci-libs/fftw:3.0= dev-qt/qtconcurrent:5
+DESCRIPTION=Tool for analysing captured signals from software-defined radio receivers
+EAPI=7
 HOMEPAGE=https://github.com/miek/inspectrum
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=sci-libs/fftw:3.0= dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5 net-libs/liquid-dsp
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 net-libs/liquid-dsp sci-libs/fftw:3.0=
 SLOT=0
 SRC_URI=https://github.com/miek/inspectrum/archive/v0.2.2.tar.gz -> inspectrum-0.2.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c9384862b18c69d3feddc15921959486
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5fa5b216365ebefc2b89bcf538179e1a
diff --git a/metadata/md5-cache/net-wireless/inspectrum-9999 b/metadata/md5-cache/net-wireless/inspectrum-9999
index 585e3a1478d9..893079fea962 100644
--- a/metadata/md5-cache/net-wireless/inspectrum-9999
+++ b/metadata/md5-cache/net-wireless/inspectrum-9999
@@ -1,11 +1,12 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/pkgconfig dev-qt/qtconcurrent:5 sci-libs/fftw:3.0= dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5 net-libs/liquid-dsp sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=a tool for analysing captured signals from software-defined radio receivers
-EAPI=6
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 net-libs/liquid-dsp sci-libs/fftw:3.0= dev-qt/qtconcurrent:5
+DESCRIPTION=Tool for analysing captured signals from software-defined radio receivers
+EAPI=7
 HOMEPAGE=https://github.com/miek/inspectrum
 LICENSE=GPL-3+
 PROPERTIES=live
-RDEPEND=sci-libs/fftw:3.0= dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5 net-libs/liquid-dsp
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 net-libs/liquid-dsp sci-libs/fftw:3.0=
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=034736427a143e3b51d78f16232d7c2b
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=57e78c237a025feac569d8b5d4eabb03
diff --git a/metadata/md5-cache/net-wireless/iw-5.4 b/metadata/md5-cache/net-wireless/iw-5.4
index 77d539a53872..93637afa8c60 100644
--- a/metadata/md5-cache/net-wireless/iw-5.4
+++ b/metadata/md5-cache/net-wireless/iw-5.4
@@ -4,10 +4,10 @@ DEPEND=dev-libs/libnl:=
 DESCRIPTION=nl80211-based configuration utility for wireless devices using the mac80211 kernel stack
 EAPI=7
 HOMEPAGE=https://wireless.wiki.kernel.org/en/users/Documentation/iw
-KEYWORDS=~amd64 ~arm arm64 ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=ISC
 RDEPEND=dev-libs/libnl:=
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/network/iw/iw-5.4.tar.xz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ee77db6c0c195d1578fda8aa3f01dc59
+_md5_=643072e24d0b6f6d9663b5595ad6023a
diff --git a/metadata/md5-cache/net-wireless/iwd-1.5 b/metadata/md5-cache/net-wireless/iwd-1.5
index a69a9ae10d13..1c573a905249 100644
--- a/metadata/md5-cache/net-wireless/iwd-1.5
+++ b/metadata/md5-cache/net-wireless/iwd-1.5
@@ -9,5 +9,5 @@ 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	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=53a4d62a071eaa83b833c60da32c25c2
diff --git a/metadata/md5-cache/net-wireless/iwd-1.6 b/metadata/md5-cache/net-wireless/iwd-1.6
index 3fd6cc65dda2..d9d6340fbbfe 100644
--- a/metadata/md5-cache/net-wireless/iwd-1.6
+++ b/metadata/md5-cache/net-wireless/iwd-1.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) >=dev-libs/ell-0.30 net-wireless/wireless-regdb crda? ( net-wireless/crda )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/network/wireless/iwd-1.6.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=13b477cba1553c40bfbfbf129fe26f47
diff --git a/metadata/md5-cache/net-wireless/iwd-1.7 b/metadata/md5-cache/net-wireless/iwd-1.7
index 3da86b1436d0..d559c2e605ec 100644
--- a/metadata/md5-cache/net-wireless/iwd-1.7
+++ b/metadata/md5-cache/net-wireless/iwd-1.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) >=dev-libs/ell-0.31 net-wireless/wireless-regdb crda? ( net-wireless/crda )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/network/wireless/iwd-1.7.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0ae5390bbb1bedcae9059accf71ad2f6
diff --git a/metadata/md5-cache/net-wireless/iwd-1.7-r1 b/metadata/md5-cache/net-wireless/iwd-1.7-r1
index e2400f515b1a..b4c122cd3a27 100644
--- a/metadata/md5-cache/net-wireless/iwd-1.7-r1
+++ b/metadata/md5-cache/net-wireless/iwd-1.7-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) >=dev-libs/ell-0.31 net-wireless/wireless-regdb crda? ( net-wireless/crda )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/network/wireless/iwd-1.7.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f63d3ddad1eea109835ad0cd4d4ced1f
diff --git a/metadata/md5-cache/net-wireless/iwd-1.8 b/metadata/md5-cache/net-wireless/iwd-1.8
index de155994b600..c2dbdaabc91e 100644
--- a/metadata/md5-cache/net-wireless/iwd-1.8
+++ b/metadata/md5-cache/net-wireless/iwd-1.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) >=dev-libs/ell-0.32 net-wireless/wireless-regdb crda? ( net-wireless/crda )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/network/wireless/iwd-1.8.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=14f39ced9564c28d0d6ab4d9983c04d6
diff --git a/metadata/md5-cache/net-wireless/iwd-9999 b/metadata/md5-cache/net-wireless/iwd-9999
index a44017e626fd..c50e499b059e 100644
--- a/metadata/md5-cache/net-wireless/iwd-9999
+++ b/metadata/md5-cache/net-wireless/iwd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) net-wireless/wireless-regdb crda? ( net-wireless/crda )
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3c11aa832b1bb46f0fe119074defa61f
diff --git a/metadata/md5-cache/net-wireless/madwimax-0.1.1-r1 b/metadata/md5-cache/net-wireless/madwimax-0.1.1-r1
index cf13e4507163..99e5ca272b40 100644
--- a/metadata/md5-cache/net-wireless/madwimax-0.1.1-r1
+++ b/metadata/md5-cache/net-wireless/madwimax-0.1.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=https://madwimax.googlecode.com/files/madwimax-0.1.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=d3c3d892f5865b3c656203697a0ac0b4
diff --git a/metadata/md5-cache/net-wireless/osmo-fl2k-0.1.1 b/metadata/md5-cache/net-wireless/osmo-fl2k-0.1.1
index 40ab1e52d439..d08eff8656a9 100644
--- a/metadata/md5-cache/net-wireless/osmo-fl2k-0.1.1
+++ b/metadata/md5-cache/net-wireless/osmo-fl2k-0.1.1
@@ -10,5 +10,5 @@ PDEPEND=media-sound/sox sys-apps/pv
 RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=https://git.osmocom.org/osmo-fl2k/snapshot/v0.1.1.tar.gz -> osmo-fl2k-0.1.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e3cc55fd56ae9956c36042de19fe36e7
diff --git a/metadata/md5-cache/net-wireless/osmo-fl2k-9999 b/metadata/md5-cache/net-wireless/osmo-fl2k-9999
index d8c07d827514..7f59a7735d1b 100644
--- a/metadata/md5-cache/net-wireless/osmo-fl2k-9999
+++ b/metadata/md5-cache/net-wireless/osmo-fl2k-9999
@@ -9,5 +9,5 @@ PDEPEND=media-sound/sox sys-apps/pv
 PROPERTIES=live
 RDEPEND=virtual/libusb:1
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dce6d84e8f9a80aac0fc61d23f00a327
diff --git a/metadata/md5-cache/net-wireless/sdrplay-2.13.1-r1 b/metadata/md5-cache/net-wireless/sdrplay-2.13.1-r1
index dd5706471b6f..29ddaa39b3b8 100644
--- a/metadata/md5-cache/net-wireless/sdrplay-2.13.1-r1
+++ b/metadata/md5-cache/net-wireless/sdrplay-2.13.1-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/libusb:1 virtual/udev
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 SLOT=0
 SRC_URI=http://www.sdrplay.com/software/SDRplay_RSP_API-Linux-2.13.1.run
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	b5891c9326ad2e7905c011d44c927c34	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=d039fa2929056ba9469f001cdbc9bcbb
diff --git a/metadata/md5-cache/net-wireless/unifi-5.12.72 b/metadata/md5-cache/net-wireless/unifi-5.12.72
deleted file mode 100644
index 626910124824..000000000000
--- a/metadata/md5-cache/net-wireless/unifi-5.12.72
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=app-arch/unzip virtual/pkgconfig
-DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
-EAPI=6
-HOMEPAGE=https://www.ubnt.com
-IUSE=systemd
-KEYWORDS=amd64
-LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
-RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8
-RESTRICT=bindist mirror
-SLOT=0/5.12
-SRC_URI=https://dl.ui.com/unifi/5.12.72/UniFi.unix.zip -> unifi-5.12.72.zip
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2eabfcf26b8bff973a503bb354ab5bc7
diff --git a/metadata/md5-cache/net-wireless/unifi-5.13.29 b/metadata/md5-cache/net-wireless/unifi-5.13.29
index 93809124e312..7070a5c33e5d 100644
--- a/metadata/md5-cache/net-wireless/unifi-5.13.29
+++ b/metadata/md5-cache/net-wireless/unifi-5.13.29
@@ -4,11 +4,11 @@ DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
 EAPI=6
 HOMEPAGE=https://www.ubnt.com
 IUSE=systemd
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
 RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8
 RESTRICT=bindist mirror
 SLOT=0/5.13
 SRC_URI=https://dl.ui.com/unifi/5.13.29-1fc0cd615f/UniFi.unix.zip -> unifi-5.13.29.zip
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8ac726ad67bb309d631285db90093dbe
+_md5_=e5227a8aa73f0318d35f88909b6c25c7
diff --git a/metadata/md5-cache/net-wireless/unifi-5.14.15 b/metadata/md5-cache/net-wireless/unifi-5.14.15
new file mode 100644
index 000000000000..ddd6c6024436
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/unifi-5.14.15
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare
+DEPEND=app-arch/unzip virtual/pkgconfig
+DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
+EAPI=6
+HOMEPAGE=https://www.ubnt.com
+IUSE=systemd
+KEYWORDS=~amd64
+LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
+RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8
+RESTRICT=bindist mirror
+SLOT=0/5.14
+SRC_URI=https://dl.ui.com/unifi/5.14.15-c3f8d69687/UniFi.unix.zip -> unifi-5.14.15.zip
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b86a16de5f2967f468d41ece78628340
diff --git a/metadata/md5-cache/net-wireless/unifi-5.14.7 b/metadata/md5-cache/net-wireless/unifi-5.14.7
deleted file mode 100644
index 913bfe5fcd93..000000000000
--- a/metadata/md5-cache/net-wireless/unifi-5.14.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=app-arch/unzip virtual/pkgconfig
-DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
-EAPI=6
-HOMEPAGE=https://www.ubnt.com
-IUSE=systemd
-KEYWORDS=~amd64
-LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
-RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8
-RESTRICT=bindist mirror
-SLOT=0/5.14
-SRC_URI=https://dl.ui.com/unifi/5.14.7-ad58f9eb49/UniFi.unix.zip -> unifi-5.14.7.zip
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=af9e7df76a1c1c8b20b9e897e087dbc8
diff --git a/metadata/md5-cache/net-wireless/urh-2.8.8 b/metadata/md5-cache/net-wireless/urh-2.8.8
index f60d5ce2ffd7..184e4a88c447 100644
--- a/metadata/md5-cache/net-wireless/urh-2.8.8
+++ b/metadata/md5-cache/net-wireless/urh-2.8.8
@@ -1,15 +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-42.0.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_targets_python3_6? ( dev-lang/python:3.6 ) python_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(-)] net-wireless/gnuradio[zeromq] 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(-)] 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-python/pyzmq[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] 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(-)] bladerf? ( net-wireless/bladerf:= ) hackrf? ( net-libs/libhackrf:= ) plutosdr? ( net-libs/libiio:= ) rtlsdr? ( net-wireless/rtl-sdr:= ) uhd? ( net-wireless/uhd:= )
+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(-)] net-wireless/gnuradio[zeromq] 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(-)] 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-python/pyzmq[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] 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(-)] airspy? ( net-wireless/airspy:= ) audio? ( dev-python/pyaudio[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) bladerf? ( net-wireless/bladerf:= ) hackrf? ( net-libs/libhackrf:= ) limesdr? ( net-wireless/limesuite:= ) plutosdr? ( net-libs/libiio:= ) rtlsdr? ( net-wireless/rtl-sdr:= ) sdrplay? ( net-wireless/sdrplay:= ) uhd? ( net-wireless/uhd:= )
 DESCRIPTION=Universal Radio Hacker: investigate wireless protocols like a boss
 EAPI=7
 HOMEPAGE=https://github.com/jopohl/urh
-IUSE=bladerf hackrf plutosdr rtlsdr uhd python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=airspy audio bladerf hackrf limesdr plutosdr rtlsdr sdrplay uhd python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~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(-)] net-wireless/gnuradio[zeromq] 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(-)] 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-python/pyzmq[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] 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(-)] 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_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),testlib] net-wireless/gr-osmosdr python_targets_python3_6? ( dev-lang/python:3.6 ) python_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(-)]
+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(-)] net-wireless/gnuradio[zeromq] 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(-)] 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-python/pyzmq[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] 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(-)] airspy? ( net-wireless/airspy:= ) audio? ( dev-python/pyaudio[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) bladerf? ( net-wireless/bladerf:= ) hackrf? ( net-libs/libhackrf:= ) limesdr? ( net-wireless/limesuite:= ) plutosdr? ( net-libs/libiio:= ) rtlsdr? ( net-wireless/rtl-sdr:= ) sdrplay? ( net-wireless/sdrplay:= ) uhd? ( net-wireless/uhd:= ) 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(-),testlib] net-wireless/gr-osmosdr python_targets_python3_6? ( dev-lang/python:3.6 ) python_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/jopohl/urh/archive/v2.8.8.tar.gz -> urh-2.8.8.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2a02930f4ce659cb6659de37d9ccaa27
+_md5_=22eeb2fbe781043ab58ef44b108cae1d
diff --git a/metadata/md5-cache/net-wireless/urh-9999 b/metadata/md5-cache/net-wireless/urh-9999
index f98ba807e55a..b154d0878458 100644
--- a/metadata/md5-cache/net-wireless/urh-9999
+++ b/metadata/md5-cache/net-wireless/urh-9999
@@ -1,14 +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-42.0.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-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-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(-)] net-wireless/gnuradio[zeromq] 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(-)] 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-python/pyzmq[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] 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(-)] bladerf? ( net-wireless/bladerf:= ) hackrf? ( net-libs/libhackrf:= ) plutosdr? ( net-libs/libiio:= ) rtlsdr? ( net-wireless/rtl-sdr:= ) uhd? ( net-wireless/uhd:= )
+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(-)] net-wireless/gnuradio[zeromq] 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(-)] 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-python/pyzmq[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] 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(-)] airspy? ( net-wireless/airspy:= ) audio? ( dev-python/pyaudio[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) bladerf? ( net-wireless/bladerf:= ) hackrf? ( net-libs/libhackrf:= ) limesdr? ( net-wireless/limesuite:= ) plutosdr? ( net-libs/libiio:= ) rtlsdr? ( net-wireless/rtl-sdr:= ) sdrplay? ( net-wireless/sdrplay:= ) uhd? ( net-wireless/uhd:= )
 DESCRIPTION=Universal Radio Hacker: investigate wireless protocols like a boss
 EAPI=7
 HOMEPAGE=https://github.com/jopohl/urh
-IUSE=bladerf hackrf plutosdr rtlsdr uhd python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=airspy audio bladerf hackrf limesdr plutosdr rtlsdr sdrplay uhd python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 LICENSE=Apache-2.0
 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(-)] net-wireless/gnuradio[zeromq] 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(-)] 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-python/pyzmq[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] 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(-)] 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_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),testlib] net-wireless/gr-osmosdr python_targets_python3_6? ( dev-lang/python:3.6 ) python_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(-)]
+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(-)] net-wireless/gnuradio[zeromq] 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(-)] 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-python/pyzmq[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] 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(-)] airspy? ( net-wireless/airspy:= ) audio? ( dev-python/pyaudio[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) bladerf? ( net-wireless/bladerf:= ) hackrf? ( net-libs/libhackrf:= ) limesdr? ( net-wireless/limesuite:= ) plutosdr? ( net-libs/libiio:= ) rtlsdr? ( net-wireless/rtl-sdr:= ) sdrplay? ( net-wireless/sdrplay:= ) uhd? ( net-wireless/uhd:= ) 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(-),testlib] net-wireless/gr-osmosdr python_targets_python3_6? ( dev-lang/python:3.6 ) python_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	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2a02930f4ce659cb6659de37d9ccaa27
+_md5_=22eeb2fbe781043ab58ef44b108cae1d
diff --git a/metadata/md5-cache/perl-core/CPAN-Meta-Requirements-2.125.0-r1 b/metadata/md5-cache/perl-core/CPAN-Meta-Requirements-2.125.0-r1
index 506631dc0904..7bc1588e2af8 100644
--- a/metadata/md5-cache/perl-core/CPAN-Meta-Requirements-2.125.0-r1
+++ b/metadata/md5-cache/perl-core/CPAN-Meta-Requirements-2.125.0-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils >=virtual/perl-version-0.77 !<perl-core/CPAN-Meta-2.120.920 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-Requirements-2.125.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=af6588dbe547af2059a999fc9bd7b594
diff --git a/metadata/md5-cache/perl-core/Data-Dumper-2.154.0 b/metadata/md5-cache/perl-core/Data-Dumper-2.154.0
index 70dea4c4fffc..6c2c38a86bbd 100644
--- a/metadata/md5-cache/perl-core/Data-Dumper-2.154.0
+++ b/metadata/md5-cache/perl-core/Data-Dumper-2.154.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/Data-Dumper-2.154.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1a11b47061c044be19143c30ef915ff6
diff --git a/metadata/md5-cache/perl-core/Devel-PPPort-3.310.0 b/metadata/md5-cache/perl-core/Devel-PPPort-3.310.0
index c0c9d6fe65b5..b7c2bebd4c4d 100644
--- a/metadata/md5-cache/perl-core/Devel-PPPort-3.310.0
+++ b/metadata/md5-cache/perl-core/Devel-PPPort-3.310.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/W/WO/WOLFSAGE/Devel-PPPort-3.31.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=161840910429112ddab666e3a9470647
diff --git a/metadata/md5-cache/perl-core/Digest-1.170.0-r1 b/metadata/md5-cache/perl-core/Digest-1.170.0-r1
index a30553aa769d..1439d074c249 100644
--- a/metadata/md5-cache/perl-core/Digest-1.170.0-r1
+++ b/metadata/md5-cache/perl-core/Digest-1.170.0-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-MIME-Base64 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Digest-1.17.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5e07b18bdefc6387c83697a504cb1ad0
diff --git a/metadata/md5-cache/perl-core/Digest-MD5-2.530.0 b/metadata/md5-cache/perl-core/Digest-MD5-2.530.0
index b825581057a1..bf01a7d9eb5e 100644
--- a/metadata/md5-cache/perl-core/Digest-MD5-2.530.0
+++ b/metadata/md5-cache/perl-core/Digest-MD5-2.530.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Digest-MD5-2.53.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1d882be9a1e5386fb7099422947e8ddf
diff --git a/metadata/md5-cache/perl-core/Digest-SHA-5.880.0 b/metadata/md5-cache/perl-core/Digest-SHA-5.880.0
index 13c7f7cc4946..af2f6cbab095 100644
--- a/metadata/md5-cache/perl-core/Digest-SHA-5.880.0
+++ b/metadata/md5-cache/perl-core/Digest-SHA-5.880.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSHELOR/Digest-SHA-5.88.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5e0ccce3440ddd474ba9b90c7100c0fb
diff --git a/metadata/md5-cache/perl-core/Dumpvalue-1.170.0 b/metadata/md5-cache/perl-core/Dumpvalue-1.170.0
index 4ea8e0c9a695..1a23d3682cfe 100644
--- a/metadata/md5-cache/perl-core/Dumpvalue-1.170.0
+++ b/metadata/md5-cache/perl-core/Dumpvalue-1.170.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FL/FLORA/Dumpvalue-1.17.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d9bfad902c981b8be5abbf5582ae0271
diff --git a/metadata/md5-cache/perl-core/Encode-2.730.0 b/metadata/md5-cache/perl-core/Encode-2.730.0
index f4779cb561cf..a386a4c014d8 100644
--- a/metadata/md5-cache/perl-core/Encode-2.730.0
+++ b/metadata/md5-cache/perl-core/Encode-2.730.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-2.73.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=41f8814ca07f7dd75095fdfa7b361766
diff --git a/metadata/md5-cache/perl-core/ExtUtils-Constant-0.230.0-r1 b/metadata/md5-cache/perl-core/ExtUtils-Constant-0.230.0-r1
index 8fc3d3f29c68..7c47cf868021 100644
--- a/metadata/md5-cache/perl-core/ExtUtils-Constant-0.230.0-r1
+++ b/metadata/md5-cache/perl-core/ExtUtils-Constant-0.230.0-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NW/NWCLARK/ExtUtils-Constant-0.23.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9bce866d12c6548304a792d5b983a30f
diff --git a/metadata/md5-cache/perl-core/ExtUtils-Manifest-1.700.0 b/metadata/md5-cache/perl-core/ExtUtils-Manifest-1.700.0
index 7de5bc16affb..e7a547527810 100644
--- a/metadata/md5-cache/perl-core/ExtUtils-Manifest-1.700.0
+++ b/metadata/md5-cache/perl-core/ExtUtils-Manifest-1.700.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!=perl-core/ExtUtils-MakeMaker-7.40.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/ExtUtils-Manifest-1.70.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d23e27531672094963eea033c27b973d
diff --git a/metadata/md5-cache/perl-core/Getopt-Long-2.420.0 b/metadata/md5-cache/perl-core/Getopt-Long-2.420.0
index 0c7d5bdb0b8b..55cdc27e6ac0 100644
--- a/metadata/md5-cache/perl-core/Getopt-Long-2.420.0
+++ b/metadata/md5-cache/perl-core/Getopt-Long-2.420.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Pod-Parser dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JV/JV/Getopt-Long-2.42.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b9576305c2e8db3af75f0278aa59e9a6
diff --git a/metadata/md5-cache/perl-core/HTTP-Tiny-0.43.0 b/metadata/md5-cache/perl-core/HTTP-Tiny-0.43.0
index 7f40d18a4ff3..7196c02f7323 100644
--- a/metadata/md5-cache/perl-core/HTTP-Tiny-0.43.0
+++ b/metadata/md5-cache/perl-core/HTTP-Tiny-0.43.0
@@ -9,5 +9,5 @@ RDEPEND=virtual/perl-IO virtual/perl-Time-Local dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/HTTP-Tiny-0.043.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=18c81db43d12d56a7e4060ce98791656
diff --git a/metadata/md5-cache/perl-core/IO-Zlib-1.100.0 b/metadata/md5-cache/perl-core/IO-Zlib-1.100.0
index c0fea1f38877..88604ef1e8c1 100644
--- a/metadata/md5-cache/perl-core/IO-Zlib-1.100.0
+++ b/metadata/md5-cache/perl-core/IO-Zlib-1.100.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-IO-Compress dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOMHUGHES/IO-Zlib-1.10.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=93e536c64a4eb126079427fbde3b3ad0
diff --git a/metadata/md5-cache/perl-core/Locale-Maketext-Simple-0.210.0-r1 b/metadata/md5-cache/perl-core/Locale-Maketext-Simple-0.210.0-r1
index 8f7993eef7b9..65033fa9935b 100644
--- a/metadata/md5-cache/perl-core/Locale-Maketext-Simple-0.210.0-r1
+++ b/metadata/md5-cache/perl-core/Locale-Maketext-Simple-0.210.0-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JE/JESSE/Locale-Maketext-Simple-0.21.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1ca829d41c95a354777341174cdd2921
diff --git a/metadata/md5-cache/perl-core/MIME-Base64-3.140.0-r1 b/metadata/md5-cache/perl-core/MIME-Base64-3.140.0-r1
index 7c616e386b7b..27fe3f123a29 100644
--- a/metadata/md5-cache/perl-core/MIME-Base64-3.140.0-r1
+++ b/metadata/md5-cache/perl-core/MIME-Base64-3.140.0-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/MIME-Base64-3.14.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7120014832f2cf56e37353b654c422a3
diff --git a/metadata/md5-cache/perl-core/Manifest.gz b/metadata/md5-cache/perl-core/Manifest.gz
index eebe1e5f4827..dfa8c189dc58 100644
--- a/metadata/md5-cache/perl-core/Manifest.gz
+++ b/metadata/md5-cache/perl-core/Manifest.gz
diff --git a/metadata/md5-cache/perl-core/Math-Complex-1.590.0 b/metadata/md5-cache/perl-core/Math-Complex-1.590.0
index 598ae2010667..c22e105eefdc 100644
--- a/metadata/md5-cache/perl-core/Math-Complex-1.590.0
+++ b/metadata/md5-cache/perl-core/Math-Complex-1.590.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Math-Complex-1.59.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0ccff8feaca13d105e6425fb20c65a67
diff --git a/metadata/md5-cache/perl-core/Memoize-1.30.0-r1 b/metadata/md5-cache/perl-core/Memoize-1.30.0-r1
index 031cb11e7948..dca011ba1e9d 100644
--- a/metadata/md5-cache/perl-core/Memoize-1.30.0-r1
+++ b/metadata/md5-cache/perl-core/Memoize-1.30.0-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MJ/MJD/Memoize-1.03.tgz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8aedd9da39c49171398338899531667a
diff --git a/metadata/md5-cache/perl-core/Module-Loaded-0.80.0-r1 b/metadata/md5-cache/perl-core/Module-Loaded-0.80.0-r1
index 476ae9b15e5d..28386b821492 100644
--- a/metadata/md5-cache/perl-core/Module-Loaded-0.80.0-r1
+++ b/metadata/md5-cache/perl-core/Module-Loaded-0.80.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Module-Loaded-0.08.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fef5c17d234157582c52980b3aea755a
diff --git a/metadata/md5-cache/perl-core/Module-Metadata-1.0.26 b/metadata/md5-cache/perl-core/Module-Metadata-1.0.26
index e15c349798c2..e6e39b3eb550 100644
--- a/metadata/md5-cache/perl-core/Module-Metadata-1.0.26
+++ b/metadata/md5-cache/perl-core/Module-Metadata-1.0.26
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-version-0.870 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Module-Metadata-1.000026.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e2dd8db4608d14537d80b958442a399f
diff --git a/metadata/md5-cache/perl-core/Params-Check-0.380.0-r1 b/metadata/md5-cache/perl-core/Params-Check-0.380.0-r1
index 31af3bdf5907..e95a3bc54f03 100644
--- a/metadata/md5-cache/perl-core/Params-Check-0.380.0-r1
+++ b/metadata/md5-cache/perl-core/Params-Check-0.380.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Locale-Maketext-Simple dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Params-Check-0.38.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=42236c7f43ae19f5d075e8e47a225cf2
diff --git a/metadata/md5-cache/perl-core/Pod-Simple-3.280.0 b/metadata/md5-cache/perl-core/Pod-Simple-3.280.0
index 38332d5ba226..e93de2d5a173 100644
--- a/metadata/md5-cache/perl-core/Pod-Simple-3.280.0
+++ b/metadata/md5-cache/perl-core/Pod-Simple-3.280.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Pod-Escapes-1.04 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DW/DWHEELER/Pod-Simple-3.28.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b68581178dc25f95e8f7babc5b4385e2
diff --git a/metadata/md5-cache/perl-core/Sys-Syslog-0.330.0-r1 b/metadata/md5-cache/perl-core/Sys-Syslog-0.330.0-r1
index 881b1afeeffe..e37943f8600a 100644
--- a/metadata/md5-cache/perl-core/Sys-Syslog-0.330.0-r1
+++ b/metadata/md5-cache/perl-core/Sys-Syslog-0.330.0-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SAPER/Sys-Syslog-0.33.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e3d4194f75c364d6fbdd176f575fb625
diff --git a/metadata/md5-cache/perl-core/Term-ANSIColor-4.20.0 b/metadata/md5-cache/perl-core/Term-ANSIColor-4.20.0
index caf5d4913ecf..89ac79a8633a 100644
--- a/metadata/md5-cache/perl-core/Term-ANSIColor-4.20.0
+++ b/metadata/md5-cache/perl-core/Term-ANSIColor-4.20.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RR/RRA/Term-ANSIColor-4.02.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4b8eb6b4da22fd254f266b9abe6dcdd9
diff --git a/metadata/md5-cache/perl-core/Test-1.260.0 b/metadata/md5-cache/perl-core/Test-1.260.0
index ef34bdce3e57..4a661a8601b4 100644
--- a/metadata/md5-cache/perl-core/Test-1.260.0
+++ b/metadata/md5-cache/perl-core/Test-1.260.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JE/JESSE/Test-1.26.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f7730dd1c045dbed8fab79b4a0e62e6c
diff --git a/metadata/md5-cache/perl-core/Text-Balanced-2.20.0-r1 b/metadata/md5-cache/perl-core/Text-Balanced-2.20.0-r1
index 51d4fffb44a3..0e5870938a2c 100644
--- a/metadata/md5-cache/perl-core/Text-Balanced-2.20.0-r1
+++ b/metadata/md5-cache/perl-core/Text-Balanced-2.20.0-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Text-Balanced-2.02.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a76277c69562e3a0a3c90f0f0600129f
diff --git a/metadata/md5-cache/perl-core/Text-ParseWords-3.290.0 b/metadata/md5-cache/perl-core/Text-ParseWords-3.290.0
index a2c1e9daef32..b2f4d010fe00 100644
--- a/metadata/md5-cache/perl-core/Text-ParseWords-3.290.0
+++ b/metadata/md5-cache/perl-core/Text-ParseWords-3.290.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Text-ParseWords-3.29.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2f7d80e3e125275772b55cdc93dff2ca
diff --git a/metadata/md5-cache/perl-core/Text-Tabs+Wrap-2013.52.300-r1 b/metadata/md5-cache/perl-core/Text-Tabs+Wrap-2013.52.300-r1
index 8d9502660a9e..f01b9d8deb86 100644
--- a/metadata/md5-cache/perl-core/Text-Tabs+Wrap-2013.52.300-r1
+++ b/metadata/md5-cache/perl-core/Text-Tabs+Wrap-2013.52.300-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MU/MUIR/modules/Text-Tabs+Wrap-2013.0523.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5aab14f51acca5399043f76782aa60f0
diff --git a/metadata/md5-cache/perl-core/Thread-Semaphore-2.120.0-r1 b/metadata/md5-cache/perl-core/Thread-Semaphore-2.120.0-r1
index 61153f3b758f..aba9d7ed24f8 100644
--- a/metadata/md5-cache/perl-core/Thread-Semaphore-2.120.0-r1
+++ b/metadata/md5-cache/perl-core/Thread-Semaphore-2.120.0-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-threads-shared virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JD/JDHEDDEN/Thread-Semaphore-2.12.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9414eebebcbfac5616ffb89fdc55ab91
diff --git a/metadata/md5-cache/perl-core/Time-HiRes-1.972.600-r1 b/metadata/md5-cache/perl-core/Time-HiRes-1.972.600-r1
index a3bab35d0db7..b440066cceb6 100644
--- a/metadata/md5-cache/perl-core/Time-HiRes-1.972.600-r1
+++ b/metadata/md5-cache/perl-core/Time-HiRes-1.972.600-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Time-HiRes-1.9726.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bf81bbb2fd9f67f915cffce452307bce
diff --git a/metadata/md5-cache/perl-core/Time-Local-1.230.0-r1 b/metadata/md5-cache/perl-core/Time-Local-1.230.0-r1
index bc5ae1c62c57..e720f32f9f15 100644
--- a/metadata/md5-cache/perl-core/Time-Local-1.230.0-r1
+++ b/metadata/md5-cache/perl-core/Time-Local-1.230.0-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Time-Local-1.2300.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3a98021e861849d6b060a81471e9d57b
diff --git a/metadata/md5-cache/perl-core/Unicode-Normalize-1.250.0 b/metadata/md5-cache/perl-core/Unicode-Normalize-1.250.0
index ddd868d4038b..0767787fc53b 100644
--- a/metadata/md5-cache/perl-core/Unicode-Normalize-1.250.0
+++ b/metadata/md5-cache/perl-core/Unicode-Normalize-1.250.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Spec dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KH/KHW/Unicode-Normalize-1.25.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4e47c61518b80af4a8f6ac8af82b86f4
diff --git a/metadata/md5-cache/perl-core/libnet-1.270.0 b/metadata/md5-cache/perl-core/libnet-1.270.0
index 53baa6c30703..b1a8c66a7d80 100644
--- a/metadata/md5-cache/perl-core/libnet-1.270.0
+++ b/metadata/md5-cache/perl-core/libnet-1.270.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=sasl? ( dev-perl/Authen-SASL ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHAY/libnet-1.27.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4e843ad61d232318b8df76dabb92c6e1
diff --git a/metadata/md5-cache/perl-core/parent-0.228-r1 b/metadata/md5-cache/perl-core/parent-0.228-r1
index 39b599a79fd3..ad3c83e396b6 100644
--- a/metadata/md5-cache/perl-core/parent-0.228-r1
+++ b/metadata/md5-cache/perl-core/parent-0.228-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CO/CORION/parent-0.228.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8de14c26dd105ad5343a1ab16bf7c673
diff --git a/metadata/md5-cache/perl-core/podlators-2.5.3 b/metadata/md5-cache/perl-core/podlators-2.5.3
index 66c43b8284c9..ad8689fa45d9 100644
--- a/metadata/md5-cache/perl-core/podlators-2.5.3
+++ b/metadata/md5-cache/perl-core/podlators-2.5.3
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-lang/perl-5.8.8-r8 >=virtual/perl-Pod-Simple-3.06 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RR/RRA/podlators-2.5.3.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e7c668a0b06fdc02d1ea8ac54bbad0a3
diff --git a/metadata/md5-cache/perl-core/version-0.990.800 b/metadata/md5-cache/perl-core/version-0.990.800
index 34cd2e5a157c..43b444f21cc0 100644
--- a/metadata/md5-cache/perl-core/version-0.990.800
+++ b/metadata/md5-cache/perl-core/version-0.990.800
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JP/JPEACOCK/version-0.9908.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=54f778cb860e363f97d2ca973071c386
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index a87f6ee76fde..7a2ca843522b 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/stellarium-0.20.1 b/metadata/md5-cache/sci-astronomy/stellarium-0.20.1
index dfea66c9d262..776b87bb6373 100644
--- a/metadata/md5-cache/sci-astronomy/stellarium-0.20.1
+++ b/metadata/md5-cache/sci-astronomy/stellarium-0.20.1
@@ -5,11 +5,11 @@ DESCRIPTION=3D photo-realistic skies in real time
 EAPI=7
 HOMEPAGE=https://www.stellarium.org/
 IUSE=debug gps media nls stars test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtserialport:5 dev-qt/qtwidgets:5 media-fonts/dejavu sys-libs/zlib virtual/opengl gps? ( dev-qt/qtpositioning:5 ) media? ( dev-qt/qtmultimedia:5[widgets] )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Stellarium/stellarium/releases/download/v0.20.1/stellarium-0.20.1.tar.gz stars? ( https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat )
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=54deaf0f8f45d7a6d0a94207bb870a12
+_md5_=7b265451239226ac0ea41de261aac6a4
diff --git a/metadata/md5-cache/sci-astronomy/wcslib-5.16 b/metadata/md5-cache/sci-astronomy/wcslib-5.16
index 47344e35d2c9..dfbdf97ae9a6 100644
--- a/metadata/md5-cache/sci-astronomy/wcslib-5.16
+++ b/metadata/md5-cache/sci-astronomy/wcslib-5.16
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install setup test
 DEPEND=fits? ( sci-libs/cfitsio:0= ) pgplot? ( sci-libs/pgplot:0= ) sys-devel/flex virtual/pkgconfig fortran? ( virtual/fortran )
 DESCRIPTION=Astronomical World Coordinate System transformations library
 EAPI=6
-HOMEPAGE=http://www.atnf.csiro.au/people/mcalabre/WCS/
+HOMEPAGE=https://www.atnf.csiro.au/people/mcalabre/WCS/
 IUSE=doc fortran fits pgplot static-libs +tools
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
@@ -10,4 +10,4 @@ RDEPEND=fits? ( sci-libs/cfitsio:0= ) pgplot? ( sci-libs/pgplot:0= ) fortran? (
 SLOT=0/5
 SRC_URI=ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib-5.16.tar.bz2
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1acd80ee40e7c37364f46b8854c005c9
+_md5_=a59ca3be85d8c1b68b4d83ba504c824f
diff --git a/metadata/md5-cache/sci-biology/GBrowse-2.48-r1 b/metadata/md5-cache/sci-biology/GBrowse-2.48-r1
index 3d43ab08a4eb..0f6d61d4463b 100644
--- a/metadata/md5-cache/sci-biology/GBrowse-2.48-r1
+++ b/metadata/md5-cache/sci-biology/GBrowse-2.48-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<sci-biology/GBrowse-2.44-r1 >=sci-biology/bioperl-1.6.9 >=dev-perl/Bio-Graphics-2.09 >=dev-perl/GD-2.07 >=dev-perl/CGI-Session-4.02 dev-perl/IO-String dev-perl/JSON dev-perl/libwww-perl dev-perl/Statistics-Descriptive !minimal? ( dev-perl/Bio-Das >=dev-perl/Bio-SamTools-1.20 dev-perl/Crypt-SSLeay dev-perl/DB_File-Lock dev-perl/DBI mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite ) dev-perl/FCGI dev-perl/File-NFSLock dev-perl/GD-SVG dev-perl/Net-OpenID-Consumer dev-perl/Net-SMTP-SSL ) dev-lang/perl:=[-build(-)] >=app-admin/webapp-config-1.50.15
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/GBrowse-2.48.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12
 _md5_=bccaeef3292f6df307fc14fb5a2a74b2
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index 9d2dbe5aee08..1156dd9bd73f 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/abyss-2.0.3-r1 b/metadata/md5-cache/sci-biology/abyss-2.0.3-r1
deleted file mode 100644
index 84630ef72cf4..000000000000
--- a/metadata/md5-cache/sci-biology/abyss-2.0.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare pretend setup
-DEPEND=dev-cpp/sparsehash dev-libs/boost:= misc-haskell? ( dev-libs/gmp:0= virtual/libffi:0= ) mpi? ( sys-cluster/openmpi ) misc-haskell? ( dev-lang/ghc ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Assembly By Short Sequences - a de novo, parallel, paired-end sequence assembler
-EAPI=6
-HOMEPAGE=http://www.bcgsc.ca/platform/bioinfo/software/abyss/
-IUSE=+mpi openmp misc-haskell
-KEYWORDS=~amd64 ~x86
-LICENSE=abyss
-RDEPEND=dev-cpp/sparsehash dev-libs/boost:= misc-haskell? ( dev-libs/gmp:0= virtual/libffi:0= ) mpi? ( sys-cluster/openmpi )
-SLOT=0
-SRC_URI=https://github.com/bcgsc/abyss/archive/2.0.3.tar.gz -> abyss-2.0.3.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=390c105831f179d395708c7ba4778ecc
diff --git a/metadata/md5-cache/sci-biology/abyss-2.0.3-r2 b/metadata/md5-cache/sci-biology/abyss-2.0.3-r2
new file mode 100644
index 000000000000..1dd84e6535c8
--- /dev/null
+++ b/metadata/md5-cache/sci-biology/abyss-2.0.3-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare pretend setup
+DEPEND=dev-cpp/sparsehash dev-libs/boost:= misc-haskell? ( dev-libs/gmp:0= dev-libs/libffi:0= ) mpi? ( sys-cluster/openmpi ) misc-haskell? ( dev-lang/ghc ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Assembly By Short Sequences - a de novo, parallel, paired-end sequence assembler
+EAPI=6
+HOMEPAGE=http://www.bcgsc.ca/platform/bioinfo/software/abyss/
+IUSE=+mpi openmp misc-haskell
+KEYWORDS=~amd64 ~x86
+LICENSE=abyss
+RDEPEND=dev-cpp/sparsehash dev-libs/boost:= misc-haskell? ( dev-libs/gmp:0= dev-libs/libffi:0= ) mpi? ( sys-cluster/openmpi )
+SLOT=0
+SRC_URI=https://github.com/bcgsc/abyss/archive/2.0.3.tar.gz -> abyss-2.0.3.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=14d874a3152b5d75a6be53f68e24fd47
diff --git a/metadata/md5-cache/sci-biology/bioperl-1.6.9 b/metadata/md5-cache/sci-biology/bioperl-1.6.9
index 038c70624aaf..f25ae867de63 100644
--- a/metadata/md5-cache/sci-biology/bioperl-1.6.9
+++ b/metadata/md5-cache/sci-biology/bioperl-1.6.9
@@ -11,5 +11,5 @@ RDEPEND=dev-perl/libwww-perl !minimal? ( dev-perl/Algorithm-Munkres dev-perl/Arr
 REQUIRED_USE=minimal? ( !graphviz )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJFIELDS/BioPerl-1.6.901.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=be22a76392a6e5c121e4b6d388045faa
diff --git a/metadata/md5-cache/sci-biology/bioperl-db-1.6.9 b/metadata/md5-cache/sci-biology/bioperl-db-1.6.9
index 31f7f1274ab5..7d888888867f 100644
--- a/metadata/md5-cache/sci-biology/bioperl-db-1.6.9
+++ b/metadata/md5-cache/sci-biology/bioperl-db-1.6.9
@@ -10,5 +10,5 @@ RDEPEND=>=sci-biology/bioperl-1.6.9 dev-perl/DBD-mysql dev-perl/DBI sci-biology/
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJFIELDS/BioPerl-DB-1.006900.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2470d7ecf1b6ff1902a8d74057748480
diff --git a/metadata/md5-cache/sci-biology/bioperl-network-1.6.9 b/metadata/md5-cache/sci-biology/bioperl-network-1.6.9
index e1a147aa5b14..ea6ecfb4fc3f 100644
--- a/metadata/md5-cache/sci-biology/bioperl-network-1.6.9
+++ b/metadata/md5-cache/sci-biology/bioperl-network-1.6.9
@@ -10,5 +10,5 @@ RDEPEND=>=sci-biology/bioperl-1.6.9 >=dev-perl/Graph-0.86 dev-lang/perl:=[-build
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJFIELDS/BioPerl-Network-1.006900.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8f7c4053ffbec76cfad29cca2d99847b
diff --git a/metadata/md5-cache/sci-biology/bioperl-run-1.6.9 b/metadata/md5-cache/sci-biology/bioperl-run-1.6.9
index eb9cb3ad4627..5591e5339a14 100644
--- a/metadata/md5-cache/sci-biology/bioperl-run-1.6.9
+++ b/metadata/md5-cache/sci-biology/bioperl-run-1.6.9
@@ -10,5 +10,5 @@ RDEPEND=>=sci-biology/bioperl-1.6.9 !minimal? ( dev-perl/Algorithm-Diff dev-perl
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJFIELDS/BioPerl-Run-1.006900.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9caec4e5b47cbf306a1689903f2a018a
diff --git a/metadata/md5-cache/sci-biology/diya-1.0_rc4 b/metadata/md5-cache/sci-biology/diya-1.0_rc4
index aaa802f2c804..62a7b72c5637 100644
--- a/metadata/md5-cache/sci-biology/diya-1.0_rc4
+++ b/metadata/md5-cache/sci-biology/diya-1.0_rc4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=sci-biology/bioperl dev-perl/Data-Utilities dev-perl/XML-Simple !minimal? ( sci-biology/mummer sci-biology/glimmer sci-biology/trnascan-se sci-biology/infernal ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/diyg/files/diya/diya-1.0/diya-1.0-rc4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5d4639d7c08c43e2c2208492508fd56c
diff --git a/metadata/md5-cache/sci-biology/infernal-1.0.2-r1 b/metadata/md5-cache/sci-biology/infernal-1.0.2-r1
index e3d478338308..b43dc9f10d3a 100644
--- a/metadata/md5-cache/sci-biology/infernal-1.0.2-r1
+++ b/metadata/md5-cache/sci-biology/infernal-1.0.2-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=configure install
 DEPEND=mpi? ( virtual/mpi )
 DESCRIPTION=Inference of RNA alignments
-EAPI=6
+EAPI=7
 HOMEPAGE=http://infernal.janelia.org/
 IUSE=mpi
 KEYWORDS=amd64 x86
@@ -9,4 +9,5 @@ LICENSE=GPL-3
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=ftp://selab.janelia.org/pub/software/infernal/infernal-1.0.2.tar.gz
-_md5_=a3cee86cfd4ecbef4e39563bc652a64b
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a3b1f788e8f5b38e41b3a9e38f91fe88
diff --git a/metadata/md5-cache/sci-biology/mcl-14.137 b/metadata/md5-cache/sci-biology/mcl-14.137
index 706dd8b00d62..3bfd048cf515 100644
--- a/metadata/md5-cache/sci-biology/mcl-14.137
+++ b/metadata/md5-cache/sci-biology/mcl-14.137
@@ -1,7 +1,7 @@
+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=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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 Markov Cluster Algorithm implementation
-EAPI=6
+EAPI=7
 HOMEPAGE=http://micans.org/mcl/
 IUSE=+blast
 KEYWORDS=~amd64 ~x86
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://micans.org/mcl/src/mcl-14-137.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3429c68609b6c70e047d577379f68f97
+_md5_=9779366f51f2fea08274072a9a019159
diff --git a/metadata/md5-cache/sci-biology/poa-2-r1 b/metadata/md5-cache/sci-biology/poa-2-r1
index 793985885507..91bb06718743 100644
--- a/metadata/md5-cache/sci-biology/poa-2-r1
+++ b/metadata/md5-cache/sci-biology/poa-2-r1
@@ -1,11 +1,10 @@
-DEFINED_PHASES=compile install postinst prepare
+DEFINED_PHASES=compile configure install postinst
 DESCRIPTION=Fast multiple sequence alignments using partial-order graphs
-EAPI=5
+EAPI=7
 HOMEPAGE=http://bioinfo.mbi.ucla.edu/poa/
-IUSE=static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/poamsa/poaV2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ab2bece5c6a9c68d3f07555c962d382d
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d7bb9c94a05320cd21ff72a8beb56406
diff --git a/metadata/md5-cache/sci-biology/vienna-rna-2.1.1 b/metadata/md5-cache/sci-biology/vienna-rna-2.1.1
deleted file mode 100644
index 7938cb23c810..000000000000
--- a/metadata/md5-cache/sci-biology/vienna-rna-2.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl media-libs/gd doc? ( dev-texlive/texlive-latex ) 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(-)] ) python? ( dev-lang/swig: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-lang/perl:=[-build(-)]
-DESCRIPTION=RNA secondary structure prediction and comparison
-EAPI=5
-HOMEPAGE=http://www.tbi.univie.ac.at/~ivo/RNA/
-IUSE=doc openmp python static-libs python_targets_python2_7
-KEYWORDS=amd64 ppc x86
-LICENSE=vienna-rna
-RDEPEND=dev-lang/perl media-libs/gd doc? ( dev-texlive/texlive-latex ) 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-lang/perl:=[-build(-)]
-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	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	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 d82c646fdfb8..b05944042c12 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	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b2a6486af275e75c6365ab7eeba1e0bd
diff --git a/metadata/md5-cache/sci-biology/wgs-assembler-7.0-r2 b/metadata/md5-cache/sci-biology/wgs-assembler-7.0-r2
index 063894d236f3..202f9f785ee1 100644
--- a/metadata/md5-cache/sci-biology/wgs-assembler-7.0-r2
+++ b/metadata/md5-cache/sci-biology/wgs-assembler-7.0-r2
@@ -1,13 +1,12 @@
-DEFINED_PHASES=compile configure install prepare
+DEFINED_PHASES=compile configure install
 DEPEND=net-libs/libtirpc x11-libs/libXt !x11-terms/terminator
 DESCRIPTION=The Celera de novo whole-genome shotgun DNA sequence assembler, aka CABOG
-EAPI=6
+EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/wgs-assembler/
-IUSE=static-libs
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=net-libs/libtirpc x11-libs/libXt !x11-terms/terminator app-shells/tcsh dev-perl/Log-Log4perl
 SLOT=0
 SRC_URI=mirror://sourceforge/wgs-assembler/wgs-7.0.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cb4182fc2947f2a3efa19db296a6a76f
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8de6fdef210cdf37e56e086c61983865
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 0de4e4db9c04..2bbbf50a75fc 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/gperiodic-3.0.3 b/metadata/md5-cache/sci-chemistry/gperiodic-3.0.3
index 64481dca6907..c3c5664563af 100644
--- a/metadata/md5-cache/sci-chemistry/gperiodic-3.0.3
+++ b/metadata/md5-cache/sci-chemistry/gperiodic-3.0.3
@@ -5,10 +5,10 @@ DESCRIPTION=Periodic table application for Linux
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/gperiodic/
 IUSE=nls
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0 x11-libs/gtk+:2 x11-libs/cairo[X]
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/gperiodic/gperiodic-3.0.3.tar.gz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=195834a7ba7defc3100f9a2f75e9c9c2
+_md5_=fb3e1fa2bc7c812a9b8f14f3ce8446d6
diff --git a/metadata/md5-cache/sci-chemistry/pymol-plugins-promol-3.0.2-r1 b/metadata/md5-cache/sci-chemistry/pymol-plugins-promol-3.0.2-r1
index 25563b2c47da..1dbd84400da1 100644
--- a/metadata/md5-cache/sci-chemistry/pymol-plugins-promol-3.0.2-r1
+++ b/metadata/md5-cache/sci-chemistry/pymol-plugins-promol-3.0.2-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=install prepare
 DESCRIPTION=Fast and accurate regognition of active sites
 EAPI=5
-HOMEPAGE=http://www.rit.edu/cos/ezviz/ProMOL_dl.html
+HOMEPAGE=https://www.rit.edu/cos/ezviz/ProMOL_dl.html
 IUSE=python_targets_python2_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux
 LICENSE=all-rights-reserved
@@ -9,6 +9,6 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=mirror bindist
 SLOT=0
-SRC_URI=http://www.rit.edu/cos/ezviz/ProMOL.zip -> pymol-plugins-promol-3.0.2.zip
+SRC_URI=https://www.rit.edu/cos/ezviz/ProMOL.zip -> pymol-plugins-promol-3.0.2.zip
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7f72068dce413463b7f8fdf55cbac471
+_md5_=bc5f1e25fc5e3d2c43f6d92e357debcb
diff --git a/metadata/md5-cache/sci-chemistry/votca-csg-1.6.1 b/metadata/md5-cache/sci-chemistry/votca-csg-1.6.1
new file mode 100644
index 000000000000..15626528bb8d
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/votca-csg-1.6.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=~sci-libs/votca-tools-1.6.1 >=dev-cpp/eigen-3.3 gromacs? ( sci-chemistry/gromacs:= ) hdf5? ( sci-libs/hdf5 ) dev-lang/perl app-shells/bash:* >=app-text/txt2tags-2.5 virtual/pkgconfig
+DESCRIPTION=Votca coarse-graining engine
+EAPI=7
+HOMEPAGE=http://www.votca.org
+IUSE=doc examples extras +gromacs hdf5
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-macos
+LICENSE=Apache-2.0
+PDEPEND=extras? ( ~sci-chemistry/votca-csgapps-1.6.1 )
+RDEPEND=~sci-libs/votca-tools-1.6.1 >=dev-cpp/eigen-3.3 gromacs? ( sci-chemistry/gromacs:= ) hdf5? ( sci-libs/hdf5 ) dev-lang/perl app-shells/bash:*
+SLOT=0
+SRC_URI=https://github.com/votca/csg/archive/v1.6.1.tar.gz -> votca-csg-1.6.1.tar.gz doc? ( https://github.com/votca/csg-manual/releases/download/v1.6.1/votca-csg-manual-1.6.1.pdf ) examples? ( https://github.com/votca/csg-tutorials/archive/v1.6.1.tar.gz -> votca-csg-tutorials-1.6.1.tar.gz )
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=38568bf1c13abada52591672e1f5ea3f
diff --git a/metadata/md5-cache/sci-chemistry/votca-csgapps-1.6.1 b/metadata/md5-cache/sci-chemistry/votca-csgapps-1.6.1
new file mode 100644
index 000000000000..63571b758809
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/votca-csgapps-1.6.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-cpp/eigen-3.3 ~sci-chemistry/votca-csg-1.6.1
+DESCRIPTION=Extra applications for votca-csg
+EAPI=7
+HOMEPAGE=http://www.votca.org
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-macos
+LICENSE=Apache-2.0
+RDEPEND=>=dev-cpp/eigen-3.3 ~sci-chemistry/votca-csg-1.6.1
+SLOT=0
+SRC_URI=https://github.com/votca/csgapps/archive/v1.6.1.tar.gz -> votca-csgapps-1.6.1.tar.gz
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9df2ffdcf0302fea33bdf3ed6228bda4
diff --git a/metadata/md5-cache/sci-chemistry/votca-xtp-1.6.1 b/metadata/md5-cache/sci-chemistry/votca-xtp-1.6.1
new file mode 100644
index 000000000000..b42197a2f6f7
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/votca-xtp-1.6.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=~sci-libs/votca-tools-1.6.1 >=dev-cpp/eigen-3.3 sci-libs/hdf5[cxx] ~sci-chemistry/votca-csg-1.6.1 sci-libs/libxc virtual/pkgconfig
+DESCRIPTION=Votca excitation and charge properties module
+EAPI=7
+HOMEPAGE=http://www.votca.org
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-macos
+LICENSE=Apache-2.0
+RDEPEND=~sci-libs/votca-tools-1.6.1 >=dev-cpp/eigen-3.3 sci-libs/hdf5[cxx] ~sci-chemistry/votca-csg-1.6.1 sci-libs/libxc
+SLOT=0
+SRC_URI=https://github.com/votca/xtp/archive/v1.6.1.tar.gz -> votca-xtp-1.6.1.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8b967f9b32be9a00f7419e84d4d6869b
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 4f5b8ada7494..d1982b9fa1aa 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/gsmc-1.1-r2 b/metadata/md5-cache/sci-electronics/gsmc-1.1-r2
index 948691e1b34f..5b3731c5d0f6 100644
--- a/metadata/md5-cache/sci-electronics/gsmc-1.1-r2
+++ b/metadata/md5-cache/sci-electronics/gsmc-1.1-r2
@@ -2,11 +2,11 @@ DEFINED_PHASES=install prepare
 DEPEND=dev-libs/glib:2 x11-libs/gtk+: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
 DESCRIPTION=A GTK program for doing Smith Chart calculations
 EAPI=5
-HOMEPAGE=http://www.qsl.net/ik5nax/
+HOMEPAGE=https://www.qsl.net/ik5nax/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2
 SLOT=0
-SRC_URI=http://www.qsl.net/ik5nax/gsmc-1.1.tar.gz
+SRC_URI=https://www.qsl.net/ik5nax/gsmc-1.1.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=869908f54346c91df5acb86902e0d428
+_md5_=8e45d951acbfdd94bea5aa0b392a88e9
diff --git a/metadata/md5-cache/sci-electronics/iverilog-10.3 b/metadata/md5-cache/sci-electronics/iverilog-10.3
index a6443029a782..7766fb5801fa 100644
--- a/metadata/md5-cache/sci-electronics/iverilog-10.3
+++ b/metadata/md5-cache/sci-electronics/iverilog-10.3
@@ -5,10 +5,10 @@ DESCRIPTION=A Verilog simulation and synthesis tool
 EAPI=7
 HOMEPAGE=http://iverilog.icarus.com https://github.com/steveicarus/iverilog
 IUSE=examples
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=sys-libs/readline:0 sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/steveicarus/iverilog/archive/v10_3.tar.gz -> iverilog-10.3.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ce1ca6689b0029e205a16889236e7cbc
+_md5_=e0d0d3128769a8fc437c0841081f815c
diff --git a/metadata/md5-cache/sci-electronics/splat-1.4.2 b/metadata/md5-cache/sci-electronics/splat-1.4.2
index b57f62af2d95..232e83d54781 100644
--- a/metadata/md5-cache/sci-electronics/splat-1.4.2
+++ b/metadata/md5-cache/sci-electronics/splat-1.4.2
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install postinst prepare
 DEPEND=sys-libs/zlib app-arch/bzip2
 DESCRIPTION=RF Signal Propagation, Loss, And Terrain analysis tool
 EAPI=5
-HOMEPAGE=http://www.qsl.net/kd2bd/splat.html
+HOMEPAGE=https://www.qsl.net/kd2bd/splat.html
 IUSE=doc hires l10n_es
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib app-arch/bzip2
 SLOT=0
-SRC_URI=http://www.qsl.net/kd2bd/splat-1.4.2.tar.bz2
+SRC_URI=https://www.qsl.net/kd2bd/splat-1.4.2.tar.bz2
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8f2daf63589a1ed8640aba076d73a5d8
+_md5_=5c1528066aac99cb6d9552eb53e246ff
diff --git a/metadata/md5-cache/sci-electronics/systemc-2.3.1-r1 b/metadata/md5-cache/sci-electronics/systemc-2.3.1-r1
index 38f3bba05483..43d56f65e204 100644
--- a/metadata/md5-cache/sci-electronics/systemc-2.3.1-r1
+++ b/metadata/md5-cache/sci-electronics/systemc-2.3.1-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=>=app-portage/elt-patches-20170815
 DESCRIPTION=A C++ based modeling platform for VLSI and system-level co-design
 EAPI=5
-HOMEPAGE=http://accellera.org/community/systemc
+HOMEPAGE=https://accellera.org/community/systemc
 IUSE=doc static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
-SRC_URI=http://accellera.org/images/downloads/standards/systemc/systemc-2.3.1a.tar.gz
+SRC_URI=https://accellera.org/images/downloads/standards/systemc/systemc-2.3.1a.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1f16194e48784367597409faab2bdf3e
+_md5_=12db56edd89929849a69c58afe6a9a45
diff --git a/metadata/md5-cache/sci-electronics/voacapl-0.6.7 b/metadata/md5-cache/sci-electronics/voacapl-0.6.7
index cb9ac01783e5..d7f56b409d33 100644
--- a/metadata/md5-cache/sci-electronics/voacapl-0.6.7
+++ b/metadata/md5-cache/sci-electronics/voacapl-0.6.7
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install setup
 DEPEND=virtual/fortran
 DESCRIPTION=HF propagation prediction tool
 EAPI=5
-HOMEPAGE=http://www.qsl.net/hz1jw/voacapl/index.html
+HOMEPAGE=https://www.qsl.net/hz1jw/voacapl/index.html
 KEYWORDS=amd64 x86
 LICENSE=all-rights-reserved
 RDEPEND=virtual/fortran
 RESTRICT=mirror bindist
 SLOT=0
-SRC_URI=http://www.qsl.net/hz1jw/voacapl/downloads/voacapl-0.6.7.tar.gz
+SRC_URI=https://www.qsl.net/hz1jw/voacapl/downloads/voacapl-0.6.7.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9ce87f9be181824faeefb2036204462c
+_md5_=e901904d9521b782a3cd32dc7f2ab874
diff --git a/metadata/md5-cache/sci-electronics/voacapl-0.7.2 b/metadata/md5-cache/sci-electronics/voacapl-0.7.2
index 99e388f5eed1..9e79f90d4258 100644
--- a/metadata/md5-cache/sci-electronics/voacapl-0.7.2
+++ b/metadata/md5-cache/sci-electronics/voacapl-0.7.2
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile setup
 DEPEND=virtual/fortran
 DESCRIPTION=HF propagation prediction tool
 EAPI=6
-HOMEPAGE=http://www.qsl.net/hz1jw/voacapl/index.html
+HOMEPAGE=https://www.qsl.net/hz1jw/voacapl/index.html
 KEYWORDS=amd64 x86
 LICENSE=all-rights-reserved
 RDEPEND=virtual/fortran
 RESTRICT=mirror bindist
 SLOT=0
-SRC_URI=http://www.qsl.net/hz1jw/voacapl/downloads/voacapl-0.7.2.tar.gz
+SRC_URI=https://www.qsl.net/hz1jw/voacapl/downloads/voacapl-0.7.2.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=58d73bc7114b5f826228f143b2937f55
+_md5_=676fd7e5a8e4c325c5d71a254d233c6e
diff --git a/metadata/md5-cache/sci-electronics/xnec2c-3.5.1 b/metadata/md5-cache/sci-electronics/xnec2c-3.5.1
index 942cd6a97f60..709425408165 100644
--- a/metadata/md5-cache/sci-electronics/xnec2c-3.5.1
+++ b/metadata/md5-cache/sci-electronics/xnec2c-3.5.1
@@ -2,12 +2,12 @@ DEFINED_PHASES=install prepare
 DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 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 GTK+ graphical interactive version of nec2c
 EAPI=5
-HOMEPAGE=http://www.qsl.net/5b4az/pages/nec2.html
+HOMEPAGE=https://www.qsl.net/5b4az/pages/nec2.html
 IUSE=doc examples
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2
 SLOT=0
-SRC_URI=http://www.qsl.net/5b4az/pkg/nec2/xnec2c/xnec2c-3.5.1.tar.bz2
+SRC_URI=https://www.qsl.net/5b4az/pkg/nec2/xnec2c/xnec2c-3.5.1.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=945712d767b735dcbd169f132fd9ac1b
+_md5_=8acf76a275a215f872a67f6efcc96cc0
diff --git a/metadata/md5-cache/sci-electronics/xoscope-2.0 b/metadata/md5-cache/sci-electronics/xoscope-2.0
index 09d8bb78aa6b..15b5a7028a30 100644
--- a/metadata/md5-cache/sci-electronics/xoscope-2.0
+++ b/metadata/md5-cache/sci-electronics/xoscope-2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtkdatabox virtual/man
 SLOT=0
 SRC_URI=mirror://sourceforge/xoscope/xoscope-2.0.tgz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f2cc7edba870b275f753c28ea6580396
diff --git a/metadata/md5-cache/sci-electronics/xoscope-2.1 b/metadata/md5-cache/sci-electronics/xoscope-2.1
index 4b2db4383838..8e7ef89a437c 100644
--- a/metadata/md5-cache/sci-electronics/xoscope-2.1
+++ b/metadata/md5-cache/sci-electronics/xoscope-2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtkdatabox virtual/man
 SLOT=0
 SRC_URI=mirror://sourceforge/project/xoscope/xoscope/2.1/xoscope-2.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b38c3cd82d22a53adb061d70ba604a62
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index b32edc76ac15..719e3879359a 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/osm-gps-map-1.1.0 b/metadata/md5-cache/sci-geosciences/osm-gps-map-1.1.0
index 89acbd3d5564..bec2ddfc974b 100644
--- a/metadata/md5-cache/sci-geosciences/osm-gps-map-1.1.0
+++ b/metadata/md5-cache/sci-geosciences/osm-gps-map-1.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=A GTK+ widget for displaying OpenStreetMap tiles
 EAPI=6
 HOMEPAGE=https://nzjrs.github.io/osm-gps-map/
 IUSE=static-libs
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.16.0:2 >=net-libs/libsoup-2.4.0:2.4 >=x11-libs/cairo-1.8.0 >=x11-libs/gtk+-3.0:3[introspection] dev-libs/gobject-introspection
 SLOT=0
 SRC_URI=https://github.com/nzjrs/osm-gps-map/releases/download/1.1.0/osm-gps-map-1.1.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3814ef1e72911a80dcfff4f31aec165d
+_md5_=5b370f433259ced955630d7b98c18e1e
diff --git a/metadata/md5-cache/sci-geosciences/qgis-3.10.3 b/metadata/md5-cache/sci-geosciences/qgis-3.10.3
deleted file mode 100644
index 8cc72fc52a5f..000000000000
--- a/metadata/md5-cache/sci-geosciences/qgis-3.10.3
+++ /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-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_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-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
-SRC_URI=https://qgis.org/downloads/qgis-3.10.3.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f4fcb115e33abde2ad220b3d89828582
diff --git a/metadata/md5-cache/sci-geosciences/qgis-3.10.7 b/metadata/md5-cache/sci-geosciences/qgis-3.10.7
new file mode 100644
index 000000000000..3d74df51274e
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/qgis-3.10.7
@@ -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-3.0.4:=[geos] sci-libs/geos sci-libs/libspatialindex:= >=sci-libs/proj-6.3.1:= >=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/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/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/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 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-3.0.4:=[geos] sci-libs/geos sci-libs/libspatialindex:= >=sci-libs/proj-6.3.1:= >=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/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/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/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.7.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=44ef409f9146923758dd31c2462fa5b8
diff --git a/metadata/md5-cache/sci-geosciences/qgis-9999 b/metadata/md5-cache/sci-geosciences/qgis-9999
index df68e6c6b196..58103e44d1e5 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] ) 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
+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-6.3.1:= >=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/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/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/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 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
 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] ) 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
+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-6.3.1:= >=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/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/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/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	19b0421555865baefd505831dd4303e3	desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f4fcb115e33abde2ad220b3d89828582
+_md5_=44ef409f9146923758dd31c2462fa5b8
diff --git a/metadata/md5-cache/sci-geosciences/qmapshack-1.15.0 b/metadata/md5-cache/sci-geosciences/qmapshack-1.15.0
new file mode 100644
index 000000000000..db16db90da65
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/qmapshack-1.15.0
@@ -0,0 +1,13 @@
+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-qt/qthelp:5 dev-libs/quazip >=sci-geosciences/routino-3.1.1 sci-libs/gdal >=sci-libs/proj-6.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://github.com/Maproom/qmapshack/wiki
+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-qt/qthelp:5 dev-libs/quazip >=sci-geosciences/routino-3.1.1 sci-libs/gdal >=sci-libs/proj-6.0.0:= sci-libs/alglib
+SLOT=0
+SRC_URI=https://github.com/Maproom/qmapshack/archive/V_1.15.0.tar.gz -> qmapshack-1.15.0.tar.gz
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=86e5c32c3f9e872f13a64105f3d21613
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 60efc5a6ee85..b5a9dc1c300a 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/ViSP-3.2.0-r2 b/metadata/md5-cache/sci-libs/ViSP-3.2.0-r2
deleted file mode 100644
index 3349d38d7d18..000000000000
--- a/metadata/md5-cache/sci-libs/ViSP-3.2.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=coin? ( >=media-libs/coin-4 virtual/opengl ) dmtx? ( media-libs/libdmtx ) gsl? ( sci-libs/gsl ) ieee1394? ( media-libs/libdc1394 ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack ) motif? ( media-libs/SoXt ) ogre? ( dev-games/ogre[ois(+)] dev-libs/boost:=[threads] ) opencv? ( media-libs/opencv:=[contribdnn(+)] ) png? ( media-libs/libpng:0= ) usb? ( virtual/libusb:1 ) v4l? ( media-libs/libv4l ) X? ( x11-libs/libX11 ) xml? ( dev-libs/libxml2 ) zbar? ( media-gfx/zbar ) zlib? ( sys-libs/zlib ) virtual/pkgconfig doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz ) test? ( sci-misc/ViSP-images ) v4l? ( virtual/os-headers ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Visual Servoing Platform: visual tracking and visual servoing library
-EAPI=5
-HOMEPAGE=http://www.irisa.fr/lagadic/visp/visp.html
-IUSE=+coin demos +dmtx doc examples gsl ieee1394 jpeg lapack motif ogre opencv png test tutorials usb v4l X xml +zbar zlib cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3
-KEYWORDS=~amd64 ~arm
-LICENSE=GPL-2
-RDEPEND=coin? ( >=media-libs/coin-4 virtual/opengl ) dmtx? ( media-libs/libdmtx ) gsl? ( sci-libs/gsl ) ieee1394? ( media-libs/libdc1394 ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack ) motif? ( media-libs/SoXt ) ogre? ( dev-games/ogre[ois(+)] dev-libs/boost:=[threads] ) opencv? ( media-libs/opencv:=[contribdnn(+)] ) png? ( media-libs/libpng:0= ) usb? ( virtual/libusb:1 ) v4l? ( media-libs/libv4l ) X? ( x11-libs/libX11 ) xml? ( dev-libs/libxml2 ) zbar? ( media-gfx/zbar ) zlib? ( sys-libs/zlib ) demos? ( sci-misc/ViSP-images )
-REQUIRED_USE=motif? ( coin )
-RESTRICT=!test? ( test )
-SLOT=0/3.2
-SRC_URI=http://gforge.inria.fr/frs/download.php/latestfile/475/visp-3.2.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5d29370dad69ec2ae375840fbbac83b7
diff --git a/metadata/md5-cache/sci-libs/ViSP-3.3.0 b/metadata/md5-cache/sci-libs/ViSP-3.3.0
index 5045d4e4d137..2142ab1de0d2 100644
--- a/metadata/md5-cache/sci-libs/ViSP-3.3.0
+++ b/metadata/md5-cache/sci-libs/ViSP-3.3.0
@@ -1,9 +1,9 @@
-BDEPEND=virtual/pkgconfig test? ( sci-misc/ViSP-images ) doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz ) dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=virtual/pkgconfig test? ( sci-misc/ViSP-images ) doc? ( app-doc/doxygen media-gfx/graphviz virtual/latex-base ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=coin? ( >=media-libs/coin-4 virtual/opengl ) dmtx? ( media-libs/libdmtx ) gsl? ( sci-libs/gsl ) ieee1394? ( media-libs/libdc1394 ) jpeg? ( virtual/jpeg:0 ) motif? ( media-libs/SoXt ) ogre? ( dev-games/ogre[ois(+)] dev-libs/boost:=[threads] ) opencv? ( media-libs/opencv:=[contribdnn(+)] ) pcl? ( sci-libs/pcl:= ) png? ( media-libs/libpng:0= ) usb? ( virtual/libusb:1 ) v4l? ( media-libs/libv4l ) X? ( x11-libs/libX11 ) xml? ( dev-libs/libxml2 ) zbar? ( media-gfx/zbar ) zlib? ( sys-libs/zlib ) v4l? ( virtual/os-headers )
 DESCRIPTION=Visual Servoing Platform: visual tracking and visual servoing library
 EAPI=7
-HOMEPAGE=http://www.irisa.fr/lagadic/visp/visp.html
+HOMEPAGE=https://visp.inria.fr/
 IUSE=+coin demos +dmtx doc examples gsl ieee1394 jpeg motif ogre opencv pcl png test tutorials usb v4l X xml +zbar zlib cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-2
@@ -12,5 +12,5 @@ REQUIRED_USE=motif? ( coin )
 RESTRICT=!test? ( test )
 SLOT=0/3.3
 SRC_URI=http://gforge.inria.fr/frs/download.php/latestfile/475/visp-3.3.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=648d4210abdb2675cd0a70f4da1ad814
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7396270106492ec0e15158ef8dfefb47
diff --git a/metadata/md5-cache/sci-libs/amd-2.4.6 b/metadata/md5-cache/sci-libs/amd-2.4.6
index 073cb6e60fcf..804305bcfb3d 100644
--- a/metadata/md5-cache/sci-libs/amd-2.4.6
+++ b/metadata/md5-cache/sci-libs/amd-2.4.6
@@ -5,10 +5,10 @@ DESCRIPTION=Library to order a sparse matrix prior to Cholesky factorization
 EAPI=7
 HOMEPAGE=http://faculty.cse.tamu.edu/davis/suitesparse.html
 IUSE=doc fortran static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=BSD
 RDEPEND=virtual/fortran
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/amd-2.4.6.tar.bz2
 _eclasses_=fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=45036e1df46463c84bc69af5fe4e1f2c
+_md5_=61c9b4c9d31653af9381c7332a086381
diff --git a/metadata/md5-cache/sci-libs/btf-1.2.6 b/metadata/md5-cache/sci-libs/btf-1.2.6
index 7408006f745f..643cc41fe3e1 100644
--- a/metadata/md5-cache/sci-libs/btf-1.2.6
+++ b/metadata/md5-cache/sci-libs/btf-1.2.6
@@ -5,9 +5,9 @@ DESCRIPTION=Algorithm for matrix permutation into block triangular form
 EAPI=7
 HOMEPAGE=http://faculty.cse.tamu.edu/davis/suitesparse.html
 IUSE=static-libs
-KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 arm64 ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=LGPL-2.1+
 RDEPEND=sci-libs/suitesparseconfig
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/btf-1.2.6.tar.bz2
-_md5_=f058d8e60268a89395092777bfc22219
+_md5_=42ebf414cc6ac418845373b8fae9b8f6
diff --git a/metadata/md5-cache/sci-libs/camd-2.4.6 b/metadata/md5-cache/sci-libs/camd-2.4.6
index df6cb0214da9..189154de8479 100644
--- a/metadata/md5-cache/sci-libs/camd-2.4.6
+++ b/metadata/md5-cache/sci-libs/camd-2.4.6
@@ -5,9 +5,9 @@ DESCRIPTION=Library to order a sparse matrix prior to Cholesky factorization
 EAPI=7
 HOMEPAGE=http://faculty.cse.tamu.edu/davis/suitesparse.html
 IUSE=doc static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=BSD
 RDEPEND=>=sci-libs/suitesparseconfig-5.4.0
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/camd-2.4.6.tar.bz2
-_md5_=d6d7da5e179ace219be81823f197bf65
+_md5_=954e72cd0302239812ac85c150cbfcc9
diff --git a/metadata/md5-cache/sci-libs/ccolamd-2.9.6 b/metadata/md5-cache/sci-libs/ccolamd-2.9.6
index 9d658c31827e..681673e6e6ad 100644
--- a/metadata/md5-cache/sci-libs/ccolamd-2.9.6
+++ b/metadata/md5-cache/sci-libs/ccolamd-2.9.6
@@ -5,9 +5,9 @@ DESCRIPTION=Constrained Column approximate minimum degree ordering algorithm
 EAPI=7
 HOMEPAGE=http://faculty.cse.tamu.edu/davis/suitesparse.html
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=BSD
 RDEPEND=sci-libs/suitesparseconfig
 SLOT=0
 SRC_URI=http://202.36.178.9/sage//ccolamd-2.9.6.tar.bz2
-_md5_=3e4991c349d0d5283e13aa686a9dd256
+_md5_=cf8b78442c39b40a96462e27fd363dbd
diff --git a/metadata/md5-cache/sci-libs/cholmod-3.0.13 b/metadata/md5-cache/sci-libs/cholmod-3.0.13
index 42d0d0c4e84b..67152af93f31 100644
--- a/metadata/md5-cache/sci-libs/cholmod-3.0.13
+++ b/metadata/md5-cache/sci-libs/cholmod-3.0.13
@@ -5,10 +5,10 @@ DESCRIPTION=Sparse Cholesky factorization and update/downdate library
 EAPI=7
 HOMEPAGE=http://faculty.cse.tamu.edu/davis/suitesparse.html
 IUSE=cuda doc +lapack +matrixops +modify +partition static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=LGPL-2.1+ modify? ( GPL-2+ ) matrixops? ( GPL-2+ )
 RDEPEND=>=sci-libs/amd-2.4 >=sci-libs/colamd-2.9 cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) lapack? ( virtual/lapack ) partition? ( >=sci-libs/camd-2.4 >=sci-libs/ccolamd-2.9 || ( >=sci-libs/metis-5.1.0 sci-libs/parmetis ) )
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/cholmod-3.0.13.tar.bz2
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3e78fe44b629ac3d6d1b128643834016
+_md5_=4e8b2ecab2e5043e2be085af0e53c9aa
diff --git a/metadata/md5-cache/sci-libs/colamd-2.9.6 b/metadata/md5-cache/sci-libs/colamd-2.9.6
index 9ec90e788635..46759a7417bf 100644
--- a/metadata/md5-cache/sci-libs/colamd-2.9.6
+++ b/metadata/md5-cache/sci-libs/colamd-2.9.6
@@ -5,9 +5,9 @@ DESCRIPTION=Column approximate minimum degree ordering algorithm
 EAPI=7
 HOMEPAGE=http://faculty.cse.tamu.edu/davis/suitesparse.html
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=BSD
 RDEPEND=>=sci-libs/suitesparseconfig-5.4.0
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/colamd-2.9.6.tar.bz2
-_md5_=0905fefdbed6734d365379dcfed08fde
+_md5_=fa6e2f12ea66d9b65d71eab2e4381c30
diff --git a/metadata/md5-cache/sci-libs/cxsparse-3.2.0 b/metadata/md5-cache/sci-libs/cxsparse-3.2.0
index 548502e8c23e..f9bc2cde9695 100644
--- a/metadata/md5-cache/sci-libs/cxsparse-3.2.0
+++ b/metadata/md5-cache/sci-libs/cxsparse-3.2.0
@@ -5,10 +5,10 @@ DESCRIPTION=Extended sparse matrix package
 EAPI=7
 HOMEPAGE=http://faculty.cse.tamu.edu/davis/suitesparse.html
 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=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=LGPL-2.1+
 RDEPEND=>=sci-libs/suitesparseconfig-5.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(-)?]
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/cxsparse-3.2.0.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=90d610bb9c71ce4a16877de2e2d16c01
+_md5_=5887ed613af8ef1dde66ceb8a6342dd5
diff --git a/metadata/md5-cache/sci-libs/hdf-4.2.11 b/metadata/md5-cache/sci-libs/hdf-4.2.11
index 8d8c64d9e592..6a36143735be 100644
--- a/metadata/md5-cache/sci-libs/hdf-4.2.11
+++ b/metadata/md5-cache/sci-libs/hdf-4.2.11
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install prepare setup
 DEPEND=sys-libs/zlib virtual/jpeg:0 szip? ( virtual/szip ) test? ( virtual/szip ) fortran? ( virtual/fortran ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=General purpose library and format for storing scientific data
 EAPI=6
-HOMEPAGE=http://www.hdfgroup.org/hdf4.html
+HOMEPAGE=https://www.hdfgroup.org/hdf4.html
 IUSE=examples fortran szip static-libs test
 KEYWORDS=~amd64 ~ia64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=NCSA-HDF
@@ -10,6 +10,6 @@ RDEPEND=sys-libs/zlib virtual/jpeg:0 szip? ( virtual/szip ) fortran? ( virtual/f
 REQUIRED_USE=test? ( szip )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/hdf-4.2.11.tar.bz2
+SRC_URI=https://www.hdfgroup.org/ftp/HDF/HDF_Current/src/hdf-4.2.11.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bbea96c19e7f656f7a6fbf79a0b278c0
+_md5_=93d6d7e4c227c8a26c7a719e95f5bb56
diff --git a/metadata/md5-cache/sci-libs/hdf-4.2.13 b/metadata/md5-cache/sci-libs/hdf-4.2.13
index 9616c2452581..97b26d6dd8cc 100644
--- a/metadata/md5-cache/sci-libs/hdf-4.2.13
+++ b/metadata/md5-cache/sci-libs/hdf-4.2.13
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install prepare setup
 DEPEND=sys-libs/zlib virtual/jpeg:0 szip? ( virtual/szip ) test? ( virtual/szip ) fortran? ( virtual/fortran ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=General purpose library and format for storing scientific data
 EAPI=6
-HOMEPAGE=http://www.hdfgroup.org/hdf4.html
+HOMEPAGE=https://www.hdfgroup.org/hdf4.html
 IUSE=examples fortran szip static-libs test
 KEYWORDS=~amd64 ~ia64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=NCSA-HDF
@@ -10,6 +10,6 @@ RDEPEND=sys-libs/zlib virtual/jpeg:0 szip? ( virtual/szip ) fortran? ( virtual/f
 REQUIRED_USE=test? ( szip )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/hdf-4.2.13.tar.bz2
+SRC_URI=https://www.hdfgroup.org/ftp/HDF/HDF_Current/src/hdf-4.2.13.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f518128fba4fb3c0ea4947abfa7b5888
+_md5_=58c263fa01ec7c15dcd32f0e630f26b2
diff --git a/metadata/md5-cache/sci-libs/hdf-4.2.13-r1 b/metadata/md5-cache/sci-libs/hdf-4.2.13-r1
index 81e89beff136..d82e4e30f578 100644
--- a/metadata/md5-cache/sci-libs/hdf-4.2.13-r1
+++ b/metadata/md5-cache/sci-libs/hdf-4.2.13-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install prepare setup
 DEPEND=net-libs/libtirpc sys-libs/zlib virtual/jpeg:0 szip? ( virtual/szip ) test? ( virtual/szip ) fortran? ( virtual/fortran ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=General purpose library and format for storing scientific data
 EAPI=6
-HOMEPAGE=http://www.hdfgroup.org/hdf4.html
+HOMEPAGE=https://www.hdfgroup.org/hdf4.html
 IUSE=examples fortran szip static-libs test
 KEYWORDS=amd64 ~ia64 ppc -sparc x86 ~amd64-linux ~x86-linux
 LICENSE=NCSA-HDF
@@ -10,6 +10,6 @@ RDEPEND=net-libs/libtirpc sys-libs/zlib virtual/jpeg:0 szip? ( virtual/szip ) fo
 REQUIRED_USE=test? ( szip )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/hdf-4.2.13.tar.bz2
+SRC_URI=https://www.hdfgroup.org/ftp/HDF/HDF_Current/src/hdf-4.2.13.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6031f53bb0d23f926bc742c430ce06ee
+_md5_=e392f8260a1e37f19c58e388c26cd1a5
diff --git a/metadata/md5-cache/sci-libs/hdf5-1.10.5 b/metadata/md5-cache/sci-libs/hdf5-1.10.5
index e1891e561469..f8610ace62c3 100644
--- a/metadata/md5-cache/sci-libs/hdf5-1.10.5
+++ b/metadata/md5-cache/sci-libs/hdf5-1.10.5
@@ -3,13 +3,13 @@ DEFINED_PHASES=configure install prepare setup
 DEPEND=mpi? ( virtual/mpi[romio] ) szip? ( virtual/szip ) zlib? ( sys-libs/zlib:0= ) sys-devel/libtool:2 >=sys-devel/autoconf-2.69 fortran? ( virtual/fortran )
 DESCRIPTION=General purpose library and file format for storing scientific data
 EAPI=7
-HOMEPAGE=http://www.hdfgroup.org/HDF5/
+HOMEPAGE=https://www.hdfgroup.org/HDF5/
 IUSE=cxx debug examples fortran +hl mpi szip threads zlib
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=NCSA-HDF
 RDEPEND=mpi? ( virtual/mpi[romio] ) szip? ( virtual/szip ) zlib? ( sys-libs/zlib:0= ) fortran? ( virtual/fortran )
 REQUIRED_USE=cxx? ( !mpi ) mpi? ( !cxx ) threads? ( !cxx !mpi !fortran !hl )
 SLOT=0/1.10.5
-SRC_URI=http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.5/src/hdf5-1.10.5.tar.bz2
+SRC_URI=https://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.5/src/hdf5-1.10.5.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=26f27f482cb653a74ada5d92981a79db
+_md5_=5be849262642b75aba61cacea83f2da8
diff --git a/metadata/md5-cache/sci-libs/hdf5-1.10.5-r1 b/metadata/md5-cache/sci-libs/hdf5-1.10.5-r1
index d5274e46dee7..db569b2db94c 100644
--- a/metadata/md5-cache/sci-libs/hdf5-1.10.5-r1
+++ b/metadata/md5-cache/sci-libs/hdf5-1.10.5-r1
@@ -3,13 +3,13 @@ DEFINED_PHASES=configure install prepare setup
 DEPEND=mpi? ( virtual/mpi[romio] ) szip? ( virtual/szip ) zlib? ( sys-libs/zlib:0= ) sys-devel/libtool:2 >=sys-devel/autoconf-2.69 fortran? ( virtual/fortran )
 DESCRIPTION=General purpose library and file format for storing scientific data
 EAPI=7
-HOMEPAGE=http://www.hdfgroup.org/HDF5/
+HOMEPAGE=https://www.hdfgroup.org/HDF5/
 IUSE=cxx debug examples fortran +hl mpi szip threads unsupported zlib
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=NCSA-HDF
 RDEPEND=mpi? ( virtual/mpi[romio] ) szip? ( virtual/szip ) zlib? ( sys-libs/zlib:0= ) fortran? ( virtual/fortran )
 REQUIRED_USE=!unsupported? ( ?? ( cxx mpi ) threads? ( !cxx !mpi !fortran !hl ) )
 SLOT=0/1.10.5
-SRC_URI=http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.5/src/hdf5-1.10.5.tar.bz2
+SRC_URI=https://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.5/src/hdf5-1.10.5.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ac275b146bd69ab5741b60aad5e30254
+_md5_=22172d69332f7dfff6e9c2b1ac9b536f
diff --git a/metadata/md5-cache/sci-libs/klu-1.3.9 b/metadata/md5-cache/sci-libs/klu-1.3.9
index 41f83848cbb5..20a3516f5b02 100644
--- a/metadata/md5-cache/sci-libs/klu-1.3.9
+++ b/metadata/md5-cache/sci-libs/klu-1.3.9
@@ -5,9 +5,9 @@ DESCRIPTION=Sparse LU factorization for circuit simulation
 EAPI=7
 HOMEPAGE=http://faculty.cse.tamu.edu/davis/suitesparse.html
 IUSE=doc static-libs
-KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm64 ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=sci-libs/amd-2.4 >=sci-libs/btf-1.2 >=sci-libs/colamd-2.9
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/klu-1.3.9.tar.bz2
-_md5_=320d3875413b7a452613f3246b6c1bbd
+_md5_=aba15a233734f73392f4422d597d7be0
diff --git a/metadata/md5-cache/sci-libs/ldl-2.2.6 b/metadata/md5-cache/sci-libs/ldl-2.2.6
index 1aa3a48733a6..2279b6e4b130 100644
--- a/metadata/md5-cache/sci-libs/ldl-2.2.6
+++ b/metadata/md5-cache/sci-libs/ldl-2.2.6
@@ -5,9 +5,9 @@ DESCRIPTION=Simple but educational LDL^T matrix factorization algorithm
 EAPI=7
 HOMEPAGE=http://faculty.cse.tamu.edu/davis/suitesparse.html
 IUSE=doc static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=LGPL-2.1+
 RDEPEND=sci-libs/suitesparseconfig
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/ldl-2.2.6.tar.bz2
-_md5_=5a017cd46f0e9fdde7ed4aec7f3c294c
+_md5_=52dfaf6a31caf31716c90978cbecfd2e
diff --git a/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.0 b/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.0
index a1b27a4dc68d..81f721d7ee57 100644
--- a/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.0
+++ b/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=acct-group/gpib !<sci-libs/linux-gpib-4.2.0_rc1 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-gpib/linux-gpib-4.3.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=18f47e78380ba322523525e0a2830b14
diff --git a/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.2 b/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.2
index e65e1ebbe7f4..d53013b591fe 100644
--- a/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.2
+++ b/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=acct-group/gpib !<sci-libs/linux-gpib-4.2.0_rc1 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-gpib/linux-gpib-4.3.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=074727bb4d7f5f5d0a7b4e30fb0b2121
diff --git a/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.3 b/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.3
index 4dc66908a21f..12dae5c33ac8 100644
--- a/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.3
+++ b/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=acct-group/gpib !<sci-libs/linux-gpib-4.2.0_rc1 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-gpib/linux-gpib-4.3.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9b1e3b312629d080f73125d3d932c3ec
diff --git a/metadata/md5-cache/sci-libs/metis-5.1.0-r4 b/metadata/md5-cache/sci-libs/metis-5.1.0-r4
index 020db9891700..1d68ddfc8de7 100644
--- a/metadata/md5-cache/sci-libs/metis-5.1.0-r4
+++ b/metadata/md5-cache/sci-libs/metis-5.1.0-r4
@@ -5,10 +5,10 @@ DESCRIPTION=A package for unstructured serial graph partitioning
 EAPI=7
 HOMEPAGE=http://www-users.cs.umn.edu/~karypis/metis/metis/
 IUSE=doc openmp
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=!sci-libs/parmetis virtual/fortran
 SLOT=0
 SRC_URI=http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=89df8aec9f12e92090c6ecad25032656
+_md5_=17b2a64a597651a2e6c9196109fa8e11
diff --git a/metadata/md5-cache/sci-libs/mpir-3.0.0 b/metadata/md5-cache/sci-libs/mpir-3.0.0
index 34450404665c..27b2ef87cc38 100644
--- a/metadata/md5-cache/sci-libs/mpir-3.0.0
+++ b/metadata/md5-cache/sci-libs/mpir-3.0.0
@@ -9,4 +9,4 @@ LICENSE=LGPL-3
 SLOT=0/23
 SRC_URI=http://www.mpir.org/mpir-3.0.0.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=918a3af96d1216fe5d83cc94492bd57c
+_md5_=f352a8d2f436625062481d17b642d628
diff --git a/metadata/md5-cache/sci-libs/nlopt-2.6.2 b/metadata/md5-cache/sci-libs/nlopt-2.6.2
index cbda0eb6af0f..4516d91df6d2 100644
--- a/metadata/md5-cache/sci-libs/nlopt-2.6.2
+++ b/metadata/md5-cache/sci-libs/nlopt-2.6.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=guile? ( dev-scheme/guile:* ) octave? ( sci-mathematics/octave ) 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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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_9(-)?,-python_single_target_python3_9(-)] ) 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_9(-)?,-python_single_target_python3_9(-)] ) 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(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( 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_9(-)?,-python_single_target_python3_9(-)] ) ) python? ( dev-lang/swig )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=guile? ( dev-scheme/guile:* ) octave? ( sci-mathematics/octave ) 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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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_9(-)?,-python_single_target_python3_9(-)] ) 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_9(-)?,-python_single_target_python3_9(-)] ) 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(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( 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_9(-)?,-python_single_target_python3_9(-)] ) ) python? ( dev-lang/swig ) virtual/fortran
 DESCRIPTION=Non-linear optimization library
 EAPI=7
 HOMEPAGE=https://ab-initio.mit.edu/nlopt/
 IUSE=cxx guile octave python static-libs test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1 MIT
-RDEPEND=guile? ( dev-scheme/guile:* ) octave? ( sci-mathematics/octave ) 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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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_9(-)?,-python_single_target_python3_9(-)] ) 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_9(-)?,-python_single_target_python3_9(-)] ) 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(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( 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_9(-)?,-python_single_target_python3_9(-)] ) )
+RDEPEND=guile? ( dev-scheme/guile:* ) octave? ( sci-mathematics/octave ) 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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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_9(-)?,-python_single_target_python3_9(-)] ) 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_9(-)?,-python_single_target_python3_9(-)] ) 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(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( 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_9(-)?,-python_single_target_python3_9(-)] ) ) virtual/fortran
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/stevengj/nlopt/archive/v2.6.2.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=32f36efb9808497d74d1a71cbe16460b
+SRC_URI=https://github.com/stevengj/nlopt/archive/v2.6.2.tar.gz -> nlopt-2.6.2.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=231196921158ec546308dfb291971bfe
diff --git a/metadata/md5-cache/sci-libs/nlopt-2.6.2-r1 b/metadata/md5-cache/sci-libs/nlopt-2.6.2-r1
new file mode 100644
index 000000000000..56db2fca97fe
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/nlopt-2.6.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=guile? ( dev-scheme/guile:* ) octave? ( sci-mathematics/octave ) 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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python? ( dev-lang/swig ) virtual/fortran
+DESCRIPTION=Non-linear optimization library
+EAPI=7
+HOMEPAGE=https://ab-initio.mit.edu/nlopt/
+IUSE=cxx guile octave python static-libs test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1 MIT
+RDEPEND=guile? ( dev-scheme/guile:* ) octave? ( sci-mathematics/octave ) 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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) virtual/fortran
+REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/stevengj/nlopt/archive/v2.6.2.tar.gz -> nlopt-2.6.2.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=136e11be324429a14fb97674bb7ae73f
diff --git a/metadata/md5-cache/sci-libs/openblas-0.3.9-r1 b/metadata/md5-cache/sci-libs/openblas-0.3.9-r1
index 39a5359b2261..cb9bc2011457 100644
--- a/metadata/md5-cache/sci-libs/openblas-0.3.9-r1
+++ b/metadata/md5-cache/sci-libs/openblas-0.3.9-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Optimized BLAS library based on GotoBLAS2
 EAPI=7
 HOMEPAGE=http://xianyi.github.com/OpenBLAS/
 IUSE=dynamic eselect-ldso index-64bit openmp pthread test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=eselect-ldso? ( >=app-eselect/eselect-blas-0.2 !app-eselect/eselect-cblas >=app-eselect/eselect-lapack-0.2 ) virtual/fortran
 REQUIRED_USE=?? ( openmp pthread )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xianyi/OpenBLAS/archive/v0.3.9 -> openblas-0.3.9.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=804fbef1b1e4448e683dba3373816d2a
+_md5_=e14d5c0d6fd394938bc43bc2f25c1880
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 02dad572956b..d5c837ca9e6a 100644
--- a/metadata/md5-cache/sci-libs/pgplot-5.2.2-r7
+++ b/metadata/md5-cache/sci-libs/pgplot-5.2.2-r7
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=media-libs/libpng:= x11-libs/libX11:= x11-libs/libXt:= motif? ( x11-libs/motif:= ) tk? ( dev-lang/tk:= ) doc? ( virtual/latex-base ) virtual/fortran
 DESCRIPTION=FORTRAN/C device-independent scientific graphic library
 EAPI=6
-HOMEPAGE=http://www.astro.caltech.edu/~tjp/pgplot/
+HOMEPAGE=https://www.astro.caltech.edu/~tjp/pgplot/
 IUSE=doc motif static-libs tk
 KEYWORDS=amd64 ~arm ~ia64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=free-noncomm
@@ -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	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9855ae916c8c9308fd628827fb98787d
+_md5_=ad6933d687444983e94a0a1b8cc94418
diff --git a/metadata/md5-cache/sci-libs/proj-7.0.0 b/metadata/md5-cache/sci-libs/proj-7.0.0
deleted file mode 100644
index 77def1a6f354..000000000000
--- a/metadata/md5-cache/sci-libs/proj-7.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install unpack
-DEPEND=dev-db/sqlite:3
-DESCRIPTION=PROJ coordinate transformation software
-EAPI=7
-HOMEPAGE=https://proj4.org/
-IUSE=europe static-libs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=MIT
-RDEPEND=dev-db/sqlite:3
-REQUIRED_USE=test? ( !europe )
-RESTRICT=!test? ( test )
-SLOT=0/19
-SRC_URI=https://download.osgeo.org/proj/proj-7.0.0.tar.gz https://download.osgeo.org/proj/proj-datumgrid-1.8.tar.gz europe? ( https://download.osgeo.org/proj/proj-datumgrid-europe-1.6.tar.gz )
-_md5_=0a5612f5ea3417253e26e5c9795c18ee
diff --git a/metadata/md5-cache/sci-libs/proj-7.0.1 b/metadata/md5-cache/sci-libs/proj-7.0.1
new file mode 100644
index 000000000000..8afc3ffbadf0
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/proj-7.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install unpack
+DEPEND=dev-db/sqlite:3 curl? ( net-misc/curl ) tiff? ( media-libs/tiff )
+DESCRIPTION=PROJ coordinate transformation software
+EAPI=7
+HOMEPAGE=https://proj4.org/
+IUSE=curl europe static-libs test +tiff
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=MIT
+RDEPEND=dev-db/sqlite:3 curl? ( net-misc/curl ) tiff? ( media-libs/tiff )
+REQUIRED_USE=test? ( !europe )
+RESTRICT=!test? ( test )
+SLOT=0/19
+SRC_URI=https://download.osgeo.org/proj/proj-7.0.1.tar.gz https://download.osgeo.org/proj/proj-datumgrid-1.8.tar.gz europe? ( https://download.osgeo.org/proj/proj-datumgrid-europe-1.6.tar.gz )
+_md5_=87e38427d0d52da4363fac4669408b5e
diff --git a/metadata/md5-cache/sci-libs/scikits-0.1-r2 b/metadata/md5-cache/sci-libs/scikits-0.1-r2
index 10e3f199f84c..f44ceef490d8 100644
--- a/metadata/md5-cache/sci-libs/scikits-0.1-r2
+++ b/metadata/md5-cache/sci-libs/scikits-0.1-r2
@@ -3,11 +3,11 @@ DESCRIPTION=Common files for python scikits
 EAPI=7
 HOMEPAGE=http://projects.scipy.org/scipy/scikits
 IUSE=examples python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 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 )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikits.example/scikits.example-0.1.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6db123bd941e828ac7e6a0080c6977e9
+_md5_=1a168aa11a4c076bd441da86bde2ae05
diff --git a/metadata/md5-cache/sci-libs/scikits_learn-0.22.2_p1 b/metadata/md5-cache/sci-libs/scikits_learn-0.22.2_p1
index 571b2ad7ee2e..e4a6f96db93f 100644
--- a/metadata/md5-cache/sci-libs/scikits_learn-0.22.2_p1
+++ b/metadata/md5-cache/sci-libs/scikits_learn-0.22.2_p1
@@ -5,7 +5,7 @@ DESCRIPTION=Machine learning library for Python
 EAPI=7
 HOMEPAGE=https://scikit-learn.org/stable/ https://github.com/scikit-learn/scikit-learn
 IUSE=examples test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=BSD
 RDEPEND=dev-python/wheel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] 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(-)] 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/scipy[python_targets_python3_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/scikits[python_targets_python3_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/blas:= virtual/cblas:= python_targets_python3_6? ( dev-lang/python:3.6 ) python_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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/scikit-learn/scikit-learn/archive/0.22.2.post1.tar.gz -> scikits_learn-0.22.2_p1.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0d2c2ce1a9f5884d2f4747ca5a347371
+_md5_=1e5c212835a19d7d9b8992aed4c26391
diff --git a/metadata/md5-cache/sci-libs/scipy-1.1.0 b/metadata/md5-cache/sci-libs/scipy-1.1.0
index 979b286a0f94..b3039a80159f 100644
--- a/metadata/md5-cache/sci-libs/scipy-1.1.0
+++ b/metadata/md5-cache/sci-libs/scipy-1.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Scientific algorithms library for Python
 EAPI=6
 HOMEPAGE=https://www.scipy.org/
 IUSE=doc sparse test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD LGPL-2
 RDEPEND=>=dev-python/numpy-1.10[lapack,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) 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(-)] virtual/fortran 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 )
@@ -12,4 +12,4 @@ 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	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6ee36b9cd5a3d4d34153276749e1d921
+_md5_=0b6994ce3716bc4c8e5bca54f22f4fa1
diff --git a/metadata/md5-cache/sci-libs/scipy-1.5.0 b/metadata/md5-cache/sci-libs/scipy-1.5.0
new file mode 100644
index 000000000000..8aaaeccb5d7d
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/scipy-1.5.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=>=dev-python/numpy-1.10[lapack,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-lang/swig >=dev-python/cython-0.29.13[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-36[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pybind11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] virtual/pkgconfig doc? ( app-arch/unzip ) test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) virtual/fortran 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(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=Scientific algorithms library for Python
+EAPI=6
+HOMEPAGE=https://www.scipy.org/
+IUSE=doc sparse test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=BSD LGPL-2
+RDEPEND=>=dev-python/numpy-1.10[lapack,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] virtual/fortran 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(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/scipy/scipy-1.5.0.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.5.0/scipy-html-1.5.0.zip -> scipy-1.5.0-html.zip https://docs.scipy.org/doc/scipy-1.5.0/scipy-ref-1.5.0.pdf -> scipy-1.5.0-ref.pdf )
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9ad19a5148d36420fa1de801c95f21cb
diff --git a/metadata/md5-cache/sci-libs/spqr-2.0.9 b/metadata/md5-cache/sci-libs/spqr-2.0.9
index de2efedc4ef1..337c404e05d5 100644
--- a/metadata/md5-cache/sci-libs/spqr-2.0.9
+++ b/metadata/md5-cache/sci-libs/spqr-2.0.9
@@ -5,9 +5,9 @@ DESCRIPTION=Multithreaded multifrontal sparse QR factorization library
 EAPI=7
 HOMEPAGE=http://faculty.cse.tamu.edu/davis/suitesparse.html
 IUSE=doc partition static-libs tbb
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=virtual/lapack >=sci-libs/cholmod-2[lapack,partition?] partition? ( >=sci-libs/metis-5.1.0 ) tbb? ( dev-cpp/tbb )
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/spqr-2.0.9.tar.bz2
-_md5_=6ca28e9011fefdbd77c3f506ba632048
+_md5_=93a2cf4d090d3ec9db4aca7fe651bb8a
diff --git a/metadata/md5-cache/sci-libs/suitesparse-5.4.0 b/metadata/md5-cache/sci-libs/suitesparse-5.4.0
index 715fba39567e..476d33993a00 100644
--- a/metadata/md5-cache/sci-libs/suitesparse-5.4.0
+++ b/metadata/md5-cache/sci-libs/suitesparse-5.4.0
@@ -3,8 +3,8 @@ DESCRIPTION=Metapackage for a suite of sparse matrix tools
 EAPI=7
 HOMEPAGE=http://faculty.cse.tamu.edu/davis/suitesparse.html
 IUSE=cuda doc lapack partition tbb
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
 RDEPEND=~sci-libs/suitesparseconfig-5.4.0 ~sci-libs/amd-2.4.6[doc?] ~sci-libs/btf-1.2.6 ~sci-libs/camd-2.4.6[doc?] ~sci-libs/ccolamd-2.9.6 ~sci-libs/cholmod-3.0.13[cuda?,doc?,partition?,lapack?] ~sci-libs/colamd-2.9.6 ~sci-libs/cxsparse-3.2.0 ~sci-libs/klu-1.3.9[doc?] ~sci-libs/ldl-2.2.6[doc?] ~sci-libs/spqr-2.0.9[doc?,partition?,tbb?] ~sci-libs/umfpack-5.7.9[doc?,cholmod]
 SLOT=0
-_md5_=02e8b429ceac3c978bc36fc73e694272
+_md5_=d05abb1072104ef50e6ca83cc80c773d
diff --git a/metadata/md5-cache/sci-libs/suitesparseconfig-5.4.0 b/metadata/md5-cache/sci-libs/suitesparseconfig-5.4.0
index 53d1c4a79838..65dd478c7b2c 100644
--- a/metadata/md5-cache/sci-libs/suitesparseconfig-5.4.0
+++ b/metadata/md5-cache/sci-libs/suitesparseconfig-5.4.0
@@ -3,9 +3,9 @@ DESCRIPTION=Common configurations for all packages in suitesparse
 EAPI=7
 HOMEPAGE=http://faculty.cse.tamu.edu/davis/suitesparse.html
 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/suitesparseconfig-5.4.0.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=af9aed53eb3e35ded4be2ed7161abfb8
+_md5_=c1a496af4b879e14b0a5525c96dbaabf
diff --git a/metadata/md5-cache/sci-libs/szip-2.1-r2 b/metadata/md5-cache/sci-libs/szip-2.1-r2
index 6d838392e143..ecbc5a8facc6 100644
--- a/metadata/md5-cache/sci-libs/szip-2.1-r2
+++ b/metadata/md5-cache/sci-libs/szip-2.1-r2
@@ -1,11 +1,11 @@
 DEFINED_PHASES=configure install
 DESCRIPTION=Extended-Rice lossless compression algorithm implementation
 EAPI=6
-HOMEPAGE=http://www.hdfgroup.org/doc_resource/SZIP/
+HOMEPAGE=https://www.hdfgroup.org/doc_resource/SZIP/
 IUSE=static-libs
 KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=szip
 RDEPEND=!sci-libs/libaec[szip]
 SLOT=0/2
 SRC_URI=ftp://ftp.hdfgroup.org/lib-external/szip/2.1/src/szip-2.1.tar.gz
-_md5_=e0178daa02fc557cf5e31fadd58b0bf8
+_md5_=34c76ce32dbb78b1a2ee66418791b6d0
diff --git a/metadata/md5-cache/sci-libs/umfpack-5.7.9 b/metadata/md5-cache/sci-libs/umfpack-5.7.9
index 08a6ac2013ff..fa1b5e2b0998 100644
--- a/metadata/md5-cache/sci-libs/umfpack-5.7.9
+++ b/metadata/md5-cache/sci-libs/umfpack-5.7.9
@@ -5,10 +5,10 @@ DESCRIPTION=Unsymmetric multifrontal sparse LU factorization library
 EAPI=7
 HOMEPAGE=http://faculty.cse.tamu.edu/davis/suitesparse.html
 IUSE=doc +cholmod static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2+
 RDEPEND=sci-libs/amd >=sci-libs/suitesparseconfig-5.4.0 virtual/blas cholmod? ( sci-libs/cholmod )
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/umfpack-5.7.9.tar.bz2
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=814e53d278ea8c9f350a1fe24cb9cce0
+_md5_=5b2eb4302726db9db3069882fdd745ca
diff --git a/metadata/md5-cache/sci-libs/volk-2.3.0-r1 b/metadata/md5-cache/sci-libs/volk-2.3.0-r1
index d9a71b725622..3c6d7f2f6f28 100644
--- a/metadata/md5-cache/sci-libs/volk-2.3.0-r1
+++ b/metadata/md5-cache/sci-libs/volk-2.3.0-r1
@@ -4,7 +4,7 @@ DEPEND=!<net-wireless/gnuradio-3.8 dev-libs/boost:= orc? ( dev-lang/orc ) python
 DESCRIPTION=vector optimized library of kernels
 EAPI=7
 HOMEPAGE=http://libvolk.org
-IUSE=orc python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=orc test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
 RDEPEND=!<net-wireless/gnuradio-3.8 dev-libs/boost:= orc? ( dev-lang/orc )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/gnuradio/volk/archive/v2.3.0.tar.gz -> volk-2.3.0.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=743cd1ccd3382ec029fa898445be1da3
+_md5_=96c52b036274401c176b4658e8a361f1
diff --git a/metadata/md5-cache/sci-libs/votca-tools-1.6.1 b/metadata/md5-cache/sci-libs/votca-tools-1.6.1
new file mode 100644
index 000000000000..e7ba80ec60e3
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/votca-tools-1.6.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:= dev-libs/expat >=dev-cpp/eigen-3.3 sci-libs/fftw:3.0 >=app-text/txt2tags-2.5 virtual/pkgconfig
+DESCRIPTION=Votca tools library
+EAPI=7
+HOMEPAGE=http://www.votca.org
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-macos
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/boost:= dev-libs/expat >=dev-cpp/eigen-3.3 sci-libs/fftw:3.0
+SLOT=0
+SRC_URI=https://github.com/votca/tools/archive/v1.6.1.tar.gz -> votca-tools-1.6.1.tar.gz
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=621fe012db27b7cfe7b73f51bbcfcea1
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index fdad964daf59..f6f13e38ee04 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/mathematica-10.3.1-r1 b/metadata/md5-cache/sci-mathematics/mathematica-10.3.1-r1
new file mode 100644
index 000000000000..c9fa6d828560
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/mathematica-10.3.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst prepare unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Wolfram Mathematica
+EAPI=6
+HOMEPAGE=https://www.wolfram.com/mathematica/
+KEYWORDS=-* ~amd64
+LICENSE=all-rights-reserved
+RDEPEND=media-libs/freetype
+RESTRICT=strip mirror bindist fetch
+SLOT=0
+SRC_URI=Mathematica_10.3.1_LINUX.sh
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a21e2286e8488a24e2ffbddf44cb8884
diff --git a/metadata/md5-cache/sci-mathematics/mathematica-12.1.1 b/metadata/md5-cache/sci-mathematics/mathematica-12.1.1
new file mode 100644
index 000000000000..3d07b71f22a2
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/mathematica-12.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst prepare unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Wolfram Mathematica
+EAPI=6
+HOMEPAGE=https://www.wolfram.com/mathematica/
+KEYWORDS=-* ~amd64
+LICENSE=all-rights-reserved
+RDEPEND=media-libs/freetype
+RESTRICT=strip mirror bindist fetch
+SLOT=0
+SRC_URI=Mathematica_12.1.1_LINUX.sh
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a21e2286e8488a24e2ffbddf44cb8884
diff --git a/metadata/md5-cache/sci-mathematics/mathomatic-15.8.5 b/metadata/md5-cache/sci-mathematics/mathomatic-15.8.5
deleted file mode 100644
index ea0b0374935c..000000000000
--- a/metadata/md5-cache/sci-mathematics/mathomatic-15.8.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=sys-libs/readline sys-libs/ncurses
-DESCRIPTION=Automatic algebraic manipulator
-EAPI=4
-HOMEPAGE=http://www.mathomatic.org/
-IUSE=doc gnuplot
-KEYWORDS=amd64 ppc x86
-LICENSE=LGPL-2.1
-RDEPEND=sys-libs/readline sys-libs/ncurses gnuplot? ( sci-visualization/gnuplot )
-SLOT=0
-SRC_URI=http://www.mathomatic.org/archive/mathomatic-15.8.5.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c53de72d374d0fd9899f07cf6c16d335
diff --git a/metadata/md5-cache/sci-mathematics/mathomatic-16.0.5 b/metadata/md5-cache/sci-mathematics/mathomatic-16.0.5
index ee3a645fae18..cb8d2f0afd11 100644
--- a/metadata/md5-cache/sci-mathematics/mathomatic-16.0.5
+++ b/metadata/md5-cache/sci-mathematics/mathomatic-16.0.5
@@ -4,10 +4,10 @@ DESCRIPTION=Automatic algebraic manipulator
 EAPI=6
 HOMEPAGE=https://github.com/mfillpot/mathomatic
 IUSE=doc gnuplot
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=sys-libs/readline:= sys-libs/ncurses:= gnuplot? ( sci-visualization/gnuplot )
 SLOT=0
 SRC_URI=https://github.com/mfillpot/mathomatic/archive/mathomatic-16.0.5.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=90b64a91bc3dee79b2e3c051ffc7670b
+_md5_=596bdf840093d871073969077d6250ce
diff --git a/metadata/md5-cache/sci-mathematics/pari-2.11.2 b/metadata/md5-cache/sci-mathematics/pari-2.11.2
deleted file mode 100644
index df7b0d928922..000000000000
--- a/metadata/md5-cache/sci-mathematics/pari-2.11.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( virtual/latex-base )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/readline:0= data? ( sci-mathematics/pari-data ) doc? ( X? ( x11-misc/xdg-utils ) ) fltk? ( x11-libs/fltk:1= ) gmp? ( dev-libs/gmp:0= ) X? ( x11-libs/libX11:0= )
-DESCRIPTION=Computer-aided number theory C library and tools
-EAPI=7
-HOMEPAGE=http://pari.math.u-bordeaux.fr/
-IUSE=data doc fltk gmp test threads X
-KEYWORDS=~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=sys-libs/readline:0= data? ( sci-mathematics/pari-data ) doc? ( X? ( x11-misc/xdg-utils ) ) fltk? ( x11-libs/fltk:1= ) gmp? ( dev-libs/gmp:0= ) X? ( x11-libs/libX11:0= )
-RESTRICT=!test? ( test )
-SLOT=0/6
-SRC_URI=http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.11.2.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=63a896c3dc64a997fbdc1f6235b0bc98
diff --git a/metadata/md5-cache/sci-mathematics/pari-2.11.4 b/metadata/md5-cache/sci-mathematics/pari-2.11.4
index 3d15ce18e948..b302060e9923 100644
--- a/metadata/md5-cache/sci-mathematics/pari-2.11.4
+++ b/metadata/md5-cache/sci-mathematics/pari-2.11.4
@@ -5,11 +5,11 @@ DESCRIPTION=Computer-aided number theory C library and tools
 EAPI=7
 HOMEPAGE=https://pari.math.u-bordeaux.fr/
 IUSE=data doc fltk gmp test threads X
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/readline:0= data? ( sci-mathematics/pari-data ) doc? ( X? ( x11-misc/xdg-utils ) ) fltk? ( x11-libs/fltk:1= ) gmp? ( dev-libs/gmp:0= ) X? ( x11-libs/libX11:0= )
 RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.11.4.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=29c315c33ed8fa994524979dc43d82d0
+_md5_=a7788f20eda83e1ccfd83ac29b79a245
diff --git a/metadata/md5-cache/sci-mathematics/petsc-3.13.0 b/metadata/md5-cache/sci-mathematics/petsc-3.13.0
index d0cd48206ef1..87f156950318 100644
--- a/metadata/md5-cache/sci-mathematics/petsc-3.13.0
+++ b/metadata/md5-cache/sci-mathematics/petsc-3.13.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install setup
 DEPEND=virtual/blas virtual/lapack afterimage? ( media-libs/libafterimage ) boost? ( dev-libs/boost ) fftw? ( sci-libs/fftw:3.0[mpi?] ) hdf5? ( sci-libs/hdf5[mpi?] ) hypre? ( >=sci-libs/hypre-2.18.0[mpi?] ) metis? ( >=sci-libs/parmetis-4 ) mpi? ( virtual/mpi[cxx?,fortran?] ) mumps? ( sci-libs/mumps[mpi?] sci-libs/scalapack ) scotch? ( sci-libs/scotch[mpi?] ) sparse? ( sci-libs/suitesparse >=sci-libs/cholmod-1.7.0 ) superlu? ( >=sci-libs/superlu-5 ) X? ( x11-libs/libX11 ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) virtual/pkgconfig dev-util/cmake virtual/fortran
 DESCRIPTION=Portable, Extensible Toolkit for Scientific Computation
 EAPI=7
-HOMEPAGE=http://www.mcs.anl.gov/petsc/
+HOMEPAGE=https://www.mcs.anl.gov/petsc/
 IUSE=afterimage boost complex-scalars cxx debug doc fftw fortran hdf5 hypre mpi metis mumps scotch sparse superlu threads X
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
@@ -11,4 +11,4 @@ REQUIRED_USE=afterimage? ( X ) complex-scalars? ( !hypre !superlu ) hdf5? ( mpi
 SLOT=0
 SRC_URI=http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-3.13.0.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=28abba3f19f955e3d8af1b6be10d967b
+_md5_=388dfeda33740242772d226c226c30df
diff --git a/metadata/md5-cache/sci-mathematics/petsc-3.13.1 b/metadata/md5-cache/sci-mathematics/petsc-3.13.1
index 229d76c867c6..2936a0dfbe2c 100644
--- a/metadata/md5-cache/sci-mathematics/petsc-3.13.1
+++ b/metadata/md5-cache/sci-mathematics/petsc-3.13.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install setup
 DEPEND=virtual/blas virtual/lapack afterimage? ( media-libs/libafterimage ) boost? ( dev-libs/boost ) fftw? ( sci-libs/fftw:3.0[mpi?] ) hdf5? ( sci-libs/hdf5[mpi?] ) hypre? ( >=sci-libs/hypre-2.18.0[mpi?] ) metis? ( >=sci-libs/parmetis-4 ) mpi? ( virtual/mpi[cxx?,fortran?] ) mumps? ( sci-libs/mumps[mpi?] sci-libs/scalapack ) scotch? ( sci-libs/scotch[mpi?] ) sparse? ( sci-libs/suitesparse >=sci-libs/cholmod-1.7.0 ) superlu? ( >=sci-libs/superlu-5 ) X? ( x11-libs/libX11 ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) virtual/pkgconfig dev-util/cmake virtual/fortran
 DESCRIPTION=Portable, Extensible Toolkit for Scientific Computation
 EAPI=7
-HOMEPAGE=http://www.mcs.anl.gov/petsc/
+HOMEPAGE=https://www.mcs.anl.gov/petsc/
 IUSE=afterimage boost complex-scalars cxx debug doc fftw fortran hdf5 hypre mpi metis mumps scotch sparse superlu threads X
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
@@ -11,4 +11,4 @@ REQUIRED_USE=afterimage? ( X ) complex-scalars? ( !hypre !superlu ) hdf5? ( mpi
 SLOT=0
 SRC_URI=http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-3.13.1.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=28abba3f19f955e3d8af1b6be10d967b
+_md5_=388dfeda33740242772d226c226c30df
diff --git a/metadata/md5-cache/sci-mathematics/polymake-3.0_p2 b/metadata/md5-cache/sci-mathematics/polymake-3.0_p2
index c90cb5282ad7..8c0011b335c5 100644
--- a/metadata/md5-cache/sci-mathematics/polymake-3.0_p2
+++ b/metadata/md5-cache/sci-mathematics/polymake-3.0_p2
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install postinst pretend
 DEPEND=dev-lang/perl dev-libs/gmp:0= dev-libs/mpfr:0 dev-libs/libxml2:2 dev-libs/libxslt ppl? ( dev-libs/ppl ) cdd? ( sci-libs/cddlib ) lrs? ( >=sci-libs/lrslib-051[gmp] ) bliss? ( sci-libs/bliss[gmp] ) group? ( dev-libs/boost:= ) libnormaliz? ( dev-libs/boost:= ) singular? ( >=sci-mathematics/singular-4.0.1 )
 DESCRIPTION=research tool for polyhedral geometry and combinatorics
 EAPI=6
-HOMEPAGE=http://polymake.org
+HOMEPAGE=https://polymake.org
 IUSE=+cdd lrs ppl bliss group +libnormaliz singular libpolymake
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=group? ( cdd lrs )
 SLOT=0
 SRC_URI=https://polymake.org/lib/exe/fetch.php/download/polymake-3.0r2.tar.bz2
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e6d83770423725fcd733b6b7028e6e9b
+_md5_=9b1072d5478d453a77e0cf0c62c313c0
diff --git a/metadata/md5-cache/sci-mathematics/rw-0.8-r2 b/metadata/md5-cache/sci-mathematics/rw-0.8-r2
deleted file mode 100644
index f82b9188e93a..000000000000
--- a/metadata/md5-cache/sci-mathematics/rw-0.8-r2
+++ /dev/null
@@ -1,12 +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 prepare
-DESCRIPTION=Compute rank-width decompositions of graphs
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/rankwidth/
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2+
-RDEPEND=!media-gfx/xpaint
-SLOT=0
-SRC_URI=https://downloads.sourceforge.net/project/rankwidth/rw-0.8.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ffea2fe7e783e61b6c1b44958446a3c1
diff --git a/metadata/md5-cache/sci-mathematics/rw-0.8-r3 b/metadata/md5-cache/sci-mathematics/rw-0.8-r3
index 05a7d8e14a8a..9c5f7430fdf9 100644
--- a/metadata/md5-cache/sci-mathematics/rw-0.8-r3
+++ b/metadata/md5-cache/sci-mathematics/rw-0.8-r3
@@ -3,10 +3,10 @@ DEFINED_PHASES=configure install prepare
 DESCRIPTION=Compute rank-width decompositions of graphs
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/rankwidth/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2+
 RDEPEND=!media-gfx/xpaint
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/rankwidth/rw-0.8.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=54e3591ba349ba1b7182b6ec1e10a16a
+_md5_=d8714e216ef505d280a1df94f613bd9e
diff --git a/metadata/md5-cache/sci-mathematics/singular-4.0.2 b/metadata/md5-cache/sci-mathematics/singular-4.0.2
index c866ea2a6510..9e87606fea69 100644
--- a/metadata/md5-cache/sci-mathematics/singular-4.0.2
+++ b/metadata/md5-cache/sci-mathematics/singular-4.0.2
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure postinst postrm prepare setup
 DEPEND=dev-libs/gmp:0 >=dev-libs/ntl-5.5.1 emacs? ( >=app-editors/emacs-23.1:* ) sci-mathematics/flint sci-mathematics/4ti2 sci-libs/cddlib dev-lang/perl boost? ( dev-libs/boost ) readline? ( sys-libs/readline ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Computer algebra system for polynomial computations
 EAPI=5
-HOMEPAGE=http://www.singular.uni-kl.de/
+HOMEPAGE=https://www.singular.uni-kl.de/
 IUSE=boost doc emacs examples python +readline
 KEYWORDS=amd64 ppc x86 ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0 >=dev-libs/ntl-5.5.1 emacs? ( >=app-editors/emacs-23.1:* ) sci-mathematics/flint sci-mathematics/4ti2 sci-libs/cddlib
 SLOT=0
-SRC_URI=http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-0-2/singular-4.0.2.tar.gz http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-0-2/singular-4.0.2-share.tar.gz
+SRC_URI=https://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-0-2/singular-4.0.2.tar.gz https://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-0-2/singular-4.0.2-share.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	504a3383c45504fde86b00426619a709	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4186aa71729119cfdcce2bd11c9c1e42
+_md5_=a2e8eb245d60a0af896a1657bde297d9
diff --git a/metadata/md5-cache/sci-mathematics/singular-4.0.3 b/metadata/md5-cache/sci-mathematics/singular-4.0.3
index 7740d1a13c58..ce36f75ea3aa 100644
--- a/metadata/md5-cache/sci-mathematics/singular-4.0.3
+++ b/metadata/md5-cache/sci-mathematics/singular-4.0.3
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure postinst postrm prepare setup
 DEPEND=dev-libs/gmp:0 >=dev-libs/ntl-5.5.1 emacs? ( >=app-editors/emacs-23.1:* ) sci-mathematics/flint sci-mathematics/4ti2 sci-libs/cddlib dev-lang/perl boost? ( dev-libs/boost ) readline? ( sys-libs/readline ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Computer algebra system for polynomial computations
 EAPI=6
-HOMEPAGE=http://www.singular.uni-kl.de/
+HOMEPAGE=https://www.singular.uni-kl.de/
 IUSE=boost doc emacs examples python +readline
 KEYWORDS=~amd64 ~ppc ~x86 ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0 >=dev-libs/ntl-5.5.1 emacs? ( >=app-editors/emacs-23.1:* ) sci-mathematics/flint sci-mathematics/4ti2 sci-libs/cddlib
 SLOT=0
-SRC_URI=http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-0-3/singular-4.0.3.tar.gz http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-0-3/singular-4.0.3-share.tar.gz
+SRC_URI=https://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-0-3/singular-4.0.3.tar.gz https://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-0-3/singular-4.0.3-share.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	504a3383c45504fde86b00426619a709	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=d31f77d04117034ca971dd1ef80e72bf
+_md5_=8b62bea3f706f27107723a8c4ba9c7c2
diff --git a/metadata/md5-cache/sci-mathematics/slepc-3.13.1 b/metadata/md5-cache/sci-mathematics/slepc-3.13.1
index 33cb18109806..f69f6e25c9d8 100644
--- a/metadata/md5-cache/sci-mathematics/slepc-3.13.1
+++ b/metadata/md5-cache/sci-mathematics/slepc-3.13.1
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure install setup
 DEPEND==sci-mathematics/petsc-3.13*:=[mpi=,complex-scalars=] sci-libs/arpack[mpi=] mpi? ( virtual/mpi ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) virtual/pkgconfig dev-util/cmake
 DESCRIPTION=Scalable Library for Eigenvalue Problem Computations
 EAPI=7
-HOMEPAGE=http://slepc.upv.es/
+HOMEPAGE=https://slepc.upv.es/
 IUSE=complex-scalars doc mpi
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
 RDEPEND==sci-mathematics/petsc-3.13*:=[mpi=,complex-scalars=] sci-libs/arpack[mpi=] mpi? ( virtual/mpi )
 SLOT=0
-SRC_URI=http://slepc.upv.es/download/distrib/slepc-3.13.1.tar.gz
+SRC_URI=https://slepc.upv.es/download/distrib/slepc-3.13.1.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d25e0df9a7751f0aefc57ab766abf892
+_md5_=0a4970b31ac1e7fbb3d6fe31188c2dfc
diff --git a/metadata/md5-cache/sci-mathematics/wxmaxima-20.06.6 b/metadata/md5-cache/sci-mathematics/wxmaxima-20.06.6
new file mode 100644
index 000000000000..9aced1e3c465
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/wxmaxima-20.06.6
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-text/pandoc dev-libs/libxml2:2 x11-libs/wxGTK:3.0 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Graphical frontend to Maxima, using the wxWidgets toolkit
+EAPI=7
+HOMEPAGE=https://wxmaxima-developers.github.io/wxmaxima/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/pandoc dev-libs/libxml2:2 x11-libs/wxGTK:3.0 media-fonts/jsmath sci-visualization/gnuplot[wxwidgets] sci-mathematics/maxima
+SLOT=0
+SRC_URI=https://github.com/wxMaxima-developers/wxmaxima/archive/Version-20.06.6.tar.gz -> wxmaxima-20.06.6.tar.gz
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=26e2b0ad8e56742893e03d386ab0bd2b
diff --git a/metadata/md5-cache/sci-misc/Manifest.gz b/metadata/md5-cache/sci-misc/Manifest.gz
index 19bf3ebcb862..1908c4f1176a 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 e70e9d6a6447..1bb455ab788c 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	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	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 0f070327719b..cdfd4cc49bdc 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	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	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 f40579c3871d..1e3b7dc77b1b 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	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	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 00636a862246..44ccfd1f1f47 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	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5fdd6936e444ca060892f5369358017e
diff --git a/metadata/md5-cache/sci-misc/vitables-3.0.0-r1 b/metadata/md5-cache/sci-misc/vitables-3.0.0-r1
index 8a41bbe9f52a..535f65be644f 100644
--- a/metadata/md5-cache/sci-misc/vitables-3.0.0-r1
+++ b/metadata/md5-cache/sci-misc/vitables-3.0.0-r1
@@ -2,7 +2,7 @@ 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-42.0.2[python_targets_python3_6(-)] )
 DESCRIPTION=A graphical tool for browsing / editing files in both PyTables and HDF5 formats
 EAPI=6
-HOMEPAGE=http://vitables.org/
+HOMEPAGE=https://vitables.org/
 IUSE=+python_single_target_python3_6
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/vitables/ViTables-3.0.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ffcb1527cfd9ac9cc505682ece89a996
+_md5_=1e027d546f7b726d96113cc3e6dc28e7
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 236ed3d077a6..0458731a5b13 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/epix-1.2.11-r2 b/metadata/md5-cache/sci-visualization/epix-1.2.11-r2
index c2b4d582f639..769568333a43 100644
--- a/metadata/md5-cache/sci-visualization/epix-1.2.11-r2
+++ b/metadata/md5-cache/sci-visualization/epix-1.2.11-r2
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure install postinst postrm prepare
 DEPEND=virtual/latex-base dev-texlive/texlive-pstricks dev-texlive/texlive-pictures dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended emacs? ( >=app-editors/emacs-23.1:* ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=2- and 3-D plotter for creating images (to be used in LaTeX)
 EAPI=5
-HOMEPAGE=http://mathcs.holycross.edu/~ahwang/current/ePiX.html
+HOMEPAGE=https://mathcs.holycross.edu/~ahwang/current/ePiX.html
 IUSE=doc emacs examples
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/latex-base dev-texlive/texlive-pstricks dev-texlive/texlive-pictures dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
-SRC_URI=http://mathcs.holycross.edu/~ahwang/epix/epix-1.2.11_withpdf.tar.bz2
+SRC_URI=https://mathcs.holycross.edu/~ahwang/epix/epix-1.2.11_withpdf.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	504a3383c45504fde86b00426619a709	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7d19242ff86e7b69ef141d18ff9cc32c
+_md5_=95b289831efcb82bc053ed0cf2c39779
diff --git a/metadata/md5-cache/sci-visualization/fityk-1.2.9 b/metadata/md5-cache/sci-visualization/fityk-1.2.9
deleted file mode 100644
index f47a9b1b9b14..000000000000
--- a/metadata/md5-cache/sci-visualization/fityk-1.2.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=sci-libs/xylib-1 >=dev-lang/lua-5.1:0 nlopt? ( sci-libs/nlopt ) 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(-)] ) readline? ( sys-libs/readline:* ) wxwidgets? ( x11-libs/wxGTK:3.0 ) dev-libs/boost dev-lang/swig >=app-portage/elt-patches-20170815
-DESCRIPTION=General-purpose nonlinear curve fitting and data analysis
-EAPI=5
-HOMEPAGE=http://fityk.nieto.pl/
-IUSE=gnuplot nlopt readline python static-libs wxwidgets python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=sci-libs/xylib-1 >=dev-lang/lua-5.1:0 nlopt? ( sci-libs/nlopt ) 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(-)] ) readline? ( sys-libs/readline:* ) wxwidgets? ( x11-libs/wxGTK:3.0 ) gnuplot? ( sci-visualization/gnuplot )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=https://github.com/wojdyr/fityk/releases/download/v1.2.9/fityk-1.2.9.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=ec88435baa0ef85262441e96cafcec13
diff --git a/metadata/md5-cache/sci-visualization/gnuplot-5.2.8 b/metadata/md5-cache/sci-visualization/gnuplot-5.2.8
index 864f52aadcfd..5f82809eea07 100644
--- a/metadata/md5-cache/sci-visualization/gnuplot-5.2.8
+++ b/metadata/md5-cache/sci-visualization/gnuplot-5.2.8
@@ -5,10 +5,10 @@ DESCRIPTION=Command-line driven interactive plotting program
 EAPI=7
 HOMEPAGE=http://www.gnuplot.info/
 IUSE=aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis svga wxwidgets X
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=gnuplot
 RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( dev-lang/lua:0 ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtnetwork:5= dev-qt/qtprintsupport:5= dev-qt/qtsvg:5= dev-qt/qtwidgets:5= ) readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) svga? ( media-libs/svgalib ) wxwidgets? ( x11-libs/wxGTK:3.0[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:2 ) X? ( x11-libs/libXaw )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnuplot/gnuplot-5.2.8.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=62518b33a537baca7bf5926d1dbbd2b3
+_md5_=929ddef2921d83bd4afa75bf25a6a4bc
diff --git a/metadata/md5-cache/sci-visualization/gr-0.50.0-r1 b/metadata/md5-cache/sci-visualization/gr-0.50.0-r1
index 4f139037903c..f2b00d9107b3 100644
--- a/metadata/md5-cache/sci-visualization/gr-0.50.0-r1
+++ b/metadata/md5-cache/sci-visualization/gr-0.50.0-r1
@@ -11,4 +11,4 @@ RDEPEND=dev-qt/qtgui:5 media-libs/fontconfig media-libs/glfw media-libs/libjpeg-
 SLOT=0
 SRC_URI=https://github.com/sciapp/gr/archive/v0.50.0.tar.gz -> gr-0.50.0.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5bafba0f432b00aca98abd589ad65382
+_md5_=5655dee37e5bda302aa54e3408431edf
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index a19b367353ec..9561aa4fb01d 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/accountsservice-0.6.55 b/metadata/md5-cache/sys-apps/accountsservice-0.6.55
index 607acf7b5298..c6de784c3f60 100644
--- a/metadata/md5-cache/sys-apps/accountsservice-0.6.55
+++ b/metadata/md5-cache/sys-apps/accountsservice-0.6.55
@@ -5,11 +5,11 @@ DESCRIPTION=D-Bus interfaces for querying and manipulating user account informat
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/AccountsService/
 IUSE=doc consolekit elogind gtk-doc +introspection selinux systemd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.44:2 sys-auth/polkit consolekit? ( sys-auth/consolekit ) elogind? ( >=sys-auth/elogind-229.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) systemd? ( >=sys-apps/systemd-186:0= ) selinux? ( sec-policy/selinux-accountsd )
 REQUIRED_USE=^^ ( consolekit elogind systemd )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/accountsservice/accountsservice-0.6.55.tar.xz
 _eclasses_=meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6611ad5347207d553669c4d110b9fc64
+_md5_=aa8faaefbfbf449994e34ff5ab3312bf
diff --git a/metadata/md5-cache/sys-apps/biosdisk-1.01 b/metadata/md5-cache/sys-apps/biosdisk-1.01
new file mode 100644
index 000000000000..9ef9ec33ada3
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/biosdisk-1.01
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=FreeDOS based BIOS updating utility for Dell machines
+EAPI=7
+HOMEPAGE=https://github.com/dell/biosdisk
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-cdr/cdrtools sys-boot/grub sys-boot/syslinux
+SLOT=0
+SRC_URI=https://github.com/dell/biosdisk/archive/1.01.tar.gz -> biosdisk-1.01.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5
+_md5_=9f4a5559f146ed606dc5cef48a023eb6
diff --git a/metadata/md5-cache/sys-apps/bubblewrap-0.4.1 b/metadata/md5-cache/sys-apps/bubblewrap-0.4.1
index 5ab4a19c6267..bedc2e6ad560 100644
--- a/metadata/md5-cache/sys-apps/bubblewrap-0.4.1
+++ b/metadata/md5-cache/sys-apps/bubblewrap-0.4.1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/libseccomp sys-libs/libcap selinux? ( >=sys-libs/libselinux-2.1
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containers/bubblewrap/releases/download/v0.4.1/bubblewrap-0.4.1.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=aa5551ef1989a9c5c22e84c0914e6aa2
diff --git a/metadata/md5-cache/sys-apps/cpint-2.5.3 b/metadata/md5-cache/sys-apps/cpint-2.5.3
index 83171e0b6196..da61e244b938 100644
--- a/metadata/md5-cache/sys-apps/cpint-2.5.3
+++ b/metadata/md5-cache/sys-apps/cpint-2.5.3
@@ -7,5 +7,5 @@ KEYWORDS=s390
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://linuxvm.org/Patches/s390/cpint253.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=589d164a1df20bbb01bcd256e0405dee
diff --git a/metadata/md5-cache/sys-apps/dbus-1.12.16 b/metadata/md5-cache/sys-apps/dbus-1.12.16
index 849caa53267c..30b1901a76a4 100644
--- a/metadata/md5-cache/sys-apps/dbus-1.12.16
+++ b/metadata/md5-cache/sys-apps/dbus-1.12.16
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( elogind systemd )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus/dbus-1.12.16.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=de6649150fd85fdd05d26e5798abbfbd
diff --git a/metadata/md5-cache/sys-apps/dbus-1.12.18 b/metadata/md5-cache/sys-apps/dbus-1.12.18
index 1a2ad0da62df..c4e9bd1d5d59 100644
--- a/metadata/md5-cache/sys-apps/dbus-1.12.18
+++ b/metadata/md5-cache/sys-apps/dbus-1.12.18
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( elogind systemd )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus/dbus-1.12.18.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=9802a613d74112e133efff9fff2ccd4d
diff --git a/metadata/md5-cache/sys-apps/epoch-1.2.1 b/metadata/md5-cache/sys-apps/epoch-1.2.1
index dcc7dd0dbc88..00de6c5ab0ee 100644
--- a/metadata/md5-cache/sys-apps/epoch-1.2.1
+++ b/metadata/md5-cache/sys-apps/epoch-1.2.1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://github.com/Subsentient/epoch/archive/1.2.1.tar.gz -> epoch-1.2.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5fea1830758f5febb11a326375cf9be1
diff --git a/metadata/md5-cache/sys-apps/epoch-1.2.2 b/metadata/md5-cache/sys-apps/epoch-1.2.2
index cced70603ab0..dccb4d997b70 100644
--- a/metadata/md5-cache/sys-apps/epoch-1.2.2
+++ b/metadata/md5-cache/sys-apps/epoch-1.2.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://universe2.us/epoch_1.2.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=31240e0ce49184593638d7b665d3e575
diff --git a/metadata/md5-cache/sys-apps/epoch-1.3.0 b/metadata/md5-cache/sys-apps/epoch-1.3.0
index 91b30e55857f..e345717c8627 100644
--- a/metadata/md5-cache/sys-apps/epoch-1.3.0
+++ b/metadata/md5-cache/sys-apps/epoch-1.3.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://universe2.us/epoch_1.3.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5d697b59558ef3e8d372d934bb32b199
diff --git a/metadata/md5-cache/sys-apps/epoch-9999 b/metadata/md5-cache/sys-apps/epoch-9999
index b4647d151cd7..a7c323646c2f 100644
--- a/metadata/md5-cache/sys-apps/epoch-9999
+++ b/metadata/md5-cache/sys-apps/epoch-9999
@@ -7,5 +7,5 @@ IUSE=kernel_linux
 LICENSE=public-domain
 PROPERTIES=live
 SLOT=0
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9777a19eccfc7cd26e5fb4d654c919b7
diff --git a/metadata/md5-cache/sys-apps/file-5.39-r1 b/metadata/md5-cache/sys-apps/file-5.39-r1
new file mode 100644
index 000000000000..31afd17c5032
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/file-5.39-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 test
+DEPEND=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_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) 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(-)?] )
+DESCRIPTION=identify a file's format by scanning binary data for patterns
+EAPI=7
+HOMEPAGE=https://www.darwinsys.com/file/
+IUSE=bzip2 lzma python seccomp static-libs zlib python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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-2
+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_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) 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_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
+SLOT=0
+SRC_URI=ftp://ftp.astron.com/pub/file/file-5.39.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	44725b3eb803b8abcd6978759c231210	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1165f47b601fdd244ed4520a66b1414c
diff --git a/metadata/md5-cache/sys-apps/file-5.39-r2 b/metadata/md5-cache/sys-apps/file-5.39-r2
new file mode 100644
index 000000000000..c65809f72950
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/file-5.39-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=compile configure install prepare test
+DEPEND=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_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) 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(-)?] )
+DESCRIPTION=identify a file's format by scanning binary data for patterns
+EAPI=7
+HOMEPAGE=https://www.darwinsys.com/file/
+IUSE=bzip2 lzma python seccomp static-libs zlib python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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-2
+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_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) 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_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
+SLOT=0
+SRC_URI=ftp://ftp.astron.com/pub/file/file-5.39.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	44725b3eb803b8abcd6978759c231210	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7e5e12944200128b74e9e526a7762516
diff --git a/metadata/md5-cache/sys-apps/file-9999 b/metadata/md5-cache/sys-apps/file-9999
index 06e54bab8fd7..b8b950dd5676 100644
--- a/metadata/md5-cache/sys-apps/file-9999
+++ b/metadata/md5-cache/sys-apps/file-9999
@@ -11,4 +11,4 @@ RDEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	44725b3eb803b8abcd6978759c231210	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=771968cdd08b1c37f15e25ad60002994
+_md5_=1165f47b601fdd244ed4520a66b1414c
diff --git a/metadata/md5-cache/sys-apps/flashrom-1.2-r1 b/metadata/md5-cache/sys-apps/flashrom-1.2-r1
index ba6aacba63e4..3a3cc8800728 100644
--- a/metadata/md5-cache/sys-apps/flashrom-1.2-r1
+++ b/metadata/md5-cache/sys-apps/flashrom-1.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Utility for reading, writing, erasing and verifying flash ROM chips
 EAPI=7
 HOMEPAGE=https://flashrom.org/
 IUSE=atahpt +atapromise +atavia +buspirate-spi +ch341a-spi +dediprog +developerbox-spi +digilent-spi +drkaiser +dummy +ft2232-spi +gfxnvidia +internal +it8212 jlink-spi +linux-mtd +linux-spi mstarddc-spi +nic3com +nicintel +nicintel-eeprom +nicintel-spi nicnatsemi +nicrealtek +ogp-spi +pickit2-spi +pony-spi +rayer-spi +satamv +satasii +serprog stlinkv3-spi +usbblaster-spi +internal-dmi static tools +wiki
-KEYWORDS=~amd64 ~arm arm64 ~ppc ~ppc64 sparc ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=!static? ( atahpt? ( sys-apps/pciutils ) atapromise? ( sys-apps/pciutils ) atavia? ( sys-apps/pciutils ) ch341a-spi? ( virtual/libusb:1 ) dediprog? ( virtual/libusb:1 ) developerbox-spi? ( virtual/libusb:1 ) digilent-spi? ( virtual/libusb:1 ) drkaiser? ( sys-apps/pciutils ) ft2232-spi? ( dev-embedded/libftdi:= ) gfxnvidia? ( sys-apps/pciutils ) internal? ( sys-apps/pciutils ) it8212? ( sys-apps/pciutils ) jlink-spi? ( dev-embedded/libjaylink ) nic3com? ( sys-apps/pciutils ) nicintel-eeprom? ( sys-apps/pciutils ) nicintel-spi? ( sys-apps/pciutils ) nicintel? ( sys-apps/pciutils ) nicnatsemi? ( sys-apps/pciutils ) nicrealtek? ( sys-apps/pciutils ) ogp-spi? ( sys-apps/pciutils ) pickit2-spi? ( virtual/libusb:0 ) rayer-spi? ( sys-apps/pciutils ) satamv? ( sys-apps/pciutils ) satasii? ( sys-apps/pciutils ) stlinkv3-spi? ( virtual/libusb:1 ) usbblaster-spi? ( dev-embedded/libftdi:= ) ) !internal-dmi? ( sys-apps/dmidecode )
 SLOT=0
 SRC_URI=https://download.flashrom.org/releases/flashrom-v1.2.tar.bz2
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2159df3b5f8998dba00111aa4f3d1cb0
+_md5_=3eae2c8de5ba930e1d4ae71348678f09
diff --git a/metadata/md5-cache/sys-apps/frandom-1.1 b/metadata/md5-cache/sys-apps/frandom-1.1
index 161e06f94744..d9fe18ad40a6 100644
--- a/metadata/md5-cache/sys-apps/frandom-1.1
+++ b/metadata/md5-cache/sys-apps/frandom-1.1
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( virtual/modutils )
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/project/frandom//frandom-1.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=de0d164228bb386ad341920090146e2f
diff --git a/metadata/md5-cache/sys-apps/fwts-17.02.00 b/metadata/md5-cache/sys-apps/fwts-17.02.00
deleted file mode 100644
index b7d373ac0285..000000000000
--- a/metadata/md5-cache/sys-apps/fwts-17.02.00
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=dev-libs/json-c-0.10-r1 dev-libs/glib:2 dev-libs/libpcre sys-apps/pciutils sys-power/iasl sys-power/pmtools sys-apps/dmidecode 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=Firmware Test Suite
-EAPI=6
-HOMEPAGE=https://wiki.ubuntu.com/Kernel/Reference/fwts
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/json-c-0.10-r1 dev-libs/glib:2 dev-libs/libpcre sys-apps/pciutils sys-power/iasl sys-power/pmtools sys-apps/dmidecode
-SLOT=0
-SRC_URI=https://launchpad.net/ubuntu/+archive/primary/+files/fwts_17.02.00.orig.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8a94a5421ae6b19bf613716c7a0b1934
diff --git a/metadata/md5-cache/sys-apps/fwts-20.05.00 b/metadata/md5-cache/sys-apps/fwts-20.05.00
new file mode 100644
index 000000000000..07ac8d5c6cc7
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/fwts-20.05.00
@@ -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=prepare
+DEPEND=dev-libs/glib:2 >=dev-libs/json-c-0.10-r1 dev-libs/libpcre sys-apps/dmidecode sys-apps/pciutils sys-power/iasl sys-power/pmtools sys-devel/libtool
+DESCRIPTION=Firmware Test Suite
+EAPI=7
+HOMEPAGE=https://wiki.ubuntu.com/Kernel/Reference/fwts
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 >=dev-libs/json-c-0.10-r1 dev-libs/libpcre sys-apps/dmidecode sys-apps/pciutils sys-power/iasl sys-power/pmtools
+SLOT=0
+SRC_URI=https://launchpad.net/ubuntu/+archive/primary/+files/fwts_20.05.00.orig.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a8d03842ea79209cbb0d243baaaf0e2c
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.3.10 b/metadata/md5-cache/sys-apps/fwupd-1.3.10
index 3c41443c3a88..e4e2a78b7946 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.3.10
+++ b/metadata/md5-cache/sys-apps/fwupd-1.3.10
@@ -5,12 +5,12 @@ 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_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~arm x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2.1+
 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 ) 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.10.tar.gz -> fwupd-1.3.10.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=03313d81fb59389f1a240f6e7f997e6c
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4863350e8c85a3a3d3022759bee5370e
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.3.11 b/metadata/md5-cache/sys-apps/fwupd-1.3.11
index 0b24b524c157..f76149d5ecbd 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.3.11
+++ b/metadata/md5-cache/sys-apps/fwupd-1.3.11
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hughsie/fwupd/archive/1.3.11.tar.gz -> fwupd-1.3.11.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=531bf8f03d16c46198c4a6ad857da3b6
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.4.2 b/metadata/md5-cache/sys-apps/fwupd-1.4.2
index 5959e3e14317..87706c8f04f9 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.4.2
+++ b/metadata/md5-cache/sys-apps/fwupd-1.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hughsie/fwupd/archive/1.4.2.tar.gz -> fwupd-1.4.2.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b4654f4362a2a70aef9089bf00aa94c4
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.4.4 b/metadata/md5-cache/sys-apps/fwupd-1.4.4
index a716506cad5b..fc9de6a93a10 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.4.4
+++ b/metadata/md5-cache/sys-apps/fwupd-1.4.4
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hughsie/fwupd/archive/1.4.4.tar.gz -> fwupd-1.4.4.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8d82b91d358604187c015df8f9befbbd
diff --git a/metadata/md5-cache/sys-apps/haveged-1.9.10 b/metadata/md5-cache/sys-apps/haveged-1.9.10
deleted file mode 100644
index f0b1e973129a..000000000000
--- a/metadata/md5-cache/sys-apps/haveged-1.9.10
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install
-DESCRIPTION=A simple entropy daemon using the HAVEGE algorithm
-EAPI=7
-HOMEPAGE=http://www.issihosts.com/haveged/
-IUSE=selinux static-libs threads
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-3+
-RDEPEND=!<sys-apps/openrc-0.11.8 selinux? ( sec-policy/selinux-entropyd )
-SLOT=0
-SRC_URI=https://github.com/jirka-h/haveged/archive/v1.9.10.tar.gz -> haveged-1.9.10.tar.gz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=30898bb4487ae0ee2a1c0778cfca03b1
diff --git a/metadata/md5-cache/sys-apps/haveged-1.9.11 b/metadata/md5-cache/sys-apps/haveged-1.9.11
deleted file mode 100644
index 0bec9ac11cb9..000000000000
--- a/metadata/md5-cache/sys-apps/haveged-1.9.11
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install
-DESCRIPTION=A simple entropy daemon using the HAVEGE algorithm
-EAPI=7
-HOMEPAGE=http://www.issihosts.com/haveged/
-IUSE=selinux static-libs threads
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-3+
-RDEPEND=!<sys-apps/openrc-0.11.8 selinux? ( sec-policy/selinux-entropyd )
-SLOT=0
-SRC_URI=https://github.com/jirka-h/haveged/archive/v1.9.11.tar.gz -> haveged-1.9.11.tar.gz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=30898bb4487ae0ee2a1c0778cfca03b1
diff --git a/metadata/md5-cache/sys-apps/haveged-1.9.12 b/metadata/md5-cache/sys-apps/haveged-1.9.12
new file mode 100644
index 000000000000..91cc086991b6
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/haveged-1.9.12
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install
+DESCRIPTION=A simple entropy daemon using the HAVEGE algorithm
+EAPI=7
+HOMEPAGE=http://www.issihosts.com/haveged/
+IUSE=selinux static-libs threads
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=!<sys-apps/openrc-0.11.8 selinux? ( sec-policy/selinux-entropyd )
+SLOT=0
+SRC_URI=https://github.com/jirka-h/haveged/archive/v1.9.12.tar.gz -> haveged-1.9.12.tar.gz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=30898bb4487ae0ee2a1c0778cfca03b1
diff --git a/metadata/md5-cache/sys-apps/haveged-1.9.4 b/metadata/md5-cache/sys-apps/haveged-1.9.4
deleted file mode 100644
index bf0f807e9543..000000000000
--- a/metadata/md5-cache/sys-apps/haveged-1.9.4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install
-DESCRIPTION=A simple entropy daemon using the HAVEGE algorithm
-EAPI=7
-HOMEPAGE=http://www.issihosts.com/haveged/
-IUSE=selinux static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=GPL-3+
-RDEPEND=!<sys-apps/openrc-0.11.8 selinux? ( sec-policy/selinux-entropyd )
-SLOT=0
-SRC_URI=https://github.com/jirka-h/haveged/archive/1.9.4.tar.gz -> haveged-1.9.4.tar.gz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=444b3068ff429efdc40af77e7f9c01c4
diff --git a/metadata/md5-cache/sys-apps/haveged-1.9.8 b/metadata/md5-cache/sys-apps/haveged-1.9.8
deleted file mode 100644
index f052ec106f93..000000000000
--- a/metadata/md5-cache/sys-apps/haveged-1.9.8
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install
-DESCRIPTION=A simple entropy daemon using the HAVEGE algorithm
-EAPI=7
-HOMEPAGE=http://www.issihosts.com/haveged/
-IUSE=selinux static-libs threads
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-3+
-RDEPEND=!<sys-apps/openrc-0.11.8 selinux? ( sec-policy/selinux-entropyd )
-SLOT=0
-SRC_URI=https://github.com/jirka-h/haveged/archive/v1.9.8.tar.gz -> haveged-1.9.8.tar.gz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=abd34ed2a2c81ad097084d4f65471173
diff --git a/metadata/md5-cache/sys-apps/haveged-1.9.9 b/metadata/md5-cache/sys-apps/haveged-1.9.9
deleted file mode 100644
index ec2c617ff6fa..000000000000
--- a/metadata/md5-cache/sys-apps/haveged-1.9.9
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install
-DESCRIPTION=A simple entropy daemon using the HAVEGE algorithm
-EAPI=7
-HOMEPAGE=http://www.issihosts.com/haveged/
-IUSE=selinux static-libs threads
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-3+
-RDEPEND=!<sys-apps/openrc-0.11.8 selinux? ( sec-policy/selinux-entropyd )
-SLOT=0
-SRC_URI=https://github.com/jirka-h/haveged/archive/v1.9.9.tar.gz -> haveged-1.9.9.tar.gz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=30898bb4487ae0ee2a1c0778cfca03b1
diff --git a/metadata/md5-cache/sys-apps/hd-idle-1.05 b/metadata/md5-cache/sys-apps/hd-idle-1.05
index 50498929c015..412d10da4e49 100644
--- a/metadata/md5-cache/sys-apps/hd-idle-1.05
+++ b/metadata/md5-cache/sys-apps/hd-idle-1.05
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/hd-idle/hd-idle-1.05.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=56aa1015a549f1509f4efc028b8dca57
diff --git a/metadata/md5-cache/sys-apps/hd-idle-1.05-r1 b/metadata/md5-cache/sys-apps/hd-idle-1.05-r1
index 3fda6dd017ad..b0061df64ea1 100644
--- a/metadata/md5-cache/sys-apps/hd-idle-1.05-r1
+++ b/metadata/md5-cache/sys-apps/hd-idle-1.05-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/hd-idle/hd-idle-1.05.tgz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=64c3342eaf63a9b98e48aeb216670f1c
diff --git a/metadata/md5-cache/sys-apps/irqbalance-1.5.0 b/metadata/md5-cache/sys-apps/irqbalance-1.5.0
index 9f45204d30c5..2ea78414c809 100644
--- a/metadata/md5-cache/sys-apps/irqbalance-1.5.0
+++ b/metadata/md5-cache/sys-apps/irqbalance-1.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 caps? ( sys-libs/libcap-ng ) numa? ( sys-process/numactl ) tui? ( sys-libs/ncurses:0=[unicode] ) selinux? ( sec-policy/selinux-irqbalance )
 SLOT=0
 SRC_URI=https://github.com/Irqbalance/irqbalance/archive/v1.5.0.tar.gz -> irqbalance-1.5.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3dbac3e0cbb0e76739d00b1dbcff6e16
diff --git a/metadata/md5-cache/sys-apps/irqbalance-1.6.0 b/metadata/md5-cache/sys-apps/irqbalance-1.6.0
index 6ac7c2faf137..dfc248355e6a 100644
--- a/metadata/md5-cache/sys-apps/irqbalance-1.6.0
+++ b/metadata/md5-cache/sys-apps/irqbalance-1.6.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 caps? ( sys-libs/libcap-ng ) numa? ( sys-process/numactl ) tui? ( sys-libs/ncurses:0=[unicode] ) selinux? ( sec-policy/selinux-irqbalance )
 SLOT=0
 SRC_URI=https://github.com/Irqbalance/irqbalance/archive/v1.6.0.tar.gz -> irqbalance-1.6.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b0589242f2a73184303fa867e078235a
diff --git a/metadata/md5-cache/sys-apps/kexec-tools-2.0.20-r1 b/metadata/md5-cache/sys-apps/kexec-tools-2.0.20-r1
index 78fe343f31d1..bdecea74b073 100644
--- a/metadata/md5-cache/sys-apps/kexec-tools-2.0.20-r1
+++ b/metadata/md5-cache/sys-apps/kexec-tools-2.0.20-r1
@@ -11,5 +11,5 @@ RDEPEND=lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=lzma? ( zlib )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-2.0.20.tar.xz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=aa7f701271c710f43e325ac4af4b0d5e
diff --git a/metadata/md5-cache/sys-apps/kexec-tools-9999 b/metadata/md5-cache/sys-apps/kexec-tools-9999
index 6388a3b96533..b9740308921c 100644
--- a/metadata/md5-cache/sys-apps/kexec-tools-9999
+++ b/metadata/md5-cache/sys-apps/kexec-tools-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=lzma? ( zlib )
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f2bc7a5bf2fb6fa87eb2ba6f5b346ab4
diff --git a/metadata/md5-cache/sys-apps/keyutils-1.6.1 b/metadata/md5-cache/sys-apps/keyutils-1.6.1
index ab029eebf1c0..db857a942928 100644
--- a/metadata/md5-cache/sys-apps/keyutils-1.6.1
+++ b/metadata/md5-cache/sys-apps/keyutils-1.6.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RESTRICT=!test? ( test )
 SLOT=0/1.9
 SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-1.6.1.tar.gz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
 _md5_=3c3caa337acd644b2fa3c32e28aaa3eb
diff --git a/metadata/md5-cache/sys-apps/likwid-4.3.3 b/metadata/md5-cache/sys-apps/likwid-4.3.3
index 9d4337d754fd..4985daa86eec 100644
--- a/metadata/md5-cache/sys-apps/likwid-4.3.3
+++ b/metadata/md5-cache/sys-apps/likwid-4.3.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ BSD
 RDEPEND=dev-lang/perl dev-lang/lua:5.3 filecaps? ( sys-libs/libcap ) fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=https://ftp.fau.de/pub/likwid/likwid-4.3.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	da689a8e04bbbb3518888ff668fee45b	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	da689a8e04bbbb3518888ff668fee45b	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e4151658ab14903ed62dae95a12d6515
diff --git a/metadata/md5-cache/sys-apps/likwid-4.3.4 b/metadata/md5-cache/sys-apps/likwid-4.3.4
index 2493fd48de0d..8294d6de6222 100644
--- a/metadata/md5-cache/sys-apps/likwid-4.3.4
+++ b/metadata/md5-cache/sys-apps/likwid-4.3.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ BSD
 RDEPEND=dev-lang/perl dev-lang/lua:5.3 filecaps? ( sys-libs/libcap ) fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=https://ftp.fau.de/pub/likwid/likwid-4.3.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	da689a8e04bbbb3518888ff668fee45b	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	da689a8e04bbbb3518888ff668fee45b	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e4151658ab14903ed62dae95a12d6515
diff --git a/metadata/md5-cache/sys-apps/linux-misc-apps-3.18 b/metadata/md5-cache/sys-apps/linux-misc-apps-3.18
index b2cdb17c0af6..3cd6602cfa03 100644
--- a/metadata/md5-cache/sys-apps/linux-misc-apps-3.18
+++ b/metadata/md5-cache/sys-apps/linux-misc-apps-3.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/hwids >=dev-libs/glib-2.6 tcpd? ( sys-apps/tcp-wrappers ) !sys-power/pmtools
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.18.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=7744704fcbf2ba10cfeafdbd6aa3ea25
diff --git a/metadata/md5-cache/sys-apps/linux-misc-apps-3.6-r2 b/metadata/md5-cache/sys-apps/linux-misc-apps-3.6-r2
index 18de47908502..17e12e9dd5bc 100644
--- a/metadata/md5-cache/sys-apps/linux-misc-apps-3.6-r2
+++ b/metadata/md5-cache/sys-apps/linux-misc-apps-3.6-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/hwids >=sys-fs/sysfsutils-2 >=dev-libs/glib-2.6 tcpd? ( sys-apps/tcp-wrappers ) !sys-power/pmtools !net-misc/usbip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v3.6/linux-3.6.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=750fdaefde8b62f90325cbff5aece22c
diff --git a/metadata/md5-cache/sys-apps/linux-misc-apps-4.19 b/metadata/md5-cache/sys-apps/linux-misc-apps-4.19
index 6278553a2ae1..24b7e17d8a41 100644
--- a/metadata/md5-cache/sys-apps/linux-misc-apps-4.19
+++ b/metadata/md5-cache/sys-apps/linux-misc-apps-4.19
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/hwids >=dev-libs/glib-2.6 >=sys-kernel/linux-headers-4.19 usbip? ( !net-misc/usbip tcpd? ( sys-apps/tcp-wrappers ) virtual/libudev ) !sys-power/pmtools
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v3.x/linux-4.19.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=192fa59fe3f4f464657e06ad5a4a4327
diff --git a/metadata/md5-cache/sys-apps/linux-misc-apps-4.4 b/metadata/md5-cache/sys-apps/linux-misc-apps-4.4
index 43ca154d4f5d..60b2a30aaaf9 100644
--- a/metadata/md5-cache/sys-apps/linux-misc-apps-4.4
+++ b/metadata/md5-cache/sys-apps/linux-misc-apps-4.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/hwids >=dev-libs/glib-2.6 tcpd? ( sys-apps/tcp-wrappers ) !sys-power/pmtools
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v3.x/linux-4.4.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=caff69b624656d2febdae7d93c0a6685
diff --git a/metadata/md5-cache/sys-apps/linux-misc-apps-4.4-r1 b/metadata/md5-cache/sys-apps/linux-misc-apps-4.4-r1
index 82bb06406f94..085533274a5d 100644
--- a/metadata/md5-cache/sys-apps/linux-misc-apps-4.4-r1
+++ b/metadata/md5-cache/sys-apps/linux-misc-apps-4.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/hwids >=dev-libs/glib-2.6 >=sys-kernel/linux-headers-4.4 usbip? ( !net-misc/usbip tcpd? ( sys-apps/tcp-wrappers ) virtual/libudev ) !sys-power/pmtools
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v3.x/linux-4.4.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=884b0e6aa30827e551102f7e03230a3c
diff --git a/metadata/md5-cache/sys-apps/linux-misc-apps-5.6 b/metadata/md5-cache/sys-apps/linux-misc-apps-5.6
index 491cd5a6c0a5..5bbb897fd99c 100644
--- a/metadata/md5-cache/sys-apps/linux-misc-apps-5.6
+++ b/metadata/md5-cache/sys-apps/linux-misc-apps-5.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/hwids >=dev-libs/glib-2.6 >=sys-kernel/linux-headers-5.6 usbip? ( !net-misc/usbip tcpd? ( sys-apps/tcp-wrappers ) virtual/libudev ) !sys-power/pmtools
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v3.x/linux-5.6.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=3bbbe0fdea27bd9c56b59b0aa5c5dee2
diff --git a/metadata/md5-cache/sys-apps/lm-sensors-3.5.0 b/metadata/md5-cache/sys-apps/lm-sensors-3.5.0
index a9bbd756c5f4..70c45494fd15 100644
--- a/metadata/md5-cache/sys-apps/lm-sensors-3.5.0
+++ b/metadata/md5-cache/sys-apps/lm-sensors-3.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1
 RDEPEND=sensord? ( net-analyzer/rrdtool virtual/logger ) dev-lang/perl !<sys-apps/openrc-0.21.7
 SLOT=0/5.0.0
 SRC_URI=https://github.com/lm-sensors/lm-sensors/archive/V3-5-0.tar.gz -> lm-sensors-3.5.0.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6b1408760b87d4a6ca6279971d83747c
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 41a6bfc81f87..a9cdc114e9e1 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
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ LGPL-2.1
 RDEPEND=sensord? ( net-analyzer/rrdtool virtual/logger ) dev-lang/perl !<sys-apps/openrc-0.36
 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	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e7a6063c8953be31b2ae9c1d3330b05c
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 cc41adb1b7b6..f0a824cc5e5f 100644
--- a/metadata/md5-cache/sys-apps/lm-sensors-3.6.0
+++ b/metadata/md5-cache/sys-apps/lm-sensors-3.6.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ LGPL-2.1
 RDEPEND=sensord? ( net-analyzer/rrdtool virtual/logger ) dev-lang/perl !<sys-apps/openrc-0.36
 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	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b4026147a4038bbcf0e9a71cf6097dbb
diff --git a/metadata/md5-cache/sys-apps/man-db-2.9.1 b/metadata/md5-cache/sys-apps/man-db-2.9.1
deleted file mode 100644
index 0334b5d0b12b..000000000000
--- a/metadata/md5-cache/sys-apps/man-db-2.9.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/xz-utils virtual/pkgconfig nls? ( >=app-text/po4a-0.45 sys-devel/gettext ) virtual/pkgconfig
-DEFINED_PHASES=configure install postinst preinst prepare setup unpack
-DEPEND=!sys-apps/man >=dev-libs/libpipeline-1.5.0 sys-apps/groff gdbm? ( sys-libs/gdbm:= ) !gdbm? ( berkdb? ( sys-libs/db:= ) ) !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib )
-DESCRIPTION=a man replacement that utilizes berkdb instead of flat files
-EAPI=7
-HOMEPAGE=http://www.nongnu.org/man-db/
-IUSE=berkdb +gdbm +manpager nls +seccomp selinux static-libs zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-PDEPEND=manpager? ( app-text/manpager )
-RDEPEND=!sys-apps/man >=dev-libs/libpipeline-1.5.0 sys-apps/groff gdbm? ( sys-libs/gdbm:= ) !gdbm? ( berkdb? ( sys-libs/db:= ) ) !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib ) acct-group/man acct-user/man selinux? ( sec-policy/selinux-mandb )
-SLOT=0
-SRC_URI=mirror://nongnu/man-db/man-db-2.9.1.tar.xz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4c223c29e6f38f58ab4b57ee288daa37
diff --git a/metadata/md5-cache/sys-apps/man-db-2.9.3 b/metadata/md5-cache/sys-apps/man-db-2.9.3
new file mode 100644
index 000000000000..a072d81aa7e5
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/man-db-2.9.3
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/xz-utils virtual/pkgconfig nls? ( >=app-text/po4a-0.45 sys-devel/gettext ) virtual/pkgconfig
+DEFINED_PHASES=configure install postinst preinst prepare setup unpack
+DEPEND=!sys-apps/man >=dev-libs/libpipeline-1.5.0 sys-apps/groff gdbm? ( sys-libs/gdbm:= ) !gdbm? ( berkdb? ( sys-libs/db:= ) ) !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib )
+DESCRIPTION=a man replacement that utilizes berkdb instead of flat files
+EAPI=7
+HOMEPAGE=http://www.nongnu.org/man-db/
+IUSE=berkdb +gdbm +manpager nls +seccomp selinux static-libs zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+PDEPEND=manpager? ( app-text/manpager )
+RDEPEND=!sys-apps/man >=dev-libs/libpipeline-1.5.0 sys-apps/groff gdbm? ( sys-libs/gdbm:= ) !gdbm? ( berkdb? ( sys-libs/db:= ) ) !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib ) acct-group/man acct-user/man selinux? ( sec-policy/selinux-mandb )
+SLOT=0
+SRC_URI=mirror://nongnu/man-db/man-db-2.9.3.tar.xz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=90841d55ce5e657c95f094c69ebcc493
diff --git a/metadata/md5-cache/sys-apps/minijail-12 b/metadata/md5-cache/sys-apps/minijail-12
index 7f5bfe2fd676..2b50ba1aed8f 100644
--- a/metadata/md5-cache/sys-apps/minijail-12
+++ b/metadata/md5-cache/sys-apps/minijail-12
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/libcap-ng:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/minijail/archive/linux-v12.tar.gz -> minijail-12.tar.gz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0564a5f949290fb92141ae12d558436c
diff --git a/metadata/md5-cache/sys-apps/minijail-9 b/metadata/md5-cache/sys-apps/minijail-9
index 30d030f7db21..197eaf8764f4 100644
--- a/metadata/md5-cache/sys-apps/minijail-9
+++ b/metadata/md5-cache/sys-apps/minijail-9
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/libcap-ng:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/minijail/archive/linux-v9.tar.gz -> minijail-9.tar.gz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d674f55d033b892ec0af64e7ce8769e9
diff --git a/metadata/md5-cache/sys-apps/msr-tools-1.3 b/metadata/md5-cache/sys-apps/msr-tools-1.3
index eebeb8dc0816..c46162a1ba4f 100644
--- a/metadata/md5-cache/sys-apps/msr-tools-1.3
+++ b/metadata/md5-cache/sys-apps/msr-tools-1.3
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://01.org/sites/default/files/downloads/msr-tools/msr-tools-1.3.zip
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=515f943da2af5095554530e2627bf658
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 2add92dbd358..fce6520c93a8 100644
--- a/metadata/md5-cache/sys-apps/opal-utils-6.5.2
+++ b/metadata/md5-cache/sys-apps/opal-utils-6.5.2
@@ -8,5 +8,5 @@ KEYWORDS=ppc64
 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	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b1af54666fbb80e3dabe37f9443efa15
diff --git a/metadata/md5-cache/sys-apps/opal-utils-6.6 b/metadata/md5-cache/sys-apps/opal-utils-6.6
index f9f0fcd3b64f..0713f51b5fc6 100644
--- a/metadata/md5-cache/sys-apps/opal-utils-6.6
+++ b/metadata/md5-cache/sys-apps/opal-utils-6.6
@@ -8,5 +8,5 @@ KEYWORDS=~ppc64
 LICENSE=Apache-2.0 GPL-2+
 SLOT=0
 SRC_URI=https://github.com/open-power/skiboot/archive/v6.6.tar.gz -> opal-utils-6.6.tar.gz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0785e1e412b38f0eb164aaa53e91b557
diff --git a/metadata/md5-cache/sys-apps/opal-utils-6.6.1 b/metadata/md5-cache/sys-apps/opal-utils-6.6.1
index 021e9cc06f71..ee5d3959a3d6 100644
--- a/metadata/md5-cache/sys-apps/opal-utils-6.6.1
+++ b/metadata/md5-cache/sys-apps/opal-utils-6.6.1
@@ -8,5 +8,5 @@ KEYWORDS=~ppc64
 LICENSE=Apache-2.0 GPL-2+
 SLOT=0
 SRC_URI=https://github.com/open-power/skiboot/archive/v6.6.1.tar.gz -> opal-utils-6.6.1.tar.gz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0785e1e412b38f0eb164aaa53e91b557
diff --git a/metadata/md5-cache/sys-apps/pcmciautils-018_p8-r1 b/metadata/md5-cache/sys-apps/pcmciautils-018_p8-r1
index 7872dffb1dc3..f9e80a156d5b 100644
--- a/metadata/md5-cache/sys-apps/pcmciautils-018_p8-r1
+++ b/metadata/md5-cache/sys-apps/pcmciautils-018_p8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/modutils
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/pcmciautils/pcmciautils_018.orig.tar.gz mirror://debian/pool/main/p/pcmciautils/pcmciautils_018-8.debian.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=454730797383fa82da13f4fef6c16093
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.100-r1 b/metadata/md5-cache/sys-apps/portage-2.3.100-r1
index da5b21e514e6..75c58fa08636 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.100-r1
+++ b/metadata/md5-cache/sys-apps/portage-2.3.100-r1
@@ -11,5 +11,5 @@ RDEPEND=app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.3.100.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.100.tar.bz2 https://github.com/gentoo/portage/commit/c238d5f7ed264179c263f5a2da983c4ee50b4f00.patch -> portage-2.3.100-bug-719810-escape-percent-signs.patch
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3e51038c74b852d16400994039288a89
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.101-r2 b/metadata/md5-cache/sys-apps/portage-2.3.101-r2
index 122743cdb760..d97b41f1bb2b 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.101-r2
+++ b/metadata/md5-cache/sys-apps/portage-2.3.101-r2
@@ -11,5 +11,5 @@ RDEPEND=app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.3.101.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.101.tar.bz2 https://github.com/gentoo/portage/compare/1079f2d13cfe575e243b76b2f5128c0c4e222f51...ca763549507d995e91a49753b13bcca8748fae6c.patch -> portage-2.3.101-revert2-bug-709746.patch
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ecb1ce2fac5b771444b8b6ebc2af54c5
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.102 b/metadata/md5-cache/sys-apps/portage-2.3.102
new file mode 100644
index 000000000000..76350178a715
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/portage-2.3.102
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=!build? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[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(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[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-7.3.0:0=[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(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] 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_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
+RDEPEND=app-arch/zstd >=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 rsync-verify? ( >=app-portage/gemato-14[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) 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_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 ) ) !<app-admin/logrotate-3.8.0 !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[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(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://gentoo/portage-2.3.102.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.102.tar.bz2
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b213469f74128a65011b04e6e0766557
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.103 b/metadata/md5-cache/sys-apps/portage-2.3.103
new file mode 100644
index 000000000000..8a47395687b1
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/portage-2.3.103
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=!build? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[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(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[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-7.3.0:0=[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(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] 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_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
+RDEPEND=app-arch/zstd >=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 rsync-verify? ( >=app-portage/gemato-14[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) 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_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 ) ) !<app-admin/logrotate-3.8.0 !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[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(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://gentoo/portage-2.3.103.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.103.tar.bz2
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b213469f74128a65011b04e6e0766557
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.99-r2 b/metadata/md5-cache/sys-apps/portage-2.3.99-r2
index 983a796444be..03dc177fa166 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.99-r2
+++ b/metadata/md5-cache/sys-apps/portage-2.3.99-r2
@@ -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_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.3.99.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.99.tar.bz2 https://github.com/gentoo/portage/commit/9738a404e876270cbdef2514f66915bce35d7435.patch -> portage-2.3.89-bug-718578.patch
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d7b9bafacff19aa05ad280ee0e41f5b7
diff --git a/metadata/md5-cache/sys-apps/portage-9999 b/metadata/md5-cache/sys-apps/portage-9999
index 8e2fa2ac3095..70c2aaef93a0 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/zstd >=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 rsync-verify? ( >=app-portage/gemato-14[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) 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_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 ) ) !<app-admin/logrotate-3.8.0 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[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(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2404b170e99484524419143b10c9cd80
diff --git a/metadata/md5-cache/sys-apps/pv-1.6.0-r1 b/metadata/md5-cache/sys-apps/pv-1.6.0-r1
index d2e729deafb2..47283341a231 100644
--- a/metadata/md5-cache/sys-apps/pv-1.6.0-r1
+++ b/metadata/md5-cache/sys-apps/pv-1.6.0-r1
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86
 LICENSE=Artistic-2
 SLOT=0
 SRC_URI=https://www.ivarch.com/programs/sources/pv-1.6.0.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d5256580ddd3ad054bb049e9c58808a2
diff --git a/metadata/md5-cache/sys-apps/pv-1.6.6 b/metadata/md5-cache/sys-apps/pv-1.6.6
index 0ac0adaf19aa..d57973cea824 100644
--- a/metadata/md5-cache/sys-apps/pv-1.6.6
+++ b/metadata/md5-cache/sys-apps/pv-1.6.6
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux
 LICENSE=Artistic-2
 SLOT=0
 SRC_URI=https://www.ivarch.com/programs/sources/pv-1.6.6.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1bc25d88abca04e55d696627919ce3a9
diff --git a/metadata/md5-cache/sys-apps/smc-sum-driver-1.6.0.20151201-r3 b/metadata/md5-cache/sys-apps/smc-sum-driver-1.6.0.20151201-r3
index 5e149d898573..0dbeb00d7e31 100644
--- a/metadata/md5-cache/sys-apps/smc-sum-driver-1.6.0.20151201-r3
+++ b/metadata/md5-cache/sys-apps/smc-sum-driver-1.6.0.20151201-r3
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( virtual/modutils )
 RESTRICT=bindist fetch mirror
 SLOT=0
 SRC_URI=sum_driver_V1.6.0_20151201.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c144ac12995aee9d0f41df25c111fad9
diff --git a/metadata/md5-cache/sys-apps/systemd-244.3 b/metadata/md5-cache/sys-apps/systemd-244.3
index 6d307b2df515..b508e915a46b 100644
--- a/metadata/md5-cache/sys-apps/systemd-244.3
+++ b/metadata/md5-cache/sys-apps/systemd-244.3
@@ -13,5 +13,5 @@ REQUIRED_USE=importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd-stable/archive/v244.3/systemd-stable-244.3.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
 _md5_=9b2023a3eee1ae729306dfa723d78737
diff --git a/metadata/md5-cache/sys-apps/systemd-245-r5 b/metadata/md5-cache/sys-apps/systemd-245-r5
index 13dce7a89e19..d12ed18689eb 100644
--- a/metadata/md5-cache/sys-apps/systemd-245-r5
+++ b/metadata/md5-cache/sys-apps/systemd-245-r5
@@ -13,5 +13,5 @@ REQUIRED_USE=homed? ( cryptsetup ) importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v245/systemd-245.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
 _md5_=a4aca2c5a700a247939d201f9c00fb7d
diff --git a/metadata/md5-cache/sys-apps/systemd-245.5 b/metadata/md5-cache/sys-apps/systemd-245.5
index b0f68be4c925..8a9b0e61e658 100644
--- a/metadata/md5-cache/sys-apps/systemd-245.5
+++ b/metadata/md5-cache/sys-apps/systemd-245.5
@@ -13,5 +13,5 @@ REQUIRED_USE=homed? ( cryptsetup ) importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd-stable/archive/v245.5/systemd-stable-245.5.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
 _md5_=c4f29f0aa5ca879cb3b908a4bc4ee372
diff --git a/metadata/md5-cache/sys-apps/systemd-9999 b/metadata/md5-cache/sys-apps/systemd-9999
index 9a9ad9575445..11c2150810eb 100644
--- a/metadata/md5-cache/sys-apps/systemd-9999
+++ b/metadata/md5-cache/sys-apps/systemd-9999
@@ -12,5 +12,5 @@ RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 REQUIRED_USE=homed? ( cryptsetup ) importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
 _md5_=1c1c0c2103d65109046bb0c6101412f9
diff --git a/metadata/md5-cache/sys-apps/tas-1.5.2.180622 b/metadata/md5-cache/sys-apps/tas-1.5.2.180622
index 0ebf853bada6..2e44c81c04fe 100644
--- a/metadata/md5-cache/sys-apps/tas-1.5.2.180622
+++ b/metadata/md5-cache/sys-apps/tas-1.5.2.180622
@@ -10,5 +10,5 @@ RDEPEND=net-misc/networkmanager sys-apps/ethtool sys-apps/net-tools sys-apps/sma
 RESTRICT=bindist fetch mirror
 SLOT=0
 SRC_URI=TAS_1.5.2_build.180622.zip
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2d86fec63788c4caadd86c16cb53be9f
diff --git a/metadata/md5-cache/sys-apps/thunderbolt-software-user-space-0.9.3-r1 b/metadata/md5-cache/sys-apps/thunderbolt-software-user-space-0.9.3-r1
index d31755efd7b7..284c45080a7a 100644
--- a/metadata/md5-cache/sys-apps/thunderbolt-software-user-space-0.9.3-r1
+++ b/metadata/md5-cache/sys-apps/thunderbolt-software-user-space-0.9.3-r1
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:=
 SLOT=0
 SRC_URI=https://github.com/intel/thunderbolt-software-user-space/archive/v0.9.3.tar.gz -> thunderbolt-software-user-space-0.9.3.tar.gz https://dev.gentoo.org/~asturm/distfiles/thunderbolt-software-user-space-0.9.3-tbtadm.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f07df4ba1b33cd7131af37d7e2ee85aa
diff --git a/metadata/md5-cache/sys-apps/ucspi-ssl-0.94-r1 b/metadata/md5-cache/sys-apps/ucspi-ssl-0.94-r1
index 8ae6475e505c..c16ae46929fb 100644
--- a/metadata/md5-cache/sys-apps/ucspi-ssl-0.94-r1
+++ b/metadata/md5-cache/sys-apps/ucspi-ssl-0.94-r1
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=dev-libs/openssl-0.9.6g:= net-libs/libnsl perl? ( dev-lang/perl:= ) sys-apps/ucspi-tcp
 SLOT=0
 SRC_URI=http://www.fehcom.de/ipnet/ucspi-ssl/ucspi-ssl-0.94.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	83a4685f5044b0b067cb7e6f0e9c909c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	d71e87f6dc80bb9af62fd46856dc0a92	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ec530d926190d1ac70fc8761c373ca2d
diff --git a/metadata/md5-cache/sys-apps/ucspi-ssl-0.97 b/metadata/md5-cache/sys-apps/ucspi-ssl-0.97
index 027a7f24b0a6..e46850fb2ad8 100644
--- a/metadata/md5-cache/sys-apps/ucspi-ssl-0.97
+++ b/metadata/md5-cache/sys-apps/ucspi-ssl-0.97
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=dev-libs/openssl-0.9.8z_p8:= net-libs/libnsl perl? ( dev-lang/perl:= ) sys-apps/ucspi-tcp
 SLOT=0
 SRC_URI=http://www.fehcom.de/ipnet/ucspi-ssl/ucspi-ssl-0.97.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	83a4685f5044b0b067cb7e6f0e9c909c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	d71e87f6dc80bb9af62fd46856dc0a92	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3e29c924afc825c2f1b68b6c24f3ad30
diff --git a/metadata/md5-cache/sys-apps/ucspi-ssl-0.98b b/metadata/md5-cache/sys-apps/ucspi-ssl-0.98b
index d680b7a9d0b4..9e891d7eab93 100644
--- a/metadata/md5-cache/sys-apps/ucspi-ssl-0.98b
+++ b/metadata/md5-cache/sys-apps/ucspi-ssl-0.98b
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=dev-libs/openssl:0= net-libs/libnsl perl? ( dev-lang/perl:= ) sys-apps/ucspi-tcp
 SLOT=0
 SRC_URI=http://www.fehcom.de/ipnet/ucspi-ssl/ucspi-ssl-0.98b.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	83a4685f5044b0b067cb7e6f0e9c909c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	d71e87f6dc80bb9af62fd46856dc0a92	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ff3f33f6e5d04acb0b1addc61e14ff2b
diff --git a/metadata/md5-cache/sys-apps/ucspi-ssl-0.99 b/metadata/md5-cache/sys-apps/ucspi-ssl-0.99
index 20d6bfdf6dbb..9b30489d861a 100644
--- a/metadata/md5-cache/sys-apps/ucspi-ssl-0.99
+++ b/metadata/md5-cache/sys-apps/ucspi-ssl-0.99
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=dev-libs/openssl:= net-libs/libnsl perl? ( dev-lang/perl:= ) sys-apps/ucspi-tcp
 SLOT=0
 SRC_URI=http://www.fehcom.de/ipnet/ucspi-ssl/ucspi-ssl-0.99.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	83a4685f5044b0b067cb7e6f0e9c909c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	d71e87f6dc80bb9af62fd46856dc0a92	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ebd6b82fce93f5626b2c68f7d974d125
diff --git a/metadata/md5-cache/sys-apps/ucspi-ssl-0.99e b/metadata/md5-cache/sys-apps/ucspi-ssl-0.99e
index a2f8bce8fdf4..35b82c3fd672 100644
--- a/metadata/md5-cache/sys-apps/ucspi-ssl-0.99e
+++ b/metadata/md5-cache/sys-apps/ucspi-ssl-0.99e
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0=[bindist=] ) perl? ( dev-lang/perl:= ) sys-apps/ucspi-tcp
 SLOT=0
 SRC_URI=https://www.fehcom.de/ipnet/ucspi-ssl/ucspi-ssl-0.99e.tgz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	qmail	83a4685f5044b0b067cb7e6f0e9c909c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	qmail	d71e87f6dc80bb9af62fd46856dc0a92	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b350d39de2dbd7272c4a7b267746e3f9
diff --git a/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r18 b/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r18
index b09409f743b4..4bedd2094c48 100644
--- a/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r18
+++ b/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r18
@@ -9,5 +9,5 @@ RDEPEND=!app-doc/ucspi-tcp-man selinux? ( sec-policy/selinux-ucspitcp )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://cr.yp.to/ucspi-tcp/ucspi-tcp-0.88.tar.gz mirror://qmail/ucspi-rss.diff http://smarden.org/pape/djb/manpages/ucspi-tcp-0.88-man.tar.gz http://xs3.b92.net/tomislavr/ucspi-tcp-0.88-rblspp.patch ipv6? ( https://www.fefe.de/ucspi/ucspi-tcp-0.88-ipv6.diff19.bz2 )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	83a4685f5044b0b067cb7e6f0e9c909c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	d71e87f6dc80bb9af62fd46856dc0a92	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c71d77b5a26439a262b8ee507b185004
diff --git a/metadata/md5-cache/sys-apps/unscd-0.52-r2 b/metadata/md5-cache/sys-apps/unscd-0.52-r2
deleted file mode 100644
index a7bcf557f203..000000000000
--- a/metadata/md5-cache/sys-apps/unscd-0.52-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=sys-libs/glibc[nscd(+)] virtual/pkgconfig
-DESCRIPTION=simple & stable nscd replacement
-EAPI=5
-HOMEPAGE=https://busybox.net/~vda/unscd/README
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/glibc[nscd(+)]
-SLOT=0
-SRC_URI=https://busybox.net/~vda/unscd/nscd-0.52.c
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5561822c92129c44099a93b4bb09aeb5
diff --git a/metadata/md5-cache/sys-apps/unscd-0.53 b/metadata/md5-cache/sys-apps/unscd-0.53
index a58977c9ab05..5ef846bab831 100644
--- a/metadata/md5-cache/sys-apps/unscd-0.53
+++ b/metadata/md5-cache/sys-apps/unscd-0.53
@@ -3,10 +3,10 @@ DEPEND=sys-libs/glibc[nscd(+)] virtual/pkgconfig
 DESCRIPTION=simple & stable nscd replacement
 EAPI=6
 HOMEPAGE=https://busybox.net/~vda/unscd/README
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/glibc[nscd(+)]
 SLOT=0
 SRC_URI=https://busybox.net/~vda/unscd/nscd-0.53.c
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e304ccbc8f911312ad599805d7948329
+_md5_=546ae7b99a5bbeaf1dce0526142cb828
diff --git a/metadata/md5-cache/sys-apps/usb_modeswitch-2.2.6 b/metadata/md5-cache/sys-apps/usb_modeswitch-2.2.6
index b5ceab58f7da..4b531e2efd3f 100644
--- a/metadata/md5-cache/sys-apps/usb_modeswitch-2.2.6
+++ b/metadata/md5-cache/sys-apps/usb_modeswitch-2.2.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/udev virtual/libusb:1 jimtcl? ( dev-lang/jimtcl ) !jimtcl? ( dev-lang/tcl:0 )
 SLOT=0
 SRC_URI=https://www.draisberghof.de/usb_modeswitch/usb-modeswitch-2.2.6.tar.bz2 https://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-20151101.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2c6c34daf1ced9964b93ddf26b8bd3c8
diff --git a/metadata/md5-cache/sys-apps/usb_modeswitch-2.3.0 b/metadata/md5-cache/sys-apps/usb_modeswitch-2.3.0
index 6ca0718fb3e5..51e68248b676 100644
--- a/metadata/md5-cache/sys-apps/usb_modeswitch-2.3.0
+++ b/metadata/md5-cache/sys-apps/usb_modeswitch-2.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/udev virtual/libusb:1 jimtcl? ( dev-lang/jimtcl ) !jimtcl? ( dev-lang/tcl:0 )
 SLOT=0
 SRC_URI=https://www.draisberghof.de/usb_modeswitch/usb-modeswitch-2.3.0.tar.bz2 https://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-20160112.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=64c03181c6c0d8035b7798ad07c4d501
diff --git a/metadata/md5-cache/sys-apps/usb_modeswitch-2.4.0-r1 b/metadata/md5-cache/sys-apps/usb_modeswitch-2.4.0-r1
index e165f9a6e018..b0a777bd0d07 100644
--- a/metadata/md5-cache/sys-apps/usb_modeswitch-2.4.0-r1
+++ b/metadata/md5-cache/sys-apps/usb_modeswitch-2.4.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/udev virtual/libusb:1 jimtcl? ( dev-lang/jimtcl ) !jimtcl? ( dev-lang/tcl:0 )
 SLOT=0
 SRC_URI=https://www.draisberghof.de/usb_modeswitch/usb-modeswitch-2.4.0.tar.bz2 https://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-20160803.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0f25a487f2c1395f5b90c36dc3582c02
diff --git a/metadata/md5-cache/sys-apps/usb_modeswitch-2.5.2 b/metadata/md5-cache/sys-apps/usb_modeswitch-2.5.2
index f12190443317..1b264962845d 100644
--- a/metadata/md5-cache/sys-apps/usb_modeswitch-2.5.2
+++ b/metadata/md5-cache/sys-apps/usb_modeswitch-2.5.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/udev virtual/libusb:1 jimtcl? ( dev-lang/jimtcl ) !jimtcl? ( dev-lang/tcl:0 )
 SLOT=0
 SRC_URI=https://www.draisberghof.de/usb_modeswitch/usb-modeswitch-2.5.2.tar.bz2 https://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-20170806.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e7fb9d5b99ef0acce8ab69cb58ec59e6
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.35.2 b/metadata/md5-cache/sys-apps/util-linux-2.35.2
index b6bfd272202e..16a2041aa6be 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.35.2
+++ b/metadata/md5-cache/sys-apps/util-linux-2.35.2
@@ -5,7 +5,7 @@ DESCRIPTION=Various useful Linux utilities
 EAPI=7
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux
 IUSE=audit build caps +cramfs cryptsetup fdformat hardlink kill +logger ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU split-usr python_targets_python3_6 python_targets_python3_7 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
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
 RDEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( sys-fs/cryptsetup ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) 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(-)] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) su? ( !<sys-apps/shadow-4.7-r2 !>=sys-apps/shadow-4.7-r2[su] ) !net-wireless/rfkill !<app-shells/bash-completion-2.7-r1
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/util-linux/v2.35/util-linux-2.35.2.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=7b3a1d21779921e47e3acb49fc0e036a
+_md5_=fc9c8a8648a3b3ce6b10687c78ca728d
diff --git a/metadata/md5-cache/sys-apps/x86info-1.30 b/metadata/md5-cache/sys-apps/x86info-1.30
index 6ff4be38b666..9f12d113f6ce 100644
--- a/metadata/md5-cache/sys-apps/x86info-1.30
+++ b/metadata/md5-cache/sys-apps/x86info-1.30
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/pciutils:=
 SLOT=0
 SRC_URI=http://www.codemonkey.org.uk/projects/x86info/x86info-1.30.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3a809e09ecb57a4ecf8b7599447e2a36
diff --git a/metadata/md5-cache/sys-apps/x86info-1.30-r1 b/metadata/md5-cache/sys-apps/x86info-1.30-r1
new file mode 100644
index 000000000000..bd15e0cb5743
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/x86info-1.30-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst setup
+DEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) sys-apps/pciutils:=
+DESCRIPTION=Dave Jones' handy, informative x86 CPU diagnostic utility
+EAPI=7
+HOMEPAGE=http://www.codemonkey.org.uk/projects/x86info/
+IUSE=kernel_linux
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/pciutils:=
+SLOT=0
+SRC_URI=http://www.codemonkey.org.uk/projects/x86info/x86info-1.30.tgz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=979fed0ee2a3f2d8aea8ff56754a215d
diff --git a/metadata/md5-cache/sys-apps/x86info-1.30_p20190617 b/metadata/md5-cache/sys-apps/x86info-1.30_p20190617
new file mode 100644
index 000000000000..c1a438bd34d6
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/x86info-1.30_p20190617
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst setup
+DEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) sys-apps/pciutils:=
+DESCRIPTION=Dave Jones' handy, informative x86 CPU diagnostic utility
+EAPI=7
+HOMEPAGE=http://www.codemonkey.org.uk/projects/x86info/
+IUSE=kernel_linux
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/pciutils:=
+SLOT=0
+SRC_URI=https://github.com/kernelslacker/x86info/archive/8ea5ed19fae1d209eba9257171a10f7afd474618.tar.gz -> x86info-1.30_p20190617.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f273e938ba67bf295818dea9b7c3dd7e
diff --git a/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.6.0-r1 b/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.6.0-r1
deleted file mode 100644
index c1c577a5c908..000000000000
--- a/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.6.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen sys-devel/gettext virtual/pkgconfig doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.3 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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
-DEPEND=dev-libs/glib:2 dev-libs/json-glib media-libs/fontconfig sys-fs/fuse:0 geolocation? ( >=app-misc/geoclue-2.5.3:2.0 ) screencast? ( media-video/pipewire:= )
-DESCRIPTION=Desktop integration portal
-EAPI=7
-HOMEPAGE=https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal
-IUSE=doc geolocation screencast
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/glib:2 dev-libs/json-glib media-libs/fontconfig sys-fs/fuse:0 geolocation? ( >=app-misc/geoclue-2.5.3:2.0 ) screencast? ( media-video/pipewire:= ) sys-apps/dbus
-SLOT=0
-SRC_URI=https://github.com/flatpak/xdg-desktop-portal/releases/download/1.6.0/xdg-desktop-portal-1.6.0.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b49d29ce82268b47b212a6447499d97a
diff --git a/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.6.0-r2 b/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.6.0-r2
new file mode 100644
index 000000000000..1e282454e712
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.6.0-r2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/gdbus-codegen sys-devel/gettext virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.3 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 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure
+DEPEND=dev-libs/glib:2 dev-libs/json-glib media-libs/fontconfig sys-fs/fuse:0 geolocation? ( >=app-misc/geoclue-2.5.3:2.0 ) screencast? ( media-video/pipewire:0/0.2 )
+DESCRIPTION=Desktop integration portal
+EAPI=7
+HOMEPAGE=https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal
+IUSE=doc geolocation screencast
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/glib:2 dev-libs/json-glib media-libs/fontconfig sys-fs/fuse:0 geolocation? ( >=app-misc/geoclue-2.5.3:2.0 ) screencast? ( media-video/pipewire:0/0.2 ) sys-apps/dbus
+SLOT=0
+SRC_URI=https://github.com/flatpak/xdg-desktop-portal/releases/download/1.6.0/xdg-desktop-portal-1.6.0.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=66725838b829713b1da0e4b8d0caa55b
diff --git a/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.7.2 b/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.7.2
new file mode 100644
index 000000000000..acb8771af81f
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.7.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/gdbus-codegen sys-devel/gettext virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.3 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 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure
+DEPEND=dev-libs/glib:2 dev-libs/json-glib media-libs/fontconfig sys-fs/fuse:0 geolocation? ( >=app-misc/geoclue-2.5.3:2.0 ) screencast? ( >=media-video/pipewire-0.3:= )
+DESCRIPTION=Desktop integration portal
+EAPI=7
+HOMEPAGE=https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal
+IUSE=doc geolocation screencast
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/glib:2 dev-libs/json-glib media-libs/fontconfig sys-fs/fuse:0 geolocation? ( >=app-misc/geoclue-2.5.3:2.0 ) screencast? ( >=media-video/pipewire-0.3:= ) sys-apps/dbus
+SLOT=0
+SRC_URI=https://github.com/flatpak/xdg-desktop-portal/releases/download/1.7.2/xdg-desktop-portal-1.7.2.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d0251d53d24aa672951fb232a4f52575
diff --git a/metadata/md5-cache/sys-apps/yarn-1.22.0 b/metadata/md5-cache/sys-apps/yarn-1.22.0
deleted file mode 100644
index 976eaa288a4f..000000000000
--- a/metadata/md5-cache/sys-apps/yarn-1.22.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=!dev-util/cmdtest net-libs/nodejs
-DESCRIPTION=Fast, reliable, and secure node dependency management
-EAPI=7
-HOMEPAGE=https://yarnpkg.com
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=!dev-util/cmdtest net-libs/nodejs
-SLOT=0
-SRC_URI=https://github.com/yarnpkg/yarn/releases/download/v1.22.0/yarn-v1.22.0.tar.gz
-_md5_=fa55070cef814c452ec508b4819626e2
diff --git a/metadata/md5-cache/sys-apps/yarn-1.22.4 b/metadata/md5-cache/sys-apps/yarn-1.22.4
index 58c66e001fa5..ec18d156b432 100644
--- a/metadata/md5-cache/sys-apps/yarn-1.22.4
+++ b/metadata/md5-cache/sys-apps/yarn-1.22.4
@@ -3,9 +3,9 @@ DEPEND=!dev-util/cmdtest net-libs/nodejs
 DESCRIPTION=Fast, reliable, and secure node dependency management
 EAPI=7
 HOMEPAGE=https://yarnpkg.com
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=!dev-util/cmdtest net-libs/nodejs
 SLOT=0
 SRC_URI=https://github.com/yarnpkg/yarn/releases/download/v1.22.4/yarn-v1.22.4.tar.gz
-_md5_=fa55070cef814c452ec508b4819626e2
+_md5_=1b2951f34c0d216d3db2decbd7a29f8e
diff --git a/metadata/md5-cache/sys-auth/AusweisApp2-1.20.0 b/metadata/md5-cache/sys-auth/AusweisApp2-1.20.0
deleted file mode 100644
index 987e25db43d9..000000000000
--- a/metadata/md5-cache/sys-auth/AusweisApp2-1.20.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/openssl:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5[qml] dev-qt/qtwidgets:5 net-libs/http-parser:0= sys-apps/pcsc-lite virtual/udev
-DESCRIPTION=Official authentication app for German ID cards and residence permits
-EAPI=7
-HOMEPAGE=https://www.ausweisapp.bund.de/
-KEYWORDS=~amd64 ~x86
-LICENSE=EUPL-1.2
-RDEPEND=dev-libs/openssl:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5[qml] dev-qt/qtwidgets:5 net-libs/http-parser:0= sys-apps/pcsc-lite virtual/udev
-SLOT=0
-SRC_URI=https://github.com/Governikus/AusweisApp2/archive/1.20.0.tar.gz -> AusweisApp2-1.20.0.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a3e66f09081f9872245ccb6f72477b9c
diff --git a/metadata/md5-cache/sys-auth/AusweisApp2-1.20.1 b/metadata/md5-cache/sys-auth/AusweisApp2-1.20.1
new file mode 100644
index 000000000000..ddc7aa0c4a30
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/AusweisApp2-1.20.1
@@ -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=dev-libs/openssl:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5[qml] dev-qt/qtwidgets:5 net-libs/http-parser:0= sys-apps/pcsc-lite virtual/udev
+DESCRIPTION=Official authentication app for German ID cards and residence permits
+EAPI=7
+HOMEPAGE=https://www.ausweisapp.bund.de/
+KEYWORDS=~amd64 ~x86
+LICENSE=EUPL-1.2
+RDEPEND=dev-libs/openssl:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5[qml] dev-qt/qtwidgets:5 net-libs/http-parser:0= sys-apps/pcsc-lite virtual/udev
+SLOT=0
+SRC_URI=https://github.com/Governikus/AusweisApp2/archive/1.20.1.tar.gz -> AusweisApp2-1.20.1.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6da17e264ef092df6480b786cf626019
diff --git a/metadata/md5-cache/sys-auth/AusweisApp2-9999 b/metadata/md5-cache/sys-auth/AusweisApp2-9999
index f03351173082..1ecd5c7cc2f9 100644
--- a/metadata/md5-cache/sys-auth/AusweisApp2-9999
+++ b/metadata/md5-cache/sys-auth/AusweisApp2-9999
@@ -1,5 +1,5 @@
 BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
 DEPEND=dev-libs/openssl:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5[qml] dev-qt/qtwidgets:5 net-libs/http-parser:0= sys-apps/pcsc-lite virtual/udev
 DESCRIPTION=Official authentication app for German ID cards and residence permits
 EAPI=7
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=dev-libs/openssl:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5[qml] dev-qt/qtwidgets:5 net-libs/http-parser:0= sys-apps/pcsc-lite virtual/udev
 SLOT=0
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1d6ce13f13ec4b354c3cee7429047000
+_md5_=43895960cdfbc9a546ff60bf80606168
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 403cdd437dd9..dee7a95036de 100644
--- a/metadata/md5-cache/sys-auth/Manifest.gz
+++ b/metadata/md5-cache/sys-auth/Manifest.gz
diff --git a/metadata/md5-cache/sys-auth/consolekit-0.4.6 b/metadata/md5-cache/sys-auth/consolekit-0.4.6
index 978af1fbcd36..42c878b92753 100644
--- a/metadata/md5-cache/sys-auth/consolekit-0.4.6
+++ b/metadata/md5-cache/sys-auth/consolekit-0.4.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.38.2-r1:2= sys-libs/zlib:
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-0.4.6.tar.xz https://launchpad.net/debian/+archive/primary/+files/consolekit_0.4.6-4.debian.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=367f4fe4f49c7159e901d1005b10e109
diff --git a/metadata/md5-cache/sys-auth/consolekit-1.1.0-r1 b/metadata/md5-cache/sys-auth/consolekit-1.1.0-r1
index a3e4dea5ce04..a7983fd614de 100644
--- a/metadata/md5-cache/sys-auth/consolekit-1.1.0-r1
+++ b/metadata/md5-cache/sys-auth/consolekit-1.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.40:2=[dbus] >=sys-devel/gettext-0.19 sys-apps/dbus sys
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ConsoleKit2/ConsoleKit2/releases/download/1.1.0/ConsoleKit2-1.1.0.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=50580ce117393c4695f2f40ac8adaf75
diff --git a/metadata/md5-cache/sys-auth/consolekit-1.1.2 b/metadata/md5-cache/sys-auth/consolekit-1.1.2
index 8e27b3c93482..f5a230cba310 100644
--- a/metadata/md5-cache/sys-auth/consolekit-1.1.2
+++ b/metadata/md5-cache/sys-auth/consolekit-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.40:2=[dbus] >=sys-devel/gettext-0.19 sys-apps/dbus sys
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ConsoleKit2/ConsoleKit2/releases/download/1.1.2/ConsoleKit2-1.1.2.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d0e8b8c2b43a54d860075d8b7f2c697a
diff --git a/metadata/md5-cache/sys-auth/consolekit-1.2.0 b/metadata/md5-cache/sys-auth/consolekit-1.2.0
index 172580ea0e05..731e1eb8584a 100644
--- a/metadata/md5-cache/sys-auth/consolekit-1.2.0
+++ b/metadata/md5-cache/sys-auth/consolekit-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.40:2=[dbus] >=sys-devel/gettext-0.19 sys-apps/dbus sys
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ConsoleKit2/ConsoleKit2/releases/download/1.2.0/ConsoleKit2-1.2.0.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a0d72e42a96a7fcdab86d9bea8b4e02d
diff --git a/metadata/md5-cache/sys-auth/consolekit-1.2.1 b/metadata/md5-cache/sys-auth/consolekit-1.2.1
index 4322167d87f8..944505c9217c 100644
--- a/metadata/md5-cache/sys-auth/consolekit-1.2.1
+++ b/metadata/md5-cache/sys-auth/consolekit-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.40:2=[dbus] >=sys-devel/gettext-0.19 sys-apps/dbus sys
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ConsoleKit2/ConsoleKit2/releases/download/1.2.1/ConsoleKit2-1.2.1.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=886ed09b9933f531f01ddae8ddf73954
diff --git a/metadata/md5-cache/sys-auth/consolekit-9999 b/metadata/md5-cache/sys-auth/consolekit-9999
index 9c37c2121c2e..5cea583aa4bd 100644
--- a/metadata/md5-cache/sys-auth/consolekit-9999
+++ b/metadata/md5-cache/sys-auth/consolekit-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/glib-2.40:2=[dbus] >=sys-devel/gettext-0.19 sys-apps/dbus sys-libs/zlib:= x11-libs/libX11:= acl? ( sys-apps/acl:= >=virtual/udev-200 ) cgroups? ( app-admin/cgmanager >=sys-libs/libnih-1.0.2[dbus] ) evdev? ( dev-libs/libevdev:= ) udev? ( virtual/libudev x11-libs/libdrm:= ) pam? ( sys-libs/pam ) policykit? ( >=sys-auth/polkit-0.110 ) selinux? ( sys-libs/libselinux ) kernel_linux? ( sys-apps/coreutils[acl?] ) pm-utils? ( sys-power/pm-utils ) selinux? ( sec-policy/selinux-consolekit )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7d208a259fc09b40cc316a7d70b0d943
diff --git a/metadata/md5-cache/sys-auth/elogind-243.7 b/metadata/md5-cache/sys-auth/elogind-243.7
index 58d66eb15428..c6d2bca6be45 100644
--- a/metadata/md5-cache/sys-auth/elogind-243.7
+++ b/metadata/md5-cache/sys-auth/elogind-243.7
@@ -11,5 +11,5 @@ PDEPEND=sys-apps/dbus policykit? ( sys-auth/polkit )
 RDEPEND=sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/acl ) pam? ( sys-libs/pam ) selinux? ( sys-libs/libselinux ) !sys-apps/systemd
 SLOT=0
 SRC_URI=https://github.com/elogind/elogind/archive/v243.7.tar.gz -> elogind-243.7.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c6ec6e03fc658c7a7071a0ae6c801a47
diff --git a/metadata/md5-cache/sys-auth/libnss-nis-1.4 b/metadata/md5-cache/sys-auth/libnss-nis-1.4
deleted file mode 100644
index fb83b1400bf2..000000000000
--- a/metadata/md5-cache/sys-auth/libnss-nis-1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>net-libs/libnsl-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(-)?] net-libs/libtirpc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_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.26 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=NSS module to provide NIS support
-EAPI=6
-HOMEPAGE=https://github.com/thkukuk/libnss_nis
-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 ~riscv
-LICENSE=LGPL-2.1+ BSD ISC
-RDEPEND=>net-libs/libnsl-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(-)?] net-libs/libtirpc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_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.26
-SLOT=0
-SRC_URI=https://github.com/thkukuk/libnss_nis/archive/v1.4.tar.gz -> libnss-nis-1.4.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2720b98c641699fd0a510485412f5d6e
diff --git a/metadata/md5-cache/sys-auth/rtkit-0.12-r1 b/metadata/md5-cache/sys-auth/rtkit-0.12-r1
index 585cb576c160..0682c8ae3dc7 100644
--- a/metadata/md5-cache/sys-auth/rtkit-0.12-r1
+++ b/metadata/md5-cache/sys-auth/rtkit-0.12-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-3 BSD
 RDEPEND=acct-group/rtkit acct-user/rtkit sys-apps/dbus sys-auth/polkit sys-libs/libcap systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=https://github.com/heftig/rtkit/releases/download/v0.12/rtkit-0.12.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0049266179dca24bbdfe3aac60cd2070
diff --git a/metadata/md5-cache/sys-auth/rtkit-0.13-r1 b/metadata/md5-cache/sys-auth/rtkit-0.13-r1
index 0ff567f393e1..1b11d4314c43 100644
--- a/metadata/md5-cache/sys-auth/rtkit-0.13-r1
+++ b/metadata/md5-cache/sys-auth/rtkit-0.13-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-3 BSD
 RDEPEND=acct-group/rtkit acct-user/rtkit sys-apps/dbus sys-auth/polkit sys-libs/libcap systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=https://github.com/heftig/rtkit/releases/download/v0.13/rtkit-0.13.tar.xz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7be95faf3953449d02c7cd38cf72c7f3
diff --git a/metadata/md5-cache/sys-auth/sssd-1.16.3-r3 b/metadata/md5-cache/sys-auth/sssd-1.16.3-r3
index 5df7a7be05ef..d4b160a22728 100644
--- a/metadata/md5-cache/sys-auth/sssd-1.16.3-r3
+++ b/metadata/md5-cache/sys-auth/sssd-1.16.3-r3
@@ -11,5 +11,5 @@ RDEPEND=>=sys-libs/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mi
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://releases.pagure.org/SSSD/sssd/sssd-1.16.3.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8f47924c7cb6b1fb7a68c931916c0ba5
diff --git a/metadata/md5-cache/sys-auth/sssd-2.1.0-r1 b/metadata/md5-cache/sys-auth/sssd-2.1.0-r1
index 01f295fef712..a8208b5d37b4 100644
--- a/metadata/md5-cache/sys-auth/sssd-2.1.0-r1
+++ b/metadata/md5-cache/sys-auth/sssd-2.1.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=sys-libs/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mi
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://releases.pagure.org/SSSD/sssd/sssd-2.1.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2d0bbd0fc4b769eaf6e9d920e58fa5f3
diff --git a/metadata/md5-cache/sys-auth/sssd-2.2.0-r1 b/metadata/md5-cache/sys-auth/sssd-2.2.0-r1
index 1be434dba1cf..fdbd00de78d5 100644
--- a/metadata/md5-cache/sys-auth/sssd-2.2.0-r1
+++ b/metadata/md5-cache/sys-auth/sssd-2.2.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=sys-libs/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mi
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://releases.pagure.org/SSSD/sssd/sssd-2.2.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2d0bbd0fc4b769eaf6e9d920e58fa5f3
diff --git a/metadata/md5-cache/sys-auth/sssd-2.2.2 b/metadata/md5-cache/sys-auth/sssd-2.2.2
index 49d3669c0f34..b6edae948a9f 100644
--- a/metadata/md5-cache/sys-auth/sssd-2.2.2
+++ b/metadata/md5-cache/sys-auth/sssd-2.2.2
@@ -11,5 +11,5 @@ RDEPEND=>=sys-libs/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mi
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://releases.pagure.org/SSSD/sssd/sssd-2.2.2.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2d0bbd0fc4b769eaf6e9d920e58fa5f3
diff --git a/metadata/md5-cache/sys-auth/sssd-2.2.3 b/metadata/md5-cache/sys-auth/sssd-2.2.3
index d74dd481b49a..ba97b65efa44 100644
--- a/metadata/md5-cache/sys-auth/sssd-2.2.3
+++ b/metadata/md5-cache/sys-auth/sssd-2.2.3
@@ -11,5 +11,5 @@ RDEPEND=>=sys-libs/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mi
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://releases.pagure.org/SSSD/sssd/sssd-2.2.3.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2d0bbd0fc4b769eaf6e9d920e58fa5f3
diff --git a/metadata/md5-cache/sys-auth/thinkfinger-0.3-r3 b/metadata/md5-cache/sys-auth/thinkfinger-0.3-r3
index f265d91277b1..83b3fe5f5454 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	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	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 f373b8d446df..d42d29b59275 100644
--- a/metadata/md5-cache/sys-block/Manifest.gz
+++ b/metadata/md5-cache/sys-block/Manifest.gz
diff --git a/metadata/md5-cache/sys-block/arcconf-2.01.22270-r1 b/metadata/md5-cache/sys-block/arcconf-2.01.22270-r1
index a3848b791dc1..2d076428b219 100644
--- a/metadata/md5-cache/sys-block/arcconf-2.01.22270-r1
+++ b/metadata/md5-cache/sys-block/arcconf-2.01.22270-r1
@@ -9,5 +9,5 @@ LICENSE=Microsemi
 RESTRICT=fetch mirror bindist
 SLOT=0
 SRC_URI=http://download.adaptec.com/raid/storage_manager/arcconf_v2_01_22270.zip
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2fc553089736953c5ab96cc9c8bb06ef
diff --git a/metadata/md5-cache/sys-block/arcconf-3.01.23531 b/metadata/md5-cache/sys-block/arcconf-3.01.23531
index bdaf601a0df6..ec627a456b22 100644
--- a/metadata/md5-cache/sys-block/arcconf-3.01.23531
+++ b/metadata/md5-cache/sys-block/arcconf-3.01.23531
@@ -9,5 +9,5 @@ LICENSE=Microsemi
 RESTRICT=fetch mirror bindist
 SLOT=0
 SRC_URI=http://download.adaptec.com/raid/storage_manager/arcconf_v3_01_23531.zip
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=72434fd3dbb98571065664abca9b6de2
diff --git a/metadata/md5-cache/sys-block/arcconf-3.04.23699 b/metadata/md5-cache/sys-block/arcconf-3.04.23699
index 006208f60278..0d454c767adb 100644
--- a/metadata/md5-cache/sys-block/arcconf-3.04.23699
+++ b/metadata/md5-cache/sys-block/arcconf-3.04.23699
@@ -9,5 +9,5 @@ LICENSE=Microsemi
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://download.adaptec.com/raid/storage_manager/arcconf_v3_04_23699.zip
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1d6be39f1671e9dfc091043797f2487c
diff --git a/metadata/md5-cache/sys-block/blktrace-1.1.0 b/metadata/md5-cache/sys-block/blktrace-1.1.0
index b62047233fcb..9b6f28b3f2e8 100644
--- a/metadata/md5-cache/sys-block/blktrace-1.1.0
+++ b/metadata/md5-cache/sys-block/blktrace-1.1.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://brick.kernel.dk/snaps/blktrace-1.1.0.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b2a2f3be448a9ceb531c68e6fba191be
diff --git a/metadata/md5-cache/sys-block/blktrace-1.1.0-r1 b/metadata/md5-cache/sys-block/blktrace-1.1.0-r1
index 5f0c4bcded54..6987c34ce649 100644
--- a/metadata/md5-cache/sys-block/blktrace-1.1.0-r1
+++ b/metadata/md5-cache/sys-block/blktrace-1.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libaio
 SLOT=0
 SRC_URI=https://brick.kernel.dk/snaps/blktrace-1.1.0.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=55263e21b154e6175c888a694a662392
diff --git a/metadata/md5-cache/sys-block/blktrace-1.2.0 b/metadata/md5-cache/sys-block/blktrace-1.2.0
index 5f7a34615a1b..967c04870073 100644
--- a/metadata/md5-cache/sys-block/blktrace-1.2.0
+++ b/metadata/md5-cache/sys-block/blktrace-1.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libaio
 SLOT=0
 SRC_URI=https://brick.kernel.dk/snaps/blktrace-1.2.0.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fb677ef0bb6ebc79d19cbed0258d60e3
diff --git a/metadata/md5-cache/sys-block/disktype-9-r1 b/metadata/md5-cache/sys-block/disktype-9-r1
new file mode 100644
index 000000000000..35ac3a92aca6
--- /dev/null
+++ b/metadata/md5-cache/sys-block/disktype-9-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Detect the content format of a disk or disk image
+EAPI=7
+HOMEPAGE=http://disktype.sourceforge.net/
+KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=mirror://sourceforge/disktype/disktype-9.tar.gz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8c35d53b5f4a7c063def116d73b4954b
diff --git a/metadata/md5-cache/sys-block/f3-7.2 b/metadata/md5-cache/sys-block/f3-7.2
index 16eb40eb2655..5c5e4ab9ccf8 100644
--- a/metadata/md5-cache/sys-block/f3-7.2
+++ b/metadata/md5-cache/sys-block/f3-7.2
@@ -4,9 +4,9 @@ DESCRIPTION=Utilities to detect broken or counterfeit flash storage
 EAPI=7
 HOMEPAGE=http://oss.digirati.com.br/f3/ https://github.com/AltraMayor/f3
 IUSE=extra
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 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	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=74fb3fbeaad134796e0f02e38893f67b
+_md5_=8dc3b80de0a6fd81b552caeabc874b74
diff --git a/metadata/md5-cache/sys-block/mbuffer-20191016 b/metadata/md5-cache/sys-block/mbuffer-20191016
index 0cce1a6a6a04..353e3083e2b8 100644
--- a/metadata/md5-cache/sys-block/mbuffer-20191016
+++ b/metadata/md5-cache/sys-block/mbuffer-20191016
@@ -5,7 +5,7 @@ DESCRIPTION=M(easuring)buffer is a replacement for buffer with additional functi
 EAPI=7
 HOMEPAGE=https://www.maier-komor.de/mbuffer.html
 IUSE=debug ssl test
-KEYWORDS=amd64 ~arm ~arm64 ppc x86
+KEYWORDS=amd64 arm ~arm64 ppc x86
 LICENSE=GPL-3
 RDEPEND=ssl? ( dev-libs/openssl:0= )
 REQUIRED_USE=test? ( ssl )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.maier-komor.de/software/mbuffer/mbuffer-20191016.tgz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5ac4343910f8e6169c5ee92e7ed5f651
+_md5_=c030e4e1561aaeb54640a093256ab3be
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r1 b/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r1
index 8a1cb48d9d91..13f7748fdfbd 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r1
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=slp? ( net-libs/openslp ) sys-fs/lsscsi sys-apps/util-linux
 SLOT=0
 SRC_URI=http://www.open-iscsi.org/bits/open-iscsi-2.0-873.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=da7c7150bbcacd3198827ca93becf054
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.875 b/metadata/md5-cache/sys-block/open-iscsi-2.0.875
index 1787b2f2f4a3..f8d98f81b008 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.875
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.875
@@ -10,5 +10,5 @@ RDEPEND=sys-block/open-isns:= infiniband? ( sys-fabric/ofed ) sys-kernel/linux-h
 REQUIRED_USE=infiniband? ( rdma ) || ( rdma tcp )
 SLOT=0
 SRC_URI=https://github.com/open-iscsi/open-iscsi/archive/2.0.875.tar.gz -> open-iscsi-2.0.875.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=5e8eb9a60dc9feae9bc129fbdbee26fd
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.878-r1 b/metadata/md5-cache/sys-block/open-iscsi-2.0.878-r1
index e5728c4961f8..4c37cf4344e7 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.878-r1
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.878-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-apps/kmod sys-block/open-isns:= sys-kernel/linux-headers infiniband?
 REQUIRED_USE=infiniband? ( rdma ) || ( rdma tcp )
 SLOT=0/0.2
 SRC_URI=https://github.com/open-iscsi/open-iscsi/archive/2.0.878.tar.gz -> open-iscsi-2.0.878.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=91dee93f19097b2c26621e23979639c1
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.1.0 b/metadata/md5-cache/sys-block/open-iscsi-2.1.0
index dcd7fa5b12ca..3b2ed814b9e8 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.1.0
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.1.0
@@ -11,5 +11,5 @@ RDEPEND=sys-apps/kmod sys-block/open-isns:= sys-kernel/linux-headers infiniband?
 REQUIRED_USE=infiniband? ( rdma ) || ( rdma tcp )
 SLOT=0/0.2
 SRC_URI=https://github.com/open-iscsi/open-iscsi/archive/2.1.0.tar.gz -> open-iscsi-2.1.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=221a4e1dfba89b3f28292ddce33fc29c
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.1.1 b/metadata/md5-cache/sys-block/open-iscsi-2.1.1
index 5bb82aa56d9f..66a5b9498243 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.1.1
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.1.1
@@ -11,5 +11,5 @@ RDEPEND=sys-apps/kmod sys-block/open-isns:= sys-kernel/linux-headers infiniband?
 REQUIRED_USE=infiniband? ( rdma ) || ( rdma tcp )
 SLOT=0/0.2
 SRC_URI=https://github.com/open-iscsi/open-iscsi/archive/2.1.1.tar.gz -> open-iscsi-2.1.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=6517e3f343199853abb9ed288cea4e4b
diff --git a/metadata/md5-cache/sys-block/rts5229-1.07-r6 b/metadata/md5-cache/sys-block/rts5229-1.07-r6
index a6793809da62..35cc8fde02a5 100644
--- a/metadata/md5-cache/sys-block/rts5229-1.07-r6
+++ b/metadata/md5-cache/sys-block/rts5229-1.07-r6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~vikraman/distfiles/rts5229-1.07.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3b357cec520970b771582a09fe196542
diff --git a/metadata/md5-cache/sys-block/rts_pstor-1.10_p20160103 b/metadata/md5-cache/sys-block/rts_pstor-1.10_p20160103
index e61f700f24f0..7ca6b460575e 100644
--- a/metadata/md5-cache/sys-block/rts_pstor-1.10_p20160103
+++ b/metadata/md5-cache/sys-block/rts_pstor-1.10_p20160103
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/gexplorer/RTS5209-linux-driver/archive/c8313abffe083ac63bf76d2cc90d3edf5b2d1188.tar.gz -> rts_pstor-1.10_p20160103.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f68586464c5eca698f0eb4f9a4cb5090
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index a6a2f42bdffc..9940c916e46e 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 9a9b043121be..bc414dd682c8 100644
--- a/metadata/md5-cache/sys-boot/gnu-efi-3.0.11
+++ b/metadata/md5-cache/sys-boot/gnu-efi-3.0.11
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile install prepare
 DESCRIPTION=Library for build EFI Applications
 EAPI=7
-HOMEPAGE=http://gnu-efi.sourceforge.net/
+HOMEPAGE=https://sourceforge.net/projects/gnu-efi/
 IUSE=abi_x86_32 abi_x86_64 custom-cflags
 KEYWORDS=-* amd64 arm arm64 ~ia64 x86
 LICENSE=GPL-2+ BSD BSD-2
@@ -9,4 +9,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/gnu-efi/gnu-efi-3.0.11.tar.bz2
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0e8dbc15d0e077befb74654f203d28e4
+_md5_=d7aff43531a431bd6e16f87ca5271c0b
diff --git a/metadata/md5-cache/sys-boot/gnu-efi-3.0.12 b/metadata/md5-cache/sys-boot/gnu-efi-3.0.12
new file mode 100644
index 000000000000..b8bd80d6cf05
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/gnu-efi-3.0.12
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Library for build EFI Applications
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/gnu-efi/
+IUSE=abi_x86_32 abi_x86_64 custom-cflags
+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.12.tar.bz2
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d7aff43531a431bd6e16f87ca5271c0b
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 4f6fa824b6ac..840ad660b99b 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-14.2.10 b/metadata/md5-cache/sys-cluster/ceph-14.2.10
new file mode 100644
index 000000000000..f847a7a14494
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/ceph-14.2.10
@@ -0,0 +1,15 @@
+BDEPEND=amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) app-arch/cpio >=dev-util/cmake-3.5.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(-)] dev-python/sphinx dev-util/cunit dev-util/gperf dev-util/ragel dev-util/valgrind sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/sed sys-apps/which sys-devel/bc sys-devel/patch virtual/pkgconfig 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(-)] dev-python/virtualenv[python_targets_python3_6(-)?,python_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-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(-)] sys-apps/grep[pcre] sys-fs/btrfs-progs ) sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DESCRIPTION=Ceph distributed filesystem
+EAPI=7
+HOMEPAGE=https://ceph.com/
+IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc kafka kerberos ldap libressl lttng +mgr numa +openssl rabbitmq +radosgw +ssl spdk 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 python_targets_python3_8
+KEYWORDS=~amd64 ~ppc64
+LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
+RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/xmlsec:=[!openssl?,!libressl?] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= openssl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) ssl? ( openssl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) system-boost? ( =dev-libs/boost-1.72*[threads,context,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(-)] ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_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/sudo net-misc/socat sys-apps/gptfdisk >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk 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/cherrypy[python_targets_python3_6(-)?,python_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/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/pecan[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/prettytable[python_targets_python3_6(-)?,python_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/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(-)] 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(-)] mgr? ( dev-python/more-itertools[python_targets_python3_6(-)?,python_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(-)] dev-python/pyjwt[python_targets_python3_6(-)?,python_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(-)] dev-python/routes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] diskprediction? ( python_targets_python3_6? ( <sci-libs/scipy-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( <sci-libs/scipy-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) sci-libs/scikits_learn[python_targets_python3_6(-)?,python_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(-)] ) virtual/tmpfiles
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ?? ( jemalloc tcmalloc ) ^^ ( openssl libressl ) diskprediction? ( mgr !python_targets_python3_8 ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw )
+RESTRICT=test? ( userpriv ) test
+SLOT=0
+SRC_URI=https://download.ceph.com/tarballs/ceph-14.2.10.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a747e931754f7df79bc06051118b6958
diff --git a/metadata/md5-cache/sys-cluster/ceph-14.2.7-r1 b/metadata/md5-cache/sys-cluster/ceph-14.2.7-r1
deleted file mode 100644
index 884043355d00..000000000000
--- a/metadata/md5-cache/sys-cluster/ceph-14.2.7-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/coreutils sys-apps/findutils sys-apps/grep sys-apps/sed sys-apps/which sys-devel/bc sys-devel/patch 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:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/nss:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) fuse? ( sys-fs/fuse:0= ) kerberos? ( virtual/krb5 ) rabbitmq? ( net-libs/rabbitmq-c:= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) radosgw? ( dev-libs/expat:= !libressl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) system-boost? ( || ( =dev-libs/boost-1.71*[threads,context,python,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,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,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-libs/boost:=[threads,context,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.4:= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.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 spdk 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
-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:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/nss:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) fuse? ( sys-fs/fuse:0= ) kerberos? ( virtual/krb5 ) rabbitmq? ( net-libs/rabbitmq-c:= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) radosgw? ( dev-libs/expat:= !libressl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) system-boost? ( || ( =dev-libs/boost-1.71*[threads,context,python,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,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,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-libs/boost:=[threads,context,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.4:= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.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	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a4d1ae7250fb935f502d863bdc167fd6
diff --git a/metadata/md5-cache/sys-cluster/ceph-15.2.3 b/metadata/md5-cache/sys-cluster/ceph-15.2.3
index 7ddc2a4bbdae..85ed3a51e838 100644
--- a/metadata/md5-cache/sys-cluster/ceph-15.2.3
+++ b/metadata/md5-cache/sys-cluster/ceph-15.2.3
@@ -4,7 +4,7 @@ DESCRIPTION=Ceph distributed filesystem
 EAPI=7
 HOMEPAGE=https://ceph.com/
 IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc kafka kerberos ldap libressl lttng +mgr numa +openssl pmdk rabbitmq +radosgw rbd-rwl +ssl spdk system-boost systemd +tcmalloc test uring 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 python_targets_python3_8
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
 RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/xmlsec:=[!openssl?,!libressl?] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= openssl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) ssl? ( openssl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) system-boost? ( =dev-libs/boost-1.72*[threads,context,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(-)] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_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/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk 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/cherrypy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-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_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/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/pecan[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/prettytable[python_targets_python3_6(-)?,python_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/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(-)] 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(-)] mgr? ( dev-python/jsonpatch[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/more-itertools[python_targets_python3_6(-)?,python_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(-)] dev-python/pyjwt[python_targets_python3_6(-)?,python_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(-)] dev-python/routes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] diskprediction? ( python_targets_python3_6? ( <sci-libs/scipy-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( <sci-libs/scipy-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) sci-libs/scikits_learn[python_targets_python3_6(-)?,python_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(-)] ) virtual/tmpfiles
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ?? ( jemalloc tcmalloc ) ^^ ( openssl libressl ) diskprediction? ( mgr !python_targets_python3_8 ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw )
@@ -12,4 +12,4 @@ RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-15.2.3.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fe2cf1d3c92e585f0ee25dd59b52b24c
+_md5_=876450f9aebaa96d465fa076486212ac
diff --git a/metadata/md5-cache/sys-cluster/cinder-15.1.0-r1 b/metadata/md5-cache/sys-cluster/cinder-15.1.0-r1
index d98da5b464b0..2bd21ebb7dbb 100644
--- a/metadata/md5-cache/sys-cluster/cinder-15.1.0-r1
+++ b/metadata/md5-cache/sys-cluster/cinder-15.1.0-r1
@@ -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-15.1.0 https://tarballs.openstack.org/cinder/cinder-15.1.0.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7149509227c209d3f3efd9a3a47e3df9
diff --git a/metadata/md5-cache/sys-cluster/cinder-15.2.0 b/metadata/md5-cache/sys-cluster/cinder-15.2.0
index ed43f3832158..d9e0cdb41d43 100644
--- a/metadata/md5-cache/sys-cluster/cinder-15.2.0
+++ b/metadata/md5-cache/sys-cluster/cinder-15.2.0
@@ -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-15.2.0 https://tarballs.openstack.org/cinder/cinder-15.2.0.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f876ea31e1694869f9c4cb7dee5f8dd5
diff --git a/metadata/md5-cache/sys-cluster/cinder-15.3.0 b/metadata/md5-cache/sys-cluster/cinder-15.3.0
new file mode 100644
index 000000000000..8c7b88df3287
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/cinder-15.3.0
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=dev-python/setuptools[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-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_7 kernel_linux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/decorator-3.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/defusedxml-0.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/eventlet-0.22.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/eventlet-0.23.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/eventlet-0.25.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/greenlet-0.4.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/httplib2-0.9.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/jsonschema-2.6.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/keystonemiddleware-4.21.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/lxml-3.4.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/lxml-3.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.27.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-6.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-policy-1.44.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-privsep-1.32.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-2.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.24.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/oslo-service-1.28.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.34.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-versionedobjects-1.31.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/paramiko-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/paste-2.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/prettytable-0.7.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] <dev-python/prettytable-0.8[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/psutil-3.2.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyparsing-2.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-barbicanclient-4.5.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-glanceclient-2.15.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-keystoneclient-3.15.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pytz-2013.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/requests-2.20.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/retrying-1.2.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/retrying-1.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/routes-2.3.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/taskflow-3.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/rtslib-fb-2.1.65[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ~dev-python/suds-0.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-vmware-2.17.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-brick-2.10.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-win-3.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/tooz-1.58.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/google-api-python-client-1.4.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/castellan-0.16.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/cryptography-2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/cursive-0.2.1[python_targets_python3_7(-)?,-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 acct-user/cinder acct-group/cinder 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=|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma ) || ( 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.3.0 https://tarballs.openstack.org/cinder/cinder-15.3.0.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=78b193252cf964c3f646b245e4bd4201
diff --git a/metadata/md5-cache/sys-cluster/cinder-16.0.0 b/metadata/md5-cache/sys-cluster/cinder-16.0.0
index 8adae89c89c4..dfe5c8e0179a 100644
--- a/metadata/md5-cache/sys-cluster/cinder-16.0.0
+++ b/metadata/md5-cache/sys-cluster/cinder-16.0.0
@@ -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/ussuri/cinder.conf.sample -> cinder.conf.sample-16.0.0 https://tarballs.openstack.org/cinder/cinder-16.0.0.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=724457ae12ed8af4f0020f161546dab4
diff --git a/metadata/md5-cache/sys-cluster/cinder-16.1.0 b/metadata/md5-cache/sys-cluster/cinder-16.1.0
index db7af04c90a0..cd43c64bd745 100644
--- a/metadata/md5-cache/sys-cluster/cinder-16.1.0
+++ b/metadata/md5-cache/sys-cluster/cinder-16.1.0
@@ -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/ussuri/cinder.conf.sample -> cinder.conf.sample-16.1.0 https://tarballs.openstack.org/cinder/cinder-16.1.0.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3acf7b62bdf1f07e81dbb1bc759faba7
diff --git a/metadata/md5-cache/sys-cluster/cinder-2019.2.9999 b/metadata/md5-cache/sys-cluster/cinder-2019.2.9999
index 51f5bdcc94af..d8870a0d783f 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	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f876ea31e1694869f9c4cb7dee5f8dd5
diff --git a/metadata/md5-cache/sys-cluster/cinder-2020.1.9999 b/metadata/md5-cache/sys-cluster/cinder-2020.1.9999
index 406ad7f22cb8..b034b8b250bc 100644
--- a/metadata/md5-cache/sys-cluster/cinder-2020.1.9999
+++ b/metadata/md5-cache/sys-cluster/cinder-2020.1.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/ussuri/cinder.conf.sample -> cinder.conf.sample-2020.1.9999
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3acf7b62bdf1f07e81dbb1bc759faba7
diff --git a/metadata/md5-cache/sys-cluster/galera-26.4.5 b/metadata/md5-cache/sys-cluster/galera-26.4.5
new file mode 100644
index 000000000000..c30b8c72427f
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/galera-26.4.5
@@ -0,0 +1,15 @@
+BDEPEND=>=sys-devel/gcc-4.4 || ( ( dev-lang/python:3.8 dev-util/scons[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( 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=https://galeracluster.com
+IUSE=cpu_flags_x86_sse4_2 garbd test
+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://releases.galeracluster.com/galera-4/source/galera-4-26.4.5.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ef7739580245f950b8eb6615fbbe359a
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-6.8 b/metadata/md5-cache/sys-cluster/glusterfs-6.8
index 9fa6f88513d3..828f595474dd 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-6.8
+++ b/metadata/md5-cache/sys-cluster/glusterfs-6.8
@@ -5,7 +5,7 @@ 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
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 ~x86
 LICENSE=|| ( GPL-2 LGPL-3+ )
 RDEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux sys-libs/readline:= 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:* ) xml? ( dev-libs/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= )
 REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) ipv6? ( libtirpc )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/6/6.8/glusterfs-6.8.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	504a3383c45504fde86b00426619a709	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=504893801ff487352ff0be437aacd201
+_md5_=26bc2d57eb62976ff1b392f80729941f
diff --git a/metadata/md5-cache/sys-cluster/heat-13.0.0 b/metadata/md5-cache/sys-cluster/heat-13.0.0
index 771425fcfcb0..2d439df600dd 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	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=776027fc75625ff2bc6ea4bf4d8f234b
diff --git a/metadata/md5-cache/sys-cluster/heat-13.0.2 b/metadata/md5-cache/sys-cluster/heat-13.0.2
index 4882f299bd1c..4eebbf359f8b 100644
--- a/metadata/md5-cache/sys-cluster/heat-13.0.2
+++ b/metadata/md5-cache/sys-cluster/heat-13.0.2
@@ -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.2 https://tarballs.openstack.org/heat/openstack-heat-13.0.2.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=be8964da5764d8daab0c5211517b3dd5
diff --git a/metadata/md5-cache/sys-cluster/heat-14.0.0 b/metadata/md5-cache/sys-cluster/heat-14.0.0
index e5813f45901d..d1fe47c1d147 100644
--- a/metadata/md5-cache/sys-cluster/heat-14.0.0
+++ b/metadata/md5-cache/sys-cluster/heat-14.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.ussuri -> heat.conf.sample-14.0.0 https://tarballs.openstack.org/heat/openstack-heat-14.0.0.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=569379f98270e68a975004f9e8f3fbc5
diff --git a/metadata/md5-cache/sys-cluster/heat-2019.2.9999 b/metadata/md5-cache/sys-cluster/heat-2019.2.9999
index 00ffd18a37bc..dc4e7cf8af81 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	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=be8964da5764d8daab0c5211517b3dd5
diff --git a/metadata/md5-cache/sys-cluster/heat-2020.1.9999 b/metadata/md5-cache/sys-cluster/heat-2020.1.9999
index 8b3c871bd0fa..8bff5a7f0c0d 100644
--- a/metadata/md5-cache/sys-cluster/heat-2020.1.9999
+++ b/metadata/md5-cache/sys-cluster/heat-2020.1.9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.ussuri -> heat.conf.sample-2020.1.9999
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cb05d1d5564d4ac6d2a8ae78710a577b
diff --git a/metadata/md5-cache/sys-cluster/hpx-1.4.1 b/metadata/md5-cache/sys-cluster/hpx-1.4.1
index 6b637ff9a00c..71dad5f9f9fd 100644
--- a/metadata/md5-cache/sys-cluster/hpx-1.4.1
+++ b/metadata/md5-cache/sys-cluster/hpx-1.4.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://stellar.cct.lsu.edu/files/hpx_1.4.1.tar.gz
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=93e024d0b18e59370e3f2cf14f870eac
+_md5_=014a813cd40c1ba263fa67c41156cb8c
diff --git a/metadata/md5-cache/sys-cluster/ipvsadm-1.26-r2 b/metadata/md5-cache/sys-cluster/ipvsadm-1.26-r2
index 78e0ad59c492..8390475f99dc 100644
--- a/metadata/md5-cache/sys-cluster/ipvsadm-1.26-r2
+++ b/metadata/md5-cache/sys-cluster/ipvsadm-1.26-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2 dev-libs/libnl:1.1 >=dev-libs/popt-1.16
 SLOT=0
 SRC_URI=http://www.linuxvirtualserver.org/software/kernel-2.6/ipvsadm-1.26.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a65d37c80944c269d5a3b052dcd93c55
diff --git a/metadata/md5-cache/sys-cluster/ipvsadm-1.27-r1 b/metadata/md5-cache/sys-cluster/ipvsadm-1.27-r1
index daf097144591..60222cc16a85 100644
--- a/metadata/md5-cache/sys-cluster/ipvsadm-1.27-r1
+++ b/metadata/md5-cache/sys-cluster/ipvsadm-1.27-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2:* dev-libs/libnl:= >=dev-libs/popt-1.16
 SLOT=0
 SRC_URI=https://kernel.org/pub/linux/utils/kernel/ipvsadm/ipvsadm-1.27.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=608dc770ecd515864a2a991b23a4863e
diff --git a/metadata/md5-cache/sys-cluster/ipvsadm-1.28 b/metadata/md5-cache/sys-cluster/ipvsadm-1.28
index fe709484758e..8f7612b5df6e 100644
--- a/metadata/md5-cache/sys-cluster/ipvsadm-1.28
+++ b/metadata/md5-cache/sys-cluster/ipvsadm-1.28
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2:* dev-libs/libnl:= >=dev-libs/popt-1.16
 SLOT=0
 SRC_URI=https://kernel.org/pub/linux/utils/kernel/ipvsadm/ipvsadm-1.28.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2561f135b1bf51808fa9d696b6abde4a
diff --git a/metadata/md5-cache/sys-cluster/k9scli-0.20.5 b/metadata/md5-cache/sys-cluster/k9scli-0.20.5
new file mode 100644
index 000000000000..99994975576a
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/k9scli-0.20.5
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst prepare unpack
+DESCRIPTION=terminal based UI to manage kubernetes clusters
+EAPI=7
+HOMEPAGE=https://k9scli.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/derailed/k9s/archive/v0.20.5.tar.gz -> k9scli-0.20.5.tar.gz mirror://goproxy//9fans.net/go/@v/v0.0.2.zip -> 9fans.net%2Fgo%2F@v%2Fv0.0.2.zip mirror://goproxy//9fans.net/go/@v/v0.0.2.mod -> 9fans.net%2Fgo%2F@v%2Fv0.0.2.mod mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.2.1+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.2.1+incompatible.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.8.1+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.8.1+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v10.8.1+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.8.1+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v14.0.0+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.0.0+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v14.0.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.0.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!d!a!t!a-!d!o!g/go-sqlmock/@v/v1.3.3.zip -> github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/!d!a!t!a-!d!o!g/go-sqlmock/@v/v1.3.3.mod -> github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/!d!a!t!a-!d!o!g/go-sqlmock/@v/v1.4.1.mod -> github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.zip -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.zip mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.mod -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.mod mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.0.zip -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.0.mod -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.0.3.zip -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.zip mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.0.3.mod -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.mod mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.1.0.zip -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.0.zip mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.1.0.mod -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/!masterminds/sprig/v3/@v/v3.0.2.zip -> github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.0.2.zip mirror://goproxy//github.com/!masterminds/sprig/v3/@v/v3.0.2.mod -> github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//github.com/!masterminds/sprig/v3/@v/v3.1.0.zip -> github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.1.0.zip mirror://goproxy//github.com/!masterminds/sprig/v3/@v/v3.1.0.mod -> github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/!masterminds/squirrel/@v/v1.2.0.zip -> github.com%2F!masterminds%2Fsquirrel%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/!masterminds/squirrel/@v/v1.2.0.mod -> github.com%2F!masterminds%2Fsquirrel%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/!masterminds/vcs/@v/v1.13.1.mod -> github.com%2F!masterminds%2Fvcs%2F@v%2Fv1.13.1.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.zip -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.zip -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.zip mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod mirror://goproxy//github.com/!shopify/logrus-bugsnag/@v/v0.0.0-20171204204709-577dee27f20d.mod -> github.com%2F!shopify%2Flogrus-bugsnag%2F@v%2Fv0.0.0-20171204204709-577dee27f20d.mod mirror://goproxy//github.com/agnivade/levenshtein/@v/v1.0.1.mod -> github.com%2Fagnivade%2Flevenshtein%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/andreyvit/diff/@v/v0.0.0-20170406064948-c7f18ee00883.mod -> github.com%2Fandreyvit%2Fdiff%2F@v%2Fv0.0.0-20170406064948-c7f18ee00883.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20180720115003-f9ffefc3facf.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20200108200545-475eaeb16496.zip -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20200108200545-475eaeb16496.zip mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20200108200545-475eaeb16496.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20200108200545-475eaeb16496.mod mirror://goproxy//github.com/atotto/clipboard/@v/v0.1.2.zip -> github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/atotto/clipboard/@v/v0.1.2.mod -> github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.11.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.11.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.29.32.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.29.32.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.29.32.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.29.32.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20160804104726-4c0e84591b9a.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20160804104726-4c0e84591b9a.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bitly/go-simplejson/@v/v0.5.0.mod -> github.com%2Fbitly%2Fgo-simplejson%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/blang/semver/@v/v3.1.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.1.0+incompatible.mod mirror://goproxy//github.com/blang/semver/@v/v3.5.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.0+incompatible.mod mirror://goproxy//github.com/bmizerany/assert/@v/v0.0.0-20160611221934-b7ed37b82869.mod -> github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.mod mirror://goproxy//github.com/bshuster-repo/logrus-logstash-hook/@v/v0.4.1.mod -> github.com%2Fbshuster-repo%2Flogrus-logstash-hook%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/bugsnag/bugsnag-go/@v/v0.0.0-20141110184014-b1d153021fcd.mod -> github.com%2Fbugsnag%2Fbugsnag-go%2F@v%2Fv0.0.0-20141110184014-b1d153021fcd.mod mirror://goproxy//github.com/bugsnag/osext/@v/v0.0.0-20130617224835-0dd3f918b21b.mod -> github.com%2Fbugsnag%2Fosext%2F@v%2Fv0.0.0-20130617224835-0dd3f918b21b.mod mirror://goproxy//github.com/bugsnag/panicwrap/@v/v0.0.0-20151223152923-e2c28503fcd0.mod -> github.com%2Fbugsnag%2Fpanicwrap%2F@v%2Fv0.0.0-20151223152923-e2c28503fcd0.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chai2010/gettext-go/@v/v0.0.0-20160711120539-c6fed771bfd5.mod -> github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190919134610-bf292b21730f.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190919134610-bf292b21730f.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20180822173158-c12b1e7919c1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.2.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.3.2.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190426062206-aaeac12a7ffc.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200107194136-26c1120b8d41.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200107194136-26c1120b8d41.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190226154929-a9fb20d87448.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190226154929-a9fb20d87448.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20180907222934-5a6d9f37cfa3.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828154514-0e0f228740de.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20180627222232-a93fcdb778cd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180108230652-97fdf19511ea.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.zip -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.mod -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/daviddengcn/go-colortext/@v/v0.0.0-20160507010035-511bcaf42ccd.mod -> github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.mod mirror://goproxy//github.com/deislabs/oras/@v/v0.8.1.zip -> github.com%2Fdeislabs%2Foras%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/deislabs/oras/@v/v0.8.1.mod -> github.com%2Fdeislabs%2Foras%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/denisenkom/go-mssqldb/@v/v0.0.0-20191001013358-cfbb681360f0.mod -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20191001013358-cfbb681360f0.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20190125010748-a747050bb1ba.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20190125010748-a747050bb1ba.mod mirror://goproxy//github.com/derailed/popeye/@v/v0.8.1.zip -> github.com%2Fderailed%2Fpopeye%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/derailed/popeye/@v/v0.8.1.mod -> github.com%2Fderailed%2Fpopeye%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/derailed/popeye/@v/v0.8.2.zip -> github.com%2Fderailed%2Fpopeye%2F@v%2Fv0.8.2.zip mirror://goproxy//github.com/derailed/popeye/@v/v0.8.2.mod -> github.com%2Fderailed%2Fpopeye%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/derailed/popeye/@v/v0.8.3.zip -> github.com%2Fderailed%2Fpopeye%2F@v%2Fv0.8.3.zip mirror://goproxy//github.com/derailed/popeye/@v/v0.8.3.mod -> github.com%2Fderailed%2Fpopeye%2F@v%2Fv0.8.3.mod mirror://goproxy//github.com/derailed/popeye/@v/v0.8.4.zip -> github.com%2Fderailed%2Fpopeye%2F@v%2Fv0.8.4.zip mirror://goproxy//github.com/derailed/popeye/@v/v0.8.4.mod -> github.com%2Fderailed%2Fpopeye%2F@v%2Fv0.8.4.mod mirror://goproxy//github.com/derailed/tview/@v/v0.3.10.zip -> github.com%2Fderailed%2Ftview%2F@v%2Fv0.3.10.zip mirror://goproxy//github.com/derailed/tview/@v/v0.3.10.mod -> github.com%2Fderailed%2Ftview%2F@v%2Fv0.3.10.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v0.0.0-20170104182250-a601269ab70c.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv0.0.0-20170104182250-a601269ab70c.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/cli/@v/v0.0.0-20200130152716-5d0cf8839492.zip -> github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20200130152716-5d0cf8839492.zip mirror://goproxy//github.com/docker/cli/@v/v0.0.0-20200130152716-5d0cf8839492.mod -> github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20200130152716-5d0cf8839492.mod mirror://goproxy//github.com/docker/distribution/@v/v0.0.0-20191216044856-a8371794149d.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv0.0.0-20191216044856-a8371794149d.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v0.7.3-0.20190327010347-be7ac8be2ae0.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv0.7.3-0.20190327010347-be7ac8be2ae0.mod mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20200203170920-46ec8731fbce.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20200203170920-46ec8731fbce.zip mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20200203170920-46ec8731fbce.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20200203170920-46ec8731fbce.mod mirror://goproxy//github.com/docker/docker-credential-helpers/@v/v0.6.3.zip -> github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.3.zip mirror://goproxy//github.com/docker/docker-credential-helpers/@v/v0.6.3.mod -> github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.3.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.0-20180209012529-399ea8c73916.zip -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.0-20180209012529-399ea8c73916.zip mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.0-20180209012529-399ea8c73916.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.0-20180209012529-399ea8c73916.mod mirror://goproxy//github.com/docker/go-units/@v/v0.3.3.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/libtrust/@v/v0.0.0-20150114040149-fa567046d9b1.mod -> github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20150114040149-fa567046d9b1.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.zip -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.zip mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/drone/envsubst/@v/v1.0.2.zip -> github.com%2Fdrone%2Fenvsubst%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/drone/envsubst/@v/v1.0.2.mod -> github.com%2Fdrone%2Fenvsubst%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.zip -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.zip mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v2.9.5+incompatible.zip -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.zip mirror://goproxy//github.com/emicklei/go-restful/@v/v2.9.5+incompatible.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.5.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.5.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.5.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.5.0+incompatible.mod mirror://goproxy//github.com/exponent-io/jsonpath/@v/v0.0.0-20151013193312-d6023ce2651d.zip -> github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.zip mirror://goproxy//github.com/exponent-io/jsonpath/@v/v0.0.0-20151013193312-d6023ce2651d.mod -> github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.mod mirror://goproxy//github.com/fatih/camelcase/@v/v1.0.0.zip -> github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/fatih/camelcase/@v/v1.0.0.mod -> github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/garyburd/redigo/@v/v0.0.0-20150301180006-535138d7bcd7.mod -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv0.0.0-20150301180006-535138d7bcd7.mod mirror://goproxy//github.com/gdamore/encoding/@v/v1.0.0.zip -> github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/gdamore/encoding/@v/v1.0.0.mod -> github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gdamore/tcell/@v/v1.1.2.mod -> github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/gdamore/tcell/@v/v1.3.0.zip -> github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/gdamore/tcell/@v/v1.3.0.mod -> github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20180905125535-1ca0a4f7cbcb.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20180905125535-1ca0a4f7cbcb.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20181015135952-eeefdecb41b8.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20181015135952-eeefdecb41b8.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.25.4.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.0.0-20180825180245-b006789cd277.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.0.0-20180825180245-b006789cd277.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.0.0-20180920151709-4f900dc2ade9.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.0.0-20180920151709-4f900dc2ade9.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gobuffalo/envy/@v/v1.7.0.mod -> github.com%2Fgobuffalo%2Fenvy%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/gobuffalo/envy/@v/v1.7.1.mod -> github.com%2Fgobuffalo%2Fenvy%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/gobuffalo/logger/@v/v1.0.1.mod -> github.com%2Fgobuffalo%2Flogger%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/gobuffalo/packd/@v/v0.3.0.mod -> github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/gobuffalo/packr/v2/@v/v2.7.1.mod -> github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.7.1.mod mirror://goproxy//github.com/gobwas/glob/@v/v0.2.3.zip -> github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/gobwas/glob/@v/v0.2.3.mod -> github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.7.1.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang-sql/civil/@v/v0.0.0-20190719163853-cb61b32ac6fe.mod -> github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golangplus/bytes/@v/v0.0.0-20160111154220-45c989fe5450.mod -> github.com%2Fgolangplus%2Fbytes%2F@v%2Fv0.0.0-20160111154220-45c989fe5450.mod mirror://goproxy//github.com/golangplus/fmt/@v/v0.0.0-20150411045040-2a5d6d7d2995.mod -> github.com%2Fgolangplus%2Ffmt%2F@v%2Fv0.0.0-20150411045040-2a5d6d7d2995.mod mirror://goproxy//github.com/golangplus/testing/@v/v0.0.0-20180327235837-af21d9c3145e.mod -> github.com%2Fgolangplus%2Ftesting%2F@v%2Fv0.0.0-20180327235837-af21d9c3145e.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.1.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.1.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/context/@v/v0.0.0-20160226214623-1ea25387ff6f.mod -> github.com%2Fgorilla%2Fcontext%2F@v%2Fv0.0.0-20160226214623-1ea25387ff6f.mod mirror://goproxy//github.com/gorilla/handlers/@v/v0.0.0-20150720190736-60c7bfde3e33.mod -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv0.0.0-20150720190736-60c7bfde3e33.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.6.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gosuri/uitable/@v/v0.0.4.zip -> github.com%2Fgosuri%2Fuitable%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/gosuri/uitable/@v/v0.0.4.mod -> github.com%2Fgosuri%2Fuitable%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.zip -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.zip mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v0.0.0-20141028054710-7554cd9344ce.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v0.0.0-20161216184304-ed905158d874.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/huandu/xstrings/@v/v1.2.0.zip -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/huandu/xstrings/@v/v1.2.0.mod -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/huandu/xstrings/@v/v1.3.1.zip -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/huandu/xstrings/@v/v1.3.1.mod -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.7.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.7.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.8.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.8.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160202185014-0b12d6b521d8.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160803190731-bd40a432e4c7.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160803190731-bd40a432e4c7.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmoiron/sqlx/@v/v1.2.0.zip -> github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/jmoiron/sqlx/@v/v1.2.0.mod -> github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.5.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.zip -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lann/builder/@v/v0.0.0-20180802200727-47ae307949d0.zip -> github.com%2Flann%2Fbuilder%2F@v%2Fv0.0.0-20180802200727-47ae307949d0.zip mirror://goproxy//github.com/lann/builder/@v/v0.0.0-20180802200727-47ae307949d0.mod -> github.com%2Flann%2Fbuilder%2F@v%2Fv0.0.0-20180802200727-47ae307949d0.mod mirror://goproxy//github.com/lann/ps/@v/v0.0.0-20150810152359-62de8c46ede0.zip -> github.com%2Flann%2Fps%2F@v%2Fv0.0.0-20150810152359-62de8c46ede0.zip mirror://goproxy//github.com/lann/ps/@v/v0.0.0-20150810152359-62de8c46ede0.mod -> github.com%2Flann%2Fps%2F@v%2Fv0.0.0-20150810152359-62de8c46ede0.mod mirror://goproxy//github.com/lib/pq/@v/v1.0.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.2.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.3.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.3.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/liggitt/tabwriter/@v/v0.0.0-20181228230101-89fcab3d43de.zip -> github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.zip mirror://goproxy//github.com/liggitt/tabwriter/@v/v0.0.0-20181228230101-89fcab3d43de.mod -> github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.mod mirror://goproxy//github.com/lithammer/dedent/@v/v1.1.0.mod -> github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.0.2.zip -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.0.2.mod -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20180823135443-60711f1a8329.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180823135443-60711f1a8329.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190312143242-1de009706dbe.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190614124828-94de47d64c63.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190626092158-b2ccc519800e.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/marstr/guid/@v/v1.1.0.mod -> github.com%2Fmarstr%2Fguid%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.5.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.9.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.9.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.10.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.9.0.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.12.0.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.12.0.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/osext/@v/v0.0.0-20151018003038-5e2d6d41470f.mod -> github.com%2Fmitchellh%2Fosext%2F@v%2Fv0.0.0-20151018003038-5e2d6d41470f.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20191010083416-a7dc8b61c822.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20191010083416-a7dc8b61c822.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/ncw/swift/@v/v1.0.47.mod -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.1.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.2.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20170106003457-a6d0ee40d420.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20170106003457-a6d0ee40d420.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.0.0-20190115041553-12f6a991201f.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.0.0-20190115041553-12f6a991201f.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.1.1.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/opencontainers/runc/@v/v0.1.1.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v0.1.2-0.20190507144316-5b71a03e2700.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv0.1.2-0.20190507144316-5b71a03e2700.mod mirror://goproxy//github.com/opencontainers/runtime-tools/@v/v0.0.0-20181011054405-1d69bd0f9c39.mod -> github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod mirror://goproxy//github.com/openfaas/faas/@v/v0.0.0-20200207215241-6afae214e3ec.zip -> github.com%2Fopenfaas%2Ffaas%2F@v%2Fv0.0.0-20200207215241-6afae214e3ec.zip mirror://goproxy//github.com/openfaas/faas/@v/v0.0.0-20200207215241-6afae214e3ec.mod -> github.com%2Fopenfaas%2Ffaas%2F@v%2Fv0.0.0-20200207215241-6afae214e3ec.mod mirror://goproxy//github.com/openfaas/faas-cli/@v/v0.0.0-20200124160744-30b7cec9634c.zip -> github.com%2Fopenfaas%2Ffaas-cli%2F@v%2Fv0.0.0-20200124160744-30b7cec9634c.zip mirror://goproxy//github.com/openfaas/faas-cli/@v/v0.0.0-20200124160744-30b7cec9634c.mod -> github.com%2Fopenfaas%2Ffaas-cli%2F@v%2Fv0.0.0-20200124160744-30b7cec9634c.mod mirror://goproxy//github.com/openfaas/faas-provider/@v/v0.15.0.zip -> github.com%2Fopenfaas%2Ffaas-provider%2F@v%2Fv0.15.0.zip mirror://goproxy//github.com/openfaas/faas-provider/@v/v0.15.0.mod -> github.com%2Fopenfaas%2Ffaas-provider%2F@v%2Fv0.15.0.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.zip -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/petergtz/pegomock/@v/v2.7.0+incompatible.zip -> github.com%2Fpetergtz%2Fpegomock%2F@v%2Fv2.7.0+incompatible.zip mirror://goproxy//github.com/petergtz/pegomock/@v/v2.7.0+incompatible.mod -> github.com%2Fpetergtz%2Fpegomock%2F@v%2Fv2.7.0+incompatible.mod mirror://goproxy//github.com/phayes/freeport/@v/v0.0.0-20180830031419-95f893ade6f2.mod -> github.com%2Fphayes%2Ffreeport%2F@v%2Fv0.0.0-20180830031419-95f893ade6f2.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1-0.20171018195549-f15c970de5b7.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20171018195549-f15c970de5b7.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20171018203845-0dec1b30a021.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.0.0-20180209125602-c332b6f63c06.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.0.0-20180209125602-c332b6f63c06.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.5.1.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.5.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20171117100541-99fa1f4be8e5.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20171117100541-99fa1f4be8e5.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20180110214958-89604d197083.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180110214958-89604d197083.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20180125133057-cb4147076ac7.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180125133057-cb4147076ac7.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.5.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rakyll/hey/@v/v0.1.3.zip -> github.com%2Frakyll%2Fhey%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/rakyll/hey/@v/v0.1.3.mod -> github.com%2Frakyll%2Fhey%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/remyoudompheng/bigfft/@v/v0.0.0-20170806203942-52369c62f446.mod -> github.com%2Fremyoudompheng%2Fbigfft%2F@v%2Fv0.0.0-20170806203942-52369c62f446.mod mirror://goproxy//github.com/rivo/tview/@v/v0.0.0-20191018115645-bacbf5155bc1.mod -> github.com%2Frivo%2Ftview%2F@v%2Fv0.0.0-20191018115645-bacbf5155bc1.mod mirror://goproxy//github.com/rivo/uniseg/@v/v0.0.0-20190513083848-b9f5b9457d44.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.0.0-20190513083848-b9f5b9457d44.mod mirror://goproxy//github.com/rivo/uniseg/@v/v0.1.0.zip -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/rivo/uniseg/@v/v0.1.0.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.1.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.2.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.4.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/rs/xid/@v/v1.2.1.mod -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.18.0.zip -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.18.0.zip mirror://goproxy//github.com/rs/zerolog/@v/v1.18.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.18.0.mod mirror://goproxy//github.com/rubenv/sql-migrate/@v/v0.0.0-20200212082348-64f95ea68aa3.zip -> github.com%2Frubenv%2Fsql-migrate%2F@v%2Fv0.0.0-20200212082348-64f95ea68aa3.zip mirror://goproxy//github.com/rubenv/sql-migrate/@v/v0.0.0-20200212082348-64f95ea68aa3.mod -> github.com%2Frubenv%2Fsql-migrate%2F@v%2Fv0.0.0-20200212082348-64f95ea68aa3.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.zip -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sahilm/fuzzy/@v/v0.1.0.zip -> github.com%2Fsahilm%2Ffuzzy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/sahilm/fuzzy/@v/v0.1.0.mod -> github.com%2Fsahilm%2Ffuzzy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.4-0.20170822132746-89742aefa4b2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.4-0.20170822132746-89742aefa4b2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.6.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.6.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.0.0.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.0.0.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20170704070218-db04d3cc01c8.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.0.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/urfave/cli/@v/v0.0.0-20171014202726-7bc6a0acffa5.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/vektah/gqlparser/@v/v1.1.2.mod -> github.com%2Fvektah%2Fgqlparser%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.zip -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.zip mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.zip -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.zip mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.mod -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20180618132009-1d523034197f.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v1.1.0.zip -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v1.1.0.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xlab/handysort/@v/v0.0.0-20150421192137-fb3537ed64a1.zip -> github.com%2Fxlab%2Fhandysort%2F@v%2Fv0.0.0-20150421192137-fb3537ed64a1.zip mirror://goproxy//github.com/xlab/handysort/@v/v0.0.0-20150421192137-fb3537ed64a1.mod -> github.com%2Fxlab%2Fhandysort%2F@v%2Fv0.0.0-20150421192137-fb3537ed64a1.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yvasiyarov/go-metrics/@v/v0.0.0-20140926110328-57bccd1ccd43.mod -> github.com%2Fyvasiyarov%2Fgo-metrics%2F@v%2Fv0.0.0-20140926110328-57bccd1ccd43.mod mirror://goproxy//github.com/yvasiyarov/gorelic/@v/v0.0.0-20141212073537-a9bba5b9ab50.mod -> github.com%2Fyvasiyarov%2Fgorelic%2F@v%2Fv0.0.0-20141212073537-a9bba5b9ab50.mod mirror://goproxy//github.com/yvasiyarov/newrelic_platform_go/@v/v0.0.0-20140908184405-b21fdbd4370f.mod -> github.com%2Fyvasiyarov%2Fnewrelic_platform_go%2F@v%2Fv0.0.0-20140908184405-b21fdbd4370f.mod mirror://goproxy//github.com/zenazn/goji/@v/v0.9.0.mod -> github.com%2Fzenazn%2Fgoji%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/ziutek/mymysql/@v/v1.5.4.mod -> github.com%2Fziutek%2Fmymysql%2F@v%2Fv1.5.4.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.0.0-20191023171146-3cf2f69b5738.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.0.3.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.0.3.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.1.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.1.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.2.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/goleak/@v/v0.10.0.zip -> go.uber.org%2Fgoleak%2F@v%2Fv0.10.0.zip mirror://goproxy//go.uber.org/goleak/@v/v0.10.0.mod -> go.uber.org%2Fgoleak%2F@v%2Fv0.10.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20171113213409-9f005a07e0d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20171113213409-9f005a07e0d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190320223903-b7391e95e576.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190320223903-b7391e95e576.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190325154230-a5d413f7728c.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190617133340-57b3e21c3d56.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190617133340-57b3e21c3d56.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190621222207-cc06ce4a13d4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190621222207-cc06ce4a13d4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190911031432-227b76d455e7.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190911031432-227b76d455e7.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200128174031-69ecbb4d6d5d.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200128174031-69ecbb4d6d5d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200414173820-0848c9571904.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200414173820-0848c9571904.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200414173820-0848c9571904.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200414173820-0848c9571904.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190125153040-c74c464bbbf2.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190125153040-c74c464bbbf2.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190312203227-4b39c73a6495.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190312203227-4b39c73a6495.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181005035420-146acd28ed58.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181005035420-146acd28ed58.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181017193950-04a2e542c03f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181017193950-04a2e542c03f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190320064053-1272bf9dcd53.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190320064053-1272bf9dcd53.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190619014844-b5b0513f8c1b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190619014844-b5b0513f8c1b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200519113804-d87ec0cfa476.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200519113804-d87ec0cfa476.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200519113804-d87ec0cfa476.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200519113804-d87ec0cfa476.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190321052220-f7bb7a8bee54.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190321052220-f7bb7a8bee54.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190514135907-3a4b5fb9f71f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190514135907-3a4b5fb9f71f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190515120540-06a5c4944438.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190515120540-06a5c4944438.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190602015325-4c4f7f33c9ed.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190602015325-4c4f7f33c9ed.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190616124812-15dcb6c0061f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190626150813-e07cf5db2756.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626150813-e07cf5db2756.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200519105757-fe76b779f299.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200519105757-fe76b779f299.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190125232054-d66bd3c5d5a6.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190125232054-d66bd3c5d5a6.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190206041539-40960b6deb8e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190206041539-40960b6deb8e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190614205625-5aca471b1d59.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190614205625-5aca471b1d59.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190617190820-da514acc4774.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190617190820-da514acc4774.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190828213141-aed303cbaa74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190828213141-aed303cbaa74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190920225731-5eefd052ad72.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190920225731-5eefd052ad72.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191004055002-72853e10c5a3.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191004055002-72853e10c5a3.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.0.0-20190331200053-3d26580ed485.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20190331200053-3d26580ed485.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190313105609-8cb42192e0e0.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190313105609-8cb42192e0e0.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190331212654-76723241ea4e.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190331212654-76723241ea4e.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20160322025152-9bf6e6e569ff.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20160322025152-9bf6e6e569ff.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/cloud/@v/v0.0.0-20151119220103-975617b05ea8.mod -> google.golang.org%2Fcloud%2F@v%2Fv0.0.0-20151119220103-975617b05ea8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200515170657-fc4c6c6a6587.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200515170657-fc4c6c6a6587.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod mirror://goproxy//google.golang.org/grpc/@v/v0.0.0-20160317175043-d3ddb4469d5a.mod -> google.golang.org%2Fgrpc%2F@v%2Fv0.0.0-20160317175043-d3ddb4469d5a.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20141024133853-64131543e789.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20141024133853-64131543e789.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/gorp.v1/@v/v1.7.2.zip -> gopkg.in%2Fgorp.v1%2F@v%2Fv1.7.2.zip mirror://goproxy//gopkg.in/gorp.v1/@v/v1.7.2.mod -> gopkg.in%2Fgorp.v1%2F@v%2Fv1.7.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/natefinch/lumberjack.v2/@v/v2.0.0.mod -> gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.2.2.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//helm.sh/helm/v3/@v/v3.1.2.zip -> helm.sh%2Fhelm%2Fv3%2F@v%2Fv3.1.2.zip mirror://goproxy//helm.sh/helm/v3/@v/v3.1.2.mod -> helm.sh%2Fhelm%2Fv3%2F@v%2Fv3.1.2.mod mirror://goproxy//helm.sh/helm/v3/@v/v3.2.0-rc.1.zip -> helm.sh%2Fhelm%2Fv3%2F@v%2Fv3.2.0-rc.1.zip mirror://goproxy//helm.sh/helm/v3/@v/v3.2.0-rc.1.mod -> helm.sh%2Fhelm%2Fv3%2F@v%2Fv3.2.0-rc.1.mod mirror://goproxy//helm.sh/helm/v3/@v/v3.2.0.zip -> helm.sh%2Fhelm%2Fv3%2F@v%2Fv3.2.0.zip mirror://goproxy//helm.sh/helm/v3/@v/v3.2.0.mod -> helm.sh%2Fhelm%2Fv3%2F@v%2Fv3.2.0.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//k8s.io/api/@v/v0.17.2.mod -> k8s.io%2Fapi%2F@v%2Fv0.17.2.mod mirror://goproxy//k8s.io/api/@v/v0.18.0.zip -> k8s.io%2Fapi%2F@v%2Fv0.18.0.zip mirror://goproxy//k8s.io/api/@v/v0.18.0.mod -> k8s.io%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/api/@v/v0.18.2.zip -> k8s.io%2Fapi%2F@v%2Fv0.18.2.zip mirror://goproxy//k8s.io/api/@v/v0.18.2.mod -> k8s.io%2Fapi%2F@v%2Fv0.18.2.mod mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.17.2.zip -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.17.2.zip mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.17.2.mod -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.17.2.mod mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.18.0.zip -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.18.0.zip mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.18.0.mod -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.17.2.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.17.2.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.18.0.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.0.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.18.0.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.18.2.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.2.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.18.2.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.2.mod mirror://goproxy//k8s.io/apiserver/@v/v0.17.2.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.17.2.mod mirror://goproxy//k8s.io/apiserver/@v/v0.18.0.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/cli-runtime/@v/v0.17.2.mod -> k8s.io%2Fcli-runtime%2F@v%2Fv0.17.2.mod mirror://goproxy//k8s.io/cli-runtime/@v/v0.18.0.zip -> k8s.io%2Fcli-runtime%2F@v%2Fv0.18.0.zip mirror://goproxy//k8s.io/cli-runtime/@v/v0.18.0.mod -> k8s.io%2Fcli-runtime%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/cli-runtime/@v/v0.18.2.zip -> k8s.io%2Fcli-runtime%2F@v%2Fv0.18.2.zip mirror://goproxy//k8s.io/cli-runtime/@v/v0.18.2.mod -> k8s.io%2Fcli-runtime%2F@v%2Fv0.18.2.mod mirror://goproxy//k8s.io/client-go/@v/v0.17.2.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.17.2.mod mirror://goproxy//k8s.io/client-go/@v/v0.18.0.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.18.0.zip mirror://goproxy//k8s.io/client-go/@v/v0.18.0.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/client-go/@v/v0.18.2.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.18.2.zip mirror://goproxy//k8s.io/client-go/@v/v0.18.2.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.18.2.mod mirror://goproxy//k8s.io/code-generator/@v/v0.17.2.mod -> k8s.io%2Fcode-generator%2F@v%2Fv0.17.2.mod mirror://goproxy//k8s.io/code-generator/@v/v0.18.0.mod -> k8s.io%2Fcode-generator%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/code-generator/@v/v0.18.2.mod -> k8s.io%2Fcode-generator%2F@v%2Fv0.18.2.mod mirror://goproxy//k8s.io/component-base/@v/v0.17.2.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.17.2.mod mirror://goproxy//k8s.io/component-base/@v/v0.18.0.zip -> k8s.io%2Fcomponent-base%2F@v%2Fv0.18.0.zip mirror://goproxy//k8s.io/component-base/@v/v0.18.0.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/component-base/@v/v0.18.2.zip -> k8s.io%2Fcomponent-base%2F@v%2Fv0.18.2.zip mirror://goproxy//k8s.io/component-base/@v/v0.18.2.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.18.2.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190822140433-26a664648505.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190822140433-26a664648505.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200114144118-36b2048a9120.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200114144118-36b2048a9120.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20191107075043-30be4d16710a.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20191107075043-30be4d16710a.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200121204235-bf4fb3bd569c.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200121204235-bf4fb3bd569c.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200121204235-bf4fb3bd569c.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200121204235-bf4fb3bd569c.mod mirror://goproxy//k8s.io/kubectl/@v/v0.17.2.mod -> k8s.io%2Fkubectl%2F@v%2Fv0.17.2.mod mirror://goproxy//k8s.io/kubectl/@v/v0.18.0.zip -> k8s.io%2Fkubectl%2F@v%2Fv0.18.0.zip mirror://goproxy//k8s.io/kubectl/@v/v0.18.0.mod -> k8s.io%2Fkubectl%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/kubectl/@v/v0.18.2.zip -> k8s.io%2Fkubectl%2F@v%2Fv0.18.2.zip mirror://goproxy//k8s.io/kubectl/@v/v0.18.2.mod -> k8s.io%2Fkubectl%2F@v%2Fv0.18.2.mod mirror://goproxy//k8s.io/kubernetes/@v/v1.13.0.mod -> k8s.io%2Fkubernetes%2F@v%2Fv1.13.0.mod mirror://goproxy//k8s.io/metrics/@v/v0.17.2.mod -> k8s.io%2Fmetrics%2F@v%2Fv0.17.2.mod mirror://goproxy//k8s.io/metrics/@v/v0.18.0.zip -> k8s.io%2Fmetrics%2F@v%2Fv0.18.0.zip mirror://goproxy//k8s.io/metrics/@v/v0.18.0.mod -> k8s.io%2Fmetrics%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/metrics/@v/v0.18.2.zip -> k8s.io%2Fmetrics%2F@v%2Fv0.18.2.zip mirror://goproxy//k8s.io/metrics/@v/v0.18.2.mod -> k8s.io%2Fmetrics%2F@v%2Fv0.18.2.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20191114184206-e782cd3c129f.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20191114184206-e782cd3c129f.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.mod mirror://goproxy//modernc.org/cc/@v/v1.0.0.mod -> modernc.org%2Fcc%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/golex/@v/v1.0.0.mod -> modernc.org%2Fgolex%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/mathutil/@v/v1.0.0.mod -> modernc.org%2Fmathutil%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/strutil/@v/v1.0.0.mod -> modernc.org%2Fstrutil%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/xc/@v/v1.0.0.mod -> modernc.org%2Fxc%2F@v%2Fv1.0.0.mod mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.7.mod -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.7.mod mirror://goproxy//sigs.k8s.io/kustomize/@v/v2.0.3+incompatible.zip -> sigs.k8s.io%2Fkustomize%2F@v%2Fv2.0.3+incompatible.zip mirror://goproxy//sigs.k8s.io/kustomize/@v/v2.0.3+incompatible.mod -> sigs.k8s.io%2Fkustomize%2F@v%2Fv2.0.3+incompatible.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v1.0.1-0.20191108220359-b1b620dd3f06.zip -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv1.0.1-0.20191108220359-b1b620dd3f06.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v1.0.1-0.20191108220359-b1b620dd3f06.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv1.0.1-0.20191108220359-b1b620dd3f06.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0-20200116222232-67a7b8c61874.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod mirror://goproxy//vbom.ml/util/@v/v0.0.0-20160121211510-db5cfe13f5cc.mod -> vbom.ml%2Futil%2F@v%2Fv0.0.0-20160121211510-db5cfe13f5cc.mod mirror://goproxy//vbom.ml/util/@v/v0.0.0-20180919145318-efcd4e0f9787.zip -> vbom.ml%2Futil%2F@v%2Fv0.0.0-20180919145318-efcd4e0f9787.zip mirror://goproxy//vbom.ml/util/@v/v0.0.0-20180919145318-efcd4e0f9787.mod -> vbom.ml%2Futil%2F@v%2Fv0.0.0-20180919145318-efcd4e0f9787.mod
+_eclasses_=go-module	45394825d9260b479aa1cf252ea58e01
+_md5_=1bf16e490b86c758b74a6e89f9cf9c8d
diff --git a/metadata/md5-cache/sys-cluster/knem-1.1.3 b/metadata/md5-cache/sys-cluster/knem-1.1.3
index 12eecc00a60b..16170481d19e 100644
--- a/metadata/md5-cache/sys-cluster/knem-1.1.3
+++ b/metadata/md5-cache/sys-cluster/knem-1.1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=sys-apps/hwloc virtual/modutils kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://gforge.inria.fr/frs/download.php/37186/knem-1.1.3.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=76d50a1c0200af29eddf7299b0fa37fd
diff --git a/metadata/md5-cache/sys-cluster/knem-9999 b/metadata/md5-cache/sys-cluster/knem-9999
index 4fe8b8224326..deea2b435628 100644
--- a/metadata/md5-cache/sys-cluster/knem-9999
+++ b/metadata/md5-cache/sys-cluster/knem-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2
 PROPERTIES=live
 RDEPEND=sys-apps/hwloc virtual/modutils kernel_linux? ( virtual/modutils )
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4b6ba9fbe6fd895f8e6639dd94e16c0e
diff --git a/metadata/md5-cache/sys-cluster/kubernetes-1.16.11 b/metadata/md5-cache/sys-cluster/kubernetes-1.16.11
new file mode 100644
index 000000000000..d1f03ad49715
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubernetes-1.16.11
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.13 >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=kube-apiserver? ( acct-group/kube-apiserver acct-user/kube-apiserver ) kube-controller-manager? ( acct-group/kube-controller-manager acct-user/kube-controller-manager ) kube-scheduler? ( acct-group/kube-scheduler acct-user/kube-scheduler )
+DESCRIPTION=production-grade container orchestration
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened +kubelet +kubeadm +kubectl +kube-apiserver +kube-controller-manager +kube-proxy +kube-scheduler
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=kube-apiserver? ( acct-group/kube-apiserver acct-user/kube-apiserver ) kube-controller-manager? ( acct-group/kube-controller-manager acct-user/kube-controller-manager ) kube-scheduler? ( acct-group/kube-scheduler acct-user/kube-scheduler ) kube-proxy? ( net-firewall/conntrack-tools ) !sys-cluster/kubeadm !sys-cluster/kubectl !sys-cluster/kubelet !sys-cluster/kube-apiserver !sys-cluster/kube-controller-manager !sys-cluster/kube-proxy !sys-cluster/kube-scheduler
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.16.11.tar.gz -> kubernetes-1.16.11.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	go-module	45394825d9260b479aa1cf252ea58e01	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=730d4ad582ba135e1a7e4c86dba81169
diff --git a/metadata/md5-cache/sys-cluster/kubernetes-1.17.7 b/metadata/md5-cache/sys-cluster/kubernetes-1.17.7
new file mode 100644
index 000000000000..202160a0775e
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubernetes-1.17.7
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.13 >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=kube-apiserver? ( acct-group/kube-apiserver acct-user/kube-apiserver ) kube-controller-manager? ( acct-group/kube-controller-manager acct-user/kube-controller-manager ) kube-scheduler? ( acct-group/kube-scheduler acct-user/kube-scheduler )
+DESCRIPTION=production-grade container orchestration
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened +kubelet +kubeadm +kubectl +kube-apiserver +kube-controller-manager +kube-proxy +kube-scheduler
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=kube-apiserver? ( acct-group/kube-apiserver acct-user/kube-apiserver ) kube-controller-manager? ( acct-group/kube-controller-manager acct-user/kube-controller-manager ) kube-scheduler? ( acct-group/kube-scheduler acct-user/kube-scheduler ) kube-proxy? ( net-firewall/conntrack-tools ) !sys-cluster/kubeadm !sys-cluster/kubectl !sys-cluster/kubelet !sys-cluster/kube-apiserver !sys-cluster/kube-controller-manager !sys-cluster/kube-proxy !sys-cluster/kube-scheduler
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.17.7.tar.gz -> kubernetes-1.17.7.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	go-module	45394825d9260b479aa1cf252ea58e01	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=730d4ad582ba135e1a7e4c86dba81169
diff --git a/metadata/md5-cache/sys-cluster/kubernetes-1.18.4 b/metadata/md5-cache/sys-cluster/kubernetes-1.18.4
new file mode 100644
index 000000000000..bce3cf1d31c5
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubernetes-1.18.4
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.13 >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=kube-apiserver? ( acct-group/kube-apiserver acct-user/kube-apiserver ) kube-controller-manager? ( acct-group/kube-controller-manager acct-user/kube-controller-manager ) kube-scheduler? ( acct-group/kube-scheduler acct-user/kube-scheduler )
+DESCRIPTION=production-grade container orchestration
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened +kubelet +kubeadm +kubectl +kube-apiserver +kube-controller-manager +kube-proxy +kube-scheduler
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=kube-apiserver? ( acct-group/kube-apiserver acct-user/kube-apiserver ) kube-controller-manager? ( acct-group/kube-controller-manager acct-user/kube-controller-manager ) kube-scheduler? ( acct-group/kube-scheduler acct-user/kube-scheduler ) kube-proxy? ( net-firewall/conntrack-tools ) !sys-cluster/kubeadm !sys-cluster/kubectl !sys-cluster/kubelet !sys-cluster/kube-apiserver !sys-cluster/kube-controller-manager !sys-cluster/kube-proxy !sys-cluster/kube-scheduler
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.4.tar.gz -> kubernetes-1.18.4.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	go-module	45394825d9260b479aa1cf252ea58e01	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=730d4ad582ba135e1a7e4c86dba81169
diff --git a/metadata/md5-cache/sys-cluster/lustre-2.13.0 b/metadata/md5-cache/sys-cluster/lustre-2.13.0
index 4315b9389fcc..82a1e0f415a8 100644
--- a/metadata/md5-cache/sys-cluster/lustre-2.13.0
+++ b/metadata/md5-cache/sys-cluster/lustre-2.13.0
@@ -11,5 +11,5 @@ RDEPEND=virtual/awk dlc? ( dev-libs/libyaml ) readline? ( sys-libs/readline:0 )
 REQUIRED_USE=client? ( modules ) server? ( modules )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~alexxy/distfiles/lustre-2.13.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=e55b0e96e1ab10b728c1c5295e6b3cd6
diff --git a/metadata/md5-cache/sys-cluster/neutron-15.0.2 b/metadata/md5-cache/sys-cluster/neutron-15.0.2
deleted file mode 100644
index 6e2ee295089a..000000000000
--- a/metadata/md5-cache/sys-cluster/neutron-15.0.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-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile config 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-4.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] app-admin/sudo
-DESCRIPTION=A virtual network service for Openstack
-EAPI=7
-HOMEPAGE=https://launchpad.net/neutron
-IUSE=compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite +mysql postgres python_targets_python3_6 python_targets_python3_7 kernel_linux
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-4.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-r1[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/debtcollector-1.2.0[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.18.4[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/pecan-1.3.2[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/requests-2.14.2[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/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/neutron-lib-1.29.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-neutronclient-6.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/tenacity-3.2.1[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.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.2.0[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.0[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.0[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/keystoneauth-3.4.0[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/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.1[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-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.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.37.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-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.30.0[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-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-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/oslo-versionedobjects-1.35.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/osprofiler-2.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-ken-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ovs-2.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ovsdbapp-0.9.1[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/pyroute2-0.5.3[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/openstacksdk-0.31.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-designateclient-2.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-xenapi-0.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-vif-1.15.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyudev[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-apps/iproute2 net-misc/iputils[arping] net-misc/bridge-utils net-firewall/ipset net-firewall/iptables net-firewall/ebtables net-firewall/conntrack-tools haproxy? ( net-proxy/haproxy ) openvswitch? ( net-misc/openvswitch ) ipv6? ( net-misc/radvd >=net-misc/dibbler-1.0.1 ) dhcp? ( net-dns/dnsmasq[dhcp-tools] ) acct-group/neutron acct-user/neutron python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.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? ( !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.2.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/train/ml2_plugins.tar.gz -> neutron-ml2-plugins-15.0.2.tar.gz https://tarballs.openstack.org/neutron/neutron-15.0.2.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e469c5374149cfce6ec42f3916febb62
diff --git a/metadata/md5-cache/sys-cluster/neutron-15.1.0 b/metadata/md5-cache/sys-cluster/neutron-15.1.0
index 070f361d8c99..7e3d2dedc718 100644
--- a/metadata/md5-cache/sys-cluster/neutron-15.1.0
+++ b/metadata/md5-cache/sys-cluster/neutron-15.1.0
@@ -5,11 +5,11 @@ DESCRIPTION=A virtual network service for Openstack
 EAPI=7
 HOMEPAGE=https://launchpad.net/neutron
 IUSE=compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite +mysql postgres 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-4.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-r1[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/debtcollector-1.2.0[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.18.4[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/pecan-1.3.2[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/requests-2.14.2[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/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/neutron-lib-1.29.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-neutronclient-6.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/tenacity-3.2.1[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.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.2.0[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.0[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.0[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/keystoneauth-3.4.0[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/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.1[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-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.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.37.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-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.30.0[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-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-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/oslo-versionedobjects-1.35.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/osprofiler-2.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-ken-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ovs-2.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ovsdbapp-0.9.1[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/pyroute2-0.5.3[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/openstacksdk-0.31.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-designateclient-2.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-xenapi-0.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-vif-1.15.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyudev[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-apps/iproute2 net-misc/iputils[arping] net-misc/bridge-utils net-firewall/ipset net-firewall/iptables net-firewall/ebtables net-firewall/conntrack-tools haproxy? ( net-proxy/haproxy ) openvswitch? ( net-misc/openvswitch ) ipv6? ( net-misc/radvd >=net-misc/dibbler-1.0.1 ) dhcp? ( net-dns/dnsmasq[dhcp-tools] ) acct-group/neutron acct-user/neutron python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.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? ( !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.1.0.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/train/ml2_plugins.tar.gz -> neutron-ml2-plugins-15.1.0.tar.gz https://tarballs.openstack.org/neutron/neutron-15.1.0.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=682d15a3e68459fc25bd1d092bda1934
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e469c5374149cfce6ec42f3916febb62
diff --git a/metadata/md5-cache/sys-cluster/neutron-16.0.0 b/metadata/md5-cache/sys-cluster/neutron-16.0.0
index 022af5dc1f6c..cf321dba61c7 100644
--- a/metadata/md5-cache/sys-cluster/neutron-16.0.0
+++ b/metadata/md5-cache/sys-cluster/neutron-16.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-4.0.0[python_targets_python3_7(-)?,-python_single_targe
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/configs.tar.gz -> neutron-configs-16.0.0.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/ml2_plugins.tar.gz -> neutron-ml2-plugins-16.0.0.tar.gz https://tarballs.openstack.org/neutron/neutron-16.0.0.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0676e578a3d1daf93db67350b2a42995
diff --git a/metadata/md5-cache/sys-cluster/neutron-2019.2.9999 b/metadata/md5-cache/sys-cluster/neutron-2019.2.9999
index 69c042f1c7a3..8a4e6692b1e7 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	44725b3eb803b8abcd6978759c231210	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=121064fdf6ca12af2d68883d1acdf9e7
diff --git a/metadata/md5-cache/sys-cluster/neutron-2020.1.9999 b/metadata/md5-cache/sys-cluster/neutron-2020.1.9999
index 9a2f39a18c8c..54bb8e594e17 100644
--- a/metadata/md5-cache/sys-cluster/neutron-2020.1.9999
+++ b/metadata/md5-cache/sys-cluster/neutron-2020.1.9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-4.0.0[python_targets_python3_7(-)?,-python_single_targe
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/configs.tar.gz -> neutron-configs-2020.1.9999.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/ml2_plugins.tar.gz -> neutron-ml2-plugins-2020.1.9999.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d7848b664075c8dbd613c08a0fef1cc6
diff --git a/metadata/md5-cache/sys-cluster/nova-20.2.0 b/metadata/md5-cache/sys-cluster/nova-20.2.0
deleted file mode 100644
index 32fe4ba0e494..000000000000
--- a/metadata/md5-cache/sys-cluster/nova-20.2.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-42.0.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 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
-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(-)] >=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.2.0 https://tarballs.openstack.org/nova/nova-20.2.0.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1f32ae8db7b2c2e92df98b7a2f07dcd8
diff --git a/metadata/md5-cache/sys-cluster/nova-20.3.0 b/metadata/md5-cache/sys-cluster/nova-20.3.0
index 0f252a212674..d881c0890538 100644
--- a/metadata/md5-cache/sys-cluster/nova-20.3.0
+++ b/metadata/md5-cache/sys-cluster/nova-20.3.0
@@ -5,11 +5,11 @@ DESCRIPTION=Cloud computing fabric controller
 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
+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(-)] >=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.3.0 https://tarballs.openstack.org/nova/nova-20.3.0.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=11c199a517aada5dff936183c4ff881f
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1f32ae8db7b2c2e92df98b7a2f07dcd8
diff --git a/metadata/md5-cache/sys-cluster/nova-2019.2.9999 b/metadata/md5-cache/sys-cluster/nova-2019.2.9999
index a0838412b718..546468fe0c09 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	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=11c199a517aada5dff936183c4ff881f
diff --git a/metadata/md5-cache/sys-cluster/nova-2020.1.9999 b/metadata/md5-cache/sys-cluster/nova-2020.1.9999
index 04d8ed58f87a..f31fd4a92675 100644
--- a/metadata/md5-cache/sys-cluster/nova-2020.1.9999
+++ b/metadata/md5-cache/sys-cluster/nova-2020.1.9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_targe
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ussuri/nova.conf.sample -> nova.conf.sample-2020.1.9999
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=433f68e6860a9344128d77d365e0fe64
diff --git a/metadata/md5-cache/sys-cluster/nova-21.0.0 b/metadata/md5-cache/sys-cluster/nova-21.0.0
index a7361d65547a..59818edc9c76 100644
--- a/metadata/md5-cache/sys-cluster/nova-21.0.0
+++ b/metadata/md5-cache/sys-cluster/nova-21.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_targe
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ussuri/nova.conf.sample -> nova.conf.sample-21.0.0 https://tarballs.openstack.org/nova/nova-21.0.0.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=65fcf511d9dceed1974b5c83662e8931
diff --git a/metadata/md5-cache/sys-cluster/openstack-meta-2019.2.2 b/metadata/md5-cache/sys-cluster/openstack-meta-2019.2.2
deleted file mode 100644
index 44a862faeb57..000000000000
--- a/metadata/md5-cache/sys-cluster/openstack-meta-2019.2.2
+++ /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 <sys-auth/keystone-17 ) swift? ( ~sys-cluster/swift-2.23.1 ) neutron? ( >=sys-cluster/neutron-15.0.0 <sys-cluster/neutron-16 ) glance? ( >=app-admin/glance-19.0.0 <app-admin/glance-20 ) cinder? ( >=sys-cluster/cinder-15.0.0 <sys-cluster/cinder-16 ) nova? ( >=sys-cluster/nova-20.0.0 <sys-cluster/nova-21 ) heat? ( >=sys-cluster/heat-13.0.0 <sys-cluster/heat-14 ) placement? ( >=sys-cluster/placement-2.0.0 <sys-cluster/placement-3 )
-SLOT=0
-_md5_=9b8c9af1a27367af3c91c3887b3bc723
diff --git a/metadata/md5-cache/sys-cluster/openstack-meta-2019.2.3 b/metadata/md5-cache/sys-cluster/openstack-meta-2019.2.3
new file mode 100644
index 000000000000..176ddd98ea01
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/openstack-meta-2019.2.3
@@ -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 <sys-auth/keystone-17 ) swift? ( >=sys-cluster/swift-2.23.0 <sys-cluster/swift-2.25.0 ) neutron? ( >=sys-cluster/neutron-15.0.0 <sys-cluster/neutron-16 ) glance? ( >=app-admin/glance-19.0.0 <app-admin/glance-20 ) cinder? ( >=sys-cluster/cinder-15.0.0 <sys-cluster/cinder-16 ) nova? ( >=sys-cluster/nova-20.0.0 <sys-cluster/nova-21 ) heat? ( >=sys-cluster/heat-13.0.0 <sys-cluster/heat-14 ) placement? ( >=sys-cluster/placement-2.0.0 <sys-cluster/placement-3 )
+SLOT=0
+_md5_=1c725466da55926769346f522869d883
diff --git a/metadata/md5-cache/sys-cluster/polysh-0.4-r1 b/metadata/md5-cache/sys-cluster/polysh-0.4-r1
deleted file mode 100644
index b5a31a868371..000000000000
--- a/metadata/md5-cache/sys-cluster/polysh-0.4-r1
+++ /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-42.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Aggregate several remote shells into one
-EAPI=5
-HOMEPAGE=http://guichaz.free.fr/polysh/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos
-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=http://guichaz.free.fr/polysh/files/polysh-0.4.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=873ab9b659627791a6eca69379dabac4
diff --git a/metadata/md5-cache/sys-cluster/rdma-core-28.0 b/metadata/md5-cache/sys-cluster/rdma-core-28.0
index 6c935f441ec9..457f4fbaef64 100644
--- a/metadata/md5-cache/sys-cluster/rdma-core-28.0
+++ b/metadata/md5-cache/sys-cluster/rdma-core-28.0
@@ -5,11 +5,11 @@ DESCRIPTION=Userspace components for the Linux Kernel's drivers/infiniband subsy
 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=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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/v28.0.tar.gz -> rdma-core-28.0.tar.gz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2ae43d15a180f78f88f1ec1711ccc504
+_md5_=c30ad1e6582cd9118bfd38eec4eefc4f
diff --git a/metadata/md5-cache/sys-cluster/rdma-core-30.0 b/metadata/md5-cache/sys-cluster/rdma-core-30.0
new file mode 100644
index 000000000000..02954c9ea0e4
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/rdma-core-30.0
@@ -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=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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/v30.0.tar.gz -> rdma-core-30.0.tar.gz
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2ae43d15a180f78f88f1ec1711ccc504
diff --git a/metadata/md5-cache/sys-cluster/sanlock-3.6.0 b/metadata/md5-cache/sys-cluster/sanlock-3.6.0
index e213d6b139dd..13c8aefb66bd 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_python3_6?
 REQUIRED_USE=python? ( || ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://releases.pagure.org/sanlock/sanlock-3.6.0.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=9d1b5a31f6e6292450ccfcdb08ff6832
diff --git a/metadata/md5-cache/sys-cluster/sanlock-3.8.0 b/metadata/md5-cache/sys-cluster/sanlock-3.8.0
index 207ad2ff964e..e0b21ab2e838 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_python3_6?
 REQUIRED_USE=python? ( || ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://releases.pagure.org/sanlock/sanlock-3.8.0.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=488ee5e7841f711bee007b68ccfbfec0
diff --git a/metadata/md5-cache/sys-cluster/singularity-3.5.3-r1 b/metadata/md5-cache/sys-cluster/singularity-3.5.3-r1
index 3a9294efefde..fcc112dd6ad8 100644
--- a/metadata/md5-cache/sys-cluster/singularity-3.5.3-r1
+++ b/metadata/md5-cache/sys-cluster/singularity-3.5.3-r1
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=sys-libs/libseccomp sys-fs/squashfs-tools
 SLOT=0
 SRC_URI=https://github.com/sylabs/singularity/releases/download/v3.5.3/singularity-3.5.3.tar.gz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4f60bcb3b010b735acfdf47d467e33f0
diff --git a/metadata/md5-cache/sys-cluster/swift-2.23.1-r2 b/metadata/md5-cache/sys-cluster/swift-2.23.1-r2
deleted file mode 100644
index 8731f8f4f006..000000000000
--- a/metadata/md5-cache/sys-cluster/swift-2.23.1-r2
+++ /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-42.0.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 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-1.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=A highly available, distributed, and eventually consistent object/blob store
-EAPI=7
-HOMEPAGE=https://launchpad.net/swift
-IUSE=account container doc +memcached +object proxy python_targets_python3_6 python_targets_python3_7 kernel_linux
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-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(-)] 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
-SRC_URI=https://tarballs.openstack.org/swift/swift-2.23.1.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c5fb8047ebd725844bea8e76ca504d59
diff --git a/metadata/md5-cache/sys-cluster/swift-2.24.0-r1 b/metadata/md5-cache/sys-cluster/swift-2.24.0-r1
index c748eaadc129..0100233ff583 100644
--- a/metadata/md5-cache/sys-cluster/swift-2.24.0-r1
+++ b/metadata/md5-cache/sys-cluster/swift-2.24.0-r1
@@ -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	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c5fb8047ebd725844bea8e76ca504d59
diff --git a/metadata/md5-cache/sys-cluster/swift-2.25.0 b/metadata/md5-cache/sys-cluster/swift-2.25.0
index 840c855ab914..535400c8a92d 100644
--- a/metadata/md5-cache/sys-cluster/swift-2.25.0
+++ b/metadata/md5-cache/sys-cluster/swift-2.25.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.25.0.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dc7f75ae4c7632f1108629793bc29c5a
diff --git a/metadata/md5-cache/sys-cluster/swift-2019.2.9999 b/metadata/md5-cache/sys-cluster/swift-2019.2.9999
index d67d58dd80d0..597fac6675f5 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(-)] 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	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c76f97a38d0a315445bd789ed21c964c
diff --git a/metadata/md5-cache/sys-cluster/swift-2020.1.9999 b/metadata/md5-cache/sys-cluster/swift-2020.1.9999
index b2f09609f27a..52f5475030df 100644
--- a/metadata/md5-cache/sys-cluster/swift-2020.1.9999
+++ b/metadata/md5-cache/sys-cluster/swift-2020.1.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(-)] 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	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=333263978c7ff73e2850297ebc3556a6
diff --git a/metadata/md5-cache/sys-cluster/torque-4.1.7-r1 b/metadata/md5-cache/sys-cluster/torque-4.1.7-r1
index a554df088c9c..0769ff327eec 100644
--- a/metadata/md5-cache/sys-cluster/torque-4.1.7-r1
+++ b/metadata/md5-cache/sys-cluster/torque-4.1.7-r1
@@ -9,5 +9,5 @@ LICENSE=torque-2.5
 RDEPEND=sys-libs/zlib sys-libs/readline:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) cpusets? ( sys-apps/hwloc ) munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 ) tk? ( dev-lang/tk:0= dev-lang/tcl:0= ) syslog? ( virtual/logger ) !!games-util/qstat crypt? ( net-misc/openssh ) !crypt? ( net-misc/netkit-rsh ) !dev-libs/uthash
 SLOT=0
 SRC_URI=http://www.adaptivecomputing.com/index.php?wpfb_dl=1690 -> torque-4.1.7.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=55301d5854e280f8b689a888db3a38ab
diff --git a/metadata/md5-cache/sys-cluster/torque-4.2.10-r1 b/metadata/md5-cache/sys-cluster/torque-4.2.10-r1
index 271a4caa6e0a..1df18cf1b479 100644
--- a/metadata/md5-cache/sys-cluster/torque-4.2.10-r1
+++ b/metadata/md5-cache/sys-cluster/torque-4.2.10-r1
@@ -9,5 +9,5 @@ LICENSE=torque-2.5
 RDEPEND=sys-libs/zlib sys-libs/readline:0= dev-libs/libxml2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) cpusets? ( sys-apps/hwloc ) munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 ) tk? ( dev-lang/tk:0= dev-lang/tcl:0= ) syslog? ( virtual/logger ) !!games-util/qstat crypt? ( net-misc/openssh ) !crypt? ( net-misc/netkit-rsh ) !dev-libs/uthash
 SLOT=0
 SRC_URI=https://github.com/adaptivecomputing/torque/archive/ddf5c4f40091b6157164a8846e5b60f42a5ae7f6.tar.gz -> torque-4.2.10-gh-20150517.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3f7a3975d792fccfae0daa21ca9a93c6
diff --git a/metadata/md5-cache/sys-cluster/torque-6.0.4-r1 b/metadata/md5-cache/sys-cluster/torque-6.0.4-r1
index 5db84b6a4093..3c59be84d7eb 100644
--- a/metadata/md5-cache/sys-cluster/torque-6.0.4-r1
+++ b/metadata/md5-cache/sys-cluster/torque-6.0.4-r1
@@ -9,5 +9,5 @@ LICENSE=torque-2.5
 RDEPEND=sys-libs/zlib sys-libs/readline:0= dev-libs/libxml2 >=dev-libs/boost-1.41 cpusets? ( sys-apps/hwloc ) munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 ) tk? ( dev-lang/tk:0= dev-lang/tcl:0= ) syslog? ( virtual/logger ) !!games-util/qstat crypt? ( net-misc/openssh ) !crypt? ( net-misc/netkit-rsh ) !dev-libs/uthash
 SLOT=0
 SRC_URI=https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e9217cbab1542792d646f59a6.tar.gz -> torque-6.0.4-gh-20170829.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1edb9c15de636439e79adfda5a337c72
diff --git a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.6.1 b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.6.1
deleted file mode 100644
index e3cde4cb4901..000000000000
--- a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install setup
-DESCRIPTION=A high-performance coordination service for distributed applications.
-EAPI=5
-HOMEPAGE=http://zookeeper.apache.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7
-RESTRICT=mirror binchecks
-SLOT=0
-SRC_URI=https://downloads.apache.org/zookeeper/zookeeper-3.6.1/apache-zookeeper-3.6.1-bin.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-utils-2	16d46032afaca1d6d0621f82084880cb	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=708873769c4273f408d0885271ccef7b
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index cb4b7ca06b28..97aac8702237 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/binutils-2.34 b/metadata/md5-cache/sys-devel/binutils-2.34
deleted file mode 100644
index 524106b5c71a..000000000000
--- a/metadata/md5-cache/sys-devel/binutils-2.34
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib sys-devel/gnuconfig
-DESCRIPTION=Tools necessary to build programs
-EAPI=7
-HOMEPAGE=https://sourceware.org/binutils/
-IUSE=default-gold doc +gold multitarget +nls +plugins static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-3+
-RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
-REQUIRED_USE=default-gold? ( gold )
-RESTRICT=!test? ( test )
-SLOT=2.34
-SRC_URI=mirror://gnu/binutils/binutils-2.34.tar.xz https://dev.gentoo.org/~slyfox/distfiles/binutils-2.34-patches-1.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3b4a39a07fa8a56c0f7413691077e299
diff --git a/metadata/md5-cache/sys-devel/binutils-config-5.3.2 b/metadata/md5-cache/sys-devel/binutils-config-5.3.2
new file mode 100644
index 000000000000..a12f9133ce66
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/binutils-config-5.3.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst
+DESCRIPTION=Utility to change the binutils version being used
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Toolchain
+IUSE=+native-symlinks
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/gentoo-functions
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/binutils-config-5.3.2.tar.xz
+_eclasses_=prefix	c2993e4c430c1ee24f278983d6189501
+_md5_=cdbeb644b00c5960463b63ea4b601fe3
diff --git a/metadata/md5-cache/sys-devel/clang-10.0.0 b/metadata/md5-cache/sys-devel/clang-10.0.0
index 2487a1aeb2e1..5e11acd5f488 100644
--- a/metadata/md5-cache/sys-devel/clang-10.0.0
+++ b/metadata/md5-cache/sys-devel/clang-10.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-10.0.0-manpages.tar.bz2 ) https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0c15c9bbc9c99df7cf257eb41b76246b
diff --git a/metadata/md5-cache/sys-devel/clang-10.0.1.9999 b/metadata/md5-cache/sys-devel/clang-10.0.1.9999
index 3a54018e189f..9db1db826ac3 100644
--- a/metadata/md5-cache/sys-devel/clang-10.0.1.9999
+++ b/metadata/md5-cache/sys-devel/clang-10.0.1.9999
@@ -12,5 +12,5 @@ RDEPEND=~sys-devel/llvm-10.0.1.9999:10=[debug=,llvm_targets_AArch64?,llvm_target
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) || ( 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	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=768f09167fccd8308590618de545deec
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=93fd9317940bc64080cf968df97a6085
diff --git a/metadata/md5-cache/sys-devel/clang-10.0.1_rc1 b/metadata/md5-cache/sys-devel/clang-10.0.1_rc1
index c8987d9dbb7c..be2795087c9c 100644
--- a/metadata/md5-cache/sys-devel/clang-10.0.1_rc1
+++ b/metadata/md5-cache/sys-devel/clang-10.0.1_rc1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1-rc1.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f3923b2db0a8711bbfc92c4312bf526c
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=44672d442fb8a284539b3141cd2fd1b2
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 4a656b50a4ee..f9512af95afe 100644
--- a/metadata/md5-cache/sys-devel/clang-11.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-11.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=~sys-devel/llvm-11.0.0.9999:11=[debug=,llvm_targets_AArch64?,llvm_target
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR 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_VE )
 RESTRICT=!test? ( test )
 SLOT=11
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2212f51fb8deb27befa0b926b454a3ae
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=56f810a1a03140423ef057e5272c340e
diff --git a/metadata/md5-cache/sys-devel/clang-9.0.1 b/metadata/md5-cache/sys-devel/clang-9.0.1
index 3f6b8f67a9b2..9d527a4e08ef 100644
--- a/metadata/md5-cache/sys-devel/clang-9.0.1
+++ b/metadata/md5-cache/sys-devel/clang-9.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 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	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2992fe095ba4527cb2f85c12515902f5
diff --git a/metadata/md5-cache/sys-devel/clang-common-10.0.0 b/metadata/md5-cache/sys-devel/clang-common-10.0.0
index 628ffe0a9f1e..8a08a8915692 100644
--- a/metadata/md5-cache/sys-devel/clang-common-10.0.0
+++ b/metadata/md5-cache/sys-devel/clang-common-10.0.0
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:*
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=71b7e898a6295ae5b8b738fe4a4d39a5
diff --git a/metadata/md5-cache/sys-devel/clang-common-10.0.1.9999 b/metadata/md5-cache/sys-devel/clang-common-10.0.1.9999
index 145ee718a371..804f260fe0ab 100644
--- a/metadata/md5-cache/sys-devel/clang-common-10.0.1.9999
+++ b/metadata/md5-cache/sys-devel/clang-common-10.0.1.9999
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:*
 PROPERTIES=live
 SLOT=0
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=18893e7c57de4f4e90ef8370f2bbabdc
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=08fc57ed13553551d5b52161c571c7d3
diff --git a/metadata/md5-cache/sys-devel/clang-common-10.0.1_rc1 b/metadata/md5-cache/sys-devel/clang-common-10.0.1_rc1
index bac96c4f4adb..34dab5406c76 100644
--- a/metadata/md5-cache/sys-devel/clang-common-10.0.1_rc1
+++ b/metadata/md5-cache/sys-devel/clang-common-10.0.1_rc1
@@ -6,5 +6,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:*
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1-rc1.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=98c6b7baeb894f65347e14aa3df3a1be
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a6513b1aae1caeb77b1491bb87b5058a
diff --git a/metadata/md5-cache/sys-devel/clang-common-11.0.0.9999 b/metadata/md5-cache/sys-devel/clang-common-11.0.0.9999
index 69d408856ceb..7700369104cb 100644
--- a/metadata/md5-cache/sys-devel/clang-common-11.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-common-11.0.0.9999
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:*
 PROPERTIES=live
 SLOT=0
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=98c6b7baeb894f65347e14aa3df3a1be
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a6513b1aae1caeb77b1491bb87b5058a
diff --git a/metadata/md5-cache/sys-devel/clang-common-9.0.1 b/metadata/md5-cache/sys-devel/clang-common-9.0.1
index cff60cbd49a9..3990e69fccb6 100644
--- a/metadata/md5-cache/sys-devel/clang-common-9.0.1
+++ b/metadata/md5-cache/sys-devel/clang-common-9.0.1
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:*
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-9.0.1.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=886b10c625deca52b7b2a114a9484c5f
diff --git a/metadata/md5-cache/sys-devel/crossdev-20200125 b/metadata/md5-cache/sys-devel/crossdev-20200125
deleted file mode 100644
index 33cd25abca09..000000000000
--- a/metadata/md5-cache/sys-devel/crossdev-20200125
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-arch/xz-utils
-DESCRIPTION=Gentoo Cross-toolchain generator
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Crossdev
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions
-SLOT=0
-SRC_URI=mirror://gentoo/crossdev-20200125.tar.xz https://dev.gentoo.org/~slyfox/distfiles/crossdev-20200125.tar.xz
-_md5_=3e9d60c86bb4f62d557178b03a84121f
diff --git a/metadata/md5-cache/sys-devel/gcc-10.1.0 b/metadata/md5-cache/sys-devel/gcc-10.1.0
deleted file mode 100644
index c80ce9541366..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-10.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/binutils >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=sys-devel/gnuconfig sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=7
-HOMEPAGE=https://gcc.gnu.org/
-IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada +vtv jit +pie +ssp +pch systemtap d lto zstd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=sys-devel/gcc-config-1.7
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
-RESTRICT=!test? ( test )
-SLOT=10
-SRC_URI=mirror://gnu/gcc/gcc-10.1.0/gcc-10.1.0.tar.xz mirror://gentoo/gcc-10.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-10.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-10.1.0-patches-1.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	3c5c1f58d3da32714ebe931369218569	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d20efc5394a83fb97761949220e47cc8
diff --git a/metadata/md5-cache/sys-devel/gcc-8.3.0-r3 b/metadata/md5-cache/sys-devel/gcc-8.3.0-r3
deleted file mode 100644
index 72a8b034f2cb..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-8.3.0-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 sys-devel/gnuconfig sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=7
-HOMEPAGE=https://gcc.gnu.org/
-IUSE=test vanilla +nls altivec debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada +vtv jit mpx +pie +ssp +pch systemtap
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
-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-4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.3.0-patches-4.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	3c5c1f58d3da32714ebe931369218569	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b19df4de648f856f6e9fe9d622be4e7a
diff --git a/metadata/md5-cache/sys-devel/gcc-config-2.3.1 b/metadata/md5-cache/sys-devel/gcc-config-2.3.1
new file mode 100644
index 000000000000..80cf4b2a1092
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-config-2.3.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst
+DESCRIPTION=Utility to manage compilers
+EAPI=7
+HOMEPAGE=https://gitweb.gentoo.org/proj/gcc-config.git/
+IUSE=+native-symlinks
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/gentoo-functions-0.10
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/gcc-config-2.3.1.tar.xz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5aa90735b2af7ea537d6c4f7f67e77c2
diff --git a/metadata/md5-cache/sys-devel/gcc-config-9999 b/metadata/md5-cache/sys-devel/gcc-config-9999
index 507092f914c6..df6e7f9bc62f 100644
--- a/metadata/md5-cache/sys-devel/gcc-config-9999
+++ b/metadata/md5-cache/sys-devel/gcc-config-9999
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=Utility to manage compilers
 EAPI=7
 HOMEPAGE=https://gitweb.gentoo.org/proj/gcc-config.git/
-IUSE=+native-symlinks
+IUSE=+cc-wrappers +native-symlinks
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/gentoo-functions-0.10
 SLOT=0
 _eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5aa90735b2af7ea537d6c4f7f67e77c2
+_md5_=05c8653528fa62482d64f18e74cc5f02
diff --git a/metadata/md5-cache/sys-devel/gnuconfig-20200621 b/metadata/md5-cache/sys-devel/gnuconfig-20200621
new file mode 100644
index 000000000000..37cdd910b7a1
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gnuconfig-20200621
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile install prepare test unpack
+DESCRIPTION=Updated config.sub and config.guess file from GNU
+EAPI=7
+HOMEPAGE=https://savannah.gnu.org/projects/config
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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://dev.gentoo.org/~whissi/dist/gnuconfig/gnuconfig-20200621.tar.bz2
+_md5_=0eb44b3b955eb626abbf0d01392f79d5
diff --git a/metadata/md5-cache/sys-devel/lld-10.0.0 b/metadata/md5-cache/sys-devel/lld-10.0.0
index fe94eaa68690..a4fc748d8622 100644
--- a/metadata/md5-cache/sys-devel/lld-10.0.0
+++ b/metadata/md5-cache/sys-devel/lld-10.0.0
@@ -11,5 +11,5 @@ RDEPEND=~sys-devel/llvm-10.0.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=509202225ef8f54a3277688142354d1a
diff --git a/metadata/md5-cache/sys-devel/lld-10.0.1.9999 b/metadata/md5-cache/sys-devel/lld-10.0.1.9999
index a3e7ff1b4350..8437043e5d47 100644
--- a/metadata/md5-cache/sys-devel/lld-10.0.1.9999
+++ b/metadata/md5-cache/sys-devel/lld-10.0.1.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=~sys-devel/llvm-10.0.1.9999
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=964caac0ab3df299dfbb82b16a911a65
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dd9b7d2b488a31c2bafc58ce3384a4a1
diff --git a/metadata/md5-cache/sys-devel/lld-10.0.1_rc1 b/metadata/md5-cache/sys-devel/lld-10.0.1_rc1
index d0c31a598bd3..82e8687848c6 100644
--- a/metadata/md5-cache/sys-devel/lld-10.0.1_rc1
+++ b/metadata/md5-cache/sys-devel/lld-10.0.1_rc1
@@ -10,5 +10,5 @@ RDEPEND=~sys-devel/llvm-10.0.1_rc1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1-rc1.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=964caac0ab3df299dfbb82b16a911a65
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dd9b7d2b488a31c2bafc58ce3384a4a1
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 26b39e21d10f..cbe322cb28cd 100644
--- a/metadata/md5-cache/sys-devel/lld-11.0.0.9999
+++ b/metadata/md5-cache/sys-devel/lld-11.0.0.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=~sys-devel/llvm-11.0.0.9999
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=964caac0ab3df299dfbb82b16a911a65
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dd9b7d2b488a31c2bafc58ce3384a4a1
diff --git a/metadata/md5-cache/sys-devel/lld-9.0.1 b/metadata/md5-cache/sys-devel/lld-9.0.1
index 708a6ed8c4c7..318e4f061a5c 100644
--- a/metadata/md5-cache/sys-devel/lld-9.0.1
+++ b/metadata/md5-cache/sys-devel/lld-9.0.1
@@ -11,5 +11,5 @@ RDEPEND=~sys-devel/llvm-9.0.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-9.0.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3c5bb5f98076613772a8e5173a6c0e39
diff --git a/metadata/md5-cache/sys-devel/llvm-10.0.0 b/metadata/md5-cache/sys-devel/llvm-10.0.0
index 4902a58d1015..d413cbb29833 100644
--- a/metadata/md5-cache/sys-devel/llvm-10.0.0
+++ b/metadata/md5-cache/sys-devel/llvm-10.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-10.0.0-manpages.tar.bz2 ) https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f6bd51b6dc58884aaaeb1edd98283c92
diff --git a/metadata/md5-cache/sys-devel/llvm-10.0.1.9999 b/metadata/md5-cache/sys-devel/llvm-10.0.1.9999
index 97f2af39daec..829112c8080c 100644
--- a/metadata/md5-cache/sys-devel/llvm-10.0.1.9999
+++ b/metadata/md5-cache/sys-devel/llvm-10.0.1.9999
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_
 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 llvm_targets_ARC llvm_targets_AVR llvm_targets_VE )
 RESTRICT=!test? ( test )
 SLOT=10
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8c96dc5defada490700d0ac4aaac4fd6
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c7fb9f5ec9f1c45d52e07780ed79861b
diff --git a/metadata/md5-cache/sys-devel/llvm-10.0.1_rc1 b/metadata/md5-cache/sys-devel/llvm-10.0.1_rc1
index dc5d437fe3bd..825585c3d7ae 100644
--- a/metadata/md5-cache/sys-devel/llvm-10.0.1_rc1
+++ b/metadata/md5-cache/sys-devel/llvm-10.0.1_rc1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1-rc1.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=be2c04c2e9e5659dea1182cdd3e8a5f9
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8e4b46935d00974fdfad08d84ca20ff5
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 064de6707de5..92eee41a486c 100644
--- a/metadata/md5-cache/sys-devel/llvm-11.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-11.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR 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_VE )
 RESTRICT=!test? ( test )
 SLOT=11
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c00553b1a199d790879c469fc03ec72e
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1830c07471daba45916fb8286730a14e
diff --git a/metadata/md5-cache/sys-devel/llvm-9.0.1 b/metadata/md5-cache/sys-devel/llvm-9.0.1
index ccaf1f40e96f..d1d9608c1012 100644
--- a/metadata/md5-cache/sys-devel/llvm-9.0.1
+++ b/metadata/md5-cache/sys-devel/llvm-9.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 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	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f6b4934dc1cdd36102e43f2e43f9c5f9
diff --git a/metadata/md5-cache/sys-devel/llvm-common-10.0.0 b/metadata/md5-cache/sys-devel/llvm-common-10.0.0
index 1125ce122702..1bc6c4466ff1 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-10.0.0
+++ b/metadata/md5-cache/sys-devel/llvm-common-10.0.0
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
-_eclasses_=llvm.org	4e92588f6138c82063258a2d303eaed8
+_eclasses_=llvm.org	de1162ce05041c923a8c6efc9175fb66	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=c1cc28fb691f9b22377a01fee75ccab6
diff --git a/metadata/md5-cache/sys-devel/llvm-common-10.0.1.9999 b/metadata/md5-cache/sys-devel/llvm-common-10.0.1.9999
index 2930976b8743..299423e1254a 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-10.0.1.9999
+++ b/metadata/md5-cache/sys-devel/llvm-common-10.0.1.9999
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PROPERTIES=live
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
-_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm.org	4e92588f6138c82063258a2d303eaed8
-_md5_=b3649a0d6d6cac5cd5d8457491c898bd
+_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm.org	de1162ce05041c923a8c6efc9175fb66	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=c8c5ff1b18ab0822fe355d25c5b2b6e6
diff --git a/metadata/md5-cache/sys-devel/llvm-common-10.0.1_rc1 b/metadata/md5-cache/sys-devel/llvm-common-10.0.1_rc1
index 7b76d9e250d2..bf4f97fa9c0a 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-10.0.1_rc1
+++ b/metadata/md5-cache/sys-devel/llvm-common-10.0.1_rc1
@@ -6,5 +6,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1-rc1.tar.gz
-_eclasses_=llvm.org	4e92588f6138c82063258a2d303eaed8
-_md5_=b3649a0d6d6cac5cd5d8457491c898bd
+_eclasses_=llvm.org	de1162ce05041c923a8c6efc9175fb66	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=c8c5ff1b18ab0822fe355d25c5b2b6e6
diff --git a/metadata/md5-cache/sys-devel/llvm-common-11.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-common-11.0.0.9999
index 2930976b8743..299423e1254a 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-11.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-common-11.0.0.9999
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PROPERTIES=live
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
-_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm.org	4e92588f6138c82063258a2d303eaed8
-_md5_=b3649a0d6d6cac5cd5d8457491c898bd
+_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm.org	de1162ce05041c923a8c6efc9175fb66	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=c8c5ff1b18ab0822fe355d25c5b2b6e6
diff --git a/metadata/md5-cache/sys-devel/llvm-common-9.0.1 b/metadata/md5-cache/sys-devel/llvm-common-9.0.1
index e5bf39b2cf87..4e144849dd2e 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-9.0.1
+++ b/metadata/md5-cache/sys-devel/llvm-common-9.0.1
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-9.0.1.tar.gz
-_eclasses_=llvm.org	4e92588f6138c82063258a2d303eaed8
+_eclasses_=llvm.org	de1162ce05041c923a8c6efc9175fb66	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=50c1f0e11c65867fa9ccc23de12003ff
diff --git a/metadata/md5-cache/sys-devel/pmake-1.111.3.3 b/metadata/md5-cache/sys-devel/pmake-1.111.3.3
index 1626a8f0e513..8a518313a4b4 100644
--- a/metadata/md5-cache/sys-devel/pmake-1.111.3.3
+++ b/metadata/md5-cache/sys-devel/pmake-1.111.3.3
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/pmake/pmake_1.111.orig.tar.gz mirror://debian/pool/main/p/pmake/pmake_1.111-3.3.debian.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=7742d88feacb1693e8ac8f9a32d01c52
diff --git a/metadata/md5-cache/sys-devel/sparse-0.5.1 b/metadata/md5-cache/sys-devel/sparse-0.5.1
deleted file mode 100644
index eb83e401d249..000000000000
--- a/metadata/md5-cache/sys-devel/sparse-0.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile prepare
-DEPEND=gtk? ( x11-libs/gtk+:2 ) llvm? ( >=sys-devel/llvm-3.0 ) xml? ( dev-libs/libxml2 ) gtk? ( virtual/pkgconfig ) xml? ( virtual/pkgconfig )
-DESCRIPTION=C semantic parser
-EAPI=6
-HOMEPAGE=https://sparse.wiki.kernel.org/index.php/Main_Page
-IUSE=gtk llvm test xml
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=gtk? ( x11-libs/gtk+:2 ) llvm? ( >=sys-devel/llvm-3.0 ) xml? ( dev-libs/libxml2 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/software/devel/sparse/dist/sparse-0.5.1.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=51b9f2cc057725fefbbe66cde834857f
diff --git a/metadata/md5-cache/sys-devel/sparse-0.5.2_rc1 b/metadata/md5-cache/sys-devel/sparse-0.5.2_rc1
deleted file mode 100644
index 9e1d7cb79627..000000000000
--- a/metadata/md5-cache/sys-devel/sparse-0.5.2_rc1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile prepare
-DEPEND=gtk? ( x11-libs/gtk+:2 ) llvm? ( >=sys-devel/llvm-3.0 ) xml? ( dev-libs/libxml2 ) gtk? ( virtual/pkgconfig ) xml? ( virtual/pkgconfig )
-DESCRIPTION=C semantic parser
-EAPI=6
-HOMEPAGE=https://sparse.wiki.kernel.org/index.php/Main_Page
-IUSE=gtk llvm test xml
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=gtk? ( x11-libs/gtk+:2 ) llvm? ( >=sys-devel/llvm-3.0 ) xml? ( dev-libs/libxml2 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://git.kernel.org/pub/scm/devel/sparse/sparse.git/snapshot/sparse-d1c2f8d3d4205ca1ae7cf0ec2cbd89a7fce73e5c.tar.gz -> sparse-0.5.2-rc1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7fbe79681de06bee1d39d0db0a3d098e
diff --git a/metadata/md5-cache/sys-devel/sparse-0.6.0 b/metadata/md5-cache/sys-devel/sparse-0.6.0
deleted file mode 100644
index a198a43c9ffa..000000000000
--- a/metadata/md5-cache/sys-devel/sparse-0.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=gtk? ( x11-libs/gtk+:2 ) llvm? ( >=sys-devel/llvm-3.0 ) xml? ( dev-libs/libxml2 ) gtk? ( virtual/pkgconfig ) xml? ( virtual/pkgconfig )
-DESCRIPTION=C semantic parser
-EAPI=7
-HOMEPAGE=https://sparse.wiki.kernel.org/index.php/Main_Page
-IUSE=gtk llvm test xml
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=gtk? ( x11-libs/gtk+:2 ) llvm? ( >=sys-devel/llvm-3.0 ) xml? ( dev-libs/libxml2 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/software/devel/sparse/dist/sparse-0.6.0.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=de21c8c71585290224e08cff2124a730
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 2b7b7bbdcc99..521d31c8d90a 100644
--- a/metadata/md5-cache/sys-firmware/Manifest.gz
+++ b/metadata/md5-cache/sys-firmware/Manifest.gz
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20200616_p20200617 b/metadata/md5-cache/sys-firmware/intel-microcode-20200616_p20200617
index 95391e539fc1..3e8535ea2d82 100644
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20200616_p20200617
+++ b/metadata/md5-cache/sys-firmware/intel-microcode-20200616_p20200617
@@ -11,5 +11,5 @@ 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-20200616.tar.gz https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20200617.tar.xz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=829dc73306d7dffd7f8ba432befd1ba1
diff --git a/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211 b/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211
index 4b98c99f79c7..fd9c46bbbff5 100644
--- a/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211
+++ b/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst
 DEPEND=!binary? ( amd64? ( app-arch/xz-utils dev-lang/perl sys-libs/zlib iso? ( sys-boot/syslinux virtual/cdrtools ) ) x86? ( app-arch/xz-utils dev-lang/perl sys-libs/zlib iso? ( sys-boot/syslinux virtual/cdrtools ) ) )
 DESCRIPTION=Open source network boot (PXE) firmware
 EAPI=6
-HOMEPAGE=http://ipxe.org/
+HOMEPAGE=https://ipxe.org/
 IUSE=+binary efi ipv6 iso lkrn +qemu undi usb vmware savedconfig
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ REQUIRED_USE=!amd64? ( !x86? ( binary ) )
 SLOT=0
 SRC_URI=!binary? ( https://git.ipxe.org/ipxe.git/snapshot/546dd51de8459d4d09958891f426fa2c73ff090d.tar.bz2 -> ipxe-1.0.0_p20180211-546dd51.tar.bz2 ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/ipxe-1.0.0_p20180211-546dd51-bin.tar.xz )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c83860e1337dc159ca5df79d3bc78fc2
+_md5_=f9697a2bec469ddeac8db39fe6a26628
diff --git a/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20190728 b/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20190728
index 5adf504b6c57..0aa6ddbe989f 100644
--- a/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20190728
+++ b/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20190728
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst
 DEPEND=!binary? ( amd64? ( app-arch/xz-utils dev-lang/perl sys-libs/zlib iso? ( sys-boot/syslinux virtual/cdrtools ) ) x86? ( app-arch/xz-utils dev-lang/perl sys-libs/zlib iso? ( sys-boot/syslinux virtual/cdrtools ) ) )
 DESCRIPTION=Open source network boot (PXE) firmware
 EAPI=6
-HOMEPAGE=http://ipxe.org/
+HOMEPAGE=https://ipxe.org/
 IUSE=+binary efi ipv6 iso lkrn +qemu undi usb vmware savedconfig
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ REQUIRED_USE=!amd64? ( !x86? ( binary ) )
 SLOT=0
 SRC_URI=!binary? ( https://git.ipxe.org/ipxe.git/snapshot/a4f8c6e31f6c62522cfc633bbbffa81b22f9d6f3.tar.bz2 -> ipxe-1.0.0_p20190728-a4f8c6e.tar.bz2 ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/ipxe-1.0.0_p20190728-a4f8c6e-bin.tar.xz )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=434109d277ea576b9a5c1ea2ba8d73ff
+_md5_=b7fcae7a690d9688d1c2a1c2c77f349c
diff --git a/metadata/md5-cache/sys-firmware/iwl1000-ucode-39.31.5.1 b/metadata/md5-cache/sys-firmware/iwl1000-ucode-39.31.5.1
index bbee8b350488..7f2f6b27289b 100644
--- a/metadata/md5-cache/sys-firmware/iwl1000-ucode-39.31.5.1
+++ b/metadata/md5-cache/sys-firmware/iwl1000-ucode-39.31.5.1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=ipw3945
 SLOT=0
 SRC_URI=http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-1000-ucode-39.31.5.1.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=22b8d4007831fa3c4fbd2817c7eacc6d
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10 b/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10
index c28d34157bfc..df458738812f 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10
+++ b/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
 SLOT=0
 SRC_URI=mirror://gentoo/iwl3160-7260-bt-ucode-37.8.10.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9955f31f0b108c2d0091a3cf983a6ccb
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p1 b/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p1
index 894ef446085d..a835e770f410 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p1
+++ b/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p1
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
 SLOT=0
 SRC_URI=mirror://gentoo/iwl3160-7260-bt-ucode-37.8.10_p1.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f7c85bcc35c7613656b7393ec6269177
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p2 b/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p2
index a31c96ddbc19..a9473dec9607 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p2
+++ b/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p2
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
 SLOT=0
 SRC_URI=mirror://gentoo/iwl3160-7260-bt-ucode-37.8.10_p2.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9f1242ed5f4b471d97bf5e46a56f56de
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.10.11.23 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.10.11.23
index a444666d9a20..0b46aa925529 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.10.11.23
+++ b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.10.11.23
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=10
 SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-3160-ucode-23.11.10.0.tgz -> iwl3160-ucode-0.10.11.23.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6d0eb92de71c28270eb3601df051067b
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.10.15.23 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.10.15.23
index c9ebb051ee29..1b199ea6014c 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.10.15.23
+++ b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.10.15.23
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=10
 SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-3160-ucode-23.15.10.0.tgz -> iwl3160-ucode-0.10.15.23.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=e4b1b0d7bf66c55c578f8ea9dca93ac4
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.12.16.25 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.12.16.25
index 9d1538ae9d18..bb3dbfbde062 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.12.16.25
+++ b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.12.16.25
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=12
 SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-3160-ucode-25.16.12.0.tgz -> iwl3160-ucode-0.12.16.25.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=9535695a42f56fbbddeed890d5be9c8f
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.12.17.25 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.12.17.25
index 7c78764cb1a7..93861d41b4a3 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.12.17.25
+++ b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.12.17.25
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=12
 SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-3160-ucode-25.17.12.0.tgz -> iwl3160-ucode-0.12.17.25.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=3b852a06be90fea9bc7d1bfec1cdda72
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.13.30.25 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.13.30.25
index d103a04c9be3..72bd8a05403b 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.13.30.25
+++ b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.13.30.25
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=13
 SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-3160-ucode-25.30.13.0.tgz -> iwl3160-ucode-0.13.30.25.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=fba1653bf0d32498802056419200d674
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.15.227938 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.15.227938
index 17e6cc8b8b45..39f910fb2a4c 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.15.227938
+++ b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.15.227938
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=15
 SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-3160-ucode-15.227938.0.tgz -> iwl3160-ucode-0.15.227938.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=ccd8415ceccb857420aac4c5b412faa6
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.16.242414 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.16.242414
index 251d6639183a..ae57bebd13bf 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.16.242414
+++ b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.16.242414
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=16
 SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-3160-ucode-16.242414.0.tgz -> iwl3160-ucode-0.16.242414.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=80eaf1d50670511dab8ab70bd5b663e8
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.7.1.22 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.7.1.22
index 72d88ebb86d2..9b303424de50 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.7.1.22
+++ b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.7.1.22
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=7
 SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-3160-ucode-22.1.7.0.tgz -> iwl3160-ucode-0.7.1.22.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=fc5062b8308806bac2f538bc63a7e384
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.8.15.22 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.8.15.22
index 15382a8e5225..08c63fb17553 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.8.15.22
+++ b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.8.15.22
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=8
 SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-3160-ucode-22.15.8.0.tgz -> iwl3160-ucode-0.8.15.22.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=b64240c5acb39bd7598a0f63c8301ba8
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.8.24.22 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.8.24.22
index 6676fcc55b2a..95768ef41c06 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.8.24.22
+++ b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.8.24.22
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=8
 SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-3160-ucode-22.24.8.0.tgz -> iwl3160-ucode-0.8.24.22.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=4befe044d6cfef4f031fb841e1360c22
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.9.214.23 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.9.214.23
index cb021ac33d7f..86822372bd1e 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.9.214.23
+++ b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.9.214.23
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=9
 SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-3160-ucode-23.214.9.0.tgz -> iwl3160-ucode-0.9.214.23.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=2a47852f8a4e1d31fd36e8d30d253c92
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.9.228.25 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.9.228.25
index fd80935c4b89..19c37287d1b5 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.9.228.25
+++ b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.9.228.25
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=9
 SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-3160-ucode-25.228.9.0.tgz -> iwl3160-ucode-0.9.228.25.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=b152ad27535f63c79852edc812e7b5ea
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.10.11.23 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.10.11.23
index 59357643bf01..f4d77d7b2705 100644
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.10.11.23
+++ b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.10.11.23
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=10
 SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-7260-ucode-23.11.10.0.tgz -> iwl7260-ucode-0.10.11.23.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6d0eb92de71c28270eb3601df051067b
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.10.15.23 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.10.15.23
index a7a88a3a69bf..07be2c27810b 100644
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.10.15.23
+++ b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.10.15.23
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=10
 SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-7260-ucode-23.15.10.0.tgz -> iwl7260-ucode-0.10.15.23.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=e4b1b0d7bf66c55c578f8ea9dca93ac4
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.12.16.25 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.12.16.25
index 300e86d30316..f4a8530400d9 100644
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.12.16.25
+++ b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.12.16.25
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=12
 SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-7260-ucode-25.16.12.0.tgz -> iwl7260-ucode-0.12.16.25.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=9535695a42f56fbbddeed890d5be9c8f
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.12.17.25 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.12.17.25
index 219113945069..0957cfb5cb52 100644
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.12.17.25
+++ b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.12.17.25
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=12
 SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-7260-ucode-25.17.12.0.tgz -> iwl7260-ucode-0.12.17.25.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=3b852a06be90fea9bc7d1bfec1cdda72
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.13.30.25 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.13.30.25
index 4a077013af5e..84a8d7133358 100644
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.13.30.25
+++ b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.13.30.25
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=13
 SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-7260-ucode-25.30.13.0.tgz -> iwl7260-ucode-0.13.30.25.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=fba1653bf0d32498802056419200d674
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.15.227938 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.15.227938
index ffb031d29cf5..1e1ecc010f23 100644
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.15.227938
+++ b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.15.227938
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=15
 SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-7260-ucode-15.227938.0.tgz -> iwl7260-ucode-0.15.227938.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=ccd8415ceccb857420aac4c5b412faa6
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.16.242414 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.16.242414
index ab10fec46f25..758a914d269c 100644
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.16.242414
+++ b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.16.242414
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=16
 SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-7260-ucode-16.242414.0.tgz -> iwl7260-ucode-0.16.242414.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=80eaf1d50670511dab8ab70bd5b663e8
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.7.1.22 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.7.1.22
index 76e72433bbf8..feb48c65a443 100644
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.7.1.22
+++ b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.7.1.22
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=7
 SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-7260-ucode-22.1.7.0.tgz -> iwl7260-ucode-0.7.1.22.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6ae1ff4f62c0e2ca4fd4898083b280a0
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.8.15.22 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.8.15.22
index bf2800a5e474..252dd8916fe6 100644
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.8.15.22
+++ b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.8.15.22
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=8
 SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-7260-ucode-22.15.8.0.tgz -> iwl7260-ucode-0.8.15.22.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=4befe044d6cfef4f031fb841e1360c22
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.8.24.22 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.8.24.22
index e35641381433..48220556e4a9 100644
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.8.24.22
+++ b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.8.24.22
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=8
 SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-7260-ucode-22.24.8.0.tgz -> iwl7260-ucode-0.8.24.22.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=4befe044d6cfef4f031fb841e1360c22
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.9.214.23 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.9.214.23
index 925708cbfd39..33cbf8acdc59 100644
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.9.214.23
+++ b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.9.214.23
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=9
 SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-7260-ucode-23.214.9.0.tgz -> iwl7260-ucode-0.9.214.23.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=ee20b0cb3a457882e43ea0bd732ef1e0
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.9.228.25 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.9.228.25
index 9cf8eb0f71f7..444aaa1afa6a 100644
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.9.228.25
+++ b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.9.228.25
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=9
 SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-7260-ucode-25.228.9.0.tgz -> iwl7260-ucode-0.9.228.25.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=e9ae3c3909b8baf5e8caa80039222aa5
diff --git a/metadata/md5-cache/sys-firmware/iwl8000-ucode-16.242414.0 b/metadata/md5-cache/sys-firmware/iwl8000-ucode-16.242414.0
index b0acd0243f20..7add6c85c96f 100644
--- a/metadata/md5-cache/sys-firmware/iwl8000-ucode-16.242414.0
+++ b/metadata/md5-cache/sys-firmware/iwl8000-ucode-16.242414.0
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
 SLOT=0
 SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-8000-ucode-16.242414.0.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a148adbff178027a90f38e51621a9fec
diff --git a/metadata/md5-cache/sys-firmware/midisport-firmware-1.2 b/metadata/md5-cache/sys-firmware/midisport-firmware-1.2
index 6d1610c64590..f02f44cabc87 100644
--- a/metadata/md5-cache/sys-firmware/midisport-firmware-1.2
+++ b/metadata/md5-cache/sys-firmware/midisport-firmware-1.2
@@ -9,5 +9,5 @@ LICENSE=Midisport
 RDEPEND=sys-apps/fxload virtual/udev
 SLOT=0
 SRC_URI=http://downloads.sourceforge.net/usb-midi-fw/midisport-firmware-1.2.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=292cbf787ef3e518b41a41646fbfd2cd
diff --git a/metadata/md5-cache/sys-firmware/nvidia-firmware-325.15 b/metadata/md5-cache/sys-firmware/nvidia-firmware-325.15
index 65df6539537f..b09b163f8a28 100644
--- a/metadata/md5-cache/sys-firmware/nvidia-firmware-325.15
+++ b/metadata/md5-cache/sys-firmware/nvidia-firmware-325.15
@@ -8,5 +8,5 @@ LICENSE=MIT NVIDIA-r2
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=http://us.download.nvidia.com/XFree86/Linux-x86/325.15/NVIDIA-Linux-x86-325.15.run https://raw.github.com/imirkin/re-vp2/845a51ab607df85fc0ed01f0b5b6d57850e37662/extract_firmware.py -> nvidia_extract_firmware-325.15.py
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4687bca05f5ccc132c83097722697871
diff --git a/metadata/md5-cache/sys-firmware/nvidia-firmware-340.32 b/metadata/md5-cache/sys-firmware/nvidia-firmware-340.32
index db716c94301a..ff540e576c2d 100644
--- a/metadata/md5-cache/sys-firmware/nvidia-firmware-340.32
+++ b/metadata/md5-cache/sys-firmware/nvidia-firmware-340.32
@@ -8,5 +8,5 @@ LICENSE=MIT NVIDIA-r2
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=http://us.download.nvidia.com/XFree86/Linux-x86/340.32/NVIDIA-Linux-x86-340.32.run https://raw.github.com/imirkin/re-vp2/96641bfebb2547402b2145fcf0e3116410f0da87/extract_firmware.py -> nvidia_extract_firmware-340.32.py
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a2ed47a6fafb4c357b5925281e515af4
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 7cfbb7e5068f..a0b9b5d9deec 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/aufs-util-4.14_p20180709 b/metadata/md5-cache/sys-fs/aufs-util-4.14_p20180709
index 7f3dfea4d657..2a1dc6ed2ab9 100644
--- a/metadata/md5-cache/sys-fs/aufs-util-4.14_p20180709
+++ b/metadata/md5-cache/sys-fs/aufs-util-4.14_p20180709
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!sys-fs/aufs2 !<sys-fs/aufs3-3_p20130318
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs-util-4.14_p20180709.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=708b65e98b79dcc71519c47eb51cecd5
diff --git a/metadata/md5-cache/sys-fs/aufs-util-4.14_p20190603 b/metadata/md5-cache/sys-fs/aufs-util-4.14_p20190603
index 079d359ac9e1..7887b579107d 100644
--- a/metadata/md5-cache/sys-fs/aufs-util-4.14_p20190603
+++ b/metadata/md5-cache/sys-fs/aufs-util-4.14_p20190603
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!sys-fs/aufs2 !<sys-fs/aufs3-3_p20130318
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs-util-4.14_p20190603.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=708b65e98b79dcc71519c47eb51cecd5
diff --git a/metadata/md5-cache/sys-fs/aufs-util-4.1_p20170130 b/metadata/md5-cache/sys-fs/aufs-util-4.1_p20170130
index d3dc2750b1ca..9802ee3f671a 100644
--- a/metadata/md5-cache/sys-fs/aufs-util-4.1_p20170130
+++ b/metadata/md5-cache/sys-fs/aufs-util-4.1_p20170130
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!sys-fs/aufs2 !<sys-fs/aufs3-3_p20130318
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs-util-4.1_p20170130.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4a5639e2da2fc5f4454e76c84f7a4aea
diff --git a/metadata/md5-cache/sys-fs/bees-0.6.1-r2 b/metadata/md5-cache/sys-fs/bees-0.6.1-r2
index 50a740a7be22..4045c081a3da 100644
--- a/metadata/md5-cache/sys-fs/bees-0.6.1-r2
+++ b/metadata/md5-cache/sys-fs/bees-0.6.1-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-apps/util-linux-2.30.2 >=sys-fs/btrfs-progs-4.20.2
 SLOT=0
 SRC_URI=https://github.com/Zygo/bees/archive/v0.6.1.tar.gz -> bees-0.6.1.tar.gz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=554ff15325964f36b6dcead1c4f4127a
diff --git a/metadata/md5-cache/sys-fs/bees-9999 b/metadata/md5-cache/sys-fs/bees-9999
index df76f7452caa..04495c3b8ff8 100644
--- a/metadata/md5-cache/sys-fs/bees-9999
+++ b/metadata/md5-cache/sys-fs/bees-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=>=sys-apps/util-linux-2.30.2 >=sys-fs/btrfs-progs-4.20.2
 SLOT=0
-_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7632d5fea6e8dd6f0df4ce27847783dc
diff --git a/metadata/md5-cache/sys-fs/clamfs-1.0.1-r3 b/metadata/md5-cache/sys-fs/clamfs-1.0.1-r3
index ce8650762459..ad16151c309e 100644
--- a/metadata/md5-cache/sys-fs/clamfs-1.0.1-r3
+++ b/metadata/md5-cache/sys-fs/clamfs-1.0.1-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/boost-1.33 sys-fs/fuse:0 dev-cpp/commoncpp2 dev-libs/rlog dev-libs/poco app-antivirus/clamav
 SLOT=0
 SRC_URI=mirror://sourceforge/clamfs/clamfs-1.0.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5bac31109ebfd1acb03bd151a876f4e8
diff --git a/metadata/md5-cache/sys-fs/cryfs-0.10.2 b/metadata/md5-cache/sys-fs/cryfs-0.10.2
index 6350cbe3fdb7..9f88654b3b5e 100644
--- a/metadata/md5-cache/sys-fs/cryfs-0.10.2
+++ b/metadata/md5-cache/sys-fs/cryfs-0.10.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/boost-1.65.1:= >=dev-libs/crypto++-8.2.0:= net-misc/curl:= >=
 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	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=88ac6ade1245eeb8153cd7f28d003477
diff --git a/metadata/md5-cache/sys-fs/cryptmount-5.3.2 b/metadata/md5-cache/sys-fs/cryptmount-5.3.2
index b296136ace5c..2bf6510139d1 100644
--- a/metadata/md5-cache/sys-fs/cryptmount-5.3.2
+++ b/metadata/md5-cache/sys-fs/cryptmount-5.3.2
@@ -11,5 +11,5 @@ RDEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) luks? ( sys-fs/cryptsetup ) openssl? (
 REQUIRED_USE=luks? ( gcrypt ) openssl? ( gcrypt )
 SLOT=0
 SRC_URI=mirror://sourceforge/cryptmount/cryptmount-5.3.2.tar.gz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3a036a60ae8ab48b3da9d6a2646c4bc3
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-2.3.2 b/metadata/md5-cache/sys-fs/cryptsetup-2.3.2
index 14a987f50612..8f7c5d880be8 100644
--- a/metadata/md5-cache/sys-fs/cryptsetup-2.3.2
+++ b/metadata/md5-cache/sys-fs/cryptsetup-2.3.2
@@ -11,5 +11,5 @@ RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[s
 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.2.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c6028ad3b18993310b15c3a9a5c02e03
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-2.3.3 b/metadata/md5-cache/sys-fs/cryptsetup-2.3.3
index fd27e9c75e2e..2029edb0dd76 100644
--- a/metadata/md5-cache/sys-fs/cryptsetup-2.3.3
+++ b/metadata/md5-cache/sys-fs/cryptsetup-2.3.3
@@ -11,5 +11,5 @@ RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[s
 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.3.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b789fe4a638ae1d128d68de052f260ce
diff --git a/metadata/md5-cache/sys-fs/ddrescue-1.24 b/metadata/md5-cache/sys-fs/ddrescue-1.24
index 0a33195222ee..e312b55db000 100644
--- a/metadata/md5-cache/sys-fs/ddrescue-1.24
+++ b/metadata/md5-cache/sys-fs/ddrescue-1.24
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://gnu/ddrescue/ddrescue-1.24.tar.lz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=50b7c5038f339c055841a06543065a59
diff --git a/metadata/md5-cache/sys-fs/ddrescue-1.25 b/metadata/md5-cache/sys-fs/ddrescue-1.25
index 9456d4ca1467..b23352919122 100644
--- a/metadata/md5-cache/sys-fs/ddrescue-1.25
+++ b/metadata/md5-cache/sys-fs/ddrescue-1.25
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://gnu/ddrescue/ddrescue-1.25.tar.lz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=10cbb927b6c9ea7093973eb1a1bdc1a4
diff --git a/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r1 b/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r1
deleted file mode 100644
index 700b520c2368..000000000000
--- a/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/openssl
-DESCRIPTION=HFS and HFS+ utils ported from OSX, supplies mkfs and fsck
-EAPI=7
-HOMEPAGE=http://opendarwin.org
-KEYWORDS=amd64 ~arm ppc ppc64 x86
-LICENSE=APSL-2
-RDEPEND=dev-libs/openssl
-SLOT=0
-SRC_URI=http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-332.14.tar.gz mirror://gentoo/diskdev_cmds-332.14_p1.patch.bz2
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3adca9ab49d442f95407f1a99956a828
diff --git a/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r2 b/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r2
index 7c697404ebeb..dd9e1014f51b 100644
--- a/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r2
+++ b/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r2
@@ -3,10 +3,10 @@ DEPEND=dev-libs/openssl
 DESCRIPTION=HFS and HFS+ utils ported from OSX, supplies mkfs and fsck
 EAPI=7
 HOMEPAGE=http://opendarwin.org
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ppc ppc64 x86
 LICENSE=APSL-2
 RDEPEND=dev-libs/openssl
 SLOT=0
 SRC_URI=http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-332.14.tar.gz mirror://gentoo/diskdev_cmds-332.14_p1.patch.bz2
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=861321a36318d3f13b70d265c645e659
+_md5_=2121908e919b53c7aa38db785367d99c
diff --git a/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r3 b/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r3
new file mode 100644
index 000000000000..b19ee129fa33
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+DESCRIPTION=HFS and HFS+ utils ported from OSX, supplies mkfs and fsck
+EAPI=7
+HOMEPAGE=http://opendarwin.org
+IUSE=libressl
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=APSL-2
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+SLOT=0
+SRC_URI=http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-332.14.tar.gz mirror://gentoo/diskdev_cmds-332.14_p1.patch.bz2
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6711ea36ba21ffdc7b24c0e0bfe21485
diff --git a/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r3 b/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r3
index 3aa47b297105..ac9d95333200 100644
--- a/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r3
+++ b/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r3
@@ -10,5 +10,5 @@ RDEPEND=>=sys-fs/lvm2-2.02.45 klibc? ( dev-libs/klibc ) dietlibc? ( dev-libs/die
 REQUIRED_USE=klibc? ( !dietlibc )
 SLOT=0
 SRC_URI=https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3821a7df2b3e0bd12c87eac72083b136
diff --git a/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r4 b/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r4
index 954846da40fc..bc6f9ee41378 100644
--- a/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r4
+++ b/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-fs/lvm2-2.02.45
 SLOT=0
 SRC_URI=https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d095d1b155393311ccb531224b54db12
diff --git a/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r5 b/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r5
index 395bfa3dc35a..1516ba42caf2 100644
--- a/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r5
+++ b/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-fs/lvm2-2.02.45
 SLOT=0
 SRC_URI=https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c92793e190b26fd295b6fd8507835289
diff --git a/metadata/md5-cache/sys-fs/e4rat-0.2.4_pre20141201-r1 b/metadata/md5-cache/sys-fs/e4rat-0.2.4_pre20141201-r1
index 104c23c7dab8..c4fb277272ab 100644
--- a/metadata/md5-cache/sys-fs/e4rat-0.2.4_pre20141201-r1
+++ b/metadata/md5-cache/sys-fs/e4rat-0.2.4_pre20141201-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-lang/perl:= >=dev-libs/boost-1.42:= sys-fs/e2fsprogs sys-process/audit[static-libs(+)] sys-process/lsof
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pacho/e4rat/e4rat-0.2.4_pre20141201.tar.xz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d450b8832651df5bc4764f5f8febddf2
diff --git a/metadata/md5-cache/sys-fs/ecryptfs-utils-111_p20170609 b/metadata/md5-cache/sys-fs/ecryptfs-utils-111_p20170609
index a56906d90801..6928eea740ee 100644
--- a/metadata/md5-cache/sys-fs/ecryptfs-utils-111_p20170609
+++ b/metadata/md5-cache/sys-fs/ecryptfs-utils-111_p20170609
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/keyutils-1.5.11-r1:= >=dev-libs/libgcrypt-1.2.0:0 dev-libs/ns
 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	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6ba3a02bbb385aea16b0af724a79a775
diff --git a/metadata/md5-cache/sys-fs/eudev-3.2.5 b/metadata/md5-cache/sys-fs/eudev-3.2.5
index dda0daa86152..b90678616bc7 100644
--- a/metadata/md5-cache/sys-fs/eudev-3.2.5
+++ b/metadata/md5-cache/sys-fs/eudev-3.2.5
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspec
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/eudev/eudev-3.2.5.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=685e0a16ec496b4e87a1478cbc1b5bba
diff --git a/metadata/md5-cache/sys-fs/eudev-3.2.7-r2 b/metadata/md5-cache/sys-fs/eudev-3.2.7-r2
index fdb08eb8c366..c33c02e97b8b 100644
--- a/metadata/md5-cache/sys-fs/eudev-3.2.7-r2
+++ b/metadata/md5-cache/sys-fs/eudev-3.2.7-r2
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspec
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/eudev/eudev-3.2.7.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3fc23fbe7287c00e58e8545a153fc200
diff --git a/metadata/md5-cache/sys-fs/eudev-3.2.8 b/metadata/md5-cache/sys-fs/eudev-3.2.8
index 1d4ad2fdf4c3..5bd2526cf80f 100644
--- a/metadata/md5-cache/sys-fs/eudev-3.2.8
+++ b/metadata/md5-cache/sys-fs/eudev-3.2.8
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspec
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/eudev/eudev-3.2.8.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3fc23fbe7287c00e58e8545a153fc200
diff --git a/metadata/md5-cache/sys-fs/eudev-3.2.9 b/metadata/md5-cache/sys-fs/eudev-3.2.9
index e435762a3703..561cde15c115 100644
--- a/metadata/md5-cache/sys-fs/eudev-3.2.9
+++ b/metadata/md5-cache/sys-fs/eudev-3.2.9
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspec
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/eudev/eudev-3.2.9.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1d037c4b55e35af8f6e81f9bebe0e3b2
diff --git a/metadata/md5-cache/sys-fs/eudev-4.9999 b/metadata/md5-cache/sys-fs/eudev-4.9999
index f22ea111656f..dec0cd305085 100644
--- a/metadata/md5-cache/sys-fs/eudev-4.9999
+++ b/metadata/md5-cache/sys-fs/eudev-4.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=sys-apps/util-linux-2.20 kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f782dcbae6339f4ba56a2d768c195ea7
diff --git a/metadata/md5-cache/sys-fs/eudev-9999 b/metadata/md5-cache/sys-fs/eudev-9999
index 3aff44beea03..83f24962506b 100644
--- a/metadata/md5-cache/sys-fs/eudev-9999
+++ b/metadata/md5-cache/sys-fs/eudev-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3fc23fbe7287c00e58e8545a153fc200
diff --git a/metadata/md5-cache/sys-fs/fuse-2.9.9-r1 b/metadata/md5-cache/sys-fs/fuse-2.9.9-r1
index 0a487d9fdd39..d26812c8fd6f 100644
--- a/metadata/md5-cache/sys-fs/fuse-2.9.9-r1
+++ b/metadata/md5-cache/sys-fs/fuse-2.9.9-r1
@@ -11,5 +11,5 @@ PDEPEND=kernel_FreeBSD? ( sys-fs/fuse4bsd )
 RDEPEND=>=sys-fs/fuse-common-3.3.0-r1
 SLOT=0
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=3802f88c6f2222a003484efa4207f380
diff --git a/metadata/md5-cache/sys-fs/hfsutils-3.2.6-r6 b/metadata/md5-cache/sys-fs/hfsutils-3.2.6-r6
deleted file mode 100644
index fc38e5e9f114..000000000000
--- a/metadata/md5-cache/sys-fs/hfsutils-3.2.6-r6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= )
-DESCRIPTION=HFS FS Access utils
-EAPI=7
-HOMEPAGE=https://www.mars.org/home/rob/proj/hfs/
-IUSE=tcl tk
-KEYWORDS=amd64 ~arm ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= )
-REQUIRED_USE=tk? ( tcl )
-SLOT=0
-SRC_URI=ftp://ftp.mars.org/pub/hfs/hfsutils-3.2.6.tar.gz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c8828c3c9a7830bbda0938af0af16548
diff --git a/metadata/md5-cache/sys-fs/hfsutils-3.2.6_p14 b/metadata/md5-cache/sys-fs/hfsutils-3.2.6_p14
index 8d5e1dfacf36..496e61af5f5a 100644
--- a/metadata/md5-cache/sys-fs/hfsutils-3.2.6_p14
+++ b/metadata/md5-cache/sys-fs/hfsutils-3.2.6_p14
@@ -5,11 +5,11 @@ DESCRIPTION=HFS FS Access utils
 EAPI=7
 HOMEPAGE=https://www.mars.org/home/rob/proj/hfs/
 IUSE=tcl tk
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= )
 REQUIRED_USE=tk? ( tcl )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/h/hfsutils/hfsutils_3.2.6.orig.tar.gz mirror://debian/pool/main/h/hfsutils/hfsutils_3.2.6-14.debian.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f4f53e3db209094a8f92b41304630147
+_md5_=d451471f4d36f579ee0c12b4aca4794d
diff --git a/metadata/md5-cache/sys-fs/loop-aes-3.7n b/metadata/md5-cache/sys-fs/loop-aes-3.7n
index 8292e3f969a2..f95f4b03b846 100644
--- a/metadata/md5-cache/sys-fs/loop-aes-3.7n
+++ b/metadata/md5-cache/sys-fs/loop-aes-3.7n
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=mirror://sourceforge/loop-aes/loop-AES-v3.7n.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b81f586be8fb28cf6318bb31662260cc
diff --git a/metadata/md5-cache/sys-fs/loop-aes-3.7q b/metadata/md5-cache/sys-fs/loop-aes-3.7q
index cfcb101215a5..9b712708d7c7 100644
--- a/metadata/md5-cache/sys-fs/loop-aes-3.7q
+++ b/metadata/md5-cache/sys-fs/loop-aes-3.7q
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://loop-aes.sourceforge.net/loop-AES/loop-AES-v3.7q.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3a06e04b520e3eb79bd9c9b708a76648
diff --git a/metadata/md5-cache/sys-fs/lsscsi-0.31 b/metadata/md5-cache/sys-fs/lsscsi-0.31
index aa786713975b..8d4ed643c1ed 100644
--- a/metadata/md5-cache/sys-fs/lsscsi-0.31
+++ b/metadata/md5-cache/sys-fs/lsscsi-0.31
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=SCSI sysfs query tool
 EAPI=7
 HOMEPAGE=http://sg.danny.cz/scsi/lsscsi.html
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://sg.danny.cz/scsi/lsscsi-0.31.tgz
-_md5_=210c0acfc27194036473dd9de8512d9d
+_md5_=33bce0aff679a8a4a86d978a272abe93
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.187-r2 b/metadata/md5-cache/sys-fs/lvm2-2.02.187-r2
index 5a6bf14f18b2..40987e91c371 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.187-r2
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.187-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libaio[static-libs?] static? ( dev-libs/libaio[static-libs] ) !
 REQUIRED_USE=device-mapper-only? ( !lvm2create_initrd !sanlock !thin ) systemd? ( udev )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.187.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.187.tgz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=1bdb46865374d91b84a1c2e261800422
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.03.09 b/metadata/md5-cache/sys-fs/lvm2-2.03.09
index c85d80f24ee6..21dcc565630d 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.03.09
+++ b/metadata/md5-cache/sys-fs/lvm2-2.03.09
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libaio[static-libs?] static? ( dev-libs/libaio[static-libs] ) !
 REQUIRED_USE=device-mapper-only? ( !lvm2create_initrd !sanlock !thin ) systemd? ( udev )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.03.09.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.03.09.tgz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=c6f8e155feb75a71692521fd1ab652f3
diff --git a/metadata/md5-cache/sys-fs/lxcfs-3.0.3 b/metadata/md5-cache/sys-fs/lxcfs-3.0.3
deleted file mode 100644
index ccc014820c09..000000000000
--- a/metadata/md5-cache/sys-fs/lxcfs-3.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare unpack
-DEPEND=sys-apps/help2man dev-libs/glib:2 sys-fs/fuse:0 virtual/pkgconfig
-DESCRIPTION=FUSE filesystem for LXC
-EAPI=6
-HOMEPAGE=https://linuxcontainers.org/lxcfs/introduction/
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/glib:2 sys-fs/fuse:0
-SLOT=0
-SRC_URI=https://github.com/lxc/lxcfs/archive/lxcfs-3.0.3.tar.gz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=15a7c7658fbb384dcbf12fba5bc9430e
diff --git a/metadata/md5-cache/sys-fs/lxcfs-4.0.3 b/metadata/md5-cache/sys-fs/lxcfs-4.0.3
index e7014f368c54..ec8d41e45d35 100644
--- a/metadata/md5-cache/sys-fs/lxcfs-4.0.3
+++ b/metadata/md5-cache/sys-fs/lxcfs-4.0.3
@@ -4,11 +4,11 @@ DEPEND=dev-libs/glib:2 sys-fs/fuse:0
 DESCRIPTION=FUSE filesystem for LXC
 EAPI=7
 HOMEPAGE=https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/glib:2 sys-fs/fuse:0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/lxc/lxcfs/archive/lxcfs-4.0.3.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=02228797118e5a8e22b1c7a66b3ef0c2
+_md5_=49d08edb20b316a5b8d10c1efd49e741
diff --git a/metadata/md5-cache/sys-fs/lxcfs-4.0.4 b/metadata/md5-cache/sys-fs/lxcfs-4.0.4
deleted file mode 100644
index 98d300641043..000000000000
--- a/metadata/md5-cache/sys-fs/lxcfs-4.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-apps/help2man >=app-portage/elt-patches-20170815 || ( >=sys-devel/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/glib:2 sys-fs/fuse:0
-DESCRIPTION=FUSE filesystem for LXC
-EAPI=7
-HOMEPAGE=https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/glib:2 sys-fs/fuse:0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/lxc/lxcfs/archive/lxcfs-4.0.4.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a4015ae3b7382c072e0188aa600debe1
diff --git a/metadata/md5-cache/sys-fs/lxcfs-4.0.4-r1 b/metadata/md5-cache/sys-fs/lxcfs-4.0.4-r1
new file mode 100644
index 000000000000..5441ec79b6d8
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/lxcfs-4.0.4-r1
@@ -0,0 +1,14 @@
+BDEPEND=sys-apps/help2man >=app-portage/elt-patches-20170815 || ( >=sys-devel/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/glib:2 sys-fs/fuse:0
+DESCRIPTION=FUSE filesystem for LXC
+EAPI=7
+HOMEPAGE=https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/glib:2 sys-fs/fuse:0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/lxc/lxcfs/archive/lxcfs-4.0.4.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5ac2f6a16c52f31c1daf31fb5c5929c8
diff --git a/metadata/md5-cache/sys-fs/multipath-tools-0.6.4-r1 b/metadata/md5-cache/sys-fs/multipath-tools-0.6.4-r1
index 429d1f65af0d..7f6628539d09 100644
--- a/metadata/md5-cache/sys-fs/multipath-tools-0.6.4-r1
+++ b/metadata/md5-cache/sys-fs/multipath-tools-0.6.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-fs/lvm2-2.02.45 >=virtual/udev-171 dev-libs/libaio dev-libs/userspace-rcu:= sys-libs/readline:0= rbd? ( sys-cluster/ceph ) systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.6.4;sf=tgz -> multipath-tools-0.6.4.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=a5e69adfdcb4ae4ca5aa11bdd9094801
diff --git a/metadata/md5-cache/sys-fs/multipath-tools-0.7.9 b/metadata/md5-cache/sys-fs/multipath-tools-0.7.9
index 2d99faf6089b..bf8351fe8822 100644
--- a/metadata/md5-cache/sys-fs/multipath-tools-0.7.9
+++ b/metadata/md5-cache/sys-fs/multipath-tools-0.7.9
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/json-c:= dev-libs/libaio dev-libs/userspace-rcu:= >=sys-fs/lvm2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.7.9;sf=tgz -> multipath-tools-0.7.9.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=8e64777d6fc8671beb8cbf8261a855f6
diff --git a/metadata/md5-cache/sys-fs/multipath-tools-0.8.3-r2 b/metadata/md5-cache/sys-fs/multipath-tools-0.8.3-r2
index 695d6d0624f1..34672d061cbe 100644
--- a/metadata/md5-cache/sys-fs/multipath-tools-0.8.3-r2
+++ b/metadata/md5-cache/sys-fs/multipath-tools-0.8.3-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/json-c:= dev-libs/libaio dev-libs/userspace-rcu:= >=sys-fs/lvm2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.8.3;sf=tgz -> multipath-tools-0.8.3.tar.gz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=b2265ef09098f8c85dbdec72e5bbd6ed
diff --git a/metadata/md5-cache/sys-fs/multipath-tools-0.8.4 b/metadata/md5-cache/sys-fs/multipath-tools-0.8.4
index 84c05f24fdb1..4b727eeb8b29 100644
--- a/metadata/md5-cache/sys-fs/multipath-tools-0.8.4
+++ b/metadata/md5-cache/sys-fs/multipath-tools-0.8.4
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/json-c:= dev-libs/libaio dev-libs/userspace-rcu:= >=sys-fs/lvm2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.8.4;sf=tgz -> multipath-tools-0.8.4.tar.gz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=b2e96c86fc834948779323e6bea692c1
diff --git a/metadata/md5-cache/sys-fs/nilfs-utils-2.1.5-r1 b/metadata/md5-cache/sys-fs/nilfs-utils-2.1.5-r1
index 75c572ec0974..2e34236a0dc2 100644
--- a/metadata/md5-cache/sys-fs/nilfs-utils-2.1.5-r1
+++ b/metadata/md5-cache/sys-fs/nilfs-utils-2.1.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=sys-libs/e2fsprogs-libs sys-apps/util-linux
 SLOT=0
 SRC_URI=http://nilfs.sourceforge.net/download/nilfs-utils-2.1.5.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7f0789b68cc8eac1913322a244035e9b
diff --git a/metadata/md5-cache/sys-fs/nilfs-utils-2.1.6 b/metadata/md5-cache/sys-fs/nilfs-utils-2.1.6
index 36a5ab4eeebf..d11ea6b939b9 100644
--- a/metadata/md5-cache/sys-fs/nilfs-utils-2.1.6
+++ b/metadata/md5-cache/sys-fs/nilfs-utils-2.1.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=sys-libs/e2fsprogs-libs sys-apps/util-linux
 SLOT=0
 SRC_URI=http://nilfs.sourceforge.net/download/nilfs-utils-2.1.6.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1d10f89ad7aa7c698cf39fe52fbd49ac
diff --git a/metadata/md5-cache/sys-fs/nilfs-utils-2.2.2 b/metadata/md5-cache/sys-fs/nilfs-utils-2.2.2
index 7afa25127ce1..a913e255450f 100644
--- a/metadata/md5-cache/sys-fs/nilfs-utils-2.2.2
+++ b/metadata/md5-cache/sys-fs/nilfs-utils-2.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=sys-libs/e2fsprogs-libs sys-apps/util-linux
 SLOT=0
 SRC_URI=http://nilfs.sourceforge.net/download/nilfs-utils-2.2.2.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1d10f89ad7aa7c698cf39fe52fbd49ac
diff --git a/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23-r3 b/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23-r3
index df4aedb18489..1f3aeea9634f 100644
--- a/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23-r3
+++ b/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23-r3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=ntfsdecrypt? ( >=dev-libs/libgcrypt-1.2.2:0 >=net-libs/gnutls-1.4.4 ) external-fuse? ( >=sys-fs/fuse-2.8.0:0 )
 SLOT=0/88
 SRC_URI=http://tuxera.com/opensource/ntfs-3g_ntfsprogs-2017.3.23.tgz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=4a2fef3520ca2c46030883595fab7882
diff --git a/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23.5 b/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23.5
index 77ff757ed2a7..e24c9b881976 100644
--- a/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23.5
+++ b/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/util-linux:0= ntfsdecrypt? ( >=dev-libs/libgcrypt-1.2.2:0 >=net-libs/gnutls-1.4.4 )
 SLOT=0/885
 SRC_URI=https://jp-andre.pagesperso-orange.fr/ntfs-3g_ntfsprogs-2017.3.23AR.5.tgz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=51ba764c1913250673ad0414133ea2f6
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 0089c8ff3ef5..f4da50bca8d3 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	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=803eaa94637e9883c16c2edcac23fb00
diff --git a/metadata/md5-cache/sys-fs/udev-242 b/metadata/md5-cache/sys-fs/udev-242
index a364796e3dc2..4b0bb5a0ac36 100644
--- a/metadata/md5-cache/sys-fs/udev-242
+++ b/metadata/md5-cache/sys-fs/udev-242
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v242/systemd-242.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=aa8f25af4fd25e68c6200c0676c91f5d
diff --git a/metadata/md5-cache/sys-fs/udev-243 b/metadata/md5-cache/sys-fs/udev-243
index 9da96bb1a0b4..86cf17c46737 100644
--- a/metadata/md5-cache/sys-fs/udev-243
+++ b/metadata/md5-cache/sys-fs/udev-243
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v243/systemd-243.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=6b3257dae50e50c2568b98528261f6b8
diff --git a/metadata/md5-cache/sys-fs/udev-243-r2 b/metadata/md5-cache/sys-fs/udev-243-r2
index 20bffe33ae5a..59765ebdcea8 100644
--- a/metadata/md5-cache/sys-fs/udev-243-r2
+++ b/metadata/md5-cache/sys-fs/udev-243-r2
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v243/systemd-243.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
 _md5_=17b4f4d61e7f08726a866212967fbed1
diff --git a/metadata/md5-cache/sys-fs/udev-245 b/metadata/md5-cache/sys-fs/udev-245
index fdad820d8166..ad7f4a84d5bf 100644
--- a/metadata/md5-cache/sys-fs/udev-245
+++ b/metadata/md5-cache/sys-fs/udev-245
@@ -12,5 +12,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v245/systemd-245.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
 _md5_=e258129e16c358b2128b5dabd46c59ce
diff --git a/metadata/md5-cache/sys-fs/udev-245.5 b/metadata/md5-cache/sys-fs/udev-245.5
index 14477e923997..7e0288df43e1 100644
--- a/metadata/md5-cache/sys-fs/udev-245.5
+++ b/metadata/md5-cache/sys-fs/udev-245.5
@@ -12,5 +12,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd-stable/archive/v245.5/systemd-stable-245.5.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
 _md5_=8d69b3643880f897c0644363fde3f44e
diff --git a/metadata/md5-cache/sys-fs/udev-9999 b/metadata/md5-cache/sys-fs/udev-9999
index 38287bc8b62b..5d4a02608f97 100644
--- a/metadata/md5-cache/sys-fs/udev-9999
+++ b/metadata/md5-cache/sys-fs/udev-9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) acct-group/kmem acct-group/tty acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kvm acct-group/lp acct-group/render acct-group/tape acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/systemd
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
 _md5_=8d69b3643880f897c0644363fde3f44e
diff --git a/metadata/md5-cache/sys-fs/udisks-2.8.4 b/metadata/md5-cache/sys-fs/udisks-2.8.4
index f830674ba374..3dfe6d581724 100644
--- a/metadata/md5-cache/sys-fs/udisks-2.8.4
+++ b/metadata/md5-cache/sys-fs/udisks-2.8.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=dev-libs/libgudev-1
 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	e5f9c3faab3ab3d1e7e007daa8c736ef	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=01b584cbfc2e7facb067aed042f9f8e5
diff --git a/metadata/md5-cache/sys-fs/udisks-2.9.0 b/metadata/md5-cache/sys-fs/udisks-2.9.0
index 023553463e80..ef05fd9434aa 100644
--- a/metadata/md5-cache/sys-fs/udisks-2.9.0
+++ b/metadata/md5-cache/sys-fs/udisks-2.9.0
@@ -11,5 +11,5 @@ RDEPEND=>=sys-auth/polkit-0.110 virtual/udev acl? ( virtual/acl ) daemon? ( >=de
 REQUIRED_USE=?? ( elogind systemd ) elogind? ( daemon ) systemd? ( daemon )
 SLOT=2
 SRC_URI=https://github.com/storaged-project/udisks/releases/download/udisks-2.9.0/udisks-2.9.0.tar.bz2
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ce74ec7a6e2485051c46b0e176a19729
diff --git a/metadata/md5-cache/sys-fs/vhba-20200106 b/metadata/md5-cache/sys-fs/vhba-20200106
index 41d247d3d029..5852a62ee06c 100644
--- a/metadata/md5-cache/sys-fs/vhba-20200106
+++ b/metadata/md5-cache/sys-fs/vhba-20200106
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=virtual/udev kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://download.sourceforge.net/cdemu/vhba-module/vhba-module-20200106.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=bfc78dba169905caba01792412c502cd
diff --git a/metadata/md5-cache/sys-fs/zfs-0.8.4-r1 b/metadata/md5-cache/sys-fs/zfs-0.8.4-r1
index fd530b6928f9..5b5f72b30152 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.8.4-r1
+++ b/metadata/md5-cache/sys-fs/zfs-0.8.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-0.8.4/zfs-0.8.4.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
 _md5_=39b7121dc3c1bca5fc02905e832058d0
diff --git a/metadata/md5-cache/sys-fs/zfs-9999 b/metadata/md5-cache/sys-fs/zfs-9999
index 77d5c114888c..6d06b5b99979 100644
--- a/metadata/md5-cache/sys-fs/zfs-9999
+++ b/metadata/md5-cache/sys-fs/zfs-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_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
 _md5_=fa8a8b5387df01dd8fb97ae176638ee1
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-0.8.4 b/metadata/md5-cache/sys-fs/zfs-kmod-0.8.4
index 1bb96ea0aa79..964185423072 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-0.8.4
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-0.8.4
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/spl kernel_linux? ( virtual/modutils )
 RESTRICT=debug? ( strip ) test
 SLOT=0
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-0.8.4/zfs-0.8.4.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2525ac1ecf0e78579275ec203bfef568
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-9999 b/metadata/md5-cache/sys-fs/zfs-kmod-9999
index e18e7f81054c..7eb31c6c8b8f 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-9999
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=!sys-kernel/spl kernel_linux? ( virtual/modutils )
 RESTRICT=debug? ( strip ) test
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6fa5b6428a09baffc2b6a21ca4af8678
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index ec888bc364ae..e163088379df 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/bliss-kernel-bin-4.14.170 b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.170
index 67a1f845147e..15eff876ffd9 100644
--- a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.170
+++ b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.170
@@ -1,5 +1,5 @@
 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
+DEFINED_PHASES=config install postinst postrm preinst prerm pretend test
 DESCRIPTION=Precompiled Vanilla Kernel (Kernel Ready-to-Eat [KRE])
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/User:Fearedbliss
@@ -10,5 +10,5 @@ RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-bo
 RESTRICT=strip test
 SLOT=4.14.170-FC.01
 SRC_URI=https://xyinn.org/gentoo/kernels/4.14.170-FC.01/kernel-4.14.170-FC.01.tar.xz
-_eclasses_=kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=c3c83579bcbbfe51949c39debffccfab
diff --git a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178 b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178
index fbf031f4500e..f81c7ac584fa 100644
--- a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178
+++ b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178
@@ -1,5 +1,5 @@
 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
+DEFINED_PHASES=config install postinst postrm preinst prerm pretend test
 DESCRIPTION=Precompiled Vanilla Kernel (Kernel Ready-to-Eat [KRE])
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/User:Fearedbliss
@@ -10,5 +10,5 @@ RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-bo
 RESTRICT=strip test
 SLOT=4.14.178-FC.01
 SRC_URI=https://xyinn.org/gentoo/kernels/4.14.178-FC.01/kernel-4.14.178-FC.01.tar.xz
-_eclasses_=kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=094d32a5460cfeff0c856475320945df
diff --git a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.38 b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.38
index fe7a573b7a78..3945d4faa591 100644
--- a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.38
+++ b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.38
@@ -1,5 +1,5 @@
 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
+DEFINED_PHASES=config install postinst postrm preinst prerm pretend test
 DESCRIPTION=Precompiled Vanilla Kernel (Kernel Ready-to-Eat [KRE])
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/User:Fearedbliss
@@ -10,5 +10,5 @@ RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-bo
 RESTRICT=strip test
 SLOT=5.4.38-FC.01
 SRC_URI=https://xyinn.org/gentoo/kernels/5.4.38-FC.01/kernel-5.4.38-FC.01.tar.xz
-_eclasses_=kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=094d32a5460cfeff0c856475320945df
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-5.4.31 b/metadata/md5-cache/sys-kernel/ck-sources-5.4.31
deleted file mode 100644
index 1ddd725984db..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-5.4.31
+++ /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=Gentoo's genpatches for Linux , with Con Kolivas' MuQSS process scheduler.
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches/ http://kernel.kolivas.org/
-IUSE=experimental symlink build
-KEYWORDS=~amd64 ~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.31
-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-31.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-31.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-31.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-31.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-31.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-31.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-31.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-31.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-31.experimental.tar.xz ) http://ck.kolivas.org/patches/5.0/5.4/5.4-ck1/patch-5.4-ck1.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b2eaddf94b5d1d44b905600ff56dc1cc
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-5.4.48 b/metadata/md5-cache/sys-kernel/ck-sources-5.4.48
new file mode 100644
index 000000000000..210fc8b12b07
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-5.4.48
@@ -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=Gentoo's genpatches for Linux , with Con Kolivas' MuQSS process scheduler.
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches/ http://kernel.kolivas.org/
+IUSE=experimental symlink build
+KEYWORDS=~amd64 ~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.48
+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-48.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-48.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-48.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-48.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-48.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-48.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-48.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-48.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-48.experimental.tar.xz ) http://ck.kolivas.org/patches/5.0/5.4/5.4-ck1/patch-5.4-ck1.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d0d8539fe115382991d5fe671bc13203
diff --git a/metadata/md5-cache/sys-kernel/cryptodev-1.9 b/metadata/md5-cache/sys-kernel/cryptodev-1.9
index 0f430ff8a49c..8a30fb40670a 100644
--- a/metadata/md5-cache/sys-kernel/cryptodev-1.9
+++ b/metadata/md5-cache/sys-kernel/cryptodev-1.9
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( virtual/modutils )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://nwl.cc/pub/cryptodev-linux/cryptodev-linux-1.9.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=eb9556add7514771d0397677abf94bcf
diff --git a/metadata/md5-cache/sys-kernel/cryptodev-9999 b/metadata/md5-cache/sys-kernel/cryptodev-9999
index 83b33222428d..44556f93262c 100644
--- a/metadata/md5-cache/sys-kernel/cryptodev-9999
+++ b/metadata/md5-cache/sys-kernel/cryptodev-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=kernel_linux? ( virtual/modutils )
 RESTRICT=test
 SLOT=0
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a1e9260f65c16be366c4440c0c4ed851
diff --git a/metadata/md5-cache/sys-kernel/dracut-048-r1 b/metadata/md5-cache/sys-kernel/dracut-048-r1
index 858bf1e7f756..58e00cf9c285 100644
--- a/metadata/md5-cache/sys-kernel/dracut-048-r1
+++ b/metadata/md5-cache/sys-kernel/dracut-048-r1
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/kmod-23[tools] virtual/pkgconfig virtual/udev app-arch/cpio >
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/boot/dracut/dracut-048.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ffa5fd71610bd5aac9980b319542148e
diff --git a/metadata/md5-cache/sys-kernel/dracut-049-r3 b/metadata/md5-cache/sys-kernel/dracut-049-r3
index e9a6066ef668..1d24b56499ff 100644
--- a/metadata/md5-cache/sys-kernel/dracut-049-r3
+++ b/metadata/md5-cache/sys-kernel/dracut-049-r3
@@ -11,5 +11,5 @@ RDEPEND=app-arch/cpio >=app-shells/bash-4.0:0 sys-apps/coreutils[xattr(-)] >=sys
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/dracutdevs/dracut/archive/049.tar.gz -> dracut-049.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cfe4db33b1c46747402217b3368ef293
diff --git a/metadata/md5-cache/sys-kernel/dracut-050 b/metadata/md5-cache/sys-kernel/dracut-050
index ad872c70e7b9..bff64457bbc4 100644
--- a/metadata/md5-cache/sys-kernel/dracut-050
+++ b/metadata/md5-cache/sys-kernel/dracut-050
@@ -11,5 +11,5 @@ RDEPEND=app-arch/cpio >=app-shells/bash-4.0:0 sys-apps/coreutils[xattr(-)] >=sys
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/boot/dracut/dracut-050.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f0b8bca3f8453bd3e4537eb60f21fa25
diff --git a/metadata/md5-cache/sys-kernel/dracut-9999 b/metadata/md5-cache/sys-kernel/dracut-9999
index 2407b4b77c6b..adb1d431d017 100644
--- a/metadata/md5-cache/sys-kernel/dracut-9999
+++ b/metadata/md5-cache/sys-kernel/dracut-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=app-arch/cpio >=app-shells/bash-4.0:0 sys-apps/coreutils[xattr(-)] >=sys-apps/kmod-23[tools] || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/openrc[sysv-utils(-),selinux?] sys-apps/systemd[sysv-utils] ) >=sys-apps/util-linux-2.21 virtual/pkgconfig virtual/udev elibc_musl? ( sys-libs/fts-standalone ) selinux? ( sec-policy/selinux-dracut sys-libs/libselinux sys-libs/libsepol )
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b19f0764e43c5881d8c2f24e7a0cf767
diff --git a/metadata/md5-cache/sys-kernel/genkernel-4.0.7-r1 b/metadata/md5-cache/sys-kernel/genkernel-4.0.7-r1
deleted file mode 100644
index ffedd1ef9c73..000000000000
--- a/metadata/md5-cache/sys-kernel/genkernel-4.0.7-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare unpack
-DESCRIPTION=Gentoo automatic kernel building scripts
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/
-IUSE=ibm +firmware
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches sys-apps/sandbox sys-devel/autoconf sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool virtual/pkgconfig firmware? ( sys-kernel/linux-firmware )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~whissi/dist/genkernel/genkernel-4.0.7.tar.xz https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2 https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.6.tar.xz https://www.busybox.net/downloads/busybox-1.31.1.tar.bz2 mirror://gnu/coreutils/coreutils-8.32.tar.xz https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.1.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://matt.ucc.asn.au/dropbear/releases/dropbear-2019.78.tar.bz2 https://github.com/libexpat/libexpat/releases/download/R_2_2_9/expat-2.2.9.tar.xz https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.45.6/e2fsprogs-1.45.6.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/open-iscsi/open-iscsi/archive/2.0.878.tar.gz -> open-iscsi-2.0.878.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-26.tar.xz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.8.5.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.36.tar.bz2 https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.187.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.1.tar.xz http://ftp.rpm.org/mirror/popt/popt-1.16.tar.gz https://github.com/strace/strace/releases/download/v5.4/strace-5.4.tar.xz https://github.com/jthornber/thin-provisioning-tools/archive/v0.8.5.tar.gz -> thin-provisioning-tools-0.8.5.tar.gz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://www.kernel.org/pub/linux/utils/util-linux/v2.35/util-linux-2.35.1.tar.xz https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.5.0.tar.xz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.4.4.tar.gz -> zstd-1.4.4.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9ba1ad64bdc90ace28068445c62af748
diff --git a/metadata/md5-cache/sys-kernel/genkernel-4.0.8 b/metadata/md5-cache/sys-kernel/genkernel-4.0.8
deleted file mode 100644
index d2aba76c59cd..000000000000
--- a/metadata/md5-cache/sys-kernel/genkernel-4.0.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare unpack
-DESCRIPTION=Gentoo automatic kernel building scripts
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/
-IUSE=ibm +firmware
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches sys-apps/sandbox sys-devel/autoconf sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool virtual/pkgconfig firmware? ( sys-kernel/linux-firmware )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~whissi/dist/genkernel/genkernel-4.0.8.tar.xz https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2 https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.6.1.tar.xz https://www.busybox.net/downloads/busybox-1.31.1.tar.bz2 mirror://gnu/coreutils/coreutils-8.32.tar.xz https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.3.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://matt.ucc.asn.au/dropbear/releases/dropbear-2019.78.tar.bz2 https://github.com/libexpat/libexpat/releases/download/R_2_2_9/expat-2.2.9.tar.xz https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.45.6/e2fsprogs-1.45.6.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/open-iscsi/open-iscsi/archive/2.0.878.tar.gz -> open-iscsi-2.0.878.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-27.tar.xz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.8.5.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.38.tar.bz2 https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.187.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.1.tar.xz http://ftp.rpm.org/mirror/popt/popt-1.16.tar.gz https://github.com/strace/strace/releases/download/v5.7/strace-5.7.tar.xz https://github.com/jthornber/thin-provisioning-tools/archive/v0.8.5.tar.gz -> thin-provisioning-tools-0.8.5.tar.gz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://www.kernel.org/pub/linux/utils/util-linux/v2.35/util-linux-2.35.2.tar.xz https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.6.0.tar.xz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.4.4.tar.gz -> zstd-1.4.4.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fd2099dae810c4e8a683f296ce3a0f20
diff --git a/metadata/md5-cache/sys-kernel/genkernel-4.0.9 b/metadata/md5-cache/sys-kernel/genkernel-4.0.9
new file mode 100644
index 000000000000..b725b0ac26f8
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/genkernel-4.0.9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DESCRIPTION=Gentoo automatic kernel building scripts
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/
+IUSE=ibm +firmware
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
+LICENSE=GPL-2
+RDEPEND=app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches sys-apps/sandbox sys-devel/autoconf sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool virtual/pkgconfig firmware? ( sys-kernel/linux-firmware )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~whissi/dist/genkernel/genkernel-4.0.9.tar.xz https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2 https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.6.1.tar.xz https://www.busybox.net/downloads/busybox-1.31.1.tar.bz2 mirror://gnu/coreutils/coreutils-8.32.tar.xz https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.3.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://matt.ucc.asn.au/dropbear/releases/dropbear-2020.79.tar.bz2 https://github.com/libexpat/libexpat/releases/download/R_2_2_9/expat-2.2.9.tar.xz https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.45.6/e2fsprogs-1.45.6.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/open-iscsi/open-iscsi/archive/2.0.878.tar.gz -> open-iscsi-2.0.878.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-27.tar.xz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.8.5.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.38.tar.bz2 https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.187.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.1.tar.xz http://ftp.rpm.org/mirror/popt/popt-1.16.tar.gz https://github.com/strace/strace/releases/download/v5.7/strace-5.7.tar.xz https://github.com/jthornber/thin-provisioning-tools/archive/v0.8.5.tar.gz -> thin-provisioning-tools-0.8.5.tar.gz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://www.kernel.org/pub/linux/utils/util-linux/v2.35/util-linux-2.35.2.tar.xz https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.6.0.tar.xz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.4.4.tar.gz -> zstd-1.4.4.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b90c0718cc4b112df092bce7ccf701cd
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.40 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.40
index 63469b27eb6e..3bb1df8bc922 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.40
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.40
@@ -1,5 +1,5 @@
-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
+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 sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
 DESCRIPTION=Linux kernel built with Gentoo patches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/vanilla-kernel:5.4.40 !sys-kernel/vanilla-kernel-bin:5.4.40
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.40
 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-40.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-40.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569 -> linux-5.4.15-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e -> linux-5.4.15-arch1.i686.config )
-_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3d20e359870a68c44a4822295e795f5c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.46 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.46
index 7f3fff309877..b1324ceaa6c2 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.46
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.46
@@ -1,5 +1,5 @@
-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
+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 sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
 DESCRIPTION=Linux kernel built with Gentoo patches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/vanilla-kernel:5.4.46 !sys-kernel/vanilla-kernel-bin:5.4.46
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.46
 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-46.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-46.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569 -> linux-5.4.15-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e -> linux-5.4.15-arch1.i686.config )
-_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e6687b692c6cd9dff848e7ba3127eca9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.47 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.47
index c225864e8781..651a53cb93a7 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.47
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.47
@@ -1,5 +1,5 @@
-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
+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 sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
 DESCRIPTION=Linux kernel built with Gentoo patches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/vanilla-kernel:5.4.47 !sys-kernel/vanilla-kernel-bin:5.4.47
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.47
 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-47.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-47.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569 -> linux-5.4.15-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e -> linux-5.4.15-arch1.i686.config )
-_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e6687b692c6cd9dff848e7ba3127eca9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.48 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.48
new file mode 100644
index 000000000000..23c96ea6f7dc
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.48
@@ -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 sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config 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.48 !sys-kernel/vanilla-kernel-bin:5.4.48 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.4.48
+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-48.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-48.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569 -> linux-5.4.15-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e -> linux-5.4.15-arch1.i686.config )
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e6687b692c6cd9dff848e7ba3127eca9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.49 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.49
new file mode 100644
index 000000000000..12c7c8a2cc77
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.49
@@ -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 sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config 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.49 !sys-kernel/vanilla-kernel-bin:5.4.49 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.4.49
+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-49.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-49.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569 -> linux-5.4.15-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e -> linux-5.4.15-arch1.i686.config )
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e6687b692c6cd9dff848e7ba3127eca9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.6.18 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.6.18
index 7d6c8c362eb7..3af48a8ed65a 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.6.18
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.6.18
@@ -1,5 +1,5 @@
-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
+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 sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
 DESCRIPTION=Linux kernel built with Gentoo patches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.6.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.6.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-22.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-22.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=7dcb86e3e6f24c6d5462c5c8d25c3fa09e7e9f55 -> linux-5.6.8-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=bc42cce2cca0d42b5cfeb8c6bcbf9f39430791f2 -> linux-5.6.8-arch1.i686.config )
-_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=32a04801cee0eaa444ac7c8e4ef66e65
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.6.19 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.6.19
index 61045e9570b8..1d5e53b07166 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.6.19
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.6.19
@@ -1,5 +1,5 @@
-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
+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 sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
 DESCRIPTION=Linux kernel built with Gentoo patches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.6.19
 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.6.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-23.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-23.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=7dcb86e3e6f24c6d5462c5c8d25c3fa09e7e9f55 -> linux-5.6.8-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=bc42cce2cca0d42b5cfeb8c6bcbf9f39430791f2 -> linux-5.6.8-arch1.i686.config )
-_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=32a04801cee0eaa444ac7c8e4ef66e65
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.4 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.4
index 8d5e81c22bd3..7036de7b1407 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.4
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.4
@@ -1,5 +1,5 @@
-BDEPEND=debug? ( dev-util/dwarves ) 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
+BDEPEND=debug? ( dev-util/dwarves ) 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 sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
 DESCRIPTION=Linux kernel built with Gentoo patches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.7.4
 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.7.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-5.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-5.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=663b08666b269eeeeaafbafaee07fd03389ac8d7 -> linux-5.7.1-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=4f18a8a48e28656a98803890a0f6567b93fd5a77 -> linux-5.7.2-arch1.i686.config )
-_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b30674cc9ef5ecb5282df28b9affba31
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.5 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.5
new file mode 100644
index 000000000000..5b91689b4e14
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.5
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/dwarves ) 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 sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel:5.7.5 !sys-kernel/vanilla-kernel-bin:5.7.5 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.7.5
+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.7.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-6.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-6.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=663b08666b269eeeeaafbafaee07fd03389ac8d7 -> linux-5.7.1-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=4f18a8a48e28656a98803890a0f6567b93fd5a77 -> linux-5.7.2-arch1.i686.config )
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b30674cc9ef5ecb5282df28b9affba31
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.6 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.6
new file mode 100644
index 000000000000..799bd9c59dc1
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.6
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/dwarves ) 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 sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel:5.7.6 !sys-kernel/vanilla-kernel-bin:5.7.6 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.7.6
+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.7.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-7.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-7.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=39802f4425f0fc50dd8040ad30cfdd001bd2b40b -> linux-5.7.6-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=4f18a8a48e28656a98803890a0f6567b93fd5a77 -> linux-5.7.2-arch1.i686.config )
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2a4d93cfe9f9e2ac4d1d2cbaf5f69042
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.40 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.40
index e869b1d31001..c31e919a79fe 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.40
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.40
@@ -1,5 +1,5 @@
 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
+DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
 DESCRIPTION=Pre-built Linux kernel with genpatches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.4.40 !sys-kernel/vanilla-kernel:5.4.40 !sys-
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.40
 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.40-1.xpak -> gentoo-kernel-5.4.40-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.40-1.xpak -> gentoo-kernel-5.4.40-1.x86.xpak )
-_eclasses_=kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=9012e8c93bb1e67d607665e63c5ce47d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.46 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.46
index c12636ef394f..0af45d4ce993 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.46
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.46
@@ -1,5 +1,5 @@
 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
+DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
 DESCRIPTION=Pre-built Linux kernel with genpatches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.4.46 !sys-kernel/vanilla-kernel:5.4.46 !sys-
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.46
 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.46-1.xpak -> gentoo-kernel-5.4.46-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.46-1.xpak -> gentoo-kernel-5.4.46-1.x86.xpak )
-_eclasses_=kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=090591d3b01a83132e35a9ff23d3d8a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.47 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.47
index 2b76412cf68d..a5bd4d442441 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.47
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.47
@@ -1,5 +1,5 @@
 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
+DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
 DESCRIPTION=Pre-built Linux kernel with genpatches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.4.47 !sys-kernel/vanilla-kernel:5.4.47 !sys-
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.47
 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.47-1.xpak -> gentoo-kernel-5.4.47-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.47-1.xpak -> gentoo-kernel-5.4.47-1.x86.xpak )
-_eclasses_=kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=090591d3b01a83132e35a9ff23d3d8a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.48 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.48
new file mode 100644
index 000000000000..030fcce8f3ac
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.48
@@ -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=config 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.48 !sys-kernel/vanilla-kernel:5.4.48 !sys-kernel/vanilla-kernel-bin:5.4.48 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.4.48
+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.48-1.xpak -> gentoo-kernel-5.4.48-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.48-1.xpak -> gentoo-kernel-5.4.48-1.x86.xpak )
+_eclasses_=kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_md5_=090591d3b01a83132e35a9ff23d3d8a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.49 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.49
new file mode 100644
index 000000000000..2827a4fa3f8d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.49
@@ -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=config 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.49 !sys-kernel/vanilla-kernel:5.4.49 !sys-kernel/vanilla-kernel-bin:5.4.49 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.4.49
+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.49-1.xpak -> gentoo-kernel-5.4.49-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.49-1.xpak -> gentoo-kernel-5.4.49-1.x86.xpak )
+_eclasses_=kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_md5_=090591d3b01a83132e35a9ff23d3d8a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.6.18 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.6.18
index e99bc7d920bb..a22d27d5af54 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.6.18
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.6.18
@@ -1,5 +1,5 @@
 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
+DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
 DESCRIPTION=Pre-built Linux kernel with genpatches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.6.18 !sys-kernel/vanilla-kernel:5.6.18 !sys-
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.6.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.6.18-1.xpak -> gentoo-kernel-5.6.18-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.6.18-1.xpak -> gentoo-kernel-5.6.18-1.x86.xpak )
-_eclasses_=kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=090591d3b01a83132e35a9ff23d3d8a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.6.19 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.6.19
index 696ddc2084e3..a333d6dc157f 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.6.19
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.6.19
@@ -1,5 +1,5 @@
 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
+DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
 DESCRIPTION=Pre-built Linux kernel with genpatches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.6.19 !sys-kernel/vanilla-kernel:5.6.19 !sys-
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.6.19
 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.6.19-1.xpak -> gentoo-kernel-5.6.19-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.6.19-1.xpak -> gentoo-kernel-5.6.19-1.x86.xpak )
-_eclasses_=kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=090591d3b01a83132e35a9ff23d3d8a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.4 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.4
index 422ba8f14ad4..1b69b54bba1c 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.4
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.4
@@ -1,5 +1,5 @@
 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
+DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
 DESCRIPTION=Pre-built Linux kernel with genpatches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.7.4 !sys-kernel/vanilla-kernel:5.7.4 !sys-ke
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.7.4
 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.7.4-1.xpak -> gentoo-kernel-5.7.4-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.4-1.xpak -> gentoo-kernel-5.7.4-1.x86.xpak )
-_eclasses_=kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=090591d3b01a83132e35a9ff23d3d8a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.5 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.5
new file mode 100644
index 000000000000..c78eb608df2e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.5
@@ -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=config 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.7.5 !sys-kernel/vanilla-kernel:5.7.5 !sys-kernel/vanilla-kernel-bin:5.7.5 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.7.5
+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.7.5-1.xpak -> gentoo-kernel-5.7.5-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.5-1.xpak -> gentoo-kernel-5.7.5-1.x86.xpak )
+_eclasses_=kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_md5_=090591d3b01a83132e35a9ff23d3d8a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.6 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.6
new file mode 100644
index 000000000000..8307f569f7b5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.6
@@ -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=config 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.7.6 !sys-kernel/vanilla-kernel:5.7.6 !sys-kernel/vanilla-kernel-bin:5.7.6 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.7.6
+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.7.6-1.xpak -> gentoo-kernel-5.7.6-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.6-1.xpak -> gentoo-kernel-5.7.6-1.x86.xpak )
+_eclasses_=kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_md5_=090591d3b01a83132e35a9ff23d3d8a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.185 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.185
new file mode 100644
index 000000000000..e411b2c274de
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.185
@@ -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 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.185
+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-195.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-195.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-195.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-195.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-195.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-195.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-195.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-195.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-195.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=63ba588838fabf6770bde66bbfbfaf69
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.186 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.186
new file mode 100644
index 000000000000..30660f683b47
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.186
@@ -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 ~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.186
+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-196.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-196.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-196.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-196.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-196.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-196.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-196.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-196.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-196.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3c1da8dd0a2fd1fac3d44e6179206e7c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.129 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.129
new file mode 100644
index 000000000000..cdff19cccd40
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.129
@@ -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 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.129
+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-128.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-128.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-128.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-128.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-128.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-128.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-128.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-128.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-128.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3e85a27486209a2cda68a5593f1d0496
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.130 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.130
new file mode 100644
index 000000000000..bb029a0a1653
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.130
@@ -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 ~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.130
+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-129.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-129.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-129.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-129.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-129.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-129.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-129.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-129.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-129.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=003532950254fd48d90c894810d32b25
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.228 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.228
new file mode 100644
index 000000000000..3e4b979cf2ae
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.228
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.4.228
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-229.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-229.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-229.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-229.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-229.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-229.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-229.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-229.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-229.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1903d033cc13e6942dd4077f18248f18
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.228 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.228
new file mode 100644
index 000000000000..36480bf9b2a9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.228
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.228
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-232.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-232.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-232.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-232.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-232.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-232.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-232.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-232.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-232.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c319d1005965b529dee87dfd973f9dad
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.48 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.48
new file mode 100644
index 000000000000..c752298750b2
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.48
@@ -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 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.48
+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-48.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-48.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-48.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-48.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-48.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-48.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-48.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-48.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-48.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a03359d309a100850eded93753deec83
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.49 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.49
new file mode 100644
index 000000000000..0add69685582
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.49
@@ -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 ~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.49
+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-49.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-49.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-49.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-49.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-49.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-49.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-49.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-49.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-49.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=508861d0dfb4412da0c1a26d8db6666b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.5 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.5
new file mode 100644
index 000000000000..e3b1a4675097
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.5
@@ -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.7 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 ~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.7.5
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-6.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-6.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-6.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-6.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-6.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-6.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-6.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-6.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-6.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0651c9fbd9db2a5b27c29f7f2d249f6c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.6 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.6
new file mode 100644
index 000000000000..806b2f425839
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.6
@@ -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.7 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 ~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.7.6
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-7.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-7.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-7.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-7.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-7.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-7.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-7.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-7.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-7.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3751e40e471920ac524f8451515f63cf
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.8_rc2 b/metadata/md5-cache/sys-kernel/git-sources-5.8_rc2
new file mode 100644
index 000000000000..975b9faf269b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.8_rc2
@@ -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 ~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.8_rc2
+SRC_URI=https://git.kernel.org/torvalds/p/v5.8-rc2/v5.7 -> patch-5.8-rc2.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=cb03c81bebb1c38d60bba9deb807c184
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.8_rc3 b/metadata/md5-cache/sys-kernel/git-sources-5.8_rc3
new file mode 100644
index 000000000000..a27b8e6a3797
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.8_rc3
@@ -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 ~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.8_rc3
+SRC_URI=https://git.kernel.org/torvalds/p/v5.8-rc3/v5.7 -> patch-5.8-rc3.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=cb03c81bebb1c38d60bba9deb807c184
diff --git a/metadata/md5-cache/sys-kernel/kpatch-0.6.3 b/metadata/md5-cache/sys-kernel/kpatch-0.6.3
index db7a46542c82..88e30c4b55c0 100644
--- a/metadata/md5-cache/sys-kernel/kpatch-0.6.3
+++ b/metadata/md5-cache/sys-kernel/kpatch-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/pesign dev-libs/openssl:0= sys-libs/zlib sys-apps/pciutils ker
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dynup/kpatch/archive/v0.6.3.tar.gz -> kpatch-0.6.3.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=665cb343a76ec6bb6fa0bf1f243c7bd8
diff --git a/metadata/md5-cache/sys-kernel/kpatch-0.7.1 b/metadata/md5-cache/sys-kernel/kpatch-0.7.1
index 1e2f55ef0830..0c4a84d733d2 100644
--- a/metadata/md5-cache/sys-kernel/kpatch-0.7.1
+++ b/metadata/md5-cache/sys-kernel/kpatch-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/pesign sys-libs/zlib sys-apps/pciutils kernel_linux? ( virtual
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dynup/kpatch/archive/v0.7.1.tar.gz -> kpatch-0.7.1.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6001286ed710bbca90db3159c0a35a70
diff --git a/metadata/md5-cache/sys-kernel/kpatch-9999 b/metadata/md5-cache/sys-kernel/kpatch-9999
index 0890fa836b2d..cb3af32bde13 100644
--- a/metadata/md5-cache/sys-kernel/kpatch-9999
+++ b/metadata/md5-cache/sys-kernel/kpatch-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=app-crypt/pesign sys-libs/zlib sys-apps/pciutils kernel_linux? ( virtual/modutils )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a25433b28f077894415b8b4d5562f956
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20190815 b/metadata/md5-cache/sys-kernel/linux-firmware-20190815
deleted file mode 100644
index e0b819c5916c..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20190815
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=initramfs? ( app-arch/cpio )
-DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend unpack
-DESCRIPTION=Linux firmware files
-EAPI=7
-HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
-IUSE=initramfs +redistributable savedconfig unknown-license savedconfig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) redistributable? ( linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) ) unknown-license? ( all-rights-reserved )
-RDEPEND=!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !media-tv/cx18-firmware !<sys-firmware/ivtv-firmware-20080701-r1 !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/libertas-firmware !sys-firmware/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !sys-firmware/amd-ucode !sys-firmware/iwl1000-ucode !sys-firmware/iwl2000-ucode !sys-firmware/iwl2030-ucode !sys-firmware/iwl3945-ucode !sys-firmware/iwl4965-ucode !sys-firmware/iwl5000-ucode !sys-firmware/iwl5150-ucode !sys-firmware/iwl6000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl6050-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl7265-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/radeon-ucode ) unknown-license? ( !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] ) )
-REQUIRED_USE=initramfs? ( redistributable )
-RESTRICT=binchecks strip unknown-license? ( bindist )
-SLOT=0
-SRC_URI=https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-07b925b450bfb4cf3e141c612ec5b104658cd020.tar.gz -> linux-firmware-20190815.tar.gz
-_eclasses_=mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd
-_md5_=1adc169222aff918c8b3c5aedab0e91a
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20190923 b/metadata/md5-cache/sys-kernel/linux-firmware-20190923
deleted file mode 100644
index 89f6d8443878..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20190923
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=initramfs? ( app-arch/cpio )
-DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend unpack
-DESCRIPTION=Linux firmware files
-EAPI=7
-HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
-IUSE=initramfs +redistributable savedconfig unknown-license savedconfig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) redistributable? ( linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) ) unknown-license? ( all-rights-reserved )
-RDEPEND=!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !media-tv/cx18-firmware !<sys-firmware/ivtv-firmware-20080701-r1 !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/libertas-firmware !sys-firmware/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !sys-firmware/amd-ucode !sys-firmware/iwl1000-ucode !sys-firmware/iwl2000-ucode !sys-firmware/iwl2030-ucode !sys-firmware/iwl3945-ucode !sys-firmware/iwl4965-ucode !sys-firmware/iwl5000-ucode !sys-firmware/iwl5150-ucode !sys-firmware/iwl6000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl6050-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl7265-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/radeon-ucode ) unknown-license? ( !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] ) )
-REQUIRED_USE=initramfs? ( redistributable )
-RESTRICT=binchecks strip unknown-license? ( bindist )
-SLOT=0
-SRC_URI=https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-417a9c6e197a8d3eec792494efc87a2b42f76324.tar.gz -> linux-firmware-20190923.tar.gz
-_eclasses_=mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd
-_md5_=394d69736be332789d869375a233a1df
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20191022 b/metadata/md5-cache/sys-kernel/linux-firmware-20191022
deleted file mode 100644
index fbe95e5c4b23..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20191022
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=initramfs? ( app-arch/cpio )
-DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend unpack
-DESCRIPTION=Linux firmware files
-EAPI=7
-HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
-IUSE=initramfs +redistributable savedconfig unknown-license savedconfig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) redistributable? ( linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) ) unknown-license? ( all-rights-reserved )
-RDEPEND=!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !media-tv/cx18-firmware !<sys-firmware/ivtv-firmware-20080701-r1 !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/libertas-firmware !sys-firmware/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !sys-firmware/amd-ucode !sys-firmware/iwl1000-ucode !sys-firmware/iwl2000-ucode !sys-firmware/iwl2030-ucode !sys-firmware/iwl3945-ucode !sys-firmware/iwl4965-ucode !sys-firmware/iwl5000-ucode !sys-firmware/iwl5150-ucode !sys-firmware/iwl6000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl6050-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl7265-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/radeon-ucode ) unknown-license? ( !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] ) )
-REQUIRED_USE=initramfs? ( redistributable )
-RESTRICT=binchecks strip unknown-license? ( bindist )
-SLOT=0
-SRC_URI=https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-2b016afc348ba4b5fb2016ffcb2822f4a293da0c.tar.gz -> linux-firmware-20191022.tar.gz
-_eclasses_=mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd
-_md5_=9afbb88d8b3195f5d94495693c209396
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20191215 b/metadata/md5-cache/sys-kernel/linux-firmware-20191215
deleted file mode 100644
index 0b863f743fe9..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20191215
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=initramfs? ( app-arch/cpio )
-DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend unpack
-DESCRIPTION=Linux firmware files
-EAPI=7
-HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
-IUSE=initramfs +redistributable savedconfig unknown-license savedconfig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) redistributable? ( linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) ) unknown-license? ( all-rights-reserved )
-RDEPEND=!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !media-tv/cx18-firmware !<sys-firmware/ivtv-firmware-20080701-r1 !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/libertas-firmware !sys-firmware/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !sys-firmware/amd-ucode !sys-firmware/iwl1000-ucode !sys-firmware/iwl2000-ucode !sys-firmware/iwl2030-ucode !sys-firmware/iwl3945-ucode !sys-firmware/iwl4965-ucode !sys-firmware/iwl5000-ucode !sys-firmware/iwl5150-ucode !sys-firmware/iwl6000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl6050-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl7265-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/radeon-ucode ) unknown-license? ( !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] ) )
-REQUIRED_USE=initramfs? ( redistributable )
-RESTRICT=binchecks strip unknown-license? ( bindist )
-SLOT=0
-SRC_URI=https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-f1100ddf581f49aa79a54b56fe6ef0815a7ae57e.tar.gz -> linux-firmware-20191215.tar.gz
-_eclasses_=mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd
-_md5_=9747175a9c00501d942f8bc181cceaca
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20200122 b/metadata/md5-cache/sys-kernel/linux-firmware-20200122
deleted file mode 100644
index e8c0dd224b9c..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20200122
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=initramfs? ( app-arch/cpio )
-DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend unpack
-DESCRIPTION=Linux firmware files
-EAPI=7
-HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
-IUSE=initramfs +redistributable savedconfig unknown-license savedconfig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) redistributable? ( linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) ) unknown-license? ( all-rights-reserved )
-RDEPEND=!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !media-tv/cx18-firmware !<sys-firmware/ivtv-firmware-20080701-r1 !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/libertas-firmware !sys-firmware/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !sys-firmware/amd-ucode !sys-firmware/iwl1000-ucode !sys-firmware/iwl2000-ucode !sys-firmware/iwl2030-ucode !sys-firmware/iwl3945-ucode !sys-firmware/iwl4965-ucode !sys-firmware/iwl5000-ucode !sys-firmware/iwl5150-ucode !sys-firmware/iwl6000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl6050-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl7265-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/radeon-ucode ) unknown-license? ( !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] ) )
-REQUIRED_USE=initramfs? ( redistributable )
-RESTRICT=binchecks strip unknown-license? ( bindist )
-SLOT=0
-SRC_URI=https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-1eb2408c6feacccd10b02a49214745f15d1c6fb7.tar.gz -> linux-firmware-20200122.tar.gz
-_eclasses_=mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd
-_md5_=97fe740b18979b60d3a5167985a7174e
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20200619 b/metadata/md5-cache/sys-kernel/linux-firmware-20200619
new file mode 100644
index 000000000000..5ff389dfd74d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20200619
@@ -0,0 +1,15 @@
+BDEPEND=initramfs? ( app-arch/cpio )
+DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend unpack
+DESCRIPTION=Linux firmware files
+EAPI=7
+HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
+IUSE=initramfs +redistributable savedconfig unknown-license savedconfig
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
+LICENSE=GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) redistributable? ( linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) ) unknown-license? ( all-rights-reserved )
+RDEPEND=!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !sys-block/qla-fc-firmware !sys-firmware/iwl1000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl6050-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl3160-7260-bt-ucode ) unknown-license? ( !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] ) )
+REQUIRED_USE=initramfs? ( redistributable )
+RESTRICT=binchecks strip unknown-license? ( bindist )
+SLOT=0
+SRC_URI=https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-20200619.tar.gz
+_eclasses_=mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd
+_md5_=3934ab1f71a9425c3124f25aa881714c
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-99999999 b/metadata/md5-cache/sys-kernel/linux-firmware-99999999
index 29ccd195868a..617c770230ff 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-99999999
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-99999999
@@ -6,9 +6,9 @@ HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
 IUSE=initramfs +redistributable savedconfig unknown-license savedconfig
 LICENSE=GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) redistributable? ( linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) ) unknown-license? ( all-rights-reserved )
 PROPERTIES=live
-RDEPEND=!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !media-tv/cx18-firmware !<sys-firmware/ivtv-firmware-20080701-r1 !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/libertas-firmware !sys-firmware/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !sys-firmware/amd-ucode !sys-firmware/iwl1000-ucode !sys-firmware/iwl2000-ucode !sys-firmware/iwl2030-ucode !sys-firmware/iwl3945-ucode !sys-firmware/iwl4965-ucode !sys-firmware/iwl5000-ucode !sys-firmware/iwl5150-ucode !sys-firmware/iwl6000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl6050-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl7265-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/radeon-ucode ) unknown-license? ( !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] ) )
+RDEPEND=!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !sys-block/qla-fc-firmware !sys-firmware/iwl1000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl6050-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl3160-7260-bt-ucode ) unknown-license? ( !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] ) )
 REQUIRED_USE=initramfs? ( redistributable )
 RESTRICT=binchecks strip unknown-license? ( bindist )
 SLOT=0
 _eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd
-_md5_=d24e64e3e0a39e6478e473bf356d88cd
+_md5_=6010881cc6d3c72baac5d7ed9703c2a2
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.7_p3 b/metadata/md5-cache/sys-kernel/pf-sources-5.7_p3
new file mode 100644
index 000000000000..56845a15e3e8
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.7_p3
@@ -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=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
+EAPI=6
+HOMEPAGE=https://gitlab.com/post-factum/pf-kernel/-/wikis/README https://dev.gentoo.org/~mpagano/genpatches/
+IUSE=symlink build
+KEYWORDS=~amd64 ~ppc ~ppc64 ~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.7_p3
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.7...v5.7-pf3.diff -> pf-sources-5.7_p3.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.7-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.7-1.extras.tar.xz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4574f37786b15b23b805dda59cc78f9c
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.40 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.40
index f3fd0856ff83..2f70de0e6030 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.40
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.40
@@ -1,5 +1,5 @@
-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
+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 sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
 DESCRIPTION=Linux kernel built from vanilla upstream sources
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.40 || ( sys-kernel/installkernel-gent
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.40
 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.40.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569 -> linux-5.4.15-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e -> linux-5.4.15-arch1.i686.config )
-_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=03aedbb35fc318996eda748e0c3f5df0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.46 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.46
index 9ee3b075b736..56cb998e289c 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.46
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.46
@@ -1,5 +1,5 @@
-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
+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 sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
 DESCRIPTION=Linux kernel built from vanilla upstream sources
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.46 || ( sys-kernel/installkernel-gent
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.46
 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.46.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569 -> linux-5.4.15-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e -> linux-5.4.15-arch1.i686.config )
-_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=03aedbb35fc318996eda748e0c3f5df0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.47 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.47
index d40bc333b8e3..af0f8121a61c 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.47
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.47
@@ -1,5 +1,5 @@
-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
+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 sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
 DESCRIPTION=Linux kernel built from vanilla upstream sources
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.47 || ( sys-kernel/installkernel-gent
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.47
 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.47.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569 -> linux-5.4.15-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e -> linux-5.4.15-arch1.i686.config )
-_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=03aedbb35fc318996eda748e0c3f5df0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.48 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.48
new file mode 100644
index 000000000000..65cc37718729
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.48
@@ -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 sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config 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.48 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.4.48
+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.48.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569 -> linux-5.4.15-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e -> linux-5.4.15-arch1.i686.config )
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=03aedbb35fc318996eda748e0c3f5df0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.49 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.49
new file mode 100644
index 000000000000..22c11efe324a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.49
@@ -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 sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config 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.49 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.4.49
+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.49.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569 -> linux-5.4.15-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e -> linux-5.4.15-arch1.i686.config )
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=03aedbb35fc318996eda748e0c3f5df0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.6.18 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.6.18
index 682c7792d107..62fce2d3f294 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.6.18
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.6.18
@@ -1,5 +1,5 @@
-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
+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 sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
 DESCRIPTION=Linux kernel built from vanilla upstream sources
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.6.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.6.18.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=7dcb86e3e6f24c6d5462c5c8d25c3fa09e7e9f55 -> linux-5.6.8-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=bc42cce2cca0d42b5cfeb8c6bcbf9f39430791f2 -> linux-5.6.8-arch1.i686.config )
-_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4b67a2931ace6e1a590f8f352b2827b3
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.6.19 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.6.19
index f3f546490bc4..416cd66ca5df 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.6.19
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.6.19
@@ -1,5 +1,5 @@
-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
+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 sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
 DESCRIPTION=Linux kernel built from vanilla upstream sources
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.6.19
 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.6.19.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=7dcb86e3e6f24c6d5462c5c8d25c3fa09e7e9f55 -> linux-5.6.8-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=bc42cce2cca0d42b5cfeb8c6bcbf9f39430791f2 -> linux-5.6.8-arch1.i686.config )
-_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4b67a2931ace6e1a590f8f352b2827b3
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.4 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.4
index 6ad97342dbe8..54d5fa145852 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.4
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.4
@@ -1,5 +1,5 @@
-BDEPEND=debug? ( dev-util/dwarves ) 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
+BDEPEND=debug? ( dev-util/dwarves ) 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 sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
 DESCRIPTION=Linux kernel built from vanilla upstream sources
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.7.4
 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.7.4.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=663b08666b269eeeeaafbafaee07fd03389ac8d7 -> linux-5.7.1-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=4f18a8a48e28656a98803890a0f6567b93fd5a77 -> linux-5.7.2-arch1.i686.config )
-_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b889b56bb362bbcd7e81876103820285
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.5 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.5
new file mode 100644
index 000000000000..b346e8befa5b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.5
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/dwarves ) 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 sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config 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=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.7.5 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.7.5
+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.7.5.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=663b08666b269eeeeaafbafaee07fd03389ac8d7 -> linux-5.7.1-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=4f18a8a48e28656a98803890a0f6567b93fd5a77 -> linux-5.7.2-arch1.i686.config )
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b889b56bb362bbcd7e81876103820285
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.6 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.6
new file mode 100644
index 000000000000..72f453ed6e8f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.6
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/dwarves ) 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 sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config 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=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.7.6 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.7.6
+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.7.6.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=39802f4425f0fc50dd8040ad30cfdd001bd2b40b -> linux-5.7.6-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=4f18a8a48e28656a98803890a0f6567b93fd5a77 -> linux-5.7.2-arch1.i686.config )
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=183b2227c7e42ffa4a2127b11457a89a
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.184 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.184
deleted file mode 100644
index 0963d561e250..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.184
+++ /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 ~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.184
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.184.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.186 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.186
new file mode 100644
index 000000000000..fbdd76d735dd
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.186
@@ -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 ~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.186
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.186.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.128 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.128
deleted file mode 100644
index f18f841789a9..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.128
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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.128
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.128.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.130 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.130
new file mode 100644
index 000000000000..bbe272c39eaa
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.130
@@ -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 ~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.130
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.130.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.227 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.227
deleted file mode 100644
index 5ff5a83b49eb..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.227
+++ /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 ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.4.227
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.227.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.228 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.228
new file mode 100644
index 000000000000..6ee78861a3c0
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.228
@@ -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 ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.4.228
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.228.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.227 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.227
deleted file mode 100644
index cd8c23fa5c30..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.227
+++ /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 ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.227
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.227.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.228 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.228
new file mode 100644
index 000000000000..9c5230e2e0ad
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.228
@@ -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 ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.228
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.228.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.47 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.47
deleted file mode 100644
index 6a8323762bdf..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.47
+++ /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 ~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.47
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.47.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.49 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.49
new file mode 100644
index 000000000000..a2c4f1a4157f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.49
@@ -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 ~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.49
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.49.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.6.19 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.6.19
deleted file mode 100644
index 2a5192c10561..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.6.19
+++ /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 ~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.19
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.6.19.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.7.4 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.7.4
deleted file mode 100644
index 5f559c453c12..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.7.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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.7.4
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.7.4.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.7.6 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.7.6
new file mode 100644
index 000000000000..ff2820594c75
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.7.6
@@ -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 ~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.7.6
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.7.6.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-5.7.5 b/metadata/md5-cache/sys-kernel/zen-sources-5.7.5
new file mode 100644
index 000000000000..01007ba55dfe
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/zen-sources-5.7.5
@@ -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=The Zen Kernel Live Sources
+EAPI=6
+HOMEPAGE=https://github.com/zen-kernel
+IUSE=symlink build
+KEYWORDS=~amd64 ~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.7.5
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-1.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-1.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-1.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-1.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-1.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-1.extras.tar.xz https://github.com/zen-kernel/zen-kernel/releases/download/v5.7.5-zen1/v5.7.5-zen1.patch.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2148a6c5380c17b8ef37514d78fd60a1
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 49e14f193849..0ede8e3d16c5 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 b/metadata/md5-cache/sys-libs/compiler-rt-10.0.0
index aec09a93aa55..e101fd1a715a 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-10.0.0
+++ b/metadata/md5-cache/sys-libs/compiler-rt-10.0.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=10.0.0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=95f7e4b29edbc5b69b909e5dc4031e69
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-10.0.1.9999 b/metadata/md5-cache/sys-libs/compiler-rt-10.0.1.9999
index 2823e9b6726f..74e640f0aa29 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-10.0.1.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-10.0.1.9999
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 PROPERTIES=live
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=10.0.1
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7c7a66ab1ffab4623671bd6ec49a71bf
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=01fbe8c55e93e332661d01b00bd429a6
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-10.0.1_rc1 b/metadata/md5-cache/sys-libs/compiler-rt-10.0.1_rc1
index f952bf2527d4..86134faf4e8b 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-10.0.1_rc1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-10.0.1_rc1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=10.0.1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1-rc1.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7c7a66ab1ffab4623671bd6ec49a71bf
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=01fbe8c55e93e332661d01b00bd429a6
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 d33e333c91e8..a96370525121 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
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 PROPERTIES=live
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=11.0.0
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7c7a66ab1ffab4623671bd6ec49a71bf
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=01fbe8c55e93e332661d01b00bd429a6
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 c521e3df8d26..8cdbb3ff46d8 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-9.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-9.0.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 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	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5c4c0d2cdcfe45a2bb7f1058701554cf
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0
index b3505a0863a1..95b6d1f317c9 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=10.0.0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0c2d1f8fdff29e4d538b3966ffc47281
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1.9999
index b7bbea6ae620..1ebd57c631ca 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=10.0.1
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d47f8b72d2a03dadc11c4b6c6a5e94ec
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7c68d63d9eac29fd8837e9a3cf96906d
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1_rc1 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1_rc1
index 06f6366cd6c4..0d281e374496 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1_rc1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1_rc1
@@ -10,5 +10,5 @@ REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=10.0.1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1-rc1.tar.gz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d47f8b72d2a03dadc11c4b6c6a5e94ec
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7c68d63d9eac29fd8837e9a3cf96906d
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 62fb134f70b6..f461aa044cce 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
@@ -10,5 +10,5 @@ PROPERTIES=live
 REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=11.0.0
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d47f8b72d2a03dadc11c4b6c6a5e94ec
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7c68d63d9eac29fd8837e9a3cf96906d
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 e5e45c4dc61f..0dd8e532deff 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
@@ -11,5 +11,5 @@ REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
 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	7e3fd1855a5e1b50bb9e80827b3f672d	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1b1e62d56a1da8942cf1801ee52ff900
diff --git a/metadata/md5-cache/sys-libs/glibc-2.19-r2 b/metadata/md5-cache/sys-libs/glibc-2.19-r2
index 6f192136b52c..725b6bc61879 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.19-r2
+++ b/metadata/md5-cache/sys-libs/glibc-2.19-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend test unpack
-DEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) >=app-misc/pax-utils-0.1.10 !<sys-devel/bison-2.7 doc? ( sys-apps/texinfo ) >=sys-devel/binutils-2.24 >=sys-devel/gcc-4.9 virtual/os-headers sys-devel/gnuconfig virtual/pkgconfig
+DEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) >=app-misc/pax-utils-0.1.10 doc? ( sys-apps/texinfo ) >=sys-devel/binutils-2.24 >=sys-devel/gcc-4.9 virtual/os-headers sys-devel/gnuconfig virtual/pkgconfig
 DESCRIPTION=GNU libc C library
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libc/
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.19.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.19-patches-9.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9e2182142056661a223646ec81ceedf3
+_md5_=e6df6531d0d86934cf7d199b75a80993
diff --git a/metadata/md5-cache/sys-libs/glibc-2.25-r11 b/metadata/md5-cache/sys-libs/glibc-2.25-r11
index 691b5cc26225..96c339c5b2f7 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.25-r11
+++ b/metadata/md5-cache/sys-libs/glibc-2.25-r11
@@ -11,5 +11,5 @@ RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/glibc-2.25-patches-15.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	toolchain-glibc	15d87aa39f413c53abf65d756d9c6a36	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	toolchain-glibc	15d87aa39f413c53abf65d756d9c6a36	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=feb6af49c3d2465247be90f123a4bf25
diff --git a/metadata/md5-cache/sys-libs/glibc-2.30-r8 b/metadata/md5-cache/sys-libs/glibc-2.30-r8
index a2b49d3d72b9..96eaeceb7a8e 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.30-r8
+++ b/metadata/md5-cache/sys-libs/glibc-2.30-r8
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) >=app-misc/pax-utils-0.1.10 sys-devel/bison !<sys-devel/bison-2.7 doc? ( sys-apps/texinfo ) >=sys-devel/binutils-2.24 >=sys-devel/gcc-6 virtual/pkgconfig
+BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) >=app-misc/pax-utils-0.1.10 sys-devel/bison doc? ( sys-apps/texinfo ) >=sys-devel/binutils-2.24 >=sys-devel/gcc-6 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
 DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers sys-devel/gnuconfig
 DESCRIPTION=GNU libc C library
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.30.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.30-patches-10.tar.xz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d1daa56f033f738f791f1bd782eff7d6
+_md5_=2290bfd9db186b487bce40f6d6a689e3
diff --git a/metadata/md5-cache/sys-libs/glibc-2.30-r9 b/metadata/md5-cache/sys-libs/glibc-2.30-r9
index 9416ab2986f6..916d0e63e56e 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.30-r9
+++ b/metadata/md5-cache/sys-libs/glibc-2.30-r9
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) >=app-misc/pax-utils-0.1.10 sys-devel/bison !<sys-devel/bison-2.7 doc? ( sys-apps/texinfo ) >=sys-devel/binutils-2.24 >=sys-devel/gcc-6 virtual/pkgconfig
+BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) >=app-misc/pax-utils-0.1.10 sys-devel/bison doc? ( sys-apps/texinfo ) >=sys-devel/binutils-2.24 >=sys-devel/gcc-6 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
 DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers sys-devel/gnuconfig
 DESCRIPTION=GNU libc C library
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.30.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.30-patches-10.tar.xz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz ) https://dev.gentoo.org/~slyfox/distfiles/glibc-2.30-sparc-reg-fix-clobber.patch
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3f513242168853de73cca5ea131e17c4
+_md5_=03c1dcd1acd25970a46541e66f9be63b
diff --git a/metadata/md5-cache/sys-libs/glibc-2.31-r4 b/metadata/md5-cache/sys-libs/glibc-2.31-r4
index 90f0be50145b..4f83fdb69f9d 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.31-r4
+++ b/metadata/md5-cache/sys-libs/glibc-2.31-r4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) >=app-misc/pax-utils-0.1.10 sys-devel/bison !<sys-devel/bison-2.7 doc? ( sys-apps/texinfo ) >=sys-devel/binutils-2.24 >=sys-devel/gcc-6 virtual/pkgconfig
+BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) >=app-misc/pax-utils-0.1.10 sys-devel/bison doc? ( sys-apps/texinfo ) >=sys-devel/binutils-2.24 >=sys-devel/gcc-6 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
 DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !<net-misc/openssh-8.1_p1-r2 test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers sys-devel/gnuconfig
 DESCRIPTION=GNU libc C library
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.31.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.31-patches-5.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.00.tar.gz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz ) https://dev.gentoo.org/~slyfox/distfiles/glibc-2.31-sparc-patch1-reg-kabi.patch https://dev.gentoo.org/~slyfox/distfiles/glibc-2.31-sparc-patch2-reg-fix-clobber.patch
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ae015e1f38936ebc29a99a17c4c81c83
+_md5_=9193efec91d2e5af6bd51083d99fa2f2
diff --git a/metadata/md5-cache/sys-libs/glibc-2.31-r5 b/metadata/md5-cache/sys-libs/glibc-2.31-r5
index 2253cca6f1be..491fa1cc9d71 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.31-r5
+++ b/metadata/md5-cache/sys-libs/glibc-2.31-r5
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) >=app-misc/pax-utils-0.1.10 sys-devel/bison !<sys-devel/bison-2.7 doc? ( sys-apps/texinfo ) >=sys-devel/binutils-2.24 >=sys-devel/gcc-6 virtual/pkgconfig
+BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) >=app-misc/pax-utils-0.1.10 sys-devel/bison doc? ( sys-apps/texinfo ) >=sys-devel/binutils-2.24 >=sys-devel/gcc-6 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
 DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !<net-misc/openssh-8.1_p1-r2 test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers sys-devel/gnuconfig
 DESCRIPTION=GNU libc C library
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.31.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.31-patches-7.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.00.tar.gz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6484477c84682db3ac45ec9e77e7c25d
+_md5_=7acaed365f9665530ee88ddeb4d4ef27
diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999
index 1523cb13bcf3..0c03500a20a0 100644
--- a/metadata/md5-cache/sys-libs/glibc-9999
+++ b/metadata/md5-cache/sys-libs/glibc-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) >=app-misc/pax-utils-0.1.10 sys-devel/bison !<sys-devel/bison-2.7 doc? ( sys-apps/texinfo ) >=sys-devel/binutils-2.24 >=sys-devel/gcc-6 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) >=app-misc/pax-utils-0.1.10 sys-devel/bison doc? ( sys-apps/texinfo ) >=sys-devel/binutils-2.24 >=sys-devel/gcc-6 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
 DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !<net-misc/openssh-8.1_p1-r2 test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers sys-devel/gnuconfig
 DESCRIPTION=GNU libc C library
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.00.tar.gz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8c2486e786877aa59ab3f7a54fa8ce8a
+_md5_=8db28d797e509563110507e7173793f6
diff --git a/metadata/md5-cache/sys-libs/libcxx-10.0.0 b/metadata/md5-cache/sys-libs/libcxx-10.0.0
index b6da95d329a1..f7e94f43c088 100644
--- a/metadata/md5-cache/sys-libs/libcxx-10.0.0
+++ b/metadata/md5-cache/sys-libs/libcxx-10.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=libunwind? ( libcxxabi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7ba0dd72d7d2aab984c91394ed7b8b5d
diff --git a/metadata/md5-cache/sys-libs/libcxx-10.0.1.9999 b/metadata/md5-cache/sys-libs/libcxx-10.0.1.9999
index b9384409c318..278b1cd5e155 100644
--- a/metadata/md5-cache/sys-libs/libcxx-10.0.1.9999
+++ b/metadata/md5-cache/sys-libs/libcxx-10.0.1.9999
@@ -11,5 +11,5 @@ RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-10.0.1.9999[libunwind=,static-libs?,abi
 REQUIRED_USE=libunwind? ( libcxxabi )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=99a272e04b3b32c9b2d94b78a5297c95
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8bd15da29f60338565fcbeeb3e1d5ed1
diff --git a/metadata/md5-cache/sys-libs/libcxx-10.0.1_rc1 b/metadata/md5-cache/sys-libs/libcxx-10.0.1_rc1
index 6e7e3721efd5..a30ec99f30a3 100644
--- a/metadata/md5-cache/sys-libs/libcxx-10.0.1_rc1
+++ b/metadata/md5-cache/sys-libs/libcxx-10.0.1_rc1
@@ -11,5 +11,5 @@ REQUIRED_USE=libunwind? ( libcxxabi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1-rc1.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=99a272e04b3b32c9b2d94b78a5297c95
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8bd15da29f60338565fcbeeb3e1d5ed1
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 1179a11b2350..eb7105828347 100644
--- a/metadata/md5-cache/sys-libs/libcxx-11.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxx-11.0.0.9999
@@ -11,5 +11,5 @@ RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-11.0.0.9999[libunwind=,static-libs?,abi
 REQUIRED_USE=libunwind? ( libcxxabi )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ccd16871b26fa69678e11035c68eb41
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9d56703c1ca27230a14d706daaf1c566
diff --git a/metadata/md5-cache/sys-libs/libcxx-9.0.1 b/metadata/md5-cache/sys-libs/libcxx-9.0.1
index 414424af1201..e5f365131efd 100644
--- a/metadata/md5-cache/sys-libs/libcxx-9.0.1
+++ b/metadata/md5-cache/sys-libs/libcxx-9.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=libunwind? ( || ( libcxxabi libcxxrt ) ) ?? ( libcxxabi libcxxrt )
 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	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cbbe8cd62153c0f309bed318386ae7f1
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-10.0.0 b/metadata/md5-cache/sys-libs/libcxxabi-10.0.0
index 6b304707b862..41b56a4e9df9 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-10.0.0
+++ b/metadata/md5-cache/sys-libs/libcxxabi-10.0.0
@@ -11,5 +11,5 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ebb7f288cf496d136fd67a3012657fc2
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-10.0.1.9999 b/metadata/md5-cache/sys-libs/libcxxabi-10.0.1.9999
index ea130ad84bcb..faffda490938 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-10.0.1.9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-10.0.1.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1964a8a7c638720fea17946a6887ca82
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=eef38ce30ecaa44fc38aec1f57aa09fa
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-10.0.1_rc1 b/metadata/md5-cache/sys-libs/libcxxabi-10.0.1_rc1
index 9f7dd3e6c7bb..dc0e47c9379c 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-10.0.1_rc1
+++ b/metadata/md5-cache/sys-libs/libcxxabi-10.0.1_rc1
@@ -10,5 +10,5 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1-rc1.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1964a8a7c638720fea17946a6887ca82
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=eef38ce30ecaa44fc38aec1f57aa09fa
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 3e13604985a7..0a4d9a25e597 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-11.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-11.0.0.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ae99acace7352a05c15df0563c18b06f
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=96850386c7e36dc111e00c299bd2ffa5
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-9.0.1 b/metadata/md5-cache/sys-libs/libcxxabi-9.0.1
index a587611eba73..49006c03d360 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-9.0.1
+++ b/metadata/md5-cache/sys-libs/libcxxabi-9.0.1
@@ -11,5 +11,5 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(
 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	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2360129f90ebbf31b290a6ae48d932ca
diff --git a/metadata/md5-cache/sys-libs/libkudzu-1.2.57.1 b/metadata/md5-cache/sys-libs/libkudzu-1.2.57.1
index a119a76dd789..9c45235b7117 100644
--- a/metadata/md5-cache/sys-libs/libkudzu-1.2.57.1
+++ b/metadata/md5-cache/sys-libs/libkudzu-1.2.57.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/popt >=sys-apps/pciutils-2.2.4[zlib?] zlib? ( sys-libs/zlib ) sys-apps/hwdata-gentoo !sys-apps/kudzu
 SLOT=0
 SRC_URI=mirror://gentoo/kudzu-1.2.57.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=052705a2c2aa8ba8b4edd6ae9e193270
diff --git a/metadata/md5-cache/sys-libs/libomp-10.0.0 b/metadata/md5-cache/sys-libs/libomp-10.0.0
index e168abb474a5..64d175b4e732 100644
--- a/metadata/md5-cache/sys-libs/libomp-10.0.0
+++ b/metadata/md5-cache/sys-libs/libomp-10.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aaee34a6f5cca992db3b1d3019d8833a
diff --git a/metadata/md5-cache/sys-libs/libomp-10.0.1.9999 b/metadata/md5-cache/sys-libs/libomp-10.0.1.9999
index 45c637849bb4..0be0287fce0e 100644
--- a/metadata/md5-cache/sys-libs/libomp-10.0.1.9999
+++ b/metadata/md5-cache/sys-libs/libomp-10.0.1.9999
@@ -11,5 +11,5 @@ RDEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=40e7c9ef4cab97038157619cc1900795
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6c2b66326e1c98ab7ec04eb6df7e0716
diff --git a/metadata/md5-cache/sys-libs/libomp-10.0.1_rc1 b/metadata/md5-cache/sys-libs/libomp-10.0.1_rc1
index caffc35a8699..f9486e4368ea 100644
--- a/metadata/md5-cache/sys-libs/libomp-10.0.1_rc1
+++ b/metadata/md5-cache/sys-libs/libomp-10.0.1_rc1
@@ -11,5 +11,5 @@ REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1-rc1.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=40e7c9ef4cab97038157619cc1900795
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6c2b66326e1c98ab7ec04eb6df7e0716
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 45c637849bb4..0be0287fce0e 100644
--- a/metadata/md5-cache/sys-libs/libomp-11.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libomp-11.0.0.9999
@@ -11,5 +11,5 @@ RDEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=40e7c9ef4cab97038157619cc1900795
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6c2b66326e1c98ab7ec04eb6df7e0716
diff --git a/metadata/md5-cache/sys-libs/libomp-8.0.1 b/metadata/md5-cache/sys-libs/libomp-8.0.1
index be67c069e821..8b30bc89fcad 100644
--- a/metadata/md5-cache/sys-libs/libomp-8.0.1
+++ b/metadata/md5-cache/sys-libs/libomp-8.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/openmp-8.0.1.src.tar.xz
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=54050af2857068358b08d0a5c0ad764d
diff --git a/metadata/md5-cache/sys-libs/libomp-9.0.1 b/metadata/md5-cache/sys-libs/libomp-9.0.1
index 300cf104f3cf..a51fd81d0bb1 100644
--- a/metadata/md5-cache/sys-libs/libomp-9.0.1
+++ b/metadata/md5-cache/sys-libs/libomp-9.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
 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	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5e5ce1c6369c0e651469092282f8a3de
diff --git a/metadata/md5-cache/sys-libs/libtermcap-compat-2.0.8-r3 b/metadata/md5-cache/sys-libs/libtermcap-compat-2.0.8-r3
deleted file mode 100644
index 8a3ce122b6fb..000000000000
--- a/metadata/md5-cache/sys-libs/libtermcap-compat-2.0.8-r3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Compatibility package for old termcap-based programs
-EAPI=4
-HOMEPAGE=http://www.catb.org/~esr/terminfo/
-KEYWORDS=~alpha amd64 ~arm hppa ppc sparc x86
-LICENSE=GPL-2 LGPL-2 BSD
-SLOT=0
-SRC_URI=http://www.catb.org/~esr/terminfo/termtypes.tc.gz mirror://gentoo/termcap-2.0.8.tar.bz2 mirror://gentoo/termcap-2.0.8-patches-2.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bd828122668e08ed3f5cdca6dc01ae52
diff --git a/metadata/md5-cache/sys-libs/libtermcap-compat-2.0.8-r4 b/metadata/md5-cache/sys-libs/libtermcap-compat-2.0.8-r4
index 24684062d8b4..df22cc15ef4b 100644
--- a/metadata/md5-cache/sys-libs/libtermcap-compat-2.0.8-r4
+++ b/metadata/md5-cache/sys-libs/libtermcap-compat-2.0.8-r4
@@ -3,9 +3,9 @@ DESCRIPTION=Compatibility package for old termcap-based programs
 EAPI=5
 HOMEPAGE=http://www.catb.org/~esr/terminfo/
 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 hppa ~ppc sparc x86
+KEYWORDS=~alpha amd64 ~arm hppa ppc sparc x86
 LICENSE=GPL-2 LGPL-2 BSD
 SLOT=0
 SRC_URI=http://www.catb.org/~esr/terminfo/termtypes.tc.gz mirror://gentoo/termcap-2.0.8.tar.bz2 mirror://gentoo/termcap-2.0.8-patches-2.tar.bz2
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bbf07f6d62615761d1fa9bde3153fce8
+_md5_=a2e113379cf8e0bfaf5213d855470d60
diff --git a/metadata/md5-cache/sys-libs/libunwind-1.4.0 b/metadata/md5-cache/sys-libs/libunwind-1.4.0
index a790e62d7476..3d60fcbcb4aa 100644
--- a/metadata/md5-cache/sys-libs/libunwind-1.4.0
+++ b/metadata/md5-cache/sys-libs/libunwind-1.4.0
@@ -5,11 +5,11 @@ DESCRIPTION=Portable and efficient API to determine the call-chain of a program
 EAPI=7
 HOMEPAGE=https://savannah.nongnu.org/projects/libunwind
 IUSE=debug debug-frame doc libatomic lzma +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=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=lzma? ( app-arch/xz-utils[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(-)?] )
 RESTRICT=test
 SLOT=0/8
 SRC_URI=mirror://nongnu/libunwind/libunwind-1.4.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d6f3ef759dd1519716de92da7b06dfdf
+_md5_=ae1cd057f29b8798a319ab1b25ad1aa2
diff --git a/metadata/md5-cache/sys-libs/liburing-0.5 b/metadata/md5-cache/sys-libs/liburing-0.5
deleted file mode 100644
index 04793cd33141..000000000000
--- a/metadata/md5-cache/sys-libs/liburing-0.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Efficient I/O with io_uring
-EAPI=7
-HOMEPAGE=https://github.com/axboe/liburing
-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 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://git.kernel.dk/cgit/liburing/snapshot/liburing-0.5.tar.bz2
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ffe6be120c2c47b14e0e2fe0d862f54f
diff --git a/metadata/md5-cache/sys-libs/liburing-0.6 b/metadata/md5-cache/sys-libs/liburing-0.6
index b413751cae26..3af17ff822f2 100644
--- a/metadata/md5-cache/sys-libs/liburing-0.6
+++ b/metadata/md5-cache/sys-libs/liburing-0.6
@@ -3,9 +3,9 @@ DESCRIPTION=Efficient I/O with io_uring
 EAPI=7
 HOMEPAGE=https://github.com/axboe/liburing
 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 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://git.kernel.dk/cgit/liburing/snapshot/liburing-0.6.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ffe6be120c2c47b14e0e2fe0d862f54f
+_md5_=e705156f4501e7b2e1bfbfc929fdaa17
diff --git a/metadata/md5-cache/sys-libs/libxcrypt-4.4.16 b/metadata/md5-cache/sys-libs/libxcrypt-4.4.16
index de91004e6fc5..00b01b3ecb03 100644
--- a/metadata/md5-cache/sys-libs/libxcrypt-4.4.16
+++ b/metadata/md5-cache/sys-libs/libxcrypt-4.4.16
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/besser82/libxcrypt/archive/v4.4.16.tar.gz -> libxcrypt-4.4.16.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c51f355ca237c9e89605600e4f17d909
+_md5_=fc47cbfa9766197558c16afa5cccb29b
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.0 b/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.0
index 24d9cfcba217..d6339574324e 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.0
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.0
@@ -11,5 +11,5 @@ RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e3a207bb7a8dc9408b9f14d3b926bba2
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.1.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.1.9999
index c39e70f7b455..d0c93cfde5a6 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.1.9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.1.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=39d80a8049bf5ae751eba3904ddd9ade
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=951167aaf4e6d60b7f809e007a00a2f8
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.1_rc1 b/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.1_rc1
index 3f4701b91ee5..c4eed64c917f 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.1_rc1
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.1_rc1
@@ -10,5 +10,5 @@ RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1-rc1.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=39d80a8049bf5ae751eba3904ddd9ade
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=951167aaf4e6d60b7f809e007a00a2f8
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 c39e70f7b455..d0c93cfde5a6 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
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=39d80a8049bf5ae751eba3904ddd9ade
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=951167aaf4e6d60b7f809e007a00a2f8
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 b6c1eea2fc71..b3610e694666 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-9.0.1
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-9.0.1
@@ -11,5 +11,5 @@ RDEPEND=!sys-libs/libunwind
 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	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	llvm.org	de1162ce05041c923a8c6efc9175fb66	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b39a25bac319f8476abb434ec2502e4d
diff --git a/metadata/md5-cache/sys-libs/musl-1.2.0 b/metadata/md5-cache/sys-libs/musl-1.2.0
deleted file mode 100644
index be2b4fa9ff99..000000000000
--- a/metadata/md5-cache/sys-libs/musl-1.2.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst setup
-DESCRIPTION=Light, fast and simple C library focused on standards-conformance and safety
-EAPI=6
-HOMEPAGE=http://www.musl-libc.org/
-IUSE=headers-only
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
-LICENSE=MIT LGPL-2 GPL-2
-SLOT=0
-SRC_URI=http://www.musl-libc.org/releases/musl-1.2.0.tar.gz https://dev.gentoo.org/~blueness/musl-misc/getconf.c https://dev.gentoo.org/~blueness/musl-misc/getent.c https://dev.gentoo.org/~blueness/musl-misc/iconv.c
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4e47b69d4060283aa68c3172d86ff3dc
diff --git a/metadata/md5-cache/sys-libs/pam-1.3.1-r2 b/metadata/md5-cache/sys-libs/pam-1.3.1-r2
deleted file mode 100644
index dad8826e19d0..000000000000
--- a/metadata/md5-cache/sys-libs/pam-1.3.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.3 app-text/docbook-xml-dtd:4.4 app-text/docbook-xml-dtd:4.5 dev-libs/libxslt sys-devel/flex 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 filecaps? ( sys-libs/libcap )
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,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-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(-)?] audit? ( >=sys-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] ) cracklib? ( >=sys-libs/cracklib-2.9.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nis? ( >=net-libs/libtirpc-0.2.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Linux-PAM (Pluggable Authentication Modules)
-EAPI=7
-HOMEPAGE=https://github.com/linux-pam/linux-pam
-IUSE=audit berkdb +cracklib debug nis +pie selinux static-libs +filecaps abi_x86_32 abi_x86_64 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 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( BSD GPL-2 )
-PDEPEND=sys-auth/pambase
-RDEPEND=virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,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-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(-)?] audit? ( >=sys-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] ) cracklib? ( >=sys-libs/cracklib-2.9.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nis? ( >=net-libs/libtirpc-0.2.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) filecaps? ( sys-libs/libcap )
-SLOT=0
-SRC_URI=https://github.com/linux-pam/linux-pam/archive/v1.3.1.tar.gz -> pam-1.3.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	db-use	501a5d0963e0d17f30260023f292ae8e	fcaps	da689a8e04bbbb3518888ff668fee45b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=efb887783f538eb6db6afc0fafdd0707
diff --git a/metadata/md5-cache/sys-libs/tdb-1.4.3 b/metadata/md5-cache/sys-libs/tdb-1.4.3
index f10d97e37054..d5099b830378 100644
--- a/metadata/md5-cache/sys-libs/tdb-1.4.3
+++ b/metadata/md5-cache/sys-libs/tdb-1.4.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=!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] ) ) 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] ) app-text/docbook-xml-dtd:4.2
 DESCRIPTION=A simple database API
 EAPI=6
-HOMEPAGE=http://tdb.samba.org/
+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_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 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
@@ -10,6 +10,6 @@ RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 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
+SRC_URI=https://samba.org/ftp/tdb/tdb-1.4.3.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	waf-utils	cf9742c01975dc707eb982114a9d70fa
-_md5_=9e27473772c215af6545809b9c746e72
+_md5_=0f2eeb726fc16c2a7060228d098d9d59
diff --git a/metadata/md5-cache/sys-libs/timezone-data-2019c b/metadata/md5-cache/sys-libs/timezone-data-2019c
deleted file mode 100644
index ecf53352b663..000000000000
--- a/metadata/md5-cache/sys-libs/timezone-data-2019c
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare test
-DEPEND=nls? ( virtual/libintl )
-DESCRIPTION=Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)
-EAPI=7
-HOMEPAGE=https://www.iana.org/time-zones
-IUSE=nls leaps-timezone elibc_FreeBSD
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=BSD public-domain
-RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)]
-SLOT=0
-SRC_URI=https://www.iana.org/time-zones/repository/releases/tzdata2019c.tar.gz https://www.iana.org/time-zones/repository/releases/tzcode2019c.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ab9fa4a2f264cdadd20ccec59020a913
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index fc85ca47deb6..c67f373980ad 100644
--- a/metadata/md5-cache/sys-power/Manifest.gz
+++ b/metadata/md5-cache/sys-power/Manifest.gz
diff --git a/metadata/md5-cache/sys-power/acpi_call-1.1.0 b/metadata/md5-cache/sys-power/acpi_call-1.1.0
index d787acb8fc16..7182a07a0c33 100644
--- a/metadata/md5-cache/sys-power/acpi_call-1.1.0
+++ b/metadata/md5-cache/sys-power/acpi_call-1.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/mkottman/acpi_call/archive/v1.1.0.tar.gz -> acpi_call-1.1.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=67849a4a256c97a3bd00c79baed45178
diff --git a/metadata/md5-cache/sys-power/acpi_call-1.1.0-r1 b/metadata/md5-cache/sys-power/acpi_call-1.1.0-r1
index 121b2a3a34ea..ef14ccf7e2c0 100644
--- a/metadata/md5-cache/sys-power/acpi_call-1.1.0-r1
+++ b/metadata/md5-cache/sys-power/acpi_call-1.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/mkottman/acpi_call/archive/v1.1.0.tar.gz -> acpi_call-1.1.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=494a781e43d6bfcc6448d99d4fc06e8d
diff --git a/metadata/md5-cache/sys-power/acpi_call-1.1.0-r2 b/metadata/md5-cache/sys-power/acpi_call-1.1.0-r2
index 0d1d5ad13333..5f246c252710 100644
--- a/metadata/md5-cache/sys-power/acpi_call-1.1.0-r2
+++ b/metadata/md5-cache/sys-power/acpi_call-1.1.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/mkottman/acpi_call/archive/v1.1.0.tar.gz -> acpi_call-1.1.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=acb52626aa504d28329757201bb3c043
diff --git a/metadata/md5-cache/sys-power/acpi_call-3.17-r1 b/metadata/md5-cache/sys-power/acpi_call-3.17-r1
index 1f8ae04361eb..2fbe099fe172 100644
--- a/metadata/md5-cache/sys-power/acpi_call-3.17-r1
+++ b/metadata/md5-cache/sys-power/acpi_call-3.17-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/teleshoes/acpi_call/archive/3.17.tar.gz -> acpi_call-3.17.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b92f2eda7ff08df6e743efb9273acba2
diff --git a/metadata/md5-cache/sys-power/acpi_call-9999 b/metadata/md5-cache/sys-power/acpi_call-9999
index 3c5f69bb2f40..4329c1973662 100644
--- a/metadata/md5-cache/sys-power/acpi_call-9999
+++ b/metadata/md5-cache/sys-power/acpi_call-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=eebb2bed76971f94baa78f0fc9963caa
diff --git a/metadata/md5-cache/sys-power/acpid-2.0.31 b/metadata/md5-cache/sys-power/acpid-2.0.31
index 31f7abf7f951..2d12e4f1f190 100644
--- a/metadata/md5-cache/sys-power/acpid-2.0.31
+++ b/metadata/md5-cache/sys-power/acpid-2.0.31
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-apm )
 SLOT=0
 SRC_URI=mirror://sourceforge/acpid2/acpid-2.0.31.tar.xz https://dev.gentoo.org/~andrey_utkin/distfiles/sys-power_acpid_2.0.29-r1_extras.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=adbec279148571a51583f0d0d571d83c
diff --git a/metadata/md5-cache/sys-power/acpid-2.0.32 b/metadata/md5-cache/sys-power/acpid-2.0.32
index 3568e656e9b9..c84ab7bad946 100644
--- a/metadata/md5-cache/sys-power/acpid-2.0.32
+++ b/metadata/md5-cache/sys-power/acpid-2.0.32
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-apm )
 SLOT=0
 SRC_URI=mirror://sourceforge/acpid2/acpid-2.0.32.tar.xz https://dev.gentoo.org/~andrey_utkin/distfiles/sys-power_acpid_2.0.29-r1_extras.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8fb30c35ac66d9c3934a79d22f09f134
diff --git a/metadata/md5-cache/sys-power/acpid-2.0.32-r1 b/metadata/md5-cache/sys-power/acpid-2.0.32-r1
index a6b11144c295..bd2cf4fb2c4c 100644
--- a/metadata/md5-cache/sys-power/acpid-2.0.32-r1
+++ b/metadata/md5-cache/sys-power/acpid-2.0.32-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-apm )
 SLOT=0
 SRC_URI=mirror://sourceforge/acpid2/acpid-2.0.32.tar.xz https://dev.gentoo.org/~andrey_utkin/distfiles/sys-power_acpid_2.0.32-r1_extras.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9c1ed58a71aedc28141078280f153c30
diff --git a/metadata/md5-cache/sys-power/acpid-2.0.32-r2 b/metadata/md5-cache/sys-power/acpid-2.0.32-r2
index 1ec003b1023c..b03a8c148d0d 100644
--- a/metadata/md5-cache/sys-power/acpid-2.0.32-r2
+++ b/metadata/md5-cache/sys-power/acpid-2.0.32-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-apm )
 SLOT=0
 SRC_URI=mirror://sourceforge/acpid2/acpid-2.0.32.tar.xz https://dev.gentoo.org/~andrey_utkin/distfiles/sys-power_acpid_2.0.32-r2_extras.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ca15223976a555988294cb851a6f66c9
diff --git a/metadata/md5-cache/sys-power/apcupsd-3.14.13 b/metadata/md5-cache/sys-power/apcupsd-3.14.13
index 3efc6590ca96..44eb2f6ac72a 100644
--- a/metadata/md5-cache/sys-power/apcupsd-3.14.13
+++ b/metadata/md5-cache/sys-power/apcupsd-3.14.13
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/util-linux-2.23[tty-helpers(-)] cgi? ( >=media-libs/gd-1.8.4 ) nls? ( sys-devel/gettext ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) gnome? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/glib:2 >=gnome-base/gconf-2.0 ) sys-apps/openrc virtual/mailx
 SLOT=0
 SRC_URI=mirror://sourceforge/apcupsd/apcupsd-3.14.13.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3b79b722d3fd9e440a0469f1e84ef383
diff --git a/metadata/md5-cache/sys-power/apcupsd-3.14.14-r2 b/metadata/md5-cache/sys-power/apcupsd-3.14.14-r2
index 5e627aa42f08..6694b3434d62 100644
--- a/metadata/md5-cache/sys-power/apcupsd-3.14.14-r2
+++ b/metadata/md5-cache/sys-power/apcupsd-3.14.14-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/util-linux-2.23[tty-helpers(-)] modbus? ( usb? ( virtual/libusb:0 ) ) cgi? ( >=media-libs/gd-1.8.4 ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) gnome? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/glib:2 >=gnome-base/gconf-2.0 ) virtual/mailx
 SLOT=0
 SRC_URI=mirror://sourceforge/apcupsd/apcupsd-3.14.14.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=43594720c7dea7cd2d4d94bfb40d4f15
diff --git a/metadata/md5-cache/sys-power/bbswitch-0.8-r2 b/metadata/md5-cache/sys-power/bbswitch-0.8-r2
index f0c2365741b3..95d9a4c69048 100644
--- a/metadata/md5-cache/sys-power/bbswitch-0.8-r2
+++ b/metadata/md5-cache/sys-power/bbswitch-0.8-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/Bumblebee-Project/bbswitch/archive/v0.8.tar.gz -> bbswitch-0.8.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fcb02a85221473d90b0ee71ac2836dcd
diff --git a/metadata/md5-cache/sys-power/bbswitch-0.8-r3 b/metadata/md5-cache/sys-power/bbswitch-0.8-r3
index bd11fd2eef75..3a72db0dc47e 100644
--- a/metadata/md5-cache/sys-power/bbswitch-0.8-r3
+++ b/metadata/md5-cache/sys-power/bbswitch-0.8-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/Bumblebee-Project/bbswitch/archive/v0.8.tar.gz -> bbswitch-0.8.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=473e659045fac1b41d7769ad40195579
diff --git a/metadata/md5-cache/sys-power/bbswitch-9999 b/metadata/md5-cache/sys-power/bbswitch-9999
index 88657fe29718..1179bcbf83b9 100644
--- a/metadata/md5-cache/sys-power/bbswitch-9999
+++ b/metadata/md5-cache/sys-power/bbswitch-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 PROPERTIES=live
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7e2592b94a8c65d4aa34c1b88eb47863
diff --git a/metadata/md5-cache/sys-power/intel-undervolt-1.7 b/metadata/md5-cache/sys-power/intel-undervolt-1.7
index 66bf4cd4d14a..412aaddc2222 100644
--- a/metadata/md5-cache/sys-power/intel-undervolt-1.7
+++ b/metadata/md5-cache/sys-power/intel-undervolt-1.7
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=elogind? ( sys-auth/elogind )
 SLOT=0
 SRC_URI=https://github.com/kitsunyan/intel-undervolt/archive/1.7.tar.gz -> intel-undervolt-1.7.tar.gz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a22643593ab0c235ca3fb2e35ce67a60
diff --git a/metadata/md5-cache/sys-power/intel-undervolt-9999 b/metadata/md5-cache/sys-power/intel-undervolt-9999
index b4b9284e5dd7..459f5e17848c 100644
--- a/metadata/md5-cache/sys-power/intel-undervolt-9999
+++ b/metadata/md5-cache/sys-power/intel-undervolt-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=elogind? ( sys-auth/elogind )
 SLOT=0
-_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a22643593ab0c235ca3fb2e35ce67a60
diff --git a/metadata/md5-cache/sys-power/powernowd-1.00-r4 b/metadata/md5-cache/sys-power/powernowd-1.00-r4
index 749cfe476a32..19aab6f7fbb3 100644
--- a/metadata/md5-cache/sys-power/powernowd-1.00-r4
+++ b/metadata/md5-cache/sys-power/powernowd-1.00-r4
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.deater.net/john/powernowd-1.00.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0714325fd160450c95ce37adf2c182fe
diff --git a/metadata/md5-cache/sys-power/powernowd-1.00-r5 b/metadata/md5-cache/sys-power/powernowd-1.00-r5
index 6e7881229ecc..a1d1d8807966 100644
--- a/metadata/md5-cache/sys-power/powernowd-1.00-r5
+++ b/metadata/md5-cache/sys-power/powernowd-1.00-r5
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.deater.net/john/powernowd-1.00.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e05eb3751a5079face9b2d86fc406941
diff --git a/metadata/md5-cache/sys-power/powertop-2.10 b/metadata/md5-cache/sys-power/powertop-2.10
index 4f8ca71acee6..59c3964e20ad 100644
--- a/metadata/md5-cache/sys-power/powertop-2.10
+++ b/metadata/md5-cache/sys-power/powertop-2.10
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode?] X? ( x11-apps/xset ) virtual/libintl
 SLOT=0
 SRC_URI=https://01.org/sites/default/files/downloads/powertop-v2.10.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=609c49525f11453eb6d02f6baa1d2220
diff --git a/metadata/md5-cache/sys-power/powertop-2.11 b/metadata/md5-cache/sys-power/powertop-2.11
index e221b9855be7..5c6a5e1736b8 100644
--- a/metadata/md5-cache/sys-power/powertop-2.11
+++ b/metadata/md5-cache/sys-power/powertop-2.11
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode?] X? ( x11-apps/xset ) virtual/libintl
 SLOT=0
 SRC_URI=https://github.com/fenrus75/powertop/archive/v2.11.tar.gz -> powertop-2.11.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2a20297c7f7f1e95596809482e710749
diff --git a/metadata/md5-cache/sys-power/powertop-9999 b/metadata/md5-cache/sys-power/powertop-9999
index 8795d4d49695..8f5120846e43 100644
--- a/metadata/md5-cache/sys-power/powertop-9999
+++ b/metadata/md5-cache/sys-power/powertop-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode?] X? ( x11-apps/xset ) virtual/libintl
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fed91986e10b45effd2c0ebc736ce5d3
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 05493895b824..b489e3f5d644 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/atop-2.3.0-r1 b/metadata/md5-cache/sys-process/atop-2.3.0-r1
index 94e95cd4abb1..f7e7d625365d 100644
--- a/metadata/md5-cache/sys-process/atop-2.3.0-r1
+++ b/metadata/md5-cache/sys-process/atop-2.3.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= >=sys-process/acct-6.6.4-r1
 SLOT=0
 SRC_URI=https://github.com/Atoptool/atop/archive/v2.3.0.tar.gz -> atop-2.3.0.tar.gz https://github.com/Atoptool/atop/commit/42e86fcc42ce60f8c92f3c7d5f3a6ccde47c0b33.patch -> atop-2.3.0-version_h.patch https://github.com/Atoptool/atop/commit/a8d850d06efc8d70a19f55ec93fe83df51e99077.patch -> atop-2.3.0-version_c.patch https://github.com/Atoptool/atop/commit/5f101e656a24271726d1e9cd672631b6033c36c1.patch -> atop-2.3.0-netatop_h.patch
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=188bb80ee3cc4491e42cda9ac2dc1774
diff --git a/metadata/md5-cache/sys-process/atop-2.4.0 b/metadata/md5-cache/sys-process/atop-2.4.0
index 92e0c79fc954..3695a14be66a 100644
--- a/metadata/md5-cache/sys-process/atop-2.4.0
+++ b/metadata/md5-cache/sys-process/atop-2.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= >=sys-process/acct-6.6.4-r1
 SLOT=0
 SRC_URI=https://github.com/Atoptool/atop/archive/v2.4.0.tar.gz -> atop-2.4.0.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=42c9bce8bd2bdfce41a2bc83537d9db8
diff --git a/metadata/md5-cache/sys-process/atop-2.5.0-r1 b/metadata/md5-cache/sys-process/atop-2.5.0-r1
index 032cbe6ba065..d028eff3072f 100644
--- a/metadata/md5-cache/sys-process/atop-2.5.0-r1
+++ b/metadata/md5-cache/sys-process/atop-2.5.0-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= >=sys-process/acct-6.6.4-r1
 SLOT=0
 SRC_URI=https://github.com/Atoptool/atop/archive/v2.5.0.tar.gz -> atop-2.5.0.tar.gz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=900268f6378b3427c99481ce736dcea0
diff --git a/metadata/md5-cache/sys-process/audit-2.6.4 b/metadata/md5-cache/sys-process/audit-2.6.4
index e52f296cc489..acc17b34c1cc 100644
--- a/metadata/md5-cache/sys-process/audit-2.6.4
+++ b/metadata/md5-cache/sys-process/audit-2.6.4
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_6 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://people.redhat.com/sgrubb/audit/audit-2.6.4.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
 _md5_=8131cc7f4b4c8133781491f2caef1023
diff --git a/metadata/md5-cache/sys-process/audit-2.7.1 b/metadata/md5-cache/sys-process/audit-2.7.1
index 644d5b488d10..a9522858e7e4 100644
--- a/metadata/md5-cache/sys-process/audit-2.7.1
+++ b/metadata/md5-cache/sys-process/audit-2.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_6 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://people.redhat.com/sgrubb/audit/audit-2.7.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
 _md5_=a2945800d0da33bf9298d4aa7751b8b0
diff --git a/metadata/md5-cache/sys-process/audit-2.8.2 b/metadata/md5-cache/sys-process/audit-2.8.2
index ddc052e8fe83..dbfdc3b7ef0f 100644
--- a/metadata/md5-cache/sys-process/audit-2.8.2
+++ b/metadata/md5-cache/sys-process/audit-2.8.2
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_6 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://people.redhat.com/sgrubb/audit/audit-2.8.2.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
 _md5_=feef96ac2f602b8f13a4f336ed869627
diff --git a/metadata/md5-cache/sys-process/audit-2.8.3 b/metadata/md5-cache/sys-process/audit-2.8.3
index 5a63782bff19..9518a9cd1b6c 100644
--- a/metadata/md5-cache/sys-process/audit-2.8.3
+++ b/metadata/md5-cache/sys-process/audit-2.8.3
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_6 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://people.redhat.com/sgrubb/audit/audit-2.8.3.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
 _md5_=7bc1c79b2d719d43288978ed7628ff1f
diff --git a/metadata/md5-cache/sys-process/audit-2.8.4 b/metadata/md5-cache/sys-process/audit-2.8.4
index f6f3181f0e86..5704703852c0 100644
--- a/metadata/md5-cache/sys-process/audit-2.8.4
+++ b/metadata/md5-cache/sys-process/audit-2.8.4
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://people.redhat.com/sgrubb/audit/audit-2.8.4.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
 _md5_=56210b35784f450e774859f6786100e4
diff --git a/metadata/md5-cache/sys-process/audit-2.8.5 b/metadata/md5-cache/sys-process/audit-2.8.5
index da3536c45857..f65b708ff0fa 100644
--- a/metadata/md5-cache/sys-process/audit-2.8.5
+++ b/metadata/md5-cache/sys-process/audit-2.8.5
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://people.redhat.com/sgrubb/audit/audit-2.8.5.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
 _md5_=46463117364e4550cd5cc1665d020866
diff --git a/metadata/md5-cache/sys-process/criu-3.11 b/metadata/md5-cache/sys-process/criu-3.11
index 3af4e314705c..c96c850f68dd 100644
--- a/metadata/md5-cache/sys-process/criu-3.11
+++ b/metadata/md5-cache/sys-process/criu-3.11
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.openvz.org/criu/criu-3.11.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7feef2e5eec68e0d431a6b4930de2f01
diff --git a/metadata/md5-cache/sys-process/criu-3.12 b/metadata/md5-cache/sys-process/criu-3.12
index d498d7873241..1b8f614928c3 100644
--- a/metadata/md5-cache/sys-process/criu-3.12
+++ b/metadata/md5-cache/sys-process/criu-3.12
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.openvz.org/criu/criu-3.12.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4276073f0f67f1dbe77b993d126cdd38
diff --git a/metadata/md5-cache/sys-process/criu-3.14 b/metadata/md5-cache/sys-process/criu-3.14
index e7c7536a97d5..57599c3d9484 100644
--- a/metadata/md5-cache/sys-process/criu-3.14
+++ b/metadata/md5-cache/sys-process/criu-3.14
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 py
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.openvz.org/criu/criu-3.14.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6052ad0e0f302423c6150f343d41e81c
diff --git a/metadata/md5-cache/sys-process/criu-3.6 b/metadata/md5-cache/sys-process/criu-3.6
index 62b8702474a8..3abe51d7fff8 100644
--- a/metadata/md5-cache/sys-process/criu-3.6
+++ b/metadata/md5-cache/sys-process/criu-3.6
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.openvz.org/criu/criu-3.6.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9c8cfc49d66ee8d1db05f2de0491951d
diff --git a/metadata/md5-cache/sys-process/daemontools-0.76-r8 b/metadata/md5-cache/sys-process/daemontools-0.76-r8
index 77b1c4b779bf..6eb7f986b051 100644
--- a/metadata/md5-cache/sys-process/daemontools-0.76-r8
+++ b/metadata/md5-cache/sys-process/daemontools-0.76-r8
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=selinux? ( sec-policy/selinux-daemontools ) !app-doc/daemontools-man
 SLOT=0
 SRC_URI=http://cr.yp.to/daemontools/daemontools-0.76.tar.gz http://smarden.org/pape/djb/manpages/daemontools-0.76-man-20020131.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	qmail	83a4685f5044b0b067cb7e6f0e9c909c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	qmail	d71e87f6dc80bb9af62fd46856dc0a92	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1c1696de78f5c263acb811abb230a9e0
diff --git a/metadata/md5-cache/sys-process/daemontools-encore-1.10 b/metadata/md5-cache/sys-process/daemontools-encore-1.10
index 739292d92193..2697e5923b6f 100644
--- a/metadata/md5-cache/sys-process/daemontools-encore-1.10
+++ b/metadata/md5-cache/sys-process/daemontools-encore-1.10
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=selinux? ( sec-policy/selinux-daemontools ) !sys-process/daemontools !app-doc/daemontools-man
 SLOT=0
 SRC_URI=http://untroubled.org/daemontools-encore/daemontools-encore-1.10.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	83a4685f5044b0b067cb7e6f0e9c909c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	d71e87f6dc80bb9af62fd46856dc0a92	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5b363e8e7d6c03c5ab94bbbeb91e5e74
diff --git a/metadata/md5-cache/sys-process/daemontools-encore-1.11 b/metadata/md5-cache/sys-process/daemontools-encore-1.11
index 9ba6a95d0e0a..c864fcb74000 100644
--- a/metadata/md5-cache/sys-process/daemontools-encore-1.11
+++ b/metadata/md5-cache/sys-process/daemontools-encore-1.11
@@ -8,5 +8,5 @@ LICENSE=GPL-2 MIT
 RDEPEND=selinux? ( sec-policy/selinux-daemontools ) !sys-process/daemontools !app-doc/daemontools-man
 SLOT=0
 SRC_URI=https://untroubled.org/daemontools-encore/daemontools-encore-1.11.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	83a4685f5044b0b067cb7e6f0e9c909c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	d71e87f6dc80bb9af62fd46856dc0a92	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5b93c030ed9a6a56ecdb5ac413af0989
diff --git a/metadata/md5-cache/sys-process/glances-2.11.1 b/metadata/md5-cache/sys-process/glances-2.11.1
index b38ac4037452..afae9ad35cb4 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_python3_6(-)?,-python_single_tar
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/G/Glances/Glances-2.11.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0ec01c23ee1f1d1b3db48796741831a9
diff --git a/metadata/md5-cache/sys-process/glances-3.1.0 b/metadata/md5-cache/sys-process/glances-3.1.0
index a0f0f055d422..6c8403b6088f 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_python3_6 python_targets_python3_7 )
 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	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cedbd04b41d93406fdac5f999496da5a
diff --git a/metadata/md5-cache/sys-process/glances-3.1.4.1-r1 b/metadata/md5-cache/sys-process/glances-3.1.4.1-r1
index 04824340a416..2d36805adc5b 100644
--- a/metadata/md5-cache/sys-process/glances-3.1.4.1-r1
+++ b/metadata/md5-cache/sys-process/glances-3.1.4.1-r1
@@ -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/nicolargo/glances/archive/v3.1.4.1.tar.gz -> glances-3.1.4.1.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=abe657a8d655730516e9a60bc33737a9
diff --git a/metadata/md5-cache/sys-process/htop-2.2.0 b/metadata/md5-cache/sys-process/htop-2.2.0
index b987b9500135..d1325db866e3 100644
--- a/metadata/md5-cache/sys-process/htop-2.2.0
+++ b/metadata/md5-cache/sys-process/htop-2.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 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	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4bf0951da68f895157acde1f4f2b6996
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 c1d772c54493..781414a9dabb 100644
--- a/metadata/md5-cache/sys-process/htop-3.0.0_beta5
+++ b/metadata/md5-cache/sys-process/htop-3.0.0_beta5
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=sys-libs/ncurses:0=[unicode?]
 SLOT=0
 SRC_URI=https://github.com/hishamhm/htop/archive/3.0.0beta5.tar.gz -> htop-3.0.0_beta5.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=85236e0c55a1d760241a8cec48d3de08
diff --git a/metadata/md5-cache/sys-process/incron-0.5.12_p20191114 b/metadata/md5-cache/sys-process/incron-0.5.12_p20191114
index f09b6acdcc70..b38cad90b2a9 100644
--- a/metadata/md5-cache/sys-process/incron-0.5.12_p20191114
+++ b/metadata/md5-cache/sys-process/incron-0.5.12_p20191114
@@ -4,9 +4,9 @@ DESCRIPTION=inotify based cron daemon
 EAPI=7
 HOMEPAGE=https://incron.aiken.cz/
 IUSE=kernel_linux
-KEYWORDS=amd64 ppc x86
+KEYWORDS=amd64 ~arm64 ppc x86
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=https://github.com/ar-/incron/archive/1eedfbc9b318372efd119fd17f4abdbde561a53d.tar.gz -> incron-0.5.12_p20191114.tar.gz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ff649ec84e37c94e8d0f7d63a0f4c429
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=77ac213b7abe46c6df4595258799ba2b
diff --git a/metadata/md5-cache/sys-process/iotop-0.6 b/metadata/md5-cache/sys-process/iotop-0.6
index 086bfb86707f..81a2740502fe 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_python3_6? ( dev-lang/python:3.6[ncurses(+)] ) python_tar
 REQUIRED_USE=|| ( 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	44725b3eb803b8abcd6978759c231210	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5a0621da3806b1367e705f9e9e36530e
diff --git a/metadata/md5-cache/sys-process/latencytop-0.5-r1 b/metadata/md5-cache/sys-process/latencytop-0.5-r1
index 090d91e72f46..9de4b1c58d52 100644
--- a/metadata/md5-cache/sys-process/latencytop-0.5-r1
+++ b/metadata/md5-cache/sys-process/latencytop-0.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 gtk? ( x11-libs/gtk+:2 ) sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://gentoo/latencytop-0.5.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=545b0c5cfe66e1191c92b7ea671cb46b
diff --git a/metadata/md5-cache/sys-process/lsof-4.93.2-r1 b/metadata/md5-cache/sys-process/lsof-4.93.2-r1
index 9185205e10f8..01365dafefb8 100644
--- a/metadata/md5-cache/sys-process/lsof-4.93.2-r1
+++ b/metadata/md5-cache/sys-process/lsof-4.93.2-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Lists open files for running Unix processes
 EAPI=7
 HOMEPAGE=https://github.com/lsof-org/lsof
 IUSE=examples ipv6 rpc selinux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=lsof
 RDEPEND=rpc? ( net-libs/libtirpc ) selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=https://github.com/lsof-org/lsof/archive/4.93.2.tar.gz -> lsof-4.93.2.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6e86ed2efd08d5a748ddde3ef4394d4c
+_md5_=1001af4cd6a1660b8c432f19c7ea6c5a
diff --git a/metadata/md5-cache/sys-process/numad-0.5-r3 b/metadata/md5-cache/sys-process/numad-0.5-r3
index e1b5d03006c3..be562a57241b 100644
--- a/metadata/md5-cache/sys-process/numad-0.5-r3
+++ b/metadata/md5-cache/sys-process/numad-0.5-r3
@@ -8,5 +8,5 @@ KEYWORDS=amd64 -arm ~arm64 ~ppc64 -s390 x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://gentoo/numad-0.5-334278f.tar.bz2
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=84f8f0edd115fcf6cac0156df780afbf
diff --git a/metadata/md5-cache/sys-process/numad-9999 b/metadata/md5-cache/sys-process/numad-9999
index 3d175226b58c..2cab6284f1f3 100644
--- a/metadata/md5-cache/sys-process/numad-9999
+++ b/metadata/md5-cache/sys-process/numad-9999
@@ -7,5 +7,5 @@ IUSE=kernel_linux
 LICENSE=LGPL-2.1
 PROPERTIES=live
 SLOT=0
-_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=46852b7da9cdb24a43139d4388af9e66
diff --git a/metadata/md5-cache/sys-process/parallel-20200522 b/metadata/md5-cache/sys-process/parallel-20200522
index 8285adc0d122..2d989e46c6a8 100644
--- a/metadata/md5-cache/sys-process/parallel-20200522
+++ b/metadata/md5-cache/sys-process/parallel-20200522
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl:= dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl
 DESCRIPTION=A shell tool for executing jobs in parallel locally or on remote machines
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git
-KEYWORDS=~amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=dev-lang/perl:= dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
 SLOT=0
 SRC_URI=mirror://gnu/parallel/parallel-20200522.tar.bz2
-_md5_=fc119cf0057ea2a09e1800134dd335f7
+_md5_=b30edfd6fc01489d8435fc2b3380c83a
diff --git a/metadata/md5-cache/sys-process/rtirq-20180209 b/metadata/md5-cache/sys-process/rtirq-20180209
index 4dabae795196..c6bf0d6302da 100644
--- a/metadata/md5-cache/sys-process/rtirq-20180209
+++ b/metadata/md5-cache/sys-process/rtirq-20180209
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://www.rncbc.org/archive/old/rtirq-20180209.tar.gz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=69db64712cd70cb0e9aec93e134c4b99
diff --git a/metadata/md5-cache/sys-process/rtirq-20191121 b/metadata/md5-cache/sys-process/rtirq-20191121
index 897faee76b06..4c2166db7381 100644
--- a/metadata/md5-cache/sys-process/rtirq-20191121
+++ b/metadata/md5-cache/sys-process/rtirq-20191121
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://www.rncbc.org/archive/rtirq-20191121.tar.gz https://www.rncbc.org/archive/old/rtirq-20191121.tar.gz
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=23b92dc96aff270463db13356dc1ab74
diff --git a/metadata/md5-cache/sys-process/uksmd-0_pre20200505 b/metadata/md5-cache/sys-process/uksmd-0_pre20200505
index 72ffc9d57e87..3e00223eaaf1 100644
--- a/metadata/md5-cache/sys-process/uksmd-0_pre20200505
+++ b/metadata/md5-cache/sys-process/uksmd-0_pre20200505
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=sys-libs/libcap-ng sys-process/procps:=
 SLOT=0
 SRC_URI=https://gitlab.com/post-factum/uksmd/-/archive/b6af35cb9a772f643fd1bd703f4d1f6c6c6d3b79/uksmd-b6af35cb9a772f643fd1bd703f4d1f6c6c6d3b79.tar.bz2 -> uksmd-0_pre20200505.tar.bz2
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ddcef07fb81db9553ceadf4b7a8f3b60
diff --git a/metadata/md5-cache/sys-process/usbtop-0.2 b/metadata/md5-cache/sys-process/usbtop-0.2
index 649947b567c0..af50a2c9c31a 100644
--- a/metadata/md5-cache/sys-process/usbtop-0.2
+++ b/metadata/md5-cache/sys-process/usbtop-0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=net-libs/libpcap:=[usb] dev-libs/boost:=[threads]
 SLOT=0
 SRC_URI=https://github.com/aguinet/usbtop/archive/release-0.2.tar.gz -> usbtop-0.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1fef7cb6cbba24be9364ff5b36295926
diff --git a/metadata/md5-cache/sys-process/usbtop-1.0 b/metadata/md5-cache/sys-process/usbtop-1.0
index faf3dc1c47bc..5f381e679f69 100644
--- a/metadata/md5-cache/sys-process/usbtop-1.0
+++ b/metadata/md5-cache/sys-process/usbtop-1.0
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=net-libs/libpcap:=[usb] dev-libs/boost:=
 SLOT=0
 SRC_URI=https://github.com/aguinet/usbtop/archive/release-1.0.tar.gz -> usbtop-1.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6fb4c7fa783376a0f4e6597a256c3ecd
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 6033823d3449..dc1a64476256 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/editor-0-r3 b/metadata/md5-cache/virtual/editor-0-r3
index c1a60413792f..eacbe55849f6 100644
--- a/metadata/md5-cache/virtual/editor-0-r3
+++ b/metadata/md5-cache/virtual/editor-0-r3
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for editor
 EAPI=6
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~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=|| ( app-editors/nano app-editors/dav app-editors/e3 app-editors/ee app-editors/elvis app-editors/emacs:* app-editors/emact app-editors/ersatz-emacs app-editors/fe app-editors/jasspa-microemacs app-editors/jed app-editors/joe app-editors/jove app-editors/kakoune app-editors/le app-editors/levee app-editors/lpe app-editors/mg app-editors/moe app-editors/ne app-editors/neovim app-editors/ng app-editors/nvi app-editors/qemacs app-editors/teco app-editors/uemacs-pk app-editors/vile app-editors/vim app-editors/gvim app-editors/vis app-editors/xemacs app-editors/zile app-misc/mc[edit] dev-lisp/cmucl mail-client/alpine[-onlyalpine] )
+RDEPEND=|| ( app-editors/nano app-editors/dav app-editors/e3 app-editors/ee app-editors/elvis app-editors/emacs:* app-editors/emact app-editors/ersatz-emacs app-editors/fe app-editors/jasspa-microemacs app-editors/jed app-editors/joe app-editors/jove app-editors/kakoune app-editors/le app-editors/levee app-editors/lpe app-editors/mg app-editors/moe app-editors/ne app-editors/neovim app-editors/ng app-editors/qemacs app-editors/teco app-editors/uemacs-pk app-editors/vile app-editors/vim app-editors/gvim app-editors/vis app-editors/xemacs app-editors/zile app-misc/mc[edit] dev-lisp/cmucl mail-client/alpine[-onlyalpine] )
 SLOT=0
-_md5_=f3f9c3ed53dc0fafc00b58e48ddd5f56
+_md5_=6237f74713c32fe2093ff143c9786d28
diff --git a/metadata/md5-cache/virtual/libc-1 b/metadata/md5-cache/virtual/libc-1
deleted file mode 100644
index ab9eea534620..000000000000
--- a/metadata/md5-cache/virtual/libc-1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for the C library
-EAPI=5
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~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=!prefix-guest? ( elibc_glibc? ( sys-libs/glibc:2.2 ) elibc_musl? ( sys-libs/musl ) elibc_uclibc? ( sys-libs/uclibc-ng ) ) prefix-guest? ( elibc_Cygwin? ( sys-libs/cygwin-crypt ) !sys-libs/glibc !sys-libs/musl !sys-libs/uclibc-ng !sys-libs/uclibc )
-SLOT=0
-_md5_=b75a30216a9933a1ff11fc43429b468a
diff --git a/metadata/md5-cache/virtual/libc-1-r1 b/metadata/md5-cache/virtual/libc-1-r1
index 968f14f4df82..8ea919765680 100644
--- a/metadata/md5-cache/virtual/libc-1-r1
+++ b/metadata/md5-cache/virtual/libc-1-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for the C library
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~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=!prefix-guest? ( elibc_glibc? ( sys-libs/glibc:2.2 ) elibc_musl? ( sys-libs/musl ) elibc_uclibc? ( sys-libs/uclibc-ng ) ) prefix-guest? ( elibc_Cygwin? ( sys-libs/cygwin-crypt ) !sys-libs/glibc !sys-libs/musl !sys-libs/uclibc-ng !sys-libs/uclibc )
 SLOT=0
-_md5_=4fc27dfaf558019abd90d0ffb521cc59
+_md5_=f577171f50c806b7a80c32ba9d3a4261
diff --git a/metadata/md5-cache/virtual/os-headers-0 b/metadata/md5-cache/virtual/os-headers-0
deleted file mode 100644
index 63da61ac69a6..000000000000
--- a/metadata/md5-cache/virtual/os-headers-0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for operating system headers
-EAPI=5
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~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=kernel_linux? ( sys-kernel/linux-headers:0 )
-SLOT=0
-_md5_=869d83dba1971699f0a6e29c135f8814
diff --git a/metadata/md5-cache/virtual/os-headers-0-r2 b/metadata/md5-cache/virtual/os-headers-0-r2
index 52d413facfcf..c7f9989f258a 100644
--- a/metadata/md5-cache/virtual/os-headers-0-r2
+++ b/metadata/md5-cache/virtual/os-headers-0-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for operating system headers
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~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=!prefix-guest? ( || ( kernel_linux? ( sys-kernel/linux-headers:0 ) kernel_Winnt? ( elibc_mingw? ( dev-util/mingw64-runtime ) ) ) ) prefix-guest? ( !sys-kernel/linux-headers )
 SLOT=0
-_md5_=e721f7fdcef63420c21a528a72af93ed
+_md5_=3828da9e6c68d40860459eabcd86a1b9
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index 311afb1dabe2..bbf9d9ed91bd 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/libapreq2-2.13-r1 b/metadata/md5-cache/www-apache/libapreq2-2.13-r1
index 9c846ce8f2a3..855a1d98c5b3 100644
--- a/metadata/md5-cache/www-apache/libapreq2-2.13-r1
+++ b/metadata/md5-cache/www-apache/libapreq2-2.13-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=perl? ( >=dev-perl/ExtUtils-XSBuilder-0.23 virtual/perl-version >=www-apache/mod_perl-2 ) =www-servers/apache-2* dev-lang/perl:=[-build(-)]
 SLOT=2
 SRC_URI=mirror://apache/httpd/libapreq/libapreq2-2.13.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=30bf1d6ae5e8d435290aafc0b7cffaaf
diff --git a/metadata/md5-cache/www-apache/mod_maxminddb-1.2.0 b/metadata/md5-cache/www-apache/mod_maxminddb-1.2.0
new file mode 100644
index 000000000000..f7a6c868cd9f
--- /dev/null
+++ b/metadata/md5-cache/www-apache/mod_maxminddb-1.2.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=dev-libs/libmaxminddb:= =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=MaxMind DB Apache Module
+EAPI=6
+HOMEPAGE=https://maxmind.github.io/mod_maxminddb/
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/libmaxminddb:= =www-servers/apache-2.4*
+SLOT=0
+SRC_URI=https://github.com/maxmind/mod_maxminddb/releases/download/1.2.0/mod_maxminddb-1.2.0.tar.gz
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	7d999b62b8749fad43fff00620cedf47	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7f45d8966ebdc12cbe6ceff9d58970a6
diff --git a/metadata/md5-cache/www-apache/mod_perl-2.0.11 b/metadata/md5-cache/www-apache/mod_perl-2.0.11
index 9e13213b69a7..25275fdfd069 100644
--- a/metadata/md5-cache/www-apache/mod_perl-2.0.11
+++ b/metadata/md5-cache/www-apache/mod_perl-2.0.11
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/perl[ithreads=] >=dev-perl/Apache-Test-1.420.0 >=www-servers/ap
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=mirror://apache/perl/mod_perl-2.0.11.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=22bc3c0d639cee6e6aa2f765069ef098
diff --git a/metadata/md5-cache/www-apache/mod_qos-11.65 b/metadata/md5-cache/www-apache/mod_qos-11.65
new file mode 100644
index 000000000000..79d60169889f
--- /dev/null
+++ b/metadata/md5-cache/www-apache/mod_qos-11.65
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND==www-servers/apache-2* >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 QOS module for the apache webserver
+EAPI=6
+HOMEPAGE=http://mod-qos.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libpcre:3 dev-libs/openssl:0= media-libs/libpng:0= sys-libs/zlib:0= =www-servers/apache-2*
+SLOT=0
+SRC_URI=mirror://sourceforge/mod-qos/mod_qos-11.65.tar.gz
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	7d999b62b8749fad43fff00620cedf47	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=95be113db6ed7e561aff3f34f8ac548b
diff --git a/metadata/md5-cache/www-apache/mpm_itk-2.4.7_p4-r1 b/metadata/md5-cache/www-apache/mpm_itk-2.4.7_p4-r1
index 32a9951369d5..11e4add66483 100644
--- a/metadata/md5-cache/www-apache/mpm_itk-2.4.7_p4-r1
+++ b/metadata/md5-cache/www-apache/mpm_itk-2.4.7_p4-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=sys-libs/libcap >=www-servers/apache-2.4.7[-threads] =www-servers/apache-2.4*
 SLOT=0
 SRC_URI=http://mpm-itk.sesse.net/mpm-itk-2.4.7-04.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e2302fb4dc670544053645a47efc57a2
diff --git a/metadata/md5-cache/www-apps/Apache-Gallery-1.0_rc3-r1 b/metadata/md5-cache/www-apps/Apache-Gallery-1.0_rc3-r1
index dc5ccd152356..163d79f2fe1d 100644
--- a/metadata/md5-cache/www-apps/Apache-Gallery-1.0_rc3-r1
+++ b/metadata/md5-cache/www-apps/Apache-Gallery-1.0_rc3-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND==www-servers/apache-2* dev-lang/perl:=[-build(-)] >=app-admin/webapp-config-1.50.15
 SLOT=0
 SRC_URI=http://apachegallery.dk/download/Apache-Gallery-1.0RC3.tar.gz
-_eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12
+_eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12
 _md5_=515d15d87102abe27871d4f16b37f452
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 671ccd6378a6..74ae9d0e6425 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/chromedriver-bin-2.24-r1 b/metadata/md5-cache/www-apps/chromedriver-bin-2.24-r1
deleted file mode 100644
index a68dc50d4b6a..000000000000
--- a/metadata/md5-cache/www-apps/chromedriver-bin-2.24-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=WebDriver for Chrome
-EAPI=6
-HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
-KEYWORDS=~amd64
-LICENSE=google-chrome
-RDEPEND=!www-client/chromium www-client/google-chrome
-SLOT=0
-SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/2.24/chromedriver_linux64.zip -> chromedriver-bin-2.24.linux64.zip ) x86? ( https://chromedriver.storage.googleapis.com/2.24/chromedriver_linux32.zip -> chromedriver-bin-2.24.linux32.zip )
-_md5_=9a2b692b8db51a0d022bde3c730d04e6
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-2.30-r1 b/metadata/md5-cache/www-apps/chromedriver-bin-2.30-r1
deleted file mode 100644
index 1c842e1433e9..000000000000
--- a/metadata/md5-cache/www-apps/chromedriver-bin-2.30-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=WebDriver for Chrome
-EAPI=6
-HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
-KEYWORDS=~amd64
-LICENSE=google-chrome
-RDEPEND=!www-client/chromium www-client/google-chrome
-SLOT=0
-SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/2.30/chromedriver_linux64.zip -> chromedriver-bin-2.30.linux64.zip ) x86? ( https://chromedriver.storage.googleapis.com/2.30/chromedriver_linux32.zip -> chromedriver-bin-2.30.linux32.zip )
-_md5_=9a2b692b8db51a0d022bde3c730d04e6
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-2.35-r1 b/metadata/md5-cache/www-apps/chromedriver-bin-2.35-r1
deleted file mode 100644
index b181b6f9feed..000000000000
--- a/metadata/md5-cache/www-apps/chromedriver-bin-2.35-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=WebDriver for Chrome
-EAPI=6
-HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
-KEYWORDS=~amd64
-LICENSE=google-chrome
-RDEPEND=!www-client/chromium www-client/google-chrome
-SLOT=0
-SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/2.35/chromedriver_linux64.zip -> chromedriver-bin-2.35.linux64.zip )
-_md5_=1a90b4759ac377781cbad0849a1d87b5
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-2.40 b/metadata/md5-cache/www-apps/chromedriver-bin-2.40
deleted file mode 100644
index 5dc8ca893000..000000000000
--- a/metadata/md5-cache/www-apps/chromedriver-bin-2.40
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=WebDriver for Chrome
-EAPI=6
-HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
-KEYWORDS=~amd64
-LICENSE=google-chrome
-RDEPEND=!www-client/chromium www-client/google-chrome
-SLOT=0
-SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/2.40/chromedriver_linux64.zip -> chromedriver-bin-2.40.linux64.zip )
-_md5_=1a90b4759ac377781cbad0849a1d87b5
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-2.41 b/metadata/md5-cache/www-apps/chromedriver-bin-2.41
deleted file mode 100644
index 03900a4ae308..000000000000
--- a/metadata/md5-cache/www-apps/chromedriver-bin-2.41
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=WebDriver for Chrome
-EAPI=6
-HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
-KEYWORDS=~amd64
-LICENSE=google-chrome
-RDEPEND=!www-client/chromium www-client/google-chrome
-SLOT=0
-SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/2.41/chromedriver_linux64.zip -> chromedriver-bin-2.41.linux64.zip )
-_md5_=1a90b4759ac377781cbad0849a1d87b5
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-74.0.3729.6 b/metadata/md5-cache/www-apps/chromedriver-bin-74.0.3729.6
deleted file mode 100644
index 7367d7717baa..000000000000
--- a/metadata/md5-cache/www-apps/chromedriver-bin-74.0.3729.6
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=WebDriver for Chrome
-EAPI=6
-HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
-KEYWORDS=~amd64
-LICENSE=google-chrome
-RDEPEND=!www-client/chromium www-client/google-chrome
-SLOT=0
-SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/74.0.3729.6/chromedriver_linux64.zip -> chromedriver-bin-74.0.3729.6.linux64.zip )
-_md5_=cce934fd1fedb6112f915ff55e84c08c
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-76.0.3809.68 b/metadata/md5-cache/www-apps/chromedriver-bin-76.0.3809.68
deleted file mode 100644
index 5b1b8f38a75b..000000000000
--- a/metadata/md5-cache/www-apps/chromedriver-bin-76.0.3809.68
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=WebDriver for Chrome
-EAPI=6
-HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
-KEYWORDS=~amd64
-LICENSE=google-chrome
-RDEPEND=!www-client/chromium www-client/google-chrome
-SLOT=0
-SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/76.0.3809.68/chromedriver_linux64.zip -> chromedriver-bin-76.0.3809.68.linux64.zip )
-_md5_=cce934fd1fedb6112f915ff55e84c08c
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-77.0.3865.40 b/metadata/md5-cache/www-apps/chromedriver-bin-77.0.3865.40
deleted file mode 100644
index 714a82a7ab1e..000000000000
--- a/metadata/md5-cache/www-apps/chromedriver-bin-77.0.3865.40
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=WebDriver for Chrome
-EAPI=6
-HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
-KEYWORDS=~amd64
-LICENSE=google-chrome
-RDEPEND=!www-client/chromium www-client/google-chrome
-SLOT=0
-SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/77.0.3865.40/chromedriver_linux64.zip -> chromedriver-bin-77.0.3865.40.linux64.zip )
-_md5_=cce934fd1fedb6112f915ff55e84c08c
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-78.0.3904.105 b/metadata/md5-cache/www-apps/chromedriver-bin-78.0.3904.105
deleted file mode 100644
index df603879a455..000000000000
--- a/metadata/md5-cache/www-apps/chromedriver-bin-78.0.3904.105
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=WebDriver for Chrome
-EAPI=7
-HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
-KEYWORDS=~amd64
-LICENSE=google-chrome
-RDEPEND=!www-client/chromium www-client/google-chrome
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/78.0.3904.105/chromedriver_linux64.zip -> chromedriver-bin-78.0.3904.105.linux64.zip )
-_md5_=cd21b13a7f832c8353dd3afe1deb75d0
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-78.0.3904.70 b/metadata/md5-cache/www-apps/chromedriver-bin-78.0.3904.70
deleted file mode 100644
index 16ba53b93c46..000000000000
--- a/metadata/md5-cache/www-apps/chromedriver-bin-78.0.3904.70
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=WebDriver for Chrome
-EAPI=6
-HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
-KEYWORDS=~amd64
-LICENSE=google-chrome
-RDEPEND=!www-client/chromium www-client/google-chrome
-SLOT=0
-SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/78.0.3904.70/chromedriver_linux64.zip -> chromedriver-bin-78.0.3904.70.linux64.zip )
-_md5_=cce934fd1fedb6112f915ff55e84c08c
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-79.0.3945.36 b/metadata/md5-cache/www-apps/chromedriver-bin-79.0.3945.36
deleted file mode 100644
index 27843eba9ccd..000000000000
--- a/metadata/md5-cache/www-apps/chromedriver-bin-79.0.3945.36
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=WebDriver for Chrome
-EAPI=7
-HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
-KEYWORDS=~amd64
-LICENSE=google-chrome
-RDEPEND=!www-client/chromium www-client/google-chrome
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/79.0.3945.36/chromedriver_linux64.zip -> chromedriver-bin-79.0.3945.36.linux64.zip )
-_md5_=cd21b13a7f832c8353dd3afe1deb75d0
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-80.0.3987.106 b/metadata/md5-cache/www-apps/chromedriver-bin-80.0.3987.106
deleted file mode 100644
index 44fce0e34926..000000000000
--- a/metadata/md5-cache/www-apps/chromedriver-bin-80.0.3987.106
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=WebDriver for Chrome
-EAPI=7
-HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
-KEYWORDS=~amd64
-LICENSE=google-chrome
-RDEPEND=!www-client/chromium www-client/google-chrome
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/80.0.3987.106/chromedriver_linux64.zip -> chromedriver-bin-80.0.3987.106.linux64.zip )
-_md5_=884a68f99111bd33819a5e9fafd99539
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-81.0.4044.69 b/metadata/md5-cache/www-apps/chromedriver-bin-81.0.4044.69
deleted file mode 100644
index 0ce925c7d8ac..000000000000
--- a/metadata/md5-cache/www-apps/chromedriver-bin-81.0.4044.69
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=WebDriver for Chrome
-EAPI=7
-HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
-KEYWORDS=~amd64
-LICENSE=google-chrome
-RDEPEND=!www-client/chromium www-client/google-chrome
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/81.0.4044.69/chromedriver_linux64.zip -> chromedriver-bin-81.0.4044.69.linux64.zip )
-_md5_=884a68f99111bd33819a5e9fafd99539
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-83.0.4103.39 b/metadata/md5-cache/www-apps/chromedriver-bin-83.0.4103.39
deleted file mode 100644
index 0f5e32a611cd..000000000000
--- a/metadata/md5-cache/www-apps/chromedriver-bin-83.0.4103.39
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=WebDriver for Chrome
-EAPI=7
-HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
-KEYWORDS=~amd64
-LICENSE=google-chrome
-RDEPEND=!www-client/chromium www-client/google-chrome
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/83.0.4103.39/chromedriver_linux64.zip -> chromedriver-bin-83.0.4103.39.linux64.zip )
-_md5_=884a68f99111bd33819a5e9fafd99539
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-83.0.4103.39-r1 b/metadata/md5-cache/www-apps/chromedriver-bin-83.0.4103.39-r1
new file mode 100644
index 000000000000..5e0960ffdbaf
--- /dev/null
+++ b/metadata/md5-cache/www-apps/chromedriver-bin-83.0.4103.39-r1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=WebDriver for Chrome
+EAPI=7
+HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
+KEYWORDS=~amd64
+LICENSE=google-chrome
+RDEPEND=!www-client/chromium =www-client/google-chrome-83*
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/83.0.4103.39/chromedriver_linux64.zip -> chromedriver-bin-83.0.4103.39.linux64.zip )
+_md5_=028b56cd1522fd580e19cce0458e615d
diff --git a/metadata/md5-cache/www-apps/drupal-7.71 b/metadata/md5-cache/www-apps/drupal-7.71
deleted file mode 100644
index 2c1194c76dfe..000000000000
--- a/metadata/md5-cache/www-apps/drupal-7.71
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=PHP-based open-source platform and content management system
-EAPI=6
-HOMEPAGE=https://www.drupal.org/
-IUSE=+mysql postgres sqlite +uploadprogress vhosts
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml] virtual/httpd-php uploadprogress? ( dev-php/pecl-uploadprogress ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=7.71
-SRC_URI=https://ftp.drupal.org/files/projects/drupal-7.71.tar.gz
-_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=8fd0a0e8a0c8d711caf044c21e4ee876
diff --git a/metadata/md5-cache/www-apps/drupal-7.72 b/metadata/md5-cache/www-apps/drupal-7.72
new file mode 100644
index 000000000000..ca2d63e2a110
--- /dev/null
+++ b/metadata/md5-cache/www-apps/drupal-7.72
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=PHP-based open-source platform and content management system
+EAPI=6
+HOMEPAGE=https://www.drupal.org/
+IUSE=+mysql postgres sqlite +uploadprogress vhosts
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml] virtual/httpd-php uploadprogress? ( dev-php/pecl-uploadprogress ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=7.72
+SRC_URI=https://ftp.drupal.org/files/projects/drupal-7.72.tar.gz
+_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=8fd0a0e8a0c8d711caf044c21e4ee876
diff --git a/metadata/md5-cache/www-apps/drupal-8.7.14 b/metadata/md5-cache/www-apps/drupal-8.7.14
deleted file mode 100644
index dead78c76a99..000000000000
--- a/metadata/md5-cache/www-apps/drupal-8.7.14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=PHP-based open-source platform and content management system
-EAPI=6
-HOMEPAGE=https://www.drupal.org/
-IUSE=+mysql postgres sqlite +uploadprogress vhosts
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml] virtual/httpd-php uploadprogress? ( dev-php/pecl-uploadprogress ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=8.7.14
-SRC_URI=https://ftp.drupal.org/files/projects/drupal-8.7.14.tar.gz
-_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=47107bdd2978241763cd87948858fd51
diff --git a/metadata/md5-cache/www-apps/drupal-8.8.7 b/metadata/md5-cache/www-apps/drupal-8.8.7
deleted file mode 100644
index 665e7a5fdf6f..000000000000
--- a/metadata/md5-cache/www-apps/drupal-8.8.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=PHP-based open-source platform and content management system
-EAPI=6
-HOMEPAGE=https://www.drupal.org/
-IUSE=+mysql postgres sqlite +uploadprogress vhosts
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml] virtual/httpd-php uploadprogress? ( dev-php/pecl-uploadprogress ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=8.8.7
-SRC_URI=https://ftp.drupal.org/files/projects/drupal-8.8.7.tar.gz
-_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=47107bdd2978241763cd87948858fd51
diff --git a/metadata/md5-cache/www-apps/drupal-8.8.8 b/metadata/md5-cache/www-apps/drupal-8.8.8
new file mode 100644
index 000000000000..478d780b249c
--- /dev/null
+++ b/metadata/md5-cache/www-apps/drupal-8.8.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=PHP-based open-source platform and content management system
+EAPI=6
+HOMEPAGE=https://www.drupal.org/
+IUSE=+mysql postgres sqlite +uploadprogress vhosts
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml] virtual/httpd-php uploadprogress? ( dev-php/pecl-uploadprogress ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=8.8.8
+SRC_URI=https://ftp.drupal.org/files/projects/drupal-8.8.8.tar.gz
+_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=47107bdd2978241763cd87948858fd51
diff --git a/metadata/md5-cache/www-apps/drupal-8.9.0 b/metadata/md5-cache/www-apps/drupal-8.9.0
deleted file mode 100644
index 4fbfc4b11353..000000000000
--- a/metadata/md5-cache/www-apps/drupal-8.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=PHP-based open-source platform and content management system
-EAPI=6
-HOMEPAGE=https://www.drupal.org/
-IUSE=+mysql postgres sqlite +uploadprogress vhosts
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml] virtual/httpd-php uploadprogress? ( dev-php/pecl-uploadprogress ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=8.9.0
-SRC_URI=https://ftp.drupal.org/files/projects/drupal-8.9.0.tar.gz
-_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=47107bdd2978241763cd87948858fd51
diff --git a/metadata/md5-cache/www-apps/drupal-8.9.1 b/metadata/md5-cache/www-apps/drupal-8.9.1
new file mode 100644
index 000000000000..f8fa1366d6f5
--- /dev/null
+++ b/metadata/md5-cache/www-apps/drupal-8.9.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=PHP-based open-source platform and content management system
+EAPI=6
+HOMEPAGE=https://www.drupal.org/
+IUSE=+mysql postgres sqlite +uploadprogress vhosts
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml] virtual/httpd-php uploadprogress? ( dev-php/pecl-uploadprogress ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=8.9.1
+SRC_URI=https://ftp.drupal.org/files/projects/drupal-8.9.1.tar.gz
+_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=47107bdd2978241763cd87948858fd51
diff --git a/metadata/md5-cache/www-apps/drupal-9.0.0 b/metadata/md5-cache/www-apps/drupal-9.0.0
deleted file mode 100644
index b46f4a46c9c0..000000000000
--- a/metadata/md5-cache/www-apps/drupal-9.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=PHP-based open-source platform and content management system
-EAPI=6
-HOMEPAGE=https://www.drupal.org/
-IUSE=+mysql postgres sqlite +uploadprogress vhosts
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml] virtual/httpd-php uploadprogress? ( dev-php/pecl-uploadprogress ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=9.0.0
-SRC_URI=https://ftp.drupal.org/files/projects/drupal-9.0.0.tar.gz
-_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=47107bdd2978241763cd87948858fd51
diff --git a/metadata/md5-cache/www-apps/drupal-9.0.1 b/metadata/md5-cache/www-apps/drupal-9.0.1
new file mode 100644
index 000000000000..41bd5997f06b
--- /dev/null
+++ b/metadata/md5-cache/www-apps/drupal-9.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=PHP-based open-source platform and content management system
+EAPI=6
+HOMEPAGE=https://www.drupal.org/
+IUSE=+mysql postgres sqlite +uploadprogress vhosts
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml] virtual/httpd-php uploadprogress? ( dev-php/pecl-uploadprogress ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=9.0.1
+SRC_URI=https://ftp.drupal.org/files/projects/drupal-9.0.1.tar.gz
+_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=47107bdd2978241763cd87948858fd51
diff --git a/metadata/md5-cache/www-apps/ikiwiki-3.20170111 b/metadata/md5-cache/www-apps/ikiwiki-3.20170111
index e1be79f50c59..e810202bd97c 100644
--- a/metadata/md5-cache/www-apps/ikiwiki-3.20170111
+++ b/metadata/md5-cache/www-apps/ikiwiki-3.20170111
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.10 app-text/po4a dev-perl/HTML-Parser dev-perl/HTML-Sc
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/i/ikiwiki/ikiwiki_3.20170111.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a1f8be3e449e7a27fd87207983a76265
diff --git a/metadata/md5-cache/www-apps/ikiwiki-3.20171001 b/metadata/md5-cache/www-apps/ikiwiki-3.20171001
index a8ffc68a7f7e..70cc09d9e76b 100644
--- a/metadata/md5-cache/www-apps/ikiwiki-3.20171001
+++ b/metadata/md5-cache/www-apps/ikiwiki-3.20171001
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.10 app-text/po4a dev-perl/HTML-Parser dev-perl/HTML-Sc
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/i/ikiwiki/ikiwiki_3.20171001.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f8480baa5e6cb1111df717546ec79280
diff --git a/metadata/md5-cache/www-apps/ikiwiki-3.20190228 b/metadata/md5-cache/www-apps/ikiwiki-3.20190228
index a0bd46a173f4..25ed7b11ae1f 100644
--- a/metadata/md5-cache/www-apps/ikiwiki-3.20190228
+++ b/metadata/md5-cache/www-apps/ikiwiki-3.20190228
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.10 app-text/po4a dev-perl/HTML-Parser dev-perl/HTML-Sc
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/i/ikiwiki/ikiwiki_3.20190228.orig.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f85fe9b2c322445d899cf3dd42707f1a
diff --git a/metadata/md5-cache/www-apps/kibana-bin-7.8.0 b/metadata/md5-cache/www-apps/kibana-bin-7.8.0
new file mode 100644
index 000000000000..95c527cef61d
--- /dev/null
+++ b/metadata/md5-cache/www-apps/kibana-bin-7.8.0
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst prepare
+DESCRIPTION=Analytics and search dashboard for Elasticsearch
+EAPI=7
+HOMEPAGE=https://www.elastic.co/products/kibana
+IUSE=x-pack
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB x-pack? ( Elastic )
+RDEPEND=acct-group/kibana acct-user/kibana >=net-libs/nodejs-10.21.0 x-pack? ( dev-libs/expat dev-libs/nss )
+SLOT=0
+SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/kibana/kibana-7.8.0-linux-x86_64.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/kibana/kibana-oss-7.8.0-linux-x86_64.tar.gz )
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=bd9c0b803f569ac13bbced20af905e38
diff --git a/metadata/md5-cache/www-apps/liquid_feedback_core-2.2.6 b/metadata/md5-cache/www-apps/liquid_feedback_core-2.2.6
index 0cc693679a5e..a6fc6dcda010 100644
--- a/metadata/md5-cache/www-apps/liquid_feedback_core-2.2.6
+++ b/metadata/md5-cache/www-apps/liquid_feedback_core-2.2.6
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install postinst
 DEPEND=dev-db/postgresql:=
 DESCRIPTION=Internet platforms for proposition development and decision making
 EAPI=7
-HOMEPAGE=http://www.public-software-group.org/liquid_feedback
+HOMEPAGE=https://www.public-software-group.org/liquid_feedback
 KEYWORDS=~amd64
 LICENSE=HPND CC-BY-2.5
 RDEPEND=dev-db/postgresql:=
 SLOT=0
-SRC_URI=http://www.public-software-group.org/pub/projects/liquid_feedback/backend/v2.2.6/liquid_feedback_core-v2.2.6.tar.gz
+SRC_URI=https://www.public-software-group.org/pub/projects/liquid_feedback/backend/v2.2.6/liquid_feedback_core-v2.2.6.tar.gz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=dc175a2d7db2a251c675441fdf24ee06
+_md5_=2a31f4ca716aa6714875e0705a2d127f
diff --git a/metadata/md5-cache/www-apps/liquid_feedback_core-3.0.4 b/metadata/md5-cache/www-apps/liquid_feedback_core-3.0.4
index c3626dd29f59..5f6202f9d7b7 100644
--- a/metadata/md5-cache/www-apps/liquid_feedback_core-3.0.4
+++ b/metadata/md5-cache/www-apps/liquid_feedback_core-3.0.4
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install
 DEPEND=dev-db/postgresql:=
 DESCRIPTION=Internet platforms for proposition development and decision making
 EAPI=7
-HOMEPAGE=http://www.public-software-group.org/liquid_feedback
+HOMEPAGE=https://www.public-software-group.org/liquid_feedback
 KEYWORDS=~amd64
 LICENSE=HPND CC-BY-2.5
 RDEPEND=dev-db/postgresql:=
 SLOT=0
-SRC_URI=http://www.public-software-group.org/pub/projects/liquid_feedback/backend/v3.0.4/liquid_feedback_core-v3.0.4.tar.gz
+SRC_URI=https://www.public-software-group.org/pub/projects/liquid_feedback/backend/v3.0.4/liquid_feedback_core-v3.0.4.tar.gz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8c189b96f445dd0d8a34a0abafbbea17
+_md5_=a1852d10c557bf5c5f5a3392dcc5c7a3
diff --git a/metadata/md5-cache/www-apps/liquid_feedback_frontend-2.2.7 b/metadata/md5-cache/www-apps/liquid_feedback_frontend-2.2.7
index b22c6b441531..7d272ff0ae6a 100644
--- a/metadata/md5-cache/www-apps/liquid_feedback_frontend-2.2.7
+++ b/metadata/md5-cache/www-apps/liquid_feedback_frontend-2.2.7
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install prepare
 DEPEND=www-apps/rocketwiki-lqfb www-servers/apache >=www-apps/liquid_feedback_core-2.2.6
 DESCRIPTION=Internet platforms for proposition development and decision making
 EAPI=7
-HOMEPAGE=http://www.public-software-group.org/liquid_feedback
+HOMEPAGE=https://www.public-software-group.org/liquid_feedback
 IUSE=l10n_de l10n_el l10n_en l10n_eo l10n_it
 KEYWORDS=~amd64
 LICENSE=HPND CC-BY-2.5
 RDEPEND=>=www-apps/liquid_feedback_core-2.2.6
 SLOT=0
-SRC_URI=http://www.public-software-group.org/pub/projects/liquid_feedback/frontend/v2.2.7/liquid_feedback_frontend-v2.2.7.tar.gz l10n_it? ( mirror://gentoo/liquid_feedback_frontend-italian-2.2.7.tar.gz )
+SRC_URI=https://www.public-software-group.org/pub/projects/liquid_feedback/frontend/v2.2.7/liquid_feedback_frontend-v2.2.7.tar.gz l10n_it? ( mirror://gentoo/liquid_feedback_frontend-italian-2.2.7.tar.gz )
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c7fd3639389e94322c218a6e03062bdd
+_md5_=7bd625f862442c78a670d8fe2ee5ca80
diff --git a/metadata/md5-cache/www-apps/liquid_feedback_frontend-3.0.6 b/metadata/md5-cache/www-apps/liquid_feedback_frontend-3.0.6
index 2441b9bba534..048631aabd74 100644
--- a/metadata/md5-cache/www-apps/liquid_feedback_frontend-3.0.6
+++ b/metadata/md5-cache/www-apps/liquid_feedback_frontend-3.0.6
@@ -2,11 +2,11 @@ DEFINED_PHASES=install
 DEPEND=www-apps/rocketwiki-lqfb www-servers/apache >=www-apps/webmcp-1.2.6 >=www-apps/liquid_feedback_core-3.0.4
 DESCRIPTION=Internet platforms for proposition development and decision making
 EAPI=7
-HOMEPAGE=http://www.public-software-group.org/liquid_feedback
+HOMEPAGE=https://www.public-software-group.org/liquid_feedback
 KEYWORDS=~amd64
 LICENSE=HPND CC-BY-2.5
 RDEPEND=>=www-apps/liquid_feedback_core-3.0.4
 SLOT=0
-SRC_URI=http://www.public-software-group.org/pub/projects/liquid_feedback/frontend/v3.0.6/liquid_feedback_frontend-v3.0.6.tar.gz
+SRC_URI=https://www.public-software-group.org/pub/projects/liquid_feedback/frontend/v3.0.6/liquid_feedback_frontend-v3.0.6.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3f799434c6d38769d3540ece878ca086
+_md5_=8a06d71b27a17828b57df255694408bf
diff --git a/metadata/md5-cache/www-apps/mediawiki-1.34.1 b/metadata/md5-cache/www-apps/mediawiki-1.34.1
deleted file mode 100644
index 8bd98c292387..000000000000
--- a/metadata/md5-cache/www-apps/mediawiki-1.34.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=The MediaWiki wiki web application (as used on wikipedia.org)
-EAPI=7
-HOMEPAGE=http://www.mediawiki.org
-IUSE=imagemagick mysql postgres sqlite vhosts
-KEYWORDS=~alpha amd64 ~arm ~arm64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[ctype,fileinfo,iconv,json,mysql?,postgres?,session,ssl,unicode,xml,xmlreader] imagemagick? ( virtual/imagemagick-tools ) !imagemagick? ( dev-lang/php[gd] ) sqlite? ( dev-db/sqlite[fts3(+)] dev-lang/php[pdo] dev-lang/php[sqlite] ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-RESTRICT=test
-SLOT=1.34.1
-SRC_URI=http://releases.wikimedia.org/mediawiki/1.34/mediawiki-1.34.1.tar.gz
-_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=8031e8a79944f161a078325f08c05974
diff --git a/metadata/md5-cache/www-apps/mediawiki-1.34.2 b/metadata/md5-cache/www-apps/mediawiki-1.34.2
new file mode 100644
index 000000000000..067d975f324f
--- /dev/null
+++ b/metadata/md5-cache/www-apps/mediawiki-1.34.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst prerm setup unpack
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=The MediaWiki wiki web application (as used on wikipedia.org)
+EAPI=7
+HOMEPAGE=http://www.mediawiki.org
+IUSE=imagemagick mysql postgres +sqlite vhosts
+KEYWORDS=~alpha amd64 ~arm ~arm64 ppc x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[ctype,fileinfo,iconv,json,postgres?,session,ssl,unicode,xml,xmlreader] imagemagick? ( virtual/imagemagick-tools ) !imagemagick? ( dev-lang/php[gd] ) mysql? ( dev-lang/php[mysql,mysqli] ) sqlite? ( dev-db/sqlite[fts3(+)] dev-lang/php[pdo,sqlite] ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+RESTRICT=test
+SLOT=1.34.2
+SRC_URI=http://releases.wikimedia.org/mediawiki/1.34/mediawiki-1.34.2.tar.gz
+_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=0844ff21563a9ee4c66eaacccca88722
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 ce2ed354dbb1..bee00056ccda 100644
--- a/metadata/md5-cache/www-apps/radicale-2.1.11-r1
+++ b/metadata/md5-cache/www-apps/radicale-2.1.11-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend 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-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] virtual/pkgconfig
+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-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig
 DESCRIPTION=A simple CalDAV calendar server
 EAPI=6
 HOMEPAGE=https://radicale.org/
-IUSE=+bcrypt python_targets_python3_6
+IUSE=+bcrypt python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3+
-RDEPEND=sys-apps/util-linux >=dev-python/vobject-0.9.6[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.7.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] bcrypt? ( dev-python/passlib[bcrypt,python_targets_python3_6(-)?,-python_single_target_python3_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=sys-apps/util-linux >=dev-python/vobject-0.9.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-dateutil-2.7.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] bcrypt? ( dev-python/passlib[bcrypt,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/Radicale/Radicale-2.1.11.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=39ab33a10988d505849d8d3bc622976c
+_md5_=cb9ed8e0871c5ca463a2e4d9a7e9dc1c
diff --git a/metadata/md5-cache/www-apps/rocketwiki-lqfb-0.4 b/metadata/md5-cache/www-apps/rocketwiki-lqfb-0.4
index 74b5bdfb0b4b..5b09f3929f72 100644
--- a/metadata/md5-cache/www-apps/rocketwiki-lqfb-0.4
+++ b/metadata/md5-cache/www-apps/rocketwiki-lqfb-0.4
@@ -2,11 +2,11 @@ DEFINED_PHASES=install
 DEPEND=dev-libs/gmp dev-haskell/parsec dev-lang/ghc
 DESCRIPTION=Small parser which translates a wiki dialect to HTML
 EAPI=7
-HOMEPAGE=http://www.public-software-group.org/rocketwiki
+HOMEPAGE=https://www.public-software-group.org/rocketwiki
 KEYWORDS=~amd64 ~x86
 LICENSE=HPND
 RDEPEND=dev-libs/gmp
 SLOT=0
-SRC_URI=http://www.public-software-group.org/pub/projects/rocketwiki/liquid_feedback_edition/v0.4/rocketwiki-lqfb-v0.4.tar.gz
+SRC_URI=https://www.public-software-group.org/pub/projects/rocketwiki/liquid_feedback_edition/v0.4/rocketwiki-lqfb-v0.4.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5
-_md5_=17d2c31575c9bfe0ea61c173c4d4028f
+_md5_=9ce5448d0a78478a47b08991bd6a4f68
diff --git a/metadata/md5-cache/www-apps/webmcp-1.2.6 b/metadata/md5-cache/www-apps/webmcp-1.2.6
index 6303f1da06bc..9e790c4714fd 100644
--- a/metadata/md5-cache/www-apps/webmcp-1.2.6
+++ b/metadata/md5-cache/www-apps/webmcp-1.2.6
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install
 DEPEND=dev-lang/lua:= dev-db/postgresql:=
 DESCRIPTION=Web application framework written in Lua and C
 EAPI=7
-HOMEPAGE=http://www.public-software-group.org/webmcp
+HOMEPAGE=https://www.public-software-group.org/webmcp
 KEYWORDS=~amd64
 LICENSE=HPND
 RDEPEND=dev-lang/lua:= dev-db/postgresql:=
 SLOT=0
-SRC_URI=http://www.public-software-group.org/pub/projects/webmcp/v1.2.6/webmcp-v1.2.6.tar.gz
+SRC_URI=https://www.public-software-group.org/pub/projects/webmcp/v1.2.6/webmcp-v1.2.6.tar.gz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4c7a0f80ec112f8cf79fd127fa9e4645
+_md5_=870d7d79ecc17321ae9521d23fc79a63
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 1f27c6e35f79..b645a29ad72a 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-83.0.4103.106 b/metadata/md5-cache/www-client/chromium-83.0.4103.106
deleted file mode 100644
index ccd5f6f12a5a..000000000000
--- a/metadata/md5-cache/www-client/chromium-83.0.4103.106
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 app-arch/unzip dev-lang/perl >=dev-util/gn-0.1726 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 virtual/pkgconfig closure-compile? ( virtual/jre ) !system-libvpx? ( amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) )
-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 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=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:= media-libs/mesa:=[gbm] system-libvpx? ( >=media-libs/libvpx-1.8.2:=[postproc,svc] ) 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-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:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-67.1:= )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=7
-HOMEPAGE=https://chromium.org/
-IUSE=+closure-compile component-build cups cpu_flags_arm_neon +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 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=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:= media-libs/mesa:=[gbm] system-libvpx? ( >=media-libs/libvpx-1.8.2:=[postproc,svc] ) 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-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:= 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 ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-67.1:= )
-REQUIRED_USE=component-build? ( !suid )
-RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-83.0.4103.106.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	portability	e8f7ef3a41965b21a734550f8a94c1c6	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1f41944886172cc7d02c41289787aed0
diff --git a/metadata/md5-cache/www-client/chromium-83.0.4103.116 b/metadata/md5-cache/www-client/chromium-83.0.4103.116
new file mode 100644
index 000000000000..6619b1465b77
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-83.0.4103.116
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 app-arch/unzip dev-lang/perl >=dev-util/gn-0.1726 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 virtual/pkgconfig closure-compile? ( virtual/jre ) !system-libvpx? ( amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) )
+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 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=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:= media-libs/mesa:=[gbm] system-libvpx? ( >=media-libs/libvpx-1.8.2:=[postproc,svc] ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:0 <media-video/ffmpeg-4.3:0= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=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:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-67.1:= )
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=7
+HOMEPAGE=https://chromium.org/
+IUSE=+closure-compile component-build cups cpu_flags_arm_neon +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 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=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:= media-libs/mesa:=[gbm] system-libvpx? ( >=media-libs/libvpx-1.8.2:=[postproc,svc] ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:0 <media-video/ffmpeg-4.3:0= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=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:= 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 ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-67.1:= )
+REQUIRED_USE=component-build? ( !suid )
+RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-83.0.4103.116.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	portability	e8f7ef3a41965b21a734550f8a94c1c6	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b2078edca6d334a79aecb0239db0f1c6
diff --git a/metadata/md5-cache/www-client/chromium-84.0.4147.45 b/metadata/md5-cache/www-client/chromium-84.0.4147.45
deleted file mode 100644
index 367562ea4c30..000000000000
--- a/metadata/md5-cache/www-client/chromium-84.0.4147.45
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 app-arch/unzip dev-lang/perl >=dev-util/gn-0.1726 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 virtual/pkgconfig closure-compile? ( virtual/jre )
-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 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=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:= media-libs/mesa:=[gbm] system-libvpx? ( >=media-libs/libvpx-1.8.2:=[postproc,svc] ) 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-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:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-67.1:= )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=7
-HOMEPAGE=https://chromium.org/
-IUSE=+closure-compile component-build cups cpu_flags_arm_neon +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 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=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:= media-libs/mesa:=[gbm] system-libvpx? ( >=media-libs/libvpx-1.8.2:=[postproc,svc] ) 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-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:= 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 ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-67.1:= )
-REQUIRED_USE=component-build? ( !suid )
-RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-84.0.4147.45.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://www.x.org/releases/individual/proto/xcb-proto-1.14.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-84-patchset-1/chromium-84-patchset-1.tar.xz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	portability	e8f7ef3a41965b21a734550f8a94c1c6	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c99a8dae2a44a9e1ce272520ff3a0c59
diff --git a/metadata/md5-cache/www-client/chromium-84.0.4147.45-r1 b/metadata/md5-cache/www-client/chromium-84.0.4147.45-r1
deleted file mode 100644
index 9fc93efe6fd2..000000000000
--- a/metadata/md5-cache/www-client/chromium-84.0.4147.45-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 app-arch/unzip dev-lang/perl >=dev-util/gn-0.1726 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 virtual/pkgconfig closure-compile? ( virtual/jre )
-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 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=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:= media-libs/mesa:=[gbm] system-libvpx? ( >=media-libs/libvpx-1.8.2:=[postproc,svc] ) 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-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:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-67.1:= )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=7
-HOMEPAGE=https://chromium.org/
-IUSE=+closure-compile component-build cups cpu_flags_arm_neon +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 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=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:= media-libs/mesa:=[gbm] system-libvpx? ( >=media-libs/libvpx-1.8.2:=[postproc,svc] ) 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-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:= 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 ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-67.1:= )
-REQUIRED_USE=component-build? ( !suid )
-RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-84.0.4147.45.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://www.x.org/releases/individual/proto/xcb-proto-1.14.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-84-patchset-1/chromium-84-patchset-1.tar.xz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	portability	e8f7ef3a41965b21a734550f8a94c1c6	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9b13a6058a3489313bb03ce4cf5de8a4
diff --git a/metadata/md5-cache/www-client/chromium-84.0.4147.68 b/metadata/md5-cache/www-client/chromium-84.0.4147.68
new file mode 100644
index 000000000000..f3727b5be1f4
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-84.0.4147.68
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 app-arch/unzip dev-lang/perl >=dev-util/gn-0.1726 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 virtual/pkgconfig closure-compile? ( virtual/jre )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=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-1.8.2:=[postproc,svc] ) 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-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) ozone? ( !headless? ( media-libs/mesa:=[gbm] 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/libXtst:= x11-libs/libxcb:= x11-libs/gtk+:3[wayland?,X] wayland? ( dev-libs/wayland:= dev-libs/libffi:= x11-libs/libdrm:= x11-libs/libxkbcommon:= ) ) ) !ozone? ( >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] x11-libs/libXScrnSaver:= media-libs/mesa:=[gbm] 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/libXtst:= x11-libs/libxcb:= ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-67.1:= )
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=7
+HOMEPAGE=https://chromium.org/
+IUSE=+closure-compile component-build cups cpu_flags_arm_neon +hangouts headless kerberos ozone pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc wayland 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-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=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-1.8.2:=[postproc,svc] ) 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-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) ozone? ( !headless? ( media-libs/mesa:=[gbm] 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/libXtst:= x11-libs/libxcb:= x11-libs/gtk+:3[wayland?,X] wayland? ( dev-libs/wayland:= dev-libs/libffi:= x11-libs/libdrm:= x11-libs/libxkbcommon:= ) ) ) !ozone? ( >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] x11-libs/libXScrnSaver:= media-libs/mesa:=[gbm] 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/libXtst:= x11-libs/libxcb:= ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-67.1:= )
+REQUIRED_USE=component-build? ( !suid ) wayland? ( ozone )
+RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-84.0.4147.68.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://www.x.org/releases/individual/proto/xcb-proto-1.14.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-84-patchset-3/chromium-84-patchset-3.tar.xz
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	portability	e8f7ef3a41965b21a734550f8a94c1c6	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c28c1637b845c872fd0e3c4e70f14701
diff --git a/metadata/md5-cache/www-client/google-chrome-83.0.4103.106 b/metadata/md5-cache/www-client/google-chrome-83.0.4103.106
deleted file mode 100644
index 1f4d73411a90..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-83.0.4103.106
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
-DESCRIPTION=The web browser from Google
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=selinux kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* amd64
-LICENSE=google-chrome
-RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_83.0.4103.106-1_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7a41e42aa6aabb9c2ad50b2425df90d6
diff --git a/metadata/md5-cache/www-client/google-chrome-83.0.4103.116 b/metadata/md5-cache/www-client/google-chrome-83.0.4103.116
new file mode 100644
index 000000000000..efe37ae42599
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-83.0.4103.116
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DESCRIPTION=The web browser from Google
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=selinux kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* amd64
+LICENSE=google-chrome
+RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_83.0.4103.116-1_amd64.deb
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7a41e42aa6aabb9c2ad50b2425df90d6
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-84.0.4147.45 b/metadata/md5-cache/www-client/google-chrome-beta-84.0.4147.45
deleted file mode 100644
index d5f93872eb61..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-beta-84.0.4147.45
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
-DESCRIPTION=The web browser from Google
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=selinux kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_84.0.4147.45-1_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7a41e42aa6aabb9c2ad50b2425df90d6
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-84.0.4147.68 b/metadata/md5-cache/www-client/google-chrome-beta-84.0.4147.68
new file mode 100644
index 000000000000..de0aac375903
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-beta-84.0.4147.68
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DESCRIPTION=The web browser from Google
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=selinux kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_84.0.4147.68-1_amd64.deb
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7a41e42aa6aabb9c2ad50b2425df90d6
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-85.0.4168.2 b/metadata/md5-cache/www-client/google-chrome-unstable-85.0.4168.2
deleted file mode 100644
index 7ca4768fe964..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-unstable-85.0.4168.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
-DESCRIPTION=The web browser from Google
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=selinux kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_85.0.4168.2-1_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7a41e42aa6aabb9c2ad50b2425df90d6
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-85.0.4181.8 b/metadata/md5-cache/www-client/google-chrome-unstable-85.0.4181.8
new file mode 100644
index 000000000000..487278137407
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-85.0.4181.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DESCRIPTION=The web browser from Google
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=selinux kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_85.0.4181.8-1_amd64.deb
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7a41e42aa6aabb9c2ad50b2425df90d6
diff --git a/metadata/md5-cache/www-client/netsurf-3.10 b/metadata/md5-cache/www-client/netsurf-3.10
new file mode 100644
index 000000000000..6ee47ce3fd96
--- /dev/null
+++ b/metadata/md5-cache/www-client/netsurf-3.10
@@ -0,0 +1,14 @@
+BDEPEND=duktape? ( app-editors/vim-core ) dev-libs/check dev-perl/HTML-Parser >=dev-util/netsurf-buildsystem-1.7-r1
+DEFINED_PHASES=compile install prepare test
+DESCRIPTION=a free, open source web browser
+EAPI=7
+HOMEPAGE=http://www.netsurf-browser.org/
+IUSE=bmp +duktape fbcon truetype +gif +gtk gtk2 +javascript +jpeg mng +png +psl rosprite +svg +svgtiny +webp
+KEYWORDS=~amd64
+LICENSE=GPL-2 MIT
+RDEPEND=>=dev-libs/libcss-0.9 >=net-libs/libdom-0.3 >=net-libs/libhubbub-0.3 >=dev-libs/libnsutils-0.0.5 >=dev-libs/libutf8proc-2.2 dev-libs/libxml2:2 net-misc/curl bmp? ( >=media-libs/libnsbmp-0.1 ) fbcon? ( >=dev-libs/libnsfb-0.2 truetype? ( media-fonts/dejavu >=media-libs/freetype-2.5.0.1 ) ) gif? ( >=media-libs/libnsgif-0.1 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) gtk2? ( dev-libs/glib:2 x11-libs/gtk+:2 ) javascript? ( >=dev-libs/nsgenbind-0.7 duktape? ( dev-lang/duktape ) !duktape? ( dev-lang/spidermonkey:0= ) ) jpeg? ( >=virtual/jpeg-0-r2:0 ) mng? ( >=media-libs/libmng-1.0.10-r2 ) png? ( >=media-libs/libpng-1.2.51:0 ) psl? ( media-libs/libnspsl ) rosprite? ( >=media-libs/librosprite-0.1.2-r1 ) svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1 ) !svgtiny? ( gnome-base/librsvg:2 ) ) webp? ( >=media-libs/libwebp-0.3.0 )
+REQUIRED_USE=|| ( fbcon gtk gtk2 ) duktape? ( javascript )
+SLOT=0
+SRC_URI=http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.10-src.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b68feb80a172783360c7ec6a5981b8b8
diff --git a/metadata/md5-cache/www-client/netsurf-3.8-r2 b/metadata/md5-cache/www-client/netsurf-3.8-r2
deleted file mode 100644
index a306a51ec73f..000000000000
--- a/metadata/md5-cache/www-client/netsurf-3.8-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-libs/libcss-0.8 >=net-libs/libdom-0.3 >=net-libs/libhubbub-0.3 >=dev-libs/libnsutils-0.0.5 >=dev-libs/libutf8proc-2.2 dev-libs/libxml2:2 net-misc/curl bmp? ( >=media-libs/libnsbmp-0.1 ) fbcon? ( >=dev-libs/libnsfb-0.2 truetype? ( media-fonts/dejavu >=media-libs/freetype-2.5.0.1 ) ) gif? ( >=media-libs/libnsgif-0.1 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) gtk2? ( dev-libs/glib:2 x11-libs/gtk+:2 ) javascript? ( >=dev-libs/nsgenbind-0.6 !duktape? ( dev-lang/spidermonkey:0= ) ) jpeg? ( >=virtual/jpeg-0-r2:0 ) mng? ( >=media-libs/libmng-1.0.10-r2 ) pdf-writer? ( media-libs/libharu ) png? ( >=media-libs/libpng-1.2.51:0 ) psl? ( media-libs/libnspsl ) rosprite? ( >=media-libs/librosprite-0.1.2-r1 ) svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1 ) !svgtiny? ( gnome-base/librsvg:2 ) ) webp? ( >=media-libs/libwebp-0.3.0 ) dev-libs/check dev-perl/HTML-Parser >=dev-util/netsurf-buildsystem-1.7-r1
-DESCRIPTION=a free, open source web browser
-EAPI=7
-HOMEPAGE=http://www.netsurf-browser.org/
-IUSE=+bmp +duktape fbcon truetype +gif gtk gtk2 +javascript +jpeg +mng pdf-writer +png +psl +rosprite +svg +svgtiny +webp
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64
-LICENSE=GPL-2 MIT
-RDEPEND=>=dev-libs/libcss-0.8 >=net-libs/libdom-0.3 >=net-libs/libhubbub-0.3 >=dev-libs/libnsutils-0.0.5 >=dev-libs/libutf8proc-2.2 dev-libs/libxml2:2 net-misc/curl bmp? ( >=media-libs/libnsbmp-0.1 ) fbcon? ( >=dev-libs/libnsfb-0.2 truetype? ( media-fonts/dejavu >=media-libs/freetype-2.5.0.1 ) ) gif? ( >=media-libs/libnsgif-0.1 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) gtk2? ( dev-libs/glib:2 x11-libs/gtk+:2 ) javascript? ( >=dev-libs/nsgenbind-0.6 !duktape? ( dev-lang/spidermonkey:0= ) ) jpeg? ( >=virtual/jpeg-0-r2:0 ) mng? ( >=media-libs/libmng-1.0.10-r2 ) pdf-writer? ( media-libs/libharu ) png? ( >=media-libs/libpng-1.2.51:0 ) psl? ( media-libs/libnspsl ) rosprite? ( >=media-libs/librosprite-0.1.2-r1 ) svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1 ) !svgtiny? ( gnome-base/librsvg:2 ) ) webp? ( >=media-libs/libwebp-0.3.0 )
-REQUIRED_USE=|| ( fbcon gtk gtk2 ) duktape? ( javascript )
-SLOT=0
-SRC_URI=http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.8-src.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b5de3cc2e765c8f4477667ba6cd286db
diff --git a/metadata/md5-cache/www-client/netsurf-3.9 b/metadata/md5-cache/www-client/netsurf-3.9
deleted file mode 100644
index 34acb236238f..000000000000
--- a/metadata/md5-cache/www-client/netsurf-3.9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=duktape? ( app-editors/vim-core ) dev-libs/check dev-perl/HTML-Parser >=dev-util/netsurf-buildsystem-1.7-r1
-DEFINED_PHASES=compile install prepare test
-DESCRIPTION=a free, open source web browser
-EAPI=7
-HOMEPAGE=http://www.netsurf-browser.org/
-IUSE=+bmp +duktape fbcon truetype +gif gtk gtk2 +javascript +jpeg +mng pdf-writer +png +psl +rosprite +svg +svgtiny +webp
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64
-LICENSE=GPL-2 MIT
-RDEPEND=>=dev-libs/libcss-0.9 >=net-libs/libdom-0.3 >=net-libs/libhubbub-0.3 >=dev-libs/libnsutils-0.0.5 >=dev-libs/libutf8proc-2.2 dev-libs/libxml2:2 net-misc/curl bmp? ( >=media-libs/libnsbmp-0.1 ) fbcon? ( >=dev-libs/libnsfb-0.2 truetype? ( media-fonts/dejavu >=media-libs/freetype-2.5.0.1 ) ) gif? ( >=media-libs/libnsgif-0.1 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) gtk2? ( dev-libs/glib:2 x11-libs/gtk+:2 ) javascript? ( >=dev-libs/nsgenbind-0.7 !duktape? ( dev-lang/spidermonkey:0= ) ) jpeg? ( >=virtual/jpeg-0-r2:0 ) mng? ( >=media-libs/libmng-1.0.10-r2 ) pdf-writer? ( media-libs/libharu ) png? ( >=media-libs/libpng-1.2.51:0 ) psl? ( media-libs/libnspsl ) rosprite? ( >=media-libs/librosprite-0.1.2-r1 ) svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1 ) !svgtiny? ( gnome-base/librsvg:2 ) ) webp? ( >=media-libs/libwebp-0.3.0 )
-REQUIRED_USE=|| ( fbcon gtk gtk2 ) duktape? ( javascript )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.9-src.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=90e59e73c4b3fe8958a28d23351c463e
diff --git a/metadata/md5-cache/www-client/opera-68.0.3618.165 b/metadata/md5-cache/www-client/opera-68.0.3618.165
index eb142e355381..be0a61310d15 100644
--- a/metadata/md5-cache/www-client/opera-68.0.3618.165
+++ b/metadata/md5-cache/www-client/opera-68.0.3618.165
@@ -8,5 +8,5 @@ LICENSE=OPERA-2014
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss 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/68.0.3618.165/linux/opera-stable_68.0.3618.165_amd64.deb https://download2.operacdn.com/pub/opera/desktop/68.0.3618.165/linux/opera-stable_68.0.3618.165_amd64.deb https://download3.operacdn.com/pub/opera/desktop/68.0.3618.165/linux/opera-stable_68.0.3618.165_amd64.deb https://download4.operacdn.com/pub/opera/desktop/68.0.3618.165/linux/opera-stable_68.0.3618.165_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=706af59742ff5910e0221a1771d821c0
diff --git a/metadata/md5-cache/www-client/opera-68.0.3618.173 b/metadata/md5-cache/www-client/opera-68.0.3618.173
index 7e665133484b..2dc653d2f58c 100644
--- a/metadata/md5-cache/www-client/opera-68.0.3618.173
+++ b/metadata/md5-cache/www-client/opera-68.0.3618.173
@@ -8,5 +8,5 @@ LICENSE=OPERA-2014
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss 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/68.0.3618.173/linux/opera-stable_68.0.3618.173_amd64.deb https://download2.operacdn.com/pub/opera/desktop/68.0.3618.173/linux/opera-stable_68.0.3618.173_amd64.deb https://download3.operacdn.com/pub/opera/desktop/68.0.3618.173/linux/opera-stable_68.0.3618.173_amd64.deb https://download4.operacdn.com/pub/opera/desktop/68.0.3618.173/linux/opera-stable_68.0.3618.173_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=807ea2165349f373f6c075a66ed12235
diff --git a/metadata/md5-cache/www-client/opera-69.0.3686.36 b/metadata/md5-cache/www-client/opera-69.0.3686.36
new file mode 100644
index 000000000000..1ff641f6fd5e
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-69.0.3686.36
@@ -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_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 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/69.0.3686.36/linux/opera-stable_69.0.3686.36_amd64.deb https://download2.operacdn.com/pub/opera/desktop/69.0.3686.36/linux/opera-stable_69.0.3686.36_amd64.deb https://download3.operacdn.com/pub/opera/desktop/69.0.3686.36/linux/opera-stable_69.0.3686.36_amd64.deb https://download4.operacdn.com/pub/opera/desktop/69.0.3686.36/linux/opera-stable_69.0.3686.36_amd64.deb
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=807ea2165349f373f6c075a66ed12235
diff --git a/metadata/md5-cache/www-client/opera-beta-69.0.3686.12 b/metadata/md5-cache/www-client/opera-beta-69.0.3686.12
deleted file mode 100644
index dc655b41eee9..000000000000
--- a/metadata/md5-cache/www-client/opera-beta-69.0.3686.12
+++ /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/69.0.3686.12/linux/opera-beta_69.0.3686.12_amd64.deb https://download2.operacdn.com/pub/opera-beta/69.0.3686.12/linux/opera-beta_69.0.3686.12_amd64.deb https://download3.operacdn.com/pub/opera-beta/69.0.3686.12/linux/opera-beta_69.0.3686.12_amd64.deb https://download4.operacdn.com/pub/opera-beta/69.0.3686.12/linux/opera-beta_69.0.3686.12_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0b9146bb7876262cb23b575125f532c8
diff --git a/metadata/md5-cache/www-client/opera-beta-69.0.3686.21 b/metadata/md5-cache/www-client/opera-beta-69.0.3686.21
deleted file mode 100644
index fea2287b2c47..000000000000
--- a/metadata/md5-cache/www-client/opera-beta-69.0.3686.21
+++ /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/69.0.3686.21/linux/opera-beta_69.0.3686.21_amd64.deb https://download2.operacdn.com/pub/opera-beta/69.0.3686.21/linux/opera-beta_69.0.3686.21_amd64.deb https://download3.operacdn.com/pub/opera-beta/69.0.3686.21/linux/opera-beta_69.0.3686.21_amd64.deb https://download4.operacdn.com/pub/opera-beta/69.0.3686.21/linux/opera-beta_69.0.3686.21_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0b9146bb7876262cb23b575125f532c8
diff --git a/metadata/md5-cache/www-client/opera-beta-69.0.3686.30 b/metadata/md5-cache/www-client/opera-beta-69.0.3686.30
index 537cfa00bfcb..39c080d6f5d0 100644
--- a/metadata/md5-cache/www-client/opera-beta-69.0.3686.30
+++ b/metadata/md5-cache/www-client/opera-beta-69.0.3686.30
@@ -8,5 +8,5 @@ LICENSE=OPERA-2014
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
 SLOT=0
 SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-beta/69.0.3686.30/linux/opera-beta_69.0.3686.30_amd64.deb https://download2.operacdn.com/pub/opera-beta/69.0.3686.30/linux/opera-beta_69.0.3686.30_amd64.deb https://download3.operacdn.com/pub/opera-beta/69.0.3686.30/linux/opera-beta_69.0.3686.30_amd64.deb https://download4.operacdn.com/pub/opera-beta/69.0.3686.30/linux/opera-beta_69.0.3686.30_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0b9146bb7876262cb23b575125f532c8
diff --git a/metadata/md5-cache/www-client/opera-beta-69.0.3686.7 b/metadata/md5-cache/www-client/opera-beta-69.0.3686.7
deleted file mode 100644
index b73a80b8c69f..000000000000
--- a/metadata/md5-cache/www-client/opera-beta-69.0.3686.7
+++ /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/69.0.3686.7/linux/opera-beta_69.0.3686.7_amd64.deb https://download2.operacdn.com/pub/opera-beta/69.0.3686.7/linux/opera-beta_69.0.3686.7_amd64.deb https://download3.operacdn.com/pub/opera-beta/69.0.3686.7/linux/opera-beta_69.0.3686.7_amd64.deb https://download4.operacdn.com/pub/opera-beta/69.0.3686.7/linux/opera-beta_69.0.3686.7_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0b9146bb7876262cb23b575125f532c8
diff --git a/metadata/md5-cache/www-client/opera-developer-70.0.3693.0 b/metadata/md5-cache/www-client/opera-developer-70.0.3693.0
deleted file mode 100644
index a92672c137fa..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-70.0.3693.0
+++ /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-developer/70.0.3693.0/linux/opera-developer_70.0.3693.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/70.0.3693.0/linux/opera-developer_70.0.3693.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/70.0.3693.0/linux/opera-developer_70.0.3693.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/70.0.3693.0/linux/opera-developer_70.0.3693.0_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f66378bbc5e882db180d17a7b964b18b
diff --git a/metadata/md5-cache/www-client/opera-developer-70.0.3701.0 b/metadata/md5-cache/www-client/opera-developer-70.0.3701.0
deleted file mode 100644
index 7b13dbe83a03..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-70.0.3701.0
+++ /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-developer/70.0.3701.0/linux/opera-developer_70.0.3701.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/70.0.3701.0/linux/opera-developer_70.0.3701.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/70.0.3701.0/linux/opera-developer_70.0.3701.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/70.0.3701.0/linux/opera-developer_70.0.3701.0_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f66378bbc5e882db180d17a7b964b18b
diff --git a/metadata/md5-cache/www-client/opera-developer-70.0.3707.0 b/metadata/md5-cache/www-client/opera-developer-70.0.3707.0
deleted file mode 100644
index 210434938ce0..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-70.0.3707.0
+++ /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-developer/70.0.3707.0/linux/opera-developer_70.0.3707.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/70.0.3707.0/linux/opera-developer_70.0.3707.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/70.0.3707.0/linux/opera-developer_70.0.3707.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/70.0.3707.0/linux/opera-developer_70.0.3707.0_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f66378bbc5e882db180d17a7b964b18b
diff --git a/metadata/md5-cache/www-client/opera-developer-70.0.3714.0 b/metadata/md5-cache/www-client/opera-developer-70.0.3714.0
deleted file mode 100644
index 88a7903b2cbe..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-70.0.3714.0
+++ /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-developer/70.0.3714.0/linux/opera-developer_70.0.3714.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/70.0.3714.0/linux/opera-developer_70.0.3714.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/70.0.3714.0/linux/opera-developer_70.0.3714.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/70.0.3714.0/linux/opera-developer_70.0.3714.0_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f66378bbc5e882db180d17a7b964b18b
diff --git a/metadata/md5-cache/www-client/opera-developer-70.0.3721.0 b/metadata/md5-cache/www-client/opera-developer-70.0.3721.0
index f7f18c2f4469..9c1f1aabea77 100644
--- a/metadata/md5-cache/www-client/opera-developer-70.0.3721.0
+++ b/metadata/md5-cache/www-client/opera-developer-70.0.3721.0
@@ -8,5 +8,5 @@ LICENSE=OPERA-2014
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
 SLOT=0
 SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-developer/70.0.3721.0/linux/opera-developer_70.0.3721.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/70.0.3721.0/linux/opera-developer_70.0.3721.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/70.0.3721.0/linux/opera-developer_70.0.3721.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/70.0.3721.0/linux/opera-developer_70.0.3721.0_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f66378bbc5e882db180d17a7b964b18b
diff --git a/metadata/md5-cache/www-client/opera-developer-70.0.3728.0 b/metadata/md5-cache/www-client/opera-developer-70.0.3728.0
new file mode 100644
index 000000000000..07b870fc569e
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-developer-70.0.3728.0
@@ -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-developer/70.0.3728.0/linux/opera-developer_70.0.3728.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/70.0.3728.0/linux/opera-developer_70.0.3728.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/70.0.3728.0/linux/opera-developer_70.0.3728.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/70.0.3728.0/linux/opera-developer_70.0.3728.0_amd64.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f66378bbc5e882db180d17a7b964b18b
diff --git a/metadata/md5-cache/www-client/vivaldi-3.1.1929.34_p1 b/metadata/md5-cache/www-client/vivaldi-3.1.1929.34_p1
deleted file mode 100644
index 7af51cff0f3c..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-3.1.1929.34_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/stable/vivaldi-stable_3.1.1929.34-1_amd64.deb -> vivaldi-3.1.1929.34_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.1.1929.34-1_arm64.deb -> vivaldi-3.1.1929.34_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.1.1929.34-1_armhf.deb -> vivaldi-3.1.1929.34_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.1.1929.34-1_i386.deb -> vivaldi-3.1.1929.34_p1-i386.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=73a663b7d29ffe75f41cddd168c25245
diff --git a/metadata/md5-cache/www-client/vivaldi-3.1.1929.40_p1 b/metadata/md5-cache/www-client/vivaldi-3.1.1929.40_p1
deleted file mode 100644
index 823129f24f56..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-3.1.1929.40_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/stable/vivaldi-stable_3.1.1929.40-1_amd64.deb -> vivaldi-3.1.1929.40_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.1.1929.40-1_arm64.deb -> vivaldi-3.1.1929.40_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.1.1929.40-1_armhf.deb -> vivaldi-3.1.1929.40_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.1.1929.40-1_i386.deb -> vivaldi-3.1.1929.40_p1-i386.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f144b1e6c9d6c200c4aa9ca786faefff
diff --git a/metadata/md5-cache/www-client/vivaldi-3.1.1929.45_p1 b/metadata/md5-cache/www-client/vivaldi-3.1.1929.45_p1
new file mode 100644
index 000000000000..e4124ab62d4d
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-3.1.1929.45_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/stable/vivaldi-stable_3.1.1929.45-1_amd64.deb -> vivaldi-3.1.1929.45_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.1.1929.45-1_arm64.deb -> vivaldi-3.1.1929.45_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.1.1929.45-1_armhf.deb -> vivaldi-3.1.1929.45_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.1.1929.45-1_i386.deb -> vivaldi-3.1.1929.45_p1-i386.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=73a663b7d29ffe75f41cddd168c25245
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-3.2.1950.3_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-3.2.1950.3_p1
index 39514f749f4b..9a0b7d886447 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-3.2.1950.3_p1
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-3.2.1950.3_p1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/als
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.2.1950.3-1_amd64.deb -> vivaldi-snapshot-3.2.1950.3_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.2.1950.3-1_arm64.deb -> vivaldi-snapshot-3.2.1950.3_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.2.1950.3-1_armhf.deb -> vivaldi-snapshot-3.2.1950.3_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.2.1950.3-1_i386.deb -> vivaldi-snapshot-3.2.1950.3_p1-i386.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8ef3b4bd883acc7a7dbc0824c73ebbbf
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-3.2.1952.3_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-3.2.1952.3_p1
index 8d5bb9221022..1aaa5f9a75b3 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-3.2.1952.3_p1
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-3.2.1952.3_p1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/als
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.2.1952.3-1_amd64.deb -> vivaldi-snapshot-3.2.1952.3_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.2.1952.3-1_arm64.deb -> vivaldi-snapshot-3.2.1952.3_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.2.1952.3-1_armhf.deb -> vivaldi-snapshot-3.2.1952.3_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.2.1952.3-1_i386.deb -> vivaldi-snapshot-3.2.1952.3_p1-i386.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8ef3b4bd883acc7a7dbc0824c73ebbbf
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-3.2.1957.9_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-3.2.1957.9_p1
new file mode 100644
index 000000000000..7cb4e15ceae2
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-3.2.1957.9_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_3.2.1957.9-1_amd64.deb -> vivaldi-snapshot-3.2.1957.9_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.2.1957.9-1_arm64.deb -> vivaldi-snapshot-3.2.1957.9_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.2.1957.9-1_armhf.deb -> vivaldi-snapshot-3.2.1957.9_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.2.1957.9-1_i386.deb -> vivaldi-snapshot-3.2.1957.9_p1-i386.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8ef3b4bd883acc7a7dbc0824c73ebbbf
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-3.2.1959.3_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-3.2.1959.3_p1
new file mode 100644
index 000000000000..4733cbcc051c
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-3.2.1959.3_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_3.2.1959.3-1_amd64.deb -> vivaldi-snapshot-3.2.1959.3_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.2.1959.3-1_arm64.deb -> vivaldi-snapshot-3.2.1959.3_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.2.1959.3-1_armhf.deb -> vivaldi-snapshot-3.2.1959.3_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.2.1959.3-1_i386.deb -> vivaldi-snapshot-3.2.1959.3_p1-i386.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8ef3b4bd883acc7a7dbc0824c73ebbbf
diff --git a/metadata/md5-cache/www-client/w3mmee-0.3.2_p24-r12 b/metadata/md5-cache/www-client/w3mmee-0.3.2_p24-r12
index 964a11a900e8..999179843094 100644
--- a/metadata/md5-cache/www-client/w3mmee-0.3.2_p24-r12
+++ b/metadata/md5-cache/www-client/w3mmee-0.3.2_p24-r12
@@ -4,10 +4,10 @@ DESCRIPTION=A variant of w3m with support for multiple character encodings
 EAPI=7
 HOMEPAGE=http://pub.ks-and-ks.ne.jp/prog/w3mmee/
 IUSE=gpm libressl nls ssl
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=w3m
 RDEPEND=>=dev-libs/boehm-gc-7.2 dev-libs/libmoe dev-lang/perl sys-libs/ncurses:0= sys-libs/zlib gpm? ( sys-libs/gpm ) nls? ( sys-devel/gettext ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=http://pub.ks-and-ks.ne.jp/prog/pub/w3mmee-p24-23.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=089ce357b1fa2db48004f476bc0407ae
+_md5_=e9eb7d672496deafdfbaf6a409019e12
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 53099c76a75c..aaec39e202db 100644
--- a/metadata/md5-cache/www-plugins/Manifest.gz
+++ b/metadata/md5-cache/www-plugins/Manifest.gz
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-83.0.4103.106 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-83.0.4103.106
deleted file mode 100644
index be05a9f302d9..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-83.0.4103.106
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-KEYWORDS=-* amd64
-LICENSE=google-chrome
-RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:unstable
-RESTRICT=bindist mirror strip
-SLOT=stable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_83.0.4103.106-1_amd64.deb
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34
-_md5_=7f234fc06525712a546b072b4c50509f
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-83.0.4103.116 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-83.0.4103.116
new file mode 100644
index 000000000000..ac8d43ae7146
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-83.0.4103.116
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+KEYWORDS=-* amd64
+LICENSE=google-chrome
+RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:unstable
+RESTRICT=bindist mirror strip
+SLOT=stable
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_83.0.4103.116-1_amd64.deb
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_md5_=7f234fc06525712a546b072b4c50509f
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-84.0.4147.45_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-84.0.4147.45_beta
deleted file mode 100644
index 95367b01afd1..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-84.0.4147.45_beta
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
-RESTRICT=bindist mirror strip
-SLOT=beta
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_84.0.4147.45-1_amd64.deb
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34
-_md5_=fa4ad51e7a151139019e9e894db010f1
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-84.0.4147.68_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-84.0.4147.68_beta
new file mode 100644
index 000000000000..26639d9b49bb
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-84.0.4147.68_beta
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
+RESTRICT=bindist mirror strip
+SLOT=beta
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_84.0.4147.68-1_amd64.deb
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_md5_=fa4ad51e7a151139019e9e894db010f1
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-85.0.4168.2_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-85.0.4168.2_alpha
deleted file mode 100644
index 471d7386d3ba..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-85.0.4168.2_alpha
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
-RESTRICT=bindist mirror strip
-SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_85.0.4168.2-1_amd64.deb
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34
-_md5_=fa4ad51e7a151139019e9e894db010f1
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-85.0.4181.8_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-85.0.4181.8_alpha
new file mode 100644
index 000000000000..e6ab420dfef9
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-85.0.4181.8_alpha
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
+RESTRICT=bindist mirror strip
+SLOT=unstable
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_85.0.4181.8-1_amd64.deb
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_md5_=fa4ad51e7a151139019e9e894db010f1
diff --git a/metadata/md5-cache/www-plugins/google-talkplugin-5.41.0.0 b/metadata/md5-cache/www-plugins/google-talkplugin-5.41.0.0
index ac17e480ff73..03cfec5f09bf 100644
--- a/metadata/md5-cache/www-plugins/google-talkplugin-5.41.0.0
+++ b/metadata/md5-cache/www-plugins/google-talkplugin-5.41.0.0
@@ -10,5 +10,5 @@ RDEPEND=|| ( media-sound/pulseaudio media-libs/alsa-lib ) dev-libs/expat dev-lib
 RESTRICT=bindist fetch strip
 SLOT=0
 SRC_URI=x86? ( https://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin/google-talkplugin_5.41.0.0-1_i386.deb ) amd64? ( https://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin/google-talkplugin_5.41.0.0-1_amd64.deb )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	mozextension	798d8c84c9e7a8105e56c9eb6626e643	multilib	2477ebe553d3e4d2c606191fe6c33602	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	mozextension	798d8c84c9e7a8105e56c9eb6626e643	multilib	2477ebe553d3e4d2c606191fe6c33602	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=2c61e6e1daedf68606ecc28b97b93f99
diff --git a/metadata/md5-cache/www-plugins/google-talkplugin-5.41.3.0 b/metadata/md5-cache/www-plugins/google-talkplugin-5.41.3.0
index 162ad34e9030..ce1fe6e2cdc2 100644
--- a/metadata/md5-cache/www-plugins/google-talkplugin-5.41.3.0
+++ b/metadata/md5-cache/www-plugins/google-talkplugin-5.41.3.0
@@ -10,5 +10,5 @@ RDEPEND=|| ( media-sound/pulseaudio media-libs/alsa-lib ) dev-libs/expat dev-lib
 RESTRICT=bindist strip mirror
 SLOT=0
 SRC_URI=x86? ( https://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin/google-talkplugin_5.41.3.0-1_i386.deb ) amd64? ( https://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin/google-talkplugin_5.41.3.0-1_amd64.deb )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	mozextension	798d8c84c9e7a8105e56c9eb6626e643	multilib	2477ebe553d3e4d2c606191fe6c33602	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	mozextension	798d8c84c9e7a8105e56c9eb6626e643	multilib	2477ebe553d3e4d2c606191fe6c33602	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=e7650a1419905736f7dad060f2952abf
diff --git a/metadata/md5-cache/www-plugins/google-talkplugin-9999 b/metadata/md5-cache/www-plugins/google-talkplugin-9999
index 1fe782420b24..6c555104271f 100644
--- a/metadata/md5-cache/www-plugins/google-talkplugin-9999
+++ b/metadata/md5-cache/www-plugins/google-talkplugin-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=|| ( media-sound/pulseaudio media-libs/alsa-lib ) dev-libs/expat dev-libs/glib:2 sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender x11-libs/pango sys-apps/lsb-release selinux? ( sec-policy/selinux-googletalk ) libnotify? ( x11-libs/libnotify )
 RESTRICT=bindist strip mirror
 SLOT=0
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	mozextension	798d8c84c9e7a8105e56c9eb6626e643	multilib	2477ebe553d3e4d2c606191fe6c33602	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	mozextension	798d8c84c9e7a8105e56c9eb6626e643	multilib	2477ebe553d3e4d2c606191fe6c33602	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=2aba46be3a00ffde86e50e2cfc9ab7a3
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 48882619883b..c39e81952e81 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.43 b/metadata/md5-cache/www-servers/apache-2.4.43
index 358c0b4529a8..69884f3d711e 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.43
+++ b/metadata/md5-cache/www-servers/apache-2.4.43
@@ -4,7 +4,7 @@ DESCRIPTION=The Apache Web Server
 EAPI=6
 HOMEPAGE=https://httpd.apache.org/
 IUSE=+suexec-caps suexec-syslog split-usr ssl debug doc gdbm ldap libressl selinux ssl static suexec threads apache2_modules_access_compat apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_auth_form apache2_modules_authn_alias apache2_modules_authn_anon apache2_modules_authn_core apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_file apache2_modules_authn_socache apache2_modules_authz_core apache2_modules_authz_dbd apache2_modules_authz_dbm apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_brotli apache2_modules_cache apache2_modules_cache_disk apache2_modules_cache_socache apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers apache2_modules_http2 apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_lbmethod_byrequests apache2_modules_lbmethod_bytraffic apache2_modules_lbmethod_bybusyness apache2_modules_lbmethod_heartbeat apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_macro apache2_modules_md apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_html apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_proxy_http2 apache2_modules_proxy_fcgi apache2_modules_proxy_wstunnel apache2_modules_rewrite apache2_modules_ratelimit apache2_modules_remoteip apache2_modules_reqtimeout apache2_modules_session apache2_modules_session_cookie apache2_modules_session_crypto apache2_modules_session_dbd apache2_modules_setenvif apache2_modules_slotmem_shm apache2_modules_speling apache2_modules_socache_shmcb apache2_modules_status apache2_modules_substitute apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_unixd apache2_modules_version apache2_modules_vhost_alias apache2_modules_watchdog apache2_modules_xml2enc apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
-KEYWORDS=~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0 Apache-1.1
 PDEPEND=~app-admin/apache-tools-2.4.43
 RDEPEND=apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 ) apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) apache2_modules_session_crypto? ( libressl? ( dev-libs/apr-util[libressl] ) !libressl? ( dev-libs/apr-util[openssl] ) ) >=dev-libs/apr-1.5.1:= !www-apache/mod_macro dev-lang/perl =dev-libs/apr-util-1*:=[gdbm=,ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:0= ) ) !=www-servers/apache-1* selinux? ( sec-policy/selinux-apache ) virtual/tmpfiles
@@ -12,4 +12,4 @@ REQUIRED_USE=apache2_modules_http2? ( ssl ) apache2_modules_md? ( ssl ) apache2_
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.43.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.39-20190402.tar.bz2
 _eclasses_=apache-2	20ad1434bfafa6a0c06f7898cf4059ef	autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4e04c0d61e3eccfa27641160eedec3ec
+_md5_=431068e803a3bca8b7b913d7cd61f171
diff --git a/metadata/md5-cache/www-servers/caddy-2.0.0 b/metadata/md5-cache/www-servers/caddy-2.0.0
new file mode 100644
index 000000000000..12adce8f08e4
--- /dev/null
+++ b/metadata/md5-cache/www-servers/caddy-2.0.0
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Fast, cross-platform HTTP/2 web server with automatic HTTPS
+EAPI=7
+HOMEPAGE=https://caddyserver.com
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/caddyserver/caddy/archive/v2.0.0.tar.gz -> caddy-2.0.0.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.31.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.31.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.37.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.37.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.51.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.51.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//contrib.go.opencensus.io/exporter/ocagent/@v/v0.4.12.zip -> contrib.go.opencensus.io%2Fexporter%2Focagent%2F@v%2Fv0.4.12.zip mirror://goproxy//contrib.go.opencensus.io/exporter/ocagent/@v/v0.4.12.mod -> contrib.go.opencensus.io%2Fexporter%2Focagent%2F@v%2Fv0.4.12.mod mirror://goproxy//contrib.go.opencensus.io/exporter/stackdriver/@v/v0.12.1.mod -> contrib.go.opencensus.io%2Fexporter%2Fstackdriver%2F@v%2Fv0.12.1.mod mirror://goproxy//contrib.go.opencensus.io/resource/@v/v0.1.1.mod -> contrib.go.opencensus.io%2Fresource%2F@v%2Fv0.1.1.mod mirror://goproxy//dmitri.shuralyov.com/app/changes/@v/v0.0.0-20180602232624-0a106ad413e3.mod -> dmitri.shuralyov.com%2Fapp%2Fchanges%2F@v%2Fv0.0.0-20180602232624-0a106ad413e3.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//dmitri.shuralyov.com/html/belt/@v/v0.0.0-20180602232347-f7d459c86be0.mod -> dmitri.shuralyov.com%2Fhtml%2Fbelt%2F@v%2Fv0.0.0-20180602232347-f7d459c86be0.mod mirror://goproxy//dmitri.shuralyov.com/service/change/@v/v0.0.0-20181023043359-a85b471d5412.mod -> dmitri.shuralyov.com%2Fservice%2Fchange%2F@v%2Fv0.0.0-20181023043359-a85b471d5412.mod mirror://goproxy//dmitri.shuralyov.com/state/@v/v0.0.0-20180228185332-28bcc343414c.mod -> dmitri.shuralyov.com%2Fstate%2F@v%2Fv0.0.0-20180228185332-28bcc343414c.mod mirror://goproxy//git.apache.org/thrift.git/@v/v0.0.0-20180902110319-2566ecd5d999.mod -> git.apache.org%2Fthrift.git%2F@v%2Fv0.0.0-20180902110319-2566ecd5d999.mod mirror://goproxy//github.com/!andreas!briese/bbloom/@v/v0.0.0-20190306092124-e2d15f34fcf9.zip -> github.com%2F!andreas!briese%2Fbbloom%2F@v%2Fv0.0.0-20190306092124-e2d15f34fcf9.zip mirror://goproxy//github.com/!andreas!briese/bbloom/@v/v0.0.0-20190306092124-e2d15f34fcf9.mod -> github.com%2F!andreas!briese%2Fbbloom%2F@v%2Fv0.0.0-20190306092124-e2d15f34fcf9.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v32.4.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv32.4.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v32.4.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv32.4.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!geert!johan/go.incremental/@v/v1.0.0.mod -> github.com%2F!geert!johan%2Fgo.incremental%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!geert!johan/go.rice/@v/v1.0.0.mod -> github.com%2F!geert!johan%2Fgo.rice%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!masterminds/glide/@v/v0.13.2.mod -> github.com%2F!masterminds%2Fglide%2F@v%2Fv0.13.2.mod mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.0.zip -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.0.mod -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.4.2.zip -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/!masterminds/semver/@v/v1.4.2.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.0.1.zip -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.1.zip mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.0.1.mod -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.1.mod mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.0.3.zip -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.zip mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.0.3.mod -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.mod mirror://goproxy//github.com/!masterminds/sprig/v3/@v/v3.0.0.zip -> github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//github.com/!masterminds/sprig/v3/@v/v3.0.0.mod -> github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/!masterminds/sprig/v3/@v/v3.0.2.zip -> github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.0.2.zip mirror://goproxy//github.com/!masterminds/sprig/v3/@v/v3.0.2.mod -> github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//github.com/!masterminds/vcs/@v/v1.13.0.mod -> github.com%2F!masterminds%2Fvcs%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.14.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!open!d!n!s/vegadns2client/@v/v0.0.0-20180418235048-a3fa4a771d87.zip -> github.com%2F!open!d!n!s%2Fvegadns2client%2F@v%2Fv0.0.0-20180418235048-a3fa4a771d87.zip mirror://goproxy//github.com/!open!d!n!s/vegadns2client/@v/v0.0.0-20180418235048-a3fa4a771d87.mod -> github.com%2F!open!d!n!s%2Fvegadns2client%2F@v%2Fv0.0.0-20180418235048-a3fa4a771d87.mod mirror://goproxy//github.com/!open!pee!dee!p/depguard/@v/v1.0.0.mod -> github.com%2F!open!pee!dee!p%2Fdepguard%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!open!pee!dee!p/depguard/@v/v1.0.1.mod -> github.com%2F!open!pee!dee!p%2Fdepguard%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/!shopify/sarama/@v/v1.19.0.mod -> github.com%2F!shopify%2Fsarama%2F@v%2Fv1.19.0.mod mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.mod -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod mirror://goproxy//github.com/!thomas!rooney/gexpect/@v/v0.0.0-20161231170123-5482f0350944.mod -> github.com%2F!thomas!rooney%2Fgexpect%2F@v%2Fv0.0.0-20161231170123-5482f0350944.mod mirror://goproxy//github.com/akamai/!akamai!o!p!e!n-edgegrid-golang/@v/v0.9.0.mod -> github.com%2Fakamai%2F!akamai!o!p!e!n-edgegrid-golang%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/akamai/!akamai!o!p!e!n-edgegrid-golang/@v/v0.9.8.zip -> github.com%2Fakamai%2F!akamai!o!p!e!n-edgegrid-golang%2F@v%2Fv0.9.8.zip mirror://goproxy//github.com/akamai/!akamai!o!p!e!n-edgegrid-golang/@v/v0.9.8.mod -> github.com%2Fakamai%2F!akamai!o!p!e!n-edgegrid-golang%2F@v%2Fv0.9.8.mod mirror://goproxy//github.com/akavel/rsrc/@v/v0.8.0.mod -> github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/alangpierce/go-forceexport/@v/v0.0.0-20160317203124-8f1d6941cd75.zip -> github.com%2Falangpierce%2Fgo-forceexport%2F@v%2Fv0.0.0-20160317203124-8f1d6941cd75.zip mirror://goproxy//github.com/alangpierce/go-forceexport/@v/v0.0.0-20160317203124-8f1d6941cd75.mod -> github.com%2Falangpierce%2Fgo-forceexport%2F@v%2Fv0.0.0-20160317203124-8f1d6941cd75.mod mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.zip -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.zip mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.mod -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.2-0.20200305040604-4f3623dce67a.zip -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.2-0.20200305040604-4f3623dce67a.zip mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.2-0.20200305040604-4f3623dce67a.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.2-0.20200305040604-4f3623dce67a.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.2.zip -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.2.zip mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.2.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.2.mod mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.zip -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.zip mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.mod -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.1.17-0.20190424132513-439c674f7ae0.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.1.17-0.20190424132513-439c674f7ae0.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.1-0.20190708041108-0548c6b1afae.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.1-0.20190708041108-0548c6b1afae.mod mirror://goproxy//github.com/alecthomas/kong-hcl/@v/v0.1.8-0.20190615233001-b21fea9723c8.mod -> github.com%2Falecthomas%2Fkong-hcl%2F@v%2Fv0.1.8-0.20190615233001-b21fea9723c8.mod mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.zip -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.zip mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.mod -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/aliyun/alibaba-cloud-sdk-go/@v/v0.0.0-20190808125512-07798873deee.zip -> github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190808125512-07798873deee.zip mirror://goproxy//github.com/aliyun/alibaba-cloud-sdk-go/@v/v0.0.0-20190808125512-07798873deee.mod -> github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190808125512-07798873deee.mod mirror://goproxy//github.com/aliyun/alibaba-cloud-sdk-go/@v/v1.61.112.zip -> github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv1.61.112.zip mirror://goproxy//github.com/aliyun/alibaba-cloud-sdk-go/@v/v1.61.112.mod -> github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv1.61.112.mod mirror://goproxy//github.com/aliyun/aliyun-oss-go-sdk/@v/v0.0.0-20190307165228-86c17b95fcd5.mod -> github.com%2Faliyun%2Faliyun-oss-go-sdk%2F@v%2Fv0.0.0-20190307165228-86c17b95fcd5.mod mirror://goproxy//github.com/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.mod -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod mirror://goproxy//github.com/antihax/optional/@v/v0.0.0-20180407024304-ca021399b1a6.mod -> github.com%2Fantihax%2Foptional%2F@v%2Fv0.0.0-20180407024304-ca021399b1a6.mod mirror://goproxy//github.com/antlr/antlr4/@v/v0.0.0-20190819145818-b43a4c3a8015.zip -> github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20190819145818-b43a4c3a8015.zip mirror://goproxy//github.com/antlr/antlr4/@v/v0.0.0-20190819145818-b43a4c3a8015.mod -> github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20190819145818-b43a4c3a8015.mod mirror://goproxy//github.com/apache/thrift/@v/v0.12.0.mod -> github.com%2Fapache%2Fthrift%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/aryann/difflib/@v/v0.0.0-20170710044230-e206f873d14a.zip -> github.com%2Faryann%2Fdifflib%2F@v%2Fv0.0.0-20170710044230-e206f873d14a.zip mirror://goproxy//github.com/aryann/difflib/@v/v0.0.0-20170710044230-e206f873d14a.mod -> github.com%2Faryann%2Fdifflib%2F@v%2Fv0.0.0-20170710044230-e206f873d14a.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20180720115003-f9ffefc3facf.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.19.18.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.19.18.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.23.0.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.23.0.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.23.0.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.23.0.mod mirror://goproxy//github.com/baiyubin/aliyun-sts-go-sdk/@v/v0.0.0-20180326062324-cfa1a18b161f.mod -> github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bombsimon/wsl/v2/@v/v2.0.0.mod -> github.com%2Fbombsimon%2Fwsl%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/boombuler/barcode/@v/v1.0.0.mod -> github.com%2Fboombuler%2Fbarcode%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/bradfitz/go-smtpd/@v/v0.0.0-20170404230938-deb6d6237625.mod -> github.com%2Fbradfitz%2Fgo-smtpd%2F@v%2Fv0.0.0-20170404230938-deb6d6237625.mod mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20181115193947-bf1c66bbce23.mod -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20181115193947-bf1c66bbce23.mod mirror://goproxy//github.com/caddyserver/certmagic/@v/v0.10.12.zip -> github.com%2Fcaddyserver%2Fcertmagic%2F@v%2Fv0.10.12.zip mirror://goproxy//github.com/caddyserver/certmagic/@v/v0.10.12.mod -> github.com%2Fcaddyserver%2Fcertmagic%2F@v%2Fv0.10.12.mod mirror://goproxy//github.com/cenkalti/backoff/v4/@v/v4.0.0.zip -> github.com%2Fcenkalti%2Fbackoff%2Fv4%2F@v%2Fv4.0.0.zip mirror://goproxy//github.com/cenkalti/backoff/v4/@v/v4.0.0.mod -> github.com%2Fcenkalti%2Fbackoff%2Fv4%2F@v%2Fv4.0.0.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.0.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.zip -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/cheekybits/genny/@v/v1.0.0.zip -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/cheekybits/genny/@v/v1.0.0.mod -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.zip -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.zip -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.zip mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.zip -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.zip mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cloudflare/cloudflare-go/@v/v0.10.2.zip -> github.com%2Fcloudflare%2Fcloudflare-go%2F@v%2Fv0.10.2.zip mirror://goproxy//github.com/cloudflare/cloudflare-go/@v/v0.10.2.mod -> github.com%2Fcloudflare%2Fcloudflare-go%2F@v%2Fv0.10.2.mod mirror://goproxy//github.com/codegangsta/cli/@v/v1.20.0.mod -> github.com%2Fcodegangsta%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.3.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.18+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.18+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20181012123002-c6f51f82210d.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/corpix/uarand/@v/v0.1.1.mod -> github.com%2Fcorpix%2Fuarand%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/cpu/goacmedns/@v/v0.0.1.mod -> github.com%2Fcpu%2Fgoacmedns%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/cpu/goacmedns/@v/v0.0.2.zip -> github.com%2Fcpu%2Fgoacmedns%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/cpu/goacmedns/@v/v0.0.2.mod -> github.com%2Fcpu%2Fgoacmedns%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.zip mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/daaku/go.zipexe/@v/v1.0.0.mod -> github.com%2Fdaaku%2Fgo.zipexe%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.zip -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.zip mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.mod -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgraph-io/badger/@v/v1.5.3.zip -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.5.3.zip mirror://goproxy//github.com/dgraph-io/badger/@v/v1.5.3.mod -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.5.3.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190423205320-6a90982ecee2.zip -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.zip mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190423205320-6a90982ecee2.mod -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.6.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.6.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.6.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.2.0.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.2.0.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v0.0.0-20180814043457-aafff18a5cc2.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv0.0.0-20180814043457-aafff18a5cc2.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v0.0.0-20180814043457-aafff18a5cc2.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv0.0.0-20180814043457-aafff18a5cc2.mod mirror://goproxy//github.com/dnsimple/dnsimple-go/@v/v0.30.0.zip -> github.com%2Fdnsimple%2Fdnsimple-go%2F@v%2Fv0.30.0.zip mirror://goproxy//github.com/dnsimple/dnsimple-go/@v/v0.30.0.mod -> github.com%2Fdnsimple%2Fdnsimple-go%2F@v%2Fv0.30.0.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.1-0.20200219035652-afde56e7acac.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.1-0.20200219035652-afde56e7acac.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.1-0.20200219035652-afde56e7acac.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.1-0.20200219035652-afde56e7acac.mod mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.1.0.mod -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.mod -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.mod -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/exoscale/egoscale/@v/v0.18.1.zip -> github.com%2Fexoscale%2Fegoscale%2F@v%2Fv0.18.1.zip mirror://goproxy//github.com/exoscale/egoscale/@v/v0.18.1.mod -> github.com%2Fexoscale%2Fegoscale%2F@v%2Fv0.18.1.mod mirror://goproxy//github.com/fatih/color/@v/v1.6.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.8.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.zip -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/francoispqt/gojay/@v/v1.2.13.zip -> github.com%2Ffrancoispqt%2Fgojay%2F@v%2Fv1.2.13.zip mirror://goproxy//github.com/francoispqt/gojay/@v/v1.2.13.mod -> github.com%2Ffrancoispqt%2Fgojay%2F@v%2Fv1.2.13.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.1.1.mod -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/go-acme/lego/v3/@v/v3.4.0.zip -> github.com%2Fgo-acme%2Flego%2Fv3%2F@v%2Fv3.4.0.zip mirror://goproxy//github.com/go-acme/lego/v3/@v/v3.4.0.mod -> github.com%2Fgo-acme%2Flego%2Fv3%2F@v%2Fv3.4.0.mod mirror://goproxy//github.com/go-acme/lego/v3/@v/v3.6.0.zip -> github.com%2Fgo-acme%2Flego%2Fv3%2F@v%2Fv3.6.0.zip mirror://goproxy//github.com/go-acme/lego/v3/@v/v3.6.0.mod -> github.com%2Fgo-acme%2Flego%2Fv3%2F@v%2Fv3.6.0.mod mirror://goproxy//github.com/go-chi/chi/@v/v4.0.2+incompatible.mod -> github.com%2Fgo-chi%2Fchi%2F@v%2Fv4.0.2+incompatible.mod mirror://goproxy//github.com/go-cmd/cmd/@v/v1.0.5.mod -> github.com%2Fgo-cmd%2Fcmd%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/go-critic/go-critic/@v/v0.3.5-0.20190526074819-1df300866540.mod -> github.com%2Fgo-critic%2Fgo-critic%2F@v%2Fv0.3.5-0.20190526074819-1df300866540.mod mirror://goproxy//github.com/go-critic/go-critic/@v/v0.4.0.mod -> github.com%2Fgo-critic%2Fgo-critic%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.zip -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.mod -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.44.0.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.44.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-lintpack/lintpack/@v/v0.5.2.mod -> github.com%2Fgo-lintpack%2Flintpack%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-toolsmith/astcast/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastcast%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/astcopy/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastcopy%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/astequal/@v/v0.0.0-20180903214952-dcb477bfacd6.mod -> github.com%2Fgo-toolsmith%2Fastequal%2F@v%2Fv0.0.0-20180903214952-dcb477bfacd6.mod mirror://goproxy//github.com/go-toolsmith/astequal/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastequal%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/astfmt/@v/v0.0.0-20180903215011-8f8ee99c3086.mod -> github.com%2Fgo-toolsmith%2Fastfmt%2F@v%2Fv0.0.0-20180903215011-8f8ee99c3086.mod mirror://goproxy//github.com/go-toolsmith/astfmt/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastfmt%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/astinfo/@v/v0.0.0-20180906194353-9809ff7efb21.mod -> github.com%2Fgo-toolsmith%2Fastinfo%2F@v%2Fv0.0.0-20180906194353-9809ff7efb21.mod mirror://goproxy//github.com/go-toolsmith/astp/@v/v0.0.0-20180903215135-0af7e3c24f30.mod -> github.com%2Fgo-toolsmith%2Fastp%2F@v%2Fv0.0.0-20180903215135-0af7e3c24f30.mod mirror://goproxy//github.com/go-toolsmith/astp/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastp%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/pkgload/@v/v0.0.0-20181119091011-e9e65178eee8.mod -> github.com%2Fgo-toolsmith%2Fpkgload%2F@v%2Fv0.0.0-20181119091011-e9e65178eee8.mod mirror://goproxy//github.com/go-toolsmith/pkgload/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fpkgload%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/strparse/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fstrparse%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/typep/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Ftypep%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gobwas/glob/@v/v0.2.3.mod -> github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.0.0-20190320160742-5135e617513b.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.0.0-20190320160742-5135e617513b.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.zip -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/goji/httpauth/@v/v0.0.0-20160601135302-2da839ab0f4d.mod -> github.com%2Fgoji%2Fhttpauth%2F@v%2Fv0.0.0-20160601135302-2da839ab0f4d.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> github.com%2Fgolang%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//github.com/golang/mock/@v/v1.0.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.0-20180518054509-2e65f85255db.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod mirror://goproxy//github.com/golangci/check/@v/v0.0.0-20180506172741-cfe4005ccda2.mod -> github.com%2Fgolangci%2Fcheck%2F@v%2Fv0.0.0-20180506172741-cfe4005ccda2.mod mirror://goproxy//github.com/golangci/dupl/@v/v0.0.0-20180902072040-3e9179ac440a.mod -> github.com%2Fgolangci%2Fdupl%2F@v%2Fv0.0.0-20180902072040-3e9179ac440a.mod mirror://goproxy//github.com/golangci/errcheck/@v/v0.0.0-20181223084120-ef45e06d44b6.mod -> github.com%2Fgolangci%2Ferrcheck%2F@v%2Fv0.0.0-20181223084120-ef45e06d44b6.mod mirror://goproxy//github.com/golangci/go-misc/@v/v0.0.0-20180628070357-927a3d87b613.mod -> github.com%2Fgolangci%2Fgo-misc%2F@v%2Fv0.0.0-20180628070357-927a3d87b613.mod mirror://goproxy//github.com/golangci/go-tools/@v/v0.0.0-20190318055746-e32c54105b7c.mod -> github.com%2Fgolangci%2Fgo-tools%2F@v%2Fv0.0.0-20190318055746-e32c54105b7c.mod mirror://goproxy//github.com/golangci/goconst/@v/v0.0.0-20180610141641-041c5f2b40f3.mod -> github.com%2Fgolangci%2Fgoconst%2F@v%2Fv0.0.0-20180610141641-041c5f2b40f3.mod mirror://goproxy//github.com/golangci/gocyclo/@v/v0.0.0-20180528134321-2becd97e67ee.mod -> github.com%2Fgolangci%2Fgocyclo%2F@v%2Fv0.0.0-20180528134321-2becd97e67ee.mod mirror://goproxy//github.com/golangci/gocyclo/@v/v0.0.0-20180528144436-0a533e8fa43d.mod -> github.com%2Fgolangci%2Fgocyclo%2F@v%2Fv0.0.0-20180528144436-0a533e8fa43d.mod mirror://goproxy//github.com/golangci/gofmt/@v/v0.0.0-20181222123516-0b8337e80d98.mod -> github.com%2Fgolangci%2Fgofmt%2F@v%2Fv0.0.0-20181222123516-0b8337e80d98.mod mirror://goproxy//github.com/golangci/gofmt/@v/v0.0.0-20190930125516-244bba706f1a.mod -> github.com%2Fgolangci%2Fgofmt%2F@v%2Fv0.0.0-20190930125516-244bba706f1a.mod mirror://goproxy//github.com/golangci/golangci-lint/@v/v1.17.2-0.20190910081718-bad04bb7378f.mod -> github.com%2Fgolangci%2Fgolangci-lint%2F@v%2Fv1.17.2-0.20190910081718-bad04bb7378f.mod mirror://goproxy//github.com/golangci/golangci-lint/@v/v1.22.2.mod -> github.com%2Fgolangci%2Fgolangci-lint%2F@v%2Fv1.22.2.mod mirror://goproxy//github.com/golangci/gosec/@v/v0.0.0-20190211064107-66fb7fc33547.mod -> github.com%2Fgolangci%2Fgosec%2F@v%2Fv0.0.0-20190211064107-66fb7fc33547.mod mirror://goproxy//github.com/golangci/ineffassign/@v/v0.0.0-20190609212857-42439a7714cc.mod -> github.com%2Fgolangci%2Fineffassign%2F@v%2Fv0.0.0-20190609212857-42439a7714cc.mod mirror://goproxy//github.com/golangci/lint-1/@v/v0.0.0-20190420132249-ee948d087217.mod -> github.com%2Fgolangci%2Flint-1%2F@v%2Fv0.0.0-20190420132249-ee948d087217.mod mirror://goproxy//github.com/golangci/lint-1/@v/v0.0.0-20191013205115-297bf364a8e0.mod -> github.com%2Fgolangci%2Flint-1%2F@v%2Fv0.0.0-20191013205115-297bf364a8e0.mod mirror://goproxy//github.com/golangci/maligned/@v/v0.0.0-20180506175553-b1d89398deca.mod -> github.com%2Fgolangci%2Fmaligned%2F@v%2Fv0.0.0-20180506175553-b1d89398deca.mod mirror://goproxy//github.com/golangci/misspell/@v/v0.0.0-20180809174111-950f5d19e770.mod -> github.com%2Fgolangci%2Fmisspell%2F@v%2Fv0.0.0-20180809174111-950f5d19e770.mod mirror://goproxy//github.com/golangci/prealloc/@v/v0.0.0-20180630174525-215b22d4de21.mod -> github.com%2Fgolangci%2Fprealloc%2F@v%2Fv0.0.0-20180630174525-215b22d4de21.mod mirror://goproxy//github.com/golangci/revgrep/@v/v0.0.0-20180526074752-d9c87f5ffaf0.mod -> github.com%2Fgolangci%2Frevgrep%2F@v%2Fv0.0.0-20180526074752-d9c87f5ffaf0.mod mirror://goproxy//github.com/golangci/revgrep/@v/v0.0.0-20180812185044-276a5c0a1039.mod -> github.com%2Fgolangci%2Frevgrep%2F@v%2Fv0.0.0-20180812185044-276a5c0a1039.mod mirror://goproxy//github.com/golangci/unconvert/@v/v0.0.0-20180507085042-28b1c447d1f4.mod -> github.com%2Fgolangci%2Funconvert%2F@v%2Fv0.0.0-20180507085042-28b1c447d1f4.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/cel-go/@v/v0.4.1.zip -> github.com%2Fgoogle%2Fcel-go%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/google/cel-go/@v/v0.4.1.mod -> github.com%2Fgoogle%2Fcel-go%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/cel-spec/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fcel-spec%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/certificate-transparency-go/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fcertificate-transparency-go%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.mod -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/monologue/@v/v0.0.0-20190606152607-4b11a32b5934.mod -> github.com%2Fgoogle%2Fmonologue%2F@v%2Fv0.0.0-20190606152607-4b11a32b5934.mod mirror://goproxy//github.com/google/monologue/@v/v0.0.0-20191220140058-35abc9683a6c.mod -> github.com%2Fgoogle%2Fmonologue%2F@v%2Fv0.0.0-20191220140058-35abc9683a6c.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/trillian/@v/v1.2.2-0.20190612132142-05461f4df60a.mod -> github.com%2Fgoogle%2Ftrillian%2F@v%2Fv1.2.2-0.20190612132142-05461f4df60a.mod mirror://goproxy//github.com/google/trillian-examples/@v/v0.0.0-20190603134952-4e75ba15216c.mod -> github.com%2Fgoogle%2Ftrillian-examples%2F@v%2Fv0.0.0-20190603134952-4e75ba15216c.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gax-go/@v/v2.0.0+incompatible.zip -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.0+incompatible.zip mirror://goproxy//github.com/googleapis/gax-go/@v/v2.0.0+incompatible.mod -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.3.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.3.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.3.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.3.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/context/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/csrf/@v/v1.6.0.mod -> github.com%2Fgorilla%2Fcsrf%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/gorilla/handlers/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.6.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/securecookie/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fsecurecookie%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/gostaticanalysis/analysisutil/@v/v0.0.0-20190318220348-4088753ea4d3.mod -> github.com%2Fgostaticanalysis%2Fanalysisutil%2F@v%2Fv0.0.0-20190318220348-4088753ea4d3.mod mirror://goproxy//github.com/gostaticanalysis/analysisutil/@v/v0.0.3.mod -> github.com%2Fgostaticanalysis%2Fanalysisutil%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.1.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.5.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.8.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.8.5.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.12.1.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.12.1.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.12.1.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/h2non/parth/@v/v0.0.0-20190131123155-b4df798d6542.zip -> github.com%2Fh2non%2Fparth%2F@v%2Fv0.0.0-20190131123155-b4df798d6542.zip mirror://goproxy//github.com/h2non/parth/@v/v0.0.0-20190131123155-b4df798d6542.mod -> github.com%2Fh2non%2Fparth%2F@v%2Fv0.0.0-20190131123155-b4df798d6542.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v0.0.0-20180404174102-ef8a98b0bbce.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv0.0.0-20180404174102-ef8a98b0bbce.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/huandu/xstrings/@v/v1.2.0.zip -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/huandu/xstrings/@v/v1.2.0.mod -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/icrowley/fake/@v/v0.0.0-20180203215853-4178557ae428.mod -> github.com%2Ficrowley%2Ffake%2F@v%2Fv0.0.0-20180203215853-4178557ae428.mod mirror://goproxy//github.com/iij/doapi/@v/v0.0.0-20190504054126-0bbf12d6d7df.zip -> github.com%2Fiij%2Fdoapi%2F@v%2Fv0.0.0-20190504054126-0bbf12d6d7df.zip mirror://goproxy//github.com/iij/doapi/@v/v0.0.0-20190504054126-0bbf12d6d7df.mod -> github.com%2Fiij%2Fdoapi%2F@v%2Fv0.0.0-20190504054126-0bbf12d6d7df.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.7.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.7.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jellevandenhooff/dkim/@v/v0.0.0-20150330215556-f50fe3d243e1.mod -> github.com%2Fjellevandenhooff%2Fdkim%2F@v%2Fv0.0.0-20150330215556-f50fe3d243e1.mod mirror://goproxy//github.com/jessevdk/go-flags/@v/v1.4.0.mod -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.5.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jsternberg/zap-logfmt/@v/v1.2.0.zip -> github.com%2Fjsternberg%2Fzap-logfmt%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/jsternberg/zap-logfmt/@v/v1.2.0.mod -> github.com%2Fjsternberg%2Fzap-logfmt%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/juju/ansiterm/@v/v0.0.0-20180109212912-720a0952cc2a.zip -> github.com%2Fjuju%2Fansiterm%2F@v%2Fv0.0.0-20180109212912-720a0952cc2a.zip mirror://goproxy//github.com/juju/ansiterm/@v/v0.0.0-20180109212912-720a0952cc2a.mod -> github.com%2Fjuju%2Fansiterm%2F@v%2Fv0.0.0-20180109212912-720a0952cc2a.mod mirror://goproxy//github.com/juju/ratelimit/@v/v1.0.1.mod -> github.com%2Fjuju%2Fratelimit%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.mod -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v0.0.0-20161130080628-0de1eaf82fa3.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv0.0.0-20161130080628-0de1eaf82fa3.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.4.0.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.4.1.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.10.4.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.4.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.10.4.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.4.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v0.0.0-20180405133222-e7e905edc00e.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv0.0.0-20180405133222-e7e905edc00e.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.0.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.3.zip -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.3.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/kolo/xmlrpc/@v/v0.0.0-20190717152603-07c4ee3fd181.zip -> github.com%2Fkolo%2Fxmlrpc%2F@v%2Fv0.0.0-20190717152603-07c4ee3fd181.zip mirror://goproxy//github.com/kolo/xmlrpc/@v/v0.0.0-20190717152603-07c4ee3fd181.mod -> github.com%2Fkolo%2Fxmlrpc%2F@v%2Fv0.0.0-20190717152603-07c4ee3fd181.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.3.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.8.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.zip -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/labbsr0x/bindman-dns-webhook/@v/v1.0.2.zip -> github.com%2Flabbsr0x%2Fbindman-dns-webhook%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/labbsr0x/bindman-dns-webhook/@v/v1.0.2.mod -> github.com%2Flabbsr0x%2Fbindman-dns-webhook%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/labbsr0x/goh/@v/v1.0.1.zip -> github.com%2Flabbsr0x%2Fgoh%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/labbsr0x/goh/@v/v1.0.1.mod -> github.com%2Flabbsr0x%2Fgoh%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/letsencrypt/pkcs11key/@v/v2.0.1-0.20170608213348-396559074696+incompatible.mod -> github.com%2Fletsencrypt%2Fpkcs11key%2F@v%2Fv2.0.1-0.20170608213348-396559074696+incompatible.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.1.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/lib/pq/@v/v1.2.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/libdns/libdns/@v/v0.0.0-20200501023120-186724ffc821.zip -> github.com%2Flibdns%2Flibdns%2F@v%2Fv0.0.0-20200501023120-186724ffc821.zip mirror://goproxy//github.com/libdns/libdns/@v/v0.0.0-20200501023120-186724ffc821.mod -> github.com%2Flibdns%2Flibdns%2F@v%2Fv0.0.0-20200501023120-186724ffc821.mod mirror://goproxy//github.com/linode/linodego/@v/v0.10.0.zip -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/linode/linodego/@v/v0.10.0.mod -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/liquidweb/liquidweb-go/@v/v1.6.0.zip -> github.com%2Fliquidweb%2Fliquidweb-go%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/liquidweb/liquidweb-go/@v/v1.6.0.mod -> github.com%2Fliquidweb%2Fliquidweb-go%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/logrusorgru/aurora/@v/v0.0.0-20181002194514-a7b3b318ed4e.mod -> github.com%2Flogrusorgru%2Faurora%2F@v%2Fv0.0.0-20181002194514-a7b3b318ed4e.mod mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.15.3.zip -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.15.3.zip mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.15.3.mod -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.15.3.mod mirror://goproxy//github.com/lunixbochs/vtclean/@v/v1.0.0.zip -> github.com%2Flunixbochs%2Fvtclean%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/lunixbochs/vtclean/@v/v1.0.0.mod -> github.com%2Flunixbochs%2Fvtclean%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.7.6.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.7.6.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190312143242-1de009706dbe.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod mirror://goproxy//github.com/manifoldco/promptui/@v/v0.3.1.zip -> github.com%2Fmanifoldco%2Fpromptui%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/manifoldco/promptui/@v/v0.3.1.mod -> github.com%2Fmanifoldco%2Fpromptui%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/marten-seemann/qpack/@v/v0.1.0.zip -> github.com%2Fmarten-seemann%2Fqpack%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/marten-seemann/qpack/@v/v0.1.0.mod -> github.com%2Fmarten-seemann%2Fqpack%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/marten-seemann/qtls/@v/v0.9.0.zip -> github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/marten-seemann/qtls/@v/v0.9.0.mod -> github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/matoous/godox/@v/v0.0.0-20190911065817-5d6d842e92eb.mod -> github.com%2Fmatoous%2Fgodox%2F@v%2Fv0.0.0-20190911065817-5d6d842e92eb.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.10.0.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/mattn/go-tty/@v/v0.0.0-20180219170247-931426f7535a.mod -> github.com%2Fmattn%2Fgo-tty%2F@v%2Fv0.0.0-20180219170247-931426f7535a.mod mirror://goproxy//github.com/mattn/goveralls/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgoveralls%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.1.mod -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.15.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.15.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.27.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.27.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.27.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/miekg/pkcs11/@v/v1.0.2.mod -> github.com%2Fmiekg%2Fpkcs11%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-ps/@v/v0.0.0-20170309133038-4fdf99ab2936.mod -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv0.0.0-20170309133038-4fdf99ab2936.mod mirror://goproxy//github.com/mitchellh/go-ps/@v/v0.0.0-20190716172923-621e5597135b.mod -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv0.0.0-20190716172923-621e5597135b.mod mirror://goproxy//github.com/mitchellh/go-vnc/@v/v0.0.0-20150629162542-723ed9867aed.mod -> github.com%2Fmitchellh%2Fgo-vnc%2F@v%2Fv0.0.0-20150629162542-723ed9867aed.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20180220230111-00c29f56e238.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20180220230111-00c29f56e238.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mohae/deepcopy/@v/v0.0.0-20170929034955-c48cc78d4826.mod -> github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170929034955-c48cc78d4826.mod mirror://goproxy//github.com/mozilla/tls-observatory/@v/v0.0.0-20180409132520-8791a200eb40.mod -> github.com%2Fmozilla%2Ftls-observatory%2F@v%2Fv0.0.0-20180409132520-8791a200eb40.mod mirror://goproxy//github.com/mozilla/tls-observatory/@v/v0.0.0-20190404164649-a3c1b6cfecfd.mod -> github.com%2Fmozilla%2Ftls-observatory%2F@v%2Fv0.0.0-20190404164649-a3c1b6cfecfd.mod mirror://goproxy//github.com/mreiferson/go-httpclient/@v/v0.0.0-20160630210159-31f0106b4474.mod -> github.com%2Fmreiferson%2Fgo-httpclient%2F@v%2Fv0.0.0-20160630210159-31f0106b4474.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/namedotcom/go/@v/v0.0.0-20180403034216-08470befbe04.zip -> github.com%2Fnamedotcom%2Fgo%2F@v%2Fv0.0.0-20180403034216-08470befbe04.zip mirror://goproxy//github.com/namedotcom/go/@v/v0.0.0-20180403034216-08470befbe04.mod -> github.com%2Fnamedotcom%2Fgo%2F@v%2Fv0.0.0-20180403034216-08470befbe04.mod mirror://goproxy//github.com/naoina/go-stringutil/@v/v0.1.0.zip -> github.com%2Fnaoina%2Fgo-stringutil%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/naoina/go-stringutil/@v/v0.1.0.mod -> github.com%2Fnaoina%2Fgo-stringutil%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/naoina/toml/@v/v0.1.1.zip -> github.com%2Fnaoina%2Ftoml%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/naoina/toml/@v/v0.1.1.mod -> github.com%2Fnaoina%2Ftoml%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/nbio/st/@v/v0.0.0-20140626010706-e9e8d9816f32.zip -> github.com%2Fnbio%2Fst%2F@v%2Fv0.0.0-20140626010706-e9e8d9816f32.zip mirror://goproxy//github.com/nbio/st/@v/v0.0.0-20140626010706-e9e8d9816f32.mod -> github.com%2Fnbio%2Fst%2F@v%2Fv0.0.0-20140626010706-e9e8d9816f32.mod mirror://goproxy//github.com/nbutton23/zxcvbn-go/@v/v0.0.0-20160627004424-a22cb81b2ecd.mod -> github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20160627004424-a22cb81b2ecd.mod mirror://goproxy//github.com/nbutton23/zxcvbn-go/@v/v0.0.0-20171102151520-eafdab6b0663.mod -> github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20171102151520-eafdab6b0663.mod mirror://goproxy//github.com/nbutton23/zxcvbn-go/@v/v0.0.0-20180912185939-ae427f1e4c1d.mod -> github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20180912185939-ae427f1e4c1d.mod mirror://goproxy//github.com/neelance/astrewrite/@v/v0.0.0-20160511093645-99348263ae86.mod -> github.com%2Fneelance%2Fastrewrite%2F@v%2Fv0.0.0-20160511093645-99348263ae86.mod mirror://goproxy//github.com/neelance/sourcemap/@v/v0.0.0-20151028013722-8c68805598ab.mod -> github.com%2Fneelance%2Fsourcemap%2F@v%2Fv0.0.0-20151028013722-8c68805598ab.mod mirror://goproxy//github.com/newrelic/go-agent/@v/v2.15.0+incompatible.mod -> github.com%2Fnewrelic%2Fgo-agent%2F@v%2Fv2.15.0+incompatible.mod mirror://goproxy//github.com/ngdinhtoan/glide-cleanup/@v/v0.2.0.mod -> github.com%2Fngdinhtoan%2Fglide-cleanup%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/nkovacs/streamquote/@v/v0.0.0-20170412213628-49af9bddb229.mod -> github.com%2Fnkovacs%2Fstreamquote%2F@v%2Fv0.0.0-20170412213628-49af9bddb229.mod mirror://goproxy//github.com/nrdcg/auroradns/@v/v1.0.0.mod -> github.com%2Fnrdcg%2Fauroradns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/nrdcg/auroradns/@v/v1.0.1.zip -> github.com%2Fnrdcg%2Fauroradns%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/nrdcg/auroradns/@v/v1.0.1.mod -> github.com%2Fnrdcg%2Fauroradns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/nrdcg/dnspod-go/@v/v0.4.0.zip -> github.com%2Fnrdcg%2Fdnspod-go%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/nrdcg/dnspod-go/@v/v0.4.0.mod -> github.com%2Fnrdcg%2Fdnspod-go%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/nrdcg/goinwx/@v/v0.6.1.zip -> github.com%2Fnrdcg%2Fgoinwx%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/nrdcg/goinwx/@v/v0.6.1.mod -> github.com%2Fnrdcg%2Fgoinwx%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/nrdcg/namesilo/@v/v0.2.1.zip -> github.com%2Fnrdcg%2Fnamesilo%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/nrdcg/namesilo/@v/v0.2.1.mod -> github.com%2Fnrdcg%2Fnamesilo%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.1.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.7.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.7.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.2.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.8.1.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.8.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/op/go-logging/@v/v0.0.0-20160315200505-970db520ece7.mod -> github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.1.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.6.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/oracle/oci-go-sdk/@v/v7.0.0+incompatible.zip -> github.com%2Foracle%2Foci-go-sdk%2F@v%2Fv7.0.0+incompatible.zip mirror://goproxy//github.com/oracle/oci-go-sdk/@v/v7.0.0+incompatible.mod -> github.com%2Foracle%2Foci-go-sdk%2F@v%2Fv7.0.0+incompatible.mod mirror://goproxy//github.com/ovh/go-ovh/@v/v0.0.0-20181109152953-ba5adb4cf014.zip -> github.com%2Fovh%2Fgo-ovh%2F@v%2Fv0.0.0-20181109152953-ba5adb4cf014.zip mirror://goproxy//github.com/ovh/go-ovh/@v/v0.0.0-20181109152953-ba5adb4cf014.mod -> github.com%2Fovh%2Fgo-ovh%2F@v%2Fv0.0.0-20181109152953-ba5adb4cf014.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.1.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.6.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/pquerna/otp/@v/v1.0.0.mod -> github.com%2Fpquerna%2Fotp%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.8.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3-0.20190127221311-3c4408c8b829.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.4.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.3.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190115171406-56726106282f.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.1.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20180801064454-c7de2306084e.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180801064454-c7de2306084e.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20180725123919-05ee40e3a273.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180725123919-05ee40e3a273.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190117184657-bf6a532e95b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/quasilyte/go-consistent/@v/v0.0.0-20190521200055-c6f3937de18c.mod -> github.com%2Fquasilyte%2Fgo-consistent%2F@v%2Fv0.0.0-20190521200055-c6f3937de18c.mod mirror://goproxy//github.com/rainycape/memcache/@v/v0.0.0-20150622160815-1031fa0ce2f2.mod -> github.com%2Frainycape%2Fmemcache%2F@v%2Fv0.0.0-20150622160815-1031fa0ce2f2.mod mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20181016184325-3113b8401b8a.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v1.2.0.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.1.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.2.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/rs/cors/@v/v1.6.0.mod -> github.com%2Frs%2Fcors%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/rs/xid/@v/v1.2.1.mod -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v0.0.0-20170128012129-256dc444b735.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv0.0.0-20170128012129-256dc444b735.mod mirror://goproxy//github.com/sacloud/libsacloud/@v/v1.26.1.zip -> github.com%2Fsacloud%2Flibsacloud%2F@v%2Fv1.26.1.zip mirror://goproxy//github.com/sacloud/libsacloud/@v/v1.26.1.mod -> github.com%2Fsacloud%2Flibsacloud%2F@v%2Fv1.26.1.mod mirror://goproxy//github.com/samfoo/ansi/@v/v0.0.0-20160124022901-b6bd2ded7189.zip -> github.com%2Fsamfoo%2Fansi%2F@v%2Fv0.0.0-20160124022901-b6bd2ded7189.zip mirror://goproxy//github.com/samfoo/ansi/@v/v0.0.0-20160124022901-b6bd2ded7189.mod -> github.com%2Fsamfoo%2Fansi%2F@v%2Fv0.0.0-20160124022901-b6bd2ded7189.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/securego/gosec/@v/v0.0.0-20191002120514-e680875ea14d.mod -> github.com%2Fsecurego%2Fgosec%2F@v%2Fv0.0.0-20191002120514-e680875ea14d.mod mirror://goproxy//github.com/securego/gosec/@v/v0.0.0-20200106085552-9cb83e10afad.mod -> github.com%2Fsecurego%2Fgosec%2F@v%2Fv0.0.0-20200106085552-9cb83e10afad.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20180427012116-c95755e4bcd7.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20180427012116-c95755e4bcd7.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20190901111213-e4ec7b275ada.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20190901111213-e4ec7b275ada.mod mirror://goproxy//github.com/shirou/w32/@v/v0.0.0-20160930032740-bb4de0191aa4.mod -> github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.mod mirror://goproxy//github.com/shurcoo!l/component/@v/v0.0.0-20170202220835-f88ec8f54cc4.mod -> github.com%2Fshurcoo!l%2Fcomponent%2F@v%2Fv0.0.0-20170202220835-f88ec8f54cc4.mod mirror://goproxy//github.com/shurcoo!l/events/@v/v0.0.0-20181021180414-410e4ca65f48.mod -> github.com%2Fshurcoo!l%2Fevents%2F@v%2Fv0.0.0-20181021180414-410e4ca65f48.mod mirror://goproxy//github.com/shurcoo!l/github_flavored_markdown/@v/v0.0.0-20181002035957-2122de532470.mod -> github.com%2Fshurcoo!l%2Fgithub_flavored_markdown%2F@v%2Fv0.0.0-20181002035957-2122de532470.mod mirror://goproxy//github.com/shurcoo!l/go/@v/v0.0.0-20180423040247-9e1955d9fb6e.mod -> github.com%2Fshurcoo!l%2Fgo%2F@v%2Fv0.0.0-20180423040247-9e1955d9fb6e.mod mirror://goproxy//github.com/shurcoo!l/go-goon/@v/v0.0.0-20170922171312-37c2f522c041.mod -> github.com%2Fshurcoo!l%2Fgo-goon%2F@v%2Fv0.0.0-20170922171312-37c2f522c041.mod mirror://goproxy//github.com/shurcoo!l/gofontwoff/@v/v0.0.0-20180329035133-29b52fc0a18d.mod -> github.com%2Fshurcoo!l%2Fgofontwoff%2F@v%2Fv0.0.0-20180329035133-29b52fc0a18d.mod mirror://goproxy//github.com/shurcoo!l/gopherjslib/@v/v0.0.0-20160914041154-feb6d3990c2c.mod -> github.com%2Fshurcoo!l%2Fgopherjslib%2F@v%2Fv0.0.0-20160914041154-feb6d3990c2c.mod mirror://goproxy//github.com/shurcoo!l/highlight_diff/@v/v0.0.0-20170515013008-09bb4053de1b.mod -> github.com%2Fshurcoo!l%2Fhighlight_diff%2F@v%2Fv0.0.0-20170515013008-09bb4053de1b.mod mirror://goproxy//github.com/shurcoo!l/highlight_go/@v/v0.0.0-20181028180052-98c3abbbae20.mod -> github.com%2Fshurcoo!l%2Fhighlight_go%2F@v%2Fv0.0.0-20181028180052-98c3abbbae20.mod mirror://goproxy//github.com/shurcoo!l/home/@v/v0.0.0-20181020052607-80b7ffcb30f9.mod -> github.com%2Fshurcoo!l%2Fhome%2F@v%2Fv0.0.0-20181020052607-80b7ffcb30f9.mod mirror://goproxy//github.com/shurcoo!l/htmlg/@v/v0.0.0-20170918183704-d01228ac9e50.mod -> github.com%2Fshurcoo!l%2Fhtmlg%2F@v%2Fv0.0.0-20170918183704-d01228ac9e50.mod mirror://goproxy//github.com/shurcoo!l/httperror/@v/v0.0.0-20170206035902-86b7830d14cc.mod -> github.com%2Fshurcoo!l%2Fhttperror%2F@v%2Fv0.0.0-20170206035902-86b7830d14cc.mod mirror://goproxy//github.com/shurcoo!l/httpfs/@v/v0.0.0-20171119174359-809beceb2371.mod -> github.com%2Fshurcoo!l%2Fhttpfs%2F@v%2Fv0.0.0-20171119174359-809beceb2371.mod mirror://goproxy//github.com/shurcoo!l/httpgzip/@v/v0.0.0-20180522190206-b1c53ac65af9.mod -> github.com%2Fshurcoo!l%2Fhttpgzip%2F@v%2Fv0.0.0-20180522190206-b1c53ac65af9.mod mirror://goproxy//github.com/shurcoo!l/issues/@v/v0.0.0-20181008053335-6292fdc1e191.mod -> github.com%2Fshurcoo!l%2Fissues%2F@v%2Fv0.0.0-20181008053335-6292fdc1e191.mod mirror://goproxy//github.com/shurcoo!l/issuesapp/@v/v0.0.0-20180602232740-048589ce2241.mod -> github.com%2Fshurcoo!l%2Fissuesapp%2F@v%2Fv0.0.0-20180602232740-048589ce2241.mod mirror://goproxy//github.com/shurcoo!l/notifications/@v/v0.0.0-20181007000457-627ab5aea122.mod -> github.com%2Fshurcoo!l%2Fnotifications%2F@v%2Fv0.0.0-20181007000457-627ab5aea122.mod mirror://goproxy//github.com/shurcoo!l/octicon/@v/v0.0.0-20181028054416-fa4f57f9efb2.mod -> github.com%2Fshurcoo!l%2Focticon%2F@v%2Fv0.0.0-20181028054416-fa4f57f9efb2.mod mirror://goproxy//github.com/shurcoo!l/reactions/@v/v0.0.0-20181006231557-f2e0b4ca5b82.mod -> github.com%2Fshurcoo!l%2Freactions%2F@v%2Fv0.0.0-20181006231557-f2e0b4ca5b82.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v0.0.0-20170918181015-86672fcb3f95.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv0.0.0-20170918181015-86672fcb3f95.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/users/@v/v0.0.0-20180125191416-49c67e49c537.mod -> github.com%2Fshurcoo!l%2Fusers%2F@v%2Fv0.0.0-20180125191416-49c67e49c537.mod mirror://goproxy//github.com/shurcoo!l/webdavfs/@v/v0.0.0-20170829043945-18c3829fa133.mod -> github.com%2Fshurcoo!l%2Fwebdavfs%2F@v%2Fv0.0.0-20170829043945-18c3829fa133.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.5.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.3.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/skratchdot/open-golang/@v/v0.0.0-20160302144031-75fb7ed4208c.mod -> github.com%2Fskratchdot%2Fopen-golang%2F@v%2Fv0.0.0-20160302144031-75fb7ed4208c.mod mirror://goproxy//github.com/smallstep/assert/@v/v0.0.0-20180720014142-de77670473b5.mod -> github.com%2Fsmallstep%2Fassert%2F@v%2Fv0.0.0-20180720014142-de77670473b5.mod mirror://goproxy//github.com/smallstep/assert/@v/v0.0.0-20200103212524-b99dc1097b15.zip -> github.com%2Fsmallstep%2Fassert%2F@v%2Fv0.0.0-20200103212524-b99dc1097b15.zip mirror://goproxy//github.com/smallstep/assert/@v/v0.0.0-20200103212524-b99dc1097b15.mod -> github.com%2Fsmallstep%2Fassert%2F@v%2Fv0.0.0-20200103212524-b99dc1097b15.mod mirror://goproxy//github.com/smallstep/certificates/@v/v0.14.2.zip -> github.com%2Fsmallstep%2Fcertificates%2F@v%2Fv0.14.2.zip mirror://goproxy//github.com/smallstep/certificates/@v/v0.14.2.mod -> github.com%2Fsmallstep%2Fcertificates%2F@v%2Fv0.14.2.mod mirror://goproxy//github.com/smallstep/certinfo/@v/v1.2.0.mod -> github.com%2Fsmallstep%2Fcertinfo%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/smallstep/cli/@v/v0.14.2.zip -> github.com%2Fsmallstep%2Fcli%2F@v%2Fv0.14.2.zip mirror://goproxy//github.com/smallstep/cli/@v/v0.14.2.mod -> github.com%2Fsmallstep%2Fcli%2F@v%2Fv0.14.2.mod mirror://goproxy//github.com/smallstep/nosql/@v/v0.2.0.zip -> github.com%2Fsmallstep%2Fnosql%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/smallstep/nosql/@v/v0.2.0.mod -> github.com%2Fsmallstep%2Fnosql%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/smallstep/truststore/@v/v0.9.3.mod -> github.com%2Fsmallstep%2Ftruststore%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/smallstep/truststore/@v/v0.9.5.zip -> github.com%2Fsmallstep%2Ftruststore%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/smallstep/truststore/@v/v0.9.5.mod -> github.com%2Fsmallstep%2Ftruststore%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/smallstep/zcrypto/@v/v0.0.0-20200203191936-fbc32cf76bce.mod -> github.com%2Fsmallstep%2Fzcrypto%2F@v%2Fv0.0.0-20200203191936-fbc32cf76bce.mod mirror://goproxy//github.com/smallstep/zlint/@v/v0.0.0-20180727184541-d84eaafe274f.mod -> github.com%2Fsmallstep%2Fzlint%2F@v%2Fv0.0.0-20180727184541-d84eaafe274f.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/sourcegraph/annotate/@v/v0.0.0-20160123013949-f4cad6c6324d.mod -> github.com%2Fsourcegraph%2Fannotate%2F@v%2Fv0.0.0-20160123013949-f4cad6c6324d.mod mirror://goproxy//github.com/sourcegraph/go-diff/@v/v0.5.1.mod -> github.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/sourcegraph/syntaxhighlight/@v/v0.0.0-20170531221838-bd320f5d308e.mod -> github.com%2Fsourcegraph%2Fsyntaxhighlight%2F@v%2Fv0.0.0-20170531221838-bd320f5d308e.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.0.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.2.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v0.0.0-20180109140146-7c0cea34c8ec.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv0.0.0-20180109140146-7c0cea34c8ec.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.0.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.6.1.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/tarm/serial/@v/v0.0.0-20180830185346-98f6abe2eb07.mod -> github.com%2Ftarm%2Fserial%2F@v%2Fv0.0.0-20180830185346-98f6abe2eb07.mod mirror://goproxy//github.com/timakin/bodyclose/@v/v0.0.0-20190721030226-87058b9bfcec.mod -> github.com%2Ftimakin%2Fbodyclose%2F@v%2Fv0.0.0-20190721030226-87058b9bfcec.mod mirror://goproxy//github.com/timakin/bodyclose/@v/v0.0.0-20190930140734-f7f2e9bca95e.mod -> github.com%2Ftimakin%2Fbodyclose%2F@v%2Fv0.0.0-20190930140734-f7f2e9bca95e.mod mirror://goproxy//github.com/timewasted/linode/@v/v0.0.0-20160829202747-37e84520dcf7.zip -> github.com%2Ftimewasted%2Flinode%2F@v%2Fv0.0.0-20160829202747-37e84520dcf7.zip mirror://goproxy//github.com/timewasted/linode/@v/v0.0.0-20160829202747-37e84520dcf7.mod -> github.com%2Ftimewasted%2Flinode%2F@v%2Fv0.0.0-20160829202747-37e84520dcf7.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/tomasen/realip/@v/v0.0.0-20180522021738-f0c99a92ddce.mod -> github.com%2Ftomasen%2Frealip%2F@v%2Fv0.0.0-20180522021738-f0c99a92ddce.mod mirror://goproxy//github.com/tommy-muehle/go-mnd/@v/v1.1.1.mod -> github.com%2Ftommy-muehle%2Fgo-mnd%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/transip/gotransip/@v/v0.0.0-20190812104329-6d8d9179b66f.zip -> github.com%2Ftransip%2Fgotransip%2F@v%2Fv0.0.0-20190812104329-6d8d9179b66f.zip mirror://goproxy//github.com/transip/gotransip/@v/v0.0.0-20190812104329-6d8d9179b66f.mod -> github.com%2Ftransip%2Fgotransip%2F@v%2Fv0.0.0-20190812104329-6d8d9179b66f.mod mirror://goproxy//github.com/transip/gotransip/v6/@v/v6.0.2.zip -> github.com%2Ftransip%2Fgotransip%2Fv6%2F@v%2Fv6.0.2.zip mirror://goproxy//github.com/transip/gotransip/v6/@v/v6.0.2.mod -> github.com%2Ftransip%2Fgotransip%2Fv6%2F@v%2Fv6.0.2.mod mirror://goproxy//github.com/uber-go/atomic/@v/v1.3.2.zip -> github.com%2Fuber-go%2Fatomic%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/uber-go/atomic/@v/v1.3.2.mod -> github.com%2Fuber-go%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/ultraware/funlen/@v/v0.0.1.mod -> github.com%2Fultraware%2Ffunlen%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ultraware/funlen/@v/v0.0.2.mod -> github.com%2Fultraware%2Ffunlen%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ultraware/whitespace/@v/v0.0.4.mod -> github.com%2Fultraware%2Fwhitespace%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.zip mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.zip mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod mirror://goproxy//github.com/uudashr/gocognit/@v/v1.0.1.mod -> github.com%2Fuudashr%2Fgocognit%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/valyala/bytebufferpool/@v/v1.0.0.mod -> github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/valyala/fasthttp/@v/v1.2.0.mod -> github.com%2Fvalyala%2Ffasthttp%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/valyala/fasttemplate/@v/v1.0.1.mod -> github.com%2Fvalyala%2Ffasttemplate%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/valyala/quicktemplate/@v/v1.1.1.mod -> github.com%2Fvalyala%2Fquicktemplate%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/valyala/quicktemplate/@v/v1.2.0.mod -> github.com%2Fvalyala%2Fquicktemplate%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/valyala/tcplisten/@v/v0.0.0-20161114210144-ceec8f93295a.mod -> github.com%2Fvalyala%2Ftcplisten%2F@v%2Fv0.0.0-20161114210144-ceec8f93295a.mod mirror://goproxy//github.com/viant/assertly/@v/v0.4.8.mod -> github.com%2Fviant%2Fassertly%2F@v%2Fv0.4.8.mod mirror://goproxy//github.com/viant/toolbox/@v/v0.24.0.mod -> github.com%2Fviant%2Ftoolbox%2F@v%2Fv0.24.0.mod mirror://goproxy//github.com/vultr/govultr/@v/v0.1.4.zip -> github.com%2Fvultr%2Fgovultr%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/vultr/govultr/@v/v0.1.4.mod -> github.com%2Fvultr%2Fgovultr%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/weppos/publicsuffix-go/@v/v0.4.0.mod -> github.com%2Fweppos%2Fpublicsuffix-go%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.mod -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v1.1.0.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v1.2.0.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.22.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.22.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.28.zip -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.28.zip mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.28.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.28.mod mirror://goproxy//github.com/yuin/goldmark-highlighting/@v/v0.0.0-20200307114337-60d527fdb691.zip -> github.com%2Fyuin%2Fgoldmark-highlighting%2F@v%2Fv0.0.0-20200307114337-60d527fdb691.zip mirror://goproxy//github.com/yuin/goldmark-highlighting/@v/v0.0.0-20200307114337-60d527fdb691.mod -> github.com%2Fyuin%2Fgoldmark-highlighting%2F@v%2Fv0.0.0-20200307114337-60d527fdb691.mod mirror://goproxy//github.com/zmap/rc2/@v/v0.0.0-20131011165748-24b9757f5521.mod -> github.com%2Fzmap%2Frc2%2F@v%2Fv0.0.0-20131011165748-24b9757f5521.mod mirror://goproxy//github.com/zmap/rc2/@v/v0.0.0-20190804163417-abaa70531248.mod -> github.com%2Fzmap%2Frc2%2F@v%2Fv0.0.0-20190804163417-abaa70531248.mod mirror://goproxy//github.com/zmap/zcertificate/@v/v0.0.0-20180516150559-0e3d58b1bac4.mod -> github.com%2Fzmap%2Fzcertificate%2F@v%2Fv0.0.0-20180516150559-0e3d58b1bac4.mod mirror://goproxy//github.com/zmap/zcertificate/@v/v0.0.0-20190521191901-30e388164f71.mod -> github.com%2Fzmap%2Fzcertificate%2F@v%2Fv0.0.0-20190521191901-30e388164f71.mod mirror://goproxy//github.com/zmap/zcrypto/@v/v0.0.0-20190329181646-dff83107394d.mod -> github.com%2Fzmap%2Fzcrypto%2F@v%2Fv0.0.0-20190329181646-dff83107394d.mod mirror://goproxy//github.com/zmap/zlint/@v/v0.0.0-20190516161541-9047d02cf65a.mod -> github.com%2Fzmap%2Fzlint%2F@v%2Fv0.0.0-20190516161541-9047d02cf65a.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.etcd.io/etcd/@v/v3.3.13+incompatible.mod -> go.etcd.io%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//go.etcd.io/etcd/@v/v3.3.18+incompatible.mod -> go.etcd.io%2Fetcd%2F@v%2Fv3.3.18+incompatible.mod mirror://goproxy//go.opencensus.io/@v/v0.18.0.mod -> go.opencensus.io%2F@v%2Fv0.18.0.mod mirror://goproxy//go.opencensus.io/@v/v0.20.1.mod -> go.opencensus.io%2F@v%2Fv0.20.1.mod mirror://goproxy//go.opencensus.io/@v/v0.20.2.mod -> go.opencensus.io%2F@v%2Fv0.20.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.zip -> go.opencensus.io%2F@v%2Fv0.22.2.zip mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.zip -> go.opencensus.io%2F@v%2Fv0.22.3.zip mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.zip mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.5.1.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.5.1.zip mirror://goproxy//go.uber.org/atomic/@v/v1.5.1.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.5.1.mod mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.3.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.4.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.4.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.4.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/ratelimit/@v/v0.0.0-20180316092928-c15da0234277.zip -> go.uber.org%2Fratelimit%2F@v%2Fv0.0.0-20180316092928-c15da0234277.zip mirror://goproxy//go.uber.org/ratelimit/@v/v0.0.0-20180316092928-c15da0234277.mod -> go.uber.org%2Fratelimit%2F@v%2Fv0.0.0-20180316092928-c15da0234277.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.zip -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.zip mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.9.1.mod -> go.uber.org%2Fzap%2F@v%2Fv1.9.1.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.13.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.13.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.13.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.13.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.14.1.zip -> go.uber.org%2Fzap%2F@v%2Fv1.14.1.zip mirror://goproxy//go.uber.org/zap/@v/v1.14.1.mod -> go.uber.org%2Fzap%2F@v%2Fv1.14.1.mod mirror://goproxy//go4.org/@v/v0.0.0-20180809161055-417644f6feb5.mod -> go4.org%2F@v%2Fv0.0.0-20180809161055-417644f6feb5.mod mirror://goproxy//golang.org/x/build/@v/v0.0.0-20190111050920-041ab4dc3f9d.mod -> golang.org%2Fx%2Fbuild%2F@v%2Fv0.0.0-20190111050920-041ab4dc3f9d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180621125126-a49355c7e3f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180621125126-a49355c7e3f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181030102418-4d3f4d9ffa16.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181030102418-4d3f4d9ffa16.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190313024323-a1f597ede03a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190313024323-a1f597ede03a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190418165655-df01cb2cc480.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190418165655-df01cb2cc480.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190911031432-227b76d455e7.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190911031432-227b76d455e7.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191227163750-53104e6ec876.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191227163750-53104e6ec876.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191227163750-53104e6ec876.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191227163750-53104e6ec876.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200221231518-2aa609cf4a9d.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200221231518-2aa609cf4a9d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200302210943-78000ba7a073.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200302210943-78000ba7a073.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200302210943-78000ba7a073.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200302210943-78000ba7a073.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200323165209-0ec3e9974c59.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200323165209-0ec3e9974c59.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200427165652-729f1e841bcc.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200427165652-729f1e841bcc.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200427165652-729f1e841bcc.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200427165652-729f1e841bcc.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170915142106-8351a756f30f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170915142106-8351a756f30f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180611182652-db08ff08e862.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180611182652-db08ff08e862.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180911220305-26e67e76b6c3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180911220305-26e67e76b6c3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181029044818-c44066c5c816.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181029044818-c44066c5c816.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181106065722-10aee1819953.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181106065722-10aee1819953.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190125091013-d26f9f9a57f3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190125091013-d26f9f9a57f3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190228165749-92fc7df08ae7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190228165749-92fc7df08ae7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190301231341-16b79f2e4e95.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190301231341-16b79f2e4e95.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190313220215-9f648a60d977.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190313220215-9f648a60d977.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190424112056-4829fb13d2c6.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190424112056-4829fb13d2c6.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190930134127-c5a3c61f89f3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190930134127-c5a3c61f89f3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191002035440-2ec189313ef0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191002035440-2ec189313ef0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191027093000-83d349e8ac1a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191027093000-83d349e8ac1a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200425230154-ff2c4b7c35a0.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200425230154-ff2c4b7c35a0.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200425230154-ff2c4b7c35a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200425230154-ff2c4b7c35a0.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181017192945-9dcd33a902f4.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181017192945-9dcd33a902f4.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181203162652-d668ce993890.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181203162652-d668ce993890.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/perf/@v/v0.0.0-20180704124530-6e6d33e29852.mod -> golang.org%2Fx%2Fperf%2F@v%2Fv0.0.0-20180704124530-6e6d33e29852.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20171026204733-164713f0dfce.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20171026204733-164713f0dfce.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180202135801-37707fdb30a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180202135801-37707fdb30a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180622082034-63fc586f45fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180622082034-63fc586f45fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181029174526-d69651ed3497.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181029174526-d69651ed3497.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181122145206-62eef0e2fa9b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181122145206-62eef0e2fa9b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181128092732-4ed8d59d0b35.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181128092732-4ed8d59d0b35.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190316082340-a2f829d7f35f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190316082340-a2f829d7f35f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190424175732-18eb32c0e2f0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190424175732-18eb32c0e2f0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190801041406-cbf593c0f2f3.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190801041406-cbf593c0f2f3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191220142924-d4481acd189f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191220142924-d4481acd189f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915090833-1cbadb444a80.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915090833-1cbadb444a80.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190921001708-c4c64cad1fd0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190921001708-c4c64cad1fd0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190921001708-c4c64cad1fd0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190921001708-c4c64cad1fd0.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20170915040203-e531a2a1c15f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20170915040203-e531a2a1c15f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180525024113-a5b4c53f6e8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180525024113-a5b4c53f6e8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180828015842-6cd1fcedba52.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180828015842-6cd1fcedba52.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030000716-a0a13e073c7b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030000716-a0a13e073c7b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181117154741-2ddaf7f79a09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181117154741-2ddaf7f79a09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190110163146-51295c7ec13a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190110163146-51295c7ec13a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190121143147-24cd39ecf745.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190121143147-24cd39ecf745.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190221204921-83362c3779f5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190221204921-83362c3779f5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311215038-5c2858a9cfe5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311215038-5c2858a9cfe5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190322203728-c1a832b0ad89.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190322203728-c1a832b0ad89.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190521203540-521d6ed310dd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190521203540-521d6ed310dd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190719005602-e377ae9d6386.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190719005602-e377ae9d6386.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190909030654-5b82db07426d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190909030654-5b82db07426d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190910044552-dd2b5c81c578.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190910044552-dd2b5c81c578.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911151314-feee8acb394c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911151314-feee8acb394c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190930201159-7c411dea38b0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190930201159-7c411dea38b0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029041327-9cc4af7d6b2c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029190741-b9c20aec41a5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113232020-e2727e816f5a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113232020-e2727e816f5a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216052735-49a3e744a425.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200103221440-774c71fcf114.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200103221440-774c71fcf114.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200106190116-7be0a674c9fc.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200106190116-7be0a674c9fc.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200106190116-7be0a674c9fc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200106190116-7be0a674c9fc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20180910000450-7ca32eb868bf.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180910000450-7ca32eb868bf.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20181030000543-1d582fd0359e.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20181030000543-1d582fd0359e.mod mirror://goproxy//google.golang.org/api/@v/v0.1.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.1.0.mod mirror://goproxy//google.golang.org/api/@v/v0.3.1.mod -> google.golang.org%2Fapi%2F@v%2Fv0.3.1.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.5.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.5.0.mod mirror://goproxy//google.golang.org/api/@v/v0.6.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.6.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.zip mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.zip mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.2.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.3.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.3.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180831171423-11092d34479b.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180831171423-11092d34479b.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20181029155118-b69ba1387ce2.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181029155118-b69ba1387ce2.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20181202183823-bd91e49a0898.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181202183823-bd91e49a0898.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190306203927-b5d61aea6440.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190306203927-b5d61aea6440.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190605220351-eb0b1bdb6ae6.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190605220351-eb0b1bdb6ae6.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190927181202-20e1ac93f88c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190927181202-20e1ac93f88c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200413115906-b5235f65be36.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200413115906-b5235f65be36.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200413115906-b5235f65be36.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200413115906-b5235f65be36.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.16.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.16.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.17.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.17.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.24.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.28.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.28.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/h2non/gock.v1/@v/v1.0.15.zip -> gopkg.in%2Fh2non%2Fgock.v1%2F@v%2Fv1.0.15.zip mirror://goproxy//gopkg.in/h2non/gock.v1/@v/v1.0.15.mod -> gopkg.in%2Fh2non%2Fgock.v1%2F@v%2Fv1.0.15.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.42.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.44.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.44.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.1.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.1.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.1.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.1.mod mirror://goproxy//gopkg.in/natefinch/lumberjack.v2/@v/v2.0.0.zip -> gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.zip mirror://goproxy//gopkg.in/natefinch/lumberjack.v2/@v/v2.0.0.mod -> gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.mod mirror://goproxy//gopkg.in/ns1/ns1-go.v2/@v/v2.0.0-20190730140822-b51389932cbc.zip -> gopkg.in%2Fns1%2Fns1-go.v2%2F@v%2Fv2.0.0-20190730140822-b51389932cbc.zip mirror://goproxy//gopkg.in/ns1/ns1-go.v2/@v/v2.0.0-20190730140822-b51389932cbc.mod -> gopkg.in%2Fns1%2Fns1-go.v2%2F@v%2Fv2.0.0-20190730140822-b51389932cbc.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.9.1.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.9.1.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.zip -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.4.0.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.4.0.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.3.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//grpc.go4.org/@v/v0.0.0-20170609214715-11d0a25b4919.mod -> grpc.go4.org%2F@v%2Fv0.0.0-20170609214715-11d0a25b4919.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20180728063816-88497007e858.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//howett.net/plist/@v/v0.0.0-20181124034731-591f970eefbb.zip -> howett.net%2Fplist%2F@v%2Fv0.0.0-20181124034731-591f970eefbb.zip mirror://goproxy//howett.net/plist/@v/v0.0.0-20181124034731-591f970eefbb.mod -> howett.net%2Fplist%2F@v%2Fv0.0.0-20181124034731-591f970eefbb.mod mirror://goproxy//howett.net/plist/@v/v0.0.0-20200225050739-77e249a2e2ba.zip -> howett.net%2Fplist%2F@v%2Fv0.0.0-20200225050739-77e249a2e2ba.zip mirror://goproxy//howett.net/plist/@v/v0.0.0-20200225050739-77e249a2e2ba.mod -> howett.net%2Fplist%2F@v%2Fv0.0.0-20200225050739-77e249a2e2ba.mod mirror://goproxy//mvdan.cc/interfacer/@v/v0.0.0-20180901003855-c20040233aed.mod -> mvdan.cc%2Finterfacer%2F@v%2Fv0.0.0-20180901003855-c20040233aed.mod mirror://goproxy//mvdan.cc/lint/@v/v0.0.0-20170908181259-adc824a0674b.mod -> mvdan.cc%2Flint%2F@v%2Fv0.0.0-20170908181259-adc824a0674b.mod mirror://goproxy//mvdan.cc/unparam/@v/v0.0.0-20190209190245-fbb59629db34.mod -> mvdan.cc%2Funparam%2F@v%2Fv0.0.0-20190209190245-fbb59629db34.mod mirror://goproxy//mvdan.cc/unparam/@v/v0.0.0-20190720180237-d51796306d8f.mod -> mvdan.cc%2Funparam%2F@v%2Fv0.0.0-20190720180237-d51796306d8f.mod mirror://goproxy//mvdan.cc/unparam/@v/v0.0.0-20191111180625-960b1ec0f2c2.mod -> mvdan.cc%2Funparam%2F@v%2Fv0.0.0-20191111180625-960b1ec0f2c2.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sourcegraph.com/sourcegraph/go-diff/@v/v0.5.0.mod -> sourcegraph.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.0.mod mirror://goproxy//sourcegraph.com/sqs/pbtypes/@v/v0.0.0-20180604144634-d3ebe8f20ae4.mod -> sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod mirror://goproxy//sourcegraph.com/sqs/pbtypes/@v/v1.0.0.mod -> sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv1.0.0.mod
+_eclasses_=go-module	45394825d9260b479aa1cf252ea58e01
+_md5_=b9f1b1346e5ae0de40398c0bef25b448
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.55 b/metadata/md5-cache/www-servers/tomcat-8.5.55
deleted file mode 100644
index 24ce986d6db2..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-8.5.55
+++ /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-8.5.55:3.1 app-admin/pwgen >=dev-java/ant-core-1.9.13 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-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
-EAPI=7
-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-8.5.55:3.1 virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=8.5
-SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.55/src/apache-tomcat-8.5.55-src.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=cc60b8f2f16705a99d91b8a487d1141b
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.56 b/metadata/md5-cache/www-servers/tomcat-8.5.56
index 147ae4c9a7c2..84ac4cc96f52 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.5.56
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.56
@@ -4,11 +4,11 @@ DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+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-8.5.56:3.1 virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=8.5
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.56/src/apache-tomcat-8.5.56-src.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=b37abbcaf7c683a6af8786132eabacbf
+_md5_=cc60b8f2f16705a99d91b8a487d1141b
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.35 b/metadata/md5-cache/www-servers/tomcat-9.0.35
deleted file mode 100644
index 01a7422ac807..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-9.0.35
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=dev-java/eclipse-ecj:4.13 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomcat-servlet-api-9.0.35:4.0 dev-java/wsdl4j:0 app-admin/pwgen >=dev-java/ant-core-1.9.13 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=7
-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.13 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomcat-servlet-api-9.0.35:4.0 dev-java/wsdl4j:0 virtual/jre >=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.35/src/apache-tomcat-9.0.35-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	16d46032afaca1d6d0621f82084880cb	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=064c71371eb7474725dac438e6cfbff8
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index f65428e3b4dc..098a98a1edb9 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/appres-1.0.4 b/metadata/md5-cache/x11-apps/appres-1.0.4
deleted file mode 100644
index bab42aedc47e..000000000000
--- a/metadata/md5-cache/x11-apps/appres-1.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXt >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=list X application resource database
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/appres
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXt
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/appres-1.0.4.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=270b648e17ce3ea34465a6b3c4296522
diff --git a/metadata/md5-cache/x11-apps/editres-1.0.6 b/metadata/md5-cache/x11-apps/editres-1.0.6
deleted file mode 100644
index 4eb0fbac4dcc..000000000000
--- a/metadata/md5-cache/x11-apps/editres-1.0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=a dynamic resource editor for X Toolkit applications
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/editres
-KEYWORDS=amd64 arm hppa ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/editres-1.0.6.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=2aa73069187a3923e828214896f2056f
diff --git a/metadata/md5-cache/x11-apps/ico-1.0.4 b/metadata/md5-cache/x11-apps/ico-1.0.4
deleted file mode 100644
index 40f478652cb7..000000000000
--- a/metadata/md5-cache/x11-apps/ico-1.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=animate an icosahedron or other polyhedron
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/ico
-KEYWORDS=amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-linux
-LICENSE=MIT
-RDEPEND=x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/ico-1.0.4.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=da2533a2a915cbc5cac3065f4b73bffa
diff --git a/metadata/md5-cache/x11-apps/igt-gpu-tools-1.24 b/metadata/md5-cache/x11-apps/igt-gpu-tools-1.24
deleted file mode 100644
index 796caf689b0f..000000000000
--- a/metadata/md5-cache/x11-apps/igt-gpu-tools-1.24
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/elfutils dev-libs/glib:2 sys-apps/kmod:= sys-libs/libunwind:= sys-libs/zlib:= sys-process/procps:= virtual/libudev:= >=x11-libs/cairo-1.12.0[X?] >=x11-libs/libdrm-2.4.82[video_cards_amdgpu?,video_cards_intel?,video_cards_nouveau?] >=x11-libs/libpciaccess-0.10 x11-libs/pixman chamelium? ( dev-libs/xmlrpc-c[curl] sci-libs/gsl media-libs/alsa-lib:= ) overlay? ( >=x11-libs/libXrandr-1.3 xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) ) runner? ( dev-libs/json-c:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) doc? ( >=dev-util/gtk-doc-1.25-r1 ) man? ( dev-python/docutils ) overlay? ( >=dev-util/peg-0.1.18 x11-base/xorg-proto ) video_cards_intel? ( sys-devel/bison sys-devel/flex ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
-DESCRIPTION=Intel GPU userland tools
-EAPI=6
-HOMEPAGE=https://01.org/linuxgraphics https://gitlab.freedesktop.org/drm/igt-gpu-tools
-IUSE=chamelium doc man overlay runner unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xv
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/elfutils dev-libs/glib:2 sys-apps/kmod:= sys-libs/libunwind:= sys-libs/zlib:= sys-process/procps:= virtual/libudev:= >=x11-libs/cairo-1.12.0[X?] >=x11-libs/libdrm-2.4.82[video_cards_amdgpu?,video_cards_intel?,video_cards_nouveau?] >=x11-libs/libpciaccess-0.10 x11-libs/pixman chamelium? ( dev-libs/xmlrpc-c[curl] sci-libs/gsl media-libs/alsa-lib:= ) overlay? ( >=x11-libs/libXrandr-1.3 xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) ) runner? ( dev-libs/json-c:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind )
-REQUIRED_USE=|| ( video_cards_amdgpu video_cards_intel video_cards_nouveau ) overlay? ( video_cards_intel || ( X xv ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/igt-gpu-tools-1.24.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=685d8e9d10dcb4d60750b4f223856835
diff --git a/metadata/md5-cache/x11-apps/igt-gpu-tools-1.25 b/metadata/md5-cache/x11-apps/igt-gpu-tools-1.25
index 2eaffe1496a3..2314a27b5aaf 100644
--- a/metadata/md5-cache/x11-apps/igt-gpu-tools-1.25
+++ b/metadata/md5-cache/x11-apps/igt-gpu-tools-1.25
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/igt-gpu-tools-1.25.tar.xz
 _eclasses_=meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=13b7b10309b3e8477c73da3ef7e7a779
+_md5_=3d0db9240fdc000984539941e67e2672
diff --git a/metadata/md5-cache/x11-apps/rgb-1.0.5 b/metadata/md5-cache/x11-apps/rgb-1.0.5
deleted file mode 100644
index 9a223dc0dab8..000000000000
--- a/metadata/md5-cache/x11-apps/rgb-1.0.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=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.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=uncompile an rgb color-name database
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/rgb
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/rgb-1.0.5.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=f9b2bb6ece85654bff428e5748a8c496
diff --git a/metadata/md5-cache/x11-apps/showfont-1.0.4 b/metadata/md5-cache/x11-apps/showfont-1.0.4
deleted file mode 100644
index 045d34dcb48b..000000000000
--- a/metadata/md5-cache/x11-apps/showfont-1.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libFS >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=font dumper for X font server
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/showfont
-KEYWORDS=amd64 arm ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libFS
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/showfont-1.0.4.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=f2a8c8d5e0755dadba04c667d27484e4
diff --git a/metadata/md5-cache/x11-apps/transset-1.0.1 b/metadata/md5-cache/x11-apps/transset-1.0.1
deleted file mode 100644
index e3006ceca554..000000000000
--- a/metadata/md5-cache/x11-apps/transset-1.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 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.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=An utility for setting opacity property
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/transset
-KEYWORDS=amd64 x86
-LICENSE=SGI-B-2.0
-RDEPEND=x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/transset-1.0.1.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=78c469bf2cd7257e6c6aba366ef2ac11
diff --git a/metadata/md5-cache/x11-apps/xdpyinfo-1.3.1 b/metadata/md5-cache/x11-apps/xdpyinfo-1.3.1
deleted file mode 100644
index c4ec2c6111a7..000000000000
--- a/metadata/md5-cache/x11-apps/xdpyinfo-1.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst x11-libs/libXxf86vm x11-libs/libxcb dga? ( x11-libs/libXxf86dga ) dmx? ( x11-libs/libdmx ) xinerama? ( x11-libs/libXinerama ) 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.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=Display information utility for X
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xdpyinfo
-IUSE=dga dmx xinerama
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst x11-libs/libXxf86vm x11-libs/libxcb dga? ( x11-libs/libXxf86dga ) dmx? ( x11-libs/libdmx ) xinerama? ( x11-libs/libXinerama )
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xdpyinfo-1.3.1.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=e0a10310fd628d3d0f21c2c1486a3945
diff --git a/metadata/md5-cache/x11-apps/xdriinfo-1.0.5 b/metadata/md5-cache/x11-apps/xdriinfo-1.0.5
deleted file mode 100644
index b4ee45e11591..000000000000
--- a/metadata/md5-cache/x11-apps/xdriinfo-1.0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libX11 virtual/opengl 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.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=query configuration information of DRI drivers
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xdriinfo
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 virtual/opengl
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xdriinfo-1.0.5.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=58acab9e01eb53064d14a04b4ca0dac2
diff --git a/metadata/md5-cache/x11-apps/xedit-1.2.1 b/metadata/md5-cache/x11-apps/xedit-1.2.1
deleted file mode 100644
index 97e5f5e4bea5..000000000000
--- a/metadata/md5-cache/x11-apps/xedit-1.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-libs/libX11 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=simple text editor for X
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xedit
-KEYWORDS=amd64 hppa ~mips ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xedit-1.2.1.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=5214dd8499426785248890bbee504fd7
diff --git a/metadata/md5-cache/x11-apps/xeyes-1.1.1 b/metadata/md5-cache/x11-apps/xeyes-1.1.1
deleted file mode 100644
index 2cc7c77f46aa..000000000000
--- a/metadata/md5-cache/x11-apps/xeyes-1.1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXrender >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X.Org xeyes application
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xeyes
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc64-solaris
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXrender
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xeyes-1.1.1.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=b2cd960378bc34bdf7c25746e93040d4
diff --git a/metadata/md5-cache/x11-apps/xfontsel-1.0.5 b/metadata/md5-cache/x11-apps/xfontsel-1.0.5
deleted file mode 100644
index b841ce663c7d..000000000000
--- a/metadata/md5-cache/x11-apps/xfontsel-1.0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=point and click selection of X11 font names
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xfontsel
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT
-RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xfontsel-1.0.5.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=cfd48093ac9aed85c716fa5b6e626934
diff --git a/metadata/md5-cache/x11-apps/xgc-1.0.4 b/metadata/md5-cache/x11-apps/xgc-1.0.4
deleted file mode 100644
index eababc78fe6e..000000000000
--- a/metadata/md5-cache/x11-apps/xgc-1.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXt >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X graphics demo
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xgc
-KEYWORDS=amd64 arm hppa ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libXaw x11-libs/libXt
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xgc-1.0.4.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=3b1a84f5786baecf96f5ccf0638a7642
diff --git a/metadata/md5-cache/x11-apps/xinput_calibrator-0.7.5-r1 b/metadata/md5-cache/x11-apps/xinput_calibrator-0.7.5-r1
deleted file mode 100644
index ae43fbb90c7e..000000000000
--- a/metadata/md5-cache/x11-apps/xinput_calibrator-0.7.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr gtk? ( dev-cpp/gtkmm:2.4 ) x11-base/xorg-proto >=app-portage/elt-patches-20170815
-DESCRIPTION=A generic touchscreen calibration program for X.Org
-EAPI=5
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/xinput_calibrator
-IUSE=gtk
-KEYWORDS=amd64 arm ~arm64 x86
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr gtk? ( dev-cpp/gtkmm:2.4 )
-SLOT=0
-SRC_URI=https://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-0.7.5.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e9fbea6781bec87485556a2e2ddc01fb
diff --git a/metadata/md5-cache/x11-apps/xinput_calibrator-0.7.5-r2 b/metadata/md5-cache/x11-apps/xinput_calibrator-0.7.5-r2
new file mode 100644
index 000000000000..c74706fa64d2
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xinput_calibrator-0.7.5-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-base/xorg-proto
+DESCRIPTION=A generic touchscreen calibration program for X.Org
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/xinput_calibrator
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr
+SLOT=0
+SRC_URI=https://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-0.7.5.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=36db0ce6b4d6810916d36efe3d2af551
diff --git a/metadata/md5-cache/x11-apps/xkill-1.0.4 b/metadata/md5-cache/x11-apps/xkill-1.0.4
deleted file mode 100644
index 358db2f4782f..000000000000
--- a/metadata/md5-cache/x11-apps/xkill-1.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXmu >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=kill a client by its X resource
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xkill
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-winnt
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXmu
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xkill-1.0.4.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=f832e84e5fb1981734436547fdab8db5
diff --git a/metadata/md5-cache/x11-apps/xmessage-1.0.4 b/metadata/md5-cache/x11-apps/xmessage-1.0.4
deleted file mode 100644
index 850d5d4aaad7..000000000000
--- a/metadata/md5-cache/x11-apps/xmessage-1.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXt >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=display a message or query in a window (X-based /bin/echo)
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xmessage
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=x11-libs/libXaw x11-libs/libXt
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xmessage-1.0.4.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=308430b31e6c43284c2206d4e1e3e41b
diff --git a/metadata/md5-cache/x11-apps/xrefresh-1.0.5 b/metadata/md5-cache/x11-apps/xrefresh-1.0.5
deleted file mode 100644
index 3768ca68b673..000000000000
--- a/metadata/md5-cache/x11-apps/xrefresh-1.0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=refresh all or part of an X screen
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xrefresh
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xrefresh-1.0.5.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=31a8a2a7cc6e8885afbdddf513200654
diff --git a/metadata/md5-cache/x11-apps/xset-1.2.3 b/metadata/md5-cache/x11-apps/xset-1.2.3
deleted file mode 100644
index 21387d4912e5..000000000000
--- a/metadata/md5-cache/x11-apps/xset-1.2.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXext >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X.Org xset application
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xset
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXext
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xset-1.2.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=4740fdcfac91ac23a9e066d1c5942b8e
diff --git a/metadata/md5-cache/x11-apps/xsetroot-1.1.1 b/metadata/md5-cache/x11-apps/xsetroot-1.1.1
deleted file mode 100644
index 28330c72d9db..000000000000
--- a/metadata/md5-cache/x11-apps/xsetroot-1.1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXmu x11-libs/libX11 x11-misc/xbitmaps x11-libs/libXcursor >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X.Org xsetroot application
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xsetroot
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=x11-libs/libXmu x11-libs/libX11 x11-misc/xbitmaps x11-libs/libXcursor
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xsetroot-1.1.1.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=c028ff7c58ab11f21848a11fd91ed497
diff --git a/metadata/md5-cache/x11-apps/xsm-1.0.3 b/metadata/md5-cache/x11-apps/xsm-1.0.3
deleted file mode 100644
index d46992de939e..000000000000
--- a/metadata/md5-cache/x11-apps/xsm-1.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libXaw x11-libs/libX11 x11-libs/libXt x11-libs/libICE x11-libs/libSM rsh? ( net-misc/netkit-rsh ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X Session Manager
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xsm
-IUSE=rsh
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=MIT
-RDEPEND=x11-libs/libXaw x11-libs/libX11 x11-libs/libXt x11-libs/libICE x11-libs/libSM rsh? ( net-misc/netkit-rsh )
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xsm-1.0.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=51e2f8e1fadc3e98eea7e870e2594552
diff --git a/metadata/md5-cache/x11-apps/xwd-1.0.6 b/metadata/md5-cache/x11-apps/xwd-1.0.6
deleted file mode 100644
index 4ad713bd0a14..000000000000
--- a/metadata/md5-cache/x11-apps/xwd-1.0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-base/xorg-proto x11-libs/libXt x11-libs/libxkbfile >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=dump an image of an X window
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xwd
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xwd-1.0.6.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=8f2d78a608f48a346bfb8f71eb1cd665
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index e5a47014ea76..3c075ff9d70d 100644
--- a/metadata/md5-cache/x11-base/Manifest.gz
+++ b/metadata/md5-cache/x11-base/Manifest.gz
diff --git a/metadata/md5-cache/x11-base/xorg-proto-2019.2 b/metadata/md5-cache/x11-base/xorg-proto-2019.2
deleted file mode 100644
index 690403cfe257..000000000000
--- a/metadata/md5-cache/x11-base/xorg-proto-2019.2
+++ /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 unpack
-DESCRIPTION=X.Org combined protocol headers
-EAPI=7
-HOMEPAGE=https://gitlab.freedesktop.org/xorg/proto/xorgproto
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=MIT
-RDEPEND=!<x11-proto/bigreqsproto-1.1.2-r1 !<x11-proto/compositeproto-0.4.2-r2 !<x11-proto/damageproto-1.2.1-r2 !<x11-proto/dmxproto-2.3.1-r2 !<x11-proto/dri2proto-2.8-r2 !<x11-proto/dri3proto-1.0-r1 !<x11-proto/fixesproto-5.0-r2 !<x11-proto/fontsproto-2.1.3-r1 !<x11-proto/glproto-1.4.17-r2 !<x11-proto/inputproto-2.3.2-r1 !<x11-proto/kbproto-1.0.7-r1 !<x11-proto/presentproto-1.1-r1 !<x11-proto/randrproto-1.5.0-r1 !<x11-proto/recordproto-1.14.2-r2 !<x11-proto/renderproto-0.11.1-r2 !<x11-proto/resourceproto-1.2.0-r1 !<x11-proto/scrnsaverproto-1.2.2-r2 !<x11-proto/trapproto-3.4.3-r1 !<x11-proto/videoproto-2.3.3-r1 !<x11-proto/xcmiscproto-1.2.2-r1 !<x11-proto/xextproto-7.3.0-r1 !<x11-proto/xf86bigfontproto-1.2.0-r2 !<x11-proto/xf86dgaproto-2.1-r3 !<x11-proto/xf86driproto-2.1.1-r2 !<x11-proto/xf86miscproto-0.9.3-r1 !<x11-proto/xf86vidmodeproto-2.3.1-r2 !<x11-proto/xineramaproto-1.2.1-r2 !<x11-proto/xproto-7.0.31-r1 !x11-proto/fontcacheproto !x11-proto/xf86rushproto
-SLOT=0
-SRC_URI=https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2019.2.tar.gz
-_eclasses_=meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=772aeb1a0dbc0e9f98404a63ead02a13
diff --git a/metadata/md5-cache/x11-base/xorg-proto-2020.1 b/metadata/md5-cache/x11-base/xorg-proto-2020.1
index 403e1ecb0015..3d2db44cfbfa 100644
--- a/metadata/md5-cache/x11-base/xorg-proto-2020.1
+++ b/metadata/md5-cache/x11-base/xorg-proto-2020.1
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install test
 DESCRIPTION=X.Org combined protocol headers
 EAPI=7
 HOMEPAGE=https://gitlab.freedesktop.org/xorg/proto/xorgproto
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2020.1.tar.gz
 _eclasses_=meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7c3b2917e531b4c3193f47474510003c
+_md5_=6261d9d8b2486a941e61a646a6613709
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.20.7 b/metadata/md5-cache/x11-base/xorg-server-1.20.7
deleted file mode 100644
index 80087468b522..000000000000
--- a/metadata/md5-cache/x11-base/xorg-server-1.20.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 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=libglvnd? ( media-libs/libglvnd[X] !app-eselect/eselect-opengl !!x11-drivers/nvidia-drivers[-libglvnd(-)] ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl,gbm] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 >=media-libs/libepoxy-1.5.4[egl(+)] >=dev-libs/wayland-protocols-1.18 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind sys-auth/pambase[elogind] ) sys-devel/flex >=x11-base/xorg-proto-2018.4 dmx? ( doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) )
-DESCRIPTION=X.Org X servers
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
-IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug elogind ipv6 libressl +libglvnd minimal selinux +suid systemd +udev unwind xcsecurity static-libs doc
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.20 )
-RDEPEND=libglvnd? ( media-libs/libglvnd[X] !app-eselect/eselect-opengl !!x11-drivers/nvidia-drivers[-libglvnd(-)] ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl,gbm] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 >=media-libs/libepoxy-1.5.4[egl(+)] >=dev-libs/wayland-protocols-1.18 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind sys-auth/pambase[elogind] ) selinux? ( sec-policy/selinux-xserver )
-REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd ) minimal? ( !wayland ) xephyr? ( kdrive )
-SLOT=0/1.20.7
-SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-1.20.7.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	f674df0f948f42c9f40bbdd2b1cd76b4
-_md5_=535db35e183ab6a0d939bba93bcf1d1c
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.20.8 b/metadata/md5-cache/x11-base/xorg-server-1.20.8
index eb96e348ba34..8a1c0336df38 100644
--- a/metadata/md5-cache/x11-base/xorg-server-1.20.8
+++ b/metadata/md5-cache/x11-base/xorg-server-1.20.8
@@ -5,7 +5,7 @@ DESCRIPTION=X.Org X servers
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
 IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug elogind ipv6 libressl +libglvnd minimal selinux +suid systemd +udev unwind xcsecurity static-libs doc
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.20 )
 RDEPEND=libglvnd? ( media-libs/libglvnd[X] !app-eselect/eselect-opengl !!x11-drivers/nvidia-drivers[-libglvnd(-)] ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl,gbm] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 >=media-libs/libepoxy-1.5.4[egl(+)] >=dev-libs/wayland-protocols-1.18 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind sys-auth/pambase[elogind] ) selinux? ( sec-policy/selinux-xserver )
@@ -13,4 +13,4 @@ REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) elog
 SLOT=0/1.20.8
 SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-1.20.8.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	f674df0f948f42c9f40bbdd2b1cd76b4
-_md5_=fa2f898276ad22fcbb107d16d64a9977
+_md5_=38fd27fc875c52c38fec92db3bb48743
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.20.8-r1 b/metadata/md5-cache/x11-base/xorg-server-1.20.8-r1
new file mode 100644
index 000000000000..1bb7df0c34e5
--- /dev/null
+++ b/metadata/md5-cache/x11-base/xorg-server-1.20.8-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 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=libglvnd? ( media-libs/libglvnd[X] !app-eselect/eselect-opengl !!x11-drivers/nvidia-drivers[-libglvnd(-)] ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl,gbm] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 >=media-libs/libepoxy-1.5.4[egl(+)] >=dev-libs/wayland-protocols-1.18 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind sys-auth/pambase[elogind] ) sys-devel/flex >=x11-base/xorg-proto-2018.4 dmx? ( doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) )
+DESCRIPTION=X.Org X servers
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
+IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug +elogind ipv6 libressl +libglvnd minimal selinux suid systemd +udev unwind xcsecurity static-libs doc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.20 )
+RDEPEND=libglvnd? ( media-libs/libglvnd[X] !app-eselect/eselect-opengl !!x11-drivers/nvidia-drivers[-libglvnd(-)] ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl,gbm] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 >=media-libs/libepoxy-1.5.4[egl(+)] >=dev-libs/wayland-protocols-1.18 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind sys-auth/pambase[elogind] ) selinux? ( sec-policy/selinux-xserver )
+REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd ) minimal? ( !wayland ) xephyr? ( kdrive )
+SLOT=0/1.20.8
+SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-1.20.8.tar.bz2
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	f674df0f948f42c9f40bbdd2b1cd76b4
+_md5_=aab45cb970b2c2c0910683a387eeb14a
diff --git a/metadata/md5-cache/x11-base/xorg-server-9999 b/metadata/md5-cache/x11-base/xorg-server-9999
index 3681de69681a..8ab5c9986fca 100644
--- a/metadata/md5-cache/x11-base/xorg-server-9999
+++ b/metadata/md5-cache/x11-base/xorg-server-9999
@@ -4,7 +4,7 @@ DEPEND=libglvnd? ( media-libs/libglvnd[X] !app-eselect/eselect-opengl !!x11-driv
 DESCRIPTION=X.Org X servers
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
-IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug elogind ipv6 libressl +libglvnd minimal selinux +suid systemd +udev unwind xcsecurity static-libs doc
+IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug +elogind ipv6 libressl +libglvnd minimal selinux suid systemd +udev unwind xcsecurity static-libs doc
 LICENSE=MIT
 PDEPEND=xorg? ( >=x11-base/xorg-drivers-9999 )
 PROPERTIES=live
@@ -12,4 +12,4 @@ RDEPEND=libglvnd? ( media-libs/libglvnd[X] !app-eselect/eselect-opengl !!x11-dri
 REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd ) minimal? ( !wayland ) xephyr? ( kdrive )
 SLOT=0/9999
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	f674df0f948f42c9f40bbdd2b1cd76b4
-_md5_=726f4c2fb63ffba1993c9cc24f0882ac
+_md5_=9f6b5463d2d17dd2f0e997796b80b824
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 2cadf2ddedac..767c063f1a5f 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 4b0bd71a4eb2..d397e3e85eb4 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	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	a97e90b59a0f3927b9782cb2cae0445e	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	b5891c9326ad2e7905c011d44c927c34
-_md5_=b45afef7777f84d142b123fc0000d0cd
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	a97e90b59a0f3927b9782cb2cae0445e	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_md5_=028eb4f7fafadb0e43dfc5f9967f0e4f
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 9cdad0cd0a54..aa53deb952ee 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	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	a97e90b59a0f3927b9782cb2cae0445e	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	b5891c9326ad2e7905c011d44c927c34
-_md5_=5b327f85abc7d08aaca5c8806c41faa9
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	a97e90b59a0f3927b9782cb2cae0445e	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_md5_=f163cb71e0138dcf1341f9eafa3537c8
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r2 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r2
index 3f79b4f9f4a3..a2fafde2a044 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r2
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r2
@@ -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	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	a97e90b59a0f3927b9782cb2cae0445e	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	b5891c9326ad2e7905c011d44c927c34
-_md5_=66cb4c1024e8fac3656caa95d802d003
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	a97e90b59a0f3927b9782cb2cae0445e	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_md5_=cd4c4c19d9b41c2881a573cf37db3eb4
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.138 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.138
new file mode 100644
index 000000000000..bbe2d25d32eb
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.138
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,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 ) app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils
+DESCRIPTION=NVIDIA Accelerated Graphics Driver
+EAPI=7
+HOMEPAGE=https://www.nvidia.com/Download/Find.aspx
+IUSE=compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib static-libs +tools uvm wayland +X kernel_linux kernel_linux kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=-* amd64 x86
+LICENSE=GPL-2 NVIDIA-r2
+RDEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,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 ) app-misc/pax-utils ) tools? ( !media-video/nvidia-settings ) uvm? ( >=virtual/opencl-3 ) wayland? ( dev-libs/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(-)?] ) X? ( <x11-base/xorg-server-1.20.99:= >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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/libvdpau-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(-)?] 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(-)?] ) kernel_linux? ( virtual/modutils )
+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.138/NVIDIA-FreeBSD-x86_64-390.138.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/390.138/NVIDIA-Linux-x86_64-390.138.run ) arm? ( https://us.download.nvidia.com/XFree86/Linux-x86-ARM/390.138/NVIDIA-Linux-armv7l-gnueabihf-390.138.run ) x86-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86/390.138/NVIDIA-FreeBSD-x86-390.138.tar.gz ) x86? ( https://us.download.nvidia.com/XFree86/Linux-x86/390.138/NVIDIA-Linux-x86-390.138.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.138.tar.bz2 )
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	a97e90b59a0f3927b9782cb2cae0445e	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_md5_=4b3b4e9ef8d7fd2a1701a830596d9ecf
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-430.64-r4 b/metadata/md5-cache/x11-drivers/nvidia-drivers-430.64-r4
deleted file mode 100644
index 171b3ad5941b..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-430.64-r4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils
-DESCRIPTION=NVIDIA Accelerated Graphics Driver
-EAPI=7
-HOMEPAGE=https://www.nvidia.com/Download/Find.aspx
-IUSE=compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib static-libs +tools uvm wayland +X kernel_linux kernel_linux kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=-* amd64
-LICENSE=GPL-2 NVIDIA-r2
-RDEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) tools? ( !media-video/nvidia-settings ) uvm? ( >=virtual/opencl-3 ) wayland? ( dev-libs/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(-)?] ) X? ( <x11-base/xorg-server-1.20.99:= >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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/libvdpau-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(-)?] 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(-)?] ) kernel_linux? ( virtual/modutils )
-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	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	a97e90b59a0f3927b9782cb2cae0445e	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	b5891c9326ad2e7905c011d44c927c34
-_md5_=bdf1589500585e703ccaf83ef5bf633b
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-430.64-r5 b/metadata/md5-cache/x11-drivers/nvidia-drivers-430.64-r5
new file mode 100644
index 000000000000..e6cf3db28dec
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-430.64-r5
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils
+DESCRIPTION=NVIDIA Accelerated Graphics Driver
+EAPI=7
+HOMEPAGE=https://www.nvidia.com/Download/Find.aspx
+IUSE=compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib static-libs +tools uvm wayland +X kernel_linux kernel_linux kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=-* amd64
+LICENSE=GPL-2 NVIDIA-r2
+RDEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) tools? ( !media-video/nvidia-settings ) uvm? ( >=virtual/opencl-3 ) wayland? ( dev-libs/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(-)?] ) X? ( <x11-base/xorg-server-1.20.99:= >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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/libvdpau-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(-)?] 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(-)?] ) kernel_linux? ( virtual/modutils )
+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	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	a97e90b59a0f3927b9782cb2cae0445e	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_md5_=7dee2d175cd7f31d8133363451664a6e
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r4 b/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r4
deleted file mode 100644
index 2e55419c7561..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,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 ) app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils
-DESCRIPTION=NVIDIA Accelerated Graphics Driver
-EAPI=7
-HOMEPAGE=https://www.nvidia.com/Download/Find.aspx
-IUSE=compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib static-libs +tools uvm wayland +X kernel_linux kernel_linux kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=-* amd64
-LICENSE=GPL-2 NVIDIA-r2
-RDEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,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 ) app-misc/pax-utils ) tools? ( !media-video/nvidia-settings ) uvm? ( >=virtual/opencl-3 ) wayland? ( dev-libs/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(-)?] ) X? ( <x11-base/xorg-server-1.20.99:= >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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/libvdpau-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(-)?] 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(-)?] ) kernel_linux? ( virtual/modutils )
-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	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	a97e90b59a0f3927b9782cb2cae0445e	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	b5891c9326ad2e7905c011d44c927c34
-_md5_=3dec0b76e30789eccb36075d0cd80fa7
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r5 b/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r5
new file mode 100644
index 000000000000..8a2b551abeb6
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r5
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,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 ) app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils
+DESCRIPTION=NVIDIA Accelerated Graphics Driver
+EAPI=7
+HOMEPAGE=https://www.nvidia.com/Download/Find.aspx
+IUSE=compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib static-libs +tools uvm wayland +X kernel_linux kernel_linux kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=-* amd64
+LICENSE=GPL-2 NVIDIA-r2
+RDEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,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 ) app-misc/pax-utils ) tools? ( !media-video/nvidia-settings ) uvm? ( >=virtual/opencl-3 ) wayland? ( dev-libs/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(-)?] ) X? ( <x11-base/xorg-server-1.20.99:= >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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/libvdpau-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(-)?] 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(-)?] ) kernel_linux? ( virtual/modutils )
+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	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	a97e90b59a0f3927b9782cb2cae0445e	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_md5_=d361a43e233c8497daeecf4e655bc850
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-440.100-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-440.100-r1
new file mode 100644
index 000000000000..842c7b1ce90b
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-440.100-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,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 ) app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils
+DESCRIPTION=NVIDIA Accelerated Graphics Driver
+EAPI=7
+HOMEPAGE=https://www.nvidia.com/Download/Find.aspx
+IUSE=compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib static-libs +tools uvm wayland +X kernel_linux kernel_linux kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=-* amd64
+LICENSE=GPL-2 NVIDIA-r2
+RDEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,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 ) app-misc/pax-utils ) tools? ( !media-video/nvidia-settings ) uvm? ( >=virtual/opencl-3 ) wayland? ( dev-libs/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(-)?] ) X? ( <x11-base/xorg-server-1.20.99:= >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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/libvdpau-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(-)?] 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(-)?] ) kernel_linux? ( virtual/modutils )
+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.100/NVIDIA-FreeBSD-x86_64-440.100.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/440.100/NVIDIA-Linux-x86_64-440.100.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-440.100.tar.bz2 )
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	a97e90b59a0f3927b9782cb2cae0445e	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_md5_=a900cf3349fc91566312218fbdc6f692
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-440.82-r3 b/metadata/md5-cache/x11-drivers/nvidia-drivers-440.82-r3
deleted file mode 100644
index 3de92b61e034..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-440.82-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,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 ) app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils
-DESCRIPTION=NVIDIA Accelerated Graphics Driver
-EAPI=7
-HOMEPAGE=https://www.nvidia.com/Download/Find.aspx
-IUSE=compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib static-libs +tools uvm wayland +X kernel_linux kernel_linux kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=-* amd64
-LICENSE=GPL-2 NVIDIA-r2
-RDEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,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 ) app-misc/pax-utils ) tools? ( !media-video/nvidia-settings ) uvm? ( >=virtual/opencl-3 ) wayland? ( dev-libs/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(-)?] ) X? ( <x11-base/xorg-server-1.20.99:= >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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/libvdpau-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(-)?] 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(-)?] ) kernel_linux? ( virtual/modutils )
-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.82/NVIDIA-FreeBSD-x86_64-440.82.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/440.82/NVIDIA-Linux-x86_64-440.82.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-440.82.tar.bz2 )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	a97e90b59a0f3927b9782cb2cae0445e	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	b5891c9326ad2e7905c011d44c927c34
-_md5_=50514b5d052012326aef488a60f8ef1a
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-450.51-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-450.51-r1
new file mode 100644
index 000000000000..67886cb7b371
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-450.51-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,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 ) app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils
+DESCRIPTION=NVIDIA Accelerated Graphics Driver
+EAPI=7
+HOMEPAGE=https://www.nvidia.com/Download/Find.aspx
+IUSE=compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib static-libs +tools uvm wayland +X kernel_linux kernel_linux kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=-* ~amd64
+LICENSE=GPL-2 NVIDIA-r2
+RDEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,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 ) app-misc/pax-utils ) tools? ( !media-video/nvidia-settings ) uvm? ( >=virtual/opencl-3 ) wayland? ( dev-libs/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(-)?] ) X? ( <x11-base/xorg-server-1.20.99:= >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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/libvdpau-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(-)?] 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(-)?] ) kernel_linux? ( net-libs/libtirpc ) kernel_linux? ( virtual/modutils )
+REQUIRED_USE=tools? ( X ) static-libs? ( tools )
+RESTRICT=bindist mirror test
+SLOT=0/450
+SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/450.51/NVIDIA-FreeBSD-x86_64-450.51.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/450.51/NVIDIA-Linux-x86_64-450.51.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-450.51.tar.bz2 )
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	a97e90b59a0f3927b9782cb2cae0445e	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_md5_=32e1b0b3ae15120420837501a94a2618
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6 b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6
index e5dba1987968..0784794d90ea 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6
+++ b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.18[udev] dev-libs/libevdev sys-libs/mtdev virtual/libudev:= x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-evdev-2.10.6.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6d2349188531f9269a34fe438392e90
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6d2349188531f9269a34fe438392e90
 _md5_=992200e74d01a43ab7ca97c9e512bfb9
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.29.0 b/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.29.0
deleted file mode 100644
index a8d009471f65..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.29.0
+++ /dev/null
@@ -1,14 +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 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare pretend setup unpack
-DEPEND=>=dev-libs/libinput-1.7.0:0= x11-base/xorg-proto x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg]
-DESCRIPTION=X.org input driver based on libinput
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput
-IUSE=kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-libs/libinput-1.7.0:0= x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg]
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-libinput-0.29.0.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	f674df0f948f42c9f40bbdd2b1cd76b4
-_md5_=f9c3433ed96bb5a105c8b3f0fd6c9e53
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.30.0 b/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.30.0
index 06ab45bce839..8dbb3e98789e 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.30.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.30.0
@@ -5,10 +5,10 @@ DESCRIPTION=X.org input driver based on libinput
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput
 IUSE=kernel_linux
-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=MIT
 RDEPEND=>=dev-libs/libinput-1.7.0:0= x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-libinput-0.30.0.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	f674df0f948f42c9f40bbdd2b1cd76b4
-_md5_=8ae7a2a0e9188db3ec2132c67b8234ff
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	f674df0f948f42c9f40bbdd2b1cd76b4
+_md5_=f9c3433ed96bb5a105c8b3f0fd6c9e53
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.0 b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.0
index 9b21f062f1a4..8ba85373262e 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=kernel_linux? ( >=dev-libs/libevdev-0.4 ) >=x11-base/xorg-server-1.14 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6d2349188531f9269a34fe438392e90
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6d2349188531f9269a34fe438392e90
 _md5_=fd95671d594b8bd061439d024d459c70
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.1 b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.1
index f6dffe0b6c24..0e00853e0c4b 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=kernel_linux? ( >=dev-libs/libevdev-0.4 ) >=x11-base/xorg-server-1.14 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6d2349188531f9269a34fe438392e90
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6d2349188531f9269a34fe438392e90
 _md5_=23c2dbbc5fc4968e36b6222624289996
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.39.0 b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.39.0
index 1d0495b20557..9a0866ba3dcb 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.39.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.39.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libwacom virtual/libudev:= >=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg]
 SLOT=0
 SRC_URI=https://github.com/linuxwacom/xf86-input-wacom/releases/download/xf86-input-wacom-0.39.0/xf86-input-wacom-0.39.0.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xorg-3	f674df0f948f42c9f40bbdd2b1cd76b4
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xorg-3	f674df0f948f42c9f40bbdd2b1cd76b4
 _md5_=f9e2837df0613a207a7f22ae64785484
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ati-19.1.0 b/metadata/md5-cache/x11-drivers/xf86-video-ati-19.1.0
index ac446203c5e1..523d138f8d36 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-19.1.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-19.1.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.89[video_cards_radeon] >=x11-libs/libpciaccess-0.8.0 x11-base/xorg-server[-minimal] udev? ( virtual/libudev:= ) x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-ati-19.1.0.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	f674df0f948f42c9f40bbdd2b1cd76b4
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	f674df0f948f42c9f40bbdd2b1cd76b4
 _md5_=44a8765960948bce8c864ae9577b2621
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ati-9999 b/metadata/md5-cache/x11-drivers/xf86-video-ati-9999
index 69653e11dea4..ca54602ff82e 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-9999
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=x11-libs/libdrm-2.4.89[video_cards_radeon] >=x11-libs/libpciaccess-0.8.0 x11-base/xorg-server[-minimal] udev? ( virtual/libudev:= ) x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	f674df0f948f42c9f40bbdd2b1cd76b4
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	f674df0f948f42c9f40bbdd2b1cd76b4
 _md5_=a0adcf808d0accc9b09b6956e2b20a48
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20200310 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20200310
index 871f7387c3bf..6551ddf49077 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20200310
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20200310
@@ -11,5 +11,5 @@ RDEPEND=x11-libs/libXext x11-libs/libXfixes x11-libs/libXScrnSaver >=x11-libs/pi
 REQUIRED_USE=|| ( sna uxa )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/-/archive/652d93cbbdc159c0883f1b626ea48e28bac63ae3/xf86-video-intel-2.99.917_p20200310.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	f674df0f948f42c9f40bbdd2b1cd76b4
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	f674df0f948f42c9f40bbdd2b1cd76b4
 _md5_=a7b89728a9e18dbbbdcfb3b2dd2f2c68
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20200515 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20200515
index a066e480a71b..91ed85627be3 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20200515
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20200515
@@ -11,5 +11,5 @@ RDEPEND=x11-libs/libXext x11-libs/libXfixes x11-libs/libXScrnSaver >=x11-libs/pi
 REQUIRED_USE=|| ( sna uxa )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/-/archive/5ca3ac1a90af177eb111a965e9b4dd8a27cc58fc/xf86-video-intel-2.99.917_p20200515.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	f674df0f948f42c9f40bbdd2b1cd76b4
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	f674df0f948f42c9f40bbdd2b1cd76b4
 _md5_=2759fe29960e50b2b290a40b2d2f74e3
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-9999 b/metadata/md5-cache/x11-drivers/xf86-video-intel-9999
index 2af9f01e3251..222d123ac872 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-9999
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=x11-libs/libXext x11-libs/libXfixes x11-libs/libXScrnSaver >=x11-libs/pixman-0.27.1 >=x11-libs/libdrm-2.4.52[video_cards_intel] >=x11-base/xorg-server-1.18 tools? ( x11-libs/libX11 x11-libs/libxcb x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libxshmfence x11-libs/libXtst ) udev? ( virtual/libudev:= ) xvmc? ( x11-libs/libXvMC >=x11-libs/libxcb-1.5 x11-libs/xcb-util ) x11-base/xorg-server:= dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 REQUIRED_USE=|| ( sna uxa )
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	f674df0f948f42c9f40bbdd2b1cd76b4
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	f674df0f948f42c9f40bbdd2b1cd76b4
 _md5_=c5f99e81fd4c564244de4d256aa65812
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.4.0 b/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.4.0
index 2a04a26a8a57..949a2ce0ec95 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.4.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.4.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6 >=x11-libs/libpciaccess-0.12.901 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-vesa-2.4.0.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6d2349188531f9269a34fe438392e90
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6d2349188531f9269a34fe438392e90
 _md5_=b6d69bbb7511804d131503d630a5e6e5
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index a15f2a3fbb6c..783641aa5882 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/goffice-0.10.46 b/metadata/md5-cache/x11-libs/goffice-0.10.46
deleted file mode 100644
index ac4732d61acd..000000000000
--- a/metadata/md5-cache/x11-libs/goffice-0.10.46
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-lang/perl dev-util/glib-utils >=dev-util/gtk-doc-am-1.12 >=dev-util/intltool-0.35 virtual/perl-Compress-Raw-Zlib virtual/perl-Getopt-Long virtual/perl-IO-Compress virtual/pkgconfig app-arch/xz-utils >=app-portage/elt-patches-20170815
-DEFINED_PHASES=configure install prepare
-DEPEND=>=app-text/libspectre-0.2.6:= >=dev-libs/glib-2.40.0:2 >=dev-libs/libxml2-2.4.12:2 dev-libs/libxslt >=gnome-base/librsvg-2.22:2 >=gnome-extra/libgsf-1.14.24:=[introspection?] >=x11-libs/cairo-1.10:=[svg] >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/gtk+-3.20:3 >=x11-libs/pango-1.24:= x11-libs/libXext:= x11-libs/libXrender:= introspection? ( >=dev-libs/gobject-introspection-1:= >=gnome-extra/libgsf-1.14.23:= )
-DESCRIPTION=A library of document-centric objects and utilities
-EAPI=7
-HOMEPAGE=https://gitlab.gnome.org/GNOME/goffice/
-IUSE=+introspection
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-text/libspectre-0.2.6:= >=dev-libs/glib-2.40.0:2 >=dev-libs/libxml2-2.4.12:2 dev-libs/libxslt >=gnome-base/librsvg-2.22:2 >=gnome-extra/libgsf-1.14.24:=[introspection?] >=x11-libs/cairo-1.10:=[svg] >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/gtk+-3.20:3 >=x11-libs/pango-1.24:= x11-libs/libXext:= x11-libs/libXrender:= introspection? ( >=dev-libs/gobject-introspection-1:= >=gnome-extra/libgsf-1.14.23:= )
-SLOT=0.10
-SRC_URI=mirror://gnome/sources/goffice/0.10/goffice-0.10.46.tar.xz
-_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b706681372d7ed776bf639d73b26847b
diff --git a/metadata/md5-cache/x11-libs/goffice-0.10.47 b/metadata/md5-cache/x11-libs/goffice-0.10.47
index ae8a04ee06f8..56de0e31e7f4 100644
--- a/metadata/md5-cache/x11-libs/goffice-0.10.47
+++ b/metadata/md5-cache/x11-libs/goffice-0.10.47
@@ -5,10 +5,10 @@ DESCRIPTION=A library of document-centric objects and utilities
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/goffice/
 IUSE=+introspection
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-text/libspectre-0.2.6:= >=dev-libs/glib-2.40.0:2 >=dev-libs/libxml2-2.4.12:2 dev-libs/libxslt >=gnome-base/librsvg-2.22:2 >=gnome-extra/libgsf-1.14.24:=[introspection?] >=x11-libs/cairo-1.10:=[svg] >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/gtk+-3.20:3 >=x11-libs/pango-1.24:= x11-libs/libXext:= x11-libs/libXrender:= introspection? ( >=dev-libs/gobject-introspection-1:= >=gnome-extra/libgsf-1.14.23:= )
 SLOT=0.10
 SRC_URI=mirror://gnome/sources/goffice/0.10/goffice-0.10.47.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=840d876ec04669bec4b4acfefd98eabe
+_md5_=b706681372d7ed776bf639d73b26847b
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.24.20 b/metadata/md5-cache/x11-libs/gtk+-3.24.20
index 15b1b2743977..b3b60acff56d 100644
--- a/metadata/md5-cache/x11-libs/gtk+-3.24.20
+++ b/metadata/md5-cache/x11-libs/gtk+-3.24.20
@@ -4,7 +4,7 @@ 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 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.57.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(-)?] 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.14.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.14 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
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=3
 SRC_URI=mirror://gnome/sources/gtk+/3.24/gtk+-3.24.20.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9ce030301e43b0da57d93f39c333aae0
+_md5_=d688cecd876e3e1613129d2e13dd6217
diff --git a/metadata/md5-cache/x11-libs/gtk+extra-3.3.4 b/metadata/md5-cache/x11-libs/gtk+extra-3.3.4
index dbba9eae14f3..a470d1f179e7 100644
--- a/metadata/md5-cache/x11-libs/gtk+extra-3.3.4
+++ b/metadata/md5-cache/x11-libs/gtk+extra-3.3.4
@@ -4,11 +4,11 @@ DESCRIPTION=Useful Additional GTK+ widgets
 EAPI=6
 HOMEPAGE=http://gtkextra.sourceforge.net
 IUSE=+introspection static-libs test
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=FDL-1.1 LGPL-2
 RDEPEND=>=x11-libs/gtk+-2.12.0:2 dev-libs/glib:2 introspection? ( >=dev-libs/gobject-introspection-0.6.14:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/gtkextra/gtkextra-3.3.4.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d016949ebaec2e582630cb3f7a11c97e
+_md5_=feb78e241a983d582ce49141b7c534b1
diff --git a/metadata/md5-cache/x11-libs/gtksourceview-4.6.1 b/metadata/md5-cache/x11-libs/gtksourceview-4.6.1
new file mode 100644
index 000000000000..7ae08fe76843
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/gtksourceview-4.6.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.25 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) 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 test
+DEPEND=>=dev-libs/glib-2.48:2 >=x11-libs/gtk+-3.22:3[introspection?] >=dev-libs/libxml2-2.6:2 glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.42.0:= ) >=dev-libs/fribidi-0.19.7 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A text widget implementing syntax highlighting and other features
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/GtkSourceView
+IUSE=glade gtk-doc +introspection +vala test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.48:2 >=x11-libs/gtk+-3.22:3[introspection?] >=dev-libs/libxml2-2.6:2 glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.42.0:= ) >=dev-libs/fribidi-0.19.7
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=4
+SRC_URI=mirror://gnome/sources/gtksourceview/4.6/gtksourceview-4.6.1.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=daa7de81475fb04ef3c8dbc6393e1b31
diff --git a/metadata/md5-cache/x11-libs/pixman-0.38.4 b/metadata/md5-cache/x11-libs/pixman-0.38.4
deleted file mode 100644
index 4820593901bc..000000000000
--- a/metadata/md5-cache/x11-libs/pixman-0.38.4
+++ /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 unpack
-DESCRIPTION=Low-level pixel manipulation routines
-EAPI=7
-HOMEPAGE=http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/
-IUSE=altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3 abi_x86_32 abi_x86_64 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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/pixman-0.38.4.tar.gz
-_eclasses_=meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0e8584949a6584725dbbe4b0b9b54909
diff --git a/metadata/md5-cache/x11-libs/pixman-0.40.0 b/metadata/md5-cache/x11-libs/pixman-0.40.0
index 6c174524f41f..aafea08525f0 100644
--- a/metadata/md5-cache/x11-libs/pixman-0.40.0
+++ b/metadata/md5-cache/x11-libs/pixman-0.40.0
@@ -4,9 +4,9 @@ DESCRIPTION=Low-level pixel manipulation routines
 EAPI=7
 HOMEPAGE=http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/
 IUSE=cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 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 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/pixman-0.40.0.tar.xz
 _eclasses_=meson	8f7dc8ed2d76af0b33328789c017e677	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a74f6b3d0a125b074ccd96d46f70acb9
+_md5_=8b977c195d2887e5b91411ae1260e21d
diff --git a/metadata/md5-cache/x11-libs/qwt-6.1.4 b/metadata/md5-cache/x11-libs/qwt-6.1.4
index 2113a60d3bad..4ac8fae18962 100644
--- a/metadata/md5-cache/x11-libs/qwt-6.1.4
+++ b/metadata/md5-cache/x11-libs/qwt-6.1.4
@@ -4,10 +4,10 @@ DESCRIPTION=2D plotting library for Qt5
 EAPI=7
 HOMEPAGE=https://qwt.sourceforge.net/
 IUSE=designer doc examples mathml opengl svg
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 ~arm ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) opengl? ( dev-qt/qtopengl:5 virtual/opengl ) svg? ( dev-qt/qtsvg:5 )
 SLOT=6/1.4
 SRC_URI=mirror://sourceforge/project/qwt/qwt/6.1.4/qwt-6.1.4.tar.bz2
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=084bc62100567e0d435c347e9581f1a7
+_md5_=96897e6a3c3093a6cd046ea4da97e4d5
diff --git a/metadata/md5-cache/x11-libs/snorenotify-0.7.0-r1 b/metadata/md5-cache/x11-libs/snorenotify-0.7.0-r1
index 088cd8febe39..da50c540af94 100644
--- a/metadata/md5-cache/x11-libs/snorenotify-0.7.0-r1
+++ b/metadata/md5-cache/x11-libs/snorenotify-0.7.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Multi platform Qt notification framework
 EAPI=7
 HOMEPAGE=https://techbase.kde.org/Projects/Snorenotify
 IUSE=sound test test debug
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-3+
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 sound? ( dev-qt/qtmultimedia:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://kde/stable/snorenotify/0.7.0/src/snorenotify-0.7.0.tar.xz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f1057c985709e69f9527c4420915cedd
+_md5_=876a02f5b20b72c0ddb7c6ebc951850d
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 5f2aa1060ced..22f6f731dfe5 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/alacarte-3.36.0 b/metadata/md5-cache/x11-misc/alacarte-3.36.0
index 88f89555847c..50cca788e44c 100644
--- a/metadata/md5-cache/x11-misc/alacarte-3.36.0
+++ b/metadata/md5-cache/x11-misc/alacarte-3.36.0
@@ -4,11 +4,11 @@ DESCRIPTION=Simple GNOME menu editor
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/alacarte
 IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~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] ) 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[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/gnome-menus-3.5.3:3[introspection] x11-libs/gdk-pixbuf:2[introspection] 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=mirror://gnome/sources/alacarte/3.36/alacarte-3.36.0.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9509263b884252e3277c215dd4807258
+_md5_=e5eb0d12c01eb6075a4a354191a7ab62
diff --git a/metadata/md5-cache/x11-misc/fraqtive-0.4.8-r2 b/metadata/md5-cache/x11-misc/fraqtive-0.4.8-r2
index 984d481f3bd4..65d5ab0d96d5 100644
--- a/metadata/md5-cache/x11-misc/fraqtive-0.4.8-r2
+++ b/metadata/md5-cache/x11-misc/fraqtive-0.4.8-r2
@@ -11,4 +11,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtxml:5 virtual/
 SLOT=0
 SRC_URI=mirror://sourceforge/fraqtive/fraqtive-0.4.8.tar.bz2
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=95e381838050cfd7caa812454617302c
+_md5_=73afc1a1807ddbf32fc8a32d08c18dc5
diff --git a/metadata/md5-cache/x11-misc/lightdm-1.28.0 b/metadata/md5-cache/x11-misc/lightdm-1.28.0
deleted file mode 100644
index 358609a24385..000000000000
--- a/metadata/md5-cache/x11-misc/lightdm-1.28.0
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/glib-2.44.0:2 dev-libs/libxml2 sys-libs/pam x11-libs/libX11 >=x11-libs/libxklavier-5 audit? ( sys-process/audit ) gnome? ( sys-apps/accountsservice ) introspection? ( >=dev-libs/gobject-introspection-1 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 ) dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig gnome? ( gnome-base/gnome-common ) vala? ( || ( dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=A lightweight display manager
-EAPI=6
-HOMEPAGE=https://github.com/CanonicalLtd/lightdm
-IUSE=audit +gnome +gtk +introspection qt5 vala
-KEYWORDS=amd64 arm arm64 ppc ppc64 x86
-LICENSE=GPL-3 LGPL-3
-PDEPEND=gtk? ( x11-misc/lightdm-gtk-greeter )
-RDEPEND=>=dev-libs/glib-2.44.0:2 dev-libs/libxml2 sys-libs/pam x11-libs/libX11 >=x11-libs/libxklavier-5 audit? ( sys-process/audit ) gnome? ( sys-apps/accountsservice ) introspection? ( >=dev-libs/gobject-introspection-1 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 ) >=sys-auth/pambase-20101024-r2
-REQUIRED_USE=vala? ( introspection )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/CanonicalLtd/lightdm/releases/download/1.28.0/lightdm-1.28.0.tar.xz mirror://gentoo/introspection-20110205.m4.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3f0f074f4058d8a0e8d4654e14307915
diff --git a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.6 b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.6
deleted file mode 100644
index 3c19bdf42232..000000000000
--- a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=appindicator? ( dev-libs/libindicator:3 ) x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 dev-util/intltool sys-devel/gettext xfce-base/exo >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=LightDM GTK+ Greeter
-EAPI=6
-HOMEPAGE=https://launchpad.net/lightdm-gtk-greeter
-IUSE=appindicator branding
-KEYWORDS=~alpha amd64 arm arm64 ppc ppc64 x86
-LICENSE=GPL-3 LGPL-3 branding? ( CC-BY-3.0 )
-RDEPEND=appindicator? ( dev-libs/libindicator:3 ) x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 x11-themes/gnome-themes-standard >=x11-themes/adwaita-icon-theme-3.14.1
-SLOT=0
-SRC_URI=https://launchpad.net/lightdm-gtk-greeter/2.0/2.0.6/+download/lightdm-gtk-greeter-2.0.6.tar.gz branding? ( https://dev.gentoo.org/~polynomial-c/dist/lightdm-gentoo-patch-2.tar.gz )
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1b4c082dc3512626a06aba6120ef6887
diff --git a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.8 b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.8
new file mode 100644
index 000000000000..46f29dae74bf
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.8
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool dev-util/xfce4-dev-tools 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 postrm prepare
+DEPEND=appindicator? ( dev-libs/libindicator:3 ) x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2
+DESCRIPTION=LightDM GTK+ Greeter
+EAPI=7
+HOMEPAGE=https://github.com/Xubuntu/lightdm-gtk-greeter
+IUSE=appindicator branding
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-3 LGPL-3 branding? ( CC-BY-3.0 )
+RDEPEND=appindicator? ( dev-libs/libindicator:3 ) x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 x11-themes/gnome-themes-standard >=x11-themes/adwaita-icon-theme-3.14.1
+SLOT=0
+SRC_URI=https://github.com/Xubuntu/lightdm-gtk-greeter/releases/download/lightdm-gtk-greeter-2.0.8/lightdm-gtk-greeter-2.0.8.tar.gz branding? ( https://dev.gentoo.org/~polynomial-c/dist/lightdm-gentoo-patch-2.tar.gz )
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ddd5581a99b9b2cf771a446c610558eb
diff --git a/metadata/md5-cache/x11-misc/menumaker-0.99.10 b/metadata/md5-cache/x11-misc/menumaker-0.99.10
deleted file mode 100644
index 52ab4c44de16..000000000000
--- a/metadata/md5-cache/x11-misc/menumaker-0.99.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] doc? ( sys-apps/texinfo ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Utility that scans through the system and generates a menu of installed programs
-EAPI=6
-HOMEPAGE=http://menumaker.sourceforge.net/
-IUSE=doc python_targets_python3_6
-KEYWORDS=amd64 ~ppc x86
-LICENSE=BSD
-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/menumaker/menumaker-0.99.10.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=daf5581351de5cb5b994682751874841
diff --git a/metadata/md5-cache/x11-misc/menumaker-0.99.12 b/metadata/md5-cache/x11-misc/menumaker-0.99.12
new file mode 100644
index 000000000000..7d113e6f7f6b
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/menumaker-0.99.12
@@ -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=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_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? ( sys-apps/texinfo )
+DESCRIPTION=Utility that scans through the system and generates a menu of installed programs
+EAPI=7
+HOMEPAGE=http://menumaker.sourceforge.net/
+IUSE=doc python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~ppc ~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] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=mirror://sourceforge/menumaker/menumaker-0.99.12.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e6a4180ec8596a9ff71af2d96fcd1ff3
diff --git a/metadata/md5-cache/x11-misc/obmenu-generator-0.88 b/metadata/md5-cache/x11-misc/obmenu-generator-0.88
new file mode 100644
index 000000000000..18d8baf500aa
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/obmenu-generator-0.88
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=A fast pipe/static menu generator for the Openbox Window Manager
+EAPI=7
+HOMEPAGE=https://github.com/trizen/obmenu-generator
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-lang/perl[gdbm] dev-perl/Data-Dump >=dev-perl/Linux-DesktopFiles-0.90.0 x11-wm/openbox
+SLOT=0
+SRC_URI=https://github.com/trizen/obmenu-generator/archive/0.88.tar.gz -> obmenu-generator-0.88.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5
+_md5_=e97d3058f1b6b5cdee7efc7005206a9d
diff --git a/metadata/md5-cache/x11-misc/projecteur-0.7-r2 b/metadata/md5-cache/x11-misc/projecteur-0.7-r2
index 7f8f73d2dc07..1ec276da7a27 100644
--- a/metadata/md5-cache/x11-misc/projecteur-0.7-r2
+++ b/metadata/md5-cache/x11-misc/projecteur-0.7-r2
@@ -4,10 +4,10 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 || ( dev-qt/qtgui:5[X(-)] dev-qt/q
 DESCRIPTION=Linux Desktop Application for the Logitech Spotlight device
 EAPI=7
 HOMEPAGE=https://github.com/jahnf/Projecteur
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/udev x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/jahnf/Projecteur/archive/v0.7.tar.gz -> projecteur-0.7.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=203f6a94b512df64ab56657c80c55c81
+_md5_=6d0952c0d8a2cf5d9a558006c6f9973a
diff --git a/metadata/md5-cache/x11-misc/spacefm-1.0.6 b/metadata/md5-cache/x11-misc/spacefm-1.0.6
index 513c131b1b49..8f0443c2a7ef 100644
--- a/metadata/md5-cache/x11-misc/spacefm-1.0.6
+++ b/metadata/md5-cache/x11-misc/spacefm-1.0.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-libs/glib:2 dev-util/desktop-file-utils >=virtual/udev-143 virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango x11-libs/libX11 x11-misc/shared-mime-info gtk2? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk2? ( x11-libs/gtk+:3 ) startup-notification? ( x11-libs/startup-notification ) video-thumbnails? ( media-video/ffmpegthumbnailer )
 SLOT=0
 SRC_URI=https://github.com/IgnorantGuru/spacefm/archive/1.0.6.tar.gz -> spacefm-1.0.6.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fe099d63ce9c81df848be23c9282044b
diff --git a/metadata/md5-cache/x11-misc/spacefm-9999 b/metadata/md5-cache/x11-misc/spacefm-9999
index 48e66ee0d7f8..350687306162 100644
--- a/metadata/md5-cache/x11-misc/spacefm-9999
+++ b/metadata/md5-cache/x11-misc/spacefm-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2.1
 PROPERTIES=live
 RDEPEND=dev-libs/glib:2 dev-util/desktop-file-utils >=virtual/udev-143 virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango x11-libs/libX11 x11-misc/shared-mime-info gtk2? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk2? ( x11-libs/gtk+:3 ) startup-notification? ( x11-libs/startup-notification ) video-thumbnails? ( media-video/ffmpegthumbnailer )
 SLOT=0
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a0ea0b0fe2649d8b18d1d416604bac15
diff --git a/metadata/md5-cache/x11-misc/virtualgl-2.6.3 b/metadata/md5-cache/x11-misc/virtualgl-2.6.3
deleted file mode 100644
index 09ee20741ea4..000000000000
--- a/metadata/md5-cache/x11-misc/virtualgl-2.6.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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/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/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/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(-)?] 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(-)?] 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(-)?] amd64? ( abi_x86_32? ( >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXtst-1.2.3[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) )
-DESCRIPTION=Run OpenGL applications remotely with full 3D hardware acceleration
-EAPI=7
-HOMEPAGE=https://www.virtualgl.org/
-IUSE=libressl 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
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1 wxWinLL-3.1 FLTK
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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/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/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/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(-)?] 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(-)?] 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(-)?] amd64? ( abi_x86_32? ( >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXtst-1.2.3[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/virtualgl/2.6.3/VirtualGL-2.6.3.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f2e0246d67455f744b21deea8d0cdf53
diff --git a/metadata/md5-cache/x11-misc/virtualgl-2.6.4 b/metadata/md5-cache/x11-misc/virtualgl-2.6.4
new file mode 100644
index 000000000000..8a307ee1e7eb
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/virtualgl-2.6.4
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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/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/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/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(-)?] 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(-)?] virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] amd64? ( abi_x86_32? ( >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXtst-1.2.3[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] virtual/opencl[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) )
+DESCRIPTION=Run OpenGL applications remotely with full 3D hardware acceleration
+EAPI=7
+HOMEPAGE=https://www.virtualgl.org/
+IUSE=libressl 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
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1 wxWinLL-3.1 FLTK
+RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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/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/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/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(-)?] 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(-)?] virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] amd64? ( abi_x86_32? ( >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXtst-1.2.3[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] virtual/opencl[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/project/virtualgl/2.6.4/VirtualGL-2.6.4.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=56164af3f994fb2f5835fa664f8aaaae
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-9999 b/metadata/md5-cache/x11-misc/xkeyboard-config-9999
index 5592466856e3..7c99f1702a35 100644
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-9999
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-9999
@@ -1,11 +1,10 @@
-BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/intltool 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 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=configure prepare setup test unpack
-DEPEND=>=x11-misc/util-macros-1.18
+BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-libs/libxslt sys-devel/gettext >=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 setup test unpack
 DESCRIPTION=X keyboard configuration database
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config
 LICENSE=MIT
 PROPERTIES=live
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9cb473724a5db45764e6bdd18d18747f
+_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=86f2aeddf1fc85f0ebe00a29da9da9e1
diff --git a/metadata/md5-cache/x11-misc/xmobar-0.23.1 b/metadata/md5-cache/x11-misc/xmobar-0.23.1
deleted file mode 100644
index 3662c1e8e43d..000000000000
--- a/metadata/md5-cache/x11-misc/xmobar-0.23.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/http-4000.2.4:= >=dev-haskell/mtl-2.1:= <dev-haskell/mtl-2.3:= dev-haskell/old-locale:= >=dev-haskell/parsec-3.1:= <dev-haskell/parsec-3.2:= dev-haskell/regex-compat:= >=dev-haskell/stm-2.3:= <dev-haskell/stm-2.5:= dev-haskell/transformers:= >=dev-haskell/utf8-string-0.3:= <dev-haskell/utf8-string-1.1:= >=dev-haskell/x11-1.6.1:= >=dev-lang/ghc-7.4.1:= x11-libs/libXrandr x11-libs/libXrender alsa? ( >=dev-haskell/alsa-core-0.5:= <dev-haskell/alsa-core-0.6:= >=dev-haskell/alsa-mixer-0.2:= <dev-haskell/alsa-mixer-0.3:= ) dbus? ( >=dev-haskell/dbus-0.10:= ) inotify? ( >=dev-haskell/hinotify-0.3:= <dev-haskell/hinotify-0.4:= ) mpd? ( >=dev-haskell/libmpd-0.9:= <dev-haskell/libmpd-0.10:= ) mpris? ( >=dev-haskell/dbus-0.10:= ) timezone? ( >=dev-haskell/timezone-olson-0.1:= <dev-haskell/timezone-olson-0.2:= >=dev-haskell/timezone-series-0.1:= <dev-haskell/timezone-series-0.2:= ) wifi? ( net-wireless/wireless-tools ) xft? ( >=dev-haskell/x11-xft-0.2:= <dev-haskell/x11-xft-0.4:= ) xpm? ( x11-libs/libXpm ) >=dev-haskell/cabal-1.6
-DESCRIPTION=A Minimalistic Text Based Status Bar
-EAPI=5
-HOMEPAGE=https://xmobar.org
-IUSE=alsa dbus inotify mpd mpris timezone wifi xft xpm
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/http-4000.2.4:= >=dev-haskell/mtl-2.1:= <dev-haskell/mtl-2.3:= dev-haskell/old-locale:= >=dev-haskell/parsec-3.1:= <dev-haskell/parsec-3.2:= dev-haskell/regex-compat:= >=dev-haskell/stm-2.3:= <dev-haskell/stm-2.5:= dev-haskell/transformers:= >=dev-haskell/utf8-string-0.3:= <dev-haskell/utf8-string-1.1:= >=dev-haskell/x11-1.6.1:= >=dev-lang/ghc-7.4.1:= x11-libs/libXrandr x11-libs/libXrender alsa? ( >=dev-haskell/alsa-core-0.5:= <dev-haskell/alsa-core-0.6:= >=dev-haskell/alsa-mixer-0.2:= <dev-haskell/alsa-mixer-0.3:= ) dbus? ( >=dev-haskell/dbus-0.10:= ) inotify? ( >=dev-haskell/hinotify-0.3:= <dev-haskell/hinotify-0.4:= ) mpd? ( >=dev-haskell/libmpd-0.9:= <dev-haskell/libmpd-0.10:= ) mpris? ( >=dev-haskell/dbus-0.10:= ) timezone? ( >=dev-haskell/timezone-olson-0.1:= <dev-haskell/timezone-olson-0.2:= >=dev-haskell/timezone-series-0.1:= <dev-haskell/timezone-series-0.2:= ) wifi? ( net-wireless/wireless-tools ) xft? ( >=dev-haskell/x11-xft-0.2:= <dev-haskell/x11-xft-0.4:= ) xpm? ( x11-libs/libXpm )
-SLOT=0
-SRC_URI=https://hackage.haskell.org/package/xmobar-0.23.1/xmobar-0.23.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=57e714b110aaedefa56062bdfcae59e8
diff --git a/metadata/md5-cache/x11-misc/xmobar-0.24.2 b/metadata/md5-cache/x11-misc/xmobar-0.24.2
deleted file mode 100644
index 023c9e59cdf1..000000000000
--- a/metadata/md5-cache/x11-misc/xmobar-0.24.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/http-4000.2.4:= >=dev-haskell/mtl-2.1:= <dev-haskell/mtl-2.3:= dev-haskell/old-locale:= >=dev-haskell/parsec-3.1:= <dev-haskell/parsec-3.2:= dev-haskell/regex-compat:= >=dev-haskell/stm-2.3:= <dev-haskell/stm-2.5:= dev-haskell/transformers:= >=dev-haskell/utf8-string-0.3:= <dev-haskell/utf8-string-1.1:= >=dev-haskell/x11-1.6.1:= >=dev-lang/ghc-7.4.1:= x11-libs/libXrandr x11-libs/libXrender alsa? ( >=dev-haskell/alsa-core-0.5:= <dev-haskell/alsa-core-0.6:= >dev-haskell/alsa-mixer-0.2.0.2:= ) dbus? ( >=dev-haskell/dbus-0.10:= ) inotify? ( >=dev-haskell/hinotify-0.3:= <dev-haskell/hinotify-0.4:= ) mpd? ( >=dev-haskell/libmpd-0.9:= <dev-haskell/libmpd-0.10:= ) mpris? ( >=dev-haskell/dbus-0.10:= ) timezone? ( >=dev-haskell/timezone-olson-0.1:= <dev-haskell/timezone-olson-0.2:= >=dev-haskell/timezone-series-0.1:= <dev-haskell/timezone-series-0.2:= ) wifi? ( net-wireless/wireless-tools ) conduit? ( dev-haskell/http-conduit:= dev-haskell/http-types:= ) xft? ( >=dev-haskell/x11-xft-0.2:= <dev-haskell/x11-xft-0.4:= ) xpm? ( x11-libs/libXpm ) >=dev-haskell/cabal-1.6
-DESCRIPTION=A Minimalistic Text Based Status Bar
-EAPI=6
-HOMEPAGE=https://xmobar.org
-IUSE=alsa dbus inotify mpd mpris timezone wifi conduit uvmeter xft xpm
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/http-4000.2.4:= >=dev-haskell/mtl-2.1:= <dev-haskell/mtl-2.3:= dev-haskell/old-locale:= >=dev-haskell/parsec-3.1:= <dev-haskell/parsec-3.2:= dev-haskell/regex-compat:= >=dev-haskell/stm-2.3:= <dev-haskell/stm-2.5:= dev-haskell/transformers:= >=dev-haskell/utf8-string-0.3:= <dev-haskell/utf8-string-1.1:= >=dev-haskell/x11-1.6.1:= >=dev-lang/ghc-7.4.1:= x11-libs/libXrandr x11-libs/libXrender alsa? ( >=dev-haskell/alsa-core-0.5:= <dev-haskell/alsa-core-0.6:= >dev-haskell/alsa-mixer-0.2.0.2:= ) dbus? ( >=dev-haskell/dbus-0.10:= ) inotify? ( >=dev-haskell/hinotify-0.3:= <dev-haskell/hinotify-0.4:= ) mpd? ( >=dev-haskell/libmpd-0.9:= <dev-haskell/libmpd-0.10:= ) mpris? ( >=dev-haskell/dbus-0.10:= ) timezone? ( >=dev-haskell/timezone-olson-0.1:= <dev-haskell/timezone-olson-0.2:= >=dev-haskell/timezone-series-0.1:= <dev-haskell/timezone-series-0.2:= ) wifi? ( net-wireless/wireless-tools ) conduit? ( dev-haskell/http-conduit:= dev-haskell/http-types:= ) xft? ( >=dev-haskell/x11-xft-0.2:= <dev-haskell/x11-xft-0.4:= ) xpm? ( x11-libs/libXpm )
-SLOT=0
-SRC_URI=https://hackage.haskell.org/package/xmobar-0.24.2/xmobar-0.24.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d4eb8fa26a3b27a7ea565cc1250b118f
diff --git a/metadata/md5-cache/x11-misc/xmobar-0.24.3 b/metadata/md5-cache/x11-misc/xmobar-0.24.3
deleted file mode 100644
index ccce13c4814b..000000000000
--- a/metadata/md5-cache/x11-misc/xmobar-0.24.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/http-4000.2.4:= >=dev-haskell/mtl-2.1:= <dev-haskell/mtl-2.3:= dev-haskell/old-locale:= >=dev-haskell/parsec-3.1:= <dev-haskell/parsec-3.2:= dev-haskell/regex-compat:= >=dev-haskell/stm-2.3:= <dev-haskell/stm-2.5:= >=dev-haskell/utf8-string-0.3:= <dev-haskell/utf8-string-1.1:= >=dev-haskell/x11-1.6.1:= >=dev-lang/ghc-7.8.2:= x11-libs/libXrandr x11-libs/libXrender alsa? ( >=dev-haskell/alsa-core-0.5:= <dev-haskell/alsa-core-0.6:= >dev-haskell/alsa-mixer-0.2.0.2:= ) dbus? ( >=dev-haskell/dbus-0.10:= ) inotify? ( >=dev-haskell/hinotify-0.3:= <dev-haskell/hinotify-0.4:= ) mpd? ( >=dev-haskell/libmpd-0.9:= <dev-haskell/libmpd-0.10:= ) mpris? ( >=dev-haskell/dbus-0.10:= ) timezone? ( >=dev-haskell/timezone-olson-0.1:= <dev-haskell/timezone-olson-0.2:= >=dev-haskell/timezone-series-0.1:= <dev-haskell/timezone-series-0.2:= ) wifi? ( net-wireless/wireless-tools ) conduit? ( dev-haskell/http-conduit:= dev-haskell/http-types:= ) xft? ( >=dev-haskell/x11-xft-0.2:= <dev-haskell/x11-xft-0.4:= ) xpm? ( x11-libs/libXpm ) >=dev-haskell/cabal-1.18.1.3
-DESCRIPTION=A Minimalistic Text Based Status Bar
-EAPI=6
-HOMEPAGE=https://xmobar.org
-IUSE=alsa dbus inotify mpd mpris timezone wifi conduit uvmeter xft xpm
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/http-4000.2.4:= >=dev-haskell/mtl-2.1:= <dev-haskell/mtl-2.3:= dev-haskell/old-locale:= >=dev-haskell/parsec-3.1:= <dev-haskell/parsec-3.2:= dev-haskell/regex-compat:= >=dev-haskell/stm-2.3:= <dev-haskell/stm-2.5:= >=dev-haskell/utf8-string-0.3:= <dev-haskell/utf8-string-1.1:= >=dev-haskell/x11-1.6.1:= >=dev-lang/ghc-7.8.2:= x11-libs/libXrandr x11-libs/libXrender alsa? ( >=dev-haskell/alsa-core-0.5:= <dev-haskell/alsa-core-0.6:= >dev-haskell/alsa-mixer-0.2.0.2:= ) dbus? ( >=dev-haskell/dbus-0.10:= ) inotify? ( >=dev-haskell/hinotify-0.3:= <dev-haskell/hinotify-0.4:= ) mpd? ( >=dev-haskell/libmpd-0.9:= <dev-haskell/libmpd-0.10:= ) mpris? ( >=dev-haskell/dbus-0.10:= ) timezone? ( >=dev-haskell/timezone-olson-0.1:= <dev-haskell/timezone-olson-0.2:= >=dev-haskell/timezone-series-0.1:= <dev-haskell/timezone-series-0.2:= ) wifi? ( net-wireless/wireless-tools ) conduit? ( dev-haskell/http-conduit:= dev-haskell/http-types:= ) xft? ( >=dev-haskell/x11-xft-0.2:= <dev-haskell/x11-xft-0.4:= ) xpm? ( x11-libs/libXpm )
-SLOT=0
-SRC_URI=https://hackage.haskell.org/package/xmobar-0.24.3/xmobar-0.24.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c20aa3eab70cbc1bfd510198e2b0ec86
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.44-r2 b/metadata/md5-cache/x11-misc/xscreensaver-5.44-r2
index ef6ba2eb09bd..e7bcf2300b4f 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.44-r2
+++ b/metadata/md5-cache/x11-misc/xscreensaver-5.44-r2
@@ -1,14 +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=>=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/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 ) dev-util/intltool sys-devel/bc sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto
+DEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86vm caps? ( sys-libs/libcap ) gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[X] ) gtk? ( x11-libs/gtk+:2 ) 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 ) dev-util/intltool sys-devel/bc sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto
 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
+IUSE=caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid xinerama
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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/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 )
+RDEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86vm caps? ( sys-libs/libcap ) gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[X] ) gtk? ( x11-libs/gtk+:2 ) 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 )
+REQUIRED_USE=gdk-pixbuf? ( gtk )
 SLOT=0
 SRC_URI=https://www.jwz.org/xscreensaver/xscreensaver-5.44.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fc36427519f5506740de41317c114b27
+_md5_=4f7e6058266d977d570e5217bf8e0662
diff --git a/metadata/md5-cache/x11-misc/xvfb-run-1.20.8_p2 b/metadata/md5-cache/x11-misc/xvfb-run-1.20.8_p2
index bce45cfb4a4e..2c1f401cdfea 100644
--- a/metadata/md5-cache/x11-misc/xvfb-run-1.20.8_p2
+++ b/metadata/md5-cache/x11-misc/xvfb-run-1.20.8_p2
@@ -3,9 +3,9 @@ DEPEND=dev-util/patchutils
 DESCRIPTION=Run a command in a virtual X server environment
 EAPI=7
 HOMEPAGE=https://packages.debian.org/sid/xvfb
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
 RDEPEND=x11-apps/xauth x11-base/xorg-server[xvfb]
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xorg-server/xorg-server_1.20.8-2.diff.gz
-_md5_=a275dbe868ce3aabff34ded1d09b84bb
+_md5_=538ef126b2cee3cd2e5b2832d6b8e9c1
diff --git a/metadata/md5-cache/x11-misc/zim-0.73.1 b/metadata/md5-cache/x11-misc/zim-0.73.1
new file mode 100644
index 000000000000..9b5fb2721c4e
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/zim-0.73.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] )
+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(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/pyxdg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] ) 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=test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+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(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/pyxdg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] ) 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] ) 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] )
+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/zim-desktop-wiki/zim-desktop-wiki/archive/0.73.1.tar.gz -> zim-0.73.1.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=02ab924d93db2be1dadec78134907adb
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index 153906a12894..e34fe8c6c895 100644
--- a/metadata/md5-cache/x11-plugins/Manifest.gz
+++ b/metadata/md5-cache/x11-plugins/Manifest.gz
diff --git a/metadata/md5-cache/x11-plugins/enigmail-2.1.7 b/metadata/md5-cache/x11-plugins/enigmail-2.1.7
new file mode 100644
index 000000000000..c1667d73a6c1
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/enigmail-2.1.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst setup
+DEPEND=( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt5(-)] ) ) !<mail-client/thunderbird-52.5.0 || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) app-arch/zip dev-lang/perl
+DESCRIPTION=Mozilla extension to provide GPG support in mail clients
+EAPI=7
+HOMEPAGE=https://www.enigmail.net/
+KEYWORDS=~alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
+LICENSE=MPL-2.0 GPL-3
+RDEPEND=( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt5(-)] ) ) !<mail-client/thunderbird-52.5.0
+SLOT=0
+SRC_URI=https://www.enigmail.net/download/source/enigmail-2.1.7.tar.gz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=42e8d71e201bc339aa028749bb7b8434
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-countdown-0.1.2-r1 b/metadata/md5-cache/x11-plugins/gkrellm-countdown-0.1.2-r1
index efcb4f320f22..5fc158071f75 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-countdown-0.1.2-r1
+++ b/metadata/md5-cache/x11-plugins/gkrellm-countdown-0.1.2-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install
 DEPEND=app-admin/gkrellm:2[X] virtual/pkgconfig
 DESCRIPTION=A simple countdown clock for GKrellM2
 EAPI=6
-HOMEPAGE=http://freecode.com/projects/gkrellm-countdown
+HOMEPAGE=http://freshmeat.sourceforge.net/projects/gkrellm-countdown
 KEYWORDS=~amd64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X]
 SLOT=0
 SRC_URI=http://oss.pugsplace.net/gkrellm-countdown-0.1.2.tar.gz
 _eclasses_=gkrellm-plugin	c01023a3c28bc24f50c00ae019e8861e	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c3bf2736a10620c19bc3b820b9d7ab09
+_md5_=b123ce8b0bf98cd09c5954fa234b5c7c
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 8aef2e01134b..7886b383f35d 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/kitty-0.18.1 b/metadata/md5-cache/x11-terms/kitty-0.18.1
new file mode 100644
index 000000000000..83d6e9cf22a6
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/kitty-0.18.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile 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] ) media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-1.5.0:= media-libs/libcanberra media-libs/libpng:0= sys-apps/dbus sys-libs/zlib x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-terms/kitty-terminfo wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.17 ) python_single_target_python3_6? ( dev-python/importlib_resources[python_targets_python3_6(-)] ) media-libs/mesa[X] sys-libs/ncurses dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A modern, hackable, featureful, OpenGL-based terminal emulator
+EAPI=7
+HOMEPAGE=https://github.com/kovidgoyal/kitty
+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= sys-apps/dbus sys-libs/zlib x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-terms/kitty-terminfo wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.17 ) python_single_target_python3_6? ( dev-python/importlib_resources[python_targets_python3_6(-)] )
+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.18.1/kitty-0.18.1.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=56976da0393d6580ac9f782e9ef802e8
diff --git a/metadata/md5-cache/x11-terms/kitty-terminfo-0.18.1 b/metadata/md5-cache/x11-terms/kitty-terminfo-0.18.1
new file mode 100644
index 000000000000..fd7e8caecc62
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/kitty-terminfo-0.18.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Terminfo for kitty, an OpenGL-based terminal emulator
+EAPI=7
+HOMEPAGE=https://github.com/kovidgoyal/kitty
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.18.1/kitty-0.18.1.tar.xz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1a4ca7086456a32b942c8e0d6425a9fb
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index b3af1dbd91de..baa37a34ebbb 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/QGnomePlatform-0.6.1-r1 b/metadata/md5-cache/x11-themes/QGnomePlatform-0.6.1-r1
index 77fc19ecc5df..7723df0bae0d 100644
--- a/metadata/md5-cache/x11-themes/QGnomePlatform-0.6.1-r1
+++ b/metadata/md5-cache/x11-themes/QGnomePlatform-0.6.1-r1
@@ -4,10 +4,10 @@ DEPEND=dev-qt/qtdbus:5= >=dev-qt/qtwidgets-5.6:5= dev-qt/qtwayland:5= dev-qt/qtx
 DESCRIPTION=A Qt Platform Theme aimed to accommodate GNOME settings
 EAPI=7
 HOMEPAGE=https://github.com/FedoraQt/QGnomePlatform
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-qt/qtdbus:5= >=dev-qt/qtwidgets-5.6:5= dev-qt/qtwayland:5= dev-qt/qtx11extras:5= x11-libs/gtk+:3[X]
 SLOT=0
 SRC_URI=https://github.com/FedoraQt/QGnomePlatform/archive/0.6.1.tar.gz -> QGnomePlatform-0.6.1.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=63ea9bab7c3ae03c19c7a4a1c98124a2
+_md5_=d6b18bf8d570e6725f1a2f151a9ff688
diff --git a/metadata/md5-cache/x11-themes/adwaita-qt-1.1.4 b/metadata/md5-cache/x11-themes/adwaita-qt-1.1.4
index 67fb37a5eb37..1cbdf8547091 100644
--- a/metadata/md5-cache/x11-themes/adwaita-qt-1.1.4
+++ b/metadata/md5-cache/x11-themes/adwaita-qt-1.1.4
@@ -5,10 +5,10 @@ DESCRIPTION=A style to bend Qt applications to look like they belong into GNOME
 EAPI=7
 HOMEPAGE=https://github.com/FedoraQt/adwaita-qt
 IUSE=gnome
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc64 x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 gnome? ( x11-themes/QGnomePlatform )
 SLOT=0
 SRC_URI=https://github.com/FedoraQt/adwaita-qt/archive/1.1.4/adwaita-qt-1.1.4.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7e021286a984adb5a72a2ffe3ef5bad2
+_md5_=30ef2fbf7e5fda99ba8a9ecb9dcb39d5
diff --git a/metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.15.1 b/metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.15.1
new file mode 100644
index 000000000000..d1574db670bd
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.15.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst postrm
+DEPEND=media-gfx/optipng sys-apps/findutils x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3
+DESCRIPTION=Elementary icons forked from upstream, extended and maintained for Xfce
+EAPI=7
+HOMEPAGE=https://github.com/shimmerproject/elementary-xfce
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain GPL-1 GPL-2 GPL-3
+SLOT=0
+SRC_URI=https://github.com/shimmerproject/elementary-xfce/archive/v0.15.1.tar.gz -> elementary-xfce-0.15.1.tar.gz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3c594fab5dffdfb72937fec61d84d6f2
diff --git a/metadata/md5-cache/x11-themes/gentoo-xcursors-0.3.1 b/metadata/md5-cache/x11-themes/gentoo-xcursors-0.3.1
deleted file mode 100644
index b682b60cb317..000000000000
--- a/metadata/md5-cache/x11-themes/gentoo-xcursors-0.3.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=A high quality set of animated mouse cursors
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=mirror://gentoo/gentoo-cursors-tad-0.3.1.tar.bz2
-_md5_=fd4abf3e30d7024c93d7dfeb08bd9bc2
diff --git a/metadata/md5-cache/x11-themes/gentoo-xcursors-0.3.2 b/metadata/md5-cache/x11-themes/gentoo-xcursors-0.3.2
index 496048d54fe9..343c9971adae 100644
--- a/metadata/md5-cache/x11-themes/gentoo-xcursors-0.3.2
+++ b/metadata/md5-cache/x11-themes/gentoo-xcursors-0.3.2
@@ -2,8 +2,8 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=A high quality set of animated mouse cursors
 EAPI=7
 HOMEPAGE=https://schlomp.space/tastytea/gentoo-xcursors
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://schlomp.space/tastytea/gentoo-xcursors/archive/0.3.2.tar.gz -> gentoo-xcursors-0.3.2.tar.gz
-_md5_=59f0ed9c2c26d9cf3fa23c331c7e94af
+_md5_=bba104621c9c291f89d1eb8aa0bb5ba9
diff --git a/metadata/md5-cache/x11-themes/icewm-extra-themes-1.2 b/metadata/md5-cache/x11-themes/icewm-extra-themes-1.2
index 9461ff1bd2bf..1422ab17beab 100644
--- a/metadata/md5-cache/x11-themes/icewm-extra-themes-1.2
+++ b/metadata/md5-cache/x11-themes/icewm-extra-themes-1.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-wm/icewm
 SLOT=0
 SRC_URI=https://github.com/bbidulock/icewm-extra-themes/releases/download/1.2/icewm-extra-themes-1.2.tar.lz
-_eclasses_=unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=5c3f74411341019adc2ca9144bf590a5
diff --git a/metadata/md5-cache/x11-themes/kvantum-0.14.1 b/metadata/md5-cache/x11-themes/kvantum-0.14.1
deleted file mode 100644
index 3b80b2b76477..000000000000
--- a/metadata/md5-cache/x11-themes/kvantum-0.14.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kwindowsystem:5 x11-libs/libX11 x11-libs/libXext
-DESCRIPTION=SVG-based theme engine for Qt5, KDE Plasma and LXQt
-EAPI=7
-HOMEPAGE=https://github.com/tsujan/Kvantum
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kwindowsystem:5 x11-libs/libX11 x11-libs/libXext
-SLOT=0
-SRC_URI=https://github.com/tsujan/Kvantum/archive/V0.14.1.tar.gz -> kvantum-0.14.1.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cca38d49f8193324983b1a747c431cf4
diff --git a/metadata/md5-cache/x11-themes/kvantum-0.15.2 b/metadata/md5-cache/x11-themes/kvantum-0.15.2
deleted file mode 100644
index 83ab4468934b..000000000000
--- a/metadata/md5-cache/x11-themes/kvantum-0.15.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kwindowsystem:5 x11-libs/libX11 x11-libs/libXext
-DESCRIPTION=SVG-based theme engine for Qt5, KDE and LXQt
-EAPI=7
-HOMEPAGE=https://github.com/tsujan/Kvantum
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kwindowsystem:5 x11-libs/libX11 x11-libs/libXext
-SLOT=0
-SRC_URI=https://github.com/tsujan/Kvantum/archive/V0.15.2.tar.gz -> kvantum-0.15.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=675b254b4a4203d2ad7f754e62a47d55
diff --git a/metadata/md5-cache/x11-themes/kvantum-0.16.0 b/metadata/md5-cache/x11-themes/kvantum-0.16.0
new file mode 100644
index 000000000000..e6c088073059
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/kvantum-0.16.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kwindowsystem:5 x11-libs/libX11 x11-libs/libXext
+DESCRIPTION=SVG-based theme engine for Qt5, KDE Plasma and LXQt
+EAPI=7
+HOMEPAGE=https://github.com/tsujan/Kvantum
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kwindowsystem:5 x11-libs/libX11 x11-libs/libXext
+SLOT=0
+SRC_URI=https://github.com/tsujan/Kvantum/archive/V0.16.0.tar.gz -> kvantum-0.16.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cca38d49f8193324983b1a747c431cf4
diff --git a/metadata/md5-cache/x11-themes/xxv-skins-1.6.1-r1 b/metadata/md5-cache/x11-themes/xxv-skins-1.6.1-r1
index 6b7ab6b7682a..51fcc3a3222b 100644
--- a/metadata/md5-cache/x11-themes/xxv-skins-1.6.1-r1
+++ b/metadata/md5-cache/x11-themes/xxv-skins-1.6.1-r1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install
 DESCRIPTION=Additional skins for XXV
 EAPI=5
-HOMEPAGE=http://projects.vdr-developer.org/projects/xxv
+HOMEPAGE=https://projects.vdr-developer.org/projects/xxv
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=~www-misc/xxv-1.6.1
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/719/xxv-skins-1.6.1.tgz mirror://vdr-developerorg/720/xxv-jason-1.6.1.tgz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b529a6601d60140d2eeeb6ba0235f1da
+_md5_=0e0226ddeff6c74ee8e6377831f84fe0
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index ef1b2abbd4d6..e683e5026d09 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/cwm-5.6 b/metadata/md5-cache/x11-wm/cwm-5.6
deleted file mode 100644
index 139353ed3c38..000000000000
--- a/metadata/md5-cache/x11-wm/cwm-5.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr virtual/pkgconfig sys-devel/bison
-DESCRIPTION=OpenBSD fork of calmwm, a clean and lightweight window manager
-EAPI=5
-HOMEPAGE=https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/ https://github.com/chneukirchen/cwm
-IUSE=vanilla
-KEYWORDS=amd64 arm x86
-LICENSE=ISC
-RDEPEND=x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr
-SLOT=0
-SRC_URI=vanilla? ( http://chneukirchen.org/releases/cwm-5.6.tar.gz -> cwm-5.6-chneukirchen.tar.gz ) !vanilla? ( https://github.com/xmw/cwm/tarball/ea9a436 -> cwm-5.6-xmw.tar.gz )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5a25fcf38e71a59de073d021fe268dff
diff --git a/metadata/md5-cache/x11-wm/cwm-6.7 b/metadata/md5-cache/x11-wm/cwm-6.7
new file mode 100644
index 000000000000..c1e22313e071
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/cwm-6.7
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/bison virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr
+DESCRIPTION=OpenBSD fork of calmwm, a clean and lightweight window manager
+EAPI=7
+HOMEPAGE=https://github.com/leahneukirchen/cwm https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=ISC
+RDEPEND=x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr
+SLOT=0
+SRC_URI=https://github.com/leahneukirchen/cwm/archive/v6.7.tar.gz -> cwm-6.7.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3a9fae011137eec18d59807450b0727a
diff --git a/metadata/md5-cache/x11-wm/cwm-9999 b/metadata/md5-cache/x11-wm/cwm-9999
index 33843225da07..bf6bcb8c0d9d 100644
--- a/metadata/md5-cache/x11-wm/cwm-9999
+++ b/metadata/md5-cache/x11-wm/cwm-9999
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile install unpack
 DEPEND=x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr
 DESCRIPTION=OpenBSD fork of calmwm, a clean and lightweight window manager
 EAPI=7
-HOMEPAGE=https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/ https://github.com/chneukirchen/cwm
+HOMEPAGE=https://github.com/leahneukirchen/cwm https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
 LICENSE=ISC
 PROPERTIES=live
 RDEPEND=x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr
 SLOT=0
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=18f868a76b4f771c8bc4e0fdaa1142fc
+_md5_=3a9fae011137eec18d59807450b0727a
diff --git a/metadata/md5-cache/x11-wm/i3-4.18.1 b/metadata/md5-cache/x11-wm/i3-4.18.1
index 1efca64df3dc..fef22df54ffc 100644
--- a/metadata/md5-cache/x11-wm/i3-4.18.1
+++ b/metadata/md5-cache/x11-wm/i3-4.18.1
@@ -5,7 +5,7 @@ DESCRIPTION=An improved dynamic tiling window manager
 EAPI=7
 HOMEPAGE=https://i3wm.org/
 IUSE=doc debug test test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config x11-libs/cairo[X,xcb(+)] x11-libs/pango[X] dev-lang/perl dev-perl/AnyEvent-I3 dev-perl/JSON-XS
 REQUIRED_USE=test? ( debug )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://i3wm.org/downloads/i3-4.18.1.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=5e9ad2d2a26f2e82288d1c0ae3ed34c9
+_md5_=06b0d93f4c25b1da0fdeb8ab2c364932
diff --git a/metadata/md5-cache/x11-wm/icewm-1.6.5 b/metadata/md5-cache/x11-wm/icewm-1.6.5
index 0516ffb1a4db..48a7328e5986 100644
--- a/metadata/md5-cache/x11-wm/icewm-1.6.5
+++ b/metadata/md5-cache/x11-wm/icewm-1.6.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( alsa ao )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ice-wm/icewm/releases/download/1.6.5/icewm-1.6.5.tar.lz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=1b596feb334c6835cba9b68e24856274
diff --git a/metadata/md5-cache/x11-wm/icewm-1.6.6 b/metadata/md5-cache/x11-wm/icewm-1.6.6
index e1a28b632ee8..830564e071b7 100644
--- a/metadata/md5-cache/x11-wm/icewm-1.6.6
+++ b/metadata/md5-cache/x11-wm/icewm-1.6.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( alsa ao )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ice-wm/icewm/releases/download/1.6.6/icewm-1.6.6.tar.lz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=1b596feb334c6835cba9b68e24856274
diff --git a/metadata/md5-cache/x11-wm/mutter-3.34.6-r1 b/metadata/md5-cache/x11-wm/mutter-3.34.6-r1
index 254a2edf16f3..550651eff054 100644
--- a/metadata/md5-cache/x11-wm/mutter-3.34.6-r1
+++ b/metadata/md5-cache/x11-wm/mutter-3.34.6-r1
@@ -5,7 +5,7 @@ DESCRIPTION=GNOME 3 compositing window manager based on Clutter
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/mutter/
 IUSE=elogind input_devices_wacom +introspection screencast +sysprof systemd test udev wayland test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=x11-libs/libX11 >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.30[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-3.33.0[introspection?] >=dev-libs/glib-2.61.1:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] gnome-base/gnome-desktop:3= >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXtst x11-libs/libxkbfile x11-misc/xkeyboard-config >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libXrender >=x11-libs/libXrandr-1.5.0 x11-libs/libxcb x11-libs/libXinerama x11-libs/libXau x11-libs/libICE >=dev-libs/atk-2.5.3[introspection?] >=media-libs/libcanberra-0.26 media-libs/mesa[X(+),egl] wayland? ( >=dev-libs/wayland-protocols-1.18 >=dev-libs/wayland-1.13.0 x11-libs/libdrm:= >=media-libs/mesa-10.3[egl,gbm,wayland,gles2] >=dev-libs/libinput-1.4 systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) x11-base/xorg-server[wayland] ) udev? ( >=dev-libs/libgudev-232:= >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.2.2:0/0.2 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) gnome-extra/zenity
 REQUIRED_USE=wayland? ( ^^ ( elogind systemd ) udev ) test? ( wayland )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=mirror://gnome/sources/mutter/3.34/mutter-3.34.6.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=56b316b178cc2057f2c4494f35729a90
+_md5_=140340bf6386aad3df0ed5f2f066b11c
diff --git a/metadata/md5-cache/x11-wm/mutter-3.34.6-r2 b/metadata/md5-cache/x11-wm/mutter-3.34.6-r2
new file mode 100644
index 000000000000..39bb6eec152f
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/mutter-3.34.6-r2
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/wayland >=dev-util/meson-0.50.0 dev-util/gdbus-codegen dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.5 ) wayland? ( >=sys-kernel/linux-headers-4.4 x11-base/xorg-server ) 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 test
+DEPEND=x11-libs/libX11 >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.30[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-3.33.0[introspection?] >=dev-libs/glib-2.61.1:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] gnome-base/gnome-desktop:3= >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXtst x11-libs/libxkbfile x11-misc/xkeyboard-config >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libXrender >=x11-libs/libXrandr-1.5.0 x11-libs/libxcb x11-libs/libXinerama x11-libs/libXau x11-libs/libICE >=dev-libs/atk-2.5.3[introspection?] >=media-libs/libcanberra-0.26 media-libs/mesa[X(+),egl] wayland? ( >=dev-libs/wayland-protocols-1.18 >=dev-libs/wayland-1.13.0 x11-libs/libdrm:= >=media-libs/mesa-10.3[egl,gbm,wayland,gles2] >=dev-libs/libinput-1.4 systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) x11-base/xorg-server[wayland] ) udev? ( >=dev-libs/libgudev-232:= >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) >=x11-libs/startup-notification-0.7 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) x11-base/xorg-proto sysprof? ( >=dev-util/sysprof-capture-3.34.1-r1:3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME 3 compositing window manager based on Clutter
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/GNOME/mutter/
+IUSE=elogind input_devices_wacom +introspection +sysprof systemd test udev wayland test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=x11-libs/libX11 >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.30[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-3.33.0[introspection?] >=dev-libs/glib-2.61.1:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] gnome-base/gnome-desktop:3= >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXtst x11-libs/libxkbfile x11-misc/xkeyboard-config >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libXrender >=x11-libs/libXrandr-1.5.0 x11-libs/libxcb x11-libs/libXinerama x11-libs/libXau x11-libs/libICE >=dev-libs/atk-2.5.3[introspection?] >=media-libs/libcanberra-0.26 media-libs/mesa[X(+),egl] wayland? ( >=dev-libs/wayland-protocols-1.18 >=dev-libs/wayland-1.13.0 x11-libs/libdrm:= >=media-libs/mesa-10.3[egl,gbm,wayland,gles2] >=dev-libs/libinput-1.4 systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) x11-base/xorg-server[wayland] ) udev? ( >=dev-libs/libgudev-232:= >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) >=x11-libs/startup-notification-0.7 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) gnome-extra/zenity
+REQUIRED_USE=wayland? ( ^^ ( elogind systemd ) udev ) test? ( wayland )
+RESTRICT=!test? ( test )
+SLOT=0/5
+SRC_URI=mirror://gnome/sources/mutter/3.34/mutter-3.34.6.tar.xz https://dev.gentoo.org/~leio/distfiles/mutter-3.34.6-patchset.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=39d4d75279a4f93e92ecab0346f2dbac
diff --git a/metadata/md5-cache/x11-wm/spectrwm-3.4.1 b/metadata/md5-cache/x11-wm/spectrwm-3.4.1
new file mode 100644
index 000000000000..11dba7d21ba9
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/spectrwm-3.4.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=elibc_musl? ( sys-libs/queue-standalone ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXt x11-libs/xcb-util
+DESCRIPTION=Small dynamic tiling window manager for X11
+EAPI=7
+HOMEPAGE=https://github.com/conformal/spectrwm
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=!x11-wm/scrotwm x11-misc/dmenu
+SLOT=0
+SRC_URI=https://github.com/conformal/spectrwm/archive/SPECTRWM_3_4_1.tar.gz -> spectrwm-3.4.1.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=03e6e0d98c685843a5b65056c7d27443
diff --git a/metadata/md5-cache/x11-wm/wmfs-99999999 b/metadata/md5-cache/x11-wm/wmfs-99999999
index 39d282241285..4263533becdd 100644
--- a/metadata/md5-cache/x11-wm/wmfs-99999999
+++ b/metadata/md5-cache/x11-wm/wmfs-99999999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=media-libs/freetype media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr
 SLOT=0
 _eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3a38a4ab673870bd54f0886d7ed97d99
+_md5_=1b8dad9a80b4a41fa32439099df03ac9
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 4fb20ef59233..5ab4ec575c41 100644
--- a/metadata/md5-cache/xfce-base/Manifest.gz
+++ b/metadata/md5-cache/xfce-base/Manifest.gz
diff --git a/metadata/md5-cache/xfce-base/libxfce4util-4.15.1 b/metadata/md5-cache/xfce-base/libxfce4util-4.15.1
new file mode 100644
index 000000000000..b2260f45226e
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/libxfce4util-4.15.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/glib-2.42 introspection? ( dev-libs/gobject-introspection:= ) dev-util/intltool dev-util/gtk-doc-am sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) )
+DESCRIPTION=A basic utility library for the Xfce desktop environment
+EAPI=7
+HOMEPAGE=https://git.xfce.org/xfce/libxfce4util/
+IUSE=introspection vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2+ GPL-2+
+RDEPEND=>=dev-libs/glib-2.42 introspection? ( dev-libs/gobject-introspection:= )
+REQUIRED_USE=vala? ( introspection )
+SLOT=0/7
+SRC_URI=https://archive.xfce.org/src/xfce/libxfce4util/4.15/libxfce4util-4.15.1.tar.bz2
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6
+_md5_=3f8d9b92f490fdc725847c5296eacf68
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.15.3 b/metadata/md5-cache/xfce-base/xfce4-panel-4.15.3
new file mode 100644
index 000000000000..5dd9cb8101b6
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfce4-panel-4.15.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=>=dev-libs/glib-2.42 >=x11-libs/cairo-1 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-0.5:= >=xfce-base/libxfce4ui-4.15.1:= >=xfce-base/libxfce4util-4.13:=[introspection?] >=xfce-base/xfconf-4.13:= introspection? ( dev-libs/gobject-introspection:= ) vala? ( || ( dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) dev-lang/perl dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=Panel for the Xfce desktop environment
+EAPI=7
+HOMEPAGE=https://www.xfce.org/projects/
+IUSE=introspection vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.42 >=x11-libs/cairo-1 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-0.5:= >=xfce-base/libxfce4ui-4.15.1:= >=xfce-base/libxfce4util-4.13:=[introspection?] >=xfce-base/xfconf-4.13:= introspection? ( dev-libs/gobject-introspection:= )
+REQUIRED_USE=vala? ( introspection )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfce4-panel/4.15/xfce4-panel-4.15.3.tar.bz2
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5209ed00da028aff39f280d446cadab5
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 5e972360622b..f5de3da76540 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-battery-plugin-1.1.3 b/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.3
index 6e3efd58268d..ddf37df17e7c 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.3
+++ b/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.24:2 >=x11-libs/gtk+-3.16:3 >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.12:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-battery-plugin/1.1/xfce4-battery-plugin-1.1.3.tar.bz2
-_eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6daa01b5013e2ae119916ca67769300a
diff --git a/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.2 b/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.2
index 4825d2d6eab0..956d668c401d 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=A panel plug-in for PulseAudio volume control
 EAPI=7
 HOMEPAGE=https://git.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/
 IUSE=debug keybinder libnotify wnck
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.42.0:= media-sound/pulseaudio:= >=x11-libs/gtk+-3.20.0:3= >=xfce-base/libxfce4ui-4.11.0:=[gtk3(+)] >=xfce-base/libxfce4util-4.9.0:= >=xfce-base/xfce4-panel-4.11.0:= >=xfce-base/xfconf-4.6.0:= keybinder? ( dev-libs/keybinder:3= ) libnotify? ( x11-libs/libnotify:= ) wnck? ( x11-libs/libwnck:3= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-pulseaudio-plugin/0.4/xfce4-pulseaudio-plugin-0.4.2.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6a0cf12c337d307bfccf499db3a9e586
+_md5_=f0c3f3ac85c6ba3863751434d554ed5f
diff --git a/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.3 b/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.3
index 1c2a4e0d6286..790cf5459576 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.3
+++ b/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.3
@@ -4,10 +4,10 @@ DESCRIPTION=A panel plug-in for PulseAudio volume control
 EAPI=7
 HOMEPAGE=https://git.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/
 IUSE=debug keybinder libnotify wnck
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.42.0:= media-sound/pulseaudio:= >=x11-libs/gtk+-3.20.0:3= >=xfce-base/exo-0.11:= >=xfce-base/libxfce4ui-4.11.0:=[gtk3(+)] >=xfce-base/libxfce4util-4.9.0:= >=xfce-base/xfce4-panel-4.11.0:= >=xfce-base/xfconf-4.6.0:= keybinder? ( dev-libs/keybinder:3= ) libnotify? ( x11-libs/libnotify:= ) wnck? ( x11-libs/libwnck:3= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-pulseaudio-plugin/0.4/xfce4-pulseaudio-plugin-0.4.3.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=12ca085e680fd3b70ec21d8a48697f24
+_md5_=307c01b0d50ee7adf8caa450d8c12939
diff --git a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.4.3 b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.4.3
index a2810e12b7c9..7df7e4bb16de 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.4.3
+++ b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.4.3
@@ -4,10 +4,10 @@ DEPEND=virtual/libintl x11-libs/gtk+:3 xfce-base/exo:= xfce-base/garcon:= xfce-b
 DESCRIPTION=Alternate application launcher for Xfce
 EAPI=7
 HOMEPAGE=https://gottcode.org/xfce4-whiskermenu-plugin/
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=virtual/libintl x11-libs/gtk+:3 xfce-base/exo:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/2.4/xfce4-whiskermenu-plugin-2.4.3.tar.bz2
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=823aac1e9badc27019b1ecbc7ac449d0
+_md5_=f93d2174ab9b6409c88a2c2d48af8b76
diff --git a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.4.4 b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.4.4
index 628cdaea1731..c7ae5e3a21fe 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.4.4
+++ b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.4.4
@@ -4,10 +4,10 @@ DEPEND=virtual/libintl x11-libs/gtk+:3 xfce-base/exo:= xfce-base/garcon:= xfce-b
 DESCRIPTION=Alternate application launcher for Xfce
 EAPI=7
 HOMEPAGE=https://gottcode.org/xfce4-whiskermenu-plugin/
-KEYWORDS=~amd64 ~arm x86
+KEYWORDS=~amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=virtual/libintl x11-libs/gtk+:3 xfce-base/exo:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/2.4/xfce4-whiskermenu-plugin-2.4.4.tar.bz2
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=29b8781e6b1085d9c2988ae6f0facc60
+_md5_=b0ddb23bd8c27c21f85fa78d7213ee4c
diff --git a/metadata/news/2020-06-23-upgrade-to-sys-libs_pam-1_4_0/2020-06-23-upgrade-to-sys-libs_pam-1_4_0.en.txt b/metadata/news/2020-06-23-upgrade-to-sys-libs_pam-1_4_0/2020-06-23-upgrade-to-sys-libs_pam-1_4_0.en.txt
new file mode 100644
index 000000000000..0c77c98637ba
--- /dev/null
+++ b/metadata/news/2020-06-23-upgrade-to-sys-libs_pam-1_4_0/2020-06-23-upgrade-to-sys-libs_pam-1_4_0.en.txt
@@ -0,0 +1,28 @@
+Title: sys-libs/pam-1.4.0 upgrade
+Author: Mikle Kolyada <zlogene@gentoo.org>
+Content-Type: text/plain
+Posted: 2020-06-23
+Revision: 1
+News-Item-Format: 2.0
+Display-If-Installed: sys-libs/pam
+Display-If-Installed: sys-auth/pambase
+
+Starting with the 1.4.0 release [1], we don't offer these modules anymore:
+
+* pam_tally and pam_tally2 have been deprecated and replaced
+  by the pam_faillock module
+* pam_cracklib has been deprecated and replaced
+  by the pam_passwdqc module
+
+These changes affected our basic PAM stack configuration.
+
+You only need to take action if:
+* you made manual changes to the PAM stack, or
+* you use FEATURES="-config-protect-if-modified" option
+
+If this applies to you, please make sure to either run the etc-update or
+dispatch-conf command in order to sync your configuration.
+
+Failure to do this may result in your system becoming inaccessible.
+
+[1] - https://github.com/linux-pam/linux-pam/releases/tag/v1.4.0
diff --git a/metadata/news/2020-06-24-xorg-server-dropping-default-suid/2020-06-24-xorg-server-dropping-default-suid.en.txt b/metadata/news/2020-06-24-xorg-server-dropping-default-suid/2020-06-24-xorg-server-dropping-default-suid.en.txt
new file mode 100644
index 000000000000..b752bb720ede
--- /dev/null
+++ b/metadata/news/2020-06-24-xorg-server-dropping-default-suid/2020-06-24-xorg-server-dropping-default-suid.en.txt
@@ -0,0 +1,32 @@
+Title: xorg-server dropping default suid
+Author: Piotr Karbowski <slashbeast@gentoo.org>
+Posted: 2020-06-24
+Revision: 3
+News-Item-Format: 2.0
+Display-If-Installed: x11-base/xorg-server
+
+Starting 2020-07-15, stable keyworded x11-base/xorg-server will default
+to using the logind interface instead of suid by default. resulting in
+better security by default through running the server as a regular user
+instead of root. However, this will require our users to use a logind
+provider such as elogind or systemd. The systemd users and those who are
+not using systemd but use desktop profiles can stop reading here, as
+they already have a logind provider enabled.
+
+Others, who have neither systemd or desktop profiles enabled will be
+required to globally enable 'elogind' USE flag and update the system
+
+    # emerge --newuse @world
+
+Afterwards, one will need to re-login, so the PAM can assign a seat. One
+can confirm that a seat has been assigned upon login by running:
+
+    $ loginctl user-status
+
+Users who do not wish to use logind interface or have rare hardware that
+does not use KMS and because of that, require root privileges to
+operate, can manually re-enable 'suid' and disable 'elogind' USE flags
+in order to preserve the previous behavior. However, please note that
+this is heavily discouraged to run X server as root due to security
+reasons. The 'suid' USE flag will remain as optional opt-in for the need
+of legacy hardware.
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index a99a17bc7963..1da6a51081bc 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 11672 BLAKE2B 2a35be1d629fabd14a3e177b2f8c68c778a09003e6c329a5c55208316e291790d15b24da03e1888b7f01b378235d12656c5b63ee2f46588e72d5e814db8ab127 SHA512 a03255c1377ed0aaf8780d946ad61d8fad5fd03d28d04083000f3f9a09319dd8bd58ecb7844d1b7bb009c6c1e511af9f6af0e20507cd177ffd401781440c86d6
-TIMESTAMP 2020-06-21T11:38:29Z
+MANIFEST Manifest.files.gz 12044 BLAKE2B 547415c33cd1d5d0e90a80f7a59574b3586b17cced894eeab2dd80042c3bb6aca4b85cda93f72c8edb89d80a5480978ea22a242f346c7a98fad2a95a214b4874 SHA512 a55a6789e7d66503ccbe69d73f70534bb16956cbc073435959464fead34e7db53e6daf9c756eb92e635e27550f6e05cf0aab7bd9d83a005f5e26dc0513b3d06f
+TIMESTAMP 2020-06-29T10:08:22Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl7vRrVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl75vZdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klABUhAAkSCPRTZ+J/2VwDvqYVFca4SvfdvhYXxflhPFFXHgJMUJStghhjmkwryi
-QjfL0XbrOXtpQ6J+Y0ryZ3nOdGLOxBPFGMxV8Uno6/xLytUrzOp1nSWwdYnfIA4O
-MXOr2kSD/tl46Mk9ADKX+E01fzwUhylM9GdIhb6Qw7oT4f8egNToDCmTWpvYZSYc
-pIk6vixeFEWg4LmogcD0OptDZsQxCtYOFgk0qcsKncJvHmyk0A8ZVyPBFONpjH5q
-jFzI5Q1uWPzSdFAW5SCzfgErwvf0KAteflosjREuuSEPh6q3m00/+YLIDC5A2b4N
-ganiSSw4B8uSrh/0WgwMhsEa539wwj6Vb8I8/MlHJwy7XzcHYmWKz5/Kn0WpDR2K
-tetmjV9cUvjKsESlakAl8ihl5vFQmTKnnr2h7rST+M6cIdj9GlKQt+gKVZ+8q7bz
-XY/ISlv5WGSwGZg7C9/y23qUfNMmPRqNgJys+QWtzqdPmhYcWEqGBiZUr9bMBdWD
-0mbHsPCsf7q0uS1zpVQ9M8XNV50G97sH3+Wovy9AcfForPjIvwNcAzDaIF1LWLSi
-MkBKayA2pqprrmlZ4wWKk0HrRT+yL9W+xCmlxEunUAvtgWqMz+tAcaq6ee6AvmiW
-FImpd4NmD+YjRzDRvSXVu6Z4M/6YCIx38lGP0GCIYrjja6QRMMI=
-=gbnr
+klBlFBAAgOpoolHKHFy6/NxmZ2dF4UPNRl94xW9/NFO5w2fS60r8FtxkjSAQgJhT
+rvQWra9zFmi3cBn6nwk4TOlkkPEaYZ5ygPZe+6+UG12LVUxIOOIVQhIchuJnWgX8
+Sa9ipaKG0y8UyZVBrd4wtzCRJzAnNYo3ToE8N6qfuxsAxCEYyc1otnBWZm18diAV
+s46SVjNTRHt18SLWqTpCOowqNR/LIazBjnVp6aOpl4JsPK1ZGRGP/DPN/67mcski
+hmehn1mkagreTNP1DT4Cog3vY8LGFpaHVU3XE6ypeqil3ZW3L47ieTs9lu2JGu5d
+WOVmawdbzNCM+cpLhNJWxtPZy7Clv/jUuWH0zWTvVX8zRKcqkhoZ2t7KtHaapE3N
+7t2Qe8cthv2+XgasXUhvuXpWyuxgxBEABtqjaYRVUCTy1BmyCsTJIklRa1xtx0Sp
+fHWh0fAcg7B3zlzOebbos/L2EhGCkdr07qrYzTOWYSksgUi1k63ARi8Y32/P5pTG
+X9AfuPtupuhAPDnMOOEWidFD5UW96xdTJSdLugs79hX3TBFnZfZ0A3h4BwZZr8du
+tjbWbMolLvjiFHf/4LroXiK9hTk3Gslr+VGMIooDayr0RCdU0Bx78XjMP+6Al7ol
+75ZwOq/grS6KH8gT9MA1vPZO2uyRXxxR+iOiePwp55iyIbD324c=
+=Kvbc
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index 88e550e9d1a3..f9a7a023a0c3 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 03b6be48b1f2..3ac069bd3848 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 21 Jun 2020 11:38:26 +0000
+Mon, 29 Jun 2020 10:08:19 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index 36535e35c7c4..2c7f65ce8584 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-72de871e6fb59e1e7fb3af51bc6227ad32b0e019 1591572597 2020-06-07T23:29:57+00:00
+bbc0f609f2b84485d3ba5dfd17dbbd0fc1085b64 1593021675 2020-06-24T18:01:15+00:00
diff --git a/metadata/timestamp b/metadata/timestamp
index 445921c8da51..c06e826e376a 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun 21 Jun 2020 11:38:26 AM UTC
+Mon 29 Jun 2020 10:08:19 AM UTC
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index f87a38c8dbfa..584956a88a9d 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 21 Jun 2020 11:45:02 +0000
+Mon, 29 Jun 2020 10:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 976a04f7177b..31799ee160cc 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-359b33cc1741a806ed5fcd2f9c8793dc1736350e 1592738290 2020-06-21T11:18:10+00:00
+4e10c55d94aa8ced633714413346f350fd437f56 1593424969 2020-06-29T10:02:49+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 87734b242075..797bd7435432 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1592739301 Sun 21 Jun 2020 11:35:01 AM UTC
+1593425101 Mon 29 Jun 2020 10:05:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 03b6be48b1f2..3ac069bd3848 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 21 Jun 2020 11:38:26 +0000
+Mon, 29 Jun 2020 10:08:19 +0000
diff --git a/net-analyzer/2ping/2ping-4.2.ebuild b/net-analyzer/2ping/2ping-4.2.ebuild
deleted file mode 100644
index 71c1f09691ce..000000000000
--- a/net-analyzer/2ping/2ping-4.2.ebuild
+++ /dev/null
@@ -1,27 +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="A bi-directional ping utility"
-HOMEPAGE="https://www.finnie.org/software/2ping/"
-SRC_URI="https://www.finnie.org/software/2ping/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE="server"
-
-src_install() {
-	distutils-r1_src_install
-	doman doc/2ping.1
-	dodoc doc/{2ping-protocol-examples.py,2ping-protocol.md}
-	use server && {
-		doinitd "${FILESDIR}"/2pingd
-		newconfd "${FILESDIR}"/2pingd.conf 2pingd
-	}
-}
diff --git a/net-analyzer/2ping/2ping-4.3.ebuild b/net-analyzer/2ping/2ping-4.3.ebuild
deleted file mode 100644
index 98a0f53291f4..000000000000
--- a/net-analyzer/2ping/2ping-4.3.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"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A bi-directional ping utility"
-HOMEPAGE="https://www.finnie.org/software/2ping/"
-SRC_URI="https://www.finnie.org/software/2ping/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE="server"
-
-src_install() {
-	distutils-r1_src_install
-	doman doc/2ping.1
-	dodoc doc/{2ping-protocol-examples.py,2ping-protocol.md}
-	use server && {
-		doinitd "${FILESDIR}"/2pingd
-		newconfd "${FILESDIR}"/2pingd.conf 2pingd
-	}
-}
diff --git a/net-analyzer/2ping/2ping-4.5.ebuild b/net-analyzer/2ping/2ping-4.5.ebuild
new file mode 100644
index 000000000000..9d31cd1228f9
--- /dev/null
+++ b/net-analyzer/2ping/2ping-4.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A bi-directional ping utility"
+HOMEPAGE="https://www.finnie.org/software/2ping/"
+SRC_URI="https://www.finnie.org/software/2ping/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="server"
+
+src_install() {
+	distutils-r1_src_install
+	doman doc/2ping.1
+	dodoc doc/{2ping-protocol-examples.py,2ping-protocol.md}
+	use server && {
+		doinitd "${FILESDIR}"/2pingd
+		newconfd "${FILESDIR}"/2pingd.conf 2pingd
+	}
+}
diff --git a/net-analyzer/2ping/Manifest b/net-analyzer/2ping/Manifest
index 404df4e8e003..0fcb2cad6a62 100644
--- a/net-analyzer/2ping/Manifest
+++ b/net-analyzer/2ping/Manifest
@@ -1,9 +1,7 @@
 AUX 2pingd 692 BLAKE2B f393bc602a4e39f77970946926bae178f9181476f7331b9a91f1dddc689ba360d8479b28e9a0b16d25864954664e6b0915149077620aa9d0fec00a85ef68b257 SHA512 7d898b96e6888233b7628af7a9a0641a4ce2f6ebe38192b88bb7f479d99067f6d34843f1b43746eed03b7512782496534e35240abf8b866a4e8f00ee9421deb1
 AUX 2pingd.conf 57 BLAKE2B 79c2a05661e342d5a5c3903071d42864d3185d6f387a6b73f129a70cadfadf081f43d9bdfea22281170b0ad27ec17f9b3612cf40b570390f44f845d7ca4555d0 SHA512 c8c666116e841b86a1f17a891453e6ea25976ad485b8299062971b45395420dd46ecc9ac36cb1de5000207372f8586850f62c6178ece5f70732bf17ae9ab4af9
-DIST 2ping-4.2.tar.gz 70054 BLAKE2B 01759c9f0d2eb2bf08e92155a74e11aaf7bb83adb43942be70b8e525486bba6608ad021bb149376f246bdcb066958c7d9886a1e5ea63094d715c8b25fa2b9784 SHA512 8c6e9b4cefd92929e8d5247f2c4caecdfc281548596f96fbfe52f99dc122dd1d53470c303e85bc469f0a7910937085ad36c7f928cb295c8f3fce5f3455dec3d9
-DIST 2ping-4.3.tar.gz 70386 BLAKE2B 7a73508bdf5fef0d6ef99d1d6b8bfdee65740277ef0e17913e2070503c20bd4d9598a7d7353eb68dbe5c7380e49e465ddd49adba4899f95daead36bbc8514f69 SHA512 f7186fe5bed2f12593d62f85fe364c9dc571f8b0ad10f6766515470ea8f8ed32d439e580003e78494b4742a8224e2b30cc454f8275a4877d432eb76646334e77
 DIST 2ping-4.4.1.tar.gz 75284 BLAKE2B 29240c9710417f735acbeb61e948634c7dd3b608084f4499cae97172f25a0951eab81db92743d452ce679d171107925cf35b9fa9fea82fb5551b11d83a23fcb1 SHA512 b40698488bd067a50be171566a0920920edb6bd0baea65999f2226fe66771770a1ebb3c1078bf8d633c555af3297e8f9925f5c42a3e9aa7cd48b59d6cb59e10b
-EBUILD 2ping-4.2.ebuild 624 BLAKE2B 53e4efecd635c89dd92b66041b7a8ab25589b370a3dfffbaceda09f87e9918da969e761148ac5bef2014aa15510385cb4a86a99830dcbccb2dbe5102358490e8 SHA512 ff0cbe08db31810930778f9d6bd5635b0f97a25db1285614d861b4ac69dbc918493daf69d1e5052c353b8c621cf22eb7a560e378a9fb6b86ee6e61b390405913
-EBUILD 2ping-4.3.ebuild 624 BLAKE2B b4f77612a74996f3f7db254ca3a7e591eaacbfe9dc38b819eeb946a6225ce26c85c443f178560a3a5913a77f2d6a5b76708739c46c65fb0336184dbce9a2f073 SHA512 02b8a0b3039747511d8792d65702ba2af69e5b19e9d0d5e12d4dcf5f3abb6644d0db26a17e8bd05719d2dcf624a516124557e3df5b2484c7834e6059cd7c097a
+DIST 2ping-4.5.tar.gz 77771 BLAKE2B 6471d06dede592e3161755d18fb08ae1d593dec0017cf7757ef1bcfcf9df7d4d7993edc14d44aaad7d7d683584906869ba957ef8096e38f362f8fd060c4f4e36 SHA512 0b1ac1c882becf1dda7207004b186d8052b21be4f842ac2b3a252c32a5610867761feadc12e237e4ed3e1da59b3cdebd8b8f8025ec3d0375193b2594f17215f0
 EBUILD 2ping-4.4.1.ebuild 628 BLAKE2B df13d1884a4873bed0a92a0844a98d3908ae19df724534d93e9510f1a8642cd5a9236f2b3a732f37628cafece46238b46c1a7340588a789b72eb54d14719859a SHA512 17653cd974285f970a38a885935b9fb5f513243b5f1656181474370921466ba550acf36832e77dacb75dd5dd17d4078a780d69111b962b4e51ef0abaea8a8681
+EBUILD 2ping-4.5.ebuild 628 BLAKE2B df13d1884a4873bed0a92a0844a98d3908ae19df724534d93e9510f1a8642cd5a9236f2b3a732f37628cafece46238b46c1a7340588a789b72eb54d14719859a SHA512 17653cd974285f970a38a885935b9fb5f513243b5f1656181474370921466ba550acf36832e77dacb75dd5dd17d4078a780d69111b962b4e51ef0abaea8a8681
 MISC metadata.xml 400 BLAKE2B 8de660bda8c58cc5c6e6027c7e52efbd03ef973594e85a90483f0bb0dd2fcdcc4ee7989cf8624e72f0e71f31daf5af05c345126b862cad1007c3a45a8122bcd4 SHA512 9d35147319cbab8e826a2f0a8badee2169e70b8a52065d8639f2326ff0bfe1717a5e8b5422072f71677e2e4a99ec14a7d6e688662f2342d7917499c35a686154
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 1c860f4048fb..f247ccda2901 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest
index d1e90bb65f48..d1db983c1938 100644
--- a/net-analyzer/arpwatch/Manifest
+++ b/net-analyzer/arpwatch/Manifest
@@ -1,8 +1,11 @@
-AUX arpwatch.confd 270 BLAKE2B 753b8fc9651840db98c41476e98674696412c53cf733724f84ccc10ebf3d8b8f5be6da0dc726adc0a6861ea04bdcbafe22d99dde707190629dba32264e49c474 SHA512 901375c1031c776f159cc526662e727be41dd9630037a492b718c9cc48d2fb580b22bcdf90a84a02049924e67fb84a2668e3519a7ab24e6c8ad07d20cc5adf41
 AUX arpwatch.confd-r1 559 BLAKE2B 291acbd1ebf7ab4f9f6ca19dfe1b445fc610c1b0961c895f5ccee3fe25e0536ef81e2530ff2151dceb52d113d1e13ab9185a0d83577d9258d57613112bb616d7 SHA512 d1fc4993db4b9a1e11fee0629b92b6372266085551e6e89f5f33a9dd092ee70087f2766c46cb983040917c47e478c0c8206efd1b9fde8d030a3e249c28970c9c
-AUX arpwatch.initd 991 BLAKE2B db231172f24c10bcff5c78d081c7de0918c10878e47fccbc9c4ea73d6b70404308864de5822ae97c0c1c94d6b17cc8c183807c33db7140e1ecae88b9df79ea3c SHA512 de62ab2026bb04f557731b741023b6fc2333656f4709226459e8bb17fee2959ad9e24077eae730443efa3736b6f0268c474ca65905c371d228c2f2869ec4986e
+AUX arpwatch.confd-r2 577 BLAKE2B 5876819ee028fe4a77ffca0e359d73492bc6ff82ad89f7ad24e38b9167c6d7858ae186115ac3fe0d594a93e0197fd2eea0daea5c0d49674b0770836d7cb2fb68 SHA512 9d6086f9e1bd27976117b408e1a604b9544a5acf80cf69cbac00516fe36f93dd600a2876039dbfa023b12a35d01439fe25845304474add1bfa059c97383aae7c
 AUX arpwatch.initd-r1 752 BLAKE2B ba0adcdc9c02ff0b60c46f9bd98c100171b365ca4d50f9345b0d9b983aeb299e51849eb04b0df0627252ab65db1adf706f181aee61f471a1af87a3c1b3653e80 SHA512 735e284132aaa2125d7b248c81a27be2208963d84b7b434f251ee3f7a350e81c9e3cff58bc812bebd26450b711322c188876e96d6638a4ba3dbde4e8fc040c04
+AUX arpwatch.initd-r2 828 BLAKE2B fc9836855074520ab6e8e4d7412f9094677fe25dba61bba1a5a8aea227c30b2fbb4425cf4d6fbaff1fe23493b58b211d4f6a6328bfe9a20e1020709db1cacb57 SHA512 b3518e24c839bda3292ff9f8dfb7c9bf12f4483637590875f281116cc1a453266ffb22507383fb71cf28b889141b355f077df8e7937ac571ab72924f5f2014f7
 DIST arpwatch-2.1a15.tar.gz 202729 BLAKE2B b583dea83c57a55b8705f0265c1324de270571468dc9f2e1d5351fd53340f7636f1d00e3de24caa9747384697721e6227e5e6de4b3827e5ac7adef4ce524fffd SHA512 f770b5b7954afe910dafb016e6e886a4e785564bcdc0ea0de9d7b1ca6a9a0b219a9d1b50b6f42a67afc2f836e782e8ff85ba5780583015d62c9694ac53f0bf90
+DIST arpwatch-3.1.tar.gz 117196 BLAKE2B 35afd3dc563ebbc8136000d5c2d53da85b9615df5cbe8a3da5b77f20da7cbee706f6fd404c2bda6f3626aaa496d9ec9439596acbdfd559c01b8c0d01d6703e46 SHA512 2e6f6e388e1828e34626e36356a89f3bc95d268b9242955d6636ac05041bcf533e7625ed73b37b6ea5eab8cfed54b8c483547556c98664efff63c18639efa282
 DIST arpwatch-patchset-0.8.tar.xz 131692 BLAKE2B 8db242f7c74c8fee0700e12e8ff028fcaa336e5feb61514b44a892a132779c11d1ca3ce2fabee3cbcbbdcb0dae0ed470daa786a91619c18e24066f11da126bc4 SHA512 3e8f1c043f09fbeacadb40c1db47fb907314ed18bb3fb506c6c510977fd0e6dd9950becc830cf7c10911a7eec97e56e0af8c8c3d7df811e8ab820290973ea0b0
-EBUILD arpwatch-2.1.15-r11.ebuild 2212 BLAKE2B 256c4c6ec2122cd1a6eda7272afa4cecbb46625ccda72117cf949faeb589ef74d089923a036bd3fd0ef057bc549a692dc150132aad92bff14b3d1cd1d54fef94 SHA512 b51f3752058eab0ac532d11157c5f9d5f65f0dda01f6d396b13b39d668f424cad3290baaddbfaec2c2edd718010aa95806f7e32f04dceb44a68f7a26382366be
+DIST ethercodes.dat-20200628.xz 239028 BLAKE2B e702b9109ef3ccce73e2637f96126bf19e7dfa533774c0bd623042b3609f147981263b84397ec155a65ae12fa57247c32644e1e7e57c2c749ef768156d853027 SHA512 2edc05d384f387e6b43d07da99038625f9c55c8044b5a48d1bcf9f657df691bf413a97fb9ca915f04dbdafab23f919edd15d906c4ce8bff12be0b255a6717f07
+EBUILD arpwatch-2.1.15-r11.ebuild 2229 BLAKE2B 63b3c747a8451a150612f52440ec779ef869f4ab7480c09b141869a8c3f91a9161d36c77025f22868430599007ad7c51c803306d373b2cf7021b13128b77dcc9 SHA512 7e1aa35935ab43542d5d1f6e855b124d61b971666785a14e60281dc666b064fbb6ddfe49904da3b3e635352850e72d68c1ae92eb2ddeb0cb556eae0779278439
+EBUILD arpwatch-3.1.ebuild 2060 BLAKE2B 74e15d6a6b4b7e994d557756a0662dbad1d8c8a44fa09b431eab77c33c8b831e93ccfc287c96c9e5a341618e2f52d54c414465afccd69dac92608dee98c479bd SHA512 de10526bf59ce55f7ec8fb67d4de5eeb002237b151bbc1be11a62f3d0cae757a5fbfeda3f64d99dbcf95fc4eac197e7b759c114bc3dff93ec6605494b73a7c16
 MISC metadata.xml 741 BLAKE2B 63f289064fdfc3164a8c2651f783e851c42c062996e4e916e69ece25c5a0892030a07aaaead7b2fc14e6708128bc48e4321d30fedca97d09efad66a2340e3897 SHA512 0db051d36fb16c5a50239a243ca46f686e71b13387330bf98df46c9af3389d16e9842b89c15d2e6fb3fba867e5a0b36a2fd745480588ba621e117ee86aadbd00
diff --git a/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild
index fbefe68bec99..b12edabc0a66 100644
--- a/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild
+++ b/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild
@@ -10,7 +10,7 @@ MY_P="${PN}-$(replace_version_separator 2 'a')"
 DESCRIPTION="An ethernet monitor program that keeps track of ethernet/IP address pairings"
 HOMEPAGE="https://ee.lbl.gov/"
 SRC_URI="
-	ftp://ftp.ee.lbl.gov/${MY_P}.tar.gz
+	https://ee.lbl.gov/downloads/arpwatch/${MY_P}.tar.gz
 	https://dev.gentoo.org/~jer/arpwatch-patchset-${PATCH_VER}.tar.xz
 "
 
diff --git a/net-analyzer/arpwatch/arpwatch-3.1.ebuild b/net-analyzer/arpwatch/arpwatch-3.1.ebuild
new file mode 100644
index 000000000000..64ae0f6ef45b
--- /dev/null
+++ b/net-analyzer/arpwatch/arpwatch-3.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit user
+
+DESCRIPTION="An ethernet monitor program that keeps track of ethernet/IP address pairings"
+HOMEPAGE="https://ee.lbl.gov/"
+LICENSE="BSD GPL-2"
+SLOT="0"
+
+ETHERCODES_DATE=20200628
+SRC_URI="
+	https://ee.lbl.gov/downloads/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~jer/ethercodes.dat-${ETHERCODES_DATE}.xz
+"
+
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="selinux"
+
+DEPEND="
+	net-libs/libpcap
+	sys-libs/ncurses:*
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-arpwatch )
+	virtual/mta
+"
+
+pkg_setup() {
+	# We need to create /var/lib/arpwatch with this group, so it must
+	# exist during src_install.
+	enewgroup arpwatch
+}
+
+pkg_postinst() {
+	# The user, however, is not needed until runtime.
+	enewuser arpwatch -1 -1 -1 arpwatch
+}
+
+src_configure() {
+	econf \
+		ac_cv_path_V_SENDMAIL=sendmail
+}
+
+src_install() {
+	dosbin arp2ethers arpfetch arpsnmp arpwatch bihourly.sh massagevendor.py update-ethercodes.sh
+	doman arpsnmp.8 arpwatch.8
+
+	insinto /usr/share/arpwatch
+	newins "${WORKDIR}"/ethercodes.dat-${ETHERCODES_DATE} ethercodes.dat
+
+	insinto /usr/share/arpwatch/awk
+	doins d.awk duplicates.awk e.awk euppertolower.awk p.awk
+
+	diropts --group=arpwatch --mode=770
+	keepdir /var/lib/arpwatch
+	dodoc README CHANGES
+
+	newconfd "${FILESDIR}"/arpwatch.confd-r2 arpwatch
+	newinitd "${FILESDIR}"/arpwatch.initd-r2 arpwatch
+}
+
+pkg_postinst() {
+	# Previous revisions installed /var/lib/arpwatch with the wrong
+	# ownership. Instead of the intended arpwatch:root, it was left as
+	# root:root. If we find any such mis-owned directories, we fix them,
+	# and then set the permission bits how we want them in *this*
+	# revision.
+	#
+	# The "--from" flag ensures that we only fix directories that need
+	# fixing, and the "&& chmod" ensures that we only adjust the
+	# permissions if the owner also needed fixing.
+	chown \
+		--from=root:root \
+		--no-dereference \
+		:arpwatch \
+		"${ROOT}"/var/lib/arpwatch && \
+		chmod 770 "${ROOT}"/var/lib/arpwatch
+}
diff --git a/net-analyzer/arpwatch/files/arpwatch.confd b/net-analyzer/arpwatch/files/arpwatch.confd
deleted file mode 100644
index 98abe0417740..000000000000
--- a/net-analyzer/arpwatch/files/arpwatch.confd
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for /etc/init.d/arpwatch
-# see arpwatch.8 for more information
-
-#IFACES="eth0 eth1"
-IFACES="eth0"
-
-# Additional options to pass to arpwatch.
-OPTIONS="-N -p"
-
-# Comment this line if you wish arpwatch to run as root user (not recommended)
-ARPUSER="arpwatch"
diff --git a/net-analyzer/arpwatch/files/arpwatch.confd-r2 b/net-analyzer/arpwatch/files/arpwatch.confd-r2
new file mode 100644
index 000000000000..2937349cdc83
--- /dev/null
+++ b/net-analyzer/arpwatch/files/arpwatch.confd-r2
@@ -0,0 +1,18 @@
+# See arpwatch.8 for more information
+
+# Specify the interface for arpwatch to listen on here (default: lo).
+# If you need to listen on more than one interface, you should
+# run multiple arpwatch services; for example "arpwatch" and
+# "arpwatch.eth1". These additional services can be configured by
+# symlinking to the "arpwatch" service script, and by creating a new
+# conf.d file whose name matches the new service (symlink) name.
+#
+# Example:
+#
+# ARPWATCH_IFACE="eth0"
+#
+ARPWATCH_IFACE="lo"
+
+# Additional options to pass to arpwatch.
+# See arpwatch(8)
+ARPWATCH_OPTS="-N -p"
diff --git a/net-analyzer/arpwatch/files/arpwatch.initd b/net-analyzer/arpwatch/files/arpwatch.initd
deleted file mode 100644
index 5569dcee2527..000000000000
--- a/net-analyzer/arpwatch/files/arpwatch.initd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	for IFACE in ${IFACES}
-	do
-		ebegin "Starting arpwatch on ${IFACE}"
-		DATAFILE=/var/lib/arpwatch/${IFACE}.dat
-		[ ! -f ${DATAFILE} ] && touch ${DATAFILE}
-
-		if [ -z ${ARPUSER} ]; then
-			start-stop-daemon --start --quiet --pidfile=/var/run/arpwatch.${IFACE}.pid --exec \
-			/usr/sbin/arpwatch -- -i ${IFACE} -f ${DATAFILE} -P /var/run/arpwatch.${IFACE}.pid ${OPTIONS}
-		else
-			chown ${ARPUSER} ${DATAFILE}
-			start-stop-daemon --start --quiet --pidfile=/var/run/arpwatch.${IFACE}.pid --exec \
-			/usr/sbin/arpwatch -- -i $IFACE -u ${ARPUSER} -f ${DATAFILE} -P /var/run/arpwatch.${IFACE}.pid ${OPTIONS}
-		fi
-		eend $?
-	done
-}
-
-stop() {
-	for IFACE in ${IFACES}
-	do
-		ebegin "Stopping arpwatch on ${IFACE}"
-		start-stop-daemon --stop --quiet --pidfile=/var/run/arpwatch.${IFACE}.pid --exec \
-		/usr/sbin/arpwatch
-		eend $?
-	done
-}
diff --git a/net-analyzer/arpwatch/files/arpwatch.initd-r2 b/net-analyzer/arpwatch/files/arpwatch.initd-r2
new file mode 100644
index 000000000000..93438209e1f1
--- /dev/null
+++ b/net-analyzer/arpwatch/files/arpwatch.initd-r2
@@ -0,0 +1,33 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Default to "lo" for the interface, so that the init script will work
+# out-of-the-box.
+: ${ARPWATCH_IFACE:=lo}
+
+ARPWATCH_DATAFILE="/var/lib/arpwatch/${RC_SVCNAME}.dat"
+
+command="/usr/sbin/arpwatch"
+pidfile="/run/${RC_SVCNAME}.pid"
+command_args="
+	-i ${ARPWATCH_IFACE}
+	-f ${ARPWATCH_DATAFILE}
+	-P ${pidfile}
+	${ARPWATCH_OPTS}
+"
+
+depend() {
+	if [ -f "/proc/net/vlan/${ARPWATCH_IFACE}" ]; then
+		_if=$(grep -i "device" /proc/net/vlan/${ARPWATCH_IFACE} |awk '{print $2;}')
+	else
+		_if=${ARPWATCH_IFACE}
+	fi
+	need "net.${_if}"
+}
+
+start_pre() {
+	# The "arpwatch" user must be a member of the "arpwatch" group for
+	# this to work.
+	checkpath --file --owner root:arpwatch --mode 0660 "${ARPWATCH_DATAFILE}"
+}
diff --git a/net-analyzer/etherape/Manifest b/net-analyzer/etherape/Manifest
index 16384011939d..87fe95455d30 100644
--- a/net-analyzer/etherape/Manifest
+++ b/net-analyzer/etherape/Manifest
@@ -3,5 +3,5 @@ DIST etherape-0.9.18.tar.gz 1436265 BLAKE2B b9f3fd625369fdf6790bef75cc97effd3e1a
 DIST etherape-0.9.19.tar.gz 1452435 BLAKE2B d80d0d0eceeff67890d6a992551a136bfdcd3de005468d7d09eccc94ddf472209738c29d06a321116c90da1a31be0349f80dbee73d3297eae3e02588afea4e94 SHA512 3819c36a6ea5b1ec6fc675563ab0264d180824343344bf4f2da834db39547b721c1565b6edb882d55ce4e0ca93e4b34e3a544996a988584aaf7fe8b8d5ca265e
 EBUILD etherape-0.9.14.ebuild 611 BLAKE2B 028a91b19cc57e075b974bc1f80c39ce42ba0bac4f89e5afb1e48742e4d44816f5b5ab5e7236cf7a59aebc87a677b11391ebb6294b504dbf45333aa6fb52a142 SHA512 2aff3a594f3e24192554249bb6ebcc5002f47a76cd1c74b4913f33cc08bd824c78e89038d8d7a52a241a382479f8057102689be565544c1e96a0c880ef332ed5
 EBUILD etherape-0.9.18.ebuild 564 BLAKE2B 093ec296766b484fa508462b6f65d8b56af5884f0c98dda915e60bc69ee5be7936236a4456a5b1dafec25a33ff981383742c197df8f12d0bd1d3db2943268dc7 SHA512 94e51eca55f371dff53d6dd0a4ecc88495edda31374fee272a3eb8af173e1837d114b26c1bac2597877c84af4bbb187bd5e57ec73caeaa4c64ff0ce820482289
-EBUILD etherape-0.9.19.ebuild 560 BLAKE2B 1cc5017d6256f72cd956ef572864a68624b50b9e4f1559106105da15b6b5ce6a383af586c1d0c8faf57703d45251b6792daf09d27ee5c1222f5f0da4da6cff86 SHA512 11ff53568856d419e723cab98d4fedc8f916d9c3e49c514f65aed6864905b217a3bf0ba6323f5582859281a4e0a455a2c251e9e9b10a40d142ed5bd70ce71fc1
+EBUILD etherape-0.9.19.ebuild 557 BLAKE2B 4484addfbfe23cdc8b16418e704b0bdac67046227eb2a6a73051346bdfce742d4bc9a78bf8460e45fa3a9dfd4e90a8bbc9c4cb926462292d36438c99f42222b1 SHA512 af42d62bf0eaae5148014dd70b6608247e2bed27841c11e5f93d0d68d2bcce2d366e4d4273bc0055492c3f67c611a17ad7d2a16c62a05e0421289b741f98982c
 MISC metadata.xml 820 BLAKE2B 613982514b7fe5365b2eb8344cd1e7214d71636fec65aba0f4f2d226047e33ede0a0fb0f096f87d20077d0f1907375eaefbbc04bfc81904dd044bbc567cc887a SHA512 8e7b8953034f14069d5d2aad3c0a1b180ec182c9ae8be46bf2b837629e40f0122b4402c0adfeccb1967844c38b241a122a2735df0d63ad475c2355eb4b454e9b
diff --git a/net-analyzer/etherape/etherape-0.9.19.ebuild b/net-analyzer/etherape/etherape-0.9.19.ebuild
index 6fe795d91ea5..dbe8b6a2a0f0 100644
--- a/net-analyzer/etherape/etherape-0.9.19.ebuild
+++ b/net-analyzer/etherape/etherape-0.9.19.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/etherape/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 sparc ~x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 59d1ddaa0b7a..4b5b16bc5fea 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -23,7 +23,7 @@ DIST munin-2.0.63-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051
 DIST munin-2.0.63.tar.gz 2254548 BLAKE2B 5e0aa63222706a1e23bcb2af98437ee8cc3f09cdf833a6546ea40cf7307728518d5d696bd500105f85139753bc17a26dddfb202a661d35a7046ffc55b5b9ef02 SHA512 c28d2bedda8abb8787e1ba40ec80961d1304c903e9e608e30ed7903210169f258f9c062fc97d89932ddd7aabefa4360495d19535520741911c489c9c3c2e76fe
 EBUILD munin-2.0.52.ebuild 12389 BLAKE2B 4e1046e310948f97ed2469cb58f67c4c7cc6b66ef2fc401a409f2069c2c3b717a1b76d5b9f51add689c00e7daa6a555e927b98f9290ee7e24aac81202f17c557 SHA512 3f1edf0c2c9a35f17794003e143fbde255f60527e0f595a40233b63c1cfaf3bb00416902f6f45941c597987eb292d6b507cc8eb3720d2a17793607f9099ed823
 EBUILD munin-2.0.56.ebuild 12254 BLAKE2B 925fe7a93c3130d665afa4aa9c874bbf34b22e29fea84fbb6a5f518facd256cb79bf1e2b20ffa5f086d1a8715328a3f34482e1e08f7ded2fa924a976b20cd93f SHA512 5fdc2357b5a48815f7de08d46def379bc5d263b68f1f88ecd5756d095299a53fc8996dce41350fd4281bba434c85c090bfbd965edc1ca46ce5f051d47eeb7c46
-EBUILD munin-2.0.59.ebuild 12269 BLAKE2B 87c730135b056d65c2f0da98dd1c9bb9d348aa1dc14663b024c2fe8cc64e83b386dfa7e40db9198375c73daf05ecb6b6490626159c3a0b3b324039064288cf06 SHA512 9761e7f5358b82419e0537d03a6f745f2bb730715a9aa181a149f662ea010a159b237ccf1f7dc4af4caadc9aeb8e857c7d71bfa15633f170c953fad400cd4d72
+EBUILD munin-2.0.59.ebuild 12268 BLAKE2B e78aa776ec73f1c59d92ef59b52f974fb902d03935e2022e08899cd94d7a042f73599e789cd20ee31f9e9672a8814681257057a79e9fb274b5c415bed8280ebf SHA512 1b675ac0ec7b689a38236c87a726fe147c06086fc0f378d04e4d88a6baec7b14239d72024ffb69060d972f92ae42156ea60dbb008d878de3921fb8b9ceaf0ed4
 EBUILD munin-2.0.61.ebuild 12270 BLAKE2B 88ca95c980e9e487b32fe6050cb62fb651efa1b576db5a94d6bd1b5a5ffb53a59b9c2dc0f13b483de4529487622e488efe67fc60b4deef22fdf1f047d5c49194 SHA512 f8c17a89d5e1d26b68bbd9ee5bb50fa5b150341044c38baa6e7e875512b66c59981df7ec701feb12880d0339f304e396e84548dc2b7518d1ee51a844a101f8c4
 EBUILD munin-2.0.63.ebuild 12270 BLAKE2B 88ca95c980e9e487b32fe6050cb62fb651efa1b576db5a94d6bd1b5a5ffb53a59b9c2dc0f13b483de4529487622e488efe67fc60b4deef22fdf1f047d5c49194 SHA512 f8c17a89d5e1d26b68bbd9ee5bb50fa5b150341044c38baa6e7e875512b66c59981df7ec701feb12880d0339f304e396e84548dc2b7518d1ee51a844a101f8c4
 MISC metadata.xml 3920 BLAKE2B cb28e1a3e95ffcc305975d7edc26a5cf852a2a29f8c56376c9bbc90fd2b2850bfeb614d750e7700870aa0c10c8dcfcd2b845c210a5518f591ccfbb7571971cda SHA512 9d12c61750f5ee42cfcb6672facf3b46a024872d918c7acb26631c1b9bab29802a6ac9f4d895b9f4ef18a6f283ad64d4bd6e313df0489a6ed82185c660c42083
diff --git a/net-analyzer/munin/munin-2.0.59.ebuild b/net-analyzer/munin/munin-2.0.59.ebuild
index c395d69c9ece..5fe4c097bffd 100644
--- a/net-analyzer/munin/munin-2.0.59.ebuild
+++ b/net-analyzer/munin/munin-2.0.59.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 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 )"
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index e26ba750b7d4..2f2186c0106c 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -5,7 +5,7 @@ AUX net-snmp-5.8-my_bool.patch 751 BLAKE2B d0caff5c2cebb50cc2fcf4375d222f1146e39
 AUX net-snmp-5.8-pcap.patch 1030 BLAKE2B e082b3a9e889ee2f9abd3229ba09a7ac35ca61b5ef65b5fd3460b89ace7753d6bef55560b5c066705bbb1965625e9739f6ebfb78c3e5b5edee2607e3df0728ac SHA512 af60ee67f1407f846f2590008a7ee1d24777f1004547d6281d7bf21d79020e5ceb4b2d0502f08c7d9e25f0fd10b8c5a8e6309963f30f2e43167d1590194ce32e
 AUX net-snmp-5.8-tinfo.patch 340 BLAKE2B 59b75cc89e83d59249921f92ca3b54e3a6fb943a956bb603c891a253f2d015b23ef00029d42bb799625bfd3af2eab5803474fad2dace5d2013f7004221c71e8d SHA512 94598dd39c0067a161beba68bfa09ef4c0dc09376c94a4b0b7346a718e75da173a8c9cb37349c79ec6909fb82a39552ca84b170c3f7f07927386991771b4568e
 AUX net-snmp-5.8.1-pkg-config.patch 621 BLAKE2B 013ae933eb2ec9edc0e454ea7d508eac9a49f92aa6fbcfd47a3b25c85852ce235a9dcb8b5aef1f16ea17976a56341bf484419fa84cb5e83a1e29481a409445aa SHA512 fb7a79514936962af175d068996a2420d70c11478a03f7437d3b471a695cbdc685d3d472c8145b4b400fb2511e591fd717e7c4e265c464696edfc091a747a6e9
-AUX net-snmp-99999999-tinfo.patch 300 BLAKE2B d6f312ca789de74f7b59a2afa3c711aa9e194b08331b11f97a4667bb4e087140dea35ea49ebfa4c5e29da0bbf682bf9f48d3dcdf0df7de91ca5a76ac9242957a SHA512 c7222d2401f7a30ab871cdcddad1f5cc89b18437357262fa2c64d5eab9f6988345b6b05e612863762846465c4f22bf06c8e1950fabc9642030a04a953d69688d
+AUX net-snmp-99999999-tinfo.patch 280 BLAKE2B 4a762bb037beb054d6afa1d3047e9bfa9df7746bdbcbf3ee4050377deee5d4107433e983f1e443a801adcabcd7f13c71f27e14ab49b729850beeb06a096d4c2b SHA512 19c65a7f80eea80fbe88bb5653dadb46f36b4921123aa7c7874c71ab82c6b14b5331b2d697a3d273d3bf93a961b80bf0a9252d833c21f81aa6f73d7e2a4a39d7
 AUX snmpd.conf 552 BLAKE2B 9d2801b0ddc2148a62e332a1d355a9ddc050ec95aea2dde31f25413096c4b91dbab794c1e71b75f5baba1234d89729a6e8c50287098c04991a3eec4d9f512b3c SHA512 e64f93631e5cb2160d3fb26abb84fc74f5632d8875227d5c8dfa24809b25e8202dcf23251ea8f296aedf16298c31ce49b8e64fb6325c18775d8899a50b853bbc
 AUX snmpd.init.2 680 BLAKE2B ce21b60980c2a0d74c810bb473c6b4c70eb11a2fc0636ec4af8a262ce412324ba80bc6c72b2544d359b4e2f536cf329df99e0be7d96035fa20c25f9ab7dc4a16 SHA512 10394f04dee23537a195f5aed63a3e758ca90227e269076ae9d13f883c7bd666c1c43823d1b869c43f232e97dc4138e52648cae995327f7a7f676ba416ee6fff
 AUX snmpd.service 181 BLAKE2B e68aa957e78178c624faa41c93eee84dcadec817fd0b0fcba19eeded1b52d265923cfe69070d3fb71a03ba071fe10bc6b5ce0c99e3c9720521d2b37d04ce8ace SHA512 e8fe55538bf8c14ddb84c464bceddc33fdd0a03d303413783fb23d49c5d2417ead17fbcbbe460bf89738a5cff543f3ea0c7a4fd28e6f598dc9458da1d30d74ac
diff --git a/net-analyzer/net-snmp/files/net-snmp-99999999-tinfo.patch b/net-analyzer/net-snmp/files/net-snmp-99999999-tinfo.patch
index 6eb2df50c43a..2eb4ccca6313 100644
--- a/net-analyzer/net-snmp/files/net-snmp-99999999-tinfo.patch
+++ b/net-analyzer/net-snmp/files/net-snmp-99999999-tinfo.patch
@@ -1,9 +1,9 @@
 --- a/configure.d/config_os_libs2
 +++ b/configure.d/config_os_libs2
-@@ -598,6 +598,7 @@
-   AC_CHECK_HEADERS([curses.h])
-   AC_CHECK_HEADERS([ncurses/curses.h])],,,
+@@ -601,6 +601,7 @@
+   [HAVE_LIBCURSES=FALSE],,
    [LIBCURSES])
+ AC_SUBST([HAVE_LIBCURSES])
 +NETSNMP_SEARCH_LIBS([cbreak], [tinfo],[LIBCURSES="$LIBCURSES -ltinfo"],,,)
  AC_SUBST([LIBCURSES])
  
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index eabcb56727c2..6e318670fe2d 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,8 +1,10 @@
 DIST netdata-1.21.1.tar.gz 3748090 BLAKE2B 5cc8dd47b768838eecc7c8af35a82548dc5bb16acb0a88c17ee1254f86ca9b63a5108bce9205c000283b817478749d963b69c65e3bdc8e2fadecc9a1826a7f2e SHA512 66d2e0cb977275250fd7b51e5156957a4506ddba586de5fe796459ea241cbbed7013fd4cf9d7acf6666407352fb34e3b962a2d01565a9cb982c89c76b7cd79b9
 DIST netdata-1.22.0.tar.gz 3786121 BLAKE2B ad34bcdb94cf44f8de154bf53b2e4ecbecee43c6cef2e5337c0fa6bd08b0feb41c25ee96e51fc6c54d72909559e5ac822b44153daa71255487bb0713ce6eca1d SHA512 3bf239c3e950195ef7b8b43f1c17f2cc94f9257a4f21665629f7b518cc6fcef3b0837743254efd03323408b39e2afa9533487147fa30c8f015705c391aa543f3
 DIST netdata-1.22.1.tar.gz 3787203 BLAKE2B cb09ade9540d81fac9b30738650206bce263b74445ce76bf3e9c57a7935bd5fed04806b3b3ba6631ad7ed119b93b1f36eb10261a239127e238e4cf09ca2f4e7a SHA512 47a0b6c4c1b3d8ab18cf25725223c72683ed74084f0efd09cddbe293950839315f8fcadb16c2e5fa9a179745f20b08ce8652d4b972465eacc6a1792b4cfc296e
+DIST netdata-1.23.0.tar.gz 3819410 BLAKE2B 33b41bacfdba03e0e8cc15ba6c200f98f4c3304136d57798c32410f04d568a2aaf12aebca87136b420d50d0f508d7ce849793b0c11b78a43c30ffed48a991c2c SHA512 edf333b40889547f454101694cadc7766da11acba96db1351d956634e5e240535f5bd9d029fbe3fce79d80e184bd60cc9649055264baea6279d1e63d2db2335f
 EBUILD netdata-1.21.1-r1.ebuild 3370 BLAKE2B 4fd3103e4841a6146365d93a6e5c77b633b7786864c47ca9eba4067197b7c093536b91d8f1ee323ff84ed41a8af6ec952008d5938f0835a5b785081ae9590d3c SHA512 e80fc41089efdaa6cd11cd1131d961ccda8a67a8260a8363312d0fd6fdbc18fa67d6ce7c23d6c89682a9ac2a207f9c5464d5d055ebb4780dfd80eb33706da1c8
 EBUILD netdata-1.22.0-r1.ebuild 3457 BLAKE2B a4ee70e56b2298eea11449b09783f3778c09920ede42149949910c28a5a4ab6a01dc8137bacc4ff72490172db3f5995923b1483dc0f39478ca97f880ec778f02 SHA512 34bc66ca8bc201a24a07b2f2b0258132aecf1109cfe6c2928904e9de5effb978aed53716fec6af79c9c5b6a16879c33cc4be194c181db8de38f6be1ccb719c1b
 EBUILD netdata-1.22.1-r1.ebuild 3459 BLAKE2B 51e39961afa8e068776f3316df2f6becf524e0506f4097c8e77d4fbd939f58ea29aa41b47e70b163ad97c660681c47b1322adcb95a5e888cd48afdfcebdc1876 SHA512 091da4e745725d9f4c626bb62e163ae999c822e148d84551225836ee83f50acd7619e5e96dbfcb1ddc765bd4bcf6c0e657c791a0da1f32c4431cd08a6a0a89c1
+EBUILD netdata-1.23.0.ebuild 3459 BLAKE2B 51e39961afa8e068776f3316df2f6becf524e0506f4097c8e77d4fbd939f58ea29aa41b47e70b163ad97c660681c47b1322adcb95a5e888cd48afdfcebdc1876 SHA512 091da4e745725d9f4c626bb62e163ae999c822e148d84551225836ee83f50acd7619e5e96dbfcb1ddc765bd4bcf6c0e657c791a0da1f32c4431cd08a6a0a89c1
 EBUILD netdata-9999.ebuild 3459 BLAKE2B 51e39961afa8e068776f3316df2f6becf524e0506f4097c8e77d4fbd939f58ea29aa41b47e70b163ad97c660681c47b1322adcb95a5e888cd48afdfcebdc1876 SHA512 091da4e745725d9f4c626bb62e163ae999c822e148d84551225836ee83f50acd7619e5e96dbfcb1ddc765bd4bcf6c0e657c791a0da1f32c4431cd08a6a0a89c1
 MISC metadata.xml 1270 BLAKE2B e2c5bac8fd169d84daf8a6e6cfea30761490cca3d7211a29e29f6cf298a9cd728ddc56075e5a85c8f5ed5467900a2f3fb1e09c40b764c2bb0e02bf1ff8e98108 SHA512 77e4d91d31d9d48b769b13f5c9778e09fc8d64941a145ea0bc1ce3e735eb64e5c89fa36a4314753e7c0871738a7b3e94f6a998a87b9c7b9d1d7aa6e8800cdbdf
diff --git a/net-analyzer/netdata/netdata-1.23.0.ebuild b/net-analyzer/netdata/netdata-1.23.0.ebuild
new file mode 100644
index 000000000000..3b6458e2fb4e
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.23.0.ebuild
@@ -0,0 +1,141 @@
+# 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 autotools fcaps linux-info python-single-r1 systemd
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tor? ( python )"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	acct-group/netdata
+	acct-user/netdata
+	app-misc/jq
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/openbsd-netcat
+		net-analyzer/netcat
+	)
+	net-misc/curl
+	net-misc/wget
+	sys-apps/util-linux
+	virtual/awk
+	caps? ( sys-libs/libcap )
+	cups? ( net-print/cups )
+	dbengine? (
+		app-arch/lz4
+		dev-libs/judy
+		dev-libs/openssl:=
+	)
+	dev-libs/libuv
+	compression? ( sys-libs/zlib )
+	ipmi? ( sys-libs/freeipmi )
+	jsonc? ( dev-libs/json-c:= )
+	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
+	mongodb? ( dev-libs/mongo-c-driver )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? ( net-libs/nodejs )
+	prometheus? (
+		dev-libs/protobuf:=
+		app-arch/snappy
+	)
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]')
+		mysql? (
+			|| (
+				$(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]')
+				$(python_gen_cond_dep 'dev-python/mysql-python[${PYTHON_MULTI_USEDEP}]')
+			)
+		)
+		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') )
+		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') )
+	)
+	xen? (
+		app-emulation/xen-tools
+		dev-libs/yajl
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# --disable-cloud: https://github.com/netdata/netdata/issues/8961
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=netdata \
+		--disable-cloud \
+		$(use_enable jsonc) \
+		$(use_enable cups plugin-cups) \
+		$(use_enable dbengine) \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable kinesis backend-kinesis) \
+		$(use_enable mongodb backend-mongodb) \
+		$(use_enable prometheus backend-prometheus-remote-write) \
+		$(use_enable xen plugin-xenstat) \
+		$(use_enable cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_install() {
+	default
+
+	rm -rf "${D}/var/cache" || die
+
+	keepdir /var/log/netdata
+	fowners -Rc netdata:netdata /var/log/netdata
+	keepdir /var/lib/netdata
+	keepdir /var/lib/netdata/registry
+	fowners -Rc netdata:netdata /var/lib/netdata
+
+	fowners -Rc root:netdata /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+	insinto /etc/netdata
+	doins system/netdata.conf
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if use xen ; then
+		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
+	fi
+}
diff --git a/net-analyzer/nsca/Manifest b/net-analyzer/nsca/Manifest
index b7eadb92f7cf..0e6023b5f842 100644
--- a/net-analyzer/nsca/Manifest
+++ b/net-analyzer/nsca/Manifest
@@ -1,5 +1,5 @@
 AUX nsca.conf 219 BLAKE2B 0ce329240a846e3fc011b82322e2635aa396bfd5eecadf5834becb08b1085e32d30be337b174d777208a882dd2fdcc71939d3fed100534e0c6b431a4e11f9b5a SHA512 c7dda1f94611e028b52ae6bf330db1415b18a88590a8a7c54d1f862aaa326751b39e88380cd24217aab11f32ef5842c6b1d4a0333ca0310a5be0e94c573165b2
 AUX nsca.init 645 BLAKE2B baa298df97c4c29fa563a1dde1ef6cf962acf2ec50797b68f073f744fd56eadf97b6163196c497e83d49b4daf8c2eac04378d8b4d00ffae32796e0f8e926ab3d SHA512 88fab799a388dc6f10a2eac94b1ee5d1a76687c408958cc8cf5c22219d10b439d0c9c64a9ae9f34211e19eccb95cb2417e4b972c5549d23ef4bdd5493cdaf224
 DIST nsca-2.7.2.tar.gz 104953 BLAKE2B 74dce7b59149cd41fe316dc48588d744131efbbe8073d0defe3542a774ac7dd7429a23e5e7f6b2c9b9e45fa1938cdb2994bfcf93e745c12c8fb5bfbbeb627e6e SHA512 f84cac3613bbd0ded4ec700c1dadac71ed075544d0f48281a70946a67792b7f4bcdf6dc3bd5ccf1293cc6a0277638e0f034c33064bf9c05696b4f015e7f15010
-EBUILD nsca-2.7.2-r103.ebuild 2126 BLAKE2B 7763365007ec891a5039834bfe93cec47067558c5b8d23d11ea75a71a9a5cb66eedf0d16a4017348c34b05af7e4e098df2d2427015309978ae242ec22672015c SHA512 6fd20849e0e376fceb31972b6e23588d2bc179d0dba74462dedf1b47cf97f900a56df13571a7119a10f16290339a3507dadc7c9925439f064cb00aae48499b97
+EBUILD nsca-2.7.2-r103.ebuild 2127 BLAKE2B b282376efe16c25c8c3af3012d5fb95ed97026444e1a329fc71ada0510be732caacccc35db0ac8d350cdb096b8e56272deface4119c50dd9dc5d61f6e429871d SHA512 be64c75074fb50cb65f02a4a1e0dfce1ec43f8f648ab4a54e9e221fad2a7fb5cfcfbe1514822f4ebac8df7b24cbeeb768dd4e4e5c8b380fccfea33fe8557765e
 MISC metadata.xml 1732 BLAKE2B 9a1c8c74f4a0b8fb4d79340d3f1860ecb0b885b5709f54ea63eb7a8b288b99ce31875d54829c87b5865b62fa75126f2713f64febc2e812981113c7172fe3aa70 SHA512 1e24a8adef9fb860b05eed48d741e7b2b981ca826300f14ee3c2b7ddd6a497fbc3318a31a9f284eb11a7f216d71ad567d4a4438e03876c83985bd8683b525a1b
diff --git a/net-analyzer/nsca/nsca-2.7.2-r103.ebuild b/net-analyzer/nsca/nsca-2.7.2-r103.ebuild
index fb8d8498ef6d..9fe0ae002f79 100644
--- a/net-analyzer/nsca/nsca-2.7.2-r103.ebuild
+++ b/net-analyzer/nsca/nsca-2.7.2-r103.ebuild
@@ -6,7 +6,7 @@ EAPI=4
 inherit multilib user eutils
 
 DESCRIPTION="Nagios Service Check Acceptor"
-HOMEPAGE="http://www.nagios.org/"
+HOMEPAGE="https://www.nagios.org/"
 SRC_URI="mirror://sourceforge/nagios/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 92dbd5b2e062..6d3068aabbfe 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -14,5 +14,5 @@ DIST rrdtool-1.7.1.tar.gz 2881346 BLAKE2B e538c6ba3fb6726f0515ed655aa8d5e184f6d3
 DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
 EBUILD rrdtool-1.6.0-r1.ebuild 4256 BLAKE2B 96efab5cf4cbdd45e5f64bf41bae3de3260dfa2ad0699ae76b2c6f98c3e88369df5173fb465628dceabb4f8bc92216c8bb51955454a8bc25bfadbed8a63e5906 SHA512 08bba445ae1e6a2e91bcdf903647919e645930bf95786d41ae2663acd1b01eb06009a2ba582ac559ccee45686168fcca9c4592e11570e7f17a2ddeb08329523b
 EBUILD rrdtool-1.7.1.ebuild 4251 BLAKE2B b422dd13981e28eaecc51396e6726eae4ce205ed2619a9a85035a2afba0729c8dcbb39956d08d5bf2422edeca2e876f05d6ba006d78f3980f10d3d332f3a83f6 SHA512 9c09607dd79f1bf9dd4936a45a1f58e7f2c5d13f0f7ea628ade5180612ed029a036168a05e7d60920e2c324a94d9b6fe283b7a27640c12430876d0ece41497db
-EBUILD rrdtool-1.7.2.ebuild 4231 BLAKE2B baf2ad5a700db73e0499f90d4bd156c88aee09fa9d507bf521056cf99491db0973d94515fb0c3c9b8cf335c83a487d9484ca109802f3a77c5df0fd39db0e6ea1 SHA512 00b1e99c0df4bf5ca8b1cccdb6a7d542c2742511f6f3654fa8c5ed41c9c19f1c73389aa5bd1d35d4451a53f95062b087a10a34265994b4aefa1ce416096db01f
+EBUILD rrdtool-1.7.2.ebuild 4229 BLAKE2B 21c6ee4a85ffa9d56efab72b2c1dd5971fe003d4eccff17e18c560c6494da652e9744b4699751c377d396bb809d810038d0e250dc04179cdeabd6b5c170b32b6 SHA512 7fd0ef299215784dd335671bbd24ecf65e22b0ccbc9d63e0066679d1fc386bc92537d72b04d55e27b039331d6bf16070fdcef30110880266f2a6aaec4fa6a4c4
 MISC metadata.xml 486 BLAKE2B d4e04c193a7b46a532791a0a448c7db4acaa4b4d4d775db70b6ab843ba32b616c91b516dbaca5b4e0a30649743553325a134291edb0ee17fe2ca049ed1e720ff SHA512 ddca3904aa3e0f1d2f543ae9329298a2dc69bbc0803c568d0871bb5ace21d2dee4d0b226e5eef0258fd59dd2cf046ee807afaa588e31db35e574f3d707894a23
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
index 95596dfc78ce..84df9b0b661e 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/8.0.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index c876c47db808..d91d424067ab 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -1,7 +1,3 @@
-AUX sarg-2.3.10-config.patch 2612 BLAKE2B 8d0d6bdab60784dd9c289e974dba087b11234b3f961c951bd96ce76a59bdc36f8da5fe5f3c4268f238b5c25f34baa69f97c1e05fbd161abaecb2eb7949d9591d SHA512 e04a971a0838bef3e777708c3328ff940cce84d934de72014eafbcc5123cb8ff2075c30aafdb4ae4541778c6c0fcce38ac32b6dde57ed1a52fc03f1b1f980cda
-AUX sarg-2.3.11-Werror.patch 1012 BLAKE2B f3e9b66c95fe905817c2ceecc52e863c4c0eb9c09d96a525c7876a5f807160421f694b95a02f8f1d62e1292102218c6a1fecf3ed1dedd8f0c7b6b9293322c034 SHA512 e74013c3bc22248ba08656b8751ca6177aeb070ce06661279ee3208ffa62dac8014fed0d6e35b65627ce6f02e70ed662b41dccf21dae8ff2b4e5902cc141e358
-AUX sarg-2.3.11-configure.patch 641 BLAKE2B 8afacc3e90ee7092b762c812dd7e2cab94e9bc6d63026818fb67b26c814b101695989d31e2b3bdd61a346334008afbe2b6f55493e68ecf5c55f7e23f16325253 SHA512 15dce8406ddcc4a4937743c9a6ee8cbe11eb95ef2d86f56f8e6a7b5f3288534a98cb0b3609332ef6b40a3d5d22dc879aaa750f0bbda64b3d5ecc66c606bad9d4
-AUX sarg-2.3.11-format.patch 778 BLAKE2B c3fdcbba47da9ef4b27adeb3cd0bcfc80b1eee230bfb7f44ed5508e0ebe0e5005abf9c40b8794f6986a533170166f7d5c455e0782271f9f87c5db7da594460e9 SHA512 d7e6baa56465d163c0422dd15317bbbf2bf8b20e4aae54eab2c77c7505f18cbf1cc600ddf35ed3f8e7b2a4c58326c5e38c837711c8f9d9188a1e1e8dfe244bc7
 AUX sarg-2.4.0-config.patch 2417 BLAKE2B 7c5f0ddea35dd77acf38431f17427c5be7d4880bcaa230c3570a5d39f8910943f94df9f6f257ba4185add2cad8795ed481371ebaa259de5b60937a569fc732d5 SHA512 8b3ee4d986a200a9ba47435bb21b08c860a7af3543f7ba88064e63b89b0dde7da40d397c57789e411c1a2be55082e8832882236ba45ecc71821df0ea8618e623
 AUX sarg-2.4.0-configure.patch 1497 BLAKE2B 2cd26287e2a5b3cbd641ead5953fb499c542ac3d1c149149261bafbc51c8bbed454dbdecfe2009d54e3ed9c7532de136396e71b8353e55cf9c98638f1157438e SHA512 c6031d8c0034dea88fc83b3171cd0d221e6a421c7806b0af3cb3a80e2c73dc92e273793f7420e4f30490911bbcc13368c0fa1cd328b972ff3eb63ae7b652cf0c
 AUX sarg-2.4.0-fabs.patch 245 BLAKE2B be45ebf17fe6d7588fa7bd8d94da305347f7f017b61875ffc3249ac1a2788ddbee7e09fc855328e0da961866375b43f5a25c2421462b95fcb8265653c3fd2803 SHA512 9fd403ea0ddc411b99645f27e4b0209d9609355735601aa225621fce74270ebaae0e5569ae111bfba88fbd97cb41099f6eaf14047d09f2ceaac25dd85b6b134b
diff --git a/net-analyzer/sarg/files/sarg-2.3.10-config.patch b/net-analyzer/sarg/files/sarg-2.3.10-config.patch
deleted file mode 100644
index cfbf103d5b2a..000000000000
--- a/net-analyzer/sarg/files/sarg-2.3.10-config.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- a/log.c
-+++ b/log.c
-@@ -241,7 +241,7 @@
- 	strcpy(LogoTextColor,"#006699");
- 	strcpy(FontSize,"9px");
- 	strcpy(TempDir,"/tmp");
--	strcpy(OutputDir,"/var/www/html/squid-reports");
-+	strcpy(OutputDir,"/var/www/localhost/htdocs/squid-reports");
- 	AnonymousOutputFiles=false;
- 	Ip2Name=false;
- 	strcpy(DateFormat,"u");
---- a/sarg-php/sarg-squidguard-block.php
-+++ b/sarg-php/sarg-squidguard-block.php
-@@ -26,8 +26,8 @@
-  */
- 
- // Change to squidGuard and sarg config file paths
--$SargConf = "/usr/local/sarg/sarg.conf";
--$squidGuardConf = "/usr/local/squidGuard/squidGuard.conf";
-+$SargConf = "/etc/sarg/sarg.conf";
-+$squidGuardConf = "/etc/squidGuard/squidGuard.conf";
- 
- global $SargConf;
- global $dbhome;
-@@ -37,7 +37,7 @@
- include_once("style.php");
- 
- $url = $_GET['url'];
--$squidGuard_conf = '/usr/local/squidGuard/squidGuard.conf';
-+$squidGuard_conf = '/etc/squidGuard/squidGuard.conf';
- 
- function parse_config($line,$clave) {
-    if (preg_match("/dbhome/i", $line)) {
---- a/sarg-php/sarg-block-it.php
-+++ b/sarg-php/sarg-block-it.php
-@@ -25,7 +25,7 @@
-  *
-  */
- 
--$filename = "/usr/local/squid/etc/block.txt";
-+$filename = "/etc/squid/etc/block.txt";
- 
- $url = $_GET['url'];
- $url = $url."\n";
---- a/htaccess
-+++ b/htaccess
-@@ -1,4 +1,4 @@
--AuthUserFile /usr/local/sarg/passwd
-+AuthUserFile /etc/sarg/passwd
- AuthName "SARG, Squid Analysis Report Generator"
- AuthType Basic
- <Limit GET POST>
---- a/sarg.conf
-+++ b/sarg.conf
-@@ -4,7 +4,7 @@
- #       Where is the access.log file
- #       sarg -l file
- #
--#access_log /usr/local/squid/var/logs/access.log
-+#access_log /var/log/squid/access.log
- 
- # TAG: graphs yes|no
- #	Use graphics where is possible.
-@@ -117,7 +117,7 @@
- #       The reports will be saved in that directory
- #       sarg -o dir
- #
--#output_dir /var/www/html/squid-reports
-+#output_dir /var/www/localhost/htdocs/squid-reports
- 
- # TAG:  anonymous_output_files yes/no
- #       Use anonymous file and directory names in the report. If it is set to
-@@ -545,7 +545,7 @@
- #      Generate reports from SquidGuard logs.
- #      Use 'none' to disable.
- #      You can use sarg -L filename to use an alternate squidGuard log.
--#      squidguard_conf /usr/local/squidGuard/squidGuard.conf
-+#      squidguard_conf /etc/squidGuard/squidGuard.conf
- #
- #squidguard_conf none
- 
---- a/user_limit_block
-+++ b/user_limit_block
-@@ -24,8 +24,8 @@
- #
- #
- 
--conf="/usr/local/sarg/sarg.conf"
--squid_password_file="/usr/local/squid/etc/passwd"
-+conf="/etc/sarg/sarg.conf"
-+squid_password_file="/etc/squid/passwd"
- tmp="/tmp/sarg_limit.$$"
- 
- limit_file=`grep "per_user_limit" $conf|grep -v "#"|awk '{print $2}'`
diff --git a/net-analyzer/sarg/files/sarg-2.3.11-Werror.patch b/net-analyzer/sarg/files/sarg-2.3.11-Werror.patch
deleted file mode 100644
index 035578793934..000000000000
--- a/net-analyzer/sarg/files/sarg-2.3.11-Werror.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -46,18 +46,18 @@
-     CFLAGS="${saved_CFLAGS}"
- fi
- 
--AC_MSG_CHECKING([for implicit-function-declaration error flag in $CC])
-+AC_MSG_CHECKING([for implicit-function-declaration warning flag in $CC])
- saved_CFLAGS="${CFLAGS}"
--CFLAGS="${CFLAGS} -Werror=implicit-function-declaration"
-+CFLAGS="${CFLAGS} -Wimplicit-function-declaration"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_implicit_function_declaration="yes"],[have_implicit_function_declaration="no"])
- AC_MSG_RESULT($have_implicit_function_declaration)
- if test "$have_implicit_function_declaration" = "no" ; then
-     CFLAGS="${saved_CFLAGS}"
- fi
- 
--AC_MSG_CHECKING([for format error flag in $CC])
-+AC_MSG_CHECKING([for format warning flag in $CC])
- saved_CFLAGS="${CFLAGS}"
--CFLAGS="${CFLAGS} -Werror=format"
-+CFLAGS="${CFLAGS} -Wformat"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_error_format="yes"],[have_error_format="no"])
- AC_MSG_RESULT($have_error_format)
- if test "$have_error_format" = "no" ; then
diff --git a/net-analyzer/sarg/files/sarg-2.3.11-configure.patch b/net-analyzer/sarg/files/sarg-2.3.11-configure.patch
deleted file mode 100644
index 583bfeb0e8e1..000000000000
--- a/net-analyzer/sarg/files/sarg-2.3.11-configure.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -2,6 +2,7 @@
- AC_INIT([sarg],[2.3.9])
- AC_CONFIG_SRCDIR([log.c])
- AC_CONFIG_AUX_DIR(cfgaux)
-+AC_CONFIG_MACRO_DIR(m4)
- 
- AC_CANONICAL_HOST
- 
-@@ -26,6 +27,11 @@
- dnl C99 support is required to define LLONG_MAX (at least on CentOS 5.7)
- AC_PROG_CC_C99
- 
-+dnl mkdir_p / MKDIR_P
-+AC_PROG_MKDIR_P
-+mkdir_p="$MKDIR_P"
-+AC_SUBST(mkdir_p)
-+
- # Report more warnings to improve code quality.
- CFLAGS="${CFLAGS} -Wall -Wno-sign-compare"
- 
-@@ -60,7 +66,7 @@
- 
- case "$host" in
-    *-solaris*)
--   LDFLAGS="${LDFLAGS} -lsocket -lnsl"
-+   LIBS="${LIBS} -lsocket -lnsl"
-    CFLAGS="-DSOLARIS ${CFLAGS}"
-    ;;
- esac
diff --git a/net-analyzer/sarg/files/sarg-2.3.11-format.patch b/net-analyzer/sarg/files/sarg-2.3.11-format.patch
deleted file mode 100644
index f2dc7d39b1e8..000000000000
--- a/net-analyzer/sarg/files/sarg-2.3.11-format.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/report.c
-+++ b/report.c
-@@ -54,7 +54,7 @@
- 	char accsmart[MAXLEN];
- 	char crc2[MAXLEN/2 -1];
- 	char siteind[MAX_TRUNCATED_URL];
--	char arqtt[256];
-+	char arqtt[MAX_USER_FNAME_LEN * 2 + MAXLEN + 10];
- 	char *oldurltt=NULL;
- 	char oldaccdiatt[11],oldacchoratt[9];
- 	char tmp3[MAXLEN];
---- a/index.c
-+++ b/index.c
-@@ -89,9 +89,9 @@
- 	char monthdir[MAXLEN];
- 	char monthname1[9], monthname2[9];
- 	char nmonth[30];
--	char monthnum[10];
-+	char monthnum[15];
- 	char dayindex[MAXLEN];
--	char daynum[10];
-+	char daynum[15];
- 	char title[80];
- 	int yearsort[150];
- 	int nyears;
---- a/userinfo.c
-+++ b/userinfo.c
-@@ -67,7 +67,7 @@
- 	int skip;
- 	int flen;
- 	int count, clen;
--	char cstr[9];
-+	char cstr[10];
- 
- 	last=NULL;
- 	for (group=first_user_group ; group ; group=group->next) {
diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest
index e83d071f960b..626a4e379b11 100644
--- a/net-analyzer/testssl/Manifest
+++ b/net-analyzer/testssl/Manifest
@@ -2,6 +2,6 @@ DIST testssl-3.0.1.tar.gz 9207908 BLAKE2B 0c7c43b306866fa79718027ce9db3a894a4344
 DIST testssl-3.0.2.tar.gz 9208016 BLAKE2B cacb21f34d769f3e255d1db01bf197c0dcb0dc619c09d8153b65ef1ce5daaddb0b43ba698c765de1993023992a101ca6a5cde66da098e3eba3e81df81b3cc824 SHA512 ad886d556d6682bc99d45a9719abf6ee00f4e0f763795a79e46e0495bc355ede56204b6f1fb0db19311e42913990b57016fb6a4adb7414bb7283d847c19e9fb2
 DIST testssl-3.0.tar.gz 9207778 BLAKE2B 56f13cb58bc930e0c70ef1ff4734dd7e363f362397ebe354c446f1fd6e73a0774a6eb84326a405a5aab224b058754e03fcecda254617eee2fde4d9566ada4e15 SHA512 a5e65d3145bc422cf03b49087cc24cadca367206a06dda61d114b0a6afd7c4921204e23cdc3ade2f5d7e9ce4adf17b54691b9d33d46b75b296111663e9cf063a
 EBUILD testssl-3.0.1.ebuild 1511 BLAKE2B 7bb402e6ecfa6ba7ec5a3b3f1411837c0fbbb35d014ce61fe80eb9eabf8fedd0375d1366019496ea4dd27bf7ee445d1e3c0203085e7dc912290f69246bf2b0fe SHA512 af622b997573b6b82392d4538dd1fb29dd0f72e05b5f1743b0b415d31638f72b73091216eb3b73f3010c5291a26af34aab57a9e28130896b11f6625ab87f4e17
-EBUILD testssl-3.0.2.ebuild 1511 BLAKE2B 7bb402e6ecfa6ba7ec5a3b3f1411837c0fbbb35d014ce61fe80eb9eabf8fedd0375d1366019496ea4dd27bf7ee445d1e3c0203085e7dc912290f69246bf2b0fe SHA512 af622b997573b6b82392d4538dd1fb29dd0f72e05b5f1743b0b415d31638f72b73091216eb3b73f3010c5291a26af34aab57a9e28130896b11f6625ab87f4e17
+EBUILD testssl-3.0.2.ebuild 1509 BLAKE2B 3fe3638078171668db5e9820cd1b29062117c8f081e0d68f9830dc1e1970a17b546eeb491170420a359901abf7ea7d9b2255a9c483b2a564ebf315b2dec319bd SHA512 5e404a151afe689e1701cbf79ccd0c6e925f4848bb513ff9f5aab6f35dd99c287ba31321841693ad51b06e54122f0bb6d876f45cda4c8aa2480982f59983be14
 EBUILD testssl-3.0.ebuild 1509 BLAKE2B 3fe3638078171668db5e9820cd1b29062117c8f081e0d68f9830dc1e1970a17b546eeb491170420a359901abf7ea7d9b2255a9c483b2a564ebf315b2dec319bd SHA512 5e404a151afe689e1701cbf79ccd0c6e925f4848bb513ff9f5aab6f35dd99c287ba31321841693ad51b06e54122f0bb6d876f45cda4c8aa2480982f59983be14
 MISC metadata.xml 427 BLAKE2B 5504150e6ed2e079db47b71afd8826e0543162d259ffb690caab572f6f87cf358ec4216b7859c274047f4d880aed40ab6858633856e12f9d9d05683198b75fba SHA512 83dacfa2293a8f14bce97a01f732376e76f84c4eb4fffbed1049b08210850cc5b54381d83df15bec2ecc1c1a592148d538ac37053b36fa1022542e023a97d9ab
diff --git a/net-analyzer/testssl/testssl-3.0.2.ebuild b/net-analyzer/testssl/testssl-3.0.2.ebuild
index 8a2472e4e275..f8845bdafb9c 100644
--- a/net-analyzer/testssl/testssl-3.0.2.ebuild
+++ b/net-analyzer/testssl/testssl-3.0.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/drwetter/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2 bundled-openssl? ( openssl )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bundled-openssl kerberos"
 
 RDEPEND="
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 95e9ba98a1fc..d32813593599 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,15 +1,10 @@
 AUX wireshark-2.4-androiddump.patch 1167 BLAKE2B dcbb99f89e25f83e28bf4d7e1379967ba98bac6b712d897e68329a85f2f19ec6ecbc0a87c59db39c619eba1e27227577b9efe2399add981a93ed589f5baade38 SHA512 b5553ff8f80309791741f7d7e82364ab754a905b062f3b477ee542ee59ce7bbe0a272c517188b0480769e170c73d2a37260222b7d517796f9b16a9b6dc0d17ef
 AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db464f1274beba49c440af831d708bf251ad7481231f27bd7d7f99cf50f964e7f8aa80ce3c0f4d3b06f00ce624f7347 SHA512 92d498c7b6c3a4ae461f5bbca090943dbd7a3151628eebd4b212f3d9eca133260fe46bc72c6bec8444a83517d7a69c334257c61f9fd8e1256f71dd70241e3f66
 AUX wireshark-2.9.0-tfshark-libm.patch 134 BLAKE2B 364acc14eaf74d134b9905c240a3a6074138a259ce6a0a4a08496884d34961cbcbcba6204a47c62e015207d551abe5c5b30430333f185773347157162a027d4d SHA512 5cbbe6fc9aef5f26216ede7e5ece4fa8b5e2aeebc478c761a8b5ee5310f24fef8b2588fc04938fa9bfc4875d6df2835f82b4d15c4b818f9ac500d2fc2465d362
-AUX wireshark-99999999-about_dialog-plugins_add_description.patch 758 BLAKE2B cdb787a6deb112708d0f39307a845e0d3594233903db1994db2fa17f61c1dd3afc6692a33b2e5694b001d7935ed076a039f15af7b98b26b612338157fa095fdb SHA512 88c07c85b36c1d5d7f3476a58f6c8af6c8f280cee147e32bfd64e848437221698a821bec9c6afed845a8a3bdd3e3f1ce2bfde33bb511a60a953c0bb4fe26a982
 AUX wireshark-99999999-androiddump-wsutil.patch 428 BLAKE2B 1385ce244836fa79c88d885616754c3645b6b658eb2e43988137a651dc3cdd34e21064ffa3b9ccf61011cc8542a5ad8ef817c497a679ef0aae2d7ba463ab2f61 SHA512 6f5dcf91cadc96272f8b9e7002319dc3c91b2a2495477da0102b87ba73a3240fea29c6c9ea655953290d4f6ed1799c049ec23b0b0cff498e2b7b6e78f49f784e
 AUX wireshark-99999999-qtsvg.patch 160 BLAKE2B f282867fc9cf3d770fb6abb5e6e9b471e3a117e216d3b0e1ba370e1bda3346fc041bedb8d14813dd17fea72441c5cd49a192ecd5fa864dedde88154e729d73fb SHA512 d5e78204767db49b5da6295418cdbb242f91181348fea8042e6ed7fd4b82b19ddef91f0ac10e1f3b7a0f9316a0a8dc7ba0a9b5fb3550dcd7c8814c92989d902e
 AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
-DIST wireshark-3.2.1.tar.xz 31522124 BLAKE2B 49a83f6c99d54b7a0910f5ace4b46caac680ea73f81d7a3bf7818ccbc6a2fc07cd8f63e1b6ef341cc516220320bb5e035ef6fe82d3d0aba04ec01d6f67f017a1 SHA512 78300f7d597132d54cabe3e51e0f069657d164823852a9f23f1c3c9e6cfdefe5d5ac05c817d06869f4efa4e3cac25ea646cc39d880e5296cf409a8e1a03c2530
-DIST wireshark-3.2.3.tar.xz 31572052 BLAKE2B 799c1e139dca90905526f0b04c9c4fbb48baa439d7f660321137c64088d190b9bce70bed4a16a6faf7327c86897825ac4f9c12d9dad465b3d6f6a23868bd9e28 SHA512 6e13f5aba9c3f531fab94c9f19e85856278ff534d02e406143c0c134c9b37a76d372105b43f51e95f319e31d742fc17c2812defe377886bd8f7ed03f743f9e9a
 DIST wireshark-3.2.4.tar.xz 31580440 BLAKE2B c40c19fde09726192119efe358892157d17e28ab87afa9a5b91203e11d3079b718d8e200522294886613d63d19283198de1256561eaf83436742db3898019e89 SHA512 67d20a248c0f4e63a58fd3a4191ede75542e9cfd09b0baa5c0016f72a435527d8f95d34f2d35ef1957c1a9c66844d530162379bfcf9e51b64d0d220b381cb097
-EBUILD wireshark-3.2.1.ebuild 6787 BLAKE2B a6c802d721d9b5922c916654a97f00bb48b8099fdf1693b793966b4c0f6b53736db09f0c9366e7dc6ecfcd3c081e00d37ce8fbef68a1ae177dfb978ac17abb03 SHA512 bfdaae60f4fe32b358b232678330453d0b9e773308e65080aa9dee543852e4c148cc848202839743e109863c9f132980cd0968f5d14e524c54ac9e8754120d11
-EBUILD wireshark-3.2.3.ebuild 6867 BLAKE2B 9a09a6c43b745de8f645ac354a2428b152dd8b9209c2ba46210e80a0906fe5d4e929208cf1fd9975ead7aa94153ef5f946ec53f99dc47679e233d612b1ec7dc2 SHA512 0e3475aa1e2e1483d8c9ce42e0c832a87a1dcee64e6adf0f6d590824cd98cdf08d6169cb52cf0f03867a94c5d9c2c5bae739c794cb7ae733775932b813d5e93c
-EBUILD wireshark-3.2.4.ebuild 6971 BLAKE2B fc8cadd97883a21dfba1798e6f06a3b459ff657e722888d8e51667550302aeda7fef26ed3e47e326c579cbf80853d3bc745c0d57307ca0b09e3414b1cd10ed07 SHA512 f77ea2d771a65ed2bcd130a7f8b3aa2039b9d3b980297b9491065fde490b38d5f9c29e98b6205aaa1a7ec76fbac5d90ca1e92edfdf901ede06f9b1721a6c3749
-EBUILD wireshark-99999999.ebuild 6652 BLAKE2B 4e5c2ac6267be8cc6f06b5ce4a328dad51bfdd29089c532d15269f900f6c2e44b865ba12bbef73e83afa18237ab7e72b9e61fdc70fab13e41f61bb4c318a4734 SHA512 42909bd29e683ee9fb724324a47e538486e413135f4b004bf9b12144a09235de393c82b1f9b2e48e59ae61ba9102fd86f52386203ca693f593def3facad99119
+EBUILD wireshark-3.2.4.ebuild 7043 BLAKE2B 3a81a5738c7a55d89755a3f1b5462ddafa420891d738350dd4f0159626148d0a4a28038050b148dc5f7fd90fde758bfea8e658f1c48606bad423719b7b899812 SHA512 42ce3ac95cc7f06f0a5fa524a5b8d5c35bdd3f0001ccf1c1bbb5034139ae9bc9378303b68a4858020b1463b33ddddf242b77743679b763588593d4e593a74b3c
+EBUILD wireshark-99999999.ebuild 6726 BLAKE2B 725f9834e9a57f9d055ece469de2a76b0d1af2a856eee7987f51afac25b9371a11bb000a47cd2bff113a85bf9b3842e6bd667b880430e7ce1a7697b6133ce4df SHA512 c45f48fa8296ff46af4161783fa0de82c9ee89f8c2e1ace27c31275d185dc1cf4831ad93b54d23f512422c921598b1f98025779a1bcb689254b9e1b160d6f3f2
 MISC metadata.xml 4887 BLAKE2B fe155238f794922efa1707256697726e556138179e431ca65376fa66c9904ef1cdbbe6018b583f61af3969be618e90b999969da92ce1b782f30f412b0c8305ca SHA512 40e145145120e0301aae8438d8b8782d2414946ac80f5e3d051261eb9372b823a74e4f779d5c4413fe9eb833c2f48e149ca64259f7498bb97275eadc0238a7b3
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-about_dialog-plugins_add_description.patch b/net-analyzer/wireshark/files/wireshark-99999999-about_dialog-plugins_add_description.patch
deleted file mode 100644
index 5506c6ec2ad4..000000000000
--- a/net-analyzer/wireshark/files/wireshark-99999999-about_dialog-plugins_add_description.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/ui/qt/about_dialog.cpp
-+++ b/ui/qt/about_dialog.cpp
-@@ -112,7 +112,6 @@ QStringList AuthorListModel::headerColumns() const
-     return QStringList() << tr("Name") << tr("Email");
- }
- 
--#if defined(HAVE_PLUGINS) || defined(HAVE_LUA)
- static void plugins_add_description(const char *name, const char *version,
-                                     const char *types, const char *filename,
-                                     void *user_data)
-@@ -121,7 +120,6 @@ static void plugins_add_description(const char *name, const char *version,
-     QStringList plugin_row = QStringList() << name << version << types << filename;
-     *plugin_data << plugin_row;
- }
--#endif
- 
- PluginListModel::PluginListModel(QObject * parent) : AStringListListModel(parent)
- {
diff --git a/net-analyzer/wireshark/wireshark-3.2.1.ebuild b/net-analyzer/wireshark/wireshark-3.2.1.ebuild
deleted file mode 100644
index 83b510b02735..000000000000
--- a/net-analyzer/wireshark/wireshark-3.2.1.ebuild
+++ /dev/null
@@ -1,248 +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 fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils cmake
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/"
-SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
-LICENSE="GPL-2"
-
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 x86"
-IUSE="
-	androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
-	+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
-	+minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump
-	+reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
-	+text2pcap tfshark +tshark +udpdump zlib
-"
-S=${WORKDIR}/${P/_/}
-
-CDEPEND="
-	>=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 )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-	${CDEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-ruby/asciidoctor
-	)
-	qt5? (
-		dev-qt/linguist-tools:5
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	qt5? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
-	plugin-ifdemo? ( plugins )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4-androiddump.patch
-	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
-	"${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
-	"${FILESDIR}"/${PN}-99999999-about_dialog-plugins_add_description.patch
-	"${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch
-	"${FILESDIR}"/${PN}-99999999-qtsvg.patch
-	"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
-)
-
-pkg_setup() {
-	enewgroup wireshark
-}
-
-src_configure() {
-	local mycmakeargs
-
-	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos; then
-		case $(krb5-config --libs) in
-			*-lcrypto*)
-				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
-				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
-				ewarn "license and the GPL, so do your check before distributing such package."
-				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
-				;;
-		esac
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	fi
-
-	python_setup
-
-	mycmakeargs+=(
-		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
-		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
-		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
-		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
-		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
-		-DBUILD_androiddump=$(usex androiddump)
-		-DBUILD_capinfos=$(usex capinfos)
-		-DBUILD_captype=$(usex captype)
-		-DBUILD_ciscodump=$(usex ciscodump)
-		-DBUILD_dftest=$(usex dftest)
-		-DBUILD_dpauxmon=$(usex dpauxmon)
-		-DBUILD_dumpcap=$(usex dumpcap)
-		-DBUILD_editcap=$(usex editcap)
-		-DBUILD_mergecap=$(usex mergecap)
-		-DBUILD_mmdbresolve=$(usex maxminddb)
-		-DBUILD_randpkt=$(usex randpkt)
-		-DBUILD_randpktdump=$(usex randpktdump)
-		-DBUILD_reordercap=$(usex reordercap)
-		-DBUILD_sdjournal=$(usex sdjournal)
-		-DBUILD_sharkd=$(usex sharkd)
-		-DBUILD_sshdump=$(usex sshdump)
-		-DBUILD_text2pcap=$(usex text2pcap)
-		-DBUILD_tfshark=$(usex tfshark)
-		-DBUILD_tshark=$(usex tshark)
-		-DBUILD_udpdump=$(usex udpdump)
-		-DBUILD_wireshark=$(usex qt5)
-		-DCMAKE_INSTALL_DOCDIR="${EROOT}/usr/share/doc/${PF}"
-		-DDISABLE_WERROR=yes
-		-DENABLE_BCG729=$(usex bcg729)
-		-DENABLE_BROTLI=$(usex brotli)
-		-DENABLE_CAP=$(usex filecaps caps)
-		-DENABLE_GNUTLS=$(usex ssl)
-		-DENABLE_KERBEROS=$(usex kerberos)
-		-DENABLE_LIBXML2=$(usex libxml2)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_LZ4=$(usex lz4)
-		-DENABLE_MINIZIP=$(usex minizip)
-		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex http2)
-		-DENABLE_PCAP=$(usex pcap)
-		-DENABLE_PLUGINS=$(usex plugins)
-		-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
-		-DENABLE_SBC=$(usex sbc)
-		-DENABLE_SMI=$(usex smi)
-		-DENABLE_SNAPPY=$(usex snappy)
-		-DENABLE_SPANDSP=$(usex spandsp)
-		-DENABLE_ZLIB=$(usex zlib)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
-	# install headers
-	insinto /usr/include/wireshark
-	doins ws_diag_control.h ws_symbol_export.h \
-		"${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
-
-	local dir dirs=(
-		epan
-		epan/crypt
-		epan/dfilter
-		epan/dissectors
-		epan/ftypes
-		epan/wmem
-		wiretap
-		wsutil
-	)
-	for dir in "${dirs[@]}"
-	do
-		insinto /usr/include/wireshark/${dir}
-		doins ${dir}/*.h
-	done
-
-	#with the above this really shouldn't be needed, but things may be looking
-	# in wiretap/ instead of wireshark/wiretap/
-	insinto /usr/include/wiretap
-	doins wiretap/wtap.h
-
-	if use qt5; then
-		local s
-		for s in 16 32 48 64 128 256 512 1024; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/apps
-			newins image/wsicon${s}.png wireshark.png
-		done
-		for s in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
-			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
-		done
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-	chgrp wireshark "${EROOT}"/usr/bin/dumpcap
-
-	if use dumpcap && use pcap; then
-		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
-			cap_dac_read_search,cap_net_raw,cap_net_admin \
-			"${EROOT}"/usr/bin/dumpcap
-	fi
-
-	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
-	ewarn "add yourself to the wireshark group. This security measure ensures"
-	ewarn "that only trusted users are allowed to sniff your traffic."
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-analyzer/wireshark/wireshark-3.2.3.ebuild b/net-analyzer/wireshark/wireshark-3.2.3.ebuild
deleted file mode 100644
index 9c28437e7631..000000000000
--- a/net-analyzer/wireshark/wireshark-3.2.3.ebuild
+++ /dev/null
@@ -1,254 +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 fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils cmake
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/"
-SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
-LICENSE="GPL-2"
-
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
-IUSE="
-	androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
-	+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
-	+minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump
-	+reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
-	test +text2pcap tfshark +tshark +udpdump zlib +zstd
-"
-S=${WORKDIR}/${P/_/}
-
-CDEPEND="
-	>=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 )
-	zstd? ( app-arch/zstd )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-	${CDEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-ruby/asciidoctor
-	)
-	qt5? (
-		dev-qt/linguist-tools:5
-	)
-	test? (
-		dev-python/pytest
-		dev-python/pytest-xdist
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	qt5? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
-	plugin-ifdemo? ( plugins )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4-androiddump.patch
-	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
-	"${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
-	"${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch
-	"${FILESDIR}"/${PN}-99999999-qtsvg.patch
-	"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
-)
-
-pkg_setup() {
-	enewgroup wireshark
-}
-
-src_configure() {
-	local mycmakeargs
-
-	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos; then
-		case $(krb5-config --libs) in
-			*-lcrypto*)
-				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
-				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
-				ewarn "license and the GPL, so do your check before distributing such package."
-				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
-				;;
-		esac
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	fi
-
-	python_setup
-
-	mycmakeargs+=(
-		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
-		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
-		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
-		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
-		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
-		-DBUILD_androiddump=$(usex androiddump)
-		-DBUILD_capinfos=$(usex capinfos)
-		-DBUILD_captype=$(usex captype)
-		-DBUILD_ciscodump=$(usex ciscodump)
-		-DBUILD_dftest=$(usex dftest)
-		-DBUILD_dpauxmon=$(usex dpauxmon)
-		-DBUILD_dumpcap=$(usex dumpcap)
-		-DBUILD_editcap=$(usex editcap)
-		-DBUILD_mergecap=$(usex mergecap)
-		-DBUILD_mmdbresolve=$(usex maxminddb)
-		-DBUILD_randpkt=$(usex randpkt)
-		-DBUILD_randpktdump=$(usex randpktdump)
-		-DBUILD_reordercap=$(usex reordercap)
-		-DBUILD_sdjournal=$(usex sdjournal)
-		-DBUILD_sharkd=$(usex sharkd)
-		-DBUILD_sshdump=$(usex sshdump)
-		-DBUILD_text2pcap=$(usex text2pcap)
-		-DBUILD_tfshark=$(usex tfshark)
-		-DBUILD_tshark=$(usex tshark)
-		-DBUILD_udpdump=$(usex udpdump)
-		-DBUILD_wireshark=$(usex qt5)
-		-DCMAKE_INSTALL_DOCDIR="${EROOT}/usr/share/doc/${PF}"
-		-DDISABLE_WERROR=yes
-		-DENABLE_BCG729=$(usex bcg729)
-		-DENABLE_BROTLI=$(usex brotli)
-		-DENABLE_CAP=$(usex filecaps caps)
-		-DENABLE_GNUTLS=$(usex ssl)
-		-DENABLE_KERBEROS=$(usex kerberos)
-		-DENABLE_LIBXML2=$(usex libxml2)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_LZ4=$(usex lz4)
-		-DENABLE_MINIZIP=$(usex minizip)
-		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex http2)
-		-DENABLE_PCAP=$(usex pcap)
-		-DENABLE_PLUGINS=$(usex plugins)
-		-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
-		-DENABLE_SBC=$(usex sbc)
-		-DENABLE_SMI=$(usex smi)
-		-DENABLE_SNAPPY=$(usex snappy)
-		-DENABLE_SPANDSP=$(usex spandsp)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_ZSTD=$(usex zstd)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build test-programs
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
-	# install headers
-	insinto /usr/include/wireshark
-	doins ws_diag_control.h ws_symbol_export.h \
-		"${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
-
-	local dir dirs=(
-		epan
-		epan/crypt
-		epan/dfilter
-		epan/dissectors
-		epan/ftypes
-		epan/wmem
-		wiretap
-		wsutil
-	)
-	for dir in "${dirs[@]}"
-	do
-		insinto /usr/include/wireshark/${dir}
-		doins ${dir}/*.h
-	done
-
-	#with the above this really shouldn't be needed, but things may be looking
-	# in wiretap/ instead of wireshark/wiretap/
-	insinto /usr/include/wiretap
-	doins wiretap/wtap.h
-
-	if use qt5; then
-		local s
-		for s in 16 32 48 64 128 256 512 1024; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/apps
-			newins image/wsicon${s}.png wireshark.png
-		done
-		for s in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
-			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
-		done
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-	chgrp wireshark "${EROOT}"/usr/bin/dumpcap
-
-	if use dumpcap && use pcap; then
-		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
-			cap_dac_read_search,cap_net_raw,cap_net_admin \
-			"${EROOT}"/usr/bin/dumpcap
-	fi
-
-	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
-	ewarn "add yourself to the wireshark group. This security measure ensures"
-	ewarn "that only trusted users are allowed to sniff your traffic."
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-analyzer/wireshark/wireshark-3.2.4.ebuild b/net-analyzer/wireshark/wireshark-3.2.4.ebuild
index 50b70fda998c..33ae5ea2b3f8 100644
--- a/net-analyzer/wireshark/wireshark-3.2.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 x86"
 IUSE="
 	androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
 	+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
@@ -180,6 +180,8 @@ src_configure() {
 
 src_test() {
 	cmake_build test-programs
+
+	myctestargs=( --disable-capture --skip-missing-programs=all --verbose )
 	cmake_src_test
 }
 
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index a358f4abf6ea..0fca7d964220 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -173,6 +173,8 @@ src_configure() {
 
 src_test() {
 	cmake_build test-programs
+
+	myctestargs=( --disable-capture --skip-missing-programs=all --verbose )
 	cmake_src_test
 }
 
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index e91754ee688e..906b1f42ffc0 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -24,6 +24,6 @@ EBUILD zabbix-4.0.20.ebuild 9219 BLAKE2B 260a527502f825cd65c1192542dac57c14ff68f
 EBUILD zabbix-4.0.21.ebuild 9233 BLAKE2B 88c1ed41839445811f8ed60013f1d6db671f3ae1b7622fe38460ebf4e1f71594f0d567b28ea268b9859a81ba7df2a0dfaef960c0687a2ed6164699b6430493de SHA512 99f22868531dbd8f9574b5bc7ca96f0c7cfbffad22ffee95d7dba7f90cc89ec9166cfa0a8cdcec2070a49722b6c39a283f82b986dc8886532d6b06d94905bab1
 EBUILD zabbix-4.4.8.ebuild 9088 BLAKE2B a5681497e0f1bc1c3b10a5a2f6c0233787d379d82df41cd3c2852f22acde9954ae40b22dffc209616e5ea04ce3825fc2610b7f5ae7a86bb21b1a3855006e71f5 SHA512 17b71b82bf1660b873c4528e316cae3f713209ce1e2b54e6a9272b8d2ed78d2b387f6efe021ad3acb4bd70425d8bea1c8eb94013e72d88a6952a47d776f8d84c
 EBUILD zabbix-4.4.9.ebuild 9102 BLAKE2B dfaa4ba55529471d3499a275ecaf0a177d15a1c2cd565fa9f955a1e2cfb48576419783f582739ec60305c317bdc22cdb6804d46543d01950f2e1920a4496d1b3 SHA512 89224dadb5f782b63f63caefbc1530fae877aa9900e162fe8d214473ac2663ea33253672ec4bc95d6f944f696e515ed1a801536012c6abab0e844a7107eca5c0
-EBUILD zabbix-5.0.0.ebuild 9101 BLAKE2B 4d2882b54f64c23acc250da2de5787cec25cf9bf9ee4b4eb1332cc43e6408d0d888a49d9bcbb560d095d54e3b7f34210c1f4bc03547f0df3d3c61ad0c81e2e24 SHA512 9244c71faef8a4945f0b0fd03235426966f7abecf3fa8d28034df340375fdf684bf5fd695c06ba94d4411ba0a4db17dcc64d757d135f9b4853a993cf53a0154c
+EBUILD zabbix-5.0.0.ebuild 9100 BLAKE2B 58767e6ebb13985bf734c2afde4c28f49ee125328934cac0e82d8ec6b6fbfd82472c007d7d8821f20e1414659356fe0f2be2b7efe4350e27405c69018b7d8a0d SHA512 afd232493c12f1f2494e31a8776b57fc22d269d2f6f7c1341757ebf3e4808ffd0de06a75e5d16fb1a904a766545c831aa65ddd2b6c1e06b83d1c9969b1525af3
 EBUILD zabbix-5.0.1.ebuild 9102 BLAKE2B 03f011a80a0b3ee224c24ab3d4cfeef0e0307a70202cb7af82b8b043fc6729fe9e1750d018422e50106f2f60b15c09e7ab1becacc271d39e8e6178de67d2fc11 SHA512 f50a8b85390edbf70fac2edd58dba016e69360a36e3485bf5633f59f4dabf6994924b134d42ab7386329e0658e3bc3979ad90b3759c905ac322870b5b97e3839
 MISC metadata.xml 1518 BLAKE2B 3ec0ec6fcb2e8d92209689d685171ad4d97a81d89f60719cc1de88b88c0f91a86a5422359e84c665ed140b6dc764164a75177ac1cc2fa0d624599bcc050d057e SHA512 6a131659395d29c72126ea38648ec273c444497f592f830af6afb7791eff4063de1349059ae11917a3356c22b38f5ac954593394ab03b955183ae8011dd4b173
diff --git a/net-analyzer/zabbix/zabbix-5.0.0.ebuild b/net-analyzer/zabbix/zabbix-5.0.0.ebuild
index 0918dc7c5b0f..c105a7d5d7ea 100644
--- a/net-analyzer/zabbix/zabbix-5.0.0.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 x86"
+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 ) )
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 05775b5010fc..45cfa5909682 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/openresolv/Manifest b/net-dns/openresolv/Manifest
index 1bc865db6845..a7ccbe073fc6 100644
--- a/net-dns/openresolv/Manifest
+++ b/net-dns/openresolv/Manifest
@@ -4,4 +4,4 @@ DIST openresolv-3.9.2.tar.xz 20200 BLAKE2B 25cb56fd85114c3866207a3bf83d1295eb135
 EBUILD openresolv-3.10.0.ebuild 1054 BLAKE2B 5ecfe2dac83e3d5c2c67fb38b587b8a4ae8136ae34749d1b415a9cf9fc8c321ecc377bca0d0d7a505763172a05f54e5cecabf5446257613c6aece551dc2b0d9e SHA512 b2a96a4732e06b595269021706de9299ff8a3805fe21b7f0f3957b68c1cf7f0d1386375153ec560b13cc0340e3cc20dc0c438fac6e67e5a8b13d91c55b530760
 EBUILD openresolv-3.9.0.ebuild 1051 BLAKE2B a65dd7f686d9f2c77f0fa80be46d7fdc0bdc3c1f60f1e55b6d063c565ee1b229b27b79218c3021ac4984c75d44eee4bcb354500a8cfdb212f46252a9648d1c3c SHA512 e4d046ace895fc5323dad10e1aa267d486744d493a53c987399bd4d91fcfa3e3cfaf3527c4467da12c685f7dc76bf1c60325b4a9a690b7d7b1ae07b62a14216a
 EBUILD openresolv-3.9.2.ebuild 1097 BLAKE2B f64842286737d4551140728da7a54090ce14b8bce3f471c07ce38a6bdd5919ff5b47d70816298e28a4491754e23310a5b54d766d96ef6c71065671cfe478d887 SHA512 55cc9dc93231bd98b29c3ec12032266a23cd11fbdef244d558f55c0c9fc49c2e30737cc9ce6bde2f8128050005f7dd049964c6002917af54a702cf4d3b078556
-MISC metadata.xml 372 BLAKE2B 24db644f62ad2ee508b0eb6a6f521f3e3d2221a749b73ca46cee7f1c97641e8d67ba7ed50da735fd524b20575026e38642529eb5389ccd9358a5d787978d5ace SHA512 2a4d2e73c7a7b33e1c7246da3fc5c3e155de0e6c76928dcda6de4917cfd9bb37880ffa2cc65e7ff7b73d5822a4879d708f842d2a833d7cdbee6c55d4d72184ee
+MISC metadata.xml 396 BLAKE2B 225458f3e84955b1864d1d3fb1e33d1621d59ca00860da438d2e4d1e5cb07db50a8910bc25c7372491ef637b03f264073c881ae157691a25665f10c176d02ca8 SHA512 125584791b7eedd8077834628835c5f03c891cc7d0cb498a8a8a356b72dd57edf680b019e416bc4f38ae6647dc6075a59b61d6fdbb98c392ec1f63fa66eee370
diff --git a/net-dns/openresolv/metadata.xml b/net-dns/openresolv/metadata.xml
index 99a0254efabc..232308b66fd0 100644
--- a/net-dns/openresolv/metadata.xml
+++ b/net-dns/openresolv/metadata.xml
@@ -9,4 +9,5 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index f8985bd515c7..37a8a9bafd45 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -2,5 +2,6 @@ AUX pdns-recursor-4.3.1-boost-1.73.0.patch 4563 BLAKE2B 81f5f33939f9937b78235c3f
 AUX pdns-recursor-4.3.1-gcc-10.patch 2592 BLAKE2B da68e0311a30ba894cfa82b1140dca85b2547cc0885d9fec6dd0721c38f531777e06d27ede7bdc92996e60bfb621351bab66c1ce19cc923f8fc3b1b44a4bde05 SHA512 16a81afc5a3a7cdac4acee52b30ff61cea97ef1c543fc0858897c2caa19fedd1e71f9787c4674122ee7f96d4130d6b5f37b0cdcc6bcd44d14765845877c02ab4
 AUX pdns-recursor-r2 1251 BLAKE2B 391f52b9c9b8ee1d01ca57b5e73106f350f474e12c5ca957cfe857a0a8f672a1347393d15c343601769ce58fc12034833fb5f012f7ae7b1d41d76d493be5ca71 SHA512 a607ac4e6edb095d7d097e255779ea574191793bbbdce1df7113e17dc777dfd8929a9332fc6cd4e98b59fe826e020efcf35a011ff4cef70433117fab4998584c
 DIST pdns-recursor-4.3.1.tar.bz2 1334817 BLAKE2B 1972259e42b1cefd9069a36d2bb235652ce234d525a2e3f19c96a93bf26f34063e6d04240146bba0560573c1d2ad042a579d6ab557fc7ac0aadee09fa15ee397 SHA512 49ae4957ef202f94ec87e6449dfa9c147689b5576ca1002e0155319099d698300c113e221571f6d41cb1cdc1649619621c2ccf8105620c25452ac30bd83e46b8
+EBUILD pdns-recursor-4.3.1-r1.ebuild 1976 BLAKE2B 349a1e9ece84876f4942fbd71e2a4627e10ae2095794540ed8537314d614d9cbc3705d889493c188acb73583d144fc4afa8cdb15c71b0b557d99d0b96dd58a37 SHA512 87ec69617de53ee96947d566475753499f0997a5597e8e48ebbc84e2dcd10992e5bb920980c4567fd68c9d02aa75d855f73feaa990d68720196b828fbcadc5f8
 EBUILD pdns-recursor-4.3.1.ebuild 1871 BLAKE2B 41b5d33da55a8a0fabfd0d69666ad23a7104f10343d10bc949b269596ed8238f9c9cd3f573a2a026f876046fce42cf7787ac264cf1fe69bd8822c8605a19c544 SHA512 26fca6db80aa43334985e27161a64a893d150f0e746fe0bb834b5341096f0eed79524c432b8b95ad06bce152ef65fcc76b7befc4a2dd100729b7ffa077c0471e
-MISC metadata.xml 954 BLAKE2B 91824dd5b63f8533d2f0a9df87df133ba87f54d6ede9dfd1b1e920251081372fa659dbeb75e2252d91804a2fe269508693ef507c7e070a3cca5ba18711ea8d70 SHA512 1ade9c243b0bdaf70146c344bc318f8c042f846bd91c8e42706d803638c2132bc9ecc9f83db5b862e6e6aff65be9c7437250ac831264a640367d1308c8e3fcfe
+MISC metadata.xml 1008 BLAKE2B 1c82fd9262358bcf1ff0f8503bc8dfe9b640023133ca48711bc576df00312312b5e37a36ff10aac561ef1c71e20f64c5f0a4c431c60ca029220732fba0ee1bf9 SHA512 2deab5a88c42d3416b3da5b6d9d3ed9b2db0a5dcb3d8b7fc4c7a13b2219fd7df786bfef42ff5e3d7c2b40058592e892f380d126a0254013534e66e65499e7105
diff --git a/net-dns/pdns-recursor/metadata.xml b/net-dns/pdns-recursor/metadata.xml
index bee2820e1924..89c22c948dda 100644
--- a/net-dns/pdns-recursor/metadata.xml
+++ b/net-dns/pdns-recursor/metadata.xml
@@ -15,6 +15,7 @@ It also has built-in hooks for making graphs with rrdtool, providing insight int
 nameserver performance.
 </longdescription>
 <use>
+	<flag name="dnstap">Enable support for dnstap</flag>
 	<flag name="protobuf">Enable support for <pkg>dev-libs/protobuf</pkg>.</flag>
 	<flag name="sodium">Use <pkg>dev-libs/libsodium</pkg> for cryptography</flag>
 </use>
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.3.1-r1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.3.1-r1.ebuild
new file mode 100644
index 000000000000..c2393a2b27e5
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.3.1-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic
+
+DESCRIPTION="The PowerDNS Recursor"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug dnstap libressl luajit protobuf snmp sodium systemd"
+REQUIRED_USE="dnstap? ( protobuf )"
+
+DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
+	luajit? ( dev-lang/luajit:= )
+	protobuf? (
+		dev-libs/protobuf
+		>=dev-libs/boost-1.42:=
+	)
+	dnstap? ( dev-libs/fstrm )
+	systemd? ( sys-apps/systemd:0= )
+	snmp? ( net-analyzer/net-snmp )
+	sodium? ( dev-libs/libsodium:= )
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:= )
+	>=dev-libs/boost-1.35:="
+RDEPEND="${DEPEND}
+	!<net-dns/pdns-2.9.20-r1
+	acct-user/pdns
+	acct-group/pdns"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/_/-}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-boost-1.73.0.patch
+	"${FILESDIR}"/${P}-gcc-10.patch
+)
+
+pkg_setup() {
+	filter-flags -ftree-vectorize
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/powerdns \
+		--with-lua=$(usex luajit luajit lua) \
+		$(use_enable debug verbose-logging) \
+		$(use_enable systemd) \
+		$(use_enable dnstap dnstap) \
+		$(use_with sodium libsodium) \
+		$(use_with protobuf) \
+		$(use_with snmp net-snmp)
+}
+
+src_install() {
+	default
+
+	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
+
+	# set defaults: setuid=nobody, setgid=nobody
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=pdns/' \
+		-e 's/^# quiet=$/quiet=on/' \
+		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
+		"${D}"/etc/powerdns/recursor.conf
+
+	newinitd "${FILESDIR}"/pdns-recursor-r2 pdns-recursor
+}
+
+pkg_postinst() {
+	local old
+
+	for old in ${REPLACING_VERSIONS}; do
+		ver_test ${old} -lt 4.0.0-r1 || continue
+
+		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
+		ewarn "to pdns-recursor, please update your runlevels accordingly."
+
+		break
+	done
+}
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 71f2a9344970..9d70d31bc958 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index aaaa01f83cfb..196e352a68a7 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -14,5 +14,6 @@ DIST nftables-0.9.6.tar.bz2 859481 BLAKE2B 0ede36370d9f8b75d0179f8f28077124d4713
 EBUILD nftables-0.9.3-r1.ebuild 3756 BLAKE2B 79cbed1a1065288d7736bb3687e7142a9bc55e788bdf88cdbb7fb48f6adfd93af2e0deb6964d3522f09fbeeed4f6c4700988f7db27a6e52ccf10bd0a9c469026 SHA512 5f508726b8e1543590379b60c589f97f722bb458ac12530833992d76094e5c70df830af223363a3c95fb142309843df6b30320b666062b48f2659e4c014973b6
 EBUILD nftables-0.9.4-r1.ebuild 3782 BLAKE2B aa3edaa13d0c0032819476c5fdfbe3a1119b815d8d167eafe48c49f36dd49780c80020045418e084ce1c6bdc5b56ffc7a511c50c356b6ccdb44c36ef41899465 SHA512 741af7b9f7b07ee5b6133170637ae819e5d8d190cda398087b7b26f7e7e377df975f2cc72f0b706707073e029b905a8284bb9a13875cda869ec7df9767faa55e
 EBUILD nftables-0.9.4-r2.ebuild 4131 BLAKE2B d30066d0eef62040e79e2099bb1db6f49667177e0f7099f0a928ee87f80664b6069b26a6ba954b38e32179e6734b564290ae8466cd8f90d79b2ee1bbc3126d2b SHA512 f777309e620845e89d32596adcd270c2961111168d11d68d9b1cd75b97a60fb3213238b60d7190559eec478d9e08e09c89de8e54bb048c59a51cfb1b412831fc
-EBUILD nftables-0.9.6.ebuild 3840 BLAKE2B dcc38a431e2600b1172ed4e8a1609813c89b9c8c591f3c267184f9b55df94988cfd692bb8764083a1bfaa01363b684313a614df57f6fdbfeb434d3747232141c SHA512 85c0f54856a5a54016d37f86124cb0b1e689254eb55cde570044efe03bfb2282dbc3e74d437130067d4b301e40fab83436e4eee551bb7d3ef5eda100e760b085
+EBUILD nftables-0.9.6.ebuild 4229 BLAKE2B db049365be35da321b95155186a13cc9dc4ed04e4aebccc7b92d6344820d3b01dc3ce46a77af040b460d81d8768ab624b428899d17c54c28077615993a52c93b SHA512 fe0e1744bf2483acbe941fc5d6b215edefb2060d48293c7dd70eb95f2d932475fecd82aeb3ed671fe4ad650641b3057567eed939965d9c95bf502fad431b4889
+EBUILD nftables-9999.ebuild 4423 BLAKE2B be22c2e35bcb580c2ecb0d1f23eea4459c215ce0aa7b2f656a9bbeca414ecd86cb82c8bd2b660317143b966c06bd8f80c7d510102f5b57fc49c0781d788cbed6 SHA512 538acf33f8eee000023cf63388732148de443cd7e4b89b92f566ac377af7728afb37e66027a6311fecfcef9cc928308e38e954b5edf7652cc92132f0412e0ffc
 MISC metadata.xml 918 BLAKE2B 8c2c39f04e2c5591ea06788788d244bddc1cdc25780810b2a19e131d43d0bdf964d2129c01605fc536451cb9a3354420a1c2f656dad45c56dec4f360a95fe473 SHA512 08de9d11f48dcb132eb5423de56b458dd4c4122329b84b56c252436c882b7670233f2217cc01755649f27e14ff9346cf99e3a742224567e712f5cb3678165dcf
diff --git a/net-firewall/nftables/nftables-0.9.6.ebuild b/net-firewall/nftables/nftables-0.9.6.ebuild
index aad88b619234..44e1fc441fb0 100644
--- a/net-firewall/nftables/nftables-0.9.6.ebuild
+++ b/net-firewall/nftables/nftables-0.9.6.ebuild
@@ -3,13 +3,12 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit autotools linux-info python-r1 systemd
 
 DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
 HOMEPAGE="https://netfilter.org/projects/nftables/"
-#SRC_URI="https://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz -> ${P}.tar.gz"
 SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
@@ -37,9 +36,9 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-#S="${WORKDIR}/v${PV}"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
 
 python_make() {
 	emake \
@@ -47,7 +46,7 @@ python_make() {
 		abs_builddir="${S}" \
 		DESTDIR="${D}" \
 		PYTHON_BIN="${PYTHON}" \
-		${@}
+		"${@}"
 }
 
 pkg_setup() {
@@ -93,7 +92,7 @@ src_configure() {
 src_compile() {
 	default
 
-	if use python ; then
+	if use python; then
 		python_foreach_impl python_make
 	fi
 }
@@ -141,11 +140,23 @@ pkg_postinst() {
 		ewarn "    'chmod 600 \"${save_file}\"'"
 	fi
 
-	elog "If you wish to enable the firewall rules on boot (on systemd) you"
-	elog "will need to enable the nftables-restore service."
-	elog "    'systemctl enable ${PN}-restore.service'"
-	elog
-	elog "If you are creating firewall rules before the next system restart "
-	elog "the nftables-restore service must be manually started in order to "
-	elog "save those rules on shutdown."
+	if has_version 'sys-apps/systemd'; then
+		elog "If you wish to enable the firewall rules on boot (on systemd) you"
+		elog "will need to enable the nftables-restore service."
+		elog "    'systemctl enable ${PN}-restore.service'"
+		elog
+		elog "If you are creating firewall rules before the next system restart"
+		elog "the nftables-restore service must be manually started in order to"
+		elog "save those rules on shutdown."
+	fi
+	if has_version 'sys-apps/openrc'; then
+		elog "If you wish to enable the firewall rules on boot (on openrc) you"
+		elog "will need to enable the nftables service."
+		elog "    'rc-update add ${PN} default'"
+		elog
+		elog "If you are creating or updating the firewall rules and wish to save"
+		elog "them to be loaded on the next restart, use the \"save\" functionality"
+		elog "in the init script."
+		elog "    'rc-service ${PN} save'"
+	fi
 }
diff --git a/net-firewall/nftables/nftables-9999.ebuild b/net-firewall/nftables/nftables-9999.ebuild
new file mode 100644
index 000000000000..916382cdf8da
--- /dev/null
+++ b/net-firewall/nftables/nftables-9999.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit autotools linux-info python-r1 systemd
+
+DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
+HOMEPAGE="https://netfilter.org/projects/nftables/"
+
+if [[ ${PV} =~ ^[9]{4,}$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.netfilter.org/nftables"
+
+	BDEPEND="
+		sys-devel/bison
+		sys-devel/flex
+	"
+else
+	SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug doc +gmp json +modern-kernel python +readline static-libs xtables"
+
+RDEPEND="
+	>=net-libs/libmnl-1.0.4:0=
+	gmp? ( dev-libs/gmp:0= )
+	json? ( dev-libs/jansson )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	>=net-libs/libnftnl-1.1.7:0=
+	xtables? ( >=net-firewall/iptables-1.6.1 )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND+="
+	doc? (
+		app-text/asciidoc
+		>=app-text/docbook2X-0.8.8-r4
+	)
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+python_make() {
+	emake \
+		-C py \
+		abs_builddir="${S}" \
+		DESTDIR="${D}" \
+		PYTHON_BIN="${PYTHON}" \
+		"${@}"
+}
+
+pkg_setup() {
+	if kernel_is ge 3 13; then
+		if use modern-kernel && kernel_is lt 3 18; then
+			eerror "The modern-kernel USE flag requires kernel version 3.18 or newer to work properly."
+		fi
+		CONFIG_CHECK="~NF_TABLES"
+		linux-info_pkg_setup
+	else
+		eerror "This package requires kernel version 3.13 or newer to work properly."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# fix installation path for doc stuff
+	sed '/^pkgsysconfdir/s@${sysconfdir}.*$@${docdir}/skels@' \
+		-i files/nftables/Makefile.am || die
+	sed '/^pkgsysconfdir/s@${sysconfdir}.*$@${docdir}/skels/osf@' \
+		-i files/osf/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		# We handle python separately
+		--disable-python
+		--sbindir="${EPREFIX}"/sbin
+		$(use_enable debug)
+		$(use_enable doc man-doc)
+		$(use_with !gmp mini_gmp)
+		$(use_with json)
+		$(use_with readline cli readline)
+		$(use_enable static-libs static)
+		$(use_with xtables)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		python_foreach_impl python_make
+	fi
+}
+
+src_install() {
+	default
+
+	if ! use doc && [[ ! ${PV} =~ ^[9]{4,}$ ]]; then
+		pushd doc >/dev/null || die
+		doman *.?
+		popd >/dev/null || die
+	fi
+
+	local mksuffix="$(usex modern-kernel '-mk' '')"
+
+	exeinto /usr/libexec/${PN}
+	newexe "${FILESDIR}"/libexec/${PN}${mksuffix}.sh ${PN}.sh
+	newconfd "${FILESDIR}"/${PN}${mksuffix}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}${mksuffix}.init ${PN}
+	keepdir /var/lib/nftables
+
+	systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service
+
+	if use python ; then
+		python_foreach_impl python_make install
+		python_foreach_impl python_optimize
+	fi
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+	local save_file
+	save_file="${EROOT}/var/lib/nftables/rules-save"
+
+	# In order for the nftables-restore systemd service to start
+	# the save_file must exist.
+	if [[ ! -f "${save_file}" ]]; then
+		( umask 177; touch "${save_file}" )
+	elif [[ $(( "$( stat --printf '%05a' "${save_file}" )" & 07177 )) -ne 0 ]]; then
+		ewarn "Your system has dangerous permissions for ${save_file}"
+		ewarn "It is probably affected by bug #691326."
+		ewarn "You may need to fix the permissions of the file. To do so,"
+		ewarn "you can run the command in the line below as root."
+		ewarn "    'chmod 600 \"${save_file}\"'"
+	fi
+
+	if has_version 'sys-apps/systemd'; then
+		elog "If you wish to enable the firewall rules on boot (on systemd) you"
+		elog "will need to enable the nftables-restore service."
+		elog "    'systemctl enable ${PN}-restore.service'"
+		elog
+		elog "If you are creating firewall rules before the next system restart"
+		elog "the nftables-restore service must be manually started in order to"
+		elog "save those rules on shutdown."
+	fi
+	if has_version 'sys-apps/openrc'; then
+		elog "If you wish to enable the firewall rules on boot (on openrc) you"
+		elog "will need to enable the nftables service."
+		elog "    'rc-update add ${PN} default'"
+		elog
+		elog "If you are creating or updating the firewall rules and wish to save"
+		elog "them to be loaded on the next restart, use the \"save\" functionality"
+		elog "in the init script."
+		elog "    'rc-service ${PN} save'"
+	fi
+}
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 38ee50e066e1..3bd540175aea 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -15,28 +15,20 @@ AUX shorewall.systemd 568 BLAKE2B 385edad8857f029f691481483cc3e5e5981836254b7b39
 AUX shorewall6-lite.systemd 612 BLAKE2B e658af2b6d399fe527a58201b80997651954df67a18be2465a1099b81f7ed89cc3c63d4ef550521d3b9e3cc995915439e21e1142f46f8df1e44e22b5c29009d5 SHA512 0bd832d4f8857bf9b1c9c776a53739d8666f002d1caab29c976a248916cf1eb5806d6b59dbf7ee8a120a3158b10e6fa6e179e34fe9fa6077a794ffa7d1e06cec
 AUX shorewall6.systemd 577 BLAKE2B 5c755c0105954a34e39e077af0e012d9d6e647715a4b12fbae4fc47f4ae19afd6a63266b3684ddead689b2d4f7450b7a12906258fc86ef33fc36a4dac3771274 SHA512 96b69df246a18e8b7dbfdbe78959da1baa8f2a97eb290853d4040a895f2ae91b97addd2ab4e4e19345960ffe8f1b099442f40ce319b27f0d4d8d7d4780d2e78d
 AUX shorewallrc-r3 2035 BLAKE2B 6f4e4c93cee1f25405cc3ac76958064f1241a325c8b530c30f6dbd94423577d592e88613f463c4b41c1af1db22c7e53512fd8509931bb6527a8da669f2dbe773 SHA512 eaa32bf6baca0d3555db918d6221c7678f5ba67e78bf9dcdc1bf96deded8f64838d3a332226fa6605f0c1ae82e51e0f2c1540fa6188fd9bced22460a631f48a8
-DIST shorewall-5.2.4.4.tar.bz2 581085 BLAKE2B 6830f1ce9350534a51b0d79efad07b338c511ab3cc1bf151ac958052c5feb1794d994a71e80ebf1546a76fae1718ebc74abab37fbb4d9362d8b3108133b30354 SHA512 c050af24969c2f18c4c020dfb611edaf9c6a5aa09d1dace502ae99b9aa82d7f217695e8099d6615a9a3c9f6de951f6d8b24621021c48ee2f2095edf9815a8d57
-DIST shorewall-5.2.4.5.tar.bz2 581558 BLAKE2B 9b089a9c5cab212ba130e3865c2ea5a8ad27c88979e6497a0fef823a12a6ac98ca12a150c3e9a5b6c76c90339aeb3c92a438dfc068811790aef13783e39e6204 SHA512 3914bac627cf8787372f21c4332fc13744a6190c7a128521103e3f47533ebbe2fe359a4c6bc95a0d7dfb03e2ce30f7b7cd8eaed9d8fa3169d4b0b5244aa6d8f8
+DIST shorewall-5.2.5.1.tar.bz2 582482 BLAKE2B 6ee3c5a6dc80e9b42ced41eaab36c9ee4fc9f2c6853a17a7dc85f162a8abfdfed2ccd3cec73e1101ea9aa6ce9b773aa76be5c00310dd73b130121b0de73ba77a SHA512 9313bf2effe4572d8898df5d55c461bddbc5d54bec5679af31c02cc494ecff06824d1d46d604078184bdabd7c08be07f30bf81bef2c8d19f03aac99b3525bf6f
 DIST shorewall-5.2.5.tar.bz2 582270 BLAKE2B 6b0e883dd424ec814fb5f2dac601bd4e896c97c73ed0f2a151a054bd4b3db732aeaeb158d5bc453ca7cf3723233e429aa24f0b9908787f384e69da656fd71832 SHA512 6527fae5067bbfedd4d1fe53fb1b110fbac3f6d7f3b1abfe76be373ebb345bc238dabf3f24a8883314bf29ffc847dcd190bddc82ca64183311ba0e5544078743
-DIST shorewall-core-5.2.4.4.tar.bz2 73257 BLAKE2B 16b8d3a1d08c9db6a939f946324295063cee71b373bd67dd85d0acb4332502df4b5d9bb932695228ad6d33395c6596e86fd3e77ca59abc99d88bab7e883777c9 SHA512 1868dcd6bad6b0cb5be2c1b0724f076605e7990d0b9dfd19fee06c758b19f2ebcbe18bccaa7a4ea861ceb26038ed07837eecdacdd2a02d0c2a927c732d6bdc30
-DIST shorewall-core-5.2.4.5.tar.bz2 73333 BLAKE2B e4d71ddd92e83c31d90b766568d4d595d1035278832c9f92c103e7b95436adecf9e79612f0bf82e7eb3447d067c2d4e626bed14f1c9d74e5f11fa5d585830ba6 SHA512 74d413cbe95688d7604a01580eff32c92b1be754df2052fa4ed22dd549c18887b1462fc70c1a2913c2d77255fccb7badce33863686abffecadb6b316aa545827
+DIST shorewall-core-5.2.5.1.tar.bz2 74648 BLAKE2B f00f2a4302361e557fbfae2fe6bfd5e82d47751a86c1ac6ebf729ead6fbe08386f570dde5ef18917ccd48d8a9a97ec467dde34fda93cde5e3d8e15977bdcfbb1 SHA512 3f1f85f388b17f6fa02fe54bbb28bf7bd36b97b14557891644caffcea11eb167a0df91964525b706f2b5eee9d8f325471f5038f6636308e4c99e8818928fdc75
 DIST shorewall-core-5.2.5.tar.bz2 74420 BLAKE2B ff2a6c2ead74f125785bcb2aea42948f27b88cb39d121a3ab1af1e4df6dc4ec878854499be7c385766af6245f4590c62b4dd2eb3d648b02fa4f16d3e13a302ce SHA512 9bd7e74def89cdc07987cbcbf9b8d8a69500f7b0dfc346c9fbcec6ab8cecad3c2adfcc505136ef0c2f0525345fdb6de4918dd5bd2d382bfb4773b23ce868a937
-DIST shorewall-docs-html-5.2.4.4.tar.bz2 4294159 BLAKE2B 81bb4a9d086f48bf8551be3bc8aff0ed8a0a99d215338f12b711c96115507ea5a7eb567d084db0a93628c4036623a72231f33dd15671e84739d59608268b98c7 SHA512 086096604f5a580906f05b460e1e19df24620b610675a8ec6038c0061199fd6f09cd8aff08f1e8daa8d2898bfaec9db95cf7f4f1397ca9df784d420907b16fac
-DIST shorewall-docs-html-5.2.4.5.tar.bz2 4294320 BLAKE2B dd80e0ae8bc622aaa2e1278a20d2b0e2aaccd25debf22301b71dfce125f94be3e9c30dd411f3f7a84592ca126917447d1b61624079b6bf3686156578c54495cd SHA512 6453c0dbdd80c41b5ca706eae2cd05946a6442f939b398985bf2b6687b60c1f636cf387d1581694223b6d887f914764f9193070dfce745e6e32dd0edd582fe76
+DIST shorewall-docs-html-5.2.5.1.tar.bz2 4310025 BLAKE2B 4ab4907eade322ec3e9e78d4c1c3c51a86f31fd8f4497d01ba0cfdeddf0294f240307f0d228b923b99d9b0f1b7444046a60a36569c04ef8d9f88043277c89bdc SHA512 a24f6dabed9a7ae9622c9a1f5be323a6c4cb7a8a5a671be3f0bb12d8d0b20ee11c8c11b3f1e8aac49a04a50f2bac6f137524b0e6edf9483a67b1eb44b3997094
 DIST shorewall-docs-html-5.2.5.tar.bz2 4310021 BLAKE2B 2d5704f126f6626bf2c934390552c19190fac5fd4231aaf61a2b0eadd770cad7b220d1083df2b0ab26ce8b2c1d97f5a3b0f2b083d14d3c5ce800bb6402603216 SHA512 04ae753f25371c0ce08af2cac5abd19797ec70860714e6891900a45baab0fb24d0f7c3163a5d2f5e419f1c1a8b092c164b7230b8d0c8cc4c3f53bbd0269e419b
-DIST shorewall-init-5.2.4.4.tar.bz2 38048 BLAKE2B 01b4664396933ca303d4013d50f290be850dad51142257a7b1f3081cee3baac219feadc96636c732072c6918f83d847eca2107aa094804691500972a90f222fd SHA512 fdab4aa68429144cbffdf41aad78744feb3e9736df0e8d6ed87ed7ac80aebf7078c6ec28646069a71cacc8d9a6738605d59c6b6fb35d8c4d9a1ed8353a71775c
-DIST shorewall-init-5.2.4.5.tar.bz2 38113 BLAKE2B 4231e22c7dfd862fd6ee8b573ea3f137ea078e488d354ddf197a83c4d60827a462311f5f9cd7d1dd0df17b61713fa164e6c6594eb4b8c173bef59fee75f4c1bc SHA512 51ac7a4022caca14c25efe0e608bb3983f27c31326b1a933385891fbe01aa5137f3d8e50406fddec41024fe8aea6e55ad16c3a4cb2d1b211fd0d13d61ce61cb1
+DIST shorewall-init-5.2.5.1.tar.bz2 39639 BLAKE2B 8c815c7ebb78c0a85cb2aac9b36e6a232c01f5ecb1fb17dd4d6b76c08746861e4e599213e553f7e2894093dc9722d61120f6f0179eda4b38fa93df4989589934 SHA512 d502b7262587b6546071083bb535f97606316c8ce592b01fe875d90b141833c9488750f864233614237b1e9412206c104f54052d7e20ff2067be8eb78acdb72b
 DIST shorewall-init-5.2.5.tar.bz2 39405 BLAKE2B 8259b4618c3b75201e245fd414da7890a80d31535eea71358f9ed3bc9b44ad0e341c3b795f624ac8cb05e2345fac82a8831ad877abe6a9ef13a8c7889bfdcb7e SHA512 61f31287472770fe02a099bddd7a6a5fa42fb676462cb7b16975fb15c6a70fe1fbb40d4c1b714f9e8a1a4bdc0ef3d7542552b1dd780833be781dda1e8dba9879
-DIST shorewall-lite-5.2.4.4.tar.bz2 42806 BLAKE2B d6dd5d9268d40fb88ee99be36b359423a6d7785417752f6e9d7245806bf9677963851327dcfd0d5fe81ea54ab11d59a5e64ee4115d41d3a6c8f4ced1e7cda732 SHA512 b81aa04f124435d3bf63d1796cca4db987f56c3e31953386ab7f3aae290058e5f3240b43864753121ed48b3744f8d6ee2dcd5210105dc1ccf5a4f790b3e22092
-DIST shorewall-lite-5.2.4.5.tar.bz2 42868 BLAKE2B 5ccab6fd410deb721671d16967fdf57be051c8403d7b2dc7273dea76f42584d01c593adee25d72730091d3f8cc7d85b985e58b5e243f5f5a11522935eae88087 SHA512 329535471f9a44f7cd3935e490d238768fe37bba397dbfd83b1f0960e16a1fdb6407ae6fd36f7054ec998f1ea8c2f91bb4cc1fa6d970675939856b2436cf7c45
+DIST shorewall-lite-5.2.5.1.tar.bz2 44367 BLAKE2B 2b6f013fd13e895ac104e277eaf8abedec6a2a3f57a50becb2bce752fd0f9c679110d84634aa82a22bbc9ae2ce2ab9f9dc06a1220cb0f6949cc5da2d59524137 SHA512 6bcd0dfeddaf2bc513610cbecbe16574f2ed65958e8455d83f99486b286bd98ae9fba539b90c2a308d62b7a0eb8526e7af8ef3d0190f3e5ffcb660b3cdd3c769
 DIST shorewall-lite-5.2.5.tar.bz2 44120 BLAKE2B 47154b9f7203f5bff279c2e936dd0fe108bcb44bc9dd43abb49dc0c129a54ea381fff71b1dc3ac55e026b4065d8d5ab48edb1dcf52845e5e5f88492a958f4451 SHA512 41e6de25b2b10452bd15c465df5ffaf21019059f511197a6d398af086bba55f80b21b6644747fb2c228414a1e8af381ef5c4174b8e4defc72389664e971a85d3
-DIST shorewall6-5.2.4.4.tar.bz2 199722 BLAKE2B c5c741ea7108e6edbb35190bccea06d04c6a0d1cf5dbae23481e38d3c05155df6bcaf4deb6397d07a1f51ba0b13b18b4ed22349fbe1f6e605d0303486002d876 SHA512 cf212d1c7c8703319a5c6f34ba8629f115b2f03a0713c1b40cf370adad66b671bfd9536a28bc650aba04bf6a6fd7c396788d40c2eb650a006e8f2eb27baf76f8
-DIST shorewall6-5.2.4.5.tar.bz2 200261 BLAKE2B b21f8232a3497be70184c9053e17265d803a9561f5799921ee63ab67bd4b1b8fa8c1950de13a5f6d8f1662013641859844b5a2032e684151a3b85b0de8d8dfb9 SHA512 362802b8b9dc52da00a291f0fb0bb115387a409974e418bb3e00d8c9c900cd49f0b6d90a4c75db5028b5a2d1ad499d352d322e4f7132a9e8647b3502a263531b
+DIST shorewall6-5.2.5.1.tar.bz2 201672 BLAKE2B 9759de6ddf0025175293f04b62ad7aa9c2a9a18d7d1e713fdcc9f859cbb1585207e8822988b91868d706698950cede5e03bc17c44a1983655fc809d330d3fb37 SHA512 c1168a609373b27db194a8eea2a934b7302fd4e3caa583d7527530426968ae5fc81510f2943a1ba1bb14c6edf7f50081841227f5aec337f5faaa54ff83f99b66
 DIST shorewall6-5.2.5.tar.bz2 201419 BLAKE2B efb1a81ee1bcee982d7cfd1bb5ee9cbae5e59e3ce47895d25332f71c1d79d2bb2421c6fca0645fe9d2d493648caab2b9c233d36fb9210e3fd6f667b89ff66671 SHA512 2b3656490209872c696966129bf4a411d050f561fd82645f494c503013a755854833cdbedfd6bdb971abb974988d11b1c4e29e62d431a4d67bba74822f579692
-DIST shorewall6-lite-5.2.4.4.tar.bz2 42739 BLAKE2B 3f1caa78b12f779bd73716dad78a26544bf99204b96da2fa950c709bbb5d68ac1ee062714d5040d961a2df35b4d22e0b6c8747b36a84bb9a5b6805cb6d0158cd SHA512 4a0c6e939bd8ca239734de64ea0b2a94885f8f14d00e37dce291b2f5aa00384227c16cc0595ef1b038f05d3d42212ace3e9482937c8c072d7e194099ab867646
-DIST shorewall6-lite-5.2.4.5.tar.bz2 42843 BLAKE2B a02923bcd75bedbcb3d48f43c11de7956829528c7076f6cdd7353550e4703de3c19d01e16abbc6d2db74a748edaffec613060a7fb6179a1c89a75e0058d766ff SHA512 c93ebb94c9baa627cb9fd18af098ca484c5e6cf2d0405624a00d6cf9093e900e06b6da7f2f9acedf3fcd1c68d6221a50ae2826718313cc0482b74c34d6f2498a
+DIST shorewall6-lite-5.2.5.1.tar.bz2 44252 BLAKE2B 5550703689ff513283ff0656b9f845741f454df4c49e54481316a5bfca5d630b02b45f67bf689ee417b8d411824b71beffde98f6aa2977d4ae6493c0eda2225c SHA512 e5696658195c6d4f4c0953af215fe35bbbcf76532fe572b2613f490716417b042755231db80885293514f21f1b29f8c44c0497df9a7ba7b2ad16431ea7cbe7d2
 DIST shorewall6-lite-5.2.5.tar.bz2 44064 BLAKE2B e4667d1f1c932980d7bea03059b0aae8f83f0f3557f4245cec21aafaae72a942d47a8a355d3581cc459f85a80c10cb16af1c6e08971be2d120644098543bb3af SHA512 0c61c489f79aa51178aa733e1e738a2921c598e9403884322ccbc90461be4ee18dd0225d758371f1c750cfc832ca63652bbd8cac831e2ea026d63b72202c6f2a
-EBUILD shorewall-5.2.4.4.ebuild 16949 BLAKE2B 40c143a0265318201ec0d2186b6a1e75c0cf368e87e2544ade3ff7db49b03134434e27d628453692e33fbddaa34ec3bcb42c9375524be92fb1cbda5f37077bc4 SHA512 055dd811b6ea964f3cd44e9d312684438e17b9a5aae7a1dfd60ea863c8537e4bdc9cd80d7a129b9fa23f2483c7943c91ce3adf8ac872bb3b58e3e562654a415b
-EBUILD shorewall-5.2.4.5.ebuild 16955 BLAKE2B 492e4680f686a2e733bcc135644882abbc04a1f0e5cdc12cff69bd2f561d88e58fdef36a162f462a7e602b8fc2bcf1c8af1329aab24df9f00d966c0e8fd34d43 SHA512 0f694217f51006e9a7872d8130b849e2461ab07fb84e64bf97a060765cd16b8f3f5cbac4728822ba65cb4dde34158480b7ffbe9ee4a3d0da8df6514a186ad33e
-EBUILD shorewall-5.2.5.ebuild 16955 BLAKE2B 492e4680f686a2e733bcc135644882abbc04a1f0e5cdc12cff69bd2f561d88e58fdef36a162f462a7e602b8fc2bcf1c8af1329aab24df9f00d966c0e8fd34d43 SHA512 0f694217f51006e9a7872d8130b849e2461ab07fb84e64bf97a060765cd16b8f3f5cbac4728822ba65cb4dde34158480b7ffbe9ee4a3d0da8df6514a186ad33e
+EBUILD shorewall-5.2.5.1.ebuild 16955 BLAKE2B 492e4680f686a2e733bcc135644882abbc04a1f0e5cdc12cff69bd2f561d88e58fdef36a162f462a7e602b8fc2bcf1c8af1329aab24df9f00d966c0e8fd34d43 SHA512 0f694217f51006e9a7872d8130b849e2461ab07fb84e64bf97a060765cd16b8f3f5cbac4728822ba65cb4dde34158480b7ffbe9ee4a3d0da8df6514a186ad33e
+EBUILD shorewall-5.2.5.ebuild 16949 BLAKE2B 40c143a0265318201ec0d2186b6a1e75c0cf368e87e2544ade3ff7db49b03134434e27d628453692e33fbddaa34ec3bcb42c9375524be92fb1cbda5f37077bc4 SHA512 055dd811b6ea964f3cd44e9d312684438e17b9a5aae7a1dfd60ea863c8537e4bdc9cd80d7a129b9fa23f2483c7943c91ce3adf8ac872bb3b58e3e562654a415b
 MISC metadata.xml 2254 BLAKE2B e9d48407a0f055415070f5b0266ed9f534768f6d17d52b7070de30a037b89dbd08daac40b0ec313b8dfc65ba40ff38dae96c9758b78ec66d100ac8fa6b870d5f SHA512 0a201cf40dd1282b52897f751903baf28a2eb284b94316a45d8af6879f995dde1cdd4a7d474293835a0bde801ce41497bde558a51035a5e3650f0ec098688f33
diff --git a/net-firewall/shorewall/shorewall-5.2.4.4.ebuild b/net-firewall/shorewall/shorewall-5.2.4.4.ebuild
deleted file mode 100644
index c6f9c3e5bed0..000000000000
--- a/net-firewall/shorewall/shorewall-5.2.4.4.ebuild
+++ /dev/null
@@ -1,482 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit linux-info prefix systemd
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="https://shorewall.org/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc +init +ipv4 ipv6 lite4 lite6 selinux"
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(ver_cut 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(ver_cut 1-3)
-
-# shorewall
-MY_PN_IPV4=Shorewall
-MY_P_IPV4=${MY_PN_IPV4/#S/s}-${MY_PV}
-
-# shorewall6
-MY_PN_IPV6=Shorewall6
-MY_P_IPV6=${MY_PN_IPV6/#S/s}-${MY_PV}
-
-# shorewall-lite
-MY_PN_LITE4=Shorewall-lite
-MY_P_LITE4=${MY_PN_LITE4/#S/s}-${MY_PV}
-
-# shorewall6-lite
-MY_PN_LITE6=Shorewall6-lite
-MY_P_LITE6=${MY_PN_LITE6/#S/s}-${MY_PV}
-
-# shorewall-init
-MY_PN_INIT=Shorewall-init
-MY_P_INIT=${MY_PN_INIT/#S/s}-${MY_PV}
-
-# shorewall-core
-MY_PN_CORE=Shorewall-core
-MY_P_CORE=${MY_PN_CORE/#S/s}-${MY_PV}
-
-# shorewall-docs-html
-MY_PN_DOCS=Shorewall-docs-html
-MY_P_DOCS=${MY_PN_DOCS/#S/s}-${MY_PV}
-
-# Upstream URL schema:
-# Beta:    $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-Beta2/shorewall-4.6.4-Beta2.tar.bz2
-# RC:      $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-RC1/shorewall-4.6.4-RC1.tar.bz2
-# Release: $MIRROR/pub/shorewall/4.6/shorewall-4.6.3/shorewall-4.6.3.3.tar.bz2
-
-MY_URL_PREFIX=
-MY_URL_SUFFIX=
-if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
-	MY_URL_PREFIX='development/'
-
-	if [[ ${MY_PV} = *-Beta* ]] ; then
-		MY_URL_SUFFIX="-Beta${MY_PV##*-Beta}"
-	elif [[ ${MY_PV} = *-RC* ]] ; then
-		MY_URL_SUFFIX="-RC${MY_PV##*-RC}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
-fi
-
-SRC_URI="
-	https://shorewall.org/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( https://shorewall.org/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( https://shorewall.org/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( https://shorewall.org/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( https://shorewall.org/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( https://shorewall.org/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( https://shorewall.org/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/${MY_P_DOCS}.tar.bz2 )
-"
-
-# - Shorewall6 requires Shorewall
-# - Installing Shorewall-init or just the documentation doesn't make any sense,
-#   that's why we force the user to select at least one "real" Shorewall product
-#
-# See https://shorewall.org/download.htm#Which
-REQUIRED_USE="
-	ipv6? ( ipv4 )
-	|| ( ipv4 lite4 lite6 )
-"
-
-# No build dependencies! Just plain shell scripts...
-DEPEND=""
-
-RDEPEND="
-	>=net-firewall/iptables-1.4.20
-	>=sys-apps/iproute2-3.8.0[-minimal]
-	>=sys-devel/bc-1.06.95
-	ipv4? (
-		>=dev-lang/perl-5.16
-		virtual/perl-Digest-SHA
-	)
-	ipv6? (
-		>=dev-perl/Socket6-0.230.0
-		>=net-firewall/iptables-1.4.20[ipv6]
-		>=sys-apps/iproute2-3.8.0[ipv6]
-	)
-	lite6? (
-		>=net-firewall/iptables-1.4.20[ipv6]
-		>=sys-apps/iproute2-3.8.0[ipv6]
-	)
-	init? ( >=sys-apps/coreutils-8.20 )
-	selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 )
-	!net-firewall/shorewall-core
-	!net-firewall/shorewall6
-	!net-firewall/shorewall-lite
-	!net-firewall/shorewall6-lite
-	!net-firewall/shorewall-init
-	!<sys-apps/systemd-214
-"
-
-S=${WORKDIR}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~NF_CONNTRACK"
-
-	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
-	local WARNING_CONNTRACK+=" to run any shorewall-based firewall on the local system."
-
-	# kernel >=4.19 has unified NF_CONNTRACK module, bug 671176
-	if kernel_is -lt 4 19; then
-		if use ipv4 || use lite4; then
-			CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4"
-
-			local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will"
-			local WARNING_CONNTRACK_IPV4+=" be unable to run any shorewall-based IPv4 firewall on the local system."
-		fi
-
-		if use ipv6 || use lite6; then
-			CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV6"
-
-			local WARNING_CONNTRACK_IPV6="Without NF_CONNTRACK_IPV6 support, you will"
-			local WARNING_CONNTRACK_IPV6+=" be unable to run any shorewall-based IPv6 firewall on the local system."
-		fi
-	fi
-
-	check_extra_config
-}
-
-pkg_setup() {
-	if [[ -n "${DIGEST}" ]]; then
-		einfo "Unsetting environment variable \"DIGEST\" to prevent conflicts with package's \"install.sh\" script ..."
-		unset DIGEST
-	fi
-}
-
-src_prepare() {
-	# We are moving each unpacked source from MY_P_* to MY_PN_*.
-	# This allows us to use patches from upstream and keeps epatch_user working
-
-	einfo "Preparing shorewallrc ..."
-	cp "${FILESDIR}"/shorewallrc-r3 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-	sed -i \
-		-e "s|SERVICEDIR=tbs|SERVICEDIR=$(systemd_get_systemunitdir)|" \
-		"${S}"/shorewallrc.gentoo || die "Failed to update shorewallrc"
-
-	# shorewall-core
-	mv "${S}"/${MY_P_CORE} "${S}"/${MY_PN_CORE} || die "Failed to move '${S}/${MY_P_CORE}' to '${S}/${MY_PN_CORE}'"
-	ebegin "Applying Gentoo-specific changes to ${MY_P_CORE} ..."
-	ln -s ../shorewallrc.gentoo ${MY_PN_CORE}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-	eend 0
-
-	pushd "${S}"/${MY_PN_CORE} &>/dev/null || die
-	eapply "${FILESDIR}"/shorewall-core-5.2.1-no-gzipped-manpages.patch
-	popd &>/dev/null || die
-
-	# shorewall
-	if use ipv4; then
-		mv "${S}"/${MY_P_IPV4} "${S}"/${MY_PN_IPV4} || die "Failed to move '${S}/${MY_P_IPV4}' to '${S}/${MY_PN_IPV4}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV4}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_IPV4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall.initd-r3 "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
-		eend 0
-
-		pushd "${S}"/${MY_PN_IPV4} &>/dev/null || die
-		eapply "${FILESDIR}"/shorewall-5.2.1-no-gzipped-manpages.patch
-		popd &>/dev/null || die
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		mv "${S}"/${MY_P_IPV6} "${S}"/${MY_PN_IPV6} || die "Failed to move '${S}/${MY_P_IPV6}' to '${S}/${MY_PN_IPV6}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV6}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_IPV6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall.initd-r3 "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
-		eend 0
-
-		pushd "${S}"/${MY_PN_IPV6} &>/dev/null || die
-		eapply "${FILESDIR}"/shorewall-5.2.1-no-gzipped-manpages.patch
-		popd &>/dev/null || die
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		mv "${S}"/${MY_P_LITE4} "${S}"/${MY_PN_LITE4} || die "Failed to move '${S}/${MY_P_LITE4}' to '${S}/${MY_PN_LITE4}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE4}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_LITE4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall-lite.initd-r3 "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
-		eend 0
-
-		pushd "${S}"/${MY_PN_LITE4} &>/dev/null || die
-		eapply "${FILESDIR}"/shorewall-lite-5.2.1-no-gzipped-manpages.patch
-		popd &>/dev/null || die
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		mv "${S}"/${MY_P_LITE6} "${S}"/${MY_PN_LITE6} || die "Failed to move '${S}/${MY_P_LITE6}' to '${S}/${MY_PN_LITE6}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE6}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_LITE6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall-lite.initd-r3 "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
-		eend 0
-
-		pushd "${S}"/${MY_PN_LITE6} &>/dev/null || die
-		eapply "${FILESDIR}"/shorewall-lite-5.2.1-no-gzipped-manpages.patch
-		popd &>/dev/null || die
-	fi
-
-	# shorewall-init
-	if use init; then
-		mv "${S}"/${MY_P_INIT} "${S}"/${MY_PN_INIT} || die "Failed to move '${S}/${MY_P_INIT}' to '${S}/${MY_PN_INIT}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_INIT}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_INIT}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall-init.confd "${S}"/${MY_PN_INIT}/default.gentoo || die "Copying shorewall-init.confd failed"
-		cp "${FILESDIR}"/shorewall-init.initd "${S}"/${MY_PN_INIT}/init.gentoo.sh || die "Copying shorewall-init.initd failed"
-		cp "${FILESDIR}"/shorewall-init.systemd "${S}"/${MY_PN_INIT}/gentoo.service || die "Copying shorewall-init.systemd failed"
-		cp "${FILESDIR}"/shorewall-init.readme "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt || die "Copying shorewall-init.systemd failed"
-		eend 0
-
-		eprefixify "${S}"/${MY_PN_INIT}/init.gentoo.sh
-
-		pushd "${S}"/${MY_PN_INIT} &>/dev/null || die
-		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r2.patch
-		popd &>/dev/null || die
-	fi
-
-	# shorewall-docs-html
-	if use doc; then
-		mv "${S}"/${MY_P_DOCS} "${S}"/${MY_PN_DOCS} || die "Failed to move '${S}/${MY_P_DOCS}' to '${S}/${MY_PN_DOCS}'"
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	# shorewall-core
-	einfo "Installing ${MY_P_CORE} ..."
-	DESTDIR="${ED}" ${MY_PN_CORE}/install.sh shorewallrc.gentoo || die "${MY_PN_CORE}/install.sh failed"
-	dodoc "${S}"/${MY_PN_CORE}/changelog.txt "${S}"/${MY_PN_CORE}/releasenotes.txt
-
-	# shorewall
-	if use ipv4; then
-		einfo "Installing ${MY_P_IPV4} ..."
-		DESTDIR="${ED}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
-		keepdir /var/lib/shorewall
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
-		fi
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		einfo "Installing ${MY_P_IPV6} ..."
-		DESTDIR="${ED}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
-		keepdir /var/lib/shorewall6
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
-		fi
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		einfo "Installing ${MY_P_LITE4} ..."
-		DESTDIR="${ED}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
-		keepdir /var/lib/shorewall-lite
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		einfo "Installing ${MY_P_LITE6} ..."
-		DESTDIR="${ED}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
-		keepdir /var/lib/shorewall6-lite
-	fi
-
-	# shorewall-init
-	if use init; then
-		einfo "Installing ${MY_P_INIT} ..."
-		DESTDIR="${ED}" ${MY_PN_INIT}/install.sh shorewallrc.gentoo || die "${MY_PN_INIT}/install.sh failed"
-		dodoc "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt
-
-		if [[ -f "${ED}/etc/logrotate.d/shorewall-init" ]]; then
-			# On Gentoo, shorewall-init will not create shorewall-ifupdown.log,
-			# so we don't need a logrotate configuration file for shorewall-init
-			einfo "Removing unused \"${ED}/etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${ED}"/etc/logrotate.d/shorewall-init || die "Removing \"${ED}/etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${ED}/etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${ED}/etc/NetworkManager\" ..."
-			rm -rf "${ED}"/etc/NetworkManager || die "Removing \"${ED}/etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${ED}/usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${ED}"/usr/share/shorewall-init/ifupdown || die "Removing \"${ED}/usr/share/shorewall-init/ifupdown\" failed"
-		fi
-	fi
-
-	if use doc; then
-		einfo "Installing ${MY_P_DOCS} ..."
-		docinto html && dodoc -r "${S}"/${MY_PN_DOCS}/*
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		# Show first steps for shorewall/shorewall6
-		local _PRODUCTS=""
-		if use ipv4; then
-			_PRODUCTS="shorewall"
-
-			if use ipv6; then
-				_PRODUCTS="${_PRODUCTS}/shorewall6"
-			fi
-		fi
-
-		if [[ -n "${_PRODUCTS}" ]]; then
-			elog "Before you can use ${_PRODUCTS}, you need to edit its configuration in:"
-			elog ""
-			elog "  /etc/shorewall/shorewall.conf"
-
-			if use ipv6; then
-				elog "  /etc/shorewall6/shorewall6.conf"
-			fi
-
-			elog ""
-			elog "To activate your shorewall-based firewall on system start, please add ${_PRODUCTS} to your default runlevel:"
-			elog ""
-			elog "  # rc-update add shorewall default"
-
-			if use ipv6; then
-				elog "  # rc-update add shorewall6 default"
-			fi
-		fi
-
-		# Show first steps for shorewall-lite/shorewall6-lite
-		_PRODUCTS=""
-		if use lite4; then
-			_PRODUCTS="shorewall-lite"
-		fi
-
-		if use lite6; then
-			if [[ -z "${_PRODUCTS}" ]]; then
-				_PRODUCTS="shorewall6-lite"
-			else
-				_PRODUCTS="${_PRODUCTS}/shorewall6-lite"
-			fi
-		fi
-
-		if [[ -n "${_PRODUCTS}" ]]; then
-			if use ipv4; then
-				elog ""
-			fi
-
-			elog "Before you can use ${_PRODUCTS}, you need to provide a configuration, which you can"
-			elog "create using ${CATEGORY}/shorewall (with \"ipv4\" and or \"ipv6\" USE flag)."
-			elog ""
-			elog "To read more about ${_PRODUCTS}, please visit"
-			elog "  https://shorewall.org/CompiledPrograms.html"
-			elog ""
-			elog "To activate your shorewall-lite-based firewall on system start, please add ${PRODUCTS} to your default runlevel:"
-			elog ""
-
-			if use lite4; then
-				elog "  # rc-update add shorewall-lite default"
-			fi
-
-			if use lite6; then
-				elog "  # rc-update add shorewall6-lite default"
-			fi
-		fi
-
-		if use init; then
-			elog ""
-			elog "To secure your system on boot, please add shorewall-init to your boot runlevel:"
-			elog ""
-			elog "  # rc-update add shorewall-init boot"
-			elog ""
-			elog "and review \$PRODUCTS in"
-			elog ""
-			elog "  /etc/conf.d/shorewall-init"
-		fi
-
-	fi
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least ${MY_MAJOR_RELEASE_NUMBER} ${v}; then
-			# This is an upgrade
-
-			elog "You are upgrading from a previous major version. It is highly recommended that you read"
-			elog ""
-			elog "  - /usr/share/doc/shorewall*/releasenotes.tx*"
-			elog "  - https://shorewall.org/Shorewall-5.html#idm214"
-
-			if use ipv4; then
-				elog ""
-				elog "You can auto-migrate your configuration using"
-				elog ""
-				elog "  # shorewall update -A"
-
-				if use ipv6; then
-					elog "  # shorewall6 update -A"
-				fi
-
-				elog ""
-				elog "*after* you have merged the changed files using one of the configuration"
-				elog "files update tools of your choice (dispatch-conf, etc-update...)."
-
-				elog ""
-				elog "But if you are not familiar with the \"shorewall[6] update\" command,"
-				elog "please read the shorewall[6] man page first."
-			fi
-
-			# Show this elog only once
-			break
-		fi
-	done
-
-	if ! use init; then
-		elog ""
-		elog "Consider emerging ${CATEGORY}/${PN} with USE flag \"init\" to secure your system on boot"
-		elog "before your shorewall-based firewall is ready to start."
-		elog ""
-		elog "To read more about shorewall-init, please visit"
-		elog "  https://shorewall.org/Shorewall-init.html"
-	fi
-
-	if ! has_version "net-firewall/conntrack-tools"; then
-		elog ""
-		elog "Your Shorewall firewall can utilize \"conntrack\" from the \"net-firewall/conntrack-tools\""
-		elog "package. if you want to use this feature, you need to install \"net-firewall/conntrack-tools\"!"
-	fi
-
-	if ! has_version "dev-perl/Devel-NYTProf"; then
-		elog ""
-		elog "If you want to profile your Shorewall firewall you need to install \"dev-perl/Devel-NYTProf\"!"
-	fi
-}
diff --git a/net-firewall/shorewall/shorewall-5.2.4.5.ebuild b/net-firewall/shorewall/shorewall-5.2.5.1.ebuild
index 95a3c0906eab..95a3c0906eab 100644
--- a/net-firewall/shorewall/shorewall-5.2.4.5.ebuild
+++ b/net-firewall/shorewall/shorewall-5.2.5.1.ebuild
diff --git a/net-firewall/shorewall/shorewall-5.2.5.ebuild b/net-firewall/shorewall/shorewall-5.2.5.ebuild
index 95a3c0906eab..c6f9c3e5bed0 100644
--- a/net-firewall/shorewall/shorewall-5.2.5.ebuild
+++ b/net-firewall/shorewall/shorewall-5.2.5.ebuild
@@ -66,7 +66,7 @@ if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
 	unset _tmp_last_index
 	unset _tmp_suffix
 else
-	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
 fi
 
 SRC_URI="
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index f903dbce3e0c..7a41a6560fad 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest
index c296184cb08b..a3aab002432a 100644
--- a/net-fs/cvmfs/Manifest
+++ b/net-fs/cvmfs/Manifest
@@ -3,5 +3,5 @@ AUX cvmfs-2.7.2-find-package.patch 1412 BLAKE2B c66a614a1aa7451ecac2cceb892c370d
 AUX cvmfs-2.7.2-gcc-version.patch 2482 BLAKE2B cf184820140669a15f4051e8d0f9a41ae8625bb7beebeabd1a2021be0b5ffa4ed915c92a980229f1692f5f2e4145a08356a89ec8f2e3cc8963f04af157c090df SHA512 c59d2b33d41467d31d6095df20e7a576a02f39fc0ff1a2938afaa30929cc3b4178cf99d1eca3326551eba982adda0b5eed7f2a11348b23a43aa2e921b983e89a
 AUX cvmfs-2.7.2-xattr.patch 717 BLAKE2B 48d595b0219b62a3ac45e46d51e3910d6124edc89669ae8996a49e95331bf9d32b4f1eec8c6df76f6906594c3da4a89665b6457d3aef9dea96d2af3959c5780e SHA512 9be285da46f52d59ef28f666bee2b0b372d76cbb786f225a533239ac7683fdef6092aaa7d62458a89bc647598e12611f025060c37c0539071feac71b262e57a0
 DIST cvmfs-2.7.2.tar.gz 43121950 BLAKE2B 3f9b23709f7fd7d21f0c141388df9b3f59c0c9ed8c4b27ae4071cff919e6d04eec1c80fe26a70b421d554969d35cb18f1a700be67f046a1a5d53d73a9e64bbe2 SHA512 35f4d949b4f2d002e6ef07e61cd443e55b30031a396f9850fc8d511b2ea3fd37f12e340828878cce151876f7391459f5bb13f0fe325070567f2876eb50185149
-EBUILD cvmfs-2.7.2.ebuild 2467 BLAKE2B 28300da1135ac5ef2320acffd0b82555a65e593f62263f0b7691f32a5a3dfa540ec8b5132c0a18de69aa3a0db7c017fe8d95817dcbe9ea1afc872c048ad2758d SHA512 9163f47f18ebe58e5aa489c3fc26ad9c5a8ee3ce398608a990cfa2a5998b8eb8cc3a9eeba7289410e61851d686f82c4cdc7b9be1791aa4c40a8c82201ce3c986
+EBUILD cvmfs-2.7.2-r1.ebuild 2517 BLAKE2B 608d5bde89d45917afe51e8a26a4cceb4b07feee14a52c664698ce226950660266e70b57e53b0853572ca885047b36885c90996b0e6e1607b2d4dbefad508ecb SHA512 cc9a6ad42acfe31d4b58b6a045af71f58b4824f4e513c288ee5f4467827874045df8ab08ca38ad86f373bc6a34f0be33d91181ab2c51a9932a92108b26d9f4f8
 MISC metadata.xml 1445 BLAKE2B 05a946a662c2f55cf57a50a88e698769e9e930f197880afaa8a81b51d2a6bb36c7e83061635992729c187e07463fc2914a214d7bf66279cd892835bebe971c73 SHA512 ee20a97ff26790a2cecfa28f0be7afdac3eda4a0aaade4cea4cb5d6c500d7634a2bb086dc0271189c50707deabc3c8882abfa25e959770976bf1196476b6aae9
diff --git a/net-fs/cvmfs/cvmfs-2.7.2-r1.ebuild b/net-fs/cvmfs/cvmfs-2.7.2-r1.ebuild
new file mode 100644
index 000000000000..a2638ee2e932
--- /dev/null
+++ b/net-fs/cvmfs/cvmfs-2.7.2-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake linux-info bash-completion-r1
+
+DESCRIPTION="HTTP read-only file system for distributing software"
+HOMEPAGE="http://cernvm.cern.ch/portal/filesystem"
+SRC_URI="https://ecsft.cern.ch/dist/cvmfs/${P}/source.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="bash-completion doc server"
+
+CDEPEND="
+	acct-group/cvmfs
+	acct-user/cvmfs
+	app-arch/libarchive
+	dev-cpp/gtest
+	dev-cpp/sparsehash
+	dev-db/sqlite:3=
+	dev-libs/leveldb:0=
+	dev-libs/openssl:0=
+	dev-libs/protobuf:0=
+	net-dns/c-ares:0=
+	net-libs/pacparser:0=
+	net-misc/curl:0[adns]
+	sys-apps/attr
+	sys-fs/fuse:0=
+	sys-fs/fuse:3=
+	sys-libs/libcap:0=
+	sys-libs/zlib:0=
+"
+
+RDEPEND="${CDEPEND}
+	app-admin/sudo
+	net-fs/autofs
+"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+"
+
+PATCHES=(
+		"${FILESDIR}"/${P}-builtins.patch
+		"${FILESDIR}"/${P}-find-package.patch
+		"${FILESDIR}"/${P}-gcc-version.patch
+		"${FILESDIR}"/${P}-xattr.patch
+)
+
+pkg_setup() {
+	if use server; then
+		CONFIG_CHECK="~OVERLAY_FS"
+		ERROR_AUFS_FS="CONFIG_OVERLAY_FS: is required to be set"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	# gentoo stuff
+	rm bootstrap.sh || die
+	sed -i -e "s:/usr/bin/systemctl:/bin/systemctl:g" cvmfs/cvmfs_config || die
+	sed -i -e 's/COPYING//' -e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \
+		CMakeLists.txt || die
+	eapply_user
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILTIN_EXTERNALS=OFF
+		-DBUILD_CVMFS=ON
+		-DBUILD_LIBCVMFS=OFF # static library used only for development
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DBUILD_GEOAPI=OFF # only used for stratum 1 servers
+		-DBUILD_LIBCVMFS_CACHE=OFF # for exotic cache configs
+		-DBUILD_PRELOADER=OFF # special purpose utility for HPCs
+		-DBUILD_RECEIVER=OFF # for distributed publishers only
+		-DBUILD_SERVER=$(usex server)
+		-DINSTALL_BASH_COMPLETION=OFF
+		-DINSTALL_MOUNT_SCRIPTS=ON
+		-DINSTALL_PUBLIC_KEYS=ON
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doc
+}
+
+src_install() {
+	cmake_src_install
+	use bash-completion && \
+		newbashcomp cvmfs/bash_completion/cvmfs.bash_completion cvmfs
+	dodoc doc/*.md
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/html
+		docompress -x /usr/share/doc/${PF}/html
+	fi
+}
+
+pkg_config() {
+	einfo "Setting up CernVM-FS client"
+	cvmfs_config setup
+	einfo "Now edit ${EROOT}/etc/cvmfs/default.local"
+	einfo "and restart the autofs service"
+}
diff --git a/net-fs/cvmfs/cvmfs-2.7.2.ebuild b/net-fs/cvmfs/cvmfs-2.7.2.ebuild
deleted file mode 100644
index 12c569ab5c0c..000000000000
--- a/net-fs/cvmfs/cvmfs-2.7.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake linux-info bash-completion-r1
-
-DESCRIPTION="HTTP read-only file system for distributing software"
-HOMEPAGE="http://cernvm.cern.ch/portal/filesystem"
-SRC_URI="https://ecsft.cern.ch/dist/cvmfs/${P}/source.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion doc server"
-
-CDEPEND="
-	app-arch/libarchive
-	dev-cpp/sparsehash
-	dev-db/sqlite:3=
-	dev-libs/leveldb:0=
-	dev-libs/openssl:0=
-	dev-libs/protobuf:0=
-	net-dns/c-ares:0=
-	net-libs/pacparser:0=
-	net-misc/curl:0[adns]
-	sys-apps/attr
-	sys-fs/fuse:0=
-	sys-fs/fuse:3=
-	sys-libs/libcap:0=
-	sys-libs/zlib:0=
-"
-
-RDEPEND="${CDEPEND}
-	app-admin/sudo
-	net-fs/autofs
-"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-"
-
-PATCHES=(
-		"${FILESDIR}"/${P}-builtins.patch
-		"${FILESDIR}"/${P}-find-package.patch
-		"${FILESDIR}"/${P}-gcc-version.patch
-		"${FILESDIR}"/${P}-xattr.patch
-)
-
-pkg_setup() {
-	if use server; then
-		CONFIG_CHECK="~OVERLAY_FS"
-		ERROR_AUFS_FS="CONFIG_OVERLAY_FS: is required to be set"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-	# gentoo stuff
-	rm bootstrap.sh || die
-	sed -i -e "s:/usr/bin/systemctl:/bin/systemctl:g" cvmfs/cvmfs_config || die
-	sed -i -e 's/COPYING//' -e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \
-		CMakeLists.txt || die
-	eapply_user
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILTIN_EXTERNALS=OFF
-		-DBUILD_CVMFS=ON
-		-DBUILD_LIBCVMFS=OFF # static library used only for development
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DBUILD_GEOAPI=OFF # only used for stratum 1 servers
-		-DBUILD_LIBCVMFS_CACHE=OFF # for exotic cache configs
-		-DBUILD_PRELOADER=OFF # special purpose utility for HPCs
-		-DBUILD_RECEIVER=OFF # for distributed publishers only
-		-DBUILD_SERVER=$(usex server)
-		-DINSTALL_BASH_COMPLETION=OFF
-		-DINSTALL_MOUNT_SCRIPTS=ON
-		-DINSTALL_PUBLIC_KEYS=ON
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doc
-}
-
-src_install() {
-	cmake_src_install
-	use bash-completion && \
-		newbashcomp cvmfs/bash_completion/cvmfs.bash_completion cvmfs
-	dodoc doc/*.md
-	if use doc; then
-		dodoc -r "${BUILD_DIR}"/html
-		docompress -x /usr/share/doc/${PF}/html
-	fi
-}
-
-pkg_config() {
-	einfo "Setting up CernVM-FS client"
-	cvmfs_config setup
-	einfo "Now edit ${EROOT}/etc/cvmfs/default.local"
-	einfo "and restart the autofs service"
-}
diff --git a/net-fs/minio/Manifest b/net-fs/minio/Manifest
index ae3d52476422..f44e5a2d14bb 100644
--- a/net-fs/minio/Manifest
+++ b/net-fs/minio/Manifest
@@ -1,131 +1,624 @@
 AUX minio.initd 410 BLAKE2B bedce560151142afc4961569f6fb803c9d7bb4263d56061191e3dc7e867dccd62fa1a363d41c16afa931d0ad138bd8cd858d7dc636851c6a0130bb1405396e3b SHA512 01610c5dd7e5887f85b1246d475e5b5c23cf3fbaa0de21e9579bfa929f3634cccbab1b7a7b8e66fa9bec41ed3feaae033c4380cc3911a7af6f64286c4ed0cf78
-DIST github.com-Azure-azure-sdk-for-go-d659f2a91175cac99aa5627d09b83026eacc978d.tar.gz 14883858 BLAKE2B dcc2f5fc0878c8f47cf04af727825ee42e51eeb0e1eb8695f404a92aa572b83cec8684e9a6e59d20acf8a354cdd2eaf07d257907a852aea93d1331dadc3b2752 SHA512 0852cb1e2f9996e42a0206a0457fa6f95d35fc1e31041f37b413e2605adea40f4001bc0100a1cebf5c2af3baeb8c0621f1fed587fbd0e7a4abd54c985e03abe4
-DIST github.com-Azure-go-autorest-3b1641ed03046f2ee28d73f7a51e5b884d55b92a.tar.gz 134957 BLAKE2B 758a94be9ebe23e8184aa5f80f3bd9dec41ef8cecf7e28d051bf5082fd5a77be477bb2391f0b7c730b38435ed5762a989502896b561c8d48463cf53bdf4fa7c7 SHA512 bb689f2a70680d0cd9c0f3337c45b93fba6329b03aba31a2737f4888d8460d5f1614b78e54bf9b277ec47d1daa368c637c8a0b6d61133ee07296d964d4943230
-DIST github.com-DataDog-zstd-c7161f8c63c045cbc7ca051dcc969dd0e4054de2.tar.gz 445833 BLAKE2B ebe3bf82d8c0839ef62be90223cc8052a5ecb700b1a8e8ee543d347589e1c26210e613d6fd9d6692c7b2f83728aba151734fe0ce849e68516fd291e78fdfcb09 SHA512 3405efb05ad33a04a78f7c5807c512bfef4d43103d912ff36746d6f64a12b02a5fb864d35555eecd1ff8e8cc91b961a47ee61c540ad42bccf30523ada9c89c89
-DIST github.com-Shopify-sarama-879f631812a30a580659e8035e7cda9994bb99ac.tar.gz 187136 BLAKE2B d9bc4330dc2a1eac3db6aafb79837f7a2c6173b53c9d07947643d66791814db970adfb26654952378d137bfca6cd53b805545e4a8016ea917fdf2e60249e362b SHA512 1c1fde4982161b69897d88e825d1baa23a57157ffeec741c6ff55990140ef496f1e3394a09988fbb158ff2dbd058b66c3cea935d4ba64029cceed5f38cd37c65
-DIST github.com-alecthomas-participle-98cb121381c371cf1542c7ae145e485d703aec0b.tar.gz 53386 BLAKE2B 709989e25fbc217390d291911b7074bd9b03c379e43379eb83f9af1f22335310b4dd9516bb1785d1186c914d6aa6234478f9399dcee26b42ced7b49f3d59286a SHA512 fef6820aa36033bdabeb28e832a9828eeaddb1ba162defd9e35eea0fbe0882ffbdd1759439fc668474831dcaf4670099e239f8106a64d3a6df846c9837cff525
-DIST github.com-aliyun-aliyun-oss-go-sdk-86c17b95fcd5db33628a61e492fb4a1a937d5906.tar.gz 608124 BLAKE2B 15b99b58204dc9e74df1397993a59d5d2459e6f28b4782fb4614701ae39f3843df7ece1816495aabd156830599eeaf7f09ed29c731c2155a6a8e1898e32a0c84 SHA512 1da4cddb57506dd5ae33738a15a396b0b0c90f854ad16c2d942daf40182e7d1b375b27c1b9f994cacca33303d9943e0e86dec221313ad0a5905af719c96d7183
-DIST github.com-apache-thrift-c9b1e29bc9e0702d7441383358d565e1e76ccea7.tar.gz 3162819 BLAKE2B 141a4fc18876d11e01d6ce47660b050e0c3654d9a02e1158370b156d8c2d4202437a9a5c36b279ae23fd33358004a05669d7b1a54ecfa322ddaf577111d1e443 SHA512 9c2fef780d85ae1a01138af16f4e87179254da416186d609bf74c326c49c586616d12b6eebd8e615ce9ba78e93602f860a2ff4c8d54eea0b9b7c55f111094d7c
-DIST github.com-bcicen-jstream-16c1f8af81c2a9967b30d365a29472126274f998.tar.gz 42510 BLAKE2B 61cb8ac82c072f9929a2df6f77b7c10d08028e8d2886925dd0bc7973791ec1ab0cc0f0c2f78409f2ef58ac420778160df3dfbd2028a0ca9063975be84211d057 SHA512 eccd9319a479e77dfa8ac902236991bb418cea77d50350a4ba1142bfbea29dc25d7b0a8f262ee271281eb9ce630bf26d42f508e1f834c80a93fdc7dcbd96353a
-DIST github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277
-DIST github.com-census-ecosystem-opencensus-go-exporter-ocagent-902c0ccba68df93f7fefbe7e7c6f16be33108b40.tar.gz 31045 BLAKE2B 50fc3c30930a365e163052bddfb4af5c8b2cd217a11006962ae805d98778c813226711e10c4e2fdace40a8156422cfa7e5dbd3bad30fd7cd66095b5682df0447 SHA512 e1e21c04345b26497751d7fa6474ec4f916f4b2bf8710f43fcf2771cb9d3b7ecffe6e40957414399659e38ad95980bc830e3d53137d605a76770f5ea7c5f3142
-DIST github.com-census-instrumentation-opencensus-go-43463a80402d8447b7fce0d2c58edf1687ff0b58.tar.gz 220937 BLAKE2B ea099d34a0e869128227b8ad99977e8b7bae6386f32eeefefb7d36477d2d1e1b4e18c00e0e5db7d811adc04478a23aa745a8b89d59c95b863ab3f3aaee084935 SHA512 b2d85e2b86fd7940d8cf434f1140eae8c03cb2b77a2f46553e9d9cad9e2b913cb235a5d7da2852d75827d80b1f242a1a678490c13bfcdb6c7120338b3be43b3a
-DIST github.com-census-instrumentation-opencensus-proto-a105b96453fe85139acc07b68de48f2cbdd71249.tar.gz 124003 BLAKE2B 9d3389514431c986d7f3f9e4386ce1a45f3ea7e5365ce7bbaf1ef3681fed5e393a3964c8bdb1d03477174a2d566ed36ec9b098b5eaaaf62c7a9fdb3f53d59717 SHA512 994143820296e09db5d8436309da35822f94c33f186e3c826c6c7a3905def8cc1d2bfdaaa36cf9ece517ad820699659727aada83d37a191d8936ee7076e4c618
-DIST github.com-cheggaaa-pb-f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11.tar.gz 11788 BLAKE2B c7726ecd41c5d8909e157a38db429327d09873b4a4661cb7607893067c362487339b33eb24f122df7ea98e81bd4556884b831014a6948a108b74c71f521f1296 SHA512 47f0985138603631d59915b01fc99b4d4fc44ea964e1ad50b472cabec0fdf57f6235dc05ad32629bc086bc3f1fe25c2a3a31be064f91d398fdf37799fe4aa8db
-DIST github.com-colinmarc-hdfs-fd1e410ff7bf76b870f625dc0aa3eb4e44f5bc50.tar.gz 674760 BLAKE2B c86e93d1a78cb36e69f18a2de823b472711cd9faa1223cabbab8980bb48f7545eab7b074de9b83bcff1a80c237e121cf7ce5367a9ddcafe269e3fc19857bb3cb SHA512 d481afc275c2fe351e7df23fd89e3699640bdfacbca499d2b65dff67d6f0dd1382918c8399b088df66833cbfc75bd9cb609bcde9b351e580833ac6c88b3bff75
-DIST github.com-coredns-coredns-8dcc7fccd74454134b33c8bc9f780ed6d7f076cf.tar.gz 5777191 BLAKE2B 82c0c3346cd9713ae5376686dc1b528c9ab7d07145b669bd76b26f1d7a8a34300bb45a8aad382c4bd83cab8e6408e7078c7ae6bcb2ee9aed2d885e5de9cc485e SHA512 d182d4de26fa68176e480a532e1ec4083503486a4713fd1df7ea0a1162b6b105ad55e3a3225cef984d05982afbc03247198abd4833f36a3fb42a9b6948587147
-DIST github.com-coreos-etcd-d57e8b8d97adfc4a6c224fe116714bf1a1f3beb9.tar.gz 3528884 BLAKE2B 5e5d799ed7cc2d242eee12f06f1a7dcc8dd8501b19d4fa61b53191c68693a9c7aa1ba8a61a1353a2fca9c1d783ab5400fd1e3a0833b0f1b0f3e5b8a8e67781a5 SHA512 b702701ba789927dbad2955fbe1d75248b6a6e4c0c127fa22f6495821aad68eab8c7377bce2ab52a20df7ab52c8de299994785434c13583638d23cc930b98f9a
-DIST github.com-davecgh-go-spew-d8f796af33cc11cb798c1aaeb27a4ebc5099927d.tar.gz 42224 BLAKE2B d731756ad71937d6616f45eb172cd5122524b12ef14d653fdc9248b6da1aa103604f6493fc93b186bf0d6b8c301c9eaccf9e8abb54a001427d9edc0fa2185c35 SHA512 9ecd1d77675ba7080945f68053e37450d003d8307c9ab507c7d64566f88a3d8b61fb9c9486ca3ee0f23c0d4e1a2e93391d1fac0a0882f351f21a118e221925a4
-DIST github.com-dgrijalva-jwt-go-06ea1031745cb8b3dab3f6a236daf2b0aa468b7e.tar.gz 36975 BLAKE2B 8d6ae74ef5b5a07af42a81a6902cbb0dd73054a7c678f35bfc6397d7f9abd79e79204f1eb4aa46cb42f1314122c2a84134d6cdc22cdd987d1040d056143730a7 SHA512 4a46ca539ec70e5e8352621cba3b1da20ba3799bf7615b1842991471f812cb4877dc053e915def3d70120170cf9c6c25b5bfdbfaab92e0537835ad66f52cf732
-DIST github.com-djherbis-atime-8e47e0e01d08df8b9f840d74299c8ab70a024a30.tar.gz 2914 BLAKE2B f1ede351b08a92a58a7daf97060c8b71ba6f36bf8017b1ee8dfa4ac505beea2bb254640f25b78050d2d896c5cea2eef2dd7a96eb030ef7a06186cf9c20390198 SHA512 b08b9d929b8e7357581a2748edde9817aaac3ebe713e407b800b318e8c75d7f97d487c7563cd0a82a95f551b42f093acfe2d458658c6d0c38e864635bac9c448
-DIST github.com-dustin-go-humanize-9f541cc9db5d55bce703bd99987c9d5cb8eea45e.tar.gz 17263 BLAKE2B 6915367735a060d873947d805b49b1a6900080019cd5c21183c11850a0fb5292ea6c93576d7bbc8939e6b0f1e31501c44b38e5c97c09fb5685053b50142de092 SHA512 713ed1188affab7954efd4a6656d0bc82368b2c71e5604afbdcf9ea1ead401b821c443d5cd1c634964139d76fcf69d9a4b0efec4079f0b2335b1c15ca042d0b2
-DIST github.com-eapache-go-resiliency-842e16ec2c98ef0c59eebfe60d2d3500a793ba19.tar.gz 10215 BLAKE2B 3300b6f0d28da44b8f96b5b129f9faa46f4015096ac6d66842c816a0c0db98ec7b393c703153f577b5a5c249e20d019821f9180fa887780547afe343cb288c2e SHA512 9d801e0252710ae6368c1ccad3997eb4d61bd4f4d937bc683bbce2554474cc317b297ae0a2a2f95260644fddad72b91b8aa8802c9e10876e53e6e3f4f2a9c57c
-DIST github.com-eapache-go-xerial-snappy-776d5712da21bc4762676d614db1d8a64f4238b0.tar.gz 7841 BLAKE2B 033e8657f43bfc921558ecb0caa1f68c3c00d04912146437b19d1ed1de5fe57d128fdc85d14280e74dda3c642183b9eb1bb459bd68f9954e874fa5df47552f03 SHA512 17a34fa71d2ab18db970ce945489aa73bb64580423ae1e048cf7635a6f91075d2b7714c835b29999e2639ab68acd6f308ac4473cb3e00006d50f7002954e3985
-DIST github.com-eapache-queue-093482f3f8ce946c05bcba64badd2c82369e084d.tar.gz 3503 BLAKE2B 95a0030b182097aa1fb640f34b60fa094073f57ed576da5180b49e254e20f88a5b3980742b43d55e02c715a8dec9f0a58a5410ab91c88a19ebcf1584ab0f7216 SHA512 7aff388e6908911bee51e0c22be9252981c22980d78f911b96235e2ea0f8ddb38b80bc3c513dbd30f8514ab3012f83e688b0beb959c917b5b45d6db57c15a162
-DIST github.com-eclipse-paho.mqtt.golang-20337d8c394721c308cc6ec096990ee451a7cd7f.tar.gz 71809 BLAKE2B 7e53baa1e7a5ef73225ce0e85f7668a642065c12b41de4f9a9a3aca3c09c8dc843c18386334f3c01c146c8ad0c7a4cabc08baa72f422236fba588d1d12bc7f12 SHA512 17668f10839e946cb6f57569a62ab846af36e1fc341155465fdf15d517a981772e3a39d85cd37a3f5ebcd09ce9ac7b4c37c2b5e375add655cd7036b46a2ed82c
-DIST github.com-elazarl-go-bindata-assetfs-30f82fa23fd844bd5bb1e5f216db87fd77b5eb43.tar.gz 3810 BLAKE2B d013b29bcce86a2ad0f41fb95292c571bd79f50061900b20d62564fa5ed295bf523f5bdac75e7eac8ce6a546b9f965a06ce3b4921591ba1f2a7671045a93df2a SHA512 1972312843339e0cebd59f0b1886ce79a755b5594b74ae20b3cbe127d6c379eb2df0391d73e495f83ec7ac007fd1be9a9d5d51ccef693eb883b5cfc06279b0ee
-DIST github.com-fatih-color-5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4.tar.gz 818356 BLAKE2B 8b9fb3b45ad4af90c26a0f197d9cb07ee22484006a396218d617e7992cc0e65dc3d3c8dab894e692eecad75d8aeaf6e5c8a34849e4d7892a10fecae3a8ecbf2f SHA512 4966b347777fb41f23c26a35511083886d67bf79ce74944a888ab29bacf6e33a753ade90df37321751167df054301fb4276452c3722dd0120cce9f4757ebec2d
-DIST github.com-fatih-structs-4966fc68f5b7593aafa6cbbba2d65ec6e1416047.tar.gz 14445 BLAKE2B 8094dd5813096fae5770a47d2f9184ae0322731d2eec49ab3f044bb4e5c4dd1691a4b20a3fb17d8cc8fe69fe7befd0f122ec28ac6005f8e776eea718dcdcac6a SHA512 7a349c5caf684915d3e1c0b9868802683e46f97868120aa3b48037a3c75b9155f5694f3a153a28e017d6d8ffb7dcfec8568691f4a66151ec51866e231897ee88
-DIST github.com-go-asn1-ber-asn1-ber-f715ec2f112d1e4195b827ad68cf44017a3ef2b1.tar.gz 13214 BLAKE2B 3b18e13a25b08c8e69a48681e4fbedb1acc3cd2bf272cd8d75159cb00345801f31ead8116ed209370bee40b4f1cf78cfe39349d668474fc14831ada7b2e1511e SHA512 fbe342c64a8782087e8772903d2c1f764a34e48e610c7198e4e4fbfbbc28e9e8b7d1c0c68508d8409b25b0e1c08d66f37153a3f2a63f15969094057790252371
-DIST github.com-go-ini-ini-c85607071cf08ca1adaf48319cd1aa322e81d8c1.tar.gz 35081 BLAKE2B 7adf1e84f4fb23632f9bbeaa53e3d5b6a12244999cc5b744f12439459be4921a271d85e3e2dfbec08fa12b1dec27016e78805c600d7d4798bb84aaef5756e49b SHA512 b2758ad40b532e30581f41b2cf609042388acfb037848858c394c0edf444181942061fceba6be76aa7913e62954cc14552ace7b4634d731a6bbe473275655aee
-DIST github.com-go-ldap-ldap-v3.0.3.tar.gz 41078 BLAKE2B 7deccbfa188e38a776e97709861c9e13417410bd331e8d9aa573072b2b35ec2408895a720bc91ce53ead7d483e5c89bec52e65b230ded5c52814a895103fb16b SHA512 6d780dc7a03c1ad3e8ec96aee9b3733ef2943e9e0092e17f2d059cf3c10368a15ca30087492e6b34b0a550c4630497a8e975453fac311293f4c31653e491803e
-DIST github.com-go-sql-driver-mysql-72cd26f257d44c1114970e19afddcd812016007e.tar.gz 83591 BLAKE2B 906f8a152c184e8173c9f9361d48a4d8cdfc5f8688d749ba43a7ef14e94496689a0e5bb99bd22a62904ca5a8491434e417732bb2211314708efa4ff4b278eda9 SHA512 a4e131ed4f0aa3c4da424d53b290258d696836c5870ae4ad868ccd347118c811855cf0a878e18ecde190327d7f7178a920065d722b70226f6afc326f5d510dc1
-DIST github.com-go-yaml-yaml-51d6538a90f86fe93ac480b35f37b2be17fef232.tar.gz 70766 BLAKE2B 3ea4412e259626b25145feacbe68b529d2bcf353bd098899c3a906d01f75bac5f93ec20967f7261feb388356d7b12fa945ec73822e21e029e38ce7c0b27855e7 SHA512 dec54681845fb5cdb159d44bf91cb703bb38a6af1821566d7b11a0668ee50247f542e3b7bfc21571198f9bda8ff31ce32cf67f98a8c906dee7ea9194643699f9
-DIST github.com-gogo-protobuf-382325bbbb4d1c850eec1f3ec92a1a16f502d68b.tar.gz 2040041 BLAKE2B ea3604ac69e703728d52a958ea016ff6bd61b4340da273db8865e264bbf524eacdc3bf82fe329f7894de1b4616b3ae131d1cec821c6138a338bdf9b394eb5d95 SHA512 6541a92724d1349d100ef6905d42dc9ce322a2c1d4080a6a1128db5d8759b4200a4247889853302bf683b4c3ff3af4c798a585cba33c6536d5f29f13e55cc81f
-DIST github.com-golang-crypto-38d8ce5564a5b71b2e3a00553993f1b9a7ae852f.tar.gz 1656765 BLAKE2B ce9b5ba9772c436a9134894bd9e93de6ad27ad0679b406c67c81dfa6d420e690c8caaa88f14c7015cde1fd642e581c7d9918c73d68f2bb1580286dcabd275792 SHA512 274a47b08129912488639c5cfcf59bc17ac0d863afc1d25b80596801022b5317f780aaf1ae8cbee6b6ef42979c22c9e1514a4aff2f62d3d1e6cace59016e0286
-DIST github.com-golang-net-eb5bcb51f2a31c7d5141d810b70815c05d9c9146.tar.gz 977441 BLAKE2B c4e3fada087341595861671b8c0d1b23a53296852d335fb4acb7f6cf6c72a4fcaa56027bedf3582a48c26aac3102ab5f146ab983c42642fe6b72a0d344ad1be7 SHA512 af5b53755d68d85313fa0c1438e4df98b077e4f4c1035b7772932593ee9ed9750108aa93be2453df723f7f008053d9f892ce565e8a9c65883f6c519c4a6cb8fe
-DIST github.com-golang-oauth2-9f3314589c9a9136388751d9adae6b0ed400978a.tar.gz 45022 BLAKE2B 0b14e367f087601624a84ef25641b1f3338cc689ee92136ef51abbbdcf1b3b3dc1cad47b17868a39c1a9ecb2f792cdb1d5bb8f8ede300a5d9dc8445319c05132 SHA512 8a9ea21c4e7f9dd1ceeb069dee1987f5e5e5ba4f973572ab6f0ccf00ae6246a142dc517ef15ff83de5f3c16c267181ac3812d3c6bc0180d12b98d7540e1fc91d
-DIST github.com-golang-protobuf-d3c38a4eb4970272b87a425ae00ccc4548e2f9bb.tar.gz 312302 BLAKE2B c36832d29979178442712e9e90d9db2f65d7664170a7aa9d387932f1238921904c3702d8f875a8e4213d58bc99eb2ce1a301bbe41b1635c705aa7c2d592302d0 SHA512 2d85f8767c44848e19f4883d7dbbe3d1ec36935a9c9ea7de45660b4dd0cf6b212ff034cced81d8d98e15ca87c26229c15fc262626d621d920739296d272ae1b7
-DIST github.com-golang-snappy-2a8bb927dd31d8daada140a5d09578521ce5c36a.tar.gz 62641 BLAKE2B 985efd86569c3c01cc108afa841cc147b090eb6448932a39831772ec775403dde9d7763570ae88e1a7759738680fec50a603264d1f70bd681067b84265086752 SHA512 8b8c5f5902815b8ae620b33a94dde3df2ae6688a6fcfa6615658bc33b5a08c85d83bb1af5896a87a8840d62b31ca8143e4b2843d6dae070f89c23f8f92b81d21
-DIST github.com-golang-sync-e225da77a7e68af35c70ccbf71af2b83e6acac3c.tar.gz 16285 BLAKE2B e42c9d05fb223eb7f3caaef4ceb0e476a4467f8a88553982b2115b3c2581025ceb3ba4b8a3783bc311c307e3d6b2bc6f54989ad447662400d9488c915dd3c44d SHA512 8f006b9178c70fbf66744aa91d964c7c349b513f013753df804d6fcf7b727e35871cbd606c551ea310545ac36aadb6febe3af59091ca38425ff703c02e555e7f
-DIST github.com-golang-sys-81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2.tar.gz 1262962 BLAKE2B 082ce1d2924efe2090c735b5338b4afb24cee1109d445ad12241fba95413fdbb5a1b5ed3425d4822a610b38cdf2fad7d3fa5af2d306ab396746fa38d1d11195a SHA512 04cda320e2c5c5dad102657725d3c94289937194836c28c4633b150fcb691123b12f8eeeb8538f76e747c5626ccb9dc12667fce362b96448195a9cc332045db2
-DIST github.com-golang-text-e3703dcdd614d2d7488fff034c75c551ea25da95.tar.gz 6593234 BLAKE2B 356acbe3ae6e16fe02bfcc83aa12bbf9e7b72b17f7120c511a7ca31b8764ec0fe52275d489bd288035b963e179952077d5702651f9d34e1e2ce5f7c1ebc8fd9a SHA512 9c369041f7f6655940c71debd7de195c17bb302438a44e3f2c7db57505634b9a9a9beae3ed239bda994ba2da062565d885a36954f371525a59de4f7a45ba6480
-DIST github.com-golang-time-9d24e82272b4f38b78bc8cff74fa936d31ccd8ef.tar.gz 9318 BLAKE2B f2d50340655d21b1bcded6cb76ae16026c1d43a40a45a45dcfdda8171722c64bde3fcdddde9eca4e1f9ceb994a58750687ebd439464f962652cfb004329b6310 SHA512 d4f6336675a491f5de855c33a506baa99c33c02f59fa9c5284e29ab4638eb55ff5f7d24dd5a1c480211f41cbd3bffa6366594828c333f5f039a7f3009515beb6
-DIST github.com-gomodule-redigo-9c11da706d9b7902c6da69c592f75637793fe121.tar.gz 42978 BLAKE2B d07f49e9c9d5965b30c84383042ce3581a7aef40a410b0cd1febacf09cf3598654e5f651a3defdd5e7d1bc007fb04b703fd280aedb83ee2f5c0906ce78d811a8 SHA512 86521a448fd20e5bcd29ef1a4f2748e34db188100a1733f1b2425e42e6a4962e449af417279664017f95891b29670961514e2fe4c0010486c52fd95888df4e3a
-DIST github.com-google-go-genproto-64821d5d210748c883cd2b809589555ae4654203.tar.gz 4779898 BLAKE2B 733632bcce17c341498df4813e7bf2fc5f25c9a82fbfd6f3637ba05ee6c6dc9e231226d826fc34a85b035713d38ce0c70534e67150324ee6ca7725dbcf66d73c SHA512 ed5fed4410f579954330ffb3347aba2e072bab5bb95166bfbc606170feb4f9be48ce74b428ece527df405399f1c0c2e65cf5e9e23e8911fbb163da5a2636fcf7
-DIST github.com-googleapis-gax-go-beaecbbdd8af86aa3acf14180d53828ce69400b2.tar.gz 14330 BLAKE2B 06c7116c76f32399449bc2729ea98b66fa662cc4cf51b8cec6a9254bba9cc240eb5369168d1393818fb8dc19f966ca0d431462b68d4b57a04f13328221f0004e SHA512 606aa0c72c0e6fcca594332d678a8120ef3cfc506a734a973424dc429ca273a85486deca4c642a7892af698f8a6df70fdb26663af8abe8a7604874fb735dd188
-DIST github.com-googleapis-google-api-go-client-bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz 11460249 BLAKE2B a4aa80a912eda428e4e106b819806e0edc9e78b3a455303aeb36582a9f59b6c7098837da536f76331a827813b4c36b9e3c1155a8b4900d893a749a11361aaacd SHA512 3cb1a5ef7258753f2ddfc7bf48df3ebd1e61927998a7c15a4ea8e74f5b7c701435a7f40b697dc9c99ef6a09aa2386e4aa93128b6d67423b5adbb410b76d9cace
-DIST github.com-googleapis-google-cloud-go-458e1f376a2b44413160b5d301183b65debaa3f6.tar.gz 1924238 BLAKE2B b85dca126c17864a38a3745e03b9c95e5ed4491351d97fcad755830ac1618237abdf5a4ac5f93382fb00e30aa60d18c05e796b45f48834463e1c278a0db67c64 SHA512 ada3360422033b8a7143c047e7c01c97ca305567b1658238d04291ed88815cae352040b4db68f862961239b2da48f577041d4b4b344fe3ac210d8329c8dfe0ca
-DIST github.com-googleapis-google-cloud-go-a4ed3b9f8c7419c692a60bbf780ab0f1c4af5ce4.tar.gz 1933640 BLAKE2B 4089b43ce5841d64f0e3c3886940f1f3bad1293240eb5b462b34e14a577a48117154e10e4d6c5401c942acecc3d1eb236fbcdbf72c9de39b888d8e5f26182cab SHA512 82613cb7af26002c879d3fa084781552b6aa1b3487d0dcda0e111e8ea8a9c9407906b0b552cd0074714fddee85c9acd1fc4ed353125209e99df58670ac547621
-DIST github.com-gorilla-handlers-7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce.tar.gz 18390 BLAKE2B 40a9f09aa256ea8ce2c3080daf84667813e441b7bc1ee80dbef9589b43499d7bf4c3a6230e3771bf6fef790b9ec19aca512624ac4766eec5db1940f2fa7cb794 SHA512 04675c1f434b3631bc67bcc8899f36c59dc17bab8f186c937d2f7487f3e7885de6fa1c0da922add2179b04af9d5d1a5f13ce5fb4f3d767692089aaea06e6cc9f
-DIST github.com-gorilla-mux-a7962380ca08b5a188038c69871b8d3fbdf31e89.tar.gz 40828 BLAKE2B f919f2c7abbf80aba5c716b5a7cfb9e3521b4ade2c080c7c403e89a85ac955f3d9ac03ee60f9d569534446c032f3a3bffcc40e18f6dacb7d9dc2a60b29ce3ded SHA512 d472ae5092987b539529fe8e97bf59176948f24a32973d0e457790fa0ef630b118bc462ccaff8c9404462015aaa04acb2c174ef9364d6bd9332d2e02a5bd7589
-DIST github.com-gorilla-rpc-bffcfa752ad4e523cc8f720afeb5b985ed41ae16.tar.gz 27334 BLAKE2B e037414ff5fa9ab181d0d743cd2176db71be9005a8461cfc769360e94cb2e45a03d232dd3b6f932052a7db0a8cb28b40ec6fb427d666db53a5e9e42ab44991de SHA512 a7a6bbb4520af8f31f57b8685bbcdc7e57db0d2f2bb48397ba33ca3ed238d1323d8b96d73b04447e19fb32c966454f8922dde7ed3dcdd868b07cca41068b7f1e
-DIST github.com-grpc-ecosystem-grpc-gateway-20f268a412e5b342ebfb1a0eef7c3b7bd6c260ea.tar.gz 295171 BLAKE2B 9b3dcf0b64548c62421d6498e33388d24f168550169f598fda3861676bd79375cb6eb684570401f5330e9a69e3963f982b219528a3abfd0bc1b2952dfca7b897 SHA512 3f96959e273bf70acf2b3b3d32afc051eb01c5cf6e25e89fc69250fe725802205ca88daa5977a77e8f87ab29bf682dc9689e31a7251024e7b162da91798b1d84
-DIST github.com-grpc-grpc-go-3507fb8e1a5ad030303c106fef3a47c9fdad16ad.tar.gz 600679 BLAKE2B a959574b779c031406031581c9bb8767a948a510d3e6e5242982ca6fb19eda047277f8620300970690d090c3391eef18d6a07c8f67889a202fa7e3de2c36f4d7 SHA512 2c715f1610fb39c40ddc93cfeb874232ac74cfc649305a43de7ab200ca7a72e9e2725c91a3acada6a4ee511e442bcb1b95ae6e29462e8d158fbbb08cb61ca80c
-DIST github.com-hashicorp-go-uuid-4f571afc59f3043a65f8fe6bf46d887b10a01d43.tar.gz 6852 BLAKE2B d04c7e0351ce0884e3a1a8d8e37da5f4183f4c0819a6b81a279ff2ada0b70bb07c80b26ec7c81decdf0968c9f715aa2416159f1326aadbb297f7c876d0bd1cf6 SHA512 f5eb03a17b9bb1ee31cc47612d41dd2ce6e797bf960f7528e65386a03f59429604e101b6f70db688a414575ff510782f8dfdf237c42dbe365bb4abcb62aa10f7
-DIST github.com-hashicorp-golang-lru-7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c.tar.gz 12983 BLAKE2B c600a2ee072ae86dc080f10232d079f5d0179e4f3ebc4c7db4ac2ef05ed99998843ce0882c38236552ce36ba38898dea6a13956e2da9ed58af91a728a34a980a SHA512 1a87bbb71da395c99b947aa85ccc8e8f680af14d0be3fcaf353bb058ffbde80252ee5dc5186e5a0a325cec0cbb8fd45cf86f3e6d4f8056515af1af4072c49308
-DIST github.com-hashicorp-vault-36aa8c8dd1936e10ebd7a4c1d412ae0e6f7900bd.tar.gz 25953593 BLAKE2B b644e45e177605ea922261700eaecbe6089f548fc2a2d680a90cb708d9b5cc80c9b5242aeedea38dde15eac6db640444b772e64f1e318261e08596ac7bc21a4f SHA512 a0e9d8c6d48aee34dbff84d159569561bb5e299e4b084080fdb7ad51cc8b9182d7b2f94d8bff8b6e76ee56fad708959e621fcf7df9645f6cc7521282f8e85d5b
-DIST github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz 11295 BLAKE2B b8d611a2f5410ecda182de54c21c57317ce5191e35d744a87eb5a546b0e8ab7f329a561537df620cb17ff92826a30699e6358e31f2c2dbbb19dc6407e2893a2f SHA512 d502e33fd19784f76d04e3ff7218a055b6b0f16ac9f53bd526ec15ff3f94ba2729aea534313d18ae62aa586993fa8ff2fdfafbea7be84a002f8d7e19ae7f951c
-DIST github.com-inconshreveable-go-update-8152e7eb6ccf8679a64582a66b78519688d156ad.tar.gz 27126 BLAKE2B 0972b3af87057486bbb85bf79ed5894eb6531ee9966b8048f0f35baa750a868a697c2103d0f26e5040d96a24ce5a9c4ee0f6ed27e262f4618e2d60165cbdba13 SHA512 6343652b5c8e5056240cc0eafae7c37772a24fd791b8cea44036af502257e403ec374bf224437391da3b596cfe6d6aa1f3889d24e5b62d42e3ddc2fbe66d696e
-DIST github.com-jcmturner-aescts-f6abebb3171c4c1b1fea279cb7c7325020a26290.tar.gz 7318 BLAKE2B e79d1ea8e27e1c456a67fa46ba932b9e0f90256dd183e53e97c8a5214616a3938acf3ea342faa934ad1f740e0c55a1ac4f691873018bd7d91ef75260726583bd SHA512 7ea5edab2e4e14d1d901911d55915e2097ad0b0f04bb7a58a6158bfc21d078f4a5da371f1960c80e1b1635dbee2909d671eb168969abbe7be65be4c1f509bd15
-DIST github.com-jcmturner-dnsutils-13eeb8d49ffb74d7a75784c35e4d900607a3943c.tar.gz 6345 BLAKE2B b72bea16a743c4967018f6a50a78b2db09202ad2308701a3f672bc3454f580d4c163c654295b96339094a80c8a1e0ac9a1df18b84d4bcd5eb3540f83f1d40e0b SHA512 453b1c9c90b5d6c7a1ee429c5f6ae4e127948b405c5c97dfa3d44141fee48265451867525a0ef555ce4116bd70790ac1c045f541b8cf4bebf93213a155f45492
-DIST github.com-jcmturner-gofork-dc7c13fece037a4a36e2b3c69db4991498d30692.tar.gz 27059 BLAKE2B f8b316235a85d5e5f8884f99f84569e7cb919eb73796bcb6d25328725921b891ff662682f80b7949a4238fa98135d5806cacce97ccea25e246fa5d31920e2c8d SHA512 1995ea7b3c6bbedeaa04177a6463121c594dce41db47242f02a31ede17e8bb3865a71309a019638c2899b99e67b2557d0ea5587df012eaa3aa2cecb250fe76a4
-DIST github.com-jcmturner-goidentity-v2.0.0.tar.gz 5673 BLAKE2B 6fce8fe4360dde6eff6fbfdd3e8532fe3ca73c0a5a5d01ea73dce35b8a186fce3dfa1eaaad09fd22d907f781a4e5442d73809164f32823b9232cb7f3767272ee SHA512 4d2bd44a86d6a6f31e63fa1438187cbbbba7d9ba1df6f92817f5e3a055e46b2d0d9dc8e40f1091bcd7c7407d0d05a1aa720e15fca08a16ab830d06e4bf506d65
-DIST github.com-jcmturner-goidentity-v3.0.0.tar.gz 5759 BLAKE2B 6d655e19030592dfd486853f6f33b52ce81f74f94d794d8f6be5575b0a93e5ebf6ef4a6f3368b19bcd6a20c8c598ddcc7962800e1395eee76b5a5b5e2abb1f60 SHA512 87e83763ef8b4e4d265ff3309644bcfa4b81bf9b5a652a7d1a13bc5b08ead840d07fa3e7f4ae3e01e7a7d59680eecffa28038f1ddc1dc4ce57214f107b30c389
-DIST github.com-jcmturner-goidentity-v5.0.0.tar.gz 6024 BLAKE2B 2e7a846c16f3db9ac0bb970d457a234232fa4db473e41aa194bbdd7c606087fe8df27b1adfbc93e40b704f183e4c4ee8e91e7bee0de468dbaaa1bf2162241d3f SHA512 d9081ec6a20363484b47850a915422452afe52e94cd83857c97a419039518e0e0bf1d460a03aee96357a74d1aba629a9449d110f8b31cd6619c38273ea892a68
-DIST github.com-jcmturner-rpc-99a8ce2fbf8b8087b6ed12a37c61b10f04070043.tar.gz 28843 BLAKE2B 0700cf5fdf78d1297000ac959811bc16bb714dd818097008e62b4916b1c793762d621c3ecf583954659455d49d2f91a1ea9a254bd7c5733d5c87f014ec0fed17 SHA512 1ea12c16fe14ce1dd3c30e4b99f0aaa0ca76eaa841a3e71578d94134da3b0db42de7e6b56c246490bda58782ab695d3581bc5bba3caf299d3b037f752a10dd21
-DIST github.com-json-iterator-go-0ff49de124c6f76f8494e194af75bde0f1a49a29.tar.gz 76813 BLAKE2B 27292de3568732b0ec50d0404207662919ccebb3f54fba9d2ef268dc02f9ae60f339ab6b6516947bb5c33e07a44ea7d06e5609fb1c04fac91d77e1a11202ffb6 SHA512 b601fe52f56928f900dfb53587a0594523583d44a9e6ed6836ffc9fb647082c05201719291b1b3fbe0c76eec1efb418ee8093cfef0f18466792167c246bc7ce4
-DIST github.com-klauspost-compress-30be6041bed523c18e269a700ebd9c2ea9328574.tar.gz 3443307 BLAKE2B 926690823f0288f1d2566c6eb61320b53fa0182d10848752cd3c216cb71e7bde8694f7cd77456f5c0727367e81a14b95546edfe2cd204f55adbdf41fe5f3c0c5 SHA512 b4a8e5a8ce57dc80b518523f677baf7b5f24a2f6906fd49478c87b917cb904c60e5e89d8cec5e382959c739ed3a3647821ef928d93265920d0b44f47de66ce02
-DIST github.com-klauspost-cpuid-e7e905edc00ea8827e58662220139109efea09db.tar.gz 278906 BLAKE2B 3a9e67372a01ff8aa51a4de50a40f7ed9a6ebfce22bd11849771c306a911909f0900902cf9cb3e4117576fed221af5f578ee9a69100cab0c6083566866676a7b SHA512 d5b6184709e4f5fe25e81b172ed40ee98f1cb87d38763235b6df399c71ebc4207e12c6c465c1051471d1aa3587adb15140017d9866e9d26e5f16822cb6a903ab
-DIST github.com-klauspost-pgzip-083b1c3f84dd6486588802e5ce295de3a7f41a8b.tar.gz 121645 BLAKE2B 8414a1cd97c510a50a12bfa724da4f79d27d00f671da38047bb11718414a117197f02ad71b70dc50e7fc37401425ba318cf06afe80dc26eb1616e988670a644c SHA512 3cddaa134b65646e922e76ebd25791a9006fb90e5e6b0aaba3f94e41a2f7874aec9ea6df5f218d091a8ef8508ca4e99ea4bdf0102a646f932f33a08327383c83
-DIST github.com-klauspost-readahead-v1.3.0.tar.gz 7728 BLAKE2B e0487c5a30bed20133ce02c58eaeeeb51d556f619378f3deec424ee80b6646b05e4d43accf343ea1bde9de1d2a582822a24490e84620dc4c428bbade78fbb27a SHA512 183cc57621ea6e956f2376ca33afb2357be186a97429185fdcd44151af802ff5b6cb4b8b5556184ba503ccfb69d1e3ac0a9797de2b0a84b91202f8952ec99567
-DIST github.com-klauspost-reedsolomon-a9588190c00b0ccd742218388f6ff68bbad83e5c.tar.gz 159438 BLAKE2B c249fe3e40c6e93dbc45673e059969c399c8f84247dc2cd7f6eeea9ab0fc6a12c522aff9353f030b913f9f1483a0e17bd4cbf214a7fb8608fd28b9c491624784 SHA512 11c12861c1c4a065b3345a19f8e6f5f5e605fc8af19e1d16dc2288ebe066f972816c021c3a30a96d0b2216f4fb337a6ca978d98cb8ae67e556d4fc0e65e161b5
-DIST github.com-kurin-blazer-cf2f27cc0be3dac3c1a94c3c8b76834ce741439e.tar.gz 87050 BLAKE2B 231b82cd688b72902b37fee87b920a215627e63a9d6d47f346bc7ff9b153c8d946489d4b8476564f6d12b9e5618431f399c136d373e9892d5191815590428878 SHA512 ae68e48dc27aaec96030ee8fc91afb65fb57810f945bf9755ec941de7ceb97469eb6169d9473f734b19c997a0899713476d8b618a3998d1f6af4d360203e290c
-DIST github.com-kurin-blazer-v0.5.3.tar.gz 86965 BLAKE2B 5cc47a82d7285e45f5a38e36c4b039d9d5762f18d39f9717171c44f7baaf40fa64d378573009af31de457a754c1511bb7f58c9cb80de0104886ce1d8b4bb7c4d SHA512 9d41c746eae39a8e61d92344d7cdd1c50bb302f35941bfb2dbad6e31ed28cc16a1da90d21bb3ebcc3788e654f1008f430f61aea3b06dd4ece91b60031d5ee729
-DIST github.com-lib-pq-4ded0e9383f75c197b3a2aaa6d590ac52df6fd79.tar.gz 91534 BLAKE2B bde0d514ed2d699b5032c9b8126c5b5183dc3b7ff47436519579428bd98126f60fab92f58d410cb5b6114d5edb84a689e2b33532cc584b0fbd8d5e8a96343599 SHA512 576983fc6cc55c69a76254d392a1cd4a36e922d23274bb9abbef0666884b30a8c1e67915acc8e0175c82eb5392900891597176929b332775c80f1ab47d6828c3
-DIST github.com-mailru-easyjson-1ea4449da9834f4d333f1cc461c374aea217d249.tar.gz 75507 BLAKE2B 8ba7b2b4eb3ea47bc151fe7c573719290dae1230c5ff187f1301850c6a711c53f0be23c2c3c4d310d6832676ad6a8035b867bab4ddf9bd934342870502d25967 SHA512 092f98935e1c31f6f041d1a63f635c414f0d0db6a5485b61a57284e45705848e04bf94776c1deddf3687195df487de2117a150123894c9058978d43cfbae4e4a
-DIST github.com-marstr-guid-8bd9a64bf37eb297b492a4101fb28e80ac0b290f.tar.gz 6590 BLAKE2B 9beaee9b00ff8f847370e044ce98afc4d369b6d1a6d4bd9966fd98bc631bcaf12faa93181266367fc3c4610a1c76dca83ef762189e769d04769eccd4101f7aaa SHA512 64b180cc4ea4bd57310b6519248491e1c6873b28e7e29958b217091fddcbaf323b940c840414d6bcbc4babec32dcb41a986b7a64c31add4da8655c8e8c7e99bc
-DIST github.com-mattn-go-colorable-3a70a971f94a22f2fa562ffcc7a0eb45f5daf045.tar.gz 8518 BLAKE2B e0c475aa8ca1a8c3488fe676f547f40a4f2cf6e655262c0c5875074d907509ff45d56c969240b9b43b4aca1dc58340a5828c7b8bddcd26428663eae399ff1905 SHA512 ec88288aa9d0c3a6e1b38f74e0c44ab8e8a7dfab49bd1ed83d9cb3b4019a7651555e07003bc70eae5a18ee213870538015bdb81646f43bb09815585f3dd0d25d
-DIST github.com-mattn-go-isatty-c2a7a6ca930a4cd0bc33a3f298eb71960732a3a7.tar.gz 3567 BLAKE2B c5c1b883ea583a24aaf7e207461ea54bb56e536695b9a7de1fc7e8376fbbdacd1600d0b59fbc1b96d765493f2db9a8a11fd1d069da5c108cbe89470c0e9190a9 SHA512 aa01330c30691e984586278ba64b9990bfb811c3d9fd66a98cd593e46f3a8e39675fc8ed0892dd03a4f3850e9f03fd9f4b75b2506737c4cc67850eaa1bbd2c93
-DIST github.com-mattn-go-runewidth-3ee7d812e62a0804a7d0a324e0249ca2db3476d3.tar.gz 19845 BLAKE2B 5512128da165241ee85c1761d86d8a780f5bb57474c66c49ff796a1a7bd3b59ce1dfc2dae04bf8b032f1939fbceacc60355a0eb9ae1fa4619418ed7b934153c7 SHA512 456bb5314164373c8589109f8333e29c397c44e4d9882b544e86b2870a44d75ba397dfb58287908d305c6928b098097decec753701eba5c17192479c900366ac
-DIST github.com-matttproud-golang_protobuf_extensions-c182affec369e30f25d3eb8cd8a478dee585ae7d.tar.gz 37541 BLAKE2B f78899afa1390aca6cb1b412271713c60107771d512ead83482e0bb1716d175b791b4b04bd24b7f469cc1a29176eadcf0545ac3bf166c5b350602420d3c05aec SHA512 141b1b781a4d1c59f5eb1af93c966343b80ed405a5f63774e6cda9f12c34536e892c7a84699d6cf2e9c775457a4c2ad5d5d0b4d302fc25a923ab81d46ad65580
-DIST github.com-miekg-dns-73601d4aed9d844322611759d7f3619110b7c88e.tar.gz 3889172 BLAKE2B 55e399833ba395e1a7acd85c59e8d34ad30c6b2742deb600d5eb7ff91203f447d9318362b6a52a0a81b41b8a734493acc393013ec5d510f5656ad3fa21121fb2 SHA512 d13d3d9c939240f6015b10f6d64d2904271c863c7f375272d070b789a6ff5dbf8d7587ee0203db8552a7e0f6e3f46911aa7457328aa831a6bfa7d2edec468b6c
-DIST github.com-minio-blazer-2081f5bf046503f576d8712253724fbf2950fffe.tar.gz 46678 BLAKE2B a36914128c00b2dc6a331847ea7aefaf7bd3e832f4626f0499387ca1ade8b54670b29ac587a0b1e2db4d5d50ac44c9a93f1a72b3beceb3c08b00985992aeaabe SHA512 1039138e7b1518dddba43eee4e6454e14be04c1dbcf0339281127bfddd933430e2b92c2c60e41ee7fb1f42d2062aee1c4c690af2f334221d8addd5091c336b74
-DIST github.com-minio-cli-8683fa7fef37cc8cb092f47bdb6b403e0049f9ee.tar.gz 57326 BLAKE2B 9e82904f852ff05d3809770762f1137116e6e4a421a5b4a9ba483f48b24287a4dfaeaca90bbe738a694b44f010d86c6fe33a2383e9c60bac728b5619071f1bf4 SHA512 e2aeb507392d34fb2908c3426de6b6b5b662ac88534d46a392a463f1447fc9c21945064482c22b02cc2ecc2c889a30e38c37d37b50117a05959b258f60c6de54
-DIST github.com-minio-dsync-fedfb5c974fa2ab238e45a6e6b19d38774e0326f.tar.gz 35488 BLAKE2B 96a6a41e57048312e788f008d55a39c0ba70c024de3b4b61400836a10c5c7811a59536ef62d07301bf5ec28f731710f996c6a5a73490c1484e9dcc5a0fe74f82 SHA512 b39b81b555426889db10985a83b197e8c5505116f5707fc6c0380e9add5f3ca9d43962acfb9021b8f23fabc2da29e0cee7c6b1a449a58bbcc27dba015896ca03
-DIST github.com-minio-gokrb5-v7.2.5.tar.gz 55024485 BLAKE2B 5794910fe8ab4c61f5ec3a9e623650c362d040b8c238688b7cc8e4a27608b6e7098b595f976e16bc24486db4eeaed0ccb4078575be10756663bc7609adb1daa8 SHA512 5b9c48449a76f58949ce270182be9f8ddecc12964d3a59acfca8b9c298ee310c16c471299dc13bda3b58dffef04b5e0bb0ce690693ba935dcdfc6b920cc27c69
-DIST github.com-minio-hdfs-v3.0.1.tar.gz 676478 BLAKE2B 4ebbb46aba0c13dbd5b79f4e83c085a645f19afe4de2ba737622f8d17e95899bbbac8d47179fc0b1dd4b4e9ad9861ecd5cc1be5f0fc24f1a13b0526fee7238fc SHA512 3e4ffb343b7b98475c887b23f73572d1fd41c732ec567f5e0b27e649b123d2e2f8c3c37fd98bd817979b9da82a60c966dcc84451544ced540393f8ccaeb8eacb
-DIST github.com-minio-highwayhash-02ca4b43caa3297fbb615700d8800acc7933be98.tar.gz 17866 BLAKE2B 964c9194816814433dad2214c66b3a2cb14a95b97009ceecc4a05d46b73206fee8eb0b98c128bfa202cb1f024f2ba59d761ffb55c197675bf56cd2f6bca1cf30 SHA512 0e9b9fe87e9d46b356d92c7d8c8c7d534e1e0dc8867b78ae3ff09e3b8884f6491c087a6cfdda3a3b639d05ceb28d7c5d296c1376ed7c2a17901f27b482154000
-DIST github.com-minio-lsync-v1.0.1.tar.gz 8302 BLAKE2B 1beddac4b641843fed4595be24a5baeefb89c88ee27d41daf178e1ab9cc0ea4de08cce1df4637352b48ab025b44cfa81a489c806f71729a2efb960baaae8b43f SHA512 2cf2c63c1c6444d307ef3eeaa47be7a861b314c8a0ea35b3a7510644861a0eb254a376fc32b8dd537fd67c3cefb439261c8a88ddff68de633fd4f08bc2627727
-DIST github.com-minio-mc-a1355e50e2e8984d645cc7745230c42b27396341.tar.gz 268431 BLAKE2B bf518e050b7fe442cf59c4a23c997c5e2c13223ca0dc11eb6db13ba4d6a301f3f86d47074f3bd9f4697375291dda7e9e1d74a2f6b1db13c93c2b27998a9219ba SHA512 7031f7978a8a8aaddb31fb140b49ec29ad82c64970115555a633e97038a989c3db00bc45a18428a400f67457375995e9f1b6ec76f48e93621b9e94ef0af6b9f5
-DIST github.com-minio-minio-go-5325257a208fc630aaaac31bc00789acbc998c14.tar.gz 190652 BLAKE2B edeeb2327e0428fc82f1c31b9826285303ae4bfc1c6f20e2fd94a3760b816c538b6da42c3f8a93d366c11d068b8fd23b2ae913c29ab4f9413641026e17b58fac SHA512 099b05c20d597eb506d68b2c8c256ed0085d058e43bf089db0b90d1cbaf0bc1f1ead1ee8b7a50e3810199d6adaed11a0bd488ac6693a7d0db4f9ae7dea198246
-DIST github.com-minio-minio-go-v6.0.29.tar.gz 195380 BLAKE2B b0b130f04fa8b66514ede1feefa284de1190592b3c594bee849effdfed2aff84aa842ee3519df9624b5219adeec95eb0c29077e3933a7c0523a3a1a72e669a65 SHA512 99ddc22870d869d38431a55a8fe6ddd7fe907a68c26fcdeb368098b3e6488da61426dc6a9006acee864f64fd25248c6f69810cd1b29f9edec8e5619479d60e22
-DIST github.com-minio-parquet-go-9d767baf16793cc4b7fd55d642474c36c077ef77.tar.gz 64834 BLAKE2B 75c349b550487891e252ed98ef577e235bddf9a9a7e82bc85049ba29019c904686669d121cef56450a55f60eefe895da57e4f4e8ca4aab0bc6d0ceb7fef9f64d SHA512 1df1aec6eb7c1aa21f9fde7ff08160d3fa118518644ee9f669092a7226bdf54dddf9bcaf3c77a4cb5ed30239b31bf524f76d3e60713e60614505bf1c6fa4af7c
-DIST github.com-minio-sha256-simd-05b4dd3047e5d6e86cb4e0477164b850cd896261.tar.gz 64938 BLAKE2B 0e36ec0383b136b0471bfc71dfb5062c7cd1b1d0708f2f5a58ece02a45b819bcd3691d85f35c66ed8a90cb4d362b86182a185916fc29e0c16f39c602fb9894eb SHA512 36330af07ffec389c92f0769bf01188de7156f2d73eeedc03280a1b4000f3a0fed156737c3b1e6554579a7570f156dcd16f52a895b661da51628496221b9b593
-DIST github.com-minio-sio-035b4ef8c449ba2ba21ec143c91964e76a1fb68c.tar.gz 53790 BLAKE2B ab22baa995c78639aa8cf1d38b675dfb18c64534f2b48815187750ef4182d761fdedc7e12308a15fcbf27af98a1054f3a94f3891968d5766205bdf16fa71ee30 SHA512 7a154aba1ace8687ddb05719de1da2c60e451bb0a00a242560e2abb8c0ecc838771bf966cc8328be0a575e3a5b8b7366348aa14f9548d9b741dc7876077417ab
-DIST github.com-mitchellh-go-homedir-af06845cf3004701891bf4fdb884bfe4920b3727.tar.gz 3362 BLAKE2B 6b6381ba8b7bfa05b0ca04b8492d9f66d0a5c76c41db3476fd0f1fac01ff38f50465953b64f48b00859e28a5725feb056f3c1bfe1234376d00e2e37fd2d71a73 SHA512 049d31e1ebe03ad0f7312819414aefac9958cce3ef14704af32104af6140f31a62a23579a12bed80e8514147ec4a93bec8eaf0f8cba8cceaeecd05d577273b3a
-DIST github.com-modern-go-concurrent-bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94.tar.gz 7527 BLAKE2B fe191bd398bbd1beac3de9a69b54b04e01436347f0f8933b8eb189dcafaf3d68bb76d6d738f5532e5e9d8e1631ef4d3785a110b69856c4e11d811b80dc31f19c SHA512 bca1593dea7cd004a0191420ccad56cffb91bc5523434f50920ce25c2ee82dc6a756e2eefdcee94ae0bb403fea881e42bf403d6218d6169f30dc9288e72d1c36
-DIST github.com-modern-go-reflect2-94122c33edd36123c84d5368cfb2b69df93a0ec8.tar.gz 14404 BLAKE2B fcf261bf39415ab06f03df46887f6373386007cab1c439733039a00eee7f3d430323f1589b422c458435809c38039d4440a537845ed0e4d49193b1448cca63c8 SHA512 1e622f71b935169c463b2cdb970c6f9c142e746a40daf760430f6a24a1e938a905d84793a7ef241a32cfcd7cbeca701714b69791b2117c46fb90490c39fe1ecc
-DIST github.com-nats-io-go-nats-70fe06cee50d4b6f98248d9675fb55f2a3aa7228.tar.gz 121996 BLAKE2B 9e20eda1172c1f6ff5a57ebb2e7548f4c34af8f51e892bbea44802ac8a59e94169466dfa8abe393de35bf8f53603ca448a128d6ca040fa6d549a153701425a91 SHA512 ef643a3bd97e405ea95af44435997cd1c6c34136cb4e4507ebfbecd3f79c11beef205fff9cb61c5f99c995d21dbb69753edc6e66ef0026d936a6395ace84efb2
-DIST github.com-nats-io-go-nats-streaming-4366d43a0648b4997ed32080f937e8702ab86c48.tar.gz 47499 BLAKE2B 1b6d9979ff523cbeed728b3ad28c1a72f6ea5907c41111d4ff42addd7e1cc537b3362b0a4fd2a7c3509de0265857c2f3ed10a8f9187812ee20d40ee20cf6ce4e SHA512 3f9b9cad5b36571ef593adecb45d7fd6a83673e35a5e3d9e7b5e5ad67111e6403b547ec48bbfb3e0916440d12121e647cb9c758e2f16f094d07fd7df8b2d0c16
-DIST github.com-nats-io-nats-70fe06cee50d4b6f98248d9675fb55f2a3aa7228.tar.gz 121996 BLAKE2B 9e20eda1172c1f6ff5a57ebb2e7548f4c34af8f51e892bbea44802ac8a59e94169466dfa8abe393de35bf8f53603ca448a128d6ca040fa6d549a153701425a91 SHA512 ef643a3bd97e405ea95af44435997cd1c6c34136cb4e4507ebfbecd3f79c11beef205fff9cb61c5f99c995d21dbb69753edc6e66ef0026d936a6395ace84efb2
-DIST github.com-nats-io-nats.go-v1.8.0.tar.gz 123870 BLAKE2B da3744b45b8ac9f436c0d369c9939fb66450341c5521424ec1365d436531e239d44dadf8a267580730e66dfddd30be345a53a72b570ea3378624d6ad78f0e744 SHA512 35e871a0f435cf3bd936679c65377c348e254da98f9304f4a11b9771a531c2af261b4e11e3be83237d3819c08051528d4b4e61213cbb5f82d13aa55118c88f2e
-DIST github.com-nats-io-nkeys-1546a3320a8f195a5b5c84aef8309377c2e411d5.tar.gz 17271 BLAKE2B 28f276071c5b1921645522302c280ac13253be83e96818071762bc3401a8c8191912a80c6d85e4401fd14b26748eba80a913b3192d3ff8beb84ce7f9f5d2b856 SHA512 ba1dafde47a8a14278c985ef56e3e9c19a8d610135e3847e9c6a47477178db64c0ac41f7240a2afc95e7cd20a51cd08450cdddde8577f5b4abb891ef9db57d97
-DIST github.com-nats-io-nuid-3024a71c3cbe30667286099921591e6fcc328230.tar.gz 7533 BLAKE2B 8adf4385c7d2bbbaa22d7dd71436bcd17150e4c9db4579aef94b83cfa71ff053f3838b1de286ac61c1a6d1f8a9ac4cd7900e9032a53bf7b14e6b5327b4cedf9e SHA512 652c2f06153cf8c3e4ed5fa2338ddef3165f82cd21f27293327551aac2d03010fe736d0c2ec0ec8b3106c78b79f809e9a81cb1912eb01879bac53f87de70d028
-DIST github.com-nats-io-stan.go-v0.4.5.tar.gz 48729 BLAKE2B e329c8a684ffa506d60d920807b5b0a505259ff593762b535c4385d73ed5c467fc6d89c2ba22f74f713db204418d1ebc8c02c02196f9aa181e55c5cb5e9ac671 SHA512 d6b09f993787b6de1b64ab5bb9c9dc0c86692e113f72b8eb4d8987540d31910d5517d4a346a4ec0406cb65afdb72e2a73ebe92ce49fbbb3e3f6f18acff1c728a
-DIST github.com-ncw-directio-v1.0.5.tar.gz 3914 BLAKE2B 2cd6076537f2413a5ff2d1ce069769466fc8f1484392d8b185ccb9323f9779f43c2d7de00086bd8c703a5b26e7624a671b6a10d5a03acdd2a30ba6b32914e23f SHA512 9664c992282ead75050fbc828ea27e662be9c40d70b20da085434dd40b3844ba197b0bab0090f0aa22290eb3b90be6bdfed613ca3f1845a5db8246c8729f1a88
-DIST github.com-nsqio-go-nsq-eee57a3ac4174c55924125bb15eeeda8cffb6e6f.tar.gz 44818 BLAKE2B ab4e74b319f50708ecf95365873bf3b49a940716af731acf5467b845b5a9c92e9ccc8312f3ae54c3f63738101582448ad4d9293a2e9a1174f06376b1a3f7350a SHA512 93aa5fae0b51e8149728523df0393a12f8387b0c08417acaf3224b3ce61265f96bdfc5296a4add19f7eda5e5a2e4896830f959e1b30c299eacfc24dafa80d501
-DIST github.com-olivere-elastic-f72acaba629a7ec879103d17b7426a31bc38e199.tar.gz 314237 BLAKE2B 526186fd4a593708caf9b0ccf4cfb0efab6e883074238f6993d1f844c5de747ad3713fb95a6bd98810dafb7021a163207a24754e46ddaa52854ecbe7f9cb9451 SHA512 2c3c191189f6ebb28f4042aac921936bbfc08c2194c22986a6689aa26515b9b7eda51dfddab241c252bc8cc459119c63330b1ea827bc83886b6d388d3149db11
-DIST github.com-pierrec-lz4-315a67e90e415bcdaff33057da191569bf4d8479.tar.gz 7465869 BLAKE2B e5a15dae50a9499efe45303f69b9b343024b24b6fc1808324ce436b4b2b6a1960bc789204e30886b270bfbc990133ae8f455c00d6db628b1994beeb360ae766e SHA512 218766ef534f5409f93ef6a221493b295a0b89aafb5bf1ae072c68363a0d4b42ef32dca689e1ee143b769309795860d5de56dbb280edade4d9a8122662f11527
-DIST github.com-pkg-errors-ba968bfe8b2f7e042a574c888954fccecfa385b4.tar.gz 11015 BLAKE2B 6ac1c39b0dd047a40fbaced603295ebd957af6e91620e8a3aef64e922f733cf5573394cb8e1966e660e7cc1acdd485ced1cab473d46ef7578167495cd50db601 SHA512 73eaab1397cb5a8a0735edda27994b069f97486023ba95d8ee0d620d16c0b955f608365ad0cd46ec8ed59b4389c0b4320075ea0e28c8d63f7a62dcdf2251fc93
-DIST github.com-pkg-profile-f6fe06335df110bcf1ed6d4e852b760bfc15beee.tar.gz 5838 BLAKE2B dd40dd8ee0cd6b9c7f4d48a9cd4dfb351fb229bbb9dfdb7f1583eb950cf846f3000064dfb7df2766a7d65fc2e2bbcfa6e065ea0fbf8dd8f7911a534c08eb9919 SHA512 87249685beb8a5bbdf0b9761347ea1095ff67c7bbabf3f60f3b0eac49f607d138237dd21fe04680174666a12d135daa03261ca08bc348797ec2fc68ad6aad957
-DIST github.com-prometheus-client_golang-505eaef017263e299324067d40ca2c48f6a2cf50.tar.gz 130114 BLAKE2B df1149ebda18c7940ea35fbe09b08be6437a8d4c4f812e3b4b088da8a374718212f0b10a153f3e04a6ffbe0bac109a92e5eca8b95814d221cd6a01d5fcfd48c5 SHA512 27a3cd10256ba6784b2f1318919ad6ce9e2a15c029c18961cd760a7569d5c683097c7407478b2ec96852163a321cda854aba18b0a73e0dda836480d05451bd62
-DIST github.com-prometheus-client_model-fd36f4220a901265f90734c3183c5f0c91daa0b8.tar.gz 57542 BLAKE2B 16f73bf9a1dfde0dd3152e11ab4d3a49271209b02541951471664a1226c9211f1b77ef4a32faf3e184888b080d0c76e3d02d03e21d688399d7e3c14629df738f SHA512 bee4b4ffdb56633ac763dd624d03db5b0dae433e2a2d1e4ff925e34444d62cbdb879d68574c7f8133f11d718cce3bdc1d686508acfb470e7dea0109c98266b1d
-DIST github.com-prometheus-common-5df5c82edb7502fd6cbe093223a19b6e1231494f.tar.gz 97633 BLAKE2B e0457947dad793ab73480d65e93d06f50a01577b0cf00fbf0f56ade4b6c7a791c391ea4609ea0ad937242b7f07eeb3af8c1b0322158961d355927f940463cc77 SHA512 fdeb351e26dd89526485764f667253edf0e64b3c1a1e16150171e43d86080d1045bab0c057fe74360331d965310f1fe265463011a8bd89b8ffd27bd07e041b2c
-DIST github.com-prometheus-procfs-55ae3d9d557340b5bc24cd8aa5f6fa2c2ab31352.tar.gz 70986 BLAKE2B 8c0580381440197a9e6a50ac686ea7d9b134790786ce2175fb2b98288c9ae194585cae7650fee6a5d262439b01648d1aee494d2eb6183ff9edd33e6fb40e3880 SHA512 4d7e2576eba78643a806e25021e5d440a8a606e44a153428d99387a6dd8d3f745492818e0b46bc0ecf5fe834dbc781c94720f2d46af5a15a6a1d4ce5807077d6
-DIST github.com-rcrowley-go-metrics-3113b8401b8a98917cde58f8bbd42a1b1c03b1fd.tar.gz 36745 BLAKE2B f5313bdf8173c5ee0f0eb8a63b68d5a9c66c18b3a2164428200a599f12afd67af7ad1148766fdcc7d17601121f357d20afc707f57dab1f5d38a8c96e146d3521 SHA512 956bb23138464aa09045fc4927a5eb6d0ab53f93e89b8ffbbafde6ff0aff1a2ff80b302a98560d9b86ab7f6a845b1dc7bcdbc43ea4cd0e5ed4d712233af32eb9
-DIST github.com-rjeczalik-notify-69d839f37b13a8cb7a78366f7633a4071cb43be7.tar.gz 56861 BLAKE2B a9573260bbe408c7726992937cebb254e5f488e7b879c84efdf2103bd97bc7a21ab7acf80d565226680b8022a5dc1d4c3a2e8d85a6b139d39bf249eef94f2ddc SHA512 5723d8bcc40b34727167cfe8c4fb7ffdb45837885638c392078755240b0ae46de6243ff83530bafe379e332e2a6797412552ae8d2d0abbb3a00cb61ec122d876
-DIST github.com-rs-cors-9a47f48565a795472d43519dd49aac781f3034fb.tar.gz 12086 BLAKE2B 284fb8aa183977f2408e88daf44596d2660e66d8ab353d5154f4e7aa495a8da51825d257627491658a9112c39565cc88df56ab5309f7f3f1fecde840c0842e08 SHA512 3e6c12c17a0fc717b169ac09fb51d5ac2f60ceb2f1f5af9041f15d56918c4f9855ddadcc178b11610483492d939656295ac18ea9367cffc05a49ad81f56a15f1
-DIST github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz 8292 BLAKE2B 7969a5837c0155661feb9113e44b146be87d2ea163bb045e57b194bf3f3957e641a7ce1c1e2fe1c363b5df48c46257ccdf8665ac36dd5a0d3174179b2734d5ea SHA512 7d2cb0674f523a19ca3f1564ad9b8b363f4b8c1a0eddc848f9ae927696d3408d8aaf6e9149816be4d3f8e9e996dcda025223aba7dfe63e8f87f8bc822a5ce6a2
-DIST github.com-segmentio-go-prompt-f0d19b6901ade831d5a3204edc0d6a7d6457fbb2.tar.gz 1735 BLAKE2B 129b813439dc2c15e6ed6b74cabacf8f4d59f3301b1530788dd2f0da6add921780993f72d5292d22ada44ad1dedfa95c29b2505f33463e9afb85d86ddc64dcd6 SHA512 745223f0370248a9233fa1940bcae461c3810353876441b5d0a81fef021ec426611628debde6a41b1973d1f7c3d2dff1600b5180ebff97b121027734c0bce8e2
-DIST github.com-skyrings-skyring-common-d1c0bb1cbd5ed8438be1385c85c4f494608cde1e.tar.gz 2195796 BLAKE2B 141442d016912c250e1e8521502be6841fe62a1570c2f339add6ee47c81f4875381afeada6fd27e564a133853145d32ec024600b7f9c2764aef60a1a94b36c03 SHA512 25c68e3ea88deb873d82fc6b168795a737a27646d897256455bae59d4649a571faf0aa1053bf653136902bc461b66a358dc5afee0047b778c2a2b9375491a87b
-DIST github.com-streadway-amqp-14f78b41ce6da3d698c2ef2cc8c0ea7ce9e26688.tar.gz 88119 BLAKE2B 754a2827ed68bb3292cb88600e1e1a0b9b8cbef5cba4429a7ebcc9f56df9d26ae5e66f5b0e7b23a882a8837d9aaa79989db7f47044b114608bb9869ce3933e3b SHA512 b45a178d9fb82094ec478a95b83c835363faa44fda4b75d606b47e900c321c86160892955ac60cf085f8c3b865668d737287eb220c066ca85ee7f9744bc416ba
-DIST github.com-tidwall-gjson-eee0b6226f0d1db2675a176fdfaa8419bcad4ca8.tar.gz 43193 BLAKE2B d8b3e59a7d17998ab50bb03c5c70a3fa06d8c52b8cc87c33a8397e1a7e2d45ec1242fda6b6060f82389c53350b1f7deb2ae01aab7328033e14fd5244aa91de89 SHA512 02dc20ad73431c688b4dec492e4015dd94a0d2dad7b16fe9c05ac537da47cf9f74713d1802bb4095721b20e8d7cfc669b1ab720993c776bc4513338e8ea074b5
-DIST github.com-tidwall-match-33827db735fff6510490d69a8622612558a557ed.tar.gz 4367 BLAKE2B f3f818845cf29b9800d370ed6dab67123fc1a45e52fa3aee4f80ddc728559da61864f9e72c6f402b9dc6b0e6d67370f88bcca26ec7a481f8ed1d43706f880ec8 SHA512 357e4a22c8b796169e901e73b5e783fde6b7ec2f2954cc2da6cd75f4c3bef46ff58d57eb03ea07267e6951e313ca54246448ffb64398889c9e72e56d78097767
-DIST github.com-tidwall-pretty-1166b9ac2b65e46a43d8618d30d1554f4652d49b.tar.gz 8823 BLAKE2B 6470a0221efb65e13d22e7cb8c5c5e43065d2980511b3972e22dfedb77b374879e4be055cae64fe9e95ca7dd0fc89c99159dd49651d43db8466f0b18e8128f4e SHA512 3a3820a4029a310e69d997dcd2a378fae2e8c0c0f76c9e2eef87bf43754832999ab4dc4c506a75e3b788ff855842b62fde8b1782ea7259a6c640a0de99a3921f
-DIST github.com-tidwall-sjson-25fb082a20e29e83fb7b7ef5f5919166aad1f084.tar.gz 26764 BLAKE2B 1756704c32c465c7368f7947ec0c7f257dcc007a0a4eaa3b18c3a3dbcebc5bd952d128dd92010bb04a4ad55a0a1e2e3e3c6524bd18ef082671d39fb9225eb0b6 SHA512 314d63ad24d9b5c4133f8a2f603a19e09f73958a61c8b10b758f760825a411fd478ab47a1fa0e95c1c5156e7b2aa0ad611ba2ca91bf0b10f6bf2b9608bbc8f4a
-DIST github.com-uber-go-atomic-1ea20fb1cbb1cc08cbd0d913a96dead89aa18289.tar.gz 8055 BLAKE2B 89cd909922bf9e565cd01e86b5970dfd55e0f4cbb3109ac052080013aa9a1dfef79761b5f3e08f6c2f2fe1cbcc99d7148e129461b7f95e266ff8253b38124732 SHA512 1455ebfeb0457da779eda76de3bdd5ef8aa18aa440563b3933d2013bff5b3742f245dd396cc9e93bbb343d166d048877b192b159b23b41c630128ac2e2ab26a5
-DIST github.com-valyala-tcplisten-ceec8f93295a060cdb565ec25e4ccf17941dbd55.tar.gz 4579 BLAKE2B d1c4bdac60073d25e0d953c2f48820c72e0da13b730f439abff498ff9fe09165ee006b021df4d6c925e9d364f5565025dd0fb8f10cad20d16db3e14aa32ddafd SHA512 69f9afd7e71c9dabb851b2592f99d565d83be9dea2ff55ee0208401debf6445e92d74973079f369d4028c64bcf6e9156a9144ba536cef8b6f72685762f28197e
-DIST minio-2019.09.11.19.53.16.tar.gz 6957333 BLAKE2B a4641d6ebc0c12304919ccc3fe81a7260f47e3e2604ddfc9432dc0ab0be1f00239cabe44374ff9db3fecf2184c54b9f9dd09231dc4337b1753bfd664583f35aa SHA512 c2b9d307b6d6b2a036a581b847b0b4dbd716b411307a917c003dc4519c306f692cb256462cee84d33ec2338331a0f8439f78080d3699fdeec9e3502feb19f79a
-EBUILD minio-2019.09.11.19.53.16.ebuild 12116 BLAKE2B 239142529bbce69eb1944e1b231f577198acaf6e8f596605f7da85b62f4c5be110fcfa4cacb87079591e5a72dd42176e6f86db306906ac208eb42fbc4f7cd028 SHA512 ee7b600ed56a0370fbefe3f441d2047a0d752b01ef7a953f6e17b570793b30af21dd762a7c6c08a61ecbdbb06d246c0b74e8add997bb76ba0414483e3ed08607
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.39.0.mod 1059 BLAKE2B 175c6f53a17c785d18eef838f35553aeb65463c35c4c56f617be30971ff9196d6642629eb71abf95ce39c4d5f6b1dd93b3e21c1f71f901e7a5c6eaf655b0aeab SHA512 8c0fbd092acafa28279d7255079d433968960cc57cffc36d69df114e9f9e87ba06e3dbf4f39fb5bd8ff60c46be965a6d3a74fc680a12fe45b935613537399333
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.39.0.zip 2869565 BLAKE2B 8bdffe82920f768d148425fc6e4c469253958a4074f991f3343b8ad8cbe186ea25f03ea273f88154f25c3122bd90c656e994768cd9d0ced3b31df18c653e3f3a SHA512 ebcdc77d1a5e1554a3c95653fbe3b09accb1b75f69d7112733e44f60d84b427cc613812de4032fde7c7f5d6c2234d55c28bc941e1726312c32668a6daa2d11fa
+DIST contrib.go.opencensus.io%2Fexporter%2Focagent%2F@v%2Fv0.5.0.mod 385 BLAKE2B 9ca5a2f59466ce7e941aa1122ebacc246a98f50db7fa8c406ab4a9308bf277a5ff6bcbd2842d48f718960b31c45e883b5fb43715b44aa2465d37461f61773662 SHA512 07802584c237452afeb6210ba1a7ca189b7bc550b7554490a89e5edc18cd3dc575ab3be6063fa981214d6824dc8327435b34b0c09188db8a563b9bae42fea1ba
+DIST contrib.go.opencensus.io%2Fexporter%2Focagent%2F@v%2Fv0.5.0.zip 46829 BLAKE2B f2de952c0919d4a0ec5e85b50a51d007c47a3ff7370143d64d8711fca0c6d39e5aed86fd3beb00a5ee50a5e64192264c9f592b75bbd4309efc55fcf4535c086f SHA512 6fe3a2cd663c8a0b7ac016888f467921b7d9cd3bf6bacb80b8617f83de7ca47ee1d0eefb52f47d54d47949ec0063723d27e3cbaeca054d1e58e782f698c5132a
+DIST git.apache.org%2Fthrift.git%2F@v%2Fv0.13.0.mod 33 BLAKE2B 1876ea8756f905511c9bb18327d11e071b5595ca315e60fbb613b2bf441656e4bbb304198aa3937240a9641f51c147ab61701c6bc39978583147ebd4e62f2627 SHA512 20958dd7849b90732d66ff46316a8e234839491c7bb2688c59f9c755ea7458d810a345362d0145c9e4c15311f0d999b030a7ba53dac7266ab7b95b926de6302c
+DIST git.apache.org%2Fthrift.git%2F@v%2Fv0.13.0.zip 5223616 BLAKE2B 75cbc8d765c4fc1bf7e9ff482befadd3b719ecd5d8620e4c6c08657935003cb617be2fea4b34e0f6c4d42aff6ebb1c53621ca84440bb9cdf9c44b36b4dbb8241 SHA512 597d393fc729cf5e73c8357a0224f47fcd021778e3abe323449bea471ec40444b7fb25aef5cdf5e76bbfd18d04d3e130aa62f5caefb095b8e845f0542b57bda1
+DIST github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.1.mod 114 BLAKE2B 076d15a6625743dbc5baa1feb35668127bd5f390b60c80f044162dc587771709b6c41f91bb862110a120a90d5279944257b673fb39030e629992c80a822e565c SHA512 f3656f04c653b5651210e048b1663ed87b8899e4af6d2ccd0d3ed4ad97abe511d61e8b1f9a68582ffd49eb6b6e81c31ce955ffe79ab398836cb6fd5e37147a0e
+DIST github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.1.zip 22164 BLAKE2B 37b8599d82a3f7b5cb43819c0fe424fcf55c5343f7738abf55fd855a133770f94fd98e7c5501c7d8f689f656d8ef38a2a28e56229f618cc66fcd7d308c021b0e SHA512 dd83c0e73f32a6370607e302d4b1a8c40c77d8e9829ceafaa290895b9a0b9973eb1363579f9fbe92a1ca21ae92b677e92e5021450636f3b5ef79b15012387740
+DIST github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.8.0.mod 197 BLAKE2B 292675e0016ac7235c23e13b7f5bb9ee8a3af41adcdb31af53c8b733962ee909064f6426ba721a42ded4b51965d5a3a526c0fa1789785c19e20eeb3cbd0206cf SHA512 20d76c44feef7ec31f420ee199da84f4c22f6376dd0099cae7bfa542f9836ccc32b63d6dac44bf58066049860cb9b33ce13e6c116763df09d466a52a767e8167
+DIST github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.8.0.zip 217387 BLAKE2B f5b64d682b267b9e125439aeec2d237382a6cedd435989b758ae9a14838b73ac910a33b51dfa3303ace231957633472ed017efb580a12bf7d92f7658e03328a6 SHA512 fc254a8019b72ae8c0b2ee22bd09fd72c4243d6974ffc851d1d3faf36a9f49affea0039ff9b716c401f4040baaad3be9551680e49d4380f10a8407f5ef35482e
+DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv11.7.1+incompatible.mod 36 BLAKE2B 71643bf27cc23617d54777e18c77d9015af83e9e9c1ec846c333d91760e70e57e51e3b9fb0b6ec8bae5140893237ae6f08bfd6a50b452145d6bd635a4abfec12 SHA512 d7c80a07fa3633acb681d54fae5743c6aab0d5f1f9e1edc3f7037a7abcf12c5536c524e856f9ea3d876b2b0fdf2884fa307ed16fd9758aba17a3d28766df1377
+DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv11.7.1+incompatible.zip 195656 BLAKE2B c717102a77f6205a05ef3ef3e74ff15eeb1b8ae689e8e6ba51b2a79cf87d3389a31b153287cdee8bccd008101ee731a43e024126abf4316aab7a0f7533271fab SHA512 e4c69efea6417be28bbb3d7e5ce0c76ed2f01b69c0d9836699e68cc45a0ef92eddf87e5c4671bbd76586fbe2b8cad2bb5e6be0dc2bd2365a47bd668655f1b099
+DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
+DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
+DIST github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod 37 BLAKE2B 74a94066231395cbd85f1dbbb68408161ef74781c0c686746f97365dceb3ca69e3b924a86e6639b5e4cbcf64928fa21245e6828339105a779a86bc4f132a5bf5 SHA512 da3a3499834784b7ace8158659956206fdb113000fdc84d54b6525805727e37029bdcf263afcbabe724d8b10f6601f1f38a985e6ac10fd0466907ae56da3edd7
+DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
+DIST github.com%2F!shopify%2Fsarama%2F@v%2Fv1.24.1.mod 1188 BLAKE2B bd52cd2d49c856181228f7d2500d6457befd145e5f5e69d1ee4e939c07cd436d4e94b1d6d7ec2cf7f371683daa69f89e06afd70f3a7d8205141cc934b61a695d SHA512 7afc6074fc64dd861b1fed922c2a89b7b75fd35a3b6af51c073152aa4097782f47f6b2c986b9e92e55c30e7bbff68ac176d478a6b1743df6e54b68c3715e7c7b
+DIST github.com%2F!shopify%2Fsarama%2F@v%2Fv1.24.1.zip 354212 BLAKE2B d04f32b81fa91096a54e672119fa1b88c557198af871ed0a9253b83aebe42665607953788f2fd8990247f31976ac6ecec19e6491b1c059477c00d7014ca6c736 SHA512 721dc8a6eb0475d0947b30b2b0b78362c5dbb86bcc339153de1d64a4d97feec86ddd8475387859c77c197f6a10a5c4f60a4268f66f9026fb42bcd05d13014ef4
+DIST github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod 36 BLAKE2B af7b84d9f1cd163555b32bcf960b28b64a5689a1c9694f430af310f5041cd967fcf0d6c1a6c4020478544d347e4ba5b2fd16a6ef54258d33314ee0ad9239752c SHA512 917ada7ac198a013d2b090dfc59a45bd2619dcb7227df1521ca38a0d822fab12ea8c158c526257fef4ef506af29d9fa678e8dc2a73fc13c8dfeb57b398801744
+DIST github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.zip 64188 BLAKE2B 8a83e77b1720a9c4d2004f8f8c14fbb8208687f54a5f4f09dda758c2516c0d907a5734c2a8d566b0461810899cc8e0877819612cd2d715220ac9da21d9cb4970 SHA512 89d7b18a1eda0e215851b894ed019d27cb302650ad12eb07edeb49e663ac0910be41a0e4281e1e9b7c1ff2948a74e174d47ae5dbd7956e946c7d3c72633d0a24
+DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod 36 BLAKE2B e15c1ef74374320cc49b3509a1fa8d7f63c8566920ba56f8b6f293e3d331f5587d45b35284af52b40f329e116f570543a7df50ab1888c4238b28c2ea583d2fda SHA512 83f296ee872570bab84dc3e3f7984f155f5a9a4f95ca7b23a5f39dd47b54eb87ceb2eaa4db00a3966def5b41fb0250de18bcde32610c350206b6d0e744353fd7
+DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip 14905 BLAKE2B 9aa626472e6bebbcb1d454f892ebf3c5f953ccf952e6ca7e60715211d418ab9c8d54832f9949824702278cd753758425dda72867e61ece209da688196d13d2ef SHA512 82818b2eb7e8f7265b814f202c420e5a187fd5e9a43536a062715e1a3d1d5717acc8d2daeb1f678dd13bf5703545309ad9d4b4e78fbb6e9befd9bb7370ddaa3b
+DIST github.com%2Falecthomas%2Fparticiple%2F@v%2Fv0.2.1.mod 186 BLAKE2B 2f103cfdbc92ad8995a4b0f65d00b3e6c838c281943acf433188d05b7061a49f8e1c1b9b83dfe4978ab1c0dc38d8e668c5661d54c25303b8d1f826916f0886cd SHA512 e024918d6f12265f3a67659ea7b2abf5a1b0e1aeabd855b1d0b132434ed65b9eef433cf11a57d53c843d0d2d1adcca3c3dc35e607255498d1aea850eaff65a9d
+DIST github.com%2Falecthomas%2Fparticiple%2F@v%2Fv0.2.1.zip 78171 BLAKE2B 8e39c20844aee590e5dff6f3bb7ddf55ce2bfb07feb76921e8bad24948bdd7819bdf852ff12c81d50c17738e3507b92417147da9273cb167072f9498bda16fa8 SHA512 a451064e4a55f5e7b16e2f489cf179425bab07997c7990abff1e27301b3b471324753d9026c05c876563725370ca00f67c4b012631009afb641ccf2209064874
+DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod 35 BLAKE2B 97d3ccde6ba4ad06a5344183f954cd6dfea580673607a6d54f1c0f3a643aee512bbe5fe7bdbc22629e6ffeb58f70422b9b80577d70fb58db9b03ababc0552ba5 SHA512 fe8dfbec1d09d7da5829af43760a4ddb5495b6a63eeb76fb3758aeb2fcf83d83ea443a15789d7042a0f5e637664babc9c388dbebc63ff7d35fb9545c7c7da991
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod 582 BLAKE2B 92aab40d86d733eb8f751fb23e40621b5b3bbfbd8b1d194bc6e689b6df763b4030aa83ab78654dc8e536274af6de247b8fc7e4e35e6cbf2f6fb5532291deec6b SHA512 aa43d2e262a603661ac3dc7aef111aea6e348e11c5384840d2be06224a6c2c580fcc0e3c6645a0d48b48826b0aff92562f0c6504eae980ff5610d2ffd2255d88
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.zip 41353 BLAKE2B 850ec7d356246c8b47c8594aaba8db95d979ca7fb50b383ec02c6802faf089bb170ea7e86f7e1fe8f95fbed4208c6f39c307871d74b8052de5ccd9d6ae29d49e SHA512 b533a51ecc7709cb74da88cd3dea70b3605e75a88b93d16aca5aafa100352002f5b1c1c6d9c33d6c93ce74663d27b7cf82c8fa8db7aadca4d42e8a7f6354f78e
+DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.20.21.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.20.21.zip 12788780 BLAKE2B de8c673c381551e230577d7bb4285e99bb4fdb91307532d92d3c03317b1beabdae97d87bddaa81bf19b15136ffc1167745b69c49870d7403315d2d53bbbeb945 SHA512 5d340683a6f2d8201e605df0e7421aa2c2387a2ff84034bffa5497415ad5fde148f80296838215296a8bd99f6ebeba46695548d603ef1b38da9ccdaa651ff83d
+DIST github.com%2Fbcicen%2Fjstream%2F@v%2Fv0.0.0-20190220045926-16c1f8af81c2.mod 33 BLAKE2B eafb7b318575f7736aa30225ca607a97a2332fbb460e086cd64de39dc03d7d9861b26c08b87b4d7426c932155018499ffbfc429301adae2ea56cdc1d5e7d3b5f SHA512 00a36a293b11b2fc111c233d9a75aab3c2ec9bbf19a3c36fb14501a4eeee28fe5af38c401b3cf387f19bf020d1cf0b446d4c0bc52cdef17cec4f3a1d2c250681
+DIST github.com%2Fbcicen%2Fjstream%2F@v%2Fv0.0.0-20190220045926-16c1f8af81c2.zip 44658 BLAKE2B fe37ab0b2755216c24dedea02aa0ffe18fdfaec39d77cc550e21e6393ffd920b7640323403041f5ecde0d74b9bc7552f12d83b1ebb19431e87b961828eced777 SHA512 5f174c40650f73afbdbaa50a7938674c15e34bd46adb8693a75f82de8efa2f4782de2415bdc4a77f8e67f36b71b4cc0831ebdc0c2ae960f5e1ab7b712b3344af
+DIST github.com%2Fbeevik%2Fntp%2F@v%2Fv0.2.0.mod 29 BLAKE2B 2cd8f3f958233f3ee3f401e4a6f88f2b95a92b4fc5d4e3344b6ffda16a871404df12be2dd74adeab98ce56dbf0e5b6356b192bf4e4da8a8b8c9f7114cec1d67d SHA512 61e8247ad30d3ddbf9df93e5ab07644a17e28f4d5e4797fe98d0c4355f886cda7bc9bd9adfeb95ad4ba6d8d4376938e094000994608d2680f6e8f2e836ae99fa
+DIST github.com%2Fbeevik%2Fntp%2F@v%2Fv0.2.0.zip 13074 BLAKE2B cfbba180752f89e3d9f2b6e5406dd011bb3a4883334aea04443f13267ab2c167340bf74892fa3a556a2ca7ffec81095414b9bd4fd8d54614a7ee2aca1e576dcc SHA512 5baf4e06be6d971d2e815ddc52e999d950a49ff097e084e9bccccf31bb01b9da46f8efe3fdcd5a5ae27aabb8c4ef875a8ae9d9f413835b2c700c2b474ebb04f0
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip 15013 BLAKE2B daecbcbb12a60a1423c4f419db44a0d63108fe622cf843593abb16fd75dcea703b3cf56f1c13433959eccbfb2a9bd5640f837f4be3296220366438dd7ed04f86 SHA512 44ccb3d6134742a80ac15830613c169d1b0d43e6ce40c2f2fdea07203bec134e1ba80dc57c6d14a007014ea141dca311b3ebe61b12d2181311665a9ffe83ca39
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod 40 BLAKE2B ce42c81a7dcb03d21a99d6240ce12f8455297722513497b1a75f2c848b5fb7ef70b577c2406638442f16beedd68806de890a5c299cf1c008c439df23df2f5bb1 SHA512 ec4424da8e1e3849408da7bfe83d37e21ac75edb889de8ef63be897d59678679b018f4606be78500952e7eee73a6252ee6e477b1a1612e2d036dbf72c17b9c9b
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.zip 14678 BLAKE2B 3f95d78aa356a314f8da501f8085a880201766e184abb6c222c45e09c0c3b5e1e1eb7b89cc8ed46b77b09be8860fdf3e28525d9a451964ad64a96c6ee848a41d SHA512 be60a4c8059a9cb07ceb12e079b1224b6f871ecb1d7953906ab303cfe86d00cb979e203299f00fe828b2f6d2a3f5d55814c50809e9b872ab6d96db73f3771498
+DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod 36 BLAKE2B ad3bb22bde28277f26a819b093ab7392da57c027bfb91bbbab4686d225ddc4e239c0905f6eec64cda2fd47746bd625682f663a11007bdbbf64f9cbff7dd1de76 SHA512 f961ced2c3e902be60fb862fff6b1c4457c57bd7586375a18857863be63d9b3ea998b05fc0c9c3a7270387e9907861d6f9d6ce4024643ec84ea6a63e59e915c1
+DIST github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod 30 BLAKE2B bf7d457fdd333781e403b93aac891f5a0a8e202c62983ec6e34ab559ea5624c3e6cc525416fe400c7a0af20a3f647b49eac5717aa749d9ff79b02fe994c36d42 SHA512 7a1ef7d0fc6d5a3a8530b44dd5aa23d4248d952fd573b9f0f6f630b1bc38fa5c9c65ecc4894734c7115a8a0c7c71e8d0e2da0773ed4c5779c23f7f294e1e7d5f
+DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.0.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
+DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.0.zip 149879 BLAKE2B 64c709af016bc93ac6a7893de3fbd247c1ad637165363a2e20899920ea19d7538aa4731f33df084a4692994239ebce9ff50aa0c569d2ede5d578f976aaeae9df SHA512 595d8528806fb254f8020a29cb45d9c89e0bb9069a79b72bd00169f4c0f522ddf3f3c99719f3d0607a5ab49fa8b1e9613cd25020f67db89c440ecedcae2cc1a7
+DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae253ffa106eafea277fd947fc0f28e6962e461283ce2267d992b85b1f0eb9074a90009d8ed1d47f9e1f3e03cfc0eb7ad7df104282cfd144cc12a SHA512 32c34a590e6c113a16700ef2faa5124ebb6c8773cd76594312157bd2b70d54cd939ff2c32fac47421b5615e804142cb7b393394d4745d5894f9b68392bc37ad9
+DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip 12221 BLAKE2B ea2f826b4582ec60f51c65783408df0e065d2a752d1cba17aaf277e0c2b48779a3bf3579982dcc26e5566c899c3f933e4c711d2f1e01c98c13e73d46fa08baad SHA512 09432cff34f69e9b0cc6f0d5bb9af376efccb85ab4396c14a4e0c072272f3172a93c240c5ae0aa89eab91799d1bed1a0e7e00ba83682843f46344c9e2fc2d4b6
+DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod 45 BLAKE2B 350e937e3f7b254b5c590445a9a7f7cc908daa2a5f208e293ac414d50b46bd29671bb483e55daeedca41d70a42fdcc62ce17fffd9992a932e29153ab6ca1168e SHA512 c1b9f572957bc4ed1ad0c61d22b7b5d6a4c863df2aaeb4cf914e304af21d949c9cfc53dc8eb67aacdf3dd56f339ee6f4a1f5fa464121d9db79b7b3febfb3251b
+DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip 12031 BLAKE2B 47bd92ee66282b671cdfea60969710e371540e79b3c1e2f510380e3dbbfe40ff76be23ab48f44855b1cbbbed7cdbfc4f1ea21bc4bd7a37716de7c27a7ef81329 SHA512 dc5efd476875fe3cfb3c5f5ce9314920bb2175be85fd1a4667faddee1b5360113b66bdc2f17e4fe889a7d104d684558744bdc6c56c8ac3afc585d7aad0114486
+DIST github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.28.mod 30 BLAKE2B 28acd3b42d1340d8d698f68c95a7e0cd563e5946e5806288ff0273f9b8123f7980e2e81dc5e137ba0b642043990cc2ab16f834ec23b6347a2913805ae2ff2d3a SHA512 b2edbb00ffd0bb0ca877e262d602a219bd31aa4104757bb53711bb0d47e37305e38c85be5d309844dcada4d24a05bb3c12a49b4411aa4c824acb8a83b452a9a9
+DIST github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.28.zip 18076 BLAKE2B 2d62acbd3a2b0980e3ebaa96ee0dde66beb88678a2087cedcc2c95cbd0f44616c996e074e83fb1d8f2f4d96271e669b93a0f427074de3438fc86b28501714a41 SHA512 3956ecebbc40adafcb5c1cebc527809e709411c8e6e1c4d6f633fa9d531641f95b6e48f2a206ff7cfb4522a3c5406ca5108e2c0efbfac7be922db99176542ce6
+DIST github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod 51 BLAKE2B 3d0af1f8d7979de88067539579b73ce3d5d81a477ff042831692c738e9b4c99de13a3beb20fde003df06145e26d472621a2ff2857fd584aa1527df3730fc5efd SHA512 d1c83d2dbd4e242bfa9d8b9b58cddbd4a1ad112d1f5d1ca757fc31c6a31bf460d08cc3c9bf14c977fa74d2099ec83d5e45c05fd6121f800e26da6a837d862ccd
+DIST github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod 47 BLAKE2B ef512f7530c4c3fc3319129afa2fdb655d40af9aca697d22e4470528cc41ef9dd5ffea2258792d0efc7e1e5de2de2fe760651df84c3d39989c4d96b58e85371c SHA512 027b177fb04d5bcfaa0e524e6682b639bd91f7aad9ba14e22cc1b4f352e2c3bcd4d93348ed013cd839eccdb01449db40170243e7895c2cfa3f6980279faf39e3
+DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
+DIST github.com%2Fcolinmarc%2Fhdfs%2Fv2%2F@v%2Fv2.1.1.mod 811 BLAKE2B d3b30aaaa8125257b509be19a94497f49a87b3e95596a23c78a5616a2d2506d48f6d1b86de2728d28005a8f4dcf4cdcc2b72982b56ddce48911e4ecbeafd2ed8 SHA512 58311e25a80c04017f9792718f7acffe603d72868978459949bfaf71a9bc0b0d3ed7d0788ee8234e761aa57c7b544e3bf468d4d72964d0b5ba8ac505a81a8081
+DIST github.com%2Fcolinmarc%2Fhdfs%2Fv2%2F@v%2Fv2.1.1.zip 757592 BLAKE2B 255749492682e35f56af07bdb658498792b18d6f6333ccebcfb79de83702490f0e127a37ba9ba7297d3285c27f2574f0fce1528c0c60e88ee273afad39689e1e SHA512 f41d47fbf15e51afbd0c340677fb00564c338ac6aa1d0e6d2eb535980119a6373fbf346fbe2b2d479c4d3f0c2e84fd5035181190745c90df13bb2b2eb0ab8778
+DIST github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.4.0.mod 34 BLAKE2B 5f659e02eb0784f23fe0fad723264f2f4ac4e6e9fca2ee0ff6506942de9e4151f91cf7a2f765cd5c3e163043aa649d350404d9240b5dbfb8a9b56eeecfd0e248 SHA512 b61915bf1e9b8a68c240220d89dcb923bb7db6d61cd155a81530daa0316ea03c1e4ad2571725907b4fdbd4603c3ce80ea6752f38a029168aa4077e5fd3b27231
+DIST github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.4.0.zip 686651 BLAKE2B faeb01fdc225354d6e01c5bba22b9fb6ce93655acaccdf3ee719288f61d261d141b910704397296b936f01496ae08122ba3d8ed6c4286a3c7e8a4741333beace SHA512 0351196993988d3bcda796b982ff62b881e0e986520b6c9b3453ca326b484517ca35cc115b123914fb8fee8f0eea1f1dc7c7ff5a1cfa15428c00332da561d8b7
+DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.3.mod 31 BLAKE2B 7bbb809c199d39bac173751c3dc21b23ee8b020f20b4447c33681469b5083c64e74f699fa8d3dd55446b76ed44fc0949337303a776efeed90a764af1d751c8a4 SHA512 12f6b0e7090b257656ee9068083207fdd1b6d9f0b27546cb5b3a5a520e5944f3eccb8f6dd644a17e1089bbf787fd26b3e83eb0f0353071c8c4ef23ca99bc6251
+DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.3.zip 113037 BLAKE2B 2f0be7ae1e384148a262492425cdfc8540020ec2000dc802d053bb19312441cc0350ced5dde82503914309e7cc6b8ef0629f31585d38a5690a7c2672a7572aa6 SHA512 5ce2d4bfd2cc84fb37ae0a300c14cd3f10da5e65e457ea4d4b96cfa334d434e01397bc08be6bfe92336fcbe11d97172b1cf218ea85761e7dd12e5e3b3d47f3f0
+DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.12+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
+DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.12+incompatible.zip 2350874 BLAKE2B ddef276e3987447c077754359d99c36050d041cc367b988baea520bd7f8c5b6879aa8605b760c4a10ffa17eb291ad37b93a26ae3326184e4ed0ecd26bdbe9a9c SHA512 8765d8210e1935e32963e2082c9573674af47251051af9598e799aa17e6f11b87325895749ae3df0655d2b4cb9f59467f51ab05dca21ae713d70ee96abbfc937
+DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
+DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.zip 13848 BLAKE2B dc2ec3bf79baaafad410ac2b4625dbc1c520803659b480c2014ffef484d409135ea5d09035669457162457962dc6b3532a480893f399b876810fbc1adfdab8e2 SHA512 918009558869443193fed748b3cc807dbfc540967d60e0315c74c6a09324d7d783067e0f21c5461ebadcdec3c7e6417522565a00e33617af8a8168281a0040c3
+DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
+DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip 109838 BLAKE2B 82e02c44f4fa60aa7257b79e385af47e23508e260415f0f768e4f7aac6a5962c713488458a50f1bc98308446ee3f45de973d5240811dc5a113e5b9577f33bab3 SHA512 7acd6ca00d067e6a81fbb12697ae9d46fa9880834934065549bb23671153012a8596d4c7875705578ca58a259ff81b1165e45aa65c93406d2c324c61954ea4df
+DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
+DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.zip 57782 BLAKE2B cdd50ecc0cbd0c7e58f3e6ff91cd26f7a212f4f62cb10358e1729b6b8be346390f1659ec7443a0c48f280c4a499f399b3ab3c03ba897ba8a7a61c336ff6f7c29 SHA512 e0ac39873cc584e40df505c3c01d20771d3a5e06f1c2c78a046971a220f029795b4cce7da71b497bfb618c0159897640c6606a4bd0d446826b142430f7f66204
+DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod 39 BLAKE2B 71e70b038748ac19649698b1c0e59af99ce0b1c5d7c9177e8c55751eea9e82d4828b27dabb17cc04978142c9fb7a54d90c062a7cc3fdbb86116034026e40baf6 SHA512 9cf1687520933d3d6bbec9d7c51472998d3bdbe1b3d2a7478fca80f9e7944f9040a2b8ec7d49f1458bd46a5121bae4810d314725add41efd413319a5006b944a
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
+DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
+DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip 57069 BLAKE2B 2c921bf5a88bf293a4c86bbaed6d7c391a323cf3ac39a54ac10fb74da5498e0f565db5e5220a9871ad5c4dedad7eacc0657ad9f8907c2bfccf147384b53b37b9 SHA512 c937c8b98196eb8496735410324a6a845e618d47e4631c500c9def70d8effb27cfb4efb17f81a8d304ce1a9d27fa6fbcfdec11ea10355de3d1918f1ddeef81d2
+DIST github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod 35 BLAKE2B 8f9b63ec3e5f70db4f7f0185a03aee0608efdaf267377c48bc0e1aa6c37d431119d6e422c8e7c9bd93f0819796ca0aac423804ff0acdd49458265dc37e9d439e SHA512 2b6a3774801edff4f0b3fd40ae8e5396782e796e36b02b4d2f34e5dcce19d2f064a7a8d0787a9cb994b9208acf39b466f291525cf6f459ecd7c45d947dfba50e
+DIST github.com%2Fdjherbis%2Fatime%2F@v%2Fv1.0.0.mod 33 BLAKE2B 6617de64a12781a405c30d930006a76e3f38b9ff659d912f7d1e73b3f5878729d23cf6298ec046d0e6a5b65ebd6590d143b40158a548fe54c4a7ec2ec9c4a1ba SHA512 eb3b2499b79cbb35734feb2b9d9b846a358d53f3e4e0209d252478b07d62a68661891c19ed7a91b2bae13e2592c15833d22259f88d303ebf03a8a606313997a1
+DIST github.com%2Fdjherbis%2Fatime%2F@v%2Fv1.0.0.zip 7936 BLAKE2B 82157baf9a3fe3e772b390f0f5f2c668634b9444ece623587140e779f80dedb5d1b4d1b861da4ee18189df394dff8150cbfa6e610dd0711b85d6031d78d53985 SHA512 59d30a31452d7c1d6a1a0ab1aedfafb06225abf77846d8eb8ac4f46f4ab6a72498773c5dd5c41fa37f5a83eddbdbbabd893115cf358c5d7be4c0c7602a4b6fd8
+DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
+DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip 26356 BLAKE2B 665fb778605fc05dc686b59a3ad82a6df9020017243cc84498e4113c7b18343507a0084cd67febc329fa6b44e675696f99f632cd282ead5bb06f93ff3bd50bea SHA512 88e19d0139de7de602272e14586a99eda26b2867ea60ef56b517d13b37c0d28b1ab62c05b2f9cf1a9b8dcc8e5afa9c915baf7a30b0f17c4fbd47d5c71d0a3965
+DIST github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod 40 BLAKE2B 9300f3006801602e05416487e6021123ff345e36835b5f4841158bc87556afa086470218c3f2178d125baae065c1af3cb27e210a50173a5bc9a469c592758eb6 SHA512 fb616884898669f21d53576f0fb70c8babc38bb98da066a2cb77fa85ceab6bcc8775feea3d3bcec19ea3b25544c776b8d55ad82f8876da5d0ed5176768da735f
+DIST github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.2.0.mod 40 BLAKE2B 9300f3006801602e05416487e6021123ff345e36835b5f4841158bc87556afa086470218c3f2178d125baae065c1af3cb27e210a50173a5bc9a469c592758eb6 SHA512 fb616884898669f21d53576f0fb70c8babc38bb98da066a2cb77fa85ceab6bcc8775feea3d3bcec19ea3b25544c776b8d55ad82f8876da5d0ed5176768da735f
+DIST github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.2.0.zip 18643 BLAKE2B 193af083e7191c5003e7668f0f35ce83b40e04642f02337ff5194a60b654d0e9f0776355ced676f8c6482a2b006026380a989e9724b2c7d8a965c863daae8798 SHA512 a5093016b6559c7297cbbca1abd3b7e50ff34a9f57ddbc383a0141a04943a5e4784a54e44d0e722fe2ac011cb9d8bd4aa954b758ff1951fc99a8b7c5ad2a36a0
+DIST github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod 43 BLAKE2B 500b3a85f43db1d61f037f437b3290888204aef8b80aabf42d70c37607fdac86e8b1f7f4e41ad3709ad7015a78b934ed7d6d254522eb3e2baba4ae24619ea4d2 SHA512 da87f8eea5497796badaa6bdd1c67ae04e75deb7595f10739f30f20364f22e588a449aacf603f2c8d738b365ac14211c7cfe8e1bfb91f220f5c9d547007ad453
+DIST github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.zip 19526 BLAKE2B 87715fa440e98bd4c44516e419c0f0495da8fbad415c59361ac53008553c4ab16aaaf37581edaa6a50fa443b9ee28cb426f7e58a921f3a3490fabfa4248245fb SHA512 e8756683977e2dceeaeb1bfb63ec8fe4c7083cc1c7b242d59080a3078cfa5aa73d43f203470b140c1714a30a97dc843adf723243a072b7529c22e1fd72d7ac69
+DIST github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod 32 BLAKE2B 51c322074fb7a69418dcdfd2e54b187fbfe541c21a979c8bf8b155a6264cc670eeaa95c2949f2b760b187fa582e86688a045f3f022cb45f053a58e00ec2c0c60 SHA512 bc43f85d5a21cbdf4b3821e707c845d08f8a6d8f2c6ef0f6ec76f7711c53bb4407f2a356c79bbbda438fe138a3cf74a4b279e8757cec7aa134a93f2173b931a0
+DIST github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.zip 4517 BLAKE2B 6408d130bb158559f4b955de57bb8b7acac1676e0e3fae8027d5bc9aa3b6b4a2cc335cc9c5a3c86fdd5f26aea8f30fa30c6c549fe824763890863026ed296772 SHA512 513221d40f43fcc6ea1baff5aff926dfda8505eb4a4735e73d17cceb5560d94b7b9eb5e6e0bc5ea61cc733ec750c901e41239e07d2ce95bef20aff654d0c406f
+DIST github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.0.mod 43 BLAKE2B 1431139ee59695bdb732385a06f05f26856117d6fde79f5aa3e3bac98bd7f10e6786600c90b414baf7d10c2bde471ceaf265e471b3159a00a13dac8cd4736b57 SHA512 9b87dd132016fb64ec4679aabaca500e4d07b1131affaf5bd1eb2e780b48f2e1364d1cc9e655a6a298d5e2e2b74aa554b228d636e294f01c3ce53f6f53837f0e
+DIST github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.0.zip 108829 BLAKE2B efac4fdf409c984caf579ffc34c94419b0d9ff5d559dd02f763cbf7bfe853e167debe82696ce3a16764bccb885987ba68ff85938a5618738ef13d198bd004c33 SHA512 723c089d31c2b5d843c4b27e79a23a80504222da1019b6c6f92bde4a54e3b156d6ff33effe987482921c2d71eacdd4c1140cf87f13f2b5430d30b836fbb80d83
+DIST github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv1.0.0.mod 45 BLAKE2B 53afd9bac3239067917b3d730bb8b2775b196d3258695342047e9a49894ab1b585d36c664e3651f71dc0a5f68523648dffc0276000fddc7d5a2b0db328115b1f SHA512 0185b47e73f67a822bd73467f1f07982722d10f59c298592440e1217c31d308547e61067d47ed9aaf6ed802823878d9ec01ef6cbc1aa60fa833e246cec260d69
+DIST github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv1.0.0.zip 4879 BLAKE2B e11b6fcd8abfa51f7c9cee477783262735541bb5feeded13de28e70325fda9194ac1eb75e7be88038a95d60f62b21b125ec190b6792bd80bc83041a8a9f48b4d SHA512 7c2b651c4d53150d5caebbfd7930089bda292557a99f77bac8a9fe453517e2bdf1e554ca607f434c9df6320a48ecf0817e5112025440e84d3e03aa7163ade410
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip 11987 BLAKE2B bb585868c568466b366c1c50762376d9e2b6f3d3ac287af94c45f7d348516d2e80ee96c6980a4b5fede40f1302f0e3e900e24aae16fec29801a795cb7e514dec SHA512 70f78081c04bdbb52e8f5d24b8926b39a28c4f069beaee0d7bf24be946f2b0ee3bc08d8ecc1305412623670e1767433a37d458df3fc849d244c63b6222f1f599
+DIST github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod 32 BLAKE2B a73ae1e577fbb84fd72de422c367c1003355c117a9660cadbb5d6d52fcd0c102fa3b22c7c7dfb6e149dc14ddcb9b5fef847fb2a7b9379a35405c7bd9d83ff1b5 SHA512 2ef8ab60b4320b9358614a28a02b4207f3986c4a06798c3e253a79bfb63692dfb1765476e9d154e15f9d5e30983609c98b6ee39ae910c678a3773fddca208cee
+DIST github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.zip 17890 BLAKE2B 663ee535dd3ddf1a89ae274a400bb744d6e22689a212b58e6f6a3ae45890be76761fd4cd08d1836ffa3b8fc290249a408c798001b343104d0f06d7e2abede6a2 SHA512 e42c37f71719ed662a4b3efc9c03725a3569ce04849d6bc845bb7967228b0e648d6b2cdf73ea18430e54df85486b2a3819aca6170538eca4401ac3ea4a512d3c
+DIST github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.2.0.mod 36 BLAKE2B 0b3e2e38c2a6c708af475f5550f4e6b366b9218fb9e29b9ace6fd61775be5635b5dfb237170e5c4a84c82a4f62e3901ce8854cc5f9a81aeb1e2da6f788470e1a SHA512 88ca10cb6af255e2e0ff960df075cbaf39e8baeb3b65e35b9a8f48843520a4cefe410765d0890781dc0429aebaa183aeda2290fc0643b852b9ef269c009ecbd1
+DIST github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.mod 36 BLAKE2B 0b3e2e38c2a6c708af475f5550f4e6b366b9218fb9e29b9ace6fd61775be5635b5dfb237170e5c4a84c82a4f62e3901ce8854cc5f9a81aeb1e2da6f788470e1a SHA512 88ca10cb6af255e2e0ff960df075cbaf39e8baeb3b65e35b9a8f48843520a4cefe410765d0890781dc0429aebaa183aeda2290fc0643b852b9ef269c009ecbd1
+DIST github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.zip 6665 BLAKE2B f9bdacdd7f4cb7149fbf6297d3ab38c3a9527e0af158b933fbc673b96c5ffb684d6511b1679e03a142e4db5dafffc7b1e2edf24ac2d0f4e8faad32041e3e1165 SHA512 77f320b3a94a6da76051d6c15a7c31bfe9dd50b463ad9a354b0ccd4e24df3ea14ce026a1f509d2125f9603ff95db4ee001f9910fd6db05c9bca7b1b15ec304f2
+DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.1.mod 112 BLAKE2B d5d3a6674d915a64981d16e50519ddcb083e77a5bc0e2474fb1e2d718512edd48534c11e13c4acc7d403da5778cb6f04c275c8f208d14d54880cdceadbfff872 SHA512 b2b728fab00b8cfb86dcfb042631a37025bd981364c068990abca3ed57b3f47837ae71e568bb2a60a2c941aa2a35ff1bb24a336e786d20ff0bebb63384fee5a4
+DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.mod 121 BLAKE2B 023fc722091ade6051165a9058ff74674f43aeea249b530be92b7f05534f0b0e738a7dade302f6733e29315fcfd34bd0d8c7554795b524e596a408e248051d12 SHA512 151f687b4d5c2b5a8fa26134332222105f40422530e49930b4533831fd5a0133ea7a8038f2d851196dd615b658729a10ec42d0a6efb15bc3abf55903bf42bd49
+DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.zip 43121 BLAKE2B ae8c0baab3324c9d60363b216e00ccd5e27b746ddd8a3b1b231f9f018dce8f3bacf5c2f9a8f1a3db97fce8db290d05f7c397141d278d585e0e44f0bea099549d SHA512 8f4610eba24604d46bcf1f9c4c7da0723a99f37224c298022823160d14469b85a911a6d18b8f084aa2730dd100721e52a8cd6bbe0215d72843daefe0f79fb141
+DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
+DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.1-0.20190212211648-25d852aebe32.mod 63 BLAKE2B e418e27df957221db7dab3effe8b7b68da72098f4a90ff3f78902c446dcd25d720874a1d5f8fc6dc916f32fd7d87a79ced65c792e6e7b2f670d32cb78c8fff8f SHA512 041fc2aa6cc90c78e270fb4d902d857f83b7837d3bc0c4073cd4efacb078016d740fbd9b3e0d78eb1984071974a2efe1a04dd5d2cc474b8b29de60e6fd1638c9
+DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.1-0.20190212211648-25d852aebe32.zip 18157 BLAKE2B 542e807e061369d9aff457bdd1ab4dcdab25378d6766ee2d7b618093e06a15d3cec0c1460613e81160fdd8f5da6732fdedbbf7203ebad80892aac70f3ae9fa1d SHA512 132d763eeb2d4729d86e2b7a0afd15f9f0b3f5f9380529867bbd6e71cc827d73664b96a7ccf84a44590a4d8eeca311b6ff83497ced3a0ebb2f7c1ad66cbebac0
+DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
+DIST github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.2+incompatible.mod 31 BLAKE2B ad0f7f1eefdcb8962e8a70fc9d27b8c4618a2374e588db1afa039cdaa34b0b612b7249adba1cf61147e46da5dbad1edcab05085d503c7babe31745de553c7f39 SHA512 42b1f72e0d2eade3b2ff4d6689be08a404e8ee9e565f2f9e141d20e11d2f6865052fa5b829712647662204f496cad00a57fade2003c321b76929773a2777e4ab
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7
+DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod 41 BLAKE2B 62bb3af3f58b23321cc389ceca36d28e4f32cb1470b6c54c4af55ef927ba84284858765b5b333c3bbdb042826550fe4f0d22022078e2b34e340098465e21f3e8 SHA512 1e8d650a965637bd0974b8f42e207155dd1bac307e9ecf4d294cb4ee0f1c694276062d46318d113326b9c1bfdc379a7d8b8fa2c18e4a08ed9baefcae67db88d2
+DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip 79799 BLAKE2B 1677e3977fcf1499a1d6d3b0dda2f990b12a9f5464ff8a7aca6752951b395038ea2e3a38224d24eff0e6df6a2cc92f5da47daef9ceb237433bd2370d70eb7737 SHA512 9a67b0101fc1afba75179246e1498c41254d8379f78ef65877166bf9a5b7f7ac9e29f270e9186f13a26891389ab4e9ef309c4e90b2e79bffc3ade49e39fe2af1
+DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod 47 BLAKE2B 7252c3d085ad65bc8d2694f6fabeaf42736c8af8f4e061f1b6f254c35859619db00c1e204057cf355434b40f403b1c67c29fa5f93661626284bde20c8877a606 SHA512 149783bbdf84f15c29931e06d98707db26048d13ae9fd157600b522c0ddc60612c39764dc177e063f844205321ba98a01eefc1744dbc6f786861d0607dbdb0bc
+DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.zip 113293 BLAKE2B 1bc68747a73c39e2b21bd2c45dbdc3cb41a6c69f9a2a5167a6960b4ed583fbc888a41f559a8866a004703939230ccf3536cb2dae43ff5a078d21151a115898c2 SHA512 d18a710e77e830e7a1e80a16a7743cfac418832c16a8e08da7749af791e2bc8116c2c3e7f028bcf9c4431cf8e61478d6f1a3549a47e569f725db2a623460986b
+DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod 33 BLAKE2B 366a1ff397488b2b1c7e42db8a946bced1eb8d4260a6c177a978eb978e14f89265e7ac1d0bcd77905bc89eb35b68b3ebb028c0dfc67ff71395ab14b62335d16c SHA512 f3dc70dfcf086b785750d5b346ea07d0dc7903937bdbba58eace0fb903e656b02ddf3a1d49b486ac29b1cac9ca9d346e964d55d3a4cc5ee5ae79ac40b24d0cd0
+DIST github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod 31 BLAKE2B 5b9a7c710473f58b57d11fb76ec3ea044f5c7bcf2532298a7bd687897e4731416f423c051c601e7012426958060519f664e9c481ac5a791b0b1603e83b406bcd SHA512 2dc02a7038b6c4e9f172e5787e70de1dcf44d1abe19fba03c586d7051f723e78bef3067f25d1bd47ca591b4f252fd76febf8494af610d8a2bdec57c306dfb496
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod 88 BLAKE2B 0699027ef7284edb7deb6a2640db52a5b93076e3250d42710bf02a1cd7d5f591f1d335ffb1e7e753dda5fe177837fad87a25bf69b03466bb545708fb2952fd7d SHA512 b91b25b4fe769a403fd7a1f82d7720bdb0526a349ffe7cfdfff09a2ba5e0015d5a3446cd8e0e5fe46479b7d2296a8616de38a8183c0185f84fcfc75d202db106
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.zip 2656615 BLAKE2B 08542db845ecffd88d279cd63919a705d566084bb556aa4a6c98164a11520ec6476841128134f8fac2e5132d5fb298c9ef6670074891e91ca90577a8535049ff SHA512 2e51e876c4533c4b34f0017f6f13ff3c34922a1905f6a4f90bab241152dbb344689d8d1f5ff1040c79632feb21fbd8f213831179bd424579ac9b5bb602325bac
+DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024
+DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip 22449 BLAKE2B 8d2eaf41ab75e870a445d50b62c02877ae8049e282f066d9aedc0dfb54d04af55d921ebc84d1e4131cc66a3f9efdf8270a0e423e563d3f8fc5a6bdd403bcdb39 SHA512 a3c086e660f2285d9fb7d56d1eba74994e8f0052363413337413cb50009ba46d3a432e2b4c67a73bfb753e7c60646d96bdad308d8e634e53f0bb0bb97ea17bda
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.zip 39652 BLAKE2B c4c9dd2930eb417b8c6bf129489c3f067b5d127ed0194808d8e7594b477fd13ef20154508126708fc69cf855ee298cd4e9031bc34d3ab8025d2b2fc67ea21f78 SHA512 e23a4491896904321a371bb972437a0b55df33fe7fc31170967d6b4c0ccf917e34f94753112d4623518875ccb4e4da2e58cad54e0a821dc4e07528021a814b3e
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.1.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip 465217 BLAKE2B 4caaf832a22faf1c45e04bebf35d29b38bfab18a490ad1fd7b2c6cd85ae678fd3991505f68e526f9f2205cf919374b07d57f8abe95d8f74dc8263cd37a9db3dd SHA512 7fe69c066b2407e6000ae21888f6cc696e51df2342a71e196aba1a9a9ecce630bd9a4d41c58b3105002508a4d0efb9c5ae2b8a87f848b8e2c6293558b8c4b4ad
+DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
+DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip 69641 BLAKE2B 7d5306ebb893e705188699f7b5e690c375bda9e0ab4c904aec10560dd75f278016c9f69ce4973260a4e5a8d8d7dd7c2f12a59f98e96a4456af6f23fd0db224c2 SHA512 fa400e3e1b6f57e29c93ecfb1dd94ccb1e4e4924f3b62ae125ad0bd88d56b5c48080ad78dbf545c1056bcacf860b93363a27780dbce2b812c5b58ca3c74fd11e
+DIST github.com%2Fgomodule%2Fredigo%2F@v%2Fv2.0.0+incompatible.mod 34 BLAKE2B 5d28e3d6f80a29fbe97b4972674feeffcba15ba0aa148c2bc2be1d4f30744eac4d47add18a78e6ea9407c74da84e882d80868377439831e0df522a3540e3c960 SHA512 f0d5e9057d61f2b7e89418e6d82567167c1083bf00f763b4744a6226911f31a9372772a888b227041cb3948c1b4683945760dd38bdb311cdf2612ef313fda934
+DIST github.com%2Fgomodule%2Fredigo%2F@v%2Fv2.0.0+incompatible.zip 65599 BLAKE2B 6f1c8a97fe30d1dcc99cd6416090903492e8624e3f7f6b640a9dbc2d09909bcd4d8261835b9c2c45eaa09c51014c9a81a139b24ad6dee6f83442b4e9b345909b SHA512 1f47d8cca66a1700d19d1a0591c125fb6639fbcc399bd5c6c7a5d1f995b802f6636ccb6400f7adba0ce6305b0bf3aa58702f6239f5a4b99f2402c578092b27e5
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.zip 17980 BLAKE2B b0947bc6a71032e97255b113d70760d85eb09f72e8733a9d660b5b45b7eb3e2bf67b00b57c674a3b6c1a90388e7e80569ac8d36ff5aff7d50af9f7c28f22c3aa SHA512 d30c86fa4d25a5f542ef349e0ae2fd4579de5c3c1bb69ea3cd1bf20978a772ab9934ca68e01b9e5db2e5d8d6d7cfa96a4547ae7330e97c03670ae1dc8585bbd2
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip 17644 BLAKE2B 2ab156c678ef5120adab042c415b287bfa6ebf901181837122bbf83867ff312900a16a24c0f375708f915628ae5bac93b42f659663cf827b81e5e6c4c6e47769 SHA512 b54c7f94aef24c769a0478aea5dedbf67309dc3f59a5d7cf52ea8b49e81783d87bf80e5bcfa36f1f95a65e64bdd8312d20ebf81cd73952af5481b2f1f3619eb9
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb97e0d557200e8722f2d373e149127307efa285cdfedb36dd57355168554d1a1bada62144e6a6a00c4d3246aa9afc7d0ffae0f087459c552 SHA512 7229d917bb0c788b07297e1b09b8f7952f951998a56f17ea1f69ff7c2f565a5686b212f42f45c6b8351905d6740a2ec5a235e493daa531ae00cb709faf67ae45
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.zip 99651 BLAKE2B 14632f8da685fecc046b2cc9e61eecca02e7bd4720ebb1d3cd01a299e59d47cc604abc57d5518e18dea69785e3d5d539d87da211279e238a78dd23e3d7f8c7bd SHA512 4b47aa3677a464af17f3e320f41f59e775b45f04cabf2cf749e00ba1aa97e27ee78a07daad347bac4b5c41e2c430634fba57c6edbcd7ad405b5a084142871362
+DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
+DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df
+DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip 259222 BLAKE2B a40b65755786c83fc0cc40de98de0c7f734b54c0441617f0274890f823175b4e44e721d4ca3c46a7551bddb5487c7d992459c928ff4abc435acb5bba5a302a96 SHA512 26ffdf319d3c952533c25c487e027bf219be3f7ec7345f9d155a480e1e5f3006fe335ba790cbfed00487e23a8506a8208ed7223a514da11b7a4bb069337573ef
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
+DIST github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod 34 BLAKE2B 1eabef50b2977886d7980d7da197828b826c54018766418b3160f5cd512784635e5791a40cc4fb806d52f5ead99f941fae8037872d6cedfd6c851103f3be1a74 SHA512 a46cae976ce90d1cef802eeaa873c059cc9ec3678d5c3c304a9de45f44f20a24d68fa290cfdcf78c4ac222a6d619a005825de8f11e72b9a5af476a0b0180092b
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip 21279 BLAKE2B d8013c686f7cd497091f4c7d782b283eb95faa7617d68ec7f8cf937c5925d677d8552c662291e41cf2c137fce163d45fb62dfcde88088225c13e0980fcde3d7e SHA512 f28071ffb6515262fb73276725181a806740688fea8de8d9484e1204fcfe6e5fd437e38a3299acec6bb545deb31373d910a09d92937308176b2043ccc9f5397f
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa28e8d5b816289e6556e114311f039b477e5ac86fc1c2ac80b1f8d7729ab6a83b99baa4c03de9634240481feb13900fd4049753b8de839656d6a7cef8f SHA512 31e50016a01fd485775368e2e430959278cb6c03ae6b1871b3d0c173fd43e91654ae87d1758c08daf897e55be8b4044bcb47fc072ec645d16e2594f345b46c73
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.zip 14233 BLAKE2B e8823d65705a9ee5cc0bb6e3e2d99800d9c94ba6d65d6bcaf45687312bd28a48a6f814b3e40f7e7cef7e750c64034c7cb537efaaac1a7d213cdc89a886dc52c8 SHA512 30f32cc78130823149f4cef944582435bc7ed15279dd04e0273ee1d9361d01546c68f4485cc230d2b1582f21093a39f4279aafff827d0c6f0da5ab595a60de58
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20190328170749-bb2674552d8f.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20190328170749-bb2674552d8f.zip 263547 BLAKE2B b5a134932e71066139378beea0056e27c939257c6d8e68ae83cac0789f692f490933e579cc78bda8fd05dda78094d734679e4792dd4750d16a7ed08f22dab9aa SHA512 8a1966cc99407a61e30b7ef9d34d4a13c41ca4db3cb26fbeca3ac5bd9f94314487738251cf63ff73fdcfe3e26f3050350c9dc9235d48a68a3cbaa2b070972c71
+DIST github.com%2Fgorilla%2Fhandlers%2F@v%2Fv1.4.0.mod 35 BLAKE2B 549faba95b001f14aa66c628d300b6b0e496c92cbd87ed5814b4dbddd422df6d5d7a38af10ea061e512df4129189d221bca001f2b23ce7bbd13fa0b7152bbf4b SHA512 b4c8a43e739f69430d5004c01d083be6f65a70301adc0cbe824955a3b7b50dd2b6033fe8db18419390cb577f89533e9b0399a169f1b10ea39fb2f0c0e3cc47a9
+DIST github.com%2Fgorilla%2Fhandlers%2F@v%2Fv1.4.0.zip 26786 BLAKE2B dd89b1bd11bd4393b0c073eb77b33a2963c5d46e036cf0e81ac9d000ef22d8c06f2260089e97f933147474a3afe0d64143701701b1141b4394d200235d2d569b SHA512 c91225b013279f29d6fd0dc32959f88efa81ea68b4624f9b4d41c269725d77a001216a77c1edf520ddfa601e7bdd3c79e4a202a28bda42ab091d243c246cb9bc
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.0.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.0.zip 51918 BLAKE2B 5005e258bec552cba695998eaaefe0e60b819bab901e0402943dcd85c67a53b2ab0a9e3e4c72f47d7bbe935af8e6cb966168fe171a49ceb10d131f163ce43a82 SHA512 760d87e06de5b781aa68f65048285f1375979cfad36bd56d4cd93f48b4262bca0a8cb58e3b65886875512fc973c131de98765e07322eea6d70960cb50a848570
+DIST github.com%2Fgorilla%2Frpc%2F@v%2Fv1.2.0.mod 30 BLAKE2B dde2566e5c9813a16ee516d2c4a9023cc105aee63d006cde8df0c833feb0126d39613cdffdd90b6f5b63e949fbc6c41e1c0c2b8a20786b1d766e2239f7ead4f2 SHA512 25167837999cb55aa16d2e099090f0ee7cf51cd9a860bbd562509226a30cced91e8e80849e444492eba1d7207e1da4708637e670a0b4cd037bb51d252f831f13
+DIST github.com%2Fgorilla%2Frpc%2F@v%2Fv1.2.0.zip 48849 BLAKE2B 3308021d73ca4179fa103e78d09b1ad2f3a68d8e5df976f05daf7c684a12835a1667b3db65212be6e8e0b561a68a56fea0998d76a19524efd6b3330059758efc SHA512 70dfdc3e4283612d5d7f5a3a77b2f469a1b3875cfe805793d601baf0c040d2cb7c23976ca2f1ab59d21862de30853abb8d0c44d895a508a748d5c8419071b9a5
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod 45 BLAKE2B 5f187c997ed74f2aab1da57c9a828be383e41f47905531da8babc1360612ba5d4cc0fc6cc48106647ffa450f334c7cc5f455bea7f6e6b9734f3e55734cf623c6 SHA512 81ef224435efb5cbd429dd4339e8410234855f4a268302a61d34e76c388e89ea22c97ae90d71a6ef910ca00d3178e40d3587eaf484112966050fbd1f1f4843ab
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.zip 79215 BLAKE2B 25312a1d971b0e214f92e88846586f3cb96a23a8df927d2fa73e37cca6eec4d55cd88c3757831f37661ed82a0681a9d0c3e1edb32e5182b1a0b8e349e28ebf79 SHA512 8de80f729d0538295606f5900e9f70a3f77c4b6ea7782c9bfa8520ec89c75b6a7ae08b42b6ad0dcc261f9e9a298bb58645fc97c4e5c2b51cbd6cbab62401a2ae
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.zip 138925 BLAKE2B 34895513786f190d7379e74e7256b9fc18fb82bcc985866dc94ab2110fe04c120fda46b2f2629b87d9d0380e21420a625f8206782c67ca5c0e71c6cc8309b9ea SHA512 39bb926ff817750578322805bcf412db6c09ca5b7dcd237fed9f64df51222de62b62eee275e6d37c7dafde7dd8fada499c344c62c3ef0a3bd8d27053057f4079
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE2B 9e5de5c147fb3f100119fc7c290e9790af57892762b7ea8b2a8328c397432466ba56ee20b64ced6dc548d58bf8ef0ecb2e62a51de2524f90a0ff39921d0f2a3f SHA512 c9e15e4a4436ffdedfe5ece51858a45806d6fd77d2306c35eb986a866a3da5bec0d5d06ddba55a05ca45c8c29a51bc7c58150849b5dbde569a6810012f3ace4e
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip 35110 BLAKE2B 4ebd3cf0dc4580a53cbefe7a955cf05cb6d1d60a69951ea4e18eaaf108ce2cd5bfd0b2dc4bed62a12b48922f6f9dcdf1e598b77a946bfa0267314caea827286d SHA512 5c8e6beedefdf390a9eda76fd8d5042323e1c9a6306605ec7ca8b1612bc038a6cb0c02ca1093e0b6373a05ea64b7eb0c0bc62720a74b37d4ceb61564f4d46753
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.8.5.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.zip 424517 BLAKE2B 4533ca4e12b0577325f0621480d91994f88dc645887e534056cd77c4c83cd37f701c249e91def9bd4bb7374d50b030cc6182f2668196769f186c85c33a6d7fb8 SHA512 1b8fd632eea86272aa5300bcac20d0a52877ce911ec568f33ce16580e965d082facd040927f8d095deea000409baee5dacf8dff1dabcf396bab678f038ca5494
+DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
+DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip 9306 BLAKE2B 1172cbdefac5f63dc5dc155b38f1f6e63bafdcc4a9ec057c3714a93251fa88d9cf29aae780587b13dd4eb4af10fde2dd305c4ff774bd843068726c05861ccc4a SHA512 fcecaaf6496b11fb35d01da0d3375508c978b0a319d344c61f77539be199f1f13ed892f2019d5b6d8ee1603c576064203ab87e235bab4b0bcb96d28f9e16e88d
+DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341
+DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341
+DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip 9560 BLAKE2B 2c8039854037c0f11590c80605cd30bce58baed3e8ba11840e98e8b450d0b2303704d1a55252589529021af473fe1f47f7bf6a3edab5ecab4de4888088843b2a SHA512 d439e95bfd858cf71659e8ce905748749e9e15cf577b98b66d7d8dd6adbff8262219d0c26bbbe9a24021ed5d683d7b81dc560eec4a97f09a1b44fb8983a4177b
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod 37 BLAKE2B 3e6a6550c5fd7b237c484b2d7ff9d4fdcf02eeef8be89f18169d50c0ca7c58849c362d363428893035a5720d094cceb407c8565ed680ff248c305cd4acf886b2 SHA512 f2a0acca0b74daa85f1b49e2a56bf2d58c17570379d80c696428e31c028ace8436bd734b032996b2e3a52396d90cfaf3c0a99fd414c10fe1d67727a0da962ac0
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.8.0.mod 183 BLAKE2B dceb26b60f2c77dd17451ba54fbf981f8033b7a1a840f938fd56454cb0af56273e260b1fadf2f708072dcda4cb26a1bc3b10497790ae128efaaefcd326c84520 SHA512 84dafac5d0770fdf20eae443ab6262dd3a32737c62908830a941b2593f683f35b0c33c009cfd2b24d3cf86a3701b9c3ffba84b77e66840201348591277ea6f8c
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod 183 BLAKE2B dceb26b60f2c77dd17451ba54fbf981f8033b7a1a840f938fd56454cb0af56273e260b1fadf2f708072dcda4cb26a1bc3b10497790ae128efaaefcd326c84520 SHA512 84dafac5d0770fdf20eae443ab6262dd3a32737c62908830a941b2593f683f35b0c33c009cfd2b24d3cf86a3701b9c3ffba84b77e66840201348591277ea6f8c
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod 183 BLAKE2B dceb26b60f2c77dd17451ba54fbf981f8033b7a1a840f938fd56454cb0af56273e260b1fadf2f708072dcda4cb26a1bc3b10497790ae128efaaefcd326c84520 SHA512 84dafac5d0770fdf20eae443ab6262dd3a32737c62908830a941b2593f683f35b0c33c009cfd2b24d3cf86a3701b9c3ffba84b77e66840201348591277ea6f8c
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.zip 35171 BLAKE2B d5f7278b148d56258773ef2b7add6efeaeb98ff9f551b3944e0e418f381a12f9ecefbd0988604d71e076da0d598eaeee123d30e93bdf30370ffac0a26bc33469 SHA512 b2a0b596bbd10fb8393459ddbeb2e4ac59b1ccc30226b158e81bfc9bdf686760d212afedf957ba11e8c4354c2ec3abe75bdc40dffc97d5dc70366c54f209a884
+DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
+DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip 23003 BLAKE2B fa553bc49f3f28624830aa0323b0c668db17d7628ca24b280eb718711c240e67fa6ec86b61c7fb5799b63085b570238d07c925a8cbc13e95b9d73d00e4a2ff65 SHA512 91c7b40e4125c3350ac4700bab85547840a8cc848f01bab06bde2eb51693a6dfd584fff718bd2425c67b15757e6e3f8a779cdbb051afff2094444f4bcb080ba8
+DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod 39 BLAKE2B c5b445c060258545233b5453482e0c739f815c1ff605b539610f3b0bdbadb6da88954c6a408084f171354256bb8521b528573f56080d4125f4fac474ff9bde83 SHA512 45b4424a023ea15d95167322e022269e32f7a718dbeaf192d0cee9f6bd136f5b4a26827d6d041a8103a95f622a0dc92123b32e6463254199893f360ad8680de0
+DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.zip 63182 BLAKE2B 6f6ca7aef3a60232a715cecb6f2a4f642fc32388229890699371d7a901498726bace0e37c800db4096769c65cebef01dc4abff9a111daa3cae8fd8352ff18174 SHA512 a50702f312dc7b0a9dc95c3415980e51d082e0c36820917b7ff5bc0965e06d5ead6d7749cf8c87c7671456e9c07e9625e342b644aa6f49a10b4483a198f845b4
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod 87 BLAKE2B 34587a565b583aac6338d7d23b4e7c2ce12deb6700e00bec711d3d8d829ef1ae356eb1b28873d5bc2a0d6ed249dd6095539a1dfd8c177bec32e08d97f4003620 SHA512 d47dfa43806a386eb74b60f692b3bc580997edb9d7feff6633992a5adbf94d102a238e036d828952e204960152c62895288af6f09e2582e8b1408d259fb834c0
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip 14840 BLAKE2B afc6e5519fc2dc1209382c6ffb6f73d29dc97b6cfa03ef525d6095e65870a1ce25ca59d56648e24bc399f53f6879c0a3ce91e27645a48734602292c7d99bfe16 SHA512 8f86f79788cec64d9ce4f02af2ab7acd64f2014e5b592256f07563841444520bf4810a1dfa76abf04909dbe5f3298c67c0a88e636e45a181e461a2fac08d385c
+DIST github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod 770 BLAKE2B 22eef413edcfeb0337641d6567fdfb73d32f8ab2b3e624a3e5dafa15d31ca15c98c9740d4e9c8652adc5cd9f336153c029b086c260cf9ed8beda64b9c0c06028 SHA512 65489f1fe43c58303bd999f4c8d96b6bdb4d194b78e14d2ae9de9ce4fa877827f47d5d3c79e8417c88d1571b135678c069571e528b061238a9d59dfc8b472097
+DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod 95 BLAKE2B 66af3c20daaa7307f453ab70f7f8db429de6202fef7ad27c4c54f6a37d5c06c253df6ea24ed2315fa8208107187615b7e5d7a5aeae2cd1fcfd3be407e8f67fe7 SHA512 472addc2b61db4d72d356e2033b0963352d5baed7e2c28a567ec4f4f8a4cdf199d50de2022d136f9ef85ee5e0329c2e4b9a6797e4ef07e348fe7976aec56088b
+DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.mod 95 BLAKE2B 66af3c20daaa7307f453ab70f7f8db429de6202fef7ad27c4c54f6a37d5c06c253df6ea24ed2315fa8208107187615b7e5d7a5aeae2cd1fcfd3be407e8f67fe7 SHA512 472addc2b61db4d72d356e2033b0963352d5baed7e2c28a567ec4f4f8a4cdf199d50de2022d136f9ef85ee5e0329c2e4b9a6797e4ef07e348fe7976aec56088b
+DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.zip 17666 BLAKE2B 17ec61e27967762f6f2d29e8dc23f4fba5c4ba0ee5acf7dd342e7437956af4348096da9df87c47c24bdc5f0d11544a1e5638125e888a9f163c97086259cbd888 SHA512 62644e1aad01d8475a0fe8878492477f11c5ac26cb0142a69b0afaf46a74ef3e3658b199ee6f505941f19d9ede170d62237422758e2800d81b251f365ac8bbbd
+DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.1.mod 98 BLAKE2B d536f017d021aa2e43bdef41de97b002d8e08e2767ae5222ad7d05ae23af04c4920fa2663b553ee803d72751ae0772b4e8ab7dd5243aae1c35d53c0f6ed85d24 SHA512 97ad4c83d3c61a8b878871c886a1fcd6e3e954623b56e0775897160368b08a243d325991956d557b5d8741b0609d758b2da0277049e57163e18248594ce3cdb6
+DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.1.zip 14910 BLAKE2B f57ec2238d5535dc22946b7636ac5d56ffc4ee90ac57d11e045971634455783bb18443ae67b09dd6dc3086b861e597e8ecd7a06cef2ef7225a04a21017bb4978 SHA512 d18262019ea6feadd73719800d8a613dc0ea00643c5f6ca5f557e46c5d757d584c5735b717a360c65bb68b25949b6d2a39ffc207e4e0f93a49ab855c050c93e8
+DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod 215 BLAKE2B 1533dab2e1f588c3e362d82a22e8031674457b30822ec51d6130bab2d9bdf9412a86eef4d581ac50b2320ed39277386f6422e0ed26145cc5a415428ee77a927e SHA512 cd1d90707ef0309643612f59ed64ee94aa1ba686a4140ed84963e983dce5204788b10def7a0c949b15b215063f52269e7441c2e0230440b07d45d704580662d3
+DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip 132950 BLAKE2B 382fd8ab248997b4f364426ab0cd0a31085b5969b9ea9ed50046e8b7687b81eaf766e9e8e0bd15cfeee84319dd25b0c32b0ca2795066ed38f6979dabe654803f SHA512 43075467209b036a7634f6398af7147d209f685e2108f6190e51487905df4d0e5e0b66c40c8bc5a26ae6edf4652fe605fc2e84fb5421019c07d45710352c146d
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv0.0.0-20180228145832-27454136f036.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip 7804 BLAKE2B 118a166e041d64c446114e195ab870455fb75db45554e02f0ca1b0a2ee76938022120848bcd5d3668a9711c32345db5911cc627977a602bfdcaa875be791199e SHA512 3a3e4b23b82bea9b094f407662f5c63659ae427bd0e922c37f0dcafa1e3cbb16f4117f265cacf2a0219f5240d378aad7aa4cd2f9960e07b7cc7200859b0d6699
+DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip 19548 BLAKE2B fe48c3db37bc280cf5f36e522f4b13f7daa45768cad11c1148634ce7af618c1c20f568f98ea7193b0be7021fe8a4d209a4a7f1c94be3c05924a36022a57c46b1 SHA512 6927a910a368e1f2b0792989858d25c5a55891082cc38f5907c539a35919916e02872619cbf45ed583c6f6f8e85936a3fa790a161b071dddc922383e983d37ee
+DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331e2648bdef36882414dbf8416884b8fd385b7e926c9b837d317322a433e7312e14c27eb095cbed26a74eec9822f0f063a2d14e753031f632 SHA512 045ed40015294ebd8f7a6df06b418415da8f091d09fb4d34fd70718bbf5ce9f49dca7399dc5649336de3fc83bbbd93e740ad6f62d41ea540fae3b17f349cd66b
+DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip 121655 BLAKE2B 071d008723f19fcac3ee740e1b4898414cf09a2813bdb6922705cdcad5913d7fe4682d11219ef10d8bd3921fcf93c7d568daadd33b8e7c307a55eea6ac0d54ca SHA512 19403c36137b6ec9247fab3a9255dc98ad9dc46ba03ad3788e11298f8a310756b24dbfd3a0d9893ad93dc111dd228c421f96daae09e2058438c3c7c58386a71b
+DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1-0.20190703171940-f639636d18e0.mod 410 BLAKE2B 192e571d096d665a55c29da1dc35ba17c52d6f5b0c3f522c80b355bf881ffe269b27a62fe44761143966aaa5bede99800918999a313869c1a81dba98b710a1ad SHA512 e44c233e6bf407eac6a4eb6f7a72dc0118575b6dfe48a9d0afb95d99a847ad30f75b11e6d008238b7761965182df56e52ec183bb0905e054a638c76898368e6d
+DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1-0.20190703171940-f639636d18e0.zip 152530 BLAKE2B 093d10489f6ff80e2bda478c98e6c2bbe8ab5a4f1754fa7fc146b65457de346323f5c5ed96fc9ddce395eaa6a7eb7203e85165e696e23d6f58085478fda53dad SHA512 16475b5e7bdd487024efa5c264bc71fd953061e6100fdfdcc8fe1fa9f08b6246e684b542438195dcad4da2a9395f109e626c966f8ffde82d4ea52e11f8f41ff0
+DIST github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod 40 BLAKE2B 77f35128903a84139dfc23055bf87c4fd8b4843953c764f0ec004a8a2b10599de19bd767a569080422179bd8ad66218d3639025cf1d83eb5cab22599b5da2c3a SHA512 76ce93f04caa8045ed49fccbbbfe76fc278bb7d94c973e408d0695e8c9c5e569b3dc9d4af8722f13c4718753aa72fea76a238dc8243aff34bbfd10d4b684e38a
+DIST github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.mod 577 BLAKE2B 6966cd924bfb433dee02347599c131e85701a7ad37be76369b3a72ba8d6d3927abf1337426eb508a5a27c77f5005240a08ade70e93e546ed752a70fee483a3ef SHA512 78b71a31222bb3bcb5310c929587b13f19343f6aae9284654bdc3ebee9249c9a8440d428af8273acba18ff144265bcb2e8cccbcec6e18b9cbec2fb0f73dd3abf
+DIST github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.zip 72918 BLAKE2B 13c10ae1ffb312d91cc1a4dbcb072ca3e9ab4cba3758a04c6c4ea0d7b875453819fa8188861bf6f284f57e44a70f8d6c436699289f44a33082ed8088b1323bd3 SHA512 c4d0ef607d0116b64507ebf631d5190bc6cd2c5508ccf060b226ab7c4798a45b595fae0d132968918ccdb644cf05335d7de76c84ac7a188f4b7aafe8068d725d
+DIST github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.mod 1594 BLAKE2B c6b069c73847f3b115faacacc323ab407df86f81a9056347ebbd15eb12ac642d8e8a7b0410afbd076f18b704c18830144a4bed5a98e6f31d67c14fd1219fa7a0 SHA512 c4a38235e1b91838e6743f4bff89ba737e6427a65e9a2d34c750b63a75ea86b7ce13243b93d13d34f9f384dbf678fbae5c5b5e056eeece9d17511b9e197444e9
+DIST github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.zip 317301 BLAKE2B b4763083e5d6e71330e880a5daa29192dc20db6217b869f9714a29967f8a606ea6e8e8190b26fdd553017045069123fec3bc2ab7884eaf0cde2f328fda16dc56 SHA512 93290fae6c7317919fbb85229e00ac7e56728aa1a226bf1cb57a6defde4491cb8032c4d0c022ef4e06056af47fc2b1a6944521069cf9336dfba4a57227343075
+DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod 34 BLAKE2B a6b62a3bba7dfe36ff9628bd3d8924ed8e74d32cda866170cd7d78d472ddffe771c1b202a1a905392736a0bf42cb2485b8178eece7f523a01e8acbe3ca1b6fa7 SHA512 9336813b2b20fc7f8f9fd9275f534f30dbe1f232df91aa58817c8a1b8aa46face6073e06721688058b223dcfaf73ea920b84f102542a050ebc51fa5da152fe37
+DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod 34 BLAKE2B a6b62a3bba7dfe36ff9628bd3d8924ed8e74d32cda866170cd7d78d472ddffe771c1b202a1a905392736a0bf42cb2485b8178eece7f523a01e8acbe3ca1b6fa7 SHA512 9336813b2b20fc7f8f9fd9275f534f30dbe1f232df91aa58817c8a1b8aa46face6073e06721688058b223dcfaf73ea920b84f102542a050ebc51fa5da152fe37
+DIST github.com%2Finconshreveable%2Fgo-update%2F@v%2Fv0.0.0-20160112193335-8152e7eb6ccf.mod 44 BLAKE2B adaeeaa8e848d6acaebf9a936949aef8714f6455465faa2f61e1ec75612d95225fe80a79a29f9772380d8eb7ba9f8970ef672cc19656b7d6c0ed816bdfecf2bd SHA512 0cb0e9dc84de7bf6fec06d6308b9ad7324d88ca3b00e70e3bbc2c31ac6ee2b7c7c034baff4aa1b6c3aef6b7f5c92bdafdb3de084af238c063061ac0c8e682f83
+DIST github.com%2Finconshreveable%2Fgo-update%2F@v%2Fv0.0.0-20160112193335-8152e7eb6ccf.zip 40984 BLAKE2B 156a6dde638d1f3ee245e275b667c28dd2073b2dd969e360b87bf10a40c705f115f69752709d23c012c5d50ea859aa5d3c7b6325b6403057f4aab7ee48872904 SHA512 166c76b95e1e49c5ee0346f85c109aeb1840cfbc641aa0e7fe74bd919f31be84930177dfd6c653dc7bda4c1bcd5ddb3e343ecf5a09c69738d02df4bce62f9b5b
+DIST github.com%2Fjcmturner%2Fgofork%2F@v%2Fv0.0.0-20180107083740-2aebee971930.mod 35 BLAKE2B 152ed61bf84dd1666421e11827c23eeee0c7c50edd35851a50ce21f4fefa13660a7a6cead25a0f9d8f1b748c2c4277d21639eb781c484359aef00e77921139e0 SHA512 5e94601c72f24a3d8a115759a8fd6fd3420b662995ce94d7dbcfe4f86437bdf81a42c77c82accf7fdb926b75a5898bb34706fff864e00b38d891cdd076fc89ec
+DIST github.com%2Fjcmturner%2Fgofork%2F@v%2Fv0.0.0-20190328161633-dc7c13fece03.mod 35 BLAKE2B 152ed61bf84dd1666421e11827c23eeee0c7c50edd35851a50ce21f4fefa13660a7a6cead25a0f9d8f1b748c2c4277d21639eb781c484359aef00e77921139e0 SHA512 5e94601c72f24a3d8a115759a8fd6fd3420b662995ce94d7dbcfe4f86437bdf81a42c77c82accf7fdb926b75a5898bb34706fff864e00b38d891cdd076fc89ec
+DIST github.com%2Fjcmturner%2Fgofork%2F@v%2Fv0.0.0-20190328161633-dc7c13fece03.zip 31847 BLAKE2B a4c6c61d226f2470abf2837d57acc527576c60ebd894cbd09f5185dc3126f5a09e05551d8277e5bcd30494173e3e0d741cbc974d9a47cb2fc9f70c0ff11bdd94 SHA512 592281b626f74e4880122d42ee55e4dc0eb578d5ccc6f1a9f02ab2f0cf8b7e9455e02bef91d200b6a5cc66901574134a7931004daf90294e28f6493ac7293ee1
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip 231432 BLAKE2B 99b12826322d86b39d622bba690286fbc43b9e0336161d5218e6620caac0580fc7b3a021e60047a19815e35a4821d31066bf1ee6ca0e49f7bbfb1df10df21380 SHA512 331f1c4fa97173f022210d15719a9ae8a0dcc1c7574e1f019959070bd8cc3f77e34dba16d78e8d9e0083fee2ac24751aa36d5cdc0b2d1303a5118156ea514b7f
+DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod 38 BLAKE2B 091e824ab9156af7978fe3aa6f61ae046588510903cf635ec166225395e40df6a1c715e4eb3c47aee849435eca3cc10db971a7c28acdae233eda85a4408c7520 SHA512 377d94cf7dd50f88b57ba829ded5169a6c41c5a304814660df0a3447d10860b87855f25cdb945a6e4de14c41281651330d4109c6dd6684c86fa4dbba27a3872d
+DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip 8857 BLAKE2B 2887917f30fc4cba4c028ce8d42262b007ecd785df9f4ba1dd74f9ddf68376a6c3af924449684c8ff8ca530b249445a7ac0ea36a63fdb18d767ed3649a63f7e0 SHA512 999ed7f22551e55d6b4b59af2ff2692ddddb251de4c61a835ccbb9f8386ae426ef8df6c3434b8e8e143faacf82ab64e022350f9d57ec51544a27042465cf920f
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.zip 138645 BLAKE2B 90b085fefbded221903d24f63cf0fe9f2dc95c215b5ec2f9738c384c9118642425d810ca405bfae689fa1985f4d6a8a44c832f79300ef82fd28419138dbe5630 SHA512 1e1e5ed05000dce783b69b47af8ed0d59b11bb0b1739eb9620b576f67b98976cba9e9227519fe247a1aa3ac9c8c423b4896d1dfd9af6877e5eeaa6514761ba7c
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip 133805 BLAKE2B e9a015f12e82e7258f4995a093cb3c710c2ada1bcd4d0e5fd70fa00b7917753c41ff23fd4ef5cd30615024791526a053c623c28b4cc3b2d304d17960b35dedeb SHA512 2ed727a07740077cf749c197615814b52511614129d15e4e4f7f04a70fdea7edb8a55522d33a9e7a29595d3c41170f7a912a7acd9fe88c6c8215df721d4d87f5
+DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c
+DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
+DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip 9901 BLAKE2B 0c8cf7ad0809f65d91b9ad5b27759cfedc5efc25194f19effd4b19c35c940461a48a57636ef3c707b27ac614b693ea05830bdef6943f11993bf561ef558cb99d SHA512 08b7201a9aa3294a3fc59bec78fee09f0d1bc7507b50b1d1cb1fa29a523c6870d00b633ea9679c9c86df9841739f46e9d5d9bbf0e3ec15b8ad08e57db67eedc0
+DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
+DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod 143 BLAKE2B 128f8934f81d0e497e1258ec65129fe5d8831b66058669a5aef3fdb2fbe5f6d8ab30bfe97a1de7befadd34aafd55d6d15bb787e8948fb7718761392817203874 SHA512 c5e546822036a7114a29454e28290f8e1082392a47a101fb1d370e0969fc2c83186b4487473f903dd638abb8a763ce3180dc87993906895a2df33db7d8bc4790
+DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.1.mod 46 BLAKE2B b5879e59b7061f16bd04702694188fc8b148c5089aa7a3a195c9fce7c349bd191dda7dc3172f88f0d546cb8c3eaaa82eac73720992509baad59757c740d277f2 SHA512 55b1b23e692eed7e5cd2789b542c27eb85c019460a1ea75bfb31802263328b53da1a466e4b09085e4e002dc699047bf3ef5ab003022a6182c9b762e0b812febd
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.3.mod 46 BLAKE2B b5879e59b7061f16bd04702694188fc8b148c5089aa7a3a195c9fce7c349bd191dda7dc3172f88f0d546cb8c3eaaa82eac73720992509baad59757c740d277f2 SHA512 55b1b23e692eed7e5cd2789b542c27eb85c019460a1ea75bfb31802263328b53da1a466e4b09085e4e002dc699047bf3ef5ab003022a6182c9b762e0b812febd
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.3.zip 16811589 BLAKE2B 990357bd2fa18a79e1803261de00e850de43cafc18906a2f8b646583fced74d2b38925d747291f66491449477b5f9b6ad0e934c33536da5e6d78fdf202c3f512 SHA512 ffed4fb60d88fb14d014faecdcda0930ac9bb676676811bade57a8f88a891a81a038454b03a20c4696c5bf3abdb6199f3cd20de5c4af8e80b0196b34453df5a2
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.8.2.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.4.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
+DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.2.mod 34 BLAKE2B 1fea82f0ae24add73e084ada4930a6192f6f1d7afac47e2fd4a018e0167779741e4c948ebe67965751a845fcee894fe88e57a1e42a00a8aba2a6589dc73b30e6 SHA512 c71392a06cc0dea75b46dcab30bc5b374eeb432aaffc678213d5896015cd31ef085387446a8086c3275b97bbfb02c93c0180f7b3bac5fc1cdf1fbe5bf7af9887
+DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.2.zip 287028 BLAKE2B 6f68ea17302b4cac43a49e8b5f1e7face16276550579515add665fe59f6b0ab24390c3d1da27d9e4efb31a7e26860214a26e9dec32559aa36fc5dd0efa3deda1 SHA512 77fd5613a21fc02e675e861685cb422ee831b6c2f7c24c32148d7eb90c064787d6fa933aa6c8bf6aac60f66a3513b98451592b78713c597af484b9e302ccb606
+DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.mod 34 BLAKE2B 1fea82f0ae24add73e084ada4930a6192f6f1d7afac47e2fd4a018e0167779741e4c948ebe67965751a845fcee894fe88e57a1e42a00a8aba2a6589dc73b30e6 SHA512 c71392a06cc0dea75b46dcab30bc5b374eeb432aaffc678213d5896015cd31ef085387446a8086c3275b97bbfb02c93c0180f7b3bac5fc1cdf1fbe5bf7af9887
+DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.4.mod 34 BLAKE2B 1fea82f0ae24add73e084ada4930a6192f6f1d7afac47e2fd4a018e0167779741e4c948ebe67965751a845fcee894fe88e57a1e42a00a8aba2a6589dc73b30e6 SHA512 c71392a06cc0dea75b46dcab30bc5b374eeb432aaffc678213d5896015cd31ef085387446a8086c3275b97bbfb02c93c0180f7b3bac5fc1cdf1fbe5bf7af9887
+DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.4.zip 369369 BLAKE2B 767b144fb300b7a0ef94648f867e331b24a89e1d4d56455fd7cdb6c8753cf1799206d70bfb55dd1ac30dbf9e976fe81de060c4c6e12621e9c5bfff61f1731103 SHA512 7f48511e4c05ae93e39a6940932c0fc3377dca29a2296ec7ea1711194840c58ec793702b5770469a14946412878cbf1d0e19e647b0e0ebb1bf34fc534c4732e4
+DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.0.mod 43 BLAKE2B 99324dc9b41ccf0b0012c4732c49c84d206cda9529e4d1ee58bf47266f1eefcb64d227e7ad285dced69c61e5a5d41e84d768bdc45a2a59df6bdb2b953299e6ad SHA512 e5b3325e43c7308becf2c0fffbf969d26624dd1f5a81ac47f91bfcc6adfa5d14f29f32d97cb53814e11a09512da3a0053deed3d0e8dfa3fa21d7ec180a84b0d9
+DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.0.zip 377597 BLAKE2B 290bf4c61fb718772218516ebf558c8cb9badba01ab9c68e886b931ca7606e4e18a96a1ee8952c01d4b755a0d1ffee748d0135b85b59ccf2972d0768d561dec4 SHA512 c59f96886f022764270686306c95b1a7ede1c8bd9be669e85587334f609435bbeb03070f4c9d83fe45b04ea60fefe6dfbbc9b40eda44294bee23732f6ae94de7
+DIST github.com%2Fklauspost%2Fpgzip%2F@v%2Fv1.2.1.mod 34 BLAKE2B 9a841f2f76972fa5d9b89395c421d1b4addf03a137703bc8f5296a2071a3db169c993468489e59ae3eb51c4668c1eac2a8dd27b742c5af923d379dfd0651e826 SHA512 cd08026364570f1acaca890fe4929ca5bafe90b4088f764a077952ce4b52e8d92a8a09e4bf264abd209a161ed47d9b6f572ebd904af2025da3696dbf79b63d5c
+DIST github.com%2Fklauspost%2Fpgzip%2F@v%2Fv1.2.1.zip 123712 BLAKE2B 70971a08aa27613efab8a16304025e681d8b0d8debbf5bbb9a0c251d72cd34aef23fdc114a9ab94fd751e04bc9159757cdb777bee802321b55d9db979005677c SHA512 d94b89df25276dad13e46f5430bfc321b33c1adf977f05b6e9bfb401a135aebe0f03c0ecc6b9162ac0c7b14e87aeefdca32dfc0547af95c90d24c6cb7949677f
+DIST github.com%2Fklauspost%2Freadahead%2F@v%2Fv1.3.1.mod 38 BLAKE2B 2f53e9eff9b94e18231e50504f4a3e92b7387f3365186a52efef5945d31ad1bda8f683749e3c4e3f2841e0abd395b3e76082bfe70a4b53003bcc537118e140f9 SHA512 f859515c6c26ace0514192ef8de61f360310ffc13cd1a0ac87f35bd945e7ac75d5bc8776ae056e8ee4f3e305e1e905a03f8af0c62d29ab70ca93c7d7022f0fa3
+DIST github.com%2Fklauspost%2Freadahead%2F@v%2Fv1.3.1.zip 9234 BLAKE2B c4bb053288970ef0345789b4eb294283b925a691a4a9c5f4b26bb5affe4bb13e77dbbf2de722823805c606da9d3556f380bfc184725bdff8700a3c68d7bfcbe0 SHA512 c3fd07324ff36c60335e35b3b51a26723f757772f06d0ac7fb22b2bedac3ddbeee36e7a515f591b1430f6ebb4d816c49ff899b954211170d37aa890657ce319e
+DIST github.com%2Fklauspost%2Freedsolomon%2F@v%2Fv1.9.9.mod 97 BLAKE2B 164e15051ab12e3ae0e027e73dd84aea6ae83cb265f76c1fcf4ba2cf8b256ad387f3b4bcec44b93e6ecb550326c570e34bacaae74e239e7ae9627e1e29c0e104 SHA512 ad0eecc075d0b2b5545b3b42be9bbbea50accca25f2960391678a2b203fd8a11df976c7270d79753082919f779b6493d7e25f497fd37c9431388c22cc1c8ce73
+DIST github.com%2Fklauspost%2Freedsolomon%2F@v%2Fv1.9.9.zip 218614 BLAKE2B 0af87f09a9b66e617c9d6798e0608e8374bd2d73d85c6bb0ff8861c5a0d14dd10a20719ea46a7cce891ae110b1c1b2936b21e7f4778dc5807c0ab2aaef063dd9 SHA512 4a9055065d9fb169957e4fd94a237bf0addecba3ad77ad161acb03c37afb2cae79f32d33344a60a6c81d439b4b000108d75332a2219946f922ca5924f8e72e41
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip 3567 BLAKE2B 80b7bf217df9367160180d44c1fab6a9f10154bb9a6455538860158a08c5bf8c794fff973b899b1376e4e65764a9aa0d6b8b162a6d9ebe1adb1368b9a2a42786 SHA512 27910ae03fc9fbf573ac31454635c43bfd771d2a91325eca544f7be0e24b43c2798ed8e74b4c31e8c20c1a9cd266b835017aea3a3e24c2ecb43a14a6143af8e1
+DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod 28 BLAKE2B fddd4b3cdef60f53bc3f8da5a3154d10b49dd180c12837d3740c22b442947cba2025649f3ac7321bcf0c73a272527659b0ccd9be141ddca13caa7594bf6ad3fe SHA512 3c623d077e39697506174a50c0380cb7787a05a52819b1a73c2f64ba8dd819fd500777de83c83d8d9e80f19c828128a569b4cd783667b4d6b9a375b0e3d527a7
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df153e027f22be7d28eefbea1c0adab10979f19d601b95d300c54086b5ee388f453c73b9931339b9b04208fc5e6512385b348c49faff5488 SHA512 bad73f3c47f70de55a90a977a1e2b4a68de545a8425c71533de081c7a8f71d7ab1b489001c56ba2e88dcb78c08804275f7f8128c812f50d005a074ed6dd9286f
+DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod 68 BLAKE2B 91222794e2d517a33cb43bb9430e2e7b497ace820ab8c47dcde253226e54f08b922404df7ba7a2dc74555a059e95b81471dc36fc5b63b55e385004fd9a16d61f SHA512 9fbff125d97ce2c4b9b301021a987edbeb686b37927504df4e5c2f0ddbebc8ed28ee5152de7db2eceb0a0fc5728579823dc4145f36df9ba1961b9c2da1ac4461
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip 12607 BLAKE2B 40090e35e5bfb0f1570cc11a3d3c3b6f9c4d097ffadb161280ac4dda90e7b74fe3784dbd31a74be243a2a0d6f3f3273f24a0dcb07523c7db8975171327de25d5 SHA512 5fbe5884d311244c5250d4a1b249749a84fc6a50d4d5d6b3967a4bccb317ebb807917fe540f13fea788abd863d7d2f2537a40b57cf156a3f920b15cd8b365ac0
+DIST github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
+DIST github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.zip 113516 BLAKE2B 885fbeb080558f74b09f37e15be84799ffbdf002a4a10c112a0556f740e4b21086ce86b7bac60f593facea80b9da8065a840b061162516e8395986f016173e78 SHA512 8ab5fdea76b41e30cb451748e1184f220dea3d5eacd8f3db9f4df802551e7740a37cc81a64d817e1a89c68879aef7ed355a5b4de8debf5a3da8dbb70af5b56cc
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180730094502-03f2033d19d5.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180730094502-03f2033d19d5.zip 107861 BLAKE2B ff5f62fc09efc839037e890ac6a175530bd9fa805ab512af05c83274301b62cce19474fd37bc5a154139c149b6bf8c8451cbb57268a7d8f056003dc6cc22d91e SHA512 ff6f56e0b30077b18306fe8d3490501d974fd412d4d84b72fbc4a26cc12166cd28f02e8b84a240c1cbfcf280bbb3790ceaba0521f219e5fc164534e19b453e24
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip 12838 BLAKE2B 668586a4df02fa2d5db174a4ada1245a463946d4bccdef2599b791414af4f10eb07f56c61484977eeb21499db7f9b46f8fea03feebbaae5511504c13e3f7a64d SHA512 c3104e921a94b1a424cbf6936e8e5cdf5823947132f41190c211e050c9c8b7135c7b319eee0667a2b958c9f4fda27b9cbad4436d37b512e269716249dbfbef65
+DIST github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190610004146-91bb50d98149.mod 35 BLAKE2B 0a7015c7402b5f49d0778bb3fdd06dab38d0a0252c40d08b0e236c94b78b7d6d7970e63efd25ee038f94b0d150979c1f81753ba1d73b34cb79ae5d57f18fee2e SHA512 66fe9fc0d2bd738f679bc576f84a807e5fa393b174d1193b448a84098cf1d5f17f884d4dc7d177092d3675176ad79070d51db45b3a5e3383246710e0f63d2018
+DIST github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190805055040-f9202b1cfdeb.mod 35 BLAKE2B 0a7015c7402b5f49d0778bb3fdd06dab38d0a0252c40d08b0e236c94b78b7d6d7970e63efd25ee038f94b0d150979c1f81753ba1d73b34cb79ae5d57f18fee2e SHA512 66fe9fc0d2bd738f679bc576f84a807e5fa393b174d1193b448a84098cf1d5f17f884d4dc7d177092d3675176ad79070d51db45b3a5e3383246710e0f63d2018
+DIST github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190805055040-f9202b1cfdeb.zip 14964 BLAKE2B 2333db9e710f4d9c473bbeaf52ddedbfa54196de97a9a696691aa47823b0de0972b12d6b6041d4215368ee87087cfec242fa8119d47683ce9170f1ae451ff2f7 SHA512 8ece0275af60796f831e2670b846dae9b36dcb405aaa177b5a531bcecb57a8af14407abd05ccf4bebb550b790cfa6d35910b0f4ca383975a2c9d140e66ddc76e
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.zip 7430 BLAKE2B becaf402e397202c86c156c3a5b7ee8f785290ca134d87cb36106a9496d18b1b45e97d306c6280c7186976a18307a7ef04d6ffa29a2e6cc2a3dd378fb400ff44 SHA512 1a7efd886840455b37b44b4d0c048b457eae14e509a740455db995e84c98f8fe94449e7dd11c544ff241e784ebeedf0f60c87838adca21fed08146fa3adeeecd
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.zip 22344 BLAKE2B 9dcfe0ef5fb4f7e493f29ed3e5edc8ef2744351a4e2a5b70f5a8931b503925ed58b5f5f58e3512fe5fb5fb8d2e7bd1598037f29dac4520e7d966f60ce5f2d307 SHA512 fb2bd143a0eb1be1faacc0069ec8c2d53b16b6969e6c4dd7ae4802f16606a80ff1c362712f0836b97f1453df468e7e12bb5dfabf9161436fbe9b87231f593068
+DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 BLAKE2B 50d2d6dc9c1ee92d629af8c9aae9fe5f70a0c6fe270a95a8232cee3c50132ef90c68218ac64a3b5b72d94e23ecbea5f567fef39a81be3d4585bae3f4f5348545 SHA512 5235188477921a263176fefaffccdaca4bf8175a2e248356a06596e37fa868400203172c7fe9fb80d0a65d335d23d80edefd242657de0eb83d9360589e063bba
+DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip 44378 BLAKE2B 15ccda2b94bb024656859fb8a6968782b9a1bffb786b0b1ed69a3284b01f4a2100b3f3c46b6ebcb8f7febedb5bd4f6762fe333b7d4f1d14c700f8fce60843352 SHA512 e9349ee2a7d5e5b129ec6a1c0507854aebca82cf9ac2d0a681cac2f4630ea35551ede48e1931494362232a83dc9f26b6b4162c6114e0176084c50101b1da46b0
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.8.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.8.zip 207556 BLAKE2B bafa0946bef80e2083bc40afef64606b4712533d23b01374542afd8f33c2832a9310dd29bc5279dd3f66d22a7f4d78e0bffb1f320f3eff767c35b80fb9982389 SHA512 9913f6315e541dd696f5c944e7c93675e88ad12e3402c2335e28180dd4800434a6bf2771af290964f5094125e2ed1abed191682c1ec80a0f3f856e777ec26c0d
+DIST github.com%2Fminio%2Fcli%2F@v%2Fv1.22.0.mod 142 BLAKE2B ef1038181556372f9179bb6bba965e968b70a8b26585cdcb9493061a7c36242ee722e8f498d1ea51ad0e771325bc7b849f716e4952e916e9fbccd432fbeca284 SHA512 c1b9ec0271ab06f698c558c6a1e6469f485c36fa94f101ccaddfc5eeb52b6a88f1783f0aaa16ac0f86d4a173ccd9a1be9c209eb07421c61171178084e6d7cb49
+DIST github.com%2Fminio%2Fcli%2F@v%2Fv1.22.0.zip 73956 BLAKE2B 9f5737cf47f30317f309a2e44a9b017e4591d045964c60e8bf7ce04dcfc432a3949a220735903e3715e567cd1388c468173668cf65a265c87955c72122b3ee04 SHA512 e8936b5ebc08adb497cd19f4fcae42fc72f094614ad6813c974c8e0cd8352c45a64677aa472d2040838add9a7941ccd81e0e7eb60aa238e74c81af63496a33e5
+DIST github.com%2Fminio%2Fhighwayhash%2F@v%2Fv1.0.0.mod 97 BLAKE2B f78124778b9637f9acfc3650e8e300490df763e5d339450f47f391c01b44850be396eb98a762f1c7208748e07930f6b7bc29e96df0cf3b782fafab07baf2a478 SHA512 2337ab724ecfd66609370f15bb23a0f71c9dcc9590c16aab8ea4103b71b18bd9ad7ac3689c5f6c0db2f6b6489cf079050175a003d411119efbb6b7ffdf38203c
+DIST github.com%2Fminio%2Fhighwayhash%2F@v%2Fv1.0.0.zip 24630 BLAKE2B e4da6b6ce6259660d94cb9f10ebfa34193a7687eff612e4b1a20e603570ade9ca59c5f7abc33f53488f6185d155e0fa3c044962f9806380ad447d3166218502b SHA512 75c02388910a83553ec854c5d15f122be51f931e1af44eecbc8c0781fa7b27d0007c4ec39e37223cf40ad6e52b549b36af12eadc8b20cc96eff00fd85dd94960
+DIST github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.mod 90 BLAKE2B e375688bb7c11de48d29d17c72a3e7675fd36d4c214bc39acd6d73386b007b51c34ff050b1b6ebf251f1f1cb98ce0022246ce7280a91f14d2136ee3e226f05c4 SHA512 aa292d2eb3045fa595c28c69fa87c329e6bfe29f2e88d5424b28a5b6270a869cc8455a88a6c076cdc5e6c76e36dd7d2d820ea7a8f3995c0af6374ab5c02ec735
+DIST github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.zip 106445 BLAKE2B 5aa2489ac1b0c4dd5c1c633731c7db35a0e84afcfff3d4317025d16e6c7f62e9a06ee1c56072a26ad45716f90fece953dca9b0831bc004c4081eda012d32944f SHA512 431bfd66971e8936204d8bd9b02aafa25e4300b3a3d8d78f63dc8f6e5dd0b436e1987074b5bd52e856759477f6d154625b5f1c565146fad909ce510322721b79
+DIST github.com%2Fminio%2Fminio-go%2Fv6%2F@v%2Fv6.0.53.mod 448 BLAKE2B 7930fd2bedc2317afd815a96384f0c2bbc3b7eaa91f62e8a82ad30828412f7b92384a87f31aeeac2b6410722fcbb79d28c2d017938b131bf2c6afbf6bb55fccc SHA512 2679f25618da714f36641d8361614860df775b8241f3cb31e00eb7dd861c2bacdffb1fb6be003298cbbd975f938a96ee8f711ef6b16845074debcadf27b3282e
+DIST github.com%2Fminio%2Fminio-go%2Fv6%2F@v%2Fv6.0.58-0.20200612001654-a57fec8037ec.mod 518 BLAKE2B cab9e78c6c835ffe72bb26db0b47da1b364d93c1bc450ceef0d25fc7ba39e1cc5330d6e38dc955c0237e04c781e968569697ebe81867030407b7bc6efaab5e96 SHA512 d0e4dcf05a6ef0bae5c79290669ed2bb6d5ba6d1a2f99b03fd95f966197ba013da352f35a62348f315793f77d6ae1a23e5de7c2f69f6bacef4ac516aca8dfae8
+DIST github.com%2Fminio%2Fminio-go%2Fv6%2F@v%2Fv6.0.58-0.20200612001654-a57fec8037ec.zip 401155 BLAKE2B 3bd7510d9acfef2a01ca4ce84e505f3a625a18c57c55d447455b1d4210069d9af018a72b87379aa35b3c1e89a4f3bfa95e878913be69f1170485a3b167198991 SHA512 528c1cb51bdda894e96b42d506039233316d1f92d2f29002bd09fd2872f9eea18ebd380882c07a56c3359ead6576965f3ebaf87a08ec7dfcc825a694b97498a6
+DIST github.com%2Fminio%2Fparquet-go%2F@v%2Fv0.0.0-20200414234858-838cfa8aae61.mod 361 BLAKE2B a86ef97440af55d32cc26acef2be61994984f90d55ef8478c3d63928cfdd3d764cf08e9db3d594c2fcd0dc23790712e6b1392cdcef28cb199a4ecd52b881c85a SHA512 b32d9ee8ae6b0e1cc054eab652be2b94cf0b347cf44ae986177713180faad77f43753823c112a126b7e8fd2ed1835ec6ae786f7a44b55e8755d8d63b1a79f013
+DIST github.com%2Fminio%2Fparquet-go%2F@v%2Fv0.0.0-20200414234858-838cfa8aae61.zip 120463 BLAKE2B ceb3bf92de7fd6ecfa816c991f1b27c11168dced6cbbae54efd74c04fba593787802af2e1de7976baa42f76f00cdd41f765b0ddcf4981ca1f55905b40862c8d6 SHA512 f40378f0623352d1610f4ef08ba323c2cd8d6dc5f570bce5b3cdfdba1512fa98a3b3aaf8f876f6a1479cf942765b1e8e0e95a5483842b5f3f70709452ff15c73
+DIST github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.mod 45 BLAKE2B 4868e4a4afda265cf4dd2e7c5a25657237687b3b1ba21d24f280174a05dece76ba902c1447586a7c632a961b8454a1d1c8a0e7d523fabcbf98dddee26d26e341 SHA512 2341ff459cb2432feff920048aac90868260d97c5ff68724b0b7e22c8e5c65da2b4055026d74578983020e24506d2f064e47e3fa247a4560a37951e205cd0a15
+DIST github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.zip 84306 BLAKE2B a22f077e8a63a951ca47f6d62a6de017245ae81ad57f788996c9efc722a5df7bf3ef9cda993ac8c524d75a95a2218732471d46d21e8bfc56f324ed8b126ba1ff SHA512 7732e181c4a620e81e77d261addf74c7d7edaa50fe41f13512124650a572ec258ebac8a4144bffa3107115f9c65968cc67a3aa5de8c8dbfffbcffceecfccbc63
+DIST github.com%2Fminio%2Fsimdjson-go%2F@v%2Fv0.1.5-0.20200303142138-b17fe061ea37.mod 168 BLAKE2B d5328a5512c3f594d73b9d7cde0d4774517dca0c969b86039f5917a612f4ea985d511fd8d587ef48f2fe159d24cd937251c9237ca4404fa992eef4d2d1179c2c SHA512 f20f976b019ed5f6e1b9fc95001a071f6607d865d5b7775a9a1ef9c0c18a0d8ff885d8b0de3d3369e2a27b05109cc85a14858324b6e57e8f6a28a14762f2ea43
+DIST github.com%2Fminio%2Fsimdjson-go%2F@v%2Fv0.1.5-0.20200303142138-b17fe061ea37.zip 2054969 BLAKE2B 01553d4cfb7c4a600ad5d19a1be89e35032d7404897dd6f36e0bc3dc995780ccf21a852f3fe5f789fb91a9ad62fdc902f5027ce79a5e90ab94a39627cae1b4dd SHA512 62cfa350705954d296db055e0cf8823818053156c0cc45a77140af269eca670312c353f7661c62377e4f4024ff8764dacd48de0cb1fdaf84bb911afb0c240f74
+DIST github.com%2Fminio%2Fsio%2F@v%2Fv0.2.0.mod 150 BLAKE2B c056c78e39be34c6f786daa8e4987f2c2bcb966960ddc4639183dec4308fdd04efc44c00b4ee5872edfcd94a6b83f3446c52211b632f7c5d6489d29ce525244a SHA512 1f7765e3ebbfa530f75c36aa6ec9d68af38428782a1dc64f3128445437a1604f9b5179ddaffe48d57682718724bf9a086c9281b6bbca3fc3d26182802e40e934
+DIST github.com%2Fminio%2Fsio%2F@v%2Fv0.2.0.zip 58650 BLAKE2B d46e52e7c105d302c4c252832d85f1d87c7fa1daeb4a55f81b4d31c541a1e490c9e3e70d1bf34d589251f2f0bab6411b9a1901a828f168c1ab2d81f4e04f4ad4 SHA512 41ce70c60619d32d35308957d487558e6080e4e9f79c25f4fe1ad2a76c22149381a95289c5c41d16456016569290156b0f24f8f73fe0c564b4e96af4e5bf351c
+DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod 416 BLAKE2B 845f9f6d79c8b18d4a070255eb93aac9afc50ad01593fc5c6076c59e4b5c09f34856b29ab24809a67fd10ffc5cc28908faff8358a52cc8885947c53622d6090d SHA512 7cbcae5e1749c55a0c3fa25b007035c0c44c8f982a37635735afb95c63a20ba019a51e74244c568a170b5a379ccb10cc8c9df716b6261d324755ea92c7f462f4
+DIST github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod 91 BLAKE2B 22854387f9c0bc85c6f4b7b9c5ce8a774c10c6be0c43ec6d188b6ff2f2e394ffdedcdd1bc0b8ba0e31fa3c418cc9339a78a798beeb355032a0724b284573c38a SHA512 8858ec62f3bcef65224ee7d66bbc16c080b2ed16609c46c5c6b6d983b9f7eef9e020a2ae78a16d0226c0f02c609ec5da92565861c02a81494cd6060dd56d005b
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 4163 BLAKE2B 7e00360086a04fb62a46ba20a10ac3460b364aa6ee09bf46f9769980c086db04aad45c4cbaa809a218f207c086876678d708a74d0a7679a48cf62b0b5edd48b7 SHA512 06bd620730c303df004e1d6a06a1aab8d83551d594c28e42f8d43613153ac28e6a5dcffaede69c84b2b49027b62581851a332f1397a2d6df9a46078510f7d1e2
+DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod 49 BLAKE2B d388b11419bfd0c80b52fb3bb5a2600712364115efe7b40ac02ba2da11d40ca30dffac19646056a4aa754de05c490d1f68af4549bdd1fab7596dae593eada97d SHA512 3e334e248e9584b050eb81bd23071a8542185c64b5f112f46b82c6842d2b8707099403bbba1b8485d64cd62faaacab3fd52e868bb405ca6e6067034e66ffc51b
+DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod 49 BLAKE2B d388b11419bfd0c80b52fb3bb5a2600712364115efe7b40ac02ba2da11d40ca30dffac19646056a4aa754de05c490d1f68af4549bdd1fab7596dae593eada97d SHA512 3e334e248e9584b050eb81bd23071a8542185c64b5f112f46b82c6842d2b8707099403bbba1b8485d64cd62faaacab3fd52e868bb405ca6e6067034e66ffc51b
+DIST github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod 40 BLAKE2B 089a3d8f85648feb04c692c4e108e1e843217ef67fb3d5c00ffec847c06eeae55a9432c206753cb220595441da76b635f33a9812ca92f04959b4e7dd08644abb SHA512 e8e4f318e3cc6d203ccc62c0b47af2aebee3fb99680cd6bd24af023442154ffa9c3d4bcf9064af5220f01d3cee71e7c600e465e3651ae0d7d15e2abee1caed27
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip 25943 BLAKE2B 9cf08441a9bb45da31ac429a372a969a822a0c5de569352bc25403cdc3e8559a7110dd2612cc9b93c91882973aefdc70f8ddadf44c1488eb0c3f5bc62cca2b73 SHA512 43d57d9ca99ee6af49e8a39be4d65799afccc8cb077a8c5b473a9147eba30d4653a8a4cb86abce66d4c8639d1eb0d961c4a50907ce9af2b2864acb615a2ecfc8
+DIST github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod 40 BLAKE2B 82487f50b9cfb3e87f2500b992a68361ad1971106763efb2ae4833e3a0505d6131b87aad4f994d203123b8fde60d5799afe67704ae72d36b3b4e85240ace49a6 SHA512 e7ba1cdb05cc6f30a57cdbfd08d55766cdad89875e4db393c304c5004d8907d07952b9b7f542bdec1c8b2f722fbc5d2283a8ff9cae53b6da0f3b075b8d05f60f
+DIST github.com%2Fmmcloughlin%2Favo%2F@v%2Fv0.0.0-20200303042253-6df701fe672f.mod 165 BLAKE2B 59890a99406488e080ad3dc4e0c3dded2b8efec1c1cc7f9ad2b412878861e25b3ec7a1f9a9a20cdd3c1df4fbbc9a98d42de496748730cc04283540faeb015b7a SHA512 cb9f370048bdfdc95af90d6dffb599ac5cff2afb9713d549a94d8eb25747c4231a5cd3e884d14c82bbc9bc833d523c4b152da9b341312d89b25336f611081e35
+DIST github.com%2Fmmcloughlin%2Favo%2F@v%2Fv0.0.0-20200303042253-6df701fe672f.zip 611071 BLAKE2B bcd0738ca3833adb3c7c4ea8b71af958f19e72194b7696c5f518f068b239a4213d9c07104b649c93ac4d7f41d4a047c2e409e48220bb72f670a9c3fa90414647 SHA512 40ef2d2c97960f4057780d36007371358a4dc263b51bb0b4de8b0daa1e5e15890a1c7f7da0924c923834f85829aa20b1f8102bfb7b8b243a9cf50adb8ed1fe42
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip 10936 BLAKE2B b045256d37d4973e88d0d9c6dbad7397160ddd7b3102ea8420f92be2e8c3ebf6362f350eff10b52fc7fb447d98b00f07c2bc1da3f6e442ebdb8e90103492c8c5 SHA512 e7986e7dfb362e346309cf77ee3969c2881056959e34db07d2dfa0e505106844b7424270d8f17f1a89d335071688e98b992ac81e8ffe0c98c8a0e3d145144d4c
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip 25694 BLAKE2B 59d0a645e3fc29e94a04fbed5329cfaf2162f5779f1c13bfe96c9d979c7acd1b356587b6e30760568607ea15d2088a76bb58e4504e17abf360f2702eb6e8c3c8 SHA512 8fb62179a48e212b74f0e8af79ee1c20479b1725c089c75a12b43bf4936caaf87d42b35f2b7a7de87c60e793347bb185486beb8061e588b8085ac354a3ef8562
+DIST github.com%2Fmontanaflynn%2Fstats%2F@v%2Fv0.5.0.mod 37 BLAKE2B 19d1ea7d880f811795d06af263c6f11c05c45b65e95a035b0a46bc132f456c41a5ec726fd934672b88129ce172ddbf5d584f524939f494cf3f6ae66671d6ea31 SHA512 b624ab08a47139a1fa45e00136e8199f27fb2d82b9589ea9227a323a7d7f3e0f58114876c0af82281ff3300eba8b1241ba804d73e63370768f58881bf45fabf7
+DIST github.com%2Fmontanaflynn%2Fstats%2F@v%2Fv0.5.0.zip 49057 BLAKE2B 4e6cbad85a1d357f4bf5f3f83bec4f6ef9e4b78e74cc2cac5c11b4ef90a0953eca5686ced1888ddd7e2219dd0f3f29981537e55b8bbb64bb6b66d1deac66ccf3 SHA512 82f57fe77e831838d0d58424f7e489ca84a70c9162c77f5dcd2682414e2483f57fee5438bccc11c14376fb38030397f122c36bbdbac08317d6fa2f037e570820
+DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
+DIST github.com%2Fnats-io%2Fgnatsd%2F@v%2Fv1.4.1.mod 33 BLAKE2B c1d48e506ce6e7bb20f424d3af8685f1b8f9a0d7ed3725654b164f589fe5aea847c1d630bc42a98aa5b4d549d540016c85794dc1ffb0faa789a5bd3bdfac05b7 SHA512 98508680148e2294cc0440b3537b0d9e115a153d5c8776c111ee627785cfe9226e1956249911b00a7108cf47d5bb338999080e37981db725beee426b11f48bef
+DIST github.com%2Fnats-io%2Fgnatsd%2F@v%2Fv1.4.1.zip 396054 BLAKE2B 74e03de92c8fabd9e9bbb483b58a41e5ed969926aaa53cfbb63182850986331b3cd387f61f695a16e364a6616fb0d5e6fb40542b2ef50428aa7cb5444bdacce8 SHA512 41ba1fc42c06fe470b7378059fa999331fc03ca1a588d63e01b239bc44751db0c7d0925ee692666060667b404f21697bc7183bceb2e8e44076cec00db90088f8
+DIST github.com%2Fnats-io%2Fgo-nats%2F@v%2Fv1.7.2.mod 34 BLAKE2B 467fee0e8b3a00762095dc1ce84b14887d816c0c9b4a0e9c6a1c502dff081ca9f7fc67e3aeeb6c3d260827835562d6f305ff7d8ed9a21fab5d4e78f38f5d9dc1 SHA512 dcc93e6686e223934a2b71532755c55a7de6a2d70019da03b9f3328cea81f898daa54d8911853996836593d43e582dfa326e83c079cd977f373db4850e53f7d3
+DIST github.com%2Fnats-io%2Fgo-nats%2F@v%2Fv1.7.2.zip 161413 BLAKE2B 0d279235678a3bfa2ff97dd85e5b91d74a30b905925cc09bf9662eb14cd944c2cee2d4e4aba5e785df8d3af7798ca67e7c790b1c116fac02871b7ca59e88d6d1 SHA512 ea4c7021b8a2a8e9a0c4f0c3d686b0051e7bfe7e42a8a08eeaccfc9e315a7f540886f54a00cc0538c27cd4b8a2efa568383dd459cf873dfb732a83d61cadc5c4
+DIST github.com%2Fnats-io%2Fgo-nats-streaming%2F@v%2Fv0.4.4.mod 44 BLAKE2B 7bc50313fa869fd356f1ec6ddee69b9108e3f0298010046686ef76bc3d23653d785580086859bb6bca029a688a5c9df495e7d0a58131c34eb4a81d0a24d1dcc5 SHA512 5c930bf8ea653400328517aa4694424022f516080445e5829541f880c80450b91149348935a3a648ec47cf131adf33e74cbb1a0fef8120a522f44ad67702084f
+DIST github.com%2Fnats-io%2Fgo-nats-streaming%2F@v%2Fv0.4.4.zip 57398 BLAKE2B 7f76e381e2cb9bb342c3fa9ccb0cb74cf6398434cf94c9afcaa0ff60b65cd899ee85894631f81337cf03a21484bee66e98dd95d60296794e132195c18db20c46 SHA512 dc979355cf8198da52a0801b38fdc7c186ff5a8581605f7b7ee85275b6b2c06fc1499f2ff9bab3297ae409154d761df0d1dc92a3c84bd31baa0f8c9f8cab7c9f
+DIST github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.0.mod 71 BLAKE2B 01b34bcadbbfc83fd26f11a51b23b66f59212c6c9f9f669ddff2d19c7d563df24839933473705b86c235cc143732398d11f0ce2af1979cebc7594a742e325019 SHA512 8df11664ca01688c0fb0648e6943c13fe0c892ddd94cdf88da039470449726ecec8b0eaf69f0e41f277e9248502325093e698a8f949a7fb2ed9b59fa28bfa4a0
+DIST github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.2.mod 71 BLAKE2B 329c114697ca9dc1dc69c4fcffbf488631b0a9648533db756495778f7ceb6de109798fc9c7e473c3cdfec6a049d6e21acb10ba6b1e2ec11cc2c2a99c03f7da81 SHA512 8745b75071b79f3dea777d3eec1e0f74cdefe5b202c8075994f7e68ba8e9bb87afb70d494fbf55944b12182d480da1c1f45c9f057c789b82ec2da81eff6079a2
+DIST github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.2.zip 58554 BLAKE2B d5afac79067d21312a6d14caf0f0454ccdea43f699a073b03a909675dd367d050dc3aa4966d359e540bcfc945300851f12b73b57c4b5df867a182b801a860992 SHA512 2a7512428585894b1f6c443218cb44aae5d75269bacc933b1bc5aea1e9387dca78f3676a59aa66fb5b0e8db849d8d28ff63b5dfe5b875ec726856047529a2232
+DIST github.com%2Fnats-io%2Fnats-server%2F@v%2Fv1.4.1.mod 38 BLAKE2B 35506517ef7a63714ca7b92b0516153d5cb4fa4303d9b8a66df47af850fd1a4e3e37af6f99f04a604317f9673e48f0dfa5d4fabf115f7d74ceed3583223806ce SHA512 2d66613a509df340176c1dab8adc4ddb25f718420a56024614fd2eebb9142b63c13e249b3ef2e2f0309c0860b23f77ca7c1177e74ff1e10ace00f7b24624226a
+DIST github.com%2Fnats-io%2Fnats-server%2F@v%2Fv1.4.1.zip 397894 BLAKE2B d8559eb114aa5d5912251f7685cfb1b954c2d920d9e2590933dc45617325e3dcbe6e2a39beed0c20354a74e824ad444a8a1823b85dea979db77f6ae5e9c85963 SHA512 fe142f57e5796eb5f8269cd93f7d24a872316afb9630f3fd7fc4da34a907667866f5a6404253786699b69b68184f9106e4cadc1bb11dc6a0bc40a54b169658f3
+DIST github.com%2Fnats-io%2Fnats-server%2Fv2%2F@v%2Fv2.1.2.mod 341 BLAKE2B 96093120c73925e7a1705fee52cb06904bdb530d8f730f6ca7832ab0646a7762e012019020ba01d3781765cd3ec849bcfac3b6e903f2dcd53104c87bf845ba73 SHA512 b555bd66ca72fd51b16a45f9e21cea01a748c44c5dca1ff248efdb5dcd36b61a7a5527f3afa9d50415f6cac56d998aa8590f65e7c0a7f90888fb174fde83067e
+DIST github.com%2Fnats-io%2Fnats-server%2Fv2%2F@v%2Fv2.1.2.zip 722770 BLAKE2B 27d12450bacaf136097b7b8f5fb8726c36873df76dd3c66f73fc662ac9b1dc308845482a9c97307d5f8aea39d41198922f9feaa07ffbeeea94370414cf0ee6d7 SHA512 0e72accfedd9e490b8a1bebf91c872a4a0c0388875a02b44fc2a8a1911eca8fbeb495c1be081c4ef235aea0ab6a256e35e9c8977703f2f3c33b285449d5a22c6
+DIST github.com%2Fnats-io%2Fnats-streaming-server%2F@v%2Fv0.14.2.mod 48 BLAKE2B 21f4cc15776ffa1667e6e3d434c553f372d0b4c8a0dbfcf8d1da8d7e04718af3bb6bbb9a63c515717ce96f15ab6788e480eca99b49a584aa4c2d802cd962eee5 SHA512 51582ac5a85a9751d4cb6f913c64c185029aa31728892d03780716447dfe97e2568c4580b2c5c8c91b22cf7b76fc2dd53daa00cadb8a6c80de418fd7bf510281
+DIST github.com%2Fnats-io%2Fnats-streaming-server%2F@v%2Fv0.14.2.zip 464016 BLAKE2B c51894bf055404d0956f8c571d8aa3f8049f33dd5d2b526420ccf45ea0e2d628e4a39d869161aef8db21a55f9f541894bb2c28ece7e733251ea66b1266b28e79 SHA512 312e1f6709d059e60f6bf4c856c53b846bb5e34e1b6f59890c0f6728e0dc801c120b8ff18f8865321db6316c8ff2b72dd8887f11ef373ff53aadde2d7cf6c609
+DIST github.com%2Fnats-io%2Fnats.go%2F@v%2Fv1.9.1.mod 143 BLAKE2B 946454f6ede7f2a46621597850fa560fdfa9b6a08a53c0aa95652fc08178dcfea523a57fc8030e5fa101128d697794f5a3bac20a3d92fd436f960975c3b18d63 SHA512 9937550a5df4b906c0e3af1777b64d119f6adc98f73738c2a8d376d665baa7bd4d0e97da7d93f0622325d80f84c3fa374d72e706bd945e50006b10f8ccce6a4e
+DIST github.com%2Fnats-io%2Fnats.go%2F@v%2Fv1.9.1.zip 166476 BLAKE2B 94e97d6b464c9abfa1bbcf62bcdfeca099203893ce731b6572ac58dc996ef70011ca1edf29c3cac182c841a3d62ca3fabf96d2baabcdc40a5d3c5d8709083ae3 SHA512 737c2d48e60d94fdd9f0d8bf14b219f8dadaeaa09cc0872c9c9e86fe8fe7e03960dde3ecf1d878c0c8a419abaacabf64081210741c31e0ae78967a8ff6f03ab8
+DIST github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.0.mod 96 BLAKE2B 071f4237c2606c161d8fc6160c818259807572f1e41dec9b753653b9dfcf4bab8c2c7d201f35d803ed876b99da693d15c1f5ac4075b556bfcf78e9fbec4d2dae SHA512 eb91e385e6161b3bc7e3e2e337519c1435a368fd98a26880cb37f3d52bdaaf23d7b07e1c7430592d0c960050a08c3f94e0a18576da214e50fe7047f2324b0ea0
+DIST github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.3.mod 96 BLAKE2B 071f4237c2606c161d8fc6160c818259807572f1e41dec9b753653b9dfcf4bab8c2c7d201f35d803ed876b99da693d15c1f5ac4075b556bfcf78e9fbec4d2dae SHA512 eb91e385e6161b3bc7e3e2e337519c1435a368fd98a26880cb37f3d52bdaaf23d7b07e1c7430592d0c960050a08c3f94e0a18576da214e50fe7047f2324b0ea0
+DIST github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.3.zip 25321 BLAKE2B 7a8a5f7c251d00627f30c988a0920cee7cdcd98e54aedb324a7b7fe2884542e0d27cca6f825a06bb9599b3e2fc07c6018840d4bbabcb3afbbf7bcd18501c69c0 SHA512 7ec852fd776067da58acd3e04ad13dbfeed7f17a2213341ba8ad406c1981efd0c8ec68a244b1bb98c7055fa001b75212400cbe314145dcf8eb9b223cab80c18e
+DIST github.com%2Fnats-io%2Fnuid%2F@v%2Fv1.0.1.mod 31 BLAKE2B 294aaa7492b6b42b366e5130e12ca72a84223fe02b4f01281ccbe3ba68dc5b515428ce95a9b575219b4688a42aaeb1a5e0dfa3bc06a1db47b8afdda282cbb991 SHA512 918b829894cfd626c011f7ff13934a2c1c12c3482ed61652ec2c59f5b94a0e8c8510e3bef4f5cbfae977df177f8eb9a123738d7382a6a6e2f8cc582d50eb10c9
+DIST github.com%2Fnats-io%2Fnuid%2F@v%2Fv1.0.1.zip 10281 BLAKE2B 78f309117cefd950c5e784bb64f6774f62797dd8419678f1d17d44c9f9b092eb7378f47f6bc4e1199043e261240f5b3493994e97a269fdfd1533c7438f6e00c1 SHA512 cc4067a1094494f168b72cc174ded31b29dfa044eac0c86c4993938561d63b7319cf2e47154c7c62afe96efbba6468bb495c0a00990d3ad2a075167e135469c5
+DIST github.com%2Fnats-io%2Fstan.go%2F@v%2Fv0.4.5.mod 34 BLAKE2B 020efdef95dfab432d0634ae6bd75e5792c3abff392a5d6368fff1757190a88a84daaf2db75b6220fee269af27689b4bbb01beff112adce566e686a704bc31dd SHA512 56840296ae58da641d2c0a50a2ea377446d384e2433a1a92e22a7bafa7df93d24fb8fb8f273666828d859addae9fc44f3e67c5e4e07098ba359e23877ef5c810
+DIST github.com%2Fnats-io%2Fstan.go%2F@v%2Fv0.4.5.zip 57056 BLAKE2B 2762163b54650997ea0a85cadadac9cc71c33bc9f25d6d9bccd5a38b9064cded9e2e888b357076ba3a0a7b0bf9d942b4380f2ac471690345a97caa58bcac2ba0 SHA512 c1727a37aebf6c2cce26eafd707cc8b17a7b7c8555c29bdbc63dc79b512b33c38cdf0df693ab381cec81442f937f96bf0bb4d8c81082c532a2b7d79732b3ec6a
+DIST github.com%2Fncw%2Fdirectio%2F@v%2Fv1.0.5.mod 40 BLAKE2B e526bf0fcbaa860ebb1790f3d31ced3b073c67462188344e1aeeb93a88023f5a87b25d2c37b4205284efb4946a98ba1f60bab8b14bd4d8dfbd67a3961e936a26 SHA512 899160c4750f36fdbf6e8dc2e2a375df08b0efa86ad8e12234e6d746ce30240cd29b2044856dc7f45835fe923093ccaa1245abe032c6ffbcb61955358f9c6ca0
+DIST github.com%2Fncw%2Fdirectio%2F@v%2Fv1.0.5.zip 6181 BLAKE2B d396ffaf09897d8a6207babf015674e9a216733cd03b8a6fa644944dd83d7aff2f9d8ceb355a17351322542865012ffe98e0ef41c8fc47de1fc9ad8140097a8c SHA512 dd29c381a25ccf1458997b93b8cab2f3110205c1c5103fa8c24beac9887e3afecb9c337a1d46e84aff499b8dfa1e128b30d5d803a40a8b392a175f198184af68
+DIST github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod 78 BLAKE2B 7cde27fce0ec4a1c5c2e5205fb962352037c873d6183a6c1d8a9d385fe6a3bc8c9b66590401f8a715960858576d100626889e02361860bde65f8b66074d93837 SHA512 ee531fe5de94a4f4fc57592864a42beaf57be600d3fc11205ff79b44615429ccf46922cc3d80ab8df77b2db31a85bf40248ce0b1e1079d6861f317828b3305ea
+DIST github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip 13281 BLAKE2B eb14a393cfba4230af192cd76a63a20568fe80ff650113640eb63d880c276307e792b0bc3339ea37f1387f78ee5e9f15a8ff66d0c4b8c8cfb09fddb1e73288fc SHA512 96747fb5890efdf10e0793afc08df1ced6dc8c71462397a0e4149f32f77470f1af6bf8fb2637693497d33a2a7483c4609380ee89ee0a85ce21102a32b7a1000e
+DIST github.com%2Fnsqio%2Fgo-nsq%2F@v%2Fv1.0.7.mod 31 BLAKE2B c5fca911d9a7c9f244149c6123b6ef3904afd74589c37f51ac24d6eebe4c20c4a850b0b7226b5073974303dece2b87decc55a20395ea36ff0f6ce0904270d208 SHA512 02227ef5bd46a087ea66e6cd08845049a3c6342f92afc97112ac8744ef1a424384a07617395f21852d8ba0c23a2f5b8b117b7ad30cb6f8e9676c78647ee16fcb
+DIST github.com%2Fnsqio%2Fgo-nsq%2F@v%2Fv1.0.7.zip 55108 BLAKE2B c8039c30c03a9d397df9a8d2274b89b6ee447bc2037e047e41d86f3cb45765353abcd038d7dd2ba374253ebe1c3246002ea842e1ac22de79d8ce3ef6aa8719c0 SHA512 d1db449034b7c15c91bd9010db60aa98a6401529ee82be75aa1a75ab6cc4378f31fdc315bb2b16a29e7c418ab6deba9d5533379879a1f1581fe53450dedfb6bc
+DIST github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod 28 BLAKE2B d1f2187d0457fbf3087b388af0e41fa8c7a6c1d54c9f22fb631a144f42adf679bd372b5fc45f8d6f33d7e3cfbd57c1b7da2c4e969ae32185281390db58e9acbd SHA512 41e5c366b775318a4162bea00a6fa4e3d5a23c2ddb5c2707e4a4fb77c42855ce407429a7cf9c8e506bc79493ad5c56423c70dab081187ea6c94fbdaa0d5040d7
+DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod 29 BLAKE2B f74d75a495f683f4e9047201721611229ecddc37ed01b5d4b5d81a06220a6385f06d0f99e514bf19cc2030fbdba6de3a08fd38b750e6651a822b10bf69c45327 SHA512 b426d975637bd2b4dddc10d7c88b70f8b946201f311859f22520d53ae0a2d9911ab358460c089771f7900d7a8740bbc0c6d3814ab8f955108fc31b7b602ab5cf
+DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802
+DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip 24373 BLAKE2B 48d3d48ea7431eba6946ec134f22d789b1e71d5ed5d421214f7c8b1803e0c44988375f1464206209a30cd20ab22da83d34ac27a3efeac55869ec24219fd835d0 SHA512 540d0f75e2fc27aeada7b736a896555732d8f4940462003fa574921d4479523ec1d7cf08697dae09a9bc1aba37b06557639ffdd8458c73346a114fa445dcc9e0
+DIST github.com%2Fpborman%2Fgetopt%2F@v%2Fv0.0.0-20180729010549-6fdd0a2c7117.mod 33 BLAKE2B 00f9f8e688d302c27f668e5d5f943b1cc058e090d7e2d32e70d56a9782f7cb3c62a4dc399d3cf97321a07702d3fdf170dec82175b8f0af3865fa3e261d982772 SHA512 20529318383fec61da3ad57a44f1b1d21011b6db36d5f04ba7ef7008a722724a09bda8d706166620ca3e346cd42c295b1c698d650d5549bef8173546288702d7
+DIST github.com%2Fphilhofer%2Ffwd%2F@v%2Fv1.0.0.mod 32 BLAKE2B 400d176245ffce370598e46c8fd88ac601298451d873a65c290009413570ed38f3c5be35fe800e95d1c23b894c9e8c1cc787ac54dc5c6b7e2d11c2f1ebd031dc SHA512 75eb2b85e2900d2e0a492e281f2b9f8b88a6b480478bc38e33b8d957ed2b65be5835f03dc8bf0903e80ddb5af268db410ce9db9a1569bc25e50523f74878fbeb
+DIST github.com%2Fphilhofer%2Ffwd%2F@v%2Fv1.0.0.zip 12676 BLAKE2B 239e79efae533fc670d44122d88a0598f2376776bd082ba6db21e48bae28e11100088c9aedfbf6a1f96c04f6b48ee6f5c0c1046e5b5a3e7104dcd66d08daed02 SHA512 38b5c94c2e75f73b9b239baf3ef371d6bc1a2ea8a9d9bd5070a68d331475b3ccce04ccf80950ac0b0546e51344566c93741a826125bccdf965ddb810686047c4
+DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
+DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.2.6+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
+DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.4.0+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
+DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.4.0+incompatible.zip 20573195 BLAKE2B 10b01b6ca3b722f92a739f5ff71f6a9a99c88e1087bc9781cedba7cb600ee8e003c08255d5ad4a80e57579c45e5aeb6aaed6c80216e09c0c6f2de807aea2f749 SHA512 4b4f48b67d2e6d347ffe2c0c17f657a6aa6328b908a8be0dc1b1a45fa74761dc973e23f00afbb291d67bda8205d11d3b92329f6d52e67b0af23d6328be888bac
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip 14339 BLAKE2B 9332d9cac7dd3aa2f4d756f0d92c911cd0fb8e00232db3bb013a0ef12addae0aea2388ce3adf79407a81e13cfe9cd4b45aeb2bc9f8b84b4e3c5dfa63b59d46a1 SHA512 f97471d54c5e73b3f59326847cdd4dbbb142a9ae790df83493f11a851d716fb407e01a857152812caf731b8f3e0f37ae151ee83300feaa73152173f6cb5b8515
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
+DIST github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod 35 BLAKE2B 763a350270dbd9e5a8f735ded2a13c7bde23a356f8f4187b4fe430b1dbf995cc9ca2dad54a38e927c07ba01b5c21f8aadcce69b8a94baaafee013d4a9fd0c988 SHA512 79b29fa26101598261ce7406c81be4fa53d79e89a7bed072abcd572d7f35f3a408da45055f1b05c7ace8acdb0ac2ea005d79a4766e7657087ca46327ebce842c
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod 540 BLAKE2B 4d43a0901fa46da74e62fa22f61dfebdf6468f2766bd43dfd487d7a5434f961d181ecf26015ff9134e8d3f9c2dc03da6abbcd0030348facda3a499af9a04665d SHA512 9add81238044589ae2cf38042b963953d507e40945118fd62ac1cbf41bde1b001a69423c50b7045b721488b3d53489b4ce3c544b68f6c4e31e340d2581f7c8a6
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod 379 BLAKE2B 6a6db2bee0b69257e5c4d37b1d5395693ba6a88bce129a580b8c0ac986a7702729ebfaec726caa3b6c4d2537bd62a7d728705dd0cc6f6d8b6c9a4460c9bb33e2 SHA512 fe6b74b26571ed4afb49f8f2c6745644cb7db7b5fe95138761c78effdd05d9948c09aded96218ca0cf9d8da6372705901048c14290a4faca56b1d05ca3d74130
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.zip 200189 BLAKE2B 24e41bedec6cddfe974d388ea7be6b0072a7e4dceab0b0d50cc0c1942f37f18a16ab7f690333f7f921e8a3f425ffc10472b40117bf80a5f8f1bcae3a39faea84 SHA512 567f4d656b23eabc175cca4517c3e357182ca92fda27ff1825ad81b8ac93c8e65e11ea3c5f5a6928350f344abb282dd5b8122465d897f2c1183b75474c4d5167
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.zip 69217 BLAKE2B 738c4f5d28aff0b5e5eaa04f50e9a4e4671bb0a06dafb2174720cc0e6fa79ee87123f55776cdc051124434a3889232d512b32d08b1db1d2cb7f54e251b617e94 SHA512 6cf7daa3b86c574afbf5d91d3d4f372fb31c06ff93d59aa128d8ef025b5c22fcbca5a148b21637ed97127e5e2150305e48c241be1ee4c1b23ae32a09f19ffaa0
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.zip 151345 BLAKE2B 9d387efcfa29f1f3c5337a601bad568aa33e0b673edb4d862ac113425b8d7563cdcfadaa5dc7c1ed83253bcb240586b2b5c7059e094c02974b8cc7b5a8cfd64d SHA512 45cad5ca810917c0d1fcd63926c999f7019225a8434794b40860d4fb1d07549bdec160278587baecefe380b988f306d334f3dceb416d010a6a13416c236b419f
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.zip 125624 BLAKE2B 3f82f687d40baf1a7958877d0a6e758746064cfdca3810f352f8b794b983546e0efa4677fb0cac4d54caa9325cddc722ef0ba18259c3bc8b17b025c8cde364d4 SHA512 9c63d39efa12d06bd8f2819752d608ffd1b9ef3c4b0cda1163c2fa80052d8bc1891a91d2d42055fe60fadaffa01119d39c54db81a1d94dee5cb81275f73d8d98
+DIST github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod 1346 BLAKE2B a46e52b7acf7ff0783cc3c18a1320f66e02ab9c6879434dccc9fe182b4c7fe4594a0be504c45ee5958e1a42c781870ae754648f5bb5ef4cd45c42d78ba189ca7 SHA512 7463ee6ed6735cf101502b6c0128c75960c55d6f9e42f37531e65afc02fb35b62d882a72f95c2fd76f3d0e253e9e70a9a2df2ddf782f53c4138135b370b69d0a
+DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod 38 BLAKE2B 091e64943724001796bfb662a26443a681d4db705219a1d7601c350b94105caa1584c62a4befd1aa0c634268867c84bacc79e235d5a8b416f6a8aa8e12192261 SHA512 f22213d29e8a0914fc947e08d8c85dbcab835cd7587e45cf5458a1cff074359fcb187ab47bdfd933c8937e393975a29e872b744ad61295fb1dee3783877e81df
+DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20190704165056-9c2d0518ed81.mod 38 BLAKE2B 091e64943724001796bfb662a26443a681d4db705219a1d7601c350b94105caa1584c62a4befd1aa0c634268867c84bacc79e235d5a8b416f6a8aa8e12192261 SHA512 f22213d29e8a0914fc947e08d8c85dbcab835cd7587e45cf5458a1cff074359fcb187ab47bdfd933c8937e393975a29e872b744ad61295fb1dee3783877e81df
+DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20190704165056-9c2d0518ed81.zip 58695 BLAKE2B 73496d9b2a116dc74259d49475f7dc0705eaf798264221ba67995188a78122bdaf8f496019ff8c9e2a66f515bb55db7428b457d41921efd8b8b0123bda4e01bf SHA512 76662964fbc2a1eb0f49952bc0b4adc84b5278b3464444584c5f82cbe35e23a640439ab246ca44f5257285b6e76fa8007676adf58fe9c33134ab2791ca59e05a
+DIST github.com%2Frjeczalik%2Fnotify%2F@v%2Fv0.9.2.mod 96 BLAKE2B 074411ba63495d8dd7982d168855b236313af86ea9170ed1f25a39fd7f46d473612da346bdf59a36d96a9401167805ee2a50040a34f96d5040396451b2c3e7df SHA512 aeb1e02a14bad917c7b50232fb965c0815529cc410766f747532508c6663aaa1f937112c9a49b788517e3f37b11b09083e4ea926b7ec6d0498bcbf65d8016c47
+DIST github.com%2Frjeczalik%2Fnotify%2F@v%2Fv0.9.2.zip 88774 BLAKE2B cc2cbe34b748a5c9bdcc5561a53c9d68c9b1f31f311ed1f75054a7938a7227cc46bc045dec32470935f9a9b42422d8520bee03bc6189e016691e11164662c05d SHA512 0e4eaddb0dbffa59e9151ff303be7ca13456395bf732f37d76ac936f609dc158580d51540d5f6d12ceca42e8c1b57729235f9759423859573130f5c77456a937
+DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod 36 BLAKE2B 6faef3be0b5f137ecc89a7875bed1f576d144f11623905c04cc44f93812b80f3e5b56f05ddb3343848e7fde7fc439f49627f4fbd10730b1e9c2c9153a2d3067c SHA512 8cedf150caf05299c5b9f8b4fcaa17e4771c613fa06bac434586048ffee22ba9501e0fa540da90a3a24f3e4f662c9517571a23a0353fbb29c881d6d6c26d5f1d
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
+DIST github.com%2Frs%2Fcors%2F@v%2Fv1.7.0.mod 26 BLAKE2B 8b06c3629b4e4371ae833fd22ee446fb963e300c42e4a92fb215f10500a826df54285a3d9718546fceef0e47f949034d0de0bf8aa9ca49150cd2d58e8272b1e0 SHA512 306c53774adbaefecb2283f1d90c11b088d9a45a29215ea7c627ec6d97027192bf5fe99a3cb473415ab47764802859ce9878e83ef38fdc4a87b4c7b0c5226a71
+DIST github.com%2Frs%2Fcors%2F@v%2Fv1.7.0.zip 19727 BLAKE2B 013a8f40bcdf2d1ca9cef088fd6cc2ffbdd9bd452d3514fbfe80f4cd5f7ef2e27f08ac9ccc575ac567649060137ee1d97af33fa5962cb79d53094439948f931e SHA512 533e6e55dbd95f9f79d794ac847b1db90c0b4515e9fd1d8d3d003a991ce8315012c3f8eb8a943f8772434b1e20b34562ef02630e472d31d8485e7c8125a47fb4
+DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod 37 BLAKE2B 6f0d51a83cccf661003d3c9a10b10fca12a5933730c676a4279c47a0b8563ae5d897845ac84079070bf47b32ea1c2ec80879b85bf8ac72b91f1a63239292758f SHA512 0af9557d073093339188a1d8f226798eccb05d43e1394ac9d207118ada9449332077161e2d6ba2327d9b736aafae79d4a08abad233ae9aca9917c677809ce2c7
+DIST github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod 35 BLAKE2B 68028ffeebb96ddadff1a781e7f0d7267d9ee0255b2b00958d9e36b6870e27630f7cfb1f6a1c90d81fa6303465d50936c66567c4b562a8b2711d459ee4e093b4 SHA512 1cf1bb0f786ca726b882a958d719c3b762ac146c01b5f57fa246dabd3fc1462b47cb71f7fa0c6b146873113a609b5a94aee724d2d624fec9651947b78d39cf73
+DIST github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip 3875 BLAKE2B 9055960e0a721a3227bf7b758ac3113aa868ddac5d5eee9f39a836f6d5289a6f01e4f97347be504bc8ec385deb5d1687df71f29b3ea8825b894cc1957531490e SHA512 1014d9b9b3d05c2ffeedf92ea2280477a9403614b6ad84631e634db98f14e28eda22fa32092d618ca2b10c13993cd82a064420c7cec5860726d80a78a1e52804
+DIST github.com%2Fsecure-io%2Fsio-go%2F@v%2Fv0.3.0.mod 166 BLAKE2B 52f70c3f4339555e6a2a618d7ec933812a98ebdb57984fde589097e4a5db1d72ce8307ed4a76219268da6209b4df7f0be44c2777bb67e1504c56ba85aa1871e6 SHA512 66b6178f0bd909e2d457fa2f1f0c4a5d7cfe65b13925329282701960a8ba75a3c825f61f52edf75a99f805cb980e476c3be8e3100f27a11da1add9706c2d183b
+DIST github.com%2Fsecure-io%2Fsio-go%2F@v%2Fv0.3.0.zip 30361 BLAKE2B 588a96b71c6ade72a04e75a266fe56125f231e7b3510081140942dcbbb6a15bbfe977155c97aae99baba4d621fdc149b6d49d444e767ffc2b8ad763ffa974a7c SHA512 8d724fdf5fdad2bdef1ea91a51a5038a1b769ef3188aa02486c8d845c9ef5bb819c56447212e67cdf265fb7517bfa604a2d20348003ebabf318996edf09661e3
+DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.3-0.20200314133625-53cec6b37e6a+incompatible.mod 34 BLAKE2B 790ec7277e4654961540dd09fcb7962328547009b0181183b7cb64972b872d30986d1e53ded5961588d89508c913b2b56dd7af3625d0e8d7be2253b6bcf59576 SHA512 a5f5d88a767a855b6ff24d7e2e0c4aeb81fb1365a7e81ed989b4c605a7a6c61dc52d7ce97fc672c21020ef56f597dce679184e5e8d3d199678487e6bebaa8127
+DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.3-0.20200314133625-53cec6b37e6a+incompatible.zip 236878 BLAKE2B 1ff6dc1ad2dd82a741129203cf1b74133ec660fab9cbf0db2b818202df515fc9f5444d38d021a2909398baa695a19c2e9c8cf42bcebc795f584b70289462a24a SHA512 605425dd0473d7fdafb056deaf93ef1653ab0c0495abd57182fa5573475d6bb6f5df9c1e9dc7d7a7efe6e25ee24e4eb4b0502de21a337ea22c23d49327510e17
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.5.0.mod 301 BLAKE2B 8898fe7003c9143aa51d94430241d950aa22446ba5b7fd087844593db1c99701dcbc9cb2dde3356d22867e72c654bb3e0b30ff2d9c376cb3ef434f70e788ea97 SHA512 7c1f73f33624409363131d5765917cdc40a8666c1d462d72a7206ce4cca74c9fe61738df4f4a48265a9d89faa0b04c3aa49b0e87d8a37ac4f53310fd04913bd9
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.5.0.zip 65341 BLAKE2B 07a8e3ea6f0b0f53dea27e54837554a75bd68e11d91eb8d3f076ca87b84163c32b75bf4f30b830eea4a2ae1bb46f327ddfea1fbf568ac3dad01fb135f7a715cc SHA512 b7a7efd4156528996dca5f3c365578eff18166ba3ecb5727c860b53e3b6b44fb03c2451de0843e08955cf067932fa971e90fc610c3a1a6a4451660075c6f58f2
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20190401211740-f487f9de1cd3.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20190401211740-f487f9de1cd3.zip 124838 BLAKE2B 448c66457e04280c0679784c58ed652eb9c420be2de1cf574100b58dbbae8ab9270cdcbf09f579926f1874a5ab84175b537da1b71c88b19bb90d20489ceda47a SHA512 95c632e577b453db76ede797d709ee68ea890b6c2b6982db375f74bb7678a632c5ec52add26969d842fa779fd23f5764a9bb1e9b6b7403b9bc46fb5e7e438118
+DIST github.com%2Fsmartystreets%2Fgo-aws-auth%2F@v%2Fv0.0.0-20180515143844-0c1422d1fdb9.mod 44 BLAKE2B 731913ee70462d90d65df204e4a8bd34a8334c6c1875792697fe1f7fc4663322d504625db21035d1b2b0541ad0d17c1e14dfaf9c7b46fa46e0ce7a56622c98c1 SHA512 b5d18ea4a5059700ab836e7b93325bc0556c66838f6f9a7049164124c8c1a2b5c44f2832b8137c4733256c6e75a14f5afeda6267ddee6c1cdd5c64bd43a374c0
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.zip 1529663 BLAKE2B f5bac351e33600e56b635602a487b592e9d54623bffdccdf9c6d9ca8eff7f358c8a1de307c2ed6dcdad5c94b9d569ed7efc3eda22044a2ef8aedfba985d7578a SHA512 e3504b80d856f46158f6997bce909f8fd6345d5177b556ca63b63be5d74a7b108e1dd621483478f20ff03932551132a1a80578f3561819072952fafe81c23993
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip 1521758 BLAKE2B 653e697d76d392b18c09e5c1c96734a737071667345b9d6ff9c9589bbe74e1c50849dcd7fc00b660adc1aaa30366aa9ca93a94d5eb4e605f7897d9714119f926 SHA512 3bdd2bbeaf755618d9fa7f324814497308361cb0f3f93a7ac84b9fc01b79ab346353ff0a022d3d85e74aef57b3773e03ea9279d0a60de317a1c57d5eca2d1507
+DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod 32 BLAKE2B cf220acb07f93b3927afcfb4211e356e17f28dbef71cfdf777366d8cd09440282cd23e7800c7e86949615b90ec60ad4f2601ef21e58d4470349913c348758b0a SHA512 def5f190323350b58be18ef9f1b00e4810987a37e1fa9332be62a638a01df7f070788c75a19a0c11949890ccbc395419de45bf9c5f7fb38fdbef56118c681d32
+DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip 26744 BLAKE2B dbc7578fcac5c616d1cb5dd7cae959ee8df0496532db36d78d617ff265f213e4e5a336d33b795e793100c1b8e604919ca6fabb1736bcea0c02bdd0f8f0cc931a SHA512 dc990fd4f640acaa66baed26f2e82e0a6c46e293b016bd1573e72600e1256146f1b8abf746ebd96771bad4f3d95dded70c9f884908580ffffc4162efa0450735
+DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
+DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
+DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip 9830 BLAKE2B c5d27e8b447082c0a1756354c0a414079fc3b03d0649cee8353490827ff50882a9321b89fdae4e341da1a4718f6db4c4a4c27e937c9bf31111085a449f56f282 SHA512 aff4d1c9bab0fd619496fd6948f05bc88e4147af2fb171c4ce4e44d81c114257abd55f92fee27c4b6d96fde21c6756735c32257de7b00bdb0356509cb4b97374
+DIST github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190404075320-75d898a42a94.mod 42 BLAKE2B 528d17f9ad90612c6004aa88eb138daac467c3cd82e8f9a990e64ec956a9e50ebface9db66bb7800f74e7923a647999a9332d871f08d78a7eb09883e0fc6c811 SHA512 c5b104556b88e433f61bc94d0b61fabaa86fc25f3089a03f1360fe61b2b3487a5f2c6c3086eb08298d48cc05860652b58075c51d2767c2c4f2a698069b7dcbdb
+DIST github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190404075320-75d898a42a94.zip 107297 BLAKE2B 9b921bfd8c0c0dbbcee9255f96f4e2cdd4cad23fec9983c81078ab7f4a3600bcc5a7258ff84a61ea43a8153afed621ad95d4b36fae0473ea7f4eac475b0bd587 SHA512 87bf5c5ed980b72a61701e57f01635200cde4f7d428fa4ce8774303fe5a3794d77340e141877f14f6957e5ad9173dbb3f6f7210a2514d98777a999fe4f7905c3
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip 90474 BLAKE2B 2f79f0cac2c15acaeae764aeb640534f58ec2ae86fe88a82533498e718cf37d67c563606090ad39b38e22ffca1e63a25cd881d6a472b862ddaf150c7d329b16a SHA512 a047ba8d5f529d459fb6ae8dd39367e6f6cd2e785e90f54a5f8759ff76e4cfff990f1b8c1e0cf49c67b97ca8de36ecf8fdeb3b8f16e579aeae2d563d38da69db
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip 91883 BLAKE2B 8bb8f10ba7a3c719844dbbcbdbb87773487921f493cf6f72d1a9fd1d553f7f7784b01b9795a5c26a352490ed6d75c29a542a0b3d7c18d8888c57e447d9d227eb SHA512 c539cd964718439715caee454b38fdb61eb5d4e20489e10f7f6a030b4b941b2ca52d33f950c0b04149962399f0c3cb5b6a90efa2d79acc0f57a7f49d508c67c7
+DIST github.com%2Ftidwall%2Fgjson%2F@v%2Fv1.3.5.mod 121 BLAKE2B 3d75e9b7319b937df20925cb169d9d03a60b37c6123d576eaaa5e5f2bfbd0d4288dba5db1bb85a25b785bd3321c8923e786d5fcf691f68805a88f0280e0f954f SHA512 656b8cb034328253243e0e4a59962e59dedb681e98ff4d0c3925d16791e03466d39bdbe2d13a9c8842a804fffc1bf92e016008aade9bb111420ed01aa8ff9d19
+DIST github.com%2Ftidwall%2Fgjson%2F@v%2Fv1.3.5.zip 53838 BLAKE2B cc14002b1bf5db44343fdb2fad44bf4a68ef6b88a05bd47932ffa6dacd4e844e78305330769499b45d7cdad38795e07f6274223e81356f8cf93b9145b0b438f4 SHA512 0e3ae741eac1e440979a11627776499602dfe90ee30d7263dafec33680a4e2ea81481634ff4078d4beb6acca52a524e1ae776a57a866ee457b56e4dfadba4b14
+DIST github.com%2Ftidwall%2Fmatch%2F@v%2Fv1.0.1.mod 32 BLAKE2B 0352a43289e6d2cf597bdd8f2979d70ad3d11a415ad38d5a334e141b1d818fb605e847f4f988ac021ffbf5b2984a36f0ee28c0d722c30919921e8629ae9c6454 SHA512 e4f197f4e75c8936e7a7e1f6cba2f6bc5d7be5a674a05d7b23e1901fdd9a4f638a377c1c82ff6c0e9615997fcdfbe59bc35a9db43427bb48ae9cd21a3bae98c9
+DIST github.com%2Ftidwall%2Fmatch%2F@v%2Fv1.0.1.zip 5099 BLAKE2B ec7d5ccd4ab6a80971c002d4958a0980bd87099882ca1c38c38002d0e0587f938836d7a60e642161aba4d097d50a1fa2709cac03ec69e87dc4a94925838a2b80 SHA512 4fb1b86da8ed5c1c3de201502954e92787148deab29bd6780de9b9b2e827e144c1dac5c8bbc80fe2e9cb477274062e37d2ec7d9648e274caa1c49e77465cba47
+DIST github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod 33 BLAKE2B 2f2161156210fb855e4efe08126e21b4fed0ff111b4f03679aa26051e23ac71f9d269c26088262a3ebeb6364fa60cb9e85c1850d8fd1674ab488c6583d6034ac SHA512 39a892eb40bdbf1398cde6fe8575bf4fea604e3bb21473de5b2316ea182130b92c9dd2467e2807c0421a35cddd0096fa99134a9f9de02fe79bb59d82e2762937
+DIST github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.zip 9803 BLAKE2B dbb2623f6e506180cc64bd0d00d88c0fae0f5334f21bedb6f23757a3fd297d11c91ea6726ac9ff1d3de7dbf4a3d400cc7771412ba7978034e78c170b635672d2 SHA512 760da1b31d891006582c28c8394a0cc3494adefbe76ae77882b8340f1ed057011d96ca10bce9d86e881899ea683e6af402770f6f769726811c7776e040c3a787
+DIST github.com%2Ftidwall%2Fsjson%2F@v%2Fv1.0.4.mod 32 BLAKE2B 297c0bd4f6cc0e26bd9778dcebd0715d05acf9218005ead90a764ed16958437060c4f9ed1cee43b62601146f31108cc6a2392abe28b8ec1aa9a024b53b79472f SHA512 c5b157098cc861bc154d495fd0ed48db7e4e7d49058b694c1a52a1954ad8bee4210ad80e74ae2597b2c621965bacd1e7678be7a2d5c6ad6d626ddfab15f30833
+DIST github.com%2Ftidwall%2Fsjson%2F@v%2Fv1.0.4.zip 29424 BLAKE2B ad3fcc635268bb4a0d8f02151a5338b7cbe94c03b127f49fdb5234e2e07b3ad2962f212fea11486aada4c96ce729a6f62690c09c723848d1eb8c9100b20f5ce2 SHA512 c81314bc8ae4e42b37cabb2b230d1b60f26a56a3a521739fed1b6491b312dd27c3b6be01b218d70cf656380066519c6956ad3ba38a3f5cf6f3ea5d0bc25e92ba
+DIST github.com%2Ftinylib%2Fmsgp%2F@v%2Fv1.1.1.mod 31 BLAKE2B 263bfb05ef35498c4876a40273bb21f3bb2c5145e95ee0365f912a6b46919b145d7497e97cfd88b68c47b581ea4d65c31cb3de65f15929137f89091faa5eda86 SHA512 c9dea92ef8c32130b2d28820cf3f4d49e43fea4b36e82343030c1acb63ca120927d94e0ec8d496ce2319a36a22654cf3463c0023d7ce6cc7d1d4b07832f31ced
+DIST github.com%2Ftinylib%2Fmsgp%2F@v%2Fv1.1.1.zip 111660 BLAKE2B d11a726e59cc0718df214006301ee1a93251c7a96d3deb9a0be2f456b09e7802653dfed699265497cb6329258b607a9c38e94a122e7b8129142b2d02f0a924dc SHA512 2dfe1eabac53b16f27418963e8676e4a8121710b9d9ff4c4c5fb57daeb9fab01f868c5303a5c0fbb6fb2097f6f5835f29a7415b7c06fe9558f5aecebc51d21e9
+DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
+DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.zip 13644 BLAKE2B 484e5ae252f421994b2a23fe3e278992a11d79948509e202366a1b496c8f82e7289eabec3f5d2e0489da66bffe73c4c8c58224993ac621a1bd65a11abeb28a76 SHA512 8d7a4d0cf4d179438a0c8ecdf887169d45b3bdc5746f2e11a07c9621dae098c69b3b6a54ebae249efe9aa78669e81db9bf384919204b3d0af866808915eaa6f1
+DIST github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod 32 BLAKE2B c5bd918ed79f8ad33509bee3028b85da9941f721e12735da810f7cf4238ddf83d3c5b7634c01944ebbe9d0c77fea36d5480d945d2dad9d9126cdb5ceb1cc1d11 SHA512 4168487b908d7fbec0813e5ac4d1cc854216d2355fd2843c2856ce81ee7bc399d9fc2b0811b5fbf1f0f1f26e92d327aab3d54b30809ffed621aff37a706e3417
+DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.5-pre.mod 79 BLAKE2B e268d5abbb8df0f5aa9ab354a1d0ab7f3aba14c509cc322bb0dd8f7753482a165147c732db29e16d60b703b4de345cdfcd92441b42636607cb9f0577fd4fd897 SHA512 fccf7f39ede0a7b03909142ae43c51365038ce67fba076c6fbb14dd8382f048c238b1fd008425d7a7f9a6bd634d1d9bad5b52e913a305d1700ec460e591a9e60
+DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.5-pre.zip 7058 BLAKE2B 1f8d953a1fad9d27876f82307f0ad18008b00e9e2a0d060e3dff6d8875565c03d653ca63cdbd7d10ed50c7ea5e41cba6722e1fa0ced2b21ecd984206407e6609 SHA512 62e479460c4146a15bc032c617519518064564dad999aa7727e8051ea1176948fe19aaff81acc30a69cd95276484be7ef425a3aadf983474010c4688893a9ccc
+DIST github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv1.1.5-pre.mod 80 BLAKE2B fe617b09ca59759d90e814b06268e0fcbe83297cb69836cf2a6ee53c7d45acf8db4ffd2c8f106dd6bfd33bc19f7d5639bc3ed9bdf048e14570c101dbeb6e8d2c SHA512 e51f5f4047ba366a81326d8f1234ca5d2b7b984dc7bb84b2887bd990e8f5547b71bda5ef9c069d9bb27b4cf3cb038c506468b897ee05dbb21690ea44fac01fd9
+DIST github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv1.1.5-pre.zip 318818 BLAKE2B 5fc78fcb7893fb44f48e4d3380871fb0a2ea6424a7ddf0e4978af0a855a88abbcf80fc9ad790c7757ff1c4dca7b998303af3ecbb2b3114f66b6dd0bbb0f0e4fb SHA512 d90fd7e4799831fd14e8dbaccac6d85ce75ba1fbcc5a8a8760c9996c1ae0b203ec1a3ae2826add79bf1e68b6cb44b13780cdc51347a0eb56a9283c6ab9a780f1
+DIST github.com%2Fvalyala%2Ftcplisten%2F@v%2Fv0.0.0-20161114210144-ceec8f93295a.mod 36 BLAKE2B 4867e6ad22da67000c8f082852df43453cba9814cdbd8370c83bae347da0c426c2e2d705a85572e08a47c872bbb880f7b8befed360edcc8a866609c9486b4e0b SHA512 971639e43bdaee2891c655fa90626dd50be715f1d8493980d6fb081deee7940ad71bdb35887a3425b600869be75dd32e344b2c5d68e54e2ef3d6397c8fbe6490
+DIST github.com%2Fvalyala%2Ftcplisten%2F@v%2Fv0.0.0-20161114210144-ceec8f93295a.zip 7848 BLAKE2B af9e56d8075a129b2f996b768ed457b88330681201f6dd084c5d1ab11c8ada5a8c0cb509cd1346f67effb8c7bfbaf8947c91cef3c7d602ddaa762ad3b9e80e8f SHA512 2c20e40ffd75b30ed4b904b53ade4004b8a796ce37f59ce1d1813a2f68506980bd99bab321ea55de0ef950970baa479a6085a8b765eeb679c2d378abed380501
+DIST github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.10.mod 31 BLAKE2B eb05706f9dc60f41414a9d2b5c3acee3f615e0d1249c2e9b9776bc255fcfeb05593fb3bf06351d763d4ae4b465aee3f64d9630f4ae5fdd2d4e9ad847e5d4675d SHA512 f220b8b8bbc82fa03107ec51399e2e8c90a442b8b4ad57db441772c1ef66b16a77b71f0601f8aa22b60de4c1da4dffd1d746cd567158fbcd12b1677d88d4b17b
+DIST github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.10.zip 24489 BLAKE2B a60d9421a54d92fc636b0d0da8421da7d99a8fd0d92fe4884f97ac3df86880708bde8c2d9e66184859d4f6292f4d7b0aa66adcca327bd801107327c0c96f888b SHA512 ec52ac45634b0262545a3d1803be995fad4bbc4836dba98cce8f1069dcd2ddcb021f8ace0cc0026a339747910abd501d5bd1239a82b0a1c4788135eeb18cc624
+DIST github.com%2Fwillf%2Fbloom%2F@v%2Fv2.0.3+incompatible.mod 30 BLAKE2B 68b9d3dcc1a7ad178f568bc16e8b24803d183f12aec9a0e911bec2ef649e50cea2f7d86bbe063e0e3a798ed29e6604f73e5c9c6e4ae0148f5715d50863e59bfc SHA512 fa494fd4869ee860aa0a5ede2caa1e185041c3088ad45e9bc899e0f2a1324fb56405153e63dee8474d7c111a79ed1a45557335de87948fc5338f189c65e532ab
+DIST github.com%2Fwillf%2Fbloom%2F@v%2Fv2.0.3+incompatible.zip 13222 BLAKE2B b8e493c316400f811d322e717c75ddc12dbb9f628d38cbfa141209d7654d22d0a024b9952aedd09f40298bc13bba6c6667f74d85b184a298c4b0d6c3238624f8 SHA512 a83d562b8ca9e85366d7fdeae8e7fd7fcc507e551b65602fa109522c9ebd38780ed69f665a4c498c5c0660c7c5bc374cb796114bff364e232c8594326b2d6c87
+DIST github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.mod 28 BLAKE2B 87b79aaa3dda433afe275fbb69b3abfaf808a8a992f37846b51a3cb9069b1a0e5506ce6166d5186eef8656b451c3f6fad5bdfb58a213a9dbab2e7820e9062c81 SHA512 2303a64b0acb96f5f73dc64468a81d6aa6fd9a08240a04d5025884d6076cf90eeb5b132979488431d6f885138702a22a606419cfc0aecd05798deeb3acc4fa1e
+DIST github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.zip 33880 BLAKE2B 4b0decc2808a3f38cf272cdc053d1ed933e5023985543ae1643f0ad18dd9de98287403ec3c44ae753c001c25355591d000c996efc23f6bdf4a571cd1ad805833 SHA512 12666c80cb033c49832f33435b6a38d1e0e562965e84485efc5da6243f9fc959de19d05a70628a3bcdd02e7167a69a1a4731f6e6e3960e754f90fb38e7343f9e
+DIST github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.mod 33 BLAKE2B 602b301b7da6b66bdb3a5c9c88d4a74f776ea535fe1c4b1085840eaaea4ea5d9a05fc2f088b92fb85152d22025e89801eb476cdc26e031f8e3adb68fbb62542e SHA512 9c89175c24f82cba599f754d2efb8dec6def64b32735f9733b883b20a0758a6769afc527322ec5059ce275df6e034bc631a32c0a392a66e96c9d4d4a1087c4c8
+DIST github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.zip 33696 BLAKE2B 698e18104a389eb6f9493ad19546a7b61e28b6e1ec138eba1b9f231a5bfca222057520861f3e5f466ec14a6908705b1cd5d0fa9339c5349d95f536e7162431a2 SHA512 b5cd794572b339f1b7ffea9443fdb5f2512b55f2d2ccbb39ddd4d4163eb3396576cb85d99c72b16d4ff564bf2a5062ea54c6d313126cf1c3e4d81a0663643d3b
+DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964
+DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.zip 5264 BLAKE2B f6d986c7f5fbb1960fa1b62a5722d426c3ab79d865cb179bb9bca5a213bb2008a3cf4edb59dba1a336928cb0bd05d31f7083f394cec09270e66b55cd4a045b37 SHA512 2a8e1f10d10e4479568374b9e51b1b8dbbf1077d8af413d7dcd254ba1dc1cd38ee19e75a4661a4e237d3662e51cbcf96a08bc69a2e5beaf34a2559fcfb9d653c
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
+DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
+DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.zip 112407 BLAKE2B af65ce0475f0b55ace7f03a7af6fdfaf8daae8b79e0ec1c9fd1aaa911cfe517c6760e6a5fb7881f87d7fed4da3274d14c78aa1424c85c003dc0fa98b092134ee SHA512 ff7060fd74bf2070006a55a739f6a8b64abc5ff09db2d2bc53fe978852e5b82f96bfc79c1f73b68e704bff423722f7adefba0b906de6d96d7e03c3e5740b7ac1
+DIST go.opencensus.io%2F@v%2Fv0.21.0.mod 305 BLAKE2B 73735106ac582b2e9d5f0d739412c3396e0df8627a6adbe810ac560998e4cf2eda12e449b6e336dd6b433eaf57c885b4a927359d0bc1bd6eba9432bb0793c35d SHA512 448e90223b8d67e4d5e4b150055ac83eacf9ef48aa34036c2e59559f21443f796e721df3c0395a829bf5d10d229cdc7beb956c8f90273e50f0989e45a82aace8
+DIST go.opencensus.io%2F@v%2Fv0.21.0.zip 289912 BLAKE2B bc8e41070dd253fa0015be310194b9e63af6d8d3edd82ed436f62726b0a5d29efc0089468a87bdcd781eb81456948389b124a4ca6f246b6f52e2a31045ab697d SHA512 2a836a1d130a6c312b055754895bee0c75fcc744aae13026ca5a301f1f31a57cfe1f8e27c7c0c20e6115426e4654bcc4a8f4adf1a9b4a18c54581671cc6676be
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod 252 BLAKE2B d5019d6264ec35aa5c7c85d6c42130027213590c6dca568099f9c3b7c02fea9abdc969dccdc2d8d3f8abd0ce4c95727ec3f6f8dfbd2d4c1c75d4462e356181ac SHA512 15aae0e0950c9812700ba4bab0a19050c30398511df8e29fcfe496927fae3aa228761a796f150dd766377e5768beed842f06ece285e8b0e094a59288e1b86e23
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.6.0.zip 19110 BLAKE2B 749dab9cbf012066f0d8eb694b6592fd4d1819dd3b27052a76940502d65900b39820091e683c1c8561f4b65262dade55db6be331b1ba8517c22ef7aa39ade990 SHA512 21b8036b73a07887db6ffb620557794241c085e01be44e45c93ffdb2aa6b47783151f37fc4023bf847e091e1150466e84a67394070d945cc4a35a771d278f61f
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod 324 BLAKE2B 46301f4e5db74421da813b0c2d3d178417435ede42a1857da3d3af84b5ba353f10cad25fd48b777325dc33edd05f0a17b019a9f37c4e13f28e7ca5ee833c0d5a SHA512 aa82aeb1b0559b9c9b2585b8d584d9be60b6d6aa48e9613cec7ca440e267b93b2eaf67e3e88fc2faca68062792f3f6c9b03d080b6f13dc7f967e1b403521a909
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.zip 20218 BLAKE2B 35528c5c70a5f9fc80cee48c0d983b0fa9b23ce5e8273742db3a5678b9d0a56bfb93cc904c0a8678114d114af5cbde5e818240751904873bdca4d7ac87cade58 SHA512 4a52ab2241ca171cce47c0ab5dbcb8f57d6cb0355c5d372d75822ee866536c4943538543fd7926846085d4a91b5d154e54865f32e9c3a8ac485b41edf217bdde
+DIST go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod 25 BLAKE2B 233f108e33b587684ea189f873a869f028f02d9fee0eea04183b8d5baa445c5f76bbe2b497f5cae24dbe1745d8b26d35f302b23d8b11b95bb7c62f54416548ad SHA512 0ee649ad9b6a2d478469ece9e6ad9b51fa00f002f7a4966068892cdae278680403637897d83a0a423effcb8bddce1d2f9316774cb5890609f6085b906394909f
+DIST go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.zip 27032 BLAKE2B 58b337663e7a5625521925deadcd0d686ccbaa7d04925852bee0ff1cf3ada22c078e9715930dd20858b16bf51632a4e4d7e76986b0092107bc07ad46d132840c SHA512 b0f1b10667e0e600a4ebca7b4cd9983a27c3ec5f2c54cd46eb055cc0a07504642bea7ccfd0e0f6e3d007422633506efe863817b7c7bc9d18eec3642c84b28f8c
+DIST go.uber.org%2Fzap%2F@v%2Fv1.15.0.mod 257 BLAKE2B 2e5fab0b1a188fb7fffa1c9ca0799fa286f74732ceb0f45a904a3620f636af45d8b30d199cbb54ca46114aaffeeaf66bfa04715abe02711d6af46bbdba9bd6dd SHA512 4922fb6e20d2f5d2fa00888b8d644c51e1b558edb69b9f7d70a883314c3e971b6f8fc707b072aa0602d4c451ca0f20983796b65edcb737e5090dda1ffed0c757
+DIST go.uber.org%2Fzap%2F@v%2Fv1.15.0.zip 226617 BLAKE2B 8f21641500327ea1bed28c3820f7103773d8955367dde6eee133b92e18631c5b5adb09a3d9f3c441f32e0ed8dd45acdccd211417a51be3be87e3b874f90897af SHA512 3fa001713fe2b81add9e841bac8ea606373d3c7d58941cfcff3f6535f252fdf608a573d614aa19981a2241fc4b7393427c1ba3c37ba4c617aa409b71ed9aa8e6
+DIST golang.org%2Fx%2Farch%2F@v%2Fv0.0.0-20190909030613-46d78d1859ac.mod 61 BLAKE2B 431faf76d0cd0d8410a37694d4f8b3220f7759c6d083094c43b66ba50c0c32773622795da78a97c848a15e3915971f854264cb07ff2284f4a3d5cd78dafb7369 SHA512 092b0d04aac89b86648eed91b1bfc4660efefa925da46cd477d4b377c90c6823bbc5da077e4e5f3612207d9e129c4fbeda3adfca7a1b07d742ddcf8e1212085e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180723164146-c126467f60eb.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181106171534-e4dc69e5b2fd.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190404164418-38d8ce5564a5.mod 88 BLAKE2B 22568b660b7e13eed0dd423bfb6b033adf659a2c2b59c6ab12d707aca9f6f7317b7b438640caf6233dea4d9840aec4eb997eff5fcccbcdb193ba81db52d814d7 SHA512 fcfc8d63d333065f1193e9c27efe32a1fab270e450fbe1db533156e00427a13c75691163cd1bc7e9aa26b84d4142625c9fbd755535c575f83d63d82d7a276066
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190513172903-22d7a77e9e5f.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200604202706-70a84ac30bf9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200604202706-70a84ac30bf9.zip 1874278 BLAKE2B c9d8d7150f589d4b313bff96b41e1a24616db4e9a6447f1a20b81e15c35d6dd966507f5b24564afb904e81768f6c226ee73d3bf4ac3ce736c0276eaabc38a139 SHA512 61a5eb5e3af434483bfdd470a028b10c7ea6bf149e0cb4d4443cb8325417cf5b4e85d2fb2e6335dba74d366b80d4bf0b6d6450dbcb3f3e06714c2bc4b0ef6f75
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod 88 BLAKE2B ce393846b227c374753f46fc076385826a6288b0c85095e097c041b844f46b87120774c68924492c4f33c33729103a2d916d2335e24953022630314b63f606d0 SHA512 0097db2957ab98a21a73960d2a37c526e5cabcd5ba4825e44f0ec4851ef83743ae171c8dc4b6c09ea4d931c15879c247e362ca53ef8dc762b484f1ddcc483d04
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.zip 45710 BLAKE2B 7349ff19c5695071b04342199b7694af51d7a63b2a9940c72abdc8e2a03da41260da0ae09b039f1cf2c3752c7f2256164a3f0f4ce00410adcd5389cdc07e5cb9 SHA512 00ae7262d6a4f5839915a648e09a51fd939300b9f0404f2c13c062412d059b8278e3c40b2db2a927bffe74a940295834c18b77fb7dc58e88401e0b7606c13aeb
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod 97 BLAKE2B f6c97d5de5c229ab22e047250a7030c201829f8237b63c0b272c0453dd8ea91360f4a73f9d2b56212103c76c36c01699231d9dd31d48ba8624554b5b36499190 SHA512 15deca99c6d866dcffdd51b1334fbe7f33ce88e1fd82badec64f5155782681887e7fd959ec2686fb35adf70afbe08d743e36c6a891f43462074663357e5b309a
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.zip 126236 BLAKE2B 48caec10f6bf4b8da7028b0358645ab0414b5526004479ceececbd68380586bfbc5b4cfb9d43f8c608565f30521a0dbfe005669db7d5e245a1b63ddc8171d3e3 SHA512 2735c124a735b4cba606e4e3de5bb39c889aae2516525f778764d987b58677dd263cb286604fee63bc45636662c11e3dcc2c9726dcaf85a26e072ccd56597b93
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.zip 1503269 BLAKE2B afc7425e8a2354a2ea7de4b9e007d7091796edc22fe2783f2ec1cac2d0554d87aafbcf49fb838b1ae4f0193f936fc4cbb87fad4ceb4e5cf4e2b020b73db7c648 SHA512 66fe99252beeb16a4a8b3e37da32343955f1727043bde2ab9e5797d1e6b65b85c97292b43ba0f19587e03e02d6bffa7b8cb0986ebb714e992b9d91571dfdfa6b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.zip 81395 BLAKE2B b96db2624f437e789a49998f86e027aef77ab03240cbe1caa37296970c69955f404458bac0ba89ad1a781442f6961cf6ab4eb5ee31ecd0531c9e73564dedf310 SHA512 38c480232f2fb482b79f60a54e1af412bd74608a63cc1d0157c09b7d471d3af4815e6d4a3844d23deb88e89871e0580ede32cfb83aea6dc6413d6c04573aa8a9
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip 26635 BLAKE2B a464a4ad04b36e50cfe966e6e6dc299c0f8b45d0f4198ba64483bb70ab815d033cec5cde60753b76dd1fbb16fed087b41179100a2002b0a61cd4a08f9de779fc SHA512 ae6f29d5f7790b37d1722d65f31708670bf19f429c60b2f6633756ecd40e47c1fab40fc128e0d70b3b6ed0ba47ce5f970ce5f4e55b8f1fa407d2efee7444b646
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180926160741-c2ed4eda69e7.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190130150945-aca44879d564.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip 1470272 BLAKE2B 9a8bbb988370bedc24428e6c78f42a9ba44dbb852ce91c3d7fc54e83678b72b9177e67c955c49dc8ef7a1e2e214475a2e55c53254469e3426ec271e90ec9e2d5 SHA512 e46ef76fe4a1628def4c6a291003b64cf11185c0214427af9c49b9ff3af99f258488d49e887206a9c8652784228d822665c5841ce87d6ff993e95ea3d0494129
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200610111108-226ff32320da.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200610111108-226ff32320da.zip 1478934 BLAKE2B 5262495e5193fe9a3e2126a6b13494b2ac34388386ce8e078340fb2d007871317cd2dd021a083208f2225817d3db98bcbcb218fbbe938fa7153ba037f616dec9 SHA512 630a3c7320d4f0707420ab86bd147a1e8e45cd2e0fe3b6dde24d8fb97ff61f683bafb8c373966d6fd5a66864ee4bcf7b6fd9729554c6cd09b005ac4d63796685
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip 11671 BLAKE2B 0a73cd55380594ca4bac71bee0207b51979e62407ec3c828f975e8091a20e2b9a6cc331dea88cf0ff44ff3a6c7d1cfd2844651acd1d957c0d725de525a58985f SHA512 ccd129fd4ce8e4067d0ad4b164cd8c4fb7ba65d5022bb656dfdb50dd2d467152bb83760f3d94c465b6d4c29c29931c8be6c697e1634ccbab4eb3a53edca7dc4a
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod 194 BLAKE2B 94f62204dd4fd9b865aca70366a7a7754e2e92ed27591beaf789b268ad272dfb34ca0906d888c608393b4c71bc5c9f975fc86c164528ed7d0390e41b66206ec4 SHA512 8b68acbca48744320e64a70a983a471e9e2fc2249562064b10256269033473fd50264b6544646227fb666f075c4f266df1835ca3f88ee679bb97d34bf62bd195
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190914235951-31e00f45c22e.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200502202811-ed308ab3e770.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200502202811-ed308ab3e770.zip 3116117 BLAKE2B b7184bf0dda19fa32c8b575232c1ebd4d1c05fc7930a77b3ec87438c3f228742a1a0d2731b648b75057e2fa25e99224ebcd3e91d91b6ce503594522ca1baed28 SHA512 2781e01dc05a1f5b1440eb9476d23f9be45b3db07d59f7723cf2318ab8d76d8576ab70b9fac11c9a7049020692db2dd33f00584f01eeadc0a0ccd5cd16db2f30
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip 22282 BLAKE2B 68df6b35d9043f23df13432b80074544f46833467294955ae5706713055d0cc9ababda892853c14e99c80a3571fd4a807a019a098fdd2ca695ba90c577ead5c4 SHA512 c72b8b73f89624889a2874c1b2445cb82f0e545fccf6a7761a278f3f659eb19f5f1c8585641b8f89f2bcfc3817ad2c0e267751cfeeab949e287e43af5df57e28
+DIST google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a
+DIST google.golang.org%2Fapi%2F@v%2Fv0.5.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a
+DIST google.golang.org%2Fapi%2F@v%2Fv0.5.0.zip 12739743 BLAKE2B ecf97082c6f434758266939c742f4ba94ef04fa17a430bb84b9842c376b79cbde4589f18216b4e8cd324484aaa5809a8f87d0fc8119646a8160806c56ff3522f SHA512 6df3b0f297df126a535786bcd80bc103a4220fe61b5ab7f79e6cd5821b3bd6ac0348da112ef02f2a4dbecf90322e82b4cd3ee466b25dd41a88b6f876d6c42e72
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.0.zip 417366 BLAKE2B 71895742e5a6ad69c7b0db979f725e0171b6df432633912dfda6f367510b0b4d5a2b41d94c7a8eecdbb4de90d2e92818d7f6dc1ba99e41ba54184d39134513b9 SHA512 263419180987380202def791006a59739446ed956bef6314ea378cb6da54079967ddcecf031080295e66755b7312f76795b0f74b876e4928700b877fe1e1e9de
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190508193815-b515fa19cec8.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190513181449-d00d292a067c.mod 331 BLAKE2B 7a174749635ef1cfd4ef7a5c67d29c51934734bb7d7d0873f56a461f040373213cd4c5deac8fe12b3ee75b7c210e5d26e7b378e31214ea0278ac84eb001f99fd SHA512 1ab2bfe29c78700b879cd08ba8993d452715b4d374d349f48018a7ea8bd5999c236be0d164fe8d340d660e222e229f8ed490b7d8f5c931e754f3617510145905
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190513181449-d00d292a067c.zip 5240154 BLAKE2B aca422ca6a8900b1549cdbaf5aab5da1bbf1bfc5564f47e64bf024e190a08fe928d161d6d3cc27a611e374e0aa49dab83ab3a8bde1ee4eb9943d30504a314208 SHA512 ff3ff984dfad7ab7fd194c5a43fbaa9a3c862e2a9946ccdff0cab2b668da750ced7981e209b84049c2b548505a657409466deef408fcb694312bfa9a60f10e46
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod 30 BLAKE2B 8ec04a655d1d0c3cfde5c051842d84f8a8615d7d56563ad57769905212e0e7cc821933d5adedcb210c724de9699b6b9cd5bcfd3a2c9555516354d3e19ffd3482 SHA512 10c6aa20da47c7923358430b63d5d5264d54f6a6cf70b008ed157807c07073cd0c64bef9db282b39fdb523515e1429125079cc29273ba186f7e4b42712d3d37a
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod 795 BLAKE2B b825f2ab62a96b9b164410f761228575fd9882de37635c09803b9d2ce682ebbec30f301fd874aafaad95a5aa2431ba25962073e1bd4f336d8cb137e5939a8708 SHA512 585d4cf68b50a70d7967ac3941a7a83b83ed5df1a31773589a38348b6fdf247eb49e7778f7054b78ba1a65eef48d004a815abad932876cb1af2c09deea9c0db8
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.zip 1044067 BLAKE2B af09fd13e907450077bac140253f6ec2c96096b2340d8e1d8df76342a71d780c124a5719e1ce2a8db402e0e31ab53d1b037924dfa4c27b1b4e76c258cc6e3cad SHA512 674b9484ffcba7bc0a316d86de642de05ef82d9615210ba2a7533aeaeed11f599dfa9fcde6380d12ae181148dd793c891b677f76cfdc92e67032a9d2cca97847
+DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
+DIST gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod 28 BLAKE2B 0fbbe5d1e239fce8fc245a0a54a09a57ba1a669a6ed93aabefe8fd333549b3309ad9e6eb15cff2f0a853d3830e6b5cd60961835b14e2dd13aad5812cca6ee04c SHA512 00151108bdaa29a2097ab78c99c93bf0ec27af203696a11bc7ba55e36d7115ad13279110c245bd3a2cc84b63bb2a8840964e3b2e1334a0d085ac1e8ec5239bad
+DIST gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.zip 29965 BLAKE2B 43a72ac189d5bb6a581938910c317ec96c39c3c32695d844c1a9cd83243a567505d388f045e6c514d077e27857a6e206d628851454eef97ec14b52ccfc2a5da3 SHA512 4624295283c43a64b2413e25c3ca5a91c798d2b2cd7e60313b92c58d048404b12052dca119f6906e1fa0419bafd2e02c160b486856e2e88f75bfb2d08fd662f3
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip 41465 BLAKE2B 9a7183d3ac6591399b5208026208047a670c85e8b6014ad29955b168c63bb4953fa972d31025613c2ab12d7207adeebe9578b3c15b65ebb792f1e41df2668297 SHA512 fa7c68a2b5a6bb14f99cda92a3e77aad0e4160f659c54ea73e9813af9ff9449df6b0cab42ee283971e778b6b9da4a6098df805dd284c3b1aedfcd3a0b8504bde
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip 41484 BLAKE2B 34fbdc1525bbea7fc6b7f74e74ab407ed03d3b58e25e9b3b79ec35945acce36b7c4be54388c1244d508c7cf67ac6e4f1ff7c9eb5245f01ff27dec82cfe87bdb8 SHA512 713c79551d48a99cc9feed3bcf71b7f1fe95270701787dfb114237bd358ad104d18ce7ca412f65d1ce6b7f94ffb6c01afe28c9b821e1a5378b05c93340aa8a49
+DIST gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.28.mod 31 BLAKE2B 1a4baffd98c62173795d54bc25845b710fe8391726fc5d67cd6025131f783a3d94cd474299d72f5f077dc529203dcdf7a069268dc30fa39d9b3f7fab566df45b SHA512 b8685a6e649de49671d079375ba2132a467bb015a29a7182744caa9464f5e7ac72a952b10faf04e5b6d745ec955b565dc03cbc4ca9849d23ebd5303a12f18401
+DIST gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.28.zip 18118 BLAKE2B 554da95a16c0993b4cf83b7cfa01a09f8a74c5d6ab80b3732bc066e82fa73abb8fc49f92f6d73acbf7296346f335f202de0d10604ed3e42b4d32d8b4169a0718 SHA512 6575eb0dea6524b8e5072a7eeb8d57f57ea2d6c6354d137b28befe9a85cc13bddf061fbe6f0da7d418bcb4ad293b38a3664424096930eadf5e16c4554cdd450f
+DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.zip 64742 BLAKE2B 55c7f791bb3ba2d1af24dd0791ae53153550b4c53aeb446dc1b549cf366409738957e41798eb879beff02b5748e670a75f1e7eac31eb8a7ac0ae047cd4e9e598 SHA512 46f6bbb5f44ab422ecd68254f559b1eb07c9bcaaa6bc08c966cf6aacfba8f8dfcfc6ba6cb928d16fa112d97600c56ebe78832fa234f4a4c19b96abd579faa61a
+DIST gopkg.in%2Fjcmturner%2Faescts.v1%2F@v%2Fv1.0.1.mod 36 BLAKE2B 1f653e0e7fe93701b9e5c212697ee615f635c03fad64811a4741f57b9df6e53a632cd6665c12d2d56b5788639c386ec8461cafb4c5721610787e63b82579c539 SHA512 508e5b91b64eda9f137bdeb45512ca617294a48b9078670938190231eac59f96169462ab6dba748b9344df62479a48588db73c1d211977514f1e9baec3013167
+DIST gopkg.in%2Fjcmturner%2Faescts.v1%2F@v%2Fv1.0.1.zip 8138 BLAKE2B d74df3115a331373ed39003d512a89a9c6fe59d571d74bbf1a6ff3ebb06b87a71bc9ec11df8105c1dccf58226fa9a354d5ebfec11a74c05d5a9b689cd6ca20c2 SHA512 a4583a6b2c3a476459184ae8890109d36594a37ed9884fcdb42a8c6985c17edaa20179233750116bb262a851aee59520030c9f4ef36639d56219e6df7f250489
+DIST gopkg.in%2Fjcmturner%2Fdnsutils.v1%2F@v%2Fv1.0.1.mod 38 BLAKE2B d1cedc414de193540de5ac312000e4304212ba989a9b7bbe10b1a2db5effa33c82ec01cfd5ac4cb9d826460a1a0dd11c4f932c8649831d9b0ca3c21db602effe SHA512 894183b8527a1a4b541f8e5dc359e62d05dfa8aa66fabe8438db3f376e4075af51e781717e6ad01b3266384719bade2bf85dbb161c3c6468a40b9640f50d1cd8
+DIST gopkg.in%2Fjcmturner%2Fdnsutils.v1%2F@v%2Fv1.0.1.zip 7425 BLAKE2B e25afce5349dcf85fff01c6282db6db594626bb20a021e77330868d666cd283306b5efacf2f8d8cc9627380e81763a50477b4ffdf1c0a0f4a71f2b2ba7d8f4ba SHA512 1aac5cca82fd087586924f69e49ecd68c7401a46368fa980c2e1ddcd3e59e170d8e2dc067d96c235442db9fac53817b631c0ded1b75557217385a3888ab5833e
+DIST gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.mod 40 BLAKE2B 3e77c43f0108e2eb7585bd5558385a198b301e2adc7f813cce7981d0979567808d015e60cfd7ac7c6a17e9c0a5d616642c4b9bec919cd5de8d2fd6f86dd00845 SHA512 c498fb321f358d43c35d98913d17242517c415fc3c26d497fd821f30e6c656ca9ba3ce3a73657c43c677d35eab70c90065a7f93dab73214502e604efbc44a180
+DIST gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.zip 7069 BLAKE2B db430bd56c95cb5a40e95368be1f8b23ffa067e4f491ba6a641c12f78855bbd691268f60b4d57307aeede99671a23c437171a446a47ca6ebc1eeaf9defb0755d SHA512 4972724984d58b174b50c1ea81842bc5baa1fca3d74ea5163b6339c2f4a9fee1731eae3dd19f8cb67bca9465a762e44f856537bdc907bbf37394dfc656b2edbc
+DIST gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.2.3.mod 36 BLAKE2B 268adc19223fdd60f8dc01a4eb96290f6c4ae0fe2576d3bac9f82caa3e683e79151d9147a8bf76bfe9b2341ec2bd28d6447248fccfd10e4ed348fd02a88473ed SHA512 a963f19cd93e788d0f5de9873a5b0aa152ea592d829c1513e74c277718ac496d6d2a9dcae0462951fb92ad1fdc59381c30eb5b1bcc2dbb3bcab1cb11928ce05e
+DIST gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.2.3.zip 55262234 BLAKE2B 34148a9413ac8f7cca88ca3d5cdfa336b35161cc263e7b10ec388b5d9c4c384534cabcf63ea2c1ff2cb44c785ddd32c69efe10436f7421bf71137e56a130df28 SHA512 e9edde00a0ed56709ff2bd02f47cf91ffbda465afd38febcfd516c70eb5170273727f318a57c0eb6da387717b57eba54b89844212b05eef684c67035886ce0bf
+DIST gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.3.0.mod 36 BLAKE2B 268adc19223fdd60f8dc01a4eb96290f6c4ae0fe2576d3bac9f82caa3e683e79151d9147a8bf76bfe9b2341ec2bd28d6447248fccfd10e4ed348fd02a88473ed SHA512 a963f19cd93e788d0f5de9873a5b0aa152ea592d829c1513e74c277718ac496d6d2a9dcae0462951fb92ad1fdc59381c30eb5b1bcc2dbb3bcab1cb11928ce05e
+DIST gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.3.0.zip 55262753 BLAKE2B 42ecb6953d818d5b70bb6ca430ffbb5ee9d2e66feca01d89c41856b99c5d3738b031a1c743cd45860499ae6dd8c0fbe6e949c4954f969dc6bf20be39744f5afd SHA512 8d24dac1e8429af5d26697bb75407490f5a36860cfe5fcb4303c17e931c37454b17d51dd54d6b70112475704da0cdbcb851ed21e1303bde950768192749a822b
+DIST gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.mod 33 BLAKE2B 0c256369010fa14f2dd95100b3f1b75357816012d226e52588c91c6615eb5b56459061d3bdc8201a84985136912c4d8e62dc281600cb53fd2e9e2a545eb3f35d SHA512 0513089b977716c7cb885b4edced551183b397858963f74f002a078920fd1e2178376261abad2c1c475e7de7ba262670de9d25e8a6e801b4c78385370cd0a489
+DIST gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.zip 42124 BLAKE2B 172da6e6ccc58989dc4827d113bc8b93dfefef6321344bc9f569786ca152dd50369e98e7fdf718096d42eec90c1cd14d05cf908afbcc12dce8de6e2248d8463d SHA512 056ad239cc4831d56ef60f0e36c7cfe78a3a4d67160ee81619f63f27ff975247eb53e2b3461b8ee461f8aeee2fe8c37131832304e3eafadbc5ed5a4fb90a994a
+DIST gopkg.in%2Fldap.v3%2F@v%2Fv3.0.3.mod 24 BLAKE2B 26544f2cddaef84fc1bd95f2aeb8a8fed91701ee76f3b7cc506b194cb4c70058d1dc1c2a4b7d0e22c6527ae424b38f0962b00aa00c246b80b1eca8ca02757b2d SHA512 975a4e9d2dd50c2571ba43b4a7a6bb0a70dd623cf6181a24bc8362d9c969f643ce4b47f33489b4d32a694c32d08b36d4546375dc0d8f91ba7737896fd7c72f09
+DIST gopkg.in%2Fldap.v3%2F@v%2Fv3.0.3.zip 54508 BLAKE2B eb85b8f41fda90cb578588767084c8ebacced84d8cae917f69bd0947cbfca23de3eb9b0db131abcf35dc5380d2612a1aee4256366123ab265688a2d7a08d4abd SHA512 be8400c5c7ed8eda70334f69fd67546b4877e906eff012fb9008e4595652799a4ca901621f21e15e23286e78ab4df12081a316a72f553dd70c1201bf2f81ca62
+DIST gopkg.in%2Folivere%2Felastic.v5%2F@v%2Fv5.0.80.mod 251 BLAKE2B cbc8b92d0d6a1a095c6c3e03f73d4de4c31ffe6eb627459c98d14abdabf819fc68799b776818d6203268914e8f61a8d10b7b6efb0ee19d0cdc7b1038af03ebd1 SHA512 31b43261cc2949068effe30d431db57f65bc6ce264a7c91a5eabfafe3c5ad719f9af11f44215f42c2a811de7ebffe765fde0266a0f4b064cb02073f36bc28d0f
+DIST gopkg.in%2Folivere%2Felastic.v5%2F@v%2Fv5.0.80.zip 604495 BLAKE2B c0204655f9b56e0ae0b7f57e4679cbfb78573ee4afb70827fdb96ce9afb85cf2f5374fee8ef30ae82c639f659e3277be10f99659f7796de0c3eab10a8f2a4432 SHA512 a40802541627f6c07ab780b08fa6cffcb695045f663aa7c1c09e907e94ec09fe0af0e45e3bbc46d9980b114b5f63214c71abef7d402ec81301d4028274cb5da4
+DIST gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod 86 BLAKE2B a2c81f0cabd00084e6e52de82e9ba9a5bdf42d45123b7a58ebe4baa07b41631498c7590535884282869c4947b4f4f9ea0f41bfd28c1c7bbd516ea5631f207e30 SHA512 84c11a71dfd5f94cbcc79aaa8d387600ea3eec89cdb44bc63e55daad5700dc20aa719ce7a5c960cf97900231bedd118afbd93c408aec449e68ed5d8c5641ff57
+DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod 34 BLAKE2B 618a69c0e95948b23d494ad15cc5572b4d0cd35929ae65433b179b7482b70ae86167346300267b20c48814313278e1ff43e92935899d1405e7561d6c994e2f15 SHA512 a9022561a9dfe5056793fe3dc81625b8093eb32c67c5cba0ab5d82348aa72f1deeca161603773369c4f02ef4e753c0f751819199b292326277a149546ae54e62
+DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.zip 343284 BLAKE2B a4f4f886636b920a987942524f504c0049ca3c9d9ca5be16101109235e77e9a8a14106fee9fb2d02d403a056dcf5f42b0a4e4f57d33dbc78a88e0df5682162f8 SHA512 0b212e847ef8972bbc9dc96685c9fafcef5552e96c622134cb1aac903aa3f6f5a1aa65a2f179e93396fcf32ea4139a34f46c4e6fb3558c9da8579282095d1baa
+DIST gopkg.in%2Furfave%2Fcli.v1%2F@v%2Fv1.20.0.mod 30 BLAKE2B 89fb6df720b3aaf783383cb36d2f3606eb3a2a23be045139ab1a365198d529683e11c040555aa106a73450242f14d9ba93175dad1451912c6baecfe81ce8ce48 SHA512 8d1fceb46b6f9262b1c0a00eb4481d66103614d32a3438777231bfa69359d0a634cfa1bcf96fda26abf453055a677080103446d4afc557efdb49202768e3c501
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod 24 BLAKE2B 1cb17a1c6b1eb33cebd983f9e965f6db03f5095441d7cd72aff6df805501eef4dc249c22ecc85da360c27696a7c4ae613f0769a1f89e73f286281de89ffd3ef2 SHA512 89b481cc62ed7a486990ebfcf65cf7a344e5d189deef680e6ddd82dc93f31d166af05fc27b4a95ea27c33fd3ced1b87d4050d617d52008ca059c4a5d3b6c26a9
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d01f3d89a2db6930f406aded7889530b04689ea34b53fa2a7af352c264681ee40b1d192c86ca2f7dcc33dca825d355694527e4dbf SHA512 19f019e85b8c9a533c3cf2fd492b1813272f00cce06a56ffe43046935e49ccf6e191ce83f1d236f6355bae7126aa722016f05174687ff2faf54f121958266edf
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.zip 506912 BLAKE2B a38cb31fd8df49dae4ff187e67704b5586ba78a0dcfe5afa3b820f0ac80f7e12ba4bdb705caa97c6be85407fe97599d1244d2f56f0e9e36554ba43289d9f21d8 SHA512 3285ab90762ee6b771c95e1c842ab308f04ac366ddfa693040c49d8951bb01db33994eb69c2c9dfd6ab2b379b29cbfe31558ca6b6aafe3feea1e693b2a36d0cb
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.zip 559809 BLAKE2B 55392e0d6cdb68f21348ef9c86b46797aedc94f8a47d7d7611be4fe489c1fca867ac184d1382480ce4a873cd5c435cf21825418bb3153420bd6f38157c332ae1 SHA512 64e810b40c1f64117074791cdab1dea4f282fb0a47df1cf82c6e26eae38bb893c9241119024d004b00dcb05d485bd5536f6ca90aee13200631c09da5c819c1c3
+DIST minio-2020.06.22.03.12.50.tar.gz 7945779 BLAKE2B 981efa6f212911c759209e354f321ab9d58dfc4a5b30315b58feb85ebb38dbe24d64479cd147b1b9611ceff8b847ba19e8caa78640f0e39a4440b86ce303528c SHA512 4cce1f13a895bf2333681be048582a8231b997075611888573831543e09c241fcf2a3a75b453086390621a3b19a30a57397f5fdb4acc7283054157d450eec27e
+DIST rsc.io%2Fpdf%2F@v%2Fv0.1.1.mod 18 BLAKE2B 02f32b5a77e5009f179cf1fdc9acbb977fe219698f19ef41acee8129e0de7ad93b0b39ce82ac1538c82a7cdd33776e270f0acec114716c791727b021a4d3e147 SHA512 f911a889614d9177295952c82f8b4a0942fcbb7b4fca7378c0b98a63ed0e37e1319d51905f906ad08144eb0f3f829a2ccc2af04c2147e60cc2ac1ea8d7dab16f
+EBUILD minio-2020.06.22.03.12.50.ebuild 33078 BLAKE2B ed4372b02e2ab29eabde1ca396dbefa6521e49518c5537232931a9f383daae84f67701240b819fc4d9d9c70499019f077519c794d58def0b15e3507de579f3f2 SHA512 b7603994f15e0efa2ed9969193cfcdc94d2fc56f33415a8eaffad0fa1a1e4c5179c6428c5147aeffbe503e34b6a3a924c9ecfac4a4fa3ae39ff8227cda226dfe
 MISC metadata.xml 243 BLAKE2B 0c14bd67f89d1810c3ae234b84edbe802e4f0905c0e3e45401dbbe3fe1ab7dab6b59c70e25c66e84386f71600bbd0e32f02539fbdd0f80f76ea73aaf5caba7ec SHA512 18b9fbd65651eb42d5b577c6007eab66ba831ee0196ffde7fc7f6987d13b2fe184c09d5cf97866288458a224e7fe98544029653d76732eb2148fa8bafb66ddcd
diff --git a/net-fs/minio/minio-2019.09.11.19.53.16.ebuild b/net-fs/minio/minio-2019.09.11.19.53.16.ebuild
deleted file mode 100644
index 9d8fad8d7cfd..000000000000
--- a/net-fs/minio/minio-2019.09.11.19.53.16.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_VENDOR=( "gopkg.in/yaml.v2 51d6538a90f86fe93ac480b35f37b2be17fef232 github.com/go-yaml/yaml"
-	     "gopkg.in/olivere/elastic.v5 f72acaba629a7ec879103d17b7426a31bc38e199 github.com/olivere/elastic"
-	     "gopkg.in/Shopify/sarama.v1 879f631812a30a580659e8035e7cda9994bb99ac github.com/Shopify/sarama"
-	     "google.golang.org/api/option bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client"
-	     "google.golang.org/api/iterator bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client"
-	     "google.golang.org/api/googleapi bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client"
-	     "golang.org/x/time 9d24e82272b4f38b78bc8cff74fa936d31ccd8ef github.com/golang/time"
-	     "golang.org/x/sys 81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2 github.com/golang/sys"
-	     "golang.org/x/net eb5bcb51f2a31c7d5141d810b70815c05d9c9146 github.com/golang/net"
-	     "golang.org/x/text e3703dcdd614d2d7488fff034c75c551ea25da95 github.com/golang/text"
-	     "golang.org/x/crypto 38d8ce5564a5b71b2e3a00553993f1b9a7ae852f github.com/golang/crypto"
-	     "go.uber.org/atomic 1ea20fb1cbb1cc08cbd0d913a96dead89aa18289 github.com/uber-go/atomic"
-	     "github.com/valyala/tcplisten ceec8f93295a060cdb565ec25e4ccf17941dbd55"
-	     "cloud.google.com/go/storage a4ed3b9f8c7419c692a60bbf780ab0f1c4af5ce4 github.com/googleapis/google-cloud-go"
-	     "github.com/tidwall/sjson 25fb082a20e29e83fb7b7ef5f5919166aad1f084"
-	     "github.com/tidwall/gjson eee0b6226f0d1db2675a176fdfaa8419bcad4ca8"
-	     "github.com/tidwall/pretty 1166b9ac2b65e46a43d8618d30d1554f4652d49b"
-	     "github.com/tidwall/match 33827db735fff6510490d69a8622612558a557ed"
-	     "github.com/streadway/amqp 14f78b41ce6da3d698c2ef2cc8c0ea7ce9e26688"
-	     "github.com/skyrings/skyring-common d1c0bb1cbd5ed8438be1385c85c4f494608cde1e"
-	     "github.com/segmentio/go-prompt f0d19b6901ade831d5a3204edc0d6a7d6457fbb2"
-	     "github.com/rs/cors 9a47f48565a795472d43519dd49aac781f3034fb"
-	     "github.com/rjeczalik/notify 69d839f37b13a8cb7a78366f7633a4071cb43be7"
-	     "github.com/rcrowley/go-metrics 3113b8401b8a98917cde58f8bbd42a1b1c03b1fd"
-	     "github.com/prometheus/client_golang 505eaef017263e299324067d40ca2c48f6a2cf50"
-	     "github.com/prometheus/procfs 55ae3d9d557340b5bc24cd8aa5f6fa2c2ab31352"
-	     "github.com/prometheus/common 5df5c82edb7502fd6cbe093223a19b6e1231494f"
-	     "github.com/prometheus/client_model fd36f4220a901265f90734c3183c5f0c91daa0b8"
-	     "github.com/pkg/profile f6fe06335df110bcf1ed6d4e852b760bfc15beee"
-	     "github.com/pkg/errors ba968bfe8b2f7e042a574c888954fccecfa385b4"
-	     "github.com/pierrec/lz4 315a67e90e415bcdaff33057da191569bf4d8479"
-	     "github.com/nsqio/go-nsq eee57a3ac4174c55924125bb15eeeda8cffb6e6f"
-	     "github.com/nats-io/nats 70fe06cee50d4b6f98248d9675fb55f2a3aa7228"
-	     "github.com/nats-io/nuid 3024a71c3cbe30667286099921591e6fcc328230"
-	     "github.com/nats-io/nkeys 1546a3320a8f195a5b5c84aef8309377c2e411d5"
-	     "github.com/nats-io/go-nats 70fe06cee50d4b6f98248d9675fb55f2a3aa7228"
-	     "github.com/nats-io/go-nats-streaming 4366d43a0648b4997ed32080f937e8702ab86c48"
-	     "github.com/Azure/azure-sdk-for-go d659f2a91175cac99aa5627d09b83026eacc978d"
-	     "github.com/Azure/go-autorest 3b1641ed03046f2ee28d73f7a51e5b884d55b92a"
-	     "github.com/DataDog/zstd c7161f8c63c045cbc7ca051dcc969dd0e4054de2"
-	     "github.com/mailru/easyjson 1ea4449da9834f4d333f1cc461c374aea217d249"
-	     "github.com/gorilla/mux a7962380ca08b5a188038c69871b8d3fbdf31e89"
-	     "github.com/coredns/coredns 8dcc7fccd74454134b33c8bc9f780ed6d7f076cf"
-	     "github.com/matttproud/golang_protobuf_extensions c182affec369e30f25d3eb8cd8a478dee585ae7d"
-	     "github.com/eapache/go-resiliency 842e16ec2c98ef0c59eebfe60d2d3500a793ba19"
-	     "github.com/minio/minio-go 5325257a208fc630aaaac31bc00789acbc998c14"
-	     "github.com/alecthomas/participle 98cb121381c371cf1542c7ae145e485d703aec0b"
-	     "github.com/aliyun/aliyun-oss-go-sdk 86c17b95fcd5db33628a61e492fb4a1a937d5906"
-	     "github.com/bcicen/jstream 16c1f8af81c2a9967b30d365a29472126274f998"
-	     "github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
-	     "github.com/cheggaaa/pb f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11"
-	     "github.com/gogo/protobuf 382325bbbb4d1c850eec1f3ec92a1a16f502d68b"
-	     "github.com/davecgh/go-spew d8f796af33cc11cb798c1aaeb27a4ebc5099927d"
-	     "github.com/inconshreveable/go-update 8152e7eb6ccf8679a64582a66b78519688d156ad"
-	     "github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
-	     "github.com/mitchellh/go-homedir af06845cf3004701891bf4fdb884bfe4920b3727"
-	     "github.com/klauspost/pgzip 083b1c3f84dd6486588802e5ce295de3a7f41a8b"
-	     "github.com/marstr/guid 8bd9a64bf37eb297b492a4101fb28e80ac0b290f"
-	     "github.com/coreos/etcd d57e8b8d97adfc4a6c224fe116714bf1a1f3beb9"
-	     "github.com/dgrijalva/jwt-go 06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"
-	     "github.com/gorilla/rpc bffcfa752ad4e523cc8f720afeb5b985ed41ae16"
-	     "github.com/djherbis/atime 8e47e0e01d08df8b9f840d74299c8ab70a024a30"
-	     "github.com/dustin/go-humanize 9f541cc9db5d55bce703bd99987c9d5cb8eea45e"
-	     "github.com/eapache/go-xerial-snappy 776d5712da21bc4762676d614db1d8a64f4238b0"
-	     "github.com/eapache/queue 093482f3f8ce946c05bcba64badd2c82369e084d"
-	     "github.com/golang/protobuf d3c38a4eb4970272b87a425ae00ccc4548e2f9bb"
-	     "github.com/fatih/structs 4966fc68f5b7593aafa6cbbba2d65ec6e1416047"
-	     "github.com/minio/parquet-go 9d767baf16793cc4b7fd55d642474c36c077ef77"
-	     "gopkg.in/ini.v1 c85607071cf08ca1adaf48319cd1aa322e81d8c1 github.com/go-ini/ini"
-	     "google.golang.org/grpc 3507fb8e1a5ad030303c106fef3a47c9fdad16ad github.com/grpc/grpc-go"
-	     "google.golang.org/genproto 64821d5d210748c883cd2b809589555ae4654203 github.com/google/go-genproto"
-	     "go.opencensus.io 43463a80402d8447b7fce0d2c58edf1687ff0b58 github.com/census-instrumentation/opencensus-go"
-	     "git.apache.org/thrift.git c9b1e29bc9e0702d7441383358d565e1e76ccea7 github.com/apache/thrift"
-	     "github.com/elazarl/go-bindata-assetfs 30f82fa23fd844bd5bb1e5f216db87fd77b5eb43"
-	     "github.com/eclipse/paho.mqtt.golang 20337d8c394721c308cc6ec096990ee451a7cd7f"
-	     "github.com/klauspost/compress 30be6041bed523c18e269a700ebd9c2ea9328574"
-	     "github.com/hashicorp/vault 36aa8c8dd1936e10ebd7a4c1d412ae0e6f7900bd"
-	     "github.com/fatih/color 5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"
-	     "github.com/miekg/dns 73601d4aed9d844322611759d7f3619110b7c88e"
-	     "github.com/klauspost/reedsolomon a9588190c00b0ccd742218388f6ff68bbad83e5c"
-	     "github.com/gomodule/redigo 9c11da706d9b7902c6da69c592f75637793fe121"
-	     "github.com/go-sql-driver/mysql 72cd26f257d44c1114970e19afddcd812016007e"
-	     "github.com/gorilla/handlers 7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce"
-	     "github.com/mattn/go-isatty c2a7a6ca930a4cd0bc33a3f298eb71960732a3a7"
-	     "github.com/satori/go.uuid f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"
-	     "github.com/golang/snappy 2a8bb927dd31d8daada140a5d09578521ce5c36a"
-	     "github.com/klauspost/cpuid e7e905edc00ea8827e58662220139109efea09db"
-	     "contrib.go.opencensus.io/exporter/ocagent 902c0ccba68df93f7fefbe7e7c6f16be33108b40 github.com/census-ecosystem/opencensus-go-exporter-ocagent"
-	     "github.com/lib/pq 4ded0e9383f75c197b3a2aaa6d590ac52df6fd79"
-	     "github.com/mattn/go-runewidth 3ee7d812e62a0804a7d0a324e0249ca2db3476d3"
-	     "github.com/census-instrumentation/opencensus-proto a105b96453fe85139acc07b68de48f2cbdd71249"
-	     "github.com/minio/cli 8683fa7fef37cc8cb092f47bdb6b403e0049f9ee"
-	     "github.com/minio/mc a1355e50e2e8984d645cc7745230c42b27396341"
-	     "google.golang.org/api bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client"
-	     "github.com/grpc-ecosystem/grpc-gateway 20f268a412e5b342ebfb1a0eef7c3b7bd6c260ea"
-	     "github.com/mattn/go-colorable 3a70a971f94a22f2fa562ffcc7a0eb45f5daf045"
-	     "github.com/minio/blazer 2081f5bf046503f576d8712253724fbf2950fffe"
-	     "github.com/minio/highwayhash 02ca4b43caa3297fbb615700d8800acc7933be98"
-	     "github.com/minio/lsync v1.0.1"
-	     "github.com/minio/sha256-simd 05b4dd3047e5d6e86cb4e0477164b850cd896261"
-	     "github.com/minio/sio 035b4ef8c449ba2ba21ec143c91964e76a1fb68c"
-	     "golang.org/x/sync e225da77a7e68af35c70ccbf71af2b83e6acac3c github.com/golang/sync"
-	     "golang.org/x/oauth2 9f3314589c9a9136388751d9adae6b0ed400978a github.com/golang/oauth2"
-	     "cloud.google.com/go 458e1f376a2b44413160b5d301183b65debaa3f6 github.com/googleapis/google-cloud-go"
-	     "github.com/googleapis/gax-go beaecbbdd8af86aa3acf14180d53828ce69400b2"
-	     "github.com/hashicorp/golang-lru 7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c"
-	     "github.com/json-iterator/go 0ff49de124c6f76f8494e194af75bde0f1a49a29"
-	     "github.com/colinmarc/hdfs/v2 fd1e410ff7bf76b870f625dc0aa3eb4e44f5bc50 github.com/colinmarc/hdfs"
-	     "github.com/hashicorp/go-uuid 4f571afc59f3043a65f8fe6bf46d887b10a01d43"
-	     "github.com/jcmturner/gofork dc7c13fece037a4a36e2b3c69db4991498d30692"
-	     "github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"
-	     "github.com/modern-go/reflect2 94122c33edd36123c84d5368cfb2b69df93a0ec8"
-	     "gopkg.in/jcmturner/aescts.v1 f6abebb3171c4c1b1fea279cb7c7325020a26290 github.com/jcmturner/aescts"
-	     "gopkg.in/jcmturner/dnsutils.v1 13eeb8d49ffb74d7a75784c35e4d900607a3943c github.com/jcmturner/dnsutils"
-	     "github.com/klauspost/readahead v1.3.0"
-	     "github.com/kurin/blazer v0.5.3"
-	     "github.com/minio/dsync/v2 fedfb5c974fa2ab238e45a6e6b19d38774e0326f github.com/minio/dsync"
-	     "github.com/ncw/directio v1.0.5"
-	     "github.com/nats-io/stan.go v0.4.5"
-	     "github.com/nats-io/nats.go v1.8.0"
-	     "github.com/minio/minio-go v6.0.29"
-	     "github.com/minio/hdfs/v3 v3.0.1 github.com/minio/hdfs"
-	     "github.com/minio/gokrb5/v7 v7.2.5 github.com/minio/gokrb5"
-	     "github.com/minio/minio-go/v6 v6.0.29 github.com/minio/minio-go"
-	     "gopkg.in/jcmturner/goidentity.v3 v5.0.0 github.com/jcmturner/goidentity"
-	     "gopkg.in/jcmturner/rpc.v1  99a8ce2fbf8b8087b6ed12a37c61b10f04070043 github.com/jcmturner/rpc"
-	     "gopkg.in/jcmturner/goidentity.v2 v2.0.0 github.com/jcmturner/goidentity"
-	     "gopkg.in/jcmturner/goidentity.v3 v3.0.0 github.com/jcmturner/goidentity"
-	     "github.com/kurin/blazer cf2f27cc0be3dac3c1a94c3c8b76834ce741439e"
-	     "gopkg.in/ldap.v3 v3.0.3 github.com/go-ldap/ldap"
-	     "gopkg.in/asn1-ber.v1 f715ec2f112d1e4195b827ad68cf44017a3ef2b1 github.com/go-asn1-ber/asn1-ber"
-)
-
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/minio/minio"
-MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
-MY_PV=${MY_PV//./-}
-EGIT_COMMIT="3e3fbdf8e6e5e889232eb7afc0b27ac054adfda0"
-ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-
-KEYWORDS="~amd64 ~amd64-linux"
-
-DESCRIPTION="An Amazon S3 compatible object storage server"
-HOMEPAGE="https://github.com/minio/minio"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
-SLOT="0"
-
-RESTRICT="test"
-
-RDEPEND=">=dev-lang/go-1.13"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_prepare() {
-	default
-
-	pushd src/${EGO_PN} || die
-
-	rm go.mod || die
-
-	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\
-		-e "s/-s //"\
-		-e "/time/d"\
-		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
-		buildscripts/gen-ldflags.go || die
-
-	popd || die
-}
-
-src_compile() {
-	unset XDG_CACHE_HOME
-
-	pushd src/${EGO_PN} || die
-	MINIO_RELEASE="${MY_PV}"
-	go run buildscripts/gen-ldflags.go
-	GOS=Linux GOPATH="${S}" GOCACHE="${T}"/go-cache go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
-
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs
-	dobin minio
-	popd  || die
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-}
diff --git a/net-fs/minio/minio-2020.06.22.03.12.50.ebuild b/net-fs/minio/minio-2020.06.22.03.12.50.ebuild
new file mode 100644
index 000000000000..816cc900eb8e
--- /dev/null
+++ b/net-fs/minio/minio-2020.06.22.03.12.50.ebuild
@@ -0,0 +1,676 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module user
+MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
+MY_PV=${MY_PV//./-}
+EGIT_COMMIT=43dd68a58acdbf12f4809665432d0540af0cb123
+
+DESCRIPTION="An Amazon S3 compatible object storage server"
+HOMEPAGE="https://github.com/minio/minio"
+
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.39.0"
+	"cloud.google.com/go v0.39.0/go.mod"
+	"contrib.go.opencensus.io/exporter/ocagent v0.5.0"
+	"contrib.go.opencensus.io/exporter/ocagent v0.5.0/go.mod"
+	"git.apache.org/thrift.git v0.13.0"
+	"git.apache.org/thrift.git v0.13.0/go.mod"
+	"github.com/Azure/azure-pipeline-go v0.2.1"
+	"github.com/Azure/azure-pipeline-go v0.2.1/go.mod"
+	"github.com/Azure/azure-storage-blob-go v0.8.0"
+	"github.com/Azure/azure-storage-blob-go v0.8.0/go.mod"
+	"github.com/Azure/go-autorest v11.7.1+incompatible"
+	"github.com/Azure/go-autorest v11.7.1+incompatible/go.mod"
+	"github.com/BurntSushi/toml v0.3.1"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/Shopify/sarama v1.24.1"
+	"github.com/Shopify/sarama v1.24.1/go.mod"
+	"github.com/Shopify/toxiproxy v2.1.4+incompatible"
+	"github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod"
+	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d"
+	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod"
+	"github.com/alecthomas/participle v0.2.1"
+	"github.com/alecthomas/participle v0.2.1/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+	"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878"
+	"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
+	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+	"github.com/aws/aws-sdk-go v1.20.21"
+	"github.com/aws/aws-sdk-go v1.20.21/go.mod"
+	"github.com/bcicen/jstream v0.0.0-20190220045926-16c1f8af81c2"
+	"github.com/bcicen/jstream v0.0.0-20190220045926-16c1f8af81c2/go.mod"
+	"github.com/beevik/ntp v0.2.0"
+	"github.com/beevik/ntp v0.2.0/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/boltdb/bolt v1.3.1/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.0"
+	"github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod"
+	"github.com/cespare/xxhash v1.1.0"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/cespare/xxhash/v2 v2.1.1"
+	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+	"github.com/cheggaaa/pb v1.0.28"
+	"github.com/cheggaaa/pb v1.0.28/go.mod"
+	"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
+	"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/colinmarc/hdfs/v2 v2.1.1"
+	"github.com/colinmarc/hdfs/v2 v2.1.1/go.mod"
+	"github.com/coredns/coredns v1.4.0"
+	"github.com/coredns/coredns v1.4.0/go.mod"
+	"github.com/coreos/bbolt v1.3.3"
+	"github.com/coreos/bbolt v1.3.3/go.mod"
+	"github.com/coreos/etcd v3.3.12+incompatible"
+	"github.com/coreos/etcd v3.3.12+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.3.0"
+	"github.com/coreos/go-semver v0.3.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+	"github.com/creack/pty v1.1.9/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+	"github.com/djherbis/atime v1.0.0"
+	"github.com/djherbis/atime v1.0.0/go.mod"
+	"github.com/dustin/go-humanize v1.0.0"
+	"github.com/dustin/go-humanize v1.0.0/go.mod"
+	"github.com/eapache/go-resiliency v1.1.0/go.mod"
+	"github.com/eapache/go-resiliency v1.2.0"
+	"github.com/eapache/go-resiliency v1.2.0/go.mod"
+	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21"
+	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
+	"github.com/eapache/queue v1.1.0"
+	"github.com/eapache/queue v1.1.0/go.mod"
+	"github.com/eclipse/paho.mqtt.golang v1.2.0"
+	"github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod"
+	"github.com/elazarl/go-bindata-assetfs v1.0.0"
+	"github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod"
+	"github.com/fatih/color v1.7.0"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/fatih/structs v1.1.0"
+	"github.com/fatih/structs v1.1.0/go.mod"
+	"github.com/fortytw2/leaktest v1.2.0/go.mod"
+	"github.com/fortytw2/leaktest v1.3.0"
+	"github.com/fortytw2/leaktest v1.3.0/go.mod"
+	"github.com/frankban/quicktest v1.4.1/go.mod"
+	"github.com/frankban/quicktest v1.7.2"
+	"github.com/frankban/quicktest v1.7.2/go.mod"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32"
+	"github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-ldap/ldap v3.0.2+incompatible/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+	"github.com/go-ole/go-ole v1.2.4"
+	"github.com/go-ole/go-ole v1.2.4/go.mod"
+	"github.com/go-sql-driver/mysql v1.5.0"
+	"github.com/go-sql-driver/mysql v1.5.0/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.1"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.1.0/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/snappy v0.0.1"
+	"github.com/golang/snappy v0.0.1/go.mod"
+	"github.com/gomodule/redigo v2.0.0+incompatible"
+	"github.com/gomodule/redigo v2.0.0+incompatible/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/renameio v0.1.0/go.mod"
+	"github.com/google/uuid v1.1.1"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20190328170749-bb2674552d8f"
+	"github.com/gopherjs/gopherjs v0.0.0-20190328170749-bb2674552d8f/go.mod"
+	"github.com/gorilla/handlers v1.4.0"
+	"github.com/gorilla/handlers v1.4.0/go.mod"
+	"github.com/gorilla/mux v1.7.0"
+	"github.com/gorilla/mux v1.7.0/go.mod"
+	"github.com/gorilla/rpc v1.2.0"
+	"github.com/gorilla/rpc v1.2.0/go.mod"
+	"github.com/gorilla/websocket v1.4.1"
+	"github.com/gorilla/websocket v1.4.1/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.0"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
+	"github.com/hashicorp/go-hclog v0.8.0/go.mod"
+	"github.com/hashicorp/go-hclog v0.9.1/go.mod"
+	"github.com/hashicorp/go-hclog v0.9.2"
+	"github.com/hashicorp/go-hclog v0.9.2/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.0.0"
+	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.5"
+	"github.com/hashicorp/go-msgpack v0.5.5/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0"
+	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+	"github.com/hashicorp/go-plugin v1.0.1/go.mod"
+	"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
+	"github.com/hashicorp/go-retryablehttp v0.5.4"
+	"github.com/hashicorp/go-retryablehttp v0.5.4/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.1"
+	"github.com/hashicorp/go-rootcerts v1.0.1/go.mod"
+	"github.com/hashicorp/go-sockaddr v1.0.2"
+	"github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
+	"github.com/hashicorp/go-uuid v0.0.0-20180228145832-27454136f036/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.1"
+	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+	"github.com/hashicorp/go-version v1.1.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/hcl v1.0.0"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hashicorp/raft v1.1.1-0.20190703171940-f639636d18e0"
+	"github.com/hashicorp/raft v1.1.1-0.20190703171940-f639636d18e0/go.mod"
+	"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
+	"github.com/hashicorp/vault/api v1.0.4"
+	"github.com/hashicorp/vault/api v1.0.4/go.mod"
+	"github.com/hashicorp/vault/sdk v0.1.13"
+	"github.com/hashicorp/vault/sdk v0.1.13/go.mod"
+	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
+	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
+	"github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf"
+	"github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf/go.mod"
+	"github.com/jcmturner/gofork v0.0.0-20180107083740-2aebee971930/go.mod"
+	"github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03"
+	"github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/json-iterator/go v1.1.9"
+	"github.com/json-iterator/go v1.1.9/go.mod"
+	"github.com/json-iterator/go v1.1.10"
+	"github.com/json-iterator/go v1.1.10/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/klauspost/compress v1.8.2/go.mod"
+	"github.com/klauspost/compress v1.9.4/go.mod"
+	"github.com/klauspost/compress v1.10.1/go.mod"
+	"github.com/klauspost/compress v1.10.3"
+	"github.com/klauspost/compress v1.10.3/go.mod"
+	"github.com/klauspost/cpuid v1.2.2"
+	"github.com/klauspost/cpuid v1.2.2/go.mod"
+	"github.com/klauspost/cpuid v1.2.3/go.mod"
+	"github.com/klauspost/cpuid v1.2.4"
+	"github.com/klauspost/cpuid v1.2.4/go.mod"
+	"github.com/klauspost/cpuid v1.3.0"
+	"github.com/klauspost/cpuid v1.3.0/go.mod"
+	"github.com/klauspost/pgzip v1.2.1"
+	"github.com/klauspost/pgzip v1.2.1/go.mod"
+	"github.com/klauspost/readahead v1.3.1"
+	"github.com/klauspost/readahead v1.3.1/go.mod"
+	"github.com/klauspost/reedsolomon v1.9.9"
+	"github.com/klauspost/reedsolomon v1.9.9/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kr/text v0.2.0"
+	"github.com/kr/text v0.2.0/go.mod"
+	"github.com/lib/pq v1.1.1"
+	"github.com/lib/pq v1.1.1/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20180730094502-03f2033d19d5"
+	"github.com/mailru/easyjson v0.0.0-20180730094502-03f2033d19d5/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-colorable v0.1.4"
+	"github.com/mattn/go-colorable v0.1.4/go.mod"
+	"github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod"
+	"github.com/mattn/go-ieproxy v0.0.0-20190805055040-f9202b1cfdeb"
+	"github.com/mattn/go-ieproxy v0.0.0-20190805055040-f9202b1cfdeb/go.mod"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.8"
+	"github.com/mattn/go-isatty v0.0.8/go.mod"
+	"github.com/mattn/go-runewidth v0.0.4"
+	"github.com/mattn/go-runewidth v0.0.4/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/miekg/dns v1.1.8"
+	"github.com/miekg/dns v1.1.8/go.mod"
+	"github.com/minio/cli v1.22.0"
+	"github.com/minio/cli v1.22.0/go.mod"
+	"github.com/minio/highwayhash v1.0.0"
+	"github.com/minio/highwayhash v1.0.0/go.mod"
+	"github.com/minio/md5-simd v1.1.0"
+	"github.com/minio/md5-simd v1.1.0/go.mod"
+	"github.com/minio/minio-go/v6 v6.0.53/go.mod"
+	"github.com/minio/minio-go/v6 v6.0.58-0.20200612001654-a57fec8037ec"
+	"github.com/minio/minio-go/v6 v6.0.58-0.20200612001654-a57fec8037ec/go.mod"
+	"github.com/minio/parquet-go v0.0.0-20200414234858-838cfa8aae61"
+	"github.com/minio/parquet-go v0.0.0-20200414234858-838cfa8aae61/go.mod"
+	"github.com/minio/sha256-simd v0.1.1"
+	"github.com/minio/sha256-simd v0.1.1/go.mod"
+	"github.com/minio/simdjson-go v0.1.5-0.20200303142138-b17fe061ea37"
+	"github.com/minio/simdjson-go v0.1.5-0.20200303142138-b17fe061ea37/go.mod"
+	"github.com/minio/sio v0.2.0"
+	"github.com/minio/sio v0.2.0/go.mod"
+	"github.com/mitchellh/cli v1.0.0/go.mod"
+	"github.com/mitchellh/copystructure v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+	"github.com/mmcloughlin/avo v0.0.0-20200303042253-6df701fe672f"
+	"github.com/mmcloughlin/avo v0.0.0-20200303042253-6df701fe672f/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/montanaflynn/stats v0.5.0"
+	"github.com/montanaflynn/stats v0.5.0/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/nats-io/gnatsd v1.4.1"
+	"github.com/nats-io/gnatsd v1.4.1/go.mod"
+	"github.com/nats-io/go-nats v1.7.2"
+	"github.com/nats-io/go-nats v1.7.2/go.mod"
+	"github.com/nats-io/go-nats-streaming v0.4.4"
+	"github.com/nats-io/go-nats-streaming v0.4.4/go.mod"
+	"github.com/nats-io/jwt v0.3.0/go.mod"
+	"github.com/nats-io/jwt v0.3.2"
+	"github.com/nats-io/jwt v0.3.2/go.mod"
+	"github.com/nats-io/nats-server v1.4.1"
+	"github.com/nats-io/nats-server v1.4.1/go.mod"
+	"github.com/nats-io/nats-server/v2 v2.1.2"
+	"github.com/nats-io/nats-server/v2 v2.1.2/go.mod"
+	"github.com/nats-io/nats-streaming-server v0.14.2"
+	"github.com/nats-io/nats-streaming-server v0.14.2/go.mod"
+	"github.com/nats-io/nats.go v1.9.1"
+	"github.com/nats-io/nats.go v1.9.1/go.mod"
+	"github.com/nats-io/nkeys v0.1.0/go.mod"
+	"github.com/nats-io/nkeys v0.1.3"
+	"github.com/nats-io/nkeys v0.1.3/go.mod"
+	"github.com/nats-io/nuid v1.0.1"
+	"github.com/nats-io/nuid v1.0.1/go.mod"
+	"github.com/nats-io/stan.go v0.4.5"
+	"github.com/nats-io/stan.go v0.4.5/go.mod"
+	"github.com/ncw/directio v1.0.5"
+	"github.com/ncw/directio v1.0.5/go.mod"
+	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
+	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
+	"github.com/nsqio/go-nsq v1.0.7"
+	"github.com/nsqio/go-nsq v1.0.7/go.mod"
+	"github.com/oklog/run v1.0.0/go.mod"
+	"github.com/oklog/ulid v1.3.1/go.mod"
+	"github.com/pascaldekloe/goe v0.1.0"
+	"github.com/pascaldekloe/goe v0.1.0/go.mod"
+	"github.com/pborman/getopt v0.0.0-20180729010549-6fdd0a2c7117/go.mod"
+	"github.com/philhofer/fwd v1.0.0"
+	"github.com/philhofer/fwd v1.0.0/go.mod"
+	"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
+	"github.com/pierrec/lz4 v2.2.6+incompatible/go.mod"
+	"github.com/pierrec/lz4 v2.4.0+incompatible"
+	"github.com/pierrec/lz4 v2.4.0+incompatible/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/posener/complete v1.1.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.2/go.mod"
+	"github.com/prometheus/client_golang v0.9.3"
+	"github.com/prometheus/client_golang v0.9.3/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+	"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
+	"github.com/prometheus/common v0.4.0"
+	"github.com/prometheus/common v0.4.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084"
+	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+	"github.com/prometheus/tsdb v0.7.1/go.mod"
+	"github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod"
+	"github.com/rcrowley/go-metrics v0.0.0-20190704165056-9c2d0518ed81"
+	"github.com/rcrowley/go-metrics v0.0.0-20190704165056-9c2d0518ed81/go.mod"
+	"github.com/rjeczalik/notify v0.9.2"
+	"github.com/rjeczalik/notify v0.9.2/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/rs/cors v1.7.0"
+	"github.com/rs/cors v1.7.0/go.mod"
+	"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
+	"github.com/ryanuber/go-glob v1.0.0"
+	"github.com/ryanuber/go-glob v1.0.0/go.mod"
+	"github.com/secure-io/sio-go v0.3.0"
+	"github.com/secure-io/sio-go v0.3.0/go.mod"
+	"github.com/shirou/gopsutil v2.20.3-0.20200314133625-53cec6b37e6a+incompatible"
+	"github.com/shirou/gopsutil v2.20.3-0.20200314133625-53cec6b37e6a+incompatible/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.5.0"
+	"github.com/sirupsen/logrus v1.5.0/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3"
+	"github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3/go.mod"
+	"github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod"
+	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a"
+	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
+	"github.com/smartystreets/goconvey v1.6.4"
+	"github.com/smartystreets/goconvey v1.6.4/go.mod"
+	"github.com/soheilhy/cmux v0.1.4"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spaolacci/murmur3 v1.1.0"
+	"github.com/spaolacci/murmur3 v1.1.0/go.mod"
+	"github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94"
+	"github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.5.1"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/tidwall/gjson v1.3.5"
+	"github.com/tidwall/gjson v1.3.5/go.mod"
+	"github.com/tidwall/match v1.0.1"
+	"github.com/tidwall/match v1.0.1/go.mod"
+	"github.com/tidwall/pretty v1.0.0"
+	"github.com/tidwall/pretty v1.0.0/go.mod"
+	"github.com/tidwall/sjson v1.0.4"
+	"github.com/tidwall/sjson v1.0.4/go.mod"
+	"github.com/tinylib/msgp v1.1.1"
+	"github.com/tinylib/msgp v1.1.1/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+	"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
+	"github.com/ugorji/go v1.1.5-pre"
+	"github.com/ugorji/go v1.1.5-pre/go.mod"
+	"github.com/ugorji/go/codec v1.1.5-pre"
+	"github.com/ugorji/go/codec v1.1.5-pre/go.mod"
+	"github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a"
+	"github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod"
+	"github.com/willf/bitset v1.1.10"
+	"github.com/willf/bitset v1.1.10/go.mod"
+	"github.com/willf/bloom v2.0.3+incompatible"
+	"github.com/willf/bloom v2.0.3+incompatible/go.mod"
+	"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c"
+	"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod"
+	"github.com/xdg/stringprep v1.0.0"
+	"github.com/xdg/stringprep v1.0.0/go.mod"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+	"github.com/yuin/goldmark v1.1.27/go.mod"
+	"go.etcd.io/bbolt v1.3.3"
+	"go.etcd.io/bbolt v1.3.3/go.mod"
+	"go.opencensus.io v0.21.0"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.uber.org/atomic v1.6.0"
+	"go.uber.org/atomic v1.6.0/go.mod"
+	"go.uber.org/multierr v1.5.0"
+	"go.uber.org/multierr v1.5.0/go.mod"
+	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee"
+	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
+	"go.uber.org/zap v1.15.0"
+	"go.uber.org/zap v1.15.0/go.mod"
+	"golang.org/x/arch v0.0.0-20190909030613-46d78d1859ac/go.mod"
+	"golang.org/x/crypto v0.0.0-20180723164146-c126467f60eb/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190404164418-38d8ce5564a5/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+	"golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod"
+	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
+	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+	"golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9"
+	"golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+	"golang.org/x/mod v0.2.0"
+	"golang.org/x/mod v0.2.0/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+	"golang.org/x/net v0.0.0-20200602114024-627f9648deb9"
+	"golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a"
+	"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20180926160741-c2ed4eda69e7/go.mod"
+	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod"
+	"golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+	"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+	"golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod"
+	"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/sys v0.0.0-20200610111108-226ff32320da"
+	"golang.org/x/sys v0.0.0-20200610111108-226ff32320da/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod"
+	"golang.org/x/text v0.3.2"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+	"golang.org/x/tools v0.0.0-20190914235951-31e00f45c22e/go.mod"
+	"golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod"
+	"golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod"
+	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+	"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
+	"golang.org/x/tools v0.0.0-20200502202811-ed308ab3e770"
+	"golang.org/x/tools v0.0.0-20200502202811-ed308ab3e770/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/api v0.5.0"
+	"google.golang.org/api v0.5.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/appengine v1.6.0"
+	"google.golang.org/appengine v1.6.0/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+	"google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod"
+	"google.golang.org/genproto v0.0.0-20190508193815-b515fa19cec8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190513181449-d00d292a067c"
+	"google.golang.org/genproto v0.0.0-20190513181449-d00d292a067c/go.mod"
+	"google.golang.org/grpc v1.14.0/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.22.0"
+	"google.golang.org/grpc v1.22.0/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d"
+	"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f"
+	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
+	"gopkg.in/cheggaaa/pb.v1 v1.0.28"
+	"gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/ini.v1 v1.42.0/go.mod"
+	"gopkg.in/ini.v1 v1.57.0"
+	"gopkg.in/ini.v1 v1.57.0/go.mod"
+	"gopkg.in/jcmturner/aescts.v1 v1.0.1"
+	"gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod"
+	"gopkg.in/jcmturner/dnsutils.v1 v1.0.1"
+	"gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod"
+	"gopkg.in/jcmturner/goidentity.v3 v3.0.0"
+	"gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod"
+	"gopkg.in/jcmturner/gokrb5.v7 v7.2.3"
+	"gopkg.in/jcmturner/gokrb5.v7 v7.2.3/go.mod"
+	"gopkg.in/jcmturner/gokrb5.v7 v7.3.0"
+	"gopkg.in/jcmturner/gokrb5.v7 v7.3.0/go.mod"
+	"gopkg.in/jcmturner/rpc.v1 v1.1.0"
+	"gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod"
+	"gopkg.in/ldap.v3 v3.0.3"
+	"gopkg.in/ldap.v3 v3.0.3/go.mod"
+	"gopkg.in/olivere/elastic.v5 v5.0.80"
+	"gopkg.in/olivere/elastic.v5 v5.0.80/go.mod"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/square/go-jose.v2 v2.3.1"
+	"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
+	"gopkg.in/urfave/cli.v1 v1.20.0/go.mod"
+	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"honnef.co/go/tools v0.0.1-2019.2.3"
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.3"
+	"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
+	"rsc.io/pdf v0.1.1/go.mod"
+	)
+go-module_set_globals
+SRC_URI="https://github.com/minio/minio/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux"
+
+RESTRICT+=" test"
+
+S="${WORKDIR}/${PN}-RELEASE.${MY_PV}"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/" \
+		-e "s/-s //" \
+		-e "/time/d" \
+		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/" \
+		buildscripts/gen-ldflags.go || die
+}
+
+src_compile() {
+	MINIO_RELEASE="${MY_PV}"
+	go run buildscripts/gen-ldflags.go
+	go build \
+		--ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
+}
+
+src_install() {
+	dobin minio
+	dodoc -r README.md CONTRIBUTING.md docs
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+}
diff --git a/net-fs/ncpfs/Manifest b/net-fs/ncpfs/Manifest
deleted file mode 100644
index 0261c6b8da54..000000000000
--- a/net-fs/ncpfs/Manifest
+++ /dev/null
@@ -1,23 +0,0 @@
-AUX ipx.confd 604 BLAKE2B e2a447045603c9560faf3360566cc1256cee0fb8a12952c85d7535a4d73f6cc27ba1636a00130033a1007a5781c4f8a15fc90c9bede3f1382fda4387d4b114a8 SHA512 b20a772fec2130054037f71a930e237baa33c264bf090568ad1a248c20680b994144d02d6488dad42c3643516f55da5171415b10aab9a908544f571c507d5690
-AUX ipx.init 872 BLAKE2B 304f34189fe38b055639523abde42f49be7c15c78077c2671b1b002d84ff3bff020e8d524c10b9b8f98f45b63b6131d08651d9fa557bc8d5cbd757b1819ccc6f SHA512 a64efeecfdb847ad16289ab5b5c4ebba8d6c910f50a378608db9aa0ef09210c4a054531abf2b4ee84b5c8ab440df61970172e7421ccdb4340127c2bb4c283ec5
-AUX ncpfs-2.2.5-php.patch 559 BLAKE2B eb696360cf1ed7610c8349f3ed7796a81f3ce5f464dbd66e16cba7ce0414710d51cd772df3ef367fdb2fee144a30c7a01b2284237a4ba8ffc8866798f1072748 SHA512 1c8509216b759df915f046c42dbb8a56d101ef9382f22f7830c089fc4f4310c75291c3984c1f079fe7b23f94717debb272c7d2b166619d415ea9df87168a52ca
-AUX ncpfs-2.2.6-align-fix.patch 421 BLAKE2B 6c701b37f0ed63014cbd0553189610c8bac9863721a764e6459bc405fe1a175bf4e388e3198d3b5511a2e08eb11691e6a7794af5971ed209ef5c1a6ef4aff468 SHA512 cf76a9866926048a0792e315c1296cb144432f8d576d9e7d68004f5eb7e10a19ff097ea4d450d2f36da05d97650f1a3411cb6a45bd88b44f6050d5b6df254528
-AUX ncpfs-2.2.6-drop-kernel-check.patch 728 BLAKE2B 562d33007d23f8b2792b7d3e4f77187fab364f1107c723cbf6ae8ab8698b83f4a06d18cdeb0642afff3caa5c6ff1d0c03d40c28898fa9ffcd1498736127d0219 SHA512 6433bd1df6e9d830b0e23882dd4d00afddbd9780d994de0ca480155d817e077b88ae7f46538855631e14a62cc52ec8c1fc5c230b1b64687ada5f2cccb61e392a
-AUX ncpfs-2.2.6-drop-mtab-support.patch 7196 BLAKE2B 2f932599c5dea7c071c6d29f00dd2a88bc0e961ad435b3dc3a59153e8e2643f94ccedeced389a3f73648dfe1b527c3299866a51e1ed9727941bb93a0f88a2add SHA512 a7498d8927c251f882f5d63c2250a8ef2ec72191531bd95bdd1c65aad1f8600602dd2ae54fc0ed6ca95c431fe330168abe972d3d3acad8e71733dde1452eed0b
-AUX ncpfs-2.2.6-gcc4.patch 1271 BLAKE2B 57b4cf96eeadd513b10ec4b6555ae4c73298304187b4bdef8e2f7d9315d1a56b225096ae25ed1a5744e5d6cc34e5dc86b84ff3adff9a91fde38e044648c259cd SHA512 b67b3a8267a76ef1fe3a128443fa96831896c3cac8f41136d3932816dfe9ab5a4d55258b6f19288c543015e53e41b691577484abf57f9163c0e3bebb4742cdbe
-AUX ncpfs-2.2.6-getuid-fix.patch 5121 BLAKE2B 8996154f28afeaaf4b05e0587f38bd9bb2c10b9da6b39d5d32f777355eed186f6064ea9af0e03b590c4a2f89a4e77d9478a69404796a24ceacc1002b6068f462 SHA512 46f02242198829dc615dd9d07ec7502e88d5738b5055e480758ddabe76b65432d436b24607a0131fd33724fa1cec95b90460b8b27c887d29c5c71a410d89edd8
-AUX ncpfs-2.2.6-ldflags-support.patch 5974 BLAKE2B 21fac3888dd7e2feb1322f14fcee20cd130c4d933691518ccd35d50b32d673c5799107ada5cd1e54a1646a8aaf577848173a055d8cf4990aced3ab9ed1064105 SHA512 4d9d6ed8021b9a9a64622e3b2af63616c69ba77ee8b4d83930d34071ac4a1d2f273e02a7ef7051edc5f816a860f977ba6474710e9ced91ff89560739976b10f6
-AUX ncpfs-2.2.6-makefile-fix-soname-link.patch 771 BLAKE2B b7c8e970cf1fd4416a0f211eb37bf80325521aa45efe26fae262b25ea069827eafb7abfa2401e80d3d0dca4c63e821a890260b8227c04c3627611be99102b7a9 SHA512 0f5f6143e6e66a7f2562c8db7a184df0a507cb1d19c32cda787ba989d0827175d198f400c6402ef399436fb4538ee067e432c5dd5b64509e0cddc4a4aef3f0dd
-AUX ncpfs-2.2.6-missing-includes.patch 758 BLAKE2B dd250f53198444500f15faad84b2a40a3a1d352f184b01b113e54c3d01f929200e4f2deb80534a130c851ba49653720cefa9ee5ba8a4ca304e939daa7a704a3e SHA512 4fab8be6c46d494721d6186055b03b6274d77f8e5a2e1bb1a28a73e8ec57805e4ca32b4a0ea4c853c8ebf023b88cc09a50307b04f97d42d5ecffd486c8a4892e
-AUX ncpfs-2.2.6-multiple-vulns.patch 14138 BLAKE2B 6f612b14d194b595a8c5baa5cd1e5a6af9e43873a3b437d004c212934ac2f0bbc638abe8bf0d7aef91c8d5084e2514f03bb9c0999e57dcc6bf210b7bf1cc3a8e SHA512 a58a3d5f4ff7540a880e064bfe7602d38671ddd737bc8e4a9e48ef52f0864de8e0ae51f0fea2ae0be82cc6910d4a47ff8562f9a730dd1930a37fd870bc2823c9
-AUX ncpfs-2.2.6-no-suid-root.patch 544 BLAKE2B 7e5b15d524cba691cd5266d2eaaf579c2180d870235254c8a77caa07e9c72dee36b6215a5681eef16e1a30274862d6bab01b2ca824571de3ac39ecd863c84364 SHA512 697d577aab12c94cbdb36c2f9f2cd51b82e3ab5efb4a9e8246a7c93b7004d004e7d4fdb1ec003585daf1a11f9f559fd65ea86fe8933f2a7d89b0ce810f21c975
-AUX ncpfs-2.2.6-pam_ncp_auth-fix.patch 556 BLAKE2B 66289abdd6b8adc0a53538365c03f30eda980c3eaeaf2c6d7105757b3bdb69c3a53d7b12bc7a06dc9d1f91bcdfbcdd81b4e027fdd5054979aaf872851ac8b148 SHA512 3c20c36bb2b8c72440e359bb3f66d5a91bc91132accc518bae8db0fbc77aaf966e676f494c8add959178e315513aaddc9f627a05b9e0c376cf7ece5bba0b0dde
-AUX ncpfs-2.2.6-remove-libncp_atomic-header.patch 572 BLAKE2B 17d8bf08a9cfa63a0ace4f9f3a7983ec70a7c5ed3ad5d83a61383408c8b350a0f25368bb271658a4ac7e26ed0f2ea62d82322a55d4e02f6f0d8d3b6e995367cf SHA512 07689c979e8e6a40aca410ac8211c6af9fa640679c34ab3431e70c849e9f3c42d26b204310a697ef1494f33b5296e642b977dfc56453f680527ee54d697abe1c
-AUX ncpfs-2.2.6-remove-packed-attrib.patch 10312 BLAKE2B 9fe98d402ec9e4435128ff903c6cf6eec7144cfa5ba75b1732707e5f50bcdd12ce693cb156d6a1d7c90b947ab52380bd1ff6d1ba44b282cb0f68319838030aa7 SHA512 efd11c2cf08f3b7b1458b836ee863f31e3ae470986a02a3d2db0ec6fbb7a984e2d33643765d7223b797732d80187412a907a9ca971233eb0f95ed4744ef6f44a
-AUX ncpfs-2.2.6-servername-array-fix.patch 523 BLAKE2B 6cf9c27ae7bda17722a74f550beb8a2f027517db264a4f895977c05b78609cf818d88fa79e2264a99e99ea09e6de626eb209c394d286b9cae84fd4636db3de47 SHA512 10c8a0b7c6d715018acf77ea3bcca2e50add48d479cc0ee07035f3f8fb910069c2c508a25ab3de945ef19c78add6d8192f0cb484e756d9a15ceb3afcd8195a69
-AUX ncpfs-2.2.6-zend_function_entry.patch 296 BLAKE2B 3bb6db87517e0fb086e95462e9b567628ede7fbeef77b5d6e101dec8a316f2a5185cad8846bbaf37dada789acfedf6f6bbc75dafa92f3eb140cfde4eb038e1eb SHA512 c96723a840cb1b0cdddb91ebe74620b87a32350be084f21b741bda4e399a7648fd00522e9f2ec8404d5a98835d3f5a343dd588f4279848cc031de5bed01680e0
-DIST ncpfs-2.2.6.tar.gz 2100545 BLAKE2B b95c8c0b097227c7b9e526e978efdca2234cdd0833468be99abaa68b0feba09794be26ebcb3a1c3371bc99f6c9d007eee164fa5f918aaee3eca44aeb1420211f SHA512 51f85eaae85deb66cea2ff434974699f6aa45ed1ed75217ef6176ac0b7d0f9f1c4fb186afc64c1b495474d5bad9ac7614033128c0bec39c05de723a9b29c8602
-EBUILD ncpfs-2.2.6-r3.ebuild 2588 BLAKE2B 27eff05fc13f2b7329d77d6ce0f9545a67122f880357103cd72a6ca39a44784c014c9540b9d57b7d6e512c77d9cdecf3280ae8179f23260a88daa16cb3769c50 SHA512 1545b64928579e16016bfb2300e90611ce64d3f0d481351448fb3690f96fdf08cc04a06004d37700ca576d599388df5d7213e464e495b2ccbb4139f382cd18c2
-EBUILD ncpfs-2.2.6-r4.ebuild 2447 BLAKE2B 09deb98327c5fd7f09ca546ff5225103095283a28f4a360475c498441bb6bf10c884407cfad7f36be86f1d286c7b2e554397bd37b9de036284c857803b8bafe1 SHA512 f43f3e7ec548d66d81a91f2cfed6928bddf7e97a8b0d6953eb331dad41f81a51c85b976cc9f29422840f0078998e151904b2c629f8cf919792393d72331916a3
-EBUILD ncpfs-2.2.6-r5.ebuild 2305 BLAKE2B 09dba15aa9a61f5bafff325c53ad61a7aed9bebcdbec5b848f47bbceaa6a581bc398e57fc64e498339c136fecdb53be3cdc621f75ddf74bf480e45cf97485be9 SHA512 80441e194f657b877442109de5dea2126eb82e075d68a5c0fcae9ffdc10d66b9e5f81e368d916b4187e0d67805fffb6104571a629918f7a041aa821f4b1067a1
-MISC metadata.xml 376 BLAKE2B 33c2a81c2a97ae39b1f66ae00a81dbc58144f8f264f31235f95852c70dadfd74ae8ab3db92bfed910354598d4f50e1ce0de546eef7fc2db3717158294fdf79e7 SHA512 dacdb06d762397d05a6ba195648173ddd13822bc020fd0c8ed12148003e9ee651636f162860c5aace8e1182111da4082d2c509a20e8523bd8ed05ef04c51afec
diff --git a/net-fs/ncpfs/files/ipx.confd b/net-fs/ncpfs/files/ipx.confd
deleted file mode 100644
index ca778f4e286a..000000000000
--- a/net-fs/ncpfs/files/ipx.confd
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Config file for /etc/init.d/ipx
-
-# Automatically selecting a primary interface.
-IPX_AUTO_PRIMARY=on
-
-# Automatically creating interfaces.
-IPX_AUTO_INTERFACE=on
-
-# Interface to which IPX sockets are bound.
-IPX_DEVICE=eth0
-
-# The IPX frame type to use.
-# Valid values are: 802.2, 802.3, SNAP, & EtherII.
-IPX_FRAME=802.2
-
-# Create a special kind of IPX interface that does not
-# have a physical device or frame type.
-IPX_INTERNAL_NET=no
-
-# Network number
-IPX_NETNUM=1
-
-# Node number
-IPX_NODENUM=1
diff --git a/net-fs/ncpfs/files/ipx.init b/net-fs/ncpfs/files/ipx.init
deleted file mode 100644
index e4aa25716c5d..000000000000
--- a/net-fs/ncpfs/files/ipx.init
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-#NB: Config is in /etc/conf.d/ipx
-
-depend() {
-	need net netmount
-}
-
-start() {
-	local retval=0
-	
-	ebegin "Bringing IPX up"
-	if [ ${IPX_INTERNAL_NET} = "yes" ]
-	then
-		/usr/bin/ipx_internal_net add ${IPX_NETNUM} ${IPX_NODENUM}
-		retval=$?
-	else
-		/usr/bin/ipx_interface add -p ${IPX_DEVICE} \
-			${IPX_FRAME} ${IPX_NETNUM}
-		retval=$?
-	fi
-	
-	/usr/bin/ipx_configure \
-		--auto_primary=${IPX_AUTO_PRIMARY} \
-		--auto_interface=${IPX_AUTO_INTERFACE}
-	retval=$(( $retval + $? ))
-	eend ${retval} "Failed to bring IPX up"
-}
-
-stop() {
-	local retval=0
-	
-	ebegin "Bringing IPX down"
-	/usr/bin/ipx_configure --auto_primary=off --auto_interface=off
-	retval=$?
-	/usr/bin/ipx_interface delall
-	retval=$(( $retval + $? ))
-	eend ${retval} "Failed to down IPX"
-}
diff --git a/net-fs/ncpfs/files/ncpfs-2.2.5-php.patch b/net-fs/ncpfs/files/ncpfs-2.2.5-php.patch
deleted file mode 100644
index 81908acd6c0b..000000000000
--- a/net-fs/ncpfs/files/ncpfs-2.2.5-php.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/contrib/php/build/rules.mk.orig	2004-12-09 13:01:04.417854240 +0000
-+++ b/contrib/php/build/rules.mk	2004-12-09 13:01:42.460070944 +0000
-@@ -63,10 +63,10 @@
- 
- install-modules:
- 	@test -d modules && \
--	$(mkinstalldirs) $(moduledir) && \
--	echo "installing shared modules into $(moduledir)" && \
-+	$(mkinstalldirs) $(DESTDIR)/$(moduledir) && \
-+	echo "installing shared modules into $(DESTDIR)/$(moduledir)" && \
- 	rm -f modules/*.la && \
--	cp modules/* $(moduledir) || true
-+	cp modules/* $(DESTDIR)/$(moduledir) || true
- 
- include $(builddir)/.deps
- 
diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-align-fix.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-align-fix.patch
deleted file mode 100644
index 49d3c386d5a1..000000000000
--- a/net-fs/ncpfs/files/ncpfs-2.2.6-align-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naurp ncpfs-2.2.6.orig/lib/ndslib.c ncpfs-2.2.6/lib/ndslib.c
---- a/lib/ndslib.c.orig	2005-01-27 12:35:59.000000000 -0500
-+++ b/lib/ndslib.c	2014-08-12 21:07:35.559190454 -0400
-@@ -957,7 +957,7 @@ static NWDSCCODE nds_beginauth2(
- 	NWDSCCODE err;
- 	int n1, n3;
- 	u_int16_t n3a;
--	char rpb_b[DEFAULT_MESSAGE_LEN];
-+	char rpb_b[DEFAULT_MESSAGE_LEN] __attribute__ ((aligned (4)));
- 	Buf_T rpb;
-     	size_t k1tl;
-     
diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-drop-kernel-check.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-drop-kernel-check.patch
deleted file mode 100644
index 9348c08536e4..000000000000
--- a/net-fs/ncpfs/files/ncpfs-2.2.6-drop-kernel-check.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Drop kernel version check
-Author: Bastian Blank <waldi@debian.org>
-Bug-Debian: http://bugs.debian.org/692472
-
---- a/sutil/ncpm_common.c.orig
-+++ b/sutil/ncpm_common.c
-@@ -243,23 +243,6 @@ static int load_ncpfs(void)
- #endif	/* MOUNT2 */
- 
- static int getmountver(void) {
--	struct utsname name;
--	int maj, mid, rev;
--	int ver;
--
--	if (uname(&name)) {
--		errexit(1, _("Cannot get kernel release\n"));
--	}
--	if (sscanf(name.release, "%d.%d.%d", &maj, &mid, &rev) != 3) {
--		errexit(2, _("Cannot convert kernel release \"%s\" to number\n"), name.release);
--	}
--	ver = maj*0x10000 + mid*0x100 + rev;
--	if (ver < 0x20100)
--		return 2;
--	if (ver < 0x20328)
--		return 3;
--	if (ver < 0x2051F)
--		return 4;
- 	return 5;
- }
- 
-
diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-drop-mtab-support.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-drop-mtab-support.patch
deleted file mode 100644
index b9c39f51e4ed..000000000000
--- a/net-fs/ncpfs/files/ncpfs-2.2.6-drop-mtab-support.patch
+++ /dev/null
@@ -1,269 +0,0 @@
-diff -Naurp ncpfs-2.2.6.orig/sutil/ncplogin.c ncpfs-2.2.6/sutil/ncplogin.c
---- a/sutil/ncplogin.c.orig	2014-08-13 02:52:56.859067273 -0400
-+++ b/sutil/ncplogin.c	2014-08-13 02:53:42.699067001 -0400
-@@ -111,7 +111,6 @@
- #include <stdlib.h>
- #include <stdarg.h>
- #include <sys/mount.h>
--#include <mntent.h>
- #include <ncp/kernel/ipx.h>
- #include <sys/ioctl.h>
- #ifdef CONFIG_NATIVE_UNIX
-@@ -935,12 +934,6 @@ ncpipx:;
- 	}
- 	NWCCCloseConn(conn);
- 	NWDSFreeContext(ctx);
--	/* ncpmap, ncplogin must write in /etc/mtab */
--	{
--		block_sigs();
--		add_mnt_entry(mount_name, mount_point, info.flags);
--		unblock_sigs();
--	}
- 	free(mount_name);
- 	if (info.echo_mnt_pnt) {
- 		printf(_("mounted on:%s\n"),mount_point);
-diff -Naurp ncpfs-2.2.6.orig/sutil/ncpm_common.c ncpfs-2.2.6/sutil/ncpm_common.c
---- ncpfs-2.2.6.orig/sutil/ncpm_common.c	2014-08-13 02:52:56.959067273 -0400
-+++ ncpfs-2.2.6/sutil/ncpm_common.c	2014-08-13 02:55:38.349066313 -0400
-@@ -104,7 +104,6 @@
- #include <stdlib.h>
- #include <stdarg.h>
- #include <sys/mount.h>
--#include <mntent.h>
- #include <ncp/kernel/ipx.h>
- #include <sys/ioctl.h>
- #if MOUNT3
-@@ -1423,68 +1422,6 @@ static const struct smntflags {
-        {MS_NODIRATIME,	"nodiratime"},
-        {0,		NULL}};
- 
--void add_mnt_entry(char* mount_name, char* mpnt, unsigned long flags) {
--	const struct smntflags* sf;
--	char mnt_opts[80];
--	char* p;
--	struct mntent ment;
--	int fd;
--	FILE* mtab;
--
--	if (check_name(mount_name) == -1 || check_name(mpnt) == -1)
--		errexit(107, _("Illegal character in mount entry\n"));
--
--	ment.mnt_fsname = mount_name;
--	ment.mnt_dir = mpnt;
--	ment.mnt_type = (char*)"ncpfs";
--	ment.mnt_opts = mnt_opts;
--	ment.mnt_freq = 0;
--	ment.mnt_passno = 0;
--
--	p = mnt_opts;
--	*p++ = 'r';
--	*p++ = (flags & MS_RDONLY)?'o':'w';
--	for (sf = mntflags; sf->flag; sf++) {
--		if (flags & sf->flag) {
--			*p++ = ',';
--			strcpy(p, sf->name);
--			p += strlen(p);
--		}
--	}
--	*p = 0;
--
--	if (ncpm_suser()) {
--		errexit(91, _("Cannot switch to superuser: %s\n"), strerror(errno));
--	}
--	if ((fd = open(MOUNTED "~", O_RDWR | O_CREAT | O_EXCL, 0600)) == -1)
--	{
--		errexit(58, _("Can't get %s~ lock file\n"), MOUNTED);
--	}
--	close(fd);
--
--	if ((mtab = setmntent(MOUNTED, "a+")) == NULL)
--	{
--		errexit(59, _("Can't open %s\n"), MOUNTED);
--	}
--	if (addmntent(mtab, &ment) == 1)
--	{
--		errexit(60, _("Can't write mount entry\n"));
--	}
--	if (fchmod(fileno(mtab), 0644) == -1)
--	{
--		errexit(61, _("Can't set perms on %s\n"), MOUNTED);
--	}
--	endmntent(mtab);
--
--	if (unlink(MOUNTED "~") == -1)
--	{
--		errexit(62, _("Can't remove %s~\n"), MOUNTED);
--	}
--	if (ncpm_normal()) {
--		errexit(90, _("Cannot relinquish superuser rights: %s\n"), strerror(EPERM));
--	}
--}
--
- static int __proc_option(const struct optinfo* opts, struct ncp_mount_info* info, const char* opt, const char* param) {
- 	const struct optinfo* optr;
- 
-diff -Naurp ncpfs-2.2.6.orig/sutil/ncpm_common.h ncpfs-2.2.6/sutil/ncpm_common.h
---- ncpfs-2.2.6.orig/sutil/ncpm_common.h	2014-08-13 02:52:56.749067274 -0400
-+++ ncpfs-2.2.6/sutil/ncpm_common.h	2014-08-13 02:53:42.699067001 -0400
-@@ -60,7 +60,6 @@ void verify_argv(int argc, char* argv[])
- int ncp_mount_specific(struct ncp_conn* conn, int pathNS, const unsigned char* NWpath, int pathlen);
- int mount_ok(struct stat *st);
- void mycom_err(int, const char*, ...);
--void add_mnt_entry(char* mount_name, char* mpoint, unsigned long flags);
- 
- struct ncp_mount_info {
- 	struct ncp_mount_data_independent mdata;
-diff -Naurp ncpfs-2.2.6.orig/sutil/ncpmount.c ncpfs-2.2.6/sutil/ncpmount.c
---- ncpfs-2.2.6.orig/sutil/ncpmount.c	2014-08-13 02:52:56.749067274 -0400
-+++ ncpfs-2.2.6/sutil/ncpmount.c	2014-08-13 02:53:42.699067001 -0400
-@@ -114,7 +114,6 @@
- #include <stdlib.h>
- #include <stdarg.h>
- #include <sys/mount.h>
--#include <mntent.h>
- #include <ncp/kernel/ipx.h>
- #include <ncp/nwclient.h>
- #include <sys/ioctl.h>
-@@ -719,11 +718,6 @@ ncpipx:;
- 	}
- 	ncp_close(conn);
- 
--	if (!opt_n) {
--		block_sigs();
--		add_mnt_entry(mount_name, mount_point, info.flags);
--		unblock_sigs();
--	}
- 	return 0;
- }
- 
-diff -Naurp ncpfs-2.2.6.orig/sutil/ncpumount.c ncpfs-2.2.6/sutil/ncpumount.c
---- ncpfs-2.2.6.orig/sutil/ncpumount.c	2014-08-13 02:52:56.749067274 -0400
-+++ ncpfs-2.2.6/sutil/ncpumount.c	2014-08-13 02:55:10.369066480 -0400
-@@ -179,108 +179,6 @@ static void enableAlarm(void) {
- 	sigprocmask(SIG_UNBLOCK, &sa.sa_mask, NULL);
- }
- 
--static int __clearMtab (const char* mount_points[], unsigned int numEntries) {
--// main logic from ncpumount.c
--	struct mntent *mnt;
--	FILE *mtab;
--	FILE *new_mtab;
--
--#define MOUNTED_TMP MOUNTED".tmp"
--
--	if ((mtab = setmntent(MOUNTED, "r")) == NULL){
--		eprintf(_("Can't open %s: %s\n"), MOUNTED,
--			strerror(errno));
--		return 1;
--	}
--
--	if ((new_mtab = setmntent(MOUNTED_TMP, "w")) == NULL){
--		eprintf(_("Can't open %s: %s\n"), MOUNTED_TMP,
--			strerror(errno));
--		endmntent(mtab);
--		return 1;
--	}
--	while ((mnt = getmntent(mtab)) != NULL)	{
--		unsigned int i=0;
--		int found=0;
--
--		while (i<numEntries && !found) {
--			found=!strcmp(mnt->mnt_dir, mount_points[i]);
--			i++;
--		}
--		if (!found) {
--			addmntent(new_mtab, mnt);
--		}
--	}
--
--	endmntent(mtab);
--
--	if (fchmod(fileno(new_mtab), S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH) < 0){
--		eprintf(_("Error changing mode of %s: %s\n"),
--			MOUNTED_TMP, strerror(errno));
--		return 1;
--	}
--	endmntent(new_mtab);
--
--	if (rename(MOUNTED_TMP, MOUNTED) < 0){
--		eprintf(_("Cannot rename %s to %s: %s\n"),
--			MOUNTED, MOUNTED_TMP, strerror(errno));
--		return 1;
--	}
--	return 0;
--}
--
--static int clearMtab (const char* mount_points[], unsigned int numEntries) {
--	int fd;
--	int err;
--	int retries = 10;
--
--	if (!numEntries)
--		return 0; /* don't waste time ! */
--
--	block_sigs();
--
--	while ((fd = open(MOUNTED "~", O_RDWR | O_CREAT | O_EXCL, 0600)) == -1) {
--		struct timespec tm;
--
--		if (errno != EEXIST || retries == 0) {
--			unblock_sigs();
--			eprintf(_("Can't get %s~ lock file: %s\n"), MOUNTED, strerror(errno));
--			return 1;
--		}
--		fd = open(MOUNTED "~", O_RDWR);
--		if (fd != -1) {
--			alarm(10);
--			err = lockf(fd, F_LOCK, 0);
--			alarm(0);
--			close(fd);
--			if (err) {
--				unblock_sigs();
--				eprintf(_("Can't lock lock file %s~: %s\n"), MOUNTED, _("Lock timed out"));
--				return 1;
--			}
--			tm.tv_sec = 0;
--			tm.tv_nsec = 20000000;
--			nanosleep(&tm, NULL);
--		}
--		retries--;
--	}
--	alarm(1);
--	lockf(fd, F_LOCK, 0);
--	alarm(0);
--	close(fd);
--
--	err = __clearMtab(mount_points, numEntries);
--
--	if ((unlink(MOUNTED "~") == -1) && (err == 0)){
--		unblock_sigs();
--		eprintf(_("Can't remove %s~"), MOUNTED);
--		return 1;
--	}
--	unblock_sigs();
--	return err;
--}
--
--
- int ncp_mnt_umount(const char *abs_mnt, const char *rel_mnt)
- {
- 	if (umount(rel_mnt) != 0) {
-@@ -617,10 +515,6 @@ static int old_ncpumount(int argc, char
- 			ret = 1;
- 			continue;
- 		}
--		if (clearMtab(&mount_point, 1)) {
--			ret = 1;
--			continue;
--		}
- 	}
- 	return ret;
- }
-@@ -739,7 +633,6 @@ main(int argc, char *argv[])
- 			if (serverName || allConns) {
- 				processBindServers(conns,curEntries,serverName,umountTable,&mountEntries);
- 			}
--			clearMtab(umountTable, mountEntries);
- 		} else if (treeName) {
- 			eprintf(_("No NCP connections to tree %s.\n"),treeName);
- 		} else if (serverName) {
diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-gcc4.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-gcc4.patch
deleted file mode 100644
index 793aca6cbccd..000000000000
--- a/net-fs/ncpfs/files/ncpfs-2.2.6-gcc4.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur ncpfs-2.2.6-orig/lib/ncplib.c ncpfs-2.2.6/lib/ncplib.c
---- a/lib/ncplib.c.orig	2006-01-13 16:55:05.000000000 -0500
-+++ b/lib/ncplib.c	2006-01-13 16:56:08.000000000 -0500
-@@ -2421,7 +2421,7 @@
- 	int i = 1;
- 	NWCCODE nwerr;
- 
--	static int get_argument(int arg_no, const char **target) {
-+	int get_argument(int arg_no, const char **target) {
- 		int count = 1;
- 
- 		if (target != NULL) {
-diff -ur ncpfs-2.2.6-orig/util/nwpjmv.c ncpfs-2.2.6/util/nwpjmv.c
---- ncpfs-2.2.6-orig/util/nwpjmv.c	2006-01-13 16:55:05.000000000 -0500
-+++ ncpfs-2.2.6/util/nwpjmv.c	2006-01-13 16:55:50.000000000 -0500
-@@ -131,7 +131,7 @@
- 	char *s = q->command;
- 	char *target_end = target + target_size;
- 
--	static void add_string(const char *str)
-+	void add_string(const char *str)
- 	{
- 		int len = strlen(str);
- 		if (target + len + 1 > target_end)
-diff -ur ncpfs-2.2.6-orig/util/pserver.c ncpfs-2.2.6/util/pserver.c
---- ncpfs-2.2.6-orig/util/pserver.c	2006-01-13 16:55:05.000000000 -0500
-+++ ncpfs-2.2.6/util/pserver.c	2006-01-13 16:55:36.000000000 -0500
-@@ -153,7 +153,7 @@
- 	char *s = q->command;
- 	char *target_end = target + target_size;
- 
--	static void add_string(const char *str)
-+	void add_string(const char *str)
- 	{
- 		int len = strlen(str);
- 		if (target + len + 1 > target_end)
diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-getuid-fix.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-getuid-fix.patch
deleted file mode 100644
index 64193c22d052..000000000000
--- a/net-fs/ncpfs/files/ncpfs-2.2.6-getuid-fix.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-diff -Naurp ncpfs-2.2.6.orig/contrib/tcl-utils/chgpwd.c ncpfs-2.2.6/contrib/tcl-utils/chgpwd.c
---- a/contrib/tcl-utils/chgpwd.c.orig	2005-01-27 12:35:59.000000000 -0500
-+++ b/contrib/tcl-utils/chgpwd.c	2014-08-12 21:08:25.779190155 -0400
-@@ -292,12 +292,12 @@ int main(int argc, char *argv[]) {
- 	        }
-         } else {
-                 if (!treeName[0]) {
--                         NWCXGetPreferredDSTree(treeName,sizeof(treeName));
-+                         dserr=NWCXGetPreferredDSTree(treeName,sizeof(treeName));
- 
-                 }
-                 if (!treeName[0]) {
-                         fprintf(stderr,"failed: You must specify a server or a tree\n");
--                        dserr=114;
-+                        /*dserr=114;*/
-                         goto finished;
-                 }
- 
-diff -Naurp ncpfs-2.2.6.orig/contrib/tcl-utils/ncplist.c ncpfs-2.2.6/contrib/tcl-utils/ncplist.c
---- ncpfs-2.2.6.orig/contrib/tcl-utils/ncplist.c	2005-01-27 12:35:59.000000000 -0500
-+++ ncpfs-2.2.6/contrib/tcl-utils/ncplist.c	2014-08-12 21:08:25.779190155 -0400
-@@ -299,7 +299,12 @@ int main(int argc, char *argv[]) {
-         }else {
- 
-                 if (!treeName[0]) {
--                         NWCXGetPreferredDSTree(treeName,sizeof(treeName));
-+                         dserr=NWCXGetPreferredDSTree(treeName,sizeof(treeName));
-+                         if (dserr){
-+                            fprintf(stderr, "failed: Cannot get preffered DS tree: %s\n",
-+                                    strnwerror(dserr);
-+			    exit(106);
-+			 }
- 
-                 }
-                 if (!treeName[0]) {
-diff -Naurp ncpfs-2.2.6.orig/contrib/tcl-utils/ncpreadprop.c ncpfs-2.2.6/contrib/tcl-utils/ncpreadprop.c
---- ncpfs-2.2.6.orig/contrib/tcl-utils/ncpreadprop.c	2005-01-27 12:35:59.000000000 -0500
-+++ ncpfs-2.2.6/contrib/tcl-utils/ncpreadprop.c	2014-08-12 21:08:25.779190155 -0400
-@@ -470,7 +470,7 @@ main(int argc, char *argv[])
-             }
-         } else {
-                 if (!treeName[0]) {
--                         NWCXGetPreferredDSTree(treeName,sizeof(treeName));
-+                         dserr=NWCXGetPreferredDSTree(treeName,sizeof(treeName));
- 
-                 }
-                 if (!treeName[0]) {
-diff -Naurp ncpfs-2.2.6.orig/contrib/tcl-utils/ncpreadprops.c ncpfs-2.2.6/contrib/tcl-utils/ncpreadprops.c
---- ncpfs-2.2.6.orig/contrib/tcl-utils/ncpreadprops.c	2005-01-27 12:35:59.000000000 -0500
-+++ ncpfs-2.2.6/contrib/tcl-utils/ncpreadprops.c	2014-08-12 21:08:25.779190155 -0400
-@@ -507,7 +507,7 @@ main(int argc, char *argv[])
-             }
-         } else {
-                 if (!treeName[0]) {
--                         NWCXGetPreferredDSTree(treeName,sizeof(treeName));
-+                         dserr=NWCXGetPreferredDSTree(treeName,sizeof(treeName));
- 
-                 }
-                 if (!treeName[0]) {
-diff -Naurp ncpfs-2.2.6.orig/lib/nwclient.c ncpfs-2.2.6/lib/nwclient.c
---- ncpfs-2.2.6.orig/lib/nwclient.c	2005-01-27 12:35:59.000000000 -0500
-+++ ncpfs-2.2.6/lib/nwclient.c	2014-08-12 21:08:25.779190155 -0400
-@@ -481,6 +481,10 @@ static char* readnwinfosfile (char * use
-                 *err = EACCES;
-                 return NULL;
-         }
-+        if (st.st_uid != getuid()) {
-+                *err = EACCES;
-+                return NULL;
-+        }
-         if ((st.st_mode & (S_IRWXO | S_IRWXG)) != 0) {
-                 *err = NCPLIB_INVALID_MODE;
-                 return NULL;
-@@ -560,7 +564,7 @@ NWDSCCODE NWCXGetPreferredDSTree    (NWD
-   if (!res)
-         res=readnwinfosfile (NULL,NDS_PREFERRED_TREE,NULL, &err);
-   if (!res)
--    return -1;
-+    return err;
-   if (strlen (res)+1 >maxLen)
-      return NWE_BUFFER_OVERFLOW;
-   strcpy(preferTree,res);
-@@ -581,7 +585,7 @@ NWDSCCODE NWCXGetDefaultNameContext (con
-    if (!res)
-         res=readnwinfosfile (NULL,NDS_PREFERRED_NAME_CTX,forTree,&err);
-   if (!res)
--    return -1;
-+    return err;
-   if (strlen (res)+1 >maxLen)
-      return NWE_BUFFER_OVERFLOW;
-   strcpy(nameContext,res);
-@@ -603,7 +607,7 @@ NWDSCCODE NWCXGetPreferredServer    (con
- 
- 		res=readnwinfosfile (NULL, NDS_PREFERRED_SERVER, forTree, &err);
- 		if (!res) {
--			return -1;
-+			return err;
- 		}
- 	}
- 	/* test that this server DO belongs to tree forTree*/
-@@ -644,7 +648,7 @@ NWDSCCODE NWCXGetDefaultUserName (const
-          if (!res)
-                 res=readnwinfosfile (NULL,NDS_USER,forTree, &err);
-          if (!res)
--                return -1;
-+                return err;
-         if (strlen (res)+1 >maxLen)
-                 return NWE_BUFFER_OVERFLOW;
-         strcpy(defaultName,res);
-diff -Naurp ncpfs-2.2.6.orig/sutil/ncplogin.c ncpfs-2.2.6/sutil/ncplogin.c
---- ncpfs-2.2.6.orig/sutil/ncplogin.c	2005-01-27 12:35:59.000000000 -0500
-+++ ncpfs-2.2.6/sutil/ncplogin.c	2014-08-12 21:08:25.779190155 -0400
-@@ -588,7 +588,10 @@ main(int argc, char *argv[])
- 		int flags = 0;
- 
- 		if (!info.tree) {
--			NWCXGetPreferredDSTree(ntree, sizeof(ntree));
-+			err=NWCXGetPreferredDSTree(ntree, sizeof(ntree));
-+			if (err){
-+			   errexit(104, _("Cannot get preffered DS tree: %s\n"),strnwerror(err));
-+			}
- 			info.tree = ntree;
- 		}
- 
diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-ldflags-support.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-ldflags-support.patch
deleted file mode 100644
index 111e780ff520..000000000000
--- a/net-fs/ncpfs/files/ncpfs-2.2.6-ldflags-support.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-diff -Naurp ncpfs-2.2.6.orig/contrib/pam/Makefile.in ncpfs-2.2.6/contrib/pam/Makefile.in
---- a/contrib/pam/Makefile.in.orig	2005-01-27 12:35:59.000000000 -0500
-+++ b/contrib/pam/Makefile.in	2014-08-12 21:06:42.369190770 -0400
-@@ -17,6 +17,7 @@ PAM_LIBRARY = pam_ncp_auth.so
- PAM_OBJECTS = pam_ncp_auth.do support.do
- 
- CFLAGS_pam_ncp_auth.do := -DNCPMOUNT_PATH=\"$(bindir)/ncpmount\" -DNCPUMOUNT_PATH=\"$(bindir)/ncpumount\"
-+LDFLAGS = @LDFLAGS@
- 
- .PHONY : all install install-dev dep clean mrproper distclean
- .PHONY : default
-@@ -45,7 +46,7 @@ $(PAM_OBJECTS): %.do: %.c
- 
- 
- $(PAM_LIBRARY): $(PAM_OBJECTS)
--	$(CC) $(CFLAGS) -shared -o $@ $(PAM_OBJECTS) -L$(NCPLIB_DIR) -lncp -lpam ${LIBS}
-+	$(CC) $(CFLAGS) -shared $(LDFLAGS) -o $@ $(PAM_OBJECTS) -L$(NCPLIB_DIR) -lncp -lpam ${LIBS}
- 
- dep:
- 
-diff -Naurp ncpfs-2.2.6.orig/ipx-1.0/Makefile.in ncpfs-2.2.6/ipx-1.0/Makefile.in
---- ncpfs-2.2.6.orig/ipx-1.0/Makefile.in	2005-01-27 12:35:59.000000000 -0500
-+++ ncpfs-2.2.6/ipx-1.0/Makefile.in	2014-08-12 21:06:42.369190770 -0400
-@@ -9,6 +9,7 @@ vpath %.c ${this_srcdir}
- vpath %.8 ${this_srcdir}
- 
- LIBS = @INTLLIBS@ @LIBS@
-+LDFLAGS = @LDFLAGS@
- 
- O_UTILS = ipx_configure.o ipx_cmd.o
- O_UTIIPX = ipx_interface.o ipx_internal_net.o ipx_route.o
-@@ -33,7 +34,7 @@ $(ALL_OBJECTS): %.o: %.c
- 		[ -s $@ ] || rm -f $@
- 
- $(UTIIPX): %: %.o ipxutil.o
--	$(CC) $(CFLAGS) -o $@ $(addsuffix .o,$@) ipxutil.o ${LIBS}
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(addsuffix .o,$@) ipxutil.o ${LIBS}
- 
- $(UTILS): %: %.o
- 	$(CC) $(CFLAGS) -o $@ $(addsuffix .o,$@) ${LIBS}
-diff -Naurp ncpfs-2.2.6.orig/ipxdump/Makefile.in ncpfs-2.2.6/ipxdump/Makefile.in
---- ncpfs-2.2.6.orig/ipxdump/Makefile.in	2005-01-27 12:35:59.000000000 -0500
-+++ ncpfs-2.2.6/ipxdump/Makefile.in	2014-08-12 21:06:42.369190770 -0400
-@@ -11,6 +11,7 @@ ncp_if_ether_support = @ncp_if_ether_sup
- OBJECTS= ipxutil.o
- 
- ALL_OBJECTS := $(EXEC:%=%.o) $(OBJECTS)
-+LDFLAGS = @LDFLAGS@
- 
- .PHONY : all install dep clean mrproper distclean
- .PHONY : dist tgz
-@@ -24,7 +25,7 @@ install: $(EXEC)
- ifeq ($(ncp_if_ether_support),yes)
- 
- $(EXEC): %: %.o $(OBJECTS)
--	$(CC) $(CFLAGS) -o $@ $(addsuffix .o,$@) $(OBJECTS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(addsuffix .o,$@) $(OBJECTS)
- 
- else
- .PHONY ipxdump ipxparse
-diff -Naurp ncpfs-2.2.6.orig/lib/Makefile.in ncpfs-2.2.6/lib/Makefile.in
---- ncpfs-2.2.6.orig/lib/Makefile.in	2005-01-27 12:35:59.000000000 -0500
-+++ ncpfs-2.2.6/lib/Makefile.in	2014-08-12 21:06:42.369190770 -0400
-@@ -23,6 +23,7 @@ STATIC_NCPLIB_BIN := $(STATIC_NCPLIB)
- CCFLAGS += -I.
- PIC_FLAGS := -fPIC
- NWCOMPAT := 1
-+LDFLAGS := @LDFLAGS@
- 
- SHARED_VLINK :=
- SHARED_VLINK_CFLAGS :=
-@@ -122,7 +123,7 @@ $(SHARED_NCPLIB): $(SHARED_NCPLIB_BIN)
- 	ln -sf $< $@
- 
- $(SHARED_NCPLIB_BIN): $(SHARED_O_OBJ) ${this_srcdir}/libncp.vers
--	$(CC) -shared -o $@ -Wl,-soname=$(SHARED_NCPLIB_SONAME) $(SHARED_VLINK) $(SHARED_O_OBJ) ${LIBS} -lc
-+	$(CC) -shared -o $@ -Wl,-soname=$(SHARED_NCPLIB_SONAME) $(LDFLAGS) $(SHARED_VLINK) $(SHARED_O_OBJ) ${LIBS} -lc
- 
- install_static: $(STATIC_NCPLIB_BIN)
- 	$(INSTALL) -d $(DESTDIR)$(libadir)
-diff -Naurp ncpfs-2.2.6.orig/Make.rules.in ncpfs-2.2.6/Make.rules.in
---- ncpfs-2.2.6.orig/Make.rules.in	2005-01-27 12:35:59.000000000 -0500
-+++ ncpfs-2.2.6/Make.rules.in	2014-08-12 21:06:42.369190770 -0400
-@@ -42,6 +42,7 @@ CFLAGS_OPTIONS += $(CWARN)
- CFLAGS_DEFINES := -DN_PLAT_LINUX -DLOCALEDIR=\"${localedir}\" -DNCPFS_VERSION=\"${VERSION}\" -DNCPFS_PACKAGE=\"${PACKAGE}\"
- 
- CCFLAGS := $(CFLAGS_DEFINES) $(CFLAGS_OPTIONS) $(INCLUDES)
-+LDFLAGS := @LDFLAGS@
- 
- # If your system is ELF, either also do a 'make install', or append the util/
- # directory where the dynamic library resides to the environment
-diff -Naurp ncpfs-2.2.6.orig/sutil/Makefile.in ncpfs-2.2.6/sutil/Makefile.in
---- ncpfs-2.2.6.orig/sutil/Makefile.in	2005-01-27 12:35:59.000000000 -0500
-+++ ncpfs-2.2.6/sutil/Makefile.in	2014-08-12 21:06:42.369190770 -0400
-@@ -14,6 +14,7 @@ USE_KERNEL = @USE_KERNEL@
- NDS_SUPPORT = @NDS_SUPPORT@
- 
- LIBS = @INTLLIBS@ @LIBS@
-+LDFLAGS := @LDFLAGS@
- 
- # environ in ncpmount
- CCFLAGS += -D_GNU_SOURCE
-@@ -69,7 +70,7 @@ $(O_UTILS:.o=.d): %.d: %.c
- 		[ -s $@ ] || rm -f $@
- 
- ncpmap.o: %.o: ncplogin.c
--	$(CC) $(CFLAGS) $(CCFLAGS) $(CFLAGS_$@) -o $@ -c $<
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(CCFLAGS) $(CFLAGS_$@) -o $@ -c $<
- 
- ncpmap.d: %.d: ncplogin.c
- 	set -e; $(CC) -M $(CFLAGS) $(CCFLAGS) $(CFLAGS_$(@:.d=.o)) $< \
-@@ -85,7 +86,7 @@ ncpm_common.d mount_login.d: %.d: %.c
- 		[ -s $@ ] || rm -f $@
- 
- $(UTILS): %: %.o ../lib/libncp.a ncpm_common.o mount_login.o
--	$(CC) @GC_SECTIONS@-o $@ $(addsuffix .o,$@) $(LDFLAGS_$@) ../lib/libncp.a ${LIBS}
-+	$(CC) @GC_SECTIONS@-o $@ $(addsuffix .o,$@) $(LDFLAGS) $(LDFLAGS_$@) ../lib/libncp.a ${LIBS}
- 
- ../lib/libncp.a:
- 	make -C ../lib libncp.a
-diff -Naurp ncpfs-2.2.6.orig/util/Makefile.in ncpfs-2.2.6/util/Makefile.in
---- ncpfs-2.2.6.orig/util/Makefile.in	2005-01-27 12:35:59.000000000 -0500
-+++ ncpfs-2.2.6/util/Makefile.in	2014-08-12 21:06:42.369190770 -0400
-@@ -15,6 +15,7 @@ NDS_SUPPORT = @NDS_SUPPORT@
- MOUNT2 = @MOUNT2@
- 
- LIBS = @INTLLIBS@ @LIBS@
-+LDFLAGS = @LDFLAGS@
- 
- O_OTHER = dsqueue.o
- O_USERUTILS = slist.o pqlist.o nwfsinfo.o pserver.o nprint.o nsend.o \
-@@ -83,7 +84,7 @@ install-dev:
- 	make -C ../lib libncp.so
- 
- $(O_USERUTILS) $(O_SBINUTILS) $(O_OTHER) ncptest.o: %.o: %.c
--	$(CC) $(CFLAGS) $(CCFLAGS) $(CFLAGS_$@) -o $@ -c $<
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(CCFLAGS) $(CFLAGS_$@) -o $@ -c $<
- 
- %.d: %.c
- 	set -e; $(CC) -M $(CFLAGS) $(CCFLAGS) $(CFLAGS_$(@:.d=.o)) $< \
-@@ -94,10 +95,10 @@ $(O_USERUTILS) $(O_SBINUTILS) $(O_OTHER)
- pqstat nwpqjob nprint: dsqueue.o
- 
- $(UTILS): %: %.o $(LIBDEP)
--	$(CC) $(CFLAGS) -o $@ $(addsuffix .o,$@) $(ADDOBJS_$@) -L$(NCPLIB_DIR) -lncp ${LIBS}
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(addsuffix .o,$@) $(ADDOBJS_$@) -L$(NCPLIB_DIR) -lncp ${LIBS}
- 
- ipx_probe: ipx_probe.c
--	$(CC) $(CFLAGS) $(CCFLAGS) -o ipx_probe ipx_probe.c ${LIBS}
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(CCFLAGS) -o ipx_probe ipx_probe.c ${LIBS}
- 
- dep:
- 
diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-makefile-fix-soname-link.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-makefile-fix-soname-link.patch
deleted file mode 100644
index ece9fc720db6..000000000000
--- a/net-fs/ncpfs/files/ncpfs-2.2.6-makefile-fix-soname-link.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naurp ncpfs-2.2.6.orig/lib/Makefile.in ncpfs-2.2.6/lib/Makefile.in
---- a/lib/Makefile.in.orig	2014-08-12 23:23:27.149141996 -0400
-+++ b/lib/Makefile.in	2014-08-12 23:23:55.969141824 -0400
-@@ -99,9 +99,10 @@ distclean: mrproper
- install_shared: $(SHARED_NCPLIB_BIN)
- 	$(INSTALL) -d $(DESTDIR)$(libsodir)
- 	$(INSTALL) $(SHARED_NCPLIB_BIN) $(DESTDIR)$(libsodir)
-+	ln -sf $(SHARED_NCPLIB_BIN) $(DESTDIR)$(libsodir)/$(SHARED_NCPLIB)
-+	ln -sf $(SHARED_NCPLIB_BIN) $(DESTDIR)$(libsodir)/$(SHARED_NCPLIB_SONAME)
- 
- install-dev: install_shared install_static
--	ln -sf $(SHARED_NCPLIB_SONAME) $(DESTDIR)$(libsodir)/$(SHARED_NCPLIB)
- 	$(INSTALL) -d $(DESTDIR)$(includedir)/ncp
- 	$(INSTALL) -d $(DESTDIR)$(includedir)/ncp/ext
- 	$(INSTALL) -d $(DESTDIR)$(includedir)/ncp/kernel
diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-missing-includes.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-missing-includes.patch
deleted file mode 100644
index 11258253af91..000000000000
--- a/net-fs/ncpfs/files/ncpfs-2.2.6-missing-includes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ruN ncpfs-2.2.6/contrib/pam/pam_ncp_auth.c ncpfs-2.2.6-fixed/contrib/pam/pam_ncp_auth.c
---- a/contrib/pam/pam_ncp_auth.c.orig	2005-01-27 18:35:59.000000000 +0100
-+++ a/contrib/pam/pam_ncp_auth.c	2007-05-11 21:38:05.143474750 +0200
-@@ -257,6 +257,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-+#include <syslog.h>
- #include <unistd.h>
- #include <pwd.h>
- #include <grp.h>
-diff -ruN ncpfs-2.2.6/sutil/ncpm_common.c ncpfs-2.2.6-fixed/sutil/ncpm_common.c
---- ncpfs-2.2.6/sutil/ncpm_common.c	2005-01-27 18:35:59.000000000 +0100
-+++ ncpfs-2.2.6-fixed/sutil/ncpm_common.c	2007-05-11 21:38:29.609003750 +0200
-@@ -82,6 +82,7 @@
- 
- #include "ncpm_common.h"
- 
-+#include <stddef.h>
- #include <stdio.h>
- #include <string.h>
- #include <signal.h>
diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-multiple-vulns.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-multiple-vulns.patch
deleted file mode 100644
index def49a5fad65..000000000000
--- a/net-fs/ncpfs/files/ncpfs-2.2.6-multiple-vulns.patch
+++ /dev/null
@@ -1,557 +0,0 @@
-From: Dan Rosenberg <dan.j.rosenberg () gmail com>
-Date: Fri, 5 Mar 2010 12:06:01 -0500
-
-============================================
- ncpfs, Multiple Vulnerabilities
- March 5, 2010
- CVE-2010-0788, CVE-2010-0790, CVE-2010-0791
-============================================
-
-==Description==
-
-The ncpmount, ncpumount, and ncplogin utilities, installed as part of the ncpfs
-package, contain several vulnerabilities.
-
-1. ncpmount, ncpumount, and ncplogin are vulnerable to race conditions that
-allow a local attacker to unmount arbitrary mountpoints, causing
-denial-of-service, or mount Netware shares to arbitrary directories,
-potentially leading to root compromise.  This issue was formerly assigned
-CVE-2009-3297, but has since been re-assigned CVE-2010-0788 to avoid overlap
-with related bugs in other packages.
-
-2. ncpumount is vulnerable to an information disclosure vulnerability that
-allows a local attacker to verify the existence of arbitrary files, violating
-directory permissions.  This issue has been assigned CVE-2010-0790.
-
-3. ncpmount, ncpumount, and ncplogin create lockfiles insecurely, allowing a
-local attacker to leave a stale lockfile at /etc/mtab~, causing other mount
-utilities to fail and creating denial-of-service conditions.  This issue has
-been assigned CVE-2010-0791.
-
-==Workaround==
-
-If unprivileged users do not need the ability to mount and unmount Netware
-shares, then the suid bit should be removed from these utilities.
-
-==Solution==
-
-A patch has been released that resolves these issues (attached to this
-advisory).  ncpfs-2.2.6.partial.patch is intended for ncpfs releases that have
-already been patched against the first vulnerability in this report
-(CVE-2010-0788, formerly CVE-2009-3297).  It has been tested against the latest
-ncpfs packages distributed by Fedora, Red Hat, and Mandriva.
-ncpfs-2.2.6.full.patch is intended for ncpfs releases that have not been
-patched against any of these vulnerabilities.  It has been tested against the
-latest ncpfs packages distributed by Debian, Ubuntu, and the upstream release
-(ftp://platan.vc.cvut.cz/pub/linux/ncpfs/).
-
-Users are advised to recompile from source, or request updated packages from
-downstream distributors.
-
-==Credits==
-
-These vulnerabilities were discovered by Dan Rosenberg
-(dan.j.rosenberg () gmail com).
-Thanks to Vitezslav Crhonek for the patch against the first issue.
-
-==References==
-
-CVE identifiers CVE-2010-0788, CVE-2010-0790, and CVE-2010-0791 have been
-assigned to these issues.
-
-http://seclists.org/fulldisclosure/2010/Mar/122
-
-
-diff -ur ncpfs-2.2.6.orig/sutil/ncplogin.c ncpfs-2.2.6/sutil/ncplogin.c
---- a/sutil/ncplogin.c.orig	2010-03-03 16:18:59.000000000 -0500
-+++ b/sutil/ncplogin.c	2010-03-03 16:17:41.000000000 -0500
-@@ -934,7 +934,9 @@
- 	NWDSFreeContext(ctx);
- 	/* ncpmap, ncplogin must write in /etc/mtab */
- 	{
-+		block_sigs();
- 		add_mnt_entry(mount_name, mount_point, info.flags);
-+		unblock_sigs();
- 	}
- 	free(mount_name);
- 	if (info.echo_mnt_pnt) {
-diff -ur ncpfs-2.2.6.orig/sutil/ncpm_common.c ncpfs-2.2.6/sutil/ncpm_common.c
---- ncpfs-2.2.6.orig/sutil/ncpm_common.c	2010-03-03 16:18:59.000000000 -0500
-+++ ncpfs-2.2.6/sutil/ncpm_common.c	2010-03-03 16:17:41.000000000 -0500
-@@ -360,7 +360,7 @@
- #endif 
- 
- static inline int ncpm_suser(void) {
--	return setreuid(-1, 0);
-+	return setresuid(0, 0, myuid);
- }
- 
- static int ncpm_normal(void) {
-@@ -368,11 +368,31 @@
- 	int v;
- 
- 	e = errno;
--	v = setreuid(-1, myuid);
-+	v = setresuid(myuid, myuid, 0);
- 	errno = e;
- 	return v;
- }
- 
-+void block_sigs(void) {
-+
-+	sigset_t mask, orig_mask;
-+	sigfillset(&mask);
-+
-+	if(sigprocmask(SIG_SETMASK, &mask, &orig_mask) < 0) {
-+		errexit(-1, _("Blocking signals failed.\n"));
-+	}
-+}
-+
-+void unblock_sigs(void) {
-+
-+	sigset_t mask, orig_mask;
-+	sigemptyset(&mask);
-+
-+	if (sigprocmask(SIG_SETMASK, &mask, &orig_mask) < 0) {
-+		errexit(-1, _("Un-blocking signals failed.\n"));
-+	}
-+}
-+
- static int proc_ncpm_mount(const char* source, const char* target, const char* filesystem, unsigned long mountflags, const void* data) {
- 	int v;
- 	int e;
-@@ -444,7 +464,7 @@
- 	}
-         datav2.file_mode   = data->file_mode;
-         datav2.dir_mode    = data->dir_mode;
--	err = proc_ncpm_mount(mount_name, data->mount_point, "ncpfs", flags, (void*) &datav2);
-+	err = proc_ncpm_mount(mount_name, ".", "ncpfs", flags, (void*) &datav2);
- 	if (err)
- 		return errno;
- 	return 0;
-@@ -508,7 +528,7 @@
- 		exit(0);	/* Should not return from process_connection */
- 	}
- 	close(pp[0]);
--	err=proc_ncpm_mount(mount_name, data->mount_point, "ncpfs", flags, (void*) &datav3);
-+	err=proc_ncpm_mount(mount_name, ".", "ncpfs", flags, (void*) &datav3);
- 	if (err) {
- 		err = errno;
- 		/* Mount unsuccesful so we have to kill daemon */
-@@ -559,7 +579,7 @@
- 		sprintf(mountopts, "version=%u,flags=%u,owner=%u,uid=%u,gid=%u,mode=%u,dirmode=%u,timeout=%u,retry=%u,wdogpid=%u,ncpfd=%u,infofd=%u",
- 			NCP_MOUNT_VERSION_V5, ncpflags, data->mounted_uid, data->uid, data->gid, data->file_mode,
- 			data->dir_mode, data->time_out, data->retry_count, wdog_pid, data->ncp_fd, pp[1]);
--		err=proc_ncpm_mount(mount_name, data->mount_point, "ncpfs", flags, mountopts);
-+		err=proc_ncpm_mount(mount_name, ".", "ncpfs", flags, mountopts);
- 	} else {
- 		err=-1;
- 	}
-@@ -577,7 +597,7 @@
- 	        datav4.file_mode   = data->file_mode;
-         	datav4.dir_mode    = data->dir_mode;
- 		datav4.wdog_pid	   = wdog_pid;
--		err = proc_ncpm_mount(mount_name, data->mount_point, "ncpfs", flags, (void*)&datav4);
-+		err = proc_ncpm_mount(mount_name, ".", "ncpfs", flags, (void*)&datav4);
- 		if (err) {
- 			err = errno;
- 			/* Mount unsuccesful so we have to kill daemon */
-@@ -1395,6 +1415,17 @@
- }
- #endif /* MOUNT3 */
- 
-+static int check_name(const char *name)
-+{
-+	char *s;
-+	for (s = "\n\t\\"; *s; s++) {
-+		if (strchr(name, *s)) {
-+			return -1;
-+		}
-+	}
-+	return 0;
-+}
-+
- static const struct smntflags {
- 	unsigned int	flag;
- 	const char*	name;
-@@ -1416,6 +1447,9 @@
- 	int fd;
- 	FILE* mtab;
- 
-+	if (check_name(mount_name) == -1 || check_name(mpnt) == -1)
-+		errexit(107, _("Illegal character in mount entry\n"));
-+
- 	ment.mnt_fsname = mount_name;
- 	ment.mnt_dir = mpnt;
- 	ment.mnt_type = (char*)"ncpfs";
-diff -ur ncpfs-2.2.6.orig/sutil/ncpm_common.h ncpfs-2.2.6/sutil/ncpm_common.h
---- ncpfs-2.2.6.orig/sutil/ncpm_common.h	2010-03-03 16:18:59.000000000 -0500
-+++ ncpfs-2.2.6/sutil/ncpm_common.h	2010-03-03 16:17:41.000000000 -0500
-@@ -121,6 +121,9 @@
- int proc_aftermount(const struct ncp_mount_info* info, NWCONN_HANDLE* conn);
- int proc_ncpm_umount(const char* dir);
- 
-+void block_sigs(void);
-+void unblock_sigs(void);
-+
- #define UNUSED(x)	x __attribute__((unused))
- 
- #endif	/* __NCPM_COMMON_H__ */
-diff -ur ncpfs-2.2.6.orig/sutil/ncpmount.c ncpfs-2.2.6/sutil/ncpmount.c
---- ncpfs-2.2.6.orig/sutil/ncpmount.c	2010-03-03 16:18:59.000000000 -0500
-+++ ncpfs-2.2.6/sutil/ncpmount.c	2010-03-03 16:17:41.000000000 -0500
-@@ -359,11 +359,17 @@
- 		usage();
- 		return -1;
- 	}
-+
- 	realpath(argv[optind], mount_point);
- 
--	if (stat(mount_point, &st) == -1)
-+	if (chdir(mount_point))
-+	{
-+		errexit(31, _("Could not change directory into mount target %s: %s\n"),
-+			mount_point, strerror(errno));
-+	}
-+	if (stat(".", &st) == -1)
- 	{
--		errexit(31, _("Could not find mount point %s: %s\n"),
-+		errexit(31, _("Mount point %s does not exist: %s\n"),
- 			mount_point, strerror(errno));
- 	}
- 	if (mount_ok(&st) != 0)
-@@ -714,7 +720,9 @@
- 	ncp_close(conn);
- 
- 	if (!opt_n) {
-+		block_sigs();
- 		add_mnt_entry(mount_name, mount_point, info.flags);
-+		unblock_sigs();
- 	}
- 	return 0;
- }
-diff -ur ncpfs-2.2.6.orig/sutil/ncpumount.c ncpfs-2.2.6/sutil/ncpumount.c
---- ncpfs-2.2.6.orig/sutil/ncpumount.c	2010-03-03 16:18:59.000000000 -0500
-+++ ncpfs-2.2.6/sutil/ncpumount.c	2010-03-03 16:17:41.000000000 -0500
-@@ -70,13 +70,24 @@
- #include <mntent.h>
- #include <pwd.h>
- 
-+#include <sched.h>
-+
- #include "private/libintl.h"
- 
- #define _(X) X
- 
-+#ifndef MS_REC
-+#define MS_REC 16384
-+#endif
-+#ifndef MS_SLAVE
-+#define MS_SLAVE (1<<19)
-+#endif
-+
- static char *progname;
- static int is_ncplogout = 0;
- 
-+uid_t uid;
-+
- static void
- usage(void)
- {
-@@ -117,6 +128,40 @@
- 	va_end(ap);
- }
- 
-+/* Mostly copied from ncpm_common.c */
-+void block_sigs(void) {
-+
-+	sigset_t mask, orig_mask;
-+	sigfillset(&mask);
-+	sigdelset(&mask, SIGALRM); /* Need SIGALRM for ncpumount */
-+
-+	if(setresuid(0, 0, uid) < 0) {
-+		eprintf("Failed to raise privileges.\n");
-+		exit(-1);
-+	}
-+
-+	if(sigprocmask(SIG_SETMASK, &mask, &orig_mask) < 0) {
-+		eprintf("Blocking signals failed.\n");
-+		exit(-1);
-+	}
-+}
-+
-+void unblock_sigs(void) {
-+
-+	sigset_t mask, orig_mask;
-+	sigemptyset(&mask);
-+
-+	if(setresuid(uid, uid, 0) < 0) {
-+		eprintf("Failed to drop privileges.\n");
-+		exit(-1);
-+	}
-+
-+	if(sigprocmask(SIG_SETMASK, &mask, &orig_mask) < 0) {
-+		eprintf("Un-blocking signals failed.\n");
-+		exit(-1);
-+	}
-+}
-+
- static void alarmSignal(int sig) {
- 	(void)sig;
- }
-@@ -192,10 +237,13 @@
- 	if (!numEntries)
- 		return 0; /* don't waste time ! */
- 
-+	block_sigs();
-+
- 	while ((fd = open(MOUNTED "~", O_RDWR | O_CREAT | O_EXCL, 0600)) == -1) {
- 		struct timespec tm;
- 
- 		if (errno != EEXIST || retries == 0) {
-+			unblock_sigs();
- 			eprintf(_("Can't get %s~ lock file: %s\n"), MOUNTED, strerror(errno));
- 			return 1;
- 		}
-@@ -206,6 +254,7 @@
- 			alarm(0);
- 			close(fd);
- 			if (err) {
-+				unblock_sigs();
- 				eprintf(_("Can't lock lock file %s~: %s\n"), MOUNTED, _("Lock timed out"));
- 				return 1;
- 			}
-@@ -223,26 +272,205 @@
- 	err = __clearMtab(mount_points, numEntries);
- 
- 	if ((unlink(MOUNTED "~") == -1) && (err == 0)){
-+		unblock_sigs();
- 		eprintf(_("Can't remove %s~"), MOUNTED);
- 		return 1;
- 	}
-+	unblock_sigs();
- 	return err;
- }
- 
-+
-+int ncp_mnt_umount(const char *abs_mnt, const char *rel_mnt)
-+{
-+	if (umount(rel_mnt) != 0) {
-+		eprintf(_("Could not umount %s: %s\n"),
-+			abs_mnt, strerror(errno));
-+		return -1;
-+	}
-+	return 0;
-+}
-+
-+
-+static int check_is_mount_child(void *p)
-+{
-+	const char **a = p;
-+	const char *last = a[0];
-+	const char *mnt = a[1];
-+	int res;
-+	const char *procmounts = "/proc/mounts";
-+	int found;
-+	FILE *fp;
-+	struct mntent *entp;
-+
-+	res = mount("", "/", "", MS_SLAVE | MS_REC, NULL);
-+	if (res == -1) {
-+		eprintf(_("Failed to mark mounts slave: %s\n"),
-+			strerror(errno));
-+		return 1;
-+	}
-+
-+	res = mount(".", "/tmp", "", MS_BIND | MS_REC, NULL);
-+	if (res == -1) {
-+		eprintf(_("Failed to bind parent to /tmp: %s\n"),
-+			strerror(errno));
-+		return 1;
-+	}
-+
-+	fp = setmntent(procmounts, "r");
-+	if (fp == NULL) {
-+		eprintf(_("Failed to open %s: %s\n"),
-+			procmounts, strerror(errno));
-+		return 1;
-+	}
-+
-+	found = 0;
-+	while ((entp = getmntent(fp)) != NULL) {
-+		if (strncmp(entp->mnt_dir, "/tmp/", 5) == 0 &&
-+		    strcmp(entp->mnt_dir + 5, last) == 0) {
-+			found = 1;
-+			break;
-+		}
-+	}
-+	endmntent(fp);
-+
-+	if (!found) {
-+		eprintf(_("%s not mounted\n"), mnt);
-+		return 1;
-+	}
-+
-+	return 0;
-+}
-+
-+
-+static int check_is_mount(const char *last, const char *mnt)
-+{
-+	char buf[131072];
-+	pid_t pid, p;
-+	int status;
-+	const char *a[2] = { last, mnt };
-+
-+	pid = clone(check_is_mount_child, buf + 65536, CLONE_NEWNS, (void *) a);
-+	if (pid == (pid_t) -1) {
-+		eprintf(_("Failed to clone namespace: %s\n"),
-+			strerror(errno));
-+		return -1;
-+	}
-+	p = waitpid(pid, &status, __WCLONE);
-+	if (p == (pid_t) -1) {
-+		eprintf(_("Waitpid failed: %s\n"),
-+			strerror(errno));
-+		return -1;
-+	}
-+	if (!WIFEXITED(status)) {
-+		eprintf(_("Child terminated abnormally (status %i)\n"),
-+			status);
-+		return -1;
-+	}
-+	if (WEXITSTATUS(status) != 0)
-+		return -1;
-+
-+	return 0;
-+}
-+
-+
-+static int chdir_to_parent(char *copy, const char **lastp, int *currdir_fd)
-+{
-+	char *tmp;
-+	const char *parent;
-+	char buf[PATH_MAX];
-+	int res;
-+
-+	tmp = strrchr(copy, '/');
-+	if (tmp == NULL || tmp[1] == '\0') {
-+		eprintf(_("Internal error: invalid abs path: <%s>\n"),
-+			copy);
-+		return -1;
-+	}
-+	if (tmp != copy) {
-+		*tmp = '\0';
-+		parent = copy;
-+		*lastp = tmp + 1;
-+	} else if (tmp[1] != '\0') {
-+		*lastp = tmp + 1;
-+		parent = "/";
-+	} else {
-+		*lastp = ".";
-+		parent = "/";
-+	}
-+	*currdir_fd = open(".", O_RDONLY);
-+	if (*currdir_fd == -1) {
-+		eprintf(_("Failed to open current directory: %s\n"),
-+			strerror(errno));
-+		return -1;
-+	}
-+	res = chdir(parent);
-+	if (res == -1) {
-+		eprintf(_("Failed to chdir to %s: %s\n"),
-+			parent, strerror(errno));
-+		return -1;
-+	}
-+	if (getcwd(buf, sizeof(buf)) == NULL) {
-+		eprintf(_("Failed to obtain current directory: %s\n"),
-+			strerror(errno));
-+		return -1;
-+	}
-+	if (strcmp(buf, parent) != 0) {
-+		eprintf(_("Mountpoint moved (%s -> %s)\n"),
-+			parent, buf);
-+		return -1;
-+
-+	}
-+
-+	return 0;
-+}
-+
-+
-+static int unmount_ncp(const char *mount_point)
-+{
-+	int currdir_fd = -1;
-+	char *copy;
-+	const char *last;
-+	int res;
-+
-+	copy = strdup(mount_point);
-+	if (copy == NULL) {
-+		eprintf(_("Failed to allocate memory\n"));
-+		return -1;
-+	}
-+	res = chdir_to_parent(copy, &last, &currdir_fd);
-+	if (res == -1)
-+		goto out;
-+	res = check_is_mount(last, mount_point);
-+	if (res == -1)
-+		goto out;
-+	res = ncp_mnt_umount(mount_point, last);
-+
-+out:
-+	free(copy);
-+	if (currdir_fd != -1) {
-+		fchdir(currdir_fd);
-+		close(currdir_fd);
-+	}
-+
-+	return res;
-+}
-+
- static int
- do_umount(const char *mount_point)
- {
- 	int fid = open(mount_point, O_RDONLY, 0);
- 	uid_t mount_uid;
-+	int res;
- 
- 	if (fid == -1) {
--		eprintf(_("Could not open %s: %s\n"),
--			mount_point, strerror(errno));
-+		eprintf(_("Invalid or unauthorized mountpoint %s\n"),
-+			mount_point);
- 		return -1;
- 	}
- 	if (ncp_get_mount_uid(fid, &mount_uid) != 0) {
- 		close(fid);
--		eprintf(_("%s probably not ncp-filesystem\n"),
-+		eprintf(_("Invalid or unauthorized mountpoint %s\n"),
- 			mount_point);
- 		return -1;
- 	}
-@@ -253,12 +481,8 @@
- 		return -1;
- 	}
- 	close(fid);
--	if (umount(mount_point) != 0) {
--		eprintf(_("Could not umount %s: %s\n"),
--			mount_point, strerror(errno));
--		return -1;
--	}
--	return 0;
-+	res = unmount_ncp(mount_point);
-+	return res;
- }
- 
- 
-@@ -409,7 +633,8 @@
- 	int allConns = 0;
- 	const char *serverName = NULL;
- 	const char *treeName = NULL;
--	uid_t uid = getuid();
-+	
-+	uid = getuid();
- 
- 	progname = strrchr(argv[0], '/');
- 	if (progname) {
diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-no-suid-root.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-no-suid-root.patch
deleted file mode 100644
index 050de30b86b0..000000000000
--- a/net-fs/ncpfs/files/ncpfs-2.2.6-no-suid-root.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Don't install utils as suid root
-Author: Bastian Blank <waldi@debian.org>
-Bug-Debian: http://bugs.debian.org/692929
-
---- ncpfs-2.2.6.orig/sutil/Makefile.in
-+++ ncpfs-2.2.6/sutil/Makefile.in
-@@ -51,7 +51,7 @@ all: $(UTILS)
- install: all
- 	${INSTALL} -d $(DESTDIR)$(bindir)
- 	${INSTALL} -d $(DESTDIR)/sbin
--	${INSTALL} -m 4755 $(UTILS) $(DESTDIR)$(bindir)
-+	${INSTALL} $(UTILS) $(DESTDIR)$(bindir)
- ifeq ($(USE_KERNEL),1)
- 	ln -sf $(bindir)/ncpmount $(DESTDIR)/sbin/mount.ncp
- 	ln -sf $(bindir)/ncpmount $(DESTDIR)/sbin/mount.ncpfs
-
diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-pam_ncp_auth-fix.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-pam_ncp_auth-fix.patch
deleted file mode 100644
index 2a9e0edd4b22..000000000000
--- a/net-fs/ncpfs/files/ncpfs-2.2.6-pam_ncp_auth-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naurp ncpfs-2.2.6.orig/contrib/pam/pam_ncp_auth.c ncpfs-2.2.6/contrib/pam/pam_ncp_auth.c
---- ncpfs-2.2.6.orig/contrib/pam/pam_ncp_auth.c	2005-01-27 12:35:59.000000000 -0500
-+++ ncpfs-2.2.6/contrib/pam/pam_ncp_auth.c	2014-08-12 21:02:33.229192251 -0400
-@@ -2534,7 +2534,7 @@ nw_retrieve_nds_user_info(struct nw_user
- bailoutctx:;
- 	NWDSFreeContext(ctx);
- bailout:;
--	if (!err & (ui->qflag & QF_DEBUG))
-+	if ((!err) && (ui->qflag & QF_DEBUG))
- 		syslog(LOG_NOTICE, "%u %u %s %s %s\n", ui->uid, ui->gid, ui->dir, ui->gecos, ui->shell);
- 	return err;
- }
diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-remove-libncp_atomic-header.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-remove-libncp_atomic-header.patch
deleted file mode 100644
index 22768817045c..000000000000
--- a/net-fs/ncpfs/files/ncpfs-2.2.6-remove-libncp_atomic-header.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Remove another generated file
-Author: Bastian Blank <waldi@debian.org>
-Bug-Debian: http://bugs.debian.org/692471
-
---- ncpfs-2.2.6.orig/Makefile.in
-+++ ncpfs-2.2.6/Makefile.in
-@@ -71,6 +71,7 @@ distclean:
- 	rm -f intl/Makefile po/Makefile po/Makefile.in
- 	rm -f lib/Makefile man/Makefile sutil/Makefile util/Makefile
- 	rm -f include/config.h 
-+	rm -f include/private/libncp-atomic.h
- 	rm -f include/ncp/ext/socket.h include/ncp/ext/stdint.h
- 	rm -f include/ncp/kernel/fs.h
- 	rm -f include/ncp/kernel/if.h include/ncp/kernel/route.h include/ncp/kernel/types.h
-
diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-remove-packed-attrib.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-remove-packed-attrib.patch
deleted file mode 100644
index 40267c728710..000000000000
--- a/net-fs/ncpfs/files/ncpfs-2.2.6-remove-packed-attrib.patch
+++ /dev/null
@@ -1,297 +0,0 @@
-diff -Naurp ncpfs-2.2.6.orig//include/ncp/ipxlib.h ncpfs-2.2.6//include/ncp/ipxlib.h
---- ncpfs-2.2.6.orig//include/ncp/ipxlib.h	2005-01-27 12:35:59.000000000 -0500
-+++ ncpfs-2.2.6//include/ncp/ipxlib.h	2011-02-10 02:38:18.822076000 -0500
-@@ -64,12 +64,12 @@ struct sap_query
- struct sap_server_ident
- {
- 	u_int16_t	server_type __attribute__((packed));
--	char		server_name[48] __attribute__((packed));
-+	char		server_name[48];
- 	IPXNet		server_network __attribute__((packed));
- #ifdef SWIG
- 	u_int8_t	server_node[6] __attribute__((packed));
- #else
--	IPXNode		server_node __attribute__((packed));
-+	IPXNode		server_node;
- #endif
- 	IPXPort		server_port __attribute__((packed));
- 	u_int16_t	intermediate_network __attribute__((packed));
-@@ -87,7 +87,7 @@ struct ipx_rt_def {
- struct ipx_rip_packet
- {
- 	u_int16_t		operation __attribute__((packed));
--	struct ipx_rt_def	rt[1] __attribute__((packed));
-+	struct ipx_rt_def	rt[1];
- };
- 
- #ifdef SWIG
-diff -Naurp ncpfs-2.2.6.orig//include/ncp/kernel/ncp.h ncpfs-2.2.6//include/ncp/kernel/ncp.h
---- ncpfs-2.2.6.orig//include/ncp/kernel/ncp.h	2005-01-27 12:35:59.000000000 -0500
-+++ ncpfs-2.2.6//include/ncp/kernel/ncp.h	2011-02-10 02:38:18.822076000 -0500
-@@ -53,12 +53,12 @@
- 
- struct ncp_request_header {
- 	u_int16_t type __attribute__((packed));
--	u_int8_t  sequence __attribute__((packed));
--	u_int8_t  conn_low __attribute__((packed));
--	u_int8_t  task __attribute__((packed));
--	u_int8_t  conn_high __attribute__((packed));
--	u_int8_t  function __attribute__((packed));
--	u_int8_t  data[0] __attribute__((packed));
-+	u_int8_t  sequence;
-+	u_int8_t  conn_low;
-+	u_int8_t  task;
-+	u_int8_t  conn_high;
-+	u_int8_t  function;
-+	u_int8_t  data[0];
- };
- 
- #define NCP_REPLY                (0x3333)
-@@ -66,13 +66,13 @@ struct ncp_request_header {
- 
- struct ncp_reply_header {
- 	u_int16_t type __attribute__((packed));
--	u_int8_t sequence __attribute__((packed));
--	u_int8_t conn_low __attribute__((packed));
--	u_int8_t task __attribute__((packed));
--	u_int8_t conn_high __attribute__((packed));
--	u_int8_t completion_code __attribute__((packed));
--	u_int8_t connection_state __attribute__((packed));
--	u_int8_t data[0] __attribute__((packed));
-+	u_int8_t sequence;
-+	u_int8_t conn_low;
-+	u_int8_t task;
-+	u_int8_t conn_high;
-+	u_int8_t completion_code;
-+	u_int8_t connection_state;
-+	u_int8_t data[0];
- };
- 
- #define NCP_VOLNAME_LEN (16)
-@@ -230,8 +230,8 @@ struct nw_info_struct {
- 	u_int32_t EAKeyCount __attribute__((packed));
- 	u_int32_t EAKeySize __attribute__((packed));
- 	u_int32_t NSCreator __attribute__((packed));
--	u_int8_t nameLen __attribute__((packed));
--	u_int8_t entryName[256] __attribute__((packed));
-+	u_int8_t nameLen;
-+	u_int8_t entryName[256];
- };
- #endif
- 
-@@ -282,13 +282,13 @@ struct nw_file_info {
- 	int opened;
- 	int access;
- 	u_int32_t server_file_handle __attribute__((packed));
--	u_int8_t open_create_action __attribute__((packed));
--	u_int8_t file_handle[6] __attribute__((packed));
-+	u_int8_t open_create_action;
-+	u_int8_t file_handle[6];
- };
- #endif
- 
- struct nw_search_sequence {
--	u_int8_t volNumber __attribute__((packed));
-+	u_int8_t volNumber;
- 	u_int32_t dirBase __attribute__((packed));
- 	u_int32_t sequence __attribute__((packed));
- };
-diff -Naurp ncpfs-2.2.6.orig//include/ncp/ncp.h ncpfs-2.2.6//include/ncp/ncp.h
---- ncpfs-2.2.6.orig//include/ncp/ncp.h	2005-01-27 12:35:59.000000000 -0500
-+++ ncpfs-2.2.6//include/ncp/ncp.h	2011-02-10 02:38:18.822076000 -0500
-@@ -95,7 +95,7 @@ struct prop_net_address {
- #ifdef SWIG
- 	fixedArray node[IPX_NODE_LEN];
- #else
--	u_int8_t node[IPX_NODE_LEN] __attribute__((packed));
-+	u_int8_t node[IPX_NODE_LEN];
- #endif
- 	u_int16_t port __attribute__((packed));
- };
-@@ -163,20 +163,20 @@ struct nw_queue_job_entry {
- 	u_int32_t ClientTask __attribute__((packed));
- 	u_int32_t ClientObjectID __attribute__((packed));
- 	u_int32_t TargetServerID __attribute__((packed));
--	u_int8_t TargetExecTime[6] __attribute__((packed));
--	u_int8_t JobEntryTime[6] __attribute__((packed));
-+	u_int8_t TargetExecTime[6];
-+	u_int8_t JobEntryTime[6];
- 	u_int32_t JobNumber __attribute__((packed));
- 	u_int16_t JobType __attribute__((packed));
- 	u_int16_t JobPosition __attribute__((packed));
- 	u_int16_t JobControlFlags __attribute__((packed));
--	u_int8_t FileNameLen __attribute__((packed));
--	char JobFileName[13] __attribute__((packed));
-+	u_int8_t FileNameLen;
-+	char JobFileName[13];
- 	u_int32_t JobFileHandle __attribute__((packed));
- 	u_int32_t ServerStation __attribute__((packed));
- 	u_int32_t ServerTaskNumber __attribute__((packed));
- 	u_int32_t ServerObjectID __attribute__((packed));
--	char JobTextDescription[50] __attribute__((packed));
--	char ClientRecordArea[152] __attribute__((packed));
-+	char JobTextDescription[50];
-+	char ClientRecordArea[152];
- };
- 
- struct queue_job {
-@@ -217,18 +217,18 @@ struct print_job_record {
- };
- #else
- struct print_job_record {
--	u_int8_t Version __attribute__((packed));
--	u_int8_t TabSize __attribute__((packed));
-+	u_int8_t Version;
-+	u_int8_t TabSize;
- 	u_int16_t Copies __attribute__((packed));
- 	u_int16_t CtrlFlags __attribute__((packed));
- 	u_int16_t Lines __attribute__((packed));
- 	u_int16_t Rows __attribute__((packed));
--	char FormName[16] __attribute__((packed));
--	u_int8_t Reserved[6] __attribute__((packed));
--	char BannerName[13] __attribute__((packed));
--	char FnameBanner[13] __attribute__((packed));
--	char FnameHeader[14] __attribute__((packed));
--	char Path[80] __attribute__((packed));
-+	char FormName[16];
-+	u_int8_t Reserved[6];
-+	char BannerName[13];
-+	char FnameBanner[13];
-+	char FnameHeader[14];
-+	char Path[80];
- };
- #endif
- 
-diff -Naurp ncpfs-2.2.6.orig//include/ncp/ncplib.h ncpfs-2.2.6//include/ncp/ncplib.h
---- ncpfs-2.2.6.orig//include/ncp/ncplib.h	2005-01-27 12:35:59.000000000 -0500
-+++ ncpfs-2.2.6//include/ncp/ncplib.h	2011-02-10 02:38:18.822076000 -0500
-@@ -462,24 +462,24 @@ struct ncp_file_server_info
- #else
- struct ncp_file_server_info
- {
--	u_int8_t ServerName[48] __attribute__((packed));
--	u_int8_t FileServiceVersion __attribute__((packed));
--	u_int8_t FileServiceSubVersion __attribute__((packed));
-+	u_int8_t ServerName[48];
-+	u_int8_t FileServiceVersion;
-+	u_int8_t FileServiceSubVersion;
- 	u_int16_t MaximumServiceConnections __attribute__((packed));
- 	u_int16_t ConnectionsInUse __attribute__((packed));
- 	u_int16_t NumberMountedVolumes __attribute__((packed));
--	u_int8_t Revision __attribute__((packed));
--	u_int8_t SFTLevel __attribute__((packed));
--	u_int8_t TTSLevel __attribute__((packed));
-+	u_int8_t Revision;
-+	u_int8_t SFTLevel;
-+	u_int8_t TTSLevel;
- 	u_int16_t MaxConnectionsEverUsed __attribute__((packed));
--	u_int8_t AccountVersion __attribute__((packed));
--	u_int8_t VAPVersion __attribute__((packed));
--	u_int8_t QueueVersion __attribute__((packed));
--	u_int8_t PrintVersion __attribute__((packed));
--	u_int8_t VirtualConsoleVersion __attribute__((packed));
--	u_int8_t RestrictionLevel __attribute__((packed));
--	u_int8_t InternetBridge __attribute__((packed));
--	u_int8_t Reserved[60] __attribute__((packed));
-+	u_int8_t AccountVersion;
-+	u_int8_t VAPVersion;
-+	u_int8_t QueueVersion;
-+	u_int8_t PrintVersion;
-+	u_int8_t VirtualConsoleVersion;
-+	u_int8_t RestrictionLevel;
-+	u_int8_t InternetBridge;
-+	u_int8_t Reserved[60];
- };
- #endif
- 
-@@ -592,7 +592,7 @@ struct ncp_station_addr
- #ifdef SWIG
- 	fixedArray Node[6];
- #else
--	u_int8_t Node[6] __attribute__((packed));
-+	u_int8_t Node[6];
- #endif
- 	u_int16_t Socket __attribute__((packed));
- };
-@@ -602,32 +602,32 @@ struct ncp_prop_login_control
- #ifdef SWIG
- 	fixedArray AccountExpireDate[3];
- #else
--	u_int8_t AccountExpireDate[3] __attribute__((packed));
-+	u_int8_t AccountExpireDate[3];
- #endif	
--	u_int8_t Disabled __attribute__((packed));
-+	u_int8_t Disabled;
- #ifdef SWIG
- 	fixedArray PasswordExpireDate[3];
- #else	
--	u_int8_t PasswordExpireDate[3] __attribute__((packed));
-+	u_int8_t PasswordExpireDate[3];
- #endif	
--	u_int8_t GraceLogins __attribute__((packed));
-+	u_int8_t GraceLogins;
- 	u_int16_t PasswordExpireInterval __attribute__((packed));
--	u_int8_t MaxGraceLogins __attribute__((packed));
--	u_int8_t MinPasswordLength __attribute__((packed));
-+	u_int8_t MaxGraceLogins;
-+	u_int8_t MinPasswordLength;
- 	u_int16_t MaxConnections __attribute__((packed));
- #ifdef SWIG
- 	fixedArray ConnectionTimeMask[42] __attribute__((packed));
- 	fixedArray LastLogin[6] __attribute__((packed));
- #else	
--	u_int8_t ConnectionTimeMask[42] __attribute__((packed));
--	u_int8_t LastLogin[6] __attribute__((packed));
-+	u_int8_t ConnectionTimeMask[42];
-+	u_int8_t LastLogin[6];
- #endif	
--	u_int8_t RestrictionMask __attribute__((packed));
--	u_int8_t reserved __attribute__((packed));
-+	u_int8_t RestrictionMask;
-+	u_int8_t reserved;
- 	u_int32_t MaxDiskUsage __attribute__((packed));
- 	u_int16_t BadLoginCount __attribute__((packed));
- 	u_int32_t BadLoginCountDown __attribute__((packed));
--	struct ncp_station_addr LastIntruder __attribute__((packed));
-+	struct ncp_station_addr LastIntruder;
- };
- 
- NWCCODE NWReadPropertyValue(NWCONN_HANDLE conn, const char *objName,
-diff -Naurp ncpfs-2.2.6.orig//ipx-1.0/ipx_cmd.c ncpfs-2.2.6//ipx-1.0/ipx_cmd.c
---- ncpfs-2.2.6.orig//ipx-1.0/ipx_cmd.c	2005-01-27 12:35:59.000000000 -0500
-+++ ncpfs-2.2.6//ipx-1.0/ipx_cmd.c	2011-02-10 02:40:19.222076002 -0500
-@@ -63,8 +63,8 @@
- /* we are doing EthernetII... Any objections? */
- struct {
- 	u_int16_t	unknown	__attribute__((packed));
--	u_int8_t	dst[6]	__attribute__((packed));
--	u_int8_t	src[6]	__attribute__((packed));
-+	u_int8_t	dst[6];
-+	u_int8_t	src[6];
- 	u_int16_t	type	__attribute__((packed));
- 	u_int8_t	ipx[16384];
- 	} buffer;
-diff -Naurp ncpfs-2.2.6.orig//lib/ncplib.c ncpfs-2.2.6//lib/ncplib.c
---- ncpfs-2.2.6.orig//lib/ncplib.c	2011-02-10 02:38:05.000000000 -0500
-+++ ncpfs-2.2.6//lib/ncplib.c	2011-02-10 02:38:18.822076000 -0500
-@@ -2584,13 +2584,13 @@ ncp_request(struct ncp_conn *conn, int f
- 
- struct nw_time_buffer
- {
--	u_int8_t year __attribute__((packed));
--	u_int8_t month __attribute__((packed));
--	u_int8_t day __attribute__((packed));
--	u_int8_t hour __attribute__((packed));
--	u_int8_t minute __attribute__((packed));
--	u_int8_t second __attribute__((packed));
--	u_int8_t wday __attribute__((packed));
-+	u_int8_t year;
-+	u_int8_t month;
-+	u_int8_t day;
-+	u_int8_t hour;
-+	u_int8_t minute;
-+	u_int8_t second;
-+	u_int8_t wday;
- };
- 
- static time_t
diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-servername-array-fix.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-servername-array-fix.patch
deleted file mode 100644
index 3e96aac5b364..000000000000
--- a/net-fs/ncpfs/files/ncpfs-2.2.6-servername-array-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naurp ncpfs-2.2.6.orig/include/ncp/ncplib.h ncpfs-2.2.6/include/ncp/ncplib.h
---- ncpfs-2.2.6.orig/include/ncp/ncplib.h	2005-01-27 12:35:59.000000000 -0500
-+++ ncpfs-2.2.6/include/ncp/ncplib.h	2014-08-12 21:01:01.159192798 -0400
-@@ -485,9 +485,9 @@ struct ncp_file_server_info
- 
- struct ncp_file_server_info_2 {
- #ifdef SWIG
--	fixedArray ServerName[49];
-+	fixedArray ServerName[50];
- #else
--	u_int8_t ServerName[49];
-+	u_int8_t ServerName[50];
- #endif	
- 	u_int8_t FileServiceVersion;
- 	u_int8_t FileServiceSubVersion;
diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-zend_function_entry.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-zend_function_entry.patch
deleted file mode 100644
index 648cb8f7f770..000000000000
--- a/net-fs/ncpfs/files/ncpfs-2.2.6-zend_function_entry.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/contrib/php/php_auth_nds.c
-+++ b/contrib/php/php_auth_nds.c
-@@ -1102,7 +1102,7 @@
- 	php_info_print_table_end();
- }
- 
--function_entry auth_nds_functions[] = {
-+zend_function_entry auth_nds_functions[] = {
- 	PHP_FE(auth_bindery,			NULL)
- 	PHP_FE(auth_nds,			NULL)
- 	PHP_FE(auth_tree,			NULL)
diff --git a/net-fs/ncpfs/metadata.xml b/net-fs/ncpfs/metadata.xml
deleted file mode 100644
index 494dcfa44647..000000000000
--- a/net-fs/ncpfs/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>kumba@gentoo.org</email>
-		<name>Joshua Kinard</name>
-	</maintainer>
-	<longdescription>Provides Access to Netware services using the NCP protocol (Kernel support must be activated!)</longdescription>
-</pkgmetadata>
diff --git a/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild b/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild
deleted file mode 100644
index 3cababd6aa33..000000000000
--- a/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils pam
-
-DESCRIPTION="Provides Access to Netware services using the NCP protocol"
-HOMEPAGE="ftp://platan.vc.cvut.cz/pub/linux/ncpfs/"
-SRC_URI="ftp://platan.vc.cvut.cz/pub/linux/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc ppc64 x86"
-IUSE="nls pam php"
-
-DEPEND="nls? ( sys-devel/gettext )
-	pam? ( sys-libs/pam )
-	php? ( || ( dev-lang/php virtual/httpd-php ) )"
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Add patch for PHP extension sandbox violation
-	epatch "${FILESDIR}"/${PN}-2.2.5-php.patch
-	epatch "${FILESDIR}"/${P}-gcc4.patch
-	epatch "${FILESDIR}"/${P}-missing-includes.patch
-
-	# Add a patch to fix multiple vulnerabilities.
-	# CVE-2010-0788, CVE-2010-0790, & CVE-2010-0791.
-	# http://seclists.org/fulldisclosure/2010/Mar/122
-	epatch "${FILESDIR}"/${P}-multiple-vulns.patch
-
-	# Add a patch that removes the __attribute__((packed)); directive
-	# from several struct members in include/ncp/ncplib.h.  This will
-	# cut down on a large number of compile warnings generated by modern
-	# gcc releases.
-	epatch "${FILESDIR}"/${P}-remove-packed-attrib.patch
-
-	# Misc patches borrowed from Mageia.
-	epatch "${FILESDIR}"/${P}-align-fix.patch
-	epatch "${FILESDIR}"/${P}-getuid-fix.patch
-	epatch "${FILESDIR}"/${P}-pam_ncp_auth-fix.patch
-	epatch "${FILESDIR}"/${P}-servername-array-fix.patch
-
-	# Misc patches borrowed from Debian.
-	# Fixes Bug #497278
-	epatch "${FILESDIR}"/${P}-drop-kernel-check.patch
-	epatch "${FILESDIR}"/${P}-drop-mtab-support.patch
-	epatch "${FILESDIR}"/${P}-no-suid-root.patch
-	epatch "${FILESDIR}"/${P}-remove-libncp_atomic-header.patch
-
-	# Bug #273484.
-	sed -i '/ldconfig/d' lib/Makefile.in
-
-	# Support LDFLAGS.
-	epatch "${FILESDIR}"/${P}-ldflags-support.patch
-
-	# Bug 446696.  This might need re-diffing if additional Makefile
-	# fixes are added.
-	epatch "${FILESDIR}"/${P}-makefile-fix-soname-link.patch
-
-	# bug 522444
-	epatch "${FILESDIR}"/${P}-zend_function_entry.patch
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable pam pam "$(getpam_mod_dir)") \
-		$(use_enable php)
-}
-
-src_install() {
-	dodir $(getpam_mod_dir) /usr/sbin /sbin
-
-	# Bug #446696.
-	#ln -s "${D}"/usr/lib64/libncp.so.2.3 "${D}"/libncp.so.2.3.0
-
-	# Install the main programs, then the headers.
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install-dev
-
-	# Install a startup script in /etc/init.d and a conf file in /etc/conf.d
-	newconfd "${FILESDIR}"/ipx.confd ipx
-	newinitd "${FILESDIR}"/ipx.init ipx
-
-	# Docs
-	dodoc FAQ README
-}
diff --git a/net-fs/ncpfs/ncpfs-2.2.6-r4.ebuild b/net-fs/ncpfs/ncpfs-2.2.6-r4.ebuild
deleted file mode 100644
index 04130516b2ca..000000000000
--- a/net-fs/ncpfs/ncpfs-2.2.6-r4.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit pam
-
-DESCRIPTION="Provides access to Netware services using the NCP protocol"
-HOMEPAGE="ftp://platan.vc.cvut.cz/pub/linux/ncpfs/"
-SRC_URI="ftp://platan.vc.cvut.cz/pub/linux/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="nls pam php"
-
-DEPEND="
-	nls? ( sys-devel/gettext )
-	pam? ( sys-libs/pam )
-	php? ( || ( dev-lang/php:* virtual/httpd-php:* ) )"
-
-RDEPEND="${DEPEND}"
-
-MY_PATCHES=(
-	# PHP extension sandbox violation.
-	"${FILESDIR}"/${PN}-2.2.5-php.patch
-	"${FILESDIR}"/${P}-gcc4.patch
-	"${FILESDIR}"/${P}-missing-includes.patch
-
-	# Add a patch to fix multiple vulnerabilities.
-	# CVE-2010-0788, CVE-2010-0790, & CVE-2010-0791.
-	# http://seclists.org/fulldisclosure/2010/Mar/122
-	"${FILESDIR}"/${P}-multiple-vulns.patch
-
-	# Add a patch that removes the __attribute__((packed)); directive
-	# from several struct members in include/ncp/ncplib.h.  This will
-	# cut down on a large number of compile warnings generated by modern
-	# gcc releases.
-	"${FILESDIR}"/${P}-remove-packed-attrib.patch
-
-	# Misc patches borrowed from Mageia.
-	"${FILESDIR}"/${P}-align-fix.patch
-	"${FILESDIR}"/${P}-getuid-fix.patch
-	"${FILESDIR}"/${P}-pam_ncp_auth-fix.patch
-	"${FILESDIR}"/${P}-servername-array-fix.patch
-
-	# Misc patches borrowed from Debian.
-	# Fixes Bug #497278
-	"${FILESDIR}"/${P}-drop-kernel-check.patch
-	"${FILESDIR}"/${P}-drop-mtab-support.patch
-	"${FILESDIR}"/${P}-no-suid-root.patch
-	"${FILESDIR}"/${P}-remove-libncp_atomic-header.patch
-
-	# Support LDFLAGS.
-	"${FILESDIR}"/${P}-ldflags-support.patch
-
-	# Bug 446696.  This might need re-diffing if additional Makefile
-	# fixes are added.
-	"${FILESDIR}"/${P}-makefile-fix-soname-link.patch
-
-	# bug 522444
-	"${FILESDIR}"/${P}-zend_function_entry.patch
-)
-
-DOCS=( FAQ README )
-
-src_prepare() {
-	default
-
-	# Bug #273484.
-	sed -i '/ldconfig/d' lib/Makefile.in || die
-
-	epatch "${MY_PATCHES[@]}"
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable pam pam "$(getpam_mod_dir)") \
-		$(use_enable php)
-}
-
-src_install() {
-	dodir $(getpam_mod_dir) /usr/sbin /sbin
-
-	# Install main software and headers.
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install-dev
-
-	# Install a startup script in /etc/init.d and a conf file in /etc/conf.d
-	newconfd "${FILESDIR}"/ipx.confd ipx
-	newinitd "${FILESDIR}"/ipx.init ipx
-
-	einstalldocs
-}
diff --git a/net-fs/ncpfs/ncpfs-2.2.6-r5.ebuild b/net-fs/ncpfs/ncpfs-2.2.6-r5.ebuild
deleted file mode 100644
index 7e4c742a0e19..000000000000
--- a/net-fs/ncpfs/ncpfs-2.2.6-r5.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
-
-inherit pam
-
-DESCRIPTION="Provides access to Netware services using the NCP protocol"
-HOMEPAGE="ftp://platan.vc.cvut.cz/pub/linux/ncpfs/"
-SRC_URI="ftp://platan.vc.cvut.cz/pub/linux/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="nls pam"
-
-DEPEND="
-	nls? ( sys-devel/gettext )
-	pam? ( sys-libs/pam )"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	# Build fixes.
-	"${FILESDIR}"/${P}-gcc4.patch
-	"${FILESDIR}"/${P}-missing-includes.patch
-
-	# Add a patch to fix multiple vulnerabilities.
-	# CVE-2010-0788, CVE-2010-0790, & CVE-2010-0791.
-	# http://seclists.org/fulldisclosure/2010/Mar/122
-	"${FILESDIR}"/${P}-multiple-vulns.patch
-
-	# Add a patch that removes the __attribute__((packed)); directive
-	# from several struct members in include/ncp/ncplib.h.  This will
-	# cut down on a large number of compile warnings generated by modern
-	# gcc releases.
-	"${FILESDIR}"/${P}-remove-packed-attrib.patch
-
-	# Misc patches borrowed from Mageia.
-	"${FILESDIR}"/${P}-align-fix.patch
-	"${FILESDIR}"/${P}-getuid-fix.patch
-	"${FILESDIR}"/${P}-pam_ncp_auth-fix.patch
-	"${FILESDIR}"/${P}-servername-array-fix.patch
-
-	# Misc patches borrowed from Debian.
-	# Fixes Bug #497278
-	"${FILESDIR}"/${P}-drop-kernel-check.patch
-	"${FILESDIR}"/${P}-drop-mtab-support.patch
-	"${FILESDIR}"/${P}-no-suid-root.patch
-	"${FILESDIR}"/${P}-remove-libncp_atomic-header.patch
-
-	# Support LDFLAGS.
-	"${FILESDIR}"/${P}-ldflags-support.patch
-
-	# Bug 446696.  This might need re-diffing if additional Makefile
-	# fixes are added.
-	"${FILESDIR}"/${P}-makefile-fix-soname-link.patch
-)
-
-DOCS=( FAQ README )
-
-src_prepare() {
-	# Bug #273484.
-	sed -i '/ldconfig/d' lib/Makefile.in || die
-
-	default
-}
-
-src_configure() {
-	# PHP integration no longer supported in Gentoo, per Bug #582516.
-	econf \
-		$(use_enable nls) \
-		$(use_enable pam pam "$(getpam_mod_dir)") \
-		--disable-php
-}
-
-src_install() {
-	dodir $(getpam_mod_dir) /usr/sbin /sbin
-
-	# Install main software and headers.
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install-dev
-
-	# Install a startup script in /etc/init.d and a conf file in /etc/conf.d
-	newconfd "${FILESDIR}"/ipx.confd ipx
-	newinitd "${FILESDIR}"/ipx.init ipx
-
-	einstalldocs
-}
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 369151f0f857..dcd6a686c6b5 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -19,12 +19,10 @@ AUX rpc.idmapd.initd 482 BLAKE2B db643d164787a730ed8f1da73cbc045237bb641fcdf2970
 AUX rpc.pipefs.initd 760 BLAKE2B 4c05275e59d7d19d80779964a3631096258704cec2097f12d87232deecba5d74181f1713e18ebb01f5da9c3833037ba47566414f0b415608ad13e3fa97c8f1e6 SHA512 3d3fa6e7ae01e27d27d88aba1e307c5293dd1cbc9d555737e03c4f1e17988518f4f1e7f7a38a7337f8e8961e8378cc4611769b04db7368460589a3b218ac6d6b
 AUX rpc.statd.initd 706 BLAKE2B 6c175729706d298307deea1d190703e67edb671a6b2c86216658fc89dafff1ae9f85a25b5386e4c89b86ca1b7b1fce7bb3045f944b7a1aee5b6544594d753cf8 SHA512 7f6baea852fff91b88e15e432ba19f9da0a3e3510b6f550b553912cf3887ce176280367b62bcce2a044730a075e4c1f6d7df1a669556d42725dea6e6e8e967ac
 AUX rpc.svcgssd.initd 470 BLAKE2B c610a7abc44b86ca242d59f833ffa6e42f48d1c3bf93420988c6c6dfcd5cc4d8e02eaf2f3a86bb8bca7c8952e05017f887e6c4f4290085c41cc095a580e04235 SHA512 819cce4ae0a0f26bc74ce546e149b98420584240a594c9bb4a0a49413750320bde050866f3753c499425ea8d8df094211fb1f7e020ce281791e1933e1bc6a47f
-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
 DIST nfs-utils-2.4.3.tar.bz2 921710 BLAKE2B 9386a99561370e09ffe871ec38a4fc993e99332c0c6fdb0d07eb7a924cfab4634e5c5186ac1f1629deecf02557fd2d3d5d99b90d97c32d3680ca4478b5c49d9c SHA512 160c828dd7a7b3206b7f167eb99a8dfac7e1a0c8dd88c81b639c3a1f66916908b3ca11fb9a945e4cf6a474f82509ed91a8a3217623f6cb79302d3d9b760f19d9
-EBUILD nfs-utils-2.3.4.ebuild 5263 BLAKE2B d52b55e2dcfec9243ca6eea60479881edccc7e2a4465c404ed017af94302d099aca689a9557994c23a68953b7f79bd7cf97834d1930834757626ba93849b2b53 SHA512 8a7a6372687dfaff3d2b384c83e51cc467349dc0fc98d46090c468f74792a31cacd4c2ff3291ec36062df516a33ed9246c3f2f9c0caa40ef2fc4e6654cab5218
+DIST nfs-utils-2.5.1.tar.bz2 931848 BLAKE2B 84c93ef5707bd97e9e1107dcca0530a3c137cb5ad04c7533bb8aee595a53fdc72359252d009fde95b9833a61f1695db1d6b1726081e5e8efd6c528e831f9834c SHA512 36c11668a9d2a382206db3d73a3d03000cdd2be9836fcbbbd327eb38515ac0b451520f6ffdc69bc05b2b81c60ecb88d50a20a50f123b8092a5b63e1c1054a2eb
 EBUILD nfs-utils-2.4.1-r4.ebuild 6205 BLAKE2B 6a8c7bb4e2796bbf00c8aef69243cafd7a428aae5b1c0c1e4d82418593b14272efd37e8d7561ef0a671de217e27147f73c6287a207016185054c88ae31df3f86 SHA512 68a109f63eefc855a42569867db9876bd0c49ac222bc30c1791b5e7ce88752144315553e309c613c8953dfbc8f3c58c69f067312c936574a491355349ec61f14
-EBUILD nfs-utils-2.4.2-r1.ebuild 6056 BLAKE2B 1adc881ef97c86a6f282e549fcd007fb25dbe2f5a70a8e649af0c09b2b88cdff903a47ab2cbbad3e3576f38718b0b3b18dc6ec545e6de166d1d6ee1ba03f03d6 SHA512 70bc084dd816dd2feb0e8731af7fd7db2c3e94b3951ebb9afce2fd67b6638101a179b6cef8bed421ae2a21e5a2715f7b7b852c93c0173d46b62c8605c1eb6f2f
 EBUILD nfs-utils-2.4.3.ebuild 5796 BLAKE2B a2b68add141b971e43ef27b3e8fe02dda6ac1f214e64013d1aafbcdb845a5bd7ed2c6dd4200737f1720e5809aeb4ee69a6e3e3e1fefbe36f1d268173961bac11 SHA512 78af39e7bc35dd68894b32d7bc0afc0d7b63ec8470a126e6f6e34ea26533bd0212ba6976b2049ce2fd5e27898a343ebb776cfbdec92f67345bf760b5d5b713ad
+EBUILD nfs-utils-2.5.1.ebuild 5796 BLAKE2B a2b68add141b971e43ef27b3e8fe02dda6ac1f214e64013d1aafbcdb845a5bd7ed2c6dd4200737f1720e5809aeb4ee69a6e3e3e1fefbe36f1d268173961bac11 SHA512 78af39e7bc35dd68894b32d7bc0afc0d7b63ec8470a126e6f6e34ea26533bd0212ba6976b2049ce2fd5e27898a343ebb776cfbdec92f67345bf760b5d5b713ad
 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
deleted file mode 100644
index c250e3872502..000000000000
--- a/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild
+++ /dev/null
@@ -1,192 +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 multilib systemd
-
-DESCRIPTION="NFS client and server daemons"
-HOMEPAGE="http://linux-nfs.org/"
-
-if [[ "${PV}" = *_rc* ]] ; then
-	MY_PV="$(ver_rs 1- -)"
-	SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
-else
-	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
-REQUIRED_USE="kerberos? ( nfsv4 )"
-RESTRICT="test" #315573
-
-# kth-krb doesn't provide the right include
-# files, and nfs-utils doesn't build against heimdal either,
-# so don't depend on virtual/krb.
-# (04 Feb 2005 agriffis)
-DEPEND="
-	>=dev-db/sqlite-3.3
-	dev-libs/libxml2
-	net-libs/libtirpc:=
-	>=net-nds/rpcbind-0.2.4
-	sys-libs/e2fsprogs-libs
-	caps? ( sys-libs/libcap )
-	ldap? ( net-nds/openldap )
-	libmount? ( sys-apps/util-linux )
-	nfsv4? (
-		dev-libs/libevent:=
-		>=sys-apps/keyutils-1.5.9
-		kerberos? (
-			>=net-libs/libtirpc-0.2.4-r1[kerberos]
-			app-crypt/mit-krb5
-		)
-	)
-	nfsv41? (
-		sys-fs/lvm2
-	)
-	tcpd? ( sys-apps/tcp-wrappers )
-	uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND}
-	!net-libs/libnfsidmap
-	!net-nds/portmap
-	!<sys-apps/openrc-0.13.9
-	selinux? (
-		sec-policy/selinux-rpc
-		sec-policy/selinux-rpcbind
-	)
-"
-BDEPEND="
-	net-libs/rpcsvc-proto
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
-	"${FILESDIR}"/${PN}-1.2.8-cross-build.patch
-	"${FILESDIR}"/${PN}-2.3.4-no-werror.patch
-)
-
-src_prepare() {
-	default
-
-	sed \
-		-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
-		-i utils/*/Makefile.am || die
-
-	eautoreconf
-}
-
-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
-		--enable-tirpc
-		--with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/
-		--with-pluginpath="${EPREFIX}"/usr/$(get_libdir)/libnfsidmap
-		--with-rpcgen
-		--with-systemd="$(systemd_get_systemunitdir)"
-		--without-gssglue
-		$(use_enable caps)
-		$(use_enable ipv6)
-		$(use_enable junction)
-		$(use_enable kerberos gss)
-		$(use_enable kerberos svcgss)
-		$(use_enable ldap)
-		$(use_enable libmount libmount-mount)
-		$(use_enable nfsdcld nfsdcltrack)
-		$(use_enable nfsv4)
-		$(use_enable nfsv41)
-		$(use_enable uuid)
-		$(use_with tcpd tcp-wrappers)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# remove compiled files bundled in the tarball
-	emake clean
-	default
-}
-
-src_install() {
-	default
-	rm linux-nfs/Makefile* || die
-	dodoc -r linux-nfs README
-
-	# Don't overwrite existing xtab/etab, install the original
-	# versions somewhere safe...  more info in pkg_postinst
-	keepdir /var/lib/nfs/{,sm,sm.bak}
-	mv "${ED}"/var/lib/nfs "${ED}"/usr/$(get_libdir)/ || die
-
-	# Install some client-side binaries in /sbin
-	dodir /sbin
-	mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
-
-	if use nfsv4 && use nfsidmap ; then
-		# Install a config file for idmappers in newer kernels. #415625
-		insinto /etc/request-key.d
-		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
-		doins id_resolver.conf
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/exports
-	keepdir /etc/exports.d
-
-	local f list=() opt_need=""
-	if use nfsv4 ; then
-		opt_need="rpc.idmapd"
-		list+=( rpc.idmapd rpc.pipefs )
-		use kerberos && list+=( rpc.gssd rpc.svcgssd )
-	fi
-	for f in nfs nfsclient rpc.statd "${list[@]}" ; do
-		newinitd "${FILESDIR}"/${f}.initd ${f}
-	done
-	newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
-	for f in nfs nfsclient ; do
-		newconfd "${FILESDIR}"/${f}.confd ${f}
-	done
-	sed -i \
-		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
-		"${ED}"/etc/conf.d/nfs || die #234132
-
-	local systemd_systemunitdir="$(systemd_get_systemunitdir)"
-	sed -i \
-		-e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
-		"${ED}${systemd_systemunitdir}"/* || die
-
-	keepdir /var/lib/nfs #368505
-	keepdir /var/lib/nfs/v4recovery #603628
-
-}
-
-pkg_postinst() {
-	# Install default xtab and friends if there's none existing.  In
-	# src_install we put them in /usr/lib/nfs for safe-keeping, but
-	# the daemons actually use the files in /var/lib/nfs.  #30486
-	local f
-	for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
-		[[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
-		einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
-		cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
-	done
-
-	if systemd_is_booted; then
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${v}" -lt 1.3.0; then
-				ewarn "We have switched to upstream systemd unit files. Since"
-				ewarn "they got renamed, you should probably enable the new ones."
-				ewarn "You can run 'equery files nfs-utils | grep systemd'"
-				ewarn "to know what services you need to enable now."
-			fi
-		done
-	else
-		ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
-		ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
-		ewarn "same runlevel as nfsmount."
-	fi
-}
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
deleted file mode 100644
index 60e7f090e122..000000000000
--- a/net-fs/nfs-utils/nfs-utils-2.4.2-r1.ebuild
+++ /dev/null
@@ -1,209 +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 linux-info multilib systemd
-
-DESCRIPTION="NFS client and server daemons"
-HOMEPAGE="http://linux-nfs.org/"
-
-if [[ "${PV}" = *_rc* ]] ; then
-	MY_PV="$(ver_rs 1- -)"
-	SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
-else
-	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
-REQUIRED_USE="kerberos? ( nfsv4 )"
-RESTRICT="test" #315573
-
-# kth-krb doesn't provide the right include
-# files, and nfs-utils doesn't build against heimdal either,
-# so don't depend on virtual/krb.
-# (04 Feb 2005 agriffis)
-DEPEND="
-	>=dev-db/sqlite-3.3
-	dev-libs/libxml2
-	net-libs/libtirpc:=
-	>=net-nds/rpcbind-0.2.4
-	sys-libs/e2fsprogs-libs
-	caps? ( sys-libs/libcap )
-	ldap? ( net-nds/openldap )
-	libmount? ( sys-apps/util-linux )
-	nfsv4? (
-		dev-libs/libevent:=
-		>=sys-apps/keyutils-1.5.9:=
-		kerberos? (
-			>=net-libs/libtirpc-0.2.4-r1[kerberos]
-			app-crypt/mit-krb5
-		)
-	)
-	nfsv41? (
-		sys-fs/lvm2
-	)
-	tcpd? ( sys-apps/tcp-wrappers )
-	uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND}
-	!net-libs/libnfsidmap
-	!net-nds/portmap
-	!<sys-apps/openrc-0.13.9
-	selinux? (
-		sec-policy/selinux-rpc
-		sec-policy/selinux-rpcbind
-	)
-"
-BDEPEND="
-	net-libs/rpcsvc-proto
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
-	"${FILESDIR}"/${PN}-1.2.8-cross-build.patch
-	"${FILESDIR}"/${PN}-2.4.2-no-werror.patch
-	"${FILESDIR}"/${PN}-2.4.1-statx.patch #688644
-	"${FILESDIR}"/${P}-Ensure-consistent-struct-stat.patch
-	"${FILESDIR}"/${P}-mountd-Add-check-for-struct-file_handle.patch
-	"${FILESDIR}"/${P}-mountd-Fix-compilation-for--disable-uuid.patch
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	if use nfsv4 && ! use nfsdcld && linux_config_exists && ! linux_chkconfig_present CRYPTO_MD5 ; then
-		ewarn "Your NFS server will be unable to track clients across server restarts!"
-		ewarn "Please enable the \"${HILITE}nfsdcld${NORMAL}\" USE flag to install the nfsdcltrack usermode"
-		ewarn "helper upcall program, or enable ${HILITE}CONFIG_CRYPTO_MD5${NORMAL} in your kernel to"
-		ewarn "support the legacy, in-kernel client tracker."
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed \
-		-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
-		-i utils/*/Makefile.am || die
-
-	eautoreconf
-}
-
-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
-		--enable-tirpc
-		--with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/
-		--with-pluginpath="${EPREFIX}"/usr/$(get_libdir)/libnfsidmap
-		--with-rpcgen
-		--with-systemd="$(systemd_get_systemunitdir)"
-		--without-gssglue
-		$(use_enable caps)
-		$(use_enable ipv6)
-		$(use_enable junction)
-		$(use_enable kerberos gss)
-		$(use_enable kerberos svcgss)
-		$(use_enable ldap)
-		$(use_enable libmount libmount-mount)
-		$(use_enable nfsdcld nfsdcltrack)
-		$(use_enable nfsv4)
-		$(use_enable nfsv41)
-		$(use_enable uuid)
-		$(use_with tcpd tcp-wrappers)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# remove compiled files bundled in the tarball
-	emake clean
-	default
-}
-
-src_install() {
-	default
-	rm linux-nfs/Makefile* || die
-	dodoc -r linux-nfs README
-
-	# Don't overwrite existing xtab/etab, install the original
-	# versions somewhere safe...  more info in pkg_postinst
-	keepdir /var/lib/nfs/{,sm,sm.bak}
-	mv "${ED}"/var/lib/nfs "${ED}"/usr/$(get_libdir)/ || die
-
-	# Install some client-side binaries in /sbin
-	dodir /sbin
-	mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
-
-	if use nfsv4 && use nfsidmap ; then
-		insinto /etc
-		doins support/nfsidmap/idmapd.conf
-
-		# Install a config file for idmappers in newer kernels. #415625
-		insinto /etc/request-key.d
-		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
-		doins id_resolver.conf
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/exports
-	keepdir /etc/exports.d
-
-	local f list=() opt_need=""
-	if use nfsv4 ; then
-		opt_need="rpc.idmapd"
-		list+=( rpc.idmapd rpc.pipefs )
-		use kerberos && list+=( rpc.gssd rpc.svcgssd )
-	fi
-	for f in nfs nfsclient rpc.statd "${list[@]}" ; do
-		newinitd "${FILESDIR}"/${f}.initd ${f}
-	done
-	newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
-	for f in nfs nfsclient ; do
-		newconfd "${FILESDIR}"/${f}.confd ${f}
-	done
-	sed -i \
-		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
-		"${ED}"/etc/conf.d/nfs || die #234132
-
-	local systemd_systemunitdir="$(systemd_get_systemunitdir)"
-	sed -i \
-		-e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
-		"${ED}${systemd_systemunitdir}"/* || die
-
-	keepdir /var/lib/nfs #368505
-	keepdir /var/lib/nfs/v4recovery #603628
-
-}
-
-pkg_postinst() {
-	# Install default xtab and friends if there's none existing.  In
-	# src_install we put them in /usr/lib/nfs for safe-keeping, but
-	# the daemons actually use the files in /var/lib/nfs.  #30486
-	local f
-	for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
-		[[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
-		einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
-		cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
-	done
-
-	if systemd_is_booted; then
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${v}" -lt 1.3.0; then
-				ewarn "We have switched to upstream systemd unit files. Since"
-				ewarn "they got renamed, you should probably enable the new ones."
-				ewarn "You can run 'equery files nfs-utils | grep systemd'"
-				ewarn "to know what services you need to enable now."
-			fi
-		done
-	else
-		ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
-		ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
-		ewarn "same runlevel as nfsmount."
-	fi
-}
diff --git a/net-fs/nfs-utils/nfs-utils-2.5.1.ebuild b/net-fs/nfs-utils/nfs-utils-2.5.1.ebuild
new file mode 100644
index 000000000000..62e71ea77936
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-2.5.1.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic linux-info multilib systemd
+
+DESCRIPTION="NFS client and server daemons"
+HOMEPAGE="http://linux-nfs.org/"
+
+if [[ "${PV}" = *_rc* ]] ; then
+	MY_PV="$(ver_rs 1- -)"
+	SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
+else
+	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
+REQUIRED_USE="kerberos? ( nfsv4 )"
+RESTRICT="test" #315573
+
+# kth-krb doesn't provide the right include
+# files, and nfs-utils doesn't build against heimdal either,
+# so don't depend on virtual/krb.
+# (04 Feb 2005 agriffis)
+DEPEND="
+	>=dev-db/sqlite-3.3
+	dev-libs/libxml2
+	net-libs/libtirpc:=
+	>=net-nds/rpcbind-0.2.4
+	sys-libs/e2fsprogs-libs
+	caps? ( sys-libs/libcap )
+	ldap? ( net-nds/openldap )
+	libmount? ( sys-apps/util-linux )
+	nfsv4? (
+		dev-libs/libevent:=
+		>=sys-apps/keyutils-1.5.9:=
+		kerberos? (
+			>=net-libs/libtirpc-0.2.4-r1[kerberos]
+			app-crypt/mit-krb5
+		)
+	)
+	nfsv41? (
+		sys-fs/lvm2
+	)
+	tcpd? ( sys-apps/tcp-wrappers )
+	uuid? ( sys-apps/util-linux )"
+RDEPEND="${DEPEND}
+	!net-libs/libnfsidmap
+	!net-nds/portmap
+	!<sys-apps/openrc-0.13.9
+	selinux? (
+		sec-policy/selinux-rpc
+		sec-policy/selinux-rpcbind
+	)
+"
+BDEPEND="
+	net-libs/rpcsvc-proto
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.2-no-werror.patch
+	"${FILESDIR}"/${PN}-2.4.2-Ensure-consistent-struct-stat.patch
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	if use nfsv4 && ! use nfsdcld && linux_config_exists && ! linux_chkconfig_present CRYPTO_MD5 ; then
+		ewarn "Your NFS server will be unable to track clients across server restarts!"
+		ewarn "Please enable the \"${HILITE}nfsdcld${NORMAL}\" USE flag to install the nfsdcltrack usermode"
+		ewarn "helper upcall program, or enable ${HILITE}CONFIG_CRYPTO_MD5${NORMAL} in your kernel to"
+		ewarn "support the legacy, in-kernel client tracker."
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed \
+		-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
+		-i utils/*/Makefile.am || die
+
+	eautoreconf
+}
+
+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
+		--enable-tirpc
+		--with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/
+		--with-pluginpath="${EPREFIX}"/usr/$(get_libdir)/libnfsidmap
+		--with-rpcgen
+		--with-systemd="$(systemd_get_systemunitdir)"
+		--without-gssglue
+		$(use_enable caps)
+		$(use_enable ipv6)
+		$(use_enable junction)
+		$(use_enable kerberos gss)
+		$(use_enable kerberos svcgss)
+		$(use_enable ldap)
+		$(use_enable libmount libmount-mount)
+		$(use_enable nfsdcld nfsdcltrack)
+		$(use_enable nfsv4)
+		$(use_enable nfsv41)
+		$(use_enable uuid)
+		$(use_with tcpd tcp-wrappers)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# remove compiled files bundled in the tarball
+	emake clean
+	default
+}
+
+src_install() {
+	default
+	rm linux-nfs/Makefile* || die
+	dodoc -r linux-nfs README
+
+	# Don't overwrite existing xtab/etab, install the original
+	# versions somewhere safe...  more info in pkg_postinst
+	keepdir /var/lib/nfs/{,sm,sm.bak}
+	mv "${ED}"/var/lib/nfs "${ED}"/usr/$(get_libdir)/ || die
+
+	# Install some client-side binaries in /sbin
+	dodir /sbin
+	mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
+
+	if use nfsv4 && use nfsidmap ; then
+		insinto /etc
+		doins support/nfsidmap/idmapd.conf
+
+		# Install a config file for idmappers in newer kernels. #415625
+		insinto /etc/request-key.d
+		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
+		doins id_resolver.conf
+	fi
+
+	insinto /etc
+	doins "${FILESDIR}"/exports
+	keepdir /etc/exports.d
+
+	local f list=() opt_need=""
+	if use nfsv4 ; then
+		opt_need="rpc.idmapd"
+		list+=( rpc.idmapd rpc.pipefs )
+		use kerberos && list+=( rpc.gssd rpc.svcgssd )
+	fi
+	for f in nfs nfsclient rpc.statd "${list[@]}" ; do
+		newinitd "${FILESDIR}"/${f}.initd ${f}
+	done
+	newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
+	for f in nfs nfsclient ; do
+		newconfd "${FILESDIR}"/${f}.confd ${f}
+	done
+	sed -i \
+		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
+		"${ED}"/etc/conf.d/nfs || die #234132
+
+	local systemd_systemunitdir="$(systemd_get_systemunitdir)"
+	sed -i \
+		-e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
+		"${ED}${systemd_systemunitdir}"/* || die
+
+	keepdir /var/lib/nfs #368505
+	keepdir /var/lib/nfs/v4recovery #603628
+
+}
+
+pkg_postinst() {
+	# Install default xtab and friends if there's none existing.  In
+	# src_install we put them in /usr/lib/nfs for safe-keeping, but
+	# the daemons actually use the files in /var/lib/nfs.  #30486
+	local f
+	for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
+		[[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
+		einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
+		cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
+	done
+
+	if systemd_is_booted; then
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${v}" -lt 1.3.0; then
+				ewarn "We have switched to upstream systemd unit files. Since"
+				ewarn "they got renamed, you should probably enable the new ones."
+				ewarn "You can run 'equery files nfs-utils | grep systemd'"
+				ewarn "to know what services you need to enable now."
+			fi
+		done
+	else
+		ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
+		ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
+		ewarn "same runlevel as nfsmount."
+	fi
+}
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 01169cbf2c20..b3743edb9b68 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -6,16 +6,10 @@ AUX samba-4.13-winexe_option.patch 2611 BLAKE2B 709cc020ac7bbce948151fca511299ac
 AUX samba-4.4.0-pam.patch 895 BLAKE2B bdc0601527a932424d55946b2eeaa288420ce90a8fd9be2271709da5c113625e80ae3783975b725c515004382bea65336ef725241079081cec213e81cc6e3056 SHA512 5a00c6131c372fc1cc9e23e4a37314442bf9af8e420a040a7b20ec3d76a357959d456437ed13e2e17f938eb6dcb4e7c5d899ff3d670526b0a444f63e35d5262c
 AUX samba-4.9.2-timespec.patch 701 BLAKE2B 8bb49dcc4a2e8219a66737e6211b1f597bba9f64622c750fbd5334c60f7d69fd61030422cc4259dd83068b820276a5ce873f59560e9a54a9891a1d7d213ce47a SHA512 9aeaa8a4359828f34cc66a92b88579592580435fd0992b9dfe5b541c9b08e103bef644a0049dfc29f305c1dd3ca3b87f378957f9afae95cfb2c72bfb6e44941c
 AUX samba.conf 88 BLAKE2B 5bf3391fdf31b284bfa68b904370776d2e5b14fe0ce5677b4982b54da379e504cf9a3c9563438ce262b9634140a1192ecf00f57a66da2e42d52c351ae9972d4e SHA512 b26251050e29571e6a567d8516aa0ea82fe7fdaa25726677b6cad20d0e25b9fec350d755d26c778855a1444d20852930a47c06340c213dac441375a2c424fdb2
-DIST samba-4.11.6.tar.gz 18541566 BLAKE2B 2b4a40be7cec8a9706cbc344796885f59403aa11ca3d8a7dc40b3d287ec222c11d7395fd193c4b66c4116f1bffd869caf444a950d508f5a9a596db32553e1461 SHA512 3815080a1693c596a126371a5ea4e8534317a7266803c7de13a7e5b3ee9757dfbf13c0de20d498a6683d3aaf56941ed42f289e3c24f88713529a5f047a691af2
 DIST samba-4.11.8.tar.gz 18571308 BLAKE2B 024920789ac8fcedfc79f4d094a47e4c1399a0bbc3ad79908f66b9bbabd765865795763c1017cc0caba18dbc11ce6a7e25231804d7dff11ab3d97a599ab8d9ed SHA512 a036c46e060d9edc11bf4e45e0449042fe44b74ff083d305779c68dad943f87fb6d2680f3a68e6bbcd0b19c8c397ec9fc5794229a311c25dad9efc366add613a
 DIST samba-4.11.9.tar.gz 18576961 BLAKE2B 584e62df96bd7de6c0ff93f8fb45b85583b048c300cae020e1e1b467e773b4198c215cbef3b9c34ddf2e138118cca1dd7002ab9c671d111606e735ba8595f720 SHA512 77c1e928d23115eed0cc20f5836b02e73a26b0c23b2061c6148177fbf5b140e3d3a7a9fabfee3a2306158bc157708636c58c6655a57a64f0ff9a20c1a91e4f23
-DIST samba-4.12.2.tar.gz 18192360 BLAKE2B 1ef1b128dc628d5b8b69183fa99eceac27feaea54207eb2e5e2af5882cdf17d2819efbfc9f91cf73a9c744b5ef17c6b8dcd135783da9a36d8c41246d2c4515d0 SHA512 c1d5f62ea2e43c246988aa65c4b690de232f73c0213cbc5d532e43c8cfbea17f1ac92435526b64c9a85c582b29381eecfb57713861efc32f6e6257000c393562
 DIST samba-4.12.3.tar.gz 18203604 BLAKE2B 4d95e472fe4dbec259c6efe14db56d38056209f22a1ad98a62f7b8a9efb09c09ef4ff16ac1ee287e5a93cc86cb7472ee7c1d4feb1d0e1bdc4b887b1a7213fdf2 SHA512 5de66c21db0710880b6e0347ae1eff17ff1881eb926e9a0cf5af9ddc27599cf8daa9ca6ea35b2a0a2158226a38cdf7074b28a51e460a139720c78a522b1a5908
-EBUILD samba-4.11.6-r2.ebuild 9331 BLAKE2B fabf6baea685d888cad0cf974005986043b2d21ee2915db9b97fb6d24a43e148e28aa77e22a0456952141a55d97ff496631a59b481fb4b25af1134f418865bf0 SHA512 c35ed162c8e1d9a3824d9e46524ecc7728bdd11c503fab0fe849d271c37aa2d3c93dc2a6a08054f69cdfbedb218ab1bd46e6da9d4b4a169e8e0bc240860116a3
-EBUILD samba-4.11.8.ebuild 9277 BLAKE2B 221d780730847c9ffc68b6559782da7b0e732e298f84af3df829817d6639b503c3f90cb8d65c95bf199c4a0af5bcf1cc74d0dc8f3c8aca965c12e468cbb4099f SHA512 00ba080257fc342e6b48dd616126be087e58ebdc8100aed2400819c3bdb802bc47c7de1560e0f4cdf0497cf597c8f80755ce269e170abea35f5d56343b4d833b
-EBUILD samba-4.11.9-r1.ebuild 9451 BLAKE2B 6dcf1c982625ddb4c98413b127a96ca0f38d536fa5b879e8ceb6c5478654685da458e1aa62e46f667c4579a0f8b252d6a70669fdafd834506b41be9d9c5dffbd SHA512 313d30e44160a56ee4e4f1fb4b1e0daa149b663d19eecd35f986712835266523598f8e24cee939b8aa66d0cd2c55842edf52041a1c833d85adbb9e0ee0b5792c
-EBUILD samba-4.11.9.ebuild 9348 BLAKE2B 5d44aa90662162b89302c956f49dc82891b14a644745353598acd259ad398158e2c6fee28753d66cdc66478ff85ae11f6e81d22a08c2e6eeaccff39858ccb273 SHA512 95adf5b8027141da44ed5ce9dd2cde19e67db148b07b4d4931d5fdf1e920cf7d6f758cdf49200b9056ab13967b3c078b06276102ca1065938b3a2c5633a46570
-EBUILD samba-4.12.2.ebuild 9334 BLAKE2B f07649ff63c69c998c2cf85c871bded75619fb1cb4298583ea396c9561101867ebfc7face7960096470aa3367df72a42957d37c94a01da67b5d5906a45dba06b SHA512 01d150c98933ca43e9558d8661ee0aaaf6c8de9f5680a09788adf5b8c76be7b96aff76f0c372ffb6209711f9f2693f6d23cc7fbc12851ec7f9babbf9522ad8da
-EBUILD samba-4.12.3-r1.ebuild 9437 BLAKE2B ff3f33316cc259e8695b7648b165ee4f2bdc849f73e1dadd4e7f25730fa3b21ebe708f17471f2f204e83e37343a31be29775552293a1a1018675890c91f1c810 SHA512 b14d3bf792b54caad52cc922cff5c8f95d4fddc6d4ed8eb1147f6cb00a11a1552e33244490c8f9fd678cdc870cbf85c15abc33274584f2d4f160bdefe70e654b
-EBUILD samba-4.12.3.ebuild 9334 BLAKE2B 407286a8bf12a71708c22fd23dcc93c9c7bc4fd359016e0d0317bfeb2074c2c8b0a472a93e5c25809107c2ff87e5780f9187da544e91af5afbdab5395abee7e5 SHA512 68a085127a4b30fc42274936328fbfc858fd08f0fea9b4f4c22ede184314066189b3cfb1e4a4b8bf59e508d520e04c6c2898f4bf287724d2e417ae6c0923b226
+EBUILD samba-4.11.8.ebuild 9276 BLAKE2B f8d481cf12c33d41c6e95d34e32107b7129965db381759108dca19d1404a096314b08fec95b5bb56b6b217db37b67964ad55f42e6ef2ac709526734b9eea78cd SHA512 436fe7292912e01ef4c83a6ba444ab8737cf981b57d26434cbb65d3692f2090347f6ed8477a10044d107240b9732c22a9a8c5f21af1fe099a170893efb3854ae
+EBUILD samba-4.11.9-r1.ebuild 9450 BLAKE2B bf862dcba7d3d9ad650257825bbb1ac8d8dacf736d150c298f5fa915f57ce0b52141cc48c0fe0463aa3e7bb6cfe3490c415ccaf37e5c4fd4a619bfb629d7ea06 SHA512 1efb645a8107f54c166588e0202b5863f176d97970bb5c4ebdaef10dabc7b5ec424b5e99f7e10111ee8f62151c85d4a6b17323c13f1aa0f330aae0cac4d339d1
+EBUILD samba-4.12.3-r1.ebuild 9436 BLAKE2B b7e75105693152f660aa7d912bb99c56dda131370acc94d003c3f7f007d6b2716f84baaed9af1efb49e8239698b2b254f99b0486efdebb34cd4ab379c82e2ea4 SHA512 ef90ee10eaa5063e51b433884da72d38bd42c3183a3081f6ca4150cfdeff8b2853b2e85d89102ccb3db0b180cd36c3b278cd94e89716208f2c461c835a03b7df
 MISC metadata.xml 1848 BLAKE2B 2ae9d28a0ea8d1b53f4999e23044713b42f0fc829dd2df20c301acefe9d2c9334c97121ed85c50a5d0734cec834652b1f8ec8d0bd5cca30afbecc4730cb4d1a8 SHA512 48ac3deb48a2188836be87c485f1ba988788814aa1b495e89d70eb17f67fa80163132ac788d3bc0d586ba1957b22e4094036186c40af0cfc48aa453490021ec5
diff --git a/net-fs/samba/samba-4.11.6-r2.ebuild b/net-fs/samba/samba-4.11.6-r2.ebuild
deleted file mode 100644
index d4dbcb43bbb1..000000000000
--- a/net-fs/samba/samba-4.11.6-r2.ebuild
+++ /dev/null
@@ -1,316 +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} )
-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.1.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 that 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.8.ebuild b/net-fs/samba/samba-4.11.8.ebuild
index 48195a8817a6..f250d29d96f1 100644
--- a/net-fs/samba/samba-4.11.8.ebuild
+++ b/net-fs/samba/samba-4.11.8.ebuild
@@ -15,7 +15,7 @@ SRC_PATH="stable"
 
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="https://www.samba.org/"
diff --git a/net-fs/samba/samba-4.11.9-r1.ebuild b/net-fs/samba/samba-4.11.9-r1.ebuild
index 9043a94e1383..e3cde0c2d9df 100644
--- a/net-fs/samba/samba-4.11.9-r1.ebuild
+++ b/net-fs/samba/samba-4.11.9-r1.ebuild
@@ -133,7 +133,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.0-pam.patch"
 	"${FILESDIR}/${PN}-4.9.2-timespec.patch"
 	"${FILESDIR}/${PN}-4.13-winexe_option.patch"
-	"${FILESDIR}/${PN}-4.13-vfs_snapper_configure_option.patch" 
+	"${FILESDIR}/${PN}-4.13-vfs_snapper_configure_option.patch"
 )
 
 #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
diff --git a/net-fs/samba/samba-4.11.9.ebuild b/net-fs/samba/samba-4.11.9.ebuild
deleted file mode 100644
index 3fe07a3d4303..000000000000
--- a/net-fs/samba/samba-4.11.9.ebuild
+++ /dev/null
@@ -1,316 +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} )
-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
-)
-
-CDEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/libtasn1[${MULTILIB_USEDEP}]
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	>=net-libs/gnutls-3.2.0[${MULTILIB_USEDEP}]
-	net-libs/libnsl:=[${MULTILIB_USEDEP}]
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-2.0.10[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.1.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/libcap
-	sys-libs/ncurses:0=
-	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
-	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-	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"
-	"${FILESDIR}/${PN}-4.13-winexe_option.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
-		--without-winexe
-		$(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 that 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.12.2.ebuild b/net-fs/samba/samba-4.12.2.ebuild
deleted file mode 100644
index 423237c1a0ef..000000000000
--- a/net-fs/samba/samba-4.12.2.ebuild
+++ /dev/null
@@ -1,314 +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} )
-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 ~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
-)
-
-CDEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/icu:=[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/libtasn1[${MULTILIB_USEDEP}]
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-perl/Parse-Yapp
-	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
-	net-libs/libnsl:=[${MULTILIB_USEDEP}]
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-2.1.2[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/libcap[${MULTILIB_USEDEP}]
-	sys-libs/liburing[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.3.1[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.3[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.10.2[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
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-	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 )
-"
-
-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"
-	"${FILESDIR}/${PN}-4.13-winexe_option.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
-		--without-winexe
-		$(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/lock/samba
-	keepdir /var/log/samba
-	keepdir /var/run/samba
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Be aware that 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.12.3-r1.ebuild b/net-fs/samba/samba-4.12.3-r1.ebuild
index 33b067a7ed60..bfe12176b97e 100644
--- a/net-fs/samba/samba-4.12.3-r1.ebuild
+++ b/net-fs/samba/samba-4.12.3-r1.ebuild
@@ -135,7 +135,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.0-pam.patch"
 	"${FILESDIR}/${PN}-4.9.2-timespec.patch"
 	"${FILESDIR}/${PN}-4.13-winexe_option.patch"
-	"${FILESDIR}/${PN}-4.13-vfs_snapper_configure_option.patch" 
+	"${FILESDIR}/${PN}-4.13-vfs_snapper_configure_option.patch"
 )
 
 #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
diff --git a/net-fs/samba/samba-4.12.3.ebuild b/net-fs/samba/samba-4.12.3.ebuild
deleted file mode 100644
index 7c7490b3b54e..000000000000
--- a/net-fs/samba/samba-4.12.3.ebuild
+++ /dev/null
@@ -1,314 +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} )
-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 ~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
-)
-
-CDEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/icu:=[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/libtasn1[${MULTILIB_USEDEP}]
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-perl/Parse-Yapp
-	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
-	net-libs/libnsl:=[${MULTILIB_USEDEP}]
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-2.1.3[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/libcap[${MULTILIB_USEDEP}]
-	sys-libs/liburing[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.3.1[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.3[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.10.2[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
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-	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 )
-"
-
-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"
-	"${FILESDIR}/${PN}-4.13-winexe_option.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
-		--without-winexe
-		$(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/lock/samba
-	keepdir /var/log/samba
-	keepdir /var/run/samba
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Be aware that 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-im/Manifest.gz b/net-im/Manifest.gz
index 9ef1588e75ef..311879a94d10 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/coturn/Manifest b/net-im/coturn/Manifest
index 475df9e70a96..b2d1440c7341 100644
--- a/net-im/coturn/Manifest
+++ b/net-im/coturn/Manifest
@@ -2,7 +2,7 @@ AUX coturn.conf 46 BLAKE2B 8ae3300f7a0a6e09fde5259b660ec69c7b15cd08d2edcd7a5f77d
 AUX coturn.service 470 BLAKE2B 21b1cc005b5b91a8cb80b05a45afc16d73ad88e5b0a851294a6fab79d01a3bebbd048dc0bdd2423b62c2b56fe16dece95613846ad45bc9d5c3642a79fa726eff SHA512 f4228af88e51a38b06b0f91e1494d4e61a9a9f18cbab9fe85c323267e28045ebaae2832bae114da6e326cf22bf8efbd2bd5677cbcdde8fe994eca60802a6dc66
 AUX logrotate.coturn 345 BLAKE2B 26edd2ad44d947bf943757fb3e3255cafea64fac5d495402bbc3a7088ed6ffd822cc8f07010669f9faf856eb8a893d9ba9ab48d4b417f8c3fd27772ffb71cae0 SHA512 ebfadc7e6435061b7120baffce76a65c224768ab85e59e3b8cd140e394fa6e4eaa258eccce76f3152fd6a1adab0c84e39feb51663c76359401e04df4d8db2c1d
 AUX turnserver.init 633 BLAKE2B 78da89afc2be30bac969bb2a393d454d32ba77e199f2ccb5e34557ce34cf3a242402210afe6e30400b4a47ef9dc7880cded44a1932f7769f21f4143261a3569e SHA512 3b86b2186499c96ec0cfd3a124ea058a622c21cc870e079414f6055f7ba85830a5b85c424c809c010144f9270fcada80ef20bcab4cbc9c7fe0949b24fef02b59
-DIST coturn-4.5.1.1.tar.gz 420069 BLAKE2B fe0e0334658d2a69132d7a83667ee52927e888f8978bd03eb099e61f17a4516d10a36d2abb1c93e2b25bc4192c342fba581b85892e99b139016e09c77a365cc2 SHA512 a5e1aecdab5a7060ffbc73cc8dd294cafa701f2e0d2a827e40901cb6001af5a2c5ecbafdf14662410713818aad0ad259133f0dc9b34730bf7911863e1e255f70
-EBUILD coturn-4.5.1.1.ebuild 1907 BLAKE2B f1923a6530515c995a973b7079153a82249c6df34f1f740d371304962f688f0e08ef760bf59b0e8950eb8d4f2ae9bcb792c6a2473613d8317480401beddc4977 SHA512 d815d05a6d3056e6e1e7f0defaee9e2460270c7694660c85b974b822393a9142e4be439e1a0b28c59bff9cf6968702a251908ef6b5b5173cb5b0c1050c37e88d
-EBUILD coturn-9999.ebuild 1907 BLAKE2B f1923a6530515c995a973b7079153a82249c6df34f1f740d371304962f688f0e08ef760bf59b0e8950eb8d4f2ae9bcb792c6a2473613d8317480401beddc4977 SHA512 d815d05a6d3056e6e1e7f0defaee9e2460270c7694660c85b974b822393a9142e4be439e1a0b28c59bff9cf6968702a251908ef6b5b5173cb5b0c1050c37e88d
+DIST coturn-4.5.1.2.tar.gz 436487 BLAKE2B c59a3ba0554111c6f70db04438e08b4d78bacc312bc5e5c2435e92f697222c8a3ab1c4f3e25de15174c3c359acda4760f855d88e37e68d333568c0882f4139a5 SHA512 6dd223fee866d97a3e55d87250fcb5d6ecc56f14b30029685406237aedd3d3cd6c09b685ef13ed2d1ebed3a4a3a80a88151c6498f312e53e3f5848d4af489478
+EBUILD coturn-4.5.1.2.ebuild 2308 BLAKE2B 608fc648807afad194dddc72901211fd4c08fbb238679db8a87e2cb9088ec50e7c5f728a4f4fb030d63b35f1f69c6ed2a388bd755738d6ac3ad2d97c0d09a5e9 SHA512 f31ff6ae202aad02e3ecd2908e34e322c4464497d595041387da1d38c0d180f6e16f808069765b4714475fb1a3a400c815cb9bc927ef023457c2abf9c75aa588
+EBUILD coturn-9999.ebuild 2308 BLAKE2B 608fc648807afad194dddc72901211fd4c08fbb238679db8a87e2cb9088ec50e7c5f728a4f4fb030d63b35f1f69c6ed2a388bd755738d6ac3ad2d97c0d09a5e9 SHA512 f31ff6ae202aad02e3ecd2908e34e322c4464497d595041387da1d38c0d180f6e16f808069765b4714475fb1a3a400c815cb9bc927ef023457c2abf9c75aa588
 MISC metadata.xml 497 BLAKE2B 522928095883e077064a9971e45e4e644461ce6d7a07720920a7bc96afc326b6ab337aa64704518a866f0df276f5bc284660e81561874631ff84c395035051dd SHA512 62689abd67427c6dd3de86c139b2cb94f7dc3ba8c8f9d3fced5b91b6de36cd30caa1a7805c0dc3aa64fa35e154e4509a607ef7eae62fe6894084383b2226b8bb
diff --git a/net-im/coturn/coturn-4.5.1.1.ebuild b/net-im/coturn/coturn-4.5.1.1.ebuild
deleted file mode 100644
index 4a1fd7499733..000000000000
--- a/net-im/coturn/coturn-4.5.1.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
-inherit eutils systemd tmpfiles
-DESCRIPTION="coturn TURN server project"
-HOMEPAGE="https://github.com/coturn/coturn"
-
-if [ ${PV} = 9999 ]; then
-	KEYWORDS=""
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-	DEPEND="dev-vcs/git"
-#	S="${WORKDIR}/${PN}-master"
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="mongodb mysql postgres redis sqlite"
-RDEPEND="acct-group/turnserver
-	 acct-user/turnserver
-	 || ( dev-libs/libevent[-ssl,libressl] dev-libs/libevent[ssl,-libressl] >dev-libs/libevent-2.1.8[ssl,libressl] )
-	 mongodb? ( dev-libs/mongo-c-driver )
-	 mysql?  ( dev-db/mysql-connector-c )
-	 postgres? ( dev-db/postgresql:* )
-	 redis? ( dev-libs/hiredis )
-	 sqlite? ( dev-db/sqlite )"
-
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	sed 's:#log-file=/var/tmp/turn.log:log-file=/var/log/turnserver.log:' \
-	    -i "${S}/examples/etc/turnserver.conf"  || die "sed for logdir failed"
-	sed 's:#simple-log:simple-log:' -i "${S}/examples/etc/turnserver.conf" \
-	    || die "sed for simple-log failed"
-	if ! use mongodb; then
-		export TURN_NO_MONGO=yes
-	fi
-	if ! use mysql; then
-		export TURN_NO_MYSQL=yes
-	fi
-	if ! use postgres; then
-		export TURN_NO_PQ=yes
-	fi
-	if ! use redis; then
-		export TURN_NO_HIREDIS=yes
-	fi
-	if ! use sqlite; then
-		export TURN_NO_SQLITE=yes
-	fi
-
-	econf $(use_with sqlite)
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}/turnserver.init" turnserver
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate.${PN}" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	dotmpfiles "${FILESDIR}/${PN}.conf"
-}
-
-pkg_postinst() {
-	tmpfiles_process "${PN}.conf"
-	elog "You need to copy /etc/turnserver.conf.default to"
-	elog "/etc/turnserver.conf and do your settings there."
-}
diff --git a/net-im/coturn/coturn-4.5.1.2.ebuild b/net-im/coturn/coturn-4.5.1.2.ebuild
new file mode 100644
index 000000000000..f3a72b581544
--- /dev/null
+++ b/net-im/coturn/coturn-4.5.1.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils systemd tmpfiles
+DESCRIPTION="coturn TURN server project"
+HOMEPAGE="https://github.com/coturn/coturn"
+
+if [ ${PV} = 9999 ]; then
+	KEYWORDS=""
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+	DEPEND="dev-vcs/git"
+#	S="${WORKDIR}/${PN}-master"
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="mongodb mysql postgres redis sqlite"
+RDEPEND="acct-group/turnserver
+	 acct-user/turnserver
+	 || ( dev-libs/libevent[-ssl,libressl] dev-libs/libevent[ssl,-libressl] >dev-libs/libevent-2.1.8[ssl,libressl] )
+	 mongodb? ( dev-libs/mongo-c-driver )
+	 mysql?  ( dev-db/mysql-connector-c )
+	 postgres? ( dev-db/postgresql:* )
+	 redis? ( dev-libs/hiredis )
+	 sqlite? ( dev-db/sqlite )"
+
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	if [ -n "${AR}" ]; then
+		sed 's:ARCHIVERCMD="ar -r":ARCHIVERCMD="${AR} -r":g' -i "${S}/configure"
+	fi
+	sed 's:MANPREFIX}/man/:MANPREFIX}/:g' -i "${S}/Makefile.in" || die "sed for mandir failed"
+	sed 's:#log-file=/var/tmp/turn.log:log-file=/var/log/turnserver.log:' \
+	    -i "${S}/examples/etc/turnserver.conf"  || die "sed for logdir failed"
+	sed 's:#simple-log:simple-log:' -i "${S}/examples/etc/turnserver.conf" \
+	    || die "sed for simple-log failed"
+	sed '/INSTALL_DIR} examples\/script/a \	\${INSTALL_DIR} examples\/ca \${DESTDIR}${EXAMPLESDIR}' \
+	    -i "${S}/Makefile.in" || die "sed for example ca failed"
+	if ! use mongodb; then
+		export TURN_NO_MONGO=yes
+	fi
+	if ! use mysql; then
+		export TURN_NO_MYSQL=yes
+	fi
+	if ! use postgres; then
+		export TURN_NO_PQ=yes
+	fi
+	if ! use redis; then
+		export TURN_NO_HIREDIS=yes
+	fi
+	if ! use sqlite; then
+		export TURN_NO_SQLITE=yes
+	fi
+	export DOCSDIR="/usr/share/doc/${PN}-${PV}"
+	econf $(use_with sqlite)
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}/turnserver.init" turnserver
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate.${PN}" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	dotmpfiles "${FILESDIR}/${PN}.conf"
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}.conf"
+	elog "You need to copy /etc/turnserver.conf.default to"
+	elog "/etc/turnserver.conf and do your settings there."
+}
diff --git a/net-im/coturn/coturn-9999.ebuild b/net-im/coturn/coturn-9999.ebuild
index 4a1fd7499733..f3a72b581544 100644
--- a/net-im/coturn/coturn-9999.ebuild
+++ b/net-im/coturn/coturn-9999.ebuild
@@ -32,10 +32,16 @@ RDEPEND="acct-group/turnserver
 DEPEND="${RDEPEND}"
 
 src_configure() {
+	if [ -n "${AR}" ]; then
+		sed 's:ARCHIVERCMD="ar -r":ARCHIVERCMD="${AR} -r":g' -i "${S}/configure"
+	fi
+	sed 's:MANPREFIX}/man/:MANPREFIX}/:g' -i "${S}/Makefile.in" || die "sed for mandir failed"
 	sed 's:#log-file=/var/tmp/turn.log:log-file=/var/log/turnserver.log:' \
 	    -i "${S}/examples/etc/turnserver.conf"  || die "sed for logdir failed"
 	sed 's:#simple-log:simple-log:' -i "${S}/examples/etc/turnserver.conf" \
 	    || die "sed for simple-log failed"
+	sed '/INSTALL_DIR} examples\/script/a \	\${INSTALL_DIR} examples\/ca \${DESTDIR}${EXAMPLESDIR}' \
+	    -i "${S}/Makefile.in" || die "sed for example ca failed"
 	if ! use mongodb; then
 		export TURN_NO_MONGO=yes
 	fi
@@ -51,7 +57,7 @@ src_configure() {
 	if ! use sqlite; then
 		export TURN_NO_SQLITE=yes
 	fi
-
+	export DOCSDIR="/usr/share/doc/${PN}-${PV}"
 	econf $(use_with sqlite)
 }
 
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 39325c8b5edc..5afbb582b8a1 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,4 +1,6 @@
 DIST gajim-1.1.3.tar.bz2 8013585 BLAKE2B 7be25380ecfe76ae5e2a7534665688dcca9ff850c12c7a450e8d1f6caab1820a1022750710df0a8a7ae259c5748f55582b272ad83fbdb0560f18e6ab8642bf78 SHA512 18062832f9b9295c7a844c347d5ece4a6db43126d5b58bbf362fdf2f8e082e2241c46dae6d1cbe66ebf2ef19f65618102c3c21fa0079a96fc21511e6e93420ac
+DIST gajim-1.2.0.tar.gz 9605006 BLAKE2B b68e801fedf89d14e8831a52f952fa3937b8f8ed0423a0289d5c665b50244db8db9d91dd24203e446d691e26843dd75dbf0de2b1b183cc0a8fb178bc7632c500 SHA512 e73802dd1172c1fa38be10e6fb5d605109dacf0491516b15111ccd05389309af217e8af68440a1333b8a636c9ff425dec6d4461296ba47f1bb6dbb3000b02fd0
 EBUILD gajim-1.1.3-r1.ebuild 2457 BLAKE2B ffdea9fa425f2ae97e718ccc58cc13c95a908b0ff8019df5fc9b82b0b4be522d872b83ada56c1070165f81e20cb0a26df5b70abf0ca54c202cb0796f6c9d5986 SHA512 025c1ff713a2e975dd4c2c334d033fac30d0e4de9d778eeff0dc071d70a871777d5798497394963e49277fc9c529fc3c15e3b14a6f946daa39650c9e88d15125
 EBUILD gajim-1.1.3-r2.ebuild 2222 BLAKE2B 62d8baa9c3fb0fbb76b665244d692d10f4be65468cd9c2e5f5ff8abd5a04b72142f4b6bb3f39498c8d7f4685d084208ca1a5a3d84977d8ce1873e0427222bade SHA512 57e2256a177a3238bd4a21634ee30b43559c9b2326905d97740b0408070a950c098fb715d8ae453860279900a5f9ad368af069b9437678d7d96b16153fc1077e
+EBUILD gajim-1.2.0.ebuild 2289 BLAKE2B 697f393348f18c9a48155a0fe42ee87bc19cf4c8277c8c0c3652765329f9f3cee8846afd6f4252d5e52db5bc21e710284bd18140bc9d3c50ecd6cd7467dc9f9f SHA512 50d2408e1af48557666e5f0389e55376c7fe9ff91aba795727f4e6934b47eee1ef37d72280fa21b36b86a0494d769dd8002d2581d99b2a252d30692724e7a00a
 MISC metadata.xml 985 BLAKE2B ef02d7f96bcdc15c013e15ee79e3bb4dc591dd9697139f7331ca0bc065d2adfb2e6c2808f8c32d16dee433a1b03d4639f371a69e1d0870d498db55443ff3f713 SHA512 de8eba51dc79776b19e4122d6da16073c577c70dbe5b05dcbf7aa32a4c0b109c5b9cf222313aada405227f27ba8014c38baa73acfb0951691fbbcad1503801f5
diff --git a/net-im/gajim/gajim-1.2.0.ebuild b/net-im/gajim/gajim-1.2.0.ebuild
new file mode 100644
index 000000000000..9dd5e08d83cc
--- /dev/null
+++ b/net-im/gajim/gajim-1.2.0.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,8} )
+PYTHON_REQ_USE="sqlite,xml"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="https://gajim.org/"
+SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+crypt geolocation jingle 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_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:3[cairo,${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+		>=dev-python/python-nbxmpp-1.0.0[${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/css-parser[${PYTHON_USEDEP}]
+		dev-python/packaging[${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
+		)
+		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}] )
+	')"
+
+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/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index b0e692ac2eab..4378e162826e 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_1.34.1_amd64.deb 99582102 BLAKE2B 338abd5c346e5abda98dcaac9f3792f64350bdac57828ff7c5ac50997cf4d81e311cf646cccfa7ccfb6ad3bbaf0b8843f3f46356ae196b10ddc8fe0a635cc0d2 SHA512 0576a1554937f4e1d32e5babb16d5f08a29593a15c3a0363d7735ab089c26dc5294a2eff672f026019e4f9d8d7551474e26a96ece96f59b978d3865dfeef1aa0
-EBUILD signal-desktop-bin-1.34.1.ebuild 2475 BLAKE2B f706e0174b1e285cefaa50b9304ec05fdabb132ccf0eb09183b8ba70b50c38cf271b322820fc2011a2094426305816ccff5e4385fdbd78760985a6fe7b1f693f SHA512 276ff0398fb65a6aea6d4230e22652c7bb38405adab308f5fc120a16531ba5764711664af1141935c115e4cd19188ffdba8582fa45fc93272a056c8fba102c13
+DIST signal-desktop_1.34.3_amd64.deb 99601582 BLAKE2B 36ff459be13182780adcad52990341bb708de84ced00bcb6fc45e0fdd7bba0fb176b3a7000fe1ef436c1a0ac0cf47a184114356a5f944513086c4d90464aea50 SHA512 9dcdbc50d4a8ed08ec1011667d50396f221cb8e8eb34cab6bc432b8a1da2b5efb42839182ef3091f2bb865d45088eb6b81ae8e9ed375822098096b095970c545
+EBUILD signal-desktop-bin-1.34.3.ebuild 2503 BLAKE2B 62eabbecb707d8c6799c301ab63e81392bb4f44a769207f9b89b38b66b2019e40f2366ecfa1cba25fd67f556675cb0ddbead6e8aecd9a2010bee1432cb269001 SHA512 236e2827b25c49f73dd348d52b131a961c05e487d906c787d988255ecfa9d97cf047fb184ae5a65561531c320923596298a45e6cb5221a725058123f93155e53
 MISC metadata.xml 366 BLAKE2B ed902f5cc030be09d1d839f3192009f6ed195718c28e3e4bca1c80f157b20ff63ec9f83a9ceb187ba1e0d203785ae60ba6777278fe833644e7cb11b3fb7bc786 SHA512 776e1f9b4fee54973687d8179b554598a9cd4d983b9515a0003f641fbe8e497b9ceef54d1fd5d09a665098b0717ccd7c9687ae96e0011619959fb5ad945c302b
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.34.1.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.34.1.ebuild
deleted file mode 100644
index b339b110aafd..000000000000
--- a/net-im/signal-desktop-bin/signal-desktop-bin-1.34.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/-bin/}"
-
-inherit eutils pax-utils unpacker xdg-utils
-
-DESCRIPTION="Allows you to send and receive messages of Signal Messenger on your computer"
-HOMEPAGE="https://signal.org/
-	https://github.com/signalapp/Signal-Desktop"
-SRC_URI="https://updates.signal.org/desktop/apt/pool/main/s/${MY_PN}/${MY_PN}_${PV}_amd64.deb"
-
-LICENSE="GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE=""
-
-BDEPEND="app-admin/chrpath"
-RDEPEND="
-	dev-libs/nss
-	media-libs/mesa[X(+)]
-	net-print/cups
-	x11-libs/gtk+:3[X]
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst"
-
-QA_PREBUILT="opt/Signal/signal-desktop
-	opt/Signal/chrome-sandbox
-	opt/Signal/crashpad_handler
-	opt/Signal/libffmpeg.so
-	opt/Signal/libGLESv2.so
-	opt/Signal/libnode.so
-	opt/Signal/libVkICD_mock_icd.so
-	opt/Signal/libvk_swiftshader.so
-	opt/Signal/swiftshader/libGLESv2.so
-	opt/Signal/resources/app.asar.unpacked/node_modules/sharp/build/Release/sharp.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/lib/*
-	opt/Signal/resources/app.asar.unpacked/node_modules/zkgroup/libzkgroup.so"
-
-RESTRICT="splitdebug"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-	sed -e 's|\("/opt/Signal/signal-desktop"\)|\1 --start-in-tray|g' \
-		-i usr/share/applications/signal-desktop.desktop || die
-	unpack usr/share/doc/signal-desktop/changelog.gz
-	# Fix Bug 706352
-	chrpath opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/lib/libjpeg.so.8.2.2 -r '$ORIGIN:/target/lib' || die
-	chrpath opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/lib/libffi.so.6.0.4 -d || die
-}
-
-src_install() {
-	insinto /
-	dodoc changelog
-	doins -r opt
-	insinto /usr/share
-	doins -r usr/share/applications
-	doins -r usr/share/icons
-	fperms +x /opt/Signal/signal-desktop /opt/Signal/chrome-sandbox
-	fperms u+s /opt/Signal/chrome-sandbox
-	pax-mark m opt/Signal/signal-desktop opt/Signal/chrome-sandbox
-
-	dosym ../../opt/Signal/${MY_PN} /usr/bin/${MY_PN}
-	dosym ../../usr/lib64/libEGL.so opt/Signal/libEGL.so
-	dosym ../../../usr/lib64/libEGL.so opt/Signal/swiftshader/libEGL.so
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-
-	optfeature "using the tray icon in Xfce desktop environments" xfce-extra/xfce4-statusnotifier-plugin
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.34.3.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.34.3.ebuild
new file mode 100644
index 000000000000..137ae5436432
--- /dev/null
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.34.3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/-bin/}"
+
+inherit eutils pax-utils unpacker xdg-utils
+
+DESCRIPTION="Allows you to send and receive messages of Signal Messenger on your computer"
+HOMEPAGE="https://signal.org/
+	https://github.com/signalapp/Signal-Desktop"
+SRC_URI="https://updates.signal.org/desktop/apt/pool/main/s/${MY_PN}/${MY_PN}_${PV}_amd64.deb"
+
+LICENSE="GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE=""
+
+BDEPEND="app-admin/chrpath"
+RDEPEND="
+	dev-libs/nss
+	media-libs/mesa[X(+)]
+	net-print/cups
+	x11-libs/gtk+:3[X]
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst"
+
+QA_PREBUILT="opt/Signal/signal-desktop
+	opt/Signal/chrome-sandbox
+	opt/Signal/crashpad_handler
+	opt/Signal/libffmpeg.so
+	opt/Signal/libGLESv2.so
+	opt/Signal/libnode.so
+	opt/Signal/libVkICD_mock_icd.so
+	opt/Signal/libvk_swiftshader.so
+	opt/Signal/swiftshader/libGLESv2.so
+	opt/Signal/resources/app.asar.unpacked/node_modules/sharp/build/Release/sharp.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/lib/*
+	opt/Signal/resources/app.asar.unpacked/node_modules/zkgroup/libzkgroup.so"
+
+RESTRICT="splitdebug"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+	sed -e 's|\("/opt/Signal/signal-desktop"\)|\1 --start-in-tray|g' \
+		-e 's| --no-sandbox||g' \
+		-i usr/share/applications/signal-desktop.desktop || die
+	unpack usr/share/doc/signal-desktop/changelog.gz
+	# Fix Bug 706352
+	chrpath opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/lib/libjpeg.so.8.2.2 -r '$ORIGIN:/target/lib' || die
+	chrpath opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/lib/libffi.so.6.0.4 -d || die
+}
+
+src_install() {
+	insinto /
+	dodoc changelog
+	doins -r opt
+	insinto /usr/share
+	doins -r usr/share/applications
+	doins -r usr/share/icons
+	fperms +x /opt/Signal/signal-desktop /opt/Signal/chrome-sandbox
+	fperms u+s /opt/Signal/chrome-sandbox
+	pax-mark m opt/Signal/signal-desktop opt/Signal/chrome-sandbox
+
+	dosym ../../opt/Signal/${MY_PN} /usr/bin/${MY_PN}
+	dosym ../../usr/lib64/libEGL.so opt/Signal/libEGL.so
+	dosym ../../../usr/lib64/libEGL.so opt/Signal/swiftshader/libEGL.so
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	optfeature "using the tray icon in Xfce desktop environments" xfce-extra/xfce4-statusnotifier-plugin
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index 169edb810065..31e2482ed7d2 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -4,5 +4,5 @@ AUX spectrum2.initd 1332 BLAKE2B ee4a9f62ccb909bb824df485dc56c59fe935e77dcfc0354
 AUX spectrum2.service 222 BLAKE2B 58227bb8d49dac2a43d41d9a1e16b9ad804fb540a1e37fc0ec58e23e7412c5a9e0a931fe41d37430be5b77d0bc33fc17870b885995185e29a7ccd2da73022dc8 SHA512 c50d83e6afadc798b90f4df5b2f473031dadb8e32dff0c1120dc2345a3fe37a86566d6d975d22d310e0dd6d2c602d674f6a17f4df2e730e71aaf484a30aa97c2
 AUX spectrum2.tmpfiles-r1 44 BLAKE2B 262e14134a78bc5955fc8ec750ceec94b6fd99fbb65365e28c6dab6f80b0941197899bec6a99d2c5ae21ecaf750013c5c909791c86a609893a4b431597323a59 SHA512 151c93d490f58309fe25bc3ee13ec9987e024c3aec4e58fe399016307f8b78aa7721f3b86bc51373aee7cebe9ab75273f0c48c7c840562ecd2e69d2ce44eba53
 DIST spectrum2-2.0.12.tar.gz 839711 BLAKE2B 22dbc201135008effbd1aac52a708f5c942bd9a3c4a359622d1eb21ce104bdd3a6be64f1cb2ad5950b51e5f1772d77fce088d4a61a56532d970901656176d3f7 SHA512 bcd2797877583e6b59e5f1da430ed049e5bcdddfa9698f6d845f020847405ff8ee01b595d47d414105153e2a00e9a8fac171f45db5d39f72ddf0f6588bc71a36
-EBUILD spectrum2-2.0.12-r2.ebuild 2742 BLAKE2B 6a75b45f4ebf98deb7f8061fe99d0c8b15f09d34c5991eaaf2119e6bfe312c702f698a15b7dcd09dbdd931c0d67ce5437f02a2000cdc8bac357fdb1da1902413 SHA512 3301190f242f2aa412a0ff1b22ff3e640e472cc701c8e541ab953d82ade39e6f571aa1dcd61cff5736666a09f956b13f0f301ed8b302ecc5d088249eb3a64efb
+EBUILD spectrum2-2.0.12-r2.ebuild 2741 BLAKE2B 9bfe9cc0834e3cdd564017462ebbeb65737c30c1d8f5df9ad35a4d943158457c5de1c4979d1f6df43742478d926166f726edba2f74035e2d9dd883d51637fcee SHA512 b66a5d6ebfc181061b780d75879f53eb944fa4e713bc5848ef8ea12230fdcc434c47ce33a5bce66d3689b6c9fdac1dd81a57d7e6036afb0f8d3ae3aa0922e8a1
 MISC metadata.xml 1140 BLAKE2B 279808a98359761ce2620d44575f320de77b5b19f795d55c9b3b16f13eec2ab5fd900c00adef81ba87aacd41d9527ca998bcd27fc6a7d3c3c61d668791f501a4 SHA512 8adf9a85df87528db06d13c830dd96bb2aa77a3d22bb5701c23db0951ac67d7b6b29c8ffa5af11a6bd15e84e7a0722ea99f18e7b6f9ca00b5b42dfc36d3a1a7d
diff --git a/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild b/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild
index e2a557eb7113..52118de297e5 100644
--- a/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild
+++ b/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 0e54d6e9bc73..50c7d5438fc4 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -3,7 +3,9 @@ AUX telegram-desktop-qt5.15.patch 975 BLAKE2B faf7fa6505d760299b05a0268481799316
 DIST tdesktop-2.1.0-full.tar.gz 26133964 BLAKE2B c5eb476ea3ed02c2618e5b770bdce365bcf0d6124f75558570189e07e9dcd9f6f3282d53fec621be736cbd1269a9dd820629d4d9a36167d8f71109bfcd5a52e2 SHA512 46f5453c64d1dbd4cf8adde73fcc48e6b6f795972ab0f6516cb55112f47d5af990a049da356bedb81e6d3f7103c14a7be45369ff9a5a1812c07a1bfcda70646d
 DIST tdesktop-2.1.11-full.tar.gz 36548657 BLAKE2B 969ee0b680cb225c86bbab25e792b9fa21182227d73f062700ac56f08de83b249cca41d661c711e1a7dbcbeeeda70ddb13535403bee6f001ea10c4864b995c67 SHA512 9f2fba2814a5ab64f946913e32fce66dbc842d9607cbaee00994689ef6a661a04c2a8de5e075fc532e7d8926b51432c06c2b1510b019d729eef40da373d91d42
 DIST tdesktop-2.1.12-full.tar.gz 36549678 BLAKE2B 0a973f8f560ccd30a35f172d4a63af9b4d16601af47f2ed71f37f6c3845e328501a79062f2917f37842248646b60ff3d88f8444d75df8bbae967969907cd3a83 SHA512 961f7e4900f782d58d5d1b1045590a7029777c3daa8d26f47a61663de9ab0c3c3cdfa7507c0710af2fb231e480ffe67de0bcbd61b72acb751ae8133b73d86cff
+DIST tdesktop-2.1.13-full.tar.gz 36549505 BLAKE2B 48514be8add4ad4491c8e81a868f140228787ee489de7cd90faf31dbee959b0fb87cf2c844bf98c5b62fd6de8e32f504a6d19b071c56e6a4c0cd489d7b283818 SHA512 f28ae7c8c9a9eb8094fc52784742b470235234a3df7487902152858bc7c297b2dcfe5c8b939cdb9653a356b3835609e7289f53cdf7d5fb3f009823d3dbeb1bd8
 EBUILD telegram-desktop-2.1.0-r1.ebuild 3715 BLAKE2B 78d184427e162ee5fa54f8f3e1fc495d279ffef5e80db51097fb8e144253e3c8abca6da1c5f31f313ccd8883421c1144defd8a4dc9792977b1cd2347eb7e059e SHA512 a22d939a8a8c939e8205a6aa3f537f627370d3f929b817e0ec77e5d95a24a12b8ca5fa6ef87a1b36782204127d13ae5cdbb46a8f26eab9b0bd13d24c77119040
 EBUILD telegram-desktop-2.1.11-r1.ebuild 3871 BLAKE2B 8fb5f786d077016fa3e487eb3e3d895b8ea9224c92a257fb2ea613c225f69e9f441160f0d329ab9fdcc9500784e6e29ad5b1298cd77a6c2c9bc19b68143425d7 SHA512 32e27091413618701d1eec5f30f4a2182be39b358f773c272aedd5ede4da9cee0d589ee9db123a502c4a4b9b954044edf1ad007fd1cb6822a5cad7ad5d94b886
 EBUILD telegram-desktop-2.1.12.ebuild 3888 BLAKE2B fd9413f9899f8dc6c3d03693a60151c5f2323102f157c65108ab2b6418d6c005c59321deeb66a1b0d4c2e644904f382014332e3e370d90e0ae65a91a1a85b4e6 SHA512 91e37a46a7ce9d85393fe5580f5df100a0508a783a750e13b839e9e497c9dadfab28715d07e02f14dbb67d193efdabe55cf7c6a7d9f41127d0689e9ab97a7e1c
+EBUILD telegram-desktop-2.1.13.ebuild 3888 BLAKE2B fd9413f9899f8dc6c3d03693a60151c5f2323102f157c65108ab2b6418d6c005c59321deeb66a1b0d4c2e644904f382014332e3e370d90e0ae65a91a1a85b4e6 SHA512 91e37a46a7ce9d85393fe5580f5df100a0508a783a750e13b839e9e497c9dadfab28715d07e02f14dbb67d193efdabe55cf7c6a7d9f41127d0689e9ab97a7e1c
 MISC metadata.xml 429 BLAKE2B fd7c38c1636548f8fbd5b20f3c64681fd2e379dd6c1b9f25f159b15d4a287fd8cefaf11aa655784176990130f39ec7fcc6eb246a89c06c48e9480a1232c195a8 SHA512 b2ef15fa658070bca96cd00cb2dfb7d43befe9f1c06c0a6f2a3d29e85e8a90e626e782235379e500332ca9ca81cccc761793140c8d34791c57b2942aa0c76a88
diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.13.ebuild b/net-im/telegram-desktop/telegram-desktop-2.1.13.ebuild
new file mode 100644
index 000000000000..339746697842
--- /dev/null
+++ b/net-im/telegram-desktop/telegram-desktop-2.1.13.ebuild
@@ -0,0 +1,145 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+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 enchant +hunspell libressl pulseaudio +spell wayland +X"
+
+RDEPEND="
+	!net-im/telegram-desktop-bin
+	app-arch/lz4:=
+	app-arch/xz-utils
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	dev-libs/xxhash
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[jpeg,png,wayland?,X(-)?]
+	dev-qt/qtimageformats:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5[png,X(-)?]
+	media-fonts/open-sans
+	media-libs/fontconfig:=
+	>=media-libs/libtgvoip-2.4.4_p20200525[alsa?,pulseaudio?]
+	media-libs/openal[alsa?,pulseaudio?]
+	media-libs/opus:=
+	media-video/ffmpeg:=[alsa?,opus,pulseaudio?]
+	sys-libs/zlib[minizip]
+	virtual/libiconv
+	x11-libs/gtk+:3
+	dbus? (
+		dev-qt/qtdbus:5
+		dev-libs/libdbusmenu-qt[qt5(+)]
+	)
+	enchant? ( app-text/enchant:= )
+	hunspell? ( >=app-text/hunspell-1.7:= )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+
+DEPEND="
+	${PYTHON_DEPS}
+	${RDEPEND}
+	dev-cpp/range-v3
+	=dev-cpp/ms-gsl-3*
+"
+
+BDEPEND="
+	>=dev-util/cmake-3.16
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="
+	|| ( alsa pulseaudio )
+	|| ( X wayland )
+	spell? (
+		^^ ( enchant hunspell )
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if has ccache ${FEATURES}; then
+		ewarn
+		ewarn "ccache does not work with ${PN} out of the box"
+		ewarn "due to usage of precompiled headers"
+		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
+		ewarn
+	fi
+}
+
+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=(
+		-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_LAUNCHER_BASENAME="${PN}"
+		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)"
+		-DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" # enables hunspell (recommended)
+		-DDESKTOP_APP_USE_ENCHANT="$(usex enchant ON OFF)" # enables enchant and disables hunspell
+	)
+
+	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
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
+		# Building with snapcraft API credentials by default
+		# Custom API credentials can be obtained here:
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
+		# After getting credentials you can export variables:
+		#  export MY_TDESKTOP_API_ID="17349""
+		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
+		# and restart the build"
+		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
+		# portage will use custom variable every build automatically
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="611335"
+			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+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-irc/Manifest.gz b/net-irc/Manifest.gz
index add7cd6ea66c..d7fb79ebf1cf 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/irccloud-desktop-bin/Manifest b/net-irc/irccloud-desktop-bin/Manifest
new file mode 100644
index 000000000000..c09bd9b831d2
--- /dev/null
+++ b/net-irc/irccloud-desktop-bin/Manifest
@@ -0,0 +1,3 @@
+DIST irccloud-desktop_0.15.0_linux_amd64.deb 56822648 BLAKE2B 9311a0b1c7aca956cbcd75be20dd11d6114c4a593d7f3fb3cbc06d9806d9fe8631d72af3e0f209a3ecb1211a8027cd9d55c0999366359fe49e219a3f6efb9429 SHA512 69d3a6edaae05a71100ca791eb0986e5b58070fd20ec23ae853e14d59f613f2f25470983de34f24222c7f67e609ae5e2a83b5dc0dbadb9c49e9165b3d5b550d1
+EBUILD irccloud-desktop-bin-0.15.0.ebuild 1193 BLAKE2B a0330168d512fcacb3e3896d9a28b6ed38399dfe4a32a3a8383c32a1579a49760324e352d4946dff21278d9a05c841b094f7fb42d3ecc98feb04cdd7be0a56ae SHA512 5e0c6bfb034b7b7ecb8494bd1f2f7ee1093f8504b70ce3339e90cb8f791abc69e85af0835b539339a74f409222687a0f1ccacf83b6db28caa5b73a1101411c2d
+MISC metadata.xml 250 BLAKE2B 3c6a58190f2680dd7f7e4afd9e6abfedc7e36181b1a8d7fa9710e08c805ef85988e4a156221c61fc71c36f8e84113537b70a8f144e0764e7704f7dd074af8172 SHA512 d2115b154bf731eac11fd7b96a95baa2467cb660371f7a3dc7a7a77cf4a6cf992b97c5353f184010eac1d37cdfffa6c5d9ec35d82e171f0fad5086767d0173a5
diff --git a/net-irc/irccloud-desktop-bin/irccloud-desktop-bin-0.15.0.ebuild b/net-irc/irccloud-desktop-bin/irccloud-desktop-bin-0.15.0.ebuild
new file mode 100644
index 000000000000..fd92a49e7005
--- /dev/null
+++ b/net-irc/irccloud-desktop-bin/irccloud-desktop-bin-0.15.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop unpacker xdg
+
+DESCRIPTION="IRCCloud Desktop Client"
+HOMEPAGE="https://github.com/irccloud/irccloud-desktop
+	https://www.irccloud.com/"
+SRC_URI="https://github.com/irccloud/irccloud-desktop/releases/download/v${PV}/irccloud-desktop_${PV}_linux_amd64.deb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror strip"
+
+DEPEND="
+	>=x11-libs/gtk+-3.0
+	x11-libs/libnotify
+	>=dev-libs/nss-3
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-misc/xdg-utils
+	net-print/cups
+	>=app-accessibility/at-spi2-core-2.0.0
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_install() {
+	sed -i 's/--no-sandbox//g' usr/share/applications/irccloud.desktop || die
+	domenu usr/share/applications/irccloud.desktop
+
+	for size in 16 32 48 64 128 256 512; do
+		doicon -s ${size} usr/share/icons/hicolor/${size}x${size}/apps/irccloud.png
+	done
+
+	gunzip usr/share/doc/irccloud-desktop/changelog.gz || die
+	dodoc usr/share/doc/irccloud-desktop/changelog
+
+	insinto /
+	doins -r opt
+	fperms +x /opt/IRCCloud/irccloud
+	dosym ../IRCCloud/irccloud /opt/bin/irccloud
+}
diff --git a/net-irc/irccloud-desktop-bin/metadata.xml b/net-irc/irccloud-desktop-bin/metadata.xml
new file mode 100644
index 000000000000..915f00227065
--- /dev/null
+++ b/net-irc/irccloud-desktop-bin/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>zx2c4@gentoo.org</email>
+		<name>Jason A. Donenfeld</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-irc/polari/Manifest b/net-irc/polari/Manifest
index 95cf0b4e6f30..c7b4c164a456 100644
--- a/net-irc/polari/Manifest
+++ b/net-irc/polari/Manifest
@@ -1,5 +1,5 @@
 DIST polari-3.30.2.tar.xz 1153792 BLAKE2B 992f39e989179617164fb9d955a5211aa466293882d773c5783792503741cf62ae7fa848697046f2888bdc04c083e0b3fef0be18055e2d2c2607cc029eb2c816 SHA512 4aae1bd70498ddbddab494c9484c039bc5fabc13860ddd6a2001858808baea004c9f463b37c9392eaac62cf951867ea6e24e77053976bd4524dd711ac52a5b4d
 DIST polari-3.34.1.tar.xz 1270300 BLAKE2B 37a7a5bd5e1850b03100d8465aeddb4f558ec94ae334a5b3f16b54b591404102bc505c3254fe353aaf8174031b8b7eb67b5f85468367eeded44400d704889d92 SHA512 99cdf95b248322e69f0fee99110598c0c1d9ceb8e7377db8eb319645090c5b56ca09e1c55e1ef2e98ae546e01b796aabe31c9362f69907d641a20cc8a588aa4d
 EBUILD polari-3.30.2.ebuild 1146 BLAKE2B e8775c613efc0361b613b35cc11b83808a518c39716c10490794081d34d22be42376c194d847cc2e639fb3c5dd7df20f8acfc8130088db7351a606f0b4f47eba SHA512 1aa4b700329cacd07cadc7bfa1bd85567dba50c43a5a4a16b97cdf816bd9ee8f34584d3bede96cc8e131d90043a71d3822f2a91bb6c4acc8bc2aa088b59467c2
-EBUILD polari-3.34.1.ebuild 1066 BLAKE2B 82d5120e3af5687f5523e1bafb788e9a78caac814b11bffd33ae482aa4a8da19570933af23da79235c6118baefa0b8a567809c0fa619e1a7747c16d8d96e8c35 SHA512 8eeb1e6e6264ea480f11889adf2b9bf5733a86a7454c0b76c3afe3559da1f7f55e9d632cdda450e4d5030955980ea90bda19e65536b3f02327a02f81120cd800
+EBUILD polari-3.34.1.ebuild 1065 BLAKE2B 5cdfe9ee5f7d6e39152fcf39d3b3a8e995a89fee7c4673bdc86e99c3c426e98387b69136e229f056d70c3f0ec549e6778a09fec7460801b696d0227f07025d69 SHA512 f4f219f142f7e68372bda3aaab531924da229d6651c460eb4e7710820aded786514af7b277d0aa98708a40d70041bbe4982fad0eaa3bdd22b58129507f1af657
 MISC metadata.xml 383 BLAKE2B fe4acd5e1d8f9336124e6a8588c3d25df25d7a60fac88b1eb637a1b169fd0805bc59030ec776257bfd664df72e6a3dfefcbde1d60bd08384281587ec062f2ad7 SHA512 98707a009259fafe782cd442524620d79465fadf8304becb5c4de4e15763245bd7c21fda7081749a7bfb551e1dd9d3168236862bb704bfb9091ca087ce348deb
diff --git a/net-irc/polari/polari-3.34.1.ebuild b/net-irc/polari/polari-3.34.1.ebuild
index 61f877b7ed7a..831b7b187876 100644
--- a/net-irc/polari/polari-3.34.1.ebuild
+++ b/net-irc/polari/polari-3.34.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Polari"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index e8ccea9126dd..101a445c46d7 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -4,6 +4,6 @@ AUX quasselcore.conf-r1 333 BLAKE2B 67586dc8a62e94131d11d81502f09387026f98b7452a
 AUX quasselcore.init-r1 492 BLAKE2B 568e41c649875fc9e334b54f341dc9f95295e37d1c350ac3356b1e92859786a242da52103acb4692bd32d647983d2b5a758b847db66041791dac5bf531cf448a SHA512 6b050c6bafa2c49ab92f8e7c77be3c6868b58040b4df8b2cc3bbc217c4bf9d69fa63a7efe9e1c9e3b055de170d79af6470fa58828c5291e0b3d6b6eb7044aff3
 AUX quasselcore.service 189 BLAKE2B a115a98b17f4e59f2bbae584ac998cb16729977b617feb7b76696fcb682c1bc2d88cc40847ed1b20dce04dd8702b86a406ce0117304501c203453d1d30667e47 SHA512 3f0e15582dca70ca11beddb50aa6c6d993d4283ff89dc83a84b1acf2c0d2edba306fdab30eb05937f363cf507e34b7f884e0852d88be68748b68ac7b4013b776
 DIST quassel-0.13.1.tar.bz2 4289663 BLAKE2B 1d5252efe3febd26e7d04f6533f551316d58b5e4a7c143cc81dd0cf6a3602e28a57de4c73c86fb668e43bf8d01049456d1f5cf37a73f683b9c8b6dd9d78ee4bd SHA512 4ed55e81b1638c8851ddae5d9c9d23a1c2cea92f307e19f426873c2600d8e183898d3ed7c290f2ea5d1b8c5e1be7f9ffcc3e8c3c0193d080fc879b10cc3a962c
-EBUILD quassel-0.13.1-r2.ebuild 4694 BLAKE2B 0aebe324b925e629cdbbacd53262ef5f6ca86f66a412adf89714cc5a37a12ddb6c097e31dd1cfdf9d201b08ffc60fa551f8a45c418b8d1f2de7493e8ddffcecd SHA512 a48ada68f4dc485e1a5efe633af45e44ed736985421bd4899245f7fd98a4fb4ae92378198050b600e3137c613dfbaa1bf8c255c1a5bd2d0c0a70d5fbe90044c5
+EBUILD quassel-0.13.1-r2.ebuild 4701 BLAKE2B 11e47ac3b8346b0fcc7521b642a1422dc3d69a162d9da95a746a9764c735fe18829e2ee481d02078c406773200f0f9b1a174f36fdd24a88e268959fd30f9acc1 SHA512 a02f17fbae75b52f2890ffaf87d282bdc43fd3d0396674db15eb902f68e4fdcf4391ca1fc743d7938f559001dce363be0dc8837357b6a84c1ce5b223ca83c928
 EBUILD quassel-9999.ebuild 4593 BLAKE2B cec8cb464d7f8f6796c136ba1cf80b28411e27e458385c847eae3258f58cafb44e9f27c8a26e0db9f04d2bf11b175e0370ea578d4bc21d9d3708565eda3acdbd SHA512 a047bffb683a604c1095306970e3f753aeea6301340b0cdbf54482823526e3b10492510ba7e6010b957a839d3d2d62c364265ae6cbb5ca89caf82d2ac9f48484
 MISC metadata.xml 1840 BLAKE2B ce192c0c4987d04d874967c26d9febfe2061391921e013ff8d16af93cad58a6d75475f32903f1ff7dc242547f11bd2ff9981c5b0fc24bc0dc3adc434d7d358f1 SHA512 9fe3bb49838a4b5c400f31934d00ddd15704f30137d35d7ea3d85d45679015e5fefa11d726f5a86dadbc2dc68c0ffd37867fb98ee69e7cd0f2d06624d52944e9
diff --git a/net-irc/quassel/quassel-0.13.1-r2.ebuild b/net-irc/quassel/quassel-0.13.1-r2.ebuild
index d418a0d39a55..57fc94c79cd1 100644
--- a/net-irc/quassel/quassel-0.13.1-r2.ebuild
+++ b/net-irc/quassel/quassel-0.13.1-r2.ebuild
@@ -8,7 +8,7 @@ inherit cmake xdg-utils pax-utils systemd
 if [[ ${PV} != *9999* ]]; then
 	MY_P=${PN}-${PV/_/-}
 	SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-linux ~sparc-solaris"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~sparc-solaris"
 	S="${WORKDIR}/${MY_P}"
 else
 	EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" )
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index fa624a3f834e..797a9e4cf64c 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -2,11 +2,7 @@ AUX unrealircd.confd-r3 1301 BLAKE2B 36246c5d0ce324907e9d077d0b1c1e186eb95705f45
 AUX unrealircd.initd-r2 1162 BLAKE2B f4b073662d6428122b91e89350bca346daa71af00708830f627c288157241b505e34662f5262cebb3aa397436b1f584d5e92a6accc8b63746f6040ea784554d5 SHA512 97219aac646ba2a2e7fab81dcb013f6e078807baddfefeea93942242a02cd7c5c8c08cbceebd649e12400b86fe44222f8f22a3fb1f8a7cf9fdd18152268e03c1
 AUX unrealircd.service 177 BLAKE2B 9a58ce4e7785a66beac53afa2ecd276dd6f8e9927de8dfc3e9eab968008ad681a8b9f353bff4951bba8023d5c04affda6b58fde5db8232d0f1f9ae3e470424f0 SHA512 99163776104f2f27a585332004221fac16a9fbf9c8930b0603b5f33aca4c5ac13bdded4d5917143796b3893a19d2f709b0c4d4d635d85bd681f643b3b59131f5
 DIST unrealircd-4.2.4.1.tar.gz 6090725 BLAKE2B 817a7c2a13a495944676d08ed90b36f6795fe43ee171efc6661980e6da9a8cc8d98c4fb0eb8221ac6af85ab1a9b5578a2e992d7b41696434430e58918bc30145 SHA512 752573c4af1f92a10739bb2b0cdaade1948207b46d28ae5177e1dfd6b0663044bc22dce5ffe8549882cd70325e3ef7e3296182fffbb84e08d59dbbdd6551a686
-DIST unrealircd-5.0.3.1.tar.gz 4902967 BLAKE2B d3c2e2399091b3aa9906583231d5ba42534234c4c40ce7412609fe8866438848bb69a4fc3cd378e0ed9ab13970ba2a7b27ba9fccdaaaea3585ec0a05aa5f89c2 SHA512 1bf3e2aab2f14d68a02ae6925d9e91135a92cf08886f703be0cd203c8b4b323bfc3930254d2bda381e60b3991f379115c954fa1fd262e28d7a27172a25bb172a
-DIST unrealircd-5.0.4.tar.gz 4907069 BLAKE2B 223c45dbd060cf13afabafd13325bb76889fa64f663fff1be753de703df50265c6a05658edfe7300e97cf1431f54992b7e37801ef4773b02add9d5edca80237c SHA512 cdd83fa55bdf1960499fff48ba656b66cf5a1c43a360658bc37add217af36933f00280f7eaddcbbd39720058a401650b944a5f0ce79ae3ca6749bd58c9cd5241
 DIST unrealircd-5.0.5.1.tar.gz 4957950 BLAKE2B 7e92f941662cec0a202589aecf372578e568559360761e17735d4637785ff737ec24c07593b666dd830b0fc1f36293a700693134c34ad32095839a73e7368677 SHA512 57272afa9b758c71522730a5a5a45819731271c02b25f6e0b9da30671d38ecfbc1adc0e91eef9dc4c1d67b2e1fa4fc9a09377152f2b0e3e97e8f7fe4f144288b
 EBUILD unrealircd-4.2.4.1.ebuild 5452 BLAKE2B 356dfc371b2c8757cd710ba93401f4a34e069b545cc77573b9942ac1672e0a4367be3fb1a47fdf9ef7cdee3a1ba40bc57d0ae0366c16262665a03cdc63fae242 SHA512 b875c731c0712ab570b1d18fe0ca30abe5ed235d24a3beafa169f98d94cc6f52130d935d21ba732bbf74b368adfd9754283e61688339b1a2599523fd3e3d3d98
-EBUILD unrealircd-5.0.3.1.ebuild 5008 BLAKE2B ada6fca3216c0cbffcab8de82791d605bed4754e6bea55b9e8d1866ec771c987a019600ad073d9178c0e87265b55d45ad8143254bf710d520805f6e7d25285c9 SHA512 21c19a57e4cbf63f046d9bbeeee00e0400a63291329bd9d7765f9d790b3d065f8bae492c5703b927e9779f0481295153875a1655613b6c1445582d7adc0f176d
-EBUILD unrealircd-5.0.4.ebuild 5090 BLAKE2B 2403730ad38e5220d43b6227385deb58546293602c727438232ee4fd1910a9863b0fd78c1adbc6f43fe9cd32a256b67c08c43d495a03dc8e9b90c4c955e97309 SHA512 4ca8d90ddc7182b54b24153de1b30ffb3cae9298cfe664b4d914471603aa62bd50d1d4c4f1dd3e4346c1f40a239317efc8209bf29435041e578ecfb6fef452f6
 EBUILD unrealircd-5.0.5.1.ebuild 5090 BLAKE2B 2403730ad38e5220d43b6227385deb58546293602c727438232ee4fd1910a9863b0fd78c1adbc6f43fe9cd32a256b67c08c43d495a03dc8e9b90c4c955e97309 SHA512 4ca8d90ddc7182b54b24153de1b30ffb3cae9298cfe664b4d914471603aa62bd50d1d4c4f1dd3e4346c1f40a239317efc8209bf29435041e578ecfb6fef452f6
 MISC metadata.xml 1048 BLAKE2B 23fc4e5fd19084a8cb4157d14318d00952b61914d1d26137ee93ee866b394ac8bc0471110903806bb94f60141ef5a12c436816ce1cac55ab2e84db30ebdb1a36 SHA512 6f87be3568418355d74b9f8839f5640fe6299e8ee2b1de2ea0f83ac1a93ec9ab150b437e327d8543a815761389773dd8e8149cba023395893c9313d8b3d46102
diff --git a/net-irc/unrealircd/unrealircd-5.0.3.1.ebuild b/net-irc/unrealircd/unrealircd-5.0.3.1.ebuild
deleted file mode 100644
index 10fd8b753269..000000000000
--- a/net-irc/unrealircd/unrealircd-5.0.3.1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# 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/unrealircd/unrealircd-5.0.4.ebuild b/net-irc/unrealircd/unrealircd-5.0.4.ebuild
deleted file mode 100644
index d2f7a8a96ec9..000000000000
--- a/net-irc/unrealircd/unrealircd-5.0.4.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# 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 systemd
-
-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
-
-	insinto $(systemd_get_systemunitdir)
-	doins "${FILESDIR}"/${PN}.service
-}
-
-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-libs/Manifest.gz b/net-libs/Manifest.gz
index bc3154bd8722..1da7afa45149 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/cppzmq/Manifest b/net-libs/cppzmq/Manifest
index f474a8ee3488..7d1ba1b4ed15 100644
--- a/net-libs/cppzmq/Manifest
+++ b/net-libs/cppzmq/Manifest
@@ -3,5 +3,5 @@ AUX cppzmq-use-system-catch2.patch 784 BLAKE2B 15ad4fe99048651d9b1f00fb43e1da428
 DIST cppzmq-0_pre150606.tar.xz 4032 BLAKE2B 80918dc148d22a4ddced41bd9dbec2a39f5d69d73724177b186fda490b899ed7dbeaa5aa67a348411b5a34948b167f8def6dfe688a9facd2d56ca6fe41df32d3 SHA512 d5ab584989f0eec7ce227de4534820f6e00582b8f45ebab5472c8244823a14a89e74005edb8ae933037a1df9684cc21641cd271a147f39577331b96474927efe
 DIST cppzmq-4.6.0.tar.gz 35078 BLAKE2B 282cc8db524eb76a35835db12ae1d5f18d7729149979afb9e7a364497b8fb1db1f65b4df5c0aa905440e260cc797d45e839fc61694560cf60c20f855e34eb2c0 SHA512 f30b37c970790de2684086638084e65310396072c1c1d00415c9a36b7ef6d79fe500ce174fddab699a602a80341e2fb7f309dec2eb96252531b5ca5cf7ac5027
 EBUILD cppzmq-0_pre150606.ebuild 664 BLAKE2B a782f9142c209224fde2b68505866e0901e7bed600cd0df3ff572aafd88b31b2aab08c9bc30ad2653d3ca1d61d56dc2b0912a85032370eadb48636b1502ce6d4 SHA512 9cc680f474dd763f3718d2d72d59f58215b8e058b7899fb3be2eb6bba79c05c5255f401407c1e97ac91a5bcb2ba7c7ee9ec5bd056a36b12993588f8f815445cc
-EBUILD cppzmq-4.6.0.ebuild 1014 BLAKE2B 4c2c241abf6087dbffd9edb7588fa20cff52f21739becb9babe6edd65e3c2f34da20dc6cd11d6c9d03dadd4df631f8cffddc151076ffe623c4e00855a40e9a33 SHA512 8da33a0453425d20f009900b310ecc4a0a64be387c7f14255fad177c2f01d328a8bac5f8dd9d3b78501bbdf88a9d6ffefc9285e23a4bb8b441993f2c0c262dab
+EBUILD cppzmq-4.6.0.ebuild 1019 BLAKE2B 1c212681016612e6f1376e7230fe76b7c4280a8b6f44ab89b9f66caeddfe045ad720c9ada41ab20314d06f6dcd123edcc0979a033a97f76bd37e4fcb06d8a860 SHA512 2f261e7c753a5b94767af3cbc411b641aede86b5b591c3a24e35c0f9fde858e49b69b941a8b913085979858c5ab901921ab97c2dd8ccf29bfc04011d8e2e9308
 MISC metadata.xml 341 BLAKE2B cebd14f5acb08924cfe8941e5ca4c5ff7894e2d52e5f8dbb9a9d648681b6dc7b68b6949e19497fdf34af84eff780e8b52e282d4b5eb48bc110e18f5538eee84c SHA512 20bc14d462ee04fe3bce142640dacf724ff8970bb23e71f97bad89a2837cd0184d77304f34faa8780436c1824d458433d4b0ad644150234d7b11be094963131b
diff --git a/net-libs/cppzmq/cppzmq-4.6.0.ebuild b/net-libs/cppzmq/cppzmq-4.6.0.ebuild
index 477975337ae1..a9d24c470685 100644
--- a/net-libs/cppzmq/cppzmq-4.6.0.ebuild
+++ b/net-libs/cppzmq/cppzmq-4.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zeromq/${PN}/archive/v${PV}.tar.gz ->  ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-linux"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/net-libs/gssdp/Manifest b/net-libs/gssdp/Manifest
index a9f3dbd339d0..6c12400095ee 100644
--- a/net-libs/gssdp/Manifest
+++ b/net-libs/gssdp/Manifest
@@ -1,5 +1,7 @@
 DIST gssdp-1.0.3.tar.xz 316740 BLAKE2B 50293e653ec5596a986770f3ea81a244b8f9772e9d0c13df0e48f00ee34445c2fc7250702d7928e7dba081715e6d4e379d7a899905c35da84915e6b4058a3307 SHA512 ef72335c3f796aff0d3dce1781d5a0b015508f614d4a73699ebce411b0593419b40c09839ffb62e50cf9d77e16ec0e31d0e23f92d35abb4d105dea47c00a0506
 DIST gssdp-1.2.2.tar.xz 61444 BLAKE2B 917936ba61ef6074939a11792ddb4f3baf0bd88475df7e49fd6e598dc2530610f04661a4b5efcb2a024e0d37011bfab32bcffd644d2a3be2eb1325c9020b73bf SHA512 3d962ac5a633492979d49c722bbbbeec88385fdbd063d3b68f6b82edbc62c9e78c556d48a904460dd04328bf7a79668dcf3ee33bf61a271ac926e01e2e645f68
+DIST gssdp-1.2.3.tar.xz 62032 BLAKE2B 761a9e0df8289a595d882497bdda6d180f19328d0e97076446286e34e7735d1b1d07fc0299618955f7d92732d11d533a59cf4012f5167c4610c9856583f06770 SHA512 abce2473995a996b0adc74ced77cb2158cc997ed70edb0c25fbddd85fe9e6afc6bf7f996bbba7a6ed5268dfbe9207ae12f2e6989efe2e8e10cc25293df347e82
 EBUILD gssdp-1.0.3.ebuild 1390 BLAKE2B e976444c3ac2fa6dcc4f680abb1715ed4c4c8198f1ff5dd77914380d5cf7fe8a5f592c6cb3eb6d98a6a59d16148dc722dc72905d486aa344bc15d72d1525fd5d SHA512 26a7e121088e3b4293c798b07a83010095eb7b9a7e7e3ccbec774139d3cfa0b93a51dfaf1d5012b79cfd1c254d9659965fa27e3a9893f802bb75019072120311
 EBUILD gssdp-1.2.2.ebuild 1450 BLAKE2B 36af250637e0c8b2c3e13c642a4c6d053c7a1a3df86e3b71829557d1d9f5cb44b0375d038f9fc45effd164793091105f8f29e207fcd37dbe4fe612dfc6fa7d92 SHA512 1a5d04d7d613103cde06b1409607613b35a32f091a23c6b30dd390064c46619ce55b835aadc665a82cd85f830dc084f7250b8c9989a95484a24ecbebd5fa4e13
+EBUILD gssdp-1.2.3.ebuild 1450 BLAKE2B 36af250637e0c8b2c3e13c642a4c6d053c7a1a3df86e3b71829557d1d9f5cb44b0375d038f9fc45effd164793091105f8f29e207fcd37dbe4fe612dfc6fa7d92 SHA512 1a5d04d7d613103cde06b1409607613b35a32f091a23c6b30dd390064c46619ce55b835aadc665a82cd85f830dc084f7250b8c9989a95484a24ecbebd5fa4e13
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gssdp/gssdp-1.2.3.ebuild b/net-libs/gssdp/gssdp-1.2.3.ebuild
new file mode 100644
index 000000000000..4590776d84b4
--- /dev/null
+++ b/net-libs/gssdp/gssdp-1.2.3.ebuild
@@ -0,0 +1,61 @@
+# 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 meson multilib-minimal vala xdg
+
+DESCRIPTION="GObject-based API for handling resource discovery and announcement over SSDP"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
+
+LICENSE="LGPL-2+"
+SLOT="0/1.2-0" # <API version>-<soname>
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
+IUSE="gtk-doc +introspection gtk vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.54:2[${MULTILIB_USEDEP}]
+	>=net-libs/libsoup-2.26.1:2.4[${MULTILIB_USEDEP},introspection?]
+	gtk? ( >=x11-libs/gtk+-3.12:3 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? ( >=dev-util/gtk-doc-1.14
+		app-text/docbook-xml-dtd:4.1.2 )
+	virtual/pkgconfig
+	vala? (
+		$(vala_depend)
+		net-libs/libsoup:2.4[vala]
+	)
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
+		-Dsniffer=$(multilib_native_usex gtk true false)
+		-Dintrospection=$(multilib_native_usex introspection true false)
+		-Dvapi=$(multilib_native_usex vala true false)
+		-Dexamples=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/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index 9e82a3ee66ff..fd67d2722b15 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -3,5 +3,5 @@ DIST gtk-vnc-0.9.0.tar.xz 444736 BLAKE2B cf1afc0e856659012738060a584c72d7ad1b704
 DIST gtk-vnc-1.0.0-patchset.tar.xz 9636 BLAKE2B 4f25fdf279e5a1718ea8dc42bdb59722630b363e4e289704b946ae788d593b5d95c56d0eb5315e30ff00c2eb4d3a9e5df366f74808f94e926a47c2f817b0f1ee SHA512 998771ceb28516f52bb083d872a1ad8aa22a7208c8a0ca94270f63d91cc7f7a0f99c4bb93f7a545d9a6c796fa063dd27b36a1cb9a3d7c9349a9d8372754ea929
 DIST gtk-vnc-1.0.0.tar.xz 215904 BLAKE2B 05ef0389c3ac307859228506adf55a5ed0f5d577078b82686ad97c9df180fc5c23d8dd030930c61f87b1bbd3cb6cee74c4485af4816b7b29fd53016c2d9b1d07 SHA512 63a40b9b284c4e46a92d5375ab3660b324ff27bfc572559d3b34d29fe4f7d24e976396b6688b8f3e3109d49dc5527075d128c43bb997507e68ddc0880b0ad148
 EBUILD gtk-vnc-0.9.0.ebuild 1695 BLAKE2B 88844526c4ff9ef740f82e349bd72e24fc3dcaca517b354d8764c282edeeb28683717d3f201f0da4c2b2232739ba0126114faa23cec74b3cb27ad5f1e2a7e779 SHA512 6f288b5d4b2e1149f15ed59657752ac2475b6c39be57a687d9ea17bb5fd6e0bc4dd9a98f7c099163f386705c2ef82a3bdd1f4a5b15b9a001e70a084328231376
-EBUILD gtk-vnc-1.0.0.ebuild 1854 BLAKE2B 8d6ff327a0058dbee31ae28fe75dc735ba5929344380f1b5d329811a3416e2f230bc4bb42b30e1e1d94397585e07b4e3cb02a403f29d352fe045949155081b23 SHA512 3c6f53b1e5b85f78a40cc740f127d317bcc417adf9972015ab86cf15ef4a4bd3d45ab5e7771bc1997ff35625b1a9abd8c4c15d127d1cc08c525ee6845cce15e7
+EBUILD gtk-vnc-1.0.0.ebuild 1853 BLAKE2B d7649d78f4cbf59a83a4fbb34ea1661642b70c693967bcadf1f5609168fe2d40b906c5624a73f6cb6d1507ec21104d53a04d096a06f7665409b7b5c4320cbf21 SHA512 a1abe0505848b11ce60c44309480b569f8c3c36ac6fd7bcf03bf002eaa302f1e735e0ddcdeb3b2ead72a5fc184926b7494dacedd3de50c2873ee090c61d811d9
 MISC metadata.xml 397 BLAKE2B 0e99084e903bd50b1228c59e87a97bbec3d6c2543328b9ac42587969cc402e93537c360ca8e1df2e5a9bb1129473e8d6c698b373b3e65ee7b322bb87f01baf71 SHA512 eeedc7da2c6292330fa47841afdbf4038d1c3bec1b2803bd462ea4b13c6cd88448274a0814675d3d85ef89f2fd1aa9c45344412a9742e26214dfdf9d51a63d06
diff --git a/net-libs/gtk-vnc/gtk-vnc-1.0.0.ebuild b/net-libs/gtk-vnc/gtk-vnc-1.0.0.ebuild
index ffd65be1853c..33084e2eef4a 100644
--- a/net-libs/gtk-vnc/gtk-vnc-1.0.0.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-1.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 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"
 IUSE="+introspection pulseaudio sasl +vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index 14a35afe3264..41a0f5131fea 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1,6 +1,8 @@
 AUX 1.2.2-build-manpage.patch 1447 BLAKE2B b876a44ac3930f087e3c00530d0b5cba2d2836b9b968c4cc34500e6a11a5b04b432c5e8dac1addff6cea85feeab5bf3fe2027b3d87fe2e861a4b9aec2e3e349b SHA512 e232ee5bdb2ae1fcd9b44c63942d1bef9d610e90135ec4fa3224716ca632d513f099638eea58fa67f39d7d80a507db1f7788af5712749417d2c576c8868521ab
 DIST gupnp-1.0.4.tar.xz 427616 BLAKE2B ab5d34e701e253dc48ebafabc908f9aacd7a325805c61b11b5668cfa105d56a37f0d93593eeedd0e63630b986f2a2c18d4d9cdd82b653c9cc7a5d57262a819ef SHA512 54a133ce043e9b3d5ea23041c04fbbf5483aea98a72421cdb59bada0ab2e3ab3fc85452c4c743b794eeb7c929f5ef38bf0e6ba7f9539d86182a77612c898205a
 DIST gupnp-1.2.2.tar.xz 136556 BLAKE2B f38018c76972f1b60b8274353a60d4bb1e4687ead6fd3fb084e050c070e5da4cbb7118807f65d47787c50af3174e7c2b87ff0b920cdcf13e7c5be17f8b156588 SHA512 08a715b06f30b9d9d11b914136f89b0c53d6b07b09dddf622619073fc6f144fc8d711eec28ede80fd14fc71a6addfe88de15740d0748302522ce71555fd18d2a
+DIST gupnp-1.2.3.tar.xz 138428 BLAKE2B 23f7f677ee9d58c43ba69d6e707e26b17efa5b510f4b14b41006b332f196037fcb103b64e6b1f91260383232ad6d19872b1e8d856878b103c5c2612d3bafae63 SHA512 85caa68a4c6f4b1ccf21d910048a59b6db2b21e8bd728404b28eb0f00b588a1ab55f3ff3227e76199a20554b0708128680379e7ffa5fe162cccb4a1e3e322101
 EBUILD gupnp-1.0.4.ebuild 1936 BLAKE2B 0bd2a5783fe11eb5948b39ab91eae9b8055227add4186eb39f2c25291bb8979d807765d521e617d2cf1eed5621dea26eecd79f8b262b482efba6bd30eea0ee84 SHA512 4d5ca071142bcac84c1c907894d4f8b5c67d7a77c1ad58801ecbac4a4104711eda25cdc19394d51c10ace1d75bc18b3a2f68b35dd96b5c3452217a7d5b85338b
 EBUILD gupnp-1.2.2.ebuild 2382 BLAKE2B e0c3a459602fd8eda64aba8116369a3abb9db1f13c5b367ed4ecd2464f6cd3416a6c54696de17fc6c942c988704aca199c80087def6a5753b2e79f32445d87a4 SHA512 d33f989487371960f7e419d3f8bdd3b14687286aae6741238ae93dbacd14cef28e993c237a380ce7f39ed8d2c013a70f230b7a22c4e40fbc7d58eac78bb9112b
+EBUILD gupnp-1.2.3.ebuild 2272 BLAKE2B 51cdfcd0af4bcc7881d4b3485dbe6abcef5f824991f808722f69561a13d1e788193275536be99ca38a1a8e40a687ea3f772f3fdf43105c4f03881818e594a15d SHA512 3b6e400499d2ef3f026210d2d83a853a1b070237d86abece3d91af5c751913e8a06d4d97d0dcd1f84a455b51161d09b7adc3d5eb92ec2a0a706033124d31f705
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp/gupnp-1.2.3.ebuild b/net-libs/gupnp/gupnp-1.2.3.ebuild
new file mode 100644
index 000000000000..f95420747be0
--- /dev/null
+++ b/net-libs/gupnp/gupnp-1.2.3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="xml"
+
+inherit gnome.org meson multilib-minimal python-single-r1 vala xdg
+
+DESCRIPTION="An object-oriented framework for creating UPnP devs and control points"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
+
+LICENSE="LGPL-2+ GPL-2+" # gupnp-binding-tool is GPL-2+
+SLOT="0/1.2-0" # <API version>-<soname>
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
+
+IUSE="connman gtk-doc +introspection kernel_linux networkmanager vala"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( connman networkmanager )
+"
+
+# prefix: uuid dependency can be adapted to non-linux platforms
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.58:2[${MULTILIB_USEDEP}]
+	>=net-libs/gssdp-1.2.3:0=[introspection?,${MULTILIB_USEDEP}]
+	>=net-libs/libsoup-2.48.0:2.4[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
+	>=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.14
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.2 )
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	virtual/pkgconfig
+	!connman? ( !networkmanager? ( kernel_linux? ( sys-kernel/linux-headers ) ) )
+	vala? ( $(vala_depend)
+		>=net-libs/gssdp-1.2.3:0[vala]
+		net-libs/libsoup:2.4[vala]
+	)
+"
+
+src_prepare() {
+	use introspection && vala_src_prepare
+	xdg_src_prepare
+}
+
+multilib_src_configure() {
+	local backend=system
+	use kernel_linux && backend=linux
+	use connman && backend=connman
+	use networkmanager && backend=network-manager
+
+	local emesonargs=(
+		-Dcontext_manager=${backend}
+		-Dintrospection=$(multilib_native_usex introspection true false)
+		-Dvapi=$(multilib_native_usex vala true false)
+		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
+		-Dexamples=false
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	python_fix_shebang "${ED}"/usr/bin/gupnp-binding-tool-1.2
+}
diff --git a/net-libs/libhubbub/Manifest b/net-libs/libhubbub/Manifest
index cff556a86fef..4b222bb56fd2 100644
--- a/net-libs/libhubbub/Manifest
+++ b/net-libs/libhubbub/Manifest
@@ -1,5 +1,5 @@
 AUX libhubbub-0.3.6-json-c.patch 860 BLAKE2B a70a81eb2e8a1c3c61f8990e80c000d7047dada87e6721e50309c0d81ee411dadd3840bce2c72dc019aa1c7804801eafa387aead11b820b203de901f1dd4253e SHA512 ecd28b596cbdd01029b299d0f378e85f854205abd7bfb592061576dde35195dcc84b37f7aafe5127f76fb22b633f9f4ba13ef7158c58a021067cb7502effbc14
 DIST libhubbub-0.3.6-src.tar.gz 784692 BLAKE2B a24b2c7b33849d6f4b25867f8b801d157f19257a055dd9a5a6c49de6c2fbd3f234f648d542b7938fab249e14bb6839997530c47b931379a94ab85ccd750b71e0 SHA512 6ccf9d9bbe8fc8de21570994c4a2f6f6c6943d2b00b8939d0ec9ec72cb3d653c40b58f509a1a81a5500fc8d3b4c49595aec509129bc993208b51b29486d0c14f
-EBUILD libhubbub-0.3.6-r1.ebuild 1261 BLAKE2B d87a370618d95268d7b3dc9b5c02dddfb580ee8b5ac3aa925bef47dcaeb3117778e8be6a322a349ed35206102c5c4a9c91b0f0f406583eb84f60f04912ce3b4e SHA512 ef93f90d5f1fb78bee0b891fc9e9516f8313ee669205b75aa92d9c2aef23641f764c608826fdb393869bc1a964d06609b0f902448affe826637f5b71ae1d418e
+EBUILD libhubbub-0.3.6-r1.ebuild 1287 BLAKE2B 04b4f3130806bd1f5fd2ff05712a48d682a6ece6df1e2550532dd0a3d09c5013bc68092fc18f99cf4c6fd91612b74049fd034067addf26e4026d80599aafc092 SHA512 b818bd53d6b7e64e3998153d6e4b710a5db8461351a20d85766236d0a2cf4145da45261fc78f1a9a3b200e09733068acb2a4c2cd4b56e90d6c9d974ae6c8ccd5
 EBUILD libhubbub-0.3.6.ebuild 1184 BLAKE2B 46be9c562a28e3ee7f93a54b108a745fdfe8ebdee68c1927a810a0016b8f68c2acae92b27953abee7251cc274c3d8513139e2faabb475b983d8d49f805963505 SHA512 bd94104437b4b4799115d15e2b36c3684c235773bc3bbd2b8b4fed74fc9ef987e0510a51e860ebbe99c292c2c54ceb2f7476e2ae4681299a7954540166f6288e
 MISC metadata.xml 357 BLAKE2B 34eb2ba7fee2d2df8540a6fb2b5407ec249e1a983e348951dc002373288643cc06b7ceb4cd84de8ae770b9e0ced10892fc08fb6d415d803365f60bfcf6948b0b SHA512 40cc14c2f673767be159cadd8da258d273d99e38d96ccd2c2139f8fa424b30c8878ad6aa7d061c76e52cdd77ea42e58c9018e27849887882e9bcb7cd70827e64
diff --git a/net-libs/libhubbub/libhubbub-0.3.6-r1.ebuild b/net-libs/libhubbub/libhubbub-0.3.6-r1.ebuild
index 758a9a08d909..e0afef19c3f2 100644
--- a/net-libs/libhubbub/libhubbub-0.3.6-r1.ebuild
+++ b/net-libs/libhubbub/libhubbub-0.3.6-r1.ebuild
@@ -17,6 +17,7 @@ IUSE="doc test"
 BDEPEND="
 	dev-util/netsurf-buildsystem
 	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
 	test? ( dev-lang/perl )
 "
 RDEPEND="dev-libs/libparserutils:="
diff --git a/net-libs/libnma/Manifest b/net-libs/libnma/Manifest
index 138df71c15cc..1faafd52e029 100644
--- a/net-libs/libnma/Manifest
+++ b/net-libs/libnma/Manifest
@@ -1,5 +1,7 @@
 AUX 1.8.28-nma-ws-leak-fix.patch 2559 BLAKE2B a399b22f1f9c2a4d0acca2fac72f17211ec360204e8029ae980a46f67aff1b39dc20e6d4dbe88c55885d85f19b270b1c77e3bccde52884831383f168df5c2671 SHA512 35a8c8b4cb85dd0c0e7af1b9c424f9b69908b71c30605274dc8c383f72fbd3793780209ddbb1e82422aef3a8a297fecada0233a31f285090c5c037ff4f454228
 DIST libnma-1.8.28.tar.xz 1366584 BLAKE2B 598c2d310844930a5ed8b8d4b8bc0ae91193a8e62bccdb60050cc980cd37d198adf728b98694d9f1cf9f523998b865d9682fd271c88e434ead777ed5b69866b4 SHA512 d3996da3433493149edf0743b7f2280a83db2efc2228f04eddb773bbcb08ea2efcb640f781cb1d0a5cbabd8b25b1c612387682ff5239151d8ce249568e877f5b
+DIST libnma-1.8.30.tar.xz 1386248 BLAKE2B 7021e85595819b0cbd44b8c62087f49a5ecccc4bb230820d9a0159bf33b904df4f5c8021a79822c37d0933bdcde790a44f6d960b7f5f504e7506849aed35d54c SHA512 4d8f93d035fca4252e5c5dafc756ee6bc8f1d302aaeca77c5c0acb5d7f6cd4214224fb48e2706e69084c5a714aafa7837769be17d0642cc29eded9eb175a1107
 EBUILD libnma-1.8.24.ebuild 585 BLAKE2B 14955a958ecb2ef65e729f46dc4cabbedf020ca1ede426efd0291101fed11d8dc5ef70051143c4ea5f638cc1a08aeca5426f09595fcdc67d8127228c98af247e SHA512 e67925f59d07a5cba47cb44ec50721e8c365b5ec9d73882b31c2ddfa82ee5daee1241e152a7f2fe7a7f4035a8aa9ea563594d8722ed3e0bc340c9c8fe8e15c95
 EBUILD libnma-1.8.28.ebuild 1689 BLAKE2B 6da4564ecf1a70c90ffd4b9f46b67a062eefc031961ff05b702465065f6637da500ac4dc6bd41590d975c953ccac5fb2650068fc53d9334d43248ab37ad2e727 SHA512 194b9f092912f8a5df01b0f64962f87ca9b613984fe2b8ff8abde42e525dadd2c35411ee0311cccdb40d84486e5f1b2e2170d79dbd1a12c0b952dc8b9d83f4de
+EBUILD libnma-1.8.30.ebuild 1633 BLAKE2B 1ecc8236daeb550e3c445b1118fb6608b4eff69ced19d0c12579173f115e04e5672ce1a63cc2e81498087d01d6cf17f624f7b7b49f6433cc10e30c7b3462218f SHA512 23297c553458cc8fde7aca34ee355ae1f4edb5c5f1b65ec0dcc2d3c573dd76c214e9bd831cec7cf20ad532b7689ee493a538e185b25f5ebee26f80e80e38b969
 MISC metadata.xml 372 BLAKE2B e55e51eff966d0806e416c520f700ab28219271b0b92cbab359e9b894813e0cf48b978279a4c3d0b460fe5477e12bd016cf2d401b22134c609432284d1e01ff3 SHA512 b644f5bbd965ea13b9097aec503e0d9448bd013feb1abc24cc2bf9b2b4612a984a4ec6b36b67bf0c8b920c82c812e79afcc9dceccde4b37652a61e71c6cdf16e
diff --git a/net-libs/libnma/libnma-1.8.30.ebuild b/net-libs/libnma/libnma-1.8.30.ebuild
new file mode 100644
index 000000000000..dac7e9407e80
--- /dev/null
+++ b/net-libs/libnma/libnma-1.8.30.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson xdg vala
+
+DESCRIPTION="NetworkManager GUI library"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+# pkcs11 default enabled as it's a small dep often already present by libnma users, and it was default enabled as IUSE=+gcr in nm-applet before
+IUSE="gtk-doc +introspection +pkcs11 vala"
+REQUIRED_USE="vala? ( introspection )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+	app-text/iso-codes
+	net-misc/mobile-broadband-provider-info
+	>=dev-libs/glib-2.38:2
+	>=x11-libs/gtk+-3.10:3[introspection?]
+	>=net-misc/networkmanager-1.7[introspection?]
+	pkcs11? ( >=app-crypt/gcr-3.14:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+"
+RDEPEND="${DEPEND}
+	!<gnome-extra/nm-applet-1.16.0" # gschema moved to here before nm-applet-1.16.0
+BDEPEND="
+	dev-libs/libxml2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	vala? ( $(vala_depend)
+		net-misc/networkmanager[vala]
+	)
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dlibnma_gtk4=false
+		$(meson_use pkcs11 gcr)
+		-Dmore_asserts=0
+		-Diso_codes=true
+		-Dmobile_broadband_provider_info=true
+		-Dld_gc=false
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index ce37551ccb7b..e66460aa7358 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 1867 BLAKE2B 32e905fdcb957e8c7687bfb90e3434b02dd65aae3f43d4995ec9b6950cdbc1b60e741ed383423701e6d7081500f2d39f2f170d8a05a3925da9c15e38dceb007f SHA512 27f5ce94122fff4e77b2a5bd74e24952e855e84cdb3e36b3dce1e3585813821ec9cce21d53c28983d5e2765ef118fddbaee2aa57250f6b40b4f792a696627f4d
-EBUILD libpcap-1.9.1-r3.ebuild 1892 BLAKE2B 004dd5e00ef7d759aeacc8206afdfa6737e467807a254654ba893a0a50eaf51a4ed752de797533ad921bffe102587b5e6cfb664a4eebea5bacae89cfcf75b205 SHA512 9503cc9cd34519965ebb3a70a3917bf207edb1ffd85c9e0edb7b2fabd99b902894e7afcfcb73752f75cd78800435b6be3a7e9eaff262c645526f8b1ddfdb756d
+EBUILD libpcap-1.9.1-r3.ebuild 1897 BLAKE2B 24d4703df09d11f9458848a734558012d01d954cf4b0f403c08117a7ec96fc5598ff96d3accf1a19f61409ed582b9bcff6b1aa863ba966077d81f8aecb1ae67a SHA512 10a0cf19c9f76e5a421d7360e93e1efe6972a0bf1006b47b3d4ff26bbff92b0be1868eaa62bc8542318c354187c663fa82b05d81c8158c9f87729afed55aa156
 EBUILD libpcap-1.9.1.ebuild 1740 BLAKE2B fe8f2ffdb8548719fa379514c6deb9753c7f9d49b26fbdd2f54ec3f922c7b2ae166449883bd85695dd1b397bacdf108b3996e20d4c62a3bf336dcbd1c09c6cf0 SHA512 12b202747893fdf2170caf1ef1355046dd388162bec8790fa638e6ecc7f6819bb19b1d41b5246899cb28214ee8cfa50e799d0d51457a857e32f1daaef5022d91
 EBUILD libpcap-9999.ebuild 1669 BLAKE2B 20026176a3a00d3a6aeeff34b8e42d9d3ff2c5309fbec222bafd73d9b8191eef1164a482f1a439c78c3edb255fbc6446ccc41933ea6d905d6c3a36c63d7a131b SHA512 1d26c8816891fbd0031e45a56cb648a6dbd7d675adfebb3225dbe2be58431128d3b72faba7d6883689dfc255aab9ec536ca797642767614350742482c51ecedd
 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 eb184a07121e..7412b63170a1 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="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~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/libvncserver/Manifest b/net-libs/libvncserver/Manifest
index b095fb204c54..ee19c715fc6f 100644
--- a/net-libs/libvncserver/Manifest
+++ b/net-libs/libvncserver/Manifest
@@ -7,8 +7,10 @@ AUX libvncserver-0.9.12-fix-tight-raw-decoding.patch 1486 BLAKE2B 6baf50393a728e
 AUX libvncserver-0.9.12-libgcrypt.patch 1526 BLAKE2B 83e042ff875844cced2cb1416477c9fa255f84e6cc40b9d1d5e7dfa3e2467effb3481155b5eeeb29835cf29c0a6aa0ed381862fc184e4070b149b3a1bfc84c9e SHA512 2b2aba010104b2206eab7bec1bc6a258edb28d43da2a376d03e063d9d5e7236d690388da8ccd501b22d3181b966d2b6ee1e6752153c1ff78ab498a59355fb385
 AUX libvncserver-0.9.12-pkgconfig-libdir.patch 1241 BLAKE2B 7ac16afc86204a320253c4b0b819e4c66c44c6112ac5a9bfbae13bd567391f137d1c4f786f43e5023663fcccb7d45aed628459301dd0859361a7b01f41a98d29 SHA512 37d15eb01f6c89d012c47fff885c2405ead2b7e18798b3fa68fb72bffff9caf084652e1d29fbb11263800c69e875d9442fdef660ea69b146361690820035f056
 AUX libvncserver-0.9.12-sparc-unaligned.patch 1463 BLAKE2B 66ab54a68026de0c9ce5eb04333b24ae104bc24b2fcacf5c1aad2a7d019f94feef46b4588166d8063bd3e5c616b40092309306600328eb8e7597efba5e35952e SHA512 c2d26ca2a570de3fdbabef723cfe3cb6208aabe9d7222feb6f0128fba55370e0dff0b520ac84abdc6d1dc6c0762092d36dea21eccff68432cb1c6e5b1e3b79df
+AUX libvncserver-0.9.13-test-fix-includetest.patch 1626 BLAKE2B 1a2bab37cc2716a0c3912a2d1b76329c81bc8c3c6b9a881a0813ab035e05a06683a908cb0ca55af94d8682ef6e0153c25d93dd09381ef1079c93808a0f7d529c SHA512 7cb35e32245152e0fdc10fd6ca80221bfe1d5a75ed9407e9d69a3082bba24cbf8868db5dc36390943e09f0beeb3a366f994ecde62c6f9d7e7688ba749249bf3d
+AUX libvncserver-0.9.13-test-fix-tjunittest.patch 989 BLAKE2B 2ebe6a5bf1f04bdb188ed9a3ca965a697e995268f2e65fb7de37da663cef91672111ba0eaa1d25c4309e3f600240042e773d342996168b8b9f2dac808004b140 SHA512 6ccee0741778ae7d504acf250bffdc2231556dbc1357fd08bf54fd769e73159c3c27714c512775266f0e1cdd145a61e029645a6676b198dbc8aa6bf7ad0ca04d
 DIST LibVNCServer-0.9.12.tar.gz 2237447 BLAKE2B 583500c0bcfb6e9e3a02a33fb2701113b164851f0906fcc4845de7c7d82d4f7f65f5edd6c9a672348ee1deeefc65c1b0a257da024254598ba86d121d424f027e SHA512 60ff1cc93a937d6f8f97449bc58b763095846207112f7b1b3c43eb2d74448b595d6da949903a764bd484ee54e38ff6277e882adbe965dd6d26ba15ef6ff6fcb8
 DIST LibVNCServer-0.9.13.tar.gz 567491 BLAKE2B 138c7ca63f8cd30a21dc1b58aafa744e12a1a9eca503ffec18a63d18791d7a5df4eef176d7e4e797a2aadda1dd04d1b051abfd76bf5c6806d558c09ffee78cce SHA512 18b0a1698d32bbdbfe6f65f76130b2a95860e3cc76e8adb904269663698c7c0ae982f451fda1f25e5461f096045d40a89d9014258f439366d5b4feaa4999d643
 EBUILD libvncserver-0.9.12-r5.ebuild 2343 BLAKE2B 9c344e34f6774f49fd93013c88dc2b64c6d0c62beebc7e31c9ebae1a587b9da3dfe29a3cd6b05b671fcb33f9f0925e65b73b82dab7e34eb866c5a2dd9795d610 SHA512 419c2a377644d3997c315a6e4e3e68f7ec52773eea06be9b8f7b8fc2b91cc6129f263b7b151f91b76892eced64af26997ad84c73ef8f59871217814418202406
-EBUILD libvncserver-0.9.13.ebuild 2044 BLAKE2B 97b48ab16cdbe30eaa9b55ae75ecb0ccca7af5ab2a098b21cd8990d823e14b0cd7be384604fd08d5563a2ae61c0e398eb127e445fbf02c92f732f3b2e3ad2951 SHA512 7d26b8df9881233a7bafba8eab51c1309770e935efad8280771c3e62de6c3ed0acce0649aab61e0e758c4f9617a668abcda7908d0ef3017632aa576e1a591ac0
+EBUILD libvncserver-0.9.13.ebuild 2142 BLAKE2B f07c954ca65b929c33136c95e40bd5f5a545e7611c700c227317996088a023ef54d8a26a204cf2edc01a1cbf2b705c5ac8b1aedf24ce94d9d498e8795c1318db SHA512 0a63092ec09675eb0893e9f1e4d39a6a252913d0781b42cacff4fc302c86b08b916c87794e128aeb22481a3f207684d5cd3b6c148df40a39fd3c52fa3993c98c
 MISC metadata.xml 1047 BLAKE2B 28c16623c5e871d4099bc17de390cfce4b791c88884e0acdb22d31e6b05e164427d133dd22159778a50117cb41cf0008916c8dd899afa1aef03656b8adaf809e SHA512 3284ae298ac2262fd92d24aee84bee384d149ee7b6929738c0c5fab5ff41f9a1d72605bc26178339c2aec3b91b2aada2654f2daa5d495a158ea2d495d21d4927
diff --git a/net-libs/libvncserver/files/libvncserver-0.9.13-test-fix-includetest.patch b/net-libs/libvncserver/files/libvncserver-0.9.13-test-fix-includetest.patch
new file mode 100644
index 000000000000..767708288830
--- /dev/null
+++ b/net-libs/libvncserver/files/libvncserver-0.9.13-test-fix-includetest.patch
@@ -0,0 +1,54 @@
+From 39cff3dd6b5d9ebcf86f01e2c7e0bef62abd9d6f Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Thu, 25 Jun 2020 11:35:04 +0300
+Subject: [PATCH 1/2] test: fix includetest to use CMAKE_MAKE_PROGRAM (#431)
+
+includetest currently fais if, for example, ninja is used as a CMake
+generator. Fix it by using CMAKE_MAKE_PROGRAM in the test.
+---
+ CMakeLists.txt      | 2 +-
+ test/includetest.sh | 7 ++++---
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0b6228a2..290deb38 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -680,7 +680,7 @@ endif(LIBVNCSERVER_WITH_WEBSOCKETS)
+ 
+ add_test(NAME cargs COMMAND test_cargstest)
+ if(UNIX)
+-  add_test(NAME includetest COMMAND ${TESTS_DIR}/includetest.sh ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR})
++  add_test(NAME includetest COMMAND ${TESTS_DIR}/includetest.sh ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR} ${CMAKE_MAKE_PROGRAM})
+ endif(UNIX)
+ if(FOUND_LIBJPEG_TURBO)
+     add_test(NAME turbojpeg COMMAND test_tjunittest)
+diff --git a/test/includetest.sh b/test/includetest.sh
+index 23d602e6..6b064208 100755
+--- a/test/includetest.sh
++++ b/test/includetest.sh
+@@ -5,10 +5,11 @@
+ 
+ # expects install prefix like /usr as an argument
+ PREFIX=$1
++CMAKE_MAKE_PROGRAM=$2
+ 
+ TMPDIR=$(mktemp -d)
+ 
+-make install DESTDIR=$TMPDIR
++DESTDIR="$TMPDIR" $CMAKE_MAKE_PROGRAM install
+ 
+ echo \
+ "
+@@ -19,6 +20,6 @@ int main()
+ {
+     return 0;
+ }
+-" > $TMPDIR/includetest.c
++" > "$TMPDIR"/includetest.c
+ 
+-cc -I $TMPDIR/$PREFIX $TMPDIR/includetest.c
++cc -I "$TMPDIR/$PREFIX" "$TMPDIR"/includetest.c
+-- 
+2.26.2
+
diff --git a/net-libs/libvncserver/files/libvncserver-0.9.13-test-fix-tjunittest.patch b/net-libs/libvncserver/files/libvncserver-0.9.13-test-fix-tjunittest.patch
new file mode 100644
index 000000000000..98e3a654b471
--- /dev/null
+++ b/net-libs/libvncserver/files/libvncserver-0.9.13-test-fix-tjunittest.patch
@@ -0,0 +1,29 @@
+From 8244fab5421fd14d4c75ce488ad18d38b7a6edb4 Mon Sep 17 00:00:00 2001
+From: Christian Beier <info@christianbeier.net>
+Date: Thu, 25 Jun 2020 12:21:50 +0200
+Subject: [PATCH 2/2] CMake: only add turbojpeg test if configured WITH_JPEG
+
+Closes #430
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 290deb38..fdca4d81 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -682,9 +682,9 @@ add_test(NAME cargs COMMAND test_cargstest)
+ if(UNIX)
+   add_test(NAME includetest COMMAND ${TESTS_DIR}/includetest.sh ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR} ${CMAKE_MAKE_PROGRAM})
+ endif(UNIX)
+-if(FOUND_LIBJPEG_TURBO)
++if(WITH_JPEG AND FOUND_LIBJPEG_TURBO)
+     add_test(NAME turbojpeg COMMAND test_tjunittest)
+-endif(FOUND_LIBJPEG_TURBO)
++endif(WITH_JPEG AND FOUND_LIBJPEG_TURBO)
+ if(LIBVNCSERVER_WITH_WEBSOCKETS)
+     add_test(NAME wstest COMMAND test_wstest)
+ endif(LIBVNCSERVER_WITH_WEBSOCKETS)
+-- 
+2.26.2
+
diff --git a/net-libs/libvncserver/libvncserver-0.9.13.ebuild b/net-libs/libvncserver/libvncserver-0.9.13.ebuild
index 6a10ad068579..c513bda1f85d 100644
--- a/net-libs/libvncserver/libvncserver-0.9.13.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.9.13.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 LICENSE="GPL-2 GPL-2+ LGPL-2.1+ BSD MIT"
 # no sub slot wanted (yet), see #578958
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+24bpp +filetransfer gcrypt gnutls ipv6 +jpeg libressl lzo +png sasl ssl systemd +threads +zlib"
 # https://bugs.gentoo.org/690202
 # https://bugs.gentoo.org/435326
@@ -48,6 +48,11 @@ RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS ChangeLog NEWS.md README.md TODO.md )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-test-fix-includetest.patch
+	"${FILESDIR}"/${P}-test-fix-tjunittest.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_FFMPEG=OFF
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index c134626f9ed6..ae31a8d3beb0 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -4,6 +4,7 @@ AUX nodejs-13.8.0-paxmarking.patch 4213 BLAKE2B 4235139400e33fbc0e9f9f965953ed16
 AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
 DIST node-v10.19.0.tar.xz 21906168 BLAKE2B 395504ef3befa47d8b967114e019e6a76c799871e7eb21e2c6c0453655ffa07f17f42209daddeb5417342cfbad71ba1a35ae15a2d210b692bc60be270c2fc415 SHA512 512efc58415ed789938c434af131d76bdd51772cac9f7e380afaa79d83cc9c433a979068fc7272adba6ba6551d195267978e1fc819236926b0d1fd6cf91c5eee
 DIST node-v10.20.1.tar.xz 21947588 BLAKE2B 6078e29a125fc1020de7b62c97174d82273af5f6def1dbd2be7968227400735d62f8427811cced69f6365f3232d8800cad388853c34dc6620dfbbc5a27d7f716 SHA512 be2f87e1089be37caa87f5c109121f3f054ffc5a66c4d468f631fa718e461425fbb2dc397459e252eb66c11a06b60659a449dcdcd9d44506732f3703660b597b
+DIST node-v10.21.0.tar.xz 21953796 BLAKE2B 6bdbeafb0f4ceb5c02df96ea74e8796680706756d3cadf48b813c46bdf91e3e1d5c49616ff827f01c17ed3bce1af303a5f7219c1995adb482b11203091d614f4 SHA512 613d3c1bca79ea5f127dc6793de2b5cfdfa056c01ec092e3b7ee79205894b21ca5ec4a367265122641dd1d360c675cfb36a4f7892894194ddd18abd1b2206544
 DIST node-v12.16.1.tar.xz 23481768 BLAKE2B 29371b952c14907778c064269108f1da5e3818c32773e73090c61edcd07190c418189db6a505987ca71f99bb868880e297de5d2181b9a880774eaaf515985f26 SHA512 fe1e9fabb6fe52e3bc4275b33e6c5e4a761550b04964c0ae7dbef7172f5d415207bb2985751d068e357ce45a0ba414b07c0abd1531ef839b9463e98eeae8f9a4
 DIST node-v12.16.2.tar.xz 23654020 BLAKE2B aa4bb764a8731e32ce07d03d96d573632bbf9af79b127c2acec48fcf335c01ea0ea99532670a46befac42e2e1ce5a4dbd2e4cf0d068bac05749d87af59bb80fa SHA512 81688468bc6e20d83f7f58f0c15f9291a801eb2acc8ba7279e65d81f3eb4ea95e3b6cee0d09738c0d0fa35226ae3d52f2bad5da63a20a3edc9129197d42d000d
 DIST node-v12.16.3.tar.xz 23682432 BLAKE2B 91b97c0de9c76f33d080f3f12a42a15140be6e3f4d42022a55305dc2afc04de6a2b8364b9fc5df0dd71c9ec249eb9e4da8ff23f53be43a1f306d2a6fbc6d6bce SHA512 e5d2d1960972f19ef5acc667efb702d534eb436212dea9e0bfd817328c927b55734406f232b32bba366f05c2691e5085e3a6f8c1e2d959398745e60719e731b3
@@ -14,6 +15,7 @@ DIST node-v14.4.0.tar.xz 33005312 BLAKE2B bc1462d897e24a6b842e6f8146971866c73b54
 DIST node-v8.12.0.tar.xz 18310452 BLAKE2B 79634fc57cd76a97e72bab4be37da91d5eff4d13cdaa2b48e83f013885fa3590ba4a28378baf036ed26b7304bf234753d1d4014f72571496f5bb6cd5b221e5f0 SHA512 665d2dba287d78bcd723d7b4d00a6897fb996f4aa69a541e010a3dfeb2614257892117fcce7123966b1ecaddc9269a6667e0e262df693baea1f476c96de55c42
 EBUILD nodejs-10.19.0.ebuild 6357 BLAKE2B b44a9661af496c8ba80b1ee680b2c511b3b6c2f7702d23710ff2876312e1f20016e579a36531083699a9881001e65150565c3b1fe6f5875b667aa9b79e87a665 SHA512 b290ea8a99c36e16fc0dcae001a3466a094c7ab6953c04f04a86ee0cef14b8ba861e86ad44e0a2b882636b16e95de6975afe40bb5d5e090791322bad6c276b8c
 EBUILD nodejs-10.20.1.ebuild 6361 BLAKE2B 347a4d538848e42a071ecab801743002b1a2c979dfbf67be153024541b53ab7ad9814d25bdeb31ee13a659a24470c6a73fefcecd7b1175836506bb25681ff4cf SHA512 6858af544698d7b343bc41b0c6a57956cdff1602d0018b00662d0ceb4b619e821fd14dcef67573b96c680e1584714745e007088dbeda9f5f410937892260186e
+EBUILD nodejs-10.21.0.ebuild 6361 BLAKE2B b9cade7c3afd16ae8e365a6769480d6512ad12e44e1a101894b6637c165755d87e0bc5054c3c3c7121615fab584196f681e1cb6e29c75f3962c20a67649ebdbe SHA512 39e1f76ca82c6d46f919fbcc23c1bfbd4eaa8229e7c1d2b0b7ed14176e91c0847eb9362360f13a6d060552a76fbf07479e45886e8fb95e38c1d84d33cf021866
 EBUILD nodejs-12.16.1.ebuild 6199 BLAKE2B 401807f39cc6cb178a532cb99f73558c47916f766a45184ce63cd0260605d2977a164cafa8a1197b7177da6b8198ba3224e2ca96733b47e8ea104fe1d6465a4c SHA512 7ce5fd34dc047875994da88d022c693e599b379bd9bcd98ecaecd99dd8eb45e7bfafc303f4d328e5cd241e5486a015a29197df0a905bb67e84c6b943930e229c
 EBUILD nodejs-12.16.2.ebuild 6203 BLAKE2B 013443da57ae66e7a58247e7ab3599d72fbfcb1a62f9bf6d06b4412a5bae1372eefd7e8cbc68aed2d97b72734c60ce3a38effb34b6961872c946bfa4c5bba4b6 SHA512 9b56e373305402bd499d09b04f748f555f6e1966bbc5c112ddb0e1a372615c89b58850bc802b86f9e0b06942d6707095f156a05b15ad9c01b55c4c23c1301d53
 EBUILD nodejs-12.16.3.ebuild 6203 BLAKE2B 244b4c61b0f6272b26e5664ddfbd67eb6bb8637af78b1e57b5a077d7ee978499875e7d4a8dacb29d93cfe6e589415c969fe52012b41d5dc718c78a25bc1d913f SHA512 19b19f7c108ae641833c1c8e1351de8ed511bf04b53a5003d5d6225b5aa59933857368ba8415afb88b2278d1daac8f4de9d57f3b755a3a27fa33b04a3f470a9e
diff --git a/net-libs/nodejs/nodejs-10.21.0.ebuild b/net-libs/nodejs/nodejs-10.21.0.ebuild
new file mode 100644
index 000000000000..f7ab581674c5
--- /dev/null
+++ b/net-libs/nodejs/nodejs-10.21.0.ebuild
@@ -0,0 +1,205 @@
+# 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 eutils 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 +system-ssl systemtap test"
+REQUIRED_USE="
+	inspector? ( icu ssl )
+	npm? ( ssl )
+	system-ssl? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.34.2:=
+	>=net-dns/c-ares-1.15.0
+	>=net-libs/http-parser-2.9.3:=
+	>=net-libs/nghttp2-1.41.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-64.2:= )
+	system-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 )
+	if use ssl; then
+		use system-ssl && myconf+=( --shared-openssl )
+	else
+		myconf+=( --without-ssl )
+	fi
+
+	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/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest
index 0331f3515776..a5b5eca6515f 100644
--- a/net-libs/rpcsvc-proto/Manifest
+++ b/net-libs/rpcsvc-proto/Manifest
@@ -1,5 +1,4 @@
 DIST rpcsvc-proto-1.4.1.tar.gz 61724 BLAKE2B 4fd04b36d30561edf3bbc9f565b07a8f1450ca28d7489b63d241f0b7eb2b98640d2dc2d798b1469460f682c0774fc99a995239d7e0fe2f244852b2561b37a0fb SHA512 a75546255bc5c553ec12dc0844783907b70499eb65ea6fb9de7c0a0f669e4ef0caa717c0cbe9ba8651dc7acfb0c9c4e0fc644ebf12e0a704819fa47e6c65b8b7
 EBUILD rpcsvc-proto-0.ebuild 478 BLAKE2B c7c8e675ea6a1fab782b3b8da093eada21de0ddda0835aeedf0e3aa39828df23b7f6b797c4178f9eccb676ffb45dc059d48b07e88488d7f4771202154d36c67e SHA512 30964ff01fa3043f9719bebce15d3b64d26dd77fa71375db16bc59ba7308d8db5861d2f8619bdbea425576f714ed428587288774c872a53ee1268f304d0abbd2
 EBUILD rpcsvc-proto-1.4.1-r1.ebuild 945 BLAKE2B b37c837ee226bf9208107c89c2b66b6e7209ff2226cd73c41f76a711959f3aee7188c53262c37dfd409c9968ed27d79db92c6d1c2fc480912fcbe7397b3aa59f SHA512 8d4078193d552d75b6666ea25c4ca1c03a71ab28236bf35609fa08a902cbd23e6e40f5b17f6e867bb83077c70b24fe8e0de74af52d28c67b230a9072eadae8a6
-EBUILD rpcsvc-proto-1.4.1.ebuild 739 BLAKE2B 36d56f5bc792dbcd995fe3181f0a1793c115141f9790edda01935a7bc0ff00cba7792485314448b9b4f0a36caec70990655df1898b92bc5275af85c0f66e0d2d SHA512 f8b0768a5b6cb398eb24cdb9c8841af7114bd1f3d4377ccd143b7199a1403d9e6724717579e9103aaccb200d97ac84d0c8c913cc5f9b55deb2eda6bc165b8b0b
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1.ebuild
deleted file mode 100644
index 6898da16fe7c..000000000000
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="rpcsvc protocol definitions from glibc"
-HOMEPAGE="https://github.com/thkukuk/rpcsvc-proto"
-SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1+ BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE=""
-
-# sys-devel/gettext is only for libintl detection macros.
-DEPEND="sys-devel/gettext"
-RDEPEND="
-	!<sys-libs/glibc-2.26
-	virtual/libintl
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	# provided by sys-fs/quota[rpc]
-	rm "${ED}"/usr/include/rpcsvc/rquota.{x,h} || die
-}
diff --git a/net-libs/shairplay/Manifest b/net-libs/shairplay/Manifest
index 77450aef517f..4ead37251abd 100644
--- a/net-libs/shairplay/Manifest
+++ b/net-libs/shairplay/Manifest
@@ -1,7 +1,7 @@
 DIST shairplay-0_pre20170118.tar.gz 291352 BLAKE2B 0eb1a60e7cd3511d24d7f6fc910afa85df4488a96ffca80d98bf00b8544b05630f8edb2f5204bc93e8901c4d8efa752f2eef94ed625e2bf7d77cd74ed3053572 SHA512 05a8ac399659235e88d3b1a7fbe8364ba526881b24ee082c3b7a5709b9b63eac376071d44028e4758ab22ca56d30f8e996b12dc9d3bd99bd38fe453e00a4a18b
 DIST shairplay-0_pre20180824.tar.gz 554332 BLAKE2B cbebe272a15a602b79f384c7497bd849145bf065a9b2c6fd335c5536dd0cbefef332945662ad4962e69273d64a23c1f2ace3edcb7c38362607414d27a61397fd SHA512 38d947740da85546cccc4186dfd6d1ab0be71463107b24beb374b17a9e557fc7e4c97e34bfd69e962ddb3e481ecc8e37070e225761d8543588cf047be25ca3a6
 EBUILD shairplay-0_pre20170118.ebuild 960 BLAKE2B d8dd128013d9402402f489d81c6f9d44b70c3b4283852643a9fa1b313538fb48f0900e254faed5ac100e480d7021dca2a776056ab30f977b9dd915314e0b32eb SHA512 3ce15525ded41e9ffd2d6ac3134a73a8bc0a8bea1d018d3e93f42c5aa35a9b983e3848806fad8089f20e9ca7fdaab1c1ba7ad7697423872b1a9f4c89be48018e
-EBUILD shairplay-0_pre20180824-r1.ebuild 926 BLAKE2B c6a518f8deff81b1072948c6be8376cec5827da017e721b1179681fe7797db542fd009aeba277c5aee83997d183fc0c9f7f5ea8fbbb7e9dab0ab9b9247331d70 SHA512 4b76ddc7c46d1712831b1cc5cbb5a03e9727b28c7839a3b4a511ae4a3c16a15fc6d4b3d700fbb9d9356394b472c5023dab128923d446ebce34d973c2dfba32cf
+EBUILD shairplay-0_pre20180824-r1.ebuild 933 BLAKE2B 8ce683912ef9cc24024e7e6015e0b892d97c2b969a753f21bc72c8c17b4d26d9728de165bfa612cbc631b2f954f313fdfe4ee087db76517a2ebfef6518ee3bdc SHA512 5adcda50568ffd1d6fb351526625a53517cd51aaff83124cb0c1486785e79233c45b746d56f3fbae21d99aa3171516ac9c6919f30c309368279953ff3ec392af
 EBUILD shairplay-0_pre20180824.ebuild 1040 BLAKE2B 576832bd080175c2a5e4b02b46a27bc2ceab31b40ec276aa1cf0e2a0c7c6ed3b80b939142fad3817750f6fe5bf61ba134c950188f2a88ac5c1d98cf7c63bec14 SHA512 eb25be13b23aa3c0f25813bf7ceea0f95dabf79d020178ae846cdc44e264315cd85bb06a8ce28aa92a03be22245e966801247bf8fd4aad024dfabee0e664649a
 EBUILD shairplay-9999.ebuild 926 BLAKE2B c6a518f8deff81b1072948c6be8376cec5827da017e721b1179681fe7797db542fd009aeba277c5aee83997d183fc0c9f7f5ea8fbbb7e9dab0ab9b9247331d70 SHA512 4b76ddc7c46d1712831b1cc5cbb5a03e9727b28c7839a3b4a511ae4a3c16a15fc6d4b3d700fbb9d9356394b472c5023dab128923d446ebce34d973c2dfba32cf
 MISC metadata.xml 806 BLAKE2B 54e0d86fcf821eb4c29502f75a44b7a5dc53747e6e594e4a8bfcc558cef8362b136b17e827a10f617b6115a29f3dda5528555e09c2c6fb1fe43b2132d1a8a177 SHA512 fe0e689e3b0cd7bf95bab72137b10b04d7006b63917142293bca72a58a90c485d3e5735f6036828de714a89180021785361aa8862fcf7405815e0bb57f476329
diff --git a/net-libs/shairplay/shairplay-0_pre20180824-r1.ebuild b/net-libs/shairplay/shairplay-0_pre20180824-r1.ebuild
index e8573a8c12b6..393ad57ec1fc 100644
--- a/net-libs/shairplay/shairplay-0_pre20180824-r1.ebuild
+++ b/net-libs/shairplay/shairplay-0_pre20180824-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=7
@@ -12,7 +12,7 @@ else
 	EGIT_COMMIT="096b61ad14c90169f438e690d096e3fcf87e504e"
 	SRC_URI="https://github.com/juhovh/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="Apple airplay and raop protocol server"
diff --git a/net-libs/signond/Manifest b/net-libs/signond/Manifest
index 9729444a1921..3fddd6515b23 100644
--- a/net-libs/signond/Manifest
+++ b/net-libs/signond/Manifest
@@ -1,8 +1,9 @@
-AUX signond-8.60-buildsystem.patch 1306 BLAKE2B 5cf758cd974d54fa39e42291f6d4969f341d37970948d0e1bb6f74367a5a77e5b0be8c7a435af2f7474d9ff8ab6f8352a7ddd83e772b792bb8db97032db2b8ba SHA512 ec69a845da1019c7517ca1163bd09fab2cf1f4e1e8faf27c2baa1ae0da5c5b4689b7fadc4207f744224deff7b99eaada6d41af4c451962bc07c9920d1559ba1f
-AUX signond-8.60-consistent-paths.patch 10565 BLAKE2B 09024a3a877d965ad037f3e77add52589e230b2fdeb133960192b6f26d4272395230621625a78633d084f863fd3aa0c931011f47134587a44e1a27a20ca04e91 SHA512 e3731e360c208c75de3634e507c81be94da29df7592ae90c192a30ef727cdf1c86e939a6d27ddd5b227a7655630dc7320c7181f644721e8b59b37501dc34e2fb
+AUX signond-8.60-buildsystem.patch 1004 BLAKE2B 6a9ae7cc9c2750ffb5eb6495dc47c2118bb7d7babf8f253f168be73cf03934d00a875c99048b1985716d7c1f2ac3a2543bd988939e76631aff8e852a464b4589 SHA512 73ac6551d9c1bb37e331baad427d3770a913ab52833f3112f825a5a28647752f925a40c12bf72a79c0c9b93aacbaca5f357a21a48eae4f1f24341cfeb1ce5b57
+AUX signond-8.60-consistent-paths.patch 10627 BLAKE2B 853cc9816469c0b47c8ecab941c1ade09aa2567a6cbe99012da42d479d35d304eeb869700e4fc9f0623191735c1e445aa2046b904ef151cbc048dda00e3c7cd4 SHA512 3c285e57843d458fb30e21f607dc7edf3009d7bcf68c2641188b1ded4cd44d589541b754803a687adf92b2de11417bf3411c0cf2bfdcd6c7375e32bc1948edfe
 AUX signond-8.60-crashfix.patch 5228 BLAKE2B 713fe5b5fe6c806fc09bf1710e5a5c8872b7bc80e55d328d6301fa0040bf3750b33891d1e2ce42cab45622b9633fb93e29277889ce27fb54a98fb44bc022124a SHA512 25ef43ed61f8d422882e944600e2571108927920493558904c039a06af7091ec8fdcdcf030cb4e59ebf53d934aa67265d073084b3d280b204f24f74620e764b9
-AUX signond-8.60-unused-dep.patch 254 BLAKE2B 65f6157833a139b72d4fdb07b3877948ce7d7f327e457c0c2391d715475a7110c5e793f02c950b4a7b289ecca2c387ce6133af3d51c7f0d96b3910795abd4ed9 SHA512 21cb1ee319b3219ac46e6b61eec04d93262a3108311e141fee25fb1280fd6673d5ffac0f7b444a9131d5f8a6b255ba8189a75dec83004680d48eae5776404778
+AUX signond-8.60-drop-fno-rtti.patch 4558 BLAKE2B cd75d2a269b337b43286f9a76d189b4cdd91e4c312b7664de49a2b6e72d63eedd3776ef3fe2a659120556725c748cc5a66a16568d3f24726229ca6baef129fa6 SHA512 d7b3abc6f82fdccba7544176f483d26dfe15200a07d9a44aaf0c2a7b27f09a1bef3e8f6e1a59f7a529c21bf373741f541710d1c3cc958bbcb7e0bd58d45d868c
+AUX signond-8.60-unused-dep.patch 984 BLAKE2B 67ec450053f294eec1be87411ab11dd14d3e6c9895a794b0aa6f08a433763f2aa246908bf8c8345639b98cf5be3a06670dfc200a238ce9582e37e186f88759c0 SHA512 b54a59c580436dfac3e469dd733557ddd1857f78fb992693f19c58683baed99e91193ca5c62cda9e974b7db48791c46156427a1c0043a24ec03c4594018fe697
 DIST signond-8.60.tar.gz 281359 BLAKE2B 3ecd8048d8c5551c3611e48091c35a9f0fe4c972e6b4730fe1f610b4870fe86911dee04c331847deee2a50f4a04acd5a8a0d1c605d1f4f0a24272d44c289a6d3 SHA512 fb3ccc99c692506ca29d5bae39bc375ff97057734fac1551ea39105d5f8e78f3df23e01a286f73be3a606c54b40f957c3c0d985484926e57f354218e4137ff3c
 EBUILD signond-8.60-r1.ebuild 1622 BLAKE2B ed235128e02a9d93fde9848d2feff85e1ddfe29cc3b5cc97e63cc04630a898a34722750ead88faa5940bd6983fb193911b588a27fdf022ad1fb3fb88211d9570 SHA512 4b5cca985c36a579420153441d4d75e1ef879262b21145385079e9be8244d2442678b4c742d7b2fe9453d2cb97411190bd01ea03fcf6a96887bf09bc3bc575e0
-EBUILD signond-8.60-r2.ebuild 2166 BLAKE2B a01bf96f0641b976263523f5e09052b129554401577c403f1ff0b57d32586d98dc79aef05ec9d369ecb2589c190f317a5f8727face1aaacb2aeae02be8bd5fdc SHA512 f9bb80adb2d4e0790448d7f31afe40f064be2e2d671d97267e0d842471ae354669a9b26f57a9acf93d352473489f1aaf3f8e0e8e847df9dbd2d0d45cd9159a14
+EBUILD signond-8.60-r2.ebuild 1904 BLAKE2B d2e251511e16cd920ec29642b13569e0620b63a3c4f3b148c4a340605ce3ba8454d6f14423c2ba6166fcb8582ac17f746c64a3826128ea07bbd031f804b0b9cb SHA512 b5fd1c36ffa0377613a01fa4cb975878becfeb087e06c1131db0cbde4bd55e20c20cf495787fd130013cf7fbca58949affec7fa4d6d5ed6d84e31d3893564cec
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/signond/files/signond-8.60-buildsystem.patch b/net-libs/signond/files/signond-8.60-buildsystem.patch
index 95c4791ac4e2..a38f8458848c 100644
--- a/net-libs/signond/files/signond-8.60-buildsystem.patch
+++ b/net-libs/signond/files/signond-8.60-buildsystem.patch
@@ -1,16 +1,16 @@
-From 43e953418a5a08c3492d1160e4268dbcf82e7be9 Mon Sep 17 00:00:00 2001
+From 32e001d760dc1a7f884d7dc3a6e6883bd76e2f55 Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 8 Dec 2019 20:35:11 +0100
-Subject: [PATCH] Fix build system for Gentoo
+Date: Sun, 28 Jun 2020 21:37:30 +0200
+Subject: [PATCH 1/3] Fix buildsystem
 
-1) remove unused dependency Qt5Xml
-2) don't install example plugin
-3) don't install static libs
+- Disable examples
+- Disable static lib
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
 ---
  lib/SignOn/SignOn.pro   | 4 +---
  src/plugins/plugins.pro | 1 -
- src/signond/signond.pro | 1 -
- 3 files changed, 1 insertion(+), 5 deletions(-)
+ 2 files changed, 1 insertion(+), 4 deletions(-)
 
 diff --git a/lib/SignOn/SignOn.pro b/lib/SignOn/SignOn.pro
 index f6a1d61..28af041 100644
@@ -34,18 +34,6 @@ index dfccc4a..ca1c1ae 100644
  SUBDIRS = password \
 -          example \
            test
-diff --git a/src/signond/signond.pro b/src/signond/signond.pro
-index 60ee5e7..211dab6 100644
---- a/src/signond/signond.pro
-+++ b/src/signond/signond.pro
-@@ -4,7 +4,6 @@ TEMPLATE = app
- TARGET = signond
- QT += core \
-     sql \
--    xml \
-     network \
-     dbus
- 
 -- 
-2.24.0
+2.27.0
 
diff --git a/net-libs/signond/files/signond-8.60-consistent-paths.patch b/net-libs/signond/files/signond-8.60-consistent-paths.patch
index f32ac319e570..6743a92678af 100644
--- a/net-libs/signond/files/signond-8.60-consistent-paths.patch
+++ b/net-libs/signond/files/signond-8.60-consistent-paths.patch
@@ -1,11 +1,14 @@
-From c68f31b964f9decf323cd212282cf13d4a42ad21 Mon Sep 17 00:00:00 2001
+From 62ce2305081075a53836999441214f03d37b50b5 Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 8 Dec 2019 22:52:46 +0100
-Subject: [PATCH] Consistent overrideable install paths
+Date: Sun, 28 Jun 2020 21:44:42 +0200
+Subject: [PATCH 3/3] Consistent overrideable install paths
 
 At least signon-plugins.pc and signon-plugins-common.pc were getting it wrong.
 
-This patch is converting absolute INSTALL_LIBDIR to LIBDIR relative beneath INSTALL_PREFIX.
+This patch is converting absolute INSTALL_LIBDIR to LIBDIR relative beneath
+INSTALL_PREFIX.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
 ---
  common-installs-config.pri                    |  2 +-
  common-pkgconfig.pri                          |  2 +-
@@ -259,5 +262,5 @@ index 2c03e74..ea2fcb2 100644
 +target.path = $${INSTALL_PREFIX}/$${LIBDIR}/signon
  INSTALLS = target
 -- 
-2.24.0
+2.27.0
 
diff --git a/net-libs/signond/files/signond-8.60-drop-fno-rtti.patch b/net-libs/signond/files/signond-8.60-drop-fno-rtti.patch
new file mode 100644
index 000000000000..175d88361c43
--- /dev/null
+++ b/net-libs/signond/files/signond-8.60-drop-fno-rtti.patch
@@ -0,0 +1,123 @@
+From e21867fa27e32f5391d73d145eef1c8d908dee44 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Thu, 18 Jun 2020 10:22:04 +0200
+Subject: [PATCH] Don't use -fno-rtti
+
+QProcess uses typeid and crashes otherwise.
+---
+ common-project-config.pri                       | 2 --
+ src/extensions/cryptsetup/cryptsetup.pro        | 1 -
+ src/plugins/plugins.pri                         | 3 +--
+ src/remotepluginprocess/remotepluginprocess.pro | 3 +--
+ tests/extensions/extensions.pri                 | 3 +--
+ tests/libsignon-qt-tests/libsignon-qt-tests.pro | 3 +--
+ tests/passwordplugintest/passwordplugintest.pro | 3 +--
+ tests/signond-tests/signond-tests.pri           | 3 +--
+ 8 files changed, 6 insertions(+), 15 deletions(-)
+
+diff --git a/common-project-config.pri b/common-project-config.pri
+index 606f70bb..abe6cf6d 100644
+--- a/common-project-config.pri
++++ b/common-project-config.pri
+@@ -13,8 +13,6 @@ RCC_DIR         = resources
+ 
+ # we don't like warnings...
+ QMAKE_CXXFLAGS -= -Werror -Wno-write-strings
+-# Disable RTTI
+-QMAKE_CXXFLAGS += -fno-rtti
+ # Disable exceptions
+ CONFIG += exceptions_off
+ # Use C++11
+diff --git a/src/extensions/cryptsetup/cryptsetup.pro b/src/extensions/cryptsetup/cryptsetup.pro
+index f4b6e53b..5cc214e4 100644
+--- a/src/extensions/cryptsetup/cryptsetup.pro
++++ b/src/extensions/cryptsetup/cryptsetup.pro
+@@ -29,7 +29,6 @@ QT -= gui
+ 
+ QMAKE_CXXFLAGS += \
+     -fno-exceptions \
+-    -fno-rtti \
+     -fvisibility=hidden
+ 
+ DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
+diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri
+index 2c03e743..074896d5 100644
+--- a/src/plugins/plugins.pri
++++ b/src/plugins/plugins.pri
+@@ -22,8 +22,7 @@ LIBS += -lsignon-plugins
+ QMAKE_LIBDIR += \
+     $${TOP_BUILD_DIR}/lib/plugins
+ 
+-QMAKE_CXXFLAGS += -fno-exceptions \
+-    -fno-rtti
++QMAKE_CXXFLAGS += -fno-exceptions
+ 
+ headers.path = $${INSTALL_PREFIX}/include/signon-plugins
+ 
+diff --git a/src/remotepluginprocess/remotepluginprocess.pro b/src/remotepluginprocess/remotepluginprocess.pro
+index 7c2ea007..36b4cbe0 100644
+--- a/src/remotepluginprocess/remotepluginprocess.pro
++++ b/src/remotepluginprocess/remotepluginprocess.pro
+@@ -40,8 +40,7 @@ LIBS += \
+     -lsignon-plugins-common \
+     -lsignon-plugins
+ 
+-QMAKE_CXXFLAGS += -fno-exceptions \
+-                  -fno-rtti
++QMAKE_CXXFLAGS += -fno-exceptions
+ 
+ #DEFINES += QT_NO_CAST_TO_ASCII \
+ #    QT_NO_CAST_FROM_ASCII
+diff --git a/tests/extensions/extensions.pri b/tests/extensions/extensions.pri
+index 179cd28d..2fd75955 100644
+--- a/tests/extensions/extensions.pri
++++ b/tests/extensions/extensions.pri
+@@ -20,5 +20,4 @@ INCLUDEPATH += . \
+     $$TOP_SRC_DIR/lib/signond
+ 
+ QMAKE_CXXFLAGS += \
+-    -fno-exceptions \
+-    -fno-rtti
++    -fno-exceptions
+diff --git a/tests/libsignon-qt-tests/libsignon-qt-tests.pro b/tests/libsignon-qt-tests/libsignon-qt-tests.pro
+index 43f2d59f..ac87781d 100644
+--- a/tests/libsignon-qt-tests/libsignon-qt-tests.pro
++++ b/tests/libsignon-qt-tests/libsignon-qt-tests.pro
+@@ -36,8 +36,7 @@ INCLUDEPATH += . \
+     $$TOP_SRC_DIR/src/plugins/test
+ DEFINES += SSO_CI_TESTMANAGEMENT
+ DEFINES += "SIGNOND_PLUGINS_DIR=$${SIGNOND_PLUGINS_DIR_QUOTED}"
+-QMAKE_CXXFLAGS += -fno-exceptions \
+-    -fno-rtti
++QMAKE_CXXFLAGS += -fno-exceptions
+ 
+ check.depends = $$TARGET
+ check.commands = "SSO_PLUGINS_DIR=$${TOP_BUILD_DIR}/src/plugins/test SSO_EXTENSIONS_DIR=$${TOP_BUILD_DIR}/non-existing-dir $$RUN_WITH_SIGNOND ./libsignon-qt-tests"
+diff --git a/tests/passwordplugintest/passwordplugintest.pro b/tests/passwordplugintest/passwordplugintest.pro
+index 6132921e..ce16fdcf 100644
+--- a/tests/passwordplugintest/passwordplugintest.pro
++++ b/tests/passwordplugintest/passwordplugintest.pro
+@@ -19,5 +19,4 @@ INCLUDEPATH += $${TOP_SRC_DIR}/lib/plugins \
+     $${TOP_SRC_DIR}/src/plugins \
+     $${TOP_SRC_DIR}/lib
+ 
+-QMAKE_CXXFLAGS += -fno-exceptions \
+-    -fno-rtti
++QMAKE_CXXFLAGS += -fno-exceptions
+diff --git a/tests/signond-tests/signond-tests.pri b/tests/signond-tests/signond-tests.pri
+index 1bbd5a15..e95556ba 100644
+--- a/tests/signond-tests/signond-tests.pri
++++ b/tests/signond-tests/signond-tests.pri
+@@ -34,8 +34,7 @@ INCLUDEPATH += . \
+     $${TOP_SRC_DIR}/lib/plugins/signon-plugins-common/SignOn \
+     $${TOP_SRC_DIR}/lib \
+ 
+-QMAKE_CXXFLAGS += -fno-exceptions \
+-    -fno-rtti
++QMAKE_CXXFLAGS += -fno-exceptions
+ 
+ check.depends = $$TARGET
+ check.commands = "SSO_PLUGINS_DIR=$${TOP_BUILD_DIR}/src/plugins/test SSO_EXTENSIONS_DIR=$${TOP_BUILD_DIR}/non-existing-dir $$RUN_WITH_SIGNOND ./$$TARGET"
+-- 
+GitLab
+
diff --git a/net-libs/signond/files/signond-8.60-unused-dep.patch b/net-libs/signond/files/signond-8.60-unused-dep.patch
index dd32af041d4d..54b5ce26f4c7 100644
--- a/net-libs/signond/files/signond-8.60-unused-dep.patch
+++ b/net-libs/signond/files/signond-8.60-unused-dep.patch
@@ -1,6 +1,31 @@
---- a/tests/signond-tests/signond-tests.pri	2020-06-07 10:57:19.327456979 +0200
-+++ b/tests/signond-tests/signond-tests.pri	2020-06-07 11:00:39.866322814 +0200
-@@ -6,7 +6,6 @@
+From 5814507706210031432a4ff727231bb1082576d5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 28 Jun 2020 21:43:09 +0200
+Subject: [PATCH 2/3] Drop unused Qt5Xml dependency
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/signond/signond.pro               | 1 -
+ tests/signond-tests/signond-tests.pri | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/src/signond/signond.pro b/src/signond/signond.pro
+index 60ee5e7..211dab6 100644
+--- a/src/signond/signond.pro
++++ b/src/signond/signond.pro
+@@ -4,7 +4,6 @@ TEMPLATE = app
+ TARGET = signond
+ QT += core \
+     sql \
+-    xml \
+     network \
+     dbus
+ 
+diff --git a/tests/signond-tests/signond-tests.pri b/tests/signond-tests/signond-tests.pri
+index 1bbd5a1..950baaa 100644
+--- a/tests/signond-tests/signond-tests.pri
++++ b/tests/signond-tests/signond-tests.pri
+@@ -6,7 +6,6 @@ CONFIG += \
  QT += core \
      sql \
      testlib \
@@ -8,3 +33,6 @@
      network \
      dbus
  
+-- 
+2.27.0
+
diff --git a/net-libs/signond/signond-8.60-r2.ebuild b/net-libs/signond/signond-8.60-r2.ebuild
index c775677aaaa5..4c354dd63641 100644
--- a/net-libs/signond/signond-8.60-r2.ebuild
+++ b/net-libs/signond/signond-8.60-r2.ebuild
@@ -27,13 +27,15 @@ DEPEND="${RDEPEND}
 	test? ( dev-qt/qttest:5 )
 "
 
-RESTRICT="!test? ( test )"
+# tests are brittle; they all pass when stars align, bug 727666
+RESTRICT="test !test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/${P}-buildsystem.patch"
 	"${FILESDIR}/${P}-consistent-paths.patch" # bug 701142
 	"${FILESDIR}/${P}-crashfix.patch"
 	"${FILESDIR}/${P}-unused-dep.patch" # bug 727346
+	"${FILESDIR}/${P}-drop-fno-rtti.patch" # runtime crashes
 )
 
 S="${WORKDIR}/${PN}-VERSION_${PV}"
@@ -53,14 +55,6 @@ src_prepare() {
 	sed -e "/CONFIG += c++11/d" \
 		-i common-project-config.pri || die "failed fixing CXXFLAGS"
 
-	# fix runtime failures
-	sed -e "/fno-rtti/d" \
-		-i common-project-config.pri src/plugins/plugins.pri \
-		src/{remotepluginprocess/remotepluginprocess,extensions/cryptsetup/cryptsetup}.pro \
-		tests/{signond-tests/signond-tests,extensions/extensions}.pri \
-		tests/{passwordplugintest/passwordplugintest,libsignon-qt-tests/libsignon-qt-tests}.pro \
-		|| die "failed disabling -fno-rtti"
-
 	use doc || sed -e "/include(\s*doc\/doc.pri\s*)/d" \
 		-i signon.pro lib/SignOn/SignOn.pro lib/plugins/plugins.pro || die
 
diff --git a/net-libs/xrootd-ceph/Manifest b/net-libs/xrootd-ceph/Manifest
index 6ed94890401b..2e72a75c26ac 100644
--- a/net-libs/xrootd-ceph/Manifest
+++ b/net-libs/xrootd-ceph/Manifest
@@ -1,5 +1,5 @@
 DIST xrootd-ceph-4.12.0.tar.gz 80601 BLAKE2B 05e31ec3a03d50f36f7ef368705ca8ad064d1d9da4fc3815aaf96ce358da07348aaea264d82884da2782cf7c1069b584269fff9f2a3140057b2d4d2929639f77 SHA512 de55cc923bad3629de6428dbc4e7c7e2cb802512f03f49bcfc79f12221828cd9702f1c9a1bc28b599dce801c937146cf381dfd589c85f4f5721c4fbf13f6ad34
 DIST xrootd-ceph-4.12.3.tar.gz 80615 BLAKE2B d7040be47fe3f9283036f1d56f509860c6a56f29f68835d1469f3ee48377dd90e1c76b28c65b1dab24b64e00083368e1242bd4988f15b6b9df50a0c7715d9f00 SHA512 8df64c33b97cb9d92bc0a962c34c82d789551d76a3450b56125f2924357ee46c51513f992809357a217890d1d261144a92ee1b95f075b2c8081d4646402467b0
-EBUILD xrootd-ceph-4.12.0.ebuild 680 BLAKE2B dffac256f61140144d51cbfc72d4c996273be0fa1f55685138d040e3acde5f46ba50b07ed601c5c06cac56c944ea1c22e506f350acbaab33e17b0a77486adc86 SHA512 9f014c81e32d0936307d9c000fb69ab7d992cb14e22a9d111ae582cfd3fa946241108d3ab915f92fdce9bfc4b7f1f8ef50130ca753f86d8f101a3407eddba5cc
+EBUILD xrootd-ceph-4.12.0.ebuild 679 BLAKE2B 6171c6bf61a24f633fbb774d23b398160fe9d00ae797d6c40fc2058ce33c4216e6a1a79846d38e6cf489fa3655772441505b30cf372a19e25f6fe5c2398d4948 SHA512 72c4e43a05aee572e139050e2428046f70e1ce2199698998cabc1f3f391f5dd8369a8ed081a39fca733999ca4cca102a2f7a4baf8de9605b127f2d14f5df2dfd
 EBUILD xrootd-ceph-4.12.3.ebuild 680 BLAKE2B dffac256f61140144d51cbfc72d4c996273be0fa1f55685138d040e3acde5f46ba50b07ed601c5c06cac56c944ea1c22e506f350acbaab33e17b0a77486adc86 SHA512 9f014c81e32d0936307d9c000fb69ab7d992cb14e22a9d111ae582cfd3fa946241108d3ab915f92fdce9bfc4b7f1f8ef50130ca753f86d8f101a3407eddba5cc
 MISC metadata.xml 496 BLAKE2B e2a202798936cfc2061b2660ab7ad32a4a4c02aab9789e46bdd5981795815505da531ab2891c9022447d2154b6070ddba3e1daa68f25b2373757cbe17d960a6c SHA512 43fa4446767cb279125fdedcaf415af260c42871460fd1144aff7bf47769070da9e9c4fc0e8b32c87fdd879f8dca24586a0764f0ad8a3ba715e1d95e07d60f70
diff --git a/net-libs/xrootd-ceph/xrootd-ceph-4.12.0.ebuild b/net-libs/xrootd-ceph/xrootd-ceph-4.12.0.ebuild
index f701427b94c7..9936f476eb33 100644
--- a/net-libs/xrootd-ceph/xrootd-ceph-4.12.0.ebuild
+++ b/net-libs/xrootd-ceph/xrootd-ceph-4.12.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/xrootd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
+KEYWORDS="amd64 ~amd64-linux"
 
 DEPEND="net-libs/xrootd
 	!<net-libs/xrootd-4.10.0[rbd]
diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index 353b0aeb5a7c..dcedf026979d 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -1,18 +1,11 @@
 AUX cmsd.initd 885 BLAKE2B 9198afa01850da74519a6869894ebd86313f87781e3e2401d429e5e05a938a19a583feca808f78c4b497fd459a8adaece01d0482b132646033575cd50ad5b1b7 SHA512 7f666e98634b205964d69fd540fb79c7ff3b6f1b423ed416a966d1e0d6a18d950908e1dc463e3cc8029fc062b2ff7d29693af8e5af2fb13a36500d40b16345e9
 AUX frm_purged.initd 895 BLAKE2B c192a3c69d3161a8342242789cfc1559f189c0748cd0bdd1ee6baf9b5ba98c80d8103fa55344e1c9b040a513045c7a473272da46c800ff2afa45a0665a93c3b2 SHA512 f9c09f8baae7ed391d5248f5dfb7a1d4d60f23605b2646e6f3c2ec33b05838918a4ba4874424e9b4e674f1ca127d57760364552f6f948dcd3ef84245730efc30
 AUX frm_xfrd.initd 899 BLAKE2B bdfc83f7bbad7e0d7aea91720798c10367c7ac27851414b99013c01d4f9681e010082bfef332ba2cc520afdbef67051ea80ee6922e515a30de32e735f0a6c6a7 SHA512 1c38b20c9b54cab17706c040a90b00df61c9b2f5e4e7a9cc26fa3b125e1d132097222921b5627a33f69b80c8ae5a64cfbaea0a4880588de9fa9d18f6aaa04768
-AUX xrootd-4.8.3-Werror_only_Debug.patch 1183 BLAKE2B 482ea67f3138600b3e3a2de22986526366cac6e854ffc09ff613601a7ec7d71de796129137eb2df47feccb232c5c2160286ef3328834da76960819a914a6475a SHA512 48cb86f5e5ea4fa1c238048aebc775db3d6611c6b3f61adcf692715dcdd0dba4d0c4fafbef3beeaa4690723c9684ccf899e236cd1a4e772f55ac31bb4b597839
 AUX xrootd-4.8.3-crc32.patch 1987 BLAKE2B be57f7be2a897a2399f923e4670d219be79053221cc62ca0f6cf9b7abe6fae4f99dde0ccc72f6617bb07a871a396072db59aa57265382dab7928cbffdac1706e SHA512 4c390ed4329f21839ca2b481408c0114e5d4839cf0b04e673677e175c2e7e92573c9f56ec69660d4f5256c824676f65f9fb6c683d0e77d3b1f97bee7e5f65bc9
 AUX xrootd.confd 651 BLAKE2B a35bf51b82334757dbd27bd48923e59f955361ab009c4b92eef83050d5d4e23904abc2b0b9577f8a5888c875c34bf736cf4072b6684a91ca6ad8cd90fe9a2ba9 SHA512 60ab5b6d77cf79437960044bf201127c8adf5134e7f61a18dcccd2e474a4e41eda971e3ada71dea987716080fb308af98a5237bab2a0b82f50f932ff59e3fdea
 AUX xrootd.initd 858 BLAKE2B 306970196c9f69db3f94c095c8518b837f5f4723a1cbae273273821e4d77d30a7fe65ac4fccbb640ad5e0b6f879e549dbbc4e799f87b5b5c813d66f2d270af2b SHA512 dcdb75341d904c9850c2bf97393ccbb68ad37b095e0a20ca4dab27b10dd7525874c8ad6e07e5b9c1f3c3566391a50c06dee70622d865fa51a7e73aa4096da955
-DIST xrootd-4.11.1.tar.gz 2549971 BLAKE2B e131769291d33d2198c4afdedd0d9f9a0eac9459654277763554d2dfba211b7123f3d0dfc90fe365c7f4da2590d9bec6daf994ee7ae241897aa10b4500362c3c SHA512 7853de40d40f28177f70a18f17ee99f83c8b6c6ddf0b5e7ef64df83c5457bad11e6249c75f985c207c3292fab73a2181730ce9c8bf11979535a566c5364de8a1
 DIST xrootd-4.12.0.tar.gz 2564041 BLAKE2B 6ea9c379aa482c81279168baa3e1381e880d34014fb3516c96961da64d54faf649295f024313ece445df9a62b6b5c818b7aa8a987025d3cd969188de072648c9 SHA512 5338c4fb5461918473dd4f41f4d29fae09a8fc6a9e2d8f00bb74d929dc5396fef73643462d1a4f1ba71ffe5cf92a1695a167ca3a766c674a9377dcf99aaa1778
-DIST xrootd-4.12.1.tar.gz 2564202 BLAKE2B df6334884d12ea68d98f5e8d1c83bb44d9a7d9232f1350323beff8de3815fd24711a90b5180824c9a9fd3f9e4f45ad3448bb32cde57efd646343bf2fd202237e SHA512 8d5c7029ccad8cb898ff41671e6f360154549df926b1fb5e7747503bed477f7bf1daec7addbc5a832b76f0f5c40ef8fdcda708907389fa790c3b87a944af4d93
 DIST xrootd-4.12.3.tar.gz 2574996 BLAKE2B 1ba6ecdee473fbe1f6367459dfe8324f38e2d72aa64ed349ccdcaa7616a3d70f0b647d2eac6babbcc0e1b673ff44a050c05f23e80fb89161f121fa6dd3484311 SHA512 e4f4ad744a71a7fc69a16f2114b6d5962ddf0b22bd86f7eb19703313d55242813f13be1a1f23c541b966674bdb4854f955843322525f37bc83647e8f2fbe076d
-DIST xrootd-4.8.3.tar.gz 2390520 BLAKE2B 1b97225c41f6a3a751f55a4d357f53fac2e4cc24f2456962a6d6282b78faaeb844db5d69bff34437acd2c015dbff4a2a5047d6295770abd200d3e5bedd89d4fe SHA512 6f605131be18f35115bf7cf5d829dfd5a36e004ac69aa77dd0cb34ab70f2b89ff07e7b3e3259fe672d81b6241596c78a537de02e5abad4537dc92ae745ae8911
-EBUILD xrootd-4.11.1.ebuild 2516 BLAKE2B fda9ae309307fbdc7c6b2996ecc305d310e1750e47f044744e9fc1f15b45b452c0c7b4b1e49f33c15346cc6458462a9b3a19e3af6a72b3e55cb61cf467c3ac8e SHA512 8d386d956d6c323bf54f07d7c02065cb477ff3b2f77fa40f3d894e6a8aa767133c5fec7ee879de530ec6478e8f9bd3ce45b47fb8d13db3c267333f088a8b19dc
-EBUILD xrootd-4.12.0.ebuild 2529 BLAKE2B 0106134cbcaa6578797f4a1f9ab36bc6897ecdf8c6769a8abe2883167f2c06cc659715961159f450c352e7dacbcfdba5e707665e5975414c6601fda53242be1a SHA512 58ccd291ebef8ce57ed499d00e22a463c430e884f5e18b36f671918924e4ceee38267c8e3d3b87f70fd420f5135941e29508289051e20dd3dd9b87eaa141c29e
-EBUILD xrootd-4.12.1.ebuild 2529 BLAKE2B 0106134cbcaa6578797f4a1f9ab36bc6897ecdf8c6769a8abe2883167f2c06cc659715961159f450c352e7dacbcfdba5e707665e5975414c6601fda53242be1a SHA512 58ccd291ebef8ce57ed499d00e22a463c430e884f5e18b36f671918924e4ceee38267c8e3d3b87f70fd420f5135941e29508289051e20dd3dd9b87eaa141c29e
-EBUILD xrootd-4.12.3.ebuild 2529 BLAKE2B 0106134cbcaa6578797f4a1f9ab36bc6897ecdf8c6769a8abe2883167f2c06cc659715961159f450c352e7dacbcfdba5e707665e5975414c6601fda53242be1a SHA512 58ccd291ebef8ce57ed499d00e22a463c430e884f5e18b36f671918924e4ceee38267c8e3d3b87f70fd420f5135941e29508289051e20dd3dd9b87eaa141c29e
-EBUILD xrootd-4.8.3.ebuild 2672 BLAKE2B 6d7ca5ca0dde690749a3f704935c2ea93ab7323fc2bb55a63fd5b4b595f11f2829440e690b2b5decb2fa576926e05901c6b42144914cb4fa369007bd25e3c603 SHA512 7f368cc50498ac135739a2b51dfa13a2501cfc9421dc9f7d92f09fdce1e3868a87b4ac1c68459dfb467bfb2f9f4798ee4eafc2f9b6c19e0609c1a4a0ef7252af
-MISC metadata.xml 934 BLAKE2B f490ed604e1135f4440e805a5c7e6ee239326ea716074f1952361efc95d1763ab1ed7e3d9ed883f801430986181104313560092a329994b4a5caf478efec72e9 SHA512 44828821d0307904163a2a818855efc7c68029be18aa0e11ea07bd99d794c433888bcf74a19632a7e3b68494192e6d8c2b9d30b9c33aea748e8b03ebd44efb25
+EBUILD xrootd-4.12.0.ebuild 2527 BLAKE2B a48f6d68fa7926aee485c8f56a4a33d7d661e633c2875271acc35e7fbac66132ce8fcb999d8ba58dc561ba59da3bad5d08e9ff0284dec4f5c58a5b675ec6caf6 SHA512 e401d9e3a10f2c28be18243cd64132de5f079ca5c9db9f18df5c179560b47b9ea3e0bf471a7257f3f15956e4d552a5442b2ad02f969808c1643721fb0e7f2c2c
+EBUILD xrootd-4.12.3.ebuild 2519 BLAKE2B 395695d7458e091905988112f84008e6b6ec67cd5ebd5ea76cdf04ff7f2ffdbcf3ae35b7a94aec178fdecddbb8eb2e9db984a017cc73eaad59cd42fa3e006e4c SHA512 4fea5f8371f05507a25c20472600b0b4fe085442e81b0acec0dea3fbe65483836da1ffca4fa70f639f81aba336aaf83b7e0467b7a7dd879bdd98da2ac99907e0
+MISC metadata.xml 840 BLAKE2B 47b6a6dc8459145124fbc5555f39ef7d3c4a77ef0c4377237a16b37e459f69250442a53ef078498d2b37648f93becd9f46080e71dcca7373a4061d6642bcca0d SHA512 d197a0dda77d491fd3b7a6eeff70d77bd28e7b1faef61b6ca3e523b974653e64448adfc4bbee1c11aa6bf746a85e7a5f1c6e76a76a8d8c3431c45d17ca46ec36
diff --git a/net-libs/xrootd/files/xrootd-4.8.3-Werror_only_Debug.patch b/net-libs/xrootd/files/xrootd-4.8.3-Werror_only_Debug.patch
deleted file mode 100644
index 2f0a64b13fd8..000000000000
--- a/net-libs/xrootd/files/xrootd-4.8.3-Werror_only_Debug.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Only set -Werror - which among other things prevents xrootd-4.8.3 from being
-compiled with gcc-9 - either in debug mode or when explicitly requested.
-Backport of the change made upstream in 4.10.
---- a/cmake/XRootDOSDefs.cmake
-+++ b/cmake/XRootDOSDefs.cmake
-@@ -26,7 +26,15 @@
- #-------------------------------------------------------------------------------
- if( CMAKE_COMPILER_IS_GNUCXX )
-   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x" )
--  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror" )
-+  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra" )
-+  #-----------------------------------------------------------------------------
-+  # Set -Werror only for Debug (or undefined) build type or if we have been
-+  # explicitly asked to do so
-+  #-----------------------------------------------------------------------------
-+  if( ( CMAKE_BUILD_TYPE STREQUAL "Debug" OR "${CMAKE_BUILD_TYPE}" STREQUAL ""
-+        OR FORCE_WERROR ) )
-+    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror" )
-+  endif()
-   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter" )
-   # gcc 4.1 is retarded
-   execute_process( COMMAND ${CMAKE_C_COMPILER} -dumpversion
diff --git a/net-libs/xrootd/metadata.xml b/net-libs/xrootd/metadata.xml
index ecd16e038b97..b961d03874b4 100644
--- a/net-libs/xrootd/metadata.xml
+++ b/net-libs/xrootd/metadata.xml
@@ -16,6 +16,5 @@
   <use>
     <flag name="fuse">Enable the <pkg>sys-fs/fuse</pkg> filesystem driver</flag>
     <flag name="http">Enable http protocol support</flag>
-    <flag name="rbd">Enable rados block device support via <pkg>sys-cluster/ceph</pkg></flag>
   </use>
 </pkgmetadata>
diff --git a/net-libs/xrootd/xrootd-4.11.1.ebuild b/net-libs/xrootd/xrootd-4.11.1.ebuild
deleted file mode 100644
index 735dfba08105..000000000000
--- a/net-libs/xrootd/xrootd-4.11.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=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="Extended ROOT remote file server"
-HOMEPAGE="http://xrootd.org/"
-SRC_URI="http://xrootd.org/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples fuse http kerberos python readline ssl test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="acct-group/xrootd
-	acct-user/xrootd
-	sys-libs/zlib
-	fuse? ( sys-fs/fuse:= )
-	kerberos? ( virtual/krb5 )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
-	doc? (
-		app-doc/doxygen[dot]
-		python? ( dev-python/sphinx )
-	)
-	test? ( dev-util/cppunit )
-"
-RDEPEND="${CDEPEND}
-	dev-lang/perl
-"
-REQUIRED_USE="
-	http? ( kerberos ssl )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-PATCHES=( "${FILESDIR}"/xrootd-4.8.3-crc32.patch )
-
-# xrootd plugins are not intended to be linked with,
-# they are to be loaded at runtime by xrootd,
-# see https://github.com/xrootd/xrootd/issues/447
-QA_SONAME="/usr/lib*/libXrd*-4.so"
-
-pkg_setup() {
-	use python && python_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_CRYPTO=$(usex ssl)
-		-DENABLE_FUSE=$(usex fuse)
-		-DENABLE_HTTP=$(usex http)
-		-DENABLE_KRB5=$(usex kerberos)
-		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_READLINE=$(usex readline)
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc; then
-		doxygen Doxyfile || die
-		if use python; then
-			emake -C bindings/python/docs html
-		fi
-	fi
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doxydoc/html/. )
-	dodoc docs/ReleaseNotes.txt
-	cmake-utils_src_install
-	find "${D}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die
-
-	# base configs
-	insinto /etc/xrootd
-	doins packaging/common/*.cfg
-
-	fowners root:xrootd /etc/xrootd
-	keepdir /var/log/xrootd
-	fowners xrootd:xrootd /var/log/xrootd
-
-	local i
-	for i in cmsd frm_purged frm_xfrd xrootd; do
-		newinitd "${FILESDIR}"/${i}.initd ${i}
-	done
-	# all daemons MUST use single master config file
-	newconfd "${FILESDIR}"/xrootd.confd xrootd
-
-	if use python; then
-		python_optimize "${D}/$(python_get_sitedir)"
-
-		if use doc; then
-			docinto python
-			docompress -x "/usr/share/doc/${PF}/python/html"
-			dodoc -r bindings/python/docs/build/html
-		fi
-		if use examples; then
-			docinto python
-			dodoc -r bindings/python/examples
-		fi
-	fi
-}
diff --git a/net-libs/xrootd/xrootd-4.12.0.ebuild b/net-libs/xrootd/xrootd-4.12.0.ebuild
index 6acdc5a472ee..414f5edd4dc1 100644
--- a/net-libs/xrootd/xrootd-4.12.0.ebuild
+++ b/net-libs/xrootd/xrootd-4.12.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://xrootd.org/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples fuse http kerberos python readline ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/xrootd/xrootd-4.12.1.ebuild b/net-libs/xrootd/xrootd-4.12.1.ebuild
deleted file mode 100644
index 6acdc5a472ee..000000000000
--- a/net-libs/xrootd/xrootd-4.12.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=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="Extended ROOT remote file server"
-HOMEPAGE="http://xrootd.org/"
-SRC_URI="http://xrootd.org/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples fuse http kerberos python readline ssl test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="acct-group/xrootd
-	acct-user/xrootd
-	sys-libs/zlib
-	fuse? ( sys-fs/fuse:= )
-	kerberos? ( virtual/krb5 )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
-	doc? (
-		app-doc/doxygen[dot]
-		python? ( dev-python/sphinx )
-	)
-	test? ( dev-util/cppunit )
-"
-RDEPEND="${CDEPEND}
-	dev-lang/perl
-"
-REQUIRED_USE="
-	http? ( kerberos ssl )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-PATCHES=( "${FILESDIR}"/xrootd-4.8.3-crc32.patch )
-
-# xrootd plugins are not intended to be linked with,
-# they are to be loaded at runtime by xrootd,
-# see https://github.com/xrootd/xrootd/issues/447
-QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1).so"
-
-pkg_setup() {
-	use python && python_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_CRYPTO=$(usex ssl)
-		-DENABLE_FUSE=$(usex fuse)
-		-DENABLE_HTTP=$(usex http)
-		-DENABLE_KRB5=$(usex kerberos)
-		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_READLINE=$(usex readline)
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc; then
-		doxygen Doxyfile || die
-		if use python; then
-			emake -C bindings/python/docs html
-		fi
-	fi
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doxydoc/html/. )
-	dodoc docs/ReleaseNotes.txt
-	cmake-utils_src_install
-	find "${D}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die
-
-	# base configs
-	insinto /etc/xrootd
-	doins packaging/common/*.cfg
-
-	fowners root:xrootd /etc/xrootd
-	keepdir /var/log/xrootd
-	fowners xrootd:xrootd /var/log/xrootd
-
-	local i
-	for i in cmsd frm_purged frm_xfrd xrootd; do
-		newinitd "${FILESDIR}"/${i}.initd ${i}
-	done
-	# all daemons MUST use single master config file
-	newconfd "${FILESDIR}"/xrootd.confd xrootd
-
-	if use python; then
-		python_optimize "${D}/$(python_get_sitedir)"
-
-		if use doc; then
-			docinto python
-			docompress -x "/usr/share/doc/${PF}/python/html"
-			dodoc -r bindings/python/docs/build/html
-		fi
-		if use examples; then
-			docinto python
-			dodoc -r bindings/python/examples
-		fi
-	fi
-}
diff --git a/net-libs/xrootd/xrootd-4.12.3.ebuild b/net-libs/xrootd/xrootd-4.12.3.ebuild
index 6acdc5a472ee..17545ef3217e 100644
--- a/net-libs/xrootd/xrootd-4.12.3.ebuild
+++ b/net-libs/xrootd/xrootd-4.12.3.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-single-r1
 
diff --git a/net-libs/xrootd/xrootd-4.8.3.ebuild b/net-libs/xrootd/xrootd-4.8.3.ebuild
deleted file mode 100644
index df36a3d62137..000000000000
--- a/net-libs/xrootd/xrootd-4.8.3.ebuild
+++ /dev/null
@@ -1,119 +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 cmake-utils python-single-r1 user
-
-DESCRIPTION="Extended ROOT remote file server"
-HOMEPAGE="http://xrootd.org/"
-SRC_URI="http://xrootd.org/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples fuse http kerberos python readline rbd ssl test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	!<sci-physics/root-5.32[xrootd]
-	sys-libs/zlib
-	fuse? ( sys-fs/fuse:= )
-	kerberos? ( virtual/krb5 )
-	python? ( ${PYTHON_DEPS} )
-	rbd? ( sys-cluster/ceph )
-	readline? ( sys-libs/readline:0= )
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="${CDEPEND}
-	doc? (
-		app-doc/doxygen[dot]
-		python? ( dev-python/sphinx )
-	)
-	test? ( dev-util/cppunit )
-"
-RDEPEND="${CDEPEND}
-	dev-lang/perl
-"
-REQUIRED_USE="
-	http? ( kerberos ssl )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-crc32.patch
-	"${FILESDIR}"/${PN}-4.8.3-Werror_only_Debug.patch
-)
-
-# xrootd plugins are not intended to be linked with,
-# they are to be loaded at runtime by xrootd,
-# see https://github.com/xrootd/xrootd/issues/447
-QA_SONAME="/usr/lib.*/libXrd*-4.so"
-
-pkg_setup() {
-	enewgroup xrootd
-	enewuser xrootd -1 -1 "${EPREFIX}"/var/spool/xrootd xrootd
-	use python && python_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_CEPH=$(usex rbd)
-		-DENABLE_CRYPTO=$(usex ssl)
-		-DENABLE_FUSE=$(usex fuse)
-		-DENABLE_HTTP=$(usex http)
-		-DENABLE_KRB5=$(usex kerberos)
-		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_READLINE=$(usex readline)
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc; then
-		doxygen Doxyfile || die
-		if use python; then
-			emake -C bindings/python/docs html
-		fi
-	fi
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doxydoc/html/. )
-	dodoc docs/ReleaseNotes.txt
-	cmake-utils_src_install
-	find "${D}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die
-
-	# base configs
-	insinto /etc/xrootd
-	doins packaging/common/*.cfg
-
-	fowners root:xrootd /etc/xrootd
-	keepdir /var/log/xrootd
-	fowners xrootd:xrootd /var/log/xrootd
-
-	local i
-	for i in cmsd frm_purged frm_xfrd xrootd; do
-		newinitd "${FILESDIR}"/${i}.initd ${i}
-	done
-	# all daemons MUST use single master config file
-	newconfd "${FILESDIR}"/xrootd.confd xrootd
-
-	if use python; then
-		python_optimize "${D}/$(python_get_sitedir)"
-
-		if use doc; then
-			docinto python
-			docompress -x "/usr/share/doc/${PF}/python/html"
-			dodoc -r bindings/python/docs/build/html
-		fi
-		if use examples; then
-			docinto python
-			dodoc -r bindings/python/examples
-		fi
-	fi
-}
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index e66c50d50c82..8527c595409f 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 43355839a328..c9f2e29045d4 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -7,7 +7,7 @@ AUX fetchmail_at.service 289 BLAKE2B ab28a4b96625404f5451aa2dd37b671a18d7bf72bb3
 DIST fetchmail-6.4.1.tar.xz 1257488 BLAKE2B 101a7c2da7374eb180a4afd576bd436e074241b2071107676330e1773a33035a20f406e3dd1e0f1a280887b4556f68fc6c87be1eabf9b7e3003dff4cc740eebb SHA512 940b8df52f963f71537962ebe2b2cb88298fd2b54ca79932e5c974abe850f0b59cdc4919d606ee4f210e82d1e0a6f090ea87f1d3bdea18b531d4fbb36f7f9ea0
 DIST fetchmail-6.4.6.tar.xz 1262256 BLAKE2B c5abb5b8b80f2cd61fd3c6c38956c753bb74597c585974d5529c8c7665ef13483b4292c1247df43f8702f8bd3b055b8f77bdfc2ae620bea170e8bd457fec9a49 SHA512 0101c79039c754b55e94181fb6c51f07782e581123e25ac72a99c2abe8f3ac4af3e97b12bab50813fb9300179b921c80d0bc60f528ad73c914ad266e29fb6513
 DIST fetchmail-6.4.8.tar.xz 1282300 BLAKE2B 31b7f9fa31edff534210a2a0764cc6dec461968071a8aa29b1d1e9915ff6b8d2949b128f97d72fafe6d431b06d4e5c6b38d4a3cdba06736bdf8ec1879a991798 SHA512 c1052389baafa3a48186733133130bf69b87c8dda8faa00e82f5947037845b95d3271c8183df729728a351888175174ca11eb18f9adb8b3515860cba95ab8987
-EBUILD fetchmail-6.4.1.ebuild 2603 BLAKE2B 68ba1e7d628a167658315341dddb67812d89640d454c674f49089894b34c1a217259201c61a8cf095e1b97ca4c0a2fd490b6be3bf8d9bcb27a40fa37741009de SHA512 811ad64d8a0f27da0b71bf086c8674191b68e7bdbf0f0c4154dc0d077dede58bc99b9f6c1ec5fd9cae887f97ee4b8fd4f3b560f419d3289715618d33b963636a
-EBUILD fetchmail-6.4.6.ebuild 2511 BLAKE2B 405af4d6378351ee89dcaab7737bf86d55601941849d8935f8d9b4277db614f0fe1b257d24103d4ef0f1b1c75ab7b1c98407e4888bed444d4bf9ad6459d79315 SHA512 10c089f1d4978ef08a52611f40074f8c203e3570e4c4f6f759041725c7b7431ef4b7194cadb3982e26d96137cb9884409d03b464ee4a886fd52219d4f9072037
-EBUILD fetchmail-6.4.8.ebuild 2511 BLAKE2B 405af4d6378351ee89dcaab7737bf86d55601941849d8935f8d9b4277db614f0fe1b257d24103d4ef0f1b1c75ab7b1c98407e4888bed444d4bf9ad6459d79315 SHA512 10c089f1d4978ef08a52611f40074f8c203e3570e4c4f6f759041725c7b7431ef4b7194cadb3982e26d96137cb9884409d03b464ee4a886fd52219d4f9072037
+EBUILD fetchmail-6.4.1.ebuild 2604 BLAKE2B 87cd29799760d4ebf46e5da0539b7bdc6d9f8d46b7cf74708e3e4c58d5bd495758b7bfe480d86ff7c83728e33ae7599946c62383decd8f30169197d87205647b SHA512 2c1e27730dbdf9245aed882f31e663975735acb3befabc1d5fadd9ea7889d50498e7adad114cf68d4d8b9ca3251a816a13d2d23d7dd187645d0c5ef3985fd6b5
+EBUILD fetchmail-6.4.6.ebuild 2512 BLAKE2B cf7c5298c4cfafe328b92e94cb3563a1d6ccce7850152fd61e8d5a19505bb4d7c809a5830ade28c6fe3b0aeddd62dba625fc258c5ba478577fbc45da5d683c3b SHA512 f0d42322c6a97bad84b73212db5e2308cbd04f6d511cf27e1f93517f0d32c7e462a74b341548414bc6bdb7562e29270f9018ba021179b4ae829ee09f32901dcb
+EBUILD fetchmail-6.4.8.ebuild 2512 BLAKE2B cf7c5298c4cfafe328b92e94cb3563a1d6ccce7850152fd61e8d5a19505bb4d7c809a5830ade28c6fe3b0aeddd62dba625fc258c5ba478577fbc45da5d683c3b SHA512 f0d42322c6a97bad84b73212db5e2308cbd04f6d511cf27e1f93517f0d32c7e462a74b341548414bc6bdb7562e29270f9018ba021179b4ae829ee09f32901dcb
 MISC metadata.xml 521 BLAKE2B 8e33fe9b7e4e041ed3990e710b9d903cb6284d4ea9675ae781a0b73aa404c97f39718baccfa9441f388848fe82d2e97e6aaba602df4a8d1f6cbc1093081a718d SHA512 e7efcf6511fa7467455e9af104d83f814ee2342a6956ae5b98b39319ddc3b431d8255e5755fa447f3a20ad5caffe8810f343245239657af211e177dd39a7d974
diff --git a/net-mail/fetchmail/fetchmail-6.4.1.ebuild b/net-mail/fetchmail/fetchmail-6.4.1.ebuild
index b96439961dbe..26040d1b23e1 100644
--- a/net-mail/fetchmail/fetchmail-6.4.1.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="tk"
 inherit python-single-r1 user systemd toolchain-funcs autotools
 
 DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
-HOMEPAGE="http://www.fetchmail.info/"
+HOMEPAGE="https://www.fetchmail.info/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2 public-domain"
diff --git a/net-mail/fetchmail/fetchmail-6.4.6.ebuild b/net-mail/fetchmail/fetchmail-6.4.6.ebuild
index 0688fb62856d..657ffb71fe6e 100644
--- a/net-mail/fetchmail/fetchmail-6.4.6.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.6.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="tk"
 inherit python-single-r1 systemd toolchain-funcs autotools
 
 DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
-HOMEPAGE="http://www.fetchmail.info/"
+HOMEPAGE="https://www.fetchmail.info/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2 public-domain"
diff --git a/net-mail/fetchmail/fetchmail-6.4.8.ebuild b/net-mail/fetchmail/fetchmail-6.4.8.ebuild
index 0688fb62856d..657ffb71fe6e 100644
--- a/net-mail/fetchmail/fetchmail-6.4.8.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.8.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="tk"
 inherit python-single-r1 systemd toolchain-funcs autotools
 
 DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
-HOMEPAGE="http://www.fetchmail.info/"
+HOMEPAGE="https://www.fetchmail.info/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2 public-domain"
diff --git a/net-mail/list-remote-forwards/Manifest b/net-mail/list-remote-forwards/Manifest
index a7ff3c8d5134..f8197313c0bc 100644
--- a/net-mail/list-remote-forwards/Manifest
+++ b/net-mail/list-remote-forwards/Manifest
@@ -1,5 +1,4 @@
 AUX list-remote-forwards-0.0.1-ghc84.patch 978 BLAKE2B 295f2ca369794739da3ff45bf6a5ca57b102942c93b8dd8c4e99d9a70906a469c761aa0fdbe50311d6e56d5bb0725610dd473c49152f4cdd3462cd2da2a8418d SHA512 4f9addb938b14590d98e4e17e6764987ebe4192d7492de1ce2c917881ec20ecd15898988c223dac695ed8f71d7b2fe74f8b798a52960f215fd4c9c9a02c9a72e
 DIST list-remote-forwards-0.0.1.tar.gz 25869 BLAKE2B decfd8b5d4fcbd5e278f9c58f79687aa33cc91d4d4907ff7a29fe6b745ff49c073e3beaf2876ec071f4ed1099b4575cacb8194049add04c0aa8ebeff3338293e SHA512 b6d8c0e8a72e3dcbc62c00b291da99da6c37c853997c367eb60db128db327c1f862e9dc6d9ad4028aad2e0cec9acc96add28d85d4b22508e1fd00a65bb9b0317
-EBUILD list-remote-forwards-0.0.1-r1.ebuild 994 BLAKE2B 390cc3ae12fb933b6fce5635908c31677a46486edfc288b936c57402679968c53dafca811ad053c992df1c4702feb8656863bec3bae17af9d1b8f9b36109802f SHA512 fb0b1a2f5026d2e178acd60c60bf9a0b8394f01f95ad3853dc163ad011c305d281b01a718e5e16b9cb8c208c7d9c67541c9709aae9ca0a59c914a2fc9d612d0e
 EBUILD list-remote-forwards-0.0.1-r2.ebuild 1101 BLAKE2B 6e632191a0332dd74eb6d0edd5c922577ecd70b3d6c91031cb9ec4b96a1ba548560534cd243bd785f3d7d8c3f2f92701a2435d0134849391a72b52bc7e170b22 SHA512 2997d82a3c25e21ef173231fa4e52afee4acf6c175e76fedf695b564ab614370b770057d7e84f3dd4ee5632b350a03914e9a7d9c6a52e77a519717fc387b7f65
 MISC metadata.xml 4175 BLAKE2B 183538e85d540850e8176fb6c2a6a24dd0dfddeac8bf9b9ee684b11ef8ddb54c58e5a0292f67e72c15264880fcd68d253b48c3ca70bf0b8110b9cc8d58438186 SHA512 a6cb86568d00776106d194639bfbabec5e753e8bcc5c4b1c2f50f25f1202865ea45a946e55de5bc41a79ad7a18c8d9442ec7e964065a1b00fa0c5937177ee9e4
diff --git a/net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r1.ebuild b/net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r1.ebuild
deleted file mode 100644
index 0c3763e369f5..000000000000
--- a/net-mail/list-remote-forwards/list-remote-forwards-0.0.1-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=6
-
-# ebuild generated by hackport 0.4.4
-
-CABAL_FEATURES="bin test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="List all remote forwards for mail accounts stored in a database"
-HOMEPAGE="http://hackage.haskell.org/package/list-remote-forwards"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	>=dev-haskell/cmdargs-0.10
-	>=dev-haskell/configurator-0.2
-	>=dev-haskell/dns-1.4
-	>=dev-haskell/hdbc-2.4
-	>=dev-haskell/hdbc-postgresql-2.3
-	>=dev-haskell/hdbc-sqlite3-2.3
-	>=dev-haskell/missingh-1.2
-	>=dev-haskell/tasty-0.8
-	>=dev-haskell/tasty-hunit-0.8
-	>=dev-haskell/tasty-quickcheck-0.8
-	>=dev-lang/ghc-7.6.1
-	test? ( >=dev-haskell/doctest-0.9
-		>=dev-haskell/filemanip-0.3.6 )
-"
-
-src_install() {
-	haskell-cabal_src_install
-	doman "${S}/doc/man1/${PN}.1"
-}
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index 323e3ae15b1f..dcd42e5893d3 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -6,11 +6,13 @@ AUX mailman-2.1.9-icons.patch 555 BLAKE2B c000931d44321f0eb9fabdf1a49cfcd05b2c68
 AUX mailman.rc 488 BLAKE2B 76f35e4e1a5257b6aa058b0cea29cf53640322d436a195140cd71b7bc749d4205fc4555b611b1713663604c08ca929b3aa57d60355d8e9e5e9b7056b9dc1c5f1 SHA512 bb97f6fec48cf474be66c1aa73adc874ceaeee894acc3fad76f4b3f5e6f82dcd4238a6915de941fe87f815668dfb6c5ffe90926c5aaaddedf7dc06dfa4c1a126
 AUX mailman.service 288 BLAKE2B 64dad97b16458f9d9b64f249f9096e4217ce78e9a33e9d3ea55ef27d11daea102a1ecae30ddda095c1bbf1b175def17b9ad2db5a3e0b8e694ab02ed94a557e87 SHA512 c4a5532666afbebc5aa69463ec9b9eaa2dcb03fdd8fd62307920a4572d0c795c1d93478236240746018be617c0eec0fcfcc1c711e8810140fb8ffbc0a9b71009
 DIST mailman-2.1.29.tgz 9376258 BLAKE2B 63ae740abed79d2887eef35ddfd8b51f22ee984a0eaacddeb34afb8147c0d239e5eaf93579face987b3c604653fed4c13233de78298914b4eacf5a33f769a997 SHA512 ed25179a4580092629890664c5502908b20e326c2ed06ad4e597fb4e8de84076c369ecd7a272be5ed8a1cb4479413d0e004d87804de763ee850e4d04d9a83376
+DIST mailman-2.1.33.tgz 9412979 BLAKE2B 1018ee5b2993658117ac5a1d76e1742c5e27cef69ba2892e8f56897f6c00394b1b479b3fa00855f78211844bd531a5ac1e5ac8c9d16763dd49303ab3690edc0c SHA512 1e7bb58a9d38e5171f682563abb0b23fcb0a7423e0e7fa883326815ada37ffa8074845ea70fad4ea29fa098a6e7203e259caf57532e09a0f7c05120f89dd83a9
 DIST mailman-3.3.0-importlib_resources-fix.diff.xz 2120 BLAKE2B d455a88a922fe715cb3e3faf6d7f94115ab0e762b85a3195988c9bcb0d01b37d4495e4c30c566f10f65f47c55f18c8af46e21037fca042503167238c88e1ff77 SHA512 31e6f71ff700a3e648b78b75808ac40b333ed58f3d51819b959f48ef4598f0e5d07d3b4fc178745702c02fb3137941c9887a6bd1cdd9ea7d18cd50d32da6c57f
 DIST mailman-3.3.0.tar.gz 839241 BLAKE2B a9f972a5cd09be6e971b568066cf67980c050fc619bc0bba7956d65b9601613f2dd87bbf243072be2478367e2fecfd48b184dada6fc525dae8cf1414dc64cec0 SHA512 63cf30c102751c1cae086f4c046767c2d817ad57097bd60bc838ead19c4e29ed1bc5d4cc2c1eef40f41787daf60d8b98033f64064d6ad4567a9552b5fb2cabd8
 DIST mailman-3.3.1.tar.gz 1184548 BLAKE2B e9bf5cec5fec75ae01093003fa9b128f9415c55cc505eda841a807d72177d17dc7609e1e0c20305f5f38c40e01745b4cbc58d1c5ddc43d0799ec601bde92cb54 SHA512 31dc5d0fca7f28579a1e174010ea8ac83d17b5e7ace37f3a86fb73110de412af145a9c3d16cf7b446f80e44a3419b51cce7b56b8de93264751cf771b2c084ddc
 EBUILD mailman-2.1.29-r3.ebuild 5863 BLAKE2B ce55af2241c9ace4519e33da2fcfcdea4bd5fe04f17a4e075519e73f7153ebe1f385a4663a7042f720a28e96068bcfcbe28aedcd3d88e28a670a942dedf5a2ee SHA512 b221b40ad1dbece603eb7efd175cc52a66a5e298ae4b2e78dcef387f13a82b9597a0e0cf23bb4b052d5f63e911a307c0984a5e96098328743e3fb68a3971ba6a
 EBUILD mailman-2.1.29-r4.ebuild 6036 BLAKE2B 5c600f87ab4772e05800077ef0a320ad0f725ede719e93b8a0cf444f9bf80a7bd5f22b5331976584eb5e33c163d9db00ce9aa5c58a4ce99a2388b1786bf7e3a1 SHA512 06184706205800d5b48e888d2e98f86e9bc736288421625f13b90ebdf7cfc4c7ecbe35c0796576404c822ccf321ab248d5f0da040a5723fcd123ebfbdfef1b4c
+EBUILD mailman-2.1.33.ebuild 5866 BLAKE2B e3ede50fae262f888356a97c358b9c7f22441a94f32365af2660014edfcf240ad22cd13ccb1e74ceb65179b402fd7ba6cdd5be0d534a8a779215bc2b256c779c SHA512 257e8f5a5c34fc6c14847f82974648fded3c7ee3d52ff0124f35fc3ed76bd8f94e9e31883aca8a87d66b72b30d157997160864ed62f20d0c57bce09c500f09c6
 EBUILD mailman-3.3.0.ebuild 1742 BLAKE2B b528851e4d73acdcf459b0eae5224d3ef0ba14a7c13c3f9b92ab53e089dcc0ea2d23ce87fafd6aa1c4d5149d581e751010f0ace2ec1037d567027da13a18c416 SHA512 495fe29c164075fd7a4b85cba712115ea3e9193212a6e048febaf2b5ce1a719a765e99efeb17984659a03c3a93dc7c20a48df5c10a1e6a01667aaa6bb623c64a
 EBUILD mailman-3.3.1.ebuild 1474 BLAKE2B ff1f4e9c30bb04449413f387c37d0e3dabf62895ce8bdba42208ca2f85d0071e4320df2cae180ca1f62d880a6a3f67f5fa846de4534704369cedfa5b5adc89fe SHA512 afe16caa2ec32a4ded2acc05063393884c0409071a82505bc2efaff15941c8cbd03bb43a81a572a2cc7fc15ddd92cc1a86ac9bbdb2101a449dd1830c694871b7
 MISC metadata.xml 293 BLAKE2B 374d60f4c201126bc672a15e1d2cc0e8ddac567760932fd51bf0abd758378c92d9c0c9bba81fdee2d30cfcf14c067f46a38e1b55f3ca09ed3c002316b48c1b74 SHA512 9be4ca21301ae46b1c80f63b365a69a855858f3b0f51b5f5dd88f572cce940f068d6de17261de1828b068bbef9061124840b66bd370e120c73b3589048653b8c
diff --git a/net-mail/mailman/mailman-2.1.33.ebuild b/net-mail/mailman/mailman-2.1.33.ebuild
new file mode 100644
index 000000000000..fda789269651
--- /dev/null
+++ b/net-mail/mailman/mailman-2.1.33.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/mu/Manifest b/net-mail/mu/Manifest
index 6f191889c808..db649a4cbb80 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -5,6 +5,7 @@ DIST mu-1.0.tar.gz 2273670 BLAKE2B a771b00159142fa4a671d07cf9de6f0f941c432ddee31
 DIST mu-1.3.5.tar.gz 2305222 BLAKE2B ff6025cf053d7c2880855ec32953a2881ce8bc7d468082f13e45e7684dd41bd7906cbc9a619fd27bd4860bb953e4a547c3d22ea9a7fb4c645825c755ee33b5f9 SHA512 5d7eccec296affbe6e2e31d2204672f8ecac43f1a0c93673f983378fcf7ad8a050662097ec58603251eed31b499054d6c453a2a4e2c70dfdd896c430559b95c0
 DIST mu-1.3.6.tar.gz 2305653 BLAKE2B b9a556c1b374e0b72b6b0c40beba581dc3fe0e0a654a881db3a47582481ef00831e18bcd771e24b231ef843e97f14f7401ad8d041c077617b865f1fa971d1a0f SHA512 c889dc3fc1b7f1333f2adc3891f23ea8977c77ac6af532fec37c6570b4fbb2ce8dda0776568d61dedfa34f0519bb5bba89b90002503c3191a0d633ecfb9d5c87
 DIST mu-1.4.1.tar.gz 2311134 BLAKE2B 4d44032874217167d46a68b1c837fb443dc860f1eb1f698c08d3731c131e196483028b0eee8bec13bbec71eeab6df1146013beb00b31824630154e14af914c09 SHA512 9a6d20a814f0cdf7c0a04e0e4a22210a12d539d9be713be8f689f2ed3ba39eaf9da7d1969a10f47af1a201cc23e91696e379cfcbd5d6586aea5e83997ba3e043
+DIST mu-1.4.10.tar.gz 2309459 BLAKE2B 38aa09e1efd788f1ed0d490dfba04bf4f3fccf1eb40d22d2d205934ab6d71ec8739d1baa019ba4c9a0593a0d9487533a46048f71be042178bd33bde6130cbb80 SHA512 59c06e1a0bc893c7dcf5e758dad15be80667be8bb914e97f16158709ebfd50ca29b3a27934bc2df29cc378ce17a3778c5c44738703aa77f5bde21050abb6eb0c
 DIST mu-1.4.4.tar.gz 2311600 BLAKE2B 1953dc9e63fe013af2821a58fde0222d3d7b61266807bb95345aff7c6e3f988fa6589bcca79612bd64296f50e2b4feda62cc3f4aa4d731f3f4cebe4e3a21cceb SHA512 db317706956304df9e0c6d53ce9b2bf444f5fc66903deb8ac13c8d771ada016d009e3b10d8bf76cfeda1d712fa3e23bed70362334231cccfc072bc181c6660e5
 EBUILD mu-0.9.18-r3.ebuild 1775 BLAKE2B 87146e9495664d360ccb98a7693e24a7498200cd80c2e565d55f139a3039f7ed48dc448f2c4eb1f14242b6054ba3e696e9b76fb5b7d60d1a86c3bf576ac6e2d4 SHA512 87321aacc6dd25ce0442fe5ef161433bbb039c58b4c4424f94d893377a5f5ff7b4358ffef67162a94544452c2d49e3da6bcdd3799ac1d8ef86fc8263654c71ad
 EBUILD mu-1.0-r1.ebuild 1778 BLAKE2B 85c611bc38bb40c202d3b39fe2d8a2e0fc3ee1c1aa5a45c892d19a0c5986d7cd973f8699f5090c1754220db43c7a9dd0587862112b70cd192a75d16fdc487a8a SHA512 aa0fee0bdd2d8596cd1da4dcc11f70c0e5f73a03007777f36a0367964f8a1aae8cc7200fff1de374f8d7c3f9f8121a173ecda6f6b7f932a3a2ba5bba2c63f7a0
@@ -12,5 +13,6 @@ EBUILD mu-1.3.5-r1.ebuild 1962 BLAKE2B 68dfb86a7ca8877c1ab359f3d82857809c2267aca
 EBUILD mu-1.3.6-r1.ebuild 2029 BLAKE2B 06f2f1e5c73faeef1e45e7b3331e1aa6354b092f8d9daa893871aed2d5f301373feb7832229fcd04552cf155863a1c62e74521df1d6d48bff19716a0330b62e6 SHA512 5b32ea81343b7735c48d31cd6eba23f3b865c39e3e181d7268ec17a8ae8f458e7d3bea45195fee30728b8031434ba529e9adfab8b2395c9ea06d57b4c7e56847
 EBUILD mu-1.3.6-r2.ebuild 2040 BLAKE2B 102104b3d404a8b50ee6696baae778b7b3804117882c9c73f1c83e7dcdc813c07b656f6c048c7adf99e4dbb7e4fd46e8453a8b703f811cc0440e454d9712478a SHA512 8e81d83618b663cc894fe8be870a0bb76e0f502e42c08f59a9dd7736fd0b38fda116db2b81e53b826994a63dd3c278221ba2c676b2da270ab1944d72f0b82373
 EBUILD mu-1.4.1.ebuild 1784 BLAKE2B 27466207a50c1f175b56d6ff17f775fa644b884074d9914e32ae81c7f1887a1e140225a5f2d8875dc5cd18db7563ce58577082d00ad039c54d25207e76499e17 SHA512 e1aad3af510eb9be475b0e983048d63fd0ad007cfe178265daada05be7bd32edc70c9be8a4b097a5a26bf5a2ad0c970565cd33350cd77534ba4320750cfa8018
+EBUILD mu-1.4.10.ebuild 1786 BLAKE2B 36766ba266400ab63b36a986f121de47802f9fb46f7fafaab41af1b40ae2cb2c0bfb34edb3cb0f75bbe1926dbdb4f0309afd64c92cb18553711c35b44b96d8aa SHA512 9e89d8989a8c90d2ab14ad99ece718fa78118cbf53563f580be9b67b50700400fb2c96b0e1995390446c5a1f62af28ad926c716a80f5beaf380311c91b123453
 EBUILD mu-1.4.4.ebuild 1786 BLAKE2B 36766ba266400ab63b36a986f121de47802f9fb46f7fafaab41af1b40ae2cb2c0bfb34edb3cb0f75bbe1926dbdb4f0309afd64c92cb18553711c35b44b96d8aa SHA512 9e89d8989a8c90d2ab14ad99ece718fa78118cbf53563f580be9b67b50700400fb2c96b0e1995390446c5a1f62af28ad926c716a80f5beaf380311c91b123453
 MISC metadata.xml 895 BLAKE2B 2a8d3f5aa6673c03df5bcf495aded3bb07316b4833ed84ec3e2d7030f5cbab8333865da6a4bd67bc8ee69e39bc6540d4a77bd7ddf3b1b9fdd7b5a6dfb7278fe6 SHA512 e5e1e9f3084189fbdbc8fb55127b8b3eec4acd7685b0d4c9ab564644f21fcc53520b89f7ced7bb3972c13d577a030175a9665d30ba513112125409082a7ad7c0
diff --git a/net-mail/mu/mu-1.4.10.ebuild b/net-mail/mu/mu-1.4.10.ebuild
new file mode 100644
index 000000000000..99919703af77
--- /dev/null
+++ b/net-mail/mu/mu-1.4.10.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common
+
+DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
+HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
+SRC_URI="https://github.com/djcb/mu/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs guile mug"
+
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/gmime:3.0
+	>=dev-libs/xapian-1.4
+	emacs? ( >=app-editors/emacs-24.4:* )
+	guile? ( >=dev-scheme/guile-2.2 )
+	mug? (
+		net-libs/webkit-gtk:4
+		x11-libs/gtk+:3
+	)"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+SITEFILE="70mu-gentoo-autoload.el"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable emacs mu4e)
+		$(use_enable mug gtk)
+		$(use_enable mug webkit)
+		$(use_enable guile)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	dobin mu/mu
+	dodoc AUTHORS HACKING NEWS NEWS.org TODO README ChangeLog
+	if use emacs; then
+		elisp-install ${PN} mu4e/*.el mu4e/*.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		doinfo mu4e/mu4e.info
+	fi
+
+	doman man/mu-*.*
+
+	if use guile; then
+		  doinfo guile/mu-guile.info
+	fi
+
+	if use mug; then
+		  dobin toys/mug/mug
+	fi
+}
+
+src_test() {
+	emake check
+}
+
+pkg_preinst() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog "After upgrading from an old major version, you should"
+		elog "rebuild your mail index."
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		einfo "To use mu4e you need to configure it in your .emacs file"
+		einfo "See the manual for more information:"
+		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
+	fi
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 93309f480957..186b6d0e7b2a 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
index bc9d34e2f877..4c786b880232 100644
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -1,6 +1,4 @@
 AUX initd-bird-2 1169 BLAKE2B 399481b20099d54f4a4f0cbffa2d9d080f090e15fa1bb9e0613469d94a895fcff3708983defe6d9be181f11ad18598e7e36d411cfc8e07b59c78a74890b5c1c3 SHA512 42224f1ac8ac53be1e0f2d30ecba0fa9ac491494bb6b6147940455538623082f4111731463daec15cbc7c10a90c440d36e27eaab1193f9385488ab6683e15f55
-AUX initd-v4-bird-1.3.8 801 BLAKE2B 09d9045299972580280fbb6d8745378a75b3a9e647b965d9033e6493df67ea268afba8ab95c46208894f330ff3607d90502653072eb73c130d1841cab9e604c2 SHA512 e878792e589317b743c53fa9fd1f5a4e04c6c97a64946a3e47a910c35d32ad265dcd860935e91950cddb97e1f6ab43c02157a5349e4bd4529cdd1539ca7cf879
-AUX initd-v6-bird-1.3.8 802 BLAKE2B a9dc698f9dfde93314fe1b0f4c8005d9b5f14e4133ebad124f4283a50d990c946bda88b1d55227ed6bf9f33caf0d716b0a8540adf592fbf156297c20ab8a3b1c SHA512 6adb2b7c22696e53644bb5331bcb1b6e84026e41086f6f538c40073a7daa3b0ce3a14e041c2615a72cbe151d6fa8f81b543f85d421f019440ef5b6fd0a556ad9
 DIST bird-2.0.7.tar.gz 1993395 BLAKE2B ceb88d811d254e57e089ef4b4e1e4f34fd96d4622d9f5563cc8694323c060e99d6cdfccfeb5d8c885b9431dc71e96d5cc04e4344901a7c7d899f4249e7503720 SHA512 48ca63be923285dd282e80d7e2b240256953fd7ad4f6eaa5dcba2648f3f148be20198bc8c6e7e888aac1588ecb005a4f4c03e979853e76ea6f8680643a874b35
 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/files/initd-v4-bird-1.3.8 b/net-misc/bird/files/initd-v4-bird-1.3.8
deleted file mode 100644
index c7c6a0b63af7..000000000000
--- a/net-misc/bird/files/initd-v4-bird-1.3.8
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-
-EXE=bird
-SOCK="/var/run/${EXE}.ctl"
-
-depend() {
-	need net
-	use logger
-}
-
-checkconfig() {
-	if [ ! -f "/etc/${EXE}.conf" ]; then
-		eerror "Please create /etc/${EXE}.conf"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	checkconfig || return $?
-	ebegin "Starting BIRD"
-	start-stop-daemon --start --exec /usr/sbin/${EXE} -- -c "/etc/${EXE}.conf" -s "${SOCK}"
-	eend $? "Failed to start BIRD"
-}
-
-stop() {
-	ebegin "Stopping BIRD"
-	start-stop-daemon --stop --exec /usr/sbin/${EXE}
-	eend $? "Failed to stop BIRD"
-}
-
-reload() {
-	ebegin "Reloading BIRD"
-	start-stop-daemon --stop --signal HUP --oknodo --exec /usr/sbin/${EXE}
-	eend $? "Failed to reload BIRD"
-}
diff --git a/net-misc/bird/files/initd-v6-bird-1.3.8 b/net-misc/bird/files/initd-v6-bird-1.3.8
deleted file mode 100644
index 94ba4426e5dd..000000000000
--- a/net-misc/bird/files/initd-v6-bird-1.3.8
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-
-EXE=bird6
-SOCK="/var/run/${EXE}.ctl"
-
-depend() {
-	need net
-	use logger
-}
-
-checkconfig() {
-	if [ ! -f "/etc/${EXE}.conf" ]; then
-		eerror "Please create /etc/${EXE}.conf"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	checkconfig || return $?
-	ebegin "Starting BIRD"
-	start-stop-daemon --start --exec /usr/sbin/${EXE} -- -c "/etc/${EXE}.conf" -s "${SOCK}"
-	eend $? "Failed to start BIRD"
-}
-
-stop() {
-	ebegin "Stopping BIRD"
-	start-stop-daemon --stop --exec /usr/sbin/${EXE}
-	eend $? "Failed to stop BIRD"
-}
-
-reload() {
-	ebegin "Reloading BIRD"
-	start-stop-daemon --stop --signal HUP --oknodo --exec /usr/sbin/${EXE}
-	eend $? "Failed to reload BIRD"
-}
diff --git a/net-misc/bridge-utils/Manifest b/net-misc/bridge-utils/Manifest
index 6a3a20bb2e95..86a0af6c102d 100644
--- a/net-misc/bridge-utils/Manifest
+++ b/net-misc/bridge-utils/Manifest
@@ -3,5 +3,5 @@ AUX libbridge-substitute-AR-variable-from-configure.patch 942 BLAKE2B e1835eefb9
 DIST bridge-utils-1.5.tar.gz 33243 BLAKE2B 211ecb831f802c119f32c30621daa781056bd9ff2fb5880d328704bd76b5b5b964d0671f77489fb9c71f25a3e073e5e4070cfa759deeba014aa1136ff60b1fdd SHA512 4e525fbd3defb509664ef3b728d9e5edfb92beaebdb5d7733d8203fb38cb3f4bb54d02dc1e28813889a2ee19c78b9b47da6d99c8032481a7fd7f104658dea7c3
 DIST bridge-utils-1.6.tar.xz 29904 BLAKE2B 4a816d2855a8f127dca3a19df326863848d36032c881a9093cd98b88f701d70486a9488e9761869629f29c6f5bc14305388eac3c22393a3e60dfdb3c9c4dda10 SHA512 b2ed39bc67349b7b91f2068cb505c0e3c89a8797d61e3d97ff957796cfe5fcef2c26dd788bd4215f628d69a4c8592377f4e632c3e181e87af3eaa238d8741e02
 EBUILD bridge-utils-1.5.ebuild 1319 BLAKE2B fb76d4f17be11bfa531e2f43c2cefa72f5077befdbf2d4ed75f5f7722379fc082810c25d3f360be56ce4e4a69e79a4761343798137d8a34514b466d652ee7f9e SHA512 5d360cfd301b69732fa8a2f713673c776e24a3bf5963044b53ae87e86ca768aebd6c56462083bd33488d5593097bab7a655f5eea70d22a526df0b74e707395f2
-EBUILD bridge-utils-1.6.ebuild 1443 BLAKE2B 411e0487cacd73875ccbdba90d962f298240f04cefeec9a36eb90db23da8b3c51fd8aac8bda73b922d79c18b32d4524d41810dba1fd04cc7f3dc0b0353b48f9c SHA512 05dd684f3309c94cd099c19493a933e75ac7bec7abaad78e7dc91d5d246c0f6d98fb3324a529b7468804e61b4a00d79bc6954dbe10478b52d53e226193ff53bf
+EBUILD bridge-utils-1.6.ebuild 1437 BLAKE2B db6310f76e4b10f54a24bc472aa44c70fa6a9d0b45f2f87850da532b024729bbda3fea181316312d3584fd03104bbff94169f588ea67fadd5faf34f27fceae36 SHA512 324720b237f4b0ebded7892de8f348dbf0080c172aa4d8e4785480bf76a742c397ab0cf8dab12d8f3b03021429b6dde712a1950810b9fc276d119e1b1d357e3e
 MISC metadata.xml 491 BLAKE2B bf2e6636e5cd672907c0fa7a57894aadd2a56c6a86243d6894567e5819684dba5ef73419b9796d3e8e30e5d9048e13f4a11f714400f4b71dc2a61b8fee81467f SHA512 ec5ffecc293290fa0931f16fc447b5f9537d86db112462f6f865b1e4714e95c10d22fef326692d4506958956c3148061beba187e19b8549608f02ef974302bee
diff --git a/net-misc/bridge-utils/bridge-utils-1.6.ebuild b/net-misc/bridge-utils/bridge-utils-1.6.ebuild
index 11f95413077e..47491b009b6a 100644
--- a/net-misc/bridge-utils/bridge-utils-1.6.ebuild
+++ b/net-misc/bridge-utils/bridge-utils-1.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 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="selinux"
 
 DEPEND="virtual/os-headers"
diff --git a/net-misc/charm/Manifest b/net-misc/charm/Manifest
deleted file mode 100644
index ff1d5cd2f9d7..000000000000
--- a/net-misc/charm/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST charm-1.9.2.tar.gz 84927 BLAKE2B 6c1daea30a8b038a23d82567ba4e00f50a65d8faadd384d25524a29b0c5b1902f18d2d14fb2ef28b78cb1e43cb168704883719c493267a0cdacb348729a8c334 SHA512 9ea4c7411764dd1d1c87a1a19de2de3061e08e030e793ff259e80477aa5880a01f05f8a8d1ecc9b1e696111c3f3f9504f5387f535d9d52d1496d20b04c68835b
-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-r2.ebuild b/net-misc/charm/charm-1.9.2-r2.ebuild
deleted file mode 100644
index 52c66fb0448f..000000000000
--- a/net-misc/charm/charm-1.9.2-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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/charm/metadata.xml b/net-misc/charm/metadata.xml
deleted file mode 100644
index e7d7e8d65d89..000000000000
--- a/net-misc/charm/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">ljcharm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-misc/clockspeed/Manifest b/net-misc/clockspeed/Manifest
index 51a65d8e28b0..5afe918596a2 100644
--- a/net-misc/clockspeed/Manifest
+++ b/net-misc/clockspeed/Manifest
@@ -3,4 +3,5 @@ AUX ntpclockset 1100 BLAKE2B a84e6d6ec78e8d0e9be34640db9f18cb6a15dfe35c583b3f1af
 DIST clockspeed-0.62.tar.gz 25797 BLAKE2B 3e409b09dd426dbe33a1aa27e08313bafb5f682ce4fb42740b88841bad2a88b6095e3b0d178c3d2b0f338a99a8ede03e00e79ce09559dc136addfd1d1e1ceca3 SHA512 4dae1cfcfc5eb1398fd5a7642ff91987487d9828d314d4bd9f93cdadc60fe99889280a7f8e9192674ed19d246bd4a450ad32b1258e450216111c488074db7978
 DIST leapsecs.dat.20081114 192 BLAKE2B 71113068e1fce9a11b9acba1527d90f6977302b6d8042fe83522fc2fea260a15b18226bc34cd84637b00d0e58a24c24d6f9ea537f1064b82655647ad4c58e0b6 SHA512 c85634ce30f40a03ae45983ee29483fe5859f291a0a69835dad1f50459327b212b8187a0c2c18c9a27fd74f2d69ed0d9a556349c8b2833b9a30107ed259aacc7
 EBUILD clockspeed-0.62-r6.ebuild 1193 BLAKE2B 39ef62870f8316af2e7d37f26732ec1e9ed9c6869f59659d1626479e4eeefe590fbfe2c40cbfd3b89089ef7676994dbc94ed4cfa57b1a77ddaa557b361da95f6 SHA512 04c9d9bef35d41402b30b30d5e4a879c1923fa4a0942b24541017e85399ac033f2b96c30956be5da980a70c788ee282036dc4bf207082d7effa001443d85b200
+EBUILD clockspeed-0.62-r7.ebuild 1188 BLAKE2B 9a765b034396f5f77b6468b3da71d43e38e0908d7f39820e18c083d8aa05fc8a0257e51af7a08434e5fe01fcd2f1e0845fa2c980fb2d3c13b98a893510e83723 SHA512 d4f44a48aa0d8cfe88f44c9b3a60f75f7b271ea719b057e398bf5a409d8d688a1f302f51657c944f288f43ca0c478f8e43f323026359f6fcf75ebe1a82fb51e9
 MISC metadata.xml 416 BLAKE2B b11bd8ea02066ba97613146ac7984f394b5fa4e1b34b2781f0e3fb747affebc6f5db19bde801ca0e0465699520561c24293e6855f40df0c93d9e21fd7463f094 SHA512 966f4ad088720ae3da99158933a8344b9f17b7f251ae37562b99ee8cdc9e1fdbb0d530e42703208ed1373932037918e4657bd0663a42f3a3348505ccdcd39d69
diff --git a/net-misc/clockspeed/clockspeed-0.62-r7.ebuild b/net-misc/clockspeed/clockspeed-0.62-r7.ebuild
new file mode 100644
index 000000000000..69bb561244a7
--- /dev/null
+++ b/net-misc/clockspeed/clockspeed-0.62-r7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Simple Network Time Protocol (NTP) client"
+HOMEPAGE="https://cr.yp.to/clockspeed.html"
+
+# this is the trailing part of the name for the latest leapseconds file.
+LEAPSECONDS_DATE="20081114"
+
+SRC_URI="https://cr.yp.to/clockspeed/${P}.tar.gz
+	https://dev.gentoo.org/~pacho/maintainer-needed/leapsecs.dat."$LEAPSECONDS_DATE""
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE="static selinux"
+RESTRICT="mirror bindist test"
+
+DEPEND="sys-apps/groff"
+RDEPEND="selinux? ( sec-policy/selinux-clockspeed )
+	net-dns/djbdns"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_configure() {
+	echo "$(tc-getCC) ${CFLAGS} ${ASFLAGS}" > conf-cc || die
+	use static && append-ldflags -static
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
+}
+
+src_install() {
+	dobin clockspeed clockadd clockview sntpclock taiclock taiclockd
+	dosbin "${FILESDIR}"/ntpclockset
+
+	doman *.1
+	dodoc BLURB CHANGES INSTALL README THANKS TODO
+
+	insinto /var/lib/clockspeed
+	newins "${DISTDIR}"/leapsecs.dat."$LEAPSECONDS_DATE" leapsecs.dat
+}
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index 5e5c0a78d4c6..c5346ceb6745 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -3,4 +3,4 @@ AUX connman.initd2 479 BLAKE2B 4ef210f405b196fe2fe0fa2e95188cded69d3da37e9f368f5
 DIST connman-1.38.tar.xz 749288 BLAKE2B 3f0ec95c87d9b3bf4f188e2523cb8ed97f462953ed95180fadf98bfe0d01c67a3b73e18e39d616e9299fa0251b9a86afea6161b9e280ae6999eb66e6bd5c4406 SHA512 9c8f77c4dd62763ccb9ea5cc5d285a8a1c51bb09a82eafc73246231557a4f627ae1e5e4a9df5e104457390ebba643349d7d67800a4ee4c17c6dceff192afe8d4
 EBUILD connman-1.38.ebuild 2722 BLAKE2B ed9392bee5e97012fe13b77fd3ed5c50f15dd64aeea641695505c7c4f0d575c949e51e04e21ff801de9d8d8609807593b2d7279a5adc6aa87ac99da16473d654 SHA512 829b20d249c16a550819d00cba1b42afa44895f287c48a47176576280d3d6dd231c446c5bcae91ef662f78d0e0e828429377365482426d2b29115494c9247b70
 EBUILD connman-9999.ebuild 2728 BLAKE2B 40425b699009ba247ea64db4db90c86914c5d69c70614e9c1fd4071ad30d6ad73f1e7558befe877788b00d3e551973d93cd38f28519dc7f11c4e0b3f7d14751e SHA512 7b15cf1018816892e0d11011e9f6bdf823f140e10158b9a55a230b88e2f1a2980fcabee4d681c23f4939eb387fb8d93cc9400bd64a58dc61e9bddee1718161da
-MISC metadata.xml 1220 BLAKE2B 0d56b48507231a37eed6f84e5875ea55571a8cfc0379b7b16c3d74650fa011876b7466a96bfbcf7a9db9cc931c2662d678d33872082dec7b444dc404430e71bd SHA512 591edad65cd7efc59a63b207c5ea7b60b624ee91b3ab1d4aa165d4b2824640fffeca662d7f6ba34822e38777ceae9aa3caafd39d328294f245e988c77fbede5d
+MISC metadata.xml 1302 BLAKE2B b6cea3b784c7f217c5d0befc833fe573ff68f010f9fb1043b11ce9c70473c45b2a9c03d59495e8a04f58e1657ce6a9ca531da9675bdd545493cd1bab8a583ae9 SHA512 3df49e8184d319601df17ff8238404c673026a6953f0a566c7d9134215841dab8cb6a4ec507e2c6467bfbc463678568696828173b80a96a4035a449ff886bb3f
diff --git a/net-misc/connman/metadata.xml b/net-misc/connman/metadata.xml
index a8e17b602a0e..88deddf40f43 100644
--- a/net-misc/connman/metadata.xml
+++ b/net-misc/connman/metadata.xml
@@ -20,4 +20,7 @@
 		<flag name="wispr">Enable support for WISPr hotspot logins.</flag>
 		<flag name="wireguard">Enable WireGuard VPN support.</flag>
 	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:intel:connman</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index d432bf6f5ac7..842c3e92b94f 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -5,7 +5,9 @@ AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8
 DIST curl-7.68.0.tar.xz 2442788 BLAKE2B d72dbf3c4d6ef7259f0dc9b5347f9289067807246ce6aaab03f3a9c04c17328a8315261dbc08390096571bcad3bbb185a70d15ce83687d7e792bee37318bf269 SHA512 bf365609c9a66a05b3a263d02bcd3f81f905570c5739c8ec522a296b4b8e2a479d64d5524e8345e14eafad28995ee22d923522f1a45fa40eb46db38759c2eb2c
 DIST curl-7.69.1.tar.xz 2467272 BLAKE2B 71eee2a8f511ea698f4ebf879bcdccabe11439b2f6c7812cde640f944af93b33dc797c6f4990ddd2a7051d33584dacc005ae011c16a6c1f7ab7fc7258c891937 SHA512 dcb917ce9a6f34b30adae10e2e635d7a8c67781d69789cc5617ab2b49e898394ecfeee546453b14ab168d4b3b52baf974b2ec07e7a4b199addbc1ba57274d8fa
 DIST curl-7.70.0.tar.xz 2348780 BLAKE2B 6b505d87242bcaa554c4ee6994eb97ca70453521c1e77b5e757677475328c70f41e23e22b3a0eb9be7a299a94d4f1f85a46f7f999f3db8439072626320352ecf SHA512 ab8796af1bd6f35ae704fd5e3639a8153482615a05c24e2e6d0b9cef8ed9a1e0d497ead2dbf5972cc53f632c2d87f0bf79e9e7cac625452dd24e6c7d8045cfc6
+DIST curl-7.71.0.tar.xz 2379056 BLAKE2B 50d7369e4335823c3032b8801b270f7d8e687b0552f25ed5f9752549483cf68870e0422132ecf86e756e1c7c27cdf60048a7765850608c3a1b734cffb1fe7b99 SHA512 f1ea045f23b6a7e2c84ea83954d3299c612f57c3b1e5fee0b39493dc92fc4e95e7af2a5424c2e5bc480659e80cf1adce1fc528fc816f8ff2d0e7bfcfe4c5830a
 EBUILD curl-7.68.0.ebuild 7574 BLAKE2B a63f7bd7c6a27f2c67824d2cd2e742bf6d53f2fb004ab7ea6e4aaf0034bb97a5a59a605c133cd3c27ce84114bdc715c873706f757428a8f3ade59516dea1b882 SHA512 a59e3f0ad00bf9becf08fb624e0f634f6bac617b8ba88f751e2a2a78422eb54f294149db7a1cb9fbd25554637335c01c9467d1774a26b9571d413f90a620e491
 EBUILD curl-7.69.1.ebuild 7663 BLAKE2B c3d98ec0d1f9d40d1173cec9f4a8e6198e5da809fe52fe83db75ba3ec68f0f2ca0812fcc90d29004bdcdf874136ac139a130f913899553d5912392b541f612a9 SHA512 c6f542f18802aaf42ac0ca33477f239587bc20afd9462bf931444ee79a8773e0b1fc1cc8ce503157433d6d45f0600b104fd0a0b200de2ffcbd462dc6d2cd784b
 EBUILD curl-7.70.0-r1.ebuild 7735 BLAKE2B 8bb2413f7fead1501f7146b06c0aa15e6c610c1e731c3ffc59d0a8b979b24cbc491d32087315aa0dfa178701a2a8eaee116d41fdbdd321bcee5c6c62e8ad5a0a SHA512 40c3dd6c2e168de6e596fa6e5177cef48be547fa5e76772a46fbbd076b68ddcaca0c9f8c2d1981ad528c900a3624d80dfa87dc077d84c773f21b35a57b568b9b
+EBUILD curl-7.71.0.ebuild 7688 BLAKE2B bc7f9ea325b026c360a9e3dddde33c94a8b2a71dbbbd7d7cb5b28b09c3a8e662db36756ad00b40beb5ba452e71157f4253c7c02c65e9ab981a0c72000d1508df SHA512 9cfd78a000ba73e782b1ee16948d6266c7f9d90059dda2ea43f0450868660e97383802564ab15920b61903d0a2ef70f9101b2395ffd64c6d6b02a996a0a4122f
 MISC metadata.xml 1643 BLAKE2B 269e3f95823a962466081b171d376e1f13cf4e8ac7d440577f704d585d40d0a4e7f496be1860f283f2e118338183210c1a93d3cff24fe517c9fed57dcd8b615c SHA512 ed329ba19ca89372141274e7fcb161e9f825e219d9bf71dc719b1a2bf5deefdecaaab02bb6e5e4c0bd1c87ce16731f7f5137dffb86e65c67381d98eaf72cc2d9
diff --git a/net-misc/curl/curl-7.71.0.ebuild b/net-misc/curl/curl-7.71.0.ebuild
new file mode 100644
index 000000000000..cfcba68debda
--- /dev/null
+++ b/net-misc/curl/curl-7.71.0.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools eutils prefix multilib-minimal
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/"
+SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
+
+LICENSE="curl"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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="adns alt-svc brotli +ftp gopher http2 idn +imap ipv6 kerberos ldap metalink +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads"
+IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
+IUSE+=" nghttp3 quiche"
+IUSE+=" elibc_Winnt"
+
+#lead to lots of false negatives, bug #285669
+RESTRICT="test"
+
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+	ssl? (
+		curl_ssl_gnutls? (
+			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_libressl? (
+			dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_mbedtls? (
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_openssl? (
+			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_nss? (
+			dev-libs/nss:0[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+	)
+	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
+	nghttp3? (
+		net-libs/nghttp3[${MULTILIB_USEDEP}]
+		net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
+	)
+	quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
+	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
+	sys-libs/zlib[${MULTILIB_USEDEP}]"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#	rtmp? (
+#		media-video/rtmpdump
+#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#	)
+
+# ssl providers to be added:
+# fbopenssl  $(use_with spnego)
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+
+# c-ares must be disabled for threads
+# only one ssl provider can be enabled
+REQUIRED_USE="
+	curl_ssl_winssl? ( elibc_Winnt )
+	threads? ( !adns )
+	ssl? (
+		^^ (
+			curl_ssl_gnutls
+			curl_ssl_libressl
+			curl_ssl_mbedtls
+			curl_ssl_nss
+			curl_ssl_openssl
+			curl_ssl_winssl
+		)
+	)"
+
+DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
+	docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
+	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
+	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+
+	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+	sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
+
+	eapply_user
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
+	local myconf=()
+	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
+	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
+	if use ssl ; then
+		if use curl_ssl_gnutls; then
+			einfo "SSL provided by gnutls"
+			myconf+=( --with-gnutls --with-nettle )
+		elif use curl_ssl_libressl; then
+			einfo "SSL provided by LibreSSL"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_mbedtls; then
+			einfo "SSL provided by mbedtls"
+			myconf+=( --with-mbedtls )
+		elif use curl_ssl_nss; then
+			einfo "SSL provided by nss"
+			myconf+=( --with-nss )
+		elif use curl_ssl_openssl; then
+			einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_winssl; then
+			einfo "SSL provided by Windows"
+			myconf+=( --with-winssl )
+		else
+			eerror "We can't be here because of REQUIRED_USE."
+		fi
+	else
+		einfo "SSL disabled"
+	fi
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		$(use_enable alt-svc) \
+		--enable-crypto-auth \
+		--enable-dict \
+		--disable-esni \
+		--enable-file \
+		$(use_enable ftp) \
+		$(use_enable gopher) \
+		--enable-http \
+		$(use_enable imap) \
+		$(use_enable ldap) \
+		$(use_enable ldap ldaps) \
+		--disable-mqtt \
+		--disable-ntlm-wb \
+		$(use_enable pop3) \
+		--enable-rt  \
+		--enable-rtsp \
+		$(use_enable samba smb) \
+		$(use_with ssh libssh2) \
+		$(use_enable smtp) \
+		$(use_enable telnet) \
+		$(use_enable tftp) \
+		--enable-tls-srp \
+		$(use_enable adns ares) \
+		--enable-cookies \
+		--enable-dateparse \
+		--enable-dnsshuffle \
+		--enable-doh \
+		--enable-hidden-symbols \
+		--enable-http-auth \
+		$(use_enable ipv6) \
+		--enable-largefile \
+		--enable-manual \
+		--enable-mime \
+		--enable-netrc \
+		$(use_enable progress-meter) \
+		--enable-proxy \
+		--disable-sspi \
+		$(use_enable static-libs static) \
+		$(use_enable threads threaded-resolver) \
+		$(use_enable threads pthreads) \
+		--disable-versioned-symbols \
+		--without-amissl \
+		--without-bearssl \
+		--without-cyassl \
+		--without-darwinssl \
+		--without-fish-functions-dir \
+		$(use_with idn libidn2) \
+		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
+		$(use_with metalink libmetalink) \
+		$(use_with http2 nghttp2) \
+		--without-libpsl \
+		$(use_with nghttp3) \
+		$(use_with nghttp3 ngtcp2) \
+		$(use_with quiche) \
+		$(use_with rtmp librtmp) \
+		$(use_with brotli) \
+		--without-schannel \
+		--without-secure-transport \
+		--without-spnego \
+		--without-winidn \
+		--without-wolfssl \
+		--with-zlib \
+		"${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# avoid building the client
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+	# Fix up the pkg-config file to be more robust.
+	# https://github.com/curl/curl/issues/864
+	local priv=() libs=()
+	# We always enable zlib.
+	libs+=( "-lz" )
+	priv+=( "zlib" )
+	if use http2; then
+		libs+=( "-lnghttp2" )
+		priv+=( "libnghttp2" )
+	fi
+	if use quiche; then
+		libs+=( "-lquiche" )
+		priv+=( "quiche" )
+	fi
+	if use nghttp3; then
+		libs+=( "-lnghttp3" "-lngtcp2" )
+		priv+=( "libnghttp3" "-libtcp2" )
+	fi
+	if use ssl && use curl_ssl_openssl; then
+		libs+=( "-lssl" "-lcrypto" )
+		priv+=( "openssl" )
+	fi
+	grep -q Requires.private libcurl.pc && die "need to update ebuild"
+	libs=$(printf '|%s' "${libs[@]}")
+	sed -i -r \
+		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
+		libcurl.pc || die
+	echo "Requires.private: ${priv[*]}" >> libcurl.pc
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete
+	rm -rf "${ED}"/etc/
+}
diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index 521482d87752..19dc34131258 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -18,5 +18,5 @@ DIST dahdi-fwload-vpmadt032-1.25.0.tar.gz 149360 BLAKE2B bb754b1abf794d918d1c457
 DIST dahdi-linux-3.1.0.tar.gz 1645832 BLAKE2B 27ea6b68318750639fd90f2061e2e9e128e3faa8cc195b368f7157947f5b522f86b871a3b793016945c9faaed20b38a185adafa29b2fc04019063257f578169e SHA512 440f5e44c933c609f2b3cfcf013c84bcd0c37929a43d69aac0276b11484cb890cd5939c5ac5950cad54d934d27ee6ff0b18f2bdd58477ed9be8055de107727b4
 DIST gentoo-dahdi-patchset-3.1.0-r1-v2.tar.bz2 104683 BLAKE2B 6ad6ede1163baa40e0bc265af5bfba5781bc61bfcabaccb0b8579d8ea8b778a06e2acf4b3d57b5419f3ad406e32d3cbe63cea6b2ee5960644e1458636462decd SHA512 b3acfb0e614073ce8e3a009f5685959f6c226607ba6c50a4657ed1dda808345e745e13005de95e61ac1ed47a2c6da3ce678c5881f5eff945434b8b79551dd304
 DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 BLAKE2B c8bbb007cd1a76d02b758af35d1d6a26d5617018ad1de8c69dd9bdf7d781d66b85031706efe55edb32eec1d00f3877fe8a2edd4f9899f367824875cd5fe93984 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66
-EBUILD dahdi-3.1.0-r1.ebuild 4372 BLAKE2B 63cc2f665eb0002988e4c6db7e3487eda30e832c2cf75f3811dc4a0fd04c82ef9d7a3d2195af0dd38208dc94fb06e493a198507d7b10907e794d3e32a61c964c SHA512 92291422009eb9c2020f09cc54121039b6ecc38e8978c9ff71fa36c6b0f60c251ca11d2b2753bbc9b9bccb7ad33a1f3f437322a02d5e91d7a1de4fbcceb0f519
+EBUILD dahdi-3.1.0-r1.ebuild 4781 BLAKE2B f317267d87d5d5c6617bd94928196d661ea9bd80dce5f55665baebcd898588e7c1859df4fa66fbcbef124801f44af6d5ee4f0dff4624ea904045286cf48887ff SHA512 6101d70501c8a57b18955824966a7c023d9e88871aa236bf4dc214d66a9b0ab64ae2599b79851812e93d3398ac02bd0bcc10347d554be7fec0a5ed3afd2ee303
 MISC metadata.xml 539 BLAKE2B a0ce99924eb45e3ab924bdf354a54b185775fdf86e412dd53b2f2ad00772376e7e191c9166b9417dc81d0e05dccdaa1e6eb1e72b937a8a125b948f023129624e SHA512 41033deb3d149daf967524383856a8e45eebfc6b6c721ae5a9bb6fcc18c5f1371e49f5f52f403ff9f192911c3345a52ae11b03b4d0fa1d3cf753ec5efd570c5c
diff --git a/net-misc/dahdi/dahdi-3.1.0-r1.ebuild b/net-misc/dahdi/dahdi-3.1.0-r1.ebuild
index bd1d6c11293c..f69efcbe4185 100644
--- a/net-misc/dahdi/dahdi-3.1.0-r1.ebuild
+++ b/net-misc/dahdi/dahdi-3.1.0-r1.ebuild
@@ -97,5 +97,11 @@ src_install() {
 		DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \
 		LDFLAGS="$(raw-ldflags)" install
 
-	rm -r "${ED}"/lib/modules/*/modules.* || die "Error removing bogus modules"
+	# Remove the blank "version" files (these files are all empty, and root owned).
+	find "${ED}/lib/firmware" -name ".*" -delete || die "Error removing empty firmware version files"
+
+	# If the kernel sources have a System.map, and there a suitable depmod
+	# available (seemingly when we're not cross-compiling), then the kernel
+	# sources depmod kicks in.  Remove the files caused by that.
+	find "${ED}/lib/modules" -name "modules.*" -delete || die "Error deleting bogus modules.* files"
 }
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index b21381cb678d..59732f17e75c 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,10 +1,13 @@
 AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad3294a927d8cbd708427e4aba8b6f62157a5b6e7cec8d7631a6d79ccd55616a9bca63003ef72f5 SHA512 100a9480dc086e18972c25bbf554e47737dae43989fc7fe1d01173c2570e64792e64fa7d52a93ca53f3e1248b3b335fd838b5c7713dae937e919f0e6a99bb132
 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
+DIST dropbox-lnx.x86-100.4.409.tar.gz 96530220 BLAKE2B 392949b19d97bb8d8a63b83e48c03414eec7064f151060ae2ab9f8b852a9bb46710c7ba54440e9242f803de3245c96705255aea8ec1435061282a68e3d27bec2 SHA512 e54e6fdb5cc6eba4267cea60ae7c1dd4a4537de70c430436e7e0f6eaf99e6730bb2a69ffb3e62ff7a7b2fe23301b7c9093143554b5659385e23099d702b057a2
 DIST dropbox-lnx.x86-98.4.158.tar.gz 96568004 BLAKE2B fc9ae4cf5d9ad1798dd5d55bf90cd5e77e7cd7405626fb55d4693e26d028d97a81d2843eb03d60de94f552cc446fffa4caa679ba3a750098a58549fc78ff4c67 SHA512 ce6432bbec1ec024e6753a93f2d0eed3af60de521f411f52efb63767eb500a85da80102a011e077fd9953d4827403d02143b186f30137ef7a338cb01664911a2
 DIST dropbox-lnx.x86-99.4.501.tar.gz 97126978 BLAKE2B 38476b8c0b36c385c69c44588c5b3ea227a8f7db2b1bc08c75558dfae6e962c5f9df4ce82ddb8afaa53b4b6522ec37f2cc5cfffce6d5b293a64b98333c33641b SHA512 01d91cb5be1439fd1d2e47b93da570650cbc21aa4ba0bff05f066ed5c5a60d162a7a5e3eb343e6a2ca48709964b29570b94cc8702a1064a8fce0779acb6ea14e
+DIST dropbox-lnx.x86_64-100.4.409.tar.gz 100580993 BLAKE2B a9e6c4c02bfaac4f27bb0be0369c77af23bb0fe23a5105ed7c46fde699ecde012c31aff015591cad85a3fd4f3bfe58a0281f78efebb9db05fe732bfb0c92a8e2 SHA512 862c289827e3769725242b4973c384ca0ac933a5390641f8eca428a812f66858fc2f0a6ae056305fc17746d1a34ec927d68f9435c3bd47fa1308a0dbcab23e3c
 DIST dropbox-lnx.x86_64-98.4.158.tar.gz 100751556 BLAKE2B 8ebbfa7101852e531edf9c6b3318c14418c95a0e618ce3725411e6fb1dbae70860de9b0daeba4c824fff0b3bd5f9a9347a4fe09c1433f76be3b3cc86184d769e SHA512 00db27742f8dff9d3fb96f06fcefdb30450b675b3c3cd35df717908455a8b1ca0419efff8932022d82c89dd3fccca183bc1bb16a1fb25c0505c49dfd03b06a19
 DIST dropbox-lnx.x86_64-99.4.501.tar.gz 101375862 BLAKE2B 46c03250bd2c2d480b67a645c03fc8fc0343aeb5906afd1807b49bfb44d07606b59a61fa79fcad48cb4029969f457ef347d5f1394dbf53b10586bc05b068295e SHA512 4d8b350aa8cbc9cc5491c8978cbe56eb8e08110f48dd4187d7287a46847d8a4316158ea39e09e707a135a10424e8c6bc2a66b3cf4f9b8529fc0cbf755744a118
+EBUILD dropbox-100.4.409.ebuild 2548 BLAKE2B 0ab7a439a7f99d50ef8fa036807330510463895ac7498dcac125cc0fb35615fca328a228f0d69d291c182323c4777e6a4e69e7d7201315729df9cf84b0643008 SHA512 4231b7e3b24db00386a00e3c589f2889dbfe9fa4658c8d912e0b9c96de8b35061b588bfd985514928f97fa78f0a01b0b836f0c0e3d34577f5bff985c009bb1a8
 EBUILD dropbox-98.4.158.ebuild 2546 BLAKE2B 615c2a5848135ecdbae88019b23218acf2114347a931bd345f660f1dc333bbdefbf304ec8c4069947af061e114dea8fe856bffcedbd91437b1300f979f12272f SHA512 88e21dfd4905e1c31114814243cf93b5f6e95302e2f90c7fde2b5c955f0789f1ca66c9b7b7372d2ec5c404d8e6788ce76e66b658151f28ec16020eb3c06aec7e
 EBUILD dropbox-99.4.501.ebuild 2548 BLAKE2B 0ab7a439a7f99d50ef8fa036807330510463895ac7498dcac125cc0fb35615fca328a228f0d69d291c182323c4777e6a4e69e7d7201315729df9cf84b0643008 SHA512 4231b7e3b24db00386a00e3c589f2889dbfe9fa4658c8d912e0b9c96de8b35061b588bfd985514928f97fa78f0a01b0b836f0c0e3d34577f5bff985c009bb1a8
 MISC metadata.xml 422 BLAKE2B aa4c408abfc15620a5a8aa6f65891c152315200622b4cf65214757244394a7234e01093d4c0d899d93897182061b02631cce9a3f9409e530d9d9d9a7662771a8 SHA512 987f29ecd23a68ee9037749c20640279f1e232e1d09fb0c4279940643ed50cfd2f0ee8c3e5d3f582b6ca227c757bd3306ca7b3bc59cc7a4f86e9586421d4c839
diff --git a/net-misc/dropbox/dropbox-100.4.409.ebuild b/net-misc/dropbox/dropbox-100.4.409.ebuild
new file mode 100644
index 000000000000..38f892d3ba40
--- /dev/null
+++ b/net-misc/dropbox/dropbox-100.4.409.ebuild
@@ -0,0 +1,102 @@
+# 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"
+
+BDEPEND="dev-util/patchelf"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+RDEPEND="
+	X? (
+		dev-libs/glib:2
+		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 images || die
+	fi
+	if use librsync-bundled ; then
+		patchelf --set-rpath '$ORIGIN' librsyncffi_native.*.so || die
+	else
+		rm -vf librsync.so.1 || die
+	fi
+	patchelf --set-rpath '$ORIGIN' \
+		apex._apex.*.so \
+		nucleus_python.*.so \
+		tprt.*.so \
+		|| die
+	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/endlessh/Manifest b/net-misc/endlessh/Manifest
index ff6e6263c138..68bcebb5a29b 100644
--- a/net-misc/endlessh/Manifest
+++ b/net-misc/endlessh/Manifest
@@ -1,12 +1,7 @@
 AUX endlessh-1.1-syslog-help.patch 898 BLAKE2B 97d075e3f0e86f560cc57a2227f15ed88bd2081d0d991e2f420c4f57ab37c3f7302bb56a414ef3a799cbae4eb3e8dfe44706bd755680641fae0b14e2ded9ec59 SHA512 b7681e555afbd12745b0c68f34220451dfe4f9c52fd08401c83197f8b2cd22c14115b5e7d5cf421b56f0fe4b3528903f642557ef8f1a34fabb4dec8901934a2b
-AUX endlessh.confd-r1 1334 BLAKE2B 978cb9746acf2ab5aba7bff766a11daa347daee14bb5d6e03f2dcb8dda4ac8e9394b40aec1acd6ed082d0d4bdbd8fa553793bca10791faa7c99994625dd1f51a SHA512 8f54abdd8d4f63153ed1b1653b52d2e2c4a97b68851a9e8c882e7a0ff6c235300b74ca9803c0eb8402c5c4e6d17977ce77860fa5101d7925ff5004cffca92304
-AUX endlessh.confd-r2 1076 BLAKE2B c25a41bfb71eeaa7b6bdfb4651a1e0d8af91fb1fff6aa1c8edcf31917447d69645d9a00f280d5e7ee88c11c071906d306e916bac72061d5cdcb871f55247752d SHA512 6338bd15f0120936a14aec0b4979fd4422a736e5a5eb7428a5e816cfb0671c24764ba2ce4d6bebfc5488fab18ffd8b02b52f778e0a395891da6352e310135bad
-AUX endlessh.initd-r1 657 BLAKE2B 1954581b2434437d1fbac539a4cf0ee7dd8c59f4eab9a5e7f0f2549ead3ecda062810b9ecbc25b4bd8928e9e0aeea42ff6a0e64be2628313fbaa1a55e1feef11 SHA512 0e7e4306a4b9bfde080647ba82e0f0e4b828a787926d6cc78189a25b0f5d2de4d95433c960f23e4c16ceae0d7cf67a8be69323f04d1911393b88400a9498ba48
-AUX endlessh.initd-r2 762 BLAKE2B c5d89221af1a24bf7d0b45785fa2178dbd6dd70fe12d025f54fbb9c65c2d82a3abf2f2ece1cee30541ba05343984af0318e72f932c171a1de9c4a1e58e2fcf86 SHA512 6ecea923bd9e73a082131bae97bac46b5823828bdbcc8301642c17f7eea3f7231fa1a84e03872e841f64b7ec8b818a03ba993a7b1e87df167434bb1ead4d4c4b
-AUX logrotated-r1 181 BLAKE2B 6667824ccd09b277e1c020c68380061cc40f615b29dd5041fe6c9d2c97a5e434302ef1dae8341bf37f9fbdfe1f12bb73a589c0817dac033714d04ccef337cb8f SHA512 4961f3ea7dabb66a0ba6a650ed21bef9d4bd2289d15d5b3367b31524480d4c63275cedcd2f39202353f302fab6310168529560975b23a8699a2b7a4e6bd4abad
-DIST endlessh-1.0.tar.gz 12258 BLAKE2B add6e24568cc94b244aa52bb484d1516210bfaa5a82440e090a89a94d50fbd4805ae004f917af56a7ad82a6502ae97c059d3f1c24b7c3e13ad1bd5a04bcf1c3e SHA512 a7e4e6ac5dc5e9b6e479ac3323b6a3ecec398ea074970de7794c93bd7a1a77c5662bdfa5752217fe552db1b3dbb9f400183114d7399c5a019637cb40756b46a8
+AUX endlessh.confd 1076 BLAKE2B c25a41bfb71eeaa7b6bdfb4651a1e0d8af91fb1fff6aa1c8edcf31917447d69645d9a00f280d5e7ee88c11c071906d306e916bac72061d5cdcb871f55247752d SHA512 6338bd15f0120936a14aec0b4979fd4422a736e5a5eb7428a5e816cfb0671c24764ba2ce4d6bebfc5488fab18ffd8b02b52f778e0a395891da6352e310135bad
+AUX endlessh.initd 767 BLAKE2B fdc7a57dbf9812880ee2b95f3d23350375ae960431929c5823647d052eb38fd6d3bfb87e9a3d33356018d117a73ba1a78a855972d7e4e11d35cf3a8910b2473f SHA512 2deb46cfcdf002408933f8e20287c1be3a0deddf41d97229ec30408e769b0c9a5c8575cb3e43939e385a3187def4451b7f20acf1641da403f335d435ebabf322
 DIST endlessh-1.1.tar.gz 12844 BLAKE2B 8828739844cb03f67067bb020c3da5b5c6610a195202776da1ae184c0ab02c9f2acef32cc6536bbb80a46242251e3425eed2c70b0d1a90b0e73696ac14babc94 SHA512 7df2463425ad1417a2e328eacfb840aed14727168b83b5adf80cf6c5c98a6fc05f96bba9257b543ef60202a74383e4978e92c4a1b959e35d4ab94e0e5bda14fd
-EBUILD endlessh-1.0.ebuild 1348 BLAKE2B 83ac47579e735b6b53e482feee08e0ca648556702e4b7cbd168d6ba08afc70d975ab8d1a062d42d1e15148286b5132ea994c9df61e80db3b337624b9b6ae2907 SHA512 820be32639fc61b2f04894f15dc33c76785662c5c162e7fff6b3280664992cf23c77e0239829d99e14efc88cff4d771656b548ebd69030d9e062631f68f2666a
-EBUILD endlessh-1.1.ebuild 1285 BLAKE2B abc2316e6a0100d31e4072be14167e8ca98344c2c9129da964d0d31ddee8c8ebb4c2483809dfa86b5c34dbe89e25e33c2791ed87591aeabfa8cc0b035087e7d2 SHA512 97de42b47d57f4aecd3ce1b03234a6a54b9655b0047c851364bbc35c4e3a139acbdb73c13d511dca65b7855dc1f284e42d81538adf060d35eca374c660aa30ef
-EBUILD endlessh-9999.ebuild 1348 BLAKE2B 83ac47579e735b6b53e482feee08e0ca648556702e4b7cbd168d6ba08afc70d975ab8d1a062d42d1e15148286b5132ea994c9df61e80db3b337624b9b6ae2907 SHA512 820be32639fc61b2f04894f15dc33c76785662c5c162e7fff6b3280664992cf23c77e0239829d99e14efc88cff4d771656b548ebd69030d9e062631f68f2666a
+EBUILD endlessh-1.1-r1.ebuild 1335 BLAKE2B 7020443bb021f25668b40d923b792a4de32c25f31da9ce1f3fad3d4455fe0c3ba2ef51d046a080b44ef1a3b2fa67e906ff6658eebf4f00548a4e6afc2b45b332 SHA512 9315012e6770a895ad9a8123e3bd5c04632558c6098df0cd8b468360e0915b4c0d9bfa4d817c2028d36be7e5e228429830807a7edecd896b1d23826ff68f41a8
+EBUILD endlessh-9999.ebuild 1281 BLAKE2B 848c81ceca759839ef436cce8c906392a9265cb43dd04e5adff8c2efc8f9a7879e6fe3b0639375c1ccd79489314427d1ae230e4a4a4a41df94c6767dabb6d97b SHA512 01da5e8c76ca8eb794417162537048156ac2772da596ca1ab75641fc57a64a6c3304b56c6c116dd46ff50dd088265f05c9fa81c49a2e1379fcffc70a90750d43
 MISC metadata.xml 1031 BLAKE2B 8f3ec618c1142bbea8f7bc995b0630dedba8391b1b52045f24f3636418bdbdb3a9368e442b177915db8e77291af3c73bb2ee7ad7e3ad596916bcdfde14034ef2 SHA512 2cb9ee586abf06930aa03eb3a536c15d22114a5d3c42c15037cac9f6df6a289bdadcfd83b87f75869be49c22486c11c1e425f67bd982289be0f6130bfb828cbf
diff --git a/net-misc/endlessh/endlessh-1.0.ebuild b/net-misc/endlessh/endlessh-1.0.ebuild
deleted file mode 100644
index c9996640c02b..000000000000
--- a/net-misc/endlessh/endlessh-1.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="SSH tarpit that slowly sends and endless banner"
-HOMEPAGE="https://github.com/skeeto/endlessh"
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/skeeto/${PN}.git"
-else
-	SRC_URI="https://github.com/skeeto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-fi
-
-LICENSE="Unlicense"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-BDEPEND=""
-
-src_prepare() {
-	default
-
-	tc-export CC
-
-	sed -i \
-		-e 's/^CC/CC?/' \
-		-e 's/^CFLAGS  =/CFLAGS  +=/' \
-		-e 's/ -Os//' \
-		-e 's/^LDFLAGS/LDFLAGS?/' \
-		-e 's/^PREFIX/PREFIX?/' \
-		Makefile || die
-
-	sed -i -e "/^ExecStart=/ s:=/opt/endlessh:=${EPREFIX}/usr/bin:" \
-		util/endlessh.service || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-
-	einstalldocs
-
-	newinitd "${FILESDIR}"/endlessh.initd-r1 endlessh
-	newconfd "${FILESDIR}"/endlessh.confd-r1 endlessh
-
-	systemd_dounit util/endlessh.service
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotated-r1" endlessh
-
-	insinto /usr/share/"${PN}"
-	doins util/{pivot.py,schema.sql}
-}
-
-pkg_postinst() {
-	elog "Log parsing script installed to ${EPREFIX}/usr/share/${PN}"
-	elog "Install dev-python/pyrfc3339 if you are going to use it"
-}
diff --git a/net-misc/endlessh/endlessh-1.1-r1.ebuild b/net-misc/endlessh/endlessh-1.1-r1.ebuild
new file mode 100644
index 000000000000..eb2ab463fcba
--- /dev/null
+++ b/net-misc/endlessh/endlessh-1.1-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="SSH tarpit that slowly sends and endless banner"
+HOMEPAGE="https://github.com/skeeto/endlessh"
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/skeeto/${PN}.git"
+else
+	SRC_URI="https://github.com/skeeto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+fi
+
+LICENSE="Unlicense"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+BDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1-syslog-help.patch
+)
+
+src_prepare() {
+	default
+
+	tc-export CC
+
+	sed -i \
+		-e 's/^CC/CC?/' \
+		-e 's/^CFLAGS  =/CFLAGS  +=/' \
+		-e 's/ -Os//' \
+		-e 's/^LDFLAGS/LDFLAGS?/' \
+		-e 's/^PREFIX/PREFIX?/' \
+		Makefile || die
+
+	sed -i -e "/^ExecStart=/ s:=/opt/endlessh:=${EPREFIX}/usr/bin:" \
+		util/endlessh.service || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+
+	einstalldocs
+
+	newinitd "${FILESDIR}"/endlessh.initd endlessh
+	newconfd "${FILESDIR}"/endlessh.confd endlessh
+
+	systemd_dounit util/endlessh.service
+
+	insinto /usr/share/"${PN}"
+	doins util/{pivot.py,schema.sql}
+}
+
+pkg_postinst() {
+	elog "Log parsing script installed to ${EPREFIX}/usr/share/${PN}"
+	elog "Install dev-python/pyrfc3339 if you are going to use it"
+}
diff --git a/net-misc/endlessh/endlessh-1.1.ebuild b/net-misc/endlessh/endlessh-1.1.ebuild
deleted file mode 100644
index 89e86696bb7f..000000000000
--- a/net-misc/endlessh/endlessh-1.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="SSH tarpit that slowly sends and endless banner"
-HOMEPAGE="https://github.com/skeeto/endlessh"
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/skeeto/${PN}.git"
-else
-	SRC_URI="https://github.com/skeeto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
-fi
-
-LICENSE="Unlicense"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-BDEPEND=""
-
-src_prepare() {
-	default
-
-	tc-export CC
-
-	sed -i \
-		-e 's/^CC/CC?/' \
-		-e 's/^CFLAGS  =/CFLAGS  +=/' \
-		-e 's/ -Os//' \
-		-e 's/^LDFLAGS/LDFLAGS?/' \
-		-e 's/^PREFIX/PREFIX?/' \
-		Makefile || die
-
-	sed -i -e "/^ExecStart=/ s:=/opt/endlessh:=${EPREFIX}/usr/bin:" \
-		util/endlessh.service || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-
-	einstalldocs
-
-	newinitd "${FILESDIR}"/endlessh.initd-r2 endlessh
-	newconfd "${FILESDIR}"/endlessh.confd-r2 endlessh
-
-	systemd_dounit util/endlessh.service
-
-	insinto /usr/share/"${PN}"
-	doins util/{pivot.py,schema.sql}
-}
-
-pkg_postinst() {
-	elog "Log parsing script installed to ${EPREFIX}/usr/share/${PN}"
-	elog "Install dev-python/pyrfc3339 if you are going to use it"
-}
diff --git a/net-misc/endlessh/endlessh-9999.ebuild b/net-misc/endlessh/endlessh-9999.ebuild
index c9996640c02b..45747936cb6c 100644
--- a/net-misc/endlessh/endlessh-9999.ebuild
+++ b/net-misc/endlessh/endlessh-9999.ebuild
@@ -13,7 +13,7 @@ if [ ${PV} == "9999" ] ; then
 	EGIT_REPO_URI="https://github.com/skeeto/${PN}.git"
 else
 	SRC_URI="https://github.com/skeeto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 fi
 
 LICENSE="Unlicense"
@@ -31,7 +31,7 @@ src_prepare() {
 
 	sed -i \
 		-e 's/^CC/CC?/' \
-		-e 's/^CFLAGS  =/CFLAGS  +=/' \
+		-e 's/^CFLAGS   =/CFLAGS   +=/' \
 		-e 's/ -Os//' \
 		-e 's/^LDFLAGS/LDFLAGS?/' \
 		-e 's/^PREFIX/PREFIX?/' \
@@ -46,14 +46,11 @@ src_install() {
 
 	einstalldocs
 
-	newinitd "${FILESDIR}"/endlessh.initd-r1 endlessh
-	newconfd "${FILESDIR}"/endlessh.confd-r1 endlessh
+	newinitd "${FILESDIR}"/endlessh.initd endlessh
+	newconfd "${FILESDIR}"/endlessh.confd endlessh
 
 	systemd_dounit util/endlessh.service
 
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotated-r1" endlessh
-
 	insinto /usr/share/"${PN}"
 	doins util/{pivot.py,schema.sql}
 }
diff --git a/net-misc/endlessh/files/endlessh.confd-r2 b/net-misc/endlessh/files/endlessh.confd
index 062e30f0c164..062e30f0c164 100644
--- a/net-misc/endlessh/files/endlessh.confd-r2
+++ b/net-misc/endlessh/files/endlessh.confd
diff --git a/net-misc/endlessh/files/endlessh.confd-r1 b/net-misc/endlessh/files/endlessh.confd-r1
deleted file mode 100644
index 13ba0ef55d2e..000000000000
--- a/net-misc/endlessh/files/endlessh.confd-r1
+++ /dev/null
@@ -1,34 +0,0 @@
-# /etc/conf.d/endlessh: config file for /etc/init.d/endlessh
-#
-#ENDLESSH_ARGS=""
-# Usage: [-vh] [-46] [-d MS] [-f CONFIG] [-l LEN] [-m LIMIT] [-p PORT]
-#   -4        Bind to IPv4 only
-#   -6        Bind to IPv6 only
-#   -d INT    Message millisecond delay [10000]
-#   -f        Set and load config file [/etc/endlessh/config]
-#   -h        Print this help message and exit
-#   -l INT    Maximum banner line length (3-255) [32]
-#   -m INT    Maximum number of clients [4096]
-#   -p INT    Listening port [2222]
-#   -v        Print diagnostics to standard output (repeatable)
-#   -V        Print version information and exit
-
-# EXAMPLE 1: listen on port 22, log all queries and errors in very verbose mode
-#ENDLESSH_ARGS="-p 22 -vv"
-
-# EXAMPLE 2: load settings from config file
-#ENDLESSH_ARGS="-f /etc/endlessh/config"
-
-# EXAMPLE 3: load settings from config file, but override port
-#ENDLESSH_ARGS="-f /etc/endlessh/config -p 22"
-
-
-# LOGGING: is disabled by default, enable this to actually redirect messages
-
-# plain file (preferred), change logrotate file as well if you change this.
-#output_log=/var/log/"${RC_SVCNAME}.log"
-#error_log=/var/log/"${RC_SVCNAME}.error.log"
-
-# syslog support via LOGGER(1). Note this spawns logger processes per io stream
-#output_logger="logger -p daemon.none --"
-#error_logger="logger -p daemon.err --"
diff --git a/net-misc/endlessh/files/endlessh.initd b/net-misc/endlessh/files/endlessh.initd
new file mode 100644
index 000000000000..1639c57348c4
--- /dev/null
+++ b/net-misc/endlessh/files/endlessh.initd
@@ -0,0 +1,30 @@
+#!/sbin/openrc-run
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	after bootmisc
+	need localmount
+	use clock logger net
+}
+
+description="Starts endlessh tarpit"
+
+command="/usr/bin/endlessh"
+# NOTE: You will need to add -s to ENDLESSH_ARGS in /etc/conf.d/endlessh if modified to keep syslog
+command_args="${ENDLESSH_ARGS:--sv}"
+command_background="true"
+extra_started_commands="dumpstats reload"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+dumpstats() {
+	ebegin "Dumping connection stats of ${RC_SVCNAME} to log"
+	start-stop-daemon --signal SIGUSR1 --pidfile "${pidfile}"
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading ${RC_SVCNAME} configuration"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
diff --git a/net-misc/endlessh/files/endlessh.initd-r1 b/net-misc/endlessh/files/endlessh.initd-r1
deleted file mode 100644
index ea8d830af439..000000000000
--- a/net-misc/endlessh/files/endlessh.initd-r1
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	after bootmisc
-	need localmount
-	use clock logger net
-}
-
-description="Starts endlessh tarpit"
-
-command="/usr/bin/endlessh"
-command_args="${ENDLESSH_ARGS}"
-command_background="true"
-extra_started_commands="dumpstats reload"
-pidfile="/run/${RC_SVCNAME}.pid"
-
-dumpstats() {
-	ebegin "Dumping connection stats of ${RC_SVCNAME} to log"
-	start-stop-daemon --signal SIGUSR1 --pidfile "${pidfile}"
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading ${RC_SVCNAME} configuration"
-	start-stop-daemon --signal HUP --pidfile "${pidfile}"
-	eend $?
-}
diff --git a/net-misc/endlessh/files/endlessh.initd-r2 b/net-misc/endlessh/files/endlessh.initd-r2
deleted file mode 100644
index 0b995f683d91..000000000000
--- a/net-misc/endlessh/files/endlessh.initd-r2
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	after bootmisc
-	need localmount
-	use clock logger net
-}
-
-description="Starts endlessh tarpit"
-
-command="/usr/bin/endlessh"
-# NOTE: You will need to add -s to ENDLESSH_ARGS in /etc/conf.d/endlessh if modified to keep syslog
-command_args="${ENDLESSH_ARGS:--sv}"
-command_background="true"
-extra_started_commands="dumpstats reload"
-pidfile="/run/${RC_SVCNAME}.pid"
-
-dumpstats() {
-	ebegin "Dumping connection stats of ${RC_SVCNAME} to log"
-	start-stop-daemon --signal SIGUSR1 --pidfile "${pidfile}"
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading ${RC_SVCNAME} configuration"
-	start-stop-daemon --signal HUP --pidfile "${pidfile}"
-	eend $?
-}
diff --git a/net-misc/endlessh/files/logrotated-r1 b/net-misc/endlessh/files/logrotated-r1
deleted file mode 100644
index 896e89e6474f..000000000000
--- a/net-misc/endlessh/files/logrotated-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/endlessh.log /var/log/endlessh.error.log {
-	copytruncate
-	missingok
-	notifempty
-	sharedscripts
-	prerotate
-		/etc/init.d/endlessh --ifstarted --quiet dumpstats
-	endscript
-}
diff --git a/net-misc/etherdfs/Manifest b/net-misc/etherdfs/Manifest
index 90da108b76b2..95f20fadd927 100644
--- a/net-misc/etherdfs/Manifest
+++ b/net-misc/etherdfs/Manifest
@@ -4,5 +4,5 @@ AUX etherdfs.initd 242 BLAKE2B b3109ef0534637cecb3d116254457c562e59c44042e94b3cf
 AUX etherdfs.service 210 BLAKE2B 0e3243da13f6be2251239fe43a5c675388175a1e62d4119cba30a2a35f6ca69572ff3176d944e39d55e442cb3cd1b599a8ce6d09bbd5ddefb9bf0c67aff216d5 SHA512 13a555a8c4e82f3b033d946f82064fcb0c3d026393da8abcff9336e6a20d36b2185fac3b3562dde59260c43b8a45b1c6dd1e95faf40abc870605e50f0fc8b381
 DIST etherdfs-20180203.zip 13081 BLAKE2B 53b0d12c272aa8a64a1980b6c4aae8c6789647026590ee948bc4d84be265479a816d8ae4df033a9a8be4038eb10b934b6ee8d188bf88e47c21f2e81123a572f0 SHA512 c254647fb35b7456b08eb27e6bc6b339d65c55ffd28fdc658f54bb1346a94a7056959a6e3e0b1a97add9e7919a224a0cef831ee14fc19219885274c9649a3439
 DIST ethersrv-linux-20180203.tar.xz 18160 BLAKE2B 45293b596489a290146bfb5ec5ca89c06a01bd0377cb29f33f604ac84c3d1d8f18f09058dded28e38f611a19d690c0a190ec38d45498cacd90a4cbff841115e1 SHA512 522f5ce5353c6eabaac2106d43d09cf341a2da96e56ffb06c5b2d705a997986117246cf3cb2b4a4e5b2c6f1caf96dfd68d1ddc56bb6db8140aa3761c7e6e6f7e
-EBUILD etherdfs-20180203-r1.ebuild 1134 BLAKE2B cb68ca9a4dd33fac48543ce3c9d067b6969ecb9b7853287352f0fb775fd573ce80630285476c85ad13433744083535bde76692efe9e050f2baba329e7be7167d SHA512 9242a05f575142e37b376cb04298a81089ed45db5c43b07e63e922e2427c6e4607a341e87d6f536c46d575734f3689123abf7db17adad1a0ba63062909abcb6f
+EBUILD etherdfs-20180203-r1.ebuild 1133 BLAKE2B 385a15bdab6c6948c2b0daa029f149273383f9e51d61617d89e456e4a9c7783ab59a384f5cbf58a1bde5b7454f5cdf9853ea591bc9e729a836ab61d730d5fd51 SHA512 b2d509fe33ac91fcc4945bba0341c6b38a1d4e0a48d6f6ba11079e1cafb889b79d5ab0aa523aa89f2fc2a4553740541034171e42069d8cf24f0e88479fdb9cca
 MISC metadata.xml 628 BLAKE2B 098bc7b2760258e6eb715561d32f0c2674e2e0ceb4a755d1cabf695bd938f68a9a1809f232ce136a395b00b5055b7ea31bbe7db0f1206ae5a435340089a79cf7 SHA512 1a8106a9ce7418f4a118cb143dd8605a84c38376edad4583dbfafab913738dc96e26c6e24cd65e29d408cb975f2741d37303bfbf3c99d2a966376486db526dcd
diff --git a/net-misc/etherdfs/etherdfs-20180203-r1.ebuild b/net-misc/etherdfs/etherdfs-20180203-r1.ebuild
index d5a7bfb7698e..81bf94e65eb9 100644
--- a/net-misc/etherdfs/etherdfs-20180203-r1.ebuild
+++ b/net-misc/etherdfs/etherdfs-20180203-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="tsr"
 
 BDEPEND="tsr? ( app-arch/unzip )"
diff --git a/net-misc/fatrat/Manifest b/net-misc/fatrat/Manifest
index aa5d34665c92..4a8bb83b126c 100644
--- a/net-misc/fatrat/Manifest
+++ b/net-misc/fatrat/Manifest
@@ -1,4 +1,5 @@
 AUX fatrat-1.2.0_beta2_p20150803-build.patch 357 BLAKE2B 31a7da4cd3d49f3ebab037bdc8b32708bc7454bd46ee49ee3582ffc0cad9816dc7ca575f63039c17d2e0f06a455204ccf19197a01845231362a8f6e049cb3de0 SHA512 884c79a2b40ce0aa3748df8df7e7ed5050a56cda23922c3cfbae0987a192fe1d2320d059830ed6de88f527dda87ebbc9033a73f5f12d269e93e1c3deffb0fc3e
+AUX fatrat-1.2.0_beta2_p20161204-qt-5.15.patch 297 BLAKE2B 06a07acc7a9c320eb9f52ea039220bebf86bad994d4e599b5bcdcef8f77b11fee4e0ef403397d9efb69eec7b667f90b5e66f36126f270055fab668599c14656d SHA512 ba2035f1f06ea3b36ce616be7a5b7a39c6c83446c1b3c836d4679980647348ad54c31363665428fd7d45435dfb622348be7d25d8dc46fb7ff602771974307f03
 DIST fatrat-1.2.0_beta2_p20161204.tar.gz 4988560 BLAKE2B e55b841bd5741fe81eab79847dddf084a0b193215b791c341d705d840d1658bb7978e53c3de65c23c7c1ac839b29abfceb3b71bcbb124746e841c5fb31ecba14 SHA512 d3a9816cc53fd93ef2ccd3fb5896dde5846382d40e30dc687a14379e6048f8ffc27b40c2b5c3977c6bccc912dcb054426c84c016c319174e2c2a440f9a588063
-EBUILD fatrat-1.2.0_beta2_p20161204.ebuild 1532 BLAKE2B 24d754216aacc9fa26b6b49ec616833c08bc116c3f708956fa14c2f0080cb0d479ca1a06e50c3064fab696f066ebc95ab747f476d33b4242aab2d8ed0ccab320 SHA512 bb2c8966a19f0551546b3a9b3e698676ecf97a7684b8c97aca8b4d5290ca0c5485758c6cb08171b31af44669efc862e08b66545f1c49cf996f7d50b73e041cd3
+EBUILD fatrat-1.2.0_beta2_p20161204.ebuild 1587 BLAKE2B 3a70464d07ad685c29d9e76aeec2193aaa53e4d79a13f939a90812381f9d4f28ded2b4e5f301657825bc525ae60ab59b8b6c842d00bd1be8ce7411f742b655d2 SHA512 96b2068571de2c653eef31e2a9b17b451030f9a4254dd8d6b53ff2c5ecc6bce117e8a02278a0211b4f0e8bd594da866dce7b39d47fded81ba6abdb63e599bf69
 MISC metadata.xml 471 BLAKE2B 7dc41b9e28a689ca2eaa3c68a7227406732a44216916512d0d0e45a88ada0d9e5f624ec548ae7d65c20d7c86775354003ddbe9578843da79746b528969e6d0f6 SHA512 ad697e54c2a17fd924bf31d557a71db942df499da67637e08dd5f2f8c6c5da76ed4eaef209bace83bd833a2694b7ab4956208ff8586a3e14828fd51e7532541b
diff --git a/net-misc/fatrat/fatrat-1.2.0_beta2_p20161204.ebuild b/net-misc/fatrat/fatrat-1.2.0_beta2_p20161204.ebuild
index 6a079aa56c89..c82928e3267c 100644
--- a/net-misc/fatrat/fatrat-1.2.0_beta2_p20161204.ebuild
+++ b/net-misc/fatrat/fatrat-1.2.0_beta2_p20161204.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 SNAPSHOT="14a1a146df76d70c44dcc38363848a5b41a364d5"
-
-inherit cmake-utils vcs-snapshot xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="Qt5-based download/upload manager"
 HOMEPAGE="http://fatrat.dolezel.info/"
@@ -16,6 +15,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="bittorrent +curl doc nls xmpp"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -34,12 +38,14 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-libs/boost
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-1.2.0_beta2_p20150803-build.patch" )
+S="${WORKDIR}/LubosD-${PN}-14a1a14"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.2.0_beta2_p20150803-build.patch"
+	"${FILESDIR}/${P}-qt-5.15.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(
@@ -50,7 +56,7 @@ src_configure() {
 		-DWITH_JABBER="$(usex xmpp ON OFF)"
 		-DWITH_WEBINTERFACE=OFF
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/net-misc/fatrat/files/fatrat-1.2.0_beta2_p20161204-qt-5.15.patch b/net-misc/fatrat/files/fatrat-1.2.0_beta2_p20161204-qt-5.15.patch
new file mode 100644
index 000000000000..def09bbd7673
--- /dev/null
+++ b/net-misc/fatrat/files/fatrat-1.2.0_beta2_p20161204-qt-5.15.patch
@@ -0,0 +1,12 @@
+diff --git a/src/util/BalloonTip.cpp b/src/util/BalloonTip.cpp
+index c20c0ee..67b5284 100644
+--- a/src/util/BalloonTip.cpp
++++ b/src/util/BalloonTip.cpp
+@@ -2,6 +2,7 @@
+  * Based on Qt source code
+  */
+ 
++#include <QPainterPath>
+ #include "BalloonTip.h"
+ #include <QLabel>
+ #include <QPushButton>
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 54291edae0d1..0dc1f9a4c8b2 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,8 +1,10 @@
 AUX 2.1.1-write_pixel_16-endian.patch 752 BLAKE2B 6a7d28f90819a8f6d578d7c1f305141c5e189937e62bcd704d91041ea71a1121b5c60707b274dd762d524ecc9d198e74333a45f847d93d0139912082cc98196d SHA512 bf5ff1c57867106f19def3ef62da39d74239b8674ea07b8c8f404b9f47f1d9ba28460e04c13c68a19b27f933135688689b8ea4745aa7c82607c5e170da0d6489
 DIST freerdp-2.1.0.tar.gz 6869116 BLAKE2B c9cab4b571b288450efa5c5666f8cb64ca9e37dfd342d5e66c256b0fca151b20b3f9b1027a12f8fe9cbae186d95c8cb4d28c90deeadcacc3c158f50a3e713747 SHA512 86d72419d012c52a3dfa071d50bac96ddb3a1423bf35252fdef72676f8b2830b65c9e0511dea2d7b9a69e7783a3d1eacbd2f868b08836742dec7542c77a39405
 DIST freerdp-2.1.1.tar.gz 6871637 BLAKE2B b0c01fb074f28aa569d934797d4fb8451edcb90d7f5eba9e47b7ec844cc95eda143c3d851b86ef72e233e8bde8ebc3e1c4a7d3d549d0de54f774ec1fee62e8cd SHA512 6f0cff79690ca550237c6e31f5ab361246a6d12ac765e85b752d474aceaf1390d8c5f2b21aba028927459892a045e5073e143705e6f2256a2a7c8744dcf3f95b
+DIST freerdp-2.1.2.tar.gz 6838848 BLAKE2B 2ca0e7f22311b574c09b3040a95133ad99ffa0cb91bc6992bf0fa88f8aebfccda3599f3d7f14a0813256c249c1e90fbd6e907fe36f78627fbd4ab6852353ea49 SHA512 09fbd76512661e077c4baab4056c2e636cfb0067678271c6c87dc19fb035e15a463478f697f7caedc0d650089d520f97f6143e85ef1b29f12c41cbd39b8fff92
 EBUILD freerdp-2.1.0.ebuild 2862 BLAKE2B 8b56772f76dd55965acac75cf9abf4d777a008b9473da979f776f63399e4ed662801ca3490d2675d329cf8a0f4330f99c4ad5000d01372f0041aba7fe7bbd6eb SHA512 e16deeb57e4582d7b81f1824332f1449a1204a096f587ddb6253c47606cf988bf09acd546e26e8509b21beb855034908ea035c61ea2a2894c39076a43d84b96d
 EBUILD freerdp-2.1.1-r1.ebuild 2900 BLAKE2B a9e27e7d78bf14a3ccd6a8ddb74d775d7c7e235a8a7a84d3626b765dd8478a69ce65853b9cf41ed759fc0e88c21cb32c91748b18c30e11a33e5af5cbab3a88bb SHA512 821fb34853a3297a7e21aab476812e87ac9156b000ebf49a46ba484c788c94345cfc37bd784d4c540f530ef3d1805f2c5cbdeacb90101c4578844bae3440c04b
+EBUILD freerdp-2.1.2.ebuild 2945 BLAKE2B cd029f4f0137a482c9c89c096eb42253f2da530dff71411e33dfc71870b31c1ffb92720b568657af372d5c7f138a981e13cec715b5fc8cf694c01e73e5d2e235 SHA512 c30e1340aebbff2cc2c0f0db299508a7f15c905cb98378ee73fcdce60d4edb7006e53a4a358b32f8c762190c436c6337ecea3bd840bf38da279ec3cfd58cbf06
 EBUILD freerdp-2.9999.ebuild 2868 BLAKE2B f3e8cab533090b36278612360962292519488aba16b061e52d534a55fc2b9261de5512be9680534db93755b829f33a900435094196fb6ecb2fa0d61931fb44a0 SHA512 1d08bf9875cdb34fee26ea8b668fab1bcaf1473aef5f92d4031ecd3d944447f2d9c3c935e38405283ce8dfa5f6ab65ab6fcbc7c3a1f9914da62d4e6c20fd7f1e
 EBUILD freerdp-9999.ebuild 2868 BLAKE2B f3e8cab533090b36278612360962292519488aba16b061e52d534a55fc2b9261de5512be9680534db93755b829f33a900435094196fb6ecb2fa0d61931fb44a0 SHA512 1d08bf9875cdb34fee26ea8b668fab1bcaf1473aef5f92d4031ecd3d944447f2d9c3c935e38405283ce8dfa5f6ab65ab6fcbc7c3a1f9914da62d4e6c20fd7f1e
 MISC metadata.xml 481 BLAKE2B b7102d2ff331d4c991dbd2d20b3bd33d375fe5f332ab48f2c3401a579e584cdc4c84795a286c18536b82cd88b7b9991b3559774a937ac59ad8ccc21b91241f60 SHA512 47db413f3b78632acc874d8e67ef8231551a6074cb2269760fb780f1a86dc334bf7675550fed7a95e98a92470e3d70cfedb10f98f6ec686e785dd67615e93db7
diff --git a/net-misc/freerdp/freerdp-2.1.2.ebuild b/net-misc/freerdp/freerdp-2.1.2.ebuild
new file mode 100644
index 000000000000..0370121a8a94
--- /dev/null
+++ b/net-misc/freerdp/freerdp-2.1.2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 2011-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
+	case ${PV} in
+		2.*) EGIT_BRANCH="stable-2.0";;
+	esac
+else
+	MY_P=${P/_/-}
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of the Remote Desktop Protocol"
+HOMEPAGE="http://www.freerdp.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0/2"
+IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/zlib:0
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	usb? (
+		virtual/libudev:0=
+		sys-apps/util-linux:0=
+		dev-libs/dbus-glib:0=
+		virtual/libusb:1=
+	)
+	X? (
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		xinerama? ( x11-libs/libXinerama )
+		xv? ( x11-libs/libXv )
+	)
+	ffmpeg? ( media-video/ffmpeg:0= )
+	!ffmpeg? (
+		x11-libs/cairo:0=
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		x11-libs/libXrandr
+	)
+	jpeg? ( virtual/jpeg:0 )
+	openh264? ( media-libs/openh264 )
+	pulseaudio? ( media-sound/pulseaudio )
+	server? (
+		X? (
+			x11-libs/libXcursor
+			x11-libs/libXdamage
+			x11-libs/libXext
+			x11-libs/libXfixes
+			x11-libs/libXrandr
+			x11-libs/libXtst
+			xinerama? ( x11-libs/libXinerama )
+		)
+	)
+	smartcard? ( sys-apps/pcsc-lite )
+	systemd? ( sys-apps/systemd:0= )
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxkbfile
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	X? ( doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+	) )
+"
+
+src_prepare() {
+	cmake_src_prepare
+	echo "${PV}" > .source_version || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+		-DCHANNEL_URBDRC=$(usex usb ON OFF)
+		-DWITH_ALSA=$(usex alsa ON OFF)
+		-DWITH_CCACHE=OFF
+		-DWITH_CUPS=$(usex cups ON OFF)
+		-DWITH_DEBUG_ALL=$(usex debug ON OFF)
+		-DWITH_MANPAGES=$(usex doc ON OFF)
+		-DWITH_FFMPEG=$(usex ffmpeg ON OFF)
+		-DWITH_SWSCALE=$(usex ffmpeg ON OFF)
+		-DWITH_CAIRO=$(usex ffmpeg OFF ON)
+		-DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
+		-DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
+		-DWITH_JPEG=$(usex jpeg ON OFF)
+		-DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
+		-DWITH_OPENH264=$(usex openh264 ON OFF)
+		-DWITH_PULSE=$(usex pulseaudio ON OFF)
+		-DWITH_SERVER=$(usex server ON OFF)
+		-DWITH_PCSC=$(usex smartcard ON OFF)
+		-DWITH_LIBSYSTEMD=$(usex systemd ON OFF)
+		-DWITH_X11=$(usex X ON OFF)
+		-DWITH_XINERAMA=$(usex xinerama ON OFF)
+		-DWITH_XV=$(usex xv ON OFF)
+		-DWITH_WAYLAND=$(usex wayland ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest
index e55f6ea5329a..a2b658f950f1 100644
--- a/net-misc/geoipupdate/Manifest
+++ b/net-misc/geoipupdate/Manifest
@@ -44,5 +44,5 @@ EBUILD geoipupdate-3.1.0.ebuild 563 BLAKE2B ed99758c1c0b3ee9053267444573ac3ae08d
 EBUILD geoipupdate-3.1.1.ebuild 563 BLAKE2B ed99758c1c0b3ee9053267444573ac3ae08d646d0a99f4ff9e6f43fa358451126b14474b9d4f233808a6ab44d9e7508db123cc3e4177fd27ad5c07c6ac0f1059 SHA512 36fcff88023b5f46c5528fa30b157fab5a159975ff1c4dbb1d1b69c48a3290c2416aceee3f1ea17b8e447a6524045a6af18646062454b3d80e0924934e4fadd7
 EBUILD geoipupdate-4.0.3-r1.ebuild 1289 BLAKE2B 52872fcad262f0e579aaaa692f5053756cca952d7992f5e1177a7ada17b1c93b731ca0fcd6b197be697e1fe22104b8621d93e3032ed0b9f70dc560dea6eeb815 SHA512 0dc1ed894f98a840d92f39e0f0f54686ce8742cb83e0c3b69e114e1d6389210794875d2fdc2f7053f2f86bd742536254940e30dd4a2081c9d821352299501678
 EBUILD geoipupdate-4.0.4.ebuild 1146 BLAKE2B 7b690131bd0f63803a2709e718bf6d33ffb6109d2e62c5eb99ca5bb793a9ea185bc5ca6962abffcdc0068a54187e70cdcee5d12128443f673637d92903f37015 SHA512 a3242fffa1b3511f861664134362ecd3dd06525b86be3791137ccade9bfb382ec3261ff24dd2c4bde2c5f75a79ddbbb1e9bb94102a9a3a35017bbc589840c336
-EBUILD geoipupdate-4.3.0.ebuild 2779 BLAKE2B d3ddab0b40e634f1ccc6708bd456bd79187750a675b88ba9bbbcb7f3e5f2ac305d29b18bb42c5458158e3cba9338f3323754542892768b097a95fbf703028328 SHA512 7a668cf18e79b85766a9e418fd688dd0040a68ace4c8af8dbc0256865245156ab1cd55eb66cd2b3665ae9d7a777fccc2149a3042f3f8378be2fdb374b50cd266
+EBUILD geoipupdate-4.3.0.ebuild 2777 BLAKE2B 2376a5aefab92d8a72b4ca6748f54298253c9fe3fe4f3da9febf8d77dfdf8978c6a944b090d97b1d012f56d9147da5d4b4601f54d7e661c37f64a3d780f5ff68 SHA512 a3ce19158c1d4e0ebe8d1ecae3448d4eb8dbfd5a553c8da3e5382a4c848dcf869ab6401723c6fbfabcf108de4a32e71e45162bf264a8064a9e7fd5f5d45a5495
 MISC metadata.xml 364 BLAKE2B f11ecee4030939844eddfd97da927e39bc333cd90a489176fdd1ae86fdce4da2793a984f6bbb7a2947585c7cba2f4f94789c342e37cca9c95c69777d6f6ad8e5 SHA512 0969b8629e162f85c16b9dd67dd0e5d1a980197e627cc47056a7e1bdece5d5e9816e0a00bace7cfb9b683e5ccfccc898791a2dfb9f274f46cc594708074a82cc
diff --git a/net-misc/geoipupdate/geoipupdate-4.3.0.ebuild b/net-misc/geoipupdate/geoipupdate-4.3.0.ebuild
index 7b41992866ca..337691eda77d 100644
--- a/net-misc/geoipupdate/geoipupdate-4.3.0.ebuild
+++ b/net-misc/geoipupdate/geoipupdate-4.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=7
@@ -53,7 +53,7 @@ SRC_URI="
 
 LICENSE="ISC BSD BSD-2 MIT Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DOCS=( README.md CHANGELOG.md doc/GeoIP.conf.md doc/geoipupdate.md )
 
diff --git a/net-misc/ipx-utils/Manifest b/net-misc/ipx-utils/Manifest
deleted file mode 100644
index 74e7bf57cc60..000000000000
--- a/net-misc/ipx-utils/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX ipx-utils-1.1-gcc-warnings.patch 1817 BLAKE2B c82ee0b8004b1e30ebb88988ac3fcaed7648b52062841ff0cb2ed095cc48d306efa697b7d54afdee2f19fd8363db158c1950dc7e4004c026f771e44791dde61a SHA512 176b72fdabd206ddace98cc9a58b7f0bca51af395b3fd36ec8ba579ab5682d377180edca30062a6834841e556d04462808ef1a8e54bd4f643ef6560b70e8096e
-AUX ipx-utils-1.1-makefile.patch 795 BLAKE2B a476f2a4b2f1c76c91b765e007b45db893f41dc78b4decee003126e8db9f7dd23b9171d0ff3e0bc32296c6f147bdd0ab2c365bf5fae4b94e9b1e8a9a0b9fd303 SHA512 fb5f8d35eb00c762140309031f508ed6fb2591eaf9c3c841565464f1d472f93bcd2404fdb3e85e10e4c4e1652767f9ca9bdbc44c80731ce4ff3939c81f96fd1d
-AUX ipx-utils-1.1-proc.patch 426 BLAKE2B 523d56fe1ea82f18898a6c23903fba01165fc375e95e189b336c1c1c18ccfe5581ceac0bd314867fdeec1b63d73d30a2f13a79e1b6824eb2fa782202146ac407 SHA512 0af00b0ac0e40a3de1788173609a49683ecb33ec6450c296dadfd1736f95f7ae7f94d8c5ef96091c68f6eede799b83fef19a913493acc86fd92d3f9dcf2dde6c
-AUX ipx.confd 552 BLAKE2B e953dfafdec15aed36928133ca9db9bd768112f814534fa1f13ae714af955abf2f7d3ce762e9f4c6f6440f80b2e3726f9d1c435eb8804cb3760e39394deb7be3 SHA512 ba7de25e2ee3b9997d51a4eed0b8eb6ede232b627962cbc0efe6c318c1b34911cb64e4c19786e44800d8b573c8730e355e71f78aaf17391f019cc17a49c6c84d
-AUX ipx.init 868 BLAKE2B fb63b038236b76bd3ea30bc9aaa05730c2ac3a8e7418de030ccf2243d5bddfdf317e059de49b75d34261ad09b71e9d7930ab109e3ace8329728f17a15e21a419 SHA512 afbd7e506c4616cb5ae469e8c818a4ce1ebadf733e43d938d4f1911ce41cd0ffb0e65614b8b230cfffa56163b1975287e1573a70ead6d0d73c5e3c9357689004
-DIST ipx-1.1.tar.gz 8177 BLAKE2B 83eb4f480709b82cac5c83e86db614c99cbc992e9c36421c3c409a4af8d21f45672d2f82cc32b7a6ac304c89632e32ae68fdf97f374eed02f8886543f2c981a0 SHA512 cb1bcf0c28939ab5ff1e1cf36f1cb8cbfcb7c019d65df5fc56a1b43673406cdf4abffa3d6164615e42ce955f078c05f721da90ca54353870e552c01bb3c2973d
-EBUILD ipx-utils-1.1-r4.ebuild 834 BLAKE2B b5e8b6d8796f4f24374807e5a5354f3761f2a5cb0c93f413d85eb4b38fc2bde16bac4cfee743ea77d2efe6876db134859330ce86d5383914ce7fe7341ae80fed SHA512 008011de2d570c03a504b81c5007fc08c8ff487b18b1c66ed1ebd6fb036821e37d2383e0c3719e4c9aa952f0c15feded9ee896608ee228839f14562035b5234b
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/ipx-utils/files/ipx-utils-1.1-gcc-warnings.patch b/net-misc/ipx-utils/files/ipx-utils-1.1-gcc-warnings.patch
deleted file mode 100644
index 3fc928f00e2d..000000000000
--- a/net-misc/ipx-utils/files/ipx-utils-1.1-gcc-warnings.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Binary files ipx-1.1.orig/ipx_configure and ipx-1.1/ipx_configure differ
-diff -ur ipx-1.1.orig/ipx_configure.c ipx-1.1/ipx_configure.c
---- ipx-1.1.orig/ipx_configure.c	2016-05-04 21:08:46.606264315 +0000
-+++ ipx-1.1/ipx_configure.c	2016-05-04 21:21:46.139346843 +0000
-@@ -7,6 +7,7 @@
- #include <unistd.h>
- #include <ctype.h>
- #include <getopt.h>
-+#include <stdlib.h>
- #include <strings.h>
- #include <netipx/ipx.h>
- #include <sys/types.h>
-Binary files ipx-1.1.orig/ipx_interface and ipx-1.1/ipx_interface differ
-diff -ur ipx-1.1.orig/ipx_interface.c ipx-1.1/ipx_interface.c
---- ipx-1.1.orig/ipx_interface.c	2016-05-04 21:08:46.606264315 +0000
-+++ ipx-1.1/ipx_interface.c	2016-05-04 21:20:27.414995860 +0000
-@@ -8,7 +8,7 @@
- #include <errno.h>
- #include <unistd.h>
- #include <stdlib.h>
--#include <strings.h>
-+#include <string.h>
- #include <netinet/in.h>
- #include <netipx/ipx.h>
- #include <linux/if.h>
-Binary files ipx-1.1.orig/ipx_internal_net and ipx-1.1/ipx_internal_net differ
-diff -ur ipx-1.1.orig/ipx_internal_net.c ipx-1.1/ipx_internal_net.c
---- ipx-1.1.orig/ipx_internal_net.c	2016-05-04 21:08:46.606264315 +0000
-+++ ipx-1.1/ipx_internal_net.c	2016-05-04 21:20:14.814299490 +0000
-@@ -7,7 +7,7 @@
- #include <stdlib.h>
- #include <ctype.h>
- #include <errno.h>
--#include <strings.h>
-+#include <string.h>
- #include <netinet/in.h>
- #include <netipx/ipx.h>
- #include <linux/if.h>
-Binary files ipx-1.1.orig/ipx_route and ipx-1.1/ipx_route differ
-diff -ur ipx-1.1.orig/ipx_route.c ipx-1.1/ipx_route.c
---- ipx-1.1.orig/ipx_route.c	2016-05-04 21:08:46.606264315 +0000
-+++ ipx-1.1/ipx_route.c	2016-05-04 21:20:17.954473064 +0000
-@@ -8,7 +8,7 @@
- #include <stdlib.h>
- #include <ctype.h>
- #include <errno.h>
--#include <strings.h>
-+#include <string.h>
- #include <netinet/in.h>
- #include <netipx/ipx.h>
- #include <sys/types.h>
diff --git a/net-misc/ipx-utils/files/ipx-utils-1.1-makefile.patch b/net-misc/ipx-utils/files/ipx-utils-1.1-makefile.patch
deleted file mode 100644
index 5a596f818d19..000000000000
--- a/net-misc/ipx-utils/files/ipx-utils-1.1-makefile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- ipx-1.1.orig/Makefile
-+++ ipx-1.1/Makefile
-@@ -10,17 +10,8 @@ clean:
- install: $(UTILS)
- 	for i in $(UTILS); \
- 	do \
--		install --strip $$i /sbin; \
--		install $$i.8 /usr/man/man8; \
-+		install $$i ${DESTDIR}/sbin; \
-+		install $$i.8 ${DESTDIR}/usr/share/man/man8; \
- 	done
--	install init.ipx /etc/rc.d/init.d/ipx
--	install -m 0644 config.ipx /etc/sysconfig/ipx
--	rm -f /etc/rc.d/rc2.d/S15ipx
--	ln -sf /etc/rc.d/init.d/ipx /etc/rc.d/rc2.d/S15ipx
--	rm -f /etc/rc.d/rc3.d/S15ipx
--	ln -sf /etc/rc.d/init.d/ipx /etc/rc.d/rc3.d/S15ipx
--	rm -f /etc/rc.d/rc5.d/S15ipx
--	ln -sf /etc/rc.d/init.d/ipx /etc/rc.d/rc5.d/S15ipx
--	rm -f /etc/rc.d/rc6.d/K55ipx
--	ln -sf /etc/rc.d/init.d/ipx /etc/rc.d/rc6.d/K55ipx
--
-+#	install init.ipx /etc/rc.d/init.d/ipx
-+#	install -m 0644 config.ipx /etc/sysconfig/ipx
diff --git a/net-misc/ipx-utils/files/ipx-utils-1.1-proc.patch b/net-misc/ipx-utils/files/ipx-utils-1.1-proc.patch
deleted file mode 100644
index d82d228ff139..000000000000
--- a/net-misc/ipx-utils/files/ipx-utils-1.1-proc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ipx-1.1/ipx_interface.c.orig	2004-10-16 13:14:40.677964152 -0400
-+++ ipx-1.1/ipx_interface.c	2004-10-16 13:15:18.464219768 -0400
-@@ -191,7 +191,9 @@
- 		exit(-1);
- 	}
- 
--	fp = fopen("/proc/net/ipx_interface", "r");
-+	fp = fopen("/proc/net/ipx/interface", "r");
-+	if (fp == NULL)
-+		fp = fopen("/proc/net/ipx_interface", "r");
- 	if (fp == NULL) {
- 		fprintf(stderr, 
- 			"%s: Unable to open \"/proc/net/ipx_interface.\"\n",
diff --git a/net-misc/ipx-utils/files/ipx.confd b/net-misc/ipx-utils/files/ipx.confd
deleted file mode 100644
index da14fd6e6605..000000000000
--- a/net-misc/ipx-utils/files/ipx.confd
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Config file for /etc/init.d/ipx
-
-# Automatically selecting a primary interface.
-IPX_AUTO_PRIMARY=on
-
-# Automatically creating interfaces.
-IPX_AUTO_INTERFACE=on
-
-# Interface to which IPX sockets are bound.
-IPX_DEVICE=eth0
-
-# The IPX frame type to use
-IPX_FRAME=802.2
-
-# Create a special kind of IPX interface that does not
-# have a physical device or frame type.
-IPX_INTERNAL_NET=no
-
-# Network number
-IPX_NETNUM=1
-
-# Node number
-IPX_NODENUM=1
diff --git a/net-misc/ipx-utils/files/ipx.init b/net-misc/ipx-utils/files/ipx.init
deleted file mode 100644
index 891505926b63..000000000000
--- a/net-misc/ipx-utils/files/ipx.init
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-#NB: Config is in /etc/conf.d/ipx
-
-depend() {
-	use net
-}
-
-start() {
-	local retval=0
-	
-	ebegin "Bringing IPX up"
-	if [ ${IPX_INTERNAL_NET} = "yes" ]
-	then
-		/sbin/ipx_internal_net add ${IPX_NETNUM} ${IPX_NODENUM}
-		retval=$?
-	else
-		/sbin/ipx_interface add -p ${IPX_DEVICE} \
-			${IPX_FRAME} ${IPX_NETNUM}
-		retval=$?
-	fi
-	
-	ipx_configure \
-		--auto_primary=${IPX_AUTO_PRIMARY} \
-		--auto_interface=${IPX_AUTO_INTERFACE}
-	retval=$(( $retval + $? ))
-	eend ${retval} "Failed to bring IPX up"
-}
-
-stop() {
-	local retval=0
-	
-	ebegin "Bringing IPX down"
-	/bin/umount -v -a -tncpfs
-	/sbin/ipx_configure --auto_primary=off --auto_interface=off
-	retval=$?
-	/sbin/ipx_interface delall
-	retval=$(( $retval + $? ))
-	eend ${retval} "Failed to down IPX"
-}
diff --git a/net-misc/ipx-utils/ipx-utils-1.1-r4.ebuild b/net-misc/ipx-utils/ipx-utils-1.1-r4.ebuild
deleted file mode 100644
index ce29d24d766c..000000000000
--- a/net-misc/ipx-utils/ipx-utils-1.1-r4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eutils
-
-DESCRIPTION="The IPX Utilities"
-HOMEPAGE="ftp://sunsite.unc.edu/pub/Linux/system/filesystems/ncpfs/"
-SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/filesystems/ncpfs/${P/-utils}.tar.gz"
-
-LICENSE="ipx-utils GPL-2" # GPL-2 only for init script
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-RDEPEND="!!net-fs/ncpfs" # conflicts on manpages
-
-S=${WORKDIR}/${P/-utils}
-
-src_prepare() {
-	sed -i "s:-O2 -Wall:${CFLAGS}:" "${S}"/Makefile
-	eapply "${FILESDIR}"/${P}-makefile.patch
-	eapply "${FILESDIR}"/${P}-proc.patch #67642
-	eapply "${FILESDIR}"/${P}-gcc-warnings.patch
-
-	default
-}
-
-src_install() {
-	doman *.8
-	newconfd "${FILESDIR}"/ipx.confd ipx
-	newinitd "${FILESDIR}"/ipx.init ipx
-
-	into /sbin
-	default
-}
diff --git a/net-misc/ipx-utils/metadata.xml b/net-misc/ipx-utils/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-misc/ipx-utils/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-misc/knock/Manifest b/net-misc/knock/Manifest
index 5c1ed39756f1..d24f43193556 100644
--- a/net-misc/knock/Manifest
+++ b/net-misc/knock/Manifest
@@ -1,5 +1,5 @@
 AUX knockd.confd.2 189 BLAKE2B 288c5c9e47a3001d83edd0f9d54286754fecd7d8321896370af63c0e3429a2c4004a8e99a835e558878f6b934d8c50f6ecdc5f267cd7608c59de46cfed195162 SHA512 75a483770c31f8de3744c9c3119c5cf818b9ff780bf9cffb49c1f4a78b2f384dc392218ea2a0df9fd7178a19b0b1f5a59d8a81cdb56f952cd4c8e5a91c9cf25a
 AUX knockd.initd.2 527 BLAKE2B 1c0e429d07d4023d34ae129c900161a9a681cd76761e953e3b6416fb3f5ad067b8f2e5c567887ccfc43adaa3b1a1f9e58bcb19ed660b118785db41aa45330107 SHA512 dc66e53bdc42487609d978a538dec26712f25c87b9a2e4a70e1a833fedfbacf3b8618f87cbe110ed54938f6620fd2e5f7a79143d7f8503927686dfa26eb9acff
 DIST knock-0.7.tar.gz 110791 BLAKE2B 19e63854800f4ef77199fb4005dabd749f16681068d205a924fa0bc926d2cc31a69c1f62ffa8ec335209cfa987e7db92d9332b43e971f71528f69740ced06391 SHA512 eab5d855f7111d9411e84a56a15e8ea74f41c5bd9dee27ab49f0d8d509eeeb96a60c508928c92916dc0ec9b737c447ca8ca5ed4db6479b389549d60e76a85aa7
-EBUILD knock-0.7.ebuild 1098 BLAKE2B 9a5ada3e3d7ca576a5174c2f783f67b2ad240879f36c3ea399ff8108f1953c64b20af879f47849d78a522cdbd8f4628ad95c8567b3a9f18baf88dc6fa1ba292a SHA512 17d98392fe54b136c0f6adf2c5b64b4bcb2afc3db8c6c28ae11d4cc620f014c00c15839eac2540971913ac5d486bd00253423260bc6fb3d91e42e66728e6928e
+EBUILD knock-0.7-r1.ebuild 1123 BLAKE2B 6342aa37df57028fc75cffde7e6876ebd497d7ab1e1fbcfe8aa303cca3c0c4f86dda259893a4fa3952df189a8c5c22d41b1762cdaa02a7315265b79ac7ac42c0 SHA512 29be59b12c60eb33af2ed64a78fc4df90cd7bb6496f823e14b14c58d9389c3f64fe4cff36adf2572ee936f4518930ea4012a504eff6e8076f3bb0892747e659c
 MISC metadata.xml 246 BLAKE2B dba219f8b59aae4aed3685948a81fc06da8d34cbe8a59fafe7b9c503f63fbcb011514ee8734fd74928ffc93e2ab201902fb28702df8b30be5d8636e4de0ce6d8 SHA512 68d82bf2a215c76134e5dc45ed11f3db4546f21f6989513faa7792e0ba0b706688960710f1d6cee3d2f209636d3552df9ed8120edfc1609b9d7d687883becc84
diff --git a/net-misc/knock/knock-0.7-r1.ebuild b/net-misc/knock/knock-0.7-r1.ebuild
new file mode 100644
index 000000000000..117341a6615e
--- /dev/null
+++ b/net-misc/knock/knock-0.7-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Simple port-knocking daemon"
+HOMEPAGE="https://www.zeroflux.org/projects/knock
+	https://github.com/jvinet/knock"
+SRC_URI="https://www.zeroflux.org/proj/knock/files/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE="+server"
+
+DEPEND="server? ( net-libs/libpcap )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -e "/^AM_CFLAGS/s: -g : :" \
+		-e "/dist_doc_DATA/s:COPYING::" \
+		-i Makefile.in || die
+	sed -e "s:/usr/sbin/iptables:/sbin/iptables:g" \
+		-i knockd.conf || die
+}
+
+src_configure() {
+	econf $(use_enable server knockd)
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir="${EROOT}/usr/share/doc/${PF}" install
+
+	if use server ; then
+		newinitd "${FILESDIR}"/knockd.initd.2 knock
+		newconfd "${FILESDIR}"/knockd.confd.2 knock
+	fi
+}
+
+pkg_postinst() {
+	if use server && ! has_version net-firewall/iptables ; then
+		elog "You're really encouraged to install net-firewall/iptables to"
+		elog "actually modify your firewall and use the example configuration."
+	fi
+}
diff --git a/net-misc/knock/knock-0.7.ebuild b/net-misc/knock/knock-0.7.ebuild
deleted file mode 100644
index 2b61ae365f34..000000000000
--- a/net-misc/knock/knock-0.7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="A simple port-knocking daemon"
-HOMEPAGE="http://www.zeroflux.org/projects/knock"
-SRC_URI="http://www.zeroflux.org/proj/knock/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="+server"
-
-DEPEND="server? ( net-libs/libpcap )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -e "/^AM_CFLAGS/s: -g : :" \
-		-e "/dist_doc_DATA/s:COPYING::" \
-		-i Makefile.in || die
-	sed -e "s:/usr/sbin/iptables:/sbin/iptables:g" \
-		-i knockd.conf || die
-}
-
-src_configure() {
-	econf $(use_enable server knockd)
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir="${EROOT}/usr/share/doc/${PF}" install
-
-	if use server ; then
-		newinitd "${FILESDIR}"/knockd.initd.2 knock
-		newconfd "${FILESDIR}"/knockd.confd.2 knock
-	fi
-}
-
-pkg_postinst() {
-	if use server && ! has_version net-firewall/iptables ; then
-		einfo
-		elog "You're really encouraged to install net-firewall/iptables to"
-		elog "actually modify your firewall and use the example configuration."
-		einfo
-	fi
-}
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 76cfb8c07ce0..753b13fce62c 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -3,5 +3,5 @@ AUX nextcloud-client-2.6.4-qt515.patch 678 BLAKE2B 767ff6f3bb4ecd9ff6e87484d8e2b
 DIST nextcloud-client-2.5.2.tar.gz 18995992 BLAKE2B 6ad23962d327c1feeec34f59092021f7f82f4baeaf973fac0572db55cb03bc8ba2ed0c5037bcbfa80ca057d3976aaf6e402e129f2ec963b3a9c432330ef6aaf3 SHA512 1000b420355d7a4104ca5b41e813d467dcb345b60c79c78ce532de9c58ea89cad10d5565a433409bd512f0f7771c18c7c27974b968c74f84ccfda1ed3510d3ae
 DIST nextcloud-client-2.6.4.tar.gz 19035129 BLAKE2B 8721737a4e2515996de1910219c2d36b545e068ed5c66b2df85166646c25488f401563e113674254d9d1b1a70c19435c7c0728718e1633e8036ac1e415925b97 SHA512 849bf9bfa6a50342f6b58e805dc72ef342cb5f3e2e27d8f45d6a48759b1956dec194fb376b9a6b760df724f01eec3a22aadaa439f03e5166b1b2afb5454e40f1
 EBUILD nextcloud-client-2.5.2.ebuild 2032 BLAKE2B 7d8868094ef1a9c9204165ae2e716f09e1964c2eaad5e74a100492a11b3d180ec6ac66f6fc3374515c01dcf8430f1cf00ee845d1ea27ab6026b98dbc24b78eb0 SHA512 18b8ff5a30c85e4cfeb487e8f1cdd70b088e729b27a3031ec5bcdc1378bcbc9fd8f17d4b225067e2c9c024373cb76c42a32674bcad5f7069fd50c578442b5f17
-EBUILD nextcloud-client-2.6.4.ebuild 2065 BLAKE2B df0c4509008bb3543d7e62a4edba47b0b9a826598b5c1de227a0d958626b24054db79b6664341777bdcf6636a19c0c757a09e0677fdbee561205597c73e9ba06 SHA512 f569089d81fba7bec1c4659ee7776303356283795717a522a6aac8e38e02699ce538d351716e4560b9e4ce9f28834158b0b7d284436cf99b29c022dd22585fc6
+EBUILD nextcloud-client-2.6.4.ebuild 2063 BLAKE2B 8cba515c853082f9295afe9511f59c63a52d71410247df752aa89725c4091bbbd0aeac0e99c553f8e6246076266e398af9bc14329b5d033ed735fdc3d7b6f965 SHA512 b3b809f73652286f2df1c2720b36448e0ab4bcb66485211f1f8c4ca0a404fe31e6d38e70e19a956268050f0919f7cebe671bc1c21109fb55d3f813f4c5df5b68
 MISC metadata.xml 590 BLAKE2B 6ddde648f1b75a5ac3b83ff6b24cdef05b016052257dc99d152db249b029c88854a2b44a2d5a5e7a2b87b9148dbb677fa5bf12066c7f59a9ef5812bdbd57964b SHA512 27f8098bbdec79e03007513d2f4bd6799a399fc5930871542eedf3d018a13cacc1c4dfa23f9c78275c8e5a61830b1b6d4ebe667e3a4ff42541581d5287e940b4
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild
index 655fcb79a2b3..c8d32ee60c14 100644
--- a/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.
 
 LICENSE="CC-BY-3.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc dolphin nautilus shibboleth test"
 
 COMMON_DEPEND=">=dev-db/sqlite-3.4:3
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index d0ffc48eab44..df2aeee40d24 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -1,7 +1,6 @@
 AUX man-pages/genmans.sh 1882 BLAKE2B f2da7801ad33b15486bba29832587281bab0abd472b3645d4c4291701cce041e862eac6b625e3707c872aba3bf59c9223fafc33b7ecd7bc3a50fa517c3ac2fbe SHA512 7f5161c8c25066f1a08e0c228956716aa55e2b5c54e4a67e1d9b18ffcd9bdc56e95c345ffbee9c35d974146652909b80c87a2796053b26dd0b2a0ac40afefd6d
 AUX man-pages/ntp.conf.5.patch 503 BLAKE2B 039ae4ba832249fb47e15d7782644ad8b1bdd0058fbdcb5e22404ac5a51deb9736de9cd840b7eacd4f5bd865de80a83113a898428289aa1c2fb8fda72f038666 SHA512 6e75a7900c2cde0484e57e18b1244ed188b58be54b6622c3777251a2f412a27a98c41a65d6d62d93f9e84856f211bb268bd005aca146bc27aed982daf63f24fe
 AUX man-pages/ntp.xsl 5831 BLAKE2B 6234a07c8cecb63742ed6f068dab774e12a0d44dfd8f177a684cab9fcc9350b225073daee9731a60dd11d712cbebb124a52337cb466174699aab5f8559d53ae1 SHA512 c4fb1333a35a803783dc209186ea9005a0e529aba96103460e23a0eca483414898037802686cfff04bf910b06eb27ba8805c460962c3626af2d0951904484cbd
-AUX ntp-4.2.8-gc-tests.patch 1183 BLAKE2B a92f418a901f65b06e154be27794cc4f8fa99bf0c19f1f8240c79682503bf9742d3ebd00e6d189884db702bb814caee6b197f4be3233eaf01d1d54c40a01e6e0 SHA512 b761776bdb0ea50781c57c19e6f132a7ba596e944e06bef53d1d9a4ab154f6c941ef1dd7b7d7130de546d59d9d6a7df25517590f015f9a91ea7fede41d95b471
 AUX ntp-4.2.8-gcc10-fno-common.patch 729 BLAKE2B 42692a4ae85bbf59d8f9ea22109b189b597234cee236d18229efb4e53181b6288c04a25f77300ca98af10fca9d15cb3df6bd962244eb40047ae6fa345b906b72 SHA512 794a2879a686423609f424fb73b7a1416cb0253b262b4c6b3bd42d9bb46441987daa87873bd343cc2987a9d65da887bb132c95c2bb1515ffb39637f9e64b1569
 AUX ntp-4.2.8-ipc-caps.patch 471 BLAKE2B 307a23be635e0a78f12882c26580caaebc5a38d463b3b1c686bbdc71a225bdb97ad03703513b112b9509958c687f046df3153baab1d26d019a988c94ede796a8 SHA512 549a92021ebceb1a3ea8d6599e9aa31983b0db96a2ab88959e422a0f9b7a9a4e811b943de1ac4d04e3303309b43391610beec0d1a354eb320dc795576afdd81f
 AUX ntp-4.2.8-sntp-test-pthreads.patch 325 BLAKE2B eb4d7c8b6723d0f5d17670d8ca2e9cc5df801b24dee7d5f30c73eb8ffb5a6ebfa6651b8ae37da35cb1f97171eaebef5e71afa49e2c996a40a3b1ffee6d34f5ab SHA512 d4eef7c2bdcd1db9bdb6923d78b106519efe927134a0133bd18c07195214c64535d47a0265647f2c55ff08f9ede192c2fa05a8a52bf2c1e1532d3bee9f0de8a4
@@ -14,19 +13,16 @@ AUX ntp.conf 1614 BLAKE2B 88158ad4270a7b3f42de7d3dcaa5a2dc5f7900171c0259834ff781
 AUX ntpd.confd 192 BLAKE2B f5387ba2571b238a3e4f78c11151153deb40ad0babe4728942ec0f5f87d405e95047a3a72c7f747fb52e6bfc0dc2e8da10867e83394ff07e8381fbdf0b666c26 SHA512 a9e96a214d3c21a3f4863709c48a11f9dedc73e2d83a9b20761021df44a9acb56757e77f113aa0314f5f3923e9cb26bc6e0147658d20e8a74d078d415a171d91
 AUX ntpd.rc-r1 489 BLAKE2B 6d3fe11a2ba7d04d02b24ca3acbcae5419908d12e94118bf91fca825f7561304a01dc9085cdc371b91498f6b14503c94cddeeb462b23c2b4b1017d3bfd3bd3ba SHA512 d51856ebff9160a01e1331114c5a8ea7337f9c8b570da75f36bbb29dcaf1924a40cdbbbf56e03148fc0f540103846e58d15175acf2e9d83c6b68d55c1e199734
 AUX ntpd.service-r2 207 BLAKE2B 5df5cbdde640e2686b94bf5ae952f257ec6905204aade6e0c482623187456336a5f7e4dc89fe56d929f17b16a8016e775c83f8db0bf8cfc30a819cf79da16b2d SHA512 c6425efdc046f5a8981a2ec97993d65454fe4a0c4162f8e8d873abf91280a4263509657e1d582baf5b02ce0ba536b87ca49158725f69914c9b01502f8c0e97f1
-AUX ntpdate.service-r1 316 BLAKE2B ffa7df1f3cab697bf971545cf1c60394ea456f67e2013adafdab97b4f44f93851705c3bd60e0a075c8c2b3c2f2b5d89440d63db9617dc37ac07bafe015f89e8d SHA512 156a6e48be3534ddd6e699315fa65d7ea0ee070594d7b7049962adeb8b411c0f2b919b93afe3f2976392a300792c6e6139529cc576dab6af3f8b94919af27eab
 AUX ntpdate.service-r2 325 BLAKE2B 807cef41cdaf78e582f6e77b8c992c8fed048ccb64b01152111294e4f281858815d17d90318421ba6dfcfceb49dbbbd8ae691533ff5e06ed972fb298f17d0e02 SHA512 745a9b9dd3a440b41228b1139978782dc1c2dd9a0876b5c4f9b842570fab1a6c6fd8f9e1a8b638aa7113ec863cefc17d578d8497ef4ea685ad984fc4020fb2db
 AUX ntpdate.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be686966e6ee738375a5b8df68a4216c0d8e14c11223945be82a5f221d46d94e15349753a358542b7c9ae SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8
 AUX sntp.confd 149 BLAKE2B 8ef1da02161b1b757dcf3f34934f2455499ad1f28b0691e4b49334c5900b936a96eb91bac371e756256678ff4fbcad30239fe8753d605fc8a9c498a2fbad72d3 SHA512 28c8f1fd3a69bbdfacc2379a3ce01f254ae21fd8b91d893600086d27e5fb9cccf05d1bf62022ab26fcb53fa2080d4178961619811fd7a56f4e7502893f8ea13b
 AUX sntp.rc 484 BLAKE2B b8d829c7f1f2f9fc5e4cfd584483f31843d5b5740cf2fd89a9718fc7db86fc540406dfbf1209fbd5a1a44b3c9a2e0ffc92b28d01310a2125507489f0caf3ec10 SHA512 17b48cf31f5b15f5219d4a7f69a5eb84805bea256f8ae5b4888e56ec4de7e9a2640c7a36e236a467ecc7881a1757a12c24124697694730341f24bdeb751d8d7d
-AUX sntp.service-r2 324 BLAKE2B c94e72170f46453e94d6fb48b3ee353ba2db1bdf1903f6521219975e9a456346f8525f8016dfb10779e474e9495d7dc37ebfbf6e23b4482a6ae2396e6456796f SHA512 8626967f3bf9ef01fa5a2b7268b220ed7c518974db450a6f56316ede7b57947351171fb8ae6d28d32599e50c1d5506b4547dfd03cdbd80c5b873efb7d606cf17
 AUX sntp.service-r3 320 BLAKE2B b47a7a4dab78c0ea9f85b861d7f5f2926e5302839db34b920aa400cbf7db4ecbc874e5cddb778dbdca07da9cb79be327c1c0f8f296d30bb20d6b886b41084e5f SHA512 607322b6b47fc3e64e16a91e8c4114fcc1c565769e08dc872be9d9eb7c747a42c52a3ac855544cd05a3ae232463d612c1e58fcfed2d5b8f6fbdeff076f490380
 AUX sntp.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be686966e6ee738375a5b8df68a4216c0d8e14c11223945be82a5f221d46d94e15349753a358542b7c9ae SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8
-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
 DIST ntp-4.2.8p14-manpages.tar.xz 25720 BLAKE2B fbb7342729155be6863962136a779b338a5a24be5ba95893260c4308e48afc7364630da726d19077a50a607c3a1ac545b76fa6250ac21d18ed08a345624cd65c SHA512 6efeef479b24841dca1db09fbb6e8469cb32ecb3f84f55ac38cc1dbe5fe6354a0842649755bcf7e2cc6151c05d65ffa5445f1fc34a003f6d3df08ec9dbcbe6d1
 DIST ntp-4.2.8p14.tar.gz 7007263 BLAKE2B addcf94b58ea1938914115b662b4aa071586f1ff2cb66823c85fa92d4097c8fe5ce8583a7fae6dd4f7d8ff433348f1eff740bbeb210a1c08d322fc9076a84847 SHA512 b0183b4b2f2c6ea0a49d0aca1fa28a7b5cd21e20696a2f633f5afa37c4ea2c59fa7769af82a55c626db49b9eb5a531608710dc1977c4d518583577ef95940ae8
-EBUILD ntp-4.2.8_p13-r2.ebuild 4542 BLAKE2B fb88e178f76f757530d020a9987f8fd3f70b81e22486e8e30c997635c500795b04eb5bcfcd5cd6acfa0db7fd480f3903e65a91763cb68d9b3e3a3b77f3dde2be SHA512 bf5dddbd1d8b3b387864275b70edb49440696e846e2631227f8092e737c97d9346b1b52cbf02033f61833912907a16442fa46464098aed0ff471ba2d1f7c4914
-EBUILD ntp-4.2.8_p13.ebuild 4482 BLAKE2B d1b16d12c8f6229096d925d9764c265e74e84935d55b47c35f3a05d7eb0c68d9c9890c069c078533b61797322bf960c30c7bb8c2caa4726a528c13998bb5ab8d SHA512 d5a96d8e3f1aa99b8bcef1c3d2846e4590f272b343ea7fbd099a332b935429219db5f1320764e2c2072d6b0390ae1917a70d7d331579b5d7b25e7fd8de80a57e
+DIST ntp-4.2.8p15-manpages.tar.xz 25700 BLAKE2B 6a225bc19dcebee31cb8e0d621963863d567a882655b57be8b65a16f9d3dd138787c7c6b9ff08853306f2e9b11d65cb76e3215cc5b2262a91c411d437974fc18 SHA512 21721550864b4e7e91bf20ca894109253439b737799dfc803e1496b3454199f34646f40e0156c08a39d5914e5a92f35908cec0245e1e2627c75c0e64939ba028
+DIST ntp-4.2.8p15.tar.gz 7015970 BLAKE2B 5697d6623d79686f9ca9ad907172bf942383067d1e9817117d20db042e9f7410644f236f1a0d77ab6bf6ec468476e12ea65b494a28f0dd8674bf08fc8875cfef SHA512 f5ad765e45fc302263dd40e94c287698fd235b94f3684e49f1d5d09d7d8bdd6b8c0fb96ecdabffea3d233e1e79b3c9687b76dc204ba76bad3f554682f4a97794
 EBUILD ntp-4.2.8_p14-r2.ebuild 4595 BLAKE2B f1e6d0463c435249205a44d6215099e79278172acc560770723b293409432c265a9cb2d0a1733a2331ec453bc03fc8ae6e714aa33d403df3810d72437d12378b SHA512 7badaee6ba22252b003d3345b3cf08d2e9365f0721350279bebda13ec10e1bd8139c413947c45cb0ef63d0acc006f31d597c3cee634b1602f154a71a2daa8175
+EBUILD ntp-4.2.8_p15.ebuild 4554 BLAKE2B 53716498d82265c1db38cff06915df334754d5af5a17b587fb39e3a36ea2c78198a4c6a635e822164458f9b4c8c85cf6c514172a8444ef4fb5fc16b82d59a97c SHA512 8c946674cd2407c27d870e890a575a70cf7866a9a52941f32f599bb8d6153e34a3cfae78d78b9c9f87eaa03267baed7bc241d2e402763a88d01fa34f995a2384
 MISC metadata.xml 1014 BLAKE2B 133457965d766f0db56bbca2755a7e4c37319237843dbb92e7b2563194cc2282500010e76877d9cd5d6c9a56f8b815ffab1bdc84d76446310f3cee5476ff7f52 SHA512 37f6b14a86b13c20ecc83967332599b26e958015798e341ca3e1c1d79a666a3b69904c4aeb5ff298477d2b5fd709a2fe09271dbe41910e3f439bef47efa6b650
diff --git a/net-misc/ntp/files/ntp-4.2.8-gc-tests.patch b/net-misc/ntp/files/ntp-4.2.8-gc-tests.patch
deleted file mode 100644
index 19f0c0f8bfe4..000000000000
--- a/net-misc/ntp/files/ntp-4.2.8-gc-tests.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Avoid building problematic tests on platforms
-whose linker does not support --gc-sections.
-
-https://bugs.ntp.org/show_bug.cgi?id=3601
-https://bugs.gentoo.org/564018
-
---- a/sntp/m4/ntp_problemtests.m4	2019-09-23 07:19:18.545861137 +0200
-+++ b/sntp/m4/ntp_problemtests.m4	2019-09-23 07:19:18.545861137 +0200
-@@ -33,6 +33,10 @@
-  no:0:*-*-solaris*) ;;
-  *) ntp_test_ntp_restrict="yes" ;;
- esac
-+case "$ntp_cv_gc_sections_runs" in
-+  no) ntp_test_ntp_restrict="no" ;;
-+  * ) ;;
-+esac
- AC_MSG_RESULT([$ntp_test_ntp_restrict])
- AM_CONDITIONAL([BUILD_TEST_NTP_RESTRICT], [test x$ntp_test_ntp_restrict = xyes])
- 
-@@ -43,6 +47,10 @@
-  no:0:*-*-solaris*) ;;
-  *) ntp_test_ntp_scanner="yes" ;;
- esac
-+case "$ntp_cv_gc_sections_runs" in
-+  no) ntp_test_ntp_scanner="no" ;;
-+  * ) ;;
-+esac
- AC_MSG_RESULT([$ntp_test_ntp_scanner])
- AM_CONDITIONAL([BUILD_TEST_NTP_SCANNER], [test x$ntp_test_ntp_scanner = xyes])
- 
-@@ -53,6 +61,10 @@
-  no:0:*-*-solaris*) ;;
-  *) ntp_test_ntp_signd="yes" ;;
- esac
-+case "$ntp_cv_gc_sections_runs" in
-+  no) ntp_test_ntp_signd="no" ;;
-+  * ) ;;
-+esac
- AC_MSG_RESULT([$ntp_test_ntp_signd])
- AM_CONDITIONAL([BUILD_TEST_NTP_SIGND], [test x$ntp_test_ntp_signd = xyes])
- 
diff --git a/net-misc/ntp/files/ntpdate.service-r1 b/net-misc/ntp/files/ntpdate.service-r1
deleted file mode 100644
index f9bc9ddefc90..000000000000
--- a/net-misc/ntp/files/ntpdate.service-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Set time via NTP using ntpdate
-After=network-online.target nss-lookup.target
-Before=time-sync.target
-Wants=time-sync.target
-Conflicts=systemd-timesyncd.service             
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/ntpdate -b -u $SERVER
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/ntp/files/sntp.service-r2 b/net-misc/ntp/files/sntp.service-r2
deleted file mode 100644
index 9bdd578ffbc7..000000000000
--- a/net-misc/ntp/files/sntp.service-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Set time via SNTP
-After=network.target NetworkManager-wait-online.service nss-lookup.target
-Before=time-sync.target
-Wants=time-sync.target
-Conflicts=systemd-timesyncd.service             
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/sntp -s $SERVER
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild
deleted file mode 100644
index a50710aa1a3e..000000000000
--- a/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs flag-o-matic systemd
-
-MY_P=${P/_p/p}
-DESCRIPTION="Network Time Protocol suite/programs"
-HOMEPAGE="http://www.ntp.org/"
-SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
-	https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz"
-
-LICENSE="HPND BSD ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint"
-IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
-
-COMMON_DEPEND="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 )"
-BDEPEND="virtual/pkgconfig
-	acct-group/ntp
-	acct-user/ntp"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/ntp
-	acct-user/ntp
-	selinux? ( sec-policy/selinux-ntp )
-	vim-syntax? ( app-vim/ntp-syntax )
-	!net-misc/ntpsec
-	!openntpd? ( !net-misc/openntpd )
-"
-PDEPEND="openntpd? ( net-misc/openntpd )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966
-	"${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
-	"${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
-	"${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch
-	"${FILESDIR}"/${PN}-4.2.8-gc-tests.patch #564018
-)
-
-src_prepare() {
-	default
-	append-cppflags -D_GNU_SOURCE #264109
-	# Make sure every build uses the same install layout. #539092
-	find sntp/loc/ -type f '!' -name legacy -delete || die
-	eautoreconf #622754
-	# Disable pointless checks.
-	touch .checkChangeLog .gcc-warning FRC.html html/.datecheck
-}
-
-src_configure() {
-	# avoid libmd5/libelf
-	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
-	export ac_cv_lib_elf_nlist=no
-	# blah, no real configure options #176333
-	export ac_cv_header_dns_sd_h=$(usex zeroconf)
-	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
-	# Increase the default memlimit from 32MiB to 128MiB.  #533232
-	local myeconfargs=(
-		--with-lineeditlibs=readline,edit,editline
-		--with-yielding-select
-		--disable-local-libevent
-		--with-memlock=256
-		$(use_enable caps linuxcaps)
-		$(use_enable parse-clocks)
-		$(use_enable ipv6)
-		$(use_enable debug debugging)
-		$(use_with readline lineeditlibs readline)
-		$(use_enable samba ntp-signd)
-		$(use_with snmp ntpsnmpd)
-		$(use_with ssl crypto)
-		$(use_enable threads thread-support)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# move ntpd/ntpdate to sbin #66671
-	dodir /usr/sbin
-	mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin"
-
-	dodoc INSTALL WHERE-TO-START
-	doman "${WORKDIR}"/man/*.[58]
-
-	insinto /etc
-	doins "${FILESDIR}"/ntp.conf
-	use ipv6 || sed -i '/^restrict .*::1/d' "${ED}"/etc/ntp.conf #524726
-	newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd
-	newconfd "${FILESDIR}"/ntpd.confd ntpd
-	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
-	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
-	newinitd "${FILESDIR}"/sntp.rc sntp
-	newconfd "${FILESDIR}"/sntp.confd sntp
-	if ! use caps ; then
-		sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die
-	fi
-	sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die
-
-	keepdir /var/lib/ntp
-	use prefix || fowners ntp:ntp /var/lib/ntp
-
-	if use openntpd ; then
-		cd "${ED}" || die
-		rm usr/sbin/ntpd || die
-		rm -r var/lib || die
-		rm etc/{conf,init}.d/ntpd || die
-		rm usr/share/man/*/ntpd.8 || die
-	else
-		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 \
-				|| die
-		fi
-		systemd_enable_ntpunit 60-ntpd ntpd.service
-	fi
-
-	systemd_newunit "${FILESDIR}"/ntpdate.service-r2 ntpdate.service
-	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
-	systemd_newunit "${FILESDIR}"/sntp.service-r3 sntp.service
-	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
-}
-
-pkg_postinst() {
-	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
-		eerror "The notrust option was found in your /etc/ntp.conf!"
-		ewarn "If your ntpd starts sending out weird responses,"
-		ewarn "then make sure you have keys properly setup and see"
-		ewarn "https://bugs.gentoo.org/41827"
-	fi
-}
diff --git a/net-misc/ntp/ntp-4.2.8_p13.ebuild b/net-misc/ntp/ntp-4.2.8_p13.ebuild
deleted file mode 100644
index 6656edb76903..000000000000
--- a/net-misc/ntp/ntp-4.2.8_p13.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools toolchain-funcs flag-o-matic user systemd
-
-MY_P=${P/_p/p}
-DESCRIPTION="Network Time Protocol suite/programs"
-HOMEPAGE="http://www.ntp.org/"
-SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
-	https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz"
-
-LICENSE="HPND BSD ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
-IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
-
-CDEPEND="readline? ( >=sys-libs/readline-4.1:0= )
-	>=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 )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-ntp )
-	vim-syntax? ( app-vim/ntp-syntax )
-	!net-misc/ntpsec
-	!openntpd? ( !net-misc/openntpd )
-"
-PDEPEND="openntpd? ( net-misc/openntpd )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966
-	"${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
-	"${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
-	"${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch
-)
-
-pkg_setup() {
-	enewgroup ntp 123
-	enewuser ntp 123 -1 /dev/null ntp
-}
-
-src_prepare() {
-	default
-	append-cppflags -D_GNU_SOURCE #264109
-	# Make sure every build uses the same install layout. #539092
-	find sntp/loc/ -type f '!' -name legacy -delete || die
-	eautoreconf #622754
-	# Disable pointless checks.
-	touch .checkChangeLog .gcc-warning FRC.html html/.datecheck
-}
-
-src_configure() {
-	# avoid libmd5/libelf
-	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
-	export ac_cv_lib_elf_nlist=no
-	# blah, no real configure options #176333
-	export ac_cv_header_dns_sd_h=$(usex zeroconf)
-	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
-	# Increase the default memlimit from 32MiB to 128MiB.  #533232
-	local myeconfargs=(
-		--with-lineeditlibs=readline,edit,editline
-		--with-yielding-select
-		--disable-local-libevent
-		--with-memlock=256
-		$(use_enable caps linuxcaps)
-		$(use_enable parse-clocks)
-		$(use_enable ipv6)
-		$(use_enable debug debugging)
-		$(use_with readline lineeditlibs readline)
-		$(use_enable samba ntp-signd)
-		$(use_with snmp ntpsnmpd)
-		$(use_with ssl crypto)
-		$(use_enable threads thread-support)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# move ntpd/ntpdate to sbin #66671
-	dodir /usr/sbin
-	mv "${ED%/}"/usr/bin/{ntpd,ntpdate} "${ED%/}"/usr/sbin/ || die "move to sbin"
-
-	dodoc INSTALL WHERE-TO-START
-	doman "${WORKDIR}"/man/*.[58]
-
-	insinto /etc
-	doins "${FILESDIR}"/ntp.conf
-	use ipv6 || sed -i '/^restrict .*::1/d' "${ED%/}"/etc/ntp.conf #524726
-	newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd
-	newconfd "${FILESDIR}"/ntpd.confd ntpd
-	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
-	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
-	newinitd "${FILESDIR}"/sntp.rc sntp
-	newconfd "${FILESDIR}"/sntp.confd sntp
-	if ! use caps ; then
-		sed -i "s|-u ntp:ntp||" "${ED%/}"/etc/conf.d/ntpd || die
-	fi
-	sed -i "s:/usr/bin:/usr/sbin:" "${ED%/}"/etc/init.d/ntpd || die
-
-	keepdir /var/lib/ntp
-	use prefix || fowners ntp:ntp /var/lib/ntp
-
-	if use openntpd ; then
-		cd "${ED}" || die
-		rm usr/sbin/ntpd || die
-		rm -r var/lib || die
-		rm etc/{conf,init}.d/ntpd || die
-		rm usr/share/man/*/ntpd.8 || die
-	else
-		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 \
-				|| die
-		fi
-		systemd_enable_ntpunit 60-ntpd ntpd.service
-	fi
-
-	systemd_newunit "${FILESDIR}"/ntpdate.service-r1 ntpdate.service
-	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
-	systemd_newunit "${FILESDIR}"/sntp.service-r2 sntp.service
-	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
-}
-
-pkg_postinst() {
-	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
-		eerror "The notrust option was found in your /etc/ntp.conf!"
-		ewarn "If your ntpd starts sending out weird responses,"
-		ewarn "then make sure you have keys properly setup and see"
-		ewarn "https://bugs.gentoo.org/41827"
-	fi
-}
diff --git a/net-misc/ntp/ntp-4.2.8_p15.ebuild b/net-misc/ntp/ntp-4.2.8_p15.ebuild
new file mode 100644
index 000000000000..b2cbb8b926a9
--- /dev/null
+++ b/net-misc/ntp/ntp-4.2.8_p15.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs flag-o-matic systemd
+
+MY_P=${P/_p/p}
+DESCRIPTION="Network Time Protocol suite/programs"
+HOMEPAGE="http://www.ntp.org/"
+SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
+	https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz"
+
+LICENSE="HPND BSD ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint"
+IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
+
+COMMON_DEPEND="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 )"
+BDEPEND="virtual/pkgconfig
+	acct-group/ntp
+	acct-user/ntp"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/ntp
+	acct-user/ntp
+	selinux? ( sec-policy/selinux-ntp )
+	vim-syntax? ( app-vim/ntp-syntax )
+	!net-misc/ntpsec
+	!openntpd? ( !net-misc/openntpd )
+"
+PDEPEND="openntpd? ( net-misc/openntpd )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966
+	"${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
+	"${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
+	"${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch
+	"${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch #711530
+)
+
+src_prepare() {
+	default
+	append-cppflags -D_GNU_SOURCE #264109
+	# Make sure every build uses the same install layout. #539092
+	find sntp/loc/ -type f '!' -name legacy -delete || die
+	eautoreconf #622754
+	# Disable pointless checks.
+	touch .checkChangeLog .gcc-warning FRC.html html/.datecheck
+}
+
+src_configure() {
+	# avoid libmd5/libelf
+	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
+	export ac_cv_lib_elf_nlist=no
+	# blah, no real configure options #176333
+	export ac_cv_header_dns_sd_h=$(usex zeroconf)
+	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
+	# Increase the default memlimit from 32MiB to 128MiB.  #533232
+	local myeconfargs=(
+		--with-lineeditlibs=readline,edit,editline
+		--with-yielding-select
+		--disable-local-libevent
+		--with-memlock=256
+		$(use_enable caps linuxcaps)
+		$(use_enable parse-clocks)
+		$(use_enable ipv6)
+		$(use_enable debug debugging)
+		$(use_with readline lineeditlibs readline)
+		$(use_enable samba ntp-signd)
+		$(use_with snmp ntpsnmpd)
+		$(use_with ssl crypto)
+		$(use_enable threads thread-support)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	# move ntpd/ntpdate to sbin #66671
+	dodir /usr/sbin
+	mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin"
+
+	dodoc INSTALL WHERE-TO-START
+	doman "${WORKDIR}"/man/*.[58]
+
+	insinto /etc
+	doins "${FILESDIR}"/ntp.conf
+	use ipv6 || sed -i '/^restrict .*::1/d' "${ED}"/etc/ntp.conf #524726
+	newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd
+	newconfd "${FILESDIR}"/ntpd.confd ntpd
+	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
+	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
+	newinitd "${FILESDIR}"/sntp.rc sntp
+	newconfd "${FILESDIR}"/sntp.confd sntp
+	if ! use caps ; then
+		sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die
+	fi
+	sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die
+
+	keepdir /var/lib/ntp
+	use prefix || fowners ntp:ntp /var/lib/ntp
+
+	if use openntpd ; then
+		cd "${ED}" || die
+		rm usr/sbin/ntpd || die
+		rm -r var/lib || die
+		rm etc/{conf,init}.d/ntpd || die
+		rm usr/share/man/*/ntpd.8 || die
+	else
+		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 \
+				|| die
+		fi
+		systemd_enable_ntpunit 60-ntpd ntpd.service
+	fi
+
+	systemd_newunit "${FILESDIR}"/ntpdate.service-r2 ntpdate.service
+	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
+	systemd_newunit "${FILESDIR}"/sntp.service-r3 sntp.service
+	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
+}
+
+pkg_postinst() {
+	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
+		eerror "The notrust option was found in your /etc/ntp.conf!"
+		ewarn "If your ntpd starts sending out weird responses,"
+		ewarn "then make sure you have keys properly setup and see"
+		ewarn "https://bugs.gentoo.org/41827"
+	fi
+}
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index c5b0860b87a2..87bf8db835ed 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -10,7 +10,9 @@ AUX ntpsec-1.1.8-fix-missing-scmp_sys-on-aarch64.patch 536 BLAKE2B cac17041a05d0
 AUX ntpsec-no-bsd.patch 1538 BLAKE2B 6abb7acf23149a5a47f8e479bff090966e7e6161fc0d5bca1f9e5b9396d90898a783e7d309d6cdbdf689ea12314c804aa7a39f05b3f11d75a95eb337cea95b55 SHA512 7ddb346c7f0c9b30ea08ac28eaa39cf86e3d6cee7eaeba3bc7fe0883acd5087966e4e7beb298cee02607dfa3198a8c1dfcd9ce43ead820de3bb7014cefe75302
 DIST ntpsec-1.1.7.tar.gz 2534524 BLAKE2B 5777ecca4ceb988632fadc0e7124530993a7758cdf335e8cd90f0ec1a8b643be89b67c0e2bf49d6d7193bf92ded138af0df4b5856c0d113f552ef22dd8a6cadf SHA512 734b12820539e655e504dd5071a58b9d1f80c0b0c3c7458c797ba7ada23d8e446751fbcbddd9832d9151a3ba9464749878db9e77e23cdd5f6215ab9e1d908ae9
 DIST ntpsec-1.1.8.tar.gz 2589363 BLAKE2B e7e11a7d980599ac598f084608160d3f6f6cf8e2aab5fb45cc15cabca30462bd03db7b9ecc140826c5d7b5e26f49b48f7f2b6043bdc2ffa1d73167347fb8123f SHA512 0920f25adf68f1b8ccd1734c5d61ba1c858cd86b342db7b5155dd9b58e538aa96aad3fd4058597f079ec3df63cb51d2900ac8e6d9c84d6f2bd4a3a22cc0c967c
+DIST ntpsec-1.1.9.tar.gz 2606066 BLAKE2B bbc482333c7f86936fa20751df1b427bc24be159969050caf5751e26724714bbf6491b120986563497f015c96ac9cdbdf0e999c6446a68798aff23076f631ecc SHA512 e04267aa675a5b528f3478d00329a569ecb9bbe2b6ad18697020854d2ee451bc188c4603cd5f420a08a7e3bf047d2db1301416f57f9156df23aceb1f57303b0b
 EBUILD ntpsec-1.1.7-r1.ebuild 4157 BLAKE2B 9c992edfdb1ce011c07190c1f91da6eae3f8dada516587a94ea9a5aa2feedfc904583b63bca288df2301d8b2ae58d7353a822ee9ece4c34c99243076f776b0a2 SHA512 8afda370b45d2048f10c7f3122d67af4c45204b021a5ad62e686c35c79c59fed627cedb6d39653560354b692614222bbafd46938a2620a423defa6816f170f13
 EBUILD ntpsec-1.1.8.ebuild 4345 BLAKE2B 5912cebcb1f7315538293b3c0c332abaa43525b2d78c89d8d1bdda102bdfbcfb2c01a48ce599911952708ffac64a25607844d198d0f2bd43175f749fcf96a3bb SHA512 239de4704281175438c76099ecb03726ce467c811077e2d11b11671ebde6d102ecdf50838eaeae94484daa4af48bee5b2e336df440888f64fc4e599d8da69702
-EBUILD ntpsec-9999.ebuild 4069 BLAKE2B 4ba68e1c227e7baf2b3a9305dae9eb756333bc863ec10a0f0c7b98c91327f6e0727e4cd510ef63f36d93971a004f2cf7e46fde753928456e38eb92d4856b767a SHA512 c9be282b8b99060c6f9ca84c3a07e692b99c0e278e5f6848403f911b1830212f1a67ccb8b1ffe024d9a37efa24e8f1da7fc31271fcdc9415b8799d9845eb1b03
+EBUILD ntpsec-1.1.9.ebuild 4056 BLAKE2B c47d9c0fe4c01f1d66f1dc115f801cf95a6d8a7646f621c6e127b898581eb211520ea63e2eef43999039c32d6cc2eafd15fe8721ef4a5484e3528658ab11385f SHA512 c64b7cac7418191e75aa827e800f535a193165f5395215ffa3aca99a6ed0675d5a5c060eb5a3ed662882f2b3911977b918fe9366b49c7a7053f2f186ec60c1d5
+EBUILD ntpsec-9999.ebuild 4056 BLAKE2B c47d9c0fe4c01f1d66f1dc115f801cf95a6d8a7646f621c6e127b898581eb211520ea63e2eef43999039c32d6cc2eafd15fe8721ef4a5484e3528658ab11385f SHA512 c64b7cac7418191e75aa827e800f535a193165f5395215ffa3aca99a6ed0675d5a5c060eb5a3ed662882f2b3911977b918fe9366b49c7a7053f2f186ec60c1d5
 MISC metadata.xml 2078 BLAKE2B c15f3c9143653044f1da8fdf1e36298df819a6266ca369c511a9d4247cf32d93377b26f4898070c60d59b4737581b22b27a1097de38c314ec03cc908a18a31d3 SHA512 691f4b463d437616d897d979538e20726eda0a4835f3209639ef0ae7ecbcea6fd01c7bfd1849b91bfdd37e71b8306daa07cf6223a08848c7e45f8128135fa6fc
diff --git a/net-misc/ntpsec/ntpsec-1.1.9.ebuild b/net-misc/ntpsec/ntpsec-1.1.9.ebuild
new file mode 100644
index 000000000000..0692e84af87d
--- /dev/null
+++ b/net-misc/ntpsec/ntpsec-1.1.9.ebuild
@@ -0,0 +1,155 @@
+# 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 flag-o-matic python-r1 waf-utils systemd
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
+else
+	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
+	RESTRICT="mirror"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="The NTP reference implementation, refactored"
+HOMEPAGE="https://www.ntpsec.org/"
+
+NTPSEC_REFCLOCK=(
+	oncore trimble truetime gpsd jjy generic spectracom
+	shm pps hpgps zyfer arbiter nmea neoclock modem
+	local)
+
+IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
+
+LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
+SLOT="0"
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear tests" #ionice
+REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
+
+# net-misc/pps-tools oncore,pps
+CDEPEND="${PYTHON_DEPS}
+	sys-libs/libcap
+	dev-python/psutil[${PYTHON_USEDEP}]
+	libbsd? ( dev-libs/libbsd:0= )
+	dev-libs/openssl:0=
+	seccomp? ( sys-libs/libseccomp )
+"
+RDEPEND="${CDEPEND}
+	ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )
+	!net-misc/ntp
+	!net-misc/openntpd
+	acct-group/ntp
+	acct-user/ntp
+"
+DEPEND="${CDEPEND}
+	app-text/asciidoc
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	sys-devel/bison
+	rclock_oncore? ( net-misc/pps-tools )
+	rclock_pps? ( net-misc/pps-tools )
+"
+
+WAF_BINARY="${S}/waf"
+
+src_prepare() {
+	default
+	# Remove autostripping of binaries
+	sed -i -e '/Strip binaries/d' wscript
+	if ! use libbsd ; then
+		epatch "${FILESDIR}/${PN}-no-bsd.patch"
+	fi
+	python_copy_sources
+}
+
+src_configure() {
+	is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
+
+	local string_127=""
+	local rclocks="";
+	local CLOCKSTRING=""
+
+	for refclock in ${NTPSEC_REFCLOCK[@]} ; do
+		if use rclock_${refclock} ; then
+			string_127+="$refclock,"
+		fi
+	done
+	CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
+
+	local myconf=(
+		--nopyc
+		--nopyo
+		--refclock="${CLOCKSTRING}"
+		--build-epoch="$(date +%s)"
+		$(use doc	&& echo "--enable-doc")
+		$(use early	&& echo "--enable-early-droproot")
+		$(use gdb	&& echo "--enable-debug-gdb")
+		$(use samba	&& echo "--enable-mssntp")
+		$(use seccomp	&& echo "--enable-seccomp")
+		$(use smear	&& echo "--enable-leap-smear")
+		$(use tests	&& echo "--alltests")
+		$(use debug	&& echo "--enable-debug")
+	)
+
+	python_configure() {
+		waf-utils_src_configure "${myconf[@]}"
+	}
+	python_foreach_impl run_in_build_dir python_configure
+}
+
+src_compile() {
+	unset MAKEOPTS
+	python_compile() {
+		waf-utils_src_compile
+	}
+	python_foreach_impl run_in_build_dir python_compile
+}
+
+src_install() {
+	python_install() {
+		waf-utils_src_install
+	}
+	python_foreach_impl run_in_build_dir python_install
+	python_foreach_impl python_optimize
+
+	# Install heat generating scripts
+	use heat && dosbin "${S}"/contrib/ntpheat{,usb}
+
+	# Install the openrc files
+	newinitd "${FILESDIR}"/ntpd.rc-r2 ntp
+	newconfd "${FILESDIR}"/ntpd.confd ntp
+
+	# Install the systemd unit file
+	systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service
+
+	# Prepare a directory for the ntp.drift file
+	mkdir -pv "${ED}"/var/lib/ntp
+	chown ntp:ntp "${ED}"/var/lib/ntp
+	chmod 770 "${ED}"/var/lib/ntp
+	keepdir /var/lib/ntp
+
+	# Install a log rotate script
+	mkdir -pv "${ED}"/etc/logrotate.d
+	cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd
+
+	# Install the configuration file and sample configuration
+	cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf
+	cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/
+
+	# move doc files to /usr/share/doc/"${P}"
+	use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html
+}
+
+pkg_postinst() {
+	einfo "If you want to serve time on your local network, then"
+	einfo "you should disable all the ref_clocks unless you have"
+	einfo "one and can get stable time from it.  Feel free to try"
+	einfo "it but PPS probably won't work unless you have a UART"
+	einfo "GPS that actually provides PPS messages."
+}
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild
index deb37a522fed..0692e84af87d 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -11,12 +11,10 @@ inherit flag-o-matic python-r1 waf-utils systemd
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
-	BDEPEND=""
-	KEYWORDS=""
 else
 	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
 	RESTRICT="mirror"
-	BDEPEND=""
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="The NTP reference implementation, refactored"
@@ -36,7 +34,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
 
 # net-misc/pps-tools oncore,pps
 CDEPEND="${PYTHON_DEPS}
-	${BDEPEND}
 	sys-libs/libcap
 	dev-python/psutil[${PYTHON_USEDEP}]
 	libbsd? ( dev-libs/libbsd:0= )
diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index 21f6cac5c3a1..f91e5b0dd3bd 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -3,5 +3,5 @@ AUX oidc-agent-3.3.1_install-perms.patch 1773 BLAKE2B 8fad809127230af52849da4d49
 AUX oidc-agent-3.3.1_makefile-toolchain-vars.patch 722 BLAKE2B b2e00b8b5ef2e70df4878228bc5e690e764052cb34bd8d0db74fc34374e7da4a2924ea3b1d0e422204da2e27a0bbe0baf3b8f1ff683f9b1be2df87ec2efbfc28 SHA512 04975fa76b56b998bdaf9dd1f9f2586a3df5690a318cd7741f3c542f2d9b5dc675e446770de53fb36cce0348d8f57d07618375384dcf11b8712a0608e48c3818
 AUX oidc-agent-3.3.1_test-suite-buffer-overflows.patch 1526 BLAKE2B ec623853da106f60a58814181c80786bea8ec8c02bafbcf7d1ac840723ddbf77aaf810ea5b06a62aaa4268aafd3c6c5a821d25eeb656e66393012c6b338afa18 SHA512 a9f4f50eaff99e077ac3cd1290ba45e59f6a538694919f87b3c2467b498a95fac76b84f875f92d9575516d5581cd2dfbcc9602c978ac2fd591d8dc8aabb7499f
 DIST oidc-agent-3.3.1.tar.gz 764721 BLAKE2B eea09b3b140ca81be0f3dc8f200120287682ddb328275be35bd736249b72eabb40c87ebd168e51c992ccd4b4a02138e17d3e20f3cebfb4d42bde01351aacead1 SHA512 75428bb52c0cf43256fddd3b33895d7c882ced367543763c68a385448dbe29805ee1fc035f3727e743a607ed4af851ae5db24b40cc6801fc31e45b6fec16bd66
-EBUILD oidc-agent-3.3.1.ebuild 1407 BLAKE2B e2cc4ea9c139189da68f908ed87209cb34458cbe188c5acaab5a0de8c4d3def90118ad96fb3438a52abdfc61da98ea248219f943cb8d1702593077b7d3e39a8c SHA512 35ffd6d176f5a6c9c9471e5c226cfe107edfd17b8a64cc6a7f7f9875b2e8c050c8215c1471e41feba49078f560d77f311fe84b654c8ba995f9d19384098bfca5
+EBUILD oidc-agent-3.3.1.ebuild 1480 BLAKE2B 0f4b36ef804e8bcb36f348ce49f2a68a624662eec6458f395e9c8a10ede2af28a6521c41807c42067d8c5dd0aff9e2fa6a7491644a5db082418b11bf9941e362 SHA512 e54e1cfc67d08ff943fcc89f9fa38e9a8f414af084baa8804c0ab2ee6d6a99a084f0a6e7e0be34c8f87ec78ac0a99f6b9ddd4fa80d52ee8f3d273736ada0b10e
 MISC metadata.xml 779 BLAKE2B ef7a040559363a8012380b3f8568f963a612078c2d5e5129f54db724d414d6c7864e79e480eba5574fd36847caa13a09a7ac7013f5ceb406d83e3be5ebdb47e9 SHA512 f9465b4e88418ec276071683b5abbe8f7601e54daf0cb74da2d24d142e2307b1bb994ee4191eee48ed1b3fef724ad49b548cef12cc4c77088c2f2d07e1b8a776
diff --git a/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild b/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild
index 12161b8e9044..ca748e52e6d0 100644
--- a/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit xdg-utils
+inherit flag-o-matic xdg-utils
 
 DESCRIPTION="oidc-agent for managing OpenID Connect tokens on the command line"
 HOMEPAGE="https://github.com/indigo-dc/oidc-agent"
@@ -16,7 +16,8 @@ IUSE="test"
 
 DEPEND="app-crypt/libsecret
 	dev-libs/libsodium
-	net-libs/libmicrohttpd"
+	net-libs/libmicrohttpd
+	sys-libs/libseccomp"
 RDEPEND="${DEPEND}"
 BDEPEND="test? ( dev-libs/check )"
 
@@ -30,6 +31,9 @@ PATCHES=(
 )
 
 src_compile() {
+	# Bug #728840
+	append-flags -fcommon
+
 	# Parallel building doesn't work
 	emake -j1
 }
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index a66d9b5a5d1d..869e227012d1 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -8,4 +8,4 @@ EBUILD openntpd-6.0_p1.ebuild 2964 BLAKE2B 3c46ec39de60ac3b58f52b23f3c196077e6bc
 EBUILD openntpd-6.2_p3-r1.ebuild 1815 BLAKE2B 7122205d5d6cc366b95a7023d475bb6e9bd403f889e02548056aeaa50c29f62bd70e2b5f27414f54a2e5bb34bc27c646cb23c4d631bacb1f9e84316e46e20e1d SHA512 af6eea8a35f132544bcb47d522353230468e395d283e041543cc65f511f06a7235be08d2a7989edf7ab3019128364f55cc52f012c25f79f6dd5130b2c20c494a
 EBUILD openntpd-6.2_p3-r2.ebuild 1884 BLAKE2B 8c88f18c82e3b7062894d4bab696521e0854245ea1042bb83e973b1c1977cf74e5472c501a3ebe211144564b4b59932677e157aadbf7f37d74d2219abde3ca6f SHA512 2c08fc759450c137915e9be6f43e3208e2408171f1a0b71744032e778e7b32fac903a3c8fa631e2e67d77cebbe052b748cd6ff3fb339c83371a5bff0cd7e9c16
 EBUILD openntpd-6.2_p3.ebuild 3135 BLAKE2B ad1cf55027141cfe2e571788802f92844f2792d21dc551119760a72de2b7e41cef7aed7028e1071866de828f9cd5b70cb8a214cb16d87b2db26b9147102d7ee7 SHA512 c2f99c14eff42f9ad674b45636cb7b28686adee52d5037a79694356d18770c6d2d9766eece06efe99272f13356bd944b76db650420c9ed1069ca726c6c9cad8a
-MISC metadata.xml 875 BLAKE2B 896cd59152c8cb04bf21cc8845606dee6b5e59542cbcc386771c8f713ae4cbfcdf63347f5d55854f53b26f1533ad5ecdb5e763a20ec636634361c8634894ef13 SHA512 a7817eb4847542787337abca3d184b396c4ae831aee29edc6cb5f666189da76d9282aa71cea3033261e682eb2cb00fc858f85fc4421f52dae798bec44194e361
+MISC metadata.xml 753 BLAKE2B 7881f37b5fe2009a86939eee0c579be8db7ec7ad63a565318dff4a382ce09ebf47575de20112cae24d16e74b992fe7c70cf129c06ab69af514d0b3aa42b0c2da SHA512 34a656cccd278363c5e08c65d90dd4f36e41414e48fcf924ab41bdee826da358e48b70190a882e21b5eabba8c3ff733f75a384c69013d450fb3d9c0517883b72
diff --git a/net-misc/openntpd/metadata.xml b/net-misc/openntpd/metadata.xml
index 1db33088e0cf..f5534c78e2f8 100644
--- a/net-misc/openntpd/metadata.xml
+++ b/net-misc/openntpd/metadata.xml
@@ -5,10 +5,6 @@
 		<email>henson@acm.org</email>
 		<name>Paul B. Henson</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans (proxy)</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index 3d67d1d6ab10..3a4d3e0560ac 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -1,4 +1,3 @@
-AUX 0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch 3129 BLAKE2B 5beafb31039c384adaae1b8c95077bb9c1af250e78447a1cad78fbd689ee3465fe321a80ca55b91a41e3ca1ef72cda44602dd3494dd5e368e58346e02eb88ed5 SHA512 3153e2335be9dcd4f07e4b7a84d4755d15c4d7e28735016901bb5c63ccf4e4b3c66fa200907720dfd2b4e0a011ed812b5c52bfcf9b38f9aeda5781c0d71ecd9b
 AUX openvswitch.tmpfiles 40 BLAKE2B df482f24d2c48d54b6cabb1f0a37fcb193c9da71d9ae2eab0dd9a15209462e118a7160411d6d0cdb10f1721f0a86b689dd9c286325ed965ac1a510ae0af791a1 SHA512 020aaa9599b853d75a612f7bbd4ef8ea024908f283afe5c727f5d2a1f3a5a98634f82d840b3ebf886b9a82e9c60c237ced2fb13057bc7bb9ab5c449e11b51997
 AUX ovs-delete-transient-ports.service 272 BLAKE2B 4ee3767f84b4f47fe0d01aa9aaff35c9ca2be5afa6ba0f595d37ab0cdb4ccbdd7abcfb2a9c91a04d7820d1819f7757c7de569dd62cdc6c76cf533c27908f3471 SHA512 045f9c59275c555eb83c15e7cc0af4db3e9cd834385b4bbca35f5863e8432a0cf2038d10b8a55ad90a180b386a4bd0962ddcc401b4f3cf55b7e398e0683cc0f8
 AUX ovs-vswitchd-r1 436 BLAKE2B 3660edee0906e3bd7fb1715601eb08567fba2ccb20a9b25b7ef250f130737d903acd187b35cb487a4141396ef3b7746d296ab613477b7fe907f1c6bb4c3da85d SHA512 7a98f85251a7b60d93a28ade482669537585fc05265cc51eb61e283739537df980230bd5f9dccfdb60772afe3f0bf2493eed9a25b289c7ef37d998e8ca5ec4df
@@ -11,10 +10,6 @@ AUX ovsdb-server.service 480 BLAKE2B 5192dfe98551bbd81eead18a7eaba70ff0901bf2cab
 AUX ovsdb-server_conf 492 BLAKE2B e82cd92a1ac46023d63a70093e0f9cf78b72eed20a70d2599f5a405f6f7e30e1d550090b9debc2262da674b9d04d3be16aadf375ca2031e74056433c1ce20818 SHA512 a9aab68cf5188ebdff520e8ae1bc90018fab13fea5cf7c36dda42a4acdeb842de8344191f2f52213ea173a73e647fe48e7bd29ce6974c9bf3880d0f91a3713aa
 AUX ovsdb-server_conf2 584 BLAKE2B ac54fe7f3b593dce07f051874e4ebc59ab2872fcc994e55464f8ab74135498613f9a3bb38366babeae909ae8179be87c1168a069f427d4310f220afbb58d12da SHA512 0878963eef09a3933fcdb66e7ce1ab66131ce3ee1af5d403456e0f44d763e96ff90460d9013cea9a3eb0630d60a6b8aed04aeee6789882842975df2e86bc0b9e
 AUX xcp-interface-reconfigure-2.3.2.patch 920 BLAKE2B a0cf230e9793484309ec38a6faf7ba386ae4e1ba7b8c77e3a3f0cbdef63d128dd765362e4ab8077da04a60444718283cc68d0a402ed12fa168c2ca983c1064a6 SHA512 7f2dd6fbd3f734abe2cf8e23a0aa49d81a8acb26ac5c28004a95ec0fe4630f7792aabdaeb8825a62ff96fcf1c3a871eea10b11c6b92ddf7965aa1f73150f7ec7
-DIST openvswitch-2.10.2.tar.gz 7561889 BLAKE2B a53dd7db7dcab5098af81671cb265861d3af79cce53436d75e0c3d8a38ce408a142f99b936a66c8bf0f3b317970ad8c1ef84bacc2e573e9b8c21b70aab1de485 SHA512 fd64ae814d85d3002d655a330268cfd6be79db6f954c132d3bfafc7dac23533918b642d0ed454e760f5820804bdff64f73ee8c36afc25a6810ef4c7aab748ba1
-DIST openvswitch-2.11.1.tar.gz 7682693 BLAKE2B f25a537d9ad4051db0049f7ba8442564fdc890035ce3984e1754b9dd916e0b78bea133331b5f4bc3a85d8b8a902ab210703feb0b7cce279803f642f9ee9f87bf SHA512 de016a1acfbae34d2062f4ac23b9b0782016fef4c0575b2714435380439f19613881173fb2c876afe86317a5c0327908704e540322d80f9f7da9f59bea7b1789
 DIST openvswitch-2.13.0.tar.gz 7233892 BLAKE2B 66dfeb8a5dd61538360b319cfccbe49273298d6cb20df2105d1db7eb4d01f40d54ec8792a7f80d9ffc767f9b28ae09fee6aa76ac3d97be6fc43f3e7f3b2a63bd SHA512 3fcd15d07925273e0c45e6b1e70b2cd9998f753e8d1a11fd0de1d1511ad56dfddedbba436bb1c347b4afb84eb9cd6fc52c3d445b710a89d599d2ff47ed46f17c
-EBUILD openvswitch-2.10.2.ebuild 4396 BLAKE2B 842b1b82753a3b970bcd22848e45d63997546229bb5551a38aaf7f20affdfb71a17fb7bd4b8036e7bc108be6b556f7a630597b63a75f550a2727bb3785f98aa2 SHA512 9bb48966b9fb99d11ec01de2ffd924353a0fef145edeb021ce267708df91c64d57546618a66470494ebbcb950127f5f0cc88f6609004c7f330daa838fbc6b360
-EBUILD openvswitch-2.11.1-r1.ebuild 4480 BLAKE2B 8470a55f5ad20de6dc3c241e19eb0fda32f665eb90f8dc1cbbc0aecca603b902b3eaad696533c00b05b8aa3cc87d2491e31b91ffe5e44b255706a1705c16b90b SHA512 908cba577cab3fcf7abed4f5c277ae3845855ca857704948caa9c7ba3029a2722c8bdb020cf71cedd9cbfe19af94035f325f8a03ca7eecb48ba42d871cd851fe
-EBUILD openvswitch-2.13.0.ebuild 4406 BLAKE2B b06beaded1293f17fcce6e753ebe5e13af064123305cc692b05b57556f971e98dcc821297f46344b79339fb3727318fd8b5641ae627dacc16f80e5135ca10d06 SHA512 2ab26767f98441655658ed2498915232148bc4ddba88f184071c84abf79d1507b6b5dab2d7ea54360c2f1ddea1c0e93ae6481c30aae22d334c9ec33648b0e74a
+EBUILD openvswitch-2.13.0.ebuild 4405 BLAKE2B c526b9667212e53c6ca463403eb69f24750f42c29f91ce0dff2759d22c22b5dcb4a9a25410fbad3690c85dbad4e185297a419b3d0c5c56ee76ad063fc77b7552 SHA512 52c8c6963788f27bf444e342ad370568516a0717466d5e787a3064b07a987a1620dfa4e601ecf927d75b11cdcc6d53d0f2ba1229f49a1e1d796c6a29cb0df5a7
 MISC metadata.xml 458 BLAKE2B 52809b1a9ff6c0e69988e6e17cfe34145abcbe45c9d08e94f7fcc79e4ef72aeeaf2485349a04e16190c25c5b5cd61848253f5f63f1a50bf10e63918cae2ee1fa SHA512 080e0b3bbdc520573998377b41b08ca9ef0b049affb093fd98cc8af1d33c3c18a341a158ab3cf426a15641671018abf9f4a20734508276bbc88882b9f27eec36
diff --git a/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch b/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch
deleted file mode 100644
index 1f77ab54b0ad..000000000000
--- a/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From b89f391203c4420eb454cb321e799a64de809f52 Mon Sep 17 00:00:00 2001
-From: Yousong Zhou <zhouyousong@yunionyun.com>
-Date: Fri, 3 May 2019 15:03:24 +0000
-Subject: [PATCH 5/5] datapath: conntrack: fix include for
- IP6_DEFRAG_CONNTRACK_IN
-
-The enum definition is now inside include/net/ipv6_frag.h since upstream commit
-70b095c ("ipv6: remove dependency of nf_defrag_ipv6 on ipv6 module") which was
-backported to stable trees (4.9, 4.14, 4.19) only these days.
-
-The error message
-
-	  CC [M]  /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.o
-	/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c: In function 'handle_fragments':
-	/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:8: error: variable 'user' has initializer but incomplete type
-	   enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone;
-		^~~~~~~~~~~~~~~~
-	/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:32: error: 'IP6_DEFRAG_CONNTRACK_IN' undeclared (first use in this function); did you mean 'IP_DEFRAG_CONNTRACK_IN'?
-	   enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone;
-					^~~~~~~~~~~~~~~~~~~~~~~
-					IP_DEFRAG_CONNTRACK_IN
-	/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:32: note: each undeclared identifier is reported only once for each function it appears in
-	/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:25: error: storage size of 'user' isn't known
-	   enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone;
-				 ^~~~
-	/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:25: warning: unused variable 'user' [-Wunused-variable]
-	scripts/Makefile.build:326: recipe for target '/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.o' failed
-
-Reference: https://github.com/openwrt/packages/issues/8548#issuecomment-488871090
-Signed-off-by: Yousong Zhou <zhouyousong@yunionyun.com>
----
- datapath/conntrack.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/datapath/conntrack.c b/datapath/conntrack.c
-index a7dc9e0c3..69bda5a9c 100644
---- a/datapath/conntrack.c
-+++ b/datapath/conntrack.c
-@@ -31,6 +31,7 @@
- #include <net/netfilter/nf_conntrack_seqadj.h>
- #include <net/netfilter/nf_conntrack_zones.h>
- #include <net/netfilter/ipv6/nf_defrag_ipv6.h>
-+#include <net/ipv6_frag.h>
- 
- #ifdef CONFIG_NF_NAT_NEEDED
- #include <linux/netfilter/nf_nat.h>
diff --git a/net-misc/openvswitch/openvswitch-2.10.2.ebuild b/net-misc/openvswitch/openvswitch-2.10.2.ebuild
deleted file mode 100644
index 8a2e1ad91031..000000000000
--- a/net-misc/openvswitch/openvswitch-2.10.2.ebuild
+++ /dev/null
@@ -1,144 +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 eutils linux-info linux-mod python-r1 systemd
-
-DESCRIPTION="Production quality, multilayer virtual switch"
-HOMEPAGE="https://www.openvswitch.org"
-SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="debug modules monitor +ssl"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	ssl? ( dev-libs/openssl:0= )
-	${PYTHON_DEPS}
-	~dev-python/ovs-2.10.0[${PYTHON_USEDEP}]
-	dev-python/twisted[conch,${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	debug? ( dev-lang/perl )"
-DEPEND="${RDEPEND}
-	sys-apps/util-linux[caps]
-	virtual/pkgconfig"
-
-PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
-
-CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
-MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
-BUILD_TARGETS="all"
-
-pkg_setup() {
-	if use modules ; then
-		CONFIG_CHECK+=" ~!OPENVSWITCH"
-		kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
-		# docs state 4.17.x code states 4.15.x
-		kernel_is le 4 17 999 || die "Linux >= 3.10.0 and <= 4.12 required for userspace modules"
-		linux-mod_pkg_setup
-	else
-		CONFIG_CHECK+=" ~OPENVSWITCH"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Never build kernelmodules, doing this manually
-	sed -i \
-		-e '/^SUBDIRS/d' \
-		datapath/Makefile.in || die "sed failed"
-	eautoreconf
-	default
-}
-
-src_configure() {
-	set_arch_to_kernel
-	# monitor is statically enabled for bug 596206
-	# use monitor || export ovs_cv_python="no"
-	# pyside is staticly disabled
-	export ovs_cv_pyuic4="no"
-
-	# flake8 is primarily a style guide tool, running it as part of the tests
-	# in Gentoo does not make much sense, only breaks them: bug 607280
-	export ovs_cv_flake8="no"
-
-	local linux_config
-	use modules && linux_config="--with-linux=${KV_OUT_DIR}"
-
-	econf ${linux_config} \
-		--with-rundir=/var/run/openvswitch \
-		--with-logdir=/var/log/openvswitch \
-		--with-pkidir=/etc/ssl/openvswitch \
-		--with-dbdir=/var/lib/openvswitch \
-		$(use_enable ssl) \
-		$(use_enable !debug ndebug)
-}
-
-src_compile() {
-	default
-
-	use modules && linux-mod_src_compile
-}
-
-src_install() {
-	default
-
-	local SCRIPT
-	if use monitor; then
-		for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do
-			sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}"
-			python_foreach_impl python_doscript utilities/"${SCRIPT}"
-		done
-		rm -r "${ED%/}"/usr/share/openvswitch/python || die
-	fi
-
-	keepdir /var/{lib,log}/openvswitch
-	keepdir /etc/ssl/openvswitch
-	fperms 0750 /etc/ssl/openvswitch
-
-	rm -rf "${ED%/}"/var/run || die
-
-	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
-	newconfd "${FILESDIR}/ovs-vswitchd.confd-r2" ovs-vswitchd
-	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
-	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
-
-	systemd_newunit "${FILESDIR}/ovsdb-server-r3.service" ovsdb-server.service
-	systemd_newunit "${FILESDIR}/ovs-vswitchd-r3.service" ovs-vswitchd.service
-	systemd_newunit rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service ovs-delete-transient-ports.service
-	systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
-
-	insinto /etc/logrotate.d
-	newins rhel/etc_logrotate.d_openvswitch openvswitch
-
-	use modules && linux-mod_src_install
-}
-
-pkg_postinst() {
-	use modules && linux-mod_pkg_postinst
-
-	# only needed on non-systemd, but helps anyway
-	elog "Use the following command to create an initial database for ovsdb-server:"
-	elog "   emerge --config =${CATEGORY}/${PF}"
-	elog "(will create a database in /var/lib/openvswitch/conf.db)"
-	elog "or to convert the database to the current schema after upgrading."
-}
-
-pkg_config() {
-	local db="${EROOT%/}"/var/lib/openvswitch/conf.db
-	if [[ -e "${db}" ]] ; then
-		einfo "Database '${db}' already exists, doing schema migration..."
-		einfo "(if the migration fails, make sure that ovsdb-server is not running)"
-		ovsdb-tool convert "${db}" \
-			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed"
-	else
-		einfo "Creating new database '${db}'..."
-		ovsdb-tool create "${db}" \
-			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed"
-	fi
-}
diff --git a/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild b/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild
deleted file mode 100644
index 715a907910b9..000000000000
--- a/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild
+++ /dev/null
@@ -1,147 +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 eutils linux-info linux-mod python-r1 systemd
-
-DESCRIPTION="Production quality, multilayer virtual switch"
-HOMEPAGE="https://www.openvswitch.org"
-SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="debug modules monitor +ssl"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	ssl? ( dev-libs/openssl:0= )
-	${PYTHON_DEPS}
-	~dev-python/ovs-2.10.0[${PYTHON_USEDEP}]
-	dev-python/twisted[conch,${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	debug? ( dev-lang/perl )"
-DEPEND="${RDEPEND}
-	sys-apps/util-linux[caps]
-	virtual/pkgconfig"
-
-PATCHES="
-	"${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
-	"${FILESDIR}/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch"
-"
-
-CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
-MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
-BUILD_TARGETS="all"
-
-pkg_setup() {
-	if use modules ; then
-		CONFIG_CHECK+=" ~!OPENVSWITCH"
-		kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
-		# docs state 4.17.x code states 4.15.x
-		kernel_is le 4 18 999 || die "Linux >= 3.10.0 and <= 4.18 required for userspace modules"
-		linux-mod_pkg_setup
-	else
-		CONFIG_CHECK+=" ~OPENVSWITCH"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Never build kernelmodules, doing this manually
-	sed -i \
-		-e '/^SUBDIRS/d' \
-		datapath/Makefile.in || die "sed failed"
-	eautoreconf
-	default
-}
-
-src_configure() {
-	set_arch_to_kernel
-	# monitor is statically enabled for bug 596206
-	# use monitor || export ovs_cv_python="no"
-	# pyside is staticly disabled
-	export ovs_cv_pyuic4="no"
-
-	# flake8 is primarily a style guide tool, running it as part of the tests
-	# in Gentoo does not make much sense, only breaks them: bug 607280
-	export ovs_cv_flake8="no"
-
-	local linux_config
-	use modules && linux_config="--with-linux=${KV_OUT_DIR}"
-
-	econf ${linux_config} \
-		--with-rundir=/var/run/openvswitch \
-		--with-logdir=/var/log/openvswitch \
-		--with-pkidir=/etc/ssl/openvswitch \
-		--with-dbdir=/var/lib/openvswitch \
-		$(use_enable ssl) \
-		$(use_enable !debug ndebug)
-}
-
-src_compile() {
-	default
-
-	use modules && linux-mod_src_compile
-}
-
-src_install() {
-	default
-
-	local SCRIPT
-	if use monitor; then
-		for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do
-			sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}"
-			python_foreach_impl python_doscript utilities/"${SCRIPT}"
-		done
-		rm -r "${ED%/}"/usr/share/openvswitch/python || die
-	fi
-
-	keepdir /var/{lib,log}/openvswitch
-	keepdir /etc/ssl/openvswitch
-	fperms 0750 /etc/ssl/openvswitch
-
-	rm -rf "${ED%/}"/var/run || die
-
-	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
-	newconfd "${FILESDIR}/ovs-vswitchd.confd-r2" ovs-vswitchd
-	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
-	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
-
-	systemd_newunit "${FILESDIR}/ovsdb-server-r3.service" ovsdb-server.service
-	systemd_newunit "${FILESDIR}/ovs-vswitchd-r3.service" ovs-vswitchd.service
-	systemd_newunit rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service ovs-delete-transient-ports.service
-	systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
-
-	insinto /etc/logrotate.d
-	newins rhel/etc_logrotate.d_openvswitch openvswitch
-
-	use modules && linux-mod_src_install
-}
-
-pkg_postinst() {
-	use modules && linux-mod_pkg_postinst
-
-	# only needed on non-systemd, but helps anyway
-	elog "Use the following command to create an initial database for ovsdb-server:"
-	elog "   emerge --config =${CATEGORY}/${PF}"
-	elog "(will create a database in /var/lib/openvswitch/conf.db)"
-	elog "or to convert the database to the current schema after upgrading."
-}
-
-pkg_config() {
-	local db="${EROOT%/}"/var/lib/openvswitch/conf.db
-	if [[ -e "${db}" ]] ; then
-		einfo "Database '${db}' already exists, doing schema migration..."
-		einfo "(if the migration fails, make sure that ovsdb-server is not running)"
-		ovsdb-tool convert "${db}" \
-			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed"
-	else
-		einfo "Creating new database '${db}'..."
-		ovsdb-tool create "${db}" \
-			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed"
-	fi
-}
diff --git a/net-misc/openvswitch/openvswitch-2.13.0.ebuild b/net-misc/openvswitch/openvswitch-2.13.0.ebuild
index d55555327d0d..41b9b1b021a5 100644
--- a/net-misc/openvswitch/openvswitch-2.13.0.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.13.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="debug modules monitor +ssl"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index 370056995abe..41ba145e4a98 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,5 +1,7 @@
 DIST putty-0.73.tar.gz 2459115 BLAKE2B 594ad1ebd66bdb27ac8d297525c0c5d846f8a15f7c9c5e750da8a57b08367b5c94a9d1439d6a42862e7e7b7a7d7c0dea285e9197fa45651d9eb12757b57e82a7 SHA512 4ada4b8c6d68be44afede2676bc661fedfd1ea0b574b8232ad9aaa6f3a48baa9f4f0ded2955b3f2677a14db85a508f53c965cb00fcd7538a1ed9844031f0c5e5
+DIST putty-0.74.tar.gz 2476513 BLAKE2B 3b3acd8ce1deb5d1659dd2ce77c9e7316e2c639c5f0e962c472b109afc1a54854d30123c4732f9b9e8ba28d9324508894faaa78f3b484c99c0063d1ea2f499b7 SHA512 0da86849ea764cd88643bd2c1984ac7211ae72dd7c41232307b1960a29ca9518044b022d87c60272d6db71a3357026862a112bedb90ee732b41494fca3acde9b
 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
 EBUILD putty-0.73.ebuild 1582 BLAKE2B 922b7caec11440dc2a07706c8bfd26de95cb91295311736a12df3135aec50873ed1d8d76a0d6dcb447747062b936bff790591a000e24c88dfff1fb895ccc727e SHA512 4275e021f15f898346445fd97563486b6489c478b39a67e106fd2d8d166b6a6036386158c5b42656390dc4743b4b58ec1396c4f76650ae9f83c4182b1d827aa3
+EBUILD putty-0.74.ebuild 1588 BLAKE2B 8945b86e6aeaad3e5c8d0ed2228a4acb873192e0c08727f11037f8ec6f81fdbd0d75c08a19a2bb722f9a90281b926e710a358400f737610b397614c12392daa9 SHA512 b245a8a467f4ede02ed71c185f2c6923bd12cc67db71ea234f982e907441491436c6bdc4d112f7224bb4728359c08071ccd91fc0197e35f91a1d0e24e847385b
 EBUILD putty-9999.ebuild 1693 BLAKE2B 7f8e29cb9624afb649639374e42269c5e72dcb9eb329e1c40d0eac20bb7ca4a0d8bd903a2d71412eb81733167745fabe27f0699627f5f125a128fe1ade7107fa SHA512 16c7df06d0309f1d3c3df3119dcb72c842451e188203a67c2fcf7409e781f2faa9dcd76cfb31b40526b3d3a00ed8e6842d84727d264cac0374ac6aa036e9e505
 MISC metadata.xml 977 BLAKE2B b73c9f54eaa8d9cdb3e000f25ef6c1eece6a13063d6a646017d2b7c9ee4b91076cfc8797aa021a9148e1750a9f3f6bef9c9c5a5e0c86f6ba67a15a12dbbc4a22 SHA512 ff427f7d01ad2656f8b91937001d451e4c1f5154fd54e04715d82551accf12d6b430ef47c09cb567a03ef7ec644cdd277766a033e9063916ca6aec0922e60fa6
diff --git a/net-misc/putty/putty-0.74.ebuild b/net-misc/putty/putty-0.74.ebuild
new file mode 100644
index 000000000000..07d0f147a344
--- /dev/null
+++ b/net-misc/putty/putty-0.74.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop toolchain-funcs xdg-utils
+
+DESCRIPTION="A Free Telnet/SSH Client"
+HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc +gtk gtk2 ipv6 gssapi"
+SRC_URI="
+	https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2
+	https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz
+"
+
+RDEPEND="
+	!net-misc/pssh
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf
+		x11-libs/libX11
+		x11-libs/pango
+		gtk2? ( x11-libs/gtk+:2 )
+		!gtk2? ( x11-libs/gtk+:3[X] )
+	)
+	gssapi? ( virtual/krb5 )
+"
+DEPEND="
+	${RDEPEND}
+	dev-lang/perl
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's|-Werror||g' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	cd "${S}"/unix || die
+	econf \
+		$(use_with gssapi) \
+		$(usex gtk --with-gtk= --without-gtk $(usex gtk2 2 3 ) )
+}
+
+src_compile() {
+	emake -C "${S}"/doc
+	emake -C "${S}"/unix AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6)
+}
+
+src_install() {
+	dodoc doc/puttydoc.txt
+
+	if use doc; then
+		docinto html
+		dodoc doc/*.html
+	fi
+
+	cd "${S}"/unix || die
+	default
+
+	if use gtk ; then
+		for i in 16 22 24 32 48 64 128 256; do
+			newicon -s ${i} "${WORKDIR}"/${PN}-icons/${PN}-${i}.png ${PN}.png
+		done
+
+		# install desktop file provided by Gustav Schaffter in #49577
+		make_desktop_entry ${PN} PuTTY ${PN} Network
+	fi
+}
+
+pkg_postinst() {
+	use gtk && xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	use gtk && xdg_icon_cache_update
+}
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index c47e833559fb..8fb358574e5e 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -15,5 +15,5 @@ EBUILD rabbitmq-server-3.7.13.ebuild 3105 BLAKE2B 61175864b1b7eab693fdfcf16ff117
 EBUILD rabbitmq-server-3.7.24.ebuild 2160 BLAKE2B a3fd5a085ef37088cde4956fb4ab3b0fa595c8a4d004605cdd23415db17ac521b96187971f5d687cdd7767ed1d43dfa78ac845c2f9f5a3e106461461ef694583 SHA512 fad7e1b6606fdf79440994efef5bd5d7fceae456bcc74edd30b1e53ac413112f2ece2c39ccc45e6a1701d8e0529a1b8cb4a50e7a4e491c6568081e513ee03db2
 EBUILD rabbitmq-server-3.8.2.ebuild 2160 BLAKE2B a3fd5a085ef37088cde4956fb4ab3b0fa595c8a4d004605cdd23415db17ac521b96187971f5d687cdd7767ed1d43dfa78ac845c2f9f5a3e106461461ef694583 SHA512 fad7e1b6606fdf79440994efef5bd5d7fceae456bcc74edd30b1e53ac413112f2ece2c39ccc45e6a1701d8e0529a1b8cb4a50e7a4e491c6568081e513ee03db2
 EBUILD rabbitmq-server-3.8.3.ebuild 2160 BLAKE2B 1ea1fb4a67301f670fc1c256dc2c32ea3f833e0b02adace4a1e34e03a4d5509d9e3e931385697b9dc749e0f24a70974ef0161798743fcef9106f0395c1953717 SHA512 ab51c206eb5d2d9c395aabc016b691784364b2220fea1feacdbf559ba809402491ba5282c513d312f82b897d36ccad9b8e15837bb6ed69d5f2484315b8959786
-EBUILD rabbitmq-server-3.8.4.ebuild 2369 BLAKE2B 729883c5f0e18572e907f5eacf98af095cf1eb58595e5479ef1e943944bf10e03d0ad026205788ead6882926f9b386028c10a7bb4de8acd5cb02a8ce63bea5bd SHA512 ce48169cda8a45b85bbd2e0937133c2c2bd45e03574d1bc8e5ab0e2713652b63fdad553c4370352d7972cedc5b59751bfc34d8a2561eeb6a877fb780b9b8b01d
+EBUILD rabbitmq-server-3.8.4.ebuild 2376 BLAKE2B af252dc508def8a6902923deccf85a3308de5c10b973d572b5f6d34916c84e5e8f7543acd42237fc586b35ee0ceda3b678880e49fdeae27f2005ec1a43ef3344 SHA512 028fe0378e8ae3aa6ad729d6886359ea69269d5c1d78098f30047c964df88c55badde3e410469acda81c0b2d41d76abaffed41a2079fe6d9a362525f0b98a596
 MISC metadata.xml 243 BLAKE2B 521acfb5d3a435d6280a45018d424779bc562b0de43396d1fbc0bb5950c2e672a0090552e29cafa59a61c07baf9073d466316eb1b43cdafdded443f9e57c3bf7 SHA512 d44d6b045d6b171e487d632935b2ffd1d5c567b28e273aadde4799d45d94f1dfd75873d296d4e9de1e431d5a8de4a0337e9e3fa648545c182f225e4f45652701
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.8.4.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.8.4.ebuild
index dacf415d4e71..34216e4b9ac2 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.8.4.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.8.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/ra
 
 LICENSE="GPL-2 MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 RESTRICT="test"
 
diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest
index 93c7eccda049..18b5e564ba64 100644
--- a/net-misc/rclone/Manifest
+++ b/net-misc/rclone/Manifest
@@ -1,8 +1,6 @@
-DIST rclone-1.50.0.tar.gz 18566931 BLAKE2B cfaf983ae972606b8ccc56ba505aec65bd7e6427f0b16f7e6187b079116b47eb3d297a99b505782c2bb5b64a5c8bf4e5b7beaee9dad5718ec952033ceca0945c SHA512 df805dc711ecf60b869ec957d224676643bcb6eac756470d2194338b9cc34e2a657d286d4a4308c743847fc11aa821b106888eb6ab9f04677bc70747c73fc5c1
 DIST rclone-1.51.0.tar.gz 18835242 BLAKE2B 5798a844c893e111e73ae409adcb06fd4291df3c0319bf983f2336ada45a60df253e750397bead55278cbb497c541a63498f695ce03af7b6cc1056f022ad2748 SHA512 b0881e09b75093abe4d31e95425a90513aed4a16d9e2dbf79023c9dc68875b90a1332204879530c450a16ab9cac475d967f7657d6f810a1e0f0d84b88d7de916
 DIST rclone-1.52.1.tar.gz 20029046 BLAKE2B 0dc7deebf1d362c1b7ad466991c3fc481c62d4c5803e5fa768dbe09adecfc79c2af9dcc19e7621542b464325b03be1390eff54d165c8c899c48adfac63b6cd7a SHA512 bbd305074071986cf6fb8146c634e35c28e1ea8ce2ce95507c55b95cb19eb3b1453dfb11e365bef5948978328d91df44b936b866c49db26149a17f5ca451ba15
-EBUILD rclone-1.50.0.ebuild 859 BLAKE2B c84444316be2f96809efb9e2ed04eb00e6a83f99f2b41982b96f3cfb9e268fcfd6b5f9a4c615247f026a922644365291b92d9b0327a9814e9a7258f22786b564 SHA512 0bdf451731b68b2a2be681fef6cfdbd58846939fb843310c0a3b59cb402b6cc96075395c1b5ccfb8e4dc3d088b449fcb7f538bed779ba97aa9298db52ba7cdcb
 EBUILD rclone-1.51.0.ebuild 866 BLAKE2B 9e062c50dafd247b9897b976affcf53639c99901e1308b78e23729c3507fad40777d26b45821f4c12fc2b0fe9d0d417874e96678929400a823a610b596026ece SHA512 39e3ed50f22e11abc7c758a27c1d55d470b7909d25725a03b7e9a2757046daee49bab413b20472cf9b0f1703a494740cc960a16688fa25bef282cda16b068e35
-EBUILD rclone-1.52.1.ebuild 866 BLAKE2B 9e062c50dafd247b9897b976affcf53639c99901e1308b78e23729c3507fad40777d26b45821f4c12fc2b0fe9d0d417874e96678929400a823a610b596026ece SHA512 39e3ed50f22e11abc7c758a27c1d55d470b7909d25725a03b7e9a2757046daee49bab413b20472cf9b0f1703a494740cc960a16688fa25bef282cda16b068e35
+EBUILD rclone-1.52.1.ebuild 790 BLAKE2B 8b4dc670c3865d8923c4c03110aa3919d0ce31273bca340d924b3bec89c8e4119fbbc71aaf003d38e34b2ca3cd49f81198d620aba9ccea3f67ebedde436f93ca SHA512 d43a3d54becbdf47c6bee4a70b272bbd7245e266f727880efff1e641a7e0c71085976e7e73fd865e7e758d303d7e3cd20deef759c4a99e661ba2d27d827fce59
 EBUILD rclone-9999.ebuild 861 BLAKE2B e0ad096016a740cadba21135d349fadd8a0dd4860492cb61bb21569c70e84733850707a53328f265faa2363436b0ae65013eea94d0805224087b027a5eac045e SHA512 129b7c912d8fc43fa46f50ca8c2fa02c2fb4abd51b19cb7e7d9173de0832e16c5f854386783435230ea3bb84227b3230ee34aaa9221bcf2ab64a2923414c6171
 MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/net-misc/rclone/rclone-1.50.0.ebuild b/net-misc/rclone/rclone-1.50.0.ebuild
deleted file mode 100644
index 4166391f5fac..000000000000
--- a/net-misc/rclone/rclone-1.50.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
-
-inherit golang-build bash-completion-r1
-EGO_PN="github.com/rclone/${PN}"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="amd64 ~arm x86"
-	EGIT_COMMIT="v${PV}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="A program to sync files to and from various cloud storage providers"
-HOMEPAGE="https://rclone.org/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_install() {
-	dobin ${PN}
-	doman src/${EGO_PN}/${PN}.1
-	dodoc src/${EGO_PN}/README.md
-
-	./rclone genautocomplete bash ${PN}.bash || die
-	newbashcomp ${PN}.bash ${PN}
-
-	./rclone genautocomplete zsh ${PN}.zsh || die
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/net-misc/rclone/rclone-1.52.1.ebuild b/net-misc/rclone/rclone-1.52.1.ebuild
index 380576cdebc5..9617d4c91b19 100644
--- a/net-misc/rclone/rclone-1.52.1.ebuild
+++ b/net-misc/rclone/rclone-1.52.1.ebuild
@@ -2,17 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-
-inherit golang-build bash-completion-r1
-EGO_PN="github.com/rclone/${PN}"
+inherit bash-completion-r1 go-module
 
 if [[ ${PV} == *9999* ]]; then
-	inherit golang-vcs
+	inherit git-r3
 else
 	KEYWORDS="amd64 ~arm ~arm64 x86"
-	EGIT_COMMIT="v${PV}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
+	SRC_URI="https://github.com/rclone/rclone/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 DESCRIPTION="A program to sync files to and from various cloud storage providers"
@@ -22,13 +18,14 @@ LICENSE="MIT"
 SLOT="0"
 IUSE=""
 
-DEPEND=""
-RDEPEND="${DEPEND}"
+src_compile() {
+		go build -mod=vendor . || die "compile failed"
+}
 
 src_install() {
 	dobin ${PN}
-	doman src/${EGO_PN}/${PN}.1
-	dodoc src/${EGO_PN}/README.md
+	doman ${PN}.1
+	dodoc README.md
 
 	./rclone genautocomplete bash ${PN}.bash || die
 	newbashcomp ${PN}.bash ${PN}
diff --git a/net-misc/rdate/Manifest b/net-misc/rdate/Manifest
index b89da7098922..23f500dbf081 100644
--- a/net-misc/rdate/Manifest
+++ b/net-misc/rdate/Manifest
@@ -1,5 +1,7 @@
 AUX rdate-confd 509 BLAKE2B 92826ed23b867063c8cf1145e7a2f62fe6a904593eca1add05971f06773ae992f08e58bb4f5367660e93937baf7bf3d0fe35a508bdaea44bca104c0871cf6ba8 SHA512 1ebc27949cf5c68828e00cacb20644b6c6b0e833c23b4f9e31144f0e47c10daa06b82909198227cdc7018939cbae09f2fe53de69aa84c8b9a8ecb0ab9eaf1f8f
 AUX rdate-initd-1.4-r3 525 BLAKE2B 8533f2b589aa860d88a7cdf18931b2a5800a1d82a78db576dfb12189f4b3391535bff5896ef75d6b3ef7373e1ad86c86a82f7422f4c404af8b9b3e414aaad59c SHA512 8563dedff5b2188d5176a882e36d4c8cdab4709ca40e86eb9c76e30f91c3eb78d1da8f971d2c2f4189ef801413e173367d2a8a2b9b37608ef6a84a0e73e39157
+DIST rdate-1.10.tar.gz 19159 BLAKE2B 71c858b5eb10b07a2974fcb463a91808fc59582dfce786dc936370b3fc2122bfe72cc32cb3635a1e77ec663fd44712852ab85d8ba46702d1e222ec63ad46f3bb SHA512 7a7647102b5663218fff6c1364b83250a199a0169adf40db87a49709aa24c3b1fae5acf01732d5432fcb2883d29a24b2ae38cf5333ff75075e5d7a6fd90e7146
 DIST rdate-1.4.tar.gz 11500 BLAKE2B 705324648f30685135d3ba3936b05a82bc6a027d3d1c407950cb7631858f6d9dba34f97f065482988caf4a68addc3ba122fe475cfd1684c526f5224113657ac3 SHA512 ea9d62af3aa58fb7bb2bdce257cc23758f103ac056e4d6a8b44be0e41c44dff49e78bdb03789e3bf2957e74997c2f1c0376fdc659b4f39d89e43ef139a51f996
+EBUILD rdate-1.10.ebuild 751 BLAKE2B 24e52d7a4799cf5740415a87a3244fb188d282e868d3c58dfb05ec64ed607acd2c9a102f6f39a033b356165e419c55ae023981a54f91f8bbbe19f97fb01aafa7 SHA512 ffb7cdf7b406f49b55f97a3bed78da59b2d323797bf63d0717c6241c09ecd72172c7a55d8ebd32cb6a616fb115cd8994c89a5a17efb98d67e42cabae1d9d5cca
 EBUILD rdate-1.4-r4.ebuild 829 BLAKE2B db9a2d14fd6445329e4cf57ad8ae817488f41e790207eb7d5af6d3401db4dfe17cca33e00f600fa5dddcfe04f365856e55e472628e23cfa7aa1b832e16ec5784 SHA512 b3c05b7f419c13d5aba9bb7a567f8c9fa3e075b43dcaf707900d1a5dccfb2cd883cb1fb5d43bce1add6fad45a3a817a971aa649ce6f4a40ac55cbacdf925fc6c
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/net-misc/rdate/rdate-1.10.ebuild b/net-misc/rdate/rdate-1.10.ebuild
new file mode 100644
index 000000000000..56ca14a4561b
--- /dev/null
+++ b/net-misc/rdate/rdate-1.10.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P=openrdate
+
+DESCRIPTION="Use TCP or UDP to retrieve the current time of another machine"
+HOMEPAGE="https://github.com/resurrecting-open-source-projects/openrdate"
+SRC_URI="https://github.com/resurrecting-open-source-projects/${MY_P}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-4"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-libs/libbsd"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${MY_P}-${PV}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}"/rdate-initd-1.4-r3 rdate
+	newconfd "${FILESDIR}"/rdate-confd rdate
+}
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index bdc49c3377a1..ce62b7f77a42 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,8 +1,8 @@
-AUX remmina-1.4.6-with-examples.patch 1466 BLAKE2B b2291567efa16b13e100d7b21795a497bb93d3839faa776b634e449db133e79d228d973d1d0f0117390e4e5e6b371988ea366d070cd73544f2cddc127cf17fa9 SHA512 9701f769865ecb003aee8fb16c39bb8b7f9bc28039b4f2759ef5bfe33f0c06b3f274c650be332f86d07e99ae14b1b913f89bba4c6e84e04602dedf0180caff3a
+AUX remmina-1.4.5-with-examples.patch 1594 BLAKE2B becf55ac5b0d5d4909dc49da5b43590990ce91de05d5b2c25cc6abbd915b25310866903ac73d79cef3b6971627d59aaed4b64628071d9b41498d767d4f651f26 SHA512 f833872508b01de26dc12fd09370a98415b065e40746a8e0afacf485107e375c21d9566a48adf2128cd828ba8c8006b390e44959df128f9ae2038db026b304bc
 DIST Remmina-v1.4.3.tar.gz 1705751 BLAKE2B 4d49b5d5da4017cc1870a5e37a73db767862997cffdd58b080ab5707eeb293eed7e756ca974a4f4922bb9417e94610fe07b1e774f5ad7e269e797362ff264e83 SHA512 9f555f9ff60e2a136f6379a0f2828d091aa972dcff7ebd09eaf1834dc10f506d218e5cb6856c17f625c1040a11240da2ed5ebe9f4fe32a083494cfcbbdef1a41
 DIST Remmina-v1.4.5.tar.gz 1787506 BLAKE2B 095a01cca168daaef9ef59ff5adb9bb475467e8e8c42cac74a1a605627b09aa7246aa941b514b0de29739516aa988148f377040ed8629df3d5b17f0b1158cf76 SHA512 fec07b488db8d438aa6a0263e13557c10f1401a81b3371a2da03a1037d51f8e58e88652a15c6d6ce9e02535ef93ed0f9c5b674ab5efab430380f4b7dd57c4d9d
-DIST Remmina-v1.4.6.tar.gz 1895441 BLAKE2B 38dbda1976f3af3ad89c84eaecf50c42a2a22186dd013d30ae0cea83f5ee54af1443c196b79c1b4684e6afbc6f3d8fc8461fae18806476b8ae1a79148a2ccb12 SHA512 8b918502622957f6a1637d5d79ec605f7bf1c164f902c76a3a65dc316a8ccd11de63066182ffad4783bcb7f86d5e04ca6462f6a5d2e4256c4ae14c6f483419ea
+DIST Remmina-v1.4.7.tar.gz 1908687 BLAKE2B a6656821d727914f70bafe50d5c3764e3c36a4753c618048b91eadc1fa27b8f03bcd313b99cfd46cadc446b85b583994528895f9fb755d6c8ee28e0b0bab66d1 SHA512 ebe1e62e090062107ed6674d494255bac9e3d175553bc5ae949aa1bfc9e1de4b59f35f523ee36b08bb02580513d3b585344b9864001dd991cac656f1c13116e9
 EBUILD remmina-1.4.3.ebuild 2614 BLAKE2B e87cb2e5c2e626fbc8309bfeaddf385b9dd47fae9d0244ac3a79a631ebda8df235d3dfd59009b5882520fef7e697b6d75fb6fc16204cb6c747608a58b9092684 SHA512 855a700ce278a7385e5240c7767fa37b2478d227aa5fa9f899c08c1012e7669a94efb27a2bbce3d3f25d7fcc3047778141e56739524d4d72960175a5bdb545a3
-EBUILD remmina-1.4.5.ebuild 2477 BLAKE2B f3e4eb101a87010ceaaf2ac7b717885e122cb16f563135224a0b5215ac780de3ca45b3437eba9a24ee5bcc4cac6b93834ed8d63c8a9e1e6bebbc13a35f242e20 SHA512 8d7a30d2a406edbd9928a75fe749decb593393a6e40e498d1b7fda3bfebaa1592296eb3cc3d43cf767270b32c3b55d5b281908aec8e20a5d2a97af8221acd8b3
-EBUILD remmina-1.4.6.ebuild 2576 BLAKE2B e69f281212f854010d576642b5b8de538003c320d9c8ddaebf542e099cd6bd6cf0ba6551d4520c105b5c10a1b0ce79e12e9b768b683bc320c298ef6d53e03ca0 SHA512 457a54501dbedaa6538460710df82c8aa909e35165ed686b32d801385e14a04b9ca1071a4b06325025f1ff9adb5e57ce7e46e430f8d956626c9792ad8fd693b1
+EBUILD remmina-1.4.5.ebuild 2522 BLAKE2B a860efa261252c4c559df6c4977c22bf56fef998b498dceea2e493d650a5ff2085259031c9f23df9d20fc81fc90e8ae85dd950f799213cc30884b4689c9ca5b3 SHA512 74d25d7c19ec7c9d68ce8ba06579d62608d47086874c1a4161ce52a393c7f24414c33033c088d4e41df6ba30e5d9356662c0a56702bc9115ced79af7381b720e
+EBUILD remmina-1.4.7.ebuild 2525 BLAKE2B 6c7d02fa36bb644ac179976d4d624a41deb3dd2c8e0c2d3cb13fa18892bf0cd06c40a64b5bb388146988872ee535a6d446365b7bb45616582169d12b0708b244 SHA512 a8adacebd610b10af5239d1e17ceddcf4763f642a91cb7240f887e76d0d206b80b37296ff85bbef8cf9eeb3651c6fe8c021707ddd8efb735459a893f8db4ec19
 MISC metadata.xml 1084 BLAKE2B e4bb4c696f1ef71959b779ccad19d3ee380a6e846e42b1e02caf2a772df07d168bb9623b8f29cfdcc7fb37f60523e6c1fc471f016ea3437c18b3e7512a4bcad4 SHA512 c0b50eca7d4cdd6dfa201aabec7c195b7dca44938ee627919a000bdc47fc95acd4107936a61399fab2c78dfcd3b97ce06753e97fc6bb21015758afe91337a346
diff --git a/net-misc/remmina/files/remmina-1.4.5-with-examples.patch b/net-misc/remmina/files/remmina-1.4.5-with-examples.patch
new file mode 100644
index 000000000000..10ac35744d7f
--- /dev/null
+++ b/net-misc/remmina/files/remmina-1.4.5-with-examples.patch
@@ -0,0 +1,37 @@
+--- /dev/null
++++ b/net-misc/remmina/files/remmina-1.4.6-with-examples.patch
+@@ -0,0 +1,34 @@
++diff -Nupr a/plugins/tool_hello_world/plugin.c b/plugins/tool_hello_world/plugin.c
++--- a/plugins/tool_hello_world/plugin.c	2020-06-08 22:07:44.000000000 +0200
+++++ b/plugins/tool_hello_world/plugin.c	2020-06-10 20:18:48.495507560 +0200
++@@ -42,17 +42,19 @@
++ #include <gdk/gdkx.h>
++ 
++ static RemminaPluginService *remmina_plugin_service = NULL;
+++#define remmina_plugin_debug(fmt, ...) remmina_plugin_service->_remmina_debug(__func__, fmt __VA_OPT__(,) __VA_ARGS__)
+++
++ 
++ static void remmina_plugin_tool_init(RemminaProtocolWidget *gp)
++ {
++ 	TRACE_CALL(__func__);
++-	remmina_plugin_service->_debug("[%s] Plugin init", PLUGIN_NAME);
+++	remmina_plugin_debug("[%s] Plugin init", PLUGIN_NAME);
++ }
++ 
++ static gboolean remmina_plugin_tool_open_connection(RemminaProtocolWidget *gp)
++ {
++ 	TRACE_CALL(__func__);
++-	remmina_plugin_service->_debug("[%s] Plugin open connection", PLUGIN_NAME);
+++	remmina_plugin_debug("[%s] Plugin open connection", PLUGIN_NAME);
++ 
++ 	GtkDialog *dialog;
++ 	dialog = GTK_DIALOG(gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL | GTK_DIALOG_USE_HEADER_BAR,
++@@ -65,7 +67,7 @@ static gboolean remmina_plugin_tool_open
++ static gboolean remmina_plugin_tool_close_connection(RemminaProtocolWidget *gp)
++ {
++ 	TRACE_CALL(__func__);
++-	remmina_plugin_service->_debug("[%s] Plugin close connection", PLUGIN_NAME);
+++	remmina_plugin_debug("[%s] Plugin close connection", PLUGIN_NAME);
++ 	remmina_plugin_service->protocol_plugin_emit_signal(gp, "disconnect");
++ 	return FALSE;
++ }
diff --git a/net-misc/remmina/files/remmina-1.4.6-with-examples.patch b/net-misc/remmina/files/remmina-1.4.6-with-examples.patch
deleted file mode 100644
index 259ef19e0fc8..000000000000
--- a/net-misc/remmina/files/remmina-1.4.6-with-examples.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Nupr a/plugins/tool_hello_world/plugin.c b/plugins/tool_hello_world/plugin.c
---- a/plugins/tool_hello_world/plugin.c	2020-06-08 22:07:44.000000000 +0200
-+++ b/plugins/tool_hello_world/plugin.c	2020-06-10 20:18:48.495507560 +0200
-@@ -42,17 +42,19 @@
- #include <gdk/gdkx.h>
- 
- static RemminaPluginService *remmina_plugin_service = NULL;
-+#define remmina_plugin_debug(fmt, ...) remmina_plugin_service->_remmina_debug(__func__, fmt __VA_OPT__(,) __VA_ARGS__)
-+
- 
- static void remmina_plugin_tool_init(RemminaProtocolWidget *gp)
- {
- 	TRACE_CALL(__func__);
--	remmina_plugin_service->_debug("[%s] Plugin init", PLUGIN_NAME);
-+	remmina_plugin_debug("[%s] Plugin init", PLUGIN_NAME);
- }
- 
- static gboolean remmina_plugin_tool_open_connection(RemminaProtocolWidget *gp)
- {
- 	TRACE_CALL(__func__);
--	remmina_plugin_service->_debug("[%s] Plugin open connection", PLUGIN_NAME);
-+	remmina_plugin_debug("[%s] Plugin open connection", PLUGIN_NAME);
- 
- 	GtkDialog *dialog;
- 	dialog = GTK_DIALOG(gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL | GTK_DIALOG_USE_HEADER_BAR,
-@@ -65,7 +67,7 @@ static gboolean remmina_plugin_tool_open
- static gboolean remmina_plugin_tool_close_connection(RemminaProtocolWidget *gp)
- {
- 	TRACE_CALL(__func__);
--	remmina_plugin_service->_debug("[%s] Plugin close connection", PLUGIN_NAME);
-+	remmina_plugin_debug("[%s] Plugin close connection", PLUGIN_NAME);
- 	remmina_plugin_service->protocol_plugin_emit_signal(gp, "disconnect");
- 	return FALSE;
- }
diff --git a/net-misc/remmina/remmina-1.4.5.ebuild b/net-misc/remmina/remmina-1.4.5.ebuild
index 485866aee596..f10b2bdec825 100644
--- a/net-misc/remmina/remmina-1.4.5.ebuild
+++ b/net-misc/remmina/remmina-1.4.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="appindicator crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telepathy vnc webkit zeroconf"
 
 DEPEND="
@@ -58,6 +58,7 @@ DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	eapply "${FILESDIR}"/${P}-with-examples.patch
 	cmake_src_prepare
 	xdg_src_prepare
 }
diff --git a/net-misc/remmina/remmina-1.4.6.ebuild b/net-misc/remmina/remmina-1.4.6.ebuild
deleted file mode 100644
index 8902bb75ac42..000000000000
--- a/net-misc/remmina/remmina-1.4.6.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
-
-inherit cmake eutils xdg
-
-MY_P="${PN^}-v${PV}"
-
-DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
-HOMEPAGE="https://remmina.org/"
-SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="appindicator crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telemetry telepathy vnc webkit zeroconf"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libsodium:=
-	net-libs/libsoup
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	appindicator? ( dev-libs/libappindicator:3 )
-	crypt? ( dev-libs/libgcrypt:0= )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129
-		<net-misc/freerdp-3
-		cups? ( net-print/cups:= ) )
-	gnome-keyring? ( app-crypt/libsecret )
-	kwallet? ( kde-frameworks/kwallet )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	spice? ( net-misc/spice-gtk[gtk3] )
-	ssh? ( net-libs/libssh:0=[sftp]
-		x11-libs/vte:2.91 )
-	telepathy? ( net-libs/telepathy-glib )
-	vnc? ( net-libs/libvncserver[jpeg] )
-	webkit? ( net-libs/webkit-gtk:4 )
-	zeroconf? ( || ( >=net-dns/avahi-0.8-r2[dbus,gtk] <net-dns/avahi-0.8-r2[dbus,gtk3] ) )
-"
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-RDEPEND="
-	${DEPEND}
-	virtual/freedesktop-icon-theme
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
-PATCHES=( "${FILESDIR}"/${P}-with-examples.patch )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_APPINDICATOR=$(usex appindicator)
-		-DWITH_GCRYPT=$(usex crypt)
-		-DWITH_EXAMPLES=$(usex examples)
-		-DWITH_LIBSECRET=$(usex gnome-keyring)
-		-DWITH_KF5WALLET=$(usex kwallet)
-		-DWITH_GETTEXT=$(usex nls)
-		-DWITH_TRANSLATIONS=$(usex nls)
-		-DWITH_FREERDP=$(usex rdp)
-		-DWITH_CUPS=$(usex cups)
-		-DWITH_SPICE=$(usex spice)
-		-DWITH_LIBSSH=$(usex ssh)
-		-DWITH_VTE=$(usex ssh)
-		-DWITH_TELEPATHY=$(usex telepathy)
-		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_WWW=$(usex webkit)
-		-DWITH_AVAHI=$(usex zeroconf)
-		-DWITH_NEWS=$(usex telemetry)
-		-DWITH_ICON_CACHE=OFF
-		-DWITH_UPDATE_DESKTOP_DB=OFF
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "To get additional features, some optional runtime dependencies"
-	elog "may be installed:"
-	elog ""
-	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
-	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
-}
diff --git a/net-misc/remmina/remmina-1.4.7.ebuild b/net-misc/remmina/remmina-1.4.7.ebuild
new file mode 100644
index 000000000000..f73e076ebcd8
--- /dev/null
+++ b/net-misc/remmina/remmina-1.4.7.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake eutils xdg
+
+MY_P="${PN^}-v${PV}"
+
+DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
+HOMEPAGE="https://remmina.org/"
+SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="appindicator crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telemetry telepathy vnc webkit zeroconf"
+
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libsodium:=
+	net-libs/libsoup
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	appindicator? ( dev-libs/libappindicator:3 )
+	crypt? ( dev-libs/libgcrypt:0= )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129
+		<net-misc/freerdp-3
+		cups? ( net-print/cups:= ) )
+	gnome-keyring? ( app-crypt/libsecret )
+	kwallet? ( kde-frameworks/kwallet )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	spice? ( net-misc/spice-gtk[gtk3] )
+	ssh? ( net-libs/libssh:0=[sftp]
+		x11-libs/vte:2.91 )
+	telepathy? ( net-libs/telepathy-glib )
+	vnc? ( net-libs/libvncserver[jpeg] )
+	webkit? ( net-libs/webkit-gtk:4 )
+	zeroconf? ( || ( >=net-dns/avahi-0.8-r2[dbus,gtk] <net-dns/avahi-0.8-r2[dbus,gtk3] ) )
+"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+RDEPEND="
+	${DEPEND}
+	virtual/freedesktop-icon-theme
+"
+
+DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	xdg_environment_reset
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_APPINDICATOR=$(usex appindicator)
+		-DWITH_GCRYPT=$(usex crypt)
+		-DWITH_EXAMPLES=$(usex examples)
+		-DWITH_LIBSECRET=$(usex gnome-keyring)
+		-DWITH_KF5WALLET=$(usex kwallet)
+		-DWITH_GETTEXT=$(usex nls)
+		-DWITH_TRANSLATIONS=$(usex nls)
+		-DWITH_FREERDP=$(usex rdp)
+		-DWITH_CUPS=$(usex cups)
+		-DWITH_SPICE=$(usex spice)
+		-DWITH_LIBSSH=$(usex ssh)
+		-DWITH_VTE=$(usex ssh)
+		-DWITH_TELEPATHY=$(usex telepathy)
+		-DWITH_LIBVNCSERVER=$(usex vnc)
+		-DWITH_WWW=$(usex webkit)
+		-DWITH_AVAHI=$(usex zeroconf)
+		-DWITH_NEWS=$(usex telemetry)
+		-DWITH_ICON_CACHE=OFF
+		-DWITH_UPDATE_DESKTOP_DB=OFF
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "To get additional features, some optional runtime dependencies"
+	elog "may be installed:"
+	elog ""
+	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
+	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
+}
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index b26de190f860..7be624736157 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -6,9 +6,11 @@ AUX rsyncd.init.d-r1 247 BLAKE2B ec4f7a875a51bae10cff7e15df18d285b01dddaa99a0312
 AUX rsyncd.logrotate 105 BLAKE2B 82430036a5ca123ba20bc80040e98869734b3b397440968909e9ee0f109b9151de8157427b0aa8fb0ed89fa6cc4cab6ac6e0a9986c076531cd4aa87bea4e2d25 SHA512 b8d6c0bb467a5c963317dc55478d2c10874564cd264d943d4a42037e2fce134fe001fabc92af5c6b5775e84dc310b1c8da147afaa61c99e5663c36580d8651a5
 AUX rsyncd.service 206 BLAKE2B 3b8bf9165d2410f731c5c2a63fdb5553708aa6aca0fed99acefb38c16b8ae9430a5257440c070b88b71a1295cc6360d89458e1b6696ec9897e722699f162769e SHA512 b848a13856027e4fe1fd206a2aeb32854abd73beb31ebad7ac62c36b433e65507bbb5eef3901a42f46e70a4e887c7f9013617f19712e160ce155f3cb83bfc625
 AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aabcaaf8e84c48adb15ba6a2e8d8c58098af2757011ea4f84fbfd758029d905fb8f5ed21bcc5ac34c3baae2a9c SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215
-DIST rsync-3.1.3.tar.gz 905908 BLAKE2B 616a1f3239327a28b881310f5f249c90b8bcdb05091279cd62f9cb4e35a8428c7cdd9b89e711ba124601a738f0deb9bfbebafba7fd88b72866476138a9f8c75a SHA512 8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99
 DIST rsync-3.2.0.tar.gz 1048009 BLAKE2B 641be077a88958a09b083fd9658ae7f40ce3565bee1959f0c7ef82c61356a070e7ca1e0ceeb96b7a1b31a5ee031a84733ade3965aaa93f9e18795df16a6c1460 SHA512 01a109e1e061bb7f4734b694e1f15a83efdd8fcb1995e5eeea75a8d245eead4412c09b37b0fcdfe522e368673768e4fa5ed8891ccf3ae42f60293e4e68d506c2
-EBUILD rsync-3.1.3.ebuild 2791 BLAKE2B c5996386d1e0adf52de159361d1efe245e63abe68fc44febb11b2ec607e27210c572bd4da2045142b4cc4fc5f9efd6a750da9aa4b38f6b1d194cf551e112f48d SHA512 2ef8ea9bfba4df20680d1b83aa121df54d27736c2cd7f65d04df8737bb36c2641e4f087f4b90724567d10b1262de8f6671aa80856982f74c15d28e42437fd6e7
-EBUILD rsync-3.2.0-r1.ebuild 4511 BLAKE2B 68012e3bfee86051abca8db34ed80bc6e35886e16e23f16e63b9dbb22637d46e66a2123bf21703bc78a8a229ed9d6b797ee8fa53a27883f36bff26df0f0b7188 SHA512 3b441789634815f311ed77760a4ca030c8b20568d8f5e3cd5f638c05743bf6e762de2b0fb30b64252c95a0db8d5c43e86ee7e9ef4c4261640af28e6cd66eee47
-EBUILD rsync-9999.ebuild 4455 BLAKE2B cbbc9b23733d1cca2d6d313b7438aec818199b4a85872ca5ece00d79e7932c3d037f5fafcc48313c3f56f8ecded946bb4abfe61763769e11c336cb30b2a6b5f2 SHA512 77e391b19108f82d1722e62f34619e1469d33d4c0420a683ca719c748473ec42335f2dc54c8422783ec0171ba165c6e6e2ad04b5ae9adb4bd5407e506f8ed732
+DIST rsync-3.2.1.tar.gz 1051665 BLAKE2B de1ee047b9a378cd16fceb188d0a2e14e78751c8295263e183888b464ced9263be600bbb04b7793d48e7aa1fd2ab0709d717234f346cc6a5a028c3daddcb019e SHA512 80d639ab56a993de8016115fe15794bb9aa7012e4a8300402954760566a821c230af9dcdb19143d70663497a830289212ce329fb0c4fd5c4b6f392d850e5fd8c
+DIST rsync-3.2.2pre2.tar.gz 1056347 BLAKE2B 648a5cd120cf6468e4009d766a92e91da51d142ff814abdd7db362c7170d36cd0bd7a1ff6672eed79ec2d37b2ec18a40bb18b0fee6f8610cff57f3bb5d029e60 SHA512 7427d6929b0b7eff8632db20049cb74fbb31c295e059b86dc92e3fce5c1d260ec1e9c2ec9615d985d55f0d6b22c89410fd61148b26a3eda56b6518efb8ad6518
+EBUILD rsync-3.2.0-r1.ebuild 4509 BLAKE2B ab0897f40b2f7ea13a8a841892ba5eca647befe4f8be98d6440ed9f1cdb7addc13d548a45660c4295472b116517b8c41b30f35e01b37227a1ede1b507a45fa20 SHA512 89ad2d62e3b764e8283dc41899b54ecb93d69f16e9ab4e7e859d0c45bd108bff744776fee114cbca2c4ea85e944ae53e6b5d068b809253aea482cca002ebe5a7
+EBUILD rsync-3.2.1.ebuild 4451 BLAKE2B 2723d6e0d31fcff19340fd410f678fb86d2200561e12c86eeee03cdee6a8100fee23226c37baa23c82b0099120fe428b3a959af7c331f78823889399e1c2d5ae SHA512 d0c6f34bfe52b5e1a40829db31e097e4e91f8595757867eb738bff75f15d50f59a8dcefbb038a3761c8dba7cb9056b7a70f4aad83bbacb3fa0e2dccc0d2addf9
+EBUILD rsync-3.2.2_pre2.ebuild 4451 BLAKE2B 2723d6e0d31fcff19340fd410f678fb86d2200561e12c86eeee03cdee6a8100fee23226c37baa23c82b0099120fe428b3a959af7c331f78823889399e1c2d5ae SHA512 d0c6f34bfe52b5e1a40829db31e097e4e91f8595757867eb738bff75f15d50f59a8dcefbb038a3761c8dba7cb9056b7a70f4aad83bbacb3fa0e2dccc0d2addf9
+EBUILD rsync-9999.ebuild 4444 BLAKE2B 9ebb509b7fd4ca4e77eec489a5b8f628bee745d12a8828c54f8887d81b2a79d77e65333b65491041b26efd40cec3dc6dc44d99b590b99eaa1b5f1d80fe8815bc SHA512 0437f7264cd62f2a77a4d0c81cb6135451fc705901ab658f1fd1e4b8ad4d199c096c02fab605781fd6b203caf3c0fd9a1edbaf3588a4d76548709b96a5bc3f1d
 MISC metadata.xml 654 BLAKE2B 28ea5b4e47a5e420ab64c1b688425995d9ab4e556a27b56b27f512a15ec337aa6a1028449ae0a2f9fa313df2b5b5e98b6cf98a38dac82eb83ca3b4871f3b1514 SHA512 3e23d80d1c4fffdc38287e0f1a09f44040a53eb1b395dd8e9b47aa6d467ed4cf4a0b379ce578f1ecf6438a4f322375b633dc47fd2a50e7badd5f94054bfb558d
diff --git a/net-misc/rsync/rsync-3.1.3.ebuild b/net-misc/rsync/rsync-3.1.3.ebuild
deleted file mode 100644
index b5837aee1603..000000000000
--- a/net-misc/rsync/rsync-3.1.3.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
-
-inherit flag-o-matic prefix systemd
-
-DESCRIPTION="File transfer program to keep remote files into sync"
-HOMEPAGE="https://rsync.samba.org/"
-SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
-[[ "${PV}" = *_pre* ]] && SRC_URI="https://rsync.samba.org/ftp/rsync/src-previews/${P/_/}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ ${PV} = *_pre* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~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="acl examples iconv ipv6 static stunnel xattr"
-
-LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
-	xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
-	>=dev-libs/popt-1.5[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	iconv? ( virtual/libiconv )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-
-S="${WORKDIR}/${P/_/}"
-
-src_configure() {
-	use static && append-ldflags -static
-	local myeconfargs=(
-		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
-		--without-included-popt
-		$(use_enable acl acl-support)
-		$(use_enable iconv)
-		$(use_enable ipv6)
-		$(use_enable xattr xattr-support)
-	)
-	econf "${myeconfargs[@]}"
-	touch proto.h-tstamp #421625
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
-	newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
-
-	dodoc NEWS OLDNEWS README TODO tech_report.tex
-
-	insinto /etc
-	newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/rsyncd.logrotate rsyncd
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
-
-	# Install stunnel helpers
-	if use stunnel ; then
-		emake DESTDIR="${D}" install-ssl-client
-		emake DESTDIR="${D}" install-ssl-daemon
-	fi
-
-	# Install the useful contrib scripts
-	if use examples ; then
-		exeinto /usr/share/rsync
-		doexe support/*
-		rm -f "${ED%/}"/usr/share/rsync/{Makefile*,*.c}
-	fi
-
-	eprefixify "${ED%/}"/etc/{,xinetd.d}/rsyncd*
-
-	systemd_dounit "${FILESDIR}/rsyncd.service"
-}
-
-pkg_postinst() {
-	if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
-		"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
-		ewarn "You have disabled chroot support in your rsyncd.conf.  This"
-		ewarn "is a security risk which you should fix.  Please check your"
-		ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
-	fi
-	if use stunnel ; then
-		einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
-		einfo
-		einfo "You maybe have to update the certificates configured in"
-		einfo "${EROOT}/etc/stunnel/rsync.conf"
-	fi
-}
diff --git a/net-misc/rsync/rsync-3.2.0-r1.ebuild b/net-misc/rsync/rsync-3.2.0-r1.ebuild
index 672e23e2d33b..d74e0fca5bbc 100644
--- a/net-misc/rsync/rsync-3.2.0-r1.ebuild
+++ b/net-misc/rsync/rsync-3.2.0-r1.ebuild
@@ -16,7 +16,7 @@ else
 		SRC_DIR="src-previews"
 	else
 		SRC_DIR="src"
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	fi
 	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"
 	S="${WORKDIR}/${P/_/}"
diff --git a/net-misc/rsync/rsync-3.2.1.ebuild b/net-misc/rsync/rsync-3.2.1.ebuild
new file mode 100644
index 000000000000..c02794fd0b9b
--- /dev/null
+++ b/net-misc/rsync/rsync-3.2.1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic prefix systemd
+
+DESCRIPTION="File transfer program to keep remote files into sync"
+HOMEPAGE="https://rsync.samba.org/"
+if [[ "${PV}" == *9999 ]] ; then
+	PYTHON_COMPAT=( python3_{6,7,8} )
+	inherit autotools git-r3 python-any-r1
+	EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
+else
+	if [[ "${PV}" == *_pre* ]] ; then
+		SRC_DIR="src-previews"
+	else
+		SRC_DIR="src"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	fi
+	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"
+	S="${WORKDIR}/${P/_/}"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE_CPU_FLAGS_X86=" sse2"
+IUSE="acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd"
+IUSE+=" ${IUSE_CPU_FLAGS_X86// / cpu_flags_x86_}"
+
+LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
+	lz4? ( app-arch/lz4[static-libs(+)] )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+	)
+	system-zlib? ( sys-libs/zlib[static-libs(+)] )
+	xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
+	xxhash? ( dev-libs/xxhash[static-libs(+)] )
+	zstd? ( app-arch/zstd[static-libs(+)] )
+	>=dev-libs/popt-1.5[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	iconv? ( virtual/libiconv )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+
+if [[ "${PV}" == *9999 ]] ; then
+	BDEPEND="${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+		')"
+fi
+
+# Only required for live ebuild
+python_check_deps() {
+	has_version "dev-python/commonmark[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+	if [[ "${PV}" == *9999 ]] ; then
+		eaclocal -I m4
+		eautoconf -o configure.sh
+		eautoheader && touch config.h.in
+	fi
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	local myeconfargs=(
+		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
+		--without-included-popt
+		$(use_enable acl acl-support)
+		$(use_enable iconv)
+		$(use_enable ipv6)
+		$(use_enable lz4)
+		$(use_enable ssl openssl)
+		$(use_with !system-zlib included-zlib)
+		$(use_enable xattr xattr-support)
+		$(use_enable xxhash)
+		$(use_enable zstd)
+	)
+
+	if [[ "${ARCH}" == "amd64" ]] ; then
+		# SIMD is only available for x86_64 right now (#728868)
+		myeconfargs+=( $(use_enable cpu_flags_x86_sse2 simd) )
+	else
+		myeconfargs+=( --disable-simd )
+	fi
+
+	econf "${myeconfargs[@]}"
+	[[ "${PV}" == *9999 ]] || touch proto.h-tstamp #421625
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
+	newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
+
+	dodoc NEWS.md README.md TODO tech_report.tex
+
+	insinto /etc
+	newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/rsyncd.logrotate rsyncd
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
+
+	# Install stunnel helpers
+	if use stunnel ; then
+		emake DESTDIR="${D}" install-ssl-daemon
+	fi
+
+	# Install the useful contrib scripts
+	if use examples ; then
+		exeinto /usr/share/rsync
+		doexe support/*
+		rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
+	fi
+
+	eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
+
+	systemd_dounit "${FILESDIR}/rsyncd.service"
+}
+
+pkg_postinst() {
+	if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
+		"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
+		ewarn "You have disabled chroot support in your rsyncd.conf.  This"
+		ewarn "is a security risk which you should fix.  Please check your"
+		ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
+	fi
+	if use stunnel ; then
+		einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
+		einfo
+		einfo "You maybe have to update the certificates configured in"
+		einfo "${EROOT}/etc/stunnel/rsync.conf"
+	fi
+	if use system-zlib ; then
+		ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when"
+		ewarn "using the --compress option."
+		ewarn
+		ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib,"
+		ewarn "and the --compress option, add --new-compress (-zz)."
+		ewarn
+		ewarn "For syncing the portage tree, add:"
+		ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
+	fi
+}
diff --git a/net-misc/rsync/rsync-3.2.2_pre2.ebuild b/net-misc/rsync/rsync-3.2.2_pre2.ebuild
new file mode 100644
index 000000000000..c02794fd0b9b
--- /dev/null
+++ b/net-misc/rsync/rsync-3.2.2_pre2.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic prefix systemd
+
+DESCRIPTION="File transfer program to keep remote files into sync"
+HOMEPAGE="https://rsync.samba.org/"
+if [[ "${PV}" == *9999 ]] ; then
+	PYTHON_COMPAT=( python3_{6,7,8} )
+	inherit autotools git-r3 python-any-r1
+	EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
+else
+	if [[ "${PV}" == *_pre* ]] ; then
+		SRC_DIR="src-previews"
+	else
+		SRC_DIR="src"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	fi
+	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"
+	S="${WORKDIR}/${P/_/}"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE_CPU_FLAGS_X86=" sse2"
+IUSE="acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd"
+IUSE+=" ${IUSE_CPU_FLAGS_X86// / cpu_flags_x86_}"
+
+LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
+	lz4? ( app-arch/lz4[static-libs(+)] )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+	)
+	system-zlib? ( sys-libs/zlib[static-libs(+)] )
+	xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
+	xxhash? ( dev-libs/xxhash[static-libs(+)] )
+	zstd? ( app-arch/zstd[static-libs(+)] )
+	>=dev-libs/popt-1.5[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	iconv? ( virtual/libiconv )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+
+if [[ "${PV}" == *9999 ]] ; then
+	BDEPEND="${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+		')"
+fi
+
+# Only required for live ebuild
+python_check_deps() {
+	has_version "dev-python/commonmark[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+	if [[ "${PV}" == *9999 ]] ; then
+		eaclocal -I m4
+		eautoconf -o configure.sh
+		eautoheader && touch config.h.in
+	fi
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	local myeconfargs=(
+		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
+		--without-included-popt
+		$(use_enable acl acl-support)
+		$(use_enable iconv)
+		$(use_enable ipv6)
+		$(use_enable lz4)
+		$(use_enable ssl openssl)
+		$(use_with !system-zlib included-zlib)
+		$(use_enable xattr xattr-support)
+		$(use_enable xxhash)
+		$(use_enable zstd)
+	)
+
+	if [[ "${ARCH}" == "amd64" ]] ; then
+		# SIMD is only available for x86_64 right now (#728868)
+		myeconfargs+=( $(use_enable cpu_flags_x86_sse2 simd) )
+	else
+		myeconfargs+=( --disable-simd )
+	fi
+
+	econf "${myeconfargs[@]}"
+	[[ "${PV}" == *9999 ]] || touch proto.h-tstamp #421625
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
+	newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
+
+	dodoc NEWS.md README.md TODO tech_report.tex
+
+	insinto /etc
+	newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/rsyncd.logrotate rsyncd
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
+
+	# Install stunnel helpers
+	if use stunnel ; then
+		emake DESTDIR="${D}" install-ssl-daemon
+	fi
+
+	# Install the useful contrib scripts
+	if use examples ; then
+		exeinto /usr/share/rsync
+		doexe support/*
+		rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
+	fi
+
+	eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
+
+	systemd_dounit "${FILESDIR}/rsyncd.service"
+}
+
+pkg_postinst() {
+	if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
+		"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
+		ewarn "You have disabled chroot support in your rsyncd.conf.  This"
+		ewarn "is a security risk which you should fix.  Please check your"
+		ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
+	fi
+	if use stunnel ; then
+		einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
+		einfo
+		einfo "You maybe have to update the certificates configured in"
+		einfo "${EROOT}/etc/stunnel/rsync.conf"
+	fi
+	if use system-zlib ; then
+		ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when"
+		ewarn "using the --compress option."
+		ewarn
+		ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib,"
+		ewarn "and the --compress option, add --new-compress (-zz)."
+		ewarn
+		ewarn "For syncing the portage tree, add:"
+		ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
+	fi
+}
diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild
index 38d7035321aa..7bd6a4121f2d 100644
--- a/net-misc/rsync/rsync-9999.ebuild
+++ b/net-misc/rsync/rsync-9999.ebuild
@@ -98,7 +98,7 @@ src_install() {
 	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
 	newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
 
-	dodoc NEWS.md OLDNEWS.md README.md TODO tech_report.tex
+	dodoc NEWS.md README.md TODO tech_report.tex
 
 	insinto /etc
 	newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index dc45065e16b1..4ccf68a994cb 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,8 +1,3 @@
-AUX smb4k-3.0.4-qt-5.15.patch 689 BLAKE2B 1c7d40e8dcbdc9b41380640b648860852bb8381b2f45d61a7d221f4ad7966c1e12f7cefb9c0a9bffc7a691ab97222f44f6fae587828c2bda7e395399c4fdef5d SHA512 f2f60e30991b24f68a9a84160ba935db4d20719e515cbb47eaf0576a3303bf1b549c1dd740cbb3a283eb03781820adef09199a1b9cf23f60c0b880483209ebd6
-DIST smb4k-3.0.4.tar.xz 3824508 BLAKE2B 98d9e66a577e40e734421cf46d72ebf010fa1d2161d411dbd5382af8fd84f2578a086f0425e576508aed0ed549940cf4b7f688c527f42218dd781006d2460204 SHA512 bd3b53f6f8e9ee3dd6fc8c0ab31b877fc89a887837b7bd91eef410b6dff81960ada872bada074638c8b7d204c638564a70568e87cc874e146508241e071665a3
-DIST smb4k-3.0.5.tar.xz 3841924 BLAKE2B 98bc44ed33b60fb983db34d39ed7bd51f9fab8c4594e81c9f3d6275c4b6f49822902d12da59cb777754febd839c37d42d6623cb42ae03385a5187e063790a872 SHA512 913e69ba30b4d7294e4436648fcebd54173cc0c32a712824218aee7c276dc0d8eea0a2e4a14648cd55c99424b80512e01c5a1929ce38a9f83d3dfb9c24601af1
 DIST smb4k-3.0.6.tar.xz 3842424 BLAKE2B 7c42007a00b3da07bdc1629360bb8640c66ac7332fefca82698664cf197d4061d6c4419ab99ebd29e6515dace194973be2c179fa3c422820716fc5e5e1b8591f SHA512 993f669c12db30dd78f9f6cc694dfe563958407582f65ff64b6ada36cf4372ad6bb5addecc93970ce6750d031bf4ee9dfefa362e13100d2ce8d3e848a0d89382
-EBUILD smb4k-3.0.4.ebuild 1932 BLAKE2B 38084c5e9420ade82d3ea8b245fee26c068e678724f38c5576d75cd4bc8652b6b7189d3466242fb8f90b800f8bf735dab4f4e3fa3120339dc5a00fda1e63eb31 SHA512 ec2d341b877717a47529096db938096f84a9b5d08802034a36c9bf9b403eff9eea8a28bff90d963d715f4ee63c6e28b4a2eda605fdcf9590281fc5b02726aa84
-EBUILD smb4k-3.0.5.ebuild 1888 BLAKE2B 4bd8f4e49305481f5c0522760f7e9b07daa2cc0234cfeaa28240eebe02c3d83462a6cfca13b7cfb191493c12b294896b1970a15155768f1635118fa8bd4fe9da SHA512 5e1f6b51eea2f35b9785c2885a23ed027a975d6afa41302d51568d3948f5bbf98b2c1fe09b81721d70fd8d03308d8c87a7c1da8982683c904a50bb51d79d5d01
-EBUILD smb4k-3.0.6.ebuild 1888 BLAKE2B 4bd8f4e49305481f5c0522760f7e9b07daa2cc0234cfeaa28240eebe02c3d83462a6cfca13b7cfb191493c12b294896b1970a15155768f1635118fa8bd4fe9da SHA512 5e1f6b51eea2f35b9785c2885a23ed027a975d6afa41302d51568d3948f5bbf98b2c1fe09b81721d70fd8d03308d8c87a7c1da8982683c904a50bb51d79d5d01
+EBUILD smb4k-3.0.6.ebuild 1886 BLAKE2B e3db0902dea23a31824f963850c243693aea932d8804a0f92126b072e790595e5d41e9a1b226c88fce83e0975e97c9b5183df8a69db9bb91caaed96672f280bb SHA512 76fd0d9aa5695751ef1fa43ad6add6613e515dc85e9537507fb2d0c313b66df0ce3544e2776b573fe20cc77ecca4e5685e1ca8c3cd5295dbaf81d6a8686d09ea
 MISC metadata.xml 324 BLAKE2B 9e05620c3d07398233f8ac54e9d9d3267e21835594d8bae1c14a68d3650be7a7e904b57281823e6886efcd56a33e4e9d576c8cbfe0d9b148641fae8a7ce01ce4 SHA512 48a26e2c744b920776e2d7a8a33ce6188a785f34ce783e59f9f4898947320b2ce6b0205e0848aff7c03151349d8fd6dd4dda705b695e1c4ed3c46a17347d8711
diff --git a/net-misc/smb4k/files/smb4k-3.0.4-qt-5.15.patch b/net-misc/smb4k/files/smb4k-3.0.4-qt-5.15.patch
deleted file mode 100644
index 8948e30dfa12..000000000000
--- a/net-misc/smb4k/files/smb4k-3.0.4-qt-5.15.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 009ebe0224f7e236837741a1b35f0c572024e8b3 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 21 Apr 2020 10:27:28 +0200
-Subject: [PATCH] Fix build with Qt-5.15 (missing header)
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- smb4k/smb4ktooltip.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/smb4k/smb4ktooltip.cpp b/smb4k/smb4ktooltip.cpp
-index de07a1d..b1064f7 100644
---- a/smb4k/smb4ktooltip.cpp
-+++ b/smb4k/smb4ktooltip.cpp
-@@ -43,6 +43,7 @@
- #include <QToolTip>
- #include <QApplication>
- #include <QDesktopWidget>
-+#include <QPainterPath>
- #include <QStylePainter>
- #include <QStyle>
- #include <QStyleOptionFrame>
--- 
-2.26.1
-
diff --git a/net-misc/smb4k/smb4k-3.0.4.ebuild b/net-misc/smb4k/smb4k-3.0.4.ebuild
deleted file mode 100644
index dfe247ddeca5..000000000000
--- a/net-misc/smb4k/smb4k-3.0.4.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_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Advanced network neighborhood browser"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.smb4k
-https://sourceforge.net/p/smb4k/home/Home/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="plasma"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qttest-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kauth-${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/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	net-fs/samba[cups]
-"
-RDEPEND="${DEPEND}
-	plasma? (
-		>=dev-qt/qtquickcontrols2-${QTMIN}:5
-		>=kde-frameworks/plasma-${KFMIN}:5
-	)
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_PLASMOID=$(usex plasma)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	elog "Users of Samba 4.7 and above please note that for the time being,"
-	elog "the following setting has to be added to or changed in the [global]"
-	elog "section of the smb.conf file:"
-	elog
-	elog "[global]"
-	elog "client max protocol = NT1"
-}
diff --git a/net-misc/smb4k/smb4k-3.0.5.ebuild b/net-misc/smb4k/smb4k-3.0.5.ebuild
deleted file mode 100644
index a7ff9e7f655d..000000000000
--- a/net-misc/smb4k/smb4k-3.0.5.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"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Advanced network neighborhood browser"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.smb4k
-https://sourceforge.net/p/smb4k/home/Home/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="plasma"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qttest-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kauth-${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/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	net-fs/samba[cups]
-"
-RDEPEND="${DEPEND}
-	plasma? (
-		>=dev-qt/qtquickcontrols2-${QTMIN}:5
-		>=kde-frameworks/plasma-${KFMIN}:5
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_PLASMOID=$(usex plasma)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	elog "Users of Samba 4.7 and above please note that for the time being,"
-	elog "the following setting has to be added to or changed in the [global]"
-	elog "section of the smb.conf file:"
-	elog
-	elog "[global]"
-	elog "client max protocol = NT1"
-}
diff --git a/net-misc/smb4k/smb4k-3.0.6.ebuild b/net-misc/smb4k/smb4k-3.0.6.ebuild
index a7ff9e7f655d..169b71b8637d 100644
--- a/net-misc/smb4k/smb4k-3.0.6.ebuild
+++ b/net-misc/smb4k/smb4k-3.0.6.ebuild
@@ -14,7 +14,7 @@ https://sourceforge.net/p/smb4k/home/Home/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index 48b263c51be1..cb820e229213 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -17,4 +17,4 @@ EBUILD teamviewer-15.2.2756.ebuild 4095 BLAKE2B e8a01b0e7e749396705fafd6c178d8e8
 EBUILD teamviewer-15.3.2682.ebuild 4095 BLAKE2B a2b2296669187cd8fe80b0ca044cab0ca1e155a9d48b04a49c06af5c1bff24b3f2378d093b3dc386ffc7f39741a44b02e85b9f75ee2c49338ae117dd6018f1e2 SHA512 993d28827b01ca441943b16aee7adb3ecb88274f4305bc3383370569466fe01f93ccfe4c6444afcd2578dc22f0fd63c52f21c9c239451ea8ad7f3414583dc736
 EBUILD teamviewer-15.4.4445.ebuild 4095 BLAKE2B a2b2296669187cd8fe80b0ca044cab0ca1e155a9d48b04a49c06af5c1bff24b3f2378d093b3dc386ffc7f39741a44b02e85b9f75ee2c49338ae117dd6018f1e2 SHA512 993d28827b01ca441943b16aee7adb3ecb88274f4305bc3383370569466fe01f93ccfe4c6444afcd2578dc22f0fd63c52f21c9c239451ea8ad7f3414583dc736
 EBUILD teamviewer-15.5.3.ebuild 4095 BLAKE2B a2b2296669187cd8fe80b0ca044cab0ca1e155a9d48b04a49c06af5c1bff24b3f2378d093b3dc386ffc7f39741a44b02e85b9f75ee2c49338ae117dd6018f1e2 SHA512 993d28827b01ca441943b16aee7adb3ecb88274f4305bc3383370569466fe01f93ccfe4c6444afcd2578dc22f0fd63c52f21c9c239451ea8ad7f3414583dc736
-MISC metadata.xml 353 BLAKE2B 6b23f0ea5f9e3bc076641d6991535e7069dab3abd3f30e1d1052580223ec1f2ad94a8b0f6dfc6ee0019cdb3f1b3ea31edc5bbd04579da77f866291922f4c675a SHA512 bb21752978f1cf4c9cabf6b5fad33e0dbb820d27a5dd3ef40fd54f4a86893b77cd994dfe77395ff8fdd69f4e0f805bca622486538a4781b0f30b55ffdcf1540d
+MISC metadata.xml 249 BLAKE2B 11f9a85069860d951af16d4536b4dcb5808a383e12932121c0344d7df116522d143eb5e5ccb10ab69c7d6a27ee4d421f4a34557eb02b8b9926d7ef34f3efef10 SHA512 876b15663b8f716c63393d90ad0c78d96088f53a2b2add76b0b749bf69e75be84ef58184f148c70ec2669b773f4dd2e37d045fe72429a6ddd2086b691a553047
diff --git a/net-misc/teamviewer/metadata.xml b/net-misc/teamviewer/metadata.xml
index 0034f0d370dd..025344585474 100644
--- a/net-misc/teamviewer/metadata.xml
+++ b/net-misc/teamviewer/metadata.xml
@@ -5,9 +5,5 @@
 		<email>maksbotan@gentoo.org</email>
 		<name>Maxim Koltsov</name>
 </maintainer>
-<maintainer type="person">
-	<email>zlogene@gentoo.org</email>
-	<name>Mikle Kolyada</name>
-</maintainer>
 </pkgmetadata>
 
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 60d0f275de68..3fd5021e4a9f 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/nsscache/Manifest b/net-nds/nsscache/Manifest
index ed49647e2e42..8dce38189f54 100644
--- a/net-nds/nsscache/Manifest
+++ b/net-nds/nsscache/Manifest
@@ -3,8 +3,10 @@ DIST nsscache-0.30-r3-gentoo-authorized-keys-command.py 11974 BLAKE2B 4272bab8d8
 DIST nsscache-0.30.tar.gz 109615 BLAKE2B 1b67da7241a974a541514849643115d8e6dd0e587dbd39e1919eaca5064b6fde79678c3443246444d1b8c75c4455ad008231ee1f1a6b74511d9a38e742be2c6e SHA512 22c58904eadd2e69405c42263c1c85c7b612151466386870fbea7685ab32835250a84f1acd83fca6f3289582c74df5371cbfb4f354679a302f240fd0ff334712
 DIST nsscache-0.31.tar.gz 108073 BLAKE2B c730786e4a273d039273f104d1458587741c5bc8b2e470d12a551765f3141aafb33df811feca432b493415e20c9abb07244b9c624e38053b95c15c5e41ba8303 SHA512 1be90b0217605f86d2effc6063a805fb604f535386cc9f2eb8b0244ab1293521fd1342f52e3fad98c7d95cf66db3dabf93747bf40ce5ed2bf70c8c07382001a4
 DIST nsscache-0.32.tar.gz 112333 BLAKE2B ac477eef53e8e9d8cdcc7a0d7b460046883aaba8836ec5d49f449aae0d4f0ea34cd10f89a98849a18e0a0b1b5d1eb4f4c99a138d6eb2bc6bc608a1cc33c28ac2 SHA512 c35f539ea017a328c1630031b7934c231b256d3f2198c6764954c42f36ed281432ff97667e5754692971b4f24be38887406f98718d5f49d364e1e3eebb32185f
+DIST nsscache-0.39.tar.gz 127896 BLAKE2B 8383ca53ee5cf2f84e4485722d35598b624005bb32073696a23daa1061c0b057d26333cdee9c97cedcb99daa8c61362719d80b01b216c163a327cd4edeabeefd SHA512 f93cec949302f21bc5989ab3192302a32349ee4ae98e2f05f169cca8a16a821f39857cb0fff52c7b54552828684b4723d22e44f97525a01577ab89bd159e0376
 EBUILD nsscache-0.30-r2.ebuild 1258 BLAKE2B bc58fdd5f12687ed17e2966d3a2480285c451b34b7152d6d769b6a3781b1270f9dc37d914c2d6c0c888f0520de26e9566b1524bf334d1671437f5de4c6f91c5f SHA512 3572ebb5a3f386e3b518ee8de4615e825f9a475a8cfc80e5075d3094580d4006c9c86b84dd8cc1d4ef3e2481eb73a0f07b8b380e1f4b30eb4b73b222905425d9
 EBUILD nsscache-0.30.ebuild 984 BLAKE2B f56a5d51be382f98abbc8db71de294d0227d7759e9ce9e288b356f41561c27d78bfb2c8a5487a7071cc3f893b8c51e776aed451116bdb28d2657a7001b0ab036 SHA512 e543dab6c1d1b79af6a19156eecf54f257e428798e002b349a6e0870253c3f326b78ad62d75ac086a40370172c8296fb72e0e52b3bd541c5c746a5bc67b53cb0
 EBUILD nsscache-0.31.ebuild 1250 BLAKE2B dac8feb0ae93798a2c6bd82491180ffdaf0185b7197fa271ccd48e2465eb7c3bdc6e1a6aced484736aa4ea1fde4ec947938736062825d10e32f999633daeea46 SHA512 97941a27a899a81330cd9ebaabe99f7c1c39c772cf8407171e9f6f743516e2da66bf9fa5efd363e62746f86f3fc7540f1729130fd8ae116025a708885748cca5
 EBUILD nsscache-0.32.ebuild 1250 BLAKE2B dac8feb0ae93798a2c6bd82491180ffdaf0185b7197fa271ccd48e2465eb7c3bdc6e1a6aced484736aa4ea1fde4ec947938736062825d10e32f999633daeea46 SHA512 97941a27a899a81330cd9ebaabe99f7c1c39c772cf8407171e9f6f743516e2da66bf9fa5efd363e62746f86f3fc7540f1729130fd8ae116025a708885748cca5
-MISC metadata.xml 397 BLAKE2B 98c367dda996085fb5d6edf8f398dc38d1210f1f475c89d953897cdb9c50c9ac10450f5ede28b6d24fe8f03cea5ed2e72aaac5c2a9b6959fb7b201692c91b0e0 SHA512 b75dde399e707628f36e0e711acd8fd2739afa735f41fd98e2fa47dc1cf4ba5e3b36a118dd8cf15ac456114d3d3cfcc601149145938e6033179a2bbd738ed6b1
+EBUILD nsscache-0.39.ebuild 1522 BLAKE2B b19ad72d1d7b9cf2095d9631cc7408cda27befd2c8919930316c843b64adf1cb4a10d76a52f7eb05f4f86a4281b3818092a5c90647f90796c175860cd40b0b5c SHA512 c48c3418283de752c2f5e2d0961780df6b3c715465e96a5baec87e9c842c7f8958587e4bdb6867ff5cb89b28f353ac2d75c1f98139f5d029e44c6033ec52b609
+MISC metadata.xml 455 BLAKE2B 1e71e0d24defac1beb64e865e0d30327414874bd0017fed5059e530f3dc08c8f11d20b6234bd16486bd6192c52e417e2c85262d1479e6da07e6cff7027ac7e28 SHA512 04e60c7b2db069aecaa3d69cb2760143ccf30a34f5ac304d63962de65bc4db3fbcadd8be27c8a7b949a115ca0e879f3136773a6e63f4573faa817efc1821f075
diff --git a/net-nds/nsscache/metadata.xml b/net-nds/nsscache/metadata.xml
index 2391c0ec85c5..49a9b9a18f2b 100644
--- a/net-nds/nsscache/metadata.xml
+++ b/net-nds/nsscache/metadata.xml
@@ -6,6 +6,7 @@
 	</maintainer>
 	<use>
 		<flag name="nsscache">Depend on sys-auth/libnss-cache to handle flat files</flag>
+		<flag name="s3">Support for S3-based NSS sources</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">google/nsscache</remote-id>
diff --git a/net-nds/nsscache/nsscache-0.39.ebuild b/net-nds/nsscache/nsscache-0.39.ebuild
new file mode 100644
index 000000000000..f615656a1ee1
--- /dev/null
+++ b/net-nds/nsscache/nsscache-0.39.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit eutils distutils-r1
+
+DESCRIPTION="commandline tool to sync directory services to local cache"
+HOMEPAGE="https://github.com/google/nsscache"
+SCRIPT_A='nsscache-0.30-r3-gentoo-authorized-keys-command.py'
+SRC_URI="
+	https://github.com/google/nsscache/archive/version/${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~robbat2/${SCRIPT_A}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="nsscache s3"
+
+DEPEND="${PYTHON_DEPS}
+		dev-python/ldap3[${PYTHON_USEDEP}]
+		dev-python/pycurl[${PYTHON_USEDEP}]
+		dev-python/bsddb3[${PYTHON_USEDEP}]
+		s3? ( dev-python/boto3[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}
+		nsscache? ( >=sys-auth/libnss-cache-0.10 )"
+RESTRICT="test" # requires network
+S="${WORKDIR}/${PN}-version-${PV}"
+
+src_prepare() {
+	sed -i \
+		-e "/setup_requires/s,'pytest-runner',,g" \
+		-e '/tests_require/s,\[.*\],[],g' \
+		"${S}"/setup.py || die
+	sed -i \
+		-e '/test=pytest/d' \
+		"${S}"/setup.cfg || die
+	sed -i \
+		-e '/pytest/d' \
+		"${S}"/requirements.txt || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile --verbose
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	doman nsscache.1 nsscache.conf.5
+	dodoc THANKS nsscache.cron CONTRIBUTING.md README.md
+	exeinto /usr/libexec/nsscache
+	newexe "${DISTDIR}"/"${SCRIPT_A}" authorized-keys-command.py
+
+	keepdir /var/lib/nsscache
+}
diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 42b53f66ab74..9d833b7346d1 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index de17c9846ab5..ff2317d4696b 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -1,10 +1,14 @@
 AUX patches/0001-use-system-configobj.patch 784 BLAKE2B df8648aa357f43edd599c91ceb05d068109362c407b7e130abcbbc1d8acfc99a57c0dfda5dea8daa75bbd712b0fd08faec6617fdb8a95df46e9cca29bdc8c1e3 SHA512 3d657a62da5f53eb26bbffe47ddf8c36026f1f6536bfae6c8278ec84f27e1672e058a87bc77e65e1ab40deb8b7c3ee7a72dbcc9035d62af71d7e0642dd7f6542
 AUX patches/0002-use-system-feedparser.patch 929 BLAKE2B c9d9253b6041bdcc87fcca7cdf43dfb4efea925149a67b5a02e63488fc2debcb7b04749a6e4dce1359a5e16b8b91f59df120c5dffe5340bed28503c6f1160c8d SHA512 2a58fc9c21e81c0b18f30bf94ba75777724ec8d0a9d54fddc591f1517c7f92f5b2d3d6726c90ee545f94242fef48020b81ce6291c15f9e8eecc7095f388701db
 AUX patches/0003-cfg-disable-NtfOSD-by-default.patch 962 BLAKE2B bfb066a0364aa01d6ffc7df7178c1a0ef266bbb0bdaf7e7d6bf7240dd2347d5c52358712fcdca834fcfbf04922eb6b41842f267a2226af4129f9f6d48b0e825e SHA512 48f157d0c31465424e7951f933bb2f4089c1abce185df8146cb5292a0be636b9e31c2f761aced09666bf12c907a7a33cea2fa4e5ac0853f55f0de9a0e2751fbf
+AUX sabnzbd-r1.ini 322 BLAKE2B a0afea7621d0385f2d5d01f7b9bff2afaa87efdf8b8cbea19953d572a8369e89ff268d1d92fa1625c9bf684199c6211309667c552d63297c4f01bf40f48332f6 SHA512 ef5cbb8fd8bd9a5636cd082a59e0f31d989bafa4a17b4d87ed6c66254f43b05c759bd021e8c1ea5c2ac24e5538e82dc45199f8cacfb25403a882a8e80259c6d9
+AUX sabnzbd-r1.initd 1391 BLAKE2B 1ff6d3dc4f5ece413cf1c0ab104b23c3a4ab451d5cda283327ca781acee88dcbbe22cffc15a725f6f6825a123f0db94fbad017fb7343c05f47ad02a02b68a235 SHA512 c5be8bf0a0053e1a5a6458b7a86c994e636845be2721dc0b14e76ed425ed077274ecbc800724502fa9fa543714470bbede219ec06e7b5dbd310e07c9a14f644c
 AUX sabnzbd.confd 156 BLAKE2B 8cd006eedf4f6614fa00ad9bfee6411dbfb99e1e487c19c4b314b3a7a12742ae4da5de93d771f3fb11a8c2ff5a7eef8fc1b879c1d85757ce218d9357037a70d6 SHA512 91915b54b6e2c2dc7839c23726aba7982b158b20a813ad0f66fa879d2454db14e24472e57e076b41866b28c7cd3991f9961c114b17dfc7e37322b23aa1e6c468
 AUX sabnzbd.ini 347 BLAKE2B b3e247bb75d3d3cead9db3bb1f4d7301542619bfadd66619e3c3d0bc815f4841e95dd11b0b14ec6e02d14e4510aed06abd0c9b66e8b0e2a02fde30a6b5678659 SHA512 14df57a0594a671a275e6e5b4f6a704ce2be01507c518f46162d096870da7b04fb636c4e8aedfdb07d3290934941707eda94180e290bdf7eef561b5641497df4
 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
+DIST SABnzbd-3.0.0RC1-src.tar.gz 2762495 BLAKE2B 5b623e8cc141426459f3d62c3652df41559946a0fd691163428e7b10dfda5518e9701b1a250ed0a7cda6bfda705869ee6a038184ba8f86cfea70d9ea2d09d613 SHA512 00205b1cb4a74455fc48b0ce0579e6849d08b1cedb28ab01f53da8f37bd75268ced201c9e0510ffdf7b51eee6e666e73bec01f537e1ecbdb7f3f6115422b3074
 EBUILD sabnzbd-2.3.9-r1.ebuild 4248 BLAKE2B 400d61005d17bcb42fc0e0cfa4fb0a3f3eba87a7f9efb6538842bad16c2d23db4a312aae46fb2b57a0a41218f42674e6ee139767db4e2e0f42f14c7190f612c8 SHA512 41439600846fec23a3446598761d9f127353ea34efe4858aa2ad54604cc17957cf37f821a6ec544c3f27284b946f9c65cc868170845e9b17f67483850c540762
+EBUILD sabnzbd-3.0.0_rc1.ebuild 3147 BLAKE2B 346837716675e8ec29ad791b75cc0116fd10ae94946a82ca91e33b7a63e266c8f40a78b491935a703d7305f62fa05badc9e0932d5cfdb9601e3aca863eeb2bd6 SHA512 d6b8e37fff0302ba9927fc5ea9a85dd28b1389e41f1fefac139dbe81585618fb5e06ad36a41860ccf18f629c216c70bdc6556b53e74ede7235937ad6533ab2b1
 MISC metadata.xml 537 BLAKE2B fe8b15b9a558bf21c550b24851d3ff861e4c4bda01cae83f9d973377f92142bd0cb5d3580f94b72fe7813ed757c9a487389ffb4aebcb5f3f171e0c480d4a6b5c SHA512 2e1c77abc06440c9d0ea08331a073680de2d49059b1aa7cc245b5b0cbe3aa8e1943a96c97b97071cd9296726d7a0f84a4ad428c8aa26314e0733af2793542e33
diff --git a/net-nntp/sabnzbd/files/sabnzbd-r1.ini b/net-nntp/sabnzbd/files/sabnzbd-r1.ini
new file mode 100644
index 000000000000..5ccd7e19ca37
--- /dev/null
+++ b/net-nntp/sabnzbd/files/sabnzbd-r1.ini
@@ -0,0 +1,12 @@
+__version__ = 19
+[misc]
+log_dir = /var/log/sabnzbd
+admin_dir = /var/lib/sabnzbd/admin
+cache_dir = /var/lib/sabnzbd/cache
+complete_dir = /var/lib/sabnzbd/complete
+download_dir = /var/lib/sabnzbd/download
+dirscan_dir = /var/lib/sabnzbd/dirscan
+nzb_backup_dir = /var/lib/sabnzbd/backup
+auto_browser = 0
+host = ::
+port = 8080
diff --git a/net-nntp/sabnzbd/files/sabnzbd-r1.initd b/net-nntp/sabnzbd/files/sabnzbd-r1.initd
new file mode 100644
index 000000000000..eff3352a90b4
--- /dev/null
+++ b/net-nntp/sabnzbd/files/sabnzbd-r1.initd
@@ -0,0 +1,71 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+PIDFILE="/run/sabnzbd/sabnzbd.pid"
+
+depend() {
+	use dns
+}
+
+get_var() {
+	grep -P -o -m 1 "(?<=^${1} = ).*" "${SABNZBD_CONFIGFILE}" || echo 0
+}
+
+start() {
+	ebegin "Starting SABnzbd"
+
+	checkpath -q -d -o ${SABNZBD_USER}:${SABNZBD_GROUP} -m 0770 "$(dirname "${PIDFILE}")"
+
+	start-stop-daemon \
+		--quiet \
+		--start \
+		--user ${SABNZBD_USER} \
+		--group ${SABNZBD_GROUP} \
+		--pidfile "${PIDFILE}" \
+		--wait 1000 \
+		--exec /usr/share/sabnzbd/SABnzbd.py \
+		-- \
+		--config-file "${SABNZBD_CONFIGFILE}" \
+		--logging "${SABNZBD_LOGGING}" \
+		--daemon \
+		--pidfile "${PIDFILE}"
+
+	eend $?
+}
+
+stop() {
+	local protocol="http"
+	local host="$(get_var "host")"
+	local port="$(get_var "port")"
+
+	if [ $(get_var "enable_https") -eq 1 ]; then
+		protocol="https"
+		port="$(get_var "https_port")"
+	fi
+
+	case "${host}" in
+		*:*) host="[${host}]" ;;
+	esac
+
+	local url="${protocol}://${host}:${port}/sabnzbd/api?mode=shutdown"
+
+	if [ $(get_var "disable_api_key") -eq 0 ]; then
+		url="${url}&apikey=$(get_var "api_key")"
+	fi
+
+	local signals="TERM/1/KILL/1"
+
+	ebegin "Stopping SABnzbd"
+
+	if [ "$(wget -o /dev/null -t 1 -O - -T 10 "${url}")" = "ok" ]; then
+		signals="NULL/5/${signals}"
+	fi
+
+	start-stop-daemon \
+		--stop \
+		--pidfile "${PIDFILE}" \
+		--retry "${signals}"
+
+	eend $?
+}
diff --git a/net-nntp/sabnzbd/sabnzbd-3.0.0_rc1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.0.0_rc1.ebuild
new file mode 100644
index 000000000000..afa365fd3af6
--- /dev/null
+++ b/net-nntp/sabnzbd/sabnzbd-3.0.0_rc1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+# Require python-2 with sqlite USE flag
+PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 systemd
+
+MY_PV="${PV/_rc/RC}"
+MY_PV="${MY_PV//_pre*}"
+
+MY_P="${PN/sab/SAB}-${MY_PV}"
+
+DESCRIPTION="Binary newsgrabber with web-interface"
+HOMEPAGE="https://sabnzbd.org/"
+SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${MY_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: https://sabnzbd.org/wiki/advanced/unix-packaging
+
+COMMON_DEPS="
+	acct-user/sabnzbd
+	acct-group/sabnzbd
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/cheetah3[${PYTHON_MULTI_USEDEP}]
+		dev-python/cherrypy[${PYTHON_MULTI_USEDEP}]
+		dev-python/configobj[${PYTHON_MULTI_USEDEP}]
+		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
+		dev-python/feedparser[${PYTHON_MULTI_USEDEP}]
+		dev-python/notify2[${PYTHON_MULTI_USEDEP}]
+		dev-python/portend[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/sabyenc-3.3.1[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+DEPEND="${COMMON_DEPS}"
+
+RDEPEND="
+	${COMMON_DEPS}
+	>=app-arch/par2cmdline-0.4
+	net-misc/wget
+	7za? ( app-arch/p7zip )
+	rar? ( || ( app-arch/unrar app-arch/rar ) )
+	unzip? ( >=app-arch/unzip-5.5.2 )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	MY_HOMEDIR="/var/lib/${PN}"
+	python-single-r1_pkg_setup
+}
+
+src_install() {
+	local d
+
+	for d in email icons interfaces locale po sabnzbd scripts tools; 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}-r1.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+	diropts -o "${PN}" -g "${PN}"
+	dodir "/etc/${PN}"
+	keepdir "/var/log/${PN}"
+
+	insinto "/etc/${PN}"
+	insopts -m 0600 -o "${PN}" -g "${PN}"
+	newins "${FILESDIR}"/${PN}-r1.ini ${PN}.ini
+
+	dodoc {ABOUT,ISSUES}.txt README.mkd licenses/*
+
+	systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service'
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		einfo "Default directory: ${MY_HOMEDIR}"
+		einfo
+		einfo "To add a user to the sabnzbd group so it can edit SABnzbd+ files, run:"
+		einfo
+		einfo "    usermod -a -G sabnzbd <user>"
+		einfo
+		einfo "By default, SABnzbd will listen on TCP port 8080."
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${v}" -lt 3; 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
+	fi
+}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index db121fad0c98..0650f15eac19 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index 3eb8187db26e..aee0a969f7dd 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -1,3 +1,4 @@
+AUX retroshare-0.6.5-qt-5.15.patch 2927 BLAKE2B a6e24b46af2df2592b482492b3c53049c4d089f8e4c4f6dd1d3a262945284353b1fde488c141bbae335851108887d2bda6c2e37aa91410885b1448dcfb300e4b SHA512 1b5c2debf192b9801a95d6640c079c7c3d2535cd59ca10f712e8123b1b35781cb7c0ef3fc2ff876c5582bbdb1b1c8efe7ffc666f4cfa365c1c429dd67a83ea37
 DIST retroshare-0.6.5.tar.gz 29377995 BLAKE2B 3a8909227080702e42e59b42301e873d4ece806e014a959080a3ae9df7d11564a6e6d915087a9ddd6d5c66d1e5c43895fa24dea8c0042fdce391c384a54182ee SHA512 a65fefb6baff42a81880a401c9005f73ac8180a247dd992a350f9bf5bac366ee6e809bf93cbbc31e80646156147a1d434306dadfbed1f69879ab61cfae3fddeb
-EBUILD retroshare-0.6.5.ebuild 3979 BLAKE2B 35db0f242692977c06de9243a4ee76862a74f38560989cca51d40fbbe1c9ba551559604d9c2bd3a1e88a111c50aceea58ee6dd3c5afb51633d625c9fa1802d34 SHA512 19edf671bd9b754d031848b8f20c068e0b41e51b95c2a6ea3f2ba85b55ccb77fd98e9c634fb4592b44cf5ae62d5be27b0115d76cbaef542aa30eb4814c0ae26a
+EBUILD retroshare-0.6.5.ebuild 4113 BLAKE2B 8b7711204faba503a21083b93575069de216bd9035e344c9314387600e076d996dc3a26bcff78675a4ecaa282b0c8812ba4407010083e4083aac5cfd1e086f1d SHA512 3194e2f6b63233c981dac0451f47ee6a33a7e407063b25f08686d9e01b6f56f9eca2afde3ddcfaae46780f9f9d46f686ebc846fc235763b108d58e437514bcda
 MISC metadata.xml 1584 BLAKE2B 35f66764610422f5ae44273f336d84668035cea9458da32e4af81edf162ce1c83b4e6d4d4d7d17a27a2b9ed4bcef7caff9efbd05b8bcee2bb00d33860fa4b63e SHA512 353333842e9c3335e57795447850dfe56ac29865c27232080b97f293d2c1fda89c9d1a47942861428f3b2a69f8fca5b7389f9a15b3fcfa8bd89b7ea8314f3114
diff --git a/net-p2p/retroshare/files/retroshare-0.6.5-qt-5.15.patch b/net-p2p/retroshare/files/retroshare-0.6.5-qt-5.15.patch
new file mode 100644
index 000000000000..21147a6391b0
--- /dev/null
+++ b/net-p2p/retroshare/files/retroshare-0.6.5-qt-5.15.patch
@@ -0,0 +1,99 @@
+From bbaad838572b5fba6109bc7d3b5c55c2c68e6cdc Mon Sep 17 00:00:00 2001
+From: Phenom <retrosharephenom@gmail.com>
+Date: Mon, 1 Jun 2020 13:44:43 +0200
+Subject: [PATCH] Fix build with Qt 5.15+
+
+---
+ retroshare-gui/src/gui/elastic/elnode.h        |  8 +++++---
+ .../src/gui/gxs/GxsCommentTreeWidget.cpp       | 16 +++++++++-------
+ retroshare-gui/src/gui/gxs/GxsIdDetails.cpp    | 18 ++++++++++--------
+ 3 files changed, 24 insertions(+), 18 deletions(-)
+
+diff --git a/retroshare-gui/src/gui/elastic/elnode.h b/retroshare-gui/src/gui/elastic/elnode.h
+index 1e0edd1a87..33043ddab3 100644
+--- a/retroshare-gui/src/gui/elastic/elnode.h
++++ b/retroshare-gui/src/gui/elastic/elnode.h
+@@ -26,6 +26,10 @@
+ #ifndef ELNODE_H
+ #define ELNODE_H
+ 
++#include "graphwidget.h"
++
++#include <retroshare/rstypes.h>
++
+ #include <QApplication>
+ #if QT_VERSION >= 0x040600
+ #include <QGraphicsObject>
+@@ -36,9 +40,7 @@
+ #include <QGraphicsItem>
+ #endif
+ #include <QList>
+-
+-#include <retroshare/rstypes.h>
+-#include "graphwidget.h"
++#include <QPainterPath>
+ 
+ class Edge;
+ QT_BEGIN_NAMESPACE
+--- a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
++++ b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
+@@ -18,6 +18,12 @@
+  *                                                                             *
+  *******************************************************************************/
+ 
++#include "GxsCommentTreeWidget.h"
++
++#include "gui/common/RSElidedItemDelegate.h"
++#include "gui/gxs/GxsCreateCommentDialog.h"
++#include "gui/gxs/GxsIdTreeWidgetItem.h"
++
+ #include <QAbstractTextDocumentLayout>
+ #include <QApplication>
+ #include <QClipboard>
+@@ -25,13 +31,9 @@
+ #include <QMenu>
+ #include <QMimeData>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QTextDocument>
+ 
+-#include "gui/common/RSElidedItemDelegate.h"
+-#include "gui/gxs/GxsCommentTreeWidget.h"
+-#include "gui/gxs/GxsCreateCommentDialog.h"
+-#include "gui/gxs/GxsIdTreeWidgetItem.h"
+-
+ #include <iostream>
+ 
+ #define PCITEM_COLUMN_COMMENT		0
+diff --git a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
+--- a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
++++ b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
+@@ -18,19 +18,21 @@
+  *                                                                             *
+  *******************************************************************************/
+ 
+-#include <QApplication>
+-#include <QThread>
+-#include <QTimerEvent>
+-#include <QMutexLocker>
++#include "GxsIdDetails.h"
+ 
+-#include <math.h>
+-#include "GxsIdDetails.h"
+ #include "retroshare-gui/RsAutoUpdatePage.h"
+ 
+ #include <retroshare/rspeers.h>
+ 
+-#include <iostream>
++#include <QApplication>
++#include <QMutexLocker>
+ #include <QPainter>
++#include <QPainterPath>
++#include <QThread>
++#include <QTimerEvent>
++
++#include <iostream>
++#include <cmath>
+ 
+ /* Images for tag icons */
+ #define IMAGE_LOADING     ":/images/folder-draft.png"
diff --git a/net-p2p/retroshare/retroshare-0.6.5.ebuild b/net-p2p/retroshare/retroshare-0.6.5.ebuild
index ab3d11026c9f..b2c53a2a2839 100644
--- a/net-p2p/retroshare/retroshare-0.6.5.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop qmake-utils xdg-utils
+inherit desktop eutils qmake-utils xdg-utils
 
 DESCRIPTION="P2P private sharing application"
 HOMEPAGE="https://retroshare.cc"
@@ -13,7 +13,6 @@ SRC_URI="https://github.com/RetroShare/RetroShare/releases/download/v${PV}/Retro
 LICENSE="AGPL-3 GPL-2 GPL-3 Apache-2.0 LGPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-
 IUSE="cli control-socket gnome-keyring +gui +jsonapi service +sqlcipher webui +xapian"
 
 REQUIRED_USE="
@@ -60,10 +59,14 @@ BDEPEND="dev-util/cmake
 		)
 	)"
 
-src_unpack() {
-	default
+PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" )
 
-	mv RetroShare ${P} || die
+S="${WORKDIR}"/RetroShare
+
+src_prepare() {
+	# CRLF endings break patch...
+	edos2unix retroshare-gui/src/gui/elastic/elnode.h
+	default
 }
 
 src_configure() {
diff --git a/net-p2p/tremc/Manifest b/net-p2p/tremc/Manifest
index 9deb92103253..1cc014021fd4 100644
--- a/net-p2p/tremc/Manifest
+++ b/net-p2p/tremc/Manifest
@@ -1,4 +1,3 @@
-AUX 0.9.1-fix-startup-crash.patch 2298 BLAKE2B 0cc6ecfb473d93a6bda34a3d8ebcc9a66d176280bad2d6f356077a2f026540fdcaf5d130475fb687c8292d0402ea6f264a7b67d6a9abd8f9f4356802c0c746b6 SHA512 90d4eebf3913a58bbf8c4e8175c486d1819d6804598320df9cd58a04b6c6c88e06640ca8affc495e6f9c6ceed30b2290982ba774013fbc7f07011f2948936fee
-DIST tremc-0.9.1.tar.gz 315482 BLAKE2B c4e94ef13cc9d716cdbcbff061b1956d17c6babe765e192d675d08ad5d76a22cf171a4fb3f5f2952b971f59a16a2768ccd360d10df5b0f3325fd63ff9716f209 SHA512 ed16080c6544ce9019e6a0c4d660310992cae0f139a2a78e9eaa51841e293cefb22160a105794b5f03a4bfd47a2c50402879f2a17302a96265a9c9acb3174c39
-EBUILD tremc-0.9.1.ebuild 1031 BLAKE2B ec315485a068309eddaa5854bbf83ce5c781d11a30712345be4a1a895ff956ec74b2814c57493f968f30a289388784cb1e7244d232366bd2b0c0432ac213ba46 SHA512 e508957f347a3b59244d7228e6b794bdc79c54b76d3b1ac2966e04a469161dd93d54d83c3e2a861a5fb6019fda1a5bffcb896bc44bf7d23fc1d2c35927f996a0
+DIST tremc-0.9.2.tar.gz 315631 BLAKE2B f5ed154fbfcbdb3e77b678a5827d3f68a6be4033530d6d4e451d57808d43cd5737fff32cf62445d246bfce4d8f02e4cac0c1156603e220e228e61b725d6deaf8 SHA512 d6d6d155ddac918d329226d5c3b53c63fd4fa0b98e30f1eb2cd2226ea598bd7dd81d72f747dc11f4a508bcc0453d90d774c1d8db6dac05ae1ecbc217290b7db3
+EBUILD tremc-0.9.2.ebuild 1002 BLAKE2B 1dcb7a16fb9b0882a464c49ada7b4ca28b5d10f27528202b276f3d9f90a925a4e326b478d18faad5cd8d72814ba2f6f732c3a82c3513a624ef907e54d6037190 SHA512 022c67f441c1b949c9d9a899b9a5338cc1e877796a81afe6795a2f2a38d428e6a4acd9299d49ffa86ee5965dd58ed4d422e9fdffd6a86a96418024224d45228e
 MISC metadata.xml 446 BLAKE2B 3736ac4b139f7c444823e0cf0b5adc3ffcde92bc00543fcc2bd9e23139a3ccb2c192dbbbc6b5e96586ceb61b31b7ac2d3298ee30e0b651880074788c25c2822f SHA512 75208e11a6c89db930bba12b4f120538757ccac5a45fa54b3c6c7e717131d93845453233585f68f8e77fb5abed72a7e91e94a4c1e04f8e3f8986b4de5a7d3e54
diff --git a/net-p2p/tremc/files/0.9.1-fix-startup-crash.patch b/net-p2p/tremc/files/0.9.1-fix-startup-crash.patch
deleted file mode 100644
index 5e67e5d31555..000000000000
--- a/net-p2p/tremc/files/0.9.1-fix-startup-crash.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 0cb919b446eeda41aea8578ae26796ae92a973e5 Mon Sep 17 00:00:00 2001
-From: George Angelopoulos <george@usermod.net>
-Date: Mon, 2 Jul 2018 17:55:38 +0200
-Subject: [PATCH] fix addch ERR crash when starting with no torrents
-
-There was a bug introduced by commit e06d08d:
-    scale_bytes: Simplify this function
-
-tremc would crash when started against a transmission-daemon with no
-torrents.
-
-This was because scale_bytes(0) used to return 0K but now it returns
-0.0K. The expected width of 2 was hardcoded. The new width of 4 causes
-addch() to return ERR because it tries to draw outside the window.
-
-Hardcoding the new width to 4 would resolve this issue. Instead,
-this patch dynamically sets the width returned by scale_bytes().
-This should make the code a tiny bit more readable and maybe avoid this
-issue in the future.
-
-There is one more magic number involved here which I don't see a good
-way of getting rid of. So I made an illustrative comment.
-
-Resolves #15
----
- tremc | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/tremc b/tremc
-index 36ae67b..ed898fb 100755
---- a/tremc
-+++ b/tremc
-@@ -883,7 +883,7 @@ class Interface(object):
-         self.focus        = -1  # -1: nothing focused; 0: top of list; <# of torrents>-1: bottom of list
-         self.scrollpos    = 0   # start of torrentlist
-         self.torrents_per_page  = 0 # will be set by manage_layout()
--        self.rateDownload_width = self.rateUpload_width = 2
-+        self.rateDownload_width = self.rateUpload_width = len(scale_bytes())
- 
-         self.details_category_focus = 0  # overview/files/peers/tracker in details
-         self.focus_detaillist       = -1 # same as focus but for details
-@@ -2667,6 +2667,8 @@ class Interface(object):
-                     pass
- 
-     def draw_global_rates(self):
-+        # ↑1.2K ↓3.4M
-+        # ^    ^^     => +3
-         rates_width = self.rateDownload_width + self.rateUpload_width + 3
- 
-         if self.stats['alt-speed-enabled']:
-@@ -3373,7 +3375,7 @@ def timestamp(timestamp, format="%x %X"):
-     return "%s (%s)" % (absolute, relative)
- 
- 
--def scale_bytes(bytes, type='short'):
-+def scale_bytes(bytes=0, type='short'):
-     if bytes >= 1099511627776:
-         scaled_bytes = round((bytes / 1099511627776.0), 1)
-         unit = 'T'
--- 
-2.26.0
-
diff --git a/net-p2p/tremc/tremc-0.9.1.ebuild b/net-p2p/tremc/tremc-0.9.1.ebuild
deleted file mode 100644
index 8306b1e2dfac..000000000000
--- a/net-p2p/tremc/tremc-0.9.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,8} )
-PYTHON_REQ_USE="ncurses"
-inherit bash-completion-r1 python-single-r1
-
-DESCRIPTION="Ncurses interface for the Transmission BitTorrent client"
-HOMEPAGE="https://github.com/tremc/tremc"
-SRC_URI="https://github.com/tremc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="geoip"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-	')
-"
-
-# This fixes a crash when starting that was committed after 0.9.1
-PATCHES=( "${FILESDIR}/${PV}-fix-startup-crash.patch" )
-
-# Specify a no-op src_compile so upstream's broken Makefile doesn't get used
-src_compile() {
-	:
-}
-
-src_install() {
-	python_doscript tremc
-	newbashcomp completion/bash/tremc.sh tremc
-	insinto /usr/share/zsh/site-functions
-	doins completion/zsh/_tremc
-	doman tremc.1
-	dodoc NEWS README.md
-}
diff --git a/net-p2p/tremc/tremc-0.9.2.ebuild b/net-p2p/tremc/tremc-0.9.2.ebuild
new file mode 100644
index 000000000000..2c02ce97e8da
--- /dev/null
+++ b/net-p2p/tremc/tremc-0.9.2.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_{7,8} )
+PYTHON_REQ_USE="ncurses"
+inherit bash-completion-r1 eutils python-single-r1
+
+DESCRIPTION="Ncurses interface for the Transmission BitTorrent client"
+HOMEPAGE="https://github.com/tremc/tremc"
+SRC_URI="https://github.com/tremc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+
+# Specify a no-op src_compile so upstream's broken Makefile doesn't get used
+src_compile() {
+	:
+}
+
+src_install() {
+	python_doscript tremc
+	newbashcomp completion/bash/tremc.sh tremc
+	insinto /usr/share/zsh/site-functions
+	doins completion/zsh/_tremc
+	doman tremc.1
+	dodoc NEWS README.md
+}
+
+pkg_postinst() {
+	optfeature "GeoIP support" dev-python/geoip-python
+	optfeature "Extract ipv4 from ipv6 addresses" dev-python/ipy
+	optfeature "Clipboard support" dev-python/pyperclip
+}
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 572c9f392e35..546e4fd4defe 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/brlaser/Manifest b/net-print/brlaser/Manifest
index 4a1f79f75bf5..5c5ee255e375 100644
--- a/net-print/brlaser/Manifest
+++ b/net-print/brlaser/Manifest
@@ -1,5 +1,5 @@
 DIST brlaser-4.tar.gz 21963 BLAKE2B 03d5e16ff9b6a6838c82b197bec4a868e6be5752ad9a1df393b646b35642da8f2e1528031b10ece3b0cd7c6c426ff76d1df83c73a51bcac7abac803cd0a66535 SHA512 1e08091adc371a35f75c245fd86f132aae7811a00bd7e9d194c47038dc9aa29296fbf8769cef6b8ea42d82467857195ba8024a9d6de8048174ecc44e0bb76067
 DIST brlaser-6.tar.gz 22807 BLAKE2B be8041c1b6ddb8c4e5055fa35edc2c764562b2b4e52cad17aa968a51886621264d6bf289bd7bb5af0148098bb72aa96adea603091b38c3a245068d60737e80fc SHA512 d7e0e63b64be9ae7633381622c13ba0589e5fe58d277212bce4f5bb712a291ed0b0f2ac3d450dce61c7f9052c1ce7323fec66b5005c5cb3da1314b284d20f06f
 EBUILD brlaser-4.ebuild 425 BLAKE2B 7f00a81d641549355c179df3a23aceda8123fbb03ba2c435998e348024eaee2bd7fd0d357f96c5c978ffa64f70bda794a6ddf12961c4c4777200643573c9c25d SHA512 7daf3afc30fb45d95d68706d6ffe5b13dea0041f4604ebc2b44ad7341e31be2800e1d9a7f8193237b0d215896493176ff56673187de7c6a0f9f9f672665d6cc4
-EBUILD brlaser-6.ebuild 421 BLAKE2B 87d923c261444873473640b80b77c583f39ae123923033f54a9de3101a44cd6c1bfd2e43ae177a79f2432a3c099e3bc78177453cfb298334f43c01cea8ac2e62 SHA512 7f2f93b1c74d4eb3fc3c6a41f9a2d7823a412abe5a801500a0da3fdf9efa97752cae508c8ca7d4eaf2656f1042c2a75480c2248f73aa6fa34060290a03e1bb33
+EBUILD brlaser-6.ebuild 420 BLAKE2B 46798f8b312aedcf3b82660a55bd7334d6ce458f2f1718e7ab85b21d840a18d25ce09fe10b64567dabff27d6f01c5b511ff4afa55acd5b828f41d7164b170633 SHA512 3549bb3f5fe79613e121f4e089d27dffcd2fae90a856ee4d91ef5e5b49455f1b65407fb28ca79ae8636516d53f5155812ca6e85e41f133e13df8a2a27b7d78a6
 MISC metadata.xml 493 BLAKE2B 12ad209b87255457d7f70dcd68fe65d38252473d905c92cfa529996d2e117070011b0b91e1230806a5790611b3935cfdbf2bf484da65dcd50045a43fb1be8191 SHA512 4cdf7aa5a98fefdd13150b4d03534f9586429ae00b294bace8bbb25c59e11205b3d74a7f281707e7c60aa1a04c5b3a671865bf6d078ebc7f237b33bd23569418
diff --git a/net-print/brlaser/brlaser-6.ebuild b/net-print/brlaser/brlaser-6.ebuild
index 1faee9ad08d7..df8a0251088f 100644
--- a/net-print/brlaser/brlaser-6.ebuild
+++ b/net-print/brlaser/brlaser-6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pdewacht/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="net-print/cups"
 RDEPEND="
diff --git a/net-print/cnijfilter2/Manifest b/net-print/cnijfilter2/Manifest
index c7710b271097..13957a986859 100644
--- a/net-print/cnijfilter2/Manifest
+++ b/net-print/cnijfilter2/Manifest
@@ -1,4 +1,5 @@
 AUX cnijfilter2-5.20-gentoo.patch 1535 BLAKE2B c3861e039d0ecce6f1940c1f998ce23ab2834f18a7394c82070e83d7de4d7860869775d5e017a8e26999f3798090bcffab699916263953afbc52a24f39b3bb23 SHA512 29458eabdfe3f7c66b47ddbd490c741b78a3cb9b375be1769e65d2240e732fc184005de226eed8985f77aa153c00c39463d9fce41ba79a439874ebb031acb70d
+AUX cnijfilter2-5.50-gentoo.patch 276 BLAKE2B 9805afacbdc9e3a9dfcb13b250606058f55c8f33a71018f919ae61e5f252563c701b08faaef8e380491897e3fc89669879be159b52b556886f63bb6f13c20cf4 SHA512 206b808460b4c6f5c8f7fd5e999d6fd501e278a97ea79a4f2bbbdb8e061a3641bac7033cf55d75c0681a99b69aa152ac2cf512e54b2fde3339685a3c2e0af326
 AUX cnijfilter2-5.70-gentoo.patch 1786 BLAKE2B 96c0f8b919dbc896c7b749ef52cc1c6f331921fe55b196782b613389372c5ba382b8a7f1e5f6e326bcfae4652cf4d1c40fcd052f435c721301cf4cdf7433faaa SHA512 9cc2b0a069a8ec045bdedb41e9f6246f6245ae5fb4567a23f03516bbc0d6661d54faa291a976d8a89ee216df31db4515ee04123f9ba7e1cfd629f3191c6ff657
 AUX cnijfilter2-5.80-cflags.patch 475 BLAKE2B 18cee126ff7bc58cce31e22bccbc220b3f3a149dce1d3e68a070739a08715d6093cb41e6db12bc8a3ade0d9e73ea18d9ed1b666c84f8364d263bf585a666c60f SHA512 ca36f72b0a4f5a1e9fa7c57722a55b3eb5f907fd86cdb92ec27cd1f8cd6bdba6f27b50612eb03c774d823a17598fcb475b1ea9fdba10b6de5d0acd575ddee07e
 AUX cnijfilter2-5.80-fno-common.patch 486 BLAKE2B 688d66202fddd0afeb757e7933fbf38af6cb65ee3a805e8af75a0c8c6bbf9e6951d2b5376c0204830c457a77d06d3f942a420496b98aafafe6df42f651b1da41 SHA512 fd5a21de395e93975b2118c06a6957de85157e4cac8b3c473f48f00cbd56e7178b59c03396ece47f21f49414eb7acdff53952469dca5498b875e0c488af80b53
@@ -9,7 +10,7 @@ DIST cnijfilter2-source-5.70-1.tar.gz 1366033 BLAKE2B 0d03c4c4f4bc00ea91cc46db65
 DIST cnijfilter2-source-5.80-1.tar.gz 1422542 BLAKE2B 046fa72752c5645f307dbee3f2d5f01cd24484859a2d9002135cbcaa9dba0adb3b8d961c7adede8aedd816d4932c526474e7cd252c13e1cef56a427b3b58740d SHA512 060af4834472d21f50f3a431ff6a1bfb36e14348b58eaa777ae471d44062d76b7fd3f247da1818f893285a94ac0335f656e3d026fc613d338dc2ce4d8e242d21
 EBUILD cnijfilter2-5.20.ebuild 1403 BLAKE2B 1daedead655b9573ea422a8374bf04449baed0d9f845fb64852f0a3515694d6a24cb799f83d98074553808b6e3cadeb273a4b54c1a743d079658c5f093f1cadf SHA512 e316d08d3e04b5bdc2b3281c4e2d983b8bb4d4a46b7b32b088fa65c370f613ec3a4a6d48252f620125974212b4c235d42316ef73c7748fed940ab44442d09027
 EBUILD cnijfilter2-5.40.ebuild 1515 BLAKE2B 5c7452ce92474cc403a1051b622e18ff257759bfd80b45c0e928ecf2a68e69a78eefa31ec60f29e1c4c9aa218dbab5141ccb1251a9fd46f171332dbf069975ae SHA512 0e75f8248fe1d14e2bede4e172e662492c7e2483c2dbebe66d1a8ba719df3b3c6da31f83dd2be7c71db98367a62f969a6a0ad1d7cf8ea68eb17bfdc4f6097171
-EBUILD cnijfilter2-5.50.ebuild 1510 BLAKE2B b4d914fa287c315528c6598821ff75a8b7f9b14d5fc605dba5b35794f19fa9573733ad3f1575fbc908c988a6547f27d4752161b3af93f5146f9d39cb9cc53052 SHA512 16189d363f5464c492b788dfc75c2f3b45f91489d3f93983d4c449f8e7df99263ba3ae7c3514ad71869c1f1de6a8373cbd10797ac1d0e08aa32f2484100e8b63
+EBUILD cnijfilter2-5.50.ebuild 1824 BLAKE2B 0bf3b50902e82594459eda12e60e7e7f5e95114c3c075434465c3922ea8cdc11785bb5ed40a9f664e1a98a3d666809a5a9f0aa660dc86edaa8a2598d0b2595d1 SHA512 9582f2fd8a578546000ffbc31d925802079e6131f0b907a0e9a846ff51341b171b5e25c578440808fac5782038bf8c2a63fc4343c588d733a0f4db9ab52187ca
 EBUILD cnijfilter2-5.70.ebuild 1520 BLAKE2B 526de368e3ada4e675ab6bd8b3cfc84fa6314a233be92ca072de738945011a1a76f017c0da1d6516d8879d2abfcd9636f4999860984298d5f3135b81b242c978 SHA512 44f3775f11b07387448703a7102a7d498ece24f5750e141a6838b994e4a9050a19b990514fe9a17a138683349372e40cfb6f178f3ded7cc6e6d6266d6f1e0d45
 EBUILD cnijfilter2-5.80.ebuild 1807 BLAKE2B f1cb80a0e64fd7a82fd5115cdf9844dd06953b61419a2bec7251824b7a9a60c5a90836a53ef935789f0403fa7b424a38c19de60f8edfb14229d7621121edeeb1 SHA512 59dca6a4ff8431ead84c062d6fa126584e706dd7152079651d93ac9fbb67388181d5579f7f12607e52209a4de9aae24593585f1ec6f7663b9772352304e805d5
 MISC metadata.xml 247 BLAKE2B ca08677c4c0af66af431abe578122a2ea0278f7ffabab245eec806167a6226c65f97e9826d64fc4b82eb14b6200cd1e3a31a5b4999e18aac41a4f9af43d708d6 SHA512 fff6c25e644477aaa35b838e10c44ca8eae9824ef8f19795e31201db40c10068f0216dec38deb0ba80782155b43fd1d72fb888cb825eaabacc3bd1ec0d18f3ca
diff --git a/net-print/cnijfilter2/cnijfilter2-5.50.ebuild b/net-print/cnijfilter2/cnijfilter2-5.50.ebuild
index b8e27bb386da..99edb10a5be2 100644
--- a/net-print/cnijfilter2/cnijfilter2-5.50.ebuild
+++ b/net-print/cnijfilter2/cnijfilter2-5.50.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -21,13 +21,25 @@ DEPEND="virtual/libusb:1
 	net-print/cups"
 RDEPEND="${DEPEND}"
 
+QA_FLAGS_IGNORED=(
+	"/usr/lib.*/libcnbpnet30.so.1.0.0"
+	"/usr/lib.*/libcnbpcnclapicom2.so.5.0.0"
+	"/usr/lib.*/libcnnet2.so.1.2.4"
+	"/usr/lib.*/libcnbpnet20.so.1.0.0"
+	/usr/bin/cnijlgmon3
+)
+
 S="${WORKDIR}"/${MY_P}
 
-PATCHES=( "${FILESDIR}"/${PN}-5.20-gentoo.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.20-gentoo.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${PN}-5.80-cflags.patch
+)
 
 src_prepare() {
 	default
-	DIRS="cmdtocanonij2 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg"
+	DIRS="cmdtocanonij2 cmdtocanonij3 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg"
 	LIBDIR=com/libs_bin$(usex amd64 64 32)
 	for d in ${DIRS}; do
 		mv "${d}"/configure.{in,ac} || die
@@ -40,6 +52,7 @@ src_prepare() {
 	echo "SUBDIRS= ${DIRS}" >> Makefile.am
 	sed -i \
 		-e "/^CFLAGS/d" \
+		cnijbe2/src/Makefile.am \
 		*/configure.ac || die
 	eautoreconf
 	cd ${LIBDIR}
@@ -53,7 +66,7 @@ src_prepare() {
 }
 
 src_configure() {
-	LDFLAGS="-L"${S}"/${LIBDIR}" econf --enable-progpath="${EPREFIX}/usr/bin"
+	LDFLAGS="-L${S}/${LIBDIR} ${LDFLAGS}" econf --enable-progpath="${EPREFIX}/usr/bin"
 }
 
 src_install() {
diff --git a/net-print/cnijfilter2/files/cnijfilter2-5.50-gentoo.patch b/net-print/cnijfilter2/files/cnijfilter2-5.50-gentoo.patch
new file mode 100644
index 000000000000..a7322bbce860
--- /dev/null
+++ b/net-print/cnijfilter2/files/cnijfilter2-5.50-gentoo.patch
@@ -0,0 +1,8 @@
+--- a/cmdtocanonij3/filter/Makefile.am.old	2018-01-14 18:14:20.645473030 +0100
++++ b/cmdtocanonij3/filter/Makefile.am	2018-01-14 18:14:36.078219959 +0100
+@@ -1,4 +1,4 @@
+-filterdir=$(libdir)/cups/filter
++filterdir=$(libexecdir)/cups/filter
+ 
+ filter_PROGRAMS= cmdtocanonij3
+ 
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 99c34c040f0e..d1d738651cd0 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -2,5 +2,5 @@ AUX cups-browsed.init.d-r1 154 BLAKE2B 81a1b1b6c8b6f0d7ac874c32aa5c5531b7d791711
 AUX cups-filters-1.27.4-make-missing-testfont-non-fatal.patch 510 BLAKE2B 9b48f841b7034b4c56ed6ea7d229696aacc232b9d78c9984dad6db8f6e967e239c77dbb35886230ac968966ee04912add135a5932ca1483674e1bf2c087e81fc SHA512 ce14af0a4d2db1e67471b8986290261ac17709720fe5a52a6a81bda19e4ae7e4ab92a8f1e954b82b792690f9eae8116c59ee3a11594256a36bf8cff32846e97c
 DIST cups-filters-1.27.4.tar.xz 1493860 BLAKE2B 424c3ba73ec7d6f4683eaedde86d657b1a2da17670c84097f5f3f8ef525cc8cc6d7843a88d35013a5f48bba8a903f7504df9054427b9a63d748ce39de458e71f SHA512 8005e94bb6b06d0a15fa4dfd8455d0bc67418478bf517e205af1c8c0018681a97ae9ea486db07570050ebeeb7f63f75319a8fe012c112c6d16c0941299eaa50e
 EBUILD cups-filters-1.27.4.ebuild 3599 BLAKE2B eb2b2f3dce938b6516342c4926f962f35b51fcc8eb6d1ff5c3d2311515c78c68febfd1fd59633d120cc3fee71b2ed6119d1503e1937e1084560b10b2b4527abe SHA512 78120456764f960f89ae41405286f7b1105be5db5c3cf6cd852bb620120bb56a96798d08a469580947616851d3d23d4f47e5d28830476c8833a8194c6d9e2f8e
-EBUILD cups-filters-9999.ebuild 3608 BLAKE2B 52b38a7ff26bb0ae9e761e413a84edac3378fb24e0ae5a823f562ed06df45bca60a5f38f01feb3b72cba894d34668fb6428db052219c1392f681768b3fbe0929 SHA512 5a53ec01c203f44c531507480d04ce041016fa7afcab7b2e40f9f35657c5e9a15e2d0897c941bb3d3849679cb9898dd379d8ce74060406dfb920de388de5a8a6
-MISC metadata.xml 560 BLAKE2B ef0a2d2d0db2d065b1dcb444a6bf3333cc3cc8658629ffcdf44e9d39c4f13d8adb5e5b770d4abeb76fea5d4d3e85968daaf2ce2d9a13d3f396ab91f51b1ef723 SHA512 b734c24f2b65bc5c7d13b1ec8ec86f2188d758c295f7bd5aad12a794498ec92d43d543a0aed2ff49013c26aa3baf1f3e03fead90bd5c7f70bf430d48c063b06a
+EBUILD cups-filters-9999.ebuild 3537 BLAKE2B b632ca69c758df9a0a3c77a3f410b2212288f945cce61d3782249325eaf04cc5885172cb0f7e02b4f953c608a296889c13f4c16b9be0cd6994bcdad4b6c2b4e1 SHA512 6f506cbfb556e3a0d5e404a6cd802ce63d6bdf90ef7bbbbdd6ce5b6d45f12dd025e4324ee30df36d1d2ce23684550512743cb3ca95f04023ac945ae72aaa5999
+MISC metadata.xml 444 BLAKE2B 43542e8e11bcce56517af18fe24258495e3032a72bec385a513c741bb1b48f9b77d83b2d8ebcd52f83a16b099762e9e85ff4a91e688203cbfc4461b4a68a34fb SHA512 8eafb557741f3d771b445424c4bfeef6e4de60c7aca36c1a1e3541d234d2bcd5e459602bbb7b3b5327403993486d803f8e837ec51dfde64fcdbfa522ad131950
diff --git a/net-print/cups-filters/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild
index 7abb7a7fcbf0..651c4dab158f 100644
--- a/net-print/cups-filters/cups-filters-9999.ebuild
+++ b/net-print/cups-filters/cups-filters-9999.ebuild
@@ -31,11 +31,9 @@ RDEPEND="
 	media-libs/freetype:2
 	media-libs/lcms:2
 	>=net-print/cups-1.7.3
-	!<=net-print/cups-1.5.9999
 	sys-devel/bc
 	sys-libs/zlib
 	dbus? ( sys-apps/dbus )
-	foomatic? ( !net-print/foomatic-filters )
 	jpeg? ( virtual/jpeg:0 )
 	ldap? ( net-nds/openldap )
 	pdf? ( app-text/mupdf )
diff --git a/net-print/cups-filters/metadata.xml b/net-print/cups-filters/metadata.xml
index 8c940c947b64..4a6a4ace1fb1 100644
--- a/net-print/cups-filters/metadata.xml
+++ b/net-print/cups-filters/metadata.xml
@@ -9,9 +9,6 @@
   <flag name="foomatic">
      Build the included foomatic-rip printer driver. Strongly recommended.
   </flag>
-  <flag name="ipp_autosetup">
-     Let cups-browsed automatically set up IPP network printers by default.
-  </flag>
   <flag name="pclm">
      Enable PCLm support
   </flag>
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index d75387a9df94..29a2a7cb8e93 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,11 +1,10 @@
 AUX cups-1.4.4-nostrip.patch 487 BLAKE2B efc4b3db44b65a1b0c67c472e467d80b486969396a48443b8e6be007ba991bdf6830b1e36965bae053753440528e1aa58d792c4f42bea8464ffed1179f049960 SHA512 10f46e841aa5646f40564e92b6c5b90a5d27702ea8a4dd8652cfd39834be54feec20a2c8d4fea663b90685865deae17851e57161aad7ff250916ce4accbb01fa
 AUX cups-2.0.1-xinetd-installation-fix.patch 332 BLAKE2B 5688eeabaea0d2db636012e658f5cbbf6793138653df731c24c89149553994a2db423f85251385628de2f467597af98baa91ab954f63f77b5f7eec037d8db7af SHA512 e4111fb05ac381f5639868464734fbbc9296252bda288fc415274cb0eda37ff57d4d2816e34960a3e30a1c73c3aa6911267a5d2c29f1480d8e44fdb6e95f3836
 AUX cups-2.0.2-rename-systemd-service-files.patch 2092 BLAKE2B c34d8d6c5295aea6eaeb5aea05dcf32a9a554d445ae1b57b8d33386394e1d3f414095d89dc55eb0d4c5678e2985c37451e64101e6426bc2ad26aa50404b51844 SHA512 409a7508dccbbcfca60ba448f8cea84ecb2710890e7655c67b8292c34c8d555884e7e82e70c2c700691af1a786ce0d8c8c799b6fb471a18f1b87eda99eacd9cb
-AUX cups-2.2.0-dont-compress-manpages.patch 319 BLAKE2B b03a0ab815751055d79475423242bbc407e934cdc00e4596ab05e3d7f87ca0feb7201f6696a8eef59fdb73630431364f12146f1d32743e272de054019acb8380 SHA512 0f4822e50f9376dc2e8c87b55f6526ab514f5f08f737071f5b15696e71b51416203df6c9219d78989544bbc135cd92be91ef351a377be7ab4052e98c25c0c4f5
 AUX cups-2.2.6-fix-install-perms.patch 660 BLAKE2B 85c42742762dc72c746550c36160c5fd13b10727fa4e40793b7072c88c3856c580e408180819acc1668da06024b30173fd71f725175981305c739aaa40b7ba65 SHA512 f64ed254bc79935ea3d9fce4c4cd8074445397c20ee1bc1e759e3bc7a336b30f73722357d2702219932e7a774f925abf9a450d3b30a12ca1f0c5f3c92b0b5fbf
 AUX cups-2.3.3-user-AR.patch 593 BLAKE2B 4794e162b156075a507707296a045226af5f6342870fb7173017ff530aa052b4467cc64c03cfc80d4e2d3500e584e6c313414ed7237acaeda8a8107c3ed2e65a SHA512 ec570a3a7bd6710f50e8e702755a106158f8a2fd9b7e2efad6e345f12210bbd79e450f60ae0d30ae838f1abf1b4c7fd89d13363d2e4bbacd653177b60f05786c
 AUX cupsd.init.d-r3 584 BLAKE2B f503663a59673209fc6c161aed3cc214cab2b3e68692078dc47c1a833fe141225f48f2d07dab65fc19ea68e54bb7c9a7c94f6db1dac443111d04b392fd7855a4 SHA512 ace66b46c17f99f8c6487188c14e8a1baf7acad602156b88cdae7fb4738c163a045240a1b28c6db4af86caa317723357186812eed81f9553a9ef3517c966c6b3
 DIST cups-2.3.3-source.tar.gz 8140741 BLAKE2B 427e6ee3602aec33ac336d9b2c6c8eb270f2996371f0edd3d69e411b94b2e93fc58a0032ba9f6d048f2c58a1c6b48f742671b4011cd725b882adfcc06ed7fd8a SHA512 7d6f4a01794c5599cc71525778ea785fd17271c31ac146a56e8fc374a88f99e4035d018dae48e37e541455e9cc93b302e892b2e93ec558c1b4bfc46dad68c92d
 EBUILD cups-2.3.3-r1.ebuild 9669 BLAKE2B 3e5176e8489b9c1fb71054f0081daf723ed0472e2bb72afd574dcfa6929bb20a190173e49c29ebf50648dc9b2a273e03c354fee48a87c41e6e887b46f4112a41 SHA512 987e89faa67760aa987f509099926e5cbc1508d6cae5de92b5895415c65423fd6f99a98095fbdf8b32bbfb3a7c701d79f6ca880be87f5c2ab6f5d26087134426
 EBUILD cups-9999.ebuild 9637 BLAKE2B 8790be1a982a75e70c7aee3b09a5c7be45bc6846a17313ad1ec7ff8838fa39f87c1b2ef89334330adb71540e3a68955490d59ba9699c3fb727c1251638714fd8 SHA512 e565b74c705798090368a0601331303df8574a66f7975c1c63a2531e3ac9e2124a45c11003051997c58babfa37f1720f3fcbaf217385d1bd40b2b119ddb3165f
-MISC metadata.xml 733 BLAKE2B 2014cd9267e3f7f1a4f73124ab6bb9f4ba80b95ef08c9a781a03a95bbb3f97dadeb9e1a239d8dea5a6f6678d99eb906a2835df0168c13ba5456baff8ab3c6e0f SHA512 e4e2342cb4b0598fc23486753d9296254da78eb7d448fbdc250a2ba181e5692002e1e671799971c9cfaf25d40e034e3e2752836067b1b24813cfb3ed1b682e22
+MISC metadata.xml 527 BLAKE2B 432203e09b4b13065dd0fa3a799e1b707f079b146e4d89583fcde60b1a4d09ac21805573faee9c67fecbcb0fc364c22cda310d2b4ecc92be3f39c985b20fcbd5 SHA512 0f1469c396e9e47504ec44a1e4a8db2c6dbf34e4e8cd36862cee7b58d0402873273cb9b3b24ef9b676566cafa10aed6547f8d4b50233af7257ab1d8d828b483d
diff --git a/net-print/cups/files/cups-2.2.0-dont-compress-manpages.patch b/net-print/cups/files/cups-2.2.0-dont-compress-manpages.patch
deleted file mode 100644
index 7b61b39f16ad..000000000000
--- a/net-print/cups/files/cups-2.2.0-dont-compress-manpages.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- cups-2.2.0/config-scripts/cups-manpages.m4
-+++ cups-2.2.0/config-scripts/cups-manpages.m4
-@@ -53,10 +53,10 @@
- 		;;
- 	Linux* | GNU* | Darwin*)
- 		# Linux, GNU Hurd, and macOS
--		MAN1EXT=1.gz
--		MAN5EXT=5.gz
--		MAN7EXT=7.gz
--		MAN8EXT=8.gz
-+		MAN1EXT=1
-+		MAN5EXT=5
-+		MAN7EXT=7
-+		MAN8EXT=8
- 		MAN8DIR=8
- 		;;
- 	*)
diff --git a/net-print/cups/metadata.xml b/net-print/cups/metadata.xml
index eefca8bd29d2..487c6ec99fc7 100644
--- a/net-print/cups/metadata.xml
+++ b/net-print/cups/metadata.xml
@@ -9,12 +9,6 @@
     <flag name="lprng-compat">
       Do not install lp... binaries so cups and lprng can coexist.
     </flag>
-    <flag name="python">
-      Add support for the Python interpeter in the web server CGIs.
-    </flag>
-    <flag name="java">
-      Add support for the Java interpeter in the web server CGIs.
-    </flag>
   </use>
   <upstream>
     <remote-id type="cpe">cpe:/a:apple:cups</remote-id>
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index b858949f0063..717ed8d0cf80 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -2,10 +2,8 @@ DIST hplip-3.18.12-patches-1.tar.xz 12032 BLAKE2B 33e6e4e1e0e5b4f998459073cf0742
 DIST hplip-3.19.12.tar.gz 25676247 BLAKE2B 1373aa70a2307071c28a22b0ae85e242c3e6bec614ef7490c1ecc0e5e745b81b6c2097948fbd062b5e72e10714cdc8d6f9145aacafc0fedeafde375909cb2cb6 SHA512 5552cd717ae082ee55cdb77d79e8d035d8ecb7cf23c79d659fda43468d8ed414a33c4d869eab4ab83dee836f0d1cceb74c3c4a249e26f904a5ab2350e08a5677
 DIST hplip-3.20.3.tar.gz 25672070 BLAKE2B 4c6209a268898de123b2b557d662acddb3ad90b227c0752ebdd1e2afb3fe3d19fddc819aba999347708dd0c098f2b8fea4580dcfb3d5fc7893e47520cae7c1d5 SHA512 a397eb3896292ac956a1969b76707af62c866e47d88148fa75b68574e4639283f7414a2c77e6854c5d22daea49181d4f1bc2daf11fb3058372ff084d591696f1
 DIST hplip-3.20.5-patches-1.tar.xz 12716 BLAKE2B 982480185b2decb9f4e857336b474dab585d64aa44a9f0da70ba568e20488f451507aae3bd1427aef4274d36db93dd9bcb1d906f7b393939dfc43c81a1f9a9db SHA512 ae46a6f490253a1112838b08d56199c6257d33911569619483d925798b54a8bc9fe57afd1e86dedb9482d89d42f44bec81db215f37cbcd8fb5982596c80c1117
-DIST hplip-3.20.5.tar.gz 25774089 BLAKE2B b1d95e5551ead7818c7fb8529edffea59718944e6838370594f20f8e4917ee23d0beb85f1b68867c332c196ab863f8479ab9b645ce57d9b03dae59fd1cab5f0a SHA512 fce3c7b8a2f3b0d2875bafd2ff65a3312fae867b658cd45eea16d9f3663646b6b0b70b58e6c2b46eb24627cdeefb318b6ca9ccf5a0e9790ff19519518992da07
 DIST hplip-3.20.6.tar.gz 25909290 BLAKE2B ac5720c0b0a871459f22d24658eb51b381afcb7cc76831908229e1f0d1cc2feb69122690915f817b835d71b17fe9ecaddd25f506f9e9809f49d8b935fdba962a SHA512 6a5ce55465e3a537ecc0b6e7d198835dbe495e191522e674a507a4993e2061da3ea084a5239a74b2279c065c0775067d5b6a4aeb2a7791825106a299fb55e8f8
 EBUILD hplip-3.19.12-r1.ebuild 7742 BLAKE2B a65c85f9249fb730e4f2db724ba1f8d12a946e219d1cdea42f8b270b880fbfc2113da667c40b295738318524663c0173df23818a8f5e233a21e4a2be48f7ef75 SHA512 14264395f135c78942287e5bd68577d66918511b59ab5c93410ca50c7597e10e0d8eaa43b6b2ee757a9323405fd8d6c3f507356b8defdf1c8fe1d8195db1b49e
 EBUILD hplip-3.20.3.ebuild 7789 BLAKE2B 9c983e4d2aa56aae1d76967b62f0c626c0dd58595c14fd4bd9b2b823f2fb1b24b5bd02837dc28cfa8fd3134d8fe2b41f695ffb991a7192b51b294b45249856ca SHA512 9b5fa8a34fbfb02317b46a45f69297c210bc258e65f47c1761a1aa51df466693132c50cd22acff401097a6c314127043f9de1b5822279084760eca70a1db2447
-EBUILD hplip-3.20.5.ebuild 7792 BLAKE2B 6ef0aac91d3527a1581f883655c5ea514f59c127b09ec320f88eb53482371bbefcf01065320c5222ec4ca842b52f0e8183a4b50df0093eb1420bab36244a08d6 SHA512 e3bc41d171e8112c4f6eeda9ba69ad1565e0a8fbd88e66a8a6136b832af043eec5ae7857b72f043c1ba7981b3a8aa1936ab4b213e18be414af19a8c5d037570d
-EBUILD hplip-3.20.6-r1.ebuild 7910 BLAKE2B 15b6b52ac69dcd704685beb1e7e43e2f7955b9b630bcc442d2585fb2dec14f341ef9c0c8d3d1be7587a60c1f24eaa2fe59167d487a4200f11b55c51500296912 SHA512 ee5fdbe9b8ca9bccf8007f963400b6ed743d87efade64364bc781349e4fb96eccc32318f0f0c49b13a31d68642f9eb015a03cf4ffb68ffe334b412cb009f83d4
+EBUILD hplip-3.20.6-r1.ebuild 7917 BLAKE2B de5eace7ba966ac0ea1d301788e1059588095ef4216a2f7adc7fbde7c3e9cfa6cd5f2e97f78f1a948dd34eba4a1da9aba8deb7969ddf49661da765bd360777ca SHA512 36eb5ee4e1098c180d5417a4d111dbde5fd0c9fc41d1fbc5293c8798e1e64210b41a59ce77ff1ebafa7438deeed5e993ef0e83a20cd20b6d7790ae22b9f55d32
 MISC metadata.xml 1910 BLAKE2B fd9fc7a40bd2bb877e7b4e26104df247dc8c7aa5cbd7211f5d489ec889834aa64fff20d6624f3c8b3e1e4428704cb7f2eb4d1bffc1c6fb15f15b05fd422297e2 SHA512 022854843c9ae373aed3ebd3879c9f1312773dea5dca15c85fb839ff067ea5599532201fa51d9e91ec18b0be1773e2ad544cd4e5697eb9c91be22d8d9352d7ef
diff --git a/net-print/hplip/hplip-3.20.5.ebuild b/net-print/hplip/hplip-3.20.5.ebuild
deleted file mode 100644
index 0577e0d45ea6..000000000000
--- a/net-print/hplip/hplip-3.20.5.ebuild
+++ /dev/null
@@ -1,276 +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"
-
-# 14 and 15 spit out a lot of warnings about subdirs
-WANT_AUTOMAKE="1.13"
-
-inherit autotools flag-o-matic 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.20.5-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:3[${PYTHON_MULTI_USEDEP}]' 'python3*')
-		kernel_linux? ( virtual/udev )
-		$(python_gen_cond_dep '
-			>=dev-python/dbus-python-1.2.0-r1[${PYTHON_MULTI_USEDEP}]
-			dev-python/distro[${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_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
-
-	append-cppflags "$(python-config --includes)"
-
-	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_optimize "${ED}"/usr/share/hplip
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/net-print/hplip/hplip-3.20.6-r1.ebuild b/net-print/hplip/hplip-3.20.6-r1.ebuild
index 6bf31b7b4b6e..f5b44b6010f0 100644
--- a/net-print/hplip/hplip-3.20.6-r1.ebuild
+++ b/net-print/hplip/hplip-3.20.6-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 IUSE="doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
 
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index ccfd580440fe..1be00838b41c 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index cd5253428884..df5746edbd65 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -8,5 +8,5 @@ AUX squid.pam 209 BLAKE2B 113fa119ce4fd96ddf34b95c1a1ca958b34aea405564076f89abdb
 DIST squid-4.11.tar.xz 2447700 BLAKE2B 9080508caff683bffe3e2eb64a454c95f69ab47c0ca9b1a649e553daf0dde2391aa14c6631aa6ee617687b122beef691cbe9a8e49ac5e5ea8a9737847ece9444 SHA512 02d4bb4d5860124347670615e69b1b92be7ea4fc0131e54091a06cb2e67bd73583d8e6cbe472473f0c59764611a49561d02ab9fe2bf0305ce4652d4ec7714f26
 DIST squid-4.12.tar.xz 2450564 BLAKE2B 39068d5e999ebf62fbc45ea8faa8811c7b4e6a231f814f2580f54ce3ac499b503b7bc071188b4446a2a94f7eb2f4cfc6369a1b578e637a7b5e37a0ae2aabfb8e SHA512 96fa700a0c28711eb1ec5e44e1d324dc8d3accdddbc675def8babe057e2cc71083bd3817bc37cbd9f3c03772743df578573ee3698bbd6131df68c3580ad31ef4
 EBUILD squid-4.11.ebuild 8204 BLAKE2B 4bd328eab6cb9c07987cb92d15d701db07907870e00742fa21614f4bb7f5a2e1193ed6f3be7e0845756ece5f7fe55910c705a55831e116a0d95cc8962b2c1169 SHA512 0a2bae992277a8913997cf82291651e39c617ad010841f7ffc7be3e7c21adf8cdaaa54ee3b532a38f541d60ecc6ad9ae11c323dd312b45950133244dd7125d08
-EBUILD squid-4.12.ebuild 8150 BLAKE2B be5122cd22948834f6520926f8e47377fee6e050e6e0bab3ee97958a3ec7a4b52e7c930f88d8f065458c745f5b38bcd42bffba97b457f01c708b98e471db269d SHA512 5969c808a434039ddf606b8bc5fbf95eb9204ed98076aee98be7e9bfe77b25792b2f4b378cf360258744d5a4c9cbea77123355a61ad7f52fa60c12e793648f43
+EBUILD squid-4.12.ebuild 8145 BLAKE2B ebc2a81095cacf46d30b051b4b81f293f52024a3715b3bc38db29a5c59e6b06f11528985315f125b8611a3a0924f5737172682eaeeb9bae085d4e166dae8ab64 SHA512 a1a676df8edb4b43890ed57b3ddb1d0abd9d0dcccfe513888b1b17b460d830cc05c87c957024af0314adc95052c97598201be5a2ffc2ff0e6077c3e6fd65c711
 MISC metadata.xml 1472 BLAKE2B ba8020d30b7fb7740a160a06f2f4323f1ae181c79bc89fe390b25b156000a5c751a68333a634753cb1a96a9097577b379369226db8ee6e04c22c4b9f0e8626bc SHA512 19fce272b91077d6114ee400adc6360993558c02bc6595c50fdf43323eb7aebd0f2c0d7cb6d688fd8f1db6af06305de24a7c5a0cddce62d150391c50da46e056
diff --git a/net-proxy/squid/squid-4.12.ebuild b/net-proxy/squid/squid-4.12.ebuild
index f44bb151ccf4..ccaec342a499 100644
--- a/net-proxy/squid/squid-4.12.ebuild
+++ b/net-proxy/squid/squid-4.12.ebuild
@@ -22,7 +22,7 @@ fi
 
 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="caps gnutls ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
 	ecap esi ssl-crtd \
 	mysql postgres sqlite \
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 752cdc42c214..877fbc6cdaeb 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/ipsec-tools/Manifest b/net-vpn/ipsec-tools/Manifest
index 3a5a2ee55883..0398c8de0cde 100644
--- a/net-vpn/ipsec-tools/Manifest
+++ b/net-vpn/ipsec-tools/Manifest
@@ -13,6 +13,5 @@ AUX racoon.init.d-r3 1295 BLAKE2B 730b7c7069ea94f0e27fe3c0ed344d6f9631e0445d2368
 AUX racoon.pam.d 156 BLAKE2B 91ebefbb1264fe3fe98df0a72ac22a4cd8a787b3b391af5769798e0b0185f0a588bc089d229c76138fd2db39fbe6bd33924f0d53e0513074d9c2d7abf88dcb78 SHA512 d3f7e6ca8c9f2b5060ebccb259316bb59c9a7e158e8ef9466765a20db263a4043a590811f1a3ab072b718dbd70898bc69b77e0b19603d7f394b5ac1bd0a4a56c
 AUX racoon.service 244 BLAKE2B f7e268518787a67e9363c936b8a9e69763c41db1926f99f3f001fdf738b0b3a92cd62770ab6cc0189cea20ca22d3abe675c832363ad77974e3f531ffbf525e7b SHA512 56d84f36b307e1ea93f3cdc9fbb7b459f4b3b65ea2bb765f61def10d06a3ff09d61b8d53b21796a55022279e791d751f3bc1ccf0d0f85799a743371390930567
 DIST ipsec-tools-0.8.2.tar.bz2 866465 BLAKE2B cf8c9175d96326fc5c74e6b1921bc66911256e289e6fe9cef77f26c197546902be3ebd5696af39c749a2abaac3f42010c9e2a281fd208122cd59222044b9dd4c SHA512 2b7d0efa908d3a699be7ef8b2b126a3809956cb7add50e8efb1cfdfc2d9b70c39ef517379cb9a4fad9e5f0c25937e98535b06c32bd3e729f5129da4ab133e30f
-EBUILD ipsec-tools-0.8.2-r5.ebuild 7907 BLAKE2B 4f0dee8d6a083952e1db6f89b5cdacf701eb476943915d3efdc08a369ab9f03eddc9798f7f2931021555429a69aea1fa00bee99fc24d2e8303212c4b9fc8656d SHA512 3390b428d29df81755b2d419b049ee776ff60b38d8156ed7852e54fb47fa0441f3608ee23a8a254781fb4078d8cd12bfa624035924355464e891c7a344c2bb9a
-EBUILD ipsec-tools-0.8.2-r6.ebuild 7960 BLAKE2B 5557846cd1912402055f2591ff722fcbd79edf5ff437c0ea02e5f682da5e4cc1ef518163905af6f0d3070153184f0891743f086d028aed443682b5ab824416ba SHA512 a42c3655726e8667cb1ea588db799b36fc95969ac41a3b61de61a0efcf9f59739eaa325d8d78431e77d31c5a168192cf34abccafb892aae887158603247606e2
+EBUILD ipsec-tools-0.8.2-r6.ebuild 7956 BLAKE2B 270b0b564f4f37b2a334ade4947eb26b14f202ba546b31f13a7f9f65743c363f995db4c730b23a37a511c39aca7d929be1e03a46efd1066305a299fc4215082c SHA512 11b47ba7dd381be70dbdee1a5a30c6151c078310e7ff2d7bfb07434a5deac3e3cc91c1690bc569fa4a21c11f4511c6812d2de9b26111107ce5e69684ed68a848
 MISC metadata.xml 632 BLAKE2B 705ccbcd150c7180f882207dd5e7a8b0765b58f8296be9bb299e982207d88031b770186b665ee936ca834b2b8601a78f7d2ade63b88d6aa09808b2fe3a89be87 SHA512 7636e9dd2ed9069933b2215829660c3d7c1b43d9c4ad3303cf8889618bd659f68a27994ae520ec7e327060337a196e8b720140e5b32fc6830158be0f0fff1eb8
diff --git a/net-vpn/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild b/net-vpn/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild
deleted file mode 100644
index 1355050b3636..000000000000
--- a/net-vpn/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic autotools linux-info pam systemd
-
-DESCRIPTION="A port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation"
-HOMEPAGE="http://ipsec-tools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~ia64 ~mips ppc ppc64 x86"
-IUSE="hybrid idea ipv6 kerberos ldap libressl nat pam rc5 readline selinux stats"
-
-CDEPEND="
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	pam? ( sys-libs/pam )
-	readline? ( sys-libs/readline:0= )
-	selinux? ( sys-libs/libselinux )"
-
-DEPEND="${CDEPEND}
-	>=sys-kernel/linux-headers-2.6.30"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-ipsec )
-"
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.8.0-r5" ; then
-		ewarn
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn
-		if ! has_version "net-vpn/strongswan" &&
-			! has_version "net-misc/openswan" &&
-			! has_version "net-vpn/libreswan"; then
-			ewarn "We found an earlier version of ${PN} installed."
-			ewarn "As of ${PN}-0.8.0-r5, the old configuration file,"
-			ewarn "ipsec.conf, has been changed to ipsec-tools.conf to avoid"
-			ewarn "a conflict with net-vpn/strongswan; bug #436144.  We will"
-			ewarn "rename this file for you with this upgrade.  However, if"
-			ewarn "you later downgrade, you'll have to rename the file to"
-			ewarn "its orignal manually or change /etc/conf.d/racoon to point"
-			ewarn "to the new file."
-
-			if [[ -f /etc/ipsec.conf && ! -f /etc/ipsec-tools.conf ]] ; then
-				mv /etc/ipsec.conf /etc/ipsec-tools.conf
-			else
-				ewarn
-				ewarn "Oops!  I can't move ipsec.conf to ipsec-tools.conf!"
-				ewarn "Either the former doesn't exist or the later does and"
-				ewarn "I won't clobber it.  Please fix this situation manually."
-			fi
-		else
-			ewarn "You had both an earlier version of ${PN} and"
-			ewarn "net-vpn/strongswan installed.  I can't tell whether"
-			ewarn "the configuration file, ipsec.conf, belongs to one"
-			ewarn "package or the other due to a file conflict; bug #436144."
-			ewarn "The current version of ${PN} uses ipsec-tools.conf"
-			ewarn "as its configuration file, as will future versions."
-			ewarn "Please fix this situation manually."
-		fi
-		ewarn
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	get_version
-
-	if linux_config_exists && kernel_is -ge 2 6 19; then
-		ewarn
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn
-		ewarn "Checking kernel configuration in /usr/src/linux or"
-		ewarn "or /proc/config.gz for compatibility with ${PN}."
-		ewarn "Here are the potential problems:"
-		ewarn
-
-		local nothing="1"
-
-		# Check options for all flavors of IPSec
-		local msg=""
-		for i in XFRM_USER NET_KEY; do
-			if ! linux_chkconfig_present ${i}; then
-				msg="${msg} ${i}"
-			fi
-		done
-		if [[ ! -z "$msg" ]]; then
-			nothing="0"
-			ewarn
-			ewarn "ALL IPSec may fail. CHECK:"
-			ewarn "${msg}"
-		fi
-
-		# Check unencrypted IPSec
-		if ! linux_chkconfig_present CRYPTO_NULL; then
-			nothing="0"
-			ewarn
-			ewarn "Unencrypted IPSec may fail. CHECK:"
-			ewarn " CRYPTO_NULL"
-		fi
-
-		# Check IPv4 IPSec
-		msg=""
-		for i in \
-			INET_IPCOMP INET_AH INET_ESP \
-			INET_XFRM_MODE_TRANSPORT \
-			INET_XFRM_MODE_TUNNEL \
-			INET_XFRM_MODE_BEET
-		do
-			if ! linux_chkconfig_present ${i}; then
-				msg="${msg} ${i}"
-			fi
-		done
-		if [[ ! -z "$msg" ]]; then
-			nothing="0"
-			ewarn
-			ewarn "IPv4 IPSec may fail. CHECK:"
-			ewarn "${msg}"
-		fi
-
-		# Check IPv6 IPSec
-		if use ipv6; then
-			msg=""
-			for i in INET6_IPCOMP INET6_AH INET6_ESP \
-				INET6_XFRM_MODE_TRANSPORT \
-				INET6_XFRM_MODE_TUNNEL \
-				INET6_XFRM_MODE_BEET
-			do
-				if ! linux_chkconfig_present ${i}; then
-					msg="${msg} ${i}"
-				fi
-			done
-			if [[ ! -z "$msg" ]]; then
-			nothing="0"
-				ewarn
-				ewarn "IPv6 IPSec may fail. CHECK:"
-				ewarn "${msg}"
-			fi
-		fi
-
-		# Check IPSec behind NAT
-		if use nat; then
-			if ! linux_chkconfig_present NETFILTER_XT_MATCH_POLICY; then
-				nothing="0"
-				ewarn
-				ewarn "IPSec behind NAT may fail.  CHECK:"
-				ewarn " NETFILTER_XT_MATCH_POLICY"
-			fi
-		fi
-
-		if [[ $nothing == "1" ]]; then
-			ewarn "NO PROBLEMS FOUND"
-		fi
-
-		ewarn
-		ewarn "WARNING: If your *configured* and *running* kernel"
-		ewarn "differ either now or in the future, then these checks"
-		ewarn "may lead to misleading results."
-		ewarn
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn
-	else
-		eerror
-		eerror "\033[1;31m**************************************************\033[00m"
-		eerror "Make sure that your *running* kernel is/will be >=2.6.19."
-		eerror "Building ${PN} now, assuming that you know what you're doing."
-		eerror "\033[1;31m**************************************************\033[00m"
-		eerror
-	fi
-}
-
-src_prepare() {
-	# fix for bug #124813
-	sed -i 's:-Werror::g' "${S}"/configure.ac || die
-	# fix for building with gcc-4.6
-	sed -i 's: -R: -Wl,-R:' "${S}"/configure.ac || die
-
-	eapply "${FILESDIR}/${PN}-def-psk.patch"
-	eapply "${FILESDIR}/${PN}-include-vendoridh.patch"
-	eapply "${FILESDIR}"/${PN}-0.8.0-sysctl.patch #425770
-	eapply "${FILESDIR}"/${PN}-CVE-2015-4047.patch
-	eapply "${FILESDIR}"/${PN}-add-openssl-1.1.x-support.patch
-	AT_M4DIR="${S}" eautoreconf
-
-	eapply_user
-}
-
-src_configure() {
-	#--with-{libiconv,libradius} lead to "Broken getaddrinfo()"
-	#--enable-samode-unspec is not supported in linux
-	local myconf
-	myconf="--with-kernel-headers=/usr/include \
-			--enable-adminport \
-			--enable-dependency-tracking \
-			--enable-dpd \
-			--enable-frag \
-			--without-libiconv \
-			--without-libradius \
-			--disable-samode-unspec \
-			$(use_enable idea) \
-			$(use_enable ipv6) \
-			$(use_enable kerberos gssapi) \
-			$(use_with ldap libldap) \
-			$(use_enable nat natt) \
-			$(use_with pam libpam) \
-			$(use_enable rc5) \
-			$(use_with readline) \
-			$(use_enable selinux security-context) \
-			$(use_enable stats)"
-
-	use nat && myconf="${myconf} --enable-natt-versions=yes"
-
-	# enable mode-cfg and xauth support
-	if use pam; then
-		myconf="${myconf} --enable-hybrid"
-	else
-		myconf="${myconf} $(use_enable hybrid)"
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	keepdir /var/lib/racoon
-	newconfd "${FILESDIR}"/racoon.conf.d-r2 racoon
-	newinitd "${FILESDIR}"/racoon.init.d-r3 racoon
-	systemd_dounit "${FILESDIR}/ipsec-tools.service"
-	systemd_dounit "${FILESDIR}/racoon.service"
-	use pam && newpamd "${FILESDIR}"/racoon.pam.d racoon
-
-	insinto /etc
-	doins "${FILESDIR}"/ipsec-tools.conf
-	insinto /etc/racoon
-	doins "${FILESDIR}"/racoon.conf
-	doins "${FILESDIR}"/psk.txt
-	chmod 400 "${D}"/etc/racoon/psk.txt
-
-	dodoc ChangeLog README NEWS
-	dodoc -r src/racoon/samples
-	dodoc -r src/racoon/doc
-	docinto samples
-	newdoc src/setkey/sample.cf ipsec-tools.conf
-}
-
-pkg_postinst() {
-	if use nat; then
-		elog
-		elog "You have enabled the nat traversal functionnality."
-		elog "Nat versions wich are enabled by default are 00,02,rfc"
-		elog "you can find those drafts in the CVS repository:"
-		elog "cvs -d anoncvs@anoncvs.netbsd.org:/cvsroot co ipsec-tools"
-		elog
-		elog "If you feel brave enough and you know what you are"
-		elog "doing, you can consider emerging this ebuild with"
-		elog "EXTRA_ECONF=\"--enable-natt-versions=08,07,06\""
-		elog
-	fi
-
-	if use ldap; then
-		elog
-		elog "You have enabled ldap support with {$PN}."
-		elog "The man page does NOT contain any information on it yet."
-		elog "Consider using a more recent version or CVS."
-		elog
-	fi
-
-	elog
-	elog "Please have a look in /usr/share/doc/${P} and visit"
-	elog "http://www.netbsd.org/Documentation/network/ipsec/"
-	elog "to find more information on how to configure this tool."
-	elog
-}
diff --git a/net-vpn/ipsec-tools/ipsec-tools-0.8.2-r6.ebuild b/net-vpn/ipsec-tools/ipsec-tools-0.8.2-r6.ebuild
index b570d3dc4b91..92c5ce61b3ac 100644
--- a/net-vpn/ipsec-tools/ipsec-tools-0.8.2-r6.ebuild
+++ b/net-vpn/ipsec-tools/ipsec-tools-0.8.2-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~ia64 ~mips ppc ppc64 x86"
 IUSE="hybrid idea ipv6 kerberos ldap libressl nat pam rc5 readline selinux stats"
 
 CDEPEND="
diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest
index 0612614ea800..e2cc28179521 100644
--- a/net-vpn/libreswan/Manifest
+++ b/net-vpn/libreswan/Manifest
@@ -1,4 +1,6 @@
 AUX libreswan-3.30-ip-path.patch 563 BLAKE2B 838ae401b4e7c04378e8cbb2561a6d348896883942683682c8ac3b31de56d360460bc2ea2c26f579a6f36078101270167b775579fd2502c72dd680620c12a585 SHA512 a8a391386014cff3b867fb8c0ba8c83ecb93c11d35aea205877b66e3104712311e19f13eb9659ee158833512c199d0104b5a796ebef37a1bc210e254abc6f573
+AUX libreswan-3.32-nss-compat.patch 680 BLAKE2B 5eb1f43e95d2f0801e0725ae1186e96ccf529200b0f1e4c8aa8d6d09248114f45a61468ad88a247a85c2f97b019ab0a022c6ce8a6ed263097c8d42c0008cfa43 SHA512 231b3985f333cc4a6f588b6854a217847136dd67305152dd14be96db8c0d7e043b885c47382276387e44939e26d046753d16853f3f0f17b43f966e3c3213c8e1
 DIST libreswan-3.32.tar.gz 4141631 BLAKE2B 37a4cb5c1f52d69b17ba60abd2b7a181d9f5567914a453ab875185110aeda4d33ecdaacfc83e361f153860a1db66faec70e0ad06af65e310af28ae72ce68fc6a SHA512 bb65512351059e2fac6f1c3ed1e291eabd6835faacf6d9c58649dd71dab1bb4fe6d6074178dea6dea01f24d39f3fbefd84c6060e4d8436b5d057fa55ae4467f3
+EBUILD libreswan-3.32-r1.ebuild 3165 BLAKE2B c0144e07373f076366d0baeb9c9c2472edc6c07f7fbb6ee37c7865ea37cdf4476e3f3119c51efeb1ac4ba54caad84a14727811387cf6eacd3be9724a5ede7b1d SHA512 1bd84beadae36e45f948b0c902e5ee4058c79a26a7d72b985bda62bfe3267e468f0c6ea970fe73f70e34332a286fe3c8da9f6e8b34b5f3c9d8eb742508b40344
 EBUILD libreswan-3.32.ebuild 3127 BLAKE2B dfd79e648967070d3a2ae7018873647a03d162bf904f4f70fa7d2baf9969d7912407a56869986f0c83675e65e5f27e5622ffccf4c6b1b3bcecb3200472976372 SHA512 5937f4ee0eba31fa8cbfcb477e19e5d2f74b1fafba9be035cdb64e88e80d5bc0acfd6dd995de54e449be6a8ff01a893ad64d578d4eb7b5e72f42f748fc829333
 MISC metadata.xml 319 BLAKE2B 6bae0756e29efeb1cf77d60f7e38fe62ffa5f24c3745e07900e6ef5f65194c50f6a479d97fdcc24804ccdcfefd9707b12f08dffe613fcf798afc421826de36e4 SHA512 924161f15c0f7a9666a6d7a422b45da679190e1a0f2859b997ddd753cbf49df9da337e5420040210736f76fa712dca3ec8862480f62bd321de71e74bee7c0865
diff --git a/net-vpn/libreswan/files/libreswan-3.32-nss-compat.patch b/net-vpn/libreswan/files/libreswan-3.32-nss-compat.patch
new file mode 100644
index 000000000000..09f71a9f907c
--- /dev/null
+++ b/net-vpn/libreswan/files/libreswan-3.32-nss-compat.patch
@@ -0,0 +1,23 @@
+Add compatibility setting for NSS
+
+https://github.com/libreswan/libreswan/commit/65a497959a0e1ca615341109eaad5e75723839d6
+
+We patch a different file because a later commit moved the setting to this file.
+
+diff --git a/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c b/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c
+index 93a027089a..571913cc1e 100644
+--- a/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c
++++ b/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c
+@@ -16,6 +16,12 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
++/*
++ * Special advise from Bob Relyea - needs to go before any nss include
++ *
++ */
++#define NSS_PKCS11_2_0_COMPAT 1
++
+ #include "lswlog.h"
+ #include "lswnss.h"
+ #include "prmem.h"
diff --git a/net-vpn/libreswan/libreswan-3.32-r1.ebuild b/net-vpn/libreswan/libreswan-3.32-r1.ebuild
new file mode 100644
index 000000000000..594a265b4671
--- /dev/null
+++ b/net-vpn/libreswan/libreswan-3.32-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs
+
+SRC_URI="https://download.libreswan.org/${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
+HOMEPAGE="https://libreswan.org/"
+
+LICENSE="GPL-2 BSD-4 RSA DES"
+SLOT="0"
+IUSE="caps curl dnssec ldap pam seccomp selinux systemd test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/gmp:0=
+	dev-libs/libevent:0=
+	dev-libs/nspr
+	>=dev-libs/nss-3.42
+	>=sys-kernel/linux-headers-4.19
+	caps? ( sys-libs/libcap-ng )
+	curl? ( net-misc/curl )
+	dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns )
+	ldap? ( net-nds/openldap )
+	pam? ( sys-libs/pam )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( sys-apps/systemd:0= )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto
+	dev-libs/nss
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	test? ( dev-python/setproctitle )
+"
+RDEPEND="${DEPEND}
+	dev-libs/nss[utils(+)]
+	sys-apps/iproute2
+	!net-vpn/strongswan
+	selinux? ( sec-policy/selinux-ipsec )
+"
+
+usetf() {
+	usex "$1" true false
+}
+
+PATCHES=( "${FILESDIR}/${PN}-3.30-ip-path.patch" "${FILESDIR}/${P}-nss-compat.patch" )
+
+src_prepare() {
+	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
+	sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
+	default
+}
+
+src_configure() {
+	tc-export AR CC
+	export INC_USRLOCAL=/usr
+	export INC_MANDIR=share/man
+	export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
+	export FINALDOCDIR=/usr/share/doc/${PF}/html
+	export INITSYSTEM=openrc
+	export INC_RCDIRS=
+	export INC_RCDEFAULT=/etc/init.d
+	export USERCOMPILE=
+	export USERLINK=
+	export USE_DNSSEC=$(usetf dnssec)
+	export USE_LABELED_IPSEC=$(usetf selinux)
+	export USE_LIBCAP_NG=$(usetf caps)
+	export USE_LIBCURL=$(usetf curl)
+	export USE_LINUX_AUDIT=$(usetf selinux)
+	export USE_LDAP=$(usetf ldap)
+	export USE_SECCOMP=$(usetf seccomp)
+	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
+	export SD_WATCHDOGSEC=$(usex systemd 200 0)
+	export USE_XAUTHPAM=$(usetf pam)
+	export DEBUG_CFLAGS=
+	export OPTIMIZE_CFLAGS=
+	export WERROR_CFLAGS=
+}
+
+src_compile() {
+	emake all
+	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" all
+}
+
+src_test() {
+	: # integration tests only that require set of kvms to be set up
+}
+
+src_install() {
+	default
+	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" DESTDIR="${D}" install
+
+	echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
+	fperms 0600 /etc/ipsec.secrets
+
+	dodoc -r docs
+
+	find "${D}" -type d -empty -delete || die
+}
+
+pkg_postinst() {
+	local IPSEC_CONFDIR=${ROOT}/etc/ipsec.d
+	if [[ ! -f ${IPSEC_CONFDIR}/cert8.db && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then
+		ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password"
+		certutil -N -d "${IPSEC_CONFDIR}" --empty-password
+		eend $?
+		einfo "To set a password: certutil -W -d sql:${IPSEC_CONFDIR}"
+	fi
+}
diff --git a/net-vpn/networkmanager-openvpn/Manifest b/net-vpn/networkmanager-openvpn/Manifest
index 3f9eefc3142f..9f570f077499 100644
--- a/net-vpn/networkmanager-openvpn/Manifest
+++ b/net-vpn/networkmanager-openvpn/Manifest
@@ -1,5 +1,5 @@
 DIST NetworkManager-openvpn-1.8.10.tar.xz 564540 BLAKE2B e117395b91efbd0ee10bdefe0aaff8a39fdd1fe232dc1543224be7dfd9bb18729ad873091301e6348f8955f28579e106f5565c7138309571e06598aa35dc5bba SHA512 f710848fccf21ac4554a2b46e80cf890c011edc6d64d9a49d6d8669f3ff71f7990e11e6f4681bb85d30238ec05f2fc79c4619983f6860c6ab0d714f941a3dfcc
 DIST NetworkManager-openvpn-1.8.12.tar.xz 597216 BLAKE2B 55ccb3139b1be9d1894d3651d60ce0f2167a24efbb24a9870eb4bb683a91603ae5f5149ed9aca8307cf608140c075a7b19bdfef68b1dbfe0729c117f084bb904 SHA512 1b8adf926426f866f7509a07c24203d6b584627aba4f8e2b1b00fa897bf0d7155009d566c3440565d1ee0e938694dd8d6746f37f62d493864d16eae007590b22
 EBUILD networkmanager-openvpn-1.8.10-r2.ebuild 1302 BLAKE2B 451a9e8e1e8a1de6a943927529fe439b36fd7048115db948b7fe90698c4730470dc6a73735106c0b7c4b90e892b2ee07a1b993c0397ac1b620062c585a2f7558 SHA512 6f8f1aea4ff54490b07a2d72777d6a5eec0e36de17014703ed0000a4d516966a7f8b4ad8635c988aa9a4b18ae6c8c844b79a85a9fa76d19e9ce89c04c75ed284
-EBUILD networkmanager-openvpn-1.8.12.ebuild 1304 BLAKE2B 6d11cfdcf647867da8682da56382151f51bc808bf2cf2de5a90a87c3601a18becd9382c8b1a675d34ee483f14849844be74512e7e4cf5b906fde2eacb46f56ab SHA512 0fbc2316d8ed07067c61ff0da0055fa567e846f360388a422356e7816ed000de09059b5fae2511a2b45411654e30eafb9dd662006dc309a88e7fe52742fab3cd
+EBUILD networkmanager-openvpn-1.8.12.ebuild 1303 BLAKE2B a1048fead3a30800d45aeefee9819780944c262ceafcf6ef12ea44c672efad4086dd3bd93ea28141ee966c8f7167390261d9fd46d7b70e649bf90e23b1d0819e SHA512 6f9ca67327f9965237a58d6ced3c7a1f7914953f4280ec1d950bf67eef313abc79ef61a0ec6e4cd173e7fe65e29a92ee73a37e84fd7a7398e152e50dbc2c0857
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.12.ebuild b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.12.ebuild
index 513bba285b9a..936a26c2ca5c 100644
--- a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.12.ebuild
+++ b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.12.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 IUSE="gtk test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-vpn/networkmanager-wireguard/Manifest b/net-vpn/networkmanager-wireguard/Manifest
index 7f3d1bd0818c..a49ae776fe52 100644
--- a/net-vpn/networkmanager-wireguard/Manifest
+++ b/net-vpn/networkmanager-wireguard/Manifest
@@ -1,5 +1,5 @@
 AUX networkmanager-wireguard-0_pre20191128-change-appdata-path.patch 945 BLAKE2B 2d235958175d6f62cb9032e88b0a7d8c1e3a0c859d6e233c687fa5aff65cd54b7d225008d150a4b1e6ab3115055d33b6cd07473aeb41e14aef6f1050a66d8fdf SHA512 8efa817767eb80752c862be1b4d1a1aa923d293f868dad880fd02a7af50cebbf1a6b3673a2f6598cb92cb0f38e50434414787b6b33644e3c90a6da13581e9d23
 DIST networkmanager-wireguard-0_pre20191128.tar.gz 238536 BLAKE2B e926c08c68df3e452a7ba25c66e7678969594002cb45a03ca26af32c86b021260c7836157fe9244c07223bf2e1c821ee64c3535c392f3636217c6ae67d8b800a SHA512 4ed9566a18be01b1be7d92da4663a292e17804a706045d58f08640e2fe81f9672880f20d1657b70eafc769b2688f72928c6fa601c0011bde91347902a222e670
-EBUILD networkmanager-wireguard-0_pre20191128-r5.ebuild 1173 BLAKE2B 66d8354573d0a40db3ddd77a0af637c633ab869f8443b273cfc9edef825c2af6ddfff5c8f7657ef43acfa443c4d4cc5d89f45f8f552f53d7eb84b5c68a6d1550 SHA512 3f60affe37bd1563b848e0365364ccfc356a3825a37c55b745647cb6e9355af743334124f2e93670f9797cdaada398047e9d19266cd8a34222eefde3c694344d
+EBUILD networkmanager-wireguard-0_pre20191128-r5.ebuild 1171 BLAKE2B fb7d3c9f5471f133a96b8d5fbbf9ce5ac6e3d52bec24a9da0531bfabe3134785f2015a8759ca369ac333cf52ad21460b655a1b6a3a1c0e915cc18306fa5764f0 SHA512 e4579c17da4360c384349e00c0e35cb25e4161b5909253ebb7f3c60eb56f47ae68a6bdc34821f78c70d925c6b9a08bc8acd2335efe8fe539a46f79a4acdf7224
 EBUILD networkmanager-wireguard-9999.ebuild 1019 BLAKE2B 46b228e851771f0673c01212f40b784840d5faf74982fae7c3983fdf9b3d2306aff39c149e363ca48fae6196de08c63bdd75a4517764a55dfd039cb46436a639 SHA512 89123d77464e1064d49bb0c142483c3cb8bd9067a54eb67469906fa238ee176b6880dc6ef938b6ca35df370b3bb95ba998f07bb92258c730ebc96ac34c74a9c8
 MISC metadata.xml 479 BLAKE2B 2d974d5fe2bfd35934e2638959ea93f54e0bb0c574dc0da398a9521573de047ab091728cbc6583530cdc737bd1c00af16eb282b78aae39ae8d21c37a0ad3aabe SHA512 6f8889fee4242fb2ee7e11b9ff5b1c1e012b434d19ae909c719a12dd63ff30830adc71632fb31517ea24872f3450f54381e787b399391744f8a89dfd4de0e3c6
diff --git a/net-vpn/networkmanager-wireguard/networkmanager-wireguard-0_pre20191128-r5.ebuild b/net-vpn/networkmanager-wireguard/networkmanager-wireguard-0_pre20191128-r5.ebuild
index 9b37b3a8b4cf..4d9e66dee6b3 100644
--- a/net-vpn/networkmanager-wireguard/networkmanager-wireguard-0_pre20191128-r5.ebuild
+++ b/net-vpn/networkmanager-wireguard/networkmanager-wireguard-0_pre20191128-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/max-moser/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz ->
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+gtk +nls"
 
 RDEPEND="
diff --git a/net-vpn/wireguard-modules/Manifest b/net-vpn/wireguard-modules/Manifest
index f963113e231d..fc6fcfab7c52 100644
--- a/net-vpn/wireguard-modules/Manifest
+++ b/net-vpn/wireguard-modules/Manifest
@@ -1,4 +1,4 @@
-DIST wireguard-linux-compat-1.0.20200611.tar.xz 262892 BLAKE2B bf8441b3428a6d330fb7976695a4c70c3784550854b81cfb6e784dcd9fa1d32351652cab46d0b4dab51a5dbf9ec989cfb41a58b8632ae06571b6d57dcdb0e667 SHA512 b650115d64a4bd665fdc27918d3b8ee72578a2b9542eabbc9a9d99df87c6f4d26aa395b5ec6569becadcdf291662934061fec962a7949bb99679fe7b37e9fadc
-EBUILD wireguard-modules-1.0.20200611.ebuild 3442 BLAKE2B 81c97ff68c71ce60d343266035852d2128246a3aa1c4ca95d0847904c021c5e4a7bb652d8c531e50be1dcc430fa34e54682462595101fded003af71e97e037e6 SHA512 1979d83d24156acf594edfc23c76e8e30e9a21ef9cd3fd45a06462ba20a30a9c90618852a611793af53424a52e0486a93d9198e18f89b7c57f9e8e06b434c9d5
+DIST wireguard-linux-compat-1.0.20200623.tar.xz 263156 BLAKE2B 2a45dea6d3a02f91f45ab4fcbbf5da4b24532afc3f775b2731e0360e949d8c689b4fd9e7351c337158bfcd33b09f6e94715b07532a3ebe9eaf40a3e4fff7142f SHA512 447a88d849cf81d83412adbe5aabf5ad44f878b7f64de56672d39b656a9c8053059ea71e5a965c55bacd33651bef2d9d677caf0586b0c7ee7807c69098e1942d
+EBUILD wireguard-modules-1.0.20200623.ebuild 3442 BLAKE2B 81c97ff68c71ce60d343266035852d2128246a3aa1c4ca95d0847904c021c5e4a7bb652d8c531e50be1dcc430fa34e54682462595101fded003af71e97e037e6 SHA512 1979d83d24156acf594edfc23c76e8e30e9a21ef9cd3fd45a06462ba20a30a9c90618852a611793af53424a52e0486a93d9198e18f89b7c57f9e8e06b434c9d5
 EBUILD wireguard-modules-9999.ebuild 3442 BLAKE2B 81c97ff68c71ce60d343266035852d2128246a3aa1c4ca95d0847904c021c5e4a7bb652d8c531e50be1dcc430fa34e54682462595101fded003af71e97e037e6 SHA512 1979d83d24156acf594edfc23c76e8e30e9a21ef9cd3fd45a06462ba20a30a9c90618852a611793af53424a52e0486a93d9198e18f89b7c57f9e8e06b434c9d5
 MISC metadata.xml 661 BLAKE2B bb9a48b3a4f3162f8ccec522734cbc8ffdc7a92868cc7dc32adc1f7ef89f7b2eab1df573bed421d4b76204f9f38ad4fee45f9db4b41c7dc3b86d9d9bb3120a8f SHA512 e9daa3bb8fa72cc60373a3187610231cf396bc5014f33412b65d069ffd02caa659c426819aa76d46a0dd15e8cb579325b46df5296a3b2136d020ec378e5f98a5
diff --git a/net-vpn/wireguard-modules/wireguard-modules-1.0.20200611.ebuild b/net-vpn/wireguard-modules/wireguard-modules-1.0.20200623.ebuild
index 16df945c1ab1..16df945c1ab1 100644
--- a/net-vpn/wireguard-modules/wireguard-modules-1.0.20200611.ebuild
+++ b/net-vpn/wireguard-modules/wireguard-modules-1.0.20200623.ebuild
diff --git a/net-vpn/wireguard-tools/Manifest b/net-vpn/wireguard-tools/Manifest
index 43508c67d957..e7ae98cc4150 100644
--- a/net-vpn/wireguard-tools/Manifest
+++ b/net-vpn/wireguard-tools/Manifest
@@ -1,5 +1,5 @@
 DIST wireguard-tools-1.0.20200319.tar.xz 92324 BLAKE2B 9f514748708ef6a5b7f5b043c9054c954d17bb77de7a354b5a9a4e63cfb5f441237e98b16b288426441a7e709e1874d396cf67b04b38bb0ebbe7822bb32ada57 SHA512 d5bcd153f9b10f184b9a1bf9a81f33a9713ab4863ab5aa190eac60e92919756c8fecbb0d3cfb83bae20ac78fc43fdd7168f37294cdd7c5ee21f2a1b2db5fdf41
 DIST wireguard-tools-1.0.20200513.tar.xz 94500 BLAKE2B 34a39533018416df382d180da76d6494feec1d40208c9df427c1979817dbe138c217fe4c4f4cf5cecd3c4053e6f73f1863d1e0a9ed2cad41899dda5387c15844 SHA512 4d27b262350b6b47843a323c2e7ab8d2bdd48065c265778abdec85b3f6fc92aa9af77d76e368df9cc8e435eae1c0ce50fed52e1d78db54358c1884d34be08d2c
-EBUILD wireguard-tools-1.0.20200319.ebuild 3231 BLAKE2B 09c77ccd2a56b735d48595f5363d086de834c0eb0d25437c24df9a7615c6ebebe593d44686d0397ac6b77fbe34685130a40dd0e31a07495bb3c2ac13b792d1ad SHA512 11ea317a713b3018cc3c7b54d37fa680a205dc98949505834e268e57637e054ad609f1cd300ad69c1969843e88e42fd157d4fbacf923c80e98cd51c4bada1dbd
-EBUILD wireguard-tools-1.0.20200513.ebuild 3234 BLAKE2B 0dcfc0ad5c8f7e893fc8fa7989da618b31025f2e7c28defd22278bf3f0228eb87014e8b32d6787ac257b94bb6ffdb2b2c34dadd06b0375d948a28685bb7698cd SHA512 f2a43c9a53144ef7a8fa7fb62a7fff5126f9422df3b946c54ec36c3637e846533df92e62dd2062ef2e405c44ee6440af5825f929d99779913bb55face199c383
+EBUILD wireguard-tools-1.0.20200319.ebuild 3272 BLAKE2B 800f2ec75e42ac5adb2ef8ffd0403ebd448e19f27609e6d9883d252743e838bd3a017ef86561d4aa8c82e0e67ec7f3b5d3c543ca100f495935bdb6d45faebe25 SHA512 714e11822d0854acb7eb86db716266cd53ff0ae8eb713c962b2aacaaa35b72dcca5ed03562c1a858e6cb204ae85ab25a9097f0db1516fb2ba62d33f1186f35a5
+EBUILD wireguard-tools-1.0.20200513.ebuild 3272 BLAKE2B 800f2ec75e42ac5adb2ef8ffd0403ebd448e19f27609e6d9883d252743e838bd3a017ef86561d4aa8c82e0e67ec7f3b5d3c543ca100f495935bdb6d45faebe25 SHA512 714e11822d0854acb7eb86db716266cd53ff0ae8eb713c962b2aacaaa35b72dcca5ed03562c1a858e6cb204ae85ab25a9097f0db1516fb2ba62d33f1186f35a5
 MISC metadata.xml 362 BLAKE2B b6c8384cc5434b65a80b2326df412ca38a96bfd137feb34cea5124eebe13d383851b3ceea17cfc0b937555a0760608e0f3d0a7834da15271e65f669bfbfb8d2a SHA512 bf494cd4c95dbbbf783fc847cdf03f9a83b2673bf3a0a78fa12480abd1e2657f255019cf4f68db5143b11c5c63d6c16e9e18480800115751be9bc3cae910c8ea
diff --git a/net-vpn/wireguard-tools/wireguard-tools-1.0.20200319.ebuild b/net-vpn/wireguard-tools/wireguard-tools-1.0.20200319.ebuild
index e42a4178572d..07fee8d91012 100644
--- a/net-vpn/wireguard-tools/wireguard-tools-1.0.20200319.ebuild
+++ b/net-vpn/wireguard-tools/wireguard-tools-1.0.20200319.ebuild
@@ -11,7 +11,6 @@ HOMEPAGE="https://www.wireguard.com/"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.zx2c4.com/wireguard-tools"
-	KEYWORDS="sparc"
 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 sparc x86"
@@ -55,6 +54,7 @@ pkg_setup() {
 		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 NETFILTER_XT_MATCH_ADDRTYPE
 		wg_quick_optional_config_nob IP6_NF_RAW
 		wg_quick_optional_config_nob IP_NF_RAW
 		wg_quick_optional_config_nob IP6_NF_FILTER
diff --git a/net-vpn/wireguard-tools/wireguard-tools-1.0.20200513.ebuild b/net-vpn/wireguard-tools/wireguard-tools-1.0.20200513.ebuild
index ab890be7d847..07fee8d91012 100644
--- a/net-vpn/wireguard-tools/wireguard-tools-1.0.20200513.ebuild
+++ b/net-vpn/wireguard-tools/wireguard-tools-1.0.20200513.ebuild
@@ -11,10 +11,9 @@ 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 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"
@@ -55,6 +54,7 @@ pkg_setup() {
 		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 NETFILTER_XT_MATCH_ADDRTYPE
 		wg_quick_optional_config_nob IP6_NF_RAW
 		wg_quick_optional_config_nob IP_NF_RAW
 		wg_quick_optional_config_nob IP6_NF_FILTER
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index ca4947608ec1..5eac1fcd9e29 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index 1ca0da95bfbc..b98404d1cd3e 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -2,6 +2,6 @@ AUX 01-org.blueman.rules 432 BLAKE2B c81ec47bc68be911b44056e4f0f4dd4e2939d8d5db7
 DIST blueman-2.1.2.tar.xz 950296 BLAKE2B dec19174813a76d5abb941b7a93257428175961c4f05709e5c1ba304302b4163a61cde2ae5938f40053ea43298ee8ac483cd0439c80ce76bae41a95b3dc8d5ac SHA512 44d397d3a9d154d05b5231e18e624bf1ca33c690be5eeb448620ba4882110306925b78dbbbd815384ee3faeff147d2b042c01be28fb1b43568924c9657484527
 DIST blueman-2.1.3.tar.xz 950772 BLAKE2B bec7c8da59b94e8f30ff5f41e057ae5662928a4469b46d0ad2b33521a9b3a5de94056f6f35440d90e05116b1dd83dcd2437f1c00fb6b9532c14ab0698716c57a SHA512 376007c6e857f0e10a4d5e4bc2a50f6d170d393389d3aa5d02728646bf27e2fe5c08fb835bb5432a980d2b6c70c348a0274015552be6229c15a89c34c0d105f2
 EBUILD blueman-2.1.2.ebuild 2921 BLAKE2B d9f52b190c85a0257ac904d111c0c95b0d07f40fbbd1e0fd427fd761dbf5f3d698148af604a30df6e0913ae39eed0bce68ce59fb7c5dd9fd020bcf4e3da70953 SHA512 c5ef1d1ce0b26a19704f85d42250d00f3f82244c77b2a35569f48cb6db016f4b547b2145e30555323c061b6729aff65cc3bc11f9a82bf6ad5a22d41c5759274c
-EBUILD blueman-2.1.3.ebuild 2921 BLAKE2B d9f52b190c85a0257ac904d111c0c95b0d07f40fbbd1e0fd427fd761dbf5f3d698148af604a30df6e0913ae39eed0bce68ce59fb7c5dd9fd020bcf4e3da70953 SHA512 c5ef1d1ce0b26a19704f85d42250d00f3f82244c77b2a35569f48cb6db016f4b547b2145e30555323c061b6729aff65cc3bc11f9a82bf6ad5a22d41c5759274c
+EBUILD blueman-2.1.3.ebuild 2944 BLAKE2B 16df020fc15b9563b6762510a59919f89dddbb57875dd30c5df0822f635d7b6306b332e37bcc678f4fc123110974b4b5ecde3bad9d63d0161c1bbda590735247 SHA512 704b8994d9249974e6c80cb169fc97d8f8be913f9ebda4a156fbcdcc67a59e2c0de4787f9f3e9fda6f10feeedc664f197e44a5b5b93823a1625fd8a8bbafdc9b
 EBUILD blueman-9999.ebuild 2921 BLAKE2B d9f52b190c85a0257ac904d111c0c95b0d07f40fbbd1e0fd427fd761dbf5f3d698148af604a30df6e0913ae39eed0bce68ce59fb7c5dd9fd020bcf4e3da70953 SHA512 c5ef1d1ce0b26a19704f85d42250d00f3f82244c77b2a35569f48cb6db016f4b547b2145e30555323c061b6729aff65cc3bc11f9a82bf6ad5a22d41c5759274c
 MISC metadata.xml 498 BLAKE2B 09bb34c58c2be38b24d8fa0512f2dc2c0456b220d70d7a26a1df335dfa4320f5d4048294f4d0da96756f0456d4f1fd66f5d9d17f0f2856f0f23a02198d9a9956 SHA512 841624c8939029603a24fc35db8d1b4d0559eb499c37cd1601b55f6c28f192a736b1199f33710b0028013b5fcf83310456dd42e3ded7896592f54d72cc04dba5
diff --git a/net-wireless/blueman/blueman-2.1.3.ebuild b/net-wireless/blueman/blueman-2.1.3.ebuild
index 8144b23c4cc1..28a0cb5e101c 100644
--- a/net-wireless/blueman/blueman-2.1.3.ebuild
+++ b/net-wireless/blueman/blueman-2.1.3.ebuild
@@ -12,11 +12,11 @@ HOMEPAGE="https://github.com/blueman-project/blueman"
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
-	KEYWORDS=""
+	KEYWORDS="~arm ~arm64"
 else
 	SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV/_/.}/${P/_/.}.tar.xz"
 	S=${WORKDIR}/${P/_/.}
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 # icons are GPL-2
diff --git a/net-wireless/inspectrum/Manifest b/net-wireless/inspectrum/Manifest
index 1479be19423a..cc405aa14643 100644
--- a/net-wireless/inspectrum/Manifest
+++ b/net-wireless/inspectrum/Manifest
@@ -1,4 +1,5 @@
+AUX inspectrum-0.2.2-qt-5.15.patch 526 BLAKE2B 5262b6d57ca5161ba185d051ca7d2c757ac4427954ef5ee7d03998607a74d604c5e1ae5977c95858310ce70e55e003bc27e1d4383d29666ecb03971effad4391 SHA512 012c4fa5e7fdf0bb995d71c761137733f693ccafa557577fc6599cc88efa381246f81febd342b94c60c3441ed07fea3a84cf425734c6ae56aaa3461eeb03f19c
 DIST inspectrum-0.2.2.tar.gz 109165 BLAKE2B 62926305bfa03bb3a404ed2a9098b9afd93f0de7f35846cfcf66b42ec6a81532003976bcc9a6916217044ad80fce8df689d200aa5861778f0e3f00d67373cbb6 SHA512 37ad48f87889731b7aa83a6cfa401c9986d2657f5f06f8dbdf02213123ff4d0d7cb23aa21e9b4062b7ab746d32c937dd56e85bd5c8d0bbf2181a54929e3fc501
-EBUILD inspectrum-0.2.2.ebuild 701 BLAKE2B 08445e6eada91acc1728a4ac137875b32ca78ae359310ba8c9d375b991ffe23dabc3791c1cc41354110302143dc4bc4d018b3acab67815d6a7b1445ef768f01a SHA512 e6da862809dd1ffcef94a8e6951e776c0c09542f9d3fca873c33902997919ad259065e274e264a089c66f645aa5a09bf8202e617931adf1e97a79a44ba6626e3
-EBUILD inspectrum-9999.ebuild 701 BLAKE2B 867db11a0499c8c67ff1b7f94fa66209b1957e1c6381982c6e5d81e3cd4c74656252ecd71923b777571901aa6d6a308f15b590559611b77cf30da7408a4df7aa SHA512 0e448bfb2a47728a9ea6de25ef792aa03bc953f3d9d19078533898ee63c36129fbcf87f20a82762449c699301372ea335e9ccc134d1d7b5d5f22af6c18ed9413
+EBUILD inspectrum-0.2.2.ebuild 736 BLAKE2B 3e21127f7564fec3828b2c66da6812705c940d4b4e3ed3751aae4c518bea9853769347613c1640b1807809f0c7769b508f0869612c59f1734a6fa70d9b1300ec SHA512 81a875d319d25ad26220d53880d669bdf9d1e6e3e1f3ccdf8249c3fe96a46e79acdbd047cbee95cede029ede8ad1d85690f91eeb51ae5367bbb86cd2dc8aa493
+EBUILD inspectrum-9999.ebuild 690 BLAKE2B 3ec85ef5ced6fafb7fcb667584d3289b7b532c8213182872a9e9d89e041b1f0ffa272c4e4b2272a1b220bdade1970c1db9fa8afd74f7fdaab6c5b366167e15dd SHA512 695d6ed182377da010e113e52e26a43c0a9d00e913f980ee10924a4241e3d677df3b2b5931c932f3d5466596ef8cd41a2b17daf15e6472106fcbf74f5d5f6296
 MISC metadata.xml 426 BLAKE2B a117a458ba8b91db0841ba470ee987daf8c5b55c1f87064d203b58feb9e0650b6c33f37f4259a2f5ad051c9ade4d67c7b37077f9772c3c84c942e00789ce655e SHA512 a1da383e40f0fccae9fbb2b8b29051619104e4276b8d4027c9584de14625b3612d6bdf1343f1261e5d6df8b13789f1d4f95e62b76d1ef1eda84b66c82464520e
diff --git a/net-wireless/inspectrum/files/inspectrum-0.2.2-qt-5.15.patch b/net-wireless/inspectrum/files/inspectrum-0.2.2-qt-5.15.patch
new file mode 100644
index 000000000000..3e55e814ecbe
--- /dev/null
+++ b/net-wireless/inspectrum/files/inspectrum-0.2.2-qt-5.15.patch
@@ -0,0 +1,21 @@
+From 1f2b4587ec2c6d1a1945eee8bbf361dbdf3dc8af Mon Sep 17 00:00:00 2001
+From: Martin Hauke <mardnh@gmx.de>
+Date: Sun, 7 Jun 2020 21:56:38 +0200
+Subject: [PATCH] Fix build with Qt 5.15+
+
+---
+ traceplot.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/traceplot.cpp b/traceplot.cpp
+index 3704d24..04bdba8 100644
+--- a/traceplot.cpp
++++ b/traceplot.cpp
+@@ -20,6 +20,7 @@
+ #include <QPixmapCache>
+ #include <QTextStream>
+ #include <QtConcurrent>
++#include <QPainterPath>
+ #include "samplesource.h"
+ #include "traceplot.h"
+ 
diff --git a/net-wireless/inspectrum/inspectrum-0.2.2.ebuild b/net-wireless/inspectrum/inspectrum-0.2.2.ebuild
index 55640eba8fb0..13dd958f53de 100644
--- a/net-wireless/inspectrum/inspectrum-0.2.2.ebuild
+++ b/net-wireless/inspectrum/inspectrum-0.2.2.ebuild
@@ -1,16 +1,16 @@
-# 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 cmake-utils
+inherit cmake
 
-DESCRIPTION="a tool for analysing captured signals from software-defined radio receivers"
+DESCRIPTION="Tool for analysing captured signals from software-defined radio receivers"
 HOMEPAGE="https://github.com/miek/inspectrum"
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
+
+if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/miek/inspectrum.git"
-	KEYWORDS=""
+	inherit git-r3
 else
 	SRC_URI="https://github.com/miek/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
@@ -20,11 +20,15 @@ LICENSE="GPL-3+"
 SLOT="0"
 IUSE=""
 
-RDEPEND="sci-libs/fftw:3.0=
-	dev-qt/qtwidgets:5
-	dev-qt/qtgui:5
+RDEPEND="
 	dev-qt/qtcore:5
-	net-libs/liquid-dsp"
-DEPEND="virtual/pkgconfig
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	net-libs/liquid-dsp
+	sci-libs/fftw:3.0="
+DEPEND="${RDEPEND}
 	dev-qt/qtconcurrent:5
-	${RDEPEND}"
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" )
diff --git a/net-wireless/inspectrum/inspectrum-9999.ebuild b/net-wireless/inspectrum/inspectrum-9999.ebuild
index a9a777d77d39..fef5f60bfd84 100644
--- a/net-wireless/inspectrum/inspectrum-9999.ebuild
+++ b/net-wireless/inspectrum/inspectrum-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
-DESCRIPTION="a tool for analysing captured signals from software-defined radio receivers"
+DESCRIPTION="Tool for analysing captured signals from software-defined radio receivers"
 HOMEPAGE="https://github.com/miek/inspectrum"
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
+
+if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/miek/inspectrum.git"
-	KEYWORDS=""
+	inherit git-r3
 else
 	SRC_URI="https://github.com/miek/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
@@ -20,11 +20,13 @@ LICENSE="GPL-3+"
 SLOT="0"
 IUSE=""
 
-RDEPEND="sci-libs/fftw:3.0=
-	dev-qt/qtwidgets:5
-	dev-qt/qtgui:5
+RDEPEND="
 	dev-qt/qtcore:5
-	net-libs/liquid-dsp"
-DEPEND="virtual/pkgconfig
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	net-libs/liquid-dsp
+	sci-libs/fftw:3.0="
+DEPEND="${RDEPEND}
 	dev-qt/qtconcurrent:5
-	${RDEPEND}"
+"
+BDEPEND="virtual/pkgconfig"
diff --git a/net-wireless/iw/Manifest b/net-wireless/iw/Manifest
index 5fd4138f06fb..95f807c53be2 100644
--- a/net-wireless/iw/Manifest
+++ b/net-wireless/iw/Manifest
@@ -7,5 +7,5 @@ EBUILD iw-4.14.ebuild 773 BLAKE2B bc6ccd6f4031a419034c982a7babef83244c7617960c59
 EBUILD iw-4.9.ebuild 766 BLAKE2B d2fb6d98fbf8e8588e6428db5656bfffc24e09b815d886b115d2f8c4bf8d342b66bf999908982645a7456705c729019078d2ae89f27ad3e7b0e5f859fe2b0844 SHA512 003c59621058a9324bc05d60a5f51a529a687c30f5543449750ae2195a999ea44b5e11bdfbbac48c575901803ce48eba66a2b9ee6abd1ba2289cb7de9c2b4704
 EBUILD iw-5.0.1.ebuild 870 BLAKE2B 3398efc126a7054cebace66edde21a96ffe78cd1577933945f3fefff647a7848c8595479ac342cec1c6c94d801c6d54347836a3d28f68b1cc94ceb2c4c00c9d0 SHA512 0b895d24be82a4419689fb7b9b5a66cb750951f636ce8e0b61d35e4cdc5497e6405d81c1b8337a7252b8fc71f54576e3196b43db0d117b5d516fa8c8f0a8aeef
 EBUILD iw-5.3.ebuild 874 BLAKE2B df56dff1b5f1354a7dea6e6ad815fbd49ab1a643e698cb5bbbab69193542c6cc8b4bb5a0b76fc0297ee4e006401e658abc49b8a7e32d38f0d08a07b3cee16a5f SHA512 5a50df1c663df3ae473fae4a5bc89aae09fed71c5b1074704f544d5fbd1fc522d7dfcdc93e435e105eaada5df7c39a5059476754d76b5c6cdd53b29213fd615e
-EBUILD iw-5.4.ebuild 872 BLAKE2B 252038df9ce0234970393929c724ebda91b62b23c9e1e3f16b2f38e2cc34b59140e8268d9af1bc1f9730f0481983cd0f24ac975c43297e426479989b71320338 SHA512 e4f9e5d9ab9f5954b66f7892bcd51d59b16a314a5bd24fb3ff98973b1345ae195441bf59eabcf695a43603e8750aff908135647715d116424dbc10faaebbb8e0
+EBUILD iw-5.4.ebuild 869 BLAKE2B 0b547753550a9443c2650c778c78624907c9fa9968dd4d0542fc015d61499e3a11589174b4b43c743de871da006e03659fe1f895fe8f8e81a0f429dcf37a5c37 SHA512 d458e8723092f24479b956cbe6413f265d6c5aba23202f88ee4fbb3b671aed714992801342b78c7a75abd7a094c07d74e0f81246bbc33eca238cd2423240705c
 MISC metadata.xml 325 BLAKE2B 4081db738ce07e18a087d3517e082f3aca70e17aa3e7fe371795cac7fead6fcd6a8226817fc0d995a8be9e43cb56617c345b64abbaf806ced7a96246538db9a5 SHA512 4d4ca6e03b9d43532e35b043873f134e47176b9e22b9c61e19a129726e2685218beecf31148ec5d3eba6cd02a0f818c1e2032e5bda247a1e51bafcbd7b951cea
diff --git a/net-wireless/iw/iw-5.4.ebuild b/net-wireless/iw/iw-5.4.ebuild
index 10c23bf542d6..ad63db87ee84 100644
--- a/net-wireless/iw/iw-5.4.ebuild
+++ b/net-wireless/iw/iw-5.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-libs/libnl:="
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index a05effba938a..f69a57429162 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -2,16 +2,14 @@ AUX mongod-wrapper 305 BLAKE2B 3bd1bfe831541e0e2c49b3875b23578e3b36307947ee7f080
 AUX unifi.confd 222 BLAKE2B 3b566a4667b4138f5ad8da53099342708949becfaaa2e5bdb85779f2b39675c0e234f21d57ea0a9ee1c13b41003682823fc5b2ad5132b57ddb4730fdeccb3691 SHA512 20e67959a0f22c7ef1aebcae5248ce76b9049b24e531e560ed0b9eb6b86b7ae10c57ce41517c9276fa11cb05ddc27e8a69b80350d0b8c5590fbe23152f676cc6
 AUX unifi.initd-r1 648 BLAKE2B 583d5ad1922c6eb83ba3b1388f6240107b4b0e1a479ebc463c94742f8f76d5c96adc84358e93a3b014fb2fcfc9c227af8c6f57dbfe993e6d7bbf1248ea763fc1 SHA512 d09e1b10bcc94d8459bc842bc6b94e06f8a7876bc3fe45b704e914c46bb66fc5ef03c78d51507f176450a0fbb199a5a2492a7c01cd27edf68de748f43ea1a3d4
 AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9e95934a6d60d6b700cfdc302e489cafe74d128735b0188bfa4422f30295b267d104a455fe4f1aa SHA512 6dc1dd188515c30ad105d839a2112a75f925f3453cc5eb29b727adb2dbf8bdf53be62eab94b01dfdb483f135fef092c7b6235afd63c61a996efe2d87d4fa6995
-DIST unifi-5.12.72.zip 117402382 BLAKE2B a847982972aecfc344b3054ac8364270f8de38452e818a9a575266550292fbc9fe5554937191cdfb208002a412e3fd7956a85ae9edc12fed65461a95ee801915 SHA512 a3764d4a3b39a16bc08c3206a8ceb37614d9bbd356e2e56f18eb33cc42de5c9cf21ed2a99689d0e5b794356163a0159911916513eed154b6c8ad0aee9db0e01b
 DIST unifi-5.13.29.zip 151004470 BLAKE2B 0980c012bddbbeb5d18d26ebc8427137e410577e22a9c49b799f0e8fa39343191bc361b9345919917e53ded5ff0af2b35fd71e48072a09d5533a5e89feb9a20c SHA512 01b9811e288e377aff727416b32d966af5cc7a45e0f03f08f8892c89ad40a1833f4150bc42d8732468fcd2242c790bcd62b343132149a868c0d95f38b9f17dda
 DIST unifi-5.13.32.zip 151006051 BLAKE2B d853a05c361b26a47f2b3e296a41d3086a05347f6384ff71b4e78d156d5a0a5309eb5bb0b05de31721a8dd21f917d0c5b87697a337ec096a1701640796defbb8 SHA512 f1258d4f8fa73f43385260245ca31ee5d159c99db005609a22b09cbe551a886ebf685069bf95be5a0609335fe9d7290bc04158eb2430bdaa238aa7a13da681ab
-DIST unifi-5.14.7.zip 151237089 BLAKE2B 0c00e282d5f2a3ca9077bd4455d21b28d63548be50ff3170cfde84620a9f482bf84f48047162cc9ecca247046ed49f6a3e0e77eedc5d472cc277cf85639d966e SHA512 802b9338b333892e5f84a583f93eca29d9e421a5ab301f2f5e9bff9f61a5e8a0489dfb5a67320ccfcc923c9adac259ee4d7fe6153bc95aa18b613aeed02e6b45
+DIST unifi-5.14.15.zip 152267634 BLAKE2B 7c691294d0f359153aab5f0c1df9eb06f15d6d9d7b5b98e460163222a41d4e46b9cbca0d58c0a754242abc57c4f5e6c9d2ed7d7a08b7a587e8424a0d0467f17b SHA512 6807298856a0c14ae2bd6009c167ed73bdaefe91c8c47e227e985b797263a76b2bcc7bbc040237e70ee0f6633060718fd23066bc622232aee14bf0a4f6938535
 DIST unifi-5.14.9.zip 151232553 BLAKE2B f30576c61f9fe0f971dee302a7475bc60f02889e300ebf8345b47a341e7da3b872558880c8d207f3f2f0f29c22ed84bb7502e9ff82ca0bee815b1adc39eceb71 SHA512 deeb936957129cb213af6ac82790ed338581f29d16fe902e15f478c538c22d65111c1ef8de14c392b8af3303b74ccc26f50452391f1e3f7f919dd52153e5ae83
 DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989
-EBUILD unifi-5.12.72.ebuild 1778 BLAKE2B 78a37adbf6d5b509ff4ebedb4526cc31633df6e7f60265bb50553d2c9d0873354fd1ab728d87d9e11929b78b89ffc36605c7b45d654bad3c771350d97a81208b SHA512 6394293932ab616e67e7b2d2c30c8ce850c3c58196259969662332dc2782958ffecc17633691a28b6cf7bbaad56c72128c37945ab88971ffbd46d2964fd874a6
-EBUILD unifi-5.13.29.ebuild 1567 BLAKE2B 9682b5e2feb2d2253e2fef2a9a5318a41f8a5c22977a99d78fed377cbce5d56450dd4ce35af253850a9bb1f8e5a5ccb41a086e2d9541de81f6488399b0f26fe1 SHA512 fb1c32edfcafdb212d4ca7a5f1d34fb71b266e51965b2abe1db54095617c9a29794ae0eda15451f68b1fd771314edfde80325da762d01514644185d5f88166f2
+EBUILD unifi-5.13.29.ebuild 1566 BLAKE2B f3518c77f5344023a9f219e5e01b501b0d1855879c06c90b7b89798059100e844325fe1cf42c09117049056d49df19723613977eb3f73da4a5845e403a5303c8 SHA512 b3d01a742500089913ceba14990b18cea9470be9413b753ae3ab17e4adbaf49a5575f4ffdbcbb97c7b369be3aff400a3b3cdcdf711d944dc3865f3844347cadb
 EBUILD unifi-5.13.32.ebuild 1567 BLAKE2B cbfbf056c1f98854bc1732b2b4c3204cc1f9b63f9a3fece1bf629047d87164d9b4487f39825e90f41a6cc4251985bc1e263ab1efeb297034d4316107e93043b2 SHA512 9e251af9c81088256c6bdd06a6c557f9a7cc10c4e6e48aa94e0a76173cd2dedca26886d3b52bc7d39b6a9faad30ebf5306d178803cdc8ba95bc2bdec8b4974d9
-EBUILD unifi-5.14.7.ebuild 1567 BLAKE2B cb42c2b1513a34863de66848d9e3a5ca3867f5f5442d99675f099e827c6d1004871f6bee2d1087f56ba3b1500e3a24519b336b2fa2e60a8183fb2e4e91a2819f SHA512 93c5db9d46e7a9a10f7b13745cb65378cd1be81b3ef2298ea86c62da10870c2eb8fa5ab6effdbc23b3bb485ac306e0ca934eeb0aeb1ca7a0a30574efeaa66707
+EBUILD unifi-5.14.15.ebuild 1567 BLAKE2B 16561466e5bd3e390af407661b31ffa3feb81a0b5e84092cabd52300e7e5e7fc8981104730588e51f2b2a1de0049e8b1b1b2a9de35b3a95276d334f03156cc6c SHA512 5ff099c41cef65d88a259540e867b368db07f9e118bbad259d0e75aeea195dd2d53a7f3b61cd112165d881ee95991b19e8fe8c929e9d352c424d80ecd4eb3771
 EBUILD unifi-5.14.9.ebuild 1567 BLAKE2B 3acdf8b67e2dc53554241f784d3e9fa59a9e0b3fb0ad0754b51fcdbffb5a721c312f688ac763591f1f4bf736ed3f51ee4aa4bf451a7f11e019cbc217d2193a0f SHA512 06c9aacd6fed9443cb875ec3bbd6ce7bdc86ed5ecf75148e10ba75b9e53ba8592e8c9832562223993a3947505a78afd2867b2ecf2907b83c34b3e8da2b14a5db
 EBUILD unifi-5.6.42-r1.ebuild 1667 BLAKE2B daea907c2b41f461f707411f8a68dba6cc9ec8dcd7577641d7554539fd5f191eb2684478fd9801bcbaec855e83b765ab4a429cc3bf876e7a42176fdac1eb26ff SHA512 a7001e6fb490e6ad20ea00a080bb76877c85741dd2142f54041afd71d2822684836ed8803bd74b6a8821da7b7e85e0cfb6d10b5294838ae49f08326b6e1141f7
 MISC metadata.xml 683 BLAKE2B 830f1b290d1836708aebdb1200caed6120df7ca573173584cfac59ec7eb3e8e38be65e237535d722f215ebb69b8739cf900fb79cddb78e60a09d1cbb1ff222f9 SHA512 da328bd64dea83da1f7f2bfe3431701597cc6a9829b0e0a5ec82bb4167f2f57b144b9d9c77656da33dc9b59e0d53ac89e18be6f776ac4356151d331f020c4ae0
diff --git a/net-wireless/unifi/unifi-5.12.72.ebuild b/net-wireless/unifi/unifi-5.12.72.ebuild
deleted file mode 100644
index 17ff873d18c1..000000000000
--- a/net-wireless/unifi/unifi-5.12.72.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
-
-# Set this var for any releases except stable
-#RC_SUFFIX=""
-
-inherit systemd
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-
-KEYWORDS="amd64"
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/5.12"
-IUSE="systemd"
-
-RDEPEND="
-	acct-group/unifi
-	acct-user/unifi
-	dev-db/mongodb
-	virtual/jre:1.8
-"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/UniFi"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-src_prepare() {
-	# Remove unneeded files Linux, Mac and Windows
-	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
-	if ! use systemd; then
-		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
-	fi
-
-	default
-}
-
-src_install() {
-	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
-	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
-	exeinto /usr/lib/unifi/bin
-	newexe "${FILESDIR}"/mongod-wrapper mongod
-
-	insinto /usr/lib/unifi
-	doins -r dl lib webapps
-
-	diropts -o unifi -g unifi
-	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
-	for symlink in conf data run tmp work; do
-		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
-	done
-	dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
-	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
-	systemd_dounit "${FILESDIR}"/unifi.service
-
-	newconfd "${FILESDIR}"/unifi.confd unifi
-
-	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
-	doenvd "${T}"/99unifi
-
-	einstalldocs
-}
diff --git a/net-wireless/unifi/unifi-5.13.29.ebuild b/net-wireless/unifi/unifi-5.13.29.ebuild
index a8dc73fd3b7e..c9bdb8d27e60 100644
--- a/net-wireless/unifi/unifi-5.13.29.ebuild
+++ b/net-wireless/unifi/unifi-5.13.29.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
 HOMEPAGE="https://www.ubnt.com"
 SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
 SLOT="0/5.13"
 IUSE="systemd"
diff --git a/net-wireless/unifi/unifi-5.14.15.ebuild b/net-wireless/unifi/unifi-5.14.15.ebuild
new file mode 100644
index 000000000000..22d2f71a0a01
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.14.15.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Set this var for any releases except stable
+RC_SUFFIX="-c3f8d69687"
+
+inherit systemd
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/5.14"
+IUSE="systemd"
+
+RDEPEND="
+	acct-group/unifi
+	acct-user/unifi
+	dev-db/mongodb
+	virtual/jre:1.8
+"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}/UniFi"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
+
+src_prepare() {
+	# Remove unneeded files Linux, Mac and Windows
+	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
+	if ! use systemd; then
+		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
+	fi
+
+	default
+}
+
+src_install() {
+	insinto /usr/lib/unifi
+	doins -r bin dl lib webapps
+
+	diropts -o unifi -g unifi
+	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+	for symlink in conf data run tmp work; do
+		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+	done
+	dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
+	systemd_dounit "${FILESDIR}"/unifi.service
+
+	newconfd "${FILESDIR}"/unifi.confd unifi
+
+	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+	doenvd "${T}"/99unifi
+
+	einstalldocs
+}
diff --git a/net-wireless/unifi/unifi-5.14.7.ebuild b/net-wireless/unifi/unifi-5.14.7.ebuild
deleted file mode 100644
index 12abf037f27f..000000000000
--- a/net-wireless/unifi/unifi-5.14.7.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Set this var for any releases except stable
-RC_SUFFIX="-ad58f9eb49"
-
-inherit systemd
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-
-KEYWORDS="~amd64"
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/5.14"
-IUSE="systemd"
-
-RDEPEND="
-	acct-group/unifi
-	acct-user/unifi
-	dev-db/mongodb
-	virtual/jre:1.8
-"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/UniFi"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-src_prepare() {
-	# Remove unneeded files Linux, Mac and Windows
-	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
-	if ! use systemd; then
-		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
-	fi
-
-	default
-}
-
-src_install() {
-	insinto /usr/lib/unifi
-	doins -r bin dl lib webapps
-
-	diropts -o unifi -g unifi
-	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
-	for symlink in conf data run tmp work; do
-		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
-	done
-	dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
-	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
-	systemd_dounit "${FILESDIR}"/unifi.service
-
-	newconfd "${FILESDIR}"/unifi.confd unifi
-
-	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
-	doenvd "${T}"/99unifi
-
-	einstalldocs
-}
diff --git a/net-wireless/urh/Manifest b/net-wireless/urh/Manifest
index 809333b0dbf4..67466efc9ca7 100644
--- a/net-wireless/urh/Manifest
+++ b/net-wireless/urh/Manifest
@@ -1,4 +1,4 @@
 DIST urh-2.8.8.tar.gz 13403266 BLAKE2B f2550851f209ca3b3bc389eaab5419338c07d165800e9d2e4e89c50da8fa83f84099b33f0adfbb79ca4d9d2f1104eebe51fff623f1d683b074b802b539ec8166 SHA512 499df6e15fbf73b0b7ecda3ea65c5246b3fd7e3da510b3602ea2f41390ad98c672cc9228394f779178daf545ade3783545f462436f295c06f5e37c0a5dc69179
-EBUILD urh-2.8.8.ebuild 1277 BLAKE2B 693bd4354dd585d9e6694943e944c7b21f5c2c705f30197709608a3448d1f8e31ded16eac6521fff1dadaddee2b321416937e814500cfe089db601dd8ac39dfb SHA512 7585e80130530209ce8369c793aac3df59d788502c368093afe3622ba2bff26d2fb4d68ff19ee21a74a12307c5dee1551b208e692d4e76b0c1edc1eef653a69b
-EBUILD urh-9999.ebuild 1277 BLAKE2B 693bd4354dd585d9e6694943e944c7b21f5c2c705f30197709608a3448d1f8e31ded16eac6521fff1dadaddee2b321416937e814500cfe089db601dd8ac39dfb SHA512 7585e80130530209ce8369c793aac3df59d788502c368093afe3622ba2bff26d2fb4d68ff19ee21a74a12307c5dee1551b208e692d4e76b0c1edc1eef653a69b
-MISC metadata.xml 925 BLAKE2B 2ae753ff0a9b2c58db180655350b7805546a6d4bf548902d5717be45ce07481ed1e478b7e46cfc4d0b9c82807b7b99135017aa1beb882d3ac1c9b9cd80ada30c SHA512 1d1005d81c4ba5eb2d482419d4469de906d3c754750fd7ed46540b92861e4b5356935986572168f1ee3008319aa31054a206d71b5153e7a1758a8c6796949f89
+EBUILD urh-2.8.8.ebuild 1497 BLAKE2B 4a775d0c7fa0a25a63cc51bf0c8cdc021f6507a762be7ff9b3f3f3006b2e5bde09349c7c34b3fc571a986c0d0a56960d4a9ce276ae5fb86eb5263512c9768b40 SHA512 93c0a15ace4bcbb2816ddc7585c551ba89d787f990a35d7cee72acef2528294e539d80761ff504d0e6a772cc2c3e051a5fa7dfb43d8047ccd0fd882755b73232
+EBUILD urh-9999.ebuild 1497 BLAKE2B 4a775d0c7fa0a25a63cc51bf0c8cdc021f6507a762be7ff9b3f3f3006b2e5bde09349c7c34b3fc571a986c0d0a56960d4a9ce276ae5fb86eb5263512c9768b40 SHA512 93c0a15ace4bcbb2816ddc7585c551ba89d787f990a35d7cee72acef2528294e539d80761ff504d0e6a772cc2c3e051a5fa7dfb43d8047ccd0fd882755b73232
+MISC metadata.xml 1290 BLAKE2B 9664aac1a7b063842d1f57257434bc423f4cd4681794d44ab404ff3b4ad8c9eced45a3909b65129abb3578d35e5def63e90a9b44cdc01753c8b9bd4046764270 SHA512 0e0944b7a7a8e4ba62ce1ba177f8d5d180f019d4c3b6535af6fba418b0e7e7ef6295ded4e0d804fc4c357a6eb207340f3999100798c9fbc7ab8f2b22af8e62ec
diff --git a/net-wireless/urh/metadata.xml b/net-wireless/urh/metadata.xml
index 9b89859ec288..b1455255dd5c 100644
--- a/net-wireless/urh/metadata.xml
+++ b/net-wireless/urh/metadata.xml
@@ -10,10 +10,14 @@
 		<name>Radio</name>
 	</maintainer>
 	<use>
+		<flag name="airspy">use native backend which directly uses <pkg>net-wireless/airspy</pkg></flag>
+		<flag name="audio">use a soundcard instead of an sdr</flag>
 		<flag name="bladerf">use native backend which directly uses <pkg>net-wireless/bladerf</pkg></flag>
 		<flag name="hackrf">use native backend which directly uses <pkg>net-libs/libhackrf</pkg></flag>
+		<flag name="limesdr">use native backend which directly uses <pkg>net-wireless/limesuite</pkg></flag>
 		<flag name="plutosdr">use native backend which directly uses <pkg>net-libs/libiio</pkg></flag>
 		<flag name="rtlsdr">use native backend which directly uses <pkg>net-wireless/rtl-sdr</pkg></flag>
+		<flag name="sdrplay">use native backend which directly uses <pkg>net-wireless/sdrplay</pkg></flag>
 		<flag name="uhd">use native backend which directly uses <pkg>net-wireless/uhd</pkg></flag>
 	</use>
 	<upstream>
diff --git a/net-wireless/urh/urh-2.8.8.ebuild b/net-wireless/urh/urh-2.8.8.ebuild
index f325027fcad3..a39b830fe98d 100644
--- a/net-wireless/urh/urh-2.8.8.ebuild
+++ b/net-wireless/urh/urh-2.8.8.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="bladerf hackrf plutosdr rtlsdr uhd"
+IUSE="airspy audio bladerf hackrf limesdr plutosdr rtlsdr sdrplay uhd"
 
 DEPEND="${PYTHON_DEPS}
 		net-wireless/gnuradio[zeromq]
@@ -28,10 +28,14 @@ DEPEND="${PYTHON_DEPS}
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pyzmq[${PYTHON_USEDEP}]
 		dev-python/cython[${PYTHON_USEDEP}]
+		airspy? ( net-wireless/airspy:= )
+		audio? ( dev-python/pyaudio[${PYTHON_USEDEP}] )
 		bladerf? ( net-wireless/bladerf:= )
 		hackrf? ( net-libs/libhackrf:= )
+		limesdr? ( net-wireless/limesuite:= )
 		plutosdr? ( net-libs/libiio:= )
 		rtlsdr? ( net-wireless/rtl-sdr:= )
+		sdrplay? ( net-wireless/sdrplay:= )
 		uhd?    ( net-wireless/uhd:= )"
 RDEPEND="${DEPEND}
 		dev-python/PyQt5[${PYTHON_USEDEP},testlib]
@@ -39,12 +43,13 @@ RDEPEND="${DEPEND}
 
 python_configure_all() {
 	mydistutilsargs=(
+			$(use_with airspy)
 			$(use_with bladerf)
 			$(use_with hackrf)
+			$(use_with limesdr)
 			$(use_with plutosdr)
 			$(use_with rtlsdr)
+			$(use_with sdrplay)
 			$(use_with uhd usrp)
-			--without-airspy
-			--without-limesdr
 			)
 }
diff --git a/net-wireless/urh/urh-9999.ebuild b/net-wireless/urh/urh-9999.ebuild
index f325027fcad3..a39b830fe98d 100644
--- a/net-wireless/urh/urh-9999.ebuild
+++ b/net-wireless/urh/urh-9999.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="bladerf hackrf plutosdr rtlsdr uhd"
+IUSE="airspy audio bladerf hackrf limesdr plutosdr rtlsdr sdrplay uhd"
 
 DEPEND="${PYTHON_DEPS}
 		net-wireless/gnuradio[zeromq]
@@ -28,10 +28,14 @@ DEPEND="${PYTHON_DEPS}
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pyzmq[${PYTHON_USEDEP}]
 		dev-python/cython[${PYTHON_USEDEP}]
+		airspy? ( net-wireless/airspy:= )
+		audio? ( dev-python/pyaudio[${PYTHON_USEDEP}] )
 		bladerf? ( net-wireless/bladerf:= )
 		hackrf? ( net-libs/libhackrf:= )
+		limesdr? ( net-wireless/limesuite:= )
 		plutosdr? ( net-libs/libiio:= )
 		rtlsdr? ( net-wireless/rtl-sdr:= )
+		sdrplay? ( net-wireless/sdrplay:= )
 		uhd?    ( net-wireless/uhd:= )"
 RDEPEND="${DEPEND}
 		dev-python/PyQt5[${PYTHON_USEDEP},testlib]
@@ -39,12 +43,13 @@ RDEPEND="${DEPEND}
 
 python_configure_all() {
 	mydistutilsargs=(
+			$(use_with airspy)
 			$(use_with bladerf)
 			$(use_with hackrf)
+			$(use_with limesdr)
 			$(use_with plutosdr)
 			$(use_with rtlsdr)
+			$(use_with sdrplay)
 			$(use_with uhd usrp)
-			--without-airspy
-			--without-limesdr
 			)
 }
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 2331daeafc6b..80916f45f4fa 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 9fdbb6d97673..7c324ee2e519 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Joonas Niilola <juippis@gentoo.org> (2020-06-21)
+# sys-apps/apparmor doesn't have stable keywords.
+app-emulation/lxc apparmor
+
 # Thomas Deutschmann <whissi@gentoo.org> (2019-10-28)
 # net-libs/quiche is an early HTTP/3 implementation
 # not yet ready for everyone.
diff --git a/profiles/arch/arm/armv6j/package.mask b/profiles/arch/arm/armv6j/package.mask
index 96302cff734c..9bf1f42c14b7 100644
--- a/profiles/arch/arm/armv6j/package.mask
+++ b/profiles/arch/arm/armv6j/package.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@cmpct.info> (2020-06-29)
+# Needs Rust, which is available here
+# Bug #677018
+-net-news/newsboat
+
 # James Le Cuirot <chewi@gentoo.org> (2016-01-09)
 # This is built for armv6 so unmask against the wider arm mask.
 -dev-java/oracle-jdk-bin
diff --git a/profiles/arch/arm/armv7a/package.mask b/profiles/arch/arm/armv7a/package.mask
index ea16b137362b..983866095825 100644
--- a/profiles/arch/arm/armv7a/package.mask
+++ b/profiles/arch/arm/armv7a/package.mask
@@ -1,6 +1,15 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@cmpct.info> (2020-06-29)
+# Needs Rust, which is available here
+# Bug #677018
+-net-news/newsboat
+
+# Sam James <sam@cmpct.info> (2020-06-24)
+# Valgrind works on ARMv7
+-dev-util/valgrind
+
 # James Le Cuirot <chewi@gentoo.org> (2016-01-09)
 # This is built for armv6 so unmask against the wider arm mask.
 -dev-java/oracle-jdk-bin
diff --git a/profiles/arch/arm/armv7a/package.use.mask b/profiles/arch/arm/armv7a/package.use.mask
new file mode 100644
index 000000000000..8aea7c2c8832
--- /dev/null
+++ b/profiles/arch/arm/armv7a/package.use.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Sam James <sam@cmpct.info> (2020-06-27)
+# Tests require Valgrind, available on armv7a
+dev-libs/rapidjson -test
diff --git a/profiles/arch/arm/armv7a/use.mask b/profiles/arch/arm/armv7a/use.mask
index 25991f5fd76d..764a6e7881c5 100644
--- a/profiles/arch/arm/armv7a/use.mask
+++ b/profiles/arch/arm/armv7a/use.mask
@@ -14,3 +14,7 @@
 -cpu_flags_arm_vfpv3
 -cpu_flags_arm_vfpv4
 -cpu_flags_arm_vfp-d32
+
+# Sam James <sam@cmpct.info> (2020-06-24)
+# Valgrind works on ARMv7
+-valgrind
diff --git a/profiles/arch/arm/package.mask b/profiles/arch/arm/package.mask
index 25107630e0b6..34754836d7f6 100644
--- a/profiles/arch/arm/package.mask
+++ b/profiles/arch/arm/package.mask
@@ -1,6 +1,16 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@cmpct.info> (2020-06-29)
+# Needs Rust (only on >= armv6j)
+# Bug #677018
+net-news/newsboat
+
+# Sam James <sam@cmpct.info> (2020-06-24)
+# Valgrind lacks support for < ARMv7
+# https://valgrind.org/info/platforms.html
+dev-util/valgrind
+
 # Bernardo Meurer <bernardo@standard.ai> (2019-09-28)
 # Requires app-crypt/tpm2-tss which is pending ~arm vide
 # https://bugs.gentoo.org/695758
diff --git a/profiles/arch/arm/package.use.force b/profiles/arch/arm/package.use.force
index db3826895aaa..442c1611b3de 100644
--- a/profiles/arch/arm/package.use.force
+++ b/profiles/arch/arm/package.use.force
@@ -14,8 +14,3 @@ dev-lang/rust llvm_targets_ARM
 dev-ml/llvm-ocaml llvm_targets_ARM
 sys-devel/clang llvm_targets_ARM
 sys-devel/llvm llvm_targets_ARM
-
-# Anthony G. Basile <blueness@gentoo.org> (2012-11-11)
-# Only gnome-base/gdm has stable keywording. If x11-misc/lightdm or kde-plasma/kdm
-# gets stable keyword, this line can be removed.
-x11-misc/xscreensaver gdm
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 164298d09fc6..5bc88d8bd6ba 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@cmpct.info> (2020-06-27)
+# Tests require Valgrind, not available on <armv7a
+dev-libs/rapidjson test
+
 # Michał Górny <mgorny@gentoo.org> (2020-06-19)
 # Requires dev-util/dwarves.
 sys-kernel/gentoo-kernel debug
@@ -36,10 +40,6 @@ mate-base/mate bluetooth
 # Mask until gui-libs/gtk-layer-shell is keyworded
 mate-base/mate-panel wayland
 
-# Patrick McLean <chutzpah@gentoo.org> (2020-02-15)
-# Mask until dev-libs/libfido2 is keyworded
-net-misc/openssh security-key
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-01-26)
 # media-libs/libheif is not keyworded
 media-gfx/gimp heif
@@ -65,10 +65,6 @@ sci-libs/pcl vtk
 # Neither sys-apps/bolt nor kde-plasma/plasma-thunderbolt are keyworded
 kde-plasma/plasma-meta thunderbolt
 
-# Michał Górny <mgorny@gentoo.org> (2019-07-13)
-# app-forensics/libewf is not keyworded here.
-app-admin/testdisk ewf
-
 # Craig Andrews <candrews@gentoo.org> (2019-07-03)
 # Unmask Raspberry Pi support on arm.
 media-tv/kodi -raspberry-pi
@@ -78,11 +74,6 @@ media-tv/kodi -raspberry-pi
 # build on arm.
 >=dev-lang/spidermonkey-60 -jit
 
-# Lars Wendler <polynomial-c@gentoo.org> (2019-04-29)
-# Requires app-text/discount and net-libs/webkit-gtk which both have
-# no keywords on arm
-dev-util/geany-plugins markdown
-
 # Patrick McLean <chutzpah@gentoo.org> (2019-04-15)
 # deps not available on platform
 sys-cluster/ceph babeltrace lttng
@@ -106,19 +97,11 @@ net-im/ejabberd hipe
 # (SM)BIOS/Thunderbolt outside of amd64/x86? - citation needed
 sys-apps/fwupd dell thunderbolt
 
-# Bernard Cafarelli <voyageur@gentoo.org> (2019-01-14)
-# Requires dev-php/pecl-imagick which is not keyworded on arm
-www-apps/nextcloud imagemagick
-
 # Davide Pesavento <pesa@gentoo.org> (2018-12-27)
 # The corresponding Qt5 modules are not keyworded on arm, and we don't want to
 # keyword them solely because of PyQt5 while there are no other in-tree users.
 dev-python/PyQt5 networkauth
 
-# Aaron W. Swenson <titanofold@gentoo.org> (2018-10-19)
-# Requires sys-devel/clang which isn’t keyworded for ARM.
-dev-db/postgresql llvm
-
 # Michał Górny <mgorny@gentoo.org> (2018-10-18)
 # Requires unported sys-libs/netbsd-csu.
 sys-devel/clang-runtime crt
@@ -132,22 +115,6 @@ dev-ruby/capybara test
 # pre-built, no ARM support
 net-wireless/gr-osmosdr sdrplay
 
-# Tomáš Mózes <hydrapolic@gmail.com> (2018-08-10)
-# Needs dev-libs/libmaxminddb which isn't keyworded
-app-admin/syslog-ng geoip2
-
-# Thomas Deutschmann <whissi@gentoo.org> (2018-07-04)
-# dev-libs/xxhash not keyworded for arm
-app-admin/rsyslog xxhash
-
-# Tomáš Mózes <hydrapolic@gmail.com> (2018-06-19)
-# Needs dev-libs/libmaxminddb which isn't keyworded
-www-servers/nginx nginx_modules_http_geoip2 nginx_modules_stream_geoip2
-
-# Thomas Deutschmann <whissi@gentoo.org> (2018-06-06)
-# Needs sys-apps/fakechroot which isn't keyworded
-app-arch/rpm test
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2018-06-03)
 # net-wireless/soapysdr not keyworded
 net-wireless/gr-osmosdr soapy
@@ -165,14 +132,6 @@ net-libs/gnutls test-full
 # Requires unkeyworded deps
 >=dev-python/ipython-5.4.1 notebook qt5 smp
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2018-02-04)
-# Depends on not yet keyworded dev-python/geoip-python. Bug #636860
-net-p2p/deluge geoip
-
-# Amy Liffey <amynka@gentoo.org (2018-01-21)
-# dev-libs/cereal not keyworded for arm
-media-libs/opencv contribdnn
-
 # Michał Górny <mgorny@gentoo.org> (2017-12-30)
 # Moved from use.mask since they are flags local to one package.
 media-tv/tvheadend hdhomerun
@@ -259,19 +218,10 @@ dev-db/mariadb -jdbc
 sci-mathematics/octave graphicsmagick
 media-gfx/zbar graphicsmagick
 
-# Göktürk Yüksek <gokturk@gentoo.org> (2016-06-14) on behalf of
-# Nicholas Vinson <nvinso234@gmail.com> (proxy-maint)
-# net-firewall/nftables[doc] requires dblatex which is not keyworded
-net-firewall/nftables doc
-
 # Amy Winston <amynka@gentoo.org> (2016-06-12)
 # does not build on arm at all (upstream bug)
 dev-scheme/racket futures jit
 
-# Patrick McLean <chutzpah@gentoo.org> (2016-05-12)
-# Tests require dev-python/tox which isn't keyworded on arm
-sys-cluster/ceph test
-
 # Thomas Deutschmann <whissi@gentoo.org> (2016-03-19)
 # Unkeyworded deps, bug #564274
 app-metrics/collectd collectd_plugins_gmond
@@ -321,10 +271,6 @@ media-video/ffmpeg -mmal
 # unkeyworded deps, bug #552330
 app-portage/g-sorcery bson
 
-# Markos Chandras <hwoarang@gentoo.org> (2015-04-18)
-# samba-4 not keyworded on arm
-sys-auth/sssd samba
-
 # Alexis Ballier <aballier@gentoo.org> (2015-04-02)
 # Needs ilmbase (openexr), which does not build and is masked on arm.
 media-libs/freeimage tiff
@@ -410,10 +356,6 @@ app-emulation/xen-tools system-qemu doc
 # Needs sci-physics/bullet tested #499974
 dev-libs/efl physics
 
-# Jason A. Donenfeld <zx2c4@gentoo.org> (2014-01-27)
-# luajit isn't keyworded for arm yet, which is a bummer
-net-im/prosody jit
-
 # Markus Meier <maekke@gentoo.org> (2013-12-26)
 # Unkeyworded deps, bug #488724
 app-office/gnumeric libgda
@@ -426,10 +368,6 @@ net-im/telepathy-connection-managers sipe
 # Missing keywords, bug #478254
 gnome-base/gnome classic extras
 
-# Benda Xu <heroxbd@gentoo.org> (2013-10-31)
-# Missing keywords from dev-ml/lablgtk, bug #487722
-net-p2p/mldonkey gtk guionly
-
 # Markus Meier <maekke@gentoo.org> (2013-09-15)
 # Unkeyworded deps, bug #481462
 dev-python/ipython nbconvert
@@ -450,11 +388,6 @@ app-admin/conky cmus irc lua-cairo lua-imlib lua-rsvg moc xmms2
 # Not tested
 media-libs/devil allegro nvtt
 
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (2013-07-13)
-# requires net-misc/freerdp which is not keyworded on arm
-# screen-sharing requires rdp flag
-dev-libs/weston rdp screen-sharing
-
 # Andreas K. Huettel <dilfridge@gentoo.org> (2013-05-27)
 # Firmware loader not keyworded yet
 sci-libs/linux-gpib firmware
@@ -464,7 +397,9 @@ sci-libs/linux-gpib firmware
 media-gfx/povray mkl
 
 # Benda Xu <heroxbd@gentoo.org> (2013-04-01)
-# dev-ml/lablgtk not keyworded
+# Sam James <sam@cmpct.info> (2020-06-29)
+# net-misc/x11-ssh-askpass nor
+# net-misc/ssh-askpass-fullscreen keyworded
 net-misc/unison gtk
 
 # Julian Ospald <hasufell@gentoo.org> (2013-03-31)
@@ -514,14 +449,6 @@ app-office/libreoffice libreoffice_extensions_scripting-beanshell libreoffice_ex
 # No java on ARM
 net-analyzer/wireshark bcg729 maxminddb
 
-# Markus Meier <maekke@gentoo.org> (2012-07-25)
-# no stable media-video/vlc yet, bug #401313
-media-libs/phonon vlc
-
-# Michael Sterrett <mr_bones_@gentoo.org> (2012-03-04)
-# arm is missing keywords for >=dev-libs/json-glib-0.12
-app-admin/syslog-ng json
-
 # Anthony G. Basile <blueness@gentoo.org> (2011-12-21)
 # Mask the vde flag on tinc because net-misc/vde is not
 # keyworded for arm
@@ -534,25 +461,13 @@ dev-qt/qtdeclarative -jit
 dev-qt/qtscript -jit
 dev-qt/qtwebkit -jit
 
-# Sebastian Pipping <sping@gentoo.org> (2011-02-22)
-# No media-sound/lilypond here, yet (bug #356069)
-app-text/asciidoc test
-
-# Jim Ramsay <lack@gentoo.org> (2008-11-05)
-# app-admin/gkrellm may pull in net-libs/libntlm, which is not keyworded
-app-admin/gkrellm ntlm
-
 # missing keywords
 media-plugins/gst-plugins-meta aac dts dv lame libvisual modplug taglib vcd wavpack dvd
 
-# Ultrabug <ultrabug@gentoo.org> (2011-09-05)
-# missing keyword for net-libs/zeromq
-app-admin/rsyslog zeromq
-
 # Ian Whyman <thev00d00@gentoo.org> (2016-05-22)
 # RPI support on arm
 dev-libs/libcec -raspberry-pi
 
 # Ian Whyman <thev00d00@gentoo.org> (2017-09-05)
-# missing keywords dev-lang/duktape media-libs/lastfmlib
-net-misc/gerbera javascript lastfm
+# missing keywords media-libs/lastfmlib
+net-misc/gerbera lastfm
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index 89059484015f..d197a96abbbb 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -1,6 +1,17 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@cmpct.info> (2020-06-28)
+# Deps not yet stable
+# Migrated from package.use.mask
+app-text/asciidoc test
+media-libs/phonon vlc
+net-misc/openssh security-key
+dev-util/geany-plugins markdown
+app-arch/rpm test
+net-misc/openssh security-key
+dev-util/geany-plugins markdown
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-11-02)
 # media-video/pipewire is not stable yet
 dev-libs/weston pipewire
@@ -35,10 +46,6 @@ gnome-base/gvfs mtp
 # Needs net-libs/webkit-gtk which is not stable, bug #663248
 app-editors/emacs xwidgets
 
-# Mikle Kolyada <zlogene@gentoo.org> (2018-07-16)
-# No stable qtnetwork
-net-irc/znc test
-
 # Akinori Hattori <hattya@gentoo.org> (2018-06-23)
 # No stable Java
 dev-db/qdbm java
@@ -83,10 +90,6 @@ media-libs/libbluray java
 # Requires app-emulation/xen-tools which is not stable on arm
 app-metrics/collectd collectd_plugins_java collectd_plugins_xencpu
 
-# Michael Palimaka <kensington@gentoo.org> (2017-03-19)
-# Required media-plugins/gst-plugins-x264 is not stable
-media-plugins/gst-plugins-meta x264
-
 # Michael Weber <xmw@gentoo.org> (2017-03-01)
 # Mask until >sys-cluster/ceph-0.94 goes stable
 net-analyzer/rrdtool rados
diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask
index feb40f29c013..e31a1ee7d7ff 100644
--- a/profiles/arch/arm/use.mask
+++ b/profiles/arch/arm/use.mask
@@ -8,6 +8,11 @@
 -cpu_flags_arm_iwmmxt
 -cpu_flags_arm_iwmmxt2
 
+# Sam James <sam@cmpct.info> (2020-06-24)
+# Valgrind lacks support for < ARMv7
+# https://valgrind.org/info/platforms.html
+valgrind
+
 # Matt Turner <mattst88@gentoo.org> (2020-02-02)
 # Neither dev-python/pymongo nor dev-libs/mongo-c-driver are keyworded
 mongodb
@@ -28,10 +33,6 @@ acpi
 # net-wireless/wimax not tested
 wimax
 
-# Markus Meier <maekke@gentoo.org> (2010-08-21)
-# app-antivirus/clamav not tested
-clamav
-
 # Kacper Kowalik <xarthisius@gentoo.org> (2010-08-09)
 # cblas-external as virtual/cblas is also masked
 cblas-external
@@ -44,10 +45,6 @@ xfs
 # Fails to build/work
 openexr
 
-# Samuli Suominen <drac@gentoo.org>
-# media-gfx/gimp not tested.
-gimp
-
 # No hardware to test by the team
 ios
 ipod
diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask
index 4060fc294115..965bf85ebb41 100644
--- a/profiles/arch/arm/use.stable.mask
+++ b/profiles/arch/arm/use.stable.mask
@@ -4,13 +4,17 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Sam James <sam@cmpct.info> (2020-06-29)
+# media-gfx/gimp not yet stable
+gimp
+
 # Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
 # Dependencies not yet stable.
 appindicator
 ayatana
 
 # Mike Gilbert <floppym@gentoo.org> (2017-06-08)
-# dev-lang/python:3.7 is not stable.
+# dev-lang/python:3.8 is not stable.
 python_targets_python3_8
 python_single_target_python3_8
 
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 162d49381dc7..0a595e2b137a 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,6 +1,12 @@
 # Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Lars Wendler <polynomial-c@gentoo.org> (2020-06-25)
+# Missing keyword. Requires dev-util/cmake which also lacks keyword and
+# possibly a whole bunch of its deps as well
+# See https://bugs.gentoo.org/729582
+>=net-misc/rsync-3.2.0 lz4
+
 # Lars Wendler <polynomial-c@gentoo.org> (2020-05-10)
 # Missing keyword
 media-libs/freetype brotli
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index d266201073f1..846b87f7de0d 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sergei Trofimovich <slyfox@gentoo.org> (2020-06-24)
+# Don't let people lose 'cc' or 'f77' by accident.
+sys-devel/gcc-config cc-wrappers
+
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-05-24)
 # Many base packages still rely on unqualified tools.
 # To contain the breakage flags are masked. Once most packages
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 31ad5808bb9e..ac3815a08433 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,15 +6,19 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Mart Raudsepp <leio@gentoo.org> (2020-06-28)
+# media-video/pipewire:0/0.3 is ongoing work, 0.2 on mutter-3.34
+# is not worth trying to get to work.
+x11-wm/mutter screencast
+
+# Stephan Hartmann <stha09@googlemail.com> (2020-06-28)
+# Mostly intended for development and not for general use.
+>=www-client/chromium-84 headless
+
 # Mikle Kolyada <zlogene@gentoo.org> (2020-06-21)
 # Multiple runtime crashes, see bug #724672
 media-gfx/inkscape jemalloc
 
-# Sam James <sam@cmpct.info> (2020-16-06)
-# Doc build broken for now
-# Bug #679184
-media-libs/aubio doc
-
 # Stephan Hartmann <stha09@googlemail.com> (2020-16-06)
 # Mostly intended for debugging and development,
 # not recommended for general use. Build is also often
diff --git a/profiles/desc/sane_backends.desc b/profiles/desc/sane_backends.desc
index 0e6808352690..e78df8a25857 100644
--- a/profiles/desc/sane_backends.desc
+++ b/profiles/desc/sane_backends.desc
@@ -29,6 +29,7 @@ dmc - SANE_BACKENDS setting for building the dmc backend
 epjitsu - SANE_BACKENDS setting for building the epjitsu backend
 epson - SANE_BACKENDS setting for building the epson backend
 epson2 - SANE_BACKENDS setting for building the epson2 backend
+escl - SANE_BACKENDS setting for building the escl backend
 fujitsu - SANE_BACKENDS setting for building the fujitsu backend
 genesys - SANE_BACKENDS setting for building the genesys backend
 gt68xx - SANE_BACKENDS setting for building the gt68xx backend
@@ -69,6 +70,7 @@ plustek_pp - SANE_BACKENDS setting for building the plustek_pp backend
 pnm - SANE_BACKENDS settings for building the pnm test backend, considered a possible security risk
 qcam - SANE_BACKENDS setting for building the qcam backend
 ricoh - SANE_BACKENDS setting for building the ricoh backend
+ricoh2 - SANE_BACKENDS setting for building the ricoh2 backend
 rts8891 - SANE_BACKENDS setting for building the rts8891 backend
 s9036 - SANE_BACKENDS setting for building the s9036 backend
 sceptre - SANE_BACKENDS setting for building the sceptre backend
diff --git a/profiles/package.mask b/profiles/package.mask
index 6dc7911e32b7..5c8ce3cc6cbb 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,191 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2020-06-29)
+# Unmaintained in Gentoo.  Multiple unresolved vulnerabilities.
+# Suggested replacement: sys-apps/portage (just kidding).
+# Removal in 30 days.  Bug #711134.
+sys-apps/pacman
+
+# Aaron Bauman <bman@gentoo.org> (2020-06-28)
+# More Py2 only stuff. Plz see -dev ML for discussions
+# Remove bindings, port to Py3, etc
+# Removal in 30 days
+app-arch/deltarpm
+app-crypt/virtualsmartcard
+app-text/duali
+app-text/duali-data
+app-text/mftrace
+app-text/queequeg
+app-text/referencer
+dev-libs/libmacaroons
+dev-libs/tut
+dev-python/elib-intl
+dev-python/eunuchs
+dev-python/medusa
+dev-python/misaka
+dev-python/python-iwscan
+dev-util/confix
+dev-util/qmtest
+dev-util/unrpyc
+games-engines/gemrb
+media-sound/lilycomp
+media-video/tovid
+net-dns/maradns
+net-irc/irker
+net-mail/archivemail
+net-mail/getmail
+net-nds/nsscache
+net-wireless/airpwn
+sci-chemistry/bkchem
+sci-chemistry/propka
+sci-chemistry/pymol-plugins-bni-tools
+sci-chemistry/pymol-plugins-emovie
+sci-chemistry/viewmol
+sci-libs/chemkit
+sys-apps/x86info
+www-misc/surl
+x11-wm/plwm
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2020-06-28)
+# WIP PipeWire ebuild, breaks all current revdeps in ebuild repository
+# sys-apps/xdg-desktop-portal-1.7.2 depends on masked PipeWire >=0.3
+~media-video/pipewire-0.3.6
+~sys-apps/xdg-desktop-portal-1.7.2
+
+# Mikle Kolyada <zlogene@gentoo.org> (2020-06-28)
+# Obsolete package.
+# Does not build.
+# Dead upstream and only gentoo ships it.
+# Removal in 30 days.
+app-misc/scope
+
+# Mart Raudsepp <leio@gentoo.org> (2020-06-27)
+# Disappeared upstream and download locations. Potential replacements:
+# media-sound/quimup, xfce-extra/xfce4-mpc-plugin, media-sound/xfmpc
+# Bug 729822. Removal in 30 days.
+media-sound/guimup
+
+# Mikle Kolyada <zlogene@gentoo.org> (2020-06-26)
+# Has been a part of dev-texlive/texlive-pictures
+# for a long time. Removal in 30 days.
+dev-tex/circuit_macros
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2020-06-25)
+# Stuck on Python 2, no maintainer; rgain3 fork available for sb. taking over
+# at https://github.com/chaudum/rgain - masked for removal in 30 days.
+media-sound/rgain
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2020-06-25)
+# Stuck on Python 2, m-n, we have no shortage on note taking applications.
+# Masked for removal in 30 days.
+x11-misc/nts
+
+# Ulrich Müller <ulm@gentoo.org> (2020-06-25)
+# Included with TeX Live. Last version bump in 2003.
+# Use dev-texlive/texlive-latexextra as replacement.
+# Removal in 30 days. Bug #729470.
+dev-tex/cdcover
+
+# Ulrich Müller <ulm@gentoo.org> (2020-06-25)
+# Included with TeX Live. Last version bump in 2008.
+# Use dev-texlive/texlive-latexrecommended as replacement.
+# Removal in 30 days. Bug #729470.
+dev-tex/translator
+
+# Ulrich Müller <ulm@gentoo.org> (2020-06-24)
+# Included with TeX Live. The separate Gentoo package is
+# unmaintained and had its last version bump in 2004.
+# Use dev-texlive/texlive-bibtexextra as replacement.
+# Removal in 30 days. Bug #729470.
+dev-tex/harvard
+
+# Ulrich Müller <ulm@gentoo.org> (2020-06-24)
+# Included with TeX Live. Last version bump in 2005.
+# Use dev-texlive/texlive-fontsrecommended as replacement.
+# Removal in 30 days. Bug #729470.
+dev-tex/tipa
+
+# Ulrich Müller <ulm@gentoo.org> (2020-06-24)
+# Included with TeX Live. Last version bump in 2006 or earlier.
+# Use dev-texlive/texlive-latexextra as replacement.
+# Removal in 30 days. Bug #729470.
+dev-tex/flabels
+dev-tex/floatflt
+dev-tex/lazylist
+dev-tex/newlfm
+dev-tex/polytable
+
+# Ulrich Müller <ulm@gentoo.org> (2020-06-24)
+# Included with TeX Live. Last version bump in 2011.
+# Use dev-texlive/texlive-pictures as replacement.
+# Removal in 30 days. Bug #729470.
+dev-tex/curve
+
+# Ulrich Müller <ulm@gentoo.org> (2020-06-24)
+# Included with TeX Live. Last version bump in 2006. Fails to build.
+# Use dev-texlive/texlive-latexextra as replacement.
+# Removal in 30 days. Bug #719304.
+dev-tex/ellipsis
+
+# Ulrich Müller <ulm@gentoo.org> (2020-06-24)
+# Included with TeX Live. Fails to install.
+# Use dev-texlive/texlive-latexextra as replacement.
+# Removal in 30 days. Bug #708870.
+dev-tex/rcsinfo
+
+# Ulrich Müller <ulm@gentoo.org> (2020-06-24)
+# Included with TeX Live. Last version bump in 2005. Fails to build.
+# Use dev-texlive/texlive-latexextra as replacement.
+# Removal in 30 days. Bug #709310.
+dev-tex/texpower
+
+# Ulrich Müller <ulm@gentoo.org> (2020-06-24)
+# Included with TeX Live. The separate Gentoo packages are
+# unmaintained and had their last version bump in 2010 or earlier.
+# Use >=dev-texlive/texlive-latexextra-2020-r2 as replacement.
+# Removal in 30 days. Bug #729394.
+dev-tex/currvita
+dev-tex/envlab
+dev-tex/europecv
+dev-tex/g-brief
+dev-tex/leaflet
+dev-tex/svninfo
+
+# Ulrich Müller <ulm@gentoo.org> (2020-06-24)
+# Included with TeX Live. The separate Gentoo package is
+# unmaintained and had its last version bump in 2008.
+# Use >=dev-texlive/texlive-pictures-2020-r2 as replacement.
+# Removal in 30 days. Bug #729394.
+dev-tex/dot2texi
+
+# Michał Górny <mgorny@gentoo.org> (2020-06-24)
+# A thin wrapper to run pytest via setup.py that must not be used
+# in Gentoo packages.  Calling 'setup.py test' is deprecated upstream
+# anyway.  Just call 'pytest' directly.  The last revdep is last rited.
+# Removal in 30 days.  Bug #729376.
+dev-python/pytest-runner
+
+# Michał Górny <mgorny@gentoo.org> (2020-06-23)
+# Python 2 only.
+#
+# Relax involves implementation conflicts between dependencies.  Even
+# if you can get past them, it requires Numdifftools, and...
+#
+# Numdifftools fails with modern versions of setuptools, most likely
+# because it uses pyscaffold that is broken.  There are newer versions
+# that removed pyscaffold support but they have new dependencies that
+# do not support py2 and porting them back is just not worth the effort.
+# Its only revdep is relax.
+#
+# Pyscaffold is just broken and required only by old versions
+# of Numdifftools.
+#
+# Removal in 30 days.  Bug #704032.
+dev-python/Numdifftools
+dev-python/pyscaffold
+sci-chemistry/relax
+
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-06-21)
 # virtual/libstdc++ has only one sys-libs/libstdc++-v3 provider.
 # Use that instead. Or even better use none of them. It's a
@@ -40,6 +225,7 @@ virtual/libstdc++
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-06-20)
 # Stuck on Python 2, depends on deprecated dev-python/pygobject:2
+# Masked for removal in 30 days.
 media-libs/pymemphis
 
 # Ulrich Müller <ulm@gentoo.org> (2020-06-20)
@@ -66,7 +252,6 @@ dev-python/python-wpactrl
 dev-util/bakefile
 dev-vcs/git-deps
 dev-vcs/git-remote-hg
-games-board/scid
 games-emulation/openmsx
 games-kids/childsplay
 games-mud/lyntin
@@ -96,6 +281,7 @@ x11-plugins/purple-plugin_pack
 # games-puzzle/gtetrinet: Bug #726798 last release 2006, abandoned upstream.
 # games-board/mt_gtk_client: Bug #726808, last commit 17 years ago.
 # games-board/sirius: Bug #726814, last release 15 years ago, dead upstream.
+# Masked for removal in 30 days.
 games-board/gnono
 games-puzzle/gtetrinet
 games-board/mt_gtk_client
@@ -104,6 +290,7 @@ games-board/sirius
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-06-18)
 # Depends on dead gnome-base/libgnomeui. Really, no one else is packaging
 # this, last (and only) release in 2006, abandoned upstream. Bug #726790
+# Masked for removal in 30 days.
 dev-embedded/gnome-avrdude
 
 # Michał Górny <mgorny@gentoo.org> (2020-06-14)
@@ -134,12 +321,6 @@ dev-ruby/did_you_mean:2.4
 # Removal in 30 days.
 app-text/xindy
 
-# Aaron Bauman <bman@gentoo.org> (2020-06-07)
-# py2 only. dead upstream. m-n. rdep.
-# Masked for removal in 15 days
-net-misc/charm
-sys-cluster/polysh
-
 # Jonas Stein <jstein@gentoo.org> (2020-06-07)
 # Last rite unusable package.
 # Removal after 2020-08-01
@@ -255,14 +436,6 @@ dev-python/gql
 # Masked for removal in 30 days.
 dev-ruby/rack-mount
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-05-23)
-# Obsolete GNOME 2 era packages, stuck on Python 2 and pygtk,
-# bugs #640022, #708094. Masked for removal in 30 days.
-dev-python/gconf-python
-dev-python/gnome-python-base
-dev-python/pygtksourceview
-<app-text/cherrytree-0.39.2
-
 # Hans de Graaff <graaff@gentoo.org> (2020-05023)
 # Masked for removal in 30 days.
 # Not useful anymore now that metasploit has been removed.
@@ -308,30 +481,6 @@ games-util/pogo-manager-bin
 net-p2p/bisq
 sci-mathematics/geogebra
 
-# Michał Górny <mgorny@gentoo.org> (2020-03-29)
-# Unmaintained, seriously outdated, vulnerable.  Multiple bugs reported.
-# Stuck on Python 3.6.
-# Removal in 30 days.  Bug #711702.
-app-metrics/buildbot-prometheus
-<dev-util/buildbot-2.7.0
-<dev-util/buildbot-console-view-2.7.0
-<dev-util/buildbot-grid-view-2.7.0
-<dev-util/buildbot-pkg-2.7.0
-<dev-util/buildbot-waterfall-view-2.7.0
-<dev-util/buildbot-worker-2.7.0
-<dev-util/buildbot-wsgi-dashboards-2.7.0
-<dev-util/buildbot-www-2.7.0
-
-# Joshua Kinard <kumba@gentoo.org> (2020-03-28)
-# In Linux ~4.18, IPX (Internetwork Packet eXchange) protocol and
-# NCPFS (NetWare Core Protocol Filesystem) support was removed due
-# to lack of maintenance.  Due to both being dead from a technology
-# standpoint and lack of any upstream activity, mask the below
-# packages and remove in 75 days.
-# Bug #681820
-net-fs/ncpfs
-net-misc/ipx-utils
-
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-03-27)
 # Vulnerable old version of icedtea-web #711392
 # new version is not packaged yet
@@ -402,12 +551,6 @@ www-plugins/passff
 =app-editors/emacs-27.0.50_pre*
 ~app-editors/emacs-27.0.90
 
-# David Seifert <soap@gentoo.org> (2019-12-08)
-# Unmaintained, build hangs, tons of other build failures, missing
-# dependencies.  Bug #663794, #666916, #666922, #667062, #678068,
-# #681678, #684420, #694488. Removal in 30 days.
-dev-db/clickhouse
-
 # Lars Wendler <polynomial-c@gentoo.org> (2019-11-14)
 # Breaks archives containing relative paths
 # when being called with --no-absolute-filenames
diff --git a/profiles/updates/1Q-2015 b/profiles/updates/1Q-2015
deleted file mode 100644
index 25811ee168da..000000000000
--- a/profiles/updates/1Q-2015
+++ /dev/null
@@ -1,58 +0,0 @@
-slotmove sys-firmware/iwl3160-ucode 0 7
-slotmove sys-firmware/iwl3160-ucode 1 8
-slotmove sys-firmware/iwl3160-ucode 2 9
-slotmove sys-firmware/iwl3160-ucode 3 10
-slotmove sys-firmware/iwl7260-ucode 0 7
-slotmove sys-firmware/iwl7260-ucode 1 8
-slotmove sys-firmware/iwl7260-ucode 2 9
-slotmove sys-firmware/iwl7260-ucode 3 10
-slotmove dev-ruby/tilt 2.0.1 2
-move app-vim/zencoding-vim app-vim/emmet
-move app-admin/lxqt-admin lxqt-base/lxqt-admin
-move net-misc/lxqt-openssh-askpass lxqt-base/lxqt-openssh-askpass
-move media-fonts/libertine-ttf media-fonts/libertine
-move dev-qt/qtdocumentation dev-qt/qt-docs
-move app-admin/eselect-audicle app-eselect/eselect-audicle
-move app-admin/eselect-awk app-eselect/eselect-awk
-move app-admin/eselect-blas app-eselect/eselect-blas
-move app-admin/eselect-cblas app-eselect/eselect-cblas
-move app-admin/eselect-cdparanoia app-eselect/eselect-cdparanoia
-move app-admin/eselect-chuck app-eselect/eselect-chuck
-move app-admin/eselect-ctags app-eselect/eselect-ctags
-move app-admin/eselect-emacs app-eselect/eselect-emacs
-move app-admin/eselect-fontconfig app-eselect/eselect-fontconfig
-move app-admin/eselect-gnome-shell-extensions app-eselect/eselect-gnome-shell-extensions
-move app-admin/eselect-infinality app-eselect/eselect-infinality
-move app-admin/eselect-java app-eselect/eselect-java
-move app-admin/eselect-lapack app-eselect/eselect-lapack
-move app-admin/eselect-lcdfilter app-eselect/eselect-lcdfilter
-move app-admin/eselect-lib-bin-symlink app-eselect/eselect-lib-bin-symlink
-move app-admin/eselect-lua app-eselect/eselect-lua
-move app-admin/eselect-metasploit app-eselect/eselect-metasploit
-move app-admin/eselect-miniaudicle app-eselect/eselect-miniaudicle
-move app-admin/eselect-mpg123 app-eselect/eselect-mpg123
-move app-admin/eselect-mpost app-eselect/eselect-mpost
-move app-admin/eselect-notify-send app-eselect/eselect-notify-send
-move app-admin/eselect-oodict app-eselect/eselect-oodict
-move app-admin/eselect-opencascade app-eselect/eselect-opencascade
-move app-admin/eselect-opencl app-eselect/eselect-opencl
-move app-admin/eselect-opengl app-eselect/eselect-opengl
-move app-admin/eselect-package-manager app-eselect/eselect-package-manager
-move app-admin/eselect-pdftex app-eselect/eselect-pdftex
-move app-admin/eselect-php app-eselect/eselect-php
-move app-admin/eselect-pinentry app-eselect/eselect-pinentry
-move app-admin/eselect-postgresql app-eselect/eselect-postgresql
-move app-admin/eselect-python app-eselect/eselect-python
-move app-admin/eselect-rails app-eselect/eselect-rails
-move app-admin/eselect-renpy app-eselect/eselect-renpy
-move app-admin/eselect-ruby app-eselect/eselect-ruby
-move app-admin/eselect-rust app-eselect/eselect-rust
-move app-admin/eselect-sh app-eselect/eselect-sh
-move app-admin/eselect-sndpeek app-eselect/eselect-sndpeek
-move app-admin/eselect-timezone app-eselect/eselect-timezone
-move app-admin/eselect-timidity app-eselect/eselect-timidity
-move app-admin/eselect-unison app-eselect/eselect-unison
-move app-admin/eselect-vdr app-eselect/eselect-vdr
-move app-admin/eselect-vi app-eselect/eselect-vi
-move app-admin/eselect-wxwidgets app-eselect/eselect-wxwidgets
-move app-admin/eselect-xvmc app-eselect/eselect-xvmc
diff --git a/profiles/updates/1Q-2018 b/profiles/updates/1Q-2018
index 7e9994d3a46c..1919388c157a 100644
--- a/profiles/updates/1Q-2018
+++ b/profiles/updates/1Q-2018
@@ -13,7 +13,6 @@ move app-admin/nginx-vts-exporter app-metrics/nginx-vts-exporter
 move app-admin/prom2json app-metrics/prom2json
 move net-analyzer/prometheus app-metrics/prometheus
 move net-analyzer/prometheus-alertmanager app-metrics/alertmanager
-move dev-util/buildbot-prometheus app-metrics/buildbot-prometheus
 move net-analyzer/prometheus-node_exporter app-metrics/node_exporter
 move net-analyzer/prometheus-blackbox_exporter app-metrics/blackbox_exporter
 move net-analyzer/prometheus-snmp_exporter app-metrics/snmp_exporter
diff --git a/profiles/updates/2Q-2015 b/profiles/updates/2Q-2015
deleted file mode 100644
index b17009f42e3c..000000000000
--- a/profiles/updates/2Q-2015
+++ /dev/null
@@ -1,162 +0,0 @@
-move dev-perl/config-general dev-perl/Config-General
-move dev-util/pkgcore-checks dev-util/pkgcheck
-slotmove dev-libs/libdbusmenu 3 0
-move dev-perl/log-dispatch dev-perl/Log-Dispatch
-move dev-libs/extra-cmake-modules kde-frameworks/extra-cmake-modules
-slotmove kde-frameworks/extra-cmake-modules 0 5
-slotmove =dev-lang/scala-2.9* 0 2.9
-slotmove =dev-lang/scala-2.10* 0 2.10
-slotmove =dev-lang/scala-2.11* 0 2.11
-move dev-perl/Cgi-Simple dev-perl/CGI-Simple
-move net-mail/git-mailz dev-vcs/git-mailz
-move dev-perl/extutils-depends dev-perl/ExtUtils-Depends
-move dev-perl/class-returnvalue dev-perl/Class-ReturnValue
-slotmove =dev-ruby/vcr-2.9.3 0 2
-move kde-base/analitza kde-apps/analitza
-move kde-base/ark kde-apps/ark
-move kde-base/artikulate kde-apps/artikulate
-move kde-base/audiocd-kio kde-apps/audiocd-kio
-move kde-base/blinken kde-apps/blinken
-move kde-base/bomber kde-apps/bomber
-move kde-base/bovo kde-apps/bovo
-move kde-base/cantor kde-apps/cantor
-move kde-base/cervisia kde-apps/cervisia
-move kde-base/dolphin kde-apps/dolphin
-move kde-base/dragon kde-apps/dragon
-move kde-base/ffmpegthumbs kde-apps/ffmpegthumbs
-move kde-base/filelight kde-apps/filelight
-move kde-base/granatier kde-apps/granatier
-move kde-base/gwenview kde-apps/gwenview
-move kde-base/juk kde-apps/juk
-move kde-base/kajongg kde-apps/kajongg
-move kde-base/kalgebra kde-apps/kalgebra
-move kde-base/kalzium kde-apps/kalzium
-move kde-base/kamera kde-apps/kamera
-move kde-base/kanagram kde-apps/kanagram
-move kde-base/kapman kde-apps/kapman
-move kde-base/kapptemplate kde-apps/kapptemplate
-move kde-base/kate kde-apps/kate
-move kde-base/katomic kde-apps/katomic
-move kde-base/kblackbox kde-apps/kblackbox
-move kde-base/kblocks kde-apps/kblocks
-move kde-base/kbounce kde-apps/kbounce
-move kde-base/kbreakout kde-apps/kbreakout
-move kde-base/kbruch kde-apps/kbruch
-move kde-base/kcachegrind kde-apps/kcachegrind
-move kde-base/kcalc kde-apps/kcalc
-move kde-base/kcharselect kde-apps/kcharselect
-move kde-base/kcolorchooser kde-apps/kcolorchooser
-move kde-base/kcron kde-apps/kcron
-move kde-base/kdeaccessibility-meta kde-apps/kdeaccessibility-meta
-move kde-base/kdeadmin-meta kde-apps/kdeadmin-meta
-move kde-base/kdebase-meta kde-apps/kdebase-meta
-move kde-base/kde-dev-scripts kde-apps/kde-dev-scripts
-move kde-base/kde-dev-utils kde-apps/kde-dev-utils
-move kde-base/kdeedu-meta kde-apps/kdeedu-meta
-move kde-base/kdegames-meta kde-apps/kdegames-meta
-move kde-base/kdegraphics-meta kde-apps/kdegraphics-meta
-move kde-base/kdegraphics-mobipocket kde-apps/kdegraphics-mobipocket
-move kde-base/kdemultimedia-meta kde-apps/kdemultimedia-meta
-move kde-base/kdenetwork-filesharing kde-apps/kdenetwork-filesharing
-move kde-base/kdenetwork-meta kde-apps/kdenetwork-meta
-move kde-base/kdesdk-kioslaves kde-apps/kdesdk-kioslaves
-move kde-base/kdesdk-meta kde-apps/kdesdk-meta
-move kde-base/kdeutils-meta kde-apps/kdeutils-meta
-move kde-base/kdf kde-apps/kdf
-move kde-base/kdialog kde-apps/kdialog
-move kde-base/kdiamond kde-apps/kdiamond
-move kde-base/keditbookmarks kde-apps/keditbookmarks
-move kde-base/kfind kde-apps/kfind
-move kde-base/kfloppy kde-apps/kfloppy
-move kde-base/kfourinline kde-apps/kfourinline
-move kde-base/kgamma kde-plasma/kgamma
-move kde-base/kgeography kde-apps/kgeography
-move kde-base/kget kde-apps/kget
-move kde-base/kgoldrunner kde-apps/kgoldrunner
-move kde-base/kgpg kde-apps/kgpg
-move kde-base/khangman kde-apps/khangman
-move kde-base/kig kde-apps/kig
-move kde-base/kigo kde-apps/kigo
-move kde-base/killbots kde-apps/killbots
-move kde-base/kimagemapeditor kde-apps/kimagemapeditor
-move kde-base/kiriki kde-apps/kiriki
-move kde-base/kiten kde-apps/kiten
-move kde-base/kjumpingcube kde-apps/kjumpingcube
-move kde-base/klettres kde-apps/klettres
-move kde-base/klickety kde-apps/klickety
-move kde-base/klines kde-apps/klines
-move kde-base/kmag kde-apps/kmag
-move kde-base/kmahjongg kde-apps/kmahjongg
-move kde-base/kmines kde-apps/kmines
-move kde-base/kmix kde-apps/kmix
-move kde-base/kmousetool kde-apps/kmousetool
-move kde-base/kmouth kde-apps/kmouth
-move kde-base/kmplot kde-apps/kmplot
-move kde-base/knavalbattle kde-apps/knavalbattle
-move kde-base/knetwalk kde-apps/knetwalk
-move kde-base/kolf kde-apps/kolf
-move kde-base/kollision kde-apps/kollision
-move kde-base/kolourpaint kde-apps/kolourpaint
-move kde-base/kompare kde-apps/kompare
-move kde-base/konqueror kde-apps/konqueror
-move kde-base/konquest kde-apps/konquest
-move kde-base/konsole kde-apps/konsole
-move kde-base/kopete kde-apps/kopete
-move kde-base/kpat kde-apps/kpat
-move kde-base/kqtquickcharts kde-apps/kqtquickcharts
-move kde-base/krdc kde-apps/krdc
-move kde-base/kreversi kde-apps/kreversi
-move kde-base/krfb kde-apps/krfb
-move kde-base/kruler kde-apps/kruler
-move kde-base/kshisen kde-apps/kshisen
-move kde-base/ksirk kde-apps/ksirk
-move kde-base/ksnakeduel kde-apps/ksnakeduel
-move kde-base/kspaceduel kde-apps/kspaceduel
-move kde-base/ksquares kde-apps/ksquares
-move kde-base/ksudoku kde-apps/ksudoku
-move kde-base/ksystemlog kde-apps/ksystemlog
-move kde-base/kteatime kde-apps/kteatime
-move kde-base/ktimer kde-apps/ktimer
-move kde-base/ktouch kde-apps/ktouch
-move kde-base/ktuberling kde-apps/ktuberling
-move kde-base/kturtle kde-apps/kturtle
-move kde-base/kubrick kde-apps/kubrick
-move kde-base/kwalletmanager kde-apps/kwalletmanager
-move kde-base/kwordquiz kde-apps/kwordquiz
-move kde-base/kwrite kde-apps/kwrite
-move kde-base/libkcddb kde-apps/libkcddb
-move kde-base/libkcompactdisc kde-apps/libkcompactdisc
-move kde-base/libkdcraw kde-apps/libkdcraw
-move kde-base/libkdegames kde-apps/libkdegames
-move kde-base/libkexiv2 kde-apps/libkexiv2
-move kde-base/libkipi kde-apps/libkipi
-move kde-base/libkmahjongg kde-apps/libkmahjongg
-move kde-base/libkomparediff2 kde-apps/libkomparediff2
-move kde-base/libksane kde-apps/libksane
-move kde-base/lokalize kde-apps/lokalize
-move kde-base/lskat kde-apps/lskat
-move kde-base/marble kde-apps/marble
-move kde-base/okular kde-apps/okular
-move kde-base/oxygen-icons kde-frameworks/oxygen-icons
-move kde-base/palapeli kde-apps/palapeli
-move kde-base/parley kde-apps/parley
-move kde-base/picmi kde-apps/picmi
-move kde-base/poxml kde-apps/poxml
-move kde-base/print-manager kde-apps/print-manager
-move kde-base/rocs kde-apps/rocs
-move kde-base/step kde-apps/step
-move kde-base/svgpart kde-apps/svgpart
-move kde-base/sweeper kde-apps/sweeper
-move kde-base/thumbnailers kde-apps/thumbnailers
-move kde-base/umbrello kde-apps/umbrello
-move kde-base/zeroconf-ioslave kde-apps/zeroconf-ioslave
-move dev-db/pygresql dev-python/pygresql
-slotmove =net-libs/phodav-0.4* 0 1.0
-slotmove =net-libs/phodav-2.0* 0 2.0
-slotmove =dev-ruby/temple-0.7.5 0 0.7
-move perl-core/CGI dev-perl/CGI
-move perl-core/Module-Build dev-perl/Module-Build
-move perl-core/Module-Pluggable dev-perl/Module-Pluggable
-move media-gfx/assimp media-libs/assimp
-move kde-plasma/bluez-qt kde-frameworks/bluez-qt
-move dev-java/scala-bin dev-lang/scala-bin
diff --git a/profiles/updates/2Q-2020 b/profiles/updates/2Q-2020
index 53af3e0cc8d4..41f95c93bbee 100644
--- a/profiles/updates/2Q-2020
+++ b/profiles/updates/2Q-2020
@@ -8,3 +8,5 @@ move dev-vcs/cli dev-util/github-cli
 move mail-filter/pypolicyd-spf mail-filter/spf-engine
 move dev-python/mimeparse dev-python/python-mimeparse
 move app-misc/cargo-license dev-util/cargo-license
+move dev-python/argon2_cffi dev-python/argon2-cffi
+move gnome-extra/nautilus-actions gnome-extra/filemanager-actions
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 47f5dbd6f81f..057aff16e7cd 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -555,9 +555,6 @@ app-emulation/libvirt:zfs - Enable ZFS backend storage sys-fs/zfs
 app-emulation/lxc:apparmor - Enable AppArmor support
 app-emulation/lxc:templates - Install old style templates through app-emulation/lxc-templates
 app-emulation/lxc:tools - Build and install additional command line tools
-app-emulation/lxd:daemon - Build the system daemon, not just the client tool
-app-emulation/lxd:dnsmasq - Depend on dnsmasq to provide DHCP and DNS
-app-emulation/lxd:tools - Build and install optional tools
 app-emulation/nemu:network-map - Adds possibility of exporting network map to SVG
 app-emulation/nemu:ovf - Adds support for OVA/OVF import
 app-emulation/nemu:savevm - Adds support for QEMU savevm snapshots (experimental, QEMU must be patched)
@@ -1330,12 +1327,6 @@ dev-cpp/libjson-rpc-cpp:redis-server - Build support for Redis server using dev-
 dev-cpp/libjson-rpc-cpp:stubgen - Build header stub code generator (needed for development and when pregenerated headers are not bundled)
 dev-cpp/sourcetrail:examples - Install example projects.
 dev-db/aerospike-server-community:tools - Install extra tools
-dev-db/clickhouse:client - Build CLI client.
-dev-db/clickhouse:kafka - Enables support for kafka consumer.
-dev-db/clickhouse:mongodb - Enabled support for MongoDB-based dictionaries
-dev-db/clickhouse:server - Build server.
-dev-db/clickhouse:tools - Build various tools, like benchmark, copier, etc.
-dev-db/clickhouse:zookeeper - Enable support for clustering (based on Zookeeper).
 dev-db/etcd:server - Installs etcd daemon
 dev-db/firebird:server - Install the server components of Firebird, not just the client
 dev-db/firebird:xinetd - Install ClassicServer
@@ -1893,6 +1884,7 @@ dev-lang/go:system-bootstrap - Bootstrap using previously installed dev-lang/go
 dev-lang/icon:iplsrc - install the icon programming library source
 dev-lang/janet:static-libs - install janet static library archive, you must enable this flag for using `jpm build`
 dev-lang/jsonnet:custom-optimization - Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)
+dev-lang/julia:system-llvm - (Try to) Use the system LLVM install. YMMV.
 dev-lang/lazarus:minimal - Don't build extra packages from the bigide component
 dev-lang/logtalk:fop - Support for generating pdf documentation using fop
 dev-lang/logtalk:xslt - Support for generating html documentation using xslt
@@ -2404,9 +2396,11 @@ dev-ml/ocaml-cohttp:lwt - Enables support for the dev-ml/lwt cooperative light-w
 dev-ml/ocaml-cstruct:async - Support for asynchronous execution
 dev-ml/ocaml-cstruct:lwt - Enable threads via lwt
 dev-ml/ocaml-cstruct:ppx - Enable the ppx syntax extension
+dev-ml/ocaml-fileutils:ocamlopt - Whether the OCaml native code compiler is used. Must be set globally and match dev-lang/ocaml.
 dev-ml/ocamlnet:httpd - Enables net-httpd web server component
 dev-ml/ocamlnet:zip - Enables netzip support to read/write gzip data using object channels
 dev-ml/pgocaml:camlp4 - Enable PG'Ocaml syntax extension.
+dev-ml/stdlib-shims:ocamlopt - Whether the OCaml native code compiler is used. Must be set globally and match dev-lang/ocaml.
 dev-ml/tyxml:camlp4 - Enables the camlp4 syntax extension (deprecated)
 dev-ml/tyxml:ppx - Enables the ppx syntax extension (preferred)
 dev-ml/uutf:utftrip - Builds and install the utftrip executable: Among other things, reads unicode on stdin and rewrites it on stdout.
@@ -2723,6 +2717,7 @@ dev-qt/qt-docs:serialbus - Install documentation for dev-qt/qtserialbus
 dev-qt/qt-docs:serialport - Install documentation for dev-qt/qtserialport
 dev-qt/qt-docs:speech - Install documentation for dev-qt/qtspeech
 dev-qt/qt-docs:sql - Install documentation for dev-qt/qtsql
+dev-qt/qt-docs:timeline - Install documentation for dev-qt/qtquicktimeline
 dev-qt/qt-docs:virtualkeyboard - Install documentation for dev-qt/qtvirtualkeyboard
 dev-qt/qt-docs:webchannel - Install documentation for dev-qt/qtwebchannel
 dev-qt/qt-docs:webengine - Install documentation for dev-qt/qtwebengine
@@ -2809,6 +2804,7 @@ dev-ruby/ruby-sdl:image - Enable media-libs/sdl-image support
 dev-ruby/ruby-sdl:mixer - Enable media-libs/sdl-mixer support
 dev-ruby/ruby-sdl:sge - Enable sdl-sge support
 dev-ruby/rubygems:server - Install support for the rubygems server
+dev-ruby/vcr:json - Add support for casettes serialized with JSON
 dev-scheme/gauche:mbedtls - Enable support for net-libs/mbedtls
 dev-scheme/gauche-gl:cg - Enable NVidia Cg binding
 dev-scheme/guile:debug-freelist - Include garbage collector freelist debugging code
@@ -3050,7 +3046,6 @@ dev-vcs/git:webdav - Adds support for push'ing to HTTP/HTTPS repositories via DA
 dev-vcs/git-annex:assistant - Enable git-annex assistant and watch command
 dev-vcs/git-annex:benchmark - Enable benchmarking
 dev-vcs/git-annex:concurrentoutput - Use concurrent-output library (experimental)
-dev-vcs/git-annex:magicmime - Use libmagic to determine file MIME types
 dev-vcs/git-annex:network-uri - Get Network.URI from the network-uri package.
 dev-vcs/git-annex:pairing - Enable pairing of git annex repositories
 dev-vcs/git-annex:s3 - Enable Amazon S3 remote
@@ -3420,6 +3415,9 @@ gnome-extra/evolution-data-server:berkdb - sys-libs/db support needed to migrate
 gnome-extra/evolution-data-server:gnome-online-accounts - Enable net-libs/gnome-online-accounts based Google authentication support
 gnome-extra/evolution-data-server:oauth - Enable internal OAuth2 authentication support for Google and Outlook.com. If gnome-online-accounts is enabled and used, this is not necessary, but both can be supported at the same time with different setup at runtime
 gnome-extra/evolution-data-server:weather - Enable optional weather calendar support
+gnome-extra/filemanager-actions:caja - Install the mate-base/caja extension
+gnome-extra/filemanager-actions:nautilus - Install the gnome-base/nautilus extension
+gnome-extra/filemanager-actions:nemo - Install the gnome-extra/nemo extension
 gnome-extra/gnome-color-manager:packagekit - Enable support for the distro-neutral package manager GUI PackageKit
 gnome-extra/gnome-commander:chm - Enable metadata support for Microsoft Compiled HTML Help files
 gnome-extra/gnome-commander:gsf - Add metadata support for OLE, OLE2 and ODF
@@ -4325,7 +4323,6 @@ media-libs/mesa:llvm - Enable LLVM backend for Gallium3D.
 media-libs/mesa:lm-sensors - Enable Gallium HUD lm-sensors support.
 media-libs/mesa:opencl - Enable the Clover Gallium OpenCL state tracker.
 media-libs/mesa:osmesa - Build the Mesa library for off-screen rendering.
-media-libs/mesa:pax_kernel - Enable if the user plans to run the package under a pax enabled hardened kernel
 media-libs/mesa:valgrind - Compile in valgrind memory hints
 media-libs/mesa:vdpau - Enable the VDPAU acceleration interface for the Gallium3D Video Layer.
 media-libs/mesa:vulkan - Enable Vulkan drivers
@@ -4798,12 +4795,14 @@ media-sound/split2flac:flake - Add support for Flake, alternative FLAC encoder
 media-sound/split2flac:mac - Add support for Monkey's Audio files
 media-sound/split2flac:replaygain - Support for Replay Gain metadata, for relative volume adjustment
 media-sound/spotify:pax_kernel - Triggers a paxmarking of the main Spotify binary
+media-sound/spotify:pulseaudio - Constrols the dependency on pulseaudio or apulse
 media-sound/spotify:systray - Pulls in dependencies needed for systray support on some desktop environments
 media-sound/supercollider:emacs - Enable the SCEL user interface
 media-sound/supercollider:gedit - Enable the SCED user interface
 media-sound/supercollider:gpl3 - Build GPL-3 licensed code (recommended)
 media-sound/supercollider:server - Build with internal server
 media-sound/supercollider:vim - Enable the SCVIM user interface
+media-sound/supercollider:webengine - Enable the internal help system using QtWebengine
 media-sound/teamspeak-server:tsdns - Install TeamSpeaks own DNS service for handling multiple virtual servers.
 media-sound/tomahawk:telepathy - Enable support for the real-time communication framework telepathy
 media-sound/traverso:lv2 - Add support for Ladspa V2
@@ -5103,6 +5102,10 @@ media-video/orion:mpv - Use the media-video/mpv player (upstream default)
 media-video/orion:qtav - Use the media-libs/qtav player
 media-video/orion:qtmedia - Use the dev-qt/qtmultimedia
 media-video/peek:keybinder - Enable support for global hotkeys using dev-libs/keybinder
+media-video/pipewire:alsa - Install PipeWire alsa device for playback and record
+media-video/pipewire:jack - Enable SPA JACK plugin and emulation to be able to run JACK applications on top of PipeWire
+media-video/pipewire:pulseaudio - Enable emulation to be able to run PulseAudio applications on top of PipeWire
+media-video/pipewire:vulkan - Enable vulkan spa plugin integration
 media-video/qmplay2:audiofilters - Build with AudioFilters module
 media-video/qmplay2:avdevice - Build FFmpeg module with libavdevice suport
 media-video/qmplay2:avresample - Use libavresample instead of libswresample
@@ -5593,6 +5596,7 @@ net-dns/pdns:remote - Use a generic socket or pipe as a backend (via JSON RPC re
 net-dns/pdns:sodium - Use dev-libs/libsodium for cryptography
 net-dns/pdns:tinydns - Use a TinyDNS CDB database as backend.
 net-dns/pdns:tools - Build optional tools (dnsscan, dnsscope, etc..).
+net-dns/pdns-recursor:dnstap - Enable support for dnstap
 net-dns/pdns-recursor:protobuf - Enable support for dev-libs/protobuf.
 net-dns/pdns-recursor:sodium - Use dev-libs/libsodium for cryptography
 net-dns/pdnsd:isdn - Linux-only: check status of ippp interfaces with ISDN-specific system calls.
@@ -6180,7 +6184,6 @@ net-libs/webkit-gtk:webgl - Build support for the WebGL HTML API using virtual/o
 net-libs/wvstreams:boost - Use dev-libs/boost to provide TR1-compatible functional interface. This USE flag is only needed with GCC earlier than version 4.1, or with other compilares not providing said interface.
 net-libs/xrootd:fuse - Enable the sys-fs/fuse filesystem driver
 net-libs/xrootd:http - Enable http protocol support
-net-libs/xrootd:rbd - Enable rados block device support via sys-cluster/ceph
 net-libs/zeromq:drafts - Build draft API, which may change at any time without any notice, and is therefore not recommended for normal use.
 net-libs/zeromq:pgm - Build PGM (Pragmatic General Multicast)extention, a protocol for reliable multicast transport of data over IP networks.
 net-libs/zeromq:sodium - Use dev-libs/libsodium for cryptography
@@ -6725,6 +6728,7 @@ net-nds/389-ds-base:pam-passthru - Enable pam-passthru plugin - for simple and f
 net-nds/389-ds-base:presence - Enable presence plugin - non-standard syntax validation
 net-nds/ldapvi:gnutls - Use net-libs/gnutls instead of dev-libs/openssl
 net-nds/nsscache:nsscache - Depend on sys-auth/libnss-cache to handle flat files
+net-nds/nsscache:s3 - Support for S3-based NSS sources
 net-nds/openldap:experimental - Enable experimental backend options
 net-nds/openldap:kinit - Enable support for kerberos init
 net-nds/openldap:minimal - Build libraries & userspace tools only. Does not install any server code
@@ -6829,11 +6833,8 @@ net-p2p/xmr-stak-rx:cuda - Enable NVIDIA CUDA toolkit support
 net-p2p/xmr-stak-rx:hwloc - Enable CPU affinity support via hwloc
 net-p2p/xmr-stak-rx:opencl - Enable OpenCL support
 net-p2p/xmr-stak-rx:webserver - Enable internal webserver
-net-print/cups:java - Add support for the Java interpeter in the web server CGIs.
 net-print/cups:lprng-compat - Do not install lp... binaries so cups and lprng can coexist.
-net-print/cups:python - Add support for the Python interpeter in the web server CGIs.
 net-print/cups-filters:foomatic - Build the included foomatic-rip printer driver. Strongly recommended.
-net-print/cups-filters:ipp_autosetup - Let cups-browsed automatically set up IPP network printers by default.
 net-print/cups-filters:pclm - Enable PCLm support
 net-print/dymo-cups-drivers:usb_modeswitch - Include usb_modeswitch for some hardware (bug #601242)
 net-print/fax4cups:efax - Install net-misc/efax backend
@@ -7104,10 +7105,14 @@ net-wireless/uhd:usrp1 - support USRP1 hardware
 net-wireless/uhd:usrp2 - support USRP2, N200, N210 hardware
 net-wireless/uhd:utils - utilities needed to list, query, calibrate, or update FPGA/Firmware
 net-wireless/uhd:x300 - support X300, X310 hardware
+net-wireless/urh:airspy - use native backend which directly uses net-wireless/airspy
+net-wireless/urh:audio - use a soundcard instead of an sdr
 net-wireless/urh:bladerf - use native backend which directly uses net-wireless/bladerf
 net-wireless/urh:hackrf - use native backend which directly uses net-libs/libhackrf
+net-wireless/urh:limesdr - use native backend which directly uses net-wireless/limesuite
 net-wireless/urh:plutosdr - use native backend which directly uses net-libs/libiio
 net-wireless/urh:rtlsdr - use native backend which directly uses net-wireless/rtl-sdr
+net-wireless/urh:sdrplay - use native backend which directly uses net-wireless/sdrplay
 net-wireless/urh:uhd - use native backend which directly uses net-wireless/uhd
 net-wireless/wepattack:john - Build with app-crypt/johntheripper support
 net-wireless/wireless-tools:multicall - Build the most commonly used tools as one binary
@@ -8298,6 +8303,7 @@ sys-devel/gcc:vtv - Build support for virtual table verification (a C++ hardenin
 sys-devel/gcc-apple:bootstrap - !DO NOT SET THIS FLAG YOURSELF! avoids need for autoconf during bootstrap stage2
 sys-devel/gcc-apple:objc - Build support for the Objective C code language
 sys-devel/gcc-apple:objc++ - Build support for the Objective C++ language
+sys-devel/gcc-config:cc-wrappers - Install and manage 'cc' and 'f77' wrappers in /usr/bin. Otherwise ignore them.
 sys-devel/gcc-config:native-symlinks - Install native symlinks like 'gcc' or 'g++' to /usr/bin. Otherwise keep only ${CTARGET}-gcc and friends.
 sys-devel/gdb:client - Install the main "gdb" program (most people want this)
 sys-devel/gdb:lzma - Support lzma compression in ELF debug info
@@ -8700,6 +8706,8 @@ www-apps/wordpress:themes - Installs themes (including default theme)
 www-client/chromium:closure-compile - Enable closure type-checking for Chrome's web technology-based UI. Requires Java.
 www-client/chromium:component-build - Split build into more shared libraries to speed up linking. Mostly intended for debugging and development, NOT RECOMMENDED for general use.
 www-client/chromium:hangouts - Enable support for Google Hangouts features such as screen sharing
+www-client/chromium:headless - Build Ozone only with headless backend, NOT RECOMMENDED for general use.
+www-client/chromium:ozone - Enable Ozone platform abstraction layer with X11 backend.
 www-client/chromium:pic - Disable optimized assembly code that is not PIC friendly
 www-client/chromium:proprietary-codecs - Enable proprietary codecs like H.264, MP3
 www-client/chromium:suid - Build the SUID sandbox, which is only needed on CONFIG_USER_NS=n kernels
@@ -8707,6 +8715,7 @@ www-client/chromium:system-ffmpeg - Use system ffmpeg instead of the bundled one
 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:wayland - Enable Wayland backend for Ozone.
 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
@@ -8750,7 +8759,6 @@ www-client/netsurf:bmp - BMP bitmap image support (media-libs/libnsbmp)
 www-client/netsurf:duktape - Use duktape.org javascript engine
 www-client/netsurf:gtk - Build GTK3 GUI
 www-client/netsurf:gtk2 - Build GTK2 GUI
-www-client/netsurf:pdf-writer - PDF output support (media-libs/libharu)
 www-client/netsurf:psl - Use public suffix list via media-libs/libnspsl
 www-client/netsurf:rosprite - RISC OS Sprite bitmap image support (media-libs/librosprite)
 www-client/netsurf:svgtiny - SVG image support via media-libs/svgatiny instead of gnome-base/librsvg
@@ -8994,7 +9002,9 @@ x11-misc/xmobar:mpd - Support mpd plugin
 x11-misc/xmobar:mpris - Enables MPRIS v1, v2 support
 x11-misc/xmobar:timezone - Enables localized date support
 x11-misc/xmobar:uvmeter - Plugin to show UV data for Australia.
+x11-misc/xscreensaver:gdk-pixbuf - Include support for the x11-libs/gdk-pixbuf library in some demos, which will make it possible for them to read GIF, JPEG, and PNG files as well
 x11-misc/xscreensaver:gdm - Use gdmflexiserver from gnome-base/gdm instead of x11-misc/lightdm
+x11-misc/xscreensaver:locking - Compile in support for locking the display
 x11-misc/xscreensaver:new-login - Enable user switching support using gdmflexiserver (x11-misc/lightdm)
 x11-misc/xsr:cursor - Capture mouse cursor using x11-misc/xdotool, and place them on the screenshots using media-gfx/imagemagick
 x11-misc/xss-lock:man - Build and install man pages
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 75f38829bccf..886be2b788ea 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 9e53dd73d3c6..4ffd101004aa 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -6,5 +6,5 @@ DIST stars_8_2v0_1.cat 559068934 BLAKE2B c040a369cdf6885759998e1315b554d21a5e2b9
 DIST stellarium-0.19.3.tar.gz 326218851 BLAKE2B 286d2559a2152f030640ed88778f57f1213d0d8b9e990d0aa1ad5138396fe9641083ec76554e1296dc79d914955e289d23046af42299df6217bbfbaca76b2f18 SHA512 c2948603a3b84fd2b7002cbd9993a2432ca0908d9236aca03c03ff0cf0706728a407218096e94da2b2a623b5434c109906d94ee5069a2d57a8e35af7c8455ff7
 DIST stellarium-0.20.1.tar.gz 343991703 BLAKE2B 59580dd2bca885893bfc68faaf966a727e3d7c0774f59726e23cec132cbfca4ae518983db2e52d4d3d3f1ec96c7ce876168bb23959178ebf212ee6bb357299b3 SHA512 685a306391dc681cc21834a226e35c769e11909f625ff7461d7e896ba412ad595871e93c69981b342099f46829f9f3ef3e276be867dc5ea5523fa60a99cc21d1
 EBUILD stellarium-0.19.3.ebuild 2232 BLAKE2B c1361b4194d0f838fa3b46f79854ec77ab415fad392c6b0ad19c77f9a7bf8f965101c2526c8b88e72d9b5c4cdc8f4795b588ea025887f0ad0f6444d1d33cabe5 SHA512 469ed98be0cd3637c5b77b22e81db860cfe503c03b60c414e7ee9ca63bf9ca2fa63d6eac68163052b13b2cbedede72ac9c85ed5f09c4ed0d02e4bc8a339022af
-EBUILD stellarium-0.20.1.ebuild 2236 BLAKE2B 83d3d63e8046e0abaa596e51e79607aa695b789119720e68bad42f307490a2b3413e620d397c4a0ee1dab4f9a7cdfba686219536744211771939633893bc72dd SHA512 a79c2d1e0c3c5f60447eafd1a232c07938215a7525f98579e2d1927336f28d51622f2933b2f72c76fdd6976b98d5d62250306e7babeba590c2195f248f37cb6d
+EBUILD stellarium-0.20.1.ebuild 2233 BLAKE2B 9e5228c4a7ef23f2382ba71d02bac61fbbe995f07f49a26d4621ed0cfad22271289a05811c4662cb1a35e38aa047e9186143396e1c472652031aa4b4720b8564 SHA512 911ad306134ec38383580d9e677faae00cfca79824f98d3db046cee9bd84339d5fed0cebf969e7efd6d00e0c18fd6803db96f233f76621760ac5f01ab2404ba5
 MISC metadata.xml 1004 BLAKE2B f5e3c9d2641b2cededfb9ac848a72acbe0949d5fec6bba73dcce51fcfb2f83e711e5036d2d7a4be6dad6bd357e2a243776ba185c572e655e6c0fc00321d16453 SHA512 9da973b4a8b3ca85c19b9f0a07f21b625f28ce242de061a2ef2c14c8f36f7ce58b335abc82ac9e639fba1b72c6a513bc886df42ed961c8a711f7205d5333c05d
diff --git a/sci-astronomy/stellarium/stellarium-0.20.1.ebuild b/sci-astronomy/stellarium/stellarium-0.20.1.ebuild
index 6be1804cb2f4..616eeba408b1 100644
--- a/sci-astronomy/stellarium/stellarium-0.20.1.ebuild
+++ b/sci-astronomy/stellarium/stellarium-0.20.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug gps media nls stars test"
 
 BDEPEND="
diff --git a/sci-astronomy/wcslib/Manifest b/sci-astronomy/wcslib/Manifest
index 0e0016d1f821..658f874083c2 100644
--- a/sci-astronomy/wcslib/Manifest
+++ b/sci-astronomy/wcslib/Manifest
@@ -1,3 +1,3 @@
 DIST wcslib-5.16.tar.bz2 2222111 BLAKE2B e11da145db6366804321cf415bdac621a930418f09d788c8b94413980710bb43357129a830462339127398082700a9f44f56dc0b8c96ef923d41ea0174dfd07f SHA512 bf7ab586995bdade8b96c77dee891c7d7ab6de82a7e2f94a09d89643e93658063f832efdb66e0bba11ad114b6e0ca555cba9308a84f0f22fb833e3a6303cefe6
-EBUILD wcslib-5.16.ebuild 1627 BLAKE2B 82f6bbaef8adc5dd93dbdbed3694df63d912d90d27110f6e3b3d94b9f70e92db79f6d06df6f1ed410ed02eca6422f5456d7c6d1a94d3e7af8829b7b9faf5910f SHA512 81b766004f58c9ae95d98b70e152e0284948888102b714ea3b1dcb9b5189b25da50257d6a0d21044e425ed6df81b642d3a01e71145c6ab0d62f51748b96c55f3
+EBUILD wcslib-5.16.ebuild 1628 BLAKE2B a782f5f8bfcca41cc1e841debfad393473873cb8b450443d0013d2ed74ae5761b8b9a16a7c30e9d578730d5689b2f15233dc13dea8217312c5e09fbba8bef953 SHA512 d4eaad7b56a6982fcc7dc6e33da27b1a6f2216a4b0c7a85bd328951c95c464000d5464625c74dbdeb356802957741010834a992a8dc7d710c398fcc4b11e6dc5
 MISC metadata.xml 976 BLAKE2B 7507ba6725d4a27888d6bc57c2e6c10bcb4a2bd06a2809228423b40009aa1fbef15303cb8a78a510cca5771f3d7cd3b59501751a0969990130d297fe6b1d7312 SHA512 cd4bc1614ea120e04ced965a92fdd343db9e4d1a6046b57efd503674547cfa45ce6a03bb3a2d34a472dccd885d598cbf3cd3d9d9fe182a2fc067a801e8eb9577
diff --git a/sci-astronomy/wcslib/wcslib-5.16.ebuild b/sci-astronomy/wcslib/wcslib-5.16.ebuild
index 31cf8e9f6f92..a82492d1c42e 100644
--- a/sci-astronomy/wcslib/wcslib-5.16.ebuild
+++ b/sci-astronomy/wcslib/wcslib-5.16.ebuild
@@ -8,7 +8,7 @@ FORTRAN_NEEDED=fortran
 inherit fortran-2
 
 DESCRIPTION="Astronomical World Coordinate System transformations library"
-HOMEPAGE="http://www.atnf.csiro.au/people/mcalabre/WCS/"
+HOMEPAGE="https://www.atnf.csiro.au/people/mcalabre/WCS/"
 SRC_URI="ftp://ftp.atnf.csiro.au/pub/software/${PN}/${P}.tar.bz2"
 
 SLOT="0/5"
diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index 81993963acb7..e6da050cedc7 100644
--- a/sci-biology/Manifest.gz
+++ b/sci-biology/Manifest.gz
diff --git a/sci-biology/abyss/Manifest b/sci-biology/abyss/Manifest
index b482298f23a1..bc1d45a744ea 100644
--- a/sci-biology/abyss/Manifest
+++ b/sci-biology/abyss/Manifest
@@ -1,4 +1,4 @@
 AUX abyss-2.0.3-prog-AR.patch 350 BLAKE2B 20e1a428ea02c3c67c5df9b92f623ddea58f2054912d0ca788f0a9890057277cd98babe48d089852541db262ab0a69e95ead2a4b31456a62597ae1d4856e8c5e SHA512 747e9d258767c698a95615ae83db18662ec1851c0a6dfcdcec6aea68dc76415e89b3f85f1f8ff6c04fff22052c787a43948f8f3588220e2dc66cc7262788c52a
 DIST abyss-2.0.3.tar.gz 1049144 BLAKE2B 1a320cac735747225723f0d636af435ffcac9efb3273323150f258c0f4c27ed81bb104cb06a726aa664118cc9d2224b745d9deebfcac055face01dae3fc9de15 SHA512 15bc833e89839be89dfa35a23ae22ad0f9a19e8efd36211010c9f59e974de7c569576db36e26d6ab302543ff427604b5efb1b7badf62489a5e82a193ef155570
-EBUILD abyss-2.0.3-r1.ebuild 1555 BLAKE2B 113efb423e315a0b4abf19b8a75326a90f8da5b88db1d0a5bd5485d6eead927dc7b72398452a0794edf5ec9a2c0dffabf6fe4f15aaa66f48c7cc5e2ca9615c29 SHA512 0ec8921c93ad555f35135f707ae4b71f1e0640e82d81e96a966df755313463c8ddf68991e7602435d5d762ddda8ec5ebc4763bed674985b5cd2cfaefc729a744
+EBUILD abyss-2.0.3-r2.ebuild 1556 BLAKE2B a25f93323564ce83b2a15ed31881a873ddafe688f9277439aef25dbb3a76c6d796984105498c2f547bf00229ce4c465d9e5c22c949c543b29fd61c22a8d52568 SHA512 9c5649115d97c8b6aee3909d092f8429c59c31b9200b71023bb05e3bc2501c3f55a1d4b07c9bacbfd94fc6a10a4a5124a6135b743e29d126856796bab5ea1f3f
 MISC metadata.xml 572 BLAKE2B 987284bc0e435174f2592854cf67e44d155b64975a65d69fc988352f9bf0c06bfa412bcbba0e3a5a4819a846d5fd1c5695627b8b75ab7c955abff1b0bb4ad76e SHA512 b7461a55a1f34d22b8faceb40c15f66d7564a5fd3ccd626533972f25fcca36f8ce47e7edc5e96e7eab6c9bfc27ac4e094b419c241b7cc4de051025e1a9522198
diff --git a/sci-biology/abyss/abyss-2.0.3-r1.ebuild b/sci-biology/abyss/abyss-2.0.3-r1.ebuild
deleted file mode 100644
index 800a45964cd0..000000000000
--- a/sci-biology/abyss/abyss-2.0.3-r1.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
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Assembly By Short Sequences - a de novo, parallel, paired-end sequence assembler"
-HOMEPAGE="http://www.bcgsc.ca/platform/bioinfo/software/abyss/"
-SRC_URI="https://github.com/bcgsc/abyss/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="abyss"
-SLOT="0"
-IUSE="+mpi openmp misc-haskell"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-cpp/sparsehash
-	dev-libs/boost:=
-	misc-haskell? (
-		dev-libs/gmp:0=
-		virtual/libffi:0=
-	)
-	mpi? ( sys-cluster/openmpi )"
-DEPEND="${RDEPEND}
-	misc-haskell? (
-		dev-lang/ghc
-	)"
-
-PATCHES=("${FILESDIR}"/${PN}-2.0.3-prog-AR.patch)
-
-# GHC uses it's own native code generator. Portage's
-# QA check generates false positive because it assumes
-# presence of GCC-specific sections.
-#
-# Workaround false positiove by disabling the check completely.
-# bug #677600
-QA_FLAGS_IGNORED='/usr/bin/abyss-samtobreak'
-
-# todo: --enable-maxk=N configure option
-# todo: fix automagic mpi toggling
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/-Werror//" configure.ac || die #365195
-	sed -i -e "/dist_pkgdoc_DATA/d" Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	# disable building haskell tool Misc/samtobreak
-	# unless request by user: bug #534412
-	use misc-haskell || export ac_cv_prog_ac_ct_GHC=
-
-	econf $(use_enable openmp)
-}
diff --git a/sci-biology/abyss/abyss-2.0.3-r2.ebuild b/sci-biology/abyss/abyss-2.0.3-r2.ebuild
new file mode 100644
index 000000000000..b9aed09d3eec
--- /dev/null
+++ b/sci-biology/abyss/abyss-2.0.3-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Assembly By Short Sequences - a de novo, parallel, paired-end sequence assembler"
+HOMEPAGE="http://www.bcgsc.ca/platform/bioinfo/software/abyss/"
+SRC_URI="https://github.com/bcgsc/abyss/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="abyss"
+SLOT="0"
+IUSE="+mpi openmp misc-haskell"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-cpp/sparsehash
+	dev-libs/boost:=
+	misc-haskell? (
+		dev-libs/gmp:0=
+		dev-libs/libffi:0=
+	)
+	mpi? ( sys-cluster/openmpi )"
+DEPEND="${RDEPEND}
+	misc-haskell? (
+		dev-lang/ghc
+	)"
+
+PATCHES=("${FILESDIR}"/${PN}-2.0.3-prog-AR.patch)
+
+# GHC uses it's own native code generator. Portage's
+# QA check generates false positive because it assumes
+# presence of GCC-specific sections.
+#
+# Workaround false positiove by disabling the check completely.
+# bug #677600
+QA_FLAGS_IGNORED='/usr/bin/abyss-samtobreak'
+
+# todo: --enable-maxk=N configure option
+# todo: fix automagic mpi toggling
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/-Werror//" configure.ac || die #365195
+	sed -i -e "/dist_pkgdoc_DATA/d" Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	# disable building haskell tool Misc/samtobreak
+	# unless request by user: bug #534412
+	use misc-haskell || export ac_cv_prog_ac_ct_GHC=
+
+	econf $(use_enable openmp)
+}
diff --git a/sci-biology/infernal/Manifest b/sci-biology/infernal/Manifest
index a83edfa3624a..54dff0d8887c 100644
--- a/sci-biology/infernal/Manifest
+++ b/sci-biology/infernal/Manifest
@@ -1,8 +1,6 @@
-AUX infernal-1.0.2-ldflags.patch 444 BLAKE2B 287cac3afc2898d51e5dbf82b64e793dc5decfa134365e91f1ea599df63ca736ec979063a64f2ff3a52bd5213a836a0f2b9875b5142c4a8245403261d5b382b1 SHA512 95f953bbf57a78f40df51bbfdab62e715905aa2bc57d4ca75e380c81d34c88d0177e6fe51933c908bf6e6f513b8c38ffeeb7c8f1802773c7c9773a36388b81d0
+AUX infernal-1.0.2-fix-build-system.patch 3142 BLAKE2B e5869c089b158cb8c22bff849e2a6c22a01d485f53b0da61c662cac51bb04e3cbfb2a8af9c71ac225760676f20db2f34c12fb674eac71ab995c3dbcfc7d9658e SHA512 4013676d6e79075fc0d31aa73effbdff8d391c122e5d168c93ed007c24f555a5f8c5e225461d074855b814e2c7d19ef1b804c3d82e5e5c018259e2907f2e168e
 AUX infernal-1.0.2-overflows.patch 540 BLAKE2B 1336442c3d1ef8a78d5d7a345bbbc3abf918d6edb0cef8fddcac32b9ece9f990464b3815592f564a05494a8b7c5c75e438349c384c29caa73c467e40f737db45 SHA512 c8bafb2c10d09cae24f882d5238b6ae974669d59e0ee583bcedb13e81c88ea9859c1f78343d5be91a5cca05a3dc07ffe6436b33e201a46baf349795da5eec906
-AUX infernal-1.0.2-parallel-build.patch 659 BLAKE2B ab11ef5e62268818d9cf4a871c82931ac85c564c3990fc06a4f74d8f826f4bda16150bde790681ac416ba40e0fc2cef9331942d30b25249a11a58434d56935e6 SHA512 d67271d858f60a5378d61892cd5c354ac95234620437621f3bf770e8829fa866a451ee031f530f502385044d7622f0fe88827614e95ab35ac6cbf8384d21e9c5
 AUX infernal-1.0.2-perl-5.16-2.patch 4206 BLAKE2B eb4309d31e874f395d20bded4c132fb8b811fe17b4af5c95bd56ade05e22e7bf45c08e67884ca339aa7a2e13b2ddc9bb9527cbddef9458ce8fe05b7bd4707e49 SHA512 9784f31c18f6c53b15c0454d3a41db27c3f433ac3d3030bc113e9f9e8194fb51109de5055d038a3c639b1c4142d6fd0010825df484a857c9f072f43d8cadcb44
-AUX infernal-1.0.2-respect-DESTDIR.patch 396 BLAKE2B 822a6c543c0ad0a0ff75cc3fd50c4bbb84791cadcd4a93ad1a498b7464562dd00eea7424324f1bf715802c0dc9824dced0d16bd76d65ba9b7886b536b32fb988 SHA512 6847c87e45a34a68d179fbf8c9965af502cc9e52aa1f5ed800332dfb52e97ca3f2cb87a7dc4c3adb2d85f63567f15b084a50c7139f5ab03b0cf2b0711d023ec4
 DIST infernal-1.0.2.tar.gz 15205421 BLAKE2B 3570ae42feb96ead383c2f1c09d34b4719ae0a5ae8fa973fd02f9ea6e8935c81ab49c7db21dad2e20c1ae6ab6fb9514f12704bbf5917f15f6582effae480312f SHA512 0399be14c17f053574e95d8c5b9eaf990545795a9268e20f0940e11a8e78fc49beb4b23994e9ea427764fbb29e9b39f6da9cb1d85eb4b56d354057b48515c4af
-EBUILD infernal-1.0.2-r1.ebuild 924 BLAKE2B 8a1af66f6ea82e8232d052d5361384a1082569344bf642b3e29b6f2d46dd1889c5780f3617e4d514857da013ec117e55cefa135aeb58587217746902da81b139 SHA512 816308be6a7e57e30f7c22e0c37662cde9b234501e324889e7e21e4d0e779cc6bb113490f10ce1aba3aeff46bdf9668442878e3cea4d5ad171beeb0e9fe6832c
+EBUILD infernal-1.0.2-r1.ebuild 886 BLAKE2B 8f82a57ed31081abb50ee798ad80f3de5b7db8dbc3a3428b150de486834fae52253d9765d27a19276cbd79daf9a522c52733caf7a1ed824064932dbae3ade282 SHA512 af5e2dd5822150faa278e4160e41696a322deec3ac97e3df0cc100a1b8cebc929c747235a051ac86afed0269812f10dfb005160a56b49703aa67376064c49ad1
 MISC metadata.xml 267 BLAKE2B 7cf386952842945148119de3263231db4d1046d5f54811f7e303ed8ec4d27cbc1960b99c92daf6f32e5b981c2fb9f50ec666be6193865d6e18541b7427a152a9 SHA512 91ab266d9ab24401bc0fec759c5b6cfcf44a3c5669fc31c7301d79770839bb5dfa0e155d949392ef06176b4a0b2c32b91b1b54b0027f972db61f0a5e54644403
diff --git a/sci-biology/infernal/files/infernal-1.0.2-fix-build-system.patch b/sci-biology/infernal/files/infernal-1.0.2-fix-build-system.patch
new file mode 100644
index 000000000000..41ab3103594b
--- /dev/null
+++ b/sci-biology/infernal/files/infernal-1.0.2-fix-build-system.patch
@@ -0,0 +1,135 @@
+* Fix parallel build
+* Respect AR
+* Respect DESTDIR
+* Respect LDFLAGS
+
+--- a/easel/Makefile.in
++++ b/easel/Makefile.in
+@@ -17,7 +17,6 @@
+ #
+ CC       = @CC@
+ CFLAGS   = @CFLAGS@
+-AR       = @AR@ rcv
+ LN       = ln
+ RANLIB   = @RANLIB@
+ LDFLAGS  = -static @LDFLAGS@
+@@ -132,13 +131,13 @@
+ 	esl_wuss.o
+ 
+ all: libeasel.a
+-	(cd miniapps; make)
++	$(MAKE) -C miniapps
+ 
+ .c.o: 
+ 	${CC} -I. ${CFLAGS} ${SIMDFLAGS} ${DEFS} -c $<		
+ 
+ libeasel.a: $(OBJS)
+-	$(AR) libeasel.a $(OBJS)
++	$(AR) rcv libeasel.a $(OBJS)
+ 	$(RANLIB) libeasel.a
+ 	chmod 644 libeasel.a
+ 
+--- a/easel/testsuite/Makefile.in
++++ b/easel/testsuite/Makefile.in
+@@ -15,7 +15,6 @@
+ LIBS     = @LIBGSL@ @LIBS@ -lm
+ MPILIBS  = @MPILIBS@
+ 
+-AR      = @AR@ rcv
+ RANLIB  = @RANLIB@
+ 
+ ESLDIR = ..
+--- a/iinfernal-1/Makefile.in
++++ b/iinfernal-1/Makefile.in
+@@ -20,7 +20,6 @@
+ #  only used for building the testsuite anyway... e.g. we
+ #  make a "libhmmer.a" library for building the testsuite.
+ #
+-AR     = @AR@ rcv 
+ RANLIB = @RANLIB@
+ 
+ MPILIBS   = @MPILIBS@
+@@ -63,7 +62,7 @@
+ module: libinfernal.a
+ 
+ libinfernal.a: $(OBJS) 
+-	$(AR) libinfernal.a $(OBJS) 
++	$(AR) rcv libinfernal.a $(OBJS) 
+ 	$(RANLIB) libinfernal.a
+ 	chmod 644 libinfernal.a
+ 
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -82,9 +82,10 @@
+ all: core 
+ 
+ core:
+-	(cd easel;     make CC="$(CC)" CFLAGS="$(CFLAGS)"; make)
+-	(cd src;       make CC="$(CC)" CFLAGS="$(CFLAGS)"; make module)
+-	(cd testsuite; make CC="$(CC)" CFLAGS="$(CFLAGS)")
++	$(MAKE) -C easel
++	$(MAKE) -C src 
++	$(MAKE) -C src module
++	$(MAKE) -C testsuite
+ 
+ #.PHONY: $(RIGFILTERS)
+ #$(RIGFILTERS): core
+@@ -202,9 +203,9 @@
+ # "make install" installs the programs in BINDIR
+ #
+ install:
+-	mkdir -p ${BINDIR}
++	mkdir -p $(DESTDIR)${BINDIR}
+ 	for file in $(PROGS); do\
+-		cp src/$$file $(BINDIR)/;\
++		cp src/$$file $(DESTDIR)$(BINDIR)/;\
+ 	done
+ #	if test -d $(RIGFILTERS); then\
+ #	   for file in $(RFPROGS); do\
+--- a/rigfilters/cfsqp/Makefile.in
++++ b/rigfilters/cfsqp/Makefile.in
+@@ -24,7 +24,6 @@
+ ## archiving command, and ranlib command.
+ # these are used to create the libcfsqp.a library, necessary for cm2hmm
+ #
+-AR     = @AR@ rcv 
+ RANLIB = @RANLIB@
+ 
+ OBJS  = cfsqp.o\
+@@ -41,7 +40,7 @@
+ all: libcfsqp.a
+ 
+ libcfsqp.a: $(OBJS) ${HDRS}
+-	$(AR) libcfsqp.a $(OBJS) 
++	$(AR) rcv libcfsqp.a $(OBJS)
+ 	$(RANLIB) libcfsqp.a
+ 	chmod 644 libcfsqp.a
+ 
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -27,7 +27,6 @@
+ #  only used for building the testsuite anyway... e.g. we
+ #  make a "libinfernal.a" library for building the testsuite.
+ #
+-AR     = @AR@ rcv 
+ RANLIB = @RANLIB@
+ 
+ # configuration for optional MPI functionality
+@@ -86,7 +85,7 @@
+ all: 	$(PROGS) 
+ 
+ $(PROGS): @EXEC_DEPENDENCY@ $(OBJS) ${HDRS}
+-	$(CC) $(CFLAGS) $(DEFS) $(MYLIBDIR) -o $@ $@.o $(OBJS) $(MYLIBS) $(LIBS) $(MPILIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) $(MYLIBDIR) -o $@ $@.o $(OBJS) $(MYLIBS) $(LIBS) $(MPILIBS)
+ 
+ 
+ #################################################################
+@@ -95,7 +94,7 @@
+ module: libinfernal.a
+ 
+ libinfernal.a: $(OBJS) ${HDRS}
+-	$(AR) libinfernal.a $(OBJS) 
++	$(AR) rcv libinfernal.a $(OBJS)
+ 	$(RANLIB) libinfernal.a
+ 	chmod 644 libinfernal.a
+ 
diff --git a/sci-biology/infernal/files/infernal-1.0.2-ldflags.patch b/sci-biology/infernal/files/infernal-1.0.2-ldflags.patch
deleted file mode 100644
index f688dce152ed..000000000000
--- a/sci-biology/infernal/files/infernal-1.0.2-ldflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Respect LDFLAGS
-
-http://bugs.gentoo.org/show_bug.cgi?id=338177
-
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -86,7 +86,7 @@
- all: 	$(PROGS) 
- 
- $(PROGS): @EXEC_DEPENDENCY@ $(OBJS) ${HDRS}
--	$(CC) $(CFLAGS) $(DEFS) $(MYLIBDIR) -o $@ $@.o $(OBJS) $(MYLIBS) $(LIBS) $(MPILIBS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) $(MYLIBDIR) -o $@ $@.o $(OBJS) $(MYLIBS) $(LIBS) $(MPILIBS)
- 
- 
- #################################################################
diff --git a/sci-biology/infernal/files/infernal-1.0.2-parallel-build.patch b/sci-biology/infernal/files/infernal-1.0.2-parallel-build.patch
deleted file mode 100644
index 67ffa6fda7f6..000000000000
--- a/sci-biology/infernal/files/infernal-1.0.2-parallel-build.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Fix parallel build 
-
-http://bugs.gentoo.org/show_bug.cgi?id=311919
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -82,9 +82,10 @@
- all: core 
- 
- core:
--	(cd easel;     make CC="$(CC)" CFLAGS="$(CFLAGS)"; make)
--	(cd src;       make CC="$(CC)" CFLAGS="$(CFLAGS)"; make module)
--	(cd testsuite; make CC="$(CC)" CFLAGS="$(CFLAGS)")
-+	$(MAKE) -C easel
-+	$(MAKE) -C src 
-+	$(MAKE) -C src module
-+	$(MAKE) -C testsuite
- 
- #.PHONY: $(RIGFILTERS)
- #$(RIGFILTERS): core
---- a/easel/Makefile.in
-+++ b/easel/Makefile.in
-@@ -132,7 +132,7 @@
- 	esl_wuss.o
- 
- all: libeasel.a
--	(cd miniapps; make)
-+	$(MAKE) -C miniapps
- 
- .c.o: 
- 	${CC} -I. ${CFLAGS} ${SIMDFLAGS} ${DEFS} -c $<		
diff --git a/sci-biology/infernal/files/infernal-1.0.2-respect-DESTDIR.patch b/sci-biology/infernal/files/infernal-1.0.2-respect-DESTDIR.patch
deleted file mode 100644
index ea465e592ffa..000000000000
--- a/sci-biology/infernal/files/infernal-1.0.2-respect-DESTDIR.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Build system does not respect DESTDIR by default.
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -203,9 +203,9 @@
- # "make install" installs the programs in BINDIR
- #
- install:
--	mkdir -p ${BINDIR}
-+	mkdir -p $(DESTDIR)${BINDIR}
- 	for file in $(PROGS); do\
--		cp src/$$file $(BINDIR)/;\
-+		cp src/$$file $(DESTDIR)$(BINDIR)/;\
- 	done
- #	if test -d $(RIGFILTERS); then\
- #	   for file in $(RFPROGS); do\
diff --git a/sci-biology/infernal/infernal-1.0.2-r1.ebuild b/sci-biology/infernal/infernal-1.0.2-r1.ebuild
index e906c23024ff..2e96418b6bb9 100644
--- a/sci-biology/infernal/infernal-1.0.2-r1.ebuild
+++ b/sci-biology/infernal/infernal-1.0.2-r1.ebuild
@@ -1,7 +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
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="Inference of RNA alignments"
 HOMEPAGE="http://infernal.janelia.org/"
@@ -9,21 +11,20 @@ SRC_URI="ftp://selab.janelia.org/pub/software/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="mpi"
 KEYWORDS="amd64 x86"
+IUSE="mpi"
 
 RDEPEND="mpi? ( virtual/mpi )"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-parallel-build.patch
+	"${FILESDIR}"/${P}-fix-build-system.patch
 	"${FILESDIR}"/${P}-overflows.patch
 	"${FILESDIR}"/${P}-perl-5.16-2.patch
-	"${FILESDIR}"/${P}-ldflags.patch
-	"${FILESDIR}"/${P}-respect-DESTDIR.patch
 )
 
 src_configure() {
+	tc-export AR
 	econf $(use_enable mpi)
 }
 
diff --git a/sci-biology/mcl/Manifest b/sci-biology/mcl/Manifest
index 8bef0282bc82..39003fd43076 100644
--- a/sci-biology/mcl/Manifest
+++ b/sci-biology/mcl/Manifest
@@ -1,4 +1,5 @@
-AUX mcl-14.137-qa-implicit-declarations.patch 786 BLAKE2B c7a5ed8f32dd3542766beaed19c9236a137444fdf69252becedfcc2d97136b0eba276355d2b24a38a06e0f78e6eaeb813bdc713cb01161167d4a2c65425e3c03 SHA512 e1388441e06075e951a1ff9994a8e9fe1083042c09e072c68e9abb20dc4a83498eb4cb71aa71d738268a50a0e03ee8e7976df9bbb304b8c90314d682bb8625d3
+AUX mcl-14.137-fix-autotools.patch 1524 BLAKE2B baad5d167379b8f38543159d88f66367bc625e53f457a59dfbbddadd998423d924afdff6d826c6c35004e1f4a83bbbb464d3bfe367f3257adcd6fad5cd2d5aad SHA512 bb7384d8f5a819fa1e0af7bdc5b7ef157f76c1ddb3bcc5d9bca06347b5bd86d977d9580e99161e173fef8aee288ec1075d19ab9878782fa1d97eca50bae099de
+AUX mcl-14.137-fix-declarations.patch 1266 BLAKE2B 2df8acbe98dfbf804b81950e1d60963fea49aeff0b8bce52c75bb757d72cb16adbf13b8567acb8b63ab76af63da3086fdedf25d363f2986881bb70e2b27630b9 SHA512 cce0825fe7d01a3f6c69bf1d1fcac1277b3beef6cca0f3ee729d2c4f60f57ef2a9223b7f3a8f63743011751790c625ec3601cc46fddde236eef37cbce982a9d6
 DIST mcl-14-137.tar.gz 3035491 BLAKE2B d6b975841a9094055306056ae0cd646cc92af69018893981d32b0604a583f61d3764bc67c1e21a0861b89a17013c01bcd4c1d7cbb4e0c5856403c2a767121423 SHA512 7e399e571de60da5e1ba9e643b7f0cd98fe484cc8cef517222a57322b5c7a04afa675c7cf0ab88b5801efa9565e5e67a14c4914987964308391d88dd4be1bea2
-EBUILD mcl-14.137.ebuild 651 BLAKE2B 73ba9d5ac8159a10ced22a9a39e0d5c1c4943fe5cc4ad1e823592e6362ef1f9bd3f850173a6e2c91d43bcfb825d3fd4de91dad469b27e58bd2a43c036889415f SHA512 042277297965d4796d0805dad2a951e8bd467630c7904fe1a5211616fc2a620c041ea6093bbaf10e6fed17037bccd7013afcfb0260e69c09bd1cdc3ca2f76f53
+EBUILD mcl-14.137.ebuild 569 BLAKE2B 0fae322e4911c52407d9b053dfcb1d08dc19624c1b32e68800135338b44e16d82eee4f77f1b11b88f002c5739b2f01c356d21154c48fe305800b88d802febaa0 SHA512 1be49c6038260326f6fe64bf0afba78258d355e8e74f3f3cfc30dd1f0de2971159ac3fb969b09710df8eeb28fa559135516189d9e56544287fd2089a572b68e3
 MISC metadata.xml 336 BLAKE2B 077cf6e56ca5ba6480b00411536b1814f73b8dc93faf9337e0e81f3c47f174172894487ef072637dd396f39a95cd3a6538c2fd3e62328c3659882629c9b96dff SHA512 41ed664e2fdc26c5984fb55d90365cb02fe0de893d74e74935d2a9f6eb17e2e56a33210ed7d03c28375fb27ebbae3dca472de79a2e387ecf769a604aea629da3
diff --git a/sci-biology/mcl/files/mcl-14.137-fix-autotools.patch b/sci-biology/mcl/files/mcl-14.137-fix-autotools.patch
new file mode 100644
index 000000000000..0d2c052a91b0
--- /dev/null
+++ b/sci-biology/mcl/files/mcl-14.137-fix-autotools.patch
@@ -0,0 +1,52 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -144,6 +144,7 @@
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_RANLIB
++AM_PROG_AR
+ 
+ # Checks for libraries.
+ # FIXME: Replace `main' with a function in `-lm':
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -9,7 +9,6 @@
+ ## http://www.w3.org/People/Raggett/tidy/ , by Dave Raggett <dsr@w3.org>
+ TIDY = tidy
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)
+ 
+ # mclfamily.html mclfamily.ps
+ 
+--- a/graphs/Makefile.am
++++ b/graphs/Makefile.am
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+ ## $Id: Makefile.am,v 1.7 2007-01-29 11:35:37 flux Exp $
+ 
+-exampledir = $(datadir)/doc/$(PACKAGE)/examples
++exampledir = $(docdir)/examples
+ 
+ example_DATA = falkner.mci falkner2.mci falkner.coords make-falkner.pl \
+    proteins.mci matula.mci lattice.mci honey.mci seven.mci infinity.mci \
+--- a/img/Makefile.am
++++ b/img/Makefile.am
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+ ## $Id: Makefile.am,v 1.7 2007-01-29 11:35:37 flux Exp $
+ 
+-exampledir = $(datadir)/doc/$(PACKAGE)/examples
++exampledir = $(docdir)/examples
+ 
+ example_DATA = fa_1024.png fa_400.png fa_600.png fa_large.png fa.ps falkner-bidi.ps falkner.ps small.ps small.png
+ 
+--- a/src/alien/oxygen/doc/Makefile.am
++++ b/src/alien/oxygen/doc/Makefile.am
+@@ -17,7 +17,6 @@
+ ## http://www.w3.org/People/Raggett/tidy/ , by Dave Raggett <dsr@w3.org>
+ TIDY = tidy
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)
+ 
+ ## zoemtut.html is "on hold": do not install; zoem is not yet ready
+ ## for prime time
diff --git a/sci-biology/mcl/files/mcl-14.137-fix-declarations.patch b/sci-biology/mcl/files/mcl-14.137-fix-declarations.patch
new file mode 100644
index 000000000000..4974d352bf7b
--- /dev/null
+++ b/sci-biology/mcl/files/mcl-14.137-fix-declarations.patch
@@ -0,0 +1,53 @@
+Fix QA issues related to implicit declarations.
+
+* QA Notice: Package triggers severe warnings which indicate that it
+*            may exhibit random runtime failures.
+* clmadjust.c:184:10: warning: implicit declaration of function ‘mcxFree’ [-Wimplicit-function-declaration]
+* mcxi.c:42:16: warning: implicit declaration of function ‘isatty’ [-Wimplicit-function-declaration]
+
+--- a/src/impala/iface.h
++++ b/src/impala/iface.h
+@@ -16,15 +16,15 @@
+ 
+ /* This file currently provides nothing */
+ 
+-dim nu_meet_can  ;
+-dim nu_meet_sl   ;
+-dim nu_meet_zip  ;
+-dim nu_diff_can  ;
+-dim nu_diff_sl   ;
+-dim nu_diff_zip  ;
+-double nu_magic  ;
++extern dim nu_meet_can  ;
++extern dim nu_meet_sl   ;
++extern dim nu_meet_zip  ;
++extern dim nu_diff_can  ;
++extern dim nu_diff_sl   ;
++extern dim nu_diff_zip  ;
++extern double nu_magic  ;
+ 
+-dim mclx_n_thread_g  ;
++extern dim mclx_n_thread_g  ;
+ 
+ #endif
+ 
+--- a/src/shcl/clmadjust.c
++++ b/src/shcl/clmadjust.c
+@@ -14,6 +14,7 @@
+ #include "report.h"
+ #include "clmadjust.h"
+ 
++#include "util/alloc.h"
+ #include "util/io.h"
+ #include "util/types.h"
+ #include "util/err.h"
+--- a/src/shmcx/mcxi.c
++++ b/src/shmcx/mcxi.c
+@@ -8,6 +8,7 @@
+ */
+ 
+ #include <stdio.h>
++#include <unistd.h>
+ 
+ #include "stack.h"
+ #include "glob.h"
diff --git a/sci-biology/mcl/files/mcl-14.137-qa-implicit-declarations.patch b/sci-biology/mcl/files/mcl-14.137-qa-implicit-declarations.patch
deleted file mode 100644
index df4309874d48..000000000000
--- a/sci-biology/mcl/files/mcl-14.137-qa-implicit-declarations.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Fix QA issues related to implicit declarations.
-
-* QA Notice: Package triggers severe warnings which indicate that it
-*            may exhibit random runtime failures.
-* clmadjust.c:184:10: warning: implicit declaration of function ‘mcxFree’ [-Wimplicit-function-declaration]
-* mcxi.c:42:16: warning: implicit declaration of function ‘isatty’ [-Wimplicit-function-declaration]
-
---- mcl-14-137/src/shcl/clmadjust.c
-+++ mcl-14-137/src/shcl/clmadjust.c
-@@ -14,6 +14,7 @@
- #include "report.h"
- #include "clmadjust.h"
- 
-+#include "util/alloc.h"
- #include "util/io.h"
- #include "util/types.h"
- #include "util/err.h"
---- mcl-14-137/src/shmcx/mcxi.c
-+++ mcl-14-137/src/shmcx/mcxi.c
-@@ -8,6 +8,7 @@
- */
- 
- #include <stdio.h>
-+#include <unistd.h>
- 
- #include "stack.h"
- #include "glob.h"
diff --git a/sci-biology/mcl/mcl-14.137.ebuild b/sci-biology/mcl/mcl-14.137.ebuild
index e48198deca29..e7924bccec30 100644
--- a/sci-biology/mcl/mcl-14.137.ebuild
+++ b/sci-biology/mcl/mcl-14.137.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=6
+EAPI=7
 
 inherit autotools
 
@@ -16,16 +16,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+blast"
 
-PATCHES=("${FILESDIR}/${P}-qa-implicit-declarations.patch")
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-declarations.patch
+	"${FILESDIR}"/${P}-fix-autotools.patch
+)
+
 src_prepare() {
-	find \
-		-name Makefile.am \
-		-exec sed \
-			-e '/docdir/d' \
-			-e '/exampledir/s:doc::g' \
-			-i '{}' + || die
 	default
 	eautoreconf
 }
diff --git a/sci-biology/poa/Manifest b/sci-biology/poa/Manifest
index c7e6e27a6c45..7b85951ec539 100644
--- a/sci-biology/poa/Manifest
+++ b/sci-biology/poa/Manifest
@@ -1,4 +1,5 @@
-AUX 2-respect-flags.patch 743 BLAKE2B f4da40ae90b7304520232cc9c2d61a3eecaac6ba1b9b886b29e473b1df8766286e3fd89874e2e836b9ddcd91f4bffe276ad74c1b6d073af3c1ca91e540f96c30 SHA512 496415d501040057155ba2ba261564fc00dc764626c8d41081f5463b0b40f9eae978bb8a81db15cf90f193c4ca9fe8725a2876ed175e15d37a983196b70e192f
+AUX poa-2-fno-common.patch 357 BLAKE2B 5d239201e987f1fc45e82019a27b2c8e81015cd2b6b5b35f90838a8fff16bb08b51da5e6e9e1ac163bd6591341ba96a870fce4949a79e9ca558ce8c765d15ba4 SHA512 9d8f6552fd43a0f40da9cb7a5316e0e434df793fb9f7522b60e067061d14a7b27299feb02a8603cb4f6039b205723f562ea5c54c15ab3bd6582f2e6e7c223c43
+AUX poa-2-respect-flags.patch 874 BLAKE2B ee278cdbc6ec0603bc28087bd008caa70fe39668360a1473891ed997bde93f31ef7586acc9137a23a4d3123047ce5b600c3d6418a89e1e62ca70545b99a3112b SHA512 95e2e7c43ba18f9238b379ea13d3a6004cf580c75d484dbe43f01c823484f84eb93c3d2fe1ae3c98583c51c660ab24e6dc580d132649adedbf30d8675d8107b0
 DIST poaV2.tar.gz 62612 BLAKE2B 92f7b2926dd7fc93745411fc04c8dd3380c32e3e87cf89afa81aefe787a1aa0e7a416d08809cce531a21d5118398a9474a751a742ee1fca47e83bd907444e9c0 SHA512 2a54b025f0a74ff4c01828f3e4b9e8e135bffe26d08f651f981bc95a64196173b5d887ef988a25c1f5fbf89333b4771622d5dc93946d66e7ec9abacb6167595c
-EBUILD poa-2-r1.ebuild 945 BLAKE2B 73d50cff0c550fe82490c93ca07db3661a71a0a2d6f67ad2d69fe658f156734aba5702137adae5cf091ff9e1e6f153894259ecfaabed05be92858038c7042668 SHA512 2c76bd5587239e7f260aeb82c362008610904dda01907a224577af9e0ef06cad8012ff21788edc24d7d3ae360867748b5e245fc73b6e1480f890787cea727c66
+EBUILD poa-2-r1.ebuild 857 BLAKE2B 436c6a4db2fa826ebb3f0a3d59df5d88f746a6c025f227be6b4916f7b6b34dde51013ae48355ea080dc19ba763972e62d3b1a87b17c19349ba0f3ed2df50409c SHA512 7fadf68dd86ac01c83eb65ef6e8512428b7c5fa84b1071f538458e46ff3116d02ff4f18a7d8e2bc32c360caee2bac2ca998a3a824442f662613a8808e893e7b7
 MISC metadata.xml 347 BLAKE2B f003b9e0541ffd38d84b2daf8b4df59bfbec1510ae162ac42af1cb1cb110f19297074d61b9b84d71441a0ceba9acbd38123db467e8500c482165fcd6c7e7b90b SHA512 8610e747bbc86428757f77ed688520cdd9efeabc08e08f99ce74d98e7763f3f8cb7648b1eea01bc4db79ae16a650cb119b82022d1ac41e8fcbd6a6b40385e580
diff --git a/sci-biology/poa/files/2-respect-flags.patch b/sci-biology/poa/files/2-respect-flags.patch
deleted file mode 100644
index bdd638cf64b7..000000000000
--- a/sci-biology/poa/files/2-respect-flags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/Makefile b/Makefile
-index a65bed0..713a7ab 100644
---- a/Makefile
-+++ b/Makefile
-@@ -26,9 +26,10 @@ LIBOBJECTS= \
- 	stringptr.o
- 
- 
--CC = gcc
-+CC ?= gcc
- #CFLAGS= -g -ansi-strict -W -Wall -DUSE_WEIGHTED_LINKS -DUSE_PROJECT_HEADER -I.
--CFLAGS= -g -DUSE_WEIGHTED_LINKS -DUSE_PROJECT_HEADER -I.
-+OPT_CFLAGS = -g
-+CFLAGS= $(OPT_CFLAGS) -DUSE_WEIGHTED_LINKS -DUSE_PROJECT_HEADER -I.
- # -I$(HOME)/lib/include
- # -DREPORT_MAX_ALLOC
- 
-@@ -44,7 +45,7 @@ liblpo.a: $(LIBOBJECTS)
- 
- # NB: LIBRARY MUST FOLLOW OBJECTS OR LINK FAILS WITH UNRESOLVED REFERENCES!!
- poa: $(OBJECTS) liblpo.a
--	$(CC) -o $@ $(OBJECTS) -lm liblpo.a
-+	$(CC) $(LDFLAGS) -o $@ $(OBJECTS) -lm liblpo.a
- 
- what:
- 	@echo poa: partial-order based sequence alignment program
diff --git a/sci-biology/poa/files/poa-2-fno-common.patch b/sci-biology/poa/files/poa-2-fno-common.patch
new file mode 100644
index 000000000000..ddd738a5524c
--- /dev/null
+++ b/sci-biology/poa/files/poa-2-fno-common.patch
@@ -0,0 +1,13 @@
+--- a/black_flag.h
++++ b/black_flag.h
+@@ -236,8 +236,8 @@
+ 	       int sourceline,
+ 	       char sourcefile_revision[]);
+ 
+-char *Program_name;
+-char *Program_version;
++extern char *Program_name;
++extern char *Program_version;
+ 
+ void black_flag_init(char progname[],char progversion[]);
+ void black_flag_init_args(int narg,char *arg[],char progversion[]);
diff --git a/sci-biology/poa/files/poa-2-respect-flags.patch b/sci-biology/poa/files/poa-2-respect-flags.patch
new file mode 100644
index 000000000000..fb01f0b5f934
--- /dev/null
+++ b/sci-biology/poa/files/poa-2-respect-flags.patch
@@ -0,0 +1,38 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,6 +1,3 @@
+-
+-AR=ar rc
+-
+ TARGETS=poa liblpo.a poa_doc libbflag.a
+ 
+ # align_score.c CAN BE USED TO ADD CUSTOMIZED SCORING FUNCTIONS
+@@ -26,9 +23,8 @@
+ 	stringptr.o
+ 
+ 
+-CC = gcc
+ #CFLAGS= -g -ansi-strict -W -Wall -DUSE_WEIGHTED_LINKS -DUSE_PROJECT_HEADER -I.
+-CFLAGS= -g -DUSE_WEIGHTED_LINKS -DUSE_PROJECT_HEADER -I.
++CPPFLAGS+= -DUSE_WEIGHTED_LINKS -DUSE_PROJECT_HEADER -I.
+ # -I$(HOME)/lib/include
+ # -DREPORT_MAX_ALLOC
+ 
+@@ -37,14 +33,14 @@
+ 
+ liblpo.a: $(LIBOBJECTS)
+ 	rm -f $@
+-	$(AR) $@ $(LIBOBJECTS)
+-	ranlib $@
++	$(AR) rc $@ $(LIBOBJECTS)
++	$(RANLIB) $@
+ 
+ 
+ 
+ # NB: LIBRARY MUST FOLLOW OBJECTS OR LINK FAILS WITH UNRESOLVED REFERENCES!!
+ poa: $(OBJECTS) liblpo.a
+-	$(CC) -o $@ $(OBJECTS) -lm liblpo.a
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) -lm liblpo.a
+ 
+ what:
+ 	@echo poa: partial-order based sequence alignment program
diff --git a/sci-biology/poa/poa-2-r1.ebuild b/sci-biology/poa/poa-2-r1.ebuild
index fc472ce96007..d87f2a638117 100644
--- a/sci-biology/poa/poa-2-r1.ebuild
+++ b/sci-biology/poa/poa-2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 MY_P="${PN}V${PV}"
 
@@ -15,30 +15,30 @@ SRC_URI="mirror://sourceforge/poamsa/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
 
 S="${WORKDIR}/${MY_P}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-respect-flags.patch
+PATCHES=(
+	"${FILESDIR}"/${P}-respect-flags.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
+src_configure() {
+	tc-export AR CC RANLIB
 }
 
 src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		OPT_CFLAGS="${CFLAGS}" \
-		poa
+	emake poa
 }
 
 src_install() {
-	dobin "${S}"/poa "${S}"/make_pscores.pl
-	use static-libs && dolib.a "${S}"/liblpo.a
-	dodoc "${S}"/README "${S}"/multidom.*
+	dobin poa make_pscores.pl
+	dodoc README multidom.*
 	insinto /usr/share/poa
-	doins "${S}"/*.mat
+	doins *.mat
 }
 
 pkg_postinst() {
 	elog "poa requires a score matrix as the first argument."
-	elog "This package installs two examples to ${EROOT}usr/share/poa/."
+	elog "This package installs two examples to ${EROOT}/usr/share/poa/."
 }
diff --git a/sci-biology/vienna-rna/Manifest b/sci-biology/vienna-rna/Manifest
index 93ed6d8adf22..0de0a4ebedfe 100644
--- a/sci-biology/vienna-rna/Manifest
+++ b/sci-biology/vienna-rna/Manifest
@@ -1,10 +1,6 @@
-AUX vienna-rna-2.1.1-bindir.patch 361 BLAKE2B c05d660b422519274f3c88c922d9eac79a8af055df17b78ecfd13561e76f02820d0bdc0462b66100858a8e6b1f3f8bba41cacbc142b9684e47aeb11295edef93 SHA512 f2e9da29f1ae3c1d3e7594367ef13ad0d44ebbcf1d9badf9d55c415e50b7e5af170dba7bcdad6438505786b941518f84ddb154cf1a6df60a229f3856cf333a94
 AUX vienna-rna-2.1.1-impl-decl.patch 354 BLAKE2B d9d7a4e749a2c8681dc619961291f5e082681f15729a72ee1423bc4af71e8f745a558506e7147846c84df8fb7e5d316d1bc253f8125487a4ea6aab3c05b19bd8 SHA512 7c288b4889f11b5cc4e6db5b5db6dfcd70843aa135181e8d819ae86c90faed4a43e08f99b47f418caa23643642e68bf5e153f4d279f7566433af1c9093ec6e8b
 AUX vienna-rna-2.1.1-prll.patch 885 BLAKE2B 168d4b1a4c5ff0eb92379fe5762e7f0d6b7676c774c659422923c894bfcdb9efbbe20979ed87129c688b6ced9ad19cc51716164a0056b19fbc80fc27bbd32d57 SHA512 1b80636b43e1ce9ca54431358b45f2503ef3f49b8cd049b5ef501058e1771bda3628c88e63cc1bea9a32aff5a004ccef663b47dae385a5df6071793f292dff94
-AUX vienna-rna-2.1.1-setup.py 810 BLAKE2B 7db99496739eaf21a8964d8a545204c05026ae6e5de1070d14e820e64760ffb2544a2a0247543415cc909d8938ac423be7d57dddd68103e3d9cc007ac7db7833 SHA512 57feac6d5701a25fcda01f93f506a422d4639595a7d0ef73575af88f283fabc3730a8ea3e116ccfd417b015611c813f08ff047c9e362eaa74d2ce275ae65f8b8
 AUX vienna-rna-2.1.8-bindir.patch 367 BLAKE2B 9bf3df6c604d5ac0661188d4f662ee12387f8bb30c2e3ecbd4a7bfd0a73ff5419f7a10b2fe70efd53e4b634bfdd3c1039ec000b26e7f5edbbcc4242a4edf5914 SHA512 aee16e7ff546aff38dd4a29d43502f4eb50778e6377a7d57f6a010dacc6a5f02162418fde27df03d1ba27f02361835d63dcefd866b8ac22f17a926c28fa4e9bf
-DIST ViennaRNA-2.1.1.tar.gz 5327215 BLAKE2B 1319a13daafc3798b792f43488590b4d1d290cbbf41ed6e401255c082eceb1212c312179ea31c3e574c852b453a1641198768bf565e72a920b433420d259c53f SHA512 b272afa1146543b290db605debab2badbdbf04fcdfd6130ed3b10604255476b3472b184e9af8a0bbeaa0def266f1a167c125d6cfd02aa3f7ae463697dc5226d5
 DIST ViennaRNA-2.1.8.tar.gz 5464683 BLAKE2B ed2086461b37c90de11638852680507c823495abacec1e797c589c22d07dc48b4833d8d6916e5c95083bb9b970c659bbfb14ca45e155486333a915593c4caf01 SHA512 84f9db1247ff7a77aa6550b6285d9bed31fa6ce179aab26eef798c65a07f5cbd89f944630dfa5d29a43401b12a439324b57ee69047a3985e3a4f1e88dffca60e
-EBUILD vienna-rna-2.1.1.ebuild 2667 BLAKE2B f81e3a8fd09cc846b570831ee21081e246163cfa36990a42c1e582b47adb8f59b137bd656277ed1b990a0fdddbfbc67e6c49d22a896c78842362bd1e16eaab0d SHA512 22b96fce6750fd8094e6943abd8085ec5e3035f66766f56a6a840f591faaebbffece2b0174e7db078d4e96bae30762bc6d15e21bc2e45a6e086115ddb2ca4bc1
 EBUILD vienna-rna-2.1.8.ebuild 2588 BLAKE2B 5a1692be0a587cc85dcf0a60c609ff0c4eade92e5da98ce05bf2d90a195e606d9ca9262774c2c6875b1d9d53451b5043d7c4ae8a3446d4ebf3607effe039cd92 SHA512 4474f2bf042a31e02fd7b9882f6b5ec17fef4ba9f23eab29a39e9c09ea29414e836c029e568a905a2c315370c763384f9d84547a56a8806216dc825d51c3d378
 MISC metadata.xml 1324 BLAKE2B ba9d5e1f5893344fd1899e3723e1b86bac75546cde97b311fe7ef9dc2068f1a063cd5a5d2ac65d1195f532441194e8943ad2ec44db9a5c614ed0c8d894a900bb SHA512 8198db695aea5244b62fab23fd0a53a0657f8d37cc741f60869a39374e97c725b564086d852e37216c584083168881eba246f59b840d6a41bfe9246d3bd88d4b
diff --git a/sci-biology/vienna-rna/files/vienna-rna-2.1.1-bindir.patch b/sci-biology/vienna-rna/files/vienna-rna-2.1.1-bindir.patch
deleted file mode 100644
index 6d35ecea9b0f..000000000000
--- a/sci-biology/vienna-rna/files/vienna-rna-2.1.1-bindir.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/Utils/Makefile.am b/Utils/Makefile.am
-index f42ebf4..d84a0f1 100644
---- a/Utils/Makefile.am
-+++ b/Utils/Makefile.am
-@@ -1,4 +1,4 @@
--pkgbindir = $(pkgdatadir)/bin
-+pkgbindir = $(prefix)/bin
- pkgbin_PROGRAMS = b2ct popt
- 
- pscript = b2mt.pl ct2b.pl dpzoom.pl mountain.pl relplot.pl rotate_ss.pl cmount.pl colorrna.pl coloraln.pl refold.pl switch.pl
diff --git a/sci-biology/vienna-rna/files/vienna-rna-2.1.1-setup.py b/sci-biology/vienna-rna/files/vienna-rna-2.1.1-setup.py
deleted file mode 100644
index 57f6b712ba3d..000000000000
--- a/sci-biology/vienna-rna/files/vienna-rna-2.1.1-setup.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from distutils.core import setup, Extension
-import os
-import sys
- 
-old_filename = os.path.join("Perl", "RNA.py")
-new_filename = os.path.join("Perl", "__init__.py")
-if os.path.exists(old_filename):
-    os.rename(old_filename, new_filename)
- 
-extra_link_args = []
- 
-extension = Extension("_RNA",
-                      ["Perl/RNA_wrap.c"],
-                      libraries=['RNA'],
-                      library_dirs=['lib'],
-                      extra_link_args=extra_link_args
-                      )
- 
-setup(name="RNA",
-      version="2.1.1",
-      description="Vienna RNA",
-      author="Ivo Hofacker, Institute for Theoretical Chemistry, University of Vienna",
-      url="http://www.tbi.univie.ac.at/RNA/",
-      package_dir = {'RNA':'Perl'},
-      packages = ['RNA'],
-      ext_modules=[extension],
-      )
diff --git a/sci-biology/vienna-rna/vienna-rna-2.1.1.ebuild b/sci-biology/vienna-rna/vienna-rna-2.1.1.ebuild
deleted file mode 100644
index 8b760b5a84bf..000000000000
--- a/sci-biology/vienna-rna/vienna-rna-2.1.1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=true
-AUTOTOOLS_AUTORECONF=true
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils distutils-r1 multilib perl-module toolchain-funcs
-
-DESCRIPTION="RNA secondary structure prediction and comparison"
-HOMEPAGE="http://www.tbi.univie.ac.at/~ivo/RNA/"
-SRC_URI="http://www.tbi.univie.ac.at/~ronny/RNA/ViennaRNA-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="vienna-rna"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc openmp python static-libs"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-lang/perl
-	media-libs/gd
-	doc? ( dev-texlive/texlive-latex )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	python? ( dev-lang/swig:0 )"
-
-S="${WORKDIR}/ViennaRNA-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-bindir.patch
-	"${FILESDIR}"/${P}-prll.patch
-	"${FILESDIR}"/${P}-impl-decl.patch
-)
-
-src_prepare() {
-	sed -i 's/ getline/ v_getline/' Readseq/ureadseq.c || die
-	sed -i 's/@PerlCmd@ Makefile.PL/& INSTALLDIRS=vendor/' Perl/Makefile.am || die
-
-	autotools-utils_src_prepare
-
-	if use python; then
-		cp "${FILESDIR}"/${P}-setup.py "${S}"/setup.py || die
-		PATCHES=()
-		distutils-r1_src_prepare
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-cluster
-		$(use_enable openmp) )
-
-	use doc || \
-		myeconfargs+=(
-			--without-doc-pdf
-			--without-doc-html
-			--without-doc
-			)
-	autotools-utils_src_configure
-	sed \
-		-e "s:LIBDIR = /usr/lib:LIBDIR = ${D}/usr/$(get_libdir):" \
-		-e "s:INCDIR = /usr/include:INCDIR = ${D}/usr/include:" \
-		-i RNAforester/g2-0.70/Makefile || die
-	sed \
-		-e "s:CC=gcc:CC=$(tc-getCC):" \
-		-e "s:^CFLAGS=:CFLAGS=${CFLAGS}:" \
-		-i Readseq/Makefile || die
-	use python && distutils-r1_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	autotools-utils_src_compile -C Readseq build CC=$(tc-getCC)
-
-	# TODO: Add (optional?) support for the NCBI toolkit.
-	if use python; then
-		pushd Perl > /dev/null
-			mv RNA_wrap.c{,-perl} || die
-			swig -python RNA.i || die
-		popd > /dev/null
-		distutils-r1_src_compile
-		mv Perl/RNA_wrap.c{-perl,} || die
-	fi
-}
-
-src_test() {
-	autotools-utils_src_compile -C Perl check
-	autotools-utils_src_compile -C Readseq test
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if ! use static-libs; then
-		rm -f "${ED}"/usr/$(get_libdir)/*.a || die
-	fi
-
-	newbin Readseq/readseq readseq-vienna
-	dodoc Readseq/Readseq.help
-	newdoc Readseq/Readme README.readseq
-	newdoc Readseq/Formats Formats.readseq
-
-	# remove perlocal.pod to avoid file collisions (see #240358)
-	perl_delete_localpod || die "Failed to remove perlocal.pod"
-	use python && distutils-r1_src_install
-}
diff --git a/sci-biology/wgs-assembler/Manifest b/sci-biology/wgs-assembler/Manifest
index 1cb622926ec9..e45ac70e7741 100644
--- a/sci-biology/wgs-assembler/Manifest
+++ b/sci-biology/wgs-assembler/Manifest
@@ -1,5 +1,5 @@
-AUX wgs-assembler-7.0-build.patch 10279 BLAKE2B 9fd4a113d4ea3b07570c39e32892b535a0ed7d0e958602ca891c75fa3aa73a44d205fe43580e43d98cdafa1d431c12f68d5fe55e52aca82e451d5aae3ea2c551 SHA512 77e432319cb279d188ab74edda822f6b4dda127f1e5f1d75febb6fe0533b66d5bfd066781f1ff5d4d0d8f832c491d31ec470653b9c36b29d8280b5786783c5b9
+AUX wgs-assembler-7.0-build.patch 10479 BLAKE2B 906d057017be1b84b65812f5ee28b56a34c5a2a34e03d826270cf819e63363fbb72cef90884ce5df04db2758f662b76bbd46aab79fb53452fecd99a6be179c59 SHA512 524baaeaf66ab74ac4c0649e241c0d3f070b087b89a8b723c8886c280ea9ca8a78bdb83cdc32237965c9faf04faf97edb22587d9fdc6db345f3e8dfbf1a3e9b0
 AUX wgs-assembler-7.0-libtirpc.patch 516 BLAKE2B 1ee7876f767e559a008d86b8f6ccdbf70763646b782ea23d2bc9f74edab84ff633270ff15d0cd5b888674c5ee0d0bdcd3b73a48bf040f06f2a56bf4e366125cf SHA512 b2a29b2dc0578d4e8544dce258327a34ac4a5ca6bea3e901bee06d89618e9cba7f569fd54da6148372826d053829bc991db7c4cfd5a8564dd81545566698c947
 DIST wgs-7.0.tar.bz2 1952253 BLAKE2B 2dbff6ffb9f4310d3d1301405e74476b7b7bbed4359c1701b5100d9597db46cc9956ccbe467bb37f8976d176ab9f92bfabcd5d1210b1e10675cff9a87ff379b9 SHA512 e5ef1d4533e3dd17d13c6aca9631f5300768a258f8241f3f7f90de3785bf7a340b6896febe335682c282434c9983bc4a02fe2128a5b0e7ec415dd65e0fe400ba
-EBUILD wgs-assembler-7.0-r2.ebuild 1662 BLAKE2B 1c542685f8667e1901eb3950c084ad386e29a077d280e5c3ed24ae84fed71e4876a5c8bed80ea33c4b7b4c3b0c0720f0229d3efc1e2f1654548cdfeb32383e5b SHA512 ad0f1a44e14c9c714b7b6d00dda05bb9b16b9bdde29989d2fd4d785294053aae94d85d0b5ab92faeb2574e99f18a6c566c2c8cc01c5d920632a480aae6f88a4e
+EBUILD wgs-assembler-7.0-r2.ebuild 1492 BLAKE2B cea99ff2f1c8d6d6d2b08e23808480d6b2018d6741a8e18a0a09e90f8792139af499617fe9b70723257ef7b3d63a6f270acbf06d8a426eeda3f8b59485424237 SHA512 3eb63c55dc920cf70e3da4562c7e96cd14bd646f1d7cdf74cb58ee80fdffdbdd0fe6d0a0bce2d3e01450c1fd82ad6db3bee79e46b795e2c98357a314a13bd841
 MISC metadata.xml 354 BLAKE2B eaf844f74ea3b2a51cba2f00ebc0a3cc895312e04a995000e93426fa0e2f9d8601edb2011ff6c837f85b3a5755b819dc7ce517d3787c2e7bd37e097e144fb156 SHA512 b46f437eb224dbc7d7cec21941565ab48055f1d7b787fae7e66b135a8abeff0ea55dc191643d1e5f6212012001d98e4b7e8a7a655c9a66c9f3124bf7e700e193
diff --git a/sci-biology/wgs-assembler/files/wgs-assembler-7.0-build.patch b/sci-biology/wgs-assembler/files/wgs-assembler-7.0-build.patch
index f7fb44743968..238541b512f2 100644
--- a/sci-biology/wgs-assembler/files/wgs-assembler-7.0-build.patch
+++ b/sci-biology/wgs-assembler/files/wgs-assembler-7.0-build.patch
@@ -1,33 +1,6 @@
- kmer/Make.rules   |  4 ++--
- kmer/configure.sh | 20 +++++++++----------
- src/c_make.as     | 58 +++++++++++++++++++++++++++----------------------------
- src/c_make.gen    |  4 ++--
- 4 files changed, 43 insertions(+), 43 deletions(-)
-
-diff --git a/kmer/Make.rules b/kmer/Make.rules
-index f904b13..5c2d477 100644
---- a/kmer/Make.rules
-+++ b/kmer/Make.rules
-@@ -139,12 +139,12 @@ ${ALL_CXX_DEPS}:%.d:%
- ## EXE targets
- ALL_C_EXES   :=$(strip $(foreach x,${//},${${x:.=.C_EXES}}))
- ${ALL_C_EXES}:
--	${-CC} ${CLD} ${CLDFLAGS} -o $@ $+ ${CLIBS}
-+	${-CC} ${CLD} ${CLDFLAGS} ${LDFLAGS} -o $@ $+ ${CLIBS}
- __SUBGOALS__+=$${${1:.=.C_EXES}}
- 
- ALL_CXX_EXES :=$(strip $(foreach x,${//},${${x:.=.CXX_EXES}}))
- ${ALL_CXX_EXES}:
--	${-CXX} ${CXXLD} ${CXXLDFLAGS} -o $@ $+ ${CXXLIBS}
-+	${-CXX} ${CXXLD} ${CXXLDFLAGS} ${LDFLAGS} -o $@ $+ ${CXXLIBS}
- __SUBGOALS__+=$${${1:.=.CXX_EXES}}
- 
- define .RULE-install-copy-C-CXX-EXES
-diff --git a/kmer/configure.sh b/kmer/configure.sh
-index 2f0d5ea..9daf89f 100755
 --- a/kmer/configure.sh
 +++ b/kmer/configure.sh
-@@ -254,13 +254,13 @@ EOF
+@@ -254,13 +254,13 @@
  # -*- makefile -*-
  #  Linux, optimized
  CC                := $CC
@@ -46,7 +19,7 @@ index 2f0d5ea..9daf89f 100755
  CXXLIBS           := -pthread -ldl
  ARFLAGS           := ruvs
  INSTALL/          := $target/
-@@ -272,13 +272,13 @@ EOF
+@@ -272,13 +272,13 @@
  # -*- makefile -*-
  #  Linux64, optimized
  CC                := $CC
@@ -65,11 +38,37 @@ index 2f0d5ea..9daf89f 100755
  CXXLIBS           := -pthread -ldl
  ARFLAGS           := ruvs
  INSTALL/          := $target/
-diff --git a/src/c_make.as b/src/c_make.as
-index 0172807..4304589 100644
+@@ -401,8 +401,8 @@
+ .O                := .o
+ CLD               := \${CC}
+ CXXLD             := \${CXX}
+-CCDEP		  := gcc -MM -MG
+-CXXDEP	          := g++ -MM -MG
++CCDEP             := \$(CC) -MM -MG
++CXXDEP            := \$(CXX) -MM -MG
+ CLIBS             += -lm -lbz2
+ CXXLIBS           += -lm -lbz2
+ PYTHON            := $PYTHON
+--- a/kmer/Make.rules
++++ b/kmer/Make.rules
+@@ -139,12 +139,12 @@
+ ## EXE targets
+ ALL_C_EXES   :=$(strip $(foreach x,${//},${${x:.=.C_EXES}}))
+ ${ALL_C_EXES}:
+-	${-CC} ${CLD} ${CLDFLAGS} -o $@ $+ ${CLIBS}
++	${-CC} ${CLD} ${CLDFLAGS} ${LDFLAGS} -o $@ $+ ${CLIBS}
+ __SUBGOALS__+=$${${1:.=.C_EXES}}
+ 
+ ALL_CXX_EXES :=$(strip $(foreach x,${//},${${x:.=.CXX_EXES}}))
+ ${ALL_CXX_EXES}:
+-	${-CXX} ${CXXLD} ${CXXLDFLAGS} -o $@ $+ ${CXXLIBS}
++	${-CXX} ${CXXLD} ${CXXLDFLAGS} ${LDFLAGS} -o $@ $+ ${CXXLIBS}
+ __SUBGOALS__+=$${${1:.=.CXX_EXES}}
+ 
+ define .RULE-install-copy-C-CXX-EXES
 --- a/src/c_make.as
 +++ b/src/c_make.as
-@@ -64,27 +64,27 @@ include $(LOCAL_WORK)/src/c_make.gen
+@@ -64,27 +64,27 @@
  
  ifeq ($(OSTYPE), Linux)
    ifeq ($(MACHINETYPE), i686)
@@ -107,7 +106,7 @@ index 0172807..4304589 100644
    endif
  endif
  
-@@ -94,19 +94,19 @@ endif
+@@ -94,19 +94,19 @@
  
  ifeq ($(OSTYPE), FreeBSD)
    ifeq ($(MACHINETYPE), i386)
@@ -134,7 +133,16 @@ index 0172807..4304589 100644
    else
      ifeq ($(BUILDDEBUG), 1)
        ARCH_CFLAGS   += -g
-@@ -140,14 +140,14 @@ ifeq ($(OSTYPE), Darwin)
+@@ -126,8 +126,6 @@
+ 
+ 
+ ifeq ($(OSTYPE), Darwin)
+-  CC               = gcc
+-  CXX              = g++
+   ARCH_CFLAGS      = -D_THREAD_SAFE
+ 
+   ifeq ($(MACHINETYPE), ppc)
+@@ -140,14 +138,14 @@
  
    ifeq ($(MACHINETYPE), i386)
      ifeq ($(BUILDDEBUG), 1)
@@ -153,7 +161,7 @@ index 0172807..4304589 100644
      endif
    endif
  
-@@ -161,23 +161,23 @@ endif
+@@ -161,23 +159,23 @@
  ifeq ($(OSTYPE), SunOS)
    ifeq ($(MACHINETYPE), i86pc)
      ARCH_CFLAGS    = -DBYTE_ORDER=LITTLE_ENDIAN -DANSI_C -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -pthreads
@@ -182,7 +190,7 @@ index 0172807..4304589 100644
    endif
  endif
  
-@@ -186,14 +186,14 @@ endif
+@@ -186,14 +184,14 @@
  
  ifeq ($(BUILDPROFILE), 1)
    ARCH_CFLAGS  += -pg
@@ -199,7 +207,7 @@ index 0172807..4304589 100644
  LDFLAGS         += $(ARCH_LDFLAGS)
  
  INC_IMPORT_DIRS += $(LOCAL_WORK)/src $(patsubst %, $(LOCAL_WORK)/src/%, $(strip $(SUBDIRS)))
-@@ -205,7 +205,7 @@ LIB_IMPORT_DIRS += $(ARCH_LIB)
+@@ -205,7 +203,7 @@
  OBJ_SEARCH_PATH  = $(LOCAL_OBJ)
  
  ifeq ($(SITE_NAME), JCVI)
@@ -208,11 +216,31 @@ index 0172807..4304589 100644
  endif
  
  #  The order of compilation here is very carefully chosen to be the
-diff --git a/src/c_make.gen b/src/c_make.gen
-index 7b5227c..c27b777 100644
 --- a/src/c_make.gen
 +++ b/src/c_make.gen
-@@ -396,12 +396,12 @@ $(LIBRARIES):
+@@ -248,10 +248,6 @@
+ #### Do not redefine if (a) passed in on command line, or (b)
+ #### defined in an environment variable.
+ 
+-ifneq "$(origin CC)" "environment"
+-CC=gcc
+-endif
+-
+ ifneq "$(origin CPPFLAGS)" "environment"
+ CPPFLAGS=
+ endif
+@@ -264,10 +260,6 @@
+ CDEFS=
+ endif
+ 
+-ifneq "$(origin CXX)" "environment"
+-CXX=g++
+-endif
+-
+ ifneq "$(origin CXXFLAGS)" "environment"
+ CXXFLAGS=
+ endif
+@@ -396,12 +388,12 @@
  $(C_PROGS):
  	@ echo "++++++++++++++++++++ " $@ "++++++++++++++++++++++";
  	cd $(LOCAL_OBJ); \
diff --git a/sci-biology/wgs-assembler/wgs-assembler-7.0-r2.ebuild b/sci-biology/wgs-assembler/wgs-assembler-7.0-r2.ebuild
index fc5869667f02..a9193dfe1807 100644
--- a/sci-biology/wgs-assembler/wgs-assembler-7.0-r2.ebuild
+++ b/sci-biology/wgs-assembler/wgs-assembler-7.0-r2.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
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="The Celera de novo whole-genome shotgun DNA sequence assembler, aka CABOG"
 HOMEPAGE="https://sourceforge.net/projects/wgs-assembler/"
@@ -12,7 +12,6 @@ SRC_URI="mirror://sourceforge/${PN}/wgs-${PV}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="static-libs"
 
 DEPEND="
 	net-libs/libtirpc
@@ -29,13 +28,10 @@ PATCHES=(
 	"${FILESDIR}"/${P}-libtirpc.patch
 )
 
-src_prepare() {
-	default
-	tc-export CC CXX
-}
-
 src_configure() {
-	cd "${S}/kmer"
+	tc-export AR CC CXX
+
+	cd kmer || die
 	./configure.sh || die
 }
 
@@ -57,16 +53,14 @@ src_install() {
 	sed -i '1 a use lib "/usr/share/'${PN}'/lib";' $(find $MY_S -name '*.p*') || die
 
 	dobin kmer/${MY_S}/bin/*
-	insinto /usr/$(get_libdir)/${PN}
-	use static-libs && doins kmer/${MY_S}/lib/*
 
 	insinto /usr/include/${PN}
-	doins kmer/${MY_S}/include/*
+	doins -r kmer/${MY_S}/include/.
 
 	insinto /usr/share/${PN}/lib
 	doins -r ${MY_S}/bin/TIGR
 	rm -rf ${MY_S}/bin/TIGR || die
 	dobin ${MY_S}/bin/*
-	use static-libs && dolib.a ${MY_S}/lib/*
+
 	dodoc README
 }
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 4f40a88e8f4a..47701b13d982 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/chemical-mime-data/Manifest b/sci-chemistry/chemical-mime-data/Manifest
index 0d50b7faa712..4e49779120c9 100644
--- a/sci-chemistry/chemical-mime-data/Manifest
+++ b/sci-chemistry/chemical-mime-data/Manifest
@@ -2,7 +2,6 @@ AUX chemical-mime-data-0.1.94-drop-turbomole-vibrational.patch 934 BLAKE2B 8c35a
 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-r2.patch 1305 BLAKE2B 22809dbd6c769a0dcc88d65c3454702021d9d6e082a50fce9a5f3a28743aafdbcb5e153a90ee43f7a42d4ccd5f98465f91f872e7fabf69086b8ecf1336a60e49 SHA512 4bea8dae65e28657ff75b5b613137c0f89f6de185db79297642616f208e841ba56181044eee194c619bad2c3bfb62454b7839b720d2f32fca0e768b75c842683
-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-r4.ebuild 1091 BLAKE2B 2014dc00aed88c563263444a32fa008b440413ddacca3a8e08a9f07191a0595f5166715e12f31c5454b32fe0561476b4b4400aeee6e7a99c9d791f923bd8b4fa SHA512 6760106eb5303b951b3a245de3da8356cf73a7bc6ba788554b308fd31c004ff18729e7c223264df011ac2a3493e201525e394b4f2a63bc4e7fbade9f0056663f
diff --git a/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-rsvg-convert.patch b/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-rsvg-convert.patch
deleted file mode 100644
index 8a92e19e1578..000000000000
--- a/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-rsvg-convert.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- configure.ac              | 2 +-
- icons/hicolor/Makefile.am | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6f87a94..a503da4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -102,7 +102,7 @@ if test "x$enable_convert" != "xyes" -a "x$CONVERT" = "xno" ; then
- 		[RSVG],
- 		[The 'rsvg' binary with path. Use it to define or override the location of 'rsvg'.]
- 	)
--	AC_PATH_PROG([RSVG], [rsvg], [no])
-+	AC_PATH_PROG([RSVG], [rsvg-convert], [no])
- 	AC_SUBST([RSVG])
- fi
- 
-diff --git a/icons/hicolor/Makefile.am b/icons/hicolor/Makefile.am
-index ba0847a..f2e0a84 100644
---- a/icons/hicolor/Makefile.am
-+++ b/icons/hicolor/Makefile.am
-@@ -24,7 +24,7 @@ if BOOL_HICOLOR_THEME
- 	gzip -c $< > $@
- 	for size in $(icon_sizes) ; do \
- 		if test "x$(RSVG)" != "x" ; then \
--			$(RSVG) -w $${size} -h $${size} -f png $< $*_$${size}.png ; \
-+			$(RSVG) -w $${size} -h $${size} -f png $< --output $*_$${size}.png ; \
- 		else \
- 			$(CONVERT) $< -resize $${size}x$${size} $*_$${size}.png ; \
- 		fi \
diff --git a/sci-chemistry/gperiodic/Manifest b/sci-chemistry/gperiodic/Manifest
index b3549721e09e..1e70b609648b 100644
--- a/sci-chemistry/gperiodic/Manifest
+++ b/sci-chemistry/gperiodic/Manifest
@@ -7,5 +7,5 @@ DIST gperiodic-3.0.1.tar.gz 375347 BLAKE2B fb10c7d3484e822e636a8aca245ab2a68a95c
 DIST gperiodic-3.0.3.tar.gz 451559 BLAKE2B b91995046b9905a534e3b6f530aee0ad2b4e6ac42cd11755ea182fdaaf8970f34b1aea8a33870abb8767837606a42a0cf0d76c9a689236aa39fba686e1521ee8 SHA512 7226063cf7977f4283a199d4a3d1842d6c9be60c53f5a005541eb26f35cd6538b29f086dc13c28225779e1849a12d1c39150897055c03902cb00adc011bc1ce8
 EBUILD gperiodic-2.0.10-r2.ebuild 980 BLAKE2B b5ba74641f0f3ae67d8bb727d25d73f05f2f9cd900863264c358ab41be3cfeb9fddd39b17d6eb017238add96318e12d7a6067be57024bbd5b21882ec6e526823 SHA512 3d70210080fbeb3d8689202f21b6aa25f78a4309abe4e72859ec4cb1b66a4a97db5e854b09fec1919e67947c4916a467fe86ccca9538b8e622e18598c820f87c
 EBUILD gperiodic-3.0.1.ebuild 1252 BLAKE2B 852805406f9d9d35f2e70166ec0b49eb557494b86cf028147bf0b2e2fa69450eaec73b3a1e974e001c7c67ddb95b01b14fd6d4a58c9e025e7b9c7adfc4da8c25 SHA512 942525b7106bac0451a802c4a896baf83b310a52c206ee043877f255b1abfa2592ed440dd2554cae5bcdefe210a519927e3fa387d47ad96be36a6701855a9a3e
-EBUILD gperiodic-3.0.3.ebuild 883 BLAKE2B bde1cc41d3a24a30d29d4d6ec60d2f3aece89656d46becc6b42461f78eeafdb0fba5fc48af6226ec3cf547965e55372216ea274da0c00e847e04646b0b0b2b3f SHA512 fe9faaa3caf64744ad0c3813efc956e5bc2aa80b6d135bf401c067047e38b94c4b09e9c50dc22879e75e93caf8f30811c9f736158600d552914fee67fad82793
+EBUILD gperiodic-3.0.3.ebuild 882 BLAKE2B bdf7520bda855a1538578ac7cb46de5717a461a913493e8f1d1003178348f98af5c7cbff9ba12d0a662b68f23bae750f14276db9a804c4dfbfdc4af1346a7ef6 SHA512 60ff9a7394a9e3a141b9f2a214d9abc2bd5996062baa77e6f341e73a1e69a9aa9b3f5e121e0fffc751deb04d41713b3024cb5e9c219383384fd7004a4c360e6e
 MISC metadata.xml 550 BLAKE2B eeb2153919fb1045284131b22a26e22feb0c4671296ed2ba223b0d5f8632d5e73070ef9bf8fbff52c228ad3c9eae23a701b5d3f15e0fb11c5cb0fc148297c1bd SHA512 a847a617e38f540ac53851c97bb30bb3b64d7ca3dac8a89b9a1e70521081cb8e2ee0183c9f9fdfd099532add7dd017cbff53d3b67c7624adc4264953b646e2e4
diff --git a/sci-chemistry/gperiodic/gperiodic-3.0.3.ebuild b/sci-chemistry/gperiodic/gperiodic-3.0.3.ebuild
index 200dad25d4c7..5f92d367c216 100644
--- a/sci-chemistry/gperiodic/gperiodic-3.0.3.ebuild
+++ b/sci-chemistry/gperiodic/gperiodic-3.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/sci-chemistry/pymol-plugins-promol/Manifest b/sci-chemistry/pymol-plugins-promol/Manifest
index 3ab256ab2aba..7a00b495997e 100644
--- a/sci-chemistry/pymol-plugins-promol/Manifest
+++ b/sci-chemistry/pymol-plugins-promol/Manifest
@@ -1,3 +1,3 @@
 DIST pymol-plugins-promol-3.0.2.zip 2219295 BLAKE2B 7e81de98ee20f6b22fabeca35b0825250c3b839b9ea51f6c0b51f15062c73810474bd377d0e39d3c2ac0d61f1b5cfb4174c53f1dfc67a11dfcd707eee417a7ed SHA512 e40e9c08e2cb1b223390d751bb1f32069924f1c23aa2b4bdafb6689254e6aa673d4412aca587792f660869f97a389db8a9183033d8b2394c998d0f911104d8d7
-EBUILD pymol-plugins-promol-3.0.2-r1.ebuild 1558 BLAKE2B f1edafaa69e64650e011441e31270feaed5e4454eff02efc5aabf7395595c37af271152501810b3c55d22bd7573ba7d54fbbc928c08d1b7be97e11762a6c131f SHA512 622299497c6d02a5d29bf30227c92dc00b1bee873b17d39c61c65f2e6b6b3aae7d902f4557cc1ccda14e95f8ba10963fbbcc7e29be6e245f1eeb8d68b08d7c5d
+EBUILD pymol-plugins-promol-3.0.2-r1.ebuild 1560 BLAKE2B c4f52140e4baa9f5a6beddfbace78ff111a3f78f8bdfd0fb220b0e17555175d48533079a798f98eda32b7880f23a37fdbacd0904a988871a1b8eb91f6e9a23fb SHA512 1b3962ba9471e9c2d6af5ebac500a317b44fe261ceeeb8ee8f156211d9aad39ce720e29be5d859a5867df5b87904b2084eb95d21d63806ba0452222ef96ac6cb
 MISC metadata.xml 271 BLAKE2B a446884cbe7a6789e0bcd82759f57bf1ab7b29c5ab714057ffa821c90f799d1fa9f9310c187ee4c3a8ae2476f6ea9d15f368045779f1581e68d02802c61c884c SHA512 3e6e6047a29e07123b81279cae1de17bc4bd4c3d7d8a8d26560114a18185f473d038fc220fa81c7213fa203ce197bad8b1c272d9b7e41cd770a953fa6308ff92
diff --git a/sci-chemistry/pymol-plugins-promol/pymol-plugins-promol-3.0.2-r1.ebuild b/sci-chemistry/pymol-plugins-promol/pymol-plugins-promol-3.0.2-r1.ebuild
index d1c826850f60..6cd842f3703d 100644
--- a/sci-chemistry/pymol-plugins-promol/pymol-plugins-promol-3.0.2-r1.ebuild
+++ b/sci-chemistry/pymol-plugins-promol/pymol-plugins-promol-3.0.2-r1.ebuild
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit python-r1
 
 DESCRIPTION="Fast and accurate regognition of active sites"
-HOMEPAGE="http://www.rit.edu/cos/ezviz/ProMOL_dl.html"
-SRC_URI="http://www.rit.edu/cos/ezviz/ProMOL.zip -> ${P}.zip"
+HOMEPAGE="https://www.rit.edu/cos/ezviz/ProMOL_dl.html"
+SRC_URI="https://www.rit.edu/cos/ezviz/ProMOL.zip -> ${P}.zip"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux"
diff --git a/sci-chemistry/votca-csg/Manifest b/sci-chemistry/votca-csg/Manifest
index fcf8a883ef5a..abcd5ed980d5 100644
--- a/sci-chemistry/votca-csg/Manifest
+++ b/sci-chemistry/votca-csg/Manifest
@@ -2,24 +2,28 @@ DIST votca-csg-1.4.1.tar.gz 347702 BLAKE2B 8c98804bafd75148fa72a9e119d4448ab9b04
 DIST votca-csg-1.4.tar.gz 346527 BLAKE2B 8f0a41f9aa9fd865e2e544d5fd587d93d631edc2dabab8edfc3461582da2e0401a266a42be1c0f1e6647502cdcccee55b5bba891aa156394012b8b5e1b06f7e8 SHA512 26318644c7af2dfa1b81242b27ffac98f2180c3a1f05581bc50a00f644cec4b19ffbaf41c9d941a4714171b56ae93fe41f1a663cd0593ae2b0be2da379119d9b
 DIST votca-csg-1.5.1.tar.gz 708319 BLAKE2B 2ea75cf08dc3005bd08ebe85113d95743fe85bae4b7ac3c2e2d9b64be64a7103ecf30b9edf45cffa86b7588d5c57a0256aef02f4590fa6031cb63881480bd0fd SHA512 3559452182c325d5df72918ec6e12122c8214df9733d779c123ff199597fe47fc493fd75adf1f5dbc6b55016373863378ba3cc69fb6b61bc1531c6e591d8131c
 DIST votca-csg-1.5.tar.gz 429164 BLAKE2B da04bd9ce8e879e9a961006256e03d160fa49fe77aa2f1eff0986b338296b04137bb087ecfabb7f2fc855b0ccd83dc4ddddfd65c43303bf5f2eef0519d27b0ec SHA512 c5a77ded3c9b2582494bea55b464689d566d4155713af823dccc6999f98438444d51fae3948144f82c2aaf3914eee740fe21e8828af689d37ab0b5ffea0605fa
+DIST votca-csg-1.6.1.tar.gz 474044 BLAKE2B 36ededfffe7af5b87b2a031f69afbb9cc727af9454466163312e48c23719f6fe3cb727de96c419ae6e7d4901576013bd76f84d8e7e394cc65df4d83bd1ce30bb SHA512 b8f0f1bf2ca57ee9e2050b4a76e1d725ccb0908314886415f36d4e4554953b4e1c93f7c05502afb77f9b7b5ef3059ebbf7f223b965ba72ae45736798fa2e6ad9
 DIST votca-csg-1.6.tar.gz 464175 BLAKE2B 1871c7edc4b4e848a06049a7c687e906f166312777bdbf5c65be8efe8d5032582fdca9dc7eca453b7013901f409326b0583c79731c68fa2b4e6366f021958b0b SHA512 76cda93023d46a66ae31edcec0ece709ddc70a9be9d098721b945006c197ed3b6cbd1e643158797be518c4fe66f7b23d3e8d8735cbd9e155db3db0d79929cfbe
 DIST votca-csg-1.6_rc1.tar.gz 479265 BLAKE2B c4ba3c81eefd375eea6f8c0b1cd60f9cc80898fb7e8e811ecc286f06d94bd4316edfca277649ec3f7f8b751b2f2928ca2dfe61cc3b1c3060a324ea783c62003f SHA512 6622648ddc3308ca2f8e98d6dbcd28e33a4e0fb44d96ef94ebcaa2e87e5ba3ca2ab83dcc1de4fd0803dbc20ba7192f5fdd2c935b364ed4e2122b5948c10d4936
 DIST votca-csg-manual-1.4.1.pdf 1282641 BLAKE2B 370b7c8997649555fd2360b999cf381c340a74c3747afda23d0e9d346367cc6d14d4e9a0e9ac82184945427d30050dd623dd1b6d8218c6ff3d2f17331987aaae SHA512 e89f41af05eaeb9ea499e8625cc98e2632ec647ec2d8c9c9052dcd4d2935d082b29b51495514e3e06e73ce42b8cda7017fc523a013569378e2bc86bf88ad32d4
 DIST votca-csg-manual-1.4.pdf 1281983 BLAKE2B 5659c2e327ba7bb00fac15adfb578288d546b509366863f593776a62dd3064662535d4fd525f1063f5ccaf47446822f13fefd7f66aa9d68cd1a4a7c99d66a790 SHA512 2e1f4a4375d83df9bd357d4d17e79d26a3a31c9177f008de86721427ffc6f43a5000ec840691108b52a8aecf962321ba6363cd975c7445d7230ee5b0b151b3fa
 DIST votca-csg-manual-1.5.1.pdf 1263719 BLAKE2B 29e2ce27215787a1121e45ec1e88ce7c61ba81709a2519aa0959eede505498b9aaf4f38666bb1a4f97837c98b862e7ed02405da07294a7ec76cc80390fe72e0d SHA512 7d9fb4c635383e1b9c9547691f8729e19f273fcafc4dab2a6b438b3ce98ea05bd31887d09bc4edc86ceb0b04d71a4371aed7aadc3ba6864f7be2ef3328ede642
 DIST votca-csg-manual-1.5.pdf 1273566 BLAKE2B edfa2adb942d968cf79499e89342b7aaab64edfbfb6e02f76a66201df0920a58acc17bf4e2e4846d104519df163223c27f283cc5798ec7b64d9317a7728ff8c4 SHA512 da298ab0c27000ccf7fb5793c4252c4e17a969709db2649a5acb56af6208b954312c46a2ea8399cdb879b699e72a0ded0b2fe1bcd26431c6625f36b09c0267a5
+DIST votca-csg-manual-1.6.1.pdf 1248350 BLAKE2B d4433974e38785fb968bd357ed2914515b2a22a78d6417597265bb1420b5af8b7b9849533a5faba571bcf635eff8385b244b2252bf7a20d3adb9318cd7115b03 SHA512 d627a9c7a71b8ac5e8d6ca109f0ea56978706b0dd1408aaf10b75b4b52f40b6150063248477ca2b5922f603e8d582ddd4dec3de73b3991db5fbb7bf204d347a3
 DIST votca-csg-manual-1.6.pdf 1248178 BLAKE2B 5213d55787041db81fe8563febbf130db6aed9233e569039b66d69cfb173131353d45bef824640ee7b0a3fed7821ede4d5a6ce6ffc14d1548499317afdc0248a SHA512 e91d4b8397b67808c9671b9adbaad41fd9a0ede90066e220839d86f21a9bbcd4e433534faf1dfbca106d55af5a6cce0425a5bdfa3eb30ebe14469594da0129ca
 DIST votca-csg-manual-1.6_rc1.pdf 1248403 BLAKE2B b702eff4a36d27d592147f115f4e9080cbf580b6401141a14865395f0cb927c35f60035f92724e71e5edadbbe3e317f93989eb6f2e0a0e7b9f685e56851546d2 SHA512 2514bd2fee4bae787a3f8c07d1f1d90061a2b503255efe0730ed164bb002c7e7ad7309ccd3b5b931994f70b7ed99afde28955d9ea1b34c86df21bfcb8bfb39bb
 DIST votca-csg-tutorials-1.4.1.tar.gz 6339417 BLAKE2B e9acf8e421f6fce4d97be2d51fb559979c6fd3e6b042525cedf32cadeab1dddc5b1aaf80bbbfd387da3bce71672759c2e84d317c789f616dc71834c72a581fff SHA512 896ec9d6b2537a06301046a74c1957708eb96d9854b3ec855fe3457208c142f6fb26a03e323a2644862a1efd0030fcceb1189f73655b984462f0f7127a02de90
 DIST votca-csg-tutorials-1.4.tar.gz 6348417 BLAKE2B 612fcbc4457a57be74e5306bf86d6e031ea8cd55ebe3f4d246c0876e272e6e6dd535c8dd2f24f7593cb1ef31fbc18111269d29cb69120368ddef7b1b7d25825c SHA512 f3eb28a133ebc04eed07f84d5962943cb9c547c1099638127f15e0015dfdf3f0b25aab4c97d009d6040bf1d69d408cc178edd6e803d33bf1d831e12dca0671c7
 DIST votca-csg-tutorials-1.5.1.tar.gz 5949467 BLAKE2B c6de6084fbb1d2c4ac2ce75d01a1153eabc63386063de800ff2dc6b483b0568191e7f06ddcb8be46123224ccfd3a97f5fb4e7cd603c0ee99a8636d7143f6c701 SHA512 f2e709ae31d914fe12a4ce37b5019deb878b15ade14972f2a8204bec8970ba2c8946b71b94a5bfd6f7569e41173bfbc75275ea09cbee4358ad1de0e84751049c
 DIST votca-csg-tutorials-1.5.tar.gz 5947774 BLAKE2B d497f1e9282c4cacc070d09d901ad8f5d3042ab3a279aa4d1c3bcd3184dc22231d1f2a75ba0ffe245e6f6300fb740e562b24c8039594ec01307491a6068b55f6 SHA512 00447380fa887178ad02cc4e1425a04fc2fd2babdd4790d387fcd4aa2734dc14dacf4b4444d420937aa0a5b53e90741b44f9a4bca31bdcdae10fbfb8323e9848
+DIST votca-csg-tutorials-1.6.1.tar.gz 5945945 BLAKE2B 18ea7e406acf70e37049b1f8676551d96b20825fba25bb9c1e674b0f94f5ee41bd74ce77619880dfb2e2f1f8fb0b40de9ce8a5e9e9d8470639af057376a19632 SHA512 82d60fcea4859e1caa6138147848427dbdb1ddcf4e0713b6f2d50cd624ceacdbce1ceb8e98fb85d079d8d9de02f501ec8c9236243fe75761e44486f27207249b
 DIST votca-csg-tutorials-1.6.tar.gz 5946764 BLAKE2B 018bd00c86c0a85baf35afd2ea4206c96dee8f948dcbf331b53e6f685b69bf2c909731b15ba3261c86cee9e1960ec5cfa7b2ee0c6dcfabbbbc110789840184ad SHA512 36d3a66c19d230f2002170851345da7063aeef1f29841945b8a182f73922617823815dde5d7289fb0f80e771ac03780adacdf95af4814235edbf69a4772b3696
 DIST votca-csg-tutorials-1.6_rc1.tar.gz 5946622 BLAKE2B 7bf0c7083ca7b148d16f7b77b9f785c11b16a8124a5435522e8c065859f4c2ae560c622f04021918b2683c9955d5a1b674c84fad179319f5fedb86616bbe24e7 SHA512 1c89f95944f8277a995d9d6d7dacfae2ae1be54a9a7b19c53d3464a4bdf5da0556e862033ba0a5f442b1ee5bd79bafd478655856fe266f4285c98e14512ce259
 EBUILD votca-csg-1.4.1.ebuild 3204 BLAKE2B e447a6859d7ee4d722701f96634667529bd183f10dd4affeb2713023edfe52ab73988df7ef912963bd154b893bd2d401d2fd110a729040a2a2c52ec5fd44985c SHA512 df94c127269df2a2eaa9643005eeeae6925b458fbb0cb4d1661757a49e5ab4926a613c532e4df4475b34768e904d2388270c868c9ad675cd110e2b1737153e3d
 EBUILD votca-csg-1.4.ebuild 3200 BLAKE2B 041deefd8fc208525c636d00665f7ea70d0efafb78fa98a3437823fb550e6c39a29d33e94860c3d8f01dbbdb050dd568c63dc1099d4da620f9044545850f40d1 SHA512 939608311d071b6abf8cc26dd73c9713c41476772bb37b41fc77fb3a02672989664b8a06e5465b2825285c3365ad3d70879e5c24a1c698cbb3c8ab6d2341fe31
 EBUILD votca-csg-1.5.1.ebuild 2552 BLAKE2B a64b31b3b6a9297b6ead93e9f5605ace929fecf98ee377eff17a0b529b9176fe5d251e9efb5dada1c7d29b144b7e89dcd95ff3c6921b7584f225f842bc93f94b SHA512 3d96fac05c344f0986597ec6ce50f07a19327113d3b02238df60ce28ab2788f91a224f9c70ecdaaf6cfe6206f00f8e86e4ad2dde1c68c5c0a32f5d20eee658cd
 EBUILD votca-csg-1.5.ebuild 2550 BLAKE2B 7fb2a4280fca23370169fbf04c3b9251065f06d56d7df29a26f3bbaf642e3296e400a23cc3c7524a830cee0dd881e598569c82bbcfacbec35198dd564d379828 SHA512 9516699dbfab66505053d701a31440ce0ca16484b6b0f60b072f6d5a54740449c90ea96461e08d598933dd7f7803278dbc4e19df381f5b57c541b9d3de90c9d5
+EBUILD votca-csg-1.6.1.ebuild 2369 BLAKE2B a6d8e7e9049f55f2e916614586bb6ec68e1223ea25cff260ee884f94f137afb798c51983ab7df7b54e918fc1b9eb4c315e380b1a4649e361b999753d11e5c210 SHA512 f72714b948a8c0ca93061aeeb9ff3bc358d8b0c0b5e369dbb732569ad302edf9198753e8e0921fae9cab5deb6ef3e5111d921c3fd4c0a4a8ec3deb41afb43825
 EBUILD votca-csg-1.6.ebuild 2365 BLAKE2B 585240513e8b06c9c35aab0dfb75962c59e2d42853837eaa67d86c728c5cd3d8485061a4974c71898caba41d6d44a1cf93ba27c16824427b767f965e8f9a07ab SHA512 38b6ff068367ac79717f9a364b2b6a83824cec0c804af934f15d3f19ca1cf50eddd8b94cc64c0b035724a6abca2f32a40ec598396c646f5a31c0ea0748bff976
 EBUILD votca-csg-1.6_rc1.ebuild 2358 BLAKE2B 5124239dade6f735c1f1da0071e30bf245728431a46f4361271d1eea9962249ff1bcc621db193f69ae04b61343aaafa01c64cfb4a131c6ce83b9135c5a7f39c5 SHA512 a8f2298c212299689a96d4a15e73b851725f45c6ad9fc20610a155625c5d58d1d462ba7c01fdd206fba8b43fe032b65f992ee58107e1245565cb482f8507d6ac
 EBUILD votca-csg-9999.ebuild 2358 BLAKE2B 5124239dade6f735c1f1da0071e30bf245728431a46f4361271d1eea9962249ff1bcc621db193f69ae04b61343aaafa01c64cfb4a131c6ce83b9135c5a7f39c5 SHA512 a8f2298c212299689a96d4a15e73b851725f45c6ad9fc20610a155625c5d58d1d462ba7c01fdd206fba8b43fe032b65f992ee58107e1245565cb482f8507d6ac
diff --git a/sci-chemistry/votca-csg/votca-csg-1.6.1.ebuild b/sci-chemistry/votca-csg/votca-csg-1.6.1.ebuild
new file mode 100644
index 000000000000..39920bd3c0a6
--- /dev/null
+++ b/sci-chemistry/votca-csg/votca-csg-1.6.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit bash-completion-r1 cmake-utils multilib
+
+IUSE="doc examples extras +gromacs hdf5"
+PDEPEND="extras? ( ~sci-chemistry/${PN}apps-${PV} )"
+if [ "${PV}" != "9999" ]; then
+	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		doc? ( https://github.com/${PN/-//}-manual/releases/download/v${PV}/${PN}-manual-${PV}.pdf )
+		examples? (	https://github.com/${PN/-//}-tutorials/archive/v${PV}.tar.gz -> ${PN}-tutorials-${PV}.tar.gz )"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+	S="${WORKDIR}/${P#votca-}"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
+	KEYWORDS="~amd64 ~x86"
+	PDEPEND="${PDEPEND} doc? ( ~app-doc/${PN}-manual-${PV} )"
+fi
+
+DESCRIPTION="Votca coarse-graining engine"
+HOMEPAGE="http://www.votca.org"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+	~sci-libs/votca-tools-${PV}
+	>=dev-cpp/eigen-3.3
+	gromacs? ( sci-chemistry/gromacs:= )
+	hdf5? ( sci-libs/hdf5 )
+	dev-lang/perl
+	app-shells/bash:*"
+
+DEPEND="${RDEPEND}
+	>=app-text/txt2tags-2.5
+	virtual/pkgconfig"
+
+DOCS=( README.md NOTICE CHANGELOG.md )
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		default
+	else
+		git-r3_src_unpack
+		if use examples; then
+			EGIT_REPO_URI="https://github.com/${PN/-//}-tutorials.git"
+			EGIT_BRANCH="master"
+			EGIT_CHECKOUT_DIR="${WORKDIR}/${PN#votca-}-tutorials"\
+				git-r3_src_unpack
+		fi
+	fi
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_GMX=$(usex gromacs)
+		-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex '!hdf5')
+		-DWITH_RC_FILES=OFF
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	newbashcomp "${ED}"/usr/share/votca/rc/csg-completion.bash csg_call
+	for i in "${ED}"/usr/bin/csg_*; do
+		[[ ${i} = *csg_call ]] && continue
+		bashcomp_alias csg_call "${i##*/}"
+	done
+	if use doc; then
+		[[ ${PV} != *9999* ]] && dodoc "${DISTDIR}/${PN}-manual-${PV}.pdf"
+	fi
+	if use examples; then
+		insinto "/usr/share/doc/${PF}/tutorials"
+		docompress -x "/usr/share/doc/${PF}/tutorials"
+		rm -rf "${WORKDIR}/${PN#votca-}"-tutorials*/CMake*
+		doins -r "${WORKDIR}/${PN#votca-}"-tutorials*/*
+	fi
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Please read and cite:"
+	einfo "VOTCA, J. Chem. Theory Comput. 5, 3211 (2009). "
+	einfo "https://dx.doi.org/10.1021/ct900369w"
+	einfo
+}
diff --git a/sci-chemistry/votca-csgapps/Manifest b/sci-chemistry/votca-csgapps/Manifest
index 0725ec6c70d5..26ba926b94b7 100644
--- a/sci-chemistry/votca-csgapps/Manifest
+++ b/sci-chemistry/votca-csgapps/Manifest
@@ -2,12 +2,14 @@ DIST votca-csgapps-1.4.1.tar.gz 21066 BLAKE2B 8e1d25957b7c62d2182872de4d0c50c90f
 DIST votca-csgapps-1.4.tar.gz 21072 BLAKE2B 30c2f6692544741bfbec09efea2f68ae48cd4716e61e40d3da12a17ad941f2947cc6a8477229b80e420e217a95adff4152a07215e2e913e71736b61ba1ac226a SHA512 325c99606f17d7bb00e2cc3b1545f31dd4cf1fbc0d216f2da2c48e06b2011c9f99096643a6c6efd794a169de056f803f791c156afec4a73e41c58bc4ca1055f9
 DIST votca-csgapps-1.5.1.tar.gz 26006 BLAKE2B 8651978c15087fc7332fe229cfc33d8c4257faf46d72f7ac5fbaaf5f31133c4df3d97cae2b18730b5700e742c27e3db39696fdfe910ed884952ba0f832220c3d SHA512 4f83a46f16eb0a4cb9acc6c0d9523fa746dcf670107355c95fc02daa6ca91fb4f8d5e48bc920d8c13a9445390a25415f7217979903ea86f890df1d4704944c28
 DIST votca-csgapps-1.5.tar.gz 25975 BLAKE2B 185e759d658c6f763da2d26770766ec8ee05017b4c6a67e13915de04fbf2ecf268f2f800c5e18ef0f38c615340b0db163e886dc98a9395a69359f94dc8773f60 SHA512 20dda9d07ef2f33c9decff2766ece8f24cf2562993b4dfb7dd637d84325b835a6ecd30d34c5cfb9c428dbf72c2b5dfe9fd49d266182704b981db151c3c4ea2e4
+DIST votca-csgapps-1.6.1.tar.gz 20128 BLAKE2B 509f684b84e7ebb718fbcf5b48adc732dc8c6b9f6478269e243dda3c980a5d91a46208863ac6227a07d90f6e2ea4e5cf2b50a7b34b6dbe2567d9a95ede4ee1de SHA512 06e396c20990f7bb22ae8c888a36585b40a61280aa53a521c01128bbaadc1f449f85d4f41380ee3ce290defb64eca285be7dde1cd888f4cb69805695511a5b90
 DIST votca-csgapps-1.6.tar.gz 20130 BLAKE2B 0c34fba42a70f756043aae89f51b94cc0a9c9a85680ed78c56b4c05f834d94c74aff59e4adf6155e5fab81d057da58ec420d843532af57beeaa6e81f82432d92 SHA512 5a85abaf6b09a225604f33f2e0cfb774525159e9bce89efd7ebfc0c9c37342e472503ff51c3065be2a4b87e95671f55164c630477f404f94b0510a83e262352f
 DIST votca-csgapps-1.6_rc1.tar.gz 20138 BLAKE2B 9374911f761fd78f01721e8e10f3b9c14f2ba894735735e4d09f5e29eb1d1b69f4fa081699d7a93abfad2ebe55d6439edbb6db547618e6d2cfbaf7bbc8a79ca8 SHA512 153bd6e537175c9908739c60ce80830ebf57c0686f11b21fc541995cb5355d4a3f7f7ee7d1707bb85f5fc859bf260a3a167450175ffe8feb92044e8018be996b
 EBUILD votca-csgapps-1.4.1.ebuild 653 BLAKE2B 208ae3538fcf42296a4a1077d222a9d6f752648834dc8f74941546fa2bdffb6fd9ea60ad31d124b8de52c3f59c089f48d4395b5166989fec19191076570e1bf0 SHA512 13ab1d118aea4f16664566f4e13965cc46a9e67e37157e23ad8c76a68d5db89b8db5b95104c23cf9cc16f78315dc9f632708cbd3920a545d964e2226dc6f9ff2
 EBUILD votca-csgapps-1.4.ebuild 649 BLAKE2B 4b219583f5d5a1f7f4ed7635b4fedce2619d6a0b13bcab7bde2f88cf177a9478fefcb71974deacc09eded4f278ae27c95bd2aa387c79ad4ae2268c2ff0f40a94 SHA512 b6400f2a28ce0c2953495c00aeaab0bfd15c52df28a5e6575b0f568c9a777678495b591cbce58fa61e1d54149fa3f684c6f9f99aaa82127e2eedcc67f6259ed8
 EBUILD votca-csgapps-1.5.1.ebuild 668 BLAKE2B c1a715dcf42281b13819c20b51fc0c16f0435059e4f1dcfe83babd15eda4dc179d50ffe4a6252cd3155aec9545f2e5fc3bba728e2a6f739097422f5c6d94f247 SHA512 23d3ed6be1ea715a367f6203c9431598068ec7b1494865e594a67bfc55bc0f65e86914ad04cff7eff5a9e83fb79cae46fb4abd7997752a1a72dd90a68e173f97
 EBUILD votca-csgapps-1.5.ebuild 666 BLAKE2B de904c4c69f9b223466bc97f646a861a5e1ff64d061389a1a1ac845e7351f9626226354c7c080d7a52ef5db2eddf397b2bf48ce042e168a881cb12da14338333 SHA512 e768e56d45d9e8b4ce2c01358b9de4b876a7a4149947445d388a4a1cffb6ac6882b17cdd794b17eee7abdb75d34c4e108f399c28fbca5ae0b11bbe5d57e07202
+EBUILD votca-csgapps-1.6.1.ebuild 676 BLAKE2B 7e91e674c0e4602b174877aac82562e75f9bcc5a8a5291910f5f801bb8335acc43417594c9a616ebe6fadd72ca165860a2bc3e2b4508e6d8546e1c59542c4cc1 SHA512 4b23fda3ec2857c773ffe2947ede48903f88a664c4e41f07637cbd2859b05c91108295791b53a02a33eab4777c53f89e30fb378721eec402e4abead2c2e8def4
 EBUILD votca-csgapps-1.6.ebuild 672 BLAKE2B 2737abc16e6a06485fb9e542bd620f3ee1c9b63f4fde290558e0674a4cd2488162d917f8654c108080c9370c49fe027e60fe417d33bf6a6be5d14ebd667dfd4f SHA512 af87122c3f45b6003b314373e2a87035a37f6540221c01f31b40573a9ed9973bb9124f35342e601c9c0667db9ee60042b7aca5dbf495079518d5cf62961da852
 EBUILD votca-csgapps-1.6_rc1.ebuild 665 BLAKE2B 893814bcc1e8413a5c6454c32092aa51e3633f2917aedf47bc928c603554acf064a299208e9a1c8cf58437cebdee00f6d07fd30424540081ef3d0c7f2636d8d0 SHA512 a32d204985dd20ef8389cbfd44f6e45d44542480d0593ddaa17d5976e193db687f26d1e818251325c939552c7e9a1c1f95ec20ca952834cc4a4ca6c4836ea2b7
 EBUILD votca-csgapps-9999.ebuild 665 BLAKE2B 893814bcc1e8413a5c6454c32092aa51e3633f2917aedf47bc928c603554acf064a299208e9a1c8cf58437cebdee00f6d07fd30424540081ef3d0c7f2636d8d0 SHA512 a32d204985dd20ef8389cbfd44f6e45d44542480d0593ddaa17d5976e193db687f26d1e818251325c939552c7e9a1c1f95ec20ca952834cc4a4ca6c4836ea2b7
diff --git a/sci-chemistry/votca-csgapps/votca-csgapps-1.6.1.ebuild b/sci-chemistry/votca-csgapps/votca-csgapps-1.6.1.ebuild
new file mode 100644
index 000000000000..cc4f98d6f30b
--- /dev/null
+++ b/sci-chemistry/votca-csgapps/votca-csgapps-1.6.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit cmake-utils
+
+if [ "${PV}" != "9999" ]; then
+	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+	S="${WORKDIR}/${P#votca-}"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Extra applications for votca-csg"
+HOMEPAGE="http://www.votca.org"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-cpp/eigen-3.3
+	~sci-chemistry/${PN%apps}-${PV}"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md )
diff --git a/sci-chemistry/votca-xtp/Manifest b/sci-chemistry/votca-xtp/Manifest
index b03751e4b961..6a89b861c3c8 100644
--- a/sci-chemistry/votca-xtp/Manifest
+++ b/sci-chemistry/votca-xtp/Manifest
@@ -2,6 +2,7 @@ DIST votca-xtp-1.4.1.tar.gz 15214413 BLAKE2B 0f6e67179e2ee1fa8ab79ca0c2d810f9867
 DIST votca-xtp-1.4.tar.gz 15214266 BLAKE2B 435ba1603495d904ccce20b4fa665d3a1c62fc04005ea89cf83b431240fb78f8a44f09ad619af331802e43ca3d05b20a4c6bbbb0c75360940d4f786c0030fd7a SHA512 ffc32260331862393e199f7ab643b1008ee4f800cd017f175550a079afaa20e5c929cb8599bc0c2a2328253051895de7b979f5fec044243abc680a0dc87a69b9
 DIST votca-xtp-1.5.1.tar.gz 14634849 BLAKE2B 84ee9fc531a530ba276a6fd3eccc78dd25c27346db76871f33fe307dde451956bf091b636dd5594bf3b8b24a727fe7e5a730fb85cd2cbb0e5605705996e69bd2 SHA512 8fb6891e84d4d685e26287344554b705c607e7cb9f497c00ac9cd8328e50210c56706abdb7004b83d4addbfbc7b35c3526b4feabf75f681362b3b7a39c54b668
 DIST votca-xtp-1.5.tar.gz 14637712 BLAKE2B af04de706f0d100968928459a03b6a94a94a211b3f5bd056d123756d40760fb0ada70add429ed5b86e211dbdd3b91aa4cf12e51a260638766d04158e7b5a1201 SHA512 693f34004749edfbabcd0a19dc23b3de3c09858c7c0dfe1e420b92632397971e3687489c1074a489d4d2fd337ddc5749c419869db104c65736e7c01bf12cd140
+DIST votca-xtp-1.6.1.tar.gz 1405246 BLAKE2B b32db1e50ebfd79683ea2bf990293d9dfcf7703f3d95467a3fac5f98ec98e9bf1d29bab079e8f328fab8998144af186e7f47e99d9312763f7d73a1ae364ce58a SHA512 8b1bb235e70c239d0c57ceac65cd384841ea136d61f28bc72cbe2cfb47f9d776d42e06180acd1d8da93d0a0586e0bc3884ed82830d0f31c498ce225ca79a45aa
 DIST votca-xtp-1.6.tar.gz 1404955 BLAKE2B 1599281ea1cd6b5a93b1d91f69a793af7bb9cd2fbf70157e5d40a5bfc72f973f3d97338f92157c2c482ad041f8afda298282b1f83dda66d0bb189bdc07bb5a23 SHA512 cb99c31fe7f1af53b8ccf50cc9cc304ed5c5b5d1a165e1a72a456c0bbf5ac8bb9263c9eff829acc74be348192afbf80fd4d80a2c20d1dd5d7f909b1b50368670
 DIST votca-xtp-1.6_rc1.tar.gz 13586771 BLAKE2B d5b72a7389b77df0570eac0021870bba3fa66a89b3a2df1e08632b1c1827884d101ef8d972762dae35e44e53e7a9fe9278d3204eec09c35d091ab3427b055be4 SHA512 0b54eddcf944967b1d41f75f4887eba9edc3be18b94d319e93e795a24f58a2877d7f60afd806290eacb41d329d1b1206ebaab83874d6be2d5b026f06dbc19dfd
 DIST votca-xtp-manual-1.4.1.pdf 1066873 BLAKE2B 8cbd4b55b013794a19a8b5867b929b8e2d9084e6780d777b2a2bbaea23006f4f4ec5b26bd4a07c59e1c6726f23471eb1756b668636e0c4e656a0807e64197586 SHA512 fdf1147f24785524f5e96020fcd29c32bbeef520eebf6afba32b59d7e777d586c452919478d2734c3f021e558b1147b945cdbc0833402be2b16e5af3a8e37f5f
@@ -12,6 +13,7 @@ EBUILD votca-xtp-1.4.1.ebuild 1622 BLAKE2B 1358e16a21b653584fefdf8eb673744f18ba7
 EBUILD votca-xtp-1.4.ebuild 1618 BLAKE2B bab1c2d4cd442bc2208f87ff16ed1218aaf6c34ccb229c63d9de14086055684ee9440102b0c9a5bf807ddad69d22ee1b680120f493f18891e8719211509a418f SHA512 affe412a6c4cb8139530d559ae4c12d519eb6b9190075743ed7806c2975a4647f48282893d71b4bef3477b0d35ee07815e416c33095be819967d235c9623a48a
 EBUILD votca-xtp-1.5.1.ebuild 1628 BLAKE2B a89ea389a31edce013d2e41eca4a0a818fd3f0b359aa9e770ecf3e04089b99063106d8b20562b36ad83fdc318c6cc6ffc119a589d995db08175e704ff7ce53f1 SHA512 a90fd6523ef6d42af25b99509718511cf0303bef2e0b083b6e4e8cbb5160bf1cc802b0e60a682c7bd1301f5b17cbaf78c2d2e593d2528f9c24b5f6c3c1aa984f
 EBUILD votca-xtp-1.5.ebuild 1626 BLAKE2B 15b3e63d11348ac376e15769b6106c98144a0ce88bbc7149fcf98bede2f7a29ee4ea066cea67fadf14e60e6dbc6745de4bffa4cf11d6ce6f08d5631fad0af347 SHA512 ac39f8f262a40683ff267dd13ea17cdfb9bd3ba62d698e8e20c98ee1adce53bd002a10dd7805a4ba419ca80a4a3ffd0b3b5c8f9e4b040182eaa6ffd069df114e
+EBUILD votca-xtp-1.6.1.ebuild 992 BLAKE2B ec7860af210b86c57cecb6adb3ef42130f208a60f23f65dadde98ac751cf8dc0981861b5126c2f97b6e7e20e4d6ab78a847c4e644d21fdf741b91784ce85bdfe SHA512 7174ba2da6f0bc38e2532c525a98c2d4e5641bd6879b9a1d5ed133fbfcd0523420398793edb6a86d033b759e8e6fb5550312608639517c50c4d17876ef9a9cfc
 EBUILD votca-xtp-1.6.ebuild 988 BLAKE2B a0829b922e31fe3e14c60422ebaff3e26da19320b78d22fcdf22de032d9983a98f019a2469ffe9807cc34585fc8655c5a5cc7f80e81c8547e95aa9e569e240c5 SHA512 7643ea1c4b2c123169f8c3a06c4d04e5bccb9070afe70bcbe8c935f956b78ce29c83223e9c54df8915164f0107ffec50b50a639ba0c4407f9cb3e70ee5f93023
 EBUILD votca-xtp-1.6_rc1.ebuild 981 BLAKE2B 029f87e4554e2d353b5ce31f3901b5d18ae56ae4165878066e93d2de5f4ff4c65b9532be077127ec4e605b22ff0c765b841a6f9978cc7e503e50554b0e7ff7b7 SHA512 e2d58abe5b8f8d6b3e2a696a0b0a0f7b27f0af4a88d00d2fc59053dbccd9b7fa840579a5bc3b854bcdf3ce9266d10bacd962d4bada0b5ed325e0074c2d873d3d
 EBUILD votca-xtp-9999.ebuild 981 BLAKE2B 029f87e4554e2d353b5ce31f3901b5d18ae56ae4165878066e93d2de5f4ff4c65b9532be077127ec4e605b22ff0c765b841a6f9978cc7e503e50554b0e7ff7b7 SHA512 e2d58abe5b8f8d6b3e2a696a0b0a0f7b27f0af4a88d00d2fc59053dbccd9b7fa840579a5bc3b854bcdf3ce9266d10bacd962d4bada0b5ed325e0074c2d873d3d
diff --git a/sci-chemistry/votca-xtp/votca-xtp-1.6.1.ebuild b/sci-chemistry/votca-xtp/votca-xtp-1.6.1.ebuild
new file mode 100644
index 000000000000..f617c9003e65
--- /dev/null
+++ b/sci-chemistry/votca-xtp/votca-xtp-1.6.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit bash-completion-r1 cmake-utils multilib
+
+IUSE=""
+if [ "${PV}" != "9999" ]; then
+	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+	S="${WORKDIR}/${P#votca-}"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Votca excitation and charge properties module"
+HOMEPAGE="http://www.votca.org"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+	~sci-libs/votca-tools-${PV}
+	>=dev-cpp/eigen-3.3
+	sci-libs/hdf5[cxx]
+	~sci-chemistry/votca-csg-${PV}
+	sci-libs/libxc"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( README.md NOTICE CHANGELOG.md )
+
+pkg_postinst() {
+	einfo
+	einfo "Please read and cite:"
+	einfo "VOTCA-XTP, J. Chem. Theo. Comp. 14, 6353 (2018)"
+	einfo "https://doi.org/10.1021/acs.jctc.8b00617"
+	einfo
+}
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index fb8ba89eecb1..a52853d6b993 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/gsmc/Manifest b/sci-electronics/gsmc/Manifest
index 0914d6797ede..ba4fc66415e8 100644
--- a/sci-electronics/gsmc/Manifest
+++ b/sci-electronics/gsmc/Manifest
@@ -1,4 +1,4 @@
 AUX gsmc-1.1-autotools.patch 1417 BLAKE2B f44dd414d0708c1334740ef815e6ff2b57cfddb59d9cdbefd551041c41bff221e92589147449681d90cc52425072dc5e1b1278610287b5ac406a49793f3f391b SHA512 5355f5d480afc84950edb2b74d947201c22f722410ced1b645c2e58028e994aff4ca8dd94f658f67f2632753c2584545281e92d30415f2a3d78766cb974d6496
 DIST gsmc-1.1.tar.gz 122726 BLAKE2B 540ac5fcb2057990f1b95c6be844bd3b84c7f0bca8064bf65d93d67dffacfc7dd4197b8de5477518674a8876fe7e69e0ba1e5a24e278c2d8422b35f64343f422 SHA512 ea9db9e4917d82e0d9fa40318a971b63443611ab91b2321115d68fa4083de1879086e5c3392607347e3222fabb9efd5f8175ebb8cd122da479fac1ce7e2d9696
-EBUILD gsmc-1.1-r2.ebuild 654 BLAKE2B 55109068eae58e861bb496851f705bffbb5b2a0e9fff78915ee56bf85c8c8a877e0a0090b01478a62a4a19214b4d8cbadaa6772c16e9bbfc7dc073b7e97063a8 SHA512 6fae3ab953c9a7989973ef1ec088291f24a4c27506ff1ddc7c63bfd39c78b38221d535dcfbba7cb6a69503d51bda41fc10ad5843ddfb49bba9097a003332bfec
+EBUILD gsmc-1.1-r2.ebuild 653 BLAKE2B 80773498afb43cdb33012de595b4f0c4d0f39324e2610e3206b14f3051301a82971f2f0028e28d230ce80efe28e9f015252461a6ac325487b4c1494a0139e9ea SHA512 a340d1ed031c3297d3db6378f9da70d2480f643a7f58952a5832540f91e059c4f2757df4d6f52be8f1c0a91824d8c6295ff5d2563603fdcd0042bf8e888c1454
 MISC metadata.xml 265 BLAKE2B 4a63b8e6f06e5a84e96b45b0873124bb88226e83380ca4b23b73c4583fab34aa3472804d04acf269f2952cb03a2b500a020acc219c2176587200ffc92daa49c3 SHA512 21c421dc2864d898fdf1e5b723e323a6dbbd72cfd32b57eb14776345aba19611c7c64305c63f058fc4767fbd937c9a6252a3b296354739cde07bcc50dc48b756
diff --git a/sci-electronics/gsmc/gsmc-1.1-r2.ebuild b/sci-electronics/gsmc/gsmc-1.1-r2.ebuild
index 5db3aef6c286..a6d86fb2c36b 100644
--- a/sci-electronics/gsmc/gsmc-1.1-r2.ebuild
+++ b/sci-electronics/gsmc/gsmc-1.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"
@@ -6,8 +6,8 @@ EAPI="5"
 inherit autotools eutils
 
 DESCRIPTION="A GTK program for doing Smith Chart calculations"
-HOMEPAGE="http://www.qsl.net/ik5nax/"
-SRC_URI="http://www.qsl.net/ik5nax/${P}.tar.gz"
+HOMEPAGE="https://www.qsl.net/ik5nax/"
+SRC_URI="https://www.qsl.net/ik5nax/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sci-electronics/iverilog/Manifest b/sci-electronics/iverilog/Manifest
index c2373d08abec..55f90f8e1727 100644
--- a/sci-electronics/iverilog/Manifest
+++ b/sci-electronics/iverilog/Manifest
@@ -8,6 +8,6 @@ EBUILD iverilog-0.9.6.ebuild 1123 BLAKE2B bd804cd0e062aad50ae3d13b86181431634a9f
 EBUILD iverilog-0.9.7.ebuild 1127 BLAKE2B 0df427e1b40eb81301e3ad5a783ba439d11e29f64bba8db1bae0b814807525367a1009b7dd3daad2c04e315c0899b32e6b83fa5c034dc821350151e234546616 SHA512 0166372b9aec56da2edce510783bdd9aece5610f418d0ceea081a72f0b7277b62133fcd866360fea449395a7e9bd6a7f24ae03c2373184bd14c1c951e81d4e33
 EBUILD iverilog-10.2.ebuild 645 BLAKE2B bfa32a5577961ef503b53654f1c076cfe8a1cb000a2986ca603404115502332f6c8be2ca10b925ce70f148ee394bed96c6e4f19c303664cde249de7e9dd8bc43 SHA512 de3c3cb13a45900e02cc90a9283a41f5d32e5a6fb6c9f8e261bd356fbcfafd98fd65e38c42324d246927360a6b1af17c0b9d110b38d6f2ce19921b350a19f905
 EBUILD iverilog-10.3-r1.ebuild 1869 BLAKE2B bda326a2afc4ba27c3fb0331033e3f229f323bb0ae7c73f47c9c00363b18c4c16a9ea942d5c7879c8e22f6bd9b86dc7c37370d384ab31d21168d2128cde37caa SHA512 83a96e9ba2ea8cedb81d0cc2f62226afeacfa6c5104213ac040299161500955212b8f6c70f8d991eb478cdfc62779b3bf264704ab68bd26cbc735b7c35e27c13
-EBUILD iverilog-10.3.ebuild 1867 BLAKE2B d3ea7956d726455cb7e6f6afaac227c98d4024bd6e2a1cb5f99a12851048e0ac76c786ac1732da6d85fe887aab1347f7e2ce59980e879ad3c60bd9d3e1f7bbfe SHA512 f08c88003cbf34e86a6455bee1e98551c02a949a5da3645620dc4329615438cadaf6111ec919cc6869d2ee8f0c27e962eaf95b5d7b883505d8848239b1f19629
+EBUILD iverilog-10.3.ebuild 1865 BLAKE2B f3d3828e9d6d5afd7457dbe620450713e7e8e32ed18ee41f36d07eb474bfd979dd5c27b71fdd3a9847cdcec03229586bfd14c170354905573293137ede1853f8 SHA512 4d6d589df25c6f1139f0f24d3d3074c9b7251972d38828d97989806d6f80784049b0b84eaa93f92f24ba3d60499fd612ba32d6443967a7154a197e4a933f3c2d
 EBUILD iverilog-9999.ebuild 1752 BLAKE2B d4464c92e2b93d9aea252530a4a8404c241e8f480f35f92545518812e29e7700842dfd53b40fcacc85faea0d979a3bffef353868d97e23d64a65f07455e797ba SHA512 ada646b38252d99af1f025464c8f0e5ee158d2c087015ab603114f7b4eba235df695a4d6bc546f431a6e3e92f4bd87a3868a8bfe9a40c414cf5b49cd871c0a60
 MISC metadata.xml 904 BLAKE2B 92e78cfceee82ffb4feaee92810d496bf78c3321a81c97fbcc0038244e2ea58e87fec57254ebd90852a4d308bd08d944659ce59b339b2762ba26843c8ad59cb3 SHA512 8c3633d7bea101dc771c26355b40d309eb5b0b3ea7bbf3538faaa9c7098253eb623aac3f9e312aed25a9262116d013784adf02d9f2a3943a5fbec3733dab250f
diff --git a/sci-electronics/iverilog/iverilog-10.3.ebuild b/sci-electronics/iverilog/iverilog-10.3.ebuild
index 55e7f1e7c1c7..a2dea488d4fd 100644
--- a/sci-electronics/iverilog/iverilog-10.3.ebuild
+++ b/sci-electronics/iverilog/iverilog-10.3.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/steveicarus/${PN}.git"
 else
 	SRC_URI="https://github.com/steveicarus/${PN}/archive/v${GITHUB_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
 	S="${WORKDIR}/${PN}-${GITHUB_PV}"
 fi
 
diff --git a/sci-electronics/netgen/Manifest b/sci-electronics/netgen/Manifest
index a91f7cd10638..74557c59fcb0 100644
--- a/sci-electronics/netgen/Manifest
+++ b/sci-electronics/netgen/Manifest
@@ -1,4 +1,3 @@
-AUX netgen-1.3.10-tcl-bin-name.patch 520 BLAKE2B 313fe29ce7f77c2af6a401a1953393e7baaa263ade4254645959b376f8c9663b3733d5bed201cb658c08635948e7bd1f3403632e4b45c5ae7cc94c58d76a84e7 SHA512 f7f89e1506806b37c9b54a12ca16d95a1f9bd6296c42bc813902151d048e5a58258941f454a0d73f12c146f2792bc972bc64dd503b899ca2ccc16bdf65ea86c0
 AUX netgen-1.4.40-tcl-bin-name.patch 520 BLAKE2B 313fe29ce7f77c2af6a401a1953393e7baaa263ade4254645959b376f8c9663b3733d5bed201cb658c08635948e7bd1f3403632e4b45c5ae7cc94c58d76a84e7 SHA512 f7f89e1506806b37c9b54a12ca16d95a1f9bd6296c42bc813902151d048e5a58258941f454a0d73f12c146f2792bc972bc64dd503b899ca2ccc16bdf65ea86c0
 DIST netgen-1.4.52.tgz 408225 BLAKE2B 49b19832a9f3fa22eca82846f4cca0774c8ba8f0a342a350ef5bc8ffa72f5ccfc6917876c9d8cad3c9b25ad2923ec24d7e8d88e099dda79c6139680ebb84b767 SHA512 ecee6243181e90fbd277c1315b28c34539ebdf254a03544819dbeffe8ddd22fb7ca76c783364bbf97bfbf269cbb446dd6e16f95621774a6cbaa83f0e0b6dd703
 EBUILD netgen-1.4.52.ebuild 691 BLAKE2B c3137571535fd1ad3513c10233d8c167f775317890c96573ce0fa3670649c27f2f00c8a79111704d8df6aac406d26499aca21f3b1257b1831c4cf5d89380c294 SHA512 eba6b310c10aee3c115527c79976e261d69a23af27c8bebd7790de4bb255b98b8f7d03882a6b447589dd59f8168aa9f4cf1a4db8d759d7eaa5ea78653778be7c
diff --git a/sci-electronics/netgen/files/netgen-1.3.10-tcl-bin-name.patch b/sci-electronics/netgen/files/netgen-1.3.10-tcl-bin-name.patch
deleted file mode 100644
index c0caf10361a1..000000000000
--- a/sci-electronics/netgen/files/netgen-1.3.10-tcl-bin-name.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- netgen-1.4.40/tcltk/Makefile
-+++ netgen-1.4.40/tcltk/Makefile
-@@ -42,8 +42,8 @@
- 	${CP} $* $(DESTDIR)${TCLDIR}/$*
- 
- $(DESTDIR)${BINDIR}/netgen.sh: netgen.sh
--	${RM} $(DESTDIR)${BINDIR}/netgen.sh $(DESTDIR)${BINDIR}/netgen
--	${CP} netgen.sh $(DESTDIR)${BINDIR}/netgen
--	(cd $(DESTDIR)${BINDIR}; chmod 0755 netgen)
-+	${RM} $(DESTDIR)${BINDIR}/netgen.sh $(DESTDIR)${BINDIR}/netgen-tcl
-+	${CP} netgen.sh $(DESTDIR)${BINDIR}/netgen-tcl
-+	(cd $(DESTDIR)${BINDIR}; chmod 0755 netgen-tcl)
- 
- include ${NETGENDIR}/rules.mak
diff --git a/sci-electronics/splat/Manifest b/sci-electronics/splat/Manifest
index 092bdbb3343c..c796f39f3485 100644
--- a/sci-electronics/splat/Manifest
+++ b/sci-electronics/splat/Manifest
@@ -1,4 +1,4 @@
 AUX splat-1.2.2-gcc43.patch 205 BLAKE2B f145e08d07cf755914700690737f6ebc4230c598083495d1abe99586fa4302fd5e361c5277fe3daf494686e2ea551941f4a32c953f2f4c407474f2ba2ebac357 SHA512 ce99a5688305cc0bc53544b8c57cd73d3a9ccaaa7bce1115f63ee79c93c06f9ec80d694fcedcbded35b1f12d9b8b1d79022de7afb7fa43980710c4928c6dcf21
 DIST splat-1.4.2.tar.bz2 356823 BLAKE2B 7e4fe835128ae88b6d44d87159a5eab8652eed26876a637e613f57177ebfca8df7433455b53124318a2a0277bd09ca2cb9ce74ab205f5c6d1417fa736934b3fa SHA512 223b6184b1df35052709ba3b0e8679b9f6a2933c98ac433b0f07cd93b07213f55399a6eeb8e955a86fb59d13e09d891fc085ac17594f561268da239c30e885bb
-EBUILD splat-1.4.2.ebuild 2408 BLAKE2B 9526798d8ffc9bb9f3e76de2f5bbf822bfcede2dfea9c2f2b063acf7aece7ecde4cc9cf58e83caaa6dc6c09f3a82f49a09bfc87af612885c4219a9c8c789f158 SHA512 c665a8601bbaab1445f03fc5dcb207aeaf83d8eea9ecd8cd476e963b0afd9b43b0652f578f60341de2664fa289cb8e2150cc40c31e9a7744919f85b625a3ad4e
+EBUILD splat-1.4.2.ebuild 2407 BLAKE2B 028a27a08b356313e22682508329dfe6130966530ba2fb085df5ca30deb36a094da80f56300e6c0e05c4429ca696b5a6bff54817af26e376746fe88a6fb9831b SHA512 e4270d9c782b189bf827fa1f7fc53d73674b73b7c0b07d3f609f2532da412589480a91caebe163610ba292cc4d3bd907ff9b75515870d115033e3f27b41d2b97
 MISC metadata.xml 740 BLAKE2B 20f01ab6e9fb164deaf70b2e0442a3d5c0df7131197da4e9a07c9928f14124e2d803a7779ddbd43d2d714ee57b48086ddd04c86bbe1dd4e565395f9eeede9a29 SHA512 7aae74c935e1a47b38e5bcbc08348e954625c5eb21fee593ab5d2662bcc2724f40ca4c62bc58145c9856b1a4167f23ce4b27c930f43eea4089f0edddcb1e82ee
diff --git a/sci-electronics/splat/splat-1.4.2.ebuild b/sci-electronics/splat/splat-1.4.2.ebuild
index 9514bcfdaf4d..e498c4b7c91b 100644
--- a/sci-electronics/splat/splat-1.4.2.ebuild
+++ b/sci-electronics/splat/splat-1.4.2.ebuild
@@ -1,12 +1,12 @@
-# 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
 
 DESCRIPTION="RF Signal Propagation, Loss, And Terrain analysis tool"
-HOMEPAGE="http://www.qsl.net/kd2bd/splat.html"
-SRC_URI="http://www.qsl.net/kd2bd/${P}.tar.bz2"
+HOMEPAGE="https://www.qsl.net/kd2bd/splat.html"
+SRC_URI="https://www.qsl.net/kd2bd/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sci-electronics/systemc/Manifest b/sci-electronics/systemc/Manifest
index d565da571605..73915e4fd745 100644
--- a/sci-electronics/systemc/Manifest
+++ b/sci-electronics/systemc/Manifest
@@ -1,3 +1,3 @@
 DIST systemc-2.3.1a.tar.gz 7050669 BLAKE2B eb080ba177ada7fcd816134e62e6461da59a186cd5d1a14627d69d425f72becd587ef7d31e9e48af76cf54f92ccf83f38a079e5598b4fe2e6b349dc4ec74f640 SHA512 cd52eb6e413c8b852e19c8387766eacbddf85e9b2f4d137f3d82d0d4025f13a44216a2e6cacf7b9e2b972584912a4a1c75cdb37a568330ce66a6bf909ca1b723
-EBUILD systemc-2.3.1-r1.ebuild 1332 BLAKE2B 89c5f6273b8218883201b076022ccf2b8a0863a854ed8b8fd17d4777504c229b171bdf036e1067c324d212e3121d74d38b49ce18b9a116ef3d348d5279d93125 SHA512 766d4e865078ff63b1c85185d6120ebaba75ae7cf2e9a7f8d5dd3747c5824caad0f8c9a2f5535f03aeb06da4328611bc632a44abeeb392ab09c8d6543d567c4f
+EBUILD systemc-2.3.1-r1.ebuild 1331 BLAKE2B a728bdd43f709bea98919ec750c79e908ce399d0469f99b4279cd227565db0847c7156a71177cd8a8677150231c16ce775a73dcfc30b12a56317c065b392b3c0 SHA512 8510e33478f9705c8ef435a4a19d1d8dde901f461d0f049109c4d1041ba33220321e4e733f75eb58f770298adc5e499f59c756e8f71587e55b5636bbafa1a949
 MISC metadata.xml 742 BLAKE2B 498b0bb60374137fcefdf08bb2c751d20fa7795777627a8b30bb7c4039274dc0d6f3bf88decb8ee49aa26fae32a53f4219c8ef73faedc2cde825961fe8999fa5 SHA512 a3d752c7f86e8d03dd62e0dd9c0e35ea38b654fa36db05925b7339d3a34e4bd97216948f10202f4a8efd7ef8ab15cc91d1437179b592816bd8bae63d3f5dffa3
diff --git a/sci-electronics/systemc/systemc-2.3.1-r1.ebuild b/sci-electronics/systemc/systemc-2.3.1-r1.ebuild
index bd72930845c8..118bb843f610 100644
--- a/sci-electronics/systemc/systemc-2.3.1-r1.ebuild
+++ b/sci-electronics/systemc/systemc-2.3.1-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
@@ -7,8 +7,8 @@ inherit eutils toolchain-funcs autotools-utils
 MY_P="${P}a"
 
 DESCRIPTION="A C++ based modeling platform for VLSI and system-level co-design"
-HOMEPAGE="http://accellera.org/community/systemc"
-SRC_URI="http://accellera.org/images/downloads/standards/${PN}/${MY_P}.tar.gz"
+HOMEPAGE="https://accellera.org/community/systemc"
+SRC_URI="https://accellera.org/images/downloads/standards/${PN}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
diff --git a/sci-electronics/voacapl/Manifest b/sci-electronics/voacapl/Manifest
index 7b072393f400..128a54e29767 100644
--- a/sci-electronics/voacapl/Manifest
+++ b/sci-electronics/voacapl/Manifest
@@ -1,5 +1,5 @@
 DIST voacapl-0.6.7.tar.gz 2061884 BLAKE2B cd0843f42f7284ea77be125b879c7304c50991540c1c376c2f684a8ef0def313b70a11d65a890d5b1458d51cd113e69ba3731f0eb5121f1c90b9555b449b58ed SHA512 bdd8c420ea1bb352885a0a127db1494b8cbb6d01e78fa47e577314e39b35d8265e1b62e99719edce512200ed84644dd6693e88aea63ab7416b1f24a3b25cdbc8
 DIST voacapl-0.7.2.tar.gz 2054761 BLAKE2B 8a6dc0f0af9c42b9463b4b436c8652e049b5e8b9874406da33352f5ad67e154d977ffadabbfd92764be61cfac1fea22f0900c3cf1a6c80b3e0c2297e4623df61 SHA512 d78bccdfb7db079dc77e60f80bbae66a48d6173fccec9dd32a6a0cbc283af64d8ab05eebd1e43f4b0461653919a557a88c9b3603b5d13927fbda41d2cbab78c0
-EBUILD voacapl-0.6.7.ebuild 532 BLAKE2B 19c961cb23fbbea8fff25c7ee17846bc9fc011b6dff532d8d8301e423d40800968735d8711780f330bdf5b1405329ad57a03786b1c3d4f5cf8c5dc7a23e16b19 SHA512 2089971303460eb506b59c443c31e18d09bc325515b70914506bc0053b1896c5ea0a64fff422dff21d628448ec16aa5bf56bc4eef60da64e15e8d754a1406169
-EBUILD voacapl-0.7.2.ebuild 452 BLAKE2B a209977f666a988664e2bc1f0d72702f1b8c2f9d624f1e566849d98fb05feef1bf74e83ee9bfbbee372c3ff2c77f16959388059309764be2cca01085ff0a6b83 SHA512 ae9cdfc5a8a56981a141d721fe69e86ceb03a297c155bba98e870f2e79e9e8273dc4f9ad5481dcc49235d0b1109b5c463b8bcebe0a7f96801c1314f1246ec6c7
+EBUILD voacapl-0.6.7.ebuild 531 BLAKE2B 9c848a3f9c95ab0f9b27d1afa172479eaf6fa3eb3df8eeffad4cd6a8f98b294cc36baed3146cb27a4a507da1b96d56f7db9f289967c5907490b3f3733be7ad79 SHA512 32717d37a313c4fb68c960105dd1542ff554c487170c7b4701ac7d523172b6efc75a8cb6fd4ddd1c7eb37f63ecb2073ad3b9be6e1358178238dc0540021b8317
+EBUILD voacapl-0.7.2.ebuild 454 BLAKE2B c51603d3bcd3a614c87a9ac2bf5193299f396da39d378758655e141413c8c8b9760446623f1af422cbdba232077b02dc5d0a1d5d7d9bd98e6b47885bc1457001 SHA512 0b3829584b4b49d132ca6dd7611cd02f06b8c4829d8030019d396421c6a759c06e2e8c18a29cf9a41ef2d2fdc93d73ebb90dc6b34b16dabcf294b3becf1f0cd8
 MISC metadata.xml 249 BLAKE2B d6fa8a349066f9684c68c3086f53e41ebf30b6e313e8e8e752a953c0eaa0853448fe17e5ed46836bc5e149a282a33c7408c675d3b39eb3d59ddc1c1ad86bf716 SHA512 965ae00fa198dd8f5869c4c14ff3e28c7d76be7182be6ba4bedbb68d7138da5be3c8bb993689db2c73ac328456015ebdf018ee1b308d6988067810d1156bd179
diff --git a/sci-electronics/voacapl/voacapl-0.6.7.ebuild b/sci-electronics/voacapl/voacapl-0.6.7.ebuild
index e27ac2262c93..4f6b0eb4b26d 100644
--- a/sci-electronics/voacapl/voacapl-0.6.7.ebuild
+++ b/sci-electronics/voacapl/voacapl-0.6.7.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"
@@ -6,8 +6,8 @@ EAPI="5"
 inherit fortran-2
 
 DESCRIPTION="HF propagation prediction tool"
-HOMEPAGE="http://www.qsl.net/hz1jw/voacapl/index.html"
-SRC_URI="http://www.qsl.net/hz1jw/${PN}/downloads/${P}.tar.gz"
+HOMEPAGE="https://www.qsl.net/hz1jw/voacapl/index.html"
+SRC_URI="https://www.qsl.net/hz1jw/${PN}/downloads/${P}.tar.gz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
diff --git a/sci-electronics/voacapl/voacapl-0.7.2.ebuild b/sci-electronics/voacapl/voacapl-0.7.2.ebuild
index 4c91aec529b5..d50e3b75f800 100644
--- a/sci-electronics/voacapl/voacapl-0.7.2.ebuild
+++ b/sci-electronics/voacapl/voacapl-0.7.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"
@@ -6,8 +6,8 @@ EAPI="6"
 inherit fortran-2
 
 DESCRIPTION="HF propagation prediction tool"
-HOMEPAGE="http://www.qsl.net/hz1jw/voacapl/index.html"
-SRC_URI="http://www.qsl.net/hz1jw/${PN}/downloads/${P}.tar.gz"
+HOMEPAGE="https://www.qsl.net/hz1jw/voacapl/index.html"
+SRC_URI="https://www.qsl.net/hz1jw/${PN}/downloads/${P}.tar.gz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
diff --git a/sci-electronics/xnec2c/Manifest b/sci-electronics/xnec2c/Manifest
index d9faf01a2ddf..d0b1bfd3390a 100644
--- a/sci-electronics/xnec2c/Manifest
+++ b/sci-electronics/xnec2c/Manifest
@@ -1,3 +1,3 @@
 DIST xnec2c-3.5.1.tar.bz2 995554 BLAKE2B 697a7f1d5d89e108ebc02b6f21a3e9593cf617778f3b19c2bee2d901095c48e639b86922d360c752b8e9ecf1cb1dfd58169c33df3ee2d620968c236db334ba39 SHA512 3ba4bbe9d013176ced4d5aa584cd1e4b55caeb193cd3ec905e460421ed21038ff44dea332a3aa0650c34df6ef6bf5a2a9cbf5da7c7ba892b82c2fe7e253d99f5
-EBUILD xnec2c-3.5.1.ebuild 717 BLAKE2B 572b32a0a74084a70b8544dbb2d1422ee7f24ca51a75cef236a35886ceab5734695958b33ca2b436bae3070334a225b2d2b76dca8d927992f2dcb320f011f654 SHA512 3979a454c3ba3a0a3added8ce8928cbfe861f5e4710f725b617e073ca5d16360b02741ec29033c9c08a214b2ffb12bc95d505d77338693e85eb7ffe6bce2d47a
+EBUILD xnec2c-3.5.1.ebuild 716 BLAKE2B 34f78e5afb9cfcb52a54f2df1bc09a228ed0a0c902f99294e010af0f9c4761cdcf09f02f04b8c730f89633a0ca365f592d411203efcd860c167d1050a4ed3274 SHA512 2d62050fdadbe7792d173cced5db579288ebf716f9461b02ab22507b643009648fdaecf1ad473d3baf6b44600ea3c041268263780be4bcae8c5f2ac32e3e2bc3
 MISC metadata.xml 1634 BLAKE2B f210b33b42df3619ad9f7870f35bb7330ca62005b2d47bc07024d3e8b1d4c52e340f0c790c5529c1838d14c244c2aaadf136178c9ab2d6eb7bfcd2ea66c44814 SHA512 3ba6cbd28a2f3d969c392607b29dfbbe225898674bbd9fbd732890a07c68514d3976739b04668bd255aa891480fd05dd3e7bfa6883b6594c00b594f85816ab32
diff --git a/sci-electronics/xnec2c/xnec2c-3.5.1.ebuild b/sci-electronics/xnec2c/xnec2c-3.5.1.ebuild
index 96831025485f..8bcf439db3cf 100644
--- a/sci-electronics/xnec2c/xnec2c-3.5.1.ebuild
+++ b/sci-electronics/xnec2c/xnec2c-3.5.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
@@ -6,8 +6,8 @@ EAPI=5
 inherit autotools eutils
 
 DESCRIPTION="A GTK+ graphical interactive version of nec2c"
-HOMEPAGE="http://www.qsl.net/5b4az/pages/nec2.html"
-SRC_URI="http://www.qsl.net/5b4az/pkg/nec2/xnec2c/${P}.tar.bz2"
+HOMEPAGE="https://www.qsl.net/5b4az/pages/nec2.html"
+SRC_URI="https://www.qsl.net/5b4az/pkg/nec2/xnec2c/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index ec2a15a2b2e5..0e489edfa04e 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/osm-gps-map/Manifest b/sci-geosciences/osm-gps-map/Manifest
index bfb8f71ddfc9..128dc0adf611 100644
--- a/sci-geosciences/osm-gps-map/Manifest
+++ b/sci-geosciences/osm-gps-map/Manifest
@@ -1,5 +1,5 @@
 AUX osm-gps-map-1.1.0-gtk-doc-module.patch 392 BLAKE2B 73bdfd92240b7e96b05a3cf1c6b77075e1b2e45f47919b3123a036f71c43ef6530f939f40609531287594802f37d07d59cfc8de8fb558e99f33710954acd179c SHA512 e49ab51ed248a2e05130bb7c7774c486a71af46207e855ad95d6373d3a6859bd52d56cf7957a3b16f5d65114697f27aff1d3a18a398ea846b77d25c35752c404
 AUX osm-gps-map-1.1.0-no-maintainer-mode.patch 1048 BLAKE2B bd95f60bf9ba525e7bb9ffbc46a4003a4f00a19e156ba2a288aa0aff0a72fc2d5363004ef3e91aeb6d3c2caea43f710cf77dc76d61b26834be359558baae7af6 SHA512 e6cd05ca74d77851b4b40ec167bad20f1b06840378ef93f4f961fcf795212d5f0f5ae4198bd345143e0eb0418c4bfd9e59d62b69936ae68cccb24fb84d9f87fa
 DIST osm-gps-map-1.1.0.tar.gz 440480 BLAKE2B d1847937b4f9691c2ba14908f3cbca3c9911f76e05a6f8e96cd741ca291b74e238a06b6d01fbd8bac9c43bdd73788e8ef0c035d75290ffb631a15ee0b9f749e5 SHA512 74924e5caa0b2bac822f678236d94203b34d9af1dce24cfcd44e1fb9f7551558137dd02b35ca970e36472748acfd611c6251ff5c52d998bfaffccb9821cc0fe0
-EBUILD osm-gps-map-1.1.0.ebuild 892 BLAKE2B 31040324b37c0e3df7e4338a83d6d476fd47b5f2ff53bd02e5ccff711cd45cdb5088616297f7aa14ba643782916b714029f138e641ffae6d79490e9d7d2bce0f SHA512 356bc4dd01e5feebc5ebc610aa6eef2461b7a1b55d47a895ff43b496d93ac99140fd3f0e86c016717c7891bef461487ee7b0ba771632861f0b4d33826704c6a3
+EBUILD osm-gps-map-1.1.0.ebuild 899 BLAKE2B 52bc75f8caf261415dffc1d7bb4f5256dbc9ee5c1e17cf52020b91b15ec365f09e19dcff5cce697137c54b50751511a44a54f0d18d8685c8e24a5de9b4ee59c8 SHA512 c868f9a711c0ce574376954499a68ab05411e136eba282be7fb7668a89262e1fb2eae2e38ec30c513a150c76f0dd07fdfdf95e274c2d77daedb545077cb61363
 MISC metadata.xml 327 BLAKE2B 33d0eccf4eaefa31ad6a2a5fa2aea8ac9a03e9c423c8c96400c4a6921429886bcba4c388f8ed739af67673bc00cc07a038b4664a23c6a808b1b9a699866860c1 SHA512 67dd8500028be31b9bbae47ea255981f82762bc6a1c2a98b1d76c04e09e3bd794bdcac589e09c9158425e9ed8500a2d8d02d5add82e5d269848ca19b4fd299ea
diff --git a/sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild b/sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild
index 2fcde8616055..504900c0a3fa 100644
--- a/sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild
+++ b/sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nzjrs/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 7a7911854826..df84b755cc4a 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -2,9 +2,9 @@ AUX qgis-3.10.0-cmake-lib-suffix.patch 507 BLAKE2B f9a383f380a8e5375e062350cc81b
 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.10.3.tar.bz2 102032791 BLAKE2B f64375438698f5477162644dc233e1014e6b541c5630398daa164582c3fb9130516144a9b0a5405948923416c1239cfa5260ee1e2f195b437044b0ae1bb29b9f SHA512 05501763e6ff38caa3b527e2f800da945bc08a9a194aae531c4466b76bc8bd18582e2ed5eceb82affaeec3db895ab9e36b3e09c9a4c7b3406bf98c88d54cc1a4
+DIST qgis-3.10.7.tar.bz2 102154692 BLAKE2B 9b54d542770f149eb3c413ef867a012e28e4121ff38114ef954131f55dea54cc8c0d4e65a5e8eac9098fb596af7b8d2f77ddfb2f8d0170d2e1a5b59569952151 SHA512 b10d81d24c7cfb8b285b6d9884dfe19ba33b032cd843d29b879159d203454fd359a669047b677baf515d92ce331ba66f59dc2466beae2048920b2c0da0c3d666
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
 EBUILD qgis-3.10.2-r1.ebuild 5605 BLAKE2B 6a843e029a5428a3908d8029056b0dcf50b59417d3f0f3b0f0de269b049bae110d69d80c11d588c769b54539457bbdae425820d2c1438684db2a13e8875a2fd6 SHA512 a2ade40ebb1b8ed733af9b36c265cd9254a3b13d4f46a6ae0640f0786d760878d4bc6667c3c413f3f24b5880692c72b9254c564edbe01799a4864fa16bf757a8
-EBUILD qgis-3.10.3.ebuild 5607 BLAKE2B 3acd63ef9604d2860ff2a8d6a2291d35f8d39ba277ecbedf81336b6d7142ec6ae9509c1325cfc5d1595aa4b669d5e69b9740020b251c59b9e009a28f17607037 SHA512 f86052c3b6d11030293712bddf071a969fb7cbff86ecca27d920019bb735fd8be0485ba1066b069d57067533071302af780d19d5c2034325e861c7a9c12e7706
-EBUILD qgis-9999.ebuild 5607 BLAKE2B 3acd63ef9604d2860ff2a8d6a2291d35f8d39ba277ecbedf81336b6d7142ec6ae9509c1325cfc5d1595aa4b669d5e69b9740020b251c59b9e009a28f17607037 SHA512 f86052c3b6d11030293712bddf071a969fb7cbff86ecca27d920019bb735fd8be0485ba1066b069d57067533071302af780d19d5c2034325e861c7a9c12e7706
+EBUILD qgis-3.10.7.ebuild 5447 BLAKE2B 63ac17c1c6e2ef62207d2674c38bde5ef0f89cecdd9acd745d5c3efe46291d38925e5d92141c051fab3080cd479b4cd13bcee052895c6b0f6bc58501b987d375 SHA512 479a56d2904d296df36f0b9b171a9127b89d677e6f87b761bd85b0872eb7ae585b4277be58d6e841c6d9b0ed4841b5d1da7f7a528924a027419380e588a83180
+EBUILD qgis-9999.ebuild 5447 BLAKE2B 63ac17c1c6e2ef62207d2674c38bde5ef0f89cecdd9acd745d5c3efe46291d38925e5d92141c051fab3080cd479b4cd13bcee052895c6b0f6bc58501b987d375 SHA512 479a56d2904d296df36f0b9b171a9127b89d677e6f87b761bd85b0872eb7ae585b4277be58d6e841c6d9b0ed4841b5d1da7f7a528924a027419380e588a83180
 MISC metadata.xml 1413 BLAKE2B 63f664d32aa9df18e147346271d3fb1f49148848c7177cb22001962ecf1c32f69cc9758ddfabcbd3b8996f31a018dc1fb71a10d6d2e40ba79cad3e63c6ea6e75 SHA512 c1956fc3bb77b78d24547467fea5d71d2b22cd0f09be4b029f603952a7080c2f40ff00a7e45fc844774977978ad96e936de45296fae3d44aa93fda8f17598a99
diff --git a/sci-geosciences/qgis/qgis-3.10.3.ebuild b/sci-geosciences/qgis/qgis-3.10.3.ebuild
deleted file mode 100644
index 74129055f6bb..000000000000
--- a/sci-geosciences/qgis/qgis-3.10.3.ebuild
+++ /dev/null
@@ -1,206 +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-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-${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.7.ebuild b/sci-geosciences/qgis/qgis-3.10.7.ebuild
new file mode 100644
index 000000000000..5009332eb58e
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.10.7.ebuild
@@ -0,0 +1,203 @@
+# 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"
+QTMIN="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-${QTMIN}: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-${QTMIN}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtcore-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+	>=dev-qt/qtpositioning-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtserialport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	media-gfx/exiv2:=
+	>=sci-libs/gdal-3.0.4:=[geos]
+	sci-libs/geos
+	sci-libs/libspatialindex:=
+	>=sci-libs/proj-6.3.1:=
+	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+	3d? ( >=dev-qt/qt3d-${QTMIN}: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/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-${QTMIN}:5 )
+	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qttest-${QTMIN}:5
+"
+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-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 74129055f6bb..5009332eb58e 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite"
-QT_MIN_VER="5.9.4"
+QTMIN="5.9.4"
 
 if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
@@ -26,9 +26,8 @@ IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
+BDEPEND="${PYTHON_DEPS}
+	>=dev-qt/linguist-tools-${QTMIN}:5
 	sys-devel/bison
 	sys-devel/flex
 "
@@ -39,26 +38,26 @@ COMMON_DEPEND="
 	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
+	>=dev-qt/designer-${QTMIN}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtcore-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+	>=dev-qt/qtpositioning-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtserialport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
 	media-gfx/exiv2:=
 	>=sci-libs/gdal-3.0.4:=[geos]
 	sci-libs/geos
 	sci-libs/libspatialindex:=
-	>=sci-libs/proj-4.9.3:=
+	>=sci-libs/proj-6.3.1:=
 	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
 	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
+	3d? ( >=dev-qt/qt3d-${QTMIN}:5 )
 	georeferencer? ( sci-libs/gsl:= )
 	grass? ( =sci-geosciences/grass-7*:= )
 	hdf5? ( sci-libs/hdf5:= )
@@ -74,7 +73,6 @@ COMMON_DEPEND="
 	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}]
@@ -92,12 +90,11 @@ COMMON_DEPEND="
 			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
 		')
 	)
-	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
+	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
 	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
 "
 DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qttest-${QT_MIN_VER}:5
-	python? ( ${PYTHON_DEPS} )
+	>=dev-qt/qttest-${QTMIN}:5
 "
 RDEPEND="${COMMON_DEPEND}
 	sci-geosciences/gpsbabel
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index 2ed48279d405..e30f424bac9d 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1,7 +1,10 @@
 AUX FindPROJ4.cmake 5695 BLAKE2B 916e3cb12a6dfb8428bfa97d74dc34b4b357935cc6be1e07444cbed86ace926348c0b94a0061cde1edd1ab0dfd330b57dabd7cc9be5317c761c307f61fce3c9a SHA512 d110ae4081ba75cdcee0feac9967a8f59218f12cd497a48434e6289a2fa1b04116a84582191ff45b8eda4af2dd4b6611b5035422af392653e3548e1829f2acd6
 AUX qmapshack-positioning.patch 482 BLAKE2B cb7d7b8f74a23828503c76e0cf3c7120af1aa412512461ae0e3e4a051ed7d8b89f9254a2397767b6ff56f1cbeefb1a6347f546222e991946dae3235da194d774 SHA512 245524903ec5db0da9d1874f0b5c0e2a318f6b955970da2645cff6dc1b21adb0565728021feca2cd236af9d2e60325e0bce1bb8084390d073200c5bad65d7175
+AUX qmapshack-qt-5.15.patch 3026 BLAKE2B f5f15429c198235658ba726b9122f72000c6f947d4dd4de1fd871e04148640152ca5caccd662d64da787cf4eef5841431b7e1d6d1e5e0dd310c099b14dac61d7 SHA512 7475aa269e2e502e8df2c2aa7d4f993f720284a8a190f09388581560755d9e18f1082b4e99106e934b5e02ef60fb7b8c620b02e650243b770dbe520367c2ebbb
 DIST qmapshack-1.14.0.tar.gz 12541988 BLAKE2B 146df8ab42bd5a5249207b88bf1a17b4ba20706c8114cc059b847d0b32c9d53919f931d778402a10dd62f0d86948bff8eefd29684c433c1d4bfd7e2ce019ce55 SHA512 675a72a79839ad0b96fc0717ad7eca43c4ce331645ba3ad1325f9bf114abcf2ecd164eeab0c41775fe84aa626fc67272cd9c869047f57b225ff493f66881ff99
 DIST qmapshack-1.14.1.tar.gz 12541988 BLAKE2B 146df8ab42bd5a5249207b88bf1a17b4ba20706c8114cc059b847d0b32c9d53919f931d778402a10dd62f0d86948bff8eefd29684c433c1d4bfd7e2ce019ce55 SHA512 675a72a79839ad0b96fc0717ad7eca43c4ce331645ba3ad1325f9bf114abcf2ecd164eeab0c41775fe84aa626fc67272cd9c869047f57b225ff493f66881ff99
+DIST qmapshack-1.15.0.tar.gz 46097781 BLAKE2B 16db9c59bd669e55dbb67af0411570963ff6a59f24c75d62421540fa1437cbc4dd837cf115b2649b3482e191ae11040b567f34babbf9ad46bb09114727ad4ae9 SHA512 92e2b40c37cccbb4848dab1afd872d3cb29b4a162d44d57a1042ea0d5139ffc976bc02407d327b6f5cd3e0d08dbd526661fcbc0e05602fda15f78fd9bbce52cb
 EBUILD qmapshack-1.14.0.ebuild 908 BLAKE2B f9c544be44c80f5aa9186e3d0671419968e8db35dea918730de52a1e086d487a5326f1fc5ac3b133b684bf0bba9a6e9e6c87de093b2afe5aff192cff3adcd0be SHA512 5c10b51323cb326cc35e73774ce287866cef7794c324dbe3730590db1563c6fe4e7ed7cd5601bc907b012e92dcba864d05907b681bc4f83c73b9252c3fa02d9a
 EBUILD qmapshack-1.14.1.ebuild 913 BLAKE2B 8103fd017e942ea864c8cd33976530d343460ed5ea843d67e2f3545d1878ea0fb3457ba10f513006170b00b24a992a9040a345022485be9e5ce9ec45b78ed709 SHA512 672b28b280385eb3acae91a295271bd60bb6c14aebaa5eace74560b649b8862b5248b4cef9ee5044324537868aa525aa8778e4f7dfc32057a8bb1f424ee0d883
+EBUILD qmapshack-1.15.0.ebuild 1137 BLAKE2B f6a5baaef7fce7a5457ce0b7c76bdc93be982f9b646b64d8f00b1a644a87bb322cbbb22d2a8889734f25a6fe75bd9219075466a6c3a056f5c177bd9ac92bd823 SHA512 9465f489cbf1398796d1e846bfc070fe83046630fb1fff4686a616c66810c5513b1e2531fc6b82372a4cca55aff2c5bd99ac4c7472f6dc7a8c55dceb9504b56a
 MISC metadata.xml 772 BLAKE2B b1bd146b3ae624d365dd366cef81f3eaf37c8220ddd4eeb1f64916275f6520f3bd2d458a339bdea85d0f13cde14b3038d98c32f6265204e3aa1e22424f9dbfd2 SHA512 03cd1cf6d4e0b5a420b4301ffb1077f2dda9e023572dedd1c56ba4574ab4460c125d63bb5c7475b66b023ff15dc0b9c4cfc8479218366c935108e89850ed5d4d
diff --git a/sci-geosciences/qmapshack/files/qmapshack-qt-5.15.patch b/sci-geosciences/qmapshack/files/qmapshack-qt-5.15.patch
new file mode 100644
index 000000000000..08d8946f69d4
--- /dev/null
+++ b/sci-geosciences/qmapshack/files/qmapshack-qt-5.15.patch
@@ -0,0 +1,67 @@
+diff -U3 -r qmapshack-V_1.15.0.orig/src/qmapshack/gis/wpt/CGisItemWpt.cpp qmapshack-V_1.15.0/src/qmapshack/gis/wpt/CGisItemWpt.cpp
+--- qmapshack-V_1.15.0.orig/src/qmapshack/gis/wpt/CGisItemWpt.cpp	2020-06-14 17:22:49.000000000 +0700
++++ qmapshack-V_1.15.0/src/qmapshack/gis/wpt/CGisItemWpt.cpp	2020-06-22 17:41:58.776553045 +0700
+@@ -38,6 +38,7 @@
+ 
+ #include <QtWidgets>
+ #include <QtXml>
++#include <QPainterPath>
+ 
+ IGisItem::key_t CGisItemWpt::keyUserFocus;
+ QMap<searchProperty_e, CGisItemWpt::fSearch> CGisItemWpt::keywordLambdaMap;
+diff -U3 -r qmapshack-V_1.15.0.orig/src/qmapshack/helpers/CDraw.cpp qmapshack-V_1.15.0/src/qmapshack/helpers/CDraw.cpp
+--- qmapshack-V_1.15.0.orig/src/qmapshack/helpers/CDraw.cpp	2020-06-14 17:22:49.000000000 +0700
++++ qmapshack-V_1.15.0/src/qmapshack/helpers/CDraw.cpp	2020-06-22 17:45:43.431558615 +0700
+@@ -24,6 +24,7 @@
+ #include <QImage>
+ #include <QPointF>
+ #include <QtMath>
++#include <QPainterPath>
+ 
+ QPen CDraw::penBorderBlue(QColor(10, 10, 150, 220), 2);
+ QPen CDraw::penBorderGray(Qt::lightGray, 2);
+diff -U3 -r qmapshack-V_1.15.0.orig/src/qmapshack/map/CMapIMG.cpp qmapshack-V_1.15.0/src/qmapshack/map/CMapIMG.cpp
+--- qmapshack-V_1.15.0.orig/src/qmapshack/map/CMapIMG.cpp	2020-06-14 17:22:49.000000000 +0700
++++ qmapshack-V_1.15.0/src/qmapshack/map/CMapIMG.cpp	2020-06-22 17:47:21.413561045 +0700
+@@ -33,6 +33,7 @@
+ #include "units/IUnit.h"
+ 
+ #include <QtWidgets>
++#include <QPainterPath>
+ 
+ #undef DEBUG_SHOW_SECT_DESC
+ #undef DEBUG_SHOW_TRE_DATA
+diff -U3 -r qmapshack-V_1.15.0.orig/src/qmapshack/mouse/IMouseSelect.cpp qmapshack-V_1.15.0/src/qmapshack/mouse/IMouseSelect.cpp
+--- qmapshack-V_1.15.0.orig/src/qmapshack/mouse/IMouseSelect.cpp	2020-06-14 17:22:49.000000000 +0700
++++ qmapshack-V_1.15.0/src/qmapshack/mouse/IMouseSelect.cpp	2020-06-22 17:43:31.338555340 +0700
+@@ -23,6 +23,7 @@
+ #include "mouse/IScrOpt.h"
+ 
+ #include <QtWidgets>
++#include <QPainterPath>
+ 
+ IMouseSelect::IMouseSelect(CGisDraw *gis, CCanvas *canvas, CMouseAdapter *mouse)
+     : IMouse(gis, canvas, mouse)
+diff -U3 -r qmapshack-V_1.15.0.orig/src/qmaptool/helpers/CDraw.cpp qmapshack-V_1.15.0/src/qmaptool/helpers/CDraw.cpp
+--- qmapshack-V_1.15.0.orig/src/qmaptool/helpers/CDraw.cpp	2020-06-14 17:22:49.000000000 +0700
++++ qmapshack-V_1.15.0/src/qmaptool/helpers/CDraw.cpp	2020-06-22 17:49:14.789563856 +0700
+@@ -24,6 +24,7 @@
+ #include <QImage>
+ #include <QPointF>
+ #include <QtMath>
++#include <QPainterPath>
+ 
+ QPen CDraw::penBorderBlue(QColor(10,10,150,220),2);
+ QPen CDraw::penBorderGray(Qt::lightGray,2);
+diff -U3 -r qmapshack-V_1.15.0.orig/src/qmaptool/overlay/COverlayCutMap.cpp qmapshack-V_1.15.0/src/qmaptool/overlay/COverlayCutMap.cpp
+--- qmapshack-V_1.15.0.orig/src/qmaptool/overlay/COverlayCutMap.cpp	2020-06-14 17:22:49.000000000 +0700
++++ qmapshack-V_1.15.0/src/qmaptool/overlay/COverlayCutMap.cpp	2020-06-22 17:50:08.109565178 +0700
+@@ -24,6 +24,8 @@
+ 
+ #include <functional>
+ #include <QtWidgets>
++#include <QPainterPath>
++
+ using std::bind;
+ 
+ static inline qreal sqr(qreal a)
diff --git a/sci-geosciences/qmapshack/qmapshack-1.15.0.ebuild b/sci-geosciences/qmapshack/qmapshack-1.15.0.ebuild
new file mode 100644
index 000000000000..1d7bf8e6abf5
--- /dev/null
+++ b/sci-geosciences/qmapshack/qmapshack-1.15.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 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://github.com/Maproom/qmapshack/wiki"
+SRC_URI="https://github.com/Maproom/${PN}/archive/V_1.15.0.tar.gz -> ${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-qt/qthelp:5
+	dev-libs/quazip
+	>=sci-geosciences/routino-3.1.1
+	sci-libs/gdal
+	>=sci-libs/proj-6.0.0:=
+	sci-libs/alglib"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
+
+PATCHES=( "${FILESDIR}"/${PN}-positioning.patch "${FILESDIR}"/${PN}-qt-5.15.patch )
+S="${WORKDIR}"/${PN}-V_${PV}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	cp "${FILESDIR}"/FindPROJ4.cmake cmake/Modules/ || die
+}
+
+src_install() {
+	docompress -x /usr/share/doc/${PF}/html
+	cmake-utils_src_install
+	mv "${D}"/usr/share/doc/HTML "${D}"/usr/share/doc/${PF}/html || die "mv Qt help failed"
+}
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 7f85d66655f6..d9ab1fab5e1e 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/ViSP/Manifest b/sci-libs/ViSP/Manifest
index 4bf2c1a60e63..fc97d5f4475b 100644
--- a/sci-libs/ViSP/Manifest
+++ b/sci-libs/ViSP/Manifest
@@ -1,7 +1,5 @@
 AUX ViSP-3.0.1-opencv.patch 403 BLAKE2B 0bc3da5cd6e73cdd47dac7b525f4f3fbe6e683aa79f9185a3e92cecaf36fdc30c018fe93d1e9f7ac69890b7807e16663e21e65025184b950a8f384c1ec2748d8 SHA512 3a6a84ac6ad2bce4fdf7228b4a296589239c2b4b019b3ad8e4654af71b00eca6102444f38c32604013ec62d60d067deb2902ea8cffffff6d97e0762602a013f4
 AUX ViSP-3.2.0-ocv.patch 1065 BLAKE2B 830cecf11df2d9c5c909ab5e2b5e7430e953355feeea77e40b77d53f24d2f1799a529c8dfda061ca6a276a1e150d10fee475f63e798511ce0296e8fde1fd75a8 SHA512 35fbb672da815fd404bd483800bf3f27b4f62d41b1173b10292a964d23129f4ec8afd530f8de913500214633a425a1a7567341b6da317b9e74720cf9414f3eff
-DIST visp-3.2.0.tar.gz 52737424 BLAKE2B 78b733183a62541f5d5af22a376ac52ba2377753fa53be62858611b27d961fad286923c11f624c4fe0f561d8dbc5367e2ac01e6bc11a2a19068167ef52198307 SHA512 b4ad21e5063327d91d4ebda268cf4a4dc2ceffbe39d6af0dd6bfeb94d1150884d37fc4ea4295f640135fc2ba758afd29b9090755561ef05249fe2cbc5680dcce
 DIST visp-3.3.0.tar.gz 60822186 BLAKE2B 559698af352b4eac227ab2cdb8d66be31c04d2e2ac2d30ce07cef5022501162211ff9bfc9ed4970ac8b825321b8fc34241a6ca7a29b3d78fb70fa79ac429f7ab SHA512 f96b017353240e63059ef1e514a64198b6a50b95b5a08405c16e99589fd2110071e2d558921a674e538f9cdea07fde8e653ca630e3c12c38bf91f7a83057afe2
-EBUILD ViSP-3.2.0-r2.ebuild 2881 BLAKE2B 2706c612162b35e58f66c1e00cd343c1fb528be29b196cc9a0477462294a5447bc8ae512f5776bd438b237057beda14bcdc244a2f14fefb54b268dc5724cf04a SHA512 c192fafa044c0910a1f338422acf8fa0cd1c8433c4899085503118621e617a014e206f57f01125e82ade34b95b7133e22c554de76b2cbcc9dfa621d242bacb2d
-EBUILD ViSP-3.3.0.ebuild 2876 BLAKE2B 6b9fc1ae7a19ca7f8b656f983b0e32eb05511d467c896243caac1fb8360ed0b78c1f3d24b679e4e7a64fc9e8d7061eeb2c32d4c7c71ed19ba9f5933d68f18b98 SHA512 b69177ce259c6bab5ffd1e3433347f25d7eef866e77627a357e33e08cf9b20c0043947fe022e11e2166468934353f2eb58b6365d101a2be2ad416dfbf9f030a8
+EBUILD ViSP-3.3.0.ebuild 2893 BLAKE2B 3cf9f8d816e203500378b19a6236e9146ea34168ddbb11ab2991b7ffa9c54d17081759fa7531da3c70dfefd2ea425dfad741a367c90079968ce5309fdabc7e2c SHA512 77512224d4baeea9199f5fe3d4414b9069e3e51247a5104dfef57c25331c3958cf542edaf1e8b6ed0694994c04e1c1c695599d7b0157c4a4f8253683f011bad5
 MISC metadata.xml 1383 BLAKE2B 0bc8f34d0babc7ca62c664babe0422443b0819e9c63bc850705c1de9d81b428b650ae19ddc0ae50bae28344f23058ff08247c1a0504e73c3bc419d972d3dcb27 SHA512 f562e0b6d262bd5de4f6e6f3eb5496ad9e8b4b4089a209e3614c5f0c3c531b4076d7a2af7b1317fa4fe9473a8241db1b44d343e2ca051e798c6948a86036562a
diff --git a/sci-libs/ViSP/ViSP-3.2.0-r2.ebuild b/sci-libs/ViSP/ViSP-3.2.0-r2.ebuild
deleted file mode 100644
index 005b645b21cd..000000000000
--- a/sci-libs/ViSP/ViSP-3.2.0-r2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Visual Servoing Platform: visual tracking and visual servoing library"
-HOMEPAGE="http://www.irisa.fr/lagadic/visp/visp.html"
-SRC_URI="http://gforge.inria.fr/frs/download.php/latestfile/475/visp-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/3.2"
-KEYWORDS="~amd64 ~arm"
-IUSE="
-	+coin demos +dmtx doc examples gsl ieee1394 jpeg lapack motif ogre
-	opencv png test tutorials usb v4l X xml +zbar zlib
-	cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	coin? ( >=media-libs/coin-4 virtual/opengl )
-	dmtx? ( media-libs/libdmtx )
-	gsl? ( sci-libs/gsl )
-	ieee1394? ( media-libs/libdc1394 )
-	jpeg? ( virtual/jpeg:0 )
-	lapack? ( virtual/lapack )
-	motif? ( media-libs/SoXt )
-	ogre? ( dev-games/ogre[ois(+)] dev-libs/boost:=[threads] )
-	opencv? ( media-libs/opencv:=[contribdnn(+)] )
-	png? ( media-libs/libpng:0= )
-	usb? ( virtual/libusb:1 )
-	v4l? ( media-libs/libv4l )
-	X? ( x11-libs/libX11 )
-	xml? ( dev-libs/libxml2 )
-	zbar? ( media-gfx/zbar )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz )
-	test? ( sci-misc/ViSP-images )
-	v4l? ( virtual/os-headers )"
-RDEPEND="${RDEPEND}
-	demos? ( sci-misc/ViSP-images )"
-REQUIRED_USE="motif? ( coin )"
-
-S="${WORKDIR}/visp-${PV}"
-PATCHES=( "${FILESDIR}/${PN}-3.2.0-ocv.patch" "${FILESDIR}/${PN}-3.0.1-opencv.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		"-DBUILD_EXAMPLES=$(usex examples ON OFF)"
-		"-DBUILD_TESTS=$(usex test ON OFF)"
-		"-DBUILD_DEMOS=$(usex demos ON OFF)"
-		"-DBUILD_TUTORIALS=$(usex tutorials ON OFF)"
-		"-DUSE_COIN3D=$(usex coin ON OFF)"
-		"-DUSE_DC1394=$(usex ieee1394 ON OFF)"
-		"-DUSE_DMTX=$(usex dmtx ON OFF)"
-		"-DUSE_GSL=$(usex gsl ON OFF)"
-		"-DUSE_LAPACK=$(usex lapack ON OFF)"
-		"-DUSE_JPEG=$(usex jpeg ON OFF)"
-		"-DUSE_PNG=$(usex png ON OFF)"
-		"-DUSE_LIBUSB_1=$(usex usb ON OFF)"
-		"-DUSE_OGRE=$(usex ogre ON OFF)"
-		"-DUSE_OIS=$(usex ogre ON OFF)"
-		"-DUSE_OPENCV=$(usex opencv ON OFF)"
-		"-DUSE_SOQT=OFF"
-		"-DUSE_SOXT=$(usex motif ON OFF)"
-		"-DUSE_V4L2=$(usex v4l ON OFF)"
-		"-DUSE_X11=$(usex X ON OFF)"
-		"-DUSE_XML2=$(usex xml ON OFF)"
-		"-DUSE_ZBAR=$(usex zbar ON OFF)"
-		"-DUSE_ZLIB=$(usex zlib ON OFF)"
-		"-DCOIN3D_INCLUDE_DIR=${EPREFIX:-${SYSROOT}}/usr/include/Coin4"
-		"-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)"
-		"-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)"
-		"-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	cd "${BUILD_DIR}"
-	use doc && emake visp_doc
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use tutorials ; then
-		dodoc -r tutorial
-		docompress -x /usr/share/doc/${PF}/tutorial
-	fi
-	cd "${BUILD_DIR}"
-	use doc && dohtml -r doc/html/*
-}
diff --git a/sci-libs/ViSP/ViSP-3.3.0.ebuild b/sci-libs/ViSP/ViSP-3.3.0.ebuild
index 35b2a248ef5d..7b2cda09c8a4 100644
--- a/sci-libs/ViSP/ViSP-3.3.0.ebuild
+++ b/sci-libs/ViSP/ViSP-3.3.0.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Visual Servoing Platform: visual tracking and visual servoing library"
-HOMEPAGE="http://www.irisa.fr/lagadic/visp/visp.html"
+HOMEPAGE="https://visp.inria.fr/"
 SRC_URI="http://gforge.inria.fr/frs/download.php/latestfile/475/visp-${PV}.tar.gz"
 
 LICENSE="GPL-2"
@@ -17,16 +17,23 @@ IUSE="
 	opencv pcl png test tutorials usb v4l X xml +zbar zlib
 	cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3
 "
+REQUIRED_USE="motif? ( coin )"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
-	coin? ( >=media-libs/coin-4 virtual/opengl )
+COMMON_DEPEND="
+	coin? (
+		>=media-libs/coin-4
+		virtual/opengl
+	)
 	dmtx? ( media-libs/libdmtx )
 	gsl? ( sci-libs/gsl )
 	ieee1394? ( media-libs/libdc1394 )
 	jpeg? ( virtual/jpeg:0 )
 	motif? ( media-libs/SoXt )
-	ogre? ( dev-games/ogre[ois(+)] dev-libs/boost:=[threads] )
+	ogre? (
+		dev-games/ogre[ois(+)]
+		dev-libs/boost:=[threads]
+	)
 	opencv? ( media-libs/opencv:=[contribdnn(+)] )
 	pcl? ( sci-libs/pcl:= )
 	png? ( media-libs/libpng:0= )
@@ -35,23 +42,30 @@ RDEPEND="
 	X? ( x11-libs/libX11 )
 	xml? ( dev-libs/libxml2 )
 	zbar? ( media-gfx/zbar )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
+	zlib? ( sys-libs/zlib )"
+DEPEND="${COMMON_DEPEND}
 	v4l? ( virtual/os-headers )"
-RDEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEPEND}
 	demos? ( sci-misc/ViSP-images )"
 BDEPEND="
 	virtual/pkgconfig
 	test? ( sci-misc/ViSP-images )
-	doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz )"
-REQUIRED_USE="motif? ( coin )"
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+		virtual/latex-base
+	)"
 
 S="${WORKDIR}/visp-${PV}"
-PATCHES=( "${FILESDIR}/${PN}-3.2.0-ocv.patch" "${FILESDIR}/${PN}-3.0.1-opencv.patch" )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.0-ocv.patch"
+	"${FILESDIR}/${PN}-3.0.1-opencv.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(
+		"-DBUILD_JAVA=OFF"
 		"-DBUILD_EXAMPLES=$(usex examples ON OFF)"
 		"-DBUILD_TESTS=$(usex test ON OFF)"
 		"-DBUILD_DEMOS=$(usex demos ON OFF)"
@@ -79,20 +93,19 @@ src_configure() {
 		"-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)"
 		"-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile visp_doc
+	cmake_src_compile
+	use doc && cmake_src_compile visp_doc
 }
 
 src_install() {
-	cmake-utils_src_install
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	cmake_src_install
 	if use tutorials ; then
 		dodoc -r tutorial
 		docompress -x /usr/share/doc/${PF}/tutorial
 	fi
-	cd "${BUILD_DIR}"
-	use doc && dodoc -r doc/html
 }
diff --git a/sci-libs/amd/Manifest b/sci-libs/amd/Manifest
index 4aacbf0e4876..0c2bb022cec8 100644
--- a/sci-libs/amd/Manifest
+++ b/sci-libs/amd/Manifest
@@ -1,5 +1,5 @@
 DIST amd-2.3.1.tar.bz2 339970 BLAKE2B b84b7b690deb6a1fcfdbbec403a3e5267cd4e1cf851312a56bbd48ac92a732f789365e2191f6b74f49173bc6c008ebd5f6b528a99a9abdc6a2777f3a6a7305b8 SHA512 19b8c010e0f7a5a96e60fe52904b2b548fb89dfaf9d6f99184df955a732ec3edef04acff01a82a909e030c3bf78c9eccfe0c329731edb29f4b936507e39d885e
 DIST amd-2.4.6.tar.bz2 343925 BLAKE2B 296579d888b61e84ec798206fbb6f89fd923f0d762e84e7a1e2e2a5fb502f4822f89a2a4b631dc42fa829e845bf3980886185650e8de28774400e0c351805061 SHA512 6960a557e6c2f82ca2e68e48ddcb502e1527235a3ca34df2f5f7f63f0f12afacedb15fefe4a39768fe7a2c70308793544b5b24b6f2be2c6b934b0c0e0e796d57
 EBUILD amd-2.3.1.ebuild 739 BLAKE2B f92ddd0fc74c0e1940975e1536f3a56364125a40f0ded5660c9c9dafa04235628b6e10c0aacb03abbc6faad134a2e91b88990475f9222ff9bc6fa1361ca224a7 SHA512 96e2ffe647415968e1824faab20011008db57a3d810d562dd1e45107881512dbe14cf106ea05022f8e22b0a6ca12c5bff0e5c461efaa338b09dca2e2d30534da
-EBUILD amd-2.4.6.ebuild 722 BLAKE2B 30b3940156a86ae07f36dcbdbfb5d547a079afd4e85939b1f51599cb4fadff074d2a99f93a908f9e42caad25b2f0976006e6ab007106fb3aaade3699740d2c2e SHA512 c6968c4152243dc5032247dfb07d54dc2357c2bbe2bb47fa9a8a82825f303fca18ed31de90ed6ac5d0f26361a1ec01cd026ad35ccee94b11367f691c693e87cf
+EBUILD amd-2.4.6.ebuild 718 BLAKE2B 932f6b127a62562c0d86e2e472246f0b9dcaca68d4eb1eaf440eed72e071018fadc3c5c42c290d146a38847aa38a2d3feb9bed7f38a99aea777057130f5c1d9d SHA512 593178c8259d83a56d2fdf80149aa6b631e9feecabb5944e702f06b2499104c9d08dc8482ee24a3f9211494256f6b748b8606f29ebb6a1a0f5a0348c446746c5
 MISC metadata.xml 492 BLAKE2B ac6367af33dd797e703e3370d6369db5286b11f862b5387258e9edd860554049c7d9e2bf2186c86e24a7fc29c3f1122f330c0a3cf0420f13085757cff0a388b3 SHA512 1c53658e87337e1e43149c363c901dabfdde52b647891d8026a7ce9ddcd5e36b0121948d169d446e5a78d05c26301bd4f8c7c06665506ebc0999c259b709a6b6
diff --git a/sci-libs/amd/amd-2.4.6.ebuild b/sci-libs/amd/amd-2.4.6.ebuild
index 14e702a4e129..ccfc70342cb8 100644
--- a/sci-libs/amd/amd-2.4.6.ebuild
+++ b/sci-libs/amd/amd-2.4.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc fortran static-libs"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/btf/Manifest b/sci-libs/btf/Manifest
index f3d01a84db48..bede102de565 100644
--- a/sci-libs/btf/Manifest
+++ b/sci-libs/btf/Manifest
@@ -1,5 +1,5 @@
 DIST btf-1.2.0.tar.bz2 290915 BLAKE2B b9bd3781bfd4fc4924ffb7ee52dc517a6f2ee169daca2a254510d4fddbc9a312fb40de4cadb9ac119c1dee6e3042e9c349ca805f509a958613472f1e423a7bea SHA512 4c2dcd5abf7a72485267a666e679545a5bfa8a20dfbf75a939c92547bdf960d40b6ae93cad23ac44f791e515a13f26c1dae446d3ba6e89b3d1f87d91d4dba50c
 DIST btf-1.2.6.tar.bz2 285699 BLAKE2B 4addeea7b9abe87281f826a67a8a372118579f498057c888008ac93da1cdbfcf8554af6e843d92a07989ff0b24f537588f933fcc33c97317f47536980e551531 SHA512 39c08ec9bf2a85915aeed040dc02c42c10adf5034c3797910dc7cb6942ac6e2ccea47cea4ab0c37e8ed3eb8eac8d2ce946d281c9ec643cccd282af7be5276960
 EBUILD btf-1.2.0.ebuild 542 BLAKE2B 0c68190981b2db131e18e5c1084e0d5e6fa1db4aaa33ce417078f88b028452ca9bbc4f50b68c14879cc12e0255a1c79178621c5c025251b6f1acba71cf014a4c SHA512 740f280706e53eb3f3803dd1c6c8a9cfbc8044c4125191a68d5134c851946852553bdd0011ad38b45e2725d33b57c5a705c35f769dd61a2f990c532e0daa0b5c
-EBUILD btf-1.2.6.ebuild 583 BLAKE2B c16851dd487b6d30936c4dc242bf6832477bf3e770c19e8da3a195c8fcfbdd77b45f9dbf0c040147b5ea01912dbe6e385aafd64ff6691ebc7b333c9ed4987bdd SHA512 7131c4cd6d69b6dfb13acf854475cd943a63bcc7d3898c187f2b04a1a25ce4acd4c1f0871ae11423133a6545cdcd4d2b765bbfae1b3deb6f58cbaafd1d406905
+EBUILD btf-1.2.6.ebuild 579 BLAKE2B 30e1dade2df19f6d517e4b89623e44303ad091aefef04aa2991adb29bd8fcb59ae2d3bab2c05fc727d48d4c26037fdd8083f4011cf61c05e5b8769a454eea763 SHA512 df647131b4c1dd30e89c25335076694142abd12f9b4f0594c733067331e46f007ab6a62f7e408578453132c6cd437c0c4e2bea8b0158c32ac0fbc47a16122f0e
 MISC metadata.xml 534 BLAKE2B b44c9cb7157ca2496f928f0d4580619991bc3ecc235fef6bca6072e0cd58c2be758f85dd0e4e62552218052db67fe7a24d15c7700a2bcebc88328feb6db93f52 SHA512 90699362212549e8b25ceffbf0df32253d10b5ea2203613d3bbffe5c2e7b228135579be0a63c563083846e8960d9b0594b3e230bd5ecd34100f42b08edd34b50
diff --git a/sci-libs/btf/btf-1.2.6.ebuild b/sci-libs/btf/btf-1.2.6.ebuild
index 6d1b0659d374..bf262a549295 100644
--- a/sci-libs/btf/btf-1.2.6.ebuild
+++ b/sci-libs/btf/btf-1.2.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 arm64 ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/camd/Manifest b/sci-libs/camd/Manifest
index eddb12f9c0f1..708282c2d72d 100644
--- a/sci-libs/camd/Manifest
+++ b/sci-libs/camd/Manifest
@@ -1,5 +1,5 @@
 DIST camd-2.3.1.tar.bz2 319766 BLAKE2B f812b457ede3b86fd7fd99f8cc2ea8f19a917c96cf33ca65c6bb2d0f7ebdb37b08af5cd8ad260bf4a636f2d884527c928c026edab23fffacafdd87ef2ce416e8 SHA512 13c5d687b9314f43a6c7237c7541e0c21cc544ffe52f8a984f64c5177a9f1f6b5ab07e9190388587f273424db8e6076ef050f836dbc9f33ca44e94d0034c8070
 DIST camd-2.4.6.tar.bz2 317071 BLAKE2B 8f982050a20f00c9443063a0473caa4aa27efe005fe07b503cb68b29499152561fc9d30d00783607b1e8fb8af88707eabfe22d192b80e375b8a6d04d7a9a26d7 SHA512 c4020ed3e063d04f5d7d1a301719b1a5b5b912d505858f046654c9d283c41ff01d55f668fb7f7179a6ac636f5a5b80f71cac5eb5b1e5cae0ede97d946d62a1d0
 EBUILD camd-2.3.1.ebuild 700 BLAKE2B 8426dc0e2c549807b159e0822b7574a9a12ae9ff5a52a1ce45985a6c3446b25ec45011404f1e02262b2c54f1d0c117e8002b8bdd24c44bfebb7403d00cd026da SHA512 eecedd765217b255f7301302ffc6115f0925f76244b433d3765a5feca8f1f5e96af80adc9d6f1f25fd7d2a8f6d254d6e8db301fe6c3ddedeed99a1713018510c
-EBUILD camd-2.4.6.ebuild 671 BLAKE2B 8c8e1b9f31bc1f853da950dce52aa53d6c41418d8bf0e9a71542452e9e70d1700f95cb2e405d4302b765cb0a917f87b907ad809f990926ea1abc8e289a41981e SHA512 d892372d172d61ca64391ac620ab885edbb78ea961b31d5c13a1762e87bc4dc5573f30f9fc3dd3e0bb5a85b9593e5edd1fe74d3b7974aade7d7f62b83e107fcf
+EBUILD camd-2.4.6.ebuild 667 BLAKE2B 33ee7075498fd4c7c84ad09388a973b9ed02d4555d3d5dac7a38de9bb6a5a72a9739aba7a981c42ca689cf89d7c3bc9131a782ce7b41efbcebd48f58795bdd3e SHA512 852291d6bd31990419a8a13a3d1b331312fc8e1a711d074a0e69e6e3ba9a6ce3060fe9b3d457fc78dae4a0c4218a65795c997d9bcc703299e3cd34a6508d367c
 MISC metadata.xml 494 BLAKE2B 456f4ab539ab7303849cfabfda3e07987874a833e5691d6c3336ebb8a86cc6d5cc5fe8c20b65d8e5fdd8da1c947b9e7ff8eedfd2cc17da6040ff5d109b1b110d SHA512 6402783aec0922669bbf45477074644a9b10f44b0b06bf86ad9b4ecbab124076ee7f19c2c68c6eb3bf21a1569a3410f1ed0ac12f653dd5808559da133613d09f
diff --git a/sci-libs/camd/camd-2.4.6.ebuild b/sci-libs/camd/camd-2.4.6.ebuild
index 3bdd531cc108..88bf2cf3cb77 100644
--- a/sci-libs/camd/camd-2.4.6.ebuild
+++ b/sci-libs/camd/camd-2.4.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc static-libs"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/ccolamd/Manifest b/sci-libs/ccolamd/Manifest
index e6eda8c4fca6..fa210259d394 100644
--- a/sci-libs/ccolamd/Manifest
+++ b/sci-libs/ccolamd/Manifest
@@ -1,5 +1,5 @@
 DIST ccolamd-2.8.0.tar.bz2 309907 BLAKE2B 1229d0802a53613d2a320906889dc5ae928bc0b21003d0340f7c5f153a8a7fab8302981c1c2421f64ca5c9f5a1e9460ad5d136a6c1efbc401666f82d7aab1901 SHA512 6a515a8250ed98d52aa932a6f93170174ff32f76c1ecedcedeb1540a471416d0cd40b5613a839b96fbc79c66b3cb5106c6a340a33fafdd695c83b7d949756e77
 DIST ccolamd-2.9.6.tar.bz2 305744 BLAKE2B 0d741ead328a1e888715672ddb617cc96a559f46f2379e1d7792b70868dd290de19b3047e3ed4dd2711084c9afc523d18ecb375aa4ee8a4a12950cee08f238b8 SHA512 cf6f210d26ddb1be454cac377a773b73b75261a74e1e3985565f57f45659b1c11b747829c5bbe99c4bc3e8b364d7b2b3c109e00f6d7e8e41afd713312ebf103c
 EBUILD ccolamd-2.8.0.ebuild 576 BLAKE2B e594eab1a608c513c2cf32270f4e4011520562610a3064460dfd771b09266ceaa15c95bb727eeef5a9e12577c74c5a2f900a4a92e2cab000f84f6b6a1c79ac23 SHA512 3f0e57a9837be8c4e44e3a07ed507a176a9672e3eca944b14573ad0cd9698b55cb05ba7e2ebdc981f6a9fdf5c5fa93ef667b0de12a743323bbc590d958ff95ed
-EBUILD ccolamd-2.9.6.ebuild 607 BLAKE2B 2d561523a9ed079156c16a5575df88f80bee8e852305774aa0c4a61efa4adfea9754038d2710cee88a2edaddd49a0c636a9af6ab37cfab0b8a4315276d0eb857 SHA512 fd888fe42d7a601117089697c8767f0e30a2e43e4867a76bf71422e60484e03f7faff5b4929abd0f1e3b98a8464a3257aeb3c1c6a0321eb4eed7579fbe9c2165
+EBUILD ccolamd-2.9.6.ebuild 603 BLAKE2B 9cc4344db9c02f4497fd573cf8d0ba94096d5a6b53365612b1ebc2e2375d6b9173a25de02feb7cc713bcde0386e4b978ae49120bf1f3d14ba009b7567332ff4a SHA512 ef4dcba98465e40ffb28e52ea55a4b3882da1c53ec5af724211c4a2d5bbcbe58b5baf9488241385310431290bfd9b83da96d8a1fd66ad09290f76b3345447a56
 MISC metadata.xml 470 BLAKE2B b20ae7c51907e135898a4ca6eee1454c1760d8f6c061d6d8c9bdf6082773e003326c65ba4489831139bc9af96f2321a09b22fbe106aa87b8f6dbb4781163edb9 SHA512 99c2d290fea618dfd8997209d8e6db971a2ab74d1be5fb270f2177c9843b0f324710491977c7cf2427806295d05e341ece4399afd8a0d43bca8b42b0fdea7beb
diff --git a/sci-libs/ccolamd/ccolamd-2.9.6.ebuild b/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
index cbeecdadbaf3..1a280d3e0c9c 100644
--- a/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
+++ b/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://202.36.178.9/sage//${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/cholmod/Manifest b/sci-libs/cholmod/Manifest
index 749f122d39ca..e616391be946 100644
--- a/sci-libs/cholmod/Manifest
+++ b/sci-libs/cholmod/Manifest
@@ -2,5 +2,5 @@ AUX cholmod-1.7.4-parmetis32.patch 702 BLAKE2B 241d68fa25ac2ab3f9a425702559736fb
 DIST cholmod-2.1.2.tar.bz2 656458 BLAKE2B 83a574ad7d3755428d8d732f3f60b07908b8315d73d5a3d3aaf9aac50b54590c532389dd90efc569e67639993095706eb546e72313b735e35af34a1fea398be2 SHA512 7aca97de4c60ff2d7a76a776be4c2d61243a159a51b9e147fa2480f2aaf61a5d966eb0f1cb57c0145510437f6c478fa30384b741709d0a02432b74ada3e78089
 DIST cholmod-3.0.13.tar.bz2 696002 BLAKE2B 40a065fe1a3585897b3ca554a25fa80ffc68ac70798f2f803e34a231ec4f532d113a3d00ab7ab61f5eb02503a84e1459cdb7e96cb0b0d1dc6975ed3d533104fe SHA512 c6c80d099386bac27e385a1b8ee8941cd2fb4f2dcfcf302b4b17d6477ac9ee17ad8030aae9191f92576dfaeb521e2c98ec24e867281c2405e42f95580e14f0ab
 EBUILD cholmod-2.1.2.ebuild 1758 BLAKE2B c9c74a50027e6a07ae755ecbcfbd16b60bfdaf5597dbbe91363b8119fa5689ad8f07afb8f5fcfbce3839f8e793fed7968bd58d6aa2117a1661f64fd88f95386b SHA512 f655e8b83a6886e9596a1acc2f54d1c25dc15983a3e272f159bcd72c1e362035253f0389588c5a3b377617fed982495ace46659002cd49415405cf9a2107fe32
-EBUILD cholmod-3.0.13.ebuild 1598 BLAKE2B 14b5373a37540b745ae0d425f56b6b0732e907da4c220d40d06f1ab8ca035aa3579999274d44d9876c1dd7c9db70cd099b9565b969b371f8eaae3870f5d1e27c SHA512 c80c18f5fb27da4d556e55f855423f80405663dc26e091fb6eeb6398b0e3fae0365fa8dabb38c3f95ed89df4e345f5317f90feb9c6235807a87e282c4209cd94
+EBUILD cholmod-3.0.13.ebuild 1594 BLAKE2B 8abc7d683ae2ea59c42667ad01b26096ed86570c9b01a5bd5ee4a59e139464cf7c2f99ad784a81c388ddd1428ac66c190574292a7eb0ee4b33bf8ca75df22f2b SHA512 cdbbf59454b34c91f3d748ccd92613a76192aa53cd206543737181e3c79e07d3d363104f08069facf108aa8c2ec7f184ee65636b1b76bfdba6ca053c73a4c701
 MISC metadata.xml 1064 BLAKE2B b0e3376f34f051bd7cec27db2bda432e0b7bc7a941807061e93fc0ea51fdde5ebc3d2a3ca400c0d05efaa39b16bd86051dbd3e86a629c3e3b7b3dd3fe15e99da SHA512 fc1765b400dd7463fc707e50c45e1b82152de54cbf0fcc20d4c42ed71172fd7fc0f2e649642e9074f09c6af544bb4c3e9ffed16fdd971612a66de58c9f4d7308
diff --git a/sci-libs/cholmod/cholmod-3.0.13.ebuild b/sci-libs/cholmod/cholmod-3.0.13.ebuild
index 7e2b678d25bd..f27553cef9f5 100644
--- a/sci-libs/cholmod/cholmod-3.0.13.ebuild
+++ b/sci-libs/cholmod/cholmod-3.0.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+ modify? ( GPL-2+ ) matrixops? ( GPL-2+ )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="cuda doc +lapack +matrixops +modify +partition static-libs"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/colamd/Manifest b/sci-libs/colamd/Manifest
index 6e79db23f770..12357fa9f4f0 100644
--- a/sci-libs/colamd/Manifest
+++ b/sci-libs/colamd/Manifest
@@ -1,5 +1,5 @@
 DIST colamd-2.8.0.tar.bz2 304819 BLAKE2B a2c4b67ad8d20b0cb136f579a367bf53b0e692596550b9e22908628f4d0bce00e2ddeb9aa0dfe6d1f204e79332be99c97366df2ba555ab881d4ba01c42a721e6 SHA512 36b2e50e01ad44f04f084ebcdcfb7d9d1d1712c6f53c8bce9f46ce39edc418aa64b8e67489fb06cb95d86658fd9f9bad89217a5f9f4777181f0f0e9b58c04aee
 DIST colamd-2.9.6.tar.bz2 298903 BLAKE2B e1e3cfa0153e21b742854d28fb6d3ede287c2ec22cfef4268a8aba8bb239be527433907f6984dad976341cf6e1ca9cb39f5c97029ad9bed032a874add9aa0e02 SHA512 f302d18f9ba004c9d1b0e1ada76e70f20fa1d11896815e5300983513b7ed4a7b969adef33adb1a57d67ce856a5ded410874c23d9bba42b6bf1a6a790430f5137
 EBUILD colamd-2.8.0.ebuild 564 BLAKE2B feabb3e0326d7b12d7f174b0d806515fbb155dec9f442d3a483082d7bec35ab346910d80ce7665058e7d9dd0b0f21b88a2432f6ee250745ef3afc9a05841fdbb SHA512 e8b758cb658eabb035aabc1054e2366438b63b404771e6079f00fd0b9d526a40b0cda6c9ad15c77e20243548f794e1dd755939a18e7688a588a7ec4fb930b6c0
-EBUILD colamd-2.9.6.ebuild 602 BLAKE2B 8ef7fb3dd4c273534a175910968ab9950390f1e0cd934870f2ff5b5876e1070876a1eeca31487ce25905a9966452b16a08e193b10634a5a2a0b8d358267968ea SHA512 cdd8fa45437ebed66deea0553d0acacede97d238adcebbb87e5c28bd00e3a4cf57a8a790c072aa7e9dfa6265779077be049655baa621a6331cf87966c6c74844
+EBUILD colamd-2.9.6.ebuild 598 BLAKE2B f6677ce63c8debcb45568f6eafdd5a7c6c581373b7f9b059a9cd3c2d843b25e7f9e396c214e429932c4ee1464a0cdb9f9f2903d07a6f38fab3dfc30613e0b0dc SHA512 b684df13370f3a8115982ce797449a0233f187b72d32a38fa0658cda1e8680373fff527f1130150122bcbddd213c1144efcc9bdfc68830783bfaa80be49ab53b
 MISC metadata.xml 827 BLAKE2B d1b92027b2b820c67cb091e71c22c5ebcfe8e560968b8cf76f5cb61b6c26a71b66f4801343a531fbc8941b5b678bff44e2ab3aa6bec49db9b0264ea2273ac816 SHA512 367258fb10bcde8e5136c541ef1e134c4e882b296c45300c8d70945222c0730572b1dc116b80057c3a9d6a64c175fb86915847522000740d9a39e6fcd8eb5004
diff --git a/sci-libs/colamd/colamd-2.9.6.ebuild b/sci-libs/colamd/colamd-2.9.6.ebuild
index 2ddcb5d9db54..975a5335078d 100644
--- a/sci-libs/colamd/colamd-2.9.6.ebuild
+++ b/sci-libs/colamd/colamd-2.9.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/cxsparse/Manifest b/sci-libs/cxsparse/Manifest
index 04e5bc622aac..76f11e8c1a6d 100644
--- a/sci-libs/cxsparse/Manifest
+++ b/sci-libs/cxsparse/Manifest
@@ -2,5 +2,5 @@ AUX cxsparse-3.2.0-header.patch 531 BLAKE2B 7b8738c26a48aa01541db4978cc195f093da
 DIST cxsparse-3.1.2.tar.bz2 2004570 BLAKE2B 4f1874e83faa1d831fce3847b82aeb67ae96e59b635489eceed3ed08a0fd0aaef7b0c9e40142f96ae5c7820a75bfb58b4d6a741c742b5a85dd6d8e4d78960be9 SHA512 dd3c5e31997564387b6145eaf2069c01e2ae8de384cd775a13ac7ccf03a83b6d0b8bf156a6645547f230dd13fc159d14203a4adcbe65703c154f35ecb161b6e9
 DIST cxsparse-3.2.0.tar.bz2 2080196 BLAKE2B 9b89469c45e518077c4348ad3efd8d89d248e4c039057c0286ee44b493ab595075894d01530cbfbe845b91ef5e43cfbfdd102721cfeefe943a1cb4bc5f171843 SHA512 9931dac5b319b61a39ccb5f34309acb4240602b5f55d029c790ed0b7319a373cb925c4b83994526af4bc5b19b88c723f04581068d1fc80960a290c9d6d1e1aef
 EBUILD cxsparse-3.1.2-r1.ebuild 753 BLAKE2B a3d892c3b4d585445b255ec89283b610964cf7e87bdb65a8920cebcc7c947e206bd374e6a235051c46e01afffe826ec2f4f872531bf2473ecf2fbaf30e4d34d5 SHA512 48404fb91b86177ed8c275ac1936cd03e20217e3927ac06a93c112a683040cddb5fbd5c68f954f65ef6413a5233ee1524df5dd02213d092699ff08cfa535e7e3
-EBUILD cxsparse-3.2.0.ebuild 811 BLAKE2B c3b57bd6d8cbb18f08d37cbac82eaf2f74739b296fae3e932d4f27dae73cfd7e3307bc3f532f7790c6457e25af07c3fb663bf8bfc6c6e11fc67575ed3b42c3de SHA512 1e88738b5bb8ad0a57774f7c6fa37ef426127c34854611388879e7158fc1a7e144a59347a47790223a7b6f77ec87f50cb9f3771c2781faa6bfae863b42110193
+EBUILD cxsparse-3.2.0.ebuild 807 BLAKE2B 17a792621c8ca0aaa84e6fb63089473b6f2df6c9c4207d543c6406c1f56c526f268cedf326acb3a08663ca5504f87e7b9308f81af863f03baeb0f0f184eccdc8 SHA512 0d6ea7183fd21d087e0b82a210957c6a61b494b29e95d9ae9f4053e3b4024a851d6d73a5af8a3cf091955538e8725ecd3c95a6d454699ecdaea7a705ec99dc40
 MISC metadata.xml 449 BLAKE2B 18e0d692b302702a20ecfe5ae10b8d48de7582649feeda3fe9c0bbcbbf6e6876f620bd490dabf788276a378d60b3bd0c1ee19a6fa439f37dff9269e8fd74d12d SHA512 908237dbe24a16831fc04faaff76d06bc4f0ae8605a551a98763d72ecbd19dcdbf2c74f320ccaf296c69bcacb3cda51b600ca0a9a8b481858723c2dd34a3754c
diff --git a/sci-libs/cxsparse/cxsparse-3.2.0.ebuild b/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
index 0abd3b6775cb..916ab014d3dd 100644
--- a/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
+++ b/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index 1b0e2829e143..047314d24a2f 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -5,7 +5,7 @@ AUX hdf-4.2.13-fix-xdr-configure.patch 376 BLAKE2B 611e5b37016750ad408a0cf8d7382
 AUX hdf-4.2.13-linux-tirpc.patch 972 BLAKE2B a95350ef2364e3ff08aa79d12e458853bebe610cd8376f6b6a0483f0962fca1a131be1b09cf3cc1447e1fb3b2fded9567a1a3755dbf5f195b0f70ae124bed3c9 SHA512 9901bdacab3e82632637d18fd08714876a990ceb4573261cc0e1e03a5e4e422c50c460a594d46b0434c9c7b96c1bf57de1aa52bbb59e525298eeacf22e8b41b1
 DIST hdf-4.2.11.tar.bz2 3173535 BLAKE2B a35a366858cc67d6ef68959cf407c21a929d5dca82834937b648eded506c7c3f75dd67be763f0d1fc24b7be92849b53d688abb25611cbc9b918340dbb23a83e1 SHA512 b3be9a91c62fa258c8aa6f97d1ccbd8301225e43938b525a826c639fd8b30b7dd566f58f4d54e365606d861ad01660887163e5ca6521293791080e5ed41ef781
 DIST hdf-4.2.13.tar.bz2 3616255 BLAKE2B 3b20f018849b64aebc0e5fa53516f65f6e181b421c3842a033c2ec5586c262f18cb0be5c2a146bdecd9ae7580963817face2a21458852756f5b7072b7e6d5899 SHA512 d7be2b3650255590b72db4a6931325ec0af256db4b846cfe886c76bf24034901b2ba7a7e546566f426d265b1793287ea3f95d8fbd818a3d018fa6813a4541657
-EBUILD hdf-4.2.11.ebuild 1637 BLAKE2B 1182b6cc0c1b9a4a21d11a3e232c6b7bc1b357617473493056b51252961c26e1c6747bf4893658222373b4ac695523a0486ed02ad1f0e6fa0ed1e5943f118bec SHA512 dea95330be6dba8c69180aa1c34f5068e1f2565d09893e4b02d1697c6d2d2dd8ec4ab0c4ce7a61765da65e282d19997bc3c90bbaa62e9a29b123e35f4fb2db2e
-EBUILD hdf-4.2.13-r1.ebuild 1823 BLAKE2B 4a5d632b3ad107129734c37ec0ba289f5b8c9ecfa593d2aaab3af124bc3d60492146153fa616d9995b0d78e146daa7afb7fb9cb383ec296269306b171329fb8d SHA512 1322ac7ba685da4f9ce71811cb1f046ecbfb25817d3ad3044433da337e81decff6c943eb30b47faeffaa248bf13d8cb33f3a7291de24913c1426f5403bf6a432
-EBUILD hdf-4.2.13.ebuild 1709 BLAKE2B c19ddf38cbbf55b529a5860755d7fd87dd98061e42bf0b5b11e089c204e5b24b73311bc773eb3d7ecec230bc336f8aabe93d33a669c6ab8dcc0f5ab5a076bca3 SHA512 74df72ce4b4467038ccfd45103b845f72f746e2826a51fc7f7504ac4e0e9ae07485f5a8d0d580130a7e784152735ef10f95c2facbeb6e42b34694e8ba295bc24
+EBUILD hdf-4.2.11.ebuild 1639 BLAKE2B e665ee1ddd8ed979cc7c86712289b610fed0ae71064dacef3f1d476ea3affa81783b49fcfe9f15de35ff94b37c60687c542ba824ce2f9663aed81d0b4030d912 SHA512 ccfde9e848bf91258c40853dc2161c7c80b65dd3cb07ff3928e8a465de01a2e3ae6ae1160d24f2afd177a87c86f3f814a6abf31c2d029d4231e56788a3292e04
+EBUILD hdf-4.2.13-r1.ebuild 1825 BLAKE2B d9a3ab5d47884442462115561ab2871ee537ec1ae8cc7f1babd4fb9773218bd41dcfbac49bd3bdf958df50e4fe2bad6e562eaad049d0062d6a6f4395bcc5bf6e SHA512 8f3b3373867dc97da0a1422de930b9b6ea709a830e69bb97a1be1c7294b48501222d6518d448a4f92254ea1c77b849da7ea1d6dbae739dee78a4065f5674bf3b
+EBUILD hdf-4.2.13.ebuild 1711 BLAKE2B a35ac70c77523f3bd60aedf15d4bcdf05a2d2b7d061d0ec4553a1b761566e6388f2b9d141f53bcb5bef44fb34d0cfb189031cde7bb6baca440089a251d3da6c9 SHA512 332a2a73a35a3970c18a43b1fbe139f94c8a6f0b84a37249c1a1d7b2a8fd010454bd22e64e4284d22c8fed314e5067ede2dfe25532f691a640f31ca1d4b63af9
 MISC metadata.xml 859 BLAKE2B c5c33f1a444d0af6287dac495443be05de5a2b8d9c55d4bf9aeb80ebc28f1391612510771848277fa1467097ab480b9b1dc306af587d2621e4a1d16c6bdc91a5 SHA512 2a38d2fbd5672f4465cba6da9f74c6ef95068be26514acc3d2949049f8461265e2ce7c6751d1853218ac4a4b62746e355faa9f2e0d7d8d6dc2faf17d8e40fceb
diff --git a/sci-libs/hdf/hdf-4.2.11.ebuild b/sci-libs/hdf/hdf-4.2.11.ebuild
index a167bc4da9fd..e898f4d07374 100644
--- a/sci-libs/hdf/hdf-4.2.11.ebuild
+++ b/sci-libs/hdf/hdf-4.2.11.ebuild
@@ -10,8 +10,8 @@ inherit fortran-2 toolchain-funcs autotools flag-o-matic ltprune
 MYP=${P/_p/-patch}
 
 DESCRIPTION="General purpose library and format for storing scientific data"
-HOMEPAGE="http://www.hdfgroup.org/hdf4.html"
-SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
+HOMEPAGE="https://www.hdfgroup.org/hdf4.html"
+SRC_URI="https://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
 
 SLOT="0"
 LICENSE="NCSA-HDF"
diff --git a/sci-libs/hdf/hdf-4.2.13-r1.ebuild b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
index d50d336f6fcf..ae60cc865d33 100644
--- a/sci-libs/hdf/hdf-4.2.13-r1.ebuild
+++ b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
@@ -10,8 +10,8 @@ inherit fortran-2 toolchain-funcs autotools flag-o-matic ltprune
 MYP=${P/_p/-patch}
 
 DESCRIPTION="General purpose library and format for storing scientific data"
-HOMEPAGE="http://www.hdfgroup.org/hdf4.html"
-SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
+HOMEPAGE="https://www.hdfgroup.org/hdf4.html"
+SRC_URI="https://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
 
 SLOT="0"
 LICENSE="NCSA-HDF"
diff --git a/sci-libs/hdf/hdf-4.2.13.ebuild b/sci-libs/hdf/hdf-4.2.13.ebuild
index 39f741106714..feefb99d01aa 100644
--- a/sci-libs/hdf/hdf-4.2.13.ebuild
+++ b/sci-libs/hdf/hdf-4.2.13.ebuild
@@ -10,8 +10,8 @@ inherit fortran-2 toolchain-funcs autotools flag-o-matic ltprune
 MYP=${P/_p/-patch}
 
 DESCRIPTION="General purpose library and format for storing scientific data"
-HOMEPAGE="http://www.hdfgroup.org/hdf4.html"
-SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
+HOMEPAGE="https://www.hdfgroup.org/hdf4.html"
+SRC_URI="https://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
 
 SLOT="0"
 LICENSE="NCSA-HDF"
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index 21a614534847..6c8a2a4aa155 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -2,6 +2,6 @@ AUX hdf5-1.8.13-no-messing-ldpath.patch 1141 BLAKE2B d7d186e4c00acb9fd3d44beb1d8
 AUX hdf5-1.8.9-mpicxx.patch 494 BLAKE2B 148d87af064e2ba28c918c8db39ece0782a179803e4c38c5cd5eaba81a673bb8aa3699a48e80a7ae2d4579ac0261cc21d5509e46661ada9a69f444a58eb45ecd SHA512 8b4c39e40591860652547ea8ff205230da7d67488233e911cbcb3416eab561f2529c65bc5e7c9c812bf4298812346f47f9209e5f69f7e8f66ad587306a5b477b
 AUX hdf5-1.8.9-static_libgfortran.patch 429 BLAKE2B 9e1c544a453c09b3498a7d9d3e8090c928571776934c4dd6b426cbdb2783ed8f47185d6ee0c73ede6b4f14e27459ef5e1412112e9d897daa2dc57f1ad5fb0b24 SHA512 af97c54469a90bf3b0e8ec1218d4ca95822ac0cbc7120114979fc467fe3114743c74f4d4e16f0c10b1cd82d40880ef482f6fd34e1effc7c621b981ad466204f9
 DIST hdf5-1.10.5.tar.bz2 8706317 BLAKE2B ac326be8fe4ccc4b0153f15bc7d65aa8f1adc2ae279d3980f57ed46722b754d3f36ecf1d6273c75e80ed1afd4bbf10c6b1c5d9408e1f83a4b2e397e7902a7d3c SHA512 769e43b8672e26fe24ed68da0228c010d3d9bc950ca09f0bc60707911a2f26f2f8415c8abc8ec06e07667148d8cdb3b0c7b3e7860d9b19739629c5dfd5ce73d4
-EBUILD hdf5-1.10.5-r1.ebuild 2811 BLAKE2B 1b8e555034e149f38a15046bdf4e4dbf8a5ce50093852db1dc0fe5fab512b301b887c3c1eccef1043f221f7589eec2b99cfff15ea4114822c671e8cff9a81ab5 SHA512 16468635badb6f81b09215e38739975fa2e99a89f63a7e39bc616228a0d92a5828b957187aa97da99781f67d98db646d964a72e521bf184b25d852fcc567a62c
-EBUILD hdf5-1.10.5.ebuild 2710 BLAKE2B 44d9392549ae2f6ac7e8c39fd42c8b7706c9fc626de94f79b695c9f04fa097330176253f2d7a0695daedd8bdd7c86ee6cbcfa3223490307139f86ed0e19aacb6 SHA512 40b10877a1ace67993de99e0748a5af315f8e0bda6bc539108cbef8a6ecdf4b01306f5d3b0150b6b4773be7bf8b0d82758d612cd3c8637d62c7c81f284f47db1
+EBUILD hdf5-1.10.5-r1.ebuild 2813 BLAKE2B d219ef180297f018cb3eab02d2fcb7361f6802ffbc7c4480e102ac8c9e1341c5c5e63c92fc85a9f8db909d98028d19b4396d8ba480b7f4e00b00a38729798382 SHA512 9a0e076667ebd917f2b825070d291d8435821da66fae453ec47993e4e5bf4aa4e9dcee3fcd61f0184ed66be23c293ad0f583cadcb7c5c6ccf09ccbb589288dd4
+EBUILD hdf5-1.10.5.ebuild 2712 BLAKE2B ee136d4a3c9a7301d4887f5406b208bad88ea16e60bde7e2dd07f4d24d897afbe8575ebc76c96e054b7371a37d275da6f298620c181c13e53a33be0b59ccde9e SHA512 0183dc5aa3d1ac98dd04ddcf0391a97fa48e0647ed838167b54b807ee751f96a774d9c34fb5e6dd965075db8adcb63c852b786b87a017ce5057264a55fff0dc2
 MISC metadata.xml 763 BLAKE2B df2fb5f7f3aaa55b77b51d1e874cc4e58dc81d4c9fcc713f01bcd5d197b33d3ea0e300849432255d068b585b129dd0bc75310ea6ebe6d987688a2c621fd8fa75 SHA512 303724cfdf46efa4864e58bb645398472e801d1a22b083947e52aecbf28c7e5c0e16d5752d12927f02874d24270ea64220c42ec75d04d15c014f396523c2b19d
diff --git a/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild b/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
index ef906aa6eefc..c2f1f217d63a 100644
--- a/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
@@ -11,8 +11,8 @@ MY_P="${PN}-${PV/_p/-patch}"
 MAJOR_P="${PN}-$(ver_cut 1-2)"
 
 DESCRIPTION="General purpose library and file format for storing scientific data"
-HOMEPAGE="http://www.hdfgroup.org/HDF5/"
-SRC_URI="http://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P}.tar.bz2"
+HOMEPAGE="https://www.hdfgroup.org/HDF5/"
+SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P}.tar.bz2"
 
 LICENSE="NCSA-HDF"
 SLOT="0/${PV%%_p*}"
diff --git a/sci-libs/hdf5/hdf5-1.10.5.ebuild b/sci-libs/hdf5/hdf5-1.10.5.ebuild
index d812cce90d46..9d3676dd8897 100644
--- a/sci-libs/hdf5/hdf5-1.10.5.ebuild
+++ b/sci-libs/hdf5/hdf5-1.10.5.ebuild
@@ -11,8 +11,8 @@ MY_P=${PN}-${PV/_p/-patch}
 MAJOR_P=${PN}-$(ver_cut 1-2)
 
 DESCRIPTION="General purpose library and file format for storing scientific data"
-HOMEPAGE="http://www.hdfgroup.org/HDF5/"
-SRC_URI="http://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P}.tar.bz2"
+HOMEPAGE="https://www.hdfgroup.org/HDF5/"
+SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P}.tar.bz2"
 
 LICENSE="NCSA-HDF"
 SLOT="0/${PV%%_p*}"
diff --git a/sci-libs/klu/Manifest b/sci-libs/klu/Manifest
index 1efb1aed9801..a11cf50816d2 100644
--- a/sci-libs/klu/Manifest
+++ b/sci-libs/klu/Manifest
@@ -1,5 +1,5 @@
 DIST klu-1.2.1.tar.bz2 612428 BLAKE2B 807bfc56deb5c4cbefd2f6c118cd8e929ba9b02d9b88e8eee8b9443991f16a2a3e9b4e1fa888b2b6e450aeda9fc4d12d6a5480f9f25bf366312f57cd8f380af0 SHA512 2837ade61596b5e738d0dd16a5486fd2b0089ec9ddeae4fa3b2c3671de6637c7cf2d55e44c0103c9393caa3f046039a76d9abc5b8094d236523db0c58cc58b70
 DIST klu-1.3.9.tar.bz2 635596 BLAKE2B 6c6c84cf1b30e78cbaaee6bebed21c806d1672bee5f7ea061e7ef057ff56fd456e8517ca2ff1018a14ebcbc8f96b9e87989e22d8996817394666e6d8d2d727dd SHA512 b7fd862fe8443596758c27f9c918e367b3b3816340836e74cf8d97a2e755fbe07d133778eea3d054bc70243fa15c2bd71f4fd90c1179879661ba2d624b8f0706
 EBUILD klu-1.2.1.ebuild 656 BLAKE2B 53d38f9b4a6b80b98c50a0eecf85ce3e0eb6ffa65134ef68d7c7b67c1ea1f402f11f8870f1a1720b9583c79c952c7820eae652ecd3ebf9bb399fa7f2d20c27fa SHA512 2e0dbdfb47e311c4f537aa9e064e2a383b5aa783b67c3ece14023b88512167bc9f897f707129d6a57de207152804d80e181398b7ca17ebd7a7e20985672fd717
-EBUILD klu-1.3.9.ebuild 652 BLAKE2B acc4ec5d390bf989f0eecfdff60b8183faec3badcf44f0fade78314f5b40ce26c12cab521e608a9935314dbbbd1d20a8691792190596dd1bcfb5e984bdf15804 SHA512 d29ddc8c1ae5eea76cd2e84bd7e4eebeaa3cf1ec365bf5e98f3d45afdcc696b32bb1f00ed41ac968e7afc6b041ac9701fb27c01e345dde36551c9697db37b668
+EBUILD klu-1.3.9.ebuild 648 BLAKE2B 514ada94433a3788a082a24ae67e35c085d5dfeadf6103ff06d813682b2f0f75d0d8a9cafa3549ac1602878f7759ca9aa0e793ce33242afa9b3fa2d869adfef0 SHA512 336daaaaff329a069a14e8af1427096afa5b790b4b4eedeae28109b2fbd98025efe9a60ef08d70065605b1716b8d8e568933508056e00ac53d5080df4149d46f
 MISC metadata.xml 460 BLAKE2B f4d619f68a16bcbaaf2b44a9fd1156cc88dd02d38609da2e56f8b242df9744fbbe4b7befff2ae34f084b5895ab9a537e62182015008e596fddda33ea891698b5 SHA512 1e01a7e6576552beac665a8a0affe21809785f33316767ef6e0bcc59dd019e5100f1ed16ca1bd91ee1daf102de2122ed57ff0980dd6b4f21270f8c4c5f832db7
diff --git a/sci-libs/klu/klu-1.3.9.ebuild b/sci-libs/klu/klu-1.3.9.ebuild
index 3222f16c3e55..555188448255 100644
--- a/sci-libs/klu/klu-1.3.9.ebuild
+++ b/sci-libs/klu/klu-1.3.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/ldl/Manifest b/sci-libs/ldl/Manifest
index 5e4a5bb54696..d7eb1fd4e3bb 100644
--- a/sci-libs/ldl/Manifest
+++ b/sci-libs/ldl/Manifest
@@ -1,5 +1,5 @@
 DIST ldl-2.1.0.tar.bz2 336442 BLAKE2B 8516e37ac66c329397739fb5d7ee0b3a5cc1a286d780062a749901a13b30dca52e131647e66a721be1f1e2ddd022ecc7c9d6ec5da81acc9c98afa53a06978367 SHA512 ad532e3481e48b9c3587ca0cba3d58a89a2174e3a0d523dcac6d420e04aa5da1cb8517bb14556d0a593110350fdc02aea3677eec41eb74821a3a63552418d0b5
 DIST ldl-2.2.6.tar.bz2 342923 BLAKE2B 7acf1a82824de013fe9a7742fb2d5c44c86de96e95d1d7408106d4af420dc3655ab7533eb80592b52523245c7545bc246bf129712547ff6eba856a807c78b6ad SHA512 266c9e62c474a6a9b2d7f74aa580e313fbe4b322197236ba6fbbab6d1756348cf146c1d807ea6d8d0e5941cedc48298e8437aaf386dd6c433dcaf41a9d0b7371
 EBUILD ldl-2.1.0.ebuild 676 BLAKE2B 304a185bf67e6d05cb2de2f94fe4c62f773aa4bb9e93e20f20f766afcd49426ce7842f8397654a39e01c1b7741552720c8a8e4a83f29da724cd57db0ceb52d3c SHA512 d11d0a25d7dc3d54045b3dbb0fbb0a489f609d066122261a4b0531dfe33552c129a6ff57afac41c7d0d0a93385886c00d8c8b8004df5ecef19a9d23157b96a07
-EBUILD ldl-2.2.6.ebuild 644 BLAKE2B 446abc2d8bd61598da6c5dc998482c0f0e266eef983a002a4c2ab0079bab980f8fded0df818ef72fff922925eeb1fda1f3d5648715b91d1f0c2adc74cd4de99c SHA512 3f4d63be8724d4a7c4246e441833b99bdf72937c556d387804d7ab7d44d8aa5ee0274b07c7c9b7dbf2471add2412d7110404d3a399d2c929466645cfa29b92d0
+EBUILD ldl-2.2.6.ebuild 640 BLAKE2B cb0115e8bd91c007b60a8067e01f6fd37bec84b4b88798f33d794a9d0fd22a671110b447bcf146a520857e96f9810cf6c9dc4cef82ba9e1ba83e12f7ee29845c SHA512 c918362b140eeabfcaa399d1bf3628e3ab546e01f858f1e3e54af40bd6c86a2364d207a1b6e68339b89d3a73355fb595c10206c91e557835c119b7665c0c0e8f
 MISC metadata.xml 891 BLAKE2B bb9634b4bf10c97b042f24fdd8e6427ae29ebf462d6ab8e2d29e882c683eb88e77ac1960f6cac7b674c85e4934f2f3a3b2e1924bf198f07adf6eb2e7410622b0 SHA512 b03a1a031499fe56e45d73fe5e63585cdddc75ed6a9f3e5ce4327eb02f8bee235366c23648b22959ea43ce79f16811ce28d1abfbc2c8cbb465d2986cde9cdda9
diff --git a/sci-libs/ldl/ldl-2.2.6.ebuild b/sci-libs/ldl/ldl-2.2.6.ebuild
index 97dc7300636b..59660d008192 100644
--- a/sci-libs/ldl/ldl-2.2.6.ebuild
+++ b/sci-libs/ldl/ldl-2.2.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc static-libs"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/metis/Manifest b/sci-libs/metis/Manifest
index 6b938f4a80df..75598f0540ed 100644
--- a/sci-libs/metis/Manifest
+++ b/sci-libs/metis/Manifest
@@ -9,5 +9,5 @@ EBUILD metis-4.0.3-r1.ebuild 842 BLAKE2B 436b4eef63e9e4b8c48c7ce2c989c6614354acf
 EBUILD metis-4.0.3-r2.ebuild 868 BLAKE2B 6120a07d9c342b296c2e6e6c7df8862982ff732afd6dd96cee3b190b80f18c4077507e1059ff1be3f573cd1b7469aaa2fdc822f2c3fbf2b035796860b463c2af SHA512 987f89de9887e7a5e0aeb29de9f2fcd9d057785becf7e9f7ed31a238ba39aff3f6db6b6699c0428d9d88361c4b4e2655e39e850dd8dd402057873813ec16784c
 EBUILD metis-5.1.0-r2.ebuild 1905 BLAKE2B 4bffcbb4a902c84b843a7398491242ec6a6c37a3c9a9353e28b4debad79edf95332db9578cd098b5469c8a9d144a05d4864333a29f888f46c061dd125bf59579 SHA512 7c2b0b9cece1f4842babea6cf02492584b79eb965acffe9135f43372ceabb3a87fa3514e29fb1edf061b579196a0664ee8ae5e133375e7793d06fb529b9bae5d
 EBUILD metis-5.1.0-r3.ebuild 1936 BLAKE2B ef3740f53f426b5ab9e241963a5a1401e776008a311b999297b2ec267bf59902efaff5d21a0ded45084de967de9b7ee14fd6a9ecdcf12d9601fac9b59f26747f SHA512 c42713219592ce941c56230c7b7181053c41d80ad476671115909e09ea02d7d631b485874ab348712f9867c2c0a2b4c11e13b71db4667f0591b09e694248167d
-EBUILD metis-5.1.0-r4.ebuild 1485 BLAKE2B b109c425982dbda5ca90f00acf3eba98d49ea1d4763550afe862f8036d81d3314ab3be27a349fa876f5710f2b7ad3d20cd44b4c1150d625c8c3592449ae6c302 SHA512 985ccd3091af2f4fd844a05d2650658d20d715fce071f0f51d14ac2c26befb880291d2dadf19ed46c070159eb09d4e47bdbc00f26082b59da5b0f1be8027a722
+EBUILD metis-5.1.0-r4.ebuild 1481 BLAKE2B 1fcc848c42773c37f808ce1e42104204df60fe344148815576230fb0d784da1e5c32f1d4b8ad1d51bff1400c079120fb24526fe719f3063a43cd0b3b1ea897f9 SHA512 62004079f5d2c81823a0185670ed6f15a6c3f55ac2c75e6144cf39df6e119a0db9f1fe23aaafcc6a4363df4ddd161ee6c44152fb70b5971ada676ba5a4a44797
 MISC metadata.xml 618 BLAKE2B 862f647c5562ab3d781bd3cb6a4ec1470cd45941043bbf1b9d09d41c5ad528546e338663400d322d8b1cb6b57e33910a9520b818a81c376451af0da6c037aa34 SHA512 7f46d28a97805eddd9d547ba66263cd395be46b495f4a9651312cfb421714b614d2c7415142c929c99386d32799fe78ea10110471b702487be4072b981ca17ee
diff --git a/sci-libs/metis/metis-5.1.0-r4.ebuild b/sci-libs/metis/metis-5.1.0-r4.ebuild
index 5f62daa4aff8..1883a113d0e2 100644
--- a/sci-libs/metis/metis-5.1.0-r4.ebuild
+++ b/sci-libs/metis/metis-5.1.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc openmp"
 
 RDEPEND="!sci-libs/parmetis"
diff --git a/sci-libs/mpir/Manifest b/sci-libs/mpir/Manifest
index daf8aa793b31..00c58303e7fb 100644
--- a/sci-libs/mpir/Manifest
+++ b/sci-libs/mpir/Manifest
@@ -9,5 +9,5 @@ DIST mpir-2.7.2.tar.bz2 3771429 BLAKE2B c3431bcb84207fdb1bc0242fe56b7c2d45643e8c
 DIST mpir-3.0.0.tar.bz2 2572041 BLAKE2B f564944dd76586ca6e50c39f1199468b905a3db7bbb8b2ee6cf3dcdfb00757d7eefc57e010d5cfc3d6db7ba2676e36f7980365e85c87827b4901ec4e80349915 SHA512 c735105db8b86db739fd915bf16064e6bc82d0565ad8858059e4e93f62c9d72d9a1c02a5ca9859b184346a8dc64fa714d4d61404cff1e405dc548cbd54d0a88e
 EBUILD mpir-2.6.0-r2.ebuild 1722 BLAKE2B 0d356fc5762aa25d8dff40d72ad031201d6a1c01fd10107f815ae2cb4f6abbb5b2806b9097f87f916ea892f246d0ccf9e0f00cfc88b65f7b1d8ab4eab775e0ad SHA512 43d1bc825f15e4386a163860ff62917ccdffc7cc3d1ed4cc767e101ca78f86a6212fa618b92439d7f308108c4e71bb55d2a2cb7738d8b275b6714e6ac3e21b6c
 EBUILD mpir-2.7.2.ebuild 1719 BLAKE2B e4c9c8a697fb658a76eecdc651c119729a9ec8ecf30d54f054e8f5c61e7a873824e3f566cc5afa2509b96c33eadebbd79bc94aa074e144b562d2fe61c841d6cb SHA512 0cabe5c4e5c1df7b8ecd54b4ba87caff0b934d1805fcbb32b68ba393ba5684fac4314ed277e39286697295f94e79900fc809586b96131d0d03c264873dfd0c07
-EBUILD mpir-3.0.0.ebuild 1840 BLAKE2B ae3684cc09c4853685bc97626fda129d4e3c23bec817e35b3edb18651907fd48f1e40ad52bb97121280130662c3da9ebf5d77157b3960626aa799a8b32cafd70 SHA512 43262a8e864aa234a7a05c537611b9464fa0ea934e4e2841af4c7d2b3c25b7d12457309cb0979e7debc97527c7f8b793482c11f9b9e6e20d4bc6a4a3693dadf7
+EBUILD mpir-3.0.0.ebuild 1842 BLAKE2B 232747c585153b4b71a8aa08574a4c4e41fb3f5c6d3c9cdf6e3dea34a7e330fb5a42dbbc740b02c36ae0261f251d3494bba29775280882fdd048c1d6dcefa9b8 SHA512 92bcd6e52bbbc97f3ac203c2d9afd5694cdf9c96ce18b716dc5d9e8e74615d0ecb162b61028cdb75c3502347810b199ae8b1c1fcfcafb8ffd6f939b6c2439792
 MISC metadata.xml 792 BLAKE2B 9c0bea642d53a6afb0abeecefcc940c012b5cecf8c6e98fdf69eb718f63ea8e7c7f913fa1cd8360240b5f355e3742a5ccae00166690cf8a83226ad636342d279 SHA512 811f781a961982955ba036f719ec5cce3def93190fb786ef3c3a60f1b54f9b7638d8083cf0f273174002da7d358d25e8764de591d7b587b41198c48c52908fcc
diff --git a/sci-libs/mpir/mpir-3.0.0.ebuild b/sci-libs/mpir/mpir-3.0.0.ebuild
index dd1e6cc41e80..b22fb7b36036 100644
--- a/sci-libs/mpir/mpir-3.0.0.ebuild
+++ b/sci-libs/mpir/mpir-3.0.0.ebuild
@@ -65,7 +65,7 @@ src_configure() {
 		$(use_enable static-libs static)
 	)
 	# https://bugs.gentoo.org/661430
-	if !use amd64 && !use x86; then
+	if ! use amd64 && ! use x86; then
 		myeconfargs+=( --with-yasm=/bin/false )
 	fi
 	econf "${myeconfargs[@]}"
diff --git a/sci-libs/nlopt/Manifest b/sci-libs/nlopt/Manifest
index 6f40d8de381d..5b902d46582f 100644
--- a/sci-libs/nlopt/Manifest
+++ b/sci-libs/nlopt/Manifest
@@ -3,7 +3,8 @@ AUX nlopt-2.3-pkgconfig.patch 318 BLAKE2B 3569931fb9e2fceebf46c542e10fcd2562c8ac
 AUX nlopt-2.4.2-fix-dynamic-underlinking.patch 2522 BLAKE2B 5cdb8ea93cb44c25b1814431962259727c5c4dc97b4cf78d239189187f953a4b9458849a9afe77979841768b78226c6218ecc531328cb5752d26b9df63468ee5 SHA512 bdb07b216ffb68b68cb3f03076336234c558db3953c48b02511883bf9fb12f5915c04950a2e3222577c7af4fb1e288a165af2e8adf211fc853e747c98a65cd19
 AUX nlopt-2.4.2-octave-4-map.patch 1858 BLAKE2B 34b1696762a9690a5ef5f3abc265b37d5de2f92b29e514952aa062faf1553a77ed3dba6f2abf7c8f1f7cbcc1cc63c9546967f3a317a773aa5e7c5c1e9c13f7e3 SHA512 00c45fe04fdc1acf4ccbb77aaf39feab0cb2b811b45edf791db7e87aa9e965c23b6131400eebd68335be8dcb86f346c01892e718f739f07dc0853b3dd9ea5ad4
 DIST nlopt-2.4.2.tar.gz 2361992 BLAKE2B c1c9f533c7e7b3bb61e81343ebd26b87e05434fdbea1f347fc5f6a6c10160289ce105a51c6540296f3f1d122d31b415452da49b84516cd13fabc73372e4cfd0e SHA512 136aacc00a69f77e8a7ce5dc26a5f3f027bc8c01b97aa1f43919462e0a412154eabfb01be258e082dffe61f9b554bb2bfbb550a7b82c7c77c7b22874a64a9703
-DIST v2.6.2.tar.gz 2040229 BLAKE2B f1f4124de574600ddbef8a885bbdd3a4f57b469b2f958ce94bbc831cf9bfa8a845e438fccfe4ab219a73a5675b8d880f6d49e0e7cbe9d0966777b0d2344521d4 SHA512 61e5c01140a57c0ad2a0acd82ad50dce1b5679dc281e55cbbc332e876b19a689013100617545a42b721d8c487df37d6ccd67859171243433fe29468f259b556b
+DIST nlopt-2.6.2.tar.gz 2040229 BLAKE2B f1f4124de574600ddbef8a885bbdd3a4f57b469b2f958ce94bbc831cf9bfa8a845e438fccfe4ab219a73a5675b8d880f6d49e0e7cbe9d0966777b0d2344521d4 SHA512 61e5c01140a57c0ad2a0acd82ad50dce1b5679dc281e55cbbc332e876b19a689013100617545a42b721d8c487df37d6ccd67859171243433fe29468f259b556b
 EBUILD nlopt-2.4.2-r2.ebuild 2714 BLAKE2B 3939763ab3da6e8708c10b3ca39f1c001f2d9913e883648cade9d58b83c3242804991373fdd36599474715840562533881c8ab0ffd98cda54ad71d3d4c12cbe4 SHA512 c2a7e3336ccb1887c2c6074aed5fffb254dd11e607d871bd3ed864794d04cdfb7a3aff711b8cb5f7f0a98629f34a196f4f5fa7221f5c07324b2439b48cc9e5c9
-EBUILD nlopt-2.6.2.ebuild 1962 BLAKE2B dafee2481e89c71e5c55cb0480358754ee82fd9486f85a751485cfdfdeb0743119d6e7ac3cdfe10f85076eed564507296a6e9f94d640ecbd84800a53cc0ed55b SHA512 fb35120424450c937211755fc1350d24510b09c49fe6b58c6d611f3ca98ef861e0aa89bd3ac27d9aedd747e5c0a18a22df1fb1be2b99b7dfe3eed44ebba5b5e8
+EBUILD nlopt-2.6.2-r1.ebuild 2301 BLAKE2B 92872c3fe8856a81648071c2f4fea997c96f3e8590ccf9d5bcfc27dafc73bdff822e18768521c8ce42e1eb4e3ebca1a4ccd15038e4688ebb179907ab422c71ae SHA512 68a32c60540e17cb91ed86987e3981ad519656ab2bab83fbacc98fb01e439ca65e85a8c75c8d06860b4fc47329e08f19b591e1fae25192510f9a5d44216bf749
+EBUILD nlopt-2.6.2.ebuild 2412 BLAKE2B 722391655b7a5cebb487bf893efe1203a440affc3739282ba26e7a5202edff01d953a43a157da5c6c7d5f809135674089f8179edc2be43498daa8aaa5d8c4a19 SHA512 462bb900b0eaa779bf29c6dfb99f52b432e7c3c29c4c997e3fb8019b94ba0885fbab8b57e0d7673fc561407923942e7026febe1d3c196a10f9d53cd11feea02d
 MISC metadata.xml 1095 BLAKE2B e5032d65fbb49b125b6cb5abe332c52a1e058271c71aec2d2522cc78874a079f8987e2e8356290295bcb886c32e1cf794df9b157ebc712a862605105b80abe31 SHA512 74a37bc3e6fa74d0f96c3390fadf16e76caf904f43cf9ac0496f70e3e3bc458727e58d9fc65c39a81302b081575e530c27be3812488df20fab42aff5494437f7
diff --git a/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild b/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild
new file mode 100644
index 000000000000..416022d0dc54
--- /dev/null
+++ b/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit python-r1 cmake fortran-2
+
+DESCRIPTION="Non-linear optimization library"
+HOMEPAGE="https://ab-initio.mit.edu/nlopt/"
+SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="cxx guile octave python static-libs test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	guile? ( dev-scheme/guile:* )
+	octave? ( sci-mathematics/octave )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	"
+DEPEND="
+	${RDEPEND}
+	python? ( dev-lang/swig )
+	"
+
+src_prepare() {
+	cmake_src_prepare
+	use python && python_copy_sources
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DNLOPT_CXX=$(usex cxx)
+		-DNLOPT_FORTRAN=$(usex test)
+		-DNLOPT_GUILE=$(usex guile)
+		-DNLOPT_OCTAVE=$(usex octave)
+		-DNLOPT_PYTHON=$(usex python)
+		-DNLOPT_SWIG=$(usex python)
+		-DNLOPT_TESTS=$(usex test)
+	)
+	if use python; then
+		python_foreach_impl run_in_build_dir cmake_src_configure
+	else
+		cmake_src_configure
+	fi
+	if use static-libs; then
+		mycmakeargs+=(
+			-DBUILD_SHARED_LIBS=OFF
+		)
+		BUILD_DIR="${S}_static-libs" run_in_build_dir cmake_src_configure
+	fi
+}
+
+src_compile() {
+	if use python; then
+		python_foreach_impl run_in_build_dir cmake_src_compile
+	else
+		cmake_src_compile
+	fi
+	if use static-libs; then
+		BUILD_DIR="${S}_static-libs" run_in_build_dir cmake_src_compile
+	fi
+}
+
+src_test() {
+	do_test() {
+		local a f
+		cd "${BUILD_DIR}"/test
+		for a in {1..$(usex cxx 9 7)}; do
+			for f in {5..9}; do
+				./testopt -a $a -o $f || die "algorithm $a function $f failed"
+			done
+		done
+	}
+	if use python; then
+		python_foreach_impl run_in_build_dir do_test
+	else
+		do_test
+	fi
+	if use static-libs; then
+		BUILD_DIR="${S}_static-libs" run_in_build_dir do_test
+	fi
+}
+
+nlopt_install() {
+	cmake_src_install
+	python_optimize
+}
+
+src_install() {
+	if use python; then
+		python_foreach_impl run_in_build_dir nlopt_install
+	else
+		cmake_src_install
+	fi
+	if use static-libs; then
+		BUILD_DIR="${S}_static-libs" run_in_build_dir dolib.a libnlopt.a
+	fi
+	local r
+	for r in */README; do newdoc ${r} README.$(dirname ${r}); done
+}
diff --git a/sci-libs/nlopt/nlopt-2.6.2.ebuild b/sci-libs/nlopt/nlopt-2.6.2.ebuild
index f21aa295b041..21c2ada3624a 100644
--- a/sci-libs/nlopt/nlopt-2.6.2.ebuild
+++ b/sci-libs/nlopt/nlopt-2.6.2.ebuild
@@ -5,11 +5,11 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{6..9} )
 
-inherit python-r1 cmake
+inherit python-r1 cmake fortran-2
 
 DESCRIPTION="Non-linear optimization library"
 HOMEPAGE="https://ab-initio.mit.edu/nlopt/"
-SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz"
+SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MIT"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
@@ -52,6 +52,12 @@ src_configure() {
 	else
 		cmake_src_configure
 	fi
+	if use static-libs; then
+		mycmakeargs+=(
+			-DBUILD_SHARED_LIBS=OFF
+		)
+		BUILD_DIR="${S}_static-libs" run_in_build_dir cmake_src_configure
+	fi
 }
 
 src_compile() {
@@ -60,6 +66,9 @@ src_compile() {
 	else
 		cmake_src_compile
 	fi
+	if use static-libs; then
+		BUILD_DIR="${S}_static-libs" run_in_build_dir cmake_src_compile
+	fi
 }
 
 src_test() {
@@ -77,6 +86,9 @@ src_test() {
 	else
 		do_test
 	fi
+	if use static-libs; then
+		BUILD_DIR="${S}_static-libs" run_in_build_dir do_test
+	fi
 }
 
 nlopt_install() {
@@ -90,6 +102,9 @@ src_install() {
 	else
 		cmake_src_install
 	fi
+	if use static-libs; then
+		BUILD_DIR="${S}_static-libs" run_in_build_dir dolib.a libnlopt.a
+	fi
 	local r
 	for r in */README; do newdoc ${r} README.$(dirname ${r}); done
 }
diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest
index aea16f086ed1..dea2b0401cca 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -1,5 +1,5 @@
 AUX dont-clobber-fflags.patch 1251 BLAKE2B 7451d67e8676be33c2070b9eea767d24d961eff708eec3f6544b68228963166138f844f51dde8d48f723412ce0fcb6d0da427d298c652156da56d34073a1c82c SHA512 d06cd469749c88c69e2bdab01b5c0c67105a756a6d4c3704842335261ad57f6e898ceb73943487396178ae99ccf2ee3e551ae5881996af54e36fb951c6be43dc
 AUX shared-blas-lapack.patch 5557 BLAKE2B 1e41b18e5a9c12eec9283c835e9b09e4ca89c6512f47a2f158f29c8a8a822d0365ad350177e379bec13f7c7574d8debd55a2f612027ff661c67ac7b226bb2370 SHA512 baa23f0c2bc8b7bc3384d7b8fa20eb5e095f20e1d8859badb55e680ccd435a851da6099b20aa203e46d62096ac93663ea130bea04dabf19432522e53139d393b
 DIST openblas-0.3.9.tar.gz 12189745 BLAKE2B 3cc4c6a403d6a52845cf4ff8cef254f57587e17e3d09bfb6ed7c02ad06a6002e50b340177c73a944c2a621c12b7f494c516025751c194d019662c0b4db17f4dc SHA512 c6b8ee465f1cf53b37f21ec3ff9a28d5cafe20fec59d8c1bff5923a9e1989dfa5ae8c032a5d43988fe7722ed08c64c7957a3d30e6ae917e2e7aa2977a91e67a3
-EBUILD openblas-0.3.9-r1.ebuild 4076 BLAKE2B 672d56f31f5148e878eb6b4cd2b5200e1d844d9f3e5e8d0bd0583c3052c4b15fa42fcbf4195c6a3c3a855b6b68f2a6e20f8bb129cff40ea268895972bd3b44e4 SHA512 82087864918ad0ac4777b88d5b5ec2036b7b2040d5b30af8247d960b8f460561d7215ca459087fe012ca537e65ac6fbb98c542d5bd1f57a1a9f25c940b33dc85
+EBUILD openblas-0.3.9-r1.ebuild 4075 BLAKE2B fe030c9249e08b2695cdacc10042ba128a184e2f21193d21a602bff4ec6d307fadae33937b721cb7aec7151e31e4427df95e08f639698492cd4154a43e04261d SHA512 dd96938cb36e36989e600955d4171241f66d2eb8725ba3e193cc08c7222fc6f0fea977358679eb6890d8dac6699aff1a601160ef425defd991c86381b35efd2c
 MISC metadata.xml 1460 BLAKE2B 22d1770bd4a58a0be80b7b1b04a7a6909d6bc7ff166a242c46294a1d39f5adf928c9e6f00835b79ef1c2df1747efa3b04d9b380a964581eeb963ea17e453ec9b SHA512 da3e981cab096d3bc18077ac210ccb1b91350418969549467c22f286196b18fb080eeb8a6183247b47de65cbd0a7fb67a16f2e46911aac6c5e9e9f01c193764f
diff --git a/sci-libs/openblas/openblas-0.3.9-r1.ebuild b/sci-libs/openblas/openblas-0.3.9-r1.ebuild
index b0daf6becad6..391cd2524189 100644
--- a/sci-libs/openblas/openblas-0.3.9-r1.ebuild
+++ b/sci-libs/openblas/openblas-0.3.9-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/xianyi/OpenBLAS/archive/v${PV} -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="dynamic eselect-ldso index-64bit openmp pthread test"
 REQUIRED_USE="?? ( openmp pthread )"
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/pgplot/Manifest b/sci-libs/pgplot/Manifest
index 3479aa164504..43797b961cb4 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 4345 BLAKE2B 9fea4420e1bc8f0af25dc710644e0c99570da7967ec4a80bc146f9070de1bc36d9854f8cff78098b8eb697cf4518d0893e35318e2377a2eb189ea53582ed00b3 SHA512 138fa602906e2e82db04ec38bb3058decfd6329da1684233d65b03d792347d5eff034bef2da5eac4eb7e167488a702b8839f0fe879802f5874b09983b363c9cb
+EBUILD pgplot-5.2.2-r7.ebuild 4346 BLAKE2B 982b2bcf89e297515faeee32daca24196887678acbd593c3b79d1da7aab612ab5335d10fad649acdadbc81abcae9b5a0f59fd030de7508877acdce192852f0ac SHA512 11c7ed1c02b84d22f5b14be00fc28e20a6ccff136a60b35f7c1b7db7bf4b0eb31884c0a04bfb6cb939366b60d443de02791831b7f06fd894ead4edffbec18eaa
 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 33d7fc5c0a26..43b17b8974b1 100644
--- a/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild
+++ b/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild
@@ -8,7 +8,7 @@ inherit eutils fortran-2 toolchain-funcs
 MY_P="${PN}${PV//.}"
 
 DESCRIPTION="FORTRAN/C device-independent scientific graphic library"
-HOMEPAGE="http://www.astro.caltech.edu/~tjp/pgplot/"
+HOMEPAGE="https://www.astro.caltech.edu/~tjp/pgplot/"
 SRC_URI="ftp://ftp.astro.caltech.edu/pub/pgplot/${MY_P}.tar.gz"
 
 SLOT="0"
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index 25cd128228e9..2b4f034efa61 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -1,11 +1,11 @@
 DIST proj-6.2.1.tar.gz 2698759 BLAKE2B 69867c05ef727df63351bbb8bc787d039c6a333a6e28b5fbbd1814fd9ca3ec279dd58ee7f0f79c3601ced270b6fa38619120e58f4407c49890a74996bbf88da5 SHA512 1e8632a9c6fa00c0354473f60d81e4644f173b42f6613856ba03e2404f429864fd5052aacba945ccd265173397bed2abdbe325320b54bc7b1c4a75ad95395a89
 DIST proj-6.3.0.tar.gz 2758388 BLAKE2B 33f9d6ce6aa885667b7c1337abd218ee802581320880288f948378073d04c46118927147794ce6c97616c906c683c33bf10984d08463faea214ffbe80b12d62b SHA512 679fd2e57f27feeb956d2a8843cb9028895a78f0dac104c920cc9060afade434b953fb381fed350e5c8ac15cd796f795220e0f1ad276a4f7482d6e7f5681d06e
-DIST proj-7.0.0.tar.gz 2893700 BLAKE2B a115bea09093cbd412cff439abb0f381fe7edc21aa118534e0d8844672a3497a9608ef8072e6aff850a3d70bc3df0fd4c4d4dbc3409ef2e975c84eac6a3dc83a SHA512 fd92937656c85c7f6969947323fa2752df0c931dd9c942b11c67dcae132f61f404c8da57ed7e7177aaa82f579e42b1c3611e6c2cc34d70454e548ad8afece243
+DIST proj-7.0.1.tar.gz 5312488 BLAKE2B 421a3b5324ab7c952a8b45036e6db2c8cfc1fd2db3d050d2e644cb1c1c78fe669a20c6d8428debf75233a975a989e3ad2ce6a83cd944825641ffd3107cc44a02 SHA512 034d1b916980c80fe9f8e67d2897814e611920af3e852f152fcd9e3fc4ec8cbc39bbd8f8296949a3c3f5e6708bb9d84e61c4cba9c01476a3888448135e97dc33
 DIST proj-datumgrid-1.8.tar.gz 6604329 BLAKE2B 78df259a811a79457d011b4f675f1a72b6613928bb0083d01bfe65bb4c333628725b300efdb7cf10ebc6f26ff03733886c20f25c7aef80875e81e59bda9fd7d3 SHA512 23153f5b57d210e37cd6e9e0fced23bdabb1c67476e9fb50eb83a68ae066a5c3675822472f5d558d10ddf36ac1d73d538b75304d112a1bfcd8d0bbd26c6481a5
 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
 DIST proj-datumgrid-europe-1.6.tar.gz 189057258 BLAKE2B 66daf2341b05d8d5f929f6d67e1913656c2380a3663b4359cb97576ff5954dbea5890862869bb1077f6cde760dada4d9f13201c5b2c29ef3458a8b43089e459c SHA512 463d2575d5ce6f5984e69897c34ef80ec31a77f5ba00a07a5f55e97c3033dbae40b7d17891e5495bc47e6faf917968b1cdb7b3be9b2a4838e3b093b74753c2a8
 EBUILD proj-6.2.1.ebuild 1118 BLAKE2B efc31b3a18898c9fbf064d556a51b660bfabb2db0d08352d01367a2f1c88376d993dfeeee67556d5d65b57e22997e150a9ab80b90d497bf7d2a65487ea8b1108 SHA512 88101056c9660c8c088fc05592fbcb7c258c837aaad55971f4d7939c1ae79b51bb5069b963b8c6cfbedbfb4a54a0b9ce7324c6b056a8f4883e01e273b5bddde4
 EBUILD proj-6.3.0.ebuild 1123 BLAKE2B 27a3e1372aa2c62063b16caf2d9479d8d67092f9a6e3a0f7a1a3f7f2b52bb08694a358567d36fb96c8c4a5e1fca3ef24f8eded6834f3a0f9c787bb8ba3d204f1 SHA512 7f4a6c73f17a96e95848a81be7c3821deae554719db75ae02649b2430bb5b3e73b1c27e80cf66841820c59de825a9caed11d39c707c29d988641554db7787872
-EBUILD proj-7.0.0.ebuild 1123 BLAKE2B b00047d3e07c603ffaa69a3a485e54fad0d2f4bcc3f583b1f50e6bd5d076a9a556a5661eda7077284d90f2cca81dcf6cf617e867956e5f06df6befe8a11ce8e8 SHA512 06c3f0e13d864155fd3164ddb826e479fc6db8e5256f9a0cc86010e8ffac1ac768cb6039ad93887b69ebb467a1cab5d00af4bfdc1e204672d985e917ce6ddaa3
+EBUILD proj-7.0.1.ebuild 1224 BLAKE2B a34b37a7e721cf1711f294ff91ed351d727d0325fc6f3aa348f16196700ca423ed34a4d8c762278f4918b41d1b1d412d1bfc6e509ff7941ec91a5316ece3cb80 SHA512 665874582615997300f6b28312149b922ecbdbd3cac6ee9cffb8d878b231e303578c637c206d7bfdf1cdc732f4f7599f51424940bb2896d63759b3dd6e6f965d
 MISC metadata.xml 513 BLAKE2B 4068b4ddcb4e95578df8da19650ab86b4dbfdba294a3d03f10ada37a578a2113b0d71720545c269b1c097d3a37dbc66ee0cdfe61889466171c109413088707fd SHA512 e841ea4fb30d3632fecca7d584121fce35dff2b23ad8a1feeb98a47f0a3b1d78f57a05b0d303aeff47f981f5b7feb831deb14644ab6615644c0a8593a6e321b3
diff --git a/sci-libs/proj/proj-7.0.0.ebuild b/sci-libs/proj/proj-7.0.0.ebuild
deleted file mode 100644
index 1864512c1dcd..000000000000
--- a/sci-libs/proj/proj-7.0.0.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
-
-DATUMGRID="${PN}-datumgrid-1.8.tar.gz"
-EUROPE_DATUMGRID="${PN}-datumgrid-europe-1.6.tar.gz"
-
-DESCRIPTION="PROJ coordinate transformation software"
-HOMEPAGE="https://proj4.org/"
-SRC_URI="
-	https://download.osgeo.org/proj/${P}.tar.gz
-	https://download.osgeo.org/proj/${DATUMGRID}
-	europe? ( https://download.osgeo.org/proj/${EUROPE_DATUMGRID} )
-"
-
-LICENSE="MIT"
-SLOT="0/19"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="europe static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( !europe )"
-
-RDEPEND="dev-db/sqlite:3"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"/data || die
-	mv README README.DATA || die
-	unpack ${DATUMGRID}
-	use europe && unpack ${EUROPE_DATUMGRID}
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--without-jni
-}
-
-src_install() {
-	default
-	cd data || die
-	dodoc README.{DATA,DATUMGRID}
-	use europe && dodoc README.EUROPE
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/proj/proj-7.0.1.ebuild b/sci-libs/proj/proj-7.0.1.ebuild
new file mode 100644
index 000000000000..5a90105f20d9
--- /dev/null
+++ b/sci-libs/proj/proj-7.0.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DATUMGRID="${PN}-datumgrid-1.8.tar.gz"
+EUROPE_DATUMGRID="${PN}-datumgrid-europe-1.6.tar.gz"
+
+DESCRIPTION="PROJ coordinate transformation software"
+HOMEPAGE="https://proj4.org/"
+SRC_URI="
+	https://download.osgeo.org/proj/${P}.tar.gz
+	https://download.osgeo.org/proj/${DATUMGRID}
+	europe? ( https://download.osgeo.org/proj/${EUROPE_DATUMGRID} )
+"
+
+LICENSE="MIT"
+SLOT="0/19"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="curl europe static-libs test +tiff"
+REQUIRED_USE="test? ( !europe )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-db/sqlite:3
+	curl? ( net-misc/curl )
+	tiff? ( media-libs/tiff )
+"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"/data || die
+	mv README README.DATA || die
+	unpack ${DATUMGRID}
+	use europe && unpack ${EUROPE_DATUMGRID}
+}
+
+src_configure() {
+	econf \
+		$(use_with curl) \
+		$(use_enable static-libs static) \
+		$(use_enable tiff)
+}
+
+src_install() {
+	default
+	cd data || die
+	dodoc README.{DATA,DATUMGRID}
+	use europe && dodoc README.EUROPE
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/sci-libs/scikits/Manifest b/sci-libs/scikits/Manifest
index 4125fd76b5d2..c9b3da878bab 100644
--- a/sci-libs/scikits/Manifest
+++ b/sci-libs/scikits/Manifest
@@ -1,4 +1,4 @@
 DIST scikits.example-0.1.tar.gz 2401 BLAKE2B 4c67adb2e74be9c94d68e99bf44017eb75c054608b69045523c5cfeee18edb01384640e8ed3cba4765bc181e7dfb9a2e70d1a97ad2b6176d2df7112172adce55 SHA512 9e5534a9f12f5a11e7f9d7c3d4f16cdbfa34293b29882e6bc9ec597b6e7ac306cc65e2b197da8c0bfc8e319b01db31f34b06018b5420c3ad68e8cc3f490259e1
 EBUILD scikits-0.1-r1.ebuild 738 BLAKE2B 567a32a5ab294ba1d053bcbebf68da3998c633f9e6a943180bc968a2ac0b2ea5140ace14456b77f499ecc4b20dd82417e74c8a5959c8245e43cfd95ec2fc9f0d SHA512 c2c03a129d86ca4e68a99302375a811abfa4a750750425713c91d51ef58ba203bbd46e4ddd2f9f2841b9d61f4a5c06da6b8bb9b2111e56111d581028d73d535b
-EBUILD scikits-0.1-r2.ebuild 749 BLAKE2B da0b7d7ae2ee6d0e8af2d277b17de955a52fb8323691209c855324171a3266c2ba6e54f92ff04ea6becb7a5f9cded3a890f677e391fbf3f65e6bdceeac357074 SHA512 9af97c5f23da57c0b7013e56618451a349503c96dc3fa0fbbe4ead73a35033744a5426d53abdf64b90fb176a711b738e601c1678df38944cb5051b35a610eb28
+EBUILD scikits-0.1-r2.ebuild 756 BLAKE2B c5688ed662d8c90d3e79dd99e3463952060572dd6a61851e7b28fb1729eff349a21f7393d6a7fa1bc5d1f01a18116278eb66b54d07362909b2ff7f3198dd08ae SHA512 dc82efcf0fde9b4db145a0d729074c930a79164228d547c58bd6ec71ba8a50966d4bfef2be0a323b4f0c75f038f925976b212bb4cf4d096926bac51a21c210ee
 MISC metadata.xml 454 BLAKE2B 65b13370ebd7fdc79632a088b403f493076c87a0ccc49b64946c7ed0050fcfd85f7ac0fce2fa853e1be0944d0ee1628470dadb4124448e7a746bdb864ffe9977 SHA512 b33fed7d1199471c4a86dadf1aa90951035fe49c76df9310de4ed13c391b92782230308a55a33c7fa88f5bd42b8718fe5f6ac88c0a8c1818848a447c4c1d0eb8
diff --git a/sci-libs/scikits/scikits-0.1-r2.ebuild b/sci-libs/scikits/scikits-0.1-r2.ebuild
index 921faa267648..054dde88eabc 100644
--- a/sci-libs/scikits/scikits-0.1-r2.ebuild
+++ b/sci-libs/scikits/scikits-0.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}.example/${PN}.example-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest
index f4d13ab78455..d082029a266a 100644
--- a/sci-libs/scikits_learn/Manifest
+++ b/sci-libs/scikits_learn/Manifest
@@ -7,5 +7,5 @@ DIST scikits_learn-0.22.2_p1.tar.gz 7034850 BLAKE2B 41c362ef6594e837a9fc798837e6
 EBUILD scikits_learn-0.19.0-r1.ebuild 2836 BLAKE2B 06bc03dbe61c8afbf4c83f006d23bd4255979fa7a1091aceb9a78b051dee64f721215122196e66dc93b4a47fdac0337e2a75544693104825ea38879837fbbb30 SHA512 3c87b6a8cc2fd1af8614b809f5ff533d2db2f1d1240162a697aaa392b9143d6ac1e5680d423c104fd71051c70bc3fd4caa874b80a4c866341a6bd70bad575454
 EBUILD scikits_learn-0.20.2.ebuild 2888 BLAKE2B 91ecea16f8ca17dcd04519b510c61deb9e78d14362ea3e4f4902bce7a7189577ccb96dc92b530b547389a7c65b957ffa705ca25b680c777453fa1c29c876eefd SHA512 3deb10f3314abb6e82a4e118362724147f09b2104db90cdb7bfe98d804828136a590f0aec53ec873a3c8d718009ff946c660e9efd750d3d550be91c0847e03fc
 EBUILD scikits_learn-0.20.4.ebuild 2888 BLAKE2B 91ecea16f8ca17dcd04519b510c61deb9e78d14362ea3e4f4902bce7a7189577ccb96dc92b530b547389a7c65b957ffa705ca25b680c777453fa1c29c876eefd SHA512 3deb10f3314abb6e82a4e118362724147f09b2104db90cdb7bfe98d804828136a590f0aec53ec873a3c8d718009ff946c660e9efd750d3d550be91c0847e03fc
-EBUILD scikits_learn-0.22.2_p1.ebuild 1764 BLAKE2B d3e6613bb5b314db9a52d68197a6dd82e65afcec908c55e5156598cdaab93fa4e6b9f3b972fad326a423b62508410926bfef38128c1c7b617842c9ed28f5f91b SHA512 2667395c3add51180d1c5886100daad3ae6607db383da139be626272de662dbd4870e647bb97171d416b175e5a50e04ea962346f8d80b8dd6b4f608d1bbf3e28
+EBUILD scikits_learn-0.22.2_p1.ebuild 1771 BLAKE2B 58255129e8173118593b5231ea4cf2160363a1f7a07bb808b20b305b6396ce41f728bfbcbda96cebf7f27914af01c402404b3015827cf56c235cd53efe1c8118 SHA512 57e4e346bac7c6c665ec6ac482cae986fa54b5210e5699421a560ceb13f549163ef11b4927fde45a0c53da05a8674b72b5292696cdf7328c2e3c3584923818dd
 MISC metadata.xml 605 BLAKE2B 46a657647a79f0a23cc07b39877b1e57158cdf94d9478c3aa4e7af0dbdbf60acf996d1431076697db764d42bec0d5e0517c1247e91dc36e85823a45784d00e71 SHA512 e14b6835108fa80eca44bab635c9a229da65f048ffcee16cd4ad7736c3a0fb364c94ff0bd9630030653bd3cd78d8dced191c43c7e5aacb3a7f6e61ac45b5bb3d
diff --git a/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
index aaf2a275fbbf..1c4068d298ca 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_PN}-${MY_PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 8ff79d235f37..7910e0790e21 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -4,6 +4,10 @@ DIST scipy-1.1.0.tar.gz 15583560 BLAKE2B 477753e622ee26a3bc8c2cb6829410152df84b2
 DIST scipy-1.4.1-html.zip 61414053 BLAKE2B e1f0c1a7a8941958512dcc3c0f40ef4a590bab0b44b33f842bc6e1c5d103c17f223d8b0a2f4e564f57645d601d4d74005c1ec605be2dd3bf4db19d2ac1f614d1 SHA512 9eeae83cd723d63aa1dc7a610ce3118cb68a2336be24cbfeaa8e57b34de413b2efa2fdad0978eb5bdac0ebca6b15f564b9509637efbd87d1007c969ae954e3ae
 DIST scipy-1.4.1-ref.pdf 41100747 BLAKE2B 8e56af69d0bffbe6eff73bfc5bb674aed3b80bdd80d59b58a1835f996c992306a059c2992d74c411e762490c526262753d33273613ed389928845c65eb6546b2 SHA512 76946f3b506fe22a595b70e5a418982257dd59db1a2e9af508cc1cab59d47ba4fc5951388e676f2a513043a6b3391ef853242e78d7feb99a6c21d19f6dca2b58
 DIST scipy-1.4.1.tar.gz 24555206 BLAKE2B e35f6234404839cbd24d463c8cc2f1ea66aed91534e700fd54a623df40d069b14fc220f96af04c78d13b773bfc5461559e59b0bd9b836d7953f9249ccd7cae54 SHA512 79407a2cbb4ba29c0941570181df4d7835e5791e50a3abef9b63c2fc5b15308a2e4964eb71cdebbee8cd2dcb8e497cf92fe50ee21fb12cac3013ea5e0466b25d
-EBUILD scipy-1.1.0.ebuild 4115 BLAKE2B 9444084b97ebd27c23e5bbaf6c650f1a0f3a0da7dd29f8b063c9168a4144928d10a76aa4cbce22e4608a68251ff5ace33fbb6e96a3bd6d294862b517cd354256 SHA512 4d7c8ee2129288b7308707b0aa6de8979b5f30b59f9d77e95b3813b25687dbf7a8344fdd0613e91f65220d59015623750778cf82f820fd4001d4146c99018947
+DIST scipy-1.5.0-html.zip 23579592 BLAKE2B 6e35a881967d38db67278d6990fbb1912238bca05c7064585aaaf849861371680c2cd5d3e9a150301c29984aa12db0eeebf5f23cb7d2a438edb28fed9654ac79 SHA512 a1dcf9c2d003b1f722a216c8bf0fda7022765c01505343e86da64ec9a4dbda4eb7da74ad09147e5b79e610f090740d19bda6017d6f894f2566547a42e8aa97b3
+DIST scipy-1.5.0-ref.pdf 33694300 BLAKE2B a7701cdfd8f6da71b59efcefca5c080426b175976429cb64d47f05f42795fea3abb6764c2e2d1807f215c9e00ccd5b2de254f1c68269b266492dfaf76f887972 SHA512 3208ab84421fbec0597931c6050666e9da7d21c6e73a685f084e9570a39539e9c2e5f7fbdfe27951b2ba8e51a1bc42b06ddd6c906a6a13c81a34a16dc0672dda
+DIST scipy-1.5.0.tar.gz 25573194 BLAKE2B f505e5f0627687aeefe0af0886b03eead9f6426f17bca21a3f73cc0d4957ac574e0123b86424ccf0d5f8f4a963b707a1443ddcd6e149f2a4e747daa55b1be95c SHA512 4c981a3125a88593cbc5a17417022a5db8f6ccb4c1c24e78afeb9bb26428b81d2d0fe9965caa418753b1bbbda2fa30533fa1307aac6ab168458d68f7b46049be
+EBUILD scipy-1.1.0.ebuild 4122 BLAKE2B 6c4d91c33b7f02a461f0b2805a859e160687d8a4e4792f3a12a44dcadfb33b056a705e836b2ef4fa9da36a41e7e79e285da6571b97e0172262b991dc5aa715f2 SHA512 0df59214221d5ad19b70ee60e965008f9ba598d234e1b6bda0c8f2cd99cf0eba7dc3a718bc32d01b3f5f194b2858fa04eabee4aa0012519ce43c322887a04b2c
 EBUILD scipy-1.4.1.ebuild 4150 BLAKE2B 4f7ee074825feb1c58c2d297b6817137c95b2c12b97112adfe4006996e6ca6a20325cc2b7e19c99ba09cf0dd9fc42cec9c917bc3abae0a89e4152a834326c9e6 SHA512 2f7473b792726c709f1a62b2d465168ffeba66891117c1d203f1dc2f1b2de6f9dfd945580e539ffdc2e5d8254bfcd0a05d5abdc0b1216b4e94a5b31f2adeb5bb
+EBUILD scipy-1.5.0.ebuild 4152 BLAKE2B c1c4fbf70af27fdc995b90fb21d1bc662a2454199c98b4268620df83190f73ccd56dfecc12da83044d152c837871340fdc793df5a0ccd10aa2575ea9e7f57a76 SHA512 1706a60626cc50424b66450f60b2b625e1bc015a4155694f0426df73723c7154de382d821acd8d705eddd535911088a6621891c651623132c3a2420d077d8629
 MISC metadata.xml 1038 BLAKE2B a17718312d2d1ead8646e838b2704c14a9f21be8c59fbc0cd8544ab45bdb28005443be05f3a9f5671581f0f28e3cf7507131e2baad5e7b128a452d1ca3fae19e SHA512 2ee6a44a4f32d34f52eb1a0bb787907c31d22c15af597c8db8820df72cafcbba72201c5157b60dede7df4ff0ba48847e8f764c5a67a0b7efacabe1b9fa9bd74a
diff --git a/sci-libs/scipy/scipy-1.1.0.ebuild b/sci-libs/scipy/scipy-1.1.0.ebuild
index e57e5cd5b7b1..a4576826f4cd 100644
--- a/sci-libs/scipy/scipy-1.1.0.ebuild
+++ b/sci-libs/scipy/scipy-1.1.0.ebuild
@@ -23,7 +23,7 @@ LICENSE="BSD LGPL-2"
 SLOT="0"
 IUSE="doc sparse test"
 RESTRICT="!test? ( test )"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 CDEPEND="
 	>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
diff --git a/sci-libs/scipy/scipy-1.5.0.ebuild b/sci-libs/scipy/scipy-1.5.0.ebuild
new file mode 100644
index 000000000000..21948a8eb2c5
--- /dev/null
+++ b/sci-libs/scipy/scipy-1.5.0.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+DOC_PV=${PV}
+
+inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="https://www.scipy.org/"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	doc? (
+		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip -> ${PN}-${DOC_PV}-html.zip
+		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${PV}.pdf -> ${PN}-${DOC_PV}-ref.pdf
+	)"
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc sparse test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
+	sci-libs/arpack:0=
+	virtual/cblas
+	virtual/lapack
+	sparse? ( sci-libs/umfpack:0= )"
+DEPEND="${CDEPEND}
+	dev-lang/swig
+	>=dev-python/cython-0.29.13[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-36[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${CDEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]"
+
+DOCS=( HACKING.rst.txt THANKS.txt )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	# scipy automatically detects libraries by default
+	export {FFTW,FFTW3,UMFPACK}=None
+	use sparse && unset UMFPACK
+	# the missing symbols are in -lpythonX.Y, but since the version can
+	# differ, we just introduce the same scaryness as on Linux/ELF
+	[[ ${CHOST} == *-darwin* ]] \
+		&& append-ldflags -bundle "-undefined dynamic_lookup" \
+		|| append-ldflags -shared
+	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
+	# hack to force F77 to be FC until bug #278772 is fixed
+	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
+	export F90="${FC}"
+	export SCIPY_FCONFIG="config_fc --noopt --noarch"
+	append-fflags -fPIC
+
+	local libdir="${EPREFIX}"/usr/$(get_libdir)
+	cat >> site.cfg <<-EOF || die
+		[blas]
+		include_dirs = $(pc_incdir cblas)
+		library_dirs = $(pc_libdir cblas blas):${libdir}
+		blas_libs = $(pc_libs cblas blas)
+		[lapack]
+		library_dirs = $(pc_libdir lapack):${libdir}
+		lapack_libs = $(pc_libs lapack)
+	EOF
+	cat >> setup.cfg <<-EOF || die
+		[options]
+		zip_safe = False
+	EOF
+
+	# Drop hashes to force rebuild of cython based .c code
+	rm cythonize.dat || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	# bug 721860
+	test-flag-FC -fallow-argument-mismatch &&
+		append-fflags -fallow-argument-mismatch
+}
+
+python_compile() {
+	# FIXME: parallel python building fails, bug #614464
+	export MAKEOPTS=-j1
+
+	${EPYTHON} tools/cythonize.py || die
+	distutils-r1_python_compile \
+		${SCIPY_FCONFIG}
+}
+
+python_test() {
+	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
+	distutils_install_for_testing ${SCIPY_FCONFIG}
+	cd "${TEST_DIR}/lib" || die "no ${TEST_DIR} available"
+	PYTHONPATH=. "${EPYTHON}" -c "
+import scipy, sys
+r = scipy.test('fast', verbose=2)
+sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && \
+		local DOCS=( "${DISTDIR}"/${PN}-${DOC_PV}-ref.pdf ) \
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+	distutils-r1_python_install_all
+}
+
+python_install() {
+	distutils-r1_python_install ${SCIPY_FCONFIG}
+	python_optimize
+}
+
+pkg_postinst() {
+	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
+	elog "to your prefered image viewer. Example:"
+	elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
+}
diff --git a/sci-libs/spqr/Manifest b/sci-libs/spqr/Manifest
index 8567aff42fbb..bbe7a68f69dd 100644
--- a/sci-libs/spqr/Manifest
+++ b/sci-libs/spqr/Manifest
@@ -4,5 +4,5 @@ DIST spqr-1.3.1.tar.bz2 1115795 BLAKE2B 027509745cd336d3ccff27a4f36e51493fb9008f
 DIST spqr-2.0.9.tar.bz2 2161068 BLAKE2B a662983d2543a65ce36a367749db5585308acb56b016f69a35c46a84e9c12a678f57a3cfd459cc2e887fff2819b00f99981efaadb73831f1b4c54cbef5e1c367 SHA512 54b203e0d68b266473b8a2b7b3b3a55476df54a3ebd5748b70faa7bad1d0a5a7387197f0674ba5f9a5d45887daa736117f8d6ffbbc2eb02482b3374a3babf721
 EBUILD spqr-1.2.3-r1.ebuild 909 BLAKE2B bf187af15da7e38f9b79f089768236f04c8794373d043b1fc13562ce0c5466bd80777bc0299973003306b87db45a7a9f3b2a4fdf6161ee2e11df2f3219d5de58 SHA512 752f56b943603df13cdfa90c428eb379adf004f893b1fd966193b6a650c07c0af1a8236f6d015fd451b848bddc5a9f18b408adcbd521c76f0e90792ebb585cbc
 EBUILD spqr-1.3.1.ebuild 752 BLAKE2B a96d5e8a948366fef4cc7fa2ba7d618f19f1bd17998a162e7501fe75fead8c697efe96cb0f78ed7a9329aa6d73bffea3106bdae9aeba489df92634c21b5ec98e SHA512 b97e9f20ceae34ce31edeed18eeaf1d809fbdaf883e5496ebd277f6c11b46fc139375cfca13718661fa36b127909a6e61cd9ee62d3b2b728d2dd402eb3593c97
-EBUILD spqr-2.0.9.ebuild 1023 BLAKE2B ed6a0ac25f2429914de6698a642d81581925c3d508158c85d939d0d97ccd1bf078f0a24496c0a690e744e99a688cb3f266c0ffe58007220cf78ca897ffec2033 SHA512 a5b32420ecc94feac2372975f6115e5e25e15a3e1ea9f44cf4a87ae577b67f1548da01ff34e62b70b87b3aa5fb75b7c41ec09fc29c3d6e28f441e2b556c7e45e
+EBUILD spqr-2.0.9.ebuild 1019 BLAKE2B 3eae137cc4399e2d5793de65bea5838d3891a680c42272eda8a1c921de4e5345c1fb0792403adb1db4ab7d405e8dfa75701f622765916759da94273141674e37 SHA512 be62092f8accc27143fde71126c53c65d571edcc6ba14c664fd3c61aa01c646bb919ab8073bf5885c078c8da212b216126af41be6cd9b5f7f57c29200d403c6d
 MISC metadata.xml 962 BLAKE2B b7d87c2d66c17b1d3071b8b0a17e39fe77897a9af7e79caf784cd1c370c70467010718ad3ef60314dc6f0db5703b4a0035294fac5fc2552e9bb595132b7991ed SHA512 a8cbc5b0168b847b814c54b874d159fcfd349780d9b64907ffdb1d572babbee8b64f422328fa583ba9f7e0a60846249385acbccf5db2944f7c05bcd33f4ce757
diff --git a/sci-libs/spqr/spqr-2.0.9.ebuild b/sci-libs/spqr/spqr-2.0.9.ebuild
index b29415ba3f9c..ae9b6c3adc4b 100644
--- a/sci-libs/spqr/spqr-2.0.9.ebuild
+++ b/sci-libs/spqr/spqr-2.0.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc partition static-libs tbb"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/suitesparse/Manifest b/sci-libs/suitesparse/Manifest
index 1a4832e7b92a..e5c0636f67d9 100644
--- a/sci-libs/suitesparse/Manifest
+++ b/sci-libs/suitesparse/Manifest
@@ -1,4 +1,4 @@
 EBUILD suitesparse-4.0.2.ebuild 762 BLAKE2B b2eb7df499c9ac1f8e27f0bf90fa8178303090ea3819fc3945603b94d3c3a4259823f7f46f2d824d9d69ec6d457cd1c03a9781e98e4b04706147fd0adc6e2083 SHA512 57ac75b2b86bd6f5476144db5561c0d3197ecdfedccdd7673952c928f6d0c85858c348d8e2821384e802a107870157a0fd7aade95ca7d30aea374642af7af3a2
 EBUILD suitesparse-4.2.1.ebuild 762 BLAKE2B 598b35b6165b24cc5e34f9df5ab3f695d79cee04f693c55d0d302ca5d7e2d52f193ba99fc459af97cfd2fd9badc293e6d814b578b17277a35255a0a16e94fb78 SHA512 7232069fb3d9f5ebc31424d1c88a930b27756a4a111993c8c607b7c5e1df59e089e5c5f578e331f77837c910ad81718166d7c922fe95a571722885c6ff1cc951
-EBUILD suitesparse-5.4.0.ebuild 780 BLAKE2B 15cc7b93a9e063f453b4f51bdd87781b89626a495eb520e2a0b35f57942df906787ba49c2ad3483bcc0801606288653a830ce9b1e0303343c6676cb6bfc49a58 SHA512 2204fc147fb22de262f24cb90feace1a837542aa28ac135fdd2c1448d55cb3c8f818478355080a63356164e70362d51e2c98b5444d0e34bf5deafeb0d8a2c50e
+EBUILD suitesparse-5.4.0.ebuild 776 BLAKE2B 99f423fec8a78e6b7e594c39ccc559b43a7765f1889d4831a7850d3b52d44c3afe0d757d269ad90f5b4dc230dc142d722b59351c26ea5b64b08731a6561515d8 SHA512 876eda545bc973008eca4ef1ff322fcfe9dd901a7f35bcc1a8c62c3ef2aeac5bbda5277f5db92133b70a22bac41e0fa3af04dc82f4eaf7fdc686a6a062317281
 MISC metadata.xml 1995 BLAKE2B 34721d419d77f93f3dac7d99cde6d41f8ea9ed7bdb87a8b88b02da1a151b9dce4b415da56176ba07ef83f55692b9520aea2dd2eaa0b90f5e6847585908e8c4be SHA512 855650d41560fa1a9ad9dd6d7136328f744eb07ea086a275485edb147da394787a92c56890bd8a8613ef2dbf94a32d9c94698c54916461150c5013504817aa03
diff --git a/sci-libs/suitesparse/suitesparse-5.4.0.ebuild b/sci-libs/suitesparse/suitesparse-5.4.0.ebuild
index fc9edc66953d..83d8940a3b86 100644
--- a/sci-libs/suitesparse/suitesparse-5.4.0.ebuild
+++ b/sci-libs/suitesparse/suitesparse-5.4.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
 LICENSE="metapackage"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc lapack partition tbb"
 DEPEND=""
 RDEPEND="
diff --git a/sci-libs/suitesparseconfig/Manifest b/sci-libs/suitesparseconfig/Manifest
index 1b33b7638e13..0e126dac7318 100644
--- a/sci-libs/suitesparseconfig/Manifest
+++ b/sci-libs/suitesparseconfig/Manifest
@@ -1,5 +1,5 @@
 DIST suitesparseconfig-4.2.1.tar.bz2 256308 BLAKE2B 74993d9a43117e9b71e21856c7b27d4aa6627c64a4235d7d37efa282a0a8e54fa8c6d6aea1cd447902ab8b18bfff1aa1e0d67a6b86d86c2feaf6a9f716ac2f0f SHA512 2363f8adb962d1f932b4390ac54e7203b5eec6005f9275dc155a4b178fd5259ddd42dc34c663a4c82546452c0f1e05619522567a69be1a58efc5d032b6d7a61d
 DIST suitesparseconfig-5.4.0.tar.bz2 257352 BLAKE2B 3832e34281c742a7d704dde866c53c742420486d782075e047b605fb2062d77353cda8670138c4bef62c73d16e123a8a74f65272a01766f124c1e53f9ba32e9d SHA512 e91f60f426b73add473c6341e30512b8fbe65b7850cd83f3852e78f1e74ce067b7ae1577ccc795698e680a841a9d32c2ca073651a4fe95f0b723578721aec874
 EBUILD suitesparseconfig-4.2.1-r1.ebuild 703 BLAKE2B c24f133a3a9b6b89521f8874c7259f54b3ce69f49e003fbd607d8340f9eb0f0b01b0b39fa0b1ae611f4ea22a75bf3762798ea19e743f399ed00a0a5fb398beb6 SHA512 36174e7f3e8024980d71e971c6b329f9cfe9d67f8b88f720a323d04f36d57e303510a4646d5e696122c6b31ac9c56d393209b143d4ffa6ad3949f9e702bd2118
-EBUILD suitesparseconfig-5.4.0.ebuild 795 BLAKE2B c633ecb9aca6782abde5b57179c2074202ec69d126941f3f4d49cf4a6ff247e5cef5a47121910dfdfbab11736bc4ace7f4717ab5dbf44543c7bb6b6f37bd75e3 SHA512 8f93a7db06f437af31c4f4db0f2166a86c5fe915e0f196cc4952b25720e9c33f1f5a8bb72b8c9d0c921a4150b9af8d7c3557138f9f740c16b3a645cb28f69a51
+EBUILD suitesparseconfig-5.4.0.ebuild 791 BLAKE2B ea9f2b184821029385104d95f6d7a389072a98f0b588d9b9a2ed858f317dfa5429667cac20767b9f3eb2a051f9777b9ac4b7ff0de9940ec7ae95e7b24e75ddcb SHA512 6040bd537cc5afb7bf88e5c86cdb5c9bcbcbdf336de7ddf41e9a60b1b52f316ff99e9710cdf99b299ed3560994fccbe06a4c0e1863c5ddda99f975007f729e16
 MISC metadata.xml 476 BLAKE2B f583e4dc6801797ee1572a38f1e4aaaac0811a709ce56a28d8e1f4f13f60f62a702b034809edc488d0b91920f8c5d40d48226213837d92a3e496cf65a6061c04 SHA512 fbbcd2de1d7b23e4eb45d8102fe76aa4251b83ce2b1fd7ef9cb599c7716ff662b8182060ce7b350ed3541b39483cf72c7c9ac810db1fe739f82406606412acb8
diff --git a/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild b/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
index 6e48d59fa270..69191629f724 100644
--- a/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
+++ b/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 # SuiteSparse_config directory".
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 multilib_src_configure() {
diff --git a/sci-libs/szip/Manifest b/sci-libs/szip/Manifest
index 9f5e447101bd..83ff901f8bfa 100644
--- a/sci-libs/szip/Manifest
+++ b/sci-libs/szip/Manifest
@@ -1,3 +1,3 @@
 DIST szip-2.1.tar.gz 383219 BLAKE2B 84e10763bcec885a423d64c2c3cff0632d7a6a39c8cd177cf607f549cb4cd02a4ca03362464c2c4ec4539c80149493329427f529f5d6daea4a35b91af6fa1538 SHA512 bb7e0af6dfaaaaa85013ef52e6901d5b7b6159795338d285c2e843bd2879230a6397fb072662fdfeda5690981db4e9af94782c057bf993f92516d92a8934cb75
-EBUILD szip-2.1-r2.ebuild 713 BLAKE2B eee29f5269f96977d39f756124b32249a5dc0be413fb25bb536fab05b254350564a7d4299985f12fcfc203031866aa1ff1a24311cab5b79522ecdc3846da3661 SHA512 6319b14942b31fa7ec8be0aa95d87d9eaa008a67a6c8d3b6cf7b4ccc42c86de975d42957c4cc7ae35c54972435fc99eb73f019e2a5ff51ac886ab683d982985a
+EBUILD szip-2.1-r2.ebuild 714 BLAKE2B 1af45888836f994bd11cfae25c3925cd3a78c9c3522052bd8c357969b948bda94358aa466b821f74aa44eef3c27acfb8dbb70f107d77c0c01cd1023a0c5b27dc SHA512 c63edb78e85d4b196fa4ecd815185ceff5fa21bb3826290efe0ae30d00b367feee6f71381ef888df739b6db063b87ffbf15a5745bcc4710a58cfe4a5a8ff9475
 MISC metadata.xml 765 BLAKE2B a720dfb9f71c9f9adc5e539b2a791b8edcd2fce2b1540b17066c09e1d3895d40e147ddd2ef86499c6a9db3c2c68c3bb9aae3357f13d86370d7fba8069f968368 SHA512 c56edc42adeff2e523e9a312b0393f45647b2a902334221d2b9842afa1ecd885a17f108041cad69a0797bdc1eb58c75672226a0c3a2f4c8f561ab8a70eb28b27
diff --git a/sci-libs/szip/szip-2.1-r2.ebuild b/sci-libs/szip/szip-2.1-r2.ebuild
index 7e5ab7936ab2..da08b6a5c3c9 100644
--- a/sci-libs/szip/szip-2.1-r2.ebuild
+++ b/sci-libs/szip/szip-2.1-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="Extended-Rice lossless compression algorithm implementation"
-HOMEPAGE="http://www.hdfgroup.org/doc_resource/SZIP/"
+HOMEPAGE="https://www.hdfgroup.org/doc_resource/SZIP/"
 SRC_URI="ftp://ftp.hdfgroup.org/lib-external/${PN}/${PV}/src/${P}.tar.gz"
 
 LICENSE="szip"
diff --git a/sci-libs/umfpack/Manifest b/sci-libs/umfpack/Manifest
index b9068a5c95e3..93b17f5411eb 100644
--- a/sci-libs/umfpack/Manifest
+++ b/sci-libs/umfpack/Manifest
@@ -1,5 +1,5 @@
 DIST umfpack-5.6.2.tar.bz2 780204 BLAKE2B 9e0f4abe92139e3cd6604be63d7fea0ffe50e0669081cafe07eef5d16a4c99493ace16a36a13470d617944cef2c505a3feadb5324e0add4a7f7fe6cbaa732fd3 SHA512 7b206235e837e84885c871322c1f0d4378a048008d9c110bd96204e9bc1bd9c72c6909da513fd78b6225fddc7b91e1ceebf1a5147e99943b3f0fff48682403dc
 DIST umfpack-5.7.9.tar.bz2 772026 BLAKE2B 6d6dc1ba47b8f473884c1cb17d3eaa363d88281512e33586a0af0c2bcb7a523272bef4d8da0a29e2a5a84c8f0cd0ee6830ec10247971db63b4c319e6fa9a3c42 SHA512 5ad57467b5b7e4579f3cc9e2e7c92a0262ac2ef991a606d079b749b66e10da60aceaa4b0e741c116f8866da23c0f7c06368fe2b08d66d51383683f0dcbeddba3
 EBUILD umfpack-5.6.2.ebuild 869 BLAKE2B d838942a6fd5ff1af5d10bd2015b3931f8f2e56009e4f5cd7d89ee38dd4fbb5fa5806c01ce597882310f7d5315d3c5386970661939bd31bbb9b4437ee833cf6f SHA512 4d94dbe622115b30d2bc3d9bf5ed7fbd65cae24361311b7fb52814c357dea1d6e7f3d66ae776ed937eed6cf4a813333bde0a6edc1acaa6603bde2c1331e96ca3
-EBUILD umfpack-5.7.9.ebuild 907 BLAKE2B 9b14efb61d8cd1c147581f4fadbedf643c61ad35d8e2bb51abe4c22b0842bc61386fda00f061ba6d7477cb2db31b0b3df405998696aa012b5fb43fcd420b950d SHA512 4accd648f6259dcafc64e54126b05d82e272c9f3f46c81cea4baa77c0da25482784a4b3cc4eba46f56685545477ed4fe52f6616a28d6cf5c3c81f10efead48d2
+EBUILD umfpack-5.7.9.ebuild 903 BLAKE2B c2b69a5cfbe9f480d215ba3679bf4cd59f271ec1a6e941ef3aca585fd2a7fac89c49d1294badfd7b76cd9edf27a529ec3fc2d6573161ca4544c872837e54e7d3 SHA512 4d6cc5ae0fe76d53a6bc2990aa1a4f045e3d563ac6c1234a23a8ad4e51eee07749456d23a2ddac8d46165e3a287e8379893d2d3e06861fbc969664305a4c5057
 MISC metadata.xml 667 BLAKE2B 1e0018ea7f7433ce19bfc6e364a30731e5e02f657502f721513da4191752b97c7a3d8352707e1036f0e5fe81ffb81ed3862cc2b213ca89e80067a06a82e5b078 SHA512 c204d7f86f2338f9571a46773c251dab31caa3d5bfbe4ae87326466026616d80737435d8cdbf0ae8cb5e109d8b52a5b6ccba09f8b52f38dfe9058049ef541007
diff --git a/sci-libs/umfpack/umfpack-5.7.9.ebuild b/sci-libs/umfpack/umfpack-5.7.9.ebuild
index debdb6cbfa73..f173d42739a6 100644
--- a/sci-libs/umfpack/umfpack-5.7.9.ebuild
+++ b/sci-libs/umfpack/umfpack-5.7.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc +cholmod static-libs"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/volk/Manifest b/sci-libs/volk/Manifest
index b5de6e0c6ccf..aa27518e35c0 100644
--- a/sci-libs/volk/Manifest
+++ b/sci-libs/volk/Manifest
@@ -1,3 +1,3 @@
 DIST volk-2.3.0.tar.gz 344763 BLAKE2B 0f0e0cb7e6cd28086802c1618685ec30dedf5cdf67bef7ed09f3a7482f84d6e7972f4b22c096676bdef34c66c60d936ca8ab300cd4da07f6714cface1c2846ed SHA512 9e3b405b7be46b4f5ff61a4d42fa9013fc55169bc18c9cf9253e446fe23fd12dc0356adb9aa176e33dfa4cc478e4b9226bee906a2d89ef83bac3b28f52816382
-EBUILD volk-2.3.0-r1.ebuild 1111 BLAKE2B 6dd21f37fc91d0824c5edc15f1c53e7c702d46139e7e5afe4b339cdd1823f8392b1dc0c5770e4f8d079a2b0a3e52679c5eca4a63d896051d55851d8f12967edb SHA512 d834630ae84b856e8496a804a815d261b4ce46bd65f12e7994504c40a16a58308bb9a2d31795ec1fd15b846fa30a78705273589867e64b26aa8d78d2edd03b56
+EBUILD volk-2.3.0-r1.ebuild 931 BLAKE2B 669d58f3e8f8bdba23bab9b92d52a5a0694fcac5b4d88edeefe74082352e481649ab27979294bfca79f7cfbad78c098de267277c0ef95f8265242e2d48d3c671 SHA512 ba79c624b9f7faf67feb2b2d0fbbe9d856b36fbc2f319f2a3340a1d61ecf145e29712e8ce8b7e1ac3d8ce85d689f6a30926a4e797e7c9519f43ea7147109321a
 MISC metadata.xml 247 BLAKE2B 0aa7491a8e9a68ed7ad1c53c8442fd44a9dbdfbd7ef0662e838195b44ce72a77f5dc3b846cf9951bb61de78e05aac37649b78dd4c27e304780e1223d607a4252 SHA512 3344e220b20caad7bc32141ad5d51630ff0738ab14608334576638297fdd2a48d5169ef54fb33e36d27bd448d92f8ef9e41880df388521efd4a2c58d102c7c69
diff --git a/sci-libs/volk/volk-2.3.0-r1.ebuild b/sci-libs/volk/volk-2.3.0-r1.ebuild
index 31451c46050e..e8f45f0f6f9c 100644
--- a/sci-libs/volk/volk-2.3.0-r1.ebuild
+++ b/sci-libs/volk/volk-2.3.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
 
 #https://github.com/gnuradio/volk/issues/383
-CMAKE_BUILD_TYPE="Release"
+CMAKE_BUILD_TYPE="None"
 inherit cmake python-single-r1
 
 DESCRIPTION="vector optimized library of kernels"
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/gnuradio/volk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="orc"
+IUSE="orc test"
 
 RDEPEND="!<net-wireless/gnuradio-3.8
 	dev-libs/boost:=
@@ -27,19 +27,12 @@ DEPEND="${RDEPEND}
 
 RESTRICT="test"
 
-src_prepare() {
-	#https://github.com/gnuradio/volk/issues/382
-	#Waiting for confirmation from upstream to push this fix
-	#sed -i '/_mm256_zeroupper();/d' kernels/volk/volk_32f_x2_dot_prod_32f.h || die
-	mycmakeargs=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-	)
-	cmake_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_ORC=$(usex orc)
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DENABLE_TESTING="$(usex test)"
+		-DENABLE_PROFILING=OFF
 	)
 	cmake_src_configure
 }
diff --git a/sci-libs/votca-tools/Manifest b/sci-libs/votca-tools/Manifest
index 2b4272749df1..ec62e33fb1b6 100644
--- a/sci-libs/votca-tools/Manifest
+++ b/sci-libs/votca-tools/Manifest
@@ -3,12 +3,14 @@ DIST votca-tools-1.4.1.tar.gz 103152 BLAKE2B 73dc726ea899ceb65d0406f3795f1df79a6
 DIST votca-tools-1.4.tar.gz 103102 BLAKE2B a398d20b628148ec753ee1e59353e272dbda93848be11ecccaf2153385ebcac62c7b819c4ef0b9b1a7cfc7dfd85136d042726cc996af79a4dad64375f5aa9f6c SHA512 7c4bf2e2ba8cf795f03879138787db3875f48db56b88394c98b18cef0ae90e636d8aafff42eb62a408df06a91583e37e59b33440e83de9f4338295e9ccfc9be5
 DIST votca-tools-1.5.1.tar.gz 129629 BLAKE2B ab68b38241d2c065939cf0b2e08603eaaccf613454bb64056c3d3d03472501e2079408ce856fbcc7243d51d035acec0b52c9767e2d687234296c7858f1a46fa4 SHA512 c8fe4baee0f4586dbe1a9f5b7c33b7d6b16ef0ebc35b50febfdcb049b09cd150dec3a5e9b98b43430db66f866dd01c1776f6777f01d227246c9d7b7ca879ea72
 DIST votca-tools-1.5.tar.gz 129464 BLAKE2B 2ab72758cc7c9bed5a49c924f7f0a93dc562a43cefbcc84f393656fd6c6b165152114eab48131db4d42008472d01103b5abba6ae0cf12779fe1ffacbcd65dc11 SHA512 fdee932c861742961937bdb88a1ace8caa4041c38ce80ece3b27e8a4b624248c21bf9be63b157565d1114047d3895c8b959f95b4fa49225c0cd1b2e708ef54f0
+DIST votca-tools-1.6.1.tar.gz 110141 BLAKE2B 948908a3aedb360d63aaf4077de366fb8dad7b5c97cd4532458a67e90e6e0271ba4ef30a23be264f426a1f860708592360982f283346d0a4788111719d3a8ee9 SHA512 e7dc03df46670f83139c0283824a630d8bec6cda5da156bc09e35e3c373f1cc65359ddb912e6bf19431a588acc5569ad57000045083d155fcc15c93980cfd26e
 DIST votca-tools-1.6.tar.gz 109824 BLAKE2B e030899e210e0f3030d43796a468ea20a573fe7ee62fbfde53e2e6865a9c0657d92ed06ddc44ebfa1c37c6142c865e97380e00570070351d75c403ead6fcfd19 SHA512 0159bc10066e05da8ba0f70e3c70d8cb4cd7b07ebd58edff1ccfeb86504af855eb5cae7184200e5c8ee3a3f6b6b85ec46a045f00dc8e681073ae8fdbbfc3965a
 DIST votca-tools-1.6_rc1.tar.gz 128577 BLAKE2B d9270739c00f945ff4af24e45a529e73ff0da596956791991f03b5586134d16b5fec077b3859dcd685de96a334f419f5f82ede7df60614482c9fddc61a01ca8d SHA512 42b0eae148bb93293ac16e193d2595aaa850dcee0dcaab1f6cf0ca8e36a95a1719a03243d421fbfb1034c81baf2ef294768a86530f0d69b59862df95846241ed
 EBUILD votca-tools-1.4.1.ebuild 1211 BLAKE2B d49fc0a98bfaf61cee9b1c38f058687591b81319788b578e91db513f76d452fec9e2116e503b22539f84bc0e567434d144b6ad22d3c62bd819b0fa817a7ccdea SHA512 920a37e44b7ad3d1e655843b22646d87f376bb93cbb99f7241ff538183b1d4df7aeb6ede66f04fee423bd112c651185d837423024fd1cdfde7350018b83ebde7
 EBUILD votca-tools-1.4.ebuild 1182 BLAKE2B 2077617efbf04198cf2a0f53bbf07f87897a8420ec6ad9e1774c821e7e3789421a253b79e9f09e85abfdf1523ebba02400233199cee5d7966a03b97db4477155 SHA512 48eb152df0bc0ad1481179977c0a8b6947180d9978961024a57674414326eb370182c02f5fda3a902a03a14fe3f0e60f666787eb16729412426ee83f1a074613
 EBUILD votca-tools-1.5.1.ebuild 1124 BLAKE2B d8bbb47af7f2b160f83719246b8c1c1e435970790aa1ec3922085959354347c61a845013a32da9edcbcad19c66e7dd25fd0fa8c2b908f795827c324452413183 SHA512 9219e23530a0f55cc4159f250e251c49ce61a8514b05d0d4eca7f224b340e0bcc313e82b57fb647141f683607be545044495da2eea956ea197cae029f52a5662
 EBUILD votca-tools-1.5.ebuild 1122 BLAKE2B e6ca1c6354b17eae1f1574de117b2fe421965e05376ac2d13cff50814e5b2987fbac645be133037cf31b08513e09f96fba94cb02a82bab06c60a667b9147d75c SHA512 2482328a8306a0126c7ab17250be2ab91e823a1ae248e3d4bf15b27bf1f313b3277a132ba4e52362c92f1d4096a00f7b5e657afaa6de464866b551c5976c4be5
+EBUILD votca-tools-1.6.1.ebuild 828 BLAKE2B c81919d0f05f61e825af2cebe22e19da437e7e7ccd99f2a935e8425ca5dd71d8f7dd5571720621b86db8a6e0a9ec966c048d1e68b2d672bbb4f57a2415ce03c7 SHA512 2fa333854dfdc8af689080233ebb185b0fa1fe4ff6ba2d3e49d5b5f484ccb0e2041bbe58e3fe06e1e2bdf618c81dd1265495945fc15ddc059ce9687fc5f5201b
 EBUILD votca-tools-1.6.ebuild 824 BLAKE2B 12abb2c899f4f473ddc42d30f1f43618f759373a5530228c7b08deb512b3bd273ba9d0d5611c0de34de9ddcd96784b8339b1c46dc7ad00179e6983fb3bd11e2e SHA512 c463a1b68e8e5a44f1d3688059a4291cdedc54de7883233ff828ac61b177fad92ebafc21c2d4d022488174a2512b41465cc1e2f4369df2297bc20d47aca381dc
 EBUILD votca-tools-1.6_rc1.ebuild 854 BLAKE2B ee6c6234021d9a903a611fe75c64c612ea8c3c35c048c0663dfbff91d289410966d9aef8ca2533895b33d734d7333e7bb3dba9ae88db3b387dbee199bef2c2e5 SHA512 137867d077e0c84d49a76553f00e2182350643822c6961103aba45810b236e2333f3a9092b5572cb1588d658e0c1111aa2ffdc83e6b679d84af2d7c885fbb0da
 EBUILD votca-tools-9999.ebuild 817 BLAKE2B 07c6d4667bf74c45a962fea7ad7af4d3e40910d7fb4c38713e30193c9d58d2553c693b28db361f7c0b7d16df2d05636fedc648a18934b77bd6f7faeefebb6b5c SHA512 4be6e932cb3a573465c907956d79f6f85c3f2d38bd867ce8488afdafdc4e005c3d953f5e8cfdc4a422ff16e39a8d844ed5e84e53e1155a800ab3844ffbd8a32c
diff --git a/sci-libs/votca-tools/votca-tools-1.6.1.ebuild b/sci-libs/votca-tools/votca-tools-1.6.1.ebuild
new file mode 100644
index 000000000000..83b4a6d5bce3
--- /dev/null
+++ b/sci-libs/votca-tools/votca-tools-1.6.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit cmake-utils eutils multilib
+
+if [ "${PV}" != "9999" ]; then
+	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+	S="${WORKDIR}/${P#votca-}"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Votca tools library"
+HOMEPAGE="http://www.votca.org"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/expat
+	>=dev-cpp/eigen-3.3
+	sci-libs/fftw:3.0"
+
+DEPEND="${RDEPEND}
+	>=app-text/txt2tags-2.5
+	virtual/pkgconfig"
+
+DOCS=( NOTICE )
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_RC_FILES=OFF
+	)
+	cmake-utils_src_configure
+}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 7bacb024444c..74f45dbb8b27 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/mathematica/Manifest b/sci-mathematics/mathematica/Manifest
new file mode 100644
index 000000000000..11091d32732d
--- /dev/null
+++ b/sci-mathematics/mathematica/Manifest
@@ -0,0 +1,5 @@
+DIST Mathematica_10.3.1_LINUX.sh 3200459545 BLAKE2B 5a057b4e714eabb0afebe5a3ef536dbdc2d49a775130442e21493d6a0756527362fddfa7fabf927f996464456309c37b10b70a37f05718cb9f79d8ffc5912098 SHA512 08658a01a18c14a9b3f422816007980bf6576162e4cca6779ed1bdaf6b9748fb36a195006529ed6725f462042a264e7ee7753e802af8072ba6bebfee0cad8543
+DIST Mathematica_12.1.1_LINUX.sh 4438946649 BLAKE2B 473f814a3e0686bb3a6ac1f49c887842bc17db11439b65c1dad1dae8cd5797e6762d94bccdf156f6f9ba1edb9a16ed5172936a6884d2f0f98c29808214b1eabe SHA512 5cfdd91bae9bad53afe405b40759732589119256c3f785058808b20faf21f593d90bf7bb2dbaccf3e983aa84ff380a1fa6d40fd63f5ba17109c1cd6818c63490
+EBUILD mathematica-10.3.1-r1.ebuild 2623 BLAKE2B ea4a2ffd01c5acde572183947566eba260bef8181a1b120be2c5b06ba12bec7f19b2ce0640baa0ebd0274dd15e9b7f5f81daa9de97aa4e7f9a16eef2f0367061 SHA512 86b1929d30ab0a06a1337480c1c974eda2bb2814009631673898d5bad03824b983c2a844954203c26aaa145bd896f6c42a53b78fb6b52f645ae8ee87993dbeb5
+EBUILD mathematica-12.1.1.ebuild 2623 BLAKE2B ea4a2ffd01c5acde572183947566eba260bef8181a1b120be2c5b06ba12bec7f19b2ce0640baa0ebd0274dd15e9b7f5f81daa9de97aa4e7f9a16eef2f0367061 SHA512 86b1929d30ab0a06a1337480c1c974eda2bb2814009631673898d5bad03824b983c2a844954203c26aaa145bd896f6c42a53b78fb6b52f645ae8ee87993dbeb5
+MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2
diff --git a/sci-mathematics/mathematica/mathematica-10.3.1-r1.ebuild b/sci-mathematics/mathematica/mathematica-10.3.1-r1.ebuild
new file mode 100644
index 000000000000..51e74ad3cc99
--- /dev/null
+++ b/sci-mathematics/mathematica/mathematica-10.3.1-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib versionator xdg
+
+DESCRIPTION="Wolfram Mathematica"
+SRC_URI="Mathematica_${PV}_LINUX.sh"
+HOMEPAGE="https://www.wolfram.com/mathematica/"
+
+LICENSE="all-rights-reserved"
+KEYWORDS="-* ~amd64"
+SLOT="0"
+IUSE=""
+
+RESTRICT="strip mirror bindist fetch"
+
+DEPEND=""
+
+# Mathematica comes with a lot of bundled stuff. We should place here only what we
+# explicitly override with LD_PRELOAD.
+RDEPEND="
+	media-libs/freetype
+"
+
+# we need this a few times
+MPN="Mathematica"
+MPV=$(get_version_component_range 1-2)
+M_BINARIES="MathKernel Mathematica MathematicaScript WolframKernel WolframScript math mathematica mcc wolfram"
+
+# we might as well list all files in all QA variables...
+QA_PREBUILT="opt/*"
+
+S=${WORKDIR}
+
+src_unpack() {
+	/bin/sh "${DISTDIR}/${A}" --nox11 --confirm --keep -- -auto "-targetdir=${S}/opt/Wolfram/${MPN}/${MPV}" "-execdir=${S}/opt/bin" || die
+}
+
+src_install() {
+	local ARCH='-x86-64'
+
+	# move all over
+	mv "${S}"/opt "${D}"/opt || die
+
+	# the autogenerated symlinks point into sandbox, remove
+	rm "${D}"/opt/bin/* || die
+
+	# install wrappers instead
+	for name in ${M_BINARIES} ; do
+		einfo "Generating wrapper for ${name}"
+		echo '#!/bin/sh' >> "${T}/${name}"
+		echo "LD_PRELOAD=/usr/$(get_libdir)/libfreetype.so.6:/$(get_libdir)/libz.so.1 /opt/Wolfram/${MPN}/${MPV}/Executables/${name} \$*" \
+			>> "${T}/${name}"
+		dobin "${T}/${name}"
+	done
+	for name in ${M_BINARIES} ; do
+		einfo "Symlinking ${name} to /opt/bin"
+		dosym ../../usr/bin/${name} /opt/bin/${name}
+	done
+
+	# fix some embedded paths and install desktop files
+	insinto /usr/share/applications
+	for filename in $(find "${D}/opt/Wolfram/Mathematica/10.3/SystemFiles/Installation" -name "wolfram-mathematica.desktop") ; do
+		echo Fixing "${filename}"
+		sed -e "s:${S}::g" -e 's:^\t\t::g' -i "${filename}"
+		echo "Categories=Physics;Science;Engineering;2DGraphics;Graphics;" >> "${filename}"
+		doins "${filename}"
+	done
+
+	# install mime types
+	insinto /usr/share/mime/application
+	for filename in $(find "${D}/opt/Wolfram/Mathematica/10.3/SystemFiles/Installation" -name "application-*.xml"); do
+		basefilename=$(basename "${filename}")
+		mv "${filename}" "${T}/${basefilename#application-}"
+		doins "${T}/${basefilename#application-}"
+	done
+}
+
+pkg_nofetch() {
+	einfo "Please place the Wolfram Mathematica installation file ${SRC_URI}"
+	einfo "in your \$\{DISTDIR\}."
+	einfo "Note that to actually run and use Mathematica you need a valid license."
+	einfo "Wolfram provides time-limited evaluation licenses at ${HOMEPAGE}"
+}
diff --git a/sci-mathematics/mathematica/mathematica-12.1.1.ebuild b/sci-mathematics/mathematica/mathematica-12.1.1.ebuild
new file mode 100644
index 000000000000..51e74ad3cc99
--- /dev/null
+++ b/sci-mathematics/mathematica/mathematica-12.1.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib versionator xdg
+
+DESCRIPTION="Wolfram Mathematica"
+SRC_URI="Mathematica_${PV}_LINUX.sh"
+HOMEPAGE="https://www.wolfram.com/mathematica/"
+
+LICENSE="all-rights-reserved"
+KEYWORDS="-* ~amd64"
+SLOT="0"
+IUSE=""
+
+RESTRICT="strip mirror bindist fetch"
+
+DEPEND=""
+
+# Mathematica comes with a lot of bundled stuff. We should place here only what we
+# explicitly override with LD_PRELOAD.
+RDEPEND="
+	media-libs/freetype
+"
+
+# we need this a few times
+MPN="Mathematica"
+MPV=$(get_version_component_range 1-2)
+M_BINARIES="MathKernel Mathematica MathematicaScript WolframKernel WolframScript math mathematica mcc wolfram"
+
+# we might as well list all files in all QA variables...
+QA_PREBUILT="opt/*"
+
+S=${WORKDIR}
+
+src_unpack() {
+	/bin/sh "${DISTDIR}/${A}" --nox11 --confirm --keep -- -auto "-targetdir=${S}/opt/Wolfram/${MPN}/${MPV}" "-execdir=${S}/opt/bin" || die
+}
+
+src_install() {
+	local ARCH='-x86-64'
+
+	# move all over
+	mv "${S}"/opt "${D}"/opt || die
+
+	# the autogenerated symlinks point into sandbox, remove
+	rm "${D}"/opt/bin/* || die
+
+	# install wrappers instead
+	for name in ${M_BINARIES} ; do
+		einfo "Generating wrapper for ${name}"
+		echo '#!/bin/sh' >> "${T}/${name}"
+		echo "LD_PRELOAD=/usr/$(get_libdir)/libfreetype.so.6:/$(get_libdir)/libz.so.1 /opt/Wolfram/${MPN}/${MPV}/Executables/${name} \$*" \
+			>> "${T}/${name}"
+		dobin "${T}/${name}"
+	done
+	for name in ${M_BINARIES} ; do
+		einfo "Symlinking ${name} to /opt/bin"
+		dosym ../../usr/bin/${name} /opt/bin/${name}
+	done
+
+	# fix some embedded paths and install desktop files
+	insinto /usr/share/applications
+	for filename in $(find "${D}/opt/Wolfram/Mathematica/10.3/SystemFiles/Installation" -name "wolfram-mathematica.desktop") ; do
+		echo Fixing "${filename}"
+		sed -e "s:${S}::g" -e 's:^\t\t::g' -i "${filename}"
+		echo "Categories=Physics;Science;Engineering;2DGraphics;Graphics;" >> "${filename}"
+		doins "${filename}"
+	done
+
+	# install mime types
+	insinto /usr/share/mime/application
+	for filename in $(find "${D}/opt/Wolfram/Mathematica/10.3/SystemFiles/Installation" -name "application-*.xml"); do
+		basefilename=$(basename "${filename}")
+		mv "${filename}" "${T}/${basefilename#application-}"
+		doins "${T}/${basefilename#application-}"
+	done
+}
+
+pkg_nofetch() {
+	einfo "Please place the Wolfram Mathematica installation file ${SRC_URI}"
+	einfo "in your \$\{DISTDIR\}."
+	einfo "Note that to actually run and use Mathematica you need a valid license."
+	einfo "Wolfram provides time-limited evaluation licenses at ${HOMEPAGE}"
+}
diff --git a/sci-mathematics/mathematica/metadata.xml b/sci-mathematics/mathematica/metadata.xml
new file mode 100644
index 000000000000..80a71f597854
--- /dev/null
+++ b/sci-mathematics/mathematica/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>dilfridge@gentoo.org</email>
+    <name>Andreas K. Huettel</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/sci-mathematics/mathomatic/Manifest b/sci-mathematics/mathomatic/Manifest
index 2dae4be33afe..6983a0d6da73 100644
--- a/sci-mathematics/mathomatic/Manifest
+++ b/sci-mathematics/mathomatic/Manifest
@@ -1,5 +1,3 @@
-DIST mathomatic-15.8.5.tar.bz2 270607 BLAKE2B dc8d39a53e8d8a2e252a7cecbf235d391cda282e7ed59c1c4b341ec4d8cab144098f4cee043946d4fcc230f92683276251aac4fd33d78ee7170fad191a03e644 SHA512 9d8b5fcc369d99b890fde06729daa6c86f1a400d5e42d5fd5d74525b9f4a7c28dea5a05882e753b44590e4624ec7399367a637019867ea85fe68e9e0ed3a3e6e
 DIST mathomatic-16.0.5.tar.gz 381466 BLAKE2B 31dde337646d39faad3bcda6b72e316de4febfaf8c825320c70d69fdd55bb377948ec9e8b5ad855dc0a5b9be0f50b19387a595dfee7299e71fbf19c4f2bae979 SHA512 0d98cf7ad707d6536731c98dd253f4cce30243e9eefe9912b8fec3ad4ac4261e324b93b4f0113789ce17fd0b2e3d75f7b258be7905d8e3c7bb4b756627b75950
-EBUILD mathomatic-15.8.5.ebuild 974 BLAKE2B 7db8860a26ac76a3f4395c8b9264683168fb678db2ae3dec5c10835f4a02e0bbe42e2efb7fc70512023f40567ea07ee2ce89538cecd19c249e38b50314c32dbc SHA512 af2da60e74d65c8d47fb76395fe13e8afe1cb9c0609f0099bb228082a2696c1b7a1389313f5207ca6bf00a065d52162ae9903a8bbbbc5618d579d6320b78aae5
-EBUILD mathomatic-16.0.5.ebuild 1073 BLAKE2B 57be681320b29095cb4efc38a90b08c5af36af9b8c9a61fb87716f94c52925a444b4da2f6630efd8db8e27cce05151d28ff3fa72a5c4756c9e681e6ac5a905f0 SHA512 46ef23162020da08fd21f7fb675177def8051a642d7b1fba4593ec2cdd76a08a45f44b779c5ff65978578092ecde1494c04986b1a6a8fcf6fe291c70097995a5
+EBUILD mathomatic-16.0.5.ebuild 1067 BLAKE2B c24fed7d4cd822817d70e95259cf65c9cdd9595d774dd62eeb9e694cb11d50df62fb1f8261dab3909bb44c5672f236d9a2588e8fa29d25963c42c209d2b1a889 SHA512 f63b5eee66e5744843829a37ee049ca4ea737679bec14c54d8c6c324ee1db42a17b3f98cca46901fa130d49ff06ad1ba6d9d00481fef76fb8848973a1a4a9109
 MISC metadata.xml 619 BLAKE2B f90c38439f4c52ec00af4c068b4088863b2f41481dbbe9f995681001ef0b64d37c1e2093bce6033e98cd4792d8dedddbc078b8b5b0cb25bbb96d07fb2690bf31 SHA512 8d5d1fd1e392f8eb3d7cf4551cbb5f2501c4885ae487c8a59555bb625d809d9c1e9ad4a131003d1af56be7d30258f24138a7554fa9848afc4cd58f89535ca7f0
diff --git a/sci-mathematics/mathomatic/mathomatic-15.8.5.ebuild b/sci-mathematics/mathomatic/mathomatic-15.8.5.ebuild
deleted file mode 100644
index 6a40519ade4a..000000000000
--- a/sci-mathematics/mathomatic/mathomatic-15.8.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Automatic algebraic manipulator"
-HOMEPAGE="http://www.mathomatic.org/"
-SRC_URI="http://www.mathomatic.org/archive/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc gnuplot"
-
-DEPEND="sys-libs/readline
-	sys-libs/ncurses"
-RDEPEND="${DEPEND}
-	gnuplot? ( sci-visualization/gnuplot )"
-
-src_compile() {
-	append-cflags -DBOLD_COLOR=1
-	emake READLINE=1 CC=$(tc-getCC)
-	emake CC=$(tc-getCC) -C primes
-}
-
-src_test() {
-	default
-	emake -C primes check
-}
-
-src_install() {
-	emake prefix="${EPREFIX}usr" DESTDIR="${D}" bininstall
-	emake prefix="${EPREFIX}usr" DESTDIR="${D}" -C primes install
-	dodoc changes.txt README.txt AUTHORS
-	newdoc primes/README.txt README-primes.txt
-	use doc && emake \
-		prefix="${EPREFIX}usr" \
-		mathdocdir="${EPREFIX}usr/share/doc/${PF}" \
-		DESTDIR="${D}" docinstall
-}
diff --git a/sci-mathematics/mathomatic/mathomatic-16.0.5.ebuild b/sci-mathematics/mathomatic/mathomatic-16.0.5.ebuild
index f1a450a5ad0a..9d087a72a670 100644
--- a/sci-mathematics/mathomatic/mathomatic-16.0.5.ebuild
+++ b/sci-mathematics/mathomatic/mathomatic-16.0.5.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/mfillpot/mathomatic/archive/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc gnuplot"
 
 DEPEND="sys-libs/readline:=
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index c25fd6b110f7..a1cd6144e538 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -4,8 +4,6 @@ AUX pari-2.11.2-no-automagic.patch 2626 BLAKE2B 3be495852655cf47cab2ebfc54447770
 AUX pari-2.9.4-fltk-detection.patch 572 BLAKE2B 1c2e1fa6e52521c7865c3fd011824c83fa92623903dd1e056bda29c6735eb01013e7937f66d6ffff42d0de83f7ed104c7f933d232ee37be7c4351788e76f8daa SHA512 2ec0d8035a87b693ee6a4dfa913f0b24eed20bb4db7f8cd1a47db444310d33d19e6651d475c635be747e79a02df2705e42f6f7032b60dc763583cf9fa8633b29
 AUX pari-2.9.4-ppc.patch 363 BLAKE2B 135e76972e4121362666a25e3da236c4a5b7cffa058bbc25b59ca19ea20ccb0665327f70701adca5239cb936d513976e3ba7b5cda915a3f77c7b2eb28e75eaa0 SHA512 aaf5960010e56722f11234079a20ee7a7f8819dc084e1f6567fd11ad2820e3ae47617608f312941c2f373b5312a8c09c9cd51bfa44e263ffe1e8062c9fd9877d
 AUX pari-2.9.4-strip.patch 323 BLAKE2B 85a2b56f5501b4dafc0bffe48249c1662d6f96e81f8e8260ad52ecf84f053efef2ee6d6be6a6fda47886c372eb338d8bbf4443910df79a0d4e168b2666228c37 SHA512 50624ead82da41819ccfadfbdb746fb6ff414196ae2576c5d6a86e83c67355740b0e6e901a2860cab202db15adb1b00e346aabba338ab303230bc6aee8d33076
-DIST pari-2.11.2.tar.gz 4433038 BLAKE2B 89fd8c14d6ee8c8640432bec75e10b79897f0180212dcb1b04b654478a3258fc13a7f982bcb400e28997934a21667c0c3cb08fdb2e843a80a24c6499feafb639 SHA512 22f5a6ecad6d9b8b337c2655f538a196a0460f6fe98256d0f49557ce7b843f6b27ad364f45a9472aaafee9506386c886f1f0d62697078e501ec465151d4d10a1
 DIST pari-2.11.4.tar.gz 4445000 BLAKE2B e910783186eeb71e74a369681c113b77271abd7f87d7a9f366aea83f36ab984f02e312cd451fad7ee6efb2fa285780e8fa78540bb1fd4b135a62d265176c80e0 SHA512 1312f452244cd1d814a1e43e108378c956669b614845f21199b7039fe6462881168983d4badb8a80bb1bac202cd82d92788a2b4f3c23d16f993cae6e251c4fe1
-EBUILD pari-2.11.2.ebuild 3033 BLAKE2B 7e4fd3d274c34a89419ee157bfd798db51b3462444ec886ee9ac71164c30d8d1cbf59d91f78077e792fdc0e55c3ce7ff23c201df43c6ea14bb52dca97d321745 SHA512 72dc95fcf64d2ac470ec9bcb6f30c45b18394662f0f2ab481a43310c410bbedc32c71b0e7a773d859680135c4f9fee9221e5e73bfe58dc1f0094c2f22d03c349
-EBUILD pari-2.11.4.ebuild 3038 BLAKE2B c8933d1bff3611c0f4da34f31a43db38a2f0f32c6f6403e82b297c21018089496632c49080bbf7d3c46ce382c9ef4ed163ac82738ab1bce8714b070c70fa1957 SHA512 6e989812389955f0385c1635ae9e91c3879a973307a407ab2270962e0cb2db943551c2bedc2f15fbcb7bbb95005084a532a5d3d7fbdb36fc28cd78721f3232b3
+EBUILD pari-2.11.4.ebuild 3318 BLAKE2B 12d63e5caa4a9c23053bd5d86756dec39cc36b8a614efa123150edb0ed7ef411f71b521905f916ec814e3105b0e9b0d837a044a14086efeb04e2fd8e9b5f222c SHA512 e79121ab53c3bc7755907535a0bb8f62ee9734d8cce559bac9cbc309da9a4fff7a7e264ad77b2e4fdb3be52f8de582a7d3faf17c347841727e36e684f6aa2e86
 MISC metadata.xml 1734 BLAKE2B ffb61a9e3818ed778cd30e0b41279413fec1e624aef0c490e71f501b9797703bbd24413b180b588896d6d74af988e6102f58a04fc1c645f2b876ac2731a399c1 SHA512 b5caa3c3b98405d89681fb25c97dabb3302e971c68fda94e337b10dfc14761963ea548b4689ccb4ac59661425a85a53ea0d424b6acb35a475f42ef145ce9060e
diff --git a/sci-mathematics/pari/pari-2.11.2.ebuild b/sci-mathematics/pari/pari-2.11.2.ebuild
deleted file mode 100644
index 3d42e03c1983..000000000000
--- a/sci-mathematics/pari/pari-2.11.2.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
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Computer-aided number theory C library and tools"
-HOMEPAGE="http://pari.math.u-bordeaux.fr/"
-SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/6"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="data doc fltk gmp test threads X"
-RESTRICT="!test? ( test )"
-
-BDEPEND="doc? ( virtual/latex-base )"
-DEPEND="
-	sys-libs/readline:0=
-	data? ( sci-mathematics/pari-data )
-	doc? ( X? ( x11-misc/xdg-utils ) )
-	fltk? ( x11-libs/fltk:1= )
-	gmp? ( dev-libs/gmp:0= )
-	X? ( x11-libs/libX11:0= )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-2.9.4-strip.patch
-	"${FILESDIR}/${PN}"-2.9.4-ppc.patch
-	"${FILESDIR}/${PN}"-2.11.2-no-automagic.patch
-	"${FILESDIR}/${PN}"-2.9.4-fltk-detection.patch
-	"${FILESDIR}/${PN}"-2.11.2-Makefile-LDFLAGS.patch
-	"${FILESDIR}/${PN}"-2.11.2-Makefile-docinstall.patch
-	)
-
-src_prepare() {
-	default
-
-	# move doc dir to a gentoo doc dir and replace acroread by xdg-open
-	sed -i \
-		-e "s:\$d = \$0:\$d = '${EPREFIX}/usr/share/doc/${PF}':" \
-		-e 's:"acroread":"xdg-open":' \
-		doc/gphelp.in || die "Failed to fix doc dir"
-}
-
-src_configure() {
-	tc-export CC CXX
-
-	# Workaraound to "asm operand has impossible constraints" as
-	# suggested in bug #499996.
-	use x86 && append-cflags $(test-flags-CC -fno-stack-check)
-
-	# need to force optimization here, as it breaks without
-	if is-flag -O0; then
-		replace-flags -O0 -O2
-	elif ! is-flag -O?; then
-		append-flags -O2
-	fi
-
-	# sysdatadir installs a pari.cfg stuff which is informative only.
-	# It is supposed to be for "architecture-dependent" data.
-	# It needs to be easily discoverable for downstream packages such as gp2c.
-	./Configure \
-		--prefix="${EPREFIX}"/usr \
-		--datadir="${EPREFIX}/usr/share/${PN}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--sysdatadir="${EPREFIX}"/usr/share/pari \
-		--mandir="${EPREFIX}"/usr/share/man/man1 \
-		--with-readline="${EPREFIX}"/usr \
-		--with-readline-lib="${EPREFIX}/usr/$(get_libdir)" \
-		--with-ncurses-lib="${EPREFIX}/usr/$(get_libdir)" \
-		$(use_with fltk) \
-		$(use_with gmp) \
-		--without-qt \
-		$(usex threads "--mt=pthread" "" "" "") \
-		|| die "./Configure failed"
-}
-
-src_compile() {
-	local mymake=""
-	use hppa && \
-		mymake=DLLD\="${EPREFIX}"/usr/bin/gcc\ DLLDFLAGS\=-shared\ -Wl,-soname=\$\(LIBPARI_SONAME\)\ -lm
-
-	emake ${mymake} gp
-
-	if use doc; then
-		# To prevent sandbox violations by metafont
-		VARTEXFONTS="${T}/fonts" emake docpdf
-	fi
-}
-
-src_test() {
-	# Welcome to the jungle, where the tests fail if you make your
-	# terminal bigger.
-	emake COLUMNS=80 test-all
-}
-
-src_install() {
-	DOCS=( AUTHORS CHANGES* COMPAT NEW README* )
-	default
-
-	if use doc; then
-		docompress -x "/usr/share/doc/${PF}"
-		emake \
-			DESTDIR="${D}" \
-			EXDIR="${ED}/usr/share/doc/${PF}/examples" \
-			DOCDIR="${ED}/usr/share/doc/${PF}" \
-			install-doc
-	fi
-}
diff --git a/sci-mathematics/pari/pari-2.11.4.ebuild b/sci-mathematics/pari/pari-2.11.4.ebuild
index 564ed9639a71..83c80f0b2269 100644
--- a/sci-mathematics/pari/pari-2.11.4.ebuild
+++ b/sci-mathematics/pari/pari-2.11.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/6"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="data doc fltk gmp test threads X"
 RESTRICT="!test? ( test )"
 
@@ -61,7 +61,11 @@ src_configure() {
 	# sysdatadir installs a pari.cfg stuff which is informative only.
 	# It is supposed to be for "architecture-dependent" data.
 	# It needs to be easily discoverable for downstream packages such as gp2c.
-	./Configure \
+	# We set LD to "" so that it is set to the value of the compiler used
+	# which is how a normal end user is expected to configure it. pari's build
+	# system do not cope very well with a naked linker, it is expecting a
+	# compiler driver. See https://bugs.gentoo.org/722090
+	LD="" ./Configure \
 		--prefix="${EPREFIX}"/usr \
 		--datadir="${EPREFIX}/usr/share/${PN}" \
 		--libdir="${EPREFIX}/usr/$(get_libdir)" \
diff --git a/sci-mathematics/petsc/Manifest b/sci-mathematics/petsc/Manifest
index 63bf7503661c..7e85b0742583 100644
--- a/sci-mathematics/petsc/Manifest
+++ b/sci-mathematics/petsc/Manifest
@@ -4,6 +4,6 @@ AUX petsc-3.13.0-make_hypre_configure.patch 4055 BLAKE2B e3bc831665fbe2c9a724a13
 AUX petsc-3.7.0-disable-rpath.patch 909 BLAKE2B b9b6064886d6c10b382982778398cb7fa254242e5ed0dfb86dd4cd6c094dc51eecfd625f6de5c2779bfc5b3beda351ac44145c69ac246d814a728d7565da8086 SHA512 8241c593d903615feb175bfe8213792ace739a18ac5f4c1d1890155ccea7de30b5ef5d97e2fa3b043e9a1e520e022abedeb038d0b4db671f89045e04edc65a68
 DIST petsc-3.13.0.tar.gz 35080264 BLAKE2B 0ac58e53751dbc6e053e3591cdf2363194e0cf7a493f252d879031e0135da16fa24e66974dd7bf07ce18558a75f8dd794e87f96590ad9e550d11edfeb462f727 SHA512 0590bb63d9c6dfd6ac03b1b88e5a8c11d42a0fd014084603d4d085060b126aa4341b4ec3a4d2b12146b971da327ccc7ede370e5633282bf44f269465aea32953
 DIST petsc-3.13.1.tar.gz 35097687 BLAKE2B fccf64fd3694deffdd0dc561069ffa7e9342fe279b5c9123edeb011df931874083839d27b7b9a0c63faea6487b104b54fd4ce68a88a074c82de91e8baaf270b0 SHA512 41c3138a6ae6c1f2d9077b464c6aeda96287e5a76849582b8f432e2ee93d2594a78ba2181eac0054a77b6165692be5f1a057049313f2be9743d4246383dfdc77
-EBUILD petsc-3.13.0.ebuild 5335 BLAKE2B 82629d09778a4fb2c2c2c975ac9a864d2cc1b3f134f072257861ea9e4309730df7ea9930fa418b156f13384627ac5cd61ac91a6fccbe97595a23ac76bff2301a SHA512 351b627578c0be08fef91ee42a15f83c6e160bd4ccc7ff19570cf0f367332c815469ecac501a3ad90d2eb663d707674ce56424ea9a296c6c88f016eb31c3111e
-EBUILD petsc-3.13.1.ebuild 5335 BLAKE2B 82629d09778a4fb2c2c2c975ac9a864d2cc1b3f134f072257861ea9e4309730df7ea9930fa418b156f13384627ac5cd61ac91a6fccbe97595a23ac76bff2301a SHA512 351b627578c0be08fef91ee42a15f83c6e160bd4ccc7ff19570cf0f367332c815469ecac501a3ad90d2eb663d707674ce56424ea9a296c6c88f016eb31c3111e
+EBUILD petsc-3.13.0.ebuild 5336 BLAKE2B 860ddcfa4620c552e483b8f581a59e11edba520a240dfa37b18c1fdf69b178b3c275c3fbbfa42b827396fb6e763cc66bb6681cc0c2612a640c4e37e176d97d9b SHA512 1116d684ea0304f07758ecd8cbebfa2f0a9e9b879fd2d22a646c51c4552fb856fdd1b543680137b4a7c44df089e07c0e6be6f90def039e8e671ed85cabde0572
+EBUILD petsc-3.13.1.ebuild 5336 BLAKE2B 860ddcfa4620c552e483b8f581a59e11edba520a240dfa37b18c1fdf69b178b3c275c3fbbfa42b827396fb6e763cc66bb6681cc0c2612a640c4e37e176d97d9b SHA512 1116d684ea0304f07758ecd8cbebfa2f0a9e9b879fd2d22a646c51c4552fb856fdd1b543680137b4a7c44df089e07c0e6be6f90def039e8e671ed85cabde0572
 MISC metadata.xml 1131 BLAKE2B db15101bb24374026158a0b45bab1b4b38ab6869bb13fc1df48eef96ca003cea0a8b9118033a3d53c735cefd5ca7563e074d458aee32e038a39e68a6a91b7364 SHA512 19cf1bcddd8bc1378bf85c47b090dd684474f29896c1877bfbeb53a24b1112ed4bb6e823cbc830ee40c886727c6c90d0852081488b1df63f8b4f071d3d453630
diff --git a/sci-mathematics/petsc/petsc-3.13.0.ebuild b/sci-mathematics/petsc/petsc-3.13.0.ebuild
index 961ff927f725..6823bc877764 100644
--- a/sci-mathematics/petsc/petsc-3.13.0.ebuild
+++ b/sci-mathematics/petsc/petsc-3.13.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit flag-o-matic fortran-2 python-any-r1 toolchain-funcs
 
 DESCRIPTION="Portable, Extensible Toolkit for Scientific Computation"
-HOMEPAGE="http://www.mcs.anl.gov/petsc/"
+HOMEPAGE="https://www.mcs.anl.gov/petsc/"
 SRC_URI="http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/sci-mathematics/petsc/petsc-3.13.1.ebuild b/sci-mathematics/petsc/petsc-3.13.1.ebuild
index 961ff927f725..6823bc877764 100644
--- a/sci-mathematics/petsc/petsc-3.13.1.ebuild
+++ b/sci-mathematics/petsc/petsc-3.13.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit flag-o-matic fortran-2 python-any-r1 toolchain-funcs
 
 DESCRIPTION="Portable, Extensible Toolkit for Scientific Computation"
-HOMEPAGE="http://www.mcs.anl.gov/petsc/"
+HOMEPAGE="https://www.mcs.anl.gov/petsc/"
 SRC_URI="http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/sci-mathematics/polymake/Manifest b/sci-mathematics/polymake/Manifest
index db98c16c9bf9..3e8139e2cbbc 100644
--- a/sci-mathematics/polymake/Manifest
+++ b/sci-mathematics/polymake/Manifest
@@ -1,3 +1,3 @@
 DIST polymake-3.0r2.tar.bz2 37695790 BLAKE2B 101dda48128b51737b81d3dc09a8ef32d07c5f67605370c5ef0d5638ee6de427c6e8ff66094f96593ad21fa937ca5890af772f6e877fab0e31f4c98ec7c6730b SHA512 b4c22b2c6da8ef597dc05a44a30c7a55fd924a96854cde3f725095465972eabe1e24508f8e5d544f3131c82c973117b15983c38a0242fc7f1d4a4a8ecddb1d46
-EBUILD polymake-3.0_p2.ebuild 2690 BLAKE2B 3977ed472ef7807cf77cd48818f2c3d370237d1b7c330520cb409985f61bbc3efa96d463f61ffb4a658297c09fb1cffeec832cfa09f03acec555f4de5b6affa6 SHA512 b0fe6bd588e34f06ca036d71a131acf2c6d01c23f2e7b15305d37269b36517cc2f905ccffd94a7fdffce9c8368697d90ae694590b0c77ec54ce1bab8661c5a9d
+EBUILD polymake-3.0_p2.ebuild 2692 BLAKE2B 7279c8799c49d2adbe0126f8a421eea1c657ccebd3283cf37ca8364b817f5efa1844e084f55c1a51183f780d32a8f71546e2b41f343c39f86856b1dfe36d3894 SHA512 236c7ee312e29daa6eaf371553d79cfd2bd8854af12bf020df639c2f459c0b5c52704c558bb49cc98f599ba09e643821c27aec802be95c1780fe1925ddf24c84
 MISC metadata.xml 1344 BLAKE2B 93e5b08dd3c8db1d542c98a62b5d1c0bbb2070773a563e843f31434b6babccc9bb49521d4dd5f40238a20dedd8296fc43b9b347dbe5b540f8a4c17bbc59f6fdf SHA512 43356916d2941afab2346ab4289ec1ab65a166523682a7831a29261c3f7391072d4fa232c324483e33d523fa80288a208f7937f559e56bb20b3a85d5058779e9
diff --git a/sci-mathematics/polymake/polymake-3.0_p2.ebuild b/sci-mathematics/polymake/polymake-3.0_p2.ebuild
index c14cf1c5a3fd..179fb83a8924 100644
--- a/sci-mathematics/polymake/polymake-3.0_p2.ebuild
+++ b/sci-mathematics/polymake/polymake-3.0_p2.ebuild
@@ -7,7 +7,7 @@ inherit eutils flag-o-matic
 
 DESCRIPTION="research tool for polyhedral geometry and combinatorics"
 SRC_URI="https://polymake.org/lib/exe/fetch.php/download/polymake-3.0r2.tar.bz2"
-HOMEPAGE="http://polymake.org"
+HOMEPAGE="https://polymake.org"
 
 IUSE="+cdd lrs ppl bliss group +libnormaliz singular libpolymake"
 
@@ -80,7 +80,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "Docs can be found on http://www.polymake.org/doku.php/documentation"
+	elog "Docs can be found on https://www.polymake.org/doku.php/documentation"
 	elog " "
 	elog "Support for jreality is missing, sorry (see bug #346073)."
 	elog " "
diff --git a/sci-mathematics/rw/Manifest b/sci-mathematics/rw/Manifest
index 37073adb4728..e6fd3b5d01f0 100644
--- a/sci-mathematics/rw/Manifest
+++ b/sci-mathematics/rw/Manifest
@@ -1,4 +1,3 @@
 DIST rw-0.8.tar.gz 217215 BLAKE2B e6f379ce7cde0fafb0c6e234e8958018c0682ad47e60da3755a891b7eee4c910e84556252a333a12fe0cf2eac88863a272cb8fa6d2cfa4c9f1e93bd88bc6a2d2 SHA512 609d46fd3c76e2eb1724cc3e3ff9354d13b3c15ce23b96bef9f73f02b490e1d8713146230db079fcc87f45f5acc0e04130dac04e27589836e20891c63219f3ec
-EBUILD rw-0.8-r2.ebuild 995 BLAKE2B f9b78b421a24cedc9a347f63b22e5b33d8cf115121724705207fae590c303d1956b2001f91e3735332b748ef189fafeb42d04f6844a66881790152babc76cfb5 SHA512 2fd5999820443b7d755814af961b1e1c862749180ffc6c3815be15cdc3790c036a2de5c4e4a02d5bf316c7cb1e0b6b024c86484a0a6022b831ba91ba73554660
-EBUILD rw-0.8-r3.ebuild 1125 BLAKE2B aa92fd85cde10922d0979d0503d0a4ff4e51372f15e5a5a17299d96938fdc010c5206302dbbacf5662b1536c1c8b990dae0512e00daef1eb4897d762d5d2f394 SHA512 20c39b004d9d25ebc34a35a9907f3173e554923a78eaaee3da2be0c8a991aa6099f758fb465731b43c35abd18296e2c05d974d1680c2735c5f43b29cbb08e9bb
+EBUILD rw-0.8-r3.ebuild 1123 BLAKE2B d719ea887692d4175f1a3930ee1e2d01eec92542db61dd47b472814c62a5aa95e1939183aa2ea8263d52a63ae8c3dd2da6f681e796447ce31ba29c85f49627d4 SHA512 91b0ca65465e6a762bfbcc71cbb153967dcd154c971ecad737ec1033a52337b24dca17e4a3140cfd394cdd228c4fa4ab388a18aa17f8dec72c829d28ae46ae01
 MISC metadata.xml 1128 BLAKE2B 30c263e8a47107c0c5d9a7ee5377a5deaa6260767734361b85eca07f5c1a88d8f2375f2c5d20a28cd1241fcf70a2dfcff16a7fc2886977dfd9f25b5388aa73bb SHA512 34ec83d5cf7d7ed12ef6c58291a6a1b8323d580121e8b489dadc569f09b184e6952cefd934da504542a7a4cbe5c59a781ff703dec21c7ee4010f31153144328c
diff --git a/sci-mathematics/rw/rw-0.8-r2.ebuild b/sci-mathematics/rw/rw-0.8-r2.ebuild
deleted file mode 100644
index bc5bc34162b6..000000000000
--- a/sci-mathematics/rw/rw-0.8-r2.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
-
-inherit autotools
-
-DESCRIPTION="Compute rank-width decompositions of graphs"
-HOMEPAGE="https://sourceforge.net/projects/rankwidth/"
-SRC_URI="https://downloads.sourceforge.net/project/rankwidth/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-# We have a file collision (librw.so) with xpaint, bug 560210.
-RDEPEND="!media-gfx/xpaint"
-
-src_prepare() {
-	# The upstream tarball for v0.8 contains SYMLINKS to ar-lib,
-	# compile, install-sh, ltmain.sh, etc. And those symlinks don't
-	# always point to a working location for us, so we have to
-	# (re)generate actual files for that stuff. Bug 696986.
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# The executable depends on igraph, which has gone off the rails
-	# upstream and has copy/pasted ~10 libraries into its src/ directory.
-	econf --disable-executable
-}
diff --git a/sci-mathematics/rw/rw-0.8-r3.ebuild b/sci-mathematics/rw/rw-0.8-r3.ebuild
index 6bbd3085010b..979e83395197 100644
--- a/sci-mathematics/rw/rw-0.8-r3.ebuild
+++ b/sci-mathematics/rw/rw-0.8-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/project/rankwidth/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 # We have a file collision (librw.so) with xpaint, bug 560210.
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index da845d3d8b2a..40f4f17af7fb 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -7,6 +7,6 @@ DIST singular-4.0.2-share.tar.gz 8789162 BLAKE2B 357a68f68cc0508e4e197427c56232d
 DIST singular-4.0.2.tar.gz 8635172 BLAKE2B 5f565bf14677d8414300d7a5602aa96c8cef7e863fd858083fe4561742b545d74a5fc4de95ef0c63acf4f78c66405bac7ba77a954e42b2e87a6da608e4732bcd SHA512 4543a45839ce8adc45e3b2edd84a6e398b7ba157da1eda050dbce2a8b20333eb0c63433e3e7eaf59d76bf6bcb65c1b1611bfc08c25fd493c88e2f06624898e3d
 DIST singular-4.0.3-share.tar.gz 6633256 BLAKE2B c137b72aaa0926eb006624e03fe938678acb94a41da525de1ca4f7711985d253926788b550d2d98b8def15fb0cb60b2527c1c04566a29a28135fcb1a70246025 SHA512 5f8ae4ecd22a3470e5f00393e03079936d7ed334f44ae056ed1eb1719054afc4371b03e920b598033605600c843dc39cb6b01308505323e2c084dfe1f7a1b94a
 DIST singular-4.0.3.tar.gz 12615042 BLAKE2B b3c63434974bb8b5fdef86cbcbe73b76a47503b28dcae6bfc6e4210e1ab1c14224ac0f6eeefa9d8004450f6d9a26843368a9b2ea16bca68bf1215ce33e83df0d SHA512 781227997c510829b02c969259d627572c0b62aa152c9ef623ff27de5b2df0c8e024f086740b89ca8f96b6e3f7def04f8d62ca79adb199d6249ade9b8cbb06ab
-EBUILD singular-4.0.2.ebuild 3588 BLAKE2B a9a6e588699199f44940683f4b0781b4c07d7d58b63d7d98f096d7451091cdd2ef467bba1bd532b1f59ac38d163dc5296bcbf487faedceb176de946badb61d09 SHA512 c781fe13831f591ef8f25dbc36f96423df3ce2b7526b9cea60c8ea3e03169c0618693c90d93f3bd646e1334d116d8047f91f9d463a323e6af7f6155e3248eb43
-EBUILD singular-4.0.3.ebuild 2507 BLAKE2B 5eba8ea384a04a9363d09b1a3240c67206f068e4c76225128b32c4784e732fc1b66ebd49fc7d0f0c0d2f125d6629cb83b2ff02843ed99646885c02c898f1b0f0 SHA512 99e41a1cd03040145d565e321254ce1e59809487c2f3eed590b9c9556cc72b77a20fa1250997da3b7b6104afc7dd318782ce555e9ee867e54a6ac301d3942e41
+EBUILD singular-4.0.2.ebuild 3591 BLAKE2B 102440f23197b8547484d8b949ef3caca172900c435c213690386a803dd14c871b3081fb06adb7792dc1632052912b6cd81391f212aac7616cdd2838c0101b8e SHA512 fa6b5a429109b590a3dc435dfe0d9647447cadf66939cd2c1fd2c586e4e9e3b240824dd5f9da6b3e938c7f9609b4eed5a89e125839962e8248f6efb4c5e76c3e
+EBUILD singular-4.0.3.ebuild 2510 BLAKE2B 8fb716f8da3eceb7d45b0bdd076f88aa28f12fd23dc584f8517cbf4f71061f47af6441b00bf41ed37d9fbb2829b405238202009d3e6488eb02548ef831def8f9 SHA512 41e069de66db2d81ed99e2f9004072ddc83cc6c167c5bcec0caac4aaa1791d50d09f8e771cbac6311f9b23e2fb33384f691f504aad7984ccd47edce461c91020
 MISC metadata.xml 389 BLAKE2B dcba16dd34ab572d58d76ea55f528ee1a4bb4c0c37ca272c9a11afdb8117f6982e5109a4a4783d1efc6cb31fe273f07bf79f720f178fea635af29574007c93f9 SHA512 3c5aea925276639c81a03a2a8d05ecaa48edac510f144d92e173402721dbc253638341ac8afdfbc17098ac35d2f4f47b41e5d56427c8ecaa788dc28fbb0977ae
diff --git a/sci-mathematics/singular/singular-4.0.2.ebuild b/sci-mathematics/singular/singular-4.0.2.ebuild
index 7467031e0e48..7ed8bc1ce712 100644
--- a/sci-mathematics/singular/singular-4.0.2.ebuild
+++ b/sci-mathematics/singular/singular-4.0.2.ebuild
@@ -14,9 +14,9 @@ MY_DIR=$(replace_all_version_separators '-' ${MY_DIR2})
 MY_SHARE_DIR="${WORKDIR}"/share/
 
 DESCRIPTION="Computer algebra system for polynomial computations"
-HOMEPAGE="http://www.singular.uni-kl.de/"
-SRC_URI="http://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz
-		 http://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}-share.tar.gz"
+HOMEPAGE="https://www.singular.uni-kl.de/"
+SRC_URI="https://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz
+		 https://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}-share.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sci-mathematics/singular/singular-4.0.3.ebuild b/sci-mathematics/singular/singular-4.0.3.ebuild
index 4be89de36674..fcfd823ae4d9 100644
--- a/sci-mathematics/singular/singular-4.0.3.ebuild
+++ b/sci-mathematics/singular/singular-4.0.3.ebuild
@@ -13,9 +13,9 @@ MY_DIR=$(replace_all_version_separators '-' ${MY_DIR2})
 # This is where the share tarball unpacks to
 
 DESCRIPTION="Computer algebra system for polynomial computations"
-HOMEPAGE="http://www.singular.uni-kl.de/"
-SRC_URI="http://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz
-		 http://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}-share.tar.gz"
+HOMEPAGE="https://www.singular.uni-kl.de/"
+SRC_URI="https://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz
+		 https://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}-share.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sci-mathematics/slepc/Manifest b/sci-mathematics/slepc/Manifest
index 03dc04d5a6e5..2a678fd8491f 100644
--- a/sci-mathematics/slepc/Manifest
+++ b/sci-mathematics/slepc/Manifest
@@ -1,3 +1,3 @@
 DIST slepc-3.13.1.tar.gz 4797627 BLAKE2B 29372b8a2d4c5f3b26e840df743f7aec098bfeeb29e9c108e509baa21d9697da19c737470ba4c132391d5193ebf749ef3f3c6ece600ec7527502d40a239aa0ee SHA512 620c344274808329c0a1009e7844532e03e88d38135bfd5b73bc0bc6815b17b6dfb49341d05399230ba6e06997db688aec17615429eaca3dc94fd886119bf321
-EBUILD slepc-3.13.1.ebuild 1588 BLAKE2B 471e024fa09e1b2bcbdaaccfaa6681449d7180ae0874b9f698cb180f60bc37b467e1cc5ed451ec25acb1dc02d219a2c8734a8113a277e3e95e409aefa81cc510 SHA512 87cfaaf90488b5951aa3ec865ebe288b8dc724323032d540b109511f3b268b107ed00e23f3439046191fb73c19f8b68f96a1f3450706c960b4c19c27ccbafdc5
+EBUILD slepc-3.13.1.ebuild 1590 BLAKE2B 0232d62c53f2b5c681b2e1f87bbba1f4b397673b332b53fd80a4c33dc0480a5a269c5b5fe3c15531e1a1b4da5522f70c24663c8d6dce74fca226ead11ca6ff95 SHA512 cfc07de59bcae6e39f0632e8bfc4938a11d44273e306aff5af786d56dfe7f01a7dce164a166d1f867cc907d14e7b63fac13316c0589711cb0ab561399390da65
 MISC metadata.xml 451 BLAKE2B 5268292011dffcbc322504b29332ae20a4e775238e201ffe793e1ebfb8d8c13a836ca1f8eba44b38bc63ba7b21a3634a03df9990e8b801def0152316d1539960 SHA512 7bf6d4cdedaa48f96e9b1d3e237b795f7cbfd840cece0c0181c9efa05ec833477191e8d12cf2b7737a921b85fb5af055d5868e1173415fc70802eb515959c9d5
diff --git a/sci-mathematics/slepc/slepc-3.13.1.ebuild b/sci-mathematics/slepc/slepc-3.13.1.ebuild
index be2d085dd6cb..003f1453e563 100644
--- a/sci-mathematics/slepc/slepc-3.13.1.ebuild
+++ b/sci-mathematics/slepc/slepc-3.13.1.ebuild
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit eutils flag-o-matic python-any-r1 toolchain-funcs
 
 DESCRIPTION="Scalable Library for Eigenvalue Problem Computations"
-HOMEPAGE="http://slepc.upv.es/"
-SRC_URI="http://slepc.upv.es/download/distrib/${P}.tar.gz"
+HOMEPAGE="https://slepc.upv.es/"
+SRC_URI="https://slepc.upv.es/download/distrib/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/sci-mathematics/wxmaxima/Manifest b/sci-mathematics/wxmaxima/Manifest
index 2414d502a250..8191a112a643 100644
--- a/sci-mathematics/wxmaxima/Manifest
+++ b/sci-mathematics/wxmaxima/Manifest
@@ -3,9 +3,11 @@ DIST wxmaxima-20.01.1.tar.gz 14011946 BLAKE2B ed80f02158aa0c43f37c040225010b35ee
 DIST wxmaxima-20.01.3.tar.gz 14221966 BLAKE2B cdaf62f5456446fe6edf1247323faa9f0aeb84dbe890cb03028f9f441c4c6bd3e7acf806b71a86b156ea7f10664c0188517b8f2aa15536e3350e16e3307f412c SHA512 4a977bd293255ac3c010610c74aa39fba8b8468aaa9fc59707bab69ede7a427e261ce827bae8d302ee1343bb0fce5e7aa5ee3c59f17198d5c473637571667abd
 DIST wxmaxima-20.02.4.tar.gz 15242422 BLAKE2B ea9dc613fa94d046a9d461c56a9d1564001f4fa28d90a553040e85b7dd442df025521dd9501257d12c808a2e9285b7f34b04c9f10d4ce658bc6d423055c9fbd7 SHA512 d5eb0e09de55c3e6ebafeaa95957ca8bbdacac9ec1d99f6041fa99b7fa59364b3228336675f9bffa71b879b17268b80c695f16c9259bee6d5cab9ef7ed86294b
 DIST wxmaxima-20.04.0.tar.gz 15313618 BLAKE2B 04a9544aeb1a7084250696fad99c51be21bf0b119581cebdf62b8dece3034ebcc1469b9d07576bfed8d72efe77ce6db47b5a29c4185a5e85114b552d3385caf9 SHA512 8caf9effa0167c3307eff4a6895a3b19b41aab37f845e4cdc139f3cdd03d9a061adc9ea4ad8ca7e0f28d83faf34d15f828f03c86d05ad7d83f0e28aee82aba70
+DIST wxmaxima-20.06.6.tar.gz 15627532 BLAKE2B b445cd0195561ec55d4f7c750eb2f44386267fa153638faf0d90b084e2c43d6d2cec5160011e2b0a6cadd662c31ca63f72df80328aef37234e1e5dfce9ee1f64 SHA512 65b4f93f8baf3c1b93ac1cac21b0a531e3d5fbf219540a0db4f6f66744909e3e787765ba1eb387823805df7201e6fa08bca165cdea2e0acb2687261fbd3cb269
 EBUILD wxmaxima-18.11.4.ebuild 1324 BLAKE2B 1f6c20362bc7403da290ae6ae0bfa898b611d2986f770523d24780682562fa5c60a853697dda8507fe1ede01410b140bd6518cf1f5b0a65502fc36a9f0486a7d SHA512 e6102de11417007556f36485d8c37c100c0bc2f5df0cb39750ef5bda82d4c7a71d4036f7879e066dc407f45eab3e92122ae2c0494cbc94e607daf3982ea1702a
 EBUILD wxmaxima-20.01.1.ebuild 1347 BLAKE2B d67dc143889163798e870e8ec3d04c3821bbb99ce4d1f114ecb5bc76756ae2b6fefba5b01e1ac45b16d6255dce909a9568eba1b1128dc89e127b1a329d4ac789 SHA512 7863680d2507d628741568a67954fa40962fbce8b78afdd83cf9f2612eae3d65e53a0a83b02f313b4a79e9acaf6094ac044a34c1cc6bca6ac7fa94df999c9a9b
 EBUILD wxmaxima-20.01.3.ebuild 1347 BLAKE2B d67dc143889163798e870e8ec3d04c3821bbb99ce4d1f114ecb5bc76756ae2b6fefba5b01e1ac45b16d6255dce909a9568eba1b1128dc89e127b1a329d4ac789 SHA512 7863680d2507d628741568a67954fa40962fbce8b78afdd83cf9f2612eae3d65e53a0a83b02f313b4a79e9acaf6094ac044a34c1cc6bca6ac7fa94df999c9a9b
 EBUILD wxmaxima-20.02.4.ebuild 1347 BLAKE2B d67dc143889163798e870e8ec3d04c3821bbb99ce4d1f114ecb5bc76756ae2b6fefba5b01e1ac45b16d6255dce909a9568eba1b1128dc89e127b1a329d4ac789 SHA512 7863680d2507d628741568a67954fa40962fbce8b78afdd83cf9f2612eae3d65e53a0a83b02f313b4a79e9acaf6094ac044a34c1cc6bca6ac7fa94df999c9a9b
 EBUILD wxmaxima-20.04.0.ebuild 1347 BLAKE2B d67dc143889163798e870e8ec3d04c3821bbb99ce4d1f114ecb5bc76756ae2b6fefba5b01e1ac45b16d6255dce909a9568eba1b1128dc89e127b1a329d4ac789 SHA512 7863680d2507d628741568a67954fa40962fbce8b78afdd83cf9f2612eae3d65e53a0a83b02f313b4a79e9acaf6094ac044a34c1cc6bca6ac7fa94df999c9a9b
+EBUILD wxmaxima-20.06.6.ebuild 1357 BLAKE2B 0cc3478c4ddf5be4ace1b8f0af26d9a9e723767bd0a1aa90eb95b1e20fbd2285c3e4a8cf73365525603c382f6fa2f39837a76abee4e0d1d5e793b3df1b4e9d9d SHA512 44ad67131a56ced20f76829f1a87e226ab3aaefe76fcfca09e865ac474d488b491c063922e984e9b1fcf794ea0cf4c07e40b4093c2c3a3d0404281d1378963c3
 MISC metadata.xml 711 BLAKE2B 00c54141e803d86fb20dc4f058fe99f6bbc2fd067175af6d0a5f893dc5a0b523fdd9116341ba33f991b11538989869337e1ce36c2259cfdb284725fed1aeaf60 SHA512 30a578958cbc4813e2615d0c3d7c4a1349f408933f285d3a43a382bf90bdf5c985ef1b844c4f8391205be643961de0335536ee800e1be24bf358bb4ead736fe5
diff --git a/sci-mathematics/wxmaxima/wxmaxima-20.06.6.ebuild b/sci-mathematics/wxmaxima/wxmaxima-20.06.6.ebuild
new file mode 100644
index 000000000000..da8eef70a616
--- /dev/null
+++ b/sci-mathematics/wxmaxima/wxmaxima-20.06.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0"
+PLOCALES="ca cs da de el en es fi fr gl hu it ja kab nb pl pt_BR ru tr uk zh_CN zh_TW"
+inherit cmake-utils wxwidgets l10n xdg
+
+DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit"
+HOMEPAGE="https://wxmaxima-developers.github.io/wxmaxima/"
+SRC_URI="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"/${PN}-Version-${PV}
+
+DEPEND="app-text/pandoc
+	dev-libs/libxml2:2
+	x11-libs/wxGTK:${WX_GTK_VER}"
+RDEPEND="${DEPEND}
+	media-fonts/jsmath
+	sci-visualization/gnuplot[wxwidgets]
+	sci-mathematics/maxima"
+
+src_prepare() {
+	setup-wxwidgets
+	cmake-utils_src_prepare
+
+	sed -e "s|share/doc/${PN}|share/doc/${PF}|g" -i "${S}"/info/CMakeLists.txt \
+		|| die "sed info/CMakeLists.txt failed"
+
+	# locales
+	rm_po() {
+		rm "${S}"/locales/wxMaxima/${1}.po || die "rm ${1}.po failed"
+		rm -f "${S}"/locales/manual/${1}.po
+		rm -f "${S}"/locales/wxwin/${1}.po
+		rm -f "${S}"/info/${PN}.${1}.md
+		rm -f "${S}"/info/${PN}.${1}.html
+	}
+	l10n_find_plocales_changes "${S}"/locales/wxMaxima '' '.po'
+	l10n_for_each_disabled_locale_do rm_po
+}
+
+src_install() {
+	docompress -x /usr/share/doc/${PF}
+	cmake-utils_src_install
+}
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index 59bd1400797b..cf107e8dabe8 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -2,4 +2,4 @@ DIST z3-4.8.6.tar.gz 4328752 BLAKE2B 4932670f3c1ab9bdba18a6ad80f4fd8812eb70d7170
 DIST z3-4.8.8.tar.gz 4520119 BLAKE2B 8d3d9fac61ac7d5a9d8c44323db9f67a7b24ee510b12e67867b249062cbcfe9a3bd0fa3b24c03c9eccd2aaf90451083ff5e9a9253a87c3e8e943fc5cf08a1893 SHA512 a6823cadb7cdad11b8f0db1530676c0ec4853886dfb3c4dbc5b798c5dbd445afb0c61675f81cb7f99c1b1734d9cd0ec96a07c68a948da3c25801fc6767fea47f
 EBUILD z3-4.8.6.ebuild 2335 BLAKE2B e980e31d4d6ab4443b7b385c66aa1a71ab062d4783e1947d1a2d9688986729a19769813e22cb7395d9a8a1a45e1fb898da1a8e6c923c8486aa8dccd601f9874b SHA512 214122932dcbb1cef0e3d3617e37e3057936b28afc7d70fff2fe08bfcaad963516d48f20fe65efaf80729f5ab070b562aa574c163f908c82b620846e5cda7982
 EBUILD z3-4.8.8.ebuild 2419 BLAKE2B 9ce7a230328d75a750d8dd035388cacf7805ed2acdb827ee7d23337872b31fb281d2e8b46a3670028eb88872ecdb2a6b7ceced85b57d5df88ab9cb9469504571 SHA512 17f721bcf8019eb6d2be6d0a4003187a76c6490f550fed9d488dda8d1cb372ff3b4192fd5906de45713ec3b60be8b7387d960818b386d5827977cf9db81c0213
-MISC metadata.xml 732 BLAKE2B dec39a80325f9dba9e79d65f448d828c3ee19327a1a12505e487a39fd58fb49f47446e439d713a9fa2603bc971f22f4eb8c1a12e93e18281aeba5e183642add8 SHA512 7d081840634a8dc578acc60c4b85ef1a35f025c2ac251d2f7633a807af7395061ef4fb96716e96a96a876ae318b52333dfc0200fa1e72e35889433676a56e58b
+MISC metadata.xml 616 BLAKE2B aeef1be6d9c4a94062310c6e2c3ac7fb1efe39bb608d96c143a01e9a01585f11ee25aa56d8f67d0a96d880b543882f2cb781247c034eda75e7f6f030767bf660 SHA512 aed4bbc517cc4f9e78ad3f5d50af5837757efa2985aa61a3faf40e39203179d356830a1d6fd4712422257eb244a67ae5eb5c4b2db76ab75769f5fe5e6d045a0c
diff --git a/sci-mathematics/z3/metadata.xml b/sci-mathematics/z3/metadata.xml
index 65ab90b88bdf..2d840f8f9a83 100644
--- a/sci-mathematics/z3/metadata.xml
+++ b/sci-mathematics/z3/metadata.xml
@@ -8,10 +8,6 @@
     <email>mgorny@gentoo.org</email>
   </maintainer>
   <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-    <name>Gentoo Haskell</name>
-  </maintainer>
-  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index 71e3c08f820c..6dd891ffd679 100644
--- a/sci-misc/Manifest.gz
+++ b/sci-misc/Manifest.gz
diff --git a/sci-misc/vitables/Manifest b/sci-misc/vitables/Manifest
index cd7b01f930c3..bb6b31d01a6c 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-r1.ebuild 928 BLAKE2B 821e225b801d2e9c2786a8fefa683c963f09930a6ce5f53475840b3f17cc8b6e3ee63fdb0dc6988c7dc86ae73be6ebe97e57ad49afeb124de8feee1697bee254 SHA512 a10ad3ac22a7ab7dafb1dc6269da8dc856990f6732b8c2f90544820d28f115b37d9e4a9b52ed902ddf3c8bc1f29596f5e727a4a62e8ba3dd127a4fc17cf2b528
+EBUILD vitables-3.0.0-r1.ebuild 929 BLAKE2B cba4e7d580c20ae6437853725346565f342439d084e79eb3dedc1e44714d178233149533c72853db85bffca292cf8cfd1d641e24a9a02577b4cffc3a40649b1d SHA512 9f927980f5a336b867506d1d89c1658f87d90431023f2ac7eebf1e69184c993c64386b69329741620aa7c032c7a1f1d2601093f51698d5c1ffe970fcff5c7b3f
 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
index c25d11326d4c..a39e483b2048 100644
--- a/sci-misc/vitables/vitables-3.0.0-r1.ebuild
+++ b/sci-misc/vitables/vitables-3.0.0-r1.ebuild
@@ -11,7 +11,7 @@ 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/"
+HOMEPAGE="https://vitables.org/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 27fedbf61180..b95de9ce931f 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/epix/Manifest b/sci-visualization/epix/Manifest
index e81232c64eb5..a58986fb1d62 100644
--- a/sci-visualization/epix/Manifest
+++ b/sci-visualization/epix/Manifest
@@ -1,5 +1,5 @@
 AUX 50epix-gentoo.el 298 BLAKE2B 236677e59724ddda6cca138c5e049250798a249373558caa1d2f85b432710352d86cf4c4a90ac4556da4857d5aa4bbf2dbae816a2338808a6a79d44eed0fcd75 SHA512 7033d169194cffe4265569f1b048e9ec1929dc98257eb4fb63f486be1ab8162e80fa75fd3943c81b5f9a8eb0e13665e66852ef1f9fbf7cfaee949f5d56fbe9a3
 AUX epix-1.2.10-autotools.patch 2701 BLAKE2B 1478b23499deda305b94b26e9b680131bcecf6dc633d35187f9e9fc3fa7ee500e6b679eb6ade85564b631e7d207c3e0c0cb4ee1caf42779ff1477e1a55e5fd31 SHA512 c94beae67c28ceff6cd4445272574e6cb93f4c181cddb4023587d20e2fed1bea523891191f80b6dd8870f167cbcae2567cd014b6a20aafbb6a74624c76e54cac
 DIST epix-1.2.11_withpdf.tar.bz2 1709429 BLAKE2B db9cba5b94e27742347f8fc85366399016438681a7016077966e5048b9a178404af8305da7d170722aaac82d85283552f87fbba76b21e788fee546b0e0aebf43 SHA512 16d0edf13711e469a13faba83d47fbab983277a95cfed0e343089258da0b8a56104af9fc217aaa70928c50f10e7d152df93c3638cf2a65a2833142645a829a45
-EBUILD epix-1.2.11-r2.ebuild 1518 BLAKE2B e260a64b98bdec05aac966c21526295887100543c7d52b10cab99276a9b548ea1933d75ef3f2336541521ada93847bfdfbaddfca342a5f370527c02f336dcd8c SHA512 130d0aa6f7d4da2571185d259b54beabfdce5b59a2df6804c6ba587d4d4bad3a7bd7b6165d3c77b7cea6e778bdbc4e09354cdb0612c55cda45ca7c74eaf165ed
+EBUILD epix-1.2.11-r2.ebuild 1520 BLAKE2B a835904a26a36ed9c86e57d26ea30a84bd3f24d0b6a824495f391a0d969c6c255a65a6b3f6effc72e18656200d885137b2081819bad8f80a8d5dbec92b1449cc SHA512 23affe8ea12267299b5c68829ea32b6fc7ee760320c492f3f6981f8dacb3e1d0a0cdcd98065896d88d351dafedb31d4aed496ad9d1e24c4e9e9b25e6206ff4d5
 MISC metadata.xml 779 BLAKE2B 2e6405de37d7ed3e85eb865d140a599b1de484f9cc5c35eda7be384259b34bbed06aa84dffc8a5b1b05c6db18a5d0bd1b0f28c9969a8aac933582bf0d1c9cc2a SHA512 b0cb62a782873b0e2e115f18495f520f3fb5cf06052d6fdae023a65a3a40fb2eaf355ffacf0243149d9890d8f56be87dbbdaf459b05ae32b877037e7ff2bc5e9
diff --git a/sci-visualization/epix/epix-1.2.11-r2.ebuild b/sci-visualization/epix/epix-1.2.11-r2.ebuild
index 803e8966b92b..7d479a0bc449 100644
--- a/sci-visualization/epix/epix-1.2.11-r2.ebuild
+++ b/sci-visualization/epix/epix-1.2.11-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
@@ -6,8 +6,8 @@ EAPI=5
 inherit elisp-common bash-completion-r1 autotools eutils
 
 DESCRIPTION="2- and 3-D plotter for creating images (to be used in LaTeX)"
-HOMEPAGE="http://mathcs.holycross.edu/~ahwang/current/ePiX.html"
-SRC_URI="http://mathcs.holycross.edu/~ahwang/epix/${P}_withpdf.tar.bz2"
+HOMEPAGE="https://mathcs.holycross.edu/~ahwang/current/ePiX.html"
+SRC_URI="https://mathcs.holycross.edu/~ahwang/epix/${P}_withpdf.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/sci-visualization/fityk/Manifest b/sci-visualization/fityk/Manifest
index d6aaa4a093d4..124f009009fa 100644
--- a/sci-visualization/fityk/Manifest
+++ b/sci-visualization/fityk/Manifest
@@ -1,5 +1,3 @@
-DIST fityk-1.2.9.tar.bz2 1370476 BLAKE2B 30cc6f640bcf3323d592563ce153a47a0e2770f70d0a0cf8ff6a886b1e86421e370cbc142ed89914eb63ed32e35cc6c67c1297bd8680e022ed58697ebe174e5e SHA512 e6d4846a0690ea5e7b94fc067de48d67d6342ff595844d709af9f3b978bf4bd9d0095ce348716fd0053c5575b4bff5825f8f126a53bf7e11f4e6e8a2cc6ddb1a
 DIST fityk-1.3.1.tar.bz2 1518937 BLAKE2B 6eb13646e1b5cf3fb0763bcf3e91a1877d89f14f1b986f1065fd27052e7110b357c99431a326a6c1fa2ba002300912b922cd3d5589ac5da367d2fbcee209f9a2 SHA512 4a7a65691af8b8d5b47461133b7870ea21ea04ac2ee8ee5714a6b9bab2f072baa6b5d8bf011baba09c62a7ce2dc9d60f3040cc6fdb77dc498b6e03a24fc0fe08
-EBUILD fityk-1.2.9.ebuild 1999 BLAKE2B b464361d4802e259d89ed1c3dfbf547bfe12712712032ad76293f372dfd41f3b66eca547657bd93f2aaf8fcf45575fe2b180f986d11f6fdce9d7d5bd9b386c09 SHA512 04906e65b3dc51b095cd16cb2f56231bc8565769e9bc79280ae4de0a54e1eed98da5761a2c6c1cee96e25bb31662eedd0d6e45828704268d5941dd51d77393d2
 EBUILD fityk-1.3.1.ebuild 2149 BLAKE2B a719547248466bd5c9417051f42983097487dfbb0ea29c3964652bd7563c51fe712ad8ad95e52bae72c04f1893cb5db05e9d31b53aad9c766df52d7ee5966310 SHA512 a7df734423246b71afab679b584379ece6802fb28f158dc9407d129ed6e735c6f470f44c37fee545aa22ed4d3efa9a4fe556bf0b1ecce4a9bcfa7f588d0d2b73
 MISC metadata.xml 1378 BLAKE2B a6b73be959353e2a764d5c39ae13c4fe1bc38c5c0ea5a3c2557e32825077e13d0a97504f8d79e338a65803bc98326fe25cb7e86d3aaa8c93c5d9bdce30cbec90 SHA512 38e516a5e0ec249d3ed4e54d4780830e1b53994e9dc1999c664b2f37aac0247df780522e7b25c124ffb0d9766d1292871ec0f9a238c2b3aa9994cef3581befe6
diff --git a/sci-visualization/fityk/fityk-1.2.9.ebuild b/sci-visualization/fityk/fityk-1.2.9.ebuild
deleted file mode 100644
index 6f6ef3beea26..000000000000
--- a/sci-visualization/fityk/fityk-1.2.9.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools-utils fdo-mime python-r1 wxwidgets
-
-DESCRIPTION="General-purpose nonlinear curve fitting and data analysis"
-HOMEPAGE="http://fityk.nieto.pl/"
-SRC_URI="https://github.com/wojdyr/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="gnuplot nlopt readline python static-libs wxwidgets"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
-	>=sci-libs/xylib-1
-	>=dev-lang/lua-5.1:0
-	nlopt? ( sci-libs/nlopt )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:* )
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )"
-DEPEND="${CDEPEND}
-	dev-libs/boost
-	dev-lang/swig"
-RDEPEND="${CDEPEND}
-	gnuplot? ( sci-visualization/gnuplot )"
-
-src_prepare() {
-	use python && python_copy_sources
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--disable-xyconvert
-		--disable-python
-		$(use_enable nlopt)
-		$(use_enable wxwidgets GUI)
-		$(use_with readline)
-	)
-	autotools-utils_src_configure
-	if use python; then
-		myeconfargs=(
-		--disable-xyconvert
-		--enable-python
-		--disable-nlopt
-		--disable-GUI
-		--without-readline )
-		python_foreach_impl autotools-utils_src_configure
-	fi
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	if use python; then
-		python_compilation() {
-			cd  "${BUILD_DIR}"/fityk || die
-			einfo "in ${PWD}"
-			emake swig/_fityk.la
-		}
-		python_foreach_impl python_compilation
-	fi
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use python; then
-		python_installation() {
-			cd  "${BUILD_DIR}"/fityk || die
-			emake DESTDIR="${D}" install-pyexecLTLIBRARIES
-			rm "${D}"/$(python_get_sitedir)/*.la || die
-		}
-		python_foreach_impl python_installation
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 0281a8825025..0f6c8cd785ce 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -7,7 +7,7 @@ DIST gnuplot-5.2.7.tar.gz 5335673 BLAKE2B 6ca3055f6bb2e032562c7f21beda0adca10875
 DIST gnuplot-5.2.8.tar.gz 5340677 BLAKE2B 169f5bef44a64b3b7a5be40e28ea22ef24ebc7526fe13ab09e16495453c3922712603d63a03c3b4332368d2ae8cbe4ef57ec53e18bbb4ad2cde13e4cc534245a SHA512 513dff15236dcb58c3c5471cdaa0713242787dbf30ef860c3f69152cb87c6392e4973caff5eb178707bbb84c78548e806b2920864a37686bce49425fbfdc4e8c
 EBUILD gnuplot-5.0.7.ebuild 5772 BLAKE2B fdf5b221701cd90e4dd63b7388cd3d0d7eb6b42e14d915d3c43e42bc26daf74b472a796f66223a7fd21ca835d0dcc42946f365f76a6dc5409e6c1c194ab70a3d SHA512 174d485b762c6402020bb3ee3112469ee71ede3a4d3ed3b14deaa6097066b9859e00ddbdb0bb384c4c5022806daae7e1b9d355643eafb6bb58e58006e19d10de
 EBUILD gnuplot-5.2.7.ebuild 5835 BLAKE2B 2e24c5555898aef38fcb45bf64cafe6a055d55377875d5d6ab60ff33a62570c71dc278b912b846349b4951bcd7dcbebc7babcb2064b3c54ebf67d403da768a33 SHA512 3549d714307ce3ab441e210a6e56ef9aa862240be2893e00254554bad570123666d1674a997eaa82582319c591f8fbb287f5d6748b1897db6426d8481c9e877f
-EBUILD gnuplot-5.2.8.ebuild 5853 BLAKE2B c19a82d8b67d705d058ff18ebcb9a534079a312a014a4c0c76c8ade8de080960e121ce96b38a982a9d61a89a44b4cfbfcf424c2eae0e72f27260d00455682507 SHA512 8e2faac332996da556930d83b178d583dbdf5042a4ca2e37f4d2a1179c9bc412476910c9c8a4c05828c2d9bb7b161e3a99d704db07edc74b297b27800873ff79
+EBUILD gnuplot-5.2.8.ebuild 5847 BLAKE2B 7fb11e4fa0ffc969286090c85af7a644ceac71f121c0d4cedaeaf7534b79c936618e0804a200c6fc445909c6ac4814162e67c6cfaed8400710ef45467977d459 SHA512 84a30e20777839cd97c135158c5e603239e566851588af9a4270f2df964bf53a5914ec49f2aaa598eba406f23a7b305a724a2025d6dad80feda4d32c50d620e4
 EBUILD gnuplot-5.2.9999.ebuild 5742 BLAKE2B 454aafd7166509cccd7711eeb54b2c0af3bbe136d235f5581a8d495944126f9ea4c8d201af1f02aa474a55a31bf023e5f59e61419ac44f4a7c698408b3306908 SHA512 dd5e3197892c2cc99d6fa41230286a3baa62ec67a6c5d2354ba2575ad04b6e779ae601674e11186e485ea34e7561720bbd1e87825af0f272bf14637146120939
 EBUILD gnuplot-5.3.9999.ebuild 5089 BLAKE2B 26f13dee72d3af9a555278fe3be6e5315f66b522f171e08e21fceaa2bb10b82f3895a7f57f12ad7e648b5907a0c161a997196a77655e9fa169a7a909d73d100b SHA512 06d013fc5ba85f85724b077831982e078ea9aa2db41160c6cf5d7f7b7671e5620d854af6af08d765b1ac4eb8b58e8777413e5bf72e9278f43106b04db10d62b9
-MISC metadata.xml 1267 BLAKE2B f3b0192ce2cd8d0fb10c2f4fb4bad9780f01746cb283c19e7ecc622c85470ed8a3b7193ca2f7abdee6fdb771719e0c0a9a8a5c7fd9320ef0dae1f1210e7e36cd SHA512 dc9f36a7f2ffb85eeafb41a2b5d0b61746ef3e1de049db18ba351108b887b4cf506ea871754918faae8b4989e5ee7dbfc9f7f48c5b9df55a3bbe782425dc0421
+MISC metadata.xml 1155 BLAKE2B eff192a398ceb9f9484a4fce82498a5eb657d7609c835843f964c8468c8d8a8f913e025413e4501affa15bf19c9eb7ee24153313f6d8f42b4f6f4284af081540 SHA512 1dfff9f997a870c33e455eb896949d0a379be4c20c93a92b2dc6c8495c08e98340ea1d254b40ee64c2520587869e529f7b33689fd1d157631da640179d5ed295
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.8.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.8.ebuild
index b38b2fc31c42..a230f96553af 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.8.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.8.ebuild
@@ -17,7 +17,7 @@ if [[ -z ${PV%%*9999} ]]; then
 else
 	MY_P="${P/_/.}"
 	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="gnuplot"
diff --git a/sci-visualization/gnuplot/metadata.xml b/sci-visualization/gnuplot/metadata.xml
index 6442566e482f..b258754a4c25 100644
--- a/sci-visualization/gnuplot/metadata.xml
+++ b/sci-visualization/gnuplot/metadata.xml
@@ -5,10 +5,6 @@
   <email>ulm@gentoo.org</email>
   <name>Ulrich Müller</name>
 </maintainer>
-<maintainer type="person">
-  <email>junghans@gentoo.org</email>
-  <name>Christoph Junghans</name>
-</maintainer>
 <maintainer type="project">
   <email>sci@gentoo.org</email>
   <name>Gentoo Science Project</name>
diff --git a/sci-visualization/gr/Manifest b/sci-visualization/gr/Manifest
index 24fed34ec38d..cbb9aad3625c 100644
--- a/sci-visualization/gr/Manifest
+++ b/sci-visualization/gr/Manifest
@@ -1,4 +1,4 @@
 AUX gr-0.50.0-qt-5.15.patch 652 BLAKE2B 0d945a678acf7e457ca848da770f442caa0e64dba984c073cf394903f08548e668935d4333f574429f93f415e2b74a225573f9aa0da594bd9358c79ca4fb94c2 SHA512 fc85ff4227c257cffe05925095d54451793f899013f9123bf5cc480ea2bb5e267a5067b862feebb000cee9a34781c283ad83fc8adee3b5ec9689d12c37699a5e
 DIST gr-0.50.0.tar.gz 8612608 BLAKE2B 70f4a3c6ce1dac8556646a1632667e6e464a5048f3c44fb689709e3e8218e8d7375db6ff8ce73e11dbeda559fb27c83b7f2b42f0ab518df9b464c8443748c30e SHA512 34ca077ae729e6eda0e5df7046811c77d717f3ef0e34203d6ab3a7f4b67b3aa058a68b9b2d7d78adc8b2f0830a0298778198a6499bd3d6e5697e4b7270cb648a
-EBUILD gr-0.50.0-r1.ebuild 1759 BLAKE2B f6d9fee994a2c3d7662b4774707c9a29bc0ed134f7a40ec115172867e2fe92f02e0132ecaa4ca1099a1d1614d41e9afbcb05824b5cb9c3f3c5425d55dc24d970 SHA512 b772317223cd5c5413d3ffab4aebff8e5ba1df95c41197e6feba517c6743a9bfea11b6a64e62046cfd18811cc9e44620db03caea6ff956f2ea6a203fbed3d7e1
+EBUILD gr-0.50.0-r1.ebuild 1931 BLAKE2B 9e69242b9e62499502f7eb6a456806452c9724143c15bcec2bb4330eab983c50879be3d8d5aa92d6b363a2f6104fe07a6bfb589004b2170aad00d8e24cc4d194 SHA512 ed83ed28a05f861d695cc4acc2bf18ca1f6d919c75cd3235064506d3e88a19cf2b4f7b5f070d54bd75519bb9f3af9f77df7ac69752390870961ac53c2a556fe4
 MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2
diff --git a/sci-visualization/gr/gr-0.50.0-r1.ebuild b/sci-visualization/gr/gr-0.50.0-r1.ebuild
index b15a75608877..82f6df9f2ae1 100644
--- a/sci-visualization/gr/gr-0.50.0-r1.ebuild
+++ b/sci-visualization/gr/gr-0.50.0-r1.ebuild
@@ -68,4 +68,7 @@ src_install() {
 	doenvd "${T}/99gr"
 
 	dosym ../gr/bin/gksqt /usr/bin/gksqt
+
+	elog "${P} relies on the environment variable GRDIR. If you want to use it in a running shell,"
+	elog "e.g. with dev-lang/julia, then run \"source /etc/profile\" first."
 }
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 83652c1f534f..bd51a38e0338 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index d2c386fe213a..b4099f920dbd 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -3,5 +3,5 @@ AUX accountsservice-0.6.50-loaded-state.patch 1579 BLAKE2B 40c5f1a641967fe24b740
 DIST accountsservice-0.6.50.tar.xz 384484 BLAKE2B 52c06ba85498f292204834f967211d8f0940786dc2ea3070124d3aecccd551375bfbc8fc31f23a2c3c86e23359294307656c3b927c4e819fc102d8626ae0dd82 SHA512 6e07cd318452b1cbedeacd729f0ebb200525caf1b09981abb2bac16fd90756a790ebec08aca0a0cea016f14ab27c159a68fe1332ef4bc636c5863b8c61040f64
 DIST accountsservice-0.6.55.tar.xz 97972 BLAKE2B aba3adfeb53e64455ce8e672b9db754bae4af6b4de0823cc021d0311a381ec40af04371e78f7c84eab7fb72356b26e22db78aad0343d57f65ea71a7742b51fc7 SHA512 c12e6a8e80f9b087f97238da4734d2d3a14a7c5cbd870a32a04b00116f176c818c39fb886f6dc72c3e93c136b0c2074ddf8f77e20431fa3bd54f138bea9d262d
 EBUILD accountsservice-0.6.50-r1.ebuild 1614 BLAKE2B 186817bfa9e51d665a856831cbcb537e3c671eea3f7eaa14d7549696720e6977e5b9ede900ec9656f916ebc809eb226da1e8210c9503b724db30462ca4592711 SHA512 fb1187baf22340be9c98adbfdc143288ef2e1bc4e08dfbc1c368e5718b398d6bd6f9816795760693b078cd3057d79c8ecb70dbb4581484296c761aff84088bcf
-EBUILD accountsservice-0.6.55.ebuild 1776 BLAKE2B 4282250f72efde99b74ce61ae7b5f6034abca3d6afe4ae1c282977a7f2c35f45cc36ae35354cb44b3822ac38fe3d590fc146c24e5c5fa7182e526720d13b19cb SHA512 702f9d5c2f1a182a9ff9e20483cf24945e65d23324ee3e707021be8080bb236c35df7fe2ad2f195944aeaada4dcb004f6ed0139171918b39434a9c27059f4aa5
+EBUILD accountsservice-0.6.55.ebuild 1773 BLAKE2B 3a2cb1891170494b531740577bccd987bcb98236a0178a0ad8e6030f3159fccd07dd51b5032ba64a238166941ff2b8046ae3b6de1137893e7f2bbdee9c19232a SHA512 65e9f962aff10e586ba6c8db8945c7df48733145d2c0d88c5904ff7e011968e3a8912351be9002444bc7363032b17374b7fd3fe31c1ef1435b4ea7bee5c40680
 MISC metadata.xml 523 BLAKE2B 6117c5e7b8e0120bbae31e46c4d1e3709111638afa43c18d000c975ea0fded590ecb9404e10eca2542b5262cb122be9e34d140b6b3101ad69321cbc2f73a5890 SHA512 41c7b3374cfc02ddd842f13c25039abf016fdc110716cd9f308c4d9050a793c8506d6459c3604eae946184f3d08b2848d63b1bf65eb845f9a551c27debf1794a
diff --git a/sys-apps/accountsservice/accountsservice-0.6.55.ebuild b/sys-apps/accountsservice/accountsservice-0.6.55.ebuild
index 8b9e10e0aa64..78a9dca8f4b9 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.55.ebuild
+++ b/sys-apps/accountsservice/accountsservice-0.6.55.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="doc consolekit elogind gtk-doc +introspection selinux systemd"
 REQUIRED_USE="^^ ( consolekit elogind systemd )"
diff --git a/sys-apps/biosdisk/Manifest b/sys-apps/biosdisk/Manifest
index aef44fd2f74d..09d9d460bc10 100644
--- a/sys-apps/biosdisk/Manifest
+++ b/sys-apps/biosdisk/Manifest
@@ -1,3 +1,5 @@
 DIST biosdisk-0_p20171116.tar.gz 712587 BLAKE2B f09a8c68f57cddb1949d369cfc18d1216c3e64612a7074c58e6c50c12682fce92a4d6295810d5358fac0340483387f14059811a5681ae4f37c7da8e40c34fec4 SHA512 27d99990d0e92f1295d2ddb949214946db681e7f80c6606b252473fe7b5b0d3254180b54cb26479c9014219f6b989aa6ba29e8a818f3801f9ccce4efd2f1c3b9
+DIST biosdisk-1.01.tar.gz 214715 BLAKE2B 1a42523d0ec713a895276e3ca3b383206bb841c59bf789eb2b869ce3ade6bfde1e96d47afb8874eec5efec1ef4d404c093a707e36d2d9ab785211fa62abb5782 SHA512 f1920a0eee0a1f8530488c5ccd3f37b36170150b7658658af55beb41c2084c66b6d6bded6e144e36dd9d74f963881c504d7869bbe5c8b57749bff4d918581537
 EBUILD biosdisk-0_p20171116.ebuild 971 BLAKE2B 19cc49a6fcf3e44298bf55c46edbe819dcbf1302fb8cbbae83831d6072bd31ecdeaca73695b01138ce42d65e05cfe3930c983a7d226de232c33da2f3f607fa31 SHA512 87024d007d88014c0ac837cbeaaecc24b453e596329f0f2d8a212b0243a79c437e272cd15cabb0afaeb8f2bf06969c1e4f1d92fd0d59ea2433b059aabb112627
-MISC metadata.xml 357 BLAKE2B 5fffc76231bdf56fba8728b3bef780c099b238aff410365f27bc13b408eddcc05259565e08e208522abb2631bc00929b56c8df7ced22e73bc311143bc0c772ec SHA512 dcd11ab94a75f3988677ef2e82929b37ac465764f2f040a0e11083ab3a2e7ef54215cb5628e7b4f65cc166adaec19d5ffb386700e16b5f56a4a68d8c5205b0b4
+EBUILD biosdisk-1.01.ebuild 588 BLAKE2B ca0d2e385dbf7138407ddb9ce60e4eb0ff8ff22e351a3ebf68d223c23490003721035bb54d2b128a419400f4b29312d2ee9d28e62ff032271000991dfd93dc19 SHA512 e81b6743cc3570f7ea0a903ea13d8f044eda3d538df6b5a3973ef4d943ab1c261832306c65bc4642e6df1e21724f5bc1f1add61b29531ea17f27744e26851f9c
+MISC metadata.xml 245 BLAKE2B 9d48c927e5844df237d0d7c23fe22d6b1896b0369c41a9c7d62c6ff09ccd0937de415f743270a074b9d389a6ea0c10933b9701a264a2ce155899ec2535f6bf0c SHA512 77077cbe810752d5fb24ae88ff5d9a00a175d7d043e95268d69b1f461546d9bf9053273e5d5bc3ba9dc80641b0ef908f8d189d7f51602f0c6786d04c8c991bfa
diff --git a/sys-apps/biosdisk/biosdisk-1.01.ebuild b/sys-apps/biosdisk/biosdisk-1.01.ebuild
new file mode 100644
index 000000000000..f4ae904c895e
--- /dev/null
+++ b/sys-apps/biosdisk/biosdisk-1.01.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils
+
+DESCRIPTION="FreeDOS based BIOS updating utility for Dell machines"
+HOMEPAGE="https://github.com/dell/biosdisk"
+SRC_URI="https://github.com/dell/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-cdr/cdrtools
+	sys-boot/grub
+	sys-boot/syslinux
+"
+
+src_prepare() {
+	default
+
+	sed -e 's/biosdisk.8.gz/biosdisk.8/g' -e '/gzip/d' -i Makefile || die
+}
+
+src_install() {
+	default
+
+	keepdir /var/lib/biosdisk
+}
diff --git a/sys-apps/biosdisk/metadata.xml b/sys-apps/biosdisk/metadata.xml
index abf4a100a13d..b9de019cb593 100644
--- a/sys-apps/biosdisk/metadata.xml
+++ b/sys-apps/biosdisk/metadata.xml
@@ -1,12 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>mattsch@gmail.com</email>
-	<name>Matthew Schultz</name>
-</maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">dell/biosdisk</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index bb532550ce2b..9ac5f8222606 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,7 +1,6 @@
 AUX 80-dbus 341 BLAKE2B 20849eb7c526475d3ff96766ac7183608aa51e5c069f07cf282a2b4d884b2a8580aa88cff182d54ef75aaa747848f3dbcc0bd0bd5da124e4a259851878c73b00 SHA512 fa019d903e5412d0c47dade4299995e9baa8b86d74ebc0b42967137762bc476628af57f8a6c354660fce731c33a49a66027cd8b5a25be4d898b7d1662c600e89
 AUX dbus-daemon-optional.patch 2701 BLAKE2B 28054bf147ffc29d893017dd9b8a6c9b3a032c31ec1860c38c7a54910b3fe8da2a9bce175d01fab1c224008ba38e1981dfc161fde80f725096e644495740052e SHA512 6d07220d8c80c49057396dc76d808cad2c995cce259544e8435d0c8fe328f85ac3a7da5a88209f80a127a04b48591ac20fe661683665adca2af75fedd2563bf2
 AUX dbus-enable-elogind.patch 2801 BLAKE2B c9ef41ff7b31af6cbaf28ca16974fb62aa0f2492f1c6970b41216758768d1139d2ce9aabbb3aff952d625b0decd1e8c2b25f79bb0a13c146aa9453dd4f7b5c5a SHA512 84c5eacc9c305ce1fa9f7a50407b7e836a20c679273cef06004ff57665c27818d2c33e0cfa9ea91ae89c50da4f7b9a92077e607f0f17b9300892d16e881a7d9a
-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
 DIST dbus-1.12.18.tar.gz 2094453 BLAKE2B eba48940c80a7483b858199156b297d97896232283988940d3cdb915eaa30bcdd13bc01f8410dcdb34193040a8bc8ce2dd45f1310aed791071e5dc5a6b38eb27 SHA512 817674e86a5d4cbfa705a79ca5197176311e47505c5da02334c2811f63b55014b582a12bce53bc73a08a3ad5061f210ba0d1e5f3bbf7697c81ca70c22a76fc13
diff --git a/sys-apps/dbus/files/dbus.initd-r1 b/sys-apps/dbus/files/dbus.initd-r1
deleted file mode 100644
index bd3542381a7a..000000000000
--- a/sys-apps/dbus/files/dbus.initd-r1
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-extra_started_commands="reload"
-
-description="An IPC message bus daemon"
-pidfile="/var/run/dbus.pid"
-command="/usr/bin/dbus-daemon"
-command_args="--system"
-
-dbus_socket="/var/run/dbus/system_bus_socket"
-
-depend() {
-	need localmount
-	after bootmisc
-}
-
-start_pre() {
-	/usr/bin/dbus-uuidgen --ensure=/etc/machine-id
-
-	# We need to test if /var/run/dbus exists, since script will fail if it does not
-	checkpath -q -d /var/run/dbus 
-}
-
-stop_post() {
-	[ ! -S "${dbus_socket}" ] || rm -f "${dbus_socket}"
-}
-
-reload() {
-	ebegin "Reloading D-BUS messagebus config"
-	/usr/bin/dbus-send --print-reply --system --type=method_call \
-			--dest=org.freedesktop.DBus \
-			/ org.freedesktop.DBus.ReloadConfig > /dev/null
-	eend $?
-}
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index cc1d7b4f004e..18fe50194b8a 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -2,12 +2,16 @@ AUX file-5.37-CVE-2019-18218.patch 1038 BLAKE2B 30622d39fb4006b07fabab70dfe6fc3f
 AUX file-5.38-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch 1184 BLAKE2B a2b6a11c1d89ac5683422e9d9734990d5b54dc14cc295853920c5ebfe28a5de2055c889d5f708ab55d8e292a514ce51fdbd260f0e15dce74ee048fe0f8a7d93b SHA512 7a710d32232d3484923937add7dd56e6d4c6160e32da4d65cb9b4083fbc85df229af108728f3cdf9313291bdf96259c7471c1b6c4b3548033205de47e0280e6c
 AUX file-5.38-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch 823 BLAKE2B c2d4c40224d2fa3db4ca0069e1f5bf111cc782879c97f642d91dc4d545544af22ed11bade5c014494838d75ac8e4d607009af77d0dc9d3457d1eb28d8e2ea192 SHA512 4ddc901be88b61ab860817daeb9f4021a6dff1473d0a64ff6409b8327e07011b1d86f2a2c54e1751d03518fa5def25fed644c1a6cd691f2737b526e43098603c
 AUX file-5.38-td-is-for-ptrdiff_t-not-for-off_t.patch 813 BLAKE2B e0d0168f41eb868131cbed1e657f4a1e4f4d1f29d22f4a4685b43a6bece5a9229a25a1d96bbc4deca065dcb6342d388ebe86e984e3dda66729f974bcc4e7a32b SHA512 eae1267cf6f49d448cad51f3ba97cd1f8598bebccc014b8702cf3ea330184718dacd1570f20efdd119951b55fe57729392197cb86f89dcce23654e745c846417
+AUX file-5.39-add-missing-termios.patch 813 BLAKE2B 6b65d89bcf6b3a5b7d125e05b951d7ea0e06ba821d06e3165a6fedaada07d4bb78a35f1fe541f741e88cc1f5e179215626db35d894bf7aab84b132b9e5afc29d SHA512 a1ee1fe9dab05057d962ba9f8fb811aff49794ca0e8f82bf582e17bba884c73e792230ed90450e16c4203aea7f20dd6cb26dd3a22ca66a19074c6a62fe794dd9
+AUX file-5.39-portage_sandbox.patch 668 BLAKE2B ed7556d2f602d848411a5252825401042bef816601f767bc2d24a8e84be7845c459d1149d9a5adfddb59843474dea0f52aead6c4a17ffb27dbd0c7cf14d9cc0b SHA512 c648b7cdd520a91f1c152e1d098db4a0d1877a473bddb5f8fa511b0f556d7a15b958451e071c25595fe1ac8c2a81b475846c13f415d861dc48184d6b19b8b7b7
 AUX file-5.39-seccomp_sandbox.patch 320 BLAKE2B ab7c89575e61cfcaa4072b33716f1aa9af437541e3248b329d6cb44c62581ab65c7b7d455f5e0bbe95103f15c24a54a15325af8947da614c83f9f4bad7148eb3 SHA512 3219903e1c3d9f8973515871f073b54bb3396550b308dcb307d0d8cdbd7d76bbc35417e9764c8d3adc257fdcb4a5c62aa136f5175c420c54b86ea03fede6b2d4
 DIST file-5.37.tar.gz 887682 BLAKE2B c5635e5de879af31cbef1c988275ab8620133909d146769b27a2f8eefa90871fad5fa75e66b9e1d77a6261e5d6dec315fb5a8ad587d8c214eaa0bc2e5a929fe7 SHA512 bf153c15aebdd00329806231d20f295077b8b99efd0181d01279bcf3734a1718567df38cf75bc929eb8015ac98d29bb4bf1228d7ece8bfdfe14dd976391dd06d
 DIST file-5.38.tar.gz 932528 BLAKE2B 08d8d56e2e1b6a0c9fb0caed89ca6145bf683ecc52a639c036ded01b913e7eea75d9235851a2fbd410cbc9b929c26579b06fe1d54fb73817c951bef3544bc345 SHA512 9eeeba69cbc9f0c00a0bdf9eaf60c73a4a709e797068f109d85c1ef2a19c8b0e012ecd73714f03cbb1770dfa717e8a661ad746b644cc030cafbfb1f7aac35a40
 DIST file-5.39.tar.gz 954266 BLAKE2B 4d6d9a6317961e0a2aa391f502b0be8bbb40ede57c3470230d91aaf9ce5d35bcaceb32d551ca5a391fc8c40b64517fdb996833a8b1ca47ced7e92e9e545d2682 SHA512 9cf1a7b769c56eb6f5b25c66ce85fa1300128396e445b2e53dbbd8951e5da973a7a07c4ef9f7ebd1fe945d47bdaf2cd9ef09bd2be6c217a0bcb907d9449835e6
 EBUILD file-5.37-r1.ebuild 3186 BLAKE2B ae1dc50d4a3e863b7ad9e1732c96b75c97d780bd7b42a34b3cdf8559e21e55724df58e5cb0ec54d1ce33c33c180755803b4545fdec3026a66f364b4436610328 SHA512 58fe1683e40742719d76cb17e0d8cebbf04de75fe1c8d4c4d8873ed75c0a0f1a4f196fa74c182c170ef00a19e42e9e892ef0ce68ef7709194f55cddb0f382eb1
 EBUILD file-5.38-r1.ebuild 3397 BLAKE2B 7cd1c545d4df9e9f448a07ae492df789fe2503c81dc7ec1bf530904099a0ec25789e205e33c725feeb03671f2fab11d04052a161c895f42e7fa2994aea316002 SHA512 baef4c52a5e40e35a3cb1717f78ecb066a10513c1e75e2c69e9ac381c58fdaf1cdb935cfc51720c382ecead25ea485163d544ba6ca19ece6dc556ec7e75c32c1
+EBUILD file-5.39-r1.ebuild 3291 BLAKE2B ae8369b3553dd3b7813b3f45cebf7334e9508deaa4c0a6fbfcc0e3df5caf0111ba3943b788f18cfab3b74238c1e95f97965775c536060516f2ed83a4a3e720f6 SHA512 2ff57e9b96bfc89a77d848e75d9420699999f6c73f12a1282877cd4f3b64454b3249cbb151b4078984454eed13c824956b4edde6f4d238cc7eb83131ef887c4e
+EBUILD file-5.39-r2.ebuild 3345 BLAKE2B 42e68fc14e26709f9f4b92f05f7f0e9ce78c83b41b05bc51c7e706282c40088b14c1efd6a394ecee611871f4e6d5279ba59802f0a28a0cff1320cc4fc073dbbb SHA512 a00a867a66f5a0ddd91cc3de97c425d2103e8823d0b38da75d8cf5d4eafa009b2043c78e37b931ed9b52996931524b601c76423efd4c27dd0395ac3d333578c8
 EBUILD file-5.39.ebuild 3283 BLAKE2B de652a223726670f67d97998e9285b4b997ea3809ac76a41618d9295f2635833ea98e0e93c8cad47c5531cf2babe83bbf1b6b7a20c1e9f9f862ac99a607c50d1 SHA512 17cc98d07cad36198d8069d35ef36f973290402db72561ca42c0c935d61acf6592eb8d2fa5550c457e738bcea2bbebc233870932ea4a37508fd2f0adf4ca51a1
-EBUILD file-9999.ebuild 3283 BLAKE2B de652a223726670f67d97998e9285b4b997ea3809ac76a41618d9295f2635833ea98e0e93c8cad47c5531cf2babe83bbf1b6b7a20c1e9f9f862ac99a607c50d1 SHA512 17cc98d07cad36198d8069d35ef36f973290402db72561ca42c0c935d61acf6592eb8d2fa5550c457e738bcea2bbebc233870932ea4a37508fd2f0adf4ca51a1
+EBUILD file-9999.ebuild 3291 BLAKE2B ae8369b3553dd3b7813b3f45cebf7334e9508deaa4c0a6fbfcc0e3df5caf0111ba3943b788f18cfab3b74238c1e95f97965775c536060516f2ed83a4a3e720f6 SHA512 2ff57e9b96bfc89a77d848e75d9420699999f6c73f12a1282877cd4f3b64454b3249cbb151b4078984454eed13c824956b4edde6f4d238cc7eb83131ef887c4e
 MISC metadata.xml 381 BLAKE2B 242f4a2403d0a4c69c7ff400fdbd447bb7fb8572dc57dc05f3edd0c875da68433217bec46d43467fa03c5e9ec69616e3450635ff2662ae3ed830a138521e23ab SHA512 f69d67890ecb0b574d414c432df12f6e8d31ceb7755055683941017563da8713d07728e49cd4a7277699a97cd3ba732c946ecf5435cee94778a0d5652e7d6857
diff --git a/sys-apps/file/file-5.39-r1.ebuild b/sys-apps/file/file-5.39-r1.ebuild
new file mode 100644
index 000000000000..8333fd922e2c
--- /dev/null
+++ b/sys-apps/file/file-5.39-r1.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..9} )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools distutils-r1 libtool toolchain-funcs multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/glensc/file.git"
+	inherit git-r3
+else
+	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="identify a file's format by scanning binary data for patterns"
+HOMEPAGE="https://www.darwinsys.com/file/"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="bzip2 lzma python seccomp static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	python? ( !dev-python/python-magic )
+	seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.39-portage_sandbox.patch" #713710 #728978
+)
+
+src_prepare() {
+	default
+	eautoreconf
+	elibtoolize
+
+	# don't let python README kill main README #60043
+	mv python/README.md python/README.python.md || die
+	sed 's@README.md@README.python.md@' -i python/setup.py || die #662090
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-fsect-man5
+		$(use_enable bzip2 bzlib)
+		$(use_enable lzma xzlib)
+		$(use_enable seccomp libseccomp)
+		$(use_enable static-libs static)
+		$(use_enable zlib)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+build_src_configure() {
+	local myeconfargs=(
+		--disable-shared
+		--disable-libseccomp
+		--disable-bzlib
+		--disable-xzlib
+		--disable-zlib
+	)
+	tc-env_build econf "${myeconfargs[@]}"
+}
+
+need_build_file() {
+	# when cross-compiling, we need to build up our own file
+	# because people often don't keep matching host/target
+	# file versions #362941
+	tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
+}
+
+src_configure() {
+	local ECONF_SOURCE=${S}
+
+	if need_build_file; then
+		mkdir -p "${WORKDIR}"/build || die
+		cd "${WORKDIR}"/build || die
+		build_src_configure
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		cd src || die
+		emake magic.h #586444
+		emake libmagic.la
+	fi
+}
+
+src_compile() {
+	if need_build_file; then
+		emake -C "${WORKDIR}"/build/src magic.h #586444
+		emake -C "${WORKDIR}"/build/src file
+		local -x PATH="${WORKDIR}/build/src:${PATH}"
+	fi
+	multilib-minimal_src_compile
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_compile
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		default
+	else
+		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog MAINT README
+
+	# Required for `file -C`
+	dodir /usr/share/misc/magic
+	insinto /usr/share/misc/magic
+	doins -r magic/Magdir/*
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_install
+	fi
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sys-apps/file/file-5.39-r2.ebuild b/sys-apps/file/file-5.39-r2.ebuild
new file mode 100644
index 000000000000..204826c0d4d5
--- /dev/null
+++ b/sys-apps/file/file-5.39-r2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools distutils-r1 libtool toolchain-funcs multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/glensc/file.git"
+	inherit git-r3
+else
+	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="identify a file's format by scanning binary data for patterns"
+HOMEPAGE="https://www.darwinsys.com/file/"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="bzip2 lzma python seccomp static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	python? ( !dev-python/python-magic )
+	seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.39-portage_sandbox.patch" #713710 #728978
+	"${FILESDIR}/${P}-add-missing-termios.patch" #728416
+)
+
+src_prepare() {
+	default
+	eautoreconf
+	elibtoolize
+
+	# don't let python README kill main README #60043
+	mv python/README.md python/README.python.md || die
+	sed 's@README.md@README.python.md@' -i python/setup.py || die #662090
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-fsect-man5
+		$(use_enable bzip2 bzlib)
+		$(use_enable lzma xzlib)
+		$(use_enable seccomp libseccomp)
+		$(use_enable static-libs static)
+		$(use_enable zlib)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+build_src_configure() {
+	local myeconfargs=(
+		--disable-shared
+		--disable-libseccomp
+		--disable-bzlib
+		--disable-xzlib
+		--disable-zlib
+	)
+	tc-env_build econf "${myeconfargs[@]}"
+}
+
+need_build_file() {
+	# when cross-compiling, we need to build up our own file
+	# because people often don't keep matching host/target
+	# file versions #362941
+	tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
+}
+
+src_configure() {
+	local ECONF_SOURCE=${S}
+
+	if need_build_file; then
+		mkdir -p "${WORKDIR}"/build || die
+		cd "${WORKDIR}"/build || die
+		build_src_configure
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		cd src || die
+		emake magic.h #586444
+		emake libmagic.la
+	fi
+}
+
+src_compile() {
+	if need_build_file; then
+		emake -C "${WORKDIR}"/build/src magic.h #586444
+		emake -C "${WORKDIR}"/build/src file
+		local -x PATH="${WORKDIR}/build/src:${PATH}"
+	fi
+	multilib-minimal_src_compile
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_compile
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		default
+	else
+		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog MAINT README
+
+	# Required for `file -C`
+	dodir /usr/share/misc/magic
+	insinto /usr/share/misc/magic
+	doins -r magic/Magdir/*
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_install
+	fi
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild
index 98499a3c73df..8333fd922e2c 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-9999.ebuild
@@ -37,7 +37,7 @@ RDEPEND="${DEPEND}
 	seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-5.39-seccomp_sandbox.patch" #713710
+	"${FILESDIR}/${PN}-5.39-portage_sandbox.patch" #713710 #728978
 )
 
 src_prepare() {
diff --git a/sys-apps/file/files/file-5.39-add-missing-termios.patch b/sys-apps/file/files/file-5.39-add-missing-termios.patch
new file mode 100644
index 000000000000..e6cba0d4c28c
--- /dev/null
+++ b/sys-apps/file/files/file-5.39-add-missing-termios.patch
@@ -0,0 +1,27 @@
+From 769e9868c17a471323b81b12cab851c9fd22baf4 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Mon, 15 Jun 2020 14:18:45 -0700
+Subject: [PATCH] add missing termios.h include
+
+on ppc, TCGETS relies on struct termios being complete, on other
+architectures it does not.
+so termios.h should be included before ioctl.h
+---
+ src/seccomp.c      |   1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/seccomp.c b/src/seccomp.c
+index e667adf..296f5b3 100644
+--- a/src/seccomp.c
++++ b/src/seccomp.c
+@@ -33,6 +33,7 @@ FILE_RCSID("@(#)$File: seccomp.c,v 1.15 2020/05/30 23:56:26 christos Exp $")
+ #if HAVE_LIBSECCOMP
+ #include <seccomp.h> /* libseccomp */
+ #include <sys/prctl.h> /* prctl */
++#include <termios.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <fcntl.h>
+-- 
+2.27.0
+
diff --git a/sys-apps/file/files/file-5.39-portage_sandbox.patch b/sys-apps/file/files/file-5.39-portage_sandbox.patch
new file mode 100644
index 000000000000..ff2caed413fc
--- /dev/null
+++ b/sys-apps/file/files/file-5.39-portage_sandbox.patch
@@ -0,0 +1,28 @@
+From 7e1d9d51329a0e0f3d9cd1dbc3f9509251950e81 Mon Sep 17 00:00:00 2001
+From: tka <tka@kamph.org>
+Date: Wed, 24 Jun 2020 11:18:45 +0200
+Subject: [PATCH] Allow getcwd for Gentoo's portage sandbox
+
+Gentoo-bug: https://bugs.gentoo.org/728978
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ src/seccomp.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/seccomp.c b/src/seccomp.c
+index 68c56485..af55918e 100644
+--- a/src/seccomp.c
++++ b/src/seccomp.c
+@@ -227,6 +227,9 @@ enable_sandbox_full(void)
+ 	ALLOW_RULE(unlink);
+ 	ALLOW_RULE(write);
+ 
++	// needed by Gentoo's portage sandbox
++	ALLOW_RULE(getcwd);
++
+ 
+ #if 0
+ 	// needed by valgrind
+-- 
+2.27.0
+
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 036b696cc14b..62f50af96ffd 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,4 +1,3 @@
-AUX 0.9.50-contrib-fix.patch 1446 BLAKE2B 934a1d2cfcdb070317bb47b6b451fe979279f5a4600a49ce2d79642479e5b649f5103d732aaa40ab2dbb8dcd563c75a5b0f048ae805134eef6d4afe52174b972 SHA512 04c88fbaa37c677efef1805c6b0bca6d87742acf5c80b047844e776e51c02c8803d2588a5dde74817b0cbbf6ce9d239ca39a823df1928ef36f232b403fb41889
 AUX firejail-compressed-manpages.patch 598 BLAKE2B d9b39a043a4d9219e1a8413c04aa77ec971d572b43112d6d2481796f237f00bf3927ea77fd84f15cb0c3c8c4e60549c7cbe0e26181b348408a9b873f1ae03154 SHA512 3f488582ff46ee8e87a4752c073b8f8ae4c07b2262e7bdbc9b5dc54f6b94323fbbebb7fadcbb112bc7d0d9a4a29a8f898209e8940c78127749e1006569120230
 DIST firejail-0.9.60.tar.gz 1067102 BLAKE2B c5fd9a9c60fe17fc7ae24946ae5ea2f666d1dd20d982c540783dd2e56d30859a24258c4f3426e2bafaff3530557f5865bc73af9573e399039e8d5b097e5cddee SHA512 cb3eeff2f77801b4593a719a6b63da09cdc6c7f96f8ea8ea1aaa7e8538b080421a284441c6e43ce036fdf8510e08a73816c58d22f0af048344b8752f4a02759a
 DIST firejail-0.9.62.tar.gz 918477 BLAKE2B 8654539a6a115b6f69ea94a0b699c9129cfcecaf3d478409eaf288b953563768716eae9b9a83ddc538249322daa62a764bc2eb286eddaa14fc0e5fa887c0e319 SHA512 dfdbfbffdcb9a239e071983035d57350440eb58d79bb4375bc1fe585471a260c8b090bea59ac939739ac3daddf296c041ab4cc47ebbf718b0c9deae47f16af9f
diff --git a/sys-apps/firejail/files/0.9.50-contrib-fix.patch b/sys-apps/firejail/files/0.9.50-contrib-fix.patch
deleted file mode 100644
index 7192bba34807..000000000000
--- a/sys-apps/firejail/files/0.9.50-contrib-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur firejail-0.9.48/contrib/fix_private-bin.py firejail-0.9.48.new/contrib/fix_private-bin.py
---- firejail-0.9.48/contrib/fix_private-bin.py	2017-05-24 23:01:32.000000000 +0100
-+++ firejail-0.9.48.new/contrib/fix_private-bin.py	2017-08-27 23:19:52.868481040 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/env python3
- 
- __author__ = "KOLANICH"
- __copyright__ = """This is free and unencumbered software released into the public domain.
-diff -Naur firejail-0.9.48/contrib/fjclip.py firejail-0.9.48.new/contrib/fjclip.py
---- firejail-0.9.48/contrib/fjclip.py	2017-05-24 23:01:32.000000000 +0100
-+++ firejail-0.9.48.new/contrib/fjclip.py	2017-08-27 23:19:58.476562539 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import re
- import sys
-diff -Naur firejail-0.9.48/contrib/fjdisplay.py firejail-0.9.48.new/contrib/fjdisplay.py
---- firejail-0.9.48/contrib/fjdisplay.py	2017-05-24 23:01:32.000000000 +0100
-+++ firejail-0.9.48.new/contrib/fjdisplay.py	2017-08-27 23:20:01.932612762 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import re
- import sys
-diff -Naur firejail-0.9.48/contrib/fjresize.py firejail-0.9.48.new/contrib/fjresize.py
---- firejail-0.9.48/contrib/fjresize.py	2017-05-24 23:01:32.000000000 +0100
-+++ firejail-0.9.48.new/contrib/fjresize.py	2017-08-27 23:20:06.932685422 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import sys
- import fjdisplay
diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index 78831fdf7507..3b2b3737927e 100644
--- a/sys-apps/flashrom/Manifest
+++ b/sys-apps/flashrom/Manifest
@@ -1,6 +1,6 @@
 DIST flashrom-0.9.8.tar.bz2 473902 BLAKE2B c127a41c2857ae2e1564777b49b1eff17e2e931c8a2417e738e8188871a6ce4e0fe6a0380c2139aaa906f299ca833563df895aa5fd1af333b24bf7467de0dc8f SHA512 1a1c4513bac7cdf91326ab68b822034101e688bfab0dc0b5698f664fc766027229128c55eed94f302cac05d949647cdec6a103a423c3861b047cf0ff7cc0b509
 DIST flashrom-v1.2.tar.bz2 366995 BLAKE2B 091e01a91e12b486154ace334a5e74bccbb5f5311ad76e37f43a28167080757873d8c78b8f549d2e77eb984922c830895ba955b23eb6ee4fc24f1ffed259954b SHA512 8e01395a54d0d1344bc55e7e4975f43bb8e59ebe83fb5f2766d14f76756d718b487254ce9a19ef4093aed04fb9d40fff5fe8f709b18c512f6e6fad894f83d7b8
 EBUILD flashrom-0.9.8.ebuild 4186 BLAKE2B 16f9f031ff5e2e6509ac875fecff28765b6887cc215a59af53297b75cbf724f988f22981c669ae7e196bd37644d123bca7924f3f271c33718279074c6c073a39 SHA512 060e93fc378994d2168b0deb196ef9f7c4fc8af52ffed9210742539eaff8a656e8eb97b28b8fc708256231b1077433ac381c097b0966c5b64573a054d088894a
-EBUILD flashrom-1.2-r1.ebuild 4525 BLAKE2B af163c66773928b9d1047f2edf32a5b7583c0642741bf7af17d9a4722667b803a00767fb7cc54d1154f84fbc59388bcccecc796ac593dfab29fbdab712590419 SHA512 4ed66130386c05ec66a3f1895f32a164e002b61b7613bd93a3b2c19593aab233f4dd9d35a0be555d8ae944a30e72adc1ce07368da6994d2d9a001dea06501b4b
+EBUILD flashrom-1.2-r1.ebuild 4520 BLAKE2B d00007833d23c42b7b59cc1503565e75037d7f4dc835f79c280299a2818bb5ff2f48868958940a237ef52721f971a1c055f0ef35c0167ef263b5ef36232266d9 SHA512 9c7a87c29bf7f57ff9878127c8b38d21d97f3019e0a350e64d7271a208253d85091addff5799e6e947182490a8494f6743e2e2029d3b4ae6d5ab9c9b14900d3f
 EBUILD flashrom-9999.ebuild 4423 BLAKE2B fc758295685fea683f2b7bdc07dc307525571b00745ced19910a95117a033964d037da53b86ddca9482c96b8dcb6f54e46eb6401e17e5268f2b565ed89bf6ee6 SHA512 b2ef614c5bee6c83a510306823ae34b2e32e8d03726479b6ceb89f29e51c2f9d6a91f7e6c1f24166fe572094299b3bbc49047ae4c865d3ca994be233cfa7d90e
 MISC metadata.xml 4595 BLAKE2B 0a7c4f212c57dccca72a7da1172b8eb36a7027703fea6137be5eefbadf5592abaa6e9841befa3e8f8ef65b1b5057af3c0f162584f0db65addd362a0a8880e648 SHA512 25b118e1150b405d34081add86fa02c04094ada970ea2a121bf21a3047d1df2566383549df7d0138883bcfed31c2574a420e9357dccce993c93179e3e769b8ef
diff --git a/sys-apps/flashrom/flashrom-1.2-r1.ebuild b/sys-apps/flashrom/flashrom-1.2-r1.ebuild
index 1415e8435f73..e984e762420a 100644
--- a/sys-apps/flashrom/flashrom-1.2-r1.ebuild
+++ b/sys-apps/flashrom/flashrom-1.2-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-v${PV}"
 	SRC_URI="https://download.flashrom.org/releases/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/fwts/Manifest b/sys-apps/fwts/Manifest
index a978938e61a7..58e05e009c91 100644
--- a/sys-apps/fwts/Manifest
+++ b/sys-apps/fwts/Manifest
@@ -1,3 +1,3 @@
-DIST fwts_17.02.00.orig.tar.gz 3489625 BLAKE2B 04133b8fe251923b5cf4e146bd52d3d102c3080629a85c0205fd6aeb19b315f10657da28dc7de37ae4601599dc7033354268b88bb0768b56550fe1606bd000bf SHA512 1dcbd7f120b5c09127f1242d41d7cf5ec15e6b049fb0b0590fec221849c0195a18ee4b07b66c1de29cbb241ef39f6e11c26dcd2bc7c0a4c23bf2efaec5372b70
-EBUILD fwts-17.02.00.ebuild 1126 BLAKE2B 49e4a42f531c778bc118fd8c7fef09c756cc395fce3426c406bbbd274620f7344359bce0ce1c4b1918a6839ec7caddbdff4dabe072be9735433607ff7ac1736e SHA512 ddb18c63d887e1d3abd3a2def0d3267f76ca70de59088ff25ad05660e261ed276bd3699835bc2719d5ba3f15a5c1891f86745132e02aa38fb89fadc2120e7174
+DIST fwts_20.05.00.orig.tar.gz 3817917 BLAKE2B 10365979a1b6bf2768930e144baa3982d462f05b77b1ca81116f7b44b80487924f37e097e46602c49696e987d9061a1917e3613e016bdb126146d880699c38f8 SHA512 4f68f6fc8351024e877e6fa6c9b856c7c3720348c1936f33fc8b455f5e85df83c9dc39a5c2dc16e106c851d4ac622f0a1d23b70f2b7726689f92077dbca5d82f
+EBUILD fwts-20.05.00.ebuild 1127 BLAKE2B c966a749987a9f5a23d7bb2ae3b7f506a5ace2bdab79851615d601cafd0aae20d2a845d89b064944a0c12076d6cce058604195ad266918dde1e8295eed241ede SHA512 4ce7fd15f1bd44644998be1b7d0913a6a8176bf3d76738077e1d793294b8d865aea579e386deba766b3d8080d5f2b08bf58722c6b0e950e8b990c62abf7951fb
 MISC metadata.xml 241 BLAKE2B f00f58ea265e1a7321a74a2e8a86824f7a1930a6e99162af446a1c1f831139711d626045b21215856a29e6ba4575bc38c7ab965ffb547757dbf4305235245039 SHA512 9a4d0499ef0c9cb67816755a3313bbba0b42f01b35d5d7da31dfe3e14a94fead3b8c202b95ffd4a9c5edbda7b046045b19095924b57a08cd97aacbda5bbd4550
diff --git a/sys-apps/fwts/fwts-17.02.00.ebuild b/sys-apps/fwts/fwts-17.02.00.ebuild
deleted file mode 100644
index f17665061e40..000000000000
--- a/sys-apps/fwts/fwts-17.02.00.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-DESCRIPTION="Firmware Test Suite"
-HOMEPAGE="https://wiki.ubuntu.com/Kernel/Reference/fwts"
-SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=dev-libs/json-c-0.10-r1
-	dev-libs/glib:2
-	dev-libs/libpcre
-	sys-apps/pciutils
-	sys-power/iasl
-	sys-power/pmtools
-	sys-apps/dmidecode"
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-S=${WORKDIR}
-
-src_prepare() {
-	default
-	sed -i -e 's/-Wall -Werror/-Wall/' configure.ac {,src/,src/lib/src/}Makefile.am || die
-	sed -i -e 's:/usr/bin/lspci:'$(type -p lspci)':' src/lib/include/fwts_binpaths.h || die
-
-	# Fix json-c includes
-	sed -e 's/^#include <json\//#include <json-c\//g' -i \
-		configure.ac || die
-	sed -e 's/^#include <json.h>/#include <json-c\/json.h>/' \
-		-i src/lib/include/fwts_json.h \
-		src/utilities/kernelscan.c || die
-	sed -e 's/-ljson/-ljson-c/'\
-		-i src/Makefile.am\
-		src/lib/src/Makefile.am\
-		src/utilities/Makefile.am || die
-
-	eautoreconf
-}
diff --git a/sys-apps/fwts/fwts-20.05.00.ebuild b/sys-apps/fwts/fwts-20.05.00.ebuild
new file mode 100644
index 000000000000..55aaf54db461
--- /dev/null
+++ b/sys-apps/fwts/fwts-20.05.00.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Firmware Test Suite"
+HOMEPAGE="https://wiki.ubuntu.com/Kernel/Reference/fwts"
+SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+	>=dev-libs/json-c-0.10-r1
+	dev-libs/libpcre
+	sys-apps/dmidecode
+	sys-apps/pciutils
+	sys-power/iasl
+	sys-power/pmtools"
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+S=${WORKDIR}
+
+src_prepare() {
+	default
+	sed -i -e 's/-Wall -Werror/-Wall/' configure.ac {,src/,src/lib/src/}Makefile.am || die
+	sed -i -e 's:/usr/bin/lspci:'$(type -p lspci)':' src/lib/include/fwts_binpaths.h || die
+
+	# Fix json-c includes
+	sed -e 's/^#include <json\//#include <json-c\//g' -i \
+		configure.ac || die
+	sed -e 's/^#include <json.h>/#include <json-c\/json.h>/' \
+		-i src/lib/include/fwts_json.h \
+		src/utilities/kernelscan.c || die
+	sed -e 's/-ljson/-ljson-c/'\
+		-i src/Makefile.am\
+		src/lib/src/Makefile.am\
+		src/utilities/Makefile.am || die
+
+	eautoreconf
+}
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 5fd0db0632e8..cebbda26948a 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -7,7 +7,7 @@ DIST fwupd-1.3.11.tar.gz 2255359 BLAKE2B 0f91c32602459d31e53c63647762307cfe2313c
 DIST fwupd-1.4.2.tar.gz 2304086 BLAKE2B 9a725cc49479984c3a98b75e9c52211a26f81d4a7ecec3b261ff4486201a967a6c82df9a1dbd591b91d9cd6eb9d1a8cd8cccfd2c8dd98d5bb3f82cb03bbd0a52 SHA512 b092eedf3e5e84874de1fddb7f14ca87975d5895721ac4f87b6c88ec7c7b2367e573b30906588f9adad4cea52da5ebbaaa4a9c38a2273e8f31d26399e719166e
 DIST fwupd-1.4.4.tar.gz 2311975 BLAKE2B 04ba05e157a1662dcd5fa8a3835701ff6c39935aa5e2d91e2aad3f7c7f5449ce56ac8f85bd4df4c3f4901c1d55d036f159eaf761761086bb1eda770021d38160 SHA512 9ce2ee8963789b99e43ebd3a76ba2851339bde6bda0c85198bbac11ebca76525385f41223956410bc1cff72318de463031f7e38b784fc5a4bf9bc2a85788db1a
 EBUILD fwupd-1.2.11.ebuild 3782 BLAKE2B f71c26237f656c291c63a2c7e46f220fbb56751ad0b2742acaf65672acd8060850f654962a26b52210a05e638ec408ff780488d83b1e23f8333b8c81a6f08417 SHA512 3b3a7897e737afc5a7bef4e8743a5a3abd67ca9d6b0a75fa1f7af65879188d1f72b5bdfdf8c46f945a8bf7b0189efec169cd3547cf9253df74d6ca6e7dba07bd
-EBUILD fwupd-1.3.10.ebuild 4187 BLAKE2B 3ec354cadd6950895014084b7e8fb87e1cd32263ee27faae2fb14a0cf1fe602193b2324eba89e5d4e0736516c141ce7516c7a4ab92761b74724d50d461bbcbaa SHA512 933e85964b19c839e79671ba518970361b213039ece46aab2c936996ff7cd96a33049660eb61a3b55a8ff191db0e07a613bfd2a2faeee8aa4f84cc3b358ac5aa
+EBUILD fwupd-1.3.10.ebuild 4186 BLAKE2B 287319be4161408025db0307c6356e76e596cf6ef01ce2b3db932b30f288ac181faf43afdc8222be6fa69816ec15a4f8dbac56879575bcb761e56c5d89063163 SHA512 22a425094094484874f363c078143e1a3400415dab5e62f84d6d5b64d259c31811de5b08355275dbdcd3675a0fcc3a41b3245712a5a231c4fb9f133223306363
 EBUILD fwupd-1.3.11.ebuild 4188 BLAKE2B 10fcb95d9ddd6158b33be98a772db66e857ff34c06d71592dc894ea6b2308c28c0f2af71ee3135b4b12d5aa25fb1c9fd7a66646e3eca427309f5b402374a3a03 SHA512 0e24ebd628dd7f48a90cd6d745ededaddf4bbdf29e6e3df5406ba92280cb5818debbb72fdaf1af71e55aac1143512077769cc4e15d76e301c0dd3276fab28faf
 EBUILD fwupd-1.4.2.ebuild 4071 BLAKE2B 972cd1aadcc8db1deeca41be037437139eafb2c02d7b0c62a0d1d2576034ccbbb50f0ffc0bdd0572bdbe3c33d8fecebcdf300ec5c203b56eaae4debe08a4d907 SHA512 fcbb325424a6fbbe5a026b5e760456172af0a1ef2eee13018af03d088923b5497f9240e32bd91c082341532c0ce249b4b5760e122f2955f772fab1e9e0721402
 EBUILD fwupd-1.4.4.ebuild 4100 BLAKE2B 31c1c95fa28b6d94584282f2f7f6b14cd6e98ef7af4ced6e171237c5f9a8d99abfb9092ccaffa1941bb108bfc2589a2acb067ba32a1de0a5ae76182a8575a0c4 SHA512 369cb4c232c3cc6e2056ad91572aba9a7758985d5cb4d1d1edf7902fc4cff06aef2d21b7d7c698b4225457b76aa24faf81cd9daf0be8f078b4c29f06fe2ef6c4
diff --git a/sys-apps/fwupd/fwupd-1.3.10.ebuild b/sys-apps/fwupd/fwupd-1.3.10.ebuild
index 008eaf67978e..d7daed583481 100644
--- a/sys-apps/fwupd/fwupd-1.3.10.ebuild
+++ b/sys-apps/fwupd/fwupd-1.3.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="agent amt consolekit dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( consolekit elogind minimal systemd )
diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest
index 780c7377acf7..054f997dea36 100644
--- a/sys-apps/haveged/Manifest
+++ b/sys-apps/haveged/Manifest
@@ -3,18 +3,10 @@ AUX haveged-conf.d 207 BLAKE2B 0c6adb8c4e4f6d769e2ceb039b4a553c2e75bfdecd277c16c
 AUX haveged-init.d.3 322 BLAKE2B 7484eee6c17a5c6ecf20fa656b8c3976c732ba40f370d92635517dc14dfaab1b26778f660d03389a7bb1df217d78e9ee5d8a03934bec3b53f0edc717ca8f9ef9 SHA512 057cafb7f74423759834d470664558dcf16d226fbf1f47f569bacf04a8f76334aacc7fc25348d055847f6da4c644383b0519d80a7553058bae5264508eeb4ad4
 AUX haveged.conf 147 BLAKE2B 7bdf29071f7a1a3b90266af308ab0a0a56c46f8c9ae8b6acc3b4055a89ac14c0e3cbc2e370d344debe8fb69f9ceacae6882c17d2620e0daea171d349073672d4 SHA512 052696a31ab7b9a0dda06ccb24c08524bef0cfa9c601a1ba6819bb2e42886a6b3d9b77710880d589534fae3c600d123304586f825fac554e68ce50d8b5acd563
 AUX service.gentoo 322 BLAKE2B 302a1506492e5122a03ea616de11dea493637d904cde1415abbbdeff3794251e911c6efee7d9331a4cb1e8dde1dbb579f46935cd52c58fbaeb77404b587985cb SHA512 7d7caaef45cbf268a1c1a813537a9e4ef6543addcfebe99fd178e37a8c516bbd5419fb8f47decf2370cee0562f066c72501b6c176307b1f5884b56f561386b88
-DIST haveged-1.9.10.tar.gz 495820 BLAKE2B f3ef9d566275a9174ab3a3c280b3af234dcd1ea45408c18ea990d40f5e919fd97030802037932118631b204332a4f0ceb2090e64286ba3f361b63ec1bba9863b SHA512 d45ca46dfd596e4984c457b017952c195236f7fa84fb7a6d02ec47fa8326c63aefca700ae5872da11c35b2b1c5705514ea036a080a27e80f64f1a010831997e1
-DIST haveged-1.9.11.tar.gz 495008 BLAKE2B 65c2eff3deee5f06f437086d4ec028072aa7e7adff0e0748d437b8c38f191cbe4d3c8ade67aa6f9d0d12a5940dd5bd88fe6f619ddcf62ddd59a31a0cdaa5aabd SHA512 2ddee986d45049313246d9d84f23b5ed1257bb815c0716c7cea53b86e7bbf31b718d268ee45e1cbc87d2b9f1fbf7389da34ede72ca1ca044ccc6bd82d2943f01
+DIST haveged-1.9.12.tar.gz 495503 BLAKE2B 1fc775ced82980b4b657cf5626a0a88e1de3471ab06638832ed58da4d74e41f10ba7f95cf2c3e04e4cdf19014b41b8c11f690b74c139a235c8ec1159896552ec SHA512 8165cb45ca25ca3d1f6ee303eca47f28006fb4c221bdaea5b0b09b1a712362a41d340e64102ec468a1c8272c096cb416513e6cc98bc70cfd359bdcd481422c9b
 DIST haveged-1.9.2.tar.gz 494682 BLAKE2B a972d128b19fecc3d01e17bd4cf6d5ec03ae716c4b4934c73193e03f3d3f9ff3461a8280ec0a20885499fd334343deb193ddc98b0697b2b14f92fff897bbf59b SHA512 65f70950fb90ef9c24ff3bf1b26e19a9cde2bec4749e2e64d5461a51646a20cf610efa2a5014219b8605957afa0084abd2ba11c7dc15f9379afce784971627b8
-DIST haveged-1.9.4.tar.gz 493215 BLAKE2B e1a8bbda36c35523c7a0c72a1377d7006440742961f9be4527d52b7e05b176334529ee032f5bdf902e729fcfe045a7a0558dfea7c50a95019747d1158f1e4a19 SHA512 20017c7637779c0cfa414233bb67efb2976f92c08e4eb1b7ea41ccd483dad755629d8e05fb8560a2db811fc2ded7d05fa081ab10c59341cb4c206595a964641d
-DIST haveged-1.9.8.tar.gz 494473 BLAKE2B 3c656221ffc896a1c57cfcfa17524c1e40de04fc5cffa94ce71e0bf11a78b578b9f11f8e7683f2be7150d5ccfeba9eb2f553d9379006f2624bf78d5ed152da74 SHA512 6a4012c7ab0ad7df77ae61dd3aca072a7aeca942c180d37c8495009fad13a4c9c0e7bf64a3ffce00e50c06679d4b948c3930a960789a06edf074076cf68d37db
 DIST haveged-1.9.8c.tar.gz 494470 BLAKE2B 840aa0b985107feb38a7b5823f94de3473e79f75542565e571c4ec9b2640dddcabb09d598e101678defbdd2eb04fe2fc1fb1f8466157e53d7c41272131450dec SHA512 24167e8a9773d96b3c57cd3e57def7e291f3de86873e796cafc1a59d3f89818c6cb8d46d05e5ae4eb2683fc86b313b1acaed7f210724dadb7df3939e1b3900aa
-DIST haveged-1.9.9.tar.gz 495495 BLAKE2B e0cf1a68cfc91b5a0aadb424024c44980a312f5bc5f680f0cba50edc97d82fa9cfea09fc09988cc2e4b02b245471f2a6847d518503fd33f596fa8a00069587e5 SHA512 0d30c2effb859f4960320a4681a368973960c17afa295704ec330a1bb792848ba3be5ab5428274b9dddaa5c6d50447e8bf99ff5de14c03a8d59cf87cc7a4e4ce
-EBUILD haveged-1.9.10.ebuild 945 BLAKE2B 8dad88810d8e0bafe8655c51e8c5cfe98955ff6712f884254302c22655f880ad94481a4041454f2a1599eb8c25d36ba09ba914764fe6ee735dfa6d4b622bebc2 SHA512 ac291a8be5d047d7965817580e1131ed7ef067893275cb27fa50af48dcc601f9c9eec56009e7230a1679ba34d0b3fb5801af9ab18452de591662ca6ee50aba4c
-EBUILD haveged-1.9.11.ebuild 945 BLAKE2B 8dad88810d8e0bafe8655c51e8c5cfe98955ff6712f884254302c22655f880ad94481a4041454f2a1599eb8c25d36ba09ba914764fe6ee735dfa6d4b622bebc2 SHA512 ac291a8be5d047d7965817580e1131ed7ef067893275cb27fa50af48dcc601f9c9eec56009e7230a1679ba34d0b3fb5801af9ab18452de591662ca6ee50aba4c
+EBUILD haveged-1.9.12.ebuild 945 BLAKE2B 8dad88810d8e0bafe8655c51e8c5cfe98955ff6712f884254302c22655f880ad94481a4041454f2a1599eb8c25d36ba09ba914764fe6ee735dfa6d4b622bebc2 SHA512 ac291a8be5d047d7965817580e1131ed7ef067893275cb27fa50af48dcc601f9c9eec56009e7230a1679ba34d0b3fb5801af9ab18452de591662ca6ee50aba4c
 EBUILD haveged-1.9.2-r1.ebuild 960 BLAKE2B ca6650ea624b8ca6a372ace436bdef5c2a956fc627a16a2ccf8083a0ea3e147f5cec9571b560a5e423e1a4abd36337d632d74ac4365aa7c141a8fe81d214d79b SHA512 e18f627765762c3b64f34319bd3756bda5963cb861f6fd04a3d2e31a736bd19d99d9ab4dc3690563dbf9fbd11b750431cc808c9252c5f043c6dda4b0654c2a28
-EBUILD haveged-1.9.4.ebuild 977 BLAKE2B 9f9328f7fb42a1d625c5ca0413d11d8dd18d4ae4e9e6d3cffaab2b9969ce63359d30678cff3287f8bcbb36fca724e47af5167b6d21e5b08b8f18004b515ce299 SHA512 01517dfcaa91e879e18e9a330f4d7750e9e1a2d9fdf6f1ae6bd11cc44b4dc0a978363576fce2342feaab489ca5e335ac1fe2df31105f09388d261a7727c32930
-EBUILD haveged-1.9.8.ebuild 1010 BLAKE2B 6cf51da54096328fa8c4cf7f10c7be6b3c8e40eca18bd94111f0d13bf81d1fcb78d6ec99b0b60f4944befa185d15664777656cbc1952c95f27d7aa5cd9541669 SHA512 ee5fc0487504822b832479f216c703a95af2f02fc2768cb2aaaaf0c51b4791cb73b9379390db4244227bcc22a6ba03be84e7df6b028bda2ad94e2d90357d2ec5
 EBUILD haveged-1.9.8c.ebuild 1007 BLAKE2B 17ea013ddb1531b3890c510404467204545b38feedc14b46eabe5ea6bee101012610acfd389823023c403c87e082be5ef778549551da134cca69ccea6284743c SHA512 3280473cbc0efc70ad1b0ff942cec564481c77768025153d94377a377ed463a2d0e29513a0b7381bb192e0c20f98e0874a5f48145d440ccd13eab07cc5ec4f26
-EBUILD haveged-1.9.9.ebuild 945 BLAKE2B 8dad88810d8e0bafe8655c51e8c5cfe98955ff6712f884254302c22655f880ad94481a4041454f2a1599eb8c25d36ba09ba914764fe6ee735dfa6d4b622bebc2 SHA512 ac291a8be5d047d7965817580e1131ed7ef067893275cb27fa50af48dcc601f9c9eec56009e7230a1679ba34d0b3fb5801af9ab18452de591662ca6ee50aba4c
 MISC metadata.xml 371 BLAKE2B d44d1873136cfff8c9c1ae42ee0ded780af875987caecc98494afba60017c3da105423642f10f2475d344636d54c71885607649ceb4f285a477698b40449d2ef SHA512 640e188a0829d4408d9bc7ca0c7558222ed8148afef25a88a136c0ae5bb44531bc8352c9c1da1c13e395cb54d67c62a485fa4f6329ad7b76255def9d979b70d0
diff --git a/sys-apps/haveged/haveged-1.9.11.ebuild b/sys-apps/haveged/haveged-1.9.11.ebuild
deleted file mode 100644
index c439fda13266..000000000000
--- a/sys-apps/haveged/haveged-1.9.11.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 systemd
-
-DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm"
-HOMEPAGE="http://www.issihosts.com/haveged/"
-SRC_URI="https://github.com/jirka-h/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="selinux static-libs threads"
-
-RDEPEND="
-	!<sys-apps/openrc-0.11.8
-	selinux? ( sec-policy/selinux-entropyd )
-"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		--bindir=/usr/sbin
-		--enable-nistest
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# Install gentoo ones instead
-	newinitd "${FILESDIR}"/haveged-init.d.3 haveged
-	newconfd "${FILESDIR}"/haveged-conf.d haveged
-
-	systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service
-	insinto /etc
-	doins "${FILESDIR}"/haveged.conf
-}
diff --git a/sys-apps/haveged/haveged-1.9.10.ebuild b/sys-apps/haveged/haveged-1.9.12.ebuild
index c439fda13266..c439fda13266 100644
--- a/sys-apps/haveged/haveged-1.9.10.ebuild
+++ b/sys-apps/haveged/haveged-1.9.12.ebuild
diff --git a/sys-apps/haveged/haveged-1.9.4.ebuild b/sys-apps/haveged/haveged-1.9.4.ebuild
deleted file mode 100644
index 4e82730b448d..000000000000
--- a/sys-apps/haveged/haveged-1.9.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd
-
-DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm"
-HOMEPAGE="http://www.issihosts.com/haveged/"
-SRC_URI="https://github.com/jirka-h/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="selinux static-libs"
-
-RDEPEND="
-	!<sys-apps/openrc-0.11.8
-	selinux? ( sec-policy/selinux-entropyd )
-"
-
-# threads are broken right now, but eventually
-# we should add $(use_enable threads)
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--bindir=/usr/sbin \
-		--enable-nistest \
-		--disable-threads
-}
-
-src_install() {
-	default
-
-	# Install gentoo ones instead
-	newinitd "${FILESDIR}"/haveged-init.d.3 haveged
-	newconfd "${FILESDIR}"/haveged-conf.d haveged
-
-	systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service
-	insinto /etc
-	doins "${FILESDIR}"/haveged.conf
-}
diff --git a/sys-apps/haveged/haveged-1.9.8.ebuild b/sys-apps/haveged/haveged-1.9.8.ebuild
deleted file mode 100644
index c792e4bd61fa..000000000000
--- a/sys-apps/haveged/haveged-1.9.8.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
-inherit systemd
-
-DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm"
-HOMEPAGE="http://www.issihosts.com/haveged/"
-SRC_URI="https://github.com/jirka-h/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="selinux static-libs threads"
-
-RDEPEND="
-	!<sys-apps/openrc-0.11.8
-	selinux? ( sec-policy/selinux-entropyd )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.9.8c-threads_build_fix.patch"
-)
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		--bindir=/usr/sbin
-		--enable-nistest
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# Install gentoo ones instead
-	newinitd "${FILESDIR}"/haveged-init.d.3 haveged
-	newconfd "${FILESDIR}"/haveged-conf.d haveged
-
-	systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service
-	insinto /etc
-	doins "${FILESDIR}"/haveged.conf
-}
diff --git a/sys-apps/haveged/haveged-1.9.9.ebuild b/sys-apps/haveged/haveged-1.9.9.ebuild
deleted file mode 100644
index c439fda13266..000000000000
--- a/sys-apps/haveged/haveged-1.9.9.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 systemd
-
-DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm"
-HOMEPAGE="http://www.issihosts.com/haveged/"
-SRC_URI="https://github.com/jirka-h/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="selinux static-libs threads"
-
-RDEPEND="
-	!<sys-apps/openrc-0.11.8
-	selinux? ( sec-policy/selinux-entropyd )
-"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		--bindir=/usr/sbin
-		--enable-nistest
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# Install gentoo ones instead
-	newinitd "${FILESDIR}"/haveged-init.d.3 haveged
-	newconfd "${FILESDIR}"/haveged-conf.d haveged
-
-	systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service
-	insinto /etc
-	doins "${FILESDIR}"/haveged.conf
-}
diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index 86802fb3bfa7..17f93d061cba 100644
--- a/sys-apps/ipmiutil/Manifest
+++ b/sys-apps/ipmiutil/Manifest
@@ -1,6 +1,5 @@
 AUX ipmiutil-2.9.8-flags.patch 712 BLAKE2B d084480396ee8e546c2027e95ce9c95940d1d844a0aaec7448d6eb4c750d3a4a964fa53118a2cc92897733ab99b9b1064ecf2f05cdd30282b803ea511386f1e8 SHA512 3caf226020e1fffc6c45cb549a066a034a58165415d5e325445f949042c1ac756b61949c78c30d0172983d95264a0ee2c9f829f1f5c8395e8fa1a48025f87dc2
 AUX ipmiutil-2.9.9-lib_symlink.patch 468 BLAKE2B d24e4e0183f46a3a97b9a9db754b4948446eda7504d81b3854cf8ae65eebdc2f279272ecf09736ff2966dfd477219e19a900cce8665f865bc22a8674ea863f2b SHA512 35912b578b3e61e899f97d2fc6cd6352ac04da638c64c252aa71138d9b7fd1b1de474f2702febfb85ab3f5371971be7a1922a1c6bbe5960c04be2b9171f0e75e
-AUX ipmiutil-3.1.4-fix_lanplus_build.patch 485 BLAKE2B b4a5c7092b6ff6ab54c05b848d6f89b161cf79e271f8dd77eecae0a1fa523db83539a258c227d7b90f7e11b9103acf1f7ab4fd354654bd2e7aff8d8bf89a02e9 SHA512 270d94131e434a0be89929815f9ce2e52e2dfe77e69758f5201a837215fe364c622c22fbc9db03042427aaf7629ce09a896b1ad532443c57bc8d0327cae3d30b
 AUX ipmiutil-3.1.5-fix-configure.patch 5817 BLAKE2B 3a953a03d495a453d99dae70ea29ed95e03ee5d4da6a1a2aab42bda289f43725fff9a5721d7a08538f9a5f35b36ae956e5da493a50301fdaf487a8aef05ca0ba SHA512 c1f2c13f1aafc4244b1a3cdf2da23d4ff9e982613063b2e8995c0003db6cb31e1facce9d590725f5e02789fcd62c3b334ce20e1b8815b99c002bc2f90d9fa065
 DIST ipmiutil-3.0.6.tar.gz 1692679 BLAKE2B dcc02dbb5467b824005dbc95c8f5231b2e2758e7600231c1c3fc31c1207cff0540400857dd1bfa83fc8b033fe0277ab23c6013f110744bff57fe4bc7b89174f9 SHA512 0c47246b7aa6a060091745d36e33aae07e7907dcad5fefb1759aac62adf48316915ce5818d2f9241e24b73be13e54fbb57046234a69c60ce56f41a933915580f
 DIST ipmiutil-3.0.9.tar.gz 1697688 BLAKE2B 93ed8865cae1cea0ea4f7de4683f4698e3f75e9190cc7e0af1832ca44a08f52aa149393761f1ede3994827db78841061d54058bbe4178b5930accd3a4c225ba7 SHA512 c2c0a516216a46a52621159e665a77d96cf81f385fc9cf19877e72283be3e1a4dad5a4826454727b71576c22cc4de3c73ff428d26f35bf496c7dc1511305cda3
diff --git a/sys-apps/ipmiutil/files/ipmiutil-3.1.4-fix_lanplus_build.patch b/sys-apps/ipmiutil/files/ipmiutil-3.1.4-fix_lanplus_build.patch
deleted file mode 100644
index 3f1331412d85..000000000000
--- a/sys-apps/ipmiutil/files/ipmiutil-3.1.4-fix_lanplus_build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac	2020-01-24 23:32:53.768314546 +0700
-+++ b/configure.ac	2020-01-24 23:32:13.971662393 +0700
-@@ -94,7 +94,7 @@ AC_ARG_ENABLE([landesk],
- 
- dnl Configure ipmiutil for lanplus (libipmi_lanplus.a) or not (default yes)
- AC_ARG_ENABLE([lanplus],
--    [  --enable-lanplus      enable lanplus support (default=yes)],[default=yes],
-+    [  --enable-lanplus      enable lanplus support (default=yes)],
- [if test "x$enableval" = "xno"; then
- 	drv_lanplus=""
- 	LANPLUS_CFLAGS=""
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 722946c3c0c0..900e041b606b 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -1,9 +1,9 @@
 AUX man-db.cron-r1 252 BLAKE2B 1d48851bd11ddf65ee24cae65a8bdb43b2c0df515a790661680775598fae21ef0776f04736425d511d48e97873d44b36a04d6ff41a53fceda0d8254482a4b53a SHA512 c2c7c05bcf241bb066c3ef98e33fb8c3b06abf92c20709f97c1e1e048d47aa4cf5ea412231a490008b3f1d87b284e381e611bb3275e8413ad031dac113112054
 DIST man-db-2.8.7.tar.xz 1839012 BLAKE2B 19b438b1083cfd838421f29ed053fe85686929bc9f2105fe399ea99622f138bca2c8888a17cddb9223362db2d5f9c4bb3669865ecf749fe845ea8e4223027f67 SHA512 9f9d6f3b776c0b35f95c179fb668f2dc3db3d3e63a162cfda98c5d126fe147f2418e1a1503037ebe28314f57d9b6f48b7f7674d611df14424973a866a61ff2d9
-DIST man-db-2.9.1.tar.xz 1875456 BLAKE2B 42d7d5f49bf19e031bde18dd60cbf18a7656e8756f2cc5d3789cab6ea82283115ed0303ae2f7f7ffd3e32310302b7b70b4e39704bd5c2a08ab60a38905d8c448 SHA512 ae2d1e9f293795c63f5a9a1a765478a9a59cbe5fe6f759647be5057c1ae53f90baee8d5467921f3d0102300f2111a5026eeb25f78401bcb16ce45ad790634977
 DIST man-db-2.9.2.tar.xz 1885484 BLAKE2B 46778ebdecffcdefedd062e3f6a01a54054b57aa9636450dd148f62184b9bb919deb72e3b57b2fc75670fc2d8d274417f00994f7030fee913d572637e080b4c1 SHA512 47b63c074cf61c15f82230cc35a0062ab6ded8c3229475c6667a47ca518346d0555616c5b07bb01515b31bd80cbdc9870cd05ffff35097d013252401c6927002
+DIST man-db-2.9.3.tar.xz 1885840 BLAKE2B 6163660af60a2900220d7b1de74caa9cb9e5764cc5da20469a8fb08e19ee1948937916664fdc493b89da8fd829aa512877892245fabc00fb586c7754c0da3d53 SHA512 ca1c1214753483f6e22efe69a9df9852e0de01a9ad3b9950dcbbc9f38e6060100b98a84333256f8c734002e66e2fd6256bc017a31bd9acfc42002dca2c0f879b
 EBUILD man-db-2.8.7.ebuild 3458 BLAKE2B f3096c090cfe4f5d6926389d0e3e1d8d417c7cdfd0cee59d9d4182d9c1a602b8a2a4c57fd3b92e110e8a1e9c6c4922160fda8f24bf54fca20797defa6443af42 SHA512 3b38dfae452716e3a68e1ae6dd5c74ba92ab130e25c8bd77d9e5802e3cda8dedbf5c7e7af8613e0e62c9f337b0ddb2c1a6fd69058967d3ed774c639897278f9d
-EBUILD man-db-2.9.1.ebuild 4015 BLAKE2B 6ad75623c176a62cf26afb94bd84ea3a214a949bdf534e58e7e9ccbf11bf56159e02d48e3999549fd2f1f2e0240b954298717d6bfe29523e6e7cd2382b20234b SHA512 773c65cdda7fd8275266b05450cae51996652689ce26e3095e5eee97990dcce39412e784a3a0104b43218ab3d411d78bc70cbed9d8602852decc9c06f96d6074
 EBUILD man-db-2.9.2.ebuild 4023 BLAKE2B ff89a69281aadbff8dda8687cb1466cd0b6216f705f946c5e44b4ea296e2460517dd12b6e1891bb56cbca2eff7ce252cd5314a9c5df1d4ca675a92e88241beee SHA512 f79e6ac596356ab4d8ed48d1c77a7ac7d5237fdc3893b6698a5df5e8d783684fff6a666228512dbec620e2ec783472c5211c924bd9d93398ed0825460e1028a4
+EBUILD man-db-2.9.3.ebuild 4023 BLAKE2B ff89a69281aadbff8dda8687cb1466cd0b6216f705f946c5e44b4ea296e2460517dd12b6e1891bb56cbca2eff7ce252cd5314a9c5df1d4ca675a92e88241beee SHA512 f79e6ac596356ab4d8ed48d1c77a7ac7d5237fdc3893b6698a5df5e8d783684fff6a666228512dbec620e2ec783472c5211c924bd9d93398ed0825460e1028a4
 EBUILD man-db-9999.ebuild 4023 BLAKE2B ff89a69281aadbff8dda8687cb1466cd0b6216f705f946c5e44b4ea296e2460517dd12b6e1891bb56cbca2eff7ce252cd5314a9c5df1d4ca675a92e88241beee SHA512 f79e6ac596356ab4d8ed48d1c77a7ac7d5237fdc3893b6698a5df5e8d783684fff6a666228512dbec620e2ec783472c5211c924bd9d93398ed0825460e1028a4
 MISC metadata.xml 342 BLAKE2B ac0d63182d2d7a73dc256fd0ae1f9994218da535ed39bd756e7db950899fda9a019f9107e8f0d9e4dab1987ba2650ae1fb8cddc9901240cba829c780db69e9b5 SHA512 553cf56ab0b3b6c9403612a7ccd1db073f557b432c68d60adb4716169250a9986b4c112023f6ae200a6fbc2df31cdafd9ab08e04d92ca35cffb81f690bd43d79
diff --git a/sys-apps/man-db/man-db-2.9.1.ebuild b/sys-apps/man-db/man-db-2.9.1.ebuild
deleted file mode 100644
index 92546556c66b..000000000000
--- a/sys-apps/man-db/man-db-2.9.1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="a man replacement that utilizes berkdb instead of flat files"
-HOMEPAGE="http://www.nongnu.org/man-db/"
-if [[ "${PV}" = 9999* ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
-else
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="berkdb +gdbm +manpager nls +seccomp selinux static-libs zlib"
-
-CDEPEND="
-	!sys-apps/man
-	>=dev-libs/libpipeline-1.5.0
-	sys-apps/groff
-	gdbm? ( sys-libs/gdbm:= )
-	!gdbm? ( berkdb? ( sys-libs/db:= ) )
-	!berkdb? ( !gdbm? ( sys-libs/gdbm:= ) )
-	seccomp? ( sys-libs/libseccomp )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? (
-		>=app-text/po4a-0.45
-		sys-devel/gettext
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	acct-group/man
-	acct-user/man
-	selinux? ( sec-policy/selinux-mandb )
-"
-PDEPEND="manpager? ( app-text/manpager )"
-
-pkg_setup() {
-	if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150
-		ewarn "Defaulting to USE=gdbm due to ambiguous berkdb/gdbm USE flag settings"
-	fi
-}
-
-src_unpack() {
-	if [[ "${PV}" == *9999 ]] ; then
-		git-r3_src_unpack
-
-		# We need to mess with gnulib :-/
-		EGIT_REPO_URI="https://git.savannah.gnu.org/r/gnulib.git" \
-		EGIT_CHECKOUT_DIR="${WORKDIR}/gnulib" \
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	if [[ "${PV}" == *9999 ]] ; then
-		local bootstrap_opts=(
-			--gnulib-srcdir=../gnulib
-			--no-bootstrap-sync
-			--copy
-			--no-git
-		)
-		AUTORECONF="/bin/true" \
-		LIBTOOLIZE="/bin/true" \
-		sh ./bootstrap "${bootstrap_opts[@]}" || die
-
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	export ac_cv_lib_z_gzopen=$(usex zlib)
-	local myeconfargs=(
-		--with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--disable-setuid #662438
-		--enable-cache-owner=man
-		--with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x"
-		$(use_enable nls)
-		$(use_enable static-libs static)
-		$(use_with seccomp libseccomp)
-		--with-db=$(usex gdbm gdbm $(usex berkdb db gdbm))
-	)
-	econf "${myeconfargs[@]}"
-
-	# Disable color output from groff so that the manpager can add it. #184604
-	sed -i \
-		-e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \
-		src/man_db.conf || die
-
-	cat > 15man-db <<-EOF || die
-	SANDBOX_PREDICT="/var/cache/man"
-	EOF
-}
-
-src_install() {
-	default
-	dodoc docs/{HACKING,TODO}
-	find "${ED}" -name "*.la" -delete || die
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/man-db.cron-r1 man-db #289884
-
-	insinto /etc/sandbox.d
-	doins 15man-db
-}
-
-pkg_preinst() {
-	local cachedir="${EROOT}/var/cache/man"
-	# If the system was already exploited, and the attacker is hiding in the
-	# cachedir of the old man-db, let's wipe them out.
-	# see bug  #602588 comment 18
-	local _replacing_version=
-	local _setgid_vuln=0
-	for _replacing_version in ${REPLACING_VERSIONS}; do
-		if ver_test '2.7.6.1-r2' -le "${_replacing_version}"; then
-			debug-print "Skipping security bug #602588 ... existing installation (${_replacing_version}) should not be affected!"
-		else
-			_setgid_vuln=1
-			debug-print "Applying cleanup for security bug #602588"
-		fi
-	done
-	[[ ${_setgid_vuln} -eq 1 ]] && rm -rf "${cachedir}"
-
-	# Fall back to recreating the cachedir
-	if [[ ! -d ${cachedir} ]] ; then
-		mkdir -p "${cachedir}" || die
-		chown man:man "${cachedir}" || die
-	fi
-
-	# Update the whatis cache
-	if [[ -f ${cachedir}/whatis ]] ; then
-		einfo "Cleaning ${cachedir} from sys-apps/man"
-		find "${cachedir}" -type f '!' '(' -name index.bt -o -name index.db ')' -delete
-	fi
-}
-
-pkg_postinst() {
-	if [[ $(ver_cut 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then
-		einfo "Rebuilding man-db from scratch with new database format!"
-		su man -s /bin/sh -c 'mandb --quiet --create' 2>/dev/null
-	fi
-}
diff --git a/sys-apps/man-db/man-db-2.9.3.ebuild b/sys-apps/man-db/man-db-2.9.3.ebuild
new file mode 100644
index 000000000000..8ad0f47c8564
--- /dev/null
+++ b/sys-apps/man-db/man-db-2.9.3.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="a man replacement that utilizes berkdb instead of flat files"
+HOMEPAGE="http://www.nongnu.org/man-db/"
+if [[ "${PV}" = 9999* ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
+else
+	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="berkdb +gdbm +manpager nls +seccomp selinux static-libs zlib"
+
+CDEPEND="
+	!sys-apps/man
+	>=dev-libs/libpipeline-1.5.0
+	sys-apps/groff
+	gdbm? ( sys-libs/gdbm:= )
+	!gdbm? ( berkdb? ( sys-libs/db:= ) )
+	!berkdb? ( !gdbm? ( sys-libs/gdbm:= ) )
+	seccomp? ( sys-libs/libseccomp )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${CDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? (
+		>=app-text/po4a-0.45
+		sys-devel/gettext
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	acct-group/man
+	acct-user/man
+	selinux? ( sec-policy/selinux-mandb )
+"
+PDEPEND="manpager? ( app-text/manpager )"
+
+pkg_setup() {
+	if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150
+		ewarn "Defaulting to USE=gdbm due to ambiguous berkdb/gdbm USE flag settings"
+	fi
+}
+
+src_unpack() {
+	if [[ "${PV}" == *9999 ]] ; then
+		git-r3_src_unpack
+
+		# We need to mess with gnulib :-/
+		EGIT_REPO_URI="https://git.savannah.gnu.org/r/gnulib.git" \
+		EGIT_CHECKOUT_DIR="${WORKDIR}/gnulib" \
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	if [[ "${PV}" == *9999 ]] ; then
+		local bootstrap_opts=(
+			--gnulib-srcdir=../gnulib
+			--no-bootstrap-sync
+			--copy
+			--no-git
+		)
+		AUTORECONF="/bin/true" \
+		LIBTOOLIZE="/bin/true" \
+		sh ./bootstrap "${bootstrap_opts[@]}" || die
+
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	export ac_cv_lib_z_gzopen=$(usex zlib)
+	local myeconfargs=(
+		--with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--disable-setuid #662438
+		--enable-cache-owner=man
+		--with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x"
+		$(use_enable nls)
+		$(use_enable static-libs static)
+		$(use_with seccomp libseccomp)
+		--with-db=$(usex gdbm gdbm $(usex berkdb db gdbm))
+	)
+	econf "${myeconfargs[@]}"
+
+	# Disable color output from groff so that the manpager can add it. #184604
+	sed -i \
+		-e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \
+		src/man_db.conf || die
+
+	cat > 15man-db <<-EOF || die
+	SANDBOX_PREDICT="/var/cache/man"
+	EOF
+}
+
+src_install() {
+	default
+	dodoc docs/{HACKING,TODO}
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/man-db.cron-r1 man-db #289884
+
+	insinto /etc/sandbox.d
+	doins 15man-db
+}
+
+pkg_preinst() {
+	local cachedir="${EROOT}/var/cache/man"
+	# If the system was already exploited, and the attacker is hiding in the
+	# cachedir of the old man-db, let's wipe them out.
+	# see bug  #602588 comment 18
+	local _replacing_version=
+	local _setgid_vuln=0
+	for _replacing_version in ${REPLACING_VERSIONS}; do
+		if ver_test '2.7.6.1-r2' -le "${_replacing_version}"; then
+			debug-print "Skipping security bug #602588 ... existing installation (${_replacing_version}) should not be affected!"
+		else
+			_setgid_vuln=1
+			debug-print "Applying cleanup for security bug #602588"
+		fi
+	done
+	[[ ${_setgid_vuln} -eq 1 ]] && rm -rf "${cachedir}"
+
+	# Fall back to recreating the cachedir
+	if [[ ! -d ${cachedir} ]] ; then
+		mkdir -p "${cachedir}" || die
+		chown man:man "${cachedir}" || die
+	fi
+
+	# Update the whatis cache
+	if [[ -f ${cachedir}/whatis ]] ; then
+		einfo "Cleaning ${cachedir} from sys-apps/man"
+		find "${cachedir}" -type f '!' '(' -name index.bt -o -name index.db ')' -delete
+	fi
+}
+
+pkg_postinst() {
+	if [[ $(ver_cut 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then
+		einfo "Rebuilding man-db from scratch with new database format!"
+		su man -s /bin/sh -c 'mandb --quiet --create' 2>/dev/null
+	fi
+}
diff --git a/sys-apps/modutils/Manifest b/sys-apps/modutils/Manifest
index b0ab62ece977..103bd4eedd02 100644
--- a/sys-apps/modutils/Manifest
+++ b/sys-apps/modutils/Manifest
@@ -1,4 +1,3 @@
-AUX modutils-2.4.27-alias.patch 2250 BLAKE2B 623b62fa8aa70a2a28b7da0f60c92a4fd2178015c9de855b071df0fbe1a85b55d6d4604fb57ca518d22054288f16c8362483f15290714c2479596878a92c3cbd SHA512 06ffe92cab08411158324c0c9420185bc3726ff43ece6567f294a8c9d324ef588685462ce670bbc80661d5e3da6d55d856efed3ca71891e60e3b6ab5b66d7179
 AUX modutils-2.4.27-flex.patch 805 BLAKE2B 0efc0b03204181dc456667bdf2a15e2765c4ea50ef9213d090eacddcb72adf95e597547520df2694bb59e7c0c5f01cbb714d8290f71b6d7d5f45592e9cfc1c9a SHA512 2d427b2c9b5d45866a704caa3b564c986106aeb1c60898efa54c7272bcb536fa13a46df6970a8a0b6020bdbe4c86903503a2ec0e15092d0c254f9b5a940c2374
 AUX modutils-2.4.27-gcc.patch 7007 BLAKE2B 2aade76f6aeee64a4ca25d2adccadbf5bfdaff25ebac4c317fd4d75339fdc8da5d723ffb54e6efe0fad805d5d4d279648de1ea7436df9dd89fd9c5470c2d7027 SHA512 44024ec0e6be1be4ab52a95726dad69670247665241bddcb11030735be58a4c78569dca8399ace467842f933b0fc15f4c3767a465ea433fdcea74c8c68a5d584
 AUX modutils-2.4.27-no-nested-function.patch 1422 BLAKE2B 3f1b2e95ef05815bee49666863f767e416cc67dfc4566011f59dc1ba49064c1810a31b4a91c5dcbbad0a5f47f33431644834dc872637532919cc0e2077f830d0 SHA512 0a01f28f9d3f803b1e148af382b396ad793354363c36e690ed5a731c31482bc8b909fcf77902b62f50967e1ed782ec9e53412c906117dc3d7d12b1f21ecf075a
diff --git a/sys-apps/modutils/files/modutils-2.4.27-alias.patch b/sys-apps/modutils/files/modutils-2.4.27-alias.patch
deleted file mode 100644
index 3ca733984402..000000000000
--- a/sys-apps/modutils/files/modutils-2.4.27-alias.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Taken from Debian.
-
-Update misc alias cruft.
-
---- a/util/alias.h
-+++ b/util/alias.h
-@@ -52,7 +52,11 @@
- 	"binfmt--310 binfmt_java",
- 
- 	"block-major-1 rd",
-+#if defined(__s390__) || defined(__s390x__) || defined(__ia64__) || defined(__powerpc__)
-+	"block-major-2 off",
-+#else
- 	"block-major-2 floppy",
-+#endif
- 	"block-major-3 ide-probe-mod",
- 	"block-major-7 loop",
- 	"block-major-8 sd_mod",
-@@ -107,6 +111,7 @@
- 					/* /dev/sunmouse Sun mouse */
- 					/* /dev/beep Fancy beep device */
- 					/* /dev/modreq Kernel module load request */
-+	"char-major-10-116 snd",	
- 	"char-major-10-130 wdt",	/* /dev/watchdog Watchdog timer port */
- 	"char-major-10-131 wdt",	/* /dev/temperature Machine internal temperature */
- 					/* /dev/hwtrap Hardware fault trap */
-@@ -116,7 +121,11 @@
- 	"char-major-10-144 nvram",	/* from Tigran Aivazian <tigran@sco.COM> */
- 	"char-major-10-157 applicom",	/* from David Woodhouse <dwmw2@infradead.org> */
- 	"char-major-10-175 agpgart",    /* /dev/agpgart GART AGP mapping access */
-+	"char-major-10-181 toshiba",	
-+	"char-major-10-183 hw_random",	
- 	"char-major-10-184 microcode",	/* Tigran Aivazian <tigran@veritas.com> */
-+	"char-major-10-187 irnet",	
-+	"char-major-10-189 ussp",	
- 	"char-major-10-200 tun",	/* Universal TUN/TAP device driver */
- 	"char-major-10-250 hci_vhci",
- 
-@@ -179,6 +203,11 @@
- 	/* next two from <dairiki@matthews.dairiki.org>  Thanks! */
- 	"net-pf-17 af_packet",
- 	"net-pf-19 off",	/* acorn econet */
-+	"net-pf-20 atm",
-+	"net-pf-23 irda",
-+	"net-pf-24 pppoe",
-+	"net-pf-25 wanrouter",
-+	"net-pf-26 llc",
- 	
- 	"net-pf-31 bluez",
- 
-@@ -199,6 +228,10 @@
- 	"bt-proto-2 sco",
- 	"bt-proto-3 rfcomm",
- 	"bt-proto-4 bnep",
-+	"bt-proto-5 cmtp",
-+	"bt-proto-6 hidp",
-+	"bt-proto-7 avdtp",
-+
- 
- 	"plip0 plip",
- 	"plip1 plip",
-@@ -228,6 +261,7 @@
- 	"ppp-compress-21 bsd_comp",
- 	"ppp-compress-24 ppp_deflate",
- 	"ppp-compress-26 ppp_deflate",
-+        "ppp ppp_async", /* for 2.4 */
- 
- #ifndef __sparc__
- 	"parport_lowlevel parport_pc",
-@@ -271,9 +305,6 @@
-  */
- char *above[] =
- {
--	"hid keybdev mousedev",
--	"usbmouse hid",
--	"wacom evdev",
- 	NULL			/* marks the end of the list! */
- };
- 
-@@ -284,7 +315,6 @@
-  */
- char *below[] =
- {
--	"ov518_decomp ov511",
- 	NULL			/* marks the end of the list! */
- };
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index f1ca04f3989d..fed71ac8f6f6 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -4,10 +4,14 @@ DIST portage-2.3.100-bug-719810-escape-percent-signs.patch 1486 BLAKE2B 809e3897
 DIST portage-2.3.100.tar.bz2 1051559 BLAKE2B 32ee47c2d3e28dd7530c4d6518c264f01621677b5d8872c98088117de3bde21bb05f144935b1c035157953814573473a9ac0216595138d804dd30cf8a7c5b4a9 SHA512 b784ced00676020700a27a622a7a10162b8775185e28d639473243949ca32210458523e94960cafa908ca4a97cd8731d3515f768e2512c519c54598316ecf3c9
 DIST portage-2.3.101-revert2-bug-709746.patch 25365 BLAKE2B 84a451b3af5c6a79a99f7548fa920a888b76d31d4248d11592bf5e8ec8f26bd8e62f813cb69a684ff2816942c49a8661744c7ec9d0944aa256527cfa3b20323d SHA512 49a1f7e38cec1e06373154024a980eedf5bfacc9cc66e1f8c70e8cbb77c68b94a934b4cffe039acdc86179a8f44bd463771c3acecaab6ced3387fd47a312f69a
 DIST portage-2.3.101.tar.bz2 1052483 BLAKE2B 8abf5a0f5c3aace92fd5e74692240558b9fd6cc27f5030409289519edb5287e6b49a0e8c33d11d7b1427a8463fe98f6041de37638451fe639b295d7b595328f3 SHA512 e5d373fc435a9f7535c9bdc202bd0aa9a534ac9991987e21fbfd43492940210312b817284a2484cb4e98854050bb559aa49daef7f5d555e637a37eb312ccbe61
+DIST portage-2.3.102.tar.bz2 1051616 BLAKE2B e9158cd941d65575dab51e2f8cd768c5706ce2f7e6f37fb4c77bc615501b3b3893fdee0917780fe172307bf647a1e4e56e3d88a7c479e103b095fc295fe274e7 SHA512 08024707c552b5b5174a66825cc53bc459a3db2fbb36740713a4ac5834429550200bc458e1f4a2ea921aaf04f0632dc885ef9ab5ba2c3a22d48c031667ed23ca
+DIST portage-2.3.103.tar.bz2 1051807 BLAKE2B 6a05997ea8b87627523642664956f822b76bbc41511659abfa6ede12b5f9ecaf9d253ac816b0e1dc6b6a118d9efc80593b429ef179d9d01200333585498d44d9 SHA512 e5595ca3b12c35fb696dd86ed2f1a72e56c7bc6955a63e555e1f0a795415473e38363541495496464bdc4192e2708c8bff4192bd0c7dad7a527fac96deec2a4c
 DIST portage-2.3.89-bug-718578.patch 1325 BLAKE2B 7a3bc520274617736eac2e3d078e90d151bdb5d8615f6217a499c0f5d4c80813f2c753e7902cf34482df0725ad0b43a38707764c8be14aae9f7ca34f0bd8721f SHA512 6f1c5d7b42beb8078c45cccbad2bd65374b69af92521d9be3beb6784477ca5bcdd75d8e762b239e44e3121e6fe5e3a040c92c9b61521e4a9b1d6bafee10d4c88
 DIST portage-2.3.99.tar.bz2 1051210 BLAKE2B dd3f990dbc87e655a767ce01e1ee3f0b1d5226fa818949408e54b81a2f96e50a4215a79af42b00dc795792858c4f86453b238b14baef4f0793c937b5617534b8 SHA512 176842318a4134ce54c5aa6485fef296f5a14edd2a72421c2011973a0f1a6af39bc5398f1e9eb3b8666d5fc307589c5b91ab93c219bdedb2d307357d8ddefbf5
 EBUILD portage-2.3.100-r1.ebuild 8506 BLAKE2B c28cf46a4b962d3cc63c8b2761830ec23102b2fd2bb62812e93323307449bb2e40e5ff89e28addfa19f99da7e29fb8c11ff262d0b2a129e1d7d14b55ebcd5a10 SHA512 d3b5ae4297c201177d831c50df9e5d78475025fcac3fab8a07970363f60da72ad6850fe74996791040eb24518617b915bf01b74ef3ebfb172ec72f6fc79d91a2
 EBUILD portage-2.3.101-r2.ebuild 8524 BLAKE2B 66747258d25a467f7672574c132983ee7d00107fa0d435511d8c7b70e44c2e949485f0ef461c5b232aedfe55c5afecbdd3b1ffa76bbc67cf23ccc6272fc7cb99 SHA512 1b4a33f9b134b69c48ebdd71bc4c30bcc8c2d4968ac4fa9eec087cfd0f753aa1a34751789f225b0ea7d07ec7276c3c6739dc22ce9b60d5b379c1fbd76bbc262f
+EBUILD portage-2.3.102.ebuild 8277 BLAKE2B ce6f538d3810a507e6532cd5ffcec56fefdf536c427e83464b38c8e68cc886ed67fc0e80721b6b07dc946e2e38365e961fd04683e6335e29ac429c74f2e9867d SHA512 a39ad1a46a3e965a6c0a829470f236419860d67613d4a289178688044d40bc985c2bb1db488cd8ea37b6ba8a6a2d3463aa16fe6f88d331ce937280c0dc174832
+EBUILD portage-2.3.103.ebuild 8277 BLAKE2B ce6f538d3810a507e6532cd5ffcec56fefdf536c427e83464b38c8e68cc886ed67fc0e80721b6b07dc946e2e38365e961fd04683e6335e29ac429c74f2e9867d SHA512 a39ad1a46a3e965a6c0a829470f236419860d67613d4a289178688044d40bc985c2bb1db488cd8ea37b6ba8a6a2d3463aa16fe6f88d331ce937280c0dc174832
 EBUILD portage-2.3.99-r2.ebuild 8464 BLAKE2B 4d8dd4abded851e705f4a5dc7fe7692acecf16f0a47a08086589e7d6443ed28c4adc97d94a2cbbd7e5a3e36e4a04d80402502739d4a2b75b7d6ebc2ad20f50ff SHA512 884218ac0eb74afe5bf9fb618164e0fd5fe368afeedcd93d5bb50e50b473f98c8b5b890cd44a8610b08e0d557c2ca5faf5842bef0fc3ce44ea5777a974588058
 EBUILD portage-9999.ebuild 7423 BLAKE2B ea03765f419e9450349cb5cf956f6f86f73a2ecdd95be109edee4713de5d57fb38f1da502f6d5aa0ba3bcea28ee1985efcb252a40af83982aa36fcfecfb92c73 SHA512 4494b11c180586cf6b1f268a2f9c54926ad57a4d41f74841b2644026ce8f18b8044ec5bd0048678bcd3a8c97cb1a9a1b6c5b63cbb637c2af948fa6fcd13ac0d7
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
diff --git a/sys-apps/portage/portage-2.3.102.ebuild b/sys-apps/portage/portage-2.3.102.ebuild
new file mode 100644
index 000000000000..6e1a8152761f
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.102.ebuild
@@ -0,0 +1,263 @@
+# 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..9} )
+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 ~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 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/zstd
+	>=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
+		rsync-verify? (
+			>=app-portage/gemato-14[${PYTHON_USEDEP}]
+			>=app-crypt/openpgp-keys-gentoo-release-20180706
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	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
+	) )
+	!<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 ~UTS_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
+	local sitedir=$(python_get_sitedir)
+	[[ -d ${D%/}${sitedir} ]] || die "${D%/}${sitedir}: No such directory"
+	env -u DISTDIR \
+		-u PORTAGE_OVERRIDE_EPREFIX \
+		-u PORTAGE_REPOSITORIES \
+		-u PORTDIR \
+		-u PORTDIR_OVERLAY \
+		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+	env -u BINPKG_COMPRESS \
+		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || 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/portage/portage-2.3.103.ebuild b/sys-apps/portage/portage-2.3.103.ebuild
new file mode 100644
index 000000000000..6e1a8152761f
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.103.ebuild
@@ -0,0 +1,263 @@
+# 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..9} )
+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 ~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 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/zstd
+	>=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
+		rsync-verify? (
+			>=app-portage/gemato-14[${PYTHON_USEDEP}]
+			>=app-crypt/openpgp-keys-gentoo-release-20180706
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	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
+	) )
+	!<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 ~UTS_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
+	local sitedir=$(python_get_sitedir)
+	[[ -d ${D%/}${sitedir} ]] || die "${D%/}${sitedir}: No such directory"
+	env -u DISTDIR \
+		-u PORTAGE_OVERRIDE_EPREFIX \
+		-u PORTAGE_REPOSITORIES \
+		-u PORTDIR \
+		-u PORTDIR_OVERLAY \
+		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+	env -u BINPKG_COMPRESS \
+		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || 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/prctl/Manifest b/sys-apps/prctl/Manifest
index 5e9d93ef9e0f..41f6771c40b0 100644
--- a/sys-apps/prctl/Manifest
+++ b/sys-apps/prctl/Manifest
@@ -1,6 +1,5 @@
 AUX Makefile.am 70 BLAKE2B 9c2735d35e8a0c707d5fefd6721c5a8678266b64e0fa157e3ebac62982289558fd9bdd2e1c225ac527654154917bd6e0f088c9ca57d2cef8030463ffe486f97e SHA512 8c10ca443aa6cef485e1ffd2e50195bf0c8be9ced5c94342b2a04bc5658521fd5c5fe440139de9d2603780dfd69db1cae9feef15a4956098212e6b0fdd60bebb
 AUX configure.ac 200 BLAKE2B 3ec747f56bb304484671171dd61c72cac8b264563955b7759b0c5f42f1ec03c490f400df0bc381c87c006316cb00a1687dd4dd5d83471c0699266cf23a727788 SHA512 ae8a75d3a37cb33fa8958f2de48549b99fc0b6f5c15fab8d7b9478e38e0dbd6d31e4bbdc876a50d52598d8b7964a544c0eb2e4677b3b32e7034acab98d8d6fd7
-AUX prctl-1.6-configure.in.patch 312 BLAKE2B c4fd576e1d4c42ffb4cc97cc24cea1f2d629a147b03a96f273a99a292a46615714415ad3902ef0f553713cd5de50d00a5498b8435e82de9f0ac78ba12889bd7c SHA512 fb67287f072516542822be2c267a2fb7a089546fd79fc6f26c67ede4e4b8db40e11d5594c3392a42df455194df4d674639263783954172b975e1f78a0195e034
 AUX prctl-1.6-no-implicits.patch 381 BLAKE2B 4374744647de591232e9da6398465a5b9f31f75027f57ce7da5d2294321c6ee17d6bb3c4a108131602bdab7f6643aff2778313c764d659e15093a6cee1081fad SHA512 b01e17872a6c098ddbd4720cf62cd83d485fd1095a9da47c2f79cc09b50648a02bde2aeb38b8dec03d5be794223c898f2c753f576068540252071209e1701812
 DIST prctl-1.6.tar.gz 18876 BLAKE2B 9f26fec1d178141d7e5aa7390dc0403ab1774d711a12588074ee6dbf62c980ab3713179b2f476f20cac0d7e4b027899b144fa67164021dd13b10be3dc087fb2f SHA512 c5b70abbb76f76f4a4c53cebcbd34fa4e87d7db2278a2ea17128da30dea958cc4e4d75b641cb3b9fbd8fa56fee482e97dbae5e61c697e80ef4d13f4b6d28cfda
 EBUILD prctl-1.6-r1.ebuild 545 BLAKE2B d948fc8ac27ed240266ab6eeb805bc65a7ccb07c0a8008e9acd719649cc2380f4ca61dfb658cb40a099bc67a22ee98734d03cecc6c70d9485d2ac0d8353fc304 SHA512 64419216ed7f999f12fd0fe37005cfac90db415b3952abf7a5787e56d2a6ff88d7209280487dd94fc7a37236d11f70c3a4f6700f1bea416d575b2039dfc7f96b
diff --git a/sys-apps/prctl/files/prctl-1.6-configure.in.patch b/sys-apps/prctl/files/prctl-1.6-configure.in.patch
deleted file mode 100644
index 492733eb97e9..000000000000
--- a/sys-apps/prctl/files/prctl-1.6-configure.in.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Restored configure.in based on tarball's configure
---- /dev/null
-+++ b/configure.in
-@@ -0,0 +1,16 @@
-+AC_INIT(prctl.c)
-+
-+AC_PROG_LN_S
-+AC_PROG_CC
-+AC_PROG_CPP
-+AC_PROG_INSTALL
-+
-+
-+AC_HEADER_STDC
-+AC_CHECK_HEADERS(unistd.h)
-+
-+
-+AC_CHECK_FUNCS(strerror)
-+AC_SUBST(ASCPP)
-+AC_SUBST(INSTALL)
-+AC_OUTPUT(Makefile)
diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest
index 46313102c45e..f1aea2e24947 100644
--- a/sys-apps/tcp-wrappers/Manifest
+++ b/sys-apps/tcp-wrappers/Manifest
@@ -1,5 +1,4 @@
 AUX hosts.allow.example 585 BLAKE2B 18a7786b0eb9d08b0536de6ef135189aa0527af34a9bfec378ceedf6b6479998f81bd40237bdb5ad09239f7221cdc076077c964a111f6eb651ce258496d1010f SHA512 63587dd4552b688dc5ed0adde3932e43e5287129315211498063f09e37c1f8beee0de60d7d4f69df7149bd500546a2fd59a6094d71f9c0be221426eae3cb869b
-AUX tcp-wrappers-7.6-headers.patch 5419 BLAKE2B 6d56c77652299c8bc75ea76ff42c5dfa915b94b4466c79a23529e1d815487145dffef73d262a1d79e209caaf627fbf81b4f5402fca45af6f995c129fcb2539e4 SHA512 48cd3d8951ef0f0106c51f1a1de6116fe1f68bf49f321b956d4f9dac1b3f1b6c2964163deb3d1bb449a2ac672e471c4b216e0e616de4a2dad0665d767d13f786
 AUX tcp-wrappers-7.6-redhat-bug11881.patch 956 BLAKE2B ac2e8e4c8778899c6460bf6ae680b189158c9936428644e7b93981403ed017ef26806f3de184f66eace573cf385ae350f3b0fa1b3f250b2a0b4708908289c558 SHA512 d530f788c3b40f5ec2836ba7c6e73df529869ef465b93fe2b2d8460dfcb5e9031e78c8e6a99c71d6262a05b82f25e694fdd717686198a87dfcb2c9b9d5a52ef4
 AUX tcp-wrappers-7.6.28-no-external-malloc.patch 317 BLAKE2B 4436d7bf54e13b038e8139c2dfd0a4a061b6113898560436ae0e5fb6e5a74c3c4c163c27f99e9957ec89665186beed30e7a57810db886b8a86148f6b58f5f594 SHA512 bdefe3dd35e96d1e140d1dc363f1904526aaf0c44952b8ec5e206c8e53693437f07be2ad136a0e22c38e09c1dcd1c73c755165cc68b4588715f6997f9c6affb8
 DIST tcp-wrappers_7.6.q-28.debian.tar.xz 36104 BLAKE2B 209fd9730785db8afc8ebec581f7132cfb4352f8807d2cea4715daf5c11aa08a92cf084ab1ff31222f5b265f032286ce2dcf49a238e9dc5616161c400fce4f08 SHA512 2c63201937737c19b4e5ca97dbc0ede9fc2d3b8fc344f8854a7d2afc0109ccb9ee52af94ba8a8498da910336a4f473825daa7a0cca26a0d93e1078e67abe16b0
diff --git a/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6-headers.patch b/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6-headers.patch
deleted file mode 100644
index 328a4a102618..000000000000
--- a/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6-headers.patch
+++ /dev/null
@@ -1,295 +0,0 @@
---- a/options.c
-+++ b/options.c
-@@ -34,6 +34,8 @@
- 
- /* System libraries. */
- 
-+#include <unistd.h>
-+#include <stdlib.h>
- #include <sys/types.h>
- #include <sys/param.h>
- #include <sys/socket.h>
---- a/safe_finger.c
-+++ b/safe_finger.c
-@@ -20,6 +20,11 @@
- 
- /* System libraries */
- 
-+#include <unistd.h>
-+#include <fcntl.h>
-+#include <stdlib.h>
-+#include <sys/wait.h>
-+#include <grp.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <signal.h>
-@@ -27,7 +31,7 @@
- #include <ctype.h>
- #include <pwd.h>
- 
--extern void exit();
-+int pipe_stdin(char **argv);
- 
- /* Local stuff */
- 
---- a/scaffold.c
-+++ b/scaffold.c
-@@ -10,6 +10,7 @@
- 
- /* System libraries. */
- 
-+#include <stdlib.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/socket.h>
-@@ -27,7 +27,4 @@
- #endif
- 
--#ifndef INET6
--extern char *malloc();
--#endif
- 
- /* Application-specific. */
---- a/shell_cmd.c
-+++ b/shell_cmd.c
-@@ -14,6 +14,10 @@
- 
- /* System libraries. */
- 
-+#include <unistd.h>
-+#include <stdlib.h>
-+#include <fcntl.h>
-+#include <sys/wait.h>
- #include <sys/types.h>
- #include <sys/param.h>
- #include <signal.h>
-@@ -25,8 +25,6 @@
- #include <syslog.h>
- #include <string.h>
- 
--extern void exit();
--
- /* Local stuff. */
- 
- #include "tcpd.h"
---- a/tcpdchk.c
-+++ b/tcpdchk.c
-@@ -20,6 +20,8 @@
- 
- /* System libraries. */
- 
-+#include <unistd.h>
-+#include <stdlib.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #ifdef INET6
-@@ -35,10 +36,7 @@
- #include <netdb.h>
- #include <string.h>
- 
--extern int errno;
--extern void exit();
--extern int optind;
--extern char *optarg;
-+int cidr_mask_addr(char *str);
- 
- #ifndef INADDR_NONE
- #define INADDR_NONE     (-1)		/* XXX should be 0xffffffff */
---- a/clean_exit.c
-+++ b/clean_exit.c
-@@ -13,8 +13,8 @@
- #endif
- 
- #include <stdio.h>
--
--extern void exit();
-+#include <unistd.h>
-+#include <stdlib.h>
- 
- #include "tcpd.h"
- 
---- a/hosts_access.c
-+++ b/hosts_access.c
-@@ -23,6 +23,7 @@
- 
- /* System libraries. */
- 
-+#include <stdlib.h>
- #include <sys/types.h>
- #ifdef INT32_T
-     typedef uint32_t u_int32_t;
-@@ -43,8 +44,8 @@
- #include <netdb.h>
- #endif
- 
--extern char *fgets();
--extern int errno;
-+static int match_pattern_ylo(const char *s, const char *pattern);
-+int cidr_mask_addr(char *str);
- 
- #ifndef	INADDR_NONE
- #define	INADDR_NONE	(-1)		/* XXX should be 0xffffffff */
---- a/inetcf.c
-+++ b/inetcf.c
-@@ -9,15 +9,14 @@
- static char sccsid[] = "@(#) inetcf.c 1.7 97/02/12 02:13:23";
- #endif
- 
-+#include <stdlib.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <stdio.h>
- #include <errno.h>
- #include <string.h>
- 
--extern int errno;
--extern void exit();
--
-+#include "scaffold.h"
- #include "tcpd.h"
- #include "inetcf.h"
- 
---- a/percent_x.c
-+++ b/percent_x.c
-@@ -16,12 +16,12 @@
- 
- /* System libraries. */
- 
-+#include <unistd.h>
-+#include <stdlib.h>
- #include <stdio.h>
- #include <syslog.h>
- #include <string.h>
- 
--extern void exit();
--
- /* Local stuff. */
- 
- #include "tcpd.h"
---- a/rfc931.c
-+++ b/rfc931.c
-@@ -15,6 +15,7 @@
- 
- /* System libraries. */
- 
-+#include <unistd.h>
- #include <stdio.h>
- #include <syslog.h>
- #include <sys/types.h>
---- a/tcpd.c
-+++ b/tcpd.c
-@@ -16,6 +16,7 @@
- 
- /* System libraries. */
- 
-+#include <unistd.h>
- #include <sys/types.h>
- #include <sys/param.h>
- #include <sys/stat.h>
-@@ -39,6 +39,8 @@
- #include "patchlevel.h"
- #include "tcpd.h"
- 
-+void fix_options(struct request_info *request);
-+
- int     allow_severity = SEVERITY;	/* run-time adjustable */
- int     deny_severity = LOG_WARNING;	/* ditto */
- 
---- a/tcpdmatch.c
-+++ b/tcpdmatch.c
-@@ -19,6 +19,8 @@
- 
- /* System libraries. */
- 
-+#include <unistd.h>
-+#include <stdlib.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/socket.h>
-@@ -30,9 +32,6 @@
- #include <setjmp.h>
- #include <string.h>
- 
--extern void exit();
--extern int optind;
--extern char *optarg;
- 
- #ifndef	INADDR_NONE
- #define	INADDR_NONE	(-1)		/* XXX should be 0xffffffff */
---- a/update.c
-+++ b/update.c
-@@ -19,6 +19,7 @@
- 
- /* System libraries */
- 
-+#include <unistd.h>
- #include <stdio.h>
- #include <syslog.h>
- #include <string.h>
---- a/misc.c
-+++ b/misc.c
-@@ -14,11 +14,10 @@
- #include <arpa/inet.h>
- #include <stdio.h>
- #include <string.h>
-+#include <stdlib.h>
- 
- #include "tcpd.h"
- 
--extern char *fgets();
--
- #ifndef	INADDR_NONE
- #define	INADDR_NONE	(-1)		/* XXX should be 0xffffffff */
- #endif
---- a/fix_options.c
-+++ b/fix_options.c
-@@ -32,6 +32,7 @@
- 
- /* fix_options - get rid of IP-level socket options */
- 
-+void
- fix_options(request)
- struct request_info *request;
- {
-@@ -38,11 +38,8 @@
- #ifdef IP_OPTIONS
-     unsigned char optbuf[BUFFER_SIZE / 3], *cp;
-     char    lbuf[BUFFER_SIZE], *lp;
--#ifdef __GLIBC__
--    size_t  optsize = sizeof(optbuf), ipproto;
--#else
--    int     optsize = sizeof(optbuf), ipproto;
--#endif
-+    socklen_t optsize = sizeof(optbuf);
-+    int ipproto;
-     struct protoent *ip;
-     int     fd = request->fd;
-     unsigned int opt;
---- a/socket.c
-+++ b/socket.c
-@@ -95,11 +95,7 @@
-     static struct sockaddr_in client;
-     static struct sockaddr_in server;
- #endif
--#ifdef __GLIBC__
--    size_t  len;
--#else
--    int     len;
--#endif
-+    socklen_t len;
-     char    buf[BUFSIZ];
-     int     fd = request->fd;
- 
-@@ -430,11 +426,7 @@
- #else
-     struct sockaddr_in sin;
- #endif
--#ifdef __GLIBC__
--    size_t  size = sizeof(sin);
--#else
--    int     size = sizeof(sin);
--#endif
-+    socklen_t size;
- 
-     /*
-      * Eat up the not-yet received datagram. Some systems insist on a
diff --git a/sys-apps/unscd/Manifest b/sys-apps/unscd/Manifest
index f13273db3207..0cd5af965542 100644
--- a/sys-apps/unscd/Manifest
+++ b/sys-apps/unscd/Manifest
@@ -1,8 +1,6 @@
 AUX unscd-tmpfiles.conf 29 BLAKE2B e899d228b801b5c86b9bca3eb500acf9f07bf2f46d54e6370b5f5a595614eefe879937e679cfa1df4aa471138d78f56c310142807d94fbaef718262cb95909c7 SHA512 2f5d67300493e32ba1efd31fbfd8483f42aff9e15950361b640e18451e76e0fc7a0ad08f547485ab5b1ed544407c8758b53c9b22a61d75bfe2f80b893dce0e77
 AUX unscd.initd-r1 321 BLAKE2B dd36cd5c9e5d677655204048b3d43d8e5fe8b2f5d9c69c862a230257ab73350a5d27c3c6b8a107f2541d617e4e6cbbb421d1e06c83270de3100ed3101715137f SHA512 41def8b588f818b7e6e42809b37ab9d794d7d30c4be7dca047f64cdded55a401fa00cee962066125efe69a8efb9080fa2588c0941f4fc915243f1e111ac169c7
 AUX unscd.service 513 BLAKE2B 443b97c41978967d2ce0d9ef021dd271e1fc292cec082f060109f28e96f83bc8c53937f63a4c38bc1e04cb5b72af9f80ddcf55b8537938e10fc8f8eca040ca38 SHA512 3a03be4807c06506caea41aa163bb036c2600566e7a73267e08ef0aebb3a288d37eb12e448740942277baee365654c6118102915479be882cb65dfefaf53917b
-DIST nscd-0.52.c 73144 BLAKE2B 962c619044d54d3136ce2cd3f4766a0a5a11b0f341fb595238332ec4ef521854f6ef60c846ae0c8e3069774361366b6b53c1b48c8d21ebdf11b42bf05677852a SHA512 ba48410309fced9b8d9f929c52b39ca9a8caaf451fe73742bde7d4a4ab9980bc0f353551e19c846e96d6cb8a71e3c5edc7ddddf76cce0613282f0d01fde0612f
 DIST nscd-0.53.c 73206 BLAKE2B ce3b8e02ce8879664bde7ee7362ee0d920ad9e9cd24da08b02e83d49b2e0bef7fb1b3c6635bc4e8a26d901170943a78bae608903459e4447edf004e5ef716468 SHA512 d14362d21282d0ea919af3b353f7838d1514c293b49df084bc8df424392b4121dba3443a07118f4c8c1cfdca0cbf8ebddde24cf73459b06349e9d1a68801403c
-EBUILD unscd-0.52-r2.ebuild 721 BLAKE2B 285e3465617c6cb8285f197a6916fb363cb0cf1a0bed6b4ab4a83a2ae1cb2f18c2b923fade56806c74229818160f14ece371373fdddd52df1faf7e496aa7d0a3 SHA512 d65568ef1c55d0bb689c7736e2ffaed83631abde06a4817797c937f508eefd8ec06362d8a17ff220c572e9253f5ecfc1de87329bc2e9599e1dbcde831bc11a9d
-EBUILD unscd-0.53.ebuild 723 BLAKE2B ff678564a24f51b673bbdb5cde9677b0fce4d41826b132066a88404d18bdc4999ee3c4c4ee2cc2f949a2362ff078cdd4b0336061dd2609fc362155dd21eb387b SHA512 52b3313f3f26144f93c53747df694706c1c6d9165fa7d3fceb2603f3c768fd989086fef0a5ec4353cba5642487e123415d9a630eb2e4f962f8a76f12701260ec
+EBUILD unscd-0.53.ebuild 718 BLAKE2B ac7705f4af247b6da44dcda6c1ae9067b92886ec5c23f03cffd9a7cd698758b97dabebba10297ef2208b753b83dc3bc09fdf3931c3c3e392465d264ab50048a3 SHA512 2fd72cf7aa2645a3ece10be2d8dd32e456122a93e2b4025b812197d95cf3932701e95a61f6b1c2c11b0f79f49571673f959fab2824faaa4531947e2dc8095d69
 MISC metadata.xml 267 BLAKE2B 5267526ad53ec7bedfe46f8cba86c810629394fa4f3c59e1b69619b0a11a9edbb746ae6abf818182da7ade72c862360f43a19209007a23da9701df26b96f77dd SHA512 715bb37d958c1e508b2ef00711ab3a4abee982efe90867fd2bcf91fa91305d5a413a4f3d13d01ea6e27eb15f5f9dcb58fa13ecfed7025cae43745792ac1a105d
diff --git a/sys-apps/unscd/unscd-0.52-r2.ebuild b/sys-apps/unscd/unscd-0.52-r2.ebuild
deleted file mode 100644
index f61fb7591b5f..000000000000
--- a/sys-apps/unscd/unscd-0.52-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="simple & stable nscd replacement"
-HOMEPAGE="https://busybox.net/~vda/unscd/README"
-SRC_URI="https://busybox.net/~vda/unscd/nscd-${PV}.c"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="sys-libs/glibc[nscd(+)]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}
-
-src_unpack() {
-	cp "${DISTDIR}"/nscd-${PV}.c ${PN}.c || die
-}
-
-src_compile() {
-	tc-export CC
-	emake unscd
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/unscd.initd-r1 unscd
-	systemd_newtmpfilesd "${FILESDIR}"/unscd-tmpfiles.conf unscd.conf
-	systemd_dounit "${FILESDIR}"/unscd.service
-	dosbin unscd
-}
diff --git a/sys-apps/unscd/unscd-0.53.ebuild b/sys-apps/unscd/unscd-0.53.ebuild
index d191aa03c5e6..f3e81790194e 100644
--- a/sys-apps/unscd/unscd-0.53.ebuild
+++ b/sys-apps/unscd/unscd-0.53.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://busybox.net/~vda/unscd/nscd-${PV}.c"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="sys-libs/glibc[nscd(+)]"
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index c2e7a1dc1e78..3cda1993d8a7 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -12,7 +12,7 @@ DIST util-linux-2.36-rc1.tar.xz 5183900 BLAKE2B 5bdb0dd03835fc3e46585192aaf7320e
 EBUILD util-linux-2.33.2.ebuild 8417 BLAKE2B 3b6971e04a78a962f7bbd5e6b663ce3408d57befe412d40c6b4b05777f40aea034e9f5f52872aea7537393210a2127fa952ed548061e89c15ef627987d2cfcec SHA512 7a1e0c679a1c69f2e64b54c6897a5e7c430bd8ce1fde91f9b02a00dfec115ec0c2deccbc760c1280fa092f8782c48610366828b4ebdbbaa10b2a6741a1a65a03
 EBUILD util-linux-2.34-r3.ebuild 8450 BLAKE2B 84795217360708525a23bad91268d45c997fb0ae87215a7a0c9027e2245fb98decc6f523faff98855b101e380f49663e6f7b34bb82d18d93641326e91567edf2 SHA512 3444d77384f176ff6c1b3c7f023c90b021723a4158456b504fc927b141a1ad438dfe59802d297fc136cf55d08f01be002d8f136b85df50fa762d083abacb4857
 EBUILD util-linux-2.35.1-r2.ebuild 9020 BLAKE2B 85036f850b775f5474b32601392acf488b580cbeae534ed3715f87baf285c7b7a188d4a0621156c7baa68a228e77ccbde4d459a42863b020a36bfff1814c54f5 SHA512 7b7bf0a46658c32a83a96b4d4d9a1e7dd0ea325a1593689a9187ef00c55ffdedb4d786ba2ad96b488c40fe806dae143d5957c78f445bd70bbfd0ba179a0242a6
-EBUILD util-linux-2.35.2.ebuild 8901 BLAKE2B 754af3199c098612c27e96d7f07d24486c45b03c4378460e6e224d4e1ff5e0cb2944c41dced090d76a8834769379904d7757455bb93e8c5e322b173fa9ca7f82 SHA512 ed7171580c93ab14a4402d177194b726a04c3f5d81d074527755e891930f33e0f411fffe597b2d337097dacd991f0fc09f6b71564f97b9323d21d52546e20d16
+EBUILD util-linux-2.35.2.ebuild 8900 BLAKE2B fdbf9a40dc517a3cef5442503afe0655195a4100f369f1dc4b8600d13496ac1922d7458b028235a271494a94ff701d7de5bda3deec4a124425554f24599c0896 SHA512 770befe33e7066f36f9e0ef860da2b3b64f5f56b9405fae22fadf2f56585e7f58d26054e41b4b66adc2ba227667389f64e1414ff11800e775302ffefeade72f6
 EBUILD util-linux-2.36_rc1.ebuild 8827 BLAKE2B 8d93a0b2f43af1cb3ec7c54e257f270ffd854a4f51181bfface98d800c75f8f38d40f3d91bcc8336ef0671698a0304da219947e02d4ebf3c1f7955a2a9ca4752 SHA512 8b9794bcbfaa4f653b1a4bfffaddf9a681f8de4e24feae4d890df4a01f55afdbc01021a5c06176470c07233c9fd34d67a93efc1116817c7f105dbd0741281368
 EBUILD util-linux-9999.ebuild 8840 BLAKE2B 98ec331609c6d1b2bde50590b97f32f9644299f71b264d79d31ae9568432188bac49b8c66855b70dac3afd022cee4e9188200ac9149ea468e46e69ad8c767729 SHA512 c3b65a0e43d738b6b36d27ead3a0daacb03360914757723b6017ef44a00fb592310f87fce7af0d31d390b00e70b7b5d4f047679f5d7d3549bf7e1ddfa9f0908b
 MISC metadata.xml 1364 BLAKE2B 0221b836433dfffc122d794272c554b6114862efb7d474e68507fb399e56cf32bc86f0dba0d519782634eb45638d2e15dd25c8147d7209f5a3de536ba7ecf38b SHA512 094e0b577f2322b73ace41db762ea88736650a3f3010fb8a26f649a51efc83d09a66bbdaf7a24b24164264b2dbbf7839be49b21e0a125c95ca39f1c4cd6201e4
diff --git a/sys-apps/util-linux/util-linux-2.35.2.ebuild b/sys-apps/util-linux/util-linux-2.35.2.ebuild
index a81c1721fac4..00b2ddfd8773 100644
--- a/sys-apps/util-linux/util-linux-2.35.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.35.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi
 
diff --git a/sys-apps/x86info/Manifest b/sys-apps/x86info/Manifest
index 10d1e74d447b..c7d7e566b654 100644
--- a/sys-apps/x86info/Manifest
+++ b/sys-apps/x86info/Manifest
@@ -4,5 +4,8 @@ AUX x86info-1.29-parallel-make-cleanup.patch 330 BLAKE2B 77d0b528bd5a5dae91442ae
 AUX x86info-1.30-fix-build-system.patch 268 BLAKE2B a1f57d38ea3836b51eef4ed6b6516ac8a3e1350496e5550a2070d8b7f1a8e6b15c5af664d2c45062ea347168edf882ee2ddafa976beaa8688b19c33ae4ac3b0c SHA512 80f7b0773737b83c35a8dc59aa1f844edf73c93ee89d8fceeed3eb69cf757b79d42e9e0acfea061c1e7f7f4c38b953dbc0943dda874c62db7b63102394f8f6ea
 AUX x86info-modules.conf-rc 204 BLAKE2B 1077f0a793ca7eedef6c996d2ec9075872d7df862d24885a8152ee22ef3e0ee1667f142a690b44c019c7d75093038ad5a9eb9be7b34e7bc08abf498aa91a7591 SHA512 54557bb1ee77749b7207ac886a31278ae003b52f5c4e76709c3a367e59ab0086872e8b39d30f018ad9d8b07d037a54b4817815880b5c9ebde106cad73421af6b
 DIST x86info-1.30.tgz 95727 BLAKE2B 6e9e345c6b4d05d4a137b898f1cc8a31e901b25b8a3822c06c103298e2ee60c6fada8e1fc314a5fcec04618b9a8a9ce05a4e631dbf9f03a24c5349f13d1e2301 SHA512 0b4c9f1be83a737aa26ec14d239d09465608fcf542766ef5b8634d2fe08f75857c0d2bd1969d971ab4b0d55cd3aa3e4e5f58b3b2865865aa68fd751377672e5f
+DIST x86info-1.30_p20190617.tar.gz 85913 BLAKE2B e19e5fd797617499c64e75522f0fd030beaa335a6ba9afd29cbb79fd67313a2e57236d1ad8817bf91f0131faf667ba88ac0945ff25301ba8806912979f094ea3 SHA512 352e2b00578dc54b8d5ee32f09f327ab6a23e6ab4743882ca78a5a5ec1a04ceed8780228ffbda34f84ebb02c7cb850002a686929726feac90c8083044f479bd6
+EBUILD x86info-1.30-r1.ebuild 1738 BLAKE2B f809a7f512452242dfb9580026f1adf61ba57337ed46ad9614e007d2be67ba2782f359378d3d67842fb437158c488db0349d1ac01d3fa57d1c9f656fb8e450ba SHA512 34b59d22cbe750be756adef44dbd79feedc59aa6921550cc1fca9a4662fedf781b6c619d25eef8a15468efe945e30ee5931ed15198f50eaffbe5edb2a0772660
 EBUILD x86info-1.30.ebuild 1733 BLAKE2B b3f271e8d4617c828069e438b201fa7ba8d2c84984dac8bf214cd6bf96a4c15c7033934b878c791d078bdb09ff61ff1871dbc3b749ce649d5ca9a8f797ff376b SHA512 ce72adfb475678dfee2f45c00d0ef89231ae81df793d88ff2f0879c17755c7cdfc23af79d12bbc65a24d178698d77c72775c91c010ebf42cf66c3fbdaa1fb87f
+EBUILD x86info-1.30_p20190617.ebuild 1856 BLAKE2B e4bca9efb1259b4eb475306dbf9cab3fe1399fc7b89061de4a65d0eec595f4fa20d7d476edb5ef4bfd05a644fa03f21aae1710dcbdcaa9819ce31ee24d3c7ce4 SHA512 c5e7aa9c9233d40b1be7290f67fd48c2af3b342851e4727f95caaa48de4da4617b799ea5c951128fb4dbf5f087ca8347ef0e58a56fb0fecd8720c829a524afc3
 MISC metadata.xml 329 BLAKE2B d3b79b0a53a4a98cf288ff1ee8ae8cb477b90dad4529cedf04a52b25a3fc359121851c2cea28d703b2d2a42c5813bfe9b84398786e9045521eaff01b94f543c4 SHA512 3baca06564c2219ea6175ea39cea467ada4e7bf21a4341fcdc9d5b885ae387f4ca4f93605464b900a2524d64badfae641c5459d0acd0569de1ce848528a46ee4
diff --git a/sys-apps/x86info/x86info-1.30-r1.ebuild b/sys-apps/x86info/x86info-1.30-r1.ebuild
new file mode 100644
index 000000000000..5a09ba8a8e78
--- /dev/null
+++ b/sys-apps/x86info/x86info-1.30-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4..8} )
+
+inherit flag-o-matic linux-info python-any-r1 toolchain-funcs
+
+DESCRIPTION="Dave Jones' handy, informative x86 CPU diagnostic utility"
+HOMEPAGE="http://www.codemonkey.org.uk/projects/x86info/"
+SRC_URI="http://www.codemonkey.org.uk/projects/x86info/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="sys-apps/pciutils:="
+DEPEND="
+	${PYTHON_DEPS}
+	${RDEPEND}"
+
+CONFIG_CHECK="~MTRR ~X86_CPUID"
+
+PATCHES=(
+	"${FILESDIR}"/1.21-pic.patch
+	"${FILESDIR}"/${PN}-1.24-pic.patch #270388
+	"${FILESDIR}"/${PN}-1.29-parallel-make-cleanup.patch
+	"${FILESDIR}"/${PN}-1.30-fix-build-system.patch
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# These flags taken from the 1.29 ebuild
+	append-flags -Wall -Wshadow -Wextra -Wmissing-declarations \
+		-Wdeclaration-after-statement -Wredundant-decls
+	append-ldflags -Wl,-z,relro,-z,now
+
+	tc-export CC
+}
+
+src_compile() {
+	emake x86info lsmsr
+}
+
+src_install() {
+	dobin x86info lsmsr
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}"/x86info-modules.conf-rc x86info.conf
+
+	einstalldocs
+	doman x86info.1 lsmsr.8
+
+	dodoc -r results
+}
+
+pkg_preinst() {
+	if [[ -a "${EROOT}"/etc/modules.d/x86info ]] && [[ ! -a "${EROOT}"/etc/modprobe.d/x86info ]]; then
+		elog "Moving x86info from /etc/modules.d/ to /etc/modprobe.d/"
+		mv "${EROOT}"/etc/{modules,modprobe}.d/x86info
+	fi
+	if [[ -a "${EROOT}"/etc/modprobe.d/x86info ]] && [[ ! -a "${EROOT}"/etc/modprobe.d/x86info.conf ]]; then
+		elog "Adding .conf suffix to x86info in /etc/modprobe.d/"
+		mv "${EROOT}"/etc/modprobe.d/x86info{,.conf}
+	fi
+}
diff --git a/sys-apps/x86info/x86info-1.30_p20190617.ebuild b/sys-apps/x86info/x86info-1.30_p20190617.ebuild
new file mode 100644
index 000000000000..d8a3b48dfadf
--- /dev/null
+++ b/sys-apps/x86info/x86info-1.30_p20190617.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4..8} )
+
+inherit flag-o-matic linux-info python-any-r1 toolchain-funcs
+
+DESCRIPTION="Dave Jones' handy, informative x86 CPU diagnostic utility"
+HOMEPAGE="http://www.codemonkey.org.uk/projects/x86info/"
+# Upstream stopped versioned releases entirely
+COMMIT="8ea5ed19fae1d209eba9257171a10f7afd474618"
+SRC_URI="https://github.com/kernelslacker/x86info/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="sys-apps/pciutils:="
+DEPEND="
+	${PYTHON_DEPS}
+	${RDEPEND}"
+
+CONFIG_CHECK="~MTRR ~X86_CPUID"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+PATCHES=(
+	#"${FILESDIR}"/1.21-pic.patch
+	"${FILESDIR}"/${PN}-1.24-pic.patch #270388
+	#"${FILESDIR}"/${PN}-1.29-parallel-make-cleanup.patch
+	#"${FILESDIR}"/${PN}-1.30-fix-build-system.patch
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# These flags taken from the 1.29 ebuild
+	append-flags -Wall -Wshadow -Wextra -Wmissing-declarations \
+		-Wdeclaration-after-statement -Wredundant-decls
+	append-ldflags -Wl,-z,relro,-z,now
+
+	tc-export CC
+}
+
+src_compile() {
+	emake x86info
+}
+
+src_install() {
+	dobin x86info
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}"/x86info-modules.conf-rc x86info.conf
+
+	einstalldocs
+	doman x86info.1
+}
+
+pkg_preinst() {
+	if [[ -a "${EROOT}"/etc/modules.d/x86info ]] && [[ ! -a "${EROOT}"/etc/modprobe.d/x86info ]]; then
+		elog "Moving x86info from /etc/modules.d/ to /etc/modprobe.d/"
+		mv "${EROOT}"/etc/{modules,modprobe}.d/x86info
+	fi
+	if [[ -a "${EROOT}"/etc/modprobe.d/x86info ]] && [[ ! -a "${EROOT}"/etc/modprobe.d/x86info.conf ]]; then
+		elog "Adding .conf suffix to x86info in /etc/modprobe.d/"
+		mv "${EROOT}"/etc/modprobe.d/x86info{,.conf}
+	fi
+}
diff --git a/sys-apps/xdg-desktop-portal/Manifest b/sys-apps/xdg-desktop-portal/Manifest
index c9709e610721..a4dec3ada6b3 100644
--- a/sys-apps/xdg-desktop-portal/Manifest
+++ b/sys-apps/xdg-desktop-portal/Manifest
@@ -1,3 +1,5 @@
 DIST xdg-desktop-portal-1.6.0.tar.xz 453516 BLAKE2B 13ffcb21de6b61ddeb0782dcfc7b684287e54f94b9494b19589178594d1383a15048b8f9aeed7fb1260c3a2c967b267061d1db401085a686938c8629de8824c3 SHA512 7a0c702851762a55326142cb6b470205775284e0f749620ae6b648f216afcd684f8b20500339680b42812f628634344c9e826ab7cf13dd918fdbf733381d44ce
-EBUILD xdg-desktop-portal-1.6.0-r1.ebuild 1054 BLAKE2B a5b271c247b8df1032b1f279f8f7ac7ef74e4cfefdfbb3e53ed6e634f1c5a98b7adcc014fa00f92d064d7aacdf62439ff306c1027b761f2c961ba3ed6b9f543b SHA512 c4db0e697e2eae48cd21006e37085ede3138200ffb271b2dece8a33297364a9cbaa26288f33b542cce242ec9a4e7e9f09c2a95ba4840c898ef6b0752cca38b25
+DIST xdg-desktop-portal-1.7.2.tar.xz 468140 BLAKE2B 6f2e92f79424f79e778db9c1bf94555332f1f88ef42f84e477c8784be74ce8e2cf924f34da5e17d78359bd493370dcee62aec77f60c9df5cf3475d745f3e4d8e SHA512 fac64281e89d8bf17c6f1b3751c159d9ca6c2896b71bb83622411bf2dc9b7813974d19902c81c3576b325c98edf4dae22ccc3fe290e32f717730b6aa3afbdc12
+EBUILD xdg-desktop-portal-1.6.0-r2.ebuild 1058 BLAKE2B cc38d747768e44535808c0b0b3305299a978eb73a62ab1864f967d80a38edd3ead4ee340a36345b955b1f1ff77a1f037c563c6ddc6c2eb5bd61eaecb065eaeec SHA512 fcabc1a7d2da0d0ddadd790156439d806608b0b8d917bb531c78e54ffdef745d20e7e7c61c61f606e1df6888ea17652c55afbc303b77cba3ec8c6ff2be849f49
+EBUILD xdg-desktop-portal-1.7.2.ebuild 1051 BLAKE2B c0287fb8e4dc90b2459c8755a4f4cd7b011f1f3c484a398429dca07910d656486670ecfa23060d90e174e0bdb0c6827fd99d9c9730ebf1e0ed11d96216989d16 SHA512 6cd390505de64d2c55a5c371fcab8ff3f2e9616681d53530b8a9b4862afe1c58a9d79950f840e36457b94a0f52353e015a169511844a361623a45b9ad22e4977
 MISC metadata.xml 360 BLAKE2B 1e3fae0173fab20df0be6a2bd8432477d2c0ab2b9c4272e72a9d8a9eee3255c56311364ea079d288f87032fbc2ec8cad69f32a6bc41b152d19e307ee84493b49 SHA512 4e7232bd03fad6442491ce16c155b0d447050dfc383bb2c16b51297c8c2dcc2793b6d9ce6703451e9516d5a3017fb9e20e85ed7208c94c0faa4489bcbd897e22
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.6.0-r1.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.6.0-r1.ebuild
deleted file mode 100644
index 52c483a59a5b..000000000000
--- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.6.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 autotools systemd
-
-DESCRIPTION="Desktop integration portal"
-HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal"
-SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="doc geolocation screencast"
-
-BDEPEND="
-	dev-util/gdbus-codegen
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? (
-		app-text/xmlto
-		app-text/docbook-xml-dtd:4.3
-	)
-"
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	media-libs/fontconfig
-	sys-fs/fuse:0
-	geolocation? ( >=app-misc/geoclue-2.5.3:2.0 )
-	screencast? ( media-video/pipewire:= )
-"
-RDEPEND="${DEPEND}
-	sys-apps/dbus
-"
-
-src_configure() {
-	local myeconfargs=(
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-		$(use_enable doc docbook-docs)
-		$(use_enable geolocation geoclue)
-		$(use_enable screencast pipewire)
-		--disable-libportal # not packaged
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.6.0-r2.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.6.0-r2.ebuild
new file mode 100644
index 000000000000..777122093897
--- /dev/null
+++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.6.0-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="Desktop integration portal"
+HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal"
+SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+IUSE="doc geolocation screencast"
+
+BDEPEND="
+	dev-util/gdbus-codegen
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd:4.3
+		app-text/xmlto
+	)
+"
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	media-libs/fontconfig
+	sys-fs/fuse:0
+	geolocation? ( >=app-misc/geoclue-2.5.3:2.0 )
+	screencast? ( media-video/pipewire:0/0.2 )
+"
+RDEPEND="${DEPEND}
+	sys-apps/dbus
+"
+
+src_configure() {
+	local myeconfargs=(
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+		$(use_enable doc docbook-docs)
+		$(use_enable geolocation geoclue)
+		$(use_enable screencast pipewire)
+		--disable-libportal # not packaged
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.7.2.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.7.2.ebuild
new file mode 100644
index 000000000000..5037ce682d40
--- /dev/null
+++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.7.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="Desktop integration portal"
+HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal"
+SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="doc geolocation screencast"
+
+BDEPEND="
+	dev-util/gdbus-codegen
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd:4.3
+		app-text/xmlto
+	)
+"
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	media-libs/fontconfig
+	sys-fs/fuse:0
+	geolocation? ( >=app-misc/geoclue-2.5.3:2.0 )
+	screencast? ( >=media-video/pipewire-0.3:= )
+"
+RDEPEND="${DEPEND}
+	sys-apps/dbus
+"
+
+src_configure() {
+	local myeconfargs=(
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+		$(use_enable doc docbook-docs)
+		$(use_enable geolocation geoclue)
+		$(use_enable screencast pipewire)
+		--disable-libportal # not packaged
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-apps/yarn/Manifest b/sys-apps/yarn/Manifest
index c2725ca47c08..de96470d9748 100644
--- a/sys-apps/yarn/Manifest
+++ b/sys-apps/yarn/Manifest
@@ -1,5 +1,3 @@
-DIST yarn-v1.22.0.tar.gz 1244012 BLAKE2B 2764704103e281de8fd8c2c28abae56c7ba863365989b884add045d2f80810f0f8b83acd77baeef2375fe1424ad54cabfd89e4d14b38068114552115d3b7a812 SHA512 28c1cffc9ab9de364a4d8f624d4b77748565fdb7ba50fb3620da3debe0676472cac583537f03269601d368c5b2199a0eef8448e00205be75a162b5ead9448992
 DIST yarn-v1.22.4.tar.gz 1244785 BLAKE2B 1f1eeb829096eaf19a8fdb48b46fa736769d9d3c247759e434413665186e4cccb750024afa836dae8a0130fc472df3c01805d263d81346e1dd7509e1b106e88a SHA512 a1833b862fe52169bd6c2a033045a07df5bc6a23595c259e675fed1b2d035ab37abe6ce309720abb6636d68f03615054b6292dc0a70da31c8697fda228b50d18
-EBUILD yarn-1.22.0.ebuild 1058 BLAKE2B cc521c197011573800b7671b187d0f5507df0dfb9283f4f5355cb29fc9c1f72a7e5e34589928bab4fea27a2d26f735b6274b011486efa70c6f347ff51327c4cd SHA512 ccdce002d42bd31f614e92bb8703eeba3c713504b1e2feb03120d76c35475328ff40772c1b3b237c48e87e09a86f4ba149bf3f38aed3d52a3a6f303b33621dc4
-EBUILD yarn-1.22.4.ebuild 1058 BLAKE2B cc521c197011573800b7671b187d0f5507df0dfb9283f4f5355cb29fc9c1f72a7e5e34589928bab4fea27a2d26f735b6274b011486efa70c6f347ff51327c4cd SHA512 ccdce002d42bd31f614e92bb8703eeba3c713504b1e2feb03120d76c35475328ff40772c1b3b237c48e87e09a86f4ba149bf3f38aed3d52a3a6f303b33621dc4
-MISC metadata.xml 545 BLAKE2B 223f9132b5cbabf71b64028e2fd75d4de88566b59069db3e1ebcf195cf3143e1c4c0f04dfa05d911a65f9d8ff29504385a9d8ed3001f66473e39ee2bca2417ba SHA512 f742b0908db5b89cd69b910497da75f129a0bc73b6068df891a4b8673d233b3bacc5347d98a872fdf8984f588c4991ae6c2b65ab60fbf81bfc5474402efae44a
+EBUILD yarn-1.22.4.ebuild 1057 BLAKE2B 40ca4f1e345f8914a672817c21b0a5974ac314b9bc10f54937dd7d607f492725e7e41632d4b75a0ab62b43607a2aa90b6f2ea83b4a1844ae098f0f12cefc7b45 SHA512 a50ec0902a9a509918b979a634350e048d9ba5f768cceab11b1b2af08076aaa85cd2e22174934f010330eb9ce0c08402ac77cfb7a58d6e33d7162e27784c261b
+MISC metadata.xml 654 BLAKE2B 4554ddbe2ccaaf07ae2324740b9776f7473ee6a10638b8b91dd75a4451c4030a0bc0cc41dc3fe91e392cdfe07ce6bbd55e9b04f2cd31b9c4021456c70e219237 SHA512 42ea44ef45e4c756ec6b04a657ae184380fe34829b3d770e125762bfa22e4d950a537d82e90e08ff6786dc46927212d0b5ab44e788070d0d7e05072c28440a5b
diff --git a/sys-apps/yarn/metadata.xml b/sys-apps/yarn/metadata.xml
index 3533828aaf9d..52bf09ed0f47 100644
--- a/sys-apps/yarn/metadata.xml
+++ b/sys-apps/yarn/metadata.xml
@@ -10,6 +10,10 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
diff --git a/sys-apps/yarn/yarn-1.22.0.ebuild b/sys-apps/yarn/yarn-1.22.0.ebuild
deleted file mode 100644
index 706453936e75..000000000000
--- a/sys-apps/yarn/yarn-1.22.0.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
-
-MY_P="${PN}-v${PV}"
-
-DESCRIPTION="Fast, reliable, and secure node dependency management"
-HOMEPAGE="https://yarnpkg.com"
-SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!dev-util/cmdtest
-	net-libs/nodejs"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	sed -i 's/"installationMethod": "tar"/"installationMethod": "portage"/g' "${S}/package.json" || die
-}
-
-src_install() {
-	local install_dir="/usr/$(get_libdir)/node_modules/yarn" path shebang
-	insinto "${install_dir}"
-	doins -r .
-	dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
-	dosym "../$(get_libdir)/node_modules/yarn/bin/yarnpkg" "/usr/bin/yarnpkg"
-
-	while read -r -d '' path; do
-		read -r shebang < "${ED}${path}" || die
-		[[ "${shebang}" == \#\!* ]] || continue
-		fperms +x "${path}"
-	done < <(find "${ED}" -type f -printf '/%P\0' || die)
-}
diff --git a/sys-apps/yarn/yarn-1.22.4.ebuild b/sys-apps/yarn/yarn-1.22.4.ebuild
index 706453936e75..0374a801dbc1 100644
--- a/sys-apps/yarn/yarn-1.22.4.ebuild
+++ b/sys-apps/yarn/yarn-1.22.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="!dev-util/cmdtest
diff --git a/sys-auth/AusweisApp2/AusweisApp2-1.20.0.ebuild b/sys-auth/AusweisApp2/AusweisApp2-1.20.0.ebuild
deleted file mode 100644
index 4cc7a6c7a052..000000000000
--- a/sys-auth/AusweisApp2/AusweisApp2-1.20.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Official authentication app for German ID cards and residence permits"
-HOMEPAGE="https://www.ausweisapp.bund.de/"
-SRC_URI="https://github.com/Governikus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="EUPL-1.2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols2:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebsockets:5[qml]
-	dev-qt/qtwidgets:5
-	net-libs/http-parser:0=
-	sys-apps/pcsc-lite
-	virtual/udev"
-
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=( -DBUILD_SHARED_LIBS=OFF )
-	cmake_src_configure
-}
diff --git a/sys-auth/AusweisApp2/AusweisApp2-1.20.1.ebuild b/sys-auth/AusweisApp2/AusweisApp2-1.20.1.ebuild
new file mode 100644
index 000000000000..869fe92ebae0
--- /dev/null
+++ b/sys-auth/AusweisApp2/AusweisApp2-1.20.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Official authentication app for German ID cards and residence permits"
+HOMEPAGE="https://www.ausweisapp.bund.de/"
+SRC_URI="https://github.com/Governikus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EUPL-1.2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols2:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebsockets:5[qml]
+	dev-qt/qtwidgets:5
+	net-libs/http-parser:0=
+	sys-apps/pcsc-lite
+	virtual/udev"
+
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=( -DBUILD_SHARED_LIBS=OFF )
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/sys-auth/AusweisApp2/AusweisApp2-9999.ebuild b/sys-auth/AusweisApp2/AusweisApp2-9999.ebuild
index a4ae965bed85..6d319e9081a1 100644
--- a/sys-auth/AusweisApp2/AusweisApp2-9999.ebuild
+++ b/sys-auth/AusweisApp2/AusweisApp2-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake git-r3
+inherit cmake git-r3 xdg-utils
 
 DESCRIPTION="Official authentication app for German ID cards and residence permits"
 HOMEPAGE="https://www.ausweisapp.bund.de/"
@@ -37,3 +37,11 @@ src_configure() {
 	local mycmakeargs=( -DBUILD_SHARED_LIBS=OFF )
 	cmake_src_configure
 }
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/sys-auth/AusweisApp2/Manifest b/sys-auth/AusweisApp2/Manifest
index dadda0583db8..546f4889eae6 100644
--- a/sys-auth/AusweisApp2/Manifest
+++ b/sys-auth/AusweisApp2/Manifest
@@ -1,4 +1,4 @@
-DIST AusweisApp2-1.20.0.tar.gz 9727544 BLAKE2B 23d31b5cff2756948d563052ff53fffb737c6895fddada036969350b0a65f404f8def70f8ac4409a34fe9f83160e15cd8d4b6441f901f8e53e791ca386140383 SHA512 9222bc59521aa3533c79206df14b079e618f6efbdd04c11b4cc754027dc155d2ad4a321cabdbb35b9308f5e9631ca05e828969633125fe0ac651156669a784d0
-EBUILD AusweisApp2-1.20.0.ebuild 833 BLAKE2B 86af2e93ad1e61bb6fa6be7108e34e4d743e63280c9f1eb1b034268cd058979a22b4671666930a2655aa2716e7b6aaecb531f7e2319d2dd86b573c4df943044d SHA512 5357ce53f301725a0ecd31bdbec96a5e025f03cb8c389c28947626a7d968ebe4f8b40a6068e4c32ea35fc10a3411ebbb35e0486ed5db8032aa0b593c2f458a1a
-EBUILD AusweisApp2-9999.ebuild 797 BLAKE2B 9a0fb6f00651921fafe971fed89f73e50aab2aae439179a95c4712c481a1fb8327f131f439ed5e971c75e7f4b5a2a9f52cc367071c09f442ce8e8029eac28a58 SHA512 197dc3bf334e8fe49613f90754e0d3e39e317e389716282c28330de123c76fe147e46af56473370f483be6a10e6d4b4d86efed904040583ae77a429a02afac34
+DIST AusweisApp2-1.20.1.tar.gz 10103225 BLAKE2B 79afb6e793827bec16c0ba4830d87e4ab5da35a76cb1ce1a9e59ee70a7e8c7606ae1f2244ac73fbe6ac758d559451dbaefe7cc4ad9f49adb33228af3d2647051 SHA512 08e51207bca38871b6cfc3146fa5252bd18bc018d91b7c4cb847519b0282aa5d0e6ff40ffa0bf389c421fed0d40855044e7eb9e0630ca8dc639c263d3055c1bf
+EBUILD AusweisApp2-1.20.1.ebuild 927 BLAKE2B 189d052846901114eab68f288d8cab9ff15795b52fb573c17cb48a3ed03d5f2d496fe1937a9bf48486804ed63d9fbb60d1f6e56ec952bd8f9e49b8e0d1c9a156 SHA512 fb174fc212561015ce6ecc55a7b2f9f2785d4fe91b8a1834189b88a4fffdc7fb0995a3f82c83f1283154f108430271136eeeb3e1385d335eb5fddeb92d913bb1
+EBUILD AusweisApp2-9999.ebuild 891 BLAKE2B 924618ee8a22a0ef8ad2ef62a0e8fc7448033f142371c32f814965275cb376d46e15822a9899031cc03a8003cd7159c1a94e8652a0eaf8c4acfa34eeeffa4e40 SHA512 83506e86320528f4ac17c6ac9aa80060aa9ecdf875817d12f0a680dffaf242495546aa0076c1f8185dc7eccf3dd00e87490e7ccf18028b14a57330f9f75a9894
 MISC metadata.xml 569 BLAKE2B ff252fd4eb0ba94a0b1737dc7170be7e77c031bd7be1c642c1b1b6a83ab2c217facfdc3a689bf10bcbecf044d2b4fd01563e9bd77e84d8b31a85a900f865e137 SHA512 cafac913b71aa8a40dcca2e1dd69132aad723b2d2a75dae6fb0c8954c5c3692aea1cbfb94bb1e0d8638bf4d0a74c9adfeca4d8243fe6f20cd3ad941d239760e1
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 122842385b01..d04cafc5239d 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/libnss-nis/Manifest b/sys-auth/libnss-nis/Manifest
index 98775c8c7363..69e6ca582179 100644
--- a/sys-auth/libnss-nis/Manifest
+++ b/sys-auth/libnss-nis/Manifest
@@ -1,6 +1,4 @@
 AUX libnss-nis-1.4-glibc-2.30.patch 5087 BLAKE2B d77c5dd017ea749316dd2e6bda57db7cd76625add78bebfa21a6454b8bc35ba827906ac2b0e2fd30c34595d22d633fae810fd21d27dbd0593e108377347d858a SHA512 df2503420f1499510f9e59f9615bf2904ebd7a07a6197413127643f4dc29420b33cefcceb356eca9029f206cc01d1e410b2656c57ae8304a099d3f1770803282
-DIST libnss-nis-1.4.tar.gz 209887 BLAKE2B ca9c2d66080568cc7748b4df4b0318687cf9dac5717c84a8e84d033a3a0aa0d59b3159c55ad2e1513e161b40acea59c3df8cddaea1ff4897a0599777179bd7f2 SHA512 56338a1dd60b756fb40e7e08c0d7d49ce98b47f684e7278aaf1a521a74f02b23cc73908adbd6ff88057f2f0e42301f827f888fc7af82aa57ff9449a05de73b75
 DIST libnss-nis-3.1.tar.gz 225933 BLAKE2B 23b0c760f48f2f1bd2bcd6a1d3b2e7da0bc2f186b23f4ff961faf78b76bfbbaaa238a510979b086f279f4c4e25f98d9ae8631e5222dc7479e8c50b0f4572b0da SHA512 fab2d035ef9cea5fa6351c44085a96f9f90e50550b77aa3898e0d5a6ff296951b22b4ac58979d07ae3b3da2f97c7e47ab466e1a5868e7f218971028174159636
-EBUILD libnss-nis-1.4.ebuild 890 BLAKE2B 5ed3759ea94873582035ad45cd9d8292850d2c933a5deb86d20e3a916aa2af99e025eb96dc4dbf953b4ec70475b7a7362825701d6ad59f48e15cdd6d8b3e9edd SHA512 a1b5d83a1e56a88db3f6f495bf8b9ec6167ceec45de77c6249be60515d7ddcd966698e9e3bea7621adc5b43f559ff8225175eb322206c00d104bb1ad6ef2b4e3
 EBUILD libnss-nis-3.1.ebuild 841 BLAKE2B 50a594d0c1fa5af66a92f5dca43ed14fee93a33671f8170ba36f6dc0771d5f773834e9b99e82c7e71c2105d5c427a794e56795776b8994d7942f0eec7b74881e SHA512 6bca9ea40bda16e242f3141bc45bb776e6193c47a9e349eb19673039ad53ec28a7f56e5b4a18c6367ca4d849e3ac12d10e04cccea88f46ee644df1e193734f4a
 MISC metadata.xml 221 BLAKE2B 79f6de476af31c1da59c7aeebab26fa0db49c902398f6f73beeca03d3077820240bc51a25d2945642d9a07470470f2ca9548c2d8f1c63a8592966f6df9955926 SHA512 edb14bd2dae6ad57f77c07fc601cf2782589165c7e48e1e123eff7e47044febfdb1e19d18cd0b240fd2ca494e3401b5aa1f1243480769e0faf5dbfa377d20a3b
diff --git a/sys-auth/libnss-nis/libnss-nis-1.4.ebuild b/sys-auth/libnss-nis/libnss-nis-1.4.ebuild
deleted file mode 100644
index d067904370e6..000000000000
--- a/sys-auth/libnss-nis/libnss-nis-1.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="NSS module to provide NIS support"
-HOMEPAGE="https://github.com/thkukuk/libnss_nis"
-SRC_URI="https://github.com/thkukuk/libnss_nis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+ BSD ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="
-	>net-libs/libnsl-0:0=[${MULTILIB_USEDEP}]
-	net-libs/libtirpc:0=[${MULTILIB_USEDEP}]
-	!<sys-libs/glibc-2.26
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/libnss_nis-${PV}
-
-PATCHES=( "${FILESDIR}/${P}-glibc-2.30.patch" )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--enable-shared
-		--disable-static
-	)
-	ECONF_SOURCE=${S} econf "${myconf[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 78fdb57b1211..59a7a1f38c90 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/disktype/Manifest b/sys-block/disktype/Manifest
index 111309c26fcf..06f20fe70598 100644
--- a/sys-block/disktype/Manifest
+++ b/sys-block/disktype/Manifest
@@ -1,3 +1,4 @@
 DIST disktype-9.tar.gz 43809 BLAKE2B 9155705c02ad7a9c8c799d5b728517f9de9e837464e019f3c25aa74f6b784e634ea65c67bdb3817eb0bc816c494ada28968cf85885eaff2a49db14d430b9a4c1 SHA512 3642e35af55341db089d3b671ddecb026eca67a9f63ba55456a0c63c3fa611e3888104e5c14c18959435577a08d1fd93f1794fbb37e0d8118ab9be65f474bdf3
+EBUILD disktype-9-r1.ebuild 525 BLAKE2B fdb4a39ae53f72d7f0767a81bf846b136a8cfc0537f6358f2710492bd9a8a7e1fa343b4ce95e6e06e03919678ed42eb4c16e2c10a2fa04ce6eff9ee4ede6f17b SHA512 511ccf6ac1fdaa79eb5d44e30975415556e9c7f55a89af786df59a00001373158aadfd7e8fe908a11146955c7379a57add10589a33d5b3327d004536946f5b52
 EBUILD disktype-9.ebuild 528 BLAKE2B 11946cd15e0f707475612ce90a4a147cf804a4129b60ca5411734bb1e2c25fb8200436362180ddb79710599b0e4d9162fb29f5a20c8738b1a99c8aca781f64be SHA512 99b2179df96f55dfb5b721e528c58fd8cbbe92603bea2592bd72db2510c5e8e13c62c72bf2b591db4faa7369e2f1a1d1f5d7e37d29503e93ddf579e0642302e6
 MISC metadata.xml 1365 BLAKE2B fc972acd201480c3ee7defcec10d3f2392d40b8212c8457238fa4bfaf545e2452f9ffc814403ddeed23856e288c4175c9159fd77b794161635b5bf13d52fb92c SHA512 163cdd2d8b0f6bd22ee9cc4801a2bba0a89df27e1848182edcf1ab48d9c9fb066e5ae254437a2283d1a9b9c59f709c7b35330b4e4e12cbb965010b5ed8b62cc7
diff --git a/sys-block/disktype/disktype-9-r1.ebuild b/sys-block/disktype/disktype-9-r1.ebuild
new file mode 100644
index 000000000000..ebfafa2cc36f
--- /dev/null
+++ b/sys-block/disktype/disktype-9-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Detect the content format of a disk or disk image"
+HOMEPAGE="http://disktype.sourceforge.net/"
+SRC_URI="mirror://sourceforge/disktype/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin disktype
+	dodoc README HISTORY TODO
+	doman disktype.1
+}
diff --git a/sys-block/f3/Manifest b/sys-block/f3/Manifest
index b102fc0f750a..8fceb834afc1 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 1019 BLAKE2B cd4c4076c5e496c3401abb85a5eb076840ef0ad487c9c9221e9ed160aee997584e9a0ceb94115c61b6484f8ab02b3513c3680f7218e6075e27edcdb48a4213e4 SHA512 f66882843050b09d26d352b91684e37dc64752342403c1100d7615f2095b09efcd37cca32bd7a3524dd085825e0cbfa3da6d5a5141504591deb367d6b32914fe
+EBUILD f3-7.2.ebuild 1024 BLAKE2B 9a667aeba7406e8c7052e27786c7227cb891e6b8ca50d58eecf889532d1a51e043effc14e92e52a8ae956687c8c76f878fc4c5b18e78290c394f1edbdef33529 SHA512 ce0cb757390b388699f342015da761a51686bcf135dd17abf4f16560daf04d7bf4349fcb307248afa9cd6d7fc4bf2be17d4478a5d437c331b397df6ade2f58af
 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 cbf537f43586..9888e5edfae8 100644
--- a/sys-block/f3/f3-7.2.ebuild
+++ b/sys-block/f3/f3-7.2.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/AltraMayor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index 0f0a865f4743..5e0d8aa21e91 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -1,6 +1,6 @@
 AUX mbuffer-20180410-sysconfdir.patch 897 BLAKE2B 1fc57be6f5ce11f483d43dc69c9e4120b09a4c59caaee90deefd5500058ea0c8b9cd6b9b3dea1a2f21733acf4eb8a922171d791e57d658275997ca951f73559e SHA512 36964604338a0bfd0e9cb55d17b307f32dfe09d280019e8083e5909b81e091887bb8f360ef9aebf21eb8448a3d9ba305a6f7a7bc35ea4884418bb7d67e9fadb0
 DIST mbuffer-20191016.tgz 145508 BLAKE2B d69600544fc0ed9e619f07f552a5369aed24f8a93588edd2a205613bdf5ebd5c636cda24702149bf7a82605c9a956408b56555c1577eb83c8f8ca0eb49c5c14c SHA512 78142a3f1529609b12151aafe848ad768a6074f4891bedaa52cc46ffa14350a2a8c0362d02621fa227bda54e98eabc4970c00838114574540873b426fbfe97a5
 DIST mbuffer-20200505.tgz 146020 BLAKE2B b85742f710405e29775c7d25e9c1be733fd94d7157018017b7c8fb5b5cdeab7fa8819b024d297d96af960a73a8982fdeaefe50627c605f797df4d75b0c15435f SHA512 8a1e5721869fd705d02486cf93467bfe0a59b58789826ca337c18a023e9fbb18c1651211bfebdea4cdd45772ad23d0715bb3892bed04ce66f5fbe72406cde9f7
-EBUILD mbuffer-20191016.ebuild 1498 BLAKE2B 03103c45840be50c95180bc54697edb50b43c3d5cadd686710c1429ea4f7acc18b4037634784438f2c6a57103e2eb7deb226f4327edb3afb9802c15dd506b23b SHA512 c282f00bb02de541130e7beddcd46d369fcd55b146c6be26630ccd10361815ee1771732cdbaf0ae908bb296cfd5e3dc34d2894d464e750dd940f456e490c9fd1
+EBUILD mbuffer-20191016.ebuild 1497 BLAKE2B 073e82a8ee1138b306d37dd63c3047df020d91eb90264276e01c845a9001b3c4d951a31d02771205864576529abb41c5dcf7d53c588fd07eb2b19ee03a08e48c SHA512 e9477f102d2da811a19736832b904ba65645fff2f2a1f28220e04e79f13abd052159a97b3e0014d075941e4bda2d7f6bfdeaaecb4aaebedaa34caab9e03649e5
 EBUILD mbuffer-20200505.ebuild 1501 BLAKE2B c5f87a3fe6fc28352c732fa9f95d0e91601a41030e8085da1fb7bd29a2ec62dd895b7dc92594d358234b0d843e29b89c483982c6328ec682e126f30990a953cd SHA512 b3f83676d9eaf44c2bd7ee24b0930ebbaf98501a4f66bbf370f233cf360e706cc7049d04f96a461acece024ab0c4ab344f4b92245ec1c6fe0a2b6734e5057a34
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/mbuffer/mbuffer-20191016.ebuild b/sys-block/mbuffer/mbuffer-20191016.ebuild
index 6b311595af38..a1a48e24a58a 100644
--- a/sys-block/mbuffer/mbuffer-20191016.ebuild
+++ b/sys-block/mbuffer/mbuffer-20191016.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.maier-komor.de/software/mbuffer/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc x86"
+KEYWORDS="amd64 arm ~arm64 ppc x86"
 IUSE="debug ssl test"
 
 REQUIRED_USE="test? ( ssl )"
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index f274bed962dd..db6ec08dc830 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 f38e2bff9761..8a1b1885a3ad 100644
--- a/sys-boot/gnu-efi/Manifest
+++ b/sys-boot/gnu-efi/Manifest
@@ -1,4 +1,6 @@
 AUX gnu-efi-3.0.9-fix-clang-build.patch 691 BLAKE2B 5b3f60e27982cd9e2cfb385851af4840d0301c1fb590d34b029e18a239a232ecca6a62431e10138d4e12cb44a5f64b415936935c1bdaf601dcf605ebe892de54 SHA512 1f77f4a5dcd2f1589cd6950da3462f2508d0ac51c2d2268400414c336ddd41fcf430e79fb702fd5aa99cb4be0bf0fc6eabe9362d736a1223b1c53c2c0b319584
 DIST gnu-efi-3.0.11.tar.bz2 154456 BLAKE2B dd8d5100ee65e2f94d6b67f0d2236674c7c2b6f553ac0b2d8fdc83e49c69bec0dce1e2e8730705f70b3b7b0a61e4f065773667945ffc92a6f40eba381fcf6723 SHA512 1a6b06b69eb95e03c00fb1c476bf346ab2cb0ecca9a44e163f52f2aa4b9837d3dd2d3ed8b4ce77aaf32a66e49f826ea5b43a97c8c7c56aaa030bc20b3415122a
-EBUILD gnu-efi-3.0.11.ebuild 1883 BLAKE2B 2970066312f081c9ab8ed47c7160516ff81623cddb409a186a7165632a61f58b96d2998caead7dcbdb2f6e0c79ac3a0ee39d2ca940358361841adfbcc990e58b SHA512 d708339e31740c150505ed11c9e1de707177717d14a8acf9c496969642b1a9c091120db3f70dc2baca45d94ae0c58f836966d5a5b30b989f19c6ff8dc03ba511
+DIST gnu-efi-3.0.12.tar.bz2 154575 BLAKE2B 264e04351cf1ef74956e65d209c00514c0f56c18427a87a894132e5a5b0b09b3ca992475a2f95aac42c8a26ff4977ec837ff473d76c1c766049e903f03bd9fff SHA512 cbec6f6e37271c22c71e3ce44d3579e48e7f3b797ec3946f56eb843ed3e472722763c566fc3b749f0c692ab6cb26e8909bb258cd164771a5b1eeff5c7cd51368
+EBUILD gnu-efi-3.0.11.ebuild 1893 BLAKE2B be5aa026b5aeadb8e39322013446277ea08bf96cbee08eeadea7a8392d56b1ad45f7d5963ef7f1baeef459e54fb68bc24ba5faaeef72f52e64dde1a1ef767d17 SHA512 be87d6720e42a9ff0334fb5e79b85d272339d332fa13bf8aa415badcb68bf3727b63ac241f44a1efcc1e44f869fa122350298837526d064d79931ade56e0cb3d
+EBUILD gnu-efi-3.0.12.ebuild 1893 BLAKE2B be5aa026b5aeadb8e39322013446277ea08bf96cbee08eeadea7a8392d56b1ad45f7d5963ef7f1baeef459e54fb68bc24ba5faaeef72f52e64dde1a1ef767d17 SHA512 be87d6720e42a9ff0334fb5e79b85d272339d332fa13bf8aa415badcb68bf3727b63ac241f44a1efcc1e44f869fa122350298837526d064d79931ade56e0cb3d
 MISC metadata.xml 446 BLAKE2B ed77ce0b04fab42aad08921e9365b866a3d64d5192a569ad161e0415a2bbe1e9b374a48e1b2357331cf9743fc082a22c6b68081bddaa6b783e5cc78c4df394c2 SHA512 114721b7dc26234a2bce0ab65f2513f5bdd4749fd8fc5beb9619dc449bde13c82c88716d3e9b94a192d4298019255fff1aa32beaa15b643490fdbc25e75d83f8
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 27742adc9b20..8cf6e78f27e8 100644
--- a/sys-boot/gnu-efi/gnu-efi-3.0.11.ebuild
+++ b/sys-boot/gnu-efi/gnu-efi-3.0.11.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Library for build EFI Applications"
-HOMEPAGE="http://gnu-efi.sourceforge.net/"
+HOMEPAGE="https://sourceforge.net/projects/gnu-efi/"
 SRC_URI="mirror://sourceforge/gnu-efi/${P}.tar.bz2"
 
 # inc/, lib/ dirs (README.efilib)
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.12.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.12.ebuild
new file mode 100644
index 000000000000..8cf6e78f27e8
--- /dev/null
+++ b/sys-boot/gnu-efi/gnu-efi-3.0.12.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2004-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Library for build EFI Applications"
+HOMEPAGE="https://sourceforge.net/projects/gnu-efi/"
+SRC_URI="mirror://sourceforge/gnu-efi/${P}.tar.bz2"
+
+# inc/, lib/ dirs (README.efilib)
+# - BSD-2
+# gnuefi dir:
+# - BSD (3-cluase): crt0-efi-ia32.S
+# - GPL-2+ : setjmp_ia32.S
+LICENSE="GPL-2+ BSD BSD-2"
+SLOT="0"
+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),
+# so doing these QA checks on them doesn't make sense.
+QA_EXECSTACK="usr/*/lib*efi.a:* usr/*/crt*.o"
+RESTRICT="strip"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.0.9-fix-clang-build.patch )
+
+src_prepare() {
+	default
+	sed -i -e "s/-Werror//" Make.defaults || die
+}
+
+efimake() {
+	local arch=
+	case ${CHOST} in
+		arm*) arch=arm ;;
+		aarch64*) arch=aarch64 ;;
+		ia64*) arch=ia64 ;;
+		i?86*) arch=ia32 ;;
+		x86_64*) arch=x86_64 ;;
+		*) die "Unknown CHOST" ;;
+	esac
+
+	local args=(
+		ARCH="${arch}"
+		HOSTCC="${BUILD_CC}"
+		CC="${CC}"
+		AS="${AS}"
+		LD="${LD}"
+		AR="${AR}"
+		PREFIX="${EPREFIX}/usr"
+		LIBDIR='$(PREFIX)'/$(get_libdir)
+	)
+	emake -j1 "${args[@]}" "$@"
+}
+
+src_compile() {
+	tc-export BUILD_CC AR AS CC LD
+
+	if use custom-cflags; then
+		# https://bugs.gentoo.org/607992
+		filter-mfpmath sse
+
+		# https://bugs.gentoo.org/619628
+		append-flags $(test-flags-CC -mno-avx)
+	else
+		unset CFLAGS CPPFLAGS LDFLAGS
+	fi
+
+	if [[ ${CHOST} == x86_64* ]]; then
+		use abi_x86_32 && CHOST=i686 ABI=x86 efimake
+		use abi_x86_64 && efimake
+	else
+		efimake
+	fi
+}
+
+src_install() {
+	if [[ ${CHOST} == x86_64* ]]; then
+		use abi_x86_32 && CHOST=i686 ABI=x86 efimake INSTALLROOT="${D}" install
+		use abi_x86_64 && efimake INSTALLROOT="${D}" install
+	else
+		efimake INSTALLROOT="${D}" install
+	fi
+	einstalldocs
+}
diff --git a/sys-boot/udk/Manifest b/sys-boot/udk/Manifest
index ee441487417d..c09ec638ce37 100644
--- a/sys-boot/udk/Manifest
+++ b/sys-boot/udk/Manifest
@@ -1,6 +1,5 @@
 AUX 2015-makefile.template 1543 BLAKE2B 6f16a0e3c726a99a30b68cc24f7a85267b1748c4822e1970c498f877d22195989022ddd1e1d2496744b5a8b1dde1d9dc2ebcb7dfe336b01c7258430938d05531 SHA512 c09aca05b07dbd5d2ac1979b98d889e0a2a44e6c12292cca5c6033e1c094acbf155ef1649a7f0b923e3062f4f2fd8f650f57523625628a29828c22ef1f95b405
 AUX 2015-tools_def.template 2575 BLAKE2B 9666cb1b6d225eec6e6ca3762b6c5b10332f045035787585805485b9d7ba54a54543855adda8253ecd451674d00c4beaf153a94dd3ff4c8b5ab1fa5b72d92610 SHA512 7bf9e23434ec6e4abaf525a857719d5ddf3c355a4dd2f2f6666db62cfb9b9f981180a4886d9e98f43b82b2b4a397a862201ded196ed12726b2f813d5a61bbc86
-AUX 2018-makefile.template 1059 BLAKE2B 6dda7de8a85fc2d8a55078ee298d622618da72f486a3453193dd0c0f5db1494433af6295909dbeb357aa967b58f640820d2f4790a4bec9304db0ce6e49ba2fb4 SHA512 527242cb30b23c3f2f9d6409f28d02bc41367e5cf15484819d0d8eb894b10252c0fedd4f0b11e8b5383216584846495946aad22a5ed7d25ddde511701e13b0cd
 AUX udk-workspace.template 1426 BLAKE2B b35a6e0e73c6724a29db2ad93ebceb35416d6d940b49ce6a6ec04e474e795afeaa4cf290dcb5e935f2e8e4f8dcd724619ddc3aa2b73e417e119db1cc523976d9 SHA512 6a28aa21e75ce7aecf35f469fada37591c4077749746a45153ab98bc91a09757582e5fa4813af657fba4c54ae382bf8d1ce52057b51fe10744b30b1e8a8bae6b
 DIST UDK2015.Complete.MyWorkSpace.zip 121736982 BLAKE2B b37bd9ead6ce2c665128199249483ecbcb0f410077d0ca61820bdccb7ae71f6dad870a3cf2dad79f997ad9114678fab3c15a17227ae33aa1ff66f9187aa3a568 SHA512 7856a8f29296f817e8fd09d8eaf7207f4e25a13faa10936d1ceb10cb6a900be265379722c0ade0ef93b1c640fef8693667d2567962e3288b20ae77f607f03d39
 DIST udk-2018-docs.zip 79352781 BLAKE2B 9d08579d4645121cabb7ac52850de6492f9990240da9236064352df0595867bfc6952c9858865a8ce1d81982ec0e2440dc19930a75595454257294462adc60d6 SHA512 6ba2d961f20267cafb94bd020e8fe71e1392f1f2cdbc5c9f0a43212253ddf137b3e12cc789299dfd1ea099bb1541703b995ae20d28f0275395f5f85ed0656954
diff --git a/sys-boot/udk/files/2018-makefile.template b/sys-boot/udk/files/2018-makefile.template
deleted file mode 100644
index 049a94facd81..000000000000
--- a/sys-boot/udk/files/2018-makefile.template
+++ /dev/null
@@ -1,41 +0,0 @@
-TOP := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
-BASE_NAME = «MODULE»
-EXEC = «MODULE».efi
-SRC = $(shell find $(TOP) -type f -name '*.c')
-OBJ = $(SRC:.c=.o)
-INC_DIR = /usr/include/«PACKAGE_NAME»
-LIB_DIR = «LIB_DIR»
-DEST_DIR_DEBUG = .
-«STATIC_LIBS»
-
-EFI_LDS = «EFI_LDS»
-«MODULE_TYPE»
-«VARIABLES»
-
-comma:= ,
-empty:=
-space:= $(empty) $(empty)
-
-all:	$(EXEC)
-
-%.efi:	$(OBJ)
-	$(DLINK) -o $(@:.efi=.dll) $(DLINK_FLAGS) \
-		-Wl,--script,$(EFI_LDS) -Wl,--defsym=PECOFF_HEADER_SIZE=«PECOFF_HEADER_SIZE» \
-		-Wl,$(subst $(space),$(comma),--start-group $(STATIC_LIBRARY_FILES)$^ --end-group)
-	$(OBJCOPY) $(OBJCOPY_FLAGS) $(@:.efi=.dll)
-	$(CP) $(@:.efi=.dll) $(@:.efi=.debug)
-	$(OBJCOPY) --strip-unneeded -R .eh_frame $(@:.efi=.dll)
-	$(OBJCOPY) --add-gnu-debuglink=$(@:.efi=.debug) $(@:.efi=.dll)
-	$(GENFW) -e $(MODULE_TYPE) -o $@ $(@:.efi=.dll) $(GENFW_FLAGS)
-	$(RM) $(@:.efi=.dll)
-
-%.o:	%.c
-	$(CC) $(CC_FLAGS) -I$(INC_DIR) -iquote$(TOP) -c -o $@ $^
-
-clean:
-	$(RM) *.o
-
-mrproper: clean
-	$(RM) $(EXEC) $(EXEC:.efi=.debug)
-
-.PHONY: all clean mrproper
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 5f307b012c2c..f0c7f1355299 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index f0ab475e317b..11dc71e7f73e 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -19,12 +19,11 @@ AUX ceph-14.2.0-cython-0.29.patch 946 BLAKE2B c251b6a171e5e0bab3f8716b79eb3138a1
 AUX ceph-14.2.0-dpdk-cflags.patch 1171 BLAKE2B a6815317d3828cee8d2476d6cc77b60d089db5b5ab0b30fd24c0ac10270ce930ce3049f1b22af71e5b39a6e323c672245fb78753e7ed901055afac8371cbcb9f SHA512 ece01fcaf0b82c441618eea1f37fc2658aa356de1128121d368769fdbf6316b226ea15a781353b115c0a81921c8872bb3d003ecbb1e8f1b456bb8cf6db8f091e
 AUX ceph-14.2.0-link-crc32-statically.patch 428 BLAKE2B d324855dab736eeecf5835e79c4f2fad9ea4d10aa29b2b03ab6274efa2f54a5cfdad710552662a49d5f61466e1cd9d6c2fc8a42373961e3334f39b806e647feb SHA512 3efe70f826ebc207f1ce8744483c9a82ebbf8f3cfa81c9cbb3152b40f5b540cc9cc21e6bd3370197bee9a27a01c3e3725754d044069bb760c3dbfbc97fe4276d
 AUX ceph-14.2.0-mgr-python-version.patch 685 BLAKE2B fbd36e0f5fe45be7cc58cf11b2b83613c2f7f7fdfd64d4f04729c36e5ebc110341aa4c5521d9be590bfb7a7812525130e773a346827461df0a108fbde359b161 SHA512 af0851913cf8b42bad71ece4e41017f71e91db19aeeebb5ea0306055d6d6d9e7eb9ba34224bb2583ca437d44827de8852727e8a9dd809d942d4c277ec3da3214
+AUX ceph-14.2.10-missing-includes.patch 635 BLAKE2B 22d26c1aa7815f1acd2fbfd7b3350775d8c1d3bc70b70943aba28c3974d4e115050cb8e0f2dacd9ada7b3dca41b329f83db55e51d7b3dc883458d56eddd98b7d SHA512 eb5707835859669ddd9d817513eddafe738af3c2f2755ad2288aa2f628e90dacc9cd5656dba4db2bcdf5ebcffb450f17fb9dd125bf157faeaeec284d4da6aa9d
+AUX ceph-14.2.10-python-warnings.patch 1536 BLAKE2B 49ce59204096e02f9e10037dcd365fdc6e95cabf69602592019470cc069835b139b6ac2664aff94ddf6226998fa63337db751b9daa7c9ec87eb4729063a34f4e SHA512 c9ebdfaa9d93ca8e287059f817df01294d0a523831e4212e534cfbcabfc70d4e11d154fce42931f8e65926cb7e5cff09dc9c8165268bf24010533e471e370aa1
 AUX ceph-14.2.3-dpdk-compile-fix-1.patch 4729 BLAKE2B 96e709b592a7ea9324f54acf75ac3f78334a0d2b155f6d4b5360df8b13e2c9c8e5f6d6b19da5ddb7760c56d9307e056db9aeecec1926dddec88b6b685eb55374 SHA512 d0849fa120b3d7c26106e75bd830874854ee4214ac867b577f4486e4a033b2f555fa6745910f90d26f7fa5280bff01f5880eda9a2bc6edc856400a5756a8346b
 AUX ceph-14.2.4-python-executable.patch 922 BLAKE2B a5c9e8c70de62a974ea0bea4159874447d725a566d75a026ca125a7db0f24a8d92212d067c8dd91b75ec1e2aab12e46da464f320c7e696cc916e29a4e0d28f93 SHA512 b263de28897f05fc3a201622b90a222bb2c6605d4e6d8921d3c8101247a41a44e1f9da4242f208e1ef4d10ae028917510f4390cc69595b77b723545f0f72eeb2
 AUX ceph-14.2.4-undefined-behaviour.patch 1990 BLAKE2B 4f9839bc05c95d40c870f346ebb1856f2846adb26fcbbed67e260f47def9b7167bac4a15917262e8c9dbb99cb83892da2aa315b6d9ee8cd60eb222876dc56482 SHA512 15e4df7cadb02e65144dffea3c287e853e27a04c18281c13282409f1bc28184f31b80d505123a3a29e5394fa0b5e3e3f1246bb70353f142e52e19939149a341e
-AUX ceph-14.2.5-boost-1.6-python-sonames.patch 987 BLAKE2B 526a863091ce68d2b762446bef3ac70a9a25e64db62db7b9a0507d05fe482fa5dbd0badd86f4434888f4f10668780aa9e3f8f4de30b508811e8f5a1a9d76cc0d SHA512 67c4830b2d94f697331e7ab423f7b196833a1ce762894b756caa44dca7899124750ae1ea53bb47b4c0280e1d4494d7be47a68c6ead66d13339c10b353363ed57
-AUX ceph-14.2.5-boost-1.70.patch 3601 BLAKE2B af39a65d9303d8516d1147afd7287d22725b23e722d5b38e708881b916d674a92f15f50a70047cd04050ab518518a0aca6a964f631b98ac9c98a599a1d891a99 SHA512 cb8d37d5d83a9e1e6e37f3a72719c0e892b09bb064f3cbd30b213e9be32662ebc1d3d1afbb2a84c7a8aa701d5cfd398ec4ef0c958de98b3eaffeeadc66004e11
-AUX ceph-14.2.5-boost-sonames.patch 19634 BLAKE2B 7f8225c9ae87ece13056f83b352983184ef473db53aa5da14125a002c14f355dfe8571e1fa4ea5d8241df3bebfc125c65295d4e8a9e2acbcd5070f9e05535a1c SHA512 a01e5a741cf91148d7154733233e04c6dbf8f6d672c498a5446385624c0c29c256f6031a357e899f9029335799707ee117c05468594333d05405b5acfb319b46
 AUX ceph-14.2.5-no-virtualenvs.patch 2144 BLAKE2B 1ade0666aa6dcaee8bf9da5d6e0d4f9c433afe2e59f7403d37409923f23c5de5de4451cf7193d57198c6b7617333f0ac7acdb2299411550f9bda833a9feb1e51 SHA512 e40fdef0c5b55393863cd662f52354f33f175519d746ee0ac37803616f02f9c207aeca0a1af8ecdc93742a3a63b97869a2032078a419c5746582c96fc7ecd012
 AUX ceph-15.2.0-no-virtualenvs.patch 3197 BLAKE2B 356a5d465e449b9de1ec2e0f1f1b38950954844bc3d47a2ba22118aba5376b050fbd56b366fe2913f87fa1ef7822ad4a6fff93511d02c67e3718bab0a1962b7a SHA512 181d56a168875ede97b1945976481061c5632ae79232f9d35a00adb4e5d1cf0acc9bd2e4ac7a62638574b149bcac639522c9914a08636603504385e0cbdd1292
 AUX ceph-15.2.0-rocksdb-cmake.patch 703 BLAKE2B 1c99a1a89be22cedf39326cbf7d6e381c76598ceb8efd4dc6e9f97033c8e654314b8a59c147a7d5daf0305aaedbb4ceb14b9c14e79f61e8fa789e74c0205b1f4 SHA512 20256de5c3227caa149f8285bcc90fcbd67be8cefa568fb72ad0d43688f1f62db7c7fc231dfd4ecf2dd11be68bf1ccc284ebbc691a82a26f3968200f12c82097
@@ -44,11 +43,11 @@ AUX make-node-frontend-tarball.bash 3196 BLAKE2B 1779c8fe924d8a341bcf922da310c9e
 AUX rbdmap.initd 2373 BLAKE2B b88d79efc722e2de3d1f0269664a976ed45fbb0a1c9d46fcfd058ea64d3ae7fe27d13455f2ac5ca06663d77cfac1d2f9d86d12bba926541042ac09a8778a3a52 SHA512 bbd48d6987e52eaf6d02bccf3aecd06596465af4d3ac93063f9a814106de162a27bf1a33ae1646e669efb3c754f3ba57f395523293ad643b0d81ee588252216b
 AUX sysctld 57 BLAKE2B 840eec3d188df4998c7ba8fb923777636ae9d2aa342545b69c12e5ea8aa98ae97349b42b56c65a531b207c5f970f873a79c41789941cdd10b279e38f1616f84d SHA512 410f5d721c6cfcc5d7ddaff4f348345140d4b8e1b8fddccb537118bfc59f573ecad63db448598423c9a58fcfdb4cef90e6af27b838e6b77955dfd47673f0f52a
 DIST ceph-12.2.12.tar.gz 77467762 BLAKE2B a5224432121db9ef49c1e22771d847399df2f7881cd9c2e185eca12096efb79d21578659d248eb5bae678924983d57452d370e23ab7e78663764d7bea834a461 SHA512 e694c9a8c1f9836c08fb74b54423bdc16d4900252e34643c56cf1a615d4dacddfb13df06a6a9f68bb9d438f5f07069ed358f9fa4b5a362640a3046f9c7722dcc
-DIST ceph-14.2.7.tar.gz 116647114 BLAKE2B f6971324b0467cfdb863db553b6feacaf3607b14fb9adae2808bd6e5514fc5ce218482c412b80902c22a74b883ed697f2c126bc687c8733a83de5b970593efa2 SHA512 59f475e56053ba5e7e3a482a3a91b4d44272e6ec8051b92783de76c09c0d967a7ef76676db998968a709e48f08e90828dd8f86bd96a7c3fd111d48bfb7fd93b1
+DIST ceph-14.2.10.tar.gz 129274835 BLAKE2B b3f14897db478418b982281bf367a0c497cdfa8991a73e277b5582663c159550f3eff5bdc78a506e267eae8d59c59b19b8a9294802cb532fd7dfa9f612ed0e53 SHA512 5ec95b933a360183f89404446c5e1912a81853dfb1134bb8868bc6675a0185420c2bf1eba72308014a008f617aeb8733d51eb8c8eea5d472c32514cf483f4ea6
 DIST ceph-14.2.9.tar.gz 128419205 BLAKE2B bace7469d9066a3da7320a0eb894013fae5b7139c15679dddae7df28c593a1029956234a1ba0d3bbdf1639e3a975aa776c695efefb915113a16099c80d563675 SHA512 0a26372d0037c32fe1d24be880e272fcce5089b02adfb0e791e0406155f6e66c913fa43762028f49c1fa3f30c6c8d819c521dd11702a37cc7040dfd3097c068e
 DIST ceph-15.2.3.tar.gz 147807898 BLAKE2B ff5e9707cf05e22af718ee177cce87ea9913b1b78d7ba17589f2c7fdaea0a7a27dd1f7b8e9947a095ed74106b6b19258fd8be259100624032f3a6e8ce5243390 SHA512 0378365863bcb86e62d64a2eff91e39a91218eabfb126dae74185e1fe52b21a3d5113f885ddb8076551f2f069435e18b24417bf70f29f23e21fac7065e412912
 EBUILD ceph-12.2.12-r3.ebuild 8084 BLAKE2B 10c1bb21651ca274643565a22794b4c6d8c61c9baa19fca9ffa396d6cbbf22b72b5601457b01ba62c1cdd6400ca965c6a8bdc638a959df315c57f0d272e36b5a SHA512 2cfdd77569da5c05354036e3d3864abab69e889e1cee142ed10782fb989353a8c9d7c491ef8e3fd6a872700b6a341413a591e0a341aa1a1ffca988be5b6a9af0
-EBUILD ceph-14.2.7-r1.ebuild 9766 BLAKE2B 311b4050caa476ea8198e90fa633d1f06a632127abe073831844aee81a56d1f0b15c340516c1bd44273b0a2bd50e8c37b5fb0710ddb4c5ebf439228203842729 SHA512 504eb96009c8c0d33d06540f50adc48455a2b81f11c00eb626c2b8008b604833181832bc265d4fbcb4169809aafeadcd5aede8bf97c768ef3caa6a75f53b0fcf
+EBUILD ceph-14.2.10.ebuild 10320 BLAKE2B 55fdeb9dca6f2b2bfe4da9af551774d45ebde1dad0285eea190b57cb899cebe142854a8b428dc3129fb58f25316cb1767e32050d119550e52dae32754f98c734 SHA512 ed63a057a4fc1d4e216beb4597bc2fd250062ba772ed9419efb8ffa51cb09ce691e221bdb1bb0c6dc2048fe53e9bf67b8885c7c86fa6755e0ac764ed6bb26c39
 EBUILD ceph-14.2.9-r1.ebuild 9631 BLAKE2B 2f486712c825e24b7708e581fe2c9c9d7c1e6321ee32174f8b5b5c14e643ec2369639340452a79608061f573069fc5e7940e43b555d51a1ddd8e155d208d6cc9 SHA512 8847c34ad72f931d464aafdbe62c37e80f5f16fa8be419a736c8f25109e03e73540bc83fec6a4a690cc6ad61342113b136a16faae7bc3666aef041f4cca23fbb
-EBUILD ceph-15.2.3.ebuild 10467 BLAKE2B 7550176aafae98144ee8f23096007fd796d86ee901d3b7378f9b35e29074e9b140eb68d1e016ad1cacb219637a41764a3923062ed877839b6a4173e057c2b345 SHA512 787160f343d557826739c99b484906c5eb043a5f5aa23e74665b7e8d3ad1ce64191e1db48018ac55452d426f16249ce918631f79c9e9ad18d679977f2329e90b
+EBUILD ceph-15.2.3.ebuild 10474 BLAKE2B 52cc92013f99ecf654a3432f6525bfd6f8cc835b869df580838064f9cafb95ade85949bf2e897a6a0eda47f1c720a9d5fd72f1ad9230f5d80abad2dd61503aaa SHA512 ba0432f0640eb009ddc1ddc71bac6ecf167acf05c474efbd7244a8798c06a7573f534ff087b633ae9179ce28a1f4206eeb04790f11644279044db947a96687e5
 MISC metadata.xml 2117 BLAKE2B 5aacfd24e535c6941c3b53ac2ecea9a8837511f2656ac1447b004fc6949818826321c455c0d401e79dcc21d6f5686162f69da9b6994dd4427157db47eab7894e SHA512 126776f9836132f200496c1a5eccd2bf069b8e962b47defd1b01e65d4b58204565ab8a1736d40f49e0c7b733c43bf4507fe2fc19b62c5d3935061da7980f203c
diff --git a/sys-cluster/ceph/ceph-14.2.10.ebuild b/sys-cluster/ceph/ceph-14.2.10.ebuild
new file mode 100644
index 000000000000..b9bca5dfb763
--- /dev/null
+++ b/sys-cluster/ceph/ceph-14.2.10.ebuild
@@ -0,0 +1,392 @@
+# 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_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 tmpfiles
+
+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 ~ppc64"
+fi
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="https://ceph.com/"
+
+LICENSE="Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain"
+SLOT="0"
+
+CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
+
+IUSE="babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc
+	kafka kerberos ldap libressl lttng +mgr numa +openssl rabbitmq +radosgw +ssl
+	spdk system-boost 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:=
+	app-arch/lz4:=
+	app-arch/snappy:=
+	app-arch/zstd:=
+	app-shells/bash:0
+	app-misc/jq:=
+	dev-libs/crypto++:=
+	dev-libs/leveldb:=[snappy,tcmalloc(-)?]
+	dev-libs/libaio:=
+	dev-libs/libnl:3=
+	dev-libs/libxml2:=
+	dev-libs/xmlsec:=[!openssl?,!libressl?]
+	dev-cpp/yaml-cpp:=
+	dev-libs/nss:=
+	dev-libs/protobuf:=
+	net-dns/c-ares:=
+	net-libs/gnutls:=
+	sys-auth/oath-toolkit:=
+	sys-apps/coreutils
+	sys-apps/grep
+	sys-apps/hwloc:=
+	sys-apps/keyutils:=
+	sys-apps/util-linux:=
+	sys-apps/sed
+	sys-apps/util-linux
+	sys-libs/libcap-ng:=
+	sys-libs/ncurses:0=
+	sys-libs/zlib:=
+	sys-process/numactl:=
+	x11-libs/libpciaccess:=
+	babeltrace? ( dev-util/babeltrace )
+	fuse? ( sys-fs/fuse:0= )
+	jemalloc? ( dev-libs/jemalloc:= )
+	!jemalloc? ( >=dev-util/google-perftools-2.6.1:= )
+	kafka? ( dev-libs/librdkafka:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:= )
+	lttng? ( dev-util/lttng-ust:= )
+	rabbitmq? ( net-libs/rabbitmq-c:= )
+	radosgw? (
+		dev-libs/expat:=
+		openssl? (
+			dev-libs/openssl:=
+			net-misc/curl:=[curl_ssl_openssl]
+		)
+		libressl? (
+			dev-libs/libressl:=
+			net-misc/curl:=[curl_ssl_libressl]
+		)
+	)
+	ssl? (
+		openssl? ( dev-libs/openssl:= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	system-boost? ( =dev-libs/boost-1.72*[threads,context,python,${PYTHON_USEDEP}] )
+	xfs? ( sys-fs/xfsprogs:= )
+	zfs? ( sys-fs/zfs:= )
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+	app-arch/cpio
+	>=dev-util/cmake-3.5.0
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/sphinx
+	dev-util/cunit
+	dev-util/gperf
+	dev-util/ragel
+	dev-util/valgrind
+	sys-apps/coreutils
+	sys-apps/findutils
+	sys-apps/grep
+	sys-apps/sed
+	sys-apps/which
+	sys-devel/bc
+	sys-devel/patch
+	virtual/pkgconfig
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		sys-apps/grep[pcre]
+		sys-fs/btrfs-progs
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	app-admin/sudo
+	net-misc/socat
+	sys-apps/gptfdisk
+	>=sys-apps/smartmontools-7.0
+	sys-block/parted
+	sys-fs/cryptsetup
+	sys-fs/lsscsi
+	sys-fs/lvm2[-device-mapper-only(-)]
+	virtual/awk
+	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}]
+	mgr? (
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pyjwt[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/routes[${PYTHON_USEDEP}]
+		diskprediction? (
+			$(python_gen_cond_dep '<sci-libs/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7})
+		)
+		sci-libs/scikits_learn[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+# diskprediction needs older scipy not compatible with py38
+# bug #724438
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	?? ( jemalloc tcmalloc )
+	^^ ( openssl libressl )
+	diskprediction? ( mgr !python_targets_python3_8 )
+	kafka? ( radosgw )
+	mgr? ( cephfs )
+	rabbitmq? ( radosgw )
+"
+RESTRICT="!test? ( test )"
+
+# 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.5-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-dpdk-compile-fix-1.patch"
+	"${FILESDIR}/ceph-14.2.4-python-executable.patch"
+	"${FILESDIR}/ceph-14.2.4-undefined-behaviour.patch"
+	"${FILESDIR}/ceph-14.2.10-missing-includes.patch"
+)
+
+check-reqs_export_vars() {
+	CHECKREQS_DISK_BUILD="5200M"
+	CHECKREQS_DISK_USR="510M"
+
+	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
+}
+
+pkg_pretend() {
+	check-reqs_export_vars
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	python_setup
+	check-reqs_export_vars
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if use system-boost; then
+		find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \
+			| xargs --null sed -r \
+			-e 's|Boost::|boost_|g' \
+			-e 's|Boost_|boost_|g' \
+			-e 's|[Bb]oost_boost|boost_system|g' -i || die
+	fi
+
+	sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
+		src/bash_completion/CMakeLists.txt || die
+
+	if ! use diskprediction; then
+		rm -rf src/pybind/mgr/diskprediction_local || die
+	fi
+
+	# 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=$(usex cephfs)
+		-DWITH_DPDK=$(usex dpdk)
+		-DWITH_DPDK=$(usex spdk)
+		-DWITH_FUSE=$(usex fuse)
+		-DWITH_LTTNG=$(usex lttng)
+		-DWITH_GSSAPI=$(usex kerberos)
+		-DWITH_GRAFANA=$(usex grafana)
+		-DWITH_MGR=$(usex mgr)
+		-DWITH_MGR_DASHBOARD_FRONTEND=OFF
+		-DWITH_NUMA=$(usex numa)
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DWITH_PYTHON3=3
+		-DWITH_RADOSGW=$(usex radosgw)
+		-DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq)
+		-DWITH_RADOSGW_KAFKA_ENDPOINT=$(usex kafka)
+		-DWITH_SSL=$(usex ssl)
+		-DWITH_SYSTEMD=$(usex systemd)
+		-DWITH_TESTS=$(usex test)
+		-DWITH_XFS=$(usex xfs)
+		-DWITH_ZFS=$(usex zfs)
+		-DENABLE_SHARED="ON"
+		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
+		-DWITH_SYSTEM_BOOST=$(usex system-boost)
+		-DBOOST_J=$(makeopts_jobs)
+		-DWITH_RDMA=OFF
+		-DWITH_TBB=OFF
+		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
+		-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=$(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() {
+	use custom-cflags || strip-flags
+	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
+	newtmpfiles "${FILESDIR}"/ceph-tmpfilesd ${PN}.conf
+
+	readme.gentoo_create_doc
+
+	python_setup
+
+	# 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-r1.ebuild b/sys-cluster/ceph/ceph-14.2.7-r1.ebuild
deleted file mode 100644
index f05b0b4f65b9..000000000000
--- a/sys-cluster/ceph/ceph-14.2.7-r1.ebuild
+++ /dev/null
@@ -1,370 +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 ~ppc64"
-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 spdk 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:=
-	app-arch/lz4:=
-	app-arch/snappy:=
-	app-arch/zstd:=
-	app-shells/bash:0
-	app-misc/jq:=
-	dev-libs/crypto++:=
-	dev-libs/leveldb:=[snappy,tcmalloc(-)?]
-	dev-libs/libaio:=
-	dev-libs/libnl:3=
-	dev-libs/libxml2:=
-	dev-libs/nss:=
-	sys-auth/oath-toolkit:=
-	sys-apps/coreutils
-	sys-apps/grep
-	sys-apps/keyutils:=
-	sys-apps/util-linux:=
-	sys-apps/sed
-	sys-apps/util-linux
-	sys-libs/libcap-ng:=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:=
-	babeltrace? ( dev-util/babeltrace )
-	ldap? ( net-nds/openldap:= )
-	lttng? ( dev-util/lttng-ust:= )
-	fuse? ( sys-fs/fuse:0= )
-	kerberos? ( virtual/krb5 )
-	rabbitmq? ( net-libs/rabbitmq-c:= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	xfs? ( sys-fs/xfsprogs:= )
-	zfs? ( sys-fs/zfs:= )
-	radosgw? (
-		dev-libs/expat:=
-		!libressl? (
-			dev-libs/openssl:=
-			net-misc/curl:=[curl_ssl_openssl]
-		)
-		libressl? (
-			dev-libs/libressl:=
-			net-misc/curl:=[curl_ssl_libressl]
-		)
-	)
-	system-boost? (
-		|| (
-			=dev-libs/boost-1.71*[threads,context,python,${PYTHON_USEDEP}]
-			=dev-libs/boost-1.70*[threads,context,python,${PYTHON_USEDEP}]
-			=dev-libs/boost-1.67*[threads,context,python,${PYTHON_USEDEP}]
-		)
-		dev-libs/boost:=[threads,context,python,${PYTHON_USEDEP}]
-	)
-	jemalloc? ( dev-libs/jemalloc:= )
-	!jemalloc? ( >=dev-util/google-perftools-2.4:= )
-	${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
-	sys-devel/patch
-	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
-	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.5-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.5-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.5-boost-sonames.patch"
-
-		find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \
-			| xargs --null sed -e 's|Boost::|Boost_|g' -i || die
-
-		has_version '>=dev-libs/boost-1.70.0' || \
-			eapply "${FILESDIR}/ceph-14.2.5-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_DPDK=$(usex spdk)
-		-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="ON"
-		-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-15.2.3.ebuild b/sys-cluster/ceph/ceph-15.2.3.ebuild
index dc22c44fea61..49968eb700f0 100644
--- a/sys-cluster/ceph/ceph-15.2.3.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.3.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64"
+	KEYWORDS="~amd64 ~arm64 ~ppc64"
 fi
 
 DESCRIPTION="Ceph distributed filesystem"
diff --git a/sys-cluster/ceph/files/ceph-14.2.10-missing-includes.patch b/sys-cluster/ceph/files/ceph-14.2.10-missing-includes.patch
new file mode 100644
index 000000000000..59663028cfa4
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-14.2.10-missing-includes.patch
@@ -0,0 +1,26 @@
+diff --git a/src/common/bit_str.h b/src/common/bit_str.h
+index c4c24f6a75..b5631e8b84 100644
+--- a/src/common/bit_str.h
++++ b/src/common/bit_str.h
+@@ -14,6 +14,8 @@
+ #ifndef CEPH_COMMON_BIT_STR_H
+ #define CEPH_COMMON_BIT_STR_H
+ 
++#include <cstdint>
++#include <ostream>
+ #include <functional>
+ 
+ namespace ceph {
+diff --git a/src/librbd/api/PoolMetadata.h b/src/librbd/api/PoolMetadata.h
+index 977ce3638d..8d982879aa 100644
+--- a/src/librbd/api/PoolMetadata.h
++++ b/src/librbd/api/PoolMetadata.h
+@@ -8,6 +8,8 @@
+ #include "include/rados/librados_fwd.hpp"
+ 
+ #include <map>
++#include <string>
++#include <cstdint>
+ 
+ namespace librbd {
+ 
diff --git a/sys-cluster/ceph/files/ceph-14.2.10-python-warnings.patch b/sys-cluster/ceph/files/ceph-14.2.10-python-warnings.patch
new file mode 100644
index 000000000000..8be3e509a1cf
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-14.2.10-python-warnings.patch
@@ -0,0 +1,31 @@
+diff --git a/src/pybind/ceph_volume_client.py b/src/pybind/ceph_volume_client.py
+index 7d7e5b49e4..9a1ba80e69 100644
+--- a/src/pybind/ceph_volume_client.py
++++ b/src/pybind/ceph_volume_client.py
+@@ -355,7 +355,7 @@ class CephFSVolumeClient(object):
+                 continue
+ 
+             (group_id, volume_id) = volume.split('/')
+-            group_id = group_id if group_id is not 'None' else None
++            group_id = group_id if group_id != 'None' else None
+             volume_path = VolumePath(group_id, volume_id)
+             access_level = volume_data['access_level']
+ 
+@@ -378,7 +378,7 @@ class CephFSVolumeClient(object):
+                 if vol_meta['auths'][auth_id] == want_auth:
+                     continue
+ 
+-                readonly = True if access_level is 'r' else False
++                readonly = True if access_level == 'r' else False
+                 self._authorize_volume(volume_path, auth_id, readonly)
+ 
+             # Recovered from partial auth updates for the auth ID's access
+@@ -1120,7 +1120,7 @@ class CephFSVolumeClient(object):
+ 
+             # Construct auth caps that if present might conflict with the desired
+             # auth caps.
+-            unwanted_access_level = 'r' if want_access_level is 'rw' else 'rw'
++            unwanted_access_level = 'r' if want_access_level == 'rw' else 'rw'
+             unwanted_mds_cap = 'allow {0} path={1}'.format(unwanted_access_level, path)
+             if namespace:
+                 unwanted_osd_cap = 'allow {0} pool={1} namespace={2}'.format(
diff --git a/sys-cluster/ceph/files/ceph-14.2.5-boost-1.6-python-sonames.patch b/sys-cluster/ceph/files/ceph-14.2.5-boost-1.6-python-sonames.patch
deleted file mode 100644
index 318844f6c025..000000000000
--- a/sys-cluster/ceph/files/ceph-14.2.5-boost-1.6-python-sonames.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1e9ebfbb41..1a858a6e3f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -649,7 +649,7 @@ set(BOOST_HEADER_COMPONENTS container)
- 
- if(WITH_MGR)
-   list(APPEND BOOST_COMPONENTS
--    python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR})
-+    python-${MGR_PYTHON_VERSION_MAJOR}.${MGR_PYTHON_VERSION_MINOR})
- endif()
- if(WITH_BOOST_CONTEXT)
-   list(APPEND BOOST_COMPONENTS context coroutine)
-diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake
-index f46cc0d485..3cc6340b2c 100644
---- a/cmake/modules/BuildBoost.cmake
-+++ b/cmake/modules/BuildBoost.cmake
-@@ -205,7 +205,7 @@ macro(build_boost version)
-     endif()
-     add_dependencies(Boost::${c} Boost)
-     if(c MATCHES "^python")
--      set(c "python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
-+      set(c "python-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
-     endif()
-     if(Boost_USE_STATIC_LIBS)
-       set(Boost_${upper_c}_LIBRARY
diff --git a/sys-cluster/ceph/files/ceph-14.2.5-boost-1.70.patch b/sys-cluster/ceph/files/ceph-14.2.5-boost-1.70.patch
deleted file mode 100644
index 693925e8825c..000000000000
--- a/sys-cluster/ceph/files/ceph-14.2.5-boost-1.70.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/src/rgw/rgw_asio_frontend.cc b/src/rgw/rgw_asio_frontend.cc
-index 82e2a45da6..8750c5648f 100644
---- a/src/rgw/rgw_asio_frontend.cc
-+++ b/src/rgw/rgw_asio_frontend.cc
-@@ -83,7 +83,8 @@ class StreamIO : public rgw::asio::ClientIO {
- using SharedMutex = ceph::async::SharedMutex<boost::asio::io_context::executor_type>;
- 
- template <typename Stream>
--void handle_connection(RGWProcessEnv& env, Stream& stream,
-+void handle_connection(boost::asio::io_context& context,
-+                       RGWProcessEnv& env, Stream& stream,
-                        parse_buffer& buffer, bool is_ssl,
-                        SharedMutex& pause_mutex,
-                        rgw::dmclock::Scheduler *scheduler,
-@@ -160,7 +161,7 @@ void handle_connection(RGWProcessEnv& env, Stream& stream,
-                                   rgw::io::add_conlen_controlling(
-                                     &real_client))));
-       RGWRestfulIO client(cct, &real_client_io);
--      auto y = optional_yield{socket.get_io_context(), yield};
-+      auto y = optional_yield{context, yield};
-       process_request(env.store, env.rest, &req, env.uri_prefix,
-                       *env.auth_registry, &client, env.olog, y, scheduler);
-     }
-@@ -604,7 +605,7 @@ void AsioFrontend::accept(Listener& l, boost::system::error_code ec)
-           return;
-         }
-         buffer->consume(bytes);
--        handle_connection(env, stream, *buffer, true, pause_mutex,
-+        handle_connection(context, env, stream, *buffer, true, pause_mutex,
-                           scheduler.get(), ec, yield);
-         if (!ec) {
-           // ssl shutdown (ignoring errors)
-@@ -622,7 +623,7 @@ void AsioFrontend::accept(Listener& l, boost::system::error_code ec)
-         auto c = connections.add(conn);
-         auto buffer = std::make_unique<parse_buffer>();
-         boost::system::error_code ec;
--        handle_connection(env, s, *buffer, false, pause_mutex,
-+        handle_connection(context, env, s, *buffer, false, pause_mutex,
-                           scheduler.get(), ec, yield);
-         s.shutdown(tcp::socket::shutdown_both, ec);
-       });
-diff --git a/src/rgw/rgw_dmclock_async_scheduler.h b/src/rgw/rgw_dmclock_async_scheduler.h
-index 70487a5253..1d454acd2e 100644
---- a/src/rgw/rgw_dmclock_async_scheduler.h
-+++ b/src/rgw/rgw_dmclock_async_scheduler.h
-@@ -82,7 +82,12 @@ class AsyncScheduler : public md_config_obs_t, public Scheduler {
-   using Completion = async::Completion<Signature, async::AsBase<Request>>;
- 
-   using Clock = ceph::coarse_real_clock;
-+#if BOOST_VERSION < 107000
-   using Timer = boost::asio::basic_waitable_timer<Clock>;
-+#else
-+  using Timer = boost::asio::basic_waitable_timer<Clock,
-+        boost::asio::wait_traits<Clock>, executor_type>;
-+#endif
-   Timer timer; //< timer for the next scheduled request
- 
-   CephContext *const cct;
-diff --git a/src/rgw/rgw_reshard.h b/src/rgw/rgw_reshard.h
-index d99a6ff68d..213fc238d2 100644
---- a/src/rgw/rgw_reshard.h
-+++ b/src/rgw/rgw_reshard.h
-@@ -183,7 +183,14 @@ class RGWReshardWait {
-   ceph::condition_variable cond;
- 
-   struct Waiter : boost::intrusive::list_base_hook<> {
--    boost::asio::basic_waitable_timer<Clock> timer;
-+#if BOOST_VERSION < 107000
-+    using Timer = boost::asio::basic_waitable_timer<Clock>;
-+#else
-+    using Executor = boost::asio::io_context::executor_type;
-+    using Timer = boost::asio::basic_waitable_timer<Clock,
-+          boost::asio::wait_traits<Clock>, Executor>;
-+#endif
-+    Timer timer;
-     explicit Waiter(boost::asio::io_context& ioc) : timer(ioc) {}
-   };
-   boost::intrusive::list<Waiter> waiters;
diff --git a/sys-cluster/ceph/files/ceph-14.2.5-boost-sonames.patch b/sys-cluster/ceph/files/ceph-14.2.5-boost-sonames.patch
deleted file mode 100644
index d8c26bcdfe21..000000000000
--- a/sys-cluster/ceph/files/ceph-14.2.5-boost-sonames.patch
+++ /dev/null
@@ -1,471 +0,0 @@
-diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake
-index f46cc0d485..39bb081b1b 100644
---- a/cmake/modules/BuildBoost.cmake
-+++ b/cmake/modules/BuildBoost.cmake
-@@ -199,13 +199,13 @@ macro(build_boost version)
-   foreach(c ${Boost_BUILD_COMPONENTS})
-     string(TOUPPER ${c} upper_c)
-     if(Boost_USE_STATIC_LIBS)
--      add_library(Boost::${c} STATIC IMPORTED)
-+      add_library(Boost_${c} STATIC IMPORTED)
-     else()
--      add_library(Boost::${c} SHARED IMPORTED)
-+      add_library(Boost_${c} SHARED IMPORTED)
-     endif()
--    add_dependencies(Boost::${c} Boost)
-+    add_dependencies(Boost_${c} Boost)
-     if(c MATCHES "^python")
--      set(c "python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
-+      set(c "python-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
-     endif()
-     if(Boost_USE_STATIC_LIBS)
-       set(Boost_${upper_c}_LIBRARY
-@@ -215,7 +215,7 @@ macro(build_boost version)
-         ${install_dir}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}boost_${c}${CMAKE_SHARED_LIBRARY_SUFFIX})
-     endif()
-     unset(buildid)
--    set_target_properties(Boost::${c} PROPERTIES
-+    set_target_properties(Boost_${c} PROPERTIES
-       INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}"
-       IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
-       IMPORTED_LOCATION "${Boost_${upper_c}_LIBRARY}")
-@@ -224,19 +224,19 @@ macro(build_boost version)
-   foreach(c ${Boost_BUILD_COMPONENTS})
-     if(Boost_${c}_DEPENDENCIES)
-       foreach(dep ${Boost_${c}_DEPENDENCIES})
--        list(APPEND dependencies Boost::${dep})
-+        list(APPEND dependencies Boost_${dep})
-       endforeach()
--      set_target_properties(Boost::${c} PROPERTIES
-+      set_target_properties(Boost_${c} PROPERTIES
-         INTERFACE_LINK_LIBRARIES "${dependencies}")
-       unset(dependencies)
-     endif()
-   endforeach()
- 
-   # for header-only libraries
--  add_library(Boost::boost INTERFACE IMPORTED)
--  set_target_properties(Boost::boost PROPERTIES
-+  add_library(Boost_boost INTERFACE IMPORTED)
-+  set_target_properties(Boost_boost PROPERTIES
-     INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}")
--  add_dependencies(Boost::boost Boost)
-+  add_dependencies(Boost_boost Boost)
-   find_package_handle_standard_args(Boost DEFAULT_MSG
-     Boost_INCLUDE_DIRS Boost_LIBRARIES)
-   mark_as_advanced(Boost_LIBRARIES BOOST_INCLUDE_DIRS)
-@@ -253,7 +253,7 @@ function(maybe_add_boost_dep target)
-     get_filename_component(ext ${src} EXT)
-     # assuming all cxx source files include boost header(s)
-     if(ext MATCHES ".cc|.cpp|.cxx")
--      add_dependencies(${target} Boost::boost)
-+      add_dependencies(${target} Boost_boost)
-       return()
-     endif()
-   endforeach()
-diff --git a/cmake/modules/FindBoost.cmake b/cmake/modules/FindBoost.cmake
-index e2525b8934..e728e5a9d2 100644
---- a/cmake/modules/FindBoost.cmake
-+++ b/cmake/modules/FindBoost.cmake
-@@ -340,10 +340,6 @@ macro(_Boost_ADJUST_LIB_VARS basename)
- 
-     if(Boost_${basename}_LIBRARY AND Boost_${basename}_HEADER)
-       set(Boost_${basename}_FOUND ON)
--      if("x${basename}" STREQUAL "xTHREAD" AND NOT TARGET Threads::Threads)
--        string(APPEND Boost_ERROR_REASON_THREAD " (missing dependency: Threads)")
--        set(Boost_THREAD_FOUND OFF)
--      endif()
-     endif()
- 
-   endif()
-@@ -919,7 +915,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
-   if (NOT _boost_DEPS_STRING)
-     set(_boost_DEPS_STRING "(none)")
-   endif()
--  # message(STATUS "Dependencies for Boost::${component}: ${_boost_DEPS_STRING}")
-+  # message(STATUS "Dependencies for Boost_${component}: ${_boost_DEPS_STRING}")
- endfunction()
- 
- #
-@@ -1003,7 +999,7 @@ function(_Boost_COMPONENT_HEADERS component _hdrs)
-   if (NOT _boost_HDRS_STRING)
-     set(_boost_HDRS_STRING "(none)")
-   endif()
--  # message(STATUS "Headers for Boost::${component}: ${_boost_HDRS_STRING}")
-+  # message(STATUS "Headers for Boost_${component}: ${_boost_HDRS_STRING}")
- endfunction()
- 
- #
-@@ -1051,7 +1047,7 @@ endfunction()
- 
- #
- # Some boost libraries may require particular set of compler features.
--# The very first one was `boost::fiber` introduced in Boost 1.62.
-+# The very first one was `boost_fiber` introduced in Boost 1.62.
- # One can check required compiler features of it in
- # - `${Boost_ROOT}/libs/fiber/build/Jamfile.v2`;
- # - `${Boost_ROOT}/libs/context/build/Jamfile.v2`.
-@@ -1178,7 +1174,7 @@ else()
-   # _Boost_COMPONENT_HEADERS.  See the instructions at the top of
-   # _Boost_COMPONENT_DEPENDENCIES.
-   set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
--    "1.70.0" "1.70" "1.69.0" "1.69"
-+    "1.71.0" "1.71" "1.70.0" "1.70" "1.69.0" "1.69"
-     "1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65"
-     "1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60"
-     "1.59.0" "1.59" "1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56" "1.55.0" "1.55"
-@@ -1235,10 +1231,10 @@ endif()
- # on all platforms to keep end user code free from platform dependent
- # code.  Also provide convenience targets to disable autolinking and
- # enable dynamic linking.
--if(NOT TARGET Boost::diagnostic_definitions)
--  add_library(Boost::diagnostic_definitions INTERFACE IMPORTED)
--  add_library(Boost::disable_autolinking INTERFACE IMPORTED)
--  add_library(Boost::dynamic_linking INTERFACE IMPORTED)
-+if(NOT TARGET boost_diagnostic_definitions)
-+  add_library(boost_diagnostic_definitions INTERFACE IMPORTED)
-+  add_library(boost_disable_autolinking INTERFACE IMPORTED)
-+  add_library(boost_dynamic_linking INTERFACE IMPORTED)
- endif()
- if(WIN32)
-   # In windows, automatic linking is performed, so you do not have
-@@ -1259,11 +1255,11 @@ if(WIN32)
-   # code to emit a #pragma message each time a library is selected
-   # for linking.
-   set(Boost_LIB_DIAGNOSTIC_DEFINITIONS "-DBOOST_LIB_DIAGNOSTIC")
--  set_target_properties(Boost::diagnostic_definitions PROPERTIES
-+  set_target_properties(boost_diagnostic_definitions PROPERTIES
-     INTERFACE_COMPILE_DEFINITIONS "BOOST_LIB_DIAGNOSTIC")
--  set_target_properties(Boost::disable_autolinking PROPERTIES
-+  set_target_properties(boost_disable_autolinking PROPERTIES
-     INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_NO_LIB")
--  set_target_properties(Boost::dynamic_linking PROPERTIES
-+  set_target_properties(boost_dynamic_linking PROPERTIES
-     INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_DYN_LINK")
- endif()
- 
-@@ -1738,7 +1734,7 @@ if("thread" IN_LIST Boost_FIND_COMPONENTS)
-   else()
-     set(_Boost_find_quiet "")
-   endif()
--  find_package(Threads ${_Boost_find_quiet})
-+  find_package(boost_thread ${_Boost_find_quiet})
-   unset(_Boost_find_quiet)
- endif()
- 
-@@ -2079,61 +2075,61 @@ endif()
- 
- if(Boost_FOUND)
-   # For header-only libraries
--  if(NOT TARGET Boost::boost)
--    add_library(Boost::boost INTERFACE IMPORTED)
-+  if(NOT TARGET Boost_boost)
-+    add_library(Boost_boost INTERFACE IMPORTED)
-     if(Boost_INCLUDE_DIRS)
--      set_target_properties(Boost::boost PROPERTIES
-+      set_target_properties(Boost_boost PROPERTIES
-         INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}")
-     endif()
-   endif()
- 
-   foreach(COMPONENT ${Boost_FIND_COMPONENTS})
--    if(_Boost_IMPORTED_TARGETS AND NOT TARGET Boost::${COMPONENT})
-+    if(_Boost_IMPORTED_TARGETS AND NOT TARGET Boost_${COMPONENT})
-       string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
-       if(Boost_${UPPERCOMPONENT}_FOUND)
-         if(Boost_USE_STATIC_LIBS)
--          add_library(Boost::${COMPONENT} STATIC IMPORTED)
-+          add_library(Boost_${COMPONENT} STATIC IMPORTED)
-         else()
-           # Even if Boost_USE_STATIC_LIBS is OFF, we might have static
-           # libraries as a result.
--          add_library(Boost::${COMPONENT} UNKNOWN IMPORTED)
-+          add_library(Boost_${COMPONENT} UNKNOWN IMPORTED)
-         endif()
-         if(Boost_INCLUDE_DIRS)
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(Boost_${COMPONENT} PROPERTIES
-             INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}")
-         endif()
-         if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY}")
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(Boost_${COMPONENT} PROPERTIES
-             IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
-             IMPORTED_LOCATION "${Boost_${UPPERCOMPONENT}_LIBRARY}")
-         endif()
-         if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}")
--          set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY
-+          set_property(TARGET Boost_${COMPONENT} APPEND PROPERTY
-             IMPORTED_CONFIGURATIONS RELEASE)
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(Boost_${COMPONENT} PROPERTIES
-             IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
-             IMPORTED_LOCATION_RELEASE "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}")
-         endif()
-         if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}")
--          set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY
-+          set_property(TARGET Boost_${COMPONENT} APPEND PROPERTY
-             IMPORTED_CONFIGURATIONS DEBUG)
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(Boost_${COMPONENT} PROPERTIES
-             IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX"
-             IMPORTED_LOCATION_DEBUG "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}")
-         endif()
-         if(_Boost_${UPPERCOMPONENT}_DEPENDENCIES)
-           unset(_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES)
-           foreach(dep ${_Boost_${UPPERCOMPONENT}_DEPENDENCIES})
--            list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Boost::${dep})
-+            list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Boost_${dep})
-           endforeach()
-           if(COMPONENT STREQUAL "thread")
--            list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Threads::Threads)
-+            list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES boost_thread)
-           endif()
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(Boost_${COMPONENT} PROPERTIES
-             INTERFACE_LINK_LIBRARIES "${_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES}")
-         endif()
-         if(_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES)
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(Boost_${COMPONENT} PROPERTIES
-             CXX_STANDARD 17)
-         endif()
-       endif()
-diff --git a/cmake/modules/Finddpdk.cmake b/cmake/modules/Finddpdk.cmake
-index 964ae5dfb0..92bf07c14e 100644
---- a/cmake/modules/Finddpdk.cmake
-+++ b/cmake/modules/Finddpdk.cmake
-@@ -102,9 +102,9 @@ if(dpdk_FOUND)
- 
-   if(NOT TARGET dpdk::dpdk)
-     add_library(dpdk::dpdk INTERFACE IMPORTED)
--    find_package(Threads QUIET)
-+    find_package(boost_thread QUIET)
-     list(APPEND dpdk_LIBRARIES
--      Threads::Threads
-+      boost_thread
-       dpdk::cflags)
-     set_target_properties(dpdk::dpdk PROPERTIES
-       INTERFACE_LINK_LIBRARIES "${dpdk_LIBRARIES}"
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 28ec9835f8..31a1efa19f 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -356,12 +356,12 @@ set(ceph_common_objs
- set(ceph_common_deps
-   json_spirit erasure_code arch crc32
-   ${LIB_RESOLV}
--  Boost::thread
--  Boost::system
--  Boost::random
--  Boost::program_options
--  Boost::date_time
--  Boost::iostreams
-+  boost_thread
-+  boost_system
-+  boost_random
-+  boost_program_options
-+  boost_date_time
-+  boost_iostreams
-   ${BLKID_LIBRARIES}
-   ${Backtrace_LIBRARIES}
-   ${BLKIN_LIBRARIES}
-@@ -522,7 +522,7 @@ if (WITH_CEPHFS)
-     ceph_mds.cc)
-   add_executable(ceph-mds ${ceph_mds_srcs})
-   target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common
--    Boost::thread)
-+    boost_thread)
-   install(TARGETS ceph-mds DESTINATION bin)
- endif()
- 
-diff --git a/src/crimson/CMakeLists.txt b/src/crimson/CMakeLists.txt
-index d7b58521d4..e1533af33f 100644
---- a/src/crimson/CMakeLists.txt
-+++ b/src/crimson/CMakeLists.txt
-@@ -106,8 +106,8 @@ target_link_libraries(crimson-common
-   PRIVATE
-     crc32
-     crimson::cflags
--    Boost::iostreams
--    Boost::random
-+    boost_iostreams
-+    boost_random
-     ${NSS_LIBRARIES} ${NSPR_LIBRARIES} OpenSSL::Crypto)
- 
- set(crimson_auth_srcs
-diff --git a/src/mgr/CMakeLists.txt b/src/mgr/CMakeLists.txt
-index 252fb3e5e3..213482da16 100644
---- a/src/mgr/CMakeLists.txt
-+++ b/src/mgr/CMakeLists.txt
-@@ -26,7 +26,7 @@ target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}")
- target_link_libraries(ceph-mgr
-   osdc client heap_profiler
-   global-static ceph-common
--  Boost::python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}
-+  boost_python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}
-   ${MGR_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS} ${GSSAPI_LIBRARIES})
- set_target_properties(ceph-mgr PROPERTIES
-   POSITION_INDEPENDENT_CODE ${EXE_LINKER_USE_PIE})
-diff --git a/src/rbd_replay/CMakeLists.txt b/src/rbd_replay/CMakeLists.txt
-index e9d3804c5f..5c6eb58de1 100644
---- a/src/rbd_replay/CMakeLists.txt
-+++ b/src/rbd_replay/CMakeLists.txt
-@@ -36,7 +36,7 @@ if(HAVE_BABELTRACE)
-     global
-     babeltrace
-     babeltrace-ctf
--    Boost::date_time
-+    boost_date_time
-     )
-   install(TARGETS rbd-replay-prep DESTINATION bin)
- endif(HAVE_BABELTRACE)
-diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
-index 82f5181f5b..8a51f140fb 100644
---- a/src/rgw/CMakeLists.txt
-+++ b/src/rgw/CMakeLists.txt
-@@ -202,7 +202,7 @@ if(WITH_CURL_OPENSSL)
- endif()
- 
- if(WITH_BOOST_CONTEXT)
--  target_link_libraries(rgw_a PRIVATE Boost::coroutine Boost::context)
-+  target_link_libraries(rgw_a PRIVATE boost_coroutine boost_context)
- endif()
- 
- set(rgw_libs rgw_a)
-@@ -353,7 +353,7 @@ if(WITH_RADOSGW_AMQP_ENDPOINT)
-   target_link_libraries(rgw_admin_user PRIVATE RabbitMQ::RabbitMQ)
- endif()
- if(WITH_BOOST_CONTEXT)
--  target_link_libraries(rgw_admin_user PRIVATE Boost::coroutine Boost::context)
-+  target_link_libraries(rgw_admin_user PRIVATE boost_coroutine boost_context)
- endif()
- 
- if(WITH_TESTS)
-diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
-index 5dcee1694d..60743be698 100644
---- a/src/test/CMakeLists.txt
-+++ b/src/test/CMakeLists.txt
-@@ -159,7 +159,7 @@ add_executable(ceph_omapbench
-   )
- target_link_libraries(ceph_omapbench
-   librados
--  Boost::program_options
-+  boost_program_options
-   global
-   ${BLKID_LIBRARIES}
-   ${CMAKE_DL_LIBS}
-diff --git a/src/test/common/CMakeLists.txt b/src/test/common/CMakeLists.txt
-index 71fb77cda9..aff8fb6565 100644
---- a/src/test/common/CMakeLists.txt
-+++ b/src/test/common/CMakeLists.txt
-@@ -315,8 +315,8 @@ add_ceph_unittest(unittest_hobject)
- 
- add_executable(unittest_async_completion test_async_completion.cc)
- add_ceph_unittest(unittest_async_completion)
--target_link_libraries(unittest_async_completion Boost::system)
-+target_link_libraries(unittest_async_completion boost_system)
- 
- add_executable(unittest_async_shared_mutex test_async_shared_mutex.cc)
- add_ceph_unittest(unittest_async_shared_mutex)
--target_link_libraries(unittest_async_shared_mutex ceph-common Boost::system)
-+target_link_libraries(unittest_async_shared_mutex ceph-common boost_system)
-diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt
-index 721f6c3675..1cd9635c77 100644
---- a/src/test/erasure-code/CMakeLists.txt
-+++ b/src/test/erasure-code/CMakeLists.txt
-@@ -2,15 +2,15 @@
- add_executable(ceph_erasure_code_benchmark 
-   ${CMAKE_SOURCE_DIR}/src/erasure-code/ErasureCode.cc
-   ceph_erasure_code_benchmark.cc)
--target_link_libraries(ceph_erasure_code_benchmark ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code_benchmark ceph-common boost_program_options global ${CMAKE_DL_LIBS})
- install(TARGETS ceph_erasure_code_benchmark
-   DESTINATION bin)
- 
- add_executable(ceph_erasure_code_non_regression ceph_erasure_code_non_regression.cc)
--target_link_libraries(ceph_erasure_code_non_regression ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code_non_regression ceph-common boost_program_options global ${CMAKE_DL_LIBS})
- 
- add_executable(ceph_erasure_code ceph_erasure_code.cc)
--target_link_libraries(ceph_erasure_code ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code ceph-common boost_program_options global ${CMAKE_DL_LIBS})
- install(TARGETS ceph_erasure_code
-   DESTINATION bin)
- 
-diff --git a/src/test/librados/CMakeLists.txt b/src/test/librados/CMakeLists.txt
-index 4fc53d2406..e6304394f8 100644
---- a/src/test/librados/CMakeLists.txt
-+++ b/src/test/librados/CMakeLists.txt
-@@ -62,7 +62,7 @@ add_executable(ceph_test_rados_api_asio asio.cc)
- target_link_libraries(ceph_test_rados_api_asio global
-   librados ${UNITTEST_LIBS})
- if(WITH_BOOST_CONTEXT)
--  target_link_libraries(ceph_test_rados_api_asio Boost::coroutine Boost::context)
-+  target_link_libraries(ceph_test_rados_api_asio boost_coroutine boost_context)
- endif()
- 
- add_executable(ceph_test_rados_api_list
-@@ -132,7 +132,7 @@ add_executable(ceph_test_rados_api_tier_pp
-   tier_cxx.cc
-   $<TARGET_OBJECTS:unit-main>)
- target_link_libraries(ceph_test_rados_api_tier_pp
--  librados global ${UNITTEST_LIBS} Boost::system radostest-cxx)
-+  librados global ${UNITTEST_LIBS} boost_system radostest-cxx)
- 
- add_executable(ceph_test_rados_api_snapshots
-   snapshots.cc)
-diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt
-index 3c3e9db6c1..2c208c1a4f 100644
---- a/src/test/librbd/CMakeLists.txt
-+++ b/src/test/librbd/CMakeLists.txt
-@@ -27,7 +27,7 @@ target_link_libraries(rbd_test PRIVATE
-   radostest
-   radostest-cxx
-   librados
--  Boost::thread
-+  boost_thread
-   GMock::GMock
-   GTest::GTest)
- 
-diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt
-index cde6348d57..e6ce738834 100644
---- a/src/test/rgw/CMakeLists.txt
-+++ b/src/test/rgw/CMakeLists.txt
-@@ -144,7 +144,7 @@ add_ceph_unittest(unittest_rgw_dmclock_scheduler)
- target_link_libraries(unittest_rgw_dmclock_scheduler radosgw_a dmclock)
- if(WITH_BOOST_CONTEXT)
-   target_compile_definitions(unittest_rgw_dmclock_scheduler PRIVATE BOOST_COROUTINES_NO_DEPRECATION_WARNING)
--  target_link_libraries(unittest_rgw_dmclock_scheduler Boost::coroutine Boost::context)
-+  target_link_libraries(unittest_rgw_dmclock_scheduler boost_coroutine boost_context)
- endif()
- 
- if(WITH_RADOSGW_AMQP_ENDPOINT)
-diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
-index d31f3d2408..6945018b11 100644
---- a/src/tools/CMakeLists.txt
-+++ b/src/tools/CMakeLists.txt
-@@ -35,20 +35,20 @@ install(PROGRAMS
- endif(WITH_TESTS)
- 
- add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc)
--target_link_libraries(ceph-osdomap-tool os global Boost::program_options)
-+target_link_libraries(ceph-osdomap-tool os global boost_program_options)
- install(TARGETS ceph-osdomap-tool DESTINATION bin)
- 
- add_executable(ceph-monstore-tool
-   ceph_monstore_tool.cc
-   ../mgr/mgr_commands.cc)
--target_link_libraries(ceph-monstore-tool os global Boost::program_options)
-+target_link_libraries(ceph-monstore-tool os global boost_program_options)
- install(TARGETS ceph-monstore-tool DESTINATION bin)
- 
- add_executable(ceph-objectstore-tool
-   ceph_objectstore_tool.cc
-   rebuild_mondb.cc
-   RadosDump.cc)
--target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS})
- if(WITH_FUSE)
-   target_link_libraries(ceph-objectstore-tool ${FUSE_LIBRARIES})
- endif(WITH_FUSE)
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index 5fac6d448829..3a036d310ce8 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -2,16 +2,19 @@ AUX cinder.initd 494 BLAKE2B f919de45b8e39b65d355f627fcd71a4c23a7bb550157d25811c
 AUX cinder.sudoersd 86 BLAKE2B 1ea49d3cf3bc134ea0a2d5512c6e258f117187267bfa408fea0d2449a091068e5404812a0e693f226d895ec23766ed73aca36128d6f7b968ae44dc38b8ad948a SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1
 DIST cinder-15.1.0.tar.gz 5504663 BLAKE2B 19097821729c99f0a13f0c30c9fa2c8647fe4c6ae01790b59b264fad282f1051e5e3f3275720114b1575afcbef517baab89a34ce75b7ef54d6515c204907f28a SHA512 1c6c88854994d440c3818d26533ea075adfcfc4b8642b2796d1ac90a5feec5e3c8d64d06f433840afcf2d9d4f5a50ba256808b74495e0e735a3f0a19bdc838e3
 DIST cinder-15.2.0.tar.gz 5527994 BLAKE2B 0952c00efa1023f5ffdf7079d769714c29b8df828cf25a2f027e1d984ec9db98ad8d305476cb8e6170de47f672affb746e7edd098e4ee56f14f1681d608c83b1 SHA512 70a47dacecce5218ad42d828e69b19a24f37db3fd34b4c862c5f79f77340eb1febd3414a02ea56cb691243bc0c07b0e8e6030c8f27d9fbee68fe07041de22b17
+DIST cinder-15.3.0.tar.gz 5521543 BLAKE2B e311ea1d9771f75a45a98598dae2fe7e060fb25c1b16ce5d94bbd769caca70512417724c531b756216ce594ed3bb682653681339ae37bc262139bd3080116bbb SHA512 793fe23a5526ba726416282022888f090c9c58c180d33013d66f6916251fd4789e8af2565dbe6ef61f224d9a61b4a622374ad7c4ea722f260dbf3a60274bfe0e
 DIST cinder-16.0.0.tar.gz 5448332 BLAKE2B cc570cde45ed680c54a11c46883d00596114d5cdb58cfa03424468073247efb7753be29ce542d9b03b42b4d1037020085921780baefa78a790d53c8fea9135f3 SHA512 aa1a4f5e0867ef0b55a9461705d0f1db06fc1a24ce5dbc64b3166ca4dc829957c71ac9da259b7e20fe568e4278d0ac713a87e5098409d1d83bfc71fa9197fa64
 DIST cinder-16.1.0.tar.gz 5445353 BLAKE2B f7e121845b5db3de191c8782577f680cbb93fd26087113bd0c322eed4b27cf071977763a3eacb933d7b8894b56aaf042a115c2dfd20be47f89c9d45f0556c34a SHA512 97fb157eac466d869a707cd05d287a309512952e8f8267b58123b9108eb1c2df66c8d0b799a3fb83087645a09e679b7c6eb24baa4a21b751a1ce35dbb5bd3f4a
 DIST cinder.conf.sample-15.1.0 183153 BLAKE2B fb86b82c711568c89a445c5876a1d5e890714d4dd957d4aa5b3158a3c85150e75d8d0055a93bf6a937d8a6f5a3c4042c5ddb4b4da2dd006d77d8eb8ec8a19fc5 SHA512 95a2076970184bc34c9c293371f72a791f16600c4933572b8d51291c506a7c1ef3bd2ea185f1f4dafeff6c85a237f4453f8ee6c1df6af7f603afe1ddfd63cd3a
 DIST cinder.conf.sample-15.2.0 183153 BLAKE2B fb86b82c711568c89a445c5876a1d5e890714d4dd957d4aa5b3158a3c85150e75d8d0055a93bf6a937d8a6f5a3c4042c5ddb4b4da2dd006d77d8eb8ec8a19fc5 SHA512 95a2076970184bc34c9c293371f72a791f16600c4933572b8d51291c506a7c1ef3bd2ea185f1f4dafeff6c85a237f4453f8ee6c1df6af7f603afe1ddfd63cd3a
+DIST cinder.conf.sample-15.3.0 183153 BLAKE2B fb86b82c711568c89a445c5876a1d5e890714d4dd957d4aa5b3158a3c85150e75d8d0055a93bf6a937d8a6f5a3c4042c5ddb4b4da2dd006d77d8eb8ec8a19fc5 SHA512 95a2076970184bc34c9c293371f72a791f16600c4933572b8d51291c506a7c1ef3bd2ea185f1f4dafeff6c85a237f4453f8ee6c1df6af7f603afe1ddfd63cd3a
 DIST cinder.conf.sample-16.0.0 183294 BLAKE2B 5d0f28b9ad200d912c42c34ca030a5ec3660c57db332677e1b66b314a2865187862c83baf78d122fc0af7f73fbf4f0c7f04b9253882d228dcb863bfc88e37e72 SHA512 faf712a3da37af05e642b3c14f98ce8d4e3db5b736b208d7ca8a18be02ac5626c94b4ed314bd0030d5fa3771b325ba0f24ec3a45188d27fd9de79c97b56e2626
 DIST cinder.conf.sample-16.1.0 183294 BLAKE2B 5d0f28b9ad200d912c42c34ca030a5ec3660c57db332677e1b66b314a2865187862c83baf78d122fc0af7f73fbf4f0c7f04b9253882d228dcb863bfc88e37e72 SHA512 faf712a3da37af05e642b3c14f98ce8d4e3db5b736b208d7ca8a18be02ac5626c94b4ed314bd0030d5fa3771b325ba0f24ec3a45188d27fd9de79c97b56e2626
 DIST cinder.conf.sample-2019.2.9999 183153 BLAKE2B fb86b82c711568c89a445c5876a1d5e890714d4dd957d4aa5b3158a3c85150e75d8d0055a93bf6a937d8a6f5a3c4042c5ddb4b4da2dd006d77d8eb8ec8a19fc5 SHA512 95a2076970184bc34c9c293371f72a791f16600c4933572b8d51291c506a7c1ef3bd2ea185f1f4dafeff6c85a237f4453f8ee6c1df6af7f603afe1ddfd63cd3a
 DIST cinder.conf.sample-2020.1.9999 183294 BLAKE2B 5d0f28b9ad200d912c42c34ca030a5ec3660c57db332677e1b66b314a2865187862c83baf78d122fc0af7f73fbf4f0c7f04b9253882d228dcb863bfc88e37e72 SHA512 faf712a3da37af05e642b3c14f98ce8d4e3db5b736b208d7ca8a18be02ac5626c94b4ed314bd0030d5fa3771b325ba0f24ec3a45188d27fd9de79c97b56e2626
 EBUILD cinder-15.1.0-r1.ebuild 7725 BLAKE2B 9030f02232344ed4766bc083de914f28b05411f6548c96d77cfb8bf6a3f2235666af44a06804f515df8a70e1512595c904e6ef2396e4d220b549eded07822bb9 SHA512 634c3cce3444ef915af124dcabf83c2f5ceeaba535cfab56b700a146ef3365891b273e046c5feaa308805dfc023ebe4cf669c1c0a7c875ffe372e2bfd536a300
 EBUILD cinder-15.2.0.ebuild 7727 BLAKE2B 6db8b0067861be958f16707937bb7c2345cbba8d49357610dd358d485b6bb3930629adc469b5f50de3360dbdf9acb8ae30baf08995bda0dd14ff0e1d61c0cc65 SHA512 d8b5041ed0fed6addbc626d1faaf6adce7e1fc47ff3845f2db25658b691bc58044b7f2b56b7442f2fc0651d0da4b7315e003a513b100e097af44971b677d8a89
+EBUILD cinder-15.3.0.ebuild 7724 BLAKE2B eb5b9af676afd017e0e10b8af099eb9387909ef184f6d564a557101dbbf160560b526117dd94b81cf34745952083be9066b3d19aa4814c09d535cb9ed9c1480c SHA512 c875bba2e29c67dc29507657ed725255cc23503fe5f36af9e1808233536c628c6f09fb8d2a53a0f1086e69b3319f1e854bc5f5db7ac89b505d056ce05fcb8966
 EBUILD cinder-16.0.0.ebuild 7634 BLAKE2B eac99e6afdcaa2325f9b613fe9e6032ae5f2f48f4036237d6b2c253df0549a42154e2574d3e7ebd72b7232eb529f0f37237bbbc3beb94ce60c3f96d781a8d679 SHA512 c3970066fbc2098e2e6fc334751543df0178e26c0204e79afd98e2859ab8c4464ffad5fd820b8c5432878e7efe402d43b50ba01550699d8a34d737d0654e4918
 EBUILD cinder-16.1.0.ebuild 7636 BLAKE2B cef3adb35b74cb2ed1bc574dd4408dd9c16010d4f64720fca3965adbf881af3d80685e618ff70b3d433b2737fc422c62a7439393388ce2d68b20a6e50c74bad3 SHA512 ca9be5edf83abd75dce25f0d4bbf9c67c23c1060f892d702186158c3e2d2b20544d984384116dc5468e7cfa0e84d5a46887c288c7a3ab2510974ebd24672644d
 EBUILD cinder-2019.2.9999.ebuild 7727 BLAKE2B 6db8b0067861be958f16707937bb7c2345cbba8d49357610dd358d485b6bb3930629adc469b5f50de3360dbdf9acb8ae30baf08995bda0dd14ff0e1d61c0cc65 SHA512 d8b5041ed0fed6addbc626d1faaf6adce7e1fc47ff3845f2db25658b691bc58044b7f2b56b7442f2fc0651d0da4b7315e003a513b100e097af44971b677d8a89
diff --git a/sys-cluster/cinder/cinder-15.3.0.ebuild b/sys-cluster/cinder/cinder-15.3.0.ebuild
new file mode 100644
index 000000000000..7325178131bd
--- /dev/null
+++ b/sys-cluster/cinder/cinder-15.3.0.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 )
+inherit distutils-r1 eutils linux-info
+
+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"
+
+#	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]  # do not include, upstream depricated
+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}]
+	>=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/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.10.4[${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
+	acct-user/cinder
+	acct-group/cinder"
+# 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
+}
+
+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/galera/Manifest b/sys-cluster/galera/Manifest
index d3d9d5b766a0..e8386804f597 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,4 +1,5 @@
 AUX galera-26.4.4-respect-AR.patch 396 BLAKE2B 17c0b47ce5d1a8326b9f11311647e77d12ae55570d30847d5f9bc3eaee0cc80b482375da0b4d4d398539e9763ba981b0135292c67a356df32a2f6453be71d7e3 SHA512 fa1014c1574e489e4903dbe583a4e981853d612ca2fffbe88010826a40f889a2bb20995699a520efe9bdb52595bb6afff115321505438387d564dd25f93dd140
+AUX galera-26.4.5-strip-extra-cflags.patch 2235 BLAKE2B 95c0a28a34382e4ba9690fd2c1556574ebc7a4da93fa43f21cd1dddf99ceac357922ba325dbf8f5d110ea6fdea63fe3e7fecb10c2fdc83857b70410409437aa2 SHA512 ca979602feb222ab052971ab08bfee10efc7980f2c509d4bcf1476d052ad3793aab91c4daecb1c029408becac62607b04c91cfe81f0a9f8cf42b3ef0d0cc8d89
 AUX galera-3.15-strip-extra-cflags.patch 2397 BLAKE2B 7d1d9e7b775e8ee26da152fb42c4b19e65e1084e471d4c7613a661206ee05fa280c29266be4ae66c0b1001de3062a6396c3b45917fcf3d4090b8afe229a7e680 SHA512 4f41398faaa138543ff6fd24b2aac9aa329dabf74d6355ea5c620db64e3112e27e17c15bf7e1dae1e7ddbe92795cedd65a9d6e52bd07b66f3fe27dde2ffc7cad
 AUX galera-4.1-strip-extra-cflags.patch 2747 BLAKE2B 314e020bdbce2d3080d28c4d5bf5ad438affc8075736c38b77d713e59749a4eabce3a38b6c918b1768f48b99ec5c860813c3441291d0834ebf6d6ed545d30576 SHA512 0458705897861d4bc225326077ae379fb1c921aa65a102a24f2fba5c866c52a549c47bed929801c06ebb0c484136c1179a56b2fd750abd6aabc7a6a74fc18c2f
 AUX garb.cnf 612 BLAKE2B 6597e77fd29aacece48e89217004abc62ecaf7f6477b62d5a29ff1c3b5f18dca3cfbe6a4a115c324c945f6949e8fe227b8b9e4e94816d48eda53e9e2723100e5 SHA512 97b921109b242ad1a19326564b5f9da8a09eadd4771c2c86c727c1c30e35f92ffadbb38ce7d81bc88572d2c7b04466ad212432954e09d81417c4ed7f69ec4648
@@ -10,6 +11,7 @@ DIST galera-26.4.2.tar.gz 3499538 BLAKE2B 4531b246da119528192ce85364a344f56aeb83
 DIST galera-26.4.3.tar.gz 3507925 BLAKE2B fb15724dd1477cbabffe6d76e6fee0425a86d335289a61e8b3fbb51b5dd84f8a6259d3ce1cf808fb5b2f2299c2b9f28988a87d0dc67667a02a53e12ba911d976 SHA512 857c6b1965871a5801d3cd7396fec8259e0b72a397b5fb92e63f374531fdb03dbecd5d5ebfdf2f0dc388d87c0ae25b357d02581c8d5889803d04c0a2f2583b52
 DIST galera-26.4.4.tar.gz 3472392 BLAKE2B 146355ad95058d08800870be1c7d1d0be84d2cc621cc7857754468256cfa7ff5c99b98dfab71ea8354f6fdd720ac3a0849f768cf9cc75a55a92e8cdc0a19a9d4 SHA512 4e85b7e5182a04983d1b6f2ea539bb2fc5e02b73502bcaa1c142e92cd3e43d283570301a433518206885b575932ad5d4d9f72243ed94f6c7245036f24c699d8f
 DIST galera-3-25.3.25.tar.gz 3373347 BLAKE2B 892c5824d88d7ceb0db16f72d9fad9ac7074435a6cacf3fea1599af0be811cc1a0b476d0a15353d0cf854a201ca5e60808392a41125c780bd97b844a4fd55216 SHA512 bc9f02c796c7289034f5b285a8f6a0e668c78302546b47c70cbe3927467993baae8835cf54978fb5276251a6d04a84d6952eaee4e6c7c5fd488543fd53d07b03
+DIST galera-4-26.4.5.tar.gz 3527293 BLAKE2B 2e46a1a76ea512cd644f9df6db380fcf232ef296b4178cb85782ece7e6ec70d281e89aea495167028c6e19d70455aecd272e18d8187123093e438715743a2ba6 SHA512 a8400a2a2d9b378e1e5ab9311b2d174355f9126b3bb81863de57db698bcea7571330e255b0f6d139abc4378c80db898739c856b639142864ce34cd147f255b0f
 EBUILD galera-25.3.25.ebuild 1912 BLAKE2B ac9d716d6c0b11b7f85db6da47e549895e5808e6d12a62089786996d730ea59164a389054e6ff3f89cb2cfc2c3bd2f1c15c637045487855ab1f8167979869d8e SHA512 4fceea28b0fa3b420f0f5c79ef17eacbaf029ac75566f41ad37e21ffa9737365092f32d5cd4f70f67b22e3ab497120046142e489f1ee5531d49797b32cad68b4
 EBUILD galera-25.3.26.ebuild 1933 BLAKE2B 497e6de11a10d6500e2874a973ac47383dda943b3f46340c56896024781bbfa4e4b19aa7b0a9e245170493d3246a6a6bf0b3c117b8acb6eb6db8af8b2e44da2d SHA512 7c9f83109a9418dd0a1bd1122a131338b68dde9ea0085fd5301a1b04ac089ae35e0554076336c70bcdbc8d4bb3e867436f246119fd21ff5b477ed6e331bd54e7
 EBUILD galera-25.3.28-r1.ebuild 1787 BLAKE2B 724e57232f39574fc9a74ac6005b0f0ef82f3c37a7d9dc7d06b6f967f8966d42596f97710a0048098fe4234fc6e50485b142b1f2d17c7f9ea9a7ded8a8d63c54 SHA512 13570740a581465ad5a1dc0c8475d8c301a1baad3da399d45eef620c14e731ed7619d9920620a7b218686f8596b49512573567d05c7cd376462abcbafe41ca37
@@ -17,4 +19,5 @@ EBUILD galera-25.3.28.ebuild 1933 BLAKE2B 30d6355db4bc5eecec418c814cb6de00d4013e
 EBUILD galera-26.4.2.ebuild 1887 BLAKE2B 3cfcc688d2211a780d74e8c1001abb560c4990328f281bf4754c4d0a47b0c1f54a3cd83817e66086e330050f8cee45ca5a55b4034cbd6f9c7c2b2e74b98f9a2a SHA512 4ebd12af503f8c62b354a1fc2f19190f61a1708d1c7f391320fc7df013a1409790af14c4722b7ae739094c7552f7c9c3825153fdc06f0190627616b17b18d23d
 EBUILD galera-26.4.3.ebuild 1789 BLAKE2B 457e551c47e4711a1c4420aa667a4d949b386bac6942b9c20dfbc577d6158db07b103e542daaff2e71c3233d61a99921ab20d5bf901e7b10a543aeb880af1495 SHA512 78e370cee168728221740f984907f987c5c5f84a889e5ea62406bee503b8bd5638c2d3d1057dbd220f2a195f971fe91696e6f6e72d0f709df1fca3c5567e9660
 EBUILD galera-26.4.4.ebuild 1838 BLAKE2B 4cdc14ad6f9ed0884cd416936617ebc315c527cfa16a57377332ddb4c0bfc436b740dd85c6ecab09f10d7ab86f0e6ea092a91870a05a52c595649579dd9dee00 SHA512 0518b4fad5cbc4ec92d3dbe581a4d3afb2f25db7549a3d7b25d7e437e389332a0c6b9ba9130de621a7e03771fe5597a56f02945533bb7fc262a367f4e48a0729
+EBUILD galera-26.4.5.ebuild 1871 BLAKE2B 410ef46684d0fe62d8136d2db098b11aec0a29c177ed8e84910ef44ab1381788d61a58e73f81b2116080f966c761d71393ee59b36cb026523e0db134d3b9185c SHA512 37215c9c7a2801cc0c0348a4c8997a7d4427a62eb58d6c806ef053aaca1d95a9d42460be7852db530f407498c771c85d2582ffcb539ad8b56439da4406b87a79
 MISC metadata.xml 462 BLAKE2B 1b0826bcb2bd93caa5f017b3c530d3bea18daac9f457dc79d6436d21f41b8c33d2979469df870cbc68428ba0110d17013bf9cd82f4f46d9be43bf996f7815e0c SHA512 b99987e53ae976905d3e493b09cbe35161f90b8ebfc88c4a9616b8722b0a0005c2427d509e15fdd7bbb30977266188452b3b6ec7479a943bce3a5922410246e2
diff --git a/sys-cluster/galera/files/galera-26.4.5-strip-extra-cflags.patch b/sys-cluster/galera/files/galera-26.4.5-strip-extra-cflags.patch
new file mode 100644
index 000000000000..ac99140b6c96
--- /dev/null
+++ b/sys-cluster/galera/files/galera-26.4.5-strip-extra-cflags.patch
@@ -0,0 +1,68 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -87,7 +87,7 @@ Commandline Options:
+ build_target = 'all'
+ 
+ # Optimization level
+-opt_flags    = ' -g -O3 -DNDEBUG'
++opt_flags    = ' -DNDEBUG'
+ 
+ # Architecture (defaults to build host type)
+ compile_arch = ''
+@@ -133,26 +133,6 @@ if dbug:
+ if gcov:
+     opt_flags = opt_flags + ' --coverage -g'
+ 
+-if sysname == 'sunos':
+-    compile_arch = ' -mtune=native'
+-elif x86:
+-    if bits == 32:
+-        if machine == 'x86_64':
+-            compile_arch = ' -mx32'
+-        else:
+-            compile_arch = ' -m32 -march=i686'
+-            if sysname == 'linux':
+-                link_arch = ' -Wl,-melf_i386'
+-    else:
+-        compile_arch = ' -m64'
+-        if sysname == 'linux':
+-            link_arch = ' -Wl,-melf_x86_64'
+-    link_arch = compile_arch + link_arch
+-elif machine == 's390x':
+-    compile_arch = ' -mzarch'
+-    if bits == 32:
+-        compile_arch += ' -m32'
+-
+ boost      = int(ARGUMENTS.get('boost', 1))
+ boost_pool = int(ARGUMENTS.get('boost_pool', 0))
+ system_asio= int(ARGUMENTS.get('system_asio', 1))
+--- a/galerautils/src/SConscript
++++ b/galerautils/src/SConscript
+@@ -1,4 +1,4 @@
+-Import('env', 'x86', 'sysname')
++Import('env', 'sysname')
+ 
+ libgalerautils_env = env.Clone()
+ 
+@@ -39,21 +39,6 @@ crc32c_env.Append(CPPFLAGS = ' -DWITH_GALERA')
+ crc32c_sources = [ '#/www.evanjones.ca/crc32c.c' ]
+ crc32c_objs = crc32c_env.SharedObject(crc32c_sources)
+ 
+-if x86:
+-    crc32c_env.Append(CFLAGS = ' -msse4.2')
+-    if sysname == 'sunos':
+-        # Ideally we want to simply strip SSE4.2 flag from the resulting
+-        # crc32.pic.o
+-        # (see http://ffmpeg.org/pipermail/ffmpeg-user/2013-March/013977.html)
+-        # but that requires some serious scons-fu, so we just don't
+-        # compile hardware support in if host CPU does not have it.
+-        from subprocess import check_call
+-        try:
+-            check_call("isainfo -v | grep sse4.2 >/dev/null 2>&1", shell=True);
+-        except:
+-            libgalerautils_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE')
+-            crc32c_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE')
+-
+ libgalerautils_env.StaticLibrary('galerautils',
+                                  libgalerautils_objs + crc32c_objs)
+ 
diff --git a/sys-cluster/galera/galera-26.4.5.ebuild b/sys-cluster/galera/galera-26.4.5.ebuild
new file mode 100644
index 000000000000..760070fc8afc
--- /dev/null
+++ b/sys-cluster/galera/galera-26.4.5.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,8} )
+
+inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
+
+MY_P="${PN}-4-${PV}"
+
+DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
+HOMEPAGE="https://galeracluster.com"
+SRC_URI="http://releases.galeracluster.com/galera-4/source/${MY_P}.tar.gz"
+LICENSE="GPL-2 BSD"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="cpu_flags_x86_sse4_2 garbd test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	dev-libs/openssl:0=
+	>=dev-libs/boost-1.41:0=
+	"
+BDEPEND=">=sys-devel/gcc-4.4"
+DEPEND="${BDEPEND}
+	${CDEPEND}
+	dev-libs/check
+	>=dev-cpp/asio-1.10.1[ssl]
+	<dev-cpp/asio-1.12.0
+	"
+#Run time only
+RDEPEND="${CDEPEND}"
+
+# Respect {C,LD}FLAGS.
+PATCHES=(
+	"${FILESDIR}"/${PN}-26.4.5-strip-extra-cflags.patch
+	"${FILESDIR}"/${PN}-26.4.4-respect-AR.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Remove bundled dev-cpp/asio
+	rm -r "${S}/asio" || die
+
+	#Remove optional garbd daemon
+	if ! use garbd ; then
+		rm -r "${S}/garb" || die
+	fi
+}
+
+src_configure() {
+	tc-export AR CC CXX
+	# Uses hardware specific code that seems to depend on SSE4.2
+	if use cpu_flags_x86_sse4_2 ; then
+		append-cflags -msse4.2
+	else
+		append-cflags -DCRC32C_NO_HARDWARE
+	fi
+	# strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
+	# and -Wold-style-cast
+	MYSCONS=(
+		tests=$(usex test 1 0)
+		strict_build_flags=0
+		system_asio=1
+	)
+}
+
+src_compile() {
+	escons --warn=no-missing-sconscript "${MYSCONS[@]}"
+}
+
+src_install() {
+	dodoc scripts/packages/README scripts/packages/README-MySQL
+	if use garbd ; then
+		dobin garb/garbd
+		newconfd "${FILESDIR}/garb.cnf" garbd
+		newinitd "${FILESDIR}/garb.init" garbd
+		doman man/garbd.8
+	fi
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe libgalera_smm.so
+}
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 8b4b421062d1..d4fba37caafe 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -18,7 +18,7 @@ DIST glusterfs-7.5.tar.gz 7649044 BLAKE2B 01088654051a33c3a009b42c6e7adf7cabc529
 EBUILD glusterfs-4.1.8.ebuild 6678 BLAKE2B 82e3dc30bfa0b5b883eb17e6ec2f08e0c7f0f4a15f04cbaefe7faa3c3a0d0f42469961c5ee51b807531625d4ff900ae59e3b5d6c835be19877a150556314b804 SHA512 487e8612765bf23c445563fd731aa59aa55fd6bc237720505875f456ad742c95026c2283c1a9cc08d5119d6faf676b8f2d45256a5a4d564e538735dba043b43a
 EBUILD glusterfs-6.5.ebuild 6116 BLAKE2B df48f2df594255aa196477ec76a296b9912b0c4bfd5a6dd10276098b58fa9355e4c35cabfa0bdf7d5e85967dd191208d6f2de3cc2f3b428eac3faa80c0ee9c58 SHA512 3d44b94f1b75bfcf5460a0b00b0cf1e557e468dd3baed07e08a21d29238703d4a40743201485a2e117852c05ac46d48d09349cebb2d35d22596debf2a795e5bf
 EBUILD glusterfs-6.7-r1.ebuild 6377 BLAKE2B 9b6e89a54e32c74498c7731b82edc47c7855fd686f1d714978000ba7704505d2ca3cc603c7dc79fca17876cbb1e3063b7454d406d28e37752a7449ad66d19767 SHA512 9ddef2dd1443e5340d64dea96ec99c98ee4b2bbf78ff16878e58f9f509530134344e26cb08636916de3d83d8c024e48cd64bcf5a153219785e37dae288019a2a
-EBUILD glusterfs-6.8.ebuild 6117 BLAKE2B a2f6a3c7f3e9071066dbdf85c9ae072757160de16eccabbd2fe08ba3fc805220451ff77b3bb3819c41199de61435067234de6ab0d98eb1b6695e5d88a0a8bfce SHA512 2c5ea8cd5d9a6f1957a699248678955c01b64125a9bb35bdbd8f71db6424819213f60c3bc69132dca7e89de3ed7ee497dd656d2eff67c3a1a3ea549466c0bb9f
+EBUILD glusterfs-6.8.ebuild 6114 BLAKE2B 3b03b12e3e7acd7008004e5035c2f405afed4ba5deb4e06cac1fad009f6c6fb37f3b78f68bbeef4ede14cab830fae6d17982d2443937e7a9b13e85814dc72e31 SHA512 4449b69a6ba39669e56da6f52b603c87994a5cb43ab236290cb1eb2222c184a5026364fc8eb8412858b7aa7988aa933b21da6c4c21c02adbdb32bb8d20e0ff85
 EBUILD glusterfs-7.2-r1.ebuild 6259 BLAKE2B 30903cd572631cf7dcb6a9eb2fa882d015e5f4f2801c8ae23f2e7e74d6172678ed01761240a0b0fbd74870e8f8d6d14cd173e6612696b6a964eec33259488a7b SHA512 342a661bb98e013d7b9a407aeb5e545fca24763e1363e92b958871e60245f598304a2ba8ab855afdeffeafa6790fa1ee5160f512ee8bf059a9a78128636604e1
 EBUILD glusterfs-7.3.ebuild 6117 BLAKE2B a2f6a3c7f3e9071066dbdf85c9ae072757160de16eccabbd2fe08ba3fc805220451ff77b3bb3819c41199de61435067234de6ab0d98eb1b6695e5d88a0a8bfce SHA512 2c5ea8cd5d9a6f1957a699248678955c01b64125a9bb35bdbd8f71db6424819213f60c3bc69132dca7e89de3ed7ee497dd656d2eff67c3a1a3ea549466c0bb9f
 EBUILD glusterfs-7.5.ebuild 6117 BLAKE2B a2f6a3c7f3e9071066dbdf85c9ae072757160de16eccabbd2fe08ba3fc805220451ff77b3bb3819c41199de61435067234de6ab0d98eb1b6695e5d88a0a8bfce SHA512 2c5ea8cd5d9a6f1957a699248678955c01b64125a9bb35bdbd8f71db6424819213f60c3bc69132dca7e89de3ed7ee497dd656d2eff67c3a1a3ea549466c0bb9f
diff --git a/sys-cluster/glusterfs/glusterfs-6.8.ebuild b/sys-cluster/glusterfs/glusterfs-6.8.ebuild
index 5812e989cf9c..75c496e8940a 100644
--- a/sys-cluster/glusterfs/glusterfs-6.8.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-6.8.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV#9999} != ${PV} ]]; then
 	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"
+	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~x86"
 fi
 
 DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index c9df3931e30a..8588e1de67f9 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -1,7 +1,8 @@
 AUX hpx-1.4.1-boost.patch 1067 BLAKE2B 25002fc609e2d4eef3f8645ecd4aa68ebb7db667fe66e3b33674e175857cbc8b71d8a0c1c86304ceb02df1e7ae7eb06c7a7e21c47d2b7b377fde974dce638416 SHA512 345fa5745f5be2286214d957d6b7d9497d429d8d9628db1d3f0420fdb7df5cefd9e4e06381706b55612b033f29effd085bd68e36122824ef633f23c475a3009d
 AUX hpx-1.4.1-disable-failing-tests.patch 5828 BLAKE2B 2f550b50c8090b5ae88f665c0f862adb20046c7762045917892d435f497691063e9ce56f54aa1ab5b0451dbe9a9a8666c78d7ff6d5593ae7add9d688a87617b0 SHA512 b3b2882bcc3ea7a15ebe04f0f7596608664c21c4383f7e2619b9adf484fc976c6ab5cd820dd0c941af1e2f6000edf2e894ff7aa5f7fd6e0e2e6ec835b58dcbe8
+AUX hpx-1.4.1-placeholder.patch 3760 BLAKE2B da3f34201c7be713f559d1573037fad9b979fea74791dfc3ee14a41245420962bed2dc4dc1a1ee98e5c6e87a66ea89de6c3dac590d83d1cfab102ea0de3707e8 SHA512 7af105e8855cd6ff1160f2fb0400095a1674470b2cf5447cdf3391fcd478bd1c80f35451b30eedd97d46016db74a5dc789cae83b58244163ff2fe5951b693f15
 AUX hpx-1.4.1-python.patch 1095 BLAKE2B e0bf47364e01f96b065af8d3a1e0a23c536f66a56baa71903778528c801dd6ea6d7acf9a3f2acbb580f75d1493752b1c0c30c8ed3c9ee7f71da8c007c93739e3 SHA512 4eee43504e1e60b0ee61fc9d2ea2c61c3b1c7ef00dea38d3b913e7cd8ebbeb9561394ad4680a9b6e9e995a2d3b8478abea9d8221de055f3d810f24db39bf7760
 DIST hpx_1.4.1.tar.gz 4213023 BLAKE2B dc8a9cda3061359ea1bb8eba9ccee60dea308f5425cfe0f18d9003032726962d74d417b8748124c8e6a0b207624093ccf625c82e9e1a71fce8dde74d41d987d2 SHA512 f110d5e5c10ec396f6e762568c9ecd5b767cb6efe91168b5caa8fe1e07bb5870cd13b3392fa4e008a2cc0e044b02084a35b0866e943d9b9c7435599c131f1582
-EBUILD hpx-1.4.1.ebuild 2566 BLAKE2B 9546da2933c11e1e6a50cc56149a8fe416df47caa2d911926908409c3f003229f039389ad447ef784400c537c741fe724cb9ae3cce27725f7e089d4e71b8b8ee SHA512 4fea42c1e6c0bce3c5f959dfb2242686fab0002d5ed9bfea57b71aa3ce2354e07820b26a8334fd67232ef252075ffe406f08a5a7990aedecfe21ec763ada1f13
+EBUILD hpx-1.4.1.ebuild 2604 BLAKE2B 6a8fdb61793c2e50ec3891c03e1db3e7a27a8c2cf92a7849790c145b8b2666ae384c7d4e9024ee2d1bc98c4bc581a5dbd1e16412ce7f5770935d54d22c48dbac SHA512 6cc73c8841dec9f3663537c581fd6be8207834dc07a709664bd9ab04574502f76660b6ff42382da573058bca82261e9e41dd0a417975f686ae824abfc6e976de
 EBUILD hpx-9999.ebuild 2440 BLAKE2B 2ad7756b471e832b5b6a7890686ca6c2dfc942bf0ea3ae6e92607b5709dd301d8a5ce121c78155ab730147cf4f767d436f979c9d83934bc5e11ccf1154416710 SHA512 5d683f05438d5e2f08d6872e6955cf8806d72f2f3bdb234b693bec0505263f1330d3bb8f196b104e08342e36e22cf442b2e7b77047c0a5f1715e1e31269bcbcd
 MISC metadata.xml 1189 BLAKE2B a6fedaeaa9c32038109691eb64fd62dd0cf0bc2104710fa49d57a95b09674a23d4e38d03fa2e306734b587a8682c1a7007ed078988226c39f17ccacece740a52 SHA512 eddd398a02bfa3716a373a6cb909a881efd72c11d7e4ce05a722da1fb5d5e464b59999d5bf0de2e608f768d6ceb50ccd64d43e77088c19fa1b28a19b404469da
diff --git a/sys-cluster/hpx/files/hpx-1.4.1-placeholder.patch b/sys-cluster/hpx/files/hpx-1.4.1-placeholder.patch
new file mode 100644
index 000000000000..94271e6c0eca
--- /dev/null
+++ b/sys-cluster/hpx/files/hpx-1.4.1-placeholder.patch
@@ -0,0 +1,79 @@
+From 6bdbb6a3ad6ea57c46e9998e9efd46f86f5d5729 Mon Sep 17 00:00:00 2001
+From: Hartmut Kaiser <hartmut.kaiser@gmail.com>
+Date: Tue, 28 Apr 2020 09:52:08 -0500
+Subject: [PATCH] Adding missing using placeholder::_X
+
+- flyby remove unneeded using statements
+
+(cherry picked from commit 1a6882195f9dc8d333ad12898fb88e3ca2931022)
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ src/performance_counters/registry.cpp                         | 3 ---
+ src/runtime/agas/addressing_service.cpp                       | 3 ++-
+ tests/performance/network/network_storage/network_storage.cpp | 1 -
+ 3 files changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/src/performance_counters/registry.cpp b/src/performance_counters/registry.cpp
+index 34c8d0e71d55..8da91f379a72 100644
+--- a/src/performance_counters/registry.cpp
++++ b/src/performance_counters/registry.cpp
+@@ -378,7 +378,6 @@ namespace hpx { namespace performance_counters
+     counter_status registry::create_raw_counter_value(counter_info const& info,
+         std::int64_t* countervalue, naming::gid_type& id, error_code& ec)
+     {
+-        using util::placeholders::_1;
+         hpx::util::function_nonser<std::int64_t(bool)> func(
+             util::bind_front(wrap_counter, countervalue));
+         return create_raw_counter(info, func, id, ec);
+@@ -401,7 +400,6 @@ namespace hpx { namespace performance_counters
+         hpx::util::function_nonser<std::int64_t()> const& f, naming::gid_type& id,
+         error_code& ec)
+     {
+-        using util::placeholders::_1;
+         hpx::util::function_nonser<std::int64_t(bool)> func(
+             util::bind_front(&wrap_raw_counter, f));
+         return create_raw_counter(info, func, id, ec);
+@@ -465,7 +463,6 @@ namespace hpx { namespace performance_counters
+         hpx::util::function_nonser<std::vector<std::int64_t>()> const& f,
+         naming::gid_type& id, error_code& ec)
+     {
+-        using util::placeholders::_1;
+         hpx::util::function_nonser<std::vector<std::int64_t>(bool)> func(
+             util::bind_front(&wrap_raw_values_counter, f));
+         return create_raw_counter(info, func, id, ec);
+diff --git a/src/runtime/agas/addressing_service.cpp b/src/runtime/agas/addressing_service.cpp
+index f30760c0e05e..b416a28d12d8 100644
+--- a/src/runtime/agas/addressing_service.cpp
++++ b/src/runtime/agas/addressing_service.cpp
+@@ -1864,7 +1864,6 @@ future<hpx::id_type> addressing_service::on_symbol_namespace_event(
+     hpx::future<bool> f =
+         symbol_ns_.on_event(name, call_for_past_events, p.get_id());
+ 
+-    using util::placeholders::_1;
+     return f.then(
+         hpx::launch::sync,
+         util::one_shot(util::bind_back(
+@@ -2356,6 +2355,8 @@ void addressing_service::register_counter_types()
+         util::bind_front(
+             &addressing_service::get_cache_erase_entry_time, this));
+ 
++    using util::placeholders::_1;
++    using util::placeholders::_2;
+     performance_counters::generic_counter_type_data const counter_types[] =
+     {
+         { "/agas/count/cache/entries", performance_counters::counter_raw,
+diff --git a/tests/performance/network/network_storage/network_storage.cpp b/tests/performance/network/network_storage/network_storage.cpp
+index 33fc1a66afa4..dfcffbafb180 100644
+--- a/tests/performance/network/network_storage/network_storage.cpp
++++ b/tests/performance/network/network_storage/network_storage.cpp
+@@ -802,7 +802,6 @@ void test_read(
+                 ++FuturesWaiting[send_rank];
+                 std::lock_guard<hpx::lcos::local::spinlock> lk(FuturesMutex);
+ #endif
+-                using hpx::util::placeholders::_1;
+                 std::size_t buffer_address =
+                     reinterpret_cast<std::size_t>(general_buffer.data());
+                 //
+-- 
+2.26.2
+
diff --git a/sys-cluster/hpx/hpx-1.4.1.ebuild b/sys-cluster/hpx/hpx-1.4.1.ebuild
index 9a3dc2abc763..964325329bb6 100644
--- a/sys-cluster/hpx/hpx-1.4.1.ebuild
+++ b/sys-cluster/hpx/hpx-1.4.1.ebuild
@@ -55,6 +55,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}/${P}-boost.patch"
 	"${FILESDIR}/${P}-disable-failing-tests.patch"
+	"${FILESDIR}/${P}-placeholder.patch"
 	"${FILESDIR}/${P}-python.patch"
 )
 
diff --git a/sys-cluster/k9scli/Manifest b/sys-cluster/k9scli/Manifest
new file mode 100644
index 000000000000..88c078419643
--- /dev/null
+++ b/sys-cluster/k9scli/Manifest
@@ -0,0 +1,933 @@
+DIST 9fans.net%2Fgo%2F@v%2Fv0.0.2.mod 29 BLAKE2B b8e7db485d654c4b4fd36fefe2d1e24c2716ca7ee1cdba4558864c2e7bedaffe5740a1f4b525254b52ed798899f62f34ce3e53ee2b4b78dc491620edfbee3089 SHA512 6e308f16d7a05e9714538a863b307fe879ee2c3e2c2e3c9ae99b58dec161a3b771e04522684a6524078d8c004d99e36e6cf5e6e10501640822c953b3fb5c3e38
+DIST 9fans.net%2Fgo%2F@v%2Fv0.0.2.zip 153938 BLAKE2B 3686ddd5b4e0ff4847f6f75ffcbf14da861281e66cc9801ad6df15329bf0209959635f5bfc1cafb9cf1919c6b6e17612e355db8dbfca321a3d14fc576637714a SHA512 3e9588c97150043e7536c20aa38c314cf13910eb1aecd42b8af0acba41b06d4df3d27f71980d7e1d0fd2850618567bbddf2f016ca77a92db79f34e751c2c8b80
+DIST bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod 22 BLAKE2B c2b56c0b043a2c0225c3b4142f179a2d2e4938dad64b95c8662a6d641e69a455b50ed79c66a3bcc10982792d3b7742ac96a2d74eefa7fec40a7c3146e5c949cd SHA512 7b3ef87f98485bb9ec325680f57d43a9bd76e90bdcfb1e798458f28f7d3addf91dbb6a07b654749468860981413ad2267df2d5f3535c85579e9f79d9328d355c
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.zip 2721920 BLAKE2B f3fde8f5cc53496dc314bcae822a415cf00950da0a03b968de00685371e7a2e84ffa304fb176e791c85c930728859687e768ff785829f0751ae919546bd3326d SHA512 8981a08b1ba0226854567b0977d8a349abe2b58420421ab1dccdaf9c98e7657cb2140ad1a38767d25cb54249b61f162ecd51d401374a29f7368a550b19196595
+DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.2.1+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
+DIST github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod 36 BLAKE2B 52a2c5272e004524397df00dfa03b4c2d2ebd985a0c974236aad6b847d6b2b4b7c9b69ef48e263f4c67983b845b020d2004fe749b46fee3c0525da0416b20f3e SHA512 350a16c68553738ce8c2f4a6ac8beba66a7dcf2386a42aff938ebaa3bdc526bda8e5c51c493331eda4666cbcf8411ee7ca3aeb0768cc4f557f34585960f9eb84
+DIST github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip 32735 BLAKE2B 5de266d7400ae80c027f209cea91c911e22b0ff4fc6a2e964e8906f1a86cc6905b9c12d2588d5fdc91d0d8e9501a0ddf2f7a376cca9935d21943386c3ef31979 SHA512 72621865ffc0cadd27603e2f4032f1cd9c9d8bdcb920b3ca9fd02dbf88e52876a6f092c5b74eceb136021c514b68dc599f0cbbf18ed1620b827d46462aa55e32
+DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.8.1+incompatible.mod 36 BLAKE2B 71643bf27cc23617d54777e18c77d9015af83e9e9c1ec846c333d91760e70e57e51e3b9fb0b6ec8bae5140893237ae6f08bfd6a50b452145d6bd635a4abfec12 SHA512 d7c80a07fa3633acb681d54fae5743c6aab0d5f1f9e1edc3f7037a7abcf12c5536c524e856f9ea3d876b2b0fdf2884fa307ed16fd9758aba17a3d28766df1377
+DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.8.1+incompatible.zip 171364 BLAKE2B 0b45dc6508fa260f4e4b666ad33b0806474a64e23c4c7291ffd08f418a9689a17d0593bf5fd68c46ddc5e9b770a202202fad337d3e9beda579c841c498faf003 SHA512 20417e34c3599daf727dec16591e497b0784e2e5c27684f076b27fb4e27920f7d5c3d0decf52167650d571d88164b7887fc3e6b335d3f4b53a083703a8127fdb
+DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.0.0+incompatible.mod 36 BLAKE2B 71643bf27cc23617d54777e18c77d9015af83e9e9c1ec846c333d91760e70e57e51e3b9fb0b6ec8bae5140893237ae6f08bfd6a50b452145d6bd635a4abfec12 SHA512 d7c80a07fa3633acb681d54fae5743c6aab0d5f1f9e1edc3f7037a7abcf12c5536c524e856f9ea3d876b2b0fdf2884fa307ed16fd9758aba17a3d28766df1377
+DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.0.0+incompatible.zip 23845 BLAKE2B efa4d3ee52fbb8222f37ca8b13c3caba1149472ea950bc84f7a8a07cc98ef829cfcd3c4368900eecfa7c13f28dc583467a9bba6b6fca95e5d1a3942e780e6ce9 SHA512 79c2c4371208aecba36519a9e358d454b4d3160523568f370ad51e55293434b571943f6126ea4c1a8fa2deb24f578cb380c399911494dbe138d2e0737a159c90
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.mod 315 BLAKE2B 649b180d4b41279bde5a3ad4e7a8380b3e23d9428af2b2904612abfce99e5abf53ab7fa27ac7805faff0be8c2d52d685c7edc1380b909ad2c033beaae87be7f3 SHA512 eca3516d2491afa621522aae14e0e5c8632b984d8c6daff3a69df9b2b46416eeacdbd11de8cbc2247fb1119051466d24a4c178b065b630a684be8476be1ef15c
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.zip 106412 BLAKE2B bf3d221898e0a13c2cb46fd95a1c8ca4c3983bb95f4a4b9eef327ca783a33c97cf4f31edc275012112ab30324d4ae8f2fdca75d2df59abaad9efe2f9638e4a70 SHA512 8dfebef6d6eb01b0d0fce523180faf49369b213f7ef6e6f2f19ab744a4e0e6cc6c4fb5394e9ac425419efc7bff429a13f1e1d3dc374ccdf0b4df485b1ca07fae
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod 315 BLAKE2B 08bd66cb04b1bd32588ef1eb6059f3a2cd208a20a9ba12816e50fa39f6258d1e50ced24d78da3df80f9ebbf19db7a6c42d04fa1934eb66637ec612da86704c6e SHA512 72bb5cdb3b87c148cf4b613f3976076ffa0f8406d0d85b92b8f0311ca260e643c7855a939292dd82c66a71d4c5a1419a90b13f886bd65c7138062c34eaeae0b8
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod 325 BLAKE2B 1ff6851c8e73b2a566cfafdc2ebd259478b39258f785040407cd853433312ef10e492da8dc0dc9cbd4a2d2470e2715ef5ba4c05100c35f5b0664c9b23879e721 SHA512 61c06f593c1759bb078042d461319db2f91afcbddf50186d09195021eab865159ca5c017eb078d354d7db590365846e401ec3f91a2cbbf753bc32d7111683bd2
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod 371 BLAKE2B 778ec4567ccf1533e9815f0f855933c94c2a4aed6285f10815258c71a39fb706ed130db03c85f8b944b764978ae584f7cc675cdd3688e6a93961f4437bf3aca2 SHA512 02605c296a8277e72074a0b3049ef0ee87597b67ba8d1e008d17746ee2dfc2551e2517e60f972135d368b27b899452e1c768c3b13afb9315da48173733450fe7
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.zip 40633 BLAKE2B 8ffe2bba80daeadc1a27198e4c6cbe39bf4219340686899460c4c217966d97583bcbe10ff7182a0bb27ad01550690ccdd12a1b53a91264bdaf3d6febe30adfd5 SHA512 d0f6392ef14fde8128709adaeeae7c4109a2c81830bbc107b8fca4ea6145bf68434a171f1d145536d78ea5e2fbc316cd21fabbb99008604a276974405274bea6
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod 59 BLAKE2B 7816ef9919ec514b2eafce6a859edeae85735475da10c34c64ecaf9a53a07748b02a424bd0a16b0413c499a2eacea0fcd6ce7807b651acd9f67ecd00b5fe55ce SHA512 d5eb17738399f8b8e1a1be409ba5b24520b848b3be5fced46c726499f9df5bf5a54233c6c0c9b8fe896834bcf5132f39ba0b91bac0ce6347b9aef7c8bf93f912
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod 113 BLAKE2B 7822bd4ddff863c4fe4e3caf59e722121828f61b08d5504216e1fea40401108199708fb07d7cef2b9dd7ddc7ed7d8feb4e0c823b8a7962217881601107404ca2 SHA512 08860dbcc27a83f322c07cb64b9fb1dad3810f8a7dda4ad5914b3fb8dcdc14fd20640e5aa78ad5dbd220c6dd95b8c9ab6e15c4bd75dc476db743f1c5df1fac95
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip 18897 BLAKE2B 984f84c50aa5024a3eb78369d669ad73e9b6a7ee6bc7a7ae95667d29706bbb7f6d1f06a8e8e98e037a1226ac9f9637e6072735a3d01b8467f3f21657ccbf7929 SHA512 3eb5646b62d06c1d610de05889dc4533e0bfe1ee5de2fd9feda4f4dea0606ddc7c667a41c73687460ab1f28f4fb17ea9b3f79b5c93ad6c4aaac6b0b9f15cd8ce
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod 60 BLAKE2B b5b6b8c4b80b9fb33bdabf18d6d34357cb207329df96da5fa36f85c18a62135da9d1550acc17eda531ec3fbf225781c5f9fa8f8c4a50730a8bda95e9fd567fe9 SHA512 98a8b2ccac214ef2a701c0bca2bb3512acdab19294d516ae6c8fe028d87393b055aa2e589cb273704ea4f612a1c949194014394aeb7d8ecd92233401e6ca35a6
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod 60 BLAKE2B b5b6b8c4b80b9fb33bdabf18d6d34357cb207329df96da5fa36f85c18a62135da9d1550acc17eda531ec3fbf225781c5f9fa8f8c4a50730a8bda95e9fd567fe9 SHA512 98a8b2ccac214ef2a701c0bca2bb3512acdab19294d516ae6c8fe028d87393b055aa2e589cb273704ea4f612a1c949194014394aeb7d8ecd92233401e6ca35a6
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod 114 BLAKE2B fec15aa5a362d73dbe839818a965fbf0a0183e7de3fa5b739739e7dcac4e88ae037848ccd7e6a35a4f6c3d7bc26988e0e1219ef6a3527c2533598777a0e5fdd2 SHA512 a119491d5a5b513a2ec0d0f5960ce04d03c263842f35a86a3efcb3931b5fefd19ef74df546e4b79ec119fb20dfa62d0f251c7812f144bc8258bf3acd902b693e
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip 9849 BLAKE2B 710903822f31a6678941a4489984af5b5cb7a82a97476a642fbe35061d4df496ce79159a82e4e7871fb9dfdbc3cead15416d29ac8d293165bfeb29b4c973c546 SHA512 1529a7855dce3307332e12e3b717b8c6ed9c274637e357007801df890332304f88f7aa159da3bc3685701f49edd78cbd10895131daea9c6c034d7619d21847a5
+DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod 52 BLAKE2B 83e3b09b165e45af373e2e62dc0b7799ac204794e1922b4134ebbeba4cf6cd9b6d883f6035624f2421e8ae613d071a2e281379ee4935e55b73540ad8104d79cd SHA512 ad433e42696f3b605cdb12c70438d3b1a4d4d52890cb28b8e76cb26bf1ae51f324e6dbe2043bd74bc9086efe743da65b8cbddd10618f4b59d27858e0898279d5
+DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip 9362 BLAKE2B aef4f369994d869906ca45a1051cc706579525324b8fe2a5c98dd4d80d4181366ff7e3cbb08f3274762a6f2ab2259a2770fa11a9b088b07ff3abf1a241d01814 SHA512 f81a070b61e026440ddd9b29174fd1d59241eb32d1fb4a2202c38fe80022aaff07b389ed6d75eff27da9408a7832f74c51f3c53866774cd9125e83c9f258bb61
+DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod 53 BLAKE2B 6fab3fdcfa8f595bbd52845b0b4f7b0e47df93fc624820a661b38bff1d51e0a57c89b678e0cf271ac6575b6a77c48d3ca93d5307d6cad98b35f79f1142a27795 SHA512 b1f9bd825933cac8ecd5416f86748f26e5cde3fe87266e35ee794cd1f59ce0fa81c0e62169e838e70afa71b0680a89fd8f2beafb3c1411eceadf48a154a08f9d
+DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip 6278 BLAKE2B 1c42d23c77848911af642fd38f79aab655056e731f015a62374a23cdaade84b53f61b80f65f9416bd4f0e4b72a0b42203b56d659d30a44bb244a6ed5ed1869eb SHA512 f1a334ef91dd9410c57efbeece2ebef6ea326485e790e47de67efc9495d3e252cd7e981bd9da3f94f2f7e35c1bad9a8d5153e671a9b81758ad0584883c916155
+DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
+DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
+DIST github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d
+DIST github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.3.3.mod 38 BLAKE2B eb94b6f6f4bf332f916cb642fae50486c6ad9f6a7aa1bb57aade3ed640bc98236ae167d30c140c106cee0ada737eca6bdf54d36bcab0751a940f283f55f08c5c SHA512 43bc64732c4ca2ff23bb09cd67f002b05a1b68963116fb42cf9bd60ac8dade8b2efa1cab798217a73b221ea86fb4e219e36912ffe338c7bd505f2a877be05c09
+DIST github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.3.3.zip 42823 BLAKE2B cb9b71b7dc0372ee4fed1c9c4c51abbd6cffa907f0eb5dd156475187256e5f8d007e667324edcecb3bbe51badf51c7d46643b89f30613670506c0aa5e76833a6 SHA512 b419a038368e290028a8e10066a95044d1b4aadfc3d33d396c05482f155dec4bd04f5a2277092761fa4433f4e25263a64b31524198dbe669526871ee540070d1
+DIST github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.4.1.mod 38 BLAKE2B eb94b6f6f4bf332f916cb642fae50486c6ad9f6a7aa1bb57aade3ed640bc98236ae167d30c140c106cee0ada737eca6bdf54d36bcab0751a940f283f55f08c5c SHA512 43bc64732c4ca2ff23bb09cd67f002b05a1b68963116fb42cf9bd60ac8dade8b2efa1cab798217a73b221ea86fb4e219e36912ffe338c7bd505f2a877be05c09
+DIST github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.mod 38 BLAKE2B 176ac3e371386c6a43148aabcf75084c43038decec0062e623c4a7baa194bf7c654f59cddf9f8b413209cbdc03372c790ea91d8f3f6e3d393ced5eff1e903100 SHA512 3057fdb8ea9b349e253361877f132c1808099cccff5eecfc8cb95274bfdf219a466c26ddaceded7867f0cf47f605728c417961d37a3f40695b720967c61973f8
+DIST github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.zip 5595 BLAKE2B 72d6d4e22f8aae9443e52fea0b8b01f704c7d58812c3a52ec4cccb2848f360f995e72b29fb393c333abe92e571e0b2e32a7e328e46e91d1a490b97d4d9ec93fc SHA512 258e6875c1a5c8b700cbb95bea37af6886766cc30b70aa5fd78cb18a92bbbf073ee918bac7699e0bb86c6cdbd4b25f5ba4aff8c95087ad845f8efc84f715c8d3
+DIST github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.mod 38 BLAKE2B 6bb3112d9b8ba6f9cf4d0c4ee376da93bf21b139563a211c51ee44a302caf9670181cd27f7e21c6fd05bf87c9273daa726c942749ffb18b623d17c7170aba6b1 SHA512 a3c38d1db1472c71e1c47b936d47ac2ecfb49519c2e78dd453d234f1a6153bf007eb96fabe0be7dcbd868160a3869e854ec6776356b9011fe7ef51a634b30aad
+DIST github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.zip 21259 BLAKE2B 6ebd8152517cfcd5e883bc56dbb3d347fce7ac09589e8ad5a96af8d39c5e18b284e616cb1a6f6641084a34c07e59d4ded65b600dcc9041c9af59d26afd368993 SHA512 5800ddecf3717ea31dd991068c785053b9c6cb5ffdbc97b681bcce4219634362acc7811eec766117f0087536abaf0eaa22b8d66a44103a1644e5907e3174dfae
+DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.mod 49 BLAKE2B 75301dd276a9f53c22d9d15f2ec4fa32cb90eeacabd9ddcc604d7f306d7e9481f9ed3f8f8bdfa5090951623f2ad2bdc671808dd8eae512bf911be30a6b93cc99 SHA512 7b9615ed8dbc53987e0370b5ff24bf62bfbf4cd3644859b735dd267826ce75177666106d8447a113dd508542086919336c82819385c92ee520082f6f6ada7ac9
+DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.zip 29035 BLAKE2B 44ceec916a8ed19a1e9bbc3b4b4f325e5b9fe1d55991553f30eac70b3ad3b93ae92b1f0487ed57354b40db1b5b1458885a127c5db92a27ee806b9f8f1498f3dc SHA512 3954271496e703d876e1bd9716ae1bdfcde08335cf20915aefa71c5ade8a836733f0635005d9eda8b01fb1991dbfd25d0df2aa71a1d52ae3677477eb34382aab
+DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.0.mod 49 BLAKE2B 75301dd276a9f53c22d9d15f2ec4fa32cb90eeacabd9ddcc604d7f306d7e9481f9ed3f8f8bdfa5090951623f2ad2bdc671808dd8eae512bf911be30a6b93cc99 SHA512 7b9615ed8dbc53987e0370b5ff24bf62bfbf4cd3644859b735dd267826ce75177666106d8447a113dd508542086919336c82819385c92ee520082f6f6ada7ac9
+DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.0.zip 29693 BLAKE2B b82bf12654737a5719056c9aa16c0a2fbb510fc0680844485c79b45c1d54c2254832f41517440f4ff37f3d7bf292f594dace50038e221ef790ded3ccd18bef24 SHA512 ac438522dffc4312f7b67ae0dabd8b640584f5c934682e316b212c106cd4046486bf9a29ea4a7f00afbae98288b95633acb2cacc5034da65372fc8fb9e15a505
+DIST github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.0.2.mod 405 BLAKE2B 9c6d467ebf1d4627bf376f7865a64ec587bbddc41b8032daf75b67cf799cbc1c6a30d7669fad3463cf58d0ff51d3aa077a81e85ab007809ee36a82fefb1374b7 SHA512 264a23b0fae206105a5cc428d7e3c11793c4cde9c5ba9f0db326d22a903d4652a7002ba353a574a5da50b289b2d07f9d3371d82d0aa5968cf4e9ca45cb921993
+DIST github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.0.2.zip 65647 BLAKE2B 76553a2c54a36401fa6ef3c374031bf593f209d692373f78ffef942a27dc5d7d453c3f06382acb8ac6c1c0eca87c8cddb0038080f07b5d61aa0050d462936e6e SHA512 5bab547c857895610fbbb16c589ce96f0025b19ec5da08d2249dae2815c536cd1f9def2fb2767fab49ffa6ecdd52ee1b769a69435a78e63ef03fcd046e18d1dc
+DIST github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.1.0.mod 405 BLAKE2B 1fc7d2cd7fcc518aea753db768465f5a16c8ba91fdfe7857bd4e8ebc9dae9dfce8565fa6e5c97f2d68f8446797480a4d7239f9f34996cd0427fa01e4b11e0778 SHA512 c7dec4a7d2b69239d4e583bec5839b7611bbe03d2274740bde007bdf72afefcb1e6e189242b30c48b58bec88eaba888f68abfbbd2a0ed851e38698a81f27f54d
+DIST github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.1.0.zip 67936 BLAKE2B 658935dd88446c8b33fb2bde13bc46975b49e98b50855149984485a4c1ac8b85211b43c428e7cc461dea615f784390f1439d338185833cce17b692e3e33b2b10 SHA512 04c1aa98bb863370b0075ed39dc999525ce7a6d8b1bc3bfa99e16ea02c6734889720cab7e7f820bee013bdcaaef57a3bc74d7cb02a1789e9892c5775d42bb01e
+DIST github.com%2F!masterminds%2Fsquirrel%2F@v%2Fv1.2.0.mod 312 BLAKE2B 386d733f3af5e520c16a63340477323f079302c743c19488bc09b7e63ed83b1d290db14eee791d9a06c7a2cd897ae67b79e6c681256adcbb4531789531936d07 SHA512 eaec26ac7cce88c407435c5715327d93a31746f93f57a6071178c8a45271e32b82bc8a1ec0f754a8d9318e7ff6d1de2ea28f04ef0b29158695893f89fd6a09a8
+DIST github.com%2F!masterminds%2Fsquirrel%2F@v%2Fv1.2.0.zip 43911 BLAKE2B f3ce7ee5e28e6f55e0b0a87019df0f10b7a440c4dd1a4e025c4eedc76c66f3cb490c1890952519dfee83f33901f352df96dee77f61796ada76aea78c7ecb1cd2 SHA512 96ec08b06cf74bc2ed135ff98eefeea449cd1be8fb5eb4baa59fb35dae5911e7bc496ca2be2fe97327f6725dfbe1a45af64fcbe63654ceffb93593821747ba2c
+DIST github.com%2F!masterminds%2Fvcs%2F@v%2Fv1.13.1.mod 34 BLAKE2B 3775b686ef0a7d190a38eb6cddc8a2c5d0dff7ffc656dc762ea8733def2abc81fdc3f990854a9e3e97cacdac3149be6a05f7b271cc7f8d63d11ac3512f2d64e8 SHA512 c5c6e7621f9018f117ead83e96a26b75c7f1c0bf2a71579bcdf494e1bc49553c4def4b4246f740970ed52851a66582695702c8fe2f619073e6422e593a350143
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.mod 177 BLAKE2B f2d2eb41aaa0f3f47a75ab260a461e6df690c34e7e817ec61afc7854ae26bec641cddf4f4481b5b3b27394e303d1fb1c4a9864f4de2d6c01f33e3fa0521b05bc SHA512 584c9a707b6115caac28ff373974faa59d12531962997f9640a4172b020f72c5d527355f035449a767d65ce426fc9705c143a7bd8afb5058c9ece241c9ad5d1f
+DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.mod 1988 BLAKE2B e89ecdb4644e50e2cd545eb43452729d909745705f5254a59547420baf3da357e77bf5d73b220da6899fe08a4eb034b0d1815702dceda20ada57e277b83b9954 SHA512 67df97dbec1c4a0c0f84551ea80df88a827c9ff4467614ef61544a611e19de6d063af40cf33673621f2e52e198595b61c8d6e5d732fe87f00eb7c5bd653e0399
+DIST github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod 38 BLAKE2B 3f0ac051b31c84f5e98663c1e6245a4e2bde2be5c0be61ec80764d753bef5479251bbad3cedf6fb998d1a4a4e66a80beeafa6f3291ed45f46d643f7be109004a SHA512 aa1f503fe0c19002da21ae30df5393c15f2b2243ff415493420204d11032a562d5d40047705b1644d031523881dbbf284d3c56ce8106a2a969d2610504426762
+DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
+DIST github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod 37 BLAKE2B 9aad8d876b88c7c8976667747135ea2496c21542d029e879d80490e9d979923ac3060f65ddc443044db8eff2f92e2eed6b18682822f6b5706c5605d8de92ecbb SHA512 8382734877c9dc6a9c8a59b12d9735b6f971ea72ddeeb9985ea0cd0573820991a4b936baa1a643d38b694f1df7395d7b0d119f4f52be8d947f00adba96773989
+DIST github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.0.mod 37 BLAKE2B 9aad8d876b88c7c8976667747135ea2496c21542d029e879d80490e9d979923ac3060f65ddc443044db8eff2f92e2eed6b18682822f6b5706c5605d8de92ecbb SHA512 8382734877c9dc6a9c8a59b12d9735b6f971ea72ddeeb9985ea0cd0573820991a4b936baa1a643d38b694f1df7395d7b0d119f4f52be8d947f00adba96773989
+DIST github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod 37 BLAKE2B 9aad8d876b88c7c8976667747135ea2496c21542d029e879d80490e9d979923ac3060f65ddc443044db8eff2f92e2eed6b18682822f6b5706c5605d8de92ecbb SHA512 8382734877c9dc6a9c8a59b12d9735b6f971ea72ddeeb9985ea0cd0573820991a4b936baa1a643d38b694f1df7395d7b0d119f4f52be8d947f00adba96773989
+DIST github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.zip 15402 BLAKE2B efbf0c8a3f7e771b5a90ff620bfd513d476e21a672e3f7446202861121dcea08fa95d33b0438b6f1882273630e3cfe756c5934a14a1ab6b2676b117273616097 SHA512 4c39d0907455b1c60e539e8497477e676bf7656c3b30996d55104d6129ebaa02079e5d7d27856352446ec2570c54f0d945be83e2a3445a025c85d12834120ea6
+DIST github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod 37 BLAKE2B 28c9393f5171487d23b732afcbb1d3d835d13d1a63b7e852fd3205925742fcf5a686c39b0600359e9052770360e9396f6bfe52a0000ecb51e3ed0a23611a2853 SHA512 a2b3211e3520fdef3d5c1991b5ad4b3745f4bb1b49be3afc5b1936c82b2a3058231b6cc17c63c85402cae0b80f037a70051d42738e89a708865e43dabf7b7b8a
+DIST github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod 37 BLAKE2B 28c9393f5171487d23b732afcbb1d3d835d13d1a63b7e852fd3205925742fcf5a686c39b0600359e9052770360e9396f6bfe52a0000ecb51e3ed0a23611a2853 SHA512 a2b3211e3520fdef3d5c1991b5ad4b3745f4bb1b49be3afc5b1936c82b2a3058231b6cc17c63c85402cae0b80f037a70051d42738e89a708865e43dabf7b7b8a
+DIST github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.zip 8169 BLAKE2B 61db06641c2c1db4102b72c097f63fae0bff296481556fa16e66ddd1808478aded29256befdc3d767b72f3abc91e376ae61656f8da2cfbfbb5ffbfe3fde20361 SHA512 9746be89f7fc5d50acd6376f77d43754e4a40d9da173a0b3226b78b1b1fab9afd859f15332ae5a429ce1e0e85227ceef05d94f2237c4969a8e6fc5e8454937e6
+DIST github.com%2F!shopify%2Flogrus-bugsnag%2F@v%2Fv0.0.0-20171204204709-577dee27f20d.mod 41 BLAKE2B 3f9f665454c79b0807b44cf10f69fb0e5c31364865412f19d8b146fc9a0b12d7e5a6282812c7ac70940470a3ed3f2cd9c2e6bca7eb51e43a4b14ad5e723d76f3 SHA512 f9f36e700dbfd7c997b79e527ec2a4d91e5ccf2f4bc7ad6a9298a9cbebe05263bcf8776bd2f3dd258f292790928a20cf45184e7af00140b2940af322897a59fc
+DIST github.com%2Fagnivade%2Flevenshtein%2F@v%2Fv1.0.1.mod 39 BLAKE2B fb2e961ec1914554769b3294f08059e7d8d934938062fed87c404166ce6128f35bd8ab14243fe5e5923e20bf17e0d97937c94f699bf6b5a7839d23bd1d3da7d5 SHA512 2687e2246613ee595f475b33c7bb216a7d8776e415196e4a271e4725a2331e661f2d3128d23f0102f5dbcf2b76f5780e02d673b6336db186932bcfcad35380cc
+DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
+DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
+DIST github.com%2Fandreyvit%2Fdiff%2F@v%2Fv0.0.0-20170406064948-c7f18ee00883.mod 33 BLAKE2B 5aced043cac582e67e8d3ddfef0a54dae0f7e4792dba23d7c6cb18fe687be98649a90e9aa46f591385003f945a2ffc192aca18bf1ef0516ac22fe1526d2e3b85 SHA512 8960a9c2dcaa7ab5225d3d10fbba4264032ff9bba80fd8efe2ecda6f9b925dab4db320a4650fba43c0d9c61d31005c6045eec4a650411bb549c60792f31c3b09
+DIST github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod 35 BLAKE2B e9ca430f98cfcfdc5bc1e50ef421253011f21fe2a9a06b15b4b818f336c64a544ede9a8d1552740e85358fcb16a588345124b06fb2788951c24c9dd92c3b1cda SHA512 a0c76da94f068f583607520b728036f45ea071b727d3aee601eee712bd952b5f6c8cd5df1e1484195b07bb4c3b224771dda1fc7848dcd086a6dc93ada3ff2ce8
+DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
+DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod 41 BLAKE2B 48814730032a11998c9da84351b2ed6e2a6aae70d2666dde457814f07c5348b067fe1832743d216272f2bc058d87eb4be2e926733e1934b163ffada3b6a4a13c SHA512 dcbb60f73a4fc4ef5c571978543be889675d86be078f19fc715baea2aed99de0243e8d8c3a968f047f648a883bed366a909a0c56f2ebc44780d5236868543618
+DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod 41 BLAKE2B 48814730032a11998c9da84351b2ed6e2a6aae70d2666dde457814f07c5348b067fe1832743d216272f2bc058d87eb4be2e926733e1934b163ffada3b6a4a13c SHA512 dcbb60f73a4fc4ef5c571978543be889675d86be078f19fc715baea2aed99de0243e8d8c3a968f047f648a883bed366a909a0c56f2ebc44780d5236868543618
+DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20200108200545-475eaeb16496.mod 50 BLAKE2B 365a971fcd7a5d7accf4e0d968df70dfc452ab1dcd8c39773177f1f0b5ad113ea377c4019cd86f5313e3f1168d63cc51e5cb8e2daa2ef4666d12dd30b89c691d SHA512 2ddaaa2f101d8f297f37bea4236aa9b86a0ce765abc576625460298db3231ad5207bc9313b6bf1eb85b96ffdbe4acca15feb945a4bf084e933901da52f3ed975
+DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20200108200545-475eaeb16496.zip 65802 BLAKE2B 91a1eda1fbdd1b5b03a295078577df1e1fa3c4741aa9253118d8513a5386eddd737e2b092558068a57d1ff9d54b8ba460b69a4e94ff68b3384022c57d096169a SHA512 61dcffbce5ea982bd78d70a6f51b325d708ca8f9cadbcad34df7afb3dd9b0c824dd6c3abf62f22e060207379b325e1a496b73d177a0aadda6dd939e1f7717ae6
+DIST github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.2.mod 35 BLAKE2B 15461787708b56993bf7904db63ae2a711c78fe67157ff2adec29bcdce2f6c29b7ef5d997ed7a0123ab24b0f3069d3833405849924037ca4da8c05032725706a SHA512 49d95d7db5b42c6948c50dcbee20a5ec6b554e78f8ee4beec2303b318d6289a32be807084806bd17ee8e680e58c2693f753614fdb6788f424c9d7496790b20ba
+DIST github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.2.zip 7610 BLAKE2B 98f86c3092146db7614ab394d67f720bc3a8852576c0ede1f7ff053df2222d8811274d0ba981efa7dc2c8fc3350c360f21ed45f429ecbcfd2a2da8663a209079 SHA512 5df11a2def2b93ec0465fffaeee22cf12802fd63574dccf977a6153aaddbe95c2a3ce20388fa3c3dba0b41d0cafbfa827ab9e6c311cfeb491e5b09aa907cb6cb
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.11.mod 145 BLAKE2B f28dde209c4d43940897c3dc758b088b19b38db865cba75b246477b497c1303301de7cfbfbea2a7eb1b124021967e4ead6dcfa8475ad240a7381bc7ec256b565 SHA512 00cbada20d24a2d08b1f06e0da060140820972c9718e707f0cce56ad62f1ab7344a969cefece18bee79f6b92dfc390e496d6a4af7c95eea0b66d27cc0f59f3f8
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.29.32.mod 293 BLAKE2B f9e61a09652a858841e6530749b9dfc87509f2360d87ba277003cf6eb48bb8a00e49d57dee39026bd68f9c38b48b23e415ab10a45220f529045462ef707ec8ee SHA512 498bef5869b7df953499ce3416d9336e36c7b992c46f1bd96331aa2a224be136e93385efcc827e579fc479e3ca38f7e54fb0eb1df3e90b9b16f43182dd4ac58d
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.29.32.zip 15811124 BLAKE2B 70cce32dcd9f5bda29cd77391dfb8a99b0f51938e29ea7b87e4d3c410291ef4355adfeac64a38e5d1d6d41bf7788658f63f04127561744b7236f4fbb17a961ca SHA512 2e06b8cd85fab05d3a86cb56c534847077c3e2b4308161bcd5c471eaf0c9941f908cd6a340d424f206f66755b4c798beb2bda927be1783f9ca38d0beaa3017d9
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20160804104726-4c0e84591b9a.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod 40 BLAKE2B ce42c81a7dcb03d21a99d6240ce12f8455297722513497b1a75f2c848b5fb7ef70b577c2406638442f16beedd68806de890a5c299cf1c008c439df23df2f5bb1 SHA512 ec4424da8e1e3849408da7bfe83d37e21ac75edb889de8ef63be897d59678679b018f4606be78500952e7eee73a6252ee6e477b1a1612e2d036dbf72c17b9c9b
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod 40 BLAKE2B 6cc86f2bceda8617678a251604b6c049cfdc80f9afcae0cead6b2cd04f90fe1b5d5d56d0c29f98fddd7f4ff6fb4a0f97c052193b153dbfc772cf6597d664c09d SHA512 d0c78b8f08d177e05148ce845f8d720fe79a193a420c12ce15504af8fa3dffc4d2fcebea8030f5cca90aff5775013e2252e0c289d4ed5094e07657ea97a79570
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip 14678 BLAKE2B 6647c66a45f2dc67b83a1e493bc73d4439de7962f7f1472dc267be9a9408b5ddda66b8ee2fdadf18b2973648035fb3907fe539a8b7ccb768b8c99c4cae573eab SHA512 f973efba5ce7c651d9c3e4e467a1423b00b102034a054874d09977957b7b55557e05da06fb4c158e693db7bac01bf601f950cae0d411dc92afd0686d7e1de4cf
+DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod 36 BLAKE2B ad3bb22bde28277f26a819b093ab7392da57c027bfb91bbbab4686d225ddc4e239c0905f6eec64cda2fd47746bd625682f663a11007bdbbf64f9cbff7dd1de76 SHA512 f961ced2c3e902be60fb862fff6b1c4457c57bd7586375a18857863be63d9b3ea998b05fc0c9c3a7270387e9907861d6f9d6ce4024643ec84ea6a63e59e915c1
+DIST github.com%2Fbitly%2Fgo-simplejson%2F@v%2Fv0.5.0.mod 38 BLAKE2B f6ad4f22436471512ed4037c3f4c8dec4e0f7cb9191ddda23a2f5a5135785a6c5af99dd9005218bf196e0f48db755d040c894f6c5f2c1c338580597eca5eecd8 SHA512 05b70033a965ce6a70ea5fe7c635768c2c665942e04b17e47fba03b70cd977a8cbc292faacc3e10bd785523a43c61d42811c20513669592f308830863cfab56d
+DIST github.com%2Fblang%2Fsemver%2F@v%2Fv3.1.0+incompatible.mod 31 BLAKE2B 15785a01a9f07d2cfe324a1ece5c8188395300b11821621fe13427b702cb9f452ebe125566c3c2648d2d83139add9ad6224d00536aaea7b16306eb62f67f8184 SHA512 5f7f52012aa82bdc43bd89d1491fbe00091299554bd85dbfc07f0cc757fcf44f4499df97a4f19c234ce70fbb7af0f4c54c13ffd547ef0a733365ea9c68dd0297
+DIST github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.0+incompatible.mod 31 BLAKE2B 15785a01a9f07d2cfe324a1ece5c8188395300b11821621fe13427b702cb9f452ebe125566c3c2648d2d83139add9ad6224d00536aaea7b16306eb62f67f8184 SHA512 5f7f52012aa82bdc43bd89d1491fbe00091299554bd85dbfc07f0cc757fcf44f4499df97a4f19c234ce70fbb7af0f4c54c13ffd547ef0a733365ea9c68dd0297
+DIST github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.mod 35 BLAKE2B 253b8f5c57339e04a68fcd945f25b655ae0d9b6a265fc3e02c9ab2a5cd0e41d68f5866e80aad321eda2e3fe0ae8b311ec0c4eb922d67e0c7f425ebff5d6dba69 SHA512 c19ab1ccc5297aae6bc7e3536b97091f3f877b1b76e5d93b89842e48ae3c9d4cf49a471ecf72ce6e2da001bd51ef3eb126a83bf5a35e50acc30a43db4d37c301
+DIST github.com%2Fbshuster-repo%2Flogrus-logstash-hook%2F@v%2Fv0.4.1.mod 53 BLAKE2B 099610d4ac9528646136a6214a5816a721da42afd273e8e2e7ce40bb4afde2ee7ee3de02e0c04a92808ebedba623d47715e61e8deac2bef77aa9eddce5bc1036 SHA512 fe08dc8aa742ec64dde4481a917d19c5a64d68ab7a373ad0e8a3064978f8c76c5429d9a18a4a52d0b49b035ca9a4b5f96a24fc86df475a1fd725f7cbc0da814b
+DIST github.com%2Fbugsnag%2Fbugsnag-go%2F@v%2Fv0.0.0-20141110184014-b1d153021fcd.mod 37 BLAKE2B 9dbf4e5a299c30b356177f7b76d96328e3f35affc49bbac79607fce63bcc72476a8220f773d3c5ae9a6aa0d5fa567b10e6392c68036aef5218253d409dfbc244 SHA512 ebe7fe07551e5a485d47502d69cf84978be13de26484f7541945be2113698bf11ee375a19718cc01af81074ada64803ce8ab78a5bc08fc389eae78fd9455572e
+DIST github.com%2Fbugsnag%2Fosext%2F@v%2Fv0.0.0-20130617224835-0dd3f918b21b.mod 32 BLAKE2B 879ed9071c4044f638be3ff367074c7b456ebdd04a6b298b81240662e105635e778f6668870ea711daa2be5bf45086511170df20a43f811d41cb5b1ea439169e SHA512 6eac336db439692e7c478978d290ef8ac9128a31d4535744b0b55331dce7cef6284058b5acb164a6b749a60449cdabeb131142dc5ee3d0222d443c4f292f9683
+DIST github.com%2Fbugsnag%2Fpanicwrap%2F@v%2Fv0.0.0-20151223152923-e2c28503fcd0.mod 36 BLAKE2B 8937677f3b8473d8d71c79e9d3e420bae0476de69d366765ba5f9a4c42d14a8cd18a49f4ad2911673c80276bdd47dbf019a62fc0aaadbffa72647cac046c362d SHA512 b23603768dd8994a9b735ae81f119d2ac2e33a1b54e6328044f92ebf03f905210e54692752076413dc45217b0a400870a5da8ebd75856bf6b74272d0a301484e
+DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
+DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae253ffa106eafea277fd947fc0f28e6962e461283ce2267d992b85b1f0eb9074a90009d8ed1d47f9e1f3e03cfc0eb7ad7df104282cfd144cc12a SHA512 32c34a590e6c113a16700ef2faa5124ebb6c8773cd76594312157bd2b70d54cd939ff2c32fac47421b5615e804142cb7b393394d4745d5894f9b68392bc37ad9
+DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip 12221 BLAKE2B ea2f826b4582ec60f51c65783408df0e065d2a752d1cba17aaf277e0c2b48779a3bf3579982dcc26e5566c899c3f933e4c711d2f1e01c98c13e73d46fa08baad SHA512 09432cff34f69e9b0cc6f0d5bb9af376efccb85ab4396c14a4e0c072272f3172a93c240c5ae0aa89eab91799d1bed1a0e7e00ba83682843f46344c9e2fc2d4b6
+DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod 45 BLAKE2B 350e937e3f7b254b5c590445a9a7f7cc908daa2a5f208e293ac414d50b46bd29671bb483e55daeedca41d70a42fdcc62ce17fffd9992a932e29153ab6ca1168e SHA512 c1b9f572957bc4ed1ad0c61d22b7b5d6a4c863df2aaeb4cf914e304af21d949c9cfc53dc8eb67aacdf3dd56f339ee6f4a1f5fa464121d9db79b7b3febfb3251b
+DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip 12031 BLAKE2B 47bd92ee66282b671cdfea60969710e371540e79b3c1e2f510380e3dbbfe40ff76be23ab48f44855b1cbbbed7cdbfc4f1ea21bc4bd7a37716de7c27a7ef81329 SHA512 dc5efd476875fe3cfb3c5f5ce9314920bb2175be85fd1a4667faddee1b5360113b66bdc2f17e4fe889a7d104d684558744bdc6c56c8ac3afc585d7aad0114486
+DIST github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.mod 38 BLAKE2B d8a847320562a5d1158e868d3ade028d83059898bad409051f8a342843ec21d8df4305b50b35b7ba7fddad63b53f38c5689f4f7053cfa510a2b222a043880748 SHA512 b3a401f05d85f8d687fa8387b475211ec627c7d2c80f5fe1b5a4d97a41df7707d0cc0dab634bcab246f43058f204f10b45ee4cea5f61d8e7cb88c4ba8f085dd4
+DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
+DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod 170 BLAKE2B 68adbd7d4176fc66228fa579cbbffb2239322158a9fe1226a106a2db6a7210cf9811ec30fbed4bd26e260906a214b9546d178cc1f6efef57866d378cda457166 SHA512 3877a1f5b47e6316c7a4d4e14959b355381eb3a32fb11270c646617b9908299d7dc806869d21b1fa6faca7a326f168dd1a268735cd1d532be2c318ddf9237014
+DIST github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod 41 BLAKE2B fce07437afe34fbb38dc2b3c8695440413610213aa82b910471dfdd37a5dfabd332513dff18fbef7b84469c0c137530e821e2a5adf0e660a96bb78446a084cc6 SHA512 180a8be6b0f3596aa376ec5f264ee545a082328067b3ffa5523634cc95b106328fbc6330fffcada0a1cf250c3a988971073441184b9194fe0d05fd62a33901fa
+DIST github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190919134610-bf292b21730f.mod 411 BLAKE2B aaed1a7526861470d053cfa204fe5af2ba4ebca024322c8007d3660acce6fdca03264a12ca0bedcb6fe1f0cc5c78de920f8e8e19a36b12e1604cc3274bb88733 SHA512 32f6adadbc5dc2c9a57c698ba76fa4fd83637e67f58da55c6a22d4faad9f705fef7a472c2b2b2b94b2bba2b839b85856254fac4681dc9770893afa940bc734a5
+DIST github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.mod 37 BLAKE2B 7037e2b6c6f7927a37d8298f91976232fac6e1723d9ffda59b2c01bf81c24acaf124fceeddd8791b6a6bb1e81b03e1bd5ba88ec9613784462a235bdfdea76498 SHA512 3d4ac776b750aac30718ecb1a3efdb383cf39d0838ca60db5ba266152baa1dcbee739a8f384965b5b8d39b9d9b18561ac317eb8c64c61076986db66bc10bc1dc
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.2.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.2.zip 1650463 BLAKE2B 8958a1e2bf03007734564896962be34189c6b56d1674a771819e6bee9ede0cb78601ca9f5888ec88b251b9d1bdab2e70190d0203b7694b4b30545003813b45c9 SHA512 5a355ead5a6996bd85e4c45d026371cce836a9379de65adf7f39596d9332c51f5cfdacfec66ed7e8efe7a49532b927a0ee53359f52178aa6df24787a0fc11068
+DIST github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.mod 40 BLAKE2B d99a912436af30ef3f5fd53f6348367016633170289e08c271f0148a47db1f9c5ac5da362fcc3f6fa5a7e7977377299adcffe63e9c3315c45ec173d55248006c SHA512 442fc394b0be5c87d2b9edc858f47d52b1027acf1fade259879bac7c598e51692199cba7d4e175f21f772193f1570e47e82d6c6c6fa160e253eb49b09cbca793
+DIST github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200107194136-26c1120b8d41.mod 1000 BLAKE2B 595d0a4ca474b1143bfaff75d8bb1089953f1b68da5b593966f85461b5a20ea0a8ebefe6340ae8747b12e9fda5a13dff135e751262f4efbf7142993938a103a8 SHA512 b6ec25dca49d545033cf2e97f7907e4709103e1bd76b341a27511c25df44788246d9788281d2f2636bfc7b4f39ac7fb25fc1de293917bd68ebaec92babea8557
+DIST github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190226154929-a9fb20d87448.mod 34 BLAKE2B 24e82d551cc42b7a7c8c830ff4941074686a06dfc753202e49bdf1c7d5f7b960d0ddcf73f618585b6dc925cde9cbf123196fc4b45cba6bff79a16500f49c178e SHA512 9ae770f38dd2c9560c8c3e858890a835ed848d5434a289d889c312d681af748b11471efa47739b08ccc12beb6e9050d2f1104ac6299a50a83344f496af516761
+DIST github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod 37 BLAKE2B b3d06413bdfc072eba71c8b51cb7aaf27ca29ba736959bd0fc9ef2de8fe3dbf3f194cdff7d030aa259c8e78fcc9003dee040be0d1b858a677d9e306c89a3542b SHA512 62de290e5234d6bd82d9a865d1ff592736f075130d1c29e9d9f2544ca3f9514c4a81ce1a726cf8fc8be8404e8ca41a88958dac755174ef2c20ec9b455d0cbc50
+DIST github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod 35 BLAKE2B e2c6e0700e40d563dc690884628fa22b6dd56872a63ada54374c07cd6328aa332b6df2396300090da5c9f7ac730b6b9bd60dbc776557c4614d5ab3ce003579f2 SHA512 93f981daaa62351a480595cfb2feffad6c34770cf89f35399d777096fc524cafa50d0dd3f56231ae41b15e56061ab83f0f6829190730dbfc7f9fcd594af7b054
+DIST github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod 37 BLAKE2B 109f32f2dc537cfeff1699937e93eed980f34a37faa111ad3831be6dbbb1df965c56ef266deba48aa1390fd94bdedfda9ba3a51f4f6d9519ae24db6b99dfe1d4 SHA512 6485196f4703578401e82673647b49d58fe60d7f90c311294096504d3e11477c75fa50684f00c7b378b2566e6e8683cf18d99f2ac78043b077318a643fb11720
+DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod 31 BLAKE2B 7bbb809c199d39bac173751c3dc21b23ee8b020f20b4447c33681469b5083c64e74f699fa8d3dd55446b76ed44fc0949337303a776efeed90a764af1d751c8a4 SHA512 12f6b0e7090b257656ee9068083207fdd1b6d9f0b27546cb5b3a5a520e5944f3eccb8f6dd644a17e1089bbf787fd26b3e83eb0f0353071c8c4ef23ca99bc6251
+DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
+DIST github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod 33 BLAKE2B 1ce5b6fdaf9b07e47e53896873b9ee4e96fa51c66a7a5afb3f48f34bf1b28addc5a5faa14832c24232a048b5d2b5ec0fd9af57997f0360105479550670b7272e SHA512 4fddb273aae34ba148c277266e98d174e04f5e888a1f59d44a86f7ec80168fbee85f245cea2e2fca44b29cf83f7a417e43b885438d7e3231c89604bb9f0a30c6
+DIST github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 8c1815001cb2ba1108f60c9959fc87e81146ab7a716f48de7c679e793ccdec03d7324413333cf9dc6adae620298b5c637e0a126eeb6361c82ad16138749ea759 SHA512 5617723462dc0028176687327ac1144b1046a84c9bcf518e2c553a94c9549594c28345a5b875cfbefec148d625ff3525bfec17a97e4a84831dac4fd65d61f886
+DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
+DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
+DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
+DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
+DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
+DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
+DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod 94 BLAKE2B 94e391c9c787f7b0b9d238f1fc61ac5e90d4d6658f7d60a4c143bbeae999ea0ca23d28f2ca204523e44b61807afa23e8690af850d14203e5755717b0a1f5981d SHA512 b54a3715ce2745ef68bf269b09d458d3712d8ec7a876eff53f5c171d23d992a5391552651c56f7adf5b90a356bcefab552a7ef8dd3a0d562fd396434970963ab
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
+DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod 29 BLAKE2B 6d29d882c7c8c863cc1cfa01de2e2347b09e8cf4470c0bae2737f7436ce6d6ab34eb6714eba9f869974c1c8d7a332bfb90ac842b9fb7a07bd1a4c8b0e460eefe SHA512 a41a722efe7f634eebd689a9793f9ee3a89924e6c7917008c6661761c8829d6a897dc71c496f761068c36c590a800f06bbefa4ac59f7761cc0ee2cc68ac5c14c
+DIST github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.mod 45 BLAKE2B fd78b551df24aaa503a1e3a673291776e988c7975ac3bad69beadbec7ac5c85675da6e6da9deb4463535e1b0ef0a3e640df6e7ce771de71f033f0e7a3f67a1c1 SHA512 9d9af0844e5c76f84c3804b788cd643e461b02b8a00fa5a41a6238dd72dbada1bb03aa3e7e420f0c68d9926b9cbd2d159456f26ceb64f1c51162da939742d0fd
+DIST github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.zip 8869 BLAKE2B 9c466fbe14685f949b792015995e38f276bc66f3f6ce8df45cdce9b1fc362733b3f0b08de7ed393c4fd89f24a48e4bfe90dcc8302af8e636707b07da769b4e8d SHA512 e8c8cbc63aa82d0544634f3aae9a4c94816aa5797bbc1946aff148b19651bea6c3c544add0ddc644d20eec3df99a4056bf11f7f9dd83943c53e7c443cc393eba
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
+DIST github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.mod 43 BLAKE2B c7642acf73b5b5f2464b0171c49e0f272811a7d08af54cbd773da1c273552537c51afa84935f5bc682ced8c01668606d822506f98bd872f61bc032be8fe8520d SHA512 0853d89627b3b96d9dfb2401800def229674b13e43653636574b55b9d754669e6edb52273cd8ea844a8f4564b9de1114a66e944b98e2e0bd572db9cc689d582f
+DIST github.com%2Fdeislabs%2Foras%2F@v%2Fv0.8.1.mod 1583 BLAKE2B 58c50cd36a8effb147acd6a352ab85037c0ab46683830878eef71afc5bf489f9d14866248d80092990a29bf09bfa24699316041f3626c82e1c6e69a966d9fa75 SHA512 f311aa5d1df50fd7a647ec707912f6f6fd49b8cdde98065ab5763752de8df34c200bad707fe27cac9243e962d5dbff300e21d56f0dbccf1ab3a318417c3a81ff
+DIST github.com%2Fdeislabs%2Foras%2F@v%2Fv0.8.1.zip 113348 BLAKE2B 52f35c417afd6f1540a47ca254252495f570719a29648e50e1fe400b9518c33988443494bf87c9346155ad2ff65cec7c1ffd5e3add8b162b77a0c6e6a607448c SHA512 b0cd9b329bacdc462db645f46dc2d5945fffc01c80d6017c8056d24222892b792809d7995f732daa1157375024692ef9b3c762d294d0c00d0488dd38a444d9f5
+DIST github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20191001013358-cfbb681360f0.mod 182 BLAKE2B 27d2e8f155923769d6df395281d9d2967f2bee262faff767c586e851c1595d8c74db1f890809bce63cd9544c4dfcdbda89e518a25e1a8925ff78607940e2a374 SHA512 14925087284b332c5458fa81d0e92f2a33b4a59e98b93dc6c99e0943f03c13165e8dbe1a27fe5a4d78b62b3b3bdc84d634bc31f346a70301cdf7da7463c85f92
+DIST github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20190125010748-a747050bb1ba.mod 38 BLAKE2B ca172597deee09bc6129ff6d8a27b70cd49f5891f9db37e73f1178996255cd0548405d7fdfcffed3745777a332d3e979195e4da827f45e00305725f119332cc1 SHA512 086ced52944283fce02fb1b53de3748e32fed8a90dbab1d69e9ade5ff40c47e3fa1277cb3ce7bcdce2dc36d903eb52d3d3e723801fa8f6265736badba1ae935a
+DIST github.com%2Fderailed%2Fpopeye%2F@v%2Fv0.8.1.mod 725 BLAKE2B 0721d8d57ae3d84606c9c8024ffcd7675c93a03bb113a9ba4170c6090b83cd987f8165af463c660b7bb2d0dc5501e9aeb8d44591346652da45e9b44459a6970d SHA512 f6f8b34595f3565d0defe87787b23526eb9c56f7922967ffcee82bad911d4e9098bf888b9239d23086189ef5b31118e15162c3b868fefc65fd19fcb5f7a61827
+DIST github.com%2Fderailed%2Fpopeye%2F@v%2Fv0.8.1.zip 4475375 BLAKE2B 13a52dca99e9054daf68639fd464a940a4374514e65e05f4a98743ba7e26ec63839f5ed5c2419b3f55ff95650e718b41611502bbe136141e61c2d539df8c05e8 SHA512 610ab374405fcff2e7fd95a56ce7758190a8772393f088856ef7ed11a76595047a6fd2fcac3395eb900d5b04574a912e7509fb0bab780bec3b8f892e09457b46
+DIST github.com%2Fderailed%2Fpopeye%2F@v%2Fv0.8.2.mod 725 BLAKE2B dddaa547394fba0bba7cf6f3c6ae713537b00b7787b078d6fb55dec53c58a90a9c2945a6cd6cd3749c1502349259c83065f1e01c2a796be27322ff4f3269b785 SHA512 d40bd12a5a34513b619423efab129f593c9f8fdaf14295596372c723d5637460d685323673da1f10bac9b14de59a16aaef2a2046915d6f700e7b87732c80d733
+DIST github.com%2Fderailed%2Fpopeye%2F@v%2Fv0.8.2.zip 4477482 BLAKE2B 3452cddfa2ea464e093ec57ec84d12f911112127c04bd271c9540dbe82a0f3e6fb939f331aa6139d71d57aca6d87f37514633712557421601c0d6f2dcf543bd2 SHA512 beb0726434e990fb74b446a3e740ca0f16a3191ad05f3c0d3cdafcc3f69b9827dbe3b4cc0d0c2e4a66a15b22161dff1bc8558d46b7b4c5eb4ca8cc577b97c97e
+DIST github.com%2Fderailed%2Fpopeye%2F@v%2Fv0.8.3.mod 725 BLAKE2B dddaa547394fba0bba7cf6f3c6ae713537b00b7787b078d6fb55dec53c58a90a9c2945a6cd6cd3749c1502349259c83065f1e01c2a796be27322ff4f3269b785 SHA512 d40bd12a5a34513b619423efab129f593c9f8fdaf14295596372c723d5637460d685323673da1f10bac9b14de59a16aaef2a2046915d6f700e7b87732c80d733
+DIST github.com%2Fderailed%2Fpopeye%2F@v%2Fv0.8.3.zip 4478248 BLAKE2B 9a64789b53fbb6ff80a8ef6aa81e96f22ba3b610a9ef6707457cbd2a2102e5555c43389451cb4936562dd3637337f68bffb1d2d479a2f72a43c908f76e7a53e8 SHA512 da92a431b50e59ed5df4e6fd18476ca9f97702f18d73f1e93f6020786c0a4b0f078a803472ee37e12f4e3692979352368119f3c53ad1d25b37dd459560558f6e
+DIST github.com%2Fderailed%2Fpopeye%2F@v%2Fv0.8.4.mod 725 BLAKE2B 947b367f0783a5fd824474df83e235749c7c2cd1a3b24ac337b2fc4718f819d41f389db7a00d248c0dee2da19cfc6ef3c7223d94fe46a642db0f7910f7c88503 SHA512 a354139499286819e52ffda134d6cd21ceeca7841e02dca248e58f914033ef826aeec4985dbd8d7c3b879dc80f206e82a79c0d81d5d2db5da6ddcb619a63399b
+DIST github.com%2Fderailed%2Fpopeye%2F@v%2Fv0.8.4.zip 4479757 BLAKE2B a08236dfadcac32cabe45f2b2e206ab268e2ce0ab12118fbf2b43c8ffb7a35d874d76b4e7892d5d7595ea36040787aea763354919c4ce59bcce741a43263dcfa SHA512 0c91cfe16b6f14f10cd0b91307897f0124f85cb8b0e75e14ddd9dc6de00fd2ed52e73564c0d7361a2b818af05d8d40fff6be47ab1f53a6bb3ca6276a0ce557f6
+DIST github.com%2Fderailed%2Ftview%2F@v%2Fv0.3.10.mod 383 BLAKE2B 0975855b1416708452ca216ddd1fc3b8f6ce8ea664d19dceb53ad4ece0bf57206374e753755eecc88837e1caa7679001124074a7c23dcd1ed5ea3e1c4956b9d4 SHA512 c3d74d0613e418d91d582337f4a51bcf08501c6185065fd0b30d787e2a772aa3b0f4768aad0007d78c8d0177e9c3f17e9d64482e542f8b3479311c3ed9c9ffdc
+DIST github.com%2Fderailed%2Ftview%2F@v%2Fv0.3.10.zip 2948704 BLAKE2B bdaaf1c57f838467f51b40eb6082e8b4e33dbc8b0a25877684eb6c0d6e0e8fae4e215ed4ba2519092992967fb3a622c02c186bc5e94e75ea50d914f8134d2b7a SHA512 ae1b8844ef70bc156bbc905207a809b31c7798174832757f3096a5cff8f0e296c029593685cda515fa1ed2938685b1c02eb773561b2e4dcdfd62a95132b091b4
+DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv0.0.0-20170104182250-a601269ab70c.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
+DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
+DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip 57069 BLAKE2B 2c921bf5a88bf293a4c86bbaed6d7c391a323cf3ac39a54ac10fb74da5498e0f565db5e5220a9871ad5c4dedad7eacc0657ad9f8907c2bfccf147384b53b37b9 SHA512 c937c8b98196eb8496735410324a6a845e618d47e4631c500c9def70d8effb27cfb4efb17f81a8d304ce1a9d27fa6fbcfdec11ea10355de3d1918f1ddeef81d2
+DIST github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod 35 BLAKE2B 8f9b63ec3e5f70db4f7f0185a03aee0608efdaf267377c48bc0e1aa6c37d431119d6e422c8e7c9bd93f0819796ca0aac423804ff0acdd49458265dc37e9d439e SHA512 2b6a3774801edff4f0b3fd40ae8e5396782e796e36b02b4d2f34e5dcce19d2f064a7a8d0787a9cb994b9208acf39b466f291525cf6f459ecd7c45d947dfba50e
+DIST github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod 32 BLAKE2B c96afb14f9809bf9dae22bd2260c31921b0435d4459b4386ee016514b84580aaec258fb1f8347fa6447524376de742135ff87b170f40cbaadaa41c41b553ae25 SHA512 320a96424fcf2296f59f8ba247cc9dfa43c35e2e500fc1dd990a69316d4ccb68437e4c4f98e849173161490cad216c15eee039134b3028afa7dcf82d9b8e6423
+DIST github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20200130152716-5d0cf8839492.mod 29 BLAKE2B e7c2f5d22f88da5836f4de5c23e6e1a0e1eeb43e7d6b49b79e25a2b5d04b892ad9dfe7bb174c93cb60faf8e78683af6b296606371ceaf7eafba76a85a6b1c73d SHA512 7681fbfbd36f2ab19e01f6e38f899cf538fa34e4abb34bd38660459d9060367f49680c85f75da08f8d3e7981e9ebf1f911db26e31e1ab44f451640e435cfd877
+DIST github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20200130152716-5d0cf8839492.zip 2079737 BLAKE2B dfd1611d63b7e0d0f62feaa4dbd166433d7ac15929ca39fcb724ba26fb7029e14053aac429c1936b5f93a843cb23fd03bb3b901f437fee7bdff513aacd3c3828 SHA512 7eb33ab0ab528cf8843ef78c893c79f1f5c6017dca6a2bf4bb77951b8ce056f3f0b48cf0da129bf6ece41930ba4be1fef935f52e390e62c6f528ac1a18528d4e
+DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv0.0.0-20191216044856-a8371794149d.mod 3136 BLAKE2B 7f2d74332ccfa9e92678b72ecbd9fa615c78924d6e8a7be0690cb11661d2a86ce19e97ca5839e848439bc91709c2b50d8d2f34cc91e50288cb3fee1b3a10a926 SHA512 5facb46a2728b34cbc10c9b1ea5f46da1b528e21214dfb4b12ce01de682d7340ceac6dc31cb6d840c6f596cbd1e2efff4003030864453d70280bba40cd256d9a
+DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod 38 BLAKE2B cd95ca3c9baa32743ad6a0c2359dfb95eaa79009366a4019e5e1a4d3ded54090b005d307ef18942fe4de4027e7fe688e7ad046f226c77a3495e2ec579223a9ee SHA512 662e7810daa3242958f5ac7c71bccd25fc39ce814db684641cf69e96a5573dff638faff15aad77b7abddce767f4ddbfbd8a1bbb85a2aee5a0e80c96baa3f39a3
+DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip 662227 BLAKE2B e9c50aec1dd4d34aab11819bd341b1f0f6fdc32bac63124930d45f76f0259aa5e1e4781bb408411e643574112ecbe57c3b9c4c5fe59399c153d48dc5eb5bea41 SHA512 aff78c88f3bdb596f1855ab993d8ec3315de9d4809757e2cba6fe22ad4d5dc220242f90e73d9d0a33f9a13521705b82c8526082e26c752fb027dee4b28299d52
+DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv0.7.3-0.20190327010347-be7ac8be2ae0.mod 32 BLAKE2B 60d7bedad25f2503b81b09e753b7f5aac1ce61c5b128e08dbb42f73cb5f3748d376aafcd475cda1f50f97a88790992ec920d2309e8b3faf914640ebdf4b21404 SHA512 ac7ef0a0baf8fd96efb31c685f838842cecc51e9332cafefab138f16438fe00962e91b31e53d93214ff9d18558634d4b9bed4a0a9567e06646da2d2bd3e9c439
+DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20200203170920-46ec8731fbce.mod 32 BLAKE2B 60d7bedad25f2503b81b09e753b7f5aac1ce61c5b128e08dbb42f73cb5f3748d376aafcd475cda1f50f97a88790992ec920d2309e8b3faf914640ebdf4b21404 SHA512 ac7ef0a0baf8fd96efb31c685f838842cecc51e9332cafefab138f16438fe00962e91b31e53d93214ff9d18558634d4b9bed4a0a9567e06646da2d2bd3e9c439
+DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20200203170920-46ec8731fbce.zip 3687019 BLAKE2B 057dc9f1d6382047a4aabbb7f889767333ab7c2bb61cb54ba911f78ff173b6e763ba7e4f45a62a9eade4f17c84e6110d9cd09c47523d5cc7dd4c099ad79ca1c1 SHA512 4f904e414dd7518fd9d4c656d22a4dfd54e06359c66c081a7fa9ff56ab2776d5aa0701db3e523755bf2b972dd0c13b71baa5198f2e75eb90f9eef27048d18aa9
+DIST github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.3.mod 51 BLAKE2B 324ddf12d16d5c0261f3700594d6a352ad79601237806dfa84179ff6524b7f8f2f7eb13326ab6ad1f7c22f4a358372de89f4f257d5ff6a702e865bbb56c45274 SHA512 a2ad0b6ddee7601a260905c3d146540292ff3bd69b62166b6b4ae1d25f4f0c8872fe144ad4f3024d0d9723f0f1c8c9ae7bf4e2c6ea5f30a14161bee94c3c06b1
+DIST github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.3.zip 41818 BLAKE2B 6ca108ca56e91e78fdce88d8b76b1bdc512b90094420a835ffe12da142cf77e44b34abe20276262f65574697f2b1ffe49f3a1d1885fb68d5c76804a7c0669967 SHA512 c622c80c2431280c295ba6fb7f1cb0306a0156d4c2a118d5e22294a92b5bf30cf0230540a979e94abf6dbacfae2fb9298384555415d1efb0a2c1a02863965efc
+DIST github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod 40 BLAKE2B 13f8b46e2e71edb04180a1734d63e1e84dc75661ca635d150fd2bb8b1213df768520fc1c5cffa7a9cb224cb11788efc5242dd85138915fc21dfc9ff95b1d2737 SHA512 721f6b5cc358f8ee7093f7c80e4153ebc474f2052bdb3a91bf2a4ae9d2dbd2e2e50635a5bb8f9b62bd8ee7a0b7420ca9f18c60abcfd5287a953ea63d21aec53d
+DIST github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip 43214 BLAKE2B f64253be261a17ca9e2c6540d70b159c89b5f578921a7f6287e39be2a99fdec8b67191ff06315e5539585ffe812235ddd90c4a9754d8d63e512fec1991297709 SHA512 a61373f6a66f0ffecd3ffa78a99e6d9560419ab325f12101ae90f2623fdcb2e10adcf274459191263e1a80dd866fb98388434f9875c52e42dfd646d3d25264d3
+DIST github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.0-20180209012529-399ea8c73916.mod 36 BLAKE2B f42e08ea331c88b2b916ba61587904489222acd832f03a2c7d887d555555a634bfaeaf752d030c7476bfcb1c2d3ee627035d30ea79391656489046a09b61b1b7 SHA512 8a8ece742e952ae7af8fda10838b5c394ba66b2b3fb26b59d8751beeaaffe799210812857cd37eaa311f50f937aa5d271e9e75e54e81fe4a8cc688c1f2a33977
+DIST github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.0-20180209012529-399ea8c73916.zip 21328 BLAKE2B 67a791718cce6f164f869dd248ffcd91fa5e272eb587f5540d1826682649a56b9860675a7904543f4cacd5081ccb177a4b4d56aef455b1d701bc9fa28a61c7dd SHA512 94af6e21995f7371a106873fe8ce811f2d786471c1ae870a0adcfe1457c7f09f0813fada72b1ce6fb6d523a1593a3ab5c3210d6abe7b08010288920538472293
+DIST github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.mod 34 BLAKE2B 37c07a43d4e36f25bb5bbc10a863a717fa114a5eb980f17942f5bc5b1d1a4f58de5301ce871ec5d41f5dae3f05edd7c03a5c9246317ebf089c1cff27d6634aa1 SHA512 53dd482245593fe74b94c319cf4f3079b47313a22aaa69ba023b9e60e8b5dc81177ecfac49e0cbd9b1eb6706f654f387301ceb00313f8cbe530b4dc24eaefe97
+DIST github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod 34 BLAKE2B 37c07a43d4e36f25bb5bbc10a863a717fa114a5eb980f17942f5bc5b1d1a4f58de5301ce871ec5d41f5dae3f05edd7c03a5c9246317ebf089c1cff27d6634aa1 SHA512 53dd482245593fe74b94c319cf4f3079b47313a22aaa69ba023b9e60e8b5dc81177ecfac49e0cbd9b1eb6706f654f387301ceb00313f8cbe530b4dc24eaefe97
+DIST github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip 14089 BLAKE2B a825c998f5a7e6432a9d23f49fdf9d8559b8664ce6508468540530efe9585a98400bd38681a24b5a8b2d10b13c4ad91216f6c71153e8c597e3d2e8c8472622e9 SHA512 294682c312e079f96ac920c3f4e3dde7211e36622a378f54f32483e032f4df6f54a1f7314df7c73e2b7391bc559003ffe2bdb97380e4507aba7620ea4123d872
+DIST github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20150114040149-fa567046d9b1.mod 34 BLAKE2B a4bf0454b86b8bee83b8b7c1af18459c17c527c3c30546cab6d4f3e950cfb7336d70d7154c2b799307acd9df81bdd341722555ee7f91a53a8604046039f3f337 SHA512 d5fb8a4b7587a35d372e8f0710899a7df4791ac0f0a7fb96b8fe2330a6d676ecba8903aa9c86d810b0575e61b98543bcf1ebc24e5961f1947e934d6acb121736
+DIST github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod 36 BLAKE2B d46b14a3eed14f8d5886e333deada157d9484ad3bab124d3d57d9fd6a39242c2272417df8bb31e08361f2be8b11dda9e96600aa800879f393c8753330eac4e68 SHA512 7ffd6ce59d5c5fffc6ee8e8f48e1e7114628ee2631abbb1a3591b794c23b2ce6dab10f67b8b76bf82c73e1cd8614313b2bb1152b829a8875425f1a603ee394d4
+DIST github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.zip 44017 BLAKE2B 598c6308995ba7e6874f08c56f5453d4f3b68146ee29fcf7677571cc07d39a8bd4b78fe2d7d706e57571f00807476be399b08104a0a8bc3b75cc8da6528747f0 SHA512 bad8443888a33c8ba1a18cf07b09d7401067b6924a2a076a00efcdf959a5d720c2040d011d0ba6d6f0b0844b9605928d9798e57a0ac39bf08c0856cccac317cc
+DIST github.com%2Fdrone%2Fenvsubst%2F@v%2Fv1.0.2.mod 74 BLAKE2B b2f31bce7d2026caab615f6849b67d85e28462db105ca139787b4a38e27520a101a62fb67bffb3195bed2f89efcfb39f66cab3c44f4a48ff7777a5b916840f2e SHA512 640a45926c2db08207cd4ff4815d0a9e706e9d4b011e4d913c9788077abaccfbdfe814c4b1e8fe8eb688c8a47e2447d40f2b7fe247b7a6d026550f4098d2cbd9
+DIST github.com%2Fdrone%2Fenvsubst%2F@v%2Fv1.0.2.zip 14534 BLAKE2B b3c328264aebe181dd9c3e6f2331bfaf1aadab7e1dee4c5f8436019e5c4e4b725ac488c00dca024953a3ae62fa20f9421c074c6ff8e96f09b5bc16576f3d8034 SHA512 35c11ffc70d814764aca0ba1b3ab5d20a3243fd40aee87f77e3e414ac205b65087ae354f1eb6cb52cc42fb83353b21f1b8069999eb207fccfb8de0a8d242b7f2
+DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
+DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
+DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod 34 BLAKE2B f28e4e0816416341c47f1050c45c142e5f54ea8461f335b1303def3516a3642a4cf29341cb16aa3fe7a8f78439732058a3712b3831dc35b2db3bbfdc8289ba2d SHA512 df974cf26d8392df0aa30b39a28ad4b6fa2c128cc6e4be98e91aad8f997e76f98d16a5c19cb3aaa510f659ed8c02b05e7d93888648f30c701fa02e63707075be
+DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod 34 BLAKE2B f28e4e0816416341c47f1050c45c142e5f54ea8461f335b1303def3516a3642a4cf29341cb16aa3fe7a8f78439732058a3712b3831dc35b2db3bbfdc8289ba2d SHA512 df974cf26d8392df0aa30b39a28ad4b6fa2c128cc6e4be98e91aad8f997e76f98d16a5c19cb3aaa510f659ed8c02b05e7d93888648f30c701fa02e63707075be
+DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.zip 127557 BLAKE2B 1747b001bc860fda3bef9158f85863e56c8751834dda8160e80075efd64079059cd088e6e31c3e951db81823cbd33f4787e55b5afca96795707d20b00d09d2da SHA512 d64c47cb432cdddd39ecbd6f53a431ab34eb1f17e95264302b8708832166f847d81dc650e9a61475389b33e0b5b08f8f7402258d1ae927f4fdbc2cd098326e31
+DIST github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod 38 BLAKE2B 10c510e0332f88b1c489b5787540e7db93d5babe8fddd2d1603991bd08408a590d133646697604ee008f8a16f1cc384d8223d07e74d5da7e2242434accd1bb9f SHA512 d4d6319d58284419a3bfbe6eef0623570cacf0cd75a192cf5ce49846d75f02dee4188a68b9c62a6c38864503a7884e08d03a44a35296d1a077ea46ad5d68c820
+DIST github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.mod 38 BLAKE2B 10c510e0332f88b1c489b5787540e7db93d5babe8fddd2d1603991bd08408a590d133646697604ee008f8a16f1cc384d8223d07e74d5da7e2242434accd1bb9f SHA512 d4d6319d58284419a3bfbe6eef0623570cacf0cd75a192cf5ce49846d75f02dee4188a68b9c62a6c38864503a7884e08d03a44a35296d1a077ea46ad5d68c820
+DIST github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.zip 111939 BLAKE2B a433cec67d0b6c92b0f65df570585252d52b9f2c324ac0bd50eb0d5c66d07d2c882b05e964bc55a37f7da33d3caa4314c412278b0070f827ef1fcec26f91ab64 SHA512 76a4e22da8f3a310cbb6d1460ab5c7a8cc4ff869c43eed060f062577e0632a11e722b7c8bfcb2ab22b2164d488e9725c4628fefaa97a840fa894260e8901c240
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod 471 BLAKE2B bc51330df71ca612b3a573a93a8ebe57ef4e677157835221dfc5f7bcbada1fd90f7a6a3a002cbde08c6a95642477789d532ddc80e7ecae1f9e6e7c081364e970 SHA512 323c4b1c27bdc5bfb1795f1353d21ad6b7a2056bb0b364adab5960aabb7bea20ab3287ba60685df130abddbd66c3d82dc98a291aff1849dbce8c182c63c7b0bf
+DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa
+DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod 37 BLAKE2B cc30b89e62bb3a524aa3d6c55c472d2b157d3cd3b06d63b8f68c5ec035b6281dfef631064cd836f696317bd0ab517eeff464fedcf629491ed87b748281f9508b SHA512 f3ebd49ed1f05193a2999ce7178a9bbee1d1feae8b13c612a8a57d5c836eed66307271d9dd21de79800bbe9773364e826502287c366c4d3e2ef16d4a346378a0
+DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.5.0+incompatible.mod 37 BLAKE2B cc30b89e62bb3a524aa3d6c55c472d2b157d3cd3b06d63b8f68c5ec035b6281dfef631064cd836f696317bd0ab517eeff464fedcf629491ed87b748281f9508b SHA512 f3ebd49ed1f05193a2999ce7178a9bbee1d1feae8b13c612a8a57d5c836eed66307271d9dd21de79800bbe9773364e826502287c366c4d3e2ef16d4a346378a0
+DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.5.0+incompatible.zip 18363 BLAKE2B 489ff272e19922758a7fb1b4718b0f409514f24999ff4e49b75c301c532ee8f0cb3892cacb98dcca51f58ed27761d270a433eeffa0a6be5ef9ce6540aacb5c03 SHA512 1ef2ae9897702e9eb32b2ccbf6717ebd92f647ba6874de1e4f1fd8ab668ee14e098b592d6f8b9320e5358f090bcc7e39e6c708c572771f05245b9d4a679b98b1
+DIST github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.mod 39 BLAKE2B 7045e72ec933bc321a8d41526812f0f7daa1961fddb7c5a569a4b104f8bbc853b171ccc52aed36807c71f188130a5810a49458a3807d2c38949f625017421520 SHA512 2b1644078068dbd74ed69be1be7ff08e3acac8fd53ab723ef2f9f2243b70fe60c9dd427cefaaa5364a93fc8890f8c906fa8d818847ef0b9b4edd9892f2d2b2ae
+DIST github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.zip 12204 BLAKE2B bf6a8261a8c28188279787a64c7f623c261944077babc98680b4575659d8fa2f53a7e8d7ca1f1b606d3fb778060e37e91dafb74796c9135c637361f0759c34ac SHA512 90e22e25cc68002193dad1f28fff7c271928f0de2fd86fff149a6f2e9e6833dacabad7f2ad991bc4bf520a5f5bcebf24150fec3f3bb92439cc3bace60c304830
+DIST github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.mod 34 BLAKE2B 85d050ce327c96665aac0e7954761b42f6d30256c4620a15a171ae3a92abf4ed45d026973d9d74fc07b90617885d2c002e45cac9a38f03f12018d86c091981fd SHA512 547267e05f39979e80906176e520bc4e74e48f9f96ffcd9d862f974972eb8238b28ed0a0ac891e3e0ebd6d635de98192a38534155fed9eaf44ba0b94c5ff1d9d
+DIST github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.zip 4266 BLAKE2B 962bac7897b7df9172d558894454576e60a8f0baf852e19ab80e658066daa611cf59296d715deaa4bccd4494ebc81e5da32d9d723490834c4a764c6cc39e5ec5 SHA512 e7e9551abfed9a626f8054630faa16cf7ce23122e810f0ac36c3dc63131b142d8c23b615164f54f2a6669721d0bc5ce0a03973f5e547b86fa79c0cd94e2197d4
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod 126 BLAKE2B 629ef676ff997553b93c44e9024e6b3d613b51e276d2ffb65bd9042ec1cb0455124e5ea7c5dd0e69599a25031ed536cb3356321e37248921fd8287b47656104a SHA512 a61784b08b335d2a893688c279cf6f4b1ca222c3bc8236fd24536aad2b185fa718805c9022e1ce142bd87e39fed639fdc9035c9ea9ff110e985cd01cd612e9a0
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip 12428 BLAKE2B caf7a05e79d8b7dca069966765705619ee15800d8276d968bdf4385bc1141cc06b24755ac49c65caafdde5d8b34869df1f7e42ca302ee6a80b9ac7edd8a803d2 SHA512 c757f8455ce261c06749eda03ba807ba8b2427f0a14b0b62a6ee4e9d1ba220986e6f122b061fed6f44d68e4802864a988c722604b52989a4e31761e0e7ea8163
+DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod 36 BLAKE2B 2b77fbdbb6c6c20767c120b390fbd2992bf79dcae0a35c27121a6e755233da3ecb7d74e74c38c0a2463976b546ed8bbfb8a8d8cb140526dd9a0c4f524cc131a4 SHA512 5749d33fb085d63b7c12f43df824c96f168323cf6d88cfea3e2536eeb7b56689dab9dddb8cde1ec8bc9c2848e7148b8a37abf8523a99c55ce10f896245c5f341
+DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip 41278 BLAKE2B e0b440a81efbe3c7c16ad276b4509652fd58bc94cd162b9ab13bb37c1e6edcd561e3fbb999e55619d58c8e3279b785b8eb67fa4e200b38fe6fcb60f0918e6e8a SHA512 9b1075ccd3d1f53773db97687e06fb777741d6c3b228bcc329be580562fb3c34006768eb3f989f92367ca116c597140045b3c345fe36065f5015d1d4652633c3
+DIST github.com%2Fgaryburd%2Fredigo%2F@v%2Fv0.0.0-20150301180006-535138d7bcd7.mod 34 BLAKE2B aacafc6177e1e87c8f4a17f295900d749608f722755d31a1939d1b601e4719984c0d1299fc4de9fe74c1109852009daf4641cb5c81629788a639eeb9314867c5 SHA512 c4b5fc4230e8e9c7631f577ee15414f7a72bfe27af524fd6bfad8c38a81426411dce35a191d840a9c69eeedfeacacd3f2a108c5eec35a3e30b0a7b262b15340a
+DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.mod 77 BLAKE2B 1b81c4c20a890027242b50f1566f4dfdaf120ee26d3dc56d0c2b6465df2ba79b208289eb40c3d7b666a4e7e874210f59aea545d5125c9a55c5597a3ca7f37feb SHA512 fb153c4e481c073133f0c933c67eba8a1f160ab146921f2c77125b6ff5c348cea57e3a5701a557c8db2212d32e3cba1c09b9509210660c17b66c2a45ba97cb75
+DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.zip 19867 BLAKE2B a772206ce6dc48b32d7125a25b26694325d367ebcbad85466b2e6cfdb9fc9f0e08b98b7ecede5397344e5f7e623c4c76edcf69dcee99917adccf5b31aad80bf8 SHA512 127767c725e376b43fe4e2003ddc12fe89693d6d7e52b01e6d47d73fd04496decc0fd60b64c7a65303428e00a52ece1848610ea35231789a814187ef8503bee3
+DIST github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.1.2.mod 197 BLAKE2B ad6fee3a35d085812cd83f19083097104db561530527a0a2cf08718de0f2e5865d15880d9a98919c94147baf9782855ca9fdbdab011737ad233c25c23d12ee53 SHA512 d6b37cbb68ac77c8e3697d4ab435eecc1491e745bf212cd8f29ab5c82acdcfb0bf12d04e78a643772a1ece4f245649c2a7deb7ba1bbd6f19d02fe58be8ea485f
+DIST github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.3.0.mod 250 BLAKE2B 27970513f459c49bf9bccb001157a605c14e5546d6459e3f6e2bb3851cd8fcffefd12fb2f6f918c01a06c6aede2532656d809b80b46ef4dccb838fd40bef7930 SHA512 7fdc52fea1b91ab1c81f426948f7153c0c16cfcf1f79c64a695b62f5195f25468b08c4e1b2358ab834c94efd7b9ab9a2edddf1b00ee22ea5454b46cee19302df
+DIST github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.3.0.zip 219885 BLAKE2B 1a8e3a5a8543b871d30c9fec272a50adac9755de8945cfc0ce553e7163e942d6a1ffd22b4e2de6d8e24785d906d86ec2f18afae04d27e3065115ca5436064e85 SHA512 69c17dbdf99d75b54ef71fa2c856a72b24a50cec0a34d8b99ce3bff01d32c6f325bb1e8dd747e3d448ba73fd5af66c1cc1f6042b0b12e292441234e7ed928658
+DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
+DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
+DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip 13436 BLAKE2B ddd82721096e3dfc8c70543b4324d02f1137d9eac13c1eec1236c4ff537bbebc2ce5f205af07e8ecc16a909c4415e764d87324bad3efd5c878aecc9f8b105647 SHA512 722683483b8071b58508a7de9a9c9826d4a33c874948c1a6612c89195cceadfbd0ee0b56635d408f0af09aa2e904b0ae3c86a06e9b8f86c502080ce04c756e42
+DIST github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20180905125535-1ca0a4f7cbcb.mod 33 BLAKE2B 8921f64dbb125d824bd11b0328613a447ba831d76ed34d028ebb193fb88097931b256568306d16e17e7506631e870349ec1fde283f9dc94137a8bcce03751349 SHA512 de23a4c4a97845b7eeb623a981716ac97271668fde4e120c5545d260d4d3cc17217d39113f4704ca0edd41713f8e54989284c5b2a09a1afc2897d34c38277a3b
+DIST github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20181015135952-eeefdecb41b8.mod 33 BLAKE2B 8921f64dbb125d824bd11b0328613a447ba831d76ed34d028ebb193fb88097931b256568306d16e17e7506631e870349ec1fde283f9dc94137a8bcce03751349 SHA512 de23a4c4a97845b7eeb623a981716ac97271668fde4e120c5545d260d4d3cc17217d39113f4704ca0edd41713f8e54989284c5b2a09a1afc2897d34c38277a3b
+DIST github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.mod 29 BLAKE2B ec6988d536e1cfabecc7e1ee6070c6429c88de9bd970b3ecb35bf8e42ac3d2dfa08beefbd3741ef7a039020e6d41332039c6bc0e13d5e79bca84cf669e4f552f SHA512 67077f6e3f3c2571d6df326aa1d6351c3f7950337a23c548ff69e73df265db516eee559ee4afff17868068f2754c7ef272e46bc3dd5ac324ed002b749116794f
+DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
+DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7
+DIST github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod 31 BLAKE2B d141d98fd2673b422369b754fbd430a465f08bcdb07fbbf1ed626304ecd0843255fd2e909fc395b04c7adec18a15dea65ede0c64689be98b7491729d13363db7 SHA512 45bbb63ae2dda8c2ea63c9e38405b379708326c3f2e7963e3589ea53d06fd3bdce1613b5a0c1ef66f9c6ddc21374b1669218bd6b3210918df0a4b205116f3e14
+DIST github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.0.0-20180825180245-b006789cd277.mod 38 BLAKE2B f973673320ec56ab6d8ebff0f6a789a40d5f861736377298de042f2cddf926994bc99611e4757c4cfc34b3dd515609ab9b5dc2b0501d1929d8580b115beda0fb SHA512 23b05bf2f58a7e584e301622fe71160f6d8ef32236c48b2ab9f6afec79cad5afcdf7dfa729073f7b29f1f94fc181c86197de2f05f9e80624411802f55f137c50
+DIST github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.17.0.mod 277 BLAKE2B 10729c6eed12e23e12e34c03ae63b5adbfa0f8abab95bcd750a534de50ce0b59e6082c53d64ac4fa84a075bb81fc1ea596f124b51ef44008fae5debeaee108b5 SHA512 9006a6e1ee363f5705d3113efb82e2317b624ae637391ba0d561fc9bfb0ad389e1741c9ef5fba2ba5025c3f2d3241be01bc62f4c9dfd97c389e673c95c372c4f
+DIST github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.18.0.mod 277 BLAKE2B 10729c6eed12e23e12e34c03ae63b5adbfa0f8abab95bcd750a534de50ce0b59e6082c53d64ac4fa84a075bb81fc1ea596f124b51ef44008fae5debeaee108b5 SHA512 9006a6e1ee363f5705d3113efb82e2317b624ae637391ba0d561fc9bfb0ad389e1741c9ef5fba2ba5025c3f2d3241be01bc62f4c9dfd97c389e673c95c372c4f
+DIST github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.2.mod 483 BLAKE2B f95e0948ad794bda6de6fcad4ec0414d14d448e40b60b947b583e430e0357e125adb56b8cbfba060d5d7439010e8fb4c36e25240f7a6d65f46bb8ece1480c23e SHA512 63845faa6486792914fa0644586a0aea98bc44d9ad802a1c90ccc52aed39609126af1cc09067d547782fe7cde764c77fa2b687648e7fb0b3de339f94c097183f
+DIST github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.5.mod 334 BLAKE2B ca61c4390ba8de5e9fb81d62cb7ce1ecf7b22983ccfeed6b4a8bcbfe2f23dfded897d41408772d4d4d23fe4623cb8afd46185227823a333074f5be29b364362b SHA512 e98697e890d24c66eb807c95f9a58aaf76a6ab5dd07402bd7d928d458bb9af5c72c96ac9c94bf348307bce81c74d1eae94450ab6d9463e41e2dd46a533fb6e97
+DIST github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.17.0.mod 182 BLAKE2B de615d4a9dbcd9a22198ad71876ad68a2019db3798b6acb5a36cb67280bc9c7ecf288d56de6cc0eb0cdec8db2e485f2b5054442a9dcd3c1049226c6fc3fe35b4 SHA512 d10f8eb62276da2872925ec90022757904a9b5a7afbc6f178f2aa7ffab1882e0c2eb1e26762ec208ab1d1aaaeeb44b800f0f41b061d8b1a9a9fec5a8c098dae4
+DIST github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.18.0.mod 182 BLAKE2B de615d4a9dbcd9a22198ad71876ad68a2019db3798b6acb5a36cb67280bc9c7ecf288d56de6cc0eb0cdec8db2e485f2b5054442a9dcd3c1049226c6fc3fe35b4 SHA512 d10f8eb62276da2872925ec90022757904a9b5a7afbc6f178f2aa7ffab1882e0c2eb1e26762ec208ab1d1aaaeeb44b800f0f41b061d8b1a9a9fec5a8c098dae4
+DIST github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.2.mod 130 BLAKE2B cbeafbdfffed4eb5c91295044a618d126ac876cfc56ad60e909862e77cb35576f0efa88972b5194a7095003f055102dbceb88edb792be3b47260c7d1bce9b5dc SHA512 2a23a7db04a32554bd2e502284d024060fa39df72ce5bfc6df15a11dad312655eab10f16710a18531cdbbdb464477d9bb88b53a17f364c8f7562d1df7436ecdf
+DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod 41 BLAKE2B f496cc326aeee2c6f1547b802fa1ea13a578144331451bb772a33e2934dcc655c9355f06f7845684130c6647d00decfa937c839909baa01a6d84f6e601a427e8 SHA512 56fe1d995f8f51197d68494fb2edc2d5c5cc863c881ed640a74ba80e292a54a0600f10c727b3dc8a209fc33c750d92ad658374d0dc3d083fa9750bb7174f5613
+DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.17.0.mod 335 BLAKE2B 9090c5311a481264437c2906edd2c7cced9e66653739156c88bdfa215612e17e6105edabe34e12f2dc7b3081e53b9941d02b3e7b61cf972c0da959cd855ccded SHA512 33d493241830d340c34e440c373a9f8ee35b4eb1691223d9e4c746db1a5416eac573ff913d4ac3bbfedd4fd738dc798a8840fd278bd20ca27c91100ca1c9d376
+DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.18.0.mod 335 BLAKE2B 9090c5311a481264437c2906edd2c7cced9e66653739156c88bdfa215612e17e6105edabe34e12f2dc7b3081e53b9941d02b3e7b61cf972c0da959cd855ccded SHA512 33d493241830d340c34e440c373a9f8ee35b4eb1691223d9e4c746db1a5416eac573ff913d4ac3bbfedd4fd738dc798a8840fd278bd20ca27c91100ca1c9d376
+DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.2.mod 126 BLAKE2B 27ace39813b8f55ba228ea7a2f298e26bc30daab931d25167887237a6e2a944014b132f143a20006e69861a6d4517d597ea6d56f74b2fa6941752f3161e44644 SHA512 a33deb764fbcafead3f863c4e20fbd6969e8ed04098fede6872555405fa4a352b31f771adfb5df03fd633ee5471dbe259407d873e230af01a1fd31b78042cee2
+DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.mod 210 BLAKE2B b3f610a7bbe7758041e145a17de7becfe6ef0d80bf8a2e6bb9de47883483b3ced7f09e0ef1d170f42f1c5928913cf80043727b3e62fc0025943f6a327a884f64 SHA512 d927113c08de347570e5ecf4ef7019c7574e9fa2d751273e8c68f114b49aa4a9d9c39e32937ddd1ad3d665757d59a4e498fe275578d40a6b0dc644ca7dd8fca2
+DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.zip 18504 BLAKE2B 96ca3632fa43a2e7a2aec8e72bf5ea06374096da1c18656119ea5c1ca1eca55bb82b1075dc1ff478d290febfcdc6d9596e8b6400f053e611b0101c8d79154396 SHA512 2263bc61ddf10f0ab76b3f0b3ac2bdb91e30894e6fdd48731bd3595c9005884038bcea0bdb09abc73bf9a68c03e6b761f73b8cd60315c121058e58a4bc7d18be
+DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod 43 BLAKE2B ab024fc86c325a82315f5a99c39e1fc08440ee35d81fe09959816a0fff09aa5d852431fcc370dde082963ccbd0d79d74d987f1bacdd4796d6d1d11eb80089d63 SHA512 b3548cd55d406b9148e992e276f7178d68116825198f359971f22a1d9e7e2548cdf9605a1b8b6f04b3b66d92faa906dae781a53624344733fc471452f16f4312
+DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.17.0.mod 611 BLAKE2B e9be68fdc22a6dd742faa396fbc29905dafb4addd99c8b4dbf44aa642b06e698a4acd29c1d5d18b2bec85b817fff28aec2e9467644fd0807216df209b89f87e1 SHA512 4f4e1b9f6ace0cfbac71d20abde69a7a00c88d29e4b820ba92b4b3c6f786fcce251fe97a3d853e1c2e37518ea8c709101e542e0a866e09531c1fed6dc04b529a
+DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.18.0.mod 611 BLAKE2B e9be68fdc22a6dd742faa396fbc29905dafb4addd99c8b4dbf44aa642b06e698a4acd29c1d5d18b2bec85b817fff28aec2e9467644fd0807216df209b89f87e1 SHA512 4f4e1b9f6ace0cfbac71d20abde69a7a00c88d29e4b820ba92b4b3c6f786fcce251fe97a3d853e1c2e37518ea8c709101e542e0a866e09531c1fed6dc04b529a
+DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.2.mod 354 BLAKE2B fac3e9e9fd1514b1e07894e6931cd0368df9dcc09210519c569d81871ef1350810111ae38799b9f0b5692829d380b403d8f7468e81eab8ca22027ac3dd8f9adf SHA512 30bf4610b301503fed728f146ed4458dd3bf295e1e4f7e1ae4806f4ca6e8856be988a10642c84c5dad601d71ee5b7bbbbe0f3e371be1b382c3c3e869493721ab
+DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.mod 363 BLAKE2B bec8f102ff2d1cf0d4e61960971cae49e628ff3678b0a6595fd4add3dc6018684c004ff8de4a7f60fdb5ea8fa98dae0507c619f148836dc9287cc687cb9629e1 SHA512 b9528f1a273596c8227843c7b5513920f78c25b859c0d095499ea05f5c0200095f28a344c5bcc913b61c44f71c5af50462a2e7e2ca6ebb9670c5875096118998
+DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.zip 16705 BLAKE2B 61428f887e1b321afb03e2fdb690c4d4d073c343457472fbbcf48b841e49e4e4e0b9215ca217982951bd3948ae8a2efb9042cc87f7ccea1b4e0356358aed98f2 SHA512 52d4c005063af04b2897f5fbc1d23b5b9280701e667949441ca19db9ab8484dedb9f148e5052b0d785aa24fec8fd27a44faca2cda4aca946bd0fff92231c515f
+DIST github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.17.0.mod 1073 BLAKE2B 887a07f56f26aa707e72bb4605dbd22fee24c4d5149e6aba3dcc7812b438ac41c2e9be294f307506318045fff9913c88ba6fb31bc1dc43e3b88d9f453149e4eb SHA512 f22943c5d69bc17b3b7fae0ee0746e628284e4e6ecec577509101148bc1a7fb0b4205fa06f1979204d12f9f19ce83a3c4d44b6aa1da5ac865ba2843bbe566790
+DIST github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.18.0.mod 1073 BLAKE2B 887a07f56f26aa707e72bb4605dbd22fee24c4d5149e6aba3dcc7812b438ac41c2e9be294f307506318045fff9913c88ba6fb31bc1dc43e3b88d9f453149e4eb SHA512 f22943c5d69bc17b3b7fae0ee0746e628284e4e6ecec577509101148bc1a7fb0b4205fa06f1979204d12f9f19ce83a3c4d44b6aa1da5ac865ba2843bbe566790
+DIST github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.0.mod 1073 BLAKE2B 887a07f56f26aa707e72bb4605dbd22fee24c4d5149e6aba3dcc7812b438ac41c2e9be294f307506318045fff9913c88ba6fb31bc1dc43e3b88d9f453149e4eb SHA512 f22943c5d69bc17b3b7fae0ee0746e628284e4e6ecec577509101148bc1a7fb0b4205fa06f1979204d12f9f19ce83a3c4d44b6aa1da5ac865ba2843bbe566790
+DIST github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.2.mod 221 BLAKE2B 868f9dc1980e996cd0e1a96fedc219e5277071d6d36a35e39d57672c1a2123f1388bb722afbd087085f91a16bae62167852d94631f160edc1bd760b1be3db367 SHA512 aee9410d5bd44b38fc2ad7627cd87f158dadbfb9aa9ba20db1324c44120233891aaf03db712ab5bc9478005992388c26d6ad5acbdbaf131c9f1c26d7d864d5a9
+DIST github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.4.mod 230 BLAKE2B 00b69214f0de6d8b6b38ee35a856b7d9e6f44c372c55f54e9c650c85c19b69f6194540c8236569ee69d25339802bf51ac4ac89f78600c6c1e8c7f34228126a1d SHA512 978d42cff1b1bb988abbdd1997b6b1c215c23e1271378f9d3fe7252e8ddc3e19a9deb4c93e15a93bd47a5f8b6abd62118cbf8a26bc43d655308dcf0f623a763d
+DIST github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.0.0-20180920151709-4f900dc2ade9.mod 37 BLAKE2B fe2d5da39fadf3fcf32f06d968157a8e8dea075a9d473349399f0bb8a04370ed0f6e17f37a333f5aa2bce1d2bfff644656a84c5d1bb65cd00e4310886435e1ca SHA512 30e9611c496c86d8331d8575ebd70c9459b4d0377e36bf024d9934fb03ee616665812373e8aacfb814ed0cea25924659a9f1636d65015b929a4652bf590d6322
+DIST github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.0.mod 1074 BLAKE2B 34cf9165f8a795cf1b2182addc17dc5cbf6cf17306921f7d6b35c0d67c9f85a9795d19983aef40c7a9c9b3a9f7c24f4313c30f3774446fc9e8b0a6ffd037122f SHA512 ccbb2dae7075af582756a35d6fac07d92281d3f58e222bc79404edd3f416d4a8841b6f75ec6ad1c67bce5d7b7d9ff913bb42e3ae92e7cab86ac3717802d1a080
+DIST github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.4.mod 546 BLAKE2B 5def96d32f37b6d5db079cc1724ca10c0be93f33b06907aee142e45985bb1891c8850fa531ab10f0405a34cfaeea5adb538401c2ca8955511d758ca77f9bab73 SHA512 99fe69cb7910196d46060da7b382457189d9085c9eb4c15ee75c0acdbae283a5bf8df6aa30191b3202793a071301739de57d972b5daa2be81d86de9bf08a1c85
+DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod 34 BLAKE2B da7fc8b2c3dd4e49dc2efc50ae5d50571e906f68ebbaaeb863f4b3f6f03160a381d7b0e743863cb4253ba36afa2f5d7e518ac08fb4d6c08566d9931396d87fa9 SHA512 b75a0212825e9e0554f7654b1da4050ddda233853ddd86fcfeaac0202dcc4605f0608f3e5ea90056407ccef504330ac407493187a759a36fd716f508b20dc60c
+DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.17.0.mod 635 BLAKE2B 307198d3804e2ec4f864462d3a07dd070c6ac4c66b4e4a418b9734abcd02b617155c52da0eb59d29021ee9a0cd2700f0fa0af1f8bdf7f7d6bbbb6f9cf6daf4ca SHA512 3341e7a77c6a0aef340d0247f2c004cb9c2e5ff864a43d26a2c74eb73cc4a3cdead599ce7a1251f23715fd9463fe8e8e2c2a3ea75915664711a753cada3ed3f5
+DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.18.0.mod 635 BLAKE2B 307198d3804e2ec4f864462d3a07dd070c6ac4c66b4e4a418b9734abcd02b617155c52da0eb59d29021ee9a0cd2700f0fa0af1f8bdf7f7d6bbbb6f9cf6daf4ca SHA512 3341e7a77c6a0aef340d0247f2c004cb9c2e5ff864a43d26a2c74eb73cc4a3cdead599ce7a1251f23715fd9463fe8e8e2c2a3ea75915664711a753cada3ed3f5
+DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.2.mod 515 BLAKE2B d901158241d70a76b23e81549a51db50d1a446939de537688dd1a43622b59ba7c118a17c697f6e2753a10b34d5f806a6418bc20de8aa35802c15ab50c87dc295 SHA512 fa3615e0bd38c5b0a55ed3a24ffe0534fecdc8b36b44ed47d7ce3784bad810bb2d5fe451fde2055e7c003454bcb20e9f560843056087e9b20d7afba899af065c
+DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.mod 589 BLAKE2B 9446db5ead7af8fe9e74376580e35fbec6d00ac8590e3e6ed4469ee237f549da84be7a1c282081a65f6112119d9af29c11a603640ac8dedd45e807a9582a55d3 SHA512 23d81877040f9b00f665fe8970912d413e944fe3c811970158cdd2df6778a4170199209de6039d535a896a87286392a2e342d48743235d99059ebda16086d231
+DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.zip 281786 BLAKE2B b540c0058c510680b794848fe71eb908e6bad64159240c2b3df08fc6a8fa899f17da1d10639179f46e517dbbe75f6cfab0850a9bed20e31873d46e481fe06133 SHA512 f95e4adbd3f364f4ad98104d478043158f8eb538562e9c44f80b8abb6844805984fed07929f5a155b534b56e98a2e08343cc526e78128f4945e40de564a68855
+DIST github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.17.0.mod 489 BLAKE2B 583b8241788203b1eabd49c8d50984bba7d8c1bc118aa6983bb5c0598b975851a8a955810e51cb1caee62861f4a70e02d8ae1a9d63b688871d39e175a325933f SHA512 b06d37197a7ab73237b3ccd8252bb4c382b61bc786ca26cd2fd9106a0deb4917f017db8c4101c9e21df31f4c685180c1b684d0a7075551e59ad7a7f67a07937b
+DIST github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.18.0.mod 489 BLAKE2B 583b8241788203b1eabd49c8d50984bba7d8c1bc118aa6983bb5c0598b975851a8a955810e51cb1caee62861f4a70e02d8ae1a9d63b688871d39e175a325933f SHA512 b06d37197a7ab73237b3ccd8252bb4c382b61bc786ca26cd2fd9106a0deb4917f017db8c4101c9e21df31f4c685180c1b684d0a7075551e59ad7a7f67a07937b
+DIST github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.0.mod 498 BLAKE2B 328cbeacdb4351ec3a4556df283d1ab23bdb0e2bfcfef6c516b1fef24b7591e55723a425d0e59b0ecb1ed552198d752c9fdc6977cefe6edb6f3e028dd080dbf1 SHA512 91813eecb164407460a706e6b22b368da59d9c1b29f827d95ff56ffa1c8e5fcb77dd7bf20fb830febd6ef597aa50ba63d9617540277c6502933a96ad63370b77
+DIST github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.3.mod 439 BLAKE2B 468211633ac8a95203aa1a26c04d10b0973dee61bf220b68546c97d119838ec451c627e8d598fe6e9db1b0519a55522d713498e4ce0655113ded453800789d51 SHA512 8fd770f491e8e65fcf65714ac59b44d6d967570dd028039b4bea22155261d95a7ce05688cb9bbcc2f40c9e55fbdc89b673a0f70e3522bac04d508f56f1098123
+DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod 34 BLAKE2B 3eae155bd845592809662beb61207107add5a1e0edf380e313e262699dc421b3bbeabad5ea9ee73d29b6a694b2e58854b888e8fdb3dd9c7176ce637056cb90cc SHA512 81cbe6c6c48012994253a40b9c897207b8b4b79f35c09ede64ad7f8d22db8861ec823f2b4a7185334554c75bae3b614de236f804312c77b0027e97114ed4839e
+DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.17.0.mod 268 BLAKE2B e3e647da07e2cd516610877e931734786d91328d45936b0ad95237409389480c7c5c157787d5dea79f160f665a94abb17c3fbf23535f3cab3fb0b72944b8cb55 SHA512 0dd4ce8cf6ce20117da3e59a8224727f93f6daa29ad9ae7cc92b6d331bc8734f1a6dfbb816ec08da7b24b0f76c91ad770dab551c97e49bedcc403fc823c662ed
+DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.18.0.mod 268 BLAKE2B e3e647da07e2cd516610877e931734786d91328d45936b0ad95237409389480c7c5c157787d5dea79f160f665a94abb17c3fbf23535f3cab3fb0b72944b8cb55 SHA512 0dd4ce8cf6ce20117da3e59a8224727f93f6daa29ad9ae7cc92b6d331bc8734f1a6dfbb816ec08da7b24b0f76c91ad770dab551c97e49bedcc403fc823c662ed
+DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.2.mod 499 BLAKE2B 77c4b2e41d6ef35e23029489c7962e3a6e036c1e55a876916b90efcaf7011ab935ff0bf8dfbfd45ea8a27194b480055a99039dabd2a45922a4d18f80fce4343c SHA512 c007b4edad28839d872ce2bee87b875757a3428a09d04d499bcf710baa8fe0f448a818f7a939a3c4c40b05436233a683af41c9ebf466ca58e0f44e508a014923
+DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.mod 499 BLAKE2B 77c4b2e41d6ef35e23029489c7962e3a6e036c1e55a876916b90efcaf7011ab935ff0bf8dfbfd45ea8a27194b480055a99039dabd2a45922a4d18f80fce4343c SHA512 c007b4edad28839d872ce2bee87b875757a3428a09d04d499bcf710baa8fe0f448a818f7a939a3c4c40b05436233a683af41c9ebf466ca58e0f44e508a014923
+DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.zip 49381 BLAKE2B f83648e2877f57671b8a5133f7b6d0ee36e6d48deb9d4684e839e1d3eee54d721aa536eb41c713f584418916e7dd1192742a87faee77a015496aecbc58759ff3 SHA512 64d7a667df12bb1257a8f1effeb177b0970fb326a54a72c211c781920fa8af98234c0fc22e699af099f0efa3696be2dd5314c9731fcaf74113aa25ffcbc1ba19
+DIST github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.18.0.mod 446 BLAKE2B 50730422149ba32c04e4c1344feb09e0fca7b5edeba41e4b11134a2c5c4d80f222c216c92297b0fe61b8fc081ab9b493530d4498886a874553f24df8dea31bef SHA512 acfc9cad354c8ef9ccd01df7593edd4f025d6e32dafb096fcaf21d5de8af1cce9607bd413b2c31a400e94271136710294c5b943e32a76d4b3304c28b88173f42
+DIST github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.2.mod 419 BLAKE2B 1d7e2f5a1658dea6016639a05385324b0769a07f563bb1414d560cd34d47dc64d6fab2445fefeddeecb8e70fc0703f7a174f1039a4f9948590053bfb4451b8a7 SHA512 4b81b994907ffdc0489ce9755fcb76c12b8c80a8c1f3e94a0fd628720fa8bd495b73eec430390151e417fa6d04e7784fe3eecf2efe59149f26f0da953f6598cb
+DIST github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.5.mod 616 BLAKE2B 195302c90abe853d5c39ecaa800355007bebe9eaad6c6a57e49d8a432d1d30440c213cf3b5e926f5264a65aa22a9cb59b58fcb72597fe38344e943a3ba8f89c4 SHA512 099f9d1770c55309210e8885d327a0c1299a429a5252335578009d415b56da4f30c1ab37049826f9a6a009a9a8003194c60a9837aa733e74578b43848b16c33e
+DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod 38 BLAKE2B 198f3a6fb7348bf50286e1dbb067e72ff854b1daedf1d181b643872aab377b930029feeb95d5d6ca21109facde089527a06922b9ea52cdd59ef553d69b984e06 SHA512 21ac6d6f8fd92ccbe09cb30d0dd6a37142907048cc5f9d0574824765918dfd8ccef96b7ceab9dd259f9a95f5c5be566ac00ff4eb3e37ba7c7c98f25b3185baef
+DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod 38 BLAKE2B 198f3a6fb7348bf50286e1dbb067e72ff854b1daedf1d181b643872aab377b930029feeb95d5d6ca21109facde089527a06922b9ea52cdd59ef553d69b984e06 SHA512 21ac6d6f8fd92ccbe09cb30d0dd6a37142907048cc5f9d0574824765918dfd8ccef96b7ceab9dd259f9a95f5c5be566ac00ff4eb3e37ba7c7c98f25b3185baef
+DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod 47 BLAKE2B 7252c3d085ad65bc8d2694f6fabeaf42736c8af8f4e061f1b6f254c35859619db00c1e204057cf355434b40f403b1c67c29fa5f93661626284bde20c8877a606 SHA512 149783bbdf84f15c29931e06d98707db26048d13ae9fd157600b522c0ddc60612c39764dc177e063f844205321ba98a01eefc1744dbc6f786861d0607dbdb0bc
+DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod 33 BLAKE2B 366a1ff397488b2b1c7e42db8a946bced1eb8d4260a6c177a978eb978e14f89265e7ac1d0bcd77905bc89eb35b68b3ebb028c0dfc67ff71395ab14b62335d16c SHA512 f3dc70dfcf086b785750d5b346ea07d0dc7903937bdbba58eace0fb903e656b02ddf3a1d49b486ac29b1cac9ca9d346e964d55d3a4cc5ee5ae79ac40b24d0cd0
+DIST github.com%2Fgobuffalo%2Fenvy%2F@v%2Fv1.7.0.mod 202 BLAKE2B 52f0ee72de8be8043df75bdc9b888601b25557a690be151d1696949d73fe3239eeee938de9a44801d8bfa940b15ae1749cb6a14249b3fb755e2d296b55c47c9b SHA512 33236cea065ae18acdb40c50731135610d8c5f3685b1c14eda46d99da5705d2eb3457e9c60e6ca60e39860a18343d9877480a183a6242667989cbea501807d20
+DIST github.com%2Fgobuffalo%2Fenvy%2F@v%2Fv1.7.1.mod 211 BLAKE2B 5cd9a0b010793e35bc8bdf1697052a8d829fe8e1c05ad49124d7dc1d6ed8a63343012fd1d44909a036e175aa6531ac9abd750db4676398db0d97359d8cb1df7c SHA512 7dbdbd6a258c4648c48e841203696fc917997af7f8c7bec9014a44ec0b3d6bbb1f09b4e9b958a81bc18a80059b4a3bb718ef11439ef95910a1b21ce87d85ccdb
+DIST github.com%2Fgobuffalo%2Flogger%2F@v%2Fv1.0.1.mod 370 BLAKE2B 1e5767e4bda0f4291ad234349ff515ebfa465e3e0592615308147d7a8fc80868a57a98e90cdd9325536479d960387f45dbe155ee7b3139a79c022ac5ecb047f7 SHA512 f6df14d67539914f0e34620a1cf88dad371d6d1513ac3560f57bc6c984775ed53e4dba946916b07eaa700c8c026b80ded5fec1fc871b3e517d03e8037719ec62
+DIST github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv0.3.0.mod 139 BLAKE2B dc3d1d2b39e2320971b1c9a5d930d30f6e13764da48c752aa50fa64de8a3a5e91802f0fb7e5df197ab0f78187cdaac92af1f2d2ef3ff4c8cade24fae034692aa SHA512 27976de1d72af55488bd43acfc7e2ae7bb3c90cf244f32139e38f917e1e873b55342e2005ec938674d20a59ff3b46c9ddb2d86137769c1ff0ac9dea78bebb4e5
+DIST github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.7.1.mod 415 BLAKE2B fe0a0a3d50dc3daaa0ae20efc034551b140fe98683af91aff6c15bd2591fa896cf08a023ba071c3d7faaeb0e19bdcdefe467d84d2a7a0f256207e206909be11e SHA512 76795e1d8b77e7a5f931cf00ca8d62f785a241f9666aff21eb9b5c47fd76ceddc7115ff03a16e02a1e4a2bef0e4ded8322b7a423f1eaaab64ad3da760990f279
+DIST github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.mod 30 BLAKE2B c4b58079c7f353b01123ed35c24b8c9dc43139a9c87b12fd90cb99e41b97d6e2ce646710b261dedd2a6c9572ee42e677be0ffb43cbb8cb55b99d1eb92ac68f4b SHA512 e0a6df51284e6b2faa2ae12bbc2c53c649fc503427f0651fefe99cd852a012a76a9c5d967cd1a088e1b3270f9b68abc39f56a6d823c5913fa025b771145f80c6
+DIST github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.zip 50402 BLAKE2B 361f6199022b22ba47eb17a7d85a670c4843cc4269df2587e8d9fcd1083525308b74f0a164dd1a59aec04b473da7eaf003bd005b92558126f282600b3cd4e262 SHA512 87e7c1792bb3a5ba1c78ea5844c0083abcc10f60d19019bcb763cac5aa7dd7625903e074228562207e836803a83bfb086148d886edc6d24e5fae7fc6d8abf11a
+DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.mod 39 BLAKE2B 9884f8a07f2a84a159eb17ef62e9b17398b84bdea38fc37591af050dcebc2f56b83f851046c3333e604a7f954b7628c16b267c0c94807f7a41d5d2b797db0918 SHA512 c32a84bb302c9db3f31f714484131ee3ea96fa98b224b9cbf2c5fdd15100a24094e94b55175cf1fb0b6326128c2db8950677d8f6d281b49645b0c7b51b759093
+DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.mod 30 BLAKE2B fda15fb36702083cc063889e1e180403d555d81b02cf93e32d96826df51a2fd251c338ad21fa147a06c7107831f7a30cad1131935cb61a2ca58c65592400c174 SHA512 baa937326b26fe8c673b8e230200289591c55f2305258135a421996d9c97a9a12965bc5aefbfd7cb25db266c9c7777dee8d414044129e2cfcd1591a640d782cb
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod 88 BLAKE2B 0699027ef7284edb7deb6a2640db52a5b93076e3250d42710bf02a1cd7d5f591f1d335ffb1e7e753dda5fe177837fad87a25bf69b03466bb545708fb2952fd7d SHA512 b91b25b4fe769a403fd7a1f82d7720bdb0526a349ffe7cfdfff09a2ba5e0015d5a3446cd8e0e5fe46479b7d2296a8616de38a8183c0185f84fcfc75d202db106
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod 139 BLAKE2B 0c793b0070acfae7ad92de8d8e177d6b9a2519d521bb397da4dc2610927374e4c010db6a4454783556edaabf64e585b00112aea05820874c49f9bb4c4f049fb4 SHA512 232bef55468d9ff66ef7f446d8096a44a0a947533c8665f0f018300b7ec1804a634299a1a6ab64deaa67f1475e9ef68e7be233dc72fb2d9173559800f01af142
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod 139 BLAKE2B 0c793b0070acfae7ad92de8d8e177d6b9a2519d521bb397da4dc2610927374e4c010db6a4454783556edaabf64e585b00112aea05820874c49f9bb4c4f049fb4 SHA512 232bef55468d9ff66ef7f446d8096a44a0a947533c8665f0f018300b7ec1804a634299a1a6ab64deaa67f1475e9ef68e7be233dc72fb2d9173559800f01af142
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip 2698974 BLAKE2B 5fcb1c66d3fa55efca631fe5def383ec089fab784cad7d6a031ea390463a0c552f5fc4698f7648d271f40fb0ae3eee525f149347bb409c951d15d86b7f560e16 SHA512 c7e2170eda176da203ca64e402c11489c1fd183afd3359742e373927ff228d62e445f5dfc001a471303e1708862998c125ad4c2db86919596297b11cae4aee9e
+DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.zip 39653 BLAKE2B c84bb2352695575c56a32eb0e7a8d93818b15625d850ff662039e5650f78dcb06a093203d0987d00a2271ad02e811182cc7fabff7f8b5d5475ff2628d18bcb13 SHA512 050f33b3dd4053885c46c07e7f56cf45d6addd908549ca5ed98036aa14e964a7ff4c30e08887979a69f25df85af131491fc80a62c36d038b1f3af5b3b06756dd
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip 465217 BLAKE2B 4caaf832a22faf1c45e04bebf35d29b38bfab18a490ad1fd7b2c6cd85ae678fd3991505f68e526f9f2205cf919374b07d57f8abe95d8f74dc8263cd37a9db3dd SHA512 7fe69c066b2407e6000ae21888f6cc696e51df2342a71e196aba1a9a9ecce630bd9a4d41c58b3105002508a4d0efb9c5ae2b8a87f848b8e2c6293558b8c4b4ad
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod 43 BLAKE2B 1985b508a7ca5fbf7283bfe42510dd54e1e409894b4bf404c918943c8bbc38a3682d00322514c8fef7d6528059fc547534bd956fb262f91fc63dfd6e97fe0bcd SHA512 17d97ea39719fd59908591504c8df288f5914243fcc43a2cd8cba6c2c50fd6f5315b17afa008f92ecdbda732d5447f848d31bbbfe59ef9bec78aaa3f25f51833
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.zip 458249 BLAKE2B 54ddd18b48745d6ad5a14e52a3eb57e28dc5d3ae87696a46dc48c867c7474af1b496d941005248f3af82ba4d2b964516e0325039e0d70de3758eb39e7c17abeb SHA512 bbde51e57a81708409dcc88617f1f5a4f7756c64912c4d0610899c6210201eb50782435adbf84cf622a47dd9a479c31113854d7976a434b3d882d218478b0e4f
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod 151 BLAKE2B 9c1bc32114f742984396777149c3fad997bb47288dfe265614a1d17412ae3946581c2e60ff9ab87e784d71cfbe423b7ed1ea5864b6cd3f81f35e9103c8c08a00 SHA512 431b8d4756fe79e43cdc2f8478f3171ac9c90912222e50503301fc83d34c90001fb6ee0fee3bc05f66e47d657977395769e54efa0fb74ba35f34429cc0dac5c3
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod 151 BLAKE2B 260f1bb3e48b0bf9870ea3b725b13f84d2f18a12c6ca1275afcc2897bef547fcc1e893bd6b1efd46330bc1de66a00e3ef133a4418a50a075302aa3141abed8e5 SHA512 b6d7911148c590b3ce2a14a158cfbb94dd56dd402b3a4a2399adcd0421604f85d904244ddf5f8dba65326f04a7817d5652b30a306c65f44fd248ed269485a21c
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod 151 BLAKE2B efe8a8f8394f082a813ed4983158ada7bcd20f92f9f8b9b0d0e61e8dbb968b3c825432ae05d69c9b61a04ad57533c1e60438d9a1964312d4c9168f86864ba2d3 SHA512 2df7aaf6cb36a18165dc458a7b3f4158e2bce3bf10165418de401dd43e06d44378511dd4fea6530cb668a8ebb17b4c3f294ba35f5018e6aeb1b7b9082aac8a84
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod 154 BLAKE2B 8645404d124dde54c3e9c284b1243b1faf2124f2b7d6c5e6566ca600d3c965f7787f09f6825840f5e3ea6d36c016ef2c7fef10e8e12dce354593f7a8a3210a33 SHA512 4c9416c4777123a39b23b49ecf6265295fc3432de083a04dbefc87264b8c69f0d9e342ebb7e8e488f30c3efdc02951fd7dec23dfd1fef0802c8f0250f96612a8
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod 124 BLAKE2B 4c032e7f2e1c8765cdd720690c1067c7c0ba1005bbfae01cd928bc60d96bd82321052fdb18a4ae12119144e34865cf910e306c5116e4f4f56cc5f70f5d52004e SHA512 acbd5afd399b3798d4b24529479b18523ae4009e21acde15a3893d2af75f9a6e65fcbd5a237423849003eb8903718eaa0b1aed9177c390972ab9490f3acc0d1f
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod 124 BLAKE2B 9e60030e0014cbc67c0bc7064eef3b127dec57dfe25bbf7f0d0e2b9c8c77e28477066daf073a6793428116419900e7c9f6dea6e8841a5f61812cf11ff77e7009 SHA512 14a0f1fed404939fad835398d5889ad57621edeb0e183785b3094957183bb29a2026e2af939b94c7155f8496e966116c4a6a2497fab113a175a9aef3f7ec3f32
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod 124 BLAKE2B 3242575be48f0e1f74e2d0976d2a11f0edccc59c7b74cecde37233c19f97c51e576cd3032175cfad3c1ce9721cd41053f459341182fba836e0ff0456126e493e SHA512 9586be76b697c6a5c3216762ac13a7d297372ebe0c7ac5941d16c326d1580c8a73fb475236ed9a4214d158a7386e761877be16cdbd4ac2074e8a5e1dfdc95b54
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip 206762 BLAKE2B 13c74350dfc3bf39540c37f6b7771f18930d6bfd6a5c83c27c723065da6458e0de544a6fa4d57c027e6c67eb528493c620228a56249b889f00d67a064218dbb0 SHA512 3d92469995664037149e3e11363db685b3175fff01f4ef3b578ada273853a16131b3c97899b497ab75ffbeb6191fe59a28f073779828f719681b8e15182b6211
+DIST github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.mod 35 BLAKE2B d6addf74aa6a2ad97c1792946aea166c48bbcf35fbc582a9dfeabbdba68992106b7cc7b2515ccf002f44bc74c0f0655089e3110e39fc312a683b1c364318279a SHA512 33a68d466b4aee3c41e6d70766e90fc7b7b8e904acb360d1a5e15236832ca47e5f45393a7f5c486893f6a8ca04af4ca4ced27b064c15a5189217141a325972a8
+DIST github.com%2Fgolangplus%2Fbytes%2F@v%2Fv0.0.0-20160111154220-45c989fe5450.mod 35 BLAKE2B 2266c9ec6e2058e41afcb70dfe33ef7bd1d4c0dd3ef6af9dd85d9f86ac0c5ebcf231c21d66a0c34d6e5930e1de410ad482f7774a42398aac213eb0146c2a00ef SHA512 17790f178fd61969fa03eaca0c0a546ccb8215016d44bcec8105cba39a188c855b5f90c7d6c01fece401167daac2b662405532ac3b38e0a167a2629e6d52a01f
+DIST github.com%2Fgolangplus%2Ffmt%2F@v%2Fv0.0.0-20150411045040-2a5d6d7d2995.mod 33 BLAKE2B 1f96bc7ad16794099334f84bd7b7760ae7eb94a4b32186b2d408e3bb424d19b22b3eff38a817c6ab845ea7c39555305bb940f2b9b9e83b342eb4169f2237d207 SHA512 5a17ebee3e4ae0212aa83c4923932996988a3a693d0ece14fdf1aca4193452ca43cfaf4bb6dcb78c3c7b996300ac285c503ac18b098b95445bb26b7c25cfd25d
+DIST github.com%2Fgolangplus%2Ftesting%2F@v%2Fv0.0.0-20180327235837-af21d9c3145e.mod 37 BLAKE2B d66b4b477f3f94af0760263acc5065e51d1ec6a88ba3652b0f36233e6bcba3190c694019fc3fb5cb03cbf9118f37b9ab975eb6bc79adbdfdff419cf6a13aaf0e SHA512 96042f35b1d67dd01e7d799c47a7314b3d9c30cd318ebed4a55066c9c5d94d321377dc09ee97b64644c5132c0e03ac8bd7e856a38f1d694d31b94d88cb0d0f39
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip 17644 BLAKE2B 2ab156c678ef5120adab042c415b287bfa6ebf901181837122bbf83867ff312900a16a24c0f375708f915628ae5bac93b42f659663cf827b81e5e6c4c6e47769 SHA512 b54c7f94aef24c769a0478aea5dedbf67309dc3f59a5d7cf52ea8b49e81783d87bf80e5bcfa36f1f95a65e64bdd8312d20ebf81cd73952af5481b2f1f3619eb9
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb97e0d557200e8722f2d373e149127307efa285cdfedb36dd57355168554d1a1bada62144e6a6a00c4d3246aa9afc7d0ffae0f087459c552 SHA512 7229d917bb0c788b07297e1b09b8f7952f951998a56f17ea1f69ff7c2f565a5686b212f42f45c6b8351905d6740a2ec5a235e493daa531ae00cb709faf67ae45
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip 105396 BLAKE2B 8b45b030824cf6ad208a00e36c7098b59e89c2725702926092baa11e82bd395d52b5daf26af57cd5edb01bee6ac2b8c4e3379e357e3a6cef69550d9403090c53 SHA512 bd13e72e46a82b149661a61dfc36dc6e0471dd4161f2291f301e871811e5b2a7976a49cf2af10eee1b7b2f6ad68583c240cba007ec163cea157f24bbe51d3b3a
+DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod 32 BLAKE2B 11dbff4f4352c70c63b410ec8fb7986235dbaedd97ed64d665ab465898df351f2ec3eb9758c165812d5f97bd7b409e90f2db6ee41d73ac9d13fb96c638b42c38 SHA512 8720691f3968ccec689b3c777eeb9b5dd2932f16f77760db3e51fc0315405f7d96711fe0683d6bea810c8ec4e5b320fbd16e228f5f407b12ac5ff896cb263372
+DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
+DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
+DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip 16936 BLAKE2B 04270e67b679a158d5675c41f8b92803ec49d9d29f4e8725345c307d7cfc97a4876b30f6518eadff651a38af46440e184294ea48757dcf53ace35f44d36801f4 SHA512 c94aacb755ae942dc487c9e8f79f01016cc31fb118f6f340a58eb4f458de5735b2533af6ec513cb4512a05e270cca73faf46c5f3f621a0b76a79d0606000d3bc
+DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip 21279 BLAKE2B d8013c686f7cd497091f4c7d782b283eb95faa7617d68ec7f8cf937c5925d677d8552c662291e41cf2c137fce163d45fb62dfcde88088225c13e0980fcde3d7e SHA512 f28071ffb6515262fb73276725181a806740688fea8de8d9484e1204fcfe6e5fd437e38a3299acec6bb545deb31373d910a09d92937308176b2043ccc9f5397f
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa28e8d5b816289e6556e114311f039b477e5ac86fc1c2ac80b1f8d7729ab6a83b99baa4c03de9634240481feb13900fd4049753b8de839656d6a7cef8f SHA512 31e50016a01fd485775368e2e430959278cb6c03ae6b1871b3d0c173fd43e91654ae87d1758c08daf897e55be8b4044bcb47fc072ec645d16e2594f345b46c73
+DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod 37 BLAKE2B 80edfcae1f7fa1ded69a583baaca5b236f4f9539d6e63b3b59557a8407bedd0bc3cab897d50292cb7d2a75bb52b67435f4bdda71e9cc55d901cbe574f16f3cb7 SHA512 c69dc49bd88fca7c67f4b866008d9f253387c1806c55fe82bbca0c99136b58020058e0681659e74b8f96e53d74d39d5ccbf11eec6291a0e0eac1998ba39f4d50
+DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.mod 37 BLAKE2B 80edfcae1f7fa1ded69a583baaca5b236f4f9539d6e63b3b59557a8407bedd0bc3cab897d50292cb7d2a75bb52b67435f4bdda71e9cc55d901cbe574f16f3cb7 SHA512 c69dc49bd88fca7c67f4b866008d9f253387c1806c55fe82bbca0c99136b58020058e0681659e74b8f96e53d74d39d5ccbf11eec6291a0e0eac1998ba39f4d50
+DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.zip 537340 BLAKE2B 6c20d5154ff3df760a60d3828b2171204674d8c477b7836cfb41330eb74656fe2dabdd8067eb2c88ad511c4c58f4695e9aaddf23f94767e267385ef26fd16bef SHA512 fc23502a912ba05b0e01932450dbeea39731b1c470251a3780040cb79265a8c6141ce6dc806e564728ca5bed9b537bf36fe6cd104eb25cef8c0f9a04e51bfeb2
+DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod 201 BLAKE2B bc1972ace31333e12a0462701bcd8aa135ebda6f8619d3f98e4db0bd037ab854873c68c2503812fad3773f1bb1937aba7ca4b2af50e8eb2c13cea5aaefa7f573 SHA512 a1e237b3f47807afcbe3eed728821d15da81c78e20562ded5a8cdad18d498a670cc4e1c10821374fef8661afb7ec7e41f27b4dab8db2912db7edbcdc642815cb
+DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip 1719536 BLAKE2B 0df6f7e2df2152bfe6ac0e7065a8c2a2638cc82ca532509cecf5f102e16c1463ad38ac75d324eb38f12106e4cd950d647805dd246860f05f1168ff7c92c1c1af SHA512 ef4d868f6c9f92cfcb5bf7d53e02ebe04e14fdc11ca22e7297d88652b660f6667d491035da7a9a1dcb25654add04852e968f9b7633d5c363534c63db58dce8bd
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
+DIST github.com%2Fgorilla%2Fcontext%2F@v%2Fv0.0.0-20160226214623-1ea25387ff6f.mod 34 BLAKE2B 378e68460634c64da8779bea61bcf813ce4c5797c3ea541362d1409bff606626917c1bc4cbd030d98077819c5a8abf2ded047c047c2fc6b58977093e67e7b6ab SHA512 1db09f5968fde5c7877937c2ba476afb8a07832943f66c24cda7669ccde744ecc5ebd6e9efee9427b24e10fafba5f7acba7416f9c4e438c2ae2ab22c4483127b
+DIST github.com%2Fgorilla%2Fhandlers%2F@v%2Fv0.0.0-20150720190736-60c7bfde3e33.mod 35 BLAKE2B 549faba95b001f14aa66c628d300b6b0e496c92cbd87ed5814b4dbddd422df6d5d7a38af10ea061e512df4129189d221bca001f2b23ce7bbd13fa0b7152bbf4b SHA512 b4c8a43e739f69430d5004c01d083be6f65a70301adc0cbe824955a3b7b50dd2b6033fe8db18419390cb577f89533e9b0399a169f1b10ea39fb2f0c0e3cc47a9
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.zip 52079 BLAKE2B c04668f509f8b3bb85f90304bbd60ab871c2dedb9ae91a363e692951d6be27fbca226016aac4dd7eb345face0f8d318fdeb99a68b7f0db6c41759a09aca905b7 SHA512 187e2308e2a487929d71144596f7e0dea1d4e85369eb2ec94e79bfcdd895b3355d0a9ff75f68d0e915f9c45e4140549d1a470f48dbf588a43c472b635c744b28
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
+DIST github.com%2Fgosuri%2Fuitable%2F@v%2Fv0.0.4.mod 33 BLAKE2B 445c2c65e596b5a43fec1c259e7f0a0d16be0b7a4af3f8b294f3aaa5b70b5dfa3bd799f6f9f77fa47dbec93181db36a1d3ea795bde3261e21e3780f083203880 SHA512 c33959643b21f71c73a081ce30fc6a3e3a8dc5a5175046748a9a55bd2171682dc6314f2fe680901271f968279e1389f041b8ccab0c2b6df5584ae6b903208588
+DIST github.com%2Fgosuri%2Fuitable%2F@v%2Fv0.0.4.zip 11560 BLAKE2B 8a1d9e0a149c7a1ae2330a821ea75c8a5f8aaa9102411b16d92068bdc5844261262c2d3f99c872471dfa82ac43b7cf43759ecb44b5a362476fe992e7937eb559 SHA512 e46e4f892794c258ed0ff6e37c3b3f16e794f79f314eeeb327932726921d7fdddbad8cf0fab0dda9641317e754c329934313d094def6e9d5380fbae476e39ca9
+DIST github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod 38 BLAKE2B 1ee03077667437ef310e0e9d77f917474151294d0ae6654596884b28fa847c4be1fc994e4a2dd00d4551d5a4550e14edf1757f5061c44b527cff91353944b989 SHA512 5500094712db06267cf0d437e774bb1b4df9affcebd73ac218259f089f035df59c7ef38e6f36197014acbe1c8b08806734cd27c85a4bc86cd62fd9196d7f5b3a
+DIST github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.zip 20646 BLAKE2B 9a92c4a9908648db90f4cc1de9fc1589718d1c30bc673c6eb194c9c1d69ce8844e06e6662c61debd6eaf9885f502887c8518c820c34a7963f946a332ba6a04aa SHA512 d1e689bf8336bf6354f35a73deeda6aa22d80320f09b86adcdee153c015aabfe86232eb3efc28512c23c26e6761f9d3b3ea3319d2dc1a052e321cc76b5c59313
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE2B 9e5de5c147fb3f100119fc7c290e9790af57892762b7ea8b2a8328c397432466ba56ee20b64ced6dc548d58bf8ef0ecb2e62a51de2524f90a0ff39921d0f2a3f SHA512 c9e15e4a4436ffdedfe5ece51858a45806d6fd77d2306c35eb986a866a3da5bec0d5d06ddba55a05ca45c8c29a51bc7c58150849b5dbde569a6810012f3ace4e
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
+DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
+DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.mod 42 BLAKE2B adaf8e14cd6696bc97bedcada70988d2508d8bf28e94a8b528067359665aac351ec7b7f38ca1a89ceb0c18c3c7935e30af4df20102563c9372b34b0cf54d41bb SHA512 da70feb8b6a17512c3761ce6f13653ea47bfcb4af69b471a3bfde9b79901d0f24ede05c10d35f3e051df54e1e636a848be5d00194ef5e9b85bf7915d6b27dd0e
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod 87 BLAKE2B 34587a565b583aac6338d7d23b4e7c2ce12deb6700e00bec711d3d8d829ef1ae356eb1b28873d5bc2a0d6ed249dd6095539a1dfd8c177bec32e08d97f4003620 SHA512 d47dfa43806a386eb74b60f692b3bc580997edb9d7feff6633992a5adbf94d102a238e036d828952e204960152c62895288af6f09e2582e8b1408d259fb834c0
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip 19548 BLAKE2B fe48c3db37bc280cf5f36e522f4b13f7daa45768cad11c1148634ce7af618c1c20f568f98ea7193b0be7021fe8a4d209a4a7f1c94be3c05924a36022a57c46b1 SHA512 6927a910a368e1f2b0792989858d25c5a55891082cc38f5907c539a35919916e02872619cbf45ed583c6f6f8e85936a3fa790a161b071dddc922383e983d37ee
+DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331e2648bdef36882414dbf8416884b8fd385b7e926c9b837d317322a433e7312e14c27eb095cbed26a74eec9822f0f063a2d14e753031f632 SHA512 045ed40015294ebd8f7a6df06b418415da8f091d09fb4d34fd70718bbf5ce9f49dca7399dc5649336de3fc83bbbd93e740ad6f62d41ea540fae3b17f349cd66b
+DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod 31 BLAKE2B 7202132cff9b47a4484c61586949dbf7e13622067675cdd09dace3ce2e5b3a37b6fc5275b3bd6dbb0ec6ca0335bb7c9a036cc043b2d8ff1f38bc90ce13041aec SHA512 54a5bbc02b82693a977a4f690314b16d94cf071decddee3a4af2a90398e626ff188bc34ab3517278e7aac4e657f3f3070a020c85274be3750371dfdeee139b23
+DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip 24894 BLAKE2B ab55c48bafc78202f2a0a494c6b00657dd81c078c0a23f797a59049e8ac59bc399f784ff81beb710aabd1d035e7ee3db5a4c90653d6e57dc3b3f0bcbd098fd39 SHA512 b77e39712e985744e277604bbbcd48f32d28ea69eac7a6b6cc0a3f8706e2970ccd5410761784b64eae73a07786cf81c665934c145369317b8b961b503582643a
+DIST github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.2.0.mod 33 BLAKE2B 1001759c50e0b825975577d6b7752503eb891aacc3d3a5642a3f338fa90091ae6de3cc81d2d7270ca7fa0ad40e01cc53bb433dfd079cf419904a1ba910014bef SHA512 3f1f76283ecc9d917de9b7061becf780dff161774eab48319d9094f08f51b7e4d82a4a068fb543ef766ba73d26346de29c6a69ac31e83f43186924aabf5b3bb4
+DIST github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.2.0.zip 23295 BLAKE2B 7509d0d278fb0e01c8a83013382c335d0974007ed7c7637248b1bb161cc75fc9eaa8e89766acca3f11f0749413388ceb07dc11ebe894545cac98726894855928 SHA512 9201c976a637124fda2853aa9963613653165f96d9a6a4d8f100ccadc692686b168355769e643e840c0f3e44944e5ccfefc18c58157f38ab6b8acaf3f4b29953
+DIST github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.1.mod 43 BLAKE2B ea72fa407faa556d4164e25aac2a8093cfdd8efdff6f68f9ebb277ddca3aa7efe0df0f22546a36fe6858c22dc638869cadcde024e32d0a930e0cf12ef5b17c7b SHA512 f6d3531d393904144d7c84cb254becfa2dad42f8695ce32e3f44789abe89d60019f01543936a64ae1728f8d395dd96bace969282e3cd9f8a9eda8085d3d1475d
+DIST github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.1.zip 24521 BLAKE2B 6fbe5fc8d03415b09b19029c9df95e8a3169c4d4181a988167a104b91f81b5d359779c9f3b51e71dbea191c8f4bdd70fa11d0f47235a10056725f0a6c97303e3 SHA512 20e6207e6ab0e5bd23e4e496c19573345228e0abc804db1a17dab11dfc2c9926200fba671292a63f09b88b91905d867d817506a7bda25c261b3c4002cab9e961
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.zip 26261 BLAKE2B 65c5f6b4f0e2af1076e279c5d3f61f7d6b8654b8a7537aa291693a784886dc68da0c40b480d881c41bc46ffb28364b90d22d88b17cd82ac8380d5ecd9777414c SHA512 448dfe08b2a5f7f2f1e9868274be4dcf7d2f2ae495994d16c74924f8059742204547ef2abfb73428afac3938e5f477a9db51b29bc76fbda32e01b67419af46af
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.zip 28698 BLAKE2B 76fa171ec22419b864bf42855bc0286059dbb93de9e174f8693e132679c762346b1e7ade3616404a20b8b161336d1cb2ccda1c7366a1b8d9e329a82d4c2775f5 SHA512 6dbdd7d3f35f7b6fb1088c28dc1d05bad04fc46d907273acb55e991c708e7b06f5b2db86ae2d6669f0720c3bc95816971ec4b39e897e714344817a83d9ed4583
+DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
+DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip 3712 BLAKE2B f4f79741bb83862583f51f2ac5e80181eb0e9c2a4578df32f7e24eb98f4f548b99333e0e6a377e03ef701057b01e852e6b710ab885b65170c861bef556863da4 SHA512 e16bd414c1df566a12944e4a99ebd84d2103f0cb3bf8ec312e3de400f20b3eae27845db50672801c10474dbf1dc61d0c2e16e5dcd3c4447681c0b77f9114a411
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160803190731-bd40a432e4c7.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip 231432 BLAKE2B 99b12826322d86b39d622bba690286fbc43b9e0336161d5218e6620caac0580fc7b3a021e60047a19815e35a4821d31066bf1ee6ca0e49f7bbfb1df10df21380 SHA512 331f1c4fa97173f022210d15719a9ae8a0dcc1c7574e1f019959070bd8cc3f77e34dba16d78e8d9e0083fee2ac24751aa36d5cdc0b2d1303a5118156ea514b7f
+DIST github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.0.mod 145 BLAKE2B f260c703eec27a229b5bf30176cfdd57dace844cf14b184d9289cf197092ce4bb5d4c878dfaa54bbe3ce23e9c28eeb35b94376001f4085e2f05d3c977b48d4c7 SHA512 b529b6f0312bf2be99646e11a339a97885716f44408714cf2c4343d5c5cf114dfe454fdfe75e9d5ddd9e0ce8c3ba451ba0d3729eb27616246c0bb72aae6d29c5
+DIST github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.0.zip 60383 BLAKE2B f114ffe3ef1bf6e7090ab57c4ea9591682fcad6d150b3d235534b4186580e3f66f5b4244fa47e8d62b9cb1a317bdf558962512a6c562858a1a0d2570bcdc97c1 SHA512 ec6e5e98ea9d968c27878fe0da8b7a566920202eabc53607e91c06e1bccf6044bb33d890d2c5c7c03ca2051ee1b0b28c043c77acdafbfa1ffbc232569634ed6b
+DIST github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod 32 BLAKE2B 108af2b21e180487fb535381cee881222cd34895f1b3d78561bee6bdfee40e7b9681c74345d10881fbe519fc496181b85eb880b5ec411e13b24926a39ae8a512 SHA512 5b3e66c42da78c7df031089cc05aabe56671eeda4617683a1e9857677108cd0dec00332f5b05f29923b1314fa1d1c88e57fac1b653808cadf5a3cde93daab03e
+DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod 38 BLAKE2B 091e824ab9156af7978fe3aa6f61ae046588510903cf635ec166225395e40df6a1c715e4eb3c47aee849435eca3cc10db971a7c28acdae233eda85a4408c7520 SHA512 377d94cf7dd50f88b57ba829ded5169a6c41c5a304814660df0a3447d10860b87855f25cdb945a6e4de14c41281651330d4109c6dd6684c86fa4dbba27a3872d
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip 133805 BLAKE2B e9a015f12e82e7258f4995a093cb3c710c2ada1bcd4d0e5fd70fa00b7917753c41ff23fd4ef5cd30615024791526a053c623c28b4cc3b2d304d17960b35dedeb SHA512 2ed727a07740077cf749c197615814b52511614129d15e4e4f7f04a70fdea7edb8a55522d33a9e7a29595d3c41170f7a912a7acd9fe88c6c8215df721d4d87f5
+DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c
+DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
+DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
+DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod 143 BLAKE2B 128f8934f81d0e497e1258ec65129fe5d8831b66058669a5aef3fdb2fbe5f6d8ab30bfe97a1de7befadd34aafd55d6d15bb787e8948fb7718761392817203874 SHA512 c5e546822036a7114a29454e28290f8e1082392a47a101fb1d370e0969fc2c83186b4487473f903dd638abb8a763ce3180dc87993906895a2df33db7d8bc4790
+DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod 98 BLAKE2B b9d3c55999054ed927f666a43066ccc6758a6c5f550651f43ad5d85b5403c882ee76ac2b2553803d71789da33c60ea41857ed545003072ab6c666dbb77118e00 SHA512 3529b37d770af511a716a612b7fd7fb6a4805d13166e3a6f9378950443f6eceb2f3d95db5a46027437ce55b36e571c75bba72a03769d21ecdc97888019d80a68
+DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip 3567 BLAKE2B 80b7bf217df9367160180d44c1fab6a9f10154bb9a6455538860158a08c5bf8c794fff973b899b1376e4e65764a9aa0d6b8b162a6d9ebe1adb1368b9a2a42786 SHA512 27910ae03fc9fbf573ac31454635c43bfd771d2a91325eca544f7be0e24b43c2798ed8e74b4c31e8c20c1a9cd266b835017aea3a3e24c2ecb43a14a6143af8e1
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip 3968 BLAKE2B 223cfe3604cb674a11d4558b8f5a35e2eb41cf11d536e2e2cbdccd6a3c6bed8abf66f450774b39e7247493ea8a382906617c5f297fda02a272b18eef8dcbcf47 SHA512 16c4bf83b78541d2d684113926813ce4cc91f3f13f34dc2cf8d643661dc9f21a988b8382d2c058e138fc87c1ca197e8f694b07595959e917c82bd6ca9101a5ec
+DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod 28 BLAKE2B fddd4b3cdef60f53bc3f8da5a3154d10b49dd180c12837d3740c22b442947cba2025649f3ac7321bcf0c73a272527659b0ccd9be141ddca13caa7594bf6ad3fe SHA512 3c623d077e39697506174a50c0380cb7787a05a52819b1a73c2f64ba8dd819fd500777de83c83d8d9e80f19c828128a569b4cd783667b4d6b9a375b0e3d527a7
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df153e027f22be7d28eefbea1c0adab10979f19d601b95d300c54086b5ee388f453c73b9931339b9b04208fc5e6512385b348c49faff5488 SHA512 bad73f3c47f70de55a90a977a1e2b4a68de545a8425c71533de081c7a8f71d7ab1b489001c56ba2e88dcb78c08804275f7f8128c812f50d005a074ed6dd9286f
+DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
+DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.5.mod 34 BLAKE2B 1365a1cf7687e1b4d333eadaf4871aa7a00c98f5d235453d7e4e000b51127ab036d4b20866f46343338aa79acaf71dcd8c847aa0b1568e7df9cefdc05b33f009 SHA512 ac5a145ff4464a083cec55891b85876ba0280c7115e5be9b70b3300311515260d9e03a94faedcd8eab5a7a2de838448af1a810c0e9f01cb8521582dafc10d78d
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
+DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod 46 BLAKE2B 1989fd1b186328abc02f8dcd503bf396ee63b55630d3f37f576c7e55b4c48623f62d5f2b16d047afeaa13cd423ab014f254df5f210da52535bb8818a60b375d4 SHA512 4fcffc595708aba2673e895182e695e91d6d239f8feaaaeaf15d75fcff398112af0f0d5ebdb28506d95eae30533dcbb54112ac0b0a4034ee11d7a35b78674915
+DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.zip 25634 BLAKE2B a236740e22b6dcadaf27ea0f90a68c15bed68599ef6cb086acfb1c555a8c0210663f165f3bc64bd9cfc20f3b8a9f1c5828a4a658699d3bda97104f759aef78b4 SHA512 a5ffd5713ddc3d9bd49ee9cbb0a8f5154bcf0eb073c9a772c24a6e11e824b2deee18425347f84b267192c52f3559086573e966fdd8e73e84fcee03c1971e1b7f
+DIST github.com%2Flann%2Fbuilder%2F@v%2Fv0.0.0-20180802200727-47ae307949d0.mod 31 BLAKE2B cdb721a4d4b33e518da7944f9cb1fe048bb7d126645e5031ebc7907085bd791393749b3d26d955047219d7dd54242c9916b5a73b1395501bb676fed7489376b2 SHA512 3e38fa21095d46b366bb05100da27f52e5e8c5b67352f766b2b0ff91a5a0a93da59c35e8782fa98a1933ce43a780fade4609a8f824d4d742d6aeb56cf3d3bba3
+DIST github.com%2Flann%2Fbuilder%2F@v%2Fv0.0.0-20180802200727-47ae307949d0.zip 8136 BLAKE2B fb4e06acd3e985ab706227f7453e106071687adb422b2ee3dca4b8e7015dfa154a3cd13a5bf7c1f559abc46c5938ae199683e13197598e3f0c02a3939a001e2c SHA512 2070df4becfdd6c15b72fea268c0067591995c231abfe3016e2813a8b9f819da77bc214ba6ace8deff8c0e966402b2a9965bf6c1de9cab4ca57b6159f94cd9a1
+DIST github.com%2Flann%2Fps%2F@v%2Fv0.0.0-20150810152359-62de8c46ede0.mod 26 BLAKE2B 572d6a985e99bbccf2caf7782f8722c684a97157a13120438f6ef5f69222437cfce96eb45b77220b3cd7581137bc3739d200894308a0b0e013399f926a85c65b SHA512 f07dfdcd383aef5dab1c83cd8373a0a6b34e73a34f13f74153ec52032e8a3e5edd425110d81c63107901da57597228aba9df744fbfa289264a84794cd80eeb07
+DIST github.com%2Flann%2Fps%2F@v%2Fv0.0.0-20150810152359-62de8c46ede0.zip 7157 BLAKE2B 914975b5aaddf896cbe00547422fc3698665fdb8c50baf1a8f0f244f908f25d0fdedf4769aacdfb9b662180bc4365e09ac9117525d10bb039bfbe83de86df293 SHA512 be7bb138627087e0070b260c37d4ba7dc4448cb55ef8f610af35b067568b4b305e32141b0c73687b04fd5cbac508e6b3ba11f6ef60063ce563a03da5dcd70ef3
+DIST github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
+DIST github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
+DIST github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
+DIST github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.zip 114746 BLAKE2B 19f9157f1a163b5dfd9e5a2b09d92873c8ac191aade266d1706aff1624f3bb0d87fe7cfe0c00c4c02a7cb649a98d931d1f95ab547961778117b61909982d0231 SHA512 3da4292db7b32b1422a7c85497cd4f8e27b532dbd7570e41b17f9388f9377912cd9c8fc6c205bc504f652f7b3c6945ea21f125c14c5bde97dd4a629e327ef516
+DIST github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.mod 36 BLAKE2B 16dded88c0f04a1444be329ce01bc4e336b1205b962021589dd7f8d999285da6517a4a332f585e129250cbf7387157e713f0a6703dc0b316c4581e7782dc199f SHA512 7c71255a224e45b30037823ae51ac2805b91238b6e9e5cfe295d822428af95760718e2c955f15ad672011d317516657a568b412dc2e184f068d1bc18c2eaca47
+DIST github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.zip 14370 BLAKE2B f420806544c85e8956e5588873c10e604c75f6a830510a1e163fc278ce802de4b444a15b01522249749abd4ae77510cee97eb7f4e391e22c9f4469bc705a97e7 SHA512 b535bf7bba884b24e7a97c82b12a48954a4b5b7510c3383d37bdee5963457d3122ed648f91432f9259e6606927fc2e9fedd56902ec20223c8478c2a0650b3b8c
+DIST github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.mod 35 BLAKE2B 9177d5e73b349b57f364f3bd14e835a38cb33ae37d914454aafca908004c23c3902eebd21e9841f93b9728dc40d061a78aaca599e1edc1df0c941fdc1e972791 SHA512 f91dfedfb737f905f20c50323be91dc990ef172727da91efea0fbf25de48f1f4fa8e288032ecd89af0fea177b905be7986ebd1cdc7e64853fe7fbcef8fee436f
+DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.2.mod 98 BLAKE2B 074cd6d5ef6f25ec043afc4f23272f5fad1d7bf100e75122f85c49ee93fc3c6205c72a1e5b4227ca45f3267be1b2001e743b51e54ca5f11302c2610e93630858 SHA512 f7ddb2f6ef35b65ae4a9106e31cbbbd08a7d011d3d9d5827445bf35ec0243041c3e4881a850161134d62ff822610d3aeeab2941472dc7ff0d664edabf2ec4eb9
+DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.2.zip 442733 BLAKE2B 17af8168c2253f09f1ff15c5d78359bd8449c84027b10594eb5878fbba0ed2ecb250b34809693ab75869ab02d7677f874029e85ed352295896f9658293ecf4ea SHA512 b1515c6fce781a653025c41ef164ca2a625879b2f7ba1349c470cb9afab9b92b173a89513bf601ef7dcf53e0665010a12d44311f75c9282c244d58a154af781b
+DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
+DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
+DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.zip 39235 BLAKE2B 29ca5b93a76a4547abfb2c237f832e7545f8b6f74c842644ed3d9f8f56ce6d388eda0c62162d9338dddb827dd09962e1d28ab551461f07fc0801899d6035b8af SHA512 b5d30c117750cd3fc87121787792c3575d53404b66e8095d1d6913488b0271c8372b0e17001ea320b5512987ad68e78479664a40c25f07e9f783fd54f7d562c7
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180823135443-60711f1a8329.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.mod 43 BLAKE2B 52ec55a10810ebe4083ca01c7a10daec67e5e9e370d24ae3a0140ab40801bd9b18fd09cee4f306c891b60c83049497bfc69ebc12420663fb5f6b39426002d759 SHA512 0b54c4dc34e54f09c3d9d4b63a4d6a22736250aa3caf1526220c11473f4bfb5b589fc1fe4cfd9d59d1a7c2f8cb60b3407353d41f9b31389200a96939cb95d925
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.zip 68804 BLAKE2B 1949c9647b1c50741905b2634f5798f57e666df93a6a588b36dc567c4370e5dcc8b6a281780f178de7b6d9e1bcaafda46844605d7cc53c2f3cdee7ed9e6720f8 SHA512 804570fa87fb574d4942c649c00941da987498834951b5fc6bca367f3c17fcddb714656a178daa46ad88087caf97243a6d2c6d1b3392b36f4c72b2b1d2f25b7a
+DIST github.com%2Fmarstr%2Fguid%2F@v%2Fv1.1.0.mod 30 BLAKE2B 672d0e9f9aaf18bd8da762725652827a96008d49cf50ac4c7a9776d884b15dd92a7738f49ce870b53c9136976487ea8b64a31f9b689615e16327b76a22ae605a SHA512 65984a32ddd3eea6fe699c2e636cc2368a11059756fd1f711ecb20930ac5a9bdabae5735e9d4ef829bc4312219bde9f2907dfc7864dc53c2a580fca3f8b7b39c
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip 12838 BLAKE2B 668586a4df02fa2d5db174a4ada1245a463946d4bccdef2599b791414af4f10eb07f56c61484977eeb21499db7f9b46f8fea03feebbaae5511504c13e3f7a64d SHA512 c3104e921a94b1a424cbf6936e8e5cdf5823947132f41190c211e050c9c8b7135c7b319eee0667a2b958c9f4fda27b9cbad4436d37b512e269716249dbfbef65
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod 104 BLAKE2B b8d6df41ff2e8952e12f0518d455969d7a496b8318052ca37ffabc663d9602b9df70385274818af8bf1b50e70a44ade59b0436133e08818ceb385d34a3b44c03 SHA512 218110264da1c7396295627414259fcc65cc9823216d6c03f2a6d7499e17205e540821add3216ba673efda92f1e5bfbb817416874fc745ed1d926c43fdd9bc99
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip 8885 BLAKE2B a9d15d5bb4264391abb906ef4b8ec929ecf61d0bbc781ad37aa36e236cf92f5a97f2035c0c08bb49c85142df10ba129c4c1755ede5bc8ec71743300f60af3d47 SHA512 4430b33d70f0fe35d07aefd6320ca0d8e49b71689d93b49e021e1893f8f9f043f8a6d16705e5517a600a538b3f35fed8f14a69a985b2955e8b6f34c19605c83f
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.5.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip 20005 BLAKE2B c0f71323efd262296b78867d2b387a74491cfae3f4498e0dd22c036b20dd6fc1b6569171eebf267effd140ec009527fa5ccbcedda4f8cebab2679582766331ea SHA512 fad08292597cbd4a359e06f85bc7cc37b3d3d84b8046e47828259e36872063069c4ab17b7c89f2a5de4b5d0ab1ca5cc66cc515847a7887339a3a04b5f44e3c92
+DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.10.mod 47 BLAKE2B 4a848f4f2e5cc615dfc3fc62a9523eb7b3d79244393ce8203978051a34f981b0219f13f10bbae5169e03d919404f0ed6502b39c536218f8c8c8a5492561c1112 SHA512 c1a6d910b914ceef7ffea53c61f2225ebffeba2fc87c290aebdb739bf520494e35fef046eb9ced4fc9a3767523efefcce41ef5026fe11bad97c005b8e55d96f8
+DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.9.mod 47 BLAKE2B 4a848f4f2e5cc615dfc3fc62a9523eb7b3d79244393ce8203978051a34f981b0219f13f10bbae5169e03d919404f0ed6502b39c536218f8c8c8a5492561c1112 SHA512 c1a6d910b914ceef7ffea53c61f2225ebffeba2fc87c290aebdb739bf520494e35fef046eb9ced4fc9a3767523efefcce41ef5026fe11bad97c005b8e55d96f8
+DIST github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.12.0.mod 35 BLAKE2B dfade1d4d17af2380cb103ad9a0c91ce0eb7e570f9ab98d32c8d74a9056b1ba89c44c6fbceb4a2d5e5d45bb552a18e5845b1c40d8d1efbe5a9aa87e4af0ae2cd SHA512 c929334b82e3174b98a22bcc58dffd1291e3bcea6c5f789ab36296353cafe0b09640ba7015ff559acdaef58a9212b0367bada54aa89f563c6dd4773f3220c04e
+DIST github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.9.0.mod 35 BLAKE2B dfade1d4d17af2380cb103ad9a0c91ce0eb7e570f9ab98d32c8d74a9056b1ba89c44c6fbceb4a2d5e5d45bb552a18e5845b1c40d8d1efbe5a9aa87e4af0ae2cd SHA512 c929334b82e3174b98a22bcc58dffd1291e3bcea6c5f789ab36296353cafe0b09640ba7015ff559acdaef58a9212b0367bada54aa89f563c6dd4773f3220c04e
+DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 BLAKE2B 50d2d6dc9c1ee92d629af8c9aae9fe5f70a0c6fe270a95a8232cee3c50132ef90c68218ac64a3b5b72d94e23ecbea5f567fef39a81be3d4585bae3f4f5348545 SHA512 5235188477921a263176fefaffccdaca4bf8175a2e248356a06596e37fa868400203172c7fe9fb80d0a65d335d23d80edefd242657de0eb83d9360589e063bba
+DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip 44378 BLAKE2B 15ccda2b94bb024656859fb8a6968782b9a1bffb786b0b1ed69a3284b01f4a2100b3f3c46b6ebcb8f7febedb5bd4f6762fe333b7d4f1d14c700f8fce60843352 SHA512 e9349ee2a7d5e5b129ec6a1c0507854aebca82cf9ac2d0a681cac2f4630ea35551ede48e1931494362232a83dc9f26b6b4162c6114e0176084c50101b1da46b0
+DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod 416 BLAKE2B 845f9f6d79c8b18d4a070255eb93aac9afc50ad01593fc5c6076c59e4b5c09f34856b29ab24809a67fd10ffc5cc28908faff8358a52cc8885947c53622d6090d SHA512 7cbcae5e1749c55a0c3fa25b007035c0c44c8f982a37635735afb95c63a20ba019a51e74244c568a170b5a379ccb10cc8c9df716b6261d324755ea92c7f462f4
+DIST github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod 91 BLAKE2B 22854387f9c0bc85c6f4b7b9c5ce8a774c10c6be0c43ec6d188b6ff2f2e394ffdedcdd1bc0b8ba0e31fa3c418cc9339a78a798beeb355032a0724b284573c38a SHA512 8858ec62f3bcef65224ee7d66bbc16c080b2ed16609c46c5c6b6d983b9f7eef9e020a2ae78a16d0226c0f02c609ec5da92565861c02a81494cd6060dd56d005b
+DIST github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip 11210 BLAKE2B a469026ecf6a1ee2f2d56091fd90f00857cf5e57164ead9e53c15af03d10a8b737a1d2b2fc336e3e972af014dacf8f1321ee1fa1cc9dab93790fb6d03ae195ed SHA512 30b1a531823403a911d9f877352218890bbea15d82390b4561ebaa4bab09f493d49181ea5c34078c18df31b1896165e80c4862b450ef5858ed8af55b2a0c42eb
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 4163 BLAKE2B 7e00360086a04fb62a46ba20a10ac3460b364aa6ee09bf46f9769980c086db04aad45c4cbaa809a218f207c086876678d708a74d0a7679a48cf62b0b5edd48b7 SHA512 06bd620730c303df004e1d6a06a1aab8d83551d594c28e42f8d43613153ac28e6a5dcffaede69c84b2b49027b62581851a332f1397a2d6df9a46078510f7d1e2
+DIST github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod 40 BLAKE2B 089a3d8f85648feb04c692c4e108e1e843217ef67fb3d5c00ffec847c06eeae55a9432c206753cb220595441da76b635f33a9812ca92f04959b4e7dd08644abb SHA512 e8e4f318e3cc6d203ccc62c0b47af2aebee3fb99680cd6bd24af023442154ffa9c3d4bcf9064af5220f01d3cee71e7c600e465e3651ae0d7d15e2abee1caed27
+DIST github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.zip 3587 BLAKE2B afcc45c660601467eb2d23942c845c71f5e61277308f9ed56fd86794f2577f9c61f0fe00b6d04d348e16e94616484cc4156ca2cd017eb25dcb5e985958a47cad SHA512 d08d8446d425286a94cdef1eaf227eb61d942e95499c5d4b5dc83b5e0b7a9a50eab2734016a8f57414acb8db8ca159b55900159f6c6ca67a51bee10c3a2d4356
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
+DIST github.com%2Fmitchellh%2Fosext%2F@v%2Fv0.0.0-20151018003038-5e2d6d41470f.mod 34 BLAKE2B 420449db437a4343e47d666ed912d5c57298ec80d13265f293c3a2294624cdbbce9fa319e47ee530da73bdc06d48d80b4a590a03fa1d741f089ab302cadf071d SHA512 ded99f470ac6900d2627d6cefffc4adcd64946cc036657a805f90145aa83fe05478df9eb994059cd8d9613c75f3009221ab0405bcf7e14b00d5d950e09f3e354
+DIST github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod 40 BLAKE2B 82487f50b9cfb3e87f2500b992a68361ad1971106763efb2ae4833e3a0505d6131b87aad4f994d203123b8fde60d5799afe67704ae72d36b3b4e85240ace49a6 SHA512 e7ba1cdb05cc6f30a57cdbfd08d55766cdad89875e4db393c304c5004d8907d07952b9b7f542bdec1c8b2f722fbc5d2283a8ff9cae53b6da0f3b075b8d05f60f
+DIST github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.zip 7647 BLAKE2B c7fede2886d6150a3e79d73526fc48df4922ebedadfbadb70c4b994d58626b0c7121beeeed6c7d83c1da0d2b98e7e31e7aa46d78638ce2ca834fd84a2a4da9d9 SHA512 41f5065474e14b5df4a5c9752c61231a1d330cb1c1448b3b7a4fdf5971e5511f7445361ad008a5ac7ac5f37633cfc490d7e64e605fd3a306018001e92cedf3b0
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip 10936 BLAKE2B b045256d37d4973e88d0d9c6dbad7397160ddd7b3102ea8420f92be2e8c3ebf6362f350eff10b52fc7fb447d98b00f07c2bc1da3f6e442ebdb8e90103492c8c5 SHA512 e7986e7dfb362e346309cf77ee3969c2881056959e34db07d2dfa0e505106844b7424270d8f17f1a89d335071688e98b992ac81e8ffe0c98c8a0e3d145144d4c
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip 25694 BLAKE2B 59d0a645e3fc29e94a04fbed5329cfaf2162f5779f1c13bfe96c9d979c7acd1b356587b6e30760568607ea15d2088a76bb58e4504e17abf360f2702eb6e8c3c8 SHA512 8fb62179a48e212b74f0e8af79ee1c20479b1725c089c75a12b43bf4936caaf87d42b35f2b7a7de87c60e793347bb185486beb8061e588b8085ac354a3ef8562
+DIST github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod 31 BLAKE2B 5b5d97cb4685ef921770276b81b0bab6f0acc362b49544e23c228fa4e26c3ff712b58e61815616fafc19233d3cfac47b05e9d55d926b2559137ad4e7d734e113 SHA512 f868673a9af26c1735e257c840e1f9f5de035ebdf3814f8568af504af6f3d94284e050f49e96670a5643804760db2ee8e50d396f6d6c1d17c94258695ef41748
+DIST github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip 56868 BLAKE2B 7795586966a72a5107b680b7e5b051a516cc0aa60cd1519bf0dffaf264ca5fcc768544438aa1bff2a2c5a3a5bdd92507f921357d80e4033590afda4ebaf536ed SHA512 22d3534c0e6d6507671e02f1da00eaeb7245497b4ff626ae7967d6b2dd4c9675ec16ebd20d4eb16ce98aaf831e93d207bd7a3331e8ed7411e9ffc71c574dfe67
+DIST github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod 36 BLAKE2B 636b2a1011ff647b1597c535916bdde712e45585b9be3e90191d474e88e293df5b30e2e15adbd2f6d631a57ac81b59b02055b439390664fbc8a8e224cfc51e39 SHA512 7873fe200c30b46285fa8a001345428db580c67cf634c1b1e4aef6a4a82d7b975545b827d00b1a3dad86b2f3f7681df739915f95144d4d3a3553f055fa70781a
+DIST github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20191010083416-a7dc8b61c822.mod 36 BLAKE2B 636b2a1011ff647b1597c535916bdde712e45585b9be3e90191d474e88e293df5b30e2e15adbd2f6d631a57ac81b59b02055b439390664fbc8a8e224cfc51e39 SHA512 7873fe200c30b46285fa8a001345428db580c67cf634c1b1e4aef6a4a82d7b975545b827d00b1a3dad86b2f3f7681df739915f95144d4d3a3553f055fa70781a
+DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
+DIST github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod 34 BLAKE2B 315fe4d5620c1d1c92df3fd382560ac2cf164aa17a741c1a74fc25807819de811705467227923fee7f804c6b6e96606c87b4adb11a6b722f367b543c2792cda0 SHA512 b1c163d7a6a139eeee1457fa07933f01eaf6d2ff24d10385e75f87b443a95fe1b08e9e144d3c18eb6a77d34e8521cc6dbd486fefe908e60452c5a80f654c551a
+DIST github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.mod 28 BLAKE2B 57fb6c274af3e1f296bbb2c4b81cf52ecd31af71afac9be2f77ca58c67831ecac4eb2f4f8819c510f3e2982d9a5ffdfbb5f384db878b37b531e59e06e0093a31 SHA512 2f4794d0c8dfff16f1fa252eb5e3396e2cc5479c96b5e4af9ec01931387790e51273d4a308fb2813a699a54a3cbf6b3adb5e92d831d3032120cb5f19698bfd19
+DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod 29 BLAKE2B f74d75a495f683f4e9047201721611229ecddc37ed01b5d4b5d81a06220a6385f06d0f99e514bf19cc2030fbdba6de3a08fd38b750e6651a822b10bf69c45327 SHA512 b426d975637bd2b4dddc10d7c88b70f8b946201f311859f22520d53ae0a2d9911ab358460c089771f7900d7a8740bbc0c6d3814ab8f955108fc31b7b602ab5cf
+DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod 41 BLAKE2B a8e979ec93d507fe82beeb327f4747a7dc9ef7068b14afe9d08ac1e8241c5681d53bd5c1751781948e07d41831eb133ee850e30ce651728686a75fdb66b6e1a5 SHA512 446f9405f9004b40cfa355b9d93f279e2f74fe9157a868e5d8253b7c563fd58c0c2f7b393960eb1693e5be2ee6e9cfd7f5213adb0bc7f85559928ee9dda6da02
+DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.1.mod 41 BLAKE2B a8e979ec93d507fe82beeb327f4747a7dc9ef7068b14afe9d08ac1e8241c5681d53bd5c1751781948e07d41831eb133ee850e30ce651728686a75fdb66b6e1a5 SHA512 446f9405f9004b40cfa355b9d93f279e2f74fe9157a868e5d8253b7c563fd58c0c2f7b393960eb1693e5be2ee6e9cfd7f5213adb0bc7f85559928ee9dda6da02
+DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.2.mod 143 BLAKE2B 2093eab853838f64e707b38726d449ed964c84e930a04a57f4e0da17990879e813eddd47490ebc320a0e3e63f066bd171d34280217e363368addb858d5ce66a1 SHA512 2c7ca93aa590a599d4ca5b47238459e84013ca40b9bc25f95ebede9f68f1592b785716341e8a3315a0674310e547cb747c8247e67ec4d3408d1ab0ba1c0ade74
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip 245650 BLAKE2B f917c3c8b6076add4a4cb59fcb1561b21785e9c7cd910c96f7decaeaf4f2c988566ef656925cf91842cb4218142d13f0487721c23dfd85bbdce1f847e12f1551 SHA512 bad04a31aa648777f437f3a7516549992962ef1c660694c02aee62508540c553a2ea36370b917d29a8e4510cc171d94590721c447e8878b562f55a7b0ca78f23
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod 30 BLAKE2B b8bfc20c2ecd93e4a49b1feb791a29d894d57325b04e5f36fde625431886515b2e1de0d11a384fb8138e28a131a027088c7173ffc7f8731f9f352ff521977ac0 SHA512 47de77b79abbc314a3e8c90f8d69f51fc9e99ff160a49cf6e87621183f7acdfa2dc5911877ec45111081426a4c0a6f0da55ce0491e95064a8bd416db33f25624
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.zip 157659 BLAKE2B 2e4a53ddeea8a6076af3dbc356f34d898c0189871a6328f00f0690479ca34d2efdb670a3c0a67c19a4d34684f25145d4bda7ea9a9cee1e26cc6d941a274ecbb9 SHA512 279292e468d786f0f94b627b00b7eda5049dfa9be7423ed5c26e80fc2c020787f5feceb7571654d903787089c0fba05f49539eed958f97238065924d6eccc003
+DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20170106003457-a6d0ee40d420.mod 43 BLAKE2B 42ef42def0f24844eed6bfc710d0c5070a2bee3a4f5aa8b0ec68f862840385f035fdf6b7206d7e15a94ca419af29f7fc86358aa6fdd1a014f71f5acbebc4c182 SHA512 2fcb2cf84eb579794ba81bc9f79090999b3fded538a1649fee55d1e973425a775dcfba008a11ec1ba873bfbd3c2ce13abcd99fcbd9b0ca67fd35925896bca588
+DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20180430190053-c9281466c8b2.mod 43 BLAKE2B 42ef42def0f24844eed6bfc710d0c5070a2bee3a4f5aa8b0ec68f862840385f035fdf6b7206d7e15a94ca419af29f7fc86358aa6fdd1a014f71f5acbebc4c182 SHA512 2fcb2cf84eb579794ba81bc9f79090999b3fded538a1649fee55d1e973425a775dcfba008a11ec1ba873bfbd3c2ce13abcd99fcbd9b0ca67fd35925896bca588
+DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod 43 BLAKE2B 42ef42def0f24844eed6bfc710d0c5070a2bee3a4f5aa8b0ec68f862840385f035fdf6b7206d7e15a94ca419af29f7fc86358aa6fdd1a014f71f5acbebc4c182 SHA512 2fcb2cf84eb579794ba81bc9f79090999b3fded538a1649fee55d1e973425a775dcfba008a11ec1ba873bfbd3c2ce13abcd99fcbd9b0ca67fd35925896bca588
+DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.zip 27125 BLAKE2B ace23a65113f48afafaf52d19231b51238dba82a08a85dc615a0037b037530f3fa3bba1af1ad885eed9ca453aeaa0e2585d2f1b94cecdccccf2e32d36a86f11b SHA512 95dd5f43096dcde7c21338e393977b2d8ff3389b9c9b24ffc11df2cffc73b26f3f16a6406b10281add7d6d952ce2276639ba94929491be7792a2cb8f40746bee
+DIST github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.0.mod 44 BLAKE2B e60ef6b775d320cbbd7d0d655e4a0d855f79c0f563ff3aaf0cf0a13485005c800680cb95535d57342c6f23a69da021089f7cb4d3caa3021852e1462126137887 SHA512 e7d3276e531b754a441e94acc632d7322837cc2320ced66e3e91e3512164ff84428a4665493bb3a7cf7e1057e82097bc54d0b811738b1e967b9c248b907d777b
+DIST github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod 44 BLAKE2B e60ef6b775d320cbbd7d0d655e4a0d855f79c0f563ff3aaf0cf0a13485005c800680cb95535d57342c6f23a69da021089f7cb4d3caa3021852e1462126137887 SHA512 e7d3276e531b754a441e94acc632d7322837cc2320ced66e3e91e3512164ff84428a4665493bb3a7cf7e1057e82097bc54d0b811738b1e967b9c248b907d777b
+DIST github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip 170576 BLAKE2B 52c16c643c1e621cb967bfcfa1e1209b564dd81bbf1b0427cd5c02b85160c444fcbe2ad9563bd491f040df2c4c6b9cc35f6ec83f671fc00e3cd5f40c8ca3af25 SHA512 04aa87f93002428f1ab79190ea584b23363126390dbdd6c05064646e7c5c3710da712b730f8da194bd83c7b95f260eb1773fd8c1c9daa9f41891a765e6a21742
+DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.0.0-20190115041553-12f6a991201f.mod 38 BLAKE2B 3b83f93aa086dfd3028fedf54552dacb3d904867e62704526f679f2f0da0df8cbc73ffaa4e0164718c850d638d4a4d3d9d036be176be94b430d13da25e19217c SHA512 9aa2622003271b0763bcf11c8c7e39d5a5259deb17b7463451ceb13a9fd46a8786ea9a31936e22919ac8b871458952224687fef8dc87286ea25294945371c9f6
+DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.1.1.mod 38 BLAKE2B 3b83f93aa086dfd3028fedf54552dacb3d904867e62704526f679f2f0da0df8cbc73ffaa4e0164718c850d638d4a4d3d9d036be176be94b430d13da25e19217c SHA512 9aa2622003271b0763bcf11c8c7e39d5a5259deb17b7463451ceb13a9fd46a8786ea9a31936e22919ac8b871458952224687fef8dc87286ea25294945371c9f6
+DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.1.1.zip 694339 BLAKE2B da9cfa292adc9167553fd21003e400688b39685e2cf12fee1742d2c35356ca8834d894572085eb53a98648fed8008dbf0f6a10652f32e75e17f75634c1b22e59 SHA512 021fc09bba8907755a610acd87f9f345caa55c865b631e57d53c82d9ebd65a437844203d84bfb2f10c884a61fe507a41d299a13e3cb213eedee7f328d41d0859
+DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv0.1.2-0.20190507144316-5b71a03e2700.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
+DIST github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod 47 BLAKE2B 0eda9805fe0e1acdcc1e7b2693e72e39ea416cf57a108b1847491e1f15f8a7965c8aaa77baad1ae6148f39d36b1fc5fcf159b54111bee0d20bf2fe8edfdf85e2 SHA512 4e53e67b276ea3fe8a3977bbe72758bb2f844e22cdc3e23994176821cea51b10f5e802ca3db848a8b3d00a146c133a89271ee76158c478683b393682806400de
+DIST github.com%2Fopenfaas%2Ffaas%2F@v%2Fv0.0.0-20200207215241-6afae214e3ec.mod 32 BLAKE2B 5a5f8038da44497e335f7bcc532d7228fc3e44e8f8305368eaee9d53366cdee09b6a7088b2562fabbf2f5f9fbe655f1660a06026c56f4b76b733374d3b44f688 SHA512 e2f8e280fac8e6e35ae738003137a8410ca12da482437b835de3679f2366fa26296d81503058a92a2b3e03fbacaad68c7d60eb091b28d6b9af23788cb9d3dfe4
+DIST github.com%2Fopenfaas%2Ffaas%2F@v%2Fv0.0.0-20200207215241-6afae214e3ec.zip 2916442 BLAKE2B 65181ed9a545fac36ffe24bcdbf01f40a46631ac22696aa78597e3c1b30d2e5a6e593237811b527dd5d9f541eed37026f51f5a89a6acf99c8c1562a4c6fde3a6 SHA512 d9cee2f7d7f8972b710435bc19490cccbd326bd14b833c995f14be9060270848cc5fe3b4b943f7faab43c252fbecbb4cd41c5a9d52aa7c3fc28c6dd6704f6207
+DIST github.com%2Fopenfaas%2Ffaas-cli%2F@v%2Fv0.0.0-20200124160744-30b7cec9634c.mod 36 BLAKE2B 2ea0bba525e35959404f18cc9ec7d2b5c388fd77baed8792c5868921a42ae1ccc217d73431c465a2c6f94533d99af53054660503cd868ffd82fa23178c124b06 SHA512 3f80c76f844dbf54f35fe05a38bf529cc7a35ec8de115359de55632ef442ccaf5b3c1c9965f5b071962997864aefe53edd6dfc4e48c1578700c23b1e8daffcaa
+DIST github.com%2Fopenfaas%2Ffaas-cli%2F@v%2Fv0.0.0-20200124160744-30b7cec9634c.zip 224735 BLAKE2B 3f5a41c19a8d5e00b7d8f52970756f23a006642d69fd3539d4214e5ae9817b5eee858da3916d7b265c4b90575777eb61b2e1227272a74d1a20961e0600b9af9d SHA512 c48d737cbd365f0ce08a95a9f073fbbfae72dec3581a304999663dd02a145de2c35dd1d6ca22b615c41a75f619319cd41c9689add8c3a9c08c90e09e4e04312f
+DIST github.com%2Fopenfaas%2Ffaas-provider%2F@v%2Fv0.15.0.mod 185 BLAKE2B 5fc211301da7e91989a3fe8d05a70dd12f097d77a687379438043f029e6d4390291196d6c2a431577fc240c2772fbf5b4b4a8c81d35f99b063372453629d407d SHA512 92998ff9b135026ed237cbe3aa483529c74e259ab2fccb18c6f64198c823b851f7a2dfaadd5af9f3dd64698bc969f977ebe35b7f293396c5de793745cc6ecdab
+DIST github.com%2Fopenfaas%2Ffaas-provider%2F@v%2Fv0.15.0.zip 187140 BLAKE2B 904d42b1a22d3d21bd4dc1b2cc68f0c125c2616028462f5adeadb83010e9cbeda7ac8495928b200585d0942ee2c99d190313d2a35a296f3503c9f4ea93662d79 SHA512 7f19407a803acb4ff8a9d543dbf81d6fe02da6785dca8ebccacf4c78bb689cb01e09490b4fecf9e30b3fa703502009e92faae3852fff6843768981023daf8a5a
+DIST github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod 70 BLAKE2B a94864739ead6676f2defd1020645bb86b8b77600037227aee95fe3e82070c31814fd055dad1fa16ce1a00f64f32be96a97968259ef43f70f20e8a55cb9943eb SHA512 aa2a52cf55149c10f76a8e535dc75ff9bc18b4f2515a31e8720a26a5f501459c736dc73548d2e37f348f27b78974bf0a3b18080df972eec26222fd8afbbcfabd
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
+DIST github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod 37 BLAKE2B a52c6a0304ea7026657d40ff685f37799d37cf3b05a87b15336eb05eb8a12d8749cd73d8cc3228ba2a80ce1e489a3029617ecf301dbd51c7f5dc7630dc114801 SHA512 df531789f1495979faa830433a34e38996cd919757f0191b31b862a9e9dd48be68179e291416876cb31083dec78337abf6bee92c68cff38630aaa456cd3cf052
+DIST github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip 22487 BLAKE2B 93907f2e048ce0d8be7636d9ddbfb61f051c6142402f725609692a1644cfb4b504ebc36efeb36ef1e70463b54c809b7c71b9596705a0b0e1dc5f7a52252be5cb SHA512 1619cb9a2613384fa025772cba512f24c29947945bf1d85e476a52be8f5711d4bcb670750dae0554741de3c9190f70ea2a2c60e6b04e5e5fe4bb653269f5a849
+DIST github.com%2Fpetergtz%2Fpegomock%2F@v%2Fv2.7.0+incompatible.mod 36 BLAKE2B 94ad4f44196658d6fa4d371da8aae93e662e42dd8629045ce4c151f51a5b37c4aebdc015317d64f98cfc027cf274e1002aa873aeceb2ca6b753691b28bcec964 SHA512 44fb274a04de0b485998d3b2df99ac8ca7ad812a56f9d30303b9f9b4f1c000d5c53d9398147f5cf50483d158c6f9a1ca5b15b28fa9c796a7704fa002860bb58c
+DIST github.com%2Fpetergtz%2Fpegomock%2F@v%2Fv2.7.0+incompatible.zip 85456 BLAKE2B 6f0dfda0a76351a6d2663674c931800d38f0275239cab6d9d592c7b1a03590d88cfe1f094b3d3f9b509fe73572381d5b8345690e33d72bb83dd1bc2386914921 SHA512 86a48cc9d817feb622b6d2ebe9b6ed60dbf340897714a334ae3c8bd9a781b7bc7f116a6e27b520f239ab07766bfcf9b8578ae7b6d753886cab98a883588c8d96
+DIST github.com%2Fphayes%2Ffreeport%2F@v%2Fv0.0.0-20180830031419-95f893ade6f2.mod 34 BLAKE2B 9fd28cfb3820a52a553cfd20da7dcb35c93c98d0271e08ef1e56427c83c7e8e50d11ccb7555dc88d584c1388e7e7e78e6309826e3b374d3fa7932288f3f9b2dd SHA512 113a623f9bf38e0597c7e759f5faa2dbc1da66d3325235ed3f1e8d29b70646e133d00a6532e4a6acd15ba063aeb669ed276ae06ae8b8190a2da51a173f8189f4
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20171018195549-f15c970de5b7.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip 17866 BLAKE2B bb8d50b9e736f5f1e129482bd50f720b7dbe80935fcb6cfbec6d5a5f5ba5d5434476d66a362f12bedc304e89c9886d4868d310710aa100c357900a742d4ee341 SHA512 82b0ed1ceadd44a2871b56e733a118003b1bae9e38fe95251e0aa06a0a4c9b4940c485336fa11335974e0df536dcd0491ec1b2e545ecdddc7f9ce59771f86321
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
+DIST github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod 35 BLAKE2B 763a350270dbd9e5a8f735ded2a13c7bde23a356f8f4187b4fe430b1dbf995cc9ca2dad54a38e927c07ba01b5c21f8aadcce69b8a94baaafee013d4a9fd0c988 SHA512 79b29fa26101598261ce7406c81be4fa53d79e89a7bed072abcd572d7f35f3a408da45055f1b05c7ace8acdb0ac2ea005d79a4766e7657087ca46327ebce842c
+DIST github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.mod 39 BLAKE2B f2e759320f64fa232673f4f5326c688510df6d43523a08df1b4b7524f92e294bf196c13049fb36feb846916a66b4baf7969cc0200b7109467b1f468dd6ab61cd SHA512 c0602d22e7cb8f1a20a354cafe61518a84a1499f793cdbb4e1d258d62b4f83a2c2a72e6cda49894eb2885ff524baaa47c542937c68bf338c76de5953aa468436
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.0.0-20180209125602-c332b6f63c06.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod 379 BLAKE2B 6a6db2bee0b69257e5c4d37b1d5395693ba6a88bce129a580b8c0ac986a7702729ebfaec726caa3b6c4d2537bd62a7d728705dd0cc6f6d8b6c9a4460c9bb33e2 SHA512 fe6b74b26571ed4afb49f8f2c6745644cb7db7b5fe95138761c78effdd05d9948c09aded96218ca0cf9d8da6372705901048c14290a4faca56b1d05ca3d74130
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod 535 BLAKE2B a8d3fb22b519e88dcb6b6f305a80c94e8b40fba8bdc96941230b354cc6bd8ec4bfd121b8e5ee57e9883e0b01b6224ff22a55fa8434bee1623133cf59489e64d0 SHA512 1d3646f93821b2ff1a4d80074f773eca22ff3675caca9d267762a31c1ec719ab464ba7ade7c8e2aa79b16a4f35f5a64f779fd909060a0c3056f09af77cebd655
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.5.1.mod 612 BLAKE2B e77946b5137a632121f113e6d7b390d25891d1fdf214b7c07ee0307aa4e78f5d19e96d1f4bf01aa1d62a2b0918727db1e128fdca6b6f1daeb08632b940a3084e SHA512 46eb82a74b845f5eda8cd01e8ae182e5dec7867306b31a40cb5c6bb9df2045c3259070b57388cc7826f54ee7b9fddaf980436f74ed500ab88748a13f12b30ff8
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.5.1.zip 213040 BLAKE2B f249bee112f34f59d075157c194ec5d08682e43049539fcb64ae8c195bf25b2b8e04732be7e4aba9425e3d430fd8ccce0e4a69b20a5deb9300a23926fd1565c7 SHA512 ac41ce53a3f71ed5e83ebd06cb013e7b1328a152453bde6d82ecd9eb48e5d5a5cddd19f1e3e131cbb009fa1c686a7bcffad18c84e4c20eb93605405d37519e75
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20171117100541-99fa1f4be8e5.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip 13785 BLAKE2B 2cd44410ea7af88683792807b0f2c31b0943d8664a4be050f2e422095ef3674e6d42f4b9b6a76083e13bc9f44be1578cb06a7389b4a4b201b5a88e756b40193c SHA512 db2396362357b6d5e99b21bd4aa8d8dc193dd2676a8f437c62eafae849a56a53875bce7411d58ad78e4fe36445b72ee1a34360b174a23ca84de911f5df189354
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180110214958-89604d197083.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod 829 BLAKE2B 14a7c9b3754cce16715135e33ee294058d999f343d74281b9fd111a9c0a5632b90b6594d1ed220165b58614a695b2b2aae27b2ed9aa35ba1acc768ad12e46ea3 SHA512 4cb3dba50a3b47b9db735de9df4bd7b35d02464065919502bb1e17236c2f6b1bf1e74f312a8d0127d2d570344c30d58063d62031d3439f52a6dd8f47b29b9996
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.zip 161521 BLAKE2B a412eaeb17bb3e932cb53393de6eeab563068918c9ff384ce32d2caf958b3e3e472f554c70b518b472663f42e2060a97062029e55b694a6c93a67af4eec2d626 SHA512 692c2ceadacddee42e9415892d7eaec95cbf5319db3cfd6b5406b39c99df942b4dec7095003ffb8a36a82424b9ebb312f8bf28913ff902320cad2253337e899e
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180125133057-cb4147076ac7.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod 136 BLAKE2B 49b2b47ca2cb64a1522a3719c1b46dc6f44d3122d3a05ea475dab88e89336aae3f396082f4de0f89400a0e8db85208446582a226238a701fb92c155a2e85fef8 SHA512 fbbbd57eff765585e67074e5c278d7d3077289c3d13c306147d6c3efb98232ff317ad92464ba768fc3d921b4a09cb3f3ff5c5480c89a01ec821bc86e5dca82f1
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod 145 BLAKE2B 8c6ed8a28b2f2fa7e97cfcb545ff7604eeb5802bf301ecfd574c1bd5bbd59172479a55c9f42f42a13a85daeb77e730dcf5cdb78aa9b7c499f3ded0584163d75b SHA512 0d285b677b209f7973ddf036b2f2463aacd060e58db9a0721e85d40d513f8befe3605677dca1040fe9dce006e3d5d3246d876224f05c45757505696122a3153c
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.zip 210499 BLAKE2B c21ca6fdd64535b648cacfb74fa2d23d05d493703cb7b775ec014a9efcf3e07557e0276901db2c309174f12800c6e2f438fadc5054f0ca233c65d3523937bebb SHA512 f9f9fe1e114a4e2fe4d27a836d3989b838b1bad72cbc1652570d26ac9253cc26aab01ca28c949b2c4441a7cb17e87c1689d21588093836873350d7342e8d543b
+DIST github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod 1346 BLAKE2B a46e52b7acf7ff0783cc3c18a1320f66e02ab9c6879434dccc9fe182b4c7fe4594a0be504c45ee5958e1a42c781870ae754648f5bb5ef4cd45c42d78ba189ca7 SHA512 7463ee6ed6735cf101502b6c0128c75960c55d6f9e42f37531e65afc02fb35b62d882a72f95c2fd76f3d0e253e9e70a9a2df2ddf782f53c4138135b370b69d0a
+DIST github.com%2Frakyll%2Fhey%2F@v%2Fv0.1.3.mod 142 BLAKE2B 9d1173fea51775c4b3736b3c22b6a650586b474ea92e44502d0534041947a1cd5528a8f5674124dd7df1b2ca610ddc7cc301ea2e4dca557f80834eff545faf29 SHA512 0f1311a7843fbde0617d5cda4fe1fd153873ae56b9274f12ecbf07f0573e033807f5eaebfb07d99073404c02b3957e41d75ec6e7c0ff00f349613a7cc847a609
+DIST github.com%2Frakyll%2Fhey%2F@v%2Fv0.1.3.zip 22149 BLAKE2B e6fc57e19207a8a86118ce6a94ce53c63d9e4750ce350f5d092ef14fef79ce4293cbe6b1d9db25043784c3442f84dfca30f518c7b10f2321ba7d43716e7f2d7f SHA512 4bf6eb0330231d24f02a7653be4abca81b335a4b2127d79755e47e49d2e9676cef9270c4d30b68545d55f38dfc142430ccbbf4176168f33736630ca9b379cd65
+DIST github.com%2Fremyoudompheng%2Fbigfft%2F@v%2Fv0.0.0-20170806203942-52369c62f446.mod 40 BLAKE2B bc3d826f4064d3832b3c6156849f9734bfacee51a6b5984a1dd9e4432fc83ce9e73f913bb36e17d11cd01958e7eaf36a83b3973a03c70a381c23e60eeac1bae4 SHA512 60f8fb7e3e922979c04db7c0e461f22385607f2b2c76600f230e44f410cc01dd2f5e4662aa89171a94ddc2385d879a785f3a2b6ca806a4123bbd2509fb251be6
+DIST github.com%2Frivo%2Ftview%2F@v%2Fv0.0.0-20191018115645-bacbf5155bc1.mod 224 BLAKE2B 32c9f8dafcc07c671158c3a40bd3817c46ee6d7200ff7f6a671c0e79c468b6f96368d1d3074c521946ff31c8b4a5ad5e2fe5adb521dd85dd70ee504b113b8e0a SHA512 0833f7dc85d596619b3142e52238c48f14b4f8ff527d90b8c08ba2ba746b892287e9453368bed5c8e1357a854a7fe2689b1221abeb2154bc019ed65ba5fe4b3e
+DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.0.0-20190513083848-b9f5b9457d44.mod 39 BLAKE2B c619b92efed318039eb06878b084372e8f3f45426623a9c1f045f21bf44f86347472a28a4164f607cb9fca3c253d4c9df0dd33d1dd8baaa02230af9feb8dc7f6 SHA512 d6089badd618722b8d3584965f1a10290097f259024a444744f625fe5b439fef62c7e14f060fb8593197d003ecd6c29f0cb85700de0bdfbf2511ca66729db3bc
+DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.mod 39 BLAKE2B c619b92efed318039eb06878b084372e8f3f45426623a9c1f045f21bf44f86347472a28a4164f607cb9fca3c253d4c9df0dd33d1dd8baaa02230af9feb8dc7f6 SHA512 d6089badd618722b8d3584965f1a10290097f259024a444744f625fe5b439fef62c7e14f060fb8593197d003ecd6c29f0cb85700de0bdfbf2511ca66729db3bc
+DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.zip 45664 BLAKE2B 300a1f32c514f6857be8cffe884b9fc29091a709746c83567f82413b0e64d7f42ff3aa6bc34846745489f98e10045736e3571797e715fad87cec937df28d0fc9 SHA512 f9a98001ee97894e319b82f4c190f93ce7a60e109b991691f3a90cd51818596b1baefcc1c24793aa3c8c9d4505f809fbc689037b1a929e21e17fcf134134118b
+DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod 36 BLAKE2B 6faef3be0b5f137ecc89a7875bed1f576d144f11623905c04cc44f93812b80f3e5b56f05ddb3343848e7fde7fc439f49627f4fbd10730b1e9c2c9153a2d3067c SHA512 8cedf150caf05299c5b9f8b4fcaa17e4771c613fa06bac434586048ffee22ba9501e0fa540da90a3a24f3e4f662c9517571a23a0353fbb29c881d6d6c26d5f1d
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.1.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.2.mod 82 BLAKE2B 3b7ef0a383ee9e7e64ba74f92d717687cacdcb0e7a57f76872cfbe77ec1c526ab97a8695a2819cf986c51a4561794391e5d532cc591f6ddc2141b5559d3cec9c SHA512 d08f8ca2d93c0d97d5947ed3d221fff67e774e810d7fc9c93bd25bdc446190fc5590776a3e6b159fde2b97c3355921235fb6c8b8623b7f2090102a7f1ca1a6bc
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.4.0.mod 82 BLAKE2B 3b7ef0a383ee9e7e64ba74f92d717687cacdcb0e7a57f76872cfbe77ec1c526ab97a8695a2819cf986c51a4561794391e5d532cc591f6ddc2141b5559d3cec9c SHA512 d08f8ca2d93c0d97d5947ed3d221fff67e774e810d7fc9c93bd25bdc446190fc5590776a3e6b159fde2b97c3355921235fb6c8b8623b7f2090102a7f1ca1a6bc
+DIST github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod 25 BLAKE2B 23b4d575cda8259ac3498731524edc19e21e56ca2881d58ab40adad9469eb97d94036eaecd4fa5e78558e852f4c8f4242f830c962843d14779fbef470f3f8f2b SHA512 18a8e8a8b69974b2112578bd8995f31235bcfe49c218b2d0affd6fd5d6b7938687d9f5405d4a228a2ee2960de7960496319a92a26e8b29f6076983c0d07ee66c
+DIST github.com%2Frs%2Fzerolog%2F@v%2Fv1.18.0.mod 249 BLAKE2B 4e9092affd51ce00f782312625da890e4b9a788dd6aea6b539edf3283a918a0a56c25ad672ce26b5dacac7700e68c81308cc32b1b879dbb944152cab2a640749 SHA512 bc2fb2a7e80062384d08a0d3d5c8909726732a17232363a3e427e1bafe61bb517ed62acd75d2489c073e1c590849d6b7e56671c9e5b8564ecaf1cddd2e57500c
+DIST github.com%2Frs%2Fzerolog%2F@v%2Fv1.18.0.zip 242031 BLAKE2B a2bdbc48cceb6427568f160d8b14083d2996465c1970c51b0ebdaa5a915136b83ed5a1a8cef742134636ee7052cd76e5d7d5f629e8f8b59c7acf84d02bb0d304 SHA512 87372a8228d96e5ba13b939ddf7e322db9f8b99902d39c7d5eef58d124525258d326dcc9c5697f42a48df5a34c002678e6c95b5244c3276130aa3b4b3c5f227e
+DIST github.com%2Frubenv%2Fsql-migrate%2F@v%2Fv0.0.0-20200212082348-64f95ea68aa3.mod 541 BLAKE2B 8fa6af798e820e8f6cfb87c74d71cd69f8b857658d27e8ada17d7065fd62fcae447199b7ad8c4b75aa36e3fdca0b53f11183ae8af3c0a1fedacf4629be4cafe4 SHA512 9a9b22523a458c61d66c7813993983592bd8f4f1030796688a0f4302cd85b4bda4b0088678504af74989f9b5a281c367c272e2a32c32da530725193fa8464749
+DIST github.com%2Frubenv%2Fsql-migrate%2F@v%2Fv0.0.0-20200212082348-64f95ea68aa3.zip 46530 BLAKE2B bd4a11025c5125d13b880679816bf7b30df1c98335234d9f144de449651ed8b5c248ea095fd0c0cd6accf7c0ce9d2abb13fb29b2f1d87edd87af27046677e1a0 SHA512 5dfed30da87fe9d1fc92d146ee70815f3a3486aaf703c12a0a52df2380d52789efabae2780d17a0ef6e1c462b28fe635ab5b6a79fc2f18fc0dc230e292cf3e9e
+DIST github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod 39 BLAKE2B 6d577028361a97eeb7070517fb59bc801499e5b93cb97da563e41b91ab1443583510a259283bd01777ebd435934f27212c15ed32cb5422d6d711697a7c714579 SHA512 d9e6796c9e0a1b870a32c313e22555a090e85919007d50ed4dcbcd3ccbfb90a3ab98e9f3e2d41bd32196e3d5fd57c62e6d47aa65e79efd3d05b7d73ae9bfda7a
+DIST github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip 105716 BLAKE2B d8a15d43cda9d636577a114fa0cbe0c570146402a5e0bfe94bb4b49f1b5d42dc6f30d9f29682721c28c63d261f9bc6fcdd6094bbedd81ace7bd2ef657ed97405 SHA512 7cc5f41055137124a3d330e3686860b3294c668b514fe19b21edd6f571ee4f3d895dacad4ef6e333aabd3a872f2bb3ba50ffbf19636d7f1bb462d97026713322
+DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
+DIST github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod 35 BLAKE2B 68028ffeebb96ddadff1a781e7f0d7267d9ee0255b2b00958d9e36b6870e27630f7cfb1f6a1c90d81fa6303465d50936c66567c4b562a8b2711d459ee4e093b4 SHA512 1cf1bb0f786ca726b882a958d719c3b762ac146c01b5f57fa246dabd3fc1462b47cb71f7fa0c6b146873113a609b5a94aee724d2d624fec9651947b78d39cf73
+DIST github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip 3875 BLAKE2B 9055960e0a721a3227bf7b758ac3113aa868ddac5d5eee9f39a836f6d5289a6f01e4f97347be504bc8ec385deb5d1687df71f29b3ea8825b894cc1957531490e SHA512 1014d9b9b3d05c2ffeedf92ea2280477a9403614b6ad84631e634db98f14e28eda22fa32092d618ca2b10c13993cd82a064420c7cec5860726d80a78a1e52804
+DIST github.com%2Fsahilm%2Ffuzzy%2F@v%2Fv0.1.0.mod 31 BLAKE2B c282ad64e71b854d616fc81bea04d548d53cd4853df2d248b9cad7498a7dfdc57c45f1727ead4b06275c03ca88bd7d14e2a543f777899ce4d249f0687c36a5ba SHA512 5b32643a6e75c7736b8c41e3e973f0c6cb0cdfde7bad464a4515df48273aac591775d45c953ff8cd425e289da83a5d1da66ce1bd76a1ae9484cd1878fb143013
+DIST github.com%2Fsahilm%2Ffuzzy%2F@v%2Fv0.1.0.zip 3354989 BLAKE2B ea82ecf2a2e335cd454d7a6760e86381abcfc758a5c957822d88846b8abc54b3423aebc5b3bfca3399e72f9cbf9287ef25f531df22536d3f4874db176ef5fec0 SHA512 0f00c1055432567dd5b0e1f6fc8d6d6c7418b6e647b33c048c6d56bf4743145ea7bba754be886d30b17fe9df2b1c518fabac5c1f6d96375d6e1156a085c29ac9
+DIST github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod 33 BLAKE2B d6c66082304928ba92ad6144b157ce4f59db0abc5af56538abd5a81fd927ea716df4b5dee47ff883dd99f377d2b3a772296e08244fb7a769a5843a54426be81d SHA512 081e7b82b53c1a86743e3cc4973c1bd15e1b5c48929513bfc41c0e182fd4a047519b8cac9f4e830d7a08eb3443b2feb62c727387a294a30b7c988b698d6e8d45
+DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod 32 BLAKE2B 9c0be7f17fe7a9156f124f7f67c3e15e14719d0b271f36d5d41ccfa5ff6c1b7887e0051df6eb3b29f29b40357d8e438598088b3c4f4df28fb81f030c8efa7ff3 SHA512 8b8b8958405a188b93adcdda0634aaa2961b5b8e0d3b3e1f768fb9c49c02b73cf3bb39027431e0c1d209abea6cb72a651c5776bf26391e81f4dc18c7bafa692c
+DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.4-0.20170822132746-89742aefa4b2.mod 34 BLAKE2B 9ff118e3db6f2a49d8cef81bbb78af4ae29fbcf97955758c08c4a9a610fa66f1f6da80dec5aff3c657bbbdf1fd5330331e58dc46c2b2bb657438ec0879a3c45f SHA512 186b34d707aaf1557ddc8edaf49fbc559024f454bd560ca8451cfa555abc211cccf861aea94018363547e39140d9e507c97f7a3c87bb9f1e5d444bab4c531e36
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod 337 BLAKE2B 41471db637c5c0363cd36be6d16a6228671ce9658ef71103ad2122a2cd8cfc13c30b87bf2b34df7ba9d6c1fff1ac821462fbb86b622c274cf26a1e3ecb7fd2e9 SHA512 29a4efc27c658b047fbfc6eb2ae311753b01fe878cc733e2fdfd83f5791b3e30ab50b08addd300dff37e7880f6b57662ac0cb0f4b98df2c5a5a9f7d555bc98a5
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod 337 BLAKE2B 94ce7d2e23281061ee0ac0b1be2f8c3439c86e62c56ecf556a81123d57d819b1e0e95ec3b7c6425f13abaaa1683942b7a3d0bb8ad489577284b2a6063c777b37 SHA512 38a79599dbd09661614d54fc92149fe581575b7833e89dd73a3f754fafa4bc549c6c9078753ab8e2a85ce2be3ab81e528e29b6d19e7c329e0cb0f74896d2e418
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip 58627 BLAKE2B f4276f0095188324c06e4412303ac19e3006b18823985e26ca49b2de54ef58cade626b3d2439f5f2a29c47618420b890951f94e5a4801dbaad4c3294f6555a4e SHA512 3bf6be07dd9a97bde938309857e16dc425587c100e35b2acd1a6f11a9ac196238b0844abbaded43fcc01be0664efa15b64f159f6259322043e3046e7d361dc20
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
+DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod 32 BLAKE2B cf220acb07f93b3927afcfb4211e356e17f28dbef71cfdf777366d8cd09440282cd23e7800c7e86949615b90ec60ad4f2601ef21e58d4470349913c348758b0a SHA512 def5f190323350b58be18ef9f1b00e4810987a37e1fa9332be62a638a01df7f070788c75a19a0c11949890ccbc395419de45bf9c5f7fb38fdbef56118c681d32
+DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod 30 BLAKE2B 9bf213acd16f9456f4a010a7c300a1fb7bf1ab248d1ac9eed7883deae7f9a6f6d0c761127b7b2c84e8dc46e7b0da2eecac9b334fd5a94d2995d56858d345edb9 SHA512 3166c898d741be502c0b733653cdca0e8ac4999fa6a5d67460b3962799287c9176b7f0243f0c0da394a4b7737ed1d1a6a2ee4f84a8917cf7076c774ba9a2a648
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod 64 BLAKE2B 51fb4de1e12106663228a747aa9e5fc135104573154f2a33f2a6cd2a927873efeb19bbb6d7a0a74fa1c7050683ba40d176d7c9e2c32b31e71aa43f9284b868b6 SHA512 e091de41de8e320e4eb47a082cc419a6d102791c888646a0482bf4d2b91a9f357455fe59ef0657e043dcd021441d6d78fe89440db3f11d4d516995903e0aa3b1
+DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod 175 BLAKE2B 9077c3a2c65f4025500a3215c440b1b3856e09f1543cad7ca6a37fe5b42d51af01c2032b905c72cce445807bb311ed461c4a5fd4fe680a81ac7a1c0d94759c67 SHA512 7a0a21f6a7564b3261bccc8b1e1cd39d5d1a95bd0dd3debea914b1d37b687fbacdaee5f1dd5f1f74e4da11664c12f7ee63b484d690cd79389423cb79ff38dee9
+DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.zip 12738 BLAKE2B e7a649d1c85aa7b3aa0a80123c49d6e980d8db2bdbb7c49d5871cef8c35a4f632f4de0987ae1b41b3f9b472343e22228f7e75cc7c841d446ced4f33e859039f2 SHA512 4ee0de0cb44960bd75a18648a2c7e4428cd1df1b042e24588d3ed6adee05388e6211854db1878e6ad74dec95083e439d147975082422b8ae5f3c6c7896df4304
+DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.mod 175 BLAKE2B 9077c3a2c65f4025500a3215c440b1b3856e09f1543cad7ca6a37fe5b42d51af01c2032b905c72cce445807bb311ed461c4a5fd4fe680a81ac7a1c0d94759c67 SHA512 7a0a21f6a7564b3261bccc8b1e1cd39d5d1a95bd0dd3debea914b1d37b687fbacdaee5f1dd5f1f74e4da11664c12f7ee63b484d690cd79389423cb79ff38dee9
+DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.zip 12750 BLAKE2B 65fce8e1c7f8d6553e3b003b02a2ab3a7b1eccd7dae3db0423b8ba9d5579721d6d84d0227e321f8d7b557db71648ed2e4a3b810ef867f34ce25f02f29b4209f0 SHA512 bc4f20343133aad94ea020cbb5f2c74c5b983603f3638ee84093a31b4cb94e3725f3e0f01252e6546f86d1e47c317e171e0229681116b8d4aeac67221af40636
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod 30 BLAKE2B cb72701c052ce4059500f4c6b3d0c4fb336d118865bf1f7f45ce0b0279e1d01b6e58d49f82182c2523681a97bcaa7a70216d63ceeca0ea1d09c1921226f6bc4e SHA512 ea13ed8e166d16a7bcd14a7cde90af1cacc0b05995d1c5ec245fa536208e0cbfffd689dd460d66c0a1ad315f2b0ae9f4b803ed72bcdfd89c4a98a7ed934289c7
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod 30 BLAKE2B cb72701c052ce4059500f4c6b3d0c4fb336d118865bf1f7f45ce0b0279e1d01b6e58d49f82182c2523681a97bcaa7a70216d63ceeca0ea1d09c1921226f6bc4e SHA512 ea13ed8e166d16a7bcd14a7cde90af1cacc0b05995d1c5ec245fa536208e0cbfffd689dd460d66c0a1ad315f2b0ae9f4b803ed72bcdfd89c4a98a7ed934289c7
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod 310 BLAKE2B 851f2542f28849f4f5c33155e5d9562aa9aa2645f1fb57e6300e2c6e98c39e0728e01a5e26d4a514435245662fccc55b8eca4eb2633a21057a6c4a5d80d24fd4 SHA512 dfde1474aedc5f36508bed07a01fdfd433967d2a6c0acadc6d985ce862da5e1cbec7ced13d55073512afbc2d925e6ad3e3cdee9511ad17b14ea8a159d8adf8e0
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.6.mod 265 BLAKE2B ecbd8f71c2576f741916c7e6fa4c279c327766a9bf957e019164a1ff8af16ca1fc6810004935e57a3b085f81252549ff0f4ee2b89a5e53dc0110218acba937a6 SHA512 25511d7efe6d605b33c4e142ee073694b95d93b10cf3e9d74a161dfb71171de0accd626587299f41a061f4a3ea34482ec36fe7b9b2b3588d8af6b3545a35a45f
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.6.zip 157199 BLAKE2B 89d593030de5748d0e310af24beb7b2fe51c52e4bacdf0de35e08fad4f02a907a2baf60439d5164e80aa8ef6d9fe67534960674736e642f7125e408622120cec SHA512 8755633ce43afae068a8d5ab6366965a97c08a5fdd5e199fcade8fcd5a00524f668d78b97e70269b59b321d901356ab1d0fa83e11c75bb30705c6b3de85370aa
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.mod 265 BLAKE2B ecbd8f71c2576f741916c7e6fa4c279c327766a9bf957e019164a1ff8af16ca1fc6810004935e57a3b085f81252549ff0f4ee2b89a5e53dc0110218acba937a6 SHA512 25511d7efe6d605b33c4e142ee073694b95d93b10cf3e9d74a161dfb71171de0accd626587299f41a061f4a3ea34482ec36fe7b9b2b3588d8af6b3545a35a45f
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.zip 171286 BLAKE2B efa68ba65ecac895de82fc8f8ae470ed9b2e24e7343f24429a5764fa042f7c91dbe8aedcc0ae003fdfa188bca32e7c4c82481b69736a72df76b50fad3e9094ba SHA512 f311c5ccb68a0b5dfe41f993e0867cbe9742dc3fd50904ed688d4b89777f4739f7a9293f548e7c2ee940d1742e921a3cc82cfe1b9d1b210e435d16c8f0c91880
+DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod 42 BLAKE2B 1f0af0f4518708edd09c0f02aec6103960b023a6bc178181276c54cd86b653e8bd1ddd60c5d49fa75a85f1fa0d18f670a9c2ead381da7c4f2d5e611b24f51ca9 SHA512 748b5648bf8bec4d1efe13f4dc37608e7378acc2a7d954e9d3b649a4b170a1e2d1c61338f6bee8d9007ad75a5bde87487612b47a692d6f966bca56490dcb834d
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod 39 BLAKE2B c9d700f96874e0a3977c2ffc7fd321acfffd8081aaa70ca50421ca55253fbe0636d48eca8f7093df202861f0a5f908fa00303533232c83c78bdba84e2973bba7 SHA512 8071c316d33aff1d8ffcabaeb42e8f9320465d83600cb57ac5ef071569f948d5cfd69e1bd2e92855c061395c1b814e84d1705f42e37f00d5bc713b6e724f29f5
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip 88931 BLAKE2B 7adcdaa60d4a3fd99b0f3e7e6888178b0a8d141ebcc0166b12df4bd4566500929bc792c391d33201b1ce215b6ca8ebb578cfcabb027ba453a54986270f5e37a1 SHA512 9a81f0635ca8ac059c48a15cbf625a7c91513f95a9b402ba166d48ab72d5d38cbd941d5309446f5637bd7c23eef35b60fef2f06e8b557f415dd8409a6ddf43e9
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod 986 BLAKE2B 4f2c5d920b08d5802df635316a6ca72ab3346dcd2b0ec76bc9657c265eebc68ef7c8036c1993595bcdb416ea9ef0e7ea338162a7c6854c98db3a16b035c310ca SHA512 2195ba8e28e21deb5d4f78a9319e568ea5e81fb7a257292ec12d0aeaba84d1898e8d0cb51355f87d7093c3c0501cfa1f93f2e520e40edc4995260d7977fe306f
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod 2018 BLAKE2B 516407d1afeaeb665c558a4babcaa35aff28dd9b41298d04b904378159f1978a924323195e4c160cb9cb992c264558c7ae4f07ec157dd8c65fb98853a3cdc53f SHA512 fda6d22c26332038895ea2f2c62458baebededb0df883728dc9a127c10102b9bfd3e8128dfee194d909d645ea652f3ccd5ef737a8cb7ceadab71864b21de117b
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod 137 BLAKE2B 47195334e42f0997d96b50b8364764426301d31cc7fbc289b89b173b877d54cc67133b07d4a21e6ecdfa2e4404a9cff32f06b53cfa9493e075ee2ff2cc46e605 SHA512 02d0b2b1df84750ad3d15f4b86b3f7989a22007e27b28e7b3a4d34b26ec7ccbaa5d48ac0032ad692bf7db150e101cabdc050b0aa1697cfb20f922c88b9f086b8
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip 91883 BLAKE2B 8bb8f10ba7a3c719844dbbcbdbb87773487921f493cf6f72d1a9fd1d553f7f7784b01b9795a5c26a352490ed6d75c29a542a0b3d7c18d8888c57e447d9d227eb SHA512 c539cd964718439715caee454b38fdb61eb5d4e20489e10f7f6a030b4b941b2ca52d33f950c0b04149962399f0c3cb5b6a90efa2d79acc0f57a7f49d508c67c7
+DIST github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.mod 38 BLAKE2B eafcc0e8c3633f2d4c2cb4eeb38eacdb7d029944b76da9ee611b3fd2d3b82d2adfb726405168a34f70251be920da17fdc6c70e8052720a6093c788dd724d24b3 SHA512 1efa76d27434ede74fd37d57c1673c8a60cf06248a73c425b5bd08dd068d6b50166b17a15b52d0c059218479fa3976e80e16cba08f671e9ecf7744cf5daa199c
+DIST github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod 33 BLAKE2B 2f2161156210fb855e4efe08126e21b4fed0ff111b4f03679aa26051e23ac71f9d269c26088262a3ebeb6364fa60cb9e85c1850d8fd1674ab488c6583d6034ac SHA512 39a892eb40bdbf1398cde6fe8575bf4fea604e3bb21473de5b2316ea182130b92c9dd2467e2807c0421a35cddd0096fa99134a9f9de02fe79bb59d82e2762937
+DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
+DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
+DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod 29 BLAKE2B 8502924d37d2cb283d252008e9727d55269eace4ec1b9e049294563a1d92b777e7333c946bc69c7f47167a36482c1c2084330dc68e9c33fdcb57113ac55e0ba7 SHA512 787ef0a1ab48d9faf632390dd7a89475a11a3c11d6b557cb9228111dfa7af591deb6a102cff6d6c981ab717f29bcfca64b26fcfd2cc4d213f4dac0ed24c6d625
+DIST github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod 35 BLAKE2B 159fcdee33f554db7f7bfc834a6478865e93a6258876dbb3ae755eb474786149f109ad8823484f1d72a8fe4012f24041c994e4d19ce7e684a84f85025803ffc1 SHA512 633ff61cb8fc7260fc5bd11d9bf59e9a758a3db457a9780701686b9b942b6aaabf102c7342f97d2beeeed247507f383253bc396b26581f7726538149ea4203c0
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.mod 29 BLAKE2B 4f20ac8fb7beef2b678cff290a28c8125d368504aebfcde33e746d3ca7b9606804bd94c59c50fe328da4c1c592b8768b1aad89bc1d22ddf76cbc88d0f0f76b74 SHA512 5edcf2aac39658fc7e60d5086b066470c6d6213b66a2432bc35c6f67b8cb37a66a67fd97cdd4b8fa1b8b1bddfd544e4aa9838cec06806b89f8e1447e3c61bd2a
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod 29 BLAKE2B 4f20ac8fb7beef2b678cff290a28c8125d368504aebfcde33e746d3ca7b9606804bd94c59c50fe328da4c1c592b8768b1aad89bc1d22ddf76cbc88d0f0f76b74 SHA512 5edcf2aac39658fc7e60d5086b066470c6d6213b66a2432bc35c6f67b8cb37a66a67fd97cdd4b8fa1b8b1bddfd544e4aa9838cec06806b89f8e1447e3c61bd2a
+DIST github.com%2Fvektah%2Fgqlparser%2F@v%2Fv1.1.2.mod 311 BLAKE2B b7d3826a21681cf937eccbb37e11a505f6eccaaf1b82ab8f8b00cf433ab3478f1e2f87f5812fdbb6587e9700e2e8840e9eae935f7a51a257e957b468bfa3484c SHA512 41546de4beb8bce00d5adb8213b5d0440f4917eb0090d9a81fdbde098675c6ad1166f4f2383fe0c526f8069b2f5fa88d93f6fe95642b96a044e49475375b329b
+DIST github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod 40 BLAKE2B bd8fe364e43fdad423aa574d01229ce91e9b3211cbe3a0234070805150d960d3c0fc0c6ec229e7ce5b4079906f2595a2b5f50a8da7bbe9bd906a72a6a7a7434b SHA512 cdd8a665fc41a4b04c59e869b021d5a9b793b9a441c320a234bf2a13be67af9aa60378c58991161f73d83c184039a52fc3f11cd121490996737f0508e277e1cc
+DIST github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.zip 9425 BLAKE2B b18ec4a4e021332404866950e4839e8b00db652a3bc196fee5f7ea928085d25b44584baa3b8e65f5a26edc4a84450152fb40c8eb11dabe82641c2f569d6de126 SHA512 41675a07bc201e97344136fb7afab6afc3974a7d4252068311c5f24968f6a46b979e763865e61586c5d3c8f2478a046915e62b5a7829785c703d180f4c2af58f
+DIST github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod 42 BLAKE2B c2d6fb272d8ae4e541c98023713bcf0b7f47f334d09ad7f9f375ed13eb14d27ee2995745782ecea40d31a561e28702fddeae4b5e32750726c7188118d741cf82 SHA512 14c839017eebd5dcf49dd3495a1ef6421d522389a2943c010d7869d214f757fe7d19d6ac3482fb3d8cbaaeb3977c5c311523aba90e9f7909fb1ba593ba57ae8a
+DIST github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.zip 8632 BLAKE2B db207b3c4a00178e3a2fd24a1c453ff54e8714792d5ae2ab324bebf8efdac9bf1492e3c1f6360a99459c4e88970395bc74dddc4611acec4478ce8a287dc872f9 SHA512 84eca639af26023555a96ac40edc73c5607712c4cbb42f9e9ea80c5e63c3a145e43e10d920891bb7553ddf39ada40f3b7e8cdb72891ac363a609964a3067eceb
+DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.mod 39 BLAKE2B 4a9a7321d9c10929abaf038e336248709fcfcde17c0ec9ec8e96407a9e12910b84e7008a7a847f533bd8695b56a8e35313d5771931d2fb1dfddd74ff59b58d5b SHA512 8ee8fb19b40e1366446a91a48a495fa96e4626f594903b7d4a53355069043c5a2958612dd0bf0f8b0a01a4fadf9dd92d0b9dfafbd10ab9c8ee6e3bcaa01853d2
+DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv1.1.0.mod 39 BLAKE2B 4a9a7321d9c10929abaf038e336248709fcfcde17c0ec9ec8e96407a9e12910b84e7008a7a847f533bd8695b56a8e35313d5771931d2fb1dfddd74ff59b58d5b SHA512 8ee8fb19b40e1366446a91a48a495fa96e4626f594903b7d4a53355069043c5a2958612dd0bf0f8b0a01a4fadf9dd92d0b9dfafbd10ab9c8ee6e3bcaa01853d2
+DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv1.1.0.zip 135372 BLAKE2B dfc1aafbf120f1ed5fdba1cc29b868e62c8c3224330e5457397ab503c505ba8a55c11512999d64a5efc9aba295eee4890945787a41c5cbcccce1fb1900b2f2a2 SHA512 e2b62ad55de3ceacadbc129977ded7ae141f36d42c499e0427bf020ba681191a9128a6852eb22659a3adaddb765b897bf122bbd7112b4d8abbad95f7bd72a873
+DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964
+DIST github.com%2Fxlab%2Fhandysort%2F@v%2Fv0.0.0-20150421192137-fb3537ed64a1.mod 33 BLAKE2B 6f03d324264d6508bec7b0d2075be3243927963f196b7f394ecaee719e93d0c01e52599e6be1776cdf8eaebb12ec16eb2af426ed1295111ba137fa76a022303d SHA512 2d1cc625394c148f83dd01d72770770eed383ec6797cdb2470d2f7e5d7f9c5cde07aaf003cb46dfe12547491aef79c119582777ffbb9482dbc5667828fd426f2
+DIST github.com%2Fxlab%2Fhandysort%2F@v%2Fv0.0.0-20150421192137-fb3537ed64a1.zip 4888 BLAKE2B 1990251e2030dfe8c336f7712f7125d6cdde4d4796c6752aba7c7c2d20a870eb487684bdad1cbc60d9f87a7b404f0d88380b44df998b69b3e308a3c2c87c9e75 SHA512 64b62058e9fa0736f7c9ebc4c7ab00fe01cafde6a60efb77bdd3d8507be68c1a11021149973db81c17bbfc8be3366fd62544b74d90c58d6484dab752bf7d1a87
+DIST github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod 40 BLAKE2B 844d63d9c10c55eb74504d88d5e6e85641f2c4bdbbc9b4f6728cd6b1e750d1eb333e91b6eadac635a80abf328c9423fa106b18337e89dc592876cd3f04a803e2 SHA512 daffe8f4148becee3a32c90ad21454cd48255409f3edff8681ea2074623c8aa02cbb4620b7ba52aabe4ac3c24a5f256b56fd71de1da45dcd7e4e8376699a422a
+DIST github.com%2Fyvasiyarov%2Fgo-metrics%2F@v%2Fv0.0.0-20140926110328-57bccd1ccd43.mod 40 BLAKE2B d9bfc152a45edf20400c8f59ff6f7d20ac98441b3bed903d1215a98ad5b59aa9037c3dc413b750a34d4784a14d98b6441b47f8117624acba6bf69202345c43c1 SHA512 2b18d1b7379b2fb032b531119bc11adf0d7ee3b7cb490db5fbb2d7c80f04bfcceedf474012172da27d75f4337902929fa49635a17ac436ccd3df638e182c7932
+DIST github.com%2Fyvasiyarov%2Fgorelic%2F@v%2Fv0.0.0-20141212073537-a9bba5b9ab50.mod 37 BLAKE2B 65bb120d06237325c63f8f722a251585f54d2e7f5c70dc35554fa50147d94298bae6117cee34fc6fa202e96ffb0878534d5eea11775a83ed514d33d4fdfb8775 SHA512 cb07bd4926b20e43b08c9f6c29a74eec6b9119421d56d48d69da58152ce8ead0520197c72109579869f3591fc8f8d05b7bca3d274d383cb65b7a023fd9428ed5
+DIST github.com%2Fyvasiyarov%2Fnewrelic_platform_go%2F@v%2Fv0.0.0-20140908184405-b21fdbd4370f.mod 50 BLAKE2B 1df5b82dac953ff568a0709714e04e4fb31f384e8160fa933b9aaa579f311eabd38c42781612c6d39b7eefb1f995251f74b5ca5364bbd9d240f6896df3257ca4 SHA512 a921e5321a35252f98bbfc819df7177a500b64665f710f2b833f4187062e5c2f050daeeb5230c6cea9dce724823eae24d272924742df53fd3437d9bee9ad89c6
+DIST github.com%2Fzenazn%2Fgoji%2F@v%2Fv0.9.0.mod 30 BLAKE2B 0d29cde155780d03b6e2ab89ca42ebf09ff4b310d10dabc43b3aea8829f593815c605495a08a0d28c991f29642bd5826fb4e3590c3968d4489edf7a094bb39c8 SHA512 bc5fbb05f2700cd680839597dfa1d5b446c6f91b1e0a08c36351d3bb338c2283a6988c6df156e9612a7dd356489281bae61ff661c9950268d23926f5ea78395f
+DIST github.com%2Fziutek%2Fmymysql%2F@v%2Fv1.5.4.mod 33 BLAKE2B 06075bbd3eb02ab2dd096de6cce4658000082d9afe5616c75d74b0dadf777263a3c914517bf0df87908d043370cd066c4a5c45b6843cf02bb3fd67928a8d5197 SHA512 cd6a60a15f71d86acc64da0657180522cc0cb7a6e43428e131241bcf791a9c73d6dd8813fb8dd5b3d8e9bf99ac9264b0519c796053a7d519bf66143e1b0643ac
+DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
+DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
+DIST go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod 2182 BLAKE2B 024744c8c4b0f296f32ce1af2407eae0eb760a443d43e2a1824254c9b2aace62966a2f0f5b5dbfb0cdaf66f2f00740ab653a2b429cc9aadeb3e48421dd6e180b SHA512 904249febd483a4504d49a1b769ded804042c34acd6b7f76503af9f43c76c53063888a7d0e15ee457107cf688108d2bff057330d9d44548b2a30979336370f09
+DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.0.3.mod 35 BLAKE2B 188e6d186d3c57dbdbf44792848f3e774f7b3c8f874918af1980afffdee1a2fa165d7e1d57f3baa517b128b372be6a84f4eec768050fcb2af7d5d8a8a10a8e3c SHA512 b117791ab0ea72cec89e79672ef8e17d1e3c3c5f2c419a7709892e9b8ef5b0ceed43439ad7f78d8c3d9e109e6bd662e816aaae6a8f62d8a74fb7a1f888d365a3
+DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.1.mod 35 BLAKE2B 188e6d186d3c57dbdbf44792848f3e774f7b3c8f874918af1980afffdee1a2fa165d7e1d57f3baa517b128b372be6a84f4eec768050fcb2af7d5d8a8a10a8e3c SHA512 b117791ab0ea72cec89e79672ef8e17d1e3c3c5f2c419a7709892e9b8ef5b0ceed43439ad7f78d8c3d9e109e6bd662e816aaae6a8f62d8a74fb7a1f888d365a3
+DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.2.mod 35 BLAKE2B 188e6d186d3c57dbdbf44792848f3e774f7b3c8f874918af1980afffdee1a2fa165d7e1d57f3baa517b128b372be6a84f4eec768050fcb2af7d5d8a8a10a8e3c SHA512 b117791ab0ea72cec89e79672ef8e17d1e3c3c5f2c419a7709892e9b8ef5b0ceed43439ad7f78d8c3d9e109e6bd662e816aaae6a8f62d8a74fb7a1f888d365a3
+DIST go.opencensus.io%2F@v%2Fv0.21.0.mod 305 BLAKE2B 73735106ac582b2e9d5f0d739412c3396e0df8627a6adbe810ac560998e4cf2eda12e449b6e336dd6b433eaf57c885b4a927359d0bc1bd6eba9432bb0793c35d SHA512 448e90223b8d67e4d5e4b150055ac83eacf9ef48aa34036c2e59559f21443f796e721df3c0395a829bf5d10d229cdc7beb956c8f90273e50f0989e45a82aace8
+DIST go.opencensus.io%2F@v%2Fv0.22.0.mod 408 BLAKE2B c96dc637d392594cdf710b9542b90504fb090392662ab45208d45abe2cbaac5b64e55f2f62d1afe5542d2747abef1eedfcff97cfc48d6e0649c23b9b8293f7e5 SHA512 823e1ca3a9adedb1a98f5ac900e190bd51480686872bd901cc20a394cf03be6c8fd69cfe7343e42cb6f9d3500282a8097b6c32376aeb3e92bf0b1ce3e75872d1
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
+DIST go.uber.org%2Fgoleak%2F@v%2Fv0.10.0.mod 26 BLAKE2B fab0da84b238a586768d6a17570b79be5d12b4c2853a3f56d38a5795f971fc5d9c3aa67a69deee511a17bd1ff380a6e91c49ac0e1f74ae88f1a4f21e6e8d958d SHA512 3486b791eda341ef0be103eef291246079ccf8799b50277bdabc75a7a57d0ac196b452e28fa72493e500055b49a4f7651a634f741b7c66ba61640b196b8f7bf4
+DIST go.uber.org%2Fgoleak%2F@v%2Fv0.10.0.zip 17218 BLAKE2B db837e552443d3018a594ad6fd2e80f53037361527c182aac10fa80bf486f288bd2d87985ac3e3bf0c145e713142bbf3912e1c91bfe2df02b7ded0aff569d860 SHA512 fa32c61b9572926ad39c6325fd63ce54c9550ee4e26947671c75b0c0140662d779e093d670ec741706bde6832c675991b5f0a8ca14d59e2310b1729485546ca1
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4
+DIST go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20171113213409-9f005a07e0d3.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190320223903-b7391e95e576.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190617133340-57b3e21c3d56.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190621222207-cc06ce4a13d4.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190911031432-227b76d455e7.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200128174031-69ecbb4d6d5d.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.zip 1867651 BLAKE2B 7e9654d95bf03c5462d4d6420e676bd4a0e8769c5cb7954797a66c89298ed16063581391294b7c3e7c1e735ba0cfe3b60e899fbd2821b98179b2669740271a68 SHA512 a0560b1c03857faee4e6f6d959d042258f30bea2bb86af07c701a21c7a6d7e44a8929acd3e42503daed070c3597abede768af32814e252441f85823f330e573f
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200414173820-0848c9571904.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200414173820-0848c9571904.zip 1872925 BLAKE2B 8f054f595a831d9b947dee796666fa7885b107ce8892adb04daa2f9035493917e658251ea699f05177b51a8d5ea35b503d9480eecd9cb7dcc842a48d7346e23e SHA512 dfdbcfb5bca3a5e7931f21065b91d7673938f7b6b9a9602bce78a723cb12b580a44f5d716695e27ea9dbb79bff91881ddf4301a980ffcb492f26065444904691
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190125153040-c74c464bbbf2.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190312203227-4b39c73a6495.mod 327 BLAKE2B 209bd1491b6099491fca7ccfd2fabb500b56112557b4b359819b5f9d18e1587b8b1551acab53ac6c222b66b825c4058ecd6adb1d886f1868b7b96ebbd5865eea SHA512 e16919da8b2302c45f8fab5f0d200f41c2c978ad31eab2b4db18310bfbe09079d738f682920ef6530f1d5f53359ddc3d4bf33fe5cefbcefd440212b31e72ef28
+DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod 60 BLAKE2B 1c8445e3c9313293a0551c8a2acc31a1738724b96886bdf165c74de6cf2d25b784baefa2c41997a64ff189333a8c59756fac7ac41b0ae1d4f167c38574905351 SHA512 c466f8b348acdc26208bcb782cf330a979d9af086a95f307a785884492430f11fe45d1ddc3abdc1b092654b3880a5e7a456740293935b1912a1d39b658de80e8
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod 88 BLAKE2B ce393846b227c374753f46fc076385826a6288b0c85095e097c041b844f46b87120774c68924492c4f33c33729103a2d916d2335e24953022630314b63f606d0 SHA512 0097db2957ab98a21a73960d2a37c526e5cabcd5ba4825e44f0ec4851ef83743ae171c8dc4b6c09ea4d931c15879c247e362ca53ef8dc762b484f1ddcc483d04
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod 27 BLAKE2B 9bc664bbb78cd778f132bf3504160bf8f6d9950342fa73c461db815f07c0ce2ae5bb2a0ac099457d022e1edf2d07e536566fea043a77aa8b21054254ae854c46 SHA512 a105eb088532321694d3adb5da0b3cdceb7781670a2d4a8a757799e3c8fde02784b981747714cfa8770ed29eb1a0228e0945ad3c363220c39108a7432fc29a32
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181005035420-146acd28ed58.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181017193950-04a2e542c03f.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190320064053-1272bf9dcd53.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190619014844-b5b0513f8c1b.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.zip 1499901 BLAKE2B c60f861c6531bcfe3b3ba34efc287605a9e7089a7fcb98546a3b9ea46dc982821d3233d613c96d4e4660ca00923cdbc1593d94469fff552882ab83e3eb35d2c0 SHA512 8585cf85ad230928be11a456d2153f918d8403da892e1ccf0b638d0f79e2edbf30d9e18e687c33dba4d486ef743226c5f8ed23ef96b14f6c8910aa550b2e0f3b
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200519113804-d87ec0cfa476.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200519113804-d87ec0cfa476.zip 1500758 BLAKE2B 42bb8d2307159dbc75f4d826a54c39d86d2da236ff85e76447c869bd73641e215fa317cc88f6d0ad1bfb522e4d92381c5c8b3fc500b9771ffe7abd92fa14c83a SHA512 7761726159e1c0c74be9ed8048e53ebdfdaef085ded23cc163cb8248079197a6245ecec62b169cb797b9527ada27576f86bbcbcb64b24e165690fc62e709ed88
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip 81912 BLAKE2B 647b2edcfc6109ea26a1844c259174eb37e3a97cbf12242716d4cc308b3918b5a0b104c9a5c2f3b4974bd94c28afa7ecaf40e71aae5fdd821cb1a5a15ec978e4 SHA512 62b95055b08c73a87c7ef69b2984eefd061e3f7d71eab8e05ce82a4ab1be2ce200aae7929da77a9ec49051b7c73bcc948fa4ee782afdfb8d74dc2d206636313b
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip 26635 BLAKE2B a464a4ad04b36e50cfe966e6e6dc299c0f8b45d0f4198ba64483bb70ab815d033cec5cde60753b76dd1fbb16fed087b41179100a2002b0a61cd4a08f9de779fc SHA512 ae6f29d5f7790b37d1722d65f31708670bf19f429c60b2f6633756ecd40e47c1fab40fc128e0d70b3b6ed0ba47ce5f970ce5f4e55b8f1fa407d2efee7444b646
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190321052220-f7bb7a8bee54.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190514135907-3a4b5fb9f71f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190515120540-06a5c4944438.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190602015325-4c4f7f33c9ed.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626150813-e07cf5db2756.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.zip 1914003 BLAKE2B ac7480aa388266187659eb3aecf2dee867db990bfdb93c77da513c357411c55830863e2ef52746468bda54b1e5196160a48b792722cf182b81c0c516e0c32d82 SHA512 42f2c32e4f9d0ed8c742df7570247d22250ecb2a438c248684cd85070c8b875319b471ad45ab4d10f04acf7d3684a5f324fa57b381d4681574fb19c73b3d9a10
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.zip 1477146 BLAKE2B cc4df16be2d059358b99f9c276d4df8f25aadacbf49af02139604ee688ee377be56ba59f627b83b3b4ef56da050a7a1c371784c07c893035072372fde9987488 SHA512 80419c41d5b556d6b63c2de18a7a9d89dad29b77da1acf6006f3f93f07ffbdaa5034bdd818afcae196a8b69ec00278622a2003e51861d9c6a62a886fa744fa6a
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip 11671 BLAKE2B 0a73cd55380594ca4bac71bee0207b51979e62407ec3c828f975e8091a20e2b9a6cc331dea88cf0ff44ff3a6c7d1cfd2844651acd1d957c0d725de525a58985f SHA512 ccd129fd4ce8e4067d0ad4b164cd8c4fb7ba65d5022bb656dfdb50dd2d467152bb83760f3d94c465b6d4c29c29931c8be6c697e1634ccbab4eb3a53edca7dc4a
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190125232054-d66bd3c5d5a6.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190206041539-40960b6deb8e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod 194 BLAKE2B 94f62204dd4fd9b865aca70366a7a7754e2e92ed27591beaf789b268ad272dfb34ca0906d888c608393b4c71bc5c9f975fc86c164528ed7d0390e41b66206ec4 SHA512 8b68acbca48744320e64a70a983a471e9e2fc2249562064b10256269033473fd50264b6544646227fb666f075c4f266df1835ca3f88ee679bb97d34bf62bd195
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190614205625-5aca471b1d59.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190617190820-da514acc4774.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190828213141-aed303cbaa74.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190920225731-5eefd052ad72.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191004055002-72853e10c5a3.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip 22282 BLAKE2B 68df6b35d9043f23df13432b80074544f46833467294955ae5706713055d0cc9ababda892853c14e99c80a3571fd4a807a019a098fdd2ca695ba90c577ead5c4 SHA512 c72b8b73f89624889a2874c1b2445cb82f0e545fccf6a7761a278f3f659eb19f5f1c8585641b8f89f2bcfc3817ad2c0e267751cfeeab949e287e43af5df57e28
+DIST gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20190331200053-3d26580ed485.mod 203 BLAKE2B b902ba60b159380e6169e4c6a01cfed819541cde7e25deb4455de65799492c46bd0a8ff6031b332a458f730f2cf5e9af50fb8de918abdeff15d60f20dfed78db SHA512 7c3573dd6aedcf5ccec10490f251c793494595672f68232d2aa0829b32b6922713a0fd2d9ac153434b7293def6ff84be6bb5fa88d2c62663daddecf42b1b3098
+DIST gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190313105609-8cb42192e0e0.mod 27 BLAKE2B 7947d397295d9d1d7bd22c96f4310e54ade7afe7baf1850cead3176780d46b4f517dc1a1e3ee22e15f0345a043110cb0f32bc0175ad70de62fbaf2ee755e25a2 SHA512 1576aa0b64384add0cbec0e1e5187ba992022ba5d1ac2ed6ad2d3cd888a8f97218bd42aeb8cb5e53677e8192dc4db4c7800b15fb18c6bcc320a2c67b5bd07a37
+DIST gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190331212654-76723241ea4e.mod 394 BLAKE2B 03ab5ba304253665f78c32d938e2603019d2affc82cdcdea5d14ddce39ee81fe9d9cbac9db23247bf983f7b284f3ab11f6cbebc9534af1912e719b2cdeb21b96 SHA512 2096f9ff0961448645c4fc6c3b8c3f12724219074d6f4c0ad0fdbbb2be23e263cdce4a33b6bd483595aca3be46a25d6b2d7715e5ea2bc06b76fc6ebe71ca12e2
+DIST google.golang.org%2Fapi%2F@v%2Fv0.0.0-20160322025152-9bf6e6e569ff.mod 29 BLAKE2B 411ad882e1d61d9e7a02f83256abf55c6a9557a980b89d7fd1a8981cd44f81182c17659e2fec1f4a587163a16556076418f166e90118a04041a8c488f9bb69dd SHA512 f2367919f017863362525d492f3c7f9e36aa311a55f96533ad6a2db1dcbdc9628f516ca435a43cd63a09c677c3528c2fe386907fda1da7dcb69ac2f6c95bfdc1
+DIST google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.5.0.zip 408275 BLAKE2B d9469c2686d9899f2a61eb606d7f8d79637eba5d108ae077be3f2bb5b8fe7240378aac0660317597d46bf8aead251506ac0119488cbd54cba59921517b3fa726 SHA512 ae7510a820f4d2a46354c2c987c362ce70f782eaea0ff3a0a627e9cb4b08e07d6a1f29d24fac5be6a8784a7cf3e82708b427c022682377efc2b8872326e6635a
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod 171 BLAKE2B 09b1ead1721eaa1dab7106f0206fd6f1c1509ddd07f70d7a23f73a1c047b9b33b41bae2519d2ba7e5c6ca632a9082483080dbffe0af3c371934f2ceab9ad334c SHA512 f99bba4e696291aae951ea3865a1cbaf0ba2df7cde4f86e942b2e5f5a4dfc6dfde95c74e52ff31ba69f2aa2a838d21843343b2203c732279eede5936b92d7c8c
+DIST google.golang.org%2Fcloud%2F@v%2Fv0.0.0-20151119220103-975617b05ea8.mod 31 BLAKE2B 679418ac9c2ad45dc432c1fb2f8ae13482bcce67e3d83f3204380a5fe8b69ecb6f19114b8e10656880a434e012712ad94bfe3767874d88ac64960d86dd5548ed SHA512 1ce907ff4c74870bf960dc786a8a2d824ed8794c433af026bdb4fe29c40c0812187bd409e3dfb99bb91414e0ac5f766d3cfe0badfa6e1ac4a3e54de3f14c40dc
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip 7435365 BLAKE2B 7698ddb8160d66abd158a526a71371ffc975215c78fcb187171399c0a7f68b840b2e3d9b9ff631bd57d4e5aab7afb782acd137d41b68cfe8a7dcde60b7564249 SHA512 ad0e0016a55319377b549a55cead8f3d39916dbc2acd22ef7b9a93eb455e52f58ea46e306838a908054e6438b1f2006d1a74fe0dbeee9f3fba9e727fdd42deae
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod 323 BLAKE2B 76123f14f32c6702557406271ddd9e0304f0c9d5bb53c2b503a0a1ca74892da8a685270b6463faf7fe746f7398080f8364afc94b6f7ac8ba1170d645328ce5ca SHA512 67bb03661d5b872932d9a18ee7edc2908612a31db6391a8797e1cfa9aec45c6a3643b7943c4157db60f7e7aa235368a844c5e1fb382fa705074fc721c855a441
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.zip 13735276 BLAKE2B 65688decc106d00889a45f1d6c5bab03258219bfc47243b69dac1f65cf594cf0cbb8bc63b2aae2c0edbf6a2ec497711ba649f6959a47fcf6f331438a6ecd8365 SHA512 57882482efbba4e486cbf342e3302ff8f2477df6d4b5432ea5dd438c82982d0ffa13a9ad06b4a0cda200d4f026752d1a0e2da5b8883e8121ced0a279e479e0aa
+DIST google.golang.org%2Fgrpc%2F@v%2Fv0.0.0-20160317175043-d3ddb4469d5a.mod 30 BLAKE2B 8ec04a655d1d0c3cfde5c051842d84f8a8615d7d56563ad57769905212e0e7cc821933d5adedcb210c724de9699b6b9cd5bcfd3a2c9555516354d3e19ffd3482 SHA512 10c6aa20da47c7923358430b63d5d5264d54f6a6cf70b008ed157807c07073cd0c64bef9db282b39fdb523515e1429125079cc29273ba186f7e4b42712d3d37a
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod 795 BLAKE2B b825f2ab62a96b9b164410f761228575fd9882de37635c09803b9d2ce682ebbec30f301fd874aafaad95a5aa2431ba25962073e1bd4f336d8cb137e5939a8708 SHA512 585d4cf68b50a70d7967ac3941a7a83b83ed5df1a31773589a38348b6fdf247eb49e7778f7054b78ba1a65eef48d004a815abad932876cb1af2c09deea9c0db8
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod 532 BLAKE2B 4c46c03905fc660d54c7acdb5cd614db9429b0e1add087fa5068f41a72d04b2f776e8326d1181e63ce29078f075d2312f9b0baeaeb048ea3d73f2fdba111e35d SHA512 0171fadf89079d7c0f18b1401aedfd886888d0a4ec4e107aec191c3875c640990532e1f57a3f5306a2e5705ddcf7e09ab2ce4953710347c09deb1d9d5f2d3c1f
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.zip 1141475 BLAKE2B ec5a9cbd45f90db7991979e1b25fbdf13f242cead59116a9f5703461f0b2d20b643edf61b906afa54a6b730cb5a1be4483757c726c46b571dbece739610db041 SHA512 687e9528375d9b87ce91eb5c67b22d3a1157166c753f729e4d6c0d3d7964d459defedfe09e8fbe035e49d432130a7029432cbfbf6bae95cc560e715748d4d42c
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod 542 BLAKE2B d2411d4096489755e1a83388e3b3271930614b11b5d677af4a7ce0ee9c5d4618bda9ccf29c9dce7a2d0254676dfea8bd54c88ec857473f4beaee92d61da9c209 SHA512 a8ff8c888452392a2026849edd07ad5aa36691f7cb30357c33aee3457e03cac9daf48195b90c2ea62b71337c37bcea23d7a5996eaddc4330749487789dd70fb3
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.zip 1214793 BLAKE2B f2cdd928056e84499260c6ddd44594679f8c41bcda2630238d9281060998a6d76d1f63a5c72eff4dd30a44f2a8461f3fc85778699088bd54aa9e79c31c615420 SHA512 132d92c90c8ea502c3169966e717f56d1a437018190fbbf3f750aabe87276563265e30529a87e41be0a8192cac09547e231340e6dfefd657436cd5fea07bf7b3
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod 83 BLAKE2B 4cef0579e4d6b156c1af532343070021171ead815734fe1210a0be6a8ba9bc5f3d11b97ee14cde810f2556bca76c206520f56363ee82af7409772d33301e413d SHA512 3cb3393e78f44d9de80074244756d5e309d19adca15e8313a392b925a687edad46e93c612da1539dc09d0c0072a063eede6f04fbd9e5671059e9857da0f7b1e6
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod 128 BLAKE2B 79cca062b7c73fedaa5357b7b43af16adc1ef83a86be48787887ec450e022d31e0700b7ca4cf5dca03bf2ad9db79727da0fbb89c73bdb006db6b68d75c3e1751 SHA512 bf45db2ba4ae10b447c471118551d337125d5432142f5aa4ba964054d09393730c23373e42eb34574ca93f9b1a12364669be13ba7faa7d9908cacb982984d414
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod 158 BLAKE2B 8cafd0a40647244f2dd1d3d3da7ef8e376c6eb3823fca68d7aeb041d480e1147b70b70c49c65e47ff1e9b92eba026a109c67c7900da88cf8569ebd037912a35c SHA512 7d00ab108b35ba41ed8c6ad54533bbbd967e0cdf39e62cb8914c0c6e4a531c779a28ea3fb2a4a7f6f4af7f3c922246a8d8ec8eabb779758245cedbebfdd97378
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod 128 BLAKE2B e36e105129abbd7729a6d509724246766c16df526ce22637e92ca8f29bf854b66622a0afc5afe8e4ad29c9efc498c488a87020fad5969e044757d49ed4bd6399 SHA512 802c0df5ed11f0bb2e221c01152c6339d3634068f89aac760654411884e6b936b031cbfabad57c5add340f9d504edfcd683c77cb0ba7d753e06bc604095257ce
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod 158 BLAKE2B 46e19153fe487751cddafb86818a962b621b10c109e513ef22e7f5c93b44dd94c6a1636e6c03d0db6e5099536901821549859bcf84f06c00483637d5d4284c43 SHA512 4797f4305d5b0159aba0825c0432cc5678cb74e55cd95eb5c42e9879a62db5aefa76c6286a436aee9a31b096193e8a3bc2e67175f0296c9d5eca3d03e98ab2d9
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.zip 1491602 BLAKE2B 7fcfd0d05fe509a3e30885304b7ec76a538fdc9cde84d44fb90a32aebbd14bdffd5f3f7e36f9ba24ef87decec89fa824963780b152faf43f3799c8e64e822f34 SHA512 91a070430e3a44edc4f66d6b2ecfcfeb4c633a07c252d1494ecbc9a37141483cb7bc9bfc641022a59e740ccfe9c4ed52e263d59eb85b5bc37a66088bafb6ca8a
+DIST gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod 36 BLAKE2B 33002a8288351a233f5e8236743a91df1f630355380a4ae8df10c32abc03470955eac6c15c95655caec990eb17ef2661985570e49293cb146517828090d95635 SHA512 8482c3135335a3a69611529f0d50bd19257b0fe8a8de2d4f2d6441ccde5f1e7a57d487cedc375575c5fe16094e5fc1c7f7f1a6bf04acc8a9d4f92701db279002
+DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20141024133853-64131543e789.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip 41481 BLAKE2B b952f04dc8d4717c839de5a5b7780ec2434915d11f897cc759647f71073dd3df717e1195ff2f4f804457195886c63620b342a089fc489f5deafa9c928708d4bb SHA512 40a523fc1dcc36677a0dc0e626313d44a308fa2ad5eedf7b616470ae2972dd8f5b78c18384efffa65d58391e60b704ed35db5557a5dce8362ae45204f64b721d
+DIST gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod 31 BLAKE2B 1a4baffd98c62173795d54bc25845b710fe8391726fc5d67cd6025131f783a3d94cd474299d72f5f077dc529203dcdf7a069268dc30fa39d9b3f7fab566df45b SHA512 b8685a6e649de49671d079375ba2132a467bb015a29a7182744caa9464f5e7ac72a952b10faf04e5b6d745ec955b565dc03cbc4ca9849d23ebd5303a12f18401
+DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178
+DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod 28 BLAKE2B ee2514c386f6cb3ff4a9b829d903e57372ce765aeab91fb2f29e95358e3472e0612a00f2982f53790159738e416819e368afa03e44bf8f6b43511347bc6d6995 SHA512 7cf7d1933039974dd4fa16febc52cc118bcd0e35c329d4c563c7f411b8000d9e17be5bca9a60d94f5309cbef97b3d176110704ebfbc3c114572cbadf63a55a34
+DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip 40894 BLAKE2B 5edf237401ae1a48c425ffec6fc67146850d7137c7026260e894656f6c832066321d930151bdd7624489e1f768fc04b47b0fd3dac3b2171bd092dff344de16a7 SHA512 f99afc545324e49ef1de05fd4c8dde0dae37094e2fb1b81de8d8c9b8ba9b28f39f9b5ab715c728e4a0375544a48d49c2dbd719fc178d222e0b914a425d9aeb63
+DIST gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod 50 BLAKE2B c715a977e733670d4047cc0f62fd485ce2af214d87e799cdea97015f64ee66488e1f68f4aec8e8ab139cd70574a0dd5f54b7bcedad09b8890ad098bcb01d7f5f SHA512 2d48fa45b7183412ac358a60c0af0b3c2f77d5c461f6bf4ba5d7a162195d49076870e739ac6c59e95d41dae2002370f52faf183fd6ca7999d60374866fa3ebdc
+DIST gopkg.in%2Fgorp.v1%2F@v%2Fv1.7.2.mod 24 BLAKE2B 9588790fb20149d89a8c642c78b290ec899213f9c17c823720783faffa7c5efe49deb8c34ee4e33516266c673be5e3a735ef541d30a5e3bf1f61d97f2e86438a SHA512 8d9f15ab56fae617fbbea6ec487691eac23cfe91a7da046fb1d9be206c5a0c88ce541148012a970fd9059d1663c4b37318f86665676c0f4fab5e92d2627a7598
+DIST gopkg.in%2Fgorp.v1%2F@v%2Fv1.7.2.zip 39742 BLAKE2B f7a98d3ae247b3ad78565361121aa4c8511b64abdfbe070b3e4c706f27721ded5cbcc22b275c89aae3267b8fe96f03dad01dd8aa6800bf644ac07767db9b2c83 SHA512 3dd995952e9a692756220126a4ef767142e90c7b91810ffd6c5a0821f180498201a6d080ced7fd85f842cbd42fc0d13bcd9e0f19fa6a762dcf46bdc7c659c5de
+DIST gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod 23 BLAKE2B 7e865218970f4a4fa06035c7474ea6a854843051fafd593b393007eb606d813e7817d2444697c68a3c63ce44d57b2f7bd47348ae6e4481bd11f43ed6ace64e5a SHA512 cb350a878f5cb581d62859e605c732ff92a0b92295c28eb17f17768845feef85c1838bda755ff952a8c939f6a46e9cbf5dd77b6e278adf8197a418111e2f98dc
+DIST gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip 15882 BLAKE2B 00d4a14f02231cee71bf55946b52e491df36745bffbc58affd61d73e0266bf259bd19595364c094dda028f84838442c65be69e240f8a23aa5d83f4eb7b3d3d84 SHA512 bfd1d29d3514659d778c1ef699b23bd6b5980620992d9aba56f62bc3870cf438a7f179e9b7bfc02f398cf1ffaf13652fd9b8d1c90c0fbf2ab315bf0b02a97c2b
+DIST gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.mod 40 BLAKE2B 33144c2d794f0c82dd97c993506bb6267aa9c65eb99c535e92b206dfdbba0d257a64b12d553f85ec2c770c87c196db9fda863c7f757778e4b36d4cb0fc98f844 SHA512 93ccbb29e7c38516a22d7ac174d4c2e9b87203061ae7bcdffa92499f30470e90d7e88f515f789e1a15c34cfaa6e7c50249e3d26ea1ef8b2afcd92dde62cba044
+DIST gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod 86 BLAKE2B a2c81f0cabd00084e6e52de82e9ba9a5bdf42d45123b7a58ebe4baa07b41631498c7590535884282869c4947b4f4f9ea0f41bfd28c1c7bbd516ea5631f207e30 SHA512 84c11a71dfd5f94cbcc79aaa8d387600ea3eec89cdb44bc63e55daad5700dc20aa719ce7a5c960cf97900231bedd118afbd93c408aec449e68ed5d8c5641ff57
+DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.2.2.mod 34 BLAKE2B 618a69c0e95948b23d494ad15cc5572b4d0cd35929ae65433b179b7482b70ae86167346300267b20c48814313278e1ff43e92935899d1405e7561d6c994e2f15 SHA512 a9022561a9dfe5056793fe3dc81625b8093eb32c67c5cba0ab5d82348aa72f1deeca161603773369c4f02ef4e753c0f751819199b292326277a149546ae54e62
+DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod 24 BLAKE2B 24a0c476e6590543f1b46175c4f0e036498afd9af616f6e204cac280e61cc10454e0c2a54fe10b9a7a306715ab966a5822ad78626c6cf20c2c78aac02598c922 SHA512 b147b03cabc4666519b94f4d9c7d9fefdea45810e3e35a9b3d303dba491d486fe03c0d5969a6186adbb9c75665e4f3e9811c7bf4ce72c46280b053611c198c41
+DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip 5099 BLAKE2B 56a68e317ccf9e6b0912331e7006742c3bfffd087742293b3d48ca7069c707db57b3722179c76b8c724303c8d58ac9ebf847c4277ed38a59e1510c676ebc941c SHA512 658ebdf931b23afe9d9d5d33d6c910fba7cf37740efe7052ba7627199c1a5fa4f93f093796674e341109430ba1f1b5ea933ea4a32356f63eaf337f05a562004a
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod 24 BLAKE2B 1cb17a1c6b1eb33cebd983f9e965f6db03f5095441d7cd72aff6df805501eef4dc249c22ecc85da360c27696a7c4ae613f0769a1f89e73f286281de89ffd3ef2 SHA512 89b481cc62ed7a486990ebfcf65cf7a344e5d189deef680e6ddd82dc93f31d166af05fc27b4a95ea27c33fd3ced1b87d4050d617d52008ca059c4a5d3b6c26a9
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d01f3d89a2db6930f406aded7889530b04689ea34b53fa2a7af352c264681ee40b1d192c86ca2f7dcc33dca825d355694527e4dbf SHA512 19f019e85b8c9a533c3cf2fd492b1813272f00cce06a56ffe43046935e49ccf6e191ce83f1d236f6355bae7126aa722016f05174687ff2faf54f121958266edf
+DIST gotest.tools%2F@v%2Fv2.2.0+incompatible.mod 20 BLAKE2B 25d11078b1caa5a705f3ae32f28d155683dfe0109d96531b1fc20e632acdc2f8429395975e6509f5dc78bc042b5e70e90fa2daa9790c39eb3422cbc189fb21af SHA512 5a73bc54777766425ba833348d2986408baedcaff86acf1648384bbcb31e302b0b0de38e1a92d53083551e35c62f375262497c0d5a37c9fb39824ae68fe8113e
+DIST gotest.tools%2F@v%2Fv2.2.0+incompatible.zip 88327 BLAKE2B 8730134244a00fb47b24b347ee4758fac8c11e3f627788c03d6568af129acb5b911b08857ab77a619bf571986ee90dd1c6c6aa12fd8e6e26d395a64bb7513a8b SHA512 66a13fedc358399644b869ac4b39a295c6c15d642e074ec66ff042e1b109f9603bc941ff25aaf7d9bc700f6c2fb1f60bf2a637a471e26ae037d822f0f1e2c518
+DIST helm.sh%2Fhelm%2Fv3%2F@v%2Fv3.1.2.mod 1527 BLAKE2B 4d4b6b3b736e23217a39acc36caff69ca617c45f7e6ac69de9434716384cc60224f2b80187e4f6532317ad38b4112943a99170de5724d037ad87fea4c4edf451 SHA512 fec0ad763c06003203f8b39dfb7b019012204a36908ea201a08b7cf8de6aa9c261a5b9a9ac53c7b116e1c14fbce06d91a7d3dabd4cfcdaffba0651bc5545ddaf
+DIST helm.sh%2Fhelm%2Fv3%2F@v%2Fv3.1.2.zip 1017397 BLAKE2B a0e38bbda8e43d62f3280f83773f0df27a4e89206db98cc4a898185f787aa4dad9071bafa8bec5e51fe6ffdd05bce10582ad8099b9ecb95a3686dcc16f7cb502 SHA512 e219f22dcada2ae183a11064d47eaeeb2df655216cd2f807e5753e923646b5ab3cc649763e30826c6b7bca9f4305c095712d0d96d775ccdc1a79738edd59b718
+DIST helm.sh%2Fhelm%2Fv3%2F@v%2Fv3.2.0-rc.1.mod 1731 BLAKE2B ed407e291a1f7b0d8f57d0ef836edbf188cce9ea3b69fd937c51df7759e482f0846e39cdbf7922ff2364be88f87f502bd338fcbec6d517a5e72213492024877b SHA512 18c27de94db477dca276c3ec6661ba4d76a6c6368dc54fdf1fde2cffb54bb6ab16a56f2bb287a23e8ca917aa18143a71c8faa5df6a6de39d511fb088a383f36a
+DIST helm.sh%2Fhelm%2Fv3%2F@v%2Fv3.2.0-rc.1.zip 1148610 BLAKE2B 1aae9a041db13573d892162b6635922c32b9b989e1989dcca47a52fd4e90d0ab4a7193fc6178faf8cda7abeaa4fd56930e20ccec5b7485abf003c63a5774c85d SHA512 dbdba293bebbe319e31cd1771839ee67424a4de48d14503cbf97c2cc86d05613af7fbdd41146a4274c2322066319eb2f548223b94a84468ae64e76a8a3a3ccef
+DIST helm.sh%2Fhelm%2Fv3%2F@v%2Fv3.2.0.mod 1731 BLAKE2B ed407e291a1f7b0d8f57d0ef836edbf188cce9ea3b69fd937c51df7759e482f0846e39cdbf7922ff2364be88f87f502bd338fcbec6d517a5e72213492024877b SHA512 18c27de94db477dca276c3ec6661ba4d76a6c6368dc54fdf1fde2cffb54bb6ab16a56f2bb287a23e8ca917aa18143a71c8faa5df6a6de39d511fb088a383f36a
+DIST helm.sh%2Fhelm%2Fv3%2F@v%2Fv3.2.0.zip 1137621 BLAKE2B 85a28c9ce4d6d6f0250a05e5a11fc7dbc29797044625be09b442bc53b16b615f89a581609eee2351c170a7c4e9cbe85b6d29a8cdebd037d9d5322ee9c1a987be SHA512 18e3389690da7322af4db1b49e03e3be16ac628c55e07ff2437dfce21f40fd7f25ce67a51e10a563ee6245ba98e1bb5bb66cdd05879c174cc7fc933a343b61d7
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST k8s.io%2Fapi%2F@v%2Fv0.17.2.mod 505 BLAKE2B 405b92d5c64c6d2a327ec4712958588f243a9a8cde1482349d2d3e57690afaacb421dc21c6fe80a23ff7b46f6692a3c54203e118f16559380fd00567ce00c11c SHA512 8817dc3f946010b3fb20504c51dc9c7d756d26721e6f95ad9c007a7440188a05debc0a8d931fc6e0ff42c708ae1af95ea33e141dd17182fe48db3cb02e0191a1
+DIST k8s.io%2Fapi%2F@v%2Fv0.18.0.mod 475 BLAKE2B ac30820fa8c3fe58d2b98ae9e46505c68ed009b27a25eeb23edc1fca76e8e37c2b0dc695ffa7eaf5147242781649551c2edad150997a7bc499ccf84f0b5f03c5 SHA512 7ef5f5b32ec02042c913ddcbd433dbc5c5fdcf5a4747509031ef5920a58a1bc7f1708e966624ea887ac96c919f7693a669cb4fb392c74e6a0458eec8e17f37d8
+DIST k8s.io%2Fapi%2F@v%2Fv0.18.0.zip 3442466 BLAKE2B c5a0a38eb9883ab1d6663c7606229110bdd7a875cc7861c4ffa11fbf2924bd72cfa520cf4425931149d99ed3e5e36679a076a8cabd4fda238d6cebf96d95a12a SHA512 8d8f54fd006a897d322b389c1e533c7102344810bd0a3a839199879414fdcaf111a9ac94ddb8947db828ffe9bc63b740a30cf338a9cd9ece216b8995dec47d6b
+DIST k8s.io%2Fapi%2F@v%2Fv0.18.2.mod 475 BLAKE2B 53e898621cf26565e2d9f3cf4ea4c04a962d3c3521f771496b0da55aa8e7efc142748b8c218cd0828f196716901fe80aec97780cc016607b7fd555af51c004c6 SHA512 1938d9b9c29f782286c54620434f3ea95773d9ecba8b6bae5472ba7ebac744e69afaf8e681414a394c3fda1ba38b4b0db65a83805b4d8c8a2dfef679eb843107
+DIST k8s.io%2Fapi%2F@v%2Fv0.18.2.zip 3442467 BLAKE2B a4cf569a2d07035862e73837c42fae41cd8bc901f95f09d5193af1dd7342b502c9cd2a569c79093af072842a795735f53ef78a39bcfe00b6ed0930d12aa0db9b SHA512 b4b27577bdd5d7ff3bd2c95b0e2f3dbe9528d219da4e142ac189aea660895f29b28cde389f16bf9cf6f790fb8c787880a378f1b5f4b8f415769019407c39b8e2
+DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.17.2.mod 1585 BLAKE2B 14369480397c9d58d453599ebe39295654188686746b42a7b8c8a2a92dca8fe972bcd9920101c574576560a65040f85d6a7b7032925b264751784611d670aa68 SHA512 bc5ac85d03d345ec6de78262c52297b61cbed9f22a7f431b68bee259cf01963f7d534fa229d8cdf714d5df80d9386c8d1adcd4483b00a5ef1316c95a71520fbb
+DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.17.2.zip 591982 BLAKE2B 9eab272c51ed093763f37e9df839d61535df67bb6b3f9742c267534a83e8de66c6954acfb5896c1bc4c51abc5d3b4009e4f65e4419f8a97fa1853a655fe93060 SHA512 b883669830458e47a4f3ae0a35719e6523a2b662ad8462d6ab5e139d77e12f455c66c2d204a4ee3bb7fe5a243cc327fbdb454b87b127ce4f1919e9ec53dd6b97
+DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.18.0.mod 1527 BLAKE2B 83aeb7da9e70f337f4778a7ead4b5a24745baf5836ff75e5e2848f08bbb4abe1f5a0f3a0446f569d7927425c5f773dea642edb757f295ba3d5ebaf40766db42b SHA512 e4c696fc06d257cd8f3457e59cec1567b27399bb684c8dd67ef37a751aae5eaf47ec4f250f0905a6cc23ba6579a1af5f48da8d33e08166d3e905055078aa8403
+DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.18.0.zip 604196 BLAKE2B 90e8387d1eeccf4ca979b3c66699ae0fad8b5d3dd35db60922e295dda3f2b765789e4584f9a99a5f5b8f2384e10663543a5c81860797740e92c926d3a7508fbc SHA512 b8a1ee8b2572fa4c67b4dfd7145fe87914a69a80a3f084bd576050e8a2a30ce0dc325109dffb999663e8acb23a9b72ea0399dcd1795fa69c29f7befae0fc0663
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.17.2.mod 1618 BLAKE2B 3adab28947dc91814453d8ad3929935f8e863ddcb272266e30a55bce506b05e361eb621e1227a420f90c6b6a58fb0da3c528d524d10a912ee7d75f7b6ea42ce7 SHA512 53c488b7ffbc76d32f905b0dd92577c9a9b9d5c30b810e09ecf2242cb3fec1033a71aef4bbcc53bcf4d4096d0cfa3069acbe49c40c7548553a0ae7b0af4d8ef4
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.18.0.mod 1605 BLAKE2B 7863e328cd5985db939aedbc154aa73c9fabbaa3554d21e6cce2bf02c6c07251f0fdc7c330cd9cc0b7470c6646145ad2f50ecb229b774f56ca6161a11a865fbc SHA512 7bf3281763e6aea61c2b1e83e97c74b3cb20151bb35ec5b6061a3de2a12025c488abd560e68ad90b8bb6a238a493973ea0caf016c24bff5b2ca739faed9ef0fe
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.18.0.zip 782249 BLAKE2B 86edcb0aa2b8d3d56da1a9a597506e4d7a78ab4be10cd1e7c8b8186e05e36d94e7a9139c167f8255600a3dc2e48d2382423ca6e253c8fef836a1e1a3c6073804 SHA512 819dfab278769ec74f1db24daa293bb443b4fd1d473b0016a499b167baf18affc3dc02b48601997c43ad555d8394545b75d0c76a12dfaa6a33a9621e32865a7f
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.18.2.mod 1605 BLAKE2B 7863e328cd5985db939aedbc154aa73c9fabbaa3554d21e6cce2bf02c6c07251f0fdc7c330cd9cc0b7470c6646145ad2f50ecb229b774f56ca6161a11a865fbc SHA512 7bf3281763e6aea61c2b1e83e97c74b3cb20151bb35ec5b6061a3de2a12025c488abd560e68ad90b8bb6a238a493973ea0caf016c24bff5b2ca739faed9ef0fe
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.18.2.zip 782310 BLAKE2B d8c52798f72eed2ec584ac963c77b2e37e4a30586cfb44fddda7231a384b04b08517b8a900cf9ad33109e3b29606971626fff6a91e9937879396351223ae8839 SHA512 591cb092d7d5862ccfa3c48d22ae7b0f1a08951aed579a4a78899547f2904d1dc5986ab45537fd1368e07c0f72c41fb2084289dc9bac105e738f029851b15c37
+DIST k8s.io%2Fapiserver%2F@v%2Fv0.17.2.mod 2745 BLAKE2B 09b3a2c8c4786018b156f1cea3654ea6c88b51f1497a2ab4ae5661e7b8a516fded12999d7db4288ad35ea09f1f47ab0121ddd215ff20fb1a38f7fbeede0951f4 SHA512 097684e1195a0a982d6cbe65ca628664a97a63a418beac34fb9911da5ae4dbd61500ba18ba6aa85dc1dea004a340d6ce6b40f8e49ad370ee09e5f4e8463578f6
+DIST k8s.io%2Fapiserver%2F@v%2Fv0.18.0.mod 2631 BLAKE2B 66d2b46bba152f0cfc006aa81e6225ce6ee2eb846431046db0e9a56e9af6b883d1797b7c43d11cb47aadb27235c23d758c0c98de7a95d2f9598bc20f7333211c SHA512 d2859003d1c2a2bc2844f8904e66f648d39a09e2847dd411ee68b6004ddc3e8e65d75c5af805a614a02167a8d1dfdb8c31b66f7985d1b1811c535060623a1ebe
+DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.17.2.mod 1172 BLAKE2B 26b3dc0b046e2d3a4ff328d782269a3336ec6b4216f1835d861de9d1d232b7b6f836282271e3244d2884410c2663b9267d75b9b0dfc6af109ce5244e5a6c8794 SHA512 6146e8b103ad8751148cd527a71332269294be62bede816579821740cc647800d2c8b8460d6c0c5f56f41568681e1df290968c05c718a399e6ee36bd57a4286c
+DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.18.0.mod 1291 BLAKE2B abb1bd080a36998bd0f48f77a40f119a4c55b5e396a9daf5c8ebe5ff5b29f5b1e105a186aee71f39ecfc1c18baceb3ea33beb2cbf86c7e323420b48dac5b62a0 SHA512 d4f79849dbce635e8f80031fb406c0f4c52d5c8a9c2896d40c3d3463d069d6c3a62de422203a41acfd8f325595aae77450e90138e5fdf7c812dd1746ac3691cf
+DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.18.0.zip 463302 BLAKE2B 760bf8cba810832e43ac24d4379b3568fc353120fc1f410aeab0556925089a737410125a5e5591910297a8d5ab87dd075c537e009d4fd785481db3dafa3da23d SHA512 c8b4c133f5912a02aa839f802fabc5c11d0b0ad1c1b4ceb702a67da8db25c2594e022eb45e11249ce0455712e5acfdab9720eba5486ef456f9b37ce1d37d38d4
+DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.18.2.mod 1291 BLAKE2B 53049744d3bba2ee263814f6a0f0e25991893c514285068be1e4277ea84da23904de614f4bccc909788587da2febbc2d2e8fc36254b11f30e7ad4fdb560795cb SHA512 d5f8d76c7b2e3fe09616e1cae37781da190eccc15800881c378a03cd7261a283d19abcd4a08de5f78fab37338c205265eda1001449f3eeb8dbf9cfb85b12d4f5
+DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.18.2.zip 463303 BLAKE2B 7b831a9f9d02de77d1032255543f535de4f10e8974ff1431f2ef9d3e01832c7038ee427f707e853bcb658773d7d7ef06a103e18acc1260935e6bddea38845b88 SHA512 67bcf0725cc1fd8d1a84b94c0d8e754d49cf9eed53ad708a911e77143451c4ae46816e860a850008d000b720183593d0c947aa08addf08efc4db4d4082d78ba3
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.17.2.mod 1649 BLAKE2B f4b09caaab48fc4e52e8581042b61c5ae0d1fdcb7135dd2f3154c19c8b289cf299ed5f133c968bf586d8b707da9bac40b334c230aeef378fde90a2956e3a069a SHA512 8fcba798f1c04d4201dca42d9f5801da3e5087b8cec2be627c91649564ee901c2bee260cd3d86c21f27264ea7ad789aa3e3b6771f788a97d144f98040f166f1b
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.18.0.mod 1591 BLAKE2B f6f6b7dad0d604859d7e8f62b9ad93199d1696e19498f945eb8faa3d2733b34b5e599272e27bf817229a59ea7da9dc973c00a5763a8b23aa6a3633d0d5b214a3 SHA512 f454f2667824023ca333652f78d6da7d3760061d26faafd221a464660a2eae54958c69f4f4b66ba5f8aedf48de14c91e092bfbcd64a2861f8c72192984376bb5
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.18.0.zip 2145216 BLAKE2B c153c76422e1c41413f98aedd72861f92dc5e0386da4f420d36b0c62f504dab4ba50b6f1609cb6c825863a7db2c0cdba0569ec5d16c922a5b659ca11f44a92db SHA512 7c3987914c2fe141ad9b50b876bbecf8ce6128d14a956b98a2e3938f447930b83420faef7020270c0d51d77ae0a42861e1b93e6a825c7b87f52aa189da88492d
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.18.2.mod 1591 BLAKE2B 5c0f15086184ac14519810c86ac60a236c8ca3b002476f9c03da278fc2a46035f017bf23daa3cabcc7684a9c5e26fb0b7abcf3899fdf02492e2d639dcb7e3965 SHA512 974fe4d845ae6b2bc373d3bdc6280607a4617151ec05df10bef666e9e376b6b4275eda48a0a227875190ccf72a5254e86b47dfc4bc5d7f310414edfbaea408d2
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.18.2.zip 2145651 BLAKE2B 650c8c7251cd0470d2f3aaa65246af8eb312a6951b28f0152f93a8c02e282aa4e1640dc7adeb6db065760da79473f2f4751a264fa6b9c73385e1a6414a9c9702 SHA512 77b5da68eb55fc49ac01e4519481e0ef51766d9b06c5892bef4459d67098a3af1710b2dd46ae323638758fd475eee8f618b41fb808aea6853048d4335bc63af7
+DIST k8s.io%2Fcode-generator%2F@v%2Fv0.17.2.mod 1209 BLAKE2B 49be5cf7ea6cd809c3135660a5a586684cac197b3a0eeeb65a9ee08ab4614425a296c4c517c27bd70f2d042e30eace4ecfea2d05d3958489ffe88b449d4c3550 SHA512 4e8b189ef92a1bc66386f8328c082600b659ddd9891a0d38a5c9f051c6200aebee0881f273fddefe6ce13a4316b1337157e4e733b0ea9dd506aece36b2e64245
+DIST k8s.io%2Fcode-generator%2F@v%2Fv0.18.0.mod 1051 BLAKE2B 28c44c1ea38f4bb77ab538784e40af90093dd6e9cdc9dc8babc5bbc6322f6aa3483f97cea03c0fc9a3abfb95e64573e8f17959c6cecf5915b361ca7e30a25cfd SHA512 b3dc9fcd96c9996eeec0decdf5e7ae12c33bfa8d87e94b14566aca3a492bafdb509bfa619f1e977c7f1f8f051d63a0003c2abdfebef15b14f5c4c78812344a59
+DIST k8s.io%2Fcode-generator%2F@v%2Fv0.18.2.mod 1051 BLAKE2B 28c44c1ea38f4bb77ab538784e40af90093dd6e9cdc9dc8babc5bbc6322f6aa3483f97cea03c0fc9a3abfb95e64573e8f17959c6cecf5915b361ca7e30a25cfd SHA512 b3dc9fcd96c9996eeec0decdf5e7ae12c33bfa8d87e94b14566aca3a492bafdb509bfa619f1e977c7f1f8f051d63a0003c2abdfebef15b14f5c4c78812344a59
+DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.17.2.mod 893 BLAKE2B 94b5217c1d26265d5e588986e3ea42203db3508a164d8997bb2685ac65d7f5af3aa96dee2a7709b3fcf7a537aaa8b2661129cde85fca54f5ddf3f86643e0195f SHA512 1affb253ce3c62b082088d43eb0ccc5b228cd486e476b3e2dc95c6b89e4340d270299c5f028e7ba75ed4fd419ccbfa51918443779d4b93a0ae4c73c8a57d68c8
+DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.18.0.mod 898 BLAKE2B 6cc9e5252b2e886ec23d67511e7f17d0097b564a2a35547d5c0c03c603f1485787c6a1bc3a5aba7d6b91c5377191987d7947a6181587be97319e4969c5ab5123 SHA512 743600f77e0d833d652c2affa3c0e6bf7f20dd429a914220762f044cd6d7460e8d7ee23af29b84f5bf0f1b0d17e6c3f8cc0853d31dbfb6ea64e78f5d7a6eaff5
+DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.18.0.zip 146593 BLAKE2B 125f77ab92e623c0deee825aa1f7a411ef680a4d9386a6696177228288821add27caec82483e335905de0722b8bc5c030fa32805a4d22194607a39368ae7776c SHA512 62273c50136a4c1c8b7ebf2d4510440ee58ed9f18d90cb34e8ff1e8c6808f83542f2e70060546b6ca9a3003953b2d4f0c7adbdc0007709c31ff14ccdf8d6a7e7
+DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.18.2.mod 898 BLAKE2B 0b5f9bb93586d4690b113d436e0308a72b2c091d5c8184b1aa5cf0961f75acba903f227acb86c4bd4118ae455d929469c2fb337253fe028ddf6f736b4e61877d SHA512 a88ba3b681430e4f5bda742b5acad23540c1cfcf4bd18ab576cbeedb3ef885efabb25b72f238fc09a9c01032dfb60724918983fde51f7e5fd24ed2988b0bffac
+DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.18.2.zip 146595 BLAKE2B 3e311df57401f8fa1cf31a7144c73c5e197246b0ea3e5b94f04ec1520a59912c9c7cff652e725de8adc163adf80ed629bf48d1ddfecf6078260344df6f36a3be SHA512 93997ebc6af9ff6d1696a21afe306c88527bf63730af2f86c6ef9f60225047da19809a05e07630bb43ecd087b1da445db240b39527acd85120116fb7ea33af83
+DIST k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod 20 BLAKE2B ccdc31e151abf5dd6ff0453cb723ffae550c67c154d9de14cc2aaac1efac32063e57a1092e4341db6cbc6f58f639e3b34734859052ae76f21ce92af3ef61ffa4 SHA512 854a60e4fe9dec8121b68fa3102f977ad14264ed89bce9a6860117e80a3830a58565be00260da435f40452b28c6445fd191c90ca5134afea49458d676da49b07
+DIST k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190822140433-26a664648505.mod 20 BLAKE2B ccdc31e151abf5dd6ff0453cb723ffae550c67c154d9de14cc2aaac1efac32063e57a1092e4341db6cbc6f58f639e3b34734859052ae76f21ce92af3ef61ffa4 SHA512 854a60e4fe9dec8121b68fa3102f977ad14264ed89bce9a6860117e80a3830a58565be00260da435f40452b28c6445fd191c90ca5134afea49458d676da49b07
+DIST k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200114144118-36b2048a9120.mod 20 BLAKE2B ccdc31e151abf5dd6ff0453cb723ffae550c67c154d9de14cc2aaac1efac32063e57a1092e4341db6cbc6f58f639e3b34734859052ae76f21ce92af3ef61ffa4 SHA512 854a60e4fe9dec8121b68fa3102f977ad14264ed89bce9a6860117e80a3830a58565be00260da435f40452b28c6445fd191c90ca5134afea49458d676da49b07
+DIST k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod 19 BLAKE2B 2af8f84f1cc7227be731c55dbe33e87e9d4fbba134ae86b6a86bac30260f32c7f17422789189486b17e1a2b84cfdca35984dd6d6079aab621620e90da230a6ac SHA512 cd5afa0488338a1b22bb852219078d74d61f894fd075b60b22bf062dbc49ad16c1088ab55bc8ae72aeadb4f7fb9534b99adceeaf3913e47bbf00df1ead1c7aaf
+DIST k8s.io%2Fklog%2F@v%2Fv0.3.0.mod 19 BLAKE2B 2af8f84f1cc7227be731c55dbe33e87e9d4fbba134ae86b6a86bac30260f32c7f17422789189486b17e1a2b84cfdca35984dd6d6079aab621620e90da230a6ac SHA512 cd5afa0488338a1b22bb852219078d74d61f894fd075b60b22bf062dbc49ad16c1088ab55bc8ae72aeadb4f7fb9534b99adceeaf3913e47bbf00df1ead1c7aaf
+DIST k8s.io%2Fklog%2F@v%2Fv1.0.0.mod 68 BLAKE2B f745a62a974a42d1692705de032c8c651477ec71f32b0515adc02360e5a3de6c7d65f5d97960e78da06e99b0843c312a09701c08c6a5c112af832e3cd2e43649 SHA512 cfee3f10c26fafe7cbc510ff8cba479dfacedf1d95b4e25b75978656862067524b4b9f5e889455f2d74eacf07df7895fe266415a05b9502a759baf2e4bd3884a
+DIST k8s.io%2Fklog%2F@v%2Fv1.0.0.zip 39827 BLAKE2B 441907426e07ed46aeeb6314c615fceedd43bf1b21b07a31960b23e1cf31dc400f1d7f0304cd5c13db8c2d54aaec47d05425798508978cb25c7d05aa3fcf2fa4 SHA512 b28b559a8a6e46b206ac005497d2e061645a81a3dc4b4f2c2a9f84065aae024dfbe7c64e9a446f72f7f88b5dea31d0ee725b273fb79877e24fb27906e1500c2b
+DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20191107075043-30be4d16710a.mod 2088 BLAKE2B 407e0a8a7b3fdf35034c02c9a2b22a1dcb43347d3ce85b89088b04884d49a3a24eeb80a20263699bbce415707462375a420c92fd458016ea151884ac8d2da151 SHA512 b0969627b58ab34c898af158e1dceb5427a621c39c563537ac547c2213cd7034a5eb152840e359821d152bdb47b32426264bb3b86cf64cc1359191a943712340
+DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200121204235-bf4fb3bd569c.mod 1743 BLAKE2B 1f2f1c417b102908c388ebdabbe4686f756287951943eac396b07d8be7fa905a6d362442a2f99d5411aa19b27df038e699ec1264648e9c948126835df0f1a767 SHA512 6444514b3858974b4517ef18bbf82366363e2032e53a8a88db6bf2cda4105271ed672a49cac0d01aefe7f006cb69a8e8deebc077a91063571dd1b20fdf09b21c
+DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200121204235-bf4fb3bd569c.zip 826029 BLAKE2B 454d5c68dc5b2216ff9d38302a817349ed84e2a74e52cc115695d37e6d6b0425af6163b52a96b370a09a6034dffde3ebb362d6f112c2f8b8d0d59a90f9933a17 SHA512 5e4f061796cd04e9dccb2f43c292922363d670a2be8362bbc11b5cc4c658847585a552525ae604b909ab159f447bfbeea71b91c871b01374c749f75d117c3dc1
+DIST k8s.io%2Fkubectl%2F@v%2Fv0.17.2.mod 2669 BLAKE2B 2661544a96a59af43738e7f0c9c0a28f28bc15ce8050c72b6250ff08668e821ff6c0320289799292189be1dffe4468a1a433dcbde0b277cca560e3ee333f1d68 SHA512 9bcccc057a70ba96132fdd0418fb464581ff7f5e41f409f6942bafcf556a03d696ad31c1415a3bf34f41223485f812fb58bfbee0df92b255e3a0f23ccfa05416
+DIST k8s.io%2Fkubectl%2F@v%2Fv0.18.0.mod 2674 BLAKE2B 7ebcbe7a21230135fffa57633be6d3cb2f356200a371a94f5f653c4385c837416cf669774e7f9180f2f151bc957e17516bb14817fa3886620754ec23f2d4d1ed SHA512 189bffb0111bab15210d225304dc9973b78eda60d056bf3c5972df8ab453d506ef41161e2e3db27787212a59d8cca1d7d4a1d80069c19dc93f10e3ed98e8dcf9
+DIST k8s.io%2Fkubectl%2F@v%2Fv0.18.0.zip 3312721 BLAKE2B fa4ea05eb33293ee93fd8eec7601134f5ccb840b8f78f8dd2d5a95f639848a4f9dc8380241b1cffa49fbd9622b2105c3ff3bad42675b5f7fbb410dcab3c69b69 SHA512 a3eb4055d63f7dba025b85760e0201e9219480bab6be003851ea3630b075c35511605e080dec3bdba371f27278e79193590c0ce712e4eac8df86486e285dd7d3
+DIST k8s.io%2Fkubectl%2F@v%2Fv0.18.2.mod 2674 BLAKE2B 7f182c437e897fb0475e3aa7d94896d94149132046271276617077af7760b5290d941488b1375151f7efdf399a4332c06ac0d5adf8ba0b2fe6b87a9e148cf6f2 SHA512 09d47a90010deb4ce53668766b20aa04794b0909f8a77d8a035a8f1a3dd961ebd79e93ac8f0011afe1ac99d4c70e97aa888903692d03ddb542d176821d6599ff
+DIST k8s.io%2Fkubectl%2F@v%2Fv0.18.2.zip 3312787 BLAKE2B 86bb406164d040190a80f32695456a5310616441577419ff62cb13101e6a5af23c17e8e839d03670fe02eb15656175efd11830962f188e2bffb2dedc0be45a58 SHA512 bfbb9f04e6429860d91eddf6d9231840fa1d1663efecaf61544c11021d073c9d565e40ae63a8facb2f9c8405f7c565bc5891e3e1b04c72012ef9805cdc969d04
+DIST k8s.io%2Fkubernetes%2F@v%2Fv1.13.0.mod 25 BLAKE2B 4060536d51fac9854215957b1108a158adb0b3aeb8bfc659eca1140efdcf79cffe378db6f3cb1f4a4b68aa36468b7d5631e993d5a089eb839bd03b6b608496be SHA512 2349b7dbe8409836cc70d97c5b336f518b809f5731baf05ce68d957c9970895a9b7f89caf09763794cf13824ee29410b3a6e431b2da7f64610895c44b86c4d2d
+DIST k8s.io%2Fmetrics%2F@v%2Fv0.17.2.mod 722 BLAKE2B 8abfa2f744770db64668abec95c9a8b943007cf930896a18debf6fed62c3976fc17c89016cbd0026802c3ff1d07128c34cfe29ade7398115b1af2fa243ed1b96 SHA512 fb2e9b7cb390e65c6f198f250aad90e933a7f0b58d41898b75e4f6b33dfbae6e65128b8549f7f53759a8ca52c2a7021b9b483e39836d83a78d28bc1cb98f07f7
+DIST k8s.io%2Fmetrics%2F@v%2Fv0.18.0.mod 692 BLAKE2B 76478ff05c62c6946518a3ddb372257c396362b4637dee49165e1c0f77e5e2a8d9a0acb81a530474c8b558d5d0766db67307d9ec37f999aed7d43f793ba46c31 SHA512 2ba79ee78ccd463ae3901b57f5c54ab88302c7cf8784173874b0cc6f0df9dbbc6834db5aba21934b140add4e7c961645112af66b1796fc731a8aa06d37391885
+DIST k8s.io%2Fmetrics%2F@v%2Fv0.18.0.zip 174976 BLAKE2B 51696546f6814a08b23ad289c6ee7e5a588f3911f06e0c1f88ccb02e6b4c63db2d8e47e16e5d8e88f3011e2a4cdf1261d1a7a6551bac480c6d5cb16a898f5d20 SHA512 81cb57e2e9bafda9c7ce95e6f8e8f6838dc88c9878992a607d80882da40a99a1dee30c536e846b3d42b943464266555e0e929c202210f32328ecc7376871ae82
+DIST k8s.io%2Fmetrics%2F@v%2Fv0.18.2.mod 692 BLAKE2B 2c429014fb9d485138f32fc2385a7cac7a3f6e2979b81bfd4ae55aeb7fcd3a1b762ab4b1f493f64e30cebd51d13f6c96b5e8b27768f4f955fbd2f53732766d95 SHA512 fed8202fd5285d50e34204a5e0d8f4d6d5728f58219bc3757614669b29eed2a9c73f13e998fd01c9b4c05839d0f644635b6273e63d2a12de142e5bb04101d6d3
+DIST k8s.io%2Fmetrics%2F@v%2Fv0.18.2.zip 174979 BLAKE2B 548ab405e6e5efbc7faad01cffae03a62309b21bc8d4628ea1b55c83037db30176d8859f44bb7b953aebca1d4b7cb8c309a1a24a9e8f9e5d846063b1263ece8e SHA512 231eb7d8668163db2ebaa16e8a76e912eb3960a3f617a4969cbcec5080af33d27827e6fbb2d74ad4ecc6fc04f6a342b1dc2567594f37477a5f5effc53a7dd030
+DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20191114184206-e782cd3c129f.mod 164 BLAKE2B cd4086710de69fcfd2179978f78cb5fb4633a6700b6cab545a83a733fef06e492428deb492149294c3fea186aa01b86080d2a387c1af2a789f35b5f37abfc7ac SHA512 d2cb2a60b25ab16fe3d377d4811a04503c068eef7901bb971f4107d3cc1339279ee95e3c3967651c98112b61fa7bc0fd913dd61a8aec6348180fa8bb357914c5
+DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.mod 164 BLAKE2B cd4086710de69fcfd2179978f78cb5fb4633a6700b6cab545a83a733fef06e492428deb492149294c3fea186aa01b86080d2a387c1af2a789f35b5f37abfc7ac SHA512 d2cb2a60b25ab16fe3d377d4811a04503c068eef7901bb971f4107d3cc1339279ee95e3c3967651c98112b61fa7bc0fd913dd61a8aec6348180fa8bb357914c5
+DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.zip 147166 BLAKE2B a9d5897231997c8184aba7c58d6b31fa8413d7c94e48f52fb59f171f537d0e9a047055a5e717e411c7f0dbc63bf1794c2a425c278724eeb73de59e7bbd8d2ee0 SHA512 49641d1a253a5469d9dec1e104b5ecbd7033e28f8ab08c351edea432687fb1bf902d9fbf3ea2ef217b82ab06ca3f2453a1dccf03468d38281c847e19477641df
+DIST k9scli-0.20.5.tar.gz 6075161 BLAKE2B 4de3f1f354e56b6d7d8fd2f9cf30ffa1b45e780e3db63e3b18833a5f25448c6a726962388b3569b877389f30367e94534bcf025791e2382838e531667bcaa08f SHA512 5d03f07140c6f0ee41c5cee548539cb97a2a005271217d82b582255852f17821ba8c40ee415151a11636ae637d910416112dfed75a46da83ad3206106fb52f4e
+DIST modernc.org%2Fcc%2F@v%2Fv1.0.0.mod 22 BLAKE2B 26488aa7e4d0339d58279e663998091c24b5a6d4d026ea71166c06695034ffb5011d20f49c151c6a41481c6cb5648806ae5201bffcf4e2e49b6e7ec9375d9469 SHA512 22847329a9a431f222a2bde9c743aa5d76e737e2535b53273c31cb641c89fa4b73e51de12f84fb6da532b060a1daa084c5150502e3ab4e311eaff351f10617fa
+DIST modernc.org%2Fgolex%2F@v%2Fv1.0.0.mod 25 BLAKE2B 5ae90f4bebc5486b84fbad78cbb9e747a2b1710805a35eefb93fb5f860c7850242067bf79c38a7a076f9f5823995cb4a2fa0120491258cfee9e87fd5996cbbf2 SHA512 764e7459060a8e7e90c8b8714926cb8b1eeb130789d1d89eb52e4dec5be83298bfe03647720c0e84d5aa9cf293a38f041e1696ccfe60a87cd1ef7316190b41ac
+DIST modernc.org%2Fmathutil%2F@v%2Fv1.0.0.mod 28 BLAKE2B d93ac859fd33dd8b36dcb992876edf1470206d4a455f6dbfc3a8be76aa84cd3b1a16a12e23d857b090ee5b18ba51441c90bc5d6a4bb35430193d7f99d61a3725 SHA512 53b0f0324ef1cc51f322d535b2199362be3962aa8e2d1c32b0c58da2fd4f65f8f19450089d78fc58aa89ff5903500ae2cb60ba38d89373c9f58f075db0ba80fa
+DIST modernc.org%2Fstrutil%2F@v%2Fv1.0.0.mod 27 BLAKE2B 16f598b7535482c888f2e41038dd4280846bb4a04d796f5c5e57f23bc74f634273f28841eaf40cf911b1bc27046ca8471bc0b2f7e4f93f4b605240eb0d755d54 SHA512 ecd195420e68552b6abe9bc99447e47f63ad37bee567b2b143eb612b60796a087f7948491f83c2b95e22e7ff9467f779702a0bd8557368078675964dd3748c7a
+DIST modernc.org%2Fxc%2F@v%2Fv1.0.0.mod 22 BLAKE2B 27cf5be7229a20978f3b7e622f03e3d10c1a0feee65a7d785315ad461841e2cdad9cac5a932f014738d7240c0d1f42ad2fda7fafb3519463e6bdc6ce985dd139 SHA512 fa34823abcf78a4a884d7c0ce3807e519547389f0b9f5026ac6b600f4f22d336ebc93e2c28519c2b5aed7073f11c09234d694dc922d92fa3990c97f42d6cfa91
+DIST sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.7.mod 172 BLAKE2B 76dc350439e69f75cfc082d93ee6649320fa8e311933db45425d4489f0ea21aeb8c1342b13e86d1a40c092788592e3d31e55cb550f05a3079fb60dc87f2a739f SHA512 ab153a98f7ccba57905e02e1bebc462ef2e3a86b459c0cbf8d346a2aa8eb044fd474ad2a267dfa2421d1b31d51d6db6f1ba9739cfcef8ee8c02bef554a39a40e
+DIST sigs.k8s.io%2Fkustomize%2F@v%2Fv2.0.3+incompatible.mod 29 BLAKE2B 6dcd5ffe918a42923b91bba22b5ed6da6b907cdb47dd93a471841ee92776606efcf74a0a788f188271a45682de307ac68cf68cd52089cf0398282256e3ef44a7 SHA512 2f557369d03b9991cb84462ac25e6fe937a543cae729e6dcdfd97d2e01d334d42124790442eda51dd1c87409e74d4047a523c020e4a5bf8b773dd065cd94bb69
+DIST sigs.k8s.io%2Fkustomize%2F@v%2Fv2.0.3+incompatible.zip 486035 BLAKE2B 9ab10ce74e3017ff57247747bc215b01c3da80539687369da2e12653c83a2f5336bdaec76f6ebde44187bade73372878578302f51337bc2b321c5b76f82ddf4a SHA512 a7c6ea8f2e9f5b321d4c9c1f85bca3e27a9ffe72a252227022299ba1f54634a93a36d021845ea6ac2c939eaf4e02edf345a70b740a124358b7f26b90ed0d2177
+DIST sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod 74 BLAKE2B c2d88e59e640cf540f7547fa0b67caeecd7424a1dc243681a020d233fab5126dc11f73c18032e0eb8edc7bf9d32dc2902183bf76af255f60f186f16c97055e2d SHA512 94785a6d41763ef86959d6ba291cfb34eb7b35f6599042299604fe6f35a666fa388e9d7bcac282d1370dcc5f99c6ac22f2b677ff9b9920aae8f0d9097ea224c5
+DIST sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv1.0.1-0.20191108220359-b1b620dd3f06.mod 334 BLAKE2B 920b3fce37af000b4956b9eac7782f6000b91ce04c93fd67e709e8347d4e13b63d894b2c762d927940978455c6fe7a9b02f643f5050218a749a7fe40a28458ca SHA512 58b3f092f22d417aa0fdbc3795f9dbd244b63b9f888b51b335021402e725a9babeba56f101337f5726185b031b3400e3b022e4d76e3f1debaf5281d4360add42
+DIST sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv1.0.1-0.20191108220359-b1b620dd3f06.zip 190773 BLAKE2B e94391e947a5749989c8d853ae7e42dca1a402165283f494cc2ecc35b32c839e4d731e6a46082b175ccad06d0c47c96f25dcce50c9569fd04ed21b7c0d1fc607 SHA512 024c8730d65217f8a9f6d0f13ea83d2f44429e479834185e1b856f25fcf22aa6a2317dd6ea75d811dfdcd13a929afe9d87052aacddee5c5f0e5a566c55d00d7d
+DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.mod 298 BLAKE2B c8069652ef0558d03282ef0f8444222d09708f1dcdc1ab19ed698d7acfb8d3421d9d9c9d053f3060848673d3dd30befd94c09b075ced36f79bef28940e7b351b SHA512 d153dd32bc1485e17771bad3142f576d967e0986702050431a656eb990af3bbfe809542745ac7752c0d72e6beee78bf3c285a4b41b37b8ebef50ecd7b3f53f8d
+DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.mod 298 BLAKE2B c8069652ef0558d03282ef0f8444222d09708f1dcdc1ab19ed698d7acfb8d3421d9d9c9d053f3060848673d3dd30befd94c09b075ced36f79bef28940e7b351b SHA512 d153dd32bc1485e17771bad3142f576d967e0986702050431a656eb990af3bbfe809542745ac7752c0d72e6beee78bf3c285a4b41b37b8ebef50ecd7b3f53f8d
+DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.zip 215199 BLAKE2B 10e6de70852ce1a49e1091f10305e217d873bf92d727ef5c773376eb5bd4fe7ed09f4bba82b59b8fddb7bb67709428f0ff02068bd025df35c196b29abf9d57ff SHA512 f61f3d2c31c00c2c016ebbf48f051920cb461429c8d0e46b2995efa18e5b03cbfaee429c2b545979546ac82cb3439274133f4e898d0d3f2c9e3636d673818f6c
+DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
+DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod 106 BLAKE2B bd5d8af6c5046c6de9b171ea2915c308de08e9696a8c82b3831bf5dc01f8aefc21b13b5b9a210f24ff8782909308137c25363074753427109e009889b7860f5f SHA512 712a936d07bfe4c2e67a4f199346d7e96db35486a0f051365c4636ddbc6505cf540995bc67e6a03b1b58e1e4816ece573418f23bf9ce93fcdc141a05f922f527
+DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip 20937 BLAKE2B 1bc20da34d11c6704b2d34eb93b06fd376d1b0932626c7dcbdaf43df8c8eb14e07529e84e028576bb67ce1961c3c86d0303d375d8d0aa372ded259c3561b9291 SHA512 52a52b3d380ae6e2cbe1b2c849d3089f74aa876fb3fadfbd02eada97446e0f2cf387f10ddb527f2dfefd57dccba8c82b0b349efbecaa0e6e3d00dc2b5d4fc21e
+DIST vbom.ml%2Futil%2F@v%2Fv0.0.0-20160121211510-db5cfe13f5cc.mod 20 BLAKE2B 9817a2968dcdd45e9e5d40b93cb54e6002d0aa6613f241bd77d448b3173b639f58a88d25899734be39a822473b4aac69ad947878006d5bb266a13f24637b0082 SHA512 b052661c1a3c2599fa350578cde2899166b39b71c65a6414ca7ea33e8d5186e85895ebd948819313781041d06fac3292cb08ad12447060df3860a86402344c24
+DIST vbom.ml%2Futil%2F@v%2Fv0.0.0-20180919145318-efcd4e0f9787.mod 20 BLAKE2B 9817a2968dcdd45e9e5d40b93cb54e6002d0aa6613f241bd77d448b3173b639f58a88d25899734be39a822473b4aac69ad947878006d5bb266a13f24637b0082 SHA512 b052661c1a3c2599fa350578cde2899166b39b71c65a6414ca7ea33e8d5186e85895ebd948819313781041d06fac3292cb08ad12447060df3860a86402344c24
+DIST vbom.ml%2Futil%2F@v%2Fv0.0.0-20180919145318-efcd4e0f9787.zip 27414 BLAKE2B 08374a4660b0e6df098a45358a92ce99c9bd1c4536db1f9a608aac56fdda8f14fe84ffcd8e74a920750a073482e119fc65812e328558fff113f3ff03707cd602 SHA512 35bb1f5b2fbd6cc0563dde73e0841c29802e63b873c64f89461d39dd2b6725bda2eafd7249784a2a7358f11cb3498f64e30bc5d64749c2a205ab3924dd77d5cb
+EBUILD k9scli-0.20.5.ebuild 50088 BLAKE2B 88ab0f13f47a3a9115655e0144109694ec8d2107f1904b55160d23cbeefe9c7aae6d142672871e0d2adc366ba9dee734295718fa6ed301cbb7143790e9899e72 SHA512 a0b87d079c582a342e9cf27697c3e4ee1a1a7a7b9c0a70a8b4d79f1c51e74288a10843ebebd2a2b5a7c4ac80bfb6ee48b16c4305a864108a41f66e1d1517f940
+MISC metadata.xml 257 BLAKE2B 8a445824133c1734e7b46cdd3a60bb4ac98fb4159b48856d0e296c796c700a2d9ec9ae3c94072f07aaaed98ac22088892b03c358e577df9cfbafa40194e756ee SHA512 9d6339780243409ea9233a9f5faa5c1f5b13431d35792fc6986ed5c3e9ae2e21139f44c11140519ea6cf10ab6db1d06408c1305af9e99cbbd1f2d4b27361a13c
diff --git a/sys-cluster/k9scli/k9scli-0.20.5.ebuild b/sys-cluster/k9scli/k9scli-0.20.5.ebuild
new file mode 100644
index 000000000000..99189ef1e243
--- /dev/null
+++ b/sys-cluster/k9scli/k9scli-0.20.5.ebuild
@@ -0,0 +1,966 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+GIT_COMMIT=8ca14bb
+
+DESCRIPTION="terminal based UI to manage kubernetes clusters"
+HOMEPAGE="https://k9scli.io"
+
+EGO_SUM=(
+	"9fans.net/go v0.0.2"
+	"9fans.net/go v0.0.2/go.mod"
+	"bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod"
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.38.0"
+	"cloud.google.com/go v0.38.0/go.mod"
+	"github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod"
+	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
+	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
+	"github.com/Azure/go-autorest v10.8.1+incompatible"
+	"github.com/Azure/go-autorest v10.8.1+incompatible/go.mod"
+	"github.com/Azure/go-autorest v14.0.0+incompatible"
+	"github.com/Azure/go-autorest v14.0.0+incompatible/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.10.0"
+	"github.com/Azure/go-autorest/autorest v0.10.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.2"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.2.0"
+	"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.3.0"
+	"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/logger v0.1.0"
+	"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/tracing v0.5.0"
+	"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
+	"github.com/BurntSushi/toml v0.3.1"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/DATA-DOG/go-sqlmock v1.3.3"
+	"github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod"
+	"github.com/DATA-DOG/go-sqlmock v1.4.1/go.mod"
+	"github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd"
+	"github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod"
+	"github.com/Masterminds/goutils v1.1.0"
+	"github.com/Masterminds/goutils v1.1.0/go.mod"
+	"github.com/Masterminds/semver/v3 v3.0.3"
+	"github.com/Masterminds/semver/v3 v3.0.3/go.mod"
+	"github.com/Masterminds/semver/v3 v3.1.0"
+	"github.com/Masterminds/semver/v3 v3.1.0/go.mod"
+	"github.com/Masterminds/sprig/v3 v3.0.2"
+	"github.com/Masterminds/sprig/v3 v3.0.2/go.mod"
+	"github.com/Masterminds/sprig/v3 v3.1.0"
+	"github.com/Masterminds/sprig/v3 v3.1.0/go.mod"
+	"github.com/Masterminds/squirrel v1.2.0"
+	"github.com/Masterminds/squirrel v1.2.0/go.mod"
+	"github.com/Masterminds/vcs v1.13.1/go.mod"
+	"github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod"
+	"github.com/Microsoft/hcsshim v0.8.7/go.mod"
+	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/PuerkitoBio/purell v1.0.0/go.mod"
+	"github.com/PuerkitoBio/purell v1.1.0/go.mod"
+	"github.com/PuerkitoBio/purell v1.1.1"
+	"github.com/PuerkitoBio/purell v1.1.1/go.mod"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod"
+	"github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod"
+	"github.com/agnivade/levenshtein v1.0.1/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+	"github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod"
+	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496"
+	"github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod"
+	"github.com/atotto/clipboard v0.1.2"
+	"github.com/atotto/clipboard v0.1.2/go.mod"
+	"github.com/aws/aws-sdk-go v1.15.11/go.mod"
+	"github.com/aws/aws-sdk-go v1.29.32"
+	"github.com/aws/aws-sdk-go v1.29.32/go.mod"
+	"github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/beorn7/perks v1.0.1"
+	"github.com/beorn7/perks v1.0.1/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/bitly/go-simplejson v0.5.0/go.mod"
+	"github.com/blang/semver v3.1.0+incompatible/go.mod"
+	"github.com/blang/semver v3.5.0+incompatible/go.mod"
+	"github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod"
+	"github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod"
+	"github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod"
+	"github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod"
+	"github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/cespare/xxhash v1.1.0"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/cespare/xxhash/v2 v2.1.1"
+	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+	"github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
+	"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
+	"github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod"
+	"github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod"
+	"github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod"
+	"github.com/containerd/containerd v1.3.2"
+	"github.com/containerd/containerd v1.3.2/go.mod"
+	"github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod"
+	"github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41/go.mod"
+	"github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod"
+	"github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod"
+	"github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod"
+	"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod"
+	"github.com/coreos/bbolt v1.3.2/go.mod"
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
+	"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-semver v0.3.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+	"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+	"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+	"github.com/creack/pty v1.1.7/go.mod"
+	"github.com/cyphar/filepath-securejoin v0.2.2"
+	"github.com/cyphar/filepath-securejoin v0.2.2/go.mod"
+	"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod"
+	"github.com/deislabs/oras v0.8.1"
+	"github.com/deislabs/oras v0.8.1/go.mod"
+	"github.com/denisenkom/go-mssqldb v0.0.0-20191001013358-cfbb681360f0/go.mod"
+	"github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod"
+	"github.com/derailed/popeye v0.8.1"
+	"github.com/derailed/popeye v0.8.1/go.mod"
+	"github.com/derailed/popeye v0.8.2"
+	"github.com/derailed/popeye v0.8.2/go.mod"
+	"github.com/derailed/popeye v0.8.3"
+	"github.com/derailed/popeye v0.8.3/go.mod"
+	"github.com/derailed/popeye v0.8.4"
+	"github.com/derailed/popeye v0.8.4/go.mod"
+	"github.com/derailed/tview v0.3.10"
+	"github.com/derailed/tview v0.3.10/go.mod"
+	"github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+	"github.com/dnaeon/go-vcr v1.0.1/go.mod"
+	"github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492"
+	"github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492/go.mod"
+	"github.com/docker/distribution v0.0.0-20191216044856-a8371794149d/go.mod"
+	"github.com/docker/distribution v2.7.1+incompatible"
+	"github.com/docker/distribution v2.7.1+incompatible/go.mod"
+	"github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod"
+	"github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce"
+	"github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce/go.mod"
+	"github.com/docker/docker-credential-helpers v0.6.3"
+	"github.com/docker/docker-credential-helpers v0.6.3/go.mod"
+	"github.com/docker/go-connections v0.4.0"
+	"github.com/docker/go-connections v0.4.0/go.mod"
+	"github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916"
+	"github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod"
+	"github.com/docker/go-units v0.3.3/go.mod"
+	"github.com/docker/go-units v0.4.0"
+	"github.com/docker/go-units v0.4.0/go.mod"
+	"github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+	"github.com/drone/envsubst v1.0.2"
+	"github.com/drone/envsubst v1.0.2/go.mod"
+	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
+	"github.com/dustin/go-humanize v1.0.0/go.mod"
+	"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
+	"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153"
+	"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod"
+	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+	"github.com/emicklei/go-restful v2.9.5+incompatible"
+	"github.com/emicklei/go-restful v2.9.5+incompatible/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
+	"github.com/evanphx/json-patch v4.5.0+incompatible"
+	"github.com/evanphx/json-patch v4.5.0+incompatible/go.mod"
+	"github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d"
+	"github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod"
+	"github.com/fatih/camelcase v1.0.0"
+	"github.com/fatih/camelcase v1.0.0/go.mod"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/fatih/color v1.9.0"
+	"github.com/fatih/color v1.9.0/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod"
+	"github.com/gdamore/encoding v1.0.0"
+	"github.com/gdamore/encoding v1.0.0/go.mod"
+	"github.com/gdamore/tcell v1.1.2/go.mod"
+	"github.com/gdamore/tcell v1.3.0"
+	"github.com/gdamore/tcell v1.3.0/go.mod"
+	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+	"github.com/ghodss/yaml v1.0.0"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod"
+	"github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod"
+	"github.com/go-ini/ini v1.25.4/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-kit/kit v0.9.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+	"github.com/go-logr/logr v0.1.0/go.mod"
+	"github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod"
+	"github.com/go-openapi/analysis v0.17.0/go.mod"
+	"github.com/go-openapi/analysis v0.18.0/go.mod"
+	"github.com/go-openapi/analysis v0.19.2/go.mod"
+	"github.com/go-openapi/analysis v0.19.5/go.mod"
+	"github.com/go-openapi/errors v0.17.0/go.mod"
+	"github.com/go-openapi/errors v0.18.0/go.mod"
+	"github.com/go-openapi/errors v0.19.2/go.mod"
+	"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+	"github.com/go-openapi/jsonpointer v0.17.0/go.mod"
+	"github.com/go-openapi/jsonpointer v0.18.0/go.mod"
+	"github.com/go-openapi/jsonpointer v0.19.2/go.mod"
+	"github.com/go-openapi/jsonpointer v0.19.3"
+	"github.com/go-openapi/jsonpointer v0.19.3/go.mod"
+	"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+	"github.com/go-openapi/jsonreference v0.17.0/go.mod"
+	"github.com/go-openapi/jsonreference v0.18.0/go.mod"
+	"github.com/go-openapi/jsonreference v0.19.2/go.mod"
+	"github.com/go-openapi/jsonreference v0.19.3"
+	"github.com/go-openapi/jsonreference v0.19.3/go.mod"
+	"github.com/go-openapi/loads v0.17.0/go.mod"
+	"github.com/go-openapi/loads v0.18.0/go.mod"
+	"github.com/go-openapi/loads v0.19.0/go.mod"
+	"github.com/go-openapi/loads v0.19.2/go.mod"
+	"github.com/go-openapi/loads v0.19.4/go.mod"
+	"github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod"
+	"github.com/go-openapi/runtime v0.19.0/go.mod"
+	"github.com/go-openapi/runtime v0.19.4/go.mod"
+	"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+	"github.com/go-openapi/spec v0.17.0/go.mod"
+	"github.com/go-openapi/spec v0.18.0/go.mod"
+	"github.com/go-openapi/spec v0.19.2/go.mod"
+	"github.com/go-openapi/spec v0.19.3"
+	"github.com/go-openapi/spec v0.19.3/go.mod"
+	"github.com/go-openapi/strfmt v0.17.0/go.mod"
+	"github.com/go-openapi/strfmt v0.18.0/go.mod"
+	"github.com/go-openapi/strfmt v0.19.0/go.mod"
+	"github.com/go-openapi/strfmt v0.19.3/go.mod"
+	"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+	"github.com/go-openapi/swag v0.17.0/go.mod"
+	"github.com/go-openapi/swag v0.18.0/go.mod"
+	"github.com/go-openapi/swag v0.19.2/go.mod"
+	"github.com/go-openapi/swag v0.19.5"
+	"github.com/go-openapi/swag v0.19.5/go.mod"
+	"github.com/go-openapi/validate v0.18.0/go.mod"
+	"github.com/go-openapi/validate v0.19.2/go.mod"
+	"github.com/go-openapi/validate v0.19.5/go.mod"
+	"github.com/go-sql-driver/mysql v1.4.0/go.mod"
+	"github.com/go-sql-driver/mysql v1.4.1/go.mod"
+	"github.com/go-sql-driver/mysql v1.5.0/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/gobuffalo/envy v1.7.0/go.mod"
+	"github.com/gobuffalo/envy v1.7.1/go.mod"
+	"github.com/gobuffalo/logger v1.0.1/go.mod"
+	"github.com/gobuffalo/packd v0.3.0/go.mod"
+	"github.com/gobuffalo/packr/v2 v2.7.1/go.mod"
+	"github.com/gobwas/glob v0.2.3"
+	"github.com/gobwas/glob v0.2.3/go.mod"
+	"github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod"
+	"github.com/gofrs/flock v0.7.1/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod"
+	"github.com/gogo/protobuf v1.3.1"
+	"github.com/gogo/protobuf v1.3.1/go.mod"
+	"github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef"
+	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/protobuf v1.3.3"
+	"github.com/golang/protobuf v1.3.3/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+	"github.com/golang/protobuf v1.4.0/go.mod"
+	"github.com/golang/protobuf v1.4.1/go.mod"
+	"github.com/golang/protobuf v1.4.2"
+	"github.com/golang/protobuf v1.4.2/go.mod"
+	"github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod"
+	"github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod"
+	"github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-cmp v0.4.0"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/gofuzz v1.1.0"
+	"github.com/google/gofuzz v1.1.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/uuid v1.0.0/go.mod"
+	"github.com/google/uuid v1.1.1"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
+	"github.com/googleapis/gnostic v0.1.0"
+	"github.com/googleapis/gnostic v0.1.0/go.mod"
+	"github.com/gophercloud/gophercloud v0.1.0"
+	"github.com/gophercloud/gophercloud v0.1.0/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gorilla/context v0.0.0-20160226214623-1ea25387ff6f/go.mod"
+	"github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod"
+	"github.com/gorilla/mux v1.6.2/go.mod"
+	"github.com/gorilla/mux v1.7.2"
+	"github.com/gorilla/mux v1.7.2/go.mod"
+	"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
+	"github.com/gorilla/websocket v1.4.0/go.mod"
+	"github.com/gosuri/uitable v0.0.4"
+	"github.com/gosuri/uitable v0.0.4/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
+	"github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hpcloud/tail v1.0.0"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/huandu/xstrings v1.2.0"
+	"github.com/huandu/xstrings v1.2.0/go.mod"
+	"github.com/huandu/xstrings v1.3.1"
+	"github.com/huandu/xstrings v1.3.1/go.mod"
+	"github.com/imdario/mergo v0.3.5/go.mod"
+	"github.com/imdario/mergo v0.3.7"
+	"github.com/imdario/mergo v0.3.7/go.mod"
+	"github.com/imdario/mergo v0.3.8"
+	"github.com/imdario/mergo v0.3.8/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+	"github.com/jmoiron/sqlx v1.2.0"
+	"github.com/jmoiron/sqlx v1.2.0/go.mod"
+	"github.com/joho/godotenv v1.3.0/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.7/go.mod"
+	"github.com/json-iterator/go v1.1.8/go.mod"
+	"github.com/json-iterator/go v1.1.9"
+	"github.com/json-iterator/go v1.1.9/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/errcheck v1.2.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/pty v1.1.5/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kylelemons/godebug v1.1.0"
+	"github.com/kylelemons/godebug v1.1.0/go.mod"
+	"github.com/lann/builder v0.0.0-20180802200727-47ae307949d0"
+	"github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod"
+	"github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0"
+	"github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod"
+	"github.com/lib/pq v1.0.0/go.mod"
+	"github.com/lib/pq v1.2.0/go.mod"
+	"github.com/lib/pq v1.3.0"
+	"github.com/lib/pq v1.3.0/go.mod"
+	"github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de"
+	"github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod"
+	"github.com/lithammer/dedent v1.1.0/go.mod"
+	"github.com/lucasb-eyer/go-colorful v1.0.2"
+	"github.com/lucasb-eyer/go-colorful v1.0.2/go.mod"
+	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/magiconair/properties v1.8.1"
+	"github.com/magiconair/properties v1.8.1/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod"
+	"github.com/mailru/easyjson v0.7.0"
+	"github.com/mailru/easyjson v0.7.0/go.mod"
+	"github.com/marstr/guid v1.1.0/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-colorable v0.1.4"
+	"github.com/mattn/go-colorable v0.1.4/go.mod"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.4/go.mod"
+	"github.com/mattn/go-isatty v0.0.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.11"
+	"github.com/mattn/go-isatty v0.0.11/go.mod"
+	"github.com/mattn/go-runewidth v0.0.2/go.mod"
+	"github.com/mattn/go-runewidth v0.0.4/go.mod"
+	"github.com/mattn/go-runewidth v0.0.5/go.mod"
+	"github.com/mattn/go-runewidth v0.0.9"
+	"github.com/mattn/go-runewidth v0.0.9/go.mod"
+	"github.com/mattn/go-shellwords v1.0.9/go.mod"
+	"github.com/mattn/go-shellwords v1.0.10/go.mod"
+	"github.com/mattn/go-sqlite3 v1.9.0/go.mod"
+	"github.com/mattn/go-sqlite3 v1.12.0/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/mitchellh/cli v1.0.0/go.mod"
+	"github.com/mitchellh/copystructure v1.0.0"
+	"github.com/mitchellh/copystructure v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-wordwrap v1.0.0"
+	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod"
+	"github.com/mitchellh/reflectwalk v1.0.0"
+	"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/morikuni/aec v1.0.0"
+	"github.com/morikuni/aec v1.0.0/go.mod"
+	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+	"github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+	"github.com/ncw/swift v1.0.47/go.mod"
+	"github.com/oklog/ulid v1.3.1/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.1/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.2/go.mod"
+	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.10.1/go.mod"
+	"github.com/onsi/ginkgo v1.11.0"
+	"github.com/onsi/ginkgo v1.11.0/go.mod"
+	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+	"github.com/onsi/gomega v1.7.0"
+	"github.com/onsi/gomega v1.7.0/go.mod"
+	"github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod"
+	"github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod"
+	"github.com/opencontainers/go-digest v1.0.0-rc1"
+	"github.com/opencontainers/go-digest v1.0.0-rc1/go.mod"
+	"github.com/opencontainers/image-spec v1.0.0/go.mod"
+	"github.com/opencontainers/image-spec v1.0.1"
+	"github.com/opencontainers/image-spec v1.0.1/go.mod"
+	"github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod"
+	"github.com/opencontainers/runc v0.1.1"
+	"github.com/opencontainers/runc v0.1.1/go.mod"
+	"github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod"
+	"github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod"
+	"github.com/openfaas/faas v0.0.0-20200207215241-6afae214e3ec"
+	"github.com/openfaas/faas v0.0.0-20200207215241-6afae214e3ec/go.mod"
+	"github.com/openfaas/faas-cli v0.0.0-20200124160744-30b7cec9634c"
+	"github.com/openfaas/faas-cli v0.0.0-20200124160744-30b7cec9634c/go.mod"
+	"github.com/openfaas/faas-provider v0.15.0"
+	"github.com/openfaas/faas-provider v0.15.0/go.mod"
+	"github.com/pborman/uuid v1.2.0/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+	"github.com/petergtz/pegomock v2.7.0+incompatible"
+	"github.com/petergtz/pegomock v2.7.0+incompatible/go.mod"
+	"github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/posener/complete v1.1.1/go.mod"
+	"github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod"
+	"github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.3/go.mod"
+	"github.com/prometheus/client_golang v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v1.5.1"
+	"github.com/prometheus/client_golang v1.5.1/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/prometheus/client_model v0.2.0"
+	"github.com/prometheus/client_model v0.2.0/go.mod"
+	"github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod"
+	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+	"github.com/prometheus/common v0.4.0/go.mod"
+	"github.com/prometheus/common v0.4.1/go.mod"
+	"github.com/prometheus/common v0.9.1"
+	"github.com/prometheus/common v0.9.1/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+	"github.com/prometheus/procfs v0.0.2/go.mod"
+	"github.com/prometheus/procfs v0.0.5/go.mod"
+	"github.com/prometheus/procfs v0.0.8"
+	"github.com/prometheus/procfs v0.0.8/go.mod"
+	"github.com/prometheus/tsdb v0.7.1/go.mod"
+	"github.com/rakyll/hey v0.1.3"
+	"github.com/rakyll/hey v0.1.3/go.mod"
+	"github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod"
+	"github.com/rivo/tview v0.0.0-20191018115645-bacbf5155bc1/go.mod"
+	"github.com/rivo/uniseg v0.0.0-20190513083848-b9f5b9457d44/go.mod"
+	"github.com/rivo/uniseg v0.1.0"
+	"github.com/rivo/uniseg v0.1.0/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/rogpeppe/go-internal v1.1.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.2/go.mod"
+	"github.com/rogpeppe/go-internal v1.4.0/go.mod"
+	"github.com/rs/xid v1.2.1/go.mod"
+	"github.com/rs/zerolog v1.18.0"
+	"github.com/rs/zerolog v1.18.0/go.mod"
+	"github.com/rubenv/sql-migrate v0.0.0-20200212082348-64f95ea68aa3"
+	"github.com/rubenv/sql-migrate v0.0.0-20200212082348-64f95ea68aa3/go.mod"
+	"github.com/russross/blackfriday v1.5.2"
+	"github.com/russross/blackfriday v1.5.2/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/ryanuber/go-glob v1.0.0"
+	"github.com/ryanuber/go-glob v1.0.0/go.mod"
+	"github.com/sahilm/fuzzy v0.1.0"
+	"github.com/sahilm/fuzzy v0.1.0/go.mod"
+	"github.com/satori/go.uuid v1.2.0/go.mod"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.1/go.mod"
+	"github.com/sirupsen/logrus v1.4.2"
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/afero v1.2.2/go.mod"
+	"github.com/spf13/cast v1.3.0"
+	"github.com/spf13/cast v1.3.0/go.mod"
+	"github.com/spf13/cast v1.3.1"
+	"github.com/spf13/cast v1.3.1/go.mod"
+	"github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod"
+	"github.com/spf13/cobra v0.0.3/go.mod"
+	"github.com/spf13/cobra v0.0.5/go.mod"
+	"github.com/spf13/cobra v0.0.6"
+	"github.com/spf13/cobra v0.0.6/go.mod"
+	"github.com/spf13/cobra v1.0.0"
+	"github.com/spf13/cobra v1.0.0/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+	"github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod"
+	"github.com/spf13/pflag v1.0.1/go.mod"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/spf13/pflag v1.0.5"
+	"github.com/spf13/pflag v1.0.5/go.mod"
+	"github.com/spf13/viper v1.3.2/go.mod"
+	"github.com/spf13/viper v1.4.0/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/objx v0.2.0/go.mod"
+	"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.5.1"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod"
+	"github.com/tidwall/pretty v1.0.0/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+	"github.com/ugorji/go v1.1.4/go.mod"
+	"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+	"github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod"
+	"github.com/urfave/cli v1.20.0/go.mod"
+	"github.com/vektah/gqlparser v1.1.2/go.mod"
+	"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f"
+	"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod"
+	"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415"
+	"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod"
+	"github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod"
+	"github.com/xeipuuv/gojsonschema v1.1.0"
+	"github.com/xeipuuv/gojsonschema v1.1.0/go.mod"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+	"github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1"
+	"github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod"
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+	"github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod"
+	"github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod"
+	"github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod"
+	"github.com/zenazn/goji v0.9.0/go.mod"
+	"github.com/ziutek/mymysql v1.5.4/go.mod"
+	"go.etcd.io/bbolt v1.3.2/go.mod"
+	"go.etcd.io/bbolt v1.3.3/go.mod"
+	"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod"
+	"go.mongodb.org/mongo-driver v1.0.3/go.mod"
+	"go.mongodb.org/mongo-driver v1.1.1/go.mod"
+	"go.mongodb.org/mongo-driver v1.1.2/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.opencensus.io v0.22.0/go.mod"
+	"go.uber.org/atomic v1.3.2/go.mod"
+	"go.uber.org/atomic v1.4.0/go.mod"
+	"go.uber.org/goleak v0.10.0"
+	"go.uber.org/goleak v0.10.0/go.mod"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/zap v1.10.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
+	"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod"
+	"golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod"
+	"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
+	"golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod"
+	"golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod"
+	"golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod"
+	"golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod"
+	"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
+	"golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d/go.mod"
+	"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975"
+	"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod"
+	"golang.org/x/crypto v0.0.0-20200414173820-0848c9571904"
+	"golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod"
+	"golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod"
+	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+	"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+	"golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod"
+	"golang.org/x/net v0.0.0-20181017193950-04a2e542c03f/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+	"golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
+	"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
+	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+	"golang.org/x/net v0.0.0-20200519113804-d87ec0cfa476"
+	"golang.org/x/net v0.0.0-20200519113804-d87ec0cfa476/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
+	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
+	"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+	"golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod"
+	"golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod"
+	"golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod"
+	"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod"
+	"golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod"
+	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
+	"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod"
+	"golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82"
+	"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/sys v0.0.0-20200519105757-fe76b779f299"
+	"golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod"
+	"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.2"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
+	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod"
+	"golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod"
+	"golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod"
+	"golang.org/x/tools v0.0.0-20190828213141-aed303cbaa74/go.mod"
+	"golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod"
+	"golang.org/x/tools v0.0.0-20191004055002-72853e10c5a3/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod"
+	"gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod"
+	"gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod"
+	"google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/appengine v1.5.0"
+	"google.golang.org/appengine v1.5.0/go.mod"
+	"google.golang.org/appengine v1.6.5/go.mod"
+	"google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587"
+	"google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod"
+	"google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.0/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.23.1/go.mod"
+	"google.golang.org/grpc v1.25.1/go.mod"
+	"google.golang.org/grpc v1.26.0/go.mod"
+	"google.golang.org/grpc v1.27.0"
+	"google.golang.org/grpc v1.27.0/go.mod"
+	"google.golang.org/grpc v1.29.1"
+	"google.golang.org/grpc v1.29.1/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+	"google.golang.org/protobuf v1.21.0/go.mod"
+	"google.golang.org/protobuf v1.22.0/go.mod"
+	"google.golang.org/protobuf v1.23.0"
+	"google.golang.org/protobuf v1.23.0/go.mod"
+	"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
+	"gopkg.in/gorp.v1 v1.7.2"
+	"gopkg.in/gorp.v1 v1.7.2/go.mod"
+	"gopkg.in/inf.v0 v0.9.1"
+	"gopkg.in/inf.v0 v0.9.1/go.mod"
+	"gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/square/go-jose.v2 v2.2.2/go.mod"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.2.5/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"gotest.tools v2.2.0+incompatible"
+	"gotest.tools v2.2.0+incompatible/go.mod"
+	"helm.sh/helm/v3 v3.1.2"
+	"helm.sh/helm/v3 v3.1.2/go.mod"
+	"helm.sh/helm/v3 v3.2.0-rc.1"
+	"helm.sh/helm/v3 v3.2.0-rc.1/go.mod"
+	"helm.sh/helm/v3 v3.2.0"
+	"helm.sh/helm/v3 v3.2.0/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"k8s.io/api v0.17.2/go.mod"
+	"k8s.io/api v0.18.0"
+	"k8s.io/api v0.18.0/go.mod"
+	"k8s.io/api v0.18.2"
+	"k8s.io/api v0.18.2/go.mod"
+	"k8s.io/apiextensions-apiserver v0.17.2"
+	"k8s.io/apiextensions-apiserver v0.17.2/go.mod"
+	"k8s.io/apiextensions-apiserver v0.18.0"
+	"k8s.io/apiextensions-apiserver v0.18.0/go.mod"
+	"k8s.io/apimachinery v0.17.2/go.mod"
+	"k8s.io/apimachinery v0.18.0"
+	"k8s.io/apimachinery v0.18.0/go.mod"
+	"k8s.io/apimachinery v0.18.2"
+	"k8s.io/apimachinery v0.18.2/go.mod"
+	"k8s.io/apiserver v0.17.2/go.mod"
+	"k8s.io/apiserver v0.18.0/go.mod"
+	"k8s.io/cli-runtime v0.17.2/go.mod"
+	"k8s.io/cli-runtime v0.18.0"
+	"k8s.io/cli-runtime v0.18.0/go.mod"
+	"k8s.io/cli-runtime v0.18.2"
+	"k8s.io/cli-runtime v0.18.2/go.mod"
+	"k8s.io/client-go v0.17.2/go.mod"
+	"k8s.io/client-go v0.18.0"
+	"k8s.io/client-go v0.18.0/go.mod"
+	"k8s.io/client-go v0.18.2"
+	"k8s.io/client-go v0.18.2/go.mod"
+	"k8s.io/code-generator v0.17.2/go.mod"
+	"k8s.io/code-generator v0.18.0/go.mod"
+	"k8s.io/code-generator v0.18.2/go.mod"
+	"k8s.io/component-base v0.17.2/go.mod"
+	"k8s.io/component-base v0.18.0"
+	"k8s.io/component-base v0.18.0/go.mod"
+	"k8s.io/component-base v0.18.2"
+	"k8s.io/component-base v0.18.2/go.mod"
+	"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
+	"k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod"
+	"k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod"
+	"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
+	"k8s.io/klog v0.3.0/go.mod"
+	"k8s.io/klog v1.0.0"
+	"k8s.io/klog v1.0.0/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c"
+	"k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod"
+	"k8s.io/kubectl v0.17.2/go.mod"
+	"k8s.io/kubectl v0.18.0"
+	"k8s.io/kubectl v0.18.0/go.mod"
+	"k8s.io/kubectl v0.18.2"
+	"k8s.io/kubectl v0.18.2/go.mod"
+	"k8s.io/kubernetes v1.13.0/go.mod"
+	"k8s.io/metrics v0.17.2/go.mod"
+	"k8s.io/metrics v0.18.0"
+	"k8s.io/metrics v0.18.0/go.mod"
+	"k8s.io/metrics v0.18.2"
+	"k8s.io/metrics v0.18.2/go.mod"
+	"k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod"
+	"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89"
+	"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod"
+	"modernc.org/cc v1.0.0/go.mod"
+	"modernc.org/golex v1.0.0/go.mod"
+	"modernc.org/mathutil v1.0.0/go.mod"
+	"modernc.org/strutil v1.0.0/go.mod"
+	"modernc.org/xc v1.0.0/go.mod"
+	"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod"
+	"sigs.k8s.io/kustomize v2.0.3+incompatible"
+	"sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod"
+	"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
+	"sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06"
+	"sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06/go.mod"
+	"sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod"
+	"sigs.k8s.io/structured-merge-diff/v3 v3.0.0"
+	"sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod"
+	"sigs.k8s.io/yaml v1.1.0/go.mod"
+	"sigs.k8s.io/yaml v1.2.0"
+	"sigs.k8s.io/yaml v1.2.0/go.mod"
+	"vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod"
+	"vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787"
+	"vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787/go.mod"
+	)
+go-module_set_globals
+SRC_URI="https://github.com/derailed/k9s/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/k9s-${PV}"
+
+src_prepare() {
+	default
+	# I will look into opening an upstream PR to do this.
+	sed -i -e 's/-w -s -X/-X/' Makefile || die
+}
+
+src_compile() {
+	emake GIT=${GIT_COMMIT} VERSION=v${pv} build
+}
+
+src_install() {
+	dobin execs/k9s
+	dodoc -r change_logs plugins skins README.md
+}
diff --git a/sys-cluster/k9scli/metadata.xml b/sys-cluster/k9scli/metadata.xml
new file mode 100644
index 000000000000..3c49bd23955c
--- /dev/null
+++ b/sys-cluster/k9scli/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/sys-cluster/kubernetes/Manifest b/sys-cluster/kubernetes/Manifest
index f43ed87ab468..da153ffc9b96 100644
--- a/sys-cluster/kubernetes/Manifest
+++ b/sys-cluster/kubernetes/Manifest
@@ -16,23 +16,29 @@ AUX kubelet.initd 520 BLAKE2B 50edf888fed020a02f099189f8a5bdde54a4bfa2a005854898
 AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba83207ae89aae4f2e151a8b32e21b8d5e92229cccd7b7aa2676328d3d1a5fa80cadde65fe80a8cde10535d4 SHA512 05ce9ea16d2ddf8e255adb406556c37bc04dcfc457a132a78d31deaed78963f4e1f31555f781b706909c02815a04370d5c0e02614eb79d602b1cb827cf2471d5
 AUX kubelet.service 642 BLAKE2B 9f0fa5db48c09c2525cbc556cd520660302408a43aceb6c11da3a191b4b21607e824e46d9805b12b57a0ac7878c7da94d0cb86c69cd949814c77bb217973c6f1 SHA512 770cadae6afb68f0556c7c5969643642bbf09b596ff49d969d31b8d9f0d8907d6931eb7fb14485c78a3f75682e44e2355c7e51973a0dfdd1e665816f04ba21ae
 DIST kubernetes-1.16.10.tar.gz 31761409 BLAKE2B caef0b60045d134e5243558da56301dfe2ef844e7e80ca82d86bd79e5ce00bc9d9aa61550f3356dcc6ee31bf925a22a87364fcf971e353129adb0c0e376b26c0 SHA512 b81b34f12c6d835ef86df598bb13350b7a94b02cb493df9c8e8b605c541d9a9db16331b264f66ecdaaf5451e3a2d13cc104d3d6e5facbf31c4b6bd2cc2a1441f
+DIST kubernetes-1.16.11.tar.gz 31766900 BLAKE2B a3a099eaf82b7b818a237752885358752176bb1eade5f1623a1bd8920f37a43283fc0a712197153143b6d166bb0ecb45d9d1148cc766681f67f36281473b26e0 SHA512 153a44ce61d70074462c157ffbdb8c58a8807d205a315c2be3aabee80253cba362915f93c31fcbdbfcdc25161b9bc3ca0260b1cdab8f4d562fc69aa465fc476e
 DIST kubernetes-1.16.8.tar.gz 31731459 BLAKE2B 1d53c16586b5a7a41fc42d0fb3444b694531d3f04fb9e168a70d4b98f966f322bc82d39234612e38c71da052002c5bcc452c747d9f948dacbdd91ea40a9f5417 SHA512 04c8e9a9227ac9a98074cd52cbe90758134fedb10164fa69accbc19716a2f18dc133a4f880d0e35a3728c377faea431363f00ae9fe2ff5ca9e509444da9106c5
 DIST kubernetes-1.16.9.tar.gz 31752857 BLAKE2B 34c0ff54e60276bf41ce971a8a50d57256f696ac95b551a90a6d2ccf1540279010953119def539c0824217fbbfc287d24b6f080e1fefce8864c1eade72d0777f SHA512 08fffe855a433ad0cc7586afd12815adb3bcafcac86712181625198fedbfe170bc36ae31aca9783d30dd790c415d447f073234f621416a76a7e4e0de2eeb008d
 DIST kubernetes-1.17.4.tar.gz 31777775 BLAKE2B cd04e429d3f524f5dce7948db9b22230df8abdeb7570001ab985ffdb5b85709a8d1698490b9df13455d8f3968741db9571ee1ab3bc2a6fdd06a8c0fe274476e2 SHA512 fd1944d26c840bc1d2f585fccbabf48091fe8820ea089b3ea5c18652fd1edb3c8157a70ea19111b8b62aef16e0284a1607b583c3c1af79dd0dd266b99e20c549
 DIST kubernetes-1.17.5.tar.gz 31788321 BLAKE2B b7531b9ba07a20aba6829e3351b3b66a64251970be3a07d44f8b20ef2d44fa7d80f2528c1c0a6c3dcf3373cbb21e500d26c0a53c4ed4b66bb334860c5f8ce3b9 SHA512 2f7fd071a11a4f9d53cf0b23e381d0e864a6dc19e1dab88c2b5bcdade514328714f651bc0caa9c302e74fab7d2823a0d724fe0f5444e13afcf89b792377af283
 DIST kubernetes-1.17.6.tar.gz 31795648 BLAKE2B f6116bc65d08b99295a8e373470f411f5f6b11cad722a713f660f2d24798ee21e2286f4bd538bf53c94af3e9891c49f41ce3b8643ee18df908b0dca03643e007 SHA512 62eaa62a848d7650f29d014b710ca22a744cc1c6517b46a38b5363b3cf4618366d7de2df3f4fbcfe6fbcdde7428e169b9ce917444983049b55fcfff5f3f3217e
+DIST kubernetes-1.17.7.tar.gz 31808806 BLAKE2B b8c2d64bb2e307ca866465039a4e8d62f0f73d26ed7fe3e6906784369c214037672b80c0adf617c3b47abe213f4ee5e55af72943e742aaba645b0c7f69b984c1 SHA512 12ad9de52ac2028ace8b605ccf14b98c94363f17b56da6d5efbb63617d40898384ff88d88a33d47393c3e7b529f17d41c526340ddfbd4cc0eddb5341789436a4
 DIST kubernetes-1.18.0.tar.gz 32554015 BLAKE2B 24079970cc1887c6dad7b55d9f2fd80cd9f46f1b6c1240cf28abf2eb33b3809bcd858293bb800255533a13e24145fab580b0bd2eb0e06c15ca4e0feeedcf6ff2 SHA512 3298ec63a2fbcd396b415f27a581f4286317ae206c30b35457aed780baae4115059df20e40028df394984caccc8bb4ef6c879ae3c064771c8a5c045dee7998e8
 DIST kubernetes-1.18.1.tar.gz 32581783 BLAKE2B ffacdba21dd6d326ddf9733c49ed3a16ad679fbd25b4ddda44b047a402a163474033d6b2328a816e83ede505aae07e205b68938165c546202fa6df2d03609ead SHA512 c002153e16494cd74e6f0609847602d6dcf166c8bab020341f8302b7cad5d7452ed1c2e66b3b230731d13401493d2d02f0500abcd526dbff44ae3aeabd210577
 DIST kubernetes-1.18.2.tar.gz 32585912 BLAKE2B 1f8dbd6e7a8ba4257abaf2926ada656ec42eb7e0f502f2b4fc75b2a6cacd9a6e91624a717772f605a24b42421933580bc399aca4480aa1c88009016160485a77 SHA512 9786312b06aea5cbd4e786e4b6d639ec4750fa6c8ba469d860702b317103ec464f038015ef038ba21841a0d627d58902769eb73a5d2fdf4da2f0ae4c0ec14e85
 DIST kubernetes-1.18.3.tar.gz 32596732 BLAKE2B 067a0b74d3d8e63ba99da1828c7a3e905b235a8e5bee1eb11bbc0a5e12ab2d94c0b5dcf9febf6b0808c053eb81fa6ea4746aa42d6c0a19c02b834b44d25f095f SHA512 0bb1dc33802127b03480e43dcbdeb576188a2a50b0257bcf47a0efec7d504cbce9b61048cb87d2ae4148174fcb2e373298c5947d5130604f827b806d9d00c6a4
+DIST kubernetes-1.18.4.tar.gz 32605319 BLAKE2B 4cf10cadd2b45418f45517a0191d3650a2e36bd3dc69e3f472ac59735712261eebb38eccf7da4f8496ac60701602dbf4730176236486abae6279b1f71bae831f SHA512 b2a6f76b4b933012e39aa3df2510a6dd3a2d64452799fdd32b9d7c461930d273b0cacd46550aa963d809d7b075d6076a6d1a370322870204e1298811c14122a1
 EBUILD kubernetes-1.16.10.ebuild 2303 BLAKE2B 805c711559a39bcffdb24972db170d1b22018a52cc69d15488f2673a62bfbcf00a94ab4db48506e50a1b440489e28e7db1c3b276223c582991538264ff6d30e6 SHA512 4e7bd9452e329034035b84190289fbf37491b544bacc46f5f4e1556083f5f1f13fe13563a699412aa901cb3cb57e512a279b571defc4616b1a43a493392e25f7
+EBUILD kubernetes-1.16.11.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
 EBUILD kubernetes-1.16.8.ebuild 2303 BLAKE2B 805c711559a39bcffdb24972db170d1b22018a52cc69d15488f2673a62bfbcf00a94ab4db48506e50a1b440489e28e7db1c3b276223c582991538264ff6d30e6 SHA512 4e7bd9452e329034035b84190289fbf37491b544bacc46f5f4e1556083f5f1f13fe13563a699412aa901cb3cb57e512a279b571defc4616b1a43a493392e25f7
 EBUILD kubernetes-1.16.9.ebuild 2303 BLAKE2B 805c711559a39bcffdb24972db170d1b22018a52cc69d15488f2673a62bfbcf00a94ab4db48506e50a1b440489e28e7db1c3b276223c582991538264ff6d30e6 SHA512 4e7bd9452e329034035b84190289fbf37491b544bacc46f5f4e1556083f5f1f13fe13563a699412aa901cb3cb57e512a279b571defc4616b1a43a493392e25f7
 EBUILD kubernetes-1.17.4.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
 EBUILD kubernetes-1.17.5.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
 EBUILD kubernetes-1.17.6.ebuild 2303 BLAKE2B 805c711559a39bcffdb24972db170d1b22018a52cc69d15488f2673a62bfbcf00a94ab4db48506e50a1b440489e28e7db1c3b276223c582991538264ff6d30e6 SHA512 4e7bd9452e329034035b84190289fbf37491b544bacc46f5f4e1556083f5f1f13fe13563a699412aa901cb3cb57e512a279b571defc4616b1a43a493392e25f7
+EBUILD kubernetes-1.17.7.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
 EBUILD kubernetes-1.18.0.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
 EBUILD kubernetes-1.18.1.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
 EBUILD kubernetes-1.18.2.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
 EBUILD kubernetes-1.18.3.ebuild 2303 BLAKE2B 805c711559a39bcffdb24972db170d1b22018a52cc69d15488f2673a62bfbcf00a94ab4db48506e50a1b440489e28e7db1c3b276223c582991538264ff6d30e6 SHA512 4e7bd9452e329034035b84190289fbf37491b544bacc46f5f4e1556083f5f1f13fe13563a699412aa901cb3cb57e512a279b571defc4616b1a43a493392e25f7
+EBUILD kubernetes-1.18.4.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
 MISC metadata.xml 719 BLAKE2B 4f7918cba4809becbff0cb1f6c6e9ce00e778c1a474955e64fccef68942a2e7fb337d5dbe8b01074b992497da913fbfbebe5705635245e8ce02f6daca4df7936 SHA512 9d4662622f1fa57b753018db9839b4399f3bb589a1e061821941738ea86a6d65cd0dbec31ffef658aeb14ac7d5c3840948694627b1fb32bc138b0f7dbf40a011
diff --git a/sys-cluster/kubernetes/kubernetes-1.16.11.ebuild b/sys-cluster/kubernetes/kubernetes-1.16.11.ebuild
new file mode 100644
index 000000000000..c333bbabb3b4
--- /dev/null
+++ b/sys-cluster/kubernetes/kubernetes-1.16.11.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="production-grade container orchestration"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+AGENT="kubelet"
+CLI="kubeadm kubectl"
+SERVICES="kube-apiserver kube-controller-manager kube-proxy kube-scheduler"
+IUSE="hardened"
+for x in ${AGENT} ${CLI} ${SERVICES}; do
+	IUSE+=" +${x}"
+done
+
+BDEPEND=">=dev-lang/go-1.13"
+COMMON_DEPEND="
+	kube-apiserver? (
+		acct-group/kube-apiserver
+		acct-user/kube-apiserver
+	)
+	kube-controller-manager? (
+		acct-group/kube-controller-manager
+		acct-user/kube-controller-manager
+	)
+	kube-scheduler? (
+		acct-group/kube-scheduler
+		acct-user/kube-scheduler
+	)"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	kube-proxy? ( net-firewall/conntrack-tools )
+	!sys-cluster/kubeadm
+	!sys-cluster/kubectl
+	!sys-cluster/kubelet
+	!sys-cluster/kube-apiserver
+	!sys-cluster/kube-controller-manager
+	!sys-cluster/kube-proxy
+	!sys-cluster/kube-scheduler"
+
+RESTRICT+=" test"
+
+src_compile() {
+	local x
+	for x in ${AGENT} ${CLI} ${SERVICES}; do
+		use $x || continue
+		CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+			emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${x}
+	done
+}
+
+src_install() {
+	local x
+	for x in ${AGENT} ${CLI} ${SERVICES}; do
+		use $x || continue
+		dobin _output/bin/${x}
+		if has ${x} ${CLI}; then
+		_output/bin/${x} completion bash > ${x}.bash || die
+		_output/bin/${x} completion zsh > ${x}.zsh || die
+			newbashcomp ${x}.bash ${x}
+			insinto /usr/share/zsh/site-functions
+			newins ${x}.zsh _${x}
+			continue
+		fi
+		newinitd "${FILESDIR}"/${x}.initd ${x}
+		newconfd "${FILESDIR}"/${x}.confd ${x}
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/${x}.logrotated ${x}
+		keepdir /var/log/${x}
+		if [[ "$x" =~ kubelet ]]; then
+			systemd_dounit "${FILESDIR}"/${x}.service
+			insinto /etc/kubernetes
+			newins "${FILESDIR}"/${x}.env ${x}.env
+			keepdir /etc/kubernetes/manifests
+		fi
+		if [[ $x =~ kubelet|kube-proxy ]]; then
+			keepdir /var/lib/${x}
+		fi
+		if [[ $x =~ .*apiserver|.*controller-manager|.*scheduler ]]; then
+			fowners ${x}:${x} /var/log/${x}
+		fi
+	done
+}
diff --git a/sys-cluster/kubernetes/kubernetes-1.17.7.ebuild b/sys-cluster/kubernetes/kubernetes-1.17.7.ebuild
new file mode 100644
index 000000000000..c333bbabb3b4
--- /dev/null
+++ b/sys-cluster/kubernetes/kubernetes-1.17.7.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="production-grade container orchestration"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+AGENT="kubelet"
+CLI="kubeadm kubectl"
+SERVICES="kube-apiserver kube-controller-manager kube-proxy kube-scheduler"
+IUSE="hardened"
+for x in ${AGENT} ${CLI} ${SERVICES}; do
+	IUSE+=" +${x}"
+done
+
+BDEPEND=">=dev-lang/go-1.13"
+COMMON_DEPEND="
+	kube-apiserver? (
+		acct-group/kube-apiserver
+		acct-user/kube-apiserver
+	)
+	kube-controller-manager? (
+		acct-group/kube-controller-manager
+		acct-user/kube-controller-manager
+	)
+	kube-scheduler? (
+		acct-group/kube-scheduler
+		acct-user/kube-scheduler
+	)"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	kube-proxy? ( net-firewall/conntrack-tools )
+	!sys-cluster/kubeadm
+	!sys-cluster/kubectl
+	!sys-cluster/kubelet
+	!sys-cluster/kube-apiserver
+	!sys-cluster/kube-controller-manager
+	!sys-cluster/kube-proxy
+	!sys-cluster/kube-scheduler"
+
+RESTRICT+=" test"
+
+src_compile() {
+	local x
+	for x in ${AGENT} ${CLI} ${SERVICES}; do
+		use $x || continue
+		CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+			emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${x}
+	done
+}
+
+src_install() {
+	local x
+	for x in ${AGENT} ${CLI} ${SERVICES}; do
+		use $x || continue
+		dobin _output/bin/${x}
+		if has ${x} ${CLI}; then
+		_output/bin/${x} completion bash > ${x}.bash || die
+		_output/bin/${x} completion zsh > ${x}.zsh || die
+			newbashcomp ${x}.bash ${x}
+			insinto /usr/share/zsh/site-functions
+			newins ${x}.zsh _${x}
+			continue
+		fi
+		newinitd "${FILESDIR}"/${x}.initd ${x}
+		newconfd "${FILESDIR}"/${x}.confd ${x}
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/${x}.logrotated ${x}
+		keepdir /var/log/${x}
+		if [[ "$x" =~ kubelet ]]; then
+			systemd_dounit "${FILESDIR}"/${x}.service
+			insinto /etc/kubernetes
+			newins "${FILESDIR}"/${x}.env ${x}.env
+			keepdir /etc/kubernetes/manifests
+		fi
+		if [[ $x =~ kubelet|kube-proxy ]]; then
+			keepdir /var/lib/${x}
+		fi
+		if [[ $x =~ .*apiserver|.*controller-manager|.*scheduler ]]; then
+			fowners ${x}:${x} /var/log/${x}
+		fi
+	done
+}
diff --git a/sys-cluster/kubernetes/kubernetes-1.18.4.ebuild b/sys-cluster/kubernetes/kubernetes-1.18.4.ebuild
new file mode 100644
index 000000000000..c333bbabb3b4
--- /dev/null
+++ b/sys-cluster/kubernetes/kubernetes-1.18.4.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="production-grade container orchestration"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+AGENT="kubelet"
+CLI="kubeadm kubectl"
+SERVICES="kube-apiserver kube-controller-manager kube-proxy kube-scheduler"
+IUSE="hardened"
+for x in ${AGENT} ${CLI} ${SERVICES}; do
+	IUSE+=" +${x}"
+done
+
+BDEPEND=">=dev-lang/go-1.13"
+COMMON_DEPEND="
+	kube-apiserver? (
+		acct-group/kube-apiserver
+		acct-user/kube-apiserver
+	)
+	kube-controller-manager? (
+		acct-group/kube-controller-manager
+		acct-user/kube-controller-manager
+	)
+	kube-scheduler? (
+		acct-group/kube-scheduler
+		acct-user/kube-scheduler
+	)"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	kube-proxy? ( net-firewall/conntrack-tools )
+	!sys-cluster/kubeadm
+	!sys-cluster/kubectl
+	!sys-cluster/kubelet
+	!sys-cluster/kube-apiserver
+	!sys-cluster/kube-controller-manager
+	!sys-cluster/kube-proxy
+	!sys-cluster/kube-scheduler"
+
+RESTRICT+=" test"
+
+src_compile() {
+	local x
+	for x in ${AGENT} ${CLI} ${SERVICES}; do
+		use $x || continue
+		CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+			emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${x}
+	done
+}
+
+src_install() {
+	local x
+	for x in ${AGENT} ${CLI} ${SERVICES}; do
+		use $x || continue
+		dobin _output/bin/${x}
+		if has ${x} ${CLI}; then
+		_output/bin/${x} completion bash > ${x}.bash || die
+		_output/bin/${x} completion zsh > ${x}.zsh || die
+			newbashcomp ${x}.bash ${x}
+			insinto /usr/share/zsh/site-functions
+			newins ${x}.zsh _${x}
+			continue
+		fi
+		newinitd "${FILESDIR}"/${x}.initd ${x}
+		newconfd "${FILESDIR}"/${x}.confd ${x}
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/${x}.logrotated ${x}
+		keepdir /var/log/${x}
+		if [[ "$x" =~ kubelet ]]; then
+			systemd_dounit "${FILESDIR}"/${x}.service
+			insinto /etc/kubernetes
+			newins "${FILESDIR}"/${x}.env ${x}.env
+			keepdir /etc/kubernetes/manifests
+		fi
+		if [[ $x =~ kubelet|kube-proxy ]]; then
+			keepdir /var/lib/${x}
+		fi
+		if [[ $x =~ .*apiserver|.*controller-manager|.*scheduler ]]; then
+			fowners ${x}:${x} /var/log/${x}
+		fi
+	done
+}
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index df46a148c087..4ee4cae956d2 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -6,21 +6,17 @@ AUX neutron-openvswitch-agent.confd 142 BLAKE2B 32c521f734854608173a41625bc037ee
 AUX neutron-server.confd 70 BLAKE2B 88309872ce864e4dfa9072c1472bd6f1e8116f71106ff7e055f6386563ef1077b41f538a72e183ae00e700262d2bcf82434077f0b7e5753389077be3f276b178 SHA512 79f1a40486c37b2c3486b4ef015864f6b20ee89b05d788ce6ade8af934e2c160da9e0495d22e941a717072c1d8ca3b77963a3ec06f3ec25a3f8af8b24a4e40a0
 AUX neutron.initd 530 BLAKE2B 48900bdde5770a0b0db90490d6ae8541dafc96e3fa2aa1c8d75eab5f547be35fa5adb792db8960f71a98bbeb71d56b29e5f5166a47735ebe85804019aa4e1f11 SHA512 c9c7386ae8d97205859f02edb0c7d601059af78def3f232f87e676131c5e6fcdb6e880ccee5b1b15397b1dffe83446421145c90ed448f5e9d55994efd1629f92
 AUX neutron.sudoersd 117 BLAKE2B 30e903fd3d681b779ad7e4758b56bfd78df6165ae030f0a5017dccd1873570db450efd3e7b232f77d6d2e3fcb81cb64d9d44901802310ebe2d88f882d334acda SHA512 143f8a1faa7650bc66b2566d0bd62f71eb743231b9efc4c7df265e53d664418b23182e3f271b86845ed76c537b7f60157e87af59413cf659379f367924d14366
-DIST neutron-15.0.2.tar.gz 10523237 BLAKE2B d900a95286549ede403a988b206315cee911c0dfde198101c2961a39f3059ed2121352ca0d232eac2a8deacb55344de3073b821312d40156331064b8aa00add8 SHA512 36a2adcbecf7b168a4a8141bae29453bc8122e3400bff9987d2cfe40728896a0a55040c2fd7d98ecade27162e49bbd0918be712940a0c2b7b31984d0677d1dbe
 DIST neutron-15.1.0.tar.gz 10549248 BLAKE2B f9e4dff7c8ae1568187284c2676a67a572902a67ccf08998dcc0620938e6a15320a69297771c9686dd19c93f4363c7193e1b9f3763ef7423c62a85df6ec155b6 SHA512 89d737c52fd098fab13bfe6548d9a723bfcf4c97e2f6669915d07efe55d5e707ab19ea1af8fa7c328b9426998cc835c5ddb619799949efb1a9291d0654ea7b1e
 DIST neutron-16.0.0.tar.gz 12746070 BLAKE2B 659ae3bc6971393522dc98ee5b4eccddd85aae17571734f24571e13892376ad2d9a25c09224e703a5b89511c2d696b69842469789649a1f239115ad2422af951 SHA512 f2c23a04d75328b8a671ac65163e6f84cd48880864331f6713793a037a23043779656cfdbe4aab6772fb4e5f5c606db9d97f3d4f3dc8f234920381a9929778cc
-DIST neutron-configs-15.0.2.tar.gz 23546 BLAKE2B df706681e63e4f36b54be33a6619da15d642803f40afe737bd31426f9b3643a6a032cb8bfcb95899d1e67b759155fd14bb45f41460cefdc7d9f91d3377a90d5d SHA512 ef4555be50dfb81a0558ed28eb917a1d0634d913a2b0b58deeae3132a0e3c61521074b21d195e51e348a08b55c21919b537ac3c7122f4d5524ead824642292fe
 DIST neutron-configs-15.1.0.tar.gz 23546 BLAKE2B df706681e63e4f36b54be33a6619da15d642803f40afe737bd31426f9b3643a6a032cb8bfcb95899d1e67b759155fd14bb45f41460cefdc7d9f91d3377a90d5d SHA512 ef4555be50dfb81a0558ed28eb917a1d0634d913a2b0b58deeae3132a0e3c61521074b21d195e51e348a08b55c21919b537ac3c7122f4d5524ead824642292fe
 DIST neutron-configs-16.0.0.tar.gz 24350 BLAKE2B 8f6eeae762fa297651f07667387beac6677cfa9a6c0d13d3fc90ac09753022fd284fc56c53557ab83cda99ab4fe03acc2d2049e4bb62f9496b310b1cd6f42099 SHA512 b087b23a1aa19678d4b9a76ae82243d03fe82706712e8c37b759a8521062f79e83307769b4ba639f67aa402f8b03cdf12d3274d821c3f8ecfd17ded9f4f2c881
 DIST neutron-configs-2019.2.9999.tar.gz 23546 BLAKE2B df706681e63e4f36b54be33a6619da15d642803f40afe737bd31426f9b3643a6a032cb8bfcb95899d1e67b759155fd14bb45f41460cefdc7d9f91d3377a90d5d SHA512 ef4555be50dfb81a0558ed28eb917a1d0634d913a2b0b58deeae3132a0e3c61521074b21d195e51e348a08b55c21919b537ac3c7122f4d5524ead824642292fe
 DIST neutron-configs-2020.1.9999.tar.gz 24350 BLAKE2B 8f6eeae762fa297651f07667387beac6677cfa9a6c0d13d3fc90ac09753022fd284fc56c53557ab83cda99ab4fe03acc2d2049e4bb62f9496b310b1cd6f42099 SHA512 b087b23a1aa19678d4b9a76ae82243d03fe82706712e8c37b759a8521062f79e83307769b4ba639f67aa402f8b03cdf12d3274d821c3f8ecfd17ded9f4f2c881
-DIST neutron-ml2-plugins-15.0.2.tar.gz 8669 BLAKE2B 3c34a857c0e7dd4e5313f5f9a1bb22384aeae6d1e43e719c50eab8dc3e842e98f202eb12cbb788127603931292deeed802f0592bad232e6a05121939e3b26fe0 SHA512 0e6858425ee3d3e2233c8ebf19aa8e62b5ff849532a2fdceb953f384f3b33432137537afbb2878f23ec5eb57e185eda36a6d6ff71d8be5f32b43abcb5c186082
 DIST neutron-ml2-plugins-15.1.0.tar.gz 8669 BLAKE2B 3c34a857c0e7dd4e5313f5f9a1bb22384aeae6d1e43e719c50eab8dc3e842e98f202eb12cbb788127603931292deeed802f0592bad232e6a05121939e3b26fe0 SHA512 0e6858425ee3d3e2233c8ebf19aa8e62b5ff849532a2fdceb953f384f3b33432137537afbb2878f23ec5eb57e185eda36a6d6ff71d8be5f32b43abcb5c186082
 DIST neutron-ml2-plugins-16.0.0.tar.gz 8887 BLAKE2B 5887027ce4585a523bb3379c002acdde1faa9ed24d0c83c931f2a387b56e8baf8352ae9f82ba46c85a6a3e5b1d68792da1e1ca1fae9b6dde525e6f6c67849ac4 SHA512 4ae70fe3e386932e0327333d29dc526b5f0f0f800ac14d17faa4c1e3fc2dd8524760b84bbb4767e73e70647984aa50702e5e47dc42deb47f66c47c5e3e965111
 DIST neutron-ml2-plugins-2019.2.9999.tar.gz 8669 BLAKE2B 3c34a857c0e7dd4e5313f5f9a1bb22384aeae6d1e43e719c50eab8dc3e842e98f202eb12cbb788127603931292deeed802f0592bad232e6a05121939e3b26fe0 SHA512 0e6858425ee3d3e2233c8ebf19aa8e62b5ff849532a2fdceb953f384f3b33432137537afbb2878f23ec5eb57e185eda36a6d6ff71d8be5f32b43abcb5c186082
 DIST neutron-ml2-plugins-2020.1.9999.tar.gz 8887 BLAKE2B 5887027ce4585a523bb3379c002acdde1faa9ed24d0c83c931f2a387b56e8baf8352ae9f82ba46c85a6a3e5b1d68792da1e1ca1fae9b6dde525e6f6c67849ac4 SHA512 4ae70fe3e386932e0327333d29dc526b5f0f0f800ac14d17faa4c1e3fc2dd8524760b84bbb4767e73e70647984aa50702e5e47dc42deb47f66c47c5e3e965111
-EBUILD neutron-15.0.2.ebuild 8397 BLAKE2B c60c20f26aa5325428daf5634e03f85f9013471231389d65d62261cf670d7b544bbe4c40967788df6d0cdfb50b349403860d84a8f67dc2068d1a501df916eaeb SHA512 466a62192eed31b276395f4fab869ff2a8f186878242656cbc89f9f6a65cd26a17b1a5b0b5d90b9179f71a0213b49d7fe04a1688b132c11bdd12b0f548217909
-EBUILD neutron-15.1.0.ebuild 8399 BLAKE2B f03c192d5bb8c5012e614156ec69d96866ed99572a34f07aed36f7c88611e70cba4ea1ba416923c889b56fa89aa74f38cf87f4835a54fcd8d42220c4caf6aa4c SHA512 d2c67e02dd6796310595687210760e423d6f6fdadf29b5ec57576b36b4a18df263bb70e7004b739731b7f6b751d8a3152f68c06b205eb076f3498d28c678488d
+EBUILD neutron-15.1.0.ebuild 8397 BLAKE2B c60c20f26aa5325428daf5634e03f85f9013471231389d65d62261cf670d7b544bbe4c40967788df6d0cdfb50b349403860d84a8f67dc2068d1a501df916eaeb SHA512 466a62192eed31b276395f4fab869ff2a8f186878242656cbc89f9f6a65cd26a17b1a5b0b5d90b9179f71a0213b49d7fe04a1688b132c11bdd12b0f548217909
 EBUILD neutron-16.0.0.ebuild 8509 BLAKE2B a2729cc408a19f249d75f22090ed7569fb5e4b021d768da538c9900daadff87685f3612afacd93986ddff6d3e4fb8a091796963489cc016a8177721c0aa41470 SHA512 fb4ac3bef1d01e108dcce2845bde7306c8cd69e5a0a0338e0bd4e711caa21b5ec3a8ca7d447add5bfce09fd8952457fac9e49c01a2143c5220c339444b3127a7
 EBUILD neutron-2019.2.9999.ebuild 8369 BLAKE2B cf0bf6af4b20180a5988827033b651806590363ff415624591b5a3dbbaec9acc192ba3d3f359e4a39f6dcc07e6b192a15c81525008fb28ce7f0e72525eeae90e SHA512 0182efe5ebf65fa111f7883f64fd329f7f7d5268371a2c9615c5f44b740ec56babecb3942bc8f32f11fe26ed472280ce69f479f2ab575c11df75e41b016d467d
 EBUILD neutron-2020.1.9999.ebuild 8511 BLAKE2B cbfd752ce6f8d0b3427673c807650917891fb4c501084828f346ad5e13c061fd3dd28a0c650b68449b81b0a39cddbb3e85c96d56189b2ab34d320343123741e5 SHA512 6a3544b2f66f5de8c31815389252d9c69f65bfb74d0b1d4568f23a7e68ca942fe4e121e4cc342baa4f6b8a81f992aa60acf38d71c985daffa8628aeca0eee8ec
diff --git a/sys-cluster/neutron/neutron-15.0.2.ebuild b/sys-cluster/neutron/neutron-15.0.2.ebuild
deleted file mode 100644
index 5deaec79742b..000000000000
--- a/sys-cluster/neutron/neutron-15.0.2.ebuild
+++ /dev/null
@@ -1,229 +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} )
-# still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439
-
-inherit distutils-r1 linux-info
-
-DESCRIPTION="A virtual network service for Openstack"
-HOMEPAGE="https://launchpad.net/neutron"
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/train/configs.tar.gz -> neutron-configs-${PV}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/train/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz"
-	EGIT_REPO_URI="https://github.com/openstack/neutron.git"
-	EGIT_BRANCH="stable/train"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/train/configs.tar.gz -> neutron-configs-${PV}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/train/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite +mysql postgres"
-REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
-						compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
-						|| ( openvswitch linuxbridge ) )"
-
-CDEPEND=">=dev-python/pbr-4.0.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	>=dev-python/pecan-1.3.2[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/neutron-lib-1.29.1[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	compute-only? (
-		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
-	)
-	sqlite? (
-		>=dev-python/sqlalchemy-1.2.0[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.0[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.37.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.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-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-upgradecheck-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.35.1[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/os-ken-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/ovs-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/ovsdbapp-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/pyroute2-0.5.3[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.31.2[${PYTHON_USEDEP}]
-	>=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/os-vif-1.15.1[${PYTHON_USEDEP}]
-	dev-python/pyudev[${PYTHON_USEDEP}]
-	sys-apps/iproute2
-	net-misc/iputils[arping]
-	net-misc/bridge-utils
-	net-firewall/ipset
-	net-firewall/iptables
-	net-firewall/ebtables
-	net-firewall/conntrack-tools
-	haproxy? ( net-proxy/haproxy )
-	openvswitch? ( net-misc/openvswitch )
-	ipv6? (
-		net-misc/radvd
-		>=net-misc/dibbler-1.0.1
-	)
-	dhcp? ( net-dns/dnsmasq[dhcp-tools] )
-	acct-group/neutron
-	acct-user/neutron"
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 \
-	NF_NAT_IPV4 NF_NAT NF_CONNTRACK IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
-	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
-}
-
-pkg_config() {
-	fperms 0700 /var/log/neutron
-	fowners neutron:neutron /var/log neutron
-}
-
-src_prepare() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	# it's /bin/ip not /sbin/ip
-	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use server; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-server"
-		newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
-		dosym ../../plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
-	fi
-	if use dhcp; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
-		newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
-	fi
-	if use l3; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
-		newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
-	fi
-	if use metadata; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
-		newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
-	fi
-	if use openvswitch; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
-		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
-		newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
-		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
-	fi
-	if use linuxbridge; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
-		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
-	fi
-	diropts -m 755 -o neutron -g neutron
-	dodir /var/log/neutron /var/lib/neutron
-	keepdir /etc/neutron
-	insinto /etc/neutron
-	insopts -m 0640 -o neutron -g neutron
-
-	doins etc/*
-	# stupid renames
-	insinto /etc/neutron
-	doins -r "etc/neutron/plugins"
-	insopts -m 0640 -o root -g root
-	doins "etc/rootwrap.conf"
-	doins -r "etc/neutron/rootwrap.d"
-
-	#add sudoers definitions for user neutron
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/neutron.sudoersd" neutron
-
-	# add generated configs
-	cd "${D}/etc/neutron" || die
-	unpack "neutron-configs-${PV}.tar.gz"
-	cd "${D}/etc/neutron/plugins/ml2" || die
-	unpack "neutron-ml2-plugins-${PV}.tar.gz"
-
-	# correcting perms
-	fowners neutron:neutron -R "/etc/neutron"
-	fperms o-rwx -R "/etc/neutron/"
-
-	#remove superfluous stuff
-	rm -R "${D}/usr/etc/"
-}
-
-python_install() {
-	distutils-r1_python_install
-	# copy migration conf file (not coppied on install via setup.py script)
-	python_moduleinto neutron/db/migration/alembic_migrations
-	python_domodule "neutron/db/migration/alembic_migrations/versions"
-}
-
-pkg_postinst() {
-	elog
-	elog "neutron-server's conf.d file may need updating to include additional ini files"
-	elog "We currently assume the ml2 plugin will be used but do not make assumptions"
-	elog "on if you will use openvswitch or linuxbridge (or something else)"
-	elog
-	elog "Other conf.d files may need updating too, but should be good for the default use case"
-	elog
-}
diff --git a/sys-cluster/neutron/neutron-15.1.0.ebuild b/sys-cluster/neutron/neutron-15.1.0.ebuild
index 518d9465fd1a..5deaec79742b 100644
--- a/sys-cluster/neutron/neutron-15.1.0.ebuild
+++ b/sys-cluster/neutron/neutron-15.1.0.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/train/configs.tar.gz -> neutron-configs-${PV}.tar.gz
 	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/train/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
 	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/nova/Manifest b/sys-cluster/nova/Manifest
index a3d57ce9a850..30129723595d 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -3,16 +3,13 @@ AUX nova-sudoers 78 BLAKE2B d2df2db0a2905e3a6aec56dc70afab046933d675715c9c16f0e9
 AUX nova.initd 747 BLAKE2B 2a20a632fcb66001e68f4d70fa11ba179db9b06a6f412115d7b89a7ac8cff0f897fc224e44e74f80f6b1ddfb7d44c8b399fc442ca2bc3b904a418d0765c240bd SHA512 938300464971847b0d14eb0e54c6443d0041a46d39b276642479cb3d0d9370480f7eb7aa8c20512609c5bf4f6fc54438b451ac4986ad7c93ef8ee5b966c7f2a3
 AUX openstack-scsi-disk.rules 134 BLAKE2B c1e3e150d93ab51b4da48caf2a0f83513fe63b5dde1e449a9c4c4dbfad65589b6326c799958736da86390142a914acbf9acf5b78bb1042e2c156eaf01cec8250 SHA512 6c3734d0b9ce9de887e15b1ddd5f5486dd1d0a55f463f9824ef067d3fe64a93d08ad2ef2b9d288f0dd42d570a5061e7a06976f7223df44b98bd321b73f9d036b
 AUX scsi-openscsi-link.sh 2777 BLAKE2B 84c14df2b1c49fe6210a4abf4387229aaa4fcd0c956b374b719285a20d8309f1bb58d51061084f34d284624d279bc64d53a629ec57702314c23e9b129c4a16b4 SHA512 3e7f6fc872f27b6a4d6c991346bd8eafcbc8f2b74439f1c77e93362e57fa1010ff002813cf21bf12d0550bfc165f79c70430862cd4ed5aaa15056777baf34409
-DIST nova-20.2.0.tar.gz 11625085 BLAKE2B 5ae0be3831ed03722947041efa6ce1dc3662273517ca652fb0c135f90f0323deed1f0af7751916343e3c8e065be4cc8eb7b00adf043ddaa798bf5faa88aa7bc9 SHA512 3db1fc8bda5ae95394518af1a856b6876104b852ffd758bda90a7fbdb8b389bc246e406d55eae614e65b559556ea9511c0c1281e2858d6157dd462767ae5127f
 DIST nova-20.3.0.tar.gz 11622955 BLAKE2B 39801fa8dfeed9b7a677e7bc9ba8b82a59bc431850083e108361ad3f334fef7ea9cd6065e47a86145fca28ad8f3991fd5755464bebf0fe224fb5f24900c1a8c2 SHA512 c5c8b4c475b02cba7e842312bd7f5e1c71756eff6e22bb38e8a4728edc60d746222ada05edf440f700da07d90cce19a9cbfdebee6ab6ea56a926545b5effe08d
 DIST nova-21.0.0.tar.gz 9193053 BLAKE2B efc95ac54a18a7df1530fc61e2478d59e5711e4c2da0156c405945a9a0ccd533255e2733d626f28f3460238cf157d802b79a8573f570623024089dd86ac23abc SHA512 a006a47f10d141df8a2495ae81c98bd0bf7af0b1f790627ba929e9b3e2931e438259f96d8c9391b9717126778f3f72f0bde01db5245bdbe801077fd884ba5a89
-DIST nova.conf.sample-20.2.0 220110 BLAKE2B af98687c895ee091cc2e8d668eb50b52cc94618081f8a50b544faebed29b2b3a5dfa38309da70dcc6d0083792605b810081b50c15a6c960947e0c782f25717ab SHA512 cc6cce95943b06d60dfc1f85b87d527662eeb57388dca4a6037078b517302b86fd7f752c6e9e43c59c10be83ac5955f21c08284bbc946ffe2171f5bfa6edff38
 DIST nova.conf.sample-20.3.0 220110 BLAKE2B af98687c895ee091cc2e8d668eb50b52cc94618081f8a50b544faebed29b2b3a5dfa38309da70dcc6d0083792605b810081b50c15a6c960947e0c782f25717ab SHA512 cc6cce95943b06d60dfc1f85b87d527662eeb57388dca4a6037078b517302b86fd7f752c6e9e43c59c10be83ac5955f21c08284bbc946ffe2171f5bfa6edff38
 DIST nova.conf.sample-2019.2.9999 220110 BLAKE2B af98687c895ee091cc2e8d668eb50b52cc94618081f8a50b544faebed29b2b3a5dfa38309da70dcc6d0083792605b810081b50c15a6c960947e0c782f25717ab SHA512 cc6cce95943b06d60dfc1f85b87d527662eeb57388dca4a6037078b517302b86fd7f752c6e9e43c59c10be83ac5955f21c08284bbc946ffe2171f5bfa6edff38
 DIST nova.conf.sample-2020.1.9999 191182 BLAKE2B 99999b1b42b9ecc6a7f404c9874c5065591dfd8e896c97d261307f7f3b5e935e12db1b4650182660cf1eb97bcfb993d41a1f89e079120adc00b339b5a4ac1c98 SHA512 af22ba8dcfbafdb07ba2785bdcb40efd201adb81d47bee15ee11bb76437bc7a5b7c88390f995432ffa92b64b849df754bd15264e97530334f3eac6f8f93e828d
 DIST nova.conf.sample-21.0.0 191182 BLAKE2B 99999b1b42b9ecc6a7f404c9874c5065591dfd8e896c97d261307f7f3b5e935e12db1b4650182660cf1eb97bcfb993d41a1f89e079120adc00b339b5a4ac1c98 SHA512 af22ba8dcfbafdb07ba2785bdcb40efd201adb81d47bee15ee11bb76437bc7a5b7c88390f995432ffa92b64b849df754bd15264e97530334f3eac6f8f93e828d
-EBUILD nova-20.2.0.ebuild 7724 BLAKE2B 746858811dcdc2e5951d3fdbeb3e113136e6b32e62d18d2ba39f59988c57050607ddc4b1805dce6485597160103a21d8492c1b157635e7daa9292e06e335507b SHA512 a39fa8fd98f10e9933596565bfe1827b6e0e5505559a31e9c3c70a93acdd2898e9b02ab321cfb8f7bc18455d9260af0531de98a11b2020272000040bdb22d0a5
-EBUILD nova-20.3.0.ebuild 7726 BLAKE2B 54ac624037ad5f471d987cae53bee5e88feeb9eb56ca06e362993156a3ebe069cb878e4975b20ee09318a45768841e2bf0fa045db05abafb26d4d4fcde06fdff SHA512 ed74e7d855e703cd30b427fc3e75d090493932ef511b0a62309fa23dfe20809ecb695cbd39a2892ae9745d3753951c8d052056cb4a8d9a6cdc5e919ce09fdf3b
+EBUILD nova-20.3.0.ebuild 7724 BLAKE2B 746858811dcdc2e5951d3fdbeb3e113136e6b32e62d18d2ba39f59988c57050607ddc4b1805dce6485597160103a21d8492c1b157635e7daa9292e06e335507b SHA512 a39fa8fd98f10e9933596565bfe1827b6e0e5505559a31e9c3c70a93acdd2898e9b02ab321cfb8f7bc18455d9260af0531de98a11b2020272000040bdb22d0a5
 EBUILD nova-2019.2.9999.ebuild 7726 BLAKE2B 54ac624037ad5f471d987cae53bee5e88feeb9eb56ca06e362993156a3ebe069cb878e4975b20ee09318a45768841e2bf0fa045db05abafb26d4d4fcde06fdff SHA512 ed74e7d855e703cd30b427fc3e75d090493932ef511b0a62309fa23dfe20809ecb695cbd39a2892ae9745d3753951c8d052056cb4a8d9a6cdc5e919ce09fdf3b
 EBUILD nova-2020.1.9999.ebuild 7628 BLAKE2B 3486d8ff71c4e70391cd416b6ef0cdf346ea8676d79cf594abaae8ea0f91dbe77a9a4a7fc720cbd4c6f910be91180b25251fa196878a33b4c8d114bb382c7e2a SHA512 d2a507f1fa6a00c2260f837cec8f02d6b151efbc7a50aecb6d50f30c1e56bd3cc708245ff7dec1a2d1a2601fb7a12a028a00ab3a7e75ff015500640c4b00c26a
 EBUILD nova-21.0.0.ebuild 7626 BLAKE2B 0b6038133b804d49d5164fc5cf6ef28bdba54c058f77a869a8c89d3c2658e534379808d0294f37eb0a42170980beb43b37244f23f4533f858f442e6aaae59e50 SHA512 06b0649cfcb1233e45a24f033e330dc29434b66f4ca263c8f9757940cb1b93db8ce8dd51068a3c19a16a6e394b0805f43b24b8cb9f665cd52d51e8d8d1f1e843
diff --git a/sys-cluster/nova/nova-20.2.0.ebuild b/sys-cluster/nova/nova-20.2.0.ebuild
deleted file mode 100644
index c68161259e22..000000000000
--- a/sys-cluster/nova/nova-20.2.0.ebuild
+++ /dev/null
@@ -1,218 +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 multilib
-
-DESCRIPTION="Cloud computing fabric controller"
-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}]
-	>=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/nova/nova-20.3.0.ebuild b/sys-cluster/nova/nova-20.3.0.ebuild
index a866be1bbd8e..c68161259e22 100644
--- a/sys-cluster/nova/nova-20.3.0.ebuild
+++ b/sys-cluster/nova/nova-20.3.0.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]];then
 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"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/sys-cluster/openstack-meta/Manifest b/sys-cluster/openstack-meta/Manifest
index b2082063bec3..a0e88c65f68e 100644
--- a/sys-cluster/openstack-meta/Manifest
+++ b/sys-cluster/openstack-meta/Manifest
@@ -1,5 +1,5 @@
-EBUILD openstack-meta-2019.2.2.ebuild 942 BLAKE2B 1f1d58cd9d7ef6b713899a08adb1e1464a3dc7da4db624b0372b7cfbf124e72c1a462c84abd04f4fd800a1701a6394dc478c95d03819ee4f21bd67926c155a42 SHA512 83a819ab86334cd88ccc3701aa995262070f037e3cf8e33a44f76e57ba25ea4cd491dfba62022a53570f045d15d923eacd55a56f8b75799296208dea8e1c88b5
+EBUILD openstack-meta-2019.2.3.ebuild 976 BLAKE2B 33cd92c487554ba336deaf774dea54ad9a4f8af8114ecaca70689a3181458dbba7a7a5ad57bc4810ccf8bb5460b90a831c54e3492765ce6bad9f28af44e802cd SHA512 b26dc9be7b45dac31f535827230bd7fdcc1ac69db0a95b1a18b46238e8112341d6154e10e7a09f0a932e19fb4d680a2e5973d2e4da84283aa7fee70f86586437
 EBUILD openstack-meta-2019.2.9999.ebuild 720 BLAKE2B 7b98e630cdf78a504a088f7cbef581ddb23cbd266058a4af622370c8deb5d58bc3d8a6fc65b77a4350ead39b3c120146b26edb23abac2cfb74b2b14a07dd313d SHA512 5d80cc2745055cc52c9b8d9ceb0c7d540e4295135ab8e4fc4af2b0c8cda1ea4e09f35d01634bb8ded59b880321f70cdf73397a741bda21999fa20bb1b4be3ef6
 EBUILD openstack-meta-2020.1.0.ebuild 937 BLAKE2B 6ffb5ab1fcdd9ce5e5c9c58cec8163ed479563b0e364c5efe1832d9bb5433fcdee840705821ac5f6ccfb3d0ba1682b7ad88c5f9e60b6dd6a9b20fd314f4e4353 SHA512 9fa5223c85ce5e2e4d5c1399617a3581cabde5b199a4b915aeeb67eb32ff95b8993b0650892e1406f9af3c71a287b165ae46eb0fbc857ba1317983823a150715
 EBUILD openstack-meta-2020.1.9999.ebuild 720 BLAKE2B 58fc952b499f4a29f619851382b2dd79f2e1df0911df77af0b5e9475afea04d893589cdec55c83be8bf2d61fcf732db1736301eae1f6053e79e0da0b5c394848 SHA512 e984cffa8bb323a48b714e8235c0bf1facc677f7ed5d80f88a9865b3182ecafc8b2a3d7f97f09c07df0a8a31c4682c6e66fb0b86ce1cf83bcca94064b0ebf2f5
-MISC metadata.xml 940 BLAKE2B 4b051b3ca52e1d545960126dd433ce0000bffce88dbb0f8232870fe2c3bf203133e91c237196544bc7cb20ee40e19665be9b1d88bd54363a40fc37e0a0482200 SHA512 bc45c4c949aeb153bb9e3b37ec6d84fbfb8248d83d58d5f05ed3ed5a38a6ccdd37171e1d6f394c2b8d01306f586b73cb64ff0e48ae5d365f60434c6d9e6cc4b6
+MISC metadata.xml 803 BLAKE2B 2a2110f98f5eb0b998d5377e524d7ec112631e64dfd59ced1ae0de1f2e6d82be469c8006e878b44a8e07aeba4d847ebfd9264e4f4d5a6bcdc823ea771f3f746b SHA512 7abe4ab88fd9f05a859007b341716303bf1218658675005428d4e9a698d43c75e29f912e762c0bcec2e921cdc0d67c5064503de0f00e47c389da993d32dcc198
diff --git a/sys-cluster/openstack-meta/metadata.xml b/sys-cluster/openstack-meta/metadata.xml
index d2ce7526d7e1..c025fe8964f4 100644
--- a/sys-cluster/openstack-meta/metadata.xml
+++ b/sys-cluster/openstack-meta/metadata.xml
@@ -5,9 +5,6 @@
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
-  <longdescription lang="en">
-    An openstack meta package to allow for easier installation of openstack services.
-  </longdescription>
   <use>
     <flag name="keystone">Installs Openstack Keystone</flag>
     <flag name="swift">Installs Openstack Swift</flag>
diff --git a/sys-cluster/openstack-meta/openstack-meta-2019.2.2.ebuild b/sys-cluster/openstack-meta/openstack-meta-2019.2.2.ebuild
deleted file mode 100644
index 2fcebd4b1a30..000000000000
--- a/sys-cluster/openstack-meta/openstack-meta-2019.2.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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
-	            <sys-auth/keystone-17 )
-	swift? ( ~sys-cluster/swift-2.23.1 )
-	neutron? ( >=sys-cluster/neutron-15.0.0
-						 <sys-cluster/neutron-16 )
-	glance? ( >=app-admin/glance-19.0.0
-						<app-admin/glance-20 )
-	cinder? ( >=sys-cluster/cinder-15.0.0
-						<sys-cluster/cinder-16 )
-	nova? ( >=sys-cluster/nova-20.0.0
-				  <sys-cluster/nova-21 )
-	heat? ( >=sys-cluster/heat-13.0.0
-				  <sys-cluster/heat-14 )
-	placement? ( >=sys-cluster/placement-2.0.0
-						   <sys-cluster/placement-3 )
-"
diff --git a/sys-cluster/openstack-meta/openstack-meta-2019.2.3.ebuild b/sys-cluster/openstack-meta/openstack-meta-2019.2.3.ebuild
new file mode 100644
index 000000000000..da449d6f9086
--- /dev/null
+++ b/sys-cluster/openstack-meta/openstack-meta-2019.2.3.ebuild
@@ -0,0 +1,35 @@
+# 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
+	            <sys-auth/keystone-17 )
+	swift? ( >=sys-cluster/swift-2.23.0
+				   <sys-cluster/swift-2.25.0 )
+	neutron? ( >=sys-cluster/neutron-15.0.0
+						 <sys-cluster/neutron-16 )
+	glance? ( >=app-admin/glance-19.0.0
+						<app-admin/glance-20 )
+	cinder? ( >=sys-cluster/cinder-15.0.0
+						<sys-cluster/cinder-16 )
+	nova? ( >=sys-cluster/nova-20.0.0
+				  <sys-cluster/nova-21 )
+	heat? ( >=sys-cluster/heat-13.0.0
+				  <sys-cluster/heat-14 )
+	placement? ( >=sys-cluster/placement-2.0.0
+						   <sys-cluster/placement-3 )
+"
diff --git a/sys-cluster/polysh/Manifest b/sys-cluster/polysh/Manifest
deleted file mode 100644
index 23fc0a31b723..000000000000
--- a/sys-cluster/polysh/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST polysh-0.4.tar.bz2 62770 BLAKE2B 267253299e62c00125f684c54b2930cbd9fd72dc20f6cd79a31918aa69b2504924e871ddc6bced79cc5995912675cbe91c1a27284b8dc510e1592863fe703676 SHA512 84d77a2272e9a5a577c17a4e1b791db0f8d2bf58f1ef4c52ebfbe7ba9396de3744bf6fafa72df126c3a3958d97bdb9feb8da002209b0dd0eb9b16b19b859e43d
-EBUILD polysh-0.4-r1.ebuild 412 BLAKE2B 652352125797160df35758cce18503d61c4d58128cd540d78b89720a44c6d44573d837eee28b92ccae8361a95d329325dffb69a422d14a1ebcd5e69711dfe34b SHA512 e439dd28dfbf11a84e1f626468a047959fdc7a971b0c8858a5486fd24cc36d176cdab03dec22dfea02a5f568de4d0314b1fe91b5c42982a5da79c1eca02f2a56
-MISC metadata.xml 347 BLAKE2B 9f0a59cf6b0595bcae10d48a7da62dd28eebb93a37b5f9a8e8fa9f1f3fb93efd6b0e3a7324f1737a8f6db7c47e7e566ea0874f756a9284c7bf6ed6fb172f59d6 SHA512 8d1d0e69924c2a83222d376b72d9e777927763ae869de6f5609c6cf746035e4ab5e6258c3c124dc2265334a0f286132546f34a46ef093262b78b142502409fe3
diff --git a/sys-cluster/polysh/metadata.xml b/sys-cluster/polysh/metadata.xml
deleted file mode 100644
index 0477ed06c415..000000000000
--- a/sys-cluster/polysh/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 -->
-	<longdescription>
-		Polysh is a tool to aggregate several remote shells into one. It is used to
-		launch an interactive remote shell on many machines at once.
-	</longdescription>
-</pkgmetadata>
diff --git a/sys-cluster/polysh/polysh-0.4-r1.ebuild b/sys-cluster/polysh/polysh-0.4-r1.ebuild
deleted file mode 100644
index b6f9c52ccc77..000000000000
--- a/sys-cluster/polysh/polysh-0.4-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Aggregate several remote shells into one"
-HOMEPAGE="http://guichaz.free.fr/polysh/"
-SRC_URI="http://guichaz.free.fr/polysh/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
diff --git a/sys-cluster/rdma-core/Manifest b/sys-cluster/rdma-core/Manifest
index 21bb33fa7ae4..2fbddfbf3f52 100644
--- a/sys-cluster/rdma-core/Manifest
+++ b/sys-cluster/rdma-core/Manifest
@@ -7,10 +7,12 @@ DIST rdma-core-26.1.tar.gz 1601313 BLAKE2B 459baa80d5cb74386e567880ec7fd2de9e4aa
 DIST rdma-core-27.0.tar.gz 1445552 BLAKE2B a038653865f8d37b6599a54ca7fef97b2ac131b3a11ce8696b5c1ec558e85332e950f8d5104f250b23a186224735b2a338fc03f875979bff342ad26ebb5b74b2 SHA512 8a299f4d3fe6ea98d8fc8d8135295e55c8bbf5d0d5f2e5fd362a5eb96d86f5aa84263736ab80a3c0eb104c7fc5fb5d43a2077cc6a1fed3d346af89597a4ddee2
 DIST rdma-core-28.0.tar.gz 1455729 BLAKE2B cee2030bda14d3833fa6e851e85d92ec7f91363a09e11bb7ce939ae144e4edbe32653a759a573d94a735ba6766911cb491e7871722bad81e45c3744dc3b8683e SHA512 aec8b8a0d67bcfe42d9d4a53f93bf03ead14fc6f8887fc9f05b2f1ccfd1aae1214c49ecbc01f16b585f71369e3c7a7e2c8d2adc42aa9b31436939b3f3038fde8
 DIST rdma-core-29.0.tar.gz 1467415 BLAKE2B ecea77fcd4b4033f81aef9cd9b483cc97b1f4af7c73030c2f94e8242be178c53c5d62aef4d3db7de60e2b7a9cf068bbf851915385912c8ef795c406c4e45a4f9 SHA512 4b12cd0fdf01a827831081cbe9bbb927173cb600edc51e2befe5e6c3cd88c90069d2872d839ef98e87c59eee777da6429dbf5e8621b6e872e0cf99857fe6d78b
+DIST rdma-core-30.0.tar.gz 1485452 BLAKE2B 8774a41eaba486007a4b695fc5196935102c172607136ca37d03fa626c5bb0b75df7b9cc6a6126219111b4ba828984ffbb235e9afee1e941852650a2b2412dc7 SHA512 4a0ec689e27de71f33e21df9813f78bec81b99c941da234d8d4050a3e1a1b157488d7a4d58d7f62472f32061a36dadad43d986238dcbaf24a29dded3827ec374
 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 2545 BLAKE2B 3527d23b09d389391992ab23b3c54f328fd1ca6439ec45da9ddb90aa594a7aa917ffe29103713e9d2c761044e71fdcbcef55a0730d4a8e74cc4381813a1c61b1 SHA512 91230439a73aff381201d3b34076e1481e21fef3ff6d8760b90894bfa4512397c4d1d7a198e1a9430cd702c90e1e3379fd2e98c07946e9e3a62930b31106adb4
-EBUILD rdma-core-28.0.ebuild 2559 BLAKE2B 3272f98e3048bb752d0368b64f6ef7f5c8feebdb6b88e175e6dd55cc353a8cfb0450091398ab4d63fc9fed3c1579b192de009059ce0be845d681010278c9ab29 SHA512 374a5cefd7e7bb3c9f7c1ed9b5993b3980bcf005991489fbc3ec7dcc6ba2136d4b9639b092cbbce31d76c74e23a87a7b5c61f7c35d02a70076175a72daee0a0f
+EBUILD rdma-core-28.0.ebuild 2564 BLAKE2B 837c8f2ba32ba2f92e036d1787a35e94504817450f045a470657408b6de1bb6b1601921ca1b82f60f863db259970c049338f292edba422fb43af940b78a1944d SHA512 74da15e37968be9013b0d90f44f3e05b264bbf410aa703b64d94c045ef3bbc43b522fbd507c5d938a5177312449fa0c12e81d36dd4332ad5a0a76530dbd8cd2f
 EBUILD rdma-core-29.0.ebuild 2552 BLAKE2B 864eba031ea08c1bd5603e368ecbc93c3a3f2689e74624ba04509c35fe6369692aedbfa29c8a3429aa96a816531aca9e8f7e8b81dd44d1e06fdf5e771a51d966 SHA512 c1023e7c6368f19056802107e7e605aa8d74cbb55ac326882c28d1bda5c8ff7a8d5b16e805f632cefc19dcc1e98c3d39b3de008cb00006cbd32677782e464eeb
+EBUILD rdma-core-30.0.ebuild 2559 BLAKE2B 3272f98e3048bb752d0368b64f6ef7f5c8feebdb6b88e175e6dd55cc353a8cfb0450091398ab4d63fc9fed3c1579b192de009059ce0be845d681010278c9ab29 SHA512 374a5cefd7e7bb3c9f7c1ed9b5993b3980bcf005991489fbc3ec7dcc6ba2136d4b9639b092cbbce31d76c74e23a87a7b5c61f7c35d02a70076175a72daee0a0f
 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-28.0.ebuild b/sys-cluster/rdma-core/rdma-core-28.0.ebuild
index 66af444d7865..f476dc0f72b1 100644
--- a/sys-cluster/rdma-core/rdma-core-28.0.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-28.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
 	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="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )"
diff --git a/sys-cluster/rdma-core/rdma-core-30.0.ebuild b/sys-cluster/rdma-core/rdma-core-30.0.ebuild
new file mode 100644
index 000000000000..66af444d7865
--- /dev/null
+++ b/sys-cluster/rdma-core/rdma-core-30.0.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="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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/swift/Manifest b/sys-cluster/swift/Manifest
index 66da98bf6904..ccada5caecbc 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -2,10 +2,8 @@ AUX swift-account.initd 867 BLAKE2B 12a01902f520b2c25261a229e1239c3f85ba05dd708e
 AUX swift-container.initd 877 BLAKE2B f45f04d6d6d4fefdf153d40d1480535cb6552daa812854328e845ff8afb96ffd4f947a0a38437ec401a10c493701f328667e1b7e314ea39510c957ec3e7be2bc SHA512 46ae66806db3cb8b9416ccde1a08f0f8af5dd1bbeeda23fc547f8ed29f979c554b47ff0c9ca13f8944ec8c3f4c2d0ffd0616bead4ac9b42078ffaf0ba238d52b
 AUX swift-object.initd 862 BLAKE2B 2a062873ab613e7d98d78758ccae793d8d952cb66922d900353a516738014cfe72f98a6830d0af523757e15b432b88f991753572a3e1b8e248af8e1bf43d2b70 SHA512 a977e3d81e22785b4999e5dbe6c51c020f98fe4ba08d52ff971477fca606a7fbd8e80f4c45ac6ba6afa213ddca7b81acc6238d91bb5c45635cc68c174575aa05
 AUX swift-proxy.initd 1379 BLAKE2B 56453a557c0abfd6b07f65778ef14d8920bedc4133e0efa1aa4a5466a72103e9b57b361f481e0b5cb816471161196755de7794bd3ea3d6f5120cc1f159489c22 SHA512 dd32e4249686b51d2ed6add8e2e91eb9e520c662ebdf068f68b4e52faf4d508d3c87e996c6c2f7ba2a7d1f5fdf639d08e1e6878cd4c9918408e007ccbd7c84ec
-DIST swift-2.23.1.tar.gz 3044545 BLAKE2B b3b06aefa7c58b718f7d9c1c1b9bc92f442b83202b8d5c2dbbb777650088f2d939f5e9d0fbe83cea38fd6635d072cd8bb3894d64ed9767dde203064c1b81cfdb SHA512 48aa82b178f5e3901363c2b9eeeedeea12a58b1ba86cc46937dd9ec074ecc005b04a6ce732d4e9fce2497c6c62b659038da40ed43550256584bb371df4e596fb
 DIST swift-2.24.0.tar.gz 3177018 BLAKE2B f465f0e8f58cc097b5b1fdbe5c9736ee3e2247d13d8ae1beeb7e736dd1246e7d8820cb7241afb67e651ad85c269a48d9dbeda3479dadd773bfc1fe3278731afe SHA512 f8e3b0fec06776e095067b2c12f782a9a787c814cea8039ec32930c562be5c74b4b2bf4cb9dad3481953e5163bd051fe32f3074be7776fd1af0be94982d113b6
 DIST swift-2.25.0.tar.gz 3183764 BLAKE2B 865cfcc832edb1f30a4529b0ff550c987a7413c841b9f1ef0d0a145f5be55762963b32ea332aa6f51690a871124e84dc7fb036309f38d4120a1e095e60bfaa34 SHA512 60cbc4bae61bb287e93d9a6a4e9a58a9c97f407d07927dde99c923d1ee7ab4ef79350c7c0cdcaab8aa0944aee09c27da549f3ebf86eb9bb92766b2b301d593a2
-EBUILD swift-2.23.1-r2.ebuild 3566 BLAKE2B 3d9aa0b6449fb1fa59e5190d78a0f7f39d4c810e8820acac6fe781d90b468249c6e520b2766031ce5985c776c1ecb7c9a92370b6d5ab246397f7fff47bbc182b SHA512 a13c8234a5e42cc3bc089bcd528c433587dba84f7416f7c6101d5f9c611b6e81f2aa5f3ec4f6bfe8494ee9d4bfaef24d3a93ff5ac5e516e7a8c15176c2711f18
 EBUILD swift-2.24.0-r1.ebuild 3566 BLAKE2B 3d9aa0b6449fb1fa59e5190d78a0f7f39d4c810e8820acac6fe781d90b468249c6e520b2766031ce5985c776c1ecb7c9a92370b6d5ab246397f7fff47bbc182b SHA512 a13c8234a5e42cc3bc089bcd528c433587dba84f7416f7c6101d5f9c611b6e81f2aa5f3ec4f6bfe8494ee9d4bfaef24d3a93ff5ac5e516e7a8c15176c2711f18
 EBUILD swift-2.25.0.ebuild 3567 BLAKE2B 79524bfd15b08c165957bac7e4f97c5d031299d9c10842ff684773e4f4e00b097fff48b30b63d75f063053d8ba3b05b3013439d480be1920e16ac7e4f6eb9bc3 SHA512 e73ff05580f793393e50df4b8f63e243b1a5e565650d5c32e5b261bd49f9bb473a341223dc324b8dfd1294400ab4ea251be3aa0650c6333120142da4e89aed62
 EBUILD swift-2019.2.9999.ebuild 3549 BLAKE2B 76f2071b01953f4199a593499599de64c5487a46c3028a15d05f5fef012b845aa2b514b24207a4eceee24ce976bdf5c6eb40fe385bca0b0a373c3628b42276c4 SHA512 a6b764fd0e66348f20ba23d28078ca7402201119bfa24bbaedb1542c16d0469dee7840cc65800f4f8340924291df7a4cf84ce41af48dba183c3ae188436eb723
diff --git a/sys-cluster/swift/swift-2.23.1-r2.ebuild b/sys-cluster/swift/swift-2.23.1-r2.ebuild
deleted file mode 100644
index 119dbe1fc560..000000000000
--- a/sys-cluster/swift/swift-2.23.1-r2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 python3_7 )
-
-inherit distutils-r1 eutils linux-info
-
-DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store"
-HOMEPAGE="https://launchpad.net/swift"
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/openstack/swift.git"
-	EGIT_BRANCH="stable/train"
-else
-	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="account container doc +memcached +object proxy"
-REQUIRED_USE="|| ( proxy account container object )"
-
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.8[${PYTHON_USEDEP}]
-	!~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
-	!~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	dev-python/pyxattr[${PYTHON_USEDEP}]
-	>=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.0.2[${PYTHON_USEDEP}]
-	memcached? ( net-misc/memcached )
-	net-misc/rsync[xattr]
-	acct-user/swift
-	acct-group/swift"
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
-	~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
-	~ZFS"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
-		done
-	fi
-}
-
-src_prepare() {
-	sed -i 's/xattr/pyxattr/g' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	keepdir /etc/swift
-	insinto /etc/swift
-
-	newins "etc/swift.conf-sample" "swift.conf"
-	newins "etc/rsyncd.conf-sample" "rsyncd.conf"
-	newins "etc/mime.types-sample" "mime.types-sample"
-	newins "etc/memcache.conf-sample" "memcache.conf-sample"
-	newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample"
-	newins "etc/dispersion.conf-sample" "dispersion.conf-sample"
-
-	if use proxy; then
-		newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
-		newins "etc/proxy-server.conf-sample" "proxy-server.conf"
-		if use memcached; then
-			sed -i '/depend/a\    need memcached' "${D}/etc/init.d/swift-proxy"
-		fi
-	fi
-	if use account; then
-		newinitd "${FILESDIR}/swift-account.initd" "swift-account"
-		newins "etc/account-server.conf-sample" "account-server.conf"
-	fi
-	if use container; then
-		newinitd "${FILESDIR}/swift-container.initd" "swift-container"
-		newins "etc/container-server.conf-sample" "container-server.conf"
-	fi
-	if use object; then
-		newinitd "${FILESDIR}/swift-object.initd" "swift-object"
-		newins "etc/object-server.conf-sample" "object-server.conf"
-		newins "etc/object-expirer.conf-sample" "object-expirer.conf"
-	fi
-
-	if use doc; then
-		doman doc/manpages/*
-		dodoc -r doc/{s3api,saio,source}
-	fi
-
-	fowners root:swift "/etc/swift"
-	fperms 0750 /etc/swift
-}
-
-pkg_postinst() {
-	elog "Openstack swift will default to using insecure http unless a"
-	elog "certificate is created in /etc/swift/cert.crt and the associated key"
-	elog "in /etc/swift/cert.key.  These can be created with the following:"
-	elog "  * cd /etc/swift"
-	elog "  * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
-}
diff --git a/sys-cluster/zookeeper-bin/Manifest b/sys-cluster/zookeeper-bin/Manifest
index 41e855b6b3bb..e2ed62418b32 100644
--- a/sys-cluster/zookeeper-bin/Manifest
+++ b/sys-cluster/zookeeper-bin/Manifest
@@ -1,7 +1,6 @@
 AUX log4j.properties 2191 BLAKE2B 64ca568213fcc1168a10b8ca5914361f2d4543e8d5a2e22bf81ee807df2c4f7ca269a1f8d355ee8e889aa50c250e24f65c3900a32f06233e6c3dbc9b460c48b2 SHA512 a465aef274e3f325730c150fdebe3ca27f9debe723af6680b187daf83d6da663fa8a51bb9813ec8cba3b4d59c9e28848032083a44686b08fd2c246a461ada0c6
 AUX zookeeper.confd 398 BLAKE2B d49c6c7358ce2f6911d359142e0f6abe2662c0e5c2bcf1ac114cd272d44efcfad05d31d58ef368a470e6f844df999068b68a7c1e8392138fc07887333e7bd41f SHA512 76ad4796faa2d267ae30d85e573de2dbad00c566764cf6757d71c00c68b10c99383dd87d2352f521c872ce22edde85bb2d3896bb6258f57ce3fc6b423a16296f
 AUX zookeeper.initd 373 BLAKE2B c60740f691d186861e3f101c84e5904774de6235a0423f4f639843b105d6ce9b4ebd9555db13f5ac1447c154881b3c95fbd4738d496f6008d9e52de1cc3e74eb SHA512 34a4011ecb5d8739e57dbc9222b528a0b323c6aa0aa45391621e724106571a632908782e3a4e14e953be72fa0e525b4c7cab0440af37bbef26a100fd1d92da81
-DIST apache-zookeeper-3.6.1-bin.tar.gz 12436328 BLAKE2B 73c8628826382d68171f12e6ff5baefc66c4569f6e7dfec53ce00a2fd8bcf5ec519c5aeb29e9d01762ca95205bdfce3748cdaa1c745cf254c38df6ee38117165 SHA512 1c5cb4d9886fae41bf244a446dd874b73c0fff7a5fc2dda4305041964420cde21e59b388dfd2551464a46bb6918d9d3c3c01ebe68fdbe782074ee360aa830c7d
 DIST zookeeper-3.4.10.tar.gz 35042811 BLAKE2B c17100d2179688665cfc9efededd378543492e2a839df9da7ab72097b954200c527375cadae1d7b30d83c511c21c1470d0b86a4a19df5abe0c82980920cad92f SHA512 4c54e40ac8d0b267db4a188a30e39ed0ac2c3e8a8fadaf244be45ff5adee956df28f6cb9f1eb56f175e924fa3629b64f98286a090c46764c91c017613c80a51b
 DIST zookeeper-3.4.11.tar.gz 36668066 BLAKE2B 4bf963d41280bd6227b4e81721576bf1f973a765c7049e78c5fae4d9dbc7e4d034304208af0f68b894bd4624e1945c9e4492b3217ff7f0e05d9b822c1843d96d SHA512 1ed2df11dbff2fbbb70d992d02427c4f694ccb4fe493db10a087b04d934b132b970956099edbdf1c2c636d5eb248bca1528846fcb449ae8bee4b9a82f7936f9e
 DIST zookeeper-3.4.12.tar.gz 36667596 BLAKE2B e4aac98f86fc4fcc576ecfb55381fd37efe3fa56cebc1632abda59b6ba71fecca17ace29124ef9f59ca0de627ff463f9d6fc7ff7fbbe77c2bbf30ae25a9f99f8 SHA512 026c7feb4a660bf8d99b1b719fec2b7e4603c3c46f2b77bac372df15ed0ceb4d971aa9c954082d61d73929ef8dc38c31693604ae75244f746cafb4eb6e67320c
@@ -10,5 +9,4 @@ EBUILD zookeeper-bin-3.4.10.ebuild 1933 BLAKE2B ac00e5f5e075cb3e77de407ae9863bc4
 EBUILD zookeeper-bin-3.4.11.ebuild 1933 BLAKE2B ac00e5f5e075cb3e77de407ae9863bc4f696711e54b92c45011fe2c51a992d8f156f8bacf20787b91126334c748bcc078ce327869e11c7f0b6afe6b8e73e3c8b SHA512 7dd0ece206a10f882e7fe9e0a6fee4f7a8079e84af017f6d9f12bd48ef08524fa5f672c18c469562812f4da9fdaab7a0c087ed977d473f6f33deac4f7a4e77c3
 EBUILD zookeeper-bin-3.4.12.ebuild 1933 BLAKE2B 5d326d7ea693b528e88a3e74b84e516b16ef60fc2ca1b92caa224170726b1092f8ac839b495a88d1880342b38958c6b18ebf58540884d62cd6ca44d65fd8b0cb SHA512 60b76cbc2b3e221f627737a56a0d3420d67c15f26f4b260f4278b678648d64bf51626867abff5ae2f5f7ca3d735943ac85cff03639c5daf353dc9c33314baf4e
 EBUILD zookeeper-bin-3.4.13.ebuild 2053 BLAKE2B 5aaa2b86d2762abd7558801ca16081ad65a02386bb91abb2b73caac17695028ccd3dac099194f38389c3321e11cc97281b782c9ccc0a99516195e3e7f694c28a SHA512 8335da5a5b9db28943af049dbbc25c615fe7d69684ea900ab9b4d49dc3d4823729b5f2a9c8b7df09cd7f2e0d125643693b475a8a7d382945d66ef474b3f30913
-EBUILD zookeeper-bin-3.6.1.ebuild 1480 BLAKE2B 02f60ec89dffa512c62a8a749c25be390682ca4e806d7d21c9b49a9a4991ae970b670b72f015a7d91dc48cfef35247001afaae8ff2d86664d6e960f213829ea8 SHA512 ec0d2368f7c037fbd33dc1fcb8e10d2021bb340b558eec681a367398c9377b31653da93709b7778f3d56ca4d40d090a53cb45ca0d2826e12bd43a45db69b1551
 MISC metadata.xml 377 BLAKE2B ab2582cf60510f072415cc1dd008bd744f66d76fe6b34b779eba8acf7c28a0d055d70d16c2712af7324b6b11193ed2526b6b8bb1b101084e8a5ca8d96993ef3d SHA512 2ad1600101d36b70c32cb76894e55f01717a544d689bd28ffb41a727d7d23b6f8e9565eea71f252a721bcd4e516692921796f24266485a216a6015a5a9e74f26
diff --git a/sys-cluster/zookeeper-bin/zookeeper-bin-3.6.1.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.6.1.ebuild
deleted file mode 100644
index ce172dc53831..000000000000
--- a/sys-cluster/zookeeper-bin/zookeeper-bin-3.6.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils java-utils-2 user
-
-MY_P="zookeeper"
-MY_PN=${MY_P}-${PV}
-
-DESCRIPTION="A high-performance coordination service for distributed applications."
-HOMEPAGE="http://zookeeper.apache.org/"
-SRC_URI="https://downloads.apache.org/${MY_P}/${MY_PN}/apache-${MY_PN}-bin.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror binchecks"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=virtual/jre-1.7"
-
-S=${WORKDIR}/apache-${MY_PN}-bin
-
-INSTALL_DIR=/opt/${PN}
-export CONFIG_PROTECT="${CONFIG_PROTECT} ${INSTALL_DIR}/conf"
-
-pkg_setup() {
-	enewgroup zookeeper
-	enewuser zookeeper -1 /bin/sh /var/lib/zookeeper zookeeper
-}
-
-src_install() {
-	local DATA_DIR=/var/lib/${MY_P}
-
-	rm bin/*.cmd || die
-
-	keepdir "${DATA_DIR}"
-	sed "s:^dataDir=.*:dataDir=${DATA_DIR}:" conf/zoo_sample.cfg > conf/zoo.cfg || die "sed failed"
-	cp "${FILESDIR}"/log4j.properties conf/ || die "cp log4j conf failed"
-
-	dodir "${INSTALL_DIR}"
-	cp -a "${S}"/* "${D}${INSTALL_DIR}" || die "install failed"
-
-	# data dir perms
-	fowners zookeeper:zookeeper "${DATA_DIR}"
-
-	# log dir
-	keepdir /var/log/zookeeper
-	fowners zookeeper:zookeeper /var/log/zookeeper
-
-	# init script
-	newinitd "${FILESDIR}"/zookeeper.initd zookeeper
-	newconfd "${FILESDIR}"/zookeeper.confd zookeeper
-
-	# env file
-	cat > 99"${PN}" <<-EOF
-		PATH=${INSTALL_DIR}/bin
-		CONFIG_PROTECT=${INSTALL_DIR}/conf
-	EOF
-	doenvd 99"${PN}"
-}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 937411ff985c..816a14833b34 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index e5fd3331f468..16f61e07c1d3 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -2,7 +2,9 @@ AUX binutils-config-5.2 11716 BLAKE2B cff36d78c6d872c329cd63a9cb5c03e4c30a2dde8a
 AUX binutils-config.8 2422 BLAKE2B 850b229c3c51c7687f303f723ed15f09d0d33730788aefefbb8840cee403dd287dae9380b3c60e22c0aa36ce519da8908f1d1b5e7bf4a79fc3c743a716086161 SHA512 d5f184c9a2178f94be216868afd79edf641fcc9c69a29ea2538ec93b03473199a2045edcf9f543c227de03ba986c48a61d86f0200b1a9d7defd393349ba79ad3
 AUX binutils.eselect 810 BLAKE2B 2da92ce32b79691b84e33ba83a5621e4cc6001cb6990ecf32116d44cfdfc8ce3de5f90f7ad122e0b86b85d64d3ad5c5ae1c4819d8088ef7fd528b9c202ecb4a6 SHA512 105d2c50fbe2a988e669810db3f2d278cb70c24ee85a16c85a3f63c6e8e9e32bd91f430e4f9ec347e0ccb1a88ca4edb2eba9cbda73356e44d0871cb7ab9eb203
 DIST binutils-config-5.3.1.tar.xz 6688 BLAKE2B 3bc1b96a96b0c30e425f4ffd42f86a09e2a80cc3ad1dcf77d4b5d2d9eb3d6bc607f78dfff1ae888fe8abfe44405a1e4d1ab325aa92fc5889c18aa3187a506647 SHA512 c6d188b70935604a8a519c036dda210c20e5b6e916fab33e5026bd5c78adfff0a1aa85003759b751275576ff33471b25c920beb6b1c088115f28918389e09ce2
+DIST binutils-config-5.3.2.tar.xz 6840 BLAKE2B 4f02b8d1f3f8d4adca811772edba6167fc0e739f8ff1e895f30745eca45b559da6622bb76a0cac6016d6e864fe7ad6c921c64c7ec1c18c130b3a64a1dd7b9cbc SHA512 03dfecf46fee941b7b9fc35b63ffd22c795ab54f0444f16fc00ed44d27c81f6baaca33170fb700cfc4d767be469f305890882839536363bc466ad200d28d2228
 EBUILD binutils-config-5.2.ebuild 1092 BLAKE2B 453ed9f4ce103a56c0880fe2d08594b1734081ec933415d8d54d2376a0015d4e32e8555f5dd63356bb99ee917ea982ebfb75e92e9c58dfadf9c545fdbf82e863 SHA512 74fc1bafd272f17f94a1e5b6b27bfaa5fabc1cd45bcc5886bbc0856e304396afaed8a4f942f6ab578dca782ad62eb98c8852a21f39f9c6379e3a1b43b9df52a7
 EBUILD binutils-config-5.3.1.ebuild 1127 BLAKE2B 2f2705f36212ed61dd65e00e917ba9504019705926abe988faf42c0a56f26ed83615b1ebd815c93d01ddfad1983f65f159833b65361a650afa727dd4e7b43090 SHA512 ec5e718e518591c1df1937efab6424e436cd4e632c7e73bb8a346ab19c34e1cbc1048b15849157e3a230b098a189dbb9084aa7a0eb68a029883fcb98912147ae
+EBUILD binutils-config-5.3.2.ebuild 1127 BLAKE2B 2f2705f36212ed61dd65e00e917ba9504019705926abe988faf42c0a56f26ed83615b1ebd815c93d01ddfad1983f65f159833b65361a650afa727dd4e7b43090 SHA512 ec5e718e518591c1df1937efab6424e436cd4e632c7e73bb8a346ab19c34e1cbc1048b15849157e3a230b098a189dbb9084aa7a0eb68a029883fcb98912147ae
 EBUILD binutils-config-9999.ebuild 1127 BLAKE2B 2f2705f36212ed61dd65e00e917ba9504019705926abe988faf42c0a56f26ed83615b1ebd815c93d01ddfad1983f65f159833b65361a650afa727dd4e7b43090 SHA512 ec5e718e518591c1df1937efab6424e436cd4e632c7e73bb8a346ab19c34e1cbc1048b15849157e3a230b098a189dbb9084aa7a0eb68a029883fcb98912147ae
 MISC metadata.xml 416 BLAKE2B 5ea7d7b0b0ca3767c8393d3ff5c7c51d190503d6dfea9f2146b7f8bdf1f6a91237e918e6b6b178d07a3de8affc936fbde215825ec33c5b334d67d36f66c30566 SHA512 256a0c0ec2d57c3ba75a27e7a810ec70d06cecdefc20f2f58cfcbb1ddbd195c2115661c4960ab6316d88b6db21210416a4eb5855488ddd5918888365a3a9d00b
diff --git a/sys-devel/binutils-config/binutils-config-5.3.2.ebuild b/sys-devel/binutils-config/binutils-config-5.3.2.ebuild
new file mode 100644
index 000000000000..5f9cd23da4a1
--- /dev/null
+++ b/sys-devel/binutils-config/binutils-config-5.3.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit prefix
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/binutils-config.git"
+	inherit git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Utility to change the binutils version being used"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Toolchain"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+native-symlinks"
+
+# We also RDEPEND on sys-apps/findutils which is in base @system
+RDEPEND="sys-apps/gentoo-functions"
+
+src_compile() {
+	emake DESTDIR="${D}" PV="${PV}" USE_NATIVE_LINKS="$(usex native-symlinks)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PV="${PV}" install
+
+	use prefix && eprefixify "${ED}"/usr/bin/${PN}
+}
+
+pkg_postinst() {
+	# Re-register all targets. USE flags or new versions can change
+	# installed symlinks.
+	local x
+	for x in $(binutils-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do
+		binutils-config ${x}
+	done
+}
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 912dd40b6ae5..df8722493636 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -8,7 +8,6 @@ DIST binutils-2.32-patches-3.tar.xz 151372 BLAKE2B 70d5f78d9f3e3bf9ff096b6f24bab
 DIST binutils-2.32.tar.xz 20774880 BLAKE2B d1bdbd9c8487c091665c197974ce4bdf520b7a67ed6997a81b87e6a0af9514a091458244f583acec5ae580ac2ee5e908f67f483b8e5263cd18ced794cb235da6 SHA512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a
 DIST binutils-2.33.1-patches-2.tar.xz 18636 BLAKE2B 0e0757329b6a83aeff4f4c450c95e73fd48fcc89f83e63f294568632bee0972552cf2f57494352c5d9a7c16a51cdbc4108b38fa6028d4388c8e76046b3da9212 SHA512 d982f68d1f5fdb384309a2a1b7426bf840a90e7a85b37229b4223b62c36cab9dd9ec0c08382c85c68adf996dec21133df3180a2fc649363adae8645f8282f71d
 DIST binutils-2.33.1.tar.xz 21490848 BLAKE2B c336a8412938dc8c224f40a763a8bea9937cca0462a8fb80e62f14aabe590107fc061a3f4b9327e1f4652cb026384d36a91b4766d4d469d2d0680932874b638c SHA512 b7a6767c6c7ca6b5cafa7080e6820b7bb3a53b7148348c438d99905defbdf0d30c9744a484ee01c9441a8153901808513366b15ba9533e20c9673c262ade36ac
-DIST binutils-2.34-patches-1.tar.xz 20388 BLAKE2B 8828505f62259a307de445357320827e7f6bc416a7f4c72140add505f62eef3928c7daec13be158b52c2a7a1d989f539025e4be6ec27ef80ede81477a42c5042 SHA512 951dffcc30ad5706dc48e71995217655c5d96472446ab66a357f19486b57d1868143a9809887eab7ba8c42c33124f8b37d3bab6618388ea8a08b4399d348a645
 DIST binutils-2.34-patches-4.tar.xz 95232 BLAKE2B 0a355120ecaf447d863f6d0837028061968166c9024da36212ce7d172ee2060e4027be1fca0089e38ab9073b5332307ff1dc05b868603bd2aa0ec8e88af7cd0a SHA512 e593edbeddaf97ef23fa8eb25c5714c7f2dd2500d11422bd9dba42e119884fe71593adc98862f74c7d391ceb298556ed049eee3c504733c634faef236045876b
 DIST binutils-2.34.tar.xz 21637796 BLAKE2B 07dd23916a7d27f71c3f160c8c16abe2bd4fce294c738c665a012a3be6a87dbe8160d0c38740524f9025e01d438e99b2a94bcf9f9f79ee214f5dd033de8aad3d SHA512 2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd
 DIST binutils-9999-patches-5.tar.xz 17492 BLAKE2B 4d5072d26d714dbc2a65899102c35791887b3c1298eb40a72088f5f964f500fa82581ac27a47f075812610e1757ba1ca5ac7d055dccc0d819ec06a86ca98f395 SHA512 c8a843cf04b72f010eef405cc2d029e49fb1f4582686f1e0409579d544b02d249c31f7cb9cd59747bc94727e29ddaba89951043b392017c6963ca14f3a0202b1
@@ -16,6 +15,5 @@ EBUILD binutils-2.32-r1.ebuild 12638 BLAKE2B 3bb6831d91295ad0e1eba8f50de8d5ceea5
 EBUILD binutils-2.32-r2.ebuild 12417 BLAKE2B 0db121dfdf5af96c1884684ab0d8a25d69c037d8b394a8d364f742ded9962f96c4e94f5073294c41eaefb0b9061b58b4f78f86ae04c73bd13797b3de5d3e3c4d SHA512 abbf2690b78b9c74c8db40db03a0de41afdf9006120b2d32014c53b064ff3872813c2a35d610e5dc5b50324613395ff8dbd6f9e0811fc09003efd830c748d459
 EBUILD binutils-2.33.1-r1.ebuild 12152 BLAKE2B 71c89261848ff7d8898c81cd013de9bd9fac9f3853732fb4636c6e420106b74d3f42970d2dc25c2053a71003d898377618fb2c6ef271f993302f3f5c1f4d3d54 SHA512 689498a68f0e802c1468ee3a4df6dfe8ede15dfa797d1983466d01e64f5da26c071f1396d52f25085e5df4075cb2969349f0533eb89a543da224c6c3ed47d4b9
 EBUILD binutils-2.34-r1.ebuild 12340 BLAKE2B f4947adc40ef2cd12bc0f95889372fa53166a91b70ad454127f239870524eb6fd334ba6a0ecf1e74163928d46c243c3e8e52e408419faad360e9e5dbfcb54e7c SHA512 32dc8053199384e15b74d1859988e8974164b0376452206face59c8b30e99dfcb030769b0252920c3a8ab2fd943fe292e70b82c9cb79bd0f88c96fbe1f2e48e4
-EBUILD binutils-2.34.ebuild 12337 BLAKE2B dc373bf8ef89bf4b81619d16037996e19086859a5f8de8289a0f47bb21a0381990df5d0a912abcc3009213c0c97da8277f9b0bd92d740a529cadf7feda358ded SHA512 be63803f09026d414e77b0a831da5d24526c5c2e0a65649010074acb5410d7ffefd7b861e2ddeb6338356a0a488e0095009240bda7a4f398a5f63add9333e4d8
 EBUILD binutils-9999.ebuild 12188 BLAKE2B f6167e97971971f9264ae921c0b46ae05239547823878a544748b750ed689c6b4c81378cb72b0fb6efc62942ae815d55220af0a5b868725f7b00f42b65f1c499 SHA512 69c89f09a24688b39216027bd8d6ec6a9918d59e351fe5202a4128d6e5b2a3a43f7190eda466dca4d253590a4dd622ca74fc246f788827270a1d61ed0eec37b4
 MISC metadata.xml 650 BLAKE2B 5f0547bb9a41a09f28afc7feb1d6f2da32205924d860a88f64a7970a5e24749b961531c023a8647720e119ffbf2bdcab9384f10726a3371a8ec750b808233eaf SHA512 9057a779adcdf1da85c7e26fdd134303e4fe53ba015dda84761f5e4894833ba50f1411c1e96102319479fb1becf6c02e23984737b3660a7c24101d0cf0d404b2
diff --git a/sys-devel/binutils/binutils-2.34.ebuild b/sys-devel/binutils/binutils-2.34.ebuild
deleted file mode 100644
index 40a250edf7b0..000000000000
--- a/sys-devel/binutils/binutils-2.34.ebuild
+++ /dev/null
@@ -1,442 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils libtool flag-o-matic gnuconfig multilib toolchain-funcs
-
-DESCRIPTION="Tools necessary to build programs"
-HOMEPAGE="https://sourceware.org/binutils/"
-LICENSE="GPL-3+"
-IUSE="default-gold doc +gold multitarget +nls +plugins static-libs test"
-REQUIRED_USE="default-gold? ( gold )"
-
-# Variables that can be set here:
-# PATCH_VER          - the patchset version
-#                      Default: empty, no patching
-# PATCH_BINUTILS_VER - the binutils version in the patchset name
-#                    - Default: PV
-# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
-#                      for the patchsets
-
-PATCH_VER=1
-PATCH_DEV=slyfox
-
-case ${PV} in
-	9999)
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		inherit git-r3
-		S=${WORKDIR}/binutils
-		EGIT_CHECKOUT_DIR=${S}
-		SLOT=${PV}
-		;;
-	*.9999)
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		inherit git-r3
-		S=${WORKDIR}/binutils
-		EGIT_CHECKOUT_DIR=${S}
-		EGIT_BRANCH=$(ver_cut 1-2)
-		EGIT_BRANCH="binutils-${EGIT_BRANCH/./_}-branch"
-		SLOT=$(ver_cut 1-2)
-		;;
-	*)
-		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
-		SLOT=$(ver_cut 1-2)
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-		;;
-esac
-
-#
-# The Gentoo patchset
-#
-PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
-PATCH_DEV=${PATCH_DEV:-slyfox}
-
-[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
-
-#
-# The cross-compile logic
-#
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-#
-# The dependencies
-#
-RDEPEND="
-	>=sys-devel/binutils-config-3
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( sys-apps/texinfo )
-	test? ( dev-util/dejagnu )
-	nls? ( sys-devel/gettext )
-	sys-devel/flex
-	virtual/yacc
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.33-gcc-10.patch
-	"${FILESDIR}"/${PN}-2.34-riscv-SEGV.patch
-)
-
-MY_BUILDDIR=${WORKDIR}/build
-
-src_unpack() {
-	case ${PV} in
-		*9999)
-			git-r3_src_unpack
-			;;
-		*)
-			;;
-	esac
-	default
-	mkdir -p "${MY_BUILDDIR}"
-}
-
-src_prepare() {
-	if [[ ! -z ${PATCH_VER} ]] ; then
-		# Use upstream patch to enable development mode
-		rm -v "${WORKDIR}/patch"/0000-Gentoo-Git-is-development.patch || die
-
-		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
-		eapply "${WORKDIR}/patch"/*.patch
-	fi
-
-	# This check should probably go somewhere else, like pkg_pretend.
-	if [[ ${CTARGET} == *-uclibc* ]] ; then
-		if grep -qs 'linux-gnu' "${S}"/ltconfig ; then
-			die "sorry, but this binutils doesn't yet support uClibc :("
-		fi
-	fi
-
-	# Make sure our explicit libdir paths don't get clobbered. #562460
-	sed -i \
-		-e 's:@bfdlibdir@:@libdir@:g' \
-		-e 's:@bfdincludedir@:@includedir@:g' \
-		{bfd,opcodes}/Makefile.in || die
-
-	# Fix locale issues if possible #122216
-	if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
-		einfo "Fixing misc issues in configure files"
-		for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
-			ebegin "  Updating ${f/${S}\/}"
-			patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
-				|| eerror "Please file a bug about this"
-			eend $?
-		done
-	fi
-
-	# Fix conflicts with newer glibc #272594
-	if [[ -e libiberty/testsuite/test-demangle.c ]] ; then
-		sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c
-	fi
-
-	# Apply things from PATCHES and user dirs
-	default
-
-	# Run misc portage update scripts
-	gnuconfig_update
-	elibtoolize --portage --no-uclibc
-}
-
-toolchain-binutils_bugurl() {
-	printf "https://bugs.gentoo.org/"
-}
-toolchain-binutils_pkgversion() {
-	printf "Gentoo ${PV}"
-	[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
-}
-
-src_configure() {
-	# Setup some paths
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-	INCPATH=${LIBPATH}/include
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-	if is_cross ; then
-		TOOLPATH=/usr/${CHOST}/${CTARGET}
-	else
-		TOOLPATH=/usr/${CTARGET}
-	fi
-	BINPATH=${TOOLPATH}/binutils-bin/${PV}
-
-	# Make sure we filter $LINGUAS so that only ones that
-	# actually work make it through #42033
-	strip-linguas -u */po
-
-	# Keep things sane
-	strip-flags
-
-	local x
-	echo
-	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
-		einfo "$(printf '%10s' ${x}:) ${!x}"
-	done
-	echo
-
-	cd "${MY_BUILDDIR}"
-	local myconf=()
-
-	if use plugins ; then
-		myconf+=( --enable-plugins )
-	fi
-	# enable gold (installed as ld.gold) and ld's plugin architecture
-	if use gold ; then
-		myconf+=( --enable-gold )
-		if use default-gold; then
-			myconf+=( --enable-gold=default )
-		fi
-	fi
-
-	if use nls ; then
-		myconf+=( --without-included-gettext )
-	else
-		myconf+=( --disable-nls )
-	fi
-
-	myconf+=( --with-system-zlib )
-
-	# For bi-arch systems, enable a 64bit bfd.  This matches
-	# the bi-arch logic in toolchain.eclass. #446946
-	# We used to do it for everyone, but it's slow on 32bit arches. #438522
-	case $(tc-arch) in
-		ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
-	esac
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
-
-	is_cross && myconf+=(
-		--with-sysroot="${EPREFIX}"/usr/${CTARGET}
-		--enable-poison-system-directories
-	)
-
-	# glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+
-	# on everyone in alpha (for now), we'll just enable it when possible
-	has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt )
-	has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt )
-
-	# mips can't do hash-style=gnu ...
-	if [[ $(tc-arch) != mips ]] ; then
-		myconf+=( --enable-default-hash-style=gnu )
-	fi
-
-	myconf+=(
-		--prefix="${EPREFIX}"/usr
-		--host=${CHOST}
-		--target=${CTARGET}
-		--datadir="${EPREFIX}"${DATAPATH}
-		--datarootdir="${EPREFIX}"${DATAPATH}
-		--infodir="${EPREFIX}"${DATAPATH}/info
-		--mandir="${EPREFIX}"${DATAPATH}/man
-		--bindir="${EPREFIX}"${BINPATH}
-		--libdir="${EPREFIX}"${LIBPATH}
-		--libexecdir="${EPREFIX}"${LIBPATH}
-		--includedir="${EPREFIX}"${INCPATH}
-		--enable-obsolete
-		--enable-shared
-		--enable-threads
-		# Newer versions (>=2.27) offer a configure flag now.
-		--enable-relro
-		# Newer versions (>=2.24) make this an explicit option. #497268
-		--enable-install-libiberty
-		--disable-werror
-		--with-bugurl="$(toolchain-binutils_bugurl)"
-		--with-pkgversion="$(toolchain-binutils_pkgversion)"
-		$(use_enable static-libs static)
-		${EXTRA_ECONF}
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{gdb,libdecnumber,readline,sim}
-		# Strip out broken static link flags.
-		# https://gcc.gnu.org/PR56750
-		--without-stage1-ldflags
-		# Change SONAME to avoid conflict across
-		# {native,cross}/binutils, binutils-libs. #666100
-		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
-	)
-	echo ./configure "${myconf[@]}"
-	"${S}"/configure "${myconf[@]}" || die
-
-	# Prevent makeinfo from running if doc is unset.
-	if ! use doc ; then
-		sed -i \
-			-e '/^MAKEINFO/s:=.*:= true:' \
-			Makefile || die
-	fi
-}
-
-src_compile() {
-	cd "${MY_BUILDDIR}"
-	# see Note [tooldir hack for ldscripts]
-	emake tooldir="${EPREFIX}${TOOLPATH}" all
-
-	# only build info pages if the user wants them
-	if use doc ; then
-		emake info
-	fi
-
-	# we nuke the manpages when we're left with junk
-	# (like when we bootstrap, no perl -> no manpages)
-	find . -name '*.1' -a -size 0 -delete
-}
-
-src_test() {
-	cd "${MY_BUILDDIR}"
-
-	# bug 637066
-	filter-flags -Wall -Wreturn-type
-
-	emake -k check
-}
-
-src_install() {
-	local x d
-
-	cd "${MY_BUILDDIR}"
-	# see Note [tooldir hack for ldscripts]
-	emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
-	rm -rf "${ED}"/${LIBPATH}/bin
-	use static-libs || find "${ED}" -name '*.la' -delete
-
-	# Newer versions of binutils get fancy with ${LIBPATH} #171905
-	cd "${ED}"/${LIBPATH}
-	for d in ../* ; do
-		[[ ${d} == ../${PV} ]] && continue
-		mv ${d}/* . || die
-		rmdir ${d} || die
-	done
-
-	# Now we collect everything intp the proper SLOT-ed dirs
-	# When something is built to cross-compile, it installs into
-	# /usr/$CHOST/ by default ... we have to 'fix' that :)
-	if is_cross ; then
-		cd "${ED}"/${BINPATH}
-		for x in * ; do
-			mv ${x} ${x/${CTARGET}-}
-		done
-
-		if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
-			rm -r "${ED}"/usr/${CHOST}/{include,lib}
-		fi
-	fi
-	insinto ${INCPATH}
-	local libiberty_headers=(
-		# Not all the libiberty headers.  See libiberty/Makefile.in:install_to_libdir.
-		demangle.h
-		dyn-string.h
-		fibheap.h
-		hashtab.h
-		libiberty.h
-		objalloc.h
-		splay-tree.h
-	)
-	doins "${libiberty_headers[@]/#/${S}/include/}"
-	if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
-		mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
-		rm -r "${ED}"/${LIBPATH}/lib
-	fi
-
-	# Generate an env.d entry for this binutils
-	insinto /etc/env.d/binutils
-	cat <<-EOF > "${T}"/env.d
-		TARGET="${CTARGET}"
-		VER="${PV}"
-		LIBPATH="${EPREFIX}${LIBPATH}"
-	EOF
-	newins "${T}"/env.d ${CTARGET}-${PV}
-
-	# Handle documentation
-	if ! is_cross ; then
-		cd "${S}"
-		dodoc README
-		docinto bfd
-		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
-		docinto binutils
-		dodoc binutils/ChangeLog binutils/NEWS binutils/README
-		docinto gas
-		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
-		docinto gprof
-		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
-		docinto ld
-		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
-		docinto libiberty
-		dodoc libiberty/ChangeLog* libiberty/README
-		docinto opcodes
-		dodoc opcodes/ChangeLog*
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
-
-	# Trim all empty dirs
-	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
-}
-
-pkg_postinst() {
-	# Make sure this ${CTARGET} has a binutils version selected
-	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
-	binutils-config ${CTARGET}-${PV}
-}
-
-pkg_postrm() {
-	local current_profile=$(binutils-config -c ${CTARGET})
-
-	# If no other versions exist, then uninstall for this
-	# target ... otherwise, switch to the newest version
-	# Note: only do this if this version is unmerged.  We
-	#       rerun binutils-config if this is a remerge, as
-	#       we want the mtimes on the symlinks updated (if
-	#       it is the same as the current selected profile)
-	if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then
-		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
-		choice=${choice//$'\n'/ }
-		choice=${choice/* }
-		if [[ -z ${choice} ]] ; then
-			binutils-config -u ${CTARGET}
-		else
-			binutils-config ${choice}
-		fi
-	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
-		binutils-config ${CTARGET}-${PV}
-	fi
-}
-
-# Note [slotting support]
-# -----------------------
-# Gentoo's layout for binutils files is non-standard as Gentoo
-# supports slotted installation for binutils. Many tools
-# still expect binutils to reside in known locations.
-# binutils-config package restores symlinks into known locations,
-# like:
-#    /usr/bin/${CTARGET}-<tool>
-#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
-#    /usr/include/
-#
-# Note [tooldir hack for ldscripts]
-# ---------------------------------
-# Build system does not allow ./configure to tweak every location
-# we need for slotting binutils hence all the shuffling in
-# src_install(). This note is about SCRIPTDIR define handling.
-#
-# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
-# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
-# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
-# Thus we can't just move files around after compilation finished.
-#
-# Our goal is the following:
-# - at build-time set scriptdir to point to symlinked location:
-#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
-# - at install-time set scriptdir to point to slotted location:
-#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 60afa68d8b32..724e28fdbf35 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -3,9 +3,9 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD clang-common-10.0.0.ebuild 589 BLAKE2B 71f0090e6d67508ab556dc2260ae6f0d0aa05fedec01815b67db31884d41756c0224d5df19ad7c242a0ab24b23dfde9ba8bad5d9bf95ce5434848663bcd0b0a2 SHA512 ac2a3296c395e38f1c5ba5cbccd230a0e625995756b8a8eb6b74911f87e31d1afd069b452f51a890e74147a7a79307469185f00cce21522d0b6b60045f686e24
-EBUILD clang-common-10.0.1.9999.ebuild 565 BLAKE2B debef4ab3878fd7cd72f67bba2eebbd7a4a5d488d1da5bb1066af6dfee3b0bfd230b267891edcdf388b523433f8fbdff3443394efdbc64e6231fa9d127d164dd SHA512 892819af7217e402a25b56ed6deb498b60342ca497b0e8efa6d86ee9e14eae37d6c03baecf31921052c1102137f4e66631bd2c983d6f996a438c21bf0ac713d7
-EBUILD clang-common-10.0.1_rc1.ebuild 565 BLAKE2B bef32d62a181c7552aa65a17b1ae4af5ae204d792f3dc96d4291be91c816da864d02cfc4a4141cfdc67dcf33824378eaae9f2156445f990c7defbf7f6dca2d16 SHA512 082b70a6ec2e7a8b5d690ec27b5168f45ca77d7d29887efd6e346a383026ca64670dcb0f239d2f1bae57f0c4b01253ca72fc52e940109db844471d40de17d072
-EBUILD clang-common-11.0.0.9999.ebuild 565 BLAKE2B bef32d62a181c7552aa65a17b1ae4af5ae204d792f3dc96d4291be91c816da864d02cfc4a4141cfdc67dcf33824378eaae9f2156445f990c7defbf7f6dca2d16 SHA512 082b70a6ec2e7a8b5d690ec27b5168f45ca77d7d29887efd6e346a383026ca64670dcb0f239d2f1bae57f0c4b01253ca72fc52e940109db844471d40de17d072
+EBUILD clang-common-10.0.1.9999.ebuild 513 BLAKE2B 3ca10da9963052dfcd89bfbc0399f9839325caba42a63e916ccb3ab5f10c0b1f1089cf2b932ce1f166e0dc60ae2d605003e345354eed6310eebc29a40275405d SHA512 18c55050f97348880eaa7676dcf4bde318f2db16c9014713ca32b17c2c02997e68034ed20dc8737a1f1c5d51de88da321dd68bfe83068008dc7f92857d782997
+EBUILD clang-common-10.0.1_rc1.ebuild 513 BLAKE2B 990eee9292990a4fa1fa12eda4963c78a838108bc7d56833d6696af03eded240fd01f095335020eca81832f5e64c496c129bdecff7dc4c4de86c38e95ec99dd7 SHA512 dc472092d704ca242e0370f580f506e83a17f3147cff31cf37fb3573e37ad0824960a6da576c8310f6ca43d64e7fffa0c65c9815344d40252b0ca0f8b5e3eefd
+EBUILD clang-common-11.0.0.9999.ebuild 513 BLAKE2B 990eee9292990a4fa1fa12eda4963c78a838108bc7d56833d6696af03eded240fd01f095335020eca81832f5e64c496c129bdecff7dc4c4de86c38e95ec99dd7 SHA512 dc472092d704ca242e0370f580f506e83a17f3147cff31cf37fb3573e37ad0824960a6da576c8310f6ca43d64e7fffa0c65c9815344d40252b0ca0f8b5e3eefd
 EBUILD clang-common-8.0.1.ebuild 798 BLAKE2B ee3a460e6e80ac0700fec452f3cf47a1f6054c7b93139e0fd4c5efec8ccf84d1cfe933420cca84e017e115bf45474db42f58813b98dc2f396feb61c00f2901d5 SHA512 feda961724c5bfde42926b0928107fae7df056e63041705a68eb7521ffc1e9f5be8f86591db41d10f97b940ef1ac664dc35ad11e59b29635b46b2fe5ea8c974b
 EBUILD clang-common-9.0.1.ebuild 584 BLAKE2B f9fca7b49c818a9918c199e0b12f2e73c5b7828c61a32506806591a374e8f90143a4af80eb809e7cc381773901a8b889f7cd76eb1c771b19932fc6d5797d983f SHA512 2ba5111a5c93bbde3beff601fd6a7dc5da6672a2d40afcea4fa09735c058aa4b23e9f07b90a939f9dbe6215df2760e6b1d2c2d1cf2b3695caf91139869ba672f
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/clang-common/clang-common-10.0.1.9999.ebuild b/sys-devel/clang-common/clang-common-10.0.1.9999.ebuild
index 6da8d1a30ae7..d1bfe71d2f80 100644
--- a/sys-devel/clang-common/clang-common-10.0.1.9999.ebuild
+++ b/sys-devel/clang-common/clang-common-10.0.1.9999.ebuild
@@ -18,11 +18,6 @@ IUSE=""
 
 PDEPEND="sys-devel/clang:*"
 
-src_prepare() {
-	cd "${WORKDIR}" || die
-	default
-}
-
 src_install() {
 	newbashcomp bash-autocomplete.sh clang
 }
diff --git a/sys-devel/clang-common/clang-common-10.0.1_rc1.ebuild b/sys-devel/clang-common/clang-common-10.0.1_rc1.ebuild
index ca046d28ce0b..18e41e0917da 100644
--- a/sys-devel/clang-common/clang-common-10.0.1_rc1.ebuild
+++ b/sys-devel/clang-common/clang-common-10.0.1_rc1.ebuild
@@ -18,11 +18,6 @@ IUSE=""
 
 PDEPEND="sys-devel/clang:*"
 
-src_prepare() {
-	cd "${WORKDIR}" || die
-	default
-}
-
 src_install() {
 	newbashcomp bash-autocomplete.sh clang
 }
diff --git a/sys-devel/clang-common/clang-common-11.0.0.9999.ebuild b/sys-devel/clang-common/clang-common-11.0.0.9999.ebuild
index ca046d28ce0b..18e41e0917da 100644
--- a/sys-devel/clang-common/clang-common-11.0.0.9999.ebuild
+++ b/sys-devel/clang-common/clang-common-11.0.0.9999.ebuild
@@ -18,11 +18,6 @@ IUSE=""
 
 PDEPEND="sys-devel/clang:*"
 
-src_prepare() {
-	cd "${WORKDIR}" || die
-	default
-}
-
 src_install() {
 	newbashcomp bash-autocomplete.sh clang
 }
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index d8c57d0b49f6..278ae0e908d5 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -11,9 +11,9 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD clang-10.0.0.ebuild 10194 BLAKE2B b7fdf307bd1df5fb9b4a1b74ce54852293d884396004f23011aa30d0f53cc740d554fe2fa723939b826c34b3b0797242d16eeaac0eb4465f09142005b0213f26 SHA512 7187998e91d5239e4824c6ecce16dddadff571a0e75f50ca7f0766ff77dd842f6fec3be06a2bd5859d0e56fae2bb58136b1114d1d5dad37e2bdad23e1956d9a7
-EBUILD clang-10.0.1.9999.ebuild 11297 BLAKE2B 2b50b01407f06e4ec5ae9f8988b8627d9f7ab1d57f102066c1353644fc76fec0d56d077f257d247ff3caee9ff9d2cf6d918a2ba8cda8079dbed84387c0590efa SHA512 ac7c8ac07d020de89fb68137d705231d0af649da541374a3bd9869786b3f090ef9b3d159769819d2d83acf833e3e1fff7006280b74876b499d0de1ae9769919f
-EBUILD clang-10.0.1_rc1.ebuild 11294 BLAKE2B 0df40a2e087631aa266f7d39acc00eb723ac97546ba66733c01fb88f170d5ff83fb4c769a74c06ca0e048ad8c643434e913796f6b592f139ee44f07890b85a13 SHA512 ff52706ed43701df53ed5686b1ed070a5275fee808340378cebfb521ae989f9811f7fff73dbc224c33d6d2004e4c57ac6c3ff5a583750b0546aeeb5e30942b15
-EBUILD clang-11.0.0.9999.ebuild 11124 BLAKE2B 3193fa1a9d5db4e998a28153d43553509b5c503d38b8c1e89ba346f5325e5fd78696be11129ec11523bb3a4a9f9edca362d2711449985cef49e2cd3d50e6a775 SHA512 a34ba7aeb4a6010326dad5e44ab2819a1125c5a7e6076ca60ab5e4efc86c15f5a1f99af325691f84fcced76220c32b372b0c8b3cd13a2780c33db3104f982a01
+EBUILD clang-10.0.1.9999.ebuild 11095 BLAKE2B 583b4c6cbc30beb91622687455d2ccf124d7ae7c24b104e3512d4e19c0cef38bcad77b040f5c6c9e72b27fca6bd12598c7fd27ec39fc414bfdf9e7412ca342a2 SHA512 9a9157012aedf89d2662a469f4bad6e8fc325943d895ba4f4c4b86f39ae5e2cd1f6385fa707faafc35a0b0c280a79cf210a4a68ccef3a3b6fd7d74e50a54f8b0
+EBUILD clang-10.0.1_rc1.ebuild 11092 BLAKE2B 8e37d0e7f896a2be87a7add056190f7f94a50e71a1bcb0842eeb83146c6ab8ed4f901cb25902ec27a9292926162e0e1b22175385920f0a42b1c2df035dff84d6 SHA512 f564aa451c489d491eb25f88c1286e232b7d0405f0df89ef6cb73a54ad1bbc984ca24abc2018e0f4807b45da0f19602fb0b994b80cf5c092409b67ab36bf6086
+EBUILD clang-11.0.0.9999.ebuild 10922 BLAKE2B eb9a52d1f28774811bb4d849c20fa1910311fb66393bef97b3eaeb9ca42e5b1e7bf3b9438804db26bf79c21067713ba0c542b123fbed05d63e469348797563b8 SHA512 76331c6406b3af90a7b66521ea4d0b258c2e8265ccba817f823a62cc078b7a87bb0848e83eb1cfa30a25c3b8637d7977d53dedea1613e9fbdcd4307651cf49e0
 EBUILD clang-8.0.1.ebuild 10138 BLAKE2B a2c91918e468c3f070ba10d7a0478e006c5d23289db387d6ca57ee082a7567ef24ad7af66a3b93e0e8934c69fbcd5a4fefbfbd77ba0ef077776b4110b30a6773 SHA512 da86670ee496b2a1bfe3f99eb7146cd8a85d793f580ae2ebd94bfb65363c6e39c58fb77b3b00c27e5d9bdc70ecb1688154e500506525b019da3f95d356f815e1
 EBUILD clang-9.0.1.ebuild 8982 BLAKE2B 05319c777c4ecfd03a54bc9e14f322ad6f348a99554ebf8eb1e3a0a1b8c7aba5f3ba618fd3edb21022dd34f1cd4dca2c3f24b152b6f795b939a77c8959d27fa1 SHA512 f88f6c0dc7f1faed0f0d8310c9235a4d0d17352f710f28d9a8c7e47e28aaa43f7727e3e2a7e30334ffae7cb2e6df7769a543fd4c79a0ecb8a1f0a480b15fdb06
 MISC metadata.xml 1377 BLAKE2B 8b580be2bcaddb98c2d2b8defd1730c69a7478248f7d241dd00f533d36d750a3f45c1e55161a4fd2731b6211a22c658046cf8ad5a87028c32928dfe0cd4a862f SHA512 b08ea2bd3454abb09abfa92b62e6dae4f4e10db0266c1e4895bef0f6a2d2fadea0b36b9b861831389413e1cca0e3c412b4cf474fc8c4170902b40deeab06686a
diff --git a/sys-devel/clang/clang-10.0.1.9999.ebuild b/sys-devel/clang/clang-10.0.1.9999.ebuild
index 8db3efe5b94a..2b8d5fee0580 100644
--- a/sys-devel/clang/clang-10.0.1.9999.ebuild
+++ b/sys-devel/clang/clang-10.0.1.9999.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm llvm.org multilib-minimal multiprocessing \
-	pax-utils python-single-r1 toolchain-funcs
+inherit cmake llvm llvm.org multilib-minimal pax-utils \
+	python-single-r1 toolchain-funcs
 
 DESCRIPTION="C language family frontend for LLVM"
 HOMEPAGE="https://llvm.org/"
@@ -55,9 +55,6 @@ PDEPEND="
 	default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
 	default-libcxx? ( >=sys-libs/libcxx-${PV} )"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 # Multilib notes:
 # 1. ABI_* flags control ABIs libclang* is built for only.
 # 2. clang is always capable of compiling code for all ABIs for enabled
@@ -85,10 +82,7 @@ src_prepare() {
 	mkdir -p x/y || die
 	BUILD_DIR=${WORKDIR}/x/y/clang
 
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
+	llvm.org_src_prepare
 
 	mv ../clang-tools-extra tools/extra || die
 }
@@ -259,7 +253,7 @@ multilib_src_configure() {
 	)
 	use test && mycmakeargs+=(
 		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)
 
 	if multilib_is_native_abi; then
diff --git a/sys-devel/clang/clang-10.0.1_rc1.ebuild b/sys-devel/clang/clang-10.0.1_rc1.ebuild
index bc6d83f42a8d..db3798d217bd 100644
--- a/sys-devel/clang/clang-10.0.1_rc1.ebuild
+++ b/sys-devel/clang/clang-10.0.1_rc1.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm llvm.org multilib-minimal multiprocessing \
-	pax-utils python-single-r1 toolchain-funcs
+inherit cmake llvm llvm.org multilib-minimal pax-utils \
+	python-single-r1 toolchain-funcs
 
 DESCRIPTION="C language family frontend for LLVM"
 HOMEPAGE="https://llvm.org/"
@@ -55,9 +55,6 @@ PDEPEND="
 	default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
 	default-libcxx? ( >=sys-libs/libcxx-${PV} )"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 # Multilib notes:
 # 1. ABI_* flags control ABIs libclang* is built for only.
 # 2. clang is always capable of compiling code for all ABIs for enabled
@@ -85,10 +82,7 @@ src_prepare() {
 	mkdir -p x/y || die
 	BUILD_DIR=${WORKDIR}/x/y/clang
 
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
+	llvm.org_src_prepare
 
 	mv ../clang-tools-extra tools/extra || die
 }
@@ -259,7 +253,7 @@ multilib_src_configure() {
 	)
 	use test && mycmakeargs+=(
 		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)
 
 	if multilib_is_native_abi; then
diff --git a/sys-devel/clang/clang-11.0.0.9999.ebuild b/sys-devel/clang/clang-11.0.0.9999.ebuild
index 76c40cb71042..5991c42d4c69 100644
--- a/sys-devel/clang/clang-11.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-11.0.0.9999.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm llvm.org multilib-minimal multiprocessing \
-	pax-utils python-single-r1 toolchain-funcs
+inherit cmake llvm llvm.org multilib-minimal pax-utils \
+	python-single-r1 toolchain-funcs
 
 DESCRIPTION="C language family frontend for LLVM"
 HOMEPAGE="https://llvm.org/"
@@ -56,9 +56,6 @@ PDEPEND="
 	default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
 	default-libcxx? ( >=sys-libs/libcxx-${PV} )"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 # Multilib notes:
 # 1. ABI_* flags control ABIs libclang* is built for only.
 # 2. clang is always capable of compiling code for all ABIs for enabled
@@ -80,10 +77,7 @@ src_prepare() {
 	mkdir -p x/y || die
 	BUILD_DIR=${WORKDIR}/x/y/clang
 
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
+	llvm.org_src_prepare
 
 	mv ../clang-tools-extra tools/extra || die
 }
@@ -254,7 +248,7 @@ multilib_src_configure() {
 	)
 	use test && mycmakeargs+=(
 		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)
 
 	if multilib_is_native_abi; then
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index d941cc9cc562..dc5eaf4321d8 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,6 +1,4 @@
-DIST crossdev-20200125.tar.xz 27380 BLAKE2B 4871b3ba1130c8d2e4df263aea155f95352417e65dabe64968cf9cc2628f9a1ae32a7e569cdea73a04d32d05396b0a83720bbd712a5f5b703606692e6b61516b SHA512 a4db1d09179b23f032af59c4857c3ab58d7944633b0c612a1f8aa0ecc38201f960cc1da761f34288568bb7f3434fe4da5094b4d4445be047da8838a096f6c606
 DIST crossdev-20200131.tar.xz 28200 BLAKE2B b1b8e283d150968339e259c48b3f066f5233af2578b04e060d5e69c002af6ffd65214c559353a8ebcf3238c2b60d0ddfa29131e26c707647717088df55f77282 SHA512 e1d18a7d69cdc0240d30e77b1634bd6b5806e1576227e4ffa394805aa217c050ced75436e9a004a35bc9bc47b96ea2f3d8e19ef530a106736f7cc0d995bee4a5
-EBUILD crossdev-20200125.ebuild 841 BLAKE2B ae015c955b8fae5c400e230ac248395694eaa2ca7653fac637736c577474d55ada854d17709c737340b5982678e4082fbee79b532a41c3f3cf8d0e50ee420c68 SHA512 4cd58d6bd14cd82397ba515aa7ecb04c48fd6be1a9f1d6d26ac7bf9ebc98aa43ca6106e45f149dae1b98cb142eaf949e558365d11f66669bc972de005514eaf5
 EBUILD crossdev-20200131.ebuild 841 BLAKE2B ae015c955b8fae5c400e230ac248395694eaa2ca7653fac637736c577474d55ada854d17709c737340b5982678e4082fbee79b532a41c3f3cf8d0e50ee420c68 SHA512 4cd58d6bd14cd82397ba515aa7ecb04c48fd6be1a9f1d6d26ac7bf9ebc98aa43ca6106e45f149dae1b98cb142eaf949e558365d11f66669bc972de005514eaf5
 EBUILD crossdev-99999999.ebuild 856 BLAKE2B 8ec9e78dc63a9bdf766b1010b0953b7da86c164f221fc31058dc0e02e160091241d68d38b75f155bd8c55074019f626e9b0c272899574927f7aec9560207e357 SHA512 bffbd553b032998e649c5b505d1e7758d06d7b6f8b9d25487c8d034884dbe01259585597f731dee3e10a0e3d7bbc2ecab606ae2612fac7e46b03c91f74778490
 MISC metadata.xml 380 BLAKE2B ebe1b011d5cc2077d90cc003f1340fe1243abed1aa3d66203eb5594a5e9176e4cdff826e938fcb1c26f020c2d75dc51d3585faf65a23446dac3043e16f8f0caf SHA512 c9ab89db8d3200e469dbfbcfaa3bb920852779bfbc3eadf86a5da7bc67f7b166fc0fb30f03292c2b5f3416d2488bdbef375666f7cb06e210bea0f4cb24581a41
diff --git a/sys-devel/crossdev/crossdev-20200125.ebuild b/sys-devel/crossdev/crossdev-20200125.ebuild
deleted file mode 100644
index 7a6c51ec73f2..000000000000
--- a/sys-devel/crossdev/crossdev-20200125.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
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-fi
-
-DESCRIPTION="Gentoo Cross-toolchain generator"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Crossdev"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=sys-apps/portage-2.1
-	>=app-portage/portage-utils-0.55
-	app-shells/bash
-	sys-apps/gentoo-functions
-"
-DEPEND="app-arch/xz-utils"
-
-src_install() {
-	default
-
-	if [[ "${PV}" == "99999999" ]] ; then
-		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die
-	fi
-}
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 345b10b2fb1e..18c945629cc7 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,6 +1,8 @@
 DIST gcc-config-2.2.1.tar.xz 16292 BLAKE2B bed319b73bb1dd1c693715654dab7d16c12929353eb28c6e93ffeda0d4539d8204e84287c58de65ed5198011130a6e0ef71421cf41e7cf59cc48781a94ec9af2 SHA512 783caf2f4236d7c84e7c76c2d001d069a1b8544644d7e6e12b79f4dc55f34c953a24a8cd8d01b2aa69fa7f8e02ec3380e0e33a83eda6b3cb00e8c43d2f69f673
+DIST gcc-config-2.3.1.tar.xz 17368 BLAKE2B 59c77938b24cbbb548ef2f9e68be0de8c651f6beca74cf4e6007338f6217fa6e207c020f9a5e1c05c6abae24b9628fd193d0aeaaea28c6a1aac51e48b0145118 SHA512 7d7cdcd1aaaadb32e95227f61166b4390476d080e90387a167f031ef5c2c88dd3c785297946435500e39ed9bc31c0b5369cdacf1a12e75cd1786ba30bf7e407a
 DIST gcc-config-2.3.tar.xz 16736 BLAKE2B e8c22348d73ec756ebe377c3f9b0aca8e22b7ef53507bfa4dc0fbd459bca38ba6bea9dbb290b4d83239c21c913d12f8262a263e1c078a3997558a0b14fdf355d SHA512 4ce1e46bee6b2182c664746d939a7d843d5b4323c860ea3ee24e36aa629e65f3aa99da99905d4a7091ad0a3a37c14a6a56a0f79c76d6bc93fa0dad39552f221d
 EBUILD gcc-config-2.2.1.ebuild 1186 BLAKE2B c12aab5a9529bda5ad1a8d71598f8614428e494607651d26b510ccb14a5f612a2f114c8d40f9fdee1f4d62397891dc619bc60d7f54f1e987d1ad54f6b956a4a1 SHA512 ceb3d6b270f1bc0607b112dbb09faa27bc0584f1a35abcd770a4f3c2ac673b3a22ee3f3eaf6ac1073af66bac9802197bd408bee6a60c1dacd35350d04010cb6b
+EBUILD gcc-config-2.3.1.ebuild 1472 BLAKE2B 46db37d20da238fc05515c2bc000fcea6261b0f1651b6b8a20c19c2753fbde9661f2b4ba6380008bf144dbde6caf7787d62f935613e1f455a3dc6487c16141ca SHA512 ada2817124fa574984d12e3936db1286ecd57d92f11ac5423f2c8e211ee5f75ccc9819eff0b158b9eb9fa0a8962a524dfabee3d7ab8beb8d7d41ad533bd8cfb5
 EBUILD gcc-config-2.3.ebuild 1477 BLAKE2B 54a4304c340b7841be69e7308ff3c9d1b3c4db050fdbfd51313e47ee98e6daba6d9656264193f5c0997159ba0cc88c5eeaeaf0f6c01b53aa8ddf04cea2f2d5f4 SHA512 b4f845afe3380107f7444cbf1d18b7ab00946e0b2e3853f4eeb368c655b5a920217a137d0440cfc610a035f1484d02499d17a381a212994e59e0bc29eb305edf
-EBUILD gcc-config-9999.ebuild 1472 BLAKE2B 46db37d20da238fc05515c2bc000fcea6261b0f1651b6b8a20c19c2753fbde9661f2b4ba6380008bf144dbde6caf7787d62f935613e1f455a3dc6487c16141ca SHA512 ada2817124fa574984d12e3936db1286ecd57d92f11ac5423f2c8e211ee5f75ccc9819eff0b158b9eb9fa0a8962a524dfabee3d7ab8beb8d7d41ad533bd8cfb5
-MISC metadata.xml 419 BLAKE2B 5dda1b92bb225b4a887de96721c7f8913e7ae26e0780bb0dabb875b0ee6993ec118b01c085bfa8e2d7ad824b23b561caa8a1bba443728832809242380dcde77c SHA512 7735c88b13f8ea1f076ca4344737d4d1200343e298ab37ceeeba0ff4651af7987140e541136bbdbb9feb75802e1b57f48c7b6c53bf684cd542f06adeeba5c562
+EBUILD gcc-config-9999.ebuild 1527 BLAKE2B 9d1206cbf2823cfce941012aed05e30b7a782c241039d10589a20c5cd3db454fc73ea16f788994f95ad07d8b3877fc41b9e9a5ffb55a0a1f39bcaaabbd69540c SHA512 3145defe6cefa8757b10408b11fab862e3be943accdb7bc0871c33bf39ff71cea92e15e60c75f36a2c75199f7bbab612790ac3f79decc4db2498729876ef112b
+MISC metadata.xml 532 BLAKE2B f2ce0b655376a7a6a31520f557917b4a6e2036ceec6726d869f795b6fff0a97fa27b7e13b7a41b6ea1b83ff67b9e3ef4ea12c0a8058911007da92f986c0f8265 SHA512 f2dc77e3d2301f3fadc24ceba33894ee8fd07831496b04e3513369906e101c155c7cb10cf81a4a08628514db5758368a64b0b4eb37c41f7f8fe4942f90b11935
diff --git a/sys-devel/gcc-config/gcc-config-2.3.1.ebuild b/sys-devel/gcc-config/gcc-config-2.3.1.ebuild
new file mode 100644
index 000000000000..f18c030a06c7
--- /dev/null
+++ b/sys-devel/gcc-config/gcc-config-2.3.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gcc-config.git"
+	inherit git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Utility to manage compilers"
+HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+native-symlinks"
+
+RDEPEND=">=sys-apps/gentoo-functions-0.10"
+
+_emake() {
+	emake \
+		PV="${PV}" \
+		SUBLIBDIR="$(get_libdir)" \
+		USE_NATIVE_LINKS="$(usex native-symlinks)" \
+		TOOLCHAIN_PREFIX="${CHOST}-" \
+		"$@"
+}
+
+src_compile() {
+	_emake
+}
+
+src_install() {
+	_emake DESTDIR="${D}" install
+}
+
+pkg_postinst() {
+	# Scrub eselect-compiler remains.
+	# To be removed in 2021.
+	rm -f "${ROOT}"/etc/env.d/05compiler
+
+	# We not longer use the /usr/include/g++-v3 hacks, as
+	# it is not needed ...
+	# To be removed in 2021.
+	rm -f "${ROOT}"/usr/include/g++{,-v3}
+
+	# Do we have a valid multi ver setup ?
+	local x
+	for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do
+		gcc-config ${x}
+	done
+
+	# USE flag change can add or delete files in /usr/bin worth recaching
+	if [[ ! ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow update all
+	fi
+}
diff --git a/sys-devel/gcc-config/gcc-config-9999.ebuild b/sys-devel/gcc-config/gcc-config-9999.ebuild
index f18c030a06c7..e7e08f381b4d 100644
--- a/sys-devel/gcc-config/gcc-config-9999.ebuild
+++ b/sys-devel/gcc-config/gcc-config-9999.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="Utility to manage compilers"
 HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+native-symlinks"
+IUSE="+cc-wrappers +native-symlinks"
 
 RDEPEND=">=sys-apps/gentoo-functions-0.10"
 
@@ -25,6 +25,7 @@ _emake() {
 	emake \
 		PV="${PV}" \
 		SUBLIBDIR="$(get_libdir)" \
+		USE_CC_WRAPPERS="$(usex cc-wrappers)" \
 		USE_NATIVE_LINKS="$(usex native-symlinks)" \
 		TOOLCHAIN_PREFIX="${CHOST}-" \
 		"$@"
diff --git a/sys-devel/gcc-config/metadata.xml b/sys-devel/gcc-config/metadata.xml
index 33e9604b0414..ecfb291141ed 100644
--- a/sys-devel/gcc-config/metadata.xml
+++ b/sys-devel/gcc-config/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Toolchain Project</name>
 	</maintainer>
 	<use>
+		<flag name="cc-wrappers">Install and manage 'cc' and 'f77' wrappers in /usr/bin. Otherwise ignore them.</flag>
 		<flag name="native-symlinks">Install native symlinks like 'gcc' or 'g++' to /usr/bin. Otherwise keep only ${CTARGET}-gcc and friends.</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 0d8e44905b27..f808be427621 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -32,8 +32,6 @@ DIST gcc-6.5.0.tar.xz 74355588 BLAKE2B 538595d32000b15a53577f0dc6b164d75791a8ccd
 DIST gcc-7.5.0-patches-2.tar.bz2 10573 BLAKE2B 7f631174fe317d97d92cbad7dd18285eb1596333ff2dfad346fea0d76a00fbcbd78b4c296f863854772c9ed3ce23ca9fd41c23d02e172d4dbbf23bd1f803bb4f SHA512 1f53b320acd813e97bb37b3165f6f2e37259d551e0ee49df08056c0b17a7e4a02b3a764e56d97a37c4cb71302ab5fe55b82f0b96c1adf5fa8b71016cab4fc0b9
 DIST gcc-7.5.0-patches-3.tar.bz2 11613 BLAKE2B 84d59103bffaec8fc57e69dbb17f53882935b20c23d54db5f805e8270fa16d8e572ee4a369ecc82d2279cf66a71d1eb2a7f0c9792d4495d2f68946d6b6403f15 SHA512 6e5bea150c56ce3d43c9b0878691ed54ecc5d2a12482e99261efa74af7f1d59ec94c2d0c363792d99e0d3a0abd739d5d06b861da4dea2c1676e5d498b5815d55
 DIST gcc-7.5.0.tar.xz 62783088 BLAKE2B 8a5efeef517a5da1634d063aaa83bf5e002f86acdf27419f1067f5c3d087333d9eea0c8db427b8bd895af646990bb00ee173069980ca49cec848434a4127256f SHA512 fe716cc19f2e3255d3a8b1b8290777bf769c6d98e6e0b07b81a3d6ad43f8af74cb170dfa18b1555dbfcd3f55ae582b91a286ccef496b9b65c1579902f96a1f60
-DIST gcc-8.3.0-patches-4.tar.bz2 17095 BLAKE2B 449d83371bf5a70020f4caad38d7b8f79bc4b3aeb13b060d28b56506fdd33e15527ab38c41baa3134dc9a25208dadfafab5992e93b2e9719dda420f830e7a8bf SHA512 0dcc5ce887b5c1dd9977ca1b1d8760563edf7ce2d39644f6212397c55c325ee441e1e02aea623bff157d95827db25528791137edc24931a88baad6499d0d15d5
-DIST gcc-8.3.0.tar.xz 63694700 BLAKE2B 71df2ff5bd6874d57519c2e9af6b22152c8c4d7fab906a5f427b41bc4e8e742127592a8684120d9d3c9ce6241439531850be08ec0a4f29dbfdee95435655fdca SHA512 1811337ae3add9680cec64968a2509d085b6dc5b6783fc1e8c295e3e47416196fd1a3ad8dfe7e10be2276b4f62c357659ce2902f239f60a8648548231b4b5802
 DIST gcc-8.4.0-patches-1.tar.bz2 14854 BLAKE2B 055ac27224a100c9678b343fe85e3431d4553780716ac2a9cdfa1e5bcd7b5073b883cefa460dbab8b34ffd8d19dadab0e66cebf9ee51a89a8a2d212268450248 SHA512 aaf44c0ccbd99690cea9cd4452bae8d4d6bff98ba591b29d50a50c19f3221c24e923441a24392f9717f541aa4e097645756fdf0ff558b7a263ef21d7d1e334eb
 DIST gcc-8.4.0-patches-2.tar.bz2 16254 BLAKE2B 5ee50ee1a3f6cdb392b370a0f62af7e8fd2fb2cadc46d4faf37ddbae23812a0e9f2e35a4ed6a08c41ffe648c21e9982e965d3ab91f68ae941c6cad74098afa2f SHA512 26fd2ad9f29dfd1db671d4966c16165a6fb75bd74f440871fb41dcb9b6102f07347ae8df67baa9e4d52aec91d3d67803a952b7bd45159fde56e1a1f28237c5eb
 DIST gcc-8.4.0.tar.xz 63713440 BLAKE2B e536b7d1da5942a522f4ccce489882dcd5aefb1c76660fc17b0475a1164753979563bec25ed46c4e6c718cb9f64c047f57780e8d5be919657a1653f8221c1c9a SHA512 6de904f552a02de33b11ef52312bb664396efd7e1ce3bbe37bfad5ef617f133095b3767b4804bc7fe78df335cb53bc83f1ac055baed40979ce4c2c3e46b70280
@@ -44,7 +42,6 @@ DIST gcc-9.3.0-patches-2.tar.bz2 13230 BLAKE2B d37859c753864be2c4b8c98847f6e51d9
 DIST gcc-9.3.0-patches-3.tar.bz2 14193 BLAKE2B 4863fec1af41a8cdb2c24479b28812df36c1f71ab71d267ff0efc467cfb8ce99ed77714ceaedfb08b0d1eb0eb9316758cc7cbc5a8ad0bb582050690935e64b46 SHA512 8b90a5826df64e6f74e4f6c0e5acead695b38f671e26485b110d5b341daaad4ac21aabb04baae9ad457408eed274888b7f785bbc782611acfc7261e6a315d110
 DIST gcc-9.3.0.tar.xz 70533868 BLAKE2B 21efb1432aefad5ed9b9b395e88ef2adfda3a8ea6e3e808cd151da6e66df9fed1bafdc8b8ff055d4b2272ac786d8b7ddc4293bb6b51c55c40a261a0eda0e7cb4 SHA512 4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de
 EBUILD gcc-10.1.0-r1.ebuild 290 BLAKE2B ad03863f65f96bfe59e86e10189ae666155341d4947d5043277d21c0021f1a879144b409e02ba7828f666dbe350612217298da45143ad1860ed4ef04e06645c9 SHA512 8c4561450bf7c416df2fcd0844c2e28b28172a948c2327c7680b6c5968d113dbb09a30be6e20168a3411140b2124e247f4ad22a5996668fb1098322fab3a2309
-EBUILD gcc-10.1.0.ebuild 290 BLAKE2B 02d5ac3a657382fa7a1146e5d504ddd4d3ab4caf55f6e4f114a3e5bae01a41055e8ee7421a7aaa241ceff332fafa44c1bebc5bfc77960ea27f204b4b9c467e18 SHA512 e95b6d2bfb0f1297c7bc2a7f2b2cc36a638b60f2aa66dbcd499d86d2e9c9e4e85e4927fadde94a80cc7cc4a1874bf03d4dc6fd2f770953d9cca2ad25afdcdaa5
 EBUILD gcc-10.1.1_pre9999.ebuild 405 BLAKE2B acdd045129f65fba03a33cc6ea25c429dbc768264d1841445daa6715780f27ad8776199bb3c0c52287f3a70b6ce077a5d13f43aee3a0315106f0a3516bc03b78 SHA512 c0691849f15e7671654f00c663890e7189fa0d1694a53c3f5289a7325427ed31910ff175556578c4e5180fa8d5049973be0aada659d8ee8823db71f63772942e
 EBUILD gcc-11.0.0_pre9999.ebuild 367 BLAKE2B 4dd45cc0f1599d2c94904cbc930285e75bb10de7611de5d0182128459a805cf6fd77e22f2d36e716572894a8d0bdb8264f6016266d7e6055acc157a7b8f0311a SHA512 0e7e924eb559d58f3742f3645c49bc73cc6a50079209de6ea4b9a7f3d6ee8d31b835d297d578aeea8c7f0731bb66e50546026b46fc6de6885ea123280f0afbaf
 EBUILD gcc-4.9.4-r1.ebuild 1442 BLAKE2B 89d982040aeeb513b50baaae4863edf3d8419536f09e4a44d327d0bbd342c528897209ff036a99ba3fda2c75cd36931ee8f413e273e86045cafd22c5cbd8957c SHA512 156e51cc3fee5404c97e04cb8eb96ef86b885bd4c82d3cf225075fe1f94cbed11840d394bdedfadd3e1ba4396e72a312892faf5e90b5f1d94e780801f590dfdb
@@ -53,7 +50,6 @@ EBUILD gcc-6.5.0-r1.ebuild 436 BLAKE2B bdd1de3a0facba6f1ee9b0e7c8717920d0df66beb
 EBUILD gcc-6.5.0-r2.ebuild 445 BLAKE2B a92e1cd9bd26d14390e4f9adb5e511ce5b613f9820527283a14917004f9bee594b80ad1e263d33d2b8390ad991e9d35133ca035532d827775f88128edda3ee06 SHA512 6ee49027d92fb55534c68ecfd48db30a6b19724cfe14404d186472cf8d227fa14ec76584b44f2a05eeab263550ea217af00f2f4b89b32881de5e36b2d730c7a5
 EBUILD gcc-7.5.0-r1.ebuild 456 BLAKE2B bad9ccb3415eae7e4f793fcda356b076556c62475d74e25d8133d1ac7b8f8c35394f999ccc1ed24330ea9eea454c61e953704f6dccc92edcf483bf967b3fe0cd SHA512 9ab3740bd4f074db8b96c06d45cedfa05719d5e832ed47c170733d7569b90966617efdf4c5bc7c2ec325dca9618d285f27c9f1e30a22479d7e763f4db735d7cf
 EBUILD gcc-7.5.0.ebuild 447 BLAKE2B e9c72e8743ec650fd79244b81e7855bcd1ff1b4a13d8fe245f92e0ae2fd37c15609aa951429afcd2eecd4ac2d3f45786e5e2d8a72fac439aaf7cd7a525f3c4e9 SHA512 3b0e22f868d6ff1ec47b21196354873da4d01f21350aea79d1a86c218d4245237a9e5462ae3cb5486ba48736edf6fd1550729a0b49fb22cd87d0f4d99c4eb68d
-EBUILD gcc-8.3.0-r3.ebuild 443 BLAKE2B d5da62636879b66b6e23d2bb000736c17b85d0ee81e3858994fc472edea55810b59f99737d07611ccbe7ff7e6b1af956e315feeffa3ffde227e92490c04b9300 SHA512 4b4b60fcdc829d5c28d8bff8e17d4ccfa0bb09426bf0b741fee6c5df6fc2753e8132c06d09cca8966ed398de4b1e94ba58cd06fb19c944f949a2cde0dfdc4614
 EBUILD gcc-8.4.0-r1.ebuild 452 BLAKE2B 0896974e52aeced6004b4bab01fea077803a8e92a0df45f1cd9df3bca0bc19bb1502ab764526749252888b0cc9a67ba2ef09ec07589768ba6d65390502a751fe SHA512 0016848b01a437b8d5e40e115fbab8311b525b41bab46b5c3eb47727abaf4d8b26828293407533792fc9aefd931af9b0dcd56c8853b5e9708081e62789e6ee6b
 EBUILD gcc-8.4.0.ebuild 443 BLAKE2B 0b37d1fa2fd83c95142b122a0fcc4bcd01f8278c80397f3aaffb0943af6578952a242de8fe0312b3c4c4d533f5fdebdcc63b67b29b17a6fc67b5b052f71cdf25 SHA512 c03adf50767371fef49b800bd0bd364eecf42e3e90033727bfecbd862757c43f1010f9230730506d09bbc96c747cb015fa7aa6342c5d475a3310a129cf0ec5f3
 EBUILD gcc-9.2.0-r2.ebuild 539 BLAKE2B d48f3dd9a33734a1db5546b6223bbb68ddb1f5831c92aa435fe6536af843f3754a688e728055b56999dd836a82e2bbc0f7dd9a4644d66d1c64ab127bba1af3a3 SHA512 a0b565c5a9c54f419c572a760f9b0b310e7008ca0d701a890bee224f7491c265e978215714d12a9565f4924f37c389bfd7fb1512d43e325e715d40ad3ec85f38
diff --git a/sys-devel/gcc/gcc-10.1.0.ebuild b/sys-devel/gcc/gcc-10.1.0.ebuild
deleted file mode 100644
index e41dc5822d49..000000000000
--- a/sys-devel/gcc/gcc-10.1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PATCH_VER="1"
-
-inherit toolchain
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND=""
-BDEPEND="${CATEGORY}/binutils"
diff --git a/sys-devel/gcc/gcc-8.3.0-r3.ebuild b/sys-devel/gcc/gcc-8.3.0-r3.ebuild
deleted file mode 100644
index 78f46a99d5a0..000000000000
--- a/sys-devel/gcc/gcc-8.3.0-r3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PATCH_VER="4"
-
-inherit toolchain
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.13 )
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
-fi
diff --git a/sys-devel/gnuconfig/Manifest b/sys-devel/gnuconfig/Manifest
index ed69bbf46c03..75fb985fdff6 100644
--- a/sys-devel/gnuconfig/Manifest
+++ b/sys-devel/gnuconfig/Manifest
@@ -1,6 +1,7 @@
 AUX 99999999/0001-add-ps2-targets-to-config.sub.patch 1736 BLAKE2B 291ba73c850f1a53cbb0f64da20447d6c9adb9652d994d50eb2052b385253b8d4083277f5b5aa70f9fba75aadc517755d7ef0c880d62cbb87032bae84d9760f7 SHA512 851d52019749cc8fe2c34a53326cd68acae2269274e283a96a4a90b0e630552c8f13b8199f74a8b26c62afabee7631eeed5f56381a84ec99980d59f443270b28
-AUX 99999999/0002-Add-x32-support-to-config.guess.patch 1318 BLAKE2B 1844a1c52406e4142d2b966f485de914a63dd1553e1dfb6f07dfc5860884df13228ef33ca782870a90f5f04de67f21f35028855f6da1bcfaf279fff417b603e9 SHA512 9561f39564bcba61495665e984e0e4539459ec1a342461364849f74cb86adfe6e71867913f0aa98540a4c9a54d0932f133b5541ea41e59f9b32d0278d22db17f
 DIST gnuconfig-20190912.tar.bz2 58742 BLAKE2B 2d5eba2d966d8b6bb18ba9340031c3f3b96fddad7cb156103620bc8fff3d4824b3acf63e0f9046f389cbd9ce2b88348bdddd123134ca910ce18641001943e9e7 SHA512 346ab0e8938052b66b733b0251c5e1cb8d7a61e89630cebcf0039295c5a3652db0798e62b3ec44743c0ccee72d75270dc82fec43e97912c140ac0267a81f6115
+DIST gnuconfig-20200621.tar.bz2 58729 BLAKE2B 8be2ff224620d0d93f676951ec8dcc7a4f1bfdfcb83e2e07371aa6fdf2f08a8d0e8503aecdd55954a0246f0d4119f31b24d60d461500db07757b061c89914df4 SHA512 25778100cb6b47a4ffa8a1875d3109a8b304bf3984549b53e2cbc1e31222aa9614ce01d34451cf6545af62b843378ab217d3396535ed4389ff3e8a7ddaa948ff
 EBUILD gnuconfig-20190912.ebuild 1523 BLAKE2B 9c554949eeb12824973093297ef62487a86b01dc221d758885a26d7d1d27b5d7e1f0f67bd98f870bd37fae2ec2a9edae408a689d0068da1edd5d0b11e202c8bf SHA512 1dfe87e69b584f5747732c4915e5c620b9082ba492bc0b306ba3ccc21ae603ce29ccb9e45192da015bb1f419ee247391ddb11b7025b590192010014956ced37c
+EBUILD gnuconfig-20200621.ebuild 1532 BLAKE2B 6f8a2082af26b31813412daf18e78edcc64aa185f2b9deb19a5906bf256d33a1df8a92d478da45a7129423e09b9023fe18171aa048beb20b876b5c9fd974f9e2 SHA512 d6e48365fad60eb251a84c799edb780160e5257ec74b59d3ac6893ce3469f65ad9934d2618f9f59f017d2ba2345531e95f8d6bcc60e974e1de627828eca1414a
 EBUILD gnuconfig-99999999.ebuild 1532 BLAKE2B 6f8a2082af26b31813412daf18e78edcc64aa185f2b9deb19a5906bf256d33a1df8a92d478da45a7129423e09b9023fe18171aa048beb20b876b5c9fd974f9e2 SHA512 d6e48365fad60eb251a84c799edb780160e5257ec74b59d3ac6893ce3469f65ad9934d2618f9f59f017d2ba2345531e95f8d6bcc60e974e1de627828eca1414a
 MISC metadata.xml 392 BLAKE2B f4a920a49c8060921ea7bc83a097d3a847970b7d655da81c68e13c7902850fd0cd8b442c9193b1936c8687b7a3fc79485fb2eb0523e6eb37e5b0f43f30cbbe29 SHA512 8b0ec5d0b1184ea7514dfd2ff09a1ceddad49150cf412816a5e966eec9857e25886b6c03bb14b38638f79dcca2a40326b8506e23d0d3d7e97b48d2234c5653e5
diff --git a/sys-devel/gnuconfig/files/99999999/0002-Add-x32-support-to-config.guess.patch b/sys-devel/gnuconfig/files/99999999/0002-Add-x32-support-to-config.guess.patch
deleted file mode 100644
index 5a696d1c4b4e..000000000000
--- a/sys-devel/gnuconfig/files/99999999/0002-Add-x32-support-to-config.guess.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 42ebd93d96cd060141e37d9d6601ca1e7d21040d Mon Sep 17 00:00:00 2001
-From: "H.J. Lu" <hongjiu.lu@intel.com>
-Date: Fri, 20 Dec 2013 14:36:01 -0500
-Subject: [PATCH] Add x32 support to config.guess
-
-GCC on Linux/x86-64 may be configured for x32:
-
-https://sites.google.com/site/x32abi/
-
-by default and the Linux/x32 target should be x86_64-VENDOR-linux-gnux32.
-This patch adds x32 support to config.guess.  OK to install?
-
-URL: http://gcc.gnu.org/ml/gcc-patches/2012-08/msg01083.html
----
- config.guess | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/config.guess b/config.guess
-index 97ad0733304d..92f16126465f 100755
---- a/config.guess
-+++ b/config.guess
-@@ -1090,7 +1090,18 @@ EOF
- 	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
- 	exit ;;
-     x86_64:Linux:*:*)
--	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
-+	set_cc_for_build
-+	X86_64_ABI=
-+	# If there is a compiler, see if it is configured for 32-bit objects.
-+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+	    if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \
-+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+		grep IS_X32 >/dev/null
-+	    then
-+		X86_64_ABI=x32
-+	    fi
-+	fi
-+	echo "$UNAME_MACHINE"-pc-linux-"$LIBC$X86_64_ABI"
- 	exit ;;
-     xtensa*:Linux:*:*)
- 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
--- 
-2.19.1
-
diff --git a/sys-devel/gnuconfig/gnuconfig-20200621.ebuild b/sys-devel/gnuconfig/gnuconfig-20200621.ebuild
new file mode 100644
index 000000000000..7eb2a8392c5e
--- /dev/null
+++ b/sys-devel/gnuconfig/gnuconfig-20200621.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+if [[ ${PV} == "99999999" ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/r/config.git"
+
+	inherit git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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"
+	S="${WORKDIR}"
+fi
+
+DESCRIPTION="Updated config.sub and config.guess file from GNU"
+HOMEPAGE="https://savannah.gnu.org/projects/config"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+maint_pkg_create() {
+	cd "${S}"
+
+	local ver=$(gawk '{ gsub(/-/, "", $1); print $1; exit }' ChangeLog)
+	[[ ${#ver} != 8 ]] && die "invalid version '${ver}'"
+
+	cp "${FILESDIR}"/${PV}/*.patch . || die
+
+	local tar="${T}/gnuconfig-${ver}.tar.bz2"
+	tar -jcf "${tar}" ./* || die "creating tar failed"
+	einfo "Packaged tar now available:"
+	einfo "$(du -b "${tar}")"
+}
+
+src_unpack() {
+	if [[ ${PV} == "99999999" ]] ; then
+		git-r3_src_unpack
+		maint_pkg_create
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	default
+	eapply "${S}"/*.patch
+	use elibc_uclibc && sed -i 's:linux-gnu:linux-uclibc:' testsuite/config-guess.data #180637
+}
+
+src_compile() { :;}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins config.{sub,guess}
+	fperms +x /usr/share/${PN}/config.{sub,guess}
+	dodoc ChangeLog
+}
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 580ef7bda600..114711f96018 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -4,9 +4,9 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD lld-10.0.0.ebuild 1483 BLAKE2B 7d949cb37acc2568db0915086fce712ad854df4fe0878ae42759f93c69a119e9f7f24fa8cd5047bc225b037d4afa178ce8e02f11eb9e1cd0e8c60ac3fe8a422d SHA512 bab240f2abe5b81f811080695d419683a423865dd38c62d8d65e7d2421aeb1b3d4da511298d78cd8b20ef53c18772f51367b25fc2b6252070297ceb262ffb1a2
-EBUILD lld-10.0.1.9999.ebuild 1545 BLAKE2B b3b9fa04cb0f406ad925b6ab59d67871c0a1a096cdcb797dc2eb45f67e415696a7af6a4abdd1632350313d7849766c8b6504f725c3b01c0b12fbfa509503340c SHA512 cd8fe30a226f19a5e2569b383149e0d43b2498ac6db25e6064804fe69c131072fc0614de79ff01f623722f256c9f4ba63d4b128a1244d2c3c227d089ad85badd
-EBUILD lld-10.0.1_rc1.ebuild 1545 BLAKE2B b3b9fa04cb0f406ad925b6ab59d67871c0a1a096cdcb797dc2eb45f67e415696a7af6a4abdd1632350313d7849766c8b6504f725c3b01c0b12fbfa509503340c SHA512 cd8fe30a226f19a5e2569b383149e0d43b2498ac6db25e6064804fe69c131072fc0614de79ff01f623722f256c9f4ba63d4b128a1244d2c3c227d089ad85badd
-EBUILD lld-11.0.0.9999.ebuild 1545 BLAKE2B b3b9fa04cb0f406ad925b6ab59d67871c0a1a096cdcb797dc2eb45f67e415696a7af6a4abdd1632350313d7849766c8b6504f725c3b01c0b12fbfa509503340c SHA512 cd8fe30a226f19a5e2569b383149e0d43b2498ac6db25e6064804fe69c131072fc0614de79ff01f623722f256c9f4ba63d4b128a1244d2c3c227d089ad85badd
+EBUILD lld-10.0.1.9999.ebuild 1302 BLAKE2B 281b468babbfd01037253f479a0fe50b67fa5643f514a20f6a77acaacc21324f7e9efd85e8a4dd2e7bc9534fcd290a0392241c17d23b3c1417485c0ef553ef01 SHA512 18d7cb6d3fd2d5d7798e96edcf3cdddd8f40768b12d02f3d2d1946e39c72d94a2da028e3740650dcf8c827e1423a49060940c062fad8f668401530281db18c31
+EBUILD lld-10.0.1_rc1.ebuild 1302 BLAKE2B 281b468babbfd01037253f479a0fe50b67fa5643f514a20f6a77acaacc21324f7e9efd85e8a4dd2e7bc9534fcd290a0392241c17d23b3c1417485c0ef553ef01 SHA512 18d7cb6d3fd2d5d7798e96edcf3cdddd8f40768b12d02f3d2d1946e39c72d94a2da028e3740650dcf8c827e1423a49060940c062fad8f668401530281db18c31
+EBUILD lld-11.0.0.9999.ebuild 1302 BLAKE2B 281b468babbfd01037253f479a0fe50b67fa5643f514a20f6a77acaacc21324f7e9efd85e8a4dd2e7bc9534fcd290a0392241c17d23b3c1417485c0ef553ef01 SHA512 18d7cb6d3fd2d5d7798e96edcf3cdddd8f40768b12d02f3d2d1946e39c72d94a2da028e3740650dcf8c827e1423a49060940c062fad8f668401530281db18c31
 EBUILD lld-8.0.1.ebuild 1794 BLAKE2B 31cf9d99132629908515eb9a8c6b074caa7b84bfbd86446fcd7f65391e247ac23ffd272b715836fc0d787c004a00f613c2c7b0d1bff96a1c8e9054554ae3fe41 SHA512 3d29acfa6f2eedd49917bf811f93f0f9646de38f4b17cf78d748e93c0bb0653f95e7ff1d6aefa0e77ad7af4479f7d3b27d4b10a49ae34aa86efcbeb636064e79
 EBUILD lld-9.0.1.ebuild 1323 BLAKE2B 042f875208515a2b9c39289239601e9b573aa2d9603f2bd58652612d44ff9e62b5776a2370eac1b6933f38f6dd085d3ba24749509eeb2084416e78dc4b5f8fe2 SHA512 d0a352fa95f0e5c47edce97ed4344555ee56d09b70db50b79f2b0ce50ab41e71aaa427dd4218f7239bfa56a439d04b9e99d4eabaa07f573617d55ac259721b55
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/lld/lld-10.0.1.9999.ebuild b/sys-devel/lld/lld-10.0.1.9999.ebuild
index ab0472be1ac9..7b627c88cf1b 100644
--- a/sys-devel/lld/lld-10.0.1.9999.ebuild
+++ b/sys-devel/lld/lld-10.0.1.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm llvm.org multiprocessing python-any-r1
+inherit cmake llvm llvm.org python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="https://llvm.org/"
@@ -22,9 +22,6 @@ RDEPEND="~sys-devel/llvm-${PV}"
 DEPEND="${RDEPEND}"
 BDEPEND="test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 python_check_deps() {
 	has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
 }
@@ -34,13 +31,6 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=OFF
@@ -51,7 +41,7 @@ src_configure() {
 		-DLLVM_BUILD_TESTS=ON
 		-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)")}"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)
 
 	cmake_src_configure
diff --git a/sys-devel/lld/lld-10.0.1_rc1.ebuild b/sys-devel/lld/lld-10.0.1_rc1.ebuild
index ab0472be1ac9..7b627c88cf1b 100644
--- a/sys-devel/lld/lld-10.0.1_rc1.ebuild
+++ b/sys-devel/lld/lld-10.0.1_rc1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm llvm.org multiprocessing python-any-r1
+inherit cmake llvm llvm.org python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="https://llvm.org/"
@@ -22,9 +22,6 @@ RDEPEND="~sys-devel/llvm-${PV}"
 DEPEND="${RDEPEND}"
 BDEPEND="test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 python_check_deps() {
 	has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
 }
@@ -34,13 +31,6 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=OFF
@@ -51,7 +41,7 @@ src_configure() {
 		-DLLVM_BUILD_TESTS=ON
 		-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)")}"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)
 
 	cmake_src_configure
diff --git a/sys-devel/lld/lld-11.0.0.9999.ebuild b/sys-devel/lld/lld-11.0.0.9999.ebuild
index ab0472be1ac9..7b627c88cf1b 100644
--- a/sys-devel/lld/lld-11.0.0.9999.ebuild
+++ b/sys-devel/lld/lld-11.0.0.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm llvm.org multiprocessing python-any-r1
+inherit cmake llvm llvm.org python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="https://llvm.org/"
@@ -22,9 +22,6 @@ RDEPEND="~sys-devel/llvm-${PV}"
 DEPEND="${RDEPEND}"
 BDEPEND="test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 python_check_deps() {
 	has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
 }
@@ -34,13 +31,6 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=OFF
@@ -51,7 +41,7 @@ src_configure() {
 		-DLLVM_BUILD_TESTS=ON
 		-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)")}"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)
 
 	cmake_src_configure
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index 0286676a51c2..25c89c9d5258 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -3,9 +3,9 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD llvm-common-10.0.0.ebuild 604 BLAKE2B fe149a945f69a83939278f76189b47786f68f2f7953c948825ca6cf8caa5e3d986a21e87f23f8549160475a36a3c9fad30724979681141316c2bd84ba44125f0 SHA512 0798acea6da50210e14c460637d5f38f7d3c18f9de13ee36e2dd2424b475f3c343c0c4d8531811063056b4682a8d20b1de881044bdf47bec1fc421996568f98f
-EBUILD llvm-common-10.0.1.9999.ebuild 580 BLAKE2B 00e3d530f838935197ddb2e8c4622af53812a41bd372ee1f785b4580df24252c802f6563e29fb01b32d7d4365293983cf0d45fe23d6a308fbd56e6e9c819f2a1 SHA512 0cde914ca2c20a8c7fe6c243726beca1be2acfb128bebe6201f438ee8c9aead4e84c7c010cacb4f22947c04c4b1fe81df6ab72e18344826a07230271cc2558c5
-EBUILD llvm-common-10.0.1_rc1.ebuild 580 BLAKE2B 00e3d530f838935197ddb2e8c4622af53812a41bd372ee1f785b4580df24252c802f6563e29fb01b32d7d4365293983cf0d45fe23d6a308fbd56e6e9c819f2a1 SHA512 0cde914ca2c20a8c7fe6c243726beca1be2acfb128bebe6201f438ee8c9aead4e84c7c010cacb4f22947c04c4b1fe81df6ab72e18344826a07230271cc2558c5
-EBUILD llvm-common-11.0.0.9999.ebuild 580 BLAKE2B 00e3d530f838935197ddb2e8c4622af53812a41bd372ee1f785b4580df24252c802f6563e29fb01b32d7d4365293983cf0d45fe23d6a308fbd56e6e9c819f2a1 SHA512 0cde914ca2c20a8c7fe6c243726beca1be2acfb128bebe6201f438ee8c9aead4e84c7c010cacb4f22947c04c4b1fe81df6ab72e18344826a07230271cc2558c5
+EBUILD llvm-common-10.0.1.9999.ebuild 528 BLAKE2B ac8c427ce977f480f46c33abe30cf92be1fc0f3787c619c5e4b57a3f2fd465e846b37924940413252cb178c857720e9953594cabd009253d4ab798e7fc85e854 SHA512 630d92131856eae97de7b7d448d2bd32cfa89e2ef9c7818f25b6696c3618a1931c14f424e73f7f57cc6183bf8f908e4e92d3c1b64a09e6840aab4c75ada629f9
+EBUILD llvm-common-10.0.1_rc1.ebuild 528 BLAKE2B ac8c427ce977f480f46c33abe30cf92be1fc0f3787c619c5e4b57a3f2fd465e846b37924940413252cb178c857720e9953594cabd009253d4ab798e7fc85e854 SHA512 630d92131856eae97de7b7d448d2bd32cfa89e2ef9c7818f25b6696c3618a1931c14f424e73f7f57cc6183bf8f908e4e92d3c1b64a09e6840aab4c75ada629f9
+EBUILD llvm-common-11.0.0.9999.ebuild 528 BLAKE2B ac8c427ce977f480f46c33abe30cf92be1fc0f3787c619c5e4b57a3f2fd465e846b37924940413252cb178c857720e9953594cabd009253d4ab798e7fc85e854 SHA512 630d92131856eae97de7b7d448d2bd32cfa89e2ef9c7818f25b6696c3618a1931c14f424e73f7f57cc6183bf8f908e4e92d3c1b64a09e6840aab4c75ada629f9
 EBUILD llvm-common-8.0.1.ebuild 855 BLAKE2B 81171ca3ce7d05be60c151d814ceb592e18fd2d8986db8a1106662727d0b1f94011cac9057f7fe8b398197b2d8fe588e684dacf7ed6b4d93777f4a8cdbfdc644 SHA512 f6a1f1b256bb1dae884dcecbeb6b22c295407ea3b3126839ac99c7c6e745c074c77167f52d7790b38501a0cab5680109274323ff8f6d27ea9b39bdec82ff8f7f
 EBUILD llvm-common-9.0.1.ebuild 599 BLAKE2B d6ac1c054ea708da18d5f557f2be5f0adc7dc5172ea679421516792a2a5e8a9e734bcbbb8c890c0b6ac136d7976fc7bedfde8c42837e67536d5dfeec1cf56230 SHA512 0beeb50ce3280418dfbeea22322dc9c585024a66b39ff8ce2b1465e62ea66af75bb0a151ca431a1a794ad25d74afc1e2b1ac3b9529a283b4b36ebdc99991a29f
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/llvm-common/llvm-common-10.0.1.9999.ebuild b/sys-devel/llvm-common/llvm-common-10.0.1.9999.ebuild
index 18d163abd5c8..df9cf92b47a1 100644
--- a/sys-devel/llvm-common/llvm-common-10.0.1.9999.ebuild
+++ b/sys-devel/llvm-common/llvm-common-10.0.1.9999.ebuild
@@ -17,11 +17,6 @@ IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"
 
-src_prepare() {
-	cd "${WORKDIR}" || Die
-	default
-}
-
 src_install() {
 	insinto /usr/share/vim/vimfiles
 	doins -r */
diff --git a/sys-devel/llvm-common/llvm-common-10.0.1_rc1.ebuild b/sys-devel/llvm-common/llvm-common-10.0.1_rc1.ebuild
index 18d163abd5c8..df9cf92b47a1 100644
--- a/sys-devel/llvm-common/llvm-common-10.0.1_rc1.ebuild
+++ b/sys-devel/llvm-common/llvm-common-10.0.1_rc1.ebuild
@@ -17,11 +17,6 @@ IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"
 
-src_prepare() {
-	cd "${WORKDIR}" || Die
-	default
-}
-
 src_install() {
 	insinto /usr/share/vim/vimfiles
 	doins -r */
diff --git a/sys-devel/llvm-common/llvm-common-11.0.0.9999.ebuild b/sys-devel/llvm-common/llvm-common-11.0.0.9999.ebuild
index 18d163abd5c8..df9cf92b47a1 100644
--- a/sys-devel/llvm-common/llvm-common-11.0.0.9999.ebuild
+++ b/sys-devel/llvm-common/llvm-common-11.0.0.9999.ebuild
@@ -17,11 +17,6 @@ IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"
 
-src_prepare() {
-	cd "${WORKDIR}" || Die
-	default
-}
-
 src_install() {
 	insinto /usr/share/vim/vimfiles
 	doins -r */
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 50ed11457d47..f9f84e926d84 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -10,9 +10,9 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD llvm-10.0.0.ebuild 10579 BLAKE2B 04be48351a56d46e4b13357415364c9d20a5e3e6438ca587a40f1233ffabaeeb14013a03e1794409a80cf9578bed03e93c82baae5ebe82fab7b4a9d141abaab4 SHA512 b4f6e58592423642bc570e57112b80a2c3b5abee66118333fff8bb06e5c7bb447b6636d73c304ab424d2caf842ef709db846aa8758eb7b72d0253e7e4b979b6d
-EBUILD llvm-10.0.1.9999.ebuild 12650 BLAKE2B 211f0b2414736b96abc8f8233b9887b07c3ffeff550b8730d827cba5553c72a3c1e03c60bbae3b67ea291d99ecfa26fe6a9c4d5df9f487f2720c7203e1ffeaf2 SHA512 9bdf03333f1a0db73981f5ad85ac999e4d6e9d752bbfe89cc14ab3f442492d12e923aa008364190959acffac0f3f761d48eb8db56939735b7bffbb293b3bc21d
-EBUILD llvm-10.0.1_rc1.ebuild 11657 BLAKE2B 9efafea418d81c69252ae1384c987da275a73364881de966df418a1005bbbea39459ccbfb9d5e9fd2d7120c1d8f55e929e4d23111878c65814c0ac959243fb9d SHA512 47d7bdb20aba5337db602d652076919171d2fc12bdd6d952e9aacab829b358f3de21931ea2fe4411f2054e9bb1efe0809b114f680956fbc3cde50fcee0500d02
-EBUILD llvm-11.0.0.9999.ebuild 12451 BLAKE2B 12dc5b6901c4cee6a407c17531a9557d359baaa8a1fc2432a0e42c8ae5854ff50746ebfa6440c2948fc04fc4f6f427fdd09e21a4f75c60a90ec586d143c99ca1 SHA512 67d364038e5e7cbce658fd2d0624e20423a9ebe0890dfb43419cb4f382c20651cda4b6fccb804e11cfdb23162f95907124c950a12fc4991c1bde764b6404ccd6
+EBUILD llvm-10.0.1.9999.ebuild 12448 BLAKE2B 8a548c876a5875cdb65094283ac71ea950466b4b9166d29b011f567a31039341ed6925551f4ebeb820a2cf768dab20bd20517a8733a711ad323c2c6b881d96bb SHA512 f675453ee5416e9191ca3a93fb98652bfa52750130c6d096bdfb0dd888e7e3b3b5d7de7598cd784441edef942ff056016ca8c26c4e07ac9af1ce800e889dfbf0
+EBUILD llvm-10.0.1_rc1.ebuild 11455 BLAKE2B 50602dcd5bea578a0f0cf4525cf8a83d381c3cfc71f639a90d686ffef95866842eb99a080aa0da0ee7cebdae2a6fa5e4c38dbedb684ad427dbcdc4e3931cba1e SHA512 0f006aaa87fe9aff85a8b2b18423dde7b1355b8b3ae240094c626930c8131312f358edf7a447f359aee1e404acd92d92013a8cc3850657108f2dbd35414529fa
+EBUILD llvm-11.0.0.9999.ebuild 12249 BLAKE2B a811f27eb484b31f8cccba5432ec608be0e0b3fec02039fb89e0f585643128625846a90ef34fe566a493c1adf30e6707a42ee048df7b34eba9b2a9a895adc912 SHA512 e62dbebe58acaecfcd200af5ed68dfb853a28723e1c880769d0ada60478ea84d4abfc04e1e3af153383c5a3ff970d6e0371468b255b14d9a2d6ab2b099720d2f
 EBUILD llvm-8.0.1.ebuild 8423 BLAKE2B 229579ed2cd28987476612666617c61af49760ace9b4664a4419f2518990666d88a2c234d55f7f9c89d04e4a107b34cad50ce7866e4fa944829b0eb3f7473a2b SHA512 307e04c4dac29e8b3fef2a422d231883883384b23fc9d54c8f5f9e69b9f40fb3ea7950651cc15938e0ea92a12413db67996b87b59ec88cf3ba4661b6099602e7
 EBUILD llvm-9.0.1.ebuild 8454 BLAKE2B 33b4c7bdf4bc136d29f3f6f505799b11de31d33e393b51c9bafb121b0b8b347e86a5954ba6ba039cd6b39cb7c1a501d4747f51652351559c42ba0b84c4bae54b SHA512 f43a600265c1559e924a6f2ec97dffdacfae35df2cc3e3e874704c5ae179ba48d90fdd666411cdab500d171fa63b557538282545c7c4078867857e077c941a4c
 MISC metadata.xml 2563 BLAKE2B ca85030788fb213fc891d895238fd75562cdd25cc5fe4271d709cb1c00ef56b0e8b367dc70cc18f7d185d6fbdb57333e219a984220b60141d28fb4784b2cb94a SHA512 8de68ee7f964e6eb2613bd2ff584f834e0f5a3ae8b303b5f2f10fda718a87af9b8ddfc19399950fe4eb8be515930124ced8018190af0f69da7ec5fe8180a68a2
diff --git a/sys-devel/llvm/llvm-10.0.1.9999.ebuild b/sys-devel/llvm/llvm-10.0.1.9999.ebuild
index 27af603d49b5..6bf2a545f962 100644
--- a/sys-devel/llvm/llvm-10.0.1.9999.ebuild
+++ b/sys-devel/llvm/llvm-10.0.1.9999.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm.org multilib-minimal multiprocessing pax-utils \
-	python-any-r1 toolchain-funcs
+inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
+	toolchain-funcs
 
 DESCRIPTION="Low Level Virtual Machine"
 HOMEPAGE="https://llvm.org/"
@@ -70,9 +70,6 @@ RDEPEND="${RDEPEND}
 PDEPEND="sys-devel/llvm-common
 	gold? ( >=sys-devel/llvmgold-${SLOT} )"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 PATCHES=(
 	# Fix linking to dylib and .a libs simultaneously
 	"${FILESDIR}"/10.0.1/0001-llvm-Avoid-linking-llvm-cfi-verify-to-duplicate-libs.patch
@@ -198,10 +195,7 @@ src_prepare() {
 	# Verify that the live ebuild is up-to-date
 	check_live_ebuild
 
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
+	llvm.org_src_prepare
 }
 
 # Is LLVM being linked against libc++?
@@ -399,7 +393,7 @@ multilib_src_configure() {
 #	fi
 
 	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)
 
 	if multilib_is_native_abi; then
diff --git a/sys-devel/llvm/llvm-10.0.1_rc1.ebuild b/sys-devel/llvm/llvm-10.0.1_rc1.ebuild
index 36ee1f6d95dc..5ac7c6e2a8c3 100644
--- a/sys-devel/llvm/llvm-10.0.1_rc1.ebuild
+++ b/sys-devel/llvm/llvm-10.0.1_rc1.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm.org multilib-minimal multiprocessing pax-utils \
-	python-any-r1 toolchain-funcs
+inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
+	toolchain-funcs
 
 DESCRIPTION="Low Level Virtual Machine"
 HOMEPAGE="https://llvm.org/"
@@ -70,9 +70,6 @@ RDEPEND="${RDEPEND}
 PDEPEND="sys-devel/llvm-common
 	gold? ( >=sys-devel/llvmgold-${SLOT} )"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 PATCHES=(
 	# Fix linking to dylib and .a libs simultaneously
 	"${FILESDIR}"/10.0.1/0001-llvm-Avoid-linking-llvm-cfi-verify-to-duplicate-libs.patch
@@ -163,10 +160,7 @@ src_prepare() {
 		sed -i -e '/source_parsers/d' docs/conf.py || die
 	fi
 
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
+	llvm.org_src_prepare
 }
 
 # Is LLVM being linked against libc++?
@@ -364,7 +358,7 @@ multilib_src_configure() {
 #	fi
 
 	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)
 
 	if multilib_is_native_abi; then
diff --git a/sys-devel/llvm/llvm-11.0.0.9999.ebuild b/sys-devel/llvm/llvm-11.0.0.9999.ebuild
index 5af65c0f4a0d..e005e516f322 100644
--- a/sys-devel/llvm/llvm-11.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-11.0.0.9999.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm.org multilib-minimal multiprocessing pax-utils \
-	python-any-r1 toolchain-funcs
+inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
+	toolchain-funcs
 
 DESCRIPTION="Low Level Virtual Machine"
 HOMEPAGE="https://llvm.org/"
@@ -70,9 +70,6 @@ RDEPEND="${RDEPEND}
 PDEPEND="sys-devel/llvm-common
 	gold? ( >=sys-devel/llvmgold-${SLOT} )"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 python_check_deps() {
 	if use doc; then
 		has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" ||
@@ -192,10 +189,7 @@ src_prepare() {
 	# Verify that the live ebuild is up-to-date
 	check_live_ebuild
 
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
+	llvm.org_src_prepare
 }
 
 # Is LLVM being linked against libc++?
@@ -395,7 +389,7 @@ multilib_src_configure() {
 #	fi
 
 	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)
 
 	if multilib_is_native_abi; then
diff --git a/sys-devel/sparse/Manifest b/sys-devel/sparse/Manifest
index 9284e33b4454..cc021330df86 100644
--- a/sys-devel/sparse/Manifest
+++ b/sys-devel/sparse/Manifest
@@ -1,11 +1,5 @@
 AUX sparse-0.5.1-cmdline-include.patch 1886 BLAKE2B 328a414d8c24f02e682978b7b6fef225519f5c5036ebb6f052dc930536ceb7232dfd45ccd158eaa712d2c4c1c622261969c24703bf4b69d6b625c0be4d397204 SHA512 d4267e94d7603b421a1df09869706114b5f81867ddd1d758b1dd251232f645e4a0c14df1d2bb993c78d14afaa699f84f7754b62fae19d1ccabe28571550d92f7
-DIST sparse-0.5.1.tar.xz 215144 BLAKE2B 209aa7cf34a9135dae38466a0ba41ff4fb888c363ed59a68a5820d4b6ef1636d717b8172a6d638d9dbc61197efb7a3e06ef85830b6f1c359737520b4b3aa0fbe SHA512 f7fc516ef8343a4153b9bda1b50b326dcd55a77fce5acccd9aa4c5636d6510573c7e26b0a7ca1df847082faf2be2d292336ad1cec855e395703a6b1e04d3a8a1
-DIST sparse-0.5.2-rc1.tar.gz 282810 BLAKE2B 74d06230ceb06dac427984c365223633ef795b2f6329c69da5183b9f3444457ee05d74b04b18cf400b4d813026a746218edbf9bc0b2aa371c8a3681ac10ce19b SHA512 b58458b97e91b7d02d032a946d9870a3fd227959608fb7847864ad1a92258aeb0461da513f4d6d3b37791ed8d5fc41ac01cfef0fcaf34b229090ff078672ef40
-DIST sparse-0.6.0.tar.xz 284668 BLAKE2B 9bb568fe23ac96d6e179e5c5927ff34e9fc88909d367f6ab49c8862a8e599df83602ba72bc42ba3bf63823b024340f101128c528ebf767f4e29da7f5324a1f40 SHA512 5c6c88f203c941bf0efd28802ef91641c96e7d4b4688a5176d091ff0fd6a650d9147e590b631602a8bd08994a35261977569367861a6d605ccdd25e4a07debf9
 DIST sparse-0.6.1.tar.xz 287880 BLAKE2B 026e7770460ab576b91e8c401c642e95269ddd7c90c0f855b0246448ca653b95a899b4bf647134c090c06c802757b6415dcc89bc214fb7ff124c2ce3888fccb0 SHA512 2faad9b3263f19f941cd6a5891960d2c7d1066c664d3ef68e722d461785aeed2d4a9539df3556bbd98c022e7ee965b8030c49272ab6003113ba3b36f73c00187
-EBUILD sparse-0.5.1.ebuild 1323 BLAKE2B e24dd33f50cb9e5154a863eac43f4f03cf64075cc8e3462f9dbc4aacf7ab33985ec3388f750c355da66002477964e3a6ac3f6268195e46624c1f615dbd81480b SHA512 3f7c50f64665b199ecf899a2e209489a6c39f1273056d339447401e76e5422e82f9f4001424afef99b4d980bd585c21b92ce36619e8ae5cff7357937250521b4
-EBUILD sparse-0.5.2_rc1.ebuild 1399 BLAKE2B 4e0b4d000c0ac935a0f82435505e1c3fa372862c8628716c47d1d726593d2c919fd3807d8c2bc2cb81832cb044b34a39f308acf4c04ad5302ca4126b5a832ab5 SHA512 cc5b9242a8c205356f27cada0f51d5eacb3bf57d006c83fcd42e83ebee05a4da5f10d4e7fb56261c0d279aad68f8db49da07edaf76b99b0d3fb77bf9a0de2eb1
-EBUILD sparse-0.6.0.ebuild 1292 BLAKE2B 57298d8d8db6492498d7c6743e9d5c1c025754956c5b4317cdb3ab89daf06d675b69f9eddc03ffe58e8b14e857672ac37c043ddf4d6e1ef5e1f051e24f88d22d SHA512 b5fe4638421606863f721ecb2fa6121d8008f00fad23f2d0bcfb67aad5af0fea060fc63258d88795770a06deb663adec2805af649ef98077686dbb431a529936
 EBUILD sparse-0.6.1.ebuild 1371 BLAKE2B 1cb48cddc186f3ab6726c5d7d6f4dcd680e44856626abe1cf1df61c4dbaa65f1bb821422533ec37e658be1330605cfb22f72461a7378dd7e561359c5c454f047 SHA512 cd3ac75ad44361a400cc659fe4e6b40da0bd10db5ec2e9cc96811d11002bfede6e345888cf662dac6963b9f7713b7068cefac19aee412cde699250770d9226e5
 EBUILD sparse-9999.ebuild 1371 BLAKE2B 1cb48cddc186f3ab6726c5d7d6f4dcd680e44856626abe1cf1df61c4dbaa65f1bb821422533ec37e658be1330605cfb22f72461a7378dd7e561359c5c454f047 SHA512 cd3ac75ad44361a400cc659fe4e6b40da0bd10db5ec2e9cc96811d11002bfede6e345888cf662dac6963b9f7713b7068cefac19aee412cde699250770d9226e5
 MISC metadata.xml 636 BLAKE2B 48bac3e5bb329089c8923cfbdd0bd32efa8202c5f43a8179b044c70fdc1fcb73090b0765fe3d2b6e33fd0364f5ca25eec07aabd152dff21948074a2099c5367e SHA512 b46ed66da3644ecf4e2cdb6a0ecd9fd18e99cfb6aea1967acf1119d1f75c4907889a3fbcda76ef2d3c4b1617d718a946e5fb01e75db105d740a98c49430da859
diff --git a/sys-devel/sparse/sparse-0.5.1.ebuild b/sys-devel/sparse/sparse-0.5.1.ebuild
deleted file mode 100644
index 45819e268860..000000000000
--- a/sys-devel/sparse/sparse-0.5.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=6
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="C semantic parser"
-HOMEPAGE="https://sparse.wiki.kernel.org/index.php/Main_Page"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/${PN}/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://www.kernel.org/pub/software/devel/${PN}/dist/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="gtk llvm test xml"
-RESTRICT="!test? ( test )"
-
-RDEPEND="gtk? ( x11-libs/gtk+:2 )
-	llvm? ( >=sys-devel/llvm-3.0 )
-	xml? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}
-	gtk? ( virtual/pkgconfig )
-	xml? ( virtual/pkgconfig )"
-
-PATCHES=( "${FILESDIR}/${PN}-0.5.1-cmdline-include.patch" )
-
-src_prepare() {
-	tc-export AR CC PKG_CONFIG
-	sed -i \
-		-e '/^PREFIX=/s:=.*:=/usr:' \
-		-e "/^LIBDIR=/s:/lib:/$(get_libdir):" \
-		-e '/^COMMON_CFLAGS =/{s:=:= $(CPPFLAGS):;s:-O2 -finline-functions -fno-strict-aliasing -g:-fno-strict-aliasing:}' \
-		-e "s:pkg-config:${PKG_CONFIG}:" \
-		Makefile || die
-	export MAKEOPTS+=" V=1 AR=${AR} CC=${CC} HAVE_GTK2=$(usex gtk) HAVE_LLVM=$(usex llvm) HAVE_LIBXML=$(usex xml)"
-	default
-}
-
-src_compile() {
-	emake $(usex test all all-installable)
-}
diff --git a/sys-devel/sparse/sparse-0.5.2_rc1.ebuild b/sys-devel/sparse/sparse-0.5.2_rc1.ebuild
deleted file mode 100644
index ad1d45931133..000000000000
--- a/sys-devel/sparse/sparse-0.5.2_rc1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="C semantic parser"
-HOMEPAGE="https://sparse.wiki.kernel.org/index.php/Main_Page"
-
-RC_COMMIT=d1c2f8d3d4205ca1ae7cf0ec2cbd89a7fce73e5c
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/${PN}/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://git.kernel.org/pub/scm/devel/${PN}/${PN}.git/snapshot/${PN}-${RC_COMMIT}.tar.gz -> ${PN}-${PV/_/-}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="gtk llvm test xml"
-RESTRICT="!test? ( test )"
-
-RDEPEND="gtk? ( x11-libs/gtk+:2 )
-	llvm? ( >=sys-devel/llvm-3.0 )
-	xml? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}
-	gtk? ( virtual/pkgconfig )
-	xml? ( virtual/pkgconfig )"
-
-S="${WORKDIR}/sparse-${RC_COMMIT}"
-
-src_prepare() {
-	tc-export AR CC PKG_CONFIG
-	sed -i \
-		-e '/^PREFIX=/s:=.*:=/usr:' \
-		-e "/^LIBDIR=/s:/lib:/$(get_libdir):" \
-		-e '/^COMMON_CFLAGS =/{s:=:= $(CPPFLAGS):;s:-O2 -finline-functions -fno-strict-aliasing -g:-fno-strict-aliasing:}' \
-		-e "s:pkg-config:${PKG_CONFIG}:" \
-		Makefile || die
-	export MAKEOPTS+=" V=1 AR=${AR} CC=${CC} HAVE_GTK2=$(usex gtk) HAVE_LLVM=$(usex llvm) HAVE_LIBXML=$(usex xml)"
-	default
-}
-
-src_compile() {
-	emake $(usex test all all-installable)
-}
diff --git a/sys-devel/sparse/sparse-0.6.0.ebuild b/sys-devel/sparse/sparse-0.6.0.ebuild
deleted file mode 100644
index 1b776ebd0a15..000000000000
--- a/sys-devel/sparse/sparse-0.6.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=7
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="C semantic parser"
-HOMEPAGE="https://sparse.wiki.kernel.org/index.php/Main_Page"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/${PN}/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://www.kernel.org/pub/software/devel/${PN}/dist/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="gtk llvm test xml"
-RESTRICT="!test? ( test )"
-
-RDEPEND="gtk? ( x11-libs/gtk+:2 )
-	llvm? ( >=sys-devel/llvm-3.0 )
-	xml? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}
-	gtk? ( virtual/pkgconfig )
-	xml? ( virtual/pkgconfig )"
-
-_emake() {
-	# Makefile does not allow for an easy override of flags.
-	# Collect them here and override default phases.
-	emake \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		CFLAGS="${CFLAGS}" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		\
-		HAVE_GTK=$(usex gtk) \
-		HAVE_LLVM=$(usex llvm) \
-		HAVE_LIBXML=$(usex xml) \
-		\
-		V=1 \
-		PREFIX="${EPREFIX}/usr" \
-		\
-		"$@"
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake check
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-
-	dodoc FAQ README
-}
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index b2394450e000..f4c5bea6c866 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/ipxe/Manifest b/sys-firmware/ipxe/Manifest
index 7da9fc36fdd8..166e44d77b36 100644
--- a/sys-firmware/ipxe/Manifest
+++ b/sys-firmware/ipxe/Manifest
@@ -2,6 +2,6 @@ DIST ipxe-1.0.0_p20180211-546dd51-bin.tar.xz 1748228 BLAKE2B 5ed2ce71c7dbc41d5cb
 DIST ipxe-1.0.0_p20180211-546dd51.tar.bz2 2954305 BLAKE2B 8232b1afe017ff5d0389534e4efea3209ea0330d66e4d3d429abf81da66639b19488911d85bf2da200ff8cb0d49c5dda438074c4538303335419ea080ef80a16 SHA512 45d7f80f15a1c5ff1daa31b132065d38013a51127795ad81308b468940a455edcb40cde7601475039a7c977d732817203bbc627c642d3d10146a480da603f1dd
 DIST ipxe-1.0.0_p20190728-a4f8c6e-bin.tar.xz 1839688 BLAKE2B b28772b928690646e1b0cb1c27ef56e2cb1c0637a43c6174dea7c8ca401d8c8819938fa358a0bed5d57b8cf992b8c2060b52e32a970ef813f1cf705fb0805beb SHA512 1e5838b8c530257dc544f6e25f80e6e223480917db393ca3ff8c577f07e60180e18f2eed4e71f7b1965157d6e7001f65e224d3c8b56a98f84739e2504ca38985
 DIST ipxe-1.0.0_p20190728-a4f8c6e.tar.bz2 2985776 BLAKE2B 5a85505404978d51f80e30332f6eb0417d6d97eb9b3bc05eec5ad649c446c7d17dc841f8cd34a1b29c31dc6f5cf08baa69191de9c8dd4bcdb098c5d7f13a7824 SHA512 3af0da9058b39966bfd8f9d7dfe518ae7b26e18f58d1a3fa2cba8922ec3c50775b82dd9f23bf51be3ca3f69b705f92bcf80988a1817b30f7ab1826a4b159c5a6
-EBUILD ipxe-1.0.0_p20180211.ebuild 2804 BLAKE2B b1aaf4b606d62fdc12fcacbb5917ef0ba11e82b9e31b9d6b5f4a703e5cbc959a915847aadea45c031974821a2c7a5ab8d500a6f8d41fc438fdef99325afc8d0a SHA512 9bbdabfc8f6809c75080520052b570c996932280c0f41cc913f11e86d600a4e68af5cd61e28db243158887cfe830f6b3fdcf16046cc2307222db12a301be9b30
-EBUILD ipxe-1.0.0_p20190728.ebuild 2801 BLAKE2B ea8f403f82eb8a87751e5e12d0e22cb29b7c695a4c1ed493455c93f23df08a8c53cdbea9315b90fa0d60b5662822b19193e9618a759c554bb0f6d2c8a84bc403 SHA512 bbcc96d7d54fe5c4d9259839b3d0cc66de159643f12cb4b8f818532a3667e9ea7a85b2093d79230539dcdf64082e3747eca914853bdcc2f8f936a8b964f8a02a
+EBUILD ipxe-1.0.0_p20180211.ebuild 2802 BLAKE2B 9fca4b57d57ff02da7b47ab6d69126ee9ab3a02eb3cb3d4c0dca407916436a797dd730cdfef64d14fa255fa6b6021dad4e1d3547be1e433f41d1535118cb99a8 SHA512 999f589e9a37315a7e785ad6bd7b64ff321da46d153a8cfc7704fb2a017e34c3748d0fe778ad59c276c5662f40bba3e577fcedcfb9ada2bcd3b2b736d98358fc
+EBUILD ipxe-1.0.0_p20190728.ebuild 2802 BLAKE2B c7a884618c6b0941e25134c72b32e08c71d7b2f0619d96378e706d9cb7e1e1ee9e7523d5fcf1a6b900bc748fdc43a5c390300d53db3d2eea63fec4498498ac15 SHA512 bb330a529f9d9ef152a5ab49d97b8765dfa472058197a580e70f0801ba4129a194e2a7ecd4530fa1101a604724da95c3c538a411e1c3bc01b9b0a9a0f9761a9b
 MISC metadata.xml 996 BLAKE2B 41f19340003c0213578fb1b3f7ae6aaff718eb150cdb398b463e695dcc931da45251ab5d70fbdff0277f52ad7a231f93f878d9fa4ce9fe5a338cc3d4e2708124 SHA512 123f401010d157b928390599a3125c9c18ba721757a16ac3fcce4fe30e3ff298ad9a3dcda64b779bf2fe0fcb52c9057e382b7ac618a3ae27b92dd94cf0dde0d7
diff --git a/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild b/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild
index 21b512890ba3..34c3700b7860 100644
--- a/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild
+++ b/sys-firmware/ipxe/ipxe-1.0.0_p20180211.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 @@ GIT_REV="546dd51de8459d4d09958891f426fa2c73ff090d"
 GIT_SHORT=${GIT_REV:0:7}
 
 DESCRIPTION="Open source network boot (PXE) firmware"
-HOMEPAGE="http://ipxe.org/"
+HOMEPAGE="https://ipxe.org/"
 SRC_URI="
 	!binary? ( https://git.ipxe.org/ipxe.git/snapshot/${GIT_REV}.tar.bz2 -> ${P}-${GIT_SHORT}.tar.bz2 )
 	binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-${GIT_SHORT}-bin.tar.xz )"
diff --git a/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild b/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild
index cb5cc15b84e7..a8318d879f45 100644
--- a/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild
+++ b/sys-firmware/ipxe/ipxe-1.0.0_p20190728.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 @@ GIT_REV="a4f8c6e31f6c62522cfc633bbbffa81b22f9d6f3"
 GIT_SHORT=${GIT_REV:0:7}
 
 DESCRIPTION="Open source network boot (PXE) firmware"
-HOMEPAGE="http://ipxe.org/"
+HOMEPAGE="https://ipxe.org/"
 SRC_URI="
 	!binary? ( https://git.ipxe.org/ipxe.git/snapshot/${GIT_REV}.tar.bz2 -> ${P}-${GIT_SHORT}.tar.bz2 )
 	binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-${GIT_SHORT}-bin.tar.xz )"
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 6cae333ad2e6..bb4f3ddc41f5 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/diskdev_cmds/Manifest b/sys-fs/diskdev_cmds/Manifest
index 03aee2a60c5e..91376c1c96ca 100644
--- a/sys-fs/diskdev_cmds/Manifest
+++ b/sys-fs/diskdev_cmds/Manifest
@@ -1,6 +1,7 @@
+AUX diskdev_cmds-332.14_p1-AR.patch 251 BLAKE2B 7bab604de5c1ff6ed2a78e2c7ef987bf85fc02b1a21c6996fef567086286cb1596cca61a5ddc246272570603cf0ef25050b2d6afcf8286c23f465b92e3bf096b SHA512 c81bd2bbeca3b76efb98142b9004011de923d5819d8f8bb65a9ec6afa9b1e5a594bcf69d3a733913bca614fca2ea0d456ee852beee897d7bb4799097640e8e9c
 AUX diskdev_cmds-respect-cflags.patch 388 BLAKE2B 8ecaa932e3a5841bc9ace0ffd2fea2f974a42ad33f0f65551bcc4c2a873b50a4413cf16542b74f277244f578142fcd5f1bfe63063c280062bf06aed20f601385 SHA512 21325ea43ea19a06962b7123ba418d5759d712d44b1ba7d35fa982613a95d2d91d1e7cde287b497d9e6de9483658f36378f7d3d03e5780d7dc468a82e5b0da69
 DIST diskdev_cmds-332.14.tar.gz 714035 BLAKE2B 8c66509366db8067b6b3057dc8dd8c6de5f25df86a88fec8beac78e4e14d91af5319bf61671ceea206508b6abac54231e82d527a2cc79ea467e7660e10997a7f SHA512 e1df91fb5330dc01a79de99dd8b1f389a337a19c2136994d59b7cbca9c2e1cb5f7d47101366dd01db4e23a5d3d7afab41758045bf7402d739fa22182dc922044
 DIST diskdev_cmds-332.14_p1.patch.bz2 21989 BLAKE2B f7e421c164ec242e6516a4638bc4c4706a11b03587fad0e7328a311d15f47b48b4e706f819cffa8e8539d7e4eaa8efa5f9a55a838f88586872e7fc8d67c9ac8e SHA512 aaef096aa6a3f2e09bcc8c1831172c3d68994589ade505153ade00e6f4d0c49263b63212f8616ece597b1ee218a87474bb1c3812d15f34c5bc5c51fd7b72a062
-EBUILD diskdev_cmds-332.14_p1-r1.ebuild 1232 BLAKE2B 9dcd240a0197878200d438b856d2eb6514a28597c6f8ad505a9aafcc8669e97373d92135c263dd43aad032886af52f694d0539f52d145be9a5a2d871e1dda7d6 SHA512 c243627cf30cc6ae1462ad8ed544ba933439ed14246f8fe23fbc0c1ea901f57107e7fc59284e5906384bab29d62eb994c27f6336b2e71a8517c450e0ed3c6f3b
-EBUILD diskdev_cmds-332.14_p1-r2.ebuild 1215 BLAKE2B 98df0d72eea1433a0e646ed4bcae9ca5977f495302b6e9c60274f18359b9ac132a39ab6af8bb9e9d09c1231debf70701b1edd3333ddf1a66cac063b30a1e7757 SHA512 3fd3c355740bd4cdfea1db5a390141d9f90396a9b8dd2f2049e2d54d5a658bac09ee50454fc7dcb58e1254e13cf479d73994864064cde8892d48cdfedf785c04
-MISC metadata.xml 390 BLAKE2B e64b93c1e1bc559fd8ee2b08df7760111f5e6a16ba5da382a8544fc30f619235b1faf36f3dc34af6db04d55a8e55b8898c5c11648d7f08a0aa2d084fe936a539 SHA512 713593a494fe0722fc1ea9984450a392585e57d2e317d99bbac73a2f713ff87950d52b11124ce2f3c7536755302c364d94ca38389b93789d3af5f5d19d8fc0fa
+EBUILD diskdev_cmds-332.14_p1-r2.ebuild 1211 BLAKE2B d78ec627dfbfdd755adebd7e046eda94dced4144c3993b291b119a2f6b5db13cf4a335c694b58b873a6ff2c4ed61c5de95aa5217ef88022f1daec14ae697a67b SHA512 ddccd84c7f12679b74924e2fa51fb28a385a54bac3d07ca1f3ab99a8b118657dc2155e6ced6f8b78b36e9f604d02adf795cede4c5741b6af0a4a68a42092f270
+EBUILD diskdev_cmds-332.14_p1-r3.ebuild 1299 BLAKE2B 75d5bfefeb0188160d5407cbc8dca554751787a1e498b635f43f3ddb668744bdc11331a102824246c896079a390a4c545babca9b766b6ecb1f877ca72894238a SHA512 0b5f64d71879324494675f85d336aa3d745d7966d30f994ebafba897d69f7314dfab82c579b4d00d4e5ffeac26a826b11da7971e0f80bad6ad20a6e2ebf40eb6
+MISC metadata.xml 375 BLAKE2B b5ab86c1adfdb8ad06c76fcff0378bc7d88bdb7510e0fa06cf3c32e5025d7bf7e151f4791e0b1bf9c76692408da5c979b7a9ea713cddf412e4c291eb2cbc31fb SHA512 4a9cb22aca89fe59e631d6a102977e8e3a6fe6f2599dddddcf7ca8eb043d2af50d23a43483cc23350d942cbbac52774571e57260820ea0448308858ed1fd45c5
diff --git a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r1.ebuild b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r1.ebuild
deleted file mode 100644
index 8df958e56038..000000000000
--- a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_PV=${PV%_p*}
-
-DESCRIPTION="HFS and HFS+ utils ported from OSX, supplies mkfs and fsck"
-HOMEPAGE="http://opendarwin.org"
-SRC_URI="http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-${MY_PV}.tar.gz
-		 mirror://gentoo/diskdev_cmds-${PV}.patch.bz2"
-LICENSE="APSL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE=""
-DEPEND="dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-PATCHES=(
-	"${WORKDIR}"/diskdev_cmds-${PV}.patch
-	"${FILESDIR}"/diskdev_cmds-respect-cflags.patch
-)
-
-src_compile() {
-	emake -f Makefile.lnx AR="$(tc-getAR)" CC="$(tc-getCC)"
-}
-
-src_install() {
-	into /
-	dosbin fsck_hfs.tproj/fsck_hfs
-	dosbin newfs_hfs.tproj/newfs_hfs
-	dosym /sbin/newfs_hfs /sbin/mkfs.hfs
-	dosym /sbin/newfs_hfs /sbin/mkfs.hfsplus
-	dosym /sbin/fsck_hfs /sbin/fsck.hfs
-	dosym /sbin/fsck_hfs /sbin/fsck.hfsplus
-	doman newfs_hfs.tproj/newfs_hfs.8
-	newman newfs_hfs.tproj/newfs_hfs.8 mkfs.hfs.8
-	newman newfs_hfs.tproj/newfs_hfs.8 mkfs.hfsplus.8
-	doman fsck_hfs.tproj/fsck_hfs.8
-	newman fsck_hfs.tproj/fsck_hfs.8 fsck.hfs.8
-	newman fsck_hfs.tproj/fsck_hfs.8 fsck.hfsplus.8
-}
diff --git a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r2.ebuild b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r2.ebuild
index b4a3180e1b42..7262c18fcab9 100644
--- a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r2.ebuild
+++ b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-${MY_PV}.
 		 mirror://gentoo/diskdev_cmds-${PV}.patch.bz2"
 LICENSE="APSL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE=""
 DEPEND="dev-libs/openssl"
 RDEPEND="${DEPEND}"
diff --git a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild
new file mode 100644
index 000000000000..99913550e705
--- /dev/null
+++ b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PV=${PV%_p*}
+
+DESCRIPTION="HFS and HFS+ utils ported from OSX, supplies mkfs and fsck"
+HOMEPAGE="http://opendarwin.org"
+SRC_URI="http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-${MY_PV}.tar.gz
+		 mirror://gentoo/diskdev_cmds-${PV}.patch.bz2"
+LICENSE="APSL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="libressl"
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=(
+	"${WORKDIR}"/diskdev_cmds-${PV}.patch
+	"${FILESDIR}"/${PN}-respect-cflags.patch
+	"${FILESDIR}"/${P}-AR.patch
+)
+
+src_compile() {
+	emake -f Makefile.lnx AR="$(tc-getAR)" CC="$(tc-getCC)"
+}
+
+src_install() {
+	into /
+	dosbin fsck_hfs.tproj/fsck_hfs
+	dosbin newfs_hfs.tproj/newfs_hfs
+	dosym newfs_hfs /sbin/mkfs.hfs
+	dosym newfs_hfs /sbin/mkfs.hfsplus
+	dosym fsck_hfs /sbin/fsck.hfs
+	dosym fsck_hfs /sbin/fsck.hfsplus
+	doman newfs_hfs.tproj/newfs_hfs.8
+	newman newfs_hfs.tproj/newfs_hfs.8 mkfs.hfs.8
+	newman newfs_hfs.tproj/newfs_hfs.8 mkfs.hfsplus.8
+	doman fsck_hfs.tproj/fsck_hfs.8
+	newman fsck_hfs.tproj/fsck_hfs.8 fsck.hfs.8
+	newman fsck_hfs.tproj/fsck_hfs.8 fsck.hfsplus.8
+}
diff --git a/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-AR.patch b/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-AR.patch
new file mode 100644
index 000000000000..d1b3c6129f26
--- /dev/null
+++ b/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-AR.patch
@@ -0,0 +1,11 @@
+--- a/fsck_hfs.tproj/dfalib/Makefile.lnx
++++ b/fsck_hfs.tproj/dfalib/Makefile.lnx
+@@ -9,7 +9,7 @@ CFILES = hfs_endian.c BlockCache.c\
+ OFILES = $(CFILES:.c=.o)
+ 
+ libdfa.a: $(OFILES)
+-	ar rc $@ $?
++	$(AR) rc $@ $?
+ 
+ clean:
+ 	$(RM) $(OFILES) libdfa.a
diff --git a/sys-fs/diskdev_cmds/metadata.xml b/sys-fs/diskdev_cmds/metadata.xml
index 2b0a4b9725c3..9ee7b49bec49 100644
--- a/sys-fs/diskdev_cmds/metadata.xml
+++ b/sys-fs/diskdev_cmds/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>ppc@gentoo.org</email>
-<name>Gentoo Linux PowerPC Development</name>
-</maintainer>
-<longdescription lang="en">
-HFS+ Filesytstem tools (mkfs.hfsplus and fsck.hfsplus), ported from Apple's
-versions.
-</longdescription>
+	<maintainer type="person">
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>ppc@gentoo.org</email>
+		<name>Gentoo Linux PowerPC Development</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-fs/hfsutils/Manifest b/sys-fs/hfsutils/Manifest
index d3d9f73a88e4..854fc2c9347a 100644
--- a/sys-fs/hfsutils/Manifest
+++ b/sys-fs/hfsutils/Manifest
@@ -1,9 +1,7 @@
 AUX hfsutils-3.2.6-errno.patch 223 BLAKE2B d6b42f5cb76fb57dc158bf9ae4ba43ad5518d1326048eb0e4cea7067ccd16925fd892a8a2df2d71a79f6042d4c33f3425f8be316b6f287c32b61278c588885e8 SHA512 0a6074d77690ac73513f7197b49c5309e6066104301aa53dd1c3d1b4b55abb542cef8a76f8c2f7b5aff47c1b3476446498cfe27e5763fe28bc08bba9e47dd8b1
 AUX hfsutils-3.2.6-fix-tcl-8.6.patch 158 BLAKE2B bb12d05629bede97e0d0eedcf42cbabd3d4e5c682253002b726db1d33a72f70f4cade4a2cbfbde810ac0481419c6a1561e4a3e29a81e0b0f48152e4b3b9830c1 SHA512 7b9cb4cb04fad7c092e2061568ba804f0c7035160c6213d3b069deefab8789d624e4b51b39c8bc77a2504279c641b72fad92ceff0a3e2049dad3c9b65e0163fa
 AUX largerthan2gb.patch 216 BLAKE2B d8f9edd367883df8ad1e88660f6f2e0d0d0654cfefe38da0b846ae136f141047b99c9251e9ef63e1fcb11bfc56f6ff739007a81d9cdf655e11270dfd7499db76 SHA512 f20e52f571995a0fc0b0e0a7b804717a1d501fbaecf80460cdbb69cbf2e956a2b8f33ec8c9fa637af2e857edc1d2565797d4a6f2c3ce2ace0359311ef8dc0882
-DIST hfsutils-3.2.6.tar.gz 207697 BLAKE2B 96c3d839e3c07e325e4e175a484b3c637d7cdebdc02ec11ee6810096162d155aa75d71a8e133b801b767a78d50115384460c4181359767f49e015524800885e8 SHA512 0db3050e5969c4e4e6c6ddb10cbc221a5837eb1e12f9331e7129511d31a4ec8d38420ed0b948dadc85ed990f3b1085e930eb7f0c37b3883866d963e47cbbb173
 DIST hfsutils_3.2.6-14.debian.tar.xz 6780 BLAKE2B 00474d328f5ec2614ec429052e6940b9eb10d04f433399f686ccc24d66ca1559e7ca45c4ab3ebe6386e02fc4de5ffd96242a7aa6f58d6032798d5536da912a61 SHA512 33d44f7b9094743031fc9315cf9380e158225ee2cd5af7a5ec7c55a2ae9af42e16f9cad3c667b153a1d3d9484d4ea773d34b88b78bfe9499df52a8b9d77defb2
 DIST hfsutils_3.2.6.orig.tar.gz 207697 BLAKE2B 96c3d839e3c07e325e4e175a484b3c637d7cdebdc02ec11ee6810096162d155aa75d71a8e133b801b767a78d50115384460c4181359767f49e015524800885e8 SHA512 0db3050e5969c4e4e6c6ddb10cbc221a5837eb1e12f9331e7129511d31a4ec8d38420ed0b948dadc85ed990f3b1085e930eb7f0c37b3883866d963e47cbbb173
-EBUILD hfsutils-3.2.6-r6.ebuild 1046 BLAKE2B b5d120855a6285b7cabb38b897eb942c9fd52241495a05fdeb04f7bed686e15581affa77c6fb2711865ee17342a9832f69e5ea2a2ffdf46d4963b36f58d697e4 SHA512 2cf1dbd3c3fe26e7e963b2f8530803033077236e6acd11628eba25997fdb50c50a7caf4c9abd7505b2e62b860fd146bbc853d148d18068ae0d22c9f846783283
-EBUILD hfsutils-3.2.6_p14.ebuild 1391 BLAKE2B d07394734bd278c859466965c8bad2344ac2326a61fa5576d5b6c02e59963a06e2cb92065d6cc5c90afa3809370d3933970c944254f7a6942f2802389a10bc06 SHA512 4e9165f8053907a6c4a348d37acf303e3d454daae2222cde6c9be7b9e0ea3d40983c74dff516619e9f8d63984d8d8fe66059521bc56d0b2c1ca58bbe1bf2a107
+EBUILD hfsutils-3.2.6_p14.ebuild 1386 BLAKE2B ea5b361576cc81de601b996c3138895ce1215a60befb1672bf40e93583e27b821c65a4d97e4449e6f36450b78cd7aae0fa8bd8e4cc39ee41d5aad0d007f6873b SHA512 72f6b34eeed6a85edab8e3ed2d5848c6e7bbbd1f539d39526d715b5b1b2d450dd3f302761f88fb2a97424f6cff88399c3edbba323517eb81b599c672a11b749b
 MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538
diff --git a/sys-fs/hfsutils/hfsutils-3.2.6-r6.ebuild b/sys-fs/hfsutils/hfsutils-3.2.6-r6.ebuild
deleted file mode 100644
index 23076395fd73..000000000000
--- a/sys-fs/hfsutils/hfsutils-3.2.6-r6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="HFS FS Access utils"
-HOMEPAGE="https://www.mars.org/home/rob/proj/hfs/"
-SRC_URI="ftp://ftp.mars.org/pub/hfs/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 sparc x86"
-IUSE="tcl tk"
-
-DEPEND="
-	tcl? ( dev-lang/tcl:0= )
-	tk? ( dev-lang/tk:0= )"
-RDEPEND="${DEPEND}"
-
-# use tk requires tcl - bug #150437
-REQUIRED_USE="tk? ( tcl )"
-PATCHES=(
-	"${FILESDIR}"/${P}-errno.patch
-	"${FILESDIR}"/largerthan2gb.patch
-	"${FILESDIR}"/${P}-fix-tcl-8.6.patch
-)
-
-src_configure() {
-	tc-export CC
-	econf $(use_with tcl) $(use_with tk)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR) rc" CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)"
-	emake CC="$(tc-getCC)" -C hfsck
-}
-
-src_install() {
-	dodir /usr/bin /usr/lib /usr/share/man/man1
-	emake \
-		prefix="${ED}"/usr \
-		MANDEST="${ED}"/usr/share/man \
-		infodir="${ED}"/usr/share/info \
-		install
-	dobin hfsck/hfsck
-	dodoc BLURB CHANGES README TODO doc/*.txt
-}
diff --git a/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild b/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild
index b25482a3b41e..7a5d15a78c71 100644
--- a/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild
+++ b/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 sparc x86"
 IUSE="tcl tk"
 
 DEPEND="
diff --git a/sys-fs/lsscsi/Manifest b/sys-fs/lsscsi/Manifest
index 357163d5fc1c..21ef92cc5936 100644
--- a/sys-fs/lsscsi/Manifest
+++ b/sys-fs/lsscsi/Manifest
@@ -3,5 +3,5 @@ DIST lsscsi-0.30.tgz 190598 BLAKE2B e22000c4c03fe31f40e6e95dbb6875fdf9266cb10310
 DIST lsscsi-0.31.tgz 191650 BLAKE2B 0bd9b72356cc8f9a7f83bf5bdebdc7d3093efa09b1c72e79b45f6e6dacedb6c80e085fce8ce734e298d03c959bc4428f7a4faeeaace3cdeaa3b2d6bfc4b547cc SHA512 e76a011b79657fb138e88d37ff38d83b6bbe2e28330fb621ca5972ba4ffb0131a5e67c8afeb0292c002eaf91e1b69c8f051d48849e5ed822e8705365092a53ba
 EBUILD lsscsi-0.29.ebuild 337 BLAKE2B c7ffcb121cbeea715b411ffd9c69067cb01a8dcfc094f4efc920f2fdf787796a99f3548f9cb5870953cc626788545e5d5bbe48b50bac46093a7eed65469a42c6 SHA512 4cb73df4080ec0725b6c6682c0cd51210a12abb697c7e3eb5e3a0157acd70620c014bcb421b81889d22d9d2ecac10069a59e0265ede06579f4ab02319d1cc0a7
 EBUILD lsscsi-0.30.ebuild 377 BLAKE2B aac0c30fcbd3b83940dab241e9bae9b62a8e31c36bbb293aa09997ed2a7d4483e1c73e89519c79ef2b546be0726ec24b8a29a9a8b5ad50028031cd5ddc55d4ef SHA512 d437e2da55502b0dbfc524c66409a3a90c255df0b92a27fb63d49059d1b5b9e9deec473e5abd0646be8e468f9ef2183e9b9cc10494c9e8ce08dfc810b25408df
-EBUILD lsscsi-0.31.ebuild 344 BLAKE2B 1b6cec00af27182c88304d46adef1ad8bbcd16d2a9f6d61c4f57bedf134a304044658e963e0a6811476fa9438df50cd093cc4f57fcad3def5fa1c79d6ee16301 SHA512 e1d1d0c77b94d4120a2b437f187edb3c9fe83becf7b86ad9db9a4faf9450f83c1b89d36d3d155f62c3b12733b049349e377db85412130909e1fbe64af7e59253
+EBUILD lsscsi-0.31.ebuild 338 BLAKE2B 5798633db2c7095997ca658078e1cab0b8f1300d3b947f8e70761f7af765a2c68cfc54959c753ab2a3fd52cb888d3f86151851a9dcc881c8349dabb9c4e8b0e2 SHA512 a6753644f0244f0ba6a49215aa38364383aed93646155de5e84fa3348a7252587ddb79e7c5183e8062776c8044c6d26d0714904d5cd31ea838d26277bfa5df7a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/lsscsi/lsscsi-0.31.ebuild b/sys-fs/lsscsi/lsscsi-0.31.ebuild
index 95141f037da6..53056ca18693 100644
--- a/sys-fs/lsscsi/lsscsi-0.31.ebuild
+++ b/sys-fs/lsscsi/lsscsi-0.31.ebuild
@@ -9,4 +9,4 @@ SRC_URI="http://sg.danny.cz/scsi/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index bada3d9ef94a..292378eef3c9 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,11 +1,8 @@
 AUX lxcfs-4.0.0.confd 221 BLAKE2B 18924acc45506885e0f1795ffd4dd666d341abc2957c22a241909004ea988f1464b817939b450741bc77e413fb37d2e2dcd8f85405ab69f27d475567f48df2db SHA512 ebccfce0f865c8dbc1cff67712be4ac625b91ccc42aa78971c6619cf32553abe15ae82c6b3f320600cf3605f8b8c7ccbbcac3a399c6ae8261a08ea2793992e58
 AUX lxcfs-4.0.0.initd 533 BLAKE2B c4dee71fbbe477c46cf2d661f335a43517158c3c2061decfdf327a24cb1360dd08184d8cdc3936db26b6a50c47748f146414a1ae1ab61f963a9c7740c0ec3919 SHA512 755356e2a4f1e92803d8864c4edc223c183c81592562d6492d4b374174d4e5ca2d30fcdeb9861c46df795e6373ecf5f14c089c7ad22465d02516748c2c18aed7
-AUX lxcfs-fusermount-path.patch 489 BLAKE2B 3b9aa2d1202dd6b306be6b7820315214fe3b1cb07255a5723c92edf553536f3afb18849551a52a999941d7aeae90e2956e66d18d93d00fce20527a84e8d8e79e SHA512 560f06e7a996c4a2805b5a2c37d652631ad96e1f963f18fc73b72ee535ec333f7ad56a1a92806922dd673ffa512bab2b2c70c4b403b67dc2be02f2293b1221f6
-AUX lxcfs.initd 536 BLAKE2B cc8906ec07679c2aafcfc92e038e0442622ade31a9e7b3745426cfce8e42db3f1c277d84802368f53f656fffdadca747a742b8874e5edb2724dfc74d6e97a628 SHA512 196e59cfc4b8fc06975ed24a38b710916b88a18477a0e6c7f63ff3ee8d9fb395d728bbcbf59c9dc97452262f6e2d74f3b2e6ef205bead907d989cd22bacb74ff
-DIST lxcfs-3.0.3.tar.gz 49824 BLAKE2B 02e3a0a6f4fd515924c5f038f00d664ef347c9b685e6561334b460e0ce0ce5580aca67f33df56b44b9cdafa4953f4f92843662f3516e1c923f9242388b17dbc6 SHA512 d994e1dd85f499eba2847d33870281a4bcaf4466e2c8f7acb065f4f3d5688b93b775c486bc6db571e64d09a3567710b0c816e12555ffb3e3e50f81bc7f5f6be6
+AUX lxcfs.service 350 BLAKE2B 654b9053265ac16b28e0e5d04e0278070e8f6f2bc08be55f6a896c372f1b6c98c8872a0386c0dc71dee0a3afcf7cb3a7f5049d8f5a192dda983d7273eb2bdacf SHA512 3c8f44bdc2f9e5e23fa0a44b77ce3cb0cd5fd90fea6e82a46e7bac77d22a1d52a66c3d052ca9ea7319d1debe1a1808e01a34adb79fa4fd9f1024ab60139afc6c
 DIST lxcfs-4.0.3.tar.gz 100719 BLAKE2B 24371b921ad635f97c51ac8406c949e81330ae358b0166c2af295cb1f630594bb72da802aad41971c11303f393fd05bc9f1b109bd4da4953db2c3bb7e5189315 SHA512 0aaedfe826d982b9464dfb60fb57c58e34ea6022b8503bc858538b6634dc7d0845f65832d6f814043dbc0677f887e1b559549a8f3865c755970c6b47ba65eb2b
 DIST lxcfs-4.0.4.tar.gz 101546 BLAKE2B 1e84e3b75bfb39273539ea72f941442cc3c8574c0f55359a38edc04a98a45ea8680f9bf49c5974decf180a8ecf07cadccf4e732d1743c070a740c78b773a3ee8 SHA512 15bcebecc815310870aea58d995d605444b57583b7f1bb2d35b065256ea5f70b071d58887fbf1ca124ea84da99151bbd9dffcca37a2e151677d56229dc8961ce
-EBUILD lxcfs-3.0.3.ebuild 1735 BLAKE2B 51a331b3697b9e74a99de4bfaf1ba57aade89740d353fd0c2587bcb68d3a3a6089f161bc4c41a0f0f175364df9e4f0c829e9237d50460b85b7f3bd8342baf6f9 SHA512 e5bd8924ad6da0650f960ff18ef21f8607eee17e35198a3079a4758cceec5d971089b7118ee25a97a5374a7c9a7a26a4ef34ec3762ab161920d3bda7d5a53e83
-EBUILD lxcfs-4.0.3.ebuild 1249 BLAKE2B 497af2aa819e8142f41e5fca44c39d350428bdcd8fc16a1fceeaee6d182638c916900cdb240820141b682a9e9917dfeaf4260d227c0cd43db84561a5c07d6be6 SHA512 b65b38d4b7a096aad27004796328ee3d415fc1a4cf5264e66cb00e20fc4d2944dc5045ce4e54e29c9af43f29b779a8595eb918e294144cbac74b7577ef4bfde9
-EBUILD lxcfs-4.0.4.ebuild 1009 BLAKE2B 95defa67ff77de7b20821dff0c4901bc6700b97426c401099b77ab5b8f7ca7c9429cb85bbe74e13379d60072e84185b8913ec5a1b1f2d7281fe7686c8ce3259d SHA512 f0b42933e626a47c0ca3fae78407d1283c860c9e5be5366b3a8f0d9c01376ecf8a3a9542560eae22650cf87b22a5d61a9970684391f7f1e1b0cddbfefc525d0f
+EBUILD lxcfs-4.0.3.ebuild 1248 BLAKE2B 0e37ad8f8b904f2fa2aead5fc24e316bd8d9f0b9a67c8db8f2351750f8308a7688bc4e78d662a533d16aa58b871fccfd21b33624e295a36de4fd32e1277ab8de SHA512 ea98650d13885fe5d5217ea2486c4042636377e862b71509a5de74ca028a27c7fe89c05ba663397164bea8bbd1ab845a97cfd910327b61e11879ccce2102cdd2
+EBUILD lxcfs-4.0.4-r1.ebuild 1110 BLAKE2B cfbafcae2d47f5cacc066dccec779d526ed086e4d44f6e57652266bf73bda2ebe96013f42149c3ae40cdfebbc5e04877c8730ea490c911be01a843cb61c2ff81 SHA512 19bece2da21669ad24e74749152ef5ec6a1e8f570ea728d92e1b672151373a5194e14dcd2e8796727659032f4174eb2cde0e22237f8957dd475ee660b40d19e0
 MISC metadata.xml 808 BLAKE2B b8b8be1a8fd8a1a9614dbfeddd97cd322bcf0ed4d11a97bc6680bde28faa0bdaabbf8b5a92242e0da09845f6a08280dd0d6681e3932a7319117c186f167bf6fd SHA512 dfb81661c2feb5abb3397c93eabf26c12af51099f6676d8fec346c83ca3edea788745e4a59ea05035b16b1baf21edd16d9537f66fbd10d0c8da8a7933b35c528
diff --git a/sys-fs/lxcfs/files/lxcfs-fusermount-path.patch b/sys-fs/lxcfs/files/lxcfs-fusermount-path.patch
deleted file mode 100644
index 99a5addf1d10..000000000000
--- a/sys-fs/lxcfs/files/lxcfs-fusermount-path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- /config/init/systemd/lxcfs.service.orig	2018-10-13 17:24:46.534035126 -0500
-+++ /config/init/systemd/lxcfs.service	2018-10-13 17:25:33.007034294 -0500
-@@ -5,10 +5,10 @@
- Documentation=man:lxcfs(1)
- 
- [Service]
--ExecStart=/usr/bin/lxcfs /var/lib/lxcfs/
-+ExecStart=/usr/bin/lxcfs -o allow_other,nonempty /var/lib/lxcfs/
- KillMode=process
- Restart=on-failure
--ExecStopPost=-/bin/fusermount -u /var/lib/lxcfs
-+ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs
- Delegate=yes
- 
- [Install]
diff --git a/sys-fs/lxcfs/files/lxcfs.initd b/sys-fs/lxcfs/files/lxcfs.initd
deleted file mode 100644
index 5997426fa8e8..000000000000
--- a/sys-fs/lxcfs/files/lxcfs.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON=/usr/bin/lxcfs
-PIDFILE=/run/lxcfs.pid
-
-start() {
-    ebegin "Starting lxcfs"
-
-    start-stop-daemon --start \
-		      --pidfile ${PIDFILE} \
-		      --exec ${DAEMON} \
-		      --background \
-		      --make-pidfile \
-		      -- \
-		      -o allow_other,nonempty /var/lib/lxcfs
-
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping lxcfs"
-    start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
-    eend $?
-}
diff --git a/sys-fs/lxcfs/files/lxcfs.service b/sys-fs/lxcfs/files/lxcfs.service
new file mode 100644
index 000000000000..aea0d6d920fc
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=FUSE filesystem for LXC
+ConditionVirtualization=!container
+Before=lxc.service
+Documentation=man:lxcfs(1)
+
+[Service]
+ExecStart=/usr/bin/lxcfs /var/lib/lxcfs
+KillMode=process
+Restart=on-failure
+ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs
+Delegate=yes
+ExecReload=/bin/kill -USR1 $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-fs/lxcfs/lxcfs-3.0.3.ebuild b/sys-fs/lxcfs/lxcfs-3.0.3.ebuild
deleted file mode 100644
index f9c354a881a3..000000000000
--- a/sys-fs/lxcfs/lxcfs-3.0.3.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
-
-inherit systemd vcs-snapshot
-DESCRIPTION="FUSE filesystem for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
-	KEYWORDS="amd64"
-fi
-
-# Omit all dbus.  Upstream appears to require it because systemd, but
-# lxcfs makes no direct use of dbus.
-RDEPEND="
-	dev-libs/glib:2
-	sys-fs/fuse:0
-"
-DEPEND="
-	sys-apps/help2man
-	${RDEPEND}
-"
-PATCHES="${FILESDIR}/${PN}-fusermount-path.patch"
-
-src_prepare() {
-	default
-	./bootstrap.sh || die "Failed to bootstrap configure files"
-}
-
-src_configure() {
-	# Without the localstatedir the filesystem isn't mounted correctly
-	econf --localstatedir=/var
-}
-
-# Test suite fails for me
-# src_test() {
-# 	emake tests
-# 	tests/main.sh || die "Tests failed"
-# }
-
-src_install() {
-	default
-	keepdir /var/lib/lxcfs
-	newinitd "${FILESDIR}"/${PN}.initd lxcfs
-	systemd_dounit config/init/systemd/lxcfs.service
-}
-
-pkg_preinst() {
-	# In an upgrade situation merging /var/lib/lxcfs (an empty dir)
-	# fails because that is a live mountpoint when the service is
-	# running.  It's unnecessary anyway so skip the action.
-	[[ -d ${ROOT}/var/lib/lxcfs ]] && rm -rf ${D}/var
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Starting with version 3.0.0 the cgfs PAM module has moved, and"
-	einfo "will eventually be available in app-emulation/lxc.  See:"
-	einfo "https://brauner.github.io/2018/02/28/lxc-includes-cgroup-pam-module.html"
-	einfo "for more information."
-	einfo
-}
diff --git a/sys-fs/lxcfs/lxcfs-4.0.3.ebuild b/sys-fs/lxcfs/lxcfs-4.0.3.ebuild
index 8d4d3457c618..de32fe294cb3 100644
--- a/sys-fs/lxcfs/lxcfs-4.0.3.ebuild
+++ b/sys-fs/lxcfs/lxcfs-4.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 # Omit all dbus.  Upstream appears to require it because systemd, but
 # lxcfs makes no direct use of dbus.
diff --git a/sys-fs/lxcfs/lxcfs-4.0.4-r1.ebuild b/sys-fs/lxcfs/lxcfs-4.0.4-r1.ebuild
new file mode 100644
index 000000000000..583ac4fcfa62
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-4.0.4-r1.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 systemd
+
+DESCRIPTION="FUSE filesystem for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/"
+SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/glib:2
+	sys-fs/fuse:0"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-apps/help2man"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Without the localstatedir the filesystem isn't mounted correctly
+	# Without with-distro ./configure will fail when cross-compiling
+	econf --localstatedir=/var --with-distro=gentoo
+}
+
+src_test() {
+	cd tests/ || die
+	emake tests
+	./main.sh || die "Tests failed"
+}
+
+src_install() {
+	default
+
+	newconfd "${FILESDIR}"/lxcfs-4.0.0.confd lxcfs
+	newinitd "${FILESDIR}"/lxcfs-4.0.0.initd lxcfs
+
+	# Provide our own service file (copy of upstream) due to paths being different from upstream, 
+	# 728470
+	systemd_dounit "${FILESDIR}"/lxcfs.service
+}
diff --git a/sys-fs/lxcfs/lxcfs-4.0.4.ebuild b/sys-fs/lxcfs/lxcfs-4.0.4.ebuild
deleted file mode 100644
index f1d2fdcd767f..000000000000
--- a/sys-fs/lxcfs/lxcfs-4.0.4.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
-
-inherit autotools systemd
-
-DESCRIPTION="FUSE filesystem for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/"
-SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-libs/glib:2
-	sys-fs/fuse:0"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-apps/help2man"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Without the localstatedir the filesystem isn't mounted correctly
-	# Without with-distro ./configure will fail when cross-compiling
-	econf --localstatedir=/var --with-distro=gentoo
-}
-
-src_test() {
-	cd tests/ || die
-	emake tests
-	./main.sh || die "Tests failed"
-}
-
-src_install() {
-	default
-
-	newconfd "${FILESDIR}"/lxcfs-4.0.0.confd lxcfs
-	newinitd "${FILESDIR}"/lxcfs-4.0.0.initd lxcfs
-	systemd_dounit config/init/systemd/lxcfs.service
-}
diff --git a/sys-fs/ntfs3g/Manifest b/sys-fs/ntfs3g/Manifest
index d6f3b536f20e..1ea3a5d0adee 100644
--- a/sys-fs/ntfs3g/Manifest
+++ b/sys-fs/ntfs3g/Manifest
@@ -1,6 +1,5 @@
 AUX CVE-2019-9755.patch 2111 BLAKE2B 5655cbef5789dc0de3f461f97f41e3c1d87fd64047a80ae5e2b848920afeff6fb464cec70c73ab367bb28bf77e7e73bf699f2fe9f491f380194abf058e96ba3c SHA512 2b08f609cca17740e610dd90f39c6187f5c92f74e66458df784da0fbff8490294ee5a942cb403f101fa446310f43af9d5ad451a7939e0dc84347d07912967f9f
 AUX ntfs3g-2014.2.15-no-split-usr.patch 1322 BLAKE2B efc71e28913d649484c1cf0d51dc34d8515cfba484a6a36a7cf158b142346255d403457ce0418148bbaa9e3e6e2cd494a509aa0c205ae944609844f4b9a04bc1 SHA512 232a1a7b84339c86758365564fce2058c3e652f833c6908245aa5f6f0e91d5c09cedcb978a1ebe62897c7288df4fe8671ba7085af403056742d897181e479e05
-AUX ntfs3g-2016.2.22-CVE-2017-0358.patch 1169 BLAKE2B 47ee2ae7724f77d6c50e4eb816a4558fc296990c2f65e56d40f71db642e75e2bb35aeb2d6880e3faf21f61d9c51619de003903dba93cb742170bf4df56d6e744 SHA512 223f7b4fcd962d3c2499787f9a32c09f35705de98d3d1c96677cea18c67f77f5a086b7839892cb25b62c9145b2543c02d5abca89a82cda2345d5f993d6a60131
 AUX ntfs3g-2016.2.22-sysmacros.patch 911 BLAKE2B a53765dc5cd4ae8320584167fbf202b50827e07f4599ab8572d434cc61110bb190854b24e567b210843002b74245e5a7f271ea4548cc52a0d3d893eb622702b2 SHA512 34768ef1ebf42b125cdc4d86937042f21b7146c4c76c1ed37e66e59a4bfaa863b54f7dbcca14a9d842782113e6ac70b2a96e62022dc2c8f717ec43c9985bf79f
 AUX ntfs3g-2017.3.23-big-sectors.patch 11378 BLAKE2B 47e47a6c1370af864aa7e700e56c8db1c190ae80bd3ed1ceeeb6952a143c2c7d640580d3586a088c7307893f3509884401cf2b7c4395ce8e536246ae3ae923e5 SHA512 e23b1e3eeeb3397e42c1a09afe8b261d5193df3fd521434b64aad80fe0c6fbbf78199b92659cbd76b6c802d77e708a81e86f1d2d97b464a5c854ef821ac722a1
 AUX ntfs3g-2017.3.23-check-mftmirr.patch 554 BLAKE2B 9c7ab2b705df38089dc0413b8132ea08ccfec34001470dfc8fb926ccdaddece6f7047cef29a9073a59f7a63da8f86e01dde9f8c9e482ae932a1dd860b940bffd SHA512 b6b4eb4c6c71b944a8a30b5da69fed97eec3b3e404c180f2c3434c402d3cf5b68aa7a4deaf74b74c11230c02ffd0ce41c96fa49f9874a0105e3219821431647f
diff --git a/sys-fs/ntfs3g/files/ntfs3g-2016.2.22-CVE-2017-0358.patch b/sys-fs/ntfs3g/files/ntfs3g-2016.2.22-CVE-2017-0358.patch
deleted file mode 100644
index 1ce7e9cdae32..000000000000
--- a/sys-fs/ntfs3g/files/ntfs3g-2016.2.22-CVE-2017-0358.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/src/lowntfs-3g.c b/src/lowntfs-3g.c
-index 0bb38f97..c6d1dad3 100644
---- a/src/lowntfs-3g.c
-+++ b/src/lowntfs-3g.c
-@@ -3827,13 +3827,14 @@ static fuse_fstype load_fuse_module(void)
- 	struct stat st;
- 	pid_t pid;
- 	const char *cmd = "/sbin/modprobe";
-+	char *env = (char*)NULL;
- 	struct timespec req = { 0, 100000000 };   /* 100 msec */
- 	fuse_fstype fstype;
-         
- 	if (!stat(cmd, &st) && !geteuid()) {
- 		pid = fork();
- 		if (!pid) {
--			execl(cmd, cmd, "fuse", NULL);
-+			execle(cmd, cmd, "fuse", NULL, &env);
- 			_exit(1);
- 		} else if (pid != -1)
- 			waitpid(pid, NULL, 0);
-diff --git a/src/ntfs-3g.c b/src/ntfs-3g.c
-index 268b0569..945fc0be 100644
---- a/src/ntfs-3g.c
-+++ b/src/ntfs-3g.c
-@@ -3612,13 +3612,14 @@ static fuse_fstype load_fuse_module(void)
- 	struct stat st;
- 	pid_t pid;
- 	const char *cmd = "/sbin/modprobe";
-+	char *env = (char*)NULL;
- 	struct timespec req = { 0, 100000000 };   /* 100 msec */
- 	fuse_fstype fstype;
- 	
- 	if (!stat(cmd, &st) && !geteuid()) {
- 		pid = fork();
- 		if (!pid) {
--			execl(cmd, cmd, "fuse", NULL);
-+			execle(cmd, cmd, "fuse", NULL, &env);
- 			_exit(1);
- 		} else if (pid != -1)
- 			waitpid(pid, NULL, 0);
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 050c4fdb70a4..88c4ea492344 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index f2ce0a6bd38d..12e29df61baf 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -1,12 +1,12 @@
 AUX ck-5.4-revert-version.patch 618 BLAKE2B 858c11a813ce6fe3f7f35d134c0fbef62f1ee8f5b3d6938e011b5d61bdaf772c6fb4d018565d065ace18b1b988f02856783a94e27656417a8d362625cfcd1ff3 SHA512 c5266fae5e010135d98c7352dc9f9824dc7b2c1c72ea83fbf6e7cb1cba62609f42458e904ed62f9e2f48edc5c93f977ba3507f77f03dd9a7f39100485a74be15
-DIST genpatches-5.4-31.base.tar.xz 1170496 BLAKE2B 1a85a54d6183ee4c1239c2d96c78617497e1e882e9b5ed386904b965314900c298e4d58cd3c360cdf465c9bb0adea90c4de567eca5e633c7861e7305eece2559 SHA512 171e9550c898e60df630ce85346847325e78ccd2ae979a03581d236643fbc3ae2e10dda0f781a01675cbc5b2defddaa05aba020e044f61143794426f5f02e8a7
-DIST genpatches-5.4-31.experimental.tar.xz 6140 BLAKE2B a4007afb78f09a0fe22a1a401f92666860457ff0e042b71ccfe5b58ced2e9505e414bb83f62c1e631733c2dd7ff981f34c6af176adfcf8afc912d8c7ccf0d735 SHA512 3ed0bbf0603db370f0ba536698a7843184c243e5c737dd8c824fd3681b3c7f015e5cca1e8464b937f4167479bc687c195fcf422469af86a8a783d40d66e4fca9
-DIST genpatches-5.4-31.extras.tar.xz 1744 BLAKE2B 184c9fce2b55885ee086dbeff4fb55a1d2edfeaa55e30e0e7d672e120569acd85a74bd6f50463305b3dde2154ba68c1fad82b0eb8e66a32a6f2cc87443b397dc SHA512 a45f13e1ac2ed3f6114b94793085b7b80cd40a9be08cf835c574a98e0be7cabb8740b0b22d81a471d9c5b80603f23822513a24620fcc7854dcd9de443355ccb4
 DIST genpatches-5.4-37.base.tar.xz 1364268 BLAKE2B b21de895d8b1f71c7ccc1f1d88c32cca1e9aa4e878ba410ad8f72424e540eccfc6d75274d4e8736aa54c4891c4bfb2d0439c473e073d9f26b1233fa95145fcfe SHA512 27af65a7fb661959987f885a2d4e8b471bda14d8ba40f8323c90fa04d42c5ec4d20df8095cc8a42ba386ed48fc2014185d61eff96ee892bbe64a41ee08cf2800
 DIST genpatches-5.4-37.experimental.tar.xz 6144 BLAKE2B 4b78072577abe58bd48dfe42961bc91859ebcec708254f0d5e9b1441be2b1d90bd151ff5f2b9f9f7cd088857d2882bbb8ff689caf89dbbcb6d35a169f3a48dc8 SHA512 fad854c58e677af6a9ac4c508cff9047555959a351e976eca1c7e0b104e549b773e4c91544c24a1a667d9a32e81dbd0835f70203d938898b0c1cb108208c5131
 DIST genpatches-5.4-37.extras.tar.xz 1756 BLAKE2B 8b5bf7880cd8c8e45aee0be7d29fb52e169ea53156830df60b71ea3cb0dcd0f9d9c56bde3ee275205af482b93330d6d1247841c08c2483e1266e9929ccfdd18d SHA512 6d7d202b6c3cc7f5f99d4c66834e0108b965d40cd052224b8345c8d290c5872b2ef78df93c1c0d2b9ca6d759d10099f3df70197d8441f8f0d9cdcc04fd125700
+DIST genpatches-5.4-48.base.tar.xz 1620972 BLAKE2B 45f358c85092ba422f8c411e91da90ccfc4b607f9c095dbe9ff02bc6adfbab4b35b03763316999810364d18ed3323fa613b70117e6f8454b2ba74744c1266b0e SHA512 b99974f5491b6103bb3e6b3b97e613322001bec40e49a4edc53893e94df66b7cc03370ca28af62d21dda995a477e395c16c22b8595ac96723ae66f2747fc9df4
+DIST genpatches-5.4-48.experimental.tar.xz 6144 BLAKE2B 33e0e921370e8224026984f721ddf952ae05980c405b4e7de930ac76e25097f4fbecd13a1ca4fbdd73afa6c68c8dd32dd7e6938212c79daf52f705289b91809a SHA512 c12c332f115843369010cb049872ec8c190e001abf537bc793c9a120a5dd8ec773fe971b749d95f96c590b659fac22e2a7f9b2b1e55093c4d0d542c6486b2536
+DIST genpatches-5.4-48.extras.tar.xz 1768 BLAKE2B 3f281c1c36c2a52e4fe2419592377baf4553c5fc61088911e50a901f96a1f4d89dc3e1b441b4b02575fca77ef6c371ccbecf8c55ff2eb9fbe14a7047451ae873 SHA512 9d2dbd829c53a310549811c2f133b19e4525c103827c5c5935cbd09d790eec105957dcbaee10cbe6409e0b7e00065c91b29a52e6d2bbf8e41859f5e4987de98a
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST patch-5.4-ck1.xz 104668 BLAKE2B 8faff0d2b95eda0b96e8042367634c45c1e823238e99793daeda5614efdc448dfe28172bf13f0d988cf4d5cbb4892089893e0183cd8825de7f54942283f2b5a0 SHA512 a2ea79df39b79dfc2d1c7a6acf745dfe4d5c9f4da1c54b9a5d9ff6227d0d0715cd372b7f448454976c1c6a8eb171bc248d004ee55931521ef74d5b7be8f14c6a
-EBUILD ck-sources-5.4.31.ebuild 903 BLAKE2B 8caeec3c2771a11cd4a7870e144a66a2a40dd790b61d2751656895d2fe3c1503a5cdabe82a003e9401736ffaaddafd22b7452f3a616f903afc2bd518f4161131 SHA512 c90a11df3c83eb06cffb76a77623e305fe55918d25e6c7013d0ce50467d461c3bc8414c4b6b953f69e26e6b5dcf7672fae9763aadb822cff99d78a169625b19f
 EBUILD ck-sources-5.4.37.ebuild 903 BLAKE2B 5f066671e12104c8e4313265d3a7e88e73b7d058859e0b6e4ab603a6f760a1f40e614e068e3ea9c9087d8e510270fd4b9c338ab1cec00d9d5117574aa0293063 SHA512 53e0e003d33e91c7a8f427ec1936ff92526391afc5512ccf4782a87c9aaea553b625d9cc7eec6316bb5bf31e74e288a737d864988af7035f7de4f675848e604e
+EBUILD ck-sources-5.4.48.ebuild 903 BLAKE2B 5246522d276fed096d15a77b6a187a956e0369b259954a07b82226f5807ec9c32d8699cf059076450290ba0f57f837f930e10ea50695949a6da1155ac759c119 SHA512 4f4e6764918b59268ff6088666178ce1d8b11bb07db4f7e5f9d8fd536bed739ed50d057490e26e866e1ba67507364d8dd927726050de8802f6e647dab58ae369
 MISC metadata.xml 568 BLAKE2B 28caa2e904a98a40a09a2444dcb56746a12b788e7606ce6d2d242d0edda6bd3200969aec7f6e2a18c549f91f658a364415fb465c91e9e08518d755294efbcad9 SHA512 01187500c2d375f4f02ba975470e725c934bc805e11084e09d100e8426e6fe447907247db156fd73dd7ef446636f40765853308971d592100bc9a0bd3f5b7e66
diff --git a/sys-kernel/ck-sources/ck-sources-5.4.31.ebuild b/sys-kernel/ck-sources/ck-sources-5.4.31.ebuild
deleted file mode 100644
index aa18d2a62676..000000000000
--- a/sys-kernel/ck-sources/ck-sources-5.4.31.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"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="31"
-K_SECURITY_UNSUPPORTED="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://kernel.kolivas.org/"
-IUSE="experimental"
-
-DESCRIPTION="Gentoo's genpatches for Linux ${K_BRANCH_ID}, with Con Kolivas' MuQSS process scheduler."
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-
-CK_EXTRAVERSION="ck1"
-CK_URI="http://ck.kolivas.org/patches/5.0/${K_BRANCH_ID}/${K_BRANCH_ID}-${CK_EXTRAVERSION}/patch-${K_BRANCH_ID}-${CK_EXTRAVERSION}.xz"
-
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/patch-${K_BRANCH_ID}-${CK_EXTRAVERSION}.xz
-	"${FILESDIR}"/ck-5.4-revert-version.patch"
-UNIPATCH_STRICTORDER="yes"
diff --git a/sys-kernel/ck-sources/ck-sources-5.4.48.ebuild b/sys-kernel/ck-sources/ck-sources-5.4.48.ebuild
new file mode 100644
index 000000000000..8b4eeeada3f1
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-5.4.48.ebuild
@@ -0,0 +1,30 @@
+# 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="48"
+K_SECURITY_UNSUPPORTED="1"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
+	http://kernel.kolivas.org/"
+IUSE="experimental"
+
+DESCRIPTION="Gentoo's genpatches for Linux ${K_BRANCH_ID}, with Con Kolivas' MuQSS process scheduler."
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+CK_EXTRAVERSION="ck1"
+CK_URI="http://ck.kolivas.org/patches/5.0/${K_BRANCH_ID}/${K_BRANCH_ID}-${CK_EXTRAVERSION}/patch-${K_BRANCH_ID}-${CK_EXTRAVERSION}.xz"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/patch-${K_BRANCH_ID}-${CK_EXTRAVERSION}.xz
+	"${FILESDIR}"/ck-5.4-revert-version.patch"
+UNIPATCH_STRICTORDER="yes"
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 9595968d0d29..f974cf5d04be 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -1,36 +1,28 @@
-AUX genkernel-4.0.7-fix-unquoted-SANDBOX_ON-check.patch 994 BLAKE2B fd4267d4a92b30ce666369796ce99dc53c19b4dd287043f0f4b13e9427eeba3904d231c60a4eb70650bed35a384a515cea126ac992e21ac730b0ee937705a7b2 SHA512 2f4a62f5f8e98ec577465df41253a6428ae63aaa7817c6431470126d89272a45dcc74ff0d61866bbcca3bae993079f7a58df6ed235bb188ff37c817a9093cb32
 AUX genkernel-4.bash 2479 BLAKE2B e5504698ab49bb62623fcdfdd4a54b19ee6d88f96a682f08dc282e46ec26bd22d9c54bcdc9b2bdcc6a96295de1ab96351d35b304eb176f5d177c221cd8d82180 SHA512 6a5709a410c5c07b7a343ecc141aa72de73d3b4acd0a69c05c61c801835a59dd17d9a528f6b68f12ac00ff4b6e5954b03237472501383aa390eb1365dd69c281
 AUX genkernel.bash 2438 BLAKE2B 31f1eaa826ab12bba07a2dc45b3394e14ceba9bc98b3f0ce609ca48a9306f2aec507787d457abdee18f4a83ea868de787cc6f9bd085298c396ecab6da14df9c3 SHA512 2bfe23606f919577bb2d174ffe18cd00fbb4ce642fb8860b319e059745d46ff8459b99374159f78af9f3aebb0a352a74ccd74c3be581980f5e298293b96e983d
 AUX initramfs.mounts 816 BLAKE2B 4f36e51fef78435369d43647db853c7bfde217cc93002fc010900692f67171512366e6599f08c5f2093490713aa7715e903b7e06528e3f2c6d8468f506938ed5 SHA512 97e5f92d135cff3911a68c7f1afd0f781ec1c1b794cdc824d74f8c119104ecb40bd7180be8414dc72f3a5a811143d6b4bf443ac1d3ff7a71b1e88cbf7c179665
 DIST LVM2.2.02.173.tgz 2363504 BLAKE2B a516bc9b68b7b7529f4436d8849ca741eb3ca1b5ac2eb2fb2915507935bdd28b5e234e74c1bce827e5761f57b5936510d08107e0dc1c320190f952c706f128d3 SHA512 c2ea8beafe006abf9282f51ec98600fd0ebff816d53c10ecbb19bbf336ada4825135cf9c92ccd364afb18f8b1d7e163eff5bdec8dfdd70dfb9ba45db2f6bdd5e
 DIST LVM2.2.02.187.tgz 2405544 BLAKE2B be804be3c64927a8848e8ea8de228fb563b6f8c22628b785aabb33fc993629e5370788216bd814246aeb3a5546fd5446383ce24342e716579887556edf2bbed2 SHA512 3ce56f0c0d2e7dbcdae5be263199f73ee5c4c052599d53cde9b16500a326d0340893344f4671839be06b5b4225d592175d01c9974db14f2dc220d6e9a1d47e91
-DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6
 DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca97531baa8355f488be0987b9426289dd85d6ce25b7eb03ccd690109f05ba56252a95bca50505ad9cd66f4e0e234e8 SHA512 86c296511c0766145097625a62bf099c3d155284d250ad6e528e788bc90b2945838498dfe473c6c6c78d1694b6fba8e19f7dee0d064a043841e6231603fff668
 DIST btrfs-progs-v5.6.1.tar.xz 2117064 BLAKE2B 9183300e7c086cb8f03ac14139d3d2a424461f4c5afc0e7b9bb588f4c0ddd2c41d7cefe91787b1cabe6397f8abeb6e958900e7742a80d3519382e98c3b197c9d SHA512 8f523249a5c2bfe1c0d52b0dc5d31d52b330b1c616d3ec423fa1fb4a845441bfeaa32abbe42a444a4fc84016a482c8102a3eb451ac423b542e332e9c26e76dc6
-DIST btrfs-progs-v5.6.tar.xz 2114336 BLAKE2B 24c0a2ae17bdfa7075c026427ddc3945533a8a3f2608f339b5560e91b71b23d754e2c9ae7d847b21bb73ce0894cf21ccef441fbfb28cfe40a9ce316664102f57 SHA512 4eb39da2a583fc2dfa2f5f161a44c1f107dc6ad1e789a8746cb89eecdd288718e279041bebcb85473da4780eecb8e4c297d2b0163262a941cf88b99c07951cc4
 DIST busybox-1.27.2.tar.bz2 2216527 BLAKE2B 77b8fa325b9ba691c0ac944537efdf5d87011b1a87c1c244588136f78055be9f2a71c77eea5edf1d20cfe50e59b15527511b14160930c946ed4e82c9608cb991 SHA512 d99e86b652562ebe1a5d50e1ba3877a1d1612997c17cb8d8e4212da181211a9b741a881cb051f14cb3ee8aea40226cf2cde80a076baed265d3bc0a4e96a5031c
 DIST busybox-1.31.1.tar.bz2 2430221 BLAKE2B 95c2345bc715eb7a1f08816a40add9b7a6176ef509a84069343ec2caddec58d8d57a07676ca2b03c209734169321433e27ba963b4c8b98dbfda4e409dcc347b4 SHA512 0d1197c25d963d7f95ef21e08c06c0d6124ac7b59c99989e891f744ffee4878a3b1fe44a247241a9da39fa5de0ba87f1b6d862401b591f277e66e89c02764bbf
 DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
-DIST cryptsetup-2.3.1.tar.xz 11041592 BLAKE2B acf3bb17503575b5d7edb58d0ab13989a2bc70ec96583dfc057b8258fd98a39a088411a9e0175d51d816b9164e5ec193710f1ada92427b1e6c6a53c5b8a6b9ea SHA512 e6ee77d72eda0b990db894d794a686f22043161b17b5f5c8cd54a64c5751f884a241c76b03bbccd52f74440c609036d50ed8503584bc3a0a011e4854a60dd4bf
 DIST cryptsetup-2.3.3.tar.xz 11104768 BLAKE2B 54aa6f087c5366e843c1f9b649fd77ec8be8c4e65c783a2a84a036b4ef460c9d070bdd8aff72f87a7a3136f13581e84534940b435f0b49eb1951d1a755cab47a SHA512 d613efb80e003364a21832da3fefe3891d36a891119cc0efa970aad40ba135dfcd42b32a0c19c31ad879d4eddf27864beccbea1d4b31a47a4e075bc0f756365c
 DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 BLAKE2B 290c5bb7f1b12ac48627d8afcc346327b2fcce31b1015d5974c956d94f607b297e383158cd8741f03a770cdeb3f42c3e6341ebfcbc2220e122d89c2603eee512 SHA512 7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e
-DIST dropbear-2019.78.tar.bz2 2708659 BLAKE2B 212b173cfea8655b43a8d93422dd4d3e0d669a67681cb17d6494b6083e6e4c58d21d52850c0cdf414617ee3dcaa071e376d0b5b156b6856cee2e4fe111550f7d SHA512 f667ba8dae17ea89c118642b566f2c134c71bfd0b8bacea5cf7ec87d75ac79bd7cd1864a8788367a89d30ee35427d389ef6416375adff6e83caae30ff3e0549f
 DIST dropbear-2020.79.tar.bz2 2290687 BLAKE2B 9035f28cbf8d27f18f8f9b80100f9cd3f59bb22c0276941228eb8128c3443216f0eb8fcb9fdfba87c073ed9d3e835d5df0df60213ef2b2fcfa02dbc2db7be7b4 SHA512 e723dd330c6599b49156074662bd2cab4fc26129a43d2ad814475967037ca96aa29332fa9110953829c249a44b535c08345ef15efc7c6a246235a2db9db7ef71
 DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 24a44d27a02a1fa178083d5ee6034b20fedcac9faf7cf7f5cfcd4e4cee6d38775bc78949b9b00823cbbdacfab783e8e1e739579b9a7236c5425f51b27600743b SHA512 f3abfb6fe7ef632bb81152e2127d601cadd3fa93162178576a1d5ed82c2286627184b207b85a5b2a1793db0addf0885dfc3b9523bb340443224caf9c6d613b84
 DIST expat-2.2.9.tar.xz 422460 BLAKE2B ea0e0bd005bbfd355e819e2b157859878a20ad9a6807cc5a10a6656f062e2443adb483adb0452d751b3d460834e3f613b8ecf7cdaf743be1b15815d005d01fa6 SHA512 e082874efcc4b00709e2c0192c88fb15dfc4f33fc3a2b09e619b010ea93baaf7e7572683f738463db0ce2350cab3de48a0c38af6b74d1c4f5a9e311f499edab0
 DIST fuse-2.8.6.tar.gz 505334 BLAKE2B c44533625ead8acc5a16f61064635492c54aa91780018e3895baf18abe3ca00c9ec7f6606183a4f986037201db79697c07d03adf57c5a87e7888b8823d83aa8a SHA512 03cacc45c8ba6700fcdfa9064ef4e10d3ad6fc0e4fc49d41693de2caf03d44513d449b00a7c5d200d055d9481821252509259f5f3d2d6127fa51957a006a90fd
 DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
 DIST genkernel-3.5.3.3.tar.xz 331180 BLAKE2B 0f83b973505ccb0a92ae24e92509710bf96991f36ca55975ffefdf1bd3e835bd72bb413688468a05e6a5fff2ec16e64816f8ccfe2530c9f1e9169d19a86a2231 SHA512 9170731f59a1476aa597549ac55feb3583bed249e50d1697292571caf25c5ca746a1db9e811f2009d55aea21d739ef0ab3e385acd81504bbbccc8f7346205d71
-DIST genkernel-4.0.7.tar.xz 447900 BLAKE2B 9ceacb41e509db1b6705bebe11bd209d5ede0e24c82e89f49fbee8d8e44d5fd068bfe5990cdfd7cd5dcb7989e7ccb51d13b919492daa9311c102cef427d71796 SHA512 ab9fac291a342b5990ea732f5f7f03f761e3a1dd90a5480c29d697f6dcbefc4759d8e885977cc7aa636c4dbbdae3ee24a8e7f7c9ba211e6c482443d3527e5161
-DIST genkernel-4.0.8.tar.xz 455404 BLAKE2B d9f0d6357804bd4dc7d178d089adc343920e57c255f918b3a185fbe86b2ba0d35079587748ca465211b6daa4c9b7a05326e845d94fabce77249bff2f3f97dfca SHA512 7b5465322c6f201c4e398fd55115ff66cd3d0676e7f226e71d26350eaed1d72d970e03efeec37cd5d7445d718942f58f43db1002fcf0c105018246766d9220cc
+DIST genkernel-4.0.9.tar.xz 456172 BLAKE2B b457d6fc08edb3e2b2b95aea9160ad96757bfe3af649af96f0dc3206e120deb560001e149a3f4083833b8dc77194d732557d1e30d63227ff18f5e3a0bbcc8d83 SHA512 041abccc8bcbf884cd57173ca83233e2c5aa98d9d22e3e4cd47cd37ba312af2f16a88685afa127c336bb72f2c21dcd2071520c26af41b8597c0c75bcec1f39fa
 DIST gnupg-1.4.22.tar.bz2 3746546 BLAKE2B 9a2d37eeab10f2a7353804098e865ad45db846696a00a47f5bebf47145f79e0d2bf9c01c0195e2fe79af07946a3feac0d4589656c3e698a3a548ff1dd74ce759 SHA512 c03acac0fa55761470bb085d78a44e2b99ebb187e8396cbb031a184b1e40bef2a40c91da07755d1a20610a3daa6aa1eefea2d12a0dbd5a79a45466166419c708
 DIST gnupg-1.4.23.tar.bz2 3749353 BLAKE2B ec5e6bef0c7bb2a65813d7852cebeaa24c4855f9d9d9e802070da50b89fff56b747682933aa766dd130f849efcfe28f7aa74f3153405429bcf3845ef29c6dd6e SHA512 78dc52a2010202a4afc8814b29fda657a6c9fe230d5e7db11ae040edd2b0ca819e1baa4dbd6c0d04d36cd353df484e83f52d17759d2891c2cf7025c0b5d36612
 DIST json-c-0.13.1.tar.gz 639425 BLAKE2B 1da310309f9ce03306a9fd4a161670e460cf0b2222348df7c006902390f74a4cf100aab1ce6ac8a361a278dd917c114a278de5b3445817f3a40ae287478add46 SHA512 e984db2a42b9c95b52c798b2e8dd1b79951a8dcba27370af30c43b9549fbb00008dbcf052a535c528209aaee38e6d1f760168b706905ae72f3e704ed20f8a1a1
-DIST kmod-26.tar.xz 552032 BLAKE2B 3e596d06b48599bf4919346475a036b058fb18a7b19d39953e24fa943b95fdbe34a29a5062f6b4fe3510e667ae873d3b9ae03b72350fa85ddbb40ca6a7730b34 SHA512 3ca276c6fc13c2dd2220ec528b8dc4ab4edee5d2b22e16b6f945c552e51f74342c01c33a53740e6af8c893d42bd4d6f629cd8fa6e15ef8bd8da30cb003ef0865
 DIST kmod-27.tar.xz 548924 BLAKE2B 9f12bf5792d4c867e28e0776c279369c063e84269212e3f699ae6e5e69b8b2b466b5033e43e17ac64d6101592edcf3c34881916afb6ae676b49dc8838dfe1396 SHA512 e0513094935333fca1fb4c3e3493b232507a579ab00a6457cc9ed3e928363d05aad80634fb65a8287a336bf9895194c7be8ddc41bb088a6c2cca44fc1bfbdb6c
 DIST libaio-0.3.112.tar.gz 46977 BLAKE2B 088f3b195a65bdc97ae2318e47af17c65259ed3208dca7bfef93c81a800602085e5b2078dbd436c740be316d0ebd923a1b3b7c0808257e2e7c7fb0f7ae1e0dba SHA512 5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa
 DIST libgcrypt-1.8.5.tar.bz2 2991291 BLAKE2B 93276b4536f71c07bb103e10607592e02add413f633d96cc95513daa6e6b0e098fe803bb6a0e405a241fddc5ce0cfad61658d57c27bd724eecd32fd862af4c99 SHA512 b55e16e838d1b1208e7673366971ae7c0f9c1c79e042f41c03d14ed74c5e387fa69ea81d5414ffda3d2b4f82ea5467fe13b00115727e257db22808cf351bde89
-DIST libgpg-error-1.36.tar.bz2 920542 BLAKE2B 81684f6e47192c50cfa408977d53dc3812befca28733b531d51dffa0a6799a47366a50f64755557a7b3111a179ac4aba9e6a527418461cdbcccea80ae6bed4fa SHA512 6e5f853f77dc04f0091d94b224cab8e669042450f271b78d0ea0219658d059c9cab1ab0eaa020a4227f451520b417fc340b85971a6f5e144fa69be57e15df346
 DIST libgpg-error-1.38.tar.bz2 957637 BLAKE2B 9532402466748503805366b94c82c9adfe5b448f885c26b33ebf7ba9957161ca046b4057f5ca862224accb9f2af731652a55d20e7a4ab69107190a58c8e11ad6 SHA512 b936a4738c2cee111d855b1ba3ec433da8c77799a87d1f71275f974f871ebfa593c9db06ea53f0490b6cd6b94bef34f6052a587a4d13d839ec0128500c2dd9de
 DIST lzo-2.10.tar.gz 600622 BLAKE2B 124b6645a2cb7f01f153c9fa6e1976378bdfb224841a7b45ab19c584c6ef704c20719ae87640b8d83f3f9269a57d9cc2e870a914124dac03a2ef1336e9feb9c9 SHA512 a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4
 DIST mdadm-4.0.tar.xz 430780 BLAKE2B f08a67452398c864d73c78e2a7258d89c5c81b83dd136d4cd7e31e46b22d75ff67ecf553dc22f55dca418409daded51a399728dfdbd36039e828cad3233774e6 SHA512 12fb26e6b9c1912698defa406e5e47a7ca8d68d4a9aa7acdc9b463ee2d4a37fc6ecef6beb5395ff619018c3f6bdb6d8c573060d027707540f645ad2265170e8b
@@ -38,19 +30,15 @@ DIST mdadm-4.1.tar.xz 440756 BLAKE2B df0506d937c2aa309d7c68804f66f7dcd5178328859
 DIST open-iscsi-2.0-872.tar.gz 900081 BLAKE2B 6a4911347c55c1c4906350247ae7d92c2aee9627e1ab01cb5d705b02614b6c585ea042fef85a425b8f177645741f8d36e3efb40a57536bb79dbc5cdb6fe7998c SHA512 d26c87772b0b1d13a8bd2eea9db86b3c61af83efbb788116c01ab6a914ff3de634a7b1bff56c1161b28965315543edbfc2735b6c7fbd3f7797471fde63b69cc0
 DIST open-iscsi-2.0.878.tar.gz 607489 BLAKE2B f08f7a49dee6a377aed1d5efba100c4c357e95683e841e3c7960a49a40601cf8047dd28403866d963ef6850eb23c03ac39e0861575e21c452190a20534cbec48 SHA512 2eb26e5e69b88614d9b6262fffce94b93f9afc0742415ad6c2505daacd3014cd9d73bd89c36f452d004e2c4f312f372aab1ddc55e1bdec73c58de60181d73b33
 DIST popt-1.16.tar.gz 702769 BLAKE2B 37767ec50118f3675e8bfa780dca7989e092ea71c3ea1e1ab80d7cc13bf20a3b5f0681df2a7e0b1e3404404a0952f7b7f0135083d4166026dc26880a5a17ab3f SHA512 bae2dd4e5d682ef023fdc77ae60c4aad01a3a576d45af9d78d22490c11e410e60edda37ede171920746d4ae0d5de3c060d15cecfd41ba75b727a811be828d694
-DIST strace-5.4.tar.xz 1599396 BLAKE2B 0a7fd9600488f5f07042ead8123151cf0113f82329c3cc786c8f3ffb8673f73eaaa1a489f1f27c47800a20e5b6327f1bf5fb09a5b798156908f9e10374a04970 SHA512 4ddba2ec4457a2257c18b26dca851e49a275813c4eb3069379a93fcc60228f9b63a3dee9e3719ae606a7cc61d55ab21ce147327223903c302c061e381097a8d7
 DIST strace-5.7.tar.xz 1805044 BLAKE2B 487a1481357642be21c83cf387710bc75f17bd0af87ff07f914faa99120a619f33d2caba034d50dbdbc03aa3f758dae86d04fc6c25b3f6254ac3f0578a19884a SHA512 aef481238196204495cf9507cd48ce30af799f79904478e6be57a267311a999c868f18540cc1e025f5e486730cfe9ccb256f528f6f796d204a7347ebdf2042f1
 DIST thin-provisioning-tools-0.8.5.tar.gz 305585 BLAKE2B 7e4bde537535db79e97ddab3cba775c89854362dac7da491c040badf5e3546d2e6ac4b8da8462edb59f50a2ecd95fe9c5e3349fca5e9acd588efaaf990617ca4 SHA512 1f9a1b6b9059f0b23ec3a00ddef223599292d447894316525f13b9c1e4f29d0371cb901d199cb503be4342555e016e5e6eb2d6e0e10c44b08e6c9478c573e1d4
 DIST unionfs-fuse-0.24.tar.bz2 30381 BLAKE2B c3886d7b0cbd4ac62712d7d94bf9544481200e4354539b29770a88974ea3298b0f594cecfc6f7accff3595004ad1453075b947a2633b5300a3684fedba4995e5 SHA512 e0e414f4edbf641ec9d0135a8723e43fc75412359b482f7aedd66fe8245e4df03943c5ecb6f8de4fdbd97f0346033c691e766cc4f4a755f5b43748e1441d3fbd
 DIST unionfs-fuse-2.0.tar.gz 46537 BLAKE2B 2f5a0da5adb15c408e7b9d0c3658e389a1aea4a9a5f2f3809fc724af43cf2a4b309e4220e46647e3f3fc9b19d48c8d62692e190cf8536182abfe551bfacfcc24 SHA512 5b60204632f498931fff7671cc9f40b1800d34cb8c0d0de0773626e2653eb0a36647566c92c1d0cf79543e01b934602ef5603a06508407f352e48ef27a7ee758
-DIST util-linux-2.35.1.tar.xz 5138360 BLAKE2B 08c16d4d9fd670b62c2d664feda2cfa53d0cecc36bbaa2c3ed5960bf70f905f11caa7a904c63f36e12b472f10b8e781351cca0cf2f858c2b66e4fd0204b1c456 SHA512 6e27e08bfc02378970f015decfea5a52d6c342c4c8f4ac48dd07d248485eb797e506d91d290dbbca344c3e5cfe1fc150db80a23d510367427232f5abeabe591a
 DIST util-linux-2.35.2.tar.xz 5150488 BLAKE2B 93eb90ab33db7795b46425ec4ec87f8a2d3d6e0dad671345375ea02efd654bf72041932d30b41bea494e4b62952e2fd14ea9f9e6c738d4eb4b050bd170b9bb0e SHA512 59e038ba71aa74c9af6f927b357483a965f675ab3ffcd25cf0c1b043656312d2d2d07c55659fd3da69ede165bec313e0ae7e1cd73758e49681ae610604b399a2
-DIST xfsprogs-5.5.0.tar.xz 1252760 BLAKE2B 8099d019e66be4fc8856a22be94ab94cbc78bb81137cb2f065d058b39c4048dbeca7378106047e16dc26e8307463d834bb03bcb9473af192d29b414e7fe715d8 SHA512 1169765e9a003f9618f020eb190dc0a692e7017cf1ec2a9329a8db0f07ef6a48cb250fc326fb9168714259c8d5f2195cc6fd41e01bbbdc9a5857e53f145b6815
 DIST xfsprogs-5.6.0.tar.xz 1253112 BLAKE2B 7928b29458e3ad8251b48b6fb14a515e0128701c40cdfa63c05fc85173c70da3f34c948b7791f12ac5bb8d5f0c634016dac71c328a8917d1065aa7fb4cac3291 SHA512 a6bee55b0a23316c73f3921234d1dbaa4cbe91c12e79264e5f9bfe1356a24baa0ab25270405a46e4613a7e48443ef21997ff4f5962663777bed373f89ca29701
 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.5.3.3.ebuild 4937 BLAKE2B 1aac344f671f5493855359059d3adfcaba9abe11018056fc8c226ffd69c69aa134fd9352e79adbfe5c3f756d0cfcc811c43974b4ca677c1a17db1dfb98f7f76e SHA512 5b797b3ab3fd7098c8a26e0275b956f85d2d6600ad4f02e0400cee7506846b425afd23ef8b98946999dd715b73d4df4d6196dd574b9563fcb38e03a675de9349
-EBUILD genkernel-4.0.7-r1.ebuild 9622 BLAKE2B e05d80dcd6e030fac85c805b475eba46cabb1bc302495ead5e5f3d1381012a3bafeed058b8e5ba2c4ed0ea8913161530e5e3c7776edca2ee17e66b6e4372bc02 SHA512 7537bcc4878d6eac6aa81393c34e6f47303dce9480fd7e739b74c78ccfa52f3336437b4db6b3d8f46e6b983ddd3a0afd76a85e21f3c041cf744b8d42651f672c
-EBUILD genkernel-4.0.8.ebuild 9556 BLAKE2B e9dc498cd68a2512f076abca6cdc05ff98e9beac5bed7ba844cf800ffad0e8e35252090b139dc53054090e8694cd259678d6bf2d4f4e94c232c6c0fd41358f78 SHA512 f4e2a8f6245f803122b39f0213426f6e76689846fbc983de928b1c14152971b996a982225cff4cee05e297c1624ecc67ae0c424e5b55f4cb1e7deb65346ccab6
+EBUILD genkernel-4.0.9.ebuild 9556 BLAKE2B d89727ce09b07348980907d07d85a54bd24ae018d541e067b5a8e2bc8a3802313929d96d0277e7d3b8fbae50e2f894f921650d2c18e8e30e776974a6274adb35 SHA512 4267e731cd07ce7f47ed77e537a851fba6e8d595f7092bbcd81254aa97aea037314aa2a4b77d00909bf2d5fc8cfb9cc91b18bb47e605ce2883d757486113c702
 EBUILD genkernel-9999.ebuild 9565 BLAKE2B 0799c5030d8380d6453d068d30c0bb1208303073b24ed1ded5a8744495535c0b454035194eb31e37bad21a121578f162bae7a1a1e120758dc113f007407fe364 SHA512 a423829624730c4214a954dd429322801ee8f2d0cc50383a15c3d4a4197fbdd76aea1ea09beb30640dc0555bedc1c88680910d57fa979548c743d5dd83c600a1
 MISC metadata.xml 637 BLAKE2B 8498132ea1773f537d7f463fb420e9b7c80f24e6a8e3eefbb88bc942707d37d3c7a0e8a80cbbace2c8068411d06f8a1923efbc23e80e6fa87fa06766af1a6627 SHA512 10753c6db20c7e5d2c805d309aa69945f66d27287bbb240626baa2179263b5cf0e703c589f1951aecc2ed1e7e8259097434cc4e7f36d9dff8e1c6d8f50b684db
diff --git a/sys-kernel/genkernel/files/genkernel-4.0.7-fix-unquoted-SANDBOX_ON-check.patch b/sys-kernel/genkernel/files/genkernel-4.0.7-fix-unquoted-SANDBOX_ON-check.patch
deleted file mode 100644
index be7bcf169ce5..000000000000
--- a/sys-kernel/genkernel/files/genkernel-4.0.7-fix-unquoted-SANDBOX_ON-check.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 2948a542da6964a4f61a71fd5253c97f803eac34
-Author:     Thomas Deutschmann <whissi@gentoo.org>
-AuthorDate: Sun Apr 12 01:12:38 2020 +0200
-Commit:     Thomas Deutschmann <whissi@gentoo.org>
-CommitDate: Sun Apr 12 01:12:38 2020 +0200
-
-    gen_determineargs.sh: determine_real_args(): Quote $SANDBOX_ON
-    
-    $SANDBOX_ON can be unset causing 'unary operator expected' error.
-    
-    Fixes c0e013c ("gen_determineargs.sh: determine_real_args(): Error out early when already running within a sandbox")
-    Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
-
-diff --git a/gen_determineargs.sh b/gen_determineargs.sh
-index 95ec4021..b1c038d3 100755
---- a/gen_determineargs.sh
-+++ b/gen_determineargs.sh
-@@ -1012,7 +1012,7 @@ determine_real_args() {
- 		SANDBOX_COMMAND=
- 		if isTrue "${SANDBOX}"
- 		then
--			if [ ${SANDBOX_ON} -eq 1 ]
-+			if [[ "${SANDBOX_ON}" == "1" ]]
- 			then
- 				gen_die "SANDBOX_ON=1 detected -- You cannot use --sandbox when already running within a sandbox!"
- 			fi
diff --git a/sys-kernel/genkernel/genkernel-4.0.7-r1.ebuild b/sys-kernel/genkernel/genkernel-4.0.7-r1.ebuild
deleted file mode 100644
index de64f007b7f9..000000000000
--- a/sys-kernel/genkernel/genkernel-4.0.7-r1.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# genkernel-9999        -> latest Git branch "master"
-# genkernel-VERSION     -> normal genkernel release
-
-EAPI="7"
-
-inherit bash-completion-r1
-
-# Whenever you bump a GKPKG, check if you have to move
-# or add new patches!
-VERSION_BOOST="1.72.0"
-VERSION_BTRFS_PROGS="5.6"
-VERSION_BUSYBOX="1.31.1"
-VERSION_COREUTILS="8.32"
-VERSION_CRYPTSETUP="2.3.1"
-VERSION_DMRAID="1.0.0.rc16-3"
-VERSION_DROPBEAR="2019.78"
-VERSION_EXPAT="2.2.9"
-VERSION_E2FSPROGS="1.45.6"
-VERSION_FUSE="2.9.9"
-VERSION_GPG="1.4.23"
-VERSION_ISCSI="2.0.878"
-VERSION_JSON_C="0.13.1"
-VERSION_KMOD="26"
-VERSION_LIBAIO="0.3.112"
-VERSION_LIBGCRYPT="1.8.5"
-VERSION_LIBGPGERROR="1.36"
-VERSION_LVM="2.02.187"
-VERSION_LZO="2.10"
-VERSION_MDADM="4.1"
-VERSION_POPT="1.16"
-VERSION_STRACE="5.4"
-VERSION_THIN_PROVISIONING_TOOLS="0.8.5"
-VERSION_UNIONFS_FUSE="2.0"
-VERSION_UTIL_LINUX="2.35.1"
-VERSION_XFSPROGS="5.5.0"
-VERSION_ZLIB="1.2.11"
-VERSION_ZSTD="1.4.4"
-
-COMMON_URI="
-	https://dl.bintray.com/boostorg/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2
-	https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz
-	https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2
-	mirror://gnu/coreutils/coreutils-${VERSION_COREUTILS}.tar.xz
-	https://www.kernel.org/pub/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
-	https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
-	https://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2
-	https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz
-	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
-	https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
-	mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
-	https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
-	https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz
-	https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-${VERSION_KMOD}.tar.xz
-	https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz
-	mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2
-	mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2
-	https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz
-	https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz
-	https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
-	http://ftp.rpm.org/mirror/popt/popt-${VERSION_POPT}.tar.gz
-	https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz
-	https://github.com/jthornber/thin-provisioning-tools/archive/v${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz -> thin-provisioning-tools-${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz
-	https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
-	https://www.kernel.org/pub/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz
-	https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz
-	https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
-	https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz
-"
-
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-	SRC_URI="${COMMON_URI}"
-else
-	SRC_URI="https://dev.gentoo.org/~whissi/dist/genkernel/${P}.tar.xz
-		${COMMON_URI}"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="ibm +firmware"
-
-# Note:
-# We need sys-devel/* deps like autoconf or automake at _runtime_
-# because genkernel will usually build things like LVM2, cryptsetup,
-# mdadm... during initramfs generation which will require these
-# things.
-DEPEND=""
-RDEPEND="${DEPEND}
-	app-arch/cpio
-	>=app-misc/pax-utils-1.2.2
-	app-portage/elt-patches
-	sys-apps/sandbox
-	sys-devel/autoconf
-	sys-devel/autoconf-archive
-	sys-devel/automake
-	sys-devel/libtool
-	virtual/pkgconfig
-	firmware? ( sys-kernel/linux-firmware )"
-
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
-PATCHES=( "${FILESDIR}"/${P}-fix-unquoted-SANDBOX_ON-check.patch )
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-	else
-		local gk_src_file
-		for gk_src_file in ${A} ; do
-			if [[ ${gk_src_file} == genkernel-* ]] ; then
-				unpack "${gk_src_file}"
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999* ]] ; then
-		einfo "Updating version tag"
-		GK_V="$(git describe --tags | sed 's:^v::')-git"
-		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
-		einfo "Producing ChangeLog from Git history..."
-		pushd "${S}/.git" >/dev/null || die
-		git log > "${S}"/ChangeLog || die
-		popd >/dev/null || die
-	fi
-
-	# Update software.sh
-	sed -i \
-		-e "s:VERSION_BOOST:${VERSION_BOOST}:"\
-		-e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\
-		-e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\
-		-e "s:VERSION_COREUTILS:${VERSION_COREUTILS}:"\
-		-e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\
-		-e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\
-		-e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\
-		-e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\
-		-e "s:VERSION_EXPAT:${VERSION_EXPAT}:"\
-		-e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\
-		-e "s:VERSION_FUSE:${VERSION_FUSE}:"\
-		-e "s:VERSION_GPG:${VERSION_GPG}:"\
-		-e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\
-		-e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\
-		-e "s:VERSION_KMOD:${VERSION_KMOD}:"\
-		-e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\
-		-e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\
-		-e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\
-		-e "s:VERSION_LVM:${VERSION_LVM}:"\
-		-e "s:VERSION_LZO:${VERSION_LZO}:"\
-		-e "s:VERSION_MDADM:${VERSION_MDADM}:"\
-		-e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\
-		-e "s:VERSION_POPT:${VERSION_POPT}:"\
-		-e "s:VERSION_STRACE:${VERSION_STRACE}:"\
-		-e "s:VERSION_THIN_PROVISIONING_TOOLS:${VERSION_THIN_PROVISIONING_TOOLS}:"\
-		-e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\
-		-e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\
-		-e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\
-		-e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\
-		-e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\
-		-e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\
-		"${S}"/defaults/software.sh \
-		|| die "Could not adjust versions"
-}
-
-src_compile() {
-	if [[ ${PV} == 9999* ]] ; then
-		emake
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins "${S}"/genkernel.conf
-
-	doman genkernel.8
-	dodoc AUTHORS ChangeLog README TODO
-	dobin genkernel
-	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
-
-	if use ibm ; then
-		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
-	else
-		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
-	fi
-
-	insinto /usr/share/genkernel
-	doins -r "${S}"/*
-
-	fperms +x /usr/share/genkernel/gen_worker.sh
-
-	newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}"
-	insinto /etc
-	doins "${FILESDIR}"/initramfs.mounts
-
-	pushd "${DISTDIR}" &>/dev/null || die
-	insinto /usr/share/genkernel/distfiles
-	doins ${A/${P}.tar.xz/}
-	popd &>/dev/null || die
-}
-
-pkg_postinst() {
-	# Wiki is out of date
-	#echo
-	#elog 'Documentation is available in the genkernel manual page'
-	#elog 'as well as the following URL:'
-	#echo
-	#elog 'https://wiki.gentoo.org/wiki/Genkernel'
-	#echo
-
-	local replacing_version
-	for replacing_version in ${REPLACING_VERSIONS} ; do
-		if ver_test "${replacing_version}" -lt 4 ; then
-			# This is an upgrade which requires user review
-
-			ewarn ""
-			ewarn "Genkernel v4.x is a new major release which touches"
-			ewarn "nearly everything. Be careful, read updated manpage"
-			ewarn "and pay special attention to program output regarding"
-			ewarn "changed kernel command-line parameters!"
-
-			# Show this elog only once
-			break
-		fi
-	done
-
-	if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 0 ]] ; then
-		ewarn ''
-		ewarn 'Default kernel filename was changed from "kernel-genkernel-<ARCH>-<KV>"'
-		ewarn 'to "vmlinuz-<KV>". Please be aware that due to lexical ordering the'
-		ewarn '*default* boot entry in your boot manager could still point to last kernel'
-		ewarn 'built with genkernel before that name change, resulting in booting old'
-		ewarn 'kernel when not paying attention on boot.'
-	fi
-
-	# Show special warning for users depending on remote unlock capabilities
-	local gk_config="${EROOT}/etc/genkernel.conf"
-	if [[ -f "${gk_config}" ]] ; then
-		if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then
-			if ! grep -q dosshd /proc/cmdline 2>/dev/null ; then
-				ewarn ""
-				ewarn "IMPORTANT: SSH is currently enabled in your genkernel config"
-				ewarn "file (${gk_config}). However, 'dosshd' is missing from current"
-				ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled"
-				ewarn "in genkernel v4+ initramfs!"
-			fi
-		fi
-
-		if grep -q -E "^CMD_CALLBACK=.*emerge.*@module-rebuild" "${gk_config}" 2>/dev/null ; then
-			elog ""
-			elog "Please remove 'emerge @module-rebuild' from genkernel config"
-			elog "file (${gk_config}) and make use of new MODULEREBUILD option"
-			elog "instead."
-		fi
-	fi
-}
diff --git a/sys-kernel/genkernel/genkernel-4.0.8.ebuild b/sys-kernel/genkernel/genkernel-4.0.8.ebuild
deleted file mode 100644
index 11a0afd61879..000000000000
--- a/sys-kernel/genkernel/genkernel-4.0.8.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# genkernel-9999        -> latest Git branch "master"
-# genkernel-VERSION     -> normal genkernel release
-
-EAPI="7"
-
-inherit bash-completion-r1
-
-# Whenever you bump a GKPKG, check if you have to move
-# or add new patches!
-VERSION_BOOST="1.73.0"
-VERSION_BTRFS_PROGS="5.6.1"
-VERSION_BUSYBOX="1.31.1"
-VERSION_COREUTILS="8.32"
-VERSION_CRYPTSETUP="2.3.3"
-VERSION_DMRAID="1.0.0.rc16-3"
-VERSION_DROPBEAR="2019.78"
-VERSION_EXPAT="2.2.9"
-VERSION_E2FSPROGS="1.45.6"
-VERSION_FUSE="2.9.9"
-VERSION_GPG="1.4.23"
-VERSION_ISCSI="2.0.878"
-VERSION_JSON_C="0.13.1"
-VERSION_KMOD="27"
-VERSION_LIBAIO="0.3.112"
-VERSION_LIBGCRYPT="1.8.5"
-VERSION_LIBGPGERROR="1.38"
-VERSION_LVM="2.02.187"
-VERSION_LZO="2.10"
-VERSION_MDADM="4.1"
-VERSION_POPT="1.16"
-VERSION_STRACE="5.7"
-VERSION_THIN_PROVISIONING_TOOLS="0.8.5"
-VERSION_UNIONFS_FUSE="2.0"
-VERSION_UTIL_LINUX="2.35.2"
-VERSION_XFSPROGS="5.6.0"
-VERSION_ZLIB="1.2.11"
-VERSION_ZSTD="1.4.4"
-
-COMMON_URI="
-	https://dl.bintray.com/boostorg/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2
-	https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz
-	https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2
-	mirror://gnu/coreutils/coreutils-${VERSION_COREUTILS}.tar.xz
-	https://www.kernel.org/pub/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
-	https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
-	https://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2
-	https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz
-	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
-	https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
-	mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
-	https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
-	https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz
-	https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-${VERSION_KMOD}.tar.xz
-	https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz
-	mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2
-	mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2
-	https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz
-	https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz
-	https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
-	http://ftp.rpm.org/mirror/popt/popt-${VERSION_POPT}.tar.gz
-	https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz
-	https://github.com/jthornber/thin-provisioning-tools/archive/v${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz -> thin-provisioning-tools-${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz
-	https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
-	https://www.kernel.org/pub/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz
-	https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz
-	https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
-	https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz
-"
-
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-	SRC_URI="${COMMON_URI}"
-else
-	SRC_URI="https://dev.gentoo.org/~whissi/dist/genkernel/${P}.tar.xz
-		${COMMON_URI}"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="ibm +firmware"
-
-# Note:
-# We need sys-devel/* deps like autoconf or automake at _runtime_
-# because genkernel will usually build things like LVM2, cryptsetup,
-# mdadm... during initramfs generation which will require these
-# things.
-DEPEND=""
-RDEPEND="${DEPEND}
-	app-arch/cpio
-	>=app-misc/pax-utils-1.2.2
-	app-portage/elt-patches
-	sys-apps/sandbox
-	sys-devel/autoconf
-	sys-devel/autoconf-archive
-	sys-devel/automake
-	sys-devel/libtool
-	virtual/pkgconfig
-	firmware? ( sys-kernel/linux-firmware )"
-
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-	else
-		local gk_src_file
-		for gk_src_file in ${A} ; do
-			if [[ ${gk_src_file} == genkernel-* ]] ; then
-				unpack "${gk_src_file}"
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999* ]] ; then
-		einfo "Updating version tag"
-		GK_V="$(git describe --tags | sed 's:^v::')-git"
-		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
-		einfo "Producing ChangeLog from Git history..."
-		pushd "${S}/.git" >/dev/null || die
-		git log > "${S}"/ChangeLog || die
-		popd >/dev/null || die
-	fi
-
-	# Update software.sh
-	sed -i \
-		-e "s:VERSION_BOOST:${VERSION_BOOST}:"\
-		-e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\
-		-e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\
-		-e "s:VERSION_COREUTILS:${VERSION_COREUTILS}:"\
-		-e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\
-		-e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\
-		-e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\
-		-e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\
-		-e "s:VERSION_EXPAT:${VERSION_EXPAT}:"\
-		-e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\
-		-e "s:VERSION_FUSE:${VERSION_FUSE}:"\
-		-e "s:VERSION_GPG:${VERSION_GPG}:"\
-		-e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\
-		-e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\
-		-e "s:VERSION_KMOD:${VERSION_KMOD}:"\
-		-e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\
-		-e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\
-		-e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\
-		-e "s:VERSION_LVM:${VERSION_LVM}:"\
-		-e "s:VERSION_LZO:${VERSION_LZO}:"\
-		-e "s:VERSION_MDADM:${VERSION_MDADM}:"\
-		-e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\
-		-e "s:VERSION_POPT:${VERSION_POPT}:"\
-		-e "s:VERSION_STRACE:${VERSION_STRACE}:"\
-		-e "s:VERSION_THIN_PROVISIONING_TOOLS:${VERSION_THIN_PROVISIONING_TOOLS}:"\
-		-e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\
-		-e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\
-		-e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\
-		-e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\
-		-e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\
-		-e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\
-		"${S}"/defaults/software.sh \
-		|| die "Could not adjust versions"
-}
-
-src_compile() {
-	if [[ ${PV} == 9999* ]] ; then
-		emake
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins "${S}"/genkernel.conf
-
-	doman genkernel.8
-	dodoc AUTHORS ChangeLog README TODO
-	dobin genkernel
-	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
-
-	if use ibm ; then
-		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
-	else
-		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
-	fi
-
-	insinto /usr/share/genkernel
-	doins -r "${S}"/*
-
-	fperms +x /usr/share/genkernel/gen_worker.sh
-
-	newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}"
-	insinto /etc
-	doins "${FILESDIR}"/initramfs.mounts
-
-	pushd "${DISTDIR}" &>/dev/null || die
-	insinto /usr/share/genkernel/distfiles
-	doins ${A/${P}.tar.xz/}
-	popd &>/dev/null || die
-}
-
-pkg_postinst() {
-	# Wiki is out of date
-	#echo
-	#elog 'Documentation is available in the genkernel manual page'
-	#elog 'as well as the following URL:'
-	#echo
-	#elog 'https://wiki.gentoo.org/wiki/Genkernel'
-	#echo
-
-	local replacing_version
-	for replacing_version in ${REPLACING_VERSIONS} ; do
-		if ver_test "${replacing_version}" -lt 4 ; then
-			# This is an upgrade which requires user review
-
-			ewarn ""
-			ewarn "Genkernel v4.x is a new major release which touches"
-			ewarn "nearly everything. Be careful, read updated manpage"
-			ewarn "and pay special attention to program output regarding"
-			ewarn "changed kernel command-line parameters!"
-
-			# Show this elog only once
-			break
-		fi
-	done
-
-	if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 0 ]] ; then
-		ewarn ''
-		ewarn 'Default kernel filename was changed from "kernel-genkernel-<ARCH>-<KV>"'
-		ewarn 'to "vmlinuz-<KV>". Please be aware that due to lexical ordering the'
-		ewarn '*default* boot entry in your boot manager could still point to last kernel'
-		ewarn 'built with genkernel before that name change, resulting in booting old'
-		ewarn 'kernel when not paying attention on boot.'
-	fi
-
-	# Show special warning for users depending on remote unlock capabilities
-	local gk_config="${EROOT}/etc/genkernel.conf"
-	if [[ -f "${gk_config}" ]] ; then
-		if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then
-			if ! grep -q dosshd /proc/cmdline 2>/dev/null ; then
-				ewarn ""
-				ewarn "IMPORTANT: SSH is currently enabled in your genkernel config"
-				ewarn "file (${gk_config}). However, 'dosshd' is missing from current"
-				ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled"
-				ewarn "in genkernel v4+ initramfs!"
-			fi
-		fi
-
-		if grep -q -E "^CMD_CALLBACK=.*emerge.*@module-rebuild" "${gk_config}" 2>/dev/null ; then
-			elog ""
-			elog "Please remove 'emerge @module-rebuild' from genkernel config"
-			elog "file (${gk_config}) and make use of new MODULEREBUILD option"
-			elog "instead."
-		fi
-	fi
-}
diff --git a/sys-kernel/genkernel/genkernel-4.0.9.ebuild b/sys-kernel/genkernel/genkernel-4.0.9.ebuild
new file mode 100644
index 000000000000..712a584953d0
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-4.0.9.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# genkernel-9999        -> latest Git branch "master"
+# genkernel-VERSION     -> normal genkernel release
+
+EAPI="7"
+
+inherit bash-completion-r1
+
+# Whenever you bump a GKPKG, check if you have to move
+# or add new patches!
+VERSION_BOOST="1.73.0"
+VERSION_BTRFS_PROGS="5.6.1"
+VERSION_BUSYBOX="1.31.1"
+VERSION_COREUTILS="8.32"
+VERSION_CRYPTSETUP="2.3.3"
+VERSION_DMRAID="1.0.0.rc16-3"
+VERSION_DROPBEAR="2020.79"
+VERSION_EXPAT="2.2.9"
+VERSION_E2FSPROGS="1.45.6"
+VERSION_FUSE="2.9.9"
+VERSION_GPG="1.4.23"
+VERSION_ISCSI="2.0.878"
+VERSION_JSON_C="0.13.1"
+VERSION_KMOD="27"
+VERSION_LIBAIO="0.3.112"
+VERSION_LIBGCRYPT="1.8.5"
+VERSION_LIBGPGERROR="1.38"
+VERSION_LVM="2.02.187"
+VERSION_LZO="2.10"
+VERSION_MDADM="4.1"
+VERSION_POPT="1.16"
+VERSION_STRACE="5.7"
+VERSION_THIN_PROVISIONING_TOOLS="0.8.5"
+VERSION_UNIONFS_FUSE="2.0"
+VERSION_UTIL_LINUX="2.35.2"
+VERSION_XFSPROGS="5.6.0"
+VERSION_ZLIB="1.2.11"
+VERSION_ZSTD="1.4.4"
+
+COMMON_URI="
+	https://dl.bintray.com/boostorg/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2
+	https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz
+	https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2
+	mirror://gnu/coreutils/coreutils-${VERSION_COREUTILS}.tar.xz
+	https://www.kernel.org/pub/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
+	https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
+	https://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2
+	https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz
+	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
+	https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
+	mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
+	https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
+	https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz
+	https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-${VERSION_KMOD}.tar.xz
+	https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz
+	mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2
+	mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2
+	https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz
+	https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz
+	https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
+	http://ftp.rpm.org/mirror/popt/popt-${VERSION_POPT}.tar.gz
+	https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz
+	https://github.com/jthornber/thin-provisioning-tools/archive/v${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz -> thin-provisioning-tools-${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz
+	https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
+	https://www.kernel.org/pub/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz
+	https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz
+	https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
+	https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz
+"
+
+if [[ ${PV} == 9999* ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+	S="${WORKDIR}/${P}"
+	SRC_URI="${COMMON_URI}"
+else
+	SRC_URI="https://dev.gentoo.org/~whissi/dist/genkernel/${P}.tar.xz
+		${COMMON_URI}"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT=""
+IUSE="ibm +firmware"
+
+# Note:
+# We need sys-devel/* deps like autoconf or automake at _runtime_
+# because genkernel will usually build things like LVM2, cryptsetup,
+# mdadm... during initramfs generation which will require these
+# things.
+DEPEND=""
+RDEPEND="${DEPEND}
+	app-arch/cpio
+	>=app-misc/pax-utils-1.2.2
+	app-portage/elt-patches
+	sys-apps/sandbox
+	sys-devel/autoconf
+	sys-devel/autoconf-archive
+	sys-devel/automake
+	sys-devel/libtool
+	virtual/pkgconfig
+	firmware? ( sys-kernel/linux-firmware )"
+
+if [[ ${PV} == 9999* ]]; then
+	DEPEND="${DEPEND} app-text/asciidoc"
+fi
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]]; then
+		git-r3_src_unpack
+	else
+		local gk_src_file
+		for gk_src_file in ${A} ; do
+			if [[ ${gk_src_file} == genkernel-* ]] ; then
+				unpack "${gk_src_file}"
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999* ]] ; then
+		einfo "Updating version tag"
+		GK_V="$(git describe --tags | sed 's:^v::')-git"
+		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
+		einfo "Producing ChangeLog from Git history..."
+		pushd "${S}/.git" >/dev/null || die
+		git log > "${S}"/ChangeLog || die
+		popd >/dev/null || die
+	fi
+
+	# Update software.sh
+	sed -i \
+		-e "s:VERSION_BOOST:${VERSION_BOOST}:"\
+		-e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\
+		-e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\
+		-e "s:VERSION_COREUTILS:${VERSION_COREUTILS}:"\
+		-e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\
+		-e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\
+		-e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\
+		-e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\
+		-e "s:VERSION_EXPAT:${VERSION_EXPAT}:"\
+		-e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\
+		-e "s:VERSION_FUSE:${VERSION_FUSE}:"\
+		-e "s:VERSION_GPG:${VERSION_GPG}:"\
+		-e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\
+		-e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\
+		-e "s:VERSION_KMOD:${VERSION_KMOD}:"\
+		-e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\
+		-e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\
+		-e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\
+		-e "s:VERSION_LVM:${VERSION_LVM}:"\
+		-e "s:VERSION_LZO:${VERSION_LZO}:"\
+		-e "s:VERSION_MDADM:${VERSION_MDADM}:"\
+		-e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\
+		-e "s:VERSION_POPT:${VERSION_POPT}:"\
+		-e "s:VERSION_STRACE:${VERSION_STRACE}:"\
+		-e "s:VERSION_THIN_PROVISIONING_TOOLS:${VERSION_THIN_PROVISIONING_TOOLS}:"\
+		-e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\
+		-e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\
+		-e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\
+		-e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\
+		-e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\
+		-e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\
+		"${S}"/defaults/software.sh \
+		|| die "Could not adjust versions"
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]] ; then
+		emake
+	fi
+}
+
+src_install() {
+	insinto /etc
+	doins "${S}"/genkernel.conf
+
+	doman genkernel.8
+	dodoc AUTHORS ChangeLog README TODO
+	dobin genkernel
+	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
+
+	if use ibm ; then
+		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
+	else
+		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
+	fi
+
+	insinto /usr/share/genkernel
+	doins -r "${S}"/*
+
+	fperms +x /usr/share/genkernel/gen_worker.sh
+
+	newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}"
+	insinto /etc
+	doins "${FILESDIR}"/initramfs.mounts
+
+	pushd "${DISTDIR}" &>/dev/null || die
+	insinto /usr/share/genkernel/distfiles
+	doins ${A/${P}.tar.xz/}
+	popd &>/dev/null || die
+}
+
+pkg_postinst() {
+	# Wiki is out of date
+	#echo
+	#elog 'Documentation is available in the genkernel manual page'
+	#elog 'as well as the following URL:'
+	#echo
+	#elog 'https://wiki.gentoo.org/wiki/Genkernel'
+	#echo
+
+	local replacing_version
+	for replacing_version in ${REPLACING_VERSIONS} ; do
+		if ver_test "${replacing_version}" -lt 4 ; then
+			# This is an upgrade which requires user review
+
+			ewarn ""
+			ewarn "Genkernel v4.x is a new major release which touches"
+			ewarn "nearly everything. Be careful, read updated manpage"
+			ewarn "and pay special attention to program output regarding"
+			ewarn "changed kernel command-line parameters!"
+
+			# Show this elog only once
+			break
+		fi
+	done
+
+	if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 0 ]] ; then
+		ewarn ''
+		ewarn 'Default kernel filename was changed from "kernel-genkernel-<ARCH>-<KV>"'
+		ewarn 'to "vmlinuz-<KV>". Please be aware that due to lexical ordering the'
+		ewarn '*default* boot entry in your boot manager could still point to last kernel'
+		ewarn 'built with genkernel before that name change, resulting in booting old'
+		ewarn 'kernel when not paying attention on boot.'
+	fi
+
+	# Show special warning for users depending on remote unlock capabilities
+	local gk_config="${EROOT}/etc/genkernel.conf"
+	if [[ -f "${gk_config}" ]] ; then
+		if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then
+			if ! grep -q dosshd /proc/cmdline 2>/dev/null ; then
+				ewarn ""
+				ewarn "IMPORTANT: SSH is currently enabled in your genkernel config"
+				ewarn "file (${gk_config}). However, 'dosshd' is missing from current"
+				ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled"
+				ewarn "in genkernel v4+ initramfs!"
+			fi
+		fi
+
+		if grep -q -E "^CMD_CALLBACK=.*emerge.*@module-rebuild" "${gk_config}" 2>/dev/null ; then
+			elog ""
+			elog "Please remove 'emerge @module-rebuild' from genkernel config"
+			elog "file (${gk_config}) and make use of new MODULEREBUILD option"
+			elog "instead."
+		fi
+	fi
+}
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 6d225777aafb..ae690cce5d6c 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -4,18 +4,30 @@ DIST gentoo-kernel-5.4.46-1.amd64.xpak 65041216 BLAKE2B 560936f45725977c85925cde
 DIST gentoo-kernel-5.4.46-1.x86.xpak 56466748 BLAKE2B 790e4df7a1908f260fc4a67989f2b37f6cd6a8b03c4f0b6ccb05af3109235391130a00d80b7f47980954807854d2cca74078b30e31d18f51f8c21c968a7a3fb8 SHA512 88552fc262137e46eccedcaf00db86402a07fae4811c6b48292d9ee147d343e7ba9d0970b3773ed1027c44aaa0a1c118dd6c2dd46171de2daa665d46c854e70d
 DIST gentoo-kernel-5.4.47-1.amd64.xpak 65062043 BLAKE2B aa2787856b778c67a82c5bd70f14c504e05889738768153d9ed6e9b21c805f5cf690470fd4105c469d6f0c5aad8db7605b0dd3543a43e314c5afb637bde3f2cc SHA512 458913dba2ed7bf627c1eb33b574088d5a3bb9a6083d8d0ec6cc2856decf8106ef3f582581174c5e91fc1148b4f34c25b478f3093616f22021ddbc0a763719dc
 DIST gentoo-kernel-5.4.47-1.x86.xpak 56466754 BLAKE2B 6b95a86f1f85191b663976327871b9229e3f11afccf7afe0b4179dac97f753c0b81cc5bb9fb1c52b0d03467f658a2601060f33c13628c69553a347e236d8c0ed SHA512 f275ca4b82f10db36e5df620fff39cbf21b5b00f8f313e98a87ed2464df46ac921ce0e14851cab49b75a897a37e98b7acb1779333e125877049df27367c9ec5e
+DIST gentoo-kernel-5.4.48-1.amd64.xpak 65029305 BLAKE2B b030304c6c461e5a95f60a49754533c36309458338fce95dcd130101c4fdd18bca34bd9e48ba22cf3e2a0bd36c4b70ef7c767f6a8de20187a2c45ea67974b47b SHA512 fd3ed996a6e1c2770a93afef0368f570e2f01e33cd7282f2735aae5316584cab07ba305ebf718c22378c42912129e12d9b721bc75a51298b145de7819c59f80a
+DIST gentoo-kernel-5.4.48-1.x86.xpak 56478804 BLAKE2B 0ca80b82e6f24891095de8472a5005b397db02fe85c5e5a32e05af37b9463c9ea6abe26cda3207af97c0f5b07df9ae9c5852c02168f09823004b9dce56ed8c24 SHA512 ccaad0fc9440ffb623defa8d570e9fd6eedad1f0e10d8868df0e1d14c40ff864fc1837d8654cce652b68f6f532c84b2b62e70b569b4f2defc68179e336a7dd1d
+DIST gentoo-kernel-5.4.49-1.amd64.xpak 65038447 BLAKE2B 49234c51cca0a409cabb1f155f453873646f191e4e0ae90382cfa8c0d6699c6e40aa53ba743d337f916f6155572d1a6441c9b92bb88ac11ad97c1351002fb9b8 SHA512 06fa6f2e5762faa07773be5f1c642534b4bbf3a2bbd86e0a6dc2b41f3c40f16fdc94e539a4ee361a35533f1240f4293239e4de29f3da465ea2b2452752509d64
+DIST gentoo-kernel-5.4.49-1.x86.xpak 56485619 BLAKE2B 3009af3712c3faee8739c5dc83b41d78af7d85f565c38c7d2d5682e14a2db2937c2c298ed0d4441ff253eb09152920cd6c00936c5dcdaf3bd75dbd541fdc9ff2 SHA512 e48181b0755285b68573d9012e24b70ef75e0b8759e060a404b02ef1097483db6159018b3a0dbfc2a542ccb4476a7c1204b55d8e5ec2e961b81ccf06b55ba7ee
 DIST gentoo-kernel-5.6.18-1.amd64.xpak 66169658 BLAKE2B cb111eca2a88a6cde81e4eb80ab9a025ab5f66f780fdb6e04c16686f78ae80b6fac5ed5c511508411d24b5439503ba205f8bae287acfdde75aa6f7e609ef3a1e SHA512 ffb6aa3e0269bcb9fc159b9e8237f97c569b527ac2250722f342872b1a7d603309caef5a9a83ce4770838bcccfbbefa8bf77eea9b3e4680145aee1614cc86250
 DIST gentoo-kernel-5.6.18-1.x86.xpak 57553136 BLAKE2B 3a26cd459a99c42228bd942033b6abcc9d06ae77961a4591bbc27deecbadb895ac0344298877a9474dc3057cc854d5b3be495674f8b6c549f7d136417a568271 SHA512 36c10328587a784be5d5099b5a103a9603357a2e5228be2a3f24aeb325ee4cc7aafedb98eb9314ce3fd38e45dfc3034fbdc0776e4753642945421018e03e7371
 DIST gentoo-kernel-5.6.19-1.amd64.xpak 66175473 BLAKE2B 868b2b78a260be6cd98804fa93149a17898ea8d240bb1257da0ce5e0a63ea88051b470b581fae37b620e3ed5d5821527a2deb6ee9b04102f5b7c65e2b0345242 SHA512 26ba56467823824ceb91861726bf5b3c4bbcf70790740a3147cc5b1f767d5fd5bbb76d7f4983a6d4bbce0c24fdf2c4b759949aad2ae9525de039ceeb02351415
 DIST gentoo-kernel-5.6.19-1.x86.xpak 57562673 BLAKE2B e1856f9a06dbd639adda6c50aad664caf9e18f60fa3f9636585d446dbf3304676e5d765e243e8239c57cd18e32aeb2996706ac9de0ad6bd558415f818bdc078f SHA512 cc825891f2333498195c786471a9eee2dd45180760ba2c7ac0c19ba110220bedadfe5ca9ba7e95a3fb5a055c402016df6e438e91739a41e72a9374388aacc9a6
 DIST gentoo-kernel-5.7.4-1.amd64.xpak 66666235 BLAKE2B ea6b553f0225635048f1343e534abd0c502333a78aeb282d40b7ecb8009ab8e114e334527318ee6a27fab5093f554c092858559f8ebb58c3862e4c1429d309c5 SHA512 53daf01a621f9db18f173a1e57f5fb418ce202cf75a4ea9b8e3fc8243b64f75b1425895f5056cb212dd320d51142c847b62541488f1b9c8ba8ef9e2b0df943f7
 DIST gentoo-kernel-5.7.4-1.x86.xpak 57961274 BLAKE2B 653c4c24f748453c178f096cf89ac73299056f061ccc577318393fe6c46acaffae748a0ce661dbe1850fdd721ce73070c36d26d79b097dc3ad23c9f1a15329cb SHA512 d742778fdfd2a6e0caad5143664ef27faef9ec303ba3f13763ccaf4a7a0d6e077156ef3d9619078641c11289ddce0624eb7ac98ab19e30203a968115c1209ff1
+DIST gentoo-kernel-5.7.5-1.amd64.xpak 66667238 BLAKE2B 6aaa91c2dad0f6a1b0bcbf4242392bbe155b887160e05bb45b7a451d10072c826fe8836cb7fc3dc18b7c3610e1292ceca39cd519da0adbfd9df0f286ecc507b6 SHA512 bfb219695e88514cea934b6365fb0ffe68426193a878a15ed5956b6bd6c350e4e2ae94a345d31f08c2364d1ee2799ea7005a5f245843da872eb53b680b18c1e9
+DIST gentoo-kernel-5.7.5-1.x86.xpak 57968925 BLAKE2B 94ed367c444aac05ec682efdbffdbd5ce0c60d7029e6d9c68f666abf0a1f20fd9af082b003d0efe0e10a36a767c360abccfd32e0a201559e2442976ef7b53834 SHA512 a2d10c7a69e2e93df61b273f54dca4a81e650e52147ef7ed09a3ac0a1277651d4370a6b7bc921df5b9ed917fe911cba1ad8d922616de21afafdf529c7b0e4aa1
+DIST gentoo-kernel-5.7.6-1.amd64.xpak 66694839 BLAKE2B c42a69daeaf7db6ed1a6dfe7a2da2b08634ac8487bcd1efc242d84ce80354d6b56f665744f9025eee4180768dc6fa352a9075858f95ae809bd6b181e7ed254f7 SHA512 83216a8b4f2b50bb9261fe33241220a1ab7e453f76f9d8ec6af08af4f52872a5e73ceb483b8134e4134677cfaa232f77cdab06a4196470ea55578ce267137a6d
+DIST gentoo-kernel-5.7.6-1.x86.xpak 57985355 BLAKE2B 1187ad6515f56278ec5cade9ac87f037e498a380a83eb52f298becb2b8c3f5cf63d5a3fa1533327480f42a10e673cd63b2e257bb5b737f4e416c61fcdfe5bb47 SHA512 41e1530354b1c833b64bc2636b477c4ff44fce2bebc0b602dabe770188e38aeb4e5ff22f5bb66c321803a5ae6095f48baae7010d270e04dd7898f34d3cd99414
 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-5.4.40.ebuild 1048 BLAKE2B 72875d3d21ca44fe5ec1df461367363c1fe35f28e21c0c39d77f808feb5d63a8ecc24d2f0c2bee1e90b19a7c70333120fe4d85cfc7a83d2fa78d50afea10ccc0 SHA512 4e321a97221e8a9d3e98d23ffbc25404aaf4431c0eec956aacf57e23df271c7f26355da0cc2f3bca02c2a5788428cf354959d8c191a4df984e86327251a093c0
 EBUILD gentoo-kernel-bin-5.4.46.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb0f2d5c16b052ebad524cc2938ea8e15ecaf2412c8354cc4c9318d69c8800c505537a1d245dac84cdcf3e4cb019bc891cb52a SHA512 1fd7a2c0b90c3cb5f98878e496cb16c29f56aaa28a47509cb302e7c7029727300eb25ae6a38a04a908b14766a7ab59865f8ca8429904210c41db468e398ea3f1
 EBUILD gentoo-kernel-bin-5.4.47.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb0f2d5c16b052ebad524cc2938ea8e15ecaf2412c8354cc4c9318d69c8800c505537a1d245dac84cdcf3e4cb019bc891cb52a SHA512 1fd7a2c0b90c3cb5f98878e496cb16c29f56aaa28a47509cb302e7c7029727300eb25ae6a38a04a908b14766a7ab59865f8ca8429904210c41db468e398ea3f1
+EBUILD gentoo-kernel-bin-5.4.48.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb0f2d5c16b052ebad524cc2938ea8e15ecaf2412c8354cc4c9318d69c8800c505537a1d245dac84cdcf3e4cb019bc891cb52a SHA512 1fd7a2c0b90c3cb5f98878e496cb16c29f56aaa28a47509cb302e7c7029727300eb25ae6a38a04a908b14766a7ab59865f8ca8429904210c41db468e398ea3f1
+EBUILD gentoo-kernel-bin-5.4.49.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb0f2d5c16b052ebad524cc2938ea8e15ecaf2412c8354cc4c9318d69c8800c505537a1d245dac84cdcf3e4cb019bc891cb52a SHA512 1fd7a2c0b90c3cb5f98878e496cb16c29f56aaa28a47509cb302e7c7029727300eb25ae6a38a04a908b14766a7ab59865f8ca8429904210c41db468e398ea3f1
 EBUILD gentoo-kernel-bin-5.6.18.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb0f2d5c16b052ebad524cc2938ea8e15ecaf2412c8354cc4c9318d69c8800c505537a1d245dac84cdcf3e4cb019bc891cb52a SHA512 1fd7a2c0b90c3cb5f98878e496cb16c29f56aaa28a47509cb302e7c7029727300eb25ae6a38a04a908b14766a7ab59865f8ca8429904210c41db468e398ea3f1
 EBUILD gentoo-kernel-bin-5.6.19.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb0f2d5c16b052ebad524cc2938ea8e15ecaf2412c8354cc4c9318d69c8800c505537a1d245dac84cdcf3e4cb019bc891cb52a SHA512 1fd7a2c0b90c3cb5f98878e496cb16c29f56aaa28a47509cb302e7c7029727300eb25ae6a38a04a908b14766a7ab59865f8ca8429904210c41db468e398ea3f1
 EBUILD gentoo-kernel-bin-5.7.4.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb0f2d5c16b052ebad524cc2938ea8e15ecaf2412c8354cc4c9318d69c8800c505537a1d245dac84cdcf3e4cb019bc891cb52a SHA512 1fd7a2c0b90c3cb5f98878e496cb16c29f56aaa28a47509cb302e7c7029727300eb25ae6a38a04a908b14766a7ab59865f8ca8429904210c41db468e398ea3f1
+EBUILD gentoo-kernel-bin-5.7.5.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb0f2d5c16b052ebad524cc2938ea8e15ecaf2412c8354cc4c9318d69c8800c505537a1d245dac84cdcf3e4cb019bc891cb52a SHA512 1fd7a2c0b90c3cb5f98878e496cb16c29f56aaa28a47509cb302e7c7029727300eb25ae6a38a04a908b14766a7ab59865f8ca8429904210c41db468e398ea3f1
+EBUILD gentoo-kernel-bin-5.7.6.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-5.4.48.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.48.ebuild
new file mode 100644
index 000000000000..68ca59b57351
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.48.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.49.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.49.ebuild
new file mode 100644
index 000000000000..68ca59b57351
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.49.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.7.5.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.7.5.ebuild
new file mode 100644
index 000000000000..68ca59b57351
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.7.5.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.7.6.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.7.6.ebuild
new file mode 100644
index 000000000000..68ca59b57351
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.7.6.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 3e76e872e179..7458b73be157 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -4,12 +4,20 @@ DIST genpatches-5.4-46.base.tar.xz 1524648 BLAKE2B f51069d6f459762242f172f5bdd3d
 DIST genpatches-5.4-46.extras.tar.xz 1764 BLAKE2B 80470783d8e6f2fc3ef681e113bc51d8edb3093e0eaa5274412536b35fd23f486df5aaaf749bfc2f5cf6420c647fc96690718d78e10aea9b4bc0d0ee251fe84a SHA512 2c88f9edb3fe514676034b189bf239c7bffed9b4965b696099accf8b9c3d30c125e056772a6c327d2e4b00597d4c53901466fd15140f8815819bc3df5e3d47a4
 DIST genpatches-5.4-47.base.tar.xz 1555488 BLAKE2B 4662bd4c69d3c3f59c85620c2be6dcefdb31ebd76ecbd8e65f264fe6815c6f4619693329e9d2ae30aad7c4a2b7bd726be0bf3ba77bd35b489a964502feacbda7 SHA512 71a1dc9d9f3ad4ddcf323455ff0de17a8a7825d54edef4cda8c17809d213550f2cff2e7e181dd087a6cdaa96e038105a141273ed10fb5ea01d170352ee498a2f
 DIST genpatches-5.4-47.extras.tar.xz 1764 BLAKE2B e8e7f4b48c5b9d74f3a76d9dd07a9a549a96a402670207658e15e5f2c8f6f24f1e4f2f68ad8709f2d13d1b7931c421556eb2771b4854dce8d9fd579561f6d66b SHA512 d8b3daf929a7fbfb1623677f8295c70c7fb37c3a7cfe233cda909a39c429f62fd527400bda45e3956e937bbfdb607a2e155f1dc4942565d0b419e201c05d65ea
+DIST genpatches-5.4-48.base.tar.xz 1620972 BLAKE2B 45f358c85092ba422f8c411e91da90ccfc4b607f9c095dbe9ff02bc6adfbab4b35b03763316999810364d18ed3323fa613b70117e6f8454b2ba74744c1266b0e SHA512 b99974f5491b6103bb3e6b3b97e613322001bec40e49a4edc53893e94df66b7cc03370ca28af62d21dda995a477e395c16c22b8595ac96723ae66f2747fc9df4
+DIST genpatches-5.4-48.extras.tar.xz 1768 BLAKE2B 3f281c1c36c2a52e4fe2419592377baf4553c5fc61088911e50a901f96a1f4d89dc3e1b441b4b02575fca77ef6c371ccbecf8c55ff2eb9fbe14a7047451ae873 SHA512 9d2dbd829c53a310549811c2f133b19e4525c103827c5c5935cbd09d790eec105957dcbaee10cbe6409e0b7e00065c91b29a52e6d2bbf8e41859f5e4987de98a
+DIST genpatches-5.4-49.base.tar.xz 1695772 BLAKE2B ad81358e16e2c61bcfa1649e535edbfc4aa331915e9ba7dc5844e0ac7cc9ebfafff49ba7e1cb71d4e4dd6536c8094118da0d0dd82d6be2023b031dbcdde1d25a SHA512 eb03a777c37b71456931856174eac2ac1570ae700345186dd71d978870aee08e8a76432cf777257bd21666fbc17f58fc5fb0b4d99333cc4c730931d0fbd4a496
+DIST genpatches-5.4-49.extras.tar.xz 1764 BLAKE2B 285ebf3fec9ec3b5507f80dce0d6e24f635597e1bbae921135bab4ad6b743108fb8fa2a390380e030dd9d9d0d7e240dabefe043a1659cbaf6c8851d5b64d0006 SHA512 43e66a2537b42f53fdee24350903d28ec6904b2dbc10a4a1b075ac8542e6acf9adaa66defdbd10cd3f9b177a369fa1a2c6e4d6c45067b83cc0b381eea97c654c
 DIST genpatches-5.6-22.base.tar.xz 499020 BLAKE2B c6a9977f776a79a3da7b61dd57fbf76af7cb91069bd87cbf7189cefd207befdbec044c7bd440aad194245b93ef4254dda949f15a19d1c82e7aac44bc306e14b6 SHA512 c40c15088b75dc325712cb95468d84a4eb87616d634f51a479ac6a34e9515329c90f8360a3f7d7876ab5bb335c4d435d308e37c1562507fa6c57c88f9ecd775c
 DIST genpatches-5.6-22.extras.tar.xz 1764 BLAKE2B 64a589b498dfa1cc41b525a90b77a1524926a4ff9a2f9c1e2e7bd3d3750c531df3545e4af68a04fc7e3e641b6c8985a627190407f6eb85657eac960261f98ef6 SHA512 d0c11d9d5d2966ad3bf2da898e89f99b83f179f5ffda28c8ff4c0c0d0eb7a0e2553d1773ced53557fa54a58a85486802acd51f372ec3026862af58c09049a0f4
 DIST genpatches-5.6-23.base.tar.xz 540292 BLAKE2B f22ce1772f5ab80c9a20e6447a3874c7c664dfe8c1934202706e6d2e84fc378068dc98719796d45809392e7e32d6c0a2233693617f3c3ce84f42dfab00dcdbe7 SHA512 f5db5e258efc2fd0d29e1a772f03838d232b11b9fc22e9cc78ecab70cfcae819a9bc7c24234fbaf94c2b30b559f4fb88e493643e4a6e58169e62eb665564ee9c
 DIST genpatches-5.6-23.extras.tar.xz 1764 BLAKE2B e9dc2a6c1a326782aa1b58f37ad416b39348d30bc24ef2c7af9bac1d734e8c8f058a33a43150eb9cdf7dcc7323a509066082e79eecc582977ad320c5e34fb4a9 SHA512 1c9455a8d52304bf930c1618b98bad7e1c3af47d4984fa8e65ca5723d8120b3ce8ac9106b9e3ecb5824a3220be2706febe1abcdae7c5022a02d7ed5fe07cdf2a
 DIST genpatches-5.7-5.base.tar.xz 68572 BLAKE2B a5f975ae2fd61e1e732da8ccb364b969930563752f78fe0e0632edeb486312ca7d9a09fc1e57b99bada394e90cb3a3b76eb41ef8218f93ea0a4dc4f1f23ce012 SHA512 ef5c254b03edf280f3e38ff49d17a856b1d3898bafb8018d1874c1fca3ead90edc88799bbba1cadca34b2a0b2a55b7e7905910ae941e665f783fc3e355274fc0
 DIST genpatches-5.7-5.extras.tar.xz 1764 BLAKE2B 381917b2f8844995edf7c86b9420457ea2d8d8904fc5af94c6ce26990943bd7a61467e3386ccedff42cb4d6c51a2b477ebb89a763edba964995a61ba46f5f4f5 SHA512 8e716f61f988951f2b80e1e667752228067606275392a6084a564e9e4e051d86823458084cf7a3c17a0e56ae58253aeb01065e2329d480995d15b646eb5be761
+DIST genpatches-5.7-6.base.tar.xz 182364 BLAKE2B facff9299c5913596be8bba1dcab4b06e2ae697d66df645ac7c0e8aecfbea7788b4c4574cee69d4db3cf9c8f97c18be4af17f42ef4ec1fc7380b4936ab63cfa9 SHA512 68d3e2e70ac6838ad98b179e9b0694ce96ec0fefec98b497ed0fc689958d413f502915101ee9f38fff1fb5fb6b57d9e79d12870e280bcd84836cf30cd682a654
+DIST genpatches-5.7-6.extras.tar.xz 1764 BLAKE2B db13c787489b7b21d9848cbd0079683bc5a93a9ff4df09901bb00cf275183f0a367999fd9416ec97d36cbad6351b119bf6fb347f2fb645d4e515f3e6548e9f96 SHA512 acc190f9c6efe34f5b29a86d787ec047bf8df1d8b7c726fb79279f77b2cdb7a0bc777f353c9ecadec7414797f15562c36734a69e6bb2d4a5f05acddb659c4d12
+DIST genpatches-5.7-7.base.tar.xz 322208 BLAKE2B 832e79c3aa2a044993ba2b0f75e844e5da0adf0b290e4c1e1883a382b94ee5ac882cb2b0db585bbb2ba133b5dbb908b6c02a29ea4384a2166146448d2e8eef15 SHA512 4321746f6acccc17d84ace29db9214528752eb7230265cb296b957797656a9bb65dc47529b0d2d3c8faada1f0866fe3e4fed79bd57d7154cf817183aa6db0e0c
+DIST genpatches-5.7-7.extras.tar.xz 1764 BLAKE2B 01efd460c869218bda48f2b7b270d67e4da47b6ada6af38301495bfb960c64049898a8705146d40f6baf9d4782cea3e3be6aeb55a265ef5ce2b7616a8c7be657 SHA512 4fb0a24a6cbbb05cbb0c81daba926c6b71b01821f8cf60fb81fb57b5130783c99ff726e93b7a7a265ecfe1194a353189e790a5d17b8d86cd38441a1af2c3c74e
 DIST linux-5.4.15-arch1.amd64.config 241498 BLAKE2B 2ba5eab2455c909878c36c6084718331042d0f6ab42127868ffb1522f4b53de38879e5707328968e943d1fa44cc504626af52b733829e943532931b49a612834 SHA512 582577bfe4139a8f50c5881cd5a9f24dc3da3124e464756f9efc3d39894eac378483d052e1142730585e40a45641166d309b5e1b5e379f4a5ea2d5ebb2d3314b
 DIST linux-5.4.15-arch1.i686.config 241195 BLAKE2B d3332b83a3d57c450bb1d5e85d83c71f3be730a15775b7e1d89cec2d72d28f1921987c63d95fe7bea6778efe0012ece6186449f07f6aca35ccf86805186c0f4c SHA512 187d88bdde7325d46b4bfee8d59ace88ab7dc377606b411e1249f9deee2b571ec42bac52c29d26d67bfadece2e77aad6d5e0255a95a84c200757cb05c69160a1
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
@@ -18,13 +26,18 @@ DIST linux-5.6.8-arch1.i686.config 245339 BLAKE2B 746b39cc8d8d880eadd3a04eaed7fa
 DIST linux-5.6.tar.xz 111785252 BLAKE2B 8dbe02a8ca7fd3dcf512a15c5d8098c1e7f94257e65173fed43fcc45480e4ab790df8cd39bbbb4e2a21dc9a00385bc9bbe98215a31e7f7e1d9c8f21cd8ace69e SHA512 80846fe2b4e4a7ff471d2dde28a8216ae807a3209f959e93d39ea4fc9a189ea28ec3db9d303b3fe15a28c2cb90e7446876678e93e23353c2d6f262e364a06bc9
 DIST linux-5.7.1-arch1.amd64.config 248550 BLAKE2B 438ddcb212ffd5c257da2ad00eb9425e21f938ec8958f781af067c6d4eb45077c27d6f2aaf952fa728fd0c381e6476d1839dbc1c2074796194669591c3a17ee2 SHA512 db854554b8b8138ac44488ed8656bc620a01f361f3a6006cf0b8c7e3513c0d7b0f2be8534694b063af33ccaacdf95bd1f824470f4509a274f7f52c5b67e0f723
 DIST linux-5.7.2-arch1.i686.config 247685 BLAKE2B 28f7e9cdada8876fb07523cf657a2cda175bfab7c3a57d7e5cba06b6158fde634efa4e59ff318fb21d63564245998bfe8c3b916985f078530ca57813c1d642e9 SHA512 6b16f1583739c4534b0ef3898f1bf02d47b6375867f34bf4a5171fac4cd19ce87b17ad430860e229740cf59661594890f32c42734584ddb7cdaca63cb3bc2336
+DIST linux-5.7.6-arch1.amd64.config 248589 BLAKE2B e7c64a69a1ea4f09f29f40502e03917d6ba9847d05863e4e7781cbc68e264c86cd617dc9ec0f502b990808f6914426cda030bb6582cc012b939891c9ea60976a SHA512 5ce2921dd99ef9f3e82298b53fac01bd2e56e2a234b608671a7f02ff936c38b99e8e34b15d574304b3cfff943e787d87726621df2aacef7a5a988377bbc0eeb5
 DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f5d2c58b6137d383f16034a587225a75a9dbca6a01a433056ebe078487132c224e909a2971c9634687e47b1d1 SHA512 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
 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-5.4.40.ebuild 2149 BLAKE2B 2d5c9fec557ef79c4e37584448c3d7a470156e56e97e0da57f8061ce715125fb7f24e9b522d2b7dab42ed6181af3900b8775bd19041d27d534361774ccdb64ad SHA512 2f2dcd1640a6208565fd9ec4e5d98ec9e9b4eb136e29b735b343bfa76e959ecc82a96b281d2ed3ee6be3143d4bd251e3eeb5eb244f14dc4e739885956551c92f
 EBUILD gentoo-kernel-5.4.46.ebuild 2151 BLAKE2B 3d424cfae9d59bfe0aa9f6ecf2383b800b16a91ae0a9a28b068810089fb196860ee7832368d240dd363f75d62edd6924b88fe63a59f54e34b05f251b0c3032bf SHA512 2575b8c6c728d43f6641444ce98709d47b0a14f7a91a5fc62f7ea48f175e0f3a14ba5a02aeb5315fece449be4e35b1fc211a8ec6e29ec871fff4eafe4e8f029d
 EBUILD gentoo-kernel-5.4.47.ebuild 2151 BLAKE2B 3d424cfae9d59bfe0aa9f6ecf2383b800b16a91ae0a9a28b068810089fb196860ee7832368d240dd363f75d62edd6924b88fe63a59f54e34b05f251b0c3032bf SHA512 2575b8c6c728d43f6641444ce98709d47b0a14f7a91a5fc62f7ea48f175e0f3a14ba5a02aeb5315fece449be4e35b1fc211a8ec6e29ec871fff4eafe4e8f029d
+EBUILD gentoo-kernel-5.4.48.ebuild 2151 BLAKE2B 3d424cfae9d59bfe0aa9f6ecf2383b800b16a91ae0a9a28b068810089fb196860ee7832368d240dd363f75d62edd6924b88fe63a59f54e34b05f251b0c3032bf SHA512 2575b8c6c728d43f6641444ce98709d47b0a14f7a91a5fc62f7ea48f175e0f3a14ba5a02aeb5315fece449be4e35b1fc211a8ec6e29ec871fff4eafe4e8f029d
+EBUILD gentoo-kernel-5.4.49.ebuild 2151 BLAKE2B 3d424cfae9d59bfe0aa9f6ecf2383b800b16a91ae0a9a28b068810089fb196860ee7832368d240dd363f75d62edd6924b88fe63a59f54e34b05f251b0c3032bf SHA512 2575b8c6c728d43f6641444ce98709d47b0a14f7a91a5fc62f7ea48f175e0f3a14ba5a02aeb5315fece449be4e35b1fc211a8ec6e29ec871fff4eafe4e8f029d
 EBUILD gentoo-kernel-5.6.18.ebuild 2263 BLAKE2B 56496d43cdc9623288c949f9abb29eacb7a022ac3ef65b9eda05ad89bc0ba181e6eacdc16ff390a510ca37e5b7f78fc34b4288fbfba2d55bbe7f9e2d5a5d6bf1 SHA512 94897e50ac1955a6b3ecc169e5366e1956b078cda7244a21cf611089c40ada272efb3ad5b9e6682363ecf12e65c44785f5138197a8e72b4678fdb7b5cc5f0d95
 EBUILD gentoo-kernel-5.6.19.ebuild 2263 BLAKE2B 56496d43cdc9623288c949f9abb29eacb7a022ac3ef65b9eda05ad89bc0ba181e6eacdc16ff390a510ca37e5b7f78fc34b4288fbfba2d55bbe7f9e2d5a5d6bf1 SHA512 94897e50ac1955a6b3ecc169e5366e1956b078cda7244a21cf611089c40ada272efb3ad5b9e6682363ecf12e65c44785f5138197a8e72b4678fdb7b5cc5f0d95
 EBUILD gentoo-kernel-5.7.4.ebuild 2378 BLAKE2B 1e95cfb5ef4c66484f82ff0b43d007155ca63fa0bff689db2de4a2eb6bc6367f59a4362ed3e78bb6e64e797e9f81f8fa621f56cfba395154ac72a508f6fdc799 SHA512 fea3ffd84be4481513cdb2cb5f220a55fe315c3f49b310e4ef1ef4ea1f5254c32c9c248aa59d2d5b6dc1a8a6773667058804f718716e0fc85f7ff375dfdf9866
+EBUILD gentoo-kernel-5.7.5.ebuild 2378 BLAKE2B 1e95cfb5ef4c66484f82ff0b43d007155ca63fa0bff689db2de4a2eb6bc6367f59a4362ed3e78bb6e64e797e9f81f8fa621f56cfba395154ac72a508f6fdc799 SHA512 fea3ffd84be4481513cdb2cb5f220a55fe315c3f49b310e4ef1ef4ea1f5254c32c9c248aa59d2d5b6dc1a8a6773667058804f718716e0fc85f7ff375dfdf9866
+EBUILD gentoo-kernel-5.7.6.ebuild 2378 BLAKE2B 4f9597c4fbdccef3d079856cc164587bcc49227587fd0c97d922d43bd5f31329f02524dfa23737230518dff16eb2ea582301ca3801e9903be96ea578a608af7c SHA512 3d58994b4d27cfd07f292a86b25881ea7186d9e10924e0018d6db311b284a77c7b66999ec1058b804df18b2a7c0eb9f60c2bf08b2d356caa06b4874e885a0966
 MISC metadata.xml 352 BLAKE2B d45c3f23945883bcb819c225e43715f5cfd86090f3e928dfb62b26a7b38b98421ee0c0d3b4fe9ebdb9de39c294cbc288c1731e9493f69436a6916034d8b834d9 SHA512 e3b9651b8f0fa3b07626b4cfb01456e4ecea1ae053ad9e9e1b3c925a5de601b35c9f3983535d62edae9ef49a40fe4c319e013542908839f30415f6ad85463e24
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.48.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.48.ebuild
new file mode 100644
index 000000000000..1412b2980be3
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.48.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.15-arch1
+AMD64_CONFIG_HASH=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569
+# https://git.archlinux32.org/packages/log/core/linux/config.i686
+I686_CONFIG_VER=5.4.15-arch1
+I686_CONFIG_HASH=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e
+
+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-kernel/gentoo-kernel-5.4.49.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.49.ebuild
new file mode 100644
index 000000000000..1412b2980be3
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.49.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.15-arch1
+AMD64_CONFIG_HASH=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569
+# https://git.archlinux32.org/packages/log/core/linux/config.i686
+I686_CONFIG_VER=5.4.15-arch1
+I686_CONFIG_HASH=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e
+
+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-kernel/gentoo-kernel-5.7.5.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.5.ebuild
new file mode 100644
index 000000000000..85bb9249b7c5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.5.ebuild
@@ -0,0 +1,85 @@
+# 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##*.} + 1 ))
+# https://git.archlinux.org/svntogit/packages.git/log/trunk/config?h=packages/linux
+AMD64_CONFIG_VER=5.7.1-arch1
+AMD64_CONFIG_HASH=663b08666b269eeeeaafbafaee07fd03389ac8d7
+# https://git.archlinux32.org/packages/log/core/linux/config.i686
+I686_CONFIG_VER=5.7.2-arch1
+I686_CONFIG_HASH=4f18a8a48e28656a98803890a0f6567b93fd5a77
+
+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 ~arm ~arm64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+	arm? ( savedconfig )
+	arm64? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )"
+
+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
+			;;
+		arm|arm64)
+			return
+			;;
+		*)
+			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'
+	)
+	use debug || config_tweaks+=(
+		-e '/CONFIG_DEBUG_INFO/d'
+	)
+	sed -i "${config_tweaks[@]}" .config || die
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.6.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.6.ebuild
new file mode 100644
index 000000000000..4548c0f48c2e
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.6.ebuild
@@ -0,0 +1,85 @@
+# 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##*.} + 1 ))
+# https://git.archlinux.org/svntogit/packages.git/log/trunk/config?h=packages/linux
+AMD64_CONFIG_VER=5.7.6-arch1
+AMD64_CONFIG_HASH=39802f4425f0fc50dd8040ad30cfdd001bd2b40b
+# https://git.archlinux32.org/packages/log/core/linux/config.i686
+I686_CONFIG_VER=5.7.2-arch1
+I686_CONFIG_HASH=4f18a8a48e28656a98803890a0f6567b93fd5a77
+
+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 ~arm ~arm64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+	arm? ( savedconfig )
+	arm64? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )"
+
+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
+			;;
+		arm|arm64)
+			return
+			;;
+		*)
+			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'
+	)
+	use debug || config_tweaks+=(
+		-e '/CONFIG_DEBUG_INFO/d'
+	)
+	sed -i "${config_tweaks[@]}" .config || die
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 27c60d423fd2..3fe1b0453d79 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -10,6 +10,12 @@ DIST genpatches-4.14-193.extras.tar.xz 17528 BLAKE2B 4c73309b4d54a62dc3effc3ac1e
 DIST genpatches-4.14-194.base.tar.xz 4284304 BLAKE2B 3a657017572b12b19f5c9c32d455949634460f574cac1fc1c00b7416589e3452f944c3764bdf755fba7b7bea08872364c31e38f8b53025542b3186696b3afb15 SHA512 b8e2393047eaf6f974621aa04ace41a997cf7f1ae51446eed8652a75cc721385f3087a5c5b07c361640f82367698056ba3ac68d62fcbb63de2c834739e2f6314
 DIST genpatches-4.14-194.experimental.tar.xz 5932 BLAKE2B 021af3fbd9407a3e179089a79104ad113871f90be6c23dd1ac6eacc4b5f27b39c1de40736b7a7c6a54bac7074e4f2d8f5fc5bfc1ea17e6848008d0fe07a5680f SHA512 1424a7dcacc87cf5aba5d7dee36584156f1ca7abca97530ff551d16604aede76fa43a076261bdb78e9de9caab57751eff3e7e200bf4a0122b10050cfa578b10d
 DIST genpatches-4.14-194.extras.tar.xz 17528 BLAKE2B 1da392ce372e204598450d4bdaf68c260de44a9a248e3e9582ddca2d2f45a3ea4264443784f96a658513bfca76349502dee339f7398fafc20cc633ef4cfe5674 SHA512 94256c82c1486c535c116a8604fc30c28fd20362e53bd4e62952dba2bfbad44f5a0e2e17333898adf361788bd64609afe76a145c20792d26f468b825dc6ef386
+DIST genpatches-4.14-195.base.tar.xz 4329400 BLAKE2B a17042f43952d5245c2833a8a59e6898db6b5ca0314d453527220ff1fb39a4f8054ac1cc032251f1852d07a2ec1001755f4eef637a881be460f34b9f0e6c8294 SHA512 c6d31fe4fc95f04ccf8abe8bb4aff2b78e22bed69188c7ca857c7b1230fc7c637f5a97bbb17bee960ef2c8900cf2decfd1a1dfd58bcd66a442815f8cf52db735
+DIST genpatches-4.14-195.experimental.tar.xz 5932 BLAKE2B 33f6f50601c11f832846305eff70afd279a7f2284f9fe25b001fb3e45951d46cd9b861737c7c4c030a0cded6d119428583d8aaf003d03b487aa355f5289b9be7 SHA512 5505bd69959c8a40a17d649fd13521fd5a7b872ea66ee82c21fcdc7f6fe0330dd00b8361007fdd2505289d38e0354bfa31a377aa8863facac6ac9bf14fc9f9d5
+DIST genpatches-4.14-195.extras.tar.xz 17536 BLAKE2B 9b9d57324fc8770f8e9af0d62de34691694a21bba9c8ba54fc302709fa1d2e631ff0c91cd6a3ff275cc76c0cd1f87b1d2681a874c44fd2e7287e729ece3ee654 SHA512 89c02042dbca98380d0ea0f48f4af9a1508ab76ee764099a1ab63aca54f6173c2e249df99b676ada58391b24b4d4762f973cba72304e762e9948c46666e2b37c
+DIST genpatches-4.14-196.base.tar.xz 4359108 BLAKE2B 8f56424855c5d7f0e08a9c3ebe784aba798abd0755751e00341f2f2106f9aea33640b9c59213126de7f187b69efdb8b101675258a49c51eb4d89c0655d4e6bce SHA512 26c214aa12343f607d75116d2048ede0c9b134a15ad93cbba5997b5bee71a6553e2c420fbf4d7da20dac16f9ed41ce77ae9ec7fbdc06674b32d11a3adfb9fcdb
+DIST genpatches-4.14-196.experimental.tar.xz 5932 BLAKE2B 590ebc711495e321ea9c5826fcabc47d30f88ed7bbea889b0d873eb04b1ac9467be15dd64e4ef32a002250a83de85c8267686b5b8c6f3f2019540191bbb84fef SHA512 135516ab26127df7ae8de27a148ad378ca145f3064d578a7c1d6c5d6a6c0c35941e70e30cfcb741e1ecce20e52a051e74de775b4a8861ea0b7e12212a417b4d4
+DIST genpatches-4.14-196.extras.tar.xz 17528 BLAKE2B e8cbcf4d54a3c44504498bff52bdb65b5bd697dfb211b78924a3e09bf5bc505e8053d268881d1f0d5068e1cdd427a9a1445616251d8dd78871d30303f49430da SHA512 61e14704837422bac9f0af527d0071e31b5c75dd034dc4ef11a5f297b217c7cf2ca07cf74532c83f75c0a65c88a0ced978c15e3921d4c06c3e2a9235535df067
 DIST genpatches-4.19-119.base.tar.xz 3427592 BLAKE2B 162b414b2480bf6f2c380680b2a27fb14aa9a715e07d0af2a45433e8b20dc48c3c317c308d082d328c7312cd707adb528dcc88a0515942e4c794adf63ae916e9 SHA512 ca403e6cc5037ca4c8b25c53b0f5a60f6a006f0d7486ff32cb7e7e634a3ef34883ee96ec5049825a0c07111fcc7561e172f95c4cdbf5fb7d21c1e986081a9593
 DIST genpatches-4.19-119.experimental.tar.xz 6424 BLAKE2B 52329f89b354a12cffa0eb0fa35f237b9ae1b2bf81e0ecce3a90331bbbee7e1c4b41161286952c84ba64ca54235aa134dffd09ecf164eda3fdb7f0e000a35f32 SHA512 3db0a42d06fbee6e0a6f1afa50c48e42cd4c43365f91a800a4f99a9444db2b5030a5c367ea09409efa8d7f14494c6b8eefec47d2e8a8e14f52da040d26bce845
 DIST genpatches-4.19-119.extras.tar.xz 17508 BLAKE2B fd7ac78c365d496e3a3ef6584c2690205fe6ade564ef1c6104d9995943f32e3669d8f1bc7403792f2570db01c7afbe205e343a863a391489725cd7a82c1d1295 SHA512 153134a2f1a684a185efa3effc5e254857b79e5a07a06cbc5ae43f7d852d51fb4e920c6fd020d8eeb88a7b863d09679a90df28ce5d0c39bd77f055109824a3f4
@@ -22,6 +28,12 @@ DIST genpatches-4.19-126.extras.tar.xz 17520 BLAKE2B d0c02bf09bbca9f936edd26f22d
 DIST genpatches-4.19-127.base.tar.xz 3516816 BLAKE2B 28e28340e31bbcbd5d2ef42667ab3d01ee616b8c68cbf1feb8275932d5c416cd534dad7426f95c8982cc415abc5c465f75f9b85ab9ce949608675923ff985a4b SHA512 2b0261a4cf9582c01a94a6e276f9a46b758b1398fb4e8fb1ecdb6fee401413928ee1741fce70e595c8adde8dfe213827d34a96b5de075329b1a6fc21e99ccd98
 DIST genpatches-4.19-127.experimental.tar.xz 6428 BLAKE2B 1364a7af3a58bd0c7b5eb48468e7bd1060374a15eb7c8e259ff7fffc879a0a6b6af7f29aa7b29d678315a52c447624a58f36eaf4cadebdf60d932dd22d2c1e33 SHA512 c6debd22d0e905458a6388de22c187d81d6fcc183ac1f7e6139d73fa4d8bb4a99c9b8546812ae969786e6576a6cfec06e63213381e9e85942caf57714d97cee6
 DIST genpatches-4.19-127.extras.tar.xz 17516 BLAKE2B 3818bad82a4ef179b34e9dc59038706f29d09fbb21ab49df36a0ed117ff5e6c9487b2a54ae7c33e71ac6ff3b431c51f8c61e8a16b22b5dc244a0754da16a0e49 SHA512 5f069c781b7ca35803043359a94d1e471d1acecbe13ae8c969de0b6bbb4104bdd09fe93129c411871b4228541eb60e8fe39e476fb937f68a170cd51fcf33ca71
+DIST genpatches-4.19-128.base.tar.xz 3579128 BLAKE2B 3826eb7e22f0c03382d3c417d9b58bd27f86ea2f06e2569f7eb10ecfe031c5e9bcf12dc6522a5bc7896a0777a4b3ac21ae89f2e9c9a75f5f8ea9539ac7193b36 SHA512 b3fdd7120bb07c5b8da15725d20d6f7d7b877d9b0aa4dea0deeed92026a958362cd3741dfd407129e282aaf3ffbe1257fbe1e2c77c640cbe7a78894c307c6ecd
+DIST genpatches-4.19-128.experimental.tar.xz 6432 BLAKE2B 94f7574d43c1c970c21b581d9b52ee1d150a676ebbdfd956be06e9f2af03d44128e842b88f47f92c219751f6552b480399b02e88f63869c6be4762905cce9e56 SHA512 be0a40143e569fcf3b17126b21cf8d74453a6009875f41e891691573b8026bf3ca85f12ea49e46951a5c9e0dd8971f72f3870fe756a7c916918400631d2b1bb3
+DIST genpatches-4.19-128.extras.tar.xz 17524 BLAKE2B 885ad7ab0be8ad9c2f2094e8dda22ea8b5a07dcf2da1478f1e5c6c5019b32f224dc589b5a9fe300e9c55dc2a462f6430e55d72eb130c52226ee58302946a6797 SHA512 e732168665d86658ceb92d0dbb5794c9dd441fcb09c6a9a28208668fcf63830da118c247156e177967016900e08e5754cbc573672ca90728447263f073c7f4f0
+DIST genpatches-4.19-129.base.tar.xz 3626932 BLAKE2B 68533c898d54165997b765f2efed5cc4d9d1b6193513a27b5d1f57b6b7c1107f8be1728dcee5d991c306e51ad0bb8b880b546f618eefca4eb08cd699c37e5737 SHA512 debe6881f49e27dcd9829f047734eae0e66f28ae2d87c035d69a7f57cc6622bba1e88631a479293a3cb48ef9b1570c647d04b4df305ed30d805cf578c2c2fe68
+DIST genpatches-4.19-129.experimental.tar.xz 6432 BLAKE2B a17babcb86ddab998a4ee06b3e5f1a33a5589c18fc1ee08a5f3121741eed955822d6356e8394454168d4f1b74e7dc369e33f5e14eaee279613e43bb9e454a45b SHA512 b7fb52b33d0208c6276f5d639f10ff5a6e62e2ae53c6585c9816627ce6ba7f9e53db1bce24b60842788cf0c77390bdeb8f3d3e97fe902ddf0a7a7eb6fee51733
+DIST genpatches-4.19-129.extras.tar.xz 17516 BLAKE2B 7f0959a7a6410904e97ef4e3032a490ccf716381c57c3c7f02466e8dbdea5f9d01a9245d43c07bf516d11b06193bd4643bb949393990ce9aff570be3532fb5de SHA512 d809b2433f552b895d71acf647f5d0b096685373ff283ee5b101e205fd239f327b0c74e8f41a2fd7a20ad70643d8750ba92483fa1341a0d1aa7a16056bbdd35d
 DIST genpatches-4.4-222.base.tar.xz 3571800 BLAKE2B 4402f71d528f74ba4da4fab9e0209ca9f169f78ff3619f04b6c448bbd7a21613118d1f79a470f63785180e7080289fb9ab2a59673b9ef3b67838e5fe769e297b SHA512 d03f6b31adbf185918cb71a9a276cc09c500f2d6234c6d86e9d4341e487204b4b50ee3a0af48002bb529a0445ee50f7ce187ffabb9b76a69e789a7a930caf23a
 DIST genpatches-4.4-222.experimental.tar.xz 83348 BLAKE2B fbb8c234d060b3c54b0ecb3763ca0b36700556817d4bec51ceace60a68b82c7d93c673ab3372e9e0aecfc9e0cf688340c6122070b509096971f98e1bee86d71b SHA512 d8c39c415bcb5f40e1d3877f85e9ac649936af66108d9106f5c6732b2f75b37b6a18893889fc4ed6f8409ad47b0d5a2ba1e45a16bf31a0fa3b0e771789841d83
 DIST genpatches-4.4-222.extras.tar.xz 16496 BLAKE2B cc06659a35fed7d1bac1d7c8076f1199b5985b99202c64b6f09a8557361151b51be540189b1ffeb8acfe222cfb4908e401f74b5757e6ba65a2c16dd035fb831b SHA512 294bf913915ca2669475be17dcc91f2b65c5c48bf59964650a869f1d2773e2940a09b8caf51fa92db7933d3eafa3569df64699ff10bcf1b16bed1c722fef7581
@@ -34,6 +46,9 @@ DIST genpatches-4.4-227.extras.tar.xz 16500 BLAKE2B 79702c286573cf70c9f6a7464a0a
 DIST genpatches-4.4-228.base.tar.xz 3699312 BLAKE2B 7706d3463ea7d73f72ed7b9a7c30edc0fea2f1f17c757cd2667be2f2ba812904a1691f392260854903911465d20dc8b027e5682a551b3f298148068b97f28e33 SHA512 36de1c52773f80bd48fe50de7e5592c9bedf88e9a7dd841a500b45e053db1881a05d50966127ff4f84b0ad7dc9e0cab6b333d09e8d3888d0a274450905583341
 DIST genpatches-4.4-228.experimental.tar.xz 83284 BLAKE2B 4e5f021784f72a85c56f9b86ed908800d69311eed9c199ece2850b39814c45d8dc83b5dcedc9f4ea1d45c8e73868eb673831b06fa7ea38145e27e0849b169146 SHA512 cafb52dc6d6cd9495e899bee07d57bad8697a0e42efed57615ce63634a4a18309f04ad2cf7533a89198c4e719ad4a12233fe23640be22f3d03f20ed905e85c40
 DIST genpatches-4.4-228.extras.tar.xz 16504 BLAKE2B afb9e67861da68cf3ae291e6c5bbc7afd0d35f4900a56c7148880eedaa70ec1785977fff53bffc9d03635f89db7b775fbc8889dd42946f98298bc6f3dc353d58 SHA512 eb63125254ea339c14085c1e7b5621917536cc3e3263d3769c7ae4c2ca828f1fa0aa51965c6c58041bcb3dafa82891b87fdc206b730462e5beb40feca62afed7
+DIST genpatches-4.4-229.base.tar.xz 3720552 BLAKE2B 48629037475319cac031849a45a6cb36d45036ac47366739dbd737f345c2906db4249057a920a9c3ca637c5d0fd731e93b53e331ad2cde09b8088692f48177ca SHA512 e0f1e2327398f5a73b2aa7c3b8abd42722610ab35340076ba58543e3852116ceb92afa7b3ba4f3b112164c57e5000c1584be3c9390f4048242eb0bcf91699008
+DIST genpatches-4.4-229.experimental.tar.xz 83264 BLAKE2B 3cae1db18daa8072cbe45cd50942b50ab4b8c3fbcea5ad87e2b9420886d4b8f2840b06520c271944835216a4543c4d15b1547323ccc0c24a12f6983c28b8289e SHA512 96207a3069a4424b540c952a6f553caab8abb55b37d5135f344d772106d4905784982dfed7b281112ba113fcbca3366173f6a76c6e8a255df5031c608c6911f2
+DIST genpatches-4.4-229.extras.tar.xz 16492 BLAKE2B 9c0d4734997f9af0391427aad0e2f4e2c634b2bd6439ead35ff3246effec666a1b27b6a1fab059e7a0520b169a793bc87ea499e3f1a7375a21888a1ef9d5b9b7 SHA512 f369a2ea1ca60a1c89863127dc60e0d6cf7d6edf1cdae1b6298e0764fb572c47a79ce9c9056821dd485ec944dc8791380f2ec71ead49c9eebdf50e1b76761204
 DIST genpatches-4.9-225.base.tar.xz 4002512 BLAKE2B 2c8e3586ad499caf38e45ab80bc60c302486ccf23508e289bb9c48e9fa8bc7156c73831e4afa1d7034370c8c5c5600f7fb7a7cb8a75e326cc12396ad1b33cc10 SHA512 8c5f99afaf2aaf0016be4ab1ca76678162bd993dac1f7ff8339106abff24b024605bd816e44098daaada333ebcac04aaa960b2ab6f35f5ba464cb63e1245ca6c
 DIST genpatches-4.9-225.experimental.tar.xz 106384 BLAKE2B 9c2f06e7adb3cb818ae8215cd9b9499fea83ba10522d183e4acff04ca27455156e0c2f5718852d6058e12c05ede00760313b9b6d047b47f80b7e9c6335638d46 SHA512 02c755491e2941a6399f3ebf4dce74c2ecbe81da88dc0d361aa151131b14724ebcfddc16e18bf9fc4d882b02f478472be7be5028ad6dfb931fdbab80094fc8a2
 DIST genpatches-4.9-225.extras.tar.xz 17384 BLAKE2B 6346d0933a74224a34f78ab9df10a918d3d927fdcd8fd4cca8b5d2692442339a23b8f14942b8927b892ed1d1fd24fd7bd84f58de2739bac46e1e58848c834ca8 SHA512 bb83b8779580202897823cedc9bf60698f156f57be1f22ad18968ad8e27517ca963d7d444c04e497c73828870279372b49801b51ca28335ee990026af0b56d63
@@ -46,6 +61,9 @@ DIST genpatches-4.9-230.extras.tar.xz 17408 BLAKE2B 324a0c470ef1ee70b89e5a7dfc67
 DIST genpatches-4.9-231.base.tar.xz 4067876 BLAKE2B b97cc3033f3ee4d32873c9cda6c78895162c46b6b6b262a24d9db1c76e8f8be7b4e590ddf9bd6ac3b545aa4a4974ffd72f69e004a249c0146024b95d6707fb0a SHA512 e7da0fa260b32119bb795a582c3ccf2219d212a053a47a482f3e51af20a5a5e190c8d416af79eb96db4a784f691ee47d85d751ee4ad7d0992cca41e2ad8be606
 DIST genpatches-4.9-231.experimental.tar.xz 106364 BLAKE2B 0f3dddb5f886f6d17e63c0e9151721ed4dfda0d0f45f39a1a961af2916944ca623bb542c668753cde53aced86d067248602d229c2f17cbcd2fb480db5ad988f5 SHA512 e46325411eaeb4a07550e0627e0c59a63e8ffa6adb50873e7be8db149902731ecd5edf9be7b710bd5af725cf3f05dbb54c71a81aa7ff3ee433d401ae5a54935a
 DIST genpatches-4.9-231.extras.tar.xz 17392 BLAKE2B 1fa5c2a7742f45c5851cc6af53bafce62bdd4508f2447b55d280729d7e8f0debd320ce7630208e301edeec4756318cde6c7b1c2533794b76981a1c34c0fb98fb SHA512 c1aa898023d03c840ca4a0dc49060ea5656f498bb3a680606b908f2c92195bcfab7e93d71bfaa0913f41d111d479504a19f2a5f36fa203d5817167f0298e8e93
+DIST genpatches-4.9-232.base.tar.xz 4094296 BLAKE2B 1dd145cfd49044cacc18e713e158019608c484d20a98a63978956d4121abe5b14931e52b1cff66acfdd8318d9ec0a0961925976f435e9562e2116f2002db59ef SHA512 63c410893bde42a53f653bc91c67c31d8ce3db049dc5c633cad46b1163598687a59a69d011f2b22d2b94c3f2fe07a68dbe2b221ffc071d150f9228c7f28ac77e
+DIST genpatches-4.9-232.experimental.tar.xz 106372 BLAKE2B 94ea4508513c3b1904d1ab038cadf8ad3499a2f37ca500dcb58c38fd35aee3598e3d50754ca2de4703196d297f365a7b91c9896e8e0f18abfd8f43f1e8f8f0e6 SHA512 e317ccf6153d8e755263d855cab06488df0b6fa496bbb946febb5e854ff24155654b845cf316d09c51db77af3d60d5ca9026449fd9979e760778c78a2faa9500
+DIST genpatches-4.9-232.extras.tar.xz 17396 BLAKE2B a589764847b8fe53278357c7695ddeeaadbfbc0115f292a523975ad6f9f4ccdb58f4433667fc2a8656a8bdd728f2a7c33a5d57da1a344c18390206647eafbcfc SHA512 ffe3c83411b7bb6623edbfc63bb9f6a5e8b38a0a76fdc59ab0f29863dcaf2fe76ea7a08d115862ad921ab3ba05ed000bca4a676f569768d10ac2beb02508f011
 DIST genpatches-5.4-38.base.tar.xz 1364272 BLAKE2B 708fff34d0e5db8971687815f936bb6fcac0049fdb8351a500c67ebb5c472c8a0ce7a8e580b20c841aa305441c849cc595735292fdcefe8b9877530f110bebcf SHA512 6accf4fc70cbf2463df6b50001bba07b3d32985451de341398a8e9f8b1281ac3ab22661b5216afdddb5072262ac238073b83231c9fd2b90b27b8cc3b9f1d8850
 DIST genpatches-5.4-38.experimental.tar.xz 6140 BLAKE2B b61bf414cf1dc573ab72ba84530c4fc6a565e0e2fe39c84b822a76dae4b708a55521d5ea0f680c92bc62a205c2939e0fa367a7c80ac2218da44dd361dfb0af20 SHA512 d3b35b54359ecb5177cb475913e847374aeaa155f28f120f2994ea09c7124c162a29dfc092489e2e044e52402df0abaf1e9179fe4fe2a363ca319289bc499c2a
 DIST genpatches-5.4-38.extras.tar.xz 1756 BLAKE2B 2e4d217bf53de074717b18748263318cc637ee85c1217caea175e7f47ffa74217b1e06a5bd19a0ba88307423d16c0a2c6c7975c8d3fee83a8d1fd65a0cbe4544 SHA512 db347a70bb1fd88ff37573ffe7bb1b03f61f7cca9b25ef302ce26e7e849bc87aa1f5b5c732fb3fae3a5efb339794be6a11eae386cf444fe50143bf46be3544d3
@@ -61,6 +79,12 @@ DIST genpatches-5.4-46.extras.tar.xz 1764 BLAKE2B 80470783d8e6f2fc3ef681e113bc51
 DIST genpatches-5.4-47.base.tar.xz 1555488 BLAKE2B 4662bd4c69d3c3f59c85620c2be6dcefdb31ebd76ecbd8e65f264fe6815c6f4619693329e9d2ae30aad7c4a2b7bd726be0bf3ba77bd35b489a964502feacbda7 SHA512 71a1dc9d9f3ad4ddcf323455ff0de17a8a7825d54edef4cda8c17809d213550f2cff2e7e181dd087a6cdaa96e038105a141273ed10fb5ea01d170352ee498a2f
 DIST genpatches-5.4-47.experimental.tar.xz 6144 BLAKE2B c8960836306beb9db234f6b8f853971efd16ce581356eb3f7ca438b2c0122608bb97b3f52ca862f9170163fef0809b4a466cbf3c50f550ab985056de91df5d43 SHA512 e5b0d03101e2bbd879942392675d5b0825ad2fdfd44346607cfda9098734b3e7a3b160a2936b8b95297dd2d942b8f92142d55527d696d5c7eb7e1bed71fc5fde
 DIST genpatches-5.4-47.extras.tar.xz 1764 BLAKE2B e8e7f4b48c5b9d74f3a76d9dd07a9a549a96a402670207658e15e5f2c8f6f24f1e4f2f68ad8709f2d13d1b7931c421556eb2771b4854dce8d9fd579561f6d66b SHA512 d8b3daf929a7fbfb1623677f8295c70c7fb37c3a7cfe233cda909a39c429f62fd527400bda45e3956e937bbfdb607a2e155f1dc4942565d0b419e201c05d65ea
+DIST genpatches-5.4-48.base.tar.xz 1620972 BLAKE2B 45f358c85092ba422f8c411e91da90ccfc4b607f9c095dbe9ff02bc6adfbab4b35b03763316999810364d18ed3323fa613b70117e6f8454b2ba74744c1266b0e SHA512 b99974f5491b6103bb3e6b3b97e613322001bec40e49a4edc53893e94df66b7cc03370ca28af62d21dda995a477e395c16c22b8595ac96723ae66f2747fc9df4
+DIST genpatches-5.4-48.experimental.tar.xz 6144 BLAKE2B 33e0e921370e8224026984f721ddf952ae05980c405b4e7de930ac76e25097f4fbecd13a1ca4fbdd73afa6c68c8dd32dd7e6938212c79daf52f705289b91809a SHA512 c12c332f115843369010cb049872ec8c190e001abf537bc793c9a120a5dd8ec773fe971b749d95f96c590b659fac22e2a7f9b2b1e55093c4d0d542c6486b2536
+DIST genpatches-5.4-48.extras.tar.xz 1768 BLAKE2B 3f281c1c36c2a52e4fe2419592377baf4553c5fc61088911e50a901f96a1f4d89dc3e1b441b4b02575fca77ef6c371ccbecf8c55ff2eb9fbe14a7047451ae873 SHA512 9d2dbd829c53a310549811c2f133b19e4525c103827c5c5935cbd09d790eec105957dcbaee10cbe6409e0b7e00065c91b29a52e6d2bbf8e41859f5e4987de98a
+DIST genpatches-5.4-49.base.tar.xz 1695772 BLAKE2B ad81358e16e2c61bcfa1649e535edbfc4aa331915e9ba7dc5844e0ac7cc9ebfafff49ba7e1cb71d4e4dd6536c8094118da0d0dd82d6be2023b031dbcdde1d25a SHA512 eb03a777c37b71456931856174eac2ac1570ae700345186dd71d978870aee08e8a76432cf777257bd21666fbc17f58fc5fb0b4d99333cc4c730931d0fbd4a496
+DIST genpatches-5.4-49.experimental.tar.xz 6140 BLAKE2B e46eb41342a59c0fcbd042317ccdd499ecf384e4485139ad66d581585922be1a3d90b947c8cea28bed0b653bc9ba78987218a2a1c1ab4ac633b211f7a035bf97 SHA512 6cbf24c226670a70b75200e9732af9b99567a57c7dd7918f2aeba057cdd84259af27686999e9cb83c0c604e4cf0ebd340294d575fe704691215857d28f469b84
+DIST genpatches-5.4-49.extras.tar.xz 1764 BLAKE2B 285ebf3fec9ec3b5507f80dce0d6e24f635597e1bbae921135bab4ad6b743108fb8fa2a390380e030dd9d9d0d7e240dabefe043a1659cbaf6c8851d5b64d0006 SHA512 43e66a2537b42f53fdee24350903d28ec6904b2dbc10a4a1b075ac8542e6acf9adaa66defdbd10cd3f9b177a369fa1a2c6e4d6c45067b83cc0b381eea97c654c
 DIST genpatches-5.6-20.base.tar.xz 474872 BLAKE2B ee8eb1db2f33a8f3b6dbc700f92b7ba124072b5c39ed7a7ceea114daf6d571eb7ced5d36e09fc90b5d3d9a9c36b87a6c4372f92b8f422f5d45aaa56eb7b20641 SHA512 05e69032d1152692dd93d47212e80d2ad8167777aa3d3290b0019db41f77e9ab486adb8312472c753ada6c94d715553cc9d205920580297c9c49e173ef4dd0e5
 DIST genpatches-5.6-20.experimental.tar.xz 13704 BLAKE2B 40dd9f344fbbfde4a7cd1efa7dab9c5b5155d3e0431b0c6bcfec26c484dd8111f4a1e525340e5a26d67d3675ae77ca9be6e326e42f1332d91c18c2ec3d2b8ba1 SHA512 874de82056c0be899f028ba3318af6e18708b2b89cb0536ab0e46163aa813bffe05395c29c6993cd7612fde73faa2061fd8d9040479de9c00c0b966bdf6439c7
 DIST genpatches-5.6-20.extras.tar.xz 1764 BLAKE2B ffa3cdebb5e9a0f22d23f106d0a3f4395d878277d3c62e2df1e2d333542b9c8ab3cb076a50092d1d19b6288bd39571275037246380b3944c003cc2c309b09732 SHA512 704b9c25aea54d746c83eb96797068af3c7fd1e39966f4e21a3f6242a3b0ad5bf749865088d1df9b93f4fb765e49f96dcca5929c5c194abdb25d7fd3e36d531c
@@ -88,6 +112,12 @@ DIST genpatches-5.7-4.extras.tar.xz 1764 BLAKE2B cb3b1a55e9dee36feaceb5049d4e525
 DIST genpatches-5.7-5.base.tar.xz 68572 BLAKE2B a5f975ae2fd61e1e732da8ccb364b969930563752f78fe0e0632edeb486312ca7d9a09fc1e57b99bada394e90cb3a3b76eb41ef8218f93ea0a4dc4f1f23ce012 SHA512 ef5c254b03edf280f3e38ff49d17a856b1d3898bafb8018d1874c1fca3ead90edc88799bbba1cadca34b2a0b2a55b7e7905910ae941e665f783fc3e355274fc0
 DIST genpatches-5.7-5.experimental.tar.xz 13708 BLAKE2B c511849c9f1c8e874b354624c99164af2322d9b3429cae5719224f0f60717a08235252abd6eeff672d07a3154bd63517a50478dec734109f9de69b2cd85c5139 SHA512 31b425772e0faaa7ba26bf1a423bd953e6c1a151874e6d0d89ac1983f45069ea95e0b230778b7f41811f87d2688509c8f3c622e51a4650008dc914dd6cfd54de
 DIST genpatches-5.7-5.extras.tar.xz 1764 BLAKE2B 381917b2f8844995edf7c86b9420457ea2d8d8904fc5af94c6ce26990943bd7a61467e3386ccedff42cb4d6c51a2b477ebb89a763edba964995a61ba46f5f4f5 SHA512 8e716f61f988951f2b80e1e667752228067606275392a6084a564e9e4e051d86823458084cf7a3c17a0e56ae58253aeb01065e2329d480995d15b646eb5be761
+DIST genpatches-5.7-6.base.tar.xz 182364 BLAKE2B facff9299c5913596be8bba1dcab4b06e2ae697d66df645ac7c0e8aecfbea7788b4c4574cee69d4db3cf9c8f97c18be4af17f42ef4ec1fc7380b4936ab63cfa9 SHA512 68d3e2e70ac6838ad98b179e9b0694ce96ec0fefec98b497ed0fc689958d413f502915101ee9f38fff1fb5fb6b57d9e79d12870e280bcd84836cf30cd682a654
+DIST genpatches-5.7-6.experimental.tar.xz 13692 BLAKE2B e49fca2f4419aa0923f33ba38daab49faf105ef03849bfc59dc9efecc980aaf3ccb0e34a7755149b1e4841b884494b146659df49f44f5e2913973d4ada9d5e63 SHA512 f83f8485d4e3f2c0bc5faf6c59db6745e287db7f3eeb4d1db7a8c92b7492d9d1678069c67e89fec2ac63f831a8419855caf70f9e71efb7ebfa7c0e1461e37ab3
+DIST genpatches-5.7-6.extras.tar.xz 1764 BLAKE2B db13c787489b7b21d9848cbd0079683bc5a93a9ff4df09901bb00cf275183f0a367999fd9416ec97d36cbad6351b119bf6fb347f2fb645d4e515f3e6548e9f96 SHA512 acc190f9c6efe34f5b29a86d787ec047bf8df1d8b7c726fb79279f77b2cdb7a0bc777f353c9ecadec7414797f15562c36734a69e6bb2d4a5f05acddb659c4d12
+DIST genpatches-5.7-7.base.tar.xz 322208 BLAKE2B 832e79c3aa2a044993ba2b0f75e844e5da0adf0b290e4c1e1883a382b94ee5ac882cb2b0db585bbb2ba133b5dbb908b6c02a29ea4384a2166146448d2e8eef15 SHA512 4321746f6acccc17d84ace29db9214528752eb7230265cb296b957797656a9bb65dc47529b0d2d3c8faada1f0866fe3e4fed79bd57d7154cf817183aa6db0e0c
+DIST genpatches-5.7-7.experimental.tar.xz 13700 BLAKE2B 3af6ae0514af32f5c881d67206085da436f4445f436c5caac0b7e3548553aa1da9843d1975a87d5256cd6a9b7ea44030ca1757621aee7f44ee328eaf138b9a90 SHA512 ce4b739c2713c3c244466b20f7225c89eb7dcae00454368828c90f460c953a0abaf25f14dd2ba6a6107bca8ba0c1cec4b9ad545ecf931517b2d67908fbe103c4
+DIST genpatches-5.7-7.extras.tar.xz 1764 BLAKE2B 01efd460c869218bda48f2b7b270d67e4da47b6ada6af38301495bfb960c64049898a8705146d40f6baf9d4782cea3e3be6aeb55a265ef5ce2b7616a8c7be657 SHA512 4fb0a24a6cbbb05cbb0c81daba926c6b71b01821f8cf60fb81fb57b5130783c99ff726e93b7a7a265ecfe1194a353189e790a5d17b8d86cd38441a1af2c3c74e
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
@@ -99,23 +129,31 @@ EBUILD gentoo-sources-4.14.178.ebuild 729 BLAKE2B 01d8e05b136987c35644c083d51c30
 EBUILD gentoo-sources-4.14.182.ebuild 736 BLAKE2B 7812e7dc6cab0b94986e5043c3863301525daef79992fb2e5bbfac6146775131900cdb89c155c228c1fc68e02bfaaa0428e65cf2b55e28066029784ad12c8fe3 SHA512 baab6371e62007574e50c59d712f88b192dc9d92236d343b47f9af694329848a43e8f7c48ab585ef9ad82fcb443a3755e123798c812d3310f390bed4227fdb6e
 EBUILD gentoo-sources-4.14.183.ebuild 736 BLAKE2B 920b25f745667593e8dcae07acba03f6b8e7481620a32e365ef49cb539aba07846219cc7bb9fccbbbabb52b3a81b96b7cab5f2c380dd350b3fb4ec93edc009a3 SHA512 fcff548068cfbcf05053e8933c6b21066b4f31d62529f877a7da7f69bce7341875d37d6901571c9d2aacd026eea733dcc87c6adf6498d889a411410a80c71f5d
 EBUILD gentoo-sources-4.14.184.ebuild 736 BLAKE2B 3d1812b86b266ca6a6b108ccc07a109a528b436b4dc7b42249d18f7c16b0c5dbc626829491d2ce62c6f2d78cb023dd8c4f694a11d93f1048c199c55bd2ebae99 SHA512 767d9f3636c254ef226dfd405993be70d82cc46982875f1b0959e088b37362e50c79f720716c3f7ece253c1b2935bf87192fb14b7426934cf6ac83b2a3413717
+EBUILD gentoo-sources-4.14.185.ebuild 730 BLAKE2B 055933012d82956d06157db02cecb1544fa0a591f508606406d73ab0b53c6273647d4bed34f75ed7da24c50e6a7ae8bb38b5d986cf12e468072c96adc1c2169c SHA512 93a73f9eb9880b53f8c688b19026359f86d5b61e7776729c5dcc5cb6223517e6054ef6d235c0a1f8278e36949b7a5a27dd92f957b83a1d707efd4bb5b2f48d42
+EBUILD gentoo-sources-4.14.186.ebuild 736 BLAKE2B c14626be35019bc19fafdfb8a3860922260d2a4428a61f8632f4aa24acd6724258a0e321c4b849fffd384c255c6b1e3a7e8272ccd1a0330dcb1313e0d694e77a SHA512 c6da71dc7606203899bf438f3b8b244c1997aaa238d25fe81c6cd1e56788993190789fede567726fc38065b63d91043fb3743d711fda198bde6594cffffd5540
 EBUILD gentoo-sources-4.19.120.ebuild 729 BLAKE2B 293fd5c4504c7514cafa76da359835ed16ef486a3260b8530d2017636d9ccea4b25e498a5934c757d11cec3f04232c66daaff57fa53724dfbaae42f4de3dd7a2 SHA512 2f78ee6237d86516b4e27c0927e96e5b99c82fd8b9548b16f7b93e9e4e6d6998e2d6cf410b2457e5211d5767dec4b925c4e552c0740d260656c6f62b65b08627
 EBUILD gentoo-sources-4.19.126.ebuild 736 BLAKE2B 3cba0f708866bf0e9a505f12589d5ec4bcb20eab00ce65351657ef3d5059662bf4f87f6be2983ff0bf8cafd0c59b5fcfed008ab3bf8cc18e06ecd03bde71aff4 SHA512 b5e2e88401d23f0f73be9884d7a0ade55c1a14c0f49fa74b9a62576664407ef103f42dd5380d08015ba55d4db09396e01aa611fd74322931079c061b3acc6560
 EBUILD gentoo-sources-4.19.127.ebuild 736 BLAKE2B 0a153f0d5b02eb3527ef5149008b8a1c1eea8938fa8a8fe9f8406d693dcc30339113349f0d28ab20be03a2f3e586d41a563c2979be0867d57b01e17b55f45f72 SHA512 24fbd99ee0b7643b85405c0b6c620349fb08c70c36d6fcd48d404bcd6279abbbe92732ad0a09b52d2136883864629462910eb5b4d15705fe4074a7f3cce8601b
 EBUILD gentoo-sources-4.19.128.ebuild 736 BLAKE2B ceff7e82c63c6557fc51cab9544333e8f1d273a61bac6e06072fe693a373ea7ceab312a3204d75f8f18c8e7261fde7bcd4503d0eb22e2fba079dbfdf9408f099 SHA512 9c45d34ac38774107fe33d432cddbcc3230f56b914182b0690b57372438618111969b07f96803d4e5ce742bc2d7546333e5b1f78d91aaf4e1c2523178405ef0e
+EBUILD gentoo-sources-4.19.129.ebuild 730 BLAKE2B cfb4dfcacfbd15945d4990c23342cc97759c4d9a9a480e99964b045f8af2b0e3957ae4ced08ee294579755ec4b2ea864fe4cd5461c12cea8c04c990e81f5a022 SHA512 7a5b183017703855298b6485b9babbf044ea7d51e7420cd55d4c4b1af6f546d0556531c5745e3550931d2cd0d35999588814ac785644958586c10a356f94b27b
+EBUILD gentoo-sources-4.19.130.ebuild 736 BLAKE2B 6c40eebf03bb5737c76f87b79da6a0536682f533b098a4ff117cf0a2fb2e9f53b5415b205598f1db1b41ecf04a9d83c91c01bd30087c6c92f1267c85b0edfccd SHA512 5e15875a0185e26ec263d8fe64ed01c0bf35dec66c1b6cf54643eec8aed0254b93460e7bd55ca52d9ee5fee3061b58cde54ce291d5050f1b56eb720954308635
 EBUILD gentoo-sources-4.4.221.ebuild 729 BLAKE2B 6ca7a8f5c029ab35fe94e9cd49bca37f553cae98300ffd0a1ba2d2cd8aa34297c0de7508ff2d32ae0eb60b65257c0ca7e7897e9af34be4d37ee245a4daea8830 SHA512 01e9c43a850a92c9c5b5f5c0a74f838ee86d49fcfbe462c55ff42beb553788f15b962c7d6f64562c94a1a496e2df9666ff6b558e64722da8987b15855885325e
 EBUILD gentoo-sources-4.4.225.ebuild 736 BLAKE2B 7841c89982fece1f7613901cf85488fc2444a69124fc309fe9724ac26bfb18c82321a7144ee2399ce27a2028876e46a40870c5fda5c6f1cb6c71265520ec7814 SHA512 d49759f47d66d9a50c128f5b38bfdbbe23c48b857d5c788a95a47bb4db6c4e203c467937725bea8f197602920527c6fcf9562e19ced9477fd93b36cd37e85dfd
 EBUILD gentoo-sources-4.4.226.ebuild 736 BLAKE2B 16209683a051838d74efd9dd54b84d2072aac36efa2477674993a16e2c70648e6d41e816c36f23ca81560582f53097d8a17f1b2311b63f781af5e626a7dc4505 SHA512 0abb4d52986657da89bf80e36891985a3957828b654f54ac87361b957c1bee63826c6f88472f9992c4d07a0f248773744893666a4f3b3a8f1950303b0b6f9e08
 EBUILD gentoo-sources-4.4.227.ebuild 736 BLAKE2B 73ebbcd363f716f2962638dd013d137ab9c1c04e2f5b82f5437ccf7fcb213fd1e1da4c5b0d79eb00fe1b593ca24d6e8c2df3d640bd3ccaa05003070680779e98 SHA512 868d63619b397ab88db0f7885f2c6d9b4c12530b72e06aac6fb6eca6891d472c214f2b6bbaf442b6e869948c3b2ce2551a2b3550b6c99310099b92ed2a3d7bf5
+EBUILD gentoo-sources-4.4.228.ebuild 730 BLAKE2B e0b5fd63d11f098ee2cd35f92b74c46eec12b5134825bb7c99f9e0a3c6082c34aac36ca40b172048e6c1c93a9ff1bba2abacbe2eb6cb86831c8883ad7e5de129 SHA512 ec14fde115db161fb72b445baaa98a53cc24235813c49990ec0726ec4f21923fa25112c6ea4f68c88c739256bf6a55058bdecdd11573441f476e78e05d1584f7
 EBUILD gentoo-sources-4.9.221.ebuild 729 BLAKE2B 2f47985d51bd1f16d0fbc8d52c4edf02713ad7b8f47d230a324faddc958767f9fad93accf89c6089ffa268dbec27f61934055446b62603d900fc40814cb9ca29 SHA512 5ddd789e363975fb29927d5567373fdbaf852d324ee55ee2734970cdbb9c8d61c3f23417ab7dfe6b466afd7b12a528712f34b36b4a12e317c3a22bbd1d416f5f
 EBUILD gentoo-sources-4.9.225.ebuild 736 BLAKE2B 82c2712d026b7e75eed0125ac0376ba99384ae7635a195917b8a5531b33f7f879b9bea66ab4196dda9b91df66c78a1cffe4479f1ff67521d6287702b9f527caa SHA512 e8e742375330a19b841132730b090c097f8f6193783649f2ab3c94ab161d598901ad9171a2843ea3913bde610390596d36095a7678cde3e5d69f809ce76b0f73
 EBUILD gentoo-sources-4.9.226.ebuild 736 BLAKE2B 098d95c43bb0cef02351d13f5f94c4e0a059e44937e1ec5dfa7b999d076695b5fabea1b9fac0ba56854480621ce84ff89a771bb5bcb21d23bdc1aa5513a22f80 SHA512 c113f6e8e3f192e9eba4f720f72addbcfd773f9f3ac02daa59d047f64ba79233094492faea634c02af50728d1ca9271996178da009dd165b00917691f17fc9d0
 EBUILD gentoo-sources-4.9.227.ebuild 736 BLAKE2B 1ad2d8ddbffcb41a4392ddececd202c33dc9582c33fbd0b94d03b93e625ed382b2405caaef3d605d59359ab09daead5c6653f6bb89e51b82724171c1c47356c6 SHA512 a6a16b369bb22b3334e0a695391292ce7d5811684a485c07f683c8da418318a8d19e6ff31e54960ca44481d3eb96a9612b97dd8de27fd41a5b76c2c96fb543ab
+EBUILD gentoo-sources-4.9.228.ebuild 730 BLAKE2B d22725f48b0aefede033019c7531d8988fd2e5f88d0c7ba9a87c892a4cd3ed2033ef02981d36f0af7bb737e335ce8b96adadab2aad7d3fc27ad06e5d6a848450 SHA512 7b0e635a6d2c46910eb8184a4e9b59a56a272ccb6a68943b0dfdac4e254874b9a05700137576c243e670b8335d9d39747d1e28b961c12426893e35bf63dd60d8
 EBUILD gentoo-sources-5.4.38.ebuild 728 BLAKE2B 6546a7a7b36a8947452844ff1b1fe0accaa15f75b298a3067c8d01ca88da2dcb376806918ad69d15b000b8d42078f2d49d5601d1e3a866f8fe540cb233c3f46a SHA512 a2e7a90ed18991b3e9bd610b6427a801a7df65b03d165d6addb51a3400c97fa392f6e4c07e7ac86bcee01825db3b120bd112d36a056c3d26a551dc3278a83bf4
 EBUILD gentoo-sources-5.4.44.ebuild 735 BLAKE2B 60398dffa874f1a23d644e6b1793b86d451eccd44342895c6e30490b1fa8ae39ac2d0a01a5b190cb2f680d615ce612d14923477a5a1511898007f0c9f4f35d69 SHA512 8c6746f9f05d76a4cc8cd6436602161d1f69dafa98cd07040fa845f03050c9b0a2805b9c66fd2afafb1171b70e6608f004a79c5a7eed379ac55dffb67e0f56b3
 EBUILD gentoo-sources-5.4.45.ebuild 735 BLAKE2B a01bb08e5b5d344e99a6fa11d5e16dec8cc4d93c70448bcd31976f516ad814dc728a9d3e9efb95e50d22160905c637bd460edb4d6786ce624fe60f46384b6cfe SHA512 b8f529743edf1e8a05aa0d70433cc09e03602f698b233fe064432f1b5a6885724750bc7f52cf9d6f17bf73fe48c6d4dd4b6ef7672ad7b81666435dfa49527e0f
 EBUILD gentoo-sources-5.4.46.ebuild 735 BLAKE2B 90eec943d65c2c4b688f665570835222f421a7018fd9f26b0a63a42f864c4ebbaee9bdf0a98673981f348e73282598bc41cdd65218c8c84c1e9661f1e888e407 SHA512 97515e24ac7c3e99de7c1fd9ba6971bfc6cb8906a59c87688bce0c470eca49564f1bf95d68120a9e3547c81f84f608e6103e1742db7ac56ca780b0c26c39889a
 EBUILD gentoo-sources-5.4.47.ebuild 735 BLAKE2B dc6a13b2c29966aae8d0a9ff26da9edd2893ee6d22679d2abb700639ee76d56fde5f7164e04a85e0b248aa63c0bfc2c720125470f1d47a3a4bfed553763551b0 SHA512 fc2f2f197385d8e980e78911b06b72a8bb95b704832cad090b39db420e796fa1ce26f8e113dfda84480718eb3249fbcc8abf29bf126d38be18046df7842b4b94
+EBUILD gentoo-sources-5.4.48.ebuild 729 BLAKE2B caa7619691c0872377648b047825e384f990b06229594c95d7d3f606613cfe17ca9a836ee2752dac899e65675c204b69a7267c9cb58b62188721579fc6d17c77 SHA512 ec4855c11eeb193cdaa1fda69006853211531510277f78b1b25b8a729645fc11ce4d7e022136ccbd8f4e1ab17fbb76512c1dfda3a2c8b4a822071967ce6d1b38
+EBUILD gentoo-sources-5.4.49.ebuild 735 BLAKE2B ad58a2a8a0171e1ee878b8d0b005f6a1d4b66e2518b33e83fc1dc9d600ec9cac385b6058b06d2677a04eae436c634eb645d5cdf39fffb4fcd2296ef2ab9b9991 SHA512 441b89b51558050320818f85120e83f840252cd66a61f5d8ad109600462ee5e081a50dfce68b8c5845f21d68fb19fcd2b64447cdf03c8987ece23bb24d0f7d69
 EBUILD gentoo-sources-5.6.16.ebuild 735 BLAKE2B 6ce13ac4487ed3c096b132b395c66d4a8750eb56b66a2a99361d6114668ffd79e488b1c9be4b775799416d63074828e22d864d31c630471edc430cf782696f46 SHA512 7af998f0f7c9a7f43cbc2058946a1c9d4326d2965755390979bd29c6c32cf0e0793e487cde0a26f6599d3b04673ac07a02c2e47e9f666590198fd6b3ec2ce687
 EBUILD gentoo-sources-5.6.17.ebuild 735 BLAKE2B db28f4bc1823b6439d9fd95da850b18afb4defba0d321e75d4d425f61a1a22cfa8d33cc29d8afd40732a16ba2827d2f235451e5ed70c2d6e5a363884390b2f6e SHA512 86ff4d97323814690dd974d5d5f2c0abafe85b49bd340995c275f4d58d1a3d38fd1e0742165889c8a3f166a0440626c8e1fc8df90190ad60445bb5029097dacc
 EBUILD gentoo-sources-5.6.18.ebuild 735 BLAKE2B 6ca13c78a24a7edc6da1397319d9aa9f3aef7df81a304280427ac4e314c6590895b015b6b0a3c44dd62c54bac0ab281fb499de1e8f4001d4a89966838a704ce9 SHA512 f5ebdb62167c894f72699ddcf0660d7fdaad5f093bcf26507b3f98795ed58712b5374b3087e43f137ebdbc258a9c654377e70cab5dd4481680ed930a58c54291
@@ -125,4 +163,6 @@ EBUILD gentoo-sources-5.7.1.ebuild 734 BLAKE2B 43c324d6b34b49d6bad0f5c413ed35b4b
 EBUILD gentoo-sources-5.7.2.ebuild 734 BLAKE2B e0c74e23717dce34d4f6a7905444920e33df86f30a2d5748a9f45bb9dae8118480166d77de3c0e0978b42326a14529bc2c18629375dffd4c07c481b09cd71cbf SHA512 0c2721ca787d8e8b369664f4d1c4ecf212d353e22b683c0e3e83134e6bfceea473b77bf94edd085edc452ba1447805a548c4182e229846732492eb3d93969595
 EBUILD gentoo-sources-5.7.3.ebuild 734 BLAKE2B f9c06c7fcb3d3e1714d7371e154a7e65cc0e41455c751b7d552ba796ce31e46e9da60f6cad6760d0cc0320ff541b4f5e428f0c06759a1f2edb513dd99da74ae1 SHA512 d18aa302dd6f0268422e17fd0fde7d592e38ac0ed574c982ccb79ef46eb6d8b543834cde71e41fa75ed85f0672357d2bb901ce8ceed04eeb833fc332ea0a96bf
 EBUILD gentoo-sources-5.7.4.ebuild 734 BLAKE2B 394de3dd79025b61d51744bb8dd583aacaf9636f08eabad8e9f0565713af4368b9796c1f7c2cfc67b9c90a5ccd604ea3c964d2a1b85a6e5921e45ffb639863ef SHA512 510ec265a59a2398007bfec9e5e3a3be7638a7a2f8ab9500b98fc0ffdd26f940cdfa074445bc154410cd4d099057ece1351fcef66aaa12096999c17a84827817
+EBUILD gentoo-sources-5.7.5.ebuild 734 BLAKE2B 5a4981b9e187d92f0330cecb9ad95b17fb483a766ff61fb85dffa5440eff17616e6b09787e5822bb52587aacfe8933957da460a5227fa62b9e7a3ae4b38dd14b SHA512 f4d8ae5c569f6c19dd38fb4ac411ab8bc94592069a8149cf3e8baa03a0465b0e0a894b62da62711fe5ab3cd99580b32ef78db0ada1c5e582e725e456c1342c00
+EBUILD gentoo-sources-5.7.6.ebuild 734 BLAKE2B f602927c87bbc0fb4b099b47547aef2f752cf2135a9ef3ca58fe1b1d0b55dfc6d2d20565a85bfd8a742a78b4e7527468c167960e92adfe516ed9f5bf51a98856 SHA512 bb1e4df14aa0d8ac8f4f04c9c8bbc4c58584648e958be029af894ae30772dd06f3e1150618af2e32e25e7fa892e5d17df034bdac36a38e542522cecd57f6f381
 MISC metadata.xml 500 BLAKE2B 0876bc03bc9d32afee87523a55415ba549942acc4e9a1b65511ced2aa4038557854fd9f570dd1afb6d94ecd899d9cc48034911f547eb88ef76457cdfa62845e4 SHA512 c01d2263a3faff75c3b1f01eef806a9b0c0950c904c28c11b057cfdf2f5c302b95b20f45e649a3749c4ffafa6dafd759e7738bd8e807f23e49d2febaa212ec6b
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.185.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.185.ebuild
new file mode 100644
index 000000000000..c38439a48f59
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.185.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="195"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.186.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.186.ebuild
new file mode 100644
index 000000000000..0027e5227f28
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.186.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="196"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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.129.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.129.ebuild
new file mode 100644
index 000000000000..45e18a69422b
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.129.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="128"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 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.130.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.130.ebuild
new file mode 100644
index 000000000000..40093889f1e3
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.130.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="129"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.228.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.228.ebuild
new file mode 100644
index 000000000000..83e82611fa4f
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.228.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="229"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.228.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.228.ebuild
new file mode 100644
index 000000000000..ae5fb8603ff8
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.228.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="232"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 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.48.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.48.ebuild
new file mode 100644
index 000000000000..78fef4a29b48
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.48.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="48"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 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.49.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.49.ebuild
new file mode 100644
index 000000000000..7d6f3039d6bc
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.49.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="49"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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.7.5.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.7.5.ebuild
new file mode 100644
index 000000000000..d225a5270ef9
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.7.5.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="6"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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.7.6.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.7.6.ebuild
new file mode 100644
index 000000000000..ed61615021e1
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.7.6.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="7"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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 bc8936842035..ee55af2c7848 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -1,4 +1,8 @@
 DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f5d2c58b6137d383f16034a587225a75a9dbca6a01a433056ebe078487132c224e909a2971c9634687e47b1d1 SHA512 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
 DIST patch-5.8-rc1.patch 64960909 BLAKE2B a84c2ffcc46a9451404f7fbcb94ef84f02752bdbb06c554ffad33c98e7c6b98f8177d4f37ef7fff265b6266450f0575c4c67428967bb727733e75e2e8986b679 SHA512 0209a8fd978df08952cf7db62e7cbb1726fcf5c4008bbba084e6d32797aeb5fda4bf77ca9eecb4f839b63f3ee1c0e4839b566ec1dba6a1bd55f23286c0600f0e
+DIST patch-5.8-rc2.patch 65398003 BLAKE2B 536bc4d8537587ce0324036d4649ac7c4ba2a390fc4fc3e15757fad2a63ad05642917e968290fe4ba02b06fc8ec67fe37ec203bfafe12fd83ec7fb9a8a0e8174 SHA512 4fd2d56e931079432ddce355acc049d3721eea1c1191f3c3ecbb9172169b1f8e181f272aef66a5c3bb8bce355af30e94558de2757a18c171d2e662f90c1a49f4
+DIST patch-5.8-rc3.patch 65933507 BLAKE2B a0af229faa03bcc91edd27fd09a157dda245a7e703c2c754e2917d6acbf94827db805432580760850f4b48aa3b6ae3a2431483d074eeb1a2648cb22a463f1bd5 SHA512 ddc163b322e75c40b2f4cd81e1c2e68cf1ebc9200095759948c353b75bd9dadeba4ffa704025ecbd95d8ebe9e7d2f561f2eb0f0d47dbf03d372b86bfddb31ed0
 EBUILD git-sources-5.8_rc1.ebuild 1171 BLAKE2B d58f080b2676d6e4f1bffe20162c57b0885b70aa5e2c3a16f81932a17c333494b7e17e8f238c69719f4e712d9a1ead7da24f648c706b6fac6a5cf03f752a6399 SHA512 1e67622f72c1533d59d031a3295c9f9293b96be4c668ee8659a84a647cb6ed6be8d14985e55fdd8dd5ac02ddd84e8d0901ad312f10132427f1c208c539332b19
+EBUILD git-sources-5.8_rc2.ebuild 1171 BLAKE2B d58f080b2676d6e4f1bffe20162c57b0885b70aa5e2c3a16f81932a17c333494b7e17e8f238c69719f4e712d9a1ead7da24f648c706b6fac6a5cf03f752a6399 SHA512 1e67622f72c1533d59d031a3295c9f9293b96be4c668ee8659a84a647cb6ed6be8d14985e55fdd8dd5ac02ddd84e8d0901ad312f10132427f1c208c539332b19
+EBUILD git-sources-5.8_rc3.ebuild 1171 BLAKE2B d58f080b2676d6e4f1bffe20162c57b0885b70aa5e2c3a16f81932a17c333494b7e17e8f238c69719f4e712d9a1ead7da24f648c706b6fac6a5cf03f752a6399 SHA512 1e67622f72c1533d59d031a3295c9f9293b96be4c668ee8659a84a647cb6ed6be8d14985e55fdd8dd5ac02ddd84e8d0901ad312f10132427f1c208c539332b19
 MISC metadata.xml 596 BLAKE2B 967f959eca5873ccd58ab34aeabf965ec03e9ff41850fa4eb1c49f908ed7ad090ad2f5d7904f350c84cd47d99109e977835a2b216bb8605001b4098cdbdebda5 SHA512 c3476f5b64efc298e0df021b00dc4978a34ea48e5839a9cfee583291a4b5fe7ccc35db89a335db81e9c2cded36663691e6324dcabc90d0b287213d0fccddb227
diff --git a/sys-kernel/git-sources/git-sources-5.8_rc2.ebuild b/sys-kernel/git-sources/git-sources-5.8_rc2.ebuild
new file mode 100644
index 000000000000..9412304f02dc
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-5.8_rc2.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.7"
+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 ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.5"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/git-sources/git-sources-5.8_rc3.ebuild b/sys-kernel/git-sources/git-sources-5.8_rc3.ebuild
new file mode 100644
index 000000000000..9412304f02dc
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-5.8_rc3.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.7"
+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 ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.5"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 96d3d76e9503..f600d890925f 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,18 +1,10 @@
-DIST linux-firmware-20190815.tar.gz 195268794 BLAKE2B bc67b4501e1d0c4375000bbcbae754b072a3769703eb214f85468d910f29becbe79f6989d3bf223ffa259326c964cbf153326b64d7756882165d29b576e13703 SHA512 99bcc1372ed51be1692cbc3c7b7c34940ee2f9b89f611afa5266b2b0825ed602cde27ff383edb776c1239eaf37002cd19be7cbb7cdf81e0721c3167d38018e9a
-DIST linux-firmware-20190923.tar.gz 198130120 BLAKE2B 21f337e8ef693513b5569ab67bf3ae2323f2c9109ce3fc7d6d0d071974dc8c53301eb21e0b1c279753e867873e4bb04274c0b2b5bfb1160aeaff2f2c92d7f26c SHA512 1421f283602fe889b6fba5d84eab1199c63c597a4fb487583bee188cfa01c7d41bde4ac53eee992a6aa1bb95a77126eee786f96fb682cd7992c5ec581601db54
-DIST linux-firmware-20191022.tar.gz 198935619 BLAKE2B 94d90a8e85af7104f08c398d3df20a88dc4d6f86d638565ab6e45e7fc5dff53e4e56a62a859585438812a1438ea7f7c4e4e47ce4adb22b0adf69439feb5803b4 SHA512 2cc99664c8d0275b670373581d7c6e29699f8b84cd6403949182cc1970c3241e5d9c388c34643630a237d87962b7c8e891445969ca9817ac92a4bbbe74e0dc0d
-DIST linux-firmware-20191215.tar.gz 203746264 BLAKE2B cd756ac1b1bde9706cd8321133da2e4e620a3236614427ae9836fc5e98fbc62e79060e6cf50717b41391fba9d56e16140f722ffcc5764e4b81ad2e798d1b41ec SHA512 75eb78ef642cc48dc3d8d2cdd7e5312b82ee3c9ebd6ead40a02fdc1d4329c5a9226237fa0ec8e617fc358cc12144dacf4ef6c1441fe444974c1506ef21ea70a0
-DIST linux-firmware-20200122.tar.gz 219807963 BLAKE2B 976cf7f8da61213a1210348cffdda8cae1b3f3a2d46aac05fe331fdff37e954620c2768f8941e0d4b6fff8c7b69d68b86516c9df9b9cf96538a4463b0957d1a2 SHA512 23500cc99d31597fe691341404cbe9375f7995783b4bf055a53a67ace380bdf9db1c247f12ae7e63ac02e4078e5089aa33e5cc6c2622b26dfaab4a65bfab1db3
 DIST linux-firmware-20200316.tar.gz 221745284 BLAKE2B 6ab4944927420dd8c50d3a97beb32aff22917ab13b283c3358de9f5331479c2a4353dde68a221ac221e9ff5202e46cdaaab9b65cd0431a3984877ab44e2bd0ab SHA512 2fb16fcc474753902ab0236cbb116cdd5de10080d5ad5fc19a015ad3881a203c42beeccf5745e18346fc028a5c743d3d6439f0a04b86b2e0abf9f32aa5f55bad
 DIST linux-firmware-20200421.tar.gz 223307272 BLAKE2B 0f598acd7e88b4dbe275509a6cd7709ee8f6dddf79b262be3967b0ec19f4b51e1deb7bd4be8b392af42a7dcf31e978126b3390b2748ee71fd0172318d5252ccf SHA512 3f8ec2150f9895381e71cb0d0d403694784c4a50f164da59d338dbb37bb643150bed2c6de4729d37f25989b8e799475a53319882c05a06d3eadcc4c349082162
 DIST linux-firmware-20200519.tar.gz 234290201 BLAKE2B 00852b1e035f28aae5532d6ba92d547857ac6445e17b9f29b0954a460a1af9a98b348ad1700cd9f78baa83a2c63b657b6c10a8944188c6d4edf85c2336cc5763 SHA512 9724cf3d1aea73f264d53564ef160a62e90bb35766f3300bbbeaf7c7c6a356ef50c7d17bfa01197e8e991ff72b1aeef002bb78f5dc78243b2792cafbf1139dff
-EBUILD linux-firmware-20190815.ebuild 9648 BLAKE2B 0db410cd671af196fdea060a6e199a1658e13684fc6fcb2880b8b31fc5c8108efebd478b2235a1fb0d93c959697946fb74c71c7e6665c0f61822f4f7c0ec0242 SHA512 91f5c8a7157a5b32073d791758f66f50816a3ade7d3045ccc68708110fc42dbd692820334371fe298f32871b054df275eabe96217ecc5432c766ca2b8b62b895
-EBUILD linux-firmware-20190923.ebuild 9648 BLAKE2B 7c661531b5e7800ebce4bd8720d58f99e036bd4282982a34a8f14c4c75e7031b301c8bfdf15016aa4df082f3f3c45fbe7b0b63370096467a395bc1ac4922c9ae SHA512 fde2a958629a49f6b51a8443aad1158d4a3655ffcdb0c1d872ab507cef1b07420c63661a5846390c78eb81d7cd6d36782875d1b2c2399aef9937ce02e97bcd5c
-EBUILD linux-firmware-20191022.ebuild 9648 BLAKE2B 8d8fb50d68faae58e2f6af8f6bac97917749756318a5baa04c7c3530b10d494d8cdb9d56e412806c1c8f97a3d0e2b7c1e5ada2373f1c39c5c068ab92a49a56a7 SHA512 95889ab2a87066138ad59adccbdc9e1281c29b5ed4504fe1f0594416841ceee9ede3ebaa4b249ae3ea4504be9635b5334c33124647772f97e62fb3a11ab8a461
-EBUILD linux-firmware-20191215.ebuild 9648 BLAKE2B bdd9169b53bbacec33a2264810ad3cc8cdc68d05036c37b2635abda96426322b680504978e61015d9761fe65688c4c7a7ce8521f2629c159872f4c83e4cb5e90 SHA512 6e0fa4b4792100099fb85d5726485d31bda067be9ce3b252c2f531acddf6bb5a49c8fd2188812daa8e8905012d728e15d701ba6679dcfb2e4a084d3842053cbd
-EBUILD linux-firmware-20200122.ebuild 9648 BLAKE2B cce67724bab2e103203d4a55802fbc75a3c924d8b897dd2baac302276f47b70fcfe25bae3ff7d540a5d2ec2c70b126dfd4c4d9d782a37471223cd739ed1388af SHA512 991c72eac102ff6444f70e86a7a5e9c4f8781c8cf376e8dc68e21b1315cd4601d017d7aa701427246810fc21f6e653c6f1014986a2faaa3835dce494379c470c
+DIST linux-firmware-20200619.tar.gz 250595335 BLAKE2B 9bb010b6600d02c536caf17502e54c5225934706eff747d7edaf55774f3c78841d3ff235b7eed037ff117e6e29e7ac11fec498fcace5c52f8b0ddd6b553b96f8 SHA512 9ee615f7d458e453ac53294cb920f322fa29c84255d127cd5f47fad178b0983e7e3fcd6be0b80bc6878c01258bdf75a1356ff6b6766279b10f352bfdb2e4b9a5
 EBUILD linux-firmware-20200316.ebuild 9660 BLAKE2B 6368aae540fb7bb98a57d4ad70741873094fdfd3aa36bef754562a5f8c48093079f86e2c8e909c2d1e66c2793a826334c0469511cb4a719d4bb0c7755b23ea47 SHA512 c90a9722986f83c90fe9b2b9878c99eba98e986c13fb88268fd3609a978d43aabae0928d2e4ed515fb702a4661e07a20a3ce7c499dcf72684e2d3b74287aa4fe
 EBUILD linux-firmware-20200421.ebuild 9660 BLAKE2B c741265f2a3dafb946563c8cb0261ca1f99c015bcb2550b4a87ca9d14545f55e5005313791b0b81d9e847d6077dc055ac7306f19017ce53716b8990c85e5397c SHA512 44ea1aecdbaf9212b794642d73f5fefeffdf9e6a35ab0975d7cab3398cf73ef0a4e8e4c2797d46b576d528b23ac794f4a9a078becc9ac5ce66cf278eab1863ac
 EBUILD linux-firmware-20200519.ebuild 9660 BLAKE2B cd503e55e0c033302121d852cd184fed2a9b03d4145750173189052d369e08efe8bef2165e6e1f1a7aab17bdafd5fc162291cacb473cbe96404cf6d8a6fffbad SHA512 b5393343df8bfe9c62faad9e31ec97c0f8cc691d3bc637cb233a9d74a731987e72835fc437d0541ed4aa86cb02fc4ee2bf7f3c1e84de99c353217037c8ddd381
-EBUILD linux-firmware-99999999.ebuild 9661 BLAKE2B b32eb941d517abf7a0249c1e7b09765249740d117732e32bf5c5bc3930ff231eb798fa1865d654c7064dbbde318298c2450dfc86095dcac985e2d38045349749 SHA512 985b209c055103931971e0ef662d908aa73c79dceb32431614ac9d9cbbf459f363336281d2b18124ada15fd37ffe16a8ab19dc9800194f980e217c6f8c83a0bb
+EBUILD linux-firmware-20200619.ebuild 8852 BLAKE2B b2b88cc88050011ebd76d527e2941e74307971b38eca60ca2949a02899506b8384e141df640c76f32ed4d6f837b09e06a8de146a38b06e78d6dac640c9dd7ffa SHA512 0f6a5df627918340e365b492a123279d89bc91fb46f94245cb3561ad8741678ac2b9bbd2fb4d6ea547c3bcb9054e17810b69ce7dc72e569a4422509a4206a249
+EBUILD linux-firmware-99999999.ebuild 8861 BLAKE2B 013f41958e6fde36b8103c0b980688eab0f1e902631355109cd8a9c0889e0b2dcc869f320993bc0557b49d18f613aed28ff44d302531dd8bf30fa9535fe97cd5 SHA512 9842369bb1e087b426068130a87da0b9d546a6b297ee0c79a18437313de55d44f5acbd732ad8548bc0f44dcbb18c5f46c3f5f77e76da24dbd13374b28f820646
 MISC metadata.xml 867 BLAKE2B db510434e654367fb0ae439b1a3ca3fc170f558022f07634a534ea982f2445ff656fa618b9dac5ebb6ac2f64d9ee93dcc59525c1f3d429eda4ebce05a678298c SHA512 5429e7424fac663e3448e80dad98365239b855f09522fe7ea3cd2c731bec37fee29209cc8ead46e73ea03cd85a3e9c8fafe18ddf4a35e5bb55513d63ad5ae7ff
diff --git a/sys-kernel/linux-firmware/linux-firmware-20190815.ebuild b/sys-kernel/linux-firmware/linux-firmware-20190815.ebuild
deleted file mode 100644
index cf65c9dc98fb..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20190815.ebuild
+++ /dev/null
@@ -1,354 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit mount-boot savedconfig
-
-if [[ ${PV} == 99999999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-else
-	GIT_COMMIT="07b925b450bfb4cf3e141c612ec5b104658cd020"
-	SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-fi
-
-DESCRIPTION="Linux firmware files"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
-
-LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
-	redistributable? (
-		linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) )
-	unknown-license? ( all-rights-reserved )"
-SLOT="0"
-IUSE="initramfs +redistributable savedconfig unknown-license"
-RESTRICT="binchecks strip
-	unknown-license? ( bindist )"
-
-REQUIRED_USE="initramfs? ( redistributable )"
-
-BDEPEND="initramfs? ( app-arch/cpio )"
-
-#add anything else that collides to this
-RDEPEND="!savedconfig? (
-		redistributable? (
-			!sys-firmware/alsa-firmware[alsa_cards_ca0132]
-			!media-tv/cx18-firmware
-			!<sys-firmware/ivtv-firmware-20080701-r1
-			!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
-			!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
-			!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
-			!net-dialup/ueagle-atm
-			!net-dialup/ueagle4-atm
-			!net-wireless/ar9271-firmware
-			!net-wireless/i2400m-fw
-			!net-wireless/libertas-firmware
-			!sys-firmware/rt61-firmware
-			!net-wireless/rt73-firmware
-			!net-wireless/rt2860-firmware
-			!net-wireless/rt2870-firmware
-			!sys-block/qla-fc-firmware
-			!sys-firmware/amd-ucode
-			!sys-firmware/iwl1000-ucode
-			!sys-firmware/iwl2000-ucode
-			!sys-firmware/iwl2030-ucode
-			!sys-firmware/iwl3945-ucode
-			!sys-firmware/iwl4965-ucode
-			!sys-firmware/iwl5000-ucode
-			!sys-firmware/iwl5150-ucode
-			!sys-firmware/iwl6000-ucode
-			!sys-firmware/iwl6005-ucode
-			!sys-firmware/iwl6030-ucode
-			!sys-firmware/iwl6050-ucode
-			!sys-firmware/iwl3160-ucode
-			!sys-firmware/iwl7260-ucode
-			!sys-firmware/iwl7265-ucode
-			!sys-firmware/iwl3160-7260-bt-ucode
-			!sys-firmware/radeon-ucode
-		)
-		unknown-license? (
-			!sys-firmware/alsa-firmware[alsa_cards_korg1212]
-			!sys-firmware/alsa-firmware[alsa_cards_maestro3]
-			!sys-firmware/alsa-firmware[alsa_cards_sb16]
-			!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
-		)
-	)"
-
-pkg_pretend() {
-	use initramfs && mount-boot_pkg_pretend
-}
-
-src_unpack() {
-	if [[ ${PV} == 99999999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-		# rename directory from git snapshot tarball
-		mv ${PN}-*/ ${P} || die
-	fi
-}
-
-src_prepare() {
-	# source and documentation files, not to be installed
-	local source_files=(
-		README
-		WHENCE
-		"LICEN[CS]E*"
-		"GPL*"
-		configure
-		Makefile
-		check_whence.py
-		atusb/ChangeLog
-		av7110/Boot.S
-		av7110/Makefile
-		carl9170fw/
-		cis/Makefile
-		cis/src/
-		dsp56k/bootstrap.asm
-		dsp56k/concat-bootstrap.pl
-		dsp56k/Makefile
-		"isci/*.[ch]"
-		isci/Makefile
-		isci/README
-		"keyspan_pda/*.S"
-		keyspan_pda/Makefile
-		usbdux/
-	)
-
-	# whitelist of images with a free software license
-	local free_software=(
-		# keyspan_pda (GPL-2+)
-		keyspan_pda/keyspan_pda.fw
-		keyspan_pda/xircom_pgs.fw
-		# dsp56k (GPL-2+)
-		dsp56k/bootstrap.bin
-		# ath9k_htc (BSD GPL-2+ MIT)
-		ath9k_htc/htc_7010-1.4.0.fw
-		ath9k_htc/htc_9271-1.4.0.fw
-		# pcnet_cs, 3c589_cs, 3c574_cs, serial_cs (dual GPL-2/MPL-1.1)
-		cis/LA-PCM.cis
-		cis/PCMLM28.cis
-		cis/DP83903.cis
-		cis/NE2K.cis
-		cis/tamarack.cis
-		cis/PE-200.cis
-		cis/PE520.cis
-		cis/3CXEM556.cis
-		cis/3CCFEM556.cis
-		cis/MT5634ZLX.cis
-		cis/RS-COM-2P.cis
-		cis/COMpad2.cis
-		cis/COMpad4.cis
-		# serial_cs (GPL-3)
-		cis/SW_555_SER.cis
-		cis/SW_7xx_SER.cis
-		cis/SW_8xx_SER.cis
-		# dvb-ttpci (GPL-2+)
-		av7110/bootcode.bin
-		# usbdux, usbduxfast, usbduxsigma (GPL-2+)
-		usbdux_firmware.bin
-		usbduxfast_firmware.bin
-		usbduxsigma_firmware.bin
-		# brcmfmac (GPL-2+)
-		brcm/brcmfmac4330-sdio.Prowise-PT301.txt
-		brcm/brcmfmac43340-sdio.meegopad-t08.txt
-		brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt
-		brcm/brcmfmac43362-sdio.lemaker,bananapro.txt
-		brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt
-		"brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt"
-		brcm/brcmfmac43430-sdio.AP6212.txt
-		brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
-		brcm/brcmfmac43430-sdio.MUR1DX.txt
-		brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
-		brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
-		brcm/brcmfmac4356-pcie.gpd-win-pocket.txt
-		# isci (GPL-2)
-		isci/isci_firmware.bin
-		# carl9170 (GPL-2+)
-		carl9170-1.fw
-		# atusb (GPL-2+)
-		atusb/atusb-0.2.dfu
-		atusb/atusb-0.3.dfu
-		atusb/rzusb-0.3.bin
-		# mlxsw_spectrum (dual BSD/GPL-2)
-		mellanox/mlxsw_spectrum-13.1420.122.mfa2
-		mellanox/mlxsw_spectrum-13.1530.152.mfa2
-		mellanox/mlxsw_spectrum-13.1620.192.mfa2
-		mellanox/mlxsw_spectrum-13.1702.6.mfa2
-		mellanox/mlxsw_spectrum-13.1703.4.mfa2
-		mellanox/mlxsw_spectrum-13.1910.622.mfa2
-		mellanox/mlxsw_spectrum-13.2000.1122.mfa2
-	)
-
-	# blacklist of images with unknown license
-	local unknown_license=(
-		atmsar11.fw
-		korg/k1212.dsp
-		ess/maestro3_assp_kernel.fw
-		ess/maestro3_assp_minisrc.fw
-		yamaha/ds1_ctrl.fw
-		yamaha/ds1_dsp.fw
-		yamaha/ds1e_ctrl.fw
-		tr_smctr.bin
-		ttusb-budget/dspbootcode.bin
-		emi62/bitstream.fw
-		emi62/loader.fw
-		emi62/midi.fw
-		emi62/spdif.fw
-		ti_3410.fw
-		ti_5052.fw
-		mts_mt9234mu.fw
-		mts_mt9234zba.fw
-		whiteheat.fw
-		whiteheat_loader.fw
-		intelliport2.bin
-		cpia2/stv0672_vp4.bin
-		vicam/firmware.fw
-		edgeport/boot.fw
-		edgeport/boot2.fw
-		edgeport/down.fw
-		edgeport/down2.fw
-		edgeport/down3.bin
-		sb16/mulaw_main.csp
-		sb16/alaw_main.csp
-		sb16/ima_adpcm_init.csp
-		sb16/ima_adpcm_playback.csp
-		sb16/ima_adpcm_capture.csp
-		sun/cassini.bin
-		acenic/tg1.bin
-		acenic/tg2.bin
-		adaptec/starfire_rx.bin
-		adaptec/starfire_tx.bin
-		yam/1200.bin
-		yam/9600.bin
-		3com/3C359.bin
-		ositech/Xilinx7OD.bin
-		qlogic/isp1000.bin
-		myricom/lanai.bin
-		yamaha/yss225_registers.bin
-		lgs8g75.fw
-	)
-
-	default
-
-	# remove sources and documentation (wildcards are expanded)
-	rm -r ${source_files[@]} || die
-	rm -rf .git
-
-	if use !unknown-license; then
-		# remove files in unknown_license
-		rm "${unknown_license[@]}" || die
-	fi
-
-	if use !redistributable; then
-		# remove files _not_ in the free_software or unknown_license lists
-		# everything else is confirmed (or assumed) to be redistributable
-		# based on upstream acceptance policy
-		local IFS=$'\n'
-		find ! -type d -printf "%P\n" \
-			| grep -Fvx -e "${free_software[*]}" -e "${unknown_license[*]}" \
-			| xargs -d '\n' rm || die
-		IFS=$' \t\n'
-	fi
-
-	if use initramfs; then
-		if [[ -d "${S}/amd-ucode" ]]; then
-			local UCODETMP="${T}/ucode_tmp"
-			local UCODEDIR="${UCODETMP}/kernel/x86/microcode"
-			mkdir -p "${UCODEDIR}" || die
-			echo 1 > "${UCODETMP}/early_cpio"
-
-			local amd_ucode_file="${UCODEDIR}/AuthenticAMD.bin"
-			cat "${S}"/amd-ucode/*.bin > "${amd_ucode_file}" || die "Failed to concat amd cpu ucode"
-
-			if [[ ! -s "${amd_ucode_file}" ]]; then
-				die "Sanity check failed: '${amd_ucode_file}' is empty!"
-			fi
-
-			pushd "${UCODETMP}" &>/dev/null || die
-			find . -print0 | cpio --quiet --null -o -H newc -R 0:0 > "${S}"/amd-uc.img
-			popd &>/dev/null || die
-			if [[ ! -s "${S}/amd-uc.img" ]]; then
-				die "Failed to create '${S}/amd-uc.img'!"
-			fi
-		else
-			# If this will ever happen something has changed which
-			# must be reviewed
-			die "'${S}/amd-ucode' not found!"
-		fi
-	fi
-
-	echo "# Remove files that shall not be installed from this list." > ${PN}.conf
-	find * ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) >> ${PN}.conf
-
-	if use savedconfig; then
-		restore_config ${PN}.conf
-
-		ebegin "Removing all files not listed in config"
-		find ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) -printf "%P\n" \
-			| grep -Fvx -f <(grep -v '^#' ${PN}.conf \
-				|| die "grep failed, empty config file?") \
-			| xargs -d '\n' --no-run-if-empty rm
-		eend $? || die
-	fi
-
-	# remove empty directories, bug #396073
-	find -type d -empty -delete || die
-}
-
-src_install() {
-	save_config ${PN}.conf
-	rm ${PN}.conf || die
-
-	if use initramfs ; then
-		mkdir "${ED}/boot" || die
-		mv "${S}"/amd-uc.img "${ED}/boot" || die
-	fi
-
-	if ! ( shopt -s failglob; : * ) 2>/dev/null; then
-		eerror "No files to install. Check your USE flag settings"
-		eerror "and the list of files in your saved configuration."
-		die "Refusing to install an empty package"
-	fi
-
-	insinto /lib/firmware/
-	doins -r *
-}
-
-pkg_preinst() {
-	if use savedconfig; then
-		ewarn "USE=savedconfig is active. You must handle file collisions manually."
-	fi
-
-	# Make sure /boot is available if needed.
-	use initramfs && mount-boot_pkg_preinst
-}
-
-pkg_postinst() {
-	elog "If you are only interested in particular firmware files, edit the saved"
-	elog "configfile and remove those that you do not want."
-
-	local ver
-	for ver in ${REPLACING_VERSIONS}; do
-		if ver_test ${ver} -lt 20190514; then
-			elog
-			elog 'Starting with version 20190514, installation of many firmware'
-			elog 'files is controlled by USE flags. Please review your USE flag'
-			elog 'and package.license settings if you are missing some files.'
-			break
-		fi
-	done
-
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postinst
-}
-
-pkg_prerm() {
-	# Make sure /boot is mounted so that we can remove /boot/amd-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
-}
diff --git a/sys-kernel/linux-firmware/linux-firmware-20190923.ebuild b/sys-kernel/linux-firmware/linux-firmware-20190923.ebuild
deleted file mode 100644
index e212d2e40887..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20190923.ebuild
+++ /dev/null
@@ -1,354 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit mount-boot savedconfig
-
-if [[ ${PV} == 99999999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-else
-	GIT_COMMIT="417a9c6e197a8d3eec792494efc87a2b42f76324"
-	SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-fi
-
-DESCRIPTION="Linux firmware files"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
-
-LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
-	redistributable? (
-		linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) )
-	unknown-license? ( all-rights-reserved )"
-SLOT="0"
-IUSE="initramfs +redistributable savedconfig unknown-license"
-RESTRICT="binchecks strip
-	unknown-license? ( bindist )"
-
-REQUIRED_USE="initramfs? ( redistributable )"
-
-BDEPEND="initramfs? ( app-arch/cpio )"
-
-#add anything else that collides to this
-RDEPEND="!savedconfig? (
-		redistributable? (
-			!sys-firmware/alsa-firmware[alsa_cards_ca0132]
-			!media-tv/cx18-firmware
-			!<sys-firmware/ivtv-firmware-20080701-r1
-			!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
-			!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
-			!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
-			!net-dialup/ueagle-atm
-			!net-dialup/ueagle4-atm
-			!net-wireless/ar9271-firmware
-			!net-wireless/i2400m-fw
-			!net-wireless/libertas-firmware
-			!sys-firmware/rt61-firmware
-			!net-wireless/rt73-firmware
-			!net-wireless/rt2860-firmware
-			!net-wireless/rt2870-firmware
-			!sys-block/qla-fc-firmware
-			!sys-firmware/amd-ucode
-			!sys-firmware/iwl1000-ucode
-			!sys-firmware/iwl2000-ucode
-			!sys-firmware/iwl2030-ucode
-			!sys-firmware/iwl3945-ucode
-			!sys-firmware/iwl4965-ucode
-			!sys-firmware/iwl5000-ucode
-			!sys-firmware/iwl5150-ucode
-			!sys-firmware/iwl6000-ucode
-			!sys-firmware/iwl6005-ucode
-			!sys-firmware/iwl6030-ucode
-			!sys-firmware/iwl6050-ucode
-			!sys-firmware/iwl3160-ucode
-			!sys-firmware/iwl7260-ucode
-			!sys-firmware/iwl7265-ucode
-			!sys-firmware/iwl3160-7260-bt-ucode
-			!sys-firmware/radeon-ucode
-		)
-		unknown-license? (
-			!sys-firmware/alsa-firmware[alsa_cards_korg1212]
-			!sys-firmware/alsa-firmware[alsa_cards_maestro3]
-			!sys-firmware/alsa-firmware[alsa_cards_sb16]
-			!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
-		)
-	)"
-
-pkg_pretend() {
-	use initramfs && mount-boot_pkg_pretend
-}
-
-src_unpack() {
-	if [[ ${PV} == 99999999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-		# rename directory from git snapshot tarball
-		mv ${PN}-*/ ${P} || die
-	fi
-}
-
-src_prepare() {
-	# source and documentation files, not to be installed
-	local source_files=(
-		README
-		WHENCE
-		"LICEN[CS]E*"
-		"GPL*"
-		configure
-		Makefile
-		check_whence.py
-		atusb/ChangeLog
-		av7110/Boot.S
-		av7110/Makefile
-		carl9170fw/
-		cis/Makefile
-		cis/src/
-		dsp56k/bootstrap.asm
-		dsp56k/concat-bootstrap.pl
-		dsp56k/Makefile
-		"isci/*.[ch]"
-		isci/Makefile
-		isci/README
-		"keyspan_pda/*.S"
-		keyspan_pda/Makefile
-		usbdux/
-	)
-
-	# whitelist of images with a free software license
-	local free_software=(
-		# keyspan_pda (GPL-2+)
-		keyspan_pda/keyspan_pda.fw
-		keyspan_pda/xircom_pgs.fw
-		# dsp56k (GPL-2+)
-		dsp56k/bootstrap.bin
-		# ath9k_htc (BSD GPL-2+ MIT)
-		ath9k_htc/htc_7010-1.4.0.fw
-		ath9k_htc/htc_9271-1.4.0.fw
-		# pcnet_cs, 3c589_cs, 3c574_cs, serial_cs (dual GPL-2/MPL-1.1)
-		cis/LA-PCM.cis
-		cis/PCMLM28.cis
-		cis/DP83903.cis
-		cis/NE2K.cis
-		cis/tamarack.cis
-		cis/PE-200.cis
-		cis/PE520.cis
-		cis/3CXEM556.cis
-		cis/3CCFEM556.cis
-		cis/MT5634ZLX.cis
-		cis/RS-COM-2P.cis
-		cis/COMpad2.cis
-		cis/COMpad4.cis
-		# serial_cs (GPL-3)
-		cis/SW_555_SER.cis
-		cis/SW_7xx_SER.cis
-		cis/SW_8xx_SER.cis
-		# dvb-ttpci (GPL-2+)
-		av7110/bootcode.bin
-		# usbdux, usbduxfast, usbduxsigma (GPL-2+)
-		usbdux_firmware.bin
-		usbduxfast_firmware.bin
-		usbduxsigma_firmware.bin
-		# brcmfmac (GPL-2+)
-		brcm/brcmfmac4330-sdio.Prowise-PT301.txt
-		brcm/brcmfmac43340-sdio.meegopad-t08.txt
-		brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt
-		brcm/brcmfmac43362-sdio.lemaker,bananapro.txt
-		brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt
-		"brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt"
-		brcm/brcmfmac43430-sdio.AP6212.txt
-		brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
-		brcm/brcmfmac43430-sdio.MUR1DX.txt
-		brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
-		brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
-		brcm/brcmfmac4356-pcie.gpd-win-pocket.txt
-		# isci (GPL-2)
-		isci/isci_firmware.bin
-		# carl9170 (GPL-2+)
-		carl9170-1.fw
-		# atusb (GPL-2+)
-		atusb/atusb-0.2.dfu
-		atusb/atusb-0.3.dfu
-		atusb/rzusb-0.3.bin
-		# mlxsw_spectrum (dual BSD/GPL-2)
-		mellanox/mlxsw_spectrum-13.1420.122.mfa2
-		mellanox/mlxsw_spectrum-13.1530.152.mfa2
-		mellanox/mlxsw_spectrum-13.1620.192.mfa2
-		mellanox/mlxsw_spectrum-13.1702.6.mfa2
-		mellanox/mlxsw_spectrum-13.1703.4.mfa2
-		mellanox/mlxsw_spectrum-13.1910.622.mfa2
-		mellanox/mlxsw_spectrum-13.2000.1122.mfa2
-	)
-
-	# blacklist of images with unknown license
-	local unknown_license=(
-		atmsar11.fw
-		korg/k1212.dsp
-		ess/maestro3_assp_kernel.fw
-		ess/maestro3_assp_minisrc.fw
-		yamaha/ds1_ctrl.fw
-		yamaha/ds1_dsp.fw
-		yamaha/ds1e_ctrl.fw
-		tr_smctr.bin
-		ttusb-budget/dspbootcode.bin
-		emi62/bitstream.fw
-		emi62/loader.fw
-		emi62/midi.fw
-		emi62/spdif.fw
-		ti_3410.fw
-		ti_5052.fw
-		mts_mt9234mu.fw
-		mts_mt9234zba.fw
-		whiteheat.fw
-		whiteheat_loader.fw
-		intelliport2.bin
-		cpia2/stv0672_vp4.bin
-		vicam/firmware.fw
-		edgeport/boot.fw
-		edgeport/boot2.fw
-		edgeport/down.fw
-		edgeport/down2.fw
-		edgeport/down3.bin
-		sb16/mulaw_main.csp
-		sb16/alaw_main.csp
-		sb16/ima_adpcm_init.csp
-		sb16/ima_adpcm_playback.csp
-		sb16/ima_adpcm_capture.csp
-		sun/cassini.bin
-		acenic/tg1.bin
-		acenic/tg2.bin
-		adaptec/starfire_rx.bin
-		adaptec/starfire_tx.bin
-		yam/1200.bin
-		yam/9600.bin
-		3com/3C359.bin
-		ositech/Xilinx7OD.bin
-		qlogic/isp1000.bin
-		myricom/lanai.bin
-		yamaha/yss225_registers.bin
-		lgs8g75.fw
-	)
-
-	default
-
-	# remove sources and documentation (wildcards are expanded)
-	rm -r ${source_files[@]} || die
-	rm -rf .git
-
-	if use !unknown-license; then
-		# remove files in unknown_license
-		rm "${unknown_license[@]}" || die
-	fi
-
-	if use !redistributable; then
-		# remove files _not_ in the free_software or unknown_license lists
-		# everything else is confirmed (or assumed) to be redistributable
-		# based on upstream acceptance policy
-		local IFS=$'\n'
-		find ! -type d -printf "%P\n" \
-			| grep -Fvx -e "${free_software[*]}" -e "${unknown_license[*]}" \
-			| xargs -d '\n' rm || die
-		IFS=$' \t\n'
-	fi
-
-	if use initramfs; then
-		if [[ -d "${S}/amd-ucode" ]]; then
-			local UCODETMP="${T}/ucode_tmp"
-			local UCODEDIR="${UCODETMP}/kernel/x86/microcode"
-			mkdir -p "${UCODEDIR}" || die
-			echo 1 > "${UCODETMP}/early_cpio"
-
-			local amd_ucode_file="${UCODEDIR}/AuthenticAMD.bin"
-			cat "${S}"/amd-ucode/*.bin > "${amd_ucode_file}" || die "Failed to concat amd cpu ucode"
-
-			if [[ ! -s "${amd_ucode_file}" ]]; then
-				die "Sanity check failed: '${amd_ucode_file}' is empty!"
-			fi
-
-			pushd "${UCODETMP}" &>/dev/null || die
-			find . -print0 | cpio --quiet --null -o -H newc -R 0:0 > "${S}"/amd-uc.img
-			popd &>/dev/null || die
-			if [[ ! -s "${S}/amd-uc.img" ]]; then
-				die "Failed to create '${S}/amd-uc.img'!"
-			fi
-		else
-			# If this will ever happen something has changed which
-			# must be reviewed
-			die "'${S}/amd-ucode' not found!"
-		fi
-	fi
-
-	echo "# Remove files that shall not be installed from this list." > ${PN}.conf
-	find * ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) >> ${PN}.conf
-
-	if use savedconfig; then
-		restore_config ${PN}.conf
-
-		ebegin "Removing all files not listed in config"
-		find ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) -printf "%P\n" \
-			| grep -Fvx -f <(grep -v '^#' ${PN}.conf \
-				|| die "grep failed, empty config file?") \
-			| xargs -d '\n' --no-run-if-empty rm
-		eend $? || die
-	fi
-
-	# remove empty directories, bug #396073
-	find -type d -empty -delete || die
-}
-
-src_install() {
-	save_config ${PN}.conf
-	rm ${PN}.conf || die
-
-	if use initramfs ; then
-		mkdir "${ED}/boot" || die
-		mv "${S}"/amd-uc.img "${ED}/boot" || die
-	fi
-
-	if ! ( shopt -s failglob; : * ) 2>/dev/null; then
-		eerror "No files to install. Check your USE flag settings"
-		eerror "and the list of files in your saved configuration."
-		die "Refusing to install an empty package"
-	fi
-
-	insinto /lib/firmware/
-	doins -r *
-}
-
-pkg_preinst() {
-	if use savedconfig; then
-		ewarn "USE=savedconfig is active. You must handle file collisions manually."
-	fi
-
-	# Make sure /boot is available if needed.
-	use initramfs && mount-boot_pkg_preinst
-}
-
-pkg_postinst() {
-	elog "If you are only interested in particular firmware files, edit the saved"
-	elog "configfile and remove those that you do not want."
-
-	local ver
-	for ver in ${REPLACING_VERSIONS}; do
-		if ver_test ${ver} -lt 20190514; then
-			elog
-			elog 'Starting with version 20190514, installation of many firmware'
-			elog 'files is controlled by USE flags. Please review your USE flag'
-			elog 'and package.license settings if you are missing some files.'
-			break
-		fi
-	done
-
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postinst
-}
-
-pkg_prerm() {
-	# Make sure /boot is mounted so that we can remove /boot/amd-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
-}
diff --git a/sys-kernel/linux-firmware/linux-firmware-20191022.ebuild b/sys-kernel/linux-firmware/linux-firmware-20191022.ebuild
deleted file mode 100644
index b5f0efd8ab05..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20191022.ebuild
+++ /dev/null
@@ -1,354 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit mount-boot savedconfig
-
-if [[ ${PV} == 99999999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-else
-	GIT_COMMIT="2b016afc348ba4b5fb2016ffcb2822f4a293da0c"
-	SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-fi
-
-DESCRIPTION="Linux firmware files"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
-
-LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
-	redistributable? (
-		linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) )
-	unknown-license? ( all-rights-reserved )"
-SLOT="0"
-IUSE="initramfs +redistributable savedconfig unknown-license"
-RESTRICT="binchecks strip
-	unknown-license? ( bindist )"
-
-REQUIRED_USE="initramfs? ( redistributable )"
-
-BDEPEND="initramfs? ( app-arch/cpio )"
-
-#add anything else that collides to this
-RDEPEND="!savedconfig? (
-		redistributable? (
-			!sys-firmware/alsa-firmware[alsa_cards_ca0132]
-			!media-tv/cx18-firmware
-			!<sys-firmware/ivtv-firmware-20080701-r1
-			!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
-			!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
-			!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
-			!net-dialup/ueagle-atm
-			!net-dialup/ueagle4-atm
-			!net-wireless/ar9271-firmware
-			!net-wireless/i2400m-fw
-			!net-wireless/libertas-firmware
-			!sys-firmware/rt61-firmware
-			!net-wireless/rt73-firmware
-			!net-wireless/rt2860-firmware
-			!net-wireless/rt2870-firmware
-			!sys-block/qla-fc-firmware
-			!sys-firmware/amd-ucode
-			!sys-firmware/iwl1000-ucode
-			!sys-firmware/iwl2000-ucode
-			!sys-firmware/iwl2030-ucode
-			!sys-firmware/iwl3945-ucode
-			!sys-firmware/iwl4965-ucode
-			!sys-firmware/iwl5000-ucode
-			!sys-firmware/iwl5150-ucode
-			!sys-firmware/iwl6000-ucode
-			!sys-firmware/iwl6005-ucode
-			!sys-firmware/iwl6030-ucode
-			!sys-firmware/iwl6050-ucode
-			!sys-firmware/iwl3160-ucode
-			!sys-firmware/iwl7260-ucode
-			!sys-firmware/iwl7265-ucode
-			!sys-firmware/iwl3160-7260-bt-ucode
-			!sys-firmware/radeon-ucode
-		)
-		unknown-license? (
-			!sys-firmware/alsa-firmware[alsa_cards_korg1212]
-			!sys-firmware/alsa-firmware[alsa_cards_maestro3]
-			!sys-firmware/alsa-firmware[alsa_cards_sb16]
-			!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
-		)
-	)"
-
-pkg_pretend() {
-	use initramfs && mount-boot_pkg_pretend
-}
-
-src_unpack() {
-	if [[ ${PV} == 99999999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-		# rename directory from git snapshot tarball
-		mv ${PN}-*/ ${P} || die
-	fi
-}
-
-src_prepare() {
-	# source and documentation files, not to be installed
-	local source_files=(
-		README
-		WHENCE
-		"LICEN[CS]E*"
-		"GPL*"
-		configure
-		Makefile
-		check_whence.py
-		atusb/ChangeLog
-		av7110/Boot.S
-		av7110/Makefile
-		carl9170fw/
-		cis/Makefile
-		cis/src/
-		dsp56k/bootstrap.asm
-		dsp56k/concat-bootstrap.pl
-		dsp56k/Makefile
-		"isci/*.[ch]"
-		isci/Makefile
-		isci/README
-		"keyspan_pda/*.S"
-		keyspan_pda/Makefile
-		usbdux/
-	)
-
-	# whitelist of images with a free software license
-	local free_software=(
-		# keyspan_pda (GPL-2+)
-		keyspan_pda/keyspan_pda.fw
-		keyspan_pda/xircom_pgs.fw
-		# dsp56k (GPL-2+)
-		dsp56k/bootstrap.bin
-		# ath9k_htc (BSD GPL-2+ MIT)
-		ath9k_htc/htc_7010-1.4.0.fw
-		ath9k_htc/htc_9271-1.4.0.fw
-		# pcnet_cs, 3c589_cs, 3c574_cs, serial_cs (dual GPL-2/MPL-1.1)
-		cis/LA-PCM.cis
-		cis/PCMLM28.cis
-		cis/DP83903.cis
-		cis/NE2K.cis
-		cis/tamarack.cis
-		cis/PE-200.cis
-		cis/PE520.cis
-		cis/3CXEM556.cis
-		cis/3CCFEM556.cis
-		cis/MT5634ZLX.cis
-		cis/RS-COM-2P.cis
-		cis/COMpad2.cis
-		cis/COMpad4.cis
-		# serial_cs (GPL-3)
-		cis/SW_555_SER.cis
-		cis/SW_7xx_SER.cis
-		cis/SW_8xx_SER.cis
-		# dvb-ttpci (GPL-2+)
-		av7110/bootcode.bin
-		# usbdux, usbduxfast, usbduxsigma (GPL-2+)
-		usbdux_firmware.bin
-		usbduxfast_firmware.bin
-		usbduxsigma_firmware.bin
-		# brcmfmac (GPL-2+)
-		brcm/brcmfmac4330-sdio.Prowise-PT301.txt
-		brcm/brcmfmac43340-sdio.meegopad-t08.txt
-		brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt
-		brcm/brcmfmac43362-sdio.lemaker,bananapro.txt
-		brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt
-		"brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt"
-		brcm/brcmfmac43430-sdio.AP6212.txt
-		brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
-		brcm/brcmfmac43430-sdio.MUR1DX.txt
-		brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
-		brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
-		brcm/brcmfmac4356-pcie.gpd-win-pocket.txt
-		# isci (GPL-2)
-		isci/isci_firmware.bin
-		# carl9170 (GPL-2+)
-		carl9170-1.fw
-		# atusb (GPL-2+)
-		atusb/atusb-0.2.dfu
-		atusb/atusb-0.3.dfu
-		atusb/rzusb-0.3.bin
-		# mlxsw_spectrum (dual BSD/GPL-2)
-		mellanox/mlxsw_spectrum-13.1420.122.mfa2
-		mellanox/mlxsw_spectrum-13.1530.152.mfa2
-		mellanox/mlxsw_spectrum-13.1620.192.mfa2
-		mellanox/mlxsw_spectrum-13.1702.6.mfa2
-		mellanox/mlxsw_spectrum-13.1703.4.mfa2
-		mellanox/mlxsw_spectrum-13.1910.622.mfa2
-		mellanox/mlxsw_spectrum-13.2000.1122.mfa2
-	)
-
-	# blacklist of images with unknown license
-	local unknown_license=(
-		atmsar11.fw
-		korg/k1212.dsp
-		ess/maestro3_assp_kernel.fw
-		ess/maestro3_assp_minisrc.fw
-		yamaha/ds1_ctrl.fw
-		yamaha/ds1_dsp.fw
-		yamaha/ds1e_ctrl.fw
-		tr_smctr.bin
-		ttusb-budget/dspbootcode.bin
-		emi62/bitstream.fw
-		emi62/loader.fw
-		emi62/midi.fw
-		emi62/spdif.fw
-		ti_3410.fw
-		ti_5052.fw
-		mts_mt9234mu.fw
-		mts_mt9234zba.fw
-		whiteheat.fw
-		whiteheat_loader.fw
-		intelliport2.bin
-		cpia2/stv0672_vp4.bin
-		vicam/firmware.fw
-		edgeport/boot.fw
-		edgeport/boot2.fw
-		edgeport/down.fw
-		edgeport/down2.fw
-		edgeport/down3.bin
-		sb16/mulaw_main.csp
-		sb16/alaw_main.csp
-		sb16/ima_adpcm_init.csp
-		sb16/ima_adpcm_playback.csp
-		sb16/ima_adpcm_capture.csp
-		sun/cassini.bin
-		acenic/tg1.bin
-		acenic/tg2.bin
-		adaptec/starfire_rx.bin
-		adaptec/starfire_tx.bin
-		yam/1200.bin
-		yam/9600.bin
-		3com/3C359.bin
-		ositech/Xilinx7OD.bin
-		qlogic/isp1000.bin
-		myricom/lanai.bin
-		yamaha/yss225_registers.bin
-		lgs8g75.fw
-	)
-
-	default
-
-	# remove sources and documentation (wildcards are expanded)
-	rm -r ${source_files[@]} || die
-	rm -rf .git
-
-	if use !unknown-license; then
-		# remove files in unknown_license
-		rm "${unknown_license[@]}" || die
-	fi
-
-	if use !redistributable; then
-		# remove files _not_ in the free_software or unknown_license lists
-		# everything else is confirmed (or assumed) to be redistributable
-		# based on upstream acceptance policy
-		local IFS=$'\n'
-		find ! -type d -printf "%P\n" \
-			| grep -Fvx -e "${free_software[*]}" -e "${unknown_license[*]}" \
-			| xargs -d '\n' rm || die
-		IFS=$' \t\n'
-	fi
-
-	if use initramfs; then
-		if [[ -d "${S}/amd-ucode" ]]; then
-			local UCODETMP="${T}/ucode_tmp"
-			local UCODEDIR="${UCODETMP}/kernel/x86/microcode"
-			mkdir -p "${UCODEDIR}" || die
-			echo 1 > "${UCODETMP}/early_cpio"
-
-			local amd_ucode_file="${UCODEDIR}/AuthenticAMD.bin"
-			cat "${S}"/amd-ucode/*.bin > "${amd_ucode_file}" || die "Failed to concat amd cpu ucode"
-
-			if [[ ! -s "${amd_ucode_file}" ]]; then
-				die "Sanity check failed: '${amd_ucode_file}' is empty!"
-			fi
-
-			pushd "${UCODETMP}" &>/dev/null || die
-			find . -print0 | cpio --quiet --null -o -H newc -R 0:0 > "${S}"/amd-uc.img
-			popd &>/dev/null || die
-			if [[ ! -s "${S}/amd-uc.img" ]]; then
-				die "Failed to create '${S}/amd-uc.img'!"
-			fi
-		else
-			# If this will ever happen something has changed which
-			# must be reviewed
-			die "'${S}/amd-ucode' not found!"
-		fi
-	fi
-
-	echo "# Remove files that shall not be installed from this list." > ${PN}.conf
-	find * ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) >> ${PN}.conf
-
-	if use savedconfig; then
-		restore_config ${PN}.conf
-
-		ebegin "Removing all files not listed in config"
-		find ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) -printf "%P\n" \
-			| grep -Fvx -f <(grep -v '^#' ${PN}.conf \
-				|| die "grep failed, empty config file?") \
-			| xargs -d '\n' --no-run-if-empty rm
-		eend $? || die
-	fi
-
-	# remove empty directories, bug #396073
-	find -type d -empty -delete || die
-}
-
-src_install() {
-	save_config ${PN}.conf
-	rm ${PN}.conf || die
-
-	if use initramfs ; then
-		mkdir "${ED}/boot" || die
-		mv "${S}"/amd-uc.img "${ED}/boot" || die
-	fi
-
-	if ! ( shopt -s failglob; : * ) 2>/dev/null; then
-		eerror "No files to install. Check your USE flag settings"
-		eerror "and the list of files in your saved configuration."
-		die "Refusing to install an empty package"
-	fi
-
-	insinto /lib/firmware/
-	doins -r *
-}
-
-pkg_preinst() {
-	if use savedconfig; then
-		ewarn "USE=savedconfig is active. You must handle file collisions manually."
-	fi
-
-	# Make sure /boot is available if needed.
-	use initramfs && mount-boot_pkg_preinst
-}
-
-pkg_postinst() {
-	elog "If you are only interested in particular firmware files, edit the saved"
-	elog "configfile and remove those that you do not want."
-
-	local ver
-	for ver in ${REPLACING_VERSIONS}; do
-		if ver_test ${ver} -lt 20190514; then
-			elog
-			elog 'Starting with version 20190514, installation of many firmware'
-			elog 'files is controlled by USE flags. Please review your USE flag'
-			elog 'and package.license settings if you are missing some files.'
-			break
-		fi
-	done
-
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postinst
-}
-
-pkg_prerm() {
-	# Make sure /boot is mounted so that we can remove /boot/amd-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
-}
diff --git a/sys-kernel/linux-firmware/linux-firmware-20191215.ebuild b/sys-kernel/linux-firmware/linux-firmware-20191215.ebuild
deleted file mode 100644
index 9ab4a3265a20..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20191215.ebuild
+++ /dev/null
@@ -1,354 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit mount-boot savedconfig
-
-if [[ ${PV} == 99999999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-else
-	GIT_COMMIT="f1100ddf581f49aa79a54b56fe6ef0815a7ae57e"
-	SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-fi
-
-DESCRIPTION="Linux firmware files"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
-
-LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
-	redistributable? (
-		linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) )
-	unknown-license? ( all-rights-reserved )"
-SLOT="0"
-IUSE="initramfs +redistributable savedconfig unknown-license"
-RESTRICT="binchecks strip
-	unknown-license? ( bindist )"
-
-REQUIRED_USE="initramfs? ( redistributable )"
-
-BDEPEND="initramfs? ( app-arch/cpio )"
-
-#add anything else that collides to this
-RDEPEND="!savedconfig? (
-		redistributable? (
-			!sys-firmware/alsa-firmware[alsa_cards_ca0132]
-			!media-tv/cx18-firmware
-			!<sys-firmware/ivtv-firmware-20080701-r1
-			!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
-			!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
-			!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
-			!net-dialup/ueagle-atm
-			!net-dialup/ueagle4-atm
-			!net-wireless/ar9271-firmware
-			!net-wireless/i2400m-fw
-			!net-wireless/libertas-firmware
-			!sys-firmware/rt61-firmware
-			!net-wireless/rt73-firmware
-			!net-wireless/rt2860-firmware
-			!net-wireless/rt2870-firmware
-			!sys-block/qla-fc-firmware
-			!sys-firmware/amd-ucode
-			!sys-firmware/iwl1000-ucode
-			!sys-firmware/iwl2000-ucode
-			!sys-firmware/iwl2030-ucode
-			!sys-firmware/iwl3945-ucode
-			!sys-firmware/iwl4965-ucode
-			!sys-firmware/iwl5000-ucode
-			!sys-firmware/iwl5150-ucode
-			!sys-firmware/iwl6000-ucode
-			!sys-firmware/iwl6005-ucode
-			!sys-firmware/iwl6030-ucode
-			!sys-firmware/iwl6050-ucode
-			!sys-firmware/iwl3160-ucode
-			!sys-firmware/iwl7260-ucode
-			!sys-firmware/iwl7265-ucode
-			!sys-firmware/iwl3160-7260-bt-ucode
-			!sys-firmware/radeon-ucode
-		)
-		unknown-license? (
-			!sys-firmware/alsa-firmware[alsa_cards_korg1212]
-			!sys-firmware/alsa-firmware[alsa_cards_maestro3]
-			!sys-firmware/alsa-firmware[alsa_cards_sb16]
-			!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
-		)
-	)"
-
-pkg_pretend() {
-	use initramfs && mount-boot_pkg_pretend
-}
-
-src_unpack() {
-	if [[ ${PV} == 99999999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-		# rename directory from git snapshot tarball
-		mv ${PN}-*/ ${P} || die
-	fi
-}
-
-src_prepare() {
-	# source and documentation files, not to be installed
-	local source_files=(
-		README
-		WHENCE
-		"LICEN[CS]E*"
-		"GPL*"
-		configure
-		Makefile
-		check_whence.py
-		atusb/ChangeLog
-		av7110/Boot.S
-		av7110/Makefile
-		carl9170fw/
-		cis/Makefile
-		cis/src/
-		dsp56k/bootstrap.asm
-		dsp56k/concat-bootstrap.pl
-		dsp56k/Makefile
-		"isci/*.[ch]"
-		isci/Makefile
-		isci/README
-		"keyspan_pda/*.S"
-		keyspan_pda/Makefile
-		usbdux/
-	)
-
-	# whitelist of images with a free software license
-	local free_software=(
-		# keyspan_pda (GPL-2+)
-		keyspan_pda/keyspan_pda.fw
-		keyspan_pda/xircom_pgs.fw
-		# dsp56k (GPL-2+)
-		dsp56k/bootstrap.bin
-		# ath9k_htc (BSD GPL-2+ MIT)
-		ath9k_htc/htc_7010-1.4.0.fw
-		ath9k_htc/htc_9271-1.4.0.fw
-		# pcnet_cs, 3c589_cs, 3c574_cs, serial_cs (dual GPL-2/MPL-1.1)
-		cis/LA-PCM.cis
-		cis/PCMLM28.cis
-		cis/DP83903.cis
-		cis/NE2K.cis
-		cis/tamarack.cis
-		cis/PE-200.cis
-		cis/PE520.cis
-		cis/3CXEM556.cis
-		cis/3CCFEM556.cis
-		cis/MT5634ZLX.cis
-		cis/RS-COM-2P.cis
-		cis/COMpad2.cis
-		cis/COMpad4.cis
-		# serial_cs (GPL-3)
-		cis/SW_555_SER.cis
-		cis/SW_7xx_SER.cis
-		cis/SW_8xx_SER.cis
-		# dvb-ttpci (GPL-2+)
-		av7110/bootcode.bin
-		# usbdux, usbduxfast, usbduxsigma (GPL-2+)
-		usbdux_firmware.bin
-		usbduxfast_firmware.bin
-		usbduxsigma_firmware.bin
-		# brcmfmac (GPL-2+)
-		brcm/brcmfmac4330-sdio.Prowise-PT301.txt
-		brcm/brcmfmac43340-sdio.meegopad-t08.txt
-		brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt
-		brcm/brcmfmac43362-sdio.lemaker,bananapro.txt
-		brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt
-		"brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt"
-		brcm/brcmfmac43430-sdio.AP6212.txt
-		brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
-		brcm/brcmfmac43430-sdio.MUR1DX.txt
-		brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
-		brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
-		brcm/brcmfmac4356-pcie.gpd-win-pocket.txt
-		# isci (GPL-2)
-		isci/isci_firmware.bin
-		# carl9170 (GPL-2+)
-		carl9170-1.fw
-		# atusb (GPL-2+)
-		atusb/atusb-0.2.dfu
-		atusb/atusb-0.3.dfu
-		atusb/rzusb-0.3.bin
-		# mlxsw_spectrum (dual BSD/GPL-2)
-		mellanox/mlxsw_spectrum-13.1420.122.mfa2
-		mellanox/mlxsw_spectrum-13.1530.152.mfa2
-		mellanox/mlxsw_spectrum-13.1620.192.mfa2
-		mellanox/mlxsw_spectrum-13.1702.6.mfa2
-		mellanox/mlxsw_spectrum-13.1703.4.mfa2
-		mellanox/mlxsw_spectrum-13.1910.622.mfa2
-		mellanox/mlxsw_spectrum-13.2000.1122.mfa2
-	)
-
-	# blacklist of images with unknown license
-	local unknown_license=(
-		atmsar11.fw
-		korg/k1212.dsp
-		ess/maestro3_assp_kernel.fw
-		ess/maestro3_assp_minisrc.fw
-		yamaha/ds1_ctrl.fw
-		yamaha/ds1_dsp.fw
-		yamaha/ds1e_ctrl.fw
-		tr_smctr.bin
-		ttusb-budget/dspbootcode.bin
-		emi62/bitstream.fw
-		emi62/loader.fw
-		emi62/midi.fw
-		emi62/spdif.fw
-		ti_3410.fw
-		ti_5052.fw
-		mts_mt9234mu.fw
-		mts_mt9234zba.fw
-		whiteheat.fw
-		whiteheat_loader.fw
-		intelliport2.bin
-		cpia2/stv0672_vp4.bin
-		vicam/firmware.fw
-		edgeport/boot.fw
-		edgeport/boot2.fw
-		edgeport/down.fw
-		edgeport/down2.fw
-		edgeport/down3.bin
-		sb16/mulaw_main.csp
-		sb16/alaw_main.csp
-		sb16/ima_adpcm_init.csp
-		sb16/ima_adpcm_playback.csp
-		sb16/ima_adpcm_capture.csp
-		sun/cassini.bin
-		acenic/tg1.bin
-		acenic/tg2.bin
-		adaptec/starfire_rx.bin
-		adaptec/starfire_tx.bin
-		yam/1200.bin
-		yam/9600.bin
-		3com/3C359.bin
-		ositech/Xilinx7OD.bin
-		qlogic/isp1000.bin
-		myricom/lanai.bin
-		yamaha/yss225_registers.bin
-		lgs8g75.fw
-	)
-
-	default
-
-	# remove sources and documentation (wildcards are expanded)
-	rm -r ${source_files[@]} || die
-	rm -rf .git
-
-	if use !unknown-license; then
-		# remove files in unknown_license
-		rm "${unknown_license[@]}" || die
-	fi
-
-	if use !redistributable; then
-		# remove files _not_ in the free_software or unknown_license lists
-		# everything else is confirmed (or assumed) to be redistributable
-		# based on upstream acceptance policy
-		local IFS=$'\n'
-		find ! -type d -printf "%P\n" \
-			| grep -Fvx -e "${free_software[*]}" -e "${unknown_license[*]}" \
-			| xargs -d '\n' rm || die
-		IFS=$' \t\n'
-	fi
-
-	if use initramfs; then
-		if [[ -d "${S}/amd-ucode" ]]; then
-			local UCODETMP="${T}/ucode_tmp"
-			local UCODEDIR="${UCODETMP}/kernel/x86/microcode"
-			mkdir -p "${UCODEDIR}" || die
-			echo 1 > "${UCODETMP}/early_cpio"
-
-			local amd_ucode_file="${UCODEDIR}/AuthenticAMD.bin"
-			cat "${S}"/amd-ucode/*.bin > "${amd_ucode_file}" || die "Failed to concat amd cpu ucode"
-
-			if [[ ! -s "${amd_ucode_file}" ]]; then
-				die "Sanity check failed: '${amd_ucode_file}' is empty!"
-			fi
-
-			pushd "${UCODETMP}" &>/dev/null || die
-			find . -print0 | cpio --quiet --null -o -H newc -R 0:0 > "${S}"/amd-uc.img
-			popd &>/dev/null || die
-			if [[ ! -s "${S}/amd-uc.img" ]]; then
-				die "Failed to create '${S}/amd-uc.img'!"
-			fi
-		else
-			# If this will ever happen something has changed which
-			# must be reviewed
-			die "'${S}/amd-ucode' not found!"
-		fi
-	fi
-
-	echo "# Remove files that shall not be installed from this list." > ${PN}.conf
-	find * ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) >> ${PN}.conf
-
-	if use savedconfig; then
-		restore_config ${PN}.conf
-
-		ebegin "Removing all files not listed in config"
-		find ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) -printf "%P\n" \
-			| grep -Fvx -f <(grep -v '^#' ${PN}.conf \
-				|| die "grep failed, empty config file?") \
-			| xargs -d '\n' --no-run-if-empty rm
-		eend $? || die
-	fi
-
-	# remove empty directories, bug #396073
-	find -type d -empty -delete || die
-}
-
-src_install() {
-	save_config ${PN}.conf
-	rm ${PN}.conf || die
-
-	if use initramfs ; then
-		mkdir "${ED}/boot" || die
-		mv "${S}"/amd-uc.img "${ED}/boot" || die
-	fi
-
-	if ! ( shopt -s failglob; : * ) 2>/dev/null; then
-		eerror "No files to install. Check your USE flag settings"
-		eerror "and the list of files in your saved configuration."
-		die "Refusing to install an empty package"
-	fi
-
-	insinto /lib/firmware/
-	doins -r *
-}
-
-pkg_preinst() {
-	if use savedconfig; then
-		ewarn "USE=savedconfig is active. You must handle file collisions manually."
-	fi
-
-	# Make sure /boot is available if needed.
-	use initramfs && mount-boot_pkg_preinst
-}
-
-pkg_postinst() {
-	elog "If you are only interested in particular firmware files, edit the saved"
-	elog "configfile and remove those that you do not want."
-
-	local ver
-	for ver in ${REPLACING_VERSIONS}; do
-		if ver_test ${ver} -lt 20190514; then
-			elog
-			elog 'Starting with version 20190514, installation of many firmware'
-			elog 'files is controlled by USE flags. Please review your USE flag'
-			elog 'and package.license settings if you are missing some files.'
-			break
-		fi
-	done
-
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postinst
-}
-
-pkg_prerm() {
-	# Make sure /boot is mounted so that we can remove /boot/amd-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
-}
diff --git a/sys-kernel/linux-firmware/linux-firmware-20200122.ebuild b/sys-kernel/linux-firmware/linux-firmware-20200122.ebuild
deleted file mode 100644
index 48f34fefc553..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20200122.ebuild
+++ /dev/null
@@ -1,354 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit mount-boot savedconfig
-
-if [[ ${PV} == 99999999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-else
-	GIT_COMMIT="1eb2408c6feacccd10b02a49214745f15d1c6fb7"
-	SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-fi
-
-DESCRIPTION="Linux firmware files"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
-
-LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
-	redistributable? (
-		linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) )
-	unknown-license? ( all-rights-reserved )"
-SLOT="0"
-IUSE="initramfs +redistributable savedconfig unknown-license"
-RESTRICT="binchecks strip
-	unknown-license? ( bindist )"
-
-REQUIRED_USE="initramfs? ( redistributable )"
-
-BDEPEND="initramfs? ( app-arch/cpio )"
-
-#add anything else that collides to this
-RDEPEND="!savedconfig? (
-		redistributable? (
-			!sys-firmware/alsa-firmware[alsa_cards_ca0132]
-			!media-tv/cx18-firmware
-			!<sys-firmware/ivtv-firmware-20080701-r1
-			!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
-			!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
-			!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
-			!net-dialup/ueagle-atm
-			!net-dialup/ueagle4-atm
-			!net-wireless/ar9271-firmware
-			!net-wireless/i2400m-fw
-			!net-wireless/libertas-firmware
-			!sys-firmware/rt61-firmware
-			!net-wireless/rt73-firmware
-			!net-wireless/rt2860-firmware
-			!net-wireless/rt2870-firmware
-			!sys-block/qla-fc-firmware
-			!sys-firmware/amd-ucode
-			!sys-firmware/iwl1000-ucode
-			!sys-firmware/iwl2000-ucode
-			!sys-firmware/iwl2030-ucode
-			!sys-firmware/iwl3945-ucode
-			!sys-firmware/iwl4965-ucode
-			!sys-firmware/iwl5000-ucode
-			!sys-firmware/iwl5150-ucode
-			!sys-firmware/iwl6000-ucode
-			!sys-firmware/iwl6005-ucode
-			!sys-firmware/iwl6030-ucode
-			!sys-firmware/iwl6050-ucode
-			!sys-firmware/iwl3160-ucode
-			!sys-firmware/iwl7260-ucode
-			!sys-firmware/iwl7265-ucode
-			!sys-firmware/iwl3160-7260-bt-ucode
-			!sys-firmware/radeon-ucode
-		)
-		unknown-license? (
-			!sys-firmware/alsa-firmware[alsa_cards_korg1212]
-			!sys-firmware/alsa-firmware[alsa_cards_maestro3]
-			!sys-firmware/alsa-firmware[alsa_cards_sb16]
-			!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
-		)
-	)"
-
-pkg_pretend() {
-	use initramfs && mount-boot_pkg_pretend
-}
-
-src_unpack() {
-	if [[ ${PV} == 99999999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-		# rename directory from git snapshot tarball
-		mv ${PN}-*/ ${P} || die
-	fi
-}
-
-src_prepare() {
-	# source and documentation files, not to be installed
-	local source_files=(
-		README
-		WHENCE
-		"LICEN[CS]E*"
-		"GPL*"
-		configure
-		Makefile
-		check_whence.py
-		atusb/ChangeLog
-		av7110/Boot.S
-		av7110/Makefile
-		carl9170fw/
-		cis/Makefile
-		cis/src/
-		dsp56k/bootstrap.asm
-		dsp56k/concat-bootstrap.pl
-		dsp56k/Makefile
-		"isci/*.[ch]"
-		isci/Makefile
-		isci/README
-		"keyspan_pda/*.S"
-		keyspan_pda/Makefile
-		usbdux/
-	)
-
-	# whitelist of images with a free software license
-	local free_software=(
-		# keyspan_pda (GPL-2+)
-		keyspan_pda/keyspan_pda.fw
-		keyspan_pda/xircom_pgs.fw
-		# dsp56k (GPL-2+)
-		dsp56k/bootstrap.bin
-		# ath9k_htc (BSD GPL-2+ MIT)
-		ath9k_htc/htc_7010-1.4.0.fw
-		ath9k_htc/htc_9271-1.4.0.fw
-		# pcnet_cs, 3c589_cs, 3c574_cs, serial_cs (dual GPL-2/MPL-1.1)
-		cis/LA-PCM.cis
-		cis/PCMLM28.cis
-		cis/DP83903.cis
-		cis/NE2K.cis
-		cis/tamarack.cis
-		cis/PE-200.cis
-		cis/PE520.cis
-		cis/3CXEM556.cis
-		cis/3CCFEM556.cis
-		cis/MT5634ZLX.cis
-		cis/RS-COM-2P.cis
-		cis/COMpad2.cis
-		cis/COMpad4.cis
-		# serial_cs (GPL-3)
-		cis/SW_555_SER.cis
-		cis/SW_7xx_SER.cis
-		cis/SW_8xx_SER.cis
-		# dvb-ttpci (GPL-2+)
-		av7110/bootcode.bin
-		# usbdux, usbduxfast, usbduxsigma (GPL-2+)
-		usbdux_firmware.bin
-		usbduxfast_firmware.bin
-		usbduxsigma_firmware.bin
-		# brcmfmac (GPL-2+)
-		brcm/brcmfmac4330-sdio.Prowise-PT301.txt
-		brcm/brcmfmac43340-sdio.meegopad-t08.txt
-		brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt
-		brcm/brcmfmac43362-sdio.lemaker,bananapro.txt
-		brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt
-		"brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt"
-		brcm/brcmfmac43430-sdio.AP6212.txt
-		brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
-		brcm/brcmfmac43430-sdio.MUR1DX.txt
-		brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
-		brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
-		brcm/brcmfmac4356-pcie.gpd-win-pocket.txt
-		# isci (GPL-2)
-		isci/isci_firmware.bin
-		# carl9170 (GPL-2+)
-		carl9170-1.fw
-		# atusb (GPL-2+)
-		atusb/atusb-0.2.dfu
-		atusb/atusb-0.3.dfu
-		atusb/rzusb-0.3.bin
-		# mlxsw_spectrum (dual BSD/GPL-2)
-		mellanox/mlxsw_spectrum-13.1420.122.mfa2
-		mellanox/mlxsw_spectrum-13.1530.152.mfa2
-		mellanox/mlxsw_spectrum-13.1620.192.mfa2
-		mellanox/mlxsw_spectrum-13.1702.6.mfa2
-		mellanox/mlxsw_spectrum-13.1703.4.mfa2
-		mellanox/mlxsw_spectrum-13.1910.622.mfa2
-		mellanox/mlxsw_spectrum-13.2000.1122.mfa2
-	)
-
-	# blacklist of images with unknown license
-	local unknown_license=(
-		atmsar11.fw
-		korg/k1212.dsp
-		ess/maestro3_assp_kernel.fw
-		ess/maestro3_assp_minisrc.fw
-		yamaha/ds1_ctrl.fw
-		yamaha/ds1_dsp.fw
-		yamaha/ds1e_ctrl.fw
-		tr_smctr.bin
-		ttusb-budget/dspbootcode.bin
-		emi62/bitstream.fw
-		emi62/loader.fw
-		emi62/midi.fw
-		emi62/spdif.fw
-		ti_3410.fw
-		ti_5052.fw
-		mts_mt9234mu.fw
-		mts_mt9234zba.fw
-		whiteheat.fw
-		whiteheat_loader.fw
-		intelliport2.bin
-		cpia2/stv0672_vp4.bin
-		vicam/firmware.fw
-		edgeport/boot.fw
-		edgeport/boot2.fw
-		edgeport/down.fw
-		edgeport/down2.fw
-		edgeport/down3.bin
-		sb16/mulaw_main.csp
-		sb16/alaw_main.csp
-		sb16/ima_adpcm_init.csp
-		sb16/ima_adpcm_playback.csp
-		sb16/ima_adpcm_capture.csp
-		sun/cassini.bin
-		acenic/tg1.bin
-		acenic/tg2.bin
-		adaptec/starfire_rx.bin
-		adaptec/starfire_tx.bin
-		yam/1200.bin
-		yam/9600.bin
-		3com/3C359.bin
-		ositech/Xilinx7OD.bin
-		qlogic/isp1000.bin
-		myricom/lanai.bin
-		yamaha/yss225_registers.bin
-		lgs8g75.fw
-	)
-
-	default
-
-	# remove sources and documentation (wildcards are expanded)
-	rm -r ${source_files[@]} || die
-	rm -rf .git
-
-	if use !unknown-license; then
-		# remove files in unknown_license
-		rm "${unknown_license[@]}" || die
-	fi
-
-	if use !redistributable; then
-		# remove files _not_ in the free_software or unknown_license lists
-		# everything else is confirmed (or assumed) to be redistributable
-		# based on upstream acceptance policy
-		local IFS=$'\n'
-		find ! -type d -printf "%P\n" \
-			| grep -Fvx -e "${free_software[*]}" -e "${unknown_license[*]}" \
-			| xargs -d '\n' rm || die
-		IFS=$' \t\n'
-	fi
-
-	if use initramfs; then
-		if [[ -d "${S}/amd-ucode" ]]; then
-			local UCODETMP="${T}/ucode_tmp"
-			local UCODEDIR="${UCODETMP}/kernel/x86/microcode"
-			mkdir -p "${UCODEDIR}" || die
-			echo 1 > "${UCODETMP}/early_cpio"
-
-			local amd_ucode_file="${UCODEDIR}/AuthenticAMD.bin"
-			cat "${S}"/amd-ucode/*.bin > "${amd_ucode_file}" || die "Failed to concat amd cpu ucode"
-
-			if [[ ! -s "${amd_ucode_file}" ]]; then
-				die "Sanity check failed: '${amd_ucode_file}' is empty!"
-			fi
-
-			pushd "${UCODETMP}" &>/dev/null || die
-			find . -print0 | cpio --quiet --null -o -H newc -R 0:0 > "${S}"/amd-uc.img
-			popd &>/dev/null || die
-			if [[ ! -s "${S}/amd-uc.img" ]]; then
-				die "Failed to create '${S}/amd-uc.img'!"
-			fi
-		else
-			# If this will ever happen something has changed which
-			# must be reviewed
-			die "'${S}/amd-ucode' not found!"
-		fi
-	fi
-
-	echo "# Remove files that shall not be installed from this list." > ${PN}.conf
-	find * ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) >> ${PN}.conf
-
-	if use savedconfig; then
-		restore_config ${PN}.conf
-
-		ebegin "Removing all files not listed in config"
-		find ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) -printf "%P\n" \
-			| grep -Fvx -f <(grep -v '^#' ${PN}.conf \
-				|| die "grep failed, empty config file?") \
-			| xargs -d '\n' --no-run-if-empty rm
-		eend $? || die
-	fi
-
-	# remove empty directories, bug #396073
-	find -type d -empty -delete || die
-}
-
-src_install() {
-	save_config ${PN}.conf
-	rm ${PN}.conf || die
-
-	if use initramfs ; then
-		mkdir "${ED}/boot" || die
-		mv "${S}"/amd-uc.img "${ED}/boot" || die
-	fi
-
-	if ! ( shopt -s failglob; : * ) 2>/dev/null; then
-		eerror "No files to install. Check your USE flag settings"
-		eerror "and the list of files in your saved configuration."
-		die "Refusing to install an empty package"
-	fi
-
-	insinto /lib/firmware/
-	doins -r *
-}
-
-pkg_preinst() {
-	if use savedconfig; then
-		ewarn "USE=savedconfig is active. You must handle file collisions manually."
-	fi
-
-	# Make sure /boot is available if needed.
-	use initramfs && mount-boot_pkg_preinst
-}
-
-pkg_postinst() {
-	elog "If you are only interested in particular firmware files, edit the saved"
-	elog "configfile and remove those that you do not want."
-
-	local ver
-	for ver in ${REPLACING_VERSIONS}; do
-		if ver_test ${ver} -lt 20190514; then
-			elog
-			elog 'Starting with version 20190514, installation of many firmware'
-			elog 'files is controlled by USE flags. Please review your USE flag'
-			elog 'and package.license settings if you are missing some files.'
-			break
-		fi
-	done
-
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postinst
-}
-
-pkg_prerm() {
-	# Make sure /boot is mounted so that we can remove /boot/amd-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
-}
diff --git a/sys-kernel/linux-firmware/linux-firmware-20200619.ebuild b/sys-kernel/linux-firmware/linux-firmware-20200619.ebuild
new file mode 100644
index 000000000000..29a17fd934b9
--- /dev/null
+++ b/sys-kernel/linux-firmware/linux-firmware-20200619.ebuild
@@ -0,0 +1,333 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit mount-boot savedconfig
+
+if [[ ${PV} == 99999999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
+else
+	SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${PV}.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+fi
+
+DESCRIPTION="Linux firmware files"
+HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
+
+LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
+	redistributable? (
+		linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) )
+	unknown-license? ( all-rights-reserved )"
+SLOT="0"
+IUSE="initramfs +redistributable savedconfig unknown-license"
+RESTRICT="binchecks strip
+	unknown-license? ( bindist )"
+
+REQUIRED_USE="initramfs? ( redistributable )"
+
+BDEPEND="initramfs? ( app-arch/cpio )"
+
+#add anything else that collides to this
+RDEPEND="!savedconfig? (
+		redistributable? (
+			!sys-firmware/alsa-firmware[alsa_cards_ca0132]
+			!net-dialup/ueagle-atm
+			!net-dialup/ueagle4-atm
+			!sys-block/qla-fc-firmware
+			!sys-firmware/iwl1000-ucode
+			!sys-firmware/iwl6005-ucode
+			!sys-firmware/iwl6030-ucode
+			!sys-firmware/iwl6050-ucode
+			!sys-firmware/iwl3160-ucode
+			!sys-firmware/iwl7260-ucode
+			!sys-firmware/iwl3160-7260-bt-ucode
+		)
+		unknown-license? (
+			!sys-firmware/alsa-firmware[alsa_cards_korg1212]
+			!sys-firmware/alsa-firmware[alsa_cards_maestro3]
+			!sys-firmware/alsa-firmware[alsa_cards_sb16]
+			!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
+		)
+	)"
+
+pkg_pretend() {
+	use initramfs && mount-boot_pkg_pretend
+}
+
+src_unpack() {
+	if [[ ${PV} == 99999999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+		# rename directory from git snapshot tarball
+		if [[ ${#GIT_COMMIT} -gt 8 ]]; then
+			mv ${PN}-*/ ${P} || die
+		fi
+	fi
+}
+
+src_prepare() {
+	# source and documentation files, not to be installed
+	local source_files=(
+		README
+		WHENCE
+		"LICEN[CS]E*"
+		"GPL*"
+		configure
+		Makefile
+		check_whence.py
+		atusb/ChangeLog
+		av7110/Boot.S
+		av7110/Makefile
+		carl9170fw/
+		cis/Makefile
+		cis/src/
+		dsp56k/bootstrap.asm
+		dsp56k/concat-bootstrap.pl
+		dsp56k/Makefile
+		"isci/*.[ch]"
+		isci/Makefile
+		isci/README
+		"keyspan_pda/*.S"
+		keyspan_pda/Makefile
+		usbdux/
+	)
+
+	# whitelist of images with a free software license
+	local free_software=(
+		# keyspan_pda (GPL-2+)
+		keyspan_pda/keyspan_pda.fw
+		keyspan_pda/xircom_pgs.fw
+		# dsp56k (GPL-2+)
+		dsp56k/bootstrap.bin
+		# ath9k_htc (BSD GPL-2+ MIT)
+		ath9k_htc/htc_7010-1.4.0.fw
+		ath9k_htc/htc_9271-1.4.0.fw
+		# pcnet_cs, 3c589_cs, 3c574_cs, serial_cs (dual GPL-2/MPL-1.1)
+		cis/LA-PCM.cis
+		cis/PCMLM28.cis
+		cis/DP83903.cis
+		cis/NE2K.cis
+		cis/tamarack.cis
+		cis/PE-200.cis
+		cis/PE520.cis
+		cis/3CXEM556.cis
+		cis/3CCFEM556.cis
+		cis/MT5634ZLX.cis
+		cis/RS-COM-2P.cis
+		cis/COMpad2.cis
+		cis/COMpad4.cis
+		# serial_cs (GPL-3)
+		cis/SW_555_SER.cis
+		cis/SW_7xx_SER.cis
+		cis/SW_8xx_SER.cis
+		# dvb-ttpci (GPL-2+)
+		av7110/bootcode.bin
+		# usbdux, usbduxfast, usbduxsigma (GPL-2+)
+		usbdux_firmware.bin
+		usbduxfast_firmware.bin
+		usbduxsigma_firmware.bin
+		# brcmfmac (GPL-2+)
+		brcm/brcmfmac4330-sdio.Prowise-PT301.txt
+		brcm/brcmfmac43340-sdio.meegopad-t08.txt
+		brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt
+		brcm/brcmfmac43362-sdio.lemaker,bananapro.txt
+		brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt
+		"brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt"
+		brcm/brcmfmac43430-sdio.AP6212.txt
+		brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
+		brcm/brcmfmac43430-sdio.MUR1DX.txt
+		brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
+		brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
+		brcm/brcmfmac4356-pcie.gpd-win-pocket.txt
+		# isci (GPL-2)
+		isci/isci_firmware.bin
+		# carl9170 (GPL-2+)
+		carl9170-1.fw
+		# atusb (GPL-2+)
+		atusb/atusb-0.2.dfu
+		atusb/atusb-0.3.dfu
+		atusb/rzusb-0.3.bin
+		# mlxsw_spectrum (dual BSD/GPL-2)
+		mellanox/mlxsw_spectrum-13.1420.122.mfa2
+		mellanox/mlxsw_spectrum-13.1530.152.mfa2
+		mellanox/mlxsw_spectrum-13.1620.192.mfa2
+		mellanox/mlxsw_spectrum-13.1702.6.mfa2
+		mellanox/mlxsw_spectrum-13.1703.4.mfa2
+		mellanox/mlxsw_spectrum-13.1910.622.mfa2
+		mellanox/mlxsw_spectrum-13.2000.1122.mfa2
+	)
+
+	# blacklist of images with unknown license
+	local unknown_license=(
+		atmsar11.fw
+		korg/k1212.dsp
+		ess/maestro3_assp_kernel.fw
+		ess/maestro3_assp_minisrc.fw
+		yamaha/ds1_ctrl.fw
+		yamaha/ds1_dsp.fw
+		yamaha/ds1e_ctrl.fw
+		tr_smctr.bin
+		ttusb-budget/dspbootcode.bin
+		emi62/bitstream.fw
+		emi62/loader.fw
+		emi62/midi.fw
+		emi62/spdif.fw
+		ti_3410.fw
+		ti_5052.fw
+		mts_mt9234mu.fw
+		mts_mt9234zba.fw
+		whiteheat.fw
+		whiteheat_loader.fw
+		intelliport2.bin
+		cpia2/stv0672_vp4.bin
+		vicam/firmware.fw
+		edgeport/boot.fw
+		edgeport/boot2.fw
+		edgeport/down.fw
+		edgeport/down2.fw
+		edgeport/down3.bin
+		sb16/mulaw_main.csp
+		sb16/alaw_main.csp
+		sb16/ima_adpcm_init.csp
+		sb16/ima_adpcm_playback.csp
+		sb16/ima_adpcm_capture.csp
+		sun/cassini.bin
+		acenic/tg1.bin
+		acenic/tg2.bin
+		adaptec/starfire_rx.bin
+		adaptec/starfire_tx.bin
+		yam/1200.bin
+		yam/9600.bin
+		3com/3C359.bin
+		ositech/Xilinx7OD.bin
+		qlogic/isp1000.bin
+		myricom/lanai.bin
+		yamaha/yss225_registers.bin
+		lgs8g75.fw
+	)
+
+	default
+
+	# remove sources and documentation (wildcards are expanded)
+	rm -r ${source_files[@]} || die
+	rm -rf .git
+
+	if use !unknown-license; then
+		# remove files in unknown_license
+		rm "${unknown_license[@]}" || die
+	fi
+
+	if use !redistributable; then
+		# remove files _not_ in the free_software or unknown_license lists
+		# everything else is confirmed (or assumed) to be redistributable
+		# based on upstream acceptance policy
+		local IFS=$'\n'
+		find ! -type d -printf "%P\n" \
+			| grep -Fvx -e "${free_software[*]}" -e "${unknown_license[*]}" \
+			| xargs -d '\n' rm || die
+		IFS=$' \t\n'
+	fi
+
+	if use initramfs; then
+		if [[ -d "${S}/amd-ucode" ]]; then
+			local UCODETMP="${T}/ucode_tmp"
+			local UCODEDIR="${UCODETMP}/kernel/x86/microcode"
+			mkdir -p "${UCODEDIR}" || die
+			echo 1 > "${UCODETMP}/early_cpio"
+
+			local amd_ucode_file="${UCODEDIR}/AuthenticAMD.bin"
+			cat "${S}"/amd-ucode/*.bin > "${amd_ucode_file}" || die "Failed to concat amd cpu ucode"
+
+			if [[ ! -s "${amd_ucode_file}" ]]; then
+				die "Sanity check failed: '${amd_ucode_file}' is empty!"
+			fi
+
+			pushd "${UCODETMP}" &>/dev/null || die
+			find . -print0 | cpio --quiet --null -o -H newc -R 0:0 > "${S}"/amd-uc.img
+			popd &>/dev/null || die
+			if [[ ! -s "${S}/amd-uc.img" ]]; then
+				die "Failed to create '${S}/amd-uc.img'!"
+			fi
+		else
+			# If this will ever happen something has changed which
+			# must be reviewed
+			die "'${S}/amd-ucode' not found!"
+		fi
+	fi
+
+	echo "# Remove files that shall not be installed from this list." > ${PN}.conf
+	find * ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) >> ${PN}.conf
+
+	if use savedconfig; then
+		restore_config ${PN}.conf
+
+		ebegin "Removing all files not listed in config"
+		find ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) -printf "%P\n" \
+			| grep -Fvx -f <(grep -v '^#' ${PN}.conf \
+				|| die "grep failed, empty config file?") \
+			| xargs -d '\n' --no-run-if-empty rm
+		eend $? || die
+	fi
+
+	# remove empty directories, bug #396073
+	find -type d -empty -delete || die
+}
+
+src_install() {
+	save_config ${PN}.conf
+	rm ${PN}.conf || die
+
+	if use initramfs ; then
+		mkdir "${ED}/boot" || die
+		mv "${S}"/amd-uc.img "${ED}/boot" || die
+	fi
+
+	if ! ( shopt -s failglob; : * ) 2>/dev/null; then
+		eerror "No files to install. Check your USE flag settings"
+		eerror "and the list of files in your saved configuration."
+		die "Refusing to install an empty package"
+	fi
+
+	insinto /lib/firmware/
+	doins -r *
+}
+
+pkg_preinst() {
+	if use savedconfig; then
+		ewarn "USE=savedconfig is active. You must handle file collisions manually."
+	fi
+
+	# Make sure /boot is available if needed.
+	use initramfs && mount-boot_pkg_preinst
+}
+
+pkg_postinst() {
+	elog "If you are only interested in particular firmware files, edit the saved"
+	elog "configfile and remove those that you do not want."
+
+	local ver
+	for ver in ${REPLACING_VERSIONS}; do
+		if ver_test ${ver} -lt 20190514; then
+			elog
+			elog 'Starting with version 20190514, installation of many firmware'
+			elog 'files is controlled by USE flags. Please review your USE flag'
+			elog 'and package.license settings if you are missing some files.'
+			break
+		fi
+	done
+
+	# Don't forget to umount /boot if it was previously mounted by us.
+	use initramfs && mount-boot_pkg_postinst
+}
+
+pkg_prerm() {
+	# Make sure /boot is mounted so that we can remove /boot/amd-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
+}
diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
index 9e0ee88c040a..589799ed3941 100644
--- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
@@ -8,8 +8,7 @@ if [[ ${PV} == 99999999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
 else
-	GIT_COMMIT=""
-	SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${PV}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
@@ -33,38 +32,16 @@ BDEPEND="initramfs? ( app-arch/cpio )"
 RDEPEND="!savedconfig? (
 		redistributable? (
 			!sys-firmware/alsa-firmware[alsa_cards_ca0132]
-			!media-tv/cx18-firmware
-			!<sys-firmware/ivtv-firmware-20080701-r1
-			!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
-			!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
-			!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
 			!net-dialup/ueagle-atm
 			!net-dialup/ueagle4-atm
-			!net-wireless/ar9271-firmware
-			!net-wireless/i2400m-fw
-			!net-wireless/libertas-firmware
-			!sys-firmware/rt61-firmware
-			!net-wireless/rt73-firmware
-			!net-wireless/rt2860-firmware
-			!net-wireless/rt2870-firmware
 			!sys-block/qla-fc-firmware
-			!sys-firmware/amd-ucode
 			!sys-firmware/iwl1000-ucode
-			!sys-firmware/iwl2000-ucode
-			!sys-firmware/iwl2030-ucode
-			!sys-firmware/iwl3945-ucode
-			!sys-firmware/iwl4965-ucode
-			!sys-firmware/iwl5000-ucode
-			!sys-firmware/iwl5150-ucode
-			!sys-firmware/iwl6000-ucode
 			!sys-firmware/iwl6005-ucode
 			!sys-firmware/iwl6030-ucode
 			!sys-firmware/iwl6050-ucode
 			!sys-firmware/iwl3160-ucode
 			!sys-firmware/iwl7260-ucode
-			!sys-firmware/iwl7265-ucode
 			!sys-firmware/iwl3160-7260-bt-ucode
-			!sys-firmware/radeon-ucode
 		)
 		unknown-license? (
 			!sys-firmware/alsa-firmware[alsa_cards_korg1212]
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index da3e6f63d07e..ad417739c462 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -7,7 +7,9 @@ DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f
 DIST pf-sources-5.6_p8.patch 1877703 BLAKE2B 07c39ade7484c84a2b9a496f989a0ff9241f5957cda64e9fc70c1f8a38d936531f648a12a5963288be5cc29a977f785cf97d74c1639b014083a486b3073b1052 SHA512 e9e18e120feceeb37d8405347a7df98174ecf28f0bb30be5882711459ac19ef0af81a2ba929634b907ee01fdfd4ae01bb73d832cac4a3e0ac15cec8dfd5c1e61
 DIST pf-sources-5.7_p1.patch 131429 BLAKE2B 4a3c457631c25aebb217fccb287153ae2a67554d1dbd4c073cc82e450a3380c18362321651422dc861df10ea5ca2ba057219b6d325bd7cc1e29d1912e25c0177 SHA512 7a17b758c700e3886aa07d026c39ce3e548662ee61e82d44baaf1ccbbb6bf670bbaca8ecdf7f3c76e7b1e851eeb8c244f6c0ccc25010d9061343ef8c53f304fc
 DIST pf-sources-5.7_p2.patch 191823 BLAKE2B cdf2d7f1addda7380761843c1a75e44d5e911039036625fedea74a9ac965d206023b1450c80c46940dd2c5cd7057c031d589b4705c391c9b9a3eba2ba9f41305 SHA512 0152059e98c354a315b74575840f2c1badb5b8906090ed4818bb2638cff1981d8c4b15857ef3c39cda91faabcaafc96c89e4cb011ff7eb92e614afc66a7d50a1
+DIST pf-sources-5.7_p3.patch 1536696 BLAKE2B ced07f59a174bb2c0579bd337a4036fdb09d8dac4f6a06bbb9392f83d4b0462d75678bd6ee01539c5bfaf99e866b09e33509c493036c151cc2b628ea6c22883c SHA512 31c644fbc1b27155754a5af217bb35358fc5e3ee485a442cc6a16aae87034608554236bcbf4c7fb1809a14283404a2881342044e4dfe2e1822a24245e026f97e
 EBUILD pf-sources-5.6_p8.ebuild 2043 BLAKE2B 57f79f01bb1042d096af5450a29267e1666a200d95c051a66bc99023f19bc02dcd384eb66e341ccba5a43836fcc9bf8399c1dc81dd4c2d027b9ba1ced7475c51 SHA512 a6b525f0e6035eb160e374ba9aae21840ef1d9d082386af5decbaa3f80d497169413c5875b1840135b7134ffa18bb2368db6791799214626abe8bcac55f2fe45
 EBUILD pf-sources-5.7_p1.ebuild 1954 BLAKE2B 15c4bd2a69604a36546318261ce7a8de97ab6e78994e8614e72ea6c968aed2a22389557759ab7265a2c0f4cdd5c29e68a82143b6ca23594698c1e9f0a844f4b9 SHA512 0de23fd94dbcbf7e9050cf8399f09adf5b1e2fad6bf12b9c6ba05805e251f0c3d3051014379d6b79cc5f443d6726bd5dea87b1759674bb535b3cfb3dc22a6524
 EBUILD pf-sources-5.7_p2.ebuild 1954 BLAKE2B 15c4bd2a69604a36546318261ce7a8de97ab6e78994e8614e72ea6c968aed2a22389557759ab7265a2c0f4cdd5c29e68a82143b6ca23594698c1e9f0a844f4b9 SHA512 0de23fd94dbcbf7e9050cf8399f09adf5b1e2fad6bf12b9c6ba05805e251f0c3d3051014379d6b79cc5f443d6726bd5dea87b1759674bb535b3cfb3dc22a6524
+EBUILD pf-sources-5.7_p3.ebuild 1954 BLAKE2B 15c4bd2a69604a36546318261ce7a8de97ab6e78994e8614e72ea6c968aed2a22389557759ab7265a2c0f4cdd5c29e68a82143b6ca23594698c1e9f0a844f4b9 SHA512 0de23fd94dbcbf7e9050cf8399f09adf5b1e2fad6bf12b9c6ba05805e251f0c3d3051014379d6b79cc5f443d6726bd5dea87b1759674bb535b3cfb3dc22a6524
 MISC metadata.xml 345 BLAKE2B 26083da0607ae4e301d8dd622cd9b0016630e1e70dd6197fb8b95912578015a13da38c8434df3cebdf13f22566a132ffa9ac2ee4a32ed482cf780c55327316da SHA512 4bbc43612402fe253b02894ae6bf290ae44082c98a48d31e3d822946a8709752d3c4fb9d338fdb6779d6b421e73073c67f5f951ef423728aaa5cc18ac7958b2e
diff --git a/sys-kernel/pf-sources/pf-sources-5.7_p3.ebuild b/sys-kernel/pf-sources/pf-sources-5.7_p3.ebuild
new file mode 100644
index 000000000000..2a683a5287d4
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-5.7_p3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Define what default functions to run
+ETYPE="sources"
+
+# No 'experimental' USE flag provided, but we still want to use genpatches
+K_EXP_GENPATCHES_NOUSE="1"
+
+# Just get basic genpatches, -pf patch set already includes vanilla-linux
+# updates
+K_GENPATCHES_VER="1"
+
+# -pf already sets EXTRAVERSION to kernel Makefile
+K_NOSETEXTRAVERSION="1"
+
+# Not supported by the Gentoo security team
+K_SECURITY_UNSUPPORTED="1"
+
+# We want the very basic patches from gentoo-sources, experimental patch is
+# already included in pf-sources
+K_WANT_GENPATCHES="base extras"
+
+inherit eutils kernel-2
+detect_version
+
+DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
+HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README
+	https://dev.gentoo.org/~mpagano/genpatches/"
+SRC_URI="${KERNEL_URI}
+	https://github.com/pfactum/pf-kernel/compare/v${PV/_p*/}...v${PV/_p*/}-pf${PV/*_p/}.diff -> ${P}.patch
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.extras.tar.xz"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/linux-${PVR}-pf"
+
+PATCHES=( "${DISTDIR}/${P}.patch" )
+
+K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
+	see: ${HOMEPAGE}."
+
+pkg_setup() {
+	ewarn ""
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the pf developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn ""
+
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+	default
+	kernel-2_src_prepare
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	elog "Optional features:"
+	optfeature "Userspace KSM helper" sys-process/uksmd
+}
diff --git a/sys-kernel/rt-sources/Manifest b/sys-kernel/rt-sources/Manifest
index cc3b2ab783af..582887fc4830 100644
--- a/sys-kernel/rt-sources/Manifest
+++ b/sys-kernel/rt-sources/Manifest
@@ -1,4 +1,3 @@
-AUX rt-sources-posix-printf.patch 1705 BLAKE2B b1b61b66a07a8a6b32b4ebe9a65b7b8aebef480fde9a8cf921880bc01be92046423f4e2eb2dce3f1b78bd79c45ebb1b5de954683433f392f22e2c9f728f6882b SHA512 4f9fa773327103d061ced793192258fa20d0321681aeb89c9bf7dec744e37156e1cf8aeb7cdaefeb869d5585efeb3e1598d9c80fecc26155d6ea3f2b8947c239
 DIST deblob-4.14 143883 BLAKE2B aaad9858bf626f1495f83187fd2ab91f812504534c7294cfb6818c773229eb780096a2c78a6aa963f3826df3cfdf7a7db5238f71fa8955c21b4acd75660d2b17 SHA512 662a11c03f51d85158175a8bf35fce20f01d94659d36b97a9773304ff9c091b2a9ab72a0445065c20188457fbe174fb43334a79e17b3a9e8553bb6144a971f4c
 DIST deblob-4.19 145341 BLAKE2B fcef31cc3ff32f337ed247ce9b8066b4aac3943a9b9952adbe8be221df3b290317d6a851f1a21e85fe94dae882c3fd6e43a2abbceb31f65471f92bba2e4fc121 SHA512 b0818f888b90cbc7ce08ac6a70d7ad7875418dfe21a1d1b3198b939a07aedbd712e49d5a4c8187784eb4b7531bfc25fd6a88000447b91667e6c601b5d8d3c9cf
 DIST deblob-4.4 137370 BLAKE2B 05f96867d5e50e4bc6ea8073f6f0400c2af27bd920a7732f9a9b30e7d1181fe9de745de239b2c5cf12ef647adf1f169180627fd71eb2316d994488fb3e799ca4 SHA512 ea5f2f2cdbc97bdc90c2131f846761dc1630a53986db10d8e9d07d1ddee12a9d878c57790edd3ecc75ed9792d479b7b726c39d688a3926e850608c81b1b78a3a
diff --git a/sys-kernel/rt-sources/files/rt-sources-posix-printf.patch b/sys-kernel/rt-sources/files/rt-sources-posix-printf.patch
deleted file mode 100644
index 81ebcaf0eca9..000000000000
--- a/sys-kernel/rt-sources/files/rt-sources-posix-printf.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 651e54953b5d4ad103f0efa54fc6b380807fca3a Mon Sep 17 00:00:00 2001
-From: Thomas Schneider <qsx@qsx.re>
-Date: Fri, 14 Oct 2016 21:29:49 +0200
-Subject: security/apparmor: Use POSIX-compatible "printf '%s'"
-
-When using a strictly POSIX-compliant shell, "-n #define ..." gets
-written into the file.  Use "printf '%s'" to avoid this.
-
-Signed-off-by: Thomas Schneider <qsx@qsx.re>
-Signed-off-by: John Johansen <john.johansen@canonical.com>
----
- security/apparmor/Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-(limited to 'security/apparmor')
-
-diff --git a/security/apparmor/Makefile b/security/apparmor/Makefile
-index ad369a7..2ded2f1 100644
---- a/security/apparmor/Makefile
-+++ b/security/apparmor/Makefile
-@@ -20,7 +20,7 @@ cmd_make-caps = echo "static const char *const capability_names[] = {" > $@ ;\
- 	sed $< >>$@ -r -n -e '/CAP_FS_MASK/d' \
- 	-e 's/^\#define[ \t]+CAP_([A-Z0-9_]+)[ \t]+([0-9]+)/[\2] = "\L\1",/p';\
- 	echo "};" >> $@ ;\
--	echo -n '\#define AA_FS_CAPS_MASK "' >> $@ ;\
-+	printf '%s' '\#define AA_FS_CAPS_MASK "' >> $@ ;\
- 	sed $< -r -n -e '/CAP_FS_MASK/d' \
- 	    -e 's/^\#define[ \t]+CAP_([A-Z0-9_]+)[ \t]+([0-9]+)/\L\1/p' | \
- 	     tr '\n' ' ' | sed -e 's/ $$/"\n/' >> $@
-@@ -56,7 +56,7 @@ cmd_make-rlim = echo "static const char *const rlim_names[RLIM_NLIMITS] = {" \
- 	echo "static const int rlim_map[RLIM_NLIMITS] = {" >> $@ ;\
- 	sed -r -n "s/^\# ?define[ \t]+(RLIMIT_[A-Z0-9_]+).*/\1,/p" $< >> $@ ;\
- 	echo "};" >> $@ ; \
--	echo -n '\#define AA_FS_RLIMIT_MASK "' >> $@ ;\
-+	printf '%s' '\#define AA_FS_RLIMIT_MASK "' >> $@ ;\
- 	sed -r -n 's/^\# ?define[ \t]+RLIMIT_([A-Z0-9_]+).*/\L\1/p' $< | \
- 	    tr '\n' ' ' | sed -e 's/ $$/"\n/' >> $@
- 
--- 
-cgit v1.1
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 3bdc027d6f81..071dcb17c714 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -3,6 +3,8 @@ DIST linux-5.4.15-arch1.i686.config 241195 BLAKE2B d3332b83a3d57c450bb1d5e85d83c
 DIST linux-5.4.40.tar.xz 109535980 BLAKE2B 4857f032d5333f3c16f0947f51d6fe632527cfd78e6c556b62f5356848ef3280244eef7ffaaa136589b10e151aad3087593f3518fd0fc6958d4647b786401169 SHA512 c8785d30f7b88f3a6e565789974ecf1a055900ab4b66e358070547506aecab57b5d34afb77140cb2aeb803498c407d34f7fc11c29fbba00f6d4dedea8dd8788a
 DIST linux-5.4.46.tar.xz 109542096 BLAKE2B 99c63fc28649fc7e75a18a8a6786ca81f46516979cae9dabfe604f3353ae8a145a1a2b7e6e2747af6ea7e11d52518e7ff4261ffce0cbbd7084318da56d429e2c SHA512 780d515dfb7490f3d0ea8683d4a8f7da88c2d027c1d94a0c76507f0a9b2aa3a898401eec6684206dafd281a886062c2537b8ab1865ed08a576bb1cd6c9c75f7c
 DIST linux-5.4.47.tar.xz 109535968 BLAKE2B 0c0226343b26d43a39c7188ead8c07b0e7bd4b5c237d5327f22b60462129914dd285d1205ff249be2a8820040a3f471530737a28103881b0b3e4e00fa7eb7b26 SHA512 58dfd71a49543582ef3ecd1406bb82348d21ac780a01a24a3270cc3564b94169f2838fe33309a0bb9de53b29bdf55bf676456b60bac110fa1b804f0a0446fe94
+DIST linux-5.4.48.tar.xz 109547096 BLAKE2B b4780040ea1e619ce84055332c23a53ec52add0030b0c089cfe642b382d76c2be1fd836256cef509ddbb0d3f9d57fbebab8e23268590937a9bb72cf1eafd7064 SHA512 9da99a8764941330b21bf575e513b06285a1331bae661c32a88ba12048fe8634b51ea6173e40053b884f388248e4afd6140a9eb90db65f48a67162591831b82e
+DIST linux-5.4.49.tar.xz 109559180 BLAKE2B 1e4c3dcc0f9826c2cf6211afb4fd17778abf14d50f1bd0acfe4fb675eecce9d2bc6260417edec4b11365974088ffcf9e316a0a292811c4d74bf3041371932225 SHA512 6ef787b4aa312929c3e0060f606be63fc430923b6f292d8961884f3ec3f8a34b0099e19eadafa9b246a79ea12a0655586616ddf765928d7f446528dbf9a74f30
 DIST linux-5.6.18.tar.xz 111817124 BLAKE2B a8c01860ac9e55b33709c450fb663815205260b5e62cd2bed224a47ccf1e249d2b02515f945d2508b83f1f59727d9fed29937fe584d5cfe42c5d035c020f3407 SHA512 4cef44b489b51bc4f826aafb36d0b767fc33adeb471c69c088d5e5f8a779a580a6992bcc0769800ecf658e77434dd513ed436813cbffa39d3f98f24ea8fcf1f3
 DIST linux-5.6.19.tar.xz 111829024 BLAKE2B 7c0afa0e3d322314992022272614973311a8dfb85de5e0710dd4c929b0abc0a2389b49938f7df4256ea5719bf2a56a7d6eed2eebb51c337fd5fb277747a6620a SHA512 0b3c64ab4f63431c2da6786b4f85237f20c86f20a1faa79440d9cbc2aa6101118b0f18b6688ca7ad27dbcc4978d197fae52886fc23a3e2deb3c0a1d9c82c386b
 DIST linux-5.6.8-arch1.amd64.config 246166 BLAKE2B e749472cf4bcd1fae509bf524367106c07111f5d385b5cacf335fe03188c30c184e3535603de2b855f81538fa6fb09cedfec16ff02db5b5583a90e5cb150dba5 SHA512 873275e0ba75fb5670ac7f90abfb16ab912b1a94e5f8f39845283230763118d244c1b02e33f1b05b5d86fce90cd274c944725465dabf2dd0e79fa735fabe4d4f
@@ -10,12 +12,19 @@ DIST linux-5.6.8-arch1.i686.config 245339 BLAKE2B 746b39cc8d8d880eadd3a04eaed7fa
 DIST linux-5.7.1-arch1.amd64.config 248550 BLAKE2B 438ddcb212ffd5c257da2ad00eb9425e21f938ec8958f781af067c6d4eb45077c27d6f2aaf952fa728fd0c381e6476d1839dbc1c2074796194669591c3a17ee2 SHA512 db854554b8b8138ac44488ed8656bc620a01f361f3a6006cf0b8c7e3513c0d7b0f2be8534694b063af33ccaacdf95bd1f824470f4509a274f7f52c5b67e0f723
 DIST linux-5.7.2-arch1.i686.config 247685 BLAKE2B 28f7e9cdada8876fb07523cf657a2cda175bfab7c3a57d7e5cba06b6158fde634efa4e59ff318fb21d63564245998bfe8c3b916985f078530ca57813c1d642e9 SHA512 6b16f1583739c4534b0ef3898f1bf02d47b6375867f34bf4a5171fac4cd19ce87b17ad430860e229740cf59661594890f32c42734584ddb7cdaca63cb3bc2336
 DIST linux-5.7.4.tar.xz 112684152 BLAKE2B 0cd2e4f22491709ec91c804add85a817464a90fab4118c7ee1d38cb019a687d719591db025ea83a1421d08ae6e870b813b14aac34692441236328534a691d04b SHA512 cbd4088816abace8f9c3687ea23836d3bc4084cdc8568b01bf9f41ac80a9b6acc0566246d272876f575a5d1b1f6791f7e2ba90bc39fa53a08bdc871d632ac392
+DIST linux-5.7.5.tar.xz 112700152 BLAKE2B 8b2bcb3c11a5bee4cef117dab558b82f06e818ec9d66cbb567b9d9118ac657f168eea84d5bbd67c9fd579f7537177e184b4d23e32a8314e4860c31b68ad3a923 SHA512 a7c1ff24adbcfc08828f257accc4da51582348a46bbec5339fbe3c62520650ed1b1cd0886d94a475e43c8a84dbd693cf44c9366532ff8435db3c176eedeba000
+DIST linux-5.7.6-arch1.amd64.config 248589 BLAKE2B e7c64a69a1ea4f09f29f40502e03917d6ba9847d05863e4e7781cbc68e264c86cd617dc9ec0f502b990808f6914426cda030bb6582cc012b939891c9ea60976a SHA512 5ce2921dd99ef9f3e82298b53fac01bd2e56e2a234b608671a7f02ff936c38b99e8e34b15d574304b3cfff943e787d87726621df2aacef7a5a988377bbc0eeb5
+DIST linux-5.7.6.tar.xz 112711436 BLAKE2B 6f85bbef8ed4db5214c71fcc32e4793ee336f635ff385f5208a3eb8f45e5201b9acb40db2e0e51514a2d95269336208ab6156cf695c7f4ceb8df6b537dd0cab6 SHA512 83b6622634508caf02f782688c86138cca741daad7f7b5a87a55f1f33a59d0a93ba832da46a2cb36bafaf38c31be7c7420479cf2137da928c6ccf798428fbc36
 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-5.4.40.ebuild 1842 BLAKE2B 602e78ae2dde6491e22e190d3e156cd1683ea4c7e5b15d59e4644b24db2cc256f14f74d80bff40ba4aefa320cafebebe7c1e5b920e15e1bd5fd63a94f42c51f6 SHA512 b0bf845214b80b447bf5bec57fbf3df7a130f4d1a0d710cb212224705366b469b09eb2d8b669e5cee89ce8cd778f4297fca139beec6e9fc9d4985a22e3a9f4fa
 EBUILD vanilla-kernel-5.4.46.ebuild 1842 BLAKE2B 602e78ae2dde6491e22e190d3e156cd1683ea4c7e5b15d59e4644b24db2cc256f14f74d80bff40ba4aefa320cafebebe7c1e5b920e15e1bd5fd63a94f42c51f6 SHA512 b0bf845214b80b447bf5bec57fbf3df7a130f4d1a0d710cb212224705366b469b09eb2d8b669e5cee89ce8cd778f4297fca139beec6e9fc9d4985a22e3a9f4fa
 EBUILD vanilla-kernel-5.4.47.ebuild 1842 BLAKE2B 602e78ae2dde6491e22e190d3e156cd1683ea4c7e5b15d59e4644b24db2cc256f14f74d80bff40ba4aefa320cafebebe7c1e5b920e15e1bd5fd63a94f42c51f6 SHA512 b0bf845214b80b447bf5bec57fbf3df7a130f4d1a0d710cb212224705366b469b09eb2d8b669e5cee89ce8cd778f4297fca139beec6e9fc9d4985a22e3a9f4fa
+EBUILD vanilla-kernel-5.4.48.ebuild 1842 BLAKE2B 602e78ae2dde6491e22e190d3e156cd1683ea4c7e5b15d59e4644b24db2cc256f14f74d80bff40ba4aefa320cafebebe7c1e5b920e15e1bd5fd63a94f42c51f6 SHA512 b0bf845214b80b447bf5bec57fbf3df7a130f4d1a0d710cb212224705366b469b09eb2d8b669e5cee89ce8cd778f4297fca139beec6e9fc9d4985a22e3a9f4fa
+EBUILD vanilla-kernel-5.4.49.ebuild 1842 BLAKE2B 602e78ae2dde6491e22e190d3e156cd1683ea4c7e5b15d59e4644b24db2cc256f14f74d80bff40ba4aefa320cafebebe7c1e5b920e15e1bd5fd63a94f42c51f6 SHA512 b0bf845214b80b447bf5bec57fbf3df7a130f4d1a0d710cb212224705366b469b09eb2d8b669e5cee89ce8cd778f4297fca139beec6e9fc9d4985a22e3a9f4fa
 EBUILD vanilla-kernel-5.6.18.ebuild 1943 BLAKE2B cb0a35c29c61d5483b3d94996bc947f2821f3d13331f25f97ebf84fc68f272402b9066de9abfe1c2994246a7d8447540a454da3b0eb07636f46ba5d1947c8877 SHA512 942b7d041be0746be9023bb52be8f00c4cb33ed17e6b29670f860222bfc73ea0533ae2c1c0809799bc48ae4cc57cd2f480f35fb9ae7c1c67309eb13367cdfaf6
 EBUILD vanilla-kernel-5.6.19.ebuild 1943 BLAKE2B cb0a35c29c61d5483b3d94996bc947f2821f3d13331f25f97ebf84fc68f272402b9066de9abfe1c2994246a7d8447540a454da3b0eb07636f46ba5d1947c8877 SHA512 942b7d041be0746be9023bb52be8f00c4cb33ed17e6b29670f860222bfc73ea0533ae2c1c0809799bc48ae4cc57cd2f480f35fb9ae7c1c67309eb13367cdfaf6
 EBUILD vanilla-kernel-5.7.4.ebuild 2058 BLAKE2B 0fa275b67897324218670c5219c4fd4ba8fa01a3a0894223c610694c0a3a45dc70cd73cab6e55e6c901c091746ac607c9310b798a5ecae2add48c6380233af8b SHA512 e1811df16da00c550862de9eba31653acfb75722d85d4285793b52e7dee1448a1324bbace8a48cd6dac9b06a70b5a6ef724dc8ab663aff601bb37e3349d721dd
+EBUILD vanilla-kernel-5.7.5.ebuild 2058 BLAKE2B 0fa275b67897324218670c5219c4fd4ba8fa01a3a0894223c610694c0a3a45dc70cd73cab6e55e6c901c091746ac607c9310b798a5ecae2add48c6380233af8b SHA512 e1811df16da00c550862de9eba31653acfb75722d85d4285793b52e7dee1448a1324bbace8a48cd6dac9b06a70b5a6ef724dc8ab663aff601bb37e3349d721dd
+EBUILD vanilla-kernel-5.7.6.ebuild 2058 BLAKE2B 7f7c3c55f64e35fd181f6c4aa2ba7bfa126cf7eb64e7415634bbfe5642012c95de142b1a0fc2538e9fd1a35979bbdf1805ca187c0719e4ed6c77f0f5a7d09a7f SHA512 4583f88bfc023c9c7495b02e51dd0e2be6837125d63fe777974db6dd056e9fec8cbb57d3c567678ebdc417b6326116d12fa4afcc221ee66c0edb38b20fd8e870
 MISC metadata.xml 352 BLAKE2B d45c3f23945883bcb819c225e43715f5cfd86090f3e928dfb62b26a7b38b98421ee0c0d3b4fe9ebdb9de39c294cbc288c1731e9493f69436a6916034d8b834d9 SHA512 e3b9651b8f0fa3b07626b4cfb01456e4ecea1ae053ad9e9e1b3c925a5de601b35c9f3983535d62edae9ef49a40fe4c319e013542908839f30415f6ad85463e24
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.48.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.48.ebuild
new file mode 100644
index 000000000000..cc5e365bda59
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.48.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.15-arch1
+AMD64_CONFIG_HASH=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569
+# https://git.archlinux32.org/packages/log/core/linux/config.i686
+I686_CONFIG_VER=5.4.15-arch1
+I686_CONFIG_HASH=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e
+
+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-kernel/vanilla-kernel-5.4.49.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.49.ebuild
new file mode 100644
index 000000000000..cc5e365bda59
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.49.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.15-arch1
+AMD64_CONFIG_HASH=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569
+# https://git.archlinux32.org/packages/log/core/linux/config.i686
+I686_CONFIG_VER=5.4.15-arch1
+I686_CONFIG_HASH=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e
+
+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-kernel/vanilla-kernel-5.7.5.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.5.ebuild
new file mode 100644
index 000000000000..721459c780bf
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.5.ebuild
@@ -0,0 +1,77 @@
+# 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.7.1-arch1
+AMD64_CONFIG_HASH=663b08666b269eeeeaafbafaee07fd03389ac8d7
+# https://git.archlinux32.org/packages/log/core/linux/config.i686
+I686_CONFIG_VER=5.7.2-arch1
+I686_CONFIG_HASH=4f18a8a48e28656a98803890a0f6567b93fd5a77
+
+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 ~arm ~arm64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+	arm? ( savedconfig )
+	arm64? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )"
+
+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
+			;;
+		arm|arm64)
+			return
+			;;
+		*)
+			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'
+	)
+	use debug || config_tweaks+=(
+		-e '/CONFIG_DEBUG_INFO/d'
+	)
+	sed -i "${config_tweaks[@]}" .config || die
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.6.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.6.ebuild
new file mode 100644
index 000000000000..c454b6feae81
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.6.ebuild
@@ -0,0 +1,77 @@
+# 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.7.6-arch1
+AMD64_CONFIG_HASH=39802f4425f0fc50dd8040ad30cfdd001bd2b40b
+# https://git.archlinux32.org/packages/log/core/linux/config.i686
+I686_CONFIG_VER=5.7.2-arch1
+I686_CONFIG_HASH=4f18a8a48e28656a98803890a0f6567b93fd5a77
+
+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 ~arm ~arm64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+	arm? ( savedconfig )
+	arm64? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )"
+
+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
+			;;
+		arm|arm64)
+			return
+			;;
+		*)
+			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'
+	)
+	use debug || config_tweaks+=(
+		-e '/CONFIG_DEBUG_INFO/d'
+	)
+	sed -i "${config_tweaks[@]}" .config || die
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 85e18275f889..6c7010098f44 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -4,22 +4,19 @@ DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c03418
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-DIST linux-5.6.tar.xz 111785252 BLAKE2B 8dbe02a8ca7fd3dcf512a15c5d8098c1e7f94257e65173fed43fcc45480e4ab790df8cd39bbbb4e2a21dc9a00385bc9bbe98215a31e7f7e1d9c8f21cd8ace69e SHA512 80846fe2b4e4a7ff471d2dde28a8216ae807a3209f959e93d39ea4fc9a189ea28ec3db9d303b3fe15a28c2cb90e7446876678e93e23353c2d6f262e364a06bc9
 DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f5d2c58b6137d383f16034a587225a75a9dbca6a01a433056ebe078487132c224e909a2971c9634687e47b1d1 SHA512 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
 DIST patch-3.16.85.xz 2721272 BLAKE2B 424394d5cb7204557058b3db8b791bc62b919e6f298d1f7f92825286b4ef8a2113333245720f511fa092477d33305753b45fefc86599c9f38692498e6b9f53e2 SHA512 7d2edfbafefa6377c9e14b6149cad7e15302cc32a62feb7fe5dc07ca695dad6b41f9818f314c64a118fcae740b5f9f668f4b124a56a14decfbbae27a95aa6d92
-DIST patch-4.14.184.xz 3677908 BLAKE2B 4565b2bcb190b94535e2fa2edfd09f1565e0805d145ea21359a10dc4cfc0f1d205f1bf46fde4c591ea3122112e228ec53f41363e5c15b2432207b31be2ae6dec SHA512 7798c72c22d72fdf6819452fd2d0cff098f34870235efdf88cd9b6e64227f34120bbe98212e068ec2f639b6c33c0a07a68d389a09915eadd48f2e02d969861e0
-DIST patch-4.19.128.xz 3106168 BLAKE2B a5d5bfc09190b667a27309b0dae8abe049ab3f9e2bb290788a9226adc1ab6f86cb06ee21e98dbadbb9e4ebee6c3025cc6a15a0a48359e5a257ba96cb117fe43d SHA512 4c3eb531f55a3271dd9c3bebec185f6a77996087a343415ff48bd2d8fd690f8ed967c5c17a0eb735d5084afffd31f34cac1c95c7f3ef3a19ae94e1f268226302
-DIST patch-4.4.227.xz 3196784 BLAKE2B e5233494a5cc58211661d51dfae816f9ebc35a193edd918be63cec467d63cdf179c755cd61d36fd9699d60088adbd28118945d0fb84955ebd87d2be27fa23561 SHA512 b04f3d5f7d75e92f2c0e0f2f7ee50e158d75ef0cb7123f6506af509cdc5bd211e502488057c8df76253710f2db9686393f3884e26e8023c7948022093d8b93f2
-DIST patch-4.9.227.xz 3492828 BLAKE2B e0fa15b45539458a503aa27d6a24d372d975712561691c3f42f30e525565ba479cc09c2cb52247f3f075e807197e3bdc1422245eaf699a793eeb5050c1b59d03 SHA512 f98c178cd6b8e17c1fc4725934978482bd528dd2ae867696d0e48aa7191a3b53a6d9da7c24b32aa130e84bfab5d600140c503186e9bdab77621ae48fb53490d2
-DIST patch-5.4.47.xz 1460812 BLAKE2B efd89816df9ef54b20e6f687fc955c4aefc1b08e94e85df6269bacc020b1d5a44d250411eff4d9d5a08968eb37d41af4f564fb01d4f254b24ee659ab60528388 SHA512 3ed6cc54a3a7bc06b2b2755f9203c2a6fdf1f363cc1a50e066a72378a08d2221702f36b0bc653a1065e19a8f31fcc2c87d66113b4ff7d87da9fc0b15424e5abe
-DIST patch-5.6.19.xz 518428 BLAKE2B f99d824ecf8be4b984cdab43d5ef838bf9da017ee800a1cc09eaf19596add9c1199ea68b0b581e8560a56a8f94ca35b5914a26d1340f5c42c1bc699708e77ce5 SHA512 f967f9ffc12249db757bd38fd890ac69d327f23bcb767ffa0c178aa7e541bb4a10715664d703315ac3b96ed35909046350f97752c2a4691526ad55a9f03f2c24
-DIST patch-5.7.4.xz 63764 BLAKE2B 4b7df35968015d61094653c38e5b2390b5b373892fc6fb3ade306939b241d0891a125499f2a88e3e2639fd2f6faf30d5728b643f82eee47c64a11e4d63021f14 SHA512 754fe2f3cd2e7ab32f7ce8194239ca3940b470bd9da35ba2712e45025a1ff0e4780904361a4cadbcdc513b697dbc1eb0b86bea7f3e0f5e886dbee3a6cc661a40
+DIST patch-4.14.186.xz 3736836 BLAKE2B abbac16bf59ac92984dffcd1460a120ef87a8a1a49235a451c379fed587d8bead0cf87b2fe8553968d08853f16d7afa6a0e806713f358ca4b9a41021418e34e6 SHA512 63235a8823ce604cee1590921ee84c65b8a61304a50ab9fa80fb8187a281321bdc7b3265372aeb57db7ccc6ed17d5b49eac9d173695c6f6b36c851ca1afdd7e1
+DIST patch-4.19.130.xz 3197108 BLAKE2B 0776b0df1f29709ebda102ed1422b52a1a94366a437d9f6af7a1f8506d82d88919cae09a12c5847284d197948fde74868f206fe4874b010f27f5bda9659560f8 SHA512 e87e90c96f6b0086ed21b1d2362f8129c7c96bdf279ac91806246c27c837cdd66ac14af137c61b3e038268004a2fb1401d1c4eb77002c14d157fcc34a3fb2c8d
+DIST patch-4.4.228.xz 3213224 BLAKE2B 0bf40d9a212263afa7b13fe18e965a65b95b374eeb165190d1bd13525af5174bddbb42f920f5ae3a284e4a60f53064d6658a0fdf1b505b2c86ccd2f4a648e3be SHA512 67e35262691471f09afaf523d9ce9761daf2946bc1e9bafd2042dc71fdbc99868a3c89070bac8e495e78eabd0abcb11ad44fec7bc99c43b3bb177f00b9432914
+DIST patch-4.9.228.xz 3513700 BLAKE2B a22a31f5abd139ff5d018a65bd186d373652f4b130b4254c3c570a57bb72c713ced9e937c2b2d678ceb475f5072dfcc756d8648edefa6962986d5b15c1554cb0 SHA512 59bc15bbfc6df40abc022537f7a7d25fbaca58881c12ddadfb0e2413f7306662b948947d77279473ab5590ea9b80cb6ca3e2648e04ae62279496cce2ff258b5b
+DIST patch-5.4.49.xz 1591188 BLAKE2B 282e70be9df7fdc5c947f01708e9ab64e70d18a5f51a72826c3f3114e507f106084e1f7b7f88aa7f1c0625a945071ff15207a04f4d6323a360dce8dbf176f352 SHA512 41964ea710bfa1ee810ba5c6a916344de170f4e9be5d7eaeb9c2241c2857ff81fc54e3f0dbb3712829b953ce71bdd5f56c9d087f853562428ec967d776bfb473
+DIST patch-5.7.6.xz 315652 BLAKE2B 38d9bc03690e3460ce978f184c0929a3b7fe1fc9af16060709e9e2ac988ad32ebceecd71885b60898e62b1456c3af9dc8b762064426e7819b2064ea27d8b698a SHA512 9805544822c083a7a2806c25fec94b6f784071ec69ad3c852c39576a1a2ab7dc15c71b59d9e25abc6ac6cadfed8418f6a5871ea6e5c9b025c34c5cc9aa74862e
 EBUILD vanilla-sources-3.16.85.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
-EBUILD vanilla-sources-4.14.184.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
-EBUILD vanilla-sources-4.19.128.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
-EBUILD vanilla-sources-4.4.227.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
-EBUILD vanilla-sources-4.9.227.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
-EBUILD vanilla-sources-5.4.47.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
-EBUILD vanilla-sources-5.6.19.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
-EBUILD vanilla-sources-5.7.4.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
+EBUILD vanilla-sources-4.14.186.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
+EBUILD vanilla-sources-4.19.130.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
+EBUILD vanilla-sources-4.4.228.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
+EBUILD vanilla-sources-4.9.228.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
+EBUILD vanilla-sources-5.4.49.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
+EBUILD vanilla-sources-5.7.6.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
 MISC metadata.xml 642 BLAKE2B 6aa41c5f612d15c0b53c6aed058b2dd01bf9d7dd1ef8abb188f85cad84b43be94b3279d7c7ba50b3ac1b112c385ce01a8a8bf77d3a85dfd8e18838d7def5031d SHA512 b7e1d4e4e6a4a75046ace025fa1b42a38068dcbdafddf2b468287e9280832173617202c036b1ad1fb42c2f2e16920c44f0580039e3844cbb73402143361f764e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.184.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.186.ebuild
index 26a9a84f3519..26a9a84f3519 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.14.184.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.14.186.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.128.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.130.ebuild
index 26a9a84f3519..26a9a84f3519 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.19.128.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.19.130.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.227.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.228.ebuild
index 26a9a84f3519..26a9a84f3519 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.4.227.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.4.228.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.227.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.228.ebuild
index 26a9a84f3519..26a9a84f3519 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.9.227.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.9.228.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.47.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.49.ebuild
index 26a9a84f3519..26a9a84f3519 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.4.47.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.4.49.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.7.4.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.7.4.ebuild
deleted file mode 100644
index 26a9a84f3519..000000000000
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.7.4.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_SECURITY_UNSUPPORTED="1"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="Full sources for the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.6.19.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.7.6.ebuild
index 26a9a84f3519..26a9a84f3519 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.6.19.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.7.6.ebuild
diff --git a/sys-kernel/zen-sources/Manifest b/sys-kernel/zen-sources/Manifest
index a10c72d3e140..6745cbad48d1 100644
--- a/sys-kernel/zen-sources/Manifest
+++ b/sys-kernel/zen-sources/Manifest
@@ -2,10 +2,15 @@ DIST genpatches-5.4-1.base.tar.xz 4564 BLAKE2B 0282bad95cd003c90e92d33d2f114ca9e
 DIST genpatches-5.4-1.extras.tar.xz 1736 BLAKE2B 57df5cf8b4d96378408460be4be64900771b876a23d1e5798c97449bfcd28bea8aaf31482c614e7844106f29c9ae376c6ebef26e6c18e00a3f64bcb4e360d944 SHA512 5b9b6276f6ad6ad7ac33e14c3b06dbe943c57019332b0ee545ebf7325b7d6313db3ed6d35c46434c3c38420fb372141e63528e980aca87b90c4a39339851e80f
 DIST genpatches-5.6-1.base.tar.xz 4760 BLAKE2B b46600526a6117176153b24cd168d92be86117d6bf5f2653a6cbb229812395043e6cd4c8033f62fc042b9559a5e24f4694985c46ecd6262d53cd6bd6b8852f91 SHA512 1d7aec1b018aa30156995890f743b042ba448db3cc0a7c28c2616b08fcf3824c0eee2130ac3d331af4da1a646226d788e321a9500a748e98f029f55423c9f45d
 DIST genpatches-5.6-1.extras.tar.xz 1740 BLAKE2B bef3294d3bf392d14b4d55644d5d363fe575e3f777b793a2ffd6c6a2654ebf5f89c436d600f04166dc45dd130f2bb7fcb75778bc4171984ede083137ba7a2a5e SHA512 7bb2a574b7d7e7533cb9983477ad9b9c58a25262d0331397c3bfd95f469ffa7abf6ae7bd5ed328095f7e7365912629a52cbbbad1e9939bb4ba7bba6cd0a0e3ea
+DIST genpatches-5.7-1.base.tar.xz 5168 BLAKE2B 506ed0fe3ecf7891c0fa89467437ec665b91a5d476832f567702d42aa0216b5c738cfed235e990f66244d8dbcd3c71ece1d4b280638be2b62412cb9fc2ae05c0 SHA512 bf14433a31b131bb74c1abb1151d021074015a6ed28c88bcb56430e9502d54b450bed1c066c9cd4870da2f1642cc065f2a5d027cbf389b705cea72ad3ea8e2ab
+DIST genpatches-5.7-1.extras.tar.xz 1764 BLAKE2B d455a21ce5f37b37861747a71d55f16e9983d82ddbfc51e65f6401384b7415dff3afe5491f9ff5344e9b6ab33b760e647e3e4075549211c1a9d7d2249baa4f98 SHA512 0215ce69c03a12e5bdddfcb61ad1ef9cdeb7b2016971d439766bb2420142b9c960fefedb4f85edef73172203961be9fa01c70cb76f72e9b1f4edb299a6a14067
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST linux-5.6.tar.xz 111785252 BLAKE2B 8dbe02a8ca7fd3dcf512a15c5d8098c1e7f94257e65173fed43fcc45480e4ab790df8cd39bbbb4e2a21dc9a00385bc9bbe98215a31e7f7e1d9c8f21cd8ace69e SHA512 80846fe2b4e4a7ff471d2dde28a8216ae807a3209f959e93d39ea4fc9a189ea28ec3db9d303b3fe15a28c2cb90e7446876678e93e23353c2d6f262e364a06bc9
+DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f5d2c58b6137d383f16034a587225a75a9dbca6a01a433056ebe078487132c224e909a2971c9634687e47b1d1 SHA512 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
 DIST v5.4.15-zen1.patch.xz 908592 BLAKE2B 93a1b8e46e28b20d2f465df04c597b7da9c368532a89fc02a8059769b5f39b24b6d64acbcc88dabaa7f320c9c89705a01b3a96f8b3baa287ec60e3db4d9e1dcd SHA512 5aa5a4435e125d09a463d692bba95f247498818db157d68d75899d9031deb2aaa053a352831a843afad1241e83c25dcc5caf0243ee132696328a0d5ddcaab428
 DIST v5.6.15-zen2.patch.xz 601992 BLAKE2B 079681771e83914d2b46020f077781af0ba3946c9f0ecceec62dac3f407edac39c1e9ad840560d71f44162a90151ebedd9e19b7975f62f73c2bbe450dbcb1496 SHA512 eaa0227301f83166a520429f26d8794a6921e9b042d45d74f1d2a1a5a7323ebe3edefbf4cef3317e621db49602641d37081607cba4269fa76b2844badb81b47b
+DIST v5.7.5-zen1.patch.xz 319880 BLAKE2B 9ccbf4a0dceac6b616a03f51bf65e1761c8701bc07f2ff591caddd87adfbc29bc2ea8796219be98ba44db1ba5dc7a8fb3e59b0ca99d83604ddb59ce8730d9023 SHA512 59442cef81678b2e40522afd70e7bbb1c3c1ab4071ca0f2ffe984127f0b8088c44c60f7ee314d01b1020867a8f4f2191f99d52405475ee48ba2ca99fe214537f
 EBUILD zen-sources-5.4.15.ebuild 1122 BLAKE2B 1a431d849dfcbce48364408c1d512a7a2b708ccf552f5dc92b4fb4d5df84bbc3646817a4a288230068ce8214dd4be93b624e9e4f12a6f200f45fa7db3747cf36 SHA512 3743f12f89e2c2b71bab144fdd96921dc1b87432493994ca3717827a515616d0c79ca39ee6d9ed21a621412bbf2cb870d9b0f643eff63e25b6d6b654863036f2
 EBUILD zen-sources-5.6.15.ebuild 1181 BLAKE2B 46b9be53c62b03ae42000268d1d67fe15b39ad18993b31f2f9105c943bbc167324b0dc3b50679f906e30b119fd1d8b1f4381f29c67eaa18a7859d8e8c2f350a2 SHA512 7db5e03b7bc50f2cb05fcff62eb54fa68e282587c4567792024b077dbbff0697ddc97fe02e4c2c77ab30eac3c3ad0cb078d1260861957e2d273da9a1085dee78
+EBUILD zen-sources-5.7.5.ebuild 1122 BLAKE2B 1a431d849dfcbce48364408c1d512a7a2b708ccf552f5dc92b4fb4d5df84bbc3646817a4a288230068ce8214dd4be93b624e9e4f12a6f200f45fa7db3747cf36 SHA512 3743f12f89e2c2b71bab144fdd96921dc1b87432493994ca3717827a515616d0c79ca39ee6d9ed21a621412bbf2cb870d9b0f643eff63e25b6d6b654863036f2
 MISC metadata.xml 403 BLAKE2B b007ba7583bf43c622ac26808e1511274e1586c18b7d35e97f7e32d2c7b224e5eb89fe0dfacd6d71cf8367b4ce2c5967d0158abb706b1633218a95996fc70f34 SHA512 9655d79b7a09271fa0ba35435a727bec7dfd46b01d97a3e0a4d9fdd87ebf4ce66ca7093ee8cbb0812ba5ff0a64fe750db353824127e7d8aa731a1a95efdfd8f4
diff --git a/sys-kernel/zen-sources/zen-sources-5.7.5.ebuild b/sys-kernel/zen-sources/zen-sources-5.7.5.ebuild
new file mode 100644
index 000000000000..c3dce435487e
--- /dev/null
+++ b/sys-kernel/zen-sources/zen-sources-5.7.5.ebuild
@@ -0,0 +1,42 @@
+# 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"
+K_GENPATCHES_VER="1"
+K_SECURITY_UNSUPPORTED="1"
+K_NOSETEXTRAVERSION="1"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://github.com/zen-kernel"
+IUSE=""
+
+DESCRIPTION="The Zen Kernel Live Sources"
+
+ZEN_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-zen1/v${PV}-zen1.patch.xz"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${ZEN_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/v${PV}-zen1.patch.xz"
+UNIPATCH_STRICTORDER="yes"
+
+K_EXTRAEINFO="For more info on zen-sources, and for how to report problems, see: \
+${HOMEPAGE}, also go to #zen-sources on freenode"
+
+pkg_setup() {
+	ewarn
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the zen developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn
+	kernel-2_pkg_setup
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index b215d5939dc1..34577aeed081 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 bb174de6c4fd..5474d893a407 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -4,9 +4,9 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD compiler-rt-sanitizers-10.0.0.ebuild 4557 BLAKE2B 166307f3604e487451df0b70ab48f18e0227829c847c35d6f61962515d60ec19ca876adec9feceb0405f481bbd87574038769bd08ba49f54865f6efb6f223699 SHA512 1f9892a19b9131051440c936c45a2f7ffbf12d76c9b19f2611b92365ce06f75f156e19e4b49e008ff7065a7c026fde2dd58bc93ab1d3c0b097b4cdbc1452a23a
-EBUILD compiler-rt-sanitizers-10.0.1.9999.ebuild 4579 BLAKE2B b08971bfe1877c5d1fa2fe4cc2387cb1a5d0184b285c52898f3834d5ffea52d7a0eae6166a88b65992beefba8f48c4dc8a455f966a4f4433811e68285e4123c1 SHA512 93af0627ee6ee69b02a768341f8f3db9f50429f7d11fcf54707364e54ef596a82e2f74be30d28a66f00f53878f75ed328da34d72edc379b010ac2f89763c0b01
-EBUILD compiler-rt-sanitizers-10.0.1_rc1.ebuild 4579 BLAKE2B b08971bfe1877c5d1fa2fe4cc2387cb1a5d0184b285c52898f3834d5ffea52d7a0eae6166a88b65992beefba8f48c4dc8a455f966a4f4433811e68285e4123c1 SHA512 93af0627ee6ee69b02a768341f8f3db9f50429f7d11fcf54707364e54ef596a82e2f74be30d28a66f00f53878f75ed328da34d72edc379b010ac2f89763c0b01
-EBUILD compiler-rt-sanitizers-11.0.0.9999.ebuild 4579 BLAKE2B b08971bfe1877c5d1fa2fe4cc2387cb1a5d0184b285c52898f3834d5ffea52d7a0eae6166a88b65992beefba8f48c4dc8a455f966a4f4433811e68285e4123c1 SHA512 93af0627ee6ee69b02a768341f8f3db9f50429f7d11fcf54707364e54ef596a82e2f74be30d28a66f00f53878f75ed328da34d72edc379b010ac2f89763c0b01
+EBUILD compiler-rt-sanitizers-10.0.1.9999.ebuild 4333 BLAKE2B 598c5709a3a45a28620039fdf2d09bfec1aa85e8d638b9293d0df075b19785a7bcb5847849ff45d144cb76a9e01c8d15337c0ceef5f997de521413176ab92062 SHA512 b2e60762a15f75b722be170861477e416b27434162cd998b5d64936ba65b3fa93a71b905051e99cb7e83efa02fe80414c9892f45db84a5abbd6303b5a47a4e0d
+EBUILD compiler-rt-sanitizers-10.0.1_rc1.ebuild 4333 BLAKE2B 598c5709a3a45a28620039fdf2d09bfec1aa85e8d638b9293d0df075b19785a7bcb5847849ff45d144cb76a9e01c8d15337c0ceef5f997de521413176ab92062 SHA512 b2e60762a15f75b722be170861477e416b27434162cd998b5d64936ba65b3fa93a71b905051e99cb7e83efa02fe80414c9892f45db84a5abbd6303b5a47a4e0d
+EBUILD compiler-rt-sanitizers-11.0.0.9999.ebuild 4333 BLAKE2B 598c5709a3a45a28620039fdf2d09bfec1aa85e8d638b9293d0df075b19785a7bcb5847849ff45d144cb76a9e01c8d15337c0ceef5f997de521413176ab92062 SHA512 b2e60762a15f75b722be170861477e416b27434162cd998b5d64936ba65b3fa93a71b905051e99cb7e83efa02fe80414c9892f45db84a5abbd6303b5a47a4e0d
 EBUILD compiler-rt-sanitizers-8.0.1.ebuild 5281 BLAKE2B 7041973d68007ccc56115a9748e901dc07b9228a8c513c30c234fd98253fb04072fc19faff4bcbb544dea7ac5aa2b17c7ce545083949ab6d54020c9dfa02bfa7 SHA512 19f5be642bc47a77beca5241f95b58c8b11fb580dee1db829eadbda00542d56a7b17cccc300b1eb7ebde2ec419f38e677d9800de00067e66df98f7cfdd2d47cd
 EBUILD compiler-rt-sanitizers-9.0.1.ebuild 4847 BLAKE2B cc23d456a4c52596858a405bc74c3c5db35c4fe116685cba4982e2753ba01941bd2c166f56e4278c79e02b06229e90a7fba9fce923360dba8bbf516c8a665ae6 SHA512 dc11719f142cfa56c86373e7e6dba88957511218a654c138ab37d3de01a60bd77f8dd4bc90ed634156d0952b350dce1bad08f8a2db1a7d207335596cdd0bd4d6
 MISC metadata.xml 547 BLAKE2B 6f9d8b65c12797fd3d168e9b3948c604265db135bda5493d9f1d8b1d01fd73a79d07e5241afc3a7fa1672827fac23d3d9dc4d7ae42371a0de892a900c8c28269 SHA512 fb73a96b1ffbc7ff2fecfba35c9acd3e54ade0154016ae04423217f5c000eee2b0b821cc626908647551a0aa7b7f462d42d56cde3993ddd52248bc373b117c3e
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1.9999.ebuild
index 125a82e8a057..006db04567ad 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1.9999.ebuild
@@ -4,8 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
-inherit check-reqs cmake flag-o-matic llvm llvm.org multiprocessing \
-	python-any-r1
+inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
 
 DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
 HOMEPAGE="https://llvm.org/"
@@ -35,9 +34,6 @@ BDEPEND="
 		sys-libs/compiler-rt:${SLOT} )
 	${PYTHON_DEPS}"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 python_check_deps() {
 	use test || return 0
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
@@ -60,13 +56,6 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 src_configure() {
 	# pre-set since we need to pass it to cmake
 	BUILD_DIR=${WORKDIR}/compiler-rt_build
@@ -96,7 +85,7 @@ src_configure() {
 		mycmakeargs+=(
 			-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)")}"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
 
 			# they are created during src_test()
 			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1_rc1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1_rc1.ebuild
index 125a82e8a057..006db04567ad 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1_rc1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1_rc1.ebuild
@@ -4,8 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
-inherit check-reqs cmake flag-o-matic llvm llvm.org multiprocessing \
-	python-any-r1
+inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
 
 DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
 HOMEPAGE="https://llvm.org/"
@@ -35,9 +34,6 @@ BDEPEND="
 		sys-libs/compiler-rt:${SLOT} )
 	${PYTHON_DEPS}"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 python_check_deps() {
 	use test || return 0
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
@@ -60,13 +56,6 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 src_configure() {
 	# pre-set since we need to pass it to cmake
 	BUILD_DIR=${WORKDIR}/compiler-rt_build
@@ -96,7 +85,7 @@ src_configure() {
 		mycmakeargs+=(
 			-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)")}"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
 
 			# they are created during src_test()
 			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
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 125a82e8a057..006db04567ad 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
@@ -4,8 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
-inherit check-reqs cmake flag-o-matic llvm llvm.org multiprocessing \
-	python-any-r1
+inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
 
 DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
 HOMEPAGE="https://llvm.org/"
@@ -35,9 +34,6 @@ BDEPEND="
 		sys-libs/compiler-rt:${SLOT} )
 	${PYTHON_DEPS}"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 python_check_deps() {
 	use test || return 0
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
@@ -60,13 +56,6 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 src_configure() {
 	# pre-set since we need to pass it to cmake
 	BUILD_DIR=${WORKDIR}/compiler-rt_build
@@ -96,7 +85,7 @@ src_configure() {
 		mycmakeargs+=(
 			-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)")}"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
 
 			# they are created during src_test()
 			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index 97f25f67939c..ac850199a4de 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -3,9 +3,9 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD compiler-rt-10.0.0.ebuild 2923 BLAKE2B c5f9ed65aa52a8c464d9b9ebff0dd36d7147a5637e2c9b7bb08bf29ee204a583d226c94dbaf5c5ac2eff4b28cd07b64d65271a8dcf3345b12b9d4022827dd12c SHA512 fe6aa86d6fdb5b211326e8c3d5414f0c684d53c0c64431c043a12f0d0483ada79ab724e70f4b69589d5c5166b6867a1620517040d833bcef5c1ba6953ac5fb01
-EBUILD compiler-rt-10.0.1.9999.ebuild 2945 BLAKE2B fe5825c468581ff72d62517e0f6f08f81df6eaf8ddca5447351a55c2a098f71bce970468db71095cafd4e4ea32efc0f9ffb6b38fa14ab3b27ba23e70390242e1 SHA512 8fe929c45af1f68528134d80f1293363fd26779930e7dd2f25802c63282c23f58bb01942e195a96894e9a753c4bfbbe93ece22676522a8338bf3bcd468045452
-EBUILD compiler-rt-10.0.1_rc1.ebuild 2945 BLAKE2B fe5825c468581ff72d62517e0f6f08f81df6eaf8ddca5447351a55c2a098f71bce970468db71095cafd4e4ea32efc0f9ffb6b38fa14ab3b27ba23e70390242e1 SHA512 8fe929c45af1f68528134d80f1293363fd26779930e7dd2f25802c63282c23f58bb01942e195a96894e9a753c4bfbbe93ece22676522a8338bf3bcd468045452
-EBUILD compiler-rt-11.0.0.9999.ebuild 2945 BLAKE2B fe5825c468581ff72d62517e0f6f08f81df6eaf8ddca5447351a55c2a098f71bce970468db71095cafd4e4ea32efc0f9ffb6b38fa14ab3b27ba23e70390242e1 SHA512 8fe929c45af1f68528134d80f1293363fd26779930e7dd2f25802c63282c23f58bb01942e195a96894e9a753c4bfbbe93ece22676522a8338bf3bcd468045452
+EBUILD compiler-rt-10.0.1.9999.ebuild 2699 BLAKE2B b088b4b6da3395803df39d57fec40f1427432b054a7a4d80c17b4a46f1c3c8399ed8198e8c98624f9e587fcb503dc36f06e40e758fa9759f82923b5956ba7e88 SHA512 75400dd3962689754c84323a2f5332acd0875683a0eef40055d80c54b6ed7abd9448364cb2a4de59efaefebbc1c5127173ef03614934a76f6314c31b0082ccdd
+EBUILD compiler-rt-10.0.1_rc1.ebuild 2699 BLAKE2B b088b4b6da3395803df39d57fec40f1427432b054a7a4d80c17b4a46f1c3c8399ed8198e8c98624f9e587fcb503dc36f06e40e758fa9759f82923b5956ba7e88 SHA512 75400dd3962689754c84323a2f5332acd0875683a0eef40055d80c54b6ed7abd9448364cb2a4de59efaefebbc1c5127173ef03614934a76f6314c31b0082ccdd
+EBUILD compiler-rt-11.0.0.9999.ebuild 2699 BLAKE2B b088b4b6da3395803df39d57fec40f1427432b054a7a4d80c17b4a46f1c3c8399ed8198e8c98624f9e587fcb503dc36f06e40e758fa9759f82923b5956ba7e88 SHA512 75400dd3962689754c84323a2f5332acd0875683a0eef40055d80c54b6ed7abd9448364cb2a4de59efaefebbc1c5127173ef03614934a76f6314c31b0082ccdd
 EBUILD compiler-rt-8.0.1.ebuild 3033 BLAKE2B aae9682b1069da7024ea1e4bfd29914015cd2eb043d0f56fccc4d817bdf32ccdb3121f25232fe15fafa7e17d5bb9600de57c82b700d571d3ed2b3af3bf0d3673 SHA512 4ccaa041025603d7582775b1982a9644305110268d461bbdfdcfe094e0a85df0dd258aaf378e33d8a63ed6c5ff6d8f2f6701a69564c4ef1ab1a0662001d735da
 EBUILD compiler-rt-9.0.1.ebuild 2916 BLAKE2B 4725960cfa3ff697f1b17d709c7a9f463aa8aaf2da33592b6c5d129fc4acb51181a4712c1afce01c0b97e441685cc5932524f02cbacb339f5c7c315813e4ec72 SHA512 2b038aeb653043691f046ae2930cac58ada17ece1f7da2699e1e9ce4dbe1903f21366ca82cb3d08605875f0b24fc0a9707bbde2ea6a039c080f0d54268071f0f
 MISC metadata.xml 333 BLAKE2B 24e417cb7b8ab7730b18a3e1e5e29d008042e4fd53cf1ba3cc9d18719160b0410854ddfae52315c690138e61fb0196015968fa09b98af6470cd8bdecc09205ef SHA512 97daa7452a696b7297c47f5f637a33425f82b51426060a75b3de6bc812f9ddcd3c70ae068bc3e88ce937ab1eb10d59b0ab48a2d2c0397a112b8b6a754e333bdc
diff --git a/sys-libs/compiler-rt/compiler-rt-10.0.1.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-10.0.1.9999.ebuild
index 422f3ce2cf4d..c83c56ecf249 100644
--- a/sys-libs/compiler-rt/compiler-rt-10.0.1.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-10.0.1.9999.ebuild
@@ -4,8 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake flag-o-matic llvm llvm.org multiprocessing \
-	python-any-r1 toolchain-funcs
+inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
 
 DESCRIPTION="Compiler runtime library for clang (built-in part)"
 HOMEPAGE="https://llvm.org/"
@@ -29,9 +28,6 @@ BDEPEND="
 		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
 	${PYTHON_DEPS}"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 python_check_deps() {
 	use test || return 0
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
@@ -49,13 +45,6 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 test_compiler() {
 	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
 		<<<'int main() { return 0; }' &>/dev/null
@@ -99,7 +88,7 @@ src_configure() {
 	if use test; then
 		mycmakeargs+=(
 			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
 
 			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
 			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
diff --git a/sys-libs/compiler-rt/compiler-rt-10.0.1_rc1.ebuild b/sys-libs/compiler-rt/compiler-rt-10.0.1_rc1.ebuild
index 422f3ce2cf4d..c83c56ecf249 100644
--- a/sys-libs/compiler-rt/compiler-rt-10.0.1_rc1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-10.0.1_rc1.ebuild
@@ -4,8 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake flag-o-matic llvm llvm.org multiprocessing \
-	python-any-r1 toolchain-funcs
+inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
 
 DESCRIPTION="Compiler runtime library for clang (built-in part)"
 HOMEPAGE="https://llvm.org/"
@@ -29,9 +28,6 @@ BDEPEND="
 		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
 	${PYTHON_DEPS}"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 python_check_deps() {
 	use test || return 0
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
@@ -49,13 +45,6 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 test_compiler() {
 	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
 		<<<'int main() { return 0; }' &>/dev/null
@@ -99,7 +88,7 @@ src_configure() {
 	if use test; then
 		mycmakeargs+=(
 			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
 
 			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
 			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
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 422f3ce2cf4d..c83c56ecf249 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
@@ -4,8 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake flag-o-matic llvm llvm.org multiprocessing \
-	python-any-r1 toolchain-funcs
+inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
 
 DESCRIPTION="Compiler runtime library for clang (built-in part)"
 HOMEPAGE="https://llvm.org/"
@@ -29,9 +28,6 @@ BDEPEND="
 		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
 	${PYTHON_DEPS}"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 python_check_deps() {
 	use test || return 0
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
@@ -49,13 +45,6 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 test_compiler() {
 	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
 		<<<'int main() { return 0; }' &>/dev/null
@@ -99,7 +88,7 @@ src_configure() {
 	if use test; then
 		mycmakeargs+=(
 			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
 
 			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
 			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 8ed833fee203..71de4a766526 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -21,11 +21,11 @@ DIST glibc-2.31-sparc-patch1-reg-kabi.patch 8525 BLAKE2B 2600ba4b0e24df2054a6e77
 DIST glibc-2.31-sparc-patch2-reg-fix-clobber.patch 6864 BLAKE2B a39a10ff204d74289278125d7f2686db01874e998cb27b46b3b8b9597b5a2eae3b975a5ab08a8f5dd83693455891f6862b6eb70654f215c2ce6c5da222be96a1 SHA512 69bba011a30177386193ac4ac14a4e731c45b12dbb3745619ee802459aa75d6bbd37e62e979ec9790f691edb5f9077d37ee668b8df406f8f1c4d4316ef8c0aa7
 DIST glibc-2.31.tar.xz 16676764 BLAKE2B 91df1792345f157265eae405185a81fd4b8ce36d4c2388f44b0d5b1ae38174ea374cbc909cd260770b9f38ea58051da13766d4fa22abf41c2d4a2493257b179b SHA512 735e4c0ef10418b6ea945ad3906585e5bbd8b282d76f2131309dce4cec6b15066a5e4a3731773ce428a819b542579c9957867bb0abf05ed2030983fca4412306
 DIST locale-gen-2.00.tar.gz 7738 BLAKE2B cde6de5ba3400aea24d0d5f1b79471f89f09fb747c8e371e38316c7ada92f967e0865f573f23cb353d82419c234724143c0aeca9eb70eb945dfc581cc7491eb1 SHA512 b609fddb9ec5e567c008841fef3390eddb5d6e7699a8271b3b8c0ade1b44b0ac2e5d1daa8b9acabf3432e3b88110b538a96f209b1ad0f9e988b7efce66606dff
-EBUILD glibc-2.19-r2.ebuild 38287 BLAKE2B 6537e90257900cfb0abd28c3391fb530fa24ce74cdcf870ce340f8ee605b941550329120b1598266ed9ace251f5d12980a20d0297c04fdff633ab92baed66ed4 SHA512 7082dfd299db188b9fad3a3807e723d7b274520cb579b8681030b10d8807520ccbc960ac47d03ad7c6788add345caaeae894e2f2bce2bc1394e564540707c488
+EBUILD glibc-2.19-r2.ebuild 38264 BLAKE2B 935f298661a925624e86efbcbce2a98db4c7136a7bf280971a7022b72130b3b7a05ae8ab876cea12c3d0000ebeba70cdb0c2db084322d1f33a2685d637d8864d SHA512 bad1c42660e84e8035699b91bad4a8765657f87251b6d68e795255209c2bf696cca0ad17f8e77a024e68d93120be2030ed7f4ad1bfd26774f0ec486c59f5641f
 EBUILD glibc-2.25-r11.ebuild 6063 BLAKE2B a995a2553fad56abe09f0f890e2c70f94568675057367795acc7e62fdeb8b103a8ed9b5228bbe3aa74a70c7d657808ee0420c6c8931386c7a9c2adb0c330d15c SHA512 1b8e906841492e4f9361f909e91069c3a642d84a0216fab18b434f61db991c13765a31e29175854d43bf1b8159b462cd02e138bd593990c2306afd70f163a0cd
-EBUILD glibc-2.30-r8.ebuild 43136 BLAKE2B 2db384e8d1db4918f13eebb9ee6069b6564e8c58a64d091451159c3a209a7afb175a835f50f82a9a82a2650fc2cd8b7cd225f82ce2359a0250c6e240f72d34e7 SHA512 1154bf9ba79957a238fb21a40c2e4e1118d92646596ef1ce901470e1b78c3ca17c1284bf820cd5d951cfbb6eb10f2431dc9d1d5b5d798433bace07f32479208d
-EBUILD glibc-2.30-r9.ebuild 43297 BLAKE2B 41e0b1bdba84561d206553ce2610e986efeef547714dfa0d1f3e5362c27fb8b57aad3e46fc46b69eb4cc1a41184448d30b243c06b8a9084d3e3a49bf7bca415f SHA512 ccf0a3c865b0a35f5dd6a5585f82e08610c34b18c058c4b9f6aee2fe338d42c27b1bd62fa3dc279cc2e1d4799ad8e021feb628a83a5bda567d82e3ddab3a37c6
-EBUILD glibc-2.31-r4.ebuild 44270 BLAKE2B cd228e0f40764ec5a5ba672129c360456034c995bbc7c4c3d02d303e44108fcbda61843ebf49335fdeb70c40f91a236e4b52de72c3d70643d66a8a887fbe258e SHA512 d01ad3f8273a8c1f5ba1e603a88f732df269ab3e91b0624d9f2656a0d67d0c5e5a7b894b6d8469fb9cc3cb78686e4e5122fcc54822843c39d13acf55ac35d4d0
-EBUILD glibc-2.31-r5.ebuild 44345 BLAKE2B 3788348935b2a735297403f3dab224731e331b2ff38c4815276dde2fa02f2af3de205823203e4a3ec84d2b75d06a92ab59e957c76da4773b85c5eaf068a1cff1 SHA512 e31e3b94acd99a4f1c3f91d328c5017ffda311ff3d6bdb69f410b463361d25b767e9cba6cc7f9ae8409ea96112b50f1700018c2073887f0119b396dcf4acdcca
-EBUILD glibc-9999.ebuild 44357 BLAKE2B 288b519d2746f032e0e719c9a5e1b3a2231b0d4d805a885f09f628326f11ac7a93908ccd793c81f5fba4f651311f7627e6bf6f2ad1cae336b1dcfe5e545b82a0 SHA512 a4363934c451801b1a94232541f1e575d8bf76cc604af0d6838a696d6c8988186022ae13105f8606057a047214fa388cdc1bcc16e4afb2fa5101e981f625c4df
+EBUILD glibc-2.30-r8.ebuild 43113 BLAKE2B e567ea4544419609ce3f02ac06ce8ee2175d11502e947187334ec02cca11dacbb5453d514fe8b1c77418259e8f0bbd4306cdfa6aa573426e95ba56f910a9534c SHA512 b85c7656eb09b9702d352b2e20c334d70b764ddedacc6a218b3a921c990314ec80a4ff14e234a3bebf810f3482c45b323e9edc3c2044266341125b7095186126
+EBUILD glibc-2.30-r9.ebuild 43274 BLAKE2B bc91b14913d23e16b0f730bc1087368f2ec67a310e3a746556d1e5bc55021698b8fe9ee0d9e9485c8ff2030010775a2a4338fcd2215d2adcde19cf257343927d SHA512 95405b87f2ce225ed967fcfd924f098c56707dd12ecf41f41feb7379b212da9ae3bf5b75d55a2c217726dd78d6f07818634224479988a8061028b7c082508946
+EBUILD glibc-2.31-r4.ebuild 44247 BLAKE2B a2339a7458fae41e4abb71d3a87a814ff69752eeaf896995b8393afad12e77aa3d253649ea74db40d1cf228ec15fa643f9d75295ea64df9cc712e3edc2f7e45e SHA512 74cfff2226e8f6e016576d249ec38de06cfbf8e6ccd89d2305688a2aa2b1df278bfd8d905de8b38dc1a74b334b188d580fc4baafa82fb118bf245267fb87fef0
+EBUILD glibc-2.31-r5.ebuild 44322 BLAKE2B 9b730259a4465dbedf8a3199f6d0820901d86791fa16cf373b1f3633ea827cc6eefa253683312b758836059a3d4355b857dc510e2662111c4848398caa24f639 SHA512 31e6281c082509067e650e7c050eee83e4b0bb837756880cb62352c962f95a46ace159bd73c8ad3041293a908c3d3612bbfc9be25c9da7704dd9eacc50908aff
+EBUILD glibc-9999.ebuild 44334 BLAKE2B 86aaa3348cf24be6ff081719233b300e6ff84980c80fa81bd00d36364802ad918ba3d2d7d51ed2f122e359ac6251b9fd85882c1e6ff2b35ca52f53031af8779a SHA512 f343775d16babf5b62a7981348fc6d45f6d436df80ef514c931fb121e30afcc911c5f5ba4182dc3bb4639e576bc01fc02236a8180987800cdee83c15cf227d57
 MISC metadata.xml 1491 BLAKE2B 4688b54e937163824a5895f4fbbcc9f09152378c68416f62294f7f1506379ecb82de43e8d2c6a64d1647c16700abe7c750b3cc658a9c7053891b3a9504f2ae93 SHA512 f6c002a52bb81471fbb631c7c430e1e91f6fdefc84a0c1f330606ac6347067b60f8a6d078169d49d2b30fa6991883466fff05caf4f93f53c00e5ced625dd8c88
diff --git a/sys-libs/glibc/glibc-2.19-r2.ebuild b/sys-libs/glibc/glibc-2.19-r2.ebuild
index e8877a90634b..3b45b557922d 100644
--- a/sys-libs/glibc/glibc-2.19-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.19-r2.ebuild
@@ -94,7 +94,6 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	>=app-misc/pax-utils-0.1.10
-	!<sys-devel/bison-2.7
 	doc? ( sys-apps/texinfo )
 "
 RDEPEND="${COMMON_DEPEND}
diff --git a/sys-libs/glibc/glibc-2.30-r8.ebuild b/sys-libs/glibc/glibc-2.30-r8.ebuild
index 0421d5e61db1..4888fb0aa864 100644
--- a/sys-libs/glibc/glibc-2.30-r8.ebuild
+++ b/sys-libs/glibc/glibc-2.30-r8.ebuild
@@ -88,7 +88,6 @@ BDEPEND="
 	${PYTHON_DEPS}
 	>=app-misc/pax-utils-0.1.10
 	sys-devel/bison
-	!<sys-devel/bison-2.7
 	doc? ( sys-apps/texinfo )
 "
 COMMON_DEPEND="
diff --git a/sys-libs/glibc/glibc-2.30-r9.ebuild b/sys-libs/glibc/glibc-2.30-r9.ebuild
index 1c74a0712158..11a2b4d878ce 100644
--- a/sys-libs/glibc/glibc-2.30-r9.ebuild
+++ b/sys-libs/glibc/glibc-2.30-r9.ebuild
@@ -89,7 +89,6 @@ BDEPEND="
 	${PYTHON_DEPS}
 	>=app-misc/pax-utils-0.1.10
 	sys-devel/bison
-	!<sys-devel/bison-2.7
 	doc? ( sys-apps/texinfo )
 "
 COMMON_DEPEND="
diff --git a/sys-libs/glibc/glibc-2.31-r4.ebuild b/sys-libs/glibc/glibc-2.31-r4.ebuild
index 487ca85ae402..f4831ba151d2 100644
--- a/sys-libs/glibc/glibc-2.31-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.31-r4.ebuild
@@ -98,7 +98,6 @@ BDEPEND="
 	${PYTHON_DEPS}
 	>=app-misc/pax-utils-0.1.10
 	sys-devel/bison
-	!<sys-devel/bison-2.7
 	doc? ( sys-apps/texinfo )
 "
 COMMON_DEPEND="
diff --git a/sys-libs/glibc/glibc-2.31-r5.ebuild b/sys-libs/glibc/glibc-2.31-r5.ebuild
index 6e3ecc03699c..897a2582eb9c 100644
--- a/sys-libs/glibc/glibc-2.31-r5.ebuild
+++ b/sys-libs/glibc/glibc-2.31-r5.ebuild
@@ -92,7 +92,6 @@ BDEPEND="
 	${PYTHON_DEPS}
 	>=app-misc/pax-utils-0.1.10
 	sys-devel/bison
-	!<sys-devel/bison-2.7
 	doc? ( sys-apps/texinfo )
 "
 COMMON_DEPEND="
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 2159f471f182..ca5f697b063a 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -93,7 +93,6 @@ BDEPEND="
 	${PYTHON_DEPS}
 	>=app-misc/pax-utils-0.1.10
 	sys-devel/bison
-	!<sys-devel/bison-2.7
 	doc? ( sys-apps/texinfo )
 "
 COMMON_DEPEND="
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 37d71f001a0a..3b690431b01b 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -4,9 +4,9 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD libcxx-10.0.0.ebuild 6084 BLAKE2B 6c85f35df2356419ff707a588ade9937d8b5fa3857a535f29ac77312ce565a6d02247c12a84f1d2458fea352cb9d3c3c59392bb8b7caaf7e3493180c5ad663b8 SHA512 5e7149e78a8a38de75c5e7776245d6440aedf34d3883dae05f20182952c8bf9b065ed2d72c4d9a8e6a745d87716072d4bc3e18352a3747516405dc3aa2245e00
-EBUILD libcxx-10.0.1.9999.ebuild 6175 BLAKE2B cd9d6874a410affb76581587d5bd7c72e03652dbc7a5518e40fe74158877f65f3d98a3ccc4008dd0668602c2b0df92993f7ff340177b26175c635031c97cc02a SHA512 48b6f96e787273fedbad90198ba503731cfb3fbc168ad8cf88f95d396e5208fef5c3cf570385bde6ccf1f8220ac0475b747791c86c15b6a3f4acd2788427fc51
-EBUILD libcxx-10.0.1_rc1.ebuild 6175 BLAKE2B cd9d6874a410affb76581587d5bd7c72e03652dbc7a5518e40fe74158877f65f3d98a3ccc4008dd0668602c2b0df92993f7ff340177b26175c635031c97cc02a SHA512 48b6f96e787273fedbad90198ba503731cfb3fbc168ad8cf88f95d396e5208fef5c3cf570385bde6ccf1f8220ac0475b747791c86c15b6a3f4acd2788427fc51
-EBUILD libcxx-11.0.0.9999.ebuild 6222 BLAKE2B ca7466088542877c535f9fc181bfba9a11ddd06dd02baf8a1da5e04ff0b45f7a40bb8f3518428f2f00de07e191751e1a5b20ad11ab3e20bd03b853d5dbf10d71 SHA512 ca90a9f81834c915f8e92311ae9de5e69d6dd98bd7dc2bdde19250c73ec45f9a5678ac0dfc71f64193e95edb6dd2fdfed262ebec21f36e3fed6032b5aa30935e
+EBUILD libcxx-10.0.1.9999.ebuild 5948 BLAKE2B c21e547b5380231c33457b609f1eb08af7270270c3f1309f17bf751f18b0e06ac0a18ba7a136f76dbaafa3c59e7be91c3829cd35b147da751dfebbc2b075ffc1 SHA512 e6c2c6b3d42cc3af2296d1847ea147ca07f550af1d0b9b7ce7e7a6b1fa034f9da391768bdc4e541da0e6e74912553ddfa1775a0128dc9b798185572919dbc8eb
+EBUILD libcxx-10.0.1_rc1.ebuild 5948 BLAKE2B c21e547b5380231c33457b609f1eb08af7270270c3f1309f17bf751f18b0e06ac0a18ba7a136f76dbaafa3c59e7be91c3829cd35b147da751dfebbc2b075ffc1 SHA512 e6c2c6b3d42cc3af2296d1847ea147ca07f550af1d0b9b7ce7e7a6b1fa034f9da391768bdc4e541da0e6e74912553ddfa1775a0128dc9b798185572919dbc8eb
+EBUILD libcxx-11.0.0.9999.ebuild 5995 BLAKE2B f07fbdeb0e743d0d6b72a26af6f7ab81f790b45419b909b7ba83b444875e51c64f62c33a2255ec81ffedfcaa4f1bd6906cf238754b71d9916ef1527f079b4a49 SHA512 a9138e1818fb59be2b03e3c681a50d7862358aa4f32590f796f166ead82fc5f341e9ddbeb0729347eee29cd6d84072079cd2e839c7f45d3b6a2d3f7abcac48ed
 EBUILD libcxx-8.0.1.ebuild 6539 BLAKE2B 4903d2f0c2102d4c2d373d1ce17d092adddc666e982593bab358af93360c72de2e80b1476383609ee01decaae9c08dd6ae1d473d58caefeb325cabc1042cb9b1 SHA512 5c3627016de412cfe281b2cf7579c4f68a7ae4ba087cf5ab567f0fc24c5585939ec5f7044134df4d2bcd67e5d19e1344e43b37de485f9f2572c04aa405cf8c22
 EBUILD libcxx-9.0.1.ebuild 6398 BLAKE2B 0bf084d925f6633809763077300f2221bd7fd67f2d29b1f4febc436b7ff658c51deb7b614807eb9459f466a120e9f7420cf047a1f5583effd48544bdc51aa344 SHA512 77898701b515982851e2e49436705c9166f9c82c011b967b942f3c4f8d2466692e89883d18b28b1ad886692d37b02234a14a80c965c12fc2675fc40baacceebc
 MISC metadata.xml 731 BLAKE2B a6e96906bc2bff950c1b193b01feeb456b064fa585042566eae77dbe9a207bb08dfd083a3ab5fede2133a80b905a61c6dd541f9196e585c60b5629dd04a06213 SHA512 0a25560aa3eff5355137dadbb9cc48e384d2885b89075a97a8dafc7ac0ebe4ec5fde5b171a3416490264791a734c4405ec8a42dfc98e7e830c30ef0cfef58b6f
diff --git a/sys-libs/libcxx/libcxx-10.0.1.9999.ebuild b/sys-libs/libcxx/libcxx-10.0.1.9999.ebuild
index 055385df1c68..f96a537e3541 100644
--- a/sys-libs/libcxx/libcxx-10.0.1.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-10.0.1.9999.ebuild
@@ -5,8 +5,7 @@ EAPI=7
 
 CMAKE_ECLASS=cmake
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 \
-	toolchain-funcs
+inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
 
 DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
 HOMEPAGE="https://libcxx.llvm.org/"
@@ -34,9 +33,6 @@ BDEPEND="
 
 DOCS=( CREDITS.TXT )
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 python_check_deps() {
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
@@ -58,10 +54,7 @@ src_prepare() {
 	# out-of-tree build.
 	eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch"
 
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
+	llvm.org_src_prepare
 }
 
 test_compiler() {
@@ -132,13 +125,11 @@ multilib_src_configure() {
 
 	if use test; then
 		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
-		local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
-
 		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
 
 		mycmakeargs+=(
 			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
 		)
 	fi
 	cmake_src_configure
diff --git a/sys-libs/libcxx/libcxx-10.0.1_rc1.ebuild b/sys-libs/libcxx/libcxx-10.0.1_rc1.ebuild
index 055385df1c68..f96a537e3541 100644
--- a/sys-libs/libcxx/libcxx-10.0.1_rc1.ebuild
+++ b/sys-libs/libcxx/libcxx-10.0.1_rc1.ebuild
@@ -5,8 +5,7 @@ EAPI=7
 
 CMAKE_ECLASS=cmake
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 \
-	toolchain-funcs
+inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
 
 DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
 HOMEPAGE="https://libcxx.llvm.org/"
@@ -34,9 +33,6 @@ BDEPEND="
 
 DOCS=( CREDITS.TXT )
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 python_check_deps() {
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
@@ -58,10 +54,7 @@ src_prepare() {
 	# out-of-tree build.
 	eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch"
 
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
+	llvm.org_src_prepare
 }
 
 test_compiler() {
@@ -132,13 +125,11 @@ multilib_src_configure() {
 
 	if use test; then
 		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
-		local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
-
 		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
 
 		mycmakeargs+=(
 			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
 		)
 	fi
 	cmake_src_configure
diff --git a/sys-libs/libcxx/libcxx-11.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-11.0.0.9999.ebuild
index bb151379aedf..01acafa1f815 100644
--- a/sys-libs/libcxx/libcxx-11.0.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-11.0.0.9999.ebuild
@@ -5,8 +5,7 @@ EAPI=7
 
 CMAKE_ECLASS=cmake
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 \
-	toolchain-funcs
+inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
 
 DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
 HOMEPAGE="https://libcxx.llvm.org/"
@@ -35,9 +34,6 @@ BDEPEND="
 
 DOCS=( CREDITS.TXT )
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 python_check_deps() {
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
@@ -59,10 +55,7 @@ src_prepare() {
 	# out-of-tree build.
 	eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch"
 
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
+	llvm.org_src_prepare
 }
 
 test_compiler() {
@@ -133,13 +126,11 @@ multilib_src_configure() {
 
 	if use test; then
 		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
-		local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
-
 		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
 
 		mycmakeargs+=(
 			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
 		)
 	fi
 	cmake_src_configure
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 8b0f61262def..31ea850fba98 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -4,9 +4,9 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD libcxxabi-10.0.0.ebuild 3394 BLAKE2B 47672d6e34b5961fae613e289024b3fe7266efa6c97c9560e85138f320cabf565177f4ba9349f0add7d7b653ab92905a29afe2932c840fb1dd55b028158eee85 SHA512 b3a4515a23d98e3d3888f6df6620e6731dbb0c7ea19236d97703bbd116222532a39185ecc6cd56a852656a7c315fc4a136bef07af65be9481c265ff906698618
-EBUILD libcxxabi-10.0.1.9999.ebuild 3484 BLAKE2B d10d1f6603520c687a0e4fe4e0059eef59d43ebfbd3aa7cf12a8ae6bc2b08f9f18b5b1b25f217757fb1b38525f3c271d079e0f7cf1571dd237950578d9b7a24b SHA512 881dc35bcb88725df00b93e956abe376cfa8d56e4da75fc1d4082a6b7a77721c02606d8fc72fc67e21d4a5c439e3a064901e1640ba16f0beff75fa6429183a76
-EBUILD libcxxabi-10.0.1_rc1.ebuild 3484 BLAKE2B d10d1f6603520c687a0e4fe4e0059eef59d43ebfbd3aa7cf12a8ae6bc2b08f9f18b5b1b25f217757fb1b38525f3c271d079e0f7cf1571dd237950578d9b7a24b SHA512 881dc35bcb88725df00b93e956abe376cfa8d56e4da75fc1d4082a6b7a77721c02606d8fc72fc67e21d4a5c439e3a064901e1640ba16f0beff75fa6429183a76
-EBUILD libcxxabi-11.0.0.9999.ebuild 3481 BLAKE2B 8594d2d10655dd4ca92431adc1488ba9ea06081a0844a3ecb5962b857c859d3ef074407e8955b1be1e6fdbea4f67cd85bf257697abd27d642516bbba12c35abf SHA512 be90214fa0c9f4fc8027a16bc71e47c8e23ed5997cf7055e01287273755803a5bcda282b786032a6103864b5fcf6b298483b3b2753dd0962ea98cdcbd70000bf
+EBUILD libcxxabi-10.0.1.9999.ebuild 3219 BLAKE2B d49ba451e0aee79e97b0519441d621f9d89a37bd52950fe51674dc562abb35d9e8213c26c3099bc22d835c4f7b492ea28986632f1f5d237b82cf52fc2acf27f7 SHA512 073e201313a02c8614a3966591b15053f029c85a9f2718bf9c6c7eb77fa38a43bd7ed50ddedba21d3adaba415c6240663a0506697aa6444c8a0b65ee1e0805d1
+EBUILD libcxxabi-10.0.1_rc1.ebuild 3219 BLAKE2B d49ba451e0aee79e97b0519441d621f9d89a37bd52950fe51674dc562abb35d9e8213c26c3099bc22d835c4f7b492ea28986632f1f5d237b82cf52fc2acf27f7 SHA512 073e201313a02c8614a3966591b15053f029c85a9f2718bf9c6c7eb77fa38a43bd7ed50ddedba21d3adaba415c6240663a0506697aa6444c8a0b65ee1e0805d1
+EBUILD libcxxabi-11.0.0.9999.ebuild 3216 BLAKE2B b5e0ffc7235b3ec87d689f0cbfb048002f76796aad0a0ddfb111716a3bab3d212cb540afa1d89c107edf1d9fa0f8d5c09c96aa3f31ab6a6f9153a501bf9aa423 SHA512 54eb611fac1f62c1251730f1eb374660255f64bcc42996fe37bb0a0a126350925dd0015b7f66414d439048f5adc0cf6df764dce0dd3c21e992e28541d1e4dc25
 EBUILD libcxxabi-8.0.1.ebuild 3226 BLAKE2B 9804f1976cd7e605cf60a07e69c66f97795bebf66779fb69fe500cb6f4693e63d799fdb57991b2b65bde309e72e2e6055c3e88fd1ebf0be725982a253faf10b7 SHA512 42ccc6ccfc69c95dd465542d90a6a6bc0558703fcf2b5b1acb5c828728416cddbd5af925552b231c890af8c89533073a3f13d87da9c1401cf8904bb4dc5e72de
 EBUILD libcxxabi-9.0.1.ebuild 3390 BLAKE2B 708b1327f629ad4445fde37d53dea7807c433a2e3154f56f3fed4ba9eb698f3bb3e67055820521c58d8a31dc26abf28c293d709f97b4496ab420d788ab532c12 SHA512 18ab388b271756a5eb6dd1650d6a9f05a392b4e2cb48df92359c0e9ac763ecc4672343b4b51184f13c0636fe130e4a5972d8937866d34f1efec4b1addce1f81a
 MISC metadata.xml 350 BLAKE2B 67b70b8d7292327882a845b76667ce24fee728cd84f27ed7e329bc7963631cba4c28bafce5e6a5fefb4ba1df5c7fd572b3b0d7a2b31ef649496f2f991b691bff SHA512 317dd7b59a711dd0461b5369f7e31ea196882b018e047e1dbae8077274d06cb68542c8762efb852cce0b8021bedea69c19aa0c124b9414a36cf1a9c00e0b9703
diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.1.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-10.0.1.9999.ebuild
index a1236effd156..41a864c31acd 100644
--- a/sys-libs/libcxxabi/libcxxabi-10.0.1.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-10.0.1.9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_ECLASS=cmake
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 toolchain-funcs
+inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
 
 DESCRIPTION="Low level support for a standard C++ library"
 HOMEPAGE="https://libcxxabi.llvm.org/"
@@ -33,9 +33,6 @@ BDEPEND="
 	test? ( >=sys-devel/clang-3.9.0
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 python_check_deps() {
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
@@ -45,13 +42,6 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 multilib_src_configure() {
 	# link against compiler-rt instead of libgcc if we are using clang with libunwind
 	local want_compiler_rt=OFF
@@ -79,13 +69,11 @@ multilib_src_configure() {
 	)
 	if use test; then
 		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
-		local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
-
 		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
 
 		mycmakeargs+=(
 			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
 		)
 	fi
 	cmake_src_configure
diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.1_rc1.ebuild b/sys-libs/libcxxabi/libcxxabi-10.0.1_rc1.ebuild
index a1236effd156..41a864c31acd 100644
--- a/sys-libs/libcxxabi/libcxxabi-10.0.1_rc1.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-10.0.1_rc1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_ECLASS=cmake
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 toolchain-funcs
+inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
 
 DESCRIPTION="Low level support for a standard C++ library"
 HOMEPAGE="https://libcxxabi.llvm.org/"
@@ -33,9 +33,6 @@ BDEPEND="
 	test? ( >=sys-devel/clang-3.9.0
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 python_check_deps() {
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
@@ -45,13 +42,6 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 multilib_src_configure() {
 	# link against compiler-rt instead of libgcc if we are using clang with libunwind
 	local want_compiler_rt=OFF
@@ -79,13 +69,11 @@ multilib_src_configure() {
 	)
 	if use test; then
 		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
-		local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
-
 		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
 
 		mycmakeargs+=(
 			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
 		)
 	fi
 	cmake_src_configure
diff --git a/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild
index b4d67fc8e6d6..534db9954d2c 100644
--- a/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_ECLASS=cmake
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 toolchain-funcs
+inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
 
 DESCRIPTION="Low level support for a standard C++ library"
 HOMEPAGE="https://libcxxabi.llvm.org/"
@@ -33,9 +33,6 @@ BDEPEND="
 	test? ( >=sys-devel/clang-3.9.0
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 python_check_deps() {
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
@@ -45,13 +42,6 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 multilib_src_configure() {
 	# link against compiler-rt instead of libgcc if we are using clang with libunwind
 	local want_compiler_rt=OFF
@@ -79,13 +69,11 @@ multilib_src_configure() {
 	)
 	if use test; then
 		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
-		local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
-
 		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
 
 		mycmakeargs+=(
 			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
 		)
 	fi
 	cmake_src_configure
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index ccfa6fa9a2b7..1f941c4e2492 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -3,9 +3,9 @@ DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 DIST openmp-8.0.1.src.tar.xz 933320 BLAKE2B 02a7bf70cd3a217845ef1c5a35e0d7dbfbb39069a9029d462c797b5ddf2240fd627dee55856146ca4bb81622a41f31ecd11e0ed66baf3b7d99447087271991b0 SHA512 9ded785c8129e7b3a70b54f07c4dde529456edcc94904ad77fc578cf7f096cfa3ff2279959d7f7f1db51571e11c53375f33b597c7f36ce6dc6b512c44ced8026
 EBUILD libomp-10.0.0.ebuild 3018 BLAKE2B bb29e082317eb219e465ad799dfeb8396595ea1eabc18d5481810d44adb28364875f96fd6dee194625892a6284d29c565149de081947bd17c1d56815fed921b1 SHA512 4bf69b6ef9c3860882a3eb95b2597678f34e3080e324c9ead8f905a47106e3252984ae7746bf93c1dd2d06abda371d905d7ad747459d076d999a4ea3f4571f28
-EBUILD libomp-10.0.1.9999.ebuild 3087 BLAKE2B dff585ed9a274bc0912c8558b5e0307286a2bde3b3beb0ed523fa5705b75c50bcccf416491e3132694b747c48ca62d3aad9a142ba1b515d8e092f3d1c8a415d5 SHA512 84c6e85a79be62100f161b98a6c6f2340bbda45cd537ca61a00e04820c5f8491db6158d6929a11a7024f6e4e6a3bf50973b1401218634042ae856981676a6860
-EBUILD libomp-10.0.1_rc1.ebuild 3087 BLAKE2B dff585ed9a274bc0912c8558b5e0307286a2bde3b3beb0ed523fa5705b75c50bcccf416491e3132694b747c48ca62d3aad9a142ba1b515d8e092f3d1c8a415d5 SHA512 84c6e85a79be62100f161b98a6c6f2340bbda45cd537ca61a00e04820c5f8491db6158d6929a11a7024f6e4e6a3bf50973b1401218634042ae856981676a6860
-EBUILD libomp-11.0.0.9999.ebuild 3087 BLAKE2B dff585ed9a274bc0912c8558b5e0307286a2bde3b3beb0ed523fa5705b75c50bcccf416491e3132694b747c48ca62d3aad9a142ba1b515d8e092f3d1c8a415d5 SHA512 84c6e85a79be62100f161b98a6c6f2340bbda45cd537ca61a00e04820c5f8491db6158d6929a11a7024f6e4e6a3bf50973b1401218634042ae856981676a6860
+EBUILD libomp-10.0.1.9999.ebuild 2844 BLAKE2B edf9ceb8c819d5c522c92af4de5c5470f9d99e09d60c29d1ecc0aa71aea9a281bc797fc141881759cbecbea150dc00b0ae07276808959dc566402f319526061a SHA512 4fed307e6ea1b5e9c5859a6b8d51756a5cb0775dddbefd830acea7633cdb57fd08ec4bc406500b283054d9896a41a194f496fc7dc9f60bc86ca74a165c3a76a2
+EBUILD libomp-10.0.1_rc1.ebuild 2844 BLAKE2B edf9ceb8c819d5c522c92af4de5c5470f9d99e09d60c29d1ecc0aa71aea9a281bc797fc141881759cbecbea150dc00b0ae07276808959dc566402f319526061a SHA512 4fed307e6ea1b5e9c5859a6b8d51756a5cb0775dddbefd830acea7633cdb57fd08ec4bc406500b283054d9896a41a194f496fc7dc9f60bc86ca74a165c3a76a2
+EBUILD libomp-11.0.0.9999.ebuild 2844 BLAKE2B edf9ceb8c819d5c522c92af4de5c5470f9d99e09d60c29d1ecc0aa71aea9a281bc797fc141881759cbecbea150dc00b0ae07276808959dc566402f319526061a SHA512 4fed307e6ea1b5e9c5859a6b8d51756a5cb0775dddbefd830acea7633cdb57fd08ec4bc406500b283054d9896a41a194f496fc7dc9f60bc86ca74a165c3a76a2
 EBUILD libomp-8.0.1.ebuild 3261 BLAKE2B 07d184e3032f81108f842255cd67669eec67cd7da4efbcfae92acc3dae17210522b1d2de6c4ee8067193e8c62883eacc2e12fa94bca050e77dbea257ed4cf60b SHA512 41892cf4263e67877309296ae1bc4ac6002142f6d72255bebaf2c86e3541e4eef556a3bf4489a83a23fde5297bd3c93f564bc92c48f63a7d2acbccb1eacada4a
 EBUILD libomp-9.0.1.ebuild 3011 BLAKE2B 33ccc441765ab33b61c9739e999039b24437c6f79b89a4db5ee1575b072fd3af609d5c8c583331db81b0b5a24a2a85cc359b4df312330b5732a24c7a8ebe3021 SHA512 404f3df2df27e031b59c4f827b13b2d9ce2b6af4126abdd1d6a233cfe0ec26ede61d01ddf6ca3434b6698ac6407ce8b4a845070b875f92eff4d961280c95ed5a
 MISC metadata.xml 825 BLAKE2B 07802144018f2f74b0927b53a346f99cbc7e36dbf501bb8dfc786f8d549c10eb688afafb1759f13d4d56d10f1bcae67dfa86cc2047cc39a9655a09a22e9a4260 SHA512 de43d5be94a5ea1cdfd3ae747d55b50d5d6ee577743f55d006d585d2d5acd5b3100845486ac415685f07361cd9985bae9347fff9c65417d198c49a61b4f6ba5e
diff --git a/sys-libs/libomp/libomp-10.0.1.9999.ebuild b/sys-libs/libomp/libomp-10.0.1.9999.ebuild
index 01e5f189d659..5bffd6685f64 100644
--- a/sys-libs/libomp/libomp-10.0.1.9999.ebuild
+++ b/sys-libs/libomp/libomp-10.0.1.9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_ECLASS=cmake
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake-multilib linux-info llvm.org multiprocessing python-any-r1
+inherit cmake-multilib linux-info llvm.org python-any-r1
 
 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
 HOMEPAGE="https://openmp.llvm.org"
@@ -39,9 +39,6 @@ BDEPEND="dev-lang/perl
 		>=sys-devel/clang-6
 	)"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 python_check_deps() {
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
@@ -67,13 +64,6 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 multilib_src_configure() {
 	local libdir="$(get_libdir)"
 	local mycmakeargs=(
@@ -98,7 +88,7 @@ multilib_src_configure() {
 	use test && mycmakeargs+=(
 		# this project does not use standard LLVM cmake macros
 		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
-		-DOPENMP_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
 
 		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
 		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
diff --git a/sys-libs/libomp/libomp-10.0.1_rc1.ebuild b/sys-libs/libomp/libomp-10.0.1_rc1.ebuild
index 01e5f189d659..5bffd6685f64 100644
--- a/sys-libs/libomp/libomp-10.0.1_rc1.ebuild
+++ b/sys-libs/libomp/libomp-10.0.1_rc1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_ECLASS=cmake
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake-multilib linux-info llvm.org multiprocessing python-any-r1
+inherit cmake-multilib linux-info llvm.org python-any-r1
 
 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
 HOMEPAGE="https://openmp.llvm.org"
@@ -39,9 +39,6 @@ BDEPEND="dev-lang/perl
 		>=sys-devel/clang-6
 	)"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 python_check_deps() {
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
@@ -67,13 +64,6 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 multilib_src_configure() {
 	local libdir="$(get_libdir)"
 	local mycmakeargs=(
@@ -98,7 +88,7 @@ multilib_src_configure() {
 	use test && mycmakeargs+=(
 		# this project does not use standard LLVM cmake macros
 		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
-		-DOPENMP_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
 
 		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
 		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
diff --git a/sys-libs/libomp/libomp-11.0.0.9999.ebuild b/sys-libs/libomp/libomp-11.0.0.9999.ebuild
index 01e5f189d659..5bffd6685f64 100644
--- a/sys-libs/libomp/libomp-11.0.0.9999.ebuild
+++ b/sys-libs/libomp/libomp-11.0.0.9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_ECLASS=cmake
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake-multilib linux-info llvm.org multiprocessing python-any-r1
+inherit cmake-multilib linux-info llvm.org python-any-r1
 
 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
 HOMEPAGE="https://openmp.llvm.org"
@@ -39,9 +39,6 @@ BDEPEND="dev-lang/perl
 		>=sys-devel/clang-6
 	)"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 python_check_deps() {
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
@@ -67,13 +64,6 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 multilib_src_configure() {
 	local libdir="$(get_libdir)"
 	local mycmakeargs=(
@@ -98,7 +88,7 @@ multilib_src_configure() {
 	use test && mycmakeargs+=(
 		# this project does not use standard LLVM cmake macros
 		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
-		-DOPENMP_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
 
 		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
 		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
diff --git a/sys-libs/libtermcap-compat/Manifest b/sys-libs/libtermcap-compat/Manifest
index 41362ce0f998..f456138fc4f0 100644
--- a/sys-libs/libtermcap-compat/Manifest
+++ b/sys-libs/libtermcap-compat/Manifest
@@ -1,6 +1,5 @@
 DIST termcap-2.0.8-patches-2.tar.bz2 11589 BLAKE2B 8fec4befa009a8dd53fd949435eba30a06523cf731ec35a7565608dd0fbcddcbb01b56c94815a79851e0e7afd75d31475cde682c0d419b86cb4750ec9a543bed SHA512 24d871007191a051dca604635f6d4e2dec67b675c2c9a0c728a0458a6a501ac268f5d4c4203356a6f64e718edba5c8ec970276c244435a25bef11c6fba0e837d
 DIST termcap-2.0.8.tar.bz2 211523 BLAKE2B 4ea7c4cdc26be4e1262a8e75e125b4349c75976c297c2389e034635d2d5324275486525fe93fd8628e8a5cd0980c7e97eba55f5a05d6b3b537337b2fb55cf2cd SHA512 1aca52f5bcda60933229143085416296fed1aa981bae4440f30424f1e2bd9d90e9836f05c5a5a53af77d20dbb1d2425bf2b7c5fa2952258e2b4a2a5babaddaad
 DIST termtypes.tc.gz 228329 BLAKE2B 988b91c6c3c624963e078b424f24b26eb37fe32ca34b0ece0ca4ddf734ee1513f399a4f584f41a92c6ef2edb64144c13820677b419e58b4bfaf0e0fa2c5686a7 SHA512 13a2ee2cd0bc349d69af7efb8e8122f655b67f4bcbe0dc5cbf8a9ba22649548086a097de8bc148fb71ceba1640434a6b94763410beb3b915e03c3a6b46e8a678
-EBUILD libtermcap-compat-2.0.8-r3.ebuild 1111 BLAKE2B d1d6910d8f6d654fabc3e7e62b3dad2eff4a67ed8bf749ec2077cb187ad197ac0049dbd689ba0e8419fda85864945e1193cd111e9af4c1d664c9585d310888c5 SHA512 e2723f1142016937517c86fd4f9b1db4ac576227bfa89432473c55459e56d18ca286d32de92affa865004bdf5427333fb1f63659864b79a6132a4cfc94fe46ef
-EBUILD libtermcap-compat-2.0.8-r4.ebuild 1194 BLAKE2B 4ef220b31acc8f7dfe43b54234e4bb8f64271db3f0ac58345c6ede7379e1f67c4c411f74f30a42c15a062f2b13b4b622899912bb2b3abb00defa80aaa4c3f882 SHA512 acffab477dee337358f85b01df75ad24d8e8e2c9584f71e593ab233d930220d977a687eeb461fcce93fe278e0a0d75af2ea2ab177829f401d3ec8f54617b6e37
+EBUILD libtermcap-compat-2.0.8-r4.ebuild 1192 BLAKE2B ad373309be70fa887dd8aae77ec04d73e89ffa8ae48245feabd505c7a4670bca826402ed2ee0bae429351c476cc6fe26fef3ce4227cf12cb4e575984668b0f7d SHA512 3b67516f3b6bbfa190e84d094c0394433b6959d6ca9eed664959671a1169b63f42c3e3eb90fc34dc036a59797c7d4c46b7c2627666cff935cb85cc61720bbbc2
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r3.ebuild b/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r3.ebuild
deleted file mode 100644
index 950f1a6bc63e..000000000000
--- a/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# we only want this for binary-only packages, so we will only be installing
-# the lib used at runtime; no headers and no files to link against
-
-EAPI="4"
-
-inherit eutils multilib toolchain-funcs
-
-PATCHVER="2"
-
-MY_P="termcap-${PV}"
-DESCRIPTION="Compatibility package for old termcap-based programs"
-HOMEPAGE="http://www.catb.org/~esr/terminfo/"
-SRC_URI="http://www.catb.org/~esr/terminfo/termtypes.tc.gz
-	mirror://gentoo/${MY_P}.tar.bz2
-	mirror://gentoo/${MY_P}-patches-${PATCHVER}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ppc sparc x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	EPATCH_SOURCE="${WORKDIR}/patch"
-	EPATCH_SUFFIX="patch"
-	epatch "${EPATCH_SOURCE}"
-
-	cd "${WORKDIR}"
-	mv termtypes.tc termcap || die
-	epatch "${EPATCH_SOURCE}"/tc.file
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	dolib.so libtermcap.so.${PV}
-	dosym libtermcap.so.${PV} /usr/$(get_libdir)/libtermcap.so.2
-
-	insinto /etc
-	doins "${WORKDIR}"/termcap
-
-	dodoc ChangeLog README
-}
diff --git a/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r4.ebuild b/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r4.ebuild
index bdbf937f6121..e10548a47190 100644
--- a/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r4.ebuild
+++ b/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://www.catb.org/~esr/terminfo/termtypes.tc.gz
 
 LICENSE="GPL-2 LGPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ppc sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ppc sparc x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/sys-libs/libunwind/Manifest b/sys-libs/libunwind/Manifest
index 87355dd918b8..d0aefab329f3 100644
--- a/sys-libs/libunwind/Manifest
+++ b/sys-libs/libunwind/Manifest
@@ -9,5 +9,5 @@ AUX libunwind-1.2.1-only-include-execinfo_h-if-avaliable.patch 1290 BLAKE2B eac4
 DIST libunwind-1.2.1.tar.gz 780774 BLAKE2B a5be4142e1e4932231023bdec2ab3ecd6b707faf2d32d2b571239252a1d0fb6a273a6a46c4a107db63f74f7b54c0c54cf252b8b79ad53216333ba7bcf63147a1 SHA512 af7c280d2a963779a4a2711887618bc96383011e4e5d52e4085aa7fb351e55e357468f6ff85e66a216f1c6826538f498335a917a5970575c93be74c96316319b
 DIST libunwind-1.4.0.tar.gz 872941 BLAKE2B 39628dd46151d2748372c8f1dfa3cd39114770b85e890b048304f8395b2778a22da4cc468eb6fe1e2357a41bed5a6067e12992634859dabe30addd0fd39b4269 SHA512 60bce1e840f071d3a48cfa8e2acff988977956f659c5c04ce83f00751348fbbeddbfc54e8c9bd6ebc9073423ca5ee1816655dc5aa59fefd0a8edc9c3f7f3b913
 EBUILD libunwind-1.2.1-r3.ebuild 3457 BLAKE2B f4ff7968816cc26db47d9aae87c767ead7275e72c091990ccfadfc80ba93b3eb57fd2786e62597b62ec0f68e39343f157d4917ed4f92caf7e6bd3786faafc89a SHA512 c52f5bf35b19bbf76baea28d80047d799a5f611abb969f8ff15f24ecb3a73b7d0a94ff001d7e9bddae7085af0dbd3ee9e4d7ae61e4ab84b88bd5f7078435c606
-EBUILD libunwind-1.4.0.ebuild 3091 BLAKE2B 82169bd4910b3d2ed41bf1efc7252c6a2b9f717126aefdd46acdf941ac1e41b74c888bc0208021f193938bb2976922413810acfe9a8530b638cfd91b4b8c9513 SHA512 21c41f94b570d4b3fc81c6b73dc9a82d07d740ba7f5889ac4018b60544d86ce36a233b4516b915979a917bf2ea8ef9249e60b32446d2e048f3049bc29aadffe0
+EBUILD libunwind-1.4.0.ebuild 3085 BLAKE2B bb2a6926ff85f442473cdaf239410067ab1d2621c724815b99f3bda82918581b7dcce479be88263659e1b717dc6a1cc58deb17d458391fb1e0769ce7d8ce0b11 SHA512 c1b04473d4e383267237957b2df49cc367683c48b0793fae6f7ab609c55db6d298d0dc32ffd67cdf3114ba062ec8be638bd4e716a0dd73f24316df9bfbabd25f
 MISC metadata.xml 489 BLAKE2B c0a884e7161b62e8548fdf3c8c1d34b24936c71a99fef37713b7c36e0ef3423563e5c98eae8e9748db059645ce85cf972448e0584b1ed92e51c228794e5ed10d SHA512 d7586420e24a7b841cb090ce8dc7bb1c1260a3e2afbc6606d0a974243ca20c0586b4aa3e770b5b98787f8d34b8255846d87550c16f68da6e9d3f55f8b57bde40
diff --git a/sys-libs/libunwind/libunwind-1.4.0.ebuild b/sys-libs/libunwind/libunwind-1.4.0.ebuild
index dd6e60a6c2ae..cdf70319adf1 100644
--- a/sys-libs/libunwind/libunwind-1.4.0.ebuild
+++ b/sys-libs/libunwind/libunwind-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://nongnu/libunwind/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/8" # libunwind.so.8
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug debug-frame doc libatomic lzma +static-libs"
 
 RESTRICT="test" # some tests are broken (toolchain version dependent)
diff --git a/sys-libs/liburing/Manifest b/sys-libs/liburing/Manifest
index 42df52d2e769..b4d2c5285944 100644
--- a/sys-libs/liburing/Manifest
+++ b/sys-libs/liburing/Manifest
@@ -1,5 +1,3 @@
-DIST liburing-0.5.tar.bz2 75525 BLAKE2B 7b58a59212a6c3527c0adfc102add73dc875885bcdcd6ba9dcd64020d6c8f277b5cc0e1d33860aab0d9495f0409461278175aed7483aa9c44d3c7f78b1238920 SHA512 70202f25fad89787c5c0f0022dddebd3f5ff8eb572ec50c36cc3980f291b456de445c1cf411761be1438e22c69bdb446e1e5b3c10317ec00cb3412a63508faa4
 DIST liburing-0.6.tar.bz2 81429 BLAKE2B f905238a324d5e3f4fd0c572aa7db7a2c337aea282175d2a0f89802588d3900d2fb3ef8d6787aea38a406f1ccc57bf143864b708a4716783b09d4208164d2d99 SHA512 07fb0f61cc1d204bd340ef55ec65579a718ca266e4b9c8cdd6e47ae06defa3a9521e83fb3e6ed7c8910f52428dd62f4af900c4ec13c3509c7e366b4c13e7feb5
-EBUILD liburing-0.5.ebuild 991 BLAKE2B 9c781b011d0c89fbe6cf03902d1e0ede7fff1da5a30d988d4b38bc0618cea53a0caaae994c7c16e9fa5a4c17d0ed0705aa93b3613392b54b81647d082d7974a2 SHA512 97a4df55e63fdc33e244a5893027eb586355b551175b47cdc3656421d40d98865998e6d5fbf7eaec24d582075c37da79eb89a9821c5059643db9fdcaf932e8b4
-EBUILD liburing-0.6.ebuild 991 BLAKE2B 9c781b011d0c89fbe6cf03902d1e0ede7fff1da5a30d988d4b38bc0618cea53a0caaae994c7c16e9fa5a4c17d0ed0705aa93b3613392b54b81647d082d7974a2 SHA512 97a4df55e63fdc33e244a5893027eb586355b551175b47cdc3656421d40d98865998e6d5fbf7eaec24d582075c37da79eb89a9821c5059643db9fdcaf932e8b4
+EBUILD liburing-0.6.ebuild 989 BLAKE2B 97c9a131c3f7efb9cdd25646337006f69ca4ed6a9308eeec2f60e9228321e638d995c2121d265b225701cc85d82fc3797b9e9c9e766d43900dca68c9fe5b5692 SHA512 65177143574d8c36a2b96a18f900e186ce6f19239fb874684566b82651ea24180fbe091cfa0fc1b3bca754b5fecd6538164426e0971a4723187b9778f1ed40d1
 MISC metadata.xml 330 BLAKE2B 9999abbe311550c99eac0de3e7942a37bab51413090b5ca192c0deeac61e3b0d3017a0c05650a433041e1589a6518539ea6686494cd9f57d787ab7519caa78fd SHA512 fe3f892ef7bea57e0c2889ef07f25a8f4230bd54484c73c8c00685a5a05d269271513b7235bf15dcb594b2e18e5e7d638d5d37c4b4563449dc6af1afbacec1c3
diff --git a/sys-libs/liburing/liburing-0.5.ebuild b/sys-libs/liburing/liburing-0.5.ebuild
deleted file mode 100644
index 3d71e8bd7549..000000000000
--- a/sys-libs/liburing/liburing-0.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-DESCRIPTION="Efficient I/O with io_uring"
-HOMEPAGE="https://github.com/axboe/liburing"
-SRC_URI="https://git.kernel.dk/cgit/${PN}/snapshot/${P}.tar.bz2"
-LICENSE="MIT"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static-libs"
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${EPREFIX}/usr"
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		--libdevdir="${EPREFIX}/usr/$(get_libdir)"
-		--mandir="${EPREFIX}/usr/share/man"
-		--cc="$(tc-getCC)"
-	)
-	# No autotools configure! "econf" will fail.
-	TMPDIR="${T}" ./configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake V=1 AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if ! use static-libs ; then
-		find "${ED}" -type f -name "*.a" -delete || die
-	fi
-}
diff --git a/sys-libs/liburing/liburing-0.6.ebuild b/sys-libs/liburing/liburing-0.6.ebuild
index 3d71e8bd7549..3f80273282d4 100644
--- a/sys-libs/liburing/liburing-0.6.ebuild
+++ b/sys-libs/liburing/liburing-0.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.kernel.dk/cgit/${PN}/snapshot/${P}.tar.bz2"
 LICENSE="MIT"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index cf670d907491..61521bb82165 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -10,5 +10,5 @@ DIST libxcrypt_2.4.orig.tar.gz 361503 BLAKE2B 6347bea4b22ae7742cb516a0a8673bbd7c
 EBUILD libxcrypt-2.4.ebuild 649 BLAKE2B 672890b0c7988494047e064cccd5a53323a25a1f40b953a516547fd302abac2c435e2185f31ed3e95884b3136c843f6e1fcc701b08bfc7c68a00e1bae717c124 SHA512 1aa50cd37c918682f043abc694696f6f0b1ac20d71ca2443d776d3eebfddccddab9e8e31f19ba8b473099124fb9f1d8eccb92d2efe5e7aa1b7b1bcd6393cbbcb
 EBUILD libxcrypt-4.4.10-r1.ebuild 3662 BLAKE2B 3ca592fb85f417b6d36613123ea86067dc1153b8e59acbb76ffbfad3aa1bb3b7024907225e8bd1f401e4bfbf766072c750cf39e3f0d270920520560b61dd3140 SHA512 3002fc88260a5b3a7695de457e9bcf4b0a085de239d4bcd06d627fea29d9567734ef73e4dd5eae73c29d36928e5fb9834a3335879ef7628c23b323aff484f6a6
 EBUILD libxcrypt-4.4.12-r3.ebuild 4177 BLAKE2B e0094f7c1a9ea955a0570951c33ba4e8ed114500b2426295e106d090f4cfd73671327f7da22721714e6026375cc2cd0e8584c3460b198ef593767b82fb614e67 SHA512 d10ba7899927c3aaefeab8e7eb282cd1ca89744dfa36e715c668f4f7077b0e03027db5c1c70ebf2f82de41aa8b66ac8123c56e82cb62524fe0b70106cb55e808
-EBUILD libxcrypt-4.4.16.ebuild 4177 BLAKE2B e0094f7c1a9ea955a0570951c33ba4e8ed114500b2426295e106d090f4cfd73671327f7da22721714e6026375cc2cd0e8584c3460b198ef593767b82fb614e67 SHA512 d10ba7899927c3aaefeab8e7eb282cd1ca89744dfa36e715c668f4f7077b0e03027db5c1c70ebf2f82de41aa8b66ac8123c56e82cb62524fe0b70106cb55e808
+EBUILD libxcrypt-4.4.16.ebuild 4196 BLAKE2B 3fbf631539297f6e47fd1ecf5c1c2d3ea6ccf5a0871ee27ab9ff33983c7428edf99196feae611a0edbd5f6fce90620e7348e761dac3865165647d3b51bcf9084 SHA512 9586c8111b2ac6612253dd6273e54e723eaa2285172efd294620a45569f0e661c8cebfaa17b2a3f3d9326cedd00dab9cc6a469eb11089877bb318a2c36e606c8
 MISC metadata.xml 856 BLAKE2B e9fea1aa08f5b3f0abdd4d490973da2f133ea90e3a366d4549361233f51e674cc646b2fb6b4b15bca72d5a4e3b36be9a06e55afd3a4cb8f439d3958f09f8af25 SHA512 862cf3201efbecfc23167ecd1f6798f6729ba4e76749c174d17baf8aa4887f21d36f40234f35bc1b896e4384d110033b3f2260f01930b926f759e0243039adf8
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.16.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.16.ebuild
index 166f638a5790..6046655b8148 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.16.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.16.ebuild
@@ -62,6 +62,7 @@ get_xclibdir() {
 
 multilib_src_configure() {
 	local -a myconf=(
+		--disable-werror
 		--libdir=$(get_xclibdir)
 		--with-pkgconfigdir=/usr/$(get_libdir)/pkgconfig
 		--includedir="${EPREFIX}/usr/include/$(usex system '' 'xcrypt')"
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index ca8ce1871c54..f662b1a96f34 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -5,9 +5,9 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD llvm-libunwind-10.0.0.ebuild 3360 BLAKE2B dd4b9b43af7ce1a8689940a89bf4a89ce13bcc59c005cf8117aaf9579c9a06dd38806f7cf78951e7e237a32f102c8354cc6de8a9744335997cb96f9a5f060186 SHA512 7bc34e1f314a45aec7154447a51d682d2cc37157bef41d35f7ca56b2362d2b1fb6ec12755e12cd7307562433d8875456ce0eff62794962a05e7e65449b59c225
-EBUILD llvm-libunwind-10.0.1.9999.ebuild 3432 BLAKE2B 19e2380df99bad3a27da94954521d54169281c2fddf96bad45b068d63baf4519d75ce40c5b0125a97f819c97e940c43151ea4eb7b3becbf2ba9c46a7c1d0b807 SHA512 fc0f0902698da480bc9cc5c2e6a82f9ca392e5b5b8002d7c2b8e43b9a4883db2e7b95a05e26ac85c8186ea0e908d2f18dd91476da20df6908e84b0e899b80d77
-EBUILD llvm-libunwind-10.0.1_rc1.ebuild 3432 BLAKE2B 19e2380df99bad3a27da94954521d54169281c2fddf96bad45b068d63baf4519d75ce40c5b0125a97f819c97e940c43151ea4eb7b3becbf2ba9c46a7c1d0b807 SHA512 fc0f0902698da480bc9cc5c2e6a82f9ca392e5b5b8002d7c2b8e43b9a4883db2e7b95a05e26ac85c8186ea0e908d2f18dd91476da20df6908e84b0e899b80d77
-EBUILD llvm-libunwind-11.0.0.9999.ebuild 3432 BLAKE2B 19e2380df99bad3a27da94954521d54169281c2fddf96bad45b068d63baf4519d75ce40c5b0125a97f819c97e940c43151ea4eb7b3becbf2ba9c46a7c1d0b807 SHA512 fc0f0902698da480bc9cc5c2e6a82f9ca392e5b5b8002d7c2b8e43b9a4883db2e7b95a05e26ac85c8186ea0e908d2f18dd91476da20df6908e84b0e899b80d77
+EBUILD llvm-libunwind-10.0.1.9999.ebuild 3167 BLAKE2B eb9367a2f72f58c106cdb695952cf02862829df581af3d429489c6621235d6074b5c211a21e73d1f2a166c091461366958d23e7dd0eead1fd8ed8d4fc9d3d44e SHA512 9fb218c26ed65929207aed17deea84eb016576e634e2bdb06da33cb8b243cea1cc16a469baad5e293c8e06007e06ea961437d5ee541abb292e6e4c5be6ecd82d
+EBUILD llvm-libunwind-10.0.1_rc1.ebuild 3167 BLAKE2B eb9367a2f72f58c106cdb695952cf02862829df581af3d429489c6621235d6074b5c211a21e73d1f2a166c091461366958d23e7dd0eead1fd8ed8d4fc9d3d44e SHA512 9fb218c26ed65929207aed17deea84eb016576e634e2bdb06da33cb8b243cea1cc16a469baad5e293c8e06007e06ea961437d5ee541abb292e6e4c5be6ecd82d
+EBUILD llvm-libunwind-11.0.0.9999.ebuild 3167 BLAKE2B eb9367a2f72f58c106cdb695952cf02862829df581af3d429489c6621235d6074b5c211a21e73d1f2a166c091461366958d23e7dd0eead1fd8ed8d4fc9d3d44e SHA512 9fb218c26ed65929207aed17deea84eb016576e634e2bdb06da33cb8b243cea1cc16a469baad5e293c8e06007e06ea961437d5ee541abb292e6e4c5be6ecd82d
 EBUILD llvm-libunwind-8.0.1.ebuild 3815 BLAKE2B 52a00f299c179b3b826702e6b76468922745be47e97542ad2e620879c14434f7ab334089a529ed9c27584c17f8e805bad783710c288c2e5d4258487c2b502186 SHA512 b956f3a085591de5a1519c7b5830c625a085ab2f178ca5b5e7d55b6f4cb23e0b64eeb108d3d45fd18f8420da5898ec2099e6f6d68fc575e5f9bbc846b98865e2
 EBUILD llvm-libunwind-9.0.1.ebuild 3356 BLAKE2B 761c9fcfbd3dc5689521f7423e1bafe4f673d7c6dbd397f6b6e0f4bc168495f3eea513c0550d20a60cf1e4e38200df59583cede7bfaad4c574f249e532fe4bb2 SHA512 82f4e6967d73ae96199a507081cd9cc913a4e4b2b0c45caa0b27d428b68262df76242d318327616bb5112d97ee68fec1061485f94f0137fd73a0fdaad998707b
 MISC metadata.xml 302 BLAKE2B 1cdee7813ed9a3766b2eddccd14f9e0576ba5cc7f812d7af4f35c8c2e5991790f3800c6473c37da90d72804832fd9af969a2e3bf7aa625f0d3a32da1dbcefacf SHA512 3afaef82e6a495a81e221524ae7604dc170ef5c103333728674faf0417c45ba7996118c10466eaa24f8feef9ed8f0fc60d535a5195462317d61c61a531c8a285
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1.9999.ebuild
index 6d15a7f4a17c..711bac7d068f 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1.9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1.9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_ECLASS=cmake
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1
+inherit cmake-multilib llvm llvm.org python-any-r1
 
 DESCRIPTION="C++ runtime stack unwinder from LLVM"
 HOMEPAGE="https://github.com/llvm-mirror/libunwind"
@@ -27,9 +27,6 @@ BDEPEND="
 	test? ( >=sys-devel/clang-3.9.0
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 python_check_deps() {
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
@@ -38,13 +35,6 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 multilib_src_configure() {
 	local libdir=$(get_libdir)
 
@@ -60,13 +50,11 @@ multilib_src_configure() {
 	)
 	if use test; then
 		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
-		local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
-
 		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
 
 		mycmakeargs+=(
 			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
 			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
 		)
 	fi
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1_rc1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1_rc1.ebuild
index 6d15a7f4a17c..711bac7d068f 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1_rc1.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1_rc1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_ECLASS=cmake
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1
+inherit cmake-multilib llvm llvm.org python-any-r1
 
 DESCRIPTION="C++ runtime stack unwinder from LLVM"
 HOMEPAGE="https://github.com/llvm-mirror/libunwind"
@@ -27,9 +27,6 @@ BDEPEND="
 	test? ( >=sys-devel/clang-3.9.0
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 python_check_deps() {
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
@@ -38,13 +35,6 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 multilib_src_configure() {
 	local libdir=$(get_libdir)
 
@@ -60,13 +50,11 @@ multilib_src_configure() {
 	)
 	if use test; then
 		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
-		local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
-
 		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
 
 		mycmakeargs+=(
 			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
 			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
 		)
 	fi
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 6d15a7f4a17c..711bac7d068f 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
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_ECLASS=cmake
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1
+inherit cmake-multilib llvm llvm.org python-any-r1
 
 DESCRIPTION="C++ runtime stack unwinder from LLVM"
 HOMEPAGE="https://github.com/llvm-mirror/libunwind"
@@ -27,9 +27,6 @@ BDEPEND="
 	test? ( >=sys-devel/clang-3.9.0
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 python_check_deps() {
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
@@ -38,13 +35,6 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 multilib_src_configure() {
 	local libdir=$(get_libdir)
 
@@ -60,13 +50,11 @@ multilib_src_configure() {
 	)
 	if use test; then
 		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
-		local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
-
 		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
 
 		mycmakeargs+=(
 			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
 			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
 		)
 	fi
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index b3990972203e..dfd30935bb08 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -6,6 +6,5 @@ DIST musl-1.1.24.tar.gz 1024988 BLAKE2B 5fa26746eed0f2334b740adf94a8400568d56d9b
 DIST musl-1.2.0.tar.gz 1035265 BLAKE2B 0a47e0f438cca0f3ce31ae024c19358160214842115b560efc48e66228055c9147d9550957a79425322d510ba773f197d0944bb844bf6addbbf698088a3358a9 SHA512 58bd88189a6002356728cea1c6f6605a893fe54f7687595879add4eab283c8692c3b031eb9457ad00d1edd082cfe62fcc0eb5eb1d3bf4f1d749c0efa2a95fec1
 EBUILD musl-1.1.24.ebuild 3299 BLAKE2B 17a4f78ae35c583480621880845dca6cbe55638519f25470a2bdf0922705caaeeb65a760763244b8890381714fc162487d22f07d15e20f163cb5f6cb7543b870 SHA512 984c0a1542ab23354d6e5dccad8c4ff6bab68ca9b52bba5ec36364ee997798ad0ee6f85b7ca7e66a78eead3e199c8dbe51d3e9df84d5c4df0f887428844f1ac9
 EBUILD musl-1.2.0-r1.ebuild 3258 BLAKE2B 7a8edb02b626e2cdc1ae65bfc56973c98fb874990a1ca81d3fcb1b539512efad6e5874a41bd31769965874058f27d657776137a90bdbe5d2c6eefc033c18c447 SHA512 1e7f3ff9da0870b0f42c6ae364df2155d55208ed05e445ed63862600143f01fbad428f9cb6578052f7cd7536f6cec975fc618b2b92839f04e9ba186e988e0806
-EBUILD musl-1.2.0.ebuild 3305 BLAKE2B c5c891c2e0cec0ba00dadc5172fa9d70137e4d6ab10da7162fe7682cf5cafe4088fa4441a947b852d4cc0fcc4d47630e7edca76b44b4475d900b8fc26c5c895a SHA512 f3de057636bfc67b6104cde727441f88b9e62dc33633b132d3c753b5f1983ba913e5adf9484184953c3514a7e2e45a84c20197b7550106a96ce6397aa67bfcae
 EBUILD musl-9999.ebuild 3258 BLAKE2B 7a8edb02b626e2cdc1ae65bfc56973c98fb874990a1ca81d3fcb1b539512efad6e5874a41bd31769965874058f27d657776137a90bdbe5d2c6eefc033c18c447 SHA512 1e7f3ff9da0870b0f42c6ae364df2155d55208ed05e445ed63862600143f01fbad428f9cb6578052f7cd7536f6cec975fc618b2b92839f04e9ba186e988e0806
 MISC metadata.xml 453 BLAKE2B d7b2840a6b0bb2ede2124f22bde34a9f77ac258792a9fbf9d9e3f552a85d6ee539a98c8704729efb75dec627db62b33759fc0cfdfd01614abbc4960a163c5019 SHA512 5d8bebce119ed34a6a6b8cb07b3ce056db5efc91db80709fc8031c955b16e29965f3741f75e9afbe9f428bbac1e39e7c30278cd63f04479e3a1493b006195e0a
diff --git a/sys-libs/musl/musl-1.2.0.ebuild b/sys-libs/musl/musl-1.2.0.ebuild
deleted file mode 100644
index 6aab4a0a5ecd..000000000000
--- a/sys-libs/musl/musl-1.2.0.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.musl-libc.org/musl"
-	inherit git-r3
-	SRC_URI="
-	https://dev.gentoo.org/~blueness/musl-misc/getconf.c
-	https://dev.gentoo.org/~blueness/musl-misc/getent.c
-	https://dev.gentoo.org/~blueness/musl-misc/iconv.c"
-	KEYWORDS=""
-else
-	SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
-	https://dev.gentoo.org/~blueness/musl-misc/getconf.c
-	https://dev.gentoo.org/~blueness/musl-misc/getent.c
-	https://dev.gentoo.org/~blueness/musl-misc/iconv.c"
-	KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="http://www.musl-libc.org/"
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="headers-only"
-
-QA_SONAME="/usr/lib/libc.so"
-QA_DT_NEEDED="/usr/lib/libc.so"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-just_headers() {
-	use headers-only && is_crosscompile
-}
-
-pkg_setup() {
-	if [ ${CTARGET} == ${CHOST} ] ; then
-		case ${CHOST} in
-		*-musl*) ;;
-		*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
-		esac
-	fi
-
-	# fix for #667126, copied from glibc ebuild
-	# make sure host make.conf doesn't pollute us
-	if is_crosscompile || tc-is-cross-compiler ; then
-		CHOST=${CTARGET} strip-unsupported-flags
-	fi
-}
-
-src_configure() {
-	tc-getCC ${CTARGET}
-	just_headers && export CC=true
-
-	local sysroot
-	is_crosscompile && sysroot=/usr/${CTARGET}
-	./configure \
-		--target=${CTARGET} \
-		--prefix=${sysroot}/usr \
-		--syslibdir=${sysroot}/lib \
-		--disable-gcc-wrapper || die
-}
-
-src_compile() {
-	emake obj/include/bits/alltypes.h
-	just_headers && return 0
-
-	emake
-	if [[ ${CATEGORY} != cross-* ]] ; then
-		$(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf || die
-		$(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent || die
-		$(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv || die
-	fi
-}
-
-src_install() {
-	local target="install"
-	just_headers && target="install-headers"
-	emake DESTDIR="${D}" ${target}
-	just_headers && return 0
-
-	# musl provides ldd via a sym link to its ld.so
-	local sysroot
-	is_crosscompile && sysroot=/usr/${CTARGET}
-	local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*)
-	dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
-
-	if [[ ${CATEGORY} != cross-* ]] ; then
-		# Fish out of config:
-		#   ARCH = ...
-		#   SUBARCH = ...
-		# and print $(ARCH)$(SUBARCH).
-		local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak)
-		[[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
-		cp "${FILESDIR}"/ldconfig.in "${T}" || die
-		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
-		into /
-		dosbin "${T}"/ldconfig
-		into /usr
-		dobin "${T}"/getconf
-		dobin "${T}"/getent
-		dobin "${T}"/iconv
-		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
-		doenvd "${T}"/00musl
-	fi
-}
-
-pkg_postinst() {
-	is_crosscompile && return 0
-
-	[ "${ROOT}" != "/" ] && return 0
-
-	ldconfig || die
-}
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 5cb0ce70c54e..a2188382d76b 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -1,10 +1,8 @@
 AUX fix-test-calls.patch 1969 BLAKE2B 13344bc09298e1ee68db1cf4b3d4c26ef430f6e6941b965edbca4b90bf8ecf762024f60b3541750fd1ae000f6bfd3f5e9792f0f0578beaccd405941f8b868397 SHA512 8051b3d8170ed4930274aa37c49d886b913a7cd043e247806a64c7929ea4c36b723e77d881c65e082f7424491cc29f0a726ddbbf401e15b6d7583f6f39342583
 AUX pam-remove-browsers.patch 985 BLAKE2B 3e258e00f7287436b1b6a97323764612a3098dc4effb12e62cd8d55151ace2b97b6ea7b67ae33613aa6b3cca318bfbfc310b48a99b0c81e1beaa9d16188e69eb SHA512 42d89d35fc754e51112040a5468067ee9f6a3a411e538cb634187e28975040c0b7ef48fab166ec6a20a849f6ed9d74a069355269cf708d9985ded6b87fe13ed1
-DIST pam-1.3.1.tar.gz 749997 BLAKE2B 3b44c41daaa5810c53e3e2baeac1ab58463768fde433f874b9bd09c7c28cfd55e0f227c9a0c318e66444a3adb23c112a2db32d5c7211b07c84c2d4600a47ca5c SHA512 0c5019493b2ac42180ee9c4974a51329a2395a44f5f892c1ca567ec9b43cc3a9bce0212861d4dfb82eb236c5eaa682b27189ce672ed6cafa37d8801d059a944d
 DIST pam-1.4.0-doc.tar.xz 48080 BLAKE2B 48cec348c3db7ecae6ea85934fa242d908643d0a8f6d1789a8aac3b254dc21439e11066f9ff2a7238e61e5d16c41a6c49a26dbc7351fe7eb0a1fef4a2f69378e SHA512 634cbb1b948a2b1431b9ef219a4e9e63e870b34520665170f55aca10e65cd46f0c190697cafd18a42caeaec26299f63fd8ad794ae379648e767d8481af6c36f2
 DIST pam-1.4.0.tar.gz 804586 BLAKE2B 941925677c19f0a77a4fbc29f723706d5eb31b4020b0d35732ae3c00e5a623c943ea784e11aef1c2d5092d2a7fbe1724eeefa45d8d8ebd8a053a39f01a8b541c SHA512 16003f5c118125aeabf22503bc328a4bdd68b3af35d70b608a8b261adbaffae58ce490765f246c469b2ffbff67bd5216e0586ece0eb934905074423a990c2f98
 DIST pam-4dd9b97b762cc73816cb867d49c9d0d0b91d642c.tar.gz 765455 BLAKE2B 8a8543b51c9fa877cd48d483d9af489df00376f92f26fea648d38a0ce3168702888a662e5d3c7423cce8a5d56896e84e4c1829e56d08fca8c3ab878b20945a7d SHA512 bdb236a47a5810449fb96546ff89d70dec185a215b0d047178a12e40945fde4ffdb801dbbd87ff95eead1bb7acb4748333a2d3383881d5de0dbd89ec5ceddd3f
-EBUILD pam-1.3.1-r2.ebuild 3322 BLAKE2B 5e020cfb239bb8e415d3ea28ecfc4450d85ca8fa5d564b2fa5a044c6258d4b5c7da692f8d9b3b203667bbdd3eea0305b679c073fe540369a426fc4f14b1616b6 SHA512 4a2caac1f4dacd20d28b646b998d7afbc1fed807db944b09c3e3bd15fb758d3f0bf7faf5a6e937bb00740b0cd10b8f891e2eb12a41b3dfb2fbbce45c8f3414ec
 EBUILD pam-1.3.1_p20200128-r1.ebuild 3523 BLAKE2B fd389d7d746ad0c80a8db91a0d37094b7c7e6a824fa9b5be4a5cf59b688449ce2abc8bd93dc9b6816d092bf5283fdec9c6538cf264ff4d0b185cba3cf4c0b43b SHA512 acc60d8d7bad9a447b0323710e4c58c8ac321b73431b3fc6832696ba7e3be0a7200a7eb73b7a22e092eecb3d514a69fc5a0cd3498c40e6839217be0e74f0b44b
 EBUILD pam-1.4.0-r2.ebuild 3771 BLAKE2B a657f1dd46a011e2988be9ca97ff092fceb75b8c7a628f654462eeb3761735ea1aad76d9c7ae0b7f15c088b42097115c070304d531cca93f20d04bc5476f26f4 SHA512 9160b511d71eebdaad9148fd86d8d72dc4fd5bdbded2e0965600f150b4688621c3ec4a0b7c8880ad13648f9d6e8a89b955a5d5123080f96ce5bff5c5f36659cb
 MISC metadata.xml 1086 BLAKE2B 39d2291ff9553394ce684a87a49a2c41b18689102d8cf352c905ce2ede28508501aa41a4a473d287c461b77e5732aa4ed0eaac94db94c851ed9491bffdac8acf SHA512 6743a2021ef7d7ab9fc547b270c17b205747a498e0e2bafc07ad171d52657a4aa3f84803c2b4e5c088b73b1732d600b5b2189c958d4b15fba8e081714790fc72
diff --git a/sys-libs/pam/pam-1.3.1-r2.ebuild b/sys-libs/pam/pam-1.3.1-r2.ebuild
deleted file mode 100644
index 560c09a3fe16..000000000000
--- a/sys-libs/pam/pam-1.3.1-r2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools db-use fcaps multilib-minimal toolchain-funcs usr-ldscript
-
-DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
-HOMEPAGE="https://github.com/linux-pam/linux-pam"
-SRC_URI="https://github.com/linux-pam/linux-pam/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="audit berkdb +cracklib debug nis +pie selinux static-libs"
-
-BDEPEND="app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xml-dtd:4.3
-	app-text/docbook-xml-dtd:4.4
-	app-text/docbook-xml-dtd:4.5
-	dev-libs/libxslt
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DEPEND="
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	>=virtual/libintl-0-r1[${MULTILIB_USEDEP}]
-	audit? ( >=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] )
-	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
-	cracklib? ( >=sys-libs/cracklib-2.9.1-r1[${MULTILIB_USEDEP}] )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
-	nis? ( >=net-libs/libtirpc-0.2.4-r2[${MULTILIB_USEDEP}] )"
-
-RDEPEND="${DEPEND}"
-
-PDEPEND="sys-auth/pambase"
-
-S="${WORKDIR}/linux-${P}"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}/${PN}-remove-browsers.patch"
-	touch ChangeLog || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# Do not let user's BROWSER setting mess us up. #549684
-	unset BROWSER
-
-	# Disable automatic detection of libxcrypt; we _don't_ want the
-	# user to link libxcrypt in by default, since we won't track the
-	# dependency and allow to break PAM this way.
-
-	export ac_cv_header_xcrypt_h=no
-
-	local myconf=(
-		--with-db-uniquename=-$(db_findver sys-libs/db)
-		--enable-securedir="${EPREFIX}"/$(get_libdir)/security
-		--libdir=/usr/$(get_libdir)
-		--disable-prelude
-		$(use_enable audit)
-		$(use_enable berkdb db)
-		$(use_enable cracklib)
-		$(use_enable debug)
-		$(use_enable nis)
-		$(use_enable pie)
-		$(use_enable selinux)
-		$(use_enable static-libs static)
-		--enable-isadir='.' #464016
-		)
-	ECONF_SOURCE="${S}" econf ${myconf[@]}
-}
-
-multilib_src_compile() {
-	emake sepermitlockdir="${EPREFIX}/run/sepermit"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install \
-		sepermitlockdir="${EPREFIX}/run/sepermit"
-
-	gen_usr_ldscript -a pam pam_misc pamc
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	if use selinux; then
-		dodir /usr/lib/tmpfiles.d
-		cat - > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<EOF
-d /run/sepermit 0755 root root
-EOF
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Some software with pre-loaded PAM libraries might experience"
-	ewarn "warnings or failures related to missing symbols and/or versions"
-	ewarn "after any update. While unfortunate this is a limit of the"
-	ewarn "implementation of PAM and the software, and it requires you to"
-	ewarn "restart the software manually after the update."
-	ewarn ""
-	ewarn "You can get a list of such software running a command like"
-	ewarn "  lsof / | egrep -i 'del.*libpam\\.so'"
-	ewarn ""
-	ewarn "Alternatively, simply reboot your system."
-
-	# The pam_unix module needs to check the password of the user which requires
-	# read access to /etc/shadow only.
-	fcaps cap_dac_override sbin/unix_chkpwd
-}
diff --git a/sys-libs/tdb/Manifest b/sys-libs/tdb/Manifest
index 7dbe4bca2a65..2653d6430230 100644
--- a/sys-libs/tdb/Manifest
+++ b/sys-libs/tdb/Manifest
@@ -1,3 +1,3 @@
 DIST tdb-1.4.3.tar.gz 702836 BLAKE2B 6593c3be527b383a7e8fd85b3613cf2429f6b665a7c609a56f57a6f5b41a080c1a681d712afd423c2bc1c741e06d7cd2c90949d9c5bf78ca834b18c64e23d51c SHA512 99488839e7da396f04df60412d21a7d3e09efeab52772d6cb5e9470a3dfd585d73ef2422c51cd0d8ccc123a65d455de400d5d6b24a21a2a50d3da60d9a70e67a
-EBUILD tdb-1.4.3.ebuild 1381 BLAKE2B 0d70f41a4feeb324a0ff4e9f88e1ec1aa1c444e2b17d2bd7fbc1abd4916f8388b1609c77ed07d9565043a63cda9741ca143c876914d08f235fa1cd62032976dd SHA512 9b9a91f1e2184961df60aeebe99f40310de8421ed961e772da36585db9464023df03f32e09c7a725c010710201e15eb7925dc82c82fa8a487f211168a7b81256
+EBUILD tdb-1.4.3.ebuild 1383 BLAKE2B 3fca0b33674a579291b1f48c9bd7e83d3849389a2d194478b064b03bcae8a70fbc0b2c0c790807559398b3fa9728a1adf9285678d63d5e4eab2096d6208ae139 SHA512 4ecc4bdcb02abb8cd96433ccb9bfd34ac7472dfbc890a1ab80aa6aed6e56fa347359c40417c73687816dfc0950762645b58921386a62f93c47b8c264d6390447
 MISC metadata.xml 356 BLAKE2B 89cee65fc3e653bd568f34339d7d5e4ca0486ea124b175c88a966dde42a4128789669f2e0179e8d3ee2e4eb3df90f9de95441c3f2d61f3bdf47c1d87c95e1248 SHA512 59095952e57315232ef95494f2c30f520f13538f279df25f17a923a836194c4df78e11a03ff6fab814c1db1fe5a81cae2cf20988d77ef30e0c0d47f9a74f01cb
diff --git a/sys-libs/tdb/tdb-1.4.3.ebuild b/sys-libs/tdb/tdb-1.4.3.ebuild
index ce2c9dbac06a..2d7a265a1291 100644
--- a/sys-libs/tdb/tdb-1.4.3.ebuild
+++ b/sys-libs/tdb/tdb-1.4.3.ebuild
@@ -9,8 +9,8 @@ PYTHON_REQ_USE="threads(+)"
 inherit waf-utils multilib-minimal python-single-r1
 
 DESCRIPTION="A simple database API"
-HOMEPAGE="http://tdb.samba.org/"
-SRC_URI="http://samba.org/ftp/tdb/${P}.tar.gz"
+HOMEPAGE="https://tdb.samba.org/"
+SRC_URI="https://samba.org/ftp/tdb/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 83c691ad1ee7..beb3c042df2b 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -1,7 +1,4 @@
-DIST tzcode2019c.tar.gz 253560 BLAKE2B 62552e7e78ebb50c111f9a99119843fe9b5dad9e1abb5ba0f1cf0a931cf00fc49684a6b378f5ea4cb31aca8af5b0c3b697b87048ef36a445536ec2fc5b943440 SHA512 61ef36385f501c338c263081486de0d1fccd454b86f8777b0dbad4ea3f21bbde059d0a91c23e207b167ed013127d3db8b7528f0188814a8b44d1f946b19d9b8b
 DIST tzcode2020a.tar.gz 257509 BLAKE2B 21335f0b6a3b98ba8203d49d1273c2016bfbef9903c394cda6ca97cc5ec5d1fb1605bb73ba9aa6c73eca3fe115fb2924da37b736bf0a8a0e214eed547100fe70 SHA512 5235d6590e844491df32375857f5f36ba0046f2d21a078375188dff79b125cf9b69136a0a431624de1ecfa9d53b62a232f0e6ee0b734294cec62b670e6265cb2
-DIST tzdata2019c.tar.gz 392087 BLAKE2B d7a21e57391d321b5c84e1ba2286ff0dd154c435d40015d999c8c6f2f1bea3c13d832c0752af313c9aa4dafe6a261e1e92bfd79523448fcd585188a53454e31a SHA512 2921cbb2fd44a6b8f7f2ed42c13fbae28195aa5c2eeefa70396bc97cdbaad679c6cc3c143da82cca5b0279065c02389e9af536904288c12886bf345baa8c6565
 DIST tzdata2020a.tar.gz 397245 BLAKE2B 2a85a9a9badbf2b74ba2ace3f7fd436cc7752202557785be503c1c8f2f698dfc8cfb412b3f08ebc0bd4a8d0e27293b47eeedf937f713dadb4386dad14322b871 SHA512 2a2fc2e3ad8a6e4c574242296c847ad582c2c1d86add9c556e65c812d19b9528522e3c4dddb5239017091825d2acc5a2ccaf21dc41b900b6c300ef4264cc5a9d
-EBUILD timezone-data-2019c.ebuild 5134 BLAKE2B bbefd7a68861d2fc2fc2ba573ac0e6546f90c6a3021cce3f86f291ccaf9fce16f0a6a87684046304c8a05931c80d80440807414ca9ff5d553bac2e8261bf6330 SHA512 d110ec4f2eff01b16633a71ab246ab6ff71bb9881676b946643e5cbc7232fa9a6ae15be9f947a07243e47de72451546ccf62e8ddb0c06c316e0c9194a209262d
 EBUILD timezone-data-2020a.ebuild 5134 BLAKE2B bbefd7a68861d2fc2fc2ba573ac0e6546f90c6a3021cce3f86f291ccaf9fce16f0a6a87684046304c8a05931c80d80440807414ca9ff5d553bac2e8261bf6330 SHA512 d110ec4f2eff01b16633a71ab246ab6ff71bb9881676b946643e5cbc7232fa9a6ae15be9f947a07243e47de72451546ccf62e8ddb0c06c316e0c9194a209262d
 MISC metadata.xml 658 BLAKE2B 29b5600fabd796a8f9d284fbff175493a1527e57de2f81934483cadc7a3eb33800cca9d48f0002d8b426383bad1689f1259ea7a9c93fda3fd23deb13ba6d43ce SHA512 c7cf8a401e69d9550a94f8f0649b1096949264434285e085379f92cb6a2d72948a7f771803c665ca166db64e98ddac3aa24834edbb174c0305a1db90bc448d3a
diff --git a/sys-libs/timezone-data/timezone-data-2019c.ebuild b/sys-libs/timezone-data/timezone-data-2019c.ebuild
deleted file mode 100644
index e508d234d92f..000000000000
--- a/sys-libs/timezone-data/timezone-data-2019c.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs flag-o-matic
-
-code_ver=${PV}
-data_ver=${PV}
-DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
-HOMEPAGE="https://www.iana.org/time-zones"
-SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
-	https://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz"
-
-LICENSE="BSD public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="nls leaps-timezone elibc_FreeBSD"
-
-DEPEND="nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	!sys-libs/glibc[vanilla(+)]"
-
-S=${WORKDIR}
-
-src_prepare() {
-	default
-
-	# check_web contacts validator.w3.org
-	sed -i -e 's/check_tables check_web/check_tables/g' \
-		Makefile || die "Failed to disable check_web"
-
-	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
-}
-
-src_configure() {
-	tc-export CC
-
-	append-lfs-flags #471102
-
-	if use elibc_FreeBSD || use elibc_Darwin ; then
-		append-cppflags -DSTD_INSPIRED #138251
-	fi
-
-	append-cppflags -DHAVE_GETTEXT=$(usex nls 1 0) -DTZ_DOMAIN='\"libc\"'
-	LDLIBS=""
-	if use nls ; then
-		# See if an external libintl is available. #154181 #578424
-		local c="${T}/test"
-		echo 'main(){}' > "${c}.c"
-		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} "${c}.c" -o "${c}" -lintl 2>/dev/null ; then
-			LDLIBS+=" -lintl"
-		fi
-	fi
-}
-
-_emake() {
-	emake \
-		REDO=$(usex leaps-timezone posix_right posix_only) \
-		TZDATA_TEXT= \
-		TOPDIR="${EPREFIX}" \
-		ZICDIR='$(TOPDIR)/usr/bin' \
-		"$@"
-}
-
-src_compile() {
-	_emake \
-		AR="$(tc-getAR)" \
-		cc="$(tc-getCC)" \
-		RANLIB="$(tc-getRANLIB)" \
-		CFLAGS="${CFLAGS} -std=gnu99 ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		LDLIBS="${LDLIBS}"
-	if tc-is-cross-compiler ; then
-		_emake -C "${S}"-native \
-			AR="$(tc-getBUILD_AR)" \
-			cc="$(tc-getBUILD_CC)" \
-			RANLIB="$(tc-getBUILD_RANLIB)" \
-			CFLAGS="${BUILD_CFLAGS} ${BUILD_CPPFLAGS}" \
-			LDFLAGS="${BUILD_LDFLAGS}" \
-			LDLIBS="${LDLIBS}" \
-			zic
-	fi
-}
-
-src_test() {
-	# VALIDATE_ENV is used for extended/web based tests.  Punt on them.
-	emake check VALIDATE_ENV=true
-}
-
-src_install() {
-	local zic=""
-	tc-is-cross-compiler && zic="zic=${S}-native/zic"
-	_emake install ${zic} DESTDIR="${D}" LIBDIR="/nukeit"
-	rm -rf "${D}/nukeit" "${ED}/etc" || die
-
-	insinto /usr/share/zoneinfo
-	doins "${S}"/leap-seconds.list
-
-	# Delete man pages installed by man-pages package.
-	rm "${ED}"/usr/share/man/man5/tzfile.5* "${ED}"/usr/share/man/man8/{tzselect,zdump,zic}.8 || die
-	dodoc CONTRIBUTING README NEWS *.html
-}
-
-get_TIMEZONE() {
-	local tz src="${EROOT}/etc/timezone"
-	if [[ -e ${src} ]] ; then
-		tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
-	else
-		tz="FOOKABLOIE"
-	fi
-	[[ -z ${tz} ]] && return 1 || echo "${tz}"
-}
-
-pkg_preinst() {
-	local tz=$(get_TIMEZONE)
-	if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then
-		eerror "The right & posix subdirs are no longer installed as subdirs -- they have been"
-		eerror "relocated to match upstream paths as sibling paths.  Further, posix/xxx is the"
-		eerror "same as xxx, so you should simply drop the posix/ prefix.  You also should not"
-		eerror "be using right/xxx for the system timezone as it breaks programs."
-		die "Please fix your timezone setting"
-	fi
-
-	# Trim the symlink by hand to avoid portage's automatic protection checks.
-	rm -f "${EROOT}"/usr/share/zoneinfo/posix
-
-	if has_version "<=${CATEGORY}/${PN}-2015c" ; then
-		elog "Support for accessing posix/ and right/ directly has been dropped to match"
-		elog "upstream.  There is no need to set TZ=posix/xxx as it is the same as TZ=xxx."
-		elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead.  See this post"
-		elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html"
-	fi
-}
-
-configure_tz_data() {
-	# make sure the /etc/localtime file does not get stale #127899
-	local tz src="${EROOT}/etc/timezone" etc_lt="${EROOT}/etc/localtime"
-
-	# If it's a symlink, assume the user knows what they're doing and
-	# they're managing it themselves. #511474
-	if [[ -L "${etc_lt}" ]] ; then
-		einfo "Assuming your ${etc_lt} symlink is what you want; skipping update."
-		return 0
-	fi
-
-	if ! tz=$(get_TIMEZONE) ; then
-		einfo "Assuming your empty ${etc_lt} file is what you want; skipping update."
-		return 0
-	fi
-	if [[ "${tz}" == "FOOKABLOIE" ]] ; then
-		elog "You do not have TIMEZONE set in ${src}."
-
-		if [[ ! -e "${etc_lt}" ]] ; then
-			cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}"
-			elog "Setting ${etc_lt} to Factory."
-		else
-			elog "Skipping auto-update of ${etc_lt}."
-		fi
-		return 0
-	fi
-
-	if [[ ! -e "${EROOT}/usr/share/zoneinfo/${tz}" ]] ; then
-		elog "You have an invalid TIMEZONE setting in ${src}"
-		elog "Your ${etc_lt} has been reset to Factory; enjoy!"
-		tz="Factory"
-	fi
-	einfo "Updating ${etc_lt} with ${EROOT}/usr/share/zoneinfo/${tz}"
-	cp -f "${EROOT}/usr/share/zoneinfo/${tz}" "${etc_lt}"
-}
-
-pkg_config() {
-	configure_tz_data
-}
-
-pkg_postinst() {
-	configure_tz_data
-}
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 87fe0efbceb4..e127e3a72291 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/incron/Manifest b/sys-process/incron/Manifest
index f638c86cf78f..15fee2b65f48 100644
--- a/sys-process/incron/Manifest
+++ b/sys-process/incron/Manifest
@@ -4,5 +4,5 @@ AUX incrond-r1.init 853 BLAKE2B dd7ae75e522535f27b9f342c429dd7d6590ac06767848286
 AUX incrond.conf 960 BLAKE2B b92d9f3523a8aaf38f0dfdfeda3a32b2ad6b588f007fc15e99d491a783a54f7581be677d810f00c10c3600335a89ded83664acdc0042710cf7784e9dfffba5b2 SHA512 e5d9d05c1b0f2393dea64ef27d01293f84302c79d6aec44ee11bc0f5b493e4392ee51cbf7e9a57a0771ee3e4625e6033f2e7ca3403a08df5aa1f3bad1d556545
 AUX incrond.service 155 BLAKE2B d0e1c9af86d7a548890b9c43799d5e13e17567659d25da44afbadae72e8401b6cf95e50b6471b86737dd00785c78d9f448bcab5cf0feea5c9a168aa6b3d6e26b SHA512 059043d3607aafb1d469977574eb96478845d17d88f7f61ba23269341c407e443bca36411eedf0753edf0216bd04800128c9557dc8827ffb980d5512f257bb80
 DIST incron-0.5.12_p20191114.tar.gz 339568 BLAKE2B ca6ccd4f2b4f24b48ee3bdf0a18713f6f70469cbc11f09fd215001e8512bd04dcbdc9cd5e7cc784907cd0d009a4572354f578cad78bc263070146b0ff2379029 SHA512 19cf386163de3f4cafcf36872659dd8f819129056ed2508403a8692130db04cbe5eb917370aa609d25a6b75c24a7a1b87e7bd2e957a5d66610f541fe83aec39e
-EBUILD incron-0.5.12_p20191114.ebuild 1256 BLAKE2B 52087409bc7b59c0ac1ce6a79b9a884648e781e9a2f3bedf2a102cad85d4933d3effbdf66e5e59f27761d3984e2961a581251507f687c3811ab3f5dfa3faa5ef SHA512 a78be172b3a77093568a60c4ea4aace3245d0bf0421b4af62f5fe247c25eb4febf4cf706c765dc5f23f3a00dab1c984be9732b96599efd49390d4ff2dd3b510c
+EBUILD incron-0.5.12_p20191114.ebuild 1263 BLAKE2B 122e7cfdf65e5a00976bc7546079deac96f1fa56bc329a93b751d19d52fc716b51545cd8ff4318680cc2d3b27547c0ce411060da3cb4d647dfa3a39ce12db418 SHA512 baad7855d39286f70a8ac37e0e0f466a2bb968929f6349a00108ff29d8996da1423cd0d46afbd370a0f841cce674a580209d0aa8c14947bf1373b3f26423f096
 MISC metadata.xml 251 BLAKE2B fb85d245662fa1577cfe1d77526bd34fb2a674dd447192f2defe78b751423e3d14ae73efd3ac0e1e5e6fdb6259622a782e724ec77021faf526509f199dd20d61 SHA512 46942a98ef7e36470d1169a5bc8839d25603e33c143cd36327a8a85fc14cb6bfb32247eb7608d92cc58a06cc8eef5bd64d6ec2d21e69a88632e4b936598aa772
diff --git a/sys-process/incron/incron-0.5.12_p20191114.ebuild b/sys-process/incron/incron-0.5.12_p20191114.ebuild
index 82fc4e0c0553..28928d33fc2d 100644
--- a/sys-process/incron/incron-0.5.12_p20191114.ebuild
+++ b/sys-process/incron/incron-0.5.12_p20191114.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,7 +14,7 @@ SRC_URI="https://github.com/ar-/incron/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~arm64 ppc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-process/lsof/Manifest b/sys-process/lsof/Manifest
index cd67958bd310..4f9ef9ef9715 100644
--- a/sys-process/lsof/Manifest
+++ b/sys-process/lsof/Manifest
@@ -3,5 +3,5 @@ AUX lsof-4.90-darwin-cppfix.patch 408 BLAKE2B 761ad2ee39ff4c7080466b20322b58624f
 DIST lsof-4.93.2.tar.gz 1319222 BLAKE2B 3b1756e7b72a0b0a2a11bce82a9b386f6dc5727d7837a4d544e2e33a98be3bfb46af50f0d8cc7b4a4bc419148d13f86d0f34cf806d90ba5d31312f426f81b7e9 SHA512 3c4a4d503391b1a648a08a4947c2e72a9629b169eddf50738b16a16a82f2a26967e4db2902e4a9157de5a73ae638db48e392117ffbd591e9fafd6b1725cd01a0
 DIST lsof_4.91.tar.bz2 791734 BLAKE2B cd6211caedea34fdbb89266fd78a70902117eda6d4d7fa69115426f4a6f5cb5296fa09bbd946648d8d93483881e4ea4e2190f090be155c1081850e8366cfd05a SHA512 49f811941dd6303f7cb0655fddb8b1177af5d1b18f2bd1edfab09d2c128aea73daecf09c7a5375979c66ba764c88a6e70c9086b55c3634e3be01ab1aa12e9f92
 EBUILD lsof-4.91.ebuild 3593 BLAKE2B dbbcbfa8f2dea471d337894510c63eecef0edea0226fbab75d687e296a480116fe12b0ff5a978bd74e014437749f61590d7f2b21dbeb391cf75a83acbb88219b SHA512 fc87f843df1ff2dd994b9b3158045216014843b305c8bdbc85dfc505f59ff175a7a3a8226c7869aed9149de1ff19bcf49f08e6d1de1e6f1400dac21a700d28ae
-EBUILD lsof-4.93.2-r1.ebuild 3414 BLAKE2B 8c53c84316f64299b5c182638d8b2c0f707f79080a191df97e95a4e1fa9c3f6ca3891ddf35117ee66caac2642ad069a8270727ca270e657e951ccb76cfc05d27 SHA512 64769967b273ac5d2cce59436abcf5704227359910e698a6725281cd223cb334a06c6f939cd1468cec4c4dcc6ea4bdb160f95ea7324ae180ae3534accfc51a86
+EBUILD lsof-4.93.2-r1.ebuild 3406 BLAKE2B 5c51d499112806087495620dac28e194c0d98c420e379b53d8d5ba1ecfd4f72391925212bb483e96edb6dddfbc5f7a74ff5dea1cc6422638ef79703e2a573425 SHA512 8ae42342ac763181f174b4bde9e4289924e42ac32c00a5eab4593943e66eaef881cf9475fdde664055e42590f46be4390c383d44d6aac520787d3cf43f4d8688
 MISC metadata.xml 410 BLAKE2B fd0f172a687fe180b6fc367195925576c468612bbb516fe582ed6fb8be19c5de238f9ce3e762f2bedba9802167c55995f5d8319ffeb681cdb4a91e01a9292ab2 SHA512 47b91158e1621c03685f821f3126fbd3c4a6336fedb79c85f7fc245fe0a724b2df46e18abd15f926f5739b70e93072817ccde5862c9712314bf7cd9a4e43a812
diff --git a/sys-process/lsof/lsof-4.93.2-r1.ebuild b/sys-process/lsof/lsof-4.93.2-r1.ebuild
index 35742bb38abd..853b476fc840 100644
--- a/sys-process/lsof/lsof-4.93.2-r1.ebuild
+++ b/sys-process/lsof/lsof-4.93.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/lsof-org/lsof/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="lsof"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples ipv6 rpc selinux"
 
 RDEPEND="rpc? ( net-libs/libtirpc )
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index 02caa7c84d25..8ebe57fac010 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -1,5 +1,5 @@
 DIST parallel-20200422.tar.bz2 2089965 BLAKE2B fe149236c9d05103699195b85902d3dacf73cc3b2512c6aaf24cc9f4804e2d0099ddf0a5e9439347cafdc89847bb7c5e934c9e688500d45abf4ce337a0d925b0 SHA512 77d011a946496252b1974bd3cd32dd6a0e79c81613a8d1b372717c98230bbb0bd6775b67b220e838c9fe274367fe9b9d415e4060f72a8c810a7710405b18b634
 DIST parallel-20200522.tar.bz2 2107262 BLAKE2B 04e6b5f56f749c6b157747d86428348803ce13d4313985e1c7c29e1b8b7e3fcbb802b7a389c038a73714f79e6dc6df2e772dcab2c89dc1b2c74c1bf32357e708 SHA512 1f804439bab490efee88bd40597926d10bd0b6d7f5763352fa402a38a1a2aa931036e99a21983b7c2a3a4de30e3d66695e90bec6d1d6522611dcd0f9f3489dc9
 EBUILD parallel-20200422.ebuild 587 BLAKE2B 5833c788c6cf238318b3f0d51e61928a19fbd090ddcd09eeb2315b6b916c67368020cf963d7a420cc70681443ff8cc6bd4d385a182af79cac23a57e86ec6f795 SHA512 503adc235593c047ba5e8b77a13a1908247757db59c5b0bda0c887829fee5e2ff0e06548c0ea39a886b06c79d639e748f6ddbcc54c9dad14f60f05fba9ba1236
-EBUILD parallel-20200522.ebuild 636 BLAKE2B df990bd6120d875da26a0e4c8e372747cd19b17797734bf7edb6e45ec601a9820f128bf341743aaa714ea803a4fc91c6700d99de72a9d6d7ac1504f11900123c SHA512 44a5ba85e622552e96c535ec9d2f3dd667d97c91a27470f7118b3116dcfa9b294aa8a8778ed6a70d278ac68f076bc93274c08a6ec86e69f63d3930f89694f084
+EBUILD parallel-20200522.ebuild 634 BLAKE2B 3937842c027464703f2aa2fc03407cd349174ac4f8286004ce4a91d008803a113e4ef014df6b4f93c44b0fd415f535cb2f6817b1bac3fa76f5e52730b6ab8876 SHA512 dd9271c6b3ae7a78d9917f3d19f4c97244c5cf6a51f95a16bda46e42387f334e4c135ab962664c9ac7d7d29c07f93f06ac9e52b72a656dcd4b1392cd36a48d82
 MISC metadata.xml 1113 BLAKE2B d3f2a34de2e32fc037ae3fe97736a6e9c2d8b31a1ffbd0fb381380c4e6cbfd5d99b5c911b19f655efd0f561e99980a523eb58c58f2731b78ef31af01a903f9b1 SHA512 58640ac496b4bc6d58b8ee46fda96373ba54a1063078358b7c74f6acd18166d6277d82b0fe9fabac71e908a9be020e29d65bc765541a4941b49af251a0147584
diff --git a/sys-process/parallel/parallel-20200522.ebuild b/sys-process/parallel/parallel-20200522.ebuild
index d140d40c52b2..669e8c068dcc 100644
--- a/sys-process/parallel/parallel-20200522.ebuild
+++ b/sys-process/parallel/parallel-20200522.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-lang/perl:=
 	dev-perl/Devel-Size
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index d123b2d42cad..c9947fcb9cea 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/editor/Manifest b/virtual/editor/Manifest
index 5ee14e0b0dbf..5db584b655cd 100644
--- a/virtual/editor/Manifest
+++ b/virtual/editor/Manifest
@@ -1,2 +1,2 @@
-EBUILD editor-0-r3.ebuild 1401 BLAKE2B e73c76c855b34fa10b8ab763e27db6244f03645df0707d26e4f43a1f5d92098458fd32914c17349376192d1cabb826f5b4721f7de542f7419fd9b0488aa1d98f SHA512 b23f2a0d6df8d01fa3dc1abc508b149f206cecf588525e60c57d231e3deb7cae5e118adbfca8bab032e63952e9c427f751b56d190d608c7d1f1a97a040742a4d
+EBUILD editor-0-r3.ebuild 1384 BLAKE2B 15248c76f9d01fe8a39a4fc29164f412b42ca6a014d2ff06403959f934ab7e0aad11b50fec40922b7d2cf55d04d8166d6a1df4c0ca654c70c9ad3cce93f878b7 SHA512 494545639fd1511c4c509aef6f4187bbe2fa4e44e3b745d350d89d682d8a991a87ed32d9a4ba296897d02c25485090d37e44657941c5013886ea21e8ec17b450
 MISC metadata.xml 475 BLAKE2B 04e3bc8d0eda87d6d57801992c848a5a2e68bb69b3688d2be4a7018ff4bdbde6fbab15fe16191b5c2b0b3e32a56a596931a7877160f1c265a0229a71d70bce64 SHA512 ffe46c6473a0f3d81555997b3d90569f90eb3dd467f8746430d7fac34832ce3697d2af68b508f9dcf44d5b232396ceca174daf5bcd71e7fd413f7007cc2bfe60
diff --git a/virtual/editor/editor-0-r3.ebuild b/virtual/editor/editor-0-r3.ebuild
index 01364cc3f24b..ad5eea779a9f 100644
--- a/virtual/editor/editor-0-r3.ebuild
+++ b/virtual/editor/editor-0-r3.ebuild
@@ -35,7 +35,6 @@ RDEPEND="|| (
 	app-editors/ne
 	app-editors/neovim
 	app-editors/ng
-	app-editors/nvi
 	app-editors/qemacs
 	app-editors/teco
 	app-editors/uemacs-pk
diff --git a/virtual/libc/Manifest b/virtual/libc/Manifest
index 147639147d0e..1983acd953f7 100644
--- a/virtual/libc/Manifest
+++ b/virtual/libc/Manifest
@@ -1,3 +1,2 @@
-EBUILD libc-1-r1.ebuild 825 BLAKE2B b46fabfcb5419274b1ed5d41cd6c0feda51383122b9d58c9f72761ea65a681f439c44775278d60b1312fa484e3c7ec8b269dfae6bffba91e75ca4d212b0c0085 SHA512 9797d556aa9c832a8afb0a8110026e74ea18629fc57f3e0f3fd0931c4cf3319329540aed02280de74b337dab52c4fe1f59c803e586ae922d4755ad13a1cdfc52
-EBUILD libc-1.ebuild 816 BLAKE2B ab09f702385a02e3f37d2aad82ba134bb1dc6a15e84b53abff949d54801a90a1cd5aca9fd4251c1092866fe35ef58048d6459bf49f789aa1f404c31ba86da74b SHA512 9eee98dba05909c2038b4598b7c3728c7e368d8431b4f8d89a7bdb82cec5eb94869bc254f7cc9f8663b25ffda37ab6fc872e4fb66e946aab7ff28b4de3d13551
+EBUILD libc-1-r1.ebuild 816 BLAKE2B c4be5ea3e376d3e3993a4cffcfb4062602a13731c751dc40e400ffcc86e4eed512141be2e876c9b28c3cf0c50e7ec94504265e8350287b0dd4733b7266ae1311 SHA512 f8b71845663ea9b746320d1f2c25b7eb2d1a387f237544396546a4d1c1f7b11aee5dd201122491c71a723b75d641d9fcfc87c3a883c98fddbe815dee392baa67
 MISC metadata.xml 365 BLAKE2B 5a045bfed52c49ec0cfe074512001e5ab3aea429bb6211812c2c4ac0b91acc4831613141e750827b1f56b8c9c69cf6970317a9ed0ae23ecab0bca8daccd26a24 SHA512 b4b656f72037c54182557618adb9a8f5da16f1a0e0b8fda545a760e5500d9b8b52b78084f16c0cf6c2cbe58d8aa577550e4423cf28d10b6edc7f4027efc1eeb0
diff --git a/virtual/libc/libc-1-r1.ebuild b/virtual/libc/libc-1-r1.ebuild
index 8aca9128d50d..8b62a9abad0e 100644
--- a/virtual/libc/libc-1-r1.ebuild
+++ b/virtual/libc/libc-1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for the C library"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # explicitly depend on SLOT 2.2 of glibc, because it sets
 # a different SLOT for cross-compiling
diff --git a/virtual/libc/libc-1.ebuild b/virtual/libc/libc-1.ebuild
deleted file mode 100644
index adea1bc43100..000000000000
--- a/virtual/libc/libc-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=5
-
-DESCRIPTION="Virtual for the C library"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# explicitly depend on SLOT 2.2 of glibc, because it sets
-# a different SLOT for cross-compiling
-# Cygwin uses newlib, which lacks libcrypt
-RDEPEND="!prefix-guest? (
-		elibc_glibc? ( sys-libs/glibc:2.2 )
-		elibc_musl? ( sys-libs/musl )
-		elibc_uclibc? ( sys-libs/uclibc-ng )
-	)
-	prefix-guest? (
-		elibc_Cygwin? ( sys-libs/cygwin-crypt )
-		!sys-libs/glibc
-		!sys-libs/musl
-		!sys-libs/uclibc-ng
-		!sys-libs/uclibc
-	)"
diff --git a/virtual/os-headers/Manifest b/virtual/os-headers/Manifest
index ff4311e8c779..a93b27d4a50c 100644
--- a/virtual/os-headers/Manifest
+++ b/virtual/os-headers/Manifest
@@ -1,3 +1,2 @@
-EBUILD os-headers-0-r2.ebuild 732 BLAKE2B c6248a04fd2c79ee95f4cc3540918eaaf2ca6ac0db9c3824c93aaa52f0c72b38cd65d39c7cc856eb22f2ecafc28b17213491baa1bc65ca9751bed94f7c6312d8 SHA512 c06551d9e86059c93b27e59bee85e52e07ecc89c8a6e22d332b947c56f4a5727b49a8380333d8f785cda3c37206e34179bcf2c9dec7a8d36bfbe4bcda75f1a70
-EBUILD os-headers-0.ebuild 571 BLAKE2B 72871736f222106e070ae9443c7e1495c43020e19f496c9733b6b00658d8e794aab8a5eefcf631d2fec1e5eb3eacce3aca213236c273724e36ce6df7a9db71ff SHA512 50d0a2311c0a8905e792fc660c7965fad7156a7fa5315c4f439adfbe93b3d4dcd41fa7c8e126316be4bf625de118c1cbb15908ce2526ae9b275b86ead5028e34
+EBUILD os-headers-0-r2.ebuild 723 BLAKE2B 02a5665ba8409ca8a463e9641d8a70da81431d3128501fa59f19108cfbe19bc3d350f0472315423b92a3734cdebfba1887ad46f3cba9c6cda24349383e9684a8 SHA512 005fb7c94adcb42e32918786838849894e87273169c3b221686895181fee835745173af2fb5b2d3c226f7afb000d0b45cde511e00a0d140556ba0b1c9de04b37
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/virtual/os-headers/os-headers-0-r2.ebuild b/virtual/os-headers/os-headers-0-r2.ebuild
index 6a4ee6831335..d4c619248fa1 100644
--- a/virtual/os-headers/os-headers-0-r2.ebuild
+++ b/virtual/os-headers/os-headers-0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for operating system headers"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # depend on SLOT 0 of linux-headers, because kernel-2.eclass
 # sets a different SLOT for cross-building
diff --git a/virtual/os-headers/os-headers-0.ebuild b/virtual/os-headers/os-headers-0.ebuild
deleted file mode 100644
index 3de00fe5213b..000000000000
--- a/virtual/os-headers/os-headers-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Virtual for operating system headers"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# depend on SLOT 0 of linux-headers, because kernel-2.eclass
-# sets a different SLOT for cross-building
-RDEPEND="
-	kernel_linux? ( sys-kernel/linux-headers:0 )"
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 35b889a45f90..122bebdef439 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_maxminddb/Manifest b/www-apache/mod_maxminddb/Manifest
new file mode 100644
index 000000000000..1e629b4671d7
--- /dev/null
+++ b/www-apache/mod_maxminddb/Manifest
@@ -0,0 +1,4 @@
+AUX 70_mod_maxminddb.conf 87 BLAKE2B b50eb32c9cbf88f63bd9b0d5d12d13a83d7a4cb87ff3ad96bbc06825aa2b144d9ae6c09f0abd2c4004ec7a88b9156ba6b5bf5b6fbf2ede947dae2f46a03c5b30 SHA512 e9137211ea71a52a1010cd022cc5bdc3ae967a02eeb5cbe8339239251f3d2fdb14aba03ba66dea1071f513947e26598cd228e455e92df5a41a5016e5112b5ea5
+DIST mod_maxminddb-1.2.0.tar.gz 101465 BLAKE2B a0f9673560851726e7e85b3c6a5ef3e9004854e79a72bb14446bd68eec59ed8befb3bc27d7e7f031c69708ab54984c9f7537e5d55616be9f7ef1b92e2de61ccd SHA512 739c3c9b136fd3ce784e0a81c82a26a188e7d07435c1381ba359b2e159a721d072cb04310f2ce2a38953a8918fec686025bac6c140048a1afc035c0b8e449483
+EBUILD mod_maxminddb-1.2.0.ebuild 905 BLAKE2B 7d3263f2aac6e200b3118300bab26fda18d110960205e3b433485ee38c6d7671d33249d2290a3fa0f72018b2328eb8c0085381b9397d371629841be89bdc66e9 SHA512 294db9d999ede6165f20de093f9c8507800170856cbec5ccb5fc9a80869ad5e8cbc6873be669f894ad10342a3f80de8b4f3c1a69a5384dc6ff4baf7b9bd70411
+MISC metadata.xml 483 BLAKE2B 72cbf0490ccad2edbbd3f100c788033971252a9e0d29e83ea27fe5965b3c1f6c76bb27ebabe75bb7bbd2d6a6d9c40039ac213bfaa8e1df9a4a17a901ee8c6e59 SHA512 4722e9eaaf1971a864884ab858f9c113a89e06d1fc8490c9a852285130b0ed9c708c5e039b7974f137d6b4019e581bd69c2fbaa9ebbc0451b5fd874227088d77
diff --git a/www-apache/mod_maxminddb/files/70_mod_maxminddb.conf b/www-apache/mod_maxminddb/files/70_mod_maxminddb.conf
new file mode 100644
index 000000000000..80d1ba92f10d
--- /dev/null
+++ b/www-apache/mod_maxminddb/files/70_mod_maxminddb.conf
@@ -0,0 +1,3 @@
+<IfDefine MAXMINDDB>
+	LoadModule maxminddb_module modules/mod_maxminddb.so
+</IfDefine>
diff --git a/www-apache/mod_maxminddb/metadata.xml b/www-apache/mod_maxminddb/metadata.xml
new file mode 100644
index 000000000000..16b10cec63ed
--- /dev/null
+++ b/www-apache/mod_maxminddb/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hydrapolic@gmail.com</email>
+		<name>Tomáš Mózes</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>whissi@gentoo.org</email>
+		<name>Thomas Deutschmann</name>
+		<description>Proxy</description>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">maxmind/mod_maxminddb</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apache/mod_maxminddb/mod_maxminddb-1.2.0.ebuild b/www-apache/mod_maxminddb/mod_maxminddb-1.2.0.ebuild
new file mode 100644
index 000000000000..c0d42244f01a
--- /dev/null
+++ b/www-apache/mod_maxminddb/mod_maxminddb-1.2.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit apache-module autotools
+
+DESCRIPTION="MaxMind DB Apache Module"
+HOMEPAGE="https://maxmind.github.io/mod_maxminddb/"
+SRC_URI="https://github.com/maxmind/mod_maxminddb/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/libmaxminddb:="
+RDEPEND="${DEPEND}"
+
+need_apache2_4
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	# skipping this results in:
+	# Cannot load modules/mod_maxminddb.so into server:
+	# /usr/lib64/apache2/modules/mod_maxminddb.so: undefined symbol: MMDB_aget_value
+	# because mod_maxminddb.so is not linked with libmaxminddb
+	emake
+}
+
+src_install() {
+	APACHE2_MOD_CONF="70_${PN}"
+	APACHE2_MOD_DEFINE="MAXMINDDB"
+	APACHE_MODULESDIR="/usr/$(get_libdir)/apache2/modules"
+
+	apache-module_src_install
+}
diff --git a/www-apache/mod_qos/Manifest b/www-apache/mod_qos/Manifest
index db17c708ef88..ac300e6f9d42 100644
--- a/www-apache/mod_qos/Manifest
+++ b/www-apache/mod_qos/Manifest
@@ -1,4 +1,6 @@
 AUX 10_mod_qos.conf 97 BLAKE2B d3dfe5296b89ef35b09e6b9a0d272c3fcfd66ceb54e2405c31d67a703a68f7362f5bd5340d3634d8f2c09cc8b825a8ef715c0b99430df5b9b98355c2ff4e516b SHA512 eafdbc3ae2f33a7e2bb55e59c311e79688c3ecabdd12247a5f68a9c00c46b84c709139f124cdccc5fd7b3d792b23a94ce37a8d27835d70c521ad6212d4e761c2
 DIST mod_qos-11.61.tar.gz 1242978 BLAKE2B d784538e516abda338230ae9f2580217e3727f8aa22e5d1e881d605ade06444753c9f393a16ef8c683422bb989434b1152aa06955c3f5ba5b38e486d3cc4571b SHA512 c34a970e869238a1340a4bf32f3b21ac3e19cfb65a809989c45100aa1c3559ce0a5f5c30e6366f6d65ef04ad6fc1be73f80a9fc18b7a6a164912618cce6383a8
+DIST mod_qos-11.65.tar.gz 1247087 BLAKE2B 145af39814f974855520415c3bf114aa11ac9002784feace877c9777311fb77fa798fe5f61c7b63201ab5dd6d9582a1d141f421c7215ba3271a29cece13d02b0 SHA512 7a4363b7b5e31968188f2668003d88538134456c3e6eeaff7d200ebf46064139561da6adf9b96678f349bd296f2c502a2d2c9bfb8ae12f7c78e3edbe5c13de3b
 EBUILD mod_qos-11.61.ebuild 1016 BLAKE2B 66b80b9c56cf82ec6c01b73ad660ecf95363b2450513868c07c36868cb6327731401e88edeb010bf51516ce78e59eb2919ceaea3957fc9d2bcfaa5612c6ae9bb SHA512 c647eec700392c45827bc859a7c04d15ff7f6af7d93bc9ab77947d0b5e5170aa278d224d150596d864d3bd2cc7ea7120e3752a3be5e2a173775632483dc612e3
+EBUILD mod_qos-11.65.ebuild 1163 BLAKE2B 3937f41aed391c7b15467f61014332da33aa513136a2435d8de4985fccb4f0b4dd829ce1983fcec4068d986a46e629dfece57541f91003a8caa2460429617b0f SHA512 0ab9aea2e74a785701a6dcd77d1a15ff02188249a11a8c7f4ef671e14d9fbda9cc72f85cb7ddbbde5ebab14ea61ed749a8a6e737a9ef1b6e49950424a7d3bc16
 MISC metadata.xml 244 BLAKE2B e543aaf02e6b5efa49dbd6e952f6d824548558cb94f91e489f81b70c2f13cd0f54c3388b3b540b50e54e9e78be5f8084f331ee720b8b49fa8aeeb1179a2384ca SHA512 8757fe5e361f5e4214eaf304d5d9d57bc542f1eba248fe4dfc44310d95af160e8c04ad72723b3bf7afd3075ed2f6d58e4bd28643fff37fcd8d6e0134dc147dc7
diff --git a/www-apache/mod_qos/mod_qos-11.65.ebuild b/www-apache/mod_qos/mod_qos-11.65.ebuild
new file mode 100644
index 000000000000..765632d044a6
--- /dev/null
+++ b/www-apache/mod_qos/mod_qos-11.65.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools apache-module
+
+DESCRIPTION="A QOS module for the apache webserver"
+HOMEPAGE="http://mod-qos.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mod-qos/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/libpcre:3
+	dev-libs/openssl:0=
+	media-libs/libpng:0=
+	sys-libs/zlib:0=
+"
+DEPEND="${DEPEND}"
+
+APXS2_S="${S}/apache2"
+APACHE2_MOD_CONF="10_${PN}"
+APACHE2_MOD_DEFINE="QOS"
+DOCFILES="${S}/doc/*.txt ${S}/README.TXT"
+
+need_apache2
+
+src_prepare() {
+	default
+
+	pushd "${S}"/tools &>/dev/null || die
+	eautoreconf
+	popd &>/dev/null || die
+}
+
+src_configure() {
+	pushd "${S}"/tools &>/dev/null || die
+	econf
+	popd &>/dev/null || die
+}
+
+src_compile() {
+	apache-module_src_compile
+	emake -C "${S}"/tools
+}
+
+src_install() {
+	einfo "Installing Apache module ..."
+	pushd "${S}"/tools &>/dev/null || die
+	apache-module_src_install
+	popd &>/dev/null || die
+
+	einfo "Installing module utilities ..."
+	emake -C "${S}"/tools install DESTDIR="${D}"
+
+	# installing html documentation
+	dohtml -r -x *.txt "${S}"/doc/
+}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 4055ad59acec..e88c792c56c7 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/chromedriver-bin/Manifest b/www-apps/chromedriver-bin/Manifest
index a48eaadfc34f..b3273262d79f 100644
--- a/www-apps/chromedriver-bin/Manifest
+++ b/www-apps/chromedriver-bin/Manifest
@@ -1,31 +1,3 @@
-DIST chromedriver-bin-2.24.linux32.zip 3154004 BLAKE2B 6db98f434a5a71c7d76a7fa607c96e84a5358d0f1293a5e99838bcbd7f28846422ddb2d1128fb5602b02700b7bd7b61856903bd05047007dc4f2e41a5f8d6532 SHA512 36d853050c58bfc79e3b04e14f9c00cb3b5dad42cbc6a7433b06ef841184443750d714d7a5c80528e237831adf68ddb3f24540b9f19e6601e9e483e57f50cc7b
-DIST chromedriver-bin-2.24.linux64.zip 3116161 BLAKE2B b32b8f5191b65fde09cd6fb6fa753702444e7dd15dc8f9a335bd99f9ac36942c0e7eaf546db5b688f66fa0ce429c550a20a3059e554452a2b99bb4d86b387622 SHA512 ae1fa127560af1b8419c273f9e23253a19423276294cb920c87b0c209134244315c4d3878b9025589471d72056abb0087ef897f684e28d63b5fc71d628dd1791
-DIST chromedriver-bin-2.30.linux32.zip 3891104 BLAKE2B 653365b57013549c3190d4fe2cc427b1f98bd04cd28d64be64993a99e90e33c487fcf8f3a35830659ad2f98a97a15345f24fb278c724eea4cf2ead41a19cb3b3 SHA512 341a652a4dba85a4990b6366fe1a6b392d83c32f70ec04ec69afbc90932d223f16b1944b2709b80dc4399c9377523fd494aba0e70fa7c9e22fda1e5142778a4b
-DIST chromedriver-bin-2.30.linux64.zip 3864914 BLAKE2B d31a1ff9f0eba3384bb3e1598b448c3893d65be98876ad302891657e0eaa8684733303eca618e43226a3e6eb1fd212248188d20cfc97b5aefc91186009999420 SHA512 451d120fceda3a08bba77fbae8d99c87c0902e608006a7895882a06cdcb1614afe0b563fd1b2b2bdc3ac3fbc426b5d3141245ee4d00a0c4dad6911d9a94f5d1a
-DIST chromedriver-bin-2.35.linux64.zip 3721349 BLAKE2B 37abd16d3d2aea57dfff871f2cdcf3ea0c34ad50dd8ba98f2e166e541ebf6ea2ede641a10f7b3d6ff2114740f9aad3cda6e0fc19ab3708fca89b3ce96cb3639e SHA512 0da15aee65c7f13552a57cc77212206fcd9a76b3cb912d85807760d6fb44b122e850c72e36fa7f53355c5bfff038afeeec2181089d1507c59cd5e176fd415ae7
-DIST chromedriver-bin-2.40.linux64.zip 3860375 BLAKE2B b91d4cd05b390f5b0d175ab396838ed3d2ab0dd0a961c4d51268a85c1ffc0be077615126b9373dd7cf69add57f9eb56b5b494ecf55086a4b86cdbc50f1307275 SHA512 5d4fd5723b6245bb7ee722f0e206391b1baa5f1c558f7e79f54289ea3adab385537f569f84b6de2b4f02e38105416f3361b439349a180e3a764126ed2ad525a4
-DIST chromedriver-bin-2.41.linux64.zip 3944714 BLAKE2B 6f86f973c1768d549bbc57a6578459d5603424351240530a7bc3e20c201dd5a0323843e29201a6731f70cc9672c129ebcda7478539cf9875e6e9c14d7f30eca0 SHA512 328bd82d17f5d4238d3fd18b8848f4edc218014cba515972b75f1e4e866f1d729f6d56463b276f7afaf7965f0d36680c0238ae8ff8f9667bc6631e49ae9e7013
-DIST chromedriver-bin-74.0.3729.6.linux64.zip 5065988 BLAKE2B e4c6bc2530f2cf8d033677d18978d93fba9710ead098c5ed455584154b73e9d734db32d9b3fd7f5500f3f32d4403f34fa448b37d3b96d3aecfc11dd9ac7ce54a SHA512 1f61f4940b557c4d74e540ff11770b3182941a11cc34783c97beab1afb5eb53806c958721da1a8249cb6a88c6cf40e7064ac9f94e7da1970d9c23a1188873c5b
-DIST chromedriver-bin-76.0.3809.68.linux64.zip 5231218 BLAKE2B eb4bd1f6bfe8f137ba6314fdfe6c132a989266f75af1870b6dae3ed9bee70d8a8145794798d273f971fdce0b311523972eebf88cc4ddb391195fc1985abe12af SHA512 18be867e96fce752a1a2974ade8a0897b19d4a3e1b971e751193e33a01211a96e0f835785817151405e7d3d4138f86d8104544ca2b72925ba5e38a14b45c72dd
-DIST chromedriver-bin-77.0.3865.40.linux64.zip 5425800 BLAKE2B b1b0ef7e4a6822838874fe5fa4bf7e24ef01f720a8cd62b2c748af20a6fa74bc34473d3fff1ef553f21437fb2ed592c7245253b781810da8987e6d730c6c027f SHA512 6463e76f00ceee66fd8037b38e9ce5699b6ec83c8f2fa43cb0d417fb4d8d1c92cf85168beb1a23a90c20abf20dcfd66dfe235dfb690730a8fd548ca6236eb8f7
-DIST chromedriver-bin-78.0.3904.105.linux64.zip 5528166 BLAKE2B 02cb41da4f04dedc8bdb1d6137c7646f03ee07861a3f44b51ba6547768645e90d4acdc0898d272be8337ef99d12ec2dc838778750ecf5d354224340664adedcd SHA512 fdbf9112b6e9d2e2e1fdcc4960ff5ea3a8ec4181a5afb273d5cf647193a7e9e439dc9643767e006e647d823bae524892d7b111be68165a03e9a3edb94d5c97ec
-DIST chromedriver-bin-78.0.3904.70.linux64.zip 5527671 BLAKE2B 41c29c580ed00a23ea31bd536399eb850b4978bbfb132895baeef24e6cc53b0e0ab1ad8095fb5de9dba2a4a09dd3c7641d76f704a7ffb556fe11810af27cd6ec SHA512 ec5844a1eb788d5b6649178f22702fbfbe49533d061dede19179c97c0e578d4240ccfce0e0a7b9e82d618585c8f32c96e540f8ccdb295bac787e516e26bc3887
-DIST chromedriver-bin-79.0.3945.36.linux64.zip 4875160 BLAKE2B b5f91702ea415dd65e7b5807ace37dd2c27cf77733383f97e46d4e12234afcde1642b6a814088122a5e893124e6c6cbe117b3dfa2a7cc9c97dfa6948df5c5995 SHA512 78c11beb107f4775d40dd4f28f713d6f3228930a5647dd7a5a824a6c9902364f8267e40812b4ca8dc3b849cb5adc3fb6c810146b29d29ed85e6e55e13c86ded7
-DIST chromedriver-bin-80.0.3987.106.linux64.zip 4943146 BLAKE2B 7e5656fbd223f157702e0b31a52c5d9f9bf72b0bcff15dd40571f7b470efe591b46829b3cb5139d5d2ff94fac6e9829d444a33cb1427ffd02434a7c894d889d1 SHA512 afdffdffa3cdb685c1fe96e47ed625f5bc01b5fd180c201f6eafe120b6d11bb26c60bcfabf71a07d12213eec8e606d3dc52917b0830dc86fd384f30cd18c6229
-DIST chromedriver-bin-81.0.4044.69.linux64.zip 4956612 BLAKE2B 9d7bc8fe5f62e940c8b711bd7d7918de974b6c7731bb6cd7ba6597958c20a57acb333989ab47c8298786e168a03d7456007a34d9a85e20bbd033e7380deac957 SHA512 6dcb05d7fb117051caf3091501f708cbfc45adecb8f2591b7cb5664dbe4999e93542f878a6de8c116761c8fd2f53f4f2df3604704dd4e8dc33b973ed749e25ff
 DIST chromedriver-bin-83.0.4103.39.linux64.zip 5222065 BLAKE2B 7d801205bcd0174d1d622b8e3c6c755f1dfae1fd4bf1bc225dbd05bd0d868c300d7bf442a39f29525d4af1f54c0f2e46b233d433d70523d48df15a30aa1a89f0 SHA512 9cb02938cef436dcf0b3f54e5ce668de86e9afc702a1903e2f35ecabcbd4c468f525ff3c6b079eb88b14c1a956bc070fa281fdf64d9d54027254f769c00d24f9
-EBUILD chromedriver-bin-2.24-r1.ebuild 644 BLAKE2B 1827f95c6dd8fe6bf87da9252d5b16a894626201a8eb2e62163970cad4abc048bac8e012043aa0e791cac28736dae680cce014b4177d85b4f6268ca4525ab8cb SHA512 5b5d5a6e5e333e8e36b8041247581aa687b756a01068f98052aa0d2898d662178530171fc58bd1e82cd32bdd742c7d8ec334f6adee2606ee156a7d22f7ef5604
-EBUILD chromedriver-bin-2.30-r1.ebuild 644 BLAKE2B 1827f95c6dd8fe6bf87da9252d5b16a894626201a8eb2e62163970cad4abc048bac8e012043aa0e791cac28736dae680cce014b4177d85b4f6268ca4525ab8cb SHA512 5b5d5a6e5e333e8e36b8041247581aa687b756a01068f98052aa0d2898d662178530171fc58bd1e82cd32bdd742c7d8ec334f6adee2606ee156a7d22f7ef5604
-EBUILD chromedriver-bin-2.35-r1.ebuild 539 BLAKE2B d41fdf3b40b52c2904abdd9f98623a248456ba07e20297ab5e367fd316e26012a76cff0745971e80fbc7f9c93565f7d89be9371177fc8e40374eb1515f7d0ec4 SHA512 f23bdc20e88e733db2006b29c533636a3a3135ee2225e39e7f5d8b718444feb6cff5351b3b46a6dcc7a4b8328a3f269c0c3a87d8e7d8abe64756436afc1b2f6a
-EBUILD chromedriver-bin-2.40.ebuild 539 BLAKE2B d41fdf3b40b52c2904abdd9f98623a248456ba07e20297ab5e367fd316e26012a76cff0745971e80fbc7f9c93565f7d89be9371177fc8e40374eb1515f7d0ec4 SHA512 f23bdc20e88e733db2006b29c533636a3a3135ee2225e39e7f5d8b718444feb6cff5351b3b46a6dcc7a4b8328a3f269c0c3a87d8e7d8abe64756436afc1b2f6a
-EBUILD chromedriver-bin-2.41.ebuild 539 BLAKE2B d41fdf3b40b52c2904abdd9f98623a248456ba07e20297ab5e367fd316e26012a76cff0745971e80fbc7f9c93565f7d89be9371177fc8e40374eb1515f7d0ec4 SHA512 f23bdc20e88e733db2006b29c533636a3a3135ee2225e39e7f5d8b718444feb6cff5351b3b46a6dcc7a4b8328a3f269c0c3a87d8e7d8abe64756436afc1b2f6a
-EBUILD chromedriver-bin-74.0.3729.6.ebuild 536 BLAKE2B 33443cfcfae910fbe0fffcb92137fcc80e754883d180316acef1629b3508752dd5917e717d5fd26c94fd41591a7d817bf4ac4b99b592deb0977eb5290a921db3 SHA512 4a5ff3ae076a62a748d51f7418e1d26ee401ff2f3da81f7ec42cbb21f357269912b54fcb7276fce3556f02ac68d05b12726e0748b020de28474f585e17cfe12e
-EBUILD chromedriver-bin-76.0.3809.68.ebuild 536 BLAKE2B 33443cfcfae910fbe0fffcb92137fcc80e754883d180316acef1629b3508752dd5917e717d5fd26c94fd41591a7d817bf4ac4b99b592deb0977eb5290a921db3 SHA512 4a5ff3ae076a62a748d51f7418e1d26ee401ff2f3da81f7ec42cbb21f357269912b54fcb7276fce3556f02ac68d05b12726e0748b020de28474f585e17cfe12e
-EBUILD chromedriver-bin-77.0.3865.40.ebuild 536 BLAKE2B 33443cfcfae910fbe0fffcb92137fcc80e754883d180316acef1629b3508752dd5917e717d5fd26c94fd41591a7d817bf4ac4b99b592deb0977eb5290a921db3 SHA512 4a5ff3ae076a62a748d51f7418e1d26ee401ff2f3da81f7ec42cbb21f357269912b54fcb7276fce3556f02ac68d05b12726e0748b020de28474f585e17cfe12e
-EBUILD chromedriver-bin-78.0.3904.105.ebuild 595 BLAKE2B 50a3893369b0bf26c1ac28cf30f6fceebc04096f4602d4a433c29fcae1a1dbefae0e159c95dbbebf8ca4fbb3fb78aedd5c3dd7ef7d5ac0e8c3c324e3d4c4f667 SHA512 ebd62f835d0aa6ab6a517b4b2084227969f2b087540984d46a5a1f67d235baa77f1e98c0f7e13cbbdb5bccaa106cf30a539c79e94e846e2d2e4fda7d624ae638
-EBUILD chromedriver-bin-78.0.3904.70.ebuild 536 BLAKE2B 33443cfcfae910fbe0fffcb92137fcc80e754883d180316acef1629b3508752dd5917e717d5fd26c94fd41591a7d817bf4ac4b99b592deb0977eb5290a921db3 SHA512 4a5ff3ae076a62a748d51f7418e1d26ee401ff2f3da81f7ec42cbb21f357269912b54fcb7276fce3556f02ac68d05b12726e0748b020de28474f585e17cfe12e
-EBUILD chromedriver-bin-79.0.3945.36.ebuild 595 BLAKE2B 50a3893369b0bf26c1ac28cf30f6fceebc04096f4602d4a433c29fcae1a1dbefae0e159c95dbbebf8ca4fbb3fb78aedd5c3dd7ef7d5ac0e8c3c324e3d4c4f667 SHA512 ebd62f835d0aa6ab6a517b4b2084227969f2b087540984d46a5a1f67d235baa77f1e98c0f7e13cbbdb5bccaa106cf30a539c79e94e846e2d2e4fda7d624ae638
-EBUILD chromedriver-bin-80.0.3987.106.ebuild 595 BLAKE2B 630d77aec56a4bc0d3bdf7a602f7568b205b4511fef2ffd28d0b811c86e6c31b436ed172198901e143eff56c0633d1b463c338907c79798e10e5468b7a0b5bc8 SHA512 33779f842a2e2e5aedf085c50f91c856438396705dd1191beceb85ae3cd6cfec23fe707de697f2de533289562676e9779bb8195bb63911eb245884bafc7a56fa
-EBUILD chromedriver-bin-81.0.4044.69.ebuild 595 BLAKE2B 630d77aec56a4bc0d3bdf7a602f7568b205b4511fef2ffd28d0b811c86e6c31b436ed172198901e143eff56c0633d1b463c338907c79798e10e5468b7a0b5bc8 SHA512 33779f842a2e2e5aedf085c50f91c856438396705dd1191beceb85ae3cd6cfec23fe707de697f2de533289562676e9779bb8195bb63911eb245884bafc7a56fa
-EBUILD chromedriver-bin-83.0.4103.39.ebuild 595 BLAKE2B 630d77aec56a4bc0d3bdf7a602f7568b205b4511fef2ffd28d0b811c86e6c31b436ed172198901e143eff56c0633d1b463c338907c79798e10e5468b7a0b5bc8 SHA512 33779f842a2e2e5aedf085c50f91c856438396705dd1191beceb85ae3cd6cfec23fe707de697f2de533289562676e9779bb8195bb63911eb245884bafc7a56fa
+EBUILD chromedriver-bin-83.0.4103.39-r1.ebuild 610 BLAKE2B 3c886ead5a8351ed0de86598339c851db690291703f385a5cb3612c426fcfdb1da8336cc94d34d9107a0e643a3b51bd7fc2eba998492c320a08fc2ae327bc9b4 SHA512 99b76b3627fecb3ea206f5246979ac5a068b195eff25fa9e43b1e7bad4e259aabb8fd67204f84a655d24ea07deb57590ba119f8420dce68e6fe248e7ed805aee
 MISC metadata.xml 460 BLAKE2B 6da42de60f119a13f70f0a64f61f4fde912d15a7582b240631761e852b0db50bdb2f95102be05b09b1d653907b4c0a8a9641a9952cb6a7c1bd84d8f51ae1d83b SHA512 a8dfdafe46c651f3b06e0c004750747cfbe21e0ee704e5afd6f302c2ea61e288fad3987732b0e4b6ecec4805822c347f1d43a5e09e911e7d950196207eb81f43
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-2.24-r1.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-2.24-r1.ebuild
deleted file mode 100644
index 20c77c77d886..000000000000
--- a/www-apps/chromedriver-bin/chromedriver-bin-2.24-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="WebDriver for Chrome"
-HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
-SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )
-	x86? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux32.zip -> ${P}.linux32.zip )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="!www-client/chromium
-	www-client/google-chrome"
-
-S="${WORKDIR}"
-QA_PREBUILT="usr/bin/chromedriver"
-
-src_install()
-{
-	dobin chromedriver
-}
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-2.30-r1.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-2.30-r1.ebuild
deleted file mode 100644
index 20c77c77d886..000000000000
--- a/www-apps/chromedriver-bin/chromedriver-bin-2.30-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="WebDriver for Chrome"
-HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
-SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )
-	x86? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux32.zip -> ${P}.linux32.zip )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="!www-client/chromium
-	www-client/google-chrome"
-
-S="${WORKDIR}"
-QA_PREBUILT="usr/bin/chromedriver"
-
-src_install()
-{
-	dobin chromedriver
-}
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-2.35-r1.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-2.35-r1.ebuild
deleted file mode 100644
index 2ddd7f88b05a..000000000000
--- a/www-apps/chromedriver-bin/chromedriver-bin-2.35-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="WebDriver for Chrome"
-HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
-SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="!www-client/chromium
-	www-client/google-chrome"
-
-S="${WORKDIR}"
-QA_PREBUILT="usr/bin/chromedriver"
-
-src_install()
-{
-	dobin chromedriver
-}
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-2.40.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-2.40.ebuild
deleted file mode 100644
index 2ddd7f88b05a..000000000000
--- a/www-apps/chromedriver-bin/chromedriver-bin-2.40.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="WebDriver for Chrome"
-HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
-SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="!www-client/chromium
-	www-client/google-chrome"
-
-S="${WORKDIR}"
-QA_PREBUILT="usr/bin/chromedriver"
-
-src_install()
-{
-	dobin chromedriver
-}
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-2.41.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-2.41.ebuild
deleted file mode 100644
index 2ddd7f88b05a..000000000000
--- a/www-apps/chromedriver-bin/chromedriver-bin-2.41.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="WebDriver for Chrome"
-HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
-SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="!www-client/chromium
-	www-client/google-chrome"
-
-S="${WORKDIR}"
-QA_PREBUILT="usr/bin/chromedriver"
-
-src_install()
-{
-	dobin chromedriver
-}
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-74.0.3729.6.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-74.0.3729.6.ebuild
deleted file mode 100644
index ebfd309b9915..000000000000
--- a/www-apps/chromedriver-bin/chromedriver-bin-74.0.3729.6.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
-
-DESCRIPTION="WebDriver for Chrome"
-HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
-SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="!www-client/chromium
-	www-client/google-chrome"
-
-S="${WORKDIR}"
-QA_PREBUILT="usr/bin/chromedriver"
-
-src_install()
-{
-	dobin chromedriver
-}
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-76.0.3809.68.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-76.0.3809.68.ebuild
deleted file mode 100644
index ebfd309b9915..000000000000
--- a/www-apps/chromedriver-bin/chromedriver-bin-76.0.3809.68.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
-
-DESCRIPTION="WebDriver for Chrome"
-HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
-SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="!www-client/chromium
-	www-client/google-chrome"
-
-S="${WORKDIR}"
-QA_PREBUILT="usr/bin/chromedriver"
-
-src_install()
-{
-	dobin chromedriver
-}
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-77.0.3865.40.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-77.0.3865.40.ebuild
deleted file mode 100644
index ebfd309b9915..000000000000
--- a/www-apps/chromedriver-bin/chromedriver-bin-77.0.3865.40.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
-
-DESCRIPTION="WebDriver for Chrome"
-HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
-SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="!www-client/chromium
-	www-client/google-chrome"
-
-S="${WORKDIR}"
-QA_PREBUILT="usr/bin/chromedriver"
-
-src_install()
-{
-	dobin chromedriver
-}
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-78.0.3904.105.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-78.0.3904.105.ebuild
deleted file mode 100644
index d784d5e28ea9..000000000000
--- a/www-apps/chromedriver-bin/chromedriver-bin-78.0.3904.105.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="WebDriver for Chrome"
-HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
-SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="bindist mirror strip"
-
-BDEPEND="app-arch/unzip"
-
-RDEPEND="!www-client/chromium
-	www-client/google-chrome"
-
-S="${WORKDIR}"
-QA_PREBUILT="usr/bin/chromedriver"
-
-src_install()
-{
-	dobin chromedriver
-}
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-78.0.3904.70.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-78.0.3904.70.ebuild
deleted file mode 100644
index ebfd309b9915..000000000000
--- a/www-apps/chromedriver-bin/chromedriver-bin-78.0.3904.70.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
-
-DESCRIPTION="WebDriver for Chrome"
-HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
-SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="!www-client/chromium
-	www-client/google-chrome"
-
-S="${WORKDIR}"
-QA_PREBUILT="usr/bin/chromedriver"
-
-src_install()
-{
-	dobin chromedriver
-}
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-79.0.3945.36.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-79.0.3945.36.ebuild
deleted file mode 100644
index d784d5e28ea9..000000000000
--- a/www-apps/chromedriver-bin/chromedriver-bin-79.0.3945.36.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="WebDriver for Chrome"
-HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
-SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="bindist mirror strip"
-
-BDEPEND="app-arch/unzip"
-
-RDEPEND="!www-client/chromium
-	www-client/google-chrome"
-
-S="${WORKDIR}"
-QA_PREBUILT="usr/bin/chromedriver"
-
-src_install()
-{
-	dobin chromedriver
-}
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-80.0.3987.106.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-80.0.3987.106.ebuild
deleted file mode 100644
index c96967a171b8..000000000000
--- a/www-apps/chromedriver-bin/chromedriver-bin-80.0.3987.106.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
-
-DESCRIPTION="WebDriver for Chrome"
-HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
-SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="bindist mirror strip"
-
-BDEPEND="app-arch/unzip"
-
-RDEPEND="!www-client/chromium
-	www-client/google-chrome"
-
-S="${WORKDIR}"
-QA_PREBUILT="usr/bin/chromedriver"
-
-src_install()
-{
-	dobin chromedriver
-}
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-81.0.4044.69.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-81.0.4044.69.ebuild
deleted file mode 100644
index c96967a171b8..000000000000
--- a/www-apps/chromedriver-bin/chromedriver-bin-81.0.4044.69.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
-
-DESCRIPTION="WebDriver for Chrome"
-HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
-SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="bindist mirror strip"
-
-BDEPEND="app-arch/unzip"
-
-RDEPEND="!www-client/chromium
-	www-client/google-chrome"
-
-S="${WORKDIR}"
-QA_PREBUILT="usr/bin/chromedriver"
-
-src_install()
-{
-	dobin chromedriver
-}
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-83.0.4103.39-r1.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-83.0.4103.39-r1.ebuild
new file mode 100644
index 000000000000..75e2c16479fe
--- /dev/null
+++ b/www-apps/chromedriver-bin/chromedriver-bin-83.0.4103.39-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="WebDriver for Chrome"
+HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
+SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="bindist mirror strip"
+
+BDEPEND="app-arch/unzip"
+
+RDEPEND="!www-client/chromium
+	=www-client/google-chrome-$(ver_cut 1)*"
+
+S="${WORKDIR}"
+QA_PREBUILT="usr/bin/chromedriver"
+
+src_install()
+{
+	dobin chromedriver
+}
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-83.0.4103.39.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-83.0.4103.39.ebuild
deleted file mode 100644
index c96967a171b8..000000000000
--- a/www-apps/chromedriver-bin/chromedriver-bin-83.0.4103.39.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
-
-DESCRIPTION="WebDriver for Chrome"
-HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
-SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="bindist mirror strip"
-
-BDEPEND="app-arch/unzip"
-
-RDEPEND="!www-client/chromium
-	www-client/google-chrome"
-
-S="${WORKDIR}"
-QA_PREBUILT="usr/bin/chromedriver"
-
-src_install()
-{
-	dobin chromedriver
-}
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index c65d8cecab47..bb45dc85a07c 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,12 +1,10 @@
 AUX postinstall-en.txt 1595 BLAKE2B 9b5c237befcf415d0f769052c9634da830326ff57da1a1db538059138780c8ebf8d0666908fb6bb3eba99fee5d5869cd12042f0d276b560b51db60803e46c146 SHA512 6a0a5388d40b3c49f3c685a6a7986c2a9efe3e6d7c5115fbb3110ebe4c19c605a4ff785447a20c0296f3cb16811a8a6e77f2439d58253a011603709c9dd9b760
-DIST drupal-7.71.tar.gz 3323316 BLAKE2B a34a6f35912130719867d3a1e9262d25d558d1ecd220b73f662134c3e1238bfd9dbedd71f076332e4dfac3b1ed0bab24ddf7603a4ad78faf9db5c7317e273b66 SHA512 3ed0bd4e8f176bfda89e5032728b22351951062e476956b8f0242a5a2606be65c109bb31770815a1ee74f38a6aea20b3bd7697e714597da8eaff0bdfa9ba548d
-DIST drupal-8.7.14.tar.gz 17930775 BLAKE2B 0a25ea095d8431075bb2d6506237a270131cef0548b0be4d801721fc850b504d0ea1969410a4b7493f983d9a9e80e9e8e45fb553e821759505882bac96266de3 SHA512 0dc5ee0d21c6da019aae6cf93d16d938b5fcf3179b74278d03c75cb6fd78f7fa698bc98ccb4040553b010e7b529f8a37640147b928616348abbcfd3060d42995
-DIST drupal-8.8.7.tar.gz 19504196 BLAKE2B 7414049a26fdb74d4dc5cde4d19cdd8f2631cfa1d2c97b87128f832efdafe734ef261a8423cdecad3c5ce56b6770806e2ca76a8b76fd71cfa5a056c6dfb75f6c SHA512 24608d809522878999f96c8e2fb561ee0f6e1460de54127570c75e08430a6ecfabdf080fe3f2177a70f12acdb0d1ef4c2f5f86f7304e69748eb1d82357034e74
-DIST drupal-8.9.0.tar.gz 19776103 BLAKE2B 3dc9ee0db667c370de2f686dc34b7b60797fe0a8ad80c2ca9dc08e1c096d6b3f9629e05af156c004a20fecba8958ca4283b45a21f67d212fed254feb03618b79 SHA512 4cb05a4352aa04ce94252a2614f1d16822400e45250d0d67962b8a3c7a891d323d102fc6c7c44a5d8caa16aa8857096958bb56899314c3871dece4e8647d5264
-DIST drupal-9.0.0.tar.gz 16833239 BLAKE2B 2202de1e352b181db3f85ba5ccf012987114b140afee055ba2475b63ae9738be9a669a534dc5470a3d41bf1e4eb81b269ccc34f4ac89ef5668396121d91ee1b0 SHA512 7a77a153f6e0b9f31c3d0e1350719b7677d8153a823b057efbe6e1cc21c59989755c96e497b1a4439e79361f35920eac13d1016019d4fd12dabc34c2c10d8244
-EBUILD drupal-7.71.ebuild 1546 BLAKE2B 68d9ef0e5c84e8413ab72d8d1f7427316885419b1e19086d2d27d293a98fff1c4f7f889ae68decf1083d98e228dc6778794bf7e61d82f7d3002cd2a92ca0d844 SHA512 366ec13e1ae23222f5b5bbe04f2f3ee0fec8c70e68d542582bb01c67ed5fda76b28dd3ae0072bef3c19c76bbf85e34ce505986226edb76755092b2cc8d299a63
-EBUILD drupal-8.7.14.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
-EBUILD drupal-8.8.7.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
-EBUILD drupal-8.9.0.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
-EBUILD drupal-9.0.0.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
+DIST drupal-7.72.tar.gz 3323531 BLAKE2B 07d22cde80763e9d9e959907ae246b95dc611b6ae32f8bf69e5c2fa03ad023bcb3810703dbe2285b89f43709616d9302b0598012237fe97487820e71df1b9b70 SHA512 5ad91d9aa31a0d31ba07dba0de5fd4d0fb4b875ed3fed7d48e3b65d4e2e8d7e7f3e66dcbe9d2a7a78fa22923597a396f43d70ee7b5ac63469ca3e256ba4746b6
+DIST drupal-8.8.8.tar.gz 19504669 BLAKE2B f98e772753ffc6df5e9404bcf1c30acaca284447040b73ba43e62aa413c712f3174f636efa24a3e24c5d2dfd3906ad920b40eab5c7ad51f485ef6b25647bcf84 SHA512 1170d4a6372f21d8817264f17998f3b29c5c158267d4d60d057475a773fe24eb85b4988c89daef80c08a89bf4d4ba1a85d1d35ac698ebd588109be0731b796ca
+DIST drupal-8.9.1.tar.gz 19776948 BLAKE2B 34dafaddafb0a8e742ff8591aa016e1d8cdf40c5779236308427339087b2c2f552b8829de0ae3dc2eedf5e99d70922e89a281852b3e3f2f3c27a00efafdea849 SHA512 db518cc180508023025c2f7b898f85c4728712bafaa048fe1783aa471d0c38f24f27e62175a8cea314c330b0a147509d8285ee6f0838d990ae3c76aab83d081f
+DIST drupal-9.0.1.tar.gz 16832166 BLAKE2B b783bb0282f0ee81fa1a3d606e3a97d65a537f20e2820270a2e5d554b737af45f31fac82f45e1322df8ee04ba1a4a5ee757a67fe2a09c272a32400c4d5b51424 SHA512 499459ebf72b1008266e6075667a4781b27d2e82635687744321513af1ac2289a0a33273666f251b90c4a2020e4fb52b83146b9a65007de788c5f3559bb4cb0a
+EBUILD drupal-7.72.ebuild 1546 BLAKE2B 68d9ef0e5c84e8413ab72d8d1f7427316885419b1e19086d2d27d293a98fff1c4f7f889ae68decf1083d98e228dc6778794bf7e61d82f7d3002cd2a92ca0d844 SHA512 366ec13e1ae23222f5b5bbe04f2f3ee0fec8c70e68d542582bb01c67ed5fda76b28dd3ae0072bef3c19c76bbf85e34ce505986226edb76755092b2cc8d299a63
+EBUILD drupal-8.8.8.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
+EBUILD drupal-8.9.1.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
+EBUILD drupal-9.0.1.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
 MISC metadata.xml 350 BLAKE2B 6142fb739e77e5ea96afb08fc4874d79efcac28348eb84333b77010fe74286d2939e160ad4ae0bbc7ca1630a73683d6d956ea1dc804b602f7fb925fff3e4b814 SHA512 10953373bc06435a35f07b9f0950c7e930c6c23cd3e6d35393eb98e581a3daeecf9b6c1f26bf1343e9ff4be84b7db3a6967c5c61bae78dc5cc7a8b786a93d6c4
diff --git a/www-apps/drupal/drupal-7.71.ebuild b/www-apps/drupal/drupal-7.72.ebuild
index 4fd21d3cac4f..4fd21d3cac4f 100644
--- a/www-apps/drupal/drupal-7.71.ebuild
+++ b/www-apps/drupal/drupal-7.72.ebuild
diff --git a/www-apps/drupal/drupal-8.7.14.ebuild b/www-apps/drupal/drupal-8.8.8.ebuild
index 50acdd30770d..50acdd30770d 100644
--- a/www-apps/drupal/drupal-8.7.14.ebuild
+++ b/www-apps/drupal/drupal-8.8.8.ebuild
diff --git a/www-apps/drupal/drupal-8.8.7.ebuild b/www-apps/drupal/drupal-8.9.1.ebuild
index 50acdd30770d..50acdd30770d 100644
--- a/www-apps/drupal/drupal-8.8.7.ebuild
+++ b/www-apps/drupal/drupal-8.9.1.ebuild
diff --git a/www-apps/drupal/drupal-9.0.0.ebuild b/www-apps/drupal/drupal-9.0.0.ebuild
deleted file mode 100644
index 50acdd30770d..000000000000
--- a/www-apps/drupal/drupal-9.0.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit webapp
-
-MY_PV=${PV:0:3}.0
-MY_P=${P/_/-}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="PHP-based open-source platform and content management system"
-HOMEPAGE="https://www.drupal.org/"
-SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+mysql postgres sqlite +uploadprogress"
-
-RDEPEND="
-	dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml]
-	virtual/httpd-php
-	uploadprogress? ( dev-php/pecl-uploadprogress )
-"
-
-need_httpd_cgi
-
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
-		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
-
-	dodoc ${docs}
-	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
-
-	cp sites/default/{default.settings.php,settings.php} || die
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	dodir "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/files
-
-	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	echo
-	ewarn "SECURITY NOTICE"
-	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
-	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
-	echo
-	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
-	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
-	echo
-	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
-	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
-	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
-	ewarn "reported by the setup."
-	echo
-}
diff --git a/www-apps/drupal/drupal-8.9.0.ebuild b/www-apps/drupal/drupal-9.0.1.ebuild
index 50acdd30770d..50acdd30770d 100644
--- a/www-apps/drupal/drupal-8.9.0.ebuild
+++ b/www-apps/drupal/drupal-9.0.1.ebuild
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 34180f485acd..85a4082c1141 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -5,10 +5,13 @@ AUX kibana.service 511 BLAKE2B 2b0786bfaf37c26e061973f38adea0a55ac1b8bf771395242
 DIST kibana-6.8.8-linux-x86_64.tar.gz 189162738 BLAKE2B 63ff29f7b2cf8bed931a473c0c33a9b9a82bbbd95ede171ad964e5855d56bd113981065ec12c0eb48f5e010d003229f3c91d9578a520e5909e04de5e5a635662 SHA512 f2104d1f83595cacf9ba3ce4225dc7044a251255afb62e494a7e3224cfbd280e5f51755c6a5c3452f8208fd8566ec6a11d51cd4453dc66cb8a8b158876fb4eae
 DIST kibana-7.6.2-linux-x86_64.tar.gz 249555386 BLAKE2B e3db49bbf87de5c20dd8ae91a3835d27d10bcfa914b6cf6501eeddb229f896cdfbd78fa712c0ed63498a80a87ae48b0d2bac4218d8e1328c4c228f61e4c9b5d4 SHA512 5a7187f7fd1af3d4009053b904948fca08e171ea5eea36f8120019721d84b1649bdaf1bc606577ebad179bd4d24b014a1733c8221f67b1b7da2c756c68819311
 DIST kibana-7.7.0-linux-x86_64.tar.gz 278962064 BLAKE2B 80ff28fc67d6b5d3b492a957e4cd2847364a86850abd60c468cad7d366fbbd9c406a5fd5c5e40e61ba7b5b333f0ee8c71f7c16f0da3f12fed8c81e20dec620ce SHA512 ea6e7ca12c43be627c54691e365827a2e42458ab443dedeb948a2aa2e63d1506859554a0eaef4ccdb9c03de836d4f2b4afda7daf25a826748351df2d15309b8b
+DIST kibana-7.8.0-linux-x86_64.tar.gz 334236568 BLAKE2B 17a3b593f978858bdf6910962391b3bfecb514f34b9734fb99028a4029a03603965eb3d8dae1e991782362b7963c58546abaab47ed8f3358574de93d50b94d31 SHA512 3c9ffbbfe56b66226ff62740cbe8eae83e43b07a1e3aec2ca845398c7d4418fd9c3cf67bebf5d9dd77c285468265c23c46080762cd90df070cd03ebe92b3ebef
 DIST kibana-oss-6.8.8-linux-x86_64.tar.gz 66262509 BLAKE2B 76531791f024cf98c5ebe6840564f8f49cd3539370889f209ac0b89763ad71cfd23575789c7bdeb1ad0f6adff8ee555ece530e8fdcc6e51e0671e0a4ae0095c8 SHA512 64c839cf8c1bbddf776655f6674640bd01bbe97039b78f9fac0a95f425eea37825c5fa9a06b4e8bad4e8230db02424afa569a3adcd5d36164f3d6aada8b2f4e4
 DIST kibana-oss-7.6.2-linux-x86_64.tar.gz 102252121 BLAKE2B f0b6571733b7eb5379491b8a27ee3b0ab49c643c73fd9ba53b0446f70deb059f788abf789037b9988ff398013c46653570c5ed3e539e76dd424b3ea624280e1c SHA512 639119273e0184640cf25513dd29633939c4bdc173e6577d377d60503db68989980fe09829fad8ba0862695dd7f79fd7dbd0102c3c2f9eb5e762071579a3d424
 DIST kibana-oss-7.7.0-linux-x86_64.tar.gz 138321105 BLAKE2B 148782533116a46bcaa529282ab0f8fe818789538ffac12187e95486db8757f030423e416a810c09ee20ca182e6ce80441208777e891d91961f8fc718926c975 SHA512 ed29806990a032abfeca747edcf9162f4704be5774bbe394bbe6b34c5614c97e27a900a64e9b6e7b242767bdf31729c34903c86e9708fb066f83d8df76966152
+DIST kibana-oss-7.8.0-linux-x86_64.tar.gz 151100745 BLAKE2B d8159f2abe5276afb361e4e799b69190a34c816e8814afa6284882483362e976a6baaea0bddf2b71760410633ee7ada3141a0ecbf2b43f5d543de2e1abef4b91 SHA512 637c291623fdd10cd57a2599afe221d5af1724773a02da08a6ce808a6336a64d8278f7711fdaa95c6e1557c675d417698ec40c92062c5623917b78494dfe3d63
 EBUILD kibana-bin-6.8.8.ebuild 2503 BLAKE2B 1a7338d89c5e63e1610ec3f14f39ec76794e6a07b7f4b31b66106f088dd9eb802de7944a18fe59fed5a3eba8e310e2df383f7682be317828c9327e34f2318d74 SHA512 01efdec9efc4fe2ffe4eb6cff18747115aa4e02ac462aefa0c10bcee8d460c536a04b9be99503675a7adbd1abcc09bcc29959427ac7615fdac55f5525cf55bce
 EBUILD kibana-bin-7.6.2.ebuild 2564 BLAKE2B 578c12f20b535ffaf7ee03a9c2661fd2091563be978dc5f59892c38ccc414c82c644f851cf76d9b517913e358f0db0ace42fb59e4043bb95330f67b32f028ec3 SHA512 4b57683047dfd03b60c52aa1c42af078e98e17fc5c3532a8f88d14f769fd351091d5c24a1ba3ac16044b645b6b01feee5f4f32478b86a8d0696f8869b2fc4932
 EBUILD kibana-bin-7.7.0.ebuild 2564 BLAKE2B e0d08b65a68d61c5b8cc00b10fa9b24f1f4518a51375476c61a383e90be7aa069961f3cb6c3ea2c4375196e013805402ad520cf8921385434011b2f91796908a SHA512 85a7e2cfc48e8d570b6113fd9ce77efa009ef07eeca5805a7866bfa02a7a899e283e5f17ecdef640018e2f7298c14b2a507dfe3b8286a8ca1fe5c632246f3823
+EBUILD kibana-bin-7.8.0.ebuild 2564 BLAKE2B d3805a087535b35b2f786a19ccba63f6e8c83f42287758d48aaf5aca76ebfd72eedf8e112b7f79938780659e44439f76c866c5c7da0de6c9004627e4bab0c428 SHA512 2d3f1649a05d7eede2fa2219e791250b6cac5d80ea6acd338f35489d99c8820d578dc4e0f1f06f1faa53f51c99e181dc6d399dc19b51af727ba9d11d7fc73945
 MISC metadata.xml 646 BLAKE2B 761ac91ba7a5c8a1ebdaa4b85a6db083eaca8e26dd00cf753c6cd80daadec79dbf1624a26a601e7e8c1605d9e7c267dcc75455d591c658ac1ab403ac8955786c SHA512 905abb24126c45f0b170bc4073ceb3860bdb21752a2a0315e25c1c5b3baac175e228694e0d51022928d0f05cc48e261a7b5da5792c4faa06ecef16ac105f67cf
diff --git a/www-apps/kibana-bin/kibana-bin-7.8.0.ebuild b/www-apps/kibana-bin/kibana-bin-7.8.0.ebuild
new file mode 100644
index 000000000000..94d5e2d801f5
--- /dev/null
+++ b/www-apps/kibana-bin/kibana-bin-7.8.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+MY_PN="${PN%-bin}"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Analytics and search dashboard for Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/kibana"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RDEPEND="
+	acct-group/kibana
+	acct-user/kibana
+	>=net-libs/nodejs-10.21.0
+	x-pack? (
+		dev-libs/expat
+		dev-libs/nss
+	)"
+
+S="${WORKDIR}/${MY_P}-linux-x86_64"
+
+src_prepare() {
+	default
+
+	# remove unused directory
+	rm -r data || die
+
+	# remove bundled nodejs
+	rm -r node || die
+	sed -i 's@\(^NODE="\).*@\1/usr/bin/node"@g' \
+		bin/kibana || die
+
+	# move optimize/plugins to /var/lib/kibana
+	rm -r optimize plugins || die
+
+	# handle node.js version with RDEPEND
+	sed -i /node_version_validator/d src/setup_node_env/index.js || die
+}
+
+src_install() {
+	insinto /etc/${MY_PN}
+	doins -r config/.
+	rm -r config || die
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
+
+	newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN}
+	newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN}
+	systemd_dounit "${FILESDIR}"/${MY_PN}.service
+
+	insinto /opt/${MY_PN}
+	doins -r .
+
+	fperms -R +x /opt/${MY_PN}/bin
+
+	diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
+	keepdir /var/lib/${MY_PN}/optimize
+	keepdir /var/lib/${MY_PN}/plugins
+	keepdir /var/log/${MY_PN}
+
+	dosym ../../var/lib/kibana/optimize /opt/kibana/optimize # Bug 667214
+	dosym ../../var/lib/kibana/plugins /opt/kibana/plugins
+}
+
+pkg_postinst() {
+	ewarn "Kibana optimize/plugins directories were moved to /var/lib/kibana."
+	ewarn "In case of startup failures (FATAL Error: Cannot find module...),"
+	ewarn "please remove the optimize directory content:"
+	ewarn "rm -r /var/lib/kibana/optimize/*"
+	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
+	elog "Node.js 10. Some plugins may fail with other versions of Node.js (Bug #656008)."
+	elog
+	elog "To set a customized Elasticsearch instance:"
+	elog "  OpenRC: set ES_INSTANCE in /etc/conf.d/${MY_PN}"
+	elog "  systemd: set elasticsearch.url in /etc/${MY_PN}/kibana.yml"
+	elog
+	elog "Elasticsearch can run local or remote."
+}
diff --git a/www-apps/liquid_feedback_core/Manifest b/www-apps/liquid_feedback_core/Manifest
index 5b802b9b52b2..400ac5acd5b2 100644
--- a/www-apps/liquid_feedback_core/Manifest
+++ b/www-apps/liquid_feedback_core/Manifest
@@ -3,6 +3,6 @@ AUX liquid_feedback_core-3.0.4-gentoo.patch 843 BLAKE2B 81b37cf79c20a83db0d5c55d
 AUX postinstall-en.txt 1498 BLAKE2B 0b29f386ea2c6a132046a42ebb246ecb428821d76a027722b4260f7c7bd00e99186ce145a2b5d7f169eb25b28a702ef4d3c2e0a0ae3217321f6969a2efc02304 SHA512 cd1488337b3faae08a1d7c326b4c1445863fb07b3d39b63460703467ad85524acf0fc14a19278a9cf995304e3a79c1b90ecdc0098f984d106d484f79d315b8e2
 DIST liquid_feedback_core-v2.2.6.tar.gz 127440 BLAKE2B d62ecd8c9947259a7213f92ecaf1491a5e858ff2fdaff5e020fc4ec0c433297d8a7701a812de200130a1ed7f08ded1d9f31d42de7fffa2981361efee0e31646c SHA512 6f680398a7d2e529e642dc94ba16bc1b33d25459ddbf629c06387391ef13c0e212a108cc337cd2bc29505f4f6436b6e92994e63eaa09fe1c07733d2821d9b7f1
 DIST liquid_feedback_core-v3.0.4.tar.gz 142983 BLAKE2B 05e8c1630a8fa3932b4fc291843dd0c45e2333940394a0632309c9041dc850cc894a6cb54fb840329f67812ebcde5d540c338cf27a88ad428aaa066329725409 SHA512 baea8a61c94e640557d0169b6171247ff0303ff1a9c8b587c6769e367cf56805c1a1e660aadf7178d984182be6dde326770240b3ffeda42139c4a94445a2bbf8
-EBUILD liquid_feedback_core-2.2.6.ebuild 1084 BLAKE2B df7fdf853f14de8f2f3be1cbc9dae637b0cea46d326b4454aeb3b4c55938854ef023232fd76f5752aa1e4cd2a0db0ff2e7f3299e648a2755bfbcff603a793f32 SHA512 2d0029901f91df8563c0130a8b3b7338373ff7fd5665712c2e3217682014fe3755929ea5d9271f4ac1ae64f8bb59691099825ecfa1044d875914df21fac76cad
-EBUILD liquid_feedback_core-3.0.4.ebuild 947 BLAKE2B 7db06edac8e12c112dc12dd41d12e4f805d82385c05e1fe566cb8e3a77b8f114e008d4feb80d6b8845d948f91e79fd419b7867454c50e8f510a5caff7e8e084a SHA512 9f7428e0b41b70127654446c88468a4c139e6404bbd3cced1a4283491dc05b2064e6f9feaccc067e271a624f98e86185b19250bc5117c1b2bb594d3d539d273b
+EBUILD liquid_feedback_core-2.2.6.ebuild 1086 BLAKE2B d091aa4f795779aef747229c8bd43f68f97a899eee7aca3cdda3294ca234438af631ef91ae734f7196bd0f474abdd1b0302ff767717cc6688e95ac4f594a0586 SHA512 0e2cc1ac02db4e23680459ac98ace75f65d18957bf8f8d78fc1935c6ddb56f7c18a840226b94443776e08c0b64f2e1261090ddd5bb7b0ab66e53c5095b8fc895
+EBUILD liquid_feedback_core-3.0.4.ebuild 949 BLAKE2B 38960552bb171e61add9aefcde4c0040c87f0ab15efbcf3323471236b7a6fc1d7401dacc036763b139978fff3bc8fe7f81f40bc93c350f31ea54103f4a84d365 SHA512 4dc83a60b2a87edc58fb19c6bf14699616c65085e7e1ab668ffa20c000ab749d1aed76609ff5a0dc2f49490b7bd61d8eae97f9c6f37fd52901b3de4befa75dc7
 MISC metadata.xml 1099 BLAKE2B c846e77c5b1531e4ea502b308146062803cd79f74b275cf131343fe5c9c6b0f86a107c84f40cf3be95910ed5b99174d0c9883836a06b535b2d4f08514c9b082e SHA512 1fbc5d0f4eff2085665038a48155b652d434ec42019a5343fe1c1ef34a7b863aa2f21636145d105cf9052ef0756400f29098f3017f948d3aa0fb854f89cd6ff0
diff --git a/www-apps/liquid_feedback_core/liquid_feedback_core-2.2.6.ebuild b/www-apps/liquid_feedback_core/liquid_feedback_core-2.2.6.ebuild
index 6980d685f120..934fd766bcc6 100644
--- a/www-apps/liquid_feedback_core/liquid_feedback_core-2.2.6.ebuild
+++ b/www-apps/liquid_feedback_core/liquid_feedback_core-2.2.6.ebuild
@@ -8,8 +8,8 @@ inherit toolchain-funcs
 MY_P=${PN}-v${PV}
 
 DESCRIPTION="Internet platforms for proposition development and decision making"
-HOMEPAGE="http://www.public-software-group.org/liquid_feedback"
-SRC_URI="http://www.public-software-group.org/pub/projects/liquid_feedback/backend/v${PV}/${MY_P}.tar.gz"
+HOMEPAGE="https://www.public-software-group.org/liquid_feedback"
+SRC_URI="https://www.public-software-group.org/pub/projects/liquid_feedback/backend/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="HPND CC-BY-2.5"
 SLOT="0"
diff --git a/www-apps/liquid_feedback_core/liquid_feedback_core-3.0.4.ebuild b/www-apps/liquid_feedback_core/liquid_feedback_core-3.0.4.ebuild
index 0e52e88b06a7..25dc37a2313f 100644
--- a/www-apps/liquid_feedback_core/liquid_feedback_core-3.0.4.ebuild
+++ b/www-apps/liquid_feedback_core/liquid_feedback_core-3.0.4.ebuild
@@ -8,8 +8,8 @@ inherit toolchain-funcs
 MY_P=${PN}-v${PV}
 
 DESCRIPTION="Internet platforms for proposition development and decision making"
-HOMEPAGE="http://www.public-software-group.org/liquid_feedback"
-SRC_URI="http://www.public-software-group.org/pub/projects/liquid_feedback/backend/v${PV}/${MY_P}.tar.gz"
+HOMEPAGE="https://www.public-software-group.org/liquid_feedback"
+SRC_URI="https://www.public-software-group.org/pub/projects/liquid_feedback/backend/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="HPND CC-BY-2.5"
 SLOT="0"
diff --git a/www-apps/liquid_feedback_frontend/Manifest b/www-apps/liquid_feedback_frontend/Manifest
index dd804431d617..9bdddb52c0dd 100644
--- a/www-apps/liquid_feedback_frontend/Manifest
+++ b/www-apps/liquid_feedback_frontend/Manifest
@@ -5,6 +5,6 @@ AUX postinstall-en.txt 2550 BLAKE2B 10f43b315cd156d74e3e70a8af1bbcd2a7a2e1835409
 DIST liquid_feedback_frontend-italian-2.2.7.tar.gz 7670 BLAKE2B 8131613849efdea1eaa1eda4f5620d7418d6b32c0f57b0aebb07c7dbe17afda2eee814733eada0656a159a93dda97a5a21e17db71baf3ca84e708caf502a4247 SHA512 63cfcb4a565fa570777c2f3d2dcec2e98f16415ad9f8a6d62076f4e2cdf0ddae95610688b6b7751a865344acb7b65f78e7cb1ae4103b24dacf63e3e346405918
 DIST liquid_feedback_frontend-v2.2.7.tar.gz 362509 BLAKE2B 980e261ac9bddfb0f87757457fe58e93481e6d56dc0199b9fc72308e094aec21730f6d901f2e5c1b18a7f5993d1704cc91f64870c16c6215cbbf806095aabe12 SHA512 aa8c99e53c329dbf4659dabe617938d63b2aa42bab99ff4e200d4e15be8ed8ef5f64a71293fa796adde47525d1a76ece3b04cff982474eb2307a3fcd4f269d78
 DIST liquid_feedback_frontend-v3.0.6.tar.gz 497521 BLAKE2B a9e7e7944b418a707a459093b41798818644e2d8aed47a48808c2bf7800acdcde61a04e07483dbb387264df2236b1b02f2410cb34f62bdec6244405db0cf3474 SHA512 d283d277cf6836c53398480c566158481fc65400e128bc4817975fd39c41e6e56b17f7f789a74b1b2a89f84aaf315101e9aa86a474c1817362443d03610fe6e9
-EBUILD liquid_feedback_frontend-2.2.7.ebuild 1580 BLAKE2B 43e872eea424039b31e17e7b8e8c5c6194eba98a86f44b8ab0bc879feb0ad7109af604e27b5af2a6deb08eaf82d2f7c4e2a979ed89bd041904a389b2147b4f6a SHA512 ed1eeeae12ea56a51aca672135996571a59abdc6a65f2f61d7593bd11fb8d34fc65f23c89448906d9f1d2002da7f4852bd9b76fa27495d4a9e1046bc55dfd905
-EBUILD liquid_feedback_frontend-3.0.6.ebuild 1098 BLAKE2B 8c3c79d810cc74fec51cb5fb3229b88a22d5d175d50456ee7147b7d16e29fbee409e62f1e08f1286027900ed6654744997aa4553a482bb5dcb21e2a789877f55 SHA512 c85d88a39aa53ae4f7f1a90359f5d9b5b2da55a964dffdbc260fb23cff462a01a3f4b6327e9df8fd2730671b1336956069d4ee7c9dc540ee8deb48e8f7c5e133
+EBUILD liquid_feedback_frontend-2.2.7.ebuild 1582 BLAKE2B e95f59e5b9aaa346e1eb84ce3394511ed649503a0161c522ee015c016c4713d64a123210d0ced632371de7d913f318af4f8780af30df4c384137473a2c3454e0 SHA512 5e3f1683ec2e9287d27b91336f691628ca41430b0198a989e13114bdb0d8c34cb6d81285ee7cc359ebea941e035c1a7978cb9e3541ded240fa27d389678d7865
+EBUILD liquid_feedback_frontend-3.0.6.ebuild 1100 BLAKE2B f01ee9844d42cca1a3543e46d1186c42b416ce650222527aa911514d4f82f17403e8c3be779bdeeaccccac2c3bfd91261ed3048c2ff87d935aa0564b928337fe SHA512 b6cc541e266eed0898ea9a28424b981ac2a88f63da0b8ceca08e42661d6c51b8582f59b165567c33bbb77cd47cd97a0360edd84eb161f505ae7cfd78c7ce3f7e
 MISC metadata.xml 699 BLAKE2B 12bf221f2c88a9f60051a1e91e00d855a12c937384470c92272f0ecd195f0a0cbb921ff401932a77a4304f02ed30f8afc9339035eaa6995c932db04b7529e06a SHA512 5a9961a632ba7d64fa23d2e6d43cff15cdd4b0fae14681cf7a0c809cdaa527cc6a1e5dcde7d7d9f26cf824cd18599f39345e5592064c4ebbfa29406256117038
diff --git a/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-2.2.7.ebuild b/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-2.2.7.ebuild
index 1c9f8c97b1d7..ebbd3863ae79 100644
--- a/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-2.2.7.ebuild
+++ b/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-2.2.7.ebuild
@@ -10,8 +10,8 @@ PV_F=v${PV}
 MY_P=${PN}-v${PV}
 
 DESCRIPTION="Internet platforms for proposition development and decision making"
-HOMEPAGE="http://www.public-software-group.org/liquid_feedback"
-SRC_URI="http://www.public-software-group.org/pub/projects/liquid_feedback/frontend/v${PV}/${MY_P}.tar.gz
+HOMEPAGE="https://www.public-software-group.org/liquid_feedback"
+SRC_URI="https://www.public-software-group.org/pub/projects/liquid_feedback/frontend/v${PV}/${MY_P}.tar.gz
 l10n_it? ( mirror://gentoo/${PN}-italian-${PV}.tar.gz )"
 
 LICENSE="HPND CC-BY-2.5"
diff --git a/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-3.0.6.ebuild b/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-3.0.6.ebuild
index 6cac5a55db69..cd858e7dd524 100644
--- a/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-3.0.6.ebuild
+++ b/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-3.0.6.ebuild
@@ -10,8 +10,8 @@ PV_F=v${PV}
 MY_P=${PN}-v${PV}
 
 DESCRIPTION="Internet platforms for proposition development and decision making"
-HOMEPAGE="http://www.public-software-group.org/liquid_feedback"
-SRC_URI="http://www.public-software-group.org/pub/projects/liquid_feedback/frontend/v${PV}/${MY_P}.tar.gz"
+HOMEPAGE="https://www.public-software-group.org/liquid_feedback"
+SRC_URI="https://www.public-software-group.org/pub/projects/liquid_feedback/frontend/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="HPND CC-BY-2.5"
 SLOT="0"
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index e0c383339563..0169f99cfff6 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,5 +1,5 @@
 AUX postinstall-1.18-en.txt 2611 BLAKE2B c4d110d0d7c3fc270b0dc7f134cf7de8f2ca4595692ac146c2e4cd1c3647e7399d44249059496960ae94490c5b188c986dab64d4b90901bd7fc44203493532a0 SHA512 2b6a0e00160c15466bf70189499816d18a5ea06f040ed79f2361842be93a584ea19033170dc59c1d78c590da85223a61b8d04730084e60bc7906648f2532578b
 AUX postupgrade-1.16-en.txt 1519 BLAKE2B 39cf00073c5d12e04dd69126c7671acb5876bcdd592526d6aca475b98f9ed7abcb6d2691cef8642be04d8041fcbdaee0555937f1480f71a82c3f367f2a3d99b6 SHA512 495a2ea3074e96e570ed83e557691786524aea878fa6ee489080245a9bb1669d93e318c3871ce44918225d0e64d09e1e644538627bfb35a4a2a12d27365dc89d
-DIST mediawiki-1.34.1.tar.gz 40346153 BLAKE2B 394c23e7d507aef6e47971e265b70826046e954b7f694f32a94d7c5358775e0ee8a17188de1f395fbb19457267650eaffd3586c0f73df8cfad721560d563cbfd SHA512 3a03ac696e2d5300faba0819ba0d876a21798c8dcdc64cc2792c6db0aa81d4feaced8dc133b6ca3e476c770bf51516b0a624cb336784ae3d2b51c8c0aa5987a0
-EBUILD mediawiki-1.34.1.ebuild 2315 BLAKE2B 1a7420b1f2fa0e3be3b9e256cd83d8947bc802bbe6cb5499de504b5e3c11974d64274483a6f14a7df154564629af1be318b5d9e66d403f6498056d409f47bfc6 SHA512 012694d132f48d9be9fd66405d79fa7e28ce4a19c8c02fffa01f664e97949f3edb482eea2eb8f6e94ec92255a3ce89d63ae9cf2fbfb13b34c9a3d5551f9147f9
+DIST mediawiki-1.34.2.tar.gz 40721102 BLAKE2B fbf7e8a19cd51e1dd3eab85442ce4e65ee9591bb4d2c6faa93ecbfc43e0b6cf88501a0027a7ba0f1adb55d9946de9958abcb14f9fb95b826ba674f1aa8306553 SHA512 ea95b46b746c0c180b5cb3b8a2263a2f94207eadbb1638c2113e97b1503c3f0a4d82a2107ce4cabca4790512b81564bda49defe30ac0fdb9bddf3230d6201f8b
+EBUILD mediawiki-1.34.2.ebuild 2547 BLAKE2B 671e90fbf8be26c4c3817e112a1c34dee51712cf44d2e35a27b20ef4b58c10014e6f0d8a22625ee6a9ca5d0637325444c90b80abd775418b86a96cccd84969e5 SHA512 39687dd0c3e6a03a13cac0d7343c1e261266b6ff5b9c9ad710d7fed2e1e853923fcc7ff038dbfa1735592bfaf0074bc5cca5ecaeac6dbfc06e0bfdd3df11c67e
 MISC metadata.xml 246 BLAKE2B 6bdcea4d16a06756a1ab24fb076af6d88134c134f9239e658b7e5facb8cf6ed2f30d98938fd92bc8a3690e54273fd7f72420ccab04e7a6f7319e257a9f9ed618 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed
diff --git a/www-apps/mediawiki/mediawiki-1.34.1.ebuild b/www-apps/mediawiki/mediawiki-1.34.1.ebuild
deleted file mode 100644
index 550d710e49b3..000000000000
--- a/www-apps/mediawiki/mediawiki-1.34.1.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 webapp
-
-MY_BRANCH=$(ver_cut 1-2)
-
-DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
-HOMEPAGE="http://www.mediawiki.org"
-SRC_URI="http://releases.wikimedia.org/${PN}/${MY_BRANCH}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc x86"
-IUSE="imagemagick mysql postgres sqlite"
-
-RDEPEND="dev-lang/php[ctype,fileinfo,iconv,json,mysql?,postgres?,session,ssl,unicode,xml,xmlreader]
-	imagemagick? ( virtual/imagemagick-tools )
-	!imagemagick? ( dev-lang/php[gd] )
-	sqlite? (
-		dev-db/sqlite[fts3(+)]
-		dev-lang/php[pdo]
-		dev-lang/php[sqlite]
-	)
-	virtual/httpd-php"
-
-need_httpd_cgi
-
-RESTRICT="test"
-
-src_install() {
-	webapp_src_preinst
-
-	# First we install docs and then copy everything left into htdocs dir
-	# to avoid bugs like #236411.
-
-	# We ensure the directories are prepared for writing.  The post-
-	# install instructions guide the user to enable the feature.
-	local DOCS="FAQ HISTORY INSTALL README RELEASE-NOTES-${PV:0:4} UPGRADE"
-	dodoc ${DOCS} docs/*.txt
-	docinto php-memcached
-	dodoc docs/php-memcached/*
-
-	# Clean everything not used at the site...
-	rm -rf ${DOCS} COPYING tests docs || die
-	find . -name Makefile -delete || die
-	# and install
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	# If imagemagick is enabled then setup for image upload.
-	# We ensure the directory is prepared for writing.
-	if use imagemagick ; then
-		webapp_serverowned "${MY_HTDOCSDIR}"/images
-	fi
-
-	webapp_postinst_txt en "${FILESDIR}/postinstall-1.18-en.txt"
-	webapp_postupgrade_txt en "${FILESDIR}/postupgrade-1.16-en.txt"
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		echo
-		elog "=== Consult the release notes ==="
-		elog "Before doing anything, stop and consult the release notes"
-		elog "/usr/share/doc/${PF}/RELEASE-NOTES-${PV:0:4}.bz2"
-		echo
-		elog "These detail bug fixes, new features and functionality, and any"
-		elog "particular points that may need to be noted during the upgrade procedure."
-		echo
-		ewarn "Back up existing files and the database before upgrade."
-		ewarn "http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki"
-		ewarn "provides an overview of the backup process."
-		echo
-	fi
-}
diff --git a/www-apps/mediawiki/mediawiki-1.34.2.ebuild b/www-apps/mediawiki/mediawiki-1.34.2.ebuild
new file mode 100644
index 000000000000..f8b511b8a3d6
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.34.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit webapp
+
+MY_BRANCH=$(ver_cut 1-2)
+
+DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
+HOMEPAGE="http://www.mediawiki.org"
+SRC_URI="http://releases.wikimedia.org/${PN}/${MY_BRANCH}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc x86"
+IUSE="imagemagick mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="dev-lang/php[ctype,fileinfo,iconv,json,postgres?,session,ssl,unicode,xml,xmlreader]
+	imagemagick? ( virtual/imagemagick-tools )
+	!imagemagick? ( dev-lang/php[gd] )
+	mysql? ( dev-lang/php[mysql,mysqli] )
+	sqlite? (
+		dev-db/sqlite[fts3(+)]
+		dev-lang/php[pdo,sqlite]
+	)
+	virtual/httpd-php"
+
+need_httpd_cgi
+
+RESTRICT="test"
+
+src_unpack() {
+	default
+
+	# remove lua binaries (bug #631554)
+	rm -fr "${S}"/extensions/Scribunto/includes/engines/LuaStandalone/binaries || die "Failed to remove lua binaries"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	# First we install docs and then copy everything left into htdocs dir
+	# to avoid bugs like #236411.
+
+	# We ensure the directories are prepared for writing.  The post-
+	# install instructions guide the user to enable the feature.
+	local DOCS="FAQ HISTORY INSTALL README RELEASE-NOTES-${PV:0:4} UPGRADE"
+	dodoc ${DOCS} docs/*.txt
+	docinto databases
+	dodoc docs/databases/*
+	# Clean everything not used at the site...
+	rm -rf ${DOCS} COPYING tests docs || die
+	find . -name Makefile -delete || die
+	# and install
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# If imagemagick is enabled then setup for image upload.
+	# We ensure the directory is prepared for writing.
+	if use imagemagick ; then
+		webapp_serverowned "${MY_HTDOCSDIR}"/images
+	fi
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-1.18-en.txt"
+	webapp_postupgrade_txt en "${FILESDIR}/postupgrade-1.16-en.txt"
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		echo
+		elog "=== Consult the release notes ==="
+		elog "Before doing anything, stop and consult the release notes"
+		elog "/usr/share/doc/${PF}/RELEASE-NOTES-${PV:0:4}.bz2"
+		echo
+		elog "These detail bug fixes, new features and functionality, and any"
+		elog "particular points that may need to be noted during the upgrade procedure."
+		echo
+		ewarn "Back up existing files and the database before upgrade."
+		ewarn "http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki"
+		ewarn "provides an overview of the backup process."
+		echo
+	fi
+}
diff --git a/www-apps/radicale/Manifest b/www-apps/radicale/Manifest
index 8f93e029111e..79c32aff83f2 100644
--- a/www-apps/radicale/Manifest
+++ b/www-apps/radicale/Manifest
@@ -5,5 +5,5 @@ AUX radicale.service 546 BLAKE2B 6d43e9b9aec713a944259e6323442f6796068ede3da5399
 DIST Radicale-1.1.6.tar.gz 48280 BLAKE2B 38d3047d473fad24188b597a57d3e1f0e34df03f00f6806b86c447ed731be074bf0b5f6dfb951c8a9f627993bf0763792150bc06532414a658e4d306123fcdd6 SHA512 3fed85fc5fa2b041277112870b8b508a22cc85ec0680dd1cf9411e73715e18a9b0ddd651eafb0c9529bd308e7fd87ae44ecdd82935f4062050919780301d56d9
 DIST Radicale-2.1.11.tar.gz 76490 BLAKE2B 35578b693a32d4a77f8ff1c93cbb8fb63fd8dabf9fde79cd928d4afa6e059fe836840ca6a33621c13e9421a69bfb25cbb59688ba83bed62003ef3b56b54804b1 SHA512 e85f12664d3db6b911dd534eaddd15c498ca4f641cc15523644300aca8b1ef3f6fd4d9645857235502f03a7903111905537b04f9a6fdbde1a60fbb720d377733
 EBUILD radicale-1.1.6.ebuild 1671 BLAKE2B 916e0963de31d2a4a409cd179b5693b02854c4f6df033427624a37a25f6e71dc99d5909c21c93a6f93ff9c4a4602bfec00b8aa173904f1ba9f189a8908cb762b SHA512 633e039bd007ae070548a1dc79d7874c31317ceb2e38b39dadfdf2b06baa56f5ac0c43798cf795d0b94a60fbf66e894f4b42c9e03ffb81fe8eb6304ce26076f5
-EBUILD radicale-2.1.11-r1.ebuild 2748 BLAKE2B fbd545452fbd55315d156719c2da39788a9c1249bc1d29cd0f382333bc36e1f4ec2f6eefcf035dabfdedcda5ecc4f6a2efd6316021a15ab287247deee933d379 SHA512 a237308ae89e3dad0205611ca98c8e0cdfdd853e065a5650b85241a8769937323e29ad1e1561d256967bae6698243e68db94c202f82a216aedae635991af75d8
+EBUILD radicale-2.1.11-r1.ebuild 2752 BLAKE2B 4440fdd0eb1405e2785d3811f919237d9157d938cd9ad13540ef491adabe209c8307d4044df0f1b4e211fc3d4a0c8615043c197e0117238e9f216b7897e428f9 SHA512 b67f94a2535d70937bc247d42846eefc0296558573aa7bbf1f89be8bb9ab3335fe12e824a7941c2f590453774cb59dcefcda8245371f43cbbe2bc6c600e92bbf
 MISC metadata.xml 472 BLAKE2B dad26ff5abb5fb50a0016f23a03f33bf2e6dc536ed92fe30a587824f8b85789ae16a44d362df683c2b62c9db73175f0cbb06b26a6a6d4b3d544fdefb30613690 SHA512 309c2abddb4150357ffbfd35d8dd153592b4e7426b61728a25f7a2a8eb6a97ab8c3e4042eb5e333d4524977ec7f30e6793b33a6a2a70eff1f1c555d7f9f706e2
diff --git a/www-apps/radicale/radicale-2.1.11-r1.ebuild b/www-apps/radicale/radicale-2.1.11-r1.ebuild
index 881d37248fc7..9f8ebc37c38f 100644
--- a/www-apps/radicale/radicale-2.1.11-r1.ebuild
+++ b/www-apps/radicale/radicale-2.1.11-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 eutils user systemd
 
diff --git a/www-apps/rocketwiki-lqfb/Manifest b/www-apps/rocketwiki-lqfb/Manifest
index 0282dcf09b91..2345ab315cd1 100644
--- a/www-apps/rocketwiki-lqfb/Manifest
+++ b/www-apps/rocketwiki-lqfb/Manifest
@@ -1,5 +1,5 @@
 AUX rocketwiki-lqfb-0.4-parsec1.patch 508 BLAKE2B 50310abebefc331c0d430c17bd54001d31d1b15e45fa4352c870ed90c1f6dfa537ed6c4c1ab53950ade38ea69635f806af604c8b5f2ab52c6c99b27a854fbc46 SHA512 f8a71191b153551b4bcdaddc66ebec4be191b9ce125d79d2b02de2758ed96da96cf486e7f7f37bf7b1a7a51c9a95494ffa6d36fd1ff343525d913e1138a96531
 AUX rocketwiki-lqfb-0.4-utf8.patch 1164 BLAKE2B e333d743d213fc84e20565c8ee3041c3293b4cdde85a13455fdb3f9c796a0499356386235cf2a170e485ceaa91a013ea81be8fc9a8eefb90ab767f1c4fb0eef2 SHA512 91a92b8c024ff593092f4e66d9b474c2e24d52ab0277945bc5a95a415f2e2cb23cfb05881cf665e091e9201beef9ac9d14da71138ca09e0db3c6551bd5b77c1b
 DIST rocketwiki-lqfb-v0.4.tar.gz 5274 BLAKE2B f26390e0c238a0c8453ca15417396d87e9a6c3da2bad9bd0d02061ccf083114e83713eed268541bb6f1d04587083cf8cc24454f4719700b34b1e046f8c42e006 SHA512 fa90b317007c42e2e6d36c79773948ab7ab68ee914bd20825e0d5acbb8bf0add2c0a48119440d8a5b4c991f2d1f59bc83a1835b02d9070ae67fca1d4ffb73caf
-EBUILD rocketwiki-lqfb-0.4.ebuild 666 BLAKE2B d9da7a0cb3a5a16901524b605b53c832d692d3450fc4170606d36e3f8e171eaa1b0a36cbd5d7631eccc6cb21915aee52b49198525fbfcc16b39c5bc3ce689126 SHA512 95b8e0709b135ae44f7eda3dd8f995bc50d5ce33391be93c26d7f9d41ca878da09ff2f3c32119131fe6452240f385f147a6c4f503f00c384d0a1b93161681c2e
+EBUILD rocketwiki-lqfb-0.4.ebuild 668 BLAKE2B 4a2b4f7220d423899e0a930c488abfa110ba9e01bffdb2646a7337e742c7757bcf88e82e5d28c068472badb99366de8ef69222a5ba85dd19edf101a6fd83d82b SHA512 dce6f049df7b45b4273e67eee4a27b8376615e21b01e788960e521d85f413af3da2cd738224fa6ab7e4bad13f66c13a1935853c0e1d5396a8b6c84c167e9c6ae
 MISC metadata.xml 502 BLAKE2B ad09da6f3f0555ed6c2ed1f578dbac8f85a6f7a7feba9864ee8d9a591ead254c00c141346085d4f3c71d49944c06a62e822daca11d384ff9a4b0799f1d1820b5 SHA512 f9c4da2ace81b5cf8ce45de2e923ae3ef67bb486c606f6ef2737bc733c27308bf11a653a2fe12f9036d4053eb10e514489aa7fdcc5db363ad043c607c45800d7
diff --git a/www-apps/rocketwiki-lqfb/rocketwiki-lqfb-0.4.ebuild b/www-apps/rocketwiki-lqfb/rocketwiki-lqfb-0.4.ebuild
index a36ffa354471..df87f0a5fa69 100644
--- a/www-apps/rocketwiki-lqfb/rocketwiki-lqfb-0.4.ebuild
+++ b/www-apps/rocketwiki-lqfb/rocketwiki-lqfb-0.4.ebuild
@@ -7,8 +7,8 @@ inherit eutils
 MY_P=${PN}-v${PV}
 
 DESCRIPTION="Small parser which translates a wiki dialect to HTML"
-HOMEPAGE="http://www.public-software-group.org/rocketwiki"
-SRC_URI="http://www.public-software-group.org/pub/projects/rocketwiki/liquid_feedback_edition/v${PV}/${MY_P}.tar.gz"
+HOMEPAGE="https://www.public-software-group.org/rocketwiki"
+SRC_URI="https://www.public-software-group.org/pub/projects/rocketwiki/liquid_feedback_edition/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="HPND"
 SLOT="0"
diff --git a/www-apps/webmcp/Manifest b/www-apps/webmcp/Manifest
index 097bdcf6a78a..e55dcd1d0875 100644
--- a/www-apps/webmcp/Manifest
+++ b/www-apps/webmcp/Manifest
@@ -1,4 +1,4 @@
 AUX webmcp-1.2.6-gentoo.patch 5156 BLAKE2B 4d0680753a83422483c33909b692bc6a0fdd146216889aa83e6a9b99a15bf92920913330de12f2e2125b976214753ec4853b7dd48dabf8c2a0c88fb9b7d1ada5 SHA512 7e57b4f5f32f280198e8c6e01c21ed1414af3bf87a77022af37e3d144576a7d23c9f912e7f41282ef6d984f4323af1dbdda472cfe076fc62a6ee1a47d0529a7c
 DIST webmcp-v1.2.6.tar.gz 132283 BLAKE2B ed5539b91eeb809a1e19b98f2dc8888c055ec547c95c53c0ea9232531bf9b8432ba6a0ad566a1d2fecbdcc056a52e42e99b973741fc44f923ea88369393c5ade SHA512 a233c312f85851c690f9b020e5df1fffb548c708199279021f384a36cf6e2b73a9b7bc2343c886ccc0e18aecf6d205e2a699fa2398b9bf0da587bc4f8a8f8556
-EBUILD webmcp-1.2.6.ebuild 1430 BLAKE2B e25f69e511d1b0bc9349761573fb4617e7daa96435584ba313d2d57e71fce09f3792551b3e95bbe8515a39df9e4531e6e5a60e7494029a3bdd780c61d9cf9684 SHA512 635a9ac44d15293681bb3beda2964bbe6d5e37dd4d0429d03242474b56c45f05f73e7d9b3e305c47c4866abb7d7784e96d5744fe9b08c76fc48156775602fa22
+EBUILD webmcp-1.2.6.ebuild 1432 BLAKE2B 832f15b3399e1cba3d6bd4b02f39d82b9ea84a0faee696ff3aab28d6e7714149233e0e783357b378ee7c80181b09dfc1cccb006e8643a60d28be9bab3602381c SHA512 16ecf95e1b4476cc028d8266f0e6a99f0e21da57b5139037e155acf57d7586d6ae6752210a308023d460e61c77c5aaf6bf988625149f8cbe299a762616d8e4bd
 MISC metadata.xml 821 BLAKE2B a116a4db4b1be4a6a860805b866e735633b1ee8031cc0750e9843c201fe5b1d36657f845d0e9fc1e3871ab091601b85996b4ebd5b224ea1fa6139ffc0e6fd8a2 SHA512 68b0741c84f5a93b26b89e56093b9554727ef375ed77e189cdeb62e12dc0a1b8506b56885be46c637e03b388830467eeac3f11511f49668d74dd36ff15f380e8
diff --git a/www-apps/webmcp/webmcp-1.2.6.ebuild b/www-apps/webmcp/webmcp-1.2.6.ebuild
index a156ac3bbf96..117dd6461db2 100644
--- a/www-apps/webmcp/webmcp-1.2.6.ebuild
+++ b/www-apps/webmcp/webmcp-1.2.6.ebuild
@@ -7,8 +7,8 @@ inherit toolchain-funcs
 
 MY_P=${PN}-v${PV}
 DESCRIPTION="Web application framework written in Lua and C"
-HOMEPAGE="http://www.public-software-group.org/webmcp"
-SRC_URI="http://www.public-software-group.org/pub/projects/${PN}/v${PV}/${MY_P}.tar.gz"
+HOMEPAGE="https://www.public-software-group.org/webmcp"
+SRC_URI="https://www.public-software-group.org/pub/projects/${PN}/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="HPND"
 KEYWORDS="~amd64"
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 90bc61ae4d1d..a1315325c646 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index ea1e57849e58..f83e2bc9e90b 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -20,13 +20,13 @@ AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c2
 AUX chromium-compiler-r12.patch 5680 BLAKE2B e45848b2fff230c87d2f31cd5f6e9aa85bd4fe3f354323728292b145cd1ad9c914c8511f22aa43067f00d1ed4a10b05d4a2f5886c5b26a127c0f3f6ceddf9596 SHA512 7cde27589a708ccea35f2a9b8ebf9280822b8c505dad62cb8ecf1f360670eca4d953b4f2113695eef9f227ab1f368c57fffad489b4eecdeac668f4adf641a8b6
 AUX chromium-fix-char_traits.patch 355 BLAKE2B 5269c43c4d36dc1cd190aedc04e3172fbef0048484ac7e4db15fffd69009c8ba02f0ed786c64b292fbbcd2409ad70545817cd7d45a2cb51fd76bf72250ca0018 SHA512 85ab70f168f56c01e01bdf210d107bebd7c344e95dcb692a19a0f7883ed6aec5325b38c35cd3c9b37c1915820d5e8d401e8ee92c289436fb8bc8341c3c6007a8
 AUX chromium-launcher-r3.sh 1199 BLAKE2B 85f57b380cdc25bd000cf57d3c129b67f6e55d96dd958190040b0680f8d4d358ac777e0c1ebd6a1b32dd3821a377bcf9f598e073584528d0480460978c4c1fb1 SHA512 f1909314ae74985c85740d26c9bfab694f3202de8ccc392a1c4ec5c8760db21b6cc46146c78a9abebd09e6d24f37e19466f0c4d2d61815400b48d859f8ce154d
+AUX chromium-launcher-r4.sh 1608 BLAKE2B 92bb6db1e052a072fe601a1f16d38ab20025d331b135ad29add5fb30a0eb4ab37601ae00b5f07a570ef53eca74a4893cc7a3d579f8ff502a5f40564974a7eeaf SHA512 14008bc9fd1fea333c12d8e13d86b82a261c789ba9a4d98094f724d820263c31a32dd76609386873dc771fd5f87a4e08cd99eb8381dde89c0ff86b606c0d8d83
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
-DIST chromium-83.0.4103.106.tar.xz 802630620 BLAKE2B b145fd04347ef252778c99931d2e6aebc4cb9c3b4340db13ede074ac0631fef3c530b6b8c348ad33576a1da828817a590339206cf941729ee01444350bec1683 SHA512 37d0298ec6794f753bc280352c9ea45d57dd5050240d468fd2a7465b2021ebb598cdc6c4538050dd1d626bcd4a146af87fb837619e08766d38d21821605bd3a8
-DIST chromium-84-patchset-1.tar.xz 17652 BLAKE2B 17008a5d7b81fd9dd3934f815922a10c4b33bd4b3a13b350011d60627133f2179c2e70a6e74ef11ddf9b68b83b988fad3df15e9307f871006ccb7aca52c819da SHA512 2a45183c60794256b150bf67aa8395bab113e77b338775f737ebd8a822fd17be776b786ad12ffa759774a8876e0976a1c285ef90257e9532cfd9952baba7096d
-DIST chromium-84.0.4147.45.tar.xz 845103524 BLAKE2B 8b1e1c052b2ff3968fc4f13215551b9bd53b2fe89f15512d064267e82e71909f267d4f91665b456ad84ec537601e4fbc097eebc45b461f967aa8fe997da2716c SHA512 d43ef067ed855813d3f003cc8f7302d433c924a58ea79bdafa3ec1fe35b4f71a24c4493389563bbc88744ee8fce9b1664c62548e975e0e5a97c823f90aacfe30
+DIST chromium-83.0.4103.116.tar.xz 802626772 BLAKE2B 6890d8f4a4a9b12ab56a63e037129f6b77f03f95a841494505fdbbe212b0dd756e5558bddd7ee186669929c6069568c76b70b179fe4a58ccad465f2d4677d6e5 SHA512 dbd92fb04183ec1402401388f70b18b95040083c9ea8bf2ea6b1692fddc375b090968b13afb010ebf412b480b34747eb2c82709adbeb386cccf60b972f23254f
+DIST chromium-84-patchset-3.tar.xz 20148 BLAKE2B d910570b43f63bcf4ead90ca4e4005a08d7c85b5b4e7af2a70ec4bc18265cbe8b075523878710075cfee4e0631eb3374e1e6d06251f4bf03377954807b1951e9 SHA512 316db8b0359b10a988242a0d665475d912fa9b610a547478d8c39b337afc02780a54d7024e231eb4fd402063cf439f6e2b4bb92a4968c8e0c3e69d84a2ae1664
+DIST chromium-84.0.4147.68.tar.xz 845188784 BLAKE2B a0185a5aacc1297f6240e2d887e980c69ba1219267714fb82c87e2ec31e4a3bee24ea9c059fc4f56dcc5c3e576d0baf5b59ec3576fc266daac583cf2b2917b56 SHA512 c5304dfa76ec9bf1d7e96116b6560b77d636eaa226acf7be46798f4b161c6aba90c54bec797dfbf1e48ece46d4e52e44737ed68457f9b10bbc11658a9020bffd
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
 DIST xcb-proto-1.14.tar.xz 143384 BLAKE2B 60212b0f0ce039a64a2e6cbbc78564eeffc57cff20987b37dc780d8d97ae888a7dbfbbaadc6e0e4bedfc5d1e360f16318e3825ad8406de668d9c7c66cf7f4b5d SHA512 de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690
-EBUILD chromium-83.0.4103.106.ebuild 25699 BLAKE2B 5baae430d54d36f24d2628eff1b79dd0f6b048775ffd2cfeb8db7744af15549ab37621cd54731c48ecc472ab8992eed0bdf32bc07a40adb0c8524e0c5f03b06e SHA512 ff69aea06f90ee39b3612ac2592c2c1d6a1650b639923b60aa7c7162a07f2fa50d68ffdbc43ccf83e109c81d84dbe31103bf7cf221bd2fa168a6c2371690fd59
-EBUILD chromium-84.0.4147.45-r1.ebuild 25561 BLAKE2B 5d52ec638ce4d4c07f4eb475a35a9b6a720321c34815a4c8e58a41f3aeac0f9cdf7caf8e89736e779f1bc5ec8c507a83784969b87155fac9b387083b028df1c0 SHA512 38a7fba0b4017d924dcd69ae329f65b5d167475479a7ba19514ba1833874328b660cbc5dcdd1709cc92692591c13f84e6278b9d807cc3d6094d286d21e5e1a97
-EBUILD chromium-84.0.4147.45.ebuild 25373 BLAKE2B 317630fff497b42d9064e8159121960f58845992858d639b9afd124e827d0f722516f3939d594536a75ef6e851eec78a095b849a1143e34a285d3ac34979e873 SHA512 fe5b3bae665f6af43011f2fedf6d725d35bd2f5ea84e3a3085b3beb22258b4590d9c27415e8945f173a581651a8232a547db162b98723bc194a1f532a1450b25
-MISC metadata.xml 1351 BLAKE2B fb5be12f788385e19aa41ab929c0c0f2744a61cc83b19ed973174cee564043a871f68fadb721ee91d688020aa1daba5fb2bca4535c53630bd88cc0ede527ef53 SHA512 ae812473401017ce399461a829e7182e6e28c56b01c1da926883bd3edf751fa804dc88f429c77a3f533647b2115c960a7bba21572735dcf3d039a6d87fabf51d
+EBUILD chromium-83.0.4103.116.ebuild 25728 BLAKE2B e01916870f7d8d96cd4c3428df2e792f73fcc9440c8924c305ab69f8fd5afa55744e599770104e2837bb1d9367e48dfc281df3a4ac4a660cb73b98b56a0715e4 SHA512 d7b82773af9896b0c1eb718af61765aaf314e5ec9e2ff180f171ec5e9987133034b458b8e8ec5158ed5c4fa1b80665082d4f0245c289bf36738bf7a0c3375beb
+EBUILD chromium-84.0.4147.68.ebuild 26746 BLAKE2B ec9b839ff84ca30a00b6b681a01961bf166fafb06724dae6b389012d26ad00aba1771f965e6256e9a902ecdcc595f3836f524d938e4ef84422c4333cba0cd2ff SHA512 7a2cf68c15284915b88b1b1e9ae6ce05889c3d6f89bda85f8333e119718f7c878fe2d75601919a93afa7e4ddca011effd3c7a61933d3d0a677371864dc0ea551
+MISC metadata.xml 1605 BLAKE2B d582e6df6dd04e61fd59e5886e45730c03f1124b1da141063565efda9a455a0c9b4acd83e579a6b6639e4b6be506bc853bad3c6a24dd06b6f67ae9cd9deed4df SHA512 a1d57bc2236f10d9af56cc9ca30ff9447ea9dfa091c96149dd5dd796e5d9a15116a87f20ecda1da345ede991023377d8e95156feaa0ed6557e5bff9db23bfc01
diff --git a/www-client/chromium/chromium-83.0.4103.106.ebuild b/www-client/chromium/chromium-83.0.4103.106.ebuild
deleted file mode 100644
index 2a4c9b76532c..000000000000
--- a/www-client/chromium/chromium-83.0.4103.106.ebuild
+++ /dev/null
@@ -1,820 +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="https://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
-	https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="+closure-compile component-build cups cpu_flags_arm_neon +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
-	>=dev-libs/libxml2-2.9.4-r3:=[icu]
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	>=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:=
-	media-libs/mesa:=[gbm]
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:=[postproc,svc] )
-	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-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:=
-	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}
-	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
-	app-arch/unzip
-	dev-lang/perl
-	>=dev-util/gn-0.1726
-	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
-	virtual/pkgconfig
-	closure-compile? ( virtual/jre )
-	!system-libvpx? (
-		amd64? ( dev-lang/yasm )
-		x86? ( dev-lang/yasm )
-	)
-"
-
-: ${CHROMIUM_FORCE_CLANG=no}
-: ${CHROMIUM_FORCE_LIBCXX=no}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
-	BDEPEND+=" >=sys-devel/clang-9"
-fi
-
-if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-	RDEPEND+=" >=sys-libs/libcxx-9"
-	DEPEND+=" >=sys-libs/libcxx-9"
-	BDEPEND+="
-		amd64? ( dev-lang/yasm )
-		x86? ( dev-lang/yasm )
-	"
-else
-	COMMON_DEPEND="
-		app-arch/snappy:=
-		dev-libs/libxslt:=
-		>=dev-libs/re2-0.2019.08.01:=
-		>=media-libs/openh264-1.6.0:=
-		system-icu? ( >=dev-libs/icu-67.1:= )
-	"
-	RDEPEND+="${COMMON_DEPEND}"
-	DEPEND+="${COMMON_DEPEND}"
-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.
-
-To make password storage work with your desktop environment you may
-have install one of the supported credentials management applications:
-- app-crypt/libsecret (GNOME)
-- kde-frameworks/kwallet (KDE)
-If you have one of above packages installed, but don't want to use
-them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
-in /etc/chromium/default.
-"
-
-PATCHES=(
-	"${FILESDIR}/chromium-compiler-r12.patch"
-	"${FILESDIR}/chromium-fix-char_traits.patch"
-	"${FILESDIR}/chromium-blink-style_format.patch"
-	"${FILESDIR}/chromium-78-protobuf-export.patch"
-	"${FILESDIR}/chromium-79-gcc-alignas.patch"
-	"${FILESDIR}/chromium-80-gcc-quiche.patch"
-	"${FILESDIR}/chromium-82-gcc-noexcept.patch"
-	"${FILESDIR}/chromium-82-gcc-incomplete-type.patch"
-	"${FILESDIR}/chromium-82-gcc-template.patch"
-	"${FILESDIR}/chromium-82-gcc-iterator.patch"
-	"${FILESDIR}/chromium-83-gcc-template.patch"
-	"${FILESDIR}/chromium-83-gcc-include.patch"
-	"${FILESDIR}/chromium-83-gcc-permissive.patch"
-	"${FILESDIR}/chromium-83-gcc-iterator.patch"
-	"${FILESDIR}/chromium-83-gcc-serviceworker.patch"
-	"${FILESDIR}/chromium-83-gcc-compatibility.patch"
-	"${FILESDIR}/chromium-83-gcc-10.patch"
-	"${FILESDIR}/chromium-83-icu67.patch"
-	"${FILESDIR}/chromium-81-re2-0.2020.05.01.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
-		if use custom-cflags || use component-build; then
-			CHECKREQS_DISK_BUILD="25G"
-		fi
-		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/lighthouse
-		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/harfbuzz-ng/utils
-		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/mako
-		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/schema_org
-		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/astc-encoder
-		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 )
-
-		# we need to generate ppc64 stuff because upstream does not ship it yet
-		# it has to be done before unbundling.
-		if use ppc64; then
-			pushd third_party/libvpx >/dev/null || die
-			mkdir -p source/config/linux/ppc64 || die
-			./generate_gni.sh || die
-			popd >/dev/null || die
-		fi
-	fi
-	if use tcmalloc; then
-		keeplibs+=( third_party/tcmalloc )
-	fi
-	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-		keeplibs+=( third_party/libxml )
-		keeplibs+=( third_party/libxslt )
-		keeplibs+=( third_party/openh264 )
-		keeplibs+=( third_party/re2 )
-		keeplibs+=( third_party/snappy )
-		if use system-icu; then
-			keeplibs+=( third_party/icu )
-		fi
-	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
-		if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-			die "Compiling with sys-libs/libcxx requires clang."
-		fi
-		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
-		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
-	if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
-		# unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++
-		gn_system_libraries+=( libxml )
-		gn_system_libraries+=( libxslt )
-		gn_system_libraries+=( openh264 )
-		gn_system_libraries+=( re2 )
-		gn_system_libraries+=( snappy )
-	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"
-
-	# Disable deprecated libgnome-keyring dependency, bug #713012
-	myconf_gn+=" use_gnome_keyring=false"
-
-	# 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_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
-
-		# Debug info section overflows without component build
-		# Prevent linker from running out of address space, bug #471810 .
-		if ! use component-build || 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 -mno-fma -mno-fma4
-		fi
-	fi
-
-	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-		append-flags -stdlib=libc++
-		append-ldflags -stdlib=libc++
-	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)
-	elif [[ $myarch = ppc64 ]] ; then
-		myconf_gn+=" target_cpu=\"ppc64\""
-		ffmpeg_target_arch=ppc64
-	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
-
-	# https://bugs.gentoo.org/717456
-	local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0${PYTHONPATH+:}${PYTHONPATH}"
-
-	#"${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-83.0.4103.116.ebuild b/www-client/chromium/chromium-83.0.4103.116.ebuild
new file mode 100644
index 000000000000..db11978df3cb
--- /dev/null
+++ b/www-client/chromium/chromium-83.0.4103.116.ebuild
@@ -0,0 +1,821 @@
+# 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="https://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
+	https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~x86"
+IUSE="+closure-compile component-build cups cpu_flags_arm_neon +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
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	>=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:=
+	media-libs/mesa:=[gbm]
+	system-libvpx? ( >=media-libs/libvpx-1.8.2:=[postproc,svc] )
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? (
+		>=media-video/ffmpeg-4:0
+		<media-video/ffmpeg-4.3:0=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		>=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:=
+	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}
+	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
+	app-arch/unzip
+	dev-lang/perl
+	>=dev-util/gn-0.1726
+	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
+	virtual/pkgconfig
+	closure-compile? ( virtual/jre )
+	!system-libvpx? (
+		amd64? ( dev-lang/yasm )
+		x86? ( dev-lang/yasm )
+	)
+"
+
+: ${CHROMIUM_FORCE_CLANG=no}
+: ${CHROMIUM_FORCE_LIBCXX=no}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	BDEPEND+=" >=sys-devel/clang-9"
+fi
+
+if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+	RDEPEND+=" >=sys-libs/libcxx-9"
+	DEPEND+=" >=sys-libs/libcxx-9"
+	BDEPEND+="
+		amd64? ( dev-lang/yasm )
+		x86? ( dev-lang/yasm )
+	"
+else
+	COMMON_DEPEND="
+		app-arch/snappy:=
+		dev-libs/libxslt:=
+		>=dev-libs/re2-0.2019.08.01:=
+		>=media-libs/openh264-1.6.0:=
+		system-icu? ( >=dev-libs/icu-67.1:= )
+	"
+	RDEPEND+="${COMMON_DEPEND}"
+	DEPEND+="${COMMON_DEPEND}"
+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.
+
+To make password storage work with your desktop environment you may
+have install one of the supported credentials management applications:
+- app-crypt/libsecret (GNOME)
+- kde-frameworks/kwallet (KDE)
+If you have one of above packages installed, but don't want to use
+them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
+in /etc/chromium/default.
+"
+
+PATCHES=(
+	"${FILESDIR}/chromium-compiler-r12.patch"
+	"${FILESDIR}/chromium-fix-char_traits.patch"
+	"${FILESDIR}/chromium-blink-style_format.patch"
+	"${FILESDIR}/chromium-78-protobuf-export.patch"
+	"${FILESDIR}/chromium-79-gcc-alignas.patch"
+	"${FILESDIR}/chromium-80-gcc-quiche.patch"
+	"${FILESDIR}/chromium-82-gcc-noexcept.patch"
+	"${FILESDIR}/chromium-82-gcc-incomplete-type.patch"
+	"${FILESDIR}/chromium-82-gcc-template.patch"
+	"${FILESDIR}/chromium-82-gcc-iterator.patch"
+	"${FILESDIR}/chromium-83-gcc-template.patch"
+	"${FILESDIR}/chromium-83-gcc-include.patch"
+	"${FILESDIR}/chromium-83-gcc-permissive.patch"
+	"${FILESDIR}/chromium-83-gcc-iterator.patch"
+	"${FILESDIR}/chromium-83-gcc-serviceworker.patch"
+	"${FILESDIR}/chromium-83-gcc-compatibility.patch"
+	"${FILESDIR}/chromium-83-gcc-10.patch"
+	"${FILESDIR}/chromium-83-icu67.patch"
+	"${FILESDIR}/chromium-81-re2-0.2020.05.01.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
+		if use custom-cflags || use component-build; then
+			CHECKREQS_DISK_BUILD="25G"
+		fi
+		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/lighthouse
+		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/harfbuzz-ng/utils
+		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/mako
+		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/schema_org
+		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/astc-encoder
+		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 )
+
+		# we need to generate ppc64 stuff because upstream does not ship it yet
+		# it has to be done before unbundling.
+		if use ppc64; then
+			pushd third_party/libvpx >/dev/null || die
+			mkdir -p source/config/linux/ppc64 || die
+			./generate_gni.sh || die
+			popd >/dev/null || die
+		fi
+	fi
+	if use tcmalloc; then
+		keeplibs+=( third_party/tcmalloc )
+	fi
+	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		keeplibs+=( third_party/libxml )
+		keeplibs+=( third_party/libxslt )
+		keeplibs+=( third_party/openh264 )
+		keeplibs+=( third_party/re2 )
+		keeplibs+=( third_party/snappy )
+		if use system-icu; then
+			keeplibs+=( third_party/icu )
+		fi
+	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
+		if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+			die "Compiling with sys-libs/libcxx requires clang."
+		fi
+		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
+		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
+	if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
+		# unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++
+		gn_system_libraries+=( libxml )
+		gn_system_libraries+=( libxslt )
+		gn_system_libraries+=( openh264 )
+		gn_system_libraries+=( re2 )
+		gn_system_libraries+=( snappy )
+	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"
+
+	# Disable deprecated libgnome-keyring dependency, bug #713012
+	myconf_gn+=" use_gnome_keyring=false"
+
+	# 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_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
+
+		# Debug info section overflows without component build
+		# Prevent linker from running out of address space, bug #471810 .
+		if ! use component-build || 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 -mno-fma -mno-fma4
+		fi
+	fi
+
+	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		append-flags -stdlib=libc++
+		append-ldflags -stdlib=libc++
+	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)
+	elif [[ $myarch = ppc64 ]] ; then
+		myconf_gn+=" target_cpu=\"ppc64\""
+		ffmpeg_target_arch=ppc64
+	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
+
+	# https://bugs.gentoo.org/717456
+	local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0${PYTHONPATH+:}${PYTHONPATH}"
+
+	#"${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-84.0.4147.45-r1.ebuild b/www-client/chromium/chromium-84.0.4147.45-r1.ebuild
deleted file mode 100644
index 966c8a05a06d..000000000000
--- a/www-client/chromium/chromium-84.0.4147.45-r1.ebuild
+++ /dev/null
@@ -1,808 +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="https://chromium.org/"
-XCB_PROTO_VERSION="1.14"
-PATCHSET="1"
-PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
-	https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip
-	https://www.x.org/releases/individual/proto/xcb-proto-${XCB_PROTO_VERSION}.tar.xz
-	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+closure-compile component-build cups cpu_flags_arm_neon +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
-	>=dev-libs/libxml2-2.9.4-r3:=[icu]
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	>=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:=
-	media-libs/mesa:=[gbm]
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:=[postproc,svc] )
-	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-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:=
-	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}
-	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
-	app-arch/unzip
-	dev-lang/perl
-	>=dev-util/gn-0.1726
-	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
-	virtual/pkgconfig
-	closure-compile? ( virtual/jre )
-"
-
-: ${CHROMIUM_FORCE_CLANG=no}
-: ${CHROMIUM_FORCE_LIBCXX=no}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
-	BDEPEND+=" >=sys-devel/clang-9"
-fi
-
-if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-	RDEPEND+=" >=sys-libs/libcxx-9"
-	DEPEND+=" >=sys-libs/libcxx-9"
-else
-	COMMON_DEPEND="
-		app-arch/snappy:=
-		dev-libs/libxslt:=
-		>=dev-libs/re2-0.2019.08.01:=
-		>=media-libs/openh264-1.6.0:=
-		system-icu? ( >=dev-libs/icu-67.1:= )
-	"
-	RDEPEND+="${COMMON_DEPEND}"
-	DEPEND+="${COMMON_DEPEND}"
-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.
-
-To make password storage work with your desktop environment you may
-have install one of the supported credentials management applications:
-- app-crypt/libsecret (GNOME)
-- kde-frameworks/kwallet (KDE)
-If you have one of above packages installed, but don't want to use
-them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
-in /etc/chromium/default.
-"
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
-			die "At least gcc 9.2 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
-		if use custom-cflags || use component-build; then
-			CHECKREQS_DISK_BUILD="25G"
-		fi
-		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
-
-	eapply "${WORKDIR}/patches"
-	eapply "${FILESDIR}"/chromium-84-mediaalloc.patch
-
-	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/acorn
-		third_party/devtools-frontend/src/front_end/third_party/codemirror
-		third_party/devtools-frontend/src/front_end/third_party/fabricjs
-		third_party/devtools-frontend/src/front_end/third_party/lighthouse
-		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/harfbuzz-ng/utils
-		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/libavif
-		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/lottie
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/mako
-		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/mozilla
-		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/schema_org
-		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/astc-encoder
-		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/ooura
-		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
-	)
-	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 )
-
-		# we need to generate ppc64 stuff because upstream does not ship it yet
-		# it has to be done before unbundling.
-		if use ppc64; then
-			pushd third_party/libvpx >/dev/null || die
-			mkdir -p source/config/linux/ppc64 || die
-			./generate_gni.sh || die
-			popd >/dev/null || die
-		fi
-	fi
-	if use tcmalloc; then
-		keeplibs+=( third_party/tcmalloc )
-	fi
-	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-		keeplibs+=( third_party/libxml )
-		keeplibs+=( third_party/libxslt )
-		keeplibs+=( third_party/openh264 )
-		keeplibs+=( third_party/re2 )
-		keeplibs+=( third_party/snappy )
-		if use system-icu; then
-			keeplibs+=( third_party/icu )
-		fi
-	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
-		if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-			die "Compiling with sys-libs/libcxx requires clang."
-		fi
-		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
-		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
-	if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
-		# unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++
-		gn_system_libraries+=( libxml )
-		gn_system_libraries+=( libxslt )
-		gn_system_libraries+=( openh264 )
-		gn_system_libraries+=( re2 )
-		gn_system_libraries+=( snappy )
-	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"
-
-	# Disable deprecated libgnome-keyring dependency, bug #713012
-	myconf_gn+=" use_gnome_keyring=false"
-
-	# 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_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 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
-
-		# Debug info section overflows without component build
-		# Prevent linker from running out of address space, bug #471810 .
-		if ! use component-build || 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 -mno-fma -mno-fma4
-		fi
-	fi
-
-	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-		append-flags -stdlib=libc++
-		append-ldflags -stdlib=libc++
-	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)
-	elif [[ $myarch = ppc64 ]] ; then
-		myconf_gn+=" target_cpu=\"ppc64\""
-		ffmpeg_target_arch=ppc64
-	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)
-
-	# Silence lots of GCC warnings upstream doesn't seem to care about
-	append-cxxflags -Wno-invalid-offsetof -Wno-attributes -Wno-pragmas
-
-	# Explicitly disable ICU data file support for system-icu builds.
-	if use system-icu; then
-		myconf_gn+=" icu_use_data_file=false"
-	fi
-
-	# Use bundled xcb-proto, bug #727000
-	myconf_gn+=" xcbproto_path=\"${WORKDIR}/xcb-proto-${XCB_PROTO_VERSION}/src\""
-
-	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
-
-	# https://bugs.gentoo.org/717456
-	# Use bundled xcb-proto, because system xcb-proto doesn't have Python 2.7 support
-	local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0:${WORKDIR}/xcb-proto-${XCB_PROTO_VERSION}${PYTHONPATH+:}${PYTHONPATH}"
-
-	#"${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-84.0.4147.45.ebuild b/www-client/chromium/chromium-84.0.4147.45.ebuild
deleted file mode 100644
index d50cafdca25e..000000000000
--- a/www-client/chromium/chromium-84.0.4147.45.ebuild
+++ /dev/null
@@ -1,804 +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="https://chromium.org/"
-XCB_PROTO_VERSION="1.14"
-PATCHSET="1"
-PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
-	https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip
-	https://www.x.org/releases/individual/proto/xcb-proto-${XCB_PROTO_VERSION}.tar.xz
-	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+closure-compile component-build cups cpu_flags_arm_neon +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
-	>=dev-libs/libxml2-2.9.4-r3:=[icu]
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	>=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:=
-	media-libs/mesa:=[gbm]
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:=[postproc,svc] )
-	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-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:=
-	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}
-	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
-	app-arch/unzip
-	dev-lang/perl
-	>=dev-util/gn-0.1726
-	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
-	virtual/pkgconfig
-	closure-compile? ( virtual/jre )
-"
-
-: ${CHROMIUM_FORCE_CLANG=no}
-: ${CHROMIUM_FORCE_LIBCXX=no}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
-	BDEPEND+=" >=sys-devel/clang-9"
-fi
-
-if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-	RDEPEND+=" >=sys-libs/libcxx-9"
-	DEPEND+=" >=sys-libs/libcxx-9"
-else
-	COMMON_DEPEND="
-		app-arch/snappy:=
-		dev-libs/libxslt:=
-		>=dev-libs/re2-0.2019.08.01:=
-		>=media-libs/openh264-1.6.0:=
-		system-icu? ( >=dev-libs/icu-67.1:= )
-	"
-	RDEPEND+="${COMMON_DEPEND}"
-	DEPEND+="${COMMON_DEPEND}"
-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.
-
-To make password storage work with your desktop environment you may
-have install one of the supported credentials management applications:
-- app-crypt/libsecret (GNOME)
-- kde-frameworks/kwallet (KDE)
-If you have one of above packages installed, but don't want to use
-them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
-in /etc/chromium/default.
-"
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
-			die "At least gcc 9.2 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
-		if use custom-cflags || use component-build; then
-			CHECKREQS_DISK_BUILD="25G"
-		fi
-		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
-
-	eapply "${WORKDIR}/patches"
-
-	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/acorn
-		third_party/devtools-frontend/src/front_end/third_party/codemirror
-		third_party/devtools-frontend/src/front_end/third_party/fabricjs
-		third_party/devtools-frontend/src/front_end/third_party/lighthouse
-		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/harfbuzz-ng/utils
-		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/libavif
-		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/lottie
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/mako
-		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/mozilla
-		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/schema_org
-		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/astc-encoder
-		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/ooura
-		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
-	)
-	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 )
-
-		# we need to generate ppc64 stuff because upstream does not ship it yet
-		# it has to be done before unbundling.
-		if use ppc64; then
-			pushd third_party/libvpx >/dev/null || die
-			mkdir -p source/config/linux/ppc64 || die
-			./generate_gni.sh || die
-			popd >/dev/null || die
-		fi
-	fi
-	if use tcmalloc; then
-		keeplibs+=( third_party/tcmalloc )
-	fi
-	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-		keeplibs+=( third_party/libxml )
-		keeplibs+=( third_party/libxslt )
-		keeplibs+=( third_party/openh264 )
-		keeplibs+=( third_party/re2 )
-		keeplibs+=( third_party/snappy )
-		if use system-icu; then
-			keeplibs+=( third_party/icu )
-		fi
-	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
-		if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-			die "Compiling with sys-libs/libcxx requires clang."
-		fi
-		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
-		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
-	if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
-		# unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++
-		gn_system_libraries+=( libxml )
-		gn_system_libraries+=( libxslt )
-		gn_system_libraries+=( openh264 )
-		gn_system_libraries+=( re2 )
-		gn_system_libraries+=( snappy )
-	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"
-
-	# Disable deprecated libgnome-keyring dependency, bug #713012
-	myconf_gn+=" use_gnome_keyring=false"
-
-	# 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_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 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
-
-		# Debug info section overflows without component build
-		# Prevent linker from running out of address space, bug #471810 .
-		if ! use component-build || 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 -mno-fma -mno-fma4
-		fi
-	fi
-
-	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-		append-flags -stdlib=libc++
-		append-ldflags -stdlib=libc++
-	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)
-	elif [[ $myarch = ppc64 ]] ; then
-		myconf_gn+=" target_cpu=\"ppc64\""
-		ffmpeg_target_arch=ppc64
-	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
-
-	# Use bundled xcb-proto, bug #727000
-	myconf_gn+=" xcbproto_path=\"${WORKDIR}/xcb-proto-${XCB_PROTO_VERSION}/src\""
-
-	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
-
-	# https://bugs.gentoo.org/717456
-	# Use bundled xcb-proto, because system xcb-proto doesn't have Python 2.7 support
-	local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0:${WORKDIR}/xcb-proto-${XCB_PROTO_VERSION}${PYTHONPATH+:}${PYTHONPATH}"
-
-	#"${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-84.0.4147.68.ebuild b/www-client/chromium/chromium-84.0.4147.68.ebuild
new file mode 100644
index 000000000000..6f26ac56db27
--- /dev/null
+++ b/www-client/chromium/chromium-84.0.4147.68.ebuild
@@ -0,0 +1,864 @@
+# 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="https://chromium.org/"
+XCB_PROTO_VERSION="1.14"
+PATCHSET="3"
+PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
+	https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip
+	https://www.x.org/releases/individual/proto/xcb-proto-${XCB_PROTO_VERSION}.tar.xz
+	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+closure-compile component-build cups cpu_flags_arm_neon +hangouts headless kerberos ozone pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc wayland widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+REQUIRED_USE="
+	component-build? ( !suid )
+	wayland? ( ozone )
+"
+
+COMMON_X_DEPEND="
+	media-libs/mesa:=[gbm]
+	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/libXtst:=
+	x11-libs/libxcb:=
+"
+
+COMMON_DEPEND="
+	app-arch/bzip2:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	dev-libs/expat:=
+	dev-libs/glib:2
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	>=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-1.8.2:=[postproc,svc] )
+	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-1.3.1:=
+	)
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango:=
+	media-libs/flac:=
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+	ozone? (
+		!headless? (
+			${COMMON_X_DEPEND}
+			x11-libs/gtk+:3[wayland?,X]
+			wayland? (
+				dev-libs/wayland:=
+				dev-libs/libffi:=
+				x11-libs/libdrm:=
+				x11-libs/libxkbcommon:=
+			)
+		)
+	)
+	!ozone? (
+		>=app-accessibility/at-spi2-atk-2.26:2
+		>=app-accessibility/at-spi2-core-2.26:2
+		>=dev-libs/atk-2.26
+		x11-libs/gtk+:3[X]
+		x11-libs/libXScrnSaver:=
+		${COMMON_X_DEPEND}
+	)
+"
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND="${COMMON_DEPEND}
+	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
+	app-arch/unzip
+	dev-lang/perl
+	>=dev-util/gn-0.1726
+	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
+	virtual/pkgconfig
+	closure-compile? ( virtual/jre )
+"
+
+: ${CHROMIUM_FORCE_CLANG=no}
+: ${CHROMIUM_FORCE_LIBCXX=no}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	BDEPEND+=" >=sys-devel/clang-9"
+fi
+
+if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+	RDEPEND+=" >=sys-libs/libcxx-9"
+	DEPEND+=" >=sys-libs/libcxx-9"
+else
+	COMMON_DEPEND="
+		app-arch/snappy:=
+		dev-libs/libxslt:=
+		>=dev-libs/re2-0.2019.08.01:=
+		>=media-libs/openh264-1.6.0:=
+		system-icu? ( >=dev-libs/icu-67.1:= )
+	"
+	RDEPEND+="${COMMON_DEPEND}"
+	DEPEND+="${COMMON_DEPEND}"
+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.
+
+To make password storage work with your desktop environment you may
+have install one of the supported credentials management applications:
+- app-crypt/libsecret (GNOME)
+- kde-frameworks/kwallet (KDE)
+If you have one of above packages installed, but don't want to use
+them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
+in /etc/chromium/default.
+"
+
+PATCHES=(
+	"${FILESDIR}/chromium-84-mediaalloc.patch"
+)
+
+pre_build_checks() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
+			die "At least gcc 9.2 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
+		if use custom-cflags || use component-build; then
+			CHECKREQS_DISK_BUILD="25G"
+		fi
+		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
+
+	eapply "${WORKDIR}/patches"
+
+	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/acorn
+		third_party/devtools-frontend/src/front_end/third_party/codemirror
+		third_party/devtools-frontend/src/front_end/third_party/fabricjs
+		third_party/devtools-frontend/src/front_end/third_party/lighthouse
+		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/harfbuzz-ng/utils
+		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/libavif
+		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/lottie
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/mako
+		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/mozilla
+		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/schema_org
+		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/astc-encoder
+		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/ooura
+		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
+	)
+	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 )
+
+		# we need to generate ppc64 stuff because upstream does not ship it yet
+		# it has to be done before unbundling.
+		if use ppc64; then
+			pushd third_party/libvpx >/dev/null || die
+			mkdir -p source/config/linux/ppc64 || die
+			./generate_gni.sh || die
+			popd >/dev/null || die
+		fi
+	fi
+	if use tcmalloc; then
+		keeplibs+=( third_party/tcmalloc )
+	fi
+	if use ozone && use wayland && ! use headless ; then
+		keeplibs+=( third_party/wayland )
+	fi
+	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		keeplibs+=( third_party/libxml )
+		keeplibs+=( third_party/libxslt )
+		keeplibs+=( third_party/openh264 )
+		keeplibs+=( third_party/re2 )
+		keeplibs+=( third_party/snappy )
+		if use system-icu; then
+			keeplibs+=( third_party/icu )
+		fi
+	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
+		if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+			die "Compiling with sys-libs/libcxx requires clang."
+		fi
+		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
+		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
+	if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
+		# unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++
+		gn_system_libraries+=( libxml )
+		gn_system_libraries+=( libxslt )
+		gn_system_libraries+=( openh264 )
+		gn_system_libraries+=( re2 )
+		gn_system_libraries+=( snappy )
+	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"
+
+	# Disable deprecated libgnome-keyring dependency, bug #713012
+	myconf_gn+=" use_gnome_keyring=false"
+
+	# 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_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 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
+
+		# Debug info section overflows without component build
+		# Prevent linker from running out of address space, bug #471810 .
+		if ! use component-build || 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 -mno-fma -mno-fma4
+		fi
+	fi
+
+	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		append-flags -stdlib=libc++
+		append-ldflags -stdlib=libc++
+	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)
+	elif [[ $myarch = ppc64 ]] ; then
+		myconf_gn+=" target_cpu=\"ppc64\""
+		ffmpeg_target_arch=ppc64
+	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
+
+	# Use bundled xcb-proto, bug #727000
+	myconf_gn+=" xcbproto_path=\"${WORKDIR}/xcb-proto-${XCB_PROTO_VERSION}/src\""
+
+	# Enable ozone support
+	if use ozone; then
+		myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
+		myconf_gn+=" ozone_platform_headless=true"
+		if ! use headless; then
+			myconf_gn+=" use_system_libdrm=true"
+			myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
+			myconf_gn+=" ozone_platform_x11=true"
+			myconf_gn+=" ozone_platform_headless=true"
+			if use wayland; then
+				myconf_gn+=" use_system_minigbm=true use_xkbcommon=true"
+				myconf_gn+=" ozone_platform=\"wayland\""
+			else
+				myconf_gn+=" ozone_platform=\"x11\""
+			fi
+		else
+			myconf_gn+=" ozone_platform=\"headless\""
+		fi
+	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
+
+	# https://bugs.gentoo.org/717456
+	# Use bundled xcb-proto, because system xcb-proto doesn't have Python 2.7 support
+	local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0:${WORKDIR}/xcb-proto-${XCB_PROTO_VERSION}${PYTHONPATH+:}${PYTHONPATH}"
+
+	#"${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
+
+	ozone_auto_session () {
+		use ozone && use wayland && ! use headless && echo true || echo false
+	}
+	local sedargs=( -e
+			"s:/usr/lib/:/usr/$(get_libdir)/:g;
+			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
+	)
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r4.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
+	(
+		shopt -s nullglob
+		local files=(out/Release/*.so)
+		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
+	)
+
+	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-launcher-r4.sh b/www-client/chromium/files/chromium-launcher-r4.sh
new file mode 100644
index 000000000000..cb1e9f548b35
--- /dev/null
+++ b/www-client/chromium/files/chromium-launcher-r4.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# Allow the user to override command-line flags, bug #357629.
+# This is based on Debian's chromium-browser package, and is intended
+# to be consistent with Debian.
+for f in /etc/chromium/*; do
+    [[ -f ${f} ]] && source "${f}"
+done
+
+# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system
+# default CHROMIUM_FLAGS (from /etc/chromium/default).
+CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-"$CHROMIUM_FLAGS"}
+
+# Let the wrapped binary know that it has been run through the wrapper
+export CHROME_WRAPPER=$(readlink -f "$0")
+
+PROGDIR=${CHROME_WRAPPER%/*}
+
+case ":$PATH:" in
+  *:$PROGDIR:*)
+    # $PATH already contains $PROGDIR
+    ;;
+  *)
+    # Append $PROGDIR to $PATH
+    export PATH="$PATH:$PROGDIR"
+    ;;
+esac
+
+if [[ ${EUID} == 0 && -O ${XDG_CONFIG_HOME:-${HOME}} ]]; then
+	# Running as root with HOME owned by root.
+	# Pass --user-data-dir to work around upstream failsafe.
+	CHROMIUM_FLAGS="--user-data-dir=${XDG_CONFIG_HOME:-${HOME}/.config}/chromium
+		${CHROMIUM_FLAGS}"
+fi
+
+# Select session type
+if @@OZONE_AUTO_SESSION@@; then
+    if [[ -z ${XDG_SESSION_TYPE+x} ]]; then
+        if [[ -z ${WAYLAND_DISPLAY+x} ]]; then
+            CHROMIUM_FLAGS="--ozone-platform=x11 ${CHROMIUM_FLAGS}"
+        else
+            CHROMIUM_FLAGS="--ozone-platform=wayland ${CHROMIUM_FLAGS}"
+        fi
+    else
+        CHROMIUM_FLAGS="--ozone-platform=${XDG_SESSION_TYPE} ${CHROMIUM_FLAGS}"
+    fi
+fi
+
+# Set the .desktop file name
+export CHROME_DESKTOP="chromium-browser-chromium.desktop"
+
+exec -a "chromium-browser" "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins ${CHROMIUM_FLAGS} "$@"
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml
index c54bc9ef3515..4be3cc808730 100644
--- a/www-client/chromium/metadata.xml
+++ b/www-client/chromium/metadata.xml
@@ -8,7 +8,9 @@
 	<use>
 		<flag name="closure-compile">Enable closure type-checking for Chrome's web technology-based UI. Requires Java.</flag>
 		<flag name="component-build">Split build into more shared libraries to speed up linking. Mostly intended for debugging and development, NOT RECOMMENDED for general use.</flag>
+		<flag name="headless">Build Ozone only with headless backend, NOT RECOMMENDED for general use.</flag>
 		<flag name="hangouts">Enable support for Google Hangouts features such as screen sharing</flag>
+		<flag name="ozone">Enable Ozone platform abstraction layer with X11 backend.</flag>
 		<flag name="pic">Disable optimized assembly code that is not PIC friendly</flag>
 		<flag name="proprietary-codecs">Enable proprietary codecs like H.264, MP3</flag>
 		<flag name="suid">Build the SUID sandbox, which is only needed on CONFIG_USER_NS=n kernels</flag>
@@ -16,6 +18,7 @@
 		<flag name="system-icu">Use system icu instead of the bundled one</flag>
 		<flag name="system-libvpx">Use system libvpx instead of the bundled one</flag>
 		<flag name="tcmalloc">Use bundled tcmalloc instead of system malloc</flag>
+		<flag name="wayland">Enable Wayland backend for Ozone.</flag>
 		<flag name="widevine">Unsupported closed-source DRM capability (required by Netflix VOD)</flag>
 	</use>
 </pkgmetadata>
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index 8767ac132c6c..8c0a98cab2d7 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,11 +1,9 @@
-AUX elinks-0.10.4.conf-syscharset.diff 2584 BLAKE2B a56369026802030871418033898896a1d4c940f74d73c90bb0a39dfe183f250437d4c3fe696696a83f63b51d0e1ce825754949b0e3b0588daf49997c419326fc SHA512 bed691b24adf7aa408af01e3a0a905946f9fe95cc5ded7e1448d9159ef7777bc2df1c3ef37c5498fc0f64bc59df80493fc42076bafa708c80ef5cba78e8bca9c
 AUX elinks-0.11.2-lua-5.1.patch 538 BLAKE2B 10650f042c2a074fcd6a6c3c0b481b096b4d23d530f5a7c59bbc1687f83dde1286eaa6aebc37d6a1ea2e93d3d15287e916ef6abe2d1681678a4beba87cfd07d3 SHA512 48aca9662b3d9b43ba027d2328acdafe6363f3e2a69e6f2a6d468718c28f12de6247c629273a11aef0b053010a7b7250c03db39fab1cb4cd6d237bd1c69fccef
 AUX elinks-0.12_pre5-compilation-fix.patch 464 BLAKE2B 977e4ce921ab0e8593427d2822d2a209124fc3d2d20e093adc362c6c6b4421f86571625f81690aa7a8383431519264cf195d2cec5efb99f95691518606108204 SHA512 7c1232f4f15579f8073cdea7397e4a34d5bec51268eb61cdff854f221615b027c385b81871e7b5fbefeda1ddf5de3008719724b9853798bc198866a25c8840fe
 AUX elinks-0.12_pre5-libressl.patch 845 BLAKE2B 62b77fb6280618a6fc473cdd55a9c74fb2995f1b80d13660141c4be765fbe67838e3a067c833a8eb9f61e30858d1e29245acebc42d378f4fac5fafa659b1ac38 SHA512 7cf844e5f62abc20b9fffd29c82a786504db4e645a794b98238ea7157db1fe8bfc3e4c211c674ff182aa5d540350b2c8cae34a61891dc79afa1e2525448b747a
 AUX elinks-0.12_pre5-rand-egd.patch 738 BLAKE2B fb76450867476e21dbad27633d313359dc6d641a4e705d4308faf2d79a9c3fd923b6f9b47701af4d67b7e28b67c0b477d40ead617ff8e3041394b3163315cf5c SHA512 7d23496380658f102d933a1722313d1b0396afb0b349260cb7cf735baec4edd08cb5ad363880d6bb95ef67e46770daa8b4aa57116a53ec36762db05a58ed09ff
 AUX elinks-0.12_pre5-ruby-1.9.patch 7131 BLAKE2B 5b65d975982986e85ae2f9f8a1a6ac96a49bbdbaaba23bc9bfb93c8b9a5ef3bf380a0752dd1c36b76772d7abd8cf0b37de4731ad4bd77d256749030bd22b8b0e SHA512 41f8b34f9666740fbadffc4e47467670c7766f3b8612933a08cc6febe975f9453c21c393a43927c11ffe7ef6e0875ef09e125c80e84caa9f0917f864cb1d35e6
 AUX elinks-0.12_pre5-sm185-jsval-fixes.patch 3921 BLAKE2B 133785ebccfcdcebf8f3ada684786f0b55109e46332115238b12aff92404f587186e7c1a434d004ae43df434f8cfb283c4746d6bf91d1b00556b06ebfd4ceab7 SHA512 62a96d53b529c409d81094899c75cd7943176628e2b7301a005c6ebf9f660e813fbf1f3df213c43148d425e933208f761090b23b6ae75da93a93b13a1e924a34
-AUX elinks-0.12pre5-spidermonkey-callback.patch 513 BLAKE2B 493b1fa0b6d86a7c9ec26935a44e8e268065c47dc27a37ec4d6d6c7da8d65720d489bbf1070b92215656c9715ac09cb21691259715d8be53c7a3acd631e759b1 SHA512 81a2397b90531db291526fed738fd3661362c3d20c4bc330f909375cea3779f32f4286c8c43700bf7c19d6eb177e97acb3c32f15abba052651ee5b947f3bec43
 AUX elinks-0.13-ruby.patch 6679 BLAKE2B aac1923c2115743fd29d94e67af069857e03896d5e970297ba84c250f3eef54df24324975639de14a732e84897d21637397b85eb4346dc005d99a252943718cf SHA512 df93eb589fb6d30bdc4ffac8c44a5b1f4db7565d7221f9aa1edb07809cb5ada0797f6a2128bb5c0083134fa2b58ef62a157e7aad32751821f87e15f5760e34ac
 AUX elinks-9999-parallel-make.patch 1620 BLAKE2B d3b345813b9c9c82a93f2709036d9ae63f8014b6ff50d96f5534d1c08a0eaf73825da5cf1605d8a0997c6bd659b621b8f174a555f1adc026823fd2f87196eadb SHA512 bdd612c1ce226115170e97d70519b5ec4816d8469e0cd31ec66000b603c92913645f2b57eca9f030b90af811e43db5647928d27f7bc3a8c06560be40a8063248
 DIST elinks-0.12_pre5-js185-patches.tar.bz2 13820 BLAKE2B b850c66cc74d59c6cfb0c7c6ebaaddfe0706e8cdcc14b1df5232ba2b3c75bf632e3b3e398b200876d7e594b122c6b27227ca92729129ef955174b05e7f0e6a06 SHA512 1552aeacdecb0a2db357402e0474d6b4810c767609d1d399b3350a4bcdc21ba9c0bde5a5d0bffd1d7b27d41ac46e3e85ae2527d715a1645a2dd51ab14b8eab3c
diff --git a/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff b/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff
deleted file mode 100644
index 83accf4c2d95..000000000000
--- a/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff
+++ /dev/null
@@ -1,79 +0,0 @@
---- a/elinks-0.10.4.conf	2005-04-08 15:29:49.000000000 -0700
-+++ b/elinks-0.10.4-syscharset.conf	2006-11-04 00:26:26.000000000 -0800
-@@ -12,8 +12,6 @@
-   # obsolete config.saving_style. You shouldn't touch it.
-   set config.saving_style_w = 1
- 
--    ## terminal.linux.charset <codepage>
--    set terminal.linux.charset = "us-ascii"
-     ## terminal.linux.transparency [0|1]
-     set terminal.linux.transparency = 1
-     ## terminal.linux.colors [0|1]
-@@ -29,8 +27,6 @@
-     ## terminal.linux.type <num>
-     set terminal.linux.type = 2
- 
--    ## terminal.vt100.charset <codepage>
--    set terminal.vt100.charset = "us-ascii"
-     ## terminal.vt100.transparency [0|1]
-     set terminal.vt100.transparency = 1
-     ## terminal.vt100.colors [0|1]
-@@ -46,8 +42,6 @@
-     ## terminal.vt100.type <num>
-     set terminal.vt100.type = 1
- 
--    ## terminal.vt110.charset <codepage>
--    set terminal.vt110.charset = "us-ascii"
-     ## terminal.vt110.transparency [0|1]
-     set terminal.vt110.transparency = 1
-     ## terminal.vt110.colors [0|1]
-@@ -63,8 +57,6 @@
-     ## terminal.vt110.type <num>
-     set terminal.vt110.type = 1
- 
--    ## terminal.xterm.charset <codepage>
--    set terminal.xterm.charset = "us-ascii"
-     ## terminal.xterm.transparency [0|1]
-     set terminal.xterm.transparency = 1
-     ## terminal.xterm.colors [0|1]
-@@ -80,8 +72,6 @@
-     ## terminal.xterm.type <num>
-     set terminal.xterm.type = 1
- 
--    ## terminal.xterm-color.charset <codepage>
--    set terminal.xterm-color.charset = "us-ascii"
-     ## terminal.xterm-color.transparency [0|1]
-     set terminal.xterm-color.transparency = 1
-     ## terminal.xterm-color.colors [0|1]
-@@ -96,8 +86,7 @@
-     set terminal.xterm-color.m11_hack = 0
-     ## terminal.xterm-color.type <num>
-     set terminal.xterm-color.type = 1
--    ## terminal.screen.charset <codepage>
--    set terminal.screen.charset = "us-ascii"
-+
-     ## terminal.screen.transparency [0|1]
-     set terminal.screen.transparency = 1
-     ## terminal.screen.colors [0|1]
-@@ -270,10 +259,6 @@
- 
- 
- 
--    ## document.codepage.assume <codepage>
--    # Default document codepage.
--    set document.codepage.assume = "ISO-8859-1"
--
-     ## document.codepage.force_assumed [0|1]
-     # Ignore charset info sent by server.
-     set document.codepage.force_assumed = 0
-@@ -343,10 +328,6 @@
- 
- 
- 
--    ## document.dump.codepage <codepage>
--    # Codepage used in dump output.
--    set document.dump.codepage = "us-ascii"
--
-     ## document.dump.width <num>
-     # Width of screen in characters when dumping a HTML document.
-     set document.dump.width = 80
diff --git a/www-client/elinks/files/elinks-0.12pre5-spidermonkey-callback.patch b/www-client/elinks/files/elinks-0.12pre5-spidermonkey-callback.patch
deleted file mode 100644
index b48ddaeecc47..000000000000
--- a/www-client/elinks/files/elinks-0.12pre5-spidermonkey-callback.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naurp elinks-0.12pre5-orig/src/ecmascript/spidermonkey.c elinks-0.12pre5/src/ecmascript/spidermonkey.c
---- elinks-0.12pre5-orig/src/ecmascript/spidermonkey.c	2011-06-12 01:03:02.427000686 +0200
-+++ elinks-0.12pre5/src/ecmascript/spidermonkey.c	2011-06-12 01:03:31.368000736 +0200
-@@ -130,7 +130,7 @@ setup_safeguard(struct ecmascript_interp
-                 JSContext *ctx)
- {
- 	interpreter->exec_start = time(NULL);
--	JS_SetBranchCallback(ctx, safeguard);
-+	JS_SetOperationCallback(ctx, safeguard);
- }
- 
- 
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 0a33310ff617..8a9f16bd6ad4 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_84.0.4147.45-1_amd64.deb 69645272 BLAKE2B 72e59a5962920ae0fe59de84ac8654ed0bd7b1ee99ccb6428dfe67fe1a015fcfbc4d92b8de7dae54ccecb51c44f23da5aedd5758c1a3a2540234e49b02f0b4a9 SHA512 843c96581ed93e5308f8b436eaf7a5270cf186ccbcd82f6dbd12cff071e402a3515bd310620027075d39b62131314039d3defa70550d0ed7ff8f02c1dd53eefe
-EBUILD google-chrome-beta-84.0.4147.45.ebuild 2950 BLAKE2B 20d97afa724ae77915b7256721042f968e8c2c6e60847a9077967680a25a829cc7a94791f978a6953dcf33370dbd429ef6e720d9df42869bb540a9f01647c68f SHA512 0e29e5c7b8d63fa1ebc2fe28bff26046f8690a16fc548b8ff40e52c41ae4a4eb46f7c089cef94e4422f1225be2be6311f5da8c6e0965aa5d4680b976cd7d0f15
+DIST google-chrome-beta_84.0.4147.68-1_amd64.deb 69666824 BLAKE2B 2e0c5e3bff9b8634a1960d3ed1c1cbe7e6b95dbab7fa51bbe4180f99e9c0a9dd9add35551d3711db0d9a444217aadd3ed74d68e33ae10751ba620912c4dfc58d SHA512 e1aa88090a5a92b78169ed4f67d4c6a21f6b714c4daf36bfe53695f73042f4a1790ab9272780d8a4776fda3cd0bd4a43788853cc20e7eaabd4d5ca9528edc716
+EBUILD google-chrome-beta-84.0.4147.68.ebuild 2950 BLAKE2B 20d97afa724ae77915b7256721042f968e8c2c6e60847a9077967680a25a829cc7a94791f978a6953dcf33370dbd429ef6e720d9df42869bb540a9f01647c68f SHA512 0e29e5c7b8d63fa1ebc2fe28bff26046f8690a16fc548b8ff40e52c41ae4a4eb46f7c089cef94e4422f1225be2be6311f5da8c6e0965aa5d4680b976cd7d0f15
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-beta/google-chrome-beta-84.0.4147.45.ebuild b/www-client/google-chrome-beta/google-chrome-beta-84.0.4147.68.ebuild
index b5a38b97587d..b5a38b97587d 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-84.0.4147.45.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-84.0.4147.68.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index f49d6406635a..e2a896799006 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_85.0.4168.2-1_amd64.deb 69788596 BLAKE2B 5ab77816fff94fdad8b585a7f0d566a7733d19e572fa4fdc0d3b1f457b703e20743979db8ec7a5223ed0dda34c9b11bd1eb100ced86e2377cb2a5cac991f600f SHA512 30c02dca77ed5de229ead4f0db4a9d6b1c154f2a45968958e3e5df048af74c9e35ab745eb8d2f1bbc4e62c3237041eba016cbb13a2be7cf8445f421faadf899f
-EBUILD google-chrome-unstable-85.0.4168.2.ebuild 2950 BLAKE2B 20d97afa724ae77915b7256721042f968e8c2c6e60847a9077967680a25a829cc7a94791f978a6953dcf33370dbd429ef6e720d9df42869bb540a9f01647c68f SHA512 0e29e5c7b8d63fa1ebc2fe28bff26046f8690a16fc548b8ff40e52c41ae4a4eb46f7c089cef94e4422f1225be2be6311f5da8c6e0965aa5d4680b976cd7d0f15
+DIST google-chrome-unstable_85.0.4181.8-1_amd64.deb 69878204 BLAKE2B b18cdbca45fb830c7bf34b0c47f308d19f440000639b41a342712a0f5df71cf3e13d903414e59b2a6265512370d541195560c0129c4da32c05927ddf86f7085a SHA512 a2e751e3d296e520c44e687138786881db61c98f5c881a0f04a4c1e2f7b576644bcdccc369b23e070a5afdb2bb330b11c9329850224aed696f01aafcec280afd
+EBUILD google-chrome-unstable-85.0.4181.8.ebuild 2950 BLAKE2B 20d97afa724ae77915b7256721042f968e8c2c6e60847a9077967680a25a829cc7a94791f978a6953dcf33370dbd429ef6e720d9df42869bb540a9f01647c68f SHA512 0e29e5c7b8d63fa1ebc2fe28bff26046f8690a16fc548b8ff40e52c41ae4a4eb46f7c089cef94e4422f1225be2be6311f5da8c6e0965aa5d4680b976cd7d0f15
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-85.0.4168.2.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-85.0.4181.8.ebuild
index b5a38b97587d..b5a38b97587d 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-85.0.4168.2.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-85.0.4181.8.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index a14eb7e53871..4cc1a503c9ce 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_83.0.4103.106-1_amd64.deb 68641320 BLAKE2B 90a7183c0d5dccf3b8b293dcac01a615923f08e963b63708fffd6b19570c03e9eee6ec30707164313093a68413e671a09fed338c72341144195bd3545d9acc1e SHA512 2fc1cfbe52e79b88ab900aca87a6bc57edb0dcb9e26a37101e881300a62028c316731465235407a1aa20a459109af40e7f6349c1bc486161f1da06a83a4eb2c5
-EBUILD google-chrome-83.0.4103.106.ebuild 2950 BLAKE2B 20d97afa724ae77915b7256721042f968e8c2c6e60847a9077967680a25a829cc7a94791f978a6953dcf33370dbd429ef6e720d9df42869bb540a9f01647c68f SHA512 0e29e5c7b8d63fa1ebc2fe28bff26046f8690a16fc548b8ff40e52c41ae4a4eb46f7c089cef94e4422f1225be2be6311f5da8c6e0965aa5d4680b976cd7d0f15
+DIST google-chrome-stable_83.0.4103.116-1_amd64.deb 68648484 BLAKE2B e783a1788ec091c0f785acae36cd759f9c5d016830e33a93218e42fcbb752602eba8dd28e687187d6ab71235ad77f09249999fa02b1494e523e4df955cfaab52 SHA512 2ec0279fbdff50b19e82f508590faa9ec9401b55254ce37f3d41302bcd8fecd454c7e24e95ce0e1ef0322b9f6f91d9463334dfbcb0399fa87ca5b8163c42de9f
+EBUILD google-chrome-83.0.4103.116.ebuild 2950 BLAKE2B 20d97afa724ae77915b7256721042f968e8c2c6e60847a9077967680a25a829cc7a94791f978a6953dcf33370dbd429ef6e720d9df42869bb540a9f01647c68f SHA512 0e29e5c7b8d63fa1ebc2fe28bff26046f8690a16fc548b8ff40e52c41ae4a4eb46f7c089cef94e4422f1225be2be6311f5da8c6e0965aa5d4680b976cd7d0f15
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome/google-chrome-83.0.4103.106.ebuild b/www-client/google-chrome/google-chrome-83.0.4103.116.ebuild
index b5a38b97587d..b5a38b97587d 100644
--- a/www-client/google-chrome/google-chrome-83.0.4103.106.ebuild
+++ b/www-client/google-chrome/google-chrome-83.0.4103.116.ebuild
diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index 16a7c0b9ad76..cc0266a6578c 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -1,9 +1,6 @@
-AUX netsurf-3.6-conditionally-include-image-headers.patch 598 BLAKE2B d55ff86b9b6981671eb9466ce989145ba79b00aa791ae361367362c9938335f561aa828911e44ea25637ff3e6de637180b76649f55df27b4d7d4269652f19f9a SHA512 346e7befaeb337cb33963794303eb18cccd280eaa86aed205fee9b50bcb3cbea8d5c4025b439d7d737036e66a76354871b1765eae7dd11e2d1a71dc3084747c3
-AUX netsurf-3.8-CFLAGS.patch 2544 BLAKE2B 1d71cd9f577b9a909c90117d4ba6933dacc58423e9db3bc060e79baf7c3bfb71b2eb11c82d53495be92098f50923675a6be6eef5458461d8bc0accd22136c7dc SHA512 87e2698a9b58a8871d9a7fb0bc42368974a9fb815adcacb7ee29d73ed5ac6747ccb944a15e41620841ff813dce95feae1e664ba0fcf332bfd6e8b830e82d3810
-AUX netsurf-3.8-pdf-writer.patch 2807 BLAKE2B 93ee86a467a01a2da07269ef32a672b8337d93a91b65fbcbe4c21e05f9f702baa70f79ca2757cf535ad0b4490c00bbc3c9276f6ed392d56e3a766553e2a5ab42 SHA512 40f6c88b5946822699a125a8c6c5eb631990828bd7b4e31be330191a41588d1978083db9fdca2752f8bb0c3af5afe7ed896d8b79b8eaa6f45523da74c36eda07
+AUX netsurf-3.10-disable-failing-tests.patch 1196 BLAKE2B 055f4663bfed7ebe291e922ad52b20acb3b014e0be36e2e562410ce8e1188fcaa0edce1dd39ec9b834139e4250c30a08039a896a47dfc90c23e9f2e4a1675869 SHA512 dc10108ee223287978305942e1254efacf7ac78201355df0de5c19ebb0782077cdaf655e8eba590c5187df38d1f67e861f77b13d507faea481bf8f1992fe0e1d
+AUX netsurf-3.10-julia-libutf8proc-header-location.patch 1155 BLAKE2B bd2e04f8b9ebd5a00659c88dda90b6e8822e1cb51e8bf3755cae88373a206f6d1637f14e928365345bc9d98cfaa18294e9aa5beeef43449252c70e8d1de8d21b SHA512 76b0d397ce0f73aa23e6069b9fce492768f9d8fe1ba3dcb77b2f3d8c27b2e5fb8cbf5f97ede41bc624684c0d20bd80f3d985385ba1c825298f75f68c768656b4
 AUX netsurf-3.9-conditionally-include-image-headers.patch 775 BLAKE2B 1d62fa92cda9851126b7befbf0b19d28f130a1d165c8ddabecac98b8dee59cf51bede93bf380ba5ce07625f6bf0156a400e8575df418611bda29f9e7f325a696 SHA512 5e866aa56c7959ba5a6ac44d997a12b24bf4cc3ef38e3149a06be178350cf1a14bc27a31b6bf817faf8586f44ecef65cb7633245cdbbe0896e54dbc88e7dd84f
-DIST netsurf-3.8-src.tar.gz 3945752 BLAKE2B 0f4592e53e95cfedb3c34a16ce9df9baeeaed93afb3bac3d68dab1e3d80e67c0498111c123285f6e828d063574e0e5f0cc3aa337ffab066f2283d06d248a308a SHA512 6f4dfdc546cce3b85d32da0dd816adc9a39410ed42bc28f263f4a1db64b35a889a1784a4116715190e756988dd263976933cfac75c9dcd81af01954487ddcaf6
-DIST netsurf-3.9-src.tar.gz 3989742 BLAKE2B a147a99bea00163147cb39b16ff8b7b874c58d386e60eb8aa568b3ce30e4957708c9720a5291a2aa37bc6d8d4bd0eaf4e2dc1a2bc2fff396cb4d972dd887e024 SHA512 061a1c6379b48582d842ed1ca6cea59b87cd84cd13769bdc32b623a56cebc69e94af9d65f4abd959608c98da9d0006f7842f875017569e6a3f7b77cbb928f24a
-EBUILD netsurf-3.8-r2.ebuild 3901 BLAKE2B 05e18fe99ada4d93333c4cc00c7083850423d41e6326b9b40b475b68fa9ad21b65b8fcaa6bba3b9e56bee6ccb6712362f8cfdbfe934b3043ff348145bdf77237 SHA512 38647c20bc9a6dc97ec3168f6b52280fec876bf3eef3ba29c7294f918be05467c628c7288c90ecf4c69c5dfadb7b53b3977ace67f22ccc8321c5c6645ee83707
-EBUILD netsurf-3.9.ebuild 3906 BLAKE2B 47797b8f43c566cd2c758a69dbdeae37133ad1e3bf3a648e1397e528affc7b3f7769a0673a5760890105b35abbd2715972e4af8aaa2f9634e1ea34b2f5b92361 SHA512 9e55f7d46404a942db368c3a644edf318215c00125c2a08b59449c87dd7a141777c2077f378fd6cfb747e40af8c4024a0d59a1fa193b795ba1f6a8f643ef75e9
-MISC metadata.xml 1556 BLAKE2B 4ce7e6462525c4091f3a6e6226afaa29748d11728e4e4574147f317cb3b0ec650b247023e7b1c74e29f28e60fba3116084730e831daa6ad11e01267ccac896f4 SHA512 b529c7584bed60fa7b9d84f629314a1d902cdfbfe381e5a5975c77218aa7cbb58c4c4e66de96cb2029192c25956b05e6d47ee6baf394a192154806f46979febf
+DIST netsurf-3.10-src.tar.gz 4084480 BLAKE2B 267ce1811cbf11d053f721e22b8a6d484e796102a4c9baaa10580d92cc1eecfe3f126fb97456262675c962ec88a5235e48dc85f2a5168631f6c9dd5b5082b43b SHA512 1b1153916438e08146271dc04200aefbdba3b2c4ca9432a43abfc3811b5418df7ed21bbd91767f12d04331a236227379d2c412fcf13f25349685a549723bf13d
+EBUILD netsurf-3.10.ebuild 3899 BLAKE2B a3e64bbaa69941d911c6e6bdf0f6dcb2165777ea407c78ad3e01aa891abe5ee5c48b67589f0990340e08ff017bd2a764c05e785ece928fa76212734be32e3822 SHA512 dd0cfac0bf5f30e800b2bde2523f83e42317ed946d80527b10da89d9a94ffca14c30723a959c3884988c595d12e427ddf7e2a7e19f706bdd52697e7e5aba1f25
+MISC metadata.xml 1564 BLAKE2B 613fed039b6dac6329dacce954d28087855dfb2db7445496e9394882c0d9bf59c9db936bb47188a582eaf7987961acb5d4045baf1917fd1a46b72dad1c24ed7e SHA512 634e81db8221b34e71fab51ff66efd15d95307a88dc08812837b290301a8b8e1644dab4972f9e1941434b04f0c5877343033099d624fa68bd449796f0866ab48
diff --git a/www-client/netsurf/files/netsurf-3.10-disable-failing-tests.patch b/www-client/netsurf/files/netsurf-3.10-disable-failing-tests.patch
new file mode 100644
index 000000000000..6ffcec002e0b
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.10-disable-failing-tests.patch
@@ -0,0 +1,42 @@
+From 4c3d6b10802b6747ba36b6e7c988f6b584352358 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 17 Jun 2020 17:42:34 -0400
+Subject: [PATCH 1/1] test: disable failing tests.
+
+Just cut them right out of the Makefile if they ain't gonna work.
+
+Bug: https://bugs.gentoo.org/687378
+Upstream-bug: https://bugs.netsurf-browser.org/mantis/view.php?id=2779
+---
+ test/Makefile | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/test/Makefile b/test/Makefile
+index 82ffee6..952d238 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -5,8 +5,6 @@ TESTS := \
+ 	nsurl \
+ 	urldbtest \
+ 	nsoption \
+-	bloom \
+-	hashtable \
+ 	hashmap \
+ 	urlescape \
+ 	utils \
+@@ -47,12 +45,6 @@ messages_SRCS := utils/messages.c utils/hashtable.c test/log.c test/messages.c
+ # nsoption test sources
+ nsoption_SRCS := utils/nsoption.c test/log.c test/nsoption.c
+ 
+-# Bloom filter test sources
+-bloom_SRCS := utils/bloom.c test/bloom.c
+-
+-# hash table test sources
+-hashtable_SRCS := utils/hashtable.c test/log.c test/hashtable.c
+-
+ # hashmap test sources
+ hashmap_SRCS := $(NSURL_SOURCES) utils/hashmap.c utils/corestrings.c test/log.c test/hashmap.c
+ hashmap_LD := -lmalloc_fig
+-- 
+2.26.2
+
diff --git a/www-client/netsurf/files/netsurf-3.10-julia-libutf8proc-header-location.patch b/www-client/netsurf/files/netsurf-3.10-julia-libutf8proc-header-location.patch
new file mode 100644
index 000000000000..3a6ccc2466f4
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.10-julia-libutf8proc-header-location.patch
@@ -0,0 +1,34 @@
+From d585a1573819306bb3660db3f13a85b2fd254c63 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 17 Jun 2020 17:23:10 -0400
+Subject: [PATCH 1/1] utils/idna.c: adjust utf8proc.h header location.
+
+There are two upstreams for libutf8proc, and they each put utf8proc.h
+in a different location -- ostensibly as a performance art piece
+intended to remind the programmer that we as human beings are all
+slowly dying, and that our limited time here on earth should not be
+wasted. This commit switches the header location from the netsurf-
+upstream one that used to work, to the julia-upstream location that
+works now (that the Gentoo package follows the julia upstream).
+
+Bug: https://bugs.gentoo.org/721318
+---
+ utils/idna.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/utils/idna.c b/utils/idna.c
+index 628ef1f..f6e498a 100644
+--- a/utils/idna.c
++++ b/utils/idna.c
+@@ -167,7 +167,7 @@ idna__ace_to_ucs4(const char *ace_label,
+ 
+ #ifdef WITH_UTF8PROC
+ 
+-#include <libutf8proc/utf8proc.h>
++#include <utf8proc.h>
+ 
+ int32_t idna_contexto[] = {
+ 	/* CONTEXTO codepoints which have a rule defined */
+-- 
+2.26.2
+
diff --git a/www-client/netsurf/files/netsurf-3.6-conditionally-include-image-headers.patch b/www-client/netsurf/files/netsurf-3.6-conditionally-include-image-headers.patch
deleted file mode 100644
index 06754464cb6c..000000000000
--- a/www-client/netsurf/files/netsurf-3.6-conditionally-include-image-headers.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- netsurf-3.6/content/handlers/image/image.c
-+++ netsurf-3.6/content/handlers/image/image.c
-@@ -27,14 +27,28 @@
- #include "netsurf/content.h"
- #include "desktop/gui_internal.h"
- 
-+#ifdef WITH_BMP
- #include "image/bmp.h"
-+#endif
-+#ifdef WITH_GIF
- #include "image/gif.h"
-+#endif
- #include "image/ico.h"
-+#ifdef WITH_JPEG
- #include "image/jpeg.h"
-+#endif
-+#ifdef WITH_NSSPRITE
- #include "image/nssprite.h"
-+#endif
-+#ifdef WITH_PNG
- #include "image/png.h"
-+#endif
-+#ifdef WITH_RSVG
- #include "image/rsvg.h"
-+#endif
-+#ifdef WITH_NS_SVG
- #include "image/svg.h"
-+#endif
- #include "image/image.h"
- 
- /**
diff --git a/www-client/netsurf/files/netsurf-3.8-CFLAGS.patch b/www-client/netsurf/files/netsurf-3.8-CFLAGS.patch
deleted file mode 100644
index c52422dcb92b..000000000000
--- a/www-client/netsurf/files/netsurf-3.8-CFLAGS.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --git a/Makefile.defaults b/Makefile.defaults
-index 51090109e..f1ec46f73 100644
---- a/Makefile.defaults
-+++ b/Makefile.defaults
-@@ -114,12 +114,6 @@ NETSURF_USE_SANITIZERS := NO
- # But recover after sanitizer failure
- NETSURF_RECOVER_SANITIZERS := YES
- 
--# Initial CFLAGS. Optimisation level etc. tend to be target specific.
--CFLAGS :=
--
--# Initial CXXFLAGS. Optimisation level etc. tend to be target specific.
--CXXFLAGS :=
--
- # Default installation/execution prefix
- PREFIX ?= /usr/local
- 
-diff --git a/frontends/framebuffer/Makefile b/frontends/framebuffer/Makefile
-index bdedd903b..35179138a 100644
---- a/frontends/framebuffer/Makefile
-+++ b/frontends/framebuffer/Makefile
-@@ -20,7 +20,7 @@ CFLAGS += '-DNETSURF_FB_FONT_MONOSPACE_BOLD="$(NETSURF_FB_FONT_MONOSPACE_BOLD)"'
- CFLAGS += '-DNETSURF_FB_FONT_CURSIVE="$(NETSURF_FB_FONT_CURSIVE)"'
- CFLAGS += '-DNETSURF_FB_FONT_FANTASY="$(NETSURF_FB_FONT_FANTASY)"'
- 
--CFLAGS += -std=c99 -g -Dsmall \
-+CFLAGS += -std=c99 -Dsmall \
- 	  -D_BSD_SOURCE \
- 	  -D_DEFAULT_SOURCE \
- 	  -D_XOPEN_SOURCE=600 \
-diff --git a/frontends/framebuffer/Makefile.defaults b/frontends/framebuffer/Makefile.defaults
-index cc712e992..f132c97d6 100644
---- a/frontends/framebuffer/Makefile.defaults
-+++ b/frontends/framebuffer/Makefile.defaults
-@@ -3,7 +3,7 @@
- # ----------------------------------------------------------------------------
- 
- # Optimisation levels
--CFLAGS += -O2
-+CFLAGS += 
- 
- # Framebuffer default surface provider.
- # Valid values are: x, sdl, linux, vnc, able,
-diff --git a/frontends/gtk/Makefile b/frontends/gtk/Makefile
-index ec60ce70c..04af6df8f 100644
---- a/frontends/gtk/Makefile
-+++ b/frontends/gtk/Makefile
-@@ -33,7 +33,7 @@ GTKDEPFLAGS += -DGTK_DISABLE_DEPRECATED
- endif
- 
- 
--GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk -g \
-+GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \
- 		$(GTKDEPFLAGS) \
- 		-D_BSD_SOURCE \
- 		-D_DEFAULT_SOURCE \
-diff --git a/frontends/gtk/Makefile.defaults b/frontends/gtk/Makefile.defaults
-index a98043eb9..bb5371230 100644
---- a/frontends/gtk/Makefile.defaults
-+++ b/frontends/gtk/Makefile.defaults
-@@ -39,4 +39,4 @@ NETSURF_FS_BACKING_STORE := YES
- NETSURF_GTK_MAJOR ?= 2
- 
- # Optimisation levels
--CFLAGS += -O2
-+CFLAGS += 
-diff --git a/test/Makefile b/test/Makefile
-index 4f9dd22c9..8bec9b88a 100644
---- a/test/Makefile
-+++ b/test/Makefile
-@@ -134,7 +134,7 @@ ifneq ($(CC_MAJOR),2)
-   COMMON_WARNFLAGS += -Wno-unused-parameter
- endif
- 
--BASE_TESTCFLAGS := -std=c99 -g \
-+BASE_TESTCFLAGS := -std=c99 \
- 	$(COMMON_WARNFLAGS) \
- 	-D_DEFAULT_SOURCE \
- 	-D_POSIX_C_SOURCE=200809L \
diff --git a/www-client/netsurf/files/netsurf-3.8-pdf-writer.patch b/www-client/netsurf/files/netsurf-3.8-pdf-writer.patch
deleted file mode 100644
index e9c2420a33fd..000000000000
--- a/www-client/netsurf/files/netsurf-3.8-pdf-writer.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff --git a/desktop/font_haru.c b/desktop/font_haru.c
-index 4ee9824f0..3304ba82a 100644
---- a/desktop/font_haru.c
-+++ b/desktop/font_haru.c
-@@ -37,7 +37,7 @@
- #include <hpdf.h>
- 
- #include "utils/nsoption.h"
--#include "desktop/save_pdf/font_haru.h"
-+#include "desktop/font_haru.h"
- #include "desktop/font.h"
- #include "utils/log.h"
- 
-diff --git a/desktop/save_pdf.c b/desktop/save_pdf.c
-index 889190089..9e6265cfb 100644
---- a/desktop/save_pdf.c
-+++ b/desktop/save_pdf.c
-@@ -60,6 +60,8 @@
- #include "utils/useragent.h"
- #include "content/hlcache.h"
- #include "utils/nsoption.h"
-+#include "desktop/gui_misc.h"
-+#include "desktop/gui_internal.h"
- #include "netsurf/bitmap.h"
- 
- #include "netsurf/plotters.h"
-@@ -455,11 +457,6 @@ HPDF_Image pdf_extract_image(struct bitmap *bitmap)
- 
- 		switch(content_get_type(content)){
- 		/*Handle "embeddable" types of images*/
--		case CONTENT_JPEG:
-- 			image = HPDF_LoadJpegImageFromMem(pdf_doc,
-- 					(const HPDF_BYTE *) source_data,
-- 					source_size);
-- 			break;
- 
- 		/*Disabled until HARU PNG support will be more stable.
- 
-@@ -706,7 +703,7 @@ bool pdf_begin(struct print_settings *print_settings)
- 
- 
- #ifndef PDF_DEBUG
--	if (option_enable_PDF_compression)
-+	if (nsoption_bool(enable_PDF_compression))
- 		HPDF_SetCompressionMode(pdf_doc, HPDF_COMP_ALL); /*Compression on*/
- #endif
- 	HPDF_SetInfoAttr(pdf_doc, HPDF_INFO_CREATOR, user_agent_string());
-@@ -780,7 +777,7 @@ void pdf_end(void)
- 	assert(settings->output != NULL);
- 
- 	/*Encryption on*/
--	if (option_enable_PDF_password)
-+	if (nsoption_bool(enable_PDF_password))
- 		guit->misc->pdf_password(&owner_pass, &user_pass,
- 				(void *)settings->output);
- 	else
-@@ -795,7 +792,7 @@ nserror save_pdf(const char *path)
- {
- 	nserror res = NSERROR_OK;
- 
--	if (option_enable_PDF_password && owner_pass != NULL ) {
-+	if (nsoption_bool(enable_PDF_password) && owner_pass != NULL ) {
- 		HPDF_SetPassword(pdf_doc, owner_pass, user_pass);
- 		HPDF_SetEncryptionMode(pdf_doc, HPDF_ENCRYPT_R3, 16);
- 		free(owner_pass);
-diff --git a/frontends/gtk/scaffolding.c b/frontends/gtk/scaffolding.c
-index 8c46fd884..748518fdc 100644
---- a/frontends/gtk/scaffolding.c
-+++ b/frontends/gtk/scaffolding.c
-@@ -853,14 +853,14 @@ MULTIHANDLER(pdf)
- 
- 	free(url_name);
- 
--	strncpy(dirname, option_downloads_directory, PATH_MAX);
-+	strncpy(dirname, nsoption_charp(downloads_directory), PATH_MAX);
- 	strncat(dirname, "/", PATH_MAX - strlen(dirname));
- 	dirname[PATH_MAX - 1] = '\0';
- 
- 	/* this way the scale used by PDF functions is synchronised with that
- 	 * used by the all-purpose print interface
- 	 */
--	haru_nsfont_set_scale((float)option_export_scale / 100);
-+	haru_nsfont_set_scale((float)nsoption_int(export_scale) / 100);
- 
- 	save_dialog = gtk_file_chooser_dialog_new("Export to PDF", g->window,
- 		GTK_FILE_CHOOSER_ACTION_SAVE,
diff --git a/www-client/netsurf/metadata.xml b/www-client/netsurf/metadata.xml
index c0afc0380304..4abc84a70da8 100644
--- a/www-client/netsurf/metadata.xml
+++ b/www-client/netsurf/metadata.xml
@@ -1,36 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>philipp.ammann@posteo.de</email>
-		<name>Philipp Ammann</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<changelog>http://download.netsurf-browser.org/netsurf/releases/ChangeLog.txt</changelog>
-	</upstream>
-	<use>
-		<flag name="bmp">BMP bitmap image support (media-libs/libnsbmp)</flag>
-		<flag name="duktape">Use duktape.org javascript engine</flag>
-		<flag name="gtk">Build GTK3 GUI</flag>
-		<flag name="gtk2">Build GTK2 GUI</flag>
-		<flag name="pdf-writer">PDF output support (media-libs/libharu)</flag>
-		<flag name="psl">Use public suffix list via media-libs/libnspsl</flag>
-		<flag name="rosprite">RISC OS Sprite bitmap image support (media-libs/librosprite)</flag>
-		<flag name="svgtiny">SVG image support via media-libs/svgatiny instead of gnome-base/librsvg</flag>
-	</use>
-	<longdescription lang="en">
-		NetSurf is a free, open source web browser. It is written in C, has 
-		its own layout and rendering engine entirely written from scratch. It 
-		is small and capable of handling many of the web standards in use 
-		today.
+  <maintainer type="person">
+    <email>philipp.ammann@posteo.de</email>
+    <name>Philipp Ammann</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <changelog>
+      https://download.netsurf-browser.org/netsurf/releases/ChangeLog.txt
+    </changelog>
+  </upstream>
+  <use>
+    <flag name="bmp">BMP bitmap image support (media-libs/libnsbmp)</flag>
+    <flag name="duktape">Use duktape.org javascript engine</flag>
+    <flag name="gtk">Build GTK3 GUI</flag>
+    <flag name="gtk2">Build GTK2 GUI</flag>
+    <flag name="psl">Use public suffix list via media-libs/libnspsl</flag>
+    <flag name="rosprite">
+      RISC OS Sprite bitmap image support (media-libs/librosprite)
+    </flag>
+    <flag name="svgtiny">
+      SVG image support via media-libs/svgatiny instead of gnome-base/librsvg
+    </flag>
+  </use>
+  <longdescription lang="en">
+    NetSurf is a free, open source web browser. It is written in C,
+    has its own layout and rendering engine entirely written from
+    scratch. It is small and capable of handling many of the web
+    standards in use today.
 
-		Whether you want to check your webmail, read the news or post to 
-		discussion forums, NetSurf is your lightweight gateway to the world 
-		wide web. Actively developed, NetSurf is continually evolving and 
-		improving.
-	</longdescription>
+    Whether you want to check your webmail, read the news or post to
+    discussion forums, NetSurf is your lightweight gateway to the
+    world wide web. Actively developed, NetSurf is continually
+    evolving and improving.
+  </longdescription>
 </pkgmetadata>
diff --git a/www-client/netsurf/netsurf-3.10.ebuild b/www-client/netsurf/netsurf-3.10.ebuild
new file mode 100644
index 000000000000..206f8f8d2f65
--- /dev/null
+++ b/www-client/netsurf/netsurf-3.10.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs desktop
+
+DESCRIPTION="a free, open source web browser"
+HOMEPAGE="http://www.netsurf-browser.org/"
+SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source/${P}-src.tar.gz"
+
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="bmp +duktape fbcon truetype +gif +gtk gtk2 +javascript +jpeg mng
+	+png +psl rosprite +svg +svgtiny +webp"
+
+REQUIRED_USE="|| ( fbcon gtk gtk2 )
+	duktape? ( javascript )"
+
+RDEPEND="
+	>=dev-libs/libcss-0.9
+	>=net-libs/libdom-0.3
+	>=net-libs/libhubbub-0.3
+	>=dev-libs/libnsutils-0.0.5
+	>=dev-libs/libutf8proc-2.2
+	dev-libs/libxml2:2
+	net-misc/curl
+	bmp? ( >=media-libs/libnsbmp-0.1 )
+	fbcon? ( >=dev-libs/libnsfb-0.2
+		truetype? ( media-fonts/dejavu
+			>=media-libs/freetype-2.5.0.1 )
+	)
+	gif? ( >=media-libs/libnsgif-0.1 )
+	gtk? ( dev-libs/glib:2
+		x11-libs/gtk+:3 )
+	gtk2? ( dev-libs/glib:2
+		x11-libs/gtk+:2 )
+	javascript? (
+		>=dev-libs/nsgenbind-0.7
+		duktape? ( dev-lang/duktape )
+		!duktape? ( dev-lang/spidermonkey:0= )
+	)
+	jpeg? ( >=virtual/jpeg-0-r2:0 )
+	mng? ( >=media-libs/libmng-1.0.10-r2 )
+	png? ( >=media-libs/libpng-1.2.51:0 )
+	psl? ( media-libs/libnspsl )
+	rosprite? ( >=media-libs/librosprite-0.1.2-r1 )
+	svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1 )
+		!svgtiny? ( gnome-base/librsvg:2 ) )
+	webp? ( >=media-libs/libwebp-0.3.0 )"
+BDEPEND="
+	duktape? ( app-editors/vim-core )
+	dev-libs/check
+	dev-perl/HTML-Parser
+	>=dev-util/netsurf-buildsystem-1.7-r1"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.9-conditionally-include-image-headers.patch"
+	"${FILESDIR}/${PN}-3.10-julia-libutf8proc-header-location.patch"
+	"${FILESDIR}/${PN}-3.10-disable-failing-tests.patch"
+)
+
+DOCS=( README docs/using-framebuffer.md
+	docs/ideas/{cache,css-engine,render-library}.txt )
+
+src_prepare() {
+	default
+	rm -r frontends/{amiga,atari,beos,monkey,riscos,windows} || die
+}
+
+_emake() {
+	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
+	netsurf_define_makeconf
+	local netsurf_makeconf=(
+		"${NETSURF_MAKECONF[@]}"
+		COMPONENT_TYPE=binary
+		NETSURF_USE_BMP=$(usex bmp YES NO)
+		NETSURF_USE_GIF=$(usex gif YES NO)
+		NETSURF_USE_JPEG=$(usex jpeg YES NO)
+		NETSURF_USE_PNG=$(usex png YES NO)
+		NETSURF_USE_NSPSL=$(usex psl YES NO)
+		NETSURF_USE_MNG=$(usex mng YES NO)
+		NETSURF_USE_WEBP=$(usex webp YES NO)
+		NETSURF_USE_MOZJS=$(usex javascript $(usex duktape NO YES) NO)
+		NETSURF_USE_JS=NO
+		NETSURF_USE_DUKTAPE=$(usex javascript $(usex duktape YES NO) NO)
+		NETSURF_USE_NSSVG=$(usex svg $(usex svgtiny YES NO) NO)
+		NETSURF_USE_RSVG=$(usex svg $(usex svgtiny NO YES) NO)
+		NETSURF_USE_ROSPRITE=$(usex rosprite YES NO)
+		PKG_CONFIG=$(tc-getPKG_CONFIG)
+		NETSURF_FB_FONTLIB=$(usex truetype freetype internal)
+		NETSURF_FB_FONTPATH="${EPREFIX}/usr/share/fonts/dejavu"
+		NETSURF_USE_VIDEO=NO
+	)
+	emake "${netsurf_makeconf[@]}" $@
+}
+
+src_compile() {
+	use fbcon && _emake TARGET=framebuffer
+	use gtk2 && _emake TARGET=gtk2
+	use gtk && _emake TARGET=gtk3
+}
+
+src_test() {
+	_emake test
+}
+
+src_install() {
+	sed -e '1iexit;' \
+		-i "${WORKDIR}"/*/utils/git-testament.pl || die
+
+	if use fbcon ; then
+		_emake TARGET=framebuffer DESTDIR="${D}" install
+		elog "framebuffer binary has been installed as netsurf-fb"
+		make_desktop_entry "${EPREFIX}"/usr/bin/netsurf-fb NetSurf-framebuffer netsurf "Network;WebBrowser"
+	fi
+	if use gtk2 ; then
+		_emake TARGET=gtk2 DESTDIR="${D}" install
+		elog "netsurf gtk2 version has been installed as netsurf-gtk2"
+		make_desktop_entry "${EPREFIX}"/usr/bin/netsurf-gtk2 NetSurf-gtk2 netsurf "Network;WebBrowser"
+	fi
+	if use gtk ; then
+		_emake TARGET=gtk3 DESTDIR="${D}" install
+		elog "netsurf gtk3 version has been installed as netsurf-gtk3"
+		make_desktop_entry "${EPREFIX}"/usr/bin/netsurf-gtk3 NetSurf-gtk3 netsurf "Network;WebBrowser"
+	fi
+
+	insinto /usr/share/pixmaps
+	doins frontends/gtk/res/netsurf.xpm
+}
diff --git a/www-client/netsurf/netsurf-3.8-r2.ebuild b/www-client/netsurf/netsurf-3.8-r2.ebuild
deleted file mode 100644
index e9cd87acae48..000000000000
--- a/www-client/netsurf/netsurf-3.8-r2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs desktop
-
-DESCRIPTION="a free, open source web browser"
-HOMEPAGE="http://www.netsurf-browser.org/"
-SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source/${P}-src.tar.gz"
-
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE="+bmp +duktape fbcon truetype +gif gtk gtk2 +javascript +jpeg +mng
-	pdf-writer +png +psl +rosprite +svg +svgtiny +webp"
-
-REQUIRED_USE="|| ( fbcon gtk gtk2 )
-	duktape? ( javascript )"
-
-RDEPEND="
-	>=dev-libs/libcss-0.8
-	>=net-libs/libdom-0.3
-	>=net-libs/libhubbub-0.3
-	>=dev-libs/libnsutils-0.0.5
-	>=dev-libs/libutf8proc-2.2
-	dev-libs/libxml2:2
-	net-misc/curl
-	bmp? ( >=media-libs/libnsbmp-0.1 )
-	fbcon? ( >=dev-libs/libnsfb-0.2
-		truetype? ( media-fonts/dejavu
-			>=media-libs/freetype-2.5.0.1 )
-	)
-	gif? ( >=media-libs/libnsgif-0.1 )
-	gtk? ( dev-libs/glib:2
-		x11-libs/gtk+:3 )
-	gtk2? ( dev-libs/glib:2
-		x11-libs/gtk+:2 )
-	javascript? ( >=dev-libs/nsgenbind-0.6
-		!duktape? ( dev-lang/spidermonkey:0= ) )
-	jpeg? ( >=virtual/jpeg-0-r2:0 )
-	mng? ( >=media-libs/libmng-1.0.10-r2 )
-	pdf-writer? ( media-libs/libharu )
-	png? ( >=media-libs/libpng-1.2.51:0 )
-	psl? ( media-libs/libnspsl )
-	rosprite? ( >=media-libs/librosprite-0.1.2-r1 )
-	svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1 )
-		!svgtiny? ( gnome-base/librsvg:2 ) )
-	webp? ( >=media-libs/libwebp-0.3.0 )"
-DEPEND="${RDEPEND}
-	dev-libs/check
-	dev-perl/HTML-Parser
-	>=dev-util/netsurf-buildsystem-1.7-r1"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.8-CFLAGS.patch
-	"${FILESDIR}"/${PN}-3.6-conditionally-include-image-headers.patch
-	"${FILESDIR}"/${PN}-3.8-pdf-writer.patch
-)
-
-DOCS=( README docs/using-framebuffer.md
-	docs/ideas/{cache,css-engine,render-library}.txt )
-
-src_prepare() {
-	default
-	rm -r frontends/{amiga,atari,beos,monkey,riscos,windows} || die
-}
-
-_emake() {
-	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
-	netsurf_define_makeconf
-	local netsurf_makeconf=(
-		"${NETSURF_MAKECONF[@]}"
-		COMPONENT_TYPE=binary
-		NETSURF_USE_BMP=$(usex bmp YES NO)
-		NETSURF_USE_GIF=$(usex gif YES NO)
-		NETSURF_USE_JPEG=$(usex jpeg YES NO)
-		NETSURF_USE_PNG=$(usex png YES NO)
-		NETSURF_USE_NSPSL=$(usex psl YES NO)
-		NETSURF_USE_MNG=$(usex mng YES NO)
-		NETSURF_USE_WEBP=$(usex webp YES NO)
-		NETSURF_USE_MOZJS=$(usex javascript $(usex duktape NO YES) NO)
-		NETSURF_USE_JS=NO
-		NETSURF_USE_DUKTAPE=$(usex javascript $(usex duktape YES NO) NO)
-		NETSURF_USE_HARU_PDF=$(usex pdf-writer YES NO)
-		NETSURF_USE_NSSVG=$(usex svg $(usex svgtiny YES NO) NO)
-		NETSURF_USE_RSVG=$(usex svg $(usex svgtiny NO YES) NO)
-		NETSURF_USE_ROSPRITE=$(usex rosprite YES NO)
-		PKG_CONFIG=$(tc-getPKG_CONFIG)
-		NETSURF_FB_FONTLIB=$(usex truetype freetype internal)
-		NETSURF_FB_FONTPATH=${EROOT}/usr/share/fonts/dejavu
-		NETSURF_USE_VIDEO=NO
-	)
-	emake "${netsurf_makeconf[@]}" $@
-}
-
-src_compile() {
-	use fbcon && _emake TARGET=framebuffer
-	use gtk2 && _emake TARGET=gtk
-	use gtk && _emake TARGET=gtk3
-}
-
-src_test() {
-	_emake test
-}
-
-src_install() {
-	sed -e '1iexit;' \
-		-i "${WORKDIR}"/*/utils/git-testament.pl || die
-
-	if use fbcon ; then
-		_emake TARGET=framebuffer DESTDIR="${ED}" install
-		elog "framebuffer binary has been installed as netsurf-fb"
-		make_desktop_entry "${EROOT}"/usr/bin/netsurf-fb NetSurf-framebuffer netsurf "Network;WebBrowser"
-	fi
-	if use gtk2 ; then
-		_emake TARGET=gtk DESTDIR="${ED}" install
-		elog "netsurf gtk2 version has been installed as netsurf-gtk"
-		make_desktop_entry "${EROOT}"/usr/bin/netsurf-gtk NetSurf-gtk netsurf "Network;WebBrowser"
-	fi
-	if use gtk ; then
-		_emake TARGET=gtk3 DESTDIR="${ED}" install
-		elog "netsurf gtk3 version has been installed as netsurf-gtk3"
-		make_desktop_entry "${EROOT}"/usr/bin/netsurf-gtk3 NetSurf-gtk3 netsurf "Network;WebBrowser"
-	fi
-
-	insinto /usr/share/pixmaps
-	doins frontends/gtk/res/netsurf.xpm
-}
diff --git a/www-client/netsurf/netsurf-3.9.ebuild b/www-client/netsurf/netsurf-3.9.ebuild
deleted file mode 100644
index 89bfe438c733..000000000000
--- a/www-client/netsurf/netsurf-3.9.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs desktop
-
-DESCRIPTION="a free, open source web browser"
-HOMEPAGE="http://www.netsurf-browser.org/"
-SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source/${P}-src.tar.gz"
-
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE="+bmp +duktape fbcon truetype +gif gtk gtk2 +javascript +jpeg +mng
-	pdf-writer +png +psl +rosprite +svg +svgtiny +webp"
-
-REQUIRED_USE="|| ( fbcon gtk gtk2 )
-	duktape? ( javascript )"
-
-RDEPEND="
-	>=dev-libs/libcss-0.9
-	>=net-libs/libdom-0.3
-	>=net-libs/libhubbub-0.3
-	>=dev-libs/libnsutils-0.0.5
-	>=dev-libs/libutf8proc-2.2
-	dev-libs/libxml2:2
-	net-misc/curl
-	bmp? ( >=media-libs/libnsbmp-0.1 )
-	fbcon? ( >=dev-libs/libnsfb-0.2
-		truetype? ( media-fonts/dejavu
-			>=media-libs/freetype-2.5.0.1 )
-	)
-	gif? ( >=media-libs/libnsgif-0.1 )
-	gtk? ( dev-libs/glib:2
-		x11-libs/gtk+:3 )
-	gtk2? ( dev-libs/glib:2
-		x11-libs/gtk+:2 )
-	javascript? ( >=dev-libs/nsgenbind-0.7
-		!duktape? ( dev-lang/spidermonkey:0= ) )
-	jpeg? ( >=virtual/jpeg-0-r2:0 )
-	mng? ( >=media-libs/libmng-1.0.10-r2 )
-	pdf-writer? ( media-libs/libharu )
-	png? ( >=media-libs/libpng-1.2.51:0 )
-	psl? ( media-libs/libnspsl )
-	rosprite? ( >=media-libs/librosprite-0.1.2-r1 )
-	svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1 )
-		!svgtiny? ( gnome-base/librsvg:2 ) )
-	webp? ( >=media-libs/libwebp-0.3.0 )"
-BDEPEND="
-	duktape? ( app-editors/vim-core )
-	dev-libs/check
-	dev-perl/HTML-Parser
-	>=dev-util/netsurf-buildsystem-1.7-r1"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.9-conditionally-include-image-headers.patch
-	"${FILESDIR}"/${PN}-3.8-pdf-writer.patch
-)
-
-DOCS=( README docs/using-framebuffer.md
-	docs/ideas/{cache,css-engine,render-library}.txt )
-
-src_prepare() {
-	default
-	rm -r frontends/{amiga,atari,beos,monkey,riscos,windows} || die
-}
-
-_emake() {
-	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
-	netsurf_define_makeconf
-	local netsurf_makeconf=(
-		"${NETSURF_MAKECONF[@]}"
-		COMPONENT_TYPE=binary
-		NETSURF_USE_BMP=$(usex bmp YES NO)
-		NETSURF_USE_GIF=$(usex gif YES NO)
-		NETSURF_USE_JPEG=$(usex jpeg YES NO)
-		NETSURF_USE_PNG=$(usex png YES NO)
-		NETSURF_USE_NSPSL=$(usex psl YES NO)
-		NETSURF_USE_MNG=$(usex mng YES NO)
-		NETSURF_USE_WEBP=$(usex webp YES NO)
-		NETSURF_USE_MOZJS=$(usex javascript $(usex duktape NO YES) NO)
-		NETSURF_USE_JS=NO
-		NETSURF_USE_DUKTAPE=$(usex javascript $(usex duktape YES NO) NO)
-		NETSURF_USE_HARU_PDF=$(usex pdf-writer YES NO)
-		NETSURF_USE_NSSVG=$(usex svg $(usex svgtiny YES NO) NO)
-		NETSURF_USE_RSVG=$(usex svg $(usex svgtiny NO YES) NO)
-		NETSURF_USE_ROSPRITE=$(usex rosprite YES NO)
-		PKG_CONFIG=$(tc-getPKG_CONFIG)
-		NETSURF_FB_FONTLIB=$(usex truetype freetype internal)
-		NETSURF_FB_FONTPATH=${EROOT}/usr/share/fonts/dejavu
-		NETSURF_USE_VIDEO=NO
-	)
-	emake "${netsurf_makeconf[@]}" $@
-}
-
-src_compile() {
-	use fbcon && _emake TARGET=framebuffer
-	use gtk2 && _emake TARGET=gtk
-	use gtk && _emake TARGET=gtk3
-}
-
-src_test() {
-	_emake test
-}
-
-src_install() {
-	sed -e '1iexit;' \
-		-i "${WORKDIR}"/*/utils/git-testament.pl || die
-
-	if use fbcon ; then
-		_emake TARGET=framebuffer DESTDIR="${ED}" install
-		elog "framebuffer binary has been installed as netsurf-fb"
-		make_desktop_entry "${EROOT}"/usr/bin/netsurf-fb NetSurf-framebuffer netsurf "Network;WebBrowser"
-	fi
-	if use gtk2 ; then
-		_emake TARGET=gtk DESTDIR="${ED}" install
-		elog "netsurf gtk2 version has been installed as netsurf-gtk"
-		make_desktop_entry "${EROOT}"/usr/bin/netsurf-gtk NetSurf-gtk netsurf "Network;WebBrowser"
-	fi
-	if use gtk ; then
-		_emake TARGET=gtk3 DESTDIR="${ED}" install
-		elog "netsurf gtk3 version has been installed as netsurf-gtk3"
-		make_desktop_entry "${EROOT}"/usr/bin/netsurf-gtk3 NetSurf-gtk3 netsurf "Network;WebBrowser"
-	fi
-
-	insinto /usr/share/pixmaps
-	doins frontends/gtk/res/netsurf.xpm
-}
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index ac39269b243d..45dc74b37352 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,9 +1,3 @@
-DIST opera-beta_69.0.3686.12_amd64.deb 66516048 BLAKE2B 3d8644a3c61d36c575fc3dad6bd920e8bee78ee4895374391dedee6455530b3f415dfc69b027611158fbde3c84dd7d2c1d14755df9d869b8786bb0950f0cb5f5 SHA512 d1ce815e9ba92a8795dd372d123c759734feca210fb311147aff1e33cdbc406b5df75827d50c57d0d7d29ff3bd45e2c4f86001345c8feb391145100b35ece553
-DIST opera-beta_69.0.3686.21_amd64.deb 66550336 BLAKE2B 0ee1ecbafade7a9c835dd0770e0ce838ecfa8861ac2a454a82e8a3538b50c843b7058b60a79f9ab416bc51bddb52e0b88330c3da615898fc422019e26ee7822b SHA512 f9c01baff92e71f34264fa00d2ec195a07a257230eb19d599d2c02badb14f472b46d327601789059311ca832aff106d8785a9121bd726d2434aa00a4c16c3c06
 DIST opera-beta_69.0.3686.30_amd64.deb 66554112 BLAKE2B a755afb1b5b381106c9a05a4b157581d23355d04d29177519663d6860d8add4ab2e58756c5826780c0dbe15f7dd158cf6c2f0f60a3543743c5ac73f371c07cfa SHA512 7d1268ad77ffc5df93deefa97f1e7af1b21961db7d3399288e0bd32e2bb2cc70cfd0803b5a02eb1837302d6686d59961fb398a00faecd50275f81cc03c784ca8
-DIST opera-beta_69.0.3686.7_amd64.deb 66514300 BLAKE2B 2f590713571a42a6b87d1c39ecc257b0dd19455e6a08f62887310031147ff05cbe9ca1b3aef1eb68373fa58453c6cc9d72754d746a94d5d10904ca274cc6f4ef SHA512 daec2ea81ae1790a1a0550a41b84bce6b036836ded4dae18a218104fbdf069fa5574797b7e7e21278d56de49686c6f6d7a155b53fe5489309ae0d6b61d8021cf
-EBUILD opera-beta-69.0.3686.12.ebuild 2293 BLAKE2B cd8c22cf8bc8b266165ff4e01b5072eca94fcd81a71e52c60d14d5d67573d06cc3724607b0d2bd6744cf44418c0841fa25a44b514a4ca831b855f47baeeb4ceb SHA512 033fac8a61c0983892f0c5e9284b6b41b77c353935f19e37fe46ce7d4ff469f7e139858cb8bee05cdd047581633f8782431d6f9f9974bf937f64261285162cef
-EBUILD opera-beta-69.0.3686.21.ebuild 2293 BLAKE2B cd8c22cf8bc8b266165ff4e01b5072eca94fcd81a71e52c60d14d5d67573d06cc3724607b0d2bd6744cf44418c0841fa25a44b514a4ca831b855f47baeeb4ceb SHA512 033fac8a61c0983892f0c5e9284b6b41b77c353935f19e37fe46ce7d4ff469f7e139858cb8bee05cdd047581633f8782431d6f9f9974bf937f64261285162cef
 EBUILD opera-beta-69.0.3686.30.ebuild 2293 BLAKE2B cd8c22cf8bc8b266165ff4e01b5072eca94fcd81a71e52c60d14d5d67573d06cc3724607b0d2bd6744cf44418c0841fa25a44b514a4ca831b855f47baeeb4ceb SHA512 033fac8a61c0983892f0c5e9284b6b41b77c353935f19e37fe46ce7d4ff469f7e139858cb8bee05cdd047581633f8782431d6f9f9974bf937f64261285162cef
-EBUILD opera-beta-69.0.3686.7.ebuild 2293 BLAKE2B cd8c22cf8bc8b266165ff4e01b5072eca94fcd81a71e52c60d14d5d67573d06cc3724607b0d2bd6744cf44418c0841fa25a44b514a4ca831b855f47baeeb4ceb SHA512 033fac8a61c0983892f0c5e9284b6b41b77c353935f19e37fe46ce7d4ff469f7e139858cb8bee05cdd047581633f8782431d6f9f9974bf937f64261285162cef
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-beta/opera-beta-69.0.3686.12.ebuild b/www-client/opera-beta/opera-beta-69.0.3686.12.ebuild
deleted file mode 100644
index 99905f624666..000000000000
--- a/www-client/opera-beta/opera-beta-69.0.3686.12.ebuild
+++ /dev/null
@@ -1,115 +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 es es-419 fi fil fr fr-CA hi hr hu id it
-	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	https://download1.operacdn.com/pub/
-	https://download2.operacdn.com/pub/
-	https://download3.operacdn.com/pub/
-	https://download4.operacdn.com/pub/
-"
-SRC_URI="amd64? ("
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
-"
-done
-SRC_URI+=")"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-pkg_setup() {
-	OPERA_HOME="usr/$(get_libdir)/${PN}"
-}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	default
-
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm usr/bin/${PN} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
-
-pkg_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-beta/opera-beta-69.0.3686.21.ebuild b/www-client/opera-beta/opera-beta-69.0.3686.21.ebuild
deleted file mode 100644
index 99905f624666..000000000000
--- a/www-client/opera-beta/opera-beta-69.0.3686.21.ebuild
+++ /dev/null
@@ -1,115 +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 es es-419 fi fil fr fr-CA hi hr hu id it
-	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	https://download1.operacdn.com/pub/
-	https://download2.operacdn.com/pub/
-	https://download3.operacdn.com/pub/
-	https://download4.operacdn.com/pub/
-"
-SRC_URI="amd64? ("
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
-"
-done
-SRC_URI+=")"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-pkg_setup() {
-	OPERA_HOME="usr/$(get_libdir)/${PN}"
-}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	default
-
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm usr/bin/${PN} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
-
-pkg_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-beta/opera-beta-69.0.3686.7.ebuild b/www-client/opera-beta/opera-beta-69.0.3686.7.ebuild
deleted file mode 100644
index 99905f624666..000000000000
--- a/www-client/opera-beta/opera-beta-69.0.3686.7.ebuild
+++ /dev/null
@@ -1,115 +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 es es-419 fi fil fr fr-CA hi hr hu id it
-	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	https://download1.operacdn.com/pub/
-	https://download2.operacdn.com/pub/
-	https://download3.operacdn.com/pub/
-	https://download4.operacdn.com/pub/
-"
-SRC_URI="amd64? ("
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
-"
-done
-SRC_URI+=")"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-pkg_setup() {
-	OPERA_HOME="usr/$(get_libdir)/${PN}"
-}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	default
-
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm usr/bin/${PN} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
-
-pkg_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-developer/Manifest b/www-client/opera-developer/Manifest
index fe1bd104c496..e2787ad0086c 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,11 +1,5 @@
-DIST opera-developer_70.0.3693.0_amd64.deb 66336804 BLAKE2B 57c3d32bf6a21b87f85512b9bb295e9c8bc8b89d4812f27d118774810c59b8c6634ae98f9d6d93e7890809f55c330d01afe43ee849802bab51129bd42d244294 SHA512 8ed29d90a7fd6b3ed7be23035cdbcb1d43243c884e86416d5f4f1777c626cb9482772cb10a1045bbf31b8467f63df90da2096870eb9fc49956da8ac9d35174fa
-DIST opera-developer_70.0.3701.0_amd64.deb 66415456 BLAKE2B 6b9402b9cb6a33ea1da728547903c1788b1bb861c80d7c382cf299d0b091dce67a2db6026fa1b227d713c090b77f61f468e80ebca644c824c92c166c746bdb40 SHA512 1e4485f040b645789a9e4f81e9615a55f3a184e0e3675d563f4bf52471794d6c3f6e0298fbfafdccb925be142cd99796cfbda4843fe23a79cf83630add8ab46a
-DIST opera-developer_70.0.3707.0_amd64.deb 66703228 BLAKE2B 9d6f2588fbdf8803907b4e7cd235cf05fd46f9ca99e791300efa8533b6fc294f444f8dff9f2499f9ee45022729adbb398cf1bed7fdb55e048eeb24a522e8a4ed SHA512 3a6252a36b0599c7339320a975a22a9ed2a7083dcfda3694aa2f8f8f69cd66a39ff1d5108743d2a492426f8988425b38703b7e06e4506009f5d679da86a94d3e
-DIST opera-developer_70.0.3714.0_amd64.deb 67228556 BLAKE2B a2f7cf7bcacb706e5ea8eadd3fa47ca42c440307c54a937cba02b0c42193676a6dbbb28534dd2f1f860d6e9d35cc23f65500f4d5f2711074d37016ab1c92bcd3 SHA512 73447463572a72abee219d49711fc797570ffa9b933ad7b77b83c76af964f934f7a5f8850efab029284eca3e664878b98ed691e456cc81147040bb2d632be317
 DIST opera-developer_70.0.3721.0_amd64.deb 67339908 BLAKE2B 8165e55bb82c9a89581a52d9d887d931d29b0de5763c0320f1bebd930ecfec3057f97796ebf40bfa90897b8d3653989a2dbb8b2c1e88c3f930ab40be61a32f60 SHA512 bf35b6f7e94cf64312592df1764fe85b73a3f84712dcb73a48bd976c1d3a03d9578305170bec7480427e9c9e9db8a84c27f5a20aef98d1a4391fd1295f8881b9
-EBUILD opera-developer-70.0.3693.0.ebuild 2293 BLAKE2B 77ad4a915cb5ad00c8562e3383a8535382dfa64b2016e4412ccef9a2411212ae4d62dcddd795f9e017c92bbfdc36a3f8ddb3d6f43b60212741db3bf93602a486 SHA512 53e3ae62ce96adac8354a8a84fa00be95ffc4363f13e6e77b2cd7b86da1342b6f629563a4c7477daeaa711cefc52711ccb9f219b5da6cf107135ce2f219ee07e
-EBUILD opera-developer-70.0.3701.0.ebuild 2293 BLAKE2B 77ad4a915cb5ad00c8562e3383a8535382dfa64b2016e4412ccef9a2411212ae4d62dcddd795f9e017c92bbfdc36a3f8ddb3d6f43b60212741db3bf93602a486 SHA512 53e3ae62ce96adac8354a8a84fa00be95ffc4363f13e6e77b2cd7b86da1342b6f629563a4c7477daeaa711cefc52711ccb9f219b5da6cf107135ce2f219ee07e
-EBUILD opera-developer-70.0.3707.0.ebuild 2293 BLAKE2B 77ad4a915cb5ad00c8562e3383a8535382dfa64b2016e4412ccef9a2411212ae4d62dcddd795f9e017c92bbfdc36a3f8ddb3d6f43b60212741db3bf93602a486 SHA512 53e3ae62ce96adac8354a8a84fa00be95ffc4363f13e6e77b2cd7b86da1342b6f629563a4c7477daeaa711cefc52711ccb9f219b5da6cf107135ce2f219ee07e
-EBUILD opera-developer-70.0.3714.0.ebuild 2293 BLAKE2B 77ad4a915cb5ad00c8562e3383a8535382dfa64b2016e4412ccef9a2411212ae4d62dcddd795f9e017c92bbfdc36a3f8ddb3d6f43b60212741db3bf93602a486 SHA512 53e3ae62ce96adac8354a8a84fa00be95ffc4363f13e6e77b2cd7b86da1342b6f629563a4c7477daeaa711cefc52711ccb9f219b5da6cf107135ce2f219ee07e
+DIST opera-developer_70.0.3728.0_amd64.deb 67337716 BLAKE2B 408d699664de431777d38873e60fefa298b2e3dce1c1bc51fae5230cd172150753fd260459f3649c5563d34aa5c79ad7f79ba8e3607dc6f533d3e1471c7c7a8f SHA512 b055a320b92888295094d83f609ed6afd256c007fac108d979bf4f54569bebf6c39a7926f0ba44456590b77bf93452356638fc61d8323c0bab42aac7c7d5b2b6
 EBUILD opera-developer-70.0.3721.0.ebuild 2293 BLAKE2B 77ad4a915cb5ad00c8562e3383a8535382dfa64b2016e4412ccef9a2411212ae4d62dcddd795f9e017c92bbfdc36a3f8ddb3d6f43b60212741db3bf93602a486 SHA512 53e3ae62ce96adac8354a8a84fa00be95ffc4363f13e6e77b2cd7b86da1342b6f629563a4c7477daeaa711cefc52711ccb9f219b5da6cf107135ce2f219ee07e
+EBUILD opera-developer-70.0.3728.0.ebuild 2293 BLAKE2B 77ad4a915cb5ad00c8562e3383a8535382dfa64b2016e4412ccef9a2411212ae4d62dcddd795f9e017c92bbfdc36a3f8ddb3d6f43b60212741db3bf93602a486 SHA512 53e3ae62ce96adac8354a8a84fa00be95ffc4363f13e6e77b2cd7b86da1342b6f629563a4c7477daeaa711cefc52711ccb9f219b5da6cf107135ce2f219ee07e
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-developer/opera-developer-70.0.3701.0.ebuild b/www-client/opera-developer/opera-developer-70.0.3701.0.ebuild
deleted file mode 100644
index 837674712eae..000000000000
--- a/www-client/opera-developer/opera-developer-70.0.3701.0.ebuild
+++ /dev/null
@@ -1,115 +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 es es-419 fi fil fr fr-CA hi hr hu id it
-	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	https://download1.operacdn.com/pub/
-	https://download2.operacdn.com/pub/
-	https://download3.operacdn.com/pub/
-	https://download4.operacdn.com/pub/
-"
-SRC_URI="amd64? ("
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
-"
-done
-SRC_URI+=")"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-pkg_setup() {
-	OPERA_HOME="usr/$(get_libdir)/${PN}"
-}
-
-src_prepare() {
-	default
-
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm usr/bin/${PN} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
-
-pkg_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-developer/opera-developer-70.0.3707.0.ebuild b/www-client/opera-developer/opera-developer-70.0.3707.0.ebuild
deleted file mode 100644
index 837674712eae..000000000000
--- a/www-client/opera-developer/opera-developer-70.0.3707.0.ebuild
+++ /dev/null
@@ -1,115 +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 es es-419 fi fil fr fr-CA hi hr hu id it
-	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	https://download1.operacdn.com/pub/
-	https://download2.operacdn.com/pub/
-	https://download3.operacdn.com/pub/
-	https://download4.operacdn.com/pub/
-"
-SRC_URI="amd64? ("
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
-"
-done
-SRC_URI+=")"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-pkg_setup() {
-	OPERA_HOME="usr/$(get_libdir)/${PN}"
-}
-
-src_prepare() {
-	default
-
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm usr/bin/${PN} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
-
-pkg_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-developer/opera-developer-70.0.3714.0.ebuild b/www-client/opera-developer/opera-developer-70.0.3714.0.ebuild
deleted file mode 100644
index 837674712eae..000000000000
--- a/www-client/opera-developer/opera-developer-70.0.3714.0.ebuild
+++ /dev/null
@@ -1,115 +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 es es-419 fi fil fr fr-CA hi hr hu id it
-	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	https://download1.operacdn.com/pub/
-	https://download2.operacdn.com/pub/
-	https://download3.operacdn.com/pub/
-	https://download4.operacdn.com/pub/
-"
-SRC_URI="amd64? ("
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
-"
-done
-SRC_URI+=")"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-pkg_setup() {
-	OPERA_HOME="usr/$(get_libdir)/${PN}"
-}
-
-src_prepare() {
-	default
-
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm usr/bin/${PN} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
-
-pkg_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-developer/opera-developer-70.0.3693.0.ebuild b/www-client/opera-developer/opera-developer-70.0.3728.0.ebuild
index 837674712eae..837674712eae 100644
--- a/www-client/opera-developer/opera-developer-70.0.3693.0.ebuild
+++ b/www-client/opera-developer/opera-developer-70.0.3728.0.ebuild
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 3d8270320deb..5761e1ce0f1d 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,5 +1,7 @@
 DIST opera-stable_68.0.3618.165_amd64.deb 67448160 BLAKE2B 8f0c70011898ccbbbf9badbf8ba2c792d6f6150af073e033bb2131e21cf3237d85d9c7ca7ebee0adaae7a587957be8d9cfc82cacfe9cc188e42c75574f2199c4 SHA512 7d62438f42df88593be51b60625045ef1b398ade01ee33cdefa780d96505e2b469609b684741f3f0884dce7068faeb38fb6887cb89a580e113bea528734620dc
 DIST opera-stable_68.0.3618.173_amd64.deb 67459012 BLAKE2B fcb37a6491f0174710a8bd22351ec01431b292039d2671cc91243cee406d0171d05ff1e9296746bc484507163c7d167deeb2852783a62464421b2c9714668924 SHA512 149f666465b13f3fd776c4889339e19face710101b134d69b8ab30c370f155692d0ee85593127dc3e72236b7956fc5dce4971afa1a65d9c9e8f5e5c73931906f
+DIST opera-stable_69.0.3686.36_amd64.deb 66189672 BLAKE2B d92b9aaeabcbe52b2d3f2adde7764d3a94dea78c003a5fe6748afbc2f9692ad8138b99637761f99379cb14f955df4012471f4457b1876028639bc314b4142ef0 SHA512 3a1aa77bccef2dcb21d6a81ddb4af534edb27f1a0002e523de1d44db810634b3b26cd8f3d9eb538ec81566c57afb5c9dd83d837c8c2da8801360c8ebfa1f015d
 EBUILD opera-68.0.3618.165.ebuild 2263 BLAKE2B 67babdcb934021a8b2d7a094d152a0afefaf1f4c6dc4495136c1e19b94132fda5c56ed4c458e32d6e9662e58f8f2891f1c2a2b43f29d7cca5a819f348d48def1 SHA512 679d35d4704aebe44161aa5b6d06ffbea1ab6fe3ff6bbe8ac1323e4f973d21b7694ca70c90b2b016f477df8245efa17d0e75cf164a7b0c2655b603fd5afd8336
 EBUILD opera-68.0.3618.173.ebuild 2264 BLAKE2B 3030e3c70536fd8fb5f0d84b8e852ee5c5474ff7fed660cbc916c6caccdf8cd6486d6008ae833cde542551e0b30c633905a52096efcc78885c8f50e11321a811 SHA512 12828f7dfeb9c6c6cbbb0b3c8ecab0b5fa3cd7ad4cee8a88494729c37005cd2c8290fc69a9bb23546c8a7e884a36a715798370cab34267cc1b79e37518e2c666
+EBUILD opera-69.0.3686.36.ebuild 2264 BLAKE2B 3030e3c70536fd8fb5f0d84b8e852ee5c5474ff7fed660cbc916c6caccdf8cd6486d6008ae833cde542551e0b30c633905a52096efcc78885c8f50e11321a811 SHA512 12828f7dfeb9c6c6cbbb0b3c8ecab0b5fa3cd7ad4cee8a88494729c37005cd2c8290fc69a9bb23546c8a7e884a36a715798370cab34267cc1b79e37518e2c666
 MISC metadata.xml 446 BLAKE2B dbd473cdfed1e48919a7d03f61999b3bbeb294a8ab917bb438b52dcffc304d6cd954f79817b0a73a396a9d153eb5917cfba1c1bd33e419918dc8b9a5dc449379 SHA512 42d93f4994820e8ca5f6d56a94709f8194046395f9aff8f445ce2f80777a43763c124a4ab514bab55751c6a651c9d0002c61c92d77bf9c841ef9e112abd26105
diff --git a/www-client/opera/opera-69.0.3686.36.ebuild b/www-client/opera/opera-69.0.3686.36.ebuild
new file mode 100644
index 000000000000..58c0be89c0ab
--- /dev/null
+++ b/www-client/opera/opera-69.0.3686.36.ebuild
@@ -0,0 +1,110 @@
+# 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
+	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/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 5c9b5396c962..c5456ad40bb4 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -6,6 +6,16 @@ DIST vivaldi-snapshot-3.2.1952.3_p1-amd64.deb 71810008 BLAKE2B d050d8c1ef8aa6281
 DIST vivaldi-snapshot-3.2.1952.3_p1-arm64.deb 64091432 BLAKE2B 4825e2833b5a15ac1ff47e7b085fd24a5c7474f5af88db2a5a0327048fea39a63580e06279fa6c7426fce4c4a07a8bbb9cb152b65a2102d584b9c48be4e0521d SHA512 53f469d043bff2aca62bc97fc3272a786d15a5ac3c110ff4eec3fbb4e4d09dfb51755729d8793024e04cb03c0d61579e6e6974a1d42d3471272969049bf04243
 DIST vivaldi-snapshot-3.2.1952.3_p1-armhf.deb 63607868 BLAKE2B c0e8ca2afbd0967a6549f03b83fe3cbeda6f010385b15fde526685015a309aab818fd5318254900dc5d1a1390eea7abc4bef4c7a4489d77ef21f44fbdf7c8212 SHA512 f359b64968aaf1d8e6e4f3b1d44648c0de168504d59b70c622388a89355e2856ed516700daad986e65027717e354a20bd1b10ff065aab7a152e80f0336c6f9a9
 DIST vivaldi-snapshot-3.2.1952.3_p1-i386.deb 70126608 BLAKE2B 4eaa68846f1ec9f753c5e15b556106708b3236d10a87fab5e30372f8a47e75ef66709b436580ad83a61308271462e62df693a8fdcb074a116c86c1164da9054d SHA512 d859418867dd3f105269bc19e0592b46ec7d3a58249d91bd0ab9f2101c995f6e34b85b44cc7a74cfedff5902afb84f6b931ffa15b31c168e38846b015d66377b
+DIST vivaldi-snapshot-3.2.1957.9_p1-amd64.deb 71810384 BLAKE2B 30218a9333752d2fb15168aad039a4a4a2d584c5eb1836e1782a4527c17d2ec18fb31c2973e4ceba44819ba6e35aaf0ade349b74d1ce57c4886c72a88b1d08db SHA512 29e2972efd591539f89ed9f01ff2d292ad7a90a955c885e579c904692bc8db2f4606fad2ff0b257ca77a5f1ddb6f338049bd9eb14b6b25621dae3b60fb7786e1
+DIST vivaldi-snapshot-3.2.1957.9_p1-arm64.deb 63549412 BLAKE2B d08dca3583263f5f9ed3b1e809e404fb7a666da0871c5eb0d44efd72c2661ecd9bf33c033fc3c71c489267b7e33381a239937db87071cb3468c91221e94a1132 SHA512 350fbf9b736507cfbf97e6bf9598e6636124e6b9d561b39287c15eea437075fc17519922f33846d0d2bfe4a46aa4155be11d9a13581e59a62c9c4e22e0602d6b
+DIST vivaldi-snapshot-3.2.1957.9_p1-armhf.deb 63607628 BLAKE2B e9b6ccb128f3826d1dca0c218f7a7eecf1b154b3c0fb9e84cc241e3837950d94a92a46c8a341a6337fc1b0395bf96dc328931385bd38b27c78336c93ea879936 SHA512 a5f6e8c7417ff0496eab6bb7ba45c90815065f7491745496e8a49a762f72533c40d274314dfb0765cfccc07b9ba1d0b78ce265686d81d0b1ec155f01a700e950
+DIST vivaldi-snapshot-3.2.1957.9_p1-i386.deb 70135524 BLAKE2B 7af5206e09c2dd21dfccde2c29148f66cc9e485dbf8bc77fcf10216c731043bc2d1770a45b17778677624f0b963b566d0bd076b27daf61d98344ef19d72483e2 SHA512 04fc506f5c870378b5ceae858f8b89699ee312b8207e63c347b9c1f28173d407186947e92694b1dbcd1e8413f7ca6c0736e0794086c6e42880874aa2f4cb7308
+DIST vivaldi-snapshot-3.2.1959.3_p1-amd64.deb 71834236 BLAKE2B 9529e943544c52b37e54ad79e3bc5183390926d4cd3089d3a3a38b7f8546180a7314dc8b8baa96ff488e294f67793f8edfeb2c9e9838b6f8fe2e9aebc5eeaa99 SHA512 189b53f6406dfd194dcbf23fa26e1e4b82b500a770803d6190006cbf4b8f2dd4894f02ca288496ba978b5e6bdb6284bc589c82605379d1388334bbd0c13837b2
+DIST vivaldi-snapshot-3.2.1959.3_p1-arm64.deb 64105704 BLAKE2B e4079252ba4ee183457efed529dcfdaf4ea71f443dd32ccda82103f1944799a770a986b3ed64fb3a29514a93a05aa770acbceb933acdc1e5c0d5ada5375a5fd3 SHA512 03a9f6cd2fe2ee23f87e66de9dfed39b38bd008d93e9962ed4f0a14ec5843bac54bcd074fd7b2c6164c7e025ef29f6a8400388133274ff84689bd73f407a0ab5
+DIST vivaldi-snapshot-3.2.1959.3_p1-armhf.deb 63622548 BLAKE2B 2f4301ea84654c07fe6f37d4b004332ae5976da293dd042e01c1209e5c81ed229e1968cfcab71101b3feb341e2e011c7d1d780559b1c7e5411f3d7ae95df2d67 SHA512 a3be2cb7121df3c11b263f18333fd1a140a80c845c4cac6bfefc2005c7bfe18a02d9a54da3390554ffe94ba32d376406adad8aa7412d7015532f2fffd6ae5411
+DIST vivaldi-snapshot-3.2.1959.3_p1-i386.deb 70144276 BLAKE2B e00c1f233340c33254147465d37edb75933bec9f48e14c0bcbb5d33c7eed3d83688fe7e1b2a6a1f80fd11adb8bbad5ceac266b51cf2dee059c25616b082498f2 SHA512 95038df8fb53a4539038c475a22784025298f8291cdf25a3056f34421a68b4cb045f66f27339f6c313a49a05981eb85914bab8199d6bf61442baf677b0713f48
 EBUILD vivaldi-snapshot-3.2.1950.3_p1.ebuild 2614 BLAKE2B d5e4ad5b5ecdc0e50c8a9a5054d2d76847c1b561d3015a50b79f9f70e55afff3d6447973a84849e2fbb3b1ddfc96a5935493c826d1e291ec9599375bc872c071 SHA512 ceb902e8aed71a56616f4ee04a59e13c459f97d21975a0b54f9c26917d0e62763183cbfc0935127ea34605115a965d3c29f98e033f38abff5875af13abef6e42
 EBUILD vivaldi-snapshot-3.2.1952.3_p1.ebuild 2614 BLAKE2B d5e4ad5b5ecdc0e50c8a9a5054d2d76847c1b561d3015a50b79f9f70e55afff3d6447973a84849e2fbb3b1ddfc96a5935493c826d1e291ec9599375bc872c071 SHA512 ceb902e8aed71a56616f4ee04a59e13c459f97d21975a0b54f9c26917d0e62763183cbfc0935127ea34605115a965d3c29f98e033f38abff5875af13abef6e42
+EBUILD vivaldi-snapshot-3.2.1957.9_p1.ebuild 2614 BLAKE2B d5e4ad5b5ecdc0e50c8a9a5054d2d76847c1b561d3015a50b79f9f70e55afff3d6447973a84849e2fbb3b1ddfc96a5935493c826d1e291ec9599375bc872c071 SHA512 ceb902e8aed71a56616f4ee04a59e13c459f97d21975a0b54f9c26917d0e62763183cbfc0935127ea34605115a965d3c29f98e033f38abff5875af13abef6e42
+EBUILD vivaldi-snapshot-3.2.1959.3_p1.ebuild 2614 BLAKE2B d5e4ad5b5ecdc0e50c8a9a5054d2d76847c1b561d3015a50b79f9f70e55afff3d6447973a84849e2fbb3b1ddfc96a5935493c826d1e291ec9599375bc872c071 SHA512 ceb902e8aed71a56616f4ee04a59e13c459f97d21975a0b54f9c26917d0e62763183cbfc0935127ea34605115a965d3c29f98e033f38abff5875af13abef6e42
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.2.1957.9_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.2.1957.9_p1.ebuild
new file mode 100644
index 000000000000..db3613b057e7
--- /dev/null
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.2.1957.9_p1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CHROMIUM_LANGS="
+	af am ar be bg bn ca cs da de de-CH el en-GB en-US eo es es-419 es-PE et eu
+	fa fi fil fr fy gd gl gu he hi hr hu hy id io is it ja jbo ka kn ko ku lt
+	lv mk ml mr ms nb nl nn pl pt-BR pt-PT ro ru sc sk sl sq sr sv sw ta te th
+	tr uk vi zh-CN zh-TW
+"
+inherit chromium-2 multilib unpacker toolchain-funcs xdg-utils
+
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A browser for our friends"
+HOMEPAGE="https://vivaldi.com/"
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
+SRC_URI="
+	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
+	arm64? ( ${VIVALDI_BASE_URI}arm64.deb -> ${P}-arm64.deb )
+	arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
+	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
+RESTRICT="bindist mirror"
+
+DEPEND="
+	virtual/libiconv
+"
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/speex
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+: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]
+"
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	iconv -c -t UTF-8 usr/share/applications/${PN}.desktop > "${T}"/${PN}.desktop || die
+	mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
+
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+	chmod 0755 usr/share/doc/${PF} || die
+
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	rm \
+		_gpgbuilder \
+		etc/cron.daily/${PN} \
+		|| die
+	rmdir \
+		etc/cron.daily/ \
+		etc/ \
+		|| die
+
+	local c d
+	for d in 16 22 24 32 48 64 128 256; do
+		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
+		cp \
+			${VIVALDI_HOME}/product_logo_${d}.png \
+			usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
+	done
+
+	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_install() {
+	rm -r usr/share/appdata || die
+	mv * "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.2.1959.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.2.1959.3_p1.ebuild
new file mode 100644
index 000000000000..db3613b057e7
--- /dev/null
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.2.1959.3_p1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CHROMIUM_LANGS="
+	af am ar be bg bn ca cs da de de-CH el en-GB en-US eo es es-419 es-PE et eu
+	fa fi fil fr fy gd gl gu he hi hr hu hy id io is it ja jbo ka kn ko ku lt
+	lv mk ml mr ms nb nl nn pl pt-BR pt-PT ro ru sc sk sl sq sr sv sw ta te th
+	tr uk vi zh-CN zh-TW
+"
+inherit chromium-2 multilib unpacker toolchain-funcs xdg-utils
+
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A browser for our friends"
+HOMEPAGE="https://vivaldi.com/"
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
+SRC_URI="
+	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
+	arm64? ( ${VIVALDI_BASE_URI}arm64.deb -> ${P}-arm64.deb )
+	arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
+	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
+RESTRICT="bindist mirror"
+
+DEPEND="
+	virtual/libiconv
+"
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/speex
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+: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]
+"
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	iconv -c -t UTF-8 usr/share/applications/${PN}.desktop > "${T}"/${PN}.desktop || die
+	mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
+
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+	chmod 0755 usr/share/doc/${PF} || die
+
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	rm \
+		_gpgbuilder \
+		etc/cron.daily/${PN} \
+		|| die
+	rmdir \
+		etc/cron.daily/ \
+		etc/ \
+		|| die
+
+	local c d
+	for d in 16 22 24 32 48 64 128 256; do
+		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
+		cp \
+			${VIVALDI_HOME}/product_logo_${d}.png \
+			usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
+	done
+
+	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_install() {
+	rm -r usr/share/appdata || die
+	mv * "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 17f7871c554c..5e0bcc7f95d7 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,11 +1,6 @@
-DIST vivaldi-3.1.1929.34_p1-amd64.deb 70991636 BLAKE2B 5452174dc7b63762a67840008be49db909614c9ce5ef23fa2d8b2f262b8a19d645113a021d5f8cd011ef7b681c057ab119e9dfb51071cb1b06224c16183f59ac SHA512 ea4ef7de3a1cc35b6e64aaa4fd8fbd1b069fa1962357118d380ca4be2fb7f83258b7fdc62f09512f778c97fb5fb05bf0204a9988579d8b075e5a378e7cc0d140
-DIST vivaldi-3.1.1929.34_p1-arm64.deb 63497152 BLAKE2B 6c075a3c6d12e784834d26b385a9e80760b8350caf7466a5982d2435308ff82433d1824e714720a9015b13f6767bb4a0952d4e1705bad6905b30313e898ca0c0 SHA512 7b8d3c5f373d05e70fbfe29750f6a7c684450beead9ef54b33758f8847f4bb3f736f323becdbf90fc24917caefb9087f6ece1b1ef7c013fc0480f1224eb05269
-DIST vivaldi-3.1.1929.34_p1-armhf.deb 62920496 BLAKE2B 45cdb93d10338054b55385c27ff0547e8047ac9d24fbd4dddd72e94f7d8ffc23a111e8fd632f87d13acc79a7c6598d3683735b067c7fcc8cbf6ef32beca296a3 SHA512 4c218e95b13886c96b6489095f406ee18f51fe45b4e092c8fcf15737707fcabbccfbbb1fb59c724eecd93e1e20e98be9dbed3761db44f5afd641b3d8babc37e9
-DIST vivaldi-3.1.1929.34_p1-i386.deb 69389876 BLAKE2B 1b378650a72c8c6bfc088ec22d5d654fae0251a7415932e16bd29e588680132e8d75dc34fe98a5edf45339f4ae7465e6196185d8314b0e8df9303c15652ab2b8 SHA512 12e1cd1539ba13cdebc49ce962c8e4dacf9695dbfb9791191771b3f98e1518b3750ab0164df2405b3601611a0986b70cdaea8b0aaa09b4b7545bcfbdd5fde8a1
-DIST vivaldi-3.1.1929.40_p1-amd64.deb 71036780 BLAKE2B b1f7f921bfa0983ac3f5d841ed005d6f0897a7cc2aa273816648964724111d0d646b3137644246e2efe5f0cf9068799c98ef2474a9702f9b8651b2d4e2ac7274 SHA512 3a2193f21f97df386943e4fd0b249c2fa53495261aef45081c4d837ade21c85ae4e4131d8fac2b09eadc4747f3fcafaf72924c03ecc848896c054c8c7235758e
-DIST vivaldi-3.1.1929.40_p1-arm64.deb 63485296 BLAKE2B cf9f6ea2c7a0094d5bc0d5bbfc0ab79f963cc225ae86215997c67990eaf7435262711f75a4ad2d1ed4fc90638f29699ce0d6aa08a77cfbb7f6266288ff871792 SHA512 6ea9a33279dbd1349ff1e4681f872d954d8c9e3a5b0e98121e9bde0bd5c2ed6fabbfcc1e8cf77fa090264f2b5033fc5adedf8c01c4bf32756de008b12a288f1d
-DIST vivaldi-3.1.1929.40_p1-armhf.deb 62935604 BLAKE2B 094181c43b86f35f1e897b2a4da10b2f294a87a1a73dffde54344b8ec0645b88a2272d6990ac14f8a3f36a0e6c375823f735ce8de5b01fb9f7de9dfaba5517af SHA512 be5f04d3ff3028b282a4e3c2c91dd7d41ac4f81fe3fc9601dc1528864de94828697f214f1e83781715699ecb992e28f92e2483218874a50d09980edcd7b73bfb
-DIST vivaldi-3.1.1929.40_p1-i386.deb 68708216 BLAKE2B 0bcdd6796a2a6be4490501583bb91c164d76fa1105091a8ca1db0575b49d2d9a946849896a4f5f8a567dd047b7b635dcb38f4bb417cae811ad0d6457954163ca SHA512 c190a64fcf17b24aac81ab4470540a9cad15da4af9eb16d33828e73ed4c5dfce46de26fb72bf1f13d52bc5437a298d859bba4d4cdc4c5d9e5cc2fb3d90ce37ff
-EBUILD vivaldi-3.1.1929.34_p1.ebuild 2970 BLAKE2B ee909eefd804082c5c3ba23a589395f6edc0e96e0e9cef593ead4b64f46d0b25a81e7c89c6ed1eea88a0980b5ba4e8f03407e6c37db3d9d9cab3dfb71d65cf02 SHA512 64cef34c3a0239d62b82521cf07306b1ba70502354050acd2b2be643e34af9b5c282c423c1237ca34d96b0cb6557eb388ed90b532c8d84054c4e367b7a03bb1a
-EBUILD vivaldi-3.1.1929.40_p1.ebuild 2972 BLAKE2B eaf158cdcb97fba387d5f83bb7835872c696a4e3c816b561dd2134975b66f860f570388dac32df1d188c1ee318c54359dd236f608c12a02f46733a32aa6c63ff SHA512 6c27dcf77ec35f6ad8acc530a81f70f46bfec2f1cf82ed1e5d6ed4e7bfaedd406adb0e22dccc88ff151f0f760391b373841e3463b2de7058cbbaed41b14b5bb0
+DIST vivaldi-3.1.1929.45_p1-amd64.deb 71017500 BLAKE2B 8bb5ef135a2194e968c0d86a89aff026a606bf3520846f42169267a639b608322d2b3e0c3053bca0280316e7b03b477e579ba84b923e42c5b4f5ba3895217c41 SHA512 add7f3987758e2edeb9b49c342cc075fcf6444dcd27320b5db15abff1b68b60b619460d19165fb08705c7f19d69df8a200346d44360af326da0f17bd7ee0a020
+DIST vivaldi-3.1.1929.45_p1-arm64.deb 63499340 BLAKE2B 1e33c0b380ee48cb0562ca7867e05979d1bda9dcc3db64c2cdacbd6b8b9e6955e26c5b40e94ad6a9e00a6553fcf74919a4cb95d361677c313209d5ed0dbed543 SHA512 c4ef4f360604cf79aef85016d94fab3c49dd1f8bb7ac20ee6b9c79c8545d4b771918aeb51adeed1f94b4b66a6323d84ea6901c613825a70029dc2f0f501d544e
+DIST vivaldi-3.1.1929.45_p1-armhf.deb 62950080 BLAKE2B e4ffd51f6858a70fdad7669be95ffeca8dc4e9313cb824d8274af9b33a72c21b465a2926f2946f465021de3ce4aa25259cefb45f16314e7dd3c843d9f6c3b5c4 SHA512 7c077f4c3a66921461ee28dbdec80412474b5a0799f6b3bc400a0522a06840f4328c9658e7ab01dd4d29e7a7c8ff1bda0c543447ed56c8b0109be7848295f005
+DIST vivaldi-3.1.1929.45_p1-i386.deb 69392664 BLAKE2B acc2f38031cc7179341bf082814c8505f39d35e9769960197a4f30fe0c29477b63ce59245c105ffa04717849218f103924585987f95bec9b8bd39ae6eab817fb SHA512 fcd73da5809e199337ef12aa02fb0a139e184f189b835304617bfd6be77ae5cde4b28ddf3232b3351f5f28a5da93d2d694c4d2cab22371c8f7be9e724f54db80
+EBUILD vivaldi-3.1.1929.45_p1.ebuild 2970 BLAKE2B ee909eefd804082c5c3ba23a589395f6edc0e96e0e9cef593ead4b64f46d0b25a81e7c89c6ed1eea88a0980b5ba4e8f03407e6c37db3d9d9cab3dfb71d65cf02 SHA512 64cef34c3a0239d62b82521cf07306b1ba70502354050acd2b2be643e34af9b5c282c423c1237ca34d96b0cb6557eb388ed90b532c8d84054c4e367b7a03bb1a
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/www-client/vivaldi/vivaldi-3.1.1929.40_p1.ebuild b/www-client/vivaldi/vivaldi-3.1.1929.40_p1.ebuild
deleted file mode 100644
index a156328cef54..000000000000
--- a/www-client/vivaldi/vivaldi-3.1.1929.40_p1.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
-CHROMIUM_LANGS="
-	af am ar be bg bn ca cs da de de-CH el en-GB en-US eo es es-419 es-PE et eu
-	fa fi fil fr fy gd gl gu he hi hr hu hy id io is it ja jbo ka kn ko ku lt
-	lv mk ml mr ms nb nl nn pl pt-BR pt-PT ro ru sc sk sl sq sr sv sw ta te th
-	tr uk vi zh-CN zh-TW
-"
-inherit chromium-2 multilib unpacker toolchain-funcs xdg-utils
-
-#VIVALDI_BRANCH="snapshot"
-
-VIVALDI_PN="${PN}-${VIVALDI_BRANCH:-stable}"
-VIVALDI_BIN="${PN}${VIVALDI_BRANCH/snapshot/-snapshot}"
-VIVALDI_HOME="opt/${VIVALDI_BIN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-VIVALDI_BASE_URI="https://downloads.${PN}.com/${VIVALDI_BRANCH:-stable}/${VIVALDI_PN}_${PV/_p/-}_"
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
-	arm64? ( ${VIVALDI_BASE_URI}arm64.deb -> ${P}-arm64.deb )
-	arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
-	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
-"
-
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
-RESTRICT="bindist mirror"
-
-DEPEND="
-	virtual/libiconv
-"
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/speex
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+: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]
-"
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	iconv -c -t UTF-8 usr/share/applications/${VIVALDI_PN}.desktop > "${T}"/${VIVALDI_PN}.desktop || die
-	mv "${T}"/${VIVALDI_PN}.desktop usr/share/applications/${VIVALDI_PN}.desktop || die
-
-	sed -i \
-		-e "s|${VIVALDI_BIN}|${PN}|g" \
-		usr/share/applications/${VIVALDI_PN}.desktop \
-		usr/share/xfce4/helpers/${VIVALDI_BIN}.desktop || die
-
-	mv usr/share/doc/${VIVALDI_PN} usr/share/doc/${PF} || die
-	chmod 0755 usr/share/doc/${PF} || die
-
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm \
-		_gpgbuilder \
-		etc/cron.daily/${VIVALDI_BIN} \
-		|| die
-	rmdir \
-		etc/cron.daily/ \
-		etc/ \
-		|| die
-
-	local c d
-	for d in 16 22 24 32 48 64 128 256; do
-		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
-		cp \
-			${VIVALDI_HOME}/product_logo_${d}.png \
-			usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
-	done
-
-	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_install() {
-	rm -r usr/share/appdata || die
-	mv * "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
-
-	fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/www-client/vivaldi/vivaldi-3.1.1929.34_p1.ebuild b/www-client/vivaldi/vivaldi-3.1.1929.45_p1.ebuild
index f28a5ac334d7..f28a5ac334d7 100644
--- a/www-client/vivaldi/vivaldi-3.1.1929.34_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-3.1.1929.45_p1.ebuild
diff --git a/www-client/w3mmee/Manifest b/www-client/w3mmee/Manifest
index 442ba93bcf70..893527216ed2 100644
--- a/www-client/w3mmee/Manifest
+++ b/www-client/w3mmee/Manifest
@@ -11,5 +11,5 @@ AUX w3mmee-w3mman.patch 631 BLAKE2B b155487da7120b5e106c7b747a7cfc0d3157bdd651da
 DIST w3mmee-p24-22.tar.gz 690094 BLAKE2B 9b779122a10f606fab8cfe9e3ffde7473f60ee65591de3a1eca241e563ced7c70260670da7c56c9eaf39010180733933eba039d743e723b0cc8c230ef8a31d81 SHA512 85d4d373a5a544f8c4fbc37e8344daaa5eae3ae007a0280c693aa8946c8cbf63f3fc92fb69c2597286921254e3234f29ee1b3f21e1c9d498b39a597a51e98761
 DIST w3mmee-p24-23.tar.gz 697342 BLAKE2B cdfd5752a29ee486ccb4cb174ac68aa2b93c818a088e28a8938ef308030b4baac69645e5adcf86361297f79b2473de483917f523bdd0cda0f6d0d93cc0755534 SHA512 fa74b9124e0790461ea7936411f89265c8a367326bf1bba7a5ea5f4abf748197e0926847f9860ec8d35e97f0e53bcdc69821fdd9d741fc8b18b5e11211aa3271
 EBUILD w3mmee-0.3.2_p24-r10.ebuild 3831 BLAKE2B 7fc6f1094f012938a8d69f95bedcb03636247fca6b22526dc530e272b21e6845c75e3f4eed9e72ff6353d8a982bc70d5ab41daeb70b9e128a9e59a86a0f4b884 SHA512 7a622fa47ccab3f458424da26374ec12493494b12ed61e2e9fde3f128e97e693f3b5a2446b15fdae9f7f7ff62a6e3e15b6ae71744ecc619a5f416c68123c01b5
-EBUILD w3mmee-0.3.2_p24-r12.ebuild 3688 BLAKE2B 9817a47b88082f520a84fa757e9e7babc03af0959d6b269a541ffc88f795d0125a567c76e4113afcdacba5ded0771529b5bed58b5567e714f967100cd9331a9f SHA512 b38cded71655fa5e556d4e600c8d6abc13265a9cfd5991e2313c95a8b57a5f1771e3cf8a740a61c41d7e67089d777aa8da1505f067ba8c82732b237f53f25cf2
+EBUILD w3mmee-0.3.2_p24-r12.ebuild 3685 BLAKE2B d9111a284ae3efd5775c647f2b5b63f18fa74316a061ebdb0b0b7124873b2dde627dadcde6b3b5bfeb5ffc06f1ebd9598fa4e8cc236487558ce6059bf5040575 SHA512 d0bbdc2f3af03d676f39a558ce554ef28eac010acb9e656168449c446698733cd0f6c7b2b13c11a1c782da78ca33dff41921452ec6082e0ed202604c62820477
 MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild
index 96d017eb15bc..fd3d08fbe5a4 100644
--- a/www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild
+++ b/www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://pub.ks-and-ks.ne.jp/prog/pub/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="w3m"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="gpm libressl nls ssl"
 
 DEPEND=">=dev-libs/boehm-gc-7.2
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 0fc06505340e..12761ca565e3 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 8febe9fe906d..9fbc32487725 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_84.0.4147.45-1_amd64.deb 69645272 BLAKE2B 72e59a5962920ae0fe59de84ac8654ed0bd7b1ee99ccb6428dfe67fe1a015fcfbc4d92b8de7dae54ccecb51c44f23da5aedd5758c1a3a2540234e49b02f0b4a9 SHA512 843c96581ed93e5308f8b436eaf7a5270cf186ccbcd82f6dbd12cff071e402a3515bd310620027075d39b62131314039d3defa70550d0ed7ff8f02c1dd53eefe
-DIST google-chrome-stable_83.0.4103.106-1_amd64.deb 68641320 BLAKE2B 90a7183c0d5dccf3b8b293dcac01a615923f08e963b63708fffd6b19570c03e9eee6ec30707164313093a68413e671a09fed338c72341144195bd3545d9acc1e SHA512 2fc1cfbe52e79b88ab900aca87a6bc57edb0dcb9e26a37101e881300a62028c316731465235407a1aa20a459109af40e7f6349c1bc486161f1da06a83a4eb2c5
-DIST google-chrome-unstable_85.0.4168.2-1_amd64.deb 69788596 BLAKE2B 5ab77816fff94fdad8b585a7f0d566a7733d19e572fa4fdc0d3b1f457b703e20743979db8ec7a5223ed0dda34c9b11bd1eb100ced86e2377cb2a5cac991f600f SHA512 30c02dca77ed5de229ead4f0db4a9d6b1c154f2a45968958e3e5df048af74c9e35ab745eb8d2f1bbc4e62c3237041eba016cbb13a2be7cf8445f421faadf899f
-EBUILD chrome-binary-plugins-83.0.4103.106.ebuild 1170 BLAKE2B 269453f5870654b3c127e92371b5de5a3d8f04d491aad18a823fbde9aeff8bab64c15ee11edc474f23c34715733bc38ad42888c7e2b42e5a1e00938a9daee640 SHA512 66aa14b8354b1d3909a8cdba157c8869e1eda230893cfcd9ff58b8a92fb45929076e6bdeee9fb8553735ede830d6966899bb6ab74e1e083f3523138b8044599b
-EBUILD chrome-binary-plugins-84.0.4147.45_beta.ebuild 1171 BLAKE2B 01985722c4f2eb54a78db77047f8312fb5e757e16cdb154ce2b9ec1eee691ce12e761396eec7d32b28aae92c42c5aaa74182c4a5ad08fcd58ecb86dc0aff0ba4 SHA512 e75af48eb85768f957a6465c245dce9fc5c1c78519598735b31be7732c7ade10dd6d5636a53c9b75e01b656ca179c8281f20c3956c4bdf97de43166bd9eca041
-EBUILD chrome-binary-plugins-85.0.4168.2_alpha.ebuild 1171 BLAKE2B 01985722c4f2eb54a78db77047f8312fb5e757e16cdb154ce2b9ec1eee691ce12e761396eec7d32b28aae92c42c5aaa74182c4a5ad08fcd58ecb86dc0aff0ba4 SHA512 e75af48eb85768f957a6465c245dce9fc5c1c78519598735b31be7732c7ade10dd6d5636a53c9b75e01b656ca179c8281f20c3956c4bdf97de43166bd9eca041
+DIST google-chrome-beta_84.0.4147.68-1_amd64.deb 69666824 BLAKE2B 2e0c5e3bff9b8634a1960d3ed1c1cbe7e6b95dbab7fa51bbe4180f99e9c0a9dd9add35551d3711db0d9a444217aadd3ed74d68e33ae10751ba620912c4dfc58d SHA512 e1aa88090a5a92b78169ed4f67d4c6a21f6b714c4daf36bfe53695f73042f4a1790ab9272780d8a4776fda3cd0bd4a43788853cc20e7eaabd4d5ca9528edc716
+DIST google-chrome-stable_83.0.4103.116-1_amd64.deb 68648484 BLAKE2B e783a1788ec091c0f785acae36cd759f9c5d016830e33a93218e42fcbb752602eba8dd28e687187d6ab71235ad77f09249999fa02b1494e523e4df955cfaab52 SHA512 2ec0279fbdff50b19e82f508590faa9ec9401b55254ce37f3d41302bcd8fecd454c7e24e95ce0e1ef0322b9f6f91d9463334dfbcb0399fa87ca5b8163c42de9f
+DIST google-chrome-unstable_85.0.4181.8-1_amd64.deb 69878204 BLAKE2B b18cdbca45fb830c7bf34b0c47f308d19f440000639b41a342712a0f5df71cf3e13d903414e59b2a6265512370d541195560c0129c4da32c05927ddf86f7085a SHA512 a2e751e3d296e520c44e687138786881db61c98f5c881a0f04a4c1e2f7b576644bcdccc369b23e070a5afdb2bb330b11c9329850224aed696f01aafcec280afd
+EBUILD chrome-binary-plugins-83.0.4103.116.ebuild 1170 BLAKE2B 269453f5870654b3c127e92371b5de5a3d8f04d491aad18a823fbde9aeff8bab64c15ee11edc474f23c34715733bc38ad42888c7e2b42e5a1e00938a9daee640 SHA512 66aa14b8354b1d3909a8cdba157c8869e1eda230893cfcd9ff58b8a92fb45929076e6bdeee9fb8553735ede830d6966899bb6ab74e1e083f3523138b8044599b
+EBUILD chrome-binary-plugins-84.0.4147.68_beta.ebuild 1171 BLAKE2B 01985722c4f2eb54a78db77047f8312fb5e757e16cdb154ce2b9ec1eee691ce12e761396eec7d32b28aae92c42c5aaa74182c4a5ad08fcd58ecb86dc0aff0ba4 SHA512 e75af48eb85768f957a6465c245dce9fc5c1c78519598735b31be7732c7ade10dd6d5636a53c9b75e01b656ca179c8281f20c3956c4bdf97de43166bd9eca041
+EBUILD chrome-binary-plugins-85.0.4181.8_alpha.ebuild 1171 BLAKE2B 01985722c4f2eb54a78db77047f8312fb5e757e16cdb154ce2b9ec1eee691ce12e761396eec7d32b28aae92c42c5aaa74182c4a5ad08fcd58ecb86dc0aff0ba4 SHA512 e75af48eb85768f957a6465c245dce9fc5c1c78519598735b31be7732c7ade10dd6d5636a53c9b75e01b656ca179c8281f20c3956c4bdf97de43166bd9eca041
 MISC metadata.xml 262 BLAKE2B 6958ab33a832169dbd6b7077bfeae3f398c5d825430d3d85f7f37d732951fa0585a75d28766111d82e5103fa4078cfb3e3d16b98a4520b268d4fd6b670ce811e SHA512 b440c405c25f905f11aeaab1ee3721846ac26502b1e02656f773a3b3be4bc636e85af6185c043c8e94205a3297476d3d2230d6c519d477b5c7d42268916e1128
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-83.0.4103.106.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-83.0.4103.116.ebuild
index e6b0359aad76..e6b0359aad76 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-83.0.4103.106.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-83.0.4103.116.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-84.0.4147.45_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-84.0.4147.68_beta.ebuild
index 5ab3a0cae742..5ab3a0cae742 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-84.0.4147.45_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-84.0.4147.68_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-85.0.4168.2_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-85.0.4181.8_alpha.ebuild
index 5ab3a0cae742..5ab3a0cae742 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-85.0.4168.2_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-85.0.4181.8_alpha.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 6a49feb4ac4d..143cf4cc61b5 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index e73855b89f6a..4e5c3ae5b130 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -6,5 +6,5 @@ DIST gentoo-apache-2.4.39-20190402.tar.bz2 25491 BLAKE2B ce230b07ec156048c7d7c1e
 DIST httpd-2.4.41.tar.bz2 7072373 BLAKE2B 88a2390736209d5ef04bffcb867bc8d6019302885e6f3cc63d18123336d4d0657252105a3bfebf4e91b8daa02119d4a61f4c0a9702244858a3193ec6cf681c0f SHA512 350cc7dcd2c439e0590338fa6da3f44df44f9bb885c381e91f91b14c2f48597f6f0bbac0ea118a8a67eaa70ae7edbb769beace368643ed73f6daee44c307b335
 DIST httpd-2.4.43.tar.bz2 7155865 BLAKE2B cd85c7e25500f8f1b4bd6ac5f715718a61bf548dfaf36408a970d27bacbfce256e4dda255ba5b62f89e117c335d0568d6207c93e5fb0d2b1ee84dba4ce0d4bd7 SHA512 16cfeecc8f6fab6eca478065a384bdf1872f7ac42206b0bc2bcac6c0d9c576f392c07107201f39e0601dec1bbafcb33d66153544de4d87d79b9a52094d334b64
 EBUILD apache-2.4.41.ebuild 8581 BLAKE2B 0cd1879e77c0959e4240cd48b8e7b38bf46a946e35efd8a8fb75642f69d7ee0194024f40bb79ac2b428aa583ed7ac57c71f86f6e60d388d44866cf4efdd50ea7 SHA512 8efe75e056041c7cb4912c6dee6514a5ac6c68a69d3ea4148586c1af6c9aaaa2e5fc2d7049fb687cc389633c249e9584117968638f628e3e8fca683cc178d36a
-EBUILD apache-2.4.43.ebuild 8583 BLAKE2B 08fada2df4867eb1ee0b678523af1e9498025e39fcd2cafbed0c91c5c3470715584ec6d7179ae97cf230cee83eec13f8273f2747b7eac63f4cea03c20cffc6cb SHA512 51cfac568a39539adef1488a786b8403f0d719bfe3f8409ba020df1885691635b03a4a6cfd22e55945243fc89d6bfb4fa997d5922c94ad0b710f1ce2be8965a9
+EBUILD apache-2.4.43.ebuild 8581 BLAKE2B 0cd1879e77c0959e4240cd48b8e7b38bf46a946e35efd8a8fb75642f69d7ee0194024f40bb79ac2b428aa583ed7ac57c71f86f6e60d388d44866cf4efdd50ea7 SHA512 8efe75e056041c7cb4912c6dee6514a5ac6c68a69d3ea4148586c1af6c9aaaa2e5fc2d7049fb687cc389633c249e9584117968638f628e3e8fca683cc178d36a
 MISC metadata.xml 1012 BLAKE2B ca2238f428144240f64b5c9e48087a07a3f77278958efb240edeb864050ca01d1e042a37fb304fde76925fb651d7d97755d354a45aff34ac0589b7405b848d54 SHA512 a4e903bb75740c54256fa96359f6a97cd75008ffeeadfd6353648f5bfa2295fb108ec9de398956c79633bc465475f5db365d20d71caa34fc14a07c4715cc8683
diff --git a/www-servers/apache/apache-2.4.43.ebuild b/www-servers/apache/apache-2.4.43.ebuild
index f56d9499f235..ac4fa3b9f318 100644
--- a/www-servers/apache/apache-2.4.43.ebuild
+++ b/www-servers/apache/apache-2.4.43.ebuild
@@ -136,7 +136,7 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 
 # Enable http2 by default (bug #563452)
 # FIXME: Move to apache-2.eclass once this has reached stable.
diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest
index 75683832be17..da2060b601bd 100644
--- a/www-servers/caddy/Manifest
+++ b/www-servers/caddy/Manifest
@@ -1,3 +1,1202 @@
 DIST caddy-0.10.11.tar.gz 2860871 BLAKE2B 9050ee76a325c5ae183dcafec05b0d234a1308103f617908ec31a2bd8c3ce55c8d9ced9e30a36d616ff2c6f1581e1496bed4379a6f1ba3d0b5e7f9242edfabf8 SHA512 03539ae59f654d56ad0b441e7f67eb51135b1ffd539f9eb5953445089e72d3eab905ad9b08b001ef27e5054b760887a898b89ea85b48b4f852398b073e6e4924
+DIST caddy-2.0.0.tar.gz 350050 BLAKE2B 5cf53b85fa267d6686ce00754d4653013aab56e1fd076f4c4f8c864d57f924ab3fedaba4bce24972159e83ce7ae3889b75d5d0e259c8d77a0620e0b53b3888e2 SHA512 b7393f117e33529990424a78804c0e04a86ff8af8393564134066ab7b6a1d64a141b73708928209c1f29147a2f8fd94b2056f11642b8205b6de4ede6a783f2af
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.31.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.37.0.mod 1008 BLAKE2B 4927d7d7fae96f989d42ac23ac107e4fdab6ba955f3ba69140e56ceab2e4c618faf5fd88006794a20c3660e368e717dcead18289cb09608af3bd4fc4bda29f0c SHA512 24150b760cdcb32da7bcd7adf54085973c41904673ceebc13cf12609a63e68e6620737414de3ffca810525e1f69aa7b725a3b5635d114c1c2d31f13b2ca8a7e6
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod 1150 BLAKE2B dba381727351af838c47c0d81a0d842d3851dc4e4a6cce1fbea14ccef9dc21407dbe2749fcaf130df4211b083ddac015bc532f7285450e767064855cf729ecce SHA512 6a49609209f9d51e4851ed5c55a06b9451c0101de3bd92b7fa5b3662b2e85df4a667ad8068288773b9a85670c65fbba46f88c643aac290d1f65e2a44ef531409
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod 1075 BLAKE2B 370ba9f085033653a0fe9d328aca613b7feb50eb9407e55ed583d7b9302fd844856c9a1a9dca69c67c360c0a7b49ebff6ebd22946fb83c6c7061b9b8c573e99e SHA512 a58f7bd34b5ba8affd021a2d34be64e49dab0d9bb893ad25e00bf5b50ff92c4762b6d9093134b483dff2573ad3c0ebb5f42808dfbe33081cef0e96dc5215074f
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod 998 BLAKE2B 8dc0e29275055b37db12138b6e30fb22a6ccd995b3c3566efbb616f799660cd7073bfee935e41a77f311a95d0ec40ef9b5e40673ff8e59c9c06e5cfa32675adb SHA512 ade24f2b10476b5e5eb42d6f471b73ccb7d8107e6a26c5b1fd38191dc7d4ffee31552088fa5854983c47a2c4868a13bfc22d7f92f834662c75f7c4c88e0274ea
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod 960 BLAKE2B 879529244d38fbecdaea27588031c2d0d82551d8173f7e41f004dae8356e2264259d80e66953e941aa856a9613ae82211ea8dc0b12f9188f65bdf54487052952 SHA512 cbe178d04fe28f9b7dd07b0317fd4404d805e80ceada4953ad47763bafa2f215f88464c1315261a902ebcc52145af09df4c96a341e42644d38526909fcef313c
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod 1129 BLAKE2B 975226b22ad0291e83a5e47d901c79ac5a7c684010972581dc15f9713154141f3d6dd7231407255240620e29cbfeb877f05f5b5d388100a70d381f8f54f7db5f SHA512 70400a50eedc5305fef765d38f0428f636f439195d09cbb283ee7779b8aba1f881f83d894acbc6ee90ff016358aa9b117c79557da15d10fc60264eb36ed3fe3c
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.51.0.mod 1226 BLAKE2B c58a92fb234f949137fa6a6369308f104c2619cf6af1b0a727dba2e6d0ca9297521f9236d15389e40945f314fdd3f03cbaede2a5e1a2f5b96a983ddc26beedd1 SHA512 dbadaecbd6db504404c9bc700960c20678af4ba3ecf517e993589bc3b124654cb8ba5585c77d3e454ab3e5a5172c2041ef9560ed2776fde91bfa5d92c95085b9
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.51.0.zip 1283809 BLAKE2B b704166087a43d4535ea1307ca01f42db82aca7f1fae12b308f16264cd08f95a8631e8f44594370a5937ea095bf8ed5f13943c1f91f35cb5536613811cc43be8 SHA512 f37caaa630b74006467930113b86137c0d3a2736877d1320ac26ff6da628587e29537b6ce215d1f2b7304b5e75897f7644fc8ef005496e98a6a07ec530cc3d33
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod 1226 BLAKE2B d0544ce288b6beec6b76bfd106924e8a9ad50913946ae7e8243dc3e61356363a361384ee6c827bb4040976d783b217ad1619be3a34cba533940ed4ecfce4be41 SHA512 104e7cd0eb1c4a3bccfca3feb31f1530973d4829d853ee30e8e03c2ef80ccef784bc0560342d31d8dcdc6d410fe8f64a302140e452fb77d96ea2b342bfb8b319
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod 1149 BLAKE2B bc4e8c16d0c809b4f5d46d8b29112192ff51066e7df99242923eed643339599ca3d1180afe571c3e826d656d935ccc9ff1ba1b79701de859cc15364415bb35ae SHA512 de15381b36dd6691bf40592be83b4ae5b58fc92111a3ccb8cb4b540e1230dc0798d86c149884e8dfb6f93ec827447acdd7ccca2f2942c81aeafd1b035f5c482a
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod 982 BLAKE2B 9e5e32bacbfe15d8c72b4ee66a6e4124a3d58b989ecf022cdcda38e99b83924382f412067de8f6bdf3b1ecf8deffdf8fc74a8be671221f39fc2c8b11b2919e88 SHA512 86e2e042bcb371780189029b21afe24ba8ee166a9c0a4eacc314444844cfca3dfdace1678b01a213b7452cd69acd1d46b7051614569b99ac6fed84887b0e3097
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.54.0.zip 1318291 BLAKE2B 9661d100ccc33b7418c3028b6d526345b1906387599266717201ff4e96535b45cbdbf08cf32a2ca1ac9419955e5802370cec2c275a9628b855da1b38e075162a SHA512 801cba98eafb97f22b461fcf44419e4d2cd92d7b655aead6b59b16ae8c4fbeed489c633a606aa0413bb178228cc6748381426c0e8160892b23dc34b5d96d9ca9
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod 319 BLAKE2B 99d93b5a4dbd4c90f3e8dfb58e64ed41fdbb484f2348297a90c8dabe03b036ef6917c2c9fb7cc4795d0c8d25af10cefebff4c4bc1b2ebcdc876b6db8beae5eb8 SHA512 338a067f7ad15d8549da11ac146b65657923ae4fee3caf2eff888c104c0df0edcdf0d98f5be6a67a764aa39210d5cad811ebd9d604084a67049b753246fbf89a
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod 555 BLAKE2B 6707e248be1fa35970275388888eb7692f976a8fca6ddc7cf02e355f8d44264c7eef6d093d90c115670b7a3b495658b79e622c47d1c90b95684b8d32547d7342 SHA512 2df2dbf07037f027100f8beba6416c00fc115fcde2dce19ea4c0fe4a036e8f66f7ae278e9765d0fc80149a330e6dd90eee8e9a0c93aecfe16da65d02320aabd1
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod 631 BLAKE2B f7d342f7b6a9e0cc3249d9133a5408e9738957c57cedb13a64bd54d638cf85a17902bade3b452660b5e8b6aa6dbd76e0e93f0b0e4f5711856916879049f28e13 SHA512 3de4d1cf52d35112353c8d7e76df9915e92ba8addcbcf4c72e6d24c677bb642ff0b1011fca4e17dd9d364a03443710f452effb51965d95fd1571358b9aed7039
+DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod 433 BLAKE2B b3d58e290d719434bd433ffda9572fb233171493c7b81bfe353d9b7730130d5dec365f4e93a136a25467851b5f26cb21be6be06486696f010ccff1fcea140662 SHA512 8082ab039764aa6abd6615b1cf3a1830f2813dd5b791a27b7f0ebf5fa1ee68fe040a5e12988e6c91ba5d032a0a6666d384d6eceff12165d394a75ba56b744382
+DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod 566 BLAKE2B 93ded2035caa89bff7ac5a432c713751fa04791c513b9464c409524157c62d0ad19929a65126785a1d167c499fbca2289da6e6657ab182bf38234a4d2f380d72 SHA512 e7056a89df84a1027e2dcb4e15c6e89e0279d4a8bf5a45dad7778587bbd06f5f359c7addde5a5a62e0cb454032cc3ae0fc443477bf2adc3422cb0c38009f4e52
+DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod 508 BLAKE2B 9915d1d1a768852b3f262784771c8fe2e7e176e61f7d77841f8d3adac571dc141e36c6455c19090cf00a98a7a5ef0c2c887424142e2ecad339f8105b1c30f91e SHA512 8a393b8614207c22c73a706ccc3e66a8a16d2f305ab95d8f70774f13d0bcb7396b0ac5095daa57ebb991225a1db08c3110f1e85c26dd72f3bbcaf73fea536d9c
+DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod 755 BLAKE2B 2a2aa8bcee45060e8a277379fabf5ce73a2c0a0abea8802c1bf152e31522b565b969ace4a49367048672908e55142c18b3c4ad60c7a468866ddf3316c722699a SHA512 2b2720ffcf11b02b3e12e794132f0d25e5e0afa08e4d617f9d4147d8bafbb6f00c8aa4c5776e039eba4ff5c8add0b4e73c8c928f4b155c5c386f09a4e06b765c
+DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod 858 BLAKE2B 7efdc0f9b152a5f49c07fb611f1807548f81f18f3a63b54d7f6d49a2f27c40941dc2c266e2abe0cddc60844ccb237bfbfd8afa3daa3f13c3a7ee34093e1a437d SHA512 de93e34151997c18f5d0211702ffbc19cfa1bbcd77fa6d194747e1094ffdefe7014a197f3a7c28fe99ae7677dce76e049566caeaba8a067bd4507dddeafc4f6a
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod 374 BLAKE2B 4fef9f7da9f23e94efe43be0e279958715949a889c5d51e388f5b66ec9a7cdbf15a717c988883647032998facd71359ad1dcacebcf3334100144abbfa12dac03 SHA512 faf4a02a513ae4c23f931b8917e74a056c528b4267ef3b5b704949283910bfc5d41fdd7264b78d4fc1f6e5b370474a7c9933a2fad36bb5c872006def71f8ed0b
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod 953 BLAKE2B c520f4cc8fbb60561cfd33b1f70839691a3970669c34c0bc1ede45a31ea53624d9c4d2b16de25533d3121792739006faecc1086afd2539e2a1c7e9b37fc6bead SHA512 33dacd4dc65bf8a7ead2e660e6719beb7024b1603e47e705ee657cf3024e5ec06c44ba88dfd05192142ce880903e94f8dd628d059ddc357e6b42e395953a86ba
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod 736 BLAKE2B 2337ea8dca35e9407e0b4fbb200e5465cf3338fe2eb3420444b1fa4805312f52cf9ade3e2e70d9dcc4973edcfcb1fe597d132032829133808c4842ad76f4c69b SHA512 e1e51b6a44ac17f31a09b6fefea0840fd92febeeaf97ef8ce960825473b5acbab5ade353f89d5d48b5a85ebf2b928f727ec9a3f58c8e39afbec4fbb9c22e44c0
+DIST contrib.go.opencensus.io%2Fexporter%2Focagent%2F@v%2Fv0.4.12.mod 385 BLAKE2B 0f2f1cf4e6f3c7c077581eda5d58abe44a40922f77d77f7b679c7f75a060c6341b59f32d96205dbf162ac7c915a6cd0ee8fa1c38e96c5d5fa8f877a46e50d87a SHA512 39d2d0883241829c4923434d321c6d675b3d4324a8062bd70006fb88ba700fe46b0164a55f0c6bba7cf9dd667a460dc1be0b58636481f521b3ec220365028667
+DIST contrib.go.opencensus.io%2Fexporter%2Focagent%2F@v%2Fv0.4.12.zip 47516 BLAKE2B d805a71f1ca0311f3bbe3d04c91fb7665b8e2d4baea41ae68d93d4d2b8d480cd291d3e282272f40f540abcfb65800f8b3c4b48200746d72fde70230216b727c0 SHA512 378b521e44fa569606b46eb952afcc01a708f8bdb01d9bb49668f22914d8426cf64db0fbe04b5e5ee782cc7c8d39af9fc84c874dc1f7d6f844b9c55f18a70414
+DIST contrib.go.opencensus.io%2Fexporter%2Fstackdriver%2F@v%2Fv0.12.1.mod 608 BLAKE2B aa76097167ec8e4f5c737e48499fbbdf6d69cd880cdc9fb4fae17d3944c07c754457fdbfd91435d673f2a27c8fd022947dd04f30c9f4f1426c64b057b2e55193 SHA512 79bbca334f01782edaec3ca700d70c7da4c50f388c1678e7e3696114cf93c08ce334a47cfdddf31c2cdd2259267c6f2059465e5be5c77f0b61f6fd18711ab8f0
+DIST contrib.go.opencensus.io%2Fresource%2F@v%2Fv0.1.1.mod 41 BLAKE2B 639bac549658805f4d1a72df67aa74331c31c3baea598a2b27970d3561c7a7b905bcc0492ad52dbc94c34792569b3df637234f446f3ca4e487051115d7737a83 SHA512 58d1897cf3f5b661e344d5bf91b93e91d5cd8e741ea5f213687cd5ced518d102a9a92f0c6354fbca2bf88d4c6057f78d56900e75591490f0a22ea87ad536b21a
+DIST dmitri.shuralyov.com%2Fapp%2Fchanges%2F@v%2Fv0.0.0-20180602232624-0a106ad413e3.mod 40 BLAKE2B a701681a24f3354c06bffbbff75ce9ee56a1512189b5f3791cdfde30efedea11121f097b6d06f7dff40f9f651b0eab82e79bc33d0ac003bbeb123568d23124df SHA512 26c349638b8c031e65fde1387c9fad8fd99f09e2e165d943ee5ed2d1858db713936f07f640e9b2bb4e156c794cdf18f7076a559c4df7ecf39deb959232ca7940
+DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
+DIST dmitri.shuralyov.com%2Fhtml%2Fbelt%2F@v%2Fv0.0.0-20180602232347-f7d459c86be0.mod 38 BLAKE2B fe16fc3a32dfa62245da350c0082791b531fee71fc796e478326ba118ef6b939b775fbed97ba504a8712eee54a46d35081e84fbc66d2ccb3a52874fa256671c5 SHA512 a1c78474d2b67323d7d06018d53646df667fb3a6ed8ece9f6b482b4492c84cc71287b28932dde1a2962a610019b1c6290370fa100076fc185147c4406125870c
+DIST dmitri.shuralyov.com%2Fservice%2Fchange%2F@v%2Fv0.0.0-20181023043359-a85b471d5412.mod 43 BLAKE2B cff5f7b2d25e3da40a625b06b150c042b30e2ff9ccc59d96fbac61fa32662f07986d4d9ce89df8c0479119ba5ca1a2ddad8537d8daf8576bf93b1979afa581bb SHA512 20d56bff980c4af50c7dad8e3b30d6152ad71da004cc032c74f94fe132b2ed7757e59b420226b14e1900ce0f48df741b526814612c8eca1014db852ae409b0da
+DIST dmitri.shuralyov.com%2Fstate%2F@v%2Fv0.0.0-20180228185332-28bcc343414c.mod 34 BLAKE2B 2d06e85972edda7081d69a24f79d8586b56d028c0c56e5512751535086f79444b03a50c53c763ba3b4596b11c9db6407824d88595c3c23edec8e711908f201c1 SHA512 8db816cd549d69ae78c02240c9d2fcf68460264ce3bede4878f11e9bc2a722186e4d32d494ff207216503127b548453cca0c1c532fa4f433de011d9ab0296f56
+DIST git.apache.org%2Fthrift.git%2F@v%2Fv0.0.0-20180902110319-2566ecd5d999.mod 33 BLAKE2B 1876ea8756f905511c9bb18327d11e071b5595ca315e60fbb613b2bf441656e4bbb304198aa3937240a9641f51c147ab61701c6bc39978583147ebd4e62f2627 SHA512 20958dd7849b90732d66ff46316a8e234839491c7bb2688c59f9c755ea7458d810a345362d0145c9e4c15311f0d999b030a7ba53dac7266ab7b95b926de6302c
+DIST github.com%2F!andreas!briese%2Fbbloom%2F@v%2Fv0.0.0-20190306092124-e2d15f34fcf9.mod 39 BLAKE2B 013c2db2238182e2b9b4b5aaf9dc8a744ba371ba0c6e8a6c45a0f78d6704a1514fea45f6b6c585975dcaf094f709be2e6c80964cc053d32bec015ad8342c1fe2 SHA512 f50e5abcaac0ba2453bb7e8f674ef126673e5235069d4755dc38922427952dd3cb56748db564ff1d18f733e183480ff139e4a7029416ddd362eb61b560cf4d9a
+DIST github.com%2F!andreas!briese%2Fbbloom%2F@v%2Fv0.0.0-20190306092124-e2d15f34fcf9.zip 10587 BLAKE2B b57eeddfb3f83a2dafb244f84b5fa69c8afa1b06facbe6f73847c10c505521c97d4d38614c66971355f46007ebea9cfe453994ec8142d519e47cb092f118a6e0 SHA512 f1a5f2083c6fb716b41aac17994043e8e9040fe804e83a57cfc91c45537c53da0799e074eab1a0e0eab47b64588b64419ad7c23597bea364b24ea15fe360a4a7
+DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv32.4.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
+DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv32.4.0+incompatible.zip 27726405 BLAKE2B 100ff64cdefb4946564f4fdb90c4fca16b955a1d3f7e049f689f6a704d377376f5ff8eba2d3145f12750956a4d795fa3d94a6181a3b4b8c13593d01b4ad252b1 SHA512 e45c03feb6411f889bbb23d508dc973622d5ec66ec7cedda56b1e1e7a34098e1da160e7bfb839a55be194a4b17954a2e7d176a438ebfb806595dcbf910f012d4
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.1.0.mod 341 BLAKE2B f2af2eee91df96ea7cd66b57eb37bae20ff8f2e9b9d7cbf5e22a61cfeb2d5547d7e53dbbc524da6f93e2ac549de01ea1973a8a845d55ec570dfaae2d8947af8c SHA512 aa01e43906f1fb64616bd5cc8755e5360c4450b67e137aac310220f8a5d881262f6a3d304088bdb307a483d368b9059b37013cb55bf1e14aa648dc00f0652af8
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.5.0.mod 341 BLAKE2B 9212897fd754574c6a6db9511dfe56a9693a02bd3faf0fdb1da0066d8cde590e30c5c237b2d252b91a6c5fb4332f8082a7dd478386284d77772a26dfa3bc77c0 SHA512 646a4f1258d2a30aea7dc2862dcd490e3b0f4ca310edc6cdb806f31ec133f0d8caa35d07807f9d4d3e55f44d74913a6bad77d69ca9bffb78912a945d094be4ab
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.5.0.zip 101531 BLAKE2B aa4f94f34f1c8d973e8cecb4c6eecb296d883d9af3d170cb8e455353492c4717c5a519b63608766738b7853546814d3a94b68f547d7973ed7f573c43b71c5d25 SHA512 7cc007d5d1b4ca47f5807e01e33084923e9c464a0e961f8f453a18dd8b8e00a6ad1061028fad6ba88723d6496fe1b155cc3369471d356db189682954289646fc
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.1.0.mod 325 BLAKE2B b86f1fa5b624cef378cd6ca0c6056b327f86a5a866913eeb0fb4dfd12e07527f15155dc857b7c81872e931cef23109f3b41678602405ad2dbe31d3dccffaa65e SHA512 dcc45c20fb11b9bd920a1107cf8b2ee80cb969208835c4a16457834b33bfbcdc12d275ed039d4494dd9c4dc068ce3052e50f2c72fc08df504dc2e0f4986d8cdb
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.2.0.mod 325 BLAKE2B b86f1fa5b624cef378cd6ca0c6056b327f86a5a866913eeb0fb4dfd12e07527f15155dc857b7c81872e931cef23109f3b41678602405ad2dbe31d3dccffaa65e SHA512 dcc45c20fb11b9bd920a1107cf8b2ee80cb969208835c4a16457834b33bfbcdc12d275ed039d4494dd9c4dc068ce3052e50f2c72fc08df504dc2e0f4986d8cdb
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.2.0.zip 43055 BLAKE2B f5747d6235bb86c739840851f2a09a8761ebaa0e7346c592afde71b9b52aa07304d3d55ed699e3d31f4bec783991a7c2f0a2a3cbe84a85137624ce27130cadec SHA512 a04cb79ca262375490e7f27ce9504c5ac2f0175bdaebc19086916e8d5f5e64fb30f36a1f179eb1e62accc26bde4fd7a29b2c90e8fa3b904527476b8d3c2d2723
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.1.0.mod 324 BLAKE2B e70f7e9ea7268554eec7fc8ffa311786f34bdcf24ef74867a137fddbd8c904a297d8d82fffd5447d60fd2d1894ee58efdac1ab3222dd8ad215333f76075a0471 SHA512 86d1f4cac7c2722d47bd11d2a9e73c38b1d2cc918413832d8d137470297a391172cf749c95d9e555d53fefc3bcb1c011ae2b4be06f68aad37c9dda6d5fafde35
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.1.0.zip 19915 BLAKE2B d644d8de0912b02f78ac9d1a49f068e7078ae9d2a90561d6d1b46700c98141085192eade007aea1a29fa17daa3dfdaf0286d590f3ad8c2cc57928cc226c5fbac SHA512 54c9b01fdc7eb6729d889d247a214824356393ed898f9f970284ed0c89beeeb45ee103c1c00bdaffa8cb2f310a2c3d415450e6557b6f8782af8dc5e2aca6b3d6
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.1.0.mod 256 BLAKE2B d3030e07c446ba97ad6b1894515d75966814cd3c07c17295600c2362b2ffc34e017bbbcaa33e0c34061f2d0ac3784910e1a6be0dbaca05f940bca968d49ed85c SHA512 a80f3558ada796492497e20d3775269e3bc9adf66f862ee4f4ae1435df87772afe21a111160ae94b0f6b62fecc35a0c0f0e51167ffbb13a4adcd96f71a8c6aed
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.1.0.zip 14818 BLAKE2B da456b3b959fd7648519ff76e17a32f0b6b859f0fb97ffcf1d84e56cd927d01e0f362430ea860650ac4270738b20a54cdfc52f97766d47f12750d0dc24ed25aa SHA512 25671ed58abebf1702f978a33b300bc20fb7b0afbd3b5be01d69feb6a52866db71ab6dea0560d3f427adf2f57e0eb11fd7686b43466c4fbbf03cd0d3106b0bf8
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod 59 BLAKE2B 7816ef9919ec514b2eafce6a859edeae85735475da10c34c64ecaf9a53a07748b02a424bd0a16b0413c499a2eacea0fcd6ce7807b651acd9f67ecd00b5fe55ce SHA512 d5eb17738399f8b8e1a1be409ba5b24520b848b3be5fced46c726499f9df5bf5a54233c6c0c9b8fe896834bcf5132f39ba0b91bac0ce6347b9aef7c8bf93f912
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.zip 17111 BLAKE2B 67e9376554073b3fe82834226831bd7ce92d34c9f75240c3423aa3db4e5ce3cee445bf2df4f0f24a61a4f3823c33fbb92e0986f0e5e6860dfd4f5d157e2c5047 SHA512 50182309e9823fe6a3af86a9beda7ea9a2ffd798cc0d9a97481324a205db8ca50f524ec1b482cd9d8ade987c6e7dcc511c2d6937f31d38195f4b496d42e63bd7
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod 60 BLAKE2B b5b6b8c4b80b9fb33bdabf18d6d34357cb207329df96da5fa36f85c18a62135da9d1550acc17eda531ec3fbf225781c5f9fa8f8c4a50730a8bda95e9fd567fe9 SHA512 98a8b2ccac214ef2a701c0bca2bb3512acdab19294d516ae6c8fe028d87393b055aa2e589cb273704ea4f612a1c949194014394aeb7d8ecd92233401e6ca35a6
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.zip 7983 BLAKE2B 22238fc6ddba4185512ff00f183818dbde9de85459bf2e5803512e1455dbbefc4eb2159da6cd9fe2efdd23955a82646c1f0157fd5aa2e14ff8b7c6263b67db2a SHA512 eeaa064d00e98129c200ac6455a2d95d81ca4c99e90fa11cbd658027cccb73500bc4a2ddb910023f5c288d4054e10f70351f344beb6ec8e06b2c4aa881719d6f
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.2.0.mod 57 BLAKE2B 943afb01beaa46a8b9f7b3ec18cf3e497376cbb1fa0a2d1b259a6bc127a85373ad15725efdfc27982798b597c57e870fcf7c192ce492ccebccecad1c04ee819e SHA512 785331243801e29ecc1ee2f3c28d665eb5faaca6e734468f378f26626ebd93d4c2a4768a7056982e18d650a108d7afd5b82f13a68263c9b18a95a79601248ec8
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.2.0.zip 6952 BLAKE2B 6e09b7dabfa1789de1d13df03d6b77168aba9b0b61bdaa96dea8fb16a81edcd6636d959fa25856944b5c924379c79e1f7ead21d645141ee72ea88bcc79b6add0 SHA512 3e6375343e88c4624d7268d6342d363c8a46ccbadb43fb95709f42ebf618ba1da32fcce0012a7374aada67cf7b2a2e5ffe5da8e05a6bfef207453c981343aace
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.1.0.mod 109 BLAKE2B faf0cee9d111fe3b2cc1b152bc70ae800cc1c562680b054b5d8ac93706fc0e3ef7db3779584838cbd37d6ae65154fb7bccbd1d9bfd6465f7a08be0b28700aa61 SHA512 1f82cdcde2070ecdfb57ba52deca35fe758ef4c6c48c924d3590fe036d99a228dc92d736e6fc58f272b88688c817f7763d70c47a223c6be69d7be288932f98b0
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.1.0.zip 14608 BLAKE2B fad300e37d768645ab304ed200fd5a1bc601d489840fa6afd892d23a243fb401192ecc415c3f661f05f5a442b76488a034170364df7f7f2c313d59c0e34c321f SHA512 2078a2a7db282ceb6b04188a1824d8e20f7ab162573affab6795903590c3228e6a21480a8d12898544fd209a5363c9e567354d7dce5c5ee718507496d65c5f72
+DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod 52 BLAKE2B 83e3b09b165e45af373e2e62dc0b7799ac204794e1922b4134ebbeba4cf6cd9b6d883f6035624f2421e8ae613d071a2e281379ee4935e55b73540ad8104d79cd SHA512 ad433e42696f3b605cdb12c70438d3b1a4d4d52890cb28b8e76cb26bf1ae51f324e6dbe2043bd74bc9086efe743da65b8cbddd10618f4b59d27858e0898279d5
+DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip 9362 BLAKE2B aef4f369994d869906ca45a1051cc706579525324b8fe2a5c98dd4d80d4181366ff7e3cbb08f3274762a6f2ab2259a2770fa11a9b088b07ff3abf1a241d01814 SHA512 f81a070b61e026440ddd9b29174fd1d59241eb32d1fb4a2202c38fe80022aaff07b389ed6d75eff27da9408a7832f74c51f3c53866774cd9125e83c9f258bb61
+DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.1.0.mod 143 BLAKE2B bfb3edd23d9e9003e08c894d276c042ea89fbe295e637200f88876154802ef1924077aa5cfe587ad96dffd977155a643079c04a093bdcb84c9e6773b31f1ce5c SHA512 147081bdac67eb26ead7a821787365400cae68dedfd77dcadb9cec6b982f4ef702a2f94d4b5098b602b2630712f0146dc035a07b68a66e0b125f70f1d9293a36
+DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.1.0.zip 13692 BLAKE2B d97db70ba698d8cb8ce174acde65805c57e1b61c7374ed32b1cc8b124e52daef9a3aecd09804d533fa178adcdb2de36b6c4029c6bd87575f9e5a2d3c3aa883bf SHA512 991714cb6f87845ccd84e89ec3327f882042130aa1c549d31b7e73f0c61f5b03645e7488b649b0f7907e79a20e0250b7036321196be1c98d75e84855a7f1b82e
+DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
+DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
+DIST github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d
+DIST github.com%2F!geert!johan%2Fgo.incremental%2F@v%2Fv1.0.0.mod 53 BLAKE2B ed6781e3006723a251f94bf5f96aba2964e7926617255ddedfb932ba74fd3265fe28ec906b90f7f1956509f521dc2c29701fcc7301513eb1a1764d33e50c2c8b SHA512 e46209635777bfc42c4399ff0eef13320a9b5d7a23dbe26f79da44a462b14941a949d812c586c023e3b4e617e741612ada3db8da7ae4e70ab242b8ffc123e880
+DIST github.com%2F!geert!johan%2Fgo.rice%2F@v%2Fv1.0.0.mod 349 BLAKE2B c25e546d66f5bb4679a66949169f3a4568602a7b6f8ac1386bfa7993704d79821c07d4f0931cc2779fb862b73465ed41d0f050f59149bc39dfa1602ea706f207 SHA512 51a8db67904d3f632dfad620e223c7b59efe42d8254bd4e0ef49ef1a40759e1dbe4558f87209059841b80e0ccda5130cabef7c869a399eff3786d4b4d8d3a747
+DIST github.com%2F!masterminds%2Fglide%2F@v%2Fv0.13.2.mod 36 BLAKE2B 90eea1d6bfb78f872b781706703178c3c010c549c94e28eac0b3ca2ca2ee4bf126bb5320fa8bc0c22aa2aeebb2361572081014253d12a0a8dcfcf28ee607a554 SHA512 37cffb84d5a0e51f4306f042f62a549cbac31f714b497a590149c78d1a16d9b9fb7c3ea9c4c89856dc38b1548fe18afbb537628f0c511faab6a4eb631bcbf43f
+DIST github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.mod 38 BLAKE2B 6bb3112d9b8ba6f9cf4d0c4ee376da93bf21b139563a211c51ee44a302caf9670181cd27f7e21c6fd05bf87c9273daa726c942749ffb18b623d17c7170aba6b1 SHA512 a3c38d1db1472c71e1c47b936d47ac2ecfb49519c2e78dd453d234f1a6153bf007eb96fabe0be7dcbd868160a3869e854ec6776356b9011fe7ef51a634b30aad
+DIST github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.zip 21259 BLAKE2B 6ebd8152517cfcd5e883bc56dbb3d347fce7ac09589e8ad5a96af8d39c5e18b284e616cb1a6f6641084a34c07e59d4ded65b600dcc9041c9af59d26afd368993 SHA512 5800ddecf3717ea31dd991068c785053b9c6cb5ffdbc97b681bcce4219634362acc7811eec766117f0087536abaf0eaa22b8d66a44103a1644e5907e3174dfae
+DIST github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.mod 37 BLAKE2B 60b2ec6aeaaece8fbe3ca154b432f677dbb46672fdbc95b503f613190df535c7254900c9cfaa3319ab2d7562513640c7cc9fe650d75d97dc09fe84a17e359a86 SHA512 4f01cd11b3ae6f26266154ee37e7a4084e61e865fa9427187a24a02631415f2367a4afad83b4e1cf772b263aaf8f180b4b177e30ae884cdcab239919c9e08bbc
+DIST github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.zip 20216 BLAKE2B cf3a8d5190067f8e58d632df761abcf3b122f7ff384137607a90b1afb23a42deb63a348dc1c1003d043a607adb7da997511c136d728f2c5fd553b2bced3fe62f SHA512 4c6cbe7e391a6c667c74b2cbd5f71be014d3f4cd5f384978fd4c6e2847b6e66ee6d5aa80cdeadef1e1edd6188a92d9032321a5365872ee18970175070b33c182
+DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.1.mod 49 BLAKE2B 75301dd276a9f53c22d9d15f2ec4fa32cb90eeacabd9ddcc604d7f306d7e9481f9ed3f8f8bdfa5090951623f2ad2bdc671808dd8eae512bf911be30a6b93cc99 SHA512 7b9615ed8dbc53987e0370b5ff24bf62bfbf4cd3644859b735dd267826ce75177666106d8447a113dd508542086919336c82819385c92ee520082f6f6ada7ac9
+DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.1.zip 29369 BLAKE2B 675db8802b544429f3eb3d03016b3362d17aaebea0ae931b8d610afa1c2b38baf78e591b640f1e180a96f5c32f5da50030a70847de3e6d831a06af8a4d7d95a3 SHA512 3612d456e242b053cf9af4518aa101a3f1b2d24893a2a7cceb9943ad0a1e96a139b48f22c3a8055dce13e05540f9115241ef6e2e09d78ddf37e61cacc3299844
+DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.mod 49 BLAKE2B 75301dd276a9f53c22d9d15f2ec4fa32cb90eeacabd9ddcc604d7f306d7e9481f9ed3f8f8bdfa5090951623f2ad2bdc671808dd8eae512bf911be30a6b93cc99 SHA512 7b9615ed8dbc53987e0370b5ff24bf62bfbf4cd3644859b735dd267826ce75177666106d8447a113dd508542086919336c82819385c92ee520082f6f6ada7ac9
+DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.zip 29035 BLAKE2B 44ceec916a8ed19a1e9bbc3b4b4f325e5b9fe1d55991553f30eac70b3ad3b93ae92b1f0487ed57354b40db1b5b1458885a127c5db92a27ee806b9f8f1498f3dc SHA512 3954271496e703d876e1bd9716ae1bdfcde08335cf20915aefa71c5ade8a836733f0635005d9eda8b01fb1991dbfd25d0df2aa71a1d52ae3677477eb34382aab
+DIST github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.0.0.mod 405 BLAKE2B 8b1bba137a8b24663d45eac0ed56e83f148438910e8dfef338cad483c366624dea27eeb84bee8b699640002c7f2db21b564901a318a409809ab3fc41526a68d8 SHA512 51877bb3be8b8a388b82ed7876dd4023ebe4b5ddf59ee30c5ecea31fe0420e1f93b963d160e4b91185eb33764015a3381c4bac4dfde60548a800b5668bae4a6c
+DIST github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.0.0.zip 65549 BLAKE2B adf2f127d73a027e234dfb60dd5edb84bcc08ae8f378429c192a1deaa021ad2f4b592412475324ca187e33a6500d02b3f5200c42fc9bd54cfb290c7599da5d43 SHA512 2596e3f541f941b9337289fe3a30f2e90b617bd81d7444c90c8f5fb54e18484e9c7c12e88ebdbab3d18507d3847566bffc464081bd81708771b5ec9b30bd4d29
+DIST github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.0.2.mod 405 BLAKE2B 9c6d467ebf1d4627bf376f7865a64ec587bbddc41b8032daf75b67cf799cbc1c6a30d7669fad3463cf58d0ff51d3aa077a81e85ab007809ee36a82fefb1374b7 SHA512 264a23b0fae206105a5cc428d7e3c11793c4cde9c5ba9f0db326d22a903d4652a7002ba353a574a5da50b289b2d07f9d3371d82d0aa5968cf4e9ca45cb921993
+DIST github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.0.2.zip 65647 BLAKE2B 76553a2c54a36401fa6ef3c374031bf593f209d692373f78ffef942a27dc5d7d453c3f06382acb8ac6c1c0eca87c8cddb0038080f07b5d61aa0050d462936e6e SHA512 5bab547c857895610fbbb16c589ce96f0025b19ec5da08d2249dae2815c536cd1f9def2fb2767fab49ffa6ecdd52ee1b769a69435a78e63ef03fcd046e18d1dc
+DIST github.com%2F!masterminds%2Fvcs%2F@v%2Fv1.13.0.mod 34 BLAKE2B 3775b686ef0a7d190a38eb6cddc8a2c5d0dff7ffc656dc762ea8733def2abc81fdc3f990854a9e3e97cacdac3149be6a05f7b271cc7f8d63d11ac3512f2d64e8 SHA512 c5c6e7621f9018f117ead83e96a26b75c7f1c0bf2a71579bcdf494e1bc49553c4def4b4246f740970ed52851a66582695702c8fe2f619073e6422e593a350143
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.mod 177 BLAKE2B 1b5b5169436173ec669c16023c6993e233f5fadbb574533e7e2db2140c2db22cd9b8697135a46fe7d8787b8e5ae8c16019f15e5cd7a8c4ad59a46f6e6db9bb5e SHA512 83b5d04d488db971f78cd1853903e7f5cb1d547d5b5270bcaf35aff4240f0b96c300ce311014775028e1424c6fad714991c27f0c676d8b8eb37aaa62330450ec
+DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
+DIST github.com%2F!open!d!n!s%2Fvegadns2client%2F@v%2Fv0.0.0-20180418235048-a3fa4a771d87.mod 41 BLAKE2B f15406a71c1091ea2c2bf262a96e7976a737914548702da94f1c0353dfd518f03972beb46d743915fa7a6173bf47ca94a853c40266e152386fba9a04bb688e19 SHA512 39317e44be189a47107f71b302a895ab57721d39c464aee35080866486b67a0f257151e1e4f09893e3c87626d6558917b68ce69cbeeedd8d9f341683ffa14683
+DIST github.com%2F!open!d!n!s%2Fvegadns2client%2F@v%2Fv0.0.0-20180418235048-a3fa4a771d87.zip 8063 BLAKE2B 4c1eafbf2516c51fd76cb712e5ce034dfe30579ed8b1182317b699a11fa27d32cdaeb64897eb7c0aeb5388551b27ef328e26f09a75db66d75dea1c09b3710726 SHA512 b03a6bed0f788c7e54be5bb8f01622d8ddbd95322bed75d8173c712b8e4425f0a925184a28f7690a9dd1b40d0fd24de012a4bf3b1b2314258ac14bff7698d7f0
+DIST github.com%2F!open!pee!dee!p%2Fdepguard%2F@v%2Fv1.0.0.mod 39 BLAKE2B 8a682140a1d07e82263b0e833426a913fe653381cda13a51ae57546b3364268706318eac76964341746db81863adf5d617ae6f35c5f99975b7678760e1ef98ea SHA512 d513ea6695c5f40b36e8f861d4004e3c8d222dd6568ab60b836dc80608e7e58cfb08e76718a706ad6064da16e3d0d75bb90cc5a33b4ba3a1e0b1db8e6eda7eb7
+DIST github.com%2F!open!pee!dee!p%2Fdepguard%2F@v%2Fv1.0.1.mod 181 BLAKE2B 782362abfcc93dd6f0f126f984278c01ecaa0705d17aeab67fc8a20148a3dde607364b8e3ce2d9b1cfe06f12ce9a6496e1b755d47a407f8990c97a7229480044 SHA512 687061c188f7641eb6d6e88d6aaaee50ed03debe5b8a15fc4e62ae9c25fc00ad449c5d4f6b35d12172cff7296b9e5ccab21cf36258ac9975d10540f2a2a7188d
+DIST github.com%2F!shopify%2Fsarama%2F@v%2Fv1.19.0.mod 33 BLAKE2B 7013f44d03c22c21595c5369c52e1538a526891c9fc4cccac37373504f13c66d7c504552251f46632917739dfa1d6c3a15e15aec4dc03b9c69902b0bcfc8785c SHA512 db3271d8abd514934ce5d06fd20f7490db8368e57822a2379bbfd4ccb94e67354400d487d388a57467a5a16cec339cbae9488cecf82e41d85918639bedaa0a87
+DIST github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod 36 BLAKE2B af7b84d9f1cd163555b32bcf960b28b64a5689a1c9694f430af310f5041cd967fcf0d6c1a6c4020478544d347e4ba5b2fd16a6ef54258d33314ee0ad9239752c SHA512 917ada7ac198a013d2b090dfc59a45bd2619dcb7227df1521ca38a0d822fab12ea8c158c526257fef4ef506af29d9fa678e8dc2a73fc13c8dfeb57b398801744
+DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod 36 BLAKE2B e15c1ef74374320cc49b3509a1fa8d7f63c8566920ba56f8b6f293e3d331f5587d45b35284af52b40f329e116f570543a7df50ab1888c4238b28c2ea583d2fda SHA512 83f296ee872570bab84dc3e3f7984f155f5a9a4f95ca7b23a5f39dd47b54eb87ceb2eaa4db00a3966def5b41fb0250de18bcde32610c350206b6d0e744353fd7
+DIST github.com%2F!thomas!rooney%2Fgexpect%2F@v%2Fv0.0.0-20161231170123-5482f0350944.mod 39 BLAKE2B b49daff3c8e735878c317b277419f4397f3939e23d325fa4d04227d3cbc35c1804ec51ad606cfc35ae7476a53c5d225c0ee7af332a802651106bfdac51469f64 SHA512 62e6c0d8e5e81152343265c96c3eb5cb85585e809d89c834c3b591fbc7f18b97165c4c96172e8b66a7dd699dbd54573453142f0d37fe250033986390e2ed3a75
+DIST github.com%2Fakamai%2F!akamai!o!p!e!n-edgegrid-golang%2F@v%2Fv0.9.0.mod 634 BLAKE2B e7ff0f70c7650f9d57e0fb79eba9b50f7ea9e352cd18a2561d1b62ac94310360b43a90ebb4086d52af1927e6b869f4570d6cc1fe4b8646b3f5d8a69df8c27e34 SHA512 724da9b6712efe9c87715625ac19bbe4e0871b4d33834f9024897cea872120a0f5e30d09e4adc49541b084880d6e48f3c7029ae4c7c48e9204c8ab2f29b0355e
+DIST github.com%2Fakamai%2F!akamai!o!p!e!n-edgegrid-golang%2F@v%2Fv0.9.8.mod 408 BLAKE2B 11e7723e9fb19e41ce67038a676a8d310b131b5046bc363f5c473c1c6f7317cc8cc331d28bdd75f4cd50a9b701f78c7da3d4f964002aa6bc5acd489278bda289 SHA512 ad1abc2d3e3cd6be0791fd7e3a094c338dfa9cac062d8027170abbab8a7f88f910f4911d2cafe5f67d3544b996e6558b7aa02351204b1a97eb7040eb95e50a2c
+DIST github.com%2Fakamai%2F!akamai!o!p!e!n-edgegrid-golang%2F@v%2Fv0.9.8.zip 203136 BLAKE2B 0a8cd87892ce10a1460ca56698506109cd897fc2f3a53323394ebfd065e50686905f8f93e1726d4d778915979a9d87786d9062776bd1d8e22abb03d59090bae7 SHA512 8da03528a9909c411144715ac5c3f843b0b660223dd2caec7e50bd2c98989aa610933d76bafacdffe745310081c42bcfdaf3295b050ea91024260bd33ddcb1bf
+DIST github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.mod 39 BLAKE2B 040b84d78188cff54576ac29dc39bcb557c56bcbcdbf6767a3321163859ae29dddca6e8b3294490238eaca9da7281e6b48ebcc6045a38c5f31795d0a831103f1 SHA512 4d33264b51c07e85a857699f5dc7b1b8a45cf1a330d8bc333525cd22513c4aaa9ddb44530e2f3e47192b21c72ddbffe465c31672a4bb441b863d90020a631a4e
+DIST github.com%2Falangpierce%2Fgo-forceexport%2F@v%2Fv0.0.0-20160317203124-8f1d6941cd75.mod 45 BLAKE2B 451da80b89b0c53a48baa253fb4899701b97286de7c2fd501aa17d5776c5013a9e888a36075d4b1eda1c9c4bc123f64a007e7555d09b6ec3d828d9b15d3ef2a8 SHA512 3f616622bf613f062fd222135532d4ffdcf94dfa5dffa1966619f55c446aa8186ad38470b0c23a68d0cd1de7b0b3f2b4471a1cc61ba73e27311702366befdae8
+DIST github.com%2Falangpierce%2Fgo-forceexport%2F@v%2Fv0.0.0-20160317203124-8f1d6941cd75.zip 5901 BLAKE2B 0d89542d018a40bd92a755a630c6b528679b853671b018fedd5934e271528f8cba2a7c121ec8be4306732a795482c161e301fa578b2f50970c555ffb45a03eb9 SHA512 26eee92b278a89ea30eb1bd9c105dff9d96d662d7d3b4ff255caf3fce6a7ec660fb3f01e3209ccb66358d70cf7cb9354027dc85824f54a7a2b81f889028823f4
+DIST github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.mod 36 BLAKE2B d0745757255951a92d471fdb1eeaae2e118d367caf0fcea00a405536d7e30609f22276e7a453aac1ca38063635df798a0843f279c178d394a7cbef9c9f9b3c27 SHA512 87ff97fea3e25aa903503e56fe5afc337918f7253dd7175833adb144a7296451a7d4ebd76df504737a5b4c5237b1102920728d21a587957d5d25db5d38e1217b
+DIST github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.zip 73310 BLAKE2B b0aaa346be477c14bd504f98219659c8a82ba08afdd94f1a5ffbb44cfcb6cc9b014c1ee35aec6071d4733134931e6d2a569940e9f1f06a5e69b00f56d82579e9 SHA512 adf9a3b8bda92edd028f497ca10648900a7aac4dae9372469b511afc74e79f8b990e448f375ab2a8df651a491bab5413196c06db531adc10358865f74de6f26b
+DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.2-0.20200305040604-4f3623dce67a.mod 674 BLAKE2B 41eb6ab1dedaf85f4eae33fd39f9bcaab0aad42ade09b145bb36f0f1e254c8e0b55584f4bfedd0c813ba7bdd0c26ba2ea09b8af9e8c7b622710550918d9c02fe SHA512 b8d1d453815756d8d12d6a5009921a7967dee726884bef700ddfe5318b16a29f834734857f223c6d6a5d8d676c65d1c8ccdfbdbda849969c0c572c63adb59fa3
+DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.2-0.20200305040604-4f3623dce67a.zip 787011 BLAKE2B 9547a16fac8182b8c24017290c1399209df4e950431aa58ddbcc8ddbbea1b40c755f0f373ea7069d5e58a83156d479527176ca8ff8d9ade747ccb03b7d550c45 SHA512 9b5e4672141b347c2e9dca72ddc0deb5b18aa4211902a14f496980501bd1490e510c1b570f3d110696a884383e96a5bc705e8ac20ef80db5a5cf8afefe1534ea
+DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.2.mod 674 BLAKE2B 41eb6ab1dedaf85f4eae33fd39f9bcaab0aad42ade09b145bb36f0f1e254c8e0b55584f4bfedd0c813ba7bdd0c26ba2ea09b8af9e8c7b622710550918d9c02fe SHA512 b8d1d453815756d8d12d6a5009921a7967dee726884bef700ddfe5318b16a29f834734857f223c6d6a5d8d676c65d1c8ccdfbdbda849969c0c572c63adb59fa3
+DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.2.zip 764704 BLAKE2B 5d71f83694161f6c38edc1074d6f092578699c99287c52f1002eb6313f0e8f475a2e353f3fd629be30b6371732b1088ad8daf66660f68514be01fb240c169fff SHA512 ef6bfa7b06dacf38db3a533b8b5b175ea4edb0a75bbaaa540ac6914ba2e1536bdc1fcdb9051ea9f7acd31ca70c4dba37cf6ed73060747fbd5858d518fe200294
+DIST github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.mod 36 BLAKE2B 60ece6720c6735e5b01efc335fef7d7f1186087068e573d5fa073b811053ea60b761350f9c371dada8cdeb5b285911c4ff87495b800f9c19ffeb69739f4b143b SHA512 971e35af5346054a0930f5543dc936c5f32ca801433d3ca26461ae7c1583b4f814376e8880f4d5329c46c36a3bde5ee4290b825bf19fd70c6bf2fbbab03f8ff1
+DIST github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.zip 4919 BLAKE2B a939fbc897831f04ef6995f3d6220d56b8b3a8e3ae4486b605b9601aeb5bf764249cdd619248ba55b650e15e208a720fe1571df99a850a0b742755ab36f86c0f SHA512 7947f0ed3b2b42b8454af3cfb0fb27ec38af8234936d7cfe29017d1168b80873dbb6ac1345719fc5c405df9c814bd732a4ecf6f985da880f4ad83cf2f25b7834
+DIST github.com%2Falecthomas%2Fkong%2F@v%2Fv0.1.17-0.20190424132513-439c674f7ae0.mod 252 BLAKE2B b5f48eb1337d61fd08a98d21e76d501d1206aaa607f1a112ca1e9240a3e87534db351cef7ed8768b48ba7ed956cb8f1d2cf393f1cbbd1df695d6bde55ec9a1dc SHA512 5d0b90c334067d9df55deb984b909ba31197e987c9d28b4fbda73995458762f319dac2bf152f4c36263721fe2bd6f5651d508bdcba61cf7f574ac332ec0dbc78
+DIST github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.1-0.20190708041108-0548c6b1afae.mod 252 BLAKE2B b5f48eb1337d61fd08a98d21e76d501d1206aaa607f1a112ca1e9240a3e87534db351cef7ed8768b48ba7ed956cb8f1d2cf393f1cbbd1df695d6bde55ec9a1dc SHA512 5d0b90c334067d9df55deb984b909ba31197e987c9d28b4fbda73995458762f319dac2bf152f4c36263721fe2bd6f5651d508bdcba61cf7f574ac332ec0dbc78
+DIST github.com%2Falecthomas%2Fkong-hcl%2F@v%2Fv0.1.8-0.20190615233001-b21fea9723c8.mod 216 BLAKE2B 60964b79efee4fbf34288b3d659551eb51191e85a067b5c73751f22496bb8baafb68199cdf4580bf256133c1cc51e9229952cd4436b241f98db4d1e5e7b61fd1 SHA512 44eabb63e8480c53e9abf8ea92ef6cdb6dd5a6318f62993f5e21e4d1ebf80fff7217a5f5137da822e6d84f1ea7b078f04ff97f8e33fb36b9b37a478b0eefd527
+DIST github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.mod 34 BLAKE2B 6b3b01c8066b701d0ea30efa5b144fe9bfe8e9f196ce4f0dce058e0947890e4f2d458bdade3816c3df1e35a972bbeef478c91e02579f81116603d0dc20855315 SHA512 5896c9174737c300a726f70b7d6300b892e790e41598b5f82ec82aca020f93159f9ea94afb6a4db605aca196d527a7a42df9b1babb73b8d182fe6749e95975d0
+DIST github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.zip 5773 BLAKE2B c1026dc04da3122194368b90c597d7a3b7a90279d5ca27e6f3b397f0054c4f51dbb61205804fb0257c07ce078ec3b328fdc638e752411b379474cd51d2337488 SHA512 0c048e8778641577f394433483fdd4f916c9ff16ddd4d7b1b37c4b999b5107353e6867c2b2430b183027807e53f160ebb2419ad85f1d1b2e0bc0b190efe47352
+DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
+DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
+DIST github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190808125512-07798873deee.mod 937 BLAKE2B a4f614d4bf6feeca480ca90d6f581e0b96b99d32fbdf7eaa1907ec8bbebf468c22b989dbeafaabb6bc735273ac0540a8f1ca75c9e02e204efccbb6b9c22d89fc SHA512 dbe74e04b1eb2c7c15f5cf1042de37b0ef9ddd0588eacfd0c68bc361e5d4940c7a5e275f29e8983865730135fa13f0dc6114f877c370fed1bb95afb6db1cdcc2
+DIST github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190808125512-07798873deee.zip 14175006 BLAKE2B 015f2c3738d2112b073fd1fd2a00f9ca730ea7e3fc933eed30361e9652778e8e6b38f80fd611b0ced63074ca14c4d76c3648c35815347599d42d042ced0ee689 SHA512 eb3ef6cf81f9d6e0752b3d46913dce3bd40d750068c705de49bc800c6a841e3e19e0912aaab1c160486c5ff52286252c8dda7b983a66792454f14afbf828761f
+DIST github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv1.61.112.mod 569 BLAKE2B 7d4cb5297389948fc8fb3a376786538f817b646bcc7401fdc548c4f7b1893e0d9d2df0d17d1957d01a582f6d4125123856124cfe681cd4a62cdec04a97bc3799 SHA512 e45651c05354ad34041809da05b64990a41d3e444231bd48a0dc1261c845fbeefca0813d1f1dfc69cbb675d76d64239a6da043730ef87fec652d95a37efeceb9
+DIST github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv1.61.112.zip 18396068 BLAKE2B 8325e27956beafc859db8793ec5f720ca02f90b5b929e45666bb487b5714539f0df67f2714136ee7e42e51b226269c0cb0f67cfb62dad682f7858136541b2197 SHA512 02dc2c3afff6f76d03e258b65e4fc6df92fab63e517cf883115076898fc376c0477db787aef04278b8e2ebe233fed67b5490e1051465cb01312f95660cc620a2
+DIST github.com%2Faliyun%2Faliyun-oss-go-sdk%2F@v%2Fv0.0.0-20190307165228-86c17b95fcd5.mod 43 BLAKE2B 4ad44ed79c3a1293847e7fb6ac4751a1188e294eb1eac69b6e42afd58f272bc64ecdc478ae78a4db170bfa295d5e4c7db3e0d7ac8852710cf902685d24b47895 SHA512 6db56823eb55279ac19e6127768c0763bd3c754fbf1b8e57c354a30fa4a0f13deb9ad31b5b7d109dea3ea844d69663e2be1e05788da76926f6d94a78fe8aef71
+DIST github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod 35 BLAKE2B f41c90b71b4b9e1876a13df9703b57f52ec6d7fd4258a7c44bca15c12310b512e400b32715180bfbe4726887aa7284fa21832ca9f9eb1dd759ee7d0c627307ac SHA512 5a93ead508f4f5e229e5d0e59dc820840819d9b32158ddecf2d6dae7ee96ce92af6bd80d18a98e437cbdda5de6df6cac03f7b535017fa92ef868dcccbc6e1f27
+DIST github.com%2Fantihax%2Foptional%2F@v%2Fv0.0.0-20180407024304-ca021399b1a6.mod 35 BLAKE2B 42febcb2e06c46797f14a850943d1df3c0e15630f376b8f1c860cf4e26ae4e2acbb38947f1348f501665f719943510aa2c0ad091f336e635430408794e61feed SHA512 c3d0bc6de3cac8395d0a231f041437b4caf00a4678270ae447b2e76bba3a588a6913cc1df6ba438bf6dd361b48860c365e9d32af55575208bd0f4b705b0504f6
+DIST github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20190819145818-b43a4c3a8015.mod 31 BLAKE2B 8ba7e45848280b2365b9c8fafcffd70ac32c1c22bca0d2bccb965b98f1aba961faba0824e33941ba06e7330a7e89d6804860ce16e0c0d6dcff77ad4d9f8e68b6 SHA512 f82c53780113048de082df94ef28072fbd86dadd4531270567ee8cbf31295b2590973c83992c2271df2cc1abe0cad808e4d8c5f7857e3dfc94768db69327d2c4
+DIST github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20190819145818-b43a4c3a8015.zip 5521853 BLAKE2B c5e12e4cea51874affa518311f7b92ad609b5fcb69fa5080c0d14738efb1ab4b75a7ea5419b91d51f8bece0990baa3c3ad8d0cd9ad29b5d88eedf8be6d6cc408 SHA512 b6bb5b340417579aff36ad9cd732ddab6fce3065605d0f4577867a2c64b3801103002175811321d10ffbf63c5ee3865ab05ef72b1cb1cd77af0a2bf8180acc64
+DIST github.com%2Fapache%2Fthrift%2F@v%2Fv0.12.0.mod 32 BLAKE2B f5b7273a6c32fd9eb6e4a8956477bac6cdc2a5415eb1dd5dfa5dbafb28f5f8d1cc477196a4c3347025d9c184bb68ab269f4622ae03a01516f5e9c67124a10776 SHA512 190c3c9b3fe9e247246976b3c916c2ff41da6cfc04091de1d050eb78badedb067d9e960c2295a17b167ceeaf27fa62d149b33a8794ff2bddacf93e9731660564
+DIST github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod 35 BLAKE2B e9ca430f98cfcfdc5bc1e50ef421253011f21fe2a9a06b15b4b818f336c64a544ede9a8d1552740e85358fcb16a588345124b06fb2788951c24c9dd92c3b1cda SHA512 a0c76da94f068f583607520b728036f45ea071b727d3aee601eee712bd952b5f6c8cd5df1e1484195b07bb4c3b224771dda1fc7848dcd086a6dc93ada3ff2ce8
+DIST github.com%2Faryann%2Fdifflib%2F@v%2Fv0.0.0-20170710044230-e206f873d14a.mod 33 BLAKE2B c5557c9c02300d9fc6ecaac5694461cd440f5a1f5cf9ddcdb38e6fc51d9a55d9ca1e98bfabecb6c83fce81e87979e66e56c585760ef61fdf1866480c0e32eab3 SHA512 15b2cb1fba3e5103879548ffdad032ae30f0e723cfd26fa6bcf69afff14b18c2cf3373f511702b3690fbdb7040996c437f9cd0253bdfbf211b665ff14e97aafd
+DIST github.com%2Faryann%2Fdifflib%2F@v%2Fv0.0.0-20170710044230-e206f873d14a.zip 7602 BLAKE2B 2fc27b391e078d69ed74a5591b56a0cc68b868dddce7661671ff67625de752908701ab3cc8103a0f1764ea4197044fc338588e60f403215ed37fc4b1c4e7e971 SHA512 8dba6631336679777643a784662faf6468f6d6f5332a32a3b5b3768925c5dbe2a6865ee55999549d34748b7d7fb7fe9f13eef43884276564618f8c5ff315a1fc
+DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod 41 BLAKE2B 48814730032a11998c9da84351b2ed6e2a6aae70d2666dde457814f07c5348b067fe1832743d216272f2bc058d87eb4be2e926733e1934b163ffada3b6a4a13c SHA512 dcbb60f73a4fc4ef5c571978543be889675d86be078f19fc715baea2aed99de0243e8d8c3a968f047f648a883bed366a909a0c56f2ebc44780d5236868543618
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.19.18.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.23.0.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.23.0.zip 12934706 BLAKE2B a53a13e819803c53690c2a2f508f9b7ed0c6aac597b320e9c99d5d7a9c6afe18a883b7c8a2d147d3ff4b1b8464247aa1e8f11e7ed5e34475084b96bfbe342652 SHA512 d944239825d73d1c496f924a51b3c02bc1cfb65adbc447442c9065ba0947977714602257f3b606a28518f4d5f889e0cfbe2eada703c1029ccb8cf81395bdc2b7
+DIST github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.mod 45 BLAKE2B 224d034afb0473cdf6f065978a0b8cbaea268a46e3dc6b1b8ea89bed2d013ff52bd32408bb6d768097d3ddb20f95e35953b9b679439309ff832b2481d4e35401 SHA512 b398c531571bc397b2d97f369731fb7bbe8e07328f95043dec62c9be4a9f09562a0ef0faebeb05f1bafd488a77c30e6e957189d54548ddb94b9dc115b85dff53
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod 40 BLAKE2B ce42c81a7dcb03d21a99d6240ce12f8455297722513497b1a75f2c848b5fb7ef70b577c2406638442f16beedd68806de890a5c299cf1c008c439df23df2f5bb1 SHA512 ec4424da8e1e3849408da7bfe83d37e21ac75edb889de8ef63be897d59678679b018f4606be78500952e7eee73a6252ee6e477b1a1612e2d036dbf72c17b9c9b
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod 40 BLAKE2B 6cc86f2bceda8617678a251604b6c049cfdc80f9afcae0cead6b2cd04f90fe1b5d5d56d0c29f98fddd7f4ff6fb4a0f97c052193b153dbfc772cf6597d664c09d SHA512 d0c78b8f08d177e05148ce845f8d720fe79a193a420c12ce15504af8fa3dffc4d2fcebea8030f5cca90aff5775013e2252e0c289d4ed5094e07657ea97a79570
+DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod 36 BLAKE2B ad3bb22bde28277f26a819b093ab7392da57c027bfb91bbbab4686d225ddc4e239c0905f6eec64cda2fd47746bd625682f663a11007bdbbf64f9cbff7dd1de76 SHA512 f961ced2c3e902be60fb862fff6b1c4457c57bd7586375a18857863be63d9b3ea998b05fc0c9c3a7270387e9907861d6f9d6ce4024643ec84ea6a63e59e915c1
+DIST github.com%2Fbombsimon%2Fwsl%2Fv2%2F@v%2Fv2.0.0.mod 339 BLAKE2B c3d4dca2fe6d21c32f0266aeccf5dd64efd07f0c5539389571ebc46330a858da87f7adc8381ce43f76dfdd3f844b7ed80cfb5e9fdfdcda52c24974f103aaed02 SHA512 ce2b34b8d77541c7e222a43ecaa3b2b3a434ab7f6d2fd27efb1e56b3be5e693ed4251f22eef4bd53a7abd1d992c3368dab3d08cb50265c164d68a9ccaae90493
+DIST github.com%2Fboombuler%2Fbarcode%2F@v%2Fv1.0.0.mod 36 BLAKE2B 357371a37d5f2ee657900c4ca455d9aa8aa993989fc6829e182a2c72586f18447600442e31110c5a01f6fbb8de8a17f881d86ee6b882b4b27db1bc566ca33fb4 SHA512 1487d5ffde5f6d64bc21be1aa02926261a519fad462731254f03cf124758162cb6f6848fe412cd5b02606674f566ed213ae4fb7b5e54afe29df5ea60e08d3c03
+DIST github.com%2Fbradfitz%2Fgo-smtpd%2F@v%2Fv0.0.0-20170404230938-deb6d6237625.mod 36 BLAKE2B e415584f1b251058c7ad9fda35a53a9c7f94434150330fdce3e1ef768c0b46aaec572e027040773f022b5e3657c4950442c1bc17c2c9b7f5106ba26c4aab733b SHA512 f271a93a69cd074418eec8b114375ca0a196d7cb4b69856658946fa7f2d8fc40381b575f0f624e9fb7d90d180da09477083905c70f01ae875c1f1d97084bc58c
+DIST github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20181115193947-bf1c66bbce23.mod 35 BLAKE2B 87fd74b3a198f0c8a9897797611b73c9017378af758bc559464b3e91a6f57ecc39752ad6ea9d73ec0df128a794a3caa6384cf1092808275fe6a55731b6f0bf8b SHA512 082d6dfd13dc8bbe32bb5fc0c8c7e0e2d8fe412397df32f87639179374e57eed96f7eea00a3cda8c0c9a78b354f9275c0be3fcea4b6c797aa627dec71870a41a
+DIST github.com%2Fcaddyserver%2Fcertmagic%2F@v%2Fv0.10.12.mod 188 BLAKE2B 42c2a9f176078c0bab6328d932452e1e5759ff5afd7e677fe856822c8ac2fcd00585e5396b6a3fa1e7c3a9de9c8ba04b48022b3fa5c3f5d60b5b5d3de31ebd09 SHA512 c085274ee66cb69cc5dced44e4c88a157d34166459d85bdeeae7c14aa0b965a6d78b50ab634aa9482b963d34deffef46ac3c714ca72030d1730d0f6c6390419e
+DIST github.com%2Fcaddyserver%2Fcertmagic%2F@v%2Fv0.10.12.zip 125509 BLAKE2B 4b87f402a83c4115f7b677ca0f6e7133080e55893feaaf7753d0b9a5f2ef46bd2a80049cfdb323988d40d8c8c4f5c5caf38db31240d6cb9a8524b96765909904 SHA512 827d5c4c8c7cb37b9054cf4327c05bd73785b07cc08ae2fc7ea8dfa6063069e1eddd36a3d71df0c8d368761c28b42ec1958797906f145570f115bbbcfbd49255
+DIST github.com%2Fcenkalti%2Fbackoff%2Fv4%2F@v%2Fv4.0.0.mod 47 BLAKE2B f238800b26c16806af21a26f7bc037b5b81768b47e48fb469740e3a8ef4febfa6514bcd86c596b8c9f4159dbc7d741cd17939f510394c1654656c27350952ff0 SHA512 c398310bf078b9e1c748d96334b1c10188057c8078ad7e7b58d0d0ac286221b7f95ae0ce6a69f6a4a4b8b50d89f2bddd9e03adfa447e37cfc250f395644c1764
+DIST github.com%2Fcenkalti%2Fbackoff%2Fv4%2F@v%2Fv4.0.0.zip 15167 BLAKE2B eb7731c90c7b266ab6fc4d7e64d52784d358a030e1f4075afd44a2b4a18a0635d89489fe556c7bfa6b3d24a03cff7f45c357744a027b0df64d1d44c0c299663f SHA512 d2438de57fa3b290212432a0879dce16034ddf02dce4c8e7e34341dc90c4a0e6e3f4c8ff4917ad73fcff0b2cb50aabc6c081e140f1a242e96b241853f76810ad
+DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.0.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
+DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
+DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.zip 210929 BLAKE2B 7b1c57ae92e16ffa7370b069f7037dca01e73cbe8cc5723c092139779bdbae2c5a4483d623ec2b62322818bf324f2ef41e27b03a9b9ed82bafc5a1cdcc6f18b0 SHA512 4dbdefde602fa13bb1f0ab9dc6e947dc158defd284753b51bbddf9e52410dac5429e145637f155bb8703cfe8723fd2f5e4ec7898552d4a2956c8dfa01d4946cb
+DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae253ffa106eafea277fd947fc0f28e6962e461283ce2267d992b85b1f0eb9074a90009d8ed1d47f9e1f3e03cfc0eb7ad7df104282cfd144cc12a SHA512 32c34a590e6c113a16700ef2faa5124ebb6c8773cd76594312157bd2b70d54cd939ff2c32fac47421b5615e804142cb7b393394d4745d5894f9b68392bc37ad9
+DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod 45 BLAKE2B 350e937e3f7b254b5c590445a9a7f7cc908daa2a5f208e293ac414d50b46bd29671bb483e55daeedca41d70a42fdcc62ce17fffd9992a932e29153ab6ca1168e SHA512 c1b9f572957bc4ed1ad0c61d22b7b5d6a4c863df2aaeb4cf914e304af21d949c9cfc53dc8eb67aacdf3dd56f339ee6f4a1f5fa464121d9db79b7b3febfb3251b
+DIST github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2447b3f6b52bb0ab4eb8af5ac3ca818b65bff046e0743cc8d8dd3d7e336ad121a8d017e3f7d7b83b0203b86392a82cdf56641acddfcd377a168553dfc28f3ac9 SHA512 f7d31069b4207aabc1683b00d85decf9e883387d598ec9125128724cad3b7d1f3462ffe616486e35579c97b178d703999c243a3a3aaca9223d9f661c07fe9d03
+DIST github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.zip 35021 BLAKE2B 06b4f88edb2e79b8a1776ed4b519b0f72314ef90761d6672647c1b5eefcdad4cb4715281a55b7de4c991350f401de98eaf26f20933964fe38b30dc2312f53940 SHA512 b8d346004622c7060aa4f25affafa846c7abc7f6bd04b87f53ef232f229d00d6721f139cad102c3d32eee711a82a0c814addbbc6f42e8109cc4bf8650d0aad43
+DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod 31 BLAKE2B 683f04ea11a77fcee27cfc84f41a1974ca6d61ee854dc77f072493358099ec03e94f01b5cd5cbb5ef69c856dc36790b660a3e90d7d520fd553e572f1b01a2304 SHA512 0e40cd7ff22a86cd23b49b509f5b5653f67e31ca67a07ab82743f56e5504f126cb2c11d88da644afbaf024dffa657560a420ec6d82f6b463452ad8a8bdb576d2
+DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.zip 5802 BLAKE2B 7e7b32a77adacd47318e42255dbbb59c85b38dbd3f80adf2795ed3b2d01ed714e8c6f1139b91c6ce19066414acd53eed14762806f28b6978bddb918fe756414b SHA512 4021b26f08a3fb25b71a3191445c9be56424f3f118f5a4839ee8957a9cabeeb33f8d5e4735ffdbccc20b84b45e4a61d3da9c2ecb6cceef6638901143bb6ea339
+DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod 34 BLAKE2B b1e2e3052b202324b63ddd8e580c76da40ff0bdf1df2e9e2f3d7b2f5287d75469a544e1a586352130ce636bb08c9d4ca517f0fd49c892bc17365412cb791dcaa SHA512 c0d4f293bac15a26df2433bb909794b75ecbc5cb4ffdb33a8fbf3c8f421597780eb6bb036cfb11a8346ec959ceb8e36efa8ebb84d8ebbd606485735ba171f98d
+DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.zip 56640 BLAKE2B 4a31c288981856d09a5a4fcf4f0b8223502952284ec1e2ae698214e2f950cbf618c3a938096bba4f8f3531b8b75d62c17396ae7a5b7a29304c138e32f4529978 SHA512 e63fa5b49cd41a7166b01167bab86540635ea079a36763e559da108046923897adc43b0ff7e19faa7060e0580b2042981c9a32d10ffcdcf6fea1f22eaf32313c
+DIST github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod 30 BLAKE2B 9ec507e8410331513ba11ed5432f95b9141e41125975204c2dcb50b5fbe6f7117430ed9b1b0df44fcb45843f75ca862070f85cb40a5c4f6a8d13c066d2d6741a SHA512 528f23910ca94ddf6f811331dc7ed615b2949b2cb04c630e4e2b0ba4a6dadac1396268c4c3251a77af25db3e94dc8b0a0a66d365a8d3feaa78f31192a40e2556
+DIST github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.zip 5024 BLAKE2B debe8a3f8f81708baa936e0b9c2acca92d41e718efd59a605a5352d8eea7918211c89dce1a093755bd6b051e78eaff1036c86ad48c7700d1e332c4b83a8a44f1 SHA512 05859e1e715542b64c7d63789b447f971f7cceb6fd01bd78e661891acdd94da873ae6d3f612748fefaf9507d374b62526fcfe7db5655cc297c07208bc9f22bc2
+DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
+DIST github.com%2Fcloudflare%2Fcloudflare-go%2F@v%2Fv0.10.2.mod 408 BLAKE2B 8c4d31b483fedfaf21fe1f10730416f94739ff5aceb3133d39c9bcfc057d4f8d300b25714f81f9b06cfaf860caab45adc8ca5d2a97aa23b5e904dfb7948e3041 SHA512 0ee3b4c95d76249bcb53fd29a22f7185c1f4af4f9201ef53935b7db77f713a1e1e8c4c5b3170aefb821fe00ac65e58fe0436e0a6eed026aec94f61b5110bc801
+DIST github.com%2Fcloudflare%2Fcloudflare-go%2F@v%2Fv0.10.2.zip 155576 BLAKE2B 769d17e59fe56acc483a007219558f6332a82bf394afc77337fb9817a7f71037e02706b2030f8cfa65f525f5475fb158282bef47a429bfa6921048c8acfbc055 SHA512 55b52174748cf6d5e15057fa43b6b2e6c2069f2c8282172ce7fd340d0e72fb79234f811b504a5899c032116e5968a7a1e640bf3f0fc36d889bd13e905d88c492
+DIST github.com%2Fcodegangsta%2Fcli%2F@v%2Fv1.20.0.mod 34 BLAKE2B 7a0262643eb160a5f679f4599cf391a7c76ec183874b69c64483d3255a0baf8a68578d1a1d160b5b947c28b124785a2209e9f1b25dbb8cea15cd58e0df481560 SHA512 ee383b82e3fcc05ecc8b39399b1dacbacf3ea7e89e00569c682d565da000a46e79d8cb330d1eb7e483508c0d0f152033df9d21f6f71f5fb6fc3834d50655111e
+DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod 31 BLAKE2B 7bbb809c199d39bac173751c3dc21b23ee8b020f20b4447c33681469b5083c64e74f699fa8d3dd55446b76ed44fc0949337303a776efeed90a764af1d751c8a4 SHA512 12f6b0e7090b257656ee9068083207fdd1b6d9f0b27546cb5b3a5a520e5944f3eccb8f6dd644a17e1089bbf787fd26b3e83eb0f0353071c8c4ef23ca99bc6251
+DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.3.mod 31 BLAKE2B 7bbb809c199d39bac173751c3dc21b23ee8b020f20b4447c33681469b5083c64e74f699fa8d3dd55446b76ed44fc0949337303a776efeed90a764af1d751c8a4 SHA512 12f6b0e7090b257656ee9068083207fdd1b6d9f0b27546cb5b3a5a520e5944f3eccb8f6dd644a17e1089bbf787fd26b3e83eb0f0353071c8c4ef23ca99bc6251
+DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
+DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
+DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.18+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
+DIST github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod 33 BLAKE2B 1ce5b6fdaf9b07e47e53896873b9ee4e96fa51c66a7a5afb3f48f34bf1b28addc5a5faa14832c24232a048b5d2b5ec0fd9af57997f0360105479550670b7272e SHA512 4fddb273aae34ba148c277266e98d174e04f5e888a1f59d44a86f7ec80168fbee85f245cea2e2fca44b29cf83f7a417e43b885438d7e3231c89604bb9f0a30c6
+DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
+DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
+DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
+DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
+DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
+DIST github.com%2Fcorpix%2Fuarand%2F@v%2Fv0.1.1.mod 431 BLAKE2B f58dc1f8ced55fc31d771894000b6b8f7704b78a73a256c0a44ca6e81f82972cd8030f072319b9e6b8ed85853821a6cb82e0183cd9af9e7cd22263b1d66fe91c SHA512 5317b51f8fc23e83f415e5fc39a4202e6d2550ebe22c20140551265f8d3a538b2d4ff38cec62f81d2dda00415a4690d157fafcafc81ff1c00aa7db1622a19c1e
+DIST github.com%2Fcpu%2Fgoacmedns%2F@v%2Fv0.0.1.mod 32 BLAKE2B 24419811deb7b63bf17f50bb4808d8743ba441592d8f0024bae6943c518c675394e76328d13a32c4524156c87bdea8d8ed51647ac492cc274535411aa08173f2 SHA512 3684b8287ec51547ba7a616e1a2d0e199652e8c5247ae8e1e7366fded4ef22383c14a0bbd9b49911db99a6ea8b101596fe6a7e5baf2c49c1d04b89f18c78a292
+DIST github.com%2Fcpu%2Fgoacmedns%2F@v%2Fv0.0.2.mod 41 BLAKE2B b67f32ce506018c135fabd2391f171a7d67128ad8431bb9c1779837a2949b3cd189b29b4d22f5cefa3186ae0fcf93f8885264ceff03647721e979422f0157637 SHA512 075269f676aa9531ef5768bc99a51a307c471e158e1a8baa87c14d32d89f156e9d25fa93b7db83bdd2e62215c1f9f1f0e48833871b482efeaf00a696ac7f908e
+DIST github.com%2Fcpu%2Fgoacmedns%2F@v%2Fv0.0.2.zip 11549 BLAKE2B 728a7b19fa615b8f7665fba9fbcaa7be6e4518249e7d436bab21ab382c5913cfad4e9268e2b9df3c76a00ccdd8fb1c47a101a60fa9d4f06909d7a88e6dc1af27 SHA512 7828e429f8737beb938332f4f46cb440cdd4de1123e6f0db93ec89c62607eafe099d4006f9f25781f5ea5491ac6458f39e33e03096f83435ab70114aff8cd768
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod 94 BLAKE2B 94e391c9c787f7b0b9d238f1fc61ac5e90d4d6658f7d60a4c143bbeae999ea0ca23d28f2ca204523e44b61807afa23e8690af850d14203e5755717b0a1f5981d SHA512 b54a3715ce2745ef68bf269b09d458d3712d8ec7a876eff53f5c171d23d992a5391552651c56f7adf5b90a356bcefab552a7ef8dd3a0d562fd396434970963ab
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.zip 8850 BLAKE2B 9053d9c01c92faa257ed0623eb06b27e7d9d93ff9c155ce862183bdb9da6483d57873290eb5bc7bf8f906d7b18dd29d856a7cfabec69b84a2f5400f6e43c616c SHA512 9d35a6f2ccc2b51fb2561891311d5ab33737ba76c61f190fa6b4276eadee8b09d008b2c925fb8dd5bf9202bf3e1ec944c0b5026b080d2adf050fbe8e88a74def
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.zip 12266 BLAKE2B 93705895ca63c348ac5397fe8531214f5745a3be6f5760f9d3fbf67fd85b917dab4a2077376251a005bcf07450df1fe0b0114feacc5f92c6facbb2da637beacd SHA512 284116b4f2778ee7981e3aa5583c4e685afd8434e36ca647f0c72c5bb308e87bc3bfae8c83acd259c9da75549339aa382663b7103e4033b2418e314106923c0f
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip 11426 BLAKE2B 645000d6293b81d736462fbd50a8f96483b39d07e5bb56e5a6d2fbef55a760499237f963e4b45eabe34b955280997f8218c656eb6db0a1a35093d2ab8f17cc63 SHA512 140a934e4d50fc1e5bb36bc3bfebc05863b32a50fbb6e203abb3aee1f9e9cd1c2af6ee5e0757f9d6199522c30e06377a3c94842d877513e5c9339ef7d1dcbc9c
+DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod 29 BLAKE2B 6d29d882c7c8c863cc1cfa01de2e2347b09e8cf4470c0bae2737f7436ce6d6ab34eb6714eba9f869974c1c8d7a332bfb90ac842b9fb7a07bd1a4c8b0e460eefe SHA512 a41a722efe7f634eebd689a9793f9ee3a89924e6c7917008c6661761c8829d6a897dc71c496f761068c36c590a800f06bbefa4ac59f7761cc0ee2cc68ac5c14c
+DIST github.com%2Fdaaku%2Fgo.zipexe%2F@v%2Fv1.0.0.mod 43 BLAKE2B b7f6d4dca865e691a66b70dde813bf817f089aeaffc8c49d2d61f6efdc1271ecf380740213d28b12585ca60e0a00d8707ba0880710a1b82e578bad08f4a9d979 SHA512 55103bdbd54979e045985ac6176821e9eb480611acc20f430311cc02944dc8a303468536651a54cbe653117890a3e4c6ad48b02e638abe96cc8df7b4df7fcdd9
+DIST github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.mod 39 BLAKE2B 066fe4ec077d7fc003ec3450de6899062f4e0500efa3b410cf2afd8315c2f7166e4a21605d5970d3be17692b8b4d2fd0e4b48b32a01a09a310799c3faa1c31b3 SHA512 ce1047915fc0d4f3dc7148b20b90edbd878c7f0016823997aa5dc030d000f59658ddffcd911fc98a387387ac2175ddad9ceb9c8af18e0595549ea2c3859df6a9
+DIST github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.zip 6032 BLAKE2B 0265eaf68c186fc505148e41ca53a84aa096eae82243502ccb3b3703bd248c3b42ff0cd87015d11e427dccc9564c69d58676df34c353d7fac22ab2260061b137 SHA512 04bbd7a8cef79a432684a2c84f4180401893fda4f43f18e7e78d9dff6380b645aa86a41c54526f8f18b8599889c4a167da364e197f6d090fa3450f71d6aa5177
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
+DIST github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.5.3.mod 35 BLAKE2B cb878d5c7457af4aaeffc81f34740798fe5bfb413f15efbe80c0af5108add18a9623f44f24b6ec47d4f15cde98452efb71701c71dd9914dbe48c8e8ec84a4c05 SHA512 14987165f56487477f7622d40ee2ec121d6a693bc7f13525e802819959207f347e1d7e1ede45ec6afc097861bad0f702206b649d29e5603c77d2718d701d997c
+DIST github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.5.3.zip 1069597 BLAKE2B 289ba8e12d349a3dc3c2fc5be7665244b1debb62a75cf05f67b3f31efe61a94ce48f1405969ca1891b11e97ed71f67745dda70aac6aeffc69370de981052efa3 SHA512 0bd1cbd19ac17e9ac41fe66c1146edfc2c40ed7f31b8a08c966d0cb799c5f3cc35a69d57873c6dbc2e387daddfa895ba35b02a275fa2e35ed39052d6f8a72857
+DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
+DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip 57069 BLAKE2B 2c921bf5a88bf293a4c86bbaed6d7c391a323cf3ac39a54ac10fb74da5498e0f565db5e5220a9871ad5c4dedad7eacc0657ad9f8907c2bfccf147384b53b37b9 SHA512 c937c8b98196eb8496735410324a6a845e618d47e4631c500c9def70d8effb27cfb4efb17f81a8d304ce1a9d27fa6fbcfdec11ea10355de3d1918f1ddeef81d2
+DIST github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.mod 34 BLAKE2B 7db9f433942253e04513e9a7e88b2a76cecb28837e808c9fd2fa444f19bb75f1567358ccdb5537dc6caf0aebffa08898127dc93f8f464c838da838f7ed70615d SHA512 ee0f8fff193e70c23c830494ebc2bbd182c1882ba443baeb4a8ce03166f399765ab8e4ac85047306b27c03e84fd0980f93b5b5e29f94129569ec8021e8d127fa
+DIST github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.zip 31667 BLAKE2B 7114afb863d419c80d539e287e76ee6471163aa5fee433de95276174d1c1e9030097543afe97a6131356979bc88a14108679a98bca3cb8b38e833468e80d321d SHA512 f04577670a6649bfe5d40fb743df38fdb9499b3f584e38197eed2d958d4f3e77635e82c057aa643ab3268bb99e7478aaeccfc687be36b9723ccfea3551b45366
+DIST github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod 35 BLAKE2B 8f9b63ec3e5f70db4f7f0185a03aee0608efdaf267377c48bc0e1aa6c37d431119d6e422c8e7c9bd93f0819796ca0aac423804ff0acdd49458265dc37e9d439e SHA512 2b6a3774801edff4f0b3fd40ae8e5396782e796e36b02b4d2f34e5dcce19d2f064a7a8d0787a9cb994b9208acf39b466f291525cf6f459ecd7c45d947dfba50e
+DIST github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod 35 BLAKE2B 4e9e86f0f7f18e47c80b9f4a0abff3f07d47814a9c54b297a2419265fd91b16c2780e170ded80589dac290cc3262aad162911b789510703d973f3f891d5e0849 SHA512 6a786a38aae43d8a7532621bac8c4c053624f39573a37bd66fef9048a7eff36ea55778ac8a4bf3d18cc1e6faf352dc2365e6f819053359df9ac98129e16f422f
+DIST github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip 9787 BLAKE2B bf52b08f028e5117fe9cf9554ffcfbddec214b1dc972e8be2511b5571fa15cd433b3528ddf9c8805b3a71455a94f859d3aa90348e4648300121be269d2ad5f84 SHA512 83a35ee1aaa0aa34e86db32471f18c2ecee57c8962eacd44ce492a29cd9f630318411535d3474ad10c5ec5a5634caf619eae8a06e911c37c6e8fc8d022aebe3e
+DIST github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.6.mod 34 BLAKE2B 900b7c39f85b3c32ae1cdcb56063defb238ec2dd7620f1a13b0a7b7a5c1eb237854d00d7a6063cc546fb6c7a41bb0fe6d71ba4589bca57d8dd1183a806685f9e SHA512 91475e539eb45a642590606c6174f07b3461691aa18cc232362694890b446a7f033834676273e33cac54db288a793fd70d07d5997997716f954d1806ac879091
+DIST github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.6.zip 689531 BLAKE2B 959fef9198d29d7ba6696cd8b1f273c14284566490efa47b6ec768a5a9e77fa251083451a3f3f589abb00bdc4d00051dd8ad1850b5f660e3a79d40940ee6168b SHA512 fd02c0253ca30ebdcb5d34699d66ad8333192672f89b89db5b6ad00ebf3c8a8a7280f8e650e2080572fdbb86d0e09f4535bd08e7dfaf8dc6e276e7a3c92ef0d4
+DIST github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.mod 34 BLAKE2B 900b7c39f85b3c32ae1cdcb56063defb238ec2dd7620f1a13b0a7b7a5c1eb237854d00d7a6063cc546fb6c7a41bb0fe6d71ba4589bca57d8dd1183a806685f9e SHA512 91475e539eb45a642590606c6174f07b3461691aa18cc232362694890b446a7f033834676273e33cac54db288a793fd70d07d5997997716f954d1806ac879091
+DIST github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.zip 691188 BLAKE2B a59e078427dcfedf06e31b212306e6c1bf0ba16248a86b5b3bfabe913acab2ef35b6d3f9f6b165cd773cffc9f030f1aa930e1a3dea7e066820949703962614bb SHA512 009731d05f05cfa69b710df82c894a2f31a53bd90aa3554b34bffc9f304548e5ed5c1142338e8917fd526e0fc54d1b5cb010eba8508a689efa0d852bdfe484c4
+DIST github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv0.0.0-20180814043457-aafff18a5cc2.mod 32 BLAKE2B c96afb14f9809bf9dae22bd2260c31921b0435d4459b4386ee016514b84580aaec258fb1f8347fa6447524376de742135ff87b170f40cbaadaa41c41b553ae25 SHA512 320a96424fcf2296f59f8ba247cc9dfa43c35e2e500fc1dd990a69316d4ccb68437e4c4f98e849173161490cad216c15eee039134b3028afa7dcf82d9b8e6423
+DIST github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv0.0.0-20180814043457-aafff18a5cc2.zip 25432 BLAKE2B 18a910f8a2bc0109189756a53da47691beac857a6783e39bf45fb1c02f8ecb85442d652c50717135613f634a8d17a7950309d3f0f2621714b5bef624482ab457 SHA512 80e1f1ecd3d37989f4f2d5d0d168cfa8fdf9e11698abad1f462861d0104ee0095be8a747ab16fa46521ff73772e091478ba56179f4b3d4e9db5155489530cdbf
+DIST github.com%2Fdnsimple%2Fdnsimple-go%2F@v%2Fv0.30.0.mod 158 BLAKE2B 78d955281e8ff9058f06cd1f5b91f3f6f87fb5d50f0b73a9f1862d92f720bd9cabff9445d85be48a30b49b4e933c1ab710a6cf183274b8e8f90580240ce98aff SHA512 ccc2fa12e825ffe4296e4a8354544b653b0ae662343a0464cd4fcecd3fec8f9ab6ad0a90fd061b376747e2730f6ce13f070a35546fdd0e25b422c67dddd5a94a
+DIST github.com%2Fdnsimple%2Fdnsimple-go%2F@v%2Fv0.30.0.zip 215561 BLAKE2B 7b277aeabd21d951c3bdc6b1888e8abf64dd11aafcec3214ade932a272dd6cf35b95c855bd3624ccc11681a28cf0117253d8b2298e2a00317365361460c6d356 SHA512 c020d2943285537524f46ba7208661498a6ce8366171a6cddc9334ca222425ab6f6aadd56f1d4b021c42fe7aa21bae99395915bb9d830cc9348894a02f88207e
+DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
+DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip 26356 BLAKE2B 665fb778605fc05dc686b59a3ad82a6df9020017243cc84498e4113c7b18343507a0084cd67febc329fa6b44e675696f99f632cd282ead5bb06f93ff3bd50bea SHA512 88e19d0139de7de602272e14586a99eda26b2867ea60ef56b517d13b37c0d28b1ab62c05b2f9cf1a9b8dcc8e5afa9c915baf7a30b0f17c4fbd47d5c71d0a3965
+DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.1-0.20200219035652-afde56e7acac.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
+DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.1-0.20200219035652-afde56e7acac.zip 27926 BLAKE2B ce069eea6de4969e6560f2a5b1001a4b6a9229dbf3916d8636288a43d06ab264085019102a5256e24abd35b2557e73f9ea72e413e67cbe52afdcda2081aba88c SHA512 de751ea35e2b7d85391d127940c54896ff5737d40d9792fc94d78a017707b9f40f330395bbb78614bd68101d20ba7a43db88c7aa71a9471ddcaae24795b3e4c0
+DIST github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod 40 BLAKE2B 9300f3006801602e05416487e6021123ff345e36835b5f4841158bc87556afa086470218c3f2178d125baae065c1af3cb27e210a50173a5bc9a469c592758eb6 SHA512 fb616884898669f21d53576f0fb70c8babc38bb98da066a2cb77fa85ceab6bcc8775feea3d3bcec19ea3b25544c776b8d55ad82f8876da5d0ed5176768da735f
+DIST github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod 43 BLAKE2B 500b3a85f43db1d61f037f437b3290888204aef8b80aabf42d70c37607fdac86e8b1f7f4e41ad3709ad7015a78b934ed7d6d254522eb3e2baba4ae24619ea4d2 SHA512 da87f8eea5497796badaa6bdd1c67ae04e75deb7595f10739f30f20364f22e588a449aacf603f2c8d738b365ac14211c7cfe8e1bfb91f220f5c9d547007ad453
+DIST github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod 32 BLAKE2B 51c322074fb7a69418dcdfd2e54b187fbfe541c21a979c8bf8b155a6264cc670eeaa95c2949f2b760b187fa582e86688a045f3f022cb45f053a58e00ec2c0c60 SHA512 bc43f85d5a21cbdf4b3821e707c845d08f8a6d8f2c6ef0f6ec76f7711c53bb4407f2a356c79bbbda438fe138a3cf74a4b279e8757cec7aa134a93f2173b931a0
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
+DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa
+DIST github.com%2Fexoscale%2Fegoscale%2F@v%2Fv0.18.1.mod 87 BLAKE2B 9a3f9327dfa69321abfd93dd5e501d8faafdba4d5283ea9eaad6c74e00e2a17e3d078316367e96861db3a53400e3b5184afa6c20d8c8991f53803764b02ef2cf SHA512 462c3ad73b14ace4121bb97a0ab5fec0aa0c212a2561b89fe5c78da34df25c8d969f3031eae1e23122c0aff0d234f69593bd8633e37897264a6b02c17b580a9f
+DIST github.com%2Fexoscale%2Fegoscale%2F@v%2Fv0.18.1.zip 217089 BLAKE2B aeb98c05650c9445a20fdd65bf45586a71a1971cb8f3ac0d6ee8e010d840ce45fb6c165ec1bb8210f1983632db38a668f08e87e991e6e97f8de9779156268e85 SHA512 003299b9ea7eaec2c58e36ff9dc42cd3b2ead6b9ad026dda3905c15347fc51f486841bc39768b976d879afbe6807f5f39a1c4dd6ade2ab3beee2067cc524703e
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.6.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.8.0.mod 190 BLAKE2B 5ca57c301ae17a65276e9c96e743d1d8f1dc92179aa9d3d464231c1b2a733d2ca86745b85f4032ec9ba4300431d08a0be2983e510e3f2fc10f1f26afccb3796c SHA512 d7c71a763f87394bbfbd3be503ba8927e96eb40f836b0c48c9612566696e81864e2969d0ee44355b6324306237146f494f592e5e09a6f01182f9c9badfcb95b1
+DIST github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod 32 BLAKE2B a73ae1e577fbb84fd72de422c367c1003355c117a9660cadbb5d6d52fcd0c102fa3b22c7c7dfb6e149dc14ddcb9b5fef847fb2a7b9379a35405c7bd9d83ff1b5 SHA512 2ef8ab60b4320b9358614a28a02b4207f3986c4a06798c3e253a79bfb63692dfb1765476e9d154e15f9d5e30983609c98b6ee39ae910c678a3773fddca208cee
+DIST github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.zip 17890 BLAKE2B 663ee535dd3ddf1a89ae274a400bb744d6e22689a212b58e6f6a3ae45890be76761fd4cd08d1836ffa3b8fc290249a408c798001b343104d0f06d7e2abede6a2 SHA512 e42c37f71719ed662a4b3efc9c03725a3569ce04849d6bc845bb7967228b0e648d6b2cdf73ea18430e54df85486b2a3819aca6170538eca4401ac3ea4a512d3c
+DIST github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod 33 BLAKE2B 2c279a40bce4e61e5aad9d25a1c374b6c154586c296cfdfd56f52435c7739c8d9a8958e19d6da8026c2a03b728e0cb9bb512d5c094aa6111f9b10af24ab894ee SHA512 2bb0f125a91c8f92dc1cb5ec16441b27027585606a3862c216434b76324f3069941055c4bdc98372547543b095a4014155446de1be98264842504450121c941c
+DIST github.com%2Ffrancoispqt%2Fgojay%2F@v%2Fv1.2.13.mod 962 BLAKE2B 4e010a5ff246d4e834d72b522e958d6f8063778261deb3abb11a5781a5d79c90e9697d43388158b4d80f811111eee0e86767d51ec58570d02ad4d7c8c9a31ba7 SHA512 c2b2b6ef8de68569c73aa8ce8c778dedd764f8204c8bc8a78b335d0138c49851af585da65e0ab9b2e561500f1eb0521a6f77d92794e38fcc22e6dec12113c959
+DIST github.com%2Ffrancoispqt%2Fgojay%2F@v%2Fv1.2.13.zip 231306 BLAKE2B 8db056d6fc6796e16bfc456d00ec08eeb0884fb7cf6e234193862453406a300e5bbfc23f0910bace51fc66e5c3801a14078aa8846dbf6b03a64c79414e350892 SHA512 822d1395436aee93d26cf53cdf65163247e8620b4f1bd3151270b9a9e2066012e9397158a10f433c0d0512dd8c4b6d53ec76b5e5d3f169be3e5970e3912dcccf
+DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod 36 BLAKE2B 2b77fbdbb6c6c20767c120b390fbd2992bf79dcae0a35c27121a6e755233da3ecb7d74e74c38c0a2463976b546ed8bbfb8a8d8cb140526dd9a0c4f524cc131a4 SHA512 5749d33fb085d63b7c12f43df824c96f168323cf6d88cfea3e2536eeb7b56689dab9dddb8cde1ec8bc9c2848e7148b8a37abf8523a99c55ce10f896245c5f341
+DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip 41278 BLAKE2B e0b440a81efbe3c7c16ad276b4509652fd58bc94cd162b9ab13bb37c1e6edcd561e3fbb999e55619d58c8e3279b785b8eb67fa4e200b38fe6fcb60f0918e6e8a SHA512 9b1075ccd3d1f53773db97687e06fb777741d6c3b228bcc329be580562fb3c34006768eb3f989f92367ca116c597140045b3c345fe36065f5015d1d4652633c3
+DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
+DIST github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.1.1.mod 33 BLAKE2B 18725478b6c6a565e4adc96f4edf09f8369553b8b6523f36f8e4733ae64eb9a859af67e14646e61d2faf5cfd651ada0a6bb2bae455ba6bb4570c92696b31f23c SHA512 e6592e0b4e0c9f344378efbc06365296f5978e173421824512ce6f8921212691aad2f35e73ff4562c72014897a4992b7b3e56e3c424a82159747f1fe328eaf50
+DIST github.com%2Fgo-acme%2Flego%2Fv3%2F@v%2Fv3.4.0.mod 2227 BLAKE2B 2770acc163869bc27e9a6badb76087ed323a2516eae45a9f83b6df1156be89860943d8eccba7e925974263117bf092eb8489546b94552a99143a163828f3da5d SHA512 6e6f7873278d618cc84c85be17714856b82b4b5a11453ab937f47a966382015839e6bd637a3d84b4a064986d23de2ae55cc1c9ace5159816c153399c33c0cd66
+DIST github.com%2Fgo-acme%2Flego%2Fv3%2F@v%2Fv3.4.0.zip 632770 BLAKE2B a53c4b920e68482fe3b39ac66c56679806b571d25d0be099c80e5dc88d90ceb439c423bccf6c5bad36ee493ac1ca74447c21f7ee1c28738c4097befaa9a1aefe SHA512 328b1d88435a1296e714f404207b2bd16ce0e7251fadbf133e5ba976883cf47e9fca36e97ac804e8d56d7d124701925abc3c06a481b104ed6f92eda175b5d248
+DIST github.com%2Fgo-acme%2Flego%2Fv3%2F@v%2Fv3.6.0.mod 2074 BLAKE2B 617402618d8f577ef9fb73d756a471579333f4c30474ffc2ca3f8a7fb47add79ca706b6e6d27bf030cadc1573be20b71806cd5495ff88da9b054a9b2a0a6cea2 SHA512 599d9292cd337fecae7d9c296efddd1df479b9ea3dbd8547fd12f35980848fe378a3e53cbf55a8838e6733c3d77ec178854b005fcb844a18dc348261a38522d4
+DIST github.com%2Fgo-acme%2Flego%2Fv3%2F@v%2Fv3.6.0.zip 694529 BLAKE2B ff85082738da46f492cd36329ed8f1bac916f1970d83ab712bfbf779a8a5ec2e32a2da52354ecd76151831398728ea8a6c4f5a7c96dbb327a33f5aaccba31652 SHA512 1f797f642d0e64da4b5fe33f3f1bee7fafdce9468a15d1fc845dea78c6d970165e0a864c75c7c5a5bb9fa3f53ffcb55fb168e3cf760f1641cec7575dad92b795
+DIST github.com%2Fgo-chi%2Fchi%2F@v%2Fv4.0.2+incompatible.mod 29 BLAKE2B 4332920508e4756b8f02245994a6817e6b12a463cea35613711952e2ebba0a902a2971e72cfebb82aaada062bdf9366d3a54326ed9ef41da0c3216e7547cb433 SHA512 7b02adad42c8b81f594661492450361cf74104c71257a8a27fc4117ac4bf8cec169f43fd2f1977a929c8ac94841eec03ddfbca3a19d1668f128ac028d81aec38
+DIST github.com%2Fgo-cmd%2Fcmd%2F@v%2Fv1.0.5.mod 29 BLAKE2B 338d138ce8f281efc056343ce34aa90f4e1b6f056f3b193afea9ad990a1dadfd24d9b90c2f8fc038645448fd41972f532ec815c980900c89c0e1bdf796cc2ca5 SHA512 d1ddd5ff5f4f651201ea0150d804161538e15bc078ddc530d1503808c9b248bc5426035b09493d671e831f1847f0175409cf264ff5ab8a96bc3ed4bba2010152
+DIST github.com%2Fgo-critic%2Fgo-critic%2F@v%2Fv0.3.5-0.20190526074819-1df300866540.mod 537 BLAKE2B 7a70f84e859adcf37ecddeb2e80e4c1302dab28b15102ef30b995d4a2986151c6646f450705bb80b815cefbc80d68a26be28834c89780ab05f5e408ccce05362 SHA512 f1d930fa81501da87f58e0f96e7062be5e1406a1e99965ccabbc154a415cd2fe3fb374891e1fd7362f68003282c4bf59671a8521c5bedc064df9a730fdaa8ce4
+DIST github.com%2Fgo-critic%2Fgo-critic%2F@v%2Fv0.4.0.mod 581 BLAKE2B d5a833473122e501c28b9b2b3fa4ede337640e85aaf631111e90cceb2a9ea604581e3de0fdc4f989c95e8340ccb188a54a08e6c51cf1071330d416df7da61351 SHA512 6ad97e1147a499e8de5fae18370f49e0e7527ac6b170c995cc7da4af77bec97f4f05838e69595afc97582d0752b4641c4f971daec9124c5dc1dae6f5f781bed8
+DIST github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod 35 BLAKE2B 088adc516e2f6f0a693c745963d6daaee2c196b1407e36a469eec392b232ed26b03f9c515d422b8e536c2b2ac8bf199cb3db5ba4ad19ab71fc338919f57a3a53 SHA512 787962ce037cb9143f496d5a7dd11ab1a487180cb57ad498e6c24a8da7a5bf36737b0b2730d2e0837c60a08bc7467ffba744026ce6962885fecdcdd1bb6c07b7
+DIST github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.zip 11197 BLAKE2B fbc5efeb39aa911465f17b41e15574564dd9f6711ddac8fefb6db2fcdcb1c9da86d352aea7ed9ec53ffc01d16361985cefa171c240e55a8689d3f16e01f3a64d SHA512 c11ab427de7456beca56fe2c3539161bd92c20dfc345e8b52f5752bad387e93396929bc42057e09f82038f0e59471f0a0450b66693d11e2199a7ad69eba79f01
+DIST github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod 29 BLAKE2B 1cefa73995b3d0b4206aea263f55c672b675dd22d42c61a92f7380b6e726f2d7ea40e0a9e456181f34808f5386eae3c485bd2872857caf1824254fe4a55cb635 SHA512 a709c650da5d5f513e94891b88c26697826fafebc1ca964fb9544415637ca14e3b9f1f4ddcf738e28032e10a2d39b619678ec5c8d44cc0a1dff738c75645e2f8
+DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e
+DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e
+DIST github.com%2Fgo-ini%2Fini%2F@v%2Fv1.44.0.mod 29 BLAKE2B ec6988d536e1cfabecc7e1ee6070c6429c88de9bd970b3ecb35bf8e42ac3d2dfa08beefbd3741ef7a039020e6d41332039c6bc0e13d5e79bca84cf669e4f552f SHA512 67077f6e3f3c2571d6df326aa1d6351c3f7950337a23c548ff69e73df265db516eee559ee4afff17868068f2754c7ef272e46bc3dd5ac324ed002b749116794f
+DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
+DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
+DIST github.com%2Fgo-lintpack%2Flintpack%2F@v%2Fv0.5.2.mod 475 BLAKE2B a6ee9f4b83cd2eece5006f2bdb2224b483372058c70a2374b0f8ef6e01625874653e93f804d6c95431c0d522d775f40e799704dc31a07e69aab07b690e0f9545 SHA512 bc80cc006c40939066739019c1573f78b9da54efa1f8bbc606865ca6355aa26deddb06f2c80e754ef74b9a7e804d5f45c50bca4870d9b7b995367aba2ff95281
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7
+DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod 32 BLAKE2B 165b3724097f123b839b3f65d2e401caf6d8046fe822d3d9b9f15d74e1da21c45b77706f79716fc1b9c5322127bec754b2dd35442fe077dad4f3e301cd168ca2 SHA512 14e60a75a483ff4a1f6313a7a8a1dbfbc6ed4c223c7a9d18c0b355e84261084204a22ef1125a40e30acb1b43abfc97e60c045dd91a16d2b4068a78a54d854d28
+DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod 38 BLAKE2B 198f3a6fb7348bf50286e1dbb067e72ff854b1daedf1d181b643872aab377b930029feeb95d5d6ca21109facde089527a06922b9ea52cdd59ef553d69b984e06 SHA512 21ac6d6f8fd92ccbe09cb30d0dd6a37142907048cc5f9d0574824765918dfd8ccef96b7ceab9dd259f9a95f5c5be566ac00ff4eb3e37ba7c7c98f25b3185baef
+DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.zip 106521 BLAKE2B c7c61852b093d2b0452e9daf9ab26b83ee6426a9afa4f67abb0e0f98ef28961017f774075f5d90fc05d6de3c26fdf90a1916b426b32a41e2cee8fb0452e21f03 SHA512 023209372d47d4b5279789f581a6f4452aaff1e262ecbdb3fbdc48a0939599e319109b99d1c79414716f1c426c143cc1ce506dcd38f304dd5aa3e9348084628e
+DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod 33 BLAKE2B 366a1ff397488b2b1c7e42db8a946bced1eb8d4260a6c177a978eb978e14f89265e7ac1d0bcd77905bc89eb35b68b3ebb028c0dfc67ff71395ab14b62335d16c SHA512 f3dc70dfcf086b785750d5b346ea07d0dc7903937bdbba58eace0fb903e656b02ddf3a1d49b486ac29b1cac9ca9d346e964d55d3a4cc5ee5ae79ac40b24d0cd0
+DIST github.com%2Fgo-toolsmith%2Fastcast%2F@v%2Fv1.0.0.mod 146 BLAKE2B 929c15d08be251ebb09aac169eba126603d1f3bc4c8dfffa22b26baeb368d94d4725e3d91425aad4e96aedeebfe91f43b9dc707c5bb7bb11c28e44447e5d1b3b SHA512 fab7c8aca8025f6ffb09bc7cbfbbcc86e1a84608a1643b4443a386ac979aeddf6821e6b67538a033098c22a22c251077046c38b05e08bd8799deea5549b8d8a0
+DIST github.com%2Fgo-toolsmith%2Fastcopy%2F@v%2Fv1.0.0.mod 134 BLAKE2B 0aac384b872ae017d32169a21e2688b251a70d4f9b1a3479cc369d34ad0d81688caf207501fe6017c02764063d62497951270a3e2a2babbde20ce398dcb590cf SHA512 46da2d05a4724f95dca3057c5631239f1743e5fe3359bbdd81ebeb02fc13a22b59e69476bcca359361bab2603a57868e75dd8403cc24e80a27178ff071fb9028
+DIST github.com%2Fgo-toolsmith%2Fastequal%2F@v%2Fv0.0.0-20180903214952-dcb477bfacd6.mod 40 BLAKE2B 5c860e9a56012a35ba01aacdbea717d5416d65fb8b079f1522655fc71067950cf05b2b3293c96e512c637e381880405156811910ea4fa0822983bd40eeda93a8 SHA512 b33055f798f28acbd654635211a1db351a0f27568ea75b00e1b152cd9912d9f9203072058e55482b82de46c2cd3af050606a8e835d281781ee99ff10d1d52e6d
+DIST github.com%2Fgo-toolsmith%2Fastequal%2F@v%2Fv1.0.0.mod 40 BLAKE2B 5c860e9a56012a35ba01aacdbea717d5416d65fb8b079f1522655fc71067950cf05b2b3293c96e512c637e381880405156811910ea4fa0822983bd40eeda93a8 SHA512 b33055f798f28acbd654635211a1db351a0f27568ea75b00e1b152cd9912d9f9203072058e55482b82de46c2cd3af050606a8e835d281781ee99ff10d1d52e6d
+DIST github.com%2Fgo-toolsmith%2Fastfmt%2F@v%2Fv0.0.0-20180903215011-8f8ee99c3086.mod 38 BLAKE2B 91da8f19d193efd0f0b989efb3709c45e4d1589419068d9dcbafbcff657f7e8983b90913475bff44b5751dcbab875e860909a4809e3af7546e15ccd291a1e69b SHA512 76e9f50dd3c96285c56801950f80d04d449d5d78c2b40341c3e51148d89430d25870e27c697a3a9c878a9125864166f0807591f997329548fb3fce0ac18f7575
+DIST github.com%2Fgo-toolsmith%2Fastfmt%2F@v%2Fv1.0.0.mod 145 BLAKE2B 31ab68cf4047752783457514aba06de88ca2303370b97c45cc00bb31cfe7709f3eedf75eadd349471224e6d6c1445b2c7fcd7c58bbdd60023220a9e104a6da75 SHA512 9352d6fc784f63dd8bef085a0022b942db57d50b0d418aad4bd514314b7df65ba329bf442a063a0d6ed94da93c47a3f15c77b625b40f1af117bb784c43a27f80
+DIST github.com%2Fgo-toolsmith%2Fastinfo%2F@v%2Fv0.0.0-20180906194353-9809ff7efb21.mod 39 BLAKE2B 81dcc6f162c9539d5d6e9020b8462fe0d6be656e586fb6a15769f9b01e4a490e0f046e8bddbde464449c8f5f33784330e3972e233667be06989f985e16c00717 SHA512 dcec826b59ea3bd9f37e07b4625b06d7cb61e3757cf7d6c221125bdce9711cfa1a63ac592a31b2174e4e3cd7f4d8a7ad51837f777e014dca6ee53aac5a8ce328
+DIST github.com%2Fgo-toolsmith%2Fastp%2F@v%2Fv0.0.0-20180903215135-0af7e3c24f30.mod 36 BLAKE2B 858cc95b4dde2a42ec1c3da0ead7b815188e8d6d61a52194e63f5e1ea857d4e3bff22897b9d704256c273ff0730c13fd8a17f20e63f732f5768b1cd8cb1b62e7 SHA512 151ada61957ea2e7289b17306db06c40628908f9e3ee93505b57d29cc859c006d796e1e5ff5c330bb6b00655f9f6fb6c673e9bee25b9553b28c769d372f33dca
+DIST github.com%2Fgo-toolsmith%2Fastp%2F@v%2Fv1.0.0.mod 143 BLAKE2B 8ff253d164a2ab5efee3bf62889075fe44e6ea4082e373f966c6a8f06ae79b8aac5f0edd2149d1112e523a8c1a8a0cce9e84013b2938bbbe1e09ac60fc7aade6 SHA512 7745338e2a875f382668b54ba6f71298ab6d50096998d57aff2fda883fd5a4c54d7b8f24251363fbaa380d850226bbe233c2705b0fa230de95aacde042efc5fd
+DIST github.com%2Fgo-toolsmith%2Fpkgload%2F@v%2Fv0.0.0-20181119091011-e9e65178eee8.mod 39 BLAKE2B cd422bc62dddbd9fb0cfd9db5d387d4725e5798238593670cd92c4082fbb0289ab6abd7fd3bfd3f2b91912d6942f0118f6057e09fb852bcc0db6ea19e792b722 SHA512 4c83539dcd8968a62fec2883c88c490ce39315ef61b2d8cb96d8767fecd91e045709efa48a18165d19a7d726bceaa53ae2bc8122c6f14b9ea0f48cb461ca82bb
+DIST github.com%2Fgo-toolsmith%2Fpkgload%2F@v%2Fv1.0.0.mod 102 BLAKE2B 80c36ef24ee2eb1d9aac1efb8e1bf3d54d229562fa42bdc9201d57f0f9c9f1c28500d8f344bc9803222c10f3b1358d1492cb2ee7e7fa4c4ab60ce84e0205cd88 SHA512 c69ce2862cb8cebc9bc1b24e6f18cdc8ed634ae5a5ab0ed5f00d95ab8315b146bd65f8f7960c90a8e42dd691b2b67da173fa81a5778d8e075f9af2f822ede211
+DIST github.com%2Fgo-toolsmith%2Fstrparse%2F@v%2Fv1.0.0.mod 40 BLAKE2B 5ee28988c889c7536b2209c04b61b04c4227d958b516f29e879c51e28e348b0fd9eeb6511eeabfab51c1a72083f65c9e1f6553213cb99b23b8e966f4fbd1941a SHA512 caf03dc50181a339953b27cc8627613175928b80a128473e4d10701f3fe536a66758e199c7418babe3915cf9aeab51527ef66b98b0c084209314bfdbe53cdb5e
+DIST github.com%2Fgo-toolsmith%2Ftypep%2F@v%2Fv1.0.0.mod 37 BLAKE2B e168acbf68a0195c45b153e25098ece619b2656eb02eb648d2dcf11e6c7bab3fab50cd132354d9063c1961879127819944ebc1dd8d7e1d0987cbb91a86b35caf SHA512 854c0798c7e4ba498b3b6efa00375a93e09d84c3a5de042aaa8b58bc75df62cad93e2e0d4876f43de0d1e2956062cee758c8c7aeb2c0807e994f4153ee990624
+DIST github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.mod 30 BLAKE2B c4b58079c7f353b01123ed35c24b8c9dc43139a9c87b12fd90cb99e41b97d6e2ce646710b261dedd2a6c9572ee42e677be0ffb43cbb8cb55b99d1eb92ac68f4b SHA512 e0a6df51284e6b2faa2ae12bbc2c53c649fc503427f0651fefe99cd852a012a76a9c5d967cd1a088e1b3270f9b68abc39f56a6d823c5913fa025b771145f80c6
+DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.0.0-20190320160742-5135e617513b.mod 30 BLAKE2B fda15fb36702083cc063889e1e180403d555d81b02cf93e32d96826df51a2fd251c338ad21fa147a06c7107831f7a30cad1131935cb61a2ca58c65592400c174 SHA512 baa937326b26fe8c673b8e230200289591c55f2305258135a421996d9c97a9a12965bc5aefbfd7cb25db266c9c7777dee8d414044129e2cfcd1591a640d782cb
+DIST github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.mod 29 BLAKE2B 5311a22dbbbedd78a98e34293e79fb5443c57774fa9049665943e377fd07984a9316f3ec5c8fb70da9b133c6390d32ab28b97e939f938bfeeef78883cca6fba2 SHA512 8a1ab67bf3555ca17b7efb1042fb6a7d58b225b4186302b0cf289e7b60f9aeaf23e36ff6d4e8da2ed728dcd676cb2f30f0625c430c0b6943dd25ee02d2c27247
+DIST github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.zip 36892 BLAKE2B 86fda2a386b182044a4482b9cbb90fdca1c07b45b6c0f0a6f2c63468263840ea99f22140a3d7a9f68836674f884c425d8d44c6583df554ea6bbd1b7b84add874 SHA512 c8c217d61335e9b4c9ebad513fea36f7bc529d398ee7bf6f538bdc355ef62f0597aa7aa3d78b57e6571198cd43e53ef032e8ffb66650fdfd25fe49e17c7ce84d
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod 88 BLAKE2B 0699027ef7284edb7deb6a2640db52a5b93076e3250d42710bf02a1cd7d5f591f1d335ffb1e7e753dda5fe177837fad87a25bf69b03466bb545708fb2952fd7d SHA512 b91b25b4fe769a403fd7a1f82d7720bdb0526a349ffe7cfdfff09a2ba5e0015d5a3446cd8e0e5fe46479b7d2296a8616de38a8183c0185f84fcfc75d202db106
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod 139 BLAKE2B 0c793b0070acfae7ad92de8d8e177d6b9a2519d521bb397da4dc2610927374e4c010db6a4454783556edaabf64e585b00112aea05820874c49f9bb4c4f049fb4 SHA512 232bef55468d9ff66ef7f446d8096a44a0a947533c8665f0f018300b7ec1804a634299a1a6ab64deaa67f1475e9ef68e7be233dc72fb2d9173559800f01af142
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip 2698974 BLAKE2B 5fcb1c66d3fa55efca631fe5def383ec089fab784cad7d6a031ea390463a0c552f5fc4698f7648d271f40fb0ae3eee525f149347bb409c951d15d86b7f560e16 SHA512 c7e2170eda176da203ca64e402c11489c1fd183afd3359742e373927ff228d62e445f5dfc001a471303e1708862998c125ad4c2db86919596297b11cae4aee9e
+DIST github.com%2Fgoji%2Fhttpauth%2F@v%2Fv0.0.0-20160601135302-2da839ab0f4d.mod 32 BLAKE2B 277920ac439062c049c6bf823817eb494f74b04c4e98fce8697b0fa7e73495681d209fea12d9265e7800cd8740a68ae3aba0837a6e76fe18df052734a13d40a3 SHA512 7a77a04ed51e7bf75d80d8accd810ef16587e1d941496c8f57517c7a8f185b3c00e01a456b8473c2d89e324175be7ad7e1cffc12c8d97209e0164cb60b24afbc
+DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024
+DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip 22449 BLAKE2B 8d2eaf41ab75e870a445d50b62c02877ae8049e282f066d9aedc0dfb54d04af55d921ebc84d1e4131cc66a3f9efdf8270a0e423e563d3f8fc5a6bdd403bcdb39 SHA512 a3c086e660f2285d9fb7d56d1eba74994e8f0052363413337413cb50009ba46d3a432e2b4c67a73bfb753e7c60646d96bdad308d8e634e53f0bb0bb97ea17bda
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.zip 39683 BLAKE2B cebd7b69e8f18547e77e07d49ca26fabd513b6bf95317553c5bcabac3b513dc1d7becc259118eadbad18ee4d45a1dffc3ec96864b80d87c0dc6885983bdbb3d4 SHA512 e7a8277f9b7d2e35d1e8586c580d03457ac1e755e1051fcda20ff9f819a6fb9c3cd1892be3a50d4cbf141b35d1c7b85b27bdc402eb45b700a37ce994be4e5b5e
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip 39701 BLAKE2B ecac1c4212267252571babe2c7332b517c22a7c535777a40b6e318299bc284ba3676ca75df60670dad69698450e97dc614b98c6c9fa793a4f3daa3bf88859167 SHA512 e4cc88b9e484d43a328c2ce80b812d4886fee13b915a41fb64b28cacb163960059de066b9be8aec33be081fdcd3db847ee491aeeb1a74b25aadca2c206c9587f
+DIST github.com%2Fgolang%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod 30 BLAKE2B 342057d82bd6cfc545f94289ce6dda498b35f949a3e5f9ad978910e5fcde556edd6e7a3847d136c5ef40115d99d9718e0c2bd2f420ed4ba72a4cbfda31db4c6e SHA512 fdf76199e91b2db4f75d0f8ce5844df0c4d0ea77319bec31ea1cc12f67121ebdee9f236eac8f6410313e84e3d4d625b92105802b8f1bf25de49c870aa6574d49
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.0.0.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.zip 77887 BLAKE2B b83e776eee00d6209b0470b2a68588faf8d0a73f3624ab036b6182ef413326933bc9265a2435984a08c7c1ca95731cd8a81c215c322f720f3a9e5affe7dbf689 SHA512 772dfb4b62d9091afa15ef6e0e12f23844db25846aeb113eb513da1b0bbaf51d11afc327940d8f5520be2d239da0c7cbc02844f3e26ede26d70ac3428bcecd85
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod 93 BLAKE2B aa4bc48d8914434d540f570e6017b3572dc4b75563174e73ecce9f86460669a264389e1e24ce26cbe056a26865b3cee294457315034b6ae9779001b7306d91a3 SHA512 5dff0170dc085e1be63ce69886cb019b9df09a5678128b3b0a1b174756500f7d4bd62dc25ee7546977e298f719746ce951119908ff59463a79a1aec7a8882e32
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.zip 85123 BLAKE2B 89a11d5b2c0abea9b2f391dea5fbd539b37f7770623b7e535b60d902a33ce0bd6a79928569542e932f117548eece074843303cb4c0539cc8def54dce7363fa25 SHA512 1bf7c75b83793a806e6e664b987f6a21561be9fc687364a6d4cf9fa104df27826482fee467dd752b19f349de2d8dacc1c390b064ecd4eaa2fde6d74bc10af734
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.zip 95677 BLAKE2B fb807ef51512d0f1099b43e9cccf9a64ebe19eabcade8403ca6c033631790328922bb32360a48a7d0a3529e169e71dc8ad4519ec3bb87aeb678ccc0d2d48e87a SHA512 68bf6763cde94ad213a27d17ea5abc474905643274f9cf5ca46083f86f96410958504dc84224e4cbb307b223f70a0b6732373745074231ec6a0c95e944c2501a
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.zip 96199 BLAKE2B f2657e17317a84844687fed180e61ad8851ae46ecf2c6594c00885373a2a23e6388d38749b4015534eb36dc8d0b668a42bc1fb5be0ec6b98b1810c45dca382bf SHA512 2c6d6fa94b5cf2bbb4ff6dc6ea8cf3edfc35143e3bbaa45121117af9684c0c7261248e8cd4751a0af3101d65753219c30f462c86ab70757e5f41cfaef469b9ee
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip 465217 BLAKE2B 4caaf832a22faf1c45e04bebf35d29b38bfab18a490ad1fd7b2c6cd85ae678fd3991505f68e526f9f2205cf919374b07d57f8abe95d8f74dc8263cd37a9db3dd SHA512 7fe69c066b2407e6000ae21888f6cc696e51df2342a71e196aba1a9a9ecce630bd9a4d41c58b3105002508a4d0efb9c5ae2b8a87f848b8e2c6293558b8c4b4ad
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod 43 BLAKE2B 1985b508a7ca5fbf7283bfe42510dd54e1e409894b4bf404c918943c8bbc38a3682d00322514c8fef7d6528059fc547534bd956fb262f91fc63dfd6e97fe0bcd SHA512 17d97ea39719fd59908591504c8df288f5914243fcc43a2cd8cba6c2c50fd6f5315b17afa008f92ecdbda732d5447f848d31bbbfe59ef9bec78aaa3f25f51833
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod 43 BLAKE2B 1985b508a7ca5fbf7283bfe42510dd54e1e409894b4bf404c918943c8bbc38a3682d00322514c8fef7d6528059fc547534bd956fb262f91fc63dfd6e97fe0bcd SHA512 17d97ea39719fd59908591504c8df288f5914243fcc43a2cd8cba6c2c50fd6f5315b17afa008f92ecdbda732d5447f848d31bbbfe59ef9bec78aaa3f25f51833
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.zip 458318 BLAKE2B 04daa21a72a6b8662d746828ccea97421d645e109afb6a6f48f1f56b614a8c014d2ba764b80f9601f3928b3573339936b9b522ba02ad7bcfb7c8f8323c3fc102 SHA512 dcdae1a76ed6795a7e223d3b1aae5ba2a1c2bc058d07dacca08673e484e1e18825aaa301dfe03fb8d8ce4eba253d61e1236058761eb1335ac45fefb2409417b8
+DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
+DIST github.com%2Fgolangci%2Fcheck%2F@v%2Fv0.0.0-20180506172741-cfe4005ccda2.mod 33 BLAKE2B 23432552289b1edd0987877da8a828994a834b67d0c45f7abdf72ba2cfbec12ac90043623948526f4aa3267d462158cbcac90017c377bc89cb715173fad2bcdf SHA512 ddf0d034279047865a7f71bb3745e018b04a65613eef67c75ab246665aec2c833cf41e9d4b2583d89498b0e3e516a7b491766d9935f2aaad861ff67091e23909
+DIST github.com%2Fgolangci%2Fdupl%2F@v%2Fv0.0.0-20180902072040-3e9179ac440a.mod 32 BLAKE2B 23ef6e127c4b643852b0781780f448c8f16ed5f7a000b13008f5114338725f5ba573615385f2e158e0c276e972d7f9366943c9e7cd79973c76426f332f100bcb SHA512 1fae7cd9fc7f93bd10c51b52d7834733484e54352a4cfb812417e594968de4096b8f6fba075c567de411b1302c0507b0c9c5c1d71874645da73c28d434498754
+DIST github.com%2Fgolangci%2Ferrcheck%2F@v%2Fv0.0.0-20181223084120-ef45e06d44b6.mod 144 BLAKE2B c8d7e8f039150472539681c78080647400cd4060f42bd70001c8d3bab6d848f4e0a494a215b3d2731d121e724340db54760d2647b3cf028a0487ff16c22a2d8a SHA512 3326adc96464208bbcac0c76f1c61eed9f9cb2a3f8d2f904540c0b9b403e68cf06889f74801f2be5543ebdd33c9b343f575baaba15a3618be358a4c6f7084d29
+DIST github.com%2Fgolangci%2Fgo-misc%2F@v%2Fv0.0.0-20180628070357-927a3d87b613.mod 35 BLAKE2B 56b6f7c64d33e2b51efc5ab4c705707a51022a007cedbb31dd762a78c9fa505b061033616899afc96c3e2c5813d4cbb0429e2094cee6f83f063e96082717ad24 SHA512 8d80c51b78b47eae5fa22780d52cb3f15c54eedd1827145c9ff52a2143ccc0716b415284a9cab9ddc09da97de3b5dd0e8ff39fe0b2a748a11e4032a4e870b73b
+DIST github.com%2Fgolangci%2Fgo-tools%2F@v%2Fv0.0.0-20190318055746-e32c54105b7c.mod 36 BLAKE2B ea25f08e34968cb929b9f85c2ae1eeb2d6acfbd0fb851774b86435b7dae3723a9978028789acada42f1fe1fbad4d8d0ee47b6c215b32a839be4c6064b6695f90 SHA512 404ca2c9b95bd4d33b0e8203585628822fdbe27ad4ae9c6d2f2001a61b442a8ad16fc5d329cbbf32aa076d935cc1fa14ad1e0f34895ca9641bbc13ff288564e9
+DIST github.com%2Fgolangci%2Fgoconst%2F@v%2Fv0.0.0-20180610141641-041c5f2b40f3.mod 35 BLAKE2B 7fb690e1792ad3fbbd1aa7b35a97c4dd29c00187f095deda8dda7318c96a79367d2337f7b26151ee578a3f0690c5ebfb6cdc9f304aea66b8f2b83e80b7ab360f SHA512 ba10d5331433fb94b6245a146c7d76862ca96700431609746a6d1c76c3a1b615ab3799b463597eee48e57c91b9ac299e78f33d610fe398cc9316b33c99961c7f
+DIST github.com%2Fgolangci%2Fgocyclo%2F@v%2Fv0.0.0-20180528134321-2becd97e67ee.mod 35 BLAKE2B d79807744b67e1911f0963b12df80a63782888e17d40e8b7beb1c66337261dd421535c86414ed65e807743a804c816863ed767e3109d2ddb4e3ce6afc7b3eb52 SHA512 e973a3c52a646538d671237569673b1bc9433f74c2e2401bdb022b222e623f230aa571e31bf1f239f1558397bb513c233c6121225ee02263cc92ddccb6372b4c
+DIST github.com%2Fgolangci%2Fgocyclo%2F@v%2Fv0.0.0-20180528144436-0a533e8fa43d.mod 35 BLAKE2B d79807744b67e1911f0963b12df80a63782888e17d40e8b7beb1c66337261dd421535c86414ed65e807743a804c816863ed767e3109d2ddb4e3ce6afc7b3eb52 SHA512 e973a3c52a646538d671237569673b1bc9433f74c2e2401bdb022b222e623f230aa571e31bf1f239f1558397bb513c233c6121225ee02263cc92ddccb6372b4c
+DIST github.com%2Fgolangci%2Fgofmt%2F@v%2Fv0.0.0-20181222123516-0b8337e80d98.mod 33 BLAKE2B 23d1df1d0683de5686b23eee4468e429f2ff021bc61d01895de1769adc5355eb8a13fb1936e736bda7d96f3ca9496565802a5f8d042ef9fad7947ed8fae946f8 SHA512 1b14a6fb3fd86cd47758fc4682d015125a08977e47d1245d4bcf4e6137c60880347c06c224b5302321000ea4d18e88b3c686527f18d65b3c0842a9ccabdd1df6
+DIST github.com%2Fgolangci%2Fgofmt%2F@v%2Fv0.0.0-20190930125516-244bba706f1a.mod 33 BLAKE2B 23d1df1d0683de5686b23eee4468e429f2ff021bc61d01895de1769adc5355eb8a13fb1936e736bda7d96f3ca9496565802a5f8d042ef9fad7947ed8fae946f8 SHA512 1b14a6fb3fd86cd47758fc4682d015125a08977e47d1245d4bcf4e6137c60880347c06c224b5302321000ea4d18e88b3c686527f18d65b3c0842a9ccabdd1df6
+DIST github.com%2Fgolangci%2Fgolangci-lint%2F@v%2Fv1.17.2-0.20190910081718-bad04bb7378f.mod 3590 BLAKE2B c93076c68ffbf3620f660408cff2e174cad31832d1991afc5a1d13d40d9d0a277f5233f21448b4d8303c8abfa22724715b2821565e44f1f121e312478e55349f SHA512 85bd999602faf65449dd1a23bf85d920290bb776058d987cafb76f60e006b5d56a5d293358040ac2f8465a29346258164c6aa518e5c3b8151bc1db732fb548b6
+DIST github.com%2Fgolangci%2Fgolangci-lint%2F@v%2Fv1.22.2.mod 2509 BLAKE2B c55c51c4b8f4dcf0f48a462c55dc3a95c176f91c2275a1db95ccbfd503e554293a682c66daa5b403df78ad84131531860d0c63fdc35927400023ddbc44f52a16 SHA512 bc161262d2d417efac56ff377a1980090d5cb975c098bb8961ffd66a7587eb69dddff9f4ac1391adb6d2531a4901e3ce29e25a93c6d492fcc48b0ce95624b971
+DIST github.com%2Fgolangci%2Fgosec%2F@v%2Fv0.0.0-20190211064107-66fb7fc33547.mod 1097 BLAKE2B 73b5196257c8d65709d4a95497084a4b7393981123e2b46629055a170ac11e0edb6088d73f2bfb132a0fdca66d8e5ab4eb72c82156266bcd1e94880bd9582a3e SHA512 e2358a1ecc128e330903cdd3a64044ca21f05d81840ee5df68c10d499601513fd1715da1335c05a85a34d1888443437e6fcfc161d5ef6e8569d3d44db268a959
+DIST github.com%2Fgolangci%2Fineffassign%2F@v%2Fv0.0.0-20190609212857-42439a7714cc.mod 39 BLAKE2B c366aa7c09bd08747e032aa05afc63507bfcc7b39682c7b897d489cb854c069cb2c5df45c0ac9795dc31b8e44401aea04e96d43a22c040fbebb2405896a9550a SHA512 6bee5cecfae431321e5172c428a9ddfa7166d84c47cc7debcd040b7db1a5ae5234b3b1b139ac119e2d484ddace4461da7c6d053e509568f2da27b92cb2c3861d
+DIST github.com%2Fgolangci%2Flint-1%2F@v%2Fv0.0.0-20190420132249-ee948d087217.mod 97 BLAKE2B 2147905b767052fc5449f42ff72f328655663ba63eaaadd8ba7155fbdd228c9080babe746b616245f73c9280970aa5321ed6138dd8b459561f07fecec8a3633b SHA512 cd29b90f781929ceca7be28b208aeaf51d64178caf1aa9e4f84ce38c8a8d48b846578ad8438403f64cd572448c697212df4f2ce7255956e43f366adebf7857f9
+DIST github.com%2Fgolangci%2Flint-1%2F@v%2Fv0.0.0-20191013205115-297bf364a8e0.mod 97 BLAKE2B 2147905b767052fc5449f42ff72f328655663ba63eaaadd8ba7155fbdd228c9080babe746b616245f73c9280970aa5321ed6138dd8b459561f07fecec8a3633b SHA512 cd29b90f781929ceca7be28b208aeaf51d64178caf1aa9e4f84ce38c8a8d48b846578ad8438403f64cd572448c697212df4f2ce7255956e43f366adebf7857f9
+DIST github.com%2Fgolangci%2Fmaligned%2F@v%2Fv0.0.0-20180506175553-b1d89398deca.mod 36 BLAKE2B 9f5e639d6ea8aef657af550d00e4e1f8ef3a042fd8ff5e4dcb031789b24d9e6d72cdfd3ff654041ece93d38d53f7c1a999f5a095bfcea12392120b106daefe9a SHA512 b199928dcf91ce17955d3a426861aed80460521f7947206136dd5bbf2f02d181b549a152c1b78361e761d5939fc0d05f04588683da3750a34d71bf34ff4b3502
+DIST github.com%2Fgolangci%2Fmisspell%2F@v%2Fv0.0.0-20180809174111-950f5d19e770.mod 36 BLAKE2B e5acf960c529038e9cbe3e35cb4290365ac8c7b5341516cad50466057764bb556b67a2424b55bd538a73207aa126aa1815d14057d109b696d379770cc6057337 SHA512 23f2f177644d7afcefc96843a821ea772318ec58e57a3e4d6c9acdcb484bacb8f4e79828bcd3347c372d28ec6946c8fc92f8ff652dd465d7e5a21c9b97b52f94
+DIST github.com%2Fgolangci%2Fprealloc%2F@v%2Fv0.0.0-20180630174525-215b22d4de21.mod 36 BLAKE2B d0deb13e3870c92583050942811bb6d76ea9a9166338ef27ebb9c210485f9e2d8248648fde86ab70b3bd4c6e8bca94bc54c3881400ae116a9c65d13263390626 SHA512 1890310dbfb0f686572f07b39dbd2d8559b8535702fdfee0302dbd768a6c362778795163a2bed22942d9a3eda488eb761e08443cd0a1c45e2885b276a235e349
+DIST github.com%2Fgolangci%2Frevgrep%2F@v%2Fv0.0.0-20180526074752-d9c87f5ffaf0.mod 35 BLAKE2B 5e1299e377856cd707fa70af1dbb083c3dde1d1ce9d8a25caf3b3d4a371c524127c2b3060d65e0aec6ada61a560563b1c2315a888cf38e4292b192079ac90805 SHA512 3a2d357bc6c7e558cf29e309d718b76f37686bd9457ba101a36c1b601abefe5aaf292fb9c81fffcc4411e6edaa51d130c875cee5b51368f758d26e006d7e9a2a
+DIST github.com%2Fgolangci%2Frevgrep%2F@v%2Fv0.0.0-20180812185044-276a5c0a1039.mod 35 BLAKE2B 5e1299e377856cd707fa70af1dbb083c3dde1d1ce9d8a25caf3b3d4a371c524127c2b3060d65e0aec6ada61a560563b1c2315a888cf38e4292b192079ac90805 SHA512 3a2d357bc6c7e558cf29e309d718b76f37686bd9457ba101a36c1b601abefe5aaf292fb9c81fffcc4411e6edaa51d130c875cee5b51368f758d26e006d7e9a2a
+DIST github.com%2Fgolangci%2Funconvert%2F@v%2Fv0.0.0-20180507085042-28b1c447d1f4.mod 37 BLAKE2B 419c6e5eebd9f78b3e509972d55fdb5c0de90e393e15793a1f1fac97352758dbd5908bd3aca3169b8787b98d38d3dbfd0da3b432c271d39387607f30de75b5d8 SHA512 3910c0cb068e7633473069601aa57e05d47641120229e06ff0917fd4f34ca95b06d0eacbe6fc967fe6827f620779ae0494c4bb9479919e4f0c9a6c5315ff52f1
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
+DIST github.com%2Fgoogle%2Fcel-go%2F@v%2Fv0.4.1.mod 423 BLAKE2B f27df4dc2fad19e9c65efdd8ccf0e76770aa40cb1178eb95d372bc420f12366734357750dff159c15f87ef73d9f29e96a68983be6b3f9736951fb1de00c97e2a SHA512 2c4dab2b64619aea96859efbcd27e7c011166f5ae393be5eb3f32123a9d46f317b796485b7f785d6920b602b157c12845a92f302c0d7c16dfbe5c02d912ce77e
+DIST github.com%2Fgoogle%2Fcel-go%2F@v%2Fv0.4.1.zip 2239677 BLAKE2B 43ee2c765dd76d687fe36453d004c060d99d98ab5b0e830ffda981a14f4ecd6ee9861c2e69136537589dac928d39198cf4bcba320c0963437772a8ee4bfcd745 SHA512 577c74888be7804c4e1ef743a94f0a7ae1d361fdd0af36dbb6a1b0f57253026c6517e62fc0be40232909cdf5b4ef559b9665a698474afc522e381a01644e8ad7
+DIST github.com%2Fgoogle%2Fcel-spec%2F@v%2Fv0.3.0.mod 34 BLAKE2B ef0bf5a6b3ad1bfa2b99d2e3c2d51d89baf14069c27de6c0c453f5f9af89815b13af0b284ee14891e81690b18190722847941e512196c6b90e6eb70d9ae2922f SHA512 5d6a53da05253474978a6b74c947ca949bb5f812bc94ce99ff16e3e3c5bdcc644629bf7e88856496995eca6a439999786818dfb560728e0a7e6cfe2f85a8dd64
+DIST github.com%2Fgoogle%2Fcertificate-transparency-go%2F@v%2Fv1.1.0.mod 2973 BLAKE2B 9f6e350d37e83d53df485e6121978b912346d5e7d51975367112287ab8367849370aad195a09eb9cb16c0eb30625d2934bb9b5e35b7b5e507f1b229a6f1d20e6 SHA512 08fc1b8c6ba361e20b92095021c1552007d69d118d69fecc8ba0c7ea064daf7d4f84152d53fbc45fec332ca964e2a4f11ea584284a0395517d511f30333c7d61
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb97e0d557200e8722f2d373e149127307efa285cdfedb36dd57355168554d1a1bada62144e6a6a00c4d3246aa9afc7d0ffae0f087459c552 SHA512 7229d917bb0c788b07297e1b09b8f7952f951998a56f17ea1f69ff7c2f565a5686b212f42f45c6b8351905d6740a2ec5a235e493daa531ae00cb709faf67ae45
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip 99332 BLAKE2B d95e04036796b0687ccfe18e2cae196efa87fbfe7a763a219860a82117f5a7ac594af005d67698289a9fa0f19b9c397f850ebcc8f6b2e2390fcc6463e95dd47a SHA512 6922e27a1a67c4e858880ca338f68ed80bc01175801b2194a900ba265c00eb482c29e785c564e9afb8f60288593b315ae8af6c8f366d35475678003440115d26
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip 105396 BLAKE2B 8b45b030824cf6ad208a00e36c7098b59e89c2725702926092baa11e82bd395d52b5daf26af57cd5edb01bee6ac2b8c4e3379e357e3a6cef69550d9403090c53 SHA512 bd13e72e46a82b149661a61dfc36dc6e0471dd4161f2291f301e871811e5b2a7976a49cf2af10eee1b7b2f6ad68583c240cba007ec163cea157f24bbe51d3b3a
+DIST github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod 35 BLAKE2B 87a5884f51a766419a5bfaca4d6b317f2e86680e7347d29dba287e4c2004db6b8a8afcb2b2b8145cc3f9a502b768105eab89ba0f3e99db44427fd3eab9d3ac8c SHA512 6d285a58dc91fb57f990b76b3c2634247bee990ec1bb3e0f11b19fe1edb3b9b1998030def12b20a6f05c574965ddcefda6883121f5aae70c695e031e72425178
+DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod 40 BLAKE2B 081291e204018d8256655052c8f518c8d489818e899a6932325f2efe7a33dd7228f1bab1fe31f190c2cd1a022b8f320c2a779910231122de430bdb6c196ca95e SHA512 b47c833f93e2d2f9746276fb7608dfe01295cead6b0c9cad36863e9c6da80e3abe8e7d79afb113fe382f73b641fcfd717090a8d6ca2d94bf2807fec07cd57574
+DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip 9151 BLAKE2B 853a982f1c3b2b60fb44e3da969f7cdbeb6e5214c549e47dee57329a9c93c8786bcb2af6e3aab5f7aacf0bf0c70beb26f95c42b796cc2cff5b9b825040cf5a11 SHA512 e13c7622fe1c4ba73fe147255c02d6828f5d5deaea74ee14a97dd689819547b913caef4721838a68490991c710156307cf0487866d200021cf9d774a4600e52e
+DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
+DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df
+DIST github.com%2Fgoogle%2Fmonologue%2F@v%2Fv0.0.0-20190606152607-4b11a32b5934.mod 35 BLAKE2B b9ac98a27ded910673525eca5d11db110623ec84feaf66d635fbf1631a51000251d97632e9caa4812b9936e2a59a20ac9d3dc668143b4aa7bbdc1f7860f070d2 SHA512 65f883f59ae891044cc86dfbb0f1a72ee47f11440268538b04463ca0e8a17829797ca4bb81ae3a8a65aed992b1286bfdab9560a453377b8c90130183d160b067
+DIST github.com%2Fgoogle%2Fmonologue%2F@v%2Fv0.0.0-20191220140058-35abc9683a6c.mod 35 BLAKE2B b9ac98a27ded910673525eca5d11db110623ec84feaf66d635fbf1631a51000251d97632e9caa4812b9936e2a59a20ac9d3dc668143b4aa7bbdc1f7860f070d2 SHA512 65f883f59ae891044cc86dfbb0f1a72ee47f11440268538b04463ca0e8a17829797ca4bb81ae3a8a65aed992b1286bfdab9560a453377b8c90130183d160b067
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
+DIST github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod 34 BLAKE2B 1eabef50b2977886d7980d7da197828b826c54018766418b3160f5cd512784635e5791a40cc4fb806d52f5ead99f941fae8037872d6cedfd6c851103f3be1a74 SHA512 a46cae976ce90d1cef802eeaa873c059cc9ec3678d5c3c304a9de45f44f20a24d68fa290cfdcf78c4ac222a6d619a005825de8f11e72b9a5af476a0b0180092b
+DIST github.com%2Fgoogle%2Ftrillian%2F@v%2Fv1.2.2-0.20190612132142-05461f4df60a.mod 34 BLAKE2B 106f1adca1c223780b2f1a67a3ce95b31f07b71411d936342b35f2accb0f6b157e0ab3c7a99090767d7b43755be54ef37f6d593132be714f8cee4a86bea41c85 SHA512 2a0f8a8c59a4f29eee354dc0b03769781f9158e0aa688a878828e78bba8b7a978b550d2672cf783a4eb0db4c0a34da28748b8f97e53ad64df6a724288a02d78c
+DIST github.com%2Fgoogle%2Ftrillian-examples%2F@v%2Fv0.0.0-20190603134952-4e75ba15216c.mod 43 BLAKE2B a7f5e1eaaf8d24785c86cd272e29f606c52b5a3c966c879fe613fc358c96117e3665cb681b6f8b73906b355114a65c72c566b7456d971336d5f696766a46ea23 SHA512 2a3ee3053e16294e76136a3d10e0235949dae7f3d511bcc6084fd90636b949b06796bb59872898b91e6070cd341f334f43be9efdac215baed6bcbc3397120c0d
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip 21279 BLAKE2B d8013c686f7cd497091f4c7d782b283eb95faa7617d68ec7f8cf937c5925d677d8552c662291e41cf2c137fce163d45fb62dfcde88088225c13e0980fcde3d7e SHA512 f28071ffb6515262fb73276725181a806740688fea8de8d9484e1204fcfe6e5fd437e38a3299acec6bb545deb31373d910a09d92937308176b2043ccc9f5397f
+DIST github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.0+incompatible.mod 36 BLAKE2B b84f97e1dc580fd7a509f321486bba195bfc339dad35ec7dcecae4b44cc20690b04077d51cb4f70466a19e7edce89a8a50043ddef355c37fb4e529b81b99efcf SHA512 3f00f698f5b9c8c859553086638f72b732a210572ab7319c1d641a29962b317e4b424ee213c2421c06ec76c70e1252d7a770f43d4c46b999c5b371017a3c54ea
+DIST github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.0+incompatible.zip 13017 BLAKE2B 2b97e9684bdaaa81d0d98e108d1db1472af1860b6fe9dc5e78fd655e742d0b659c0d7ac9672d76a7b7f5678551d2ec78c3e9c95214db82cbe7aaa8c56d6209f2 SHA512 ded7ea77161a00ae05b6d0a34a7b54ef7c08cb7974294d6ad94a3aa1a4dbd8b68f4ea57a37374ada18058e30d60f26d0fb144ce0005472f489f2e0fd7c2be86e
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.3.mod 79 BLAKE2B 00b450e2752b2b87b8c630d67af470188b9c3bca1cb1b7b1d619a573f59f3cd4652a6c2dd776db493323c7152454123e2b5d532161248e025cccbc5f55528b30 SHA512 b6f6f34a079219d53b3d4aaf2bde9a5f9b6b9e3265f4acc98c19ac150b6d0c8888a519c0a17a1952f8339b93118390af403fe3a259d10f4d830c030480706059
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa28e8d5b816289e6556e114311f039b477e5ac86fc1c2ac80b1f8d7729ab6a83b99baa4c03de9634240481feb13900fd4049753b8de839656d6a7cef8f SHA512 31e50016a01fd485775368e2e430959278cb6c03ae6b1871b3d0c173fd43e91654ae87d1758c08daf897e55be8b4044bcb47fc072ec645d16e2594f345b46c73
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod 79 BLAKE2B 21f442637ef0be838858e192b563e158bf6ed1f7e06e09a3872fbcd613046b095c5209d9ccd9cc0853ef14947b6b70d4483675505d0905a1d2aab15e7bfdf80a SHA512 2af320b0514b032ee87a92d99d673579981571f325d0d46133e212a639eca274d5a6f8164a7256cfa6c063967b98ace36e637f53d90331903fd6e4a21f1a5a19
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip 16077 BLAKE2B f05e4ad34d0ca2cf07ed10f5b4510f277fb4fe621523c213016171a42be56edc1b33185a93226b0d04ae6f629358603030083c7b5ba03a36fadf8349b0ebaa9f SHA512 240fccffe9eef7f5900b7e3add1fc95b45efbca63d6c09086ed4a0d4c50d470fddeb01672da067222c107b794c204f8da63c366782c52e7b7de6514c310bcb7d
+DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.3.0.mod 201 BLAKE2B bc1972ace31333e12a0462701bcd8aa135ebda6f8619d3f98e4db0bd037ab854873c68c2503812fad3773f1bb1937aba7ca4b2af50e8eb2c13cea5aaefa7f573 SHA512 a1e237b3f47807afcbe3eed728821d15da81c78e20562ded5a8cdad18d498a670cc4e1c10821374fef8661afb7ec7e41f27b4dab8db2912db7edbcdc642815cb
+DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.3.0.zip 1755614 BLAKE2B 5cef0193d9a8911541aad0d2ad9e0f94a49ce88b86dcfecdd98cf84b796a545dbebdb02b645b6f37201a27a72247a8ea9d237e9fb1f4f807718f28dc71e39ce2 SHA512 59c4ef378efc864290644b3c82dda610f77315f9d33d703a61cc440316ef463c48e0f4fb2752681d342b22312694cc33bd7ad76b6e96cf568b9fe8d5af68f66b
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip 257755 BLAKE2B 13d505a73dd179828fd3dbcbc1dfb90f6bdf8a888bb7ab160713a566472adf63d45491fa29928853d76725c2ffa5ada33e802cf857376c83cd8085a31acb48b5 SHA512 5bb0e61c8622e09cecc099c80cd97cdefbc497d4ad0e88984b2936e7731991e972883eb639be1cc3f56249a97b4f14c6820cda6b1c08e4a2323aaca22b840dea
+DIST github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod 34 BLAKE2B 378e68460634c64da8779bea61bcf813ce4c5797c3ea541362d1409bff606626917c1bc4cbd030d98077819c5a8abf2ded047c047c2fc6b58977093e67e7b6ab SHA512 1db09f5968fde5c7877937c2ba476afb8a07832943f66c24cda7669ccde744ecc5ebd6e9efee9427b24e10fafba5f7acba7416f9c4e438c2ae2ab22c4483127b
+DIST github.com%2Fgorilla%2Fcsrf%2F@v%2Fv1.6.0.mod 114 BLAKE2B 615da5161a82a6671eafe81e6b9d13163a96ba28ac37c9138e841a4155bd4252d02780b16004bf34ed5cd9148d939c1df73ae5de111756048a136745da0b04b4 SHA512 b91d15dce663147faec7143ccd4a4ea0cfbe4945b71a3e695268896ac1cb060b8d48ba5e656276c8536122d979ed767a1a4c8d5db8e520ae70df8f65d1bf8c9a
+DIST github.com%2Fgorilla%2Fhandlers%2F@v%2Fv1.4.1.mod 35 BLAKE2B 549faba95b001f14aa66c628d300b6b0e496c92cbd87ed5814b4dbddd422df6d5d7a38af10ea061e512df4129189d221bca001f2b23ce7bbd13fa0b7152bbf4b SHA512 b4c8a43e739f69430d5004c01d083be6f65a70301adc0cbe824955a3b7b50dd2b6033fe8db18419390cb577f89533e9b0399a169f1b10ea39fb2f0c0e3cc47a9
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
+DIST github.com%2Fgorilla%2Fsecurecookie%2F@v%2Fv1.1.1.mod 39 BLAKE2B 18dedfc007aad3087ef83c141ac6fc1835681c7f09af9a657f879e1f2bfce5e8d501113ca0e044435979b1dfb0ac5ad6954661f91118af7ff00b929076a39206 SHA512 f5596bc3919bf32ebdb9851ba6b8e5931eb88583e5129c277f6d5de4b339433ca8a180c40b1bfb44420c35cc8a01f53e4bf1cf6f0aef6f3b790590234bbebf61
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod 45 BLAKE2B 5f187c997ed74f2aab1da57c9a828be383e41f47905531da8babc1360612ba5d4cc0fc6cc48106647ffa450f334c7cc5f455bea7f6e6b9734f3e55734cf623c6 SHA512 81ef224435efb5cbd429dd4339e8410234855f4a268302a61d34e76c388e89ea22c97ae90d71a6ef910ca00d3178e40d3587eaf484112966050fbd1f1f4843ab
+DIST github.com%2Fgostaticanalysis%2Fanalysisutil%2F@v%2Fv0.0.0-20190318220348-4088753ea4d3.mod 120 BLAKE2B 0734abf8ddbb6c4bd190acb4f76c5f9e3f9ece54ffe3cb9a92f6f612bbb7844b46b9ce35fe680bdf9fedd66319f629866b79f311110b33167fef23752fc6b7dd SHA512 9e85c69bafa7a9f6ea007c63ebd31f4ecbf9fce14601a8f8ca2a5832414863b7911d36d629a1f6646cf31a17ad2ee29a1acfefb76da467fd2cb13a20b7436ffc
+DIST github.com%2Fgostaticanalysis%2Fanalysisutil%2F@v%2Fv0.0.3.mod 120 BLAKE2B 0734abf8ddbb6c4bd190acb4f76c5f9e3f9ece54ffe3cb9a92f6f612bbb7844b46b9ce35fe680bdf9fedd66319f629866b79f311110b33167fef23752fc6b7dd SHA512 9e85c69bafa7a9f6ea007c63ebd31f4ecbf9fce14601a8f8ca2a5832414863b7911d36d629a1f6646cf31a17ad2ee29a1acfefb76da467fd2cb13a20b7436ffc
+DIST github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod 38 BLAKE2B 1ee03077667437ef310e0e9d77f917474151294d0ae6654596884b28fa847c4be1fc994e4a2dd00d4551d5a4550e14edf1757f5061c44b527cff91353944b989 SHA512 5500094712db06267cf0d437e774bb1b4df9affcebd73ac218259f089f035df59c7ef38e6f36197014acbe1c8b08806734cd27c85a4bc86cd62fd9196d7f5b3a
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.1.0.mod 613 BLAKE2B b44c16f9b7d3d98bf2443388c993fdfa2e3ef12701a2517673d02ff1e2f8af172c59fffb5209e2bd614a94dbd7025f7f3aa4016efed8739ef60b71d21950ccbe SHA512 e5e04af7c8223f2455614409c8bc5e856b0fa66ec84289bdc96d2bbdc5d800136e93e862b10dcdacd1e8d6ebdfbcd1d56f3f9725588c92b618b09cef2557e3bd
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE2B 9e5de5c147fb3f100119fc7c290e9790af57892762b7ea8b2a8328c397432466ba56ee20b64ced6dc548d58bf8ef0ecb2e62a51de2524f90a0ff39921d0f2a3f SHA512 c9e15e4a4436ffdedfe5ece51858a45806d6fd77d2306c35eb986a866a3da5bec0d5d06ddba55a05ca45c8c29a51bc7c58150849b5dbde569a6810012f3ace4e
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.12.1.mod 535 BLAKE2B 2be9f841d89f87d8b4d2935360953fc003863569b6caafcbfbc17fa8c3f08b480c6a565861db774a4ac3b40539c42185e00d9ab3d4611ae7a92d8bf1acc5553b SHA512 f803cd5c2d7b959df845c0c0f118573718be692698685c1e8201aaea744279aa32b4f8a930e57dbc2fcacd5872498d253849066a97dfa832a45a309569e4e992
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.12.1.zip 572297 BLAKE2B c3918b6dd0629ec238c1bb7a02c5ac5c10c5c70456a36db837be393590913c4c6d5682166f09ab84f2796686fd8040fbc5ae3a0e5b52d1ab1a2c351126f9ed3b SHA512 c26c8a84e10aabd8c58882b479be2c29811ed0230c01ee58f15f445224cbd7506920dd2e5c573a10235534bc31f712c171a08106249cea73d5404a2f0a0d4dd1
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.5.0.mod 46 BLAKE2B a909a61754bdc458c27211bf62b57f4ead8065bcb84511f4fc8c6fa77f56d78ca714e7e311035c1544d92f596de2fca56bcc767f9aa360d8d2cc36b7301fde21 SHA512 b1c1ceafb509b0b3c2b1c5fa0a28281880084a63a071a32f6ea4a04dcd2b2c455c9824414da7f767b1e039a079b6a40c0505a2e71991b9e737c1ba01947ea434
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.8.5.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
+DIST github.com%2Fh2non%2Fparth%2F@v%2Fv0.0.0-20190131123155-b4df798d6542.mod 30 BLAKE2B 1b23384397af6f7f44ae78fb4b3c33bb4ea9b982068597a40e67839791af178f96ca280f14d56678b4cf7afdcaf0acb410a1a7a96e2ce1f6b18d945d7e4e7e8a SHA512 9ffd1d80d503a9dac8286873a705320cae5acb96f7125d76d501890702727ff34f12cdfaef33743a248574a3002a4eb8a2e86f932e7c5da72f5770186427870d
+DIST github.com%2Fh2non%2Fparth%2F@v%2Fv0.0.0-20190131123155-b4df798d6542.zip 13100 BLAKE2B 0eac7069a495b3f96395edfbeed5fe92c91e2f79f3f7fb1a6ae6e8a692c80a4e82b6b88ebb8942927f78e7d5eaa21b7297e4f0de70f6d4849f01cc67f5d90cd3 SHA512 8f04f7d4d8cdc2ab2f5976186e43da178739f8ff0f19e7aa767076393257820a0bf90ed1615db339187fed48454d2af61104ed1e390b58169447ea9dce12490a
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.mod 48 BLAKE2B d49fb83b0e128d1d891c78fd7efc4d1f6c92ff9ba30943fcda9b89d752d468836df7c37d6f30d1b4e8eaa5cd966c4b2ec90efc087887f037cce94654761ac107 SHA512 a55d0882366adebd894e5ebf9de5f70ac8b5f8f945e52b7dac8e56b4efc03f40930d132ac03bacb51ca220bad114940b9e27bc0ecbb92dc739691674a8aa5e15
+DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv0.0.0-20180404174102-ef8a98b0bbce.mod 32 BLAKE2B 8b645c7230638dd2b30ad68a01a18237d6bbc0ae6d2fc671706a7785c9ff50eedbb3beb06e0ebd28b7053fd20ff648606a54226ba95fda6e9deafaf5cab367be SHA512 748afdd4b790c0fa1464b492b79164ef83ae56cdcde204d19adee8b24a755455921132a71af714d78f726cfd7621dc03f85b383d6f26adf9501457573dce26af
+DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331e2648bdef36882414dbf8416884b8fd385b7e926c9b837d317322a433e7312e14c27eb095cbed26a74eec9822f0f063a2d14e753031f632 SHA512 045ed40015294ebd8f7a6df06b418415da8f091d09fb4d34fd70718bbf5ce9f49dca7399dc5649336de3fc83bbbd93e740ad6f62d41ea540fae3b17f349cd66b
+DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod 31 BLAKE2B 7202132cff9b47a4484c61586949dbf7e13622067675cdd09dace3ce2e5b3a37b6fc5275b3bd6dbb0ec6ca0335bb7c9a036cc043b2d8ff1f38bc90ce13041aec SHA512 54a5bbc02b82693a977a4f690314b16d94cf071decddee3a4af2a90398e626ff188bc34ab3517278e7aac4e657f3f3070a020c85274be3750371dfdeee139b23
+DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip 24894 BLAKE2B ab55c48bafc78202f2a0a494c6b00657dd81c078c0a23f797a59049e8ac59bc399f784ff81beb710aabd1d035e7ee3db5a4c90653d6e57dc3b3f0bcbd098fd39 SHA512 b77e39712e985744e277604bbbcd48f32d28ea69eac7a6b6cc0a3f8706e2970ccd5410761784b64eae73a07786cf81c665934c145369317b8b961b503582643a
+DIST github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.2.0.mod 33 BLAKE2B 1001759c50e0b825975577d6b7752503eb891aacc3d3a5642a3f338fa90091ae6de3cc81d2d7270ca7fa0ad40e01cc53bb433dfd079cf419904a1ba910014bef SHA512 3f1f76283ecc9d917de9b7061becf780dff161774eab48319d9094f08f51b7e4d82a4a068fb543ef766ba73d26346de29c6a69ac31e83f43186924aabf5b3bb4
+DIST github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.2.0.zip 23295 BLAKE2B 7509d0d278fb0e01c8a83013382c335d0974007ed7c7637248b1bb161cc75fc9eaa8e89766acca3f11f0749413388ceb07dc11ebe894545cac98726894855928 SHA512 9201c976a637124fda2853aa9963613653165f96d9a6a4d8f100ccadc692686b168355769e643e840c0f3e44944e5ccfefc18c58157f38ab6b8acaf3f4b29953
+DIST github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod 42 BLAKE2B a20b1ee1675ded231069e976e9e3812b116d80b207914ecd1266ce87160bd6fd3c0bdfd7f7afa4a2a4d7891a01cd7e4a7b7bcafa90ae31c5875f6b0eca00268b SHA512 ff238b036db5df69dc734f4a0db4d1fd1a94a04131d64ea20c5268078a645327527f185da4aab38b2aca60da8c6a5f8f118b660f5b0773cc76d7d108a47297c9
+DIST github.com%2Ficrowley%2Ffake%2F@v%2Fv0.0.0-20180203215853-4178557ae428.mod 32 BLAKE2B 2f3638c020525d7a0cd92e055ce17e5d9df3b1ee52d16ae5f8dfc5a9eb5284c43c6c78a07b2c9a5c9b5bd8e74fccf4227f2ac6554871c723afc9f67cdfd9f9b3 SHA512 0d34c23179f8a14936f1d5bb45ae3e6bf0e5ace54bcf93a9d121f28fffb75e504d454a91f343189c2873186c79a688971ef3172a723dc5be027706c965bf3dc6
+DIST github.com%2Fiij%2Fdoapi%2F@v%2Fv0.0.0-20190504054126-0bbf12d6d7df.mod 28 BLAKE2B 73c260bb0fbe04443ed5bd584fb0b28050103a56737a6f9ca2b892e4e2f4efcc39ea122dec597c6af87d897bfcde1450d6f42affdcd370bb0a65fe06f92d4638 SHA512 f226d814fa62df341b5f365d419db001f72c57fcf0a136d770fbb49b0cd24cf9332dd65f0a2510a32bc95af84a6d058dddabe0202e893db52e6f95099e04a35f
+DIST github.com%2Fiij%2Fdoapi%2F@v%2Fv0.0.0-20190504054126-0bbf12d6d7df.zip 14849 BLAKE2B 5db259149a633bc2b3ea35b5040e0d85bbba51508b7bd7fff5ad7d15f76ef2a8bede59c029a2737b6723a009950e438298d2a719a656003ea2760582af985710 SHA512 ca56726b0b3c709fc09601d4f49e9ca5b1d6ca9d07422812cced5ae6dfa83335ad83ebf93fca4aa5a216aedf5c3a7f5b75643eb3ba5c76315d419f4a6480b969
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.zip 26261 BLAKE2B 65c5f6b4f0e2af1076e279c5d3f61f7d6b8654b8a7537aa291693a784886dc68da0c40b480d881c41bc46ffb28364b90d22d88b17cd82ac8380d5ecd9777414c SHA512 448dfe08b2a5f7f2f1e9868274be4dcf7d2f2ae495994d16c74924f8059742204547ef2abfb73428afac3938e5f477a9db51b29bc76fbda32e01b67419af46af
+DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
+DIST github.com%2Fjellevandenhooff%2Fdkim%2F@v%2Fv0.0.0-20150330215556-f50fe3d243e1.mod 40 BLAKE2B c5cfc13138ded13b58e87927dab91ee13e3c849559ef067ff5dfc7886e454946daed9a9c916fc33e7ca2d090ba3e20b66d2b3d5cce1ad52455621659ada6ddcb SHA512 400eef69c141ebd20b3b38df86e95cceac1cc214b0ee7837ee84c6c0acc96097a459add9ff20622f1fc7df10e7c525fbe1b573a0b0e7597678c9a8ebe52bc564
+DIST github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod 36 BLAKE2B 67fdbc6d14995318979fb3e5575136262165afd7a1582f078d2c84c5d7fcc893f52707f01d798bd2a43e1cef8fdab6613f34fd9e4f5f1f6a61d91bf09a55ffa7 SHA512 5db9838fe6a00be9849cb79ad148813a573b652d6f6cf220c55b68bd23636016e6bddd6733f6b29d63e5f02d2750a86c2dcea6b964ceb87d4048d5c5f3cc989b
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip 231432 BLAKE2B 99b12826322d86b39d622bba690286fbc43b9e0336161d5218e6620caac0580fc7b3a021e60047a19815e35a4821d31066bf1ee6ca0e49f7bbfb1df10df21380 SHA512 331f1c4fa97173f022210d15719a9ae8a0dcc1c7574e1f019959070bd8cc3f77e34dba16d78e8d9e0083fee2ac24751aa36d5cdc0b2d1303a5118156ea514b7f
+DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod 38 BLAKE2B 091e824ab9156af7978fe3aa6f61ae046588510903cf635ec166225395e40df6a1c715e4eb3c47aee849435eca3cc10db971a7c28acdae233eda85a4408c7520 SHA512 377d94cf7dd50f88b57ba829ded5169a6c41c5a304814660df0a3447d10860b87855f25cdb945a6e4de14c41281651330d4109c6dd6684c86fa4dbba27a3872d
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip 133805 BLAKE2B e9a015f12e82e7258f4995a093cb3c710c2ada1bcd4d0e5fd70fa00b7917753c41ff23fd4ef5cd30615024791526a053c623c28b4cc3b2d304d17960b35dedeb SHA512 2ed727a07740077cf749c197615814b52511614129d15e4e4f7f04a70fdea7edb8a55522d33a9e7a29595d3c41170f7a912a7acd9fe88c6c8215df721d4d87f5
+DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c
+DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod 51 BLAKE2B 4cf5f813ed021b04c810da33b332dbf44f45594e3657779687cd24391d2a93770f2a0e8999fa5a8b6564da5e08ed9fea1e52394907d518ea14a9568adf263e67 SHA512 c5761bc45d554ee6639c4ca23fefa5fc5c8a7c818f8f18d0b43aaab26c8114615543a1be207f5aedaef53c2dda623edeb7d3ae1c5ce6b72ea42605a1d5c31667
+DIST github.com%2Fjsternberg%2Fzap-logfmt%2F@v%2Fv1.2.0.mod 290 BLAKE2B 8886bdb661c6df840ba61069f726e657f33d18e4ae67d0a61e5c313815d141d26cb43cd6099ee38a0331c09475ecd99b9c15e214557002e2f75d55d2e1da42c0 SHA512 7ba6e7ed382fd995e36d4b5f210b180145ce1b481b536bc32e3eaeb46355bbdd60d923003c393103296ee829ef918841ed3b84ed0812d43db37b6dbbfdc1d012
+DIST github.com%2Fjsternberg%2Fzap-logfmt%2F@v%2Fv1.2.0.zip 7932 BLAKE2B eb878b9764f32dfcaa543e98bfe70e30e08f5cc9bc1127172060fbec0ecc7e625bbfaae6dcf82c94037df101d1ad1d1846e7fe6e8a0a2afdf07c16b1678ed0cc SHA512 8dab5acbde4b44417e71cfbf3a82b1b48eb86cfe8c921a6549c093462dbb2e24440db5c60f10186792c953418f43f727b2fc9b70fb8035f191d09b76e81c5cc2
+DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
+DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip 9901 BLAKE2B 0c8cf7ad0809f65d91b9ad5b27759cfedc5efc25194f19effd4b19c35c940461a48a57636ef3c707b27ac614b693ea05830bdef6943f11993bf561ef558cb99d SHA512 08b7201a9aa3294a3fc59bec78fee09f0d1bc7507b50b1d1cb1fa29a523c6870d00b633ea9679c9c86df9841739f46e9d5d9bbf0e3ec15b8ad08e57db67eedc0
+DIST github.com%2Fjuju%2Fansiterm%2F@v%2Fv0.0.0-20180109212912-720a0952cc2a.mod 32 BLAKE2B 647f275009067b96533e0798171685a7016e488c5adf294361dbacf6a1f9b9958dd8c4fd4ea6e53ded3dbe84b178cbca5b8b13b0c047d769c8ca1308837fbc24 SHA512 c367c9c7dc9ff6a05d6d2a77d975ef29efb5e6ca73e1c446c712eb3df3f1a33de200c72f0d81810cc436380e2c67188c1d7e38ef110e20f9b7ae4db7c409e3e2
+DIST github.com%2Fjuju%2Fansiterm%2F@v%2Fv0.0.0-20180109212912-720a0952cc2a.zip 24106 BLAKE2B 9dbfd461ee5e9d9548a6021d588e3ad36e33c034d452ac180882892a933eb69000b062cf698b11ac2b87ece4efc744881906494370982d60d7493416179eb128 SHA512 4ef8c6620f596b1bf3145cb7745d661206bdd53a9495515f6afbe143a1fd2dab680e8bad412fba583279488040594d59750bf90859396c49082ba7c090d7ecd2
+DIST github.com%2Fjuju%2Fratelimit%2F@v%2Fv1.0.1.mod 33 BLAKE2B 529c89dc43822871a3108f93bd29db8bccc63d1ee1c44b0d1c3da6cf966bdef90f7960878ed4ae8e6a4407189bcab08b70b960f224f8ba57db7ff118458777ce SHA512 81a0934c2626af125a116aa22457e47f16487546b4367a1e2b160144b4e2244723986e83914e365543e7f265ca2a953112f934627ce03aa39568f2c8f0c0124f
+DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
+DIST github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod 41 BLAKE2B e9dae477e838938303749c4e7f1d0ece371d20bfb8f0d6fbb915a9ec249b82e300ef691c2175137488065828f67b02503576420fc95c2aa40f4fda262526dc7a SHA512 ab1be2f5ee91ad8c24a7c1d3c2277506dd76f85e8511f53e923ea7e0ecba140303c9312f0ecd2e09631e2e6591ad31a3b19e900ec102b486ed9b56c38a0d0c84
+DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod 143 BLAKE2B 128f8934f81d0e497e1258ec65129fe5d8831b66058669a5aef3fdb2fbe5f6d8ab30bfe97a1de7befadd34aafd55d6d15bb787e8948fb7718761392817203874 SHA512 c5e546822036a7114a29454e28290f8e1082392a47a101fb1d370e0969fc2c83186b4487473f903dd638abb8a763ce3180dc87993906895a2df33db7d8bc4790
+DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod 98 BLAKE2B b9d3c55999054ed927f666a43066ccc6758a6c5f550651f43ad5d85b5403c882ee76ac2b2553803d71789da33c60ea41857ed545003072ab6c666dbb77118e00 SHA512 3529b37d770af511a716a612b7fd7fb6a4805d13166e3a6f9378950443f6eceb2f3d95db5a46027437ce55b36e571c75bba72a03769d21ecdc97888019d80a68
+DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv0.0.0-20161130080628-0de1eaf82fa3.mod 33 BLAKE2B f8dbdaafe3a686fd557b1e1dde2a10402c841a8095800b56f4a0cc180befd45bd74de0575a7e90b5202bc50faee916196baef35d80f8ea013ddc78ae416af6d9 SHA512 3bc77706ea4909ed01ac069553bde55024b7bfa1612f5065a477d44fb68bad00d7254da1ef978a1518b2704b507ce4cb360571735905c39c7b97fb3e21c64422
+DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.4.mod 46 BLAKE2B b5879e59b7061f16bd04702694188fc8b148c5089aa7a3a195c9fce7c349bd191dda7dc3172f88f0d546cb8c3eaaa82eac73720992509baad59757c740d277f2 SHA512 55b1b23e692eed7e5cd2789b542c27eb85c019460a1ea75bfb31802263328b53da1a466e4b09085e4e002dc699047bf3ef5ab003022a6182c9b762e0b812febd
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.4.zip 16811818 BLAKE2B 8c54587021045b8c13f86a8e666bcdf5e975ccf5ec436d20b471a45a9e130f1f702dc20d4403dde42fa415bedd286a6e8b45473fd41488db2ee3733413312416 SHA512 fe00530375de5ff95764f96e770c98eb91deb4abcd378b81e9d62cdab107a3b87f3fb77ade17e27a09bc46042ad9f73bce933da65b7127aa1d9afa945cc025cb
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.0.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.1.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
+DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv0.0.0-20180405133222-e7e905edc00e.mod 34 BLAKE2B 1fea82f0ae24add73e084ada4930a6192f6f1d7afac47e2fd4a018e0167779741e4c948ebe67965751a845fcee894fe88e57a1e42a00a8aba2a6589dc73b30e6 SHA512 c71392a06cc0dea75b46dcab30bc5b374eeb432aaffc678213d5896015cd31ef085387446a8086c3275b97bbfb02c93c0180f7b3bac5fc1cdf1fbe5bf7af9887
+DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod 34 BLAKE2B 1fea82f0ae24add73e084ada4930a6192f6f1d7afac47e2fd4a018e0167779741e4c948ebe67965751a845fcee894fe88e57a1e42a00a8aba2a6589dc73b30e6 SHA512 c71392a06cc0dea75b46dcab30bc5b374eeb432aaffc678213d5896015cd31ef085387446a8086c3275b97bbfb02c93c0180f7b3bac5fc1cdf1fbe5bf7af9887
+DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.mod 34 BLAKE2B 1fea82f0ae24add73e084ada4930a6192f6f1d7afac47e2fd4a018e0167779741e4c948ebe67965751a845fcee894fe88e57a1e42a00a8aba2a6589dc73b30e6 SHA512 c71392a06cc0dea75b46dcab30bc5b374eeb432aaffc678213d5896015cd31ef085387446a8086c3275b97bbfb02c93c0180f7b3bac5fc1cdf1fbe5bf7af9887
+DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.zip 364501 BLAKE2B c1ee7b5fc9b4e08d49fecb7dc017293e83d535e25ee098b3336dc5e6be4ebfe475cf6231a78d5a8135d79f5a5feac44a658b24f78b1cf27a1cc8ea5846c6fde8 SHA512 8f63bfa6ae4f589b512e1126600d53a121e932944e25e1b8cf315214304b473c86b1f9d5cbaebe9c112ac397b9a88a217a04204eb12368910e3ba1ceeb823da6
+DIST github.com%2Fkolo%2Fxmlrpc%2F@v%2Fv0.0.0-20190717152603-07c4ee3fd181.mod 30 BLAKE2B d5459de7c13dd18d24cdda6beaf02ac341eab5353626d462bdbd22dc7fdc5f67a41b078ee1a33ea578c9f718ab78bd20ac76d76a8355918ad31aa228aae0345d SHA512 a705d6ac18dd446fb821b3e614b74a5e0e5344d618ad889839f04b1d79283eaf0397bdb9d565385cd695b5ca2288150518d54f60fedbf9a8396bb07530b016cd
+DIST github.com%2Fkolo%2Fxmlrpc%2F@v%2Fv0.0.0-20190717152603-07c4ee3fd181.zip 15992 BLAKE2B 1f74bb00322f2419639e99c1c2b8b54ec35c6f3ed32f7c6dfc66e5da429eff8dbba43c762eb7378453e5d20690390a173c6d20c728a88439d4d9993de9d9cc76 SHA512 ced432b9b38cfbe55eaa4c78a7de33fd9aba1840f229335f128cfd91799f46136ec7193bb9af23e2866892027a2002e8559894c1ae826d8a15e540c12ba0f94e
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip 3968 BLAKE2B 223cfe3604cb674a11d4558b8f5a35e2eb41cf11d536e2e2cbdccd6a3c6bed8abf66f450774b39e7247493ea8a382906617c5f297fda02a272b18eef8dcbcf47 SHA512 16c4bf83b78541d2d684113926813ce4cc91f3f13f34dc2cf8d643661dc9f21a988b8382d2c058e138fc87c1ca197e8f694b07595959e917c82bd6ca9101a5ec
+DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod 28 BLAKE2B fddd4b3cdef60f53bc3f8da5a3154d10b49dd180c12837d3740c22b442947cba2025649f3ac7321bcf0c73a272527659b0ccd9be141ddca13caa7594bf6ad3fe SHA512 3c623d077e39697506174a50c0380cb7787a05a52819b1a73c2f64ba8dd819fd500777de83c83d8d9e80f19c828128a569b4cd783667b4d6b9a375b0e3d527a7
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df153e027f22be7d28eefbea1c0adab10979f19d601b95d300c54086b5ee388f453c73b9931339b9b04208fc5e6512385b348c49faff5488 SHA512 bad73f3c47f70de55a90a977a1e2b4a68de545a8425c71533de081c7a8f71d7ab1b489001c56ba2e88dcb78c08804275f7f8128c812f50d005a074ed6dd9286f
+DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
+DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.3.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
+DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.8.mod 72 BLAKE2B 796a88b0b7d88f469e90e59f66d12a3c515e0230eb2a7ec83f00f5266266d93eea475b752677f2ec81a7c99243a5034ec1a2e9f4e23a83b61bfe6e855246b6d3 SHA512 9c13eb40018d27bb2f5623251df11cee7b8c08eaee681b4678f854d7c023bfd3885bf04ae085183c7501e637d86386a00e3a979088aaf2c37a03f732d7655a5a
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
+DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod 46 BLAKE2B 1989fd1b186328abc02f8dcd503bf396ee63b55630d3f37f576c7e55b4c48623f62d5f2b16d047afeaa13cd423ab014f254df5f210da52535bb8818a60b375d4 SHA512 4fcffc595708aba2673e895182e695e91d6d239f8feaaaeaf15d75fcff398112af0f0d5ebdb28506d95eae30533dcbb54112ac0b0a4034ee11d7a35b78674915
+DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.zip 25634 BLAKE2B a236740e22b6dcadaf27ea0f90a68c15bed68599ef6cb086acfb1c555a8c0210663f165f3bc64bd9cfc20f3b8a9f1c5828a4a658699d3bda97104f759aef78b4 SHA512 a5ffd5713ddc3d9bd49ee9cbb0a8f5154bcf0eb073c9a772c24a6e11e824b2deee18425347f84b267192c52f3559086573e966fdd8e73e84fcee03c1971e1b7f
+DIST github.com%2Flabbsr0x%2Fbindman-dns-webhook%2F@v%2Fv1.0.2.mod 377 BLAKE2B 90ca00e21936e419212332067fedee1be3f4c657aaad5e450ae0024cff7f8a626321744d9cceb539453b94423946e85b473841aeae8a77cda09f752f6174e8fe SHA512 bf9b490afac3bb8c25e121b1dd749edeb01a45ea742aff3d87751ebee22d63d53ec849d0a3a8f67081cbc48d5ada675152375992873ecb08aa142d08d30f1b39
+DIST github.com%2Flabbsr0x%2Fbindman-dns-webhook%2F@v%2Fv1.0.2.zip 28257 BLAKE2B 5a4de078e19325cf894c7074a3e04b86e327150c272b6c167bee49dff67a6afc236c3203ee5eaabaea833bbadbd710e2ec80ba818e1651f04811ea9d41dc269f SHA512 958321b9326f550734edadfa4ad334a3666ccb69a1e3a6d1ebda086bba767b8ea9e54078b3ecf33540efb80961cf276a61d17ab58c772add6207a7bb36245690
+DIST github.com%2Flabbsr0x%2Fgoh%2F@v%2Fv1.0.1.mod 154 BLAKE2B 7e9fe7a30a1c799f76d112da0195fc4b29e05b37554c968a72bdaf61b292fa51ab2d1e4eda218e2f3e6b156225b9571811d77ad95d0a9bf2d13ce78c81bb5460 SHA512 423f928f873c32dfa048d9f88fb08cd01b823b07ab4d706651059f7ef6f3ed3ba05ed5d5806e27a78e9d409b340a638e911aa688b06b8becdd8a04df2751d443
+DIST github.com%2Flabbsr0x%2Fgoh%2F@v%2Fv1.0.1.zip 10386 BLAKE2B fcc8a120e05508a28635c4d40cbfa388d54d94d3fcfd426d1c9e26772f8ede86e045973d519e3103a8bf202ddc42c69c3af1d2350e378d575d286ab8c9366077 SHA512 d5af6aaa7eac9af1d8afe072677e66912dba7e723103d4dc554713ad1e9129eb0afba813e5dff4c875db806dc4a7e310e61dae29cb56982446702a868a3c460e
+DIST github.com%2Fletsencrypt%2Fpkcs11key%2F@v%2Fv2.0.1-0.20170608213348-396559074696+incompatible.mod 40 BLAKE2B f468cc8d32acf9031d65cdbc440a5375c2a5015cb13dc94f61b4e16d14563e5b2f0edbf07ee9623bc280fe4cc305e8d7a0ed271ab8e5f73ac23a933c941fe167 SHA512 896be9cca3500de2abf70e48fe56ceb8d6111e1c56a20a7c9858ba33229359e8f82b45937ab3ab14dc2d3f17bd290cc001cd4ad94d15fb92965c1b914f0ad9e9
+DIST github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
+DIST github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
+DIST github.com%2Flibdns%2Flibdns%2F@v%2Fv0.0.0-20200501023120-186724ffc821.mod 41 BLAKE2B 9e33d8fb7686e456c85a18e5942e49bd91ab8b93b0e14bcf75727888c8f9487eca887e8442f66efc3de66512eedf59ddb98e3b914b37bd0f56d693c61a4f33bf SHA512 f588d1201e53b10ed14d020442225c87e024d7ff065f3ed1cb24427a8279599878c7ce1c2ddae079a2366f05bbb3331e930a1bf70dac8c04afcf7451de820dc7
+DIST github.com%2Flibdns%2Flibdns%2F@v%2Fv0.0.0-20200501023120-186724ffc821.zip 5467 BLAKE2B 8b6319e4b6b36b22d43daa8f69ea0df41a61d028242a7dcdeb67b2e565436038061802e782ee5bee05fd620a2d5a2b3476ee1c5870c50eb8d78f75fbf69af81b SHA512 d460b858c85f116d9bd1f29d2e8d12e01d2a8390b51506e28d95592037970a98ff90605e6d81c6a4064c912f5656f9ccfd261d93d0cc76d4ebdf5f2654908a3c
+DIST github.com%2Flinode%2Flinodego%2F@v%2Fv0.10.0.mod 560 BLAKE2B 7e3cfbf77d8bbee8079fa320b9774d2f09534c6155f629329eb4c5b47b769bdd656158b2dc8601961428fed54db726091bc4896144c26d1d86caecf9922be278 SHA512 5a899e49a753311291abd853eaf95b2717a1f040612c0e44f18253e13dc9be8f6eedc845bc356ba2032b6f152bff1478ee906ffb0b33bd7ce7e11c8445bdad79
+DIST github.com%2Flinode%2Flinodego%2F@v%2Fv0.10.0.zip 362101 BLAKE2B 1b45cd262454ac3e1f399cb1ccec1ec049384258edb90ea775e83c75b5f80da181c30b41f0fd01db8f362847466443c9854cc1cf70116bffb7b5ef2456cfd8a6 SHA512 b5837991c79770eb4e775fc593160375318ae41eb92015b5c62991eb23226436c72af5e46a4d2bcbbef0d0051637e96bc0545490347b923319190f2590756e22
+DIST github.com%2Fliquidweb%2Fliquidweb-go%2F@v%2Fv1.6.0.mod 50 BLAKE2B 14ecd513688eb35a88bce9fc03caee2e27d525472e81066f5a4956e4c6a901e6f5ab55be3a8498135beff669a598a7b5ce2a576eafd760106123115d77f90fbb SHA512 229f3c2a980a0e4baddcc1ab23df2dc119a96fe7e5a19aef781106021e3c289f6c1ce7cafe81f342319020f0b35a2d50d0acae19bfe87e361ac32b6ce733448a
+DIST github.com%2Fliquidweb%2Fliquidweb-go%2F@v%2Fv1.6.0.zip 22844 BLAKE2B 3c7a8d81118acd389f0abb016fa64fd5b0352e383f1169745d9d3587de906ef224fe7430abeae361965c0e6844c765a2fb337a87bb2cf804edbbc6ab5a0ade14 SHA512 480cd325c8fb795ce4bcef32ab3a0c3e6a8841becfe2d17509b0b8a088e140cddefe1f6cc7f3c5e892e31003e0bdfe8b5aa5868d4526a43d14e613c6f9d892ed
+DIST github.com%2Flogrusorgru%2Faurora%2F@v%2Fv0.0.0-20181002194514-a7b3b318ed4e.mod 37 BLAKE2B 400e3fd523a0995770046676b3a848d776c64948653c3730929e39e0c0a9fb2ffdddd8405359f676375bc506efb05bbb9423af6b6674d16baa16d53f264d64e8 SHA512 37c8088012b54286571d11de7e6b59d68a0c5b79542c35c31c30187ac3586f57466354498960aeb500226d740eaf62601ed6e569ee82039efc546a3bbcc7ec73
+DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.15.3.mod 582 BLAKE2B 359b64b1efd46cf3dea5fe54e27e8e2309eba8a61d10436b7185599d47a080ffed231fa0c4c990d90095843ac685a0186289fa789d39ac919815172ab638c0cf SHA512 9719fa4f3bf9c6af382371358405d3fcf007a553203ae1c4f4a21d0ac88eda88721daefc0951854940656d42d1a5940658c5793f162ff8d46fe05c0e6474fd2f
+DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.15.3.zip 678990 BLAKE2B fc26153db7fb0e5124545564ba89c6a47e40d9cc4468c8eca96c0eae06186bbb80d584baf5d5a9e0949eff5c4680f1678e91ed0bf3d874992d5b30e01516503c SHA512 8910f8e93aa91ce1d5c5aee3c34ab6a8c0417ce0f05eb6e03ff60ca9789366f5f098da0eda816f8a697d1dadff2143193a03456097c49383313ddeba1d82a1a3
+DIST github.com%2Flunixbochs%2Fvtclean%2F@v%2Fv1.0.0.mod 37 BLAKE2B 0d60c4f85be76a6a73bd4b6403a73e12378ceaebf9dd48bba245ab0e14e846bc1fb480671f959ff56d52c5e2b41db8de0804d4258fb4cb58d6b0c618c1401104 SHA512 6a0913935e88940258478e250207882eb1df8727e18e66419ba5d4a06a0b2c8691642ed379d4b4ef16df715893b35e59d1e967d5276e6b0ea75b1f481e852a65
+DIST github.com%2Flunixbochs%2Fvtclean%2F@v%2Fv1.0.0.zip 5986 BLAKE2B 2a64b2fc6c1c5ba028df7a0050bc30cbc78a6b5b15491734bf277bbc838a8e48a7cfaa7aff1714dc0db286656012f6065eee36584f69f9073ff5ecc858f397aa SHA512 1fb0eda44917fb59b299080ed300f16b6cc0123d0a45b477dbbc2b1d6aaf705a74997614b2e96bb35c4cc9ed5b076a2369d13ba3963bd55f19d87a5e69e4f777
+DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.7.6.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
+DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
+DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
+DIST github.com%2Fmanifoldco%2Fpromptui%2F@v%2Fv0.3.1.mod 38 BLAKE2B 8f8b32c78450f59c7c1bc0ffdde0694728b01137e7681be81f56e67a70b91b57e2dfdd8260bc37920555dbadafddd950c63917e9f1fc0eed2620c1c99fc707fb SHA512 bcf9890647ce50794b5f27b25b645b76dea6599e43cf75c63c9cfc3a1787cf7f4d9caded7e38cfa4457bee382bdf5056ddb20c76eae476a5007f80f8c564a983
+DIST github.com%2Fmanifoldco%2Fpromptui%2F@v%2Fv0.3.1.zip 37084 BLAKE2B 18aea2de8b7e240a68a36f2371c60da8e48f05e341085a30cfaf2e6befd33395a5b8f24dcaebd3633c88c8f3f7d1bfd9af8e099d344ffd42ab5e4e67c5f07422 SHA512 42af1420cc25af7ccb33a7d967c9d0310f7c79de5116d9efa157655e35ba4ccb2bcf43b30f96861860c5eabe4b1a96bf5e78ac574991eab5e780774edb29e678
+DIST github.com%2Fmarten-seemann%2Fqpack%2F@v%2Fv0.1.0.mod 176 BLAKE2B f13ab7cbc5159bcb8e425bafffb50590b8ba21d0cf304bf690151d42db2facda3347d7ac3adf8030cc939c4f1930945f97df443ac59483d1575db01e2d354163 SHA512 f3d70545df7302538e468344498b131d8d5cda99696d02e025f255b77ed02cbb87941eab7c17235ce1027dbcea96d298fc304d2ce88db1bd34aa9d1fb4487bbe
+DIST github.com%2Fmarten-seemann%2Fqpack%2F@v%2Fv0.1.0.zip 42470 BLAKE2B d02c581ec771e44ceed4ad7bc6b82373a8aa853bbd8cac0d11fed5516e0af09db0f5e25d63dfbd2daf49ec206604500902a98985885e706286b37ddc95a10e8d SHA512 147f6d6aa35b4819aaa6073ab903aac88c4ac90be47e68171408796a928f198eb1a63937a20b319acff6e15fce7524ba00962d38cca3ae3eb887ac17e3c692f4
+DIST github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.9.0.mod 200 BLAKE2B e92c57381bad535c271d3e00c5c361d6b1ad8f5eacc002d511f2e473d4d824db11fe3c223ebd874416bc28481b5eff9f42fc7cdafda3b334c150223ee152cef5 SHA512 485f69dc07637010a13314d890a1009b6ed9f144baf9263fa6fbf131b039df722bda6aa71b04fb03efd7fa721b87f73ae359bd2cd73568321884fdeba986a8ad
+DIST github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.9.0.zip 1156507 BLAKE2B 27bcc236125bf5723a2a1532dc915c6267ce11c1483dd4112a9aa7a8fb398a03dc7120b1af7be6eb94547c184d487778c0d27ca1a55fa3646b870d5be3dd0d5d SHA512 8ba16d79b00059d0a465d10dc74176a5095f0bb38cf09eb95c2b5333a29f58a4f349967013c93cbfbc2a34ba4360d45eecbe19564609dfb56e4b495b93d90d3c
+DIST github.com%2Fmatoous%2Fgodox%2F@v%2Fv0.0.0-20190911065817-5d6d842e92eb.mod 104 BLAKE2B 75db721c7244fb3093e6fd5b7dabf0bd35cf91ab1c74d77b118e90cd9950f522ac58aed60c82cc241d769aa0bf19327ad25004740ac16d180b33ed4c5f31c842 SHA512 5d973082b1d8ee636c161b64a0bc2366652a83fb3b2e5c62104025915ff2633f02fca23af35d9b5bd2483f9c4d12c2c0b42cfa2d0833c428686156659851e4ee
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.zip 10606 BLAKE2B d9aed996970ecc4828716e86ddbc85a7949f60ceacc7326708ce499bfc09250bc8ee336806b229a44064839e7ce34f5cb2a7607da5e82c417a737ea869f97f03 SHA512 dd1763a8d04540b3e579d397fa4888c4bd8c00c3963cfcd1fe42af7c1990ef85f9a2e2fd5c5f2c7d3e6817448df5e2237241ff5a2cda651b061cc8932e0afdca
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip 12838 BLAKE2B 668586a4df02fa2d5db174a4ada1245a463946d4bccdef2599b791414af4f10eb07f56c61484977eeb21499db7f9b46f8fea03feebbaae5511504c13e3f7a64d SHA512 c3104e921a94b1a424cbf6936e8e5cdf5823947132f41190c211e050c9c8b7135c7b319eee0667a2b958c9f4fda27b9cbad4436d37b512e269716249dbfbef65
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod 104 BLAKE2B b8d6df41ff2e8952e12f0518d455969d7a496b8318052ca37ffabc663d9602b9df70385274818af8bf1b50e70a44ade59b0436133e08818ceb385d34a3b44c03 SHA512 218110264da1c7396295627414259fcc65cc9823216d6c03f2a6d7499e17205e540821add3216ba673efda92f1e5bfbb817416874fc745ed1d926c43fdd9bc99
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip 8885 BLAKE2B a9d15d5bb4264391abb906ef4b8ec929ecf61d0bbc781ad37aa36e236cf92f5a97f2035c0c08bb49c85142df10ba129c4c1755ede5bc8ec71743300f60af3d47 SHA512 4430b33d70f0fe35d07aefd6320ca0d8e49b71689d93b49e021e1893f8f9f043f8a6d16705e5517a600a538b3f35fed8f14a69a985b2955e8b6f34c19605c83f
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.zip 7026 BLAKE2B 3cebbd0bdebcd1d32b7fc618b7190b7813876a1df010d1c3ca3800c41acd64b6537e4b3e4d4a574e3eb736822a27eda7bb2fffa197063baf9a347a820573883f SHA512 829b0596279218a2fad36695fa42036f265ce79903a0f5aad27495dfc7c6a33e8bad32010e59f4dc6853f1e38fd9e9f635ca2f56adaf5ea47e4914f2a892d251
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
+DIST github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.10.0.mod 35 BLAKE2B dfade1d4d17af2380cb103ad9a0c91ce0eb7e570f9ab98d32c8d74a9056b1ba89c44c6fbceb4a2d5e5d45bb552a18e5845b1c40d8d1efbe5a9aa87e4af0ae2cd SHA512 c929334b82e3174b98a22bcc58dffd1291e3bcea6c5f789ab36296353cafe0b09640ba7015ff559acdaef58a9212b0367bada54aa89f563c6dd4773f3220c04e
+DIST github.com%2Fmattn%2Fgo-tty%2F@v%2Fv0.0.0-20180219170247-931426f7535a.mod 31 BLAKE2B 01ec123858a9bf8d2e9b6b2bb8415431e5d4145cf3ce82c16522eaad6f5bcb7667e391ddc4544a3ee04a8dc9dbf3fbdfb74173da09f3a330952bb5eedbbe203e SHA512 8c099ef777c49b02a62031dbe9d4fdb18839f4b2265802ac5fc3e6c6fd1d3278dbd3bc01e8674a0b52d2d6e6a394d1d4ef7bd64f4388c68e9b81749a4228773e
+DIST github.com%2Fmattn%2Fgoveralls%2F@v%2Fv0.0.2.mod 34 BLAKE2B f00bbc47239c6bb31831b7a6a0f4ebd9e8d23275c2bbb0a851ba5726c310867d0a885c16984f55874b0b7378dda94533ac49a85a8de1d28fbada63ae7e94361a SHA512 e4e9e3ebfd69fb7f182352a03999e4bf657d58f783faf2c8fd0da1d71818502e12acba43292418ab929390623c638352b9603dbda6d8feda4711a9a765a931fb
+DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 BLAKE2B 50d2d6dc9c1ee92d629af8c9aae9fe5f70a0c6fe270a95a8232cee3c50132ef90c68218ac64a3b5b72d94e23ecbea5f567fef39a81be3d4585bae3f4f5348545 SHA512 5235188477921a263176fefaffccdaca4bf8175a2e248356a06596e37fa868400203172c7fe9fb80d0a65d335d23d80edefd242657de0eb83d9360589e063bba
+DIST github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.1.mod 42 BLAKE2B 1d5bc998881315c3b4507519cf19774b640d614dd686c11fdd8a9ea8f75b7c361a5bfbf13e4d005e768f6d8646a774000e3eac16d817dd7ea2d04f617c7eeab3 SHA512 c3fd7d7dfbb06289594cd16f09122e73d8882153ff54e1fcdf6f7c009c244fbbd7eae3f30154207f99a06c3fdee761b74cbcc8423131f714c626556d75ecaa94
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.zip 210715 BLAKE2B 246ffa14da7608d3f1b0dd2969b2ac4e3f0b62fbc5060ae3e7f39d8ce5cf40d17b2c074021205513c068b33607f108f887a9cfb42b5d9f013b642e70ef85158a SHA512 c7084476120e931394480ea1ef2d4df157500e89f5e5e2fcb05329e5439bb15c99d70a2566400bb74e419984ead7197809ec6cce16c624ac42b8cfff0e222d5a
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.27.mod 333 BLAKE2B 8d0eee290f65ec90aa77494795ca379d6e0dc3c1a3e040b045309e1ddcac7623330a140fccbf829cbd32cd6788195f3446d340144d5757340734804504203f86 SHA512 838358c8d40bce54c7010bf6c141e2022f2036ba91129166dbf27e2fbf355b8c32392fe8fd6edece94934c460c1b9bc73c496627b4b7efd63341d7086fd0b114
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.27.zip 218584 BLAKE2B 3369bc1602c73ab798e3654fe3523c1629f6d7989a9251cfd831181f615892e0b3adbfc600c82e15ca70f80d4c2b542ddc66aa23aa71e77c40c3a4715b1d3611 SHA512 b275ac6c3e816b66f0292668b2a7d11942792f58c231c4113ff2e3950ab9108aaaac5c8f4278f65f8127635f14cc025a0622791b6dc3804a8186c33195ce6d7d
+DIST github.com%2Fmiekg%2Fpkcs11%2F@v%2Fv1.0.2.mod 40 BLAKE2B 48753014b177fb672fb4b96c34fda82fd83e7cc16c40ccf8409628f3b41f24fcc34fb0601ac8cb7869558c7d7ee97f6f1b8e6f587d696222db2f482790a628b2 SHA512 571622dd3240dc43d9119a5cbf644cebbabf134314c46ed43438be1568c871617949d07c60b8af3d22f858f7504ab91effc9bf234de84da1fbf72a936aebdbff
+DIST github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod 91 BLAKE2B 22854387f9c0bc85c6f4b7b9c5ce8a774c10c6be0c43ec6d188b6ff2f2e394ffdedcdd1bc0b8ba0e31fa3c418cc9339a78a798beeb355032a0724b284573c38a SHA512 8858ec62f3bcef65224ee7d66bbc16c080b2ed16609c46c5c6b6d983b9f7eef9e020a2ae78a16d0226c0f02c609ec5da92565861c02a81494cd6060dd56d005b
+DIST github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip 11210 BLAKE2B a469026ecf6a1ee2f2d56091fd90f00857cf5e57164ead9e53c15af03d10a8b737a1d2b2fc336e3e972af014dacf8f1321ee1fa1cc9dab93790fb6d03ae195ed SHA512 30b1a531823403a911d9f877352218890bbea15d82390b4561ebaa4bab09f493d49181ea5c34078c18df31b1896165e80c4862b450ef5858ed8af55b2a0c42eb
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 4163 BLAKE2B 7e00360086a04fb62a46ba20a10ac3460b364aa6ee09bf46f9769980c086db04aad45c4cbaa809a218f207c086876678d708a74d0a7679a48cf62b0b5edd48b7 SHA512 06bd620730c303df004e1d6a06a1aab8d83551d594c28e42f8d43613153ac28e6a5dcffaede69c84b2b49027b62581851a332f1397a2d6df9a46078510f7d1e2
+DIST github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv0.0.0-20170309133038-4fdf99ab2936.mod 34 BLAKE2B c2617f21438d9c66d02b5f99c147c4409aca4892affa6949f59d6c2153b5860a177c90e95ebfc7649c710c19bf1b41693c67db80c4644c9bdb4f3d9c2b16fc07 SHA512 e493fbf1926f5de9c7b499dcfa319c4881e088e6c722537a61a75ca2afafc93a8586bac67fbdab47efa714a1ac8aa47cf196e821aba83662df6d4321a9817e69
+DIST github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv0.0.0-20190716172923-621e5597135b.mod 34 BLAKE2B c2617f21438d9c66d02b5f99c147c4409aca4892affa6949f59d6c2153b5860a177c90e95ebfc7649c710c19bf1b41693c67db80c4644c9bdb4f3d9c2b16fc07 SHA512 e493fbf1926f5de9c7b499dcfa319c4881e088e6c722537a61a75ca2afafc93a8586bac67fbdab47efa714a1ac8aa47cf196e821aba83662df6d4321a9817e69
+DIST github.com%2Fmitchellh%2Fgo-vnc%2F@v%2Fv0.0.0-20150629162542-723ed9867aed.mod 35 BLAKE2B 4427dfd7f169daf7c63bcfae1116dfddeca583f03e3a9edc24b588eef903f3e7c4f59903a745977be1f778c6250e3a8175bef36a9a8d7adb707759ba22851ce4 SHA512 5fa11d6039c5f030350c61873d6bef1acc27c4aa20ebee97cdf5158adcb55966f03aa5e766a8d0b23978b3fe869817fa2a0648eebac12784eb048e551ed5a5dd
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20180220230111-00c29f56e238.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip 25943 BLAKE2B 9cf08441a9bb45da31ac429a372a969a822a0c5de569352bc25403cdc3e8559a7110dd2612cc9b93c91882973aefdc70f8ddadf44c1488eb0c3f5bc62cca2b73 SHA512 43d57d9ca99ee6af49e8a39be4d65799afccc8cb077a8c5b473a9147eba30d4653a8a4cb86abce66d4c8639d1eb0d961c4a50907ce9af2b2864acb615a2ecfc8
+DIST github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod 40 BLAKE2B 82487f50b9cfb3e87f2500b992a68361ad1971106763efb2ae4833e3a0505d6131b87aad4f994d203123b8fde60d5799afe67704ae72d36b3b4e85240ace49a6 SHA512 e7ba1cdb05cc6f30a57cdbfd08d55766cdad89875e4db393c304c5004d8907d07952b9b7f542bdec1c8b2f722fbc5d2283a8ff9cae53b6da0f3b075b8d05f60f
+DIST github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.zip 7647 BLAKE2B c7fede2886d6150a3e79d73526fc48df4922ebedadfbadb70c4b994d58626b0c7121beeeed6c7d83c1da0d2b98e7e31e7aa46d78638ce2ca834fd84a2a4da9d9 SHA512 41f5065474e14b5df4a5c9752c61231a1d330cb1c1448b3b7a4fdf5971e5511f7445361ad008a5ac7ac5f37633cfc490d7e64e605fd3a306018001e92cedf3b0
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip 10936 BLAKE2B b045256d37d4973e88d0d9c6dbad7397160ddd7b3102ea8420f92be2e8c3ebf6362f350eff10b52fc7fb447d98b00f07c2bc1da3f6e442ebdb8e90103492c8c5 SHA512 e7986e7dfb362e346309cf77ee3969c2881056959e34db07d2dfa0e505106844b7424270d8f17f1a89d335071688e98b992ac81e8ffe0c98c8a0e3d145144d4c
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip 25694 BLAKE2B 59d0a645e3fc29e94a04fbed5329cfaf2162f5779f1c13bfe96c9d979c7acd1b356587b6e30760568607ea15d2088a76bb58e4504e17abf360f2702eb6e8c3c8 SHA512 8fb62179a48e212b74f0e8af79ee1c20479b1725c089c75a12b43bf4936caaf87d42b35f2b7a7de87c60e793347bb185486beb8061e588b8085ac354a3ef8562
+DIST github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170929034955-c48cc78d4826.mod 33 BLAKE2B e0ea5580f1072ea92da2932166e0e9b1aa9a68fb1f2a6d99d11f74369437431c205c2bc9282f54217f3518b828988ea398a26d7d0b0184d11c6bf7daf8d96775 SHA512 1a35c92a5df7744978b71fd312a0316cd1f6c3c26f4c83cbb61a382cb961590b6aafbb101855b5348596b33796d21f151c9b6db57b45d5056fa78c1946d0a946
+DIST github.com%2Fmozilla%2Ftls-observatory%2F@v%2Fv0.0.0-20180409132520-8791a200eb40.mod 42 BLAKE2B f2c65eda4f8af83b8125816f597f32de21a2fb675e30625c135b92fa603dddab4a253c6151692859ef24c4a4a4b3d68d5dc0506a07d2f86ce28171ca69db1982 SHA512 46deadaef6abd1e87e8aeda576aad66d6b8b49eb95295d6e036197884a4f9564d260a14bbc667bcd646c6fab3ef8eaf2c4307ffdbaf9403923e5b98c5180aff4
+DIST github.com%2Fmozilla%2Ftls-observatory%2F@v%2Fv0.0.0-20190404164649-a3c1b6cfecfd.mod 42 BLAKE2B f2c65eda4f8af83b8125816f597f32de21a2fb675e30625c135b92fa603dddab4a253c6151692859ef24c4a4a4b3d68d5dc0506a07d2f86ce28171ca69db1982 SHA512 46deadaef6abd1e87e8aeda576aad66d6b8b49eb95295d6e036197884a4f9564d260a14bbc667bcd646c6fab3ef8eaf2c4307ffdbaf9403923e5b98c5180aff4
+DIST github.com%2Fmreiferson%2Fgo-httpclient%2F@v%2Fv0.0.0-20160630210159-31f0106b4474.mod 43 BLAKE2B ff4c9b108c54fa1040ace39dd53fab92b2feb161110c0f87a9e2cafa95a22938ec6e3ec45958e25a0394583552d23a1a393766ed4eb12a0972f13d953eb4570a SHA512 d5568a21faa8f0bf90f7091bef6b024cfdd7cf979943dcd658a8026e4fd252ec2751c2ecf7f6f7e7889ace70868f96261b226af6d533f3d401b476e99d5e100b
+DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
+DIST github.com%2Fnamedotcom%2Fgo%2F@v%2Fv0.0.0-20180403034216-08470befbe04.mod 32 BLAKE2B a2c30f1489eee8da31831e7a160dd0a2a9d456e7c59dbb902f97daa3676b9bc12376da69ac3770ea613f3fd862eea3736d3144144d4ce426c70aeefb1d2fbeaf SHA512 e28974c60d2dc0603fa14a6a57814c4119acc44afccc63e58ba69466b23bfa2b109e0747a7ae44c84b5c9374220b7a1e840241b7d834d5b369f3a1f6e0bd2a1a
+DIST github.com%2Fnamedotcom%2Fgo%2F@v%2Fv0.0.0-20180403034216-08470befbe04.zip 16736 BLAKE2B c804c37fbecf361160022b4400118c5f13de6b480581ac134a8b38ccdee6626dace6891b39cd6363e6db2ed4f8d575db59d7868a1227f12b9ea3c78425bd016d SHA512 71d7a9f08927eee21118b27d41dc70a4c525f37f67458b5e93481f1cdbe295b07a720fb433dbe07063affbd1b15820103b7017dd5d34205e5296d50263927cf0
+DIST github.com%2Fnaoina%2Fgo-stringutil%2F@v%2Fv0.1.0.mod 39 BLAKE2B 7703b0d2668b61ecc03faf6c5d2acc198afe36da786cf9b3e0c7c52a62af3acabd59f4981abe0e6c99428a0a77264712c015985be45b0b65ee03b80900ea2d91 SHA512 18998ee91dba5395b06f49ab9b9b14b8f3f6271d9bd145ef0c536b62a121d062276fa03e0af4b540b838b30d927f39ad6403a51c1ed5e7185dc52700cf79ab00
+DIST github.com%2Fnaoina%2Fgo-stringutil%2F@v%2Fv0.1.0.zip 7604 BLAKE2B aba667c2c6a82e62059cdd544863b93e1804623695f4bdceb369a91063ede2d0c9913f20d5b6442ba00f64433b72d797ed47bff65130f5cdebe269d9fa62cc39 SHA512 45d442c6e218e185b3f76d2d49c3c6ed5400b078c77aaf475ebb299685d62ddbd645d2cffb04774f3f49fcf340751a997480a6258bc20e9315c3731d2fad35ea
+DIST github.com%2Fnaoina%2Ftoml%2F@v%2Fv0.1.1.mod 30 BLAKE2B 6389fb6d3b047300662c1e3994cc8bd35bc62c75ec45fc5d7e728bc1b5b778a12ec6fb94e71a4d4022d86e929bbfb9f48eba2459cfc610613f9f96681c9ebe32 SHA512 e4468fc60622384862e3dd158d6646f63c35a7bb2908146318f91565a58b5aacd482e13e3314888ab0d066ae2f24de71ddd9b1b9739b49ecf711d47ad8159a59
+DIST github.com%2Fnaoina%2Ftoml%2F@v%2Fv0.1.1.zip 57962 BLAKE2B 0e478a2fb4f245d2177de526764f4684274ede648c5c940ebcfcc1b0fba19312f4fedc2da7d846b555936556a04cae2f15785949446e617425bc9439db205735 SHA512 9a0fd4b1899c33fb988240190be8fc97a7875077e4ea0d897c13a91021659e160afb15a2c5b53c729f27e7102f78579027604cbca1afd7dc3845f4fd045daab4
+DIST github.com%2Fnbio%2Fst%2F@v%2Fv0.0.0-20140626010706-e9e8d9816f32.mod 26 BLAKE2B 0983732fffb2607008a1f339c76256c9e16ff02af37c01923363819cdac4c0f39432d01eaabfbae19ffb7a6aeb625d1dfe3beaa5b4c051cded66162f7562cbba SHA512 f8f31d63294d5e22d3fb838e02fd89e9c7f49dd5eb1a247c2b3b732e6cd6c74d775a525b57dfafb44b76d3b143d42222e10eaa4ff6727afb8dd25a8d287d03e5
+DIST github.com%2Fnbio%2Fst%2F@v%2Fv0.0.0-20140626010706-e9e8d9816f32.zip 9817 BLAKE2B 655485b7bbbde357718980b90f521085bd638c8615b477b21c07dad48245ede5d75c29fe528f17e6ff30201f641a36c9ca052c25edfe98180a1026f0504700f5 SHA512 580712b8fc654328c36425f145b4c3eff5b94b1a64f66ecc84a98ff7109179fb84b52a323ae77af268350fe20f3ea9de9845091857a950fbccd0ad0eb436b8a7
+DIST github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20160627004424-a22cb81b2ecd.mod 38 BLAKE2B e88cae8efddc7e87d193f1dfa70990188cf6997f38aaf0d22135aaed71abd543291661bf5628d0c3d7dc90e64fa0a7ee58e65db2af21bd160c7733b5971059e2 SHA512 96389bbcfe0ff698d1638ea020d8a6311f7caffce3c9d8ab1fb6da6870dc1685313803af2f79da15ad0d5fbc33e17eb883b2631a2d81fa70dd851fb7133b43da
+DIST github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20171102151520-eafdab6b0663.mod 38 BLAKE2B e88cae8efddc7e87d193f1dfa70990188cf6997f38aaf0d22135aaed71abd543291661bf5628d0c3d7dc90e64fa0a7ee58e65db2af21bd160c7733b5971059e2 SHA512 96389bbcfe0ff698d1638ea020d8a6311f7caffce3c9d8ab1fb6da6870dc1685313803af2f79da15ad0d5fbc33e17eb883b2631a2d81fa70dd851fb7133b43da
+DIST github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20180912185939-ae427f1e4c1d.mod 38 BLAKE2B e88cae8efddc7e87d193f1dfa70990188cf6997f38aaf0d22135aaed71abd543291661bf5628d0c3d7dc90e64fa0a7ee58e65db2af21bd160c7733b5971059e2 SHA512 96389bbcfe0ff698d1638ea020d8a6311f7caffce3c9d8ab1fb6da6870dc1685313803af2f79da15ad0d5fbc33e17eb883b2631a2d81fa70dd851fb7133b43da
+DIST github.com%2Fneelance%2Fastrewrite%2F@v%2Fv0.0.0-20160511093645-99348263ae86.mod 38 BLAKE2B 22b67e9f112f9074c978cc35a361c55f49e38ecec057d0e02e21957c2abc39a7992a487dbdfb22dde3a1e07ce95decc222708a8872e07756b62bebf103a21e02 SHA512 640533d437f3ab00bf4a436007f3ece53f602142b44319d170d5714da2defba70ed0f8ae93ff73c5d699c8db8ded1dd9b77a21653c3325b500b75eccebd39a9c
+DIST github.com%2Fneelance%2Fsourcemap%2F@v%2Fv0.0.0-20151028013722-8c68805598ab.mod 37 BLAKE2B 627af5df50cde39e7808cd6bb979e0b1d2ea9733dac6c36d7cb0475ee6b3a1e1e6c20d6c1a34a08e2e5f59c9b41d7a8488f56cf57fdfae110508a54ee8cd307f SHA512 a089301914088a4f0b1e6905a8cdd5748134d1834d0ba34b95c41bdb463dbace1b33901e727257f3b03cd8dadebce33c3301870f0b7ccf63483a71fc63a4d045
+DIST github.com%2Fnewrelic%2Fgo-agent%2F@v%2Fv2.15.0+incompatible.mod 36 BLAKE2B 60eb66359212e60d8c79a37825a04d38a44ec4ea8af92b34101cf3ae8747fb47936367c1769172b6b4ea90ba233b9faf25d677c2748ceb254979e4f22ffbedac SHA512 39d756efdeef598cb80b77d5f4cb5899506def0e497c3f6b3bc575c87bfbf0199da86c3d92a51d90be730d3ac9b2761698e8c6b3a7974d2845872937f3342029
+DIST github.com%2Fngdinhtoan%2Fglide-cleanup%2F@v%2Fv0.2.0.mod 43 BLAKE2B ece48307ffab9cdcb36ff0b4b2174e235396fa8e5057e30edee6d17c1d3e603d5997261c4eb180d5898e2e468e6fa2a7b8b0740dfee019d1991f50604b680445 SHA512 d60b18a90945276c5ad4be80298abf955c160c3c37d289e038700d5941e18f6c6ce9afeb04adcef1b8d76191c7d430815b5f2ded1efd05fc5c835a0b8b32c0ef
+DIST github.com%2Fnkovacs%2Fstreamquote%2F@v%2Fv0.0.0-20170412213628-49af9bddb229.mod 38 BLAKE2B 8d79ae5544eb700b505659942ce726874401d745f09108817e3d5ef9f520a3967b5f8fdae71f0206a9397ec3b298fb7531846cf6a7d66c72769f9f80d05f1187 SHA512 54cda8d52ccfb537609ca642d4b86226da9e8f9795f482137708c1e455b01e3163f0fa446442fb353fb345ade0967d9059e0a365c33bbf39551abb530f422e3f
+DIST github.com%2Fnrdcg%2Fauroradns%2F@v%2Fv1.0.0.mod 34 BLAKE2B f8cac9b50e9f1e77eb5436f61217973e8378f5e144beeaa0896511dd01eaae4852e95fd021744dd3ed7f76ab2d1d60e879911e020cbeabc1b373be1c578f8cf8 SHA512 d6532206c735e37e67281a4338a81d557d0c2a61d1e95d32116eb9c6d48147e9b18c4c1565bfac16569ca0af2dc28ea00c37b1c676952ab9b9e70131108773d3
+DIST github.com%2Fnrdcg%2Fauroradns%2F@v%2Fv1.0.1.mod 87 BLAKE2B 5526330c2665180862cde3488eb24bd725cbcc6465613b06cb1eaf2a1d9f9d02ccbc3f6fee1c71f56c4e2d0210f487dcd1c8fb8e88034362bbd8e508ac015fea SHA512 b358ce74b67a68ff3fbde609b0f6bb054cc31d089a44e0da0695fcd15b27fa964ae08b1e798de2771502fd86bbbe99078d480af70a552d11607a9e6ba65a652b
+DIST github.com%2Fnrdcg%2Fauroradns%2F@v%2Fv1.0.1.zip 16209 BLAKE2B bc4a2d41575e7353bc96ae4968f0207eb6b0102b02828437d6b0198736751aa83b980ead13acea91eee5eccd0c478fb85b0d288a3349865ef9194aaba3d06054 SHA512 1d2be6fd6cd89422187b62381cfe414a7db6a62ffa501ee78de43a77bb59f9f764a7a71d040915a29befeae2ea02c7d05fa4d8c6f0ee44e1af7b733327715ad5
+DIST github.com%2Fnrdcg%2Fdnspod-go%2F@v%2Fv0.4.0.mod 43 BLAKE2B d8d969024b9dc5e543054f00191a98d533795fac795599081f35c049aef81d3e43f31795b0ae7a9ee7906641717a430659bc7126e03a72d119f751d1bb22a398 SHA512 7c8b2f41a0f5bd599fe0c7708aa1053c5b37bc2020159587b7ded623ec284a6f477b7fc49a548553a0d048bc6d75cb5fae1685e06a0f0312006839679e9ab253
+DIST github.com%2Fnrdcg%2Fdnspod-go%2F@v%2Fv0.4.0.zip 11308 BLAKE2B d78933e228cfd719cf5efaa5b92af6bdf68027c240a62da114ca1a95425da2f927322fb8f10feb42af91e381c4e38d3822cc2aa3a0e19f6caf68589fc9e4d3bc SHA512 78959aed4504dfc2a71b83615d72d156069f64cd332ffa47b973da77dd85b7166f705892b3dc0d6bd90ae9373abf1e6a11ab45acfd8b1d3cf428f646f5950771
+DIST github.com%2Fnrdcg%2Fgoinwx%2F@v%2Fv0.6.1.mod 225 BLAKE2B 65a25ecc18c30b5eb6b94dbf5b1bafa3bafd03ae18098e79883b0cb0be9ea61ddcf52db2e7d4679b9e2dc9fcca20fc8aac213d96a1266ce4575e5c9dfa2b36fb SHA512 ab972d6f686be4dfc6f3faa4219eefb4bbb34c1f5c9a5536f3d90066ee982dcbbd63671352bf4e6e8e1f587d3034c8c16655ed009a5485766c2c619220683095
+DIST github.com%2Fnrdcg%2Fgoinwx%2F@v%2Fv0.6.1.zip 11694 BLAKE2B cec339683519f4d033e42aa603cda9acc3982aafa5231896fce4b1e00a5b83d01de390002c63a265e1f77bff628ba6b2e8c5d1f942f8ff0c879507cbc7a86be2 SHA512 e47b0b240e461c55f4ddc60c3fcc8deed2225174bfd552918f88449b5303fd68c2496d43e1ff6b403af17f054610eccd08beed2a0ebc532af86f933f1e47ae6e
+DIST github.com%2Fnrdcg%2Fnamesilo%2F@v%2Fv0.2.1.mod 132 BLAKE2B 7360cf115d224b501dd475b2836cf7e1ae7796771b6c5c2289b5b07bc40b1501ba17cfd545854c60b96596312a3c1f803a8e87ab0e655ce29ff9eb940fefe597 SHA512 63de1d6d8cfbd3cf6e2b2f3365c6ee400475f3f47c451e182043861bc278a95374390ea2908c8189671f009a18db9b70bcc18b9fd65da0c38a4d5f3fae4bae29
+DIST github.com%2Fnrdcg%2Fnamesilo%2F@v%2Fv0.2.1.zip 48006 BLAKE2B de663f4ed27419ba6ff621de2f93790beb007d7b78097118b536906e493bbd64c94eeea6c8decb2599e1dde4584577fd563c175b0a53604b0297d38897df1acb SHA512 efd22840d13e6a11ab29b1df2fd48b655e86f130ad62c434d205d04708efb27b1ce6e7c3f58201b9363b48449f2f57752a5a3b5fb425d936115ee115a3d52547
+DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod 29 BLAKE2B f74d75a495f683f4e9047201721611229ecddc37ed01b5d4b5d81a06220a6385f06d0f99e514bf19cc2030fbdba6de3a08fd38b750e6651a822b10bf69c45327 SHA512 b426d975637bd2b4dddc10d7c88b70f8b946201f311859f22520d53ae0a2d9911ab358460c089771f7900d7a8740bbc0c6d3814ab8f955108fc31b7b602ab5cf
+DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.1.mod 41 BLAKE2B a8e979ec93d507fe82beeb327f4747a7dc9ef7068b14afe9d08ac1e8241c5681d53bd5c1751781948e07d41831eb133ee850e30ce651728686a75fdb66b6e1a5 SHA512 446f9405f9004b40cfa355b9d93f279e2f74fe9157a868e5d8253b7c563fd58c0c2f7b393960eb1693e5be2ee6e9cfd7f5213adb0bc7f85559928ee9dda6da02
+DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod 96 BLAKE2B f192300c52fbe1d75a3a9c89e3d808d25f13944940475b8f2654b3e3a1205721f6a9aa553ab6293f7ea4c9e8be3d695bf7fd5fb55c35e3179cef924fd1334273 SHA512 29bf0aa6ae9cc8d66b0e1bf852534dda3a3e0e16c918be357cc8f6fec14f2d2537a94cafa1ca9cd06b64363a8f0f0d3c00dabcb5137699aced8d16af767f6ce8
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip 245650 BLAKE2B f917c3c8b6076add4a4cb59fcb1561b21785e9c7cd910c96f7decaeaf4f2c988566ef656925cf91842cb4218142d13f0487721c23dfd85bbdce1f847e12f1551 SHA512 bad04a31aa648777f437f3a7516549992962ef1c660694c02aee62508540c553a2ea36370b917d29a8e4510cc171d94590721c447e8878b562f55a7b0ca78f23
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.zip 240603 BLAKE2B 7e8d8e71006ac015e66ccd29200ddd7a280029ef27516777a678bdd7f6b17e46d993e2f6e3e4e5b0d57e3ffa7e90622e199c3e60fbc49bf7338c64f009c0e57e SHA512 a7a5115d9cafa45cf44279dafc5e4e9a5922fea05e6e5cc3ca673130cc79fa711cb806d7c3994e81c37fe6c38c051c21939a5bfd83d7c9e6c7c5a6e25ee517c8
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod 30 BLAKE2B b8bfc20c2ecd93e4a49b1feb791a29d894d57325b04e5f36fde625431886515b2e1de0d11a384fb8138e28a131a027088c7173ffc7f8731f9f352ff521977ac0 SHA512 47de77b79abbc314a3e8c90f8d69f51fc9e99ff160a49cf6e87621183f7acdfa2dc5911877ec45111081426a4c0a6f0da55ce0491e95064a8bd416db33f25624
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.2.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.zip 150535 BLAKE2B b9a2b9e5653d4e67b05242ea629d586206224c916e1a2a0e575d42645216e0b7d00da1288d75fadbd50cf49a65f5fcdb2ec98132710c1bb3b925356ac92a0ad0 SHA512 389a8ead0603ab417d1c471d773ab0ddb1668a7b952f990e7fcf26f9bdadf7937b8408a2976f74da10568a2726ab2ea15cd14ee4319f99c5c45b9ec4a1e5ee6e
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.8.1.mod 613 BLAKE2B 5c582ba17d40173653cf739137d0bd6cb866c34fa1f76bf8f0b96c1d05304c5ea52247ef99d6d31d5c6f41bbebdf5ad9e0fb21e275b2cb888098e0ca3ac8f30e SHA512 1a7624cfc159a3444be19238a2aacd003e1b0c6f586d3f6862adec175578e0bf40fca303049a15ae3cd96a1c61395dfded8427f867e1aed4dcca180417fd80f5
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.8.1.zip 158501 BLAKE2B 2abc3eda7c1e45ddd1bdfe3d4935b7aa39214a20364ca913deba33144fcc3797e594b47514be0b561ec6c1b65eca22e56ab9bf017b46ad0d514693e82ddfd806 SHA512 ac90da085fa75ccf739de3542f0a20e4fa737b266b5225e8abebb6ed47d26711550f4de9401ec82bb2f24d1d75c1268caadfa222dea75f444114f7957abe5308
+DIST github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.mod 32 BLAKE2B 0037f79655226dae67faa11b27847001c422534de854283b8124640e72f9209ddda65f4fd601cd35399c0d6705b65131b94c8bf8dd8a15c2bdbaa0c4404b58fb SHA512 76f6ad85ef60c0972b9193af3395e586b8da352614049125ea6b39ebddaed94fe3b6a5deccb8a4d33890f292795d2c44a3563fc420106bf24589a1d838f35649
+DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod 45 BLAKE2B 7a7820ed255877b390c76ffd281258a8e70dbb2812b7d2d0bf63bb431e8e4f52faad48d4e6801b301ce35cd6dcd49ceac6ab94b32e35befe2e6df56e1a1e8eec SHA512 13b356ebfd062cecffa1e323aa7768d933c6915c2963eff50b1f743712d48cb24f137ba839a7df211e6e02979a4d1c9d32eec8194227edd995c3d35849edeb54
+DIST github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.1.mod 39 BLAKE2B f2a29cf2ce5b2862bfb3d894f36035e27c8cbb4ac1a1fe78cb4a0bacb1e3fc20e82d38b9b6c5d8793229cdf5d5a21975c936de50e6e3d395296d7e116a346d23 SHA512 b4a425d5f19203f3808000050e56a197965f4f26b8828ffc5837b7ee2fec2813f7c38dc242614a7a2d97b5fbfe63986c0115bce38b5a02eec6c60ec7a4568114
+DIST github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.6.mod 1010 BLAKE2B 6bef0142218537a9452ead65865ba25d9bd2c9773cd87e199a72ec57c7de0143088044bb79e23c2d7a29d4275713efaeab457d8fe2b519006883b0c15f11e24d SHA512 10181677125b9bccfca933fa3ccc84c81381548b0bcbbf1c7423822f13902eca3907e06d9cff462126b4795b8ecba9fd0525e4dd9f90962697829b99dbc20bc7
+DIST github.com%2Foracle%2Foci-go-sdk%2F@v%2Fv7.0.0+incompatible.mod 36 BLAKE2B aa3c0143ce0099e48e07d3282bb4bb680612890e5011c4eb5e49c131d71447598bf13e93e6938b6982ba0450c668c2ea949b53f2ecc0848744512de232bff39a SHA512 cd96f5afd87e43290e6e74bf2828ae1636d4f905e1ffe068888bc30d1313a9e4ec752dc2dede29c75f4f1dd8e695c43acbb01c116c2b8fb62a21d123594a6b2a
+DIST github.com%2Foracle%2Foci-go-sdk%2F@v%2Fv7.0.0+incompatible.zip 2638269 BLAKE2B 1774e973bcf8878a63fa7110c0ebb5111efa397850e1a7022394a16217fba818248bd49cf8090c08a61ad941a5454c44b4484be1fefd69dcf9585806918fe964 SHA512 9bdcb18865a426936752a2dfbc35a108a40630d5f40b7bc8940a3b4473489d97410df4ccb765a33eaab2f818f9c7662e6ff55565264225987128fd6dea26a8cd
+DIST github.com%2Fovh%2Fgo-ovh%2F@v%2Fv0.0.0-20181109152953-ba5adb4cf014.mod 29 BLAKE2B 2d82d180af97e34712353c14a8f7f43e828f9453f0a9f50fd3532343f7f27475793c1c8ab2f8b30c0bcc44a0bde09480238f7eea4210e83fe7fa03a0601c0f5b SHA512 fda12385ad4188e0ca8a6a1b4b2c8035f4d537d23b1c30dcdc6cd55591b5d7fa7745fe30e12fcacd8b0859b9aeac8ae7d6aefc3c8d98d3def9412e1dfe61f51e
+DIST github.com%2Fovh%2Fgo-ovh%2F@v%2Fv0.0.0-20181109152953-ba5adb4cf014.zip 24599 BLAKE2B d040a7df967584a001d2277979a0847329fd1edf2a8a9c6e8d86d22da10e508891b1fa176db964cc85ae50e415eaf3dfe4ae0e18d2af905a9039867de76d656e SHA512 4b9ea67b0b2791401bdb9003da1e2c80732864f044eef359aa45d764b2e7b0ed7b69fc4c709ef9d25a12064a7f16a650611fd93d582a4649afad7315e1417e79
+DIST github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod 70 BLAKE2B a94864739ead6676f2defd1020645bb86b8b77600037227aee95fe3e82070c31814fd055dad1fa16ce1a00f64f32be96a97968259ef43f70f20e8a55cb9943eb SHA512 aa2a52cf55149c10f76a8e535dc75ff9bc18b4f2515a31e8720a26a5f501459c736dc73548d2e37f348f27b78974bf0a3b18080df972eec26222fd8afbbcfabd
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.1.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.6.0.mod 153 BLAKE2B eb918832463d06e37d522e86feed16ac3efc2f6bca36524a0956920ac639f2efa6b87bf70ee22015108b4c9c7ae63eba7345b6c770568f605438863ad23fe0e9 SHA512 89b6489f7666b4eedab8c8edb345c82d42626c567d2e402a87344d18e63133f89bdb5c0f3aeca8568e8c4c76cfeac132a4b8904902f2ac47a734209d1ce814c8
+DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip 14339 BLAKE2B 9332d9cac7dd3aa2f4d756f0d92c911cd0fb8e00232db3bb013a0ef12addae0aea2388ce3adf79407a81e13cfe9cd4b45aeb2bc9f8b84b4e3c5dfa63b59d46a1 SHA512 f97471d54c5e73b3f59326847cdd4dbbb142a9ae790df83493f11a851d716fb407e01a857152812caf731b8f3e0f37ae151ee83300feaa73152173f6cb5b8515
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
+DIST github.com%2Fpquerna%2Fotp%2F@v%2Fv1.0.0.mod 30 BLAKE2B f2951f62c06f2c9c5c0042f82861f021166c353c644d0f0d8d0ea0664ff218ef315357558e901ee488c5d0eba2690649ac89cc6178eec6e6aa60a503ed4e9d0a SHA512 e5702cc3a1b0d84fbfdd11005a5f1735a378d709c2f60a737b32b81bd2498206cef3b3ce693b2bfde9ad11de8c6bf734527d2c8874348a97a724441325baa42b
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.8.0.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.mod 443 BLAKE2B 2bc1a0ca986dd17787cbf528312efc6e721d3d9a46126b90537b7cae6681192e74afc83f3b64f8835314a0608a3f146e3fb74afc3339bb7b009d16ba04208cbe SHA512 e45c711b58e0453c63b899faabfb662fe743085dbc82782ef730ef6797fd8d372208d4fa887168ac920d6b1d15f7f65fc9a3fbff25a4474915d858411a7adee8
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod 379 BLAKE2B 6a6db2bee0b69257e5c4d37b1d5395693ba6a88bce129a580b8c0ac986a7702729ebfaec726caa3b6c4d2537bd62a7d728705dd0cc6f6d8b6c9a4460c9bb33e2 SHA512 fe6b74b26571ed4afb49f8f2c6745644cb7db7b5fe95138761c78effdd05d9948c09aded96218ca0cf9d8da6372705901048c14290a4faca56b1d05ca3d74130
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.4.mod 482 BLAKE2B 402a6fc5606c07fc947a79c61bab5535ddafb79857950ae34adbc7885db5369ad48a3c30fcc829ef692fe027ec1a8bce9644c25b7c0c72283bfe8969a4574ecb SHA512 4da31b59dd667b88601dfaacb15c4779d1f9069f686a99422552ea77e7ca960e8c806eac1e9221faa5704c53f7b3d9776ebab4b8a41f3d2a928ee436f785e55e
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod 535 BLAKE2B a8d3fb22b519e88dcb6b6f305a80c94e8b40fba8bdc96941230b354cc6bd8ec4bfd121b8e5ee57e9883e0b01b6224ff22a55fa8434bee1623133cf59489e64d0 SHA512 1d3646f93821b2ff1a4d80074f773eca22ff3675caca9d267762a31c1ec719ab464ba7ade7c8e2aa79b16a4f35f5a64f779fd909060a0c3056f09af77cebd655
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod 357 BLAKE2B ade628b5e576aac499156117606ac8b2458a5b481ee77be1df4b551133a3957dbce70e8674431420c181a67dfcf886d754b927ea06d588cc3df4e10a0ab8fbc5 SHA512 7bdbda1cfee6852064c8d4b15f1037a5153bfc66b59b3555416518a225b70c1db1daca32c0a7058e90d2b0f55da3d9cbb2f5b119107b5d96a874034158a69958
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.3.0.mod 375 BLAKE2B fdacadbb6c23350ffa04e625324420df9b523d9fe5bccd8bd1d8f6d592d7ef5a2b4620c1d16c78bbbbbba2716f3edd015cc16ae5b0c3c31e5959ed12143ff3b2 SHA512 e98ebe9ff7f5f5c893ce7a54c12b3d5b86ae1f99a5117875bfb78aa2b59d9e9a95bd54e45e1a16e8bdfa79f38192626f49366a0ea4e36a25681e7448b544b144
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.1.0.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180801064454-c7de2306084e.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod 693 BLAKE2B 414677e90b5a1e5e2b5b498e46386fb2fa7c93314b390bc4337c74865b6a72f8a64804e4c30aefc54515e9261cda168358d70bc533e8686cbbe0f625b8957d08 SHA512 829b3d7349806cebfad94252c09095aba4c5cbe0cb77cc124e7fc514ded1d8faf0f158d21be97911b8937ab9d330b284139275837607950ca602b3faebef146c
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod 857 BLAKE2B 4c4486d3772ba9c4ecb347940a8e6c84d650847e5e1d9f2a0165569bf062c2a2060cd01c8325221a0c59da8864881c35bcc1532acb0b52f617a02a28f4ebcce9 SHA512 17deca5d2ce10cfeaa0f8e0b1d83317023f4c9841149f9b989cedbc9ea2cdd2d05b2dec1a6323f6202290c7920a68d35da1d4b064892072fb056ba3a767129d2
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180725123919-05ee40e3a273.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod 136 BLAKE2B 49b2b47ca2cb64a1522a3719c1b46dc6f44d3122d3a05ea475dab88e89336aae3f396082f4de0f89400a0e8db85208446582a226238a701fb92c155a2e85fef8 SHA512 fbbbd57eff765585e67074e5c278d7d3077289c3d13c306147d6c3efb98232ff317ad92464ba768fc3d921b4a09cb3f3ff5c5480c89a01ec821bc86e5dca82f1
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod 145 BLAKE2B 8c6ed8a28b2f2fa7e97cfcb545ff7604eeb5802bf301ecfd574c1bd5bbd59172479a55c9f42f42a13a85daeb77e730dcf5cdb78aa9b7c499f3ded0584163d75b SHA512 0d285b677b209f7973ddf036b2f2463aacd060e58db9a0721e85d40d513f8befe3605677dca1040fe9dce006e3d5d3246d876224f05c45757505696122a3153c
+DIST github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod 1346 BLAKE2B a46e52b7acf7ff0783cc3c18a1320f66e02ab9c6879434dccc9fe182b4c7fe4594a0be504c45ee5958e1a42c781870ae754648f5bb5ef4cd45c42d78ba189ca7 SHA512 7463ee6ed6735cf101502b6c0128c75960c55d6f9e42f37531e65afc02fb35b62d882a72f95c2fd76f3d0e253e9e70a9a2df2ddf782f53c4138135b370b69d0a
+DIST github.com%2Fquasilyte%2Fgo-consistent%2F@v%2Fv0.0.0-20190521200055-c6f3937de18c.mod 380 BLAKE2B d5e50ceb9388a268523bd969c58c4dcbb657248897a652fb1714f180bc5c6c84fded29702d68215f7984e4e100840c415985becd9856f6e1c4f3cf1d2be969be SHA512 a3bcbb78ac52866b5bb8ba27c58b93469ffde745ebabf78c91b06d33e9bfa4641d91afb189c75c10a66f10b8d080822fb8960719d588a1f4ed54650b3b97fa19
+DIST github.com%2Frainycape%2Fmemcache%2F@v%2Fv0.0.0-20150622160815-1031fa0ce2f2.mod 37 BLAKE2B 6f9f7bfabf21aade2c491a8aa4a57318e26aa0f5491fb449dad34390e4f3452b30ae634ed280b39a3acf66b647489ab3fd8e7c22176bc87e205b8538718e640a SHA512 08598c1c037738f47a8dc83f324d4adb81fff38c0e2f23ee7160d2452f965205a9995eb42ed4f503fc4eb67d3a9e483d30a2c00de50e274e0ea0b0b81e8ecc31
+DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod 38 BLAKE2B 091e64943724001796bfb662a26443a681d4db705219a1d7601c350b94105caa1584c62a4befd1aa0c634268867c84bacc79e235d5a8b416f6a8aa8e12192261 SHA512 f22213d29e8a0914fc947e08d8c85dbcab835cd7587e45cf5458a1cff074359fcb187ab47bdfd933c8937e393975a29e872b744ad61295fb1dee3783877e81df
+DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod 36 BLAKE2B 6faef3be0b5f137ecc89a7875bed1f576d144f11623905c04cc44f93812b80f3e5b56f05ddb3343848e7fde7fc439f49627f4fbd10730b1e9c2c9153a2d3067c SHA512 8cedf150caf05299c5b9f8b4fcaa17e4771c613fa06bac434586048ffee22ba9501e0fa540da90a3a24f3e4f662c9517571a23a0353fbb29c881d6d6c26d5f1d
+DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod 45 BLAKE2B 6fe371f17a31bcd132ac67cb50052f6f3874c9f62e2d67f48d52d241026fd21e58ca9abdc15fd53cb949f79e7d40dd0c289af3849da3d4d9ff75b491e8235c10 SHA512 ea2e9a81d7720b4e11129fbdd4772be224b6e1267157c29b9d33813b6f4ae905e43c3840cf1ade6ff5f73bd22c103430a0bc882355c16715e124b442652cd4da
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.1.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.2.mod 82 BLAKE2B 3b7ef0a383ee9e7e64ba74f92d717687cacdcb0e7a57f76872cfbe77ec1c526ab97a8695a2819cf986c51a4561794391e5d532cc591f6ddc2141b5559d3cec9c SHA512 d08f8ca2d93c0d97d5947ed3d221fff67e774e810d7fc9c93bd25bdc446190fc5590776a3e6b159fde2b97c3355921235fb6c8b8623b7f2090102a7f1ca1a6bc
+DIST github.com%2Frs%2Fcors%2F@v%2Fv1.6.0.mod 26 BLAKE2B 8b06c3629b4e4371ae833fd22ee446fb963e300c42e4a92fb215f10500a826df54285a3d9718546fceef0e47f949034d0de0bf8aa9ca49150cd2d58e8272b1e0 SHA512 306c53774adbaefecb2283f1d90c11b088d9a45a29215ea7c627ec6d97027192bf5fe99a3cb473415ab47764802859ce9878e83ef38fdc4a87b4c7b0c5226a71
+DIST github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod 25 BLAKE2B 23b4d575cda8259ac3498731524edc19e21e56ca2881d58ab40adad9469eb97d94036eaecd4fa5e78558e852f4c8f4242f830c962843d14779fbef470f3f8f2b SHA512 18a8e8a8b69974b2112578bd8995f31235bcfe49c218b2d0affd6fd5d6b7938687d9f5405d4a228a2ee2960de7960496319a92a26e8b29f6076983c0d07ee66c
+DIST github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod 39 BLAKE2B 6d577028361a97eeb7070517fb59bc801499e5b93cb97da563e41b91ab1443583510a259283bd01777ebd435934f27212c15ed32cb5422d6d711697a7c714579 SHA512 d9e6796c9e0a1b870a32c313e22555a090e85919007d50ed4dcbcd3ccbfb90a3ab98e9f3e2d41bd32196e3d5fd57c62e6d47aa65e79efd3d05b7d73ae9bfda7a
+DIST github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip 105716 BLAKE2B d8a15d43cda9d636577a114fa0cbe0c570146402a5e0bfe94bb4b49f1b5d42dc6f30d9f29682721c28c63d261f9bc6fcdd6094bbedd81ace7bd2ef657ed97405 SHA512 7cc5f41055137124a3d330e3686860b3294c668b514fe19b21edd6f571ee4f3d895dacad4ef6e333aabd3a872f2bb3ba50ffbf19636d7f1bb462d97026713322
+DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
+DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip 110026 BLAKE2B 862c858d51e59569c38e1304de08c256752db260cde7f7f44fab41d22695999fe73483d3854166f4e8d3da9b4f8e41b7999d7e44510ab8c2ca6c0120173b77e3 SHA512 992df87104aa66dec048d39496c85819cab19bc890cb2c60326660d011642f49cd926b082d3eb4136b229a6e4893ed023a133e4bf83a4993c534b24e14d77b4d
+DIST github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv0.0.0-20170128012129-256dc444b735.mod 35 BLAKE2B 68028ffeebb96ddadff1a781e7f0d7267d9ee0255b2b00958d9e36b6870e27630f7cfb1f6a1c90d81fa6303465d50936c66567c4b562a8b2711d459ee4e093b4 SHA512 1cf1bb0f786ca726b882a958d719c3b762ac146c01b5f57fa246dabd3fc1462b47cb71f7fa0c6b146873113a609b5a94aee724d2d624fec9651947b78d39cf73
+DIST github.com%2Fsacloud%2Flibsacloud%2F@v%2Fv1.26.1.mod 726 BLAKE2B f410e7ec566b2cd8d333bb2b331f92196e9c922d2db68861e9a7b6879fa1df07848697f9b4cd99004f5a120b0121e02766c53df602b6d9d5d35d8c9abe756ffc SHA512 8c62149992f2f5b4ca22dee42af56325e4ace6769a8a9f784871eafcd9a3715f108839915451e20ce47f260ceaf90823c925401cae4baa46393402c9a15e7ed0
+DIST github.com%2Fsacloud%2Flibsacloud%2F@v%2Fv1.26.1.zip 352985 BLAKE2B 0f5e1ecac6aea6a4763f665840f1e54b04f1288ec3cee68339a6976c52c93e1e2dc7b3bb702e635e8ef1d27235faed7802ac8048779d491013da6134cf79b1e1 SHA512 d136a6b764302eaa5a3e4f23764fc80eaa1622b7bc5db8787dd48fc0178289b1a6a752fdad4755320f668e4839c62f1dbac955e98b76e01eb0fef01a3c59f5e8
+DIST github.com%2Fsamfoo%2Fansi%2F@v%2Fv0.0.0-20160124022901-b6bd2ded7189.mod 30 BLAKE2B aaac68b939ffebebdf66ff051f43954a0450cef7812e0009cdb821669113858fbb9531121c1c355a581d8c343283200c5957108e13858c4808ba3e78603a9938 SHA512 e90c0e17e2792645cfb6cd61164c93e6a9b9abecae6f9a58df99a0eefd2e78348dd534267fc945e23c8757a6e769baf2cdf4d59fb9bd4d8ef9a26b20ef0a48a0
+DIST github.com%2Fsamfoo%2Fansi%2F@v%2Fv0.0.0-20160124022901-b6bd2ded7189.zip 7278 BLAKE2B b00c13c60dd6877a06bd301fc3797347037298eae3cb71c3a70f41df9dd7a36b1b1bfc93d928f0eb36ed54e3d21a094f93ac799dca4a0613becca0eda30ea3e3 SHA512 3c3977090a524ee9c34a43db5cf335d67dc5e7613d582d3b56ccf410f0185a984f10668275d49fc51d44f92d39270fbd84381e336a44d574bdb851656a1492a4
+DIST github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod 33 BLAKE2B d6c66082304928ba92ad6144b157ce4f59db0abc5af56538abd5a81fd927ea716df4b5dee47ff883dd99f377d2b3a772296e08244fb7a769a5843a54426be81d SHA512 081e7b82b53c1a86743e3cc4973c1bd15e1b5c48929513bfc41c0e182fd4a047519b8cac9f4e830d7a08eb3443b2feb62c727387a294a30b7c988b698d6e8d45
+DIST github.com%2Fsecurego%2Fgosec%2F@v%2Fv0.0.0-20191002120514-e680875ea14d.mod 830 BLAKE2B 3fe0e58e30d39e14d38ff07a8f411e46e68992aec872c5b90d098e68ca7ef22d5620a99a3f44a00ec43ce4b4a47afe9c4aa8f2b30be33ebe9dc6c3520c0cb8df SHA512 ba39611cdbb9db1aca8d5dd2cdf42dc58aa4fd68972b259bc3cb27de102f00772fbdc335e4e2e28f19782565a014548b5dc059102e476624b75e6f3f4b995dea
+DIST github.com%2Fsecurego%2Fgosec%2F@v%2Fv0.0.0-20200106085552-9cb83e10afad.mod 893 BLAKE2B b7c4fce71eb1ae94235ec5ee140fa34606dc44d2af3e0dc98e3599e7cd6c4a196ddac0b7196c46b0838d41bd583424042cae8df68cf675a7455a9baf967ae779 SHA512 f65a6fc335e123b7e2c8672314548ff366f654e2cefc7fe5cc89952893b9c11f8f73503aa7aa9760c250cbbae53b8f96ff585f0a448e7faa1ac6bed65a3ad2f3
+DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod 32 BLAKE2B 9c0be7f17fe7a9156f124f7f67c3e15e14719d0b271f36d5d41ccfa5ff6c1b7887e0051df6eb3b29f29b40357d8e438598088b3c4f4df28fb81f030c8efa7ff3 SHA512 8b8b8958405a188b93adcdda0634aaa2961b5b8e0d3b3e1f768fb9c49c02b73cf3bb39027431e0c1d209abea6cb72a651c5776bf26391e81f4dc18c7bafa692c
+DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip 52931 BLAKE2B e511ef9edf7d968d848e021658001daefe7c8cc7169b1c6984ca5388fc4d6a5f54def9060483e57392711617892d21322d9de099234901bd1c251e57e6489f6b SHA512 e3d8a20d1cc351b8944579988feff39cb0aa3e1f2aacf2e2307180c25c153a0473f2a5a3ebda9d96868cb1f477ccccffdce06b117be7fa5409b2d1926b4c270a
+DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20180427012116-c95755e4bcd7.mod 34 BLAKE2B 790ec7277e4654961540dd09fcb7962328547009b0181183b7cb64972b872d30986d1e53ded5961588d89508c913b2b56dd7af3625d0e8d7be2253b6bcf59576 SHA512 a5f5d88a767a855b6ff24d7e2e0c4aeb81fb1365a7e81ed989b4c605a7a6c61dc52d7ce97fc672c21020ef56f597dce679184e5e8d3d199678487e6bebaa8127
+DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20190901111213-e4ec7b275ada.mod 374 BLAKE2B 8f8e6a8c44b6851de496b625b525bfb0522f6cd98a7792392c700fd06c2eb71c81b19670785da2b8e2d723776e0f96913caf734a8a9c154f424d2ab259805a31 SHA512 6a10bcdb3f3853cb9b39cffcc91bd4fb107f4e642405f7fdd2c0630c47e50c7d0986044221d692415849b0f1502ba50bd68483f4c709920fef389ba347e2d366
+DIST github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.mod 29 BLAKE2B 5a64bc6a74e308dc780f55617c18661ee4a570f5c536a1d8470ae197f5bde87ba88412e360585c3e7191289a2c478ec7c96c18cdd7ab9e10fc92cb8b098281b0 SHA512 54b48a0f515bb99c21f86f0cc9dfe9e06dff5bf8de3a453b1d91816e28d04fe64a52d01c2c5a651b51cf21d328fba8f97a3cba92e23d66e229034f8aed23a545
+DIST github.com%2Fshurcoo!l%2Fcomponent%2F@v%2Fv0.0.0-20170202220835-f88ec8f54cc4.mod 37 BLAKE2B b725084a49db41d4011b5eeb41b04efed95731edb148e25aae8ffb93d2442f094c033c5090594a607fd7b292ce7aba297faac83a908dcce6edb38518edb3d93b SHA512 6c421a36f72cd46edc731ffd184180e7d1843df9f18d9d009d0555489672ce0182021c3b71ec4cb604b788745c7a5cb0066f5d53dddf129e0119ca62009b63f4
+DIST github.com%2Fshurcoo!l%2Fevents%2F@v%2Fv0.0.0-20181021180414-410e4ca65f48.mod 34 BLAKE2B 01ee764606aacbfed1d971205eade7257d4a1d34e93bf0e90748210bf06b4530c08ce0cb700d87cddffb1b16484a4d40501ca3f5323f6df5288927702c4f6169 SHA512 f9bc01067de82a71b0056851e1c1e982c0447de0a00063aee820366943deb29b12674778e3497f787e848299b7b3109c525ea183688c471300743015f41a6574
+DIST github.com%2Fshurcoo!l%2Fgithub_flavored_markdown%2F@v%2Fv0.0.0-20181002035957-2122de532470.mod 100 BLAKE2B 393b839b51fae48e56a7dc8fcb98ef846a08d9e30c2c8891f7425a2b849bf7959e41c042b6ebba5cb29dac002dc6d2cda4501e2bc23895dd6f2a2bdbab844447 SHA512 647bc4cb38c346aa84348c5ed67a091fdb36a68838935af0de3efb9796cb1df582f80336b15c2509f583a0a9303c30d1ef032dac62d79be014f3da53fc35df45
+DIST github.com%2Fshurcoo!l%2Fgo%2F@v%2Fv0.0.0-20180423040247-9e1955d9fb6e.mod 30 BLAKE2B a19bc3a2a838d03257065184fc24526f5bc8881ef06e4217e0439c05200efd72d8c1f9f7f3288ae69f8317fe21ddeba7fcd35d4431f29743260d0c96c59f6e40 SHA512 2fe62b980dfafee660aef1ea4113fba52dae15e24470b7ff258f055d7f7cd7f6b55b9afa1d46b1cf9fabc804e00c00c452e9bd72ed160dcad2e459dfe5b245c7
+DIST github.com%2Fshurcoo!l%2Fgo-goon%2F@v%2Fv0.0.0-20170922171312-37c2f522c041.mod 35 BLAKE2B b4c85147e92e894346c0376cf7dca7e581ba04be40caa18e941b6bbfef1f10e3dd9c5c2df662d3a1758328b3198a04bc00472578043ef3568ee95caf689f111a SHA512 aae1d53204f15d9feec965460e46a299bf85072a40711174d8db5ee21ff50776fd401ee965b2c45ecdb352535c9e4b6e6275fbf589482a27a84baaad5b7807a5
+DIST github.com%2Fshurcoo!l%2Fgofontwoff%2F@v%2Fv0.0.0-20180329035133-29b52fc0a18d.mod 38 BLAKE2B 1d436734e7314197de65241507cf4c95544844fde986c08418c29d006932cbf50c8627c5ffd20919dec4049e7bc6075d4053917eddc634274990835d37be0c35 SHA512 a5e23639a99abf5e7d5a45b729c43d72a1583e3ad53017a391da2e16afe585be79bd879b16252667d78ea2566003768dbe347c48c67fe5f13f35d8649a3a876a
+DIST github.com%2Fshurcoo!l%2Fgopherjslib%2F@v%2Fv0.0.0-20160914041154-feb6d3990c2c.mod 39 BLAKE2B 8489f9422560bb2c1bb2828ccd1b6465961a51d02bbe7a9eb1134e18850e16147d0063fd3a0b76fb25ee7008066dbae0dff1ae72a6d70071df23abd5d142ebd5 SHA512 fc27c7a35a653c6a2151216be57451b2ab829b01d81eb9a8e342c2d81d90e9a1067d5c72ae506a0d5c5649a8c2361da1441d4609986e15bfbb1e172183dd3f57
+DIST github.com%2Fshurcoo!l%2Fhighlight_diff%2F@v%2Fv0.0.0-20170515013008-09bb4053de1b.mod 42 BLAKE2B 6849978da17adf3cdd9a8029b0eb3feccc2f4b091350a6a47f6920b0f0b5e40443fb31085760c46f0f35e55cee1d338a266dadb6e7f3932ddf6002c8007107c8 SHA512 b49571fa316b0cd8cda7ddc3184d6e253d157e5e6f5e74c3c09906fe5f837f5f496c43001e7ead9fe36067f8d96a46dd3e643ec6a64126a28ff02894b8eb6e87
+DIST github.com%2Fshurcoo!l%2Fhighlight_go%2F@v%2Fv0.0.0-20181028180052-98c3abbbae20.mod 40 BLAKE2B 463734830d42507acd06a3ad02457602a810fd66407f0f723f94433c06b59ccf59ea0c4cce0a9bbc9f269e0779af6fe2ff5fe0dbb6333ebf786c60f8ee0e5926 SHA512 a865d10b5c78ab78bcda9d01571119b08ca9201b9150ce549a2a250e572a2136af5a0157a97d1223ac4e6829d8afa7e3051be77b29ea6efa46e0571e50c6b858
+DIST github.com%2Fshurcoo!l%2Fhome%2F@v%2Fv0.0.0-20181020052607-80b7ffcb30f9.mod 32 BLAKE2B 723ecb7f1d7590012fa48dbb4ec59af43f5ed21b955e818c6e4951dba55cfebc1d9b1005a1d2cdd8eedc40d66ee5076dabb00551cb7f89492105f9e4aa76a61e SHA512 f7cef2fe6d7b5a86e1ea5af4be5b3668026e62f6c1ecb9e0f0c3ef36fdccd416af667850323f6a90fbac5da8fa764d34fa15ee25ea41666dec06e3c1df1803af
+DIST github.com%2Fshurcoo!l%2Fhtmlg%2F@v%2Fv0.0.0-20170918183704-d01228ac9e50.mod 33 BLAKE2B ff8ee32094f3ffee2781dd642e3e4f1affeb77fd8bf68656fce57d07f8048cfd764a3acb3253012f32d4b77f5b628af846ae62c67a5aeb78c97a0d38fd414cfc SHA512 3e72f6231f0bf3ca54af62b8cc8b723c72e26d2d8cebdc5ac8456b2b1a22329a6d1f537528746cd019185b87b67e0ee6a9fade9b87c403f7a6ca3a03f256af7c
+DIST github.com%2Fshurcoo!l%2Fhttperror%2F@v%2Fv0.0.0-20170206035902-86b7830d14cc.mod 37 BLAKE2B 77687e3d9871590b6f3f66034665879aca68ac443f5e4ae946ccc9cc72eb5494ae6f291743771080b639728edf0a8b4990e3bd9885785f00fe6afb83a067648d SHA512 6d2380fa9adf88bd75e6cfa4bde6b4550f87eb2e85632d658d0c74eadcffe2b50eb9fd265579107f19dc4683463bfa61350666d11ff9173b9e6d4db87bef692f
+DIST github.com%2Fshurcoo!l%2Fhttpfs%2F@v%2Fv0.0.0-20171119174359-809beceb2371.mod 34 BLAKE2B 5844c0db6ae64aae3cf731d2d71203d29aa723f4ac32760f4b74a4fd21bc55829dd0c5ac9fcb71c368026f9f60ab48a623d976e1de5c7a0085e095b701903d54 SHA512 96df2995b87ec379faba4c16f3e73b60edb5e9831384d171c260539f04c1cb6c66c5ee44ca1d293d9a68c9cb70d40a0dc09694c6a412f5445c353136f1fddf24
+DIST github.com%2Fshurcoo!l%2Fhttpgzip%2F@v%2Fv0.0.0-20180522190206-b1c53ac65af9.mod 36 BLAKE2B a5a6dd622f715b314658e63caee01df8beaa6862d289c11296e73a893ae30a0556d4523c9f3cb53aec522949266349b301df18f730c77d6063953c9fa6f868df SHA512 49483248d91c2702e4a32d5621fe5947139c962506e28212d6b0a4ae0ea34147a81289dcfbfc069aaf5326fa802fd4b13010f4f682429d3ec222fa47991908dc
+DIST github.com%2Fshurcoo!l%2Fissues%2F@v%2Fv0.0.0-20181008053335-6292fdc1e191.mod 34 BLAKE2B d1c44cc5c0eea844959ea9791ef4cdebbc3cf376dad7b9885210f29c57b67e5fb643f2531d9133847a4d669a31d92c09d43368bdf73264047cc4904c04870deb SHA512 5f50bfacbbe545c169e2d6f5f44b5c81fda593c0c29697310aec74b683e022a261dbaa4cbef6ca6c4958efd72d69552f23a5e8484713cb07f879504495f28ae2
+DIST github.com%2Fshurcoo!l%2Fissuesapp%2F@v%2Fv0.0.0-20180602232740-048589ce2241.mod 37 BLAKE2B 38cde73add88f5af675f79d43aa57fc260dbab12e3d57a7c6d83e46c4567d971444021c4f9459ab0216880eff6c0be49f74718d16b7380abb8c833de9ad1ae02 SHA512 1821ec96c3c11a7d0b587e8db7bf147cf6f7260b3558c377404e7a91f7f268c90e44940a1b7130c1e0fcd365ed617bd6dcb7ded9ba35824aeaab74bdbe64b723
+DIST github.com%2Fshurcoo!l%2Fnotifications%2F@v%2Fv0.0.0-20181007000457-627ab5aea122.mod 41 BLAKE2B 764cfcc4ac3290f81adcf2ef7d9cd889d3505185938ee48e0104777058947d0ad9901315d1246562775ca6b0cde164b77ac709e5ca73a6b6772bbf476f263cd4 SHA512 a1d21b320e024b6d3cb59a6815a3f946676cfb4f6d2475ce88a38a2a0d3670806eaee6e23600dee6128bd21471112b216dbf79b14d3f0347601824ac2384b30a
+DIST github.com%2Fshurcoo!l%2Focticon%2F@v%2Fv0.0.0-20181028054416-fa4f57f9efb2.mod 35 BLAKE2B afbdf141c49339b2808a09b0a6896bdf00debdd30f7ba0bdc8950b555a58d670dfea1f75a6194e9251964b669952b2c8c799941ee9c8c83085121dd0c9318d0d SHA512 4df4f2893f32cfc81540ede05080258cc1b1d58d0b57e19b5e3495fded1b9e858d8b40bb650bac00858f64373dc9e276518954aac6e77753cd8eda005897eee0
+DIST github.com%2Fshurcoo!l%2Freactions%2F@v%2Fv0.0.0-20181006231557-f2e0b4ca5b82.mod 37 BLAKE2B f98bfdba14c367d382c16099296517b40e1ceb7578339c113e5714a1bf50ea44c2863eb5569a5f43cf3d1a4b2d6c2c122a61e90761534b7ac8f8a615f285aabc SHA512 ba5a6d7239de1995f1b8a5de39f28696da22aacba5477d7a7b31004779d8a0dc8768edbbdadd8e1fb44f7c158529ae74f66021f7d462b408b4ceb07f2025170b
+DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv0.0.0-20170918181015-86672fcb3f95.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
+DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
+DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip 3399 BLAKE2B 348c2171bf3404d8b69166fd412707d8a348e1d808618036de2ae01fce77e3880fc782ef301f9b4135a19d81ca9ded5cc0cc4fd73d36b66b121b7f0baa73df51 SHA512 d02d5e4b8a24b1709c053138c4128d4bd6347d4adef95d1e25141935cf560fdcfd5c2b7837d6e690f175f1cd5a21b0279ce97b8b3b66d5e0a5006e4103b25f46
+DIST github.com%2Fshurcoo!l%2Fusers%2F@v%2Fv0.0.0-20180125191416-49c67e49c537.mod 33 BLAKE2B 011f9ee0544bb2bf4bbd2898fc134dae781fbbeb151ff36f1b830771a2969a2858db389e674afb16b8550a8ee5b893f1c3bd9eef7d04874cd37be9ab4e04be3b SHA512 1ec0e16e10817526a95b2c35ac44770696d74651311f4b0308208d0109dd7be10265d22f124d88837dd5ba9a45e51e4013a43244b60b956249837cee431fd483
+DIST github.com%2Fshurcoo!l%2Fwebdavfs%2F@v%2Fv0.0.0-20170829043945-18c3829fa133.mod 36 BLAKE2B 9763cc748e6e6881be55c29f5454b49a5b1d87987456024636f5b0c9fdca4e80f5152fad35f8f15a757e97ca5fbcfefaeb59ed4772acf1c0f98bfcf2e0e4718d SHA512 db55dabf219a7b17fdff45db51fd93801df17516e6ca093af97475cd0bc731d108dcc5945695581b035bf410a95da1edf481dfe9b945935ec8c9bf19e081ac18
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.5.mod 34 BLAKE2B 9ff118e3db6f2a49d8cef81bbb78af4ae29fbcf97955758c08c4a9a610fa66f1f6da80dec5aff3c657bbbdf1fd5330331e58dc46c2b2bb657438ec0879a3c45f SHA512 186b34d707aaf1557ddc8edaf49fbc559024f454bd560ca8451cfa555abc211cccf861aea94018363547e39140d9e507c97f7a3c87bb9f1e5d444bab4c531e36
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.3.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod 337 BLAKE2B 41471db637c5c0363cd36be6d16a6228671ce9658ef71103ad2122a2cd8cfc13c30b87bf2b34df7ba9d6c1fff1ac821462fbb86b622c274cf26a1e3ecb7fd2e9 SHA512 29a4efc27c658b047fbfc6eb2ae311753b01fe878cc733e2fdfd83f5791b3e30ab50b08addd300dff37e7880f6b57662ac0cb0f4b98df2c5a5a9f7d555bc98a5
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod 337 BLAKE2B 94ce7d2e23281061ee0ac0b1be2f8c3439c86e62c56ecf556a81123d57d819b1e0e95ec3b7c6425f13abaaa1683942b7a3d0bb8ad489577284b2a6063c777b37 SHA512 38a79599dbd09661614d54fc92149fe581575b7833e89dd73a3f754fafa4bc549c6c9078753ab8e2a85ce2be3ab81e528e29b6d19e7c329e0cb0f74896d2e418
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip 58627 BLAKE2B f4276f0095188324c06e4412303ac19e3006b18823985e26ca49b2de54ef58cade626b3d2439f5f2a29c47618420b890951f94e5a4801dbaad4c3294f6555a4e SHA512 3bf6be07dd9a97bde938309857e16dc425587c100e35b2acd1a6f11a9ac196238b0844abbaded43fcc01be0664efa15b64f159f6259322043e3046e7d361dc20
+DIST github.com%2Fskratchdot%2Fopen-golang%2F@v%2Fv0.0.0-20160302144031-75fb7ed4208c.mod 41 BLAKE2B da40259a83c14d444c933f97bb673c4edee72b95d5c19ef021479afe2ebfb6f01bc157527214a19e35d100a6f4d353eeefc60badf51cb85dcd735a773aa5b033 SHA512 7a7b948320e1df47d23498732e5fd7e63fcd7e905299e11f74ee86a8146fe8df29dfea06abd59185810d75c7ff670e2ecba07ccc461b681a9469beafcfb7801b
+DIST github.com%2Fsmallstep%2Fassert%2F@v%2Fv0.0.0-20180720014142-de77670473b5.mod 35 BLAKE2B f411f099e83b64b58d94a4c7f7c73b5a9f6279c4c409c9d68029b58311f724de5f7826be0933bbcbcff2867da51cee0588fef9d2676195fd97de7154b852e413 SHA512 087930a63f8a2a49aee59fb30981c2bdb5701022d8f1d93f8b9611294e56825bd3dd7e8b72ab9be58c631edb05c4b4346bf65586fd6c935a8ea88a13bfca3b8d
+DIST github.com%2Fsmallstep%2Fassert%2F@v%2Fv0.0.0-20200103212524-b99dc1097b15.mod 44 BLAKE2B 318ba94a41e57bf13e65f55f5df649f48e027344ccc1edac32751cf9a274d5d6099089efd08ad4d15455d30d06a361e304d69b85d2de6ca1d325ad696ab29287 SHA512 6dd3d69b75b037bdd24be06b2027bb1b36d1a76f86eca0f2a5fbf07855ec9e0fe85a206e01305ee7ff35909c85b8a142294568ea300e978168e9b0f0155d018c
+DIST github.com%2Fsmallstep%2Fassert%2F@v%2Fv0.0.0-20200103212524-b99dc1097b15.zip 5270 BLAKE2B b13f2a70af821fdaaa631fc3c6f2cba471ced1db94a72fa042f1fee5618ac073a124daffe93dd1202c074014155448ae121c1c1698400e1a4e08ff89dca8ad52 SHA512 1f9e710327d845ef3e2718f64280fabb5be32bd4e78b615ddf7b62f382152adc1919a900b59b1b46429bae88bac1056d3fdcc1240ff9fca808ad786418d51037
+DIST github.com%2Fsmallstep%2Fcertificates%2F@v%2Fv0.14.2.mod 960 BLAKE2B 7dd4ba9ff690702899043af074571f1224091bd7f5b667354054e4a4c0a2356c2e4b43128fe2a529d09a6826da4d6f54e14ee021820b71ce074105ff80aae292 SHA512 0a84088b66373c9ece468b0d05406435751097321e44adea3b3f2659eae300f4f8e164ccbe3166f6a7efe24b1e1fddde8ed2a53e67ef0609c50434c589f704ab
+DIST github.com%2Fsmallstep%2Fcertificates%2F@v%2Fv0.14.2.zip 17715154 BLAKE2B 08250c8eeb175a974e2af029239bab2c0554baf74a67819ddae5e42ecf3962718902157cf17be3887378334cc0a425e24d33d6907b2ac58bf8938f180a4158a7 SHA512 ee2824d5a1164a3ababdd2fbceacf41da45b4a5ebdeb6fae5ea9f940e5040233d4249a81585bef35a5cc73d65a987c47df81b6935043292fbe861cd3ef1bd119
+DIST github.com%2Fsmallstep%2Fcertinfo%2F@v%2Fv1.2.0.mod 2453 BLAKE2B 9e59305f109b7db54dbdf367906843f8a863889f010542be11f2b0d8eb43d23e9a6856fd9ded68484efd8d7b7cb496f3c074d327832c068616d7cd531b3fdc47 SHA512 e5908f5ac6cb39b8d5a8843f8c6cf0c286d0861f1d0e12d982ce8e440d2b523507eab2b480bfc08d0f9018b3e2729ed2db93e7bec5ac076ef58392e5b7d03030
+DIST github.com%2Fsmallstep%2Fcli%2F@v%2Fv0.14.2.mod 1587 BLAKE2B d053dcb2e21810e9703be70cf9226c1c57ec7c889daecfba6b0b102f34aeebc5b83dc3a037f1f31c2d0db8b0144120fc0441ec35f0e0107f0a77a07a24efb71a SHA512 0c5337caf7f1b230ef2e057d10ac4ef24a2583dad52a2da49eac3f37107da07f25c457789a94aa19528e1de225774df732cb6639726b2e2c5a344103b74622ce
+DIST github.com%2Fsmallstep%2Fcli%2F@v%2Fv0.14.2.zip 651430 BLAKE2B ac405a2cf355e640f128a766244b8e6843a3e70cd179b95ebd36d64d218a240d2efa9c7fff642e1e30a52631265f13d454ef4a177bc0132aed9ab6670438a6ad SHA512 5fc1840beb07290b5d0f02e4f3fb2dfcd3b0b4c6fc41fb0ab2266b694c73af4bf5a20c6d1e26e715a17382e240b87b494dab9727efa2c380261b5fbec20b5256
+DIST github.com%2Fsmallstep%2Fnosql%2F@v%2Fv0.2.0.mod 678 BLAKE2B 74ccc942161cf87fdcf8a7796bdbace444c914e758e9d297e7b72ccb57c0ad7e64dce3cccd711eca9c5af5932dc571318207b42841b41f078b97d65240b9e196 SHA512 c4c415d250ad4db0a0c39a7629e88b905dd89e3da8e08fb7f8814555e955e72841f99434fd77b614a3dc3de5520f2e2a797b83c6aab1a61a01d013cb5f5efe48
+DIST github.com%2Fsmallstep%2Fnosql%2F@v%2Fv0.2.0.zip 23652 BLAKE2B 776297d2f20b974ada5440951017d8b4fe17f01bc3605e5c654a2c156684509a5e490c5875e41b9b8f3fac9eb63dd43ab9649c3ffa7768bbc1b7d36b848206f6 SHA512 97f22dd85e23d7b0ee70f000568bd97ea89b6196eb44a2985ea2b5a88a598f93a8c7e3efd08a66d402b4c63b179d041e19aea40c74ae1a99d699e7b1ed4bdf6e
+DIST github.com%2Fsmallstep%2Ftruststore%2F@v%2Fv0.9.3.mod 39 BLAKE2B f9e77d71073eff0bad67ed0f5c03b1306cd76da54ef047a189e731bb3f06a14158d5cd6ee49d656752dfd904860e677d5a1f0a71696f280174fec6b58cae7fff SHA512 3ed6ee82f2913d430d2d0e66b6a5ed673657bf52a7871d64a4fc983942942ee8855c8d607a64b9c01d8190cdafee60564b2072476146844b8fb049453b0cb308
+DIST github.com%2Fsmallstep%2Ftruststore%2F@v%2Fv0.9.5.mod 109 BLAKE2B 05b481d29acb899b5917e051d5722d977a55611a52966eaefb736cb35bec7d696d2b192ce70fe42e3fa30cf6c07e741df7ce8923aee487f621a180cd9c05e3d8 SHA512 e01ff6eb4532c388e4f5102baef56cc47911c8ca6963543106117780716283fc96e644ec3a462d604e75965e59759e7af1c7b060cb4a2b168c011391215fdeb4
+DIST github.com%2Fsmallstep%2Ftruststore%2F@v%2Fv0.9.5.zip 17929 BLAKE2B 062ce2c31ccd7a0abce26bd0d31e883039771193a5b727998929274cfa9f9e47de3897f9b4cb653a4712112fd048fa4d77521a1fecac0c562463301a003f060e SHA512 85769d6d1afa3098313f634cb29087b9f719ab7ff433bd81764fb9aff65607b742025475b33d0bb0574afd9e15af506612e2bd94004bacbf981d07b17a2de17c
+DIST github.com%2Fsmallstep%2Fzcrypto%2F@v%2Fv0.0.0-20200203191936-fbc32cf76bce.mod 658 BLAKE2B 6567d111b50b66232bef6885e2214bb4837716b11d914d4f9e256f07b341d96de8d74512c91338e63c0a6c75a4344f446c1663b86765bb53c1aeabba9e5c4e20 SHA512 2328744b34eb6f2a5983dc651c5f5f9cef1095d7c3f843d085a885ade6e730c3afeae546baae130bbbc83de1d97af5f7a2ac6783414ae479d1af732f20079033
+DIST github.com%2Fsmallstep%2Fzlint%2F@v%2Fv0.0.0-20180727184541-d84eaafe274f.mod 34 BLAKE2B 1d1e22d8a186a5e6047e60d939eddd154d8b92d8a06e7314abc1785e11c593dc8061846a80c47b0a216b7cba45d68b94b7911e10bc37940f91552d0b20721fca SHA512 2c3e518e2bf8c7b67a67240317b295c3f428e3ae36306849834ffc9f791c9468ec48adc19d168d0a64c471a8a2b7f4b4317834b43194ea6d79e1963ed6bc98b2
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip 81760 BLAKE2B a5767557b0e96fa3bbbace46e08d6a2167be2c203a44ffaadcf14079a23e906ee9197c8028fb29bdfc596d4f39e7bdd29993a1a520c36c8b08c5c5b6bd6bd2cc SHA512 e204307d5a06550292a4fb6e44912260aa5a7f9fcce0883d8abb324a53673512218982b1893e7d563eb7d6313ac98a8638072aaf7b5d66d359e82832f2a8bb2f
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip 1521758 BLAKE2B 653e697d76d392b18c09e5c1c96734a737071667345b9d6ff9c9589bbe74e1c50849dcd7fc00b660adc1aaa30366aa9ca93a94d5eb4e605f7897d9714119f926 SHA512 3bdd2bbeaf755618d9fa7f324814497308361cb0f3f93a7ac84b9fc01b79ab346353ff0a022d3d85e74aef57b3773e03ea9279d0a60de317a1c57d5eca2d1507
+DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod 32 BLAKE2B cf220acb07f93b3927afcfb4211e356e17f28dbef71cfdf777366d8cd09440282cd23e7800c7e86949615b90ec60ad4f2601ef21e58d4470349913c348758b0a SHA512 def5f190323350b58be18ef9f1b00e4810987a37e1fa9332be62a638a01df7f070788c75a19a0c11949890ccbc395419de45bf9c5f7fb38fdbef56118c681d32
+DIST github.com%2Fsourcegraph%2Fannotate%2F@v%2Fv0.0.0-20160123013949-f4cad6c6324d.mod 39 BLAKE2B 0bf074876e4db2c76b675966ce28a4a32e7ac8a50c44f1f3c7f1cc929c682fd00d1fbdc5dd72d9d6dee2405d59d6699f1a8da4ed69863260258dd2574b81e924 SHA512 a6e5d41a24eded17812fae0ac1815c4e41dd3d60ac3ee667475e1801c3c654416346077d2473193be24dbdccb5d4fe7ae44acddcd354420d6a312a03df9daaf9
+DIST github.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.1.mod 283 BLAKE2B 8d2ac0a93e8060c85b68a1c3b7f1a22572319c9a8c7f7d88857f8b04793cc55141d63e53728bd85ce4c2a2f3ac27bc7dd9c115b86f5f3ae9d27aed9ad4ebae1e SHA512 cf2637b8c82a9c67cbe323e6f6601e93c6d0840e053a4644b6e6170a4efb56d670007b15eda837e89abfd17b6c15f179c96cd92cc9cea4002f27125cad1049c9
+DIST github.com%2Fsourcegraph%2Fsyntaxhighlight%2F@v%2Fv0.0.0-20170531221838-bd320f5d308e.mod 46 BLAKE2B 44bc49585092c685651bf48824262b655c9bf38fcb810ab934c0318324cbe62af85137efc6066eb30e5c132c8a2c52851741dec0d76b28024548b122621e1ee8 SHA512 183674d9c991b53d241664459b81ef54f1c2bd4c1b841af62ddb7bd72aae76ee21514a178a0d7e17267d6a958d3eb231300969bbf3db2aa266fe2a72cb265eee
+DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.0.mod 30 BLAKE2B 9bf213acd16f9456f4a010a7c300a1fb7bf1ab248d1ac9eed7883deae7f9a6f6d0c761127b7b2c84e8dc46e7b0da2eecac9b334fd5a94d2995d56858d345edb9 SHA512 3166c898d741be502c0b733653cdca0e8ac4999fa6a5d67460b3962799287c9176b7f0243f0c0da394a4b7737ed1d1a6a2ee4f84a8917cf7076c774ba9a2a648
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod 30 BLAKE2B 9bf213acd16f9456f4a010a7c300a1fb7bf1ab248d1ac9eed7883deae7f9a6f6d0c761127b7b2c84e8dc46e7b0da2eecac9b334fd5a94d2995d56858d345edb9 SHA512 3166c898d741be502c0b733653cdca0e8ac4999fa6a5d67460b3962799287c9176b7f0243f0c0da394a4b7737ed1d1a6a2ee4f84a8917cf7076c774ba9a2a648
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod 64 BLAKE2B 51fb4de1e12106663228a747aa9e5fc135104573154f2a33f2a6cd2a927873efeb19bbb6d7a0a74fa1c7050683ba40d176d7c9e2c32b31e71aa43f9284b868b6 SHA512 e091de41de8e320e4eb47a082cc419a6d102791c888646a0482bf4d2b91a9f357455fe59ef0657e043dcd021441d6d78fe89440db3f11d4d516995903e0aa3b1
+DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.2.0.mod 29 BLAKE2B 329362a4a6143a3ae3fa01298ec9a677e0e6f4054edcad3d300db7fe5a095fd9347d5a239b9ead9beab72bdaa18e6411ac342b56e841f67eba226b802261870c SHA512 961f65a3d308161a97fa3c3d85749f53b7e7b0cb44704f330616c46898ff12e837c9dbca88a02826f40fb70d2b3fcded34a69bcf0f133157291ec3e17439f7a4
+DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod 175 BLAKE2B 9077c3a2c65f4025500a3215c440b1b3856e09f1543cad7ca6a37fe5b42d51af01c2032b905c72cce445807bb311ed461c4a5fd4fe680a81ac7a1c0d94759c67 SHA512 7a0a21f6a7564b3261bccc8b1e1cd39d5d1a95bd0dd3debea914b1d37b687fbacdaee5f1dd5f1f74e4da11664c12f7ee63b484d690cd79389423cb79ff38dee9
+DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.zip 12738 BLAKE2B e7a649d1c85aa7b3aa0a80123c49d6e980d8db2bdbb7c49d5871cef8c35a4f632f4de0987ae1b41b3f9b472343e22228f7e75cc7c841d446ced4f33e859039f2 SHA512 4ee0de0cb44960bd75a18648a2c7e4428cd1df1b042e24588d3ed6adee05388e6211854db1878e6ad74dec95083e439d147975082422b8ae5f3c6c7896df4304
+DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.mod 175 BLAKE2B 9077c3a2c65f4025500a3215c440b1b3856e09f1543cad7ca6a37fe5b42d51af01c2032b905c72cce445807bb311ed461c4a5fd4fe680a81ac7a1c0d94759c67 SHA512 7a0a21f6a7564b3261bccc8b1e1cd39d5d1a95bd0dd3debea914b1d37b687fbacdaee5f1dd5f1f74e4da11664c12f7ee63b484d690cd79389423cb79ff38dee9
+DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.zip 12750 BLAKE2B 65fce8e1c7f8d6553e3b003b02a2ab3a7b1eccd7dae3db0423b8ba9d5579721d6d84d0227e321f8d7b557db71648ed2e4a3b810ef867f34ce25f02f29b4209f0 SHA512 bc4f20343133aad94ea020cbb5f2c74c5b983603f3638ee84093a31b4cb94e3725f3e0f01252e6546f86d1e47c317e171e0229681116b8d4aeac67221af40636
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2.mod 30 BLAKE2B cb72701c052ce4059500f4c6b3d0c4fb336d118865bf1f7f45ce0b0279e1d01b6e58d49f82182c2523681a97bcaa7a70216d63ceeca0ea1d09c1921226f6bc4e SHA512 ea13ed8e166d16a7bcd14a7cde90af1cacc0b05995d1c5ec245fa536208e0cbfffd689dd460d66c0a1ad315f2b0ae9f4b803ed72bcdfd89c4a98a7ed934289c7
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod 310 BLAKE2B 851f2542f28849f4f5c33155e5d9562aa9aa2645f1fb57e6300e2c6e98c39e0728e01a5e26d4a514435245662fccc55b8eca4eb2633a21057a6c4a5d80d24fd4 SHA512 dfde1474aedc5f36508bed07a01fdfd433967d2a6c0acadc6d985ce862da5e1cbec7ced13d55073512afbc2d925e6ad3e3cdee9511ad17b14ea8a159d8adf8e0
+DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv0.0.0-20180109140146-7c0cea34c8ec.mod 42 BLAKE2B 1f0af0f4518708edd09c0f02aec6103960b023a6bc178181276c54cd86b653e8bd1ddd60c5d49fa75a85f1fa0d18f670a9c2ead381da7c4f2d5e611b24f51ca9 SHA512 748b5648bf8bec4d1efe13f4dc37608e7378acc2a7d954e9d3b649a4b170a1e2d1c61338f6bee8d9007ad75a5bde87487612b47a692d6f966bca56490dcb834d
+DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod 42 BLAKE2B 1f0af0f4518708edd09c0f02aec6103960b023a6bc178181276c54cd86b653e8bd1ddd60c5d49fa75a85f1fa0d18f670a9c2ead381da7c4f2d5e611b24f51ca9 SHA512 748b5648bf8bec4d1efe13f4dc37608e7378acc2a7d954e9d3b649a4b170a1e2d1c61338f6bee8d9007ad75a5bde87487612b47a692d6f966bca56490dcb834d
+DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod 188 BLAKE2B 26b2922f8d9ebbb77872bc280b6a40ce569be69e78a0734cf7f75def7709fd86183506274ff8b9e5853cb0dc29043ce315acdda631102497a8178cd749fb0c03 SHA512 a5da49fe5d41b33c03cd1af18affc92ca2572f0c735da70c55f06d668ff33ae4a231fcb6cfa2e85ab4b04ef4c7808d895739d0121ae874c43b01edad791f2735
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod 39 BLAKE2B c9d700f96874e0a3977c2ffc7fd321acfffd8081aaa70ca50421ca55253fbe0636d48eca8f7093df202861f0a5f908fa00303533232c83c78bdba84e2973bba7 SHA512 8071c316d33aff1d8ffcabaeb42e8f9320465d83600cb57ac5ef071569f948d5cfd69e1bd2e92855c061395c1b814e84d1705f42e37f00d5bc713b6e724f29f5
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.0.2.mod 30 BLAKE2B 18e0337f9146af34821783f04024be09e18f3804558482ea56acf28048ec811ae679e0bc0f6044774e69a98c575b0a41e210277b966bfb04270d7ebf504cb1c0 SHA512 0b3a57fbf1292964f8d35a7b85e9c828bd2c1344d68e4d04ce84acc9c99e2239895058fa656d45e0e5e622afad62056b583fb00a5dd3181302798ea99b0b6799
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod 986 BLAKE2B 4f2c5d920b08d5802df635316a6ca72ab3346dcd2b0ec76bc9657c265eebc68ef7c8036c1993595bcdb416ea9ef0e7ea338162a7c6854c98db3a16b035c310ca SHA512 2195ba8e28e21deb5d4f78a9319e568ea5e81fb7a257292ec12d0aeaba84d1898e8d0cb51355f87d7093c3c0501cfa1f93f2e520e40edc4995260d7977fe306f
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.6.1.mod 2141 BLAKE2B 156a151b0a2adc3281ce942a6b33dd518a60248a9aa927241d787a6a6e4c37f8acb76cde85d8ce6e7351bea257bf0dd8a671c22c5f4d5d6a8ffb150e17ae291c SHA512 21bc1c47e67da822efa2fd98ffe8c0a9f432e95be723682a738a82098fab25771a2ebec1903561118fde91a08ae370989cd5375432cc21d80ce07ba2c44ff6d5
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod 137 BLAKE2B 47195334e42f0997d96b50b8364764426301d31cc7fbc289b89b173b877d54cc67133b07d4a21e6ecdfa2e4404a9cff32f06b53cfa9493e075ee2ff2cc46e605 SHA512 02d0b2b1df84750ad3d15f4b86b3f7989a22007e27b28e7b3a4d34b26ec7ccbaa5d48ac0032ad692bf7db150e101cabdc050b0aa1697cfb20f922c88b9f086b8
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip 42547 BLAKE2B af3f81b3947f0802a6542c60db0248aebac9521d75d0d991f76b5783f4eeb42f7902250cd22da1b8fcfc2f150342ffff53260276b7a6903c092febbe66f40ace SHA512 b21cdcb8683760280e515ae487e17b65b324b51dbdb36c6380ec0b272699297d388a34b1a6aac281b1aa149d85ca81640850e1fa0d84bf63f3dc67b794baa249
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip 90474 BLAKE2B 2f79f0cac2c15acaeae764aeb640534f58ec2ae86fe88a82533498e718cf37d67c563606090ad39b38e22ffca1e63a25cd881d6a472b862ddaf150c7d329b16a SHA512 a047ba8d5f529d459fb6ae8dd39367e6f6cd2e785e90f54a5f8759ff76e4cfff990f1b8c1e0cf49c67b97ca8de36ecf8fdeb3b8f16e579aeae2d563d38da69db
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip 91883 BLAKE2B 8bb8f10ba7a3c719844dbbcbdbb87773487921f493cf6f72d1a9fd1d553f7f7784b01b9795a5c26a352490ed6d75c29a542a0b3d7c18d8888c57e447d9d227eb SHA512 c539cd964718439715caee454b38fdb61eb5d4e20489e10f7f6a030b4b941b2ca52d33f950c0b04149962399f0c3cb5b6a90efa2d79acc0f57a7f49d508c67c7
+DIST github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod 34 BLAKE2B 85a4e50642e7088ee26b82c69c65e1bb0396d4e8819088fbdf1d93a8348d7aab950630e3bba1747517d01e0cfb9a9dd1b95341df0722480bbecf18399ba84674 SHA512 50b858817db72f0615a74431c9966f969d12a85fccc3f0dde25a72fbda32f77f3ac76cba50b12fdfd87ed7a7b3a337a291b1f9c86e1fbde81d2d0c2890c1c21d
+DIST github.com%2Ftarm%2Fserial%2F@v%2Fv0.0.0-20180830185346-98f6abe2eb07.mod 30 BLAKE2B cb0fc1336f2738d7d9c55f460d3983d043d78c13f79431b0f01530b780e27d3f44d7eaba3fc4170e60fb5c5a86b26a5a41f4e27fc3ba1c1cbb88ae23f5bce5df SHA512 729bbdce95d05166c0793f65ff5abe5178ffe5305a79d06ba2f447334ea9a13404ced5ccdf4d83b4782d88f46fb57b299750a14fd2cd16629696f5f7bc8a8baa
+DIST github.com%2Ftimakin%2Fbodyclose%2F@v%2Fv0.0.0-20190721030226-87058b9bfcec.mod 190 BLAKE2B b079349b0a65db4530e0ae682e1ad705f146a8ac2d1c735b9f660d2fa336088c04050defbd04f93d3b51a20dd396d338874065370242fb80ee5beb981fe613f6 SHA512 5056ac014217b14e7111984a99c6d49120404c31baf0ed510316b3b6edb95084b26d273da643e025e1d13fcffca82411a3542acf37dbadd4afaf9466a7a1c607
+DIST github.com%2Ftimakin%2Fbodyclose%2F@v%2Fv0.0.0-20190930140734-f7f2e9bca95e.mod 190 BLAKE2B b079349b0a65db4530e0ae682e1ad705f146a8ac2d1c735b9f660d2fa336088c04050defbd04f93d3b51a20dd396d338874065370242fb80ee5beb981fe613f6 SHA512 5056ac014217b14e7111984a99c6d49120404c31baf0ed510316b3b6edb95084b26d273da643e025e1d13fcffca82411a3542acf37dbadd4afaf9466a7a1c607
+DIST github.com%2Ftimewasted%2Flinode%2F@v%2Fv0.0.0-20160829202747-37e84520dcf7.mod 36 BLAKE2B 7184134b512e4150c612f5efa39b403b6b40d03736895abc3002208929efae56fd11a79adc7ef49218bc02812e36b65b519b019f843e7dcd86dfb0c780c72261 SHA512 cf6746073568cc38f71a6c892ff3a9968da47b3c92a838b6ffee30ab19129e81682281303e786db1ff56cc5d78137ff50f621cc833bc0c37c323d18cfbbd1ba4
+DIST github.com%2Ftimewasted%2Flinode%2F@v%2Fv0.0.0-20160829202747-37e84520dcf7.zip 11156 BLAKE2B 71243f92f8baea98a1f6cdceac34054aa695cca852a03c47d42b0b462bd546e7af2b85962ccbdd6ec4b864d6e907e60a9049e3e0905bc8eaf906bd601de84f37 SHA512 ba86da39a4a35e81d4ca6eb3348a287ddc22a120240ef9107a558727c3095606fe3511738a873a61a9adf80e77ccae23132913f3a758ced70e4f2cce2b8b419a
+DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
+DIST github.com%2Ftomasen%2Frealip%2F@v%2Fv0.0.0-20180522021738-f0c99a92ddce.mod 33 BLAKE2B 92e05addf2b65e704d351cb7f887ac28dce6f67184bf0a46e1bda350f26ba1e50e2ff7d2698a09320f05863b33c99a7034cdf517c56332a7820fc83bdf9a9888 SHA512 0661766aab15879d856bdd7df7033d9193eac91922137af549f3dda17a1adfa148d35f62122fa4ac178f6ffdb5c51a6d10a87ccf7ea2c93da7a86e3cdabdc223
+DIST github.com%2Ftommy-muehle%2Fgo-mnd%2F@v%2Fv1.1.1.mod 309 BLAKE2B 08c694a7e547971dd38604b0fae2620c1c46bffc1d19dc532377bb5d358d7c702b981960cb2f5a10240887d0667b23d2e3e766e18d35206b5e76dd49b2a8dcfa SHA512 59a9c250fef07de709fdffce7965fce26223014dc67c49584b2980c7116b6c398ce162fe3a9114a83b65432899ccf0bf2c281410366735582f14fe40cbd1436a
+DIST github.com%2Ftransip%2Fgotransip%2F@v%2Fv0.0.0-20190812104329-6d8d9179b66f.mod 80 BLAKE2B 90693a5646e36d2f8b8a7f7f11fa8ddc30586d87b582a2ac33c7db84d833f873010b4c255743534ab96c0c48adc5df2d29429d50fea24f4bf19a4acf9df11d69 SHA512 9a47a51357e74d8945ecbf5e92c37f1b8c9f3f1bdb74d1b576c1431388bf7adfd7c5454ba9586022c9b85f9e4041c2fd9d086144ff053890fcf208a111ad4f7d
+DIST github.com%2Ftransip%2Fgotransip%2F@v%2Fv0.0.0-20190812104329-6d8d9179b66f.zip 95108 BLAKE2B 750018b9b7b477b6f3b60c30fc770a08edf567868b8444c083bf64276eb11a45deff518e591396db7775efbd272f45b547c7de65dc086a332878808fa4f17546 SHA512 57fca85d842cc4c025870a13f16f3c91cfc5cffdc1f85b92ee819f2aad22f88ebc7a6b762a2bfbbf4d6923dc97f806e68eef1f033ba2c302eb9350097725ca9b
+DIST github.com%2Ftransip%2Fgotransip%2Fv6%2F@v%2Fv6.0.2.mod 181 BLAKE2B 5fcf9eaba0d853c3f650bc5ae10b35c43c90034552c600e65e90c786e6e70c6ab3da3320f127f0e90097904ca69a257a4397c65ba77732e90cf02096fcedc4f9 SHA512 563a49ae6d5288a73f45d7bcb99598d9f6b23a4b0f9e6fb1e003a39744075a94ad2b282d49f04d9109d4756bacd4ebf009003a0c75687003fb6d42a000b7a5cb
+DIST github.com%2Ftransip%2Fgotransip%2Fv6%2F@v%2Fv6.0.2.zip 160191 BLAKE2B 447ab9e75592ef41912455e2d89c720f07dd83706d53c145ad81a7218ff4f532988f4b0916eb831d01e76312b9fc9db21fda758d02c56f27cbca5d1db64af258 SHA512 faf78ec502e232dd950b539614bdc1aee6b0b47023eed9f5a96f9c6d631cc55b0e081721ee65ba0095a0b315134e96f8d6ae78c6e7866f78c1bb59390e6e72ea
+DIST github.com%2Fuber-go%2Fatomic%2F@v%2Fv1.3.2.mod 33 BLAKE2B b8f402df04871126c882aebd00d4a30ad765f21204b13f33676f6e4e768b6e64605987bce39ca277d445afc5a500a1b7e3394fbc5d506991dd52f70830cfda75 SHA512 16996218af60471a1865ecfcf15e1f749ffbe6ab2878ebc666cb32cbc61334d4889a62462fe399205f096d72a6a023af68e7798141ca10d4b2b428291f0ab5a8
+DIST github.com%2Fuber-go%2Fatomic%2F@v%2Fv1.3.2.zip 15265 BLAKE2B 78be0cf1d2dfa9520c3b6751ec03906a947bfdedf0a90ddb9f038d20a6cabf69f79beb385f8980c2bead592feb1a181e3a42b598a4a1f1221df5e3a5768bf5b6 SHA512 fbb9ea92983cd9ccc2d20c530e0a42ac27aabb3634431850711dc4adaa21bd2799a4c5dd3a6c3695d687c39502a2188070ef7d572eba26571d1f777c398738e9
+DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod 29 BLAKE2B 8502924d37d2cb283d252008e9727d55269eace4ec1b9e049294563a1d92b777e7333c946bc69c7f47167a36482c1c2084330dc68e9c33fdcb57113ac55e0ba7 SHA512 787ef0a1ab48d9faf632390dd7a89475a11a3c11d6b557cb9228111dfa7af591deb6a102cff6d6c981ab717f29bcfca64b26fcfd2cc4d213f4dac0ed24c6d625
+DIST github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod 35 BLAKE2B 159fcdee33f554db7f7bfc834a6478865e93a6258876dbb3ae755eb474786149f109ad8823484f1d72a8fe4012f24041c994e4d19ce7e684a84f85025803ffc1 SHA512 633ff61cb8fc7260fc5bd11d9bf59e9a758a3db457a9780701686b9b942b6aaabf102c7342f97d2beeeed247507f383253bc396b26581f7726538149ea4203c0
+DIST github.com%2Fultraware%2Ffunlen%2F@v%2Fv0.0.1.mod 35 BLAKE2B 8e3c38268bbf27256cb628341ea9b1772f7e0396f91f8d98137af08899752a2c7edfa235780fdd860a514176ac1e559b49fa1de26f6909b71ff4488666b73a9b SHA512 45b7c64fe3b0b38a2ca194c2b91ddbfa4cd1299685b99be460b86eaf952ac8e59b229e82d99850db3cbd4929e495413c92f2bf2c987adcc7252c501ee11b4ddb
+DIST github.com%2Fultraware%2Ffunlen%2F@v%2Fv0.0.2.mod 35 BLAKE2B 8e3c38268bbf27256cb628341ea9b1772f7e0396f91f8d98137af08899752a2c7edfa235780fdd860a514176ac1e559b49fa1de26f6909b71ff4488666b73a9b SHA512 45b7c64fe3b0b38a2ca194c2b91ddbfa4cd1299685b99be460b86eaf952ac8e59b229e82d99850db3cbd4929e495413c92f2bf2c987adcc7252c501ee11b4ddb
+DIST github.com%2Fultraware%2Fwhitespace%2F@v%2Fv0.0.4.mod 39 BLAKE2B f3a92be3ff6083e63024db0c80f8ac15e3709cb584a02e07c019aa19cf6729481e645ab85cdc1d7f1ca200bcceabc903b3f90e2fe58c49f3a87b859152ac1202 SHA512 97f4519da711fcc4bf156d007b7bd063a8afdca34199477ea575752550c71f32e030167957b161a423a04ee2c0633827b758c9eab69977c8271c03eb35295964
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod 29 BLAKE2B 4f20ac8fb7beef2b678cff290a28c8125d368504aebfcde33e746d3ca7b9606804bd94c59c50fe328da4c1c592b8768b1aad89bc1d22ddf76cbc88d0f0f76b74 SHA512 5edcf2aac39658fc7e60d5086b066470c6d6213b66a2432bc35c6f67b8cb37a66a67fd97cdd4b8fa1b8b1bddfd544e4aa9838cec06806b89f8e1447e3c61bd2a
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod 180 BLAKE2B 5d858ca40ba2af791726707bdab12d76aebc9f9c9ea79e49a6125308b079cb945d6ed06ca2425116f19604651eb56f29b3ec8d79fd9f38ed044e745c9b73ddb6 SHA512 b5431ec3fbdaf9efda016ea275ff597106916f5d5781b2ca82e075e42da98f6c5d34a00410fe65ac3a3e64b3ac0e1ab02e68579effc426ccc5ee19a583c44d2c
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.zip 103935 BLAKE2B 3c8512512515eae07ff3690657bd8800880246c3cd667dac372268d59e0a6b2e4f01d2879e121af2a4535300404d9265e491f1f1792e30e7eda7604f121ad0b1 SHA512 28b5760cea9765d971fa36f8465b6f9ad3eb507af619f7782df86da44cbe61de5c95353bdb64b2a151c170f5e1afdb14ef4aa6bbcd9734aec10a1b104487ac7d
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod 180 BLAKE2B 5d858ca40ba2af791726707bdab12d76aebc9f9c9ea79e49a6125308b079cb945d6ed06ca2425116f19604651eb56f29b3ec8d79fd9f38ed044e745c9b73ddb6 SHA512 b5431ec3fbdaf9efda016ea275ff597106916f5d5781b2ca82e075e42da98f6c5d34a00410fe65ac3a3e64b3ac0e1ab02e68579effc426ccc5ee19a583c44d2c
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.zip 106836 BLAKE2B 1dc75781d1462b8b6d646ef09cf402ce7e301a981ae04efdfd205274cb593cbe849341374adcd4239887e4323d937964850ff4caf203242ac216fe0858f7fa60 SHA512 ebe55034b03a75da1e267c7cd06517a6e429d96557bfdd0253ef3967576d57b5866d8137172f15cad0875c009c2bd2efdb6994ee82c2ba83e804e9e8531f4a14
+DIST github.com%2Fuudashr%2Fgocognit%2F@v%2Fv1.0.1.mod 44 BLAKE2B 48b6b025f3183a5b309f96aefc52322eb20259d25cddf0893979bd03a674b5ab80795765a12743c8dc1660dc5214a4173e919d4a6ae98e5481444deedce98be3 SHA512 a93db4cb6c0fa2eb3abe719f1db671319a75bc73f2de0a7b50092d0c96d680973493f4d22a4e2764be117c0faa7567ba278567f7d3fb1896e13226b12c4039e7
+DIST github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.mod 41 BLAKE2B b7c7dfaa36f45deedb2b403a7a0f09577321cdcd86d714724f9d8dd8044c05aae91dbee433deec1dc094d8af6ceb8d01924bf4a9812b7521ce52ffe5678e4a22 SHA512 887a7529d78ca53e5e8822ac041705ae20c34c337b1bb94d3f6b671e4afd2dbdcce3a52aac4a42defe3da92fde14eef180bc01293040f6150c362f23408e3fa3
+DIST github.com%2Fvalyala%2Ffasthttp%2F@v%2Fv1.2.0.mod 321 BLAKE2B f1b47bfc9434a89a99aa50b4a714d6cc2e140697e56e34475bd0dfd82cb9782f7837b922468d4769a15641a2a2dd90ce3eed92f1e15a718947537cd1c35bc50b SHA512 0e8018de1c1a59dad1f183e59a5ee1210925d16e4deffc37356b193991b24e23148def88dd6dcf010b2ca74d8172009cf96f500da80f5024ed872940ff191387
+DIST github.com%2Fvalyala%2Ffasttemplate%2F@v%2Fv1.0.1.mod 89 BLAKE2B 6dd7632179015369088b8e1271127271daac6a3af65032e723691e1d19ae50428b705a8f417950dd1b86c6aae63a0518636029f589eb4ef722e1c21ef0d0aa9a SHA512 02820d9107d43b1d41e74fb2281edb421bd95f852ae1062536d3f2ad9d6e97e2154b90a831f4618a0f83f9c4a828c176759132c0565a7a4d99dfe3b76e5f6d10
+DIST github.com%2Fvalyala%2Fquicktemplate%2F@v%2Fv1.1.1.mod 228 BLAKE2B a5dd2dc83306e4addcae5097145a5a3eb09f77e3df29d0b09c1638a0406c2baa64e2fbbc204c0450eb5a53ab310285e1c73f4fe9f539c61f2b4aa7f1a1b135e5 SHA512 15ec40e7dbf50b73b56c35b11203a8f406b35f51d8f201df80e27a4cca5c0ea35217196dcfd75f68b94128e20898fb69dd8dcb0bc2d2ff3c210d1c126fe04246
+DIST github.com%2Fvalyala%2Fquicktemplate%2F@v%2Fv1.2.0.mod 228 BLAKE2B a5dd2dc83306e4addcae5097145a5a3eb09f77e3df29d0b09c1638a0406c2baa64e2fbbc204c0450eb5a53ab310285e1c73f4fe9f539c61f2b4aa7f1a1b135e5 SHA512 15ec40e7dbf50b73b56c35b11203a8f406b35f51d8f201df80e27a4cca5c0ea35217196dcfd75f68b94128e20898fb69dd8dcb0bc2d2ff3c210d1c126fe04246
+DIST github.com%2Fvalyala%2Ftcplisten%2F@v%2Fv0.0.0-20161114210144-ceec8f93295a.mod 36 BLAKE2B 4867e6ad22da67000c8f082852df43453cba9814cdbd8370c83bae347da0c426c2e2d705a85572e08a47c872bbb880f7b8befed360edcc8a866609c9486b4e0b SHA512 971639e43bdaee2891c655fa90626dd50be715f1d8493980d6fb081deee7940ad71bdb35887a3425b600869be75dd32e344b2c5d68e54e2ef3d6397c8fbe6490
+DIST github.com%2Fviant%2Fassertly%2F@v%2Fv0.4.8.mod 33 BLAKE2B 18c00dde36c8f43d69eb58d5bad8104b2280b5ad61eb2e3f7b74f410c5ec3c59dd629f4687274f8dec7f7ae90ebce5dc422ed80e0aaa747e4b6b8d4eb1d6660e SHA512 5f31873a3a87704b5ead7c17eaa3c0ad90e4a2f313ccb838581b5989edad895cf438b8540dee8edf373ecddc3bb70ee747cfebca300e9d8b724453421ca78d3a
+DIST github.com%2Fviant%2Ftoolbox%2F@v%2Fv0.24.0.mod 32 BLAKE2B da1ff9607ba3c4e6714dccf16e1080d4e62e4fa478ae4e9832248716f7ab751d180b8fe3529167097834e4f103b2446de6b7bff0d28aa220a204b34a253ff185 SHA512 800ca66deb2973a44b8443d5c8c7f762c637144b0a441697077e1396c06c66993c9d81e5a8856e3ba33f7d12b099bcf13b1349efc096009a8ef837da1fe96d51
+DIST github.com%2Fvultr%2Fgovultr%2F@v%2Fv0.1.4.mod 41 BLAKE2B 43abe7165b0ee1588edf9c848093d9ee9d04689e93571f948020282c634629a904e559befb6f27a6696ec0e0352c45f0740324b561570fe7e7c15f4ea2f9c584 SHA512 6885c689b09b16433bc387ec99d2eec3b7aff381b6427002230e9b8c8fa769ae8700564c244ac80aa76c924db054b3cdedcebf5fccaf20cec997fd3d87dfed76
+DIST github.com%2Fvultr%2Fgovultr%2F@v%2Fv0.1.4.zip 66277 BLAKE2B a4671a69e62dcc970e7f49795b01f73182723af8d025b440a19cc8a237518c7160dcf3a3b10fe2d6893acc461720bfdd8a7a0c6f0590f2d40ce2970af9dde237 SHA512 55b03e78dafb89acc61ef0319687cbf78dc1a7f01c9b5eba5ac4cea6e847aef44c9707d79d123af97245460ca34f41f68a03659d5e3c075108dba36cbcbff5dd
+DIST github.com%2Fweppos%2Fpublicsuffix-go%2F@v%2Fv0.4.0.mod 41 BLAKE2B c63f81a5ae45e613c409a5fc16a2ee33c943f5294422f96fb4222b2ead1dcbced0636f5b653a15db7e74e1c0a83d69cb0ee9c831860207b260f27d525b075a3d SHA512 8587bb4fe1736a6006cc120243f51397e00c425167a62a0d5e4f59814eeb49059ab805cde78e9a9efaa320460dee1e710287378728c5f89375f2df35beb390f8
+DIST github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod 40 BLAKE2B bd8fe364e43fdad423aa574d01229ce91e9b3211cbe3a0234070805150d960d3c0fc0c6ec229e7ce5b4079906f2595a2b5f50a8da7bbe9bd906a72a6a7a7434b SHA512 cdd8a665fc41a4b04c59e869b021d5a9b793b9a441c320a234bf2a13be67af9aa60378c58991161f73d83c184039a52fc3f11cd121490996737f0508e277e1cc
+DIST github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod 42 BLAKE2B c2d6fb272d8ae4e541c98023713bcf0b7f47f334d09ad7f9f375ed13eb14d27ee2995745782ecea40d31a561e28702fddeae4b5e32750726c7188118d741cf82 SHA512 14c839017eebd5dcf49dd3495a1ef6421d522389a2943c010d7869d214f757fe7d19d6ac3482fb3d8cbaaeb3977c5c311523aba90e9f7909fb1ba593ba57ae8a
+DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv1.1.0.mod 39 BLAKE2B 4a9a7321d9c10929abaf038e336248709fcfcde17c0ec9ec8e96407a9e12910b84e7008a7a847f533bd8695b56a8e35313d5771931d2fb1dfddd74ff59b58d5b SHA512 8ee8fb19b40e1366446a91a48a495fa96e4626f594903b7d4a53355069043c5a2958612dd0bf0f8b0a01a4fadf9dd92d0b9dfafbd10ab9c8ee6e3bcaa01853d2
+DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv1.2.0.mod 240 BLAKE2B 0177599cd72c2547b6ab045588b64eab43cfe222a27ba0852f535300f41b39123916b3e1e0a222eda9ba72a29316e610617707246834e2b56a5a7fa23d4d3345 SHA512 d01fd1c1874dc5d24d9435452bbc641d2b6f199580abf24030be4d6465a68f6ae1f5afc4c83ea8ff9366649341ca167397dbbe1e6c8988c3117e2082338711b1
+DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964
+DIST github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod 40 BLAKE2B 844d63d9c10c55eb74504d88d5e6e85641f2c4bdbbc9b4f6728cd6b1e750d1eb333e91b6eadac635a80abf328c9423fa106b18337e89dc592876cd3f04a803e2 SHA512 daffe8f4148becee3a32c90ad21454cd48255409f3edff8681ea2074623c8aa02cbb4620b7ba52aabe4ac3c24a5f256b56fd71de1da45dcd7e4e8376699a422a
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.22.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.28.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.28.zip 260158 BLAKE2B 474660bdf8b8c882edb465b0d04714949a9ded75a7467008bac781ee84260e4587366421467ab8823c1b8a1bd06687147b9b0e71b2eb743c8b29f26ef35fe81a SHA512 b44e24ba4b9917afe05fb3e2306f10e3542ff660bd3fc983dcdbcf1e80150459b9d5c8ac095f04f3aa27439fd6c38697814b286081d6b72d8afa3a39efdc1e32
+DIST github.com%2Fyuin%2Fgoldmark-highlighting%2F@v%2Fv0.0.0-20200307114337-60d527fdb691.mod 481 BLAKE2B 7f6b0f2bfcc73b9f02244e0310b0ee8f511ba654cbaf737dd896ba2090168795835635fa5f520c6584a47a156c7c1c71150a60e8d283f7cc5edd8b140f70ea2d SHA512 42b1f424182644a589d0add502d537fcc508077e5db59757f70b8c9bada92a71ec9345149cdcdf5c33f479c3beef0740d297f3b64f9897aa12e7a858dcb3e9b9
+DIST github.com%2Fyuin%2Fgoldmark-highlighting%2F@v%2Fv0.0.0-20200307114337-60d527fdb691.zip 12715 BLAKE2B f681c484ec877951d3c6f2bda0b6cff6ac109443637c887d9eeb74c70d37ceb8dbad999a8656f42175a8c91317a6a6c4e25ca829375137ec4fb7dd5957479b4a SHA512 b47bcfca1fd927ba733de1cae29328ad44293ea0b33cd498b878733ccf7faadb221c3f9f1d5913e00d8cbff3565bcb5ead52a03dfca3cbf5d098e7d8c96cb713
+DIST github.com%2Fzmap%2Frc2%2F@v%2Fv0.0.0-20131011165748-24b9757f5521.mod 27 BLAKE2B 7067d64da9c0d3a7c282f7689105a813f433a5be060a2433893b96c5d39c0a384abdf3680ead40ea20bf440c1f0efc43cdb5ee12f9f0a91df2a62b6a3424db71 SHA512 48b3a0e74776c014b332fea8082728dcf60ee4ebc6d7823e16909874b3956bb634dbb98a63a5f68cc7f2e377048492d194746acd1075bd6367676133be88f227
+DIST github.com%2Fzmap%2Frc2%2F@v%2Fv0.0.0-20190804163417-abaa70531248.mod 27 BLAKE2B 7067d64da9c0d3a7c282f7689105a813f433a5be060a2433893b96c5d39c0a384abdf3680ead40ea20bf440c1f0efc43cdb5ee12f9f0a91df2a62b6a3424db71 SHA512 48b3a0e74776c014b332fea8082728dcf60ee4ebc6d7823e16909874b3956bb634dbb98a63a5f68cc7f2e377048492d194746acd1075bd6367676133be88f227
+DIST github.com%2Fzmap%2Fzcertificate%2F@v%2Fv0.0.0-20180516150559-0e3d58b1bac4.mod 36 BLAKE2B 04d210eef10e58c9580ea44154368dceebaccb1bc16db08544299111f881ae0afb1a7f3464e7bbd477ae2a8f839a9c4a39e10cf5a628438e6e1d51b799214a10 SHA512 087dc66e9d3bb631d22e1e95720be56d89e57e40e017162608dc853b3c459a95ffc7ff6b3baaae609fb6bb8ab35d8c6b79ee25ebe02551b1581ff89e7ede31b0
+DIST github.com%2Fzmap%2Fzcertificate%2F@v%2Fv0.0.0-20190521191901-30e388164f71.mod 202 BLAKE2B 6c95fa7dc48750611fb7fb80663330c8c15b99212045121a3172d654a4e6e9d17f5da2c8caf4ff5dcc254f4bd85c2a9e45dae03db2e70b0e915431ad8ef05c7b SHA512 2f249f51bbe35ec6b1be2a62f0df423af21ba8c1d62cd3294f4daaf490ee355446f149c1b54e33529bbb630a46f1776308ae21447c96d64c99560ca64bbbdd55
+DIST github.com%2Fzmap%2Fzcrypto%2F@v%2Fv0.0.0-20190329181646-dff83107394d.mod 667 BLAKE2B ede9649cc4d18533d7ff18fb51b0da03a59b795bc5784484c7df97e4b5730fce0a9d5aec2ac348c64e19333470df6e633d6b4cd97d6f62d4237cd3bed2dbd652 SHA512 a9f7d2f7ae242e5489d949ca46d22c10a628e979f899bf076615efda86bf919f158c245e817428e52facc90bcb4b718d18fd573c318e27d75d4d90bcffad7d1f
+DIST github.com%2Fzmap%2Fzlint%2F@v%2Fv0.0.0-20190516161541-9047d02cf65a.mod 328 BLAKE2B 7e68f565b346a899cc1895af82a9b60a51fe1c1b8de09fbf62af584bf5f7c859cc6fdbeb298044cd208e879ddf3039c8f4a75ec4ba7d7b548a674a87bf507ca6 SHA512 7353ba29c754d3698cb13cdee347f9a2fe4bd9549898713ba99f4f5c490c6bd039d71a0d8490284dcb0319269f368f7f46de4f6b66cde9bba207171f3dc06e30
+DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
+DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.zip 111427 BLAKE2B 62d61989ac2e7f9b83238e9dbc3027600235213fb39846ce0bb45c84431d80fc3d570d27fba6538668e5a91a8e8331e4bbb081e9106a4409a191209be122fa7a SHA512 f4c1b9f826415b753235e6f71dfb0c2e25ae4dab4acfd632a6ace744e437ae0df9d86dafc79569c6184895e5398108a098a5e5eda57589046316ebc767571cdc
+DIST go.etcd.io%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod 23 BLAKE2B d7c442b8bc73b30a48b7416d878750c5d33103053eeed8e9e444d75f6772cda3d9f940e4816fbd6d5531a59a6d5ae128bac6042caec4ee008baa626954487cb5 SHA512 58c284df2f2a50dcb098d7f52bd60a6c4dedcc3d08a25d4fe6ef65e1879a7a68905b0b8a386c8f90637b087cf794fde3125b2c100bceb21d105449ae5f34898e
+DIST go.etcd.io%2Fetcd%2F@v%2Fv3.3.18+incompatible.mod 23 BLAKE2B d7c442b8bc73b30a48b7416d878750c5d33103053eeed8e9e444d75f6772cda3d9f940e4816fbd6d5531a59a6d5ae128bac6042caec4ee008baa626954487cb5 SHA512 58c284df2f2a50dcb098d7f52bd60a6c4dedcc3d08a25d4fe6ef65e1879a7a68905b0b8a386c8f90637b087cf794fde3125b2c100bceb21d105449ae5f34898e
+DIST go.opencensus.io%2F@v%2Fv0.18.0.mod 1118 BLAKE2B 55892f4e07819a81da5ad96866ff71d2195b51051b5786e11d1e7badca1804f8e7dc3231dc17f99c9d4d00df45e7825ea389a30be8fd0f0670e9620b551efb97 SHA512 6992b5459b8f831b93b69588300374d1ee59e27056887687dd52baf61bb18c41e2ca75079cb17acc339a9d94da79bb697aa96e68af966abd73408a724ab70d2e
+DIST go.opencensus.io%2F@v%2Fv0.20.1.mod 408 BLAKE2B 01a022e76e1605416e74ffa8aafc0868304c7810d9e9de804bd611a2eb7417adf113cf10ecf607d89d1ef18f1e17fdbd1efc35f889854210114fb8a4e8db1d6f SHA512 2bfbe633ffde1f91834ca77f19d0b32cc4c9480b8a59e101199cf3e8ab0285c16fb45a00326353f02a7dbe06c1562c4695ce7d98767c4149ed2321acd527bebd
+DIST go.opencensus.io%2F@v%2Fv0.20.2.mod 408 BLAKE2B 01a022e76e1605416e74ffa8aafc0868304c7810d9e9de804bd611a2eb7417adf113cf10ecf607d89d1ef18f1e17fdbd1efc35f889854210114fb8a4e8db1d6f SHA512 2bfbe633ffde1f91834ca77f19d0b32cc4c9480b8a59e101199cf3e8ab0285c16fb45a00326353f02a7dbe06c1562c4695ce7d98767c4149ed2321acd527bebd
+DIST go.opencensus.io%2F@v%2Fv0.21.0.mod 305 BLAKE2B 73735106ac582b2e9d5f0d739412c3396e0df8627a6adbe810ac560998e4cf2eda12e449b6e336dd6b433eaf57c885b4a927359d0bc1bd6eba9432bb0793c35d SHA512 448e90223b8d67e4d5e4b150055ac83eacf9ef48aa34036c2e59559f21443f796e721df3c0395a829bf5d10d229cdc7beb956c8f90273e50f0989e45a82aace8
+DIST go.opencensus.io%2F@v%2Fv0.22.0.mod 408 BLAKE2B c96dc637d392594cdf710b9542b90504fb090392662ab45208d45abe2cbaac5b64e55f2f62d1afe5542d2747abef1eedfcff97cfc48d6e0649c23b9b8293f7e5 SHA512 823e1ca3a9adedb1a98f5ac900e190bd51480686872bd901cc20a394cf03be6c8fd69cfe7343e42cb6f9d3500282a8097b6c32376aeb3e92bf0b1ce3e75872d1
+DIST go.opencensus.io%2F@v%2Fv0.22.2.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
+DIST go.opencensus.io%2F@v%2Fv0.22.2.zip 296264 BLAKE2B 0b0e20eb2f10b81748d55b843f8489ffb8147a8b17c063cb21fe505fcdb46feb9cc0830f3b3a91ea7034b1e7ba78df27b0b235b8500b8c1ade19f6837366aaa1 SHA512 c98a43e1bfc9f4bd1e54847dfd6b07e9af14efdbcd8d61b70c9f9701541ee2405f800b1e33cf115615a43030accb735a1235e2b7d81f54efd127e2fe5c992326
+DIST go.opencensus.io%2F@v%2Fv0.22.3.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
+DIST go.opencensus.io%2F@v%2Fv0.22.3.zip 299798 BLAKE2B 6adc76c28569e177bf40cd2d4c7de912e92bb679c29ce669bda7e001d33f8e758d3f2a413857b2b74efc676d4d0cf239e9c7acefd2cb7cc502121f07b31d640a SHA512 99fe389fbe5fed1db31068ce5c4ebf597ac5b39203e3c5f13b0f92c3e66ed0b1ee9f6f3ec0d953a7f5d02d2db46969b8d3cb642703acf43cc0df5cda61c3e355
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.2.zip 15027 BLAKE2B 06a2451071b8cb0de9b4e664d007584998c91acf4bcca04be7f6c4e97c2579a9cc174e4db220347a00b252392cd6f3aa3e08e27ef3a231d422512a419a199c2a SHA512 be6b2545811ac8a869fd0365c1126be58531a6c0b51690feb17d7e88a2b79dfec6a466ac317df15e4d038c02df0f72993ae3e50a218c9f7f6659787c7f8e9333
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod 252 BLAKE2B d5019d6264ec35aa5c7c85d6c42130027213590c6dca568099f9c3b7c02fea9abdc969dccdc2d8d3f8abd0ce4c95727ec3f6f8dfbd2d4c1c75d4462e356181ac SHA512 15aae0e0950c9812700ba4bab0a19050c30398511df8e29fcfe496927fae3aa228761a796f150dd766377e5768beed842f06ece285e8b0e094a59288e1b86e23
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.5.1.mod 252 BLAKE2B d5019d6264ec35aa5c7c85d6c42130027213590c6dca568099f9c3b7c02fea9abdc969dccdc2d8d3f8abd0ce4c95727ec3f6f8dfbd2d4c1c75d4462e356181ac SHA512 15aae0e0950c9812700ba4bab0a19050c30398511df8e29fcfe496927fae3aa228761a796f150dd766377e5768beed842f06ece285e8b0e094a59288e1b86e23
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.5.1.zip 19041 BLAKE2B 7c782bd71c71dd343bbccf96d6f82bbfb246bf49956ea0dc1cce2c72d9f1b92bfce5ef9e939a340b363bc1179fbb7b35b2ab043b86907af74e1ea27a59e3e291 SHA512 e52ae80adaa4ea0336ebcdd314ceb6b798e388ea446bdab666769360666c3c717682d439e641a04db5c700e8ca62fbd39b768d6126da1c3eb4817abbcc672f98
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod 252 BLAKE2B d5019d6264ec35aa5c7c85d6c42130027213590c6dca568099f9c3b7c02fea9abdc969dccdc2d8d3f8abd0ce4c95727ec3f6f8dfbd2d4c1c75d4462e356181ac SHA512 15aae0e0950c9812700ba4bab0a19050c30398511df8e29fcfe496927fae3aa228761a796f150dd766377e5768beed842f06ece285e8b0e094a59288e1b86e23
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.6.0.zip 19110 BLAKE2B 749dab9cbf012066f0d8eb694b6592fd4d1819dd3b27052a76940502d65900b39820091e683c1c8561f4b65262dade55db6be331b1ba8517c22ef7aa39ade990 SHA512 21b8036b73a07887db6ffb620557794241c085e01be44e45c93ffdb2aa6b47783151f37fc4023bf847e091e1150466e84a67394070d945cc4a35a771d278f61f
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod 324 BLAKE2B 48b4bfac55f83ef9b78680d5354431cb8fa66139bb3e2f81dfb2861c8c2bd0731572372178c8499f8de7f3e7bd8d34f23f5b51935214eb008d52cda1e80953ce SHA512 9060d8bf8fd7a14d2a32656b1e086de1b3ec5658041ea0127fb2f68570c01059854137ce213d5ed648673c6f1843ae467facf647a4c7cd6ff44165eab575d30d
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.4.0.mod 324 BLAKE2B 48b4bfac55f83ef9b78680d5354431cb8fa66139bb3e2f81dfb2861c8c2bd0731572372178c8499f8de7f3e7bd8d34f23f5b51935214eb008d52cda1e80953ce SHA512 9060d8bf8fd7a14d2a32656b1e086de1b3ec5658041ea0127fb2f68570c01059854137ce213d5ed648673c6f1843ae467facf647a4c7cd6ff44165eab575d30d
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.4.0.zip 20167 BLAKE2B affec5465b2f84ff7796c959588b35670d48a8ec1bcf77f49c1a661bb08e62f051ba7d792738cdd857b26232c13501ebaf543ccd9b72012511e25a198ffbb874 SHA512 dec66c833797bcad5a7e458130b81cf6d7312f72182fdb26ad90996aa9cadcc264bb2c0fd62564fe18529f02a5e22d048d07d564dd72e8bae3430d7bef5f6d2f
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod 324 BLAKE2B 46301f4e5db74421da813b0c2d3d178417435ede42a1857da3d3af84b5ba353f10cad25fd48b777325dc33edd05f0a17b019a9f37c4e13f28e7ca5ee833c0d5a SHA512 aa82aeb1b0559b9c9b2585b8d584d9be60b6d6aa48e9613cec7ca440e267b93b2eaf67e3e88fc2faca68062792f3f6c9b03d080b6f13dc7f967e1b403521a909
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.zip 20218 BLAKE2B 35528c5c70a5f9fc80cee48c0d983b0fa9b23ce5e8273742db3a5678b9d0a56bfb93cc904c0a8678114d114af5cbde5e818240751904873bdca4d7ac87cade58 SHA512 4a52ab2241ca171cce47c0ab5dbcb8f57d6cb0355c5d372d75822ee866536c4943538543fd7926846085d4a91b5d154e54865f32e9c3a8ac485b41edf217bdde
+DIST go.uber.org%2Fratelimit%2F@v%2Fv0.0.0-20180316092928-c15da0234277.mod 29 BLAKE2B 96003330ab7677edae1ca63e98a9171395c0e3a81c4322cbf1b011b7840c467b827bc57ae9a66901f137e0d956d9f37c810664d93b69a4adf093dcb9fa074627 SHA512 de72ced3de1facf9d32a03c338b1025de32e14e642981bc68022917619858ba84ee3dc5b0c55b465fb71c1479d1280bba7f94bcf9289e524abefa760b5ef56b2
+DIST go.uber.org%2Fratelimit%2F@v%2Fv0.0.0-20180316092928-c15da0234277.zip 13556 BLAKE2B 0f98165f4ad1350aff1077e55cca4bf4c2de5fbc12a75a38a5aa61ffa4f0fcf6ebc84b3c67b2eff7ff48651f34fbdbd62bf1c385e222f3a05db256ddb81053c2 SHA512 40a6dbc1636c15e6499c8d8ba38c8686b8d22c16d5ae4b499242b11c2807937b030486437d14c6ff478b32b6edd67ffe403f4d42417162758cafa0dec23bb1a5
+DIST go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod 25 BLAKE2B 233f108e33b587684ea189f873a869f028f02d9fee0eea04183b8d5baa445c5f76bbe2b497f5cae24dbe1745d8b26d35f302b23d8b11b95bb7c62f54416548ad SHA512 0ee649ad9b6a2d478469ece9e6ad9b51fa00f002f7a4966068892cdae278680403637897d83a0a423effcb8bddce1d2f9316774cb5890609f6085b906394909f
+DIST go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.zip 27032 BLAKE2B 58b337663e7a5625521925deadcd0d686ccbaa7d04925852bee0ff1cf3ada22c078e9715930dd20858b16bf51632a4e4d7e76986b0092107bc07ad46d132840c SHA512 b0f1b10667e0e600a4ebca7b4cd9983a27c3ec5f2c54cd46eb055cc0a07504642bea7ccfd0e0f6e3d007422633506efe863817b7c7bc9d18eec3642c84b28f8c
+DIST go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
+DIST go.uber.org%2Fzap%2F@v%2Fv1.10.0.zip 224175 BLAKE2B 839e4b40c818d9ed889cb4f00b3b4c1e1a21add9e4732da956da63d77e5b8c2211443c9c2528f3c7a6886455d94d0818932e19876cf5576318426451d10eebb5 SHA512 deff970d323e0023cb39fd3aa38c419ccafef4c10af4edc8e9b70671e5892d60229e47f176495bdc4602b1cc4f344e8724e06eb740dd7858fde006bf121d5c1e
+DIST go.uber.org%2Fzap%2F@v%2Fv1.13.0.mod 221 BLAKE2B 586c82887d6cf6582837fb495a46030e1c582b58305fc70c7b88a29e570610e693a298fa7d4eac80bc86231c7fe6f6e27d3fdb5afe084363eb918692a1ccbc59 SHA512 2a7413f6f83e66456c340536502d855772e6de433ca4be1a9cd1572caf5fba7cafc7d377ef529324b5bd8af97830c9eae75768f7c45d4676b455e3959acc82c1
+DIST go.uber.org%2Fzap%2F@v%2Fv1.13.0.zip 217908 BLAKE2B 76cba015e6e09b9953c442c0080e7f0df0b47ccb57a1b7fba756dd3f32549c64dd2c71db9e00401c93c694d1cb1ce6336825e8a2b1221a199cb7b9a964370261 SHA512 e148cb9592231bcb86846dd43d8306f66618ea005cf397ef35efe2d63ba9fa08d3ff600419fa6392ce826ce585c4ee2ba44b548d3a23fed6ddf0ec8f62dd1052
+DIST go.uber.org%2Fzap%2F@v%2Fv1.14.1.mod 257 BLAKE2B 2e5fab0b1a188fb7fffa1c9ca0799fa286f74732ceb0f45a904a3620f636af45d8b30d199cbb54ca46114aaffeeaf66bfa04715abe02711d6af46bbdba9bd6dd SHA512 4922fb6e20d2f5d2fa00888b8d644c51e1b558edb69b9f7d70a883314c3e971b6f8fc707b072aa0602d4c451ca0f20983796b65edcb737e5090dda1ffed0c757
+DIST go.uber.org%2Fzap%2F@v%2Fv1.14.1.zip 223907 BLAKE2B 753367cf4cb824f280cdadb38d53e80fe64909f167e443941d573ea57791f9608a47bcf0cc9d4f24cf83fd78d9ba9ddd1ae99ea3074950e29de260998d01484c SHA512 94a725d0169b78ce842b6a9f69e178fc651ce8d10a3eb54e905ce13131420cf1d6af79e32ecbcefda166ea7a50ce51fe02c929ed8c008fc33c04b1088759f7d2
+DIST go.uber.org%2Fzap%2F@v%2Fv1.9.1.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
+DIST go4.org%2F@v%2Fv0.0.0-20180809161055-417644f6feb5.mod 15 BLAKE2B 00f2fbcebe2e9f068ba7e7dc4da2bf2e66f09203415957a1dcf8d5ca6aee422579cbaf2efdb4383985742c6e71d41029a8c68c20a074819666d2db732cf1ed13 SHA512 5bccd8605a1e1d8381adc2f52e27c600732590e7dfe261521b149fb6519693e1124e471c61bb7e6bad8f683d684c7a652f5f11ecc766c84286a51e3837cea6af
+DIST golang.org%2Fx%2Fbuild%2F@v%2Fv0.0.0-20190111050920-041ab4dc3f9d.mod 4407 BLAKE2B 01f20c6ca234f03f65fb5bca568f3f86c4fe49308030dbd045434025ceebeb168508b7d104143fa38c8476c4a926cba29bdbdabcc7d8a1f8bbb1fa7d4bcadda3 SHA512 a207bc1fff631a38a2ce1e1c041548860885b201919aa2d729af31b9538f7616b61f695c3cbed18146ce5bb79c72823425914050b5b75115f9889fc94d29d1c6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180621125126-a49355c7e3f8.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181030102418-4d3f4d9ffa16.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190313024323-a1f597ede03a.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190418165655-df01cb2cc480.mod 88 BLAKE2B 22568b660b7e13eed0dd423bfb6b033adf659a2c2b59c6ab12d707aca9f6f7317b7b438640caf6233dea4d9840aec4eb997eff5fcccbcdb193ba81db52d814d7 SHA512 fcfc8d63d333065f1193e9c27efe32a1fab270e450fbe1db533156e00427a13c75691163cd1bc7e9aa26b84d4142625c9fbd755535c575f83d63d82d7a276066
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190911031432-227b76d455e7.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod 146 BLAKE2B be8899d39fa75a36aa5a09db22d890466433efdd5310fbe61e7672f3c008a9aa34d038f844ca92450e9b8dde8c7d4d3649984f5edcb02abc34c71f46ce584c76 SHA512 173aab1e733ef5c18c3d259720c9fd7e46681d525ec934b4dc29a56beb91a362216768c28b50891b6230be003bb8e38636974e941d4fe6270a016798675fddea
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191227163750-53104e6ec876.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191227163750-53104e6ec876.zip 1861371 BLAKE2B 27c60a280e5b0644abb8ec34c645d165e6e01be124c2600d43e22955e785632f82c4597bb19ad1a61f04ae2701c4a5005f899f57d41f111d23535d6a169973b0 SHA512 62f52a80a1944263dc582e6f33a7f52d86aba7171b7ab4edc14dd22b69f523c83469fbbb04b2cfe2bd013b0920ddc15a9977ef8b58f09179d136157c64331576
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200221231518-2aa609cf4a9d.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200302210943-78000ba7a073.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200302210943-78000ba7a073.zip 1871198 BLAKE2B 952b683ea0441db01cdea99ef57634d79e30a112dc649e31dede9232c1975c1156f8e875b1203457d30c113d0dca49f01771b8549c18a2d7ca2b5dc135bfbea7 SHA512 41f3d3c47c1784e991e2b971189432fd4f9d693414e6340289b2debeb291d4972d6fc63b3ea06b84dac5dd369752134463a4275ba36f3db94cdbfed6ba3c9c8d
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.zip 1872460 BLAKE2B bcf70beb075025ed54a129e7e5851328cffb872f4885a388ff0a765793b657078ed9ed89ad6ce63a84ea0fd958731d549f6457c20a8f752c2d5a25a86f3d7195 SHA512 aa3d172a5c0d759ef698bf10ee48c231d3dc981c5f22f5e4755a2dc36596bdd2cd78891bb45c91aecb44380560e11c318d1de2c26e72650947449b335ae4b177
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200427165652-729f1e841bcc.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200427165652-729f1e841bcc.zip 1874182 BLAKE2B d28b6e5b2f897fdb9024bd9c06905e8c40719f9ee6ef78863128e907b48fa0ba55abb75b77d414aae16b78c39b023adaf4236ec1c43d67034443f2798e8a1218 SHA512 f4c8840968cf21d2a8fdb3351eac654c85ca3a1342391f445305befe696e66c7ab726bd0c19024a4c490321c90b5d5d4e14890c84080e27dfb61a576868798df
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod 327 BLAKE2B 209bd1491b6099491fca7ccfd2fabb500b56112557b4b359819b5f9d18e1587b8b1551acab53ac6c222b66b825c4058ecd6adb1d886f1868b7b96ebbd5865eea SHA512 e16919da8b2302c45f8fab5f0d200f41c2c978ad31eab2b4db18310bfbe09079d738f682920ef6530f1d5f53359ddc3d4bf33fe5cefbcefd440212b31e72ef28
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod 352 BLAKE2B 5e146ef1d6b71ec65511cb06d8392eddb9a126b6194213f3b2ac6b675977dcdc77cbb3e46fc936189269583df4d0d80d2e393523c3ba4c55f1e8f9294e0dcaa1 SHA512 8ea874c371c0a582410e682cf475628b4fe6a0c0f57b05566a03343999da063250dcb987d9a863b96a8e1ee913612f323de296b4ddbcfecb166884bee06a8af9
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod 475 BLAKE2B 3be94804cb1c692471ca7f2af890586ef57ed45a306a50fd6d6eaec9c7a161e2e4945ed11640ed30ab6f0e48ca644ec06b6b12e232b0990d4e9a08347c27491a SHA512 4b495d303e08e9bb4b43ff0c82665107a6e0a9cdd33a6d14aea491e634901fedb6341fe9e47c45fca1f89688ea3548f57ac8d62b79ef4ccb596ef4eb2e809241
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod 515 BLAKE2B b37d0d779f058e58ca3e350248cceaac958c4e406d70872fc3682f49b862391dc75d0a17a9ecac8a5dde4339552a222ce2f36b99d8daa3ad01fa5d8632351b3e SHA512 c5f79afe4531059fbc6acf58b7ec7f1e9558df83c4936c830dcb138cbfd7dbc4bab6c0acce6e0c588cc742ec3984d4116ad3e03be815c4f64af32f7ea5024053
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod 572 BLAKE2B fe37c4263fa4f07a01e65941f859f6abd92e26911622e8b06464ca1e4b65efa46b43eb1c475d6888a67d21b6104aca3c227f42210f0ea8e6709a497f13e1b45f SHA512 a773e3b5c26e95dd24414b9f2aa88225a330581cd9ed0c1ca83a3a6712dd3639e1526abe7c0ea47f9ca701828eb39e1df2144edd6ab261caf584a058f092f0fb
+DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod 60 BLAKE2B 1c8445e3c9313293a0551c8a2acc31a1738724b96886bdf165c74de6cf2d25b784baefa2c41997a64ff189333a8c59756fac7ac41b0ae1d4f167c38574905351 SHA512 c466f8b348acdc26208bcb782cf330a979d9af086a95f307a785884492430f11fe45d1ddc3abdc1b092654b3880a5e7a456740293935b1912a1d39b658de80e8
+DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod 69 BLAKE2B f2318e92793bd626374b94e2917ea05ec2b41285c169f1461365edfa00412a798775a8ce137221e1c280983a62d03bf1cc97eadaf8668661ed4387ef5823963b SHA512 d463167481b44386a011b867d6e26eaf2fe81c750325ea89f631af7b065c5152249084c45e7195a662d9b9ddde0e81a5273d8110f73a18c4d841c155c67ea0f6
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod 88 BLAKE2B ce393846b227c374753f46fc076385826a6288b0c85095e097c041b844f46b87120774c68924492c4f33c33729103a2d916d2335e24953022630314b63f606d0 SHA512 0097db2957ab98a21a73960d2a37c526e5cabcd5ba4825e44f0ec4851ef83743ae171c8dc4b6c09ea4d931c15879c247e362ca53ef8dc762b484f1ddcc483d04
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod 97 BLAKE2B ec2dbdd2dad833a979dc53c8d170b4d0f5d336f4c52f36e3116cba2f3549e42fc3191fa56b81d3b9378a52322b86cf5eb0e947e6002dc1d1bee12f7a6bc2eb36 SHA512 23082eb3c6f3e4330e88178c7511b83a06288b678e517cf8ad5062943d0a0fdcea16973425a8dc01cfeacc32ec05b2dba8edb1adfba2e0bcb2d81cb5060c6085
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.zip 45839 BLAKE2B 7fa2da9301cd760ce923164ca73b1e5c528f41421aeab0c9b90915b72ebf70f350766db083800d7f552c9253452dbac8c5dd48f8701dafb206513d46389b5638 SHA512 979b197fbfc92f81d4d376c4fcb0845a9e86a7a9350841d88ae2f3059c5192e2309df2e19edb76ef96e1e33bd957a83f95fe5c439d72731bd05fa29dda589e23
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod 97 BLAKE2B 6bf1c22438e1c18af0d845f52a62fc4c96b6752486228e0201a794540a44aca52a045366ef1beee95fb7780c9d0a37aa53fea0b669241d45a0529731bd91c2c4 SHA512 5e1e301c678b32fcb56cd538fb907900e5e60162a44c285e04f0fc8db49f1b31f346e736055872ae9a69fe63798823466d7f159d2ffffb4880bb39b17d4ba5fe
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod 97 BLAKE2B 6bf1c22438e1c18af0d845f52a62fc4c96b6752486228e0201a794540a44aca52a045366ef1beee95fb7780c9d0a37aa53fea0b669241d45a0529731bd91c2c4 SHA512 5e1e301c678b32fcb56cd538fb907900e5e60162a44c285e04f0fc8db49f1b31f346e736055872ae9a69fe63798823466d7f159d2ffffb4880bb39b17d4ba5fe
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.zip 46076 BLAKE2B a3611608a1963ae2e1e326da29671c30a1d44c7afd2698f85081aed84ae5699c16362af284e299bd4ed721d20052801a79886f0b1305f91b17a2bc5a091a3f27 SHA512 b35cfd6b7640a526780db3c3bc62a89ec731793e350a49894c1de278b8033c4105b5534b09c1ffbfedc8e020fce2f42757808550e98e0ef5d493891f971bf247
+DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod 27 BLAKE2B 9bc664bbb78cd778f132bf3504160bf8f6d9950342fa73c461db815f07c0ce2ae5bb2a0ac099457d022e1edf2d07e536566fea043a77aa8b21054254ae854c46 SHA512 a105eb088532321694d3adb5da0b3cdceb7781670a2d4a8a757799e3c8fde02784b981747714cfa8770ed29eb1a0228e0945ad3c363220c39108a7432fc29a32
+DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod 222 BLAKE2B 5f1962cf1df6a0e8d748eacc5616c3bf0b8de117d29e57da32017cfe26eafc879d33427deeb888b283eeab56d48b3c72ef1ad0aa3706a1dcaed208026eeb0054 SHA512 6689d7c55fea7d8cfb8d2b1a934ca45793dc8d4cf4fc5b001bafe676367a93b8a8c4964d8131ba145e5e41c4da50a238d6df01dd3fc336eeb18be61b49e62416
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod 97 BLAKE2B f6c97d5de5c229ab22e047250a7030c201829f8237b63c0b272c0453dd8ea91360f4a73f9d2b56212103c76c36c01699231d9dd31d48ba8624554b5b36499190 SHA512 15deca99c6d866dcffdd51b1334fbe7f33ce88e1fd82badec64f5155782681887e7fd959ec2686fb35adf70afbe08d743e36c6a891f43462074663357e5b309a
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod 97 BLAKE2B 54b5bbd5b0908619326ca8bcebebf13f45b2838737d22008f20d3f40ae52fb4f8fdb8c73cbd98b57873aefc8b37c7328aab2bf02ad82a7d5f83e0d75a9283e81 SHA512 4e955424df3c1cce0b716fc518eed10196feb34ec718c1fe537350ce99efd0676276c2000feca6faaa6f3db8ce626e2d330f700fa43a10c73120dd13f5f1a764
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod 159 BLAKE2B 7124b4e21f0b1ff142fe4cd5c57a22de7bc5b1c578e16e8661085d475d67573279c1ce3165e05a28c77a41eac43fe29b1d98854abdcc7b0b66167f82db652dd8 SHA512 5e225da646ef87b8bf435b745313187cecd1bd3e88660f8a90cd2a6fdcadbe8fc51f53edae4b3aa2357ad273a8e58034920bb61a1cd5898b95d3fe39f30ec648
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod 159 BLAKE2B 7124b4e21f0b1ff142fe4cd5c57a22de7bc5b1c578e16e8661085d475d67573279c1ce3165e05a28c77a41eac43fe29b1d98854abdcc7b0b66167f82db652dd8 SHA512 5e225da646ef87b8bf435b745313187cecd1bd3e88660f8a90cd2a6fdcadbe8fc51f53edae4b3aa2357ad273a8e58034920bb61a1cd5898b95d3fe39f30ec648
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.zip 126236 BLAKE2B 48caec10f6bf4b8da7028b0358645ab0414b5526004479ceececbd68380586bfbc5b4cfb9d43f8c608565f30521a0dbfe005669db7d5e245a1b63ddc8171d3e3 SHA512 2735c124a735b4cba606e4e3de5bb39c889aae2516525f778764d987b58677dd263cb286604fee63bc45636662c11e3dcc2c9726dcaf85a26e072ccd56597b93
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170915142106-8351a756f30f.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180611182652-db08ff08e862.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180911220305-26e67e76b6c3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181029044818-c44066c5c816.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181106065722-10aee1819953.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190125091013-d26f9f9a57f3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190228165749-92fc7df08ae7.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190301231341-16b79f2e4e95.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190313220215-9f648a60d977.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190424112056-4829fb13d2c6.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190930134127-c5a3c61f89f3.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191002035440-2ec189313ef0.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191027093000-83d349e8ac1a.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.zip 1499692 BLAKE2B 2ca64710a73a42e2c956ac30aff1ef35e9df2619ae3eaf7ebea4e6efe6cd322244daac868fce5842f08d14eb2ae3b20654d721bd8713fe2141b409aac593dbc7 SHA512 49ce7d40e2a126a4bece83b274e7c5ec18dfbc3fe2203290022a47d4eb651425dd3e90e23e747229e0b5c734fde374bfdbff629ff8466767cb17e8e94385719d
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.zip 1500173 BLAKE2B 6b2b9d94b3d6dd87fe74caceeb75254930831b14e03a54c4774374c96e74ee05917bc2e92aa38ccaa2ec41a02134b6303b668947ac336e3635aa43b7e97d2272 SHA512 63daa5add6fb2c5d315b507208a42a08a65d122b7ee1ce5772087453940b25c2c59e404ba283fc543b4814df9f1bd900e18c5c3cc4e2acd9c70fb26e46949ae8
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200425230154-ff2c4b7c35a0.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200425230154-ff2c4b7c35a0.zip 1500495 BLAKE2B 29da4ab15ccf128967369fd5c3c881d94af2d8820d52de95b7ac99b221ed1e912b49a1318d9665fe9aa2431c3c267ad88bfecc87e4fd4ae50852de3de8bb6006 SHA512 c376001cee1c89fdc414adeeb9a277e81b8b69e243ba597efe07e3cf70c62c38196dc78e6eb1e2da01fd84b6d154e7636fd6043fedee14e65400757c67f77848
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181017192945-9dcd33a902f4.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181203162652-d668ce993890.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.zip 81666 BLAKE2B 1c439d91e33db90a8cae45b0c3d94a528ef26bae9068511a14b0c6782fefa8f1dd15124a2c3a209a753903dc9485fad6ad86962f059b937d6c0c369c6af78af5 SHA512 eace3f9bbc11e83304e807c9d3117c54239a7d041a4e3fc47f6e451715a04a3385a0f5a33cdca50bd4a407c7bfa778a7cb9965741c330d26a99477f085c5efdf
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip 84373 BLAKE2B 39bd0256afae566a53bb0b7b95adf0416653fd003bf5312c7a316a2d7c3e5d1fa25fd08bdbcdf75df45a56116fea54dcb1bf9b68b07d15d3a909e072f8f9fa06 SHA512 10a924e5fb556c2726795462c91fe7086472d6baab511ac21c1fb3c137e5a3e0db55f9ce8fe1952566d887225e3528ec8b747136f8984163acf71e869a0d8c58
+DIST golang.org%2Fx%2Fperf%2F@v%2Fv0.0.0-20180704124530-6e6d33e29852.mod 25 BLAKE2B 1f8cdb1bffe6a24b9ec7efc36b1f874d1949b34c1555db9cec96a5b0408931e9cb6629770bbf734a2348c5208ac055bc31034b6892b936ec6e60c47b1dbdbda2 SHA512 482a9cd9650c6ed60700e635b05ef1a9ba9d412adb3e6824015511dbc55aedfce3ad4636d195b76d393452b578c022df7bfe6ae868cceca5db1a8b9f08aa29cf
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip 25620 BLAKE2B 770b7dc9bdd8999123fb58cfd951dcbd5592172fd394f1a70abc918e3d7adee5273da1c757f95be15a0ede27f4fd00804564828251ab308d6fc4b116415ac144 SHA512 5a9db9d294b5f2121f3de994da38161f013a0512ad64aaf51f1c7a94b7cdb1ec4102f7c457d29f9bde209e8c254f6ad034c294af3649dbd10d5349c05874f74c
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip 26635 BLAKE2B a464a4ad04b36e50cfe966e6e6dc299c0f8b45d0f4198ba64483bb70ab815d033cec5cde60753b76dd1fbb16fed087b41179100a2002b0a61cd4a08f9de779fc SHA512 ae6f29d5f7790b37d1722d65f31708670bf19f429c60b2f6633756ecd40e47c1fab40fc128e0d70b3b6ed0ba47ce5f970ce5f4e55b8f1fa407d2efee7444b646
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20171026204733-164713f0dfce.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180202135801-37707fdb30a5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180622082034-63fc586f45fe.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181029174526-d69651ed3497.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181122145206-62eef0e2fa9b.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181128092732-4ed8d59d0b35.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190316082340-a2f829d7f35f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190424175732-18eb32c0e2f0.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.zip 1817722 BLAKE2B dd684f551ee111f95610aef4b36c702ba7aae8ac4efde35f9300b89d1d84f9a954a9d274c87cc3f942f3cd8eaa922531e13a1bf7b3fda93f8b64853d3909c339 SHA512 62bb25a98a47333b5886b05edce3290d9de4f6ed6d0e67d4847f8d5170db8741dc610d4c9c7a98e522c38eac8020147993b75eeeb52b0a1d298090abb7a574e6
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191220142924-d4481acd189f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.zip 1913169 BLAKE2B c50435879fb1df50f91b1f37dd92f6504047944d41797350f0871a581d5bf17cf474845d3b422fb219c56f7627f2fdb302059d68657bd7860ebc604861cfae72 SHA512 b732d79f0828b9a900595b8dc98377436dcdcc24e2d3d9fe0472a8170d477c0e2487bb4b8e2da4eb7ca9b19251e29ea3b38a9de777d03c069425897ac47e325e
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip 1918660 BLAKE2B 015e9ad74f145cdd7cdeb55d7b2d8949d6e7baedaae36089fa53cb257b4fb49830aeb299ea3a1f782b2f033443a18d009cafcf0211d1709d4d37b4b97d5f3d08 SHA512 24a653028d079c52ba8128d9f43452d2ecabd374c8eba36d44704c3f70cac50761597c7b7bb6524ba50fcde696fbcded57c29f04f35e42c62e23a9790852bb56
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.zip 1462438 BLAKE2B b3781ba8026ce86feeeda8f46f3ab17b1c19968c13de5aac924f9110a828eed6e93f5fd3be901e74a70a98480070e7b990913a27dea21afe50bea9c745ff983a SHA512 930afe0d09f5e4e08c716e83a0d4072181519400a92c08004ddc29cfed716e5c8fbe7bd4e6d53a1baec73d9c5f578ff01029163571508bd3c04b34ba157d0f25
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip 1470272 BLAKE2B 9a8bbb988370bedc24428e6c78f42a9ba44dbb852ce91c3d7fc54e83678b72b9177e67c955c49dc8ef7a1e2e214475a2e55c53254469e3426ec271e90ec9e2d5 SHA512 e46ef76fe4a1628def4c6a291003b64cf11185c0214427af9c49b9ff3af99f258488d49e887206a9c8652784228d822665c5841ce87d6ff993e95ea3d0494129
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915090833-1cbadb444a80.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190921001708-c4c64cad1fd0.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190921001708-c4c64cad1fd0.zip 11753 BLAKE2B 1c778c3f73994890f47263af5f770cdcb69e5dda5e290aa850c16b38725a2ce9a7b18ec3a28a5226e9e6864f633ea21a9030f38b9c1c45a5e8c67b3a0a1b629b SHA512 41b17807e865578fcd17e4f7b92f907ed9fcd11bbbdb32beba9d219212ddeb76a3dfb93faf8077219c43e5430582fb8e86c75d05cd8df4e6eef29ea6a91c00d2
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip 11971 BLAKE2B 7b29c746b75b42c23fca353b8299a4feaf69556ce1395872470e891835a8dec88a4e4c3b64ba6dcb4b5512aafb9bb44cc38c68915a0f6702f1027cda89d03d81 SHA512 58cb42ebeb88c06e049caf8c609e95243e7bdba51057de7d7301885aa904111dbe85962b5faef216ae45aa73f371b5de6516800a6f5765219cfde3fb06372afe
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20170915040203-e531a2a1c15f.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180525024113-a5b4c53f6e8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180828015842-6cd1fcedba52.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030000716-a0a13e073c7b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181117154741-2ddaf7f79a09.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190110163146-51295c7ec13a.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190121143147-24cd39ecf745.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190221204921-83362c3779f5.mod 194 BLAKE2B 94f62204dd4fd9b865aca70366a7a7754e2e92ed27591beaf789b268ad272dfb34ca0906d888c608393b4c71bc5c9f975fc86c164528ed7d0390e41b66206ec4 SHA512 8b68acbca48744320e64a70a983a471e9e2fc2249562064b10256269033473fd50264b6544646227fb666f075c4f266df1835ca3f88ee679bb97d34bf62bd195
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod 194 BLAKE2B 94f62204dd4fd9b865aca70366a7a7754e2e92ed27591beaf789b268ad272dfb34ca0906d888c608393b4c71bc5c9f975fc86c164528ed7d0390e41b66206ec4 SHA512 8b68acbca48744320e64a70a983a471e9e2fc2249562064b10256269033473fd50264b6544646227fb666f075c4f266df1835ca3f88ee679bb97d34bf62bd195
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311215038-5c2858a9cfe5.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190322203728-c1a832b0ad89.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190521203540-521d6ed310dd.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190719005602-e377ae9d6386.mod 155 BLAKE2B 23d2d8015cce612ac3719373303a968d64840c82a2c4442c1c287baf2d7f30e5422fdbf0eb451912f2d38d23a4c36e7730f2c60d5aa1edb55e0b63c0b6359aea SHA512 99b2e19040279bbf7ccafe1de879eaed0dc22c49d60cc3a0e267b533ca04523ca12f35bbbb3b4b85033f1025b036acf9ee3e526d45ff6fa1ecf30d67a3ffedd9
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190909030654-5b82db07426d.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190910044552-dd2b5c81c578.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911151314-feee8acb394c.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190930201159-7c411dea38b0.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113232020-e2727e816f5a.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200103221440-774c71fcf114.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200106190116-7be0a674c9fc.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200106190116-7be0a674c9fc.zip 2928176 BLAKE2B b976bc0ae9d0fd1dfc69e6d90fa7134a093778ef5a59ff6c264c9fe1d5ab24dbbfa5a33bab6dcbc268d951aa8a5c4d5780e06f5544f7a9d83023fa6abf6d8af3 SHA512 d3bc7373c1ab509a9afcdce827208ab14969aafa9278bfe573724daf7352a64c60787584094b5cc9a87e7892a6ceb3620c7858c15b267181823391130906f3a7
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod 237 BLAKE2B 32be8e5d58d0c78633cbb17e75ae67087f14d1ed4faed5d5698b1861d27348aa71a0da1dd865e7be1e7b9704f0aee19fc87d3f6262a5f4a05a1111498995638f SHA512 712b296362aae221fdc5b56a6a9bdb0c5fd26c8f45a9602ed227f00508cd640e89fa020bf5a30367a9a5f4bcda1c18f2170a3ae69a623fde7bcf9d71d4fc6e28
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.zip 3015771 BLAKE2B 25d8865c3f9de4738a72eeeb15020ff33f36ac4a9e3f7993efe841d44fbedcc72dc192efaf13e5afc7dd880c8982b66351662796b59e161a8b51de19acdaeb36 SHA512 5b4dfb3efcdec110b63517b2bddfba5206316ad12ec5f17ab8a1f3b188ca3c8315dbefd9a18cf397d4f6a201ef29e8422f23267e659b7c00403c966a4234d1ca
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.zip 19898 BLAKE2B a1233d14bcda685e77649385f4cb03d5c0c0e2491dd01db12a81d3e255e0cc2636950142ea3f647f8177390401ad6236fc05af3537e9561e2e021a4c60ab612b SHA512 464d0f5e1ce45f303f0cf3b6c109629384cb23a8d1e23c5cbf16fbaffb19ae1641da4457b1baabd0e8d2f9784fda64774adfb4c1baaae837877275396d0f22fa
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip 22282 BLAKE2B 68df6b35d9043f23df13432b80074544f46833467294955ae5706713055d0cc9ababda892853c14e99c80a3571fd4a807a019a098fdd2ca695ba90c577ead5c4 SHA512 c72b8b73f89624889a2874c1b2445cb82f0e545fccf6a7761a278f3f659eb19f5f1c8585641b8f89f2bcfc3817ad2c0e267751cfeeab949e287e43af5df57e28
+DIST google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180910000450-7ca32eb868bf.mod 29 BLAKE2B 411ad882e1d61d9e7a02f83256abf55c6a9557a980b89d7fd1a8981cd44f81182c17659e2fec1f4a587163a16556076418f166e90118a04041a8c488f9bb69dd SHA512 f2367919f017863362525d492f3c7f9e36aa311a55f96533ad6a2db1dcbdc9628f516ca435a43cd63a09c677c3528c2fe386907fda1da7dcb69ac2f6c95bfdc1
+DIST google.golang.org%2Fapi%2F@v%2Fv0.0.0-20181030000543-1d582fd0359e.mod 29 BLAKE2B 411ad882e1d61d9e7a02f83256abf55c6a9557a980b89d7fd1a8981cd44f81182c17659e2fec1f4a587163a16556076418f166e90118a04041a8c488f9bb69dd SHA512 f2367919f017863362525d492f3c7f9e36aa311a55f96533ad6a2db1dcbdc9628f516ca435a43cd63a09c677c3528c2fe386907fda1da7dcb69ac2f6c95bfdc1
+DIST google.golang.org%2Fapi%2F@v%2Fv0.1.0.mod 342 BLAKE2B d29044f7528980834df69508a5a430885c808b2261128c98294db54509193fd9d938f9b00d5065d8747039fcfd2d1508ec3d1d28f45cace47746dceb88f2756b SHA512 f0f467b0cd37057b1c5c215a4554a85273ff29efbe22fc7476b4cb03e7d19701a18d1cc8db27d2988f63da66089cd79d82a53180c17e260fbde4100e070316ab
+DIST google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330
+DIST google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330
+DIST google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330
+DIST google.golang.org%2Fapi%2F@v%2Fv0.15.0.zip 14163585 BLAKE2B 0940d785a478203f50eb465c7e4f8686bdd54b638e21c25b41f2496bbafff66c94ab41a39ef52bb78c2bd2a59df54ca2fc77e378907397d8111e7717c8db3f48 SHA512 b81ba78ba8a62036edba302bd544c285ca5e1200209be27d6aaf62b3b116470a5cb32a1a6957c04537b407f6453057e0bd8ea9acf8fdd588c01ec9e70f8694e7
+DIST google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
+DIST google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
+DIST google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
+DIST google.golang.org%2Fapi%2F@v%2Fv0.20.0.zip 14949265 BLAKE2B 6329dba62db106b5231dd7caa92f6656221439d3283cbb1d96d1bbcd6dc9becbb71a03ecdeb41e92a71e60fdbddabb7153da6ebd78b3036e0ee95ae12c2a0c67 SHA512 f41425c9a9d4148d2539efdda6bccfbb610d0cd0a6fdb8b74b5ea175bb8c304dc0bff7bbbe9e2a0d521846764a5b884b7dfee2a38cdb8780374dd85375b5311a
+DIST google.golang.org%2Fapi%2F@v%2Fv0.3.1.mod 506 BLAKE2B 106ba1eae2f79ddc10b69e21988215a1be000c5b32a4bd8315d473748780be8785e89ce269f1560dc23a8afcb199c8a0428aefdf8035991051021443c17fd206 SHA512 37d49dd9c576465cc9dec58fab5cd9c0fa84ab472d46c961e64f34fcda27f88c45925da72368268f857db22bc9cd1378c6595933ee33ed5a6253f62c221ca6ef
+DIST google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a
+DIST google.golang.org%2Fapi%2F@v%2Fv0.5.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a
+DIST google.golang.org%2Fapi%2F@v%2Fv0.6.0.mod 814 BLAKE2B 4467907a8c67804ae0d799a6b80323ce0d14c0612c5a9500e6bb8a59ac72e937b6101043d58d5df29e74ed752ed539e3b549262aff31cc2fa51ce329fd3b2aa4 SHA512 ebce54fde531bd84ab00dd8ceaddb4985906372f790a110c7ef68d934315b2d6a14dac19f655fc7ae92d1fca33c32d99df6568587816d1eeafc68e81c6327f51
+DIST google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod 802 BLAKE2B 59277c0ab43500926ae727289dfd892ce524164f7acea3d6ede2f4efceb5e89e71e88c2c9fa3e4785da4d2a69c59e5c81c4d735887a6ab52c0b07a8b6baca88d SHA512 617883d94a4de6e07dfd82d046148ccfc5ab4eaf73840a76a9823e5cf03a60b0e0b4f1b62712620de28895d013f01bcd39477cb87bfb94524a634be8818c268c
+DIST google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
+DIST google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.3.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod 362 BLAKE2B 2d6d24186c2748c4d8f559feb269b351d4260c9c0e0b9342377f23af9e5ecc02fc7f84f7be299aedb0da1b1a6d6d67c3271a826b776bb7cc034256550479a0f5 SHA512 e3c391dfcc5f14fdc5430d7a1d239d4ebec89399b17851e4d7643b8c0c70077aaec3a1bc1a8dd5e3320d8bc6e1562a26e3fe1121d75ce578f37f5d2e84a4ddf6
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod 171 BLAKE2B 09b1ead1721eaa1dab7106f0206fd6f1c1509ddd07f70d7a23f73a1c047b9b33b41bae2519d2ba7e5c6ca632a9082483080dbffe0af3c371934f2ceab9ad334c SHA512 f99bba4e696291aae951ea3865a1cbaf0ba2df7cde4f86e942b2e5f5a4dfc6dfde95c74e52ff31ba69f2aa2a838d21843343b2203c732279eede5936b92d7c8c
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip 417678 BLAKE2B cdb4e693ed5fb2bb77ed1ce0e0b1b25dbc3648c00554ade874ce28fffd5824f487fac744f9f2cb0920aad2c94a82024e1d233d1663887f0681790488a3af6f3c SHA512 1ffe3894d8fd004f6c28916e06d8e64708c20321ff914e82d05c50ce4c62b76bcd93e74e45871f7adc779791240ef8e25df08fdaaf2abdce20a3640d8964bb28
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180831171423-11092d34479b.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181029155118-b69ba1387ce2.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181202183823-bd91e49a0898.mod 167 BLAKE2B 986a022473dc24178c99e6f660397dbee93b9680a5bd2ee1de8ce1e6d7b3b71bd9a79a70230daefd5f579c65669511a0bf89289889db3d6234583bd0b03ecf45 SHA512 bf0f5825495820d6f0416598bba137d80131ff8fea005163afca3f2984f57bd24c9005fab4ba0408bd09dfcb2f9ab1cd845e1cc3d0d9dfed1bedf0507567f570
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190306203927-b5d61aea6440.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190605220351-eb0b1bdb6ae6.mod 331 BLAKE2B 7a174749635ef1cfd4ef7a5c67d29c51934734bb7d7d0873f56a461f040373213cd4c5deac8fe12b3ee75b7c210e5d26e7b378e31214ea0278ac84eb001f99fd SHA512 1ab2bfe29c78700b879cd08ba8993d452715b4d374d349f48018a7ea8bd5999c236be0d164fe8d340d660e222e229f8ed490b7d8f5c931e754f3617510145905
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod 339 BLAKE2B 06dd6c875e6235007ea4f4a8350a7f80b3285e21f8ef599ea1e955a6185c5e11658040d073937a4110910c3d21d923487427c0dc626e342e10fef8efbfa95b2b SHA512 8d2fe5cf81319645c17ff8be71f966294976889b7aff74a5b234913dc34a1c7ac03548bcc9ed29120ef651705e7dc6da0c2aff892c9262d67d0044fec5685ac3
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190927181202-20e1ac93f88c.mod 339 BLAKE2B 06dd6c875e6235007ea4f4a8350a7f80b3285e21f8ef599ea1e955a6185c5e11658040d073937a4110910c3d21d923487427c0dc626e342e10fef8efbfa95b2b SHA512 8d2fe5cf81319645c17ff8be71f966294976889b7aff74a5b234913dc34a1c7ac03548bcc9ed29120ef651705e7dc6da0c2aff892c9262d67d0044fec5685ac3
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.zip 8035997 BLAKE2B 701b65c8b51271f8ff0e96f5fc2164f42951506c6c0d5caa1a621607e32fc1521a5be3dd287b461aee3f0022d5928eaddc314afad2f33d48da45d1d1df33347b SHA512 b1c72908124eeb0eca965973f0585e26216cc441b6eedb2c99698998fa16a3adde17879cc1d795fb1f4a9f902a2230f8647fdf2b4ea1d879bccc0980625f0ad4
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod 340 BLAKE2B 70822d80e0c64a18bea901e30359c66d790629dfcfd7b4512b215b2c29bcfcc862bb68f9480357118c7adbe6a1b42754ef7703bb28e608abef8f8cdcbf6d2396 SHA512 461bf9e9c747d61500f3884c67f82cdf9394b186b512f6ff7537620a8f7a8de7a5c30af81c9a1303c0babfbc748c80460313e6b8e440e1f553fd4e1e8e12321c
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.zip 10457859 BLAKE2B aed25a57258ded181f36b2e1bca75da26d256b4eaa2b3f116d1187395665671e125e3cbad33124045774de0522892849947998bbf01ed2f1c6bf0990a91263bc SHA512 f8cf43e02a8ec07998a36d24ace2fa29244136c055babc719ef92b04cefd51fa20814f7ac2d731fff2affd733bbe1a96df099127765dc5a9be109cfe622106bf
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200413115906-b5235f65be36.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200413115906-b5235f65be36.zip 10949147 BLAKE2B a636c26775c061bb2890c94ec2fce7ab3cffdecf50fbd266cdec1d558d4950e37d85be91f0bac5c228b475a5cfebc6a8ee2f63541e202e31156b3417820dcb08 SHA512 fd5e6fc11d6d6c687bf7c56393e530423b2bb0b6fa979d0d5e616d3c80551957025a973e667bfe38db5241ef7a30f83d733245d9c316d50a2c9270ca0fbd5203
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod 30 BLAKE2B 8ec04a655d1d0c3cfde5c051842d84f8a8615d7d56563ad57769905212e0e7cc821933d5adedcb210c724de9699b6b9cd5bcfd3a2c9555516354d3e19ffd3482 SHA512 10c6aa20da47c7923358430b63d5d5264d54f6a6cf70b008ed157807c07073cd0c64bef9db282b39fdb523515e1429125079cc29273ba186f7e4b42712d3d37a
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.16.0.mod 903 BLAKE2B dd9ff44489e2a944c07f3e58c3246534b472b407eb15780bfcf9a30370eea7353a8ec12601a6c3e0e39edad1de6651df1c959f86a528a0cb53ff7d2e8514d1e6 SHA512 1e7c2190023d06747cf81e4d6f25aa284a250912ac304e3d590e1b85f5ca3ad3d9963a0ff7106e5dc55f82f58eea953c72f131f4baa6618b46017a575669742b
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.17.0.mod 832 BLAKE2B 9de27394e05cf42e762a8b7ed42b6715244ea1086acd7c44f71b04bc0dc23c31ab236e6474fea423953eb3001dcaa357938daad1d54debfb5d52bdecc1de6bda SHA512 ac90f3fc374cc1ac7706146efaa8488a59634a209c30bf87453fa150bf8849870db2ec04e854438d59911ea35930a5dd8f40f5d5954786d0e0565907fc42f711
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.1.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod 795 BLAKE2B b825f2ab62a96b9b164410f761228575fd9882de37635c09803b9d2ce682ebbec30f301fd874aafaad95a5aa2431ba25962073e1bd4f336d8cb137e5939a8708 SHA512 585d4cf68b50a70d7967ac3941a7a83b83ed5df1a31773589a38348b6fdf247eb49e7778f7054b78ba1a65eef48d004a815abad932876cb1af2c09deea9c0db8
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.mod 771 BLAKE2B ec4ea0b34d044e7a4dab50109d3b4e9b0081c538bd568155c4aa7a6370dd0ec31a18f3d1d294ad87af95cd58f2ac885026d07d43d21df1eee2c926dd4d8b2712 SHA512 b6c886622095b3999f108230f6cd3dddb72157180b0ad1a539919289b2e0c8496ebfaab369d65e83d6fd6eeb97b618b49a834c7ad3b98afc996f290d49c936fa
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.zip 1101208 BLAKE2B bee7938f7e39bd6acfe03bf03e1d4787f30384f34fbf292ddabf7e172dcf8736ebc0d32f7d26bdf0021252dcb984766bc3b778312434a4ffc5f515f009fd26ed SHA512 8b90599cca0b31538086a5d65dc124c2e7641ec42b4774b15b3f5cb063b39f3d8f83a7114e89e6aac1dc4cebbac526105378a3cd9504bc723cb26781b5d214fd
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.zip 1142481 BLAKE2B 2b5b18292c24f142fafdffd7ca4416da8425f317e195b3c59fffa6881eaf42ee90722ec7d06f8dd39fff3b582fd5a08248d967d58204d5c55161900c01164d56 SHA512 0ba3e5799dc97e3cae5765bf607742bc3165ab02dcd774290b2a624518ab503c3110b9ea7bd889b9e898344aa679f0bb13f05fcd94514090f7d408fec81cd1ea
+DIST gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod 36 BLAKE2B 33002a8288351a233f5e8236743a91df1f630355380a4ae8df10c32abc03470955eac6c15c95655caec990eb17ef2661985570e49293cb146517828090d95635 SHA512 8482c3135335a3a69611529f0d50bd19257b0fe8a8de2d4f2d6441ccde5f1e7a57d487cedc375575c5fe16094e5fc1c7f7f1a6bf04acc8a9d4f92701db279002
+DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip 41465 BLAKE2B 9a7183d3ac6591399b5208026208047a670c85e8b6014ad29955b168c63bb4953fa972d31025613c2ab12d7207adeebe9578b3c15b65ebb792f1e41df2668297 SHA512 fa7c68a2b5a6bb14f99cda92a3e77aad0e4160f659c54ea73e9813af9ff9449df6b0cab42ee283971e778b6b9da4a6098df805dd284c3b1aedfcd3a0b8504bde
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip 41481 BLAKE2B b952f04dc8d4717c839de5a5b7780ec2434915d11f897cc759647f71073dd3df717e1195ff2f4f804457195886c63620b342a089fc489f5deafa9c928708d4bb SHA512 40a523fc1dcc36677a0dc0e626313d44a308fa2ad5eedf7b616470ae2972dd8f5b78c18384efffa65d58391e60b704ed35db5557a5dce8362ae45204f64b721d
+DIST gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.28.mod 31 BLAKE2B 1a4baffd98c62173795d54bc25845b710fe8391726fc5d67cd6025131f783a3d94cd474299d72f5f077dc529203dcdf7a069268dc30fa39d9b3f7fab566df45b SHA512 b8685a6e649de49671d079375ba2132a467bb015a29a7182744caa9464f5e7ac72a952b10faf04e5b6d745ec955b565dc03cbc4ca9849d23ebd5303a12f18401
+DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178
+DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod 28 BLAKE2B ee2514c386f6cb3ff4a9b829d903e57372ce765aeab91fb2f29e95358e3472e0612a00f2982f53790159738e416819e368afa03e44bf8f6b43511347bc6d6995 SHA512 7cf7d1933039974dd4fa16febc52cc118bcd0e35c329d4c563c7f411b8000d9e17be5bca9a60d94f5309cbef97b3d176110704ebfbc3c114572cbadf63a55a34
+DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip 40894 BLAKE2B 5edf237401ae1a48c425ffec6fc67146850d7137c7026260e894656f6c832066321d930151bdd7624489e1f768fc04b47b0fd3dac3b2171bd092dff344de16a7 SHA512 f99afc545324e49ef1de05fd4c8dde0dae37094e2fb1b81de8d8c9b8ba9b28f39f9b5ab715c728e4a0375544a48d49c2dbd719fc178d222e0b914a425d9aeb63
+DIST gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod 50 BLAKE2B c715a977e733670d4047cc0f62fd485ce2af214d87e799cdea97015f64ee66488e1f68f4aec8e8ab139cd70574a0dd5f54b7bcedad09b8890ad098bcb01d7f5f SHA512 2d48fa45b7183412ac358a60c0af0b3c2f77d5c461f6bf4ba5d7a162195d49076870e739ac6c59e95d41dae2002370f52faf183fd6ca7999d60374866fa3ebdc
+DIST gopkg.in%2Fh2non%2Fgock.v1%2F@v%2Fv1.0.15.mod 157 BLAKE2B 7cf57f0b8cd6b3dfac7e0cb7261d09f3526675ccd027be664aa6d9531578772d1ae3446e6b6cfd827abc30b5fdd9a3711cce768856a0fc18ecd2617aa948a685 SHA512 7673f93817e1fc32353a1d5b72d11e3697cf8c9e87c6d88bc9981ac8d6a36778e29d433efbb42aafb7b75f515acf5e5f42c55483481c3f5615799c5735c720bf
+DIST gopkg.in%2Fh2non%2Fgock.v1%2F@v%2Fv1.0.15.zip 46894 BLAKE2B 7bb6d2acf1604c1af4f8fe6440faa5f8f5e3b43d5079a7fb0348039438278da4ab6a9cbc96ba05b5bcd3f61772d7fbf8db19f0629b20832bc7642aaf05bf21ac SHA512 dadb8035d7573871d75370025bcafd8678bf5b86c329065fe68a17d6f5bb248d804fc9e1de6f304a74c993557f31ce20e7dee2e125187dfdd621b43721d603da
+DIST gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod 23 BLAKE2B 7e865218970f4a4fa06035c7474ea6a854843051fafd593b393007eb606d813e7817d2444697c68a3c63ce44d57b2f7bd47348ae6e4481bd11f43ed6ace64e5a SHA512 cb350a878f5cb581d62859e605c732ff92a0b92295c28eb17f17768845feef85c1838bda755ff952a8c939f6a46e9cbf5dd77b6e278adf8197a418111e2f98dc
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.44.0.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.51.1.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.51.1.zip 60242 BLAKE2B c813626bb38afad9bc3064400989ee298d938a1b9a6e619c512965361f80c7da9a5654fc47b5deba2fa758822dc542c9a6d1f756be881830a6b68e3a39e06a41 SHA512 b47b1ad2eff5abead86f0611bf6355e699ae5fe3ded89fab6efc3b940eba7ff295aa2ffd64bf3eb93cfe9b77fcdd82f8db25fe0ca91823019c9b3fb89feadc75
+DIST gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.mod 40 BLAKE2B 33144c2d794f0c82dd97c993506bb6267aa9c65eb99c535e92b206dfdbba0d257a64b12d553f85ec2c770c87c196db9fda863c7f757778e4b36d4cb0fc98f844 SHA512 93ccbb29e7c38516a22d7ac174d4c2e9b87203061ae7bcdffa92499f30470e90d7e88f515f789e1a15c34cfaa6e7c50249e3d26ea1ef8b2afcd92dde62cba044
+DIST gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.zip 17854 BLAKE2B 5580929fb891fd24550919ed250bbf70129f991a250669895a8b22d40ec40e691646dee8c243b39ce5f36accdfd749d46276b0358daf0512371f09f516819949 SHA512 26024daf1aec9a7b1e760b6fe789dd66d3f8300a9b413098c044d3f7c47d050dbad9809f9c807a1c8eb45d9d12d1821a45c8c8f0b14a96cfdf9752e271bb4de4
+DIST gopkg.in%2Fns1%2Fns1-go.v2%2F@v%2Fv2.0.0-20190730140822-b51389932cbc.mod 30 BLAKE2B 5d86097468cdf25c2ecb2021fc0189e523a4a194888da0f04a26a0b63bcafa367f896f828202747cb7c3cf6b2d4d10546396d7447425be3e87c314568c836980 SHA512 64cb6fb6710c0c6cda7ab79981be220a42028428a5f32defae5d76f3e9e0ced24a48ba5667e88a06b8f23e0c9b00e10ccbac74e2f226cb816e723170ef6f380c
+DIST gopkg.in%2Fns1%2Fns1-go.v2%2F@v%2Fv2.0.0-20190730140822-b51389932cbc.zip 70405 BLAKE2B 4cb5def3a9e4df2e647805abef65954119839a39c1c2b3ded7f0e61c3092d4f732b0680194ef2b38d61bdd1dbe4ef5b1a8ccdac24578bf550d5f06e7694ea8e2 SHA512 52250753aa937404db2cff86c2139d86a3196f704aac4db3ebe348ff981837cd41521f39518d48194f5cd8913cea5aa994c025d117af4bc32bdab1a9e8a94d93
+DIST gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod 86 BLAKE2B a2c81f0cabd00084e6e52de82e9ba9a5bdf42d45123b7a58ebe4baa07b41631498c7590535884282869c4947b4f4f9ea0f41bfd28c1c7bbd516ea5631f207e30 SHA512 84c11a71dfd5f94cbcc79aaa8d387600ea3eec89cdb44bc63e55daad5700dc20aa719ce7a5c960cf97900231bedd118afbd93c408aec449e68ed5d8c5641ff57
+DIST gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip 2645616 BLAKE2B e128dd04ef8a6855c7c0a5dadcfec1e24402799efeb868d894f783c5554a44214fe69781652887a3d496aa1bb58766d33cdf74d106cd0004ec5e018ea078455e SHA512 4b72a2b0ad43f1b1fe1c60e0dc51d39ff04b5bf2b9a761fce22c65904961267f4c61d598b2035137cdb1e1dcce9420cb36fe8882f7cade6dbb7adb3e5795f8a9
+DIST gopkg.in%2Fresty.v1%2F@v%2Fv1.9.1.mod 86 BLAKE2B 3bc6fd4eef3eb6aebd33a796d063f001dc46c95c26451d0c87323f6986eed9b10ddcc08c32496be0f8e71bb8f836039862db8e5f7f718650b1446ba6100e3de1 SHA512 f53a9633af9c9b6d0f87ce0e4c94316a5a8a2cd0a5ba3657b438fc530952e5cc9fcea9ad604c17acc32066c44c7767e5e1ef56ae1c5200ff8a046d3a34d7504a
+DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod 34 BLAKE2B 618a69c0e95948b23d494ad15cc5572b4d0cd35929ae65433b179b7482b70ae86167346300267b20c48814313278e1ff43e92935899d1405e7561d6c994e2f15 SHA512 a9022561a9dfe5056793fe3dc81625b8093eb32c67c5cba0ab5d82348aa72f1deeca161603773369c4f02ef4e753c0f751819199b292326277a149546ae54e62
+DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.zip 343284 BLAKE2B a4f4f886636b920a987942524f504c0049ca3c9d9ca5be16101109235e77e9a8a14106fee9fb2d02d403a056dcf5f42b0a4e4f57d33dbc78a88e0df5682162f8 SHA512 0b212e847ef8972bbc9dc96685c9fafcef5552e96c622134cb1aac903aa3f6f5a1aa65a2f179e93396fcf32ea4139a34f46c4e6fb3558c9da8579282095d1baa
+DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.0.mod 34 BLAKE2B 618a69c0e95948b23d494ad15cc5572b4d0cd35929ae65433b179b7482b70ae86167346300267b20c48814313278e1ff43e92935899d1405e7561d6c994e2f15 SHA512 a9022561a9dfe5056793fe3dc81625b8093eb32c67c5cba0ab5d82348aa72f1deeca161603773369c4f02ef4e753c0f751819199b292326277a149546ae54e62
+DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.0.zip 347725 BLAKE2B 2af6055809b90346269333b5ffc1c44802ab613d3f37325385b6e36f74740f3ab701e756950252ca375d59af2f8b1ec19689b9237c2d24f81a8e1daa41cb80eb SHA512 cf0551e8b01220d1472d88e08a3e3646c8001dd4605d2c8cb6e665c08c96904c4cdcdf994f27088972300b3511f699ed4ef8b45e0b6d1d9258e5700fac2d75cc
+DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod 24 BLAKE2B 24a0c476e6590543f1b46175c4f0e036498afd9af616f6e204cac280e61cc10454e0c2a54fe10b9a7a306715ab966a5822ad78626c6cf20c2c78aac02598c922 SHA512 b147b03cabc4666519b94f4d9c7d9fefdea45810e3e35a9b3d303dba491d486fe03c0d5969a6186adbb9c75665e4f3e9811c7bf4ce72c46280b053611c198c41
+DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip 5099 BLAKE2B 56a68e317ccf9e6b0912331e7006742c3bfffd087742293b3d48ca7069c707db57b3722179c76b8c724303c8d58ac9ebf847c4277ed38a59e1510c676ebc941c SHA512 658ebdf931b23afe9d9d5d33d6c910fba7cf37740efe7052ba7627199c1a5fa4f93f093796674e341109430ba1f1b5ea933ea4a32356f63eaf337f05a562004a
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod 24 BLAKE2B 1cb17a1c6b1eb33cebd983f9e965f6db03f5095441d7cd72aff6df805501eef4dc249c22ecc85da360c27696a7c4ae613f0769a1f89e73f286281de89ffd3ef2 SHA512 89b481cc62ed7a486990ebfcf65cf7a344e5d189deef680e6ddd82dc93f31d166af05fc27b4a95ea27c33fd3ced1b87d4050d617d52008ca059c4a5d3b6c26a9
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321eacd25c0af1e5b3f031831266abf6a8e5a5ed12f6381778868383c03433f8ef760d6b42ffbff40150f2fee91dedd0b312f9fe81c7f SHA512 3214b38f348921f6a6d9ef93d4337bb90abd0d101d69d16ad8e38415c22d3b9a85bda873df2eb7a271f9b973ef38b74731405e522e1bb8083c78932762cb5535
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip 80579 BLAKE2B d5de9f0dbf72902ec2244971ef1d62790008d5686ec66b67ca5ded08503168e507d7afdbc38fbfe3b431432e32d2c79540e407a2916ea93de24d45040262366a SHA512 c4a38c485edfd1773be4d3b3dd97c475b1894603526f5d95b40a3ba34b148f3979f0983444009d716e106fea0a2362836a5277f49ea21f764a55279f343a3920
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d01f3d89a2db6930f406aded7889530b04689ea34b53fa2a7af352c264681ee40b1d192c86ca2f7dcc33dca825d355694527e4dbf SHA512 19f019e85b8c9a533c3cf2fd492b1813272f00cce06a56ffe43046935e49ccf6e191ce83f1d236f6355bae7126aa722016f05174687ff2faf54f121958266edf
+DIST grpc.go4.org%2F@v%2Fv0.0.0-20170609214715-11d0a25b4919.mod 20 BLAKE2B e14762111ddcb60b4b0d52ea4ef58dd26501463483aebf674713b6cca9a2a7a000c77f212c0fc0764ae69891b0c307c97bcdbc3bfb1f3fa5032582689bcefb89 SHA512 2a842877eb3d9f5d1a51864053d1dcafc6f74cf834cf597d1c167da6040a3842d409f4bb8ceaec80049ec0f70c4b42603016bee64539616e2f988160c5409afd
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.zip 506912 BLAKE2B a38cb31fd8df49dae4ff187e67704b5586ba78a0dcfe5afa3b820f0ac80f7e12ba4bdb705caa97c6be85407fe97599d1244d2f56f0e9e36554ba43289d9f21d8 SHA512 3285ab90762ee6b771c95e1c842ab308f04ac366ddfa693040c49d8951bb01db33994eb69c2c9dfd6ab2b379b29cbfe31558ca6b6aafe3feea1e693b2a36d0cb
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.zip 559809 BLAKE2B 55392e0d6cdb68f21348ef9c86b46797aedc94f8a47d7d7611be4fe489c1fca867ac184d1382480ce4a873cd5c435cf21825418bb3153420bd6f38157c332ae1 SHA512 64e810b40c1f64117074791cdab1dea4f282fb0a47df1cf82c6e26eae38bb893c9241119024d004b00dcb05d485bd5536f6ca90aee13200631c09da5c819c1c3
+DIST howett.net%2Fplist%2F@v%2Fv0.0.0-20181124034731-591f970eefbb.mod 222 BLAKE2B feaacfa0991b48030344f0b3a95e5bbc2c536db23b42dd54e29a5018bee927bfc2b9eb9473732d983d1aae47d98d5cc1d16ebdfb2cb6718479b66156b8fa5ca3 SHA512 d21a325b837cb099226a68404f6976318a7f0b8af68c023b1eb85436bfc9dd9c877c9ffba87d0f27d5e9aac606121688c069989a0c2f3ba6d2895baa0759d022
+DIST howett.net%2Fplist%2F@v%2Fv0.0.0-20181124034731-591f970eefbb.zip 69738 BLAKE2B d22c39eb97f4f1f591a5de1caf1b3098abe2a904a89dd851fffe170bfd1ed78411113bd3f2f75b547fd32d661cb34133f652449f18e13050d2df9e594ab3484f SHA512 42edffcf1da65083864d4ad866a4bf09bb184f52888e3ae7c2e47e6ff1967916cfe6e777de231a5e5a46f25b658b1c633429b6793584886373b2f8ebef8c5cef
+DIST howett.net%2Fplist%2F@v%2Fv0.0.0-20200225050739-77e249a2e2ba.mod 222 BLAKE2B feaacfa0991b48030344f0b3a95e5bbc2c536db23b42dd54e29a5018bee927bfc2b9eb9473732d983d1aae47d98d5cc1d16ebdfb2cb6718479b66156b8fa5ca3 SHA512 d21a325b837cb099226a68404f6976318a7f0b8af68c023b1eb85436bfc9dd9c877c9ffba87d0f27d5e9aac606121688c069989a0c2f3ba6d2895baa0759d022
+DIST howett.net%2Fplist%2F@v%2Fv0.0.0-20200225050739-77e249a2e2ba.zip 70534 BLAKE2B 1b5fcd558a04ad14cce342638b0543bee9fedb5f08a2da3d033872e996f6dae665bb28d268b14c7f95ae0260565ecc1d335adf27b97ba2c3ac8095694329c992 SHA512 1b7fab725dd4ad53ac157aaa5c46dc7a015aa66b210267abdb615aa45cce62d925237e99f9adaacaa159ace8a1906b6cc0b2833630d2da1e93ee2eee04d8edb4
+DIST mvdan.cc%2Finterfacer%2F@v%2Fv0.0.0-20180901003855-c20040233aed.mod 27 BLAKE2B 1fc5a95e4432c2d8c9c211155dc66a8bfc53f823f2129174bc7155b63f4c58607127dbd2d6bd793c91fde596a5c36a0acc527b13031dd29da156c04cc1efae32 SHA512 d58e0c14bafe02b1366d43f00d07951b4c11c3e4d8771d0f658367c107d7ed05266443e50a50e10d01ff57c9eb5bfd3bd95e56b2f56fc5cd704e48d9140d93e3
+DIST mvdan.cc%2Flint%2F@v%2Fv0.0.0-20170908181259-adc824a0674b.mod 21 BLAKE2B ed7272fd29049af9e593f73cde21d7f73b40817f1e7592a1a706ee58c251aebdd423e4b1ce25405eaacb9a3b9b101af042bf12615e0cd907c8b24e183795a0f4 SHA512 a9fafa4c84459dc2958a4587b99823476dccd1e245fde663c42c3fa8784c99df27a3d90e0f9f1125f0a3b82ca89dc28ae58cc0d90084ff9df16acde7981b15ea
+DIST mvdan.cc%2Funparam%2F@v%2Fv0.0.0-20190209190245-fbb59629db34.mod 132 BLAKE2B 0cfd958e837b6bbe113fd2272427856718bb241eff20fd6dc479e4a64303c9ab5323587bfdf5e731aa63da0f7af859e48f0348b5fcaf33d8cec272a84ae1a854 SHA512 cf385a4361bad78e100100fec51fd485600a90340028393ff9fc4b7fa7ed85c3cefee28c6a2789af8f0f4f92c8694e30c22d63fbceb9be1af1fbfe38072a0ba2
+DIST mvdan.cc%2Funparam%2F@v%2Fv0.0.0-20190720180237-d51796306d8f.mod 141 BLAKE2B 6dde3d0dadd66923b18a63621f7981937a11684364e1c7c2e1c62be026a6318ee911c1756ef75790b2ee37275065962c0c8ac90e0652921da5fddf30a5eadf7a SHA512 27cc16d07ba63ad7bcd8081fbd1e571d263abeb8b047be5116c91e17b193db7648a87d0746e9cba2fce465b31fd6a71e52a5776e495558ae30a9318bcaf3f3f6
+DIST mvdan.cc%2Funparam%2F@v%2Fv0.0.0-20191111180625-960b1ec0f2c2.mod 207 BLAKE2B a095d605043ec479fb0703c97c73ab47eef76fa1bc25dbcfdf68b0d04ca4be8ab49226297dde23a9c8c7d687044b3e50eda9177e946a786234c640960ad85cca SHA512 6e8b0a9d39f725ebbe4e470f5383d107593cb51793b8bf448d870836b60e5cbf8c51f5e662a13c7daf557b5c6a0f771870f483782bead73d7460a42f8089df0a
+DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
+DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b2025c1fd436e3fd857bd525b9295c0cbcade7e1f037e3f566124a7ef428384d50525426f0d40468c967e39bac6057174710e2566 SHA512 e6357ddd7d09692c60e59e6cb80469ade8284052cdd3ea520ec4dbcb42c1cabe045c599e43cce94bec022bd82e87a554ecac42f8c917cf2ff44daff9c1a147d5
+DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863
+DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
+DIST sourcegraph.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.0.mod 288 BLAKE2B e8f361d08bba5f5689a0e8b51dc17f11fe893c1fb3c0b671d323c6f66448d0c73d26b64586ce2236cc91f44839eba5ebf2a858b04aa85b5bde847c5956b0a519 SHA512 ef74bbbbb50cb01b861dc25c1a1ee276cebb64a383a31f4acf3f78db0e1b5fa907c6ecb9a88e4819d4aa7d5fccced97b574c12e147c36677a8d4e5f73b55d04c
+DIST sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod 35 BLAKE2B ff9ae0413ef6833c8d2f6ea3938e675256d2c44e38b31cee5223b7a1bcd3ef38515337ef388a155b171bc18d2f5153bef2ad0b0cf06b7c3d01145e5a13338aa7 SHA512 4316ef9aa90178d1f45938d1c81e6e0ab0618eeae3337bdf1bb2509d05c7b0e22e42fc2f86cc5d2a6fb1fdefc50ac68acc030e1d2cce8277314bbc2cc101c262
+DIST sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv1.0.0.mod 76 BLAKE2B 2b8d5265d8f690bdfe78bc571e24d3b5f51dd9dadbf87cd5a5019ddf5a54cd8a9f895e65ecf216bad03687115d404d8e8637a6b2b5aafb19c6988340a1da3574 SHA512 c8b52c1a238330c05e1baf979ab78726f8276944b1d9ab93334f9020c7ca2cd3fb39008e1e56c5399916a6da6a1ff896346c6616ea1fe2cbacc01202a2d56e06
 EBUILD caddy-0.10.11.ebuild 740 BLAKE2B 5db6734ed49caa6fd0df9a95a393a3fb763ee8963fbff9ea3e370239bd10ef6da189335505b1e04ebbedf6cb204f317c04c16474c03b77d9d2bf600938019de6 SHA512 27e78b3ec41d60e3acd781ff59f93468a998b2fae789e8a71bb142c433a9e07153251b5bac08d0b982dbdc98773f934013525bb7c68f5dc302c562dbee18fde1
+EBUILD caddy-2.0.0.ebuild 66031 BLAKE2B 4209c138a6746778eab3f86a1e0e0d4c43569282e10ee223a7796fb052966c0e23f0c9aa2b753566ba18ad5b18d71ca46a0752e9e26a1e601ef18d3f06b3d401 SHA512 f476e53905841f4439e7781855e049a987c3b46b7f11ed4c869e87279ab0271dae35346be012379c5472726c7d2740264fa558047035d926bb5261d39b6d6adf
 MISC metadata.xml 243 BLAKE2B db1542294c2fef7bcf6f008542d87fc1661eeb5ba5caee9658a0b2f803f17c30b26523fe6d252f70d692b52e85ba7c7c16567316ce33a534cf250a169e2b0f36 SHA512 9f804a00b8c8d98d3c097b0487f8f528d3648a316214b0009292903d0930f6808fde06be5a3b2b938203ee124f9102e7f15a1446e468c26e057cba332f70c539
diff --git a/www-servers/caddy/caddy-2.0.0.ebuild b/www-servers/caddy/caddy-2.0.0.ebuild
new file mode 100644
index 000000000000..18347731925c
--- /dev/null
+++ b/www-servers/caddy/caddy-2.0.0.ebuild
@@ -0,0 +1,1226 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Fast, cross-platform HTTP/2 web server with automatic HTTPS"
+HOMEPAGE="https://caddyserver.com"
+
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.31.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.37.0/go.mod"
+	"cloud.google.com/go v0.38.0/go.mod"
+	"cloud.google.com/go v0.44.1/go.mod"
+	"cloud.google.com/go v0.44.2/go.mod"
+	"cloud.google.com/go v0.45.1/go.mod"
+	"cloud.google.com/go v0.46.3/go.mod"
+	"cloud.google.com/go v0.50.0/go.mod"
+	"cloud.google.com/go v0.51.0"
+	"cloud.google.com/go v0.51.0/go.mod"
+	"cloud.google.com/go v0.52.0/go.mod"
+	"cloud.google.com/go v0.53.0/go.mod"
+	"cloud.google.com/go v0.54.0"
+	"cloud.google.com/go v0.54.0/go.mod"
+	"cloud.google.com/go/bigquery v1.0.1/go.mod"
+	"cloud.google.com/go/bigquery v1.3.0/go.mod"
+	"cloud.google.com/go/bigquery v1.4.0/go.mod"
+	"cloud.google.com/go/datastore v1.0.0/go.mod"
+	"cloud.google.com/go/datastore v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.0.1/go.mod"
+	"cloud.google.com/go/pubsub v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.2.0/go.mod"
+	"cloud.google.com/go/storage v1.0.0/go.mod"
+	"cloud.google.com/go/storage v1.5.0/go.mod"
+	"cloud.google.com/go/storage v1.6.0/go.mod"
+	"contrib.go.opencensus.io/exporter/ocagent v0.4.12"
+	"contrib.go.opencensus.io/exporter/ocagent v0.4.12/go.mod"
+	"contrib.go.opencensus.io/exporter/stackdriver v0.12.1/go.mod"
+	"contrib.go.opencensus.io/resource v0.1.1/go.mod"
+	"dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod"
+	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+	"dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod"
+	"dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod"
+	"dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod"
+	"git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod"
+	"github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9"
+	"github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod"
+	"github.com/Azure/azure-sdk-for-go v32.4.0+incompatible"
+	"github.com/Azure/azure-sdk-for-go v32.4.0+incompatible/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.5.0"
+	"github.com/Azure/go-autorest/autorest v0.5.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.2.0"
+	"github.com/Azure/go-autorest/autorest/adal v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/azure/auth v0.1.0"
+	"github.com/Azure/go-autorest/autorest/azure/auth v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.1.0"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.1.0"
+	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.1.0"
+	"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/to v0.2.0"
+	"github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/validation v0.1.0"
+	"github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/logger v0.1.0"
+	"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/tracing v0.1.0"
+	"github.com/Azure/go-autorest/tracing v0.1.0/go.mod"
+	"github.com/BurntSushi/toml v0.3.1"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/GeertJohan/go.incremental v1.0.0/go.mod"
+	"github.com/GeertJohan/go.rice v1.0.0/go.mod"
+	"github.com/Masterminds/glide v0.13.2/go.mod"
+	"github.com/Masterminds/goutils v1.1.0"
+	"github.com/Masterminds/goutils v1.1.0/go.mod"
+	"github.com/Masterminds/semver v1.4.2"
+	"github.com/Masterminds/semver v1.4.2/go.mod"
+	"github.com/Masterminds/semver/v3 v3.0.1"
+	"github.com/Masterminds/semver/v3 v3.0.1/go.mod"
+	"github.com/Masterminds/semver/v3 v3.0.3"
+	"github.com/Masterminds/semver/v3 v3.0.3/go.mod"
+	"github.com/Masterminds/sprig/v3 v3.0.0"
+	"github.com/Masterminds/sprig/v3 v3.0.0/go.mod"
+	"github.com/Masterminds/sprig/v3 v3.0.2"
+	"github.com/Masterminds/sprig/v3 v3.0.2/go.mod"
+	"github.com/Masterminds/vcs v1.13.0/go.mod"
+	"github.com/Microsoft/go-winio v0.4.14/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/OpenDNS/vegadns2client v0.0.0-20180418235048-a3fa4a771d87"
+	"github.com/OpenDNS/vegadns2client v0.0.0-20180418235048-a3fa4a771d87/go.mod"
+	"github.com/OpenPeeDeeP/depguard v1.0.0/go.mod"
+	"github.com/OpenPeeDeeP/depguard v1.0.1/go.mod"
+	"github.com/Shopify/sarama v1.19.0/go.mod"
+	"github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod"
+	"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod"
+	"github.com/ThomasRooney/gexpect v0.0.0-20161231170123-5482f0350944/go.mod"
+	"github.com/akamai/AkamaiOPEN-edgegrid-golang v0.9.0/go.mod"
+	"github.com/akamai/AkamaiOPEN-edgegrid-golang v0.9.8"
+	"github.com/akamai/AkamaiOPEN-edgegrid-golang v0.9.8/go.mod"
+	"github.com/akavel/rsrc v0.8.0/go.mod"
+	"github.com/alangpierce/go-forceexport v0.0.0-20160317203124-8f1d6941cd75"
+	"github.com/alangpierce/go-forceexport v0.0.0-20160317203124-8f1d6941cd75/go.mod"
+	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38"
+	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod"
+	"github.com/alecthomas/chroma v0.7.2-0.20200305040604-4f3623dce67a"
+	"github.com/alecthomas/chroma v0.7.2-0.20200305040604-4f3623dce67a/go.mod"
+	"github.com/alecthomas/chroma v0.7.2"
+	"github.com/alecthomas/chroma v0.7.2/go.mod"
+	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721"
+	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod"
+	"github.com/alecthomas/kong v0.1.17-0.20190424132513-439c674f7ae0/go.mod"
+	"github.com/alecthomas/kong v0.2.1-0.20190708041108-0548c6b1afae/go.mod"
+	"github.com/alecthomas/kong-hcl v0.1.8-0.20190615233001-b21fea9723c8/go.mod"
+	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897"
+	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+	"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190808125512-07798873deee"
+	"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190808125512-07798873deee/go.mod"
+	"github.com/aliyun/alibaba-cloud-sdk-go v1.61.112"
+	"github.com/aliyun/alibaba-cloud-sdk-go v1.61.112/go.mod"
+	"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5/go.mod"
+	"github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod"
+	"github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod"
+	"github.com/antlr/antlr4 v0.0.0-20190819145818-b43a4c3a8015"
+	"github.com/antlr/antlr4 v0.0.0-20190819145818-b43a4c3a8015/go.mod"
+	"github.com/apache/thrift v0.12.0/go.mod"
+	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+	"github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a"
+	"github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod"
+	"github.com/aws/aws-sdk-go v1.19.18/go.mod"
+	"github.com/aws/aws-sdk-go v1.23.0"
+	"github.com/aws/aws-sdk-go v1.23.0/go.mod"
+	"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/beorn7/perks v1.0.1/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/bombsimon/wsl/v2 v2.0.0/go.mod"
+	"github.com/boombuler/barcode v1.0.0/go.mod"
+	"github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod"
+	"github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod"
+	"github.com/caddyserver/certmagic v0.10.12"
+	"github.com/caddyserver/certmagic v0.10.12/go.mod"
+	"github.com/cenkalti/backoff/v4 v4.0.0"
+	"github.com/cenkalti/backoff/v4 v4.0.0/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+	"github.com/cheekybits/genny v1.0.0"
+	"github.com/cheekybits/genny v1.0.0/go.mod"
+	"github.com/chzyer/logex v1.1.10"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cloudflare/cloudflare-go v0.10.2"
+	"github.com/cloudflare/cloudflare-go v0.10.2/go.mod"
+	"github.com/codegangsta/cli v1.20.0/go.mod"
+	"github.com/coreos/bbolt v1.3.2/go.mod"
+	"github.com/coreos/bbolt v1.3.3/go.mod"
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/etcd v3.3.13+incompatible/go.mod"
+	"github.com/coreos/etcd v3.3.18+incompatible/go.mod"
+	"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-semver v0.3.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+	"github.com/corpix/uarand v0.1.1/go.mod"
+	"github.com/cpu/goacmedns v0.0.1/go.mod"
+	"github.com/cpu/goacmedns v0.0.2"
+	"github.com/cpu/goacmedns v0.0.2/go.mod"
+	"github.com/cpuguy83/go-md2man v1.0.10"
+	"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+	"github.com/creack/pty v1.1.7/go.mod"
+	"github.com/daaku/go.zipexe v1.0.0/go.mod"
+	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964"
+	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/dgraph-io/badger v1.5.3"
+	"github.com/dgraph-io/badger v1.5.3/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2"
+	"github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod"
+	"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+	"github.com/dimchansky/utfbom v1.1.0"
+	"github.com/dimchansky/utfbom v1.1.0/go.mod"
+	"github.com/dlclark/regexp2 v1.1.6"
+	"github.com/dlclark/regexp2 v1.1.6/go.mod"
+	"github.com/dlclark/regexp2 v1.2.0"
+	"github.com/dlclark/regexp2 v1.2.0/go.mod"
+	"github.com/dnaeon/go-vcr v0.0.0-20180814043457-aafff18a5cc2"
+	"github.com/dnaeon/go-vcr v0.0.0-20180814043457-aafff18a5cc2/go.mod"
+	"github.com/dnsimple/dnsimple-go v0.30.0"
+	"github.com/dnsimple/dnsimple-go v0.30.0/go.mod"
+	"github.com/dustin/go-humanize v1.0.0"
+	"github.com/dustin/go-humanize v1.0.0/go.mod"
+	"github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac"
+	"github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac/go.mod"
+	"github.com/eapache/go-resiliency v1.1.0/go.mod"
+	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
+	"github.com/eapache/queue v1.1.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/exoscale/egoscale v0.18.1"
+	"github.com/exoscale/egoscale v0.18.1/go.mod"
+	"github.com/fatih/color v1.6.0/go.mod"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/fatih/color v1.8.0/go.mod"
+	"github.com/fatih/structs v1.1.0"
+	"github.com/fatih/structs v1.1.0/go.mod"
+	"github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
+	"github.com/francoispqt/gojay v1.2.13"
+	"github.com/francoispqt/gojay v1.2.13/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/gliderlabs/ssh v0.1.1/go.mod"
+	"github.com/go-acme/lego/v3 v3.4.0"
+	"github.com/go-acme/lego/v3 v3.4.0/go.mod"
+	"github.com/go-acme/lego/v3 v3.6.0"
+	"github.com/go-acme/lego/v3 v3.6.0/go.mod"
+	"github.com/go-chi/chi v4.0.2+incompatible/go.mod"
+	"github.com/go-cmd/cmd v1.0.5/go.mod"
+	"github.com/go-critic/go-critic v0.3.5-0.20190526074819-1df300866540/go.mod"
+	"github.com/go-critic/go-critic v0.4.0/go.mod"
+	"github.com/go-errors/errors v1.0.1"
+	"github.com/go-errors/errors v1.0.1/go.mod"
+	"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
+	"github.com/go-ini/ini v1.44.0/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-kit/kit v0.9.0/go.mod"
+	"github.com/go-lintpack/lintpack v0.5.2/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+	"github.com/go-ole/go-ole v1.2.1/go.mod"
+	"github.com/go-sql-driver/mysql v1.4.1"
+	"github.com/go-sql-driver/mysql v1.4.1/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/go-toolsmith/astcast v1.0.0/go.mod"
+	"github.com/go-toolsmith/astcopy v1.0.0/go.mod"
+	"github.com/go-toolsmith/astequal v0.0.0-20180903214952-dcb477bfacd6/go.mod"
+	"github.com/go-toolsmith/astequal v1.0.0/go.mod"
+	"github.com/go-toolsmith/astfmt v0.0.0-20180903215011-8f8ee99c3086/go.mod"
+	"github.com/go-toolsmith/astfmt v1.0.0/go.mod"
+	"github.com/go-toolsmith/astinfo v0.0.0-20180906194353-9809ff7efb21/go.mod"
+	"github.com/go-toolsmith/astp v0.0.0-20180903215135-0af7e3c24f30/go.mod"
+	"github.com/go-toolsmith/astp v1.0.0/go.mod"
+	"github.com/go-toolsmith/pkgload v0.0.0-20181119091011-e9e65178eee8/go.mod"
+	"github.com/go-toolsmith/pkgload v1.0.0/go.mod"
+	"github.com/go-toolsmith/strparse v1.0.0/go.mod"
+	"github.com/go-toolsmith/typep v1.0.0/go.mod"
+	"github.com/gobwas/glob v0.2.3/go.mod"
+	"github.com/gofrs/flock v0.0.0-20190320160742-5135e617513b/go.mod"
+	"github.com/gofrs/uuid v3.2.0+incompatible"
+	"github.com/gofrs/uuid v3.2.0+incompatible/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.0/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/gogo/protobuf v1.3.1"
+	"github.com/gogo/protobuf v1.3.1/go.mod"
+	"github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7"
+	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e"
+	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
+	"github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod"
+	"github.com/golang/mock v1.0.0/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/mock v1.3.1"
+	"github.com/golang/mock v1.3.1/go.mod"
+	"github.com/golang/mock v1.4.0"
+	"github.com/golang/mock v1.4.0/go.mod"
+	"github.com/golang/mock v1.4.1"
+	"github.com/golang/mock v1.4.1/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/protobuf v1.3.3/go.mod"
+	"github.com/golang/protobuf v1.3.4"
+	"github.com/golang/protobuf v1.3.4/go.mod"
+	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod"
+	"github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod"
+	"github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a/go.mod"
+	"github.com/golangci/errcheck v0.0.0-20181223084120-ef45e06d44b6/go.mod"
+	"github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613/go.mod"
+	"github.com/golangci/go-tools v0.0.0-20190318055746-e32c54105b7c/go.mod"
+	"github.com/golangci/goconst v0.0.0-20180610141641-041c5f2b40f3/go.mod"
+	"github.com/golangci/gocyclo v0.0.0-20180528134321-2becd97e67ee/go.mod"
+	"github.com/golangci/gocyclo v0.0.0-20180528144436-0a533e8fa43d/go.mod"
+	"github.com/golangci/gofmt v0.0.0-20181222123516-0b8337e80d98/go.mod"
+	"github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a/go.mod"
+	"github.com/golangci/golangci-lint v1.17.2-0.20190910081718-bad04bb7378f/go.mod"
+	"github.com/golangci/golangci-lint v1.22.2/go.mod"
+	"github.com/golangci/gosec v0.0.0-20190211064107-66fb7fc33547/go.mod"
+	"github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc/go.mod"
+	"github.com/golangci/lint-1 v0.0.0-20190420132249-ee948d087217/go.mod"
+	"github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0/go.mod"
+	"github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca/go.mod"
+	"github.com/golangci/misspell v0.0.0-20180809174111-950f5d19e770/go.mod"
+	"github.com/golangci/prealloc v0.0.0-20180630174525-215b22d4de21/go.mod"
+	"github.com/golangci/revgrep v0.0.0-20180526074752-d9c87f5ffaf0/go.mod"
+	"github.com/golangci/revgrep v0.0.0-20180812185044-276a5c0a1039/go.mod"
+	"github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/cel-go v0.4.1"
+	"github.com/google/cel-go v0.4.1/go.mod"
+	"github.com/google/cel-spec v0.3.0/go.mod"
+	"github.com/google/certificate-transparency-go v1.1.0/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-cmp v0.4.0"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/go-github v17.0.0+incompatible/go.mod"
+	"github.com/google/go-querystring v1.0.0"
+	"github.com/google/go-querystring v1.0.0/go.mod"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/monologue v0.0.0-20190606152607-4b11a32b5934/go.mod"
+	"github.com/google/monologue v0.0.0-20191220140058-35abc9683a6c/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+	"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+	"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
+	"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
+	"github.com/google/renameio v0.1.0/go.mod"
+	"github.com/google/trillian v1.2.2-0.20190612132142-05461f4df60a/go.mod"
+	"github.com/google/trillian-examples v0.0.0-20190603134952-4e75ba15216c/go.mod"
+	"github.com/google/uuid v1.0.0/go.mod"
+	"github.com/google/uuid v1.1.1"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/googleapis/gax-go v2.0.0+incompatible"
+	"github.com/googleapis/gax-go v2.0.0+incompatible/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.3/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.5"
+	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+	"github.com/gophercloud/gophercloud v0.3.0"
+	"github.com/gophercloud/gophercloud v0.3.0/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gorilla/context v1.1.1/go.mod"
+	"github.com/gorilla/csrf v1.6.0/go.mod"
+	"github.com/gorilla/handlers v1.4.1/go.mod"
+	"github.com/gorilla/mux v1.6.2/go.mod"
+	"github.com/gorilla/mux v1.7.3/go.mod"
+	"github.com/gorilla/securecookie v1.1.1/go.mod"
+	"github.com/gorilla/websocket v1.4.0/go.mod"
+	"github.com/gorilla/websocket v1.4.1/go.mod"
+	"github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.mod"
+	"github.com/gostaticanalysis/analysisutil v0.0.3/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.1.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.12.1"
+	"github.com/grpc-ecosystem/grpc-gateway v1.12.1/go.mod"
+	"github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542"
+	"github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.3/go.mod"
+	"github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce/go.mod"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hpcloud/tail v1.0.0"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/huandu/xstrings v1.2.0"
+	"github.com/huandu/xstrings v1.2.0/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+	"github.com/icrowley/fake v0.0.0-20180203215853-4178557ae428/go.mod"
+	"github.com/iij/doapi v0.0.0-20190504054126-0bbf12d6d7df"
+	"github.com/iij/doapi v0.0.0-20190504054126-0bbf12d6d7df/go.mod"
+	"github.com/imdario/mergo v0.3.7"
+	"github.com/imdario/mergo v0.3.7/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod"
+	"github.com/jessevdk/go-flags v1.4.0/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/json-iterator/go v1.1.5/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.7/go.mod"
+	"github.com/json-iterator/go v1.1.8/go.mod"
+	"github.com/json-iterator/go v1.1.9"
+	"github.com/json-iterator/go v1.1.9/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+	"github.com/jsternberg/zap-logfmt v1.2.0"
+	"github.com/jsternberg/zap-logfmt v1.2.0/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a"
+	"github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a/go.mod"
+	"github.com/juju/ratelimit v1.0.1/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod"
+	"github.com/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/errcheck v1.2.0/go.mod"
+	"github.com/kisielk/gotool v0.0.0-20161130080628-0de1eaf82fa3/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/klauspost/compress v1.4.0/go.mod"
+	"github.com/klauspost/compress v1.4.1/go.mod"
+	"github.com/klauspost/compress v1.10.4"
+	"github.com/klauspost/compress v1.10.4/go.mod"
+	"github.com/klauspost/cpuid v0.0.0-20180405133222-e7e905edc00e/go.mod"
+	"github.com/klauspost/cpuid v1.2.0/go.mod"
+	"github.com/klauspost/cpuid v1.2.3"
+	"github.com/klauspost/cpuid v1.2.3/go.mod"
+	"github.com/kolo/xmlrpc v0.0.0-20190717152603-07c4ee3fd181"
+	"github.com/kolo/xmlrpc v0.0.0-20190717152603-07c4ee3fd181/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/pty v1.1.3/go.mod"
+	"github.com/kr/pty v1.1.8/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kylelemons/godebug v1.1.0"
+	"github.com/kylelemons/godebug v1.1.0/go.mod"
+	"github.com/labbsr0x/bindman-dns-webhook v1.0.2"
+	"github.com/labbsr0x/bindman-dns-webhook v1.0.2/go.mod"
+	"github.com/labbsr0x/goh v1.0.1"
+	"github.com/labbsr0x/goh v1.0.1/go.mod"
+	"github.com/letsencrypt/pkcs11key v2.0.1-0.20170608213348-396559074696+incompatible/go.mod"
+	"github.com/lib/pq v1.1.1/go.mod"
+	"github.com/lib/pq v1.2.0/go.mod"
+	"github.com/libdns/libdns v0.0.0-20200501023120-186724ffc821"
+	"github.com/libdns/libdns v0.0.0-20200501023120-186724ffc821/go.mod"
+	"github.com/linode/linodego v0.10.0"
+	"github.com/linode/linodego v0.10.0/go.mod"
+	"github.com/liquidweb/liquidweb-go v1.6.0"
+	"github.com/liquidweb/liquidweb-go v1.6.0/go.mod"
+	"github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod"
+	"github.com/lucas-clemente/quic-go v0.15.3"
+	"github.com/lucas-clemente/quic-go v0.15.3/go.mod"
+	"github.com/lunixbochs/vtclean v1.0.0"
+	"github.com/lunixbochs/vtclean v1.0.0/go.mod"
+	"github.com/magiconair/properties v1.7.6/go.mod"
+	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/magiconair/properties v1.8.1/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod"
+	"github.com/manifoldco/promptui v0.3.1"
+	"github.com/manifoldco/promptui v0.3.1/go.mod"
+	"github.com/marten-seemann/qpack v0.1.0"
+	"github.com/marten-seemann/qpack v0.1.0/go.mod"
+	"github.com/marten-seemann/qtls v0.9.0"
+	"github.com/marten-seemann/qtls v0.9.0/go.mod"
+	"github.com/matoous/godox v0.0.0-20190911065817-5d6d842e92eb/go.mod"
+	"github.com/mattn/go-colorable v0.0.9"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-colorable v0.1.4"
+	"github.com/mattn/go-colorable v0.1.4/go.mod"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.4"
+	"github.com/mattn/go-isatty v0.0.4/go.mod"
+	"github.com/mattn/go-isatty v0.0.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.11"
+	"github.com/mattn/go-isatty v0.0.11/go.mod"
+	"github.com/mattn/go-runewidth v0.0.2/go.mod"
+	"github.com/mattn/go-runewidth v0.0.4/go.mod"
+	"github.com/mattn/go-runewidth v0.0.7/go.mod"
+	"github.com/mattn/go-sqlite3 v1.10.0/go.mod"
+	"github.com/mattn/go-tty v0.0.0-20180219170247-931426f7535a/go.mod"
+	"github.com/mattn/goveralls v0.0.2/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/microcosm-cc/bluemonday v1.0.1/go.mod"
+	"github.com/miekg/dns v1.1.15"
+	"github.com/miekg/dns v1.1.15/go.mod"
+	"github.com/miekg/dns v1.1.27"
+	"github.com/miekg/dns v1.1.27/go.mod"
+	"github.com/miekg/pkcs11 v1.0.2/go.mod"
+	"github.com/mitchellh/copystructure v1.0.0"
+	"github.com/mitchellh/copystructure v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-ps v0.0.0-20170309133038-4fdf99ab2936/go.mod"
+	"github.com/mitchellh/go-ps v0.0.0-20190716172923-621e5597135b/go.mod"
+	"github.com/mitchellh/go-vnc v0.0.0-20150629162542-723ed9867aed/go.mod"
+	"github.com/mitchellh/mapstructure v0.0.0-20180220230111-00c29f56e238/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/reflectwalk v1.0.0"
+	"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod"
+	"github.com/mozilla/tls-observatory v0.0.0-20180409132520-8791a200eb40/go.mod"
+	"github.com/mozilla/tls-observatory v0.0.0-20190404164649-a3c1b6cfecfd/go.mod"
+	"github.com/mreiferson/go-httpclient v0.0.0-20160630210159-31f0106b4474/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/namedotcom/go v0.0.0-20180403034216-08470befbe04"
+	"github.com/namedotcom/go v0.0.0-20180403034216-08470befbe04/go.mod"
+	"github.com/naoina/go-stringutil v0.1.0"
+	"github.com/naoina/go-stringutil v0.1.0/go.mod"
+	"github.com/naoina/toml v0.1.1"
+	"github.com/naoina/toml v0.1.1/go.mod"
+	"github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32"
+	"github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod"
+	"github.com/nbutton23/zxcvbn-go v0.0.0-20160627004424-a22cb81b2ecd/go.mod"
+	"github.com/nbutton23/zxcvbn-go v0.0.0-20171102151520-eafdab6b0663/go.mod"
+	"github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod"
+	"github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod"
+	"github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod"
+	"github.com/newrelic/go-agent v2.15.0+incompatible/go.mod"
+	"github.com/ngdinhtoan/glide-cleanup v0.2.0/go.mod"
+	"github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229/go.mod"
+	"github.com/nrdcg/auroradns v1.0.0/go.mod"
+	"github.com/nrdcg/auroradns v1.0.1"
+	"github.com/nrdcg/auroradns v1.0.1/go.mod"
+	"github.com/nrdcg/dnspod-go v0.4.0"
+	"github.com/nrdcg/dnspod-go v0.4.0/go.mod"
+	"github.com/nrdcg/goinwx v0.6.1"
+	"github.com/nrdcg/goinwx v0.6.1/go.mod"
+	"github.com/nrdcg/namesilo v0.2.1"
+	"github.com/nrdcg/namesilo v0.2.1/go.mod"
+	"github.com/oklog/ulid v1.3.1/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.1/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.4/go.mod"
+	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.7.0"
+	"github.com/onsi/ginkgo v1.7.0/go.mod"
+	"github.com/onsi/ginkgo v1.10.1/go.mod"
+	"github.com/onsi/ginkgo v1.11.0"
+	"github.com/onsi/ginkgo v1.11.0/go.mod"
+	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+	"github.com/onsi/gomega v1.4.2/go.mod"
+	"github.com/onsi/gomega v1.4.3"
+	"github.com/onsi/gomega v1.4.3/go.mod"
+	"github.com/onsi/gomega v1.7.0/go.mod"
+	"github.com/onsi/gomega v1.8.1"
+	"github.com/onsi/gomega v1.8.1/go.mod"
+	"github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod"
+	"github.com/opentracing/opentracing-go v1.1.0/go.mod"
+	"github.com/openzipkin/zipkin-go v0.1.1/go.mod"
+	"github.com/openzipkin/zipkin-go v0.1.6/go.mod"
+	"github.com/oracle/oci-go-sdk v7.0.0+incompatible"
+	"github.com/oracle/oci-go-sdk v7.0.0+incompatible/go.mod"
+	"github.com/ovh/go-ovh v0.0.0-20181109152953-ba5adb4cf014"
+	"github.com/ovh/go-ovh v0.0.0-20181109152953-ba5adb4cf014/go.mod"
+	"github.com/pborman/uuid v1.2.0/go.mod"
+	"github.com/pelletier/go-toml v1.1.0/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/pelletier/go-toml v1.6.0/go.mod"
+	"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/pquerna/otp v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v0.8.0/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod"
+	"github.com/prometheus/client_golang v0.9.3/go.mod"
+	"github.com/prometheus/client_golang v0.9.4/go.mod"
+	"github.com/prometheus/client_golang v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v1.1.0/go.mod"
+	"github.com/prometheus/client_golang v1.3.0/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/prometheus/client_model v0.1.0/go.mod"
+	"github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod"
+	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+	"github.com/prometheus/common v0.2.0/go.mod"
+	"github.com/prometheus/common v0.4.0/go.mod"
+	"github.com/prometheus/common v0.4.1/go.mod"
+	"github.com/prometheus/common v0.6.0/go.mod"
+	"github.com/prometheus/common v0.7.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+	"github.com/prometheus/procfs v0.0.2/go.mod"
+	"github.com/prometheus/procfs v0.0.3/go.mod"
+	"github.com/prometheus/procfs v0.0.8/go.mod"
+	"github.com/prometheus/tsdb v0.7.1/go.mod"
+	"github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod"
+	"github.com/rainycape/memcache v0.0.0-20150622160815-1031fa0ce2f2/go.mod"
+	"github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/rogpeppe/fastuuid v1.2.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.1.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.2/go.mod"
+	"github.com/rs/cors v1.6.0/go.mod"
+	"github.com/rs/xid v1.2.1/go.mod"
+	"github.com/russross/blackfriday v1.5.2"
+	"github.com/russross/blackfriday v1.5.2/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735/go.mod"
+	"github.com/sacloud/libsacloud v1.26.1"
+	"github.com/sacloud/libsacloud v1.26.1/go.mod"
+	"github.com/samfoo/ansi v0.0.0-20160124022901-b6bd2ded7189"
+	"github.com/samfoo/ansi v0.0.0-20160124022901-b6bd2ded7189/go.mod"
+	"github.com/satori/go.uuid v1.2.0/go.mod"
+	"github.com/securego/gosec v0.0.0-20191002120514-e680875ea14d/go.mod"
+	"github.com/securego/gosec v0.0.0-20200106085552-9cb83e10afad/go.mod"
+	"github.com/sergi/go-diff v1.0.0"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/shirou/gopsutil v0.0.0-20180427012116-c95755e4bcd7/go.mod"
+	"github.com/shirou/gopsutil v0.0.0-20190901111213-e4ec7b275ada/go.mod"
+	"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod"
+	"github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod"
+	"github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod"
+	"github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod"
+	"github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod"
+	"github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod"
+	"github.com/shurcooL/gofontwoff v0.0.0-20180329035133-29b52fc0a18d/go.mod"
+	"github.com/shurcooL/gopherjslib v0.0.0-20160914041154-feb6d3990c2c/go.mod"
+	"github.com/shurcooL/highlight_diff v0.0.0-20170515013008-09bb4053de1b/go.mod"
+	"github.com/shurcooL/highlight_go v0.0.0-20181028180052-98c3abbbae20/go.mod"
+	"github.com/shurcooL/home v0.0.0-20181020052607-80b7ffcb30f9/go.mod"
+	"github.com/shurcooL/htmlg v0.0.0-20170918183704-d01228ac9e50/go.mod"
+	"github.com/shurcooL/httperror v0.0.0-20170206035902-86b7830d14cc/go.mod"
+	"github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod"
+	"github.com/shurcooL/httpgzip v0.0.0-20180522190206-b1c53ac65af9/go.mod"
+	"github.com/shurcooL/issues v0.0.0-20181008053335-6292fdc1e191/go.mod"
+	"github.com/shurcooL/issuesapp v0.0.0-20180602232740-048589ce2241/go.mod"
+	"github.com/shurcooL/notifications v0.0.0-20181007000457-627ab5aea122/go.mod"
+	"github.com/shurcooL/octicon v0.0.0-20181028054416-fa4f57f9efb2/go.mod"
+	"github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod"
+	"github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod"
+	"github.com/sirupsen/logrus v1.0.5/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.3.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.1/go.mod"
+	"github.com/sirupsen/logrus v1.4.2"
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c/go.mod"
+	"github.com/smallstep/assert v0.0.0-20180720014142-de77670473b5/go.mod"
+	"github.com/smallstep/assert v0.0.0-20200103212524-b99dc1097b15"
+	"github.com/smallstep/assert v0.0.0-20200103212524-b99dc1097b15/go.mod"
+	"github.com/smallstep/certificates v0.14.2"
+	"github.com/smallstep/certificates v0.14.2/go.mod"
+	"github.com/smallstep/certinfo v1.2.0/go.mod"
+	"github.com/smallstep/cli v0.14.2"
+	"github.com/smallstep/cli v0.14.2/go.mod"
+	"github.com/smallstep/nosql v0.2.0"
+	"github.com/smallstep/nosql v0.2.0/go.mod"
+	"github.com/smallstep/truststore v0.9.3/go.mod"
+	"github.com/smallstep/truststore v0.9.5"
+	"github.com/smallstep/truststore v0.9.5/go.mod"
+	"github.com/smallstep/zcrypto v0.0.0-20200203191936-fbc32cf76bce/go.mod"
+	"github.com/smallstep/zlint v0.0.0-20180727184541-d84eaafe274f/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
+	"github.com/smartystreets/goconvey v1.6.4"
+	"github.com/smartystreets/goconvey v1.6.4/go.mod"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod"
+	"github.com/sourcegraph/go-diff v0.5.1/go.mod"
+	"github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spf13/afero v1.1.0/go.mod"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/afero v1.2.2/go.mod"
+	"github.com/spf13/cast v1.2.0/go.mod"
+	"github.com/spf13/cast v1.3.0"
+	"github.com/spf13/cast v1.3.0/go.mod"
+	"github.com/spf13/cast v1.3.1"
+	"github.com/spf13/cast v1.3.1/go.mod"
+	"github.com/spf13/cobra v0.0.2/go.mod"
+	"github.com/spf13/cobra v0.0.5/go.mod"
+	"github.com/spf13/jwalterweatherman v0.0.0-20180109140146-7c0cea34c8ec/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+	"github.com/spf13/jwalterweatherman v1.1.0/go.mod"
+	"github.com/spf13/pflag v1.0.1/go.mod"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/spf13/pflag v1.0.5/go.mod"
+	"github.com/spf13/viper v1.0.2/go.mod"
+	"github.com/spf13/viper v1.3.2/go.mod"
+	"github.com/spf13/viper v1.6.1/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/objx v0.2.0"
+	"github.com/stretchr/objx v0.2.0/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.5.1"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/subosito/gotenv v1.2.0/go.mod"
+	"github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod"
+	"github.com/timakin/bodyclose v0.0.0-20190721030226-87058b9bfcec/go.mod"
+	"github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e/go.mod"
+	"github.com/timewasted/linode v0.0.0-20160829202747-37e84520dcf7"
+	"github.com/timewasted/linode v0.0.0-20160829202747-37e84520dcf7/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+	"github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce/go.mod"
+	"github.com/tommy-muehle/go-mnd v1.1.1/go.mod"
+	"github.com/transip/gotransip v0.0.0-20190812104329-6d8d9179b66f"
+	"github.com/transip/gotransip v0.0.0-20190812104329-6d8d9179b66f/go.mod"
+	"github.com/transip/gotransip/v6 v6.0.2"
+	"github.com/transip/gotransip/v6 v6.0.2/go.mod"
+	"github.com/uber-go/atomic v1.3.2"
+	"github.com/uber-go/atomic v1.3.2/go.mod"
+	"github.com/ugorji/go v1.1.4/go.mod"
+	"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+	"github.com/ultraware/funlen v0.0.1/go.mod"
+	"github.com/ultraware/funlen v0.0.2/go.mod"
+	"github.com/ultraware/whitespace v0.0.4/go.mod"
+	"github.com/urfave/cli v1.20.0/go.mod"
+	"github.com/urfave/cli v1.22.1"
+	"github.com/urfave/cli v1.22.1/go.mod"
+	"github.com/urfave/cli v1.22.2"
+	"github.com/urfave/cli v1.22.2/go.mod"
+	"github.com/uudashr/gocognit v1.0.1/go.mod"
+	"github.com/valyala/bytebufferpool v1.0.0/go.mod"
+	"github.com/valyala/fasthttp v1.2.0/go.mod"
+	"github.com/valyala/fasttemplate v1.0.1/go.mod"
+	"github.com/valyala/quicktemplate v1.1.1/go.mod"
+	"github.com/valyala/quicktemplate v1.2.0/go.mod"
+	"github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod"
+	"github.com/viant/assertly v0.4.8/go.mod"
+	"github.com/viant/toolbox v0.24.0/go.mod"
+	"github.com/vultr/govultr v0.1.4"
+	"github.com/vultr/govultr v0.1.4/go.mod"
+	"github.com/weppos/publicsuffix-go v0.4.0/go.mod"
+	"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod"
+	"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod"
+	"github.com/xeipuuv/gojsonschema v1.1.0/go.mod"
+	"github.com/xeipuuv/gojsonschema v1.2.0/go.mod"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+	"github.com/yuin/goldmark v1.1.22/go.mod"
+	"github.com/yuin/goldmark v1.1.28"
+	"github.com/yuin/goldmark v1.1.28/go.mod"
+	"github.com/yuin/goldmark-highlighting v0.0.0-20200307114337-60d527fdb691"
+	"github.com/yuin/goldmark-highlighting v0.0.0-20200307114337-60d527fdb691/go.mod"
+	"github.com/zmap/rc2 v0.0.0-20131011165748-24b9757f5521/go.mod"
+	"github.com/zmap/rc2 v0.0.0-20190804163417-abaa70531248/go.mod"
+	"github.com/zmap/zcertificate v0.0.0-20180516150559-0e3d58b1bac4/go.mod"
+	"github.com/zmap/zcertificate v0.0.0-20190521191901-30e388164f71/go.mod"
+	"github.com/zmap/zcrypto v0.0.0-20190329181646-dff83107394d/go.mod"
+	"github.com/zmap/zlint v0.0.0-20190516161541-9047d02cf65a/go.mod"
+	"go.etcd.io/bbolt v1.3.2"
+	"go.etcd.io/bbolt v1.3.2/go.mod"
+	"go.etcd.io/etcd v3.3.13+incompatible/go.mod"
+	"go.etcd.io/etcd v3.3.18+incompatible/go.mod"
+	"go.opencensus.io v0.18.0/go.mod"
+	"go.opencensus.io v0.20.1/go.mod"
+	"go.opencensus.io v0.20.2/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.opencensus.io v0.22.0/go.mod"
+	"go.opencensus.io v0.22.2"
+	"go.opencensus.io v0.22.2/go.mod"
+	"go.opencensus.io v0.22.3"
+	"go.opencensus.io v0.22.3/go.mod"
+	"go.uber.org/atomic v1.3.2"
+	"go.uber.org/atomic v1.3.2/go.mod"
+	"go.uber.org/atomic v1.4.0/go.mod"
+	"go.uber.org/atomic v1.5.0/go.mod"
+	"go.uber.org/atomic v1.5.1"
+	"go.uber.org/atomic v1.5.1/go.mod"
+	"go.uber.org/atomic v1.6.0"
+	"go.uber.org/atomic v1.6.0/go.mod"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/multierr v1.3.0/go.mod"
+	"go.uber.org/multierr v1.4.0"
+	"go.uber.org/multierr v1.4.0/go.mod"
+	"go.uber.org/multierr v1.5.0"
+	"go.uber.org/multierr v1.5.0/go.mod"
+	"go.uber.org/ratelimit v0.0.0-20180316092928-c15da0234277"
+	"go.uber.org/ratelimit v0.0.0-20180316092928-c15da0234277/go.mod"
+	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee"
+	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
+	"go.uber.org/zap v1.9.1/go.mod"
+	"go.uber.org/zap v1.10.0"
+	"go.uber.org/zap v1.10.0/go.mod"
+	"go.uber.org/zap v1.13.0"
+	"go.uber.org/zap v1.13.0/go.mod"
+	"go.uber.org/zap v1.14.1"
+	"go.uber.org/zap v1.14.1/go.mod"
+	"go4.org v0.0.0-20180809161055-417644f6feb5/go.mod"
+	"golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod"
+	"golang.org/x/crypto v0.0.0-20180621125126-a49355c7e3f8/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod"
+	"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
+	"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod"
+	"golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+	"golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod"
+	"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
+	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+	"golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876"
+	"golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod"
+	"golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod"
+	"golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073"
+	"golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod"
+	"golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59"
+	"golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod"
+	"golang.org/x/crypto v0.0.0-20200427165652-729f1e841bcc"
+	"golang.org/x/crypto v0.0.0-20200427165652-729f1e841bcc/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+	"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+	"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
+	"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
+	"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+	"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
+	"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
+	"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
+	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+	"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+	"golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+	"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f"
+	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+	"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
+	"golang.org/x/lint v0.0.0-20200302205851-738671d3881b"
+	"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
+	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+	"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+	"golang.org/x/mod v0.1.0/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
+	"golang.org/x/mod v0.2.0"
+	"golang.org/x/mod v0.2.0/go.mod"
+	"golang.org/x/net v0.0.0-20170915142106-8351a756f30f/go.mod"
+	"golang.org/x/net v0.0.0-20180611182652-db08ff08e862/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+	"golang.org/x/net v0.0.0-20180911220305-26e67e76b6c3/go.mod"
+	"golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod"
+	"golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190228165749-92fc7df08ae7/go.mod"
+	"golang.org/x/net v0.0.0-20190301231341-16b79f2e4e95/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190424112056-4829fb13d2c6/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
+	"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
+	"golang.org/x/net v0.0.0-20190930134127-c5a3c61f89f3/go.mod"
+	"golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod"
+	"golang.org/x/net v0.0.0-20191027093000-83d349e8ac1a/go.mod"
+	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553"
+	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+	"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+	"golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod"
+	"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+	"golang.org/x/net v0.0.0-20200301022130-244492dfa37a"
+	"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
+	"golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0"
+	"golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6"
+	"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d"
+	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+	"golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sys v0.0.0-20171026204733-164713f0dfce/go.mod"
+	"golang.org/x/sys v0.0.0-20180202135801-37707fdb30a5/go.mod"
+	"golang.org/x/sys v0.0.0-20180622082034-63fc586f45fe/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+	"golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod"
+	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod"
+	"golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35/go.mod"
+	"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
+	"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+	"golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod"
+	"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+	"golang.org/x/sys v0.0.0-20190424175732-18eb32c0e2f0/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+	"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
+	"golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3"
+	"golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod"
+	"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
+	"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
+	"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+	"golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod"
+	"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+	"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e"
+	"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
+	"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
+	"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+	"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527"
+	"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
+	"golang.org/x/text v0.0.0-20170915090833-1cbadb444a80/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.2"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0"
+	"golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0/go.mod"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+	"golang.org/x/tools v0.0.0-20170915040203-e531a2a1c15f/go.mod"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod"
+	"golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod"
+	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+	"golang.org/x/tools v0.0.0-20181117154741-2ddaf7f79a09/go.mod"
+	"golang.org/x/tools v0.0.0-20190110163146-51295c7ec13a/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190121143147-24cd39ecf745/go.mod"
+	"golang.org/x/tools v0.0.0-20190221204921-83362c3779f5/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190311215038-5c2858a9cfe5/go.mod"
+	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/tools v0.0.0-20190322203728-c1a832b0ad89/go.mod"
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+	"golang.org/x/tools v0.0.0-20190521203540-521d6ed310dd/go.mod"
+	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+	"golang.org/x/tools v0.0.0-20190719005602-e377ae9d6386/go.mod"
+	"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+	"golang.org/x/tools v0.0.0-20190909030654-5b82db07426d/go.mod"
+	"golang.org/x/tools v0.0.0-20190910044552-dd2b5c81c578/go.mod"
+	"golang.org/x/tools v0.0.0-20190911151314-feee8acb394c/go.mod"
+	"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+	"golang.org/x/tools v0.0.0-20190930201159-7c411dea38b0/go.mod"
+	"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+	"golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod"
+	"golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod"
+	"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
+	"golang.org/x/tools v0.0.0-20191113232020-e2727e816f5a/go.mod"
+	"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
+	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+	"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+	"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
+	"golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod"
+	"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
+	"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+	"golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod"
+	"golang.org/x/tools v0.0.0-20200106190116-7be0a674c9fc"
+	"golang.org/x/tools v0.0.0-20200106190116-7be0a674c9fc/go.mod"
+	"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
+	"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
+	"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
+	"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
+	"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
+	"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
+	"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
+	"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb"
+	"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898"
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod"
+	"google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod"
+	"google.golang.org/api v0.1.0/go.mod"
+	"google.golang.org/api v0.3.1/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/api v0.5.0/go.mod"
+	"google.golang.org/api v0.6.0/go.mod"
+	"google.golang.org/api v0.7.0/go.mod"
+	"google.golang.org/api v0.8.0/go.mod"
+	"google.golang.org/api v0.9.0/go.mod"
+	"google.golang.org/api v0.13.0/go.mod"
+	"google.golang.org/api v0.14.0/go.mod"
+	"google.golang.org/api v0.15.0"
+	"google.golang.org/api v0.15.0/go.mod"
+	"google.golang.org/api v0.17.0/go.mod"
+	"google.golang.org/api v0.18.0/go.mod"
+	"google.golang.org/api v0.20.0"
+	"google.golang.org/api v0.20.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.2.0/go.mod"
+	"google.golang.org/appengine v1.3.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/appengine v1.5.0/go.mod"
+	"google.golang.org/appengine v1.6.1/go.mod"
+	"google.golang.org/appengine v1.6.5"
+	"google.golang.org/appengine v1.6.5/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod"
+	"google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod"
+	"google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod"
+	"google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod"
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+	"google.golang.org/genproto v0.0.0-20190605220351-eb0b1bdb6ae6/go.mod"
+	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+	"google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod"
+	"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
+	"google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod"
+	"google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod"
+	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb"
+	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
+	"google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod"
+	"google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod"
+	"google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod"
+	"google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod"
+	"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
+	"google.golang.org/genproto v0.0.0-20200305110556-506484158171"
+	"google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod"
+	"google.golang.org/genproto v0.0.0-20200413115906-b5235f65be36"
+	"google.golang.org/genproto v0.0.0-20200413115906-b5235f65be36/go.mod"
+	"google.golang.org/grpc v1.14.0/go.mod"
+	"google.golang.org/grpc v1.16.0/go.mod"
+	"google.golang.org/grpc v1.17.0/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.19.1/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.0/go.mod"
+	"google.golang.org/grpc v1.21.1/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.24.0/go.mod"
+	"google.golang.org/grpc v1.26.0"
+	"google.golang.org/grpc v1.26.0/go.mod"
+	"google.golang.org/grpc v1.27.0/go.mod"
+	"google.golang.org/grpc v1.27.1"
+	"google.golang.org/grpc v1.27.1/go.mod"
+	"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
+	"gopkg.in/h2non/gock.v1 v1.0.15"
+	"gopkg.in/h2non/gock.v1 v1.0.15/go.mod"
+	"gopkg.in/inf.v0 v0.9.1/go.mod"
+	"gopkg.in/ini.v1 v1.42.0/go.mod"
+	"gopkg.in/ini.v1 v1.44.0/go.mod"
+	"gopkg.in/ini.v1 v1.51.0/go.mod"
+	"gopkg.in/ini.v1 v1.51.1"
+	"gopkg.in/ini.v1 v1.51.1/go.mod"
+	"gopkg.in/natefinch/lumberjack.v2 v2.0.0"
+	"gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod"
+	"gopkg.in/ns1/ns1-go.v2 v2.0.0-20190730140822-b51389932cbc"
+	"gopkg.in/ns1/ns1-go.v2 v2.0.0-20190730140822-b51389932cbc/go.mod"
+	"gopkg.in/resty.v1 v1.9.1/go.mod"
+	"gopkg.in/resty.v1 v1.12.0"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/square/go-jose.v2 v2.3.1"
+	"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
+	"gopkg.in/square/go-jose.v2 v2.4.0"
+	"gopkg.in/square/go-jose.v2 v2.4.0/go.mod"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.3/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.2.5/go.mod"
+	"gopkg.in/yaml.v2 v2.2.7"
+	"gopkg.in/yaml.v2 v2.2.7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod"
+	"honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"honnef.co/go/tools v0.0.1-2019.2.3"
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.3"
+	"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
+	"howett.net/plist v0.0.0-20181124034731-591f970eefbb"
+	"howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod"
+	"howett.net/plist v0.0.0-20200225050739-77e249a2e2ba"
+	"howett.net/plist v0.0.0-20200225050739-77e249a2e2ba/go.mod"
+	"mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod"
+	"mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod"
+	"mvdan.cc/unparam v0.0.0-20190209190245-fbb59629db34/go.mod"
+	"mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f/go.mod"
+	"mvdan.cc/unparam v0.0.0-20191111180625-960b1ec0f2c2/go.mod"
+	"rsc.io/binaryregexp v0.2.0/go.mod"
+	"rsc.io/quote/v3 v3.1.0/go.mod"
+	"rsc.io/sampler v1.3.0/go.mod"
+	"sigs.k8s.io/yaml v1.1.0/go.mod"
+	"sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod"
+	"sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod"
+	"sourcegraph.com/sqs/pbtypes v1.0.0/go.mod"
+	)
+go-module_set_globals
+SRC_URI="https://github.com/caddyserver/caddy/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT+=" test"
+
+src_compile() {
+	go build ./cmd/caddy || die
+}
+
+src_install() {
+	dobin caddy
+	dodoc README.md
+}
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index eae122332e46..47e4079c3f7f 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -6,15 +6,11 @@ AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f
 AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b449601a89a4518286d61dbca76417265289782a7a08540d8e78a3ea1cd1427d43d87e24813261c0fee SHA512 3d32e2ad998adfbaea5fe0ffcbbe6659dcb530a110faed5f2712ae2fd767353b1fc3f1ac83a24d43138c1bfc55949e645833a428ab982be14415887fc46d9fab
 AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
 DIST apache-tomcat-7.0.104-src.tar.gz 5309794 BLAKE2B 0d4d5d668e1131bb533af1d56fe37ee1f5c252c2c4dd987e24aae67484f27805f88750b27248c6acfd0585eacd0d3f2155c723e9a25c8613652101944add2a15 SHA512 788eab3ac343815362decf4c0d5db91f3697cc669e7e051f93bf82905cc52f9b040d00b7e07f7b85bcf470e802418896a678f991e523e08a3ae5a2f212a53257
-DIST apache-tomcat-8.5.55-src.tar.gz 5719386 BLAKE2B 4d5d20cf81e0a9aba1fe2b0fc2e9641696a2c7b4bfe1cefd1e86025612484ef06a8171e28722bcde91b671df5bd6e148b22c2fc267828109c6af762fe35f8fdb SHA512 214758bf4dc868c38fd92a19e405f3cd8e47008dee82610f8f7373d92ab5f8800c160a42c96c293f599b702c1c9d2967ca40d3410c1f6a14745edac4739f177d
 DIST apache-tomcat-8.5.56-src.tar.gz 5724546 BLAKE2B 623dc2d1f6808f012f19fdd0d914c4bb200e8328ab6b6855666c1db1704e198d069ff74d227bf51e8376c20daf0640002e5d6907edadfde294d8c62a64d55f83 SHA512 75529e567a7be48f2c1034f3eeada571478d0babb63fb2d368061573d7e64d5fc0a937304e2e2ffa956b5d8a403936c1543a93ee78b258b532939fb9ce80ef3d
-DIST apache-tomcat-9.0.35-src.tar.gz 5887816 BLAKE2B 8103a50a62aa527861fdc35ce8256d9ff0b7185bfa647e25c30c226f9850e88632e0c1e3575bac3a07513fe9c9777b4ef230275e685f48b0bbc733bc68ff7dad SHA512 8931c0f7c30f50d352879f8dfddc02fa59d7128813399e4eca3994be7cf2448e32e726a3cb8b387a5470ccbfa3fb74d0192c825b5f68bbb9fb6b43a9353cb24a
 DIST apache-tomcat-9.0.36-src.tar.gz 5890912 BLAKE2B 18962c7d4dcd75a04476acd306002977bf039d832aa1ed5551ffcaa0612e612e6b11db6d80cea149b9fb5df9d0f76284d55a1745760df8f4fa7449999e095c61 SHA512 f8263594bc679f75cecf5bcf4ad8e8ccfea42ad8e90eaeb7004c63875c6b700b0f863d68f1cdd932ebc7b303bdfb86d70afe88686e576c8ea7ccd9574c74e25b
 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.104.ebuild 4204 BLAKE2B 933c63117433e3c57c394bfedbaf75c808f79d5b811a0d3580281658298d62c81a81b35c20be389d8135391a14cb68942749927f8b3c02063fdd89411a53f70b SHA512 8a5e1571002872eb6bd972c50ebfb721ad05a78a9176c7215f0ad9d4422109a2206d24d68ff7b82f62745c67d2416b5771af14f24e809a8c097aaaa44e7fd8e5
-EBUILD tomcat-8.5.55.ebuild 4556 BLAKE2B 6a67a362e8fd98f7b233857abbcc2e85e3ce6911c795db4ba899932e62848c060f607b9bff66426dd0fbec9df91dcae959258ad813d4629ddede5c4986204ffb SHA512 de5dfd04a260674bab8c6d6dfbedc9684ad26a98994796472e694a1fa6105f55f721f97eb5ff3331a5c71182aa6874aa9be4bb0ee1fba427a6d7a0e2bdb25154
-EBUILD tomcat-8.5.56.ebuild 4557 BLAKE2B f51f8359dd552c5ea5c0816062c91c29d68ffaaff765241f17cd037187ca8fd03c9c39f7c05a95a51a57d24bfe2445ef50434f3614c9b1c9e8c01ce6a42287cd SHA512 910c1f7cf60c79dc4f7546e7d153bb239f44cd5eac7021bd78d49205f8199d3d30cca8bcc21df171fa0663d88ae504e6f237184787d923a335bf64f6e2d0b4ae
-EBUILD tomcat-9.0.35.ebuild 5479 BLAKE2B f9ca5f12da777e5a7c4022324f5dbd5e7c62607e1afd2888b9903307ae3af7a6b17fdc8ee7e82011291b4ca39fa59334754189e9abee646453bacbd497a92a03 SHA512 ce012dea0e52c29533191fc08436779309c6ce053d620c018c82d31fe26a8e5da9f39ebc64902ccd642577351c4093e23055306b3790ef107a512c01b0cdc639
+EBUILD tomcat-8.5.56.ebuild 4556 BLAKE2B 6a67a362e8fd98f7b233857abbcc2e85e3ce6911c795db4ba899932e62848c060f607b9bff66426dd0fbec9df91dcae959258ad813d4629ddede5c4986204ffb SHA512 de5dfd04a260674bab8c6d6dfbedc9684ad26a98994796472e694a1fa6105f55f721f97eb5ff3331a5c71182aa6874aa9be4bb0ee1fba427a6d7a0e2bdb25154
 EBUILD tomcat-9.0.36.ebuild 5479 BLAKE2B f9ca5f12da777e5a7c4022324f5dbd5e7c62607e1afd2888b9903307ae3af7a6b17fdc8ee7e82011291b4ca39fa59334754189e9abee646453bacbd497a92a03 SHA512 ce012dea0e52c29533191fc08436779309c6ce053d620c018c82d31fe26a8e5da9f39ebc64902ccd642577351c4093e23055306b3790ef107a512c01b0cdc639
 MISC metadata.xml 712 BLAKE2B 3e0a9b1bd07334015006678c0e1d933dc3d7b65291425754f7bcaec673f2316ba85b2e7df2c79a90f0d53dfbc443329cbea8ddfde7d4c93a1635b6140a3b18b6 SHA512 bc7c894d5f945a732078cc4d9a7fa9d0374ebb6aec449487f8968b22aed07bc5e20094448fda9be7516206121d0dfec8c6d6e48ee818786999703ea778a82109
diff --git a/www-servers/tomcat/tomcat-8.5.55.ebuild b/www-servers/tomcat/tomcat-8.5.55.ebuild
deleted file mode 100644
index 688cb7615768..000000000000
--- a/www-servers/tomcat/tomcat-8.5.55.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# 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.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8.5"
-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="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
-	virtual/jre"
-DEPEND="${COMMON_DEP}
-	app-admin/pwgen
-	>=dev-java/ant-core-1.9.13
-	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}-8.5.47-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 -Dexecute.validate=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/www-servers/tomcat/tomcat-8.5.56.ebuild b/www-servers/tomcat/tomcat-8.5.56.ebuild
index 4bdde891a689..688cb7615768 100644
--- a/www-servers/tomcat/tomcat-8.5.56.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.56.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="8.5"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-9.0.35.ebuild b/www-servers/tomcat/tomcat-9.0.35.ebuild
deleted file mode 100644
index b0c29cb19e68..000000000000
--- a/www-servers/tomcat/tomcat-9.0.35.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# 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-${PN}-${PV}-src"
-
-# Currently we bundle binary versions of bnd.jar and bndlib.jar
-# See bugs #203080 and #676116
-BND_VERSION="4.1.0"
-BND="biz.aQute.bnd-${BND_VERSION}.jar"
-BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
-
-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
-	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
-	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
-
-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.13"
-SAPI_SLOT="4.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	dev-java/glassfish-xmlrpc-api:0
-	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
-	dev-java/wsdl4j:0"
-RDEPEND="${COMMON_DEP}
-	virtual/jre"
-DEPEND="${COMMON_DEP}
-	app-admin/pwgen
-	>=dev-java/ant-core-1.9.13
-	virtual/jdk:1.8
-	test? (
-		>=dev-java/ant-junit-1.9:0
-		dev-java/easymock:3.2
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-BND_HOME="${S}/tomcat-build-libs/bnd"
-BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
-BND_JAR="${BND_HOME}/${BND}"
-BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-
-	mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
-	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
-	ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
-}
-
-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.27-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},glassfish-xmlrpc-api,wsdl4j"
-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 -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
-
-# 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/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index f717cee75956..0cb370810e93 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -1,5 +1,3 @@
-AUX 2.0.14-php-plugin.patch 856 BLAKE2B ae97b6b72cd985a45e41800938b6419c96de4d0f17bfa820586bb9bcc66b394c520403b11c4ca8f15c385d45f0d9827c14a9d5035555b34bc0b1b5673d1ea8fd SHA512 ccddf94e145dbea4d0d69e45202b062de01b7b8d6b154d496eca6a03450adfe1455b45217dc18612f5a21296e276fbac061de30973aff656b93c6488e0d3359b
-AUX 42_mod_uwsgi-r2.conf 254 BLAKE2B 27e8a1814eb6a3a2cf265d5364971cb2aa4ff97a4286cc09ebfde77657a20c1200b538cfafa44290d059b79e94f215be737db6f33a070d5bf74c0c3055013607 SHA512 de827913644ff8763d7e9f6907e5dd500bc7d25f861c9e8dd07d6f070e96b9eb39bdacc3a8e7ca0925f2a8ee1cd74bfe22da467bab39e319b7cabee36d31dc70
 AUX gentoo.buildconf 490 BLAKE2B 320b0471c0c76ab6c8ada7b034f612fc20398eb60e1edc3530be9d177bff755779251ea880d98addacf5476e3aae20145c95fad4d7baf594e58b9ebcaf2b0dde SHA512 d5bdc136374aed58ce206ea72cc45c72750f60117eef98960356b5cd64e2152c454af6b5aebb28f03ad46b42ea95a16fbf1e4a6f976ae78744550803ac775fe2
 AUX uwsgi.confd-r4 1849 BLAKE2B 80afdf7a5ebc520d887061aba9f7cd64b1bca06d3da478d8d1090a8b9cba973ac2d3dbcbc2ceb980415e98317bc55b07a9a7e6641fac593dc4dd5466bd8d67c9 SHA512 041d1bd694fad6f7c5e28944aab6d7ba53b3c7fc990ce6b7c2d97b9f3d6650c46dda8069e545c252a7400e1d825c8e46d7393a289757b1bd665e64241ca3789a
 AUX uwsgi.initd-r7 3746 BLAKE2B a56c5f4e32ccb415fab10f357e2a7404179285e656d9f886809da281b214e2110c76e2cf8826d8fd90aba01262a5edc7a941522ff59348972c5a4325c784b9b9 SHA512 81ed974fb2957e05c890cab29f5b5a75845e6b7de899d2695fb2fa5f49b4545daa437c81c8dc5c735b24a45655cf6320c9256bc8faa7e32ffd7a2d981922def5
diff --git a/www-servers/uwsgi/files/2.0.14-php-plugin.patch b/www-servers/uwsgi/files/2.0.14-php-plugin.patch
deleted file mode 100644
index f60a6553cfd1..000000000000
--- a/www-servers/uwsgi/files/2.0.14-php-plugin.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 6b332e6f7e6fc3c267a91ce5b5591684575ea271 Mon Sep 17 00:00:00 2001
-From: Damjan Georgievski <gdamjan@gmail.com>
-Date: Thu, 13 Oct 2016 00:55:35 +0200
-Subject: [PATCH] fix issue #1380 - compiling with llvm/freebsd
-
----
- plugins/php/php_plugin.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/php/php_plugin.c b/plugins/php/php_plugin.c
-index 536ec1a..ef30180 100644
---- a/plugins/php/php_plugin.c
-+++ b/plugins/php/php_plugin.c
-@@ -232,7 +232,7 @@ static void sapi_uwsgi_register_variables(zval *track_vars_array TSRMLS_DC)
- 			size_t name_len = equal-usl->value;
- 			char *name = estrndup(usl->value, name_len);
- 			char *strval = equal+1;
--			zend_register_string_constant(name, name_len, strval, CONST_CS, 0);
-+			zend_register_string_constant(name, name_len, strval, CONST_CS, 0 TSRMLS_CC);
- 		}
- 		usl = usl->next;
- 	}
diff --git a/www-servers/uwsgi/files/42_mod_uwsgi-r2.conf b/www-servers/uwsgi/files/42_mod_uwsgi-r2.conf
deleted file mode 100644
index 85ede87b037b..000000000000
--- a/www-servers/uwsgi/files/42_mod_uwsgi-r2.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<IfDefine PROXY_UWSGI>
-    LoadModule proxy_uwsgi_module modules/mod_proxy_uwsgi.so
-</IfDefine>
-<IfDefine RUWSGI>
-    LoadModule uwsgi_module modules/mod_Ruwsgi.so
-</IfDefine>
-<IfDefine UWSGI>
-    LoadModule uwsgi_module modules/mod_uwsgi.so
-</IfDefine>
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index e8cbc1bc1ce1..e480b1ca326f 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -1,5 +1,3 @@
-AUX fix-build-x86.patch 871 BLAKE2B 2d08a9e541ce5cc23910124d6bba677bd17287e7158f20395d61bcae3c92fb1a813244051561af71a8482ad47d22659df37f8bd00a54df169e84d4c2ce7a7bd2 SHA512 b46ab9cbfc5e7e4a75d1caf624fab453338531a19a8653550347fc233652199977ea907ba79e4db7822cb5c24f12f48aa765e4d582ba1bbd43edaf88d6b05d7c
-AUX varnish-5.2.0-fix-import.patch 1743 BLAKE2B 7b5e428653b419219a3001a95f57bf4b473a1d11c47e66f821a77e90b235467847a356e4c08c5a95e2f33e78e0d1c95ddcd4d461ad28867b4827b99e2573a0ad SHA512 bb64ddd0c15279b448a091b20aff4b36270b42b4d3e7389f98d0c9e54303d47d676eb90e1735e614bcede788466c291a8f809bdea733ddef8ad4f24bd645daf0
 AUX varnishd.confd-r4 519 BLAKE2B 18d867add08324ad9ea8b829a747e21c450d6c1f724e18c4318d21ba1647250073d443ea63d721585dc2a274d490a9fb76f14d5e725cc62f483b45be45220463 SHA512 98c8901e53f3c6adb908b9eb01fd441ea53f3c54d4a79aecb1fb1eddfa2fc93de3d0de403a4464a9baff15873b3a20623837e3a37cb225e924a329e32b9e37d6
 AUX varnishd.initd-r4 1573 BLAKE2B 79a6583ea337857c58eafcf6dff5cd9646a871116adca6aa5a956bf25b8474394d850afb3c296cc5c920bad0176ca144a486b7202d3a94e7ab7e4688c552be5d SHA512 5ac7867e85cbd721f903c524ed4b524423d9dada4acfeefb0e543214a208828df5cc4efe2f012991bea6b38c2b223c24b17d3890ec4ed2c57d2b441b8e5a6900
 AUX varnishd.logrotate-r2 470 BLAKE2B c44ccd8198458031b977e3d0d1b6ef1a0c824554b7b1d9745e6bbbcddb7cf1c9ba23bd72472361bfda803f9691276433f3af422819aa3e6e8e5436f66cc47097 SHA512 51cc6d46ff7439de93977ab87dfb0af399458c1e446475696f73342ae7a0c1a8ca8fc6e79e593659f1af30716a5f8a1ee5e3b1f5e7b35df40b45d47e7b0f2ffd
diff --git a/www-servers/varnish/files/fix-build-x86.patch b/www-servers/varnish/files/fix-build-x86.patch
deleted file mode 100644
index acacd3b9d610..000000000000
--- a/www-servers/varnish/files/fix-build-x86.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-See https://bugs.gentoo.org/show_bug.cgi?id=620952
-
-From 54b5a09f00c027da280361b30d32a4ff309ba3ab Mon Sep 17 00:00:00 2001
-From: Poul-Henning Kamp <phk@FreeBSD.org>
-Date: Tue, 28 Mar 2017 18:44:12 +0000
-Subject: [PATCH] Try to confuse GCC to not doing FP brain-damage.
-
-Fixes #1875 (maybe)
----
- bin/varnishd/mgt/mgt_param_tweak.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/varnishd/mgt/mgt_param_tweak.c b/bin/varnishd/mgt/mgt_param_tweak.c
-index 12a7a52ef..b26581e2e 100644
---- a/bin/varnishd/mgt/mgt_param_tweak.c
-+++ b/bin/varnishd/mgt/mgt_param_tweak.c
-@@ -52,7 +52,7 @@ static int
- tweak_generic_double(struct vsb *vsb, volatile double *dest,
-     const char *arg, const char *min, const char *max, const char *fmt)
- {
--	double u, minv = 0, maxv = 0;
-+	volatile double u, minv = 0, maxv = 0;
- 
- 	if (arg != NULL) {
- 		if (min != NULL) {
diff --git a/www-servers/varnish/files/varnish-5.2.0-fix-import.patch b/www-servers/varnish/files/varnish-5.2.0-fix-import.patch
deleted file mode 100644
index f83385a3f8e7..000000000000
--- a/www-servers/varnish/files/varnish-5.2.0-fix-import.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 17c92e43fda114bf5341e51d752e882238b8fe8c Mon Sep 17 00:00:00 2001
-From: Nils Goroll <nils.goroll@uplex.de>
-Date: Thu, 5 Oct 2017 13:39:23 +0200
-Subject: [PATCH] hack up vsctool to work with python 2 and 3
-
-StringIO does not exist any more in python3, yet requiring 2.7 would
-not pave the path forward, so try to be compatible with both.
-
-Works for me on Python 2.7.9 and Python 3.4
-
-I would appreciate if someone more fluent in serpentinous programming
-language reviewed and/or rewrote this.
----
- lib/libvcc/vsctool.py | 24 ++++++++++++++++++++----
- 1 file changed, 20 insertions(+), 4 deletions(-)
-
-diff --git a/lib/libvcc/vsctool.py b/lib/libvcc/vsctool.py
-index 854968e3b..829c6e518 100644
---- a/lib/libvcc/vsctool.py
-+++ b/lib/libvcc/vsctool.py
-@@ -37,7 +37,10 @@
- import json
- import sys
- import gzip
--import StringIO
-+try:
-+    import StringIO
-+except ImportError:
-+    import io
- import collections
- import struct
- 
-@@ -54,9 +57,22 @@
- 	"format":	[ "integer", FORMATS],
- }
- 
-+# http://python3porting.com/problems.html#bytes-strings-and-unicode
-+if sys.version_info < (3,):
-+    def b(x):
-+        return x
-+else:
-+    import codecs
-+    def b(x):
-+        return codecs.latin_1_encode(x)[0]
-+
- def gzip_str(s):
--	out = StringIO.StringIO()
--	gzip.GzipFile(fileobj=out, mode="w").write(s)
-+	try:
-+		out = StringIO.StringIO()
-+	except NameError:
-+		out = io.BytesIO()
-+
-+	gzip.GzipFile(fileobj=out, mode="w").write(b(s))
- 	out.seek(4)
- 	out.write(struct.pack("<L", 0x12bfd58))
- 	return out.getvalue()
-@@ -285,7 +301,7 @@ class rst_vsc(directive):
- 	def __init__(self, s):
- 		super(rst_vsc, self).__init__(s)
- 
--		for i,v in PARAMS.iteritems():
-+		for i,v in PARAMS.items():
- 			if v is not True:
- 				self.do_default(i, v[0], v[1])
- 
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 649e4ec4cf4d..1d9a45b994b9 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/appres/Manifest b/x11-apps/appres/Manifest
index f091d5c10d97..3ddd6b0017b2 100644
--- a/x11-apps/appres/Manifest
+++ b/x11-apps/appres/Manifest
@@ -1,5 +1,3 @@
-DIST appres-1.0.4.tar.bz2 117949 BLAKE2B a1938ffd3a3ecf279e35fd85c39f79550b9da0d2155d4ba08708fddff0b6cb9cb97a8174fcfb701ff13e929bd551405c3eaeae516d15e4d7ea31ef50aa6a5d29 SHA512 f07e672bd335308e58495685e5e7748684283aac28a96ea716edefe99ff281ec1f9b264e853ec0ce0f64cf54d9208d70dd3112a5a4219e0a38bfdc0fab8c9d98
 DIST appres-1.0.5.tar.bz2 124531 BLAKE2B 0d3e497afb3ab7d3565451c0da6594b4e608fa20e1a225162c4347d672db6a94823b5961c112b414e55c86a6b53a684709ddd109991f0545b6897bf276824da8 SHA512 70825563cd80f0f433c48ab2fdae888072939c1b22fb22340b70b9444c97916275ed92c9e5bf9a06bb76c32a5371b89ff7c0211a9a47a227c88311078c2c4137
-EBUILD appres-1.0.4.ebuild 390 BLAKE2B 576a1f60fa4c9c68ad233423870eff850956e798cb9e2dbb5c68c563f580aac784f5b029d510ca9419eea11eb8859abdfefe225ab4b0272a0dad1a3e8de1d8c7 SHA512 889e2353bba272973ffee2af9f08dcbced890e745c7a51001bdf343ca48c7d39f11f21125917abf463aadf32f88a02df79c4e00cf59298d82624d29470a0ca90
 EBUILD appres-1.0.5.ebuild 390 BLAKE2B 576a1f60fa4c9c68ad233423870eff850956e798cb9e2dbb5c68c563f580aac784f5b029d510ca9419eea11eb8859abdfefe225ab4b0272a0dad1a3e8de1d8c7 SHA512 889e2353bba272973ffee2af9f08dcbced890e745c7a51001bdf343ca48c7d39f11f21125917abf463aadf32f88a02df79c4e00cf59298d82624d29470a0ca90
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/appres/appres-1.0.4.ebuild b/x11-apps/appres/appres-1.0.4.ebuild
deleted file mode 100644
index e852a4932817..000000000000
--- a/x11-apps/appres/appres-1.0.4.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="list X application resource database"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-RDEPEND="x11-libs/libX11
-	x11-libs/libXt"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/editres/Manifest b/x11-apps/editres/Manifest
index 4bbf6fba63ed..30cbda289dbb 100644
--- a/x11-apps/editres/Manifest
+++ b/x11-apps/editres/Manifest
@@ -1,5 +1,3 @@
-DIST editres-1.0.6.tar.bz2 156155 BLAKE2B b36ba85cd7c58a580e682e058d81af1d0f7bef044334fb0bb799fef7778af53055b592e0c67ee1b8c116573585d7699aaf2050310994b76c9b4aef1e43d9cd47 SHA512 c070709ce926802696d43d27256cea125c04021ad7555e1ea6c90650bf9e9fdd8da7786ebc99d6cf6a2dac73db041d489d34e6b2f6ceb6b396b6e96711b1c510
 DIST editres-1.0.7.tar.bz2 166429 BLAKE2B abaa0764bfc3419e17d5cd222bbe20f5591f7bc8431444aa6739cdc067cfb81f606370df19562410aa54820a0249828ccc9d506a9607031b453a7993af634f60 SHA512 b9c928b556116bf50cf4b6ea779bdc9fedf29f5db3e6a8cc75c122578c92e1cc530a81b226ec24aad183b8ebc2de570f200314b0d9ce7883b6e3306007365b32
-EBUILD editres-1.0.6.ebuild 360 BLAKE2B 881aacc17fd0f690673511ba8a3a8ac9b9a2c0f0390600617850be576cf2244172dc745e3793f78989de6f361d94b678442b43807b2d1c92576051f78e86755b SHA512 aaa396b5816bea5057cfaeb7e502cd64527118aead063c0a976689c2903340baf1ce75728ec2432c800a60c172c4aae0796c5a8380d02d9e4b643c9b7c71592b
 EBUILD editres-1.0.7.ebuild 360 BLAKE2B 881aacc17fd0f690673511ba8a3a8ac9b9a2c0f0390600617850be576cf2244172dc745e3793f78989de6f361d94b678442b43807b2d1c92576051f78e86755b SHA512 aaa396b5816bea5057cfaeb7e502cd64527118aead063c0a976689c2903340baf1ce75728ec2432c800a60c172c4aae0796c5a8380d02d9e4b643c9b7c71592b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/editres/editres-1.0.6.ebuild b/x11-apps/editres/editres-1.0.6.ebuild
deleted file mode 100644
index 57d3582265a7..000000000000
--- a/x11-apps/editres/editres-1.0.6.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
-
-inherit xorg-2
-
-DESCRIPTION="a dynamic resource editor for X Toolkit applications"
-
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libXaw"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/ico/Manifest b/x11-apps/ico/Manifest
index 1ee23f579512..0b8233ca98d4 100644
--- a/x11-apps/ico/Manifest
+++ b/x11-apps/ico/Manifest
@@ -1,5 +1,3 @@
-DIST ico-1.0.4.tar.bz2 127619 BLAKE2B 8e9e161b2f0ae23acc989e7bd8ce70e953ffdb43e9d998d63993504073bc339b5dee85c0e5611e38a6c1b3b98a9a1067b0468c6dc3a1aaef26e38fac76efffa8 SHA512 f7200fc04e7d0442215a3fe1f53456fe6bcd14eb2e2fd048cbe7f5700ad28e10ea8ef72ab98d3cd232c801b037fdac5ac4367ba98484f2912de0715a23f82e5d
 DIST ico-1.0.5.tar.bz2 136727 BLAKE2B 6c6d0a3e9521d9dad9f17f20ca7e1ccb52da31b6a5c5879bbe3d63e58231956cb2ff665b109191185a9af8ee9d2b87f034d349d4d3b33d18dc7b52e0d0640972 SHA512 93a94a66d4a41b39d4b3657050e58f8269d352dae5d5916c9ecdda1cb14f23b9d159d67c50fdfa654b4b1c2ad11434bed140ace70703c82b05d3fe8686aab8f6
-EBUILD ico-1.0.4.ebuild 308 BLAKE2B 468613dc6e01745bff4fb99db8cac492ab296aa9d45044f58a0d228f691534adccd415554c47e1ff1f1822e491a640f6016c21fc1be003ddb1972cc501a237a3 SHA512 b55e76d19556566e052c1907d917c8a12fc2e7546172393fded38161046f8f199d01e81f9a58fd54f111f306db5aa22b547a843dd6b79f9e12a30f6b58bc44a9
 EBUILD ico-1.0.5.ebuild 308 BLAKE2B 468613dc6e01745bff4fb99db8cac492ab296aa9d45044f58a0d228f691534adccd415554c47e1ff1f1822e491a640f6016c21fc1be003ddb1972cc501a237a3 SHA512 b55e76d19556566e052c1907d917c8a12fc2e7546172393fded38161046f8f199d01e81f9a58fd54f111f306db5aa22b547a843dd6b79f9e12a30f6b58bc44a9
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/ico/ico-1.0.4.ebuild b/x11-apps/ico/ico-1.0.4.ebuild
deleted file mode 100644
index 0c60e859472d..000000000000
--- a/x11-apps/ico/ico-1.0.4.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="animate an icosahedron or other polyhedron"
-KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-linux"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/igt-gpu-tools/Manifest b/x11-apps/igt-gpu-tools/Manifest
index a24c13b489ca..b2d4ebb00093 100644
--- a/x11-apps/igt-gpu-tools/Manifest
+++ b/x11-apps/igt-gpu-tools/Manifest
@@ -1,6 +1,5 @@
-DIST igt-gpu-tools-1.24.tar.xz 1207436 BLAKE2B 0b04033be0195a4fee5611aeae2f47334ce1de5df65c652ebc0b36d1185286268bb426f472e3c1311ff576e8184e7a4efb95ef3181006ed8c448ea76452940d7 SHA512 22c25e27ead64f561fe8f46b132d6c7562a90d7bff09dc2618a532b16d7b8fdf54ed94d986a45655657b54219d350ce1b1e6c89da2b6073024e9bbe0973fa190
+AUX 1.25-python-3.9.patch 687 BLAKE2B b0abe02391df5bff2e1de47f1fea220a5dc3b9b9b0e8cd0bf7f17a7b96bd4879412c95daf2e824cb18a46ca95fae403050db4ec9054affe0a8bb10fb805383f5 SHA512 55aec8584771723fb96d5361f4588d2a1d9da1ed30832bf77a85862d5030e5a2c0e6149e3c899e2a536b7b1a252a6537fd91d1d0298eef3affa08696c220776f
 DIST igt-gpu-tools-1.25.tar.xz 1425652 BLAKE2B 1dd17e8542c126d356478acd07344d8732013a24fd180064d6f2277be76170924e7031fd2529b2aa054b40d5093d9cd95271e156bc6b97a75158c84de142f1ba SHA512 a24ee46092241da26fc2dac2b9b54c9f16f7a408c8740c9c7209e876929e2908a36261ba258ca4a4a4e4a21c1e9c919457bf98d514f81d8b7dbfcf5f89a74daf
-EBUILD igt-gpu-tools-1.24.ebuild 2509 BLAKE2B e5d7344a2cc59a3fe6f6e72abe3433fdb88344faa20b00ab11e7499b5911e734a983ea6cf64637f3e3e56df57c8a9fd766eb0832854ad2f30fc34ccf873e46e0 SHA512 2d50a2db3f8dd94138b0c7479b7a6dc5839efe4ac4c5e1cf5956db79cbb721f789d660f4f6620c8c201687e25cc6309b112d9ff2b28bde69c7fe1b964ad161ff
-EBUILD igt-gpu-tools-1.25.ebuild 2412 BLAKE2B 4c39dd0e40dc0fee05a6ca778b99fd81c1841192944323b85703182d91778e9220448c6a9883a1f6ce812801c84e152cc632115be52197536cbb67bdf09b6c94 SHA512 e9f77e2cb65a3a09cf7f3e1d6b460fa24c34b16ada0c439b6d6c2b0e183055b8f13c6ef0bc7b0280186e791e6e5e33488ee222ad484db5e5c07276e0170f83fd
+EBUILD igt-gpu-tools-1.25.ebuild 2462 BLAKE2B 1e43a538ff075d43501d925d4eb5ce8ff4968ec8d1aa98cd2444fa7f68cee117239c1fe289e62587012e8ec3ebdf495d66f202c1daa89b866cb80d068008b66b SHA512 aebf56bb749808b8e76d9d4282c18606ba5a6d595473a5b7e71a03233f874807d2563006c37fea6a9d31176421cd554c5affe84a8159ea05f18d32ba8e8dcac4
 EBUILD igt-gpu-tools-9999.ebuild 2412 BLAKE2B 4c39dd0e40dc0fee05a6ca778b99fd81c1841192944323b85703182d91778e9220448c6a9883a1f6ce812801c84e152cc632115be52197536cbb67bdf09b6c94 SHA512 e9f77e2cb65a3a09cf7f3e1d6b460fa24c34b16ada0c439b6d6c2b0e183055b8f13c6ef0bc7b0280186e791e6e5e33488ee222ad484db5e5c07276e0170f83fd
 MISC metadata.xml 724 BLAKE2B 8fc5c9e95c807af441d821433a598a79aafeb8438f04f7b1d4e6399f02f30b17c11e8a047bd29d2c1e92b2b988367202d2c1617e121c4f300d5cd3d9dc6ed9f1 SHA512 98ba85c21823801e84229fa1c0435b8bfd10c40213b52e2892dcdd958f9a52cf737fe8541b10feaf8fef1c68d96f7abacf5d1e91aa773f69182800e9da52ba7a
diff --git a/x11-apps/igt-gpu-tools/files/1.25-python-3.9.patch b/x11-apps/igt-gpu-tools/files/1.25-python-3.9.patch
new file mode 100644
index 000000000000..689dca411e5b
--- /dev/null
+++ b/x11-apps/igt-gpu-tools/files/1.25-python-3.9.patch
@@ -0,0 +1,25 @@
+manual backport of upstream commit
+https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/commit/201da47cb57b8fadd9bc45be16b82617b32a2c01
+
+--- a/docs/reference/igt-gpu-tools/generate_description_xml.py
++++ b/docs/reference/igt-gpu-tools/generate_description_xml.py
+@@ -4,7 +4,7 @@ import re
+ import sys
+ import os.path
+ import subprocess
+-import xml.etree.cElementTree as ET
++import xml.etree.ElementTree as ET
+ 
+ from collections import namedtuple
+ 
+--- a/lib/i915/perf-configs/perf-codegen.py
++++ b/lib/i915/perf-configs/perf-codegen.py
+@@ -26,7 +26,7 @@ import os
+ import sys
+ import textwrap
+ 
+-import xml.etree.cElementTree as et
++import xml.etree.ElementTree as et
+ 
+ import codegen
+ 
diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.24.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.24.ebuild
deleted file mode 100644
index 8662c0102ba5..000000000000
--- a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.24.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGIT_REPO_URI="https://gitlab.freedesktop.org/drm/${PN}.git"
-if [[ ${PV} = *9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} meson
-
-DESCRIPTION="Intel GPU userland tools"
-
-HOMEPAGE="https://01.org/linuxgraphics https://gitlab.freedesktop.org/drm/igt-gpu-tools"
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://www.x.org/releases/individual/app/${P}.tar.xz"
-fi
-LICENSE="MIT"
-SLOT="0"
-IUSE="chamelium doc man overlay runner unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xv"
-REQUIRED_USE="
-	|| ( video_cards_amdgpu video_cards_intel video_cards_nouveau )
-	overlay? (
-		video_cards_intel
-		|| ( X xv )
-	)
-"
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/elfutils
-	dev-libs/glib:2
-	sys-apps/kmod:=
-	sys-libs/libunwind:=
-	sys-libs/zlib:=
-	sys-process/procps:=
-	virtual/libudev:=
-	>=x11-libs/cairo-1.12.0[X?]
-	>=x11-libs/libdrm-2.4.82[video_cards_amdgpu?,video_cards_intel?,video_cards_nouveau?]
-	>=x11-libs/libpciaccess-0.10
-	x11-libs/pixman
-	chamelium? (
-		dev-libs/xmlrpc-c[curl]
-		sci-libs/gsl
-		media-libs/alsa-lib:=
-	)
-	overlay? (
-		>=x11-libs/libXrandr-1.3
-		xv? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXv
-		)
-	)
-	runner? ( dev-libs/json-c:= )
-	unwind? ( sys-libs/libunwind )
-	valgrind? ( dev-util/valgrind )
-	"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-util/gtk-doc-1.25-r1 )
-	man? ( dev-python/docutils )
-	overlay? (
-		>=dev-util/peg-0.1.18
-		x11-base/xorg-proto
-	)
-	video_cards_intel? (
-		sys-devel/bison
-		sys-devel/flex
-	)
-"
-
-src_prepare() {
-	sed -e "s/find_program('rst2man-3'/find_program('rst2man.py', 'rst2man-3'/" -i man/meson.build
-	default_src_prepare
-}
-
-src_configure() {
-	local gpus=""
-	use video_cards_amdgpu  && gpus+="amdgpu,"
-	use video_cards_intel   && gpus+="intel,"
-	use video_cards_nouveau && gpus+="nouveau,"
-
-	local overlay_backends=""
-	use overlay && use xv && overlay_backends+="xv,"
-	use overlay && use X && overlay_backends+="x,"
-
-	local emesonargs=(
-		$(meson_feature chamelium build_chamelium)
-		$(meson_feature doc build_docs)
-		$(meson_feature man build_man)
-		$(meson_feature overlay build_overlay)
-		$(meson_feature runner build_runner)
-		$(meson_feature doc build_tests) # Test build is required for docs
-		$(meson_feature valgrind with_valgrind)
-		$(meson_feature unwind with_libunwind)
-		-Doverlay_backends=${overlay_backends%?}
-		-Dwith_libdrm=${gpus%?}
-	)
-	meson_src_configure
-}
diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild
index b202d340de99..6bb31b86e9f1 100644
--- a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild
+++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild
@@ -73,6 +73,8 @@ DEPEND="${RDEPEND}
 	)
 "
 
+PATCHES=( "${FILESDIR}/${PV}-python-3.9.patch" )
+
 src_prepare() {
 	sed -e "s/find_program('rst2man-3'/find_program('rst2man.py', 'rst2man-3'/" -i man/meson.build
 	default_src_prepare
diff --git a/x11-apps/rgb/Manifest b/x11-apps/rgb/Manifest
index dda4404ac4d5..4cc0ad80524f 100644
--- a/x11-apps/rgb/Manifest
+++ b/x11-apps/rgb/Manifest
@@ -1,5 +1,3 @@
-DIST rgb-1.0.5.tar.bz2 130900 BLAKE2B 40675dfd862757d62cc636fe2cc3cfac25a87d863ada67e76dd9516a1607e356530b2578082b9e5cdf84d97b766c558b80f8fa919c515a5eb3da2731ac07391f SHA512 2e4ad2b0f5539375986d455b47cb5f10e50841198ee242ee430e021e9ddbffec1304259c259c7a6b7e0cd4b244ecedcb5818baac35deb4447da53c2ddba3ad43
 DIST rgb-1.0.6.tar.bz2 139225 BLAKE2B 25e20d0be23a46d869869e47169d86dd50a99bc65551bf83800119c7f9cd242f41d5ecdb611467eaf9aeba909cebbfab8f578e0a5dc63380482f324124064bb4 SHA512 92c8885a0e1482065a8b86f7be890859a5eab6b9d57ff219e916cbbd10cd185deec1c5db25dae8c405a343ab0e2ddaba3ddfe0b567d06534405f102e1845654e
-EBUILD rgb-1.0.5.ebuild 421 BLAKE2B 3e16368b4795afacc3aad5601b562419c6eee6cd61108b872763733ee8d73549ea1a5f9386de94dbc02d5972ab360f1bce2b36042b117838a513ec2f1efd6f81 SHA512 c791de01b06a977b2dd5028f1805e22de6bde5e0d6a3031290669189503216173d7e94538ce7e5c7bdc3ad4154d2a3b21a89de713360b4d088a1bd34912a3bbb
 EBUILD rgb-1.0.6.ebuild 448 BLAKE2B 420cab1dc350afb4101f5a10a0ef0b017ea43a399bbf7f8882120ffb66073166755b9e14830b3353ad99d37900d62b3445af05d80df18d27fe361b73d583e91e SHA512 4ef1435859cd5769930ae9f01213a388054020ab1e0fb2f25c00313a3ca2c56c5f63a401f2161553534d6e195b8030366dd9cb76174f88cd087e5eeafa4499c1
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/rgb/rgb-1.0.5.ebuild b/x11-apps/rgb/rgb-1.0.5.ebuild
deleted file mode 100644
index 88f8ee04ddb2..000000000000
--- a/x11-apps/rgb/rgb-1.0.5.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="uncompile an rgb color-name database"
-
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-RDEPEND=""
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/showfont/Manifest b/x11-apps/showfont/Manifest
index e15c83a3eeea..559341ba8636 100644
--- a/x11-apps/showfont/Manifest
+++ b/x11-apps/showfont/Manifest
@@ -1,5 +1,3 @@
-DIST showfont-1.0.4.tar.bz2 118199 BLAKE2B 0784e5c6a4cb2fbff460058aac958a68d788dd65fd83dd00d3dd2b59220f1279c1cfec0f86fab79ede2888c49b18f3f3eb5e73f711dd0bebb5e868c623ece01b SHA512 5514aec3eca18f714b14b60a085e7f6edafa6f661567876cbcf965d67e90f031dd02d60cc71f8f1889b8e94c99a7f4f8adc8cb3acc1054a83dc8bc36656be0cb
 DIST showfont-1.0.5.tar.bz2 125618 BLAKE2B dd3f97e3f2dff934f1cff4bfda0f8a06be3b8549b8572f3a163dbc638fa753eb14b65e8b11e19a56e687a306f3602f99b91fc458c22543d5622f870e518b77cd SHA512 d90d6d99ca573f2632435ccfd46de606994e3792deb58bab6261ff950481ec71eef032b828da0ee5333d6946c5f54594dfb2dadf930825971d3f4baa5c0ff6fd
-EBUILD showfont-1.0.4.ebuild 280 BLAKE2B 5f3e0343da41c73d391f75e228bb094650cf91cdf537e1cbd8c7cddd92ed92f4d67994dfd2b25a58dc03aa8b88bbad4a0bc6e80ee6ff01399b66f792f08e8a3a SHA512 e78c4100e6bdb4e2c4950bea79e4e10b694208a9eabae9ae7bf22beb9f927a5b23deb2935fd2f270063d730663c488ca2361b97526e440a9cc6dbc2e8fb4727e
 EBUILD showfont-1.0.5.ebuild 280 BLAKE2B 5f3e0343da41c73d391f75e228bb094650cf91cdf537e1cbd8c7cddd92ed92f4d67994dfd2b25a58dc03aa8b88bbad4a0bc6e80ee6ff01399b66f792f08e8a3a SHA512 e78c4100e6bdb4e2c4950bea79e4e10b694208a9eabae9ae7bf22beb9f927a5b23deb2935fd2f270063d730663c488ca2361b97526e440a9cc6dbc2e8fb4727e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/showfont/showfont-1.0.4.ebuild b/x11-apps/showfont/showfont-1.0.4.ebuild
deleted file mode 100644
index 08e95071467c..000000000000
--- a/x11-apps/showfont/showfont-1.0.4.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="font dumper for X font server"
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libFS"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/transset/Manifest b/x11-apps/transset/Manifest
index 8f447a33572d..8d1503efcc9a 100644
--- a/x11-apps/transset/Manifest
+++ b/x11-apps/transset/Manifest
@@ -1,5 +1,3 @@
-DIST transset-1.0.1.tar.bz2 121199 BLAKE2B 1ef56061150993bf870075c5dadf0589dc795750ce9b898a5a39a062fd14693003a4b0ab258140e87a208fb1f560742dc6217bfebaeffce98cc73d677fe015e9 SHA512 709a693cedc877f981179376105ac071ea5cf553c4388ecc7b974547050104fbc2cc64292f86f047b70acf7d85e7dca1ed7cd004b73652f4854275c8a514fd1d
 DIST transset-1.0.2.tar.bz2 127774 BLAKE2B fba4e8dc6eb3b3ea1285af9fccacc2d46cddbf17a086084c3db395bb5d78e6f13a348e2733c8b42efd2993dc053c01a4e6761c479506ba5d84a8715a956303c0 SHA512 f7a658cae70e211a0455420efbfacee0f3032821d94e7a80ec6db32ced716c1ce013f38713915505998071c312cedd1bad08575dbadfbbeb94361b048623f874
-EBUILD transset-1.0.1.ebuild 300 BLAKE2B 7eae249f4b26b9f5b2971d18644e88e46eac674049e8361a8980c28a3fc1a1a11898ad72825ec3cd93fdd0b209c139ce3a7682a2232e7d3b8bc5908b0ba44b9d SHA512 834062a86b701b476e31a9fc26bc0c935914169d99b2c191ab820860e92752ec9374b416193b0ac00acbb0893e01836d89dea0d431a8abba813809716f7c3276
 EBUILD transset-1.0.2.ebuild 300 BLAKE2B 7eae249f4b26b9f5b2971d18644e88e46eac674049e8361a8980c28a3fc1a1a11898ad72825ec3cd93fdd0b209c139ce3a7682a2232e7d3b8bc5908b0ba44b9d SHA512 834062a86b701b476e31a9fc26bc0c935914169d99b2c191ab820860e92752ec9374b416193b0ac00acbb0893e01836d89dea0d431a8abba813809716f7c3276
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/transset/transset-1.0.1.ebuild b/x11-apps/transset/transset-1.0.1.ebuild
deleted file mode 100644
index e94154a3ff15..000000000000
--- a/x11-apps/transset/transset-1.0.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="An utility for setting opacity property"
-
-LICENSE="SGI-B-2.0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xdpyinfo/Manifest b/x11-apps/xdpyinfo/Manifest
index a6c66ad7a806..d83ae36c8d61 100644
--- a/x11-apps/xdpyinfo/Manifest
+++ b/x11-apps/xdpyinfo/Manifest
@@ -1,5 +1,3 @@
-DIST xdpyinfo-1.3.1.tar.bz2 136412 BLAKE2B 6c9750a0c9690f6c5cebf3551f6ed77b4504e1ec31685c698abb5963b571d214d4647f3b1b11837e3df645becc468bd9f0275616527519693011d7e3168051a3 SHA512 1d9f5948f04bf555181f7989bd25dd4559226f757a8452493cfa7ba0ed33112502df28ea702e48c384e801360ea1b6374a1e3f626bd56b7a855016c12b7ad927
 DIST xdpyinfo-1.3.2.tar.bz2 141351 BLAKE2B b2dee4f424dee902c31430b8843c14d6836508ee0125db7de41f5e9faef1732dea571e90b37638cc90dabd3995a0ceb5e4094707138b7e066ee1ae856258503c SHA512 2c9097c13778c7a7fe5a9b3ee04b28512ff6028231eca91ecdf6104c742be470678920d37a4f540fece7e39dccbea34802271f359ab80618027b2856c8912e7d
-EBUILD xdpyinfo-1.3.1.ebuild 770 BLAKE2B c0d25e2b7713d6b2dabe70ca563c9f766ca7d3e01c3594d0b6e24f5b3b685122a1c0f9632883a78b67f22e4be36d47d169a93ebec2ee4101923aa29b6e92fc8d SHA512 3a22f19002266c5de95025ecdc1684315d7df4e7b3868c7d33e23674b7bc52f614767dd94e4dd40f5559c616a528867f84b7c8744e3c891cca178b50d684844e
 EBUILD xdpyinfo-1.3.2.ebuild 770 BLAKE2B c0d25e2b7713d6b2dabe70ca563c9f766ca7d3e01c3594d0b6e24f5b3b685122a1c0f9632883a78b67f22e4be36d47d169a93ebec2ee4101923aa29b6e92fc8d SHA512 3a22f19002266c5de95025ecdc1684315d7df4e7b3868c7d33e23674b7bc52f614767dd94e4dd40f5559c616a528867f84b7c8744e3c891cca178b50d684844e
 MISC metadata.xml 347 BLAKE2B 0496b148ad07710139de96e153b80e6035e6731a18d6e8a4dce75dd17bdfc54ad77276f1f82791393d198e96c9306f464dbce832b4d643b6285fb9a6d92e6261 SHA512 98174497a1f55be4b14d769ec110dafd63a8942eb8f51e2953237b76705128e47bd36a39b9c25985cdd99a3b431f3d5aa856fd634b2a2fbfc1a5cc13a3826fab
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild
deleted file mode 100644
index d69f224bd74b..000000000000
--- a/x11-apps/xdpyinfo/xdpyinfo-1.3.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=5
-inherit xorg-2
-
-DESCRIPTION="Display information utility for X"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt"
-IUSE="dga dmx xinerama"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libXxf86vm
-	x11-libs/libxcb
-	dga? ( x11-libs/libXxf86dga )
-	dmx? ( x11-libs/libdmx )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		"--without-xf86misc"
-		$(use_with dga)
-		$(use_with dmx)
-		$(use_with xinerama)
-	)
-
-}
diff --git a/x11-apps/xdriinfo/Manifest b/x11-apps/xdriinfo/Manifest
index 40aa560def16..17b27a499e1e 100644
--- a/x11-apps/xdriinfo/Manifest
+++ b/x11-apps/xdriinfo/Manifest
@@ -1,5 +1,3 @@
-DIST xdriinfo-1.0.5.tar.bz2 121276 BLAKE2B c6db6dfd5ff0f5f6106f92ad42b37e18cc148d156a5e294c497f4ac84226114bcb7d7666196b4b1e1b4471108f839c03d4a2e1dc19080af0d60c5cfb10b55463 SHA512 6b7a3641f488d305f950c494464fd4b674ab3aaed5c7159d6d8ddad4587c18d680e5854bd80666444f1dee52eb4f46b45709a6d9c333593fe045c73e738524de
 DIST xdriinfo-1.0.6.tar.bz2 123636 BLAKE2B 43e15c6833ad84760c89abff272864e13b777c01796ba119fbc7fa7165ab05cf5a090cf736f618a25385b5d5a8cf2d679fbe2cd55119842fcf9e16fdb46dd549 SHA512 7ddd9e19abaef93e4d85004293528ec3814ef84c470d496dbb8dc8313d804bb7520406de8d33d2bc2b3af942bd0a5d5032a109b2726438a966af63ea680a102f
-EBUILD xdriinfo-1.0.5.ebuild 488 BLAKE2B 8ae51a2973054db0c3b86d6d2a3686a505b391759d34fbb342f2290d5375b303119b3bd981879994a8072d71c5bfff9a22b4a4c13c76418e6ae03f9371969be6 SHA512 228b45aef3a668d593068efea63583a1d3c9462eb46785b97bdd4de39a8e7f891fad5fc545dd8ba1b9c0b21b3257fb7d188a4ba1b29f725ead4c2b6a647616f1
 EBUILD xdriinfo-1.0.6.ebuild 487 BLAKE2B 16bcb26d0f5b423b5ecf408f0a404f3d74b80e61aa31ef9c69158cd91ede416a4b3da19c2f9e9ea3f3bebf616097eb397658b01979922f5be638c2b2f4cef66a SHA512 5ad5730a20da542453e6006fc6730465d0f69ef6d12beb6d6d7de9fa1fd469636c0d273dae84f5b18ecfe15b561984127fb2a0e02cdbc1f726091d0334b40eca
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild
deleted file mode 100644
index 9fc1ba2196ef..000000000000
--- a/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2 flag-o-matic multilib
-
-DESCRIPTION="query configuration information of DRI drivers"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	virtual/opengl"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-pkg_setup() {
-	xorg-2_pkg_setup
-
-	append-cppflags "-I${EPREFIX}/usr/$(get_libdir)/opengl/xorg-x11/include/"
-
-}
diff --git a/x11-apps/xedit/Manifest b/x11-apps/xedit/Manifest
index e9250a08fe0b..73badcb3a3e9 100644
--- a/x11-apps/xedit/Manifest
+++ b/x11-apps/xedit/Manifest
@@ -1,5 +1,3 @@
-DIST xedit-1.2.1.tar.bz2 520614 BLAKE2B d3ffca5517472d4b5f80e6ab84cb79af216493a81d951ae30d28babcca7847ad638d179e237579a20589c96f10b0cf61be13bb7d0f40461be077ced63e37de58 SHA512 8c0675e39219ce4da02f2fc09ba39a5ff774213d155ad2dfd55e7672ab896219e815b12a4a86f3c72dfd6fd32e75bcdaaefdecab81fa5a10aebf0ed6b88e5af7
 DIST xedit-1.2.2.tar.bz2 525861 BLAKE2B 608f3f2b06d14f99a71d9eaf45114ba71271957f584c685236bd78e2f7c9a6e969ce15de72a7530a41835b951caa800a7cb0c45d71a4790aab5fe703d654e912 SHA512 24d8e23a2ad1a2e81f6606928bb032f25b70b76da83b65341367bc4111d011abe89f9e30402d057854f2ccdaa9c1ef0d7c55bf29b81ab2d050a8f448cf3eeb5d
-EBUILD xedit-1.2.1.ebuild 324 BLAKE2B 83699ba439c013e06faba5f06e033eca6087273dbb318229e5770073a46a4a55abd21d639e594d0d23471b592b25be3b27470e2656f4bb9b0c2904f3d1bed524 SHA512 d58047c0c951d451a5f4c36391d6d4fe2dc76a27f259bed693f898ce7d60cd587fd24bda0ad02d50a670e10408406f31003b8a282278a2e616e0996cdb184161
 EBUILD xedit-1.2.2.ebuild 328 BLAKE2B f9b7e390f9eff8be5f2262dfae0a2f5e26f9b121a48dad5f9f88168bcfb725b5d36d11283629b2de6b0fc1d65787242214e8ea8552295949ce048c21215141cb SHA512 eacc68fb84e56b72f33a8688a6244f1c7f900581cf090b01f14ace402208c917ae826839503ccad12f543f6b70248d44455c28ad6992e74e79ca2f85c9754d5c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xedit/xedit-1.2.1.ebuild b/x11-apps/xedit/xedit-1.2.1.ebuild
deleted file mode 100644
index 59948aca9294..000000000000
--- a/x11-apps/xedit/xedit-1.2.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="simple text editor for X"
-KEYWORDS="amd64 hppa ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xeyes/Manifest b/x11-apps/xeyes/Manifest
index 2e99665899c3..7fb4ba0d60be 100644
--- a/x11-apps/xeyes/Manifest
+++ b/x11-apps/xeyes/Manifest
@@ -1,5 +1,3 @@
-DIST xeyes-1.1.1.tar.bz2 113757 BLAKE2B eed50677718223be829fed869360dc2ed98252a2e0a335403b8e680bd5a47cb96d92a762899e46a8823a260dda4be7ae98b45208c87c80a833ab8929056df427 SHA512 3cb734239fa3180a9cc0eb2564c5a04f5e5c64ea314079c0604cebdbb821132f95a2c113dab476af8820308f0e6dbd4eac02b5da45dc2ed78a5d3ca010453618
 DIST xeyes-1.1.2.tar.bz2 133160 BLAKE2B c3f31a2df7988517e4f8903fce6b0cbfbaad01e84d89c7b9f7755eccebba95fbb8b75377644ae97f090e9f4a3a245698966e78f738275f7513f5927193b5dd19 SHA512 008d76f03ddabd3d86ad9e52a540504553b94cb7a6743b20cf08897549eb27505667365ab9af21956a1b5ec7297acca8903a326536e6195a30e643cd93297ee0
-EBUILD xeyes-1.1.1.ebuild 452 BLAKE2B e99e2740d8dfd5f30393a263c09e5a59701d7aec3a5400edb3dd225413bc6ab591058bee228bff9757ad1f376468cf9a20b4fc61f94af0bcce1cb412e6ef5650 SHA512 bc8e8fa591327740bd354cbd8230aaaaab198b3cb58cba65a1c33e4e7027876d19d62b62875b38605ad2b630e0ff34ae2b72c45e4220813cf3c823066f815ef8
 EBUILD xeyes-1.1.2.ebuild 451 BLAKE2B fb2fa73ff85c4e02bddd8133922afe8c9dbf917946ef275fd61ec2af820d42b2e13fde5c52a48ebc87b01178e91e7f637e084d28b4b154ef757d815e762e8394 SHA512 4b76f8871c1384647fd7b758f310c7e8aab5b8f3d32a1a2fae87ae99d9ea42bca8cdedf7acfce497e6927fa4759af845eec670edc4e639c5ddbdefdc2538bc2b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xeyes/xeyes-1.1.1.ebuild b/x11-apps/xeyes/xeyes-1.1.1.ebuild
deleted file mode 100644
index acf3b255cb6e..000000000000
--- a/x11-apps/xeyes/xeyes-1.1.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=5
-
-inherit xorg-2
-
-DESCRIPTION="X.Org xeyes application"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc64-solaris"
-IUSE=""
-RDEPEND="x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXrender"
-DEPEND="${RDEPEND}"
-
-XORG_CONFIGURE_OPTIONS="--with-xrender"
diff --git a/x11-apps/xfontsel/Manifest b/x11-apps/xfontsel/Manifest
index f5dba55711fe..8011ec411022 100644
--- a/x11-apps/xfontsel/Manifest
+++ b/x11-apps/xfontsel/Manifest
@@ -1,5 +1,3 @@
-DIST xfontsel-1.0.5.tar.bz2 139801 BLAKE2B dc3c9f8b893434923f414a9bb2a8608cba1eafc7ad915cbd6231763892608cebcba8147a02250719ed4fb5881389467ab375a7777f904248047d369533949713 SHA512 df7a49286b94f64c610ab990d66376dedc12e3e8fa1d803641f466c3f6ebfdd06e81e4c7be39f8e6234928305f397d877579c39cf24c319dd5deead56f2578a4
 DIST xfontsel-1.0.6.tar.bz2 146469 BLAKE2B 9773430e51e63d23086403f91fd78f6ed2e7f3abf144fda5bba171d05145026d233474e9d055b31bd498a861994c4f59af52a8101fc1e10b891ea879cb2f0bb9 SHA512 2f6bc51549a302404cdaf9a5a825add383953fcbb2a0c7076691cefd4dd7e4a3c772c047be74101c8486f75d03ce0bd3e65ede14e91732cf2a932810441c9099
-EBUILD xfontsel-1.0.5.ebuild 408 BLAKE2B edb05263c134839517f8e8225152f11cacbd43f31b6d44139416f102355d574afba703d31b7fb96f8af39910ee80d8f0786f8143d1fcbfd82276710566cbb4ed SHA512 738c3a9496e1b461ffef774c8ce2117abd2f685cc6246108af56aa9ee05bbf1aa543b21e77589a2417435a605c6879642d7c64ea37179beb8bc77dfe7b214dc2
 EBUILD xfontsel-1.0.6.ebuild 408 BLAKE2B edb05263c134839517f8e8225152f11cacbd43f31b6d44139416f102355d574afba703d31b7fb96f8af39910ee80d8f0786f8143d1fcbfd82276710566cbb4ed SHA512 738c3a9496e1b461ffef774c8ce2117abd2f685cc6246108af56aa9ee05bbf1aa543b21e77589a2417435a605c6879642d7c64ea37179beb8bc77dfe7b214dc2
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xfontsel/xfontsel-1.0.5.ebuild b/x11-apps/xfontsel/xfontsel-1.0.5.ebuild
deleted file mode 100644
index 0b56c5402146..000000000000
--- a/x11-apps/xfontsel/xfontsel-1.0.5.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
-
-inherit xorg-2
-
-DESCRIPTION="point and click selection of X11 font names"
-
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xgc/Manifest b/x11-apps/xgc/Manifest
index d504ce11fca3..87ba25d1af53 100644
--- a/x11-apps/xgc/Manifest
+++ b/x11-apps/xgc/Manifest
@@ -1,5 +1,3 @@
-DIST xgc-1.0.4.tar.bz2 180138 BLAKE2B 97082987e557963e714b5ec96c3d1106e9ecdc7d832f948c8205965363968b6db9de81229b126cb6f9098dd9ee0c00b353022410b88fb73cce8d382ddafc15d8 SHA512 c2156eb1c6dcc838d9b21ac9e45b188a92dadc991875c3c9497a18bae36212c01cf4c2c6df04830664da4e010880d2d84663e00aaa5e17082211ba969d480390
 DIST xgc-1.0.5.tar.bz2 188307 BLAKE2B 8e3906ee07898c1382c692d3ccb7541de40be55dbc88c0ed40ab3e78a638c6e475bf38f3a34d626507d34270208cc59cb7bdf727869c9907a00fca6280b5b39e SHA512 5943d13b9e0ed5e1b66d26eaa4b39d16d71f0df23e3ea93bfc397b6303516b161c2b60b24679ed75b640bf2493e66682d35efc7cedd41c5b57caa65f309a8314
-EBUILD xgc-1.0.4.ebuild 288 BLAKE2B 9e538dbafd2e5305fc7fe7b2fb036f34c8f29e0a5440a8d49e66250acf8d69b5648fc38602961da63b5ee16cac93aea3f5b68d9b62f083f3e93161f1566aa05e SHA512 f5790d680dbbad3c26604959c70eda871b90ebd1db17ed3ba28a1a96f635a28546b99beb09f84128c870e81418504b30d526fd36773ef2b8a7b21b570c1a8255
 EBUILD xgc-1.0.5.ebuild 288 BLAKE2B 9e538dbafd2e5305fc7fe7b2fb036f34c8f29e0a5440a8d49e66250acf8d69b5648fc38602961da63b5ee16cac93aea3f5b68d9b62f083f3e93161f1566aa05e SHA512 f5790d680dbbad3c26604959c70eda871b90ebd1db17ed3ba28a1a96f635a28546b99beb09f84128c870e81418504b30d526fd36773ef2b8a7b21b570c1a8255
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xgc/xgc-1.0.4.ebuild b/x11-apps/xgc/xgc-1.0.4.ebuild
deleted file mode 100644
index b9a84142818a..000000000000
--- a/x11-apps/xgc/xgc-1.0.4.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X graphics demo"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libXt"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xinput_calibrator/Manifest b/x11-apps/xinput_calibrator/Manifest
index 08775f62d0a1..e5bc4baa31ae 100644
--- a/x11-apps/xinput_calibrator/Manifest
+++ b/x11-apps/xinput_calibrator/Manifest
@@ -1,3 +1,3 @@
 DIST xinput_calibrator-0.7.5.tar.gz 355313 BLAKE2B 72c6b2f1b2cf4d5baaba27827e870adb52c4a51004a9a3f51376c5e30560b26abe6e83a94ae2e308a01dca3204a1938d888d40cad793cce50c1d9acea9f507b3 SHA512 dc022f4de6d7b57912373a571ef0598c7b9d91cdbc3f63bb2b32c6149e43f67eaf820dc0289349d527314381d5195cf8891f6bcb9847110662dd75875f76b9de
-EBUILD xinput_calibrator-0.7.5-r1.ebuild 733 BLAKE2B 843320ced66cf3883d4eaca06b851a144936ad9f0b8381c7c78cd46ce8ed18ebc59aeaccd4e421cc7a964134081640ec09d29300120d7599f18d9cac8a66a037 SHA512 00a9130509313ecc73171f18ef6aec5ec5ddef785794e644b44c66d5d8b9d4d9391759f938530d6f7a9fadc7e9c481e7b85546db289716d527551e109bea1810
+EBUILD xinput_calibrator-0.7.5-r2.ebuild 638 BLAKE2B fb71f6c2669d13d8d99bf53889d258da5a5df152ae6a44ea5db998ebe33331f3b7fdf9bd12986ad6d0499ca33761e74007e0da9e27219f81eaa68a31f244e316 SHA512 c80d656103dc1db39d04c04ebbfbcadde634a720c3f44db836f2cd592029521970e2c6864de96a292a3b5bba7922d2f436cf4bf6221861694a7e3788551e8d65
 MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-apps/xinput_calibrator/xinput_calibrator-0.7.5-r1.ebuild b/x11-apps/xinput_calibrator/xinput_calibrator-0.7.5-r1.ebuild
deleted file mode 100644
index a2641d8d82db..000000000000
--- a/x11-apps/xinput_calibrator/xinput_calibrator-0.7.5-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools-utils flag-o-matic
-
-DESCRIPTION="A generic touchscreen calibration program for X.Org"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/xinput_calibrator"
-SRC_URI="https://github.com/downloads/tias/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
-IUSE="gtk"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr
-	gtk? ( dev-cpp/gtkmm:2.4 )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_configure() {
-	append-cxxflags -std=c++11 #566594
-
-	local myeconfargs=(
-		--with-gui=$(use gtk && echo "gtkmm" || echo "x11")
-	)
-	autotools-utils_src_configure
-}
diff --git a/x11-apps/xinput_calibrator/xinput_calibrator-0.7.5-r2.ebuild b/x11-apps/xinput_calibrator/xinput_calibrator-0.7.5-r2.ebuild
new file mode 100644
index 000000000000..7a3d3101534e
--- /dev/null
+++ b/x11-apps/xinput_calibrator/xinput_calibrator-0.7.5-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+DESCRIPTION="A generic touchscreen calibration program for X.Org"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/xinput_calibrator"
+SRC_URI="https://github.com/downloads/tias/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+src_configure() {
+	append-cxxflags -std=c++11 #566594
+
+	local myconf=(
+		--with-gui=x11
+	)
+	econf "${myconf[@]}"
+}
diff --git a/x11-apps/xkill/Manifest b/x11-apps/xkill/Manifest
index 4575ed871e5f..14ad5eebe144 100644
--- a/x11-apps/xkill/Manifest
+++ b/x11-apps/xkill/Manifest
@@ -1,5 +1,3 @@
-DIST xkill-1.0.4.tar.bz2 124828 BLAKE2B 4d7484a6e044f2a93d7d54f25619c08f657cc34955cd399e927442d8e8d79f3ad983020f75a3edb57e91371f4693909fae28b1ebf8f1e78189868c79c3ac5e87 SHA512 14d1fc0eff96a62d66307f09efc599639ee70be4bf580e2857569326881bfdcae7a8a21640509875218dd2b88575b4801ab0c43c4295550dc71141a579483545
 DIST xkill-1.0.5.tar.bz2 128146 BLAKE2B a01b954872eaad2aefe11335df2c85972abb8d36ae0c00fbca02b5af2d7df57934e3ddc47455f88927a90b0bff5ed707ca6dddbbf5478c89b193c98a86cc0562 SHA512 4603a1794f114f5cea2c885020c9d073c8421d1e785c99ff6b936ae97139c8dac8020a187b5bbd0fa6d56ed6fab879441b42ba900cc5f2f5a534dafdc86b9249
-EBUILD xkill-1.0.4.ebuild 361 BLAKE2B c8514bf71107186edbb6fd362e2eacafe43c88df1cfb5cce48967857906031962eb6e921974e59a4190ac74ec2df6a6b86ae53b5fed8169bde2ea5dcdcc1314d SHA512 7e5fd914df7b5ccda284bd836a947a648f7fc30aea92c9a24df6803701b86b0d8f5bc8a8d7efd54629d2ed32fee0f9d6a64237143ea9bde3bca178e59e85b3bd
 EBUILD xkill-1.0.5.ebuild 361 BLAKE2B c8514bf71107186edbb6fd362e2eacafe43c88df1cfb5cce48967857906031962eb6e921974e59a4190ac74ec2df6a6b86ae53b5fed8169bde2ea5dcdcc1314d SHA512 7e5fd914df7b5ccda284bd836a947a648f7fc30aea92c9a24df6803701b86b0d8f5bc8a8d7efd54629d2ed32fee0f9d6a64237143ea9bde3bca178e59e85b3bd
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkill/xkill-1.0.4.ebuild b/x11-apps/xkill/xkill-1.0.4.ebuild
deleted file mode 100644
index 73e70b238b47..000000000000
--- a/x11-apps/xkill/xkill-1.0.4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="kill a client by its X resource"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-winnt"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmessage/Manifest b/x11-apps/xmessage/Manifest
index dfe8102ba6ac..67a78e2f7272 100644
--- a/x11-apps/xmessage/Manifest
+++ b/x11-apps/xmessage/Manifest
@@ -1,5 +1,3 @@
-DIST xmessage-1.0.4.tar.bz2 125011 BLAKE2B 4b1134ac3dcb6a696ba75dddb3fcd348222763c375067279e4d6af41c3c2c855249cd76b888693a5c0136144071acb628c0e3a653ce0afed70d0e6910d055a4f SHA512 a087fb09595bf0b188a4525b45e9b607acd063cceae36c69c78a48674fb7eca1c82d5c2d2770c7f4425b499e4c002bfc0e377935308c218a330a2b4994b94ebd
 DIST xmessage-1.0.5.tar.bz2 133393 BLAKE2B afa42e20ba995fa1086cd3cee5b90be8564c521f7bc12b544a787cc753782e1cfdbc5a94f5925f5bae1b630b7ac08fcaeee59e319f680d3be29c46d5421aa048 SHA512 a8423c3986b1576fa67800c315a605a527bb9a8f594ac269a736ae7b91eed0d4d83deb89148197dc3cd3f0e51894146958ce2979f78e97dcdb99c5326e34dabe
-EBUILD xmessage-1.0.4.ebuild 467 BLAKE2B 7e2319114b6f99b51b2722f41ef1a3d974093b5cdb0e2fd535c554275f1ad49fece8bcede6bf6104b1baef84ee7ba45ce81e83d8492743333ff4f42dbc4015f5 SHA512 cb3a3a18e82937ffe15afb001b9d458cee3e45b1a7553d38d9140dc550265af85f3c3e70dd7ce8ec27da776c6b2d1f01349951b08484fd71a45e6184893288f0
 EBUILD xmessage-1.0.5.ebuild 465 BLAKE2B d1a59adab2833e5f41f30199f6248803c1afa2cd92e8450670be1793ff91615eab4fec15c513fb4b4c116b0c115c8334ebf59d562f5754525d493d9bbf2daf38 SHA512 3bfe38dfb10ec1a58565fe93bbaeecd67f56bf99479612e77b946b8021e0d106455e09c4d23d7779ee29b6347f894fe7e7d1628767be32a9d48c66f4ac9f4e4a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xmessage/xmessage-1.0.4.ebuild b/x11-apps/xmessage/xmessage-1.0.4.ebuild
deleted file mode 100644
index aeffb7fd02d3..000000000000
--- a/x11-apps/xmessage/xmessage-1.0.4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="display a message or query in a window (X-based /bin/echo)"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libXt"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xrefresh/Manifest b/x11-apps/xrefresh/Manifest
index 839a595842a6..a49bf4412820 100644
--- a/x11-apps/xrefresh/Manifest
+++ b/x11-apps/xrefresh/Manifest
@@ -1,5 +1,3 @@
-DIST xrefresh-1.0.5.tar.bz2 120757 BLAKE2B 5c29df155649998cc18e607267f140e59fc50df063d1ba26440103c71c998050f4a0e940ef87a78ceeb3f350e9340fea3813c204548d5f506cb8c014be9362e0 SHA512 287d167cd167aa35cfc89364bf4e74313137ce47978419446c60cb915188c34051f95d4900d0d5dcf692173f31e00e2699d70e54b79f0b21a59b4694be744014
 DIST xrefresh-1.0.6.tar.bz2 127494 BLAKE2B 587f5756bbd3095e77494288d4b9cca99992b342bb718e5cadefdfbf018710ce0f216f43b68814d0d0a681c87d855be4ecf199a314361278c3bfdd81e6073f69 SHA512 361e97fecfc2706d5eeab69df0d4dd4baa55b6783cfddabf51d8561b7c930d71ce6c217e0512c6564208d69b04f89c69ea8c0bfb2e4f6cc25b062b55e4db3674
-EBUILD xrefresh-1.0.5.ebuild 311 BLAKE2B 45cf2d160fecc68de4a809e919064626840e1d1d5b91e8ee3c7245421c17be4193c3e499a2ba9ca797cf36ae76589295d591cddb7422cd12c6b812df2b85f878 SHA512 86af2598d1b33cb66210bb0389aeedfae44c5f7e241bfb791c32ef47574ed7d875e95b915f36737ac5a9254c2545e355d0ab0a4acdf410da03e315fef6aaf635
 EBUILD xrefresh-1.0.6.ebuild 311 BLAKE2B 45cf2d160fecc68de4a809e919064626840e1d1d5b91e8ee3c7245421c17be4193c3e499a2ba9ca797cf36ae76589295d591cddb7422cd12c6b812df2b85f878 SHA512 86af2598d1b33cb66210bb0389aeedfae44c5f7e241bfb791c32ef47574ed7d875e95b915f36737ac5a9254c2545e355d0ab0a4acdf410da03e315fef6aaf635
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xrefresh/xrefresh-1.0.5.ebuild b/x11-apps/xrefresh/xrefresh-1.0.5.ebuild
deleted file mode 100644
index 50dafaff47e6..000000000000
--- a/x11-apps/xrefresh/xrefresh-1.0.5.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="refresh all or part of an X screen"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xset/Manifest b/x11-apps/xset/Manifest
index 17c57e307758..261514186ad0 100644
--- a/x11-apps/xset/Manifest
+++ b/x11-apps/xset/Manifest
@@ -1,5 +1,3 @@
-DIST xset-1.2.3.tar.bz2 142286 BLAKE2B 83ba3d7ccc259ae7b244049e558af6db9428b897b340537b75b6c534c7e8a11f36709237982ffe1ab5b523cef5834467bdc85c94fbe07c64d6eab6eef2c930b2 SHA512 7b2cf4b06b93aec9f6f868be3f0932a5d6e62968485f7eb742a9b775059aa2a49c9170404e0597fd41a5730c0bf321e371ee6b23bbcde3be054f768ab8d3d92a
 DIST xset-1.2.4.tar.bz2 145546 BLAKE2B df4ae52046af7f632e2f60386bd3b8d90b27db3e53ceb68f1056c9c5df2ee9c6d83d109a444eb99ddc031e35b91db0249ee56eba3180bc9a8a002935db213605 SHA512 f24714c9a82081a09d3054bbad98553de9366992f22eaf3e2bcadbb58fad1d3dad2547fef6fa9898d8a9df064573c29df9d82a5c801fa92248604c95f65dc83d
-EBUILD xset-1.2.3.ebuild 481 BLAKE2B 77a6667b5a60dc600a0b8020a1a81054588a0ba0c9abb8a1f8794855d50c146adf9527912bf22ac23158bfcd17e0078a9827132c4b05bcb4ce4668d9ae464635 SHA512 4feed7e94b16ac0847dfd2560ce9b4f65f151b82bbfdb79f4f6a5d2788dab4cf4cb4bd2e5fdcdf7783d3bec12d9a9c4525862efe0a2c51f0a83a17525eefd698
 EBUILD xset-1.2.4.ebuild 480 BLAKE2B ad32f3f8d9dabb9ff8df650df24a515c0738dad789ffebb85803bf64850ba4774a0120eda3d89ebda7aad64ea20d9b937be25fa0a8f7ea3c76bf2355d01655a3 SHA512 f5047ae36a8ca04fc6d9c446ef8b004eaf032703f5aba18cd6c4d13f665d3e588e6a4dae2c5dadcf735e79b7f82f4e5044126dd6a6481d043599c06a20ff6f75
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xset/xset-1.2.3.ebuild b/x11-apps/xset/xset-1.2.3.ebuild
deleted file mode 100644
index eeed78e4c258..000000000000
--- a/x11-apps/xset/xset-1.2.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X.Org xset application"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXext"
-DEPEND="${RDEPEND}"
-
-XORG_CONFIGURE_OPTIONS=(
-	--without-xf86misc
-	--without-fontcache
-)
diff --git a/x11-apps/xsetroot/Manifest b/x11-apps/xsetroot/Manifest
index f20e75852f59..312611e4b616 100644
--- a/x11-apps/xsetroot/Manifest
+++ b/x11-apps/xsetroot/Manifest
@@ -1,5 +1,3 @@
-DIST xsetroot-1.1.1.tar.bz2 119977 BLAKE2B 7589dc6014c2f905dce4bc72c4a98096eba38354975c307408e1aeb06e27cafcf64ecda7f8e3a470ac25e41108b3aac688fa9d365a3ab41908a52d8044142712 SHA512 04834a8ca658a4aabe03e62588353102e8019d424e25fab450d48e6fc4ac358df5bb98a850c82c61e2495faabfe54f3d92d9563e77c83ace7fd69c278edbbd64
 DIST xsetroot-1.1.2.tar.bz2 129091 BLAKE2B 0bd0615f64c636eaad7ed1b83d49208e9065edf7583bcd7e5d4c5d2f1a1eca4c7692209a540cab823c35497696176f4925afecaaf843610f6e9485cd3724f1cb SHA512 0b9df1b72305e5c24f1e1664578aa4411a5ffcdc5d318458117594e641f01c34700205b0d16c08abf4a8106d36128ccdbe1ea1f1035fce9018d6b52801a8b72b
-EBUILD xsetroot-1.1.1.ebuild 384 BLAKE2B 763932128c9c3842e531a9f45e7c89c894acb5afbc5a211c7daaff5f258a92cf52fb9276245574e955af7ed856ced35fb7fe69922da4e066a2baf066e0788f3f SHA512 2f4cbd0535c35b04592688d4e714cdd0b391efafe637258a068b79945b21f2c803964c1b051fc1034ffb7635b2a999ee04ac734cff04da4996becbe3042c6402
 EBUILD xsetroot-1.1.2.ebuild 383 BLAKE2B 95775973ad5582592f6b97f221035905501faa09b906b65e4601837616a3b47bab7b4a3ebc5971cacaee9e2a13b1015724963378b296b7f099ed4b6c0e4fd19c SHA512 bac08c9f5ca3e31211ed7465c028fe1af3819bc4e4fc21006204a83f2476b38e2680a8d1fe239c640aa1c3e163523ac21bfe0caffc8a5c790c018cb6ce3834fb
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xsetroot/xsetroot-1.1.1.ebuild b/x11-apps/xsetroot/xsetroot-1.1.1.ebuild
deleted file mode 100644
index 485282c50133..000000000000
--- a/x11-apps/xsetroot/xsetroot-1.1.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X.Org xsetroot application"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-RDEPEND="x11-libs/libXmu
-	x11-libs/libX11
-	x11-misc/xbitmaps
-	x11-libs/libXcursor"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xsm/Manifest b/x11-apps/xsm/Manifest
index 1deb543afa38..b056583a6f56 100644
--- a/x11-apps/xsm/Manifest
+++ b/x11-apps/xsm/Manifest
@@ -1,5 +1,3 @@
-DIST xsm-1.0.3.tar.bz2 161012 BLAKE2B 2628e4234b5fed58ebefb35f454c36e268c75cafa784ed709833d5979ee4484ada8f315d75b6204e64a0efd0f1fd7a14662afb430c0e84bc81a40eefda9380cf SHA512 930a12272011ddd7c60e62b32b485c383292163f8aed6086c756f71cece62d0c316d89a6056751818b3b0ee26f68cca6e0fc914cd58d9b20da0a3b7ccf2145f0
 DIST xsm-1.0.4.tar.bz2 170933 BLAKE2B 05cf4614440f36da6ed1e8e0949ef6955da03d1fe0cc2d0323150b34ea01c293301aa49006a93fe7c44c842db41fb6b66a2f4a4051ddf2258143e54a6e99b390 SHA512 d4e4da7c309a4eae126d2b58a13684f4dbc06b09f76dde9c89c707375df2843614f3d83bc44f9cd02f239200db3397abd86796dca0dbafc69f60482b0af5a176
-EBUILD xsm-1.0.3.ebuild 821 BLAKE2B 4160b60d92cf42db9b26bb82aac3c0c222e9706c0b0e9139d93f64797b6348ce5f8b88f29c65cf197583d215fa9a5b4e07148effffbd493e161501d987648c07 SHA512 28e16468be7bd7795edcfbea7c876982c3a0c5ffe1ecee8b71b50ba63dfd2d7dbdd3bf4ca24a65472863d8f3f55cd53a3e146b9c763d930835d3d42901bf3cae
 EBUILD xsm-1.0.4.ebuild 819 BLAKE2B 26991d3f723feb4c99e2be8b30f25ca766317d3861697fdcde15c55f1e65192ef922a88640477ec1d59b82c964e6f06768437fc32c97da5551fd1001c1232672 SHA512 e51bac35c0f0eac4e80f7ee7a83f9418b4713d459660722785cf9ccecb24c0c53d16fce3d76e576e7faf77c6fdd372ef2fb1acfcdb16d09745e5d33d5576047e
 MISC metadata.xml 333 BLAKE2B 0b142d7cf4b255c50a9e616434af7ff1db6a2aa0d3467f43d3e22ce6ce55a1bae7ab18eaf092bd5ca002464dc046bc2de62b3738425cdecf4ad15727b20f2d18 SHA512 5496dab87579d1d5c218ddd1ef1e8b63e73ed8d0e695d3be9577d862fc03a775b9cd3dc82abd356c1ef124522f4ed07a5f289e5e3355bb76c2d8746e6cf5a7c2
diff --git a/x11-apps/xsm/xsm-1.0.3.ebuild b/x11-apps/xsm/xsm-1.0.3.ebuild
deleted file mode 100644
index ac51d3e44362..000000000000
--- a/x11-apps/xsm/xsm-1.0.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X Session Manager"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="rsh"
-RDEPEND="x11-libs/libXaw
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libICE
-	x11-libs/libSM
-	rsh? ( net-misc/netkit-rsh )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	# (#158056) /usr/$(get_libdir)/X11/xsm could be a symlink
-	local XSMPATH="${EROOT}usr/$(get_libdir)/X11/xsm"
-	if [[ -L ${XSMPATH} ]]; then
-		einfo "Removing symlink ${XSMPATH}"
-		rm -f ${XSMPATH} || die "failed to remove symlink ${XSMPATH}"
-	fi
-	xorg-2_pkg_setup
-}
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS="$(use_with rsh rsh /usr/bin/rsh)"
-	xorg-2_src_configure
-}
diff --git a/x11-apps/xwd/Manifest b/x11-apps/xwd/Manifest
index a6a566f19c03..29f5d34b4f73 100644
--- a/x11-apps/xwd/Manifest
+++ b/x11-apps/xwd/Manifest
@@ -1,5 +1,3 @@
-DIST xwd-1.0.6.tar.bz2 144548 BLAKE2B 56560a36931d15f6f59d6c6548325e559534cee10cb13b07722bce5b47d7d2360244b29e88a66a58ffffd2209336f0ffb14cbabb0369c144ceeeabb4eb184b06 SHA512 8fb86cbe163631fdb3f49ad6bb648ea599d7c5f9b11aba7e88afb86daed34cab88dcba057e0c5ca3e4e5904598b279f5a68ad43a64dd1053d647aa78523a806f
 DIST xwd-1.0.7.tar.bz2 148026 BLAKE2B 9088105a07db38418352cccafaee4ecc084940e031416358291e6b5a6f47b2c8972928f0eb3479db4ff93b3a54a24ea4231f4d8196464f14ac4d7a1b5bb7ecce SHA512 6fdb0a115ae505169bbc7fcc45580daf26bced2e26e0bf9a877636016038931a8386e8edcbe015f4024be508d0461906adef4834cf22a445e3c282f0b8fad17e
-EBUILD xwd-1.0.6.ebuild 438 BLAKE2B ee537e795d13cc8b49464a555ea4f81169848fc1cc9b0777949ea0d8a630001e45eac206343b3ab2a19d8a169f80de765332d69549103b38704deaef8b1626bd SHA512 eb338d80b5aa7a5b1fc80b9398d096e260f67ad5a3ffda75318e0c45c65e4a80b4ad6eb4d204a9c3f5b9a422c325a6e3ac75ab31a729e43146647a3b6feac950
 EBUILD xwd-1.0.7.ebuild 438 BLAKE2B ee537e795d13cc8b49464a555ea4f81169848fc1cc9b0777949ea0d8a630001e45eac206343b3ab2a19d8a169f80de765332d69549103b38704deaef8b1626bd SHA512 eb338d80b5aa7a5b1fc80b9398d096e260f67ad5a3ffda75318e0c45c65e4a80b4ad6eb4d204a9c3f5b9a422c325a6e3ac75ab31a729e43146647a3b6feac950
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xwd/xwd-1.0.6.ebuild b/x11-apps/xwd/xwd-1.0.6.ebuild
deleted file mode 100644
index 8cadf6a8f429..000000000000
--- a/x11-apps/xwd/xwd-1.0.6.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="dump an image of an X window"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-# libXt dependency is not in configure.ac, bug #408629, upstream #47462."
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXt
-	x11-libs/libxkbfile"
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 69fda0de4474..58ce47fb6933 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xorg-proto/Manifest b/x11-base/xorg-proto/Manifest
index e5d7240a8326..8727e17ad97b 100644
--- a/x11-base/xorg-proto/Manifest
+++ b/x11-base/xorg-proto/Manifest
@@ -1,6 +1,4 @@
-DIST xorgproto-2019.2.tar.gz 1080686 BLAKE2B 4e0218ef02a8df5220431ae36ac1bc8feaa2bfdefe784f9b7393fe1d27db5b39ba90a38a3570bd78279964c5842ea65df3724b2407535a43fd867922156d92e9 SHA512 3385e7eb8ae1384aa01945c7f5a300884a1deb8d564ab62bd5bcaa3703d3dbf9bbc19797ac17d19e15417bf8456f706f993e90ece2d34cc94046ac302c062cbe
 DIST xorgproto-2020.1.tar.gz 1081369 BLAKE2B 1bed8d65499926a830180ee1fce5e5e57a276a6412231508eabb6c5eea5ee20dcce4046fc82203d5be88d1f24fb7919289393551d339e5cf5cb80b1c14f22c42 SHA512 d0bc3aec517fd00fa5fd32a5715760c34810a19154e10fb1f92f2e2fe7f26136f7ba9b76b47fcd37c3c4796663154f4e5abf6a18dd634619b0f718f3e4737ae9
-EBUILD xorg-proto-2019.2.ebuild 1839 BLAKE2B c947dc68efd80041ebd656d6f11887a741b8f1bb9fe683d55ac02b92ee1e7788d2d0754ad59135c6086b6dc845509669ab74b0ba2bd89dacfe41ef674b20b6d7 SHA512 872d2677772d953c2dcfe0ea4ca2ddab3e3fab5632d0114c80e59a2d2ca407573ee3bc824d95093cf9a6db44aedfbf7c07babeffbbaa2fbd8978e32327e59714
-EBUILD xorg-proto-2020.1.ebuild 755 BLAKE2B 78ad2c14548024da40c6ed9e0c866ed6e50fa4fd62a242cbebf5d984977e88c971a556027b9d813cd3c96cf1321d3b2630f4706684ad01c4b417fef465fcc130 SHA512 e8975be4fd553e4f9c1d037267671fc05aee7cd0ef3ea23f7dce18544bf9eb41d6be2a61e1aaa8ce34e692517f9a23029c1858e75373ac0046c3d7574a0dae7c
+EBUILD xorg-proto-2020.1.ebuild 753 BLAKE2B 04833bf3cc86366ca8531bf47d0d848a800c7f674485e199fb5cee3a17175e65dedc82018a7d9dff6836d439d36c2c386f734436fe7b10dafc317e6e21d53fd7 SHA512 d9cea847d178dfc3d5979feb6dd375e78d8c1f78807fd5fc4ec29c4ab86ae502c5c5cd07c7aabd1ab5e6fdd1a3b2a8ee3e49e5643fad7c878f85c20e6e6ed7d8
 EBUILD xorg-proto-9999.ebuild 762 BLAKE2B 96107b11d3dad0edd79ab67b513a3c1a0624aeb15514312f691546acbd9d9e9f2a6f4fc9b18cf0cd52a0fe5c99712e7181def059941fb0480fad9a2759c561ee SHA512 929ae7dc0cf21a197556c3e383a3ffc6bd631ef17a01ba9be4c08e47d80e49e8c4345dd3226abb38e8cc5d99a7c0c59e5c8a6911b937974134ce7f139215c57f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-base/xorg-proto/xorg-proto-2019.2.ebuild b/x11-base/xorg-proto/xorg-proto-2019.2.ebuild
deleted file mode 100644
index 60cb600fe9e3..000000000000
--- a/x11-base/xorg-proto/xorg-proto-2019.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/xorg-/xorg}"
-MY_P="${MY_PN}-${PV}"
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/${MY_PN}.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} meson
-
-DESCRIPTION="X.Org combined protocol headers"
-HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	!<x11-proto/bigreqsproto-1.1.2-r1
-	!<x11-proto/compositeproto-0.4.2-r2
-	!<x11-proto/damageproto-1.2.1-r2
-	!<x11-proto/dmxproto-2.3.1-r2
-	!<x11-proto/dri2proto-2.8-r2
-	!<x11-proto/dri3proto-1.0-r1
-	!<x11-proto/fixesproto-5.0-r2
-	!<x11-proto/fontsproto-2.1.3-r1
-	!<x11-proto/glproto-1.4.17-r2
-	!<x11-proto/inputproto-2.3.2-r1
-	!<x11-proto/kbproto-1.0.7-r1
-	!<x11-proto/presentproto-1.1-r1
-	!<x11-proto/randrproto-1.5.0-r1
-	!<x11-proto/recordproto-1.14.2-r2
-	!<x11-proto/renderproto-0.11.1-r2
-	!<x11-proto/resourceproto-1.2.0-r1
-	!<x11-proto/scrnsaverproto-1.2.2-r2
-	!<x11-proto/trapproto-3.4.3-r1
-	!<x11-proto/videoproto-2.3.3-r1
-	!<x11-proto/xcmiscproto-1.2.2-r1
-	!<x11-proto/xextproto-7.3.0-r1
-	!<x11-proto/xf86bigfontproto-1.2.0-r2
-	!<x11-proto/xf86dgaproto-2.1-r3
-	!<x11-proto/xf86driproto-2.1.1-r2
-	!<x11-proto/xf86miscproto-0.9.3-r1
-	!<x11-proto/xf86vidmodeproto-2.3.1-r2
-	!<x11-proto/xineramaproto-1.2.1-r2
-	!<x11-proto/xproto-7.0.31-r1
-
-	!x11-proto/fontcacheproto
-	!x11-proto/xf86rushproto"
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
diff --git a/x11-base/xorg-proto/xorg-proto-2020.1.ebuild b/x11-base/xorg-proto/xorg-proto-2020.1.ebuild
index 5f5e70e4ff2c..18d16318e037 100644
--- a/x11-base/xorg-proto/xorg-proto-2020.1.ebuild
+++ b/x11-base/xorg-proto/xorg-proto-2020.1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 fi
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 2514ac973ddb..d3df35b081af 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -3,11 +3,9 @@ AUX xdm.confd-4 573 BLAKE2B 0c2a282acc851b95f925715c31915be469ef3758bbaa800d5fc5
 AUX xdm.initd-11 6033 BLAKE2B 713aa81380124326f3dce3604c44e943578d37d0c83b60778b4e1ffd3d7eec3f84014fcbd221ba4bd2b9839989f8a1aa21e76dbc3612436e4a9b3091cbd7714e SHA512 f1174938e91c323174efedfc332097fc802a1261b882b7ac7b39a8251f7c70908e037335d4ae542652afe8162e1c0f0312ebbaebc8b7c4b036abd94d1d1f64bb
 AUX xorg-server-1.12-unloadsubmodule.patch 1373 BLAKE2B 4c6017bcdc53964ecc796e1beaf8a8714a85f1cfe65032df3e9ea23378b4d2db0057ea7a75ab00e8d5d89ae0d63c766dce05350446f69ffe69bb668d06e2e68b SHA512 a6a8ebbb1005f2ea9cfdfc928209a23fe213caab31a889c3290f14bcae0a9afd40176330e2e56cb5ff986d522505e7fb98fa0c71187f403e2afd33c9c919780e
 AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 BLAKE2B 69ba852b425d652ebb83d116cabbf92d1530d2c616910ddbb96fb574cdad8d3f1ce2b4fcf9fb16aa2950b40a0723c9d00465d8e6d72299f1ea181a257d014c80 SHA512 5cd0a4ce9c2efef7abc84df805a3c6da33bd64fdb16c3aa2fa61da4f805605a3d12cab0f452d3bc217b6e5d5d5bea29c9f3bf262e46347a074770ebd75ddf5b5
-AUX xorg-server-1.20.7-Fix-building-with-fno-common.patch 8302 BLAKE2B e37c79e8d14955328243ff61b38a85f809d840b8dca68cd1b7336cffd3bbd2c014b76fe6ed0000b1eb4090d51d917d0cd3e3aae6c3d6e385a062d147310d1de8 SHA512 028c9812a4e059f3feedeb5fbf47d43489bd670751ba893e51b732559d172c4762d0c6d0699113d4fe4a18bba2f579d1ea574ccd719366820c7ea1816fa584b9
 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
-DIST xorg-server-1.20.7.tar.bz2 6303005 BLAKE2B 343ebc1ff45fc1cd459b204d92eabdd0629c94d4338d2d7cb635f73642080d07ef174cfbd83e5b7f253f2918af2d1efbe99d7c75720b88857f69093ee0be1b65 SHA512 c67612e379111c28c68941c0a660abf72be7669591b41ccaa3b3474c4540a03822a28d892831b12ce08bac6e5e7e33504c2d19ef2a0c2298f83bd083459f96f5
 DIST xorg-server-1.20.8.tar.bz2 6309640 BLAKE2B 0dadd3a7afdb768bcd79f99f3670f7efcb919c43ea88870c93df598b080fbbec48f88cfa996fb7bff2363cffe70d42d9b154855691a64ddb26156f1b378512a0 SHA512 ab0ec0fcbf490c61558b9297f61b58fd2dedb676c78bef6431dc9166054743b43a0091b88a8b3f4e81d1f539909440ee7e188a298cefabe13ea89159639cd805
-EBUILD xorg-server-1.20.7.ebuild 6032 BLAKE2B 60913a727294a25aa348f596f5972ceeb6664ddddd2c1ef71ad6d1ec72b66daec05e1720c1db1ed6f8bced458304f373fbc3a0c9d041cb19242a568e54f451bf SHA512 e00b1b1056a577534c05d45bce9c93924773ab7748f94cde57bdefcf7bc6671a640ffdd389edc128735a3e63cebabe947692464190bb8961f6bc423ef368bc16
-EBUILD xorg-server-1.20.8.ebuild 5737 BLAKE2B 0ed225a48df9bfec9e6fd0960d51394a61a917e357a78594dd3d6948cd7ab3fa623d024d6fcb4cfe85dabc6b8500bb4a6648130421a70a1c44522689e6a92155 SHA512 a0f6dee6e5f2a0fc4956649f1868597be5be1b18800ff34f10ad4412dc14503728b429ca191006de9b64a85a2a8f826e676f99a383ee7ad0b755ee08eb19dc29
-EBUILD xorg-server-9999.ebuild 5740 BLAKE2B 74acdd4654eb23b4deb59a6719065d1a2bb3dced48053f56feb52349be571d8169474e8bf1a7090d5d42c65d00376f25f1ace4bae796f7a895b692a37ebb713e SHA512 ea0b4720399c43bd219ff8819cb0e1b338695357f6f8eb6852189dea6894bdf9879d6f8c92053a8222b560281dc4403124c06bc86b91c022cd936df4217aa7f2
+EBUILD xorg-server-1.20.8-r1.ebuild 5811 BLAKE2B abf1dbfda5e29fb8117f875bfdc0462d93a9720eb1e81dbcd195e3f62539abfbcd7a07ee2ba50f0314b4ae25091b048bd19ff005650ee761d70bebe682031209 SHA512 456f9e7f0c90bdda43743bd51954cdd9c95c886d3aabf227dd2bb5367f9b96c35d21d15b3cb93d9a9724e5d8eab0c2b09ebed8fe2dc435b1a5e4f871cc315d3b
+EBUILD xorg-server-1.20.8.ebuild 5735 BLAKE2B a2b0cb465f0f4f6f8de29dad64192a9bf94a39828167b68c690fe4589487314c60c5099c16f7aa5797bae912a3543b0c525962d06fe0e09a603e00d9d825356e SHA512 2e15a579b0791ff13f885915f62ef3d9dc5c3547103e95dbff6393369c0f8321f51d609255b0149fd2bbd99d610497aecb2b7686163fe0491e5e7167e4293e29
+EBUILD xorg-server-9999.ebuild 5808 BLAKE2B 3cd072b5853a72c7aa0b6b3e9c0294e6b5d8df75199d66b512cded99a002205d5e6d3e258ddfd52780f016a4af7103e6424053ce25a532535073dc4e0750d4e5 SHA512 8c1e986e785e77a3f2031d4d48c911697b31642c52cf176de251fbff7368b09b12e1e29327f8a5a453ec8ac255e3dc12df98d438f3b10677779e98b7f1402e1b
 MISC metadata.xml 952 BLAKE2B 48b5bada3b2b3b16ef4806f028b8fe47a4d5cd0d19783ebb585f0389f51df589d3f53c5bff5f5ed883ad61c7e7be0fef94fd5cf11042e23dea5e456faf0a927c SHA512 34955c04ee1488a09997d0d9caf63c9202023d06e0524b74120c5c1def033d9dbc2ce82a5d4c289a6fd98df83e2e09ad54e6a084d164d2416228628df7874198
diff --git a/x11-base/xorg-server/files/xorg-server-1.20.7-Fix-building-with-fno-common.patch b/x11-base/xorg-server/files/xorg-server-1.20.7-Fix-building-with-fno-common.patch
deleted file mode 100644
index d3011fcb255e..000000000000
--- a/x11-base/xorg-server/files/xorg-server-1.20.7-Fix-building-with-fno-common.patch
+++ /dev/null
@@ -1,254 +0,0 @@
-From 1610ef1d6b5ba99da9d1a639f3b65b2e61514a7d Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Fri, 24 Jan 2020 12:49:44 +0100
-Subject: [PATCH xserver] Fix building with `-fno-common`
-
-* GCC 10 will switch the default to `-fno-common`.
-  https://gcc.gnu.org/PR85678
-
-Bug: https://bugs.gentoo.org/705880
-Signed-off-by: Matt Turner <mattst88@gmail.com>
----
- hw/dmx/config/dmxconfig.c                | 2 +-
- hw/dmx/config/xdmxconfig.c               | 2 +-
- hw/dmx/glxProxy/glxext.c                 | 2 --
- hw/xwayland/xwayland.c                   | 2 +-
- test/misc.c                              | 2 +-
- test/xi1/protocol-xchangedevicecontrol.c | 2 +-
- test/xi2/protocol-common.c               | 2 ++
- test/xi2/protocol-common.h               | 2 +-
- test/xi2/protocol-xigetclientpointer.c   | 2 +-
- test/xi2/protocol-xigetselectedevents.c  | 2 +-
- test/xi2/protocol-xipassivegrabdevice.c  | 2 +-
- test/xi2/protocol-xiquerydevice.c        | 2 +-
- test/xi2/protocol-xiquerypointer.c       | 2 +-
- test/xi2/protocol-xiqueryversion.c       | 2 +-
- test/xi2/protocol-xiselectevents.c       | 2 +-
- test/xi2/protocol-xisetclientpointer.c   | 2 +-
- test/xi2/protocol-xiwarppointer.c        | 2 +-
- 17 files changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/hw/dmx/config/dmxconfig.c b/hw/dmx/config/dmxconfig.c
-index c1a9e1cf3..85bc0dbe4 100644
---- a/hw/dmx/config/dmxconfig.c
-+++ b/hw/dmx/config/dmxconfig.c
-@@ -72,7 +72,7 @@ typedef struct DMXConfigCmdStruct {
-     DMXConfigList *xinputs;
- } DMXConfigCmd, *DMXConfigCmdPtr;
- 
--DMXConfigEntryPtr dmxConfigEntry;
-+extern DMXConfigEntryPtr dmxConfigEntry;
- static DMXConfigCmd dmxConfigCmd;
- 
- static int dmxDisplaysFromCommandLine;
-diff --git a/hw/dmx/config/xdmxconfig.c b/hw/dmx/config/xdmxconfig.c
-index 49e4b5459..05d839688 100644
---- a/hw/dmx/config/xdmxconfig.c
-+++ b/hw/dmx/config/xdmxconfig.c
-@@ -65,7 +65,7 @@ extern FILE *yyin;
- #define DMX_CANVAS_WIDTH  400
- #define DMX_CANVAS_HEIGHT 500
- 
--DMXConfigEntryPtr dmxConfigEntry;
-+extern DMXConfigEntryPtr dmxConfigEntry;
- static DMXConfigVirtualPtr dmxConfigCurrent, dmxConfigNewVirtual;
- static DMXConfigDisplayPtr dmxConfigCurrentDisplay, dmxConfigNewDisplay;
- static int dmxConfigGrabbed, dmxConfigGrabbedFine;
-diff --git a/hw/dmx/glxProxy/glxext.c b/hw/dmx/glxProxy/glxext.c
-index 49848bbff..ca9780f99 100644
---- a/hw/dmx/glxProxy/glxext.c
-+++ b/hw/dmx/glxProxy/glxext.c
-@@ -47,8 +47,6 @@
- #include "extinit.h"
- #include "glx_extinit.h"
- 
--int noGlxExtension;
--
- /*
- ** Forward declarations.
- */
-diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
-index feb1058b7..5fefa5923 100644
---- a/hw/xwayland/xwayland.c
-+++ b/hw/xwayland/xwayland.c
-@@ -40,7 +40,7 @@
- 
- #ifdef XF86VIDMODE
- #include <X11/extensions/xf86vmproto.h>
--_X_EXPORT Bool noXFree86VidModeExtension;
-+extern _X_EXPORT Bool noXFree86VidModeExtension;
- #endif
- 
- #ifdef XWL_HAS_GLAMOR
-diff --git a/test/misc.c b/test/misc.c
-index 3c669b677..f1f76cccd 100644
---- a/test/misc.c
-+++ b/test/misc.c
-@@ -33,7 +33,7 @@
- 
- #include "tests-common.h"
- 
--ScreenInfo screenInfo;
-+extern ScreenInfo screenInfo;
- 
- static void
- dix_version_compare(void)
-diff --git a/test/xi1/protocol-xchangedevicecontrol.c b/test/xi1/protocol-xchangedevicecontrol.c
-index 57a15c407..54f1f67cb 100644
---- a/test/xi1/protocol-xchangedevicecontrol.c
-+++ b/test/xi1/protocol-xchangedevicecontrol.c
-@@ -37,7 +37,7 @@
- 
- #include "protocol-common.h"
- 
--ClientRec client_window;
-+extern ClientRec client_window;
- static ClientRec client_request;
- 
- static void
-diff --git a/test/xi2/protocol-common.c b/test/xi2/protocol-common.c
-index 8cd85dd05..05dd3c4e7 100644
---- a/test/xi2/protocol-common.c
-+++ b/test/xi2/protocol-common.c
-@@ -45,6 +45,8 @@ static ClientRec server_client;
- 
- void *global_userdata;
- 
-+void (*reply_handler) (ClientPtr client, int len, char *data, void *userdata);
-+
- int enable_GrabButton_wrap = 1;
- int enable_XISetEventMask_wrap = 1;
- 
-diff --git a/test/xi2/protocol-common.h b/test/xi2/protocol-common.h
-index 8490529ad..742ce348f 100644
---- a/test/xi2/protocol-common.h
-+++ b/test/xi2/protocol-common.h
-@@ -99,7 +99,7 @@ extern void *global_userdata;
-  * The reply handler called from WriteToClient. Set this handler if you need
-  * to check the reply values.
-  */
--void (*reply_handler) (ClientPtr client, int len, char *data, void *userdata);
-+extern void (*reply_handler) (ClientPtr client, int len, char *data, void *userdata);
- 
- /**
-  * The default screen used for the windows. Initialized by init_simple().
-diff --git a/test/xi2/protocol-xigetclientpointer.c b/test/xi2/protocol-xigetclientpointer.c
-index 9c38bd720..244e8438f 100644
---- a/test/xi2/protocol-xigetclientpointer.c
-+++ b/test/xi2/protocol-xigetclientpointer.c
-@@ -46,7 +46,7 @@ static struct {
-     int win;
- } test_data;
- 
--ClientRec client_window;
-+extern ClientRec client_window;
- static ClientRec client_request;
- 
- static void
-diff --git a/test/xi2/protocol-xigetselectedevents.c b/test/xi2/protocol-xigetselectedevents.c
-index 9a0fac5d4..b14100224 100644
---- a/test/xi2/protocol-xigetselectedevents.c
-+++ b/test/xi2/protocol-xigetselectedevents.c
-@@ -60,7 +60,7 @@ static struct {
-     int mask_len;
- } test_data;
- 
--ClientRec client_window;
-+extern ClientRec client_window;
- 
- /* AddResource is called from XISetSEventMask, we don't need this */
- Bool
-diff --git a/test/xi2/protocol-xipassivegrabdevice.c b/test/xi2/protocol-xipassivegrabdevice.c
-index c703a1ee8..142bcecb7 100644
---- a/test/xi2/protocol-xipassivegrabdevice.c
-+++ b/test/xi2/protocol-xipassivegrabdevice.c
-@@ -41,7 +41,7 @@
- 
- #include "protocol-common.h"
- 
--ClientRec client_window;
-+extern ClientRec client_window;
- static ClientRec client_request;
- 
- #define N_MODS 7
-diff --git a/test/xi2/protocol-xiquerydevice.c b/test/xi2/protocol-xiquerydevice.c
-index a068038fd..6ee8a80fc 100644
---- a/test/xi2/protocol-xiquerydevice.c
-+++ b/test/xi2/protocol-xiquerydevice.c
-@@ -54,7 +54,7 @@ struct test_data {
-     int num_devices_in_reply;
- };
- 
--ClientRec client_window;
-+extern ClientRec client_window;
- 
- static void reply_XIQueryDevice_data(ClientPtr client, int len, char *data,
-                                      void *closure);
-diff --git a/test/xi2/protocol-xiquerypointer.c b/test/xi2/protocol-xiquerypointer.c
-index ed75d7910..0f5a2b57a 100644
---- a/test/xi2/protocol-xiquerypointer.c
-+++ b/test/xi2/protocol-xiquerypointer.c
-@@ -41,7 +41,7 @@
- 
- #include "protocol-common.h"
- 
--ClientRec client_window;
-+extern ClientRec client_window;
- static ClientRec client_request;
- static void reply_XIQueryPointer_data(ClientPtr client, int len,
-                                       char *data, void *closure);
-diff --git a/test/xi2/protocol-xiqueryversion.c b/test/xi2/protocol-xiqueryversion.c
-index 3ce758faa..c7ddbfc10 100644
---- a/test/xi2/protocol-xiqueryversion.c
-+++ b/test/xi2/protocol-xiqueryversion.c
-@@ -58,7 +58,7 @@ struct test_data {
-     int minor_expected;
- };
- 
--ClientRec client_window;
-+extern ClientRec client_window;
- 
- static void
- reply_XIQueryVersion(ClientPtr client, int len, char *data, void *closure)
-diff --git a/test/xi2/protocol-xiselectevents.c b/test/xi2/protocol-xiselectevents.c
-index f136c23d0..06050ade7 100644
---- a/test/xi2/protocol-xiselectevents.c
-+++ b/test/xi2/protocol-xiselectevents.c
-@@ -62,7 +62,7 @@
- 
- static unsigned char *data[4096 * 20];  /* the request data buffer */
- 
--ClientRec client_window;
-+extern ClientRec client_window;
- 
- int
- __real_XISetEventMask(DeviceIntPtr dev, WindowPtr win, ClientPtr client,
-diff --git a/test/xi2/protocol-xisetclientpointer.c b/test/xi2/protocol-xisetclientpointer.c
-index 6584bb9cc..ddc9f0000 100644
---- a/test/xi2/protocol-xisetclientpointer.c
-+++ b/test/xi2/protocol-xisetclientpointer.c
-@@ -48,7 +48,7 @@
- 
- #include "protocol-common.h"
- 
--ClientRec client_window;
-+extern ClientRec client_window;
- static ClientRec client_request;
- 
- static void
-diff --git a/test/xi2/protocol-xiwarppointer.c b/test/xi2/protocol-xiwarppointer.c
-index 8484d54e5..e5c2f31ea 100644
---- a/test/xi2/protocol-xiwarppointer.c
-+++ b/test/xi2/protocol-xiwarppointer.c
-@@ -44,7 +44,7 @@
- static int expected_x = SPRITE_X;
- static int expected_y = SPRITE_Y;
- 
--ClientRec client_window;
-+extern ClientRec client_window;
- 
- /**
-  * This function overrides the one in the screen rec.
--- 
-2.24.1
-
diff --git a/x11-base/xorg-server/xorg-server-1.20.7.ebuild b/x11-base/xorg-server/xorg-server-1.20.7.ebuild
deleted file mode 100644
index ded98b6f8b90..000000000000
--- a/x11-base/xorg-server/xorg-server-1.20.7.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_DOC=doc
-inherit xorg-3 multilib flag-o-matic
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug elogind ipv6 libressl +libglvnd minimal selinux +suid systemd +udev unwind xcsecurity"
-
-CDEPEND="libglvnd? (
-		media-libs/libglvnd[X]
-		!app-eselect/eselect-opengl
-		!!x11-drivers/nvidia-drivers[-libglvnd(-)]
-	)
-	!libglvnd? ( >=app-eselect/eselect-opengl-1.3.0	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/rgb-1.0.3
-	>=x11-apps/xauth-1.0.3
-	x11-apps/xkbcomp
-	>=x11-libs/libdrm-2.4.89
-	>=x11-libs/libpciaccess-0.12.901
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont2-2.0.1
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-libs/xtrans-1.3.5
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-	dmx? (
-		x11-libs/libXt
-		>=x11-libs/libdmx-1.0.99.1
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXaw-1.0.4
-		>=x11-libs/libXext-1.0.99.4
-		>=x11-libs/libXfixes-5.0
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXmu-1.0.3
-		x11-libs/libXrender
-		>=x11-libs/libXres-1.0.3
-		>=x11-libs/libXtst-1.0.99.2
-	)
-	kdrive? (
-		>=x11-libs/libXext-1.0.5
-		x11-libs/libXv
-	)
-	xephyr? (
-		x11-libs/libxcb[xkb]
-		x11-libs/xcb-util
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-	!minimal? (
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXext-1.0.5
-		>=media-libs/mesa-18[X(+),egl,gbm]
-		>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	)
-	udev? ( virtual/libudev:= )
-	unwind? ( sys-libs/libunwind )
-	wayland? (
-		>=dev-libs/wayland-1.3.0
-		>=media-libs/libepoxy-1.5.4[egl(+)]
-		>=dev-libs/wayland-protocols-1.18
-	)
-	>=x11-apps/xinit-1.3.3-r1
-	systemd? (
-		sys-apps/dbus
-		sys-apps/systemd
-	)
-	elogind? (
-		sys-apps/dbus
-		sys-auth/elogind
-		sys-auth/pambase[elogind]
-	)
-	"
-
-DEPEND="${CDEPEND}
-	sys-devel/flex
-	>=x11-base/xorg-proto-2018.4
-	dmx? (
-		doc? (
-			|| (
-				www-client/links
-				www-client/lynx
-				www-client/w3m
-			)
-		)
-	)"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-xserver )
-"
-
-PDEPEND="
-	xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )"
-
-REQUIRED_USE="!minimal? (
-		|| ( ${IUSE_SERVERS} )
-	)
-	elogind? ( udev )
-	?? ( elogind systemd )
-	minimal? ( !wayland )
-	xephyr? ( kdrive )"
-
-UPSTREAMED_PATCHES=(
-	"${FILESDIR}"/${P}-Fix-building-with-fno-common.patch
-)
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
-	# needed for new eselect-opengl, bug #541232
-	"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
-)
-
-pkg_setup() {
-	if use wayland && use minimal; then
-		ewarn "glamor is necessary for acceleration under Xwayland."
-		ewarn "Performance may be unacceptable without it."
-		ewarn "Build with USE=-minimal to enable glamor."
-	fi
-
-	# localstatedir is used for the log location; we need to override the default
-	#	from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	# NOTE: fop is used for doc generating; and I have no idea if Gentoo
-	#	package it somewhere
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable debug)
-		$(use_enable dmx)
-		$(use_enable kdrive)
-		$(use_enable unwind libunwind)
-		$(use_enable wayland xwayland)
-		$(use_enable !minimal record)
-		$(use_enable !minimal xfree86-utils)
-		$(use_enable !minimal dri)
-		$(use_enable !minimal dri2)
-		$(use_enable !minimal dri3)
-		$(use_enable !minimal glamor)
-		$(use_enable !minimal glx)
-		$(use_enable xcsecurity)
-		$(use_enable xephyr)
-		$(use_enable xnest)
-		$(use_enable xorg)
-		$(use_enable xvfb)
-		$(use_enable udev config-udev)
-		$(use_with doc doxygen)
-		$(use_with doc xmlto)
-		$(usex !elogind $(use_enable systemd systemd-logind) '--enable-systemd-logind')
-		$(use_with systemd systemd-daemon)
-		$(usex suid $(use_enable systemd suid-wrapper) '--disable-suid-wrapper')
-		$(usex suid $(use_enable !systemd install-setuid) '--disable-install-setuid')
-		--enable-libdrm
-		--sysconfdir="${EPREFIX}"/etc/X11
-		--localstatedir="${EPREFIX}"/var
-		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
-		--with-xkb-output="${EPREFIX}"/var/lib/xkb
-		--disable-config-hal
-		--disable-linux-acpi
-		--without-dtrace
-		--without-fop
-		--with-os-vendor=Gentoo
-		--with-sha1=libcrypto
-	)
-}
-
-src_configure() {
-	# Needed since commit 2a1a96d956f4 ("glamor: Add a function to get the
-	# driver name via EGL_MESA_query_driver") neglected to add autotools
-	# support
-	append-cflags -DGLAMOR_HAS_EGL_QUERY_DRIVER
-
-	xorg-3_src_configure
-}
-
-src_install() {
-	xorg-3_src_install
-
-	server_based_install
-
-	if ! use minimal && use xorg; then
-		# Install xorg.conf.example into docs
-		dodoc "${S}"/hw/xfree86/xorg.conf.example
-	fi
-
-	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
-	newinitd "${FILESDIR}"/xdm.initd-11 xdm
-	newconfd "${FILESDIR}"/xdm.confd-4 xdm
-
-	# install the @x11-module-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-
-	find "${ED}"/var -type d -empty -delete || die
-}
-
-pkg_postinst() {
-	if ! use minimal; then
-		# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
-		if ! use libglvnd; then
-			eselect opengl set xorg-x11 --use-old
-		fi
-	fi
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
-	fi
-}
-
-server_based_install() {
-	if ! use xorg; then
-		rm "${ED}"/usr/share/man/man1/Xserver.1x \
-			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${ED}"/usr/share/man/man1/Xserver.1x
-	fi
-}
diff --git a/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild b/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild
new file mode 100644
index 000000000000..8aae610d6d0e
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_DOC=doc
+inherit xorg-3 multilib flag-o-matic
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
+
+DESCRIPTION="X.Org X servers"
+SLOT="0/${PV}"
+if [[ ${PV} != 9999* ]]; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl +libglvnd minimal selinux suid systemd +udev unwind xcsecurity"
+
+CDEPEND="libglvnd? (
+		media-libs/libglvnd[X]
+		!app-eselect/eselect-opengl
+		!!x11-drivers/nvidia-drivers[-libglvnd(-)]
+	)
+	!libglvnd? ( >=app-eselect/eselect-opengl-1.3.0	)
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	>=x11-apps/iceauth-1.0.2
+	>=x11-apps/rgb-1.0.3
+	>=x11-apps/xauth-1.0.3
+	x11-apps/xkbcomp
+	>=x11-libs/libdrm-2.4.89
+	>=x11-libs/libpciaccess-0.12.901
+	>=x11-libs/libXau-1.0.4
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXfont2-2.0.1
+	>=x11-libs/libxkbfile-1.0.4
+	>=x11-libs/libxshmfence-1.1
+	>=x11-libs/pixman-0.27.2
+	>=x11-libs/xtrans-1.3.5
+	>=x11-misc/xbitmaps-1.0.1
+	>=x11-misc/xkeyboard-config-2.4.1-r3
+	dmx? (
+		x11-libs/libXt
+		>=x11-libs/libdmx-1.0.99.1
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXaw-1.0.4
+		>=x11-libs/libXext-1.0.99.4
+		>=x11-libs/libXfixes-5.0
+		>=x11-libs/libXi-1.2.99.1
+		>=x11-libs/libXmu-1.0.3
+		x11-libs/libXrender
+		>=x11-libs/libXres-1.0.3
+		>=x11-libs/libXtst-1.0.99.2
+	)
+	kdrive? (
+		>=x11-libs/libXext-1.0.5
+		x11-libs/libXv
+	)
+	xephyr? (
+		x11-libs/libxcb[xkb]
+		x11-libs/xcb-util
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-keysyms
+		x11-libs/xcb-util-renderutil
+		x11-libs/xcb-util-wm
+	)
+	!minimal? (
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXext-1.0.5
+		>=media-libs/mesa-18[X(+),egl,gbm]
+		>=media-libs/libepoxy-1.5.4[X,egl(+)]
+	)
+	udev? ( virtual/libudev:= )
+	unwind? ( sys-libs/libunwind )
+	wayland? (
+		>=dev-libs/wayland-1.3.0
+		>=media-libs/libepoxy-1.5.4[egl(+)]
+		>=dev-libs/wayland-protocols-1.18
+	)
+	>=x11-apps/xinit-1.3.3-r1
+	systemd? (
+		sys-apps/dbus
+		sys-apps/systemd
+	)
+	elogind? (
+		sys-apps/dbus
+		sys-auth/elogind
+		sys-auth/pambase[elogind]
+	)
+	"
+
+DEPEND="${CDEPEND}
+	sys-devel/flex
+	>=x11-base/xorg-proto-2018.4
+	dmx? (
+		doc? (
+			|| (
+				www-client/links
+				www-client/lynx
+				www-client/w3m
+			)
+		)
+	)"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-xserver )
+"
+
+PDEPEND="
+	xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )"
+
+REQUIRED_USE="!minimal? (
+		|| ( ${IUSE_SERVERS} )
+	)
+	elogind? ( udev )
+	?? ( elogind systemd )
+	minimal? ( !wayland )
+	xephyr? ( kdrive )"
+
+UPSTREAMED_PATCHES=(
+)
+
+PATCHES=(
+	"${UPSTREAMED_PATCHES[@]}"
+	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
+	# needed for new eselect-opengl, bug #541232
+	"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
+)
+
+pkg_setup() {
+	if use wayland && use minimal; then
+		ewarn "glamor is necessary for acceleration under Xwayland."
+		ewarn "Performance may be unacceptable without it."
+		ewarn "Build with USE=-minimal to enable glamor."
+	fi
+
+	# localstatedir is used for the log location; we need to override the default
+	#	from ebuild.sh
+	# sysconfdir is used for the xorg.conf location; same applies
+	# NOTE: fop is used for doc generating; and I have no idea if Gentoo
+	#	package it somewhere
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable debug)
+		$(use_enable dmx)
+		$(use_enable kdrive)
+		$(use_enable unwind libunwind)
+		$(use_enable wayland xwayland)
+		$(use_enable !minimal record)
+		$(use_enable !minimal xfree86-utils)
+		$(use_enable !minimal dri)
+		$(use_enable !minimal dri2)
+		$(use_enable !minimal dri3)
+		$(use_enable !minimal glamor)
+		$(use_enable !minimal glx)
+		$(use_enable xcsecurity)
+		$(use_enable xephyr)
+		$(use_enable xnest)
+		$(use_enable xorg)
+		$(use_enable xvfb)
+		$(use_enable udev config-udev)
+		$(use_with doc doxygen)
+		$(use_with doc xmlto)
+		$(use_with systemd systemd-daemon)
+		--enable-libdrm
+		--sysconfdir="${EPREFIX}"/etc/X11
+		--localstatedir="${EPREFIX}"/var
+		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
+		--with-xkb-output="${EPREFIX}"/var/lib/xkb
+		--disable-config-hal
+		--disable-linux-acpi
+		--without-dtrace
+		--without-fop
+		--with-os-vendor=Gentoo
+		--with-sha1=libcrypto
+	)
+
+	if use systemd || use elogind; then
+		XORG_CONFIGURE_OPTIONS+=(
+			"--enable-systemd-logind"
+			"--disable-install-setuid"
+			"$(use_enable suid suid-wrapper)"
+		)
+	else
+		XORG_CONFIGURE_OPTIONS+=(
+			"--disable-systemd-logind"
+			"--disable-suid-wrapper"
+			"$(use_enable suid install-setuid)"
+		)
+	fi
+}
+
+src_install() {
+	xorg-3_src_install
+
+	server_based_install
+
+	if ! use minimal && use xorg; then
+		# Install xorg.conf.example into docs
+		dodoc "${S}"/hw/xfree86/xorg.conf.example
+	fi
+
+	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
+	newinitd "${FILESDIR}"/xdm.initd-11 xdm
+	newconfd "${FILESDIR}"/xdm.confd-4 xdm
+
+	# install the @x11-module-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
+
+	find "${ED}"/var -type d -empty -delete || die
+}
+
+pkg_postinst() {
+	if ! use minimal; then
+		# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
+		if ! use libglvnd; then
+			eselect opengl set xorg-x11 --use-old
+		fi
+	fi
+}
+
+pkg_postrm() {
+	# Get rid of module dir to ensure opengl-update works properly
+	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
+	fi
+}
+
+server_based_install() {
+	if ! use xorg; then
+		rm "${ED}"/usr/share/man/man1/Xserver.1x \
+			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			"${ED}"/usr/share/man/man1/Xserver.1x
+	fi
+}
diff --git a/x11-base/xorg-server/xorg-server-1.20.8.ebuild b/x11-base/xorg-server/xorg-server-1.20.8.ebuild
index 8640edc77379..62120a5bcb2e 100644
--- a/x11-base/xorg-server/xorg-server-1.20.8.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.8.ebuild
@@ -10,7 +10,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
 if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 252ce275e869..347f504c887c 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} != 9999* ]]; then
 fi
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug elogind ipv6 libressl +libglvnd minimal selinux +suid systemd +udev unwind xcsecurity"
+IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl +libglvnd minimal selinux suid systemd +udev unwind xcsecurity"
 
 CDEPEND="libglvnd? (
 		media-libs/libglvnd[X]
@@ -162,10 +162,7 @@ pkg_setup() {
 		$(use_enable udev config-udev)
 		$(use_with doc doxygen)
 		$(use_with doc xmlto)
-		$(usex !elogind $(use_enable systemd systemd-logind) '--enable-systemd-logind')
 		$(use_with systemd systemd-daemon)
-		$(usex suid $(use_enable systemd suid-wrapper) '--disable-suid-wrapper')
-		$(usex suid $(use_enable !systemd install-setuid) '--disable-install-setuid')
 		--enable-libdrm
 		--sysconfdir="${EPREFIX}"/etc/X11
 		--localstatedir="${EPREFIX}"/var
@@ -177,6 +174,20 @@ pkg_setup() {
 		--without-fop
 		--with-sha1=libcrypto
 	)
+
+	if use systemd || use elogind; then
+		XORG_CONFIGURE_OPTIONS+=(
+			"--enable-systemd-logind"
+			"--disable-install-setuid"
+			"$(use_enable suid suid-wrapper)"
+		)
+	else
+		XORG_CONFIGURE_OPTIONS+=(
+			"--disable-systemd-logind"
+			"--disable-suid-wrapper"
+			"$(use_enable suid install-setuid)"
+		)
+	fi
 }
 
 src_install() {
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 6167cb1df7e8..ad316af8f5d9 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index a5d752ff6eb6..2c1c63d69ba3 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -17,28 +17,39 @@ AUX nvidia-uvm.udev-rule 167 BLAKE2B c4606309aaa522f4c86568928b072f09578d4e78540
 AUX nvidia.udev-rule 462 BLAKE2B d417e0e4f5a64c5cee235f4640554ff1ba4d34590a6c3459fd8b4e10dc7581010c006f96cfd01f2c9a847c79979631f6e5afbef01724d110201377e8f8c75966 SHA512 96f9edaa0b46bea5fce17596f868bea5265b303d7185af6ba81527bbd7b8fdf92de9311317cbde51a29d222083d451c25ab77c3d6837cbc4072a50d9af89aa86
 DIST NVIDIA-FreeBSD-x86-340.108.tar.gz 60616768 BLAKE2B 816d1b04aabb2853007dde1aaa31a71b9f42690a5a9e0f017668d79b262d7dc495d15729e276c5eb52c751d4e56841dad6d4f6322f07fce247dae2e51403ca2b SHA512 5384186412ba030768797e3c6db6945b35f86f3b58d632d2bd8e5d57f66c45ff4659fbe119f6b153e48053b21fe38f8cedf1009713d94049efce49df9f4a3196
 DIST NVIDIA-FreeBSD-x86-390.132.tar.gz 64863740 BLAKE2B aa92a8968c81b64e2df637fd20116320431cc9b2acde4e71c5828c37ac124ed15f89074cf2ae1a3dc039d042f3bd87b27f8fe0a07f073e2cfac02871a79e7e72 SHA512 f11152e14ed3c0806df007559087a74f8841c382b19aceb00880f9d92fd549f256874223c987f6b167215c711bee8962d49f34eb047957885a57c1dd6f1eb27a
+DIST NVIDIA-FreeBSD-x86-390.138.tar.gz 65940848 BLAKE2B ea40a0289012425ee1fa1c74cb5963ac3d7e0992dc55255bb1c20fc8391fce772bf8ab97458047307211865c4e0239acad1196ec88c0259a9e6f70103c2888ec SHA512 32d66398af1edfd4b72a8e1e84ad8a3bcdb18d1c92f5cca5fcaca82d3ed73d40e55b403693a7896735b55a758ddf03437811f6ca7c082c8f85de9112da037713
 DIST NVIDIA-FreeBSD-x86_64-340.108.tar.gz 61500286 BLAKE2B 6997395199b5105249c93c8b6b36d1f29cc7663f21d3a2ad4479f7a46822524c8a00bd2b310d7ee830208cf36f911c5f090d899de34801d5d2487a61370bb7da SHA512 70d5ae62fa0a018d4bb84f285c0850a0b9f760212d5468feac312c575cc018fac8c2686e70c3ef594337b6afaada3d4392126b63a517b6032d54d9af8b7533f3
 DIST NVIDIA-FreeBSD-x86_64-390.132.tar.gz 64206643 BLAKE2B a95bc5bbb99c89b817692167946deddff1c131c54165e5958e0600432c59fa7ce06cfc6037f4bcf090232c8c25ae36e370e77594ca9a057565adc8e8ac231e72 SHA512 120bf1c5784ef2c74047780383ce5ba8997dc588bab7a5178afeca99fb3829f7b99651238348c9098d023eee1c7f94b5321e6fb4c6e542ece2af705fe33da863
+DIST NVIDIA-FreeBSD-x86_64-390.138.tar.gz 65280213 BLAKE2B 36d5651ceaf90cefcf9e844f8f5810ac42bebca2ca47318b27606c1401d8f343fc7b2619a5405dee9d5d64ec98379b0582f6d5fe5dd4df1269ba48332a6a5ec2 SHA512 fb61e19010826e5c2e403ecc12e19ee28517682599100804d74be92a9e3c6688b51dafa6c6703a5a0d080b0ca16495792fec3badf9cab959321cc401e72520a3
 DIST NVIDIA-FreeBSD-x86_64-430.64.tar.gz 62723909 BLAKE2B f3e48bc38a3ec051a75c08845b45c0ba6b80bca31d7efd85f115e6244f9cdff70c68466f9139f69c645207d4cf61103432d75c943d3f3508811d405fba55d1b6 SHA512 498a3007c065d8b17f94024f6ca80ffbe3dca253fdb73c4a08babede821e52f8466523b402af350e961f153c5f732eb04160937fabef1f1be3846a0a4743b310
 DIST NVIDIA-FreeBSD-x86_64-435.21.tar.gz 64153630 BLAKE2B fee655cc843c004ac0c1ec85b9417292016a013136e04ad047d2513edbdc7c732561d6bcc4603c658905972dce6618de49d4d6ac583e84fdf212cf45397b48c1 SHA512 2c160c06ca58e3009deb1ba4a4a28d39419e251ced3bfa9a442942f9cce17003d67e8a8bfa23036d3916cc0e66f4bff0fbedaae73db6f10b995235a56d7eba7c
-DIST NVIDIA-FreeBSD-x86_64-440.82.tar.gz 82289126 BLAKE2B b8d0a0c235bbc7a1bdeb6cde2a3c72b4b54044e6d22cdf9c275640349051f9c1aa1ce358f47b10b0917d15f359ccec579f43caf8e4ec7a142192061b9e61a7b7 SHA512 88c7ce2f3786a364befd5690e973eb82b12421d0abbd16cf88e0727a137ce0099fe606b577d325185f3ee85bace89da745cae000d8d8665548a283b5bb397095
+DIST NVIDIA-FreeBSD-x86_64-440.100.tar.gz 82523267 BLAKE2B 9d8eddcf3a58787a03fab207c197d722ff047f8bc840ea41e8d38815fbfab9e54759b9fbeaa26e3d147f54cb4a510eec421708d3bbb21197922f4dc175ed6df5 SHA512 96f57e1f308f0e5f00ef09a128e91a68ac55033893000e84cf4ff1a910a88798743c911b3effcc26c3f27ae224b733d8c2f87e9ec0596149f65ad7bcd71edbc5
+DIST NVIDIA-FreeBSD-x86_64-450.51.tar.gz 82784766 BLAKE2B fbd0e71919b16db5957539c5b44a9d974e01d6ab42d5c292aaa4a4e06125d982e37607e28124ae63436eb1d3fcb1b7eb9e1e258b1644310d00d4eebf9fe17ae7 SHA512 0cba373609787e2cb341232a619b3d95bc6c4da8db27633f717ba5654e7717005089d6c2ef4801ff117e6f35f8fa522b600864cf440578cad9397b7f839e16fe
 DIST NVIDIA-Linux-armv7l-gnueabihf-390.132.run 29084574 BLAKE2B 4727627de610928f0808c0213c9d359c5566900972ab9fbd3d0c58b36c0a1331799ceea22b4defdcfb81c3132f6124d8a6357de8124921eef608938afdc1380d SHA512 2f78a722ec31ceda86afc1831cb42d0eab8f8698b94c7fbc8569a6d34693b50e74453d5aaf3c0180f1fc2511b8c237ac635aceb24bcbea468f2a092cb44f98ee
+DIST NVIDIA-Linux-armv7l-gnueabihf-390.138.run 28540622 BLAKE2B 342852dd6fa371f86d19547d73edef582fe3f04cf4f6e9ec247767951180671ba46f3ed2ee7bab11b0cf2f8bb1eb846b1d7481d318789c14ce79b54fefe0f830 SHA512 e04b8aca202c1df305f7b67ec372322494fa7b77f27cbf04f240527dcac0ce3ffa5e0e9df36b52045ac13fbc2f84b5033784040884ed19072f66f41385d11b97
 DIST NVIDIA-Linux-x86-340.108.run 38902892 BLAKE2B 67e3c336a1f3e953e0fbccf96177bef7e0674c32243856660e9203e7c5fd4ada12a5fa784cebc2150d2133bdb16c19109f9fc5c04d4a138bd519def80c43164c SHA512 cf122c4cf724737cc647bc3d115e853bfe17027d5070c5ed68caf78e0dab718e7345bf824d0e8b33489bf299957dab8ff249cb0f837c3d17b2bb60887afe2818
 DIST NVIDIA-Linux-x86-390.132.run 48152101 BLAKE2B f1e76c2796d12476a35701607226483a34ee3b50a0c7dc03e3626e8cab4250b07c0f5aa238a0d5d5b65b79dc504963f2723089108281668b2f4fae03f4bf25c5 SHA512 12b0f80b4bbaebc984c7dbacd365795646c7697606242b05095ac61d69d89ab89fded47d583b4b99793ebcea9e38ec1e7b63dda1c2fdce53ab697cafcdbb3a85
+DIST NVIDIA-Linux-x86-390.138.run 49091672 BLAKE2B 465f025041aafdb03699babdb97380b73c2d7a0568bf2ffe4f3830974457d29eec28dbdf2742bfb1508f00eb6f5d4697f03726561b470b479eb9caa940113bdc SHA512 f6c1e388a6801f0557e34ce9094f99e1a87510c3c620f0ecd9959a6e3bb0a313a8b991c8da319d60531e6a1e2f098d94bc88b12b63c624930295f0e05bb4f9ae
 DIST NVIDIA-Linux-x86_64-340.108.run 70165522 BLAKE2B 890d00ff2d1d1a602d7ce65e62d5c3fdb5d9096b61dbfa41e3348260e0c0cc068f92b32ee28a48404376e7a311e12ad1535c68d89e76a956ecabc4e452030f15 SHA512 7941b5496b2c17b06320d676a51ec2866c08a3d3dce9d7cf20464bc35ccb4616c398eb247d1f1e5039386aa73bb610a36937252ce4ad47959437938db8cf3c29
 DIST NVIDIA-Linux-x86_64-390.132.run 82900057 BLAKE2B e94cc2493701e34c4dd2f0fc4f89501d6b1d3e44abf80af2eff20c19a22c1160ce322c25d2b5b13e212bf48fb41f94d3c1bb6f9251302e6c8facb687d807a3dc SHA512 bad3453472e8af9ef0681b82db75f9c53816a7d57ff2bf1facd2ea010e757bf7fd4fb907317471934a0cb56510eaf2a90503a3a86ec80b76afdacfa2b9ee6c13
+DIST NVIDIA-Linux-x86_64-390.138.run 83780873 BLAKE2B 5e6a9d77dd2b9de17d923198105a9227ffe2adbc1ed7c9dd5ef3cc810358f71ae47ce9615cbe04f36090f052082a2066772505fd763cbfdbce272f0fb7c25dc7 SHA512 2984fb8f5de598fd3031ebd928942ceb09fd26ae9e61b40b2d348e3174e172a932a1b2a5c2e5534f299b883ade323932be4fdcd26d6f7235a17f6f5a04fa792c
 DIST NVIDIA-Linux-x86_64-430.64.run 111331457 BLAKE2B 59d8b739bc472810eb896ef620735b6f21ccfde653e08f248797720d21d75580dcea2448f17a5d1c32be393595d9dfedc48c81e96a8ea422c7f0d9eadf36ae1c SHA512 552bf1e8c4725258c07cbb0e000d0e407fba1b51207903f2b77c0d9fd8b15b629f791b20239f75a1aec85aa03cbcca90a1cb633090919cf0599054231f715250
 DIST NVIDIA-Linux-x86_64-435.21.run 144387574 BLAKE2B e9afd6335182a28f5136dbef55195a2f2d8f768376ebc148190a0a82470a34d008ce04170ffc1aab36585605910c1300567a90443b5f58cb46ec3bff6ab9409c SHA512 e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270
-DIST NVIDIA-Linux-x86_64-440.82.run 142872609 BLAKE2B 3ebef17002a788f145b61fb8c921f120324eac036ff4c7b972913e30ed830339fc971fd352f5e59ee3bb1b4a7a159dcf3e35d2f33ee37357c3f177aa605307ea SHA512 d86ed2cd715c5a9aebdd11ee562cfa454dbafdb1b468004cbb93d37ee258623f11144cf30b8b14996a4e093cb3119edc36d13152893d735e3536f49c45e2cca3
+DIST NVIDIA-Linux-x86_64-440.100.run 144653408 BLAKE2B a62e6324f5ac6033c1c4b59486c86a6d4f81b240e5a7ddf9f861f9cfec4daedbe08ef3af6556c1cd4260a5a6fcd1b8bfed886ae617677d87c3a900d0e313267b SHA512 274b3a8e4c801b67a3f71f11da93134bc1a16a48bc85a6bf63265c00bb3fd8caf935dd23c85c40285a162e83c146bd5e34bb0b1d74fc34e7122bfc4c3a8c81e7
+DIST NVIDIA-Linux-x86_64-450.51.run 140812490 BLAKE2B 927820fb30e0aac7d022acc82c969503e63be66045d7f10eee0af02b065251ecc4a0c95caef30cf0c2bb2e94de02f59b4469b26eaa801e67d6340184139b82ed SHA512 ddb63f28ddbfa9e5c1bacbd3a5e8d529072c98b09a54c745467ed3ce87e8d5ffef80e41848bb473104147554dbac7dd1d1283821ceef6de05d3a2f8538e2ca33
 DIST nvidia-settings-340.108.tar.bz2 1550018 BLAKE2B 1acdfbcb0e7c02af33f5e86b9b140e356057efd9825fbc130971884ae76dd23765c2a0dbd00e1ac47bbff882f6d004e0a10c0195e6c6dce1408c72a00e0e6322 SHA512 d8b6dcbd3803af4da22cfffc039e1c050313f90b7ee86106a784863f7c203de9137ac2fee12aa800498cc56081dbe7e3aaa943c162037477ce97a07a237db41a
 DIST nvidia-settings-390.132.tar.bz2 1109373 BLAKE2B cec60b7409f6d352afe3845a2ec65db96183d1fe009340fa3601166718f21b43bb08b63c5eaaaf4c266c7b16e7d374f6ecc00691763d5ae1b6902c8002da5bea SHA512 12553edc1a1ba9c3f578e0e921b25ec7114cbc80a55621cbd612a1bd85c9a518e221b30809058e4df5da6ae75ea7a1cd5c3d9c8f02a0898bc8c08ac9c22ccee3
+DIST nvidia-settings-390.138.tar.bz2 1109175 BLAKE2B 4171c12de0a6fb97b655567d4cc8b4e6fb92e340aae6d65f0a0583db159478fb11f8d5c4cf0fa5ef87098ec1582ccb896fec9f2bf81e4c748b8ff5ee5d73af6b SHA512 6c54ff039840098c23f2091b4c33ab2b712ff90c16829c568bc39c9375cb2f4fb677bb5ab90efcf2034b15a1d93d13f1fbb40dde1d90092073af7d9f3c16de97
 DIST nvidia-settings-430.64.tar.bz2 1130931 BLAKE2B 032bbe8cdb7ec3b353e8f8ef33d0e86f4b4f3ef24b38de669e09173519149efe0aa55d5d30d0a0c6d2b8398d5ce38bbe4176df735501725475df4137d533e57d SHA512 fa82699610aa0f4709101e1a4e9e8147b133c85afb20ecb4506bfccf233e4f42dac26e53e2966f2137eb29190b5e4173b267167f5341b516fa1169785946e240
 DIST nvidia-settings-435.21.tar.bz2 1131222 BLAKE2B 855f5c7667f4a5ec0f917fbb017d70ec6ee5e768f7087e77e54a66dea852c471bd1810a2163fb33204e5f381998a27a4254e0a5d2c73e2b6b624813ff8294f24 SHA512 8b408cc70118df3a138a99fe7fc14f6370d500b8ae26888b27b07de22f6fc6eebd65bd437d83ee82e18a1d8ee4cceec601c414b1947302ca808fff48165f31bb
-DIST nvidia-settings-440.82.tar.bz2 1128498 BLAKE2B cc26d83b8ac8d609919db15b462b98976ad063026c39fdf58de36ce26a5b9a9ed5aca8e966f5b61c231ab1f7324a5530fb9779fccb999f39f79252570d62cb79 SHA512 8f9b546f65a1bd17f6336df9e62b0d1403581d3f60276793a536ff39bf67038def1c2738545b24b04eb465860f0cb97b5b9688d7dfb759fda567c05b1cc651ff
-EBUILD nvidia-drivers-340.108.ebuild 13317 BLAKE2B a4e0e5bccf47edbcecf9584e97e7bf3f29fa470b5245b4941918d93c2572f842135a4c0dd79aa0b7d4a1cbaab66cd7ea09aa09351f56f1bb7004632297a083a3 SHA512 628e69f3d5d9152fe5cac3c7901d40b74bd9792ad5696403a2d09a5ef50936feeeb77f0280869d5c6830738f2c494c57c323784645cfdb9f41f93cd5cfe57581
-EBUILD nvidia-drivers-390.132-r1.ebuild 15101 BLAKE2B e1591518d29a1946cd725ceaf6905d709efb2f14e2f828fda5075dbcf15c730d2f876ff0c15f337c6c312987eab35243329d6ae2a4da1f91374099119159c41b SHA512 c5cef6ca393804549559f04e3ce9a4a13b159cea0b9f26d7a29c57b551a261c36c0d85a6ea99257f673dc093ee6d5dbcf2e51d7faf5406080e2ada3f7944f5b4
-EBUILD nvidia-drivers-390.132-r2.ebuild 15539 BLAKE2B 8d0d3794dec70dd69fbd0e0dbc9b1eb92841e28149e805fdb680444dc8000ae9138c6c68d1ed471d26754865078121045ee8dc32ccca6b0e113c559001173157 SHA512 509a1699402526e4a7c18d9a607d540b5bb0496ee71abdafe576450b1f73ce8638ee030571015cf112fd950eabcdbf34430246f2ee32fa1a2ad00641edabd616
-EBUILD nvidia-drivers-430.64-r4.ebuild 15147 BLAKE2B 5e506906cd02233ca338914922639ef8063b46b9f057ffb0ab2d2654e61da13d1a76d1de223ab73026e6ac28c994f37a2a80387633918e2c603643090821f66a SHA512 d0f561e7a3b062753d1da50ad1b2ee6a459e4723fa0f4659453a1b64b4d60f3ff6661a5fbbae8de03204230550adbfa628e17d5c7586eff69b41623ad43f43f1
-EBUILD nvidia-drivers-435.21-r4.ebuild 15506 BLAKE2B a4599c7158d02eacc32dc3ec24280d60775232847b913cf40c6162594cb0bff368c7562479cecee0013a3397762de9ca5723f3977809b0fffa269498e0784643 SHA512 a2bfc4e964cd25e91333d0fad886b60b757469eb73cdb11bd024c11024330e4a61e621122cec0abae6b4082aaed0e459063f49137d8b1242c19f63d32cb2af97
-EBUILD nvidia-drivers-440.82-r3.ebuild 15626 BLAKE2B e0e0615d7271b452c73a93ab9078222682f60777091a1704644c660bcb39fd524bdc1842c10284555179063e263db25826270f2703b0d6a988b51f5907ce5296 SHA512 486d5a78bf9a177fce5478860c12b613a1f0f096f5195e13271a1ece19f558fe930e77691227617d17ae061daed76de40037041afaef191898fcaa683bf3dc9c
+DIST nvidia-settings-440.100.tar.bz2 1129171 BLAKE2B bc8b28ae5743df50177c51a9269ef2b5d11c69dd9f30441179d81e42e7f77c54f327c87a7a5c6a410540bed35eb1ba0cc289b5b98a046deda376dccb29a8206b SHA512 4fe8fbbca1f805652235d898e8451ba89263c81f53e78da471b13ba0668d0d528d04d098b276df6fd2bf7ea7a219a3aa3c4d0bada0a483767c00c0654a5a8818
+DIST nvidia-settings-450.51.tar.bz2 1056993 BLAKE2B a410593a3217023103c2c783c7a2ca0dee1c6a2af8dec1f0398159aa8192b307e4d27690b9987e879e863e7667b2d046f6128ca1634750863b58d4727b4d2a12 SHA512 6fd455c1910a3ff6105facc06ef65e29f88a0133794f27bf36b999cd513f5639a2c24c53bd5bca308730e6c66f10eda25d191bb815eee53d39b5632a1ce466e1
+EBUILD nvidia-drivers-340.108.ebuild 13327 BLAKE2B f1e779862f35febebe6e4efb9d58e4e33d0be1aa42fc41f403089506b23166174f9d1d82213ce6a22f67ebd35f66f34e1443af8724e3cf6243de1c19e93f79d9 SHA512 9f8a9e15fec577368cb13251fffe68107ce5a9e3bb6c4fdf8735dbfcff4bcf2d1f9b7562751e94e9353dcf41114f9071aaba3835463e38a6ecf10886827fffd1
+EBUILD nvidia-drivers-390.132-r1.ebuild 15144 BLAKE2B bdbeaa03a397e8e757f1f4e084118b7030cc953cdb2caa4c4970969c408f2af434c4d3fe7b1b27ed9bee36880b23a17ff265abe7d5485eb72cb56e132c9d24e3 SHA512 5011129e6a446a831765c859374af724f50c7ff335eb07e0562c141b40a0b1d846bb0d40be05d9d7483356c9ceef59d2e4d5c5d81e11ebfa6bcd32a4bf2b7819
+EBUILD nvidia-drivers-390.132-r2.ebuild 15582 BLAKE2B ec7efbad69e13b1bb89b98a61f8487d4a1605d573efe08a541d1a53410c815e438a55af67e43810919992ff5e289b76f6011f1d2221888c036dcce6d94772fd8 SHA512 2e46a86cca40e942c5c570c5040e01e746f80eb93b93db2842da9c7e551d8f2c1062877a26734ba0b587386c3697af14abcb53382566508e63ea357a60bd397f
+EBUILD nvidia-drivers-390.138.ebuild 15598 BLAKE2B 0a207fc2c57c2617bff21ab20b063b2d235aa8ecaee809f966735a3f7fd950e307f71fbe92c2611d0d191a78bc97de329236488c7c1426de13ff7950e3c897a6 SHA512 6cd90ba22155cb6f166bfb39afb5dbd84d9247575c4478279e629ab53ed77a62b8ae427d253a6cf276aeefd0617479e7019d204d8729fbd4ebe8a2730f193d45
+EBUILD nvidia-drivers-430.64-r5.ebuild 15157 BLAKE2B 8aac4b297ec70adae1d958d9dd5a39d1ba279e42f5c8edd7eb0851736cad85bf53180513a49f3184b4df10fe7e009544b968828ad8907924f07bdb2a41f51a7c SHA512 c44b72bd7e16e340bbb7d3d3159e879f124d9dd780a78d491867fb86bbcf6ed96e8091132cb3996db5a1d128572c5b6e4b8310f87d597714dba4a756e943a005
+EBUILD nvidia-drivers-435.21-r5.ebuild 15516 BLAKE2B 30bd6c41ff6671c221156084fe5388a70703dc068cf595c361001c061be5e90c25a5482f55e775bf11512812466dc388671c5cb4ef2ccd9712a25e4e797c3843 SHA512 78a7f4ceccf9c3837f90fde937271e94204f13dafcd475db13947e3af828fce9bb56d4e2003bf9b39dd1cb538bf8d7e8bbb236ad340d6e92f67443adb859f2e1
+EBUILD nvidia-drivers-440.100-r1.ebuild 15458 BLAKE2B 472d84718c2f17c9f4642fd8c02103dd3375d8b3b1c38f0e6d489c71d93580326e95e3508f573da240b4274417626ca88a7e75467c7119d81543de758b7d1ce4 SHA512 eacfe3aa6f5c091870fe2f2a0dc6c4dc940937a5dfac6f5f0c495c09a9efebbe8189cab1146b4c18f6873b846ea2abe40258610ad93ca288122cafd909c4ee06
+EBUILD nvidia-drivers-450.51-r1.ebuild 15484 BLAKE2B fab6b5b4f061ca765efafda22cd7f361f914265da371b2376b15335e5c986c5bb0c5aa991447465f52682a3c12835473788a2d3cb9db31e2695cbc3e18a76cbf SHA512 217911bd48bc528bdbb42b5f7c12d147dc37b4dd688713ec52317884ad2d551c907b64f7d77a678bb3f820f2b58faa1c778ad4d412cde777fe347a6bb5f9531a
 MISC metadata.xml 1284 BLAKE2B 0e13b2eae77fee75a4757da7ae80540093962b6e8ccc3b0950caa3a0957ff79c6b08c80ceeec8ffcde47b293c258159f8722a13334fe06868589a18802ec0434 SHA512 0a3c6679f7fc23bf87340145f3a97945c9e8c7fc9c8721fa4643fb662347af312b4b927635901e95acb9349a7b191ef088ff0e51bbbc0cbd333603bb60984020
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild
index f66e31d379fe..94c582830348 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild
@@ -70,7 +70,13 @@ REQUIRED_USE="tools? ( X )"
 QA_PREBUILT="opt/* usr/lib*"
 S=${WORKDIR}/
 NV_KV_MAX_PLUS="5.5"
-CONFIG_CHECK="!DEBUG_MUTEXES ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
+CONFIG_CHECK="
+	!DEBUG_MUTEXES
+	DRM
+	DRM_KMS_HELPER
+	~!LOCKDEP
+	~SYSVIPC
+"
 
 pkg_pretend() {
 	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild
index af9e78389d81..3f2495a4af14 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild
@@ -80,7 +80,13 @@ RDEPEND="
 QA_PREBUILT="opt/* usr/lib*"
 S=${WORKDIR}/
 NV_KV_MAX_PLUS="5.5"
-CONFIG_CHECK="!DEBUG_MUTEXES ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
+CONFIG_CHECK="
+	!DEBUG_MUTEXES
+	DRM
+	~!LOCKDEP
+	~DRM_KMS_HELPER
+	~SYSVIPC
+"
 
 pkg_pretend() {
 	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
@@ -196,6 +202,7 @@ src_compile() {
 
 		emake -C "${S}"/nvidia-settings-${PV}/src \
 			CC="$(tc-getCC)" \
+			OBJCOPY="$(tc-getOBJCOPY)" \
 			DO_STRIP= \
 			GTK3_AVAILABLE=$(usex gtk3 1 0) \
 			LD="$(tc-getCC)" \
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild
index 8c2e15d88bb9..d042a6ee3ddd 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild
@@ -84,7 +84,13 @@ RDEPEND="
 QA_PREBUILT="opt/* usr/lib*"
 S=${WORKDIR}/
 NV_KV_MAX_PLUS="5.5"
-CONFIG_CHECK="!DEBUG_MUTEXES ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
+CONFIG_CHECK="
+	!DEBUG_MUTEXES
+	DRM
+	~!LOCKDEP
+	~DRM_KMS_HELPER
+	~SYSVIPC
+"
 
 pkg_pretend() {
 	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
@@ -200,6 +206,7 @@ src_compile() {
 
 		emake -C "${S}"/nvidia-settings-${PV}/src \
 			CC="$(tc-getCC)" \
+			OBJCOPY="$(tc-getOBJCOPY)" \
 			DO_STRIP= \
 			GTK3_AVAILABLE=$(usex gtk3 1 0) \
 			LD="$(tc-getCC)" \
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild
new file mode 100644
index 000000000000..3bf3c71b97c8
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild
@@ -0,0 +1,586 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
+	nvidia-driver portability toolchain-funcs unpacker udev
+
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
+
+NV_URI="https://us.download.nvidia.com/XFree86/"
+SRC_URI="
+	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	arm? ( ${NV_URI}Linux-x86-ARM/${PV}/${ARM_NV_PACKAGE}.run )
+	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
+	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
+	tools? (
+		https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
+	)
+"
+
+EMULTILIB_PKG="true"
+KEYWORDS="-* amd64 x86"
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0/${PV%.*}"
+
+IUSE="compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib static-libs +tools uvm wayland +X"
+REQUIRED_USE="
+	tools? ( X )
+	static-libs? ( tools )
+"
+
+COMMON="
+	driver? ( kernel_linux? ( acct-group/video ) )
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		gtk3? (
+			x11-libs/gtk+:3
+		)
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf[X]
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+	)
+	X? (
+		!libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 )
+		libglvnd? (
+			media-libs/libglvnd[${MULTILIB_USEDEP}]
+			!app-eselect/eselect-opengl
+		)
+		app-misc/pax-utils
+	)
+"
+DEPEND="
+	${COMMON}
+	kernel_linux? ( virtual/linux-sources )
+	tools? ( sys-apps/dbus )
+"
+RDEPEND="
+	${COMMON}
+	tools? ( !media-video/nvidia-settings )
+	uvm? ( >=virtual/opencl-3 )
+	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+	X? (
+		<x11-base/xorg-server-1.20.99:=
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+	)
+"
+QA_PREBUILT="opt/* usr/lib*"
+S=${WORKDIR}/
+NV_KV_MAX_PLUS="5.8"
+CONFIG_CHECK="
+	!DEBUG_MUTEXES
+	DRM
+	~!I2C_NVIDIA_GPU
+	~!LOCKDEP
+	~DRM_KMS_HELPER
+	~SYSVIPC
+"
+
+pkg_pretend() {
+	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
+	nvidia-driver_check
+}
+
+pkg_setup() {
+	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
+	nvidia-driver_check
+
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use driver && use kernel_linux; then
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
+		use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) nvidia-drm(video:${S}/kernel)"
+
+		# This needs to run after MODULE_NAMES (so that the eclass checks
+		# whether the kernel supports loadable modules) but before BUILD_PARAMS
+		# is set (so that KV_DIR is populated).
+		linux-mod_pkg_setup
+
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
+
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+	fi
+
+	if use kernel_linux && kernel_is lt 2 6 9; then
+		eerror "You must build this against 2.6.9 or higher kernels."
+	fi
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
+		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+		NV_DOC="${S}/doc"
+		NV_OBJ="${S}/obj"
+		NV_SRC="${S}/src"
+		NV_MAN="${S}/x11/man"
+		NV_X11="${S}/obj"
+		NV_SOVER=1
+	elif use kernel_linux; then
+		NV_DOC="${S}"
+		NV_OBJ="${S}"
+		NV_SRC="${S}/kernel"
+		NV_MAN="${S}"
+		NV_X11="${S}"
+		NV_SOVER=${PV}
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_prepare() {
+	local man_file
+	for man_file in "${NV_MAN}"/*1.gz; do
+		gunzip $man_file || die
+	done
+
+	if use tools; then
+		cp "${FILESDIR}"/nvidia-settings-fno-common.patch "${WORKDIR}" || die
+		cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die
+		sed -i \
+			-e "s:@PV@:${PV}:g" \
+			"${WORKDIR}"/nvidia-settings-fno-common.patch \
+			"${WORKDIR}"/nvidia-settings-linker.patch \
+			|| die
+		eapply "${WORKDIR}"/nvidia-settings-fno-common.patch
+		eapply "${WORKDIR}"/nvidia-settings-linker.patch
+	fi
+
+	default
+
+	if ! [ -f nvidia_icd.json ]; then
+		cp nvidia_icd.json.template nvidia_icd.json || die
+		sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die
+	fi
+}
+
+src_compile() {
+	# This is already the default on Linux, as there's no toplevel Makefile, but
+	# on FreeBSD there's one and triggers the kernel module build, as we install
+	# it by itself, pass this.
+
+	cd "${NV_SRC}"
+	if use kernel_FreeBSD; then
+		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+	elif use driver && use kernel_linux; then
+		BUILD_TARGETS=module linux-mod_src_compile \
+			KERNELRELEASE="${KV_FULL}" \
+			src="${KERNEL_DIR}"
+	fi
+
+	if use tools; then
+		emake -C "${S}"/nvidia-settings-${PV}/src \
+			AR="$(tc-getAR)" \
+			CC="$(tc-getCC)" \
+			DO_STRIP= \
+			LD="$(tc-getCC)" \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NV_VERBOSE=1 \
+			RANLIB="$(tc-getRANLIB)" \
+			build-xnvctrl
+
+		emake -C "${S}"/nvidia-settings-${PV}/src \
+			CC="$(tc-getCC)" \
+			OBJCOPY="$(tc-getOBJCOPY)" \
+			DO_STRIP= \
+			GTK3_AVAILABLE=$(usex gtk3 1 0) \
+			LD="$(tc-getCC)" \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NVML_ENABLED=0 \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1
+	fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if it is not /usr/lib
+donvidia() {
+	# Full path to library
+	nv_LIB="${1}"
+
+	# SOVER to use
+	nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
+
+	# Where to install
+	nv_DEST="${2}"
+
+	# Get just the library name
+	nv_LIBNAME=$(basename "${nv_LIB}")
+
+	if [[ "${nv_DEST}" ]]; then
+		exeinto ${nv_DEST}
+		action="doexe"
+	else
+		nv_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	fi
+
+	# Install the library
+	${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
+
+	# If the library has a SONAME and SONAME does not match the library name,
+	# then we need to create a symlink
+	if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
+		dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER}
+	fi
+
+	dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so}
+}
+
+src_install() {
+	if use driver && use kernel_linux; then
+		linux-mod_src_install
+
+		# Add the aliases
+		# This file is tweaked with the appropriate video group in
+		# pkg_preinst, see bug #491414
+		insinto /etc/modprobe.d
+		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
+		if use uvm; then
+			doins "${FILESDIR}"/nvidia-rmmod.conf
+			udev_newrules "${FILESDIR}"/nvidia-uvm.udev-rule 99-nvidia-uvm.rules
+		else
+			sed -e 's|nvidia-uvm ||g' "${FILESDIR}"/nvidia-rmmod.conf \
+				> "${T}"/nvidia-rmmod.conf || die
+			doins "${T}"/nvidia-rmmod.conf
+		fi
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(get_udevdir)"
+		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+	elif use kernel_FreeBSD; then
+		if use x86-fbsd; then
+			insinto /boot/modules
+			doins "${S}/src/nvidia.kld"
+		fi
+
+		exeinto /boot/modules
+		doexe "${S}/src/nvidia.ko"
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
+
+	# NVIDIA framebuffer capture library
+	donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
+
+	# NVIDIA video encode/decode <-> CUDA
+	if use kernel_linux; then
+		donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
+		donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
+	fi
+
+	if use X; then
+		# Xorg DDX driver
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
+		doins ${NV_X11}/nvidia_drv.so
+
+		# Xorg GLX driver
+		if use libglvnd; then
+			local extensions_dir="/usr/$(get_libdir)/extensions/nvidia"
+		else
+			local extensions_dir="/usr/$(get_libdir)/opengl/nvidia/extensions/"
+		fi
+		donvidia ${NV_X11}/libglx.so.${NV_SOVER} \
+			"${extensions_dir}"
+
+		# Xorg nvidia.conf
+		if has_version '>=x11-base/xorg-server-1.16'; then
+			insinto /usr/share/X11/xorg.conf.d
+			newins {,50-}nvidia-drm-outputclass.conf
+		fi
+
+		insinto /usr/share/glvnd/egl_vendor.d
+		doins ${NV_X11}/10_nvidia.json
+	fi
+
+	if use wayland; then
+		insinto /usr/share/egl/egl_external_platform.d
+		doins ${NV_X11}/10_nvidia_wayland.json
+	fi
+
+	# OpenCL ICD for NVIDIA
+	if use kernel_linux; then
+		insinto /etc/OpenCL/vendors
+		doins ${NV_OBJ}/nvidia.icd
+	fi
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe ${NV_OBJ}/nvidia-xconfig
+
+		insinto /etc/vulkan/icd.d
+		doins nvidia_icd.json
+	fi
+
+	if use kernel_linux; then
+		doexe ${NV_OBJ}/nvidia-cuda-mps-control
+		doexe ${NV_OBJ}/nvidia-cuda-mps-server
+		doexe ${NV_OBJ}/nvidia-debugdump
+		doexe ${NV_OBJ}/nvidia-persistenced
+		doexe ${NV_OBJ}/nvidia-smi
+
+		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+		doexe ${NV_OBJ}/nvidia-modprobe
+		fowners root:video /opt/bin/nvidia-modprobe
+		fperms 4710 /opt/bin/nvidia-modprobe
+		dosym /{opt,usr}/bin/nvidia-modprobe
+
+		doman nvidia-cuda-mps-control.1
+		doman nvidia-modprobe.1
+		doman nvidia-persistenced.1
+		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
+		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
+	fi
+
+	if use tools; then
+		emake -C "${S}"/nvidia-settings-${PV}/src/ \
+			DESTDIR="${D}" \
+			GTK3_AVAILABLE=$(usex gtk3 1 0) \
+			LIBDIR="${D}/usr/$(get_libdir)" \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 \
+			PREFIX=/usr \
+			DO_STRIP= \
+			install
+
+		if use static-libs; then
+			dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
+
+			insinto /usr/include/NVCtrl
+			doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
+		fi
+
+		insinto /usr/share/nvidia/
+		doins nvidia-application-profiles-${PV}-key-documentation
+
+		insinto /etc/nvidia
+		newins \
+			nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
+
+		# There is no icon in the FreeBSD tarball.
+		use kernel_FreeBSD || \
+			doicon ${NV_OBJ}/nvidia-settings.png
+
+		domenu "${FILESDIR}"/nvidia-settings.desktop
+
+		exeinto /etc/X11/xinit/xinitrc.d
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+	fi
+
+	dobin ${NV_OBJ}/nvidia-bug-report.sh
+
+	if has_multilib_profile && use multilib; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+
+	# Documentation
+	if use kernel_FreeBSD; then
+		dodoc "${NV_DOC}/README"
+		use X && doman "${NV_MAN}"/nvidia-xconfig.1
+		use tools && doman "${NV_MAN}"/nvidia-settings.1
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}"/nvidia-smi.1
+		use X && doman "${NV_MAN}"/nvidia-xconfig.1
+		use tools && doman "${NV_MAN}"/nvidia-settings.1
+		doman "${NV_MAN}"/nvidia-cuda-mps-control.1
+	fi
+
+	readme.gentoo_create_doc
+
+	docinto html
+	dodoc -r ${NV_DOC}/html/*
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	if use libglvnd; then
+		local GL_ROOT="/usr/$(get_libdir)"
+	else
+		local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+	fi
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local nv_libdir="${NV_OBJ}"
+
+	if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then
+		nv_libdir="${NV_OBJ}"/32
+	fi
+
+	if use X; then
+		NV_GLX_LIBRARIES=(
+			"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libOpenCL.so.1.0.0 ${CL_ROOT}"
+			"libcuda.so.${NV_SOVER}"
+			"libnvcuvid.so.${NV_SOVER}"
+			"libnvidia-compiler.so.${NV_SOVER}"
+			"libnvidia-eglcore.so.${NV_SOVER}"
+			"libnvidia-encode.so.${NV_SOVER}"
+			"libnvidia-fatbinaryloader.so.${NV_SOVER}"
+			"libnvidia-fbc.so.${NV_SOVER}"
+			"libnvidia-glcore.so.${NV_SOVER}"
+			"libnvidia-glsi.so.${NV_SOVER}"
+			"libnvidia-ifr.so.${NV_SOVER}"
+			"libnvidia-opencl.so.${NV_SOVER}"
+			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
+			"libvdpau_nvidia.so.${NV_SOVER}"
+		)
+		if ! use libglvnd; then
+			NV_GLX_LIBRARIES+=(
+				"libEGL.so.$(usex compat ${NV_SOVER} 1.1.0) ${GL_ROOT}"
+				"libGL.so.$(usex compat ${NV_SOVER} 1.7.0) ${GL_ROOT}"
+				"libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
+				"libGLESv2.so.2.1.0 ${GL_ROOT}"
+				"libGLX.so.0 ${GL_ROOT}"
+				"libGLdispatch.so.0 ${GL_ROOT}"
+				"libOpenGL.so.0 ${GL_ROOT}"
+			)
+		fi
+
+		if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-egl-wayland.so.1.0.2"
+			)
+		fi
+
+		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-wfb.so.${NV_SOVER}"
+			)
+		fi
+
+		if use kernel_FreeBSD; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-tls.so.${NV_SOVER}"
+			)
+		fi
+
+		if use kernel_linux; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-ml.so.${NV_SOVER}"
+				"tls/libnvidia-tls.so.${NV_SOVER}"
+			)
+		fi
+
+		for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
+			donvidia "${nv_libdir}"/${NV_LIB}
+		done
+	fi
+}
+
+pkg_preinst() {
+	if use driver && use kernel_linux; then
+		linux-mod_pkg_preinst
+
+		local videogroup="$(getent group video | cut -d ':' -f 3)"
+		if [ -z "${videogroup}" ]; then
+			eerror "Failed to determine the video group gid"
+			die "Failed to determine the video group gid"
+		else
+			sed -i \
+				-e "s:PACKAGE:${PF}:g" \
+				-e "s:VIDEOGID:${videogroup}:" \
+				"${D}"/etc/modprobe.d/nvidia.conf || die
+		fi
+	fi
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
+		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
+		rm -f "${ROOT}"/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	use driver && use kernel_linux && linux-mod_pkg_postinst
+
+	# Switch to the nvidia implementation
+	if ! use libglvnd; then
+		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+	fi
+
+	readme.gentoo_print_elog
+
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	fi
+}
+
+pkg_prerm() {
+	if ! use libglvnd; then
+		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+	fi
+}
+
+pkg_postrm() {
+	use driver && use kernel_linux && linux-mod_pkg_postrm
+	if ! use libglvnd; then
+		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+	fi
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r4.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r4.ebuild
deleted file mode 100644
index e7e60ac326a7..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r4.ebuild
+++ /dev/null
@@ -1,564 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
-	nvidia-driver portability systemd toolchain-funcs unpacker udev
-
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
-
-NV_URI="https://us.download.nvidia.com/XFree86/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	tools? (
-		https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
-	)
-"
-
-EMULTILIB_PKG="true"
-KEYWORDS="-* amd64"
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0/${PV%.*}"
-
-IUSE="compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib static-libs +tools uvm wayland +X"
-REQUIRED_USE="
-	tools? ( X )
-	static-libs? ( tools )
-"
-
-COMMON="
-	driver? ( kernel_linux? ( acct-group/video ) )
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	tools? (
-		dev-libs/atk
-		dev-libs/glib:2
-		dev-libs/jansson
-		gtk3? (
-			x11-libs/gtk+:3
-		)
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf[X]
-		x11-libs/gtk+:2
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrandr
-		x11-libs/libXv
-		x11-libs/libXxf86vm
-		x11-libs/pango[X]
-	)
-	X? (
-		>=app-eselect/eselect-opengl-1.0.9
-		app-misc/pax-utils
-	)
-"
-DEPEND="
-	${COMMON}
-	kernel_linux? ( virtual/linux-sources )
-	tools? ( sys-apps/dbus )
-"
-RDEPEND="
-	${COMMON}
-	tools? ( !media-video/nvidia-settings )
-	uvm? ( >=virtual/opencl-3 )
-	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
-	X? (
-		<x11-base/xorg-server-1.20.99:=
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-	)
-"
-QA_PREBUILT="opt/* usr/lib*"
-S=${WORKDIR}/
-NV_KV_MAX_PLUS="5.5"
-CONFIG_CHECK="!DEBUG_MUTEXES ~!I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
-
-pkg_pretend() {
-	nvidia-driver_check
-}
-
-pkg_setup() {
-	nvidia-driver_check
-
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use driver && use kernel_linux; then
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
-		use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) nvidia-drm(video:${S}/kernel)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
-
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-	fi
-
-	if use kernel_linux && kernel_is lt 2 6 9; then
-		eerror "You must build this against 2.6.9 or higher kernels."
-	fi
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_DOC="${S}/doc"
-		NV_OBJ="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}"
-		NV_OBJ="${S}"
-		NV_SRC="${S}/kernel"
-		NV_MAN="${S}"
-		NV_X11="${S}"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_configure() {
-	tc-export AR CC LD
-
-	default
-}
-
-src_prepare() {
-	local man_file
-	for man_file in "${NV_MAN}"/*1.gz; do
-		gunzip $man_file || die
-	done
-
-	if use tools; then
-		cp "${FILESDIR}"/nvidia-settings-fno-common.patch "${WORKDIR}" || die
-		cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die
-		sed -i \
-			-e "s:@PV@:${PV}:g" \
-			"${WORKDIR}"/nvidia-settings-fno-common.patch \
-			"${WORKDIR}"/nvidia-settings-linker.patch \
-			|| die
-		eapply "${WORKDIR}"/nvidia-settings-fno-common.patch
-		eapply "${WORKDIR}"/nvidia-settings-linker.patch
-	fi
-
-	default
-
-	if ! [ -f nvidia_icd.json ]; then
-		cp nvidia_icd.json.template nvidia_icd.json || die
-		sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die
-	fi
-}
-
-src_compile() {
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use driver && use kernel_linux; then
-		BUILD_TARGETS=module linux-mod_src_compile \
-			KERNELRELEASE="${KV_FULL}" \
-			src="${KERNEL_DIR}"
-	fi
-
-	if use tools; then
-		emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl \
-			DO_STRIP= \
-			LIBDIR="$(get_libdir)" \
-			NVLD="$(tc-getLD)" \
-			NV_VERBOSE=1 \
-			OUTPUTDIR=. \
-			RANLIB="$(tc-getRANLIB)"
-
-		emake -C "${S}"/nvidia-settings-${PV}/src \
-			DO_STRIP= \
-			GTK3_AVAILABLE=$(usex gtk3 1 0) \
-			LIBDIR="$(get_libdir)" \
-			NVLD="$(tc-getLD)" \
-			NVML_ENABLED=0 \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 \
-			OUTPUTDIR=.
-	fi
-}
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if it is not /usr/lib
-donvidia() {
-	# Full path to library
-	nv_LIB="${1}"
-
-	# SOVER to use
-	nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
-
-	# Where to install
-	nv_DEST="${2}"
-
-	# Get just the library name
-	nv_LIBNAME=$(basename "${nv_LIB}")
-
-	if [[ "${nv_DEST}" ]]; then
-		exeinto ${nv_DEST}
-		action="doexe"
-	else
-		nv_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	fi
-
-	# Install the library
-	${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
-
-	# If the library has a SONAME and SONAME does not match the library name,
-	# then we need to create a symlink
-	if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
-		dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER}
-	fi
-
-	dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so}
-}
-
-src_install() {
-	if use driver && use kernel_linux; then
-		linux-mod_src_install
-
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_preinst, see bug #491414
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-430.conf nvidia.conf
-
-		if use uvm; then
-			doins "${FILESDIR}"/nvidia-rmmod.conf
-			udev_newrules "${FILESDIR}"/nvidia-uvm.udev-rule 99-nvidia-uvm.rules
-		else
-			sed -e 's|nvidia-uvm ||g' "${FILESDIR}"/nvidia-rmmod.conf \
-				> "${T}"/nvidia-rmmod.conf || die
-			doins "${T}"/nvidia-rmmod.conf
-		fi
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(get_udevdir)"
-		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
-
-	# NVIDIA framebuffer capture library
-	donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
-
-	# NVIDIA video encode/decode <-> CUDA
-	if use kernel_linux; then
-		donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
-		donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		# Xorg GLX driver
-		donvidia ${NV_X11}/libglxserver_nvidia.so.${NV_SOVER} \
-			/usr/$(get_libdir)/xorg/modules/extensions
-
-		# Xorg nvidia.conf
-		if has_version '>=x11-base/xorg-server-1.16'; then
-			insinto /usr/share/X11/xorg.conf.d
-			newins {,50-}nvidia-drm-outputclass.conf
-		fi
-
-		insinto /usr/share/glvnd/egl_vendor.d
-		doins ${NV_X11}/10_nvidia.json
-	fi
-
-	if use wayland; then
-		insinto /usr/share/egl/egl_external_platform.d
-		doins ${NV_X11}/10_nvidia_wayland.json
-	fi
-
-	# OpenCL ICD for NVIDIA
-	if use kernel_linux; then
-		insinto /etc/OpenCL/vendors
-		doins ${NV_OBJ}/nvidia.icd
-	fi
-
-	# Helper Apps
-	exeinto /opt/bin/
-
-	if use X; then
-		doexe ${NV_OBJ}/nvidia-xconfig
-
-		insinto /etc/vulkan/icd.d
-		doins nvidia_icd.json
-	fi
-
-	if use kernel_linux; then
-		doexe ${NV_OBJ}/nvidia-cuda-mps-control
-		doexe ${NV_OBJ}/nvidia-cuda-mps-server
-		doexe ${NV_OBJ}/nvidia-debugdump
-		doexe ${NV_OBJ}/nvidia-persistenced
-		doexe ${NV_OBJ}/nvidia-smi
-
-		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
-		doexe ${NV_OBJ}/nvidia-modprobe
-		fowners root:video /opt/bin/nvidia-modprobe
-		fperms 4710 /opt/bin/nvidia-modprobe
-		dosym /{opt,usr}/bin/nvidia-modprobe
-
-		doman nvidia-cuda-mps-control.1
-		doman nvidia-modprobe.1
-		doman nvidia-persistenced.1
-		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
-		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
-	fi
-
-	if use tools; then
-		emake -C "${S}"/nvidia-settings-${PV}/src/ \
-			DESTDIR="${D}" \
-			DO_STRIP= \
-			GTK3_AVAILABLE=$(usex gtk3 1 0) \
-			LIBDIR="${D}/usr/$(get_libdir)" \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 \
-			OUTPUTDIR=. \
-			PREFIX=/usr \
-			install
-
-		if use static-libs; then
-			dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
-
-			insinto /usr/include/NVCtrl
-			doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
-		fi
-
-		insinto /usr/share/nvidia/
-		doins nvidia-application-profiles-${PV}-key-documentation
-
-		insinto /etc/nvidia
-		newins \
-			nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
-
-		# There is no icon in the FreeBSD tarball.
-		use kernel_FreeBSD || \
-			doicon ${NV_OBJ}/nvidia-settings.png
-
-		domenu "${FILESDIR}"/nvidia-settings.desktop
-
-		exeinto /etc/X11/xinit/xinitrc.d
-		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
-	fi
-
-	dobin ${NV_OBJ}/nvidia-bug-report.sh
-
-	systemd_dounit *.service
-	dobin nvidia-sleep.sh
-	exeinto $(systemd_get_utildir)/system-sleep
-	doexe nvidia
-
-	if has_multilib_profile && use multilib; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-
-	# Documentation
-	if use kernel_FreeBSD; then
-		dodoc "${NV_DOC}/README"
-		use X && doman "${NV_MAN}"/nvidia-xconfig.1
-		use tools && doman "${NV_MAN}"/nvidia-settings.1
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-		doman "${NV_MAN}"/nvidia-smi.1
-		use X && doman "${NV_MAN}"/nvidia-xconfig.1
-		use tools && doman "${NV_MAN}"/nvidia-settings.1
-		doman "${NV_MAN}"/nvidia-cuda-mps-control.1
-	fi
-
-	readme.gentoo_create_doc
-
-	docinto html
-	dodoc -r ${NV_DOC}/html/*
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
-	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
-	local nv_libdir="${NV_OBJ}"
-
-	if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then
-		nv_libdir="${NV_OBJ}"/32
-	fi
-
-	if use X; then
-		NV_GLX_LIBRARIES=(
-			"libEGL.so.$(usex compat ${NV_SOVER} 1.1.0) ${GL_ROOT}"
-			"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGL.so.$(usex compat ${NV_SOVER} 1.7.0) ${GL_ROOT}"
-			"libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
-			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLESv2.so.2.1.0 ${GL_ROOT}"
-			"libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLX.so.0 ${GL_ROOT}"
-			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLdispatch.so.0 ${GL_ROOT}"
-			"libOpenCL.so.1.0.0 ${CL_ROOT}"
-			"libOpenGL.so.0 ${GL_ROOT}"
-			"libcuda.so.${NV_SOVER}"
-			"libnvcuvid.so.${NV_SOVER}"
-			"libnvidia-compiler.so.${NV_SOVER}"
-			"libnvidia-eglcore.so.${NV_SOVER}"
-			"libnvidia-encode.so.${NV_SOVER}"
-			"libnvidia-fatbinaryloader.so.${NV_SOVER}"
-			"libnvidia-fbc.so.${NV_SOVER}"
-			"libnvidia-glcore.so.${NV_SOVER}"
-			"libnvidia-glsi.so.${NV_SOVER}"
-			"libnvidia-glvkspirv.so.${NV_SOVER}"
-			"libnvidia-ifr.so.${NV_SOVER}"
-			"libnvidia-opencl.so.${NV_SOVER}"
-			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
-			"libvdpau_nvidia.so.${NV_SOVER}"
-		)
-
-		if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
-		then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-egl-wayland.so.1.1.2"
-			)
-		fi
-
-		if use kernel_FreeBSD; then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-tls.so.${NV_SOVER}"
-			)
-		fi
-
-		if use kernel_linux; then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-ml.so.${NV_SOVER}"
-				"libnvidia-tls.so.${NV_SOVER}"
-			)
-		fi
-
-		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
-		then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-cbl.so.${NV_SOVER}"
-				"libnvidia-rtcore.so.${NV_SOVER}"
-				"libnvoptix.so.${NV_SOVER}"
-			)
-		fi
-
-		for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
-			donvidia "${nv_libdir}"/${NV_LIB}
-		done
-	fi
-}
-
-pkg_preinst() {
-	if use driver && use kernel_linux; then
-		linux-mod_pkg_preinst
-
-		local videogroup="$(getent group video | cut -d ':' -f 3)"
-		if [ -z "${videogroup}" ]; then
-			eerror "Failed to determine the video group gid"
-			die "Failed to determine the video group gid"
-		else
-			sed -i \
-				-e "s:PACKAGE:${PF}:g" \
-				-e "s:VIDEOGID:${videogroup}:" \
-				"${D}"/etc/modprobe.d/nvidia.conf || die
-		fi
-	fi
-
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-}
-
-pkg_postinst() {
-	use driver && use kernel_linux && linux-mod_pkg_postinst
-
-	# Switch to the nvidia implementation
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-
-	readme.gentoo_print_elog
-
-	if ! use X; then
-		elog "You have elected to not install the X.org driver. Along with"
-		elog "this the OpenGL libraries and VDPAU libraries were not"
-		elog "installed. Additionally, once the driver is loaded your card"
-		elog "and fan will run at max speed which may not be desirable."
-		elog "Use the 'nvidia-smi' init script to have your card and fan"
-		elog "speed scale appropriately."
-		elog
-	fi
-	if ! use tools; then
-		elog "USE=tools controls whether the nvidia-settings application"
-		elog "is installed. If you would like to use it, enable that"
-		elog "flag and re-emerge this ebuild. Optionally you can install"
-		elog "media-video/nvidia-settings"
-		elog
-	fi
-
-	elog "To enable nvidia sleep services under systemd, run these commands:"
-	elog "	systemctl enable nvidia-suspend.service"
-	elog "	systemctl enable nvidia-hibernate.service"
-	elog "	systemctl enable nvidia-resume.service"
-	elog "Set the NVreg_TemporaryFilePath kernel module parameter to a"
-	elog "suitable path in case the default of /tmp does not work for you"
-	elog "For more information see:"
-	elog "${ROOT}/usr/share/doc/${PF}/html/powermanagement.html"
-}
-
-pkg_prerm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use driver && use kernel_linux && linux-mod_pkg_postrm
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild
new file mode 100644
index 000000000000..d2aeed7b1691
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild
@@ -0,0 +1,571 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
+	nvidia-driver portability systemd toolchain-funcs unpacker udev
+
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
+
+NV_URI="https://us.download.nvidia.com/XFree86/"
+SRC_URI="
+	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	tools? (
+		https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
+	)
+"
+
+EMULTILIB_PKG="true"
+KEYWORDS="-* amd64"
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0/${PV%.*}"
+
+IUSE="compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib static-libs +tools uvm wayland +X"
+REQUIRED_USE="
+	tools? ( X )
+	static-libs? ( tools )
+"
+
+COMMON="
+	driver? ( kernel_linux? ( acct-group/video ) )
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		gtk3? (
+			x11-libs/gtk+:3
+		)
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf[X]
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+	)
+	X? (
+		>=app-eselect/eselect-opengl-1.0.9
+		app-misc/pax-utils
+	)
+"
+DEPEND="
+	${COMMON}
+	kernel_linux? ( virtual/linux-sources )
+	tools? ( sys-apps/dbus )
+"
+RDEPEND="
+	${COMMON}
+	tools? ( !media-video/nvidia-settings )
+	uvm? ( >=virtual/opencl-3 )
+	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+	X? (
+		<x11-base/xorg-server-1.20.99:=
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+	)
+"
+QA_PREBUILT="opt/* usr/lib*"
+S=${WORKDIR}/
+NV_KV_MAX_PLUS="5.5"
+CONFIG_CHECK="
+	!DEBUG_MUTEXES
+	DRM
+	~!I2C_NVIDIA_GPU
+	~!LOCKDEP
+	~DRM_KMS_HELPER
+	~SYSVIPC
+"
+
+pkg_pretend() {
+	nvidia-driver_check
+}
+
+pkg_setup() {
+	nvidia-driver_check
+
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use driver && use kernel_linux; then
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
+		use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) nvidia-drm(video:${S}/kernel)"
+
+		# This needs to run after MODULE_NAMES (so that the eclass checks
+		# whether the kernel supports loadable modules) but before BUILD_PARAMS
+		# is set (so that KV_DIR is populated).
+		linux-mod_pkg_setup
+
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
+
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+	fi
+
+	if use kernel_linux && kernel_is lt 2 6 9; then
+		eerror "You must build this against 2.6.9 or higher kernels."
+	fi
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+		NV_DOC="${S}/doc"
+		NV_OBJ="${S}/obj"
+		NV_SRC="${S}/src"
+		NV_MAN="${S}/x11/man"
+		NV_X11="${S}/obj"
+		NV_SOVER=1
+	elif use kernel_linux; then
+		NV_DOC="${S}"
+		NV_OBJ="${S}"
+		NV_SRC="${S}/kernel"
+		NV_MAN="${S}"
+		NV_X11="${S}"
+		NV_SOVER=${PV}
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_configure() {
+	tc-export AR CC LD OBJCOPY
+
+	default
+}
+
+src_prepare() {
+	local man_file
+	for man_file in "${NV_MAN}"/*1.gz; do
+		gunzip $man_file || die
+	done
+
+	if use tools; then
+		cp "${FILESDIR}"/nvidia-settings-fno-common.patch "${WORKDIR}" || die
+		cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die
+		sed -i \
+			-e "s:@PV@:${PV}:g" \
+			"${WORKDIR}"/nvidia-settings-fno-common.patch \
+			"${WORKDIR}"/nvidia-settings-linker.patch \
+			|| die
+		eapply "${WORKDIR}"/nvidia-settings-fno-common.patch
+		eapply "${WORKDIR}"/nvidia-settings-linker.patch
+	fi
+
+	default
+
+	if ! [ -f nvidia_icd.json ]; then
+		cp nvidia_icd.json.template nvidia_icd.json || die
+		sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die
+	fi
+}
+
+src_compile() {
+	cd "${NV_SRC}"
+	if use kernel_FreeBSD; then
+		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+	elif use driver && use kernel_linux; then
+		BUILD_TARGETS=module linux-mod_src_compile \
+			KERNELRELEASE="${KV_FULL}" \
+			src="${KERNEL_DIR}"
+	fi
+
+	if use tools; then
+		emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl \
+			DO_STRIP= \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NV_VERBOSE=1 \
+			OUTPUTDIR=. \
+			RANLIB="$(tc-getRANLIB)"
+
+		emake -C "${S}"/nvidia-settings-${PV}/src \
+			DO_STRIP= \
+			GTK3_AVAILABLE=$(usex gtk3 1 0) \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NVML_ENABLED=0 \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 \
+			OUTPUTDIR=.
+	fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if it is not /usr/lib
+donvidia() {
+	# Full path to library
+	nv_LIB="${1}"
+
+	# SOVER to use
+	nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
+
+	# Where to install
+	nv_DEST="${2}"
+
+	# Get just the library name
+	nv_LIBNAME=$(basename "${nv_LIB}")
+
+	if [[ "${nv_DEST}" ]]; then
+		exeinto ${nv_DEST}
+		action="doexe"
+	else
+		nv_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	fi
+
+	# Install the library
+	${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
+
+	# If the library has a SONAME and SONAME does not match the library name,
+	# then we need to create a symlink
+	if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
+		dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER}
+	fi
+
+	dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so}
+}
+
+src_install() {
+	if use driver && use kernel_linux; then
+		linux-mod_src_install
+
+		# Add the aliases
+		# This file is tweaked with the appropriate video group in
+		# pkg_preinst, see bug #491414
+		insinto /etc/modprobe.d
+		newins "${FILESDIR}"/nvidia-430.conf nvidia.conf
+
+		if use uvm; then
+			doins "${FILESDIR}"/nvidia-rmmod.conf
+			udev_newrules "${FILESDIR}"/nvidia-uvm.udev-rule 99-nvidia-uvm.rules
+		else
+			sed -e 's|nvidia-uvm ||g' "${FILESDIR}"/nvidia-rmmod.conf \
+				> "${T}"/nvidia-rmmod.conf || die
+			doins "${T}"/nvidia-rmmod.conf
+		fi
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(get_udevdir)"
+		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+	elif use kernel_FreeBSD; then
+		if use x86-fbsd; then
+			insinto /boot/modules
+			doins "${S}/src/nvidia.kld"
+		fi
+
+		exeinto /boot/modules
+		doexe "${S}/src/nvidia.ko"
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
+
+	# NVIDIA framebuffer capture library
+	donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
+
+	# NVIDIA video encode/decode <-> CUDA
+	if use kernel_linux; then
+		donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
+		donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
+	fi
+
+	if use X; then
+		# Xorg DDX driver
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
+		doins ${NV_X11}/nvidia_drv.so
+
+		# Xorg GLX driver
+		donvidia ${NV_X11}/libglxserver_nvidia.so.${NV_SOVER} \
+			/usr/$(get_libdir)/xorg/modules/extensions
+
+		# Xorg nvidia.conf
+		if has_version '>=x11-base/xorg-server-1.16'; then
+			insinto /usr/share/X11/xorg.conf.d
+			newins {,50-}nvidia-drm-outputclass.conf
+		fi
+
+		insinto /usr/share/glvnd/egl_vendor.d
+		doins ${NV_X11}/10_nvidia.json
+	fi
+
+	if use wayland; then
+		insinto /usr/share/egl/egl_external_platform.d
+		doins ${NV_X11}/10_nvidia_wayland.json
+	fi
+
+	# OpenCL ICD for NVIDIA
+	if use kernel_linux; then
+		insinto /etc/OpenCL/vendors
+		doins ${NV_OBJ}/nvidia.icd
+	fi
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe ${NV_OBJ}/nvidia-xconfig
+
+		insinto /etc/vulkan/icd.d
+		doins nvidia_icd.json
+	fi
+
+	if use kernel_linux; then
+		doexe ${NV_OBJ}/nvidia-cuda-mps-control
+		doexe ${NV_OBJ}/nvidia-cuda-mps-server
+		doexe ${NV_OBJ}/nvidia-debugdump
+		doexe ${NV_OBJ}/nvidia-persistenced
+		doexe ${NV_OBJ}/nvidia-smi
+
+		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+		doexe ${NV_OBJ}/nvidia-modprobe
+		fowners root:video /opt/bin/nvidia-modprobe
+		fperms 4710 /opt/bin/nvidia-modprobe
+		dosym /{opt,usr}/bin/nvidia-modprobe
+
+		doman nvidia-cuda-mps-control.1
+		doman nvidia-modprobe.1
+		doman nvidia-persistenced.1
+		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
+		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
+	fi
+
+	if use tools; then
+		emake -C "${S}"/nvidia-settings-${PV}/src/ \
+			DESTDIR="${D}" \
+			DO_STRIP= \
+			GTK3_AVAILABLE=$(usex gtk3 1 0) \
+			LIBDIR="${D}/usr/$(get_libdir)" \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 \
+			OUTPUTDIR=. \
+			PREFIX=/usr \
+			install
+
+		if use static-libs; then
+			dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
+
+			insinto /usr/include/NVCtrl
+			doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
+		fi
+
+		insinto /usr/share/nvidia/
+		doins nvidia-application-profiles-${PV}-key-documentation
+
+		insinto /etc/nvidia
+		newins \
+			nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
+
+		# There is no icon in the FreeBSD tarball.
+		use kernel_FreeBSD || \
+			doicon ${NV_OBJ}/nvidia-settings.png
+
+		domenu "${FILESDIR}"/nvidia-settings.desktop
+
+		exeinto /etc/X11/xinit/xinitrc.d
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+	fi
+
+	dobin ${NV_OBJ}/nvidia-bug-report.sh
+
+	systemd_dounit *.service
+	dobin nvidia-sleep.sh
+	exeinto /lib/systemd/system-sleep
+	doexe nvidia
+
+	if has_multilib_profile && use multilib; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+
+	# Documentation
+	if use kernel_FreeBSD; then
+		dodoc "${NV_DOC}/README"
+		use X && doman "${NV_MAN}"/nvidia-xconfig.1
+		use tools && doman "${NV_MAN}"/nvidia-settings.1
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}"/nvidia-smi.1
+		use X && doman "${NV_MAN}"/nvidia-xconfig.1
+		use tools && doman "${NV_MAN}"/nvidia-settings.1
+		doman "${NV_MAN}"/nvidia-cuda-mps-control.1
+	fi
+
+	readme.gentoo_create_doc
+
+	docinto html
+	dodoc -r ${NV_DOC}/html/*
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local nv_libdir="${NV_OBJ}"
+
+	if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then
+		nv_libdir="${NV_OBJ}"/32
+	fi
+
+	if use X; then
+		NV_GLX_LIBRARIES=(
+			"libEGL.so.$(usex compat ${NV_SOVER} 1.1.0) ${GL_ROOT}"
+			"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGL.so.$(usex compat ${NV_SOVER} 1.7.0) ${GL_ROOT}"
+			"libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
+			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLESv2.so.2.1.0 ${GL_ROOT}"
+			"libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLX.so.0 ${GL_ROOT}"
+			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLdispatch.so.0 ${GL_ROOT}"
+			"libOpenCL.so.1.0.0 ${CL_ROOT}"
+			"libOpenGL.so.0 ${GL_ROOT}"
+			"libcuda.so.${NV_SOVER}"
+			"libnvcuvid.so.${NV_SOVER}"
+			"libnvidia-compiler.so.${NV_SOVER}"
+			"libnvidia-eglcore.so.${NV_SOVER}"
+			"libnvidia-encode.so.${NV_SOVER}"
+			"libnvidia-fatbinaryloader.so.${NV_SOVER}"
+			"libnvidia-fbc.so.${NV_SOVER}"
+			"libnvidia-glcore.so.${NV_SOVER}"
+			"libnvidia-glsi.so.${NV_SOVER}"
+			"libnvidia-glvkspirv.so.${NV_SOVER}"
+			"libnvidia-ifr.so.${NV_SOVER}"
+			"libnvidia-opencl.so.${NV_SOVER}"
+			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
+			"libvdpau_nvidia.so.${NV_SOVER}"
+		)
+
+		if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-egl-wayland.so.1.1.2"
+			)
+		fi
+
+		if use kernel_FreeBSD; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-tls.so.${NV_SOVER}"
+			)
+		fi
+
+		if use kernel_linux; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-ml.so.${NV_SOVER}"
+				"libnvidia-tls.so.${NV_SOVER}"
+			)
+		fi
+
+		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-cbl.so.${NV_SOVER}"
+				"libnvidia-rtcore.so.${NV_SOVER}"
+				"libnvoptix.so.${NV_SOVER}"
+			)
+		fi
+
+		for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
+			donvidia "${nv_libdir}"/${NV_LIB}
+		done
+	fi
+}
+
+pkg_preinst() {
+	if use driver && use kernel_linux; then
+		linux-mod_pkg_preinst
+
+		local videogroup="$(getent group video | cut -d ':' -f 3)"
+		if [ -z "${videogroup}" ]; then
+			eerror "Failed to determine the video group gid"
+			die "Failed to determine the video group gid"
+		else
+			sed -i \
+				-e "s:PACKAGE:${PF}:g" \
+				-e "s:VIDEOGID:${videogroup}:" \
+				"${D}"/etc/modprobe.d/nvidia.conf || die
+		fi
+	fi
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
+		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
+		rm -f "${ROOT}"/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	use driver && use kernel_linux && linux-mod_pkg_postinst
+
+	# Switch to the nvidia implementation
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+
+	readme.gentoo_print_elog
+
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	fi
+
+	elog "To enable nvidia sleep services under systemd, run these commands:"
+	elog "	systemctl enable nvidia-suspend.service"
+	elog "	systemctl enable nvidia-hibernate.service"
+	elog "	systemctl enable nvidia-resume.service"
+	elog "Set the NVreg_TemporaryFilePath kernel module parameter to a"
+	elog "suitable path in case the default of /tmp does not work for you"
+	elog "For more information see:"
+	elog "${ROOT}/usr/share/doc/${PF}/html/powermanagement.html"
+}
+
+pkg_prerm() {
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use driver && use kernel_linux && linux-mod_pkg_postrm
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r4.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r4.ebuild
deleted file mode 100644
index 24fc073904bb..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r4.ebuild
+++ /dev/null
@@ -1,582 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
-	nvidia-driver portability systemd toolchain-funcs unpacker udev
-
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
-
-NV_URI="https://us.download.nvidia.com/XFree86/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	tools? (
-		https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
-	)
-"
-
-EMULTILIB_PKG="true"
-KEYWORDS="-* amd64"
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0/${PV%.*}"
-
-IUSE="compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib static-libs +tools uvm wayland +X"
-REQUIRED_USE="
-	tools? ( X )
-	static-libs? ( tools )
-"
-
-COMMON="
-	driver? ( kernel_linux? ( acct-group/video ) )
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	tools? (
-		dev-libs/atk
-		dev-libs/glib:2
-		dev-libs/jansson
-		gtk3? (
-			x11-libs/gtk+:3
-		)
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf[X]
-		x11-libs/gtk+:2
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrandr
-		x11-libs/libXv
-		x11-libs/libXxf86vm
-		x11-libs/pango[X]
-	)
-	X? (
-		!libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 )
-		libglvnd? (
-			media-libs/libglvnd[${MULTILIB_USEDEP}]
-			!app-eselect/eselect-opengl
-		)
-		app-misc/pax-utils
-	)
-"
-DEPEND="
-	${COMMON}
-	kernel_linux? ( virtual/linux-sources )
-	tools? ( sys-apps/dbus )
-"
-RDEPEND="
-	${COMMON}
-	tools? ( !media-video/nvidia-settings )
-	uvm? ( >=virtual/opencl-3 )
-	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
-	X? (
-		<x11-base/xorg-server-1.20.99:=
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-	)
-"
-QA_PREBUILT="opt/* usr/lib*"
-S=${WORKDIR}/
-NV_KV_MAX_PLUS="5.4"
-CONFIG_CHECK="!DEBUG_MUTEXES ~!I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
-
-pkg_pretend() {
-	nvidia-driver_check
-}
-
-pkg_setup() {
-	nvidia-driver_check
-
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use driver && use kernel_linux; then
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
-		use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) nvidia-drm(video:${S}/kernel)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
-
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-	fi
-
-	if use kernel_linux && kernel_is lt 2 6 9; then
-		eerror "You must build this against 2.6.9 or higher kernels."
-	fi
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_DOC="${S}/doc"
-		NV_OBJ="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}"
-		NV_OBJ="${S}"
-		NV_SRC="${S}/kernel"
-		NV_MAN="${S}"
-		NV_X11="${S}"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_configure() {
-	tc-export AR CC LD
-
-	default
-}
-
-src_prepare() {
-	local man_file
-	for man_file in "${NV_MAN}"/*1.gz; do
-		gunzip $man_file || die
-	done
-
-	if use tools; then
-		cp "${FILESDIR}"/nvidia-settings-fno-common.patch "${WORKDIR}" || die
-		cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die
-		sed -i \
-			-e "s:@PV@:${PV}:g" \
-			"${WORKDIR}"/nvidia-settings-fno-common.patch \
-			"${WORKDIR}"/nvidia-settings-linker.patch \
-			|| die
-		eapply "${WORKDIR}"/nvidia-settings-fno-common.patch
-		eapply "${WORKDIR}"/nvidia-settings-linker.patch
-	fi
-
-	default
-
-	if ! [ -f nvidia_icd.json ]; then
-		cp nvidia_icd.json.template nvidia_icd.json || die
-		sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die
-	fi
-}
-
-src_compile() {
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use driver && use kernel_linux; then
-		BUILD_TARGETS=module linux-mod_src_compile \
-			KERNELRELEASE="${KV_FULL}" \
-			src="${KERNEL_DIR}"
-	fi
-
-	if use tools; then
-		emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl \
-			DO_STRIP= \
-			LIBDIR="$(get_libdir)" \
-			NVLD="$(tc-getLD)" \
-			NV_VERBOSE=1 \
-			OUTPUTDIR=. \
-			RANLIB="$(tc-getRANLIB)"
-
-		emake -C "${S}"/nvidia-settings-${PV}/src \
-			DO_STRIP= \
-			GTK3_AVAILABLE=$(usex gtk3 1 0) \
-			LIBDIR="$(get_libdir)" \
-			NVLD="$(tc-getLD)" \
-			NVML_ENABLED=0 \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 \
-			OUTPUTDIR=.
-	fi
-}
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if it is not /usr/lib
-donvidia() {
-	# Full path to library
-	nv_LIB="${1}"
-
-	# SOVER to use
-	nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
-
-	# Where to install
-	nv_DEST="${2}"
-
-	# Get just the library name
-	nv_LIBNAME=$(basename "${nv_LIB}")
-
-	if [[ "${nv_DEST}" ]]; then
-		exeinto ${nv_DEST}
-		action="doexe"
-	else
-		nv_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	fi
-
-	# Install the library
-	${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
-
-	# If the library has a SONAME and SONAME does not match the library name,
-	# then we need to create a symlink
-	if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
-		dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER}
-	fi
-
-	dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so}
-}
-
-src_install() {
-	if use driver && use kernel_linux; then
-		linux-mod_src_install
-
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_preinst, see bug #491414
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-430.conf nvidia.conf
-
-		if use uvm; then
-			doins "${FILESDIR}"/nvidia-rmmod.conf
-			udev_newrules "${FILESDIR}"/nvidia-uvm.udev-rule 99-nvidia-uvm.rules
-		else
-			sed -e 's|nvidia-uvm ||g' "${FILESDIR}"/nvidia-rmmod.conf \
-				> "${T}"/nvidia-rmmod.conf || die
-			doins "${T}"/nvidia-rmmod.conf
-		fi
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(get_udevdir)"
-		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
-
-	# NVIDIA framebuffer capture library
-	donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
-
-	# NVIDIA video encode/decode <-> CUDA
-	if use kernel_linux; then
-		donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
-		donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		# Xorg GLX driver
-		donvidia ${NV_X11}/libglxserver_nvidia.so.${NV_SOVER} \
-			/usr/$(get_libdir)/xorg/modules/extensions
-
-		# Xorg nvidia.conf
-		if has_version '>=x11-base/xorg-server-1.16'; then
-			insinto /usr/share/X11/xorg.conf.d
-			newins {,50-}nvidia-drm-outputclass.conf
-		fi
-
-		insinto /usr/share/glvnd/egl_vendor.d
-		doins ${NV_X11}/10_nvidia.json
-	fi
-
-	if use wayland; then
-		insinto /usr/share/egl/egl_external_platform.d
-		doins ${NV_X11}/10_nvidia_wayland.json
-	fi
-
-	# OpenCL ICD for NVIDIA
-	if use kernel_linux; then
-		insinto /etc/OpenCL/vendors
-		doins ${NV_OBJ}/nvidia.icd
-	fi
-
-	# Helper Apps
-	exeinto /opt/bin/
-
-	if use X; then
-		doexe ${NV_OBJ}/nvidia-xconfig
-
-		insinto /etc/vulkan/icd.d
-		doins nvidia_icd.json
-	fi
-
-	if use kernel_linux; then
-		doexe ${NV_OBJ}/nvidia-cuda-mps-control
-		doexe ${NV_OBJ}/nvidia-cuda-mps-server
-		doexe ${NV_OBJ}/nvidia-debugdump
-		doexe ${NV_OBJ}/nvidia-persistenced
-		doexe ${NV_OBJ}/nvidia-smi
-
-		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
-		doexe ${NV_OBJ}/nvidia-modprobe
-		fowners root:video /opt/bin/nvidia-modprobe
-		fperms 4710 /opt/bin/nvidia-modprobe
-		dosym /{opt,usr}/bin/nvidia-modprobe
-
-		doman nvidia-cuda-mps-control.1
-		doman nvidia-modprobe.1
-		doman nvidia-persistenced.1
-		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
-		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
-	fi
-
-	if use tools; then
-		emake -C "${S}"/nvidia-settings-${PV}/src/ \
-			DESTDIR="${D}" \
-			DO_STRIP= \
-			GTK3_AVAILABLE=$(usex gtk3 1 0) \
-			LIBDIR="${D}/usr/$(get_libdir)" \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 \
-			OUTPUTDIR=. \
-			PREFIX=/usr \
-			install
-
-		if use static-libs; then
-			dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
-
-			insinto /usr/include/NVCtrl
-			doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
-		fi
-
-		insinto /usr/share/nvidia/
-		doins nvidia-application-profiles-${PV}-key-documentation
-
-		insinto /etc/nvidia
-		newins \
-			nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
-
-		# There is no icon in the FreeBSD tarball.
-		use kernel_FreeBSD || \
-			doicon ${NV_OBJ}/nvidia-settings.png
-
-		domenu "${FILESDIR}"/nvidia-settings.desktop
-
-		exeinto /etc/X11/xinit/xinitrc.d
-		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
-	fi
-
-	dobin ${NV_OBJ}/nvidia-bug-report.sh
-
-	systemd_dounit *.service
-	dobin nvidia-sleep.sh
-	exeinto $(systemd_get_utildir)/system-sleep
-	doexe nvidia
-
-	if has_multilib_profile && use multilib; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-
-	# Documentation
-	if use kernel_FreeBSD; then
-		dodoc "${NV_DOC}/README"
-		use X && doman "${NV_MAN}"/nvidia-xconfig.1
-		use tools && doman "${NV_MAN}"/nvidia-settings.1
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-		doman "${NV_MAN}"/nvidia-smi.1
-		use X && doman "${NV_MAN}"/nvidia-xconfig.1
-		use tools && doman "${NV_MAN}"/nvidia-settings.1
-		doman "${NV_MAN}"/nvidia-cuda-mps-control.1
-	fi
-
-	readme.gentoo_create_doc
-
-	docinto html
-	dodoc -r ${NV_DOC}/html/*
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	if use libglvnd; then
-		local GL_ROOT="/usr/$(get_libdir)"
-	else
-		local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
-	fi
-	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
-	local nv_libdir="${NV_OBJ}"
-
-	if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then
-		nv_libdir="${NV_OBJ}"/32
-	fi
-
-	if use X; then
-		NV_GLX_LIBRARIES=(
-			"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libOpenCL.so.1.0.0 ${CL_ROOT}"
-			"libcuda.so.${NV_SOVER}"
-			"libnvcuvid.so.${NV_SOVER}"
-			"libnvidia-compiler.so.${NV_SOVER}"
-			"libnvidia-eglcore.so.${NV_SOVER}"
-			"libnvidia-encode.so.${NV_SOVER}"
-			"libnvidia-fatbinaryloader.so.${NV_SOVER}"
-			"libnvidia-fbc.so.${NV_SOVER}"
-			"libnvidia-glcore.so.${NV_SOVER}"
-			"libnvidia-glsi.so.${NV_SOVER}"
-			"libnvidia-glvkspirv.so.${NV_SOVER}"
-			"libnvidia-ifr.so.${NV_SOVER}"
-			"libnvidia-opencl.so.${NV_SOVER}"
-			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
-			"libvdpau_nvidia.so.${NV_SOVER}"
-		)
-		if ! use libglvnd; then
-			NV_GLX_LIBRARIES+=(
-				"libEGL.so.$( [[ ${ABI} == "amd64" ]] && usex compat ${NV_SOVER} 1.1.0 || echo 1.1.0) ${GL_ROOT}"
-				"libGL.so.1.7.0 ${GL_ROOT}"
-				"libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
-				"libGLESv2.so.2.1.0 ${GL_ROOT}"
-				"libGLX.so.0 ${GL_ROOT}"
-				"libGLdispatch.so.0 ${GL_ROOT}"
-				"libOpenGL.so.0 ${GL_ROOT}"
-			)
-		fi
-
-		if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
-		then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-egl-wayland.so.1.1.3"
-			)
-		fi
-
-		if use kernel_FreeBSD; then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-tls.so.${NV_SOVER}"
-			)
-		fi
-
-		if use kernel_linux; then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-ml.so.${NV_SOVER}"
-				"libnvidia-tls.so.${NV_SOVER}"
-			)
-		fi
-
-		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
-		then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-cbl.so.${NV_SOVER}"
-				"libnvidia-rtcore.so.${NV_SOVER}"
-				"libnvoptix.so.${NV_SOVER}"
-			)
-		fi
-
-		for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
-			donvidia "${nv_libdir}"/${NV_LIB}
-		done
-	fi
-}
-
-pkg_preinst() {
-	if use driver && use kernel_linux; then
-		linux-mod_pkg_preinst
-
-		local videogroup="$(getent group video | cut -d ':' -f 3)"
-		if [ -z "${videogroup}" ]; then
-			eerror "Failed to determine the video group gid"
-			die "Failed to determine the video group gid"
-		else
-			sed -i \
-				-e "s:PACKAGE:${PF}:g" \
-				-e "s:VIDEOGID:${videogroup}:" \
-				"${D}"/etc/modprobe.d/nvidia.conf || die
-		fi
-	fi
-
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-}
-
-pkg_postinst() {
-	use driver && use kernel_linux && linux-mod_pkg_postinst
-
-	# Switch to the nvidia implementation
-	if ! use libglvnd; then
-		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	fi
-
-	readme.gentoo_print_elog
-
-	if ! use X; then
-		elog "You have elected to not install the X.org driver. Along with"
-		elog "this the OpenGL libraries and VDPAU libraries were not"
-		elog "installed. Additionally, once the driver is loaded your card"
-		elog "and fan will run at max speed which may not be desirable."
-		elog "Use the 'nvidia-smi' init script to have your card and fan"
-		elog "speed scale appropriately."
-		elog
-	fi
-	if ! use tools; then
-		elog "USE=tools controls whether the nvidia-settings application"
-		elog "is installed. If you would like to use it, enable that"
-		elog "flag and re-emerge this ebuild. Optionally you can install"
-		elog "media-video/nvidia-settings"
-		elog
-	fi
-
-	elog "To enable nvidia sleep services under systemd, run these commands:"
-	elog "	systemctl enable nvidia-suspend.service"
-	elog "	systemctl enable nvidia-hibernate.service"
-	elog "	systemctl enable nvidia-resume.service"
-	elog "Set the NVreg_TemporaryFilePath kernel module parameter to a"
-	elog "suitable path in case the default of /tmp does not work for you"
-	elog "For more information see:"
-	elog "${ROOT}/usr/share/doc/${PF}/html/powermanagement.html"
-}
-
-pkg_prerm() {
-	if ! use libglvnd; then
-		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-	fi
-}
-
-pkg_postrm() {
-	use driver && use kernel_linux && linux-mod_pkg_postrm
-	if ! use libglvnd; then
-		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-	fi
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild
new file mode 100644
index 000000000000..a0a7e2f2d5f8
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild
@@ -0,0 +1,589 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
+	nvidia-driver portability systemd toolchain-funcs unpacker udev
+
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
+
+NV_URI="https://us.download.nvidia.com/XFree86/"
+SRC_URI="
+	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	tools? (
+		https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
+	)
+"
+
+EMULTILIB_PKG="true"
+KEYWORDS="-* amd64"
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0/${PV%.*}"
+
+IUSE="compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib static-libs +tools uvm wayland +X"
+REQUIRED_USE="
+	tools? ( X )
+	static-libs? ( tools )
+"
+
+COMMON="
+	driver? ( kernel_linux? ( acct-group/video ) )
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		gtk3? (
+			x11-libs/gtk+:3
+		)
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf[X]
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+	)
+	X? (
+		!libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 )
+		libglvnd? (
+			media-libs/libglvnd[${MULTILIB_USEDEP}]
+			!app-eselect/eselect-opengl
+		)
+		app-misc/pax-utils
+	)
+"
+DEPEND="
+	${COMMON}
+	kernel_linux? ( virtual/linux-sources )
+	tools? ( sys-apps/dbus )
+"
+RDEPEND="
+	${COMMON}
+	tools? ( !media-video/nvidia-settings )
+	uvm? ( >=virtual/opencl-3 )
+	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+	X? (
+		<x11-base/xorg-server-1.20.99:=
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+	)
+"
+QA_PREBUILT="opt/* usr/lib*"
+S=${WORKDIR}/
+NV_KV_MAX_PLUS="5.4"
+CONFIG_CHECK="
+	!DEBUG_MUTEXES
+	DRM
+	~!I2C_NVIDIA_GPU
+	~!LOCKDEP
+	~DRM_KMS_HELPER
+	~SYSVIPC
+"
+
+pkg_pretend() {
+	nvidia-driver_check
+}
+
+pkg_setup() {
+	nvidia-driver_check
+
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use driver && use kernel_linux; then
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
+		use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) nvidia-drm(video:${S}/kernel)"
+
+		# This needs to run after MODULE_NAMES (so that the eclass checks
+		# whether the kernel supports loadable modules) but before BUILD_PARAMS
+		# is set (so that KV_DIR is populated).
+		linux-mod_pkg_setup
+
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
+
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+	fi
+
+	if use kernel_linux && kernel_is lt 2 6 9; then
+		eerror "You must build this against 2.6.9 or higher kernels."
+	fi
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+		NV_DOC="${S}/doc"
+		NV_OBJ="${S}/obj"
+		NV_SRC="${S}/src"
+		NV_MAN="${S}/x11/man"
+		NV_X11="${S}/obj"
+		NV_SOVER=1
+	elif use kernel_linux; then
+		NV_DOC="${S}"
+		NV_OBJ="${S}"
+		NV_SRC="${S}/kernel"
+		NV_MAN="${S}"
+		NV_X11="${S}"
+		NV_SOVER=${PV}
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_configure() {
+	tc-export AR CC LD OBJCOPY
+
+	default
+}
+
+src_prepare() {
+	local man_file
+	for man_file in "${NV_MAN}"/*1.gz; do
+		gunzip $man_file || die
+	done
+
+	if use tools; then
+		cp "${FILESDIR}"/nvidia-settings-fno-common.patch "${WORKDIR}" || die
+		cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die
+		sed -i \
+			-e "s:@PV@:${PV}:g" \
+			"${WORKDIR}"/nvidia-settings-fno-common.patch \
+			"${WORKDIR}"/nvidia-settings-linker.patch \
+			|| die
+		eapply "${WORKDIR}"/nvidia-settings-fno-common.patch
+		eapply "${WORKDIR}"/nvidia-settings-linker.patch
+	fi
+
+	default
+
+	if ! [ -f nvidia_icd.json ]; then
+		cp nvidia_icd.json.template nvidia_icd.json || die
+		sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die
+	fi
+}
+
+src_compile() {
+	cd "${NV_SRC}"
+	if use kernel_FreeBSD; then
+		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+	elif use driver && use kernel_linux; then
+		BUILD_TARGETS=module linux-mod_src_compile \
+			KERNELRELEASE="${KV_FULL}" \
+			src="${KERNEL_DIR}"
+	fi
+
+	if use tools; then
+		emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl \
+			DO_STRIP= \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NV_VERBOSE=1 \
+			OUTPUTDIR=. \
+			RANLIB="$(tc-getRANLIB)"
+
+		emake -C "${S}"/nvidia-settings-${PV}/src \
+			DO_STRIP= \
+			GTK3_AVAILABLE=$(usex gtk3 1 0) \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NVML_ENABLED=0 \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 \
+			OUTPUTDIR=.
+	fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if it is not /usr/lib
+donvidia() {
+	# Full path to library
+	nv_LIB="${1}"
+
+	# SOVER to use
+	nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
+
+	# Where to install
+	nv_DEST="${2}"
+
+	# Get just the library name
+	nv_LIBNAME=$(basename "${nv_LIB}")
+
+	if [[ "${nv_DEST}" ]]; then
+		exeinto ${nv_DEST}
+		action="doexe"
+	else
+		nv_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	fi
+
+	# Install the library
+	${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
+
+	# If the library has a SONAME and SONAME does not match the library name,
+	# then we need to create a symlink
+	if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
+		dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER}
+	fi
+
+	dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so}
+}
+
+src_install() {
+	if use driver && use kernel_linux; then
+		linux-mod_src_install
+
+		# Add the aliases
+		# This file is tweaked with the appropriate video group in
+		# pkg_preinst, see bug #491414
+		insinto /etc/modprobe.d
+		newins "${FILESDIR}"/nvidia-430.conf nvidia.conf
+
+		if use uvm; then
+			doins "${FILESDIR}"/nvidia-rmmod.conf
+			udev_newrules "${FILESDIR}"/nvidia-uvm.udev-rule 99-nvidia-uvm.rules
+		else
+			sed -e 's|nvidia-uvm ||g' "${FILESDIR}"/nvidia-rmmod.conf \
+				> "${T}"/nvidia-rmmod.conf || die
+			doins "${T}"/nvidia-rmmod.conf
+		fi
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(get_udevdir)"
+		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+	elif use kernel_FreeBSD; then
+		if use x86-fbsd; then
+			insinto /boot/modules
+			doins "${S}/src/nvidia.kld"
+		fi
+
+		exeinto /boot/modules
+		doexe "${S}/src/nvidia.ko"
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
+
+	# NVIDIA framebuffer capture library
+	donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
+
+	# NVIDIA video encode/decode <-> CUDA
+	if use kernel_linux; then
+		donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
+		donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
+	fi
+
+	if use X; then
+		# Xorg DDX driver
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
+		doins ${NV_X11}/nvidia_drv.so
+
+		# Xorg GLX driver
+		donvidia ${NV_X11}/libglxserver_nvidia.so.${NV_SOVER} \
+			/usr/$(get_libdir)/xorg/modules/extensions
+
+		# Xorg nvidia.conf
+		if has_version '>=x11-base/xorg-server-1.16'; then
+			insinto /usr/share/X11/xorg.conf.d
+			newins {,50-}nvidia-drm-outputclass.conf
+		fi
+
+		insinto /usr/share/glvnd/egl_vendor.d
+		doins ${NV_X11}/10_nvidia.json
+	fi
+
+	if use wayland; then
+		insinto /usr/share/egl/egl_external_platform.d
+		doins ${NV_X11}/10_nvidia_wayland.json
+	fi
+
+	# OpenCL ICD for NVIDIA
+	if use kernel_linux; then
+		insinto /etc/OpenCL/vendors
+		doins ${NV_OBJ}/nvidia.icd
+	fi
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe ${NV_OBJ}/nvidia-xconfig
+
+		insinto /etc/vulkan/icd.d
+		doins nvidia_icd.json
+	fi
+
+	if use kernel_linux; then
+		doexe ${NV_OBJ}/nvidia-cuda-mps-control
+		doexe ${NV_OBJ}/nvidia-cuda-mps-server
+		doexe ${NV_OBJ}/nvidia-debugdump
+		doexe ${NV_OBJ}/nvidia-persistenced
+		doexe ${NV_OBJ}/nvidia-smi
+
+		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+		doexe ${NV_OBJ}/nvidia-modprobe
+		fowners root:video /opt/bin/nvidia-modprobe
+		fperms 4710 /opt/bin/nvidia-modprobe
+		dosym /{opt,usr}/bin/nvidia-modprobe
+
+		doman nvidia-cuda-mps-control.1
+		doman nvidia-modprobe.1
+		doman nvidia-persistenced.1
+		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
+		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
+	fi
+
+	if use tools; then
+		emake -C "${S}"/nvidia-settings-${PV}/src/ \
+			DESTDIR="${D}" \
+			DO_STRIP= \
+			GTK3_AVAILABLE=$(usex gtk3 1 0) \
+			LIBDIR="${D}/usr/$(get_libdir)" \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 \
+			OUTPUTDIR=. \
+			PREFIX=/usr \
+			install
+
+		if use static-libs; then
+			dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
+
+			insinto /usr/include/NVCtrl
+			doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
+		fi
+
+		insinto /usr/share/nvidia/
+		doins nvidia-application-profiles-${PV}-key-documentation
+
+		insinto /etc/nvidia
+		newins \
+			nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
+
+		# There is no icon in the FreeBSD tarball.
+		use kernel_FreeBSD || \
+			doicon ${NV_OBJ}/nvidia-settings.png
+
+		domenu "${FILESDIR}"/nvidia-settings.desktop
+
+		exeinto /etc/X11/xinit/xinitrc.d
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+	fi
+
+	dobin ${NV_OBJ}/nvidia-bug-report.sh
+
+	systemd_dounit *.service
+	dobin nvidia-sleep.sh
+	exeinto /lib/systemd/system-sleep
+	doexe nvidia
+
+	if has_multilib_profile && use multilib; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+
+	# Documentation
+	if use kernel_FreeBSD; then
+		dodoc "${NV_DOC}/README"
+		use X && doman "${NV_MAN}"/nvidia-xconfig.1
+		use tools && doman "${NV_MAN}"/nvidia-settings.1
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}"/nvidia-smi.1
+		use X && doman "${NV_MAN}"/nvidia-xconfig.1
+		use tools && doman "${NV_MAN}"/nvidia-settings.1
+		doman "${NV_MAN}"/nvidia-cuda-mps-control.1
+	fi
+
+	readme.gentoo_create_doc
+
+	docinto html
+	dodoc -r ${NV_DOC}/html/*
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	if use libglvnd; then
+		local GL_ROOT="/usr/$(get_libdir)"
+	else
+		local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+	fi
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local nv_libdir="${NV_OBJ}"
+
+	if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then
+		nv_libdir="${NV_OBJ}"/32
+	fi
+
+	if use X; then
+		NV_GLX_LIBRARIES=(
+			"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libOpenCL.so.1.0.0 ${CL_ROOT}"
+			"libcuda.so.${NV_SOVER}"
+			"libnvcuvid.so.${NV_SOVER}"
+			"libnvidia-compiler.so.${NV_SOVER}"
+			"libnvidia-eglcore.so.${NV_SOVER}"
+			"libnvidia-encode.so.${NV_SOVER}"
+			"libnvidia-fatbinaryloader.so.${NV_SOVER}"
+			"libnvidia-fbc.so.${NV_SOVER}"
+			"libnvidia-glcore.so.${NV_SOVER}"
+			"libnvidia-glsi.so.${NV_SOVER}"
+			"libnvidia-glvkspirv.so.${NV_SOVER}"
+			"libnvidia-ifr.so.${NV_SOVER}"
+			"libnvidia-opencl.so.${NV_SOVER}"
+			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
+			"libvdpau_nvidia.so.${NV_SOVER}"
+		)
+		if ! use libglvnd; then
+			NV_GLX_LIBRARIES+=(
+				"libEGL.so.$( [[ ${ABI} == "amd64" ]] && usex compat ${NV_SOVER} 1.1.0 || echo 1.1.0) ${GL_ROOT}"
+				"libGL.so.1.7.0 ${GL_ROOT}"
+				"libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
+				"libGLESv2.so.2.1.0 ${GL_ROOT}"
+				"libGLX.so.0 ${GL_ROOT}"
+				"libGLdispatch.so.0 ${GL_ROOT}"
+				"libOpenGL.so.0 ${GL_ROOT}"
+			)
+		fi
+
+		if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-egl-wayland.so.1.1.3"
+			)
+		fi
+
+		if use kernel_FreeBSD; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-tls.so.${NV_SOVER}"
+			)
+		fi
+
+		if use kernel_linux; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-ml.so.${NV_SOVER}"
+				"libnvidia-tls.so.${NV_SOVER}"
+			)
+		fi
+
+		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-cbl.so.${NV_SOVER}"
+				"libnvidia-rtcore.so.${NV_SOVER}"
+				"libnvoptix.so.${NV_SOVER}"
+			)
+		fi
+
+		for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
+			donvidia "${nv_libdir}"/${NV_LIB}
+		done
+	fi
+}
+
+pkg_preinst() {
+	if use driver && use kernel_linux; then
+		linux-mod_pkg_preinst
+
+		local videogroup="$(getent group video | cut -d ':' -f 3)"
+		if [ -z "${videogroup}" ]; then
+			eerror "Failed to determine the video group gid"
+			die "Failed to determine the video group gid"
+		else
+			sed -i \
+				-e "s:PACKAGE:${PF}:g" \
+				-e "s:VIDEOGID:${videogroup}:" \
+				"${D}"/etc/modprobe.d/nvidia.conf || die
+		fi
+	fi
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
+		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
+		rm -f "${ROOT}"/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	use driver && use kernel_linux && linux-mod_pkg_postinst
+
+	# Switch to the nvidia implementation
+	if ! use libglvnd; then
+		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+	fi
+
+	readme.gentoo_print_elog
+
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	fi
+
+	elog "To enable nvidia sleep services under systemd, run these commands:"
+	elog "	systemctl enable nvidia-suspend.service"
+	elog "	systemctl enable nvidia-hibernate.service"
+	elog "	systemctl enable nvidia-resume.service"
+	elog "Set the NVreg_TemporaryFilePath kernel module parameter to a"
+	elog "suitable path in case the default of /tmp does not work for you"
+	elog "For more information see:"
+	elog "${ROOT}/usr/share/doc/${PF}/html/powermanagement.html"
+}
+
+pkg_prerm() {
+	if ! use libglvnd; then
+		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+	fi
+}
+
+pkg_postrm() {
+	use driver && use kernel_linux && linux-mod_pkg_postrm
+	if ! use libglvnd; then
+		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+	fi
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild
new file mode 100644
index 000000000000..5772b74a7c25
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild
@@ -0,0 +1,592 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
+	nvidia-driver portability systemd toolchain-funcs unpacker udev
+
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
+
+NV_URI="https://us.download.nvidia.com/XFree86/"
+SRC_URI="
+	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	tools? (
+		https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
+	)
+"
+
+EMULTILIB_PKG="true"
+KEYWORDS="-* amd64"
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0/${PV%.*}"
+
+IUSE="compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib static-libs +tools uvm wayland +X"
+REQUIRED_USE="
+	tools? ( X )
+	static-libs? ( tools )
+"
+
+COMMON="
+	driver? ( kernel_linux? ( acct-group/video ) )
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		gtk3? (
+			x11-libs/gtk+:3
+		)
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf[X]
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+	)
+	X? (
+		!libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 )
+		libglvnd? (
+			media-libs/libglvnd[${MULTILIB_USEDEP}]
+			!app-eselect/eselect-opengl
+		)
+		app-misc/pax-utils
+	)
+"
+DEPEND="
+	${COMMON}
+	kernel_linux? ( virtual/linux-sources )
+	tools? ( sys-apps/dbus )
+"
+RDEPEND="
+	${COMMON}
+	tools? ( !media-video/nvidia-settings )
+	uvm? ( >=virtual/opencl-3 )
+	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+	X? (
+		<x11-base/xorg-server-1.20.99:=
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+	)
+"
+QA_PREBUILT="opt/* usr/lib*"
+S=${WORKDIR}/
+PATCHES=(
+	"${FILESDIR}"/${PN}-440.26-locale.patch
+)
+NV_KV_MAX_PLUS="5.8"
+CONFIG_CHECK="
+	!DEBUG_MUTEXES
+	DRM
+	~!I2C_NVIDIA_GPU
+	~!LOCKDEP
+	~DRM_KMS_HELPER
+	~SYSVIPC
+"
+
+pkg_pretend() {
+	nvidia-driver_check
+}
+
+pkg_setup() {
+	nvidia-driver_check
+
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use driver && use kernel_linux; then
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
+		use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) nvidia-drm(video:${S}/kernel)"
+
+		# This needs to run after MODULE_NAMES (so that the eclass checks
+		# whether the kernel supports loadable modules) but before BUILD_PARAMS
+		# is set (so that KV_DIR is populated).
+		linux-mod_pkg_setup
+
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
+
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+	fi
+
+	if use kernel_linux && kernel_is lt 2 6 9; then
+		eerror "You must build this against 2.6.9 or higher kernels."
+	fi
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+		NV_DOC="${S}/doc"
+		NV_OBJ="${S}/obj"
+		NV_SRC="${S}/src"
+		NV_MAN="${S}/x11/man"
+		NV_X11="${S}/obj"
+		NV_SOVER=1
+	elif use kernel_linux; then
+		NV_DOC="${S}"
+		NV_OBJ="${S}"
+		NV_SRC="${S}/kernel"
+		NV_MAN="${S}"
+		NV_X11="${S}"
+		NV_SOVER=${PV}
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_configure() {
+	tc-export AR CC LD OBJCOPY
+
+	default
+}
+
+src_prepare() {
+	local man_file
+	for man_file in "${NV_MAN}"/*1.gz; do
+		gunzip $man_file || die
+	done
+
+	if use tools; then
+		cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die
+		sed -i \
+			-e "s:@PV@:${PV}:g" \
+			"${WORKDIR}"/nvidia-settings-linker.patch \
+			|| die
+		eapply "${WORKDIR}"/nvidia-settings-linker.patch
+	fi
+
+	default
+
+	if ! [ -f nvidia_icd.json ]; then
+		cp nvidia_icd.json.template nvidia_icd.json || die
+		sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die
+	fi
+}
+
+src_compile() {
+	cd "${NV_SRC}"
+	if use kernel_FreeBSD; then
+		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+	elif use driver && use kernel_linux; then
+		BUILD_TARGETS=module linux-mod_src_compile \
+			KERNELRELEASE="${KV_FULL}" \
+			src="${KERNEL_DIR}"
+	fi
+
+	if use tools; then
+		emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl \
+			DO_STRIP= \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NV_VERBOSE=1 \
+			OUTPUTDIR=. \
+			RANLIB="$(tc-getRANLIB)"
+
+		emake -C "${S}"/nvidia-settings-${PV}/src \
+			DO_STRIP= \
+			GTK3_AVAILABLE=$(usex gtk3 1 0) \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NVML_ENABLED=0 \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 \
+			OUTPUTDIR=.
+	fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if it is not /usr/lib
+donvidia() {
+	# Full path to library
+	nv_LIB="${1}"
+
+	# SOVER to use
+	nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
+
+	# Where to install
+	nv_DEST="${2}"
+
+	# Get just the library name
+	nv_LIBNAME=$(basename "${nv_LIB}")
+
+	if [[ "${nv_DEST}" ]]; then
+		exeinto ${nv_DEST}
+		action="doexe"
+	else
+		nv_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	fi
+
+	# Install the library
+	${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
+
+	# If the library has a SONAME and SONAME does not match the library name,
+	# then we need to create a symlink
+	if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
+		dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER}
+	fi
+
+	dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so}
+}
+
+src_install() {
+	if use driver && use kernel_linux; then
+		linux-mod_src_install
+
+		# Add the aliases
+		# This file is tweaked with the appropriate video group in
+		# pkg_preinst, see bug #491414
+		insinto /etc/modprobe.d
+		newins "${FILESDIR}"/nvidia-430.conf nvidia.conf
+
+		if use uvm; then
+			doins "${FILESDIR}"/nvidia-rmmod.conf
+			udev_newrules "${FILESDIR}"/nvidia-uvm.udev-rule 99-nvidia-uvm.rules
+		else
+			sed -e 's|nvidia-uvm ||g' "${FILESDIR}"/nvidia-rmmod.conf \
+				> "${T}"/nvidia-rmmod.conf || die
+			doins "${T}"/nvidia-rmmod.conf
+		fi
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(get_udevdir)"
+		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+	elif use kernel_FreeBSD; then
+		if use x86-fbsd; then
+			insinto /boot/modules
+			doins "${S}/src/nvidia.kld"
+		fi
+
+		exeinto /boot/modules
+		doexe "${S}/src/nvidia.ko"
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
+
+	# NVIDIA framebuffer capture library
+	donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
+
+	# NVIDIA video encode/decode <-> CUDA
+	if use kernel_linux; then
+		donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
+		donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
+	fi
+
+	if use X; then
+		# Xorg DDX driver
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
+		doins ${NV_X11}/nvidia_drv.so
+
+		# Xorg GLX driver
+		donvidia ${NV_X11}/libglxserver_nvidia.so.${NV_SOVER} \
+			/usr/$(get_libdir)/xorg/modules/extensions
+
+		# Xorg nvidia.conf
+		if has_version '>=x11-base/xorg-server-1.16'; then
+			insinto /usr/share/X11/xorg.conf.d
+			newins {,50-}nvidia-drm-outputclass.conf
+		fi
+
+		insinto /usr/share/glvnd/egl_vendor.d
+		doins ${NV_X11}/10_nvidia.json
+	fi
+
+	if use wayland; then
+		insinto /usr/share/egl/egl_external_platform.d
+		doins ${NV_X11}/10_nvidia_wayland.json
+	fi
+
+	# OpenCL ICD for NVIDIA
+	if use kernel_linux; then
+		insinto /etc/OpenCL/vendors
+		doins ${NV_OBJ}/nvidia.icd
+	fi
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe ${NV_OBJ}/nvidia-xconfig
+
+		insinto /etc/vulkan/icd.d
+		doins nvidia_icd.json
+
+		insinto /etc/vulkan/implicit_layer.d
+		doins nvidia_layers.json
+	fi
+
+	if use kernel_linux; then
+		doexe ${NV_OBJ}/nvidia-cuda-mps-control
+		doexe ${NV_OBJ}/nvidia-cuda-mps-server
+		doexe ${NV_OBJ}/nvidia-debugdump
+		doexe ${NV_OBJ}/nvidia-persistenced
+		doexe ${NV_OBJ}/nvidia-smi
+
+		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+		doexe ${NV_OBJ}/nvidia-modprobe
+		fowners root:video /opt/bin/nvidia-modprobe
+		fperms 4710 /opt/bin/nvidia-modprobe
+		dosym /{opt,usr}/bin/nvidia-modprobe
+
+		doman nvidia-cuda-mps-control.1
+		doman nvidia-modprobe.1
+		doman nvidia-persistenced.1
+		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
+		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
+	fi
+
+	if use tools; then
+		emake -C "${S}"/nvidia-settings-${PV}/src/ \
+			DESTDIR="${D}" \
+			DO_STRIP= \
+			GTK3_AVAILABLE=$(usex gtk3 1 0) \
+			LIBDIR="${D}/usr/$(get_libdir)" \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 \
+			OUTPUTDIR=. \
+			PREFIX=/usr \
+			install
+
+		if use static-libs; then
+			dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
+
+			insinto /usr/include/NVCtrl
+			doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
+		fi
+
+		insinto /usr/share/nvidia/
+		doins nvidia-application-profiles-${PV}-key-documentation
+
+		insinto /etc/nvidia
+		newins \
+			nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
+
+		# There is no icon in the FreeBSD tarball.
+		use kernel_FreeBSD || \
+			doicon ${NV_OBJ}/nvidia-settings.png
+
+		domenu "${FILESDIR}"/nvidia-settings.desktop
+
+		exeinto /etc/X11/xinit/xinitrc.d
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+	fi
+
+	dobin ${NV_OBJ}/nvidia-bug-report.sh
+
+	systemd_dounit *.service
+	dobin nvidia-sleep.sh
+	exeinto /lib/systemd/system-sleep
+	doexe nvidia
+
+	if has_multilib_profile && use multilib; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+
+	# Documentation
+	if use kernel_FreeBSD; then
+		dodoc "${NV_DOC}/README"
+		use X && doman "${NV_MAN}"/nvidia-xconfig.1
+		use tools && doman "${NV_MAN}"/nvidia-settings.1
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}"/nvidia-smi.1
+		use X && doman "${NV_MAN}"/nvidia-xconfig.1
+		use tools && doman "${NV_MAN}"/nvidia-settings.1
+		doman "${NV_MAN}"/nvidia-cuda-mps-control.1
+	fi
+
+	readme.gentoo_create_doc
+
+	docinto html
+	dodoc -r ${NV_DOC}/html/*
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	if use libglvnd; then
+		local GL_ROOT="/usr/$(get_libdir)"
+	else
+		local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+	fi
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local nv_libdir="${NV_OBJ}"
+
+	if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then
+		nv_libdir="${NV_OBJ}"/32
+	fi
+
+	if use X; then
+		NV_GLX_LIBRARIES=(
+			"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libOpenCL.so.1.0.0 ${CL_ROOT}"
+			"libcuda.so.${NV_SOVER}"
+			"libnvcuvid.so.${NV_SOVER}"
+			"libnvidia-compiler.so.${NV_SOVER}"
+			"libnvidia-eglcore.so.${NV_SOVER}"
+			"libnvidia-encode.so.${NV_SOVER}"
+			"libnvidia-fatbinaryloader.so.${NV_SOVER}"
+			"libnvidia-fbc.so.${NV_SOVER}"
+			"libnvidia-glcore.so.${NV_SOVER}"
+			"libnvidia-glsi.so.${NV_SOVER}"
+			"libnvidia-glvkspirv.so.${NV_SOVER}"
+			"libnvidia-ifr.so.${NV_SOVER}"
+			"libnvidia-opencl.so.${NV_SOVER}"
+			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
+			"libvdpau_nvidia.so.${NV_SOVER}"
+		)
+		if ! use libglvnd; then
+			NV_GLX_LIBRARIES+=(
+				"libEGL.so.$( [[ ${ABI} == "amd64" ]] && usex compat ${NV_SOVER} 1.1.0 || echo 1.1.0) ${GL_ROOT}"
+				"libGL.so.1.7.0 ${GL_ROOT}"
+				"libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
+				"libGLESv2.so.2.1.0 ${GL_ROOT}"
+				"libGLX.so.0 ${GL_ROOT}"
+				"libGLdispatch.so.0 ${GL_ROOT}"
+				"libOpenGL.so.0 ${GL_ROOT}"
+			)
+		fi
+
+		if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-egl-wayland.so.1.1.4"
+			)
+		fi
+
+		if use kernel_FreeBSD; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-tls.so.${NV_SOVER}"
+			)
+		fi
+
+		if use kernel_linux; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-ml.so.${NV_SOVER}"
+				"libnvidia-tls.so.${NV_SOVER}"
+			)
+		fi
+
+		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-cbl.so.${NV_SOVER}"
+				"libnvidia-rtcore.so.${NV_SOVER}"
+				"libnvoptix.so.${NV_SOVER}"
+			)
+		fi
+
+		for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
+			donvidia "${nv_libdir}"/${NV_LIB}
+		done
+	fi
+}
+
+pkg_preinst() {
+	if use driver && use kernel_linux; then
+		linux-mod_pkg_preinst
+
+		local videogroup="$(getent group video | cut -d ':' -f 3)"
+		if [ -z "${videogroup}" ]; then
+			eerror "Failed to determine the video group gid"
+			die "Failed to determine the video group gid"
+		else
+			sed -i \
+				-e "s:PACKAGE:${PF}:g" \
+				-e "s:VIDEOGID:${videogroup}:" \
+				"${D}"/etc/modprobe.d/nvidia.conf || die
+		fi
+	fi
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
+		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
+		rm -f "${ROOT}"/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	use driver && use kernel_linux && linux-mod_pkg_postinst
+
+	# Switch to the nvidia implementation
+	if ! use libglvnd; then
+		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+	fi
+
+	readme.gentoo_print_elog
+
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	fi
+
+	elog "To enable nvidia sleep services under systemd, run these commands:"
+	elog "	systemctl enable nvidia-suspend.service"
+	elog "	systemctl enable nvidia-hibernate.service"
+	elog "	systemctl enable nvidia-resume.service"
+	elog "Set the NVreg_TemporaryFilePath kernel module parameter to a"
+	elog "suitable path in case the default of /tmp does not work for you"
+	elog "For more information see:"
+	elog "${ROOT}/usr/share/doc/${PF}/html/powermanagement.html"
+}
+
+pkg_prerm() {
+	if ! use libglvnd; then
+		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+	fi
+}
+
+pkg_postrm() {
+	use driver && use kernel_linux && linux-mod_pkg_postrm
+	if ! use libglvnd; then
+		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+	fi
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild
deleted file mode 100644
index b098aafca9b7..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild
+++ /dev/null
@@ -1,588 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
-	nvidia-driver portability systemd toolchain-funcs unpacker udev
-
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
-
-NV_URI="https://us.download.nvidia.com/XFree86/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	tools? (
-		https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
-	)
-"
-
-EMULTILIB_PKG="true"
-KEYWORDS="-* amd64"
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0/${PV%.*}"
-
-IUSE="compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib static-libs +tools uvm wayland +X"
-REQUIRED_USE="
-	tools? ( X )
-	static-libs? ( tools )
-"
-
-COMMON="
-	driver? ( kernel_linux? ( acct-group/video ) )
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	tools? (
-		dev-libs/atk
-		dev-libs/glib:2
-		dev-libs/jansson
-		gtk3? (
-			x11-libs/gtk+:3
-		)
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf[X]
-		x11-libs/gtk+:2
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrandr
-		x11-libs/libXv
-		x11-libs/libXxf86vm
-		x11-libs/pango[X]
-	)
-	X? (
-		!libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 )
-		libglvnd? (
-			media-libs/libglvnd[${MULTILIB_USEDEP}]
-			!app-eselect/eselect-opengl
-		)
-		app-misc/pax-utils
-	)
-"
-DEPEND="
-	${COMMON}
-	kernel_linux? ( virtual/linux-sources )
-	tools? ( sys-apps/dbus )
-"
-RDEPEND="
-	${COMMON}
-	tools? ( !media-video/nvidia-settings )
-	uvm? ( >=virtual/opencl-3 )
-	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
-	X? (
-		<x11-base/xorg-server-1.20.99:=
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-	)
-"
-QA_PREBUILT="opt/* usr/lib*"
-S=${WORKDIR}/
-PATCHES=(
-	"${FILESDIR}"/${PN}-440.26-locale.patch
-)
-NV_KV_MAX_PLUS="5.7"
-CONFIG_CHECK="!DEBUG_MUTEXES ~!I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
-
-pkg_pretend() {
-	nvidia-driver_check
-}
-
-pkg_setup() {
-	nvidia-driver_check
-
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use driver && use kernel_linux; then
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
-		use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) nvidia-drm(video:${S}/kernel)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
-
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-	fi
-
-	if use kernel_linux && kernel_is lt 2 6 9; then
-		eerror "You must build this against 2.6.9 or higher kernels."
-	fi
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_DOC="${S}/doc"
-		NV_OBJ="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}"
-		NV_OBJ="${S}"
-		NV_SRC="${S}/kernel"
-		NV_MAN="${S}"
-		NV_X11="${S}"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_configure() {
-	tc-export AR CC LD
-
-	default
-}
-
-src_prepare() {
-	local man_file
-	for man_file in "${NV_MAN}"/*1.gz; do
-		gunzip $man_file || die
-	done
-
-	if use tools; then
-		cp "${FILESDIR}"/nvidia-settings-fno-common.patch "${WORKDIR}" || die
-		cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die
-		sed -i \
-			-e "s:@PV@:${PV}:g" \
-			"${WORKDIR}"/nvidia-settings-fno-common.patch \
-			"${WORKDIR}"/nvidia-settings-linker.patch \
-			|| die
-		eapply "${WORKDIR}"/nvidia-settings-fno-common.patch
-		eapply "${WORKDIR}"/nvidia-settings-linker.patch
-	fi
-
-	default
-
-	if ! [ -f nvidia_icd.json ]; then
-		cp nvidia_icd.json.template nvidia_icd.json || die
-		sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die
-	fi
-}
-
-src_compile() {
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use driver && use kernel_linux; then
-		BUILD_TARGETS=module linux-mod_src_compile \
-			KERNELRELEASE="${KV_FULL}" \
-			src="${KERNEL_DIR}"
-	fi
-
-	if use tools; then
-		emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl \
-			DO_STRIP= \
-			LIBDIR="$(get_libdir)" \
-			NVLD="$(tc-getLD)" \
-			NV_VERBOSE=1 \
-			OUTPUTDIR=. \
-			RANLIB="$(tc-getRANLIB)"
-
-		emake -C "${S}"/nvidia-settings-${PV}/src \
-			DO_STRIP= \
-			GTK3_AVAILABLE=$(usex gtk3 1 0) \
-			LIBDIR="$(get_libdir)" \
-			NVLD="$(tc-getLD)" \
-			NVML_ENABLED=0 \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 \
-			OUTPUTDIR=.
-	fi
-}
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if it is not /usr/lib
-donvidia() {
-	# Full path to library
-	nv_LIB="${1}"
-
-	# SOVER to use
-	nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
-
-	# Where to install
-	nv_DEST="${2}"
-
-	# Get just the library name
-	nv_LIBNAME=$(basename "${nv_LIB}")
-
-	if [[ "${nv_DEST}" ]]; then
-		exeinto ${nv_DEST}
-		action="doexe"
-	else
-		nv_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	fi
-
-	# Install the library
-	${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
-
-	# If the library has a SONAME and SONAME does not match the library name,
-	# then we need to create a symlink
-	if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
-		dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER}
-	fi
-
-	dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so}
-}
-
-src_install() {
-	if use driver && use kernel_linux; then
-		linux-mod_src_install
-
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_preinst, see bug #491414
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-430.conf nvidia.conf
-
-		if use uvm; then
-			doins "${FILESDIR}"/nvidia-rmmod.conf
-			udev_newrules "${FILESDIR}"/nvidia-uvm.udev-rule 99-nvidia-uvm.rules
-		else
-			sed -e 's|nvidia-uvm ||g' "${FILESDIR}"/nvidia-rmmod.conf \
-				> "${T}"/nvidia-rmmod.conf || die
-			doins "${T}"/nvidia-rmmod.conf
-		fi
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(get_udevdir)"
-		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
-
-	# NVIDIA framebuffer capture library
-	donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
-
-	# NVIDIA video encode/decode <-> CUDA
-	if use kernel_linux; then
-		donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
-		donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		# Xorg GLX driver
-		donvidia ${NV_X11}/libglxserver_nvidia.so.${NV_SOVER} \
-			/usr/$(get_libdir)/xorg/modules/extensions
-
-		# Xorg nvidia.conf
-		if has_version '>=x11-base/xorg-server-1.16'; then
-			insinto /usr/share/X11/xorg.conf.d
-			newins {,50-}nvidia-drm-outputclass.conf
-		fi
-
-		insinto /usr/share/glvnd/egl_vendor.d
-		doins ${NV_X11}/10_nvidia.json
-	fi
-
-	if use wayland; then
-		insinto /usr/share/egl/egl_external_platform.d
-		doins ${NV_X11}/10_nvidia_wayland.json
-	fi
-
-	# OpenCL ICD for NVIDIA
-	if use kernel_linux; then
-		insinto /etc/OpenCL/vendors
-		doins ${NV_OBJ}/nvidia.icd
-	fi
-
-	# Helper Apps
-	exeinto /opt/bin/
-
-	if use X; then
-		doexe ${NV_OBJ}/nvidia-xconfig
-
-		insinto /etc/vulkan/icd.d
-		doins nvidia_icd.json
-
-		insinto /etc/vulkan/implicit_layer.d
-		doins nvidia_layers.json
-	fi
-
-	if use kernel_linux; then
-		doexe ${NV_OBJ}/nvidia-cuda-mps-control
-		doexe ${NV_OBJ}/nvidia-cuda-mps-server
-		doexe ${NV_OBJ}/nvidia-debugdump
-		doexe ${NV_OBJ}/nvidia-persistenced
-		doexe ${NV_OBJ}/nvidia-smi
-
-		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
-		doexe ${NV_OBJ}/nvidia-modprobe
-		fowners root:video /opt/bin/nvidia-modprobe
-		fperms 4710 /opt/bin/nvidia-modprobe
-		dosym /{opt,usr}/bin/nvidia-modprobe
-
-		doman nvidia-cuda-mps-control.1
-		doman nvidia-modprobe.1
-		doman nvidia-persistenced.1
-		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
-		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
-	fi
-
-	if use tools; then
-		emake -C "${S}"/nvidia-settings-${PV}/src/ \
-			DESTDIR="${D}" \
-			DO_STRIP= \
-			GTK3_AVAILABLE=$(usex gtk3 1 0) \
-			LIBDIR="${D}/usr/$(get_libdir)" \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 \
-			OUTPUTDIR=. \
-			PREFIX=/usr \
-			install
-
-		if use static-libs; then
-			dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
-
-			insinto /usr/include/NVCtrl
-			doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
-		fi
-
-		insinto /usr/share/nvidia/
-		doins nvidia-application-profiles-${PV}-key-documentation
-
-		insinto /etc/nvidia
-		newins \
-			nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
-
-		# There is no icon in the FreeBSD tarball.
-		use kernel_FreeBSD || \
-			doicon ${NV_OBJ}/nvidia-settings.png
-
-		domenu "${FILESDIR}"/nvidia-settings.desktop
-
-		exeinto /etc/X11/xinit/xinitrc.d
-		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
-	fi
-
-	dobin ${NV_OBJ}/nvidia-bug-report.sh
-
-	systemd_dounit *.service
-	dobin nvidia-sleep.sh
-	exeinto $(systemd_get_utildir)/system-sleep
-	doexe nvidia
-
-	if has_multilib_profile && use multilib; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-
-	# Documentation
-	if use kernel_FreeBSD; then
-		dodoc "${NV_DOC}/README"
-		use X && doman "${NV_MAN}"/nvidia-xconfig.1
-		use tools && doman "${NV_MAN}"/nvidia-settings.1
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-		doman "${NV_MAN}"/nvidia-smi.1
-		use X && doman "${NV_MAN}"/nvidia-xconfig.1
-		use tools && doman "${NV_MAN}"/nvidia-settings.1
-		doman "${NV_MAN}"/nvidia-cuda-mps-control.1
-	fi
-
-	readme.gentoo_create_doc
-
-	docinto html
-	dodoc -r ${NV_DOC}/html/*
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	if use libglvnd; then
-		local GL_ROOT="/usr/$(get_libdir)"
-	else
-		local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
-	fi
-	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
-	local nv_libdir="${NV_OBJ}"
-
-	if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then
-		nv_libdir="${NV_OBJ}"/32
-	fi
-
-	if use X; then
-		NV_GLX_LIBRARIES=(
-			"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libOpenCL.so.1.0.0 ${CL_ROOT}"
-			"libcuda.so.${NV_SOVER}"
-			"libnvcuvid.so.${NV_SOVER}"
-			"libnvidia-compiler.so.${NV_SOVER}"
-			"libnvidia-eglcore.so.${NV_SOVER}"
-			"libnvidia-encode.so.${NV_SOVER}"
-			"libnvidia-fatbinaryloader.so.${NV_SOVER}"
-			"libnvidia-fbc.so.${NV_SOVER}"
-			"libnvidia-glcore.so.${NV_SOVER}"
-			"libnvidia-glsi.so.${NV_SOVER}"
-			"libnvidia-glvkspirv.so.${NV_SOVER}"
-			"libnvidia-ifr.so.${NV_SOVER}"
-			"libnvidia-opencl.so.${NV_SOVER}"
-			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
-			"libvdpau_nvidia.so.${NV_SOVER}"
-		)
-		if ! use libglvnd; then
-			NV_GLX_LIBRARIES+=(
-				"libEGL.so.$( [[ ${ABI} == "amd64" ]] && usex compat ${NV_SOVER} 1.1.0 || echo 1.1.0) ${GL_ROOT}"
-				"libGL.so.1.7.0 ${GL_ROOT}"
-				"libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
-				"libGLESv2.so.2.1.0 ${GL_ROOT}"
-				"libGLX.so.0 ${GL_ROOT}"
-				"libGLdispatch.so.0 ${GL_ROOT}"
-				"libOpenGL.so.0 ${GL_ROOT}"
-			)
-		fi
-
-		if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
-		then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-egl-wayland.so.1.1.4"
-			)
-		fi
-
-		if use kernel_FreeBSD; then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-tls.so.${NV_SOVER}"
-			)
-		fi
-
-		if use kernel_linux; then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-ml.so.${NV_SOVER}"
-				"libnvidia-tls.so.${NV_SOVER}"
-			)
-		fi
-
-		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
-		then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-cbl.so.${NV_SOVER}"
-				"libnvidia-rtcore.so.${NV_SOVER}"
-				"libnvoptix.so.${NV_SOVER}"
-			)
-		fi
-
-		for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
-			donvidia "${nv_libdir}"/${NV_LIB}
-		done
-	fi
-}
-
-pkg_preinst() {
-	if use driver && use kernel_linux; then
-		linux-mod_pkg_preinst
-
-		local videogroup="$(getent group video | cut -d ':' -f 3)"
-		if [ -z "${videogroup}" ]; then
-			eerror "Failed to determine the video group gid"
-			die "Failed to determine the video group gid"
-		else
-			sed -i \
-				-e "s:PACKAGE:${PF}:g" \
-				-e "s:VIDEOGID:${videogroup}:" \
-				"${D}"/etc/modprobe.d/nvidia.conf || die
-		fi
-	fi
-
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-}
-
-pkg_postinst() {
-	use driver && use kernel_linux && linux-mod_pkg_postinst
-
-	# Switch to the nvidia implementation
-	if ! use libglvnd; then
-		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	fi
-
-	readme.gentoo_print_elog
-
-	if ! use X; then
-		elog "You have elected to not install the X.org driver. Along with"
-		elog "this the OpenGL libraries and VDPAU libraries were not"
-		elog "installed. Additionally, once the driver is loaded your card"
-		elog "and fan will run at max speed which may not be desirable."
-		elog "Use the 'nvidia-smi' init script to have your card and fan"
-		elog "speed scale appropriately."
-		elog
-	fi
-	if ! use tools; then
-		elog "USE=tools controls whether the nvidia-settings application"
-		elog "is installed. If you would like to use it, enable that"
-		elog "flag and re-emerge this ebuild. Optionally you can install"
-		elog "media-video/nvidia-settings"
-		elog
-	fi
-
-	elog "To enable nvidia sleep services under systemd, run these commands:"
-	elog "	systemctl enable nvidia-suspend.service"
-	elog "	systemctl enable nvidia-hibernate.service"
-	elog "	systemctl enable nvidia-resume.service"
-	elog "Set the NVreg_TemporaryFilePath kernel module parameter to a"
-	elog "suitable path in case the default of /tmp does not work for you"
-	elog "For more information see:"
-	elog "${ROOT}/usr/share/doc/${PF}/html/powermanagement.html"
-}
-
-pkg_prerm() {
-	if ! use libglvnd; then
-		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-	fi
-}
-
-pkg_postrm() {
-	use driver && use kernel_linux && linux-mod_pkg_postrm
-	if ! use libglvnd; then
-		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-	fi
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-450.51-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-450.51-r1.ebuild
new file mode 100644
index 000000000000..f6e28fa006f6
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-450.51-r1.ebuild
@@ -0,0 +1,593 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
+	nvidia-driver portability systemd toolchain-funcs unpacker udev
+
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
+
+NV_URI="https://us.download.nvidia.com/XFree86/"
+SRC_URI="
+	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	tools? (
+		https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
+	)
+"
+
+EMULTILIB_PKG="true"
+KEYWORDS="-* ~amd64"
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0/${PV%.*}"
+
+IUSE="compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib static-libs +tools uvm wayland +X"
+REQUIRED_USE="
+	tools? ( X )
+	static-libs? ( tools )
+"
+
+COMMON="
+	driver? ( kernel_linux? ( acct-group/video ) )
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		gtk3? (
+			x11-libs/gtk+:3
+		)
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf[X]
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+	)
+	X? (
+		!libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 )
+		libglvnd? (
+			media-libs/libglvnd[${MULTILIB_USEDEP}]
+			!app-eselect/eselect-opengl
+		)
+		app-misc/pax-utils
+	)
+"
+DEPEND="
+	${COMMON}
+	kernel_linux? ( virtual/linux-sources )
+	tools? ( sys-apps/dbus )
+"
+RDEPEND="
+	${COMMON}
+	tools? ( !media-video/nvidia-settings )
+	uvm? ( >=virtual/opencl-3 )
+	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+	X? (
+		<x11-base/xorg-server-1.20.99:=
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+	)
+	kernel_linux? ( net-libs/libtirpc )
+"
+QA_PREBUILT="opt/* usr/lib*"
+S=${WORKDIR}/
+PATCHES=(
+	"${FILESDIR}"/${PN}-440.26-locale.patch
+)
+NV_KV_MAX_PLUS="5.8"
+CONFIG_CHECK="
+	!DEBUG_MUTEXES
+	DRM
+	DRM_KMS_HELPER
+	~!I2C_NVIDIA_GPU
+	~!LOCKDEP
+	~SYSVIPC
+"
+
+pkg_pretend() {
+	nvidia-driver_check
+}
+
+pkg_setup() {
+	nvidia-driver_check
+
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use driver && use kernel_linux; then
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
+		use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) nvidia-drm(video:${S}/kernel)"
+
+		# This needs to run after MODULE_NAMES (so that the eclass checks
+		# whether the kernel supports loadable modules) but before BUILD_PARAMS
+		# is set (so that KV_DIR is populated).
+		linux-mod_pkg_setup
+
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
+
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+	fi
+
+	if use kernel_linux && kernel_is lt 2 6 9; then
+		eerror "You must build this against 2.6.9 or higher kernels."
+	fi
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+		NV_DOC="${S}/doc"
+		NV_OBJ="${S}/obj"
+		NV_SRC="${S}/src"
+		NV_MAN="${S}/x11/man"
+		NV_X11="${S}/obj"
+		NV_SOVER=1
+	elif use kernel_linux; then
+		NV_DOC="${S}"
+		NV_OBJ="${S}"
+		NV_SRC="${S}/kernel"
+		NV_MAN="${S}"
+		NV_X11="${S}"
+		NV_SOVER=${PV}
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_configure() {
+	tc-export AR CC LD OBJCOPY
+
+	default
+}
+
+src_prepare() {
+	local man_file
+	for man_file in "${NV_MAN}"/*1.gz; do
+		gunzip $man_file || die
+	done
+
+	if use tools; then
+		cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die
+		sed -i \
+			-e "s:@PV@:${PV}:g" \
+			"${WORKDIR}"/nvidia-settings-linker.patch \
+			|| die
+		eapply "${WORKDIR}"/nvidia-settings-linker.patch
+	fi
+
+	default
+
+	if ! [ -f nvidia_icd.json ]; then
+		cp nvidia_icd.json.template nvidia_icd.json || die
+		sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die
+	fi
+}
+
+src_compile() {
+	cd "${NV_SRC}"
+	if use kernel_FreeBSD; then
+		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+	elif use driver && use kernel_linux; then
+		BUILD_TARGETS=module linux-mod_src_compile \
+			KERNELRELEASE="${KV_FULL}" \
+			src="${KERNEL_DIR}"
+	fi
+
+	if use tools; then
+		emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl \
+			DO_STRIP= \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NV_VERBOSE=1 \
+			OUTPUTDIR=. \
+			RANLIB="$(tc-getRANLIB)"
+
+		emake -C "${S}"/nvidia-settings-${PV}/src \
+			DO_STRIP= \
+			GTK3_AVAILABLE=$(usex gtk3 1 0) \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NVML_ENABLED=0 \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 \
+			OUTPUTDIR=.
+	fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if it is not /usr/lib
+donvidia() {
+	# Full path to library
+	nv_LIB="${1}"
+
+	# SOVER to use
+	nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
+
+	# Where to install
+	nv_DEST="${2}"
+
+	# Get just the library name
+	nv_LIBNAME=$(basename "${nv_LIB}")
+
+	if [[ "${nv_DEST}" ]]; then
+		exeinto ${nv_DEST}
+		action="doexe"
+	else
+		nv_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	fi
+
+	# Install the library
+	${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
+
+	# If the library has a SONAME and SONAME does not match the library name,
+	# then we need to create a symlink
+	if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
+		dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER}
+	fi
+
+	dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so}
+}
+
+src_install() {
+	if use driver && use kernel_linux; then
+		linux-mod_src_install
+
+		# Add the aliases
+		# This file is tweaked with the appropriate video group in
+		# pkg_preinst, see bug #491414
+		insinto /etc/modprobe.d
+		newins "${FILESDIR}"/nvidia-430.conf nvidia.conf
+
+		if use uvm; then
+			doins "${FILESDIR}"/nvidia-rmmod.conf
+			udev_newrules "${FILESDIR}"/nvidia-uvm.udev-rule 99-nvidia-uvm.rules
+		else
+			sed -e 's|nvidia-uvm ||g' "${FILESDIR}"/nvidia-rmmod.conf \
+				> "${T}"/nvidia-rmmod.conf || die
+			doins "${T}"/nvidia-rmmod.conf
+		fi
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(get_udevdir)"
+		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+	elif use kernel_FreeBSD; then
+		if use x86-fbsd; then
+			insinto /boot/modules
+			doins "${S}/src/nvidia.kld"
+		fi
+
+		exeinto /boot/modules
+		doexe "${S}/src/nvidia.ko"
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
+
+	# NVIDIA framebuffer capture library
+	donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
+
+	# NVIDIA video encode/decode <-> CUDA
+	if use kernel_linux; then
+		donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
+		donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
+	fi
+
+	if use X; then
+		# Xorg DDX driver
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
+		doins ${NV_X11}/nvidia_drv.so
+
+		# Xorg GLX driver
+		donvidia ${NV_X11}/libglxserver_nvidia.so.${NV_SOVER} \
+			/usr/$(get_libdir)/xorg/modules/extensions
+
+		# Xorg nvidia.conf
+		if has_version '>=x11-base/xorg-server-1.16'; then
+			insinto /usr/share/X11/xorg.conf.d
+			newins {,50-}nvidia-drm-outputclass.conf
+		fi
+
+		insinto /usr/share/glvnd/egl_vendor.d
+		doins ${NV_X11}/10_nvidia.json
+	fi
+
+	if use wayland; then
+		insinto /usr/share/egl/egl_external_platform.d
+		doins ${NV_X11}/10_nvidia_wayland.json
+	fi
+
+	# OpenCL ICD for NVIDIA
+	if use kernel_linux; then
+		insinto /etc/OpenCL/vendors
+		doins ${NV_OBJ}/nvidia.icd
+	fi
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe ${NV_OBJ}/nvidia-xconfig
+
+		insinto /etc/vulkan/icd.d
+		doins nvidia_icd.json
+
+		insinto /etc/vulkan/implicit_layer.d
+		doins nvidia_layers.json
+	fi
+
+	if use kernel_linux; then
+		doexe ${NV_OBJ}/nvidia-cuda-mps-control
+		doexe ${NV_OBJ}/nvidia-cuda-mps-server
+		doexe ${NV_OBJ}/nvidia-debugdump
+		doexe ${NV_OBJ}/nvidia-persistenced
+		doexe ${NV_OBJ}/nvidia-smi
+
+		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+		doexe ${NV_OBJ}/nvidia-modprobe
+		fowners root:video /opt/bin/nvidia-modprobe
+		fperms 4710 /opt/bin/nvidia-modprobe
+		dosym /{opt,usr}/bin/nvidia-modprobe
+
+		doman nvidia-cuda-mps-control.1
+		doman nvidia-modprobe.1
+		doman nvidia-persistenced.1
+		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
+		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
+	fi
+
+	if use tools; then
+		emake -C "${S}"/nvidia-settings-${PV}/src/ \
+			DESTDIR="${D}" \
+			DO_STRIP= \
+			GTK3_AVAILABLE=$(usex gtk3 1 0) \
+			LIBDIR="${D}/usr/$(get_libdir)" \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 \
+			OUTPUTDIR=. \
+			PREFIX=/usr \
+			install
+
+		if use static-libs; then
+			dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
+
+			insinto /usr/include/NVCtrl
+			doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
+		fi
+
+		insinto /usr/share/nvidia/
+		doins nvidia-application-profiles-${PV}-key-documentation
+
+		insinto /etc/nvidia
+		newins \
+			nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
+
+		# There is no icon in the FreeBSD tarball.
+		use kernel_FreeBSD || \
+			doicon ${NV_OBJ}/nvidia-settings.png
+
+		domenu "${FILESDIR}"/nvidia-settings.desktop
+
+		exeinto /etc/X11/xinit/xinitrc.d
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+	fi
+
+	dobin ${NV_OBJ}/nvidia-bug-report.sh
+
+	systemd_dounit *.service
+	dobin nvidia-sleep.sh
+	exeinto /lib/systemd/system-sleep
+	doexe nvidia
+
+	if has_multilib_profile && use multilib; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+
+	# Documentation
+	if use kernel_FreeBSD; then
+		dodoc "${NV_DOC}/README"
+		use X && doman "${NV_MAN}"/nvidia-xconfig.1
+		use tools && doman "${NV_MAN}"/nvidia-settings.1
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}"/nvidia-smi.1
+		use X && doman "${NV_MAN}"/nvidia-xconfig.1
+		use tools && doman "${NV_MAN}"/nvidia-settings.1
+		doman "${NV_MAN}"/nvidia-cuda-mps-control.1
+	fi
+
+	readme.gentoo_create_doc
+
+	docinto html
+	dodoc -r ${NV_DOC}/html/*
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	if use libglvnd; then
+		local GL_ROOT="/usr/$(get_libdir)"
+	else
+		local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+	fi
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local nv_libdir="${NV_OBJ}"
+
+	if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then
+		nv_libdir="${NV_OBJ}"/32
+	fi
+
+	if use X; then
+		NV_GLX_LIBRARIES=(
+			"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libOpenCL.so.1.0.0 ${CL_ROOT}"
+			"libcuda.so.${NV_SOVER}"
+			"libnvcuvid.so.${NV_SOVER}"
+			"libnvidia-compiler.so.${NV_SOVER}"
+			"libnvidia-eglcore.so.${NV_SOVER}"
+			"libnvidia-encode.so.${NV_SOVER}"
+			"libnvidia-fbc.so.${NV_SOVER}"
+			"libnvidia-glcore.so.${NV_SOVER}"
+			"libnvidia-glsi.so.${NV_SOVER}"
+			"libnvidia-glvkspirv.so.${NV_SOVER}"
+			"libnvidia-ifr.so.${NV_SOVER}"
+			"libnvidia-opencl.so.${NV_SOVER}"
+			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
+			"libvdpau_nvidia.so.${NV_SOVER}"
+		)
+		if ! use libglvnd; then
+			NV_GLX_LIBRARIES+=(
+				"libEGL.so.$( [[ ${ABI} == "amd64" ]] && usex compat ${NV_SOVER} 1.1.0 || echo 1.1.0) ${GL_ROOT}"
+				"libGL.so.1.7.0 ${GL_ROOT}"
+				"libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
+				"libGLESv2.so.2.1.0 ${GL_ROOT}"
+				"libGLX.so.0 ${GL_ROOT}"
+				"libGLdispatch.so.0 ${GL_ROOT}"
+				"libOpenGL.so.0 ${GL_ROOT}"
+			)
+		fi
+
+		if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-egl-wayland.so.1.1.4"
+			)
+		fi
+
+		if use kernel_FreeBSD; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-tls.so.${NV_SOVER}"
+			)
+		fi
+
+		if use kernel_linux; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-ml.so.${NV_SOVER}"
+				"libnvidia-tls.so.${NV_SOVER}"
+			)
+		fi
+
+		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-cbl.so.${NV_SOVER}"
+				"libnvidia-ngx.so.${NV_SOVER}"
+				"libnvidia-rtcore.so.${NV_SOVER}"
+				"libnvoptix.so.${NV_SOVER}"
+			)
+		fi
+
+		for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
+			donvidia "${nv_libdir}"/${NV_LIB}
+		done
+	fi
+}
+
+pkg_preinst() {
+	if use driver && use kernel_linux; then
+		linux-mod_pkg_preinst
+
+		local videogroup="$(getent group video | cut -d ':' -f 3)"
+		if [ -z "${videogroup}" ]; then
+			eerror "Failed to determine the video group gid"
+			die "Failed to determine the video group gid"
+		else
+			sed -i \
+				-e "s:PACKAGE:${PF}:g" \
+				-e "s:VIDEOGID:${videogroup}:" \
+				"${D}"/etc/modprobe.d/nvidia.conf || die
+		fi
+	fi
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
+		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
+		rm -f "${ROOT}"/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	use driver && use kernel_linux && linux-mod_pkg_postinst
+
+	# Switch to the nvidia implementation
+	if ! use libglvnd; then
+		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+	fi
+
+	readme.gentoo_print_elog
+
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	fi
+
+	elog "To enable nvidia sleep services under systemd, run these commands:"
+	elog "	systemctl enable nvidia-suspend.service"
+	elog "	systemctl enable nvidia-hibernate.service"
+	elog "	systemctl enable nvidia-resume.service"
+	elog "Set the NVreg_TemporaryFilePath kernel module parameter to a"
+	elog "suitable path in case the default of /tmp does not work for you"
+	elog "For more information see:"
+	elog "${ROOT}/usr/share/doc/${PF}/html/powermanagement.html"
+}
+
+pkg_prerm() {
+	if ! use libglvnd; then
+		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+	fi
+}
+
+pkg_postrm() {
+	use driver && use kernel_linux && linux-mod_pkg_postrm
+	if ! use libglvnd; then
+		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+	fi
+}
diff --git a/x11-drivers/xf86-input-libinput/Manifest b/x11-drivers/xf86-input-libinput/Manifest
index 69ad4ad733ea..94479f3774d2 100644
--- a/x11-drivers/xf86-input-libinput/Manifest
+++ b/x11-drivers/xf86-input-libinput/Manifest
@@ -1,5 +1,3 @@
-DIST xf86-input-libinput-0.29.0.tar.bz2 377412 BLAKE2B 5d1c3f301decb89eafee7229efcddb670def39be4469e6d9913c2e2b73046a28c71daf61c6990899fe3124f4a68aa7151a83530956a3ce8b2f29407e40adfd5a SHA512 f19ef2e9e0c1336d8e0b17853e1fe0c66ecf50e7b10b10b6c5cbafc99323694597821e15e8e358419ef3c68d1009967fd2ec3760800c85adbb71ac3ecc99954b
 DIST xf86-input-libinput-0.30.0.tar.bz2 378270 BLAKE2B 1c24f2e73897372ae00f4b660a4fb580f854d2ae177a638c9ed74626cafa81be48617767901e9efdd12a37ae4cdf34617e9136e118128503ecd6b75fc48be0c0 SHA512 823f80f7d53866f2f06c1fb7b2d64111bf807329acaaeda4a09413cdb5f3e3235c1dd4f99183aae75adf5a01503e40e35b4449b31f977afd842b4723b062c380
-EBUILD xf86-input-libinput-0.29.0.ebuild 443 BLAKE2B a3d690893123540fa40465cfd8891eda631078e15a202de0503f0676f509af975484c201887c60b4fa83e9c339a14e77aa12adf40681ea1cf1a2c31e98a59ecb SHA512 05f83961b0325860dcd53ef2d57fd3d4a01cb37d370cfdf30f537c6b266568fd5a7a509833fd8926bffb88f38e4f71ce6e7955f25045a2957551fd9d0e31ca9d
-EBUILD xf86-input-libinput-0.30.0.ebuild 445 BLAKE2B bc311a64146ba89baae2ea2b1a4cda95c0050c75932f870fed12d7bee8a0eb4e48ca917def7efe1849f9adc501e8fad1f201746ab999786739d09f5bfda9c64b SHA512 fa16158981642f0d78bf0a47da193f404c448c82ef080ba0e01c69202a2bb51f58acc21986244409f0803cb84c0c6021fbeee92ebe7a68d94afef2d8222904f9
+EBUILD xf86-input-libinput-0.30.0.ebuild 443 BLAKE2B a3d690893123540fa40465cfd8891eda631078e15a202de0503f0676f509af975484c201887c60b4fa83e9c339a14e77aa12adf40681ea1cf1a2c31e98a59ecb SHA512 05f83961b0325860dcd53ef2d57fd3d4a01cb37d370cfdf30f537c6b266568fd5a7a509833fd8926bffb88f38e4f71ce6e7955f25045a2957551fd9d0e31ca9d
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.29.0.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.29.0.ebuild
deleted file mode 100644
index 54b208bc1858..000000000000
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.29.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
-
-inherit linux-info xorg-3
-
-DESCRIPTION="X.org input driver based on libinput"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/libinput-1.7.0:0="
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-DOCS=( "README.md" )
-
-pkg_pretend() {
-	CONFIG_CHECK="~TIMERFD"
-	check_extra_config
-}
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.30.0.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.30.0.ebuild
index 96723e198668..54b208bc1858 100644
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.30.0.ebuild
+++ b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.30.0.ebuild
@@ -7,7 +7,7 @@ inherit linux-info xorg-3
 
 DESCRIPTION="X.org input driver based on libinput"
 
-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=""
 
 RDEPEND=">=dev-libs/libinput-1.7.0:0="
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 8b266ac2ae6e..43575c80209d 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest
index f62106d31733..cd272c13c726 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -1,5 +1,3 @@
-DIST goffice-0.10.46.tar.xz 2397976 BLAKE2B a05696cde60b1cb1ee915bebd3a6e99d1f0a31dc232481615a1c6bbc05ee5433cdebfb05d96160026b260c752c2cfb11c0aecc338079cda66fd40b653fb8b0d1 SHA512 23714fef4dabccc76fe96b78d8eba9c9adb01cb9b3e2f1a9768598fb2a82742b2d2060a7d2548279998488c59e313d7a5863a96b2eb380f540b61fb08e0330f3
 DIST goffice-0.10.47.tar.xz 2400616 BLAKE2B 16a92b3aa5c6e53cb0fe3f51d3ce03a9df6a18f50c0d6890da6ca2529f9e90e3ba30bef63b3c840697d229f58a723957731f985bf02ba80ec4d63bc93d6b7c1a SHA512 0db26fbd049893ee9274ee492e1dc3f10ae789cf99cc0b9dda3f1c2f106423e4679cc56515eb08bbf752aaf48492212777eee08d43a9fefb0b22048e883f5a76
-EBUILD goffice-0.10.46.ebuild 1433 BLAKE2B 27245a4417af2d02a716e2a1d15150e51cec6ff313bf3e71672fa9c65bba7002f5caaa43ced59f322ed22e8ae50b98ffebadff79e6acbae18e1636c38dea5c9b SHA512 2e86d28586e2fc09a316f601d123d6dafbc3f66be7a933d3560584ac0474bc773f5d63bbf1e0dd25bd8052aacaa5202a3c1f02ff1df221c71703eee0ef01c655
-EBUILD goffice-0.10.47.ebuild 1435 BLAKE2B 21b3248acb696e0110696071828797afe67d49952a4a3a43acef2c016eea09020309837cb8ce418c19a0a345721614b57f56da5ccf971a4fcdcfef7b806412d3 SHA512 992c2f665ee577dd8b459f7e2b7a83c720c4150ce9e5ee9b7f5639fbcb7feeb14c0549bc9040995c0f9f0e21c558273872de9d62c015597a5befb791d411ea2d
+EBUILD goffice-0.10.47.ebuild 1433 BLAKE2B 27245a4417af2d02a716e2a1d15150e51cec6ff313bf3e71672fa9c65bba7002f5caaa43ced59f322ed22e8ae50b98ffebadff79e6acbae18e1636c38dea5c9b SHA512 2e86d28586e2fc09a316f601d123d6dafbc3f66be7a933d3560584ac0474bc773f5d63bbf1e0dd25bd8052aacaa5202a3c1f02ff1df221c71703eee0ef01c655
 MISC metadata.xml 441 BLAKE2B d1239d813165b887ed43610e0b9a09afd739164ecf52a0b6a94e957550b5dec5e18dbf5777e4b7bf8e1d665edf89bc5777ad90ebd93caeab5af6fc2882eb3469 SHA512 69e822f6c8ecb89ae952b30074c2527e8283eeabe32ac6555d043576b21d0f5a40b968b0211574ce8b1836dac85370070ee86905551bdd8cf2418cdc2ac6c3ce
diff --git a/x11-libs/goffice/goffice-0.10.46.ebuild b/x11-libs/goffice/goffice-0.10.46.ebuild
deleted file mode 100644
index e6023df8247a..000000000000
--- a/x11-libs/goffice/goffice-0.10.46.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
-
-inherit gnome.org libtool
-
-DESCRIPTION="A library of document-centric objects and utilities"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/goffice/"
-
-LICENSE="GPL-2"
-SLOT="0.10"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="+introspection"
-
-# FIXME: add lasem to tree
-RDEPEND="
-	>=app-text/libspectre-0.2.6:=
-	>=dev-libs/glib-2.40.0:2
-	>=dev-libs/libxml2-2.4.12:2
-	dev-libs/libxslt
-	>=gnome-base/librsvg-2.22:2
-	>=gnome-extra/libgsf-1.14.24:=[introspection?]
-	>=x11-libs/cairo-1.10:=[svg]
-	>=x11-libs/gdk-pixbuf-2.22:2
-	>=x11-libs/gtk+-3.20:3
-	>=x11-libs/pango-1.24:=
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	introspection? (
-		>=dev-libs/gobject-introspection-1:=
-		>=gnome-extra/libgsf-1.14.23:=
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.12
-	>=dev-util/intltool-0.35
-	virtual/perl-Compress-Raw-Zlib
-	virtual/perl-Getopt-Long
-	virtual/perl-IO-Compress
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--disable-gtk-doc \
-		--disable-maintainer-mode \
-		--without-lasem \
-		--with-gtk \
-		--with-config-backend=gsettings \
-		$(use_enable introspection)
-}
-
-src_install() {
-	default
-	dodoc MAINTAINERS
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/x11-libs/goffice/goffice-0.10.47.ebuild b/x11-libs/goffice/goffice-0.10.47.ebuild
index 12d2ce5eb098..e6023df8247a 100644
--- a/x11-libs/goffice/goffice-0.10.47.ebuild
+++ b/x11-libs/goffice/goffice-0.10.47.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/goffice/"
 
 LICENSE="GPL-2"
 SLOT="0.10"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="+introspection"
 
 # FIXME: add lasem to tree
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index c0b9a5fc270b..0ef46689fa10 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -12,5 +12,5 @@ DIST gtk+-3.24.20.tar.xz 22726768 BLAKE2B 75daa850275d55758503fa98055ca4deb9adca
 EBUILD gtk+-2.24.32-r1.ebuild 9957 BLAKE2B 9f5b89755fa452b5b2ca075093f703b1ca0e904de6848a24644a5662bbfe0edd1dad0d1a4732e268d7878a2702b4432a39ed22f33b6c45f44e4fffd0e7dc648f SHA512 e8f2dc31fa4ba63128bad6f2b7130a872344d86562d38675011661baff8cf16c56efe375933b5ef67d33555dca2ea963b54d66827a179132cd56532b77974a89
 EBUILD gtk+-3.24.16.ebuild 7267 BLAKE2B 14118fd199adbe0538854f9052864eadd94c10d42a5ec467c5820ea267d22994b95e0d15317a4549b84d597a9931866fba0777e5fb8f0664aeff15f85975a684 SHA512 032b54fd90d4dfa92fcb970b6a1c11e1767c9723d142b0476aa22362885c1fc32d1cc8cf89d1562dc48cd34539d885656e5b7bda13fe1a89aabf8b93ec77c046
 EBUILD gtk+-3.24.18.ebuild 7275 BLAKE2B 56a9c7d5ce48c0e3141375fd11646d4e5c39bd1536f2464b67d63fafb0d4befd3f5d918596b624618ed1279f19da26a1d359bef6edf8cd19ee6f865eb2029e82 SHA512 c5694653f9abb7b565c9f7657d21e92c58d94af8f521a3325b8373ebe6b949231238955b0bfe0baf97c8459c9742ad636bfb0541822894cc4c436abed7201d3b
-EBUILD gtk+-3.24.20.ebuild 7275 BLAKE2B 56a9c7d5ce48c0e3141375fd11646d4e5c39bd1536f2464b67d63fafb0d4befd3f5d918596b624618ed1279f19da26a1d359bef6edf8cd19ee6f865eb2029e82 SHA512 c5694653f9abb7b565c9f7657d21e92c58d94af8f521a3325b8373ebe6b949231238955b0bfe0baf97c8459c9742ad636bfb0541822894cc4c436abed7201d3b
+EBUILD gtk+-3.24.20.ebuild 7270 BLAKE2B 0d83f51e2a0572566000ae603659bccb151268756a17ac6ae0cb7c461af4e1a3ae7f070ca150028aefdc80d7c60571fbc7650935795d7b134f31098cbc49b58d SHA512 c81c64046c2da135d5112a5b4e449aae5dff0ffaead358e117c68dae74d78e96b82e52c13ef22872fa9c614163da2385ffff2e922265d6aa28e66effcf0b1a4f
 MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/gtk+-3.24.20.ebuild b/x11-libs/gtk+/gtk+-3.24.20.ebuild
index 476dca8c34fd..47316e0d9b9b 100644
--- a/x11-libs/gtk+/gtk+-3.24.20.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.20.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 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
diff --git a/x11-libs/gtk+extra/Manifest b/x11-libs/gtk+extra/Manifest
index 0a16c8df6a8c..8811eaa46044 100644
--- a/x11-libs/gtk+extra/Manifest
+++ b/x11-libs/gtk+extra/Manifest
@@ -1,5 +1,5 @@
 DIST gtkextra-3.3.3.tar.gz 1503817 BLAKE2B dc99923ad962348d617b8db2171b99e925d0dc06501110d805f166ba25cff72094c02031e3375304ddfd96cc7d3f76a1b06d56b196aec1d1868f10d154acfc8e SHA512 864fa2e957941a05a9c4b4a4283ae48e733d72ab334e2fb8440fc884166b0d1ad34d381924184f7a88f829d00bbd857d5f3f32d89f159e0133dd89233a8a93e9
 DIST gtkextra-3.3.4.tar.gz 1542795 BLAKE2B 5a6d5b72f34c8373db615961728a01d0c27005726f316c1233b0b4c4dba688022a53236cc3abe090891a53441d910322ea938ea864a13933a5cea87f18e3426b SHA512 fd61bce7070cf4f28129b47a6c0b01e974101d96b525be9ce1bc4b40ce94197f3c411d17fd8954f5549075c4cdd7ac58a6aaa6faa2f5d3013b761391559e570b
 EBUILD gtk+extra-3.3.3.ebuild 879 BLAKE2B 71b3eca32db12de4dea51e16220b1b27f588dd9fe8d143b3b74e3959e2f504ceac00b9de0e0282d95fca9e9ce11f2a68312be62c51040ae0c31bb19194239362 SHA512 bfd32583e4842b00261e039f5635e883de68093b0cee4d3adfcf41ab52dc0a2992705579da501636486f47f2977d5d9529f8b8000f2dbb16618393e3656dd4d4
-EBUILD gtk+extra-3.3.4.ebuild 881 BLAKE2B a27d417790ec2a05750500f4ee6298cff61c3a1577f846f43482627d881d2166cf13c07c34c829f2d57af9b80a59d09ab183d85cbdbcd8c33f3be1e1ab754074 SHA512 0da550b846fc77e7f1aa77f4644803e13ef24030a65f4354dda7aa6a7aa8d0dc5d22e412472b7a6312c70b887657ab2ec0fc0bcf85bf8b483e48e5c248f270cc
+EBUILD gtk+extra-3.3.4.ebuild 880 BLAKE2B ca18896669fde6bfc41bd78c3c4844e196bce33d9e88523f129c960a7f4a3f24d8cfa641d2d70357bd837071c72edb2819bb8ddc89d4ab86c6c7999eed3e97de SHA512 b41be0f986be99be2c831732b9b40b993e067f533d4ca50a350078a5b1b0b4b0198f7ac579b677c963eb72bf3336c32fbfb00245af12046f285910a39818c0d7
 MISC metadata.xml 331 BLAKE2B aba9451bf53641f26c08773cf5146351d4bce301ae44d153dfe6650de8523ca85144e850e1ad3363094afd27b592d54b551f02c92e3de58bf6b5733752a43fe8 SHA512 af4ad9c00fe60299ada4ee678335173a37696f53b35fb9409b477622952b9b952d897168eed5c1bdb18d11d1797a9a80b6cce3782f3b6dd487a7cb682bfe127c
diff --git a/x11-libs/gtk+extra/gtk+extra-3.3.4.ebuild b/x11-libs/gtk+extra/gtk+extra-3.3.4.ebuild
index 03058820a695..98ccbdf2868f 100644
--- a/x11-libs/gtk+extra/gtk+extra-3.3.4.ebuild
+++ b/x11-libs/gtk+extra/gtk+extra-3.3.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gtkextra/gtkextra-${PV}.tar.gz"
 
 LICENSE="FDL-1.1 LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="+introspection static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index 1604ddcbe42d..68f81254678e 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -3,7 +3,9 @@ AUX gtksourceview-2.10.5-G_CONST_RETURN.patch 6799 BLAKE2B e3276c433d2bb6286ea8f
 DIST gtksourceview-2.10.5.tar.bz2 1253321 BLAKE2B 810a3eeca69bab4356b21c64129bb852e00d02c7937ad4a2ce3af9e48700da943d8d6834efcce9810dd49a54f39d4a074dc086a557128da51a593b2f23e58d48 SHA512 6f64acef6196bfc5953e0b148d7e460d366073b5e21367c01b01fc4d1c86ffe8aca71ecd77cf0814e47d8fc3085495f25bbbdc69e746987b02fd02fcda64886d
 DIST gtksourceview-3.24.11.tar.xz 1438232 BLAKE2B a25762255a12887c8151465689e3acbd5864a6638044500acd087832888a092b8aad5d885d31c9dbe057ce183510afa2342bccb2a2675719dbba7e82be72368a SHA512 3490b34c6432a2e2ef292ad5bf982fdd22d33b1472434549b4ea8ddae0fc8808e128ef947e4d0dcb41e8de5e601b202f52532bbbbfa11d35050acfc42f9936b2
 DIST gtksourceview-4.4.0.tar.xz 1105776 BLAKE2B ef4ed4ed15435daba60795598ba41624b2680b0518246d5d6ade3630cb96e2bac96fea08105e72db7b5a07e714f9270ce27c11e9448fd1b21e8d3942989b2255 SHA512 068e723525290c5356c5ce3f5e5b5b8ecc9f7b1ff2f8234da247d1a84bed63ff5601cad6550981720859286e107705ec25cc7793b754ada164ec6569df0df9eb
+DIST gtksourceview-4.6.1.tar.xz 1162024 BLAKE2B 41f84dade9e48cc958fecbf887f4c733cb1631557be34e52ca5af39802455f115e9920d368406314299aad35b1d18995c4e403f0ec3a9b3a27254fd1952f37e3 SHA512 3341e6248a0abba6373a79742b4348d8aff58ca6a4b9093729d0d1fe2579ab8acbc61f1ecc6d350000edae60c963eeca866fa659b3f3d6ec320cdbf1ed21fdec
 EBUILD gtksourceview-2.10.5-r3.ebuild 1347 BLAKE2B 906f89f5840c70e6b971f5ee4d4a84cdce5ad71081d1762c434d34ebf6534eff74450ae81bc796201fb74c20537eaec76a97774d9f5eb1a6cb2c65a20a29b4f0 SHA512 c864e339c432308d99a494da8a3366de9c299cad4c109fa2d96aea4ae82a3f7be9453a5c5ab1f8648233d922f90343fcf5ad85b33defb3f0e37f3937d1bbb7ef
 EBUILD gtksourceview-3.24.11.ebuild 1272 BLAKE2B d606bbfed3a72adf6478175516be05045a5ccdeace5b4f6e36c1f9cce337e01f27ab680f1da56462c187b5085a543cfe272088f3dc9ca385ee1c3b28af2ea2e1 SHA512 f54f0e0a88a3e5310c75f985eee92ff3cfe0db3b930c7eb520879b519d214394604c84155c3ee9fef23a12477b81d4de1848ee1c29aa6c352af986b0247b3489
 EBUILD gtksourceview-4.4.0.ebuild 1729 BLAKE2B 35d5b3c27652d73df5968a62721e8de720eab4519491d9416076e3b40d9ccb8fbfe919da4e65e8c4350bb179621c9b8ece601592f8e68b6748343fc91c4a32b5 SHA512 4df46bc6ee781206e15e57d79285052bcb7d0ed48d11eac641529f45515ab83a83592062cd04f51d1c9d2d844044b21b7369f914737b6862a21b042eeec3b3ef
+EBUILD gtksourceview-4.6.1.ebuild 1735 BLAKE2B 5492f9b865213c8f07cd2aeb7ccf65cacfc0acd4bb87a046e49ae7cace8abee7226e1f661e555d3cfe149ffa3a4ef7bac8eb6dc02e18bd2fa44ec1106e38c48b SHA512 5056cdc4c0dfaca8d2c838c31ee5e8324e4860357c21d998127bc58a8876fc575276abd680aceb92220f8887a2600469d12e41ad439d77c430200ea35e271cce
 MISC metadata.xml 318 BLAKE2B 63b73a76e8f01503afd3f29f3329056ce6b95614aceef233ee4308ab7589dd5f0f35b84f317ecdf5829847a01bdf18987ca87e345ea7e92bf9556d81b15dde1f SHA512 c0954dc93b8b12dbad5d31805afc40d8075c55aafc209d6292cdbc50727f4e17a24353d115004e1e6974fdbb4bdfdb1588ff86ad93b6a60cd1ed430c13865ac5
diff --git a/x11-libs/gtksourceview/gtksourceview-4.6.1.ebuild b/x11-libs/gtksourceview/gtksourceview-4.6.1.ebuild
new file mode 100644
index 000000000000..7de4201a29d2
--- /dev/null
+++ b/x11-libs/gtksourceview/gtksourceview-4.6.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson vala virtualx xdg
+
+DESCRIPTION="A text widget implementing syntax highlighting and other features"
+HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
+
+LICENSE="LGPL-2.1+"
+SLOT="4"
+
+IUSE="glade gtk-doc +introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.48:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	>=dev-libs/libxml2-2.6:2
+	glade? ( >=dev-util/glade-3.9:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
+	>=dev-libs/fribidi-0.19.7
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.25
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use glade glade_catalog)
+		-Dinstall_tests=false
+		$(meson_use introspection gir)
+		$(meson_use vala vapi)
+		$(meson_use gtk-doc gtk_doc)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /usr/share/${PN}-4/language-specs
+	doins "${FILESDIR}"/2.0/gentoo.lang
+
+	# Avoid conflict with gtksourceview:3.0 glade-catalog
+	# TODO: glade doesn't actually show multiple GtkSourceView widget collections, so with both installed, can't really be sure which ones are used
+	if use glade; then
+		mv "${ED}"/usr/share/glade/catalogs/gtksourceview.xml "${ED}"/usr/share/glade/catalogs/gtksourceview-${SLOT}.xml || die
+	fi
+}
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index 0b4b09c332ac..f5c48c74a3af 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,6 +1,4 @@
-DIST pixman-0.38.4.tar.gz 897926 BLAKE2B 2c27069411e709391a1cc0af6c37acf2f06b4fad433a3197e24a0636d5d828ddbf1ca339d91470514d75e126452bc2300d14a2b862671bd11a8b85057d86b31c SHA512 b66dc23c0bc7327cb90085cbc14ccf96ad58001a927f23af24e0258ca13f32d4255535862f1efcf00e9e723410aa9f51edf26fb01c8cde49379d1225acf7b5af
 DIST pixman-0.40.0.tar.xz 634752 BLAKE2B 29b71f5eb6c3df0318c7a6153c6abbce29748b0b578697916414a869a029635fe5e0bab06b8f701a764c95e475c115ed12eb4f93c751d234b5868f4c4196d7db SHA512 8a60edb113d68791b41bd90b761ff7b3934260cb3dada3234c9351416f61394e4157353bc4d61b8f6c2c619de470f6feefffb4935bfcf79d291ece6285de7270
-EBUILD pixman-0.38.4.ebuild 1729 BLAKE2B ce0f18be74b4586a2227b3b517af19aa0029d478c9a50a1d83c2d07a222dfc70395316853366a3a4f22395ccde57b4faff6488755c7046877b671fb5b5cfefb6 SHA512 412d23d206071fc1357940328f4f8697cbcf7bf0d5cc9d20e033304d376dff3b92a0e8256af0e5d5bced1e30a8af8101a3d00cb4088ad7cd341f64a05eaa2e3d
-EBUILD pixman-0.40.0.ebuild 1784 BLAKE2B 57b1f39d4925d1b29045487e62714d513dbc23238fec2fb1114babf1e80086f5ead1a0b7d13339e03b8544e3ef5fd560b2fc01ce6f8c9977e7a3b9f9e619960f SHA512 914f9f0c17eb82ac100c41034ad03e7ec004dab9e1032295d1199b75cf178d3bfdb2415261a803aa53a31cc5ed45ed3a46267b294cf81e1e639f8360a3add891
+EBUILD pixman-0.40.0.ebuild 1782 BLAKE2B 5611bd96da3c2cf69676cf6d3d1a73a5f049a9c2aae62dce9789bbcc9811eb435117abd6368db46fee849fe8f7a353cd6d5e14bdf0585e3046fd4be3a4f9fc8b SHA512 b2844fc06f7643c01a8f3c025f08f99452d1c39f99e441e2ab2c6d9897a6e7c43c1dc766fcfe8749b5916fe2e58c491227d405638c8d777d6bc1957bbf82d6c5
 EBUILD pixman-9999.ebuild 1791 BLAKE2B 269eebe1da7f127311d09a4e0fae271324a51deb494123a35a44d4b3b1d5c4f166bda201d40f318115045942213605cf4fba6049027fef18818e9bea3cb59464 SHA512 e3c4e3374dc265f3d92f0eddeb142eb6c194103ec69f63c877182cf762b8021d836c06e8fb7b951e43c5ed690aa25e47630cea8657488c0b338179a63502abf1
 MISC metadata.xml 391 BLAKE2B 201ddfb7a766c48fb4e5b48d67564de3b6ef85847a8369cd56acdce186716872be35ddd8501604fce1d30502eb5ea4c328c01406837bb0e0d90c81655a859233 SHA512 3e9dfb3f70cd8c7dfa763bae9fb3415c276bf0104822122f72cf6df47bdc7926a654ddd653321e5ec4bd04ed7f0dd1335a4924e23d1ac37f63c05a536c1defbc
diff --git a/x11-libs/pixman/pixman-0.38.4.ebuild b/x11-libs/pixman/pixman-0.38.4.ebuild
deleted file mode 100644
index e327798978a0..000000000000
--- a/x11-libs/pixman/pixman-0.38.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
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/pixman/pixman.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} meson multilib-minimal multiprocessing toolchain-funcs
-
-DESCRIPTION="Low-level pixel manipulation routines"
-HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-	SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.gz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
-multilib_src_configure() {
-	local openmp=disabled
-	tc-has-openmp && openmp=enabled
-
-	local emesonargs=(
-		$(meson_feature cpu_flags_arm_iwmmxt iwmmxt)
-		$(meson_use     cpu_flags_arm_iwmmxt2 iwmmxt2)
-		$(meson_feature cpu_flags_x86_mmxext mmx)
-		$(meson_feature cpu_flags_x86_sse2 sse2)
-		$(meson_feature cpu_flags_x86_ssse3 ssse3)
-		$(meson_feature altivec vmx)
-		$(meson_feature neon neon)
-		$(meson_feature loongson2f loongson-mmi)
-		-Dgtk=disabled
-		-Dlibpng=disabled
-		-Dopenmp=$openmp # only used in unit tests
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	export OMP_NUM_THREADS=$(makeopts_jobs)
-	meson test -v -C "${BUILD_DIR}" -t 100
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/x11-libs/pixman/pixman-0.40.0.ebuild b/x11-libs/pixman/pixman-0.40.0.ebuild
index 9ca0bf375385..d45108302210 100644
--- a/x11-libs/pixman/pixman-0.40.0.ebuild
+++ b/x11-libs/pixman/pixman-0.40.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz"
 fi
 
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index 0ed98bffbe9f..174b938c8c3d 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -4,5 +4,5 @@ AUX qwt-6.1.4-qt-5.15.patch 8857 BLAKE2B 539dd05419d36428aee36a78f92a875c5067366
 DIST qwt-6.1.3.tar.bz2 4245614 BLAKE2B 5461602702eb159c5c9131eb554d6a619f40c459432c3f32f98b55e4b659d37848fbc0691baeaf691155bae83f68b9c91d3fee430935dd0c1b29e6fceac7a36f SHA512 d4a73e9e7ddcb7c16c508920a298784935be2eddc8f7585993d9fffe1bb01e1787a0d5d7ea4f220398b94ea2b211a19009dccaeadce56a84410357124bcb051a
 DIST qwt-6.1.4.tar.bz2 4227315 BLAKE2B dd7212adb3c8fda081b1feeeb9d59b3b087deb0ef56bdbc7bb95e01992e41d5d91065f0b8aaf3337e1c66d4ad431bfb313f9b04bb2e43915f4cb21fb65725e36 SHA512 6135ce47fd4f9ff5b705193fc1f7410cfd5a0b84931bb17db750f6a5486ae810c261dae32431bd52838c36eadee02487148e1efa71c465c63aa43062eec160da
 EBUILD qwt-6.1.3-r2.ebuild 3829 BLAKE2B 8004bef99cd22601a42a34c5af2ecab197fa631d92d72f0a2dbded59f48022d2c774a1ba37475a8f3b923828ddc913eac3d8c655ce95b439e083df68d10b7eee SHA512 f45ba8f2be6718a78e3aa513bc4659cf5c174ad96dba52a1fda09052ed46326930230f4dc7e3dc7ec883bd5e2a76888989963b85cb9216f338daeda8a9d7fda8
-EBUILD qwt-6.1.4.ebuild 3224 BLAKE2B e621d8f84a498a06b2d53a80729c12671a15f9ef5605a8964820390adbcb84ef53e1e1c6467c3dd142059745b3e805e801462d5ec9680650c0288a7b15745880 SHA512 6b1482963719e6032a5a12951d5b3308b0e8f9ea0f9df4d3fd475d51855b90be04b4f88e4c477ef1168c7bff6b8288075d636707c229f672f76307987d744967
+EBUILD qwt-6.1.4.ebuild 3221 BLAKE2B 3a986d4e08e7c8adb260f70d52263daf2c8c8f4a45e2df8c6a8d689e417afdf2ef1ea73bc1ef39b3f158223656e9f42a962842b9b95ee1d7b425e0ff3058ea39 SHA512 17ee245ebba7f177563536c5b29867936e2d8722297f97ac8fc35bc808f98f76b341237c69c7320d4da89f76ff59296d90e970cc0b869fedcfff81dfcbf6ca1f
 MISC metadata.xml 870 BLAKE2B 1e2262a74f86901bfdb2a897fb40885880391898e60ca6ddb001ea6f7a1bca4586e2cc2c3af28b8d3f455aac4d93204efb370d491ac6749207cf584c8b08f589 SHA512 53e10079699529613ece87ae1e2908e7f7144d041f62618512d00df0b6bf9ae2c5b70afc8309cef0523e10a6605126f3ce871589c3133d64ac52db9ff7346b43
diff --git a/x11-libs/qwt/qwt-6.1.4.ebuild b/x11-libs/qwt/qwt-6.1.4.ebuild
index de7c90317610..42df258aab5c 100644
--- a/x11-libs/qwt/qwt-6.1.4.ebuild
+++ b/x11-libs/qwt/qwt-6.1.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://qwt.sourceforge.net/"
 SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 SLOT="6/1.4"
 IUSE="designer doc examples mathml opengl svg"
 
diff --git a/x11-libs/snorenotify/Manifest b/x11-libs/snorenotify/Manifest
index afbc3fa0888f..fe4e38f0eb60 100644
--- a/x11-libs/snorenotify/Manifest
+++ b/x11-libs/snorenotify/Manifest
@@ -1,5 +1,5 @@
 AUX snorenotify-0.7.0-desktop.patch 1517 BLAKE2B fc126c421ca7feae0f64e913ac9ff9d19fb47bf2ac8743d70756b04b2d17bcee8736c16377208bbf81c61281797effe783e3ed6b9a827529eb1046b2f4ffe189 SHA512 be7663b95e7884f9b77891bf175ae87bae33d2aeec1076538428785aa496b60a7dbe5f48aae8ab443100cba4cd90f4638545df80184df9d98f2c0222775da072
 AUX snorenotify-0.7.0-include.patch 561 BLAKE2B e6d75957732b6cef79ca9c043efdcb2d860cbb6de90ad231edc8d5364a6544e466ff296ad1ffcbfb89671e9173fd7936dee81dc76c9f4fd2a6272e1ddcfa7b2c SHA512 5f644739f76aafea122e30ce0978371fecab5ab2c4a13ae11cae69fbfa23be0ea1f7075d296f181d9568e84a54a683f13b0a1cb1a83d47ba7d3c7febb2de391e
 DIST snorenotify-0.7.0.tar.xz 200032 BLAKE2B 4eb4f7a57bfde7a780b868a8c57c5d1e262809fd2b591597d69c3e98b712b926e287009b453a5e00ba5f805728d986441824eb226bd73c94375d11129be03d4d SHA512 2030a7b6bc69d3803e83e1a6d26efa5bfdd3facf53dcaade6059b85cea3db879ea49b9e02dbce3b043b4ddded21509a6d5859a4002cfd57a870a0e39cd11011a
-EBUILD snorenotify-0.7.0-r1.ebuild 1046 BLAKE2B 4168c35b6ebf19b820b552eaac495dfca9fda7cf1608275c93eee8be2dd86db9cf965ed3f8ef7342f115ec0e68053e1f76f35adfa0e9033e2a469f0ab60ac2eb SHA512 f19ac2666c201a6ad39abf463ff1f1495443a0220ae96517fb107d1c01a28874c6f5d6827a9556a0cd19b2438400dd1405325057e9489357b6c827a35f785305
+EBUILD snorenotify-0.7.0-r1.ebuild 1053 BLAKE2B 189311ac53b0524836ec2797647d76c3b685ca4596858e5ff075d5ee922e70bea8ed62449c5ea3e6355aa80673813776c738097a4dbc29d97e90496f3e03207d SHA512 66e30c70b2e82f689280d09bd99fe556e7f877a33b3276a93a1b492fbb83e0fbb9fd41751fdf5dbdbb2529df98d28dc9069cd811e38f36fd49459dd76e7b5ce3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild b/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild
index 5fa613294bc7..c165073fda3d 100644
--- a/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild
+++ b/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-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="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="sound test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index ed74cea9e13d..25d8bd969bb0 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/alacarte/Manifest b/x11-misc/alacarte/Manifest
index e6967510816e..ab1a41e75362 100644
--- a/x11-misc/alacarte/Manifest
+++ b/x11-misc/alacarte/Manifest
@@ -1,5 +1,5 @@
 DIST alacarte-3.11.91.tar.xz 199128 BLAKE2B 711baf87d48b79cf52ad41bc9292c848a0f69477388580b9dddc068c8184178ae1e3c455a5b9ac6d99ef442d4b36544a45852aa134744379fc14b6c69c6a77df SHA512 b4b5ead4ba0b9742ea0530ecb5362afa970125d29750aaf147be6fd477f238b9c360307ce1df2a56330a69cd9c849a0dde4be44b36bf55377f42e30429411935
 DIST alacarte-3.36.0.tar.xz 201088 BLAKE2B 26c924a8a88c014358db38496cb8a20eca82e9b3d514a9feefa64db3674527cef454346c538a1cdb04ebbb384a64dee395738d8d2a19f4d2445e887f5714f8d6 SHA512 7406fef4c59f94f26d52ad6b52ddd8a5183e9ceb50834aecd5e83f60d996ab4efd09ecbc9d3568d65fe1dd9290e446b5c5c5f6ad89c7e81b0ef304d2a10476b9
 EBUILD alacarte-3.11.91.ebuild 1335 BLAKE2B baa5b6b922f92788c6dbe63ad969f6e512d66edd3fa62f821b6f0e3775861d32377af03132347e5ac610deb0e2170342f548d9f341f7aea2f60aaa8aa13a4b39 SHA512 9bf1bc0ce59f8ff04ec425850d720c7e8f9ec3d3bdfec7dbd1068d292b7fb332bfcb1185a8edcb5a16f8d1a2233b83ddd36290b6550ee5b2cd7ed65fdd14da53
-EBUILD alacarte-3.36.0.ebuild 817 BLAKE2B 106ce77f3da560dd3cca88e4d187f4a23702142c56a007aa3f7b2226df9ca3e8d6cbaa87a9a3a11d3efb3ee6bc9877b3bc730fab7c1a9c10f16234d87d2a0c27 SHA512 1f7626c7cd30ee654842debd265c2ef4fcc32951139ad4b3eca8927d55558185eb43ac813d505830419746f3999057b33d49c468b97d2c5750ac5e1a5dfbd78f
+EBUILD alacarte-3.36.0.ebuild 816 BLAKE2B be5aae8b74cbd4103f05444f74e128b18f1cd92a4a3d7c50bd4b1e992382cdb48ed9c80cb493792a066fe4e88f2bfd96be85a44f55ae580fc1ee5d32f2efeb36 SHA512 5a9fb6fb699a72127fc505a4fc7b748a79903b9b01977adde6cc99de9dbb88507aa666db9fa59451d04f9fdc454adfae6468bd3d8b2f36636af5b35baa8b646c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-misc/alacarte/alacarte-3.36.0.ebuild b/x11-misc/alacarte/alacarte-3.36.0.ebuild
index 03f6ba727ddb..e0e0b3da6b06 100644
--- a/x11-misc/alacarte/alacarte-3.36.0.ebuild
+++ b/x11-misc/alacarte/alacarte-3.36.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/alacarte"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/x11-misc/fraqtive/Manifest b/x11-misc/fraqtive/Manifest
index 885111e8e885..c6c7ed559aaf 100644
--- a/x11-misc/fraqtive/Manifest
+++ b/x11-misc/fraqtive/Manifest
@@ -1,4 +1,5 @@
+AUX fraqtive-0.4.8-qt-5.15.patch 953 BLAKE2B c67c9df040d24bab183ddd92db3457c9a4df9b2c8b6825236db57e88230d0d2c2c81534619be4e6aaea06fa6fa4f3f4666e556906f9dace673bb15146783909b SHA512 b52a1313ae02b9ecda9e508de0db4024e9d6605a255a543e5d4cdf5e927199312ebe4b68ccb107f26403635537c87b871dbdac43fc37ce1b3f817734cf10f519
 AUX fraqtive-0.4.8-qt-includes.patch 438 BLAKE2B 537ab2c470dd14f977cb53278cabf5a4e05e7973b69142f17d4bec1732c588ef181697e1be2c703d273ec1a6d26a53f1374482edb5d422924042c65917d7620f SHA512 0e5ea8dce236a5cdb8086ab0671360aeb15a4d0ac9703969be28373315288d59ccd31b013f932c77bfb5a64faf917f311c30c7cd25c006f08be5a5f40f5735c4
 DIST fraqtive-0.4.8.tar.bz2 260484 BLAKE2B 0bbbd983af324c38fb73db043e808de6cbf8e3e39073163b748215a2a3a374e53e4118b7fb0993685d3eef4ef6b65afcc51c5a7d23f4ab91ffc2dfd41305171d SHA512 8b4be81dd14fe086dbcffda123395ccb30a197e7762e590bc3ab7dc1d0aafb44dc45e1445e2f83198a0c1f4b9ea0d54a7de1989c3b85c0f2e5f474a67255d942
-EBUILD fraqtive-0.4.8-r2.ebuild 1032 BLAKE2B ea808fb80683dfb4ceaa9258918ab3ec84655867c0080fa313b4ee5ad3d61b692037d397f3f36ebd9c43820361e9747f15f5e4623537d3652211ca6ad0a949c3 SHA512 1fe9fa27683261e0630a32609a61f042bef07d22d621733312da13f953f044947cf9c254a8c1cc88dec6cd66f5e6508d417e661575f6b0532b6c82338b56bc31
+EBUILD fraqtive-0.4.8-r2.ebuild 1068 BLAKE2B 6822db66df0b5d35719e2d4c3329d5bc99bf89c4cb9bdeb61eb26ba6af0216229b1eb77a6f61067c8607b79019a03005334d0f83dafa81a550d751e23ceab23f SHA512 1983911ff7cf2b07166d654fefaf018b9b7afcb7e2ff5aaf7c053ac58bb0615ee2f71f3b8c7e3b3837f093f7023f6f606a001f0e5e12ec1abb3fab60a2b6ca18
 MISC metadata.xml 364 BLAKE2B c40b388c714f4e116db4a5dc2292bf9da6bf0906dd3da66add62a5339e157e7ba728e135e58e818fc80d7cb3ed5c4fa72b4675efc15c30eeac9a8badda8a79d9 SHA512 b3343bcc5cf584c4bbacb0d54e353bca91c3112d9d906dc920ead427fc964e7a71bc632e810f6047a293d00325dfafe532067b6d0d5fb9abcb797ae83c587604
diff --git a/x11-misc/fraqtive/files/fraqtive-0.4.8-qt-5.15.patch b/x11-misc/fraqtive/files/fraqtive-0.4.8-qt-5.15.patch
new file mode 100644
index 000000000000..63c281757096
--- /dev/null
+++ b/x11-misc/fraqtive/files/fraqtive-0.4.8-qt-5.15.patch
@@ -0,0 +1,39 @@
+From 34963f986f64d98b6ef82757ca07159a6a059763 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 21 Jun 2020 13:21:15 +0200
+Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath include)
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/datafunctions.cpp | 2 ++
+ src/shadewidget.cpp   | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/src/datafunctions.cpp b/src/datafunctions.cpp
+index 3ec1af9..9369299 100644
+--- a/src/datafunctions.cpp
++++ b/src/datafunctions.cpp
+@@ -19,6 +19,8 @@
+ #include "datafunctions.h"
+ #include "fractaldata.h"
+ 
++#include <QPainterPath>
++
+ namespace DataFunctions
+ {
+ 
+diff --git a/src/shadewidget.cpp b/src/shadewidget.cpp
+index 1494b37..3da5c05 100644
+--- a/src/shadewidget.cpp
++++ b/src/shadewidget.cpp
+@@ -19,6 +19,7 @@
+ #include "shadewidget.h"

+ 

+ #include <QPainter>

++#include <QPainterPath>

+ #include <QPaintEvent>

+ #include <QToolTip>

+ 

+-- 
+2.27.0
+
diff --git a/x11-misc/fraqtive/fraqtive-0.4.8-r2.ebuild b/x11-misc/fraqtive/fraqtive-0.4.8-r2.ebuild
index 7c98c2069002..0b5059a75c4d 100644
--- a/x11-misc/fraqtive/fraqtive-0.4.8-r2.ebuild
+++ b/x11-misc/fraqtive/fraqtive-0.4.8-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit qmake-utils toolchain-funcs xdg
 
 DESCRIPTION="Open source, multi-platform generator of the Mandelbrot family fractals"
@@ -25,7 +26,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-qt-includes.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-qt-includes.patch"
+	"${FILESDIR}/${P}-qt-5.15.patch"
+)
 
 src_configure() {
 	tc-export PKG_CONFIG
diff --git a/x11-misc/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest
index 6f223d7ea161..3efb6b85f94b 100644
--- a/x11-misc/lightdm-gtk-greeter/Manifest
+++ b/x11-misc/lightdm-gtk-greeter/Manifest
@@ -1,6 +1,6 @@
 DIST lightdm-gentoo-patch-2.tar.gz 695543 BLAKE2B 62e21dd413b90053160f774663d89c81b3c9d8c4a040023f4ce50bf775a2f036e0be6ed16ae767eb5b04586a27fdbf41eb56f777340b2d56633738a126c3d575 SHA512 8d9bfdee71ab1871de33e134b11bba409cc493876e5ae9534956100ff6af6c8748b29de9082ecf8b771ccac4c8c2024e15e93332165171dfe93eb99c9a834274
-DIST lightdm-gtk-greeter-2.0.6.tar.gz 575668 BLAKE2B 6aa5e4db80f411b5a5e34c5ce332906a11d7755af71f617dfedf1658c60777ba732e0ed81a9d5e01c93e2a7fd74364dffc8043d640cd6ab91f3e604769863c01 SHA512 778215351a9140f164c67c75d69efc55b1edf97a493f42a14e2a40e322f738cba99534274d00198291454466fbf407efdc927479c4821d04e12d742feb31cc3a
 DIST lightdm-gtk-greeter-2.0.7.tar.gz 580726 BLAKE2B 1cb2a92a9bda0e28b718cf033ad01e8a8a955600715c61bc5f27723a1b5f4a4624caa61bbe9bdca13064919116f5f08959db2622a5d6b097998d762ffd9cfc28 SHA512 62ad8d522db9aeea7bd0acc76c989a1d39e8be619847b294048530b2dfbebf5a5982f84daf1a5f49b0a8a7abe3234e1571fb5d4f5429b02867801015f30e4944
-EBUILD lightdm-gtk-greeter-2.0.6.ebuild 2082 BLAKE2B dce5c3a2287c63eed4ea373740f47181004984d4ee33a7132d509354d994c0fe47bc2f623631990b556c14f1e8cf29d6138a99e85b9bc53d2fcf475997f54f76 SHA512 6fb43d653fbbb9564a6d25cd34ac60db0c8c0cce6998c14aec934e90718c386382fb08241b8ffef5e4e826f2cc508f4fcc6c026129298d7d20cf7ff38e7dfe20
+DIST lightdm-gtk-greeter-2.0.8.tar.gz 583426 BLAKE2B ae06ebbc07efe5c0131c07b293671f24683699eb84f12222de8165428e935b98bbf9d1e107eaeca8f10e725a6a11c97d4f4c3d415ada0b0876b0b0a99f21d1ee SHA512 59cad69fd7f17b6a416944804be80f306ed51ee0c55826975c8564f432e8098043b677f6452e9afa290c6ef37ebdc632cd8b79e7a0a712a3407ddbf9f200b0db
 EBUILD lightdm-gtk-greeter-2.0.7-r1.ebuild 2078 BLAKE2B 5e4252ccc3d0fb4102a0f8741a051845cb9953b15004feeee6d62e22a6a385e3ee996da2ce4825e68312fa0bcb58be704e257643601bf9350e00d5d19b7689ef SHA512 8cb1c44379697de9f7328abb26ed83e18b3591dbc52eecd4f74ded1569f4daf44320d9d40dbe0cad547c4e9cccfdf5eecd9cbd7d79292172d02cb70426c989f6
+EBUILD lightdm-gtk-greeter-2.0.8.ebuild 2040 BLAKE2B 5a079c729044ca71eeebd0e03f69d52a8f62e0a7433a0c283b4ba389c4a04c9ef71f87706c576fe647278d85c582057b4d23cfa1685252811ec8cd363fd0f794 SHA512 7822a312b72cf60e82be9a06d5eff7267485a5807ab3546ca88783be31387f0ca90342cdce201811158a2fe9c6fbaf428862342f833a28afdeacbcba0f22033f
 MISC metadata.xml 338 BLAKE2B d67c21b3faacdf75178e2dd79f1365b5d8891431f2388a959c986f9e21f1da21a5138ba6d1831c4d28f6102a6964850ce3ebe8971d955e68be0d9d97fbfa2fa4 SHA512 2b2065cbe74e2166fc4fe4970fcc01e20dc34c92842e163bcc799d162da39e2cce09f1491e6fc853d5fadd9cb40cc975f0f1e4d57462fbce2442a99441ed7403
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.6.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.6.ebuild
deleted file mode 100644
index 47ae408d0447..000000000000
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.6.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2-utils eapi7-ver
-
-DESCRIPTION="LightDM GTK+ Greeter"
-HOMEPAGE="https://launchpad.net/lightdm-gtk-greeter"
-SRC_URI="https://launchpad.net/lightdm-gtk-greeter/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz
-	branding? ( https://dev.gentoo.org/~polynomial-c/dist/lightdm-gentoo-patch-2.tar.gz )"
-
-LICENSE="GPL-3 LGPL-3
-	branding? ( CC-BY-3.0 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86"
-IUSE="appindicator branding"
-
-COMMON_DEPEND="appindicator? ( dev-libs/libindicator:3 )
-	x11-libs/gtk+:3
-	>=x11-misc/lightdm-1.2.2"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	xfce-base/exo"
-
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/gnome-themes-standard
-	>=x11-themes/adwaita-icon-theme-3.14.1"
-
-GENTOO_BG="gentoo-bg_65.jpg"
-
-src_prepare() {
-	# Ok, this has to be fixed in the tarball but I am too lazy to do it.
-	# I will fix this once I decide to update the tarball with a new gentoo
-	# background
-	# Bug #404467
-	if use branding; then
-		sed \
-			-e "/xft-hintstyle/s:slight:hintslight:" \
-			-e "/background/s:=.*:=/usr/share/lightdm/backgrounds/${GENTOO_BG}:" \
-			-i "${WORKDIR}"/${PN}.conf || die
-		# Add back the reboot/shutdown buttons
-		echo 'indicators=~host;~spacer;~clock;~spacer;~session;~language;~a11y;~power;~' \
-			>> "${WORKDIR}"/${PN}.conf || die
-	fi
-	default
-
-	# Fix docdir
-	sed "/^docdir/s@${PN}@${PF}@" -i data/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-kill-on-sigterm
-		--enable-at-spi-command="${EPREFIX}/usr/libexec/at-spi-bus-launcher --launch-immediately"
-		$(use_enable appindicator libindicator)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use branding; then
-		insinto /etc/lightdm/
-		doins "${WORKDIR}"/${PN}.conf
-		insinto /usr/share/lightdm/backgrounds/
-		doins "${WORKDIR}"/${GENTOO_BG}
-		newdoc "${WORKDIR}"/README.txt README-background.txt
-	fi
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild
new file mode 100644
index 000000000000..8824bc8e07e2
--- /dev/null
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg-utils
+
+DESCRIPTION="LightDM GTK+ Greeter"
+HOMEPAGE="https://github.com/Xubuntu/lightdm-gtk-greeter"
+SRC_URI="https://github.com/Xubuntu/${PN}/releases/download/${P}/${P}.tar.gz
+	branding? ( https://dev.gentoo.org/~polynomial-c/dist/lightdm-gentoo-patch-2.tar.gz )"
+
+LICENSE="GPL-3 LGPL-3
+	branding? ( CC-BY-3.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="appindicator branding"
+
+DEPEND="appindicator? ( dev-libs/libindicator:3 )
+	x11-libs/gtk+:3
+	>=x11-misc/lightdm-1.2.2"
+
+BDEPEND="
+	dev-util/intltool
+	dev-util/xfce4-dev-tools
+	sys-devel/gettext
+"
+
+RDEPEND="${DEPEND}
+	x11-themes/gnome-themes-standard
+	>=x11-themes/adwaita-icon-theme-3.14.1"
+
+GENTOO_BG="gentoo-bg_65.jpg"
+
+src_prepare() {
+	# Ok, this has to be fixed in the tarball but I am too lazy to do it.
+	# I will fix this once I decide to update the tarball with a new gentoo
+	# background
+	# Bug #404467
+	if use branding; then
+		sed \
+			-e "/xft-hintstyle/s:slight:hintslight:" \
+			-e "/background/s:=.*:=/usr/share/lightdm/backgrounds/${GENTOO_BG}:" \
+			-i "${WORKDIR}"/${PN}.conf || die
+		# Add back the reboot/shutdown buttons
+		echo 'indicators=~host;~spacer;~clock;~spacer;~session;~language;~a11y;~power;~' \
+			>> "${WORKDIR}"/${PN}.conf || die
+	fi
+	default
+
+	# Fix docdir
+	sed "/^docdir/s@${PN}@${PF}@" -i data/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-kill-on-sigterm
+		--enable-at-spi-command="${EPREFIX}/usr/libexec/at-spi-bus-launcher --launch-immediately"
+		$(use_enable appindicator libindicator)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use branding; then
+		insinto /etc/lightdm/
+		doins "${WORKDIR}"/${PN}.conf
+		insinto /usr/share/lightdm/backgrounds/
+		doins "${WORKDIR}"/${GENTOO_BG}
+		newdoc "${WORKDIR}"/README.txt README-background.txt
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 972530dd9043..0d630542b1e2 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -3,8 +3,6 @@ AUX Xsession 1819 BLAKE2B 3d0502ca0d353c4bf16aec063dacde3a57da0062595821aaebd783
 AUX lightdm-autologin 155 BLAKE2B 0236489d922c07cc84e17b403e746af052b9fcec1671c4b41184a26399ff8b310083c17959327eb752f8ff9ada04a7ff012ed6708c7ff50324dd0a3cef42efd8 SHA512 d09be0a61b7eea18a5c5977182362226e82a39b238c401f636bdf0a83381b97a16efc19e67be10b76854c95186dd65f539431d2352ce87a4e35dd1d40e388064
 AUX lightdm.service 279 BLAKE2B 92a9602d1d1c10fedfabd58b0794a68a278939d905f4d790ea9c2a0632abe8238a6187b3e01b4296a1187349864b30291853889ceaa519f5a12a98b2aecbb1ea SHA512 5b60788e35ebd7918b21ab52dc3f5cc29dd3aa45ddf6cfe75a72d1c541620f0438378a9bd681e2c151a465cf981e803b399f61b48ff5d0f2e1a3cc950c30d23a
 DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c4cd946aaaac0b5fa13aa27805fa17297112bfaabb1c5a34bd83d2ecdef2033b622dbd5e63914baacb8f6edf488a7396d26d9 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be
-DIST lightdm-1.28.0.tar.xz 517460 BLAKE2B 98a0b60623dcac07bbb6bff95fa20da9425b714fe5da0d7d86c788362e40604bea2b46675c57e70c70356f71a542adbd6431723e40b815db8565d67ddecc20a1 SHA512 e1e8a952e723bbcc106043d33a64278b228a5a47a7e54235375817b08483594cc5e46ec52f5cbb9d258266e44b045785bca1d4c62daf83071c0f668b3c480071
 DIST lightdm-1.30.0.tar.xz 509220 BLAKE2B 5b6fcc6b955d7a7eb3a810a7e28707a812810d7f2568d6985a4411b1bf6f06b35ff721bd8a9388a85a4e4a64a39f5e30e86a9dbaa6d344e898ae49e9f39785ff SHA512 bca25a0aa73caf7d51e5882889a1707d2527470a170658c1be98ecfb96c8f85fd616494fc5bed658e744f91b9f8b0a98d2a0cf42f9c030242ae470c8a27145ce
-EBUILD lightdm-1.28.0.ebuild 3920 BLAKE2B 9a50dfa326aac3c678291c95efad0d700f6a940b1bff0c5d8b414777e4029502d4260b6e9afaac7d770bb30231c07a9f98dc1799fc6875b609206e75a249e312 SHA512 3ae4cbeaf8a786861a2a88e47693ebd713350b6139991c91a57abe7a741009480fd82706ac98de1fdedee570d2475f9373a80ef0a8b21bcb9679c640185e5004
 EBUILD lightdm-1.30.0.ebuild 4267 BLAKE2B a68f01ea8c9dc1725c859a7ba74627f57230c22669d4a090ac8704b28fdd56233d71a031ca0e7dd2e65ae5bdc9994b88fcc5707b2afd134f956b7d93782d0942 SHA512 782a2ab3242a1fbb202989f380cc6a625be99aea157f150a649ae41599dc00be941d70be1e0af32314db48445e00d783c6d3b54c4cc486286bc3ae837cf3a4ff
 MISC metadata.xml 462 BLAKE2B 8360d85d185558b5d6c3b2d18d5210c532537d1cc93007b0f0b91d37b388d02c966dda14c298ff8c3b47bd39696b332f989fffa6e1a68001116ddd69141b21d6 SHA512 d76a144235e233e46103c3f10ee64d3b5306b82220366e006671851dc725027ddbf600ca8fab8370c7fca3b09182cd7c85b458d79e7ddca681f279909f4737ba
diff --git a/x11-misc/lightdm/lightdm-1.28.0.ebuild b/x11-misc/lightdm/lightdm-1.28.0.ebuild
deleted file mode 100644
index 07340664b29f..000000000000
--- a/x11-misc/lightdm/lightdm-1.28.0.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic pam qmake-utils readme.gentoo-r1 systemd vala xdg-utils
-
-DESCRIPTION="A lightweight display manager"
-HOMEPAGE="https://github.com/CanonicalLtd/lightdm"
-SRC_URI="https://github.com/CanonicalLtd/lightdm/releases/download/${PV}/${P}.tar.xz
-	mirror://gentoo/introspection-20110205.m4.tar.bz2"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="audit +gnome +gtk +introspection qt5 vala"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.44.0:2
-	dev-libs/libxml2
-	sys-libs/pam
-	x11-libs/libX11
-	>=x11-libs/libxklavier-5
-	audit? ( sys-process/audit )
-	gnome? ( sys-apps/accountsservice )
-	introspection? ( >=dev-libs/gobject-introspection-1 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	>=sys-auth/pambase-20101024-r2"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	gnome? ( gnome-base/gnome-common )
-	vala? ( $(vala_depend) )
-"
-PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )"
-
-DOCS=( NEWS )
-RESTRICT="test"
-REQUIRED_USE="vala? ( introspection )"
-
-src_prepare() {
-	xdg_environment_reset
-
-	sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
-	sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
-
-	einfo "Fixing the session-wrapper variable in lightdm.conf"
-	sed -i -e \
-		"/^#session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
-		data/lightdm.conf || die "Failed to fix lightdm.conf"
-
-	# use correct version of qmake. bug #566950
-	sed \
-		-e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" \
-		-i configure.ac || die
-
-	default
-
-	# Remove bogus Makefile statement. This needs to go upstream
-	sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
-	if has_version dev-libs/gobject-introspection; then
-		eautoreconf
-	else
-		AT_M4DIR=${WORKDIR} eautoreconf
-	fi
-
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	# Set default values if global vars unset
-	local _greeter _session _user
-	_greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
-	_session=${LIGHTDM_SESSION:=gnome}
-	_user=${LIGHTDM_USER:=root}
-	# Let user know how lightdm is configured
-	einfo "Gentoo configuration"
-	einfo "Default greeter: ${_greeter}"
-	einfo "Default session: ${_session}"
-	einfo "Greeter user: ${_user}"
-
-	use qt5 && append-cxxflags -std=c++11
-
-	# also disable tests because libsystem.c does not build. Tests are
-	# restricted so it does not matter anyway.
-	local myeconfargs=(
-		--localstatedir=/var
-		--disable-static
-		--disable-tests
-		$(use_enable audit libaudit)
-		$(use_enable introspection)
-		--disable-liblightdm-qt
-		$(use_enable qt5 liblightdm-qt5)
-		$(use_enable vala)
-		--with-user-session=${_session}
-		--with-greeter-session=${_greeter}
-		--with-greeter-user=${_user}
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# Delete apparmor profiles because they only work with Ubuntu's
-	# apparmor package. Bug #494426
-	if [[ -d ${ED%/}/etc/apparmor.d ]]; then
-		rm -r "${ED%/}/etc/apparmor.d" || die \
-			"Failed to remove apparmor profiles"
-	fi
-
-	insinto /etc/${PN}
-	doins data/{${PN},keys}.conf
-	doins "${FILESDIR}"/Xsession
-	fperms +x /etc/${PN}/Xsession
-	# /var/lib/lightdm-data could be useful. Bug #522228
-	dodir /var/lib/lightdm-data
-
-	find "${ED}" \( -name '*.a' -o -name "*.la" \) -delete || die
-	rm -rf "${ED%/}"/etc/init
-
-	# Remove existing pam file. We will build a new one. Bug #524792
-	rm -rf "${ED%/}"/etc/pam.d/${PN}{,-greeter}
-	pamd_mimic system-local-login ${PN} auth account password session #372229
-	pamd_mimic system-local-login ${PN}-greeter auth account password session #372229
-	dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
-
-	readme.gentoo_create_doc
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	keepdir /var/lib/${PN}-data
-}
-
-pkg_postinst() {
-	systemd_reenable "${PN}.service"
-}
diff --git a/x11-misc/menumaker/Manifest b/x11-misc/menumaker/Manifest
index 22a9c568ae14..5efc3849f1a8 100644
--- a/x11-misc/menumaker/Manifest
+++ b/x11-misc/menumaker/Manifest
@@ -1,7 +1,7 @@
-AUX menumaker-0.99.10-AM_PATH_PYTHON.patch 2517 BLAKE2B 45fc07e14f0b89106464b925e68fc3b9b8ea23c14e5091150ed45c7a3a7bf84e310d0cc2437b021f4a83c4d162200b44c5deb23c1a40740dba4379dd682ad964 SHA512 8ba6d7898f5346a6e64ac1cbf17f914c44835f603c9d5952e226063c2d7d3ad64597e41a8a0bbfa4dd12966ddbf53722bc4c28d3ee0e5c860073e08f56fa2805
 AUX menumaker-0.99.11-AM_PATH_PYTHON.patch 2579 BLAKE2B 67b3924544429c998229b439cdaac12aaf6e24aeaf647fd604a9602a25d24250a59c398d7c403744445adf81cf0dc4dcaeb88a07edb0f6181104e0e81aae175d SHA512 f36c5d30981c2e39b37a626eb235f7e9117de18bd774e91058350cceb9859ed9f99a11233f9a72a8acff7a7f84bf657a25e86935623a65986d63ce86734b3c3b
-DIST menumaker-0.99.10.tar.gz 202580 BLAKE2B 2fb53359a6e4b14fe8966c3fbb6d0f381a3ad9e52463d37edbef47a409b0ecf4f17bd7221395987d4cd49f363007aa97f0d6182595a571f1baab4e7977c06bff SHA512 e7a731ac848089cbdb845fdb0e344b48e70d3bb7220870127d3616549d31fa62b61a48e3efff52d7767b597a4407a8548e776c16976072d0aa7f5c96740cd207
+AUX menumaker-0.99.12-AM_PATH_PYTHON.patch 2600 BLAKE2B bd7b4b3628c9628ca9b381f292e5919c093d492b2f87ce6ff595be15e57d4e8b92e417fcf8856ed8e7625a1eea337a361c321c0b6f87a23f462f5dc1a79d1756 SHA512 db92e8bde59afa52a3d38681deaab37642830964b717a4bb39134afc607d46f33d983f081e9b96848e63d7f7ea99a3ecdc8df7c0bc3dda5156c3e0d9f8bcaca0
 DIST menumaker-0.99.11.tar.gz 205196 BLAKE2B 5f1fa9cbf4fd739499db86f9173fbbea2c96900597d13185f2a2f2b5746a0a2c05d12b115782488cb5b1df1f48638bb831dbee4bb14c414fc11328f43d241c46 SHA512 b45b8f2de4e63bad673bf4463ac074b068d4889cf37644962d51e1514d07bef827679d060d1503e59ea4bfc460fdc643d850921b3a02babd1ea57249511ffa5a
-EBUILD menumaker-0.99.10.ebuild 1090 BLAKE2B d31876d7b5d2ea5774abe97068be1b189fb258012576c824b76d63a874d2c680fd4477ab5d8de1f28c520c6b0d6cafc9621b702d9a421d995e435dee5f2e8e29 SHA512 22afcce577ac026e8fbaf90f3bab9f4623022ee9ef51fc6b2dc336edae413585405a0dd49f6095ca9fcc1f1aff9f1a4c070e28df1e109efdc1e7410014defa07
+DIST menumaker-0.99.12.tar.gz 206208 BLAKE2B c909a103bd031f385a1b7c19c8f17ac97310b3f19b2cf3eeb4b77ebfa82ac388cb9d76b1c88523942ce9d20016ba86bd4fa3741b31e3f6cd9ca63e10c8cab65e SHA512 dceef85da4d68a7f13bb59e1d93a51632d4134e55c59fa9cdf4ec4497eb502959c1b65ccaa56c2410f2fc5a770a9b023ddec05e80d186c88cdc1a351e1869af6
 EBUILD menumaker-0.99.11.ebuild 1085 BLAKE2B 13171e9c329839b33b97c8df86841b3c2deff204c7ed4f45edb647e12d224d34e554d60e4881ebcedb4d20b92c867df990e4a16fc3fa00a3c533738d9ae65e22 SHA512 aa94681b914b862c5ed8dd65adbe9ab96cc694b9f8890be2ec7917dcbc2ee964b903296103e3f0f0c36b38ea76de0d42983c8bacb683c0aca9df21e5ff952dd2
+EBUILD menumaker-0.99.12.ebuild 897 BLAKE2B 48616c0f5e77611b204d55faaec061c4904a69c5b7093c34b2ce24a8bbaf413a5cd8311fa0774c268732a139ff0cd286ede82bd559ca2592d24eab600a8c0657 SHA512 4f4f9665ab7688c59f4232d7c1481ecbfc594fb810064825b5249bd93ef7bcae2a16ec6d68de7ae522325247d284c0d4ea3e35b7298ab7fe35ba4862f210565e
 MISC metadata.xml 439 BLAKE2B cee25e15ca49508e651ba46d0598ee61f0c959bdf46a28337ab0d6071683e6779e8e0d50e36d9aa84ef761f251773ea101eae4dbf1a3b7494d08d2f8778f90e4 SHA512 5f68ee720bbfc364f200335a1045982b4c82aab73e24a8e5143d8a776919b6b676088c5af49ea74cdb09d09cf1f055b596471915f173ab6afbb17bc553a6b07c
diff --git a/x11-misc/menumaker/files/menumaker-0.99.10-AM_PATH_PYTHON.patch b/x11-misc/menumaker/files/menumaker-0.99.10-AM_PATH_PYTHON.patch
deleted file mode 100644
index 8e645a8b2fbc..000000000000
--- a/x11-misc/menumaker/files/menumaker-0.99.10-AM_PATH_PYTHON.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Use AM_PATH_PYTHON instead of broken hacks
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,23 +1,13 @@
--AC_INIT(MenuMaker, 0.99.10)
-+AC_INIT([MenuMaker], [0.99.10])
- 
- AM_INIT_AUTOMAKE
- 
--#AZ_PYTHON_DEFAULT
-+AM_PATH_PYTHON
- 
--#AZ_PYTHON_WITH
--
--#if test -z "$PYTHON"; then
--#    AZ_PYTHON_PATH
--#fi
--
--#AZ_PYTHON_VERSION_ENSURE([2.7])
--
--#AZ_PYTHON_RUN
--
--AX_PYTHON
--
--AC_CONFIG_FILES([Makefile])
--AC_CONFIG_FILES([doc/Makefile])
--AC_CONFIG_FILES([Config.py])
-+AC_CONFIG_FILES([
-+	Makefile
-+	doc/Makefile
-+	Config.py
-+])
- 
- AC_OUTPUT
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,15 +1,53 @@
--ACLOCAL_AMFLAGS = -I m4
--
- SUBDIRS = doc
- 
- dist_bin_SCRIPTS = mmaker
- 
--nobase_dist_pkgdata_DATA = *.py MenuMaker/*.py Prophet/*.py Prophet/Desktop/*.py Prophet/Legacy/*.py Prophet/Debian/*.py Prophet/Debian/menu/*
-+python_PYTHON = \
-+	Config.py \
-+	Keywords.py \
-+	Paths.py
-+
-+pythonMenuMakerdir = $(pythondir)/MenuMaker
-+pythonMenuMaker_PYTHON = \
-+	MenuMaker/BlackBox.py \
-+	MenuMaker/CLI.py \
-+	MenuMaker/Deskmenu.py \
-+	MenuMaker/FluxBox.py \
-+	MenuMaker/IceWM.py \
-+	MenuMaker/__init__.py \
-+	MenuMaker/OpenBox3.py \
-+	MenuMaker/PekWM.py \
-+	MenuMaker/WindowMaker.py \
-+	MenuMaker/xBox.py \
-+	MenuMaker/Xfce4.py
-+
-+pythonProphetdir = $(pythondir)/Prophet
-+pythonProphet_PYTHON = \
-+	Prophet/Categories.py \
-+	Prophet/__init__.py
-+
-+pythonProphetDesktopdir = $(pythondir)/Prophet/Desktop
-+pythonProphetDesktop_PYTHON = \
-+	Prophet/Desktop/__init__.py
-+
-+pythonProphetLegacydir = $(pythondir)/Prophet/Legacy
-+pythonProphetLegacy_PYTHON = \
-+	Prophet/Legacy/Development.py \
-+	Prophet/Legacy/Editor.py \
-+	Prophet/Legacy/Emulator.py \
-+	Prophet/Legacy/Graphics.py \
-+	Prophet/Legacy/__init__.py \
-+	Prophet/Legacy/Multimedia.py \
-+	Prophet/Legacy/Network.py \
-+	Prophet/Legacy/Shell.py
- 
--install-exec-local :
--	echo "#!/usr/bin/env $(PYTHON_BIN)" > $(DESTDIR)/$(bindir)/mmaker
--	echo "import sys; sys.path = ['$(pkgdatadir)'] + sys.path" >> $(DESTDIR)/$(bindir)/mmaker
--	echo "import MenuMaker.CLI" >> $(DESTDIR)/$(bindir)/mmaker
-+pythonProphetDebiandir = $(pythondir)/Prophet/Debian
-+pythonProphetDebian_PYTHON = \
-+	Prophet/Debian/__init__.py
- 
--install-data-local :
--	$(PYTHON) -c 'import compileall; compileall.compile_dir(dir="$(DESTDIR)/$(pkgdatadir)", ddir="$(pkgdatadir)")'
-+pythonProphetDebianMenudir = $(pythondir)/Prophet/Debian/menu
-+dist_pythonProphetDebianMenu_DATA = \
-+	Prophet/Debian/menu/debian-2.2r5 \
-+	Prophet/Debian/menu/debian-8.1 \
-+	Prophet/Debian/menu/ubuntu-5.04 \
-+	Prophet/Debian/menu/ubuntu-5.10
diff --git a/x11-misc/menumaker/files/menumaker-0.99.12-AM_PATH_PYTHON.patch b/x11-misc/menumaker/files/menumaker-0.99.12-AM_PATH_PYTHON.patch
new file mode 100644
index 000000000000..4df6939ce019
--- /dev/null
+++ b/x11-misc/menumaker/files/menumaker-0.99.12-AM_PATH_PYTHON.patch
@@ -0,0 +1,101 @@
+diff --git a/Makefile.am b/Makefile.am
+index b00b7bc..e1395ac 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,15 +1,54 @@
+-ACLOCAL_AMFLAGS = -I m4
+-
+ SUBDIRS = doc
+ 
+ dist_bin_SCRIPTS = mmaker
+ 
+-nobase_dist_pkgdata_DATA = *.py MenuMaker/*.py Prophet/*.py Prophet/Desktop/*.py Prophet/Legacy/*.py Prophet/Debian/*.py Prophet/Debian/menu/*
++python_PYTHON = \
++	Config.py \
++	Keywords.py \
++	Paths.py
++
++pythonMenuMakerdir = $(pythondir)/MenuMaker
++pythonMenuMaker_PYTHON = \
++	MenuMaker/BlackBox.py \
++	MenuMaker/CLI.py \
++	MenuMaker/Deskmenu.py \
++	MenuMaker/FluxBox.py \
++	MenuMaker/IceWM.py \
++	MenuMaker/__init__.py \
++	MenuMaker/JWM.py \
++	MenuMaker/OpenBox3.py \
++	MenuMaker/PekWM.py \
++	MenuMaker/WindowMaker.py \
++	MenuMaker/xBox.py \
++	MenuMaker/Xfce4.py
++
++pythonProphetdir = $(pythondir)/Prophet
++pythonProphet_PYTHON = \
++	Prophet/Categories.py \
++	Prophet/__init__.py
++
++pythonProphetDesktopdir = $(pythondir)/Prophet/Desktop
++pythonProphetDesktop_PYTHON = \
++	Prophet/Desktop/__init__.py
++
++pythonProphetLegacydir = $(pythondir)/Prophet/Legacy
++pythonProphetLegacy_PYTHON = \
++	Prophet/Legacy/Development.py \
++	Prophet/Legacy/Editor.py \
++	Prophet/Legacy/Emulator.py \
++	Prophet/Legacy/Graphics.py \
++	Prophet/Legacy/__init__.py \
++	Prophet/Legacy/Multimedia.py \
++	Prophet/Legacy/Network.py \
++	Prophet/Legacy/Shell.py
+ 
+-install-exec-local :
+-	echo "#!/usr/bin/env $(PYTHON_BIN)" > $(DESTDIR)/$(bindir)/mmaker
+-	echo "import sys; sys.path = ['$(pkgdatadir)'] + sys.path" >> $(DESTDIR)/$(bindir)/mmaker
+-	echo "import MenuMaker.CLI" >> $(DESTDIR)/$(bindir)/mmaker
++pythonProphetDebiandir = $(pythondir)/Prophet/Debian
++pythonProphetDebian_PYTHON = \
++	Prophet/Debian/__init__.py
+ 
+-install-data-local :
+-	$(PYTHON) -c 'import compileall; compileall.compile_dir(dir="$(DESTDIR)/$(pkgdatadir)", ddir="$(pkgdatadir)")'
++pythonProphetDebianMenudir = $(pythondir)/Prophet/Debian/menu
++dist_pythonProphetDebianMenu_DATA = \
++	Prophet/Debian/menu/debian-2.2r5 \
++	Prophet/Debian/menu/debian-8.1 \
++	Prophet/Debian/menu/ubuntu-5.04 \
++	Prophet/Debian/menu/ubuntu-5.10
+diff --git a/configure.ac b/configure.ac
+index 9ffeee7..604af4e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2,22 +2,12 @@ AC_INIT(MenuMaker, 0.99.12)
+ 
+ AM_INIT_AUTOMAKE
+ 
+-#AZ_PYTHON_DEFAULT
++AM_PATH_PYTHON
+ 
+-#AZ_PYTHON_WITH
+-
+-#if test -z "$PYTHON"; then
+-#    AZ_PYTHON_PATH
+-#fi
+-
+-#AZ_PYTHON_VERSION_ENSURE([2.7])
+-
+-#AZ_PYTHON_RUN
+-
+-AX_PYTHON
+-
+-AC_CONFIG_FILES([Makefile])
+-AC_CONFIG_FILES([doc/Makefile])
+-AC_CONFIG_FILES([Config.py])
++AC_CONFIG_FILES([
++	Makefile
++	doc/Makefile
++	Config.py
++])
+ 
+ AC_OUTPUT
diff --git a/x11-misc/menumaker/menumaker-0.99.10.ebuild b/x11-misc/menumaker/menumaker-0.99.10.ebuild
deleted file mode 100644
index b7fbd34187e3..000000000000
--- a/x11-misc/menumaker/menumaker-0.99.10.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=( python3_6 )
-
-inherit autotools python-r1
-
-DESCRIPTION="Utility that scans through the system and generates a menu of installed programs"
-HOMEPAGE="http://menumaker.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-IUSE="doc"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	doc? ( sys-apps/texinfo )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.99.10-AM_PATH_PYTHON.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	configure() {
-		ECONF_SOURCE="${S}" econf PYTHON="${EPYTHON}"
-	}
-	python_foreach_impl run_in_build_dir configure
-}
-
-src_compile() {
-	compile() {
-		default
-		use doc && emake html
-	}
-	python_foreach_impl run_in_build_dir compile
-}
-
-src_install() {
-	compile() {
-		default
-		use doc && emake DESTDIR="${D}" install-html
-	}
-	python_foreach_impl run_in_build_dir compile
-	python_replicate_script "${ED%/}"/usr/bin/mmaker
-	einstalldocs
-}
diff --git a/x11-misc/menumaker/menumaker-0.99.12.ebuild b/x11-misc/menumaker/menumaker-0.99.12.ebuild
new file mode 100644
index 000000000000..311238de9188
--- /dev/null
+++ b/x11-misc/menumaker/menumaker-0.99.12.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,7,8} )
+
+inherit autotools python-single-r1
+
+DESCRIPTION="Utility that scans through the system and generates a menu of installed programs"
+HOMEPAGE="http://menumaker.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="doc"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	doc? ( sys-apps/texinfo )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-AM_PATH_PYTHON.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	ECONF_SOURCE="${S}" econf PYTHON="${EPYTHON}"
+}
+
+src_compile() {
+	default
+	use doc && emake html
+}
+
+src_install() {
+	default
+	use doc && emake DESTDIR="${D}" install-html
+	python_optimize
+	python_fix_shebang "${ED}"/usr/bin/mmaker
+}
diff --git a/x11-misc/obmenu-generator/Manifest b/x11-misc/obmenu-generator/Manifest
index 36bac083489e..9cfd350f42d1 100644
--- a/x11-misc/obmenu-generator/Manifest
+++ b/x11-misc/obmenu-generator/Manifest
@@ -1,5 +1,7 @@
 DIST obmenu-generator-0.85.tar.gz 20558 BLAKE2B 526657eb9fc7ed0adc3681809d0f8b763f5faf7b2cb578962e1c2ab2e2bd488f386bcd6e7bf45e5752a2d339048af37f05bf31ef3947c2a9642f15e99db00eac SHA512 d6925ec8c2b75eec12bc23840799cedf4b882787b62a6b8814ca6c8b3bc5d22d2b8a4510fa6829d66541923caf3163a85eefc068a96ead631a3200467c563545
 DIST obmenu-generator-0.87.tar.gz 20648 BLAKE2B ba4f223c61cc380aa510d02c640e0694a6235a06cd44db0b6f929730747ff8f7f62842c545a8684a00fe31fa990ec7ce8488f8b2efd45cbd5852803c3c81ce99 SHA512 dfbe9e2f1565c7f02c08885ac9980fd35e6d698208f813d62cf97a34befe16987e0fca29429fce006bafbb8bd04a05c63e1a109d70bb757240199b8a970ba55e
+DIST obmenu-generator-0.88.tar.gz 20569 BLAKE2B 0b17a3d379f6a92e08dd1f2e6d943e4d30f669c11847ad1354f44c41e8d3714b174fe6194a4b952664e9cc8408080ba236871b83e9f2498f5d337bc6498e92ec SHA512 650915562792b20cb39175cf2e7d11141eba24e3345cb54e5400a18f324f6fdacc4008d57d091a3ee64a36ebcf4548d0c8328e6a2dbc62613c7001b97e10332a
 EBUILD obmenu-generator-0.85-r1.ebuild 611 BLAKE2B f1ba98e0e35fe7e5c64a1104ad84649a0b4b7d74115ed0b3ede21cf63aa684188cdbd3117c3c4cfeef5f355b0d5efb594e49eba3e5bb28f2addb3e86fb72202c SHA512 1812382a1700870dead875fea637f784215b0a5602b5605c8f80246b0526f8bde03cfdf5dc8a774169feca204a39b66c60735261a1ed24d4a8223b1b34441f7b
 EBUILD obmenu-generator-0.87.ebuild 803 BLAKE2B d5820e0ebad344ab6fab057998f1d49c4cd34cddb3185652c7fe53d54722770544963f5e805199572ef19b0f905cd0b6dabf23fe4e9059cdd48f802fd938c8c1 SHA512 eeea5f32515a83c28c2e707db14b82f71b54decf37d9f002f41dbb5e42cd187f0ec590929c67cfa71d3c67477f1beedebe6a9cd8fc412fa8566d6cd376c4d02e
+EBUILD obmenu-generator-0.88.ebuild 803 BLAKE2B d5820e0ebad344ab6fab057998f1d49c4cd34cddb3185652c7fe53d54722770544963f5e805199572ef19b0f905cd0b6dabf23fe4e9059cdd48f802fd938c8c1 SHA512 eeea5f32515a83c28c2e707db14b82f71b54decf37d9f002f41dbb5e42cd187f0ec590929c67cfa71d3c67477f1beedebe6a9cd8fc412fa8566d6cd376c4d02e
 MISC metadata.xml 445 BLAKE2B 6f47ae8ef7c079b03a0e8769bcf6ea35b0743dfb8f94f7ee99eba54f0dd1e66ac12a1d9198ffa246601965d02a0260ef667c4b48bac243fa1c82afe0e094be1d SHA512 8cf342329f67576b238d72043cc6485628f78874ee2a0ec54c0cba8e99ed5eeb0348c75396f035c82f6d3dbb501e338d090cca8bacd0a9c8ac969cf9e4de9d67
diff --git a/x11-misc/obmenu-generator/obmenu-generator-0.88.ebuild b/x11-misc/obmenu-generator/obmenu-generator-0.88.ebuild
new file mode 100644
index 000000000000..d00c2b742b88
--- /dev/null
+++ b/x11-misc/obmenu-generator/obmenu-generator-0.88.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils
+
+DESCRIPTION="A fast pipe/static menu generator for the Openbox Window Manager"
+HOMEPAGE="https://github.com/trizen/obmenu-generator"
+SRC_URI="https://github.com/trizen/obmenu-generator/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/perl[gdbm]
+	dev-perl/Data-Dump
+	>=dev-perl/Linux-DesktopFiles-0.90.0
+	x11-wm/openbox
+"
+
+src_install() {
+	dobin ${PN}
+
+	insinto /etc/xdg/obmenu-generator
+	doins schema.pl
+
+	dodoc README.md
+}
+
+pkg_postinst() {
+	elog "For icon (-i) functionality, install:"
+	optfeature "support via gtk+:2 (default)" dev-perl/Gtk2
+	optfeature "support via gtk+:3 (enabled via config)" dev-perl/Gtk3
+}
diff --git a/x11-misc/projecteur/Manifest b/x11-misc/projecteur/Manifest
index 2e0750716bab..d8145dd612fb 100644
--- a/x11-misc/projecteur/Manifest
+++ b/x11-misc/projecteur/Manifest
@@ -1,6 +1,6 @@
 AUX projecteur-0.7-fix-git-detection.patch 1740 BLAKE2B 18087fca44642910cc7b16902d10f295b55e00965d1104a5a293728d2ef5514cd2da0f0e1535662ce5385c604111d6b8ba56835b28a5e11811d59c51a76c0ff7 SHA512 f45928c0787e107c49364d2a9bf207f39f55f16278888baee5335a50ec6ec98e7c49f4734da65cf729482396b2d4297acdcef72ee101ac4113f0870bb9357918
 DIST projecteur-0.7.tar.gz 296252 BLAKE2B fb20de48ee5f89e66701fc8d6cad036aed48ed862994b82431a8a14f3ec95dccb863c4c35a5de01c932150b3b311511ef01af093ddbcd23a2413ebb882152bab SHA512 9af54e47883cd3d9368edef173b9c0eb522f947f7d72f759388e2ecdf275524bdf56d3562506a383bba32c0fd2ec5c76c232a7b523e13b79caeb4d6d76bbbac0
 DIST projecteur-0.8.tar.gz 379203 BLAKE2B b2171bd6120c9f6245c129519e33adbb4661ea4cd0df5f30c6c90fbefb8b7c5024da5c6d920d4e162b818bc0fc6417731dcf0c540103ed6f12976123c45c69eb SHA512 e892e87f442cfa7f0102efa01b43e63ed7ea9c30c875496dd3d683ee769de66f0a4ccfae149f060924e5613dfd7758a0b19d565232fb6db75b9228cee4a956de
-EBUILD projecteur-0.7-r2.ebuild 857 BLAKE2B 470cd4868b3f706f0d13cbb705463bb8acb9e02d3b780ef276c7799b042a36dfe2b9028f25ee3f671f0914175e38f1b59bdefa149d2a52fd66e792686e5fd50f SHA512 1da45091da76c22343e3bf2caed66ab2f6f7d7eb03d7489b2c53e402f7ad376de1666eaade8ace6c7d948200a8ed74679012c849a479774359a96c040d8dc079
+EBUILD projecteur-0.7-r2.ebuild 856 BLAKE2B 52b26bc65c88c0a8bc4d178f91c5c1ea263e928a440689def22c55e55529c6d59a00aeab3ab04aee41106d4d7b6f3e3abd3b3966157c1c152b29b1b90966c50b SHA512 fe93fa0857c2b633965dde8ac1f3cc2df5578e3fd5aab4b763dc78017b93f4decf257b9551e2ff3e958dc849e9b3d06fc2dc9a9d997e2321e73befd8f6cd7a3d
 EBUILD projecteur-0.8.ebuild 805 BLAKE2B 1ba5091382d294db067f0e4eb6c8e728d29a4d885e6db4d4ccd9aab31dbec9844edded5d0a4beadcb7c219b441a27aae52fd876a79bbfc33c0cbc720d44bd82a SHA512 4cd17f53e08c7caf60ae5a82d3f669dc4c52e8d20caf69b9ab16954ad071de646dc71c5911ff5a799561d8b0f2decb2f4049a3fc5aaa2b8654e79e64188dd0e5
 MISC metadata.xml 612 BLAKE2B 84ebf5cc3be489a0f7483e81b43dcee7067ec325a8a6c58f2350107921d0844bc7d084d7a35cddc95296c2f1046c4e098fed2b8748f0834df90c152dcd70e91e SHA512 d51be761cc4f93a47230bb63685fb367d7b0846b048733d192c6e36e9ac87f49cfcc28631ab4980dbc50213a9bbe23d3b0db665c5257e1e0e79804d9752e822c
diff --git a/x11-misc/projecteur/projecteur-0.7-r2.ebuild b/x11-misc/projecteur/projecteur-0.7-r2.ebuild
index 196ecb704c20..63ce3fd4425e 100644
--- a/x11-misc/projecteur/projecteur-0.7-r2.ebuild
+++ b/x11-misc/projecteur/projecteur-0.7-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jahnf/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 0a8822ac80cf..be15b8532d15 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -5,8 +5,9 @@ AUX vgl.service 254 BLAKE2B 0a0e73228821019a764b1bc3ff61a752b15001018f704739d86e
 AUX virtualgl-2.6.3-mesa-19.3.patch 3803 BLAKE2B cd2120dfc1fdc9c65cb65e428fd5bf98082c0bfcba3ce18ddd736bd1f421188ad9df4170bd6aa7bc2c8ef15f36398ec37a80554aa82e959e2e858faa910171d7 SHA512 6845a60071aac333ac1c2ad5c3861f9fbe8cdf9f28425817a18c2b6f8c280b5469ce3be4831a0bf8a6600955bf5177217ff684c61f728783f2d09be6885f2815
 DIST VirtualGL-2.6.1.tar.gz 1278335 BLAKE2B 62abb082eb8c82fecff33dd5b5036ebaead99b837cf0dc42581790863f09814858fd7a23a479c0c4ac5e59a4cc99af58903016a5109a6636191ce98d6da3d0bd SHA512 36580e55e11ba3e93945d62e865fe0b63ecd5aa1ee3889fb4d0940c68da06737fff4689a77638f5c8c57dbc9d020ba821bdec9aa2f6b2f0f144b18f1c3d8c5e5
 DIST VirtualGL-2.6.3.tar.gz 1197037 BLAKE2B d331ddac80d98e5c1d6be90e90d06706ff3ea8c0c303aeab41536eb1a33014e5e100900f0f1f8734fad317d073c8259523dddb98d9658c2cfb2345ea1410fc0e SHA512 c01c602335d51c94840c32021a5ce4f982939d67efbe1458fce67582c5a76ac42f5b733998a8c8f04a77d57d7c2de01377f7cabcf848c01bfd9b2d8e0b318fea
+DIST VirtualGL-2.6.4.tar.gz 1198141 BLAKE2B 34794897f62ccdf7f5d80b1c4465af5e22d72408e14ae9243c66315c9ffeedb21eb5dc6afc95c889c000c46685b8ab6e0756edaee4f34d9d28ea0b71459efba3 SHA512 a475e5b7373d0c86ec7d1274f7527cd7bb1d82acdb38d42366faae58175052f957e090a4c8fdb4e3ba4b2b9063957c14b46d55316b69420247d2f9cf3afb1280
 EBUILD virtualgl-2.6.1-r1.ebuild 2709 BLAKE2B 95b4f319aeae46ee30ddd72eed37956bf465857e25e0397c8837a6e86689c2803513ab2d13385cd7e8ad879a78a5567fc33e3f0070a69d0ad26688c9a0694aed SHA512 2981a1b63d890e16159ae292e70a34e50deb363183eaa9910ff1501a15de61d279eb77bdf2cf5e0fc39100ad7dcff841a07f426eb60f6bf2d0cd5da25e4cdc01
 EBUILD virtualgl-2.6.3-r1.ebuild 2960 BLAKE2B 15f663fe63ebcf45c8efc7efa31af1bf2f98b39916533e335e30eb2fa03fba204e28e1c06c6a1e83c0f612a8b6cb56c22340ee77cf10685f60aec5f8eec86f2c SHA512 159f58a730f670615a26640e9b5f9d7e55b10562e2af06cc1dc93b5066b5c6d4b7095e0718ee3382f126376e0803446927afc7a5552dcf77d62b2794f6c1b504
-EBUILD virtualgl-2.6.3.ebuild 2902 BLAKE2B 0a444af34d6c2271e4effba1fe73a78f367d65137df33ed720da9dbc8e0d935cfabc657df117b3a5f0b74f69d3e525aafd1d88a78b6a1f8e80814eecc4f52eca SHA512 d102d8952f57a5e1aa789f33a547fee0b9b3aa3b3c0c4ea67713e3b9a6122e98f2eb8b1df1a1bb4ac5dc301d95fd875fb7279c85c41d3d53ca98572364532c17
+EBUILD virtualgl-2.6.4.ebuild 2844 BLAKE2B 6a01f775a41796ff666a9270f2fd656cbcbfc0225c8501e243792b814c0e12fe856c684fc8432b8b2af388b1240bb71c67d7b7c9ec7baf3b6835df22c4fd15a3 SHA512 770f8776d32136cbb660acbc69f8f4ae1bef52ef3c64adaa7a6d7255e98086994626484bb60afc9392bfc39be1be44f949b36168269f472c38e107711185fc86
 EBUILD virtualgl-9999.ebuild 2711 BLAKE2B 6e80ffef02dbb840712e2d8767a3de5acde047a119e3550ad341174d7206ebb811b86a2fade4af739a66363d681106811c6b78a55d8e01160d59ee85a58e6cbd SHA512 53dc4e4e1bd74c0866d165e8e76cc36717081408046ebb798cf31abfcca27d0b93048ebb9a66c513a5914a8f455127d89b667ad210696eb849380f85457bcc10
 MISC metadata.xml 840 BLAKE2B bce303f2b3aac9d5cccd03062f64761f6fadc1194fc78c5850e8ecc3ae00ae0282d21be2f64e2fed294255c3fc3405a48b8cab7270e2c6e20b557b72d1dd82ae SHA512 7b4ffc9dccfe1c5bee2168216854b4020d1854fd85402a4757b8cbd6cf11e90e85ddf352f210d02d55388569b1dafd953377793a35f4130bd45210625c95f3af
diff --git a/x11-misc/virtualgl/virtualgl-2.6.3.ebuild b/x11-misc/virtualgl/virtualgl-2.6.3.ebuild
deleted file mode 100644
index 223864f51a21..000000000000
--- a/x11-misc/virtualgl/virtualgl-2.6.3.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic systemd
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git"
-	inherit git-r3
-else
-	MY_PN="VirtualGL"
-	MY_P="${MY_PN}-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
-HOMEPAGE="https://www.virtualgl.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-IUSE="libressl ssl"
-
-RDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	)
-	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXtst[${MULTILIB_USEDEP}]
-	x11-libs/libXv[${MULTILIB_USEDEP}]
-	virtual/glu[${MULTILIB_USEDEP}]
-	virtual/opengl[${MULTILIB_USEDEP}]
-	amd64? ( abi_x86_32? (
-		>=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32]
-		>=x11-libs/libX11-1.6.2[abi_x86_32]
-		>=x11-libs/libXext-1.3.2[abi_x86_32]
-		>=x11-libs/libXtst-1.2.3[abi_x86_32]
-		>=x11-libs/libXv-1.0.10[abi_x86_32]
-		>=virtual/glu-9.0-r1[abi_x86_32]
-		>=virtual/opengl-7.0-r1[abi_x86_32]
-	) )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	# Fix build issue w/ Mesa 19.3.0+ headers (fixed in next version)
-	"${FILESDIR}/${P}-mesa-19.3.patch"
-)
-
-src_prepare() {
-	# Use /var/lib, bug #428122
-	sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
-		server/vglrun.in server/vglgenkey server/vglserver_config || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Completely breaks steam/wine for discrete graphics otherwise
-	# see https://github.com/VirtualGL/virtualgl/issues/16
-	append-ldflags "-Wl,--no-as-needed"
-
-	abi_configure() {
-		local mycmakeargs=(
-			-DVGL_USESSL="$(usex ssl)"
-			-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
-			-DTJPEG_INCLUDE_DIR=/usr/include
-			-DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL
-			-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
-			-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
-		)
-		cmake_src_configure
-	}
-	multilib_parallel_foreach_abi abi_configure
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	# Make config dir
-	dodir /var/lib/VirtualGL
-	fowners root:video /var/lib/VirtualGL
-	fperms 0750 /var/lib/VirtualGL
-	newinitd "${FILESDIR}/vgl.initd-r3" vgl
-	newconfd "${FILESDIR}/vgl.confd-r2" vgl
-
-	exeinto /usr/libexec
-	doexe "${FILESDIR}/vgl-helper.sh"
-	systemd_dounit "${FILESDIR}/vgl.service"
-
-	# Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
-	mv "${D}"/usr/bin/{,v}glxinfo || die
-
-	# Remove license files, bug 536284
-	rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
-
-	# Directory is created if needed at runtime
-	rm -r "${D}"/var/lib || die
-}
diff --git a/x11-misc/virtualgl/virtualgl-2.6.4.ebuild b/x11-misc/virtualgl/virtualgl-2.6.4.ebuild
new file mode 100644
index 000000000000..ec1b128132e7
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-2.6.4.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic systemd
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git"
+	inherit git-r3
+else
+	MY_PN="VirtualGL"
+	MY_P="${MY_PN}-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
+HOMEPAGE="https://www.virtualgl.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
+IUSE="libressl ssl"
+
+RDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	)
+	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXtst[${MULTILIB_USEDEP}]
+	x11-libs/libXv[${MULTILIB_USEDEP}]
+	virtual/glu[${MULTILIB_USEDEP}]
+	virtual/opencl[${MULTILIB_USEDEP}]
+	virtual/opengl[${MULTILIB_USEDEP}]
+	amd64? ( abi_x86_32? (
+		>=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32]
+		>=x11-libs/libX11-1.6.2[abi_x86_32]
+		>=x11-libs/libXext-1.3.2[abi_x86_32]
+		>=x11-libs/libXtst-1.2.3[abi_x86_32]
+		>=x11-libs/libXv-1.0.10[abi_x86_32]
+		>=virtual/glu-9.0-r1[abi_x86_32]
+		virtual/opencl[abi_x86_32]
+		>=virtual/opengl-7.0-r1[abi_x86_32]
+	) )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# Use /var/lib, bug #428122
+	sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
+		server/vglrun.in server/vglgenkey server/vglserver_config || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Completely breaks steam/wine for discrete graphics otherwise
+	# see https://github.com/VirtualGL/virtualgl/issues/16
+	append-ldflags "-Wl,--no-as-needed"
+
+	abi_configure() {
+		local mycmakeargs=(
+			-DVGL_USESSL="$(usex ssl)"
+			-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
+			-DTJPEG_INCLUDE_DIR=/usr/include
+			-DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL
+			-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
+			-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+		)
+		cmake_src_configure
+	}
+	multilib_parallel_foreach_abi abi_configure
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	# Make config dir
+	dodir /var/lib/VirtualGL
+	fowners root:video /var/lib/VirtualGL
+	fperms 0750 /var/lib/VirtualGL
+	newinitd "${FILESDIR}/vgl.initd-r3" vgl
+	newconfd "${FILESDIR}/vgl.confd-r2" vgl
+
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/vgl-helper.sh"
+	systemd_dounit "${FILESDIR}/vgl.service"
+
+	# Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
+	mv "${D}"/usr/bin/{,v}glxinfo || die
+
+	# Remove license files, bug 536284
+	rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
+
+	# Directory is created if needed at runtime
+	rm -r "${D}"/var/lib || die
+}
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 292c0b76e31c..596493a2da9a 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -3,5 +3,5 @@ DIST xkeyboard-config-2.29.tar.bz2 1707176 BLAKE2B 436f2e8f4c7bea5a96e551daf01cd
 DIST xkeyboard-config-2.30.tar.bz2 1689137 BLAKE2B 54ba0a3a82d65f4cf15c45aa500bd8a44865c9ce845d5bc1ae85d3544a384622c580baa119b8882defa9868d8210697153f868a273a38852d938bf318ed09c3b SHA512 2d775dcaab49d80f62b8eaadc9be406b42c9a3643d3a360f864a462c61865abce67d0a8a80772d54f8136603114c61b5168fd06771f9c132411911914abb1ea4
 EBUILD xkeyboard-config-2.29.ebuild 1395 BLAKE2B 5b12916ab898994fd013590bfe57ea2925310d251f8609f1995b9a64cf5ec4fc5f9beae49dbd2de9ee0ffed017d466c2f995487d32669e86fc149e4789c0bafb SHA512 c20621c807ffd9150558c0c2df7af2fde339045b695cca5f97f51da29ccb136a538b4125492f11617526c363d98fe496057edb5c8ff405130a5d7763d0876325
 EBUILD xkeyboard-config-2.30.ebuild 1344 BLAKE2B 3c02114e37b8db6084419232eac2b01e9b9d3b7417403a77e78a340bf5c0457ae307217d6ee79e50ab0130b79c7e173824a68b4b946d25ae6cbf8e763b9bf84f SHA512 3133d952555a82d6aa55a8e8a5d39a6357d8b8e9f13f5ed5f1be0dde0ccbef4bb381fe1effab2ff259500b1810aa697892c2795084fae4b319213158fe4a4260
-EBUILD xkeyboard-config-9999.ebuild 1344 BLAKE2B 3c02114e37b8db6084419232eac2b01e9b9d3b7417403a77e78a340bf5c0457ae307217d6ee79e50ab0130b79c7e173824a68b4b946d25ae6cbf8e763b9bf84f SHA512 3133d952555a82d6aa55a8e8a5d39a6357d8b8e9f13f5ed5f1be0dde0ccbef4bb381fe1effab2ff259500b1810aa697892c2795084fae4b319213158fe4a4260
+EBUILD xkeyboard-config-9999.ebuild 1023 BLAKE2B bd4b25cfb97dbd822f4b2e06200833139dacf0c1e689e4ea50c7cd779a8b86d3e79bde1581bab7ea3fa55b205b7291ba255b1f6d2992ddfa2755327a4f33d5f8 SHA512 87e81c2aa3ab90331386369e160be599051e831c6ea59ecb0345e829b376acc4f820aad418020852431357bd470feea2999fbdedaa8f0dee372a792fb23572a8
 MISC metadata.xml 337 BLAKE2B ab0893146e71b0d96879e7ec41c7c4e057cb92570227daef015b6fa1a24c55709cd3d19e16df5afe80f706995e12a44a9fc29826a552bd436b1e9381e44acde5 SHA512 6a43f86407638d3f156d4ae64caee882878dbd1ee7c23991c8f378d55cfb0afe016202866f95c328d8b4e59186efa6a7cb7335a1c86e3fbdda4c16a96e175cf0
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
index 66e3276b4ab7..5ae805ded96c 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -4,16 +4,14 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit python-any-r1
+inherit meson python-any-r1
 
 DESCRIPTION="X keyboard configuration database"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git"
-	inherit autotools git-r3
-	# x11-misc/util-macros only required on live ebuilds
-	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+	inherit git-r3
 else
 	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
@@ -23,36 +21,22 @@ LICENSE="MIT"
 SLOT="0"
 IUSE=""
 
+DEPEND=""
+RDEPEND=""
 BDEPEND="
 	${PYTHON_DEPS}
-	dev-util/intltool
+	dev-libs/libxslt
 	sys-devel/gettext
-	virtual/pkgconfig
 "
-RDEPEND=""
-DEPEND="${LIVE_DEPEND}"
 
 pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
 src_configure() {
-	local econfargs=(
-		--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
-		--enable-compat-rules
-		# do not check for runtime deps
-		--disable-runtime-deps
-		--with-xkb-rules-symlink=xorg
+	local emesonargs=(
+		-Dxkb-base="${EPREFIX}/usr/share/X11/xkb"
+		-Dcompat-rules=true
 	)
-
-	econf "${econfargs[@]}"
-}
-
-src_test() {
-	:;
+	meson_src_configure
 }
diff --git a/x11-misc/xmobar/Manifest b/x11-misc/xmobar/Manifest
index eb8d4f621c5d..2aba509b8a33 100644
--- a/x11-misc/xmobar/Manifest
+++ b/x11-misc/xmobar/Manifest
@@ -1,10 +1,5 @@
 AUX xmobar-0.24.3-alsa-mixer-0.3.patch 1113 BLAKE2B bd73e83144c9544b96ecce7c0990a68e14befc8556e325d62634bb62745f9f0dd84711b2b4873d31c6b228ba1383132edb3fb75638eb0e306333e354cf2c78c6 SHA512 87e1a2461aa98d02f6b4e0602429e24fd906de86f982328affb055514151e338ce20a4294485f490ef1678e7a3633736d7bb553d66c464a9dddf1becf6dc2b58
 AUX xmobar-0.24.3-noxpm.patch 363 BLAKE2B f7bc04a5c317400501c0bfc86b403cb7c12e5407ff492a58cc252b54d4723a00fe2dbb954c0ff85f0b9d9f283b0b1739ef7b882e797f8f26125044dbd56b36ff SHA512 54e87bfac3476d0821c7b42ace5f9f3f2709ca89bdb182f3e93bdfb3e09cb0432267698e20aa325099949694120f0f81810e5c5a026839899de2b1d4550485c8
-DIST xmobar-0.23.1.tar.gz 96169 BLAKE2B 5d16d3fc0a052614bc86cbc5ab515a5e2879d39d7bdf4541a3a10193c08bdc34a9bb07468ff7142c73e58694fb24c2fe581934404fd5ca737c4736855c60d316 SHA512 0215c02d32d90efff4d041d48b663755ccfb1944281f8a2cabb3e88cc9fd77221da03dd709b9c96f5ca8d7204561fe33fdabf37a2d919a83374df71909cc5978
-DIST xmobar-0.24.2.tar.gz 100179 BLAKE2B a5ca50d66bdb83274be62d1df83545d3527a3d05fc41708be44927ff75519f8686a2afc6671bede1142b881ebef37ede5116abff557b03276d509b031f5292d3 SHA512 c271e50d615d509c2c15ffa716b45df3211cfa143b128126c55a78a056475c9fbb6d7abc60a6a058e20a12aced5f33b94cecc35c73a76505e33e62ea1f1561f8
 DIST xmobar-0.24.3.tar.gz 100317 BLAKE2B 3ca7aeb977688b975674dc767f645d15aaf296ff906f51d79529ee58d827188437695b4ee0b960563f6c0ce1489baf1f5bdc4360807989277078a93dfafb3ed1 SHA512 aa16d55b16cf108005ee8ec6c3d1b348b3e70a5182cbb97eed2aeb67bed83bee4b23acff6d29d5bda5a30ce35dc87463a6ade6e0814b588f53b173a1c3b5a5b3
-EBUILD xmobar-0.23.1.ebuild 2874 BLAKE2B df35ca980a34b443b73170fb496fa0cf9d41861a54d1c804b113e4e72b979799b3bb4a2134287f2374590baebc4e258f08e1175a8958d0c56dd1b4da4e8ac92e SHA512 5eb9e8afde181c8ae13da72013ca22b77ae79ed16b57f0a8dd89df395725354fd6c31f95255763e6d6d7d45520525d07bffc0044a03b7a42eb9e9b5c55177e4d
-EBUILD xmobar-0.24.2.ebuild 3017 BLAKE2B 0b304a167a5da7222cba30e8d4b88a4566e7891a960eedafe6f555e5a7afbe6434d0117fa02390d05f2ec4bd1e78c0dddca57ad57a4ea6cc87aa99bb1a6a08f0 SHA512 284eba89d9aed6997268b90d1aa0b6fc83d6c7e031bc267a071caad9308e8235bfc8c25c9b2ba86ca1cac1e070296575d10f3337c387bba9193fa9253bbe0ed6
 EBUILD xmobar-0.24.3-r1.ebuild 3131 BLAKE2B 9559d065d2fc80acbb5284f06fe6f7ceb1c1664663d889376f86aacb1846ead62c4f3818d8dee68638b3aea84ff42e6b0ccaeb79e84b3666a10784cb0245b3ff SHA512 a3e3295e0654c6c36d2024e53c1fbf8d3fa0b6edf9705c876a63acbe5b6f6397c76eeb32364ae4cf92aafdd7c4d3c08d8a21af019adce163d9cb274277b39442
-EBUILD xmobar-0.24.3.ebuild 3090 BLAKE2B 4a8baabbcef3c4f8d52ce2edba2a96762f520159ae836272eec9d8b51696f8f5fa4535539af3ef981b15fc59c50dab8cb5b58521d34ef1c7f2e6eb4727c129a3 SHA512 2d8318df250ca22d86562e3aaa93c04eac88fd9a9b81e7495cb1a99c655bdfb431dbe4589b5092333e0c2673be250e8ae358abe5064d65b4bd00d8929c648c70
 MISC metadata.xml 807 BLAKE2B 3529fa66e04b28b6a55fd835e942c7bbe0e1e3888d16374eb62a7a57c5e88244a4bbd6fbc8370f3e27a586f3ed46b32f28afcd0d5f0254374230809c0338f9d7 SHA512 3753cd9088cf4c0d7858876d7606379c52b65ab5ed2314b69a480d3b21c522b8f3934b2572c61f72efb7be1da3b77665e055b6a76641c7f22d7c0de65e98ec44
diff --git a/x11-misc/xmobar/xmobar-0.23.1.ebuild b/x11-misc/xmobar/xmobar-0.23.1.ebuild
deleted file mode 100644
index 4ae5b8af980c..000000000000
--- a/x11-misc/xmobar/xmobar-0.23.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -all_extensions,+with_threaded,+with_utf8,with_iwlib:wifi,with_alsa:alsa,with_xft:xft,with_datezone:timezone,with_dbus:dbus,with_mpd:mpd,with_inotify:inotify,with_mpris:mpris,with_xpm:xpm
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="A Minimalistic Text Based Status Bar"
-HOMEPAGE="https://xmobar.org"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa dbus inotify mpd mpris timezone wifi xft xpm"
-
-RDEPEND=">=dev-haskell/http-4000.2.4:=
-	>=dev-haskell/mtl-2.1:= <dev-haskell/mtl-2.3:=
-	dev-haskell/old-locale:=
-	>=dev-haskell/parsec-3.1:= <dev-haskell/parsec-3.2:=
-	dev-haskell/regex-compat:=
-	>=dev-haskell/stm-2.3:= <dev-haskell/stm-2.5:=
-	dev-haskell/transformers:=
-	>=dev-haskell/utf8-string-0.3:= <dev-haskell/utf8-string-1.1:=
-	>=dev-haskell/x11-1.6.1:=
-	>=dev-lang/ghc-7.4.1:=
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	alsa? ( >=dev-haskell/alsa-core-0.5:= <dev-haskell/alsa-core-0.6:=
-		>=dev-haskell/alsa-mixer-0.2:= <dev-haskell/alsa-mixer-0.3:= )
-	dbus? ( >=dev-haskell/dbus-0.10:= )
-	inotify? ( >=dev-haskell/hinotify-0.3:= <dev-haskell/hinotify-0.4:= )
-	mpd? ( >=dev-haskell/libmpd-0.9:= <dev-haskell/libmpd-0.10:= )
-	mpris? ( >=dev-haskell/dbus-0.10:= )
-	timezone? ( >=dev-haskell/timezone-olson-0.1:= <dev-haskell/timezone-olson-0.2:=
-			>=dev-haskell/timezone-series-0.1:= <dev-haskell/timezone-series-0.2:= )
-	wifi? ( net-wireless/wireless-tools )
-	xft? ( >=dev-haskell/x11-xft-0.2:= <dev-haskell/x11-xft-0.4:= )
-	xpm? ( x11-libs/libXpm )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	# xmobar is an idle multithreaded program
-	# which sits in 'while { sleep(1); }'
-	# loops in multiple threads.
-	# It has a pathological behaviour in GHC:
-	#   everything program does is thread context switch
-	#   100 times per second. It's easily seen with
-	#
-	#       $ strace -f -p `pidof xmobar`
-	#
-	#   where rt_sigreturn() manages to enter/exit
-	# kernel 32 times in each second to do nothing
-	# This workaround allows shrinkng wakeups/thread
-	# switches down to one per second (internal xmobar's
-	# cycle).
-	# Be careful when remove it :]
-	HCFLAGS+=" -with-rtsopts=-V0"
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-all_extensions \
-		$(cabal_flag alsa with_alsa) \
-		$(cabal_flag timezone with_datezone) \
-		$(cabal_flag dbus with_dbus) \
-		$(cabal_flag inotify with_inotify) \
-		$(cabal_flag wifi with_iwlib) \
-		$(cabal_flag mpd with_mpd) \
-		$(cabal_flag mpris with_mpris) \
-		--flag=with_threaded \
-		--flag=with_utf8 \
-		$(cabal_flag xft with_xft) \
-		$(cabal_flag xpm with_xpm)
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc samples/xmobar.config readme.md news.md
-}
diff --git a/x11-misc/xmobar/xmobar-0.24.2.ebuild b/x11-misc/xmobar/xmobar-0.24.2.ebuild
deleted file mode 100644
index e87d7fd1a21b..000000000000
--- a/x11-misc/xmobar/xmobar-0.24.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -all_extensions,+with_threaded,+with_utf8,with_iwlib:wifi,with_alsa:alsa,with_xft:xft,with_datezone:timezone,with_dbus:dbus,with_mpd:mpd,with_inotify:inotify,with_mpris:mpris,with_xpm:xpm
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="A Minimalistic Text Based Status Bar"
-HOMEPAGE="https://xmobar.org"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa dbus inotify mpd mpris timezone wifi conduit uvmeter xft xpm"
-
-RDEPEND=">=dev-haskell/http-4000.2.4:=
-	>=dev-haskell/mtl-2.1:= <dev-haskell/mtl-2.3:=
-	dev-haskell/old-locale:=
-	>=dev-haskell/parsec-3.1:= <dev-haskell/parsec-3.2:=
-	dev-haskell/regex-compat:=
-	>=dev-haskell/stm-2.3:= <dev-haskell/stm-2.5:=
-	dev-haskell/transformers:=
-	>=dev-haskell/utf8-string-0.3:= <dev-haskell/utf8-string-1.1:=
-	>=dev-haskell/x11-1.6.1:=
-	>=dev-lang/ghc-7.4.1:=
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	alsa? ( >=dev-haskell/alsa-core-0.5:= <dev-haskell/alsa-core-0.6:=
-		>dev-haskell/alsa-mixer-0.2.0.2:= )
-	dbus? ( >=dev-haskell/dbus-0.10:= )
-	inotify? ( >=dev-haskell/hinotify-0.3:= <dev-haskell/hinotify-0.4:= )
-	mpd? ( >=dev-haskell/libmpd-0.9:= <dev-haskell/libmpd-0.10:= )
-	mpris? ( >=dev-haskell/dbus-0.10:= )
-	timezone? ( >=dev-haskell/timezone-olson-0.1:= <dev-haskell/timezone-olson-0.2:=
-			>=dev-haskell/timezone-series-0.1:= <dev-haskell/timezone-series-0.2:= )
-	wifi? ( net-wireless/wireless-tools )
-	conduit? ( dev-haskell/http-conduit:=
-			dev-haskell/http-types:= )
-	xft? ( >=dev-haskell/x11-xft-0.2:= <dev-haskell/x11-xft-0.4:= )
-	xpm? ( x11-libs/libXpm )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	default
-	# xmobar is an idle multithreaded program
-	# which sits in 'while { sleep(1); }'
-	# loops in multiple threads.
-	# It has a pathological behaviour in GHC:
-	#   everything program does is thread context switch
-	#   100 times per second. It's easily seen with
-	#
-	#       $ strace -f -p `pidof xmobar`
-	#
-	#   where rt_sigreturn() manages to enter/exit
-	# kernel 32 times in each second to do nothing
-	# This workaround allows shrinkng wakeups/thread
-	# switches down to one per second (internal xmobar's
-	# cycle).
-	# Be careful when remove it :]
-	HCFLAGS+=" -with-rtsopts=-V0"
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-all_extensions \
-		$(cabal_flag alsa with_alsa) \
-		$(cabal_flag conduit with_conduit) \
-		$(cabal_flag timezone with_datezone) \
-		$(cabal_flag dbus with_dbus) \
-		$(cabal_flag inotify with_inotify) \
-		$(cabal_flag wifi with_iwlib) \
-		$(cabal_flag mpd with_mpd) \
-		$(cabal_flag mpris with_mpris) \
-		--flag=with_threaded \
-		--flag=with_utf8 \
-		$(cabal_flag uvmeter with_uvmeter) \
-		$(cabal_flag xft with_xft) \
-		$(cabal_flag xpm with_xpm)
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc samples/xmobar.config readme.md news.md
-}
diff --git a/x11-misc/xmobar/xmobar-0.24.3.ebuild b/x11-misc/xmobar/xmobar-0.24.3.ebuild
deleted file mode 100644
index 62173b3a3355..000000000000
--- a/x11-misc/xmobar/xmobar-0.24.3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -all_extensions,+with_threaded,+with_utf8,with_iwlib:wifi,with_alsa:alsa,with_xft:xft,with_datezone:timezone,with_dbus:dbus,with_mpd:mpd,with_inotify:inotify,with_mpris:mpris,with_xpm:xpm
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="A Minimalistic Text Based Status Bar"
-HOMEPAGE="https://xmobar.org"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa dbus inotify mpd mpris timezone wifi conduit uvmeter xft xpm"
-
-RDEPEND=">=dev-haskell/http-4000.2.4:=
-	>=dev-haskell/mtl-2.1:= <dev-haskell/mtl-2.3:=
-	dev-haskell/old-locale:=
-	>=dev-haskell/parsec-3.1:= <dev-haskell/parsec-3.2:=
-	dev-haskell/regex-compat:=
-	>=dev-haskell/stm-2.3:= <dev-haskell/stm-2.5:=
-	>=dev-haskell/utf8-string-0.3:= <dev-haskell/utf8-string-1.1:=
-	>=dev-haskell/x11-1.6.1:=
-	>=dev-lang/ghc-7.8.2:=
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	alsa? ( >=dev-haskell/alsa-core-0.5:= <dev-haskell/alsa-core-0.6:=
-		>dev-haskell/alsa-mixer-0.2.0.2:= )
-	dbus? ( >=dev-haskell/dbus-0.10:= )
-	inotify? ( >=dev-haskell/hinotify-0.3:= <dev-haskell/hinotify-0.4:= )
-	mpd? ( >=dev-haskell/libmpd-0.9:= <dev-haskell/libmpd-0.10:= )
-	mpris? ( >=dev-haskell/dbus-0.10:= )
-	timezone? ( >=dev-haskell/timezone-olson-0.1:= <dev-haskell/timezone-olson-0.2:=
-			>=dev-haskell/timezone-series-0.1:= <dev-haskell/timezone-series-0.2:= )
-	wifi? ( net-wireless/wireless-tools )
-	conduit? ( dev-haskell/http-conduit:=
-			dev-haskell/http-types:= )
-	xft? ( >=dev-haskell/x11-xft-0.2:= <dev-haskell/x11-xft-0.4:= )
-	xpm? ( x11-libs/libXpm )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-PATCHES=("${FILESDIR}"/${P}-noxpm.patch)
-
-src_prepare() {
-	default
-	# xmobar is an idle multithreaded program
-	# which sits in 'while { sleep(1); }'
-	# loops in multiple threads.
-	# It has a pathological behaviour in GHC:
-	#   everything program does is thread context switch
-	#   100 times per second. It's easily seen with
-	#
-	#       $ strace -f -p `pidof xmobar`
-	#
-	#   where rt_sigreturn() manages to enter/exit
-	# kernel 32 times in each second to do nothing
-	# This workaround allows shrinkng wakeups/thread
-	# switches down to one per second (internal xmobar's
-	# cycle).
-	# Be careful when remove it :]
-	HCFLAGS+=" -with-rtsopts=-V0"
-
-	cabal_chdeps \
-		'stm >= 2.3 && < 2.5' 'stm >= 2.3'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-all_extensions \
-		$(cabal_flag alsa with_alsa) \
-		$(cabal_flag conduit with_conduit) \
-		$(cabal_flag timezone with_datezone) \
-		$(cabal_flag dbus with_dbus) \
-		$(cabal_flag inotify with_inotify) \
-		$(cabal_flag wifi with_iwlib) \
-		$(cabal_flag mpd with_mpd) \
-		$(cabal_flag mpris with_mpris) \
-		--flag=with_threaded \
-		--flag=with_utf8 \
-		$(cabal_flag uvmeter with_uvmeter) \
-		$(cabal_flag xft with_xft) \
-		$(cabal_flag xpm with_xpm)
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc samples/xmobar.config readme.md news.md
-}
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 9e9aff296d4f..a4a5de87e51c 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -16,5 +16,5 @@ DIST xscreensaver-5.43-r1.tar.gz 26973508 BLAKE2B 67b57214e8a41ba895df6e9efcac3e
 DIST xscreensaver-5.44.tar.gz 27001826 BLAKE2B 102025aa2f57672ed3547f0e9bab989566fb8e50ecae8b9e4078ec5ee5de3cad09fec107695335ef236ad9fe19b2638978366a180a998d77b0ce8a2a5d1ebde3 SHA512 9d9144dec6f075c2d6a1c3cd45123a98d6d0cd732d6c3e3389e97b3f802b8f8765a188d1e35f97f123ca0a64661ea616b7b710577063c311da3d99d8439f1dae
 EBUILD xscreensaver-5.38-r1.ebuild 3437 BLAKE2B f8fbcb02b9f5927e395a13b438235cc4b4d5b8f0660253085d890326151dbebdc826ba89b401c855a86a7f037828527408cf44484478d72e2722fdd0048d7dfa SHA512 2237ff0d15867e50b564c8889d251afc7e2a08431701f9a8a36e9120ca47c6665b03be86eec4ec2f6fc1a38352dca5297fcd60d813d1b73856707447a2e14f87
 EBUILD xscreensaver-5.43-r3.ebuild 3476 BLAKE2B 573c05f1255f99c769b96c605952a525ace1ee8782e6c5408fd4a02501e584654478fededc8396d3eb0fa69b1096ebf2b9d87390a2f5b79264e61f2ad67b7c54 SHA512 525acd033e5cabd0cc7d0a03f72f7e86bcbe229c11aaa2de78a2639dc20657258416782003adbc528ae610af694429236c6f5381aec7e135b6f8a16b17726bb8
-EBUILD xscreensaver-5.44-r2.ebuild 3620 BLAKE2B 8b31476686597311466918725f85c0be7bcc566e9bf872a36cc7e9d6c5ade6eaf0a532a67dafae89a220913e22d58bfb78f0803dc8a1b60b378e096cc87686e8 SHA512 30d6c2f02e7ef813ffd5f35b8446e2ee638a6dc523dcff664e8b77751e1b253e8d0e35ea4842ba102363e74dc2c070f0ecc95c9c426119729c6483f664522f20
-MISC metadata.xml 660 BLAKE2B f720a7df804148568927cc909ec46013c8de0087f2ab5751bd3852cf310161c328d43f29db22105e46b4c142db3e84fa5a2c943bae63779156bfe569726bf12b SHA512 ecc2b0423bd77d7713db654875f5d112c90c278653248298c877a84104db40430fcdaffaac2cbb972bb6ae6ce970b498d4d086278ba85c519dedeb3586bcd41b
+EBUILD xscreensaver-5.44-r2.ebuild 3755 BLAKE2B 5de38bbcf33fd443e012f136b7e437d96a56f688853664bc1ea64467c88b2892c4e90a91646884094cbc9abdbc51dd1524ade3b210719b029ac5d06284c8ff3d SHA512 3f9b8926051b8363e5b6d7062dec240f9502a395d9521fbde525c0a6aa37f6073858f6d67b5b0e81e51c1ef7d22c4912500c920f613a44bfdb29ad133841d487
+MISC metadata.xml 870 BLAKE2B 222f0b24d94c2d9884848813bc9927312e23c670cb03d6427af4018c469b7ca81ab5d0887fa469ad60d05aff97f3b8b2df88158638213fbce24ea6d90c7d9f1a SHA512 0743dbc932e97530aede3f34519e1785bd186662619f46d212f4b4ae0b53bfa01875a3a58d2a30e7f7e6d93f1723211e5cf95018b86dd8e5ede5a37e4c238592
diff --git a/x11-misc/xscreensaver/metadata.xml b/x11-misc/xscreensaver/metadata.xml
index cc68eed36040..fb3aa2fc1da8 100644
--- a/x11-misc/xscreensaver/metadata.xml
+++ b/x11-misc/xscreensaver/metadata.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>desktop-misc@gentoo.org</email>
-    <name>Gentoo Desktop Miscellaneous Project</name>
-  </maintainer>
-  <upstream>
-    <maintainer>
-      <email>jwz@jwz.org</email>
-      <name>Jamie Zawinski</name>
-    </maintainer>
-  </upstream>
-  <use>
-    <flag name="gdm">Use gdmflexiserver from <pkg>gnome-base/gdm</pkg> instead of <pkg>x11-misc/lightdm</pkg></flag>
-    <flag name="new-login">Enable user switching support using gdmflexiserver (<pkg>x11-misc/lightdm</pkg>)</flag>
-  </use>
+<maintainer type="project">
+<email>desktop-misc@gentoo.org</email>
+<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
+<upstream>
+<maintainer>
+<email>jwz@jwz.org</email>
+<name>Jamie Zawinski</name>
+</maintainer>
+</upstream>
+<use>
+<flag name="gdk-pixbuf">Include support for the <pkg>x11-libs/gdk-pixbuf</pkg> library in some demos, which will make it possible for them to read GIF, JPEG, and PNG files as well</flag>
+<flag name="gdm">Use gdmflexiserver from <pkg>gnome-base/gdm</pkg> instead of <pkg>x11-misc/lightdm</pkg></flag>
+<flag name="locking">Compile in support for locking the display</flag>
+<flag name="new-login">Enable user switching support using gdmflexiserver (<pkg>x11-misc/lightdm</pkg>)</flag>
+</use>
 </pkgmetadata>
diff --git a/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild
index 60a494c33632..49a04e5dd618 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild
@@ -13,7 +13,10 @@ SRC_URI="
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="caps gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
+IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid xinerama"
+REQUIRED_USE="
+	gdk-pixbuf? ( gtk )
+"
 
 COMMON_DEPEND="
 	>=gnome-base/libglade-2
@@ -21,8 +24,6 @@ COMMON_DEPEND="
 	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
@@ -32,6 +33,8 @@ COMMON_DEPEND="
 	x11-libs/libXt
 	x11-libs/libXxf86vm
 	caps? ( sys-libs/libcap )
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[X] )
+	gtk? ( x11-libs/gtk+:2 )
 	jpeg? ( virtual/jpeg:0 )
 	new-login? (
 		gdm? ( gnome-base/gdm )
@@ -111,19 +114,19 @@ src_configure() {
 	export RPM_PACKAGE_VERSION=no #368025
 
 	econf \
+		$(use_enable locking) \
 		$(use_with caps setcap-hacks) \
+		$(use_with gdk-pixbuf pixbuf) \
+		$(use_with gtk) \
 		$(use_with jpeg) \
 		$(use_with new-login login-manager) \
 		$(use_with opengl gl) \
 		$(use_with pam) \
 		$(use_with suid setuid-hacks) \
 		$(use_with xinerama xinerama-ext) \
-		--enable-locking \
 		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
 		--with-dpms-ext \
-		--with-gtk \
 		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
-		--with-pixbuf \
 		--with-proc-interrupts \
 		--with-randr-ext \
 		--with-text-file="${EPREFIX}"/etc/gentoo-release \
@@ -135,6 +138,7 @@ src_configure() {
 		--with-xshm-ext \
 		--without-gle \
 		--without-kerberos \
+		--without-motif \
 		--x-includes="${EPREFIX}"/usr/include \
 		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
 }
diff --git a/x11-misc/xvfb-run/Manifest b/x11-misc/xvfb-run/Manifest
index e150df89a5cd..922c1466be7d 100644
--- a/x11-misc/xvfb-run/Manifest
+++ b/x11-misc/xvfb-run/Manifest
@@ -3,5 +3,5 @@ DIST xorg-server_1.19.3-2.diff.gz 139662 BLAKE2B b88708c4358a121a6f7bd099b15711b
 DIST xorg-server_1.20.8-2.diff.gz 171769 BLAKE2B 5572320e4bc1de63ba221e5c9804d6676cc7c918d417b4069572fec4385d62b73e5636a4f17eebb1897f410e323e190dff68056abd888373df4ccdd688ed7c47 SHA512 89115023fc802a3cf2fc21fabed4499112b1e6f52967eb134795f041194b05d86c59b1477d8b9001c2935efdeb64e8a0dd281a43a6252802df2d19349972f7d7
 EBUILD xvfb-run-1.18.4_p2.ebuild 773 BLAKE2B f43e286a6a376a355c527990a3600eadb7ca7078ee4e9942aa43f8b6c4679e4fccf7521914065bbc77538a5ff18e64081acfa1367919e2920d414c13b6c6225e SHA512 078d5ce6b8a52c4917c61cfc287caac0400e6db5e44b6df8c67455330e400e3cfce0fd0cd497e7c2d5081ad19076c1ce38191b6668f64bc492a663cb3c9aae4e
 EBUILD xvfb-run-1.19.3_p2.ebuild 743 BLAKE2B 9bc489339913c6139369aacb2898c8f4d4f2e987283dd70029705d28942b88ae2e011ac08bfdf72603fcb98e907869edd5a9cd145f92205ad0fdf38e8555a12b SHA512 9cf5be301ecd7fb6aec136deb9fab6e595fa0bdc1dd7392a1c654675f341056e33c9d4118a4e8dc88955ed12f865a8e3c602bf948ab6b013183dd21f48d2a311
-EBUILD xvfb-run-1.20.8_p2.ebuild 736 BLAKE2B e016ed38a269117a3ac32af70add252192bdbe94c7e305097119552d76a88e5c0b4baa2686261b73a2dd01366336e1494777fa1a51d9b686014c1138b054f9fd SHA512 8fc9c6c2f5eab50040ab95f79c8f34a43b59c9c56ad1308624c982725a33420afaa4860b2825477903c5456a6e6b9605a66407228d693b3573e0044ccef1f212
+EBUILD xvfb-run-1.20.8_p2.ebuild 741 BLAKE2B 8356910a3ff1dd3cc426ef266503038814aded34a792a8a2d40c53d8d2bc881486ad32ad3eca7c110998f470892f071a5d98f246477257a6d633e1036df86265 SHA512 9ee1c7d8aff0d71ef0e4abfc42482d7fdf60a0e645c62197fc4ea0d7ea92cdf5a52dd56b6a28cb047e9ba550f44d0c34a5a956d070e8b528e8f8f8bfa32c58ef
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild b/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild
index 1c1b5f678fce..c2608ef15845 100644
--- a/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild
+++ b/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${MY_PV}.diff.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="dev-util/patchutils"
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 60c71041ecab..c0a0866c071a 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -1,6 +1,8 @@
 AUX zim-0.60-remove-ubuntu-theme.patch 669 BLAKE2B fbb3fe0082e7567f4ae9d0bd031096cf2bcbd4d4cb86b31ceff18dda880b5cf1f8441e452642dd28275c9ce6e20c7da0a3a77b4157da13d5d4bbe9b6a30a9086 SHA512 a2e202986c77490898c15f6c4e647667fd6662422e8bbd638624a52a33989cd4259f95b37f488ff4a947f04354704ee9df7b9d60aae2fcc928f1f3186955ea1a
 DIST zim-0.72.1.tar.gz 2596910 BLAKE2B cdc6c875ed316dcd5655d75c280b46189d9b7068922ea0cc05606bce8f5bd0ef7d92b7965ee0af067add28ef75f53363e864b3ca43d216dbf99fe2cac6e19a73 SHA512 3b74388eb9272e6c5c89e752d784428b18ffc6cbc76311162aa8f42f2de434ad8e9f9c6932b8aaa62e2a3abdb879a31c982cc3103e7eaa3a5407a02cb6750bfc
 DIST zim-0.73.0.tar.gz 2615116 BLAKE2B 0d7c3910dfaa49f5260b4f7d23f812aa4cd9288bb19ffca0ca7297c49a508b89d4815ee7f2e98883f43c5cad92c6084939b827ccc4cb4e976edbf1cbc910eafa SHA512 0c01c63f68fe661263e25eef80e9b5872f2e5315d1e6a378de6b2486c081d39e5970435feee879a444f16f67ff2eda1a1e790630a3829a630c0ea95e59a505fa
+DIST zim-0.73.1.tar.gz 2615382 BLAKE2B 055857b20dbdebc1e5d8d6b13c344fcf665d9889f392f9c58fd3cfef1f80865a78c48e5138d2443f67bb29b8cd915b8d0d6bc0ac4807de20344dfe6673f1350e SHA512 ba67b396a6c06921e5e67ab5ccf0559e54b29a719262411b24f178c350bd0ac7c8239f8d5d4396b9dc291aadc36b59869d81dc04d457ce4a36eade67cdd53dd2
 EBUILD zim-0.72.1-r2.ebuild 1938 BLAKE2B 8df050f51ac404af6410471445eacd43d9450d50f151780e97082d131144d7d2ac84c5dae37e08ac6fbe242311663216a30e5afc9b91a2cc26c340f78b189606 SHA512 3b7f99d4dc56c86c98fbd72fb285c9fdf825062ef25fde9c0de72c9ffc571ebc015a241edb1dc8a76e836d989d1096ebd4adf8eff49d9fffbbe4fa14c612ddff
 EBUILD zim-0.73.0.ebuild 1940 BLAKE2B dfa3171f6443e914b989010e49b505895b1ea0aa06501942c5abf3c041cd501e6e2f9ba4e5b8ee6c809ae6d6984ae0ccc117b2ad972c5827ac308a553e8f08df SHA512 e9f686901a40ccf79e72a38cd4d2da0654e928c8369f36743c3880dcbe149d36d1c043dca6da5d5b0a3161a8bedb41cde177a68ac3ff879a25dfa7572d6800c6
+EBUILD zim-0.73.1.ebuild 2001 BLAKE2B baa7b03409977a87b624a59d104703fca9c98107381ed2f54792bcc5fa2f18d42dd2201d282f4e0d4922f3c8cba1214eaa5721e379c83a2ac77018ab7dfbe5d3 SHA512 150377bbc61f8de1bcb92235e874b7b660f25f8fc268a4f642b0f3ce43d55470f944c916a85241e7197e67dce96c865c2e8121ff0297df0150393886db1a29e5
 MISC metadata.xml 824 BLAKE2B a6ac745b62015073844af9a8aae0ef1d6ca6b7c28e881c7b85d31e00c808076fa944feec5980cdefc72b5ddfa2cecb98fc96b4745df12743212a4d572679408d SHA512 26a4774e75f0a06bfedc2c26f4ca688f9a2644935302e0674ba5a5308af88bc90f291a01f5b10bba62ac0f0a46561d63bfd9289de67bc53c4be454542ea76816
diff --git a/x11-misc/zim/zim-0.73.1.ebuild b/x11-misc/zim/zim-0.73.1.ebuild
new file mode 100644
index 000000000000..44944193205d
--- /dev/null
+++ b/x11-misc/zim/zim-0.73.1.ebuild
@@ -0,0 +1,81 @@
+# 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"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+inherit xdg-utils virtualx distutils-r1
+
+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
+	export XDG_RUNTIME_DIR=fakethis
+}
+
+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 72d271f9d27f..c21e617de2bf 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index 34bfe51756fe..99bbac2d79d4 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -3,8 +3,10 @@ AUX enigmail-no_pEp_auto_download.patch 1356 BLAKE2B 1e3c440e3bcaeed42b3de751303
 DIST enigmail-2.0.12.tar.gz 2614589 BLAKE2B 3db6f595c14e02cfdc71bebc763d05926dc6e0abf4668d132fd0ce43204e681de5fce45db752c4f49b231bd7e217b75c0f23d4a7e204fa9a3a51f1c8097fb63d SHA512 f9f4f1ed4c7244280be2fade0ccb2f4b5e7075dd60f53953478ffb84012e687b7ac7bad489c0b0cb2d8937916c783fe9e1841174bf1e5bdb9ab8cb58b415db74
 DIST enigmail-2.1.5.tar.gz 2838286 BLAKE2B e86a340a916a7ac7ef39230e5bb5730198b672ab6c466db5085aa8a818da38e3681a6f22810355db986978c7d547ae50f6d70260a3ccdc9758861d03f3c4e5d5 SHA512 0ed104306ee998b368d4a5779c2daf7c20a112c9a37f357bbe10d8c64dd435448c71e83a0e1a1dc9eb10efcf654b1524676f2b490bf6a065e6dd66de0861baea
 DIST enigmail-2.1.6.tar.gz 2838221 BLAKE2B e95569dcd58f16e64079436a24b152e7d5e3cfbc2067fe909b0f714a8acbcf80db7b1c288302c0ca11b2536fb2ff4f4376bd5de582f3b65fd01938182c9e8f9c SHA512 72159287601ed95052fcdeb3c973714e775150ba41894ecb6474798fd5109ab18dee0e3b8874a920fd07d3b184ed2034cf75f7baff4e14307d8739a312193919
+DIST enigmail-2.1.7.tar.gz 2851632 BLAKE2B 8f6d1ec16b48219c75c6dbcddf4807ed57965eeec29776e7c757d5aa34da6bfdbbb58964ee3d7de2efcb65ab69fa5b020f1a8ec01cd8eee662d8195a217cdc69 SHA512 1b57091c8ab9aaa086f327b78d904d688c850b6d39e37e2dac82e0629c0279723eae4608ecd08a24efe9ed1bdc86fbc497e97cd800c7349a70612a42b98f3e41
 EBUILD enigmail-2.0.12-r1.ebuild 2181 BLAKE2B 50b69ab4765ae278d6222b45663bc1869d46142b7eb8f9fc89dbbd414b65857d49d836de6bee8fab65694b989a696bf2ca9b28e62ddc97a55ff72a1c443e770e SHA512 cad36763177ebcc2d40e57eb3c80143c08dfcfe0cbd3d8d7968bc0cbf6f0767c0503a1c4acee37e199ea52d562588031bed24e99dbb25e0f2963ce1d8c7a4937
 EBUILD enigmail-2.1.5.ebuild 2250 BLAKE2B 3fcad1fa9f86151aee49b7ba52267270751e0876d52455bd0ae9ea0201d472a21cddf844633aa125626a1420937b9786fdab95d7fddb6c187717c5f3af97f9ca SHA512 468f86c4c4a6e69fc0579a440793850dac9f9f29d2b9b05c930364da3063c2283c89d5768199d68f49f17ec42cf6ae895688c3a3088c27b863a6355eff56a0c0
 EBUILD enigmail-2.1.6.ebuild 2254 BLAKE2B 901ad5c969a2b82c8be8d683323258981ca28f260642761e7ff94df6c76e8b4b81afab67c321f106be414ffdc17b5fdc08336fca53cbacb2c198a5611e1e0967 SHA512 238a2aee1fd06d61d99c495a625cc191b404ff0efe631b79b031882ff774752221e4ca58c445d958b9d167dbb0199ab9647caf7b8cd7642b9bafaa869802bce3
+EBUILD enigmail-2.1.7.ebuild 2250 BLAKE2B 3fcad1fa9f86151aee49b7ba52267270751e0876d52455bd0ae9ea0201d472a21cddf844633aa125626a1420937b9786fdab95d7fddb6c187717c5f3af97f9ca SHA512 468f86c4c4a6e69fc0579a440793850dac9f9f29d2b9b05c930364da3063c2283c89d5768199d68f49f17ec42cf6ae895688c3a3088c27b863a6355eff56a0c0
 EBUILD enigmail-9999.ebuild 2188 BLAKE2B ed979ec62c674c60769027d73ced5a402894b3240be4ea93fcd5f1808b8066791836f019ecb497b236d9702efd0c4b01f1e30e65720b243cc1407615e32ebeb8 SHA512 ef2b530bd9cd0cd7e8a002b6e01bc21fd4d8331ee074ef676c12c37a315744dcd7fb2f24c49622fcb91cca9aa42067a17fbfbb825f94c016bb742df920f764b6
 MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
diff --git a/x11-plugins/enigmail/enigmail-2.1.7.ebuild b/x11-plugins/enigmail/enigmail-2.1.7.ebuild
new file mode 100644
index 000000000000..53f90a93be8c
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-2.1.7.ebuild
@@ -0,0 +1,84 @@
+# 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-any-r1
+
+DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
+HOMEPAGE="https://www.enigmail.net/"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-3"
+IUSE=""
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/enigmail/source"
+	S="${WORKDIR}/${P}"
+else
+	if [[ ${PV} = *_beta* ]] ; then
+		SRC_URI="https://www.enigmail.net/download/beta/${P/_/-}.tar.gz"
+	else
+		SRC_URI="https://www.enigmail.net/download/source/${P}.tar.gz"
+		KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
+	fi
+	S="${WORKDIR}/${PN}"
+fi
+
+RDEPEND="
+	( >=app-crypt/gnupg-2.0
+		|| (
+			app-crypt/pinentry[gtk(-)]
+			app-crypt/pinentry[qt5(-)]
+		)
+	)
+	!<mail-client/thunderbird-52.5.0
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	app-arch/zip
+	dev-lang/perl
+	"
+
+PATCHES=( "${FILESDIR}/enigmail-no_pEp_auto_download.patch" )
+
+src_compile() {
+	# Required or parallel make fails
+	emake -C stdlib createlib
+
+	emake ipc public ui package lang stdlib
+	emake xpi
+}
+
+src_install() {
+	local build_dir=build-tb
+	local emid=$(sed -n '/"id":/!d; s/.*\({.*}\).*/\1/; p; q' ${build_dir}/dist/manifest.json)
+	[[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf"
+
+	mv ${build_dir}/enigmail*.xpi ${build_dir}/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID'
+
+	# thunderbird
+	insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
+	doins ${build_dir}/"${emid}.xpi"
+
+	# seamonkey
+	insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
+	doins ${build_dir}/"${emid}.xpi"
+}
+
+pkg_postinst() {
+	local peimpl=$(eselect --brief --colour=no pinentry show)
+	case "${peimpl}" in
+	*gtk*|*qt*) ;;
+	*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
+		ewarn "You may be prompted for your password in an inaccessible shell!!"
+		ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
+		;;
+	esac
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "Please restart thunderbird and/or seamonkey in order for them to use"
+		elog "the newly installed version of enigmail."
+	fi
+}
diff --git a/x11-plugins/gkrellm-countdown/Manifest b/x11-plugins/gkrellm-countdown/Manifest
index d65bc3a3c2b1..7bc98bbd426e 100644
--- a/x11-plugins/gkrellm-countdown/Manifest
+++ b/x11-plugins/gkrellm-countdown/Manifest
@@ -1,4 +1,4 @@
 AUX gkrellm-countdown-makefile.patch 1005 BLAKE2B 80711f28134b9241e5844a30e84a1bf634c9c75a880c1a5dfdad32e427b7e50d802c049a424086d6bed05d50a5bd5b8d39e31265c900d7bcdc5111a95301b6b7 SHA512 ae7ed8c952698b8cf23f99ce18abff865ed0168df42a3b9db54326131dbbbc982ef3490b93fb0e76b05cbb746b34fe43fb98a7b0d18e459e773b723a80bc8178
 DIST gkrellm-countdown-0.1.2.tar.gz 12482 BLAKE2B eb619cc1da6ef90f843ab2a30e24da63d90988e85b4d48e2425f9c69a77ee64e7eaa674a7bed79da202633037aa56d5dd1f3b1c3ac9895172eed11af4b507dc0 SHA512 974a885ed56ffa95d2b5972fd309721e0043e8798fc1289fbb34bfd0320ec78db7a0572f8e43eee922b2823a2aa80789b8d24fdf106074e683b218e731b6de71
-EBUILD gkrellm-countdown-0.1.2-r1.ebuild 561 BLAKE2B 05c03125631eaa38486d3250af42cbebd0bdda4367db05c5aee5cb345d7d521ca13c4f263c48d81586d0ebaa231674dea06c59402d5dc0a3c3077b0bbf9d123d SHA512 3e56522637ab3923c97b97d81583bfd6797670c1ba1398b8dafd7f1f88d185a4ec78d8e15071a2053f43ee85ff9688f20de24bca59a6e58dfc0c78f8b894c855
+EBUILD gkrellm-countdown-0.1.2-r1.ebuild 574 BLAKE2B 1321e15f74fba14b9d5ed9f10bc20e69a6dbc65b9ea4db2e4c54470c19436f8cd542ae67eb285c1b33c317b040d8fa96414b3955dbcc51063efee328030fb866 SHA512 a909005e9e3dca72be3c87176cb3ebdceaf497f758dd082a244903a29ea571a0e81acd373dd07fb2b68afb4dad9152f371ddcc45a66b6693c0e62ec5be77584f
 MISC metadata.xml 251 BLAKE2B 56b93d75989820d690eb681b917d29f689b06ba963a184f6231dc2c6832952b28800211f92f56da38261f260a98f7366e84929d99a8662e03a83abb6c4b4672c SHA512 cb7741f0e8e8f07e6264f62b224e166e1f3a1e7df00df62c5de94c211bf6b60b413b7bbdb1c5fccdd3596e53fc9eb56c6c0cbe0d680690c1bc0e31ff881ee47d
diff --git a/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r1.ebuild b/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r1.ebuild
index ce1fc9af4cad..ba2f0c934ba6 100644
--- a/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r1.ebuild
+++ b/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r1.ebuild
@@ -7,7 +7,7 @@ inherit gkrellm-plugin toolchain-funcs
 
 DESCRIPTION="A simple countdown clock for GKrellM2"
 SRC_URI="http://oss.pugsplace.net/${P}.tar.gz"
-HOMEPAGE="http://freecode.com/projects/gkrellm-countdown"
+HOMEPAGE="http://freshmeat.sourceforge.net/projects/gkrellm-countdown"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index b83599c6b3e0..c0a4c2cc1acc 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest
index 42c20b3a5dc2..e8900ad41eb4 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -2,8 +2,10 @@ AUX kitty-terminfo-setup-0.17.2.patch 1707 BLAKE2B 6670b86ac9ed5063d2d2bd855ecd2
 DIST kitty-0.17.2.tar.xz 3044140 BLAKE2B 12dcb8ddb7d90a22904f575301e8c2b1672c3212ee29a035fa5e8eec553dafb0e2c8c1cc3a491c8ac6854d619e979e518d83c5218f36647a032a4f847d068ef3 SHA512 bccf1c1d60d1149bc5f849b82db1af80a2d9a7a11c5f2df853daae5700550eef98da389a30f015d67be796f39deacb31f3ee245eb37ba1a41ba377c70cd26d61
 DIST kitty-0.17.3.tar.xz 3064216 BLAKE2B f5ab532d97c211ceed463c24758635a9e7168bf03990889a98ebdad7fc8c1c60f5f3726724007f00ac6a5f5e8db44ca54a4a43027dbf6ce1fdfcaa40c7b8e10c SHA512 dc14ba35e77e0ebd1978fde0731b00e726e75137f900952dfa6b06add1f46e3a3f42e8e886ce8c689e4e3500f2d2216a66225d5211522a41d09ef61265065e2d
 DIST kitty-0.17.4.tar.xz 3068456 BLAKE2B 7c3be1bd9e1be814ca2c98ac8bed5c8ac906021efee9e399bddb8d1f2d6faa4368f08741fd24666892272c5ffc68e62d490f3a3b20a4f1cb1025401741ace29f SHA512 4ea954a59f44b04a1540d814892b08c93e37c07d7dd32b5db3f50806fa6f39a8a89957c216e47b43bf7aa9571dd0200de7dc12266cc672c9e70e39b2133da0d7
+DIST kitty-0.18.1.tar.xz 3098940 BLAKE2B c54f9e7996e8e17182d5cdb3f915964b2626985992dc9f8bf2f11d086475fd7b13ee131aaf942f521cd6356ac13f7efdf436253237022532ffc68cb7923bc645 SHA512 d1870fa8c1c42c9a20251ba7819fb649760a98070653cff6bbc0ef86160d6b20070bbfe4e549b80d75d7a78b37cb3c1153e4be246709cf630129cd4d09a76604
 EBUILD kitty-terminfo-0.17.2.ebuild 997 BLAKE2B 2b0cb0ab2cae14ec8ffab109ee3e429f258b4e3e05c1d6ceed4deec1dcce47923151961ecba4f3c9caa4ea8d75beff9b3791de728c9cc40b34465382f5ae6aa2 SHA512 1a3389f67d6b19fee38385b5bafcf48be9e839761f883581fef433528d1cda5a86b48fc03a244572c0f33f0ef66d1f3d6ddc55140915adb19e5fdfee9c3f90bf
 EBUILD kitty-terminfo-0.17.3.ebuild 997 BLAKE2B 2b0cb0ab2cae14ec8ffab109ee3e429f258b4e3e05c1d6ceed4deec1dcce47923151961ecba4f3c9caa4ea8d75beff9b3791de728c9cc40b34465382f5ae6aa2 SHA512 1a3389f67d6b19fee38385b5bafcf48be9e839761f883581fef433528d1cda5a86b48fc03a244572c0f33f0ef66d1f3d6ddc55140915adb19e5fdfee9c3f90bf
 EBUILD kitty-terminfo-0.17.4.ebuild 997 BLAKE2B 2b0cb0ab2cae14ec8ffab109ee3e429f258b4e3e05c1d6ceed4deec1dcce47923151961ecba4f3c9caa4ea8d75beff9b3791de728c9cc40b34465382f5ae6aa2 SHA512 1a3389f67d6b19fee38385b5bafcf48be9e839761f883581fef433528d1cda5a86b48fc03a244572c0f33f0ef66d1f3d6ddc55140915adb19e5fdfee9c3f90bf
+EBUILD kitty-terminfo-0.18.1.ebuild 997 BLAKE2B 2b0cb0ab2cae14ec8ffab109ee3e429f258b4e3e05c1d6ceed4deec1dcce47923151961ecba4f3c9caa4ea8d75beff9b3791de728c9cc40b34465382f5ae6aa2 SHA512 1a3389f67d6b19fee38385b5bafcf48be9e839761f883581fef433528d1cda5a86b48fc03a244572c0f33f0ef66d1f3d6ddc55140915adb19e5fdfee9c3f90bf
 EBUILD kitty-terminfo-9999.ebuild 920 BLAKE2B 03f762c69be3ce63a340cd57678444a9960b3654d6ea676a583eca4ff629375f9924328702ed6006a38af2da60ae3220db56ea296171cd69f6ed0c3d5f99dd49 SHA512 bae84cdcdce2cf5dd8f5149cddfb30b79ebd21b00875d49ac7da5856614d8816ba0f8daed4d7197341a5df7660a4221acd037c09f6f52f4fd0bb3ac7b69239fb
 MISC metadata.xml 464 BLAKE2B 5b6a988d0c9a9eb68e9e269b3f423915d4471b535dfb466fec8b9856ecbfb8d1d51decf34576f8522852bf59f1264e4a1d3b777363de221d0d114edcb9628cfa SHA512 90d9e9db675bd68fab9865526234692c3fb34086822b2b2c47eaec4d9a4f8ef10be41d8c9bf3801e579f8bcf541528dd09ea042f54f6f27319ea82bc4288745d
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.18.1.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.18.1.ebuild
new file mode 100644
index 000000000000..b37c1bba5c12
--- /dev/null
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.18.1.ebuild
@@ -0,0 +1,41 @@
+# 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-any-r1 toolchain-funcs xdg
+
+DESCRIPTION="Terminfo for kitty, an OpenGL-based terminal emulator"
+HOMEPAGE="https://github.com/kovidgoyal/kitty"
+SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
+S="${WORKDIR}/kitty-${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}"/kitty-terminfo-setup-0.17.2.patch
+)
+
+# kitty-terminfo is a split package from kitty that only installs the terminfo
+# file. As tests are designed to be run with the whole package compiled they
+# would fail in this case.
+RESTRICT="test"
+
+src_compile() {
+	"${EPYTHON}" setup.py \
+		--verbose $(usex debug --debug "") \
+		--libdir-name $(get_libdir) \
+		linux-terminfo || die "Failed to compile kitty."
+}
+
+src_install() {
+	insinto /usr
+	doins -r linux-package/*
+}
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index b7a5ce30af88..ab7a470631b0 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -4,8 +4,10 @@ AUX kitty-0.17.2-flags.patch 1719 BLAKE2B 1d68d001f4750268375971bd533a0e153ecead
 DIST kitty-0.17.2.tar.xz 3044140 BLAKE2B 12dcb8ddb7d90a22904f575301e8c2b1672c3212ee29a035fa5e8eec553dafb0e2c8c1cc3a491c8ac6854d619e979e518d83c5218f36647a032a4f847d068ef3 SHA512 bccf1c1d60d1149bc5f849b82db1af80a2d9a7a11c5f2df853daae5700550eef98da389a30f015d67be796f39deacb31f3ee245eb37ba1a41ba377c70cd26d61
 DIST kitty-0.17.3.tar.xz 3064216 BLAKE2B f5ab532d97c211ceed463c24758635a9e7168bf03990889a98ebdad7fc8c1c60f5f3726724007f00ac6a5f5e8db44ca54a4a43027dbf6ce1fdfcaa40c7b8e10c SHA512 dc14ba35e77e0ebd1978fde0731b00e726e75137f900952dfa6b06add1f46e3a3f42e8e886ce8c689e4e3500f2d2216a66225d5211522a41d09ef61265065e2d
 DIST kitty-0.17.4.tar.xz 3068456 BLAKE2B 7c3be1bd9e1be814ca2c98ac8bed5c8ac906021efee9e399bddb8d1f2d6faa4368f08741fd24666892272c5ffc68e62d490f3a3b20a4f1cb1025401741ace29f SHA512 4ea954a59f44b04a1540d814892b08c93e37c07d7dd32b5db3f50806fa6f39a8a89957c216e47b43bf7aa9571dd0200de7dc12266cc672c9e70e39b2133da0d7
+DIST kitty-0.18.1.tar.xz 3098940 BLAKE2B c54f9e7996e8e17182d5cdb3f915964b2626985992dc9f8bf2f11d086475fd7b13ee131aaf942f521cd6356ac13f7efdf436253237022532ffc68cb7923bc645 SHA512 d1870fa8c1c42c9a20251ba7819fb649760a98070653cff6bbc0ef86160d6b20070bbfe4e549b80d75d7a78b37cb3c1153e4be246709cf630129cd4d09a76604
 EBUILD kitty-0.17.2-r1.ebuild 2183 BLAKE2B a776ca1fd558ced50c8f2bea49f49f88f7fbdbe36f20151af64bdb9a5c59506900779879aa2f863dd792378e761736750f19929db595ded02364024027a50374 SHA512 1bedf2d7e703875987d03629ffeaf33bd69ba036939254935d3668dd63ad07d532ee39424eaecb9bf9aebdb23e0015ba417a766f438b762705005d0084b33013
 EBUILD kitty-0.17.3.ebuild 2183 BLAKE2B a776ca1fd558ced50c8f2bea49f49f88f7fbdbe36f20151af64bdb9a5c59506900779879aa2f863dd792378e761736750f19929db595ded02364024027a50374 SHA512 1bedf2d7e703875987d03629ffeaf33bd69ba036939254935d3668dd63ad07d532ee39424eaecb9bf9aebdb23e0015ba417a766f438b762705005d0084b33013
 EBUILD kitty-0.17.4.ebuild 2183 BLAKE2B a776ca1fd558ced50c8f2bea49f49f88f7fbdbe36f20151af64bdb9a5c59506900779879aa2f863dd792378e761736750f19929db595ded02364024027a50374 SHA512 1bedf2d7e703875987d03629ffeaf33bd69ba036939254935d3668dd63ad07d532ee39424eaecb9bf9aebdb23e0015ba417a766f438b762705005d0084b33013
+EBUILD kitty-0.18.1.ebuild 2174 BLAKE2B f434b17d1bd98ab0c3ea56ca0ae9a71172ee0d6a318ed1940836629222f26dbac8db1df931996eb9f8ddf65657ed1cc5f0f9e6a7f439af47dbdeb71d00fe05fb SHA512 66f7ac195d5bb9179b2e0849c09921991a4c55b9dc7edc54dce35d239a1fab64911acdcee2b55cab1b4893f5b84dfad1a4fb8b4c11bd11102edf97c7102eba70
 EBUILD kitty-9999.ebuild 2140 BLAKE2B fb60b6cbbde14212cc2d437a5dd946ce2e0d5178ec86b4e140b8092b8a31d29d7cd68669984a475fd51b2b54ea8b5fb9d9399cb07d99c6897a95f81fddc1cade SHA512 2cc98526c03091abe79a2916ed9b9937f17a06e1347be89d8e496a46fdd5b630b4c5ab84749493ea8565c38ea9738e10149e25b3f3fd5d4fd52d2d606869bcd2
 MISC metadata.xml 464 BLAKE2B 5b6a988d0c9a9eb68e9e269b3f423915d4471b535dfb466fec8b9856ecbfb8d1d51decf34576f8522852bf59f1264e4a1d3b777363de221d0d114edcb9628cfa SHA512 90d9e9db675bd68fab9865526234692c3fb34086822b2b2c47eaec4d9a4f8ef10be41d8c9bf3801e579f8bcf541528dd09ea042f54f6f27319ea82bc4288745d
diff --git a/x11-terms/kitty/kitty-0.18.1.ebuild b/x11-terms/kitty/kitty-0.18.1.ebuild
new file mode 100644
index 000000000000..8c01019befd9
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.18.1.ebuild
@@ -0,0 +1,104 @@
+# 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 xdg
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
+HOMEPAGE="https://github.com/kovidgoyal/kitty"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug wayland"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=media-libs/harfbuzz-1.5.0:=
+	media-libs/libcanberra
+	media-libs/libpng:0=
+	sys-apps/dbus
+	sys-libs/zlib
+	x11-libs/libxcb[xkb]
+	x11-libs/libXcursor
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libxkbcommon[X]
+	x11-libs/libXrandr
+	x11-terms/kitty-terminfo
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.17
+	)
+	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_6)
+"
+
+DEPEND="${RDEPEND}
+	media-libs/mesa[X]
+	sys-libs/ncurses
+"
+
+BDEPEND="virtual/pkgconfig"
+
+[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.17.2-flags.patch
+	"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
+	"${FILESDIR}"/${PN}-0.16.0-remove-terminfo.patch
+)
+
+src_prepare() {
+	default
+
+	# disable wayland as required
+	if ! use wayland; then
+		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
+	fi
+
+	# respect doc dir
+	sed -i "/htmldir =/s/appname/'${PF}'/" setup.py || die
+
+	tc-export CC
+}
+
+src_compile() {
+	"${EPYTHON}" setup.py \
+		--verbose $(usex debug --debug "") \
+		--libdir-name $(get_libdir) \
+		linux-package || die "Failed to compile kitty."
+}
+
+src_test() {
+	export KITTY_CONFIG_DIRECTORY=${T}
+	"${EPYTHON}" test.py || die
+}
+
+src_install() {
+	insinto /usr
+	doins -r linux-package/*
+	dobin linux-package/bin/kitty
+	python_fix_shebang "${ED}"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	optfeature "Displaying images in the terminal" virtual/imagemagick-tools
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-terms/pangoterm/Manifest b/x11-terms/pangoterm/Manifest
index 7c6f7fae616c..33aa6572428a 100644
--- a/x11-terms/pangoterm/Manifest
+++ b/x11-terms/pangoterm/Manifest
@@ -8,4 +8,4 @@ EBUILD pangoterm-0.0_pre20150913.ebuild 611 BLAKE2B 8d329e4a4189c310854b34416823
 EBUILD pangoterm-0.0_pre20151022.ebuild 622 BLAKE2B 2d4350c24d033ce8498abbb5cb882073778913e906395f22f7881b4fbc7dcbb97a8cce90a36b783a512037dec449fe008be1baadc022c559e685a51ec5daaaf7 SHA512 82b3f5dc51d565257232b732ae6abb2366751fa14326af570036b3a711dcff4071fc49a47f40d53ccb40057c5a0d98fb02e1b883d25c758888bce7f91bed4062
 EBUILD pangoterm-0.0_pre20160305.ebuild 622 BLAKE2B 3f65bac5771109dcbf7fdc2f13aa0fff29a2f335456eedeb1a085b433b2bde915bc8c3594c9a66ec39e3f58fba2e9dabbf30bc07b015c58f29b7905ee1f3980e SHA512 a694df69939569b7b574a13f13f230e47d133661f01560d9ae3f0b7732f1fe96492c45d87f21567725dc31cd464d5a549c7bbe18dabbca72d05e2dc67bd4324e
 EBUILD pangoterm-0.0_pre20171111.ebuild 622 BLAKE2B 326b1c23b4861811c435d201f143d980aad65ffa9310921ed9251b7b84508c05690daad5c1910124a809d9a2ec58f2b216dda8b9ef34a081f6ac678c89491413 SHA512 8cd2174e44d3a1cc882048ff36f6d9fa11b87caea1c333ddcce0514a8649f118305d422686f4e3e9e57d1cab64ae697a96f2a00d77742b1cf0a800416a202868
-MISC metadata.xml 255 BLAKE2B ce8556f284e2aeb414525da970f2d09bd347410b5bd062590d9f7a5210452d20216bd81d2f4be2680d8fb8c8cb6c57ad054754ef3f3cc99d057bff734b4e28fe SHA512 5666b3b1d8ef1d8f738e4c44c1ffe45eb019554a33fac80936cb005e2a6c6da95df236425dcd5922396ead1b3b7d1b1d9e70bafaf0631a36694e12f4613439f1
+MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
diff --git a/x11-terms/pangoterm/metadata.xml b/x11-terms/pangoterm/metadata.xml
index d8772d4166ca..58f638b2ac3e 100644
--- a/x11-terms/pangoterm/metadata.xml
+++ b/x11-terms/pangoterm/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>tranquility@gentoo.org</email>
-		<name>Ole Reifschneider</name>
-	</maintainer>
+	<!--maintainer-needed-->
 </pkgmetadata>
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 959ba41c2aaa..c5d4c401aa87 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/QGnomePlatform/Manifest b/x11-themes/QGnomePlatform/Manifest
index 1c4c8e628d2f..f6e2a927e462 100644
--- a/x11-themes/QGnomePlatform/Manifest
+++ b/x11-themes/QGnomePlatform/Manifest
@@ -2,5 +2,5 @@ AUX QGnomePlatform-0.6.1-qt5.15.patch 682 BLAKE2B 418b0c478d191e58186625cd2a307d
 DIST QGnomePlatform-0.6.0.tar.gz 28618 BLAKE2B af4ef5c54a8056a370a8d6299fd80bace2491a97c9bff99ce5a461a1c3ab07c6a5336fa88606805e37102ccc648217722331ec9e572ce3708581b713ee399d0d SHA512 c5aad4518e1c9d06b2561a6f8a6a169bf9a07ec0a63602d3bc5b0f91e1134504f5ca0e5a76bda3183165c72bf8de3e9297b51fe37879d80c1fbe4ca06e242a97
 DIST QGnomePlatform-0.6.1.tar.gz 28996 BLAKE2B 3d0da37fcc8e85bd59263dffb19865666d25dd50d2c1e00b4d6358d745eb7079f415058ffb75a8228c9c7ed956003a656b3e10a3467d9fc9dcd5eee2c14bf7cd SHA512 5e0bab45a8ff4c56e6e34d636ed719ce1a087f116942dd356253403d4be40aac348ccbdbfc917f65f6cc4df8619e1031734f0a46a36d4d9b7bb4838ded61570c
 EBUILD QGnomePlatform-0.6.0-r1.ebuild 634 BLAKE2B 8ae5634bbc6f11dd6c98d0f31646fd8432f0b47c58e987532946bc97be6212a05bce73cfd2cd79ec49c118fbc50939215a816bfd3d3ffb0c2b41a9d0dcb1e4ca SHA512 65d85f2c24164f9db965d1331533a4aa775158aa11bd20919c7201f2d9a6719cedf5cdc54c079577b9de42c3d3b6b075f0ae7fd0e75bd60c88b44422324d04a5
-EBUILD QGnomePlatform-0.6.1-r1.ebuild 699 BLAKE2B 8fe0bab2890d3e4937e88ed78540f170f02ece21b00e987194100fd7211e3183a5206e20ec71826db77316f6d1f6a3ac26e96034b7301726c25c77059b136364 SHA512 54e6bd068e38898fdc09585b5635b622ba4e850b550d458efde1aa0e11a5b36c43b9aaa8cf7dd2d3f4f7be0a3404bdf2606ad5e749b3fa3f9bc77a7fc8797fd6
+EBUILD QGnomePlatform-0.6.1-r1.ebuild 698 BLAKE2B 49e67ca9b13b38d6fff352c544f042a6851c6fa1b0aed47ecac09dc82dc32084a0ba6fed73e04e0253dd32e255ff9d7c0c180ec15cefdf4236d9563bdfd7420e SHA512 fce4d78ccc11f95b45eba2278896b95d5c1c76f143b8093b787c5a1c6f91bff27898e0331a6fd1af1f93b03c7dc40ba8f9895a66a2b3ecc78f833b8089ddfb0e
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/x11-themes/QGnomePlatform/QGnomePlatform-0.6.1-r1.ebuild b/x11-themes/QGnomePlatform/QGnomePlatform-0.6.1-r1.ebuild
index cb5e82b1d6ce..bbcb0579a22f 100644
--- a/x11-themes/QGnomePlatform/QGnomePlatform-0.6.1-r1.ebuild
+++ b/x11-themes/QGnomePlatform/QGnomePlatform-0.6.1-r1.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="A Qt Platform Theme aimed to accommodate GNOME settings"
 HOMEPAGE="https://github.com/FedoraQt/QGnomePlatform"
 SRC_URI="https://github.com/FedoraQt/QGnomePlatform/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 x86"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE=""
diff --git a/x11-themes/adwaita-qt/Manifest b/x11-themes/adwaita-qt/Manifest
index 48fa93209b92..c97259adef77 100644
--- a/x11-themes/adwaita-qt/Manifest
+++ b/x11-themes/adwaita-qt/Manifest
@@ -1,5 +1,5 @@
 DIST adwaita-qt-1.1.1.tar.gz 435566 BLAKE2B c8ca8df84ce06311b0937d994a859bb6e71a4a45570c179bdf3ded144bee06c93d8d80b300db3786b1bcc8db7f2b1d78423c8d8b0456079c4563924b2a036abc SHA512 6d11fc8eecc94da4f2e3798ee5147258f277032b23a82d5bf8d3414943ac89c5ebd056d519338959c72a8a45d1638ab8cfeac01b3f3fd1118b4c89eb0c8b5608
 DIST adwaita-qt-1.1.4.tar.gz 436392 BLAKE2B 2a8ab80a2189cc7bbc21bb83c409b16c8824364cc768765246876dedab8ac4073f0325d28dd916b2173bb3cd7396bb2c4b19b07c8932d589200d91f3ea48e2b9 SHA512 78390787c4b080608036605c6c713bbd5d482b039796e76974ca8c034e0d8af694704e063d53f99a3e5e7ac4d48f6325ff1c90d67fbeb4bc9e49792485e11cb1
 EBUILD adwaita-qt-1.1.1.ebuild 872 BLAKE2B d560355c9a638a9d4d261091761d07374a51592b6fad05f75894335499d4ccc1b8a00e54d7f3519598efeaf86fef6fa852a8c94dddc84b3f09f9f4d0f9479fa0 SHA512 426e8787277aff420a4871a9f4b865a6353f221baa26dc308681f2315cce5e46e87c916c10b5a8ee7d2c2d170a28d4f49741c76d0014830bbf88074679b4ab80
-EBUILD adwaita-qt-1.1.4.ebuild 874 BLAKE2B 35a5ddcad2122ae637eb78a6b413f31bcbd7e529ed789f953fb6d4790f7bb81af9710c9f9b05f0bbe86ac27f4afdc0fbaa32ab5f53fb47cb9a90a31b6e737b28 SHA512 3e0b2c5b9df8822c7c9c32e1cc6f83df23cb6143431e07349ed6ee7db3b71bc0c85d910727841b89296fd4555de7bde2a2bbd99a52f667ff6058a53543a89957
+EBUILD adwaita-qt-1.1.4.ebuild 873 BLAKE2B 0dd86925908c20f0a1585deb6054f83e87cc550f73b154f6c9a3f651d33f808758673f13c98ef7a8d4984f667e9b5510b0b88e0e6c3776f48cc308911b51a10a SHA512 bfb3cd5d975bcc9d2d2673f99b80d69e845be4f5b0579f3345ecb88147eaf18a8862a02613a88fa345c6d11b41c35eb059339344e62465dfe67890103983d345
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/x11-themes/adwaita-qt/adwaita-qt-1.1.4.ebuild b/x11-themes/adwaita-qt/adwaita-qt-1.1.4.ebuild
index c290d5c603dc..83d5ee52a95a 100644
--- a/x11-themes/adwaita-qt/adwaita-qt-1.1.4.ebuild
+++ b/x11-themes/adwaita-qt/adwaita-qt-1.1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/FedoraQt/${PN}/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 x86"
 IUSE="gnome"
 
 DEPEND="
diff --git a/x11-themes/elementary-xfce-icon-theme/Manifest b/x11-themes/elementary-xfce-icon-theme/Manifest
index e4d9c017efe8..9f10154081cf 100644
--- a/x11-themes/elementary-xfce-icon-theme/Manifest
+++ b/x11-themes/elementary-xfce-icon-theme/Manifest
@@ -1,3 +1,5 @@
+DIST elementary-xfce-0.15.1.tar.gz 6198394 BLAKE2B 18638aa2c55a01a48fc342a836c9271aeb09524ee1032bc8237fc864e92fa09f8784439ab793f474311465ef40710ac7665217496ce98444ae146c7c526d43da SHA512 e28524c0a1f3b2b35a43428ab4de58e0e7635b5ca4e57f88d44de356965dd978d34aeb514440d7413dd8cdaf1b869bd5024e63cb3bd668fe9b47b52872de9445
 DIST elementary-xfce-0.15.tar.gz 6178898 BLAKE2B 9b15a850a91c6d2fc598efe463c66dfeaecd70c45131c387e303ad471076b26f95c151cc3534e34e3d00c05334cfb601a2683492bcde64d326b4a2efa94fde68 SHA512 35434671d81ef5ad61562360faa54752da7351c1d885efc5dd3dffd5af86bb3ba91aa9f20433e237ccd6eb9ffadf1342a7c77a4a83154c8655fd076eca9107b3
+EBUILD elementary-xfce-icon-theme-0.15.1.ebuild 938 BLAKE2B 790f7285ae6010ecb4fe0326140580b0fc94defe912b333a48ceee9384e3f5866f5950bf1b22f260c990da05b35c74d3774ad784c3cc5dc39e36becd2db23b9d SHA512 5414aae8c23be14539f76e40b52c831904473a486bba172534bfce4eec678bc535622674378585b5c2b76d808a9a9709b4339ef028ce0bfc5ed7018dfd6aa4a0
 EBUILD elementary-xfce-icon-theme-0.15.ebuild 938 BLAKE2B 790f7285ae6010ecb4fe0326140580b0fc94defe912b333a48ceee9384e3f5866f5950bf1b22f260c990da05b35c74d3774ad784c3cc5dc39e36becd2db23b9d SHA512 5414aae8c23be14539f76e40b52c831904473a486bba172534bfce4eec678bc535622674378585b5c2b76d808a9a9709b4339ef028ce0bfc5ed7018dfd6aa4a0
 MISC metadata.xml 346 BLAKE2B aadbfac92004404037c41af003c6db9a99e9ed48f35ffd7c8561a4a624ea43f31a7262cc913a8ce75df4280f1d557672696e880712db5cbd90fc2be92e261f25 SHA512 41a313ca1a567e691e144d3e0aa1110cc1fc4110c63d7a72e8acafb83805e278360019e31b8d387604f4f932a16e6c3b57b77a2a81f32a1cee3b4e6e492f26cb
diff --git a/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.15.1.ebuild b/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.15.1.ebuild
new file mode 100644
index 000000000000..9d36aba20360
--- /dev/null
+++ b/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.15.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit xdg-utils toolchain-funcs
+
+MY_P="${PN%-icon-theme}-${PV}"
+DESCRIPTION="Elementary icons forked from upstream, extended and maintained for Xfce"
+HOMEPAGE="https://github.com/shimmerproject/elementary-xfce"
+SRC_URI="https://github.com/shimmerproject/elementary-xfce/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="public-domain GPL-1 GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="media-gfx/optipng
+	sys-apps/findutils
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	# custom script
+	./configure --prefix="${EPREFIX}/usr" || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	default
+	# delete dangling doc links
+	find -L "${D}" -type l -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-themes/gentoo-xcursors/Manifest b/x11-themes/gentoo-xcursors/Manifest
index cc83011fad2f..d3f48742f66d 100644
--- a/x11-themes/gentoo-xcursors/Manifest
+++ b/x11-themes/gentoo-xcursors/Manifest
@@ -1,5 +1,3 @@
-DIST gentoo-cursors-tad-0.3.1.tar.bz2 1196991 BLAKE2B 126c90b93e5071dbd68c4bb1188cc43b67c74fae5cc0d4b01c08ed0057f8421462116bbafc3862878d43d48591a507ae95d274b8ec0ea11954c3605753160a6b SHA512 b153d5860ec2167a57eba1073ec226fa7d49d256ba20ca4c18b2bac779e6944971253db51a4585d72439c4e5433464991f2e025aaa89b4a3793e15b8bd74cad9
 DIST gentoo-xcursors-0.3.2.tar.gz 2035025 BLAKE2B 520dbb3f8fe77bc915bb60c81f2abf4fce1ee6fb349ae5064ff5d2fa10c0af7ba2dd00dc0b36f992c96169214c4ebd28dceb1ba069e638e5efab7088ba804fe6 SHA512 5ccbd2e8be7bda4da0578c5a08d967dded9dc4c9163eb96f629c0eaa548f2e46e85f7301de44d5be707cc63a988b925c9c222863da5bac9095dc5170ca9c4aea
-EBUILD gentoo-xcursors-0.3.1.ebuild 1408 BLAKE2B d6dace7f04826ea2d0a3e1d667b1479cb09e54577511e4a752300e471524d0e9f7d81544f94415109e097167a345bf8b5f7cbd2f3db70caf6b25a3f44c8d99c6 SHA512 1c779e2d377ae46edcd817d332c01632d7aace9971c2f01dc8c68b9f5cd32caa27e6ed079213afca283a1812012578b7128ed5594a2052214455c983072cbf79
-EBUILD gentoo-xcursors-0.3.2.ebuild 1447 BLAKE2B 6711b8aba50bfeb7269ef4ef70183375393a45dab8b6fc70f4d14106c040d3a40134432e0e16bc720bce7a777996d28854b9b72cf72959301ae655156668b49f SHA512 143094cd4be1bb0c5e985fb7f7e13e69ecc1129ede6a48cfe9e9ed139023f650b6cfbeb9596378775db08ad27c71e85541f67fd3a071e68b3a63fe01d9ff0dff
+EBUILD gentoo-xcursors-0.3.2.ebuild 1446 BLAKE2B 4be0a4d93b6e3bd5429ca10d024124acede1d4eeced069a0ec6672bb5abbd5ceb0bc955e8f8091938a5c2bcf6740a6267ff4e1aa70c0b52a923d18b81b42923e SHA512 1b543c1c1bbacd4dcbacc6f380c7f9d82fa68c571f767de675ddc4126e0e71a1a45bd5ddc53b646fb9a213a84aa903092727f0d26081dd36a2ab7116e3938433
 MISC metadata.xml 570 BLAKE2B 44e1850e98a52f0d92045055817daeb074503a98b129e100128300c9a2d76a14f4b6a7c2ac6814d205f51f068abf8441f6530832eee0952f83ee43d7bfab2c80 SHA512 bc9f910e1b3032dcc34fe011e921b0e8994095738f94cd4c99ee212ef492f5ab6b3827f2e67bd9b43f05125c133063bce70a315e2afa10a2d5896fad0801a511
diff --git a/x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.1.ebuild b/x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.1.ebuild
deleted file mode 100644
index 1e4e92fead81..000000000000
--- a/x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2005-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A high quality set of animated mouse cursors"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${PN/xcursors/cursors}-tad-${PV}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/cursors"
-
-src_install() {
-	insinto /usr/share/cursors/xorg-x11
-	doins -r *
-}
-
-pkg_postinst() {
-	einfo "To use this set of cursors, edit or create the file ~/.Xdefaults"
-	einfo "and add the following line (for example):"
-	einfo "Xcursor.theme: gentoo"
-	einfo ""
-	einfo "You can change the size by adding a line like:"
-	einfo "Xcursor.size: 48"
-	einfo ""
-	einfo "Also, to globally use this set of mouse cursors edit the file:"
-	einfo "   /usr/local/share/cursors/xorg-x11/default/index.theme"
-	einfo "and change the line:"
-	einfo "    Inherits=[current setting]"
-	einfo "to (for example)"
-	einfo "    Inherits=gentoo"
-	einfo ""
-	einfo "Note this will be overruled by a user's ~/.Xdefaults file."
-	einfo ""
-	ewarn "If you experience flickering, try setting the following line in"
-	ewarn ""
-	ewarn "the Device section of your xorg.conf file:"
-	ewarn "    Option  \"HWCursor\"  \"false\""
-	einfo ""
-	einfo "The three sets installed are gentoo, gentoo-silver and gentoo-blue."
-}
diff --git a/x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.2.ebuild b/x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.2.ebuild
index ce5f58eb7696..0931d8c1da22 100644
--- a/x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.2.ebuild
+++ b/x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://schlomp.space/tastytea/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 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=""
 
 RDEPEND=""
diff --git a/x11-themes/kvantum/Manifest b/x11-themes/kvantum/Manifest
index ba28499063d8..a99c01a78c8f 100644
--- a/x11-themes/kvantum/Manifest
+++ b/x11-themes/kvantum/Manifest
@@ -1,5 +1,3 @@
-DIST kvantum-0.14.1.tar.gz 2461477 BLAKE2B 6c7fd45801eff1183ee46a157b5c31591da31c9b5fa9586b6095074a272fa705ac826733ce45a679b857276fbd358fdb56dc72ffe6c4744557e25c9c6782ca4a SHA512 18faa895bb6affa1744d15aa5b64636c49f7780eddca62ecee18c133702a156bca055cda473af9ea72e1d6de17fd86c4d7212bd16c544030d96d8afa4f5aff69
-DIST kvantum-0.15.2.tar.gz 2652167 BLAKE2B 610bd705d40605cf7d14ffe9acc62bcd276159ffd6f12c315871d633be74d986efc6c45ac938b26851af78565140e2a0dc0424174c543a0622dbf9c951225668 SHA512 98b83a14c3c86636acb6f2440d64dc47496536b5487dc08aed8e8370d656e8838d00866bfb54a4b5752135bdc3d3da0eaab209f5ca3e33c237aada59640a78f7
-EBUILD kvantum-0.14.1.ebuild 637 BLAKE2B fd4a9bd989f8198074b0e3b296b9e83086b4f38e2a433f873fcf5fb70227e6ed34e470f845a452c0091206035016a15d4a70aee2eff5fe2cefea4b614d4fd369 SHA512 0def1d9f186c77349ac0c6769b552d8aa7e13390aa7bf80eefc0b53e3af295aa1700c3c7757f8bef56fcb97fc10e8366be4bfc92123cd9fad2ce88a7ce5f4c92
-EBUILD kvantum-0.15.2.ebuild 659 BLAKE2B 21ea8abffa9bc8786ffa0d712d3eee8838adc5572a6e8d817ad257d5bfef618521c43c98558e676404e2019623a513f2ba2d586a4f53c07d7d1706fd70670990 SHA512 56c909a458a1b167da98b253ca5d1bfcb5a031af191f67ea645685363dac2ed3f6509e81f4aee28f325b822e8e68f67a253872932e6572bf4847cfe3895fdde1
+DIST kvantum-0.16.0.tar.gz 2696870 BLAKE2B 67d52cba8c621a804a81d702be01547660a52619ea499997e5d6f5c37e8970bf5b598ee0dd5b6ec397ed30c50024f5a83181771aaad3cabd195d2c8f52bf8d15 SHA512 a70c8f46ee556627dadaf68d998c0e37730978f6c9cb143b27ec1cdb7b912fceb62f83ca2f9fadd49f5230e0254d0f9c5f29c51fba941cdc7cc8572011aefe06
+EBUILD kvantum-0.16.0.ebuild 637 BLAKE2B fd4a9bd989f8198074b0e3b296b9e83086b4f38e2a433f873fcf5fb70227e6ed34e470f845a452c0091206035016a15d4a70aee2eff5fe2cefea4b614d4fd369 SHA512 0def1d9f186c77349ac0c6769b552d8aa7e13390aa7bf80eefc0b53e3af295aa1700c3c7757f8bef56fcb97fc10e8366be4bfc92123cd9fad2ce88a7ce5f4c92
 MISC metadata.xml 252 BLAKE2B 11c8366ef963cda3ae7aaf5fa07d085bf57b6a5e00fd8033ce6bee3bcdbc6cfb8d385b64b924b5e02cf4be79d34e137b8e525bbd2c9446dc1ec5eddbd3235329 SHA512 43db8b1cda45f79f3a14df2735f53b1a1b8ce9d9aa101fa1863454c24015f2e691b686bde15667988f82ce74e023504ea9ff76e0459df3f1ac5191e678141a39
diff --git a/x11-themes/kvantum/kvantum-0.15.2.ebuild b/x11-themes/kvantum/kvantum-0.15.2.ebuild
deleted file mode 100644
index e52409193b01..000000000000
--- a/x11-themes/kvantum/kvantum-0.15.2.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
-
-inherit cmake-utils
-
-MY_PN="Kvantum"
-
-DESCRIPTION="SVG-based theme engine for Qt5, KDE and LXQt"
-HOMEPAGE="https://github.com/tsujan/Kvantum"
-SRC_URI="https://github.com/tsujan/${MY_PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5=
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	kde-frameworks/kwindowsystem:5
-	x11-libs/libX11
-	x11-libs/libXext
-"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-S="${WORKDIR}/${MY_PN}-${PV}/${MY_PN}"
diff --git a/x11-themes/kvantum/kvantum-0.14.1.ebuild b/x11-themes/kvantum/kvantum-0.16.0.ebuild
index 886e8cf31a5b..886e8cf31a5b 100644
--- a/x11-themes/kvantum/kvantum-0.14.1.ebuild
+++ b/x11-themes/kvantum/kvantum-0.16.0.ebuild
diff --git a/x11-themes/xxv-skins/Manifest b/x11-themes/xxv-skins/Manifest
index 045a45676335..477f3bd2c7a3 100644
--- a/x11-themes/xxv-skins/Manifest
+++ b/x11-themes/xxv-skins/Manifest
@@ -1,4 +1,4 @@
 DIST xxv-jason-1.6.1.tgz 892863 BLAKE2B 3181acfc4d13f32772413f7add4ee476b881e3e1be8f4767ff342b6df94aa5fa51258faf58f53e37405e80cd39d08beb91701c61ad8d5cd57005465829abf444 SHA512 fcab6c52106265209fa80c61b9ec24a063974f817225649be7bca3ec1468df7c8d82aba5372f5a7fcb7f0beff2dff275e0a1969e91fdce8c985b60d4514e2a4f
 DIST xxv-skins-1.6.1.tgz 537124 BLAKE2B 76e7a8f947e079db7677c013860f485f26dafc7e4af43526f52a423e2871260027597ef44e06ba7a60d242f221bca0740719cec8fb7f24b2096f305a102e6db1 SHA512 108240563d733af3853b72417f34f45638ffab1b9c487c5fd12068ced604da01c357376875679614b0ce6404c58dbf06f0f3481a1f0d47ae5eca0fbbd7f02bab
-EBUILD xxv-skins-1.6.1-r1.ebuild 596 BLAKE2B 7fc976c9065ce720a3918f70c5644819a64133585f5159e593e199ae1f70c51a7eca941485e1144b530890e8ec7f8e4a5ec83ec4c152518ed4b60fb1de83a33a SHA512 ce44f0294227d7fbf362e9299f03e3e734fcb95437721fc67932ec6ba803958c37e411a58a4710f41cd191fb373be7d0745c1ef091253a064dcde14977b6ed2f
+EBUILD xxv-skins-1.6.1-r1.ebuild 597 BLAKE2B 3fd2c42a52e3b602e6b0a9ddfdcdeff97e90861e3258f68fb7c0c621c702b1eacf838cbd01b41fe5e6655f056368a2f048246e42397d74e54f1735d0fe46835f SHA512 95107a4179f8f2f8648fdc69b429a0232a6023da1e779ecc00f2cf8cecbf860f3641d7a94cea1c8405c2e78604290680a0dd854a6d717ef5d49fcc34d21383c0
 MISC metadata.xml 247 BLAKE2B 9e3b214def8d0812e5874ec4889f7a497734347082a0378eb44f4f06301ef5c674e764a979df2de2969a2948431c850b8ed855f7a902e8e1a31b55950995548a SHA512 e0b73626a417f23e593257f3c2203fb673de9cfa147297849505b3a1f16b60aed3245d41e6f27f9e707447c0215e93db79017600dc9a43dba2d3bb767077acf4
diff --git a/x11-themes/xxv-skins/xxv-skins-1.6.1-r1.ebuild b/x11-themes/xxv-skins/xxv-skins-1.6.1-r1.ebuild
index c1e16c6c680a..6b5eb87ec4d4 100644
--- a/x11-themes/xxv-skins/xxv-skins-1.6.1-r1.ebuild
+++ b/x11-themes/xxv-skins/xxv-skins-1.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=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils
 
 DESCRIPTION="Additional skins for XXV"
-HOMEPAGE="http://projects.vdr-developer.org/projects/xxv"
+HOMEPAGE="https://projects.vdr-developer.org/projects/xxv"
 SRC_URI="mirror://vdr-developerorg/719/${P}.tgz
 		mirror://vdr-developerorg/720/xxv-jason-${PV}.tgz"
 
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 39173b75a5bd..a97daea67400 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/cwm/Manifest b/x11-wm/cwm/Manifest
index 5d1aac3d2088..f5413388266c 100644
--- a/x11-wm/cwm/Manifest
+++ b/x11-wm/cwm/Manifest
@@ -1,8 +1,7 @@
 AUX cwm-Makefile.patch 596 BLAKE2B 561277a5a4da0a2b06c01c14cd0c8baf4dfcffe3ccd9a7f5e5009c2a6820145e124bc7d1eb4cee9826281cce1433a21f74b5799f8f2e3c4287b918d60603b8d4 SHA512 544ea3805211679f565dcdff42f1b438452e304701c9138e5c15b19374150c1e63e8d83eb64c0519b5c6664d7d7d70657c0b15516b770605115021b77b592308
-DIST cwm-5.6-chneukirchen.tar.gz 50799 BLAKE2B 4d9341e89b21187044bbcbc658dea2eac6f6c1c87f25e1b0b81871a9f8b95af7354c8b486bd77f201acba430e019a5c784591cfc5efb281fd40d6670749958ad SHA512 0bb5f9c69e1ed30ef38ced70008baa347032a0c31ee2d4a88e3b45092969a5427ef160577da4891aba3181067235b244f11fc796815f41448930b438099b5bfc
-DIST cwm-5.6-xmw.tar.gz 53738 BLAKE2B 9c36c42fc35a8206035ed59fb8fe2e8eb13effcdb43d488bcc99c2d0f48476e206e46fd52c0928afdb51d55c68d9be03a186aaf4c49d03bcdf8754df0c5d81db SHA512 cf0174523838dba5997206be904ab667efc5ff7e413e98bb81cc3a69d40a79b54e21405787e088486feb8790d1094a2d3cce0be08d7ee36a2b9b0dadd78466c7
 DIST cwm-6.6.tar.gz 53062 BLAKE2B 3da762f0c1a48c83c773a1f355cc970c5e4f6100e7294a00f44c6b5b7e1ffe954fde0e3d106991b05cd1f8c898fe055b5305b0bd7bf533df5868d32adbae2c5f SHA512 ff94fd1b7d263f9de538e5b338db58a08e1bec3e4233b84ab0a3ac94c47a45e10b2c772f93b897e70baf9a3c04e1a6fa04604ac71655acb7ebd1d10edb381042
-EBUILD cwm-5.6.ebuild 1004 BLAKE2B 27ef899c7d0fb99f273a31a0cfa0f5429bbd0b24c692af1e15fa5cd5c22f347d65e93120b1564ed6b9fc0d563801340f6dfaa7d2559dac5693c791a0beca2f2c SHA512 bcfcb3689de10912b31c88601185bb23e1f99305cf0c6a79d3ea02760b5ea0b8f213f63b6b84b1e3471049b9b3a7fb3df374580883e972e3fde69921dcd92493
+DIST cwm-6.7.tar.gz 53172 BLAKE2B 9e8c6503235ee71f3974a4e64cf45b80675b6ff33a68505b07f003c8d711a68a158f31147f463d5467bb4242c6321ebe0acaee63727689a136ca83c47e7592ea SHA512 5ad0fa56d9c96c36cc32e68128e58d4e3a7483f349bb26be1083c5b5c6d853ff05eec1a783b07ed928bd99a35a2e0b2d7053fc89b828aa9bdfe3589a318c4171
 EBUILD cwm-6.6.ebuild 1017 BLAKE2B 2da4f398acfe5e1bb351cdaf75d8cf46af19a78a75741f9a40121495f9f9207ab9d181b8e604339dd74c607a1388b58e37e33b1b26d593d8b65f800caae5b990 SHA512 015d5b4d8eb74fc7d1af00e95c8cf33ef390571a999138430965435688f1f1a6b059a3f140b63a074ed38cf9df70c78ec6f45a0ba12d86f93cb7a32857d962d1
-EBUILD cwm-9999.ebuild 958 BLAKE2B 592d23a69e9ad7bc664354df19000a726dd64f93452c1f4e4fa4a8439de8050c12cee941ea91fb82a831af1fb97cd0b52bf80312dd71649c473fea6479c36b49 SHA512 0cd8900c7f3d23733752d348e67882bc26bcbaf25c89742c7279a410369ea15ca76186cff91d3a7a6d1c7df8bd7421f23a9c506f3f9d909a1ac51a971c70eb7f
+EBUILD cwm-6.7.ebuild 945 BLAKE2B 3cdddaece0891f8d7904118ca3e35f02b1aaac4005daa6202a31dc32d51d15aebe6534bff91bdc7fa4f5991d3c293a37affb0c2500f4dddc1af2657acf965355 SHA512 fa2222f80c05c59a07e6ba7457164465e9107101154be05e17f1cf0bffe68586bfdde053c8aa0db4ee9cedacf743e5214051e78cfa40e8bf9bbfbd812da1621d
+EBUILD cwm-9999.ebuild 945 BLAKE2B 3cdddaece0891f8d7904118ca3e35f02b1aaac4005daa6202a31dc32d51d15aebe6534bff91bdc7fa4f5991d3c293a37affb0c2500f4dddc1af2657acf965355 SHA512 fa2222f80c05c59a07e6ba7457164465e9107101154be05e17f1cf0bffe68586bfdde053c8aa0db4ee9cedacf743e5214051e78cfa40e8bf9bbfbd812da1621d
 MISC metadata.xml 440 BLAKE2B a1ed14101aa667304e039f287fcec44a7f125585b20af9b1e9c35d68520f567d7eb4306ceabc888dbf25c3effffed13fbadf0a2703ed7cee1424b7a5225a3157 SHA512 97dace19645fdebf1f37d8023d689eb6b8bd5747f0c88d1c5cae410862d5123a46bfc112f8d77c6259144138381a866509986ae774dc058e422c11fd2d6c5478
diff --git a/x11-wm/cwm/cwm-5.6.ebuild b/x11-wm/cwm/cwm-5.6.ebuild
deleted file mode 100644
index 82d341433eaa..000000000000
--- a/x11-wm/cwm/cwm-5.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="OpenBSD fork of calmwm, a clean and lightweight window manager"
-HOMEPAGE="https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
-	https://github.com/chneukirchen/cwm"
-SRC_URI="vanilla? ( http://chneukirchen.org/releases/${P}.tar.gz -> ${P}-chneukirchen.tar.gz )
-	!vanilla? ( https://github.com/xmw/cwm/tarball/ea9a436 -> ${P}-xmw.tar.gz )"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="vanilla"
-
-RDEPEND="x11-libs/libXft
-	x11-libs/libXinerama
-	x11-libs/libXrandr"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/bison"
-
-src_unpack() {
-	default
-	# vcs-snapshot doesn't work with tarball names
-	if ! use vanilla ; then
-		mv *${PN}-* ${P} || die
-	fi
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS} -D_GNU_SOURCE" CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-	dodoc README
-	make_session_desktop ${PN} ${PN}
-}
diff --git a/x11-wm/cwm/cwm-6.7.ebuild b/x11-wm/cwm/cwm-6.7.ebuild
new file mode 100644
index 000000000000..c35cf81e9f80
--- /dev/null
+++ b/x11-wm/cwm/cwm-6.7.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="OpenBSD fork of calmwm, a clean and lightweight window manager"
+HOMEPAGE="https://github.com/leahneukirchen/cwm
+	https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
+"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/leahneukirchen/cwm.git"
+else
+	SRC_URI="https://github.com/leahneukirchen/cwm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+
+DEPEND="x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+src_compile() {
+	emake CFLAGS="${CFLAGS} -D_GNU_SOURCE" CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+	dodoc README
+	make_session_desktop ${PN} ${PN}
+}
diff --git a/x11-wm/cwm/cwm-9999.ebuild b/x11-wm/cwm/cwm-9999.ebuild
index 23dab4acd436..c35cf81e9f80 100644
--- a/x11-wm/cwm/cwm-9999.ebuild
+++ b/x11-wm/cwm/cwm-9999.ebuild
@@ -6,27 +6,28 @@ EAPI=7
 inherit desktop toolchain-funcs
 
 DESCRIPTION="OpenBSD fork of calmwm, a clean and lightweight window manager"
-HOMEPAGE="https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
-	https://github.com/chneukirchen/cwm"
+HOMEPAGE="https://github.com/leahneukirchen/cwm
+	https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
+"
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/leahneukirchen/${PN}.git"
-	KEYWORDS=""
+	EGIT_REPO_URI="https://github.com/leahneukirchen/cwm.git"
 else
-	SRC_URI="https://github.com/leahneukirchen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/leahneukirchen/cwm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="ISC"
 SLOT="0"
 
-RDEPEND="x11-libs/libXft
+DEPEND="x11-libs/libXft
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 "
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/bison
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-devel/bison
 	virtual/pkgconfig
 "
 
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 31f5067a2fdc..2adc22cdbe8f 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -6,7 +6,7 @@ DIST i3-4.18.1.tar.bz2 1217703 BLAKE2B 469a6ac09004f95861655858c47d9e6b2f378152b
 DIST i3-4.18.tar.bz2 1218591 BLAKE2B 582b7ba3a54edf8dd2657add05eb54a64b7c004761a1a248d91dfcb061cb9df215ff35301c125b11aa69b571daeacd5732b498934c1fb17f69404a101fd16ec8 SHA512 0bbfda7f4b20a92a50ffb6abbfc3f6bfe6bb4c987ad4b5b1791192eb23b8c3389cc9949a699901797370c14de1ff8e12447a3b8ce330ab7d300fafdb60a432ec
 EBUILD i3-4.14-r1.ebuild 2140 BLAKE2B 941ebc7e16c4376bed180964e610ce38ff216b3d8b7c406edc07deb7b91f03390fe1dd064d3288048b1d77b47572ecc9c7d2643c868abd5c0d257b1dac89af22 SHA512 10d791310d6617ce95253d4dafc97291558e229dabea1c8ad44ecb1061d2baa9edeab2aef5c2b36ebceac85171339bddc81d33494f2fb244facc6c256cef2e6b
 EBUILD i3-4.17.1-r1.ebuild 2327 BLAKE2B 8f307ab43874156d97b3db51ac68fef7ca58f3f2381c495d815326076c1368473974143f00f0909ef66b1efb6e0ff2fda4ccfd7161d336e4d80ae6f6f9da5be0 SHA512 9405eaafba8cac4c6918cdd8343f61c558f58460c2a8dcda2321b1ad38e7318f8a7f6a51d4a3afcc450dcdc9a139d8baf158179c9bf6165c421288e1dc99b1e9
-EBUILD i3-4.18.1.ebuild 2128 BLAKE2B 99d9309ce3cf1673708ebdc5830db5c67c467df78295963d19c920e26704510dfa694762f74b638ebeb4fc937e964409c8332e00e2f1da6af1316dfb629eec65 SHA512 cd8e635c5c60b4d1e8372e8bfe597bff93c5449154842ae5b9bc966900105ed948eae98f965cac20740870d5e092318cea0218a6ace8ad87c0f5cc04eff844fa
+EBUILD i3-4.18.1.ebuild 2133 BLAKE2B f5b1ca5ab47d57102c358e72d958d4b0153d24b41573067f8760f80860150567a16839b5baf9270f80c9ac2daeb751c103a893ca4c8246e7f476f401200451d9 SHA512 6006b8efd31270c81b4ab4047ef22abc15779729d71ff6a6e3ab2a82376bf84c1e19eb80a6e5d22d7f68ea03d78ca088edd9d4c35e9aa5093a39e2d689d6648a
 EBUILD i3-4.18.ebuild 2126 BLAKE2B 29048fa9165965ccd572cbacc8fdcc15697384bb75039c2c77caa3970040b31592359c1aa4b8df9242fd8c455e0b1a44d33c76422a9e603235651828cb7020d3 SHA512 527a652e1c6e05b1730a404c38a612820aebc2619ea8baf63c3403cbaaa8a4a5608ba63586c4f5ab09d7d57225727ed3f1207da317110b2b50b31b224440820c
 EBUILD i3-9999.ebuild 1817 BLAKE2B e812d4a04b34d2afb67da16370baace1a3d3376e2a15f73ff77aabbb8a061104f750abd84721266926bcd4d8f05b60d0014f38643c1a706e3ba5126ce68139f5 SHA512 0a31fd5d8ceeeda0c6f8fe06e595be9aa9f0aeca7547c9a8dc24cb2f6c0034255269d256cd88f265d77517da7df0cc8cd116b02404207cc4163df8e27132e086
 MISC metadata.xml 470 BLAKE2B 1c4fd7b44860934e88fb5165254fe0e8ca7e647c11af9af7d959f240e51002e6a454d9b93b30da8944891a1aa6a989f7a3e2a8af44ba41de174e78745393dd79 SHA512 52eddb56541d1172b04ca3ae646d01e52fb300dd62f5dfeaf2abe9d791965813e87b24a1477743797227bf8d407051f79076d54edb599524f89f3cfc716cc47e
diff --git a/x11-wm/i3/i3-4.18.1.ebuild b/x11-wm/i3/i3-4.18.1.ebuild
index d7064cfb971e..58a3f832182c 100644
--- a/x11-wm/i3/i3-4.18.1.ebuild
+++ b/x11-wm/i3/i3-4.18.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="doc debug test"
 
 CDEPEND="dev-libs/libev
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index dd8043c02160..12731eca4eff 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,8 +1,11 @@
 AUX 3.32-eglmesaext-include.patch 2078 BLAKE2B cea9ba1a8d2749eb3590dd17a598aace69ad96897cbc5a6c1061c4041a8fe3809ff9f5bcc99cbdc33611a3a3319cda20f74f88434e71f03f2a1cac108185f3fb SHA512 23296f0e0b6ffd4610be3f0c6e1d524d15a5d259c5607a7ded4a8c39846f555dee92e5a8bb9c766211b758f8bc7483715a9640718bb9b7daa42905d802b2ee71
 AUX 3.34.6-XInitThreads.patch 1625 BLAKE2B 5b9ff02d96643105d0b865da0821ed6d4a849c8a42d5787c0eadbee4f7943ba5028471bb8424b87ee716d7ae9581b29f6f219c65371a6307da8eb04e0a5a94a2 SHA512 b223845da63ddbba5eaffa9b2a85e1cdaaee9126707d10c902814d35596857fca733ac290b86648ec506cc7bea2432b95ed5c5ea18dd598e539fcd0670620065
+AUX 3.34.6-tests-dontreq-gdkwayland.patch 1730 BLAKE2B d796a4dc91d756ac4af24c411e9f6ef33fcd02443585a3662bf58f04498305aa6b458ab0ace5191a97d9c66ba81cec9ee75099d7e77436eb39c3bec33bb68e26 SHA512 841f59c00f061302f411ce5ed5c25ef041f13a57d44da011815cfb2c1f80cccea1963675dc023d82aac4824b620861876ca628b6165db74b150564222b786b22
 DIST mutter-3.34.5.tar.xz 2804640 BLAKE2B b73a34f4e064b74b321b7ac54749170663c10874a82c0e4f6b20b1f9d97662af0ba188e5ac13a187117765b8aee820fc7367dfbeecc26002942151e77433012c SHA512 4199cf66e6551ebf80b9d2217e3164b1de30b055c58a64bc2d88961aad3a35c137174f6aea96f0250fa3efb2bf4676aa409fefb1a9237bbc7acf438aeed2e78a
+DIST mutter-3.34.6-patchset.tar.xz 4748 BLAKE2B 103f17256c7a9f347aadd58119e0e92c844bf372723e1462ea343fe9a80d7ed9dd55ad04215216dd51f97143e23b201e056f2e17a1808a22fe2d4e0f8e8da659 SHA512 79e1d72d14643ef3b6d9da0532ca636e41a110bcc7e8fe1553940ca6c1e2cf6414923a707bdde7823449ef7b0535d8c97ae0ae57a02f55e90950e8c127340ade
 DIST mutter-3.34.6.tar.xz 2805328 BLAKE2B bba0e062ab81f8e88e7e59b6dbf51226b6e2d43932c7d61aca5a3e709119f909e30acea67a5444c95205ddf929a1f5bf7785eec7aed4f2da743c19543aa79962 SHA512 dd240fdcfc8ba0c62c0ff423a40ec6e0007d154f0be39e18cea543da7ff548e10a9b712f9b2cc09c58ad342b1e7eb50fb2a8790c55d284846bb6f1a76f8c6d6b
 EBUILD mutter-3.34.5.ebuild 4566 BLAKE2B a4550c12085dd8dedbe1d3652ab06475adee962d6006ded1506ff491773dacec9c50e1568e851418d2a95dbbcfbc104b50c771b1c2075190eab57c52f4fc473b SHA512 f5c4f35cbce4916d564e15d11a1a420c87cc695d24046d808e499916f01170709a546594e0ab1da2447ab1165d9bce287608644a24486897febe16135d781fda
-EBUILD mutter-3.34.6-r1.ebuild 4608 BLAKE2B 58efbebcb5ac65a7322a4e8a937dffd81cab1e990107098a5513c9208860990f68a1bee76391a874e15bc83f1bd407fddf79e1cd1df9f78de9cbb53525ae649e SHA512 409eaed8766d29cb8ba588eaaf1faf9c904a3548f68516606319a2365d88766ebf31466a9176868b994c89fb17447d632e2e37b6b0065e473aca60f6fd17be89
+EBUILD mutter-3.34.6-r1.ebuild 4659 BLAKE2B c87832ef12a3eb2e5d1651cad6cfcaffd0842636b7c6130a222e9eeb2837008f295c481e0fc117f47393ce7f9f11e7c55419ebff5ff7ba6dcd5d707c2b840b63 SHA512 4e727cf5a0162c1a763cbd39be0a842488381bbc739d036c1bccc35f504366efaaa98698f9289c005840189f354962a51f1e9f3c7561ed91f1cf72e0e172f8ad
+EBUILD mutter-3.34.6-r2.ebuild 4723 BLAKE2B a221269665384b0b9ae5f1814e8fbcef3e4e08dd9dd3cbcc9731a1c8977e30d37f326bc5095ee6e1d53cf99d933d5d12d5eb950991eab47c6c42b8a42038641f SHA512 4b672d356a53144795bb50da0de2f02a7e67f8c59d502208ce8a9ac4ec85e8e30f04e1d4fb4b3a2bd6410965a56ec40084a68dcbcee6e6bef1a5565e4134da7a
 EBUILD mutter-3.34.6.ebuild 4568 BLAKE2B d8cf3267696b61193efbe0189e45bf2c5e96e5d6f44e727c630a19b4b33b6796a23596b51171cb8bdbe40879d05a73f66a1438c828067086e279bc87a01e560c SHA512 b47cc0637b4a59e7a680dace7f3ca95b32c6ef9b903cfffcd34395dca037f88b859ac2905fb97d4ca6e91e4277d035d781cd257d471ccc9b25dfb9d71af15bf6
 MISC metadata.xml 605 BLAKE2B 5dc68fbf8b85c2bf75ea435abe116a9ed7072ec40a45bda28de9cb277a03e5c363487f1c3aa5c60cab5f710e06f15d966790684cac1573676af635e59b3cdfbd SHA512 440e7a33404e218da15c127614d843edcd42c469aced4609c2e7d7d8ec1281c9eceb64aebe406a75e9ba0a05b6be18bbb721257e140f6d334aff6143b1233fb8
diff --git a/x11-wm/mutter/files/3.34.6-tests-dontreq-gdkwayland.patch b/x11-wm/mutter/files/3.34.6-tests-dontreq-gdkwayland.patch
new file mode 100644
index 000000000000..810801977af8
--- /dev/null
+++ b/x11-wm/mutter/files/3.34.6-tests-dontreq-gdkwayland.patch
@@ -0,0 +1,51 @@
+From fd10425c598f7b3db16521c2709032fd2ea5a396 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 28 Jun 2020 09:26:33 +0300
+Subject: [PATCH] test-client: Fix compilation without GDK_WINDOWING_WAYLAND
+
+---
+ src/tests/test-client.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/tests/test-client.c b/src/tests/test-client.c
+index 83a5ce485..80c239310 100644
+--- a/src/tests/test-client.c
++++ b/src/tests/test-client.c
+@@ -22,7 +22,9 @@
+ #include <gio/gunixinputstream.h>
+ #include <gtk/gtk.h>
+ #include <gdk/gdkx.h>
++#ifdef GDK_WINDOWING_WAYLAND
+ #include <gdk/gdkwayland.h>
++#endif
+ #include <stdarg.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -46,8 +48,10 @@ window_export_handle_cb (GdkWindow  *window,
+ {
+   GdkWindow *gdk_window = gtk_widget_get_window (GTK_WIDGET (user_data));
+ 
++#ifdef GDK_WINDOWING_WAYLAND
+   if (!gdk_wayland_window_set_transient_for_exported (gdk_window,
+                                                       (gchar *) handle_str))
++#endif
+     g_print ("Fail to set transient_for exported window handle %s", handle_str);
+   gdk_window_set_modal_hint (gdk_window, TRUE);
+ }
+@@ -377,11 +381,13 @@ process_line (const char *line)
+           goto out;
+         }
+ 
++#ifdef GDK_WINDOWING_WAYLAND
+       GdkWindow *parent_gdk_window = gtk_widget_get_window (parent_window);
+       if (!gdk_wayland_window_export_handle (parent_gdk_window,
+                                              window_export_handle_cb,
+                                              window,
+                                              NULL))
++#endif
+         g_print ("Fail to export handle for window id %s", argv[2]);
+     }
+   else if (strcmp (argv[0], "accept_focus") == 0)
+-- 
+2.20.1
+
diff --git a/x11-wm/mutter/mutter-3.34.6-r1.ebuild b/x11-wm/mutter/mutter-3.34.6-r1.ebuild
index 722e7bb3d139..c6e568965e54 100644
--- a/x11-wm/mutter/mutter-3.34.6-r1.ebuild
+++ b/x11-wm/mutter/mutter-3.34.6-r1.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	test? ( wayland )"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
 # xorg-server is needed at build and runtime with USE=wayland for Xwayland
@@ -94,6 +94,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/3.32-eglmesaext-include.patch
 	"${FILESDIR}"/${PV}-XInitThreads.patch
+	"${FILESDIR}"/${PV}-tests-dontreq-gdkwayland.patch
 )
 
 src_configure() {
diff --git a/x11-wm/mutter/mutter-3.34.6-r2.ebuild b/x11-wm/mutter/mutter-3.34.6-r2.ebuild
new file mode 100644
index 000000000000..d04f56b67e4a
--- /dev/null
+++ b/x11-wm/mutter/mutter-3.34.6-r2.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/5" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
+
+IUSE="elogind input_devices_wacom +introspection +sysprof systemd test udev wayland"
+# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
+REQUIRED_USE="
+	wayland? ( ^^ ( elogind systemd ) udev )
+	test? ( wayland )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
+# xorg-server is needed at build and runtime with USE=wayland for Xwayland
+# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
+DEPEND="
+	x11-libs/libX11
+	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/pango-1.30[introspection?]
+	>=dev-libs/fribidi-1.0.0
+	>=x11-libs/cairo-1.14[X]
+	>=gnome-base/gsettings-desktop-schemas-3.33.0[introspection?]
+	>=dev-libs/glib-2.61.1:2
+	gnome-base/gnome-settings-daemon
+	>=dev-libs/json-glib-0.12.0[introspection?]
+	gnome-base/gnome-desktop:3=
+	>=x11-libs/libXcomposite-0.4
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	>=x11-libs/libXfixes-3
+	>=x11-libs/libXi-1.7.4
+	x11-libs/libXtst
+	x11-libs/libxkbfile
+	x11-misc/xkeyboard-config
+	>=x11-libs/libxkbcommon-0.4.3[X]
+	x11-libs/libXrender
+	>=x11-libs/libXrandr-1.5.0
+	x11-libs/libxcb
+	x11-libs/libXinerama
+	x11-libs/libXau
+	x11-libs/libICE
+	>=dev-libs/atk-2.5.3[introspection?]
+	>=media-libs/libcanberra-0.26
+	media-libs/mesa[X(+),egl]
+	wayland? (
+		>=dev-libs/wayland-protocols-1.18
+		>=dev-libs/wayland-1.13.0
+		x11-libs/libdrm:=
+		>=media-libs/mesa-10.3[egl,gbm,wayland,gles2]
+		>=dev-libs/libinput-1.4
+		systemd? ( sys-apps/systemd )
+		elogind? ( sys-auth/elogind )
+		x11-base/xorg-server[wayland]
+	)
+	udev? ( >=dev-libs/libgudev-232:=
+		>=virtual/libudev-232-r1:= )
+	x11-libs/libSM
+	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
+	>=x11-libs/startup-notification-0.7
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	gnome-extra/zenity
+"
+DEPEND="${DEPEND}
+	x11-base/xorg-proto
+	sysprof? ( >=dev-util/sysprof-capture-3.34.1-r1:3 )
+"
+# wayland bdepend for wayland-scanner, xorg-server for cvt utility
+BDEPEND="
+	dev-libs/wayland
+	>=dev-util/meson-0.50.0
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	wayland? ( >=sys-kernel/linux-headers-4.4
+		x11-base/xorg-server )
+"
+
+PATCHES=(
+	"${WORKDIR}"/patches/
+	"${FILESDIR}"/3.32-eglmesaext-include.patch
+	"${FILESDIR}"/${PV}-tests-dontreq-gdkwayland.patch
+)
+
+src_configure() {
+	# TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain
+	local emesonargs=(
+		-Dopengl=true
+		#opengl_libname
+		#gles2_libname
+		$(meson_use wayland gles2)
+		-Degl=true
+		-Dglx=true
+		$(meson_use wayland)
+		$(meson_use wayland native_backend)
+		-Dremote_desktop=false # not bothering with pipewire-0.2; to be reintroduced in newer mutter via pipewire-0.3
+		-Degl_device=false # This should be dependent on wayland,video_drivers_nvidia, once eglstream support is there
+		-Dwayland_eglstream=false # requires packages egl-wayland for wayland-eglstream-protocols.pc
+		$(meson_use udev)
+		$(meson_use input_devices_wacom libwacom)
+		-Dpango_ft2=true
+		-Dstartup_notification=true
+		-Dsm=true
+		$(meson_use introspection)
+		$(meson_use test cogl_tests)
+		$(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
+		$(meson_use test clutter_tests)
+		$(meson_use test tests)
+		$(meson_use sysprof profiler)
+		-Dinstalled_tests=false
+		#verbose # Let upstream choose default for verbose mode
+		#xwayland_path
+		# TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
+		#xwayland_grab_default_access_rules
+	)
+	meson_src_configure
+}
+
+src_test() {
+	glib-compile-schemas "${BUILD_DIR}"/data
+	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/x11-wm/spectrwm/Manifest b/x11-wm/spectrwm/Manifest
index 4b7117cab1b1..015ec6b4d2b7 100644
--- a/x11-wm/spectrwm/Manifest
+++ b/x11-wm/spectrwm/Manifest
@@ -5,8 +5,10 @@ DIST spectrwm-3.1.0.tar.gz 147206 BLAKE2B abcce22bc7859dbcc109f02ea832d65091c842
 DIST spectrwm-3.2.0.tar.gz 150691 BLAKE2B a90fb556f0572709df51272a259724c3a497ac3b9852722646058ffb92914ca49581f3f95884c8a6bab2cb6475c4c3b475ff7ed3ea0ff125e76f202696dfd2bd SHA512 038d7fc5716fbca324a078a311939ec23db6ff53e9ef33b2804c687838e729f0e7bb7f724c539e8ac8efed9607358962d4dd742db7f1a30bf3c6ab72eade1039
 DIST spectrwm-3.3.0.tar.gz 161806 BLAKE2B 07470511486c7b5c61e65eb33e5a9ec7fbfec97390057311fab27bd5608d428b3a53c379fe6c5436000b4847769db9d175154e696b39d3175175bae173e8e68e SHA512 743affffd0437641a760ae29ccbd0084baee3354dadc48f3fc9ab70bffa2413ffe3af67f1223413aa1bbf8c679fbae1fbbdd71a840b3e44f5df83b527f63c1cc
 DIST spectrwm-3.4.0.tar.gz 164188 BLAKE2B a79feb7f1e667728d237ec97aa5753eb5d0a1ae96ea63a5f14348cbc63ddde7a49639664fa19bffb564d0342727e558498a7a72ec3442899462ad8800075e32e SHA512 f55785976ffefaa93601cdc509880cc7e1c13df6f676d3dc0ee8121240b221b0d3db5968d32486673e2ab172165dd55da3d28b1e088fbf4f77ccecb8c6e57519
+DIST spectrwm-3.4.1.tar.gz 164507 BLAKE2B 8047e639be3d4a07616f7ef3911765c5d6dd7dbd56c684453db90283faee08aac2cb9e3e20ae42f839582b67b778a4490a04fa21fc90fe489f798c40c517351e SHA512 94d468833124b51fa12b29b173126f10f27dd551d599459e4bea589721b3df6f1f0af0ea67326ed3ad462e1203d3bbcb82032ff83abfa0943ec45afd29dedaa6
 EBUILD spectrwm-3.1.0.ebuild 1132 BLAKE2B dacd1cfb94ef799132eef7ee5d7f0c4d521b417529403ca81c4657074df5e61f52af0bd3baee5d53a8652f8e5456fb835ae9c11320a902b99cbb4eb97e7bf06e SHA512 b31a2e6cd77ae1117929f063f8b6cc7cd3a0167189fd3fd86d95254ea91bc6173414b7354af029d2671e08b6f62c9f0cefccc509ea89108fdb562fdf906096bf
 EBUILD spectrwm-3.2.0.ebuild 1023 BLAKE2B f966d0420844ca3dee536f60a12a81677f2a9a6eb64983bf727992956490256721a374b7f144da7b54111499f7d7b9fe4668ea130e50c3cb6c71855295ef9f19 SHA512 79410cf8fc5859f0e7e5f9bfbc135cca3f69c38721c317acc582228fd9755e2667febbe9015fccb205963ed65512c86d2fb3ae05fb5fe8ffed2b67e9194861e2
 EBUILD spectrwm-3.3.0.ebuild 1128 BLAKE2B 731f6a1988fd23082740086b6d1c4600a0f9ca1486a8aaf7895b10c50be91ef034e68a747a6c0258d5b6a14155b693c24c7efe1f183d43ebfb160d48776e7737 SHA512 e5fb1c60b25d64fa499c1e0d69b12a325a28904dd8f1bb7c296b8daa131b2ddbb2b217f131e6443ef46cdcf30c00d14e60ee22c28d98a9bfea83db61384bbd38
 EBUILD spectrwm-3.4.0.ebuild 1128 BLAKE2B 8747ca9aba5e6a65d5b622729a3c1ac35f2b7c2e078bf34a43a43f5069a9bf78aa2b03b31c79b36319ed71d63cc7b6a62f43100cfe6462844b9c76544ab544c7 SHA512 de30080599900e14beb0d982ff237f8a45e37df764328a748afab6898a7528a456229c199cf3c5195a81d8a07c5700ffefdd249cdc58e81b854be04260b65757
+EBUILD spectrwm-3.4.1.ebuild 1128 BLAKE2B 8747ca9aba5e6a65d5b622729a3c1ac35f2b7c2e078bf34a43a43f5069a9bf78aa2b03b31c79b36319ed71d63cc7b6a62f43100cfe6462844b9c76544ab544c7 SHA512 de30080599900e14beb0d982ff237f8a45e37df764328a748afab6898a7528a456229c199cf3c5195a81d8a07c5700ffefdd249cdc58e81b854be04260b65757
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/x11-wm/spectrwm/spectrwm-3.4.1.ebuild b/x11-wm/spectrwm/spectrwm-3.4.1.ebuild
new file mode 100644
index 000000000000..67195eaf70bb
--- /dev/null
+++ b/x11-wm/spectrwm/spectrwm-3.4.1.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 multilib toolchain-funcs
+
+DESCRIPTION="Small dynamic tiling window manager for X11"
+HOMEPAGE="https://github.com/conformal/spectrwm"
+SRC_URI="https://github.com/conformal/spectrwm/archive/${PN^^}_${PV//./_}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!x11-wm/scrotwm
+	x11-misc/dmenu
+"
+DEPEND="
+	elibc_musl? ( sys-libs/queue-standalone )
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	x11-libs/libXt
+	x11-libs/xcb-util
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.0-gentoo.patch
+)
+S=${WORKDIR}/${PN}-${PN^^}_${PV//./_}
+
+src_prepare() {
+	sed -i -e '/LICENSE.md/d' linux/Makefile || die
+	default
+}
+
+src_compile() {
+	tc-export CC PKG_CONFIG
+	emake -C linux PREFIX="${EROOT}/usr" LIBDIR="${EROOT}/usr/$(get_libdir)"
+}
+
+src_install() {
+	emake -C linux PREFIX="${EROOT}/usr" LIBDIR="${EROOT}/usr/$(get_libdir)" \
+		SYSCONFDIR="${EROOT}/etc" DOCDIR="${EROOT}/usr/share/doc/${P}" \
+		DESTDIR="${D}" install
+
+	dodoc README.md ${PN}_*.conf {initscreen,screenshot}.sh
+}
diff --git a/x11-wm/wmfs/Manifest b/x11-wm/wmfs/Manifest
index 988bb50cb1fc..ca407acbf9a3 100644
--- a/x11-wm/wmfs/Manifest
+++ b/x11-wm/wmfs/Manifest
@@ -6,5 +6,5 @@ AUX wmfs-99999999-fno-common.patch 1986 BLAKE2B 096becca88a23b15e3fee115640b50ba
 AUX wmfs-99999999-strncat.patch 598 BLAKE2B e80fd233e895162e24f7264cf152c9a570665d5f6ff48ea1ec9212963c2b786b5707c8052d33a1a354b283042af0c2b7d5ac45f34e8dc57a68abd517d7e410aa SHA512 9141bd044a122fbe0aa10189f38d02e127c453665ae7d926dee852bb16ec7812450357e86ab6dfc8f48a41ce16891759a8229bb4a67f1bb5a970c7e6452298fd
 DIST wmfs-201003.tar.gz 59593 BLAKE2B b2e1f2cf73ca3d8881fa8de7b52fb6cae947a6006549f05dd06179b8b44b10fd1157a8e180b2b3177177fe0edf4c39b9a3fbf36ebb2b6470f1ed802a641a4c89 SHA512 117a238d6a8d8d147291ec9fb4e0aaf2bf8bab8ea794cf00deeaeaac1df15f0122bc705cb1bff54abe80d7228a19e67a79e4b3e0de0ced82abaf98fab3778a90
 EBUILD wmfs-201003.ebuild 968 BLAKE2B 89d8b905ba1c0a6c0016e9b0b40e0f3bd5ef538134e72b7b560dac4547a5f875081d3275604fc66a274ebb118556295433516ee884aa815fe8572cb2a766fc24 SHA512 4afaf1556dd33aa42c749a22929a815ec7970156963e39cc6e78e2d56dbbf465554889e4bb1ed1534e92ee0fbdc00803cf873408d8a014d197702c82ac803bc2
-EBUILD wmfs-99999999.ebuild 1097 BLAKE2B 1f3d48ce2f4b5477872bd4e307ed35daac2e4163406481b55c7a169c681505bfdcc6e859925977d6f141ba29e066b41c4fd65c23464ed34ff950f03501d24e83 SHA512 7fe78bc7ab800d3a4a6f6411a7f0155d83a75aa528a8511ca7539b4744ebf892e63304305df6fbad87360f26332b339112ed34e8032ceda041a94d114b522a96
+EBUILD wmfs-99999999.ebuild 1141 BLAKE2B 29ab0a030dafb7f482dda9c06ae49c26bad2c5a77099e58b4148ee635a003d03e5a9a21c265800319a4a467c4d07a831e874c0279e6ac6adfd1f8de78065fb15 SHA512 e68aacf763356986ada1101eb77226c9efb94a23a7e1e619110f8e5f954a9b73168aa997c39a88c8c9744c5365a8709d9fbef0a3c176c9b65b2d8b47155eb823
 MISC metadata.xml 380 BLAKE2B 318de05f3f531b8c35e71a0563525f7c8a1397e0ba4adbd086b768c93d792d8c336da47bc7582dfc7b0f4ce2917dcccb21191f46c064b02317477ef3a568ee17 SHA512 644e88ac0ca2d999cd273f807d45400a8438a9800b3b744f764c914fa41d819efd55ecaa27de6cbcf4403491f2986299fc1c032afd26fee67822cfc2c6368359
diff --git a/x11-wm/wmfs/wmfs-99999999.ebuild b/x11-wm/wmfs/wmfs-99999999.ebuild
index a2a1959136ed..416f8f678db2 100644
--- a/x11-wm/wmfs/wmfs-99999999.ebuild
+++ b/x11-wm/wmfs/wmfs-99999999.ebuild
@@ -30,6 +30,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-99999999-Debian.patch
 	"${FILESDIR}"/${PN}-99999999-desktop.patch
 	"${FILESDIR}"/${PN}-99999999-fno-common.patch
+	"${FILESDIR}"/${PN}-99999999-strncat.patch
 )
 
 src_configure() {
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 06a622a86dfc..5ef8f5f2c7d3 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index ae82657cefda..2f4b0189be73 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -1,4 +1,4 @@
-AUX exo-4.15.1-parallel-make.patch 1743 BLAKE2B 046512817d76698e2929b3a0f625eed486f07e3a46e161d9bcf7bfe0afa3d0f8cc083b955753281eba1c66d3b8c48cb39e3885173a2bb167b4190e48f53c04cd SHA512 1099b23a92904ca4a8df68c5d3f97fb877db9a50fe9bed4fe8951ac2ff7c7db4ea4326afea265e7c41796e01f3ec2b5ff4ec964dffac633cd1f42012e409f17f
+AUX exo-4.15.1-parallel-make.patch 7738 BLAKE2B 26aa0f1208bd8cd606990d9430d948a7333a9d2bc419f1e40d5fb1ddfac52efbb860e18e16f2c805af86f170849540311206336298bd113b8d21c661a81ff7cd SHA512 085828b15cba8aec7445b1a3c9e09552f03ed8467e0ce58e2a619cc799753984cff3da61946ad840cb5ad05e178f40ecee4f4bc86ca1ea31b3019bce6840f390
 DIST exo-0.12.11.tar.bz2 1333227 BLAKE2B 4e95809c58b6db26ecdf524663c06df9cd70007726091e381a1f0dd58be52efee85ad9721c421c0df6438073bb9de97d56cd039f520e2f7c0f5722a1839ba167 SHA512 ecbf20feddf86178d34a5c70212f0c2310ab1d6ce25291846d6d1d3045270ae3e68102065d7b3d8840137406f826f9bc37fed92a16c1268c3d14f2833a97d533
 DIST exo-4.15.1.tar.bz2 1049760 BLAKE2B 365a51a6be44b36290d1bbe7100bc4e9a164436b2111997c969bdcc2f46306c0532fa41bedc231c5640992910e44acc8d072f5c070fc8d56f02b561002985224 SHA512 46b60bfde133969a25e72a5a80644454b06543888e554e8473145486d1b1952c4e508f2303045f183c49b053969189f50316ce7d18a0be2c404daa691e26d276
 EBUILD exo-0.12.11.ebuild 1036 BLAKE2B 12fc8c5a693166a7672750259cf9b3061b24c104ad3aeaf234ce5fc3d189ca552502eefaf08b24836f1b4f8f356f181469c805929fa0fefdde652cf1c38218b2 SHA512 5e6486e6cabb66870995aa41337730f7dcc6f5dff787b2fb7eba254d11fa69ba1309fbfc7926fec4aba8f287c55f8d777210eb1fe523ceed42c9e1282184b733
diff --git a/xfce-base/exo/files/exo-4.15.1-parallel-make.patch b/xfce-base/exo/files/exo-4.15.1-parallel-make.patch
index f18159442fea..34bc669655c1 100644
--- a/xfce-base/exo/files/exo-4.15.1-parallel-make.patch
+++ b/xfce-base/exo/files/exo-4.15.1-parallel-make.patch
@@ -64,3 +64,156 @@ index fc8845d4..358ae9cb 100644
 -- 
 2.26.2
 
+diff --git a/exo/Makefile.in b/exo/Makefile.in
+index 56abe35..ee1be62 100644
+--- a/exo/Makefile.in
++++ b/exo/Makefile.in
+@@ -98,7 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+ DIST_COMMON = $(srcdir)/Makefile.am $(libexo_2_include_HEADERS) \
+-	$(libexoinclude_HEADERS) $(am__DIST_COMMON)
++	$(am__DIST_COMMON)
+ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES = exo-2.pc exo-config.h
+@@ -131,8 +131,7 @@ am__uninstall_files_from_dir = { \
+          $(am__cd) "$$dir" && rm -f $$files; }; \
+   }
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
+-	"$(DESTDIR)$(libexo_2_includedir)" \
+-	"$(DESTDIR)$(libexoincludedir)"
++	"$(DESTDIR)$(libexo_2_includedir)"
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ libexo_2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+@@ -224,7 +223,7 @@ am__can_run_installinfo = \
+     *) (install-info --version) >/dev/null 2>&1;; \
+   esac
+ DATA = $(pkgconfig_DATA)
+-HEADERS = $(libexo_2_include_HEADERS) $(libexoinclude_HEADERS)
++HEADERS = $(libexo_2_include_HEADERS)
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates.  Input order is
+@@ -657,24 +656,14 @@ libexo_headers = \
+ 	exo-tree-view.h							\
+ 	exo-utils.h
+ 
+-libexo_built_public_sources = \
+-	exo-enum-types.h
+-
+-libexo_built_sources = \
+-	$(libexo_built_public_sources)					\
++libexo_2_built_sources = \
++	exo-enum-types.h \
+ 	exo-alias.h							\
+ 	exo-aliasdef.c							\
+ 	exo-enum-types.c						\
+ 	exo-marshal.c							\
+ 	exo-marshal.h
+ 
+-libexoincludedir = $(includedir)/exo-2/exo
+-libexoinclude_HEADERS = \
+-	$(libexo_built_public_sources)					\
+-	$(libexo_headers)						\
+-	exo.h								\
+-	exo-config.h
+-
+ libexo_2_includedir = $(includedir)/exo-2/exo
+ lib_LTLIBRARIES = libexo-2.la
+ libexo_2_include_HEADERS = \
+@@ -756,10 +745,10 @@ pkgconfig_DATA = exo-2.pc
+ @MAINTAINER_MODE_TRUE@DISTCLEANFILES = \
+ @MAINTAINER_MODE_TRUE@	stamp-exo-enum-types.h						\
+ @MAINTAINER_MODE_TRUE@	stamp-exo-marshal.h						\
+-@MAINTAINER_MODE_TRUE@	$(libexo_built_sources)
++@MAINTAINER_MODE_TRUE@	$(libexo_2_built_sources)
+ 
+ @MAINTAINER_MODE_TRUE@BUILT_SOURCES = \
+-@MAINTAINER_MODE_TRUE@	$(libexo_built_sources)
++@MAINTAINER_MODE_TRUE@	$(libexo_2_built_sources)
+ 
+ EXTRA_DIST = \
+ 	abicheck.sh							\
+@@ -1091,27 +1080,6 @@ uninstall-libexo_2_includeHEADERS:
+ 	@list='$(libexo_2_include_HEADERS)'; test -n "$(libexo_2_includedir)" || list=; \
+ 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ 	dir='$(DESTDIR)$(libexo_2_includedir)'; $(am__uninstall_files_from_dir)
+-install-libexoincludeHEADERS: $(libexoinclude_HEADERS)
+-	@$(NORMAL_INSTALL)
+-	@list='$(libexoinclude_HEADERS)'; test -n "$(libexoincludedir)" || list=; \
+-	if test -n "$$list"; then \
+-	  echo " $(MKDIR_P) '$(DESTDIR)$(libexoincludedir)'"; \
+-	  $(MKDIR_P) "$(DESTDIR)$(libexoincludedir)" || exit 1; \
+-	fi; \
+-	for p in $$list; do \
+-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  echo "$$d$$p"; \
+-	done | $(am__base_list) | \
+-	while read files; do \
+-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libexoincludedir)'"; \
+-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libexoincludedir)" || exit $$?; \
+-	done
+-
+-uninstall-libexoincludeHEADERS:
+-	@$(NORMAL_UNINSTALL)
+-	@list='$(libexoinclude_HEADERS)'; test -n "$(libexoincludedir)" || list=; \
+-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+-	dir='$(DESTDIR)$(libexoincludedir)'; $(am__uninstall_files_from_dir)
+ 
+ ID: $(am__tagged_files)
+ 	$(am__define_uniq_tagged_files); mkid -fID $$unique
+@@ -1370,7 +1338,7 @@ check: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) check-am
+ all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
+ installdirs:
+-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libexo_2_includedir)" "$(DESTDIR)$(libexoincludedir)"; do \
++	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libexo_2_includedir)"; do \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: $(BUILT_SOURCES)
+@@ -1452,8 +1420,7 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-libexo_2_includeHEADERS \
+-	install-libexoincludeHEADERS install-pkgconfigDATA
++install-data-am: install-libexo_2_includeHEADERS install-pkgconfigDATA
+ 
+ install-dvi: install-dvi-am
+ 
+@@ -1519,8 +1486,7 @@ ps: ps-am
+ ps-am:
+ 
+ uninstall-am: uninstall-libLTLIBRARIES \
+-	uninstall-libexo_2_includeHEADERS \
+-	uninstall-libexoincludeHEADERS uninstall-pkgconfigDATA
++	uninstall-libexo_2_includeHEADERS uninstall-pkgconfigDATA
+ 
+ .MAKE: all check check-am install install-am install-strip
+ 
+@@ -1533,15 +1499,14 @@ uninstall-am: uninstall-libLTLIBRARIES \
+ 	install-dvi-am install-exec install-exec-am install-html \
+ 	install-html-am install-info install-info-am \
+ 	install-libLTLIBRARIES install-libexo_2_includeHEADERS \
+-	install-libexoincludeHEADERS install-man install-pdf \
+-	install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
+-	install-strip installcheck installcheck-am installdirs \
+-	maintainer-clean maintainer-clean-generic mostlyclean \
+-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+-	pdf pdf-am ps ps-am recheck tags tags-am uninstall \
+-	uninstall-am uninstall-libLTLIBRARIES \
+-	uninstall-libexo_2_includeHEADERS \
+-	uninstall-libexoincludeHEADERS uninstall-pkgconfigDATA
++	install-man install-pdf install-pdf-am install-pkgconfigDATA \
++	install-ps install-ps-am install-strip installcheck \
++	installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	recheck tags tags-am uninstall uninstall-am \
++	uninstall-libLTLIBRARIES uninstall-libexo_2_includeHEADERS \
++	uninstall-pkgconfigDATA
+ 
+ .PRECIOUS: Makefile
+ 
diff --git a/xfce-base/libxfce4util/Manifest b/xfce-base/libxfce4util/Manifest
index 486c06754a9f..9ed79b9d5226 100644
--- a/xfce-base/libxfce4util/Manifest
+++ b/xfce-base/libxfce4util/Manifest
@@ -1,5 +1,7 @@
 DIST libxfce4util-4.14.0.tar.bz2 516358 BLAKE2B d8e3d1e3247e23908456aa296415240c1a9146001a02cb859541922ee541e30955279fd68f2d9938e43f992a5115b21836363fa8d8234de87fca0bbaac830bf0 SHA512 6ac95aea03052d9e2f886cbe76afe9bbb43511bf3fe1766097e10cd8762541ed17060a727df3ef93e226aae448c15d9dd3ad8acd55a9d5f2387cb360bdf72832
 DIST libxfce4util-4.15.0.tar.bz2 516074 BLAKE2B 67ba9d34c850d057012a4a2c76acce55e3afd606ab379eadc6873a62651affd69cb5d2ecd6be5e03f11b81d7bdb9ff43e39b04886f9c2c214b898b7b0dcf6b09 SHA512 f47194c999d5c4b0fd44abf392ea40ea2c3f07064e15b900821e30adc58c791e533ae2df20927037bad9db5e94981621716c743522b6daad579badd0094cffaf
+DIST libxfce4util-4.15.1.tar.bz2 520249 BLAKE2B 94a2d84d5e930cb590b87cd27d2a68e8a2d885fc783b9939adbb1af364cf84a0f2663920de5ae697e31e27c53f5665891733546d3e27e5f8cc01a56d9499ea03 SHA512 813269669df3b6b3d99f83142b4e0fbbc884306e467a3de34cd7e26e2dbe67e8cef769cab165e5f68838ead3ebd0d3895cc58e515c8e253b52a512298690acbf
 EBUILD libxfce4util-4.14.0.ebuild 1024 BLAKE2B 46f7b43ced6ac5109718d2085b0a43be351bda24cf7de22caa44d0c2a1ca21c72fdc5c117f9779883730a9d92d03a5df60ab5a0b4814090843a4a29fe0144e5d SHA512 39fae6a20d296ea91c5d1844a73a8d15656289d19586afed045fbf8468957c3a072861d7bbbc847dffb407c958005c8c40b746bbbb3c759e0d0dcb7c90f3bca9
 EBUILD libxfce4util-4.15.0.ebuild 1028 BLAKE2B 23a1b604164f6028791662299bdd0cfa4ee6fc0f1c65c0d2935177a7a0b74ce446ffb3ac051e9c5d8af3e07edc8724bad9c699db82b4f120a062012456068edf SHA512 a89d8e37eaf2f76fe590378405450084c412b2dc36738468e7cc388e852d8ecb8bee8812ad87161523a8a67fe840e1a6e56b476d6543fcb6834dc56325ce0ee0
+EBUILD libxfce4util-4.15.1.ebuild 1028 BLAKE2B 23a1b604164f6028791662299bdd0cfa4ee6fc0f1c65c0d2935177a7a0b74ce446ffb3ac051e9c5d8af3e07edc8724bad9c699db82b4f120a062012456068edf SHA512 a89d8e37eaf2f76fe590378405450084c412b2dc36738468e7cc388e852d8ecb8bee8812ad87161523a8a67fe840e1a6e56b476d6543fcb6834dc56325ce0ee0
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/libxfce4util/libxfce4util-4.15.1.ebuild b/xfce-base/libxfce4util/libxfce4util-4.15.1.ebuild
new file mode 100644
index 000000000000..dd5b8e34dae7
--- /dev/null
+++ b/xfce-base/libxfce4util/libxfce4util-4.15.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vala
+
+DESCRIPTION="A basic utility library for the Xfce desktop environment"
+HOMEPAGE="https://git.xfce.org/xfce/libxfce4util/"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0/7"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND=">=dev-libs/glib-2.42
+	introspection? ( dev-libs/gobject-introspection:= )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/gtk-doc-am
+	sys-devel/gettext
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )"
+
+src_prepare() {
+	# stupid vala.eclass...
+	default
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+		$(use_enable vala)
+	)
+
+	use vala && vala_src_prepare
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index 48e1c244363a..b75e9d1f4780 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,7 +1,9 @@
 DIST xfce4-panel-4.14.3.tar.bz2 1304748 BLAKE2B 7e009e2afcc59b1d014fe776c439cd27c8ddb9b46215a9766f25f384802bc27a672201d0a73eff8aab3714822ee5f2c062806a60ccaf70cf6b5ec65f38f7e8a1 SHA512 c317741df1196a9f8d675c87732155f973022d1cb30a8815393980747d1569e8348c386253fc9056068c35fbdc13faefb4a0bef6678d072d51461c4aae909940
 DIST xfce4-panel-4.14.4.tar.bz2 1307938 BLAKE2B 79e0abcc5dfe41faaab1de981b8a61a99e9c11ab5b3ddba5fb7385517d24b50210f12d0a6a49720d6d8458fa7143ed65d7960025c5e8c01af1a59dd6b339a2d9 SHA512 5ae7c7acf0254fdc3f5eaccf75d7c12699ab8147322f231af7bd17b1238b8c25a96d628dada9caa086fc8fde2b7dc4030a38eb7b863b290f9e069193b3728d85
 DIST xfce4-panel-4.15.2.tar.bz2 1302860 BLAKE2B 0c2ee5dac584cd1cae940872ca1130ae710e23f46089ee16241f03f87317d905937f1eb6c382140659e9b01669ccce26bf7e6e64e90207db3c7b7a7865c71674 SHA512 7f2e0d1de70db1778cd5a0c0ae4845ffef960b16f1e147ec6fd47543a6360e2281d8290bc055bc83993796bdbd97edeaca867a6790052bc07d8e2bffa412e5a2
+DIST xfce4-panel-4.15.3.tar.bz2 1321860 BLAKE2B dbe4eff757e612267c0de6edc0689bf3b469c30cf8060f06e3e99de9093924bc0e8dbb4f1362349904c6d99dc250b240f34cbde218de0b13abdd259a8482cee0 SHA512 ab3ad010899cf86368e5dd8e469937d89221f6847f54d047536c120bf282bf5e7756dd8aa2837984c35a10c2f5c46c75874839d1b4cbbfe91417875fff4c3cc2
 EBUILD xfce4-panel-4.14.3.ebuild 1494 BLAKE2B 73021f104029c59f7f829083e61e558e76865ff57dd1faaf191c2a8d8c6cd927004d42f7f36c144841c40804c151f5bbba4512e65492d15ee40f3202445bb6aa SHA512 8105bf3c2606467e4763f86a5fa78b027aa26365977f62e752fa2ec921cb63b264540cb5ab91b936c952bb6093a705a956b9ff4ab6a9949055a5bdd8c9d7a923
 EBUILD xfce4-panel-4.14.4.ebuild 1529 BLAKE2B ca4cb85eaf335337db82157ac55482c8e767c65c513a9b9b3e8940a13d90a812cbed4617091146203e7121e0d59256611cf1543915320458c33b043ff1a25895 SHA512 ae711df8427ffa091cf0de69ecbbdb0c93ab980a5a16610d72ff1ce827f0046a6fac09311cd42355a910c35218c38c871c2d4642503005eb2697148d7e495750
 EBUILD xfce4-panel-4.15.2.ebuild 1413 BLAKE2B d5bdb34864314e9a177b1134a5bd89845b3e4b0bd5371c3bc653cb1c42644f7e917c46a2e70e29aaa5d16fdc1929d418dc758af172904e5f5ec12885d0ecf125 SHA512 ca1aa1cb317bf05ee8c36983767bfc9a40cde6e711873f67835843f5caef1486c1bcdf29996fef49e3054aeb933998231d50b52a890fdbfd3af81df976dfe790
+EBUILD xfce4-panel-4.15.3.ebuild 1413 BLAKE2B d5bdb34864314e9a177b1134a5bd89845b3e4b0bd5371c3bc653cb1c42644f7e917c46a2e70e29aaa5d16fdc1929d418dc758af172904e5f5ec12885d0ecf125 SHA512 ca1aa1cb317bf05ee8c36983767bfc9a40cde6e711873f67835843f5caef1486c1bcdf29996fef49e3054aeb933998231d50b52a890fdbfd3af81df976dfe790
 MISC metadata.xml 322 BLAKE2B 30f74676e7071e50ef0a877f83148fb5c90b6706e31b9a9b71540c7d5488ec04eed647e345aefe701315855fd047ca721a91031ef1cd7ca04388236d4a404d5e SHA512 3d6a3a46f9e77eb4904ac9385a4ddb3337b97f450c26895c2c3032095f94eb92420fe8d814da7696e4dc7aed3d8ca395aeca7c46914babfa845c6f61cbbe97c7
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.15.3.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.15.3.ebuild
new file mode 100644
index 000000000000..9861259a3be5
--- /dev/null
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.15.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vala xdg-utils
+
+DESCRIPTION="Panel for the Xfce desktop environment"
+HOMEPAGE="https://www.xfce.org/projects/"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND=">=dev-libs/glib-2.42
+	>=x11-libs/cairo-1
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	x11-libs/libX11
+	x11-libs/libwnck:3
+	>=xfce-base/exo-0.11.2:=
+	>=xfce-base/garcon-0.5:=
+	>=xfce-base/libxfce4ui-4.15.1:=
+	>=xfce-base/libxfce4util-4.13:=[introspection?]
+	>=xfce-base/xfconf-4.13:=
+	introspection? ( dev-libs/gobject-introspection:= )"
+DEPEND="${RDEPEND}
+	vala? ( $(vala_depend) )
+	dev-lang/perl
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	# stupid vala.eclass...
+	default
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+		$(use_enable vala)
+	)
+
+	use vala && vala_src_prepare
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 2844b4f789db..880b4f346080 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/Manifest b/xfce-extra/xfce4-pulseaudio-plugin/Manifest
index 7c4023901fcb..a2afa662a1d8 100644
--- a/xfce-extra/xfce4-pulseaudio-plugin/Manifest
+++ b/xfce-extra/xfce4-pulseaudio-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-pulseaudio-plugin-0.4.2.tar.bz2 428504 BLAKE2B dd8c855e75aaee060df1e7abb2f8b835f1a630ce8b45b28c407c48f52071a51729e0bf8c645d5f68f968f12a45dea272d03ee69f4554009421a1a075a8fb8d2c SHA512 94184fe7379a7f1763d606fe3c45186767a43180329b43c8cba04b76ae5e1b2249531fc1fb6304da9bb03e7475ad65f861341253ead530d9a945165b4eb9e46e
 DIST xfce4-pulseaudio-plugin-0.4.3.tar.bz2 431773 BLAKE2B 2c0de4ea0ab9304b737fe4ce570bcd8427f983845fe898dbe7e053a5fe79793223df6882a931b186664d8c95d4c767daf39ba36a98dc58595ba77e8a18c13a6c SHA512 d3214b2b7c35a0a87ea60a5d843f5027d1b09f320d4d24c6bf89a8936de92226223cb4dc5368edf4c0a1aedb3b8796510981eeadee8e836e764569d9284f0efa
-EBUILD xfce4-pulseaudio-plugin-0.4.2.ebuild 1458 BLAKE2B e874b0db23c6b99f72aace1af730ab124a98852505563a6183abacc137dcf5c3b3744c368b62115efdbcb5f9504596905bb75d9f4d7b2d14afa91088661b669d SHA512 094bc7fc802460f831d8fffe4edabd25605a887ed4d8e6795963818d5cd33449a24ff325d35a2a92a8f95a86803cb9e2d8454862dd688dfa504c23a191b2d837
-EBUILD xfce4-pulseaudio-plugin-0.4.3.ebuild 1483 BLAKE2B 057e60be3f6c054fc633da9bea5c0f7e57bab10cfdc30ffd21dd23dcfe5a0a0e7deb12437f39c81e3a298a1b6b6e24fad42d12d245687baa9a8200482fb7e3bd SHA512 5c77ebcd8cfce0c5133f9897460febc297750e77b6d9535f1cc827b92445b6a523891c50162ee31a6025e25d3fbe11edda76bb3dd2f2c883302786f991daa009
+EBUILD xfce4-pulseaudio-plugin-0.4.2.ebuild 1465 BLAKE2B f3edcdcc18f7746fd77c3da3e17acf9ecd8b959c9ce22699372fb24ea519cf77c0577d175b53e45bb1f104829fca2dc4d5d9828771a1fcbb53eeb16d5ecaef8c SHA512 24d5f412977747f84ef811716756daa0961da2fe90a6c17b0ffd57cc916c22f93fba8cc3f4d137181a67c23546f746c905380fba471772e51f9b88ced3ed117b
+EBUILD xfce4-pulseaudio-plugin-0.4.3.ebuild 1490 BLAKE2B 359c3395f3d7d654857dff1c516cfc47237c5c4ddcd047dd76979ab6824b4f688e14c15adf681c3b937cd56c097b2265145544a63e43501b582511065f4e1d26 SHA512 d6bc2cced925ed371e82de8863b7d2199d024d2277fdae02364353c2c9ed0eb5c7b073f3acc7258da5634a50e3ab95fd90f9a6df7ee2c11d4a52888cc52809fe
 MISC metadata.xml 586 BLAKE2B 57900ad6e29515182780ef646d7861d3858150ab61861bf70c1a106221e20d7ca93f7bfd36e4337204a0abe32e515f60affae94342b6b76cdf6d34815e0130d8 SHA512 63bb2c2bd9a71f8d53f17cf5894039afb4592d8b5687e6daa4485a566464e3fe4f5ca45306409547f7d828488242fd760ddaa0587733f69067717ceffabba05e
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.2.ebuild b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.2.ebuild
index 9aab5c50ce62..02d0d033f7fb 100644
--- a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.2.ebuild
+++ b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.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="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
 IUSE="debug keybinder libnotify wnck"
 
 RDEPEND=">=dev-libs/glib-2.42.0:=
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.3.ebuild b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.3.ebuild
index 37630efd582c..b5e58098a79b 100644
--- a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.3.ebuild
+++ b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
 IUSE="debug keybinder libnotify wnck"
 
 RDEPEND=">=dev-libs/glib-2.42.0:=
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/Manifest b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
index 98112eb0d685..fc7242911e35 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/Manifest
+++ b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-whiskermenu-plugin-2.4.3.tar.bz2 171822 BLAKE2B 3bba151c768e9dbd3eb0904e675c334ba073a6e22a2c216e41df3bf1e6d5e2961cf25650b90dd459f40a10b4b12f4209e1a370e66d71fedc05da110693f039ad SHA512 378f9b1a5ef4ffab079090aeb10b2e571918aadf7dddb051dc30288b325d3f1e6621fe9c2d3db5815b706d63361d77616124a543d0c96e0d1cc06407152e9f32
 DIST xfce4-whiskermenu-plugin-2.4.4.tar.bz2 172157 BLAKE2B 9e5e12448a35e55285a6e291f0c988ce3797f33b0c72aa5b2be54aafdd15463b75dd726a04116aae8b1721adc9cca93188779a428641bda133883034c19d1203 SHA512 2fe27567d301f66de4648f1c3104a2ecb90c3b25672d5babcde69507559628a3a74b14d1526ff70dd75d64f7d056c8baae645f5a9291bf8c5e30a1a8258721ba
-EBUILD xfce4-whiskermenu-plugin-2.4.3.ebuild 912 BLAKE2B 39351df830906b03e875dac589a024c170cd98ddea6a70edd117f2117de4e53e87c0d0a44dd520f18bb72ef5cf83da2bd02cf039669ace9eb61778f34b8b34cd SHA512 0e32852278940ab88839f69be7191867561f80864a0ab4ac410b3c4ed6a8e2eff21bdfa39355eabb16b4c13c11806a78bc19d0ca9c8206ac2338c6be55c355c7
-EBUILD xfce4-whiskermenu-plugin-2.4.4.ebuild 913 BLAKE2B 32b442c204f262553037cfd47a0c0eba4b3aa7fcdd4f106063e103d19e4432e100c78f5f9612a411abe899a4d0219198e8818d798b64ca215e8ecde7e6428996 SHA512 fd712a791a52e43d840b6c56edbb66c2eb9d936e50c55ae20f361dca50b7f3c5091fc072548af1c63f33d4b2ad2e88b48e149f48749a81303b553bd2dc2e5baa
+EBUILD xfce4-whiskermenu-plugin-2.4.3.ebuild 919 BLAKE2B 9ef4ed7cf3c39ef6e67c9120859fc4e5bfe78024b6d35e55fbb80ad0fbba502c649d0ab514c4b888f6f2aa8622a8606f2bb2aa124cf3d59ffc217d072e3a2be6 SHA512 b60d2074a760e65e202b049c0efa6c35d3d3d46d7e1287a9a1454b1730c00bac8563b9e102794dc40527c7d066f1ca8951bd7cf31f063fe0321f377093184642
+EBUILD xfce4-whiskermenu-plugin-2.4.4.ebuild 920 BLAKE2B 209b9a99e558b74e99cf2ee7342501f5619022fc2f741cf0a672ae103bda3207601cadf54da925f63fa7bcb1a0919465835603129da557ef4f4ff9ddbdaa19d3 SHA512 ae8dae87fdf457b1a12830dedfc3299e8b883626e0a56b1df79fca63c1cfd3b3b93732bcb63e72c3e9f72ef55c278f4238639e6111bdb9029e8dbe69d203c81a
 MISC metadata.xml 2083 BLAKE2B 4e8d91617b37e4f239098a391229bbb4e3a58906e89586b7b3b24459e419bd2a83db41ec0707e5cb1fee21f14f07d98557682566f1776a178baa436874351bec SHA512 8bb378a95fda0f395ce115761dfa52889f1a2d024cca07d0547042c0611b49949c91867d06405812b5048bd49de123bc216802d1193d7b4baf91a598bcd84313
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.3.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.3.ebuild
index 73770954f8a7..a6a2f1033366 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.3.ebuild
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.4.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.4.ebuild
index f6208090e372..1d5070d62417 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.4.ebuild
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="